diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index dd7d1947fd..8fefe3ef4d 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -85,23 +85,6 @@ stages:
             retryCountOnTaskFailure: 3
             inputs:
               versionSpec: $(nodeVersion)
-          - task: Cache@2
-            displayName: Cache node_modules
-            inputs:
-              key: '"npm_client" | "$(Agent.OS)" | $(Build.SourcesDirectory)/src/Umbraco.Web.UI.Client/package-lock.json'
-              restoreKeys: |
-                "npm_client" | "$(Agent.OS)"
-                "npm_client"
-              path: $(npm_config_cache)
-          - script: npm ci --no-fund --no-audit --prefer-offline
-            workingDirectory:  src/Umbraco.Web.UI.Client
-            displayName: Run npm ci (Backoffice)
-          - task: gulp@0
-            displayName: Run gulp build (Backoffice)
-            inputs:
-              gulpFile: src/Umbraco.Web.UI.Client/gulpfile.js
-              targets: coreBuild
-              workingDirectory: src/Umbraco.Web.UI.Client
           - script: npm ci --no-fund --no-audit --prefer-offline
             displayName: Run npm ci (Login)
             workingDirectory: src/Umbraco.Web.UI.Login
@@ -241,7 +224,7 @@ stages:
           - task: Cache@2
             displayName: Cache node_modules
             inputs:
-              key: '"npm_client" | "$(Agent.OS)"| $(Build.SourcesDirectory)/src/Umbraco.Web.UI.Client/package-lock.json | $(Build.SourcesDirectory)/src/Umbraco.Web.UI.New.Client/package-lock.json'
+              key: '"npm_client" | "$(Agent.OS)"| $(Build.SourcesDirectory)/src/Umbraco.Web.UI.New.Client/package-lock.json'
               restoreKeys: |
                 "npm_client" | "$(Agent.OS)"
                 "npm_client"
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeController.cs
index d0b68d81d2..d58bdc148a 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeController.cs
@@ -2,6 +2,7 @@
 using Asp.Versioning;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
@@ -14,11 +15,11 @@ using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Web.BackOffice.Security;
 using Umbraco.Extensions;
 using IdentitySignInResult = Microsoft.AspNetCore.Identity.SignInResult;
 using SignInResult = Microsoft.AspNetCore.Mvc.SignInResult;
 using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Web.Common.Security;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Security;
 
@@ -174,7 +175,7 @@ public class BackOfficeController : SecurityControllerBase
 
         // Returning a SignOutResult will ask OpenIddict to redirect the user agent
         // to the post_logout_redirect_uri specified by the client application.
-        return SignOut(Constants.Security.NewBackOfficeAuthenticationType, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+        return SignOut(Constants.Security.BackOfficeAuthenticationType, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
     }
 
     /// <summary>
@@ -182,7 +183,7 @@ public class BackOfficeController : SecurityControllerBase
     /// </summary>
     private async Task<string?> GetUserNameFromAuthCookie()
     {
-        AuthenticateResult cookieAuthResult = await HttpContext.AuthenticateAsync(Constants.Security.NewBackOfficeAuthenticationType);
+        AuthenticateResult cookieAuthResult = await HttpContext.AuthenticateAsync(Constants.Security.BackOfficeAuthenticationType);
         return cookieAuthResult.Succeeded
             ? cookieAuthResult.Principal?.Identity?.Name
             : null;
@@ -263,5 +264,5 @@ public class BackOfficeController : SecurityControllerBase
         return new SignInResult(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme, backOfficePrincipal);
     }
 
-    private static IActionResult DefaultChallengeResult() => new ChallengeResult(Constants.Security.NewBackOfficeAuthenticationType);
+    private static IActionResult DefaultChallengeResult() => new ChallengeResult(Constants.Security.BackOfficeAuthenticationType);
 }
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeDefaultController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeDefaultController.cs
new file mode 100644
index 0000000000..e9ef58d8b0
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeDefaultController.cs
@@ -0,0 +1,39 @@
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Api.Management.Controllers.Security;
+
+public class BackOfficeDefaultController : Controller
+{
+    [HttpGet]
+    [AllowAnonymous]
+    public async Task<IActionResult> Index()
+    {
+        // force authentication to occur since this is not an authorized endpoint
+        AuthenticateResult result = await this.AuthenticateBackOfficeAsync();
+
+        // if we are not authenticated then we need to redirect to the login page
+        if (!result.Succeeded)
+        {
+            RedirectToAction("Login", "Backoffice");
+        }
+
+        ViewResult defaultView = DefaultView();
+
+        return defaultView;
+    }
+
+    /// <summary>
+    ///     Returns the default view for the BackOffice
+    /// </summary>
+    /// <returns>The default view currently /umbraco/UmbracoBackOffice/Default.cshtml</returns>
+    public ViewResult DefaultView()
+    {
+        var viewPath = Path.Combine(Constants.SystemDirectories.Umbraco, Constants.Web.Mvc.BackOfficeArea, nameof(Index) + ".cshtml")
+            .Replace("\\", "/"); // convert to forward slashes since it's a virtual path
+        return View(viewPath);
+    }
+}
diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthBuilderExtensions.cs
index 3199cfbecc..0c303d2dc2 100644
--- a/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthBuilderExtensions.cs
+++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthBuilderExtensions.cs
@@ -19,13 +19,12 @@ public static class BackOfficeAuthBuilderExtensions
         builder
             .AddAuthentication()
             .AddUmbracoOpenIddict()
-            .AddBackOfficeLogin()
-            .AddTokenRevocation();
+            .AddBackOfficeLogin();
 
         return builder;
     }
 
-    private static IUmbracoBuilder AddTokenRevocation(this IUmbracoBuilder builder)
+    public static IUmbracoBuilder AddTokenRevocation(this IUmbracoBuilder builder)
     {
         builder.AddNotificationAsyncHandler<UserSavingNotification, RevokeUserAuthenticationTokensNotificationHandler>();
         builder.AddNotificationAsyncHandler<UserSavedNotification, RevokeUserAuthenticationTokensNotificationHandler>();
@@ -52,28 +51,29 @@ public static class BackOfficeAuthBuilderExtensions
     {
         builder.Services
             .AddAuthentication()
-            .AddCookie(Constants.Security.NewBackOfficeAuthenticationType, options =>
+            // Add our custom schemes which are cookie handlers
+            .AddCookie(Constants.Security.BackOfficeAuthenticationType, options =>
             {
                 options.LoginPath = "/umbraco/login";
-                options.Cookie.Name = Constants.Security.NewBackOfficeAuthenticationType;
+                options.Cookie.Name = Constants.Security.BackOfficeAuthenticationType;
             })
-            .AddCookie(Constants.Security.NewBackOfficeExternalAuthenticationType, options =>
+            .AddCookie(Constants.Security.BackOfficeExternalAuthenticationType, o =>
             {
-                options.Cookie.Name = Constants.Security.NewBackOfficeExternalAuthenticationType;
-                options.ExpireTimeSpan = TimeSpan.FromMinutes(5);
+                o.Cookie.Name = Constants.Security.BackOfficeExternalAuthenticationType;
+                o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
             })
 
             // Although we don't natively support this, we add it anyways so that if end-users implement the required logic
             // they don't have to worry about manually adding this scheme or modifying the sign in manager
-            .AddCookie(Constants.Security.NewBackOfficeTwoFactorAuthenticationType, options =>
+            .AddCookie(Constants.Security.BackOfficeTwoFactorAuthenticationType, options =>
             {
-                options.Cookie.Name = Constants.Security.NewBackOfficeTwoFactorAuthenticationType;
+                options.Cookie.Name = Constants.Security.BackOfficeTwoFactorAuthenticationType;
                 options.ExpireTimeSpan = TimeSpan.FromMinutes(5);
             })
-            .AddCookie(Constants.Security.NewBackOfficeTwoFactorRememberMeAuthenticationType, options =>
+            .AddCookie(Constants.Security.BackOfficeTwoFactorRememberMeAuthenticationType, o =>
             {
-                options.Cookie.Name = Constants.Security.NewBackOfficeTwoFactorRememberMeAuthenticationType;
-                options.ExpireTimeSpan = TimeSpan.FromMinutes(5);
+                o.Cookie.Name = Constants.Security.BackOfficeTwoFactorRememberMeAuthenticationType;
+                o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
             });
 
         return builder;
diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/InstallerBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/InstallerBuilderExtensions.cs
index 2965e35b36..88d95b2fbd 100644
--- a/src/Umbraco.Cms.Api.Management/DependencyInjection/InstallerBuilderExtensions.cs
+++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/InstallerBuilderExtensions.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Cms.Api.Management.Install;
 using Umbraco.Cms.Api.Management.Mapping.Installer;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Factories;
 using Umbraco.Cms.Core.Installer;
 using Umbraco.Cms.Core.Installer.Steps;
 using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Services.Installer;
 using Umbraco.Cms.Infrastructure.Factories.Installer;
 using Umbraco.Cms.Infrastructure.Installer.Steps;
@@ -13,7 +15,7 @@ namespace Umbraco.Cms.Api.Management.DependencyInjection;
 
 public static class InstallerBuilderExtensions
 {
-    internal static IUmbracoBuilder AddNewInstaller(this IUmbracoBuilder builder)
+    internal static IUmbracoBuilder AddInstaller(this IUmbracoBuilder builder)
     {
         IServiceCollection services = builder.Services;
 
@@ -23,7 +25,7 @@ public static class InstallerBuilderExtensions
 
         builder.AddInstallSteps();
         services.AddTransient<IInstallService, InstallService>();
-
+        builder.AddNotificationAsyncHandler<UnattendedInstallNotification, CreateUnattendedUserNotificationHandler>();
         builder.WithCollectionBuilder<MapDefinitionCollectionBuilder>().Add<InstallerViewModelsMapDefinition>();
 
         return builder;
diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/PreviewBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/PreviewBuilderExtensions.cs
new file mode 100644
index 0000000000..81148fbaa9
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/PreviewBuilderExtensions.cs
@@ -0,0 +1,20 @@
+using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Cms.Api.Management.Preview;
+using Umbraco.Cms.Api.Management.Routing;
+using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.Notifications;
+
+namespace Umbraco.Cms.Api.Management.DependencyInjection;
+
+internal static class PreviewBuilderExtensions
+{
+    internal static IUmbracoBuilder AddPreview(this IUmbracoBuilder builder)
+    {
+        builder.Services.AddSignalR();
+        builder.Services.AddSingleton<PreviewRoutes>();
+        builder.AddNotificationAsyncHandler<ContentCacheRefresherNotification, PreviewHubUpdater>();
+
+        return builder;
+    }
+}
+
diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilder.BackOffice.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilder.BackOffice.cs
new file mode 100644
index 0000000000..20ee572dc4
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilder.BackOffice.cs
@@ -0,0 +1,61 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Api.Management.DependencyInjection;
+using Umbraco.Cms.Api.Management.Security;
+using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.Hosting;
+using Umbraco.Cms.Core.IO;
+using Umbraco.Cms.Infrastructure.DependencyInjection;
+using Umbraco.Cms.Infrastructure.Examine.DependencyInjection;
+using Umbraco.Cms.Web.Common.Hosting;
+
+namespace Umbraco.Extensions;
+
+/// <summary>
+/// Extension methods for <see cref="IUmbracoBuilder"/> for the Umbraco back office
+/// </summary>
+public static partial class UmbracoBuilderExtensions
+{
+    /// <summary>
+    /// Adds all required components to run the Umbraco back office
+    /// </summary>
+    public static IUmbracoBuilder
+        AddBackOffice(this IUmbracoBuilder builder, Action<IMvcBuilder>? configureMvc = null) => builder
+        .AddConfiguration()
+        .AddUmbracoCore()
+        .AddWebComponents()
+        .AddRuntimeMinifier()
+        .AddBackOfficeCore()
+        .AddBackOfficeIdentity()
+        .AddBackOfficeAuthentication()
+        .AddTokenRevocation()
+        .AddMembersIdentity()
+        .AddUmbracoProfiler()
+        .AddMvcAndRazor(configureMvc)
+        .AddWebServer()
+        .AddRecurringBackgroundJobs()
+        .AddNuCache()
+        .AddDistributedCache()
+        .AddCoreNotifications()
+        .AddExamine()
+        .AddExamineIndexes();
+
+    public static IUmbracoBuilder AddBackOfficeCore(this IUmbracoBuilder builder)
+    {
+        builder.Services.AddUnique<IBackOfficePathGenerator, UmbracoBackOfficePathGenerator>();
+        builder.Services.AddUnique<IPhysicalFileSystem>(factory =>
+        {
+            var path = "~/";
+            IHostingEnvironment hostingEnvironment = factory.GetRequiredService<IHostingEnvironment>();
+            return new PhysicalFileSystem(
+                factory.GetRequiredService<IIOHelper>(),
+                hostingEnvironment,
+                factory.GetRequiredService<ILogger<PhysicalFileSystem>>(),
+                hostingEnvironment.MapPathContentRoot(path),
+                hostingEnvironment.ToAbsolute(path)
+            );
+        });
+
+        return builder;
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.BackOfficeIdentity.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilder.BackOfficeIdentity.cs
similarity index 92%
rename from src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.BackOfficeIdentity.cs
rename to src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilder.BackOfficeIdentity.cs
index 9f79b5e3bb..f3ae55c8f6 100644
--- a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.BackOfficeIdentity.cs
+++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilder.BackOfficeIdentity.cs
@@ -3,6 +3,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Umbraco.Cms.Api.Management.Security;
+using Umbraco.Cms.Api.Management.Telemetry;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DependencyInjection;
@@ -15,8 +17,6 @@ using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Security;
 using Umbraco.Cms.Infrastructure.Telemetry.Interfaces;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Cms.Web.BackOffice.Telemetry;
 using Umbraco.Cms.Web.Common.AspNetCore;
 using Umbraco.Cms.Web.Common.Security;
 
@@ -63,18 +63,17 @@ public static partial class UmbracoBuilderExtensions
         services.AddScoped<ICoreBackOfficeUserManager, BackOfficeUserManager>();
         services.AddScoped<IInviteUriProvider, InviteUriProvider>();
         services.AddScoped<IForgotPasswordUriProvider, ForgotPasswordUriProvider>();
+        services.AddScoped<IBackOfficePasswordChanger, BackOfficePasswordChanger>();
 
-        services.AddSingleton<IBackOfficeUserPasswordChecker, NoopBackOfficeUserPasswordChecker>(); ;
+        services.AddSingleton<IBackOfficeUserPasswordChecker, NoopBackOfficeUserPasswordChecker>();
 
         // Configure the options specifically for the UmbracoBackOfficeIdentityOptions instance
         services.ConfigureOptions<ConfigureBackOfficeIdentityOptions>();
-        services.ConfigureOptions<ConfigureBackOfficeSecurityStampValidatorOptions>();
 
         return builder;
     }
 
-    //TODO change this to private when the legacy backoffice is removed
-    public static BackOfficeIdentityBuilder BuildUmbracoBackOfficeIdentity(this IUmbracoBuilder builder)
+    private static BackOfficeIdentityBuilder BuildUmbracoBackOfficeIdentity(this IUmbracoBuilder builder)
     {
         IServiceCollection services = builder.Services;
 
diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.LocalizedText.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilder.LocalizedText.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.LocalizedText.cs
rename to src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilder.LocalizedText.cs
diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilderExtensions.cs
index f36f88b384..718b2de9ed 100644
--- a/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -3,25 +3,32 @@ using Umbraco.Cms.Api.Common.Configuration;
 using Umbraco.Cms.Api.Common.DependencyInjection;
 using Umbraco.Cms.Api.Management.Configuration;
 using Umbraco.Cms.Api.Management.DependencyInjection;
+using Umbraco.Cms.Api.Management.Middleware;
+using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Api.Management.Serialization;
 using Umbraco.Cms.Api.Management.Services;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Web.BackOffice.Services;
 using Umbraco.Cms.Web.Common.ApplicationBuilder;
 
 namespace Umbraco.Extensions;
 
-public static class UmbracoBuilderExtensions
+public static partial class UmbracoBuilderExtensions
 {
     public static IUmbracoBuilder AddUmbracoManagementApi(this IUmbracoBuilder builder)
     {
         IServiceCollection services = builder.Services;
+        builder.Services.AddSingleton<BackOfficeAreaRoutes>();
+        builder.Services.AddSingleton<BackOfficeExternalLoginProviderErrorMiddleware>();
+        builder.Services.AddUnique<IConflictingRouteService, ConflictingRouteService>();
 
         if (!services.Any(x => x.ImplementationType == typeof(JsonPatchService)))
         {
             ModelsBuilderBuilderExtensions.AddModelsBuilder(builder)
                 .AddJson()
-                .AddNewInstaller()
+                .AddInstaller()
                 .AddUpgrader()
                 .AddSearchManagement()
                 .AddTrees()
@@ -55,8 +62,10 @@ public static class UmbracoBuilderExtensions
                 .AddWebhooks()
                 .AddServer()
                 .AddCorsPolicy()
-                .AddBackOfficeAuthentication()
-                .AddPasswordConfiguration();
+                .AddWebhooks()
+                .AddPreview()
+                .AddPasswordConfiguration()
+                .AddSupplemenataryLocalizedTextFileSources();
 
             services
                 .ConfigureOptions<ConfigureApiBehaviorOptions>()
diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/WebhookBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/WebhooksBuilderExtensions.cs
similarity index 63%
rename from src/Umbraco.Cms.Api.Management/DependencyInjection/WebhookBuilderExtensions.cs
rename to src/Umbraco.Cms.Api.Management/DependencyInjection/WebhooksBuilderExtensions.cs
index 85c85e3915..74cbe680a9 100644
--- a/src/Umbraco.Cms.Api.Management/DependencyInjection/WebhookBuilderExtensions.cs
+++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/WebhooksBuilderExtensions.cs
@@ -1,16 +1,13 @@
 using Umbraco.Cms.Api.Management.Factories;
 using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Web.BackOffice.Mapping;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Api.Management.DependencyInjection;
 
-internal static class WebhookBuilderExtensions
+internal static class WebhooksBuilderExtensions
 {
     internal static IUmbracoBuilder AddWebhooks(this IUmbracoBuilder builder)
     {
-        builder.WithCollectionBuilder<MapDefinitionCollectionBuilder>().Add<WebhookMapDefinition>();
         builder.Services.AddUnique<IWebhookPresentationFactory, WebhookPresentationFactory>();
 
         return builder;
diff --git a/src/Umbraco.Cms.Api.Management/Extensions/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Cms.Api.Management/Extensions/HtmlHelperBackOfficeExtensions.cs
new file mode 100644
index 0000000000..f501b7f312
--- /dev/null
+++ b/src/Umbraco.Cms.Api.Management/Extensions/HtmlHelperBackOfficeExtensions.cs
@@ -0,0 +1,52 @@
+using System.Text;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Manifest;
+using Umbraco.Cms.Core.Serialization;
+using Umbraco.Cms.Web.Common.Hosting;
+
+namespace Umbraco.Cms.Api.Management.Extensions;
+
+public static class HtmlHelperBackOfficeExtensions
+{
+    /// <summary>
+    ///     Outputs a script tag containing the import map for the BackOffice.
+    /// </summary>
+    /// <remarks>
+    ///     It will replace the token %CACHE_BUSTER% with the cache buster hash.
+    ///     It will also replace the /umbraco/backoffice path with the correct path for the BackOffice assets.
+    /// </remarks>
+    /// <returns>A <see cref="Task"/> containing the html content for the BackOffice import map.</returns>
+    public static async Task<IHtmlContent> BackOfficeImportMapScriptAsync(
+        this IHtmlHelper html,
+        IJsonSerializer jsonSerializer,
+        IBackOfficePathGenerator backOfficePathGenerator,
+        IPackageManifestService packageManifestService)
+    {
+        try
+        {
+            PackageManifestImportmap packageImports = await packageManifestService.GetPackageManifestImportmapAsync();
+
+            var sb = new StringBuilder();
+            sb.AppendLine("""<script type="importmap">""");
+            sb.AppendLine(jsonSerializer.Serialize(packageImports));
+            sb.AppendLine("</script>");
+
+            // Inject the BackOffice cache buster into the import string to handle BackOffice assets
+            var importmapScript = sb.ToString()
+                .Replace(backOfficePathGenerator.BackOfficeVirtualDirectory, backOfficePathGenerator.BackOfficeAssetsPath)
+                .Replace(Constants.Web.CacheBusterToken, backOfficePathGenerator.BackOfficeCacheBustHash);
+
+            return html.Raw(importmapScript);
+        }
+        catch (NotSupportedException ex)
+        {
+            throw new NotSupportedException("Failed to serialize the BackOffice import map", ex);
+        }
+        catch (Exception ex)
+        {
+            throw new Exception("Failed to generate the BackOffice import map", ex);
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/Extensions/HttpContextExtensions.cs b/src/Umbraco.Cms.Api.Management/Extensions/HttpContextExtensions.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Extensions/HttpContextExtensions.cs
rename to src/Umbraco.Cms.Api.Management/Extensions/HttpContextExtensions.cs
diff --git a/src/Umbraco.Web.BackOffice/Extensions/IdentityBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/Extensions/IdentityBuilderExtensions.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Extensions/IdentityBuilderExtensions.cs
rename to src/Umbraco.Cms.Api.Management/Extensions/IdentityBuilderExtensions.cs
diff --git a/src/Umbraco.Web.BackOffice/Extensions/UmbracoApplicationBuilder.BackOffice.cs b/src/Umbraco.Cms.Api.Management/Extensions/UmbracoApplicationBuilder.BackOffice.cs
similarity index 69%
rename from src/Umbraco.Web.BackOffice/Extensions/UmbracoApplicationBuilder.BackOffice.cs
rename to src/Umbraco.Cms.Api.Management/Extensions/UmbracoApplicationBuilder.BackOffice.cs
index 71e94a1b2d..b1e3000884 100644
--- a/src/Umbraco.Web.BackOffice/Extensions/UmbracoApplicationBuilder.BackOffice.cs
+++ b/src/Umbraco.Cms.Api.Management/Extensions/UmbracoApplicationBuilder.BackOffice.cs
@@ -1,10 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Web.BackOffice.Middleware;
-using Umbraco.Cms.Web.BackOffice.Routing;
+using Umbraco.Cms.Api.Management.Middleware;
+using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Web.Common.ApplicationBuilder;
 
 namespace Umbraco.Extensions;
@@ -21,13 +18,6 @@ public static partial class UmbracoApplicationBuilderExtensions
     /// <returns></returns>
     public static IUmbracoApplicationBuilderContext UseBackOffice(this IUmbracoApplicationBuilderContext builder)
     {
-        KeepAliveSettings keepAliveSettings =
-            builder.ApplicationServices.GetRequiredService<IOptions<KeepAliveSettings>>().Value;
-        IHostingEnvironment hostingEnvironment = builder.ApplicationServices.GetRequiredService<IHostingEnvironment>();
-        builder.AppBuilder.Map(
-            hostingEnvironment.ToAbsolute(keepAliveSettings.KeepAlivePingUrl),
-            a => a.UseMiddleware<KeepAliveMiddleware>());
-
         builder.AppBuilder.UseMiddleware<BackOfficeExternalLoginProviderErrorMiddleware>();
         return builder;
     }
diff --git a/src/Umbraco.Web.BackOffice/Extensions/UmbracoApplicationBuilder.Preview.cs b/src/Umbraco.Cms.Api.Management/Extensions/UmbracoApplicationBuilder.Preview.cs
similarity index 93%
rename from src/Umbraco.Web.BackOffice/Extensions/UmbracoApplicationBuilder.Preview.cs
rename to src/Umbraco.Cms.Api.Management/Extensions/UmbracoApplicationBuilder.Preview.cs
index 18e1a877aa..a73ba3c492 100644
--- a/src/Umbraco.Web.BackOffice/Extensions/UmbracoApplicationBuilder.Preview.cs
+++ b/src/Umbraco.Cms.Api.Management/Extensions/UmbracoApplicationBuilder.Preview.cs
@@ -1,5 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Web.BackOffice.Routing;
+using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Web.Common.ApplicationBuilder;
 
 namespace Umbraco.Extensions;
diff --git a/src/Umbraco.Cms.Api.Management/Factories/IWebhookPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/IWebhookPresentationFactory.cs
index 113d739bfb..722d909cb6 100644
--- a/src/Umbraco.Cms.Api.Management/Factories/IWebhookPresentationFactory.cs
+++ b/src/Umbraco.Cms.Api.Management/Factories/IWebhookPresentationFactory.cs
@@ -1,5 +1,6 @@
-using Umbraco.Cms.Api.Management.ViewModels.Webhook;
+using Umbraco.Cms.Api.Management.ViewModels.Webhook;
 using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Web.Common.Models;
 
 namespace Umbraco.Cms.Api.Management.Factories;
 
diff --git a/src/Umbraco.Web.BackOffice/Install/CreateUnattendedUserNotificationHandler.cs b/src/Umbraco.Cms.Api.Management/Install/CreateUnattendedUserNotificationHandler.cs
similarity index 95%
rename from src/Umbraco.Web.BackOffice/Install/CreateUnattendedUserNotificationHandler.cs
rename to src/Umbraco.Cms.Api.Management/Install/CreateUnattendedUserNotificationHandler.cs
index 11648a2618..a1ee165da7 100644
--- a/src/Umbraco.Web.BackOffice/Install/CreateUnattendedUserNotificationHandler.cs
+++ b/src/Umbraco.Cms.Api.Management/Install/CreateUnattendedUserNotificationHandler.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
@@ -10,7 +10,7 @@ using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Web.BackOffice.Install;
+namespace Umbraco.Cms.Api.Management.Install;
 
 public class CreateUnattendedUserNotificationHandler : INotificationAsyncHandler<UnattendedInstallNotification>
 {
@@ -18,8 +18,7 @@ public class CreateUnattendedUserNotificationHandler : INotificationAsyncHandler
     private readonly IOptions<UnattendedSettings> _unattendedSettings;
     private readonly IUserService _userService;
 
-    public CreateUnattendedUserNotificationHandler(IOptions<UnattendedSettings> unattendedSettings,
-        IUserService userService, IServiceScopeFactory serviceScopeFactory)
+    public CreateUnattendedUserNotificationHandler(IOptions<UnattendedSettings> unattendedSettings, IUserService userService, IServiceScopeFactory serviceScopeFactory)
     {
         _unattendedSettings = unattendedSettings;
         _userService = userService;
diff --git a/src/Umbraco.Cms.Api.Management/ManagementApiComposer.cs b/src/Umbraco.Cms.Api.Management/ManagementApiComposer.cs
index 77f2740c1e..5e8bff68c1 100644
--- a/src/Umbraco.Cms.Api.Management/ManagementApiComposer.cs
+++ b/src/Umbraco.Cms.Api.Management/ManagementApiComposer.cs
@@ -6,6 +6,7 @@ namespace Umbraco.Cms.Api.Management;
 
 public class ManagementApiComposer : IComposer
 {
-    public void Compose(IUmbracoBuilder builder) => builder.AddUmbracoManagementApi();
+    public void Compose(IUmbracoBuilder builder) =>
+        builder.AddUmbracoManagementApi();
 }
 
diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Webhook/WebhookMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Webhook/WebhookMapDefinition.cs
deleted file mode 100644
index cc89a5b27f..0000000000
--- a/src/Umbraco.Cms.Api.Management/Mapping/Webhook/WebhookMapDefinition.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using Umbraco.Cms.Api.Management.ViewModels.Webhook;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Webhooks;
-using Umbraco.Cms.Web.Common.Models;
-
-namespace Umbraco.Cms.Web.BackOffice.Mapping;
-
-public class WebhookMapDefinition : IMapDefinition
-{
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly ILocalizedTextService _localizedTextService;
-
-    public WebhookMapDefinition(IHostingEnvironment hostingEnvironment, ILocalizedTextService localizedTextService)
-    {
-        _hostingEnvironment = hostingEnvironment;
-        _localizedTextService = localizedTextService;
-    }
-
-    public void DefineMaps(IUmbracoMapper mapper)
-    {
-        mapper.Define<IWebhookEvent, WebhookEventResponseModel>((_, _) => new WebhookEventResponseModel(), Map);
-        mapper.Define<WebhookLog, WebhookLogViewModel>((_, _) => new WebhookLogViewModel(), Map);
-        mapper.Define<CreateWebhookRequestModel, IWebhook>((_, _) => new Webhook(string.Empty), Map);
-        mapper.Define<UpdateWebhookRequestModel, IWebhook>((_, _) => new Webhook(string.Empty), Map);
-    }
-
-    // Umbraco.Code.MapAll
-    private void Map(IWebhookEvent source, WebhookEventResponseModel target, MapperContext context)
-    {
-        target.EventName = source.EventName;
-        target.EventType = source.EventType;
-        target.Alias = source.Alias;
-    }
-
-    // Umbraco.Code.MapAll -CreateDate -DeleteDate -Id -UpdateDate
-    private void Map(CreateWebhookRequestModel source, IWebhook target, MapperContext context)
-    {
-        target.Url = source.Url;
-        target.Enabled = source.Enabled;
-        target.ContentTypeKeys = source.ContentTypeKeys;
-        target.Events = source.Events;
-        target.Headers = source.Headers;
-        target.Key = source.Id ?? Guid.NewGuid();
-    }
-
-    // Umbraco.Code.MapAll -CreateDate -DeleteDate -Id -UpdateDate -Key
-    private void Map(UpdateWebhookRequestModel source, IWebhook target, MapperContext context)
-    {
-        target.Url = source.Url;
-        target.Enabled = source.Enabled;
-        target.ContentTypeKeys = source.ContentTypeKeys;
-        target.Events = source.Events;
-        target.Headers = source.Headers;
-    }
-
-    // Umbraco.Code.MapAll
-    private void Map(WebhookLog source, WebhookLogViewModel target, MapperContext context)
-    {
-        target.Date = source.Date;
-        target.EventAlias = source.EventAlias;
-        target.Key = source.Key;
-        target.RequestBody = source.RequestBody ?? string.Empty;
-        target.RetryCount = source.RetryCount;
-        target.Url = source.Url;
-        target.RequestHeaders = source.RequestHeaders;
-        target.WebhookKey = source.WebhookKey;
-
-        if (_hostingEnvironment.IsDebugMode)
-        {
-            target.ExceptionOccured = source.ExceptionOccured;
-            target.ResponseBody = source.ResponseBody;
-            target.ResponseHeaders = source.ResponseHeaders;
-            target.StatusCode = source.StatusCode;
-        }
-        else
-        {
-            target.ResponseBody = _localizedTextService.Localize("webhooks", "toggleDebug", Thread.CurrentThread.CurrentUICulture);
-            target.StatusCode = source.StatusCode is "OK (200)" ? source.StatusCode : _localizedTextService.Localize("webhooks", "statusNotOk", Thread.CurrentThread.CurrentUICulture);
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Middleware/BackOfficeExternalLoginProviderErrorMiddleware.cs b/src/Umbraco.Cms.Api.Management/Middleware/BackOfficeExternalLoginProviderErrorMiddleware.cs
similarity index 97%
rename from src/Umbraco.Web.BackOffice/Middleware/BackOfficeExternalLoginProviderErrorMiddleware.cs
rename to src/Umbraco.Cms.Api.Management/Middleware/BackOfficeExternalLoginProviderErrorMiddleware.cs
index 9dbe09e119..95128b47f7 100644
--- a/src/Umbraco.Web.BackOffice/Middleware/BackOfficeExternalLoginProviderErrorMiddleware.cs
+++ b/src/Umbraco.Cms.Api.Management/Middleware/BackOfficeExternalLoginProviderErrorMiddleware.cs
@@ -5,7 +5,7 @@ using Newtonsoft.Json;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Web.BackOffice.Middleware;
+namespace Umbraco.Cms.Api.Management.Middleware;
 
 /// <summary>
 ///     Used to handle errors registered by external login providers
diff --git a/src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerMiddleware.cs b/src/Umbraco.Cms.Api.Management/Middleware/UnhandledExceptionLoggerMiddleware.cs
similarity index 93%
rename from src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerMiddleware.cs
rename to src/Umbraco.Cms.Api.Management/Middleware/UnhandledExceptionLoggerMiddleware.cs
index 06eaf3fd30..c991937e65 100644
--- a/src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerMiddleware.cs
+++ b/src/Umbraco.Cms.Api.Management/Middleware/UnhandledExceptionLoggerMiddleware.cs
@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.Logging;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Web.BackOffice.Filters;
+namespace Umbraco.Cms.Api.Management.Middleware;
 
 /// <summary>
 ///     Logs any unhandled exception.
diff --git a/src/Umbraco.Web.BackOffice/SignalR/IPreviewHub.cs b/src/Umbraco.Cms.Api.Management/Preview/IPreviewHub.cs
similarity index 80%
rename from src/Umbraco.Web.BackOffice/SignalR/IPreviewHub.cs
rename to src/Umbraco.Cms.Api.Management/Preview/IPreviewHub.cs
index 4ba4b9fd26..fe04c028ee 100644
--- a/src/Umbraco.Web.BackOffice/SignalR/IPreviewHub.cs
+++ b/src/Umbraco.Cms.Api.Management/Preview/IPreviewHub.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Cms.Web.BackOffice.SignalR;
+namespace Umbraco.Cms.Api.Management.Preview;
 
 public interface IPreviewHub
 {
diff --git a/src/Umbraco.Web.BackOffice/SignalR/PreviewHub.cs b/src/Umbraco.Cms.Api.Management/Preview/PreviewHub.cs
similarity index 64%
rename from src/Umbraco.Web.BackOffice/SignalR/PreviewHub.cs
rename to src/Umbraco.Cms.Api.Management/Preview/PreviewHub.cs
index b5407f385c..d5cb5e4e55 100644
--- a/src/Umbraco.Web.BackOffice/SignalR/PreviewHub.cs
+++ b/src/Umbraco.Cms.Api.Management/Preview/PreviewHub.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.SignalR;
 
-namespace Umbraco.Cms.Web.BackOffice.SignalR;
+namespace Umbraco.Cms.Api.Management.Preview;
 
 public class PreviewHub : Hub<IPreviewHub>
 {
diff --git a/src/Umbraco.Web.BackOffice/SignalR/PreviewHubUpdater.cs b/src/Umbraco.Cms.Api.Management/Preview/PreviewHubUpdater.cs
similarity index 96%
rename from src/Umbraco.Web.BackOffice/SignalR/PreviewHubUpdater.cs
rename to src/Umbraco.Cms.Api.Management/Preview/PreviewHubUpdater.cs
index 104deceba2..f88c61ac4a 100644
--- a/src/Umbraco.Web.BackOffice/SignalR/PreviewHubUpdater.cs
+++ b/src/Umbraco.Cms.Api.Management/Preview/PreviewHubUpdater.cs
@@ -4,7 +4,7 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Sync;
 
-namespace Umbraco.Cms.Web.BackOffice.SignalR;
+namespace Umbraco.Cms.Api.Management.Preview;
 
 public class PreviewHubUpdater : INotificationAsyncHandler<ContentCacheRefresherNotification>
 {
diff --git a/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs b/src/Umbraco.Cms.Api.Management/Routing/BackOfficeAreaRoutes.cs
similarity index 87%
rename from src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs
rename to src/Umbraco.Cms.Api.Management/Routing/BackOfficeAreaRoutes.cs
index 24a90fa0f1..6e725d4191 100644
--- a/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs
+++ b/src/Umbraco.Cms.Api.Management/Routing/BackOfficeAreaRoutes.cs
@@ -1,19 +1,18 @@
 using System.Text;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Options;
+using Umbraco.Cms.Api.Management.Controllers.Security;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Web.Mvc;
-using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.Common.Controllers;
 using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Web.BackOffice.Routing;
+namespace Umbraco.Cms.Api.Management.Routing;
 
 /// <summary>
 ///     Creates routes for the back office area
@@ -68,27 +67,24 @@ public sealed class BackOfficeAreaRoutes : IAreaRoutes
     /// </summary>
     private void MapMinimalBackOffice(IEndpointRouteBuilder endpoints)
     {
-        endpoints.MapUmbracoRoute<BackOfficeController>(
+        endpoints.MapUmbracoRoute<BackOfficeDefaultController>(
             _umbracoPathSegment,
-            Constants.Web.Mvc.BackOfficeArea,
+            null!,
             string.Empty,
-            "Default",
+            "Index",
             false,
             // Limit the action/id to only allow characters - this is so this route doesn't hog all other
             // routes like: /umbraco/channels/word.aspx, etc...
             // (Not that we have to worry about too many of those these days, there still might be a need for these constraints).
             new { action = @"[a-zA-Z]*", id = @"[a-zA-Z]*" });
 
-        endpoints.MapUmbracoApiRoute<AuthenticationController>(_umbracoPathSegment, Constants.Web.Mvc.BackOfficeApiArea, true, string.Empty);
-
-        endpoints.MapAreaControllerRoute(
+        endpoints.MapControllerRoute(
             "catch-all-sections-to-client",
-            Constants.Web.Mvc.BackOfficeArea,
             new StringBuilder(_umbracoPathSegment).Append("/section/{**slug}").ToString(),
             new
             {
-                Controller = ControllerExtensions.GetControllerName<BackOfficeController>(),
-                Action = nameof(BackOfficeController.Default)
+                Controller = ControllerExtensions.GetControllerName<BackOfficeDefaultController>(),
+                Action = nameof(BackOfficeDefaultController.Index)
             });
     }
 
diff --git a/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs b/src/Umbraco.Cms.Api.Management/Routing/PreviewRoutes.cs
similarity index 84%
rename from src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs
rename to src/Umbraco.Cms.Api.Management/Routing/PreviewRoutes.cs
index d91a67f9f0..6f19010775 100644
--- a/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs
+++ b/src/Umbraco.Cms.Api.Management/Routing/PreviewRoutes.cs
@@ -1,16 +1,15 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Options;
+using Umbraco.Cms.Api.Management.Preview;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.BackOffice.SignalR;
 using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Web.BackOffice.Routing;
+namespace Umbraco.Cms.Api.Management.Routing;
 
 /// <summary>
 ///     Creates routes for the preview hub
@@ -37,8 +36,6 @@ public sealed class PreviewRoutes : IAreaRoutes
             case RuntimeLevel.Upgrade:
             case RuntimeLevel.Run:
                 endpoints.MapHub<PreviewHub>(GetPreviewHubRoute());
-                endpoints.MapUmbracoRoute<PreviewController>(_umbracoPathSegment, Constants.Web.Mvc.BackOfficeArea,
-                    null);
                 break;
             case RuntimeLevel.BootFailed:
             case RuntimeLevel.Unknown:
diff --git a/src/Umbraco.Web.BackOffice/Security/AutoLinkSignInResult.cs b/src/Umbraco.Cms.Api.Management/Security/AutoLinkSignInResult.cs
similarity index 95%
rename from src/Umbraco.Web.BackOffice/Security/AutoLinkSignInResult.cs
rename to src/Umbraco.Cms.Api.Management/Security/AutoLinkSignInResult.cs
index 86a8a71c76..14995bf288 100644
--- a/src/Umbraco.Web.BackOffice/Security/AutoLinkSignInResult.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/AutoLinkSignInResult.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <summary>
 ///     Result returned from signing in when auto-linking takes place
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilder.cs b/src/Umbraco.Cms.Api.Management/Security/BackOfficeAuthenticationBuilder.cs
similarity index 98%
rename from src/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilder.cs
rename to src/Umbraco.Cms.Api.Management/Security/BackOfficeAuthenticationBuilder.cs
index f4aed22fbe..f688d138bd 100644
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilder.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/BackOfficeAuthenticationBuilder.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <summary>
 ///     Custom <see cref="AuthenticationBuilder" /> used to associate external logins with umbraco external login options
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternaLoginProviderScheme.cs b/src/Umbraco.Cms.Api.Management/Security/BackOfficeExternaLoginProviderScheme.cs
similarity index 93%
rename from src/Umbraco.Web.BackOffice/Security/BackOfficeExternaLoginProviderScheme.cs
rename to src/Umbraco.Cms.Api.Management/Security/BackOfficeExternaLoginProviderScheme.cs
index 322d81c550..e716f0b748 100644
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternaLoginProviderScheme.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/BackOfficeExternaLoginProviderScheme.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Authentication;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 public class BackOfficeExternaLoginProviderScheme
 {
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProvider.cs b/src/Umbraco.Cms.Api.Management/Security/BackOfficeExternalLoginProvider.cs
similarity index 96%
rename from src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProvider.cs
rename to src/Umbraco.Cms.Api.Management/Security/BackOfficeExternalLoginProvider.cs
index eeb68fd19a..85663f683b 100644
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProvider.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/BackOfficeExternalLoginProvider.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Options;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <summary>
 ///     An external login (OAuth) provider for the back office
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs b/src/Umbraco.Cms.Api.Management/Security/BackOfficeExternalLoginProviderOptions.cs
similarity index 99%
rename from src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs
rename to src/Umbraco.Cms.Api.Management/Security/BackOfficeExternalLoginProviderOptions.cs
index 32261eefef..19a74757f8 100644
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/BackOfficeExternalLoginProviderOptions.cs
@@ -1,6 +1,6 @@
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <summary>
 ///     Options used to configure back office external login providers
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviders.cs b/src/Umbraco.Cms.Api.Management/Security/BackOfficeExternalLoginProviders.cs
similarity index 98%
rename from src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviders.cs
rename to src/Umbraco.Cms.Api.Management/Security/BackOfficeExternalLoginProviders.cs
index 75548032f4..ee620864f5 100644
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviders.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/BackOfficeExternalLoginProviders.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authentication;
 using Umbraco.Cms.Core.Security;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <inheritdoc />
 public class BackOfficeExternalLoginProviders : IBackOfficeExternalLoginProviders, ILocalLoginSettingProvider
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginsBuilder.cs b/src/Umbraco.Cms.Api.Management/Security/BackOfficeExternalLoginsBuilder.cs
similarity index 94%
rename from src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginsBuilder.cs
rename to src/Umbraco.Cms.Api.Management/Security/BackOfficeExternalLoginsBuilder.cs
index 4a15be1d54..a70a062d05 100644
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginsBuilder.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/BackOfficeExternalLoginsBuilder.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <summary>
 ///     Used to add back office login providers
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficePasswordChanger.cs b/src/Umbraco.Cms.Api.Management/Security/BackOfficePasswordChanger.cs
similarity index 92%
rename from src/Umbraco.Web.BackOffice/Security/BackOfficePasswordChanger.cs
rename to src/Umbraco.Cms.Api.Management/Security/BackOfficePasswordChanger.cs
index d4c3bfe83b..60983804f2 100644
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficePasswordChanger.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/BackOfficePasswordChanger.cs
@@ -2,9 +2,8 @@
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Web.Common.Security;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 public class BackOfficePasswordChanger : IBackOfficePasswordChanger
 {
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeSecureDataFormat.cs b/src/Umbraco.Cms.Api.Management/Security/BackOfficeSecureDataFormat.cs
similarity index 98%
rename from src/Umbraco.Web.BackOffice/Security/BackOfficeSecureDataFormat.cs
rename to src/Umbraco.Cms.Api.Management/Security/BackOfficeSecureDataFormat.cs
index a30a13722c..d2e0e799a8 100644
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeSecureDataFormat.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/BackOfficeSecureDataFormat.cs
@@ -2,7 +2,7 @@ using System.Security.Claims;
 using Microsoft.AspNetCore.Authentication;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <summary>
 ///     Custom secure format that ensures the Identity in the ticket is verified <see cref="ClaimsIdentity" />
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs b/src/Umbraco.Cms.Api.Management/Security/BackOfficeSignInManager.cs
similarity index 99%
rename from src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs
rename to src/Umbraco.Cms.Api.Management/Security/BackOfficeSignInManager.cs
index 8cbb4adb3e..e5c36cf77c 100644
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/BackOfficeSignInManager.cs
@@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DependencyInjection;
@@ -15,7 +14,7 @@ using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Web.Common.Security;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <summary>
 ///     The sign in manager for back office users
diff --git a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeIdentityOptions.cs b/src/Umbraco.Cms.Api.Management/Security/ConfigureBackOfficeIdentityOptions.cs
similarity index 84%
rename from src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeIdentityOptions.cs
rename to src/Umbraco.Cms.Api.Management/Security/ConfigureBackOfficeIdentityOptions.cs
index 211528afab..f5e85fe6e5 100644
--- a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeIdentityOptions.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/ConfigureBackOfficeIdentityOptions.cs
@@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Web.Common.DependencyInjection;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <summary>
 ///     Used to configure <see cref="BackOfficeIdentityOptions" /> for the Umbraco Back office
@@ -17,12 +17,6 @@ public sealed class ConfigureBackOfficeIdentityOptions : IConfigureOptions<BackO
     private readonly UserPasswordConfigurationSettings _userPasswordConfiguration;
     private readonly SecuritySettings _securitySettings;
 
-    [Obsolete("Use the constructor that accepts SecuritySettings. Will be removed in V13.")]
-    public ConfigureBackOfficeIdentityOptions(IOptions<UserPasswordConfigurationSettings> userPasswordConfiguration)
-        : this(userPasswordConfiguration, StaticServiceProvider.Instance.GetRequiredService<IOptions<SecuritySettings>>())
-    {
-    }
-
     public ConfigureBackOfficeIdentityOptions(
         IOptions<UserPasswordConfigurationSettings> userPasswordConfiguration,
         IOptions<SecuritySettings> securitySettings)
diff --git a/src/Umbraco.Web.BackOffice/Security/DefaultBackOfficeTwoFactorOptions.cs b/src/Umbraco.Cms.Api.Management/Security/DefaultBackOfficeTwoFactorOptions.cs
similarity index 91%
rename from src/Umbraco.Web.BackOffice/Security/DefaultBackOfficeTwoFactorOptions.cs
rename to src/Umbraco.Cms.Api.Management/Security/DefaultBackOfficeTwoFactorOptions.cs
index 7eeb51077b..53f9cac9da 100644
--- a/src/Umbraco.Web.BackOffice/Security/DefaultBackOfficeTwoFactorOptions.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/DefaultBackOfficeTwoFactorOptions.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <inheritdoc />
 public class DefaultBackOfficeTwoFactorOptions : IBackOfficeTwoFactorOptions
diff --git a/src/Umbraco.Web.BackOffice/Security/ExternalLoginSignInResult.cs b/src/Umbraco.Cms.Api.Management/Security/ExternalLoginSignInResult.cs
similarity index 86%
rename from src/Umbraco.Web.BackOffice/Security/ExternalLoginSignInResult.cs
rename to src/Umbraco.Cms.Api.Management/Security/ExternalLoginSignInResult.cs
index e35d4e632e..b543c45204 100644
--- a/src/Umbraco.Web.BackOffice/Security/ExternalLoginSignInResult.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/ExternalLoginSignInResult.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <summary>
 ///     Result returned from signing in when external logins are used.
diff --git a/src/Umbraco.Web.BackOffice/Security/ExternalSignInAutoLinkOptions.cs b/src/Umbraco.Cms.Api.Management/Security/ExternalSignInAutoLinkOptions.cs
similarity index 98%
rename from src/Umbraco.Web.BackOffice/Security/ExternalSignInAutoLinkOptions.cs
rename to src/Umbraco.Cms.Api.Management/Security/ExternalSignInAutoLinkOptions.cs
index bbf37ed8bb..c8fc4d6107 100644
--- a/src/Umbraco.Web.BackOffice/Security/ExternalSignInAutoLinkOptions.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/ExternalSignInAutoLinkOptions.cs
@@ -4,7 +4,7 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Security;
 using SecurityConstants = Umbraco.Cms.Core.Constants.Security;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <summary>
 ///     Options used to configure auto-linking external OAuth providers
diff --git a/src/Umbraco.Web.BackOffice/Security/ForgotPasswordUriProvider.cs b/src/Umbraco.Cms.Api.Management/Security/ForgotPasswordUriProvider.cs
similarity index 83%
rename from src/Umbraco.Web.BackOffice/Security/ForgotPasswordUriProvider.cs
rename to src/Umbraco.Cms.Api.Management/Security/ForgotPasswordUriProvider.cs
index f44420672e..0c43933014 100644
--- a/src/Umbraco.Web.BackOffice/Security/ForgotPasswordUriProvider.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/ForgotPasswordUriProvider.cs
@@ -7,10 +7,9 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services.OperationStatus;
-using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 public class ForgotPasswordUriProvider : IForgotPasswordUriProvider
 {
@@ -43,10 +42,11 @@ public class ForgotPasswordUriProvider : IForgotPasswordUriProvider
         string forgotPasswordToken = $"{user.Key}{WebUtility.UrlEncode("|")}{tokenAttempt.Result.ToUrlBase64()}";
 
         // FIXME: This will need to change.
-        string? action = _linkGenerator.GetPathByAction(
-            nameof(BackOfficeController.ValidatePasswordResetCode),
-            ControllerExtensions.GetControllerName<BackOfficeController>(),
-            new { area = Constants.Web.Mvc.BackOfficeArea, invite = forgotPasswordToken });
+        // string? action = _linkGenerator.GetPathByAction(
+        //     nameof(BackOfficeController.ValidatePasswordResetCode),
+        //     ControllerExtensions.GetControllerName<BackOfficeController>(),
+        //     new { area = Constants.Web.Mvc.BackOfficeArea, invite = forgotPasswordToken });
+        string action = string.Empty;
 
         Uri applicationUri = _httpContextAccessor
             .GetRequiredHttpContext()
diff --git a/src/Umbraco.Web.BackOffice/Security/IBackOfficeExternalLoginProviders.cs b/src/Umbraco.Cms.Api.Management/Security/IBackOfficeExternalLoginProviders.cs
similarity index 96%
rename from src/Umbraco.Web.BackOffice/Security/IBackOfficeExternalLoginProviders.cs
rename to src/Umbraco.Cms.Api.Management/Security/IBackOfficeExternalLoginProviders.cs
index 6d0a699f9a..288ea3e741 100644
--- a/src/Umbraco.Web.BackOffice/Security/IBackOfficeExternalLoginProviders.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/IBackOfficeExternalLoginProviders.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <summary>
 ///     Service to return <see cref="BackOfficeExternalLoginProvider" /> instances
diff --git a/src/Umbraco.Web.BackOffice/Security/IBackOfficeTwoFactorOptions.cs b/src/Umbraco.Cms.Api.Management/Security/IBackOfficeTwoFactorOptions.cs
similarity index 90%
rename from src/Umbraco.Web.BackOffice/Security/IBackOfficeTwoFactorOptions.cs
rename to src/Umbraco.Cms.Api.Management/Security/IBackOfficeTwoFactorOptions.cs
index 792fbf237a..748eee41f8 100644
--- a/src/Umbraco.Web.BackOffice/Security/IBackOfficeTwoFactorOptions.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/IBackOfficeTwoFactorOptions.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <summary>
 ///     Options used to control 2FA for the Umbraco back office.
diff --git a/src/Umbraco.Web.BackOffice/Security/InviteUriProvider.cs b/src/Umbraco.Cms.Api.Management/Security/InviteUriProvider.cs
similarity index 83%
rename from src/Umbraco.Web.BackOffice/Security/InviteUriProvider.cs
rename to src/Umbraco.Cms.Api.Management/Security/InviteUriProvider.cs
index 8226848604..b5b9c51cab 100644
--- a/src/Umbraco.Web.BackOffice/Security/InviteUriProvider.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/InviteUriProvider.cs
@@ -7,10 +7,9 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services.OperationStatus;
-using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 public class InviteUriProvider : IInviteUriProvider
 {
@@ -43,10 +42,11 @@ public class InviteUriProvider : IInviteUriProvider
         string inviteToken = $"{invitee.Key}{WebUtility.UrlEncode("|")}{tokenAttempt.Result.ToUrlBase64()}";
 
         // FIXME: This will need to change.
-        string? action = _linkGenerator.GetPathByAction(
-            nameof(BackOfficeController.VerifyInvite),
-            ControllerExtensions.GetControllerName<BackOfficeController>(),
-            new { area = Constants.Web.Mvc.BackOfficeArea, invite = inviteToken });
+        // string? action = _linkGenerator.GetPathByAction(
+        //     nameof(BackOfficeController.VerifyInvite),
+        //     ControllerExtensions.GetControllerName<BackOfficeController>(),
+        //     new { area = Constants.Web.Mvc.BackOfficeArea, invite = inviteToken });
+        string action = string.Empty;
 
         Uri applicationUri = _httpContextAccessor
             .GetRequiredHttpContext()
diff --git a/src/Umbraco.Web.BackOffice/Security/TwoFactorLoginViewOptions.cs b/src/Umbraco.Cms.Api.Management/Security/TwoFactorLoginViewOptions.cs
similarity index 86%
rename from src/Umbraco.Web.BackOffice/Security/TwoFactorLoginViewOptions.cs
rename to src/Umbraco.Cms.Api.Management/Security/TwoFactorLoginViewOptions.cs
index b5487b249e..44cc9db3a7 100644
--- a/src/Umbraco.Web.BackOffice/Security/TwoFactorLoginViewOptions.cs
+++ b/src/Umbraco.Cms.Api.Management/Security/TwoFactorLoginViewOptions.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Api.Management.Security;
 
 /// <summary>
 ///     Options used as named options for 2fa providers
diff --git a/src/Umbraco.Web.BackOffice/Services/ConflictingRouteService.cs b/src/Umbraco.Cms.Api.Management/Services/ConflictingRouteService.cs
similarity index 91%
rename from src/Umbraco.Web.BackOffice/Services/ConflictingRouteService.cs
rename to src/Umbraco.Cms.Api.Management/Services/ConflictingRouteService.cs
index 86bc607edb..322096c89b 100644
--- a/src/Umbraco.Web.BackOffice/Services/ConflictingRouteService.cs
+++ b/src/Umbraco.Cms.Api.Management/Services/ConflictingRouteService.cs
@@ -1,8 +1,8 @@
 using System.Reflection;
+using Umbraco.Cms.Api.Management.Controllers;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Controllers;
 
 namespace Umbraco.Cms.Web.BackOffice.Services;
 
@@ -18,7 +18,7 @@ public class ConflictingRouteService : IConflictingRouteService
     /// <inheritdoc />
     public bool HasConflictingRoutes(out string controllerName)
     {
-        var controllers = _typeLoader.GetTypes<UmbracoApiControllerBase>().ToList();
+        var controllers = _typeLoader.GetTypes<ManagementApiControllerBase>().ToList();
         foreach (Type controller in controllers)
         {
             Type[] potentialConflicting = controllers.Where(x => x.Name == controller.Name).ToArray();
diff --git a/src/Umbraco.Web.BackOffice/Telemetry/ExternalLoginTelemetryProvider.cs b/src/Umbraco.Cms.Api.Management/Telemetry/ExternalLoginTelemetryProvider.cs
similarity index 76%
rename from src/Umbraco.Web.BackOffice/Telemetry/ExternalLoginTelemetryProvider.cs
rename to src/Umbraco.Cms.Api.Management/Telemetry/ExternalLoginTelemetryProvider.cs
index 21a59796b3..6778ad6de3 100644
--- a/src/Umbraco.Web.BackOffice/Telemetry/ExternalLoginTelemetryProvider.cs
+++ b/src/Umbraco.Cms.Api.Management/Telemetry/ExternalLoginTelemetryProvider.cs
@@ -1,13 +1,14 @@
-using Umbraco.Cms.Core;
+using Umbraco.Cms.Api.Management.Security;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Infrastructure.Telemetry.Interfaces;
-using Umbraco.Cms.Web.BackOffice.Security;
 
-namespace Umbraco.Cms.Web.BackOffice.Telemetry;
+namespace Umbraco.Cms.Api.Management.Telemetry;
 
 public class ExternalLoginTelemetryProvider : IDetailedTelemetryProvider
 {
-    private readonly IBackOfficeExternalLoginProviders _externalLoginProviders;
+    private readonly
+        IBackOfficeExternalLoginProviders _externalLoginProviders;
 
     public ExternalLoginTelemetryProvider(IBackOfficeExternalLoginProviders externalLoginProviders)
     {
diff --git a/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj
index 1ff599251b..58d8a0e4e9 100644
--- a/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj
+++ b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj
@@ -9,23 +9,16 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <ProjectReference Include="..\Umbraco.Cms.Api.Management\Umbraco.Cms.Api.Management.csproj" />
-    <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
     <ProjectReference Include="..\Umbraco.Web.Website\Umbraco.Web.Website.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
     <BasePath>$(ProjectDir)wwwroot\umbraco</BasePath>
-    <BellePath>$(BasePath)\lib</BellePath>
     <BellissimaPath>$(BasePath)\backoffice</BellissimaPath>
     <LoginPath>$(BasePath)\login</LoginPath>
   </PropertyGroup>
 
   <Target Name="BuildStaticAssetsPreconditions" BeforeTargets="Build">
-    <Message Text="Skip BuildBelle target because UmbracoBuild is '$(UmbracoBuild)' (this is not Visual Studio)" Importance="high" Condition="'$(UmbracoBuild)' != ''" />
-    <Message Text="Skip BuildBelle target because '$(BellePath)' already exists" Importance="high" Condition="Exists('$(BellePath)')" />
-    <Message Text="Call BuildBelle target because UmbracoBuild is empty (this is Visual Studio) and '$(BellePath)' doesn't exist" Importance="high" Condition="'$(UmbracoBuild)' == '' and !Exists('$(BellePath)')" />
-    <CallTarget Targets="BuildBelle" Condition="'$(UmbracoBuild)' == '' and !Exists('$(BellePath)')" />
-
     <Message Text="Skip BuildBellissima target because UmbracoBuild is '$(UmbracoBuild)' (this is not Visual Studio)" Importance="high" Condition="'$(UmbracoBuild)' != ''" />
     <Message Text="Skip BuildBellissima target because '$(BellissimaPath)' already exists" Importance="high" Condition="Exists('$(BellissimaPath)')" />
     <Message Text="Call BuildBellissima target because UmbracoBuild is empty (this is Visual Studio) and '$(BellissimaPath)' doesn't exist" Importance="high" Condition="'$(UmbracoBuild)' == '' and !Exists('$(BellissimaPath)')" />
@@ -37,11 +30,6 @@
     <CallTarget Targets="BuildLogin" Condition="'$(UmbracoBuild)' == '' and (!Exists('$(LoginPath)') or !Exists('$(BasePath)/auth'))" />
   </Target>
 
-  <Target Name="BuildBelle">
-    <Exec WorkingDirectory="$(ProjectDir)..\Umbraco.Web.UI.Client\" Command="npm ci --no-fund --no-audit --prefer-offline" />
-    <Exec WorkingDirectory="$(ProjectDir)..\Umbraco.Web.UI.Client\" Command="npm run build:skip-tests" />
-  </Target>
-
   <Target Name="BuildBellissima">
     <Exec WorkingDirectory="$(ProjectDir)..\Umbraco.Web.UI.New.Client\" Command="npm ci --no-fund --no-audit --prefer-offline" />
     <Exec WorkingDirectory="$(ProjectDir)..\Umbraco.Web.UI.New.Client\" Command="npm run build:for:cms" />
@@ -54,10 +42,6 @@
   </Target>
 
   <Target Name="CleanStaticAssetsPreconditions" AfterTargets="Clean" Condition="'$(UmbracoBuild)' == ''">
-    <Message Text="Skip CleanBelle target because '$(BellePath)' doesn't exist" Importance="high" Condition="!Exists('$(BellePath)')" />
-    <Message Text="Skip CleanBelle target because preserve.belle marker file exists" Importance="high" Condition="Exists('$(BellePath)') and Exists('$(SolutionDir)preserve.belle')" />
-    <Message Text="Call CleanBelle target because '$(BellePath)' exists and preserve.belle marker file doesn't exist" Importance="high" Condition="Exists('$(BellePath)') and !Exists('$(SolutionDir)preserve.belle')" />
-    <CallTarget Targets="CleanBelle" Condition="Exists('$(BellePath)') and !Exists('$(SolutionDir)preserve.belle')" />
 
     <Message Text="Skip CleanBellissima target because '$(BellissimaPath)' doesn't exist" Importance="high" Condition="!Exists('$(BellissimaPath)')" />
     <Message Text="Skip CleanBellissima target because preserve.bellissima marker file exists" Importance="high" Condition="Exists('$(BellissimaPath)') and Exists('$(SolutionDir)preserve.bellissima')" />
@@ -70,13 +54,6 @@
     <CallTarget Targets="CleanLogin" Condition="(Exists('$(LoginPath)') or Exists('$(BasePath)/auth')) and !Exists('$(SolutionDir)preserve.login')" />
   </Target>
 
-  <Target Name="CleanBelle">
-    <ItemGroup>
-      <BelleDirectories Include="$(BasePath)/js;$(BasePath)/lib;$(BasePath)/assets;$(BasePath)/views;" />
-    </ItemGroup>
-    <RemoveDir Directories="@(BelleDirectories)" />
-  </Target>
-
   <Target Name="CleanBellissima">
     <ItemGroup>
       <BellissimaDirectories Include="$(BellissimaPath);" />
diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
deleted file mode 100644
index ab45a61ed0..0000000000
--- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
+++ /dev/null
@@ -1,73 +0,0 @@
-@using Microsoft.Extensions.Options;
-@using Umbraco.Cms.Core
-@using Umbraco.Cms.Core.Configuration
-@using Umbraco.Cms.Core.Configuration.Models
-@using Umbraco.Cms.Core.Hosting
-@using Umbraco.Cms.Core.WebAssets
-@using Umbraco.Cms.Infrastructure.WebAssets
-@using Umbraco.Cms.Web.BackOffice.Controllers
-@using Umbraco.Cms.Web.BackOffice.Security
-@using Umbraco.Extensions
-@inject BackOfficeServerVariables backOfficeServerVariables
-@inject IUmbracoVersion umbracoVersion
-@inject IHostingEnvironment hostingEnvironment
-@inject IOptions<GlobalSettings> globalSettings
-@inject IBackOfficeExternalLoginProviders externalLogins
-@inject IRuntimeMinifier runtimeMinifier
-
-@{
-    var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment);
-}
-
-<!DOCTYPE html>
-
-<html lang="en">
-<head>
-    <base href="@backOfficePath.EnsureEndsWith('/')" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <title>Umbraco</title>
-
-    @Html.Raw(await runtimeMinifier.RenderCssHereAsync(BackOfficeWebAssets.UmbracoUpgradeCssBundleName))
-
-    @*Because we're lazy loading angular js, the embedded cloak style will not be loaded initially, but we need it*@
-    <style>
-        [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
-            display: none !important;
-        }
-    </style>
-
-</head>
-<body id="umbracoMainPageBody" ng-controller="Umbraco.AuthorizeUpgradeController" class="login-only">
-
-    <umb-login on-login="loginAndRedirect()"></umb-login>
-
-    <umb-notifications></umb-notifications>
-
-    @{
-        var externalLoginUrl = Url.Action("ExternalLogin", "BackOffice", new
-        {
-            area = ViewData.GetUmbracoPath(),
-            //Custom redirect URL since we don't want to just redirect to the back office since this is for authing upgrades
-            redirectUrl = Url.Action("AuthorizeUpgrade", "BackOffice")
-        });
-    }
-
-    @await Html.BareMinimumServerVariablesScriptAsync(backOfficeServerVariables)
-
-    <script type="text/javascript">
-    document.angularReady = function (app) {
-
-        @await Html.AngularValueExternalLoginInfoScriptAsync(externalLogins, ViewData.GetExternalSignInProviderErrors()!)
-        @Html.AngularValueResetPasswordCodeInfoScript(ViewData[ViewDataExtensions.TokenPasswordResetCode]!)
-
-    }
-    </script>
-
-    @*And finally we can load in our angular app*@
-    <script type="text/javascript" src="lib/lazyload-js/LazyLoad.min.js"></script>
-    <script src="@Url.GetUrlWithCacheBust("Application", "BackOffice", null!, hostingEnvironment, umbracoVersion, runtimeMinifier)"></script>
-
-</body>
-</html>
diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
deleted file mode 100644
index f8040e91b4..0000000000
--- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
+++ /dev/null
@@ -1,35 +0,0 @@
-@using System.Globalization
-@using Umbraco.Cms.Core.Manifest
-@using Umbraco.Cms.Core.Serialization
-@using Umbraco.Cms.Web.Common.Hosting
-@using Umbraco.Extensions
-@inject IBackOfficePathGenerator BackOfficePathGenerator
-@inject IPackageManifestService PackageManifestService
-@inject IJsonSerializer JsonSerializer
-
-@{
-    var backOfficePath = BackOfficePathGenerator.BackOfficePath;
-    var backOfficeAssetsPath = BackOfficePathGenerator.BackOfficeAssetsPath;
-}
-
-<!DOCTYPE html>
-<html lang="@CultureInfo.CurrentCulture.Name">
-
-<head>
-    <base href="@backOfficePath.EnsureEndsWith('/')" />
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="@backOfficeAssetsPath/assets/favicon.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Umbraco</title>
-
-    <link rel="stylesheet" href="@backOfficeAssetsPath/css/umb-css.css" />
-    <link rel="stylesheet" href="@backOfficeAssetsPath/css/uui-css.css" />
-    @await Html.BackOfficeImportMapScriptAsync(JsonSerializer, BackOfficePathGenerator, PackageManifestService)
-    <script type="module" src="@backOfficeAssetsPath/apps/app/app.element.js"></script>
-</head>
-
-<body class="uui-font uui-text" style="margin: 0; padding: 0; overflow: hidden">
-    <umb-app culture="@CultureInfo.CurrentCulture.Name"></umb-app>
-</body>
-
-</html>
diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Index.cshtml
similarity index 96%
rename from src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml
rename to src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Index.cshtml
index f8040e91b4..0ec32181ee 100644
--- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoInstall/Index.cshtml
+++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Index.cshtml
@@ -1,4 +1,5 @@
 @using System.Globalization
+@using Umbraco.Cms.Api.Management.Extensions
 @using Umbraco.Cms.Core.Manifest
 @using Umbraco.Cms.Core.Serialization
 @using Umbraco.Cms.Web.Common.Hosting
diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Preview.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Preview.cshtml
deleted file mode 100644
index 80231d3ac5..0000000000
--- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Preview.cshtml
+++ /dev/null
@@ -1,114 +0,0 @@
-@using Microsoft.Extensions.Options;
-@using Umbraco.Cms.Core.Configuration
-@using Umbraco.Cms.Core.Configuration.Models
-@using Umbraco.Cms.Core.Hosting
-@using Umbraco.Cms.Core.Logging
-@using Umbraco.Cms.Core.Services
-@using Umbraco.Cms.Core.WebAssets
-@using Umbraco.Cms.Infrastructure.WebAssets
-@using Umbraco.Cms.Web.BackOffice.Controllers
-@using Umbraco.Cms.Web.BackOffice.Security
-@using Umbraco.Extensions
-@inject IBackOfficeSignInManager SignInManager
-@inject BackOfficeServerVariables BackOfficeServerVariables
-@inject IUmbracoVersion UmbracoVersion
-@inject IHostingEnvironment HostingEnvironment
-@inject IOptions<GlobalSettings> GlobalSettings
-@inject IRuntimeMinifier RuntimeMinifier
-@inject IProfilerHtml ProfilerHtml
-@inject ILocalizedTextService LocalizedTextService
-
-@model Umbraco.Cms.Core.Editors.BackOfficePreviewModel
-@{
-    var disableDevicePreview = Model?.DisableDevicePreview.ToString().ToLowerInvariant();
-
-    var EndLabel = LocalizedTextService.Localize("preview", "endLabel");
-    var EndTitle = LocalizedTextService.Localize("preview", "endTitle");
-    var OpenWebsiteLabel = LocalizedTextService.Localize("preview", "openWebsiteLabel");
-    var OpenWebsiteTitle = LocalizedTextService.Localize("preview", "openWebsiteTitle");
-    var returnToPreviewHeadline = LocalizedTextService.Localize("preview", "returnToPreviewHeadline");
-    var returnToPreviewDescription = LocalizedTextService.Localize("preview", "returnToPreviewDescription");
-    var returnToPreviewAcceptButton = LocalizedTextService.Localize("preview", "returnToPreviewAcceptButton");
-    var returnToPreviewDeclineButton = LocalizedTextService.Localize("preview", "returnToPreviewDeclineButton");
-}
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>Umbraco Preview</title>
-    <meta name="robots" content="noindex, nofollow">
-    <meta name="pinterest" content="nopin" />
-
-    @Html.Raw(await RuntimeMinifier.RenderCssHereAsync(BackOfficeWebAssets.UmbracoPreviewCssBundleName))
-
-    <script type="text/javascript">
-        window.umbLocalizedVars = {
-            'returnToPreviewHeadline': '@returnToPreviewHeadline',
-            'returnToPreviewDescription':'@returnToPreviewDescription',
-            'returnToPreviewAcceptButton':'@returnToPreviewAcceptButton',
-            'returnToPreviewDeclineButton':'@returnToPreviewDeclineButton'
-        };
-    </script>
-</head>
-<body id="canvasdesignerPanel" ng-mouseover="outlinePositionHide()" ng-controller="previewController" ng-class="{'tabbing-active': tabbingActive === true}" ng-click="windowClickHandler($event)">
-    <div class="wait" ng-show="!frameLoaded"></div>
-
-    @if (!string.IsNullOrWhiteSpace(Model?.PreviewExtendedHeaderView))
-    {
-        @await Html.PartialAsync(Model.PreviewExtendedHeaderView)
-    }
-
-    <div id="demo-iframe-wrapper" class="{{previewDevice.css}}">
-        <preview-i-frame src="pageUrl" on-loaded="onFrameLoaded(iframe)"></preview-i-frame>
-    </div>
-    <div class="canvasdesigner" ng-init="showDevicesPreview = true; showDevices = !@(disableDevicePreview);" ng-mouseenter="positionSelectedHide()">
-        <div class="menu-bar selected">
-
-            <div class="menu-bar__title">Preview Mode</div>
-
-            <div class="menu-bar__right-part">
-
-                <div class="preview-menu-option" ng-class="{'--open': sizeOpen === true}" ng-click="$event.stopPropagation()">
-                    <button class="menu-bar__button umb-outline" ng-click="toggleSizeOpen()"><i class="icon {{previewDevice.icon}}"></i><span>{{previewDevice.title}}</span></button>
-                    <div class="dropdown-menu">
-                        <button ng-repeat="device in devices" class="menu-bar__button umb-outline" ng-class="{ '--active':previewDevice === device }" ng-click="updatePreviewDevice(device)">
-                            <i class="icon {{device.icon}}"></i><span>{{device.title}}</span>
-                        </button>
-                    </div>
-                </div>
-
-                @if (Model?.Languages.Any() == true)
-                {
-                    <div class="preview-menu-option" ng-class="{'--open': cultureOpen === true}" ng-click="$event.stopPropagation()">
-                        <button class="menu-bar__button umb-outline" ng-click="toggleCultureOpen()"><i class="icon icon-globe-europe---africa"></i><span>{{currentCulture.title}}</span></button>
-                        <div class="dropdown-menu">
-                            @foreach (var language in Model.Languages)
-                            {
-                                <button class="menu-bar__button umb-outline" ng-class="{ '--active': currentCultureIso === '@language.IsoCode' || (@language.IsDefault.ToString().ToLower() && currentCultureIso === null) }" ng-click="changeCulture('@language.IsoCode')" ng-init="registerCulture('@language.IsoCode', '@language.CultureName', @language.IsDefault.ToString().ToLower())">
-                                    <i class="icon icon-globe-europe---africa"></i><span>@language.CultureName</span>
-                                </button>
-                            }
-                        </div>
-                    </div>
-                }
-
-                <button ng-click="openInBrowser()" title="@OpenWebsiteTitle" class="menu-bar__button umb-outline">
-                    <i class="icon icon-out"></i><span>@OpenWebsiteLabel</span>
-                </button>
-
-                <button ng-click="exitPreview()" title="@EndTitle" class="menu-bar__button umb-outline">
-                    <i class="icon icon-power"></i><span>@EndLabel</span>
-                </button>
-
-            </div>
-        </div>
-
-    </div>
-
-    @await Html.BareMinimumServerVariablesScriptAsync(BackOfficeServerVariables)
-
-    <script src="../lib/lazyload-js/LazyLoad.min.js"></script>
-    <script src="@Url.GetUrlWithCacheBust("Application", "Preview", null!, HostingEnvironment, UmbracoVersion, RuntimeMinifier)"></script>
-
-</body>
-</html>
diff --git a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs
index f08ab2abe5..1c2caeb9bc 100644
--- a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs
+++ b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs
@@ -152,9 +152,9 @@ public class ContentSettings
     internal const string StaticMacroErrors = "Inline";
     internal const string StaticDisallowedUploadFiles = "ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,xamlx";
     internal const bool StaticShowDeprecatedPropertyEditors = false;
-    internal const string StaticLoginBackgroundImage = "assets/img/login.jpg";
-    internal const string StaticLoginLogoImage = "assets/img/application/umbraco_logo_blue.svg";
-    internal const string StaticLoginLogoImageAlternative = "assets/img/application/umbraco_logo_blue.svg";
+    internal const string StaticLoginBackgroundImage = "login/login.jpg";
+    internal const string StaticLoginLogoImage = "login/logo_dark.svg";
+    internal const string StaticLoginLogoImageAlternative = "login/logo_light.svg";
     internal const bool StaticHideBackOfficeLogo = false;
     internal const bool StaticDisableDeleteWhenReferenced = false;
     internal const bool StaticDisableUnpublishWhenReferenced = false;
diff --git a/src/Umbraco.Core/Constants-Security.cs b/src/Umbraco.Core/Constants-Security.cs
index b406b52731..ca8d5efb25 100644
--- a/src/Umbraco.Core/Constants-Security.cs
+++ b/src/Umbraco.Core/Constants-Security.cs
@@ -77,11 +77,6 @@ public static partial class Constants
         public const string BackOfficeTokenAuthenticationType = "UmbracoBackOfficeToken";
         public const string BackOfficeTwoFactorAuthenticationType = "UmbracoTwoFactorCookie";
         public const string BackOfficeTwoFactorRememberMeAuthenticationType = "UmbracoTwoFactorRememberMeCookie";
-        // FIXME: remove this in favor of BackOfficeAuthenticationType when the old backoffice auth is no longer necessary
-        public const string NewBackOfficeAuthenticationType = "NewUmbracoBackOffice";
-        public const string NewBackOfficeExternalAuthenticationType = "NewUmbracoExternalCookie";
-        public const string NewBackOfficeTwoFactorAuthenticationType = "NewUmbracoTwoFactorCookie";
-        public const string NewBackOfficeTwoFactorRememberMeAuthenticationType = "NewUmbracoTwoFactorRememberMeCookie";
         public const string EmptyPasswordPrefix = "___UIDEMPTYPWORD__";
 
         public const string DefaultMemberTypeAlias = "Member";
diff --git a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs
index 3b00039812..d4467fa3ea 100644
--- a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs
+++ b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs
@@ -97,7 +97,6 @@ public static partial class UmbracoBuilderExtensions
             .Append<Hulu>()
             .Append<Giphy>()
             .Append<LottieFiles>();
-        builder.SearchableTrees().Add(() => builder.TypeLoader.GetTypes<ISearchableTree>());
         builder.BackOfficeAssets();
         builder.SelectorHandlers().Add(() => builder.TypeLoader.GetTypes<ISelectorHandler>());
         builder.FilterHandlers().Add(() => builder.TypeLoader.GetTypes<IFilterHandler>());
@@ -245,12 +244,6 @@ public static partial class UmbracoBuilderExtensions
     public static EmbedProvidersCollectionBuilder EmbedProviders(this IUmbracoBuilder builder)
         => builder.WithCollectionBuilder<EmbedProvidersCollectionBuilder>();
 
-    /// <summary>
-    /// Gets the back office searchable tree collection builder
-    /// </summary>
-    public static SearchableTreeCollectionBuilder SearchableTrees(this IUmbracoBuilder builder)
-        => builder.WithCollectionBuilder<SearchableTreeCollectionBuilder>();
-
     /// <summary>
     /// Gets the back office custom assets collection builder
     /// </summary>
diff --git a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
index 08586120c0..c211b54c1f 100644
--- a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
+++ b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
@@ -217,7 +217,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
 
             Services.AddUnique<IEventMessagesFactory, DefaultEventMessagesFactory>();
             Services.AddUnique<IEventMessagesAccessor, HybridEventMessagesAccessor>();
-            Services.AddUnique<ITreeService, TreeService>();
+
             Services.AddUnique<ISmsSender, NotImplementedSmsSender>();
             Services.AddUnique<IEmailSender, NotImplementedEmailSender>();
 
@@ -369,7 +369,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
             Services.AddUnique<IWebhookLogService, WebhookLogService>();
             Services.AddUnique<IWebhookLogFactory, WebhookLogFactory>();
             Services.AddUnique<IWebhookRequestService, WebhookRequestService>();
-            
+
             // Data type configuration cache
             Services.AddUnique<IDataTypeConfigurationCache, DataTypeConfigurationCache>();
             Services.AddNotificationHandler<DataTypeCacheRefresherNotification, DataTypeConfigurationCacheRefresher>();
diff --git a/src/Umbraco.Core/Models/Mapping/ContentPropertyMapDefinition.cs b/src/Umbraco.Core/Models/Mapping/ContentPropertyMapDefinition.cs
index e5416420a4..42eebd29e2 100644
--- a/src/Umbraco.Core/Models/Mapping/ContentPropertyMapDefinition.cs
+++ b/src/Umbraco.Core/Models/Mapping/ContentPropertyMapDefinition.cs
@@ -7,6 +7,7 @@ using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Models.Mapping;
 
@@ -20,6 +21,9 @@ public class ContentPropertyMapDefinition : IMapDefinition
     private readonly ContentPropertyBasicMapper<ContentPropertyBasic> _contentPropertyBasicConverter;
     private readonly ContentPropertyDisplayMapper _contentPropertyDisplayMapper;
     private readonly ContentPropertyDtoMapper _contentPropertyDtoConverter;
+    private readonly CommonMapper _commonMapper;
+    private readonly ContentBasicSavedStateMapper<ContentPropertyBasic> _basicStateMapper;
+
 
     public ContentPropertyMapDefinition(
         ICultureDictionary cultureDictionary,
@@ -28,8 +32,10 @@ public class ContentPropertyMapDefinition : IMapDefinition
         ILocalizedTextService textService,
         ILoggerFactory loggerFactory,
         PropertyEditorCollection propertyEditors,
-        IDataTypeConfigurationCache dataTypeConfigurationCache)
+        CommonMapper commonMapper)
     {
+        _commonMapper = commonMapper;
+        _basicStateMapper = new ContentBasicSavedStateMapper<ContentPropertyBasic>();
         _contentPropertyBasicConverter = new ContentPropertyBasicMapper<ContentPropertyBasic>(
             dataTypeService,
             entityService,
@@ -49,24 +55,6 @@ public class ContentPropertyMapDefinition : IMapDefinition
             propertyEditors);
     }
 
-    [Obsolete("Please use constructor that takes an IDataTypeConfigurationCache. Will be removed in V14.")]
-    public ContentPropertyMapDefinition(
-        ICultureDictionary cultureDictionary,
-        IDataTypeService dataTypeService,
-        IEntityService entityService,
-        ILocalizedTextService textService,
-        ILoggerFactory loggerFactory,
-        PropertyEditorCollection propertyEditors)
-        : this(
-            cultureDictionary,
-            dataTypeService,
-            entityService,
-            textService,
-            loggerFactory,
-            propertyEditors,
-            StaticServiceProvider.Instance.GetRequiredService<IDataTypeConfigurationCache>())
-    { }
-
     public void DefineMaps(IUmbracoMapper mapper)
     {
         mapper.Define<PropertyGroup, Tab<ContentPropertyDisplay>>(
@@ -74,6 +62,8 @@ public class ContentPropertyMapDefinition : IMapDefinition
         mapper.Define<IProperty, ContentPropertyBasic>((source, context) => new ContentPropertyBasic(), Map);
         mapper.Define<IProperty, ContentPropertyDto>((source, context) => new ContentPropertyDto(), Map);
         mapper.Define<IProperty, ContentPropertyDisplay>((source, context) => new ContentPropertyDisplay(), Map);
+        mapper.Define<IContent, ContentItemBasic<ContentPropertyBasic>>((source, context) => new ContentItemBasic<ContentPropertyBasic>(), Map);
+        mapper.Define<IContent, ContentPropertyCollectionDto>((source, context) => new ContentPropertyCollectionDto(), Map);
     }
 
     // Umbraco.Code.MapAll -Properties -Alias -Expanded
@@ -101,4 +91,81 @@ public class ContentPropertyMapDefinition : IMapDefinition
 
         // assume this is mapping everything and no MapAll is required
         _contentPropertyDisplayMapper.Map(source, target, context);
+
+    // Umbraco.Code.MapAll -Alias
+    private void Map(IContent source, ContentItemBasic<ContentPropertyBasic> target, MapperContext context)
+    {
+        target.ContentTypeId = source.ContentType.Id;
+        target.ContentTypeAlias = source.ContentType.Alias;
+        target.CreateDate = source.CreateDate;
+        target.Edited = source.Edited;
+        target.Icon = source.ContentType.Icon;
+        target.Id = source.Id;
+        target.Key = source.Key;
+        target.Name = GetName(source, context);
+        target.Owner = _commonMapper.GetOwner(source, context);
+        target.ParentId = source.ParentId;
+        target.Path = source.Path;
+        target.Properties = context.MapEnumerable<IProperty, ContentPropertyBasic>(source.Properties).WhereNotNull();
+        target.SortOrder = source.SortOrder;
+        target.State = _basicStateMapper.Map(source, context);
+        target.Trashed = source.Trashed;
+        target.Udi =
+            Udi.Create(source.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document, source.Key);
+        target.UpdateDate = GetUpdateDate(source, context);
+        target.Updater = _commonMapper.GetCreator(source, context);
+        target.VariesByCulture = source.ContentType.VariesByCulture();
+    }
+
+    // Umbraco.Code.MapAll
+    private static void Map(IContent source, ContentPropertyCollectionDto target, MapperContext context) =>
+        target.Properties = context.MapEnumerable<IProperty, ContentPropertyDto>(source.Properties).WhereNotNull();
+
+    private string? GetName(IContent source, MapperContext context)
+    {
+        // invariant = only 1 name
+        if (!source.ContentType.VariesByCulture())
+        {
+            return source.Name;
+        }
+
+        // variant = depends on culture
+        var culture = context.GetCulture();
+
+        // if there's no culture here, the issue is somewhere else (UI, whatever) - throw!
+        if (culture == null)
+        {
+            throw new InvalidOperationException("Missing culture in mapping options.");
+        }
+
+        // if we don't have a name for a culture, it means the culture is not available, and
+        // hey we should probably not be mapping it, but it's too late, return a fallback name
+        return source.CultureInfos is not null &&
+               source.CultureInfos.TryGetValue(culture, out ContentCultureInfos name) && !name.Name.IsNullOrWhiteSpace()
+            ? name.Name
+            : $"({source.Name})";
+    }
+
+    private DateTime GetUpdateDate(IContent source, MapperContext context)
+    {
+        // invariant = global date
+        if (!source.ContentType.VariesByCulture())
+        {
+            return source.UpdateDate;
+        }
+
+        // variant = depends on culture
+        var culture = context.GetCulture();
+
+        // if there's no culture here, the issue is somewhere else (UI, whatever) - throw!
+        if (culture == null)
+        {
+            throw new InvalidOperationException("Missing culture in mapping options.");
+        }
+
+        // if we don't have a date for a culture, it means the culture is not available, and
+        // hey we should probably not be mapping it, but it's too late, return a fallback date
+        DateTime? date = source.GetUpdateDate(culture);
+        return date ?? source.UpdateDate;
+    }
 }
diff --git a/src/Umbraco.Core/Models/Mapping/MediaMapDefinition.cs b/src/Umbraco.Core/Models/Mapping/MediaMapDefinition.cs
new file mode 100644
index 0000000000..7a37562a82
--- /dev/null
+++ b/src/Umbraco.Core/Models/Mapping/MediaMapDefinition.cs
@@ -0,0 +1,50 @@
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Core.Models.Mapping;
+
+/// <summary>
+///     Declares model mappings for media.
+/// </summary>
+public class MediaMapDefinition : IMapDefinition
+{
+    private readonly CommonMapper _commonMapper;
+
+    public MediaMapDefinition(CommonMapper commonMapper)
+    {
+        _commonMapper = commonMapper;
+    }
+
+    public void DefineMaps(IUmbracoMapper mapper)
+    {
+        mapper.Define<IMedia, ContentPropertyCollectionDto>((source, context) => new ContentPropertyCollectionDto(), Map);
+        mapper.Define<IMedia, ContentItemBasic<ContentPropertyBasic>>((source, context) => new ContentItemBasic<ContentPropertyBasic>(), Map);
+    }
+
+    // Umbraco.Code.MapAll
+    private static void Map(IMedia source, ContentPropertyCollectionDto target, MapperContext context) =>
+        target.Properties = context.MapEnumerable<IProperty, ContentPropertyDto>(source.Properties).WhereNotNull();
+
+    // Umbraco.Code.MapAll -Edited -Updater -Alias
+    private void Map(IMedia source, ContentItemBasic<ContentPropertyBasic> target, MapperContext context)
+    {
+        target.ContentTypeId = source.ContentType.Id;
+        target.ContentTypeAlias = source.ContentType.Alias;
+        target.CreateDate = source.CreateDate;
+        target.Icon = source.ContentType.Icon;
+        target.Id = source.Id;
+        target.Key = source.Key;
+        target.Name = source.Name;
+        target.Owner = _commonMapper.GetOwner(source, context);
+        target.ParentId = source.ParentId;
+        target.Path = source.Path;
+        target.Properties = context.MapEnumerable<IProperty, ContentPropertyBasic>(source.Properties).WhereNotNull();
+        target.SortOrder = source.SortOrder;
+        target.State = null;
+        target.Trashed = source.Trashed;
+        target.Udi = Udi.Create(Constants.UdiEntityType.Media, source.Key);
+        target.UpdateDate = source.UpdateDate;
+        target.VariesByCulture = source.ContentType.VariesByCulture();
+    }
+}
diff --git a/src/Umbraco.Core/Models/Mapping/MemberMapDefinition.cs b/src/Umbraco.Core/Models/Mapping/MemberMapDefinition.cs
index 8444d5bd0a..cff81c7fa9 100644
--- a/src/Umbraco.Core/Models/Mapping/MemberMapDefinition.cs
+++ b/src/Umbraco.Core/Models/Mapping/MemberMapDefinition.cs
@@ -1,13 +1,23 @@
 using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.Models.Mapping;
 
 /// <inheritdoc />
 public class MemberMapDefinition : IMapDefinition
 {
+    private readonly CommonMapper _commonMapper;
+
+    public MemberMapDefinition(CommonMapper commonMapper) => _commonMapper = commonMapper;
+
     /// <inheritdoc />
-    public void DefineMaps(IUmbracoMapper mapper) => mapper.Define<MemberSave, IMember>(Map);
+    public void DefineMaps(IUmbracoMapper mapper)
+    {
+        mapper.Define<MemberSave, IMember>(Map);
+        mapper.Define<IMember, MemberBasic>((source, context) => new MemberBasic(), Map);
+        mapper.Define<IMember, ContentPropertyCollectionDto>((source, context) => new ContentPropertyCollectionDto(), Map);
+    }
 
     private static void Map(MemberSave source, IMember target, MapperContext context)
     {
@@ -28,4 +38,36 @@ public class MemberMapDefinition : IMapDefinition
 
         // TODO: add groups as required
     }
+
+    // Umbraco.Code.MapAll -Trashed -Edited -Updater -Alias -VariesByCulture
+    private void Map(IMember source, MemberBasic target, MapperContext context)
+    {
+        target.ContentTypeId = source.ContentType.Id;
+        target.ContentTypeAlias = source.ContentType.Alias;
+        target.CreateDate = source.CreateDate;
+        target.Email = source.Email;
+        target.Icon = source.ContentType.Icon;
+        target.Id = int.MaxValue;
+        target.Key = source.Key;
+        target.Name = source.Name;
+        target.Owner = _commonMapper.GetOwner(source, context);
+        target.ParentId = source.ParentId;
+        target.Path = source.Path;
+        target.Properties = context.MapEnumerable<IProperty, ContentPropertyBasic>(source.Properties).WhereNotNull();
+        target.SortOrder = source.SortOrder;
+        target.State = null;
+        target.Udi = Udi.Create(Constants.UdiEntityType.Member, source.Key);
+        target.UpdateDate = source.UpdateDate;
+        target.Username = source.Username;
+        target.FailedPasswordAttempts = source.FailedPasswordAttempts;
+        target.Approved = source.IsApproved;
+        target.LockedOut = source.IsLockedOut;
+        target.LastLockoutDate = source.LastLockoutDate;
+        target.LastLoginDate = source.LastLoginDate;
+        target.LastPasswordChangeDate = source.LastPasswordChangeDate;
+    }
+
+    // Umbraco.Code.MapAll
+    private static void Map(IMember source, ContentPropertyCollectionDto target, MapperContext context) =>
+        target.Properties = context.MapEnumerable<IProperty, ContentPropertyDto>(source.Properties).WhereNotNull();
 }
diff --git a/src/Umbraco.Core/Security/BackOfficeAuthenticationTypeSettings.cs b/src/Umbraco.Core/Security/BackOfficeAuthenticationTypeSettings.cs
index c0b1112ef3..fc102ce95e 100644
--- a/src/Umbraco.Core/Security/BackOfficeAuthenticationTypeSettings.cs
+++ b/src/Umbraco.Core/Security/BackOfficeAuthenticationTypeSettings.cs
@@ -4,8 +4,8 @@ namespace Umbraco.Cms.Core.Security;
 
 public class BackOfficeAuthenticationTypeSettings
 {
-    public string AuthenticationType { get; set; } = Constants.Security.NewBackOfficeAuthenticationType;
-    public string ExternalAuthenticationType { get; set; } = Constants.Security.NewBackOfficeExternalAuthenticationType;
-    public string TwoFactorAuthenticationType { get; set; } = Constants.Security.NewBackOfficeTwoFactorAuthenticationType;
-    public string TwoFactorRememberMeAuthenticationType { get; set; } = Constants.Security.NewBackOfficeTwoFactorRememberMeAuthenticationType;
+    public string AuthenticationType { get; set; } = Constants.Security.BackOfficeAuthenticationType;
+    public string ExternalAuthenticationType { get; set; } = Constants.Security.BackOfficeExternalAuthenticationType;
+    public string TwoFactorAuthenticationType { get; set; } = Constants.Security.BackOfficeTwoFactorAuthenticationType;
+    public string TwoFactorRememberMeAuthenticationType { get; set; } = Constants.Security.BackOfficeTwoFactorRememberMeAuthenticationType;
 }
diff --git a/src/Umbraco.Core/Services/IIconService.cs b/src/Umbraco.Core/Services/IIconService.cs
deleted file mode 100644
index 8aff7e8920..0000000000
--- a/src/Umbraco.Core/Services/IIconService.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Umbraco.Cms.Core.Models;
-
-namespace Umbraco.Cms.Core.Services;
-
-public interface IIconService
-{
-    /// <summary>
-    ///     Gets the svg string for the icon name found at the global icons path
-    /// </summary>
-    /// <param name="iconName"></param>
-    /// <returns></returns>
-    IconModel? GetIcon(string iconName);
-
-    /// <summary>
-    ///     Gets a list of all svg icons found at at the global icons path.
-    /// </summary>
-    /// <returns></returns>
-    IReadOnlyDictionary<string, string>? GetIcons();
-}
diff --git a/src/Umbraco.Core/Services/ITreeService.cs b/src/Umbraco.Core/Services/ITreeService.cs
deleted file mode 100644
index d61fca066a..0000000000
--- a/src/Umbraco.Core/Services/ITreeService.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Umbraco.Cms.Core.Trees;
-
-namespace Umbraco.Cms.Core.Services;
-
-/// <summary>
-///     Represents a service which manages section trees.
-/// </summary>
-public interface ITreeService
-{
-    /// <summary>
-    ///     Gets a tree.
-    /// </summary>
-    /// <param name="treeAlias">The tree alias.</param>
-    Tree? GetByAlias(string treeAlias);
-
-    /// <summary>
-    ///     Gets all trees.
-    /// </summary>
-    IEnumerable<Tree> GetAll(TreeUse use = TreeUse.Main);
-
-    /// <summary>
-    ///     Gets all trees for a section.
-    /// </summary>
-    IEnumerable<Tree> GetBySection(string sectionAlias, TreeUse use = TreeUse.Main);
-
-    /// <summary>
-    ///     Gets all trees for a section, grouped.
-    /// </summary>
-    IDictionary<string, IEnumerable<Tree>> GetBySectionGrouped(string sectionAlias, TreeUse use = TreeUse.Main);
-}
diff --git a/src/Umbraco.Core/Services/TreeService.cs b/src/Umbraco.Core/Services/TreeService.cs
deleted file mode 100644
index 3b2b5f3618..0000000000
--- a/src/Umbraco.Core/Services/TreeService.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Core.Services;
-
-/// <summary>
-///     Implements <see cref="ITreeService" />.
-/// </summary>
-public class TreeService : ITreeService
-{
-    private readonly TreeCollection _treeCollection;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="TreeService" /> class.
-    /// </summary>
-    /// <param name="treeCollection"></param>
-    public TreeService(TreeCollection treeCollection) => _treeCollection = treeCollection;
-
-    /// <inheritdoc />
-    public Tree? GetByAlias(string treeAlias) => _treeCollection.FirstOrDefault(x => x.TreeAlias == treeAlias);
-
-    /// <inheritdoc />
-    public IEnumerable<Tree> GetAll(TreeUse use = TreeUse.Main)
-
-        // use HasFlagAny: if use is Main|Dialog, we want to return Main *and* Dialog trees
-        => _treeCollection.Where(x => x.TreeUse.HasFlagAny(use));
-
-    /// <inheritdoc />
-    public IEnumerable<Tree> GetBySection(string sectionAlias, TreeUse use = TreeUse.Main)
-
-        // use HasFlagAny: if use is Main|Dialog, we want to return Main *and* Dialog trees
-        => _treeCollection.Where(x => x.SectionAlias.InvariantEquals(sectionAlias) && x.TreeUse.HasFlagAny(use))
-            .OrderBy(x => x.SortOrder).ToList();
-
-    /// <inheritdoc />
-    public IDictionary<string, IEnumerable<Tree>>
-        GetBySectionGrouped(string sectionAlias, TreeUse use = TreeUse.Main) =>
-        GetBySection(sectionAlias, use).GroupBy(x => x.TreeGroup).ToDictionary(
-            x => x.Key ?? string.Empty,
-            x => (IEnumerable<Tree>)x.ToArray());
-}
diff --git a/src/Umbraco.Core/Trees/SearchableTreeAttribute.cs b/src/Umbraco.Core/Trees/SearchableTreeAttribute.cs
deleted file mode 100644
index f3a92fe82f..0000000000
--- a/src/Umbraco.Core/Trees/SearchableTreeAttribute.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-namespace Umbraco.Cms.Core.Trees;
-
-[AttributeUsage(AttributeTargets.Class)]
-public sealed class SearchableTreeAttribute : Attribute
-{
-    public const int DefaultSortOrder = 1000;
-
-    /// <summary>
-    ///     This constructor will assume that the method name equals `format(searchResult, appAlias, treeAlias)`.
-    /// </summary>
-    /// <param name="serviceName">Name of the service.</param>
-    public SearchableTreeAttribute(string serviceName)
-        : this(serviceName, string.Empty)
-    {
-    }
-
-    /// <summary>
-    ///     This constructor defines both the Angular service and method name to use.
-    /// </summary>
-    /// <param name="serviceName">Name of the service.</param>
-    /// <param name="methodName">Name of the method.</param>
-    public SearchableTreeAttribute(string serviceName, string methodName)
-        : this(serviceName, methodName, DefaultSortOrder)
-    {
-    }
-
-    /// <summary>
-    ///     This constructor defines both the Angular service and method name to use and explicitly defines a sort order for
-    ///     the results
-    /// </summary>
-    /// <param name="serviceName">Name of the service.</param>
-    /// <param name="methodName">Name of the method.</param>
-    /// <param name="sortOrder">The sort order.</param>
-    /// <exception cref="ArgumentNullException">
-    ///     serviceName
-    ///     or
-    ///     methodName
-    /// </exception>
-    /// <exception cref="ArgumentException">Value can't be empty or consist only of white-space characters. - serviceName</exception>
-    public SearchableTreeAttribute(string serviceName, string methodName, int sortOrder)
-    {
-        if (serviceName == null)
-        {
-            throw new ArgumentNullException(nameof(serviceName));
-        }
-
-        if (string.IsNullOrWhiteSpace(serviceName))
-        {
-            throw new ArgumentException(
-                "Value can't be empty or consist only of white-space characters.",
-                nameof(serviceName));
-        }
-
-        ServiceName = serviceName;
-        MethodName = methodName ?? throw new ArgumentNullException(nameof(methodName));
-        SortOrder = sortOrder;
-    }
-
-    public string ServiceName { get; }
-
-    public string MethodName { get; }
-
-    public int SortOrder { get; }
-}
diff --git a/src/Umbraco.Core/Trees/SearchableTreeCollection.cs b/src/Umbraco.Core/Trees/SearchableTreeCollection.cs
deleted file mode 100644
index fdf2c8124b..0000000000
--- a/src/Umbraco.Core/Trees/SearchableTreeCollection.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Umbraco.Cms.Core.Composing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Core.Trees;
-
-public class SearchableTreeCollection : BuilderCollectionBase<ISearchableTree>
-{
-    private readonly Dictionary<string, SearchableApplicationTree> _dictionary;
-
-    public SearchableTreeCollection(Func<IEnumerable<ISearchableTree>> items, ITreeService treeService)
-        : base(items) =>
-        _dictionary = CreateDictionary(treeService);
-
-    public IReadOnlyDictionary<string, SearchableApplicationTree> SearchableApplicationTrees => _dictionary;
-
-    public SearchableApplicationTree this[string key] => _dictionary[key];
-
-    private Dictionary<string, SearchableApplicationTree> CreateDictionary(ITreeService treeService)
-    {
-        Tree[] appTrees = treeService.GetAll()
-            .OrderBy(x => x.SortOrder)
-            .ToArray();
-        var dictionary = new Dictionary<string, SearchableApplicationTree>(StringComparer.OrdinalIgnoreCase);
-        ISearchableTree[] searchableTrees = this.ToArray();
-        foreach (Tree appTree in appTrees)
-        {
-            ISearchableTree? found = searchableTrees.FirstOrDefault(x => x.TreeAlias.InvariantEquals(appTree.TreeAlias));
-            if (found != null)
-            {
-                SearchableTreeAttribute? searchableTreeAttribute =
-                    found.GetType().GetCustomAttribute<SearchableTreeAttribute>(false);
-                dictionary[found.TreeAlias] = new SearchableApplicationTree(
-                    appTree.SectionAlias,
-                    appTree.TreeAlias,
-                    searchableTreeAttribute?.SortOrder ?? SearchableTreeAttribute.DefaultSortOrder,
-                    searchableTreeAttribute?.ServiceName ?? string.Empty,
-                    searchableTreeAttribute?.MethodName ?? string.Empty,
-                    found);
-            }
-        }
-
-        return dictionary;
-    }
-}
diff --git a/src/Umbraco.Core/Trees/SearchableTreeCollectionBuilder.cs b/src/Umbraco.Core/Trees/SearchableTreeCollectionBuilder.cs
deleted file mode 100644
index 372866ba68..0000000000
--- a/src/Umbraco.Core/Trees/SearchableTreeCollectionBuilder.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.Composing;
-
-namespace Umbraco.Cms.Core.Trees;
-
-public class SearchableTreeCollectionBuilder : LazyCollectionBuilderBase<SearchableTreeCollectionBuilder,
-    SearchableTreeCollection, ISearchableTree>
-{
-    protected override SearchableTreeCollectionBuilder This => this;
-
-    // per request because generally an instance of ISearchableTree is a controller
-    protected override ServiceLifetime CollectionLifetime => ServiceLifetime.Scoped;
-}
diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
index 47022734fb..0c8dde608d 100644
--- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
+++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
@@ -255,21 +255,6 @@ public static partial class UmbracoBuilderExtensions
         return builder;
     }
 
-    public static IUmbracoBuilder AddLogViewer(this IUmbracoBuilder builder)
-    {
-        builder.Services.AddSingleton<ILogViewerConfig, LogViewerConfig>();
-        builder.Services.AddSingleton<ILogLevelLoader, LogLevelLoader>();
-        builder.SetLogViewer<SerilogJsonLogViewer>();
-        builder.Services.AddSingleton<ILogViewer>(factory => new SerilogJsonLogViewer(
-            factory.GetRequiredService<ILogger<SerilogJsonLogViewer>>(),
-            factory.GetRequiredService<ILogViewerConfig>(),
-            factory.GetRequiredService<ILoggingConfiguration>(),
-            factory.GetRequiredService<ILogLevelLoader>(),
-            Log.Logger));
-
-        return builder;
-    }
-
     /// <summary>
     ///     Adds logging requirements for Umbraco
     /// </summary>
diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs
index 3fb4bfbb31..204b929166 100644
--- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs
+++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs
@@ -31,6 +31,7 @@ public static partial class UmbracoBuilderExtensions
             .Add<TagMapDefinition>()
             .Add<TemplateMapDefinition>()
             .Add<UserMapDefinition>()
+            .Add<MediaMapDefinition>()
             .Add<MemberMapDefinition>()
             .Add<LanguageMapDefinition>()
             .Add<IdentityMapDefinition>();
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
index f05ed4c9bd..7949eb65db 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
@@ -150,7 +150,7 @@ public class RichTextPropertyEditor : DataEditor
                 .WhereNotNull()
                 .Select(udi => new UmbracoEntityReference(udi)));
 
-            // references from blocks
+            // references from blocksIg
             if (richTextEditorValue.Blocks is not null)
             {
                 BlockEditorData<RichTextBlockValue, RichTextBlockLayoutItem>? blockEditorData = ConvertAndClean(richTextEditorValue.Blocks);
diff --git a/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs b/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs
index cf2b36fdde..be54e3f199 100644
--- a/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs
@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -62,7 +61,7 @@ namespace Umbraco.Cms.Infrastructure.WebAssets {
         
         /// <summary>
         ///   Looks up a localized string similar to [
-        ///    
+        ///
         ///    &apos;lib/jquery/jquery.min.js&apos;,
         ///    &apos;lib/jquery-ui/jquery-ui.min.js&apos;,
         ///    &apos;lib/jquery-ui-touch-punch/jquery.ui.touch-punch.min.js&apos;,
@@ -78,7 +77,7 @@ namespace Umbraco.Cms.Infrastructure.WebAssets {
         ///    &apos;lib/angular-route/angular-route.min.js&apos;,
         ///    &apos;lib/angular-cookies/angular-cookies.min.js&apos;,
         ///    &apos;lib/angular-aria/angular-aria.min.js&apos;,
-        ///    &apos;lib/angular-touch/angular-touch [rest of string was truncated]&quot;;.
+        ///    &apos;lib/angular-touch/angular-touch.min [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string JsInitialize {
             get {
@@ -130,35 +129,20 @@ namespace Umbraco.Cms.Infrastructure.WebAssets {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to // TODO: This would be nicer as an angular module so it can be injected into stuff... that&apos;d be heaps nicer, but
-        ///// how to do that when this is not a regular JS file, it is a server side JS file and RequireJS seems to only want
-        ///// to force load JS files ?
-        ///
-        /////create the namespace (NOTE: This loads before any dependencies so we don&apos;t have a namespace mgr so we just create it manually)
-        ///var Umbraco = {};
-        ///Umbraco.Sys = {};
-        /////define a global static object
-        ///Umbraco.Sys.ServerVariables = ##Variables## ;.
-        /// </summary>
-        internal static string ServerVariables {
-            get {
-                return ResourceManager.GetString("ServerVariables", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to [
-        ///    &apos;lib/tinymce/tinymce.min.js&apos;,
+        ///  &apos;lib/tinymce/tinymce.min.js&apos;,
         ///
-        ///    &apos;lib/tinymce/plugins/anchor/plugin.min.js&apos;,
-        ///    &apos;lib/tinymce/plugins/charmap/plugin.min.js&apos;,
-        ///    &apos;lib/tinymce/plugins/table/plugin.min.js&apos;,
-        ///    &apos;lib/tinymce/plugins/lists/plugin.min.js&apos;,
-        ///    &apos;lib/tinymce/plugins/advlist/plugin.min.js&apos;,
-        ///    &apos;lib/tinymce/plugins/autolink/plugin.min.js&apos;,
-        ///    &apos;lib/tinymce/plugins/directionality/plugin.min.js&apos;,
-        ///    &apos;lib/tinymce/plugins/t [rest of string was truncated]&quot;;.
+        ///  &apos;lib/tinymce/plugins/anchor/plugin.min.js&apos;,
+        ///  &apos;lib/tinymce/plugins/charmap/plugin.min.js&apos;,
+        ///  &apos;lib/tinymce/plugins/table/plugin.min.js&apos;,
+        ///  &apos;lib/tinymce/plugins/lists/plugin.min.js&apos;,
+        ///  &apos;lib/tinymce/plugins/advlist/plugin.min.js&apos;,
+        ///  &apos;lib/tinymce/plugins/autolink/plugin.min.js&apos;,
+        ///  &apos;lib/tinymce/plugins/directionality/plugin.min.js&apos;,
+        ///  &apos;lib/tinymce/plugins/searchreplace/plugin.min.js&apos;
+        ///]
+        ///.
         /// </summary>
         internal static string TinyMceInitialize {
             get {
diff --git a/src/Umbraco.Infrastructure/WebAssets/Resources.resx b/src/Umbraco.Infrastructure/WebAssets/Resources.resx
index 476acc461b..0c0289a6f6 100644
--- a/src/Umbraco.Infrastructure/WebAssets/Resources.resx
+++ b/src/Umbraco.Infrastructure/WebAssets/Resources.resx
@@ -28,9 +28,6 @@
     <data name="PreviewInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
         <value>PreviewInitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
     </data>
-    <data name="ServerVariables" type="System.Resources.ResXFileRef, System.Windows.Forms">
-        <value>ServerVariables.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-    </data>
     <data name="TinyMceInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
         <value>TinyMceInitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
     </data>
diff --git a/src/Umbraco.Infrastructure/WebAssets/ServerVariables.js b/src/Umbraco.Infrastructure/WebAssets/ServerVariables.js
deleted file mode 100644
index 4a0017550a..0000000000
--- a/src/Umbraco.Infrastructure/WebAssets/ServerVariables.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// TODO: This would be nicer as an angular module so it can be injected into stuff... that'd be heaps nicer, but
-// how to do that when this is not a regular JS file, it is a server side JS file and RequireJS seems to only want
-// to force load JS files ?
-
-//create the namespace (NOTE: This loads before any dependencies so we don't have a namespace mgr so we just create it manually)
-var Umbraco = {};
-Umbraco.Sys = {};
-//define a global static object
-Umbraco.Sys.ServerVariables = ##Variables## ;
\ No newline at end of file
diff --git a/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs b/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs
deleted file mode 100644
index bcdc316fe5..0000000000
--- a/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Newtonsoft.Json.Linq;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Notifications;
-
-namespace Umbraco.Cms.Infrastructure.WebAssets;
-
-/// <summary>
-///     Ensures the server variables are included in the outgoing JS script
-/// </summary>
-public class ServerVariablesParser
-{
-    private const string Token = "##Variables##";
-    private readonly IEventAggregator _eventAggregator;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="ServerVariablesParser" /> class.
-    /// </summary>
-    public ServerVariablesParser(IEventAggregator eventAggregator) => _eventAggregator = eventAggregator;
-
-    /// <summary>
-    ///     Ensures the server variables in the dictionary are included in the outgoing JS script
-    /// </summary>
-    public async Task<string> ParseAsync(Dictionary<string, object> items)
-    {
-        var vars = Resources.ServerVariables;
-
-        // Raise event for developers to add custom variables
-        await _eventAggregator.PublishAsync(new ServerVariablesParsingNotification(items));
-
-        var json = JObject.FromObject(items);
-        return vars.Replace(Token, json.ToString());
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs b/src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs
deleted file mode 100644
index 5344a22707..0000000000
--- a/src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace Umbraco.Cms.Web.BackOffice.ActionResults;
-
-public class JavaScriptResult : ContentResult
-{
-    public JavaScriptResult(string? script)
-    {
-        Content = script;
-        ContentType = "application/javascript";
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ActionResults/UmbracoErrorResult.cs b/src/Umbraco.Web.BackOffice/ActionResults/UmbracoErrorResult.cs
deleted file mode 100644
index a2ae808b19..0000000000
--- a/src/Umbraco.Web.BackOffice/ActionResults/UmbracoErrorResult.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Umbraco.Cms.Web.BackOffice.ActionResults;
-
-public class UmbracoErrorResult : ObjectResult
-{
-    public UmbracoErrorResult(HttpStatusCode statusCode, string message) : this(statusCode, new MessageWrapper(message))
-    {
-    }
-
-    public UmbracoErrorResult(HttpStatusCode statusCode, object value) : base(value) => StatusCode = (int)statusCode;
-
-    private class MessageWrapper
-    {
-        public MessageWrapper(string message) => Message = message;
-
-        public string Message { get; }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/AdminUsersHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/AdminUsersHandler.cs
deleted file mode 100644
index b5cc970025..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/AdminUsersHandler.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Editors;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     If the users being edited is an admin then we must ensure that the current user is also an admin.
-/// </summary>
-public class AdminUsersHandler : MustSatisfyRequirementAuthorizationHandler<AdminUsersRequirement>
-{
-    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-    private readonly IHttpContextAccessor _httpContextAccessor;
-    private readonly UserEditorAuthorizationHelper _userEditorAuthorizationHelper;
-    private readonly IUserService _userService;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="AdminUsersHandler" /> class.
-    /// </summary>
-    /// <param name="httpContextAccessor">Accessor for the HTTP context of the current request.</param>
-    /// <param name="userService">Service for user related operations.</param>
-    /// <param name="backOfficeSecurityAccessor">Accessor for back-office security.</param>
-    /// <param name="userEditorAuthorizationHelper">Helper for user authorization checks.</param>
-    public AdminUsersHandler(
-        IHttpContextAccessor httpContextAccessor,
-        IUserService userService,
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-        UserEditorAuthorizationHelper userEditorAuthorizationHelper)
-    {
-        _httpContextAccessor = httpContextAccessor;
-        _userService = userService;
-        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
-        _userEditorAuthorizationHelper = userEditorAuthorizationHelper;
-    }
-
-    /// <inheritdoc />
-    protected override Task<bool> IsAuthorized(AuthorizationHandlerContext context, AdminUsersRequirement requirement)
-    {
-        StringValues? queryString = _httpContextAccessor.HttpContext?.Request.Query[requirement.QueryStringName];
-        if (!queryString.HasValue || !queryString.Value.Any())
-        {
-            // Must succeed this requirement since we cannot process it.
-            return Task.FromResult(true);
-        }
-
-        int[]? userIds;
-        if (int.TryParse(queryString, NumberStyles.Integer, CultureInfo.InvariantCulture, out var userId))
-        {
-            userIds = new[] { userId };
-        }
-        else
-        {
-            var ids = queryString.ToString()?.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)
-                .ToList();
-            if (ids?.Count == 0)
-            {
-                // Must succeed this requirement since we cannot process it.
-                return Task.FromResult(true);
-            }
-
-            userIds = ids?
-                .Select(x =>
-                    int.TryParse(x, NumberStyles.Integer, CultureInfo.InvariantCulture, out var output)
-                        ? Attempt<int>.Succeed(output)
-                        : Attempt<int>.Fail())
-                .Where(x => x.Success)
-                .Select(x => x.Result)
-                .ToArray();
-        }
-
-        if (userIds?.Length == 0)
-        {
-            // Must succeed this requirement since we cannot process it.
-            return Task.FromResult(true);
-        }
-
-        IEnumerable<IUser> users = _userService.GetUsersById(userIds);
-        var isAuth = users.All(user =>
-            _userEditorAuthorizationHelper.IsAuthorized(_backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser,
-                user, null, null, null) != false);
-
-        return Task.FromResult(isAuth);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/AdminUsersRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/AdminUsersRequirement.cs
deleted file mode 100644
index 2c2aea0ff2..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/AdminUsersRequirement.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Authorization requirement for the <see cref="AdminUsersHandler" />
-/// </summary>
-public class AdminUsersRequirement : IAuthorizationRequirement
-{
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="AdminUsersRequirement" /> class.
-    /// </summary>
-    /// <param name="queryStringName">Query string name from which to authorize values.</param>
-    public AdminUsersRequirement(string queryStringName = "id") => QueryStringName = queryStringName;
-
-    /// <summary>
-    ///     Gets the query string name from which to authorize values.
-    /// </summary>
-    public string QueryStringName { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/BackOfficeHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/BackOfficeHandler.cs
deleted file mode 100644
index 451aec2d89..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/BackOfficeHandler.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Ensures authorization is successful for a back office user.
-/// </summary>
-public class BackOfficeHandler : MustSatisfyRequirementAuthorizationHandler<BackOfficeRequirement>
-{
-    private readonly IBackOfficeSecurityAccessor _backOfficeSecurity;
-    private readonly IRuntimeState _runtimeState;
-
-    public BackOfficeHandler(IBackOfficeSecurityAccessor backOfficeSecurity, IRuntimeState runtimeState)
-    {
-        _backOfficeSecurity = backOfficeSecurity;
-        _runtimeState = runtimeState;
-    }
-
-    protected override Task<bool> IsAuthorized(AuthorizationHandlerContext context, BackOfficeRequirement requirement)
-    {
-        // if not configured (install or upgrade) then we can continue
-        // otherwise we need to ensure that a user is logged in
-
-        switch (_runtimeState.Level)
-        {
-            case var _ when _runtimeState.EnableInstaller():
-                return Task.FromResult(true);
-            default:
-                if (!_backOfficeSecurity.BackOfficeSecurity?.IsAuthenticated() ?? false)
-                {
-                    return Task.FromResult(false);
-                }
-
-                var userApprovalSucceeded = !requirement.RequireApproval ||
-                                            (_backOfficeSecurity.BackOfficeSecurity?.CurrentUser?.IsApproved ?? false);
-                return Task.FromResult(userApprovalSucceeded);
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/BackOfficeRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/BackOfficeRequirement.cs
deleted file mode 100644
index d0d5ae1913..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/BackOfficeRequirement.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Authorization requirement for the <see cref="BackOfficeHandler" />.
-/// </summary>
-public class BackOfficeRequirement : IAuthorizationRequirement
-{
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="BackOfficeRequirement" /> class.
-    /// </summary>
-    /// <param name="requireApproval">Flag for whether back-office user approval is required.</param>
-    public BackOfficeRequirement(bool requireApproval = true) => RequireApproval = requireApproval;
-
-    /// <summary>
-    ///     Gets a value indicating whether back-office user approval is required.
-    /// </summary>
-    public bool RequireApproval { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandler.cs
deleted file mode 100644
index faf67d8ec5..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandler.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     The user must have access to all descendant nodes of the content item in order to continue.
-/// </summary>
-public class ContentPermissionsPublishBranchHandler : MustSatisfyRequirementAuthorizationHandler<
-    ContentPermissionsPublishBranchRequirement, IContent>
-{
-    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-    private readonly ContentPermissions _contentPermissions;
-    private readonly IEntityService _entityService;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="ContentPermissionsPublishBranchHandler" /> class.
-    /// </summary>
-    /// <param name="entityService">Service for entity operations.</param>
-    /// <param name="contentPermissions">per for user content authorization checks.</param>
-    /// <param name="backOfficeSecurityAccessor">Accessor for back-office security.</param>
-    public ContentPermissionsPublishBranchHandler(
-        IEntityService entityService,
-        ContentPermissions contentPermissions,
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor)
-    {
-        _entityService = entityService;
-        _contentPermissions = contentPermissions;
-        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
-    }
-
-    /// <inheritdoc />
-    protected override Task<bool> IsAuthorized(AuthorizationHandlerContext context,
-        ContentPermissionsPublishBranchRequirement requirement, IContent resource)
-    {
-        IUser? currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-
-        var denied = new List<IUmbracoEntity>();
-        var page = 0;
-        const int pageSize = 500;
-        var total = long.MaxValue;
-
-        while (page * pageSize < total)
-        {
-            // Order descendents by shallowest to deepest, this allows us to check permissions from top to bottom so we can exit
-            // early if a permission higher up fails.
-            IEnumerable<IEntitySlim> descendants = _entityService.GetPagedDescendants(
-                resource.Id,
-                UmbracoObjectTypes.Document,
-                page++,
-                pageSize,
-                out total,
-                ordering: Ordering.By("path"));
-
-            foreach (IEntitySlim c in descendants)
-            {
-                // If this item's path has already been denied or if the user doesn't have access to it, add to the deny list.
-                if (denied.Any(x => c.Path.StartsWith($"{x.Path},")) ||
-                    _contentPermissions.CheckPermissions(
-                        c,
-                        currentUser,
-                        requirement.Permission) == ContentPermissions.ContentAccess.Denied)
-                {
-                    denied.Add(c);
-                }
-            }
-        }
-
-        return Task.FromResult(denied.Count == 0);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchRequirement.cs
deleted file mode 100644
index 4bb1636b63..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchRequirement.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Authorization requirement for <see cref="ContentPermissionsPublishBranchHandler" />
-/// </summary>
-public class ContentPermissionsPublishBranchRequirement : IAuthorizationRequirement
-{
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="ContentPermissionsPublishBranchRequirement" /> class.
-    /// </summary>
-    /// <param name="permission">Permission to check.</param>
-    public ContentPermissionsPublishBranchRequirement(char permission) => Permission = permission;
-
-    /// <summary>
-    ///     Gets a value for the permission to check.
-    /// </summary>
-    public char Permission { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandler.cs
deleted file mode 100644
index 15d0b39f65..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandler.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Used to authorize if the user has the correct permission access to the content for the content id specified in a
-///     query string.
-/// </summary>
-public class
-    ContentPermissionsQueryStringHandler : PermissionsQueryStringHandler<ContentPermissionsQueryStringRequirement>
-{
-    private readonly ContentPermissions _contentPermissions;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="ContentPermissionsQueryStringHandler" /> class.
-    /// </summary>
-    /// <param name="backOfficeSecurityAccessor">Accessor for back-office security.</param>
-    /// <param name="httpContextAccessor">Accessor for the HTTP context of the current request.</param>
-    /// <param name="entityService">Service for entity operations.</param>
-    /// <param name="contentPermissions">Helper for content authorization checks.</param>
-    public ContentPermissionsQueryStringHandler(
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-        IHttpContextAccessor httpContextAccessor,
-        IEntityService entityService,
-        ContentPermissions contentPermissions)
-        : base(backOfficeSecurityAccessor, httpContextAccessor, entityService) =>
-        _contentPermissions = contentPermissions;
-
-    /// <inheritdoc />
-    protected override Task<bool> IsAuthorized(AuthorizationHandlerContext context, ContentPermissionsQueryStringRequirement requirement)
-    {
-        int nodeId;
-        if (requirement.NodeId.HasValue == false)
-        {
-            if (HttpContextAccessor.HttpContext is null || requirement.QueryStringName is null ||
-                !HttpContextAccessor.HttpContext.Request.Query.TryGetValue(requirement.QueryStringName, out StringValues routeVal))
-            {
-                // Must succeed this requirement since we cannot process it
-                return Task.FromResult(true);
-            }
-
-            var argument = routeVal.ToString();
-
-            if (!TryParseNodeId(argument, out nodeId))
-            {
-                // Must succeed this requirement since we cannot process it.
-                return Task.FromResult(true);
-            }
-        }
-        else
-        {
-            nodeId = requirement.NodeId.Value;
-        }
-
-        ContentPermissions.ContentAccess permissionResult = _contentPermissions.CheckPermissions(
-            nodeId,
-            BackOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser,
-            out IContent? contentItem,
-            new[] { requirement.PermissionToCheck });
-
-        if (HttpContextAccessor.HttpContext is not null && contentItem is not null)
-        {
-            // Store the content item in request cache so it can be resolved in the controller without re-looking it up.
-            HttpContextAccessor.HttpContext.Items[typeof(IContent).ToString()] = contentItem;
-        }
-
-        return permissionResult switch
-        {
-            ContentPermissions.ContentAccess.Denied => Task.FromResult(false),
-            _ => Task.FromResult(true)
-        };
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringRequirement.cs
deleted file mode 100644
index bdeeeef2cc..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringRequirement.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     An authorization requirement for <see cref="ContentPermissionsQueryStringHandler" />
-/// </summary>
-public class ContentPermissionsQueryStringRequirement : IAuthorizationRequirement
-{
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="ContentPermissionsQueryStringRequirement" /> class for a specific node
-    ///     id.
-    /// </summary>
-    /// <param name="nodeId">The node Id.</param>
-    /// <param name="permissionToCheck">The permission to authorize the current user against.</param>
-    public ContentPermissionsQueryStringRequirement(int nodeId, char permissionToCheck)
-    {
-        NodeId = nodeId;
-        PermissionToCheck = permissionToCheck;
-    }
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="ContentPermissionsQueryStringRequirement" /> class for a
-    ///     node id based on a query string parameter.
-    /// </summary>
-    /// <param name="paramName">The querystring parameter name.</param>
-    /// <param name="permissionToCheck">The permission to authorize the current user against.</param>
-    public ContentPermissionsQueryStringRequirement(char permissionToCheck, string paramName = "id")
-    {
-        QueryStringName = paramName;
-        PermissionToCheck = permissionToCheck;
-    }
-
-    /// <summary>
-    ///     Gets the specific node Id.
-    /// </summary>
-    public int? NodeId { get; }
-
-    /// <summary>
-    ///     Gets the querystring parameter name.
-    /// </summary>
-    public string? QueryStringName { get; }
-
-    /// <summary>
-    ///     Gets the permission to authorize the current user against.
-    /// </summary>
-    public char PermissionToCheck { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResource.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResource.cs
deleted file mode 100644
index d83318531a..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResource.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Umbraco.Cms.Core.Models;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     The resource used for the <see cref="ContentPermissionsResourceRequirement" />
-/// </summary>
-public class ContentPermissionsResource
-{
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="ContentPermissionsResource" /> class.
-    /// </summary>
-    /// <param name="content">The content.</param>
-    /// <param name="permissionToCheck">The permission to authorize.</param>
-    public ContentPermissionsResource(IContent? content, char permissionToCheck)
-    {
-        PermissionsToCheck = new List<char> { permissionToCheck };
-        Content = content;
-    }
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="ContentPermissionsResource" /> class.
-    /// </summary>
-    /// <param name="content">The content.</param>
-    /// <param name="permissionsToCheck">The collection of permissions to authorize.</param>
-    public ContentPermissionsResource(IContent content, IReadOnlyList<char> permissionsToCheck)
-    {
-        Content = content;
-        PermissionsToCheck = permissionsToCheck;
-    }
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="ContentPermissionsResource" /> class.
-    /// </summary>
-    /// <param name="content">The content.</param>
-    /// <param name="nodeId">The node Id.</param>
-    /// <param name="permissionsToCheck">The collection of permissions to authorize.</param>
-    public ContentPermissionsResource(IContent? content, int nodeId, IReadOnlyList<char> permissionsToCheck)
-    {
-        Content = content;
-        NodeId = nodeId;
-        PermissionsToCheck = permissionsToCheck;
-    }
-
-    /// <summary>
-    ///     Gets the node Id.
-    /// </summary>
-    public int? NodeId { get; }
-
-    /// <summary>
-    ///     Gets the collection of permissions to authorize.
-    /// </summary>
-    public IReadOnlyList<char> PermissionsToCheck { get; }
-
-    /// <summary>
-    ///     Gets the content.
-    /// </summary>
-    public IContent? Content { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandler.cs
deleted file mode 100644
index e453787c33..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandler.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Security;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Used to authorize if the user has the correct permission access to the content for the <see cref="IContent" />
-///     specified.
-/// </summary>
-public class ContentPermissionsResourceHandler : MustSatisfyRequirementAuthorizationHandler<
-    ContentPermissionsResourceRequirement, ContentPermissionsResource>
-{
-    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-    private readonly ContentPermissions _contentPermissions;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="ContentPermissionsResourceHandler" /> class.
-    /// </summary>
-    /// <param name="backOfficeSecurityAccessor">Accessor for back-office security.</param>
-    /// <param name="contentPermissions">Helper for content authorization checks.</param>
-    public ContentPermissionsResourceHandler(
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-        ContentPermissions contentPermissions)
-    {
-        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
-        _contentPermissions = contentPermissions;
-    }
-
-    /// <inheritdoc />
-    protected override Task<bool> IsAuthorized(AuthorizationHandlerContext context,
-        ContentPermissionsResourceRequirement requirement, ContentPermissionsResource resource)
-    {
-        ContentPermissions.ContentAccess permissionResult = resource.NodeId.HasValue
-            ? _contentPermissions.CheckPermissions(
-                resource.NodeId.Value,
-                _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser,
-                out IContent? _,
-                resource.PermissionsToCheck)
-            : _contentPermissions.CheckPermissions(
-                resource.Content,
-                _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser,
-                resource.PermissionsToCheck);
-
-        return Task.FromResult(permissionResult != ContentPermissions.ContentAccess.Denied);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceRequirement.cs
deleted file mode 100644
index a25d491604..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceRequirement.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     An authorization requirement for <see cref="ContentPermissionsResourceHandler" />
-/// </summary>
-public class ContentPermissionsResourceRequirement : IAuthorizationRequirement
-{
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandler.cs
deleted file mode 100644
index 7daa9fbdd0..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandler.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Web.BackOffice.Security;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Ensures the resource cannot be accessed if <see cref="IBackOfficeExternalLoginProviders.HasDenyLocalLogin" />
-///     returns true.
-/// </summary>
-public class DenyLocalLoginHandler : MustSatisfyRequirementAuthorizationHandler<DenyLocalLoginRequirement>
-{
-    private readonly IBackOfficeExternalLoginProviders _externalLogins;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="DenyLocalLoginHandler" /> class.
-    /// </summary>
-    /// <param name="externalLogins">Provides access to <see cref="BackOfficeExternalLoginProvider" /> instances.</param>
-    public DenyLocalLoginHandler(IBackOfficeExternalLoginProviders externalLogins) => _externalLogins = externalLogins;
-
-    /// <inheritdoc />
-    protected override Task<bool> IsAuthorized(AuthorizationHandlerContext context,
-        DenyLocalLoginRequirement requirement) =>
-        Task.FromResult(!_externalLogins.HasDenyLocalLogin());
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginRequirement.cs
deleted file mode 100644
index 3aade0f9fd..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginRequirement.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Marker requirement for the <see cref="DenyLocalLoginHandler" />.
-/// </summary>
-public class DenyLocalLoginRequirement : IAuthorizationRequirement
-{
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandler.cs
deleted file mode 100644
index 7b662e5fc0..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandler.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Used to authorize if the user has the correct permission access to the media for the media id specified in a query
-///     string.
-/// </summary>
-public class MediaPermissionsQueryStringHandler : PermissionsQueryStringHandler<MediaPermissionsQueryStringRequirement>
-{
-    private readonly MediaPermissions _mediaPermissions;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="MediaPermissionsQueryStringHandler" /> class.
-    /// </summary>
-    /// <param name="backOfficeSecurityAccessor">Accessor for back-office security.</param>
-    /// <param name="httpContextAccessor">Accessor for the HTTP context of the current request.</param>
-    /// <param name="entityService">Service for entity operations.</param>
-    /// <param name="mediaPermissions">Helper for media authorization checks.</param>
-    public MediaPermissionsQueryStringHandler(
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-        IHttpContextAccessor httpContextAccessor,
-        IEntityService entityService,
-        MediaPermissions mediaPermissions)
-        : base(backOfficeSecurityAccessor, httpContextAccessor, entityService) => _mediaPermissions = mediaPermissions;
-
-    /// <inheritdoc />
-    protected override Task<bool> IsAuthorized(AuthorizationHandlerContext context,
-        MediaPermissionsQueryStringRequirement requirement)
-    {
-        if (HttpContextAccessor.HttpContext is null ||
-            !HttpContextAccessor.HttpContext.Request.Query.TryGetValue(requirement.QueryStringName,
-                out StringValues routeVal))
-        {
-            // Must succeed this requirement since we cannot process it.
-            return Task.FromResult(true);
-        }
-
-        var argument = routeVal.ToString();
-
-        if (!TryParseNodeId(argument, out var nodeId))
-        {
-            // Must succeed this requirement since we cannot process it.
-            return Task.FromResult(true);
-        }
-
-        MediaPermissions.MediaAccess permissionResult = _mediaPermissions.CheckPermissions(
-            BackOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser,
-            nodeId,
-            out IMedia? mediaItem);
-
-        if (mediaItem != null)
-        {
-            // Store the media item in request cache so it can be resolved in the controller without re-looking it up.
-            HttpContextAccessor.HttpContext.Items[typeof(IMedia).ToString()] = mediaItem;
-        }
-
-        return permissionResult switch
-        {
-            MediaPermissions.MediaAccess.Denied => Task.FromResult(false),
-            _ => Task.FromResult(true)
-        };
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringRequirement.cs
deleted file mode 100644
index 5174fe54de..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringRequirement.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     An authorization requirement for <see cref="MediaPermissionsQueryStringHandler" />
-/// </summary>
-public class MediaPermissionsQueryStringRequirement : IAuthorizationRequirement
-{
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="MediaPermissionsQueryStringRequirement" /> class.
-    /// </summary>
-    /// <param name="paramName">Querystring paramter name.</param>
-    public MediaPermissionsQueryStringRequirement(string paramName) => QueryStringName = paramName;
-
-    /// <summary>
-    ///     Gets the querystring paramter name.
-    /// </summary>
-    public string QueryStringName { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResource.cs b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResource.cs
deleted file mode 100644
index 562de479ca..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResource.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Umbraco.Cms.Core.Models;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-public class MediaPermissionsResource
-{
-    public MediaPermissionsResource(IMedia? media) => Media = media;
-
-    public MediaPermissionsResource(int nodeId) => NodeId = nodeId;
-
-    public int? NodeId { get; }
-    public IMedia? Media { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandler.cs
deleted file mode 100644
index 06e2b4f89c..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandler.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Security;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Used to authorize if the user has the correct permission access to the content for the <see cref="IContent" />
-///     specified.
-/// </summary>
-public class MediaPermissionsResourceHandler : MustSatisfyRequirementAuthorizationHandler<
-    MediaPermissionsResourceRequirement, MediaPermissionsResource>
-{
-    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-    private readonly MediaPermissions _mediaPermissions;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="MediaPermissionsResourceHandler" /> class.
-    /// </summary>
-    /// <param name="backOfficeSecurityAccessor">Accessor for back-office security.</param>
-    /// <param name="mediaPermissions">Helper for media authorization checks.</param>
-    public MediaPermissionsResourceHandler(
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-        MediaPermissions mediaPermissions)
-    {
-        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
-        _mediaPermissions = mediaPermissions;
-    }
-
-    /// <inheritdoc />
-    protected override Task<bool> IsAuthorized(AuthorizationHandlerContext context,
-        MediaPermissionsResourceRequirement requirement, MediaPermissionsResource resource)
-    {
-        MediaPermissions.MediaAccess permissionResult = resource.NodeId.HasValue
-            ? _mediaPermissions.CheckPermissions(
-                _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser,
-                resource.NodeId.Value,
-                out _)
-            : _mediaPermissions.CheckPermissions(
-                resource.Media,
-                _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser);
-
-        return Task.FromResult(permissionResult != MediaPermissions.MediaAccess.Denied);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceRequirement.cs
deleted file mode 100644
index 5251174761..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceRequirement.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     An authorization requirement for <see cref="MediaPermissionsResourceHandler" />
-/// </summary>
-public class MediaPermissionsResourceRequirement : IAuthorizationRequirement
-{
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/MustSatisfyRequirementAuthorizationHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/MustSatisfyRequirementAuthorizationHandler.cs
deleted file mode 100644
index 6d3f6f3187..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/MustSatisfyRequirementAuthorizationHandler.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Abstract handler that must satisfy the requirement so Succeed or Fail will be called no matter what.
-/// </summary>
-/// <typeparam name="T">Authorization requirement.</typeparam>
-/// <remarks>
-///     aspnetcore Authz handlers are not required to satisfy the requirement and generally don't explicitly call Fail when
-///     the requirement
-///     isn't satisfied, however in many simple cases explicitly calling Succeed or Fail is what we want which is what this
-///     class is used for.
-/// </remarks>
-public abstract class MustSatisfyRequirementAuthorizationHandler<T> : AuthorizationHandler<T>
-    where T : IAuthorizationRequirement
-{
-    /// <inheritdoc />
-    protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, T requirement)
-    {
-        var isAuth = await IsAuthorized(context, requirement);
-        if (isAuth)
-        {
-            context.Succeed(requirement);
-        }
-        else
-        {
-            context.Fail();
-        }
-    }
-
-    /// <summary>
-    ///     Return true if the requirement is succeeded or ignored, return false if the requirement is explicitly not met
-    /// </summary>
-    /// <param name="context">The authorization context.</param>
-    /// <param name="requirement">The authorization requirement.</param>
-    /// <returns>True if request is authorized, false if not.</returns>
-    protected abstract Task<bool> IsAuthorized(AuthorizationHandlerContext context, T requirement);
-}
-
-/// <summary>
-///     Abstract handler that must satisfy the requirement so Succeed or Fail will be called no matter what.
-/// </summary>
-/// <typeparam name="T">Authorization requirement.</typeparam>
-/// <typeparam name="TResource">Resource to authorize access to.</typeparam>
-/// <remarks>
-///     aspnetcore Authz handlers are not required to satisfy the requirement and generally don't explicitly call Fail when
-///     the requirement
-///     isn't satisfied, however in many simple cases explicitly calling Succeed or Fail is what we want which is what this
-///     class is used for.
-/// </remarks>
-public abstract class MustSatisfyRequirementAuthorizationHandler<T, TResource> : AuthorizationHandler<T, TResource>
-    where T : IAuthorizationRequirement
-{
-    /// <inheritdoc />
-    protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, T requirement,
-        TResource resource)
-    {
-        var isAuth = await IsAuthorized(context, requirement, resource);
-        if (isAuth)
-        {
-            context.Succeed(requirement);
-        }
-        else
-        {
-            context.Fail();
-        }
-    }
-
-    /// <summary>
-    ///     Return true if the requirement is succeeded or ignored, return false if the requirement is explicitly not met
-    /// </summary>
-    /// <param name="context">The authorization context.</param>
-    /// <param name="requirement">The authorization requirement.</param>
-    /// <param name="resource">The resource to authorize access to.</param>
-    /// <returns>True if request is authorized, false if not.</returns>
-    protected abstract Task<bool> IsAuthorized(AuthorizationHandlerContext context, T requirement, TResource resource);
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/PermissionsQueryStringHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/PermissionsQueryStringHandler.cs
deleted file mode 100644
index 5367208c79..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/PermissionsQueryStringHandler.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Abstract base class providing common functionality for authorization checks based on querystrings.
-/// </summary>
-/// <typeparam name="T">Authorization requirement</typeparam>
-public abstract class PermissionsQueryStringHandler<T> : MustSatisfyRequirementAuthorizationHandler<T>
-    where T : IAuthorizationRequirement
-{
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="PermissionsQueryStringHandler{T}" /> class.
-    /// </summary>
-    /// <param name="backOfficeSecurityAccessor">Accessor for back-office security.</param>
-    /// <param name="httpContextAccessor">Accessor for the HTTP context of the current request.</param>
-    /// <param name="entityService">Service for entity operations.</param>
-    public PermissionsQueryStringHandler(
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-        IHttpContextAccessor httpContextAccessor,
-        IEntityService entityService)
-    {
-        BackOfficeSecurityAccessor = backOfficeSecurityAccessor;
-        HttpContextAccessor = httpContextAccessor;
-        EntityService = entityService;
-    }
-
-    /// <summary>
-    ///     Gets or sets the <see cref="IBackOfficeSecurityAccessor" /> instance.
-    /// </summary>
-    protected IBackOfficeSecurityAccessor BackOfficeSecurityAccessor { get; set; }
-
-    /// <summary>
-    ///     Gets or sets the <see cref="IHttpContextAccessor" /> instance.
-    /// </summary>
-    protected IHttpContextAccessor HttpContextAccessor { get; set; }
-
-    /// <summary>
-    ///     Gets or sets the <see cref="IEntityService" /> instance.
-    /// </summary>
-    protected IEntityService EntityService { get; set; }
-
-    /// <summary>
-    ///     Attempts to parse a node ID from a string representation found in a querystring value.
-    /// </summary>
-    /// <param name="argument">Querystring value.</param>
-    /// <param name="nodeId">Output parsed Id.</param>
-    /// <returns>True of node ID could be parased, false it not.</returns>
-    protected bool TryParseNodeId(string argument, out int nodeId)
-    {
-        // If the argument is an int, it will parse and can be assigned to nodeId.
-        // It might be a udi, so check that next.
-        // Otherwise treat it as a guid - unlikely we ever get here.
-        // Failing that, we can't parse it.
-        if (int.TryParse(argument, NumberStyles.Integer, CultureInfo.InvariantCulture, out var parsedId))
-        {
-            nodeId = parsedId;
-            return true;
-        }
-
-        if (UdiParser.TryParse(argument, true, out Udi? udi))
-        {
-            nodeId = EntityService.GetId(udi).Result;
-            return true;
-        }
-
-        if (Guid.TryParse(argument, out Guid key))
-        {
-            nodeId = EntityService.GetId(key, UmbracoObjectTypes.Document).Result;
-            return true;
-        }
-
-        nodeId = 0;
-        return false;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/SectionHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/SectionHandler.cs
deleted file mode 100644
index 2bcaa9a89d..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/SectionHandler.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Core.Security;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Ensures that the current user has access to the section
-/// </summary>
-/// <remarks>
-///     The user only needs access to one of the sections specified, not all of the sections.
-/// </remarks>
-public class SectionHandler : MustSatisfyRequirementAuthorizationHandler<SectionRequirement>
-{
-    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="SectionHandler" /> class.
-    /// </summary>
-    /// <param name="backOfficeSecurityAccessor">Accessor for back-office security.</param>
-    public SectionHandler(IBackOfficeSecurityAccessor backOfficeSecurityAccessor) =>
-        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
-
-    /// <inheritdoc />
-    protected override Task<bool> IsAuthorized(AuthorizationHandlerContext context, SectionRequirement requirement)
-    {
-        var authorized = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser != null &&
-                         requirement.SectionAliases
-                             .Any(app => _backOfficeSecurityAccessor.BackOfficeSecurity.UserHasSectionAccess(
-                                 app, _backOfficeSecurityAccessor.BackOfficeSecurity.CurrentUser));
-
-        return Task.FromResult(authorized);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/SectionRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/SectionRequirement.cs
deleted file mode 100644
index ab0d3c47f9..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/SectionRequirement.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Authorization requirements for <see cref="SectionHandler" />
-/// </summary>
-public class SectionRequirement : IAuthorizationRequirement
-{
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="SectionRequirement" /> class.
-    /// </summary>
-    /// <param name="aliases">Aliases for sections that the user will need access to.</param>
-    public SectionRequirement(params string[] aliases) => SectionAliases = aliases;
-
-    /// <summary>
-    ///     Gets the aliases for sections that the user will need access to.
-    /// </summary>
-    public IReadOnlyCollection<string> SectionAliases { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/TreeHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/TreeHandler.cs
deleted file mode 100644
index 07f2b96eed..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/TreeHandler.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Ensures that the current user has access to the section for which the specified tree(s) belongs
-/// </summary>
-/// <remarks>
-///     This would allow a tree to be moved between sections.
-///     The user only needs access to one of the trees specified, not all of the trees.
-/// </remarks>
-public class TreeHandler : MustSatisfyRequirementAuthorizationHandler<TreeRequirement>
-{
-    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-    private readonly ITreeService _treeService;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="TreeHandler" /> class.
-    /// </summary>
-    /// <param name="treeService">Service for section tree operations.</param>
-    /// <param name="backOfficeSecurityAccessor">Accessor for back-office security.</param>
-    public TreeHandler(ITreeService treeService, IBackOfficeSecurityAccessor backOfficeSecurityAccessor)
-    {
-        _treeService = treeService ?? throw new ArgumentNullException(nameof(treeService));
-        _backOfficeSecurityAccessor = backOfficeSecurityAccessor ??
-                                      throw new ArgumentNullException(nameof(backOfficeSecurityAccessor));
-    }
-
-    /// <inheritdoc />
-    protected override Task<bool> IsAuthorized(AuthorizationHandlerContext context, TreeRequirement requirement)
-    {
-        var apps = requirement.TreeAliases
-            .Select(x => _treeService.GetByAlias(x))
-            .WhereNotNull()
-            .Select(x => x.SectionAlias)
-            .Distinct()
-            .ToArray();
-
-        var isAuth = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser != null &&
-                     apps.Any(app => _backOfficeSecurityAccessor.BackOfficeSecurity.UserHasSectionAccess(
-                         app, _backOfficeSecurityAccessor.BackOfficeSecurity.CurrentUser));
-
-        return Task.FromResult(isAuth);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/TreeRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/TreeRequirement.cs
deleted file mode 100644
index b5bf5bf815..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/TreeRequirement.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Authorization requirements for <see cref="TreeHandler" />
-/// </summary>
-public class TreeRequirement : IAuthorizationRequirement
-{
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="TreeRequirement" /> class.
-    /// </summary>
-    /// <param name="aliases">The aliases for trees that the user will need access to.</param>
-    public TreeRequirement(params string[] aliases) => TreeAliases = aliases;
-
-    /// <summary>
-    ///     Gets the aliases for trees that the user will need access to.
-    /// </summary>
-    public IReadOnlyCollection<string> TreeAliases { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/UserGroupHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/UserGroupHandler.cs
deleted file mode 100644
index 82a01ab73e..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/UserGroupHandler.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Authorizes that the current user has access to the user group Id in the request
-/// </summary>
-public class UserGroupHandler : MustSatisfyRequirementAuthorizationHandler<UserGroupRequirement>
-{
-    private readonly AppCaches _appCaches;
-    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-    private readonly IContentService _contentService;
-    private readonly IEntityService _entityService;
-    private readonly IHttpContextAccessor _httpContextAccessor;
-    private readonly IMediaService _mediaService;
-    private readonly IUserService _userService;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="UserGroupHandler" /> class.
-    /// </summary>
-    /// <param name="httpContextAccessor">Accessor for the HTTP context of the current request.</param>
-    /// <param name="userService">Service for user related operations.</param>
-    /// <param name="contentService">Service for content related operations.</param>
-    /// <param name="mediaService">Service for media related operations.</param>
-    /// <param name="entityService">Service for entity related operations.</param>
-    /// <param name="backOfficeSecurityAccessor">Accessor for back-office security.</param>
-    /// <param name="appCaches">App caches.</param>
-    public UserGroupHandler(
-        IHttpContextAccessor httpContextAccessor,
-        IUserService userService,
-        IContentService contentService,
-        IMediaService mediaService,
-        IEntityService entityService,
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-        AppCaches appCaches)
-    {
-        _httpContextAccessor = httpContextAccessor;
-        _userService = userService;
-        _contentService = contentService;
-        _mediaService = mediaService;
-        _entityService = entityService;
-        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
-        _appCaches = appCaches;
-    }
-
-    /// <inheritdoc />
-    protected override Task<bool> IsAuthorized(AuthorizationHandlerContext context, UserGroupRequirement requirement)
-    {
-        IUser? currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-
-        StringValues? querystring = _httpContextAccessor.HttpContext?.Request.Query[requirement.QueryStringName];
-        if (querystring is null)
-        {
-            // Must succeed this requirement since we cannot process it.
-            return Task.FromResult(true);
-        }
-
-        if (querystring.Value.Count == 0)
-        {
-            // Must succeed this requirement since we cannot process it.
-            return Task.FromResult(true);
-        }
-
-        var intIds = querystring.Value.ToString().Split(Constants.CharArrays.Comma)
-            .Select(x =>
-                int.TryParse(x, NumberStyles.Integer, CultureInfo.InvariantCulture, out var output)
-                    ? Attempt<int>.Succeed(output)
-                    : Attempt<int>.Fail())
-            .Where(x => x.Success).Select(x => x.Result).ToArray();
-
-        var authHelper = new UserGroupEditorAuthorizationHelper(
-            _userService,
-            _contentService,
-            _mediaService,
-            _entityService,
-            _appCaches);
-
-        Attempt<string?> isAuth = authHelper.AuthorizeGroupAccess(currentUser, intIds);
-
-        return Task.FromResult(isAuth.Success);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Authorization/UserGroupRequirement.cs b/src/Umbraco.Web.BackOffice/Authorization/UserGroupRequirement.cs
deleted file mode 100644
index c06638f273..0000000000
--- a/src/Umbraco.Web.BackOffice/Authorization/UserGroupRequirement.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Authorization;
-
-/// <summary>
-///     Authorization requirement for the <see cref="UserGroupHandler" />
-/// </summary>
-public class UserGroupRequirement : IAuthorizationRequirement
-{
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="UserGroupRequirement" /> class.
-    /// </summary>
-    /// <param name="queryStringName">Query string name from which to authorize values.</param>
-    public UserGroupRequirement(string queryStringName = "id") => QueryStringName = queryStringName;
-
-    /// <summary>
-    ///     Gets the query string name from which to authorize values.
-    /// </summary>
-    public string QueryStringName { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/AnalyticsController.cs b/src/Umbraco.Web.BackOffice/Controllers/AnalyticsController.cs
deleted file mode 100644
index b9980308b9..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/AnalyticsController.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[Authorize(Policy = AuthorizationPolicies.SectionAccessSettings)]
-public class AnalyticsController : UmbracoAuthorizedJsonController
-{
-    private readonly IMetricsConsentService _metricsConsentService;
-
-    public AnalyticsController(IMetricsConsentService metricsConsentService) =>
-        _metricsConsentService = metricsConsentService;
-
-    public TelemetryLevel GetConsentLevel() => _metricsConsentService.GetConsentLevel();
-
-    [HttpPost]
-    public IActionResult SetConsentLevel([FromBody] TelemetryResource telemetryResource)
-    {
-        if (!ModelState.IsValid)
-        {
-            return BadRequest();
-        }
-
-        _metricsConsentService.SetConsentLevel(telemetryResource.TelemetryLevel);
-        return Ok();
-    }
-
-    public IEnumerable<TelemetryLevel> GetAllLevels() =>
-        new[] { TelemetryLevel.Minimal, TelemetryLevel.Basic, TelemetryLevel.Detailed };
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
deleted file mode 100644
index 45a1746b7e..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
+++ /dev/null
@@ -1,772 +0,0 @@
-using System.Globalization;
-using System.Security.Claims;
-using System.Security.Cryptography;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Mail;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Email;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Net;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Security;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Cms.Web.Common.ActionsResults;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Cms.Web.Common.Controllers;
-using Umbraco.Cms.Web.Common.Filters;
-using Umbraco.Cms.Web.Common.Models;
-using Umbraco.Extensions;
-using SignInResult = Microsoft.AspNetCore.Identity.SignInResult;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-// See
-// for a bigger example of this type of controller implementation in netcore:
-// https://github.com/dotnet/AspNetCore.Docs/blob/2efb4554f8f659be97ee7cd5dd6143b871b330a5/aspnetcore/migration/1x-to-2x/samples/AspNetCoreDotNetCore2App/AspNetCoreDotNetCore2App/Controllers/AccountController.cs
-// https://github.com/dotnet/AspNetCore.Docs/blob/ad16f5e1da6c04fa4996ee67b513f2a90fa0d712/aspnetcore/common/samples/WebApplication1/Controllers/AccountController.cs
-// with authenticator app
-// https://github.com/dotnet/AspNetCore.Docs/blob/master/aspnetcore/security/authentication/identity/sample/src/ASPNETCore-IdentityDemoComplete/IdentityDemo/Controllers/AccountController.cs
-
-[PluginController(Constants.Web.Mvc
-    .BackOfficeApiArea)] // TODO: Maybe this could be applied with our Application Model conventions
-//[ValidationFilter] // TODO: I don't actually think this is required with our custom Application Model conventions applied
-[AngularJsonOnlyConfiguration] // TODO: This could be applied with our Application Model conventions
-[IsBackOffice]
-[DisableBrowserCache]
-public class AuthenticationController : UmbracoApiControllerBase
-{
-    // NOTE: Each action must either be explicitly authorized or explicitly [AllowAnonymous], the latter is optional because
-    // this controller itself doesn't require authz but it's more clear what the intention is.
-
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IBackOfficeTwoFactorOptions _backOfficeTwoFactorOptions;
-    private readonly IEmailSender _emailSender;
-    private readonly IBackOfficeExternalLoginProviders _externalAuthenticationOptions;
-    private readonly GlobalSettings _globalSettings;
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly IHttpContextAccessor _httpContextAccessor;
-    private readonly IIpResolver _ipResolver;
-    private readonly LinkGenerator _linkGenerator;
-    private readonly ILogger<AuthenticationController> _logger;
-    private readonly UserPasswordConfigurationSettings _passwordConfiguration;
-    private readonly SecuritySettings _securitySettings;
-    private readonly IBackOfficeSignInManager _signInManager;
-    private readonly ISmsSender _smsSender;
-    private readonly ILocalizedTextService _textService;
-    private readonly ITwoFactorLoginService _twoFactorLoginService;
-    private readonly IUmbracoMapper _umbracoMapper;
-    private readonly IBackOfficeUserManager _userManager;
-    private readonly IUserService _userService;
-    private readonly WebRoutingSettings _webRoutingSettings;
-
-    // TODO: We need to review all _userManager.Raise calls since many/most should be on the usermanager or signinmanager, very few should be here
-    [ActivatorUtilitiesConstructor]
-    public AuthenticationController(
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IBackOfficeUserManager backOfficeUserManager,
-        IBackOfficeSignInManager signInManager,
-        IUserService userService,
-        ILocalizedTextService textService,
-        IUmbracoMapper umbracoMapper,
-        IOptionsSnapshot<GlobalSettings> globalSettings,
-        IOptionsSnapshot<SecuritySettings> securitySettings,
-        ILogger<AuthenticationController> logger,
-        IIpResolver ipResolver,
-        IOptionsSnapshot<UserPasswordConfigurationSettings> passwordConfiguration,
-        IEmailSender emailSender,
-        ISmsSender smsSender,
-        IHostingEnvironment hostingEnvironment,
-        LinkGenerator linkGenerator,
-        IBackOfficeExternalLoginProviders externalAuthenticationOptions,
-        IBackOfficeTwoFactorOptions backOfficeTwoFactorOptions,
-        IHttpContextAccessor httpContextAccessor,
-        IOptions<WebRoutingSettings> webRoutingSettings,
-        ITwoFactorLoginService twoFactorLoginService)
-    {
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-        _userManager = backOfficeUserManager;
-        _signInManager = signInManager;
-        _userService = userService;
-        _textService = textService;
-        _umbracoMapper = umbracoMapper;
-        _globalSettings = globalSettings.Value;
-        _securitySettings = securitySettings.Value;
-        _logger = logger;
-        _ipResolver = ipResolver;
-        _passwordConfiguration = passwordConfiguration.Value;
-        _emailSender = emailSender;
-        _smsSender = smsSender;
-        _hostingEnvironment = hostingEnvironment;
-        _linkGenerator = linkGenerator;
-        _externalAuthenticationOptions = externalAuthenticationOptions;
-        _backOfficeTwoFactorOptions = backOfficeTwoFactorOptions;
-        _httpContextAccessor = httpContextAccessor;
-        _webRoutingSettings = webRoutingSettings.Value;
-        _twoFactorLoginService = twoFactorLoginService;
-    }
-
-    /// <summary>
-    ///     Returns the configuration for the backoffice user membership provider - used to configure the change password
-    ///     dialog
-    /// </summary>
-    [AllowAnonymous] // Needed for users that are invited when they use the link from the mail they are not authorized
-    [Authorize(Policy =
-        AuthorizationPolicies.BackOfficeAccess)] // Needed to enforce the principle set on the request, if one exists.
-    public IDictionary<string, object> GetPasswordConfig(int userId)
-    {
-        Attempt<int> currentUserId =
-            _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId() ?? Attempt<int>.Fail();
-        return _passwordConfiguration.GetConfiguration(
-            currentUserId.Success
-                ? currentUserId.Result != userId
-                : true);
-    }
-
-    /// <summary>
-    ///     Checks if a valid token is specified for an invited user and if so logs the user in and returns the user object
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     This will also update the security stamp for the user so it can only be used once
-    /// </remarks>
-    [ValidateAngularAntiForgeryToken]
-    [Authorize(Policy = AuthorizationPolicies.DenyLocalLoginIfConfigured)]
-    public async Task<ActionResult<UserDisplay?>> PostVerifyInvite([FromQuery] int id, [FromQuery] string token)
-    {
-        if (string.IsNullOrWhiteSpace(token))
-        {
-            return NotFound();
-        }
-
-        var decoded = token.FromUrlBase64();
-        if (decoded.IsNullOrWhiteSpace())
-        {
-            return NotFound();
-        }
-
-        BackOfficeIdentityUser? identityUser = await _userManager.FindByIdAsync(id.ToString());
-        if (identityUser == null)
-        {
-            return NotFound();
-        }
-
-        IdentityResult result = await _userManager.ConfirmEmailAsync(identityUser, decoded!);
-
-        if (result.Succeeded == false)
-        {
-            return ValidationErrorResult.CreateNotificationValidationErrorResult(result.Errors.ToErrorMessage());
-        }
-
-        await _signInManager.SignOutAsync();
-
-        await _signInManager.SignInAsync(identityUser, false);
-
-        IUser? user = _userService.GetUserById(id);
-
-        return _umbracoMapper.Map<UserDisplay>(user);
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
-    [ValidateAngularAntiForgeryToken]
-    public async Task<IActionResult> PostUnLinkLogin(UnLinkLoginModel unlinkLoginModel)
-    {
-        var userId = User.Identity?.GetUserId();
-        if (userId is null)
-        {
-            throw new InvalidOperationException("Could not find userId");
-        }
-        var user = await _userManager.FindByIdAsync(userId);
-        if (user == null) throw new InvalidOperationException("Could not find user");
-
-        AuthenticationScheme? authType = (await _signInManager.GetExternalAuthenticationSchemesAsync())
-            .FirstOrDefault(x => x.Name == unlinkLoginModel.LoginProvider);
-
-        if (authType == null)
-        {
-            _logger.LogWarning("Could not find external authentication provider registered: {LoginProvider}", unlinkLoginModel.LoginProvider);
-        }
-        else
-        {
-            BackOfficeExternaLoginProviderScheme? opt = await _externalAuthenticationOptions.GetAsync(authType.Name);
-            if (opt == null)
-            {
-                return BadRequest(
-                    $"Could not find external authentication options registered for provider {unlinkLoginModel.LoginProvider}");
-            }
-
-            if (!opt.ExternalLoginProvider.Options.AutoLinkOptions.AllowManualLinking)
-            {
-                // If AllowManualLinking is disabled for this provider we cannot unlink
-                return BadRequest();
-            }
-        }
-
-        IdentityResult result = await _userManager.RemoveLoginAsync(
-            user,
-            unlinkLoginModel.LoginProvider,
-            unlinkLoginModel.ProviderKey);
-
-        if (result.Succeeded)
-        {
-            await _signInManager.SignInAsync(user, true);
-            return Ok();
-        }
-
-        AddModelErrors(result);
-        return new ValidationErrorResult(ModelState);
-    }
-
-    [HttpGet]
-    [AllowAnonymous]
-    public async Task<double> GetRemainingTimeoutSeconds()
-    {
-        // force authentication to occur since this is not an authorized endpoint
-        AuthenticateResult result = await this.AuthenticateBackOfficeAsync();
-        if (!result.Succeeded)
-        {
-            return 0;
-        }
-
-        var remainingSeconds = result.Principal.GetRemainingAuthSeconds();
-        if (remainingSeconds <= 30)
-        {
-            var username = result.Principal.FindFirst(ClaimTypes.Name)?.Value;
-
-            //NOTE: We are using 30 seconds because that is what is coded into angular to force logout to give some headway in
-            // the timeout process.
-
-            _logger.LogInformation(
-                "User logged will be logged out due to timeout: {Username}, IP Address: {IPAddress}",
-                username ?? "unknown",
-                _ipResolver.GetCurrentRequestIpAddress());
-        }
-
-        return remainingSeconds;
-    }
-
-    /// <summary>
-    ///     Checks if the current user's cookie is valid and if so returns OK or a 400 (BadRequest)
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet]
-    [AllowAnonymous]
-    public async Task<bool> IsAuthenticated()
-    {
-        // force authentication to occur since this is not an authorized endpoint
-        AuthenticateResult result = await this.AuthenticateBackOfficeAsync();
-        return result.Succeeded;
-    }
-
-    /// <summary>
-    ///     Returns the currently logged in Umbraco user
-    /// </summary>
-    /// <returns></returns>
-    /// <remarks>
-    ///     We have the attribute [SetAngularAntiForgeryTokens] applied because this method is called initially to determine if
-    ///     the user
-    ///     is valid before the login screen is displayed. The Auth cookie can be persisted for up to a day but the csrf
-    ///     cookies are only session
-    ///     cookies which means that the auth cookie could be valid but the csrf cookies are no longer there, in that case we
-    ///     need to re-set the csrf cookies.
-    /// </remarks>
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
-    [SetAngularAntiForgeryTokens]
-    [CheckIfUserTicketDataIsStale]
-    public UserDetail? GetCurrentUser()
-    {
-        IUser? user = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-        UserDetail? result = _umbracoMapper.Map<UserDetail>(user);
-
-        if (result is not null)
-        {
-            //set their remaining seconds
-            result.SecondsUntilTimeout = HttpContext.User.GetRemainingAuthSeconds();
-        }
-
-        return result;
-    }
-
-    /// <summary>
-    ///     When a user is invited they are not approved but we need to resolve the partially logged on (non approved)
-    ///     user.
-    /// </summary>
-    /// <returns>It returns a 403 error if the logged-in user has already been created.</returns>
-    /// <remarks>
-    ///     We cannot user GetCurrentUser since that requires they are approved, this is the same as GetCurrentUser but doesn't
-    ///     require them to be approved
-    /// </remarks>
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccessWithoutApproval)]
-    [Authorize(Policy = AuthorizationPolicies.DenyLocalLoginIfConfigured)]
-    [SetAngularAntiForgeryTokens]
-    [AllowAnonymous] // Needed for users that are invited when they use the link from the mail they may have logged in on a different session, so we don't want to redirect them.
-    public ActionResult<UserDetail?> GetCurrentInvitedUser()
-    {
-        IUser? user = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-
-        if (user?.IsApproved ?? false)
-        {
-            // if they are approved, than they are no longer invited and we can return an error
-            return Forbid();
-        }
-
-        UserDetail? result = _umbracoMapper.Map<UserDetail>(user);
-
-        if (result is not null)
-        {
-            // set their remaining seconds
-            result.SecondsUntilTimeout = HttpContext.User.GetRemainingAuthSeconds();
-        }
-
-        return result;
-    }
-
-    /// <summary>
-    ///     When a user is invited and they click on the invitation link, they will be partially logged in
-    ///     where they can set their username/password.
-    /// </summary>
-    /// <param name="invitePasswordModel">The model for the new password.</param>
-    /// <returns>The user model for the invited user.</returns>
-    /// <remarks>
-    ///     This only works when the user is logged in (partially).
-    /// </remarks>
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccessWithoutApproval)]
-    [Authorize(Policy = AuthorizationPolicies.DenyLocalLoginIfConfigured)]
-    [SetAngularAntiForgeryTokens]
-    [AllowAnonymous] // Needed for users that are invited when they use the link from the mail they may have logged in on a different session, so we don't want to redirect them.
-    public async Task<ActionResult<UserDetail?>> PostSetInvitedUserPassword(InvitePasswordModel invitePasswordModel)
-    {
-        IUser? currentUser = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-
-        if (currentUser is null)
-        {
-            return BadRequest("Could not find user");
-        }
-
-        if (currentUser.IsApproved)
-        {
-            // if they are approved, than they are no longer invited and we can return an error
-            return Forbid();
-        }
-
-        BackOfficeIdentityUser? user = await _userManager.FindByIdAsync(currentUser!.Id.ToString());
-
-        if (user is null)
-        {
-            return BadRequest("Could not find identity user");
-        }
-
-        IdentityResult result = await _userManager.AddPasswordAsync(user, invitePasswordModel.NewPassword);
-
-        if (result.Succeeded is false)
-        {
-            // it wasn't successful, so add the change error to the model state, we've name the property alias _umb_password on the form
-            // so that is why it is being used here.
-            ModelState.AddModelError("value", result.Errors.ToErrorMessage());
-
-            return ValidationProblem(ModelState);
-        }
-
-        if (_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser is not null)
-        {
-            // They've successfully set their password, we can now update their user account to be approved
-            _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.IsApproved = true;
-
-            // They've successfully set their password, and will now get fully logged into the back office, so the lastlogindate is set so the backoffice shows they have logged in
-            _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.LastLoginDate = DateTime.UtcNow;
-
-            _userService.Save(_backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser);
-        }
-
-
-        // now we can return their full object since they are now really logged into the back office
-        UserDetail? userDisplay =
-            _umbracoMapper.Map<UserDetail>(_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser);
-
-        if (userDisplay is not null)
-        {
-            userDisplay.SecondsUntilTimeout = HttpContext.User.GetRemainingAuthSeconds();
-        }
-
-        return userDisplay;
-    }
-
-    /// <summary>
-    ///     Logs a user in
-    /// </summary>
-    /// <returns></returns>
-    [SetAngularAntiForgeryTokens]
-    [Authorize(Policy = AuthorizationPolicies.DenyLocalLoginIfConfigured)]
-    public async Task<ActionResult<UserDetail?>> PostLogin(LoginModel loginModel)
-    {
-        // Sign the user in with username/password, this also gives a chance for developers to
-        // custom verify the credentials and auto-link user accounts with a custom IBackOfficePasswordChecker
-        SignInResult result = await _signInManager.PasswordSignInAsync(
-            loginModel.Username, loginModel.Password, true, true);
-
-        if (result.Succeeded)
-        {
-            // return the user detail
-            return GetUserDetail(_userService.GetByUsername(loginModel.Username));
-        }
-
-        if (result.RequiresTwoFactor)
-        {
-            var twofactorView = _backOfficeTwoFactorOptions.GetTwoFactorView(loginModel.Username);
-
-            IUser? attemptedUser = _userService.GetByUsername(loginModel.Username);
-
-            // create a with information to display a custom two factor send code view
-            var verifyResponse =
-                new ObjectResult(new { twoFactorView = twofactorView, userId = attemptedUser?.Id })
-                {
-                    StatusCode = StatusCodes.Status402PaymentRequired
-                };
-
-            return verifyResponse;
-        }
-
-        // TODO: We can check for these and respond differently if we think it's important
-        //  result.IsLockedOut
-        //  result.IsNotAllowed
-
-        // return BadRequest (400), we don't want to return a 401 because that get's intercepted
-        // by our angular helper because it thinks that we need to re-perform the request once we are
-        // authorized and we don't want to return a 403 because angular will show a warning message indicating
-        // that the user doesn't have access to perform this function, we just want to return a normal invalid message.
-        return BadRequest();
-    }
-
-    /// <summary>
-    ///     Processes a password reset request.  Looks for a match on the provided email address
-    ///     and if found sends an email with a link to reset it
-    /// </summary>
-    /// <returns></returns>
-    [SetAngularAntiForgeryTokens]
-    [Authorize(Policy = AuthorizationPolicies.DenyLocalLoginIfConfigured)]
-    public async Task<IActionResult> PostRequestPasswordReset(RequestPasswordResetModel model)
-    {
-        // If this feature is switched off in configuration the UI will be amended to not make the request to reset password available.
-        // So this is just a server-side secondary check.
-        if (_securitySettings.AllowPasswordReset == false)
-        {
-            return BadRequest();
-        }
-
-        BackOfficeIdentityUser? identityUser = await _userManager.FindByEmailAsync(model.Email);
-
-        await Task.Delay(RandomNumberGenerator.GetInt32(400, 2500)); // To randomize response time preventing user enumeration
-
-        if (identityUser != null)
-        {
-            IUser? user = _userService.GetByEmail(model.Email);
-            if (user != null)
-            {
-                var from = _globalSettings.Smtp?.From;
-                var code = await _userManager.GeneratePasswordResetTokenAsync(identityUser);
-                var callbackUrl = ConstructCallbackUrl(identityUser.Id, code);
-
-                var message = _textService.Localize("login", "resetPasswordEmailCopyFormat",
-                    // Ensure the culture of the found user is used for the email!
-                    UmbracoUserExtensions.GetUserCulture(identityUser.Culture, _textService, _globalSettings),
-                    new[] { identityUser.UserName, callbackUrl });
-
-                var subject = _textService.Localize("login", "resetPasswordEmailCopySubject",
-                    // Ensure the culture of the found user is used for the email!
-                    UmbracoUserExtensions.GetUserCulture(identityUser.Culture, _textService, _globalSettings));
-
-                var mailMessage = new EmailMessage(from, user.Email, subject, message, true);
-
-                try
-                {
-                    await _emailSender.SendAsync(mailMessage, Constants.Web.EmailTypes.PasswordReset, true);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error sending email, please check your SMTP configuration: {ErrorMessage}", ex.Message);
-                    return Ok();
-                }
-
-                _userManager.NotifyForgotPasswordRequested(User, user.Id.ToString());
-            }
-        }
-
-        return Ok();
-    }
-
-    /// <summary>
-    ///     Used to retrieve the 2FA providers for code submission
-    /// </summary>
-    /// <returns></returns>
-    [SetAngularAntiForgeryTokens]
-    [AllowAnonymous]
-    public async Task<ActionResult<IEnumerable<string>>> Get2FAProviders()
-    {
-        BackOfficeIdentityUser? user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
-        if (user == null)
-        {
-            _logger.LogWarning("Get2FAProviders :: No verified user found, returning 404");
-            return NotFound();
-        }
-
-        IEnumerable<string> userFactors = await _twoFactorLoginService.GetEnabledTwoFactorProviderNamesAsync(user.Key);
-
-        return new ObjectResult(userFactors);
-    }
-
-    [SetAngularAntiForgeryTokens]
-    [AllowAnonymous]
-    public async Task<IActionResult> PostSend2FACode([FromBody] string provider)
-    {
-        if (provider.IsNullOrWhiteSpace())
-        {
-            return NotFound();
-        }
-
-        BackOfficeIdentityUser? user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
-        if (user == null)
-        {
-            _logger.LogWarning("PostSend2FACode :: No verified user found, returning 404");
-            return NotFound();
-        }
-
-        var from = _globalSettings.Smtp?.From;
-        // Generate the token and send it
-        var code = await _userManager.GenerateTwoFactorTokenAsync(user, provider);
-        if (string.IsNullOrWhiteSpace(code))
-        {
-            _logger.LogWarning("PostSend2FACode :: Could not generate 2FA code");
-            return BadRequest("Invalid code");
-        }
-
-        var subject = _textService.Localize("login", "mfaSecurityCodeSubject",
-            // Ensure the culture of the found user is used for the email!
-            UmbracoUserExtensions.GetUserCulture(user.Culture, _textService, _globalSettings));
-
-        var message = _textService.Localize("login", "mfaSecurityCodeMessage",
-            // Ensure the culture of the found user is used for the email!
-            UmbracoUserExtensions.GetUserCulture(user.Culture, _textService, _globalSettings),
-            new[] { code });
-
-            if (provider == "Email")
-            {
-                var mailMessage = new EmailMessage(from, user.Email, subject, message, true);
-                await _emailSender.SendAsync(mailMessage, Constants.Web.EmailTypes.TwoFactorAuth);
-            }
-            else if (provider == "Phone")
-            {
-                var phoneNumber = await _userManager.GetPhoneNumberAsync(user);
-                if (phoneNumber is not null)
-                {
-                    await _smsSender.SendSmsAsync(phoneNumber, message);
-                }
-            }
-
-        return Ok();
-    }
-
-    [SetAngularAntiForgeryTokens]
-    [AllowAnonymous]
-    public async Task<ActionResult<UserDetail?>> PostVerify2FACode(Verify2FACodeModel model)
-    {
-        if (ModelState.IsValid == false)
-        {
-            return new ValidationErrorResult(ModelState);
-        }
-
-        BackOfficeIdentityUser? user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
-        if (user == null)
-        {
-            _logger.LogWarning("PostVerify2FACode :: No verified user found, returning 404");
-            return NotFound();
-        }
-
-        SignInResult result =
-            await _signInManager.TwoFactorSignInAsync(model.Provider, model.Code, model.IsPersistent, model.RememberClient);
-        if (result.Succeeded)
-        {
-            return Ok(GetUserDetail(_userService.GetByUsername(user.UserName)));
-        }
-
-        if (result.IsLockedOut)
-        {
-            return new ValidationErrorResult("User is locked out");
-        }
-
-        if (result.IsNotAllowed)
-        {
-            return new ValidationErrorResult("User is not allowed");
-        }
-
-        return new ValidationErrorResult("Invalid code");
-    }
-
-    /// <summary>
-    ///     Processes a set password request.  Validates the request and sets a new password.
-    /// </summary>
-    /// <returns></returns>
-    [SetAngularAntiForgeryTokens]
-    [AllowAnonymous]
-    public async Task<IActionResult> PostSetPassword(SetPasswordModel model)
-    {
-        BackOfficeIdentityUser? identityUser =
-            await _userManager.FindByIdAsync(model.UserId.ToString(CultureInfo.InvariantCulture));
-            if (identityUser is null)
-            {
-                return new ValidationErrorResult("Could not find user");
-            }
-
-        IdentityResult result = await _userManager.ResetPasswordAsync(identityUser, model.ResetCode, model.Password);
-        if (result.Succeeded)
-        {
-            var lockedOut = await _userManager.IsLockedOutAsync(identityUser);
-            if (lockedOut)
-            {
-                _logger.LogInformation(
-                    "User {UserId} is currently locked out, unlocking and resetting AccessFailedCount", model.UserId);
-
-                //// var user = await UserManager.FindByIdAsync(model.UserId);
-                IdentityResult unlockResult =
-                    await _userManager.SetLockoutEndDateAsync(identityUser, DateTimeOffset.Now);
-                if (unlockResult.Succeeded == false)
-                {
-                    _logger.LogWarning("Could not unlock for user {UserId} - error {UnlockError}", model.UserId,
-                        unlockResult.Errors.First().Description);
-                }
-
-                IdentityResult resetAccessFailedCountResult =
-                    await _userManager.ResetAccessFailedCountAsync(identityUser);
-                if (resetAccessFailedCountResult.Succeeded == false)
-                {
-                    _logger.LogWarning("Could not reset access failed count {UserId} - error {UnlockError}",
-                        model.UserId, unlockResult.Errors.First().Description);
-                }
-            }
-
-            // They've successfully set their password, we can now update their user account to be confirmed
-            // if user was only invited, then they have not been approved
-            // but a successful forgot password flow (e.g. if their token had expired and they did a forgot password instead of request new invite)
-            // means we have verified their email
-            if (!await _userManager.IsEmailConfirmedAsync(identityUser))
-            {
-                await _userManager.ConfirmEmailAsync(identityUser, model.ResetCode);
-            }
-
-            // invited is not approved, never logged in, invited date present
-            /*
-            if (LastLoginDate == default && IsApproved == false && InvitedDate != null)
-                return UserState.Invited;
-            */
-            if (identityUser != null && !identityUser.IsApproved)
-            {
-                IUser? user = _userService.GetByUsername(identityUser.UserName);
-                // also check InvitedDate and never logged in, otherwise this would allow a disabled user to reactivate their account with a forgot password
-                if (user?.LastLoginDate == default && user?.InvitedDate != null)
-                {
-                    user.IsApproved = true;
-                    user.InvitedDate = null;
-                    _userService.Save(user);
-                }
-            }
-
-            _userManager.NotifyForgotPasswordChanged(User, model.UserId.ToString(CultureInfo.InvariantCulture));
-            return Ok();
-        }
-
-        return new ValidationErrorResult(
-            result.Errors.Any() ? result.Errors.First().Description : "Set password failed");
-    }
-
-    /// <summary>
-    ///     Logs the current user out
-    /// </summary>
-    /// <returns></returns>
-    [ValidateAngularAntiForgeryToken]
-    [AllowAnonymous]
-    public async Task<IActionResult> PostLogout()
-    {
-        // force authentication to occur since this is not an authorized endpoint
-        AuthenticateResult result = await this.AuthenticateBackOfficeAsync();
-        if (!result.Succeeded)
-        {
-            return Ok();
-        }
-
-        await _signInManager.SignOutAsync();
-
-        _logger.LogInformation("User {UserName} from IP address {RemoteIpAddress} has logged out",
-            result.Principal.Identity == null ? "UNKNOWN" : result.Principal.Identity.Name, HttpContext.Connection.RemoteIpAddress);
-
-        var userId = result.Principal.Identity?.GetUserId();
-        SignOutSuccessResult args = _userManager.NotifyLogoutSuccess(User, userId);
-        if (!args.SignOutRedirectUrl.IsNullOrWhiteSpace())
-        {
-            return new ObjectResult(new { signOutRedirectUrl = args.SignOutRedirectUrl });
-        }
-
-        return Ok();
-    }
-
-
-    /// <summary>
-    ///     Return the <see cref="UserDetail" /> for the given <see cref="IUser" />
-    /// </summary>
-    /// <param name="user"></param>
-    /// <returns></returns>
-    private UserDetail? GetUserDetail(IUser? user)
-    {
-        if (user == null)
-        {
-            throw new ArgumentNullException(nameof(user));
-        }
-
-        UserDetail? userDetail = _umbracoMapper.Map<UserDetail>(user);
-
-        if (userDetail is not null)
-        {
-            // update the userDetail and set their remaining seconds
-            userDetail.SecondsUntilTimeout = _globalSettings.TimeOut.TotalSeconds;
-        }
-
-        return userDetail;
-    }
-
-    private string ConstructCallbackUrl(string userId, string code)
-    {
-        // Get an mvc helper to get the url
-        var action = _linkGenerator.GetPathByAction(
-            nameof(BackOfficeController.ValidatePasswordResetCode),
-            ControllerExtensions.GetControllerName<BackOfficeController>(),
-            new { area = Constants.Web.Mvc.BackOfficeArea, u = userId, r = code });
-
-        // Construct full URL using configured application URL (which will fall back to current request)
-        Uri applicationUri = _httpContextAccessor.GetRequiredHttpContext().Request
-            .GetApplicationUri(_webRoutingSettings);
-        var callbackUri = new Uri(applicationUri, action);
-        return callbackUri.ToString();
-    }
-
-    private void AddModelErrors(IdentityResult result, string prefix = "")
-    {
-        foreach (IdentityError? error in result.Errors)
-        {
-            ModelState.AddModelError(prefix, error.Description);
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsController.cs
deleted file mode 100644
index b73788fe30..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsController.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Web.Common.Attributes;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class BackOfficeAssetsController : UmbracoAuthorizedJsonController
-{
-    private readonly IFileSystem _jsLibFileSystem;
-
-    public BackOfficeAssetsController(IIOHelper ioHelper, IHostingEnvironment hostingEnvironment, ILoggerFactory loggerFactory, IOptionsSnapshot<GlobalSettings> globalSettings)
-    {
-        var path = globalSettings.Value.UmbracoPath + Path.DirectorySeparatorChar + "lib";
-        _jsLibFileSystem = new PhysicalFileSystem(
-            ioHelper,
-            hostingEnvironment,
-            loggerFactory.CreateLogger<PhysicalFileSystem>(),
-            hostingEnvironment.MapPathWebRoot(path),
-            hostingEnvironment.ToAbsolute(path));
-    }
-
-    [HttpGet]
-    public object GetSupportedLocales()
-    {
-        const string momentLocaleFolder = "moment";
-        const string flatpickrLocaleFolder = "flatpickr/l10n";
-
-        return new { moment = GetLocales(momentLocaleFolder), flatpickr = GetLocales(flatpickrLocaleFolder) };
-    }
-
-    private IEnumerable<string> GetLocales(string path)
-    {
-        var cultures = _jsLibFileSystem.GetFiles(path, "*.js").ToList();
-        for (var i = 0; i < cultures.Count; i++)
-        {
-            cultures[i] = cultures[i].Substring(cultures[i].IndexOf(path, StringComparison.Ordinal) + path.Length + 1);
-        }
-
-        return cultures;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
deleted file mode 100644
index 979691acf2..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
+++ /dev/null
@@ -1,630 +0,0 @@
-using System.Globalization;
-using System.Net;
-using System.Security.Claims;
-using System.Security.Principal;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Primitives;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Manifest;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.WebAssets;
-using Umbraco.Cms.Infrastructure.WebAssets;
-using Umbraco.Cms.Web.BackOffice.ActionResults;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.BackOffice.Install;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Cms.Web.Common.ActionsResults;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Cms.Web.Common.Controllers;
-using Umbraco.Cms.Web.Common.Filters;
-using Umbraco.Extensions;
-using SignInResult = Microsoft.AspNetCore.Identity.SignInResult;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[DisableBrowserCache]
-[UmbracoRequireHttps]
-[PluginController(Constants.Web.Mvc.BackOfficeArea)]
-[IsBackOffice]
-public class BackOfficeController : UmbracoController
-{
-    private readonly AppCaches _appCaches;
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly BackOfficeServerVariables _backOfficeServerVariables;
-    private readonly IBackOfficeTwoFactorOptions _backOfficeTwoFactorOptions;
-    private readonly IBackOfficeExternalLoginProviders _externalLogins;
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly IHttpContextAccessor _httpContextAccessor;
-    private readonly IJsonSerializer _jsonSerializer;
-    private readonly ILogger<BackOfficeController> _logger;
-    private readonly IRuntimeMinifier _runtimeMinifier;
-    private readonly IRuntimeState _runtimeState;
-    private readonly IOptions<SecuritySettings> _securitySettings;
-    private readonly ServerVariablesParser _serverVariables;
-    private readonly IBackOfficeSignInManager _signInManager;
-
-    private readonly ILocalizedTextService _textService;
-    // See here for examples of what a lot of this is doing: https://github.com/dotnet/aspnetcore/blob/main/src/Identity/samples/IdentitySample.Mvc/Controllers/AccountController.cs
-    // along with our AuthenticationController
-
-    // NOTE: Each action must either be explicitly authorized or explicitly [AllowAnonymous], the latter is optional because
-    // this controller itself doesn't require authz but it's more clear what the intention is.
-
-    private readonly IBackOfficeUserManager _userManager;
-    private readonly GlobalSettings _globalSettings;
-
-
-    [ActivatorUtilitiesConstructor]
-    public BackOfficeController(
-        IBackOfficeUserManager userManager,
-        IRuntimeState runtimeState,
-        IRuntimeMinifier runtimeMinifier,
-        IOptionsSnapshot<GlobalSettings> globalSettings,
-        IHostingEnvironment hostingEnvironment,
-        ILocalizedTextService textService,
-        BackOfficeServerVariables backOfficeServerVariables,
-        AppCaches appCaches,
-        IBackOfficeSignInManager signInManager,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        ILogger<BackOfficeController> logger,
-        IJsonSerializer jsonSerializer,
-        IBackOfficeExternalLoginProviders externalLogins,
-        IHttpContextAccessor httpContextAccessor,
-        IBackOfficeTwoFactorOptions backOfficeTwoFactorOptions,
-        ServerVariablesParser serverVariables,
-        IOptions<SecuritySettings> securitySettings)
-    {
-        _userManager = userManager;
-        _runtimeState = runtimeState;
-        _runtimeMinifier = runtimeMinifier;
-        _globalSettings = globalSettings.Value;
-        _hostingEnvironment = hostingEnvironment;
-        _textService = textService;
-        _backOfficeServerVariables = backOfficeServerVariables;
-        _appCaches = appCaches;
-        _signInManager = signInManager;
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-        _logger = logger;
-        _jsonSerializer = jsonSerializer;
-        _externalLogins = externalLogins;
-        _httpContextAccessor = httpContextAccessor;
-        _backOfficeTwoFactorOptions = backOfficeTwoFactorOptions;
-        _serverVariables = serverVariables;
-        _securitySettings = securitySettings;
-    }
-
-    [HttpGet]
-    [AllowAnonymous]
-    public async Task<IActionResult> Default()
-    {
-        // force authentication to occur since this is not an authorized endpoint
-        AuthenticateResult result = await this.AuthenticateBackOfficeAsync();
-
-        /*
-         TODO: Remove authentication check & clean controller in V14
-         This is crossed out in V14 to allow the Backoffice to handle authentication itself whilst still allowing
-         the old Umbraco.Web.UI executable now using the updated login screen from V13 to work with the old Backoffice.
-
-        // if we are not authenticated then we need to redirect to the login page
-        if (!result.Succeeded)
-        {
-            return RedirectToLogin(null);
-        }
-        */
-
-        ViewResult defaultView = DefaultView();
-
-        return await RenderDefaultOrProcessExternalLoginAsync(
-            result,
-            () => defaultView);
-    }
-
-    /// <summary>
-    ///     Returns the default view for the BackOffice
-    /// </summary>
-    /// <returns>The default view currently /umbraco/UmbracoBackOffice/Default.cshtml</returns>
-    public ViewResult DefaultView()
-    {
-        var viewPath = Path.Combine(Constants.SystemDirectories.Umbraco, Constants.Web.Mvc.BackOfficeArea, nameof(Default) + ".cshtml")
-            .Replace("\\", "/"); // convert to forward slashes since it's a virtual path
-        return View(viewPath);
-    }
-
-    [HttpGet]
-    [AllowAnonymous]
-    public async Task<IActionResult> Login()
-    {
-        // force authentication to occur since this is not an authorized endpoint
-        AuthenticateResult result = await this.AuthenticateBackOfficeAsync();
-
-        var viewPath = Path.Combine(Constants.SystemDirectories.Umbraco, Constants.Web.Mvc.BackOfficeLoginArea, "Index.cshtml")
-            .Replace("\\", "/"); // convert to forward slashes since it's a virtual path
-
-        return await RenderDefaultOrProcessExternalLoginAsync(
-            result,
-            () => View(viewPath));
-    }
-
-    [HttpGet]
-    [AllowAnonymous]
-    public async Task<IActionResult> VerifyInvite(string invite)
-    {
-        AuthenticateResult authenticate = await this.AuthenticateBackOfficeAsync();
-
-        //if you are hitting VerifyInvite, you're already signed in as a different user, and the token is invalid
-        //you'll exit on one of the return RedirectToAction(nameof(Default)) but you're still logged in so you just get
-        //dumped at the default admin view with no detail
-        if (authenticate.Succeeded)
-        {
-            await _signInManager.SignOutAsync();
-        }
-
-        if (invite == null)
-        {
-            _logger.LogWarning("VerifyUser endpoint reached with invalid token: NULL");
-            return RedirectToLogin(new { flow = "invite-user", status = "invalidToken" });
-        }
-
-        var parts = WebUtility.UrlDecode(invite).Split('|');
-
-        if (parts.Length != 2)
-        {
-            _logger.LogWarning("VerifyUser endpoint reached with invalid token: {Invite}", invite);
-            return RedirectToLogin(new { flow = "invite-user", status = "invalidToken" });
-        }
-
-        var token = parts[1];
-
-        var decoded = token.FromUrlBase64();
-        if (decoded.IsNullOrWhiteSpace())
-        {
-            _logger.LogWarning("VerifyUser endpoint reached with invalid token: {Invite}", invite);
-            return RedirectToLogin(new { flow = "invite-user", status = "invalidToken" });
-        }
-
-        var id = parts[0];
-
-        BackOfficeIdentityUser? identityUser = await _userManager.FindByIdAsync(id);
-        if (identityUser == null)
-        {
-            _logger.LogWarning("VerifyUser endpoint reached with non existing user: {UserId}", id);
-            return RedirectToLogin(new { flow = "invite-user", status = "nonExistingUser" });
-        }
-
-        IdentityResult result = await _userManager.ConfirmEmailAsync(identityUser, decoded!);
-
-        if (result.Succeeded == false)
-        {
-            _logger.LogWarning("Could not verify email, Error: {Errors}, Token: {Invite}", result.Errors.ToErrorMessage(), invite);
-            return RedirectToLogin(new { flow = "invite-user", status = "false", invite = "3" });
-        }
-
-        // sign the user in
-        DateTime? previousLastLoginDate = identityUser.LastLoginDateUtc;
-        await _signInManager.SignInAsync(identityUser, false);
-
-        // reset the lastlogindate back to previous as the user hasn't actually logged in, to add a flag or similar to BackOfficeSignInManager would be a breaking change
-        identityUser.LastLoginDateUtc = previousLastLoginDate;
-        await _userManager.UpdateAsync(identityUser);
-
-        return RedirectToLogin(new { flow = "invite-user", invite = "1" });
-    }
-
-    /// <summary>
-    ///     This Action is used by the installer when an upgrade is detected but the admin user is not logged in. We need to
-    ///     ensure the user is authenticated before the install takes place so we redirect here to show the standard login
-    ///     screen.
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet]
-    [StatusCodeResult(HttpStatusCode.ServiceUnavailable)]
-    [AllowAnonymous]
-    public async Task<IActionResult> AuthorizeUpgrade()
-    {
-        // force authentication to occur since this is not an authorized endpoint
-        AuthenticateResult result = await this.AuthenticateBackOfficeAsync();
-        if (result.Succeeded)
-        {
-            // Redirect to installer if we're already authorized
-            var installerUrl = Url.Action(nameof(InstallController.Index), ControllerExtensions.GetControllerName<InstallController>(), new { area = Cms.Core.Constants.Web.Mvc.InstallArea }) ?? "/";
-            return new LocalRedirectResult(installerUrl);
-        }
-
-        var viewPath = Path.Combine(Constants.SystemDirectories.Umbraco, Constants.Web.Mvc.BackOfficeArea, nameof(Default) + ".cshtml");
-
-        return await RenderDefaultOrProcessExternalLoginAsync(
-            result,
-            //The default view to render when there is no external login info or errors
-            () => View(viewPath));
-    }
-
-    /// <summary>
-    ///     Returns the JavaScript main file including all references found in manifests
-    /// </summary>
-    /// <returns></returns>
-    [MinifyJavaScriptResult(Order = 0)]
-    [HttpGet]
-    [AllowAnonymous]
-    public async Task<IActionResult> Application()
-    {
-        // Removed in separate PR
-        return Ok();
-    }
-
-    /// <summary>
-    ///     Get the json localized text for a given culture or the culture for the current user
-    /// </summary>
-    /// <param name="culture"></param>
-    /// <returns></returns>
-    [HttpGet]
-    [AllowAnonymous]
-    public async Task<Dictionary<string, Dictionary<string, string>>> LocalizedText(string? culture = null)
-    {
-        CultureInfo? cultureInfo = null;
-        if (string.IsNullOrWhiteSpace(culture))
-        {
-            // Force authentication to occur since this is not an authorized endpoint, we need this to get a user.
-            AuthenticateResult authenticationResult = await this.AuthenticateBackOfficeAsync();
-            // We have to get the culture from the Identity, we can't rely on thread culture
-            // It's entirely likely for a user to have a different culture in the backoffice, than their system.
-            IIdentity? user = authenticationResult.Principal?.Identity;
-
-            if (authenticationResult.Succeeded && user is not null)
-            {
-                cultureInfo = user.GetCulture();
-            }
-
-            cultureInfo ??= CultureInfo.GetCultureInfo(_globalSettings.DefaultUILanguage);
-        }
-        else
-        {
-            cultureInfo = CultureInfo.GetCultureInfo(culture);
-        }
-
-        IDictionary<string, string> allValues = _textService.GetAllStoredValues(cultureInfo!);
-        var pathedValues = allValues.Select(kv =>
-        {
-            var slashIndex = kv.Key.IndexOf('/');
-            var areaAlias = kv.Key[..slashIndex];
-            var valueAlias = kv.Key[(slashIndex + 1)..];
-            return new { areaAlias, valueAlias, value = kv.Value };
-        });
-
-        var nestedDictionary = pathedValues
-            .GroupBy(pv => pv.areaAlias)
-            .ToDictionary(pv => pv.Key, pv =>
-                pv.ToDictionary(pve => pve.valueAlias, pve => pve.value));
-
-        return nestedDictionary;
-    }
-
-    /// <summary>
-    ///     Returns the JavaScript object representing the static server variables javascript object
-    /// </summary>
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
-    [MinifyJavaScriptResult(Order = 1)]
-    public async Task<JavaScriptResult> ServerVariables()
-    {
-        // cache the result if debugging is disabled
-        var serverVars = await _serverVariables.ParseAsync(await _backOfficeServerVariables.GetServerVariablesAsync());
-        var result = _hostingEnvironment.IsDebugMode
-            ? serverVars
-            : _appCaches.RuntimeCache.GetCacheItem(
-                typeof(BackOfficeController) + "ServerVariables",
-                () => serverVars,
-                new TimeSpan(0, 10, 0));
-
-        return new JavaScriptResult(result);
-    }
-
-    [HttpPost]
-    [AllowAnonymous]
-    public ActionResult ExternalLogin(string provider, string? redirectUrl = null)
-    {
-        // Only relative urls are accepted as redirect url
-        // We can't simply use Uri.TryCreate with kind Absolute, as in Linux any relative url would be seen as an absolute file uri
-        if (redirectUrl == null || !Uri.TryCreate(redirectUrl, UriKind.RelativeOrAbsolute, out Uri? redirectUri) || redirectUri.IsAbsoluteUri)
-        {
-            redirectUrl = Url.Action(nameof(Default), this.GetControllerName());
-        }
-
-        // Configures the redirect URL and user identifier for the specified external login
-        AuthenticationProperties properties =
-            _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
-
-        return Challenge(properties, provider);
-    }
-
-    /// <summary>
-    ///     Called when a user links an external login provider in the back office
-    /// </summary>
-    /// <param name="provider"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
-    [HttpPost]
-    public ActionResult LinkLogin(string provider)
-    {
-        // Request a redirect to the external login provider to link a login for the current user
-        var redirectUrl = Url.Action(nameof(ExternalLinkLoginCallback), this.GetControllerName());
-
-        // Configures the redirect URL and user identifier for the specified external login including xsrf data
-        AuthenticationProperties properties =
-            _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl, _userManager.GetUserId(User));
-
-        return Challenge(properties, provider);
-    }
-
-    [HttpGet]
-    [AllowAnonymous]
-    public async Task<IActionResult> ValidatePasswordResetCode([Bind(Prefix = "u")] int userId, [Bind(Prefix = "r")] string resetCode)
-    {
-        BackOfficeIdentityUser? user = await _userManager.FindByIdAsync(userId.ToString(CultureInfo.InvariantCulture));
-        if (user is null)
-        {
-            return RedirectToLogin(new { flow = "reset-password", status = "userNotFound" });
-        }
-
-        var result = await _userManager.VerifyUserTokenAsync(user, "Default", "ResetPassword", resetCode);
-
-        return result ?
-
-            // Redirect to login with userId and resetCode
-            RedirectToLogin(new { flow = "reset-password", userId, resetCode }) :
-
-            // Redirect to login with error code
-            RedirectToLogin(new { flow = "reset-password", status = "resetCodeExpired" });
-    }
-
-    /// <summary>
-    ///     Callback path when the user initiates a link login request from the back office to the external provider from the
-    ///     <see cref="LinkLogin(string)" /> action
-    /// </summary>
-    /// <remarks>
-    ///     An example of this is here
-    ///     https://github.com/dotnet/aspnetcore/blob/main/src/Identity/samples/IdentitySample.Mvc/Controllers/AccountController.cs#L155
-    ///     which this is based on
-    /// </remarks>
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
-    [HttpGet]
-    public async Task<IActionResult> ExternalLinkLoginCallback()
-    {
-        BackOfficeIdentityUser? user = await _userManager.GetUserAsync(User);
-        if (user == null)
-        {
-            // ... this should really not happen
-            TempData[ViewDataExtensions.TokenExternalSignInError] = new[] { "Local user does not exist" };
-            return RedirectToLogin(new { flow = "external-login", status = "localUserNotFound", logout = "true"});
-        }
-
-        ExternalLoginInfo? info =
-            await _signInManager.GetExternalLoginInfoAsync(await _userManager.GetUserIdAsync(user));
-
-        if (info == null)
-        {
-            // Add error and redirect for it to be displayed
-            TempData[ViewDataExtensions.TokenExternalSignInError] =
-                new[] { "An error occurred, could not get external login info" };
-            return RedirectToLogin(new { flow = "external-login", status = "externalLoginInfoNotFound", logout = "true"});
-        }
-
-        IdentityResult addLoginResult = await _userManager.AddLoginAsync(user, info);
-        if (addLoginResult.Succeeded)
-        {
-            // Update any authentication tokens if succeeded
-            await _signInManager.UpdateExternalAuthenticationTokensAsync(info);
-
-            return RedirectToLocal(Url.Action(nameof(Default), this.GetControllerName()));
-        }
-
-        // Add errors and redirect for it to be displayed
-        TempData[ViewDataExtensions.TokenExternalSignInError] = addLoginResult.Errors;
-        return RedirectToLogin(new { flow = "external-login", status = "failed", logout = "true" });
-    }
-
-    /// <summary>
-    ///     Used by Default and AuthorizeUpgrade to render as per normal if there's no external login info,
-    ///     otherwise process the external login info.
-    /// </summary>
-    /// <returns></returns>
-    private async Task<IActionResult> RenderDefaultOrProcessExternalLoginAsync(
-        AuthenticateResult authenticateResult,
-        Func<IActionResult> defaultResponse)
-    {
-        ArgumentNullException.ThrowIfNull(defaultResponse);
-
-        ViewData.SetUmbracoPath(_globalSettings.GetUmbracoMvcArea(_hostingEnvironment));
-
-        // check if there is the TempData or cookies with the any token name specified, if so, assign to view bag and render the view
-        if (ViewData.FromBase64CookieData<BackOfficeExternalLoginProviderErrors>(
-                _httpContextAccessor.HttpContext,
-                ViewDataExtensions.TokenExternalSignInError,
-                _jsonSerializer) ||
-            ViewData.FromTempData(TempData, ViewDataExtensions.TokenExternalSignInError))
-        {
-            // Return early to let the client side handle the messaging
-            return defaultResponse();
-        }
-
-        // First check if there's external login info, if there's not proceed as normal
-        ExternalLoginInfo? loginInfo = await _signInManager.GetExternalLoginInfoAsync();
-
-        if (loginInfo != null)
-        {
-            // we're just logging in with an external source, not linking accounts
-            return await ExternalSignInAsync(loginInfo, defaultResponse);
-        }
-
-        // If we are authenticated then we can just render the default view
-        if (authenticateResult.Succeeded)
-        {
-            return defaultResponse();
-        }
-
-        // If the user is not logged in, check if there's any auto login redirects specified
-        var oauthRedirectAuthProvider = _externalLogins.GetAutoLoginProvider();
-
-        // If there's no auto login provider specified, then we'll render the default view
-        if (oauthRedirectAuthProvider.IsNullOrWhiteSpace())
-        {
-            return defaultResponse();
-        }
-
-        // If the ?logout=true query string is not specified, then we'll redirect to the external login provider
-        // which will then redirect back to the ExternalLoginCallback action
-        if (Request.Query.TryGetValue("logout", out StringValues logout) == false || logout != "true")
-        {
-            return ExternalLogin(oauthRedirectAuthProvider);
-        }
-
-        return defaultResponse();
-    }
-
-    private async Task<IActionResult> ExternalSignInAsync(ExternalLoginInfo loginInfo, Func<IActionResult> response)
-    {
-        if (loginInfo == null)
-        {
-            throw new ArgumentNullException(nameof(loginInfo));
-        }
-
-        if (response == null)
-        {
-            throw new ArgumentNullException(nameof(response));
-        }
-
-        // Sign in the user with this external login provider (which auto links, etc...)
-        SignInResult result = await _signInManager.ExternalLoginSignInAsync(loginInfo, false, _securitySettings.Value.UserBypassTwoFactorForExternalLogins);
-
-        var errors = new List<string>();
-
-        if (result == SignInResult.Success)
-        {
-            // Update any authentication tokens if succeeded
-            await _signInManager.UpdateExternalAuthenticationTokensAsync(loginInfo);
-
-            // Check if we are in an upgrade state, if so we need to redirect
-            if (_runtimeState.Level == RuntimeLevel.Upgrade)
-            {
-                // redirect to the the installer
-                return RedirectToLocal(null);
-            }
-        }
-        else if (result == SignInResult.TwoFactorRequired)
-        {
-            BackOfficeIdentityUser? attemptedUser = await _userManager.FindByLoginAsync(loginInfo.LoginProvider, loginInfo.ProviderKey);
-                if (attemptedUser?.UserName is null)
-            {
-                return new ValidationErrorResult(
-                    $"No local user found for the login provider {loginInfo.LoginProvider} - {loginInfo.ProviderKey}");
-            }
-
-            var twofactorView = _backOfficeTwoFactorOptions.GetTwoFactorView(attemptedUser.UserName);
-            if (twofactorView.IsNullOrWhiteSpace())
-            {
-                return new ValidationErrorResult(
-                    $"The registered {typeof(IBackOfficeTwoFactorOptions)} of type {_backOfficeTwoFactorOptions.GetType()} did not return a view for two factor auth ");
-            }
-
-            // create a with information to display a custom two factor send code view
-            var verifyResponse =
-                new ObjectResult(new { twoFactorView = twofactorView, userId = attemptedUser.Id })
-                {
-                    StatusCode = StatusCodes.Status402PaymentRequired
-                };
-
-            return verifyResponse;
-        }
-        else if (result == SignInResult.LockedOut)
-        {
-            errors.Add(
-                $"The local user {loginInfo.Principal.Identity?.Name} for the external provider {loginInfo.ProviderDisplayName} is locked out.");
-        }
-        else if (result == SignInResult.NotAllowed)
-        {
-            // This occurs when SignInManager.CanSignInAsync fails which is when RequireConfirmedEmail , RequireConfirmedPhoneNumber or RequireConfirmedAccount fails
-            // however since we don't enforce those rules (yet) this shouldn't happen.
-            errors.Add(
-                $"The user {loginInfo.Principal.Identity?.Name} for the external provider {loginInfo.ProviderDisplayName} has not confirmed their details and cannot sign in.");
-        }
-        else if (result == SignInResult.Failed)
-        {
-            // Failed only occurs when the user does not exist
-            errors.Add("The requested provider (" + loginInfo.LoginProvider +
-                       ") has not been linked to an account, the provider must be linked from the back office.");
-        }
-        else if (result == ExternalLoginSignInResult.NotAllowed)
-        {
-            // This occurs when the external provider has approved the login but custom logic in OnExternalLogin has denined it.
-            errors.Add(
-                $"The user {loginInfo.Principal.Identity?.Name} for the external provider {loginInfo.ProviderDisplayName} has not been accepted and cannot sign in.");
-        }
-        else if (result == AutoLinkSignInResult.FailedNotLinked)
-        {
-            errors.Add("The requested provider (" + loginInfo.LoginProvider +
-                       ") has not been linked to an account, the provider must be linked from the back office.");
-        }
-        else if (result == AutoLinkSignInResult.FailedNoEmail)
-        {
-            errors.Add(
-                $"The requested provider ({loginInfo.LoginProvider}) has not provided the email claim {ClaimTypes.Email}, the account cannot be linked.");
-        }
-        else if (result is AutoLinkSignInResult autoLinkSignInResult && autoLinkSignInResult.Errors.Count > 0)
-        {
-            errors.AddRange(autoLinkSignInResult.Errors);
-        }
-        else if (!result.Succeeded)
-        {
-            // this shouldn't occur, the above should catch the correct error but we'll be safe just in case
-            errors.Add($"An unknown error with the requested provider ({loginInfo.LoginProvider}) occurred.");
-        }
-
-        if (errors.Count > 0)
-        {
-            // the external user might actually be signed in at this point, but certain errors (i.e. missing claims)
-            // prevents us from applying said user to a back-office session. make sure the sign-in manager does not
-            // report the user as being signed in for subsequent requests.
-            await _signInManager.SignOutAsync();
-
-            ViewData.SetExternalSignInProviderErrors(
-                new BackOfficeExternalLoginProviderErrors(
-                    loginInfo.LoginProvider,
-                    errors));
-        }
-
-        return response();
-    }
-
-    private RedirectResult RedirectToLocal(string? returnUrl)
-    {
-        if (Url.IsLocalUrl(returnUrl))
-        {
-            return Redirect(returnUrl);
-        }
-
-        return Redirect("/");
-    }
-
-    /// <summary>
-    ///     Redirect the user to the login action with the specified path as string and parameter as object
-    /// </summary>
-    /// <param name="values">Object containing route values</param>
-    /// <returns>Redirects the user session to the login page</returns>
-    private LocalRedirectResult RedirectToLogin(object? values)
-    {
-        var url = Url.Action(nameof(Login).ToLower(), this.GetControllerName(), values);
-
-        return new LocalRedirectResult(url ?? "/");
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeNotificationsController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeNotificationsController.cs
deleted file mode 100644
index 5508593277..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeNotificationsController.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.Common.ActionsResults;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     An abstract controller that automatically checks if any request is a non-GET and if the
-///     resulting message is INotificationModel in which case it will append any Event Messages
-///     currently in the request.
-/// </summary>
-[PrefixlessBodyModelValidator]
-[AppendCurrentEventMessages]
-public abstract class BackOfficeNotificationsController : UmbracoAuthorizedJsonController
-{
-    /// <summary>
-    ///     returns a 200 OK response with a notification message
-    /// </summary>
-    /// <param name="message"></param>
-    /// <returns></returns>
-    protected OkObjectResult Ok(string message)
-    {
-        var notificationModel = new SimpleNotificationModel { Message = message };
-        notificationModel.AddSuccessNotification(message, string.Empty);
-
-        return new OkObjectResult(notificationModel);
-    }
-
-    /// <summary>
-    ///     Overridden to ensure that the error message is an error notification message
-    /// </summary>
-    /// <param name="errorMessage"></param>
-    /// <returns></returns>
-    protected override ActionResult ValidationProblem(string? errorMessage)
-        => ValidationProblem(errorMessage, string.Empty);
-
-    /// <summary>
-    ///     Creates a notofication validation problem with a header and message
-    /// </summary>
-    /// <param name="errorHeader"></param>
-    /// <param name="errorMessage"></param>
-    /// <returns></returns>
-    protected ActionResult ValidationProblem(string? errorHeader, string errorMessage)
-    {
-        var notificationModel = new SimpleNotificationModel { Message = errorMessage };
-        notificationModel.AddErrorNotification(errorHeader, errorMessage);
-        return new ValidationErrorResult(notificationModel);
-    }
-
-    /// <summary>
-    ///     Overridden to ensure that all queued notifications are sent to the back office
-    /// </summary>
-    /// <returns></returns>
-    [NonAction]
-    public override ActionResult ValidationProblem()
-        // returning an object of INotificationModel will ensure that any pending
-        // notification messages are added to the response.
-        => new ValidationErrorResult(new SimpleNotificationModel());
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
deleted file mode 100644
index 0ca3c2ccbb..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
+++ /dev/null
@@ -1,759 +0,0 @@
-using System.Runtime.Serialization;
-using System.Web;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.ViewFeatures;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Features;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Mail;
-using Umbraco.Cms.Core.Media;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.TemplateQuery;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Core.WebAssets;
-using Umbraco.Cms.Web.BackOffice.HealthChecks;
-using Umbraco.Cms.Web.BackOffice.Profiling;
-using Umbraco.Cms.Web.BackOffice.PropertyEditors;
-using Umbraco.Cms.Web.BackOffice.Routing;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Cms.Web.BackOffice.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Models;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers
-{
-    /// <summary>
-    /// Used to collect the server variables for use in the back office angular app
-    /// </summary>
-    public class BackOfficeServerVariables
-    {
-        private readonly LinkGenerator _linkGenerator;
-        private readonly IRuntimeState _runtimeState;
-        private readonly UmbracoFeatures _features;
-        private GlobalSettings _globalSettings;
-        private readonly IUmbracoVersion _umbracoVersion;
-        private ContentSettings _contentSettings;
-        private readonly TreeCollection _treeCollection;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IHostingEnvironment _hostingEnvironment;
-        private RuntimeSettings _runtimeSettings;
-        private SecuritySettings _securitySettings;
-        private readonly IRuntimeMinifier _runtimeMinifier;
-        private readonly IBackOfficeExternalLoginProviders _externalLogins;
-        private readonly IImageUrlGenerator _imageUrlGenerator;
-        private readonly PreviewRoutes _previewRoutes;
-        private readonly IEmailSender _emailSender;
-        private MemberPasswordConfigurationSettings _memberPasswordConfigurationSettings;
-        private DataTypesSettings _dataTypesSettings;
-        private readonly ITempDataDictionaryFactory _tempDataDictionaryFactory;
-        private MarketplaceSettings _marketplaceSettings;
-
-        [Obsolete("Use constructor that takes IOptionsMontior<DataTypeSettings>, scheduled for removal in V12")]
-        public BackOfficeServerVariables(
-            LinkGenerator linkGenerator,
-            IRuntimeState runtimeState,
-            UmbracoFeatures features,
-            IOptionsMonitor<GlobalSettings> globalSettings,
-            IUmbracoVersion umbracoVersion,
-            IOptionsMonitor<ContentSettings> contentSettings,
-            IHttpContextAccessor httpContextAccessor,
-            TreeCollection treeCollection,
-            IHostingEnvironment hostingEnvironment,
-            IOptionsMonitor<RuntimeSettings> runtimeSettings,
-            IOptionsMonitor<SecuritySettings> securitySettings,
-            IRuntimeMinifier runtimeMinifier,
-            IBackOfficeExternalLoginProviders externalLogins,
-            IImageUrlGenerator imageUrlGenerator,
-            PreviewRoutes previewRoutes,
-            IEmailSender emailSender,
-            IOptionsMonitor<MemberPasswordConfigurationSettings> memberPasswordConfigurationSettings)
-        : this(
-            linkGenerator,
-            runtimeState,
-            features,
-            globalSettings,
-            umbracoVersion,
-            contentSettings,
-            httpContextAccessor,
-            treeCollection,
-            hostingEnvironment,
-            runtimeSettings,
-            securitySettings,
-            runtimeMinifier,
-            externalLogins,
-            imageUrlGenerator,
-            previewRoutes,
-            emailSender,
-            memberPasswordConfigurationSettings,
-            StaticServiceProvider.Instance.GetRequiredService<IOptionsMonitor<DataTypesSettings>>())
-        {
-        }
-
-        [Obsolete("Use constructor that takes ITempDataDictionaryFactory, scheduled for removal in V12")]
-        public BackOfficeServerVariables(
-            LinkGenerator linkGenerator,
-            IRuntimeState runtimeState,
-            UmbracoFeatures features,
-            IOptionsMonitor<GlobalSettings> globalSettings,
-            IUmbracoVersion umbracoVersion,
-            IOptionsMonitor<ContentSettings> contentSettings,
-            IHttpContextAccessor httpContextAccessor,
-            TreeCollection treeCollection,
-            IHostingEnvironment hostingEnvironment,
-            IOptionsMonitor<RuntimeSettings> runtimeSettings,
-            IOptionsMonitor<SecuritySettings> securitySettings,
-            IRuntimeMinifier runtimeMinifier,
-            IBackOfficeExternalLoginProviders externalLogins,
-            IImageUrlGenerator imageUrlGenerator,
-            PreviewRoutes previewRoutes,
-            IEmailSender emailSender,
-            IOptionsMonitor<MemberPasswordConfigurationSettings> memberPasswordConfigurationSettings,
-            IOptionsMonitor<DataTypesSettings> dataTypesSettings)
-        : this(
-            linkGenerator,
-            runtimeState,
-            features,
-            globalSettings,
-            umbracoVersion,
-            contentSettings,
-            httpContextAccessor,
-            treeCollection,
-            hostingEnvironment,
-            runtimeSettings,
-            securitySettings,
-            runtimeMinifier,
-            externalLogins,
-            imageUrlGenerator,
-            previewRoutes,
-            emailSender,
-            memberPasswordConfigurationSettings,
-            dataTypesSettings,
-            StaticServiceProvider.Instance.GetRequiredService<ITempDataDictionaryFactory>())
-        {
-        }
-
-        [Obsolete("Use constructor that takes IOptionsMonitor<MarketplaceSettings>, scheduled for removal in V13")]
-        public BackOfficeServerVariables(
-            LinkGenerator linkGenerator,
-            IRuntimeState runtimeState,
-            UmbracoFeatures features,
-            IOptionsMonitor<GlobalSettings> globalSettings,
-            IUmbracoVersion umbracoVersion,
-            IOptionsMonitor<ContentSettings> contentSettings,
-            IHttpContextAccessor httpContextAccessor,
-            TreeCollection treeCollection,
-            IHostingEnvironment hostingEnvironment,
-            IOptionsMonitor<RuntimeSettings> runtimeSettings,
-            IOptionsMonitor<SecuritySettings> securitySettings,
-            IRuntimeMinifier runtimeMinifier,
-            IBackOfficeExternalLoginProviders externalLogins,
-            IImageUrlGenerator imageUrlGenerator,
-            PreviewRoutes previewRoutes,
-            IEmailSender emailSender,
-            IOptionsMonitor<MemberPasswordConfigurationSettings> memberPasswordConfigurationSettings,
-            IOptionsMonitor<DataTypesSettings> dataTypesSettings,
-            ITempDataDictionaryFactory tempDataDictionaryFactory)
-            : this(
-                linkGenerator,
-                runtimeState,
-                features,
-                globalSettings,
-                umbracoVersion,
-                contentSettings,
-                httpContextAccessor,
-                treeCollection,
-                hostingEnvironment,
-                runtimeSettings,
-                securitySettings,
-                runtimeMinifier,
-                externalLogins,
-                imageUrlGenerator,
-                previewRoutes,
-                emailSender,
-                memberPasswordConfigurationSettings,
-                dataTypesSettings,
-                tempDataDictionaryFactory,
-                StaticServiceProvider.Instance.GetRequiredService<IOptionsMonitor<MarketplaceSettings>>()
-                )
-        {
-        }
-
-         public BackOfficeServerVariables(
-            LinkGenerator linkGenerator,
-            IRuntimeState runtimeState,
-            UmbracoFeatures features,
-            IOptionsMonitor<GlobalSettings> globalSettings,
-            IUmbracoVersion umbracoVersion,
-            IOptionsMonitor<ContentSettings> contentSettings,
-            IHttpContextAccessor httpContextAccessor,
-            TreeCollection treeCollection,
-            IHostingEnvironment hostingEnvironment,
-            IOptionsMonitor<RuntimeSettings> runtimeSettings,
-            IOptionsMonitor<SecuritySettings> securitySettings,
-            IRuntimeMinifier runtimeMinifier,
-            IBackOfficeExternalLoginProviders externalLogins,
-            IImageUrlGenerator imageUrlGenerator,
-            PreviewRoutes previewRoutes,
-            IEmailSender emailSender,
-            IOptionsMonitor<MemberPasswordConfigurationSettings> memberPasswordConfigurationSettings,
-            IOptionsMonitor<DataTypesSettings> dataTypesSettings,
-            ITempDataDictionaryFactory tempDataDictionaryFactory,
-            IOptionsMonitor<MarketplaceSettings> marketplaceSettings)
-        {
-            _linkGenerator = linkGenerator;
-            _runtimeState = runtimeState;
-            _features = features;
-            _globalSettings = globalSettings.CurrentValue;
-            _umbracoVersion = umbracoVersion;
-            _contentSettings = contentSettings.CurrentValue ?? throw new ArgumentNullException(nameof(contentSettings));
-            _httpContextAccessor = httpContextAccessor;
-            _treeCollection = treeCollection ?? throw new ArgumentNullException(nameof(treeCollection));
-            _hostingEnvironment = hostingEnvironment;
-            _runtimeSettings = runtimeSettings.CurrentValue;
-            _securitySettings = securitySettings.CurrentValue;
-            _runtimeMinifier = runtimeMinifier;
-            _externalLogins = externalLogins;
-            _imageUrlGenerator = imageUrlGenerator;
-            _previewRoutes = previewRoutes;
-            _emailSender = emailSender;
-            _tempDataDictionaryFactory = tempDataDictionaryFactory;
-            _memberPasswordConfigurationSettings = memberPasswordConfigurationSettings.CurrentValue;
-            _dataTypesSettings = dataTypesSettings.CurrentValue;
-            _marketplaceSettings = marketplaceSettings.CurrentValue;
-
-            globalSettings.OnChange(x => _globalSettings = x);
-            contentSettings.OnChange(x => _contentSettings = x);
-            runtimeSettings.OnChange(x => _runtimeSettings = x);
-            securitySettings.OnChange(x => _securitySettings = x);
-            dataTypesSettings.OnChange(x => _dataTypesSettings = x);
-            memberPasswordConfigurationSettings.OnChange(x => _memberPasswordConfigurationSettings = x);
-            marketplaceSettings.OnChange(x => _marketplaceSettings = x);
-        }
-
-        /// <summary>
-        /// Returns the server variables for non-authenticated users
-        /// </summary>
-        /// <returns></returns>
-        internal async Task<Dictionary<string, object>> BareMinimumServerVariablesAsync()
-        {
-            // figure out if we are executing in context of a backoffice user
-            HttpContext? context = _httpContextAccessor.HttpContext;
-            var isBackofficeUser = false;
-            if (context != null)
-            {
-                // first look for an authorized user (this covers both logged in and invited users)
-                isBackofficeUser = (await context.AuthenticateBackOfficeAsync()).Succeeded;
-                if (isBackofficeUser == false)
-                {
-                    // here's where things get a little ugly:
-                    // when a backoffice user is about to reset their password, TempData[ViewDataExtensions.TokenPasswordResetCode]
-                    // contains a JSON object with the current user ID and a password reset code - see ValidatePasswordResetCodeModel
-                    ITempDataDictionary tempData = _tempDataDictionaryFactory.GetTempData(context);
-                    var passwordResetCode = tempData[ViewDataExtensions.TokenPasswordResetCode];
-                    isBackofficeUser = passwordResetCode is string passwordResetCodeString && passwordResetCodeString.InvariantContains("userId");
-                }
-            }
-
-            //this is the filter for the keys that we'll keep based on the full version of the server vars
-            var umbracoSettings = new List<string> {
-                "allowPasswordReset",
-                "imageFileTypes",
-                "loginBackgroundImage",
-                "loginLogoImage",
-                "loginLogoImageAlternative",
-                "canSendRequiredEmail",
-                "usernameIsEmail",
-                "hideBackofficeLogo",
-                "disableDeleteWhenReferenced",
-                "disableUnpublishWhenReferenced"
-            };
-
-            // add a few extras for backoffice users (server vars we don't want floating around for anonymous users)
-            if (isBackofficeUser)
-            {
-                umbracoSettings.AddRange(new[] { "maxFileSize", "minimumPasswordLength", "minimumPasswordNonAlphaNum" });
-            }
-
-            var keepOnlyKeys = new Dictionary<string, string[]>
-            {
-                {"umbracoUrls", new[] {"authenticationApiBaseUrl", "serverVarsJs", "externalLoginsUrl", "currentUserApiBaseUrl", "previewHubUrl", "iconApiBaseUrl"}},
-                {"umbracoSettings", umbracoSettings.ToArray()},
-                {"application", new[] {"applicationPath", "cacheBuster"}},
-                {"isDebuggingEnabled", new string[] { }},
-                {"features", new [] {"disabledFeatures"}}
-            };
-
-            //now do the filtering...
-            Dictionary<string, object> defaults = await GetServerVariablesAsync();
-            foreach (var key in defaults.Keys.ToArray())
-            {
-                if (keepOnlyKeys.ContainsKey(key) == false)
-                {
-                    defaults.Remove(key);
-                }
-                else
-                {
-                    if (defaults[key] is System.Collections.IDictionary asDictionary)
-                    {
-                        var toKeep = keepOnlyKeys[key];
-                        foreach (var k in asDictionary.Keys.Cast<string>().ToArray())
-                        {
-                            if (toKeep.Contains(k) == false)
-                            {
-                                asDictionary.Remove(k);
-                            }
-                        }
-                    }
-                }
-            }
-
-            // TODO: This is ultra confusing! this same key is used for different things, when returning the full app when authenticated it is this URL but when not auth'd it's actually the ServerVariables address
-            // so based on compat and how things are currently working we need to replace the serverVarsJs one
-            ((Dictionary<string, object?>)defaults["umbracoUrls"])["serverVarsJs"]
-                = _linkGenerator.GetPathByAction(
-                    nameof(BackOfficeController.ServerVariables),
-                    ControllerExtensions.GetControllerName<BackOfficeController>(),
-                    new { area = Constants.Web.Mvc.BackOfficeArea });
-
-            return defaults;
-        }
-
-        /// <summary>
-        /// Returns the server variables for authenticated users
-        /// </summary>
-        /// <returns></returns>
-        internal async Task<Dictionary<string, object>> GetServerVariablesAsync()
-        {
-            GlobalSettings globalSettings = _globalSettings;
-            var backOfficeControllerName = ControllerExtensions.GetControllerName<BackOfficeController>();
-            var defaultVals = new Dictionary<string, object>
-            {
-                {
-                    "umbracoUrls", new Dictionary<string, object?>
-                    {
-                        // TODO: Add 'umbracoApiControllerBaseUrl' which people can use in JS
-                        // to prepend their URL. We could then also use this in our own resources instead of
-                        // having each URL defined here explicitly - we can do that in v8! for now
-                        // for umbraco services we'll stick to explicitly defining the endpoints.
-
-                        {"externalLoginsUrl", _linkGenerator.GetPathByAction(nameof(BackOfficeController.ExternalLogin), backOfficeControllerName, new { area = Constants.Web.Mvc.BackOfficeArea })},
-                        {"externalLinkLoginsUrl", _linkGenerator.GetPathByAction(nameof(BackOfficeController.LinkLogin), backOfficeControllerName, new { area = Constants.Web.Mvc.BackOfficeArea })},
-                        // TODO: This is ultra confusing! this same key is used for different things, when returning the full app when authenticated it is this URL but when not auth'd it's actually the ServerVariables address
-                        {"serverVarsJs", _linkGenerator.GetPathByAction(nameof(BackOfficeController.Application), backOfficeControllerName, new { area = Constants.Web.Mvc.BackOfficeArea })},
-                        {"marketplaceUrl",  GetMarketplaceUrl()},
-                        //API URLs
-                        {
-                            "packagesRestApiBaseUrl", Constants.PackageRepository.RestApiBaseUrl
-                        },
-                        {
-                            "redirectUrlManagementApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<RedirectUrlManagementController>(
-                                controller => controller.GetEnableState())
-                        },
-                        {
-                            "tourApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<TourController>(
-                                controller => controller.GetTours())
-                        },
-                        {
-                            "embedApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<RteEmbedController>(
-                                controller => controller.GetEmbed(string.Empty, 0, 0))
-                        },
-                        {
-                            "userApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<UsersController>(
-                                controller => controller.PostSaveUser(new UserSave()))
-                        },
-                        {
-                            "userGroupsApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<UserGroupsController>(
-                                controller => controller.PostSaveUserGroup(new UserGroupSave()))
-                        },
-                        {
-                            "contentApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<ContentController>(
-                                controller => controller.PostSave(new ContentItemSave()))
-                        },
-                        {
-                            "publicAccessApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<PublicAccessController>(
-                                controller => controller.GetPublicAccess(0))
-                        },
-                        {
-                            "iconApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<IconController>(
-                                controller => controller.GetIcon(string.Empty))
-                        },
-                        {
-                            "imagesApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<ImagesController>(
-                                controller => controller.GetBigThumbnail(string.Empty))
-                        },
-                        {
-                            "treeApplicationApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<ApplicationTreeController>(
-                                controller => controller.GetApplicationTrees(string.Empty, string.Empty, FormCollection.Empty, TreeUse.None))
-                        },
-                        {
-                            "contentTypeApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<ContentTypeController>(
-                                controller => controller.GetAllowedChildren(0))
-                        },
-                        {
-                            "mediaTypeApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<MediaTypeController>(
-                                controller => controller.GetAllowedChildren(0))
-                        },
-                        {
-                            "macroRenderingApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<MacroRenderingController>(
-                                controller => controller.GetMacroParameters(0))
-                        },
-                        {
-                            "authenticationApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<AuthenticationController>(
-                                controller => controller.PostLogin(new LoginModel()))
-                        },
-                        {
-                            "twoFactorLoginApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<TwoFactorLoginController>(
-                                controller => controller.SetupInfo(string.Empty))
-                        },
-                        {
-                            "currentUserApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<CurrentUserController>(
-                                controller => controller.PostSetAvatar(new List<IFormFile>()))
-                        },
-                        {
-                            "entityApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<EntityController>(
-                                controller => controller.GetById(0, UmbracoEntityTypes.Media))
-                        },
-                        {
-                            "dataTypeApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<DataTypeController>(
-                                controller => controller.GetById(0))
-                        },
-                        {
-                            "logApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<LogController>(
-                                controller => controller.GetPagedEntityLog(0, 0, 0, Direction.Ascending, null))
-                        },
-                        {
-                            "packageApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<PackageController>(
-                                controller => controller.GetCreatedPackages())
-                        },
-                        {
-                            "relationApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<RelationController>(
-                                controller => controller.GetById(0))
-                        },
-                        {
-                            "rteApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<RichTextPreValueController>(
-                                controller => controller.GetConfiguration())
-                        },
-                        {
-                            "stylesheetApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<StylesheetController>(
-                                controller => controller.GetAll())
-                        },
-                        {
-                            "memberTypeApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<MemberTypeController>(
-                                controller => controller.GetById(0))
-                        },
-                        {
-                            "memberTypeQueryApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<MemberTypeQueryController>(
-                                controller => controller.GetAllTypes())
-                        },
-                        {
-                            "memberGroupApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<MemberGroupController>(
-                                controller => controller.GetAllGroups())
-                        },
-                        {
-                            "updateCheckApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<UpdateCheckController>(
-                                controller => controller.GetCheck())
-                        },
-                        {
-                            "templateApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<TemplateController>(
-                                controller => controller.GetById(0))
-                        },
-                        {
-                            "memberTreeBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<MemberTreeController>(
-                                controller => controller.GetNodes("-1", FormCollection.Empty))
-                        },
-                        {
-                            "mediaTreeBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<MediaTreeController>(
-                                controller => controller.GetNodes("-1", FormCollection.Empty))
-                        },
-                        {
-                            "contentTreeBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<ContentTreeController>(
-                                controller => controller.GetNodes("-1", FormCollection.Empty))
-                        },
-                        {
-                            "tagsDataBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<TagsDataController>(
-                                controller => controller.GetTags(string.Empty, string.Empty, null))
-                        },
-                        {
-                            "examineMgmtBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<ExamineManagementController>(
-                                controller => controller.GetIndexerDetails())
-                        },
-                        {
-                            "healthCheckBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<HealthCheckController>(
-                                controller => controller.GetAllHealthChecks())
-                        },
-                        {
-                            "templateQueryApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<TemplateQueryController>(
-                                controller => controller.PostTemplateQuery(new QueryModel()))
-                        },
-                        {
-                            "codeFileApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<CodeFileController>(
-                                controller => controller.GetByPath(string.Empty, string.Empty))
-                        },
-                        {
-                            "publishedStatusBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<PublishedStatusController>(
-                                controller => controller.GetPublishedStatusUrl())
-                        },
-                        {
-                            "dictionaryApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<DictionaryController>(
-                                controller => controller.DeleteById(int.MaxValue))
-                        },
-                        {
-                            "publishedSnapshotCacheStatusBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<PublishedSnapshotCacheStatusController>(
-                                controller => controller.GetStatus())
-                        },
-                        {
-                            "helpApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<HelpController>(
-                                controller => controller.GetContextHelpForPage(string.Empty,string.Empty,string.Empty))
-                        },
-                        {
-                            "backOfficeAssetsApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<BackOfficeAssetsController>(
-                                controller => controller.GetSupportedLocales())
-                        },
-                        {
-                            "languageApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<LanguageController>(
-                                controller => controller.GetAllLanguages())
-                        },
-                        {
-                            "relationTypeApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<RelationTypeController>(
-                                controller => controller.GetById(1))
-                        },
-                        {
-                            "logViewerApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<LogViewerController>(
-                                controller => controller.GetNumberOfErrors(null, null))
-                        },
-                        {
-                            "webProfilingBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<WebProfilingController>(
-                                controller => controller.GetStatus())
-                        },
-                        {
-                            "tinyMceApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<TinyMceController>(
-                                controller => controller.UploadImage(new FormFileCollection()))
-                        },
-                        {
-                            "imageUrlGeneratorApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<ImageUrlGeneratorController>(
-                                controller => controller.GetCropUrl(string.Empty, null, null, null))
-                        },
-                        {
-                            "elementTypeApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<ElementTypeController>(
-                                controller => controller.GetAll())
-                        },
-                        {
-                            "previewHubUrl", _previewRoutes.GetPreviewHubRoute()
-                        },
-                        {
-                            "trackedReferencesApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<TrackedReferencesController>(
-                                controller => controller.GetPagedReferences(0,  1, 1, false))
-                        },
-                        {
-                            "analyticsApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<AnalyticsController>(
-                                controller => controller.GetConsentLevel())
-                        },
-                        {
-                          "propertyTypeApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<PropertyTypeController>(
-                              controller => controller.HasValues(string.Empty))
-                        },
-                        {
-                            "mediaPickerThreeBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<MediaPickerThreeController>(
-                                controller => controller.UploadMedia(null!))
-                        },
-                    }
-                },
-                {
-                    "umbracoSettings", new Dictionary<string, object>
-                    {
-                        {"umbracoPath", _globalSettings.GetBackOfficePath(_hostingEnvironment)},
-                        {"mediaPath", _hostingEnvironment.ToAbsolute(globalSettings.UmbracoMediaPath).TrimEnd(Constants.CharArrays.ForwardSlash)},
-                        {"appPluginsPath", _hostingEnvironment.ToAbsolute(Constants.SystemDirectories.AppPlugins).TrimEnd(Constants.CharArrays.ForwardSlash)},
-                        {
-                            "imageFileTypes",
-                            string.Join(",", _imageUrlGenerator.SupportedImageFileTypes)
-                        },
-                        {
-                            "disallowedUploadFiles",
-                            string.Join(",", _contentSettings.DisallowedUploadedFileExtensions)
-                        },
-                        {
-                            "allowedUploadFiles",
-                            string.Join(",", _contentSettings.AllowedUploadedFileExtensions)
-                        },
-                        {
-                            "maxFileSize",
-                            GetMaxRequestLength()
-                        },
-                        {"keepUserLoggedIn", _securitySettings.KeepUserLoggedIn},
-                        {"usernameIsEmail", _securitySettings.UsernameIsEmail},
-                        {"cssPath", _hostingEnvironment.ToAbsolute(globalSettings.UmbracoCssPath).TrimEnd(Constants.CharArrays.ForwardSlash)},
-                        {"allowPasswordReset", _securitySettings.AllowPasswordReset},
-                        {"loginBackgroundImage", _contentSettings.LoginBackgroundImage},
-                        {"loginLogoImage", _contentSettings.LoginLogoImage },
-                        {"loginLogoImageAlternative", _contentSettings.LoginLogoImageAlternative },
-                        {"hideBackofficeLogo", _contentSettings.HideBackOfficeLogo },
-                        {"disableDeleteWhenReferenced", _contentSettings.DisableDeleteWhenReferenced },
-                        {"disableUnpublishWhenReferenced", _contentSettings.DisableUnpublishWhenReferenced },
-                        {"showUserInvite", _emailSender.CanSendRequiredEmail()},
-                        {"canSendRequiredEmail", _emailSender.CanSendRequiredEmail()},
-                        {"showAllowSegmentationForDocumentTypes", false},
-                        {"minimumPasswordLength", _memberPasswordConfigurationSettings.RequiredLength},
-                        {"minimumPasswordNonAlphaNum", _memberPasswordConfigurationSettings.GetMinNonAlphaNumericChars()},
-                        {"sanitizeTinyMce", _globalSettings.SanitizeTinyMce},
-                        {"dataTypesCanBeChanged", _dataTypesSettings.CanBeChanged.ToString()},
-                        {"allowEditInvariantFromNonDefault", _contentSettings.AllowEditInvariantFromNonDefault},
-                    }
-                },
-                {
-                    "umbracoPlugins", new Dictionary<string, object>
-                    {
-                        // for each tree that is [PluginController], get
-                        // alias -> areaName
-                        // so that routing (route.js) can look for views
-                        { "trees", GetPluginTrees().ToArray() }
-                    }
-                },
-                {
-                    "isDebuggingEnabled", _hostingEnvironment.IsDebugMode
-                },
-                {
-                    "application", GetApplicationState()
-                },
-                {
-                    "externalLogins", new Dictionary<string, object>
-                    {
-                        {
-                            // TODO: It would be nicer to not have to manually translate these properties
-                            // but then needs to be changed in quite a few places in angular
-                            "providers", (await _externalLogins.GetBackOfficeProvidersAsync())
-                                .Select(p => new
-                                {
-                                    authType = p.ExternalLoginProvider.AuthenticationType,
-                                    caption = p.AuthenticationScheme.DisplayName,
-                                    properties = p.ExternalLoginProvider.Options
-                                })
-                                .ToArray()
-                        }
-                    }
-                },
-                {
-                    "features", new Dictionary<string,object>
-                    {
-                        {
-                            "disabledFeatures", new Dictionary<string,object>
-                            {
-                                { "disableTemplates", _features.Disabled.DisableTemplates}
-                            }
-                        }
-
-                    }
-                }
-            };
-
-            return defaultVals;
-        }
-
-        private string GetMarketplaceUrl()
-        {
-            var uriBuilder = new UriBuilder(Constants.Marketplace.Url);
-
-            var query = HttpUtility.ParseQueryString(uriBuilder.Query);
-
-            query["umbversion"] = _runtimeState.SemanticVersion.ToSemanticStringWithoutBuild();
-            query["style"] = "backoffice";
-
-            foreach (var kvp in _marketplaceSettings.AdditionalParameters)
-            {
-                query[kvp.Key] = kvp.Value;
-            }
-
-            uriBuilder.Query = query.ToString();
-
-            return uriBuilder.ToString();
-        }
-
-        [DataContract]
-        private class PluginTree
-        {
-            [DataMember(Name = "alias")]
-            public string? Alias { get; set; }
-
-            [DataMember(Name = "packageFolder")]
-            public string? PackageFolder { get; set; }
-        }
-
-        private IEnumerable<PluginTree> GetPluginTrees()
-        {
-
-            // used to be (cached)
-            //var treeTypes = Current.TypeLoader.GetAttributedTreeControllers();
-            //
-            // ie inheriting from TreeController and marked with TreeAttribute
-            //
-            // do this instead
-            // inheriting from TreeControllerBase and marked with TreeAttribute
-
-            foreach (Tree tree in _treeCollection)
-            {
-                Type treeType = tree.TreeControllerType;
-
-                // exclude anything marked with CoreTreeAttribute
-                CoreTreeAttribute? coreTree = treeType.GetCustomAttribute<CoreTreeAttribute>(false);
-                if (coreTree != null)
-                {
-                    continue;
-                }
-
-                // exclude anything not marked with PluginControllerAttribute
-                PluginControllerAttribute? pluginController = treeType.GetCustomAttribute<PluginControllerAttribute>(false);
-                if (pluginController == null)
-                {
-                    continue;
-                }
-
-                yield return new PluginTree { Alias = tree.TreeAlias, PackageFolder = pluginController.AreaName };
-            }
-        }
-
-        /// <summary>
-        /// Returns the server variables regarding the application state
-        /// </summary>
-        /// <returns></returns>
-        private Dictionary<string, object?> GetApplicationState()
-        {
-            var version = _runtimeState.SemanticVersion.ToSemanticStringWithoutBuild();
-            var app = new Dictionary<string, object?>
-            {
-                // add versions - see UmbracoVersion for details & differences
-
-                // the complete application version (eg "8.1.2-alpha.25")
-                { "version", version },
-
-                // the assembly version (eg "8.0.0")
-                { "assemblyVersion", _umbracoVersion.AssemblyVersion?.ToString() }
-            };
-
-            app.Add("runtimeMode", _runtimeSettings.Mode.ToString());
-
-            //the value is the hash of the version, cdf version and the configured state
-            app.Add("cacheBuster", $"{version}.{_runtimeState.Level}.{_runtimeMinifier.CacheBuster}".GenerateHash());
-
-            //useful for dealing with virtual paths on the client side when hosted in virtual directories especially
-            app.Add("applicationPath", _httpContextAccessor.GetRequiredHttpContext().Request.PathBase.ToString().EnsureEndsWith('/'));
-
-            //add the server's GMT time offset in minutes
-            app.Add("serverTimeOffset", Convert.ToInt32(DateTimeOffset.Now.Offset.TotalMinutes));
-
-            return app;
-        }
-
-        private string GetMaxRequestLength()
-        {
-            return _runtimeSettings.MaxRequestLength.HasValue ? _runtimeSettings.MaxRequestLength.Value.ToString() : string.Empty;
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/BlockGridSampleHelper.cs b/src/Umbraco.Web.BackOffice/Controllers/BlockGridSampleHelper.cs
deleted file mode 100644
index 034f9524d2..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/BlockGridSampleHelper.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Templates.PartialViews;
-using Umbraco.Cms.Web.Common.ActionsResults;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-// Unfortunately this has to be public to be injected into a controller
-public sealed class BlockGridSampleHelper
-{
-    private const string ContainerName = "Umbraco Block Grid Demo";
-
-    private readonly IContentTypeService _contentTypeService;
-    private readonly IDataTypeService _dataTypeService;
-    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-    private readonly IPartialViewPopulator _partialViewPopulator;
-
-    public BlockGridSampleHelper(
-        IContentTypeService contentTypeService,
-        IDataTypeService dataTypeService,
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-        IPartialViewPopulator partialViewPopulator)
-    {
-        _contentTypeService = contentTypeService;
-        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
-        _partialViewPopulator = partialViewPopulator;
-        _dataTypeService = dataTypeService;
-    }
-
-    /// <summary>
-    /// Creates block grid elements for sample purposes:
-    /// - a "Headline" block with a text box
-    /// - an "Image" block with a single value media picker
-    /// - a "Rich Text" block with an RTE
-    /// - an empty "Two Column Layout" (will be used for layouting nested blocks)
-    /// </summary>
-    /// <param name="createElement">The function that will perform the actual element creation</param>
-    /// <param name="errorMessage">If an error occurs, this message will describe that error</param>
-    /// <returns>A mapping table between element aliases and the created element UDIs, or null if an error occurs</returns>
-    internal Dictionary<string, Udi>? CreateSampleElements(Func<DocumentTypeSave, ActionResult<IContentType?>> createElement, out string errorMessage)
-    {
-        errorMessage = string.Empty;
-
-        EntityContainer? container = GetOrCreateContainer();
-        if (container == null)
-        {
-            errorMessage = $"Unable to get or create content type container: {ContainerName}";
-            return null;
-        }
-
-        FindDataTypes(out IDataType? textBox, out IDataType? tinyMce, out IDataType? mediaPicker);
-        if (textBox == null || tinyMce == null || mediaPicker == null)
-        {
-            errorMessage = $"Could not find required data types - must have a text box, a rich text editor and a media picker (configured in single picker mode)";
-            return null;
-        }
-
-        // get any already created elements
-        IContentType[] existingContentTypes = _contentTypeService.GetChildren(container.Id).ToArray();
-
-        // this is the return value (will be populated below)
-        var elementUdisByAlias = new Dictionary<string, Udi>();
-
-        // these describe the block grid elements we want to create
-        var elementDescriptors = new[]
-        {
-            new
-            {
-                Alias = "umbBlockGridDemoHeadlineBlock",
-                Icon = "icon-font color-black",
-                Name = "Headline",
-                Property = new { Alias = "headline", Label = "Headline", EditorId = textBox.Id }
-            },
-            new
-            {
-                Alias = "umbBlockGridDemoImageBlock",
-                Icon = "icon-umb-media color-black",
-                Name = "Image",
-                Property = new { Alias = "image", Label = "Image", EditorId = mediaPicker.Id }
-            },
-            new
-            {
-                Alias = "umbBlockGridDemoRichTextBlock",
-                Icon = "icon-script color-black",
-                Name = "Rich Text",
-                Property = new { Alias = "richText", Label = "Text", EditorId = tinyMce.Id }
-            },
-            new
-            {
-                Alias = "umbBlockGridDemoTwoColumnLayoutBlock",
-                Icon = "icon-book-alt color-black",
-                Name = "Two Column Layout",
-                Property = new { Alias = string.Empty, Label = string.Empty, EditorId = -1 }
-            }
-        };
-
-        foreach (var elementDescriptor  in elementDescriptors)
-        {
-            IContentType? contentType = existingContentTypes.FirstOrDefault(c => c.Alias == elementDescriptor.Alias);
-            if (contentType != null)
-            {
-                elementUdisByAlias[elementDescriptor.Alias] = contentType.GetUdi();
-                continue;
-            }
-
-            var documentTypeSave = new DocumentTypeSave
-            {
-                Alias = elementDescriptor.Alias,
-                Icon = elementDescriptor.Icon,
-                Name = elementDescriptor.Name,
-                IsElement = true,
-                Groups = new[]
-                {
-                    new PropertyGroupBasic<PropertyTypeBasic>
-                    {
-                        Alias = "content",
-                        Name = "Content",
-                        Type = PropertyGroupType.Group,
-                        Properties = elementDescriptor.Property.Alias.IsNullOrWhiteSpace()
-                            ? Array.Empty<PropertyTypeBasic>()
-                            : new[]
-                            {
-                                new PropertyTypeBasic
-                                {
-                                    Alias = elementDescriptor.Property.Alias,
-                                    Label = elementDescriptor.Property.Label,
-                                    Validation = new PropertyTypeValidation { Mandatory = true },
-                                    DataTypeId = elementDescriptor.Property.EditorId
-                                }
-                            }
-                    }
-                },
-                ParentId = container.Id,
-                Thumbnail = "folder.png"
-            };
-
-            ActionResult<IContentType?> result = createElement(documentTypeSave);
-
-            if (result.Value != null)
-            {
-                elementUdisByAlias[elementDescriptor.Alias] = result.Value.GetUdi();
-                continue;
-            }
-
-            if (result.Result is ValidationErrorResult validationErrorResult)
-            {
-                errorMessage = validationErrorResult.Value switch
-                {
-                    string error => error,
-                    Exception exception => exception.Message,
-                    _ => string.Empty
-                };
-            }
-
-            if(errorMessage.IsNullOrWhiteSpace())
-            {
-                errorMessage = $"Could not create element type: {elementDescriptor.Name}";
-            }
-
-            return null;
-        }
-
-        return elementUdisByAlias;
-    }
-
-    internal void CreateSamplePartialViews()
-    {
-        var embeddedBasePath = $"{_partialViewPopulator.CoreEmbeddedPath}.BlockGrid.Components";
-        var fileSystemBasePath = "/Views/Partials/blockgrid/Components";
-        var filesToMove = new[]
-        {
-            "umbBlockGridDemoHeadlineBlock.cshtml",
-            "umbBlockGridDemoImageBlock.cshtml",
-            "umbBlockGridDemoRichTextBlock.cshtml",
-            "umbBlockGridDemoTwoColumnLayoutBlock.cshtml",
-        };
-
-        foreach (var fileName in filesToMove)
-        {
-            var embeddedPath = $"{embeddedBasePath}.{fileName}";
-            var fileSystemPath = $"{fileSystemBasePath}/{fileName}";
-            _partialViewPopulator.CopyPartialViewIfNotExists(_partialViewPopulator.GetCoreAssembly(), embeddedPath, fileSystemPath);
-        }
-    }
-
-    private EntityContainer? GetOrCreateContainer()
-    {
-        var userId = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1;
-
-        EntityContainer? container = _contentTypeService.GetContainers(ContainerName, 1).FirstOrDefault();
-        if (container == null)
-        {
-            Attempt<OperationResult<OperationResultType, EntityContainer>?> attempt =
-                _contentTypeService.CreateContainer(Constants.System.Root, Guid.NewGuid(), ContainerName, userId);
-            container = attempt.Result?.Entity;
-        }
-
-        return container;
-    }
-
-    private void FindDataTypes(out IDataType? textBox, out IDataType? tinyMce, out IDataType? mediaPicker)
-    {
-        // order by ID to prioritize default installed data types
-        IDataType[] dataTypes = _dataTypeService.GetAll().OrderBy(d => d.Id).ToArray();
-
-        textBox = dataTypes.FirstOrDefault(d => d.EditorAlias == Constants.PropertyEditors.Aliases.TextBox);
-        tinyMce = dataTypes.FirstOrDefault(d => d.EditorAlias == Constants.PropertyEditors.Aliases.RichText);
-        mediaPicker = dataTypes.Where(d =>
-                d.EditorAlias == Constants.PropertyEditors.Aliases.MediaPicker3
-                && d.ConfigurationAs<MediaPicker3Configuration>()?.Multiple == false)
-            // prioritize the default "Image Media Picker" if it exists
-            .MinBy(d => d.Name == "Image Media Picker" ? 0 : 1);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs b/src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs
deleted file mode 100644
index 28116570eb..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs
+++ /dev/null
@@ -1,803 +0,0 @@
-using System.Net;
-using System.Web;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Snippets;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Core.Strings.Css;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.BackOffice.Trees;
-using Umbraco.Cms.Web.Common.ActionsResults;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-using Stylesheet = Umbraco.Cms.Core.Models.Stylesheet;
-using StylesheetRule = Umbraco.Cms.Core.Models.ContentEditing.StylesheetRule;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-// TODO: Put some exception filters in our webapi to return 404 instead of 500 when we throw ArgumentNullException
-// ref: https://www.exceptionnotfound.net/the-asp-net-web-api-exception-handling-pipeline-a-guided-tour/
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-//[PrefixlessBodyModelValidator]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessSettings)]
-public class CodeFileController : BackOfficeNotificationsController
-{
-    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-    private readonly IFileService _fileService;
-    private readonly FileSystems _fileSystems;
-    private readonly GlobalSettings _globalSettings;
-    private readonly IHostingEnvironment _hostingEnvironment;
-
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly IShortStringHelper _shortStringHelper;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-    [ActivatorUtilitiesConstructor]
-    public CodeFileController(
-        IHostingEnvironment hostingEnvironment,
-        FileSystems fileSystems,
-        IFileService fileService,
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-        ILocalizedTextService localizedTextService,
-        IUmbracoMapper umbracoMapper,
-        IShortStringHelper shortStringHelper,
-        IOptionsSnapshot<GlobalSettings> globalSettings)
-    {
-        _hostingEnvironment = hostingEnvironment;
-        _fileSystems = fileSystems;
-        _fileService = fileService;
-        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
-        _localizedTextService = localizedTextService;
-        _umbracoMapper = umbracoMapper;
-        _shortStringHelper = shortStringHelper;
-        _globalSettings = globalSettings.Value;
-    }
-
-    /// <summary>
-    ///     Used to create a brand new file
-    /// </summary>
-    /// <param name="type">This is a string but will be 'scripts' 'partialViews', 'partialViewMacros'</param>
-    /// <param name="display"></param>
-    /// <returns>Will return a simple 200 if file creation succeeds</returns>
-    [ValidationFilter]
-    public ActionResult<CodeFileDisplay> PostCreate(string type, CodeFileDisplay display)
-    {
-        if (display == null)
-        {
-            throw new ArgumentNullException("display");
-        }
-
-        if (string.IsNullOrWhiteSpace(type))
-        {
-            throw new ArgumentException("Value cannot be null or whitespace.", "type");
-        }
-
-        IUser? currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-        switch (type)
-        {
-            case Constants.Trees.PartialViews:
-                var view = new PartialView(PartialViewType.PartialView, display.VirtualPath ?? string.Empty)
-                {
-                    Content = display.Content,
-                };
-                Attempt<IPartialView?> result = _fileService.CreatePartialView(view, display.Snippet, currentUser?.Id);
-                if (result.Success)
-                {
-                    return Ok();
-                }
-
-                return ValidationProblem(result.Exception?.Message);
-
-            case Constants.Trees.PartialViewMacros:
-                var viewMacro = new PartialView(PartialViewType.PartialViewMacro, display.VirtualPath ?? string.Empty)
-                {
-                    Content = display.Content,
-                };
-                Attempt<IPartialView?> resultMacro =
-                    _fileService.CreatePartialViewMacro(viewMacro, display.Snippet, currentUser?.Id);
-                if (resultMacro.Success)
-                {
-                    return Ok();
-                }
-
-                return ValidationProblem(resultMacro.Exception?.Message);
-
-            case Constants.Trees.Scripts:
-                var script = new Script(display.VirtualPath ?? string.Empty);
-                _fileService.SaveScript(script, currentUser?.Id);
-                return Ok();
-
-            default:
-                return NotFound();
-        }
-    }
-
-    /// <summary>
-    ///     Used to create a container/folder in 'partialViews', 'partialViewMacros', 'scripts' or 'stylesheets'
-    /// </summary>
-    /// <param name="type">'partialViews', 'partialViewMacros' or 'scripts'</param>
-    /// <param name="parentId">The virtual path of the parent.</param>
-    /// <param name="name">The name of the container/folder</param>
-    /// <returns></returns>
-    [HttpPost]
-    public ActionResult<CodeFileDisplay> PostCreateContainer(string type, string parentId, string name)
-    {
-        if (string.IsNullOrWhiteSpace(type))
-        {
-            throw new ArgumentException("Value cannot be null or whitespace.", "type");
-        }
-
-        if (string.IsNullOrWhiteSpace(parentId))
-        {
-            throw new ArgumentException("Value cannot be null or whitespace.", "parentId");
-        }
-
-        if (string.IsNullOrWhiteSpace(name))
-        {
-            throw new ArgumentException("Value cannot be null or whitespace.", "name");
-        }
-
-        if (name.ContainsAny(Path.GetInvalidPathChars()))
-        {
-            return ValidationProblem(_localizedTextService.Localize("codefile", "createFolderIllegalChars"));
-        }
-
-        // if the parentId is root (-1) then we just need an empty string as we are
-        // creating the path below and we don't want -1 in the path
-        if (parentId == Constants.System.RootString)
-        {
-            parentId = string.Empty;
-        }
-
-        name = HttpUtility.UrlDecode(name);
-
-        if (parentId.IsNullOrWhiteSpace() == false)
-        {
-            parentId = HttpUtility.UrlDecode(parentId);
-            name = parentId.EnsureEndsWith("/") + name;
-        }
-
-        var virtualPath = string.Empty;
-        switch (type)
-        {
-            case Constants.Trees.PartialViews:
-                virtualPath = NormalizeVirtualPath(name, Constants.SystemDirectories.PartialViews);
-                _fileService.CreatePartialViewFolder(virtualPath);
-                break;
-            case Constants.Trees.PartialViewMacros:
-                virtualPath = NormalizeVirtualPath(name, Constants.SystemDirectories.MacroPartials);
-                _fileService.CreatePartialViewMacroFolder(virtualPath);
-                break;
-            case Constants.Trees.Scripts:
-                virtualPath = NormalizeVirtualPath(name, _globalSettings.UmbracoScriptsPath);
-                _fileService.CreateScriptFolder(virtualPath);
-                break;
-            case Constants.Trees.Stylesheets:
-                virtualPath = NormalizeVirtualPath(name, _globalSettings.UmbracoCssPath);
-                _fileService.CreateStyleSheetFolder(virtualPath);
-                break;
-        }
-
-        return new CodeFileDisplay { VirtualPath = virtualPath, Path = Url.GetTreePathFromFilePath(virtualPath) };
-    }
-
-    /// <summary>
-    ///     Used to get a specific file from disk via the FileService
-    /// </summary>
-    /// <param name="type">This is a string but will be 'scripts' 'partialViews', 'partialViewMacros' or 'stylesheets'</param>
-    /// <param name="virtualPath">The filename or URL encoded path of the file to open</param>
-    /// <returns>The file and its contents from the virtualPath</returns>
-    public ActionResult<CodeFileDisplay?> GetByPath(string type, string virtualPath)
-    {
-        if (string.IsNullOrWhiteSpace(type))
-        {
-            throw new ArgumentException("Value cannot be null or whitespace.", "type");
-        }
-
-        if (string.IsNullOrWhiteSpace(virtualPath))
-        {
-            throw new ArgumentException("Value cannot be null or whitespace.", "virtualPath");
-        }
-
-        virtualPath = HttpUtility.UrlDecode(virtualPath);
-
-        switch (type)
-        {
-            case Constants.Trees.PartialViews:
-                IPartialView? view = _fileService.GetPartialView(virtualPath);
-                if (view != null)
-                {
-                    CodeFileDisplay? display = _umbracoMapper.Map<IPartialView, CodeFileDisplay>(view);
-
-                    if (display is not null)
-                    {
-                        display.FileType = Constants.Trees.PartialViews;
-                        display.Path = Url.GetTreePathFromFilePath(view.Path);
-                        display.Id = HttpUtility.UrlEncode(view.Path);
-                    }
-
-                    return display;
-                }
-
-                break;
-            case Constants.Trees.PartialViewMacros:
-                IPartialView? viewMacro = _fileService.GetPartialViewMacro(virtualPath);
-                if (viewMacro != null)
-                {
-                    CodeFileDisplay? display = _umbracoMapper.Map<IPartialView, CodeFileDisplay>(viewMacro);
-
-                    if (display is not null)
-                    {
-                        display.FileType = Constants.Trees.PartialViewMacros;
-                        display.Path = Url.GetTreePathFromFilePath(viewMacro.Path);
-                        display.Id = HttpUtility.UrlEncode(viewMacro.Path);
-                    }
-
-                    return display;
-                }
-
-                break;
-            case Constants.Trees.Scripts:
-                IScript? script = _fileService.GetScript(virtualPath);
-                if (script != null)
-                {
-                    CodeFileDisplay? display = _umbracoMapper.Map<IScript, CodeFileDisplay>(script);
-
-                    if (display is not null)
-                    {
-                        display.FileType = Constants.Trees.Scripts;
-                        display.Path = Url.GetTreePathFromFilePath(script.Path);
-                        display.Id = HttpUtility.UrlEncode(script.Path);
-                    }
-
-                    return display;
-                }
-
-                break;
-            case Constants.Trees.Stylesheets:
-                IStylesheet? stylesheet = _fileService.GetStylesheet(virtualPath);
-                if (stylesheet != null)
-                {
-                    CodeFileDisplay? display = _umbracoMapper.Map<IStylesheet, CodeFileDisplay>(stylesheet);
-
-                    if (display is not null)
-                    {
-                        display.FileType = Constants.Trees.Stylesheets;
-                        display.Path = Url.GetTreePathFromFilePath(stylesheet.Path);
-                        display.Id = HttpUtility.UrlEncode(stylesheet.Path);
-                    }
-
-                    return display;
-                }
-
-                break;
-        }
-
-        return NotFound();
-    }
-
-    /// <summary>
-    ///     Used to get a list of available templates/snippets to base a new Partial View or Partial View Macro from
-    /// </summary>
-    /// <param name="type">This is a string but will be 'partialViews', 'partialViewMacros'</param>
-    /// <returns>Returns a list of <see cref="SnippetDisplay" /> if a correct type is sent</returns>
-    public ActionResult<IEnumerable<SnippetDisplay>> GetSnippets(string type)
-    {
-        if (string.IsNullOrWhiteSpace(type))
-        {
-            throw new ArgumentException("Value cannot be null or whitespace.", "type");
-        }
-
-        IEnumerable<string> snippets;
-        switch (type)
-        {
-            case Constants.Trees.PartialViews:
-                throw new NotImplementedException("Partial views snippets have been rewritten for V14 - no longer supported in the old back-office.");
-                break;
-            case Constants.Trees.PartialViewMacros:
-                throw new NotSupportedException("Macros are not part of V14 :)");
-                break;
-            default:
-                return NotFound();
-        }
-
-        return snippets.Select(snippet => new SnippetDisplay
-        {
-            Name = snippet.SplitPascalCasing(_shortStringHelper).ToFirstUpperInvariant(),
-            FileName = snippet,
-        }).ToList();
-    }
-
-    /// <summary>
-    ///     Used to scaffold the json object for the editors for 'scripts', 'partialViews', 'partialViewMacros' and
-    ///     'stylesheets'
-    /// </summary>
-    /// <param name="type">This is a string but will be 'scripts' 'partialViews', 'partialViewMacros' or 'stylesheets'</param>
-    /// <param name="id"></param>
-    /// <param name="snippetName"></param>
-    /// <returns></returns>
-    public ActionResult<CodeFileDisplay?> GetScaffold(string type, string id, string? snippetName = null)
-    {
-        if (string.IsNullOrWhiteSpace(type))
-        {
-            throw new ArgumentException("Value cannot be null or whitespace.", "type");
-        }
-
-        if (string.IsNullOrWhiteSpace(id))
-        {
-            throw new ArgumentException("Value cannot be null or whitespace.", "id");
-        }
-
-        CodeFileDisplay? codeFileDisplay;
-
-        switch (type)
-        {
-            case Constants.Trees.PartialViews:
-                throw new NotImplementedException("Partial views snippets have been rewritten for V14 - no longer supported in the old back-office.");
-            case Constants.Trees.PartialViewMacros:
-                throw new NotSupportedException("Macros are not part of V14 :)");
-            case Constants.Trees.Scripts:
-                codeFileDisplay = _umbracoMapper.Map<Script, CodeFileDisplay>(new Script(string.Empty));
-                if (codeFileDisplay is not null)
-                {
-                    codeFileDisplay.VirtualPath = _globalSettings.UmbracoScriptsPath;
-                }
-
-                break;
-            case Constants.Trees.Stylesheets:
-                codeFileDisplay = _umbracoMapper.Map<Stylesheet, CodeFileDisplay>(new Stylesheet(string.Empty));
-                if (codeFileDisplay is not null)
-                {
-                    codeFileDisplay.VirtualPath = _globalSettings.UmbracoCssPath;
-                }
-
-                break;
-            default:
-                return new UmbracoProblemResult("Unsupported editortype", HttpStatusCode.BadRequest);
-        }
-
-        if (codeFileDisplay is null)
-        {
-            return codeFileDisplay;
-        }
-
-        // Make sure that the root virtual path ends with '/'
-        codeFileDisplay.VirtualPath = codeFileDisplay.VirtualPath?.EnsureEndsWith("/");
-
-        if (id != Constants.System.RootString)
-        {
-            codeFileDisplay.VirtualPath += id.TrimStart(Constants.CharArrays.ForwardSlash).EnsureEndsWith("/");
-            //if it's not new then it will have a path, otherwise it won't
-            codeFileDisplay.Path = Url.GetTreePathFromFilePath(id);
-        }
-
-        codeFileDisplay.VirtualPath = codeFileDisplay.VirtualPath?.TrimStart("~");
-        codeFileDisplay.FileType = type;
-        return codeFileDisplay;
-    }
-
-    /// <summary>
-    ///     Used to delete a specific file from disk via the FileService
-    /// </summary>
-    /// <param name="type">This is a string but will be 'scripts' 'partialViews', 'partialViewMacros' or 'stylesheets'</param>
-    /// <param name="virtualPath">The filename or URL encoded path of the file to delete</param>
-    /// <returns>Will return a simple 200 if file deletion succeeds</returns>
-    [HttpDelete]
-    [HttpPost]
-    public IActionResult Delete(string type, string virtualPath)
-    {
-        if (string.IsNullOrWhiteSpace(type))
-        {
-            throw new ArgumentException("Value cannot be null or whitespace.", "type");
-        }
-
-        if (string.IsNullOrWhiteSpace(virtualPath))
-        {
-            throw new ArgumentException("Value cannot be null or whitespace.", "virtualPath");
-        }
-
-        virtualPath = HttpUtility.UrlDecode(virtualPath);
-        IUser? currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-        switch (type)
-        {
-            case Constants.Trees.PartialViews:
-                if (IsDirectory(
-                        _hostingEnvironment.MapPathContentRoot(Path.Combine(Constants.SystemDirectories.PartialViews, virtualPath)), _fileSystems.PartialViewsFileSystem!))
-                {
-                    _fileService.DeletePartialViewFolder(virtualPath);
-                    return Ok();
-                }
-
-                if (_fileService.DeletePartialView(virtualPath, currentUser?.Id))
-                {
-                    return Ok();
-                }
-
-                return new UmbracoProblemResult("No Partial View or folder found with the specified path", HttpStatusCode.NotFound);
-
-            case Constants.Trees.PartialViewMacros:
-                if (IsDirectory(
-                        _hostingEnvironment.MapPathContentRoot(Path.Combine(Constants.SystemDirectories.MacroPartials, virtualPath)), _fileSystems.MacroPartialsFileSystem!))
-                {
-                    _fileService.DeletePartialViewMacroFolder(virtualPath);
-                    return Ok();
-                }
-
-                if (_fileService.DeletePartialViewMacro(virtualPath, currentUser?.Id))
-                {
-                    return Ok();
-                }
-
-                return new UmbracoProblemResult("No Partial View Macro or folder found with the specified path", HttpStatusCode.NotFound);
-
-            case Constants.Trees.Scripts:
-                if (IsDirectory(
-                        _hostingEnvironment.MapPathWebRoot(Path.Combine(_globalSettings.UmbracoScriptsPath, virtualPath)), _fileSystems.ScriptsFileSystem!))
-                {
-                    _fileService.DeleteScriptFolder(virtualPath);
-                    return Ok();
-                }
-
-                if (_fileService.GetScript(virtualPath) != null)
-                {
-                    _fileService.DeleteScript(virtualPath, currentUser?.Id);
-                    return Ok();
-                }
-
-                return new UmbracoProblemResult("No Script or folder found with the specified path", HttpStatusCode.NotFound);
-            case Constants.Trees.Stylesheets:
-                if (IsDirectory(
-                        _hostingEnvironment.MapPathWebRoot(Path.Combine(_globalSettings.UmbracoCssPath, virtualPath)), _fileSystems.StylesheetsFileSystem!))
-                {
-                    _fileService.DeleteStyleSheetFolder(virtualPath);
-                    return Ok();
-                }
-
-                if (_fileService.GetStylesheet(virtualPath) != null)
-                {
-                    _fileService.DeleteStylesheet(virtualPath, currentUser?.Id);
-                    return Ok();
-                }
-
-                return new UmbracoProblemResult("No Stylesheet found with the specified path", HttpStatusCode.NotFound);
-            default:
-                return NotFound();
-        }
-    }
-
-    /// <summary>
-    ///     Used to create or update a 'partialview', 'partialviewmacro', 'script' or 'stylesheets' file
-    /// </summary>
-    /// <param name="display"></param>
-    /// <returns>The updated CodeFileDisplay model</returns>
-    public ActionResult<CodeFileDisplay> PostSave(CodeFileDisplay display)
-    {
-        if (display == null)
-        {
-            throw new ArgumentNullException("display");
-        }
-
-        TryValidateModel(display);
-        if (ModelState.IsValid == false)
-        {
-            return ValidationProblem(ModelState);
-        }
-
-        switch (display.FileType)
-        {
-            case Constants.Trees.PartialViews:
-                Attempt<IPartialView?> partialViewResult = CreateOrUpdatePartialView(display);
-                if (partialViewResult.Success)
-                {
-                    display = _umbracoMapper.Map(partialViewResult.Result, display);
-                    display.Path = Url.GetTreePathFromFilePath(partialViewResult.Result?.Path);
-                    display.Id = HttpUtility.UrlEncode(partialViewResult.Result?.Path);
-                    return display;
-                }
-
-                display.AddErrorNotification(
-                    _localizedTextService.Localize("speechBubbles", "partialViewErrorHeader"),
-                    _localizedTextService.Localize("speechBubbles", "partialViewErrorText"));
-                break;
-
-            case Constants.Trees.PartialViewMacros:
-                Attempt<IPartialView?> partialViewMacroResult = CreateOrUpdatePartialViewMacro(display);
-                if (partialViewMacroResult.Success)
-                {
-                    display = _umbracoMapper.Map(partialViewMacroResult.Result, display);
-                    display.Path = Url.GetTreePathFromFilePath(partialViewMacroResult.Result?.Path);
-                    display.Id = HttpUtility.UrlEncode(partialViewMacroResult.Result?.Path);
-                    return display;
-                }
-
-                display.AddErrorNotification(
-                    _localizedTextService.Localize("speechBubbles", "partialViewErrorHeader"),
-                    _localizedTextService.Localize("speechBubbles", "partialViewErrorText"));
-                break;
-
-            case Constants.Trees.Scripts:
-
-                IScript? scriptResult = CreateOrUpdateScript(display);
-                display = _umbracoMapper.Map(scriptResult, display);
-                display.Path = Url.GetTreePathFromFilePath(scriptResult?.Path);
-                display.Id = HttpUtility.UrlEncode(scriptResult?.Path);
-                return display;
-
-            //display.AddErrorNotification(
-            //    _localizedTextService.Localize("speechBubbles/partialViewErrorHeader"),
-            //    _localizedTextService.Localize("speechBubbles/partialViewErrorText"));
-
-            case Constants.Trees.Stylesheets:
-
-                IStylesheet? stylesheetResult = CreateOrUpdateStylesheet(display);
-                display = _umbracoMapper.Map(stylesheetResult, display);
-                display.Path = Url.GetTreePathFromFilePath(stylesheetResult?.Path);
-                display.Id = HttpUtility.UrlEncode(stylesheetResult?.Path);
-                return display;
-
-            default:
-                return NotFound();
-        }
-
-        return display;
-    }
-
-    /// <summary>
-    ///     Extracts "umbraco style rules" from a style sheet
-    /// </summary>
-    /// <param name="data">The style sheet data</param>
-    /// <returns>The style rules</returns>
-    public StylesheetRule[]? PostExtractStylesheetRules(StylesheetData data)
-    {
-        if (data.Content.IsNullOrWhiteSpace())
-        {
-            return new StylesheetRule[0];
-        }
-
-        return StylesheetHelper.ParseRules(data.Content)?.Select(rule => new StylesheetRule
-        {
-            Name = rule.Name,
-            Selector = rule.Selector,
-            Styles = rule.Styles
-        }).ToArray();
-    }
-
-    /// <summary>
-    ///     Creates a style sheet from CSS and style rules
-    /// </summary>
-    /// <param name="data">The style sheet data</param>
-    /// <returns>The style sheet combined from the CSS and the rules</returns>
-    /// <remarks>
-    ///     Any "umbraco style rules" in the CSS will be removed and replaced with the rules passed in <paramref name="data"/>
-    /// </remarks>
-    public string? PostInterpolateStylesheetRules(StylesheetData data)
-    {
-        // first remove all existing rules
-        Core.Strings.Css.StylesheetRule[] existingRules = data.Content.IsNullOrWhiteSpace()
-            ? new Core.Strings.Css.StylesheetRule[0]
-            : StylesheetHelper.ParseRules(data.Content).ToArray();
-        foreach (Core.Strings.Css.StylesheetRule rule in existingRules)
-        {
-            data.Content = StylesheetHelper.ReplaceRule(data.Content, rule.Name, null);
-        }
-
-        data.Content = data.Content?.TrimEnd(Constants.CharArrays.LineFeedCarriageReturn);
-
-        // now add all the posted rules
-        if (data.Rules != null && data.Rules.Any())
-        {
-            foreach (StylesheetRule rule in data.Rules)
-            {
-                data.Content = StylesheetHelper.AppendRule(
-                    data.Content,
-                    new Core.Strings.Css.StylesheetRule
-                    {
-                        Name = rule.Name,
-                        Selector = rule.Selector,
-                        Styles = rule.Styles
-                    });
-            }
-
-            data.Content += Environment.NewLine;
-        }
-
-        return data.Content;
-    }
-
-    /// <summary>
-    ///     Create or Update a Script
-    /// </summary>
-    /// <param name="display"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     It's important to note that Scripts are DIFFERENT from cshtml files since scripts use IFileSystem and cshtml files
-    ///     use a normal file system because they must exist on a real file system for ASP.NET to work.
-    /// </remarks>
-    private IScript? CreateOrUpdateScript(CodeFileDisplay display) =>
-        CreateOrUpdateFile(
-            display,
-            ".js",
-            _fileSystems.ScriptsFileSystem,
-            name => _fileService.GetScript(name),
-            (script, userId) => _fileService.SaveScript(script, userId),
-            name => new Script(name ?? string.Empty));
-
-    private IStylesheet? CreateOrUpdateStylesheet(CodeFileDisplay display) =>
-        CreateOrUpdateFile(
-            display,
-            ".css",
-            _fileSystems.StylesheetsFileSystem,
-            name => _fileService.GetStylesheet(name),
-            (stylesheet, userId) => _fileService.SaveStylesheet(stylesheet, userId),
-            name => new Stylesheet(name ?? string.Empty));
-
-    private T CreateOrUpdateFile<T>(CodeFileDisplay display, string extension, IFileSystem? fileSystem, Func<string?, T> getFileByName, Action<T, int?> saveFile, Func<string?, T> createFile)
-        where T : IFile?
-    {
-        //must always end with the correct extension
-        display.Name = EnsureCorrectFileExtension(display.Name, extension);
-
-        var virtualPath = display.VirtualPath ?? string.Empty;
-        // this is all weird, should be using relative paths everywhere!
-        var relPath = fileSystem?.GetRelativePath(virtualPath);
-
-        if (relPath?.EndsWith(extension) == false)
-        {
-            //this would typically mean it's new
-            relPath = relPath.IsNullOrWhiteSpace()
-                ? relPath + display.Name
-                : relPath.EnsureEndsWith('/') + display.Name;
-        }
-
-        IUser? currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-        T file = getFileByName(relPath);
-        if (file != null)
-        {
-            // might need to find the path
-            var orgPath = file.Name is null
-                ? string.Empty
-                : file.OriginalPath.Substring(0, file.OriginalPath.IndexOf(file.Name));
-            file.Path = orgPath + display.Name;
-
-            file.Content = display.Content;
-            //try/catch? since this doesn't return an Attempt?
-            saveFile(file, currentUser?.Id);
-        }
-        else
-        {
-            file = createFile(relPath);
-            if (file is not null)
-            {
-                file.Content = display.Content;
-            }
-
-            saveFile(file, currentUser?.Id);
-        }
-
-        return file;
-    }
-
-    private Attempt<IPartialView?> CreateOrUpdatePartialView(CodeFileDisplay display) =>
-        CreateOrUpdatePartialView(
-            display,
-            Constants.SystemDirectories.PartialViews,
-            _fileService.GetPartialView,
-            _fileService.SavePartialView,
-            _fileService.CreatePartialView);
-
-    private Attempt<IPartialView?> CreateOrUpdatePartialViewMacro(CodeFileDisplay display) =>
-        CreateOrUpdatePartialView(display, Constants.SystemDirectories.MacroPartials, _fileService.GetPartialViewMacro, _fileService.SavePartialViewMacro, _fileService.CreatePartialViewMacro);
-
-    /// <summary>
-    ///     Helper method to take care of persisting partial views or partial view macros - so we're not duplicating the same
-    ///     logic
-    /// </summary>
-    /// <param name="display"></param>
-    /// <param name="systemDirectory"></param>
-    /// <param name="getView"></param>
-    /// <param name="saveView"></param>
-    /// <param name="createView"></param>
-    /// <returns></returns>
-    private Attempt<IPartialView?> CreateOrUpdatePartialView(
-        CodeFileDisplay display,
-        string systemDirectory,
-        Func<string, IPartialView?> getView,
-        Func<IPartialView, int?,
-            Attempt<IPartialView?>> saveView,
-        Func<IPartialView, string?,
-            int?, Attempt<IPartialView?>> createView)
-    {
-        //must always end with the correct extension
-        display.Name = EnsureCorrectFileExtension(display.Name, ".cshtml");
-
-        Attempt<IPartialView?> partialViewResult;
-        IUser? currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-
-        var virtualPath = NormalizeVirtualPath(display.VirtualPath, systemDirectory);
-        IPartialView? view = getView(virtualPath);
-        if (view != null)
-        {
-            // might need to find the path
-            var orgPath = view.OriginalPath.Substring(0, view.OriginalPath.IndexOf(view.Name ?? string.Empty));
-            view.Path = orgPath + display.Name;
-
-            view.Content = display.Content;
-            partialViewResult = saveView(view, currentUser?.Id);
-        }
-        else
-        {
-            view = new PartialView(PartialViewType.PartialView, virtualPath + display.Name)
-            {
-                Content = display.Content
-            };
-            partialViewResult = createView(view, display.Snippet, currentUser?.Id);
-        }
-
-        return partialViewResult;
-    }
-
-    private string NormalizeVirtualPath(string? virtualPath, string systemDirectory)
-    {
-        if (virtualPath.IsNullOrWhiteSpace())
-        {
-            return string.Empty;
-        }
-
-        systemDirectory = systemDirectory.TrimStart("~");
-        systemDirectory = systemDirectory.Replace('\\', '/');
-        virtualPath = virtualPath!.TrimStart("~");
-        virtualPath = virtualPath.Replace('\\', '/');
-        virtualPath = virtualPath.ReplaceFirst(systemDirectory, string.Empty);
-
-        return virtualPath;
-    }
-
-    private string? EnsureCorrectFileExtension(string? value, string extension)
-    {
-        if (value?.EndsWith(extension) == false)
-        {
-            value += extension;
-        }
-
-        return value;
-    }
-
-    private bool IsDirectory(string path, IFileSystem fileSystem)
-    {
-        // If it's a physical filesystem check with directory info
-        if (fileSystem.CanAddPhysical)
-        {
-            var dirInfo = new DirectoryInfo(path);
-
-            // If you turn off indexing in Windows this will have the attribute:
-            // `FileAttributes.Directory | FileAttributes.NotContentIndexed`
-            return (dirInfo.Attributes & FileAttributes.Directory) != 0;
-        }
-
-        // Otherwise check the filesystem abstraction to see if the folder exists
-        // Since this is used for delete, it presumably exists if we're trying to delete it
-        return fileSystem.DirectoryExists(path);
-    }
-
-    // this is an internal class for passing stylesheet data from the client to the controller while editing
-    public class StylesheetData
-    {
-        public string? Content { get; set; }
-
-        public StylesheetRule[]? Rules { get; set; }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
deleted file mode 100644
index 36316ffd18..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
+++ /dev/null
@@ -1,3071 +0,0 @@
-using System.Net.Mime;
-using System.Text;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http.Extensions;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Dictionary;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Models.Validation;
-using Umbraco.Cms.Core.Notifications;
-using Umbraco.Cms.Core.Persistence.Querying;
-using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Infrastructure.Persistence;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.BackOffice.ModelBinders;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     The API controller used for editing content
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessDocuments)]
-[ParameterSwapControllerActionSelector(nameof(GetById), "id", typeof(int), typeof(Guid), typeof(Udi))]
-[ParameterSwapControllerActionSelector(nameof(GetNiceUrl), "id", typeof(int), typeof(Guid), typeof(Udi))]
-public class ContentController : ContentControllerBase
-{
-    private readonly ActionCollection _actionCollection;
-    private readonly Lazy<IDictionary<string, ILanguage>> _allLangs;
-    private readonly IAuthorizationService _authorizationService;
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IContentService _contentService;
-    private readonly IContentTypeService _contentTypeService;
-    private readonly IContentVersionService _contentVersionService;
-    private readonly IDataTypeService _dataTypeService;
-    private readonly IDomainService _domainService;
-    private readonly IFileService _fileService;
-    private readonly ILocalizationService _localizationService;
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly INotificationService _notificationService;
-    private readonly ICultureImpactFactory _cultureImpactFactory;
-    private readonly IUserGroupService _userGroupService;
-    private readonly ILogger<ContentController> _logger;
-    private readonly PropertyEditorCollection _propertyEditors;
-    private readonly IPublishedUrlProvider _publishedUrlProvider;
-    private readonly ICoreScopeProvider _scopeProvider;
-    private readonly ISqlContext _sqlContext;
-    private readonly IUmbracoMapper _umbracoMapper;
-    private readonly IUserService _userService;
-    private readonly ContentSettings _contentSettings;
-
-    [ActivatorUtilitiesConstructor]
-    public ContentController(
-        ICultureDictionary cultureDictionary,
-        ILoggerFactory loggerFactory,
-        IShortStringHelper shortStringHelper,
-        IEventMessagesFactory eventMessages,
-        ILocalizedTextService localizedTextService,
-        PropertyEditorCollection propertyEditors,
-        IContentService contentService,
-        IUserService userService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IContentTypeService contentTypeService,
-        IUmbracoMapper umbracoMapper,
-        IPublishedUrlProvider publishedUrlProvider,
-        IDomainService domainService,
-        IDataTypeService dataTypeService,
-        ILocalizationService localizationService,
-        IFileService fileService,
-        INotificationService notificationService,
-        ActionCollection actionCollection,
-        ISqlContext sqlContext,
-        IJsonSerializer serializer,
-        ICoreScopeProvider scopeProvider,
-        IAuthorizationService authorizationService,
-        IContentVersionService contentVersionService,
-        ICultureImpactFactory cultureImpactFactory,
-        IUserGroupService userGroupService,
-        IOptions<ContentSettings> contentSettings)
-        : base(cultureDictionary, loggerFactory, shortStringHelper, eventMessages, localizedTextService, serializer)
-    {
-        _propertyEditors = propertyEditors;
-        _contentService = contentService;
-        _localizedTextService = localizedTextService;
-        _userService = userService;
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-        _contentTypeService = contentTypeService;
-        _umbracoMapper = umbracoMapper;
-        _publishedUrlProvider = publishedUrlProvider;
-        _domainService = domainService;
-        _dataTypeService = dataTypeService;
-        _localizationService = localizationService;
-        _fileService = fileService;
-        _notificationService = notificationService;
-        _actionCollection = actionCollection;
-        _sqlContext = sqlContext;
-        _authorizationService = authorizationService;
-        _contentVersionService = contentVersionService;
-        _cultureImpactFactory = cultureImpactFactory;
-        _userGroupService = userGroupService;
-        _logger = loggerFactory.CreateLogger<ContentController>();
-        _scopeProvider = scopeProvider;
-        _allLangs = new Lazy<IDictionary<string, ILanguage>>(() =>
-        _localizationService.GetAllLanguages().ToDictionary(x => x.IsoCode, x => x, StringComparer.InvariantCultureIgnoreCase));
-        _contentSettings = contentSettings.Value;
-    }
-
-    [Obsolete("User constructor that takes a IUserGroupService, scheduled for removal in V15.")]
-    public ContentController(
-        ICultureDictionary cultureDictionary,
-        ILoggerFactory loggerFactory,
-        IShortStringHelper shortStringHelper,
-        IEventMessagesFactory eventMessages,
-        ILocalizedTextService localizedTextService,
-        PropertyEditorCollection propertyEditors,
-        IContentService contentService,
-        IUserService userService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IContentTypeService contentTypeService,
-        IUmbracoMapper umbracoMapper,
-        IPublishedUrlProvider publishedUrlProvider,
-        IDomainService domainService,
-        IDataTypeService dataTypeService,
-        ILocalizationService localizationService,
-        IFileService fileService,
-        INotificationService notificationService,
-        ActionCollection actionCollection,
-        ISqlContext sqlContext,
-        IJsonSerializer serializer,
-        ICoreScopeProvider scopeProvider,
-        IAuthorizationService authorizationService,
-        IContentVersionService contentVersionService,
-        ICultureImpactFactory cultureImpactFactory)
-        : this(
-            cultureDictionary,
-            loggerFactory,
-            shortStringHelper,
-            eventMessages,
-            localizedTextService,
-            propertyEditors,
-            contentService,
-            userService,
-            backofficeSecurityAccessor,
-            contentTypeService,
-            umbracoMapper,
-            publishedUrlProvider,
-            domainService,
-            dataTypeService,
-            localizationService,
-            fileService,
-            notificationService,
-            actionCollection,
-            sqlContext,
-            serializer,
-            scopeProvider,
-            authorizationService,
-            contentVersionService,
-            cultureImpactFactory,
-            StaticServiceProvider.Instance.GetRequiredService<IUserGroupService>(),
-            StaticServiceProvider.Instance.GetRequiredService<IOptions<ContentSettings>>()
-        )
-    {
-    }
-
-    public object? Domains { get; private set; }
-
-
-    /// <summary>
-    ///     Return content for the specified ids
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemDisplay>))]
-    public IEnumerable<ContentItemDisplay> GetByIds([FromQuery] int[] ids)
-    {
-        IEnumerable<IContent> foundContent = _contentService.GetByIds(ids);
-        return foundContent.Select(MapToDisplay).WhereNotNull();
-    }
-
-    /// <summary>
-    ///     Updates the permissions for a content item for a particular user group
-    /// </summary>
-    /// <param name="saveModel"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     Permission check is done for letter 'R' which is for <see cref="ActionRights" /> which the user must have access to
-    ///     update
-    /// </remarks>
-    public async Task<ActionResult<IEnumerable<AssignedUserGroupPermissions?>?>> PostSaveUserGroupPermissions(
-        UserGroupPermissionsSave saveModel)
-    {
-        if (saveModel.ContentId <= 0)
-        {
-            return NotFound();
-        }
-
-        // TODO: Should non-admins be allowed to set granular permissions?
-
-        IContent? content = _contentService.GetById(saveModel.ContentId);
-        if (content == null)
-        {
-            return NotFound();
-        }
-
-        // Authorize...
-        var resource = new ContentPermissionsResource(content, ActionRights.ActionLetter);
-        AuthorizationResult authorizationResult =
-            await _authorizationService.AuthorizeAsync(User, resource, AuthorizationPolicies.ContentPermissionByResource);
-        if (!authorizationResult.Succeeded)
-        {
-            return Forbid();
-        }
-
-        //current permissions explicitly assigned to this content item
-        var contentPermissions = _contentService.GetPermissions(content)
-            .ToDictionary(x => x.UserGroupId, x => x);
-
-        IUserGroup[] allUserGroups = _userGroupService.GetAllAsync(0, int.MaxValue).GetAwaiter().GetResult().Items.ToArray();
-
-        //loop through each user group
-        foreach (IUserGroup userGroup in allUserGroups)
-        {
-            //check if there's a permission set posted up for this user group
-            if (saveModel.AssignedPermissions.TryGetValue(userGroup.Id, out IEnumerable<string>? groupPermissions))
-            {
-                if (groupPermissions is null)
-                {
-                    _userService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
-                    continue;
-                }
-
-                // Create a string collection of the assigned letters
-                var groupPermissionCodes = groupPermissions.ToArray();
-                // Check if they are the defaults, if so we should just remove them if they exist since it's more overhead having them stored
-                if (contentPermissions.ContainsKey(userGroup.Id) == false || contentPermissions[userGroup.Id]
-                        .AssignedPermissions.UnsortedSequenceEqual(groupPermissionCodes) == false)
-                {
-                    _userService.ReplaceUserGroupPermissions(userGroup.Id, groupPermissionCodes.Select(x => x[0]), content.Id);
-                }
-            }
-        }
-
-        return GetDetailedPermissions(content, allUserGroups);
-    }
-
-    /// <summary>
-    ///     Returns the user group permissions for user groups assigned to this node
-    /// </summary>
-    /// <param name="contentId"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     Permission check is done for letter 'R' which is for <see cref="ActionRights" /> which the user must have access to
-    ///     view
-    /// </remarks>
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionAdministrationById)]
-    public ActionResult<IEnumerable<AssignedUserGroupPermissions?>?> GetDetailedPermissions(int contentId)
-    {
-        if (contentId <= 0)
-        {
-            return NotFound();
-        }
-
-        IContent? content = _contentService.GetById(contentId);
-        if (content == null)
-        {
-            return NotFound();
-        }
-
-        // TODO: Should non-admins be able to see detailed permissions?
-
-        IEnumerable<IUserGroup> allUserGroups = _userGroupService.GetAllAsync(0, int.MaxValue).GetAwaiter().GetResult().Items;
-
-        return GetDetailedPermissions(content, allUserGroups);
-    }
-
-    private ActionResult<IEnumerable<AssignedUserGroupPermissions?>?> GetDetailedPermissions(
-        IContent content,
-        IEnumerable<IUserGroup> allUserGroups)
-    {
-        //get all user groups and map their default permissions to the AssignedUserGroupPermissions model.
-        //we do this because not all groups will have true assigned permissions for this node so if they don't have assigned permissions, we need to show the defaults.
-
-        List<AssignedUserGroupPermissions> defaultPermissionsByGroup =
-            _umbracoMapper.MapEnumerable<IUserGroup, AssignedUserGroupPermissions>(allUserGroups);
-
-        var defaultPermissionsAsDictionary = defaultPermissionsByGroup.WhereNotNull()
-            .ToDictionary(x => Convert.ToInt32(x.Id), x => x);
-
-        //get the actual assigned permissions
-        EntityPermission[] assignedPermissionsByGroup = _contentService.GetPermissions(content).ToArray();
-
-        //iterate over assigned and update the defaults with the real values
-        foreach (EntityPermission assignedGroupPermission in assignedPermissionsByGroup)
-        {
-            AssignedUserGroupPermissions defaultUserGroupPermissions =
-                defaultPermissionsAsDictionary[assignedGroupPermission.UserGroupId];
-
-            //clone the default permissions model to the assigned ones
-            defaultUserGroupPermissions.AssignedPermissions =
-                AssignedUserGroupPermissions.ClonePermissions(defaultUserGroupPermissions.DefaultPermissions);
-
-            //since there is custom permissions assigned to this node for this group, we need to clear all of the default permissions
-            //and we'll re-check it if it's one of the explicitly assigned ones
-            foreach (Permission permission in defaultUserGroupPermissions.AssignedPermissions.SelectMany(x => x.Value))
-            {
-                permission.Checked = false;
-                permission.Checked =
-                    assignedGroupPermission.AssignedPermissions.Contains(
-                        permission.PermissionCode,
-                        StringComparer.InvariantCulture);
-            }
-        }
-
-        return defaultPermissionsByGroup;
-    }
-
-    /// <summary>
-    ///     Returns an item to be used to display the recycle bin for content
-    /// </summary>
-    /// <returns></returns>
-    public ActionResult<ContentItemDisplay> GetRecycleBin()
-    {
-        var display = new ContentItemDisplay
-        {
-            Id = Constants.System.RecycleBinContent,
-            ParentId = -1,
-            ContentTypeAlias = "recycleBin",
-            IsContainer = true,
-            Path = "-1," + Constants.System.RecycleBinContent,
-            Variants = new List<ContentVariantDisplay>
-            {
-                new()
-                {
-                    CreateDate = DateTime.Now,
-                    Name = _localizedTextService.Localize("general", "recycleBin")
-                }
-            }
-        };
-
-        return display;
-    }
-
-    public ActionResult<ContentItemDisplay?> GetBlueprintById(int id)
-    {
-        IContent? foundContent = _contentService.GetBlueprintById(id);
-        if (foundContent == null)
-        {
-            return HandleContentNotFound(id);
-        }
-
-        ContentItemDisplay? content = MapToDisplay(foundContent);
-
-        if (content is not null)
-        {
-            SetupBlueprint(content, foundContent);
-        }
-
-        return content;
-    }
-
-    private static void SetupBlueprint(ContentItemDisplay content, IContent? persistedContent)
-    {
-        content.AllowPreview = false;
-
-        //set a custom path since the tree that renders this has the content type id as the parent
-        content.Path = string.Format("-1,{0},{1}", persistedContent?.ContentTypeId, content.Id);
-
-        content.AllowedActions = new[] { "A" };
-        content.IsBlueprint = true;
-
-        // TODO: exclude the content apps here
-        //var excludeProps = new[] { "_umb_urls", "_umb_releasedate", "_umb_expiredate", "_umb_template" };
-        //var propsTab = content.Tabs.Last();
-        //propsTab.Properties = propsTab.Properties
-        //    .Where(p => excludeProps.Contains(p.Alias) == false);
-    }
-
-    /// <summary>
-    ///     Gets the content json for the content id
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [OutgoingEditorModelEvent]
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionBrowseById)]
-    public ActionResult<ContentItemDisplayWithSchedule?> GetById(int id)
-    {
-        IContent? foundContent = GetObjectFromRequest(() => _contentService.GetById(id));
-        if (foundContent == null)
-        {
-            return HandleContentNotFound(id);
-        }
-
-        return MapToDisplayWithSchedule(foundContent);
-    }
-
-    /// <summary>
-    ///     Gets the content json for the content guid
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [OutgoingEditorModelEvent]
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionBrowseById)]
-    public ActionResult<ContentItemDisplayWithSchedule?> GetById(Guid id)
-    {
-        IContent? foundContent = GetObjectFromRequest(() => _contentService.GetById(id));
-        if (foundContent == null)
-        {
-            return HandleContentNotFound(id);
-        }
-
-        return MapToDisplayWithSchedule(foundContent);
-    }
-
-    /// <summary>
-    ///     Gets the content json for the content udi
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [OutgoingEditorModelEvent]
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionBrowseById)]
-    public ActionResult<ContentItemDisplayWithSchedule?> GetById(Udi id)
-    {
-        var guidUdi = id as GuidUdi;
-        if (guidUdi != null)
-        {
-            return GetById(guidUdi.Guid);
-        }
-
-        return NotFound();
-    }
-
-    /// <summary>
-    ///     Gets an empty content item for the document type.
-    /// </summary>
-    /// <param name="contentTypeAlias"></param>
-    /// <param name="parentId"></param>
-    [OutgoingEditorModelEvent]
-    public ActionResult<ContentItemDisplay?> GetEmpty(string contentTypeAlias, int parentId)
-    {
-        IContentType? contentType = _contentTypeService.Get(contentTypeAlias);
-        if (contentType == null)
-        {
-            return NotFound();
-        }
-
-        return GetEmptyInner(contentType, parentId);
-    }
-
-    /// <summary>
-    ///     Gets a dictionary containing empty content items for every alias specified in the contentTypeAliases array in the
-    ///     body of the request.
-    /// </summary>
-    /// <remarks>
-    ///     This is a post request in order to support a large amount of aliases without hitting the URL length limit.
-    /// </remarks>
-    /// <param name="contentTypesByAliases"></param>
-    /// <returns></returns>
-    [OutgoingEditorModelEvent]
-    [HttpPost]
-    public ActionResult<IDictionary<string, ContentItemDisplay>> GetEmptyByAliases(
-        ContentTypesByAliases contentTypesByAliases)
-    {
-        // It's important to do this operation within a scope to reduce the amount of readlock queries.
-        using ICoreScope scope = _scopeProvider.CreateCoreScope(autoComplete: true);
-        IEnumerable<IContentType>? contentTypes = contentTypesByAliases.ContentTypeAliases
-            ?.Select(alias => _contentTypeService.Get(alias)).WhereNotNull();
-        return GetEmpties(contentTypes, contentTypesByAliases.ParentId).ToDictionary(x => x.ContentTypeAlias);
-    }
-
-    /// <summary>
-    ///     Gets an empty content item for the document type.
-    /// </summary>
-    /// <param name="contentTypeKey"></param>
-    /// <param name="parentId"></param>
-    [OutgoingEditorModelEvent]
-    public ActionResult<ContentItemDisplay?> GetEmptyByKey(Guid contentTypeKey, int parentId)
-    {
-        using (ICoreScope scope = _scopeProvider.CreateCoreScope())
-        {
-            IContentType? contentType = _contentTypeService.Get(contentTypeKey);
-            if (contentType == null)
-            {
-                return NotFound();
-            }
-
-            ContentItemDisplay? contentItem = GetEmptyInner(contentType, parentId);
-            scope.Complete();
-
-            return contentItem;
-        }
-    }
-
-    private ContentItemDisplay? GetEmptyInner(IContentType contentType, int parentId)
-    {
-        IContent emptyContent = _contentService.Create(string.Empty, parentId, contentType.Alias, _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1);
-        ContentItemDisplay? mapped = MapToDisplay(emptyContent);
-
-        if (mapped is null)
-        {
-            return null;
-        }
-
-        return CleanContentItemDisplay(mapped);
-    }
-
-    private ContentItemDisplay CleanContentItemDisplay(ContentItemDisplay display)
-    {
-        // translate the content type name if applicable
-        display.ContentTypeName =
-            _localizedTextService.UmbracoDictionaryTranslate(CultureDictionary, display.ContentTypeName);
-        // if your user type doesn't have access to the Settings section it would not get this property mapped
-        if (display.DocumentType != null)
-        {
-            display.DocumentType.Name =
-                _localizedTextService.UmbracoDictionaryTranslate(CultureDictionary, display.DocumentType.Name);
-            display.DocumentType.Description =
-                _localizedTextService.UmbracoDictionaryTranslate(CultureDictionary, display.DocumentType.Description);
-        }
-
-        return display;
-    }
-
-    /// <summary>
-    ///     Gets an empty <see cref="ContentItemDisplay" /> for each content type in the IEnumerable, all with the same parent
-    ///     ID
-    /// </summary>
-    /// <remarks>Will attempt to re-use the same permissions for every content as long as the path and user are the same</remarks>
-    /// <param name="contentTypes"></param>
-    /// <param name="parentId"></param>
-    /// <returns></returns>
-    private IEnumerable<ContentItemDisplay> GetEmpties(IEnumerable<IContentType>? contentTypes, int parentId)
-    {
-        var result = new List<ContentItemDisplay>();
-        IBackOfficeSecurity? backOfficeSecurity = _backofficeSecurityAccessor.BackOfficeSecurity;
-
-        var userId = backOfficeSecurity?.GetUserId().Result ?? -1;
-        IUser? currentUser = backOfficeSecurity?.CurrentUser;
-        // We know that if the ID is less than 0 the parent is null.
-        // Since this is called with parent ID it's safe to assume that the parent is the same for all the content types.
-        IContent? parent = parentId > 0 ? _contentService.GetById(parentId) : null;
-        // Since the parent is the same and the path used to get permissions is based on the parent we only have to do it once
-        var path = parent == null ? "-1" : parent.Path;
-        var permissions = new Dictionary<string, EntityPermissionSet>
-        {
-            [path] = _userService.GetPermissionsForPath(currentUser, path)
-        };
-
-        if (contentTypes is not null)
-        {
-            foreach (IContentType contentType in contentTypes)
-            {
-                IContent emptyContent = _contentService.Create(string.Empty, parentId, contentType, userId);
-
-                ContentItemDisplay? mapped = MapToDisplay(emptyContent, context =>
-                {
-                    // Since the permissions depend on current user and path, we add both of these to context as well,
-                    // that way we can compare the path and current user when mapping, if they're the same just take permissions
-                    // and skip getting them again, in theory they should always be the same, but better safe than sorry.,
-                    context.Items["Parent"] = parent;
-                    context.Items["CurrentUser"] = currentUser;
-                    context.Items["Permissions"] = permissions;
-                });
-                if (mapped is not null)
-                {
-                    result.Add(CleanContentItemDisplay(mapped));
-                }
-            }
-        }
-
-        return result;
-    }
-
-    private ActionResult<IDictionary<Guid, ContentItemDisplay>> GetEmptyByKeysInternal(
-        Guid[]? contentTypeKeys,
-        int parentId)
-    {
-        using ICoreScope scope = _scopeProvider.CreateCoreScope(autoComplete: true);
-        var contentTypes = _contentTypeService.GetAll(contentTypeKeys).ToList();
-        return GetEmpties(contentTypes, parentId).ToDictionary(x => x.ContentTypeKey);
-    }
-
-    /// <summary>
-    ///     Gets a collection of empty content items for all document types.
-    /// </summary>
-    /// <param name="contentTypeKeys"></param>
-    /// <param name="parentId"></param>
-    [OutgoingEditorModelEvent]
-    public ActionResult<IDictionary<Guid, ContentItemDisplay>> GetEmptyByKeys(
-        [FromQuery] Guid[] contentTypeKeys,
-        [FromQuery] int parentId) => GetEmptyByKeysInternal(contentTypeKeys, parentId);
-
-    /// <summary>
-    ///     Gets a collection of empty content items for all document types.
-    /// </summary>
-    /// <remarks>
-    ///     This is a post request in order to support a large amount of GUIDs without hitting the URL length limit.
-    /// </remarks>
-    /// <param name="contentTypeByKeys"></param>
-    /// <returns></returns>
-    [HttpPost]
-    [OutgoingEditorModelEvent]
-    public ActionResult<IDictionary<Guid, ContentItemDisplay>> GetEmptyByKeys(ContentTypesByKeys contentTypeByKeys) =>
-        GetEmptyByKeysInternal(contentTypeByKeys.ContentTypeKeys, contentTypeByKeys.ParentId);
-
-    [OutgoingEditorModelEvent]
-    public ActionResult<ContentItemDisplay?> GetEmptyBlueprint(int blueprintId, int parentId)
-    {
-        IContent? scaffold;
-        using (ICoreScope scope = _scopeProvider.CreateCoreScope())
-        {
-            IContent? blueprint = _contentService.GetBlueprintById(blueprintId);
-            if (blueprint is null)
-            {
-                return NotFound();
-            }
-            scaffold = (IContent)blueprint.DeepClone();
-
-            scaffold.Id = 0;
-            scaffold.Name = string.Empty;
-            scaffold.ParentId = parentId;
-
-            var scaffoldedNotification = new ContentScaffoldedNotification(blueprint, scaffold, parentId, new EventMessages());
-            if (scope.Notifications.PublishCancelable(scaffoldedNotification))
-            {
-                scope.Complete();
-                return Problem("Scaffolding was cancelled");
-            }
-
-            scope.Complete();
-        }
-
-
-
-        ContentItemDisplay? mapped = _umbracoMapper.Map<ContentItemDisplay>(scaffold);
-
-        return mapped;
-    }
-
-    /// <summary>
-    ///     Gets the Url for a given node ID
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public IActionResult GetNiceUrl(int id)
-    {
-        var url = _publishedUrlProvider.GetUrl(id);
-        return Content(url, MediaTypeNames.Text.Plain, Encoding.UTF8);
-    }
-
-    /// <summary>
-    ///     Gets the Url for a given node ID
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public IActionResult GetNiceUrl(Guid id)
-    {
-        var url = _publishedUrlProvider.GetUrl(id);
-        return Content(url, MediaTypeNames.Text.Plain, Encoding.UTF8);
-    }
-
-    /// <summary>
-    ///     Gets the Url for a given node ID
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public IActionResult GetNiceUrl(Udi id)
-    {
-        var guidUdi = id as GuidUdi;
-        if (guidUdi != null)
-        {
-            return GetNiceUrl(guidUdi.Guid);
-        }
-
-        return NotFound();
-    }
-
-    /// <summary>
-    ///     Gets the children for the content id passed in
-    /// </summary>
-    /// <returns></returns>
-    [FilterAllowedOutgoingContent(typeof(IEnumerable<ContentItemBasic<ContentPropertyBasic>>), "Items")]
-    public PagedResult<ContentItemBasic<ContentPropertyBasic>> GetChildren(
-        int id,
-        string includeProperties,
-        int pageNumber = 0,
-        int pageSize = 0,
-        string orderBy = "SortOrder",
-        Direction orderDirection = Direction.Ascending,
-        bool orderBySystemField = true,
-        string filter = "",
-        string cultureName = "") // TODO: it's not a NAME it's the ISO CODE
-    {
-        long totalChildren;
-        List<IContent> children;
-        // Sets the culture to the only existing culture if we only have one culture.
-        if (string.IsNullOrWhiteSpace(cultureName))
-        {
-            if (_allLangs.Value.Count == 1)
-            {
-                cultureName = _allLangs.Value.First().Key;
-            }
-        }
-        if (pageNumber > 0 && pageSize > 0)
-        {
-            IQuery<IContent>? queryFilter = null;
-            if (filter.IsNullOrWhiteSpace() == false)
-            {
-                int.TryParse(filter, out int filterAsIntId);//considering id,key & name as filter param
-                Guid.TryParse(filter, out Guid filterAsGuid);
-                //add the default text filter
-                queryFilter = _sqlContext.Query<IContent>()
-                    .Where(x => x.Name != null)
-                    .Where(x => x.Name!.Contains(filter)
-                      || x.Id == filterAsIntId || x.Key == filterAsGuid);
-            }
-            children = _contentService
-                .GetPagedChildren(id, pageNumber - 1, pageSize, out totalChildren, queryFilter, Ordering.By(orderBy, orderDirection, cultureName, !orderBySystemField)).ToList();
-        }
-        else
-        {
-            //better to not use this without paging where possible, currently only the sort dialog does
-            children = _contentService.GetPagedChildren(id, 0, int.MaxValue, out var total).ToList();
-            totalChildren = children.Count;
-        }
-
-        if (totalChildren == 0)
-        {
-            return new PagedResult<ContentItemBasic<ContentPropertyBasic>>(0, 0, 0);
-        }
-
-        var pagedResult = new PagedResult<ContentItemBasic<ContentPropertyBasic>>(totalChildren, pageNumber, pageSize)
-        {
-            Items = children.Select(content =>
-                _umbracoMapper.Map<IContent, ContentItemBasic<ContentPropertyBasic>>(
-                    content,
-                    context =>
-                    {
-                        context.SetCulture(cultureName);
-
-                        // if there's a list of property aliases to map - we will make sure to store this in the mapping context.
-                        if (!includeProperties.IsNullOrWhiteSpace())
-                        {
-                            context.SetIncludedProperties(includeProperties.Split(
-                                new[] { ", ", "," },
-                                StringSplitOptions.RemoveEmptyEntries));
-                        }
-                    }))
-            .WhereNotNull()
-            .ToList() // evaluate now
-        };
-
-        return pagedResult;
-    }
-
-    /// <summary>
-    ///     Creates a blueprint from a content item
-    /// </summary>
-    /// <param name="contentId">The content id to copy</param>
-    /// <param name="name">The name of the blueprint</param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionCreateBlueprintFromId)]
-    [HttpPost]
-    public ActionResult<SimpleNotificationModel> CreateBlueprintFromContent(
-        [FromQuery] int contentId,
-        [FromQuery] string name)
-    {
-        if (string.IsNullOrWhiteSpace(name))
-        {
-            throw new ArgumentException("Value cannot be null or whitespace.", nameof(name));
-        }
-
-        IContent? content = _contentService.GetById(contentId);
-        if (content == null)
-        {
-            return NotFound();
-        }
-
-        if (!EnsureUniqueName(name, content, nameof(name)))
-        {
-            return ValidationProblem(ModelState);
-        }
-
-        IContent blueprint = _contentService.CreateContentFromBlueprint(content, name, _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1);
-
-        _contentService.SaveBlueprint(
-            blueprint,
-            _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1);
-
-        var notificationModel = new SimpleNotificationModel();
-        notificationModel.AddSuccessNotification(
-            _localizedTextService.Localize("blueprints", "createdBlueprintHeading"),
-            _localizedTextService.Localize("blueprints", "createdBlueprintMessage", new[] { content.Name }));
-
-        return notificationModel;
-    }
-
-    private bool EnsureUniqueName(string? name, IContent? content, string modelName)
-    {
-        if (content is null)
-        {
-            return false;
-        }
-
-        IEnumerable<IContent>? existing = _contentService.GetBlueprintsForContentTypes(content.ContentTypeId);
-        if (existing?.Any(x => x.Name == name && x.Id != content.Id) ?? false)
-        {
-            ModelState.AddModelError(modelName, _localizedTextService.Localize("blueprints", "duplicateBlueprintMessage"));
-            return false;
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Saves content
-    /// </summary>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    [ContentSaveValidation(skipUserAccessValidation:true)] // skip user access validation because we "only" require Settings access to create new blueprints from scratch
-    public async Task<ActionResult<ContentItemDisplay<ContentVariantDisplay>?>?> PostSaveBlueprint(
-        [ModelBinder(typeof(BlueprintItemBinder))] ContentItemSave contentItem)
-    {
-        ActionResult<ContentItemDisplay<ContentVariantDisplay>?> contentItemDisplay = await PostSaveInternal(
-            contentItem,
-            (content, _) =>
-            {
-                if (!EnsureUniqueName(content?.Name, content, "Name") || contentItem.PersistedContent is null)
-                {
-                    return OperationResult.Cancel(new EventMessages());
-                }
-
-                _contentService.SaveBlueprint(contentItem.PersistedContent, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-
-                // we need to reuse the underlying logic so return the result that it wants
-                return OperationResult.Succeed(new EventMessages());
-            },
-            content =>
-            {
-                ContentItemDisplay? display = MapToDisplay(content);
-                if (display is not null)
-                {
-                    SetupBlueprint(display, content);
-                }
-
-                return display;
-            });
-
-        return contentItemDisplay;
-    }
-
-    /// <summary>
-    ///     Saves content
-    /// </summary>
-    [ContentSaveValidation]
-    [OutgoingEditorModelEvent]
-    public async Task<ActionResult<ContentItemDisplay<ContentVariantScheduleDisplay>?>> PostSave(
-        [ModelBinder(typeof(ContentItemBinder))] ContentItemSave contentItem)
-    {
-        ActionResult<ContentItemDisplay<ContentVariantScheduleDisplay>?> contentItemDisplay = await PostSaveInternal(
-            contentItem,
-            (content, contentSchedule) => _contentService.Save(content, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id, contentSchedule),
-            MapToDisplayWithSchedule);
-
-        return contentItemDisplay;
-    }
-
-    private async Task<ActionResult<ContentItemDisplay<TVariant>?>> PostSaveInternal<TVariant>(
-        ContentItemSave contentItem,
-        Func<IContent, ContentScheduleCollection?, OperationResult>? saveMethod,
-        Func<IContent?, ContentItemDisplay<TVariant>?> mapToDisplay)
-        where TVariant : ContentVariantDisplay
-    {
-        // If we've reached here it means:
-        // * Our model has been bound
-        // * and validated
-        // * any file attachments have been saved to their temporary location for us to use
-        // * we have a reference to the DTO object and the persisted object
-        // * Permissions are valid
-        MapValuesForPersistence(contentItem);
-
-        var passesCriticalValidationRules = ValidateCriticalData(contentItem, out var variantCount);
-
-        // we will continue to save if model state is invalid, however we cannot save if critical data is missing.
-        if (!ModelState.IsValid)
-        {
-            // Don't try and save if we do not have access
-            if (ModelState.Keys.Contains(Constants.ModelStateErrorKeys.PermissionError))
-            {
-                var forDisplay = mapToDisplay(contentItem.PersistedContent);
-                return ValidationProblem(forDisplay, ModelState);
-            }
-
-            // check for critical data validation issues, we can't continue saving if this data is invalid
-            if (!passesCriticalValidationRules)
-            {
-                // ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
-                // add the model state to the outgoing object and throw a validation message
-                ContentItemDisplay<TVariant>? forDisplay = mapToDisplay(contentItem.PersistedContent);
-                return ValidationProblem(forDisplay, ModelState);
-            }
-
-            // if there's only one variant and the model state is not valid we cannot publish so change it to save
-            if (variantCount == 1)
-            {
-                switch (contentItem.Action)
-                {
-                    case ContentSaveAction.Publish:
-                    case ContentSaveAction.PublishWithDescendants:
-                    case ContentSaveAction.PublishWithDescendantsForce:
-                    case ContentSaveAction.SendPublish:
-                    case ContentSaveAction.Schedule:
-                        contentItem.Action = ContentSaveAction.Save;
-                        break;
-                    case ContentSaveAction.PublishNew:
-                    case ContentSaveAction.PublishWithDescendantsNew:
-                    case ContentSaveAction.PublishWithDescendantsForceNew:
-                    case ContentSaveAction.SendPublishNew:
-                    case ContentSaveAction.ScheduleNew:
-                        contentItem.Action = ContentSaveAction.SaveNew;
-                        break;
-                }
-            }
-        }
-
-        bool wasCancelled;
-
-        //used to track successful notifications
-        var globalNotifications = new SimpleNotificationModel();
-        var notifications = new Dictionary<string, SimpleNotificationModel>
-        {
-            //global (non variant specific) notifications
-            [string.Empty] = globalNotifications
-        };
-
-        //The default validation language will be either: The default languauge, else if the content is brand new and the default culture is
-        // not marked to be saved, it will be the first culture in the list marked for saving.
-        var defaultCulture = _allLangs.Value.Values.FirstOrDefault(x => x.IsDefault)?.IsoCode;
-        var cultureForInvariantErrors = _cultureImpactFactory.GetCultureForInvariantErrors(
-        contentItem.PersistedContent,
-        contentItem.Variants.Where(x => x.Save).Select(x => x.Culture).ToArray(),
-        defaultCulture);
-
-        //get the updated model
-        var isBlueprint = contentItem.PersistedContent?.Blueprint ?? false;
-
-        var contentSavedHeader = isBlueprint ? "editBlueprintSavedHeader" : "editContentSavedHeader";
-        var contentSavedText = isBlueprint ? "editBlueprintSavedText" : "editContentSavedText";
-
-        switch (contentItem.Action)
-        {
-            case ContentSaveAction.Save:
-            case ContentSaveAction.SaveNew:
-                SaveAndNotify(
-                    contentItem,
-                    saveMethod,
-                    variantCount,
-                    notifications,
-                    globalNotifications,
-                    contentSavedHeader,
-                    contentSavedText,
-                    "editVariantSavedText",
-                    cultureForInvariantErrors,
-                    null,
-                    out wasCancelled);
-                break;
-            case ContentSaveAction.Schedule:
-            case ContentSaveAction.ScheduleNew:
-                ContentScheduleCollection contentSchedule =
-                    _contentService.GetContentScheduleByContentId(contentItem.Id);
-                if (!SaveSchedule(contentItem, contentSchedule, globalNotifications))
-                {
-                    wasCancelled = false;
-                    break;
-                }
-
-                SaveAndNotify(
-                    contentItem,
-                    saveMethod,
-                    variantCount,
-                    notifications,
-                    globalNotifications,
-                    "editContentSavedHeader",
-                    "editContentScheduledSavedText",
-                    "editVariantSavedText",
-                    cultureForInvariantErrors,
-                    contentSchedule,
-                    out wasCancelled);
-                break;
-
-            case ContentSaveAction.SendPublish:
-            case ContentSaveAction.SendPublishNew:
-                var sendResult = _contentService.SendToPublication(contentItem.PersistedContent, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-                wasCancelled = sendResult == false;
-                if (sendResult)
-                {
-                    if (variantCount > 1)
-                    {
-                        IReadOnlyList<(string? culture, string? segment)>? variantErrors =
-                            ModelState.GetVariantsWithErrors(cultureForInvariantErrors);
-
-                        if (variantErrors is not null)
-                        {
-                            IEnumerable<(string? culture, string? segment)> validVariants = contentItem.Variants
-                                .Where(x => x.Save && !variantErrors.Contains((x.Culture, x.Segment)))
-                                .Select(x => (culture: x.Culture, segment: x.Segment));
-
-                            foreach ((string? culture, string? segment) in validVariants)
-                            {
-                                var variantName = GetVariantName(culture, segment);
-
-                                AddSuccessNotification(
-                                    notifications,
-                                    culture,
-                                    segment,
-                                    _localizedTextService.Localize("speechBubbles", "editContentSendToPublish"),
-                                    _localizedTextService.Localize(
-                                        "speechBubbles",
-                                        "editVariantSendToPublishText",
-                                        new[]
-                                        {
-                                            variantName
-                                        }));
-                            }
-                        }
-                    }
-                    else if (ModelState.IsValid)
-                    {
-                        globalNotifications.AddSuccessNotification(
-                            _localizedTextService.Localize("speechBubbles", "editContentSendToPublish"),
-                            _localizedTextService.Localize("speechBubbles", "editContentSendToPublishText"));
-                    }
-                }
-
-                break;
-            case ContentSaveAction.Publish:
-            case ContentSaveAction.PublishNew:
-            {
-                PublishResult publishStatus = PublishInternal(contentItem, defaultCulture, cultureForInvariantErrors, out wasCancelled, out var successfulCultures);
-                // Add warnings if domains are not set up correctly
-                AddDomainWarnings(publishStatus.Content, successfulCultures, globalNotifications);
-                AddPublishStatusNotifications(new[] { publishStatus }, globalNotifications, notifications, successfulCultures);
-            }
-                break;
-            case ContentSaveAction.PublishWithDescendants:
-            case ContentSaveAction.PublishWithDescendantsNew:
-            {
-                if (!await ValidatePublishBranchPermissionsAsync(contentItem))
-                {
-                    globalNotifications.AddErrorNotification(
-                        _localizedTextService.Localize(null, "publish"),
-                        _localizedTextService.Localize("publish", "invalidPublishBranchPermissions"));
-                    wasCancelled = false;
-                    break;
-                }
-
-                var publishStatus = PublishBranchInternal(contentItem, false, cultureForInvariantErrors, out wasCancelled, out var successfulCultures).ToList();
-                AddDomainWarnings(publishStatus, successfulCultures, globalNotifications);
-                AddPublishStatusNotifications(publishStatus, globalNotifications, notifications, successfulCultures);
-            }
-                break;
-            case ContentSaveAction.PublishWithDescendantsForce:
-            case ContentSaveAction.PublishWithDescendantsForceNew:
-            {
-                if (!await ValidatePublishBranchPermissionsAsync(contentItem))
-                {
-                    globalNotifications.AddErrorNotification(
-                        _localizedTextService.Localize(null, "publish"),
-                        _localizedTextService.Localize("publish", "invalidPublishBranchPermissions"));
-                    wasCancelled = false;
-                    break;
-                }
-
-                var publishStatus = PublishBranchInternal(contentItem, true, cultureForInvariantErrors, out wasCancelled, out var successfulCultures).ToList();
-                AddPublishStatusNotifications(publishStatus, globalNotifications, notifications, successfulCultures);
-            }
-                break;
-            default:
-                throw new ArgumentOutOfRangeException();
-        }
-
-        // We have to map do display after we've actually saved the content, otherwise we'll miss information that's set when saving content, such as ID
-        ContentItemDisplay<TVariant>? display = mapToDisplay(contentItem.PersistedContent);
-
-        //merge the tracked success messages with the outgoing model
-        display?.Notifications.AddRange(globalNotifications.Notifications);
-        if (display?.Variants is not null)
-        {
-            foreach (TVariant v in display.Variants.Where(x => x.Language != null))
-            {
-                if (v.Language?.IsoCode is not null &&
-                    notifications.TryGetValue(v.Language.IsoCode, out SimpleNotificationModel? n))
-                {
-                    v.Notifications.AddRange(n.Notifications);
-                }
-            }
-        }
-
-        //lastly, if it is not valid, add the model state to the outgoing object and throw a 400
-        HandleInvalidModelState(display, cultureForInvariantErrors);
-
-        if (!ModelState.IsValid)
-        {
-            return ValidationProblem(display, ModelState);
-        }
-
-        if (wasCancelled)
-        {
-            AddCancelMessage(display);
-            if (IsCreatingAction(contentItem.Action))
-            {
-                //If the item is new and the operation was cancelled, we need to return a different
-                // status code so the UI can handle it since it won't be able to redirect since there
-                // is no Id to redirect to!
-                return ValidationProblem(display);
-            }
-        }
-
-        if (display is not null)
-        {
-            display.PersistedContent = contentItem.PersistedContent;
-        }
-
-        return display;
-    }
-
-    private void AddPublishStatusNotifications(
-        IReadOnlyCollection<PublishResult> publishStatus,
-        SimpleNotificationModel globalNotifications,
-        Dictionary<string, SimpleNotificationModel> variantNotifications,
-        string[]? successfulCultures)
-    {
-        //global notifications
-        AddMessageForPublishStatus(publishStatus, globalNotifications, successfulCultures);
-        //variant specific notifications
-        foreach (var c in successfulCultures ?? Array.Empty<string>())
-        {
-            AddMessageForPublishStatus(publishStatus, variantNotifications.GetOrCreate(c), successfulCultures);
-        }
-    }
-
-    /// <summary>
-    ///     Validates critical data for persistence and updates the ModelState and result accordingly
-    /// </summary>
-    /// <param name="contentItem"></param>
-    /// <param name="variantCount">Returns the total number of variants (will be one if it's an invariant content item)</param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     For invariant, the variants collection count will be 1 and this will check if that invariant item has the critical
-    ///     values for persistence (i.e. Name)
-    ///     For variant, each variant will be checked for critical data for persistence and if it's not there then it's flags
-    ///     will be reset and it will not
-    ///     be persisted. However, we also need to deal with the case where all variants don't pass this check and then there
-    ///     is nothing to save. This also deals
-    ///     with removing the Name validation keys based on data annotations validation for items that haven't been marked to
-    ///     be saved.
-    /// </remarks>
-    /// <returns>
-    ///     returns false if persistence cannot take place, returns true if persistence can take place even if there are
-    ///     validation errors
-    /// </returns>
-    private bool ValidateCriticalData(ContentItemSave contentItem, out int variantCount)
-    {
-        var variants = contentItem.Variants.ToList();
-        variantCount = variants.Count;
-        var savedCount = 0;
-        var variantCriticalValidationErrors = new List<string>();
-        for (var i = 0; i < variants.Count; i++)
-        {
-            ContentVariantSave variant = variants[i];
-            if (variant.Save)
-            {
-                //ensure the variant has all critical required data to be persisted
-                if (!RequiredForPersistenceAttribute.HasRequiredValuesForPersistence(variant))
-                {
-                    if (variant.Culture is not null)
-                    {
-                        variantCriticalValidationErrors.Add(variant.Culture);
-                    }
-
-                    //if there's no Name, it cannot be persisted at all reset the flags, this cannot be saved or published
-                    variant.Save = variant.Publish = false;
-
-                    //if there's more than 1 variant, then we need to add the culture specific error
-                    //messages based on the variants in error so that the messages show in the publish/save dialog
-                    if (variants.Count > 1)
-                    {
-                        AddVariantValidationError(variant.Culture, variant.Segment, "publish", "contentPublishedFailedByMissingName");
-                    }
-                    else
-                    {
-                        return false; //It's invariant and is missing critical data, it cannot be saved
-                    }
-                }
-
-                savedCount++;
-            }
-            else
-            {
-                var msKey = $"Variants[{i}].Name";
-                if (ModelState.ContainsKey(msKey))
-                {
-                    //if it's not being saved, remove the validation key
-                    if (!variant.Save)
-                    {
-                        ModelState.Remove(msKey);
-                    }
-                }
-            }
-        }
-
-        if (savedCount == variantCriticalValidationErrors.Count)
-        {
-            //in this case there can be nothing saved since all variants marked to be saved haven't passed critical validation rules
-            return false;
-        }
-
-        return true;
-    }
-
-
-    /// <summary>
-    ///     Helper method to perform the saving of the content and add the notifications to the result
-    /// </summary>
-    /// <param name="contentItem"></param>
-    /// <param name="saveMethod"></param>
-    /// <param name="variantCount"></param>
-    /// <param name="notifications"></param>
-    /// <param name="globalNotifications"></param>
-    /// <param name="invariantSavedLocalizationAlias"></param>
-    /// <param name="variantSavedLocalizationAlias"></param>
-    /// <param name="wasCancelled"></param>
-    /// <param name="savedContentHeaderLocalizationAlias"></param>
-    /// <param name="cultureForInvariantErrors"></param>
-    /// <param name="contentSchedule"></param>
-    /// <remarks>
-    ///     Method is used for normal Saving and Scheduled Publishing
-    /// </remarks>
-    private void SaveAndNotify(
-        ContentItemSave contentItem,
-        Func<IContent, ContentScheduleCollection?, OperationResult>? saveMethod,
-        int variantCount,
-        Dictionary<string, SimpleNotificationModel> notifications,
-        SimpleNotificationModel globalNotifications,
-        string savedContentHeaderLocalizationAlias,
-        string invariantSavedLocalizationAlias,
-        string variantSavedLocalizationAlias,
-        string? cultureForInvariantErrors,
-        ContentScheduleCollection? contentSchedule,
-        out bool wasCancelled)
-    {
-        OperationResult? saveResult = saveMethod?.Invoke(contentItem.PersistedContent, contentSchedule);
-        wasCancelled = saveResult?.Success == false && saveResult.Result == OperationResultType.FailedCancelledByEvent;
-        if (saveResult?.Success ?? false)
-        {
-            if (variantCount > 1)
-            {
-                IReadOnlyList<(string? culture, string? segment)>? variantErrors =
-                    ModelState.GetVariantsWithErrors(cultureForInvariantErrors);
-
-                IEnumerable<(string? culture, string? segment)> savedWithoutErrors = contentItem.Variants
-                    .Where(x => x.Save && (!variantErrors?.Contains((x.Culture, x.Segment)) ?? false))
-                    .Select(x => (culture: x.Culture, segment: x.Segment));
-
-                foreach ((string? culture, string? segment) in savedWithoutErrors)
-                {
-                    var variantName = GetVariantName(culture, segment);
-
-                    AddSuccessNotification(
-                        notifications,
-                        culture,
-                        segment,
-                        _localizedTextService.Localize(
-                            "speechBubbles",
-                            savedContentHeaderLocalizationAlias),
-                        _localizedTextService.Localize(null, variantSavedLocalizationAlias, new[]
-                            {
-                                variantName
-                            }));
-                }
-            }
-            else if (ModelState.IsValid)
-            {
-                globalNotifications.AddSuccessNotification(
-                    _localizedTextService.Localize("speechBubbles", savedContentHeaderLocalizationAlias),
-                    _localizedTextService.Localize("speechBubbles", invariantSavedLocalizationAlias));
-            }
-        }
-    }
-
-    /// <summary>
-    ///     Validates the incoming schedule and update the model
-    /// </summary>
-    /// <param name="contentItem"></param>
-    /// <param name="contentSchedule"></param>
-    /// <param name="globalNotifications"></param>
-    private bool SaveSchedule(ContentItemSave contentItem, ContentScheduleCollection contentSchedule, SimpleNotificationModel globalNotifications)
-    {
-        if (!contentItem.PersistedContent?.ContentType.VariesByCulture() ?? false)
-        {
-            return SaveScheduleInvariant(contentItem, contentSchedule, globalNotifications);
-        }
-
-        return SaveScheduleVariant(contentItem, contentSchedule);
-    }
-
-    private bool SaveScheduleInvariant(ContentItemSave contentItem, ContentScheduleCollection contentSchedule, SimpleNotificationModel globalNotifications)
-    {
-        ContentVariantSave variant = contentItem.Variants.First();
-
-        var currRelease = contentSchedule.GetSchedule(ContentScheduleAction.Release).ToList();
-        var currExpire = contentSchedule.GetSchedule(ContentScheduleAction.Expire).ToList();
-
-        //Do all validation of data first
-
-        //1) release date cannot be less than now
-        if (variant.ReleaseDate.HasValue && variant.ReleaseDate < DateTime.Now)
-        {
-            globalNotifications.AddErrorNotification(
-                _localizedTextService.Localize("speechBubbles", "validationFailedHeader"),
-                _localizedTextService.Localize("speechBubbles", "scheduleErrReleaseDate1"));
-            return false;
-        }
-
-        //2) expire date cannot be less than now
-        if (variant.ExpireDate.HasValue && variant.ExpireDate < DateTime.Now)
-        {
-            globalNotifications.AddErrorNotification(
-                _localizedTextService.Localize("speechBubbles", "validationFailedHeader"),
-                _localizedTextService.Localize("speechBubbles", "scheduleErrExpireDate1"));
-            return false;
-        }
-
-        //3) expire date cannot be less than release date
-        if (variant.ExpireDate.HasValue && variant.ReleaseDate.HasValue && variant.ExpireDate <= variant.ReleaseDate)
-        {
-            globalNotifications.AddErrorNotification(
-                _localizedTextService.Localize("speechBubbles", "validationFailedHeader"),
-                _localizedTextService.Localize("speechBubbles", "scheduleErrExpireDate2"));
-            return false;
-        }
-
-
-        //Now we can do the data updates
-
-        //remove any existing release dates so we can replace it
-        //if there is a release date in the request or if there was previously a release and the request value is null then we are clearing the schedule
-        if (variant.ReleaseDate.HasValue || currRelease.Count > 0)
-        {
-            contentSchedule.Clear(ContentScheduleAction.Release);
-        }
-
-        //remove any existing expire dates so we can replace it
-        //if there is an expiry date in the request or if there was a previous expiry and the request value is null then we are clearing the schedule
-        if (variant.ExpireDate.HasValue || currExpire.Count > 0)
-        {
-            contentSchedule.Clear(ContentScheduleAction.Expire);
-        }
-
-        //add the new schedule
-        contentSchedule.Add(variant.ReleaseDate, variant.ExpireDate);
-        return true;
-    }
-
-    private bool SaveScheduleVariant(ContentItemSave contentItem, ContentScheduleCollection contentSchedule)
-    {
-        //All variants in this collection should have a culture if we get here but we'll double check and filter here)
-        var cultureVariants = contentItem.Variants.Where(x => !x.Culture.IsNullOrWhiteSpace()).ToList();
-        var mandatoryCultures = _allLangs.Value.Values.Where(x => x.IsMandatory).Select(x => x.IsoCode).ToList();
-
-        foreach (ContentVariantSave variant in cultureVariants.Where(x => x.Save))
-        {
-            var currRelease = contentSchedule.GetSchedule(variant.Culture, ContentScheduleAction.Release).ToList();
-            var currExpire = contentSchedule.GetSchedule(variant.Culture, ContentScheduleAction.Expire).ToList();
-
-            //remove any existing release dates so we can replace it
-            //if there is a release date in the request or if there was previously a release and the request value is null then we are clearing the schedule
-            if (variant.ReleaseDate.HasValue || currRelease.Count > 0)
-            {
-                contentSchedule.Clear(variant.Culture, ContentScheduleAction.Release);
-            }
-
-            //remove any existing expire dates so we can replace it
-            //if there is an expiry date in the request or if there was a previous expiry and the request value is null then we are clearing the schedule
-            if (variant.ExpireDate.HasValue || currExpire.Count > 0)
-            {
-                contentSchedule.Clear(variant.Culture, ContentScheduleAction.Expire);
-            }
-
-            //add the new schedule
-            contentSchedule.Add(variant.Culture, variant.ReleaseDate, variant.ExpireDate);
-        }
-
-        //now validate the new schedule to make sure it passes all of the rules
-
-        var isValid = true;
-
-        //create lists of mandatory/non-mandatory states
-        var mandatoryVariants = new List<(string culture, bool isPublished, List<DateTime> releaseDates)>();
-        var nonMandatoryVariants = new List<(string culture, bool isPublished, List<DateTime> releaseDates)>();
-        foreach (IGrouping<string, ContentSchedule> groupedSched in
-                 contentSchedule.FullSchedule.GroupBy(x => x.Culture))
-        {
-            var isPublished = (contentItem.PersistedContent?.Published ?? false) &&
-                              contentItem.PersistedContent.IsCulturePublished(groupedSched.Key);
-            var releaseDates = groupedSched.Where(x => x.Action == ContentScheduleAction.Release).Select(x => x.Date)
-                .ToList();
-            if (mandatoryCultures.Contains(groupedSched.Key, StringComparer.InvariantCultureIgnoreCase))
-            {
-                mandatoryVariants.Add((groupedSched.Key, isPublished, releaseDates));
-            }
-            else
-            {
-                nonMandatoryVariants.Add((groupedSched.Key, isPublished, releaseDates));
-            }
-        }
-
-        var nonMandatoryVariantReleaseDates = nonMandatoryVariants.SelectMany(x => x.releaseDates).ToList();
-
-        //validate that the mandatory languages have the right data
-        foreach ((var culture, var isPublished, List<DateTime> releaseDates) in mandatoryVariants)
-        {
-            if (!isPublished && releaseDates.Count == 0)
-            {
-                //can't continue, a mandatory variant is not published and not scheduled for publishing
-                // TODO: Add segment
-                AddVariantValidationError(culture, null, "speechBubbles", "scheduleErrReleaseDate2");
-                isValid = false;
-                continue;
-            }
-
-            if (!isPublished && releaseDates.Any(x => nonMandatoryVariantReleaseDates.Any(r => x.Date > r.Date)))
-            {
-                //can't continue, a mandatory variant is not published and it's scheduled for publishing after a non-mandatory
-                // TODO: Add segment
-                AddVariantValidationError(culture, null, "speechBubbles", "scheduleErrReleaseDate3");
-                isValid = false;
-            }
-        }
-
-        if (!isValid)
-        {
-            return false;
-        }
-
-        //now we can validate the more basic rules for individual variants
-        foreach (ContentVariantSave variant in cultureVariants.Where(x =>
-                     x.ReleaseDate.HasValue || x.ExpireDate.HasValue))
-        {
-            //1) release date cannot be less than now
-            if (variant.ReleaseDate.HasValue && variant.ReleaseDate < DateTime.Now)
-            {
-                AddVariantValidationError(variant.Culture, variant.Segment, "speechBubbles", "scheduleErrReleaseDate1");
-                isValid = false;
-                continue;
-            }
-
-            //2) expire date cannot be less than now
-            if (variant.ExpireDate.HasValue && variant.ExpireDate < DateTime.Now)
-            {
-                AddVariantValidationError(variant.Culture, variant.Segment, "speechBubbles", "scheduleErrExpireDate1");
-                isValid = false;
-                continue;
-            }
-
-            //3) expire date cannot be less than release date
-            if (variant.ExpireDate.HasValue && variant.ReleaseDate.HasValue &&
-                variant.ExpireDate <= variant.ReleaseDate)
-            {
-                AddVariantValidationError(variant.Culture, variant.Segment, "speechBubbles", "scheduleErrExpireDate2");
-                isValid = false;
-            }
-        }
-
-        if (!isValid)
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Used to add success notifications globally and for the culture
-    /// </summary>
-    /// <param name="notifications"></param>
-    /// <param name="culture"></param>
-    /// <param name="segment"></param>
-    /// <param name="header"></param>
-    /// <param name="msg"></param>
-    /// <remarks>
-    ///     global notifications will be shown if all variant processing is successful and the save/publish dialog is closed,
-    ///     otherwise
-    ///     variant specific notifications are used to show success messages in the save/publish dialog.
-    /// </remarks>
-    private static void AddSuccessNotification(
-        IDictionary<string,
-            SimpleNotificationModel> notifications,
-        string? culture,
-        string? segment,
-        string header,
-        string msg)
-    {
-        //add the global notification (which will display globally if all variants are successfully processed)
-        notifications[string.Empty].AddSuccessNotification(header, msg);
-        //add the variant specific notification (which will display in the dialog if all variants are not successfully processed)
-        var key = culture + "_" + segment;
-        notifications.GetOrCreate(key).AddSuccessNotification(header, msg);
-    }
-
-    /// <summary>
-    ///     The user must have publish access to all descendant nodes of the content item in order to continue
-    /// </summary>
-    /// <param name="contentItem"></param>
-    /// <returns></returns>
-    private async Task<bool> ValidatePublishBranchPermissionsAsync(ContentItemSave contentItem)
-    {
-        // Authorize...
-        var requirement = new ContentPermissionsPublishBranchRequirement(ActionPublish.ActionLetter);
-        AuthorizationResult authorizationResult =
-            await _authorizationService.AuthorizeAsync(User, contentItem.PersistedContent, requirement);
-        return authorizationResult.Succeeded;
-    }
-
-    private IEnumerable<PublishResult> PublishBranchInternal(ContentItemSave contentItem, bool force, string? cultureForInvariantErrors, out bool wasCancelled, out string[]? successfulCultures)
-    {
-        if (!contentItem.PersistedContent?.ContentType.VariesByCulture() ?? false)
-        {
-            //its invariant, proceed normally
-            // NOTE: we don't really care about the correctness of this anymore, as this controller is being replaced by the Management API ... let's just ensure that save and publish works for happy paths
-            _contentService.Save(contentItem.PersistedContent!);
-            IEnumerable<PublishResult> publishStatus = _contentService.PublishBranch(contentItem.PersistedContent!, force, Array.Empty<string>(), userId: _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-            // TODO: Deal with multiple cancellations
-            wasCancelled = publishStatus.Any(x => x.Result == PublishResultType.FailedPublishCancelledByEvent);
-            successfulCultures = null; //must be null! this implies invariant
-            return publishStatus;
-        }
-
-        var mandatoryCultures = _allLangs.Value.Values.Where(x => x.IsMandatory).Select(x => x.IsoCode).ToList();
-
-        IReadOnlyList<(string? culture, string? segment)>? variantErrors =
-            ModelState.GetVariantsWithErrors(cultureForInvariantErrors);
-
-        var variants = contentItem.Variants.ToList();
-
-        //validate if we can publish based on the mandatory language requirements
-        var canPublish = ValidatePublishingMandatoryLanguages(variantErrors, contentItem, variants, mandatoryCultures, mandatoryVariant => mandatoryVariant.Publish);
-
-        //Now check if there are validation errors on each variant.
-        //If validation errors are detected on a variant and it's state is set to 'publish', then we
-        //need to change it to 'save'.
-        //It is a requirement that this is performed AFTER ValidatePublishingMandatoryLanguages.
-
-        foreach (ContentVariantSave variant in contentItem.Variants)
-        {
-            if (variantErrors?.Contains((variant.Culture, variant.Segment)) ?? false)
-            {
-                variant.Publish = false;
-            }
-        }
-
-        var culturesToPublish = variants.Where(x => x.Publish).Select(x => x.Culture).ToArray();
-
-        if (canPublish)
-        {
-            //proceed to publish if all validation still succeeds
-            // NOTE: we don't really care about the correctness of this anymore, as this controller is being replaced by the Management API ... let's just ensure that save and publish works for happy paths
-            _contentService.Save(contentItem.PersistedContent!);
-            IEnumerable<PublishResult> publishStatus = _contentService.PublishBranch(
-                contentItem.PersistedContent!, force, culturesToPublish.WhereNotNull().ToArray(), _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-            // TODO: Deal with multiple cancellations
-            wasCancelled = publishStatus.Any(x => x.Result == PublishResultType.FailedPublishCancelledByEvent);
-            successfulCultures = contentItem.Variants.Where(x => x.Publish).Select(x => x.Culture).WhereNotNull()
-                .ToArray();
-            return publishStatus;
-        }
-        else
-        {
-            //can only save
-            OperationResult saveResult = _contentService.Save(contentItem.PersistedContent!, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-            PublishResult[] publishStatus =
-            {
-                new PublishResult(PublishResultType.FailedPublishMandatoryCultureMissing, null, contentItem.PersistedContent!)
-            };
-            wasCancelled = saveResult.Result == OperationResultType.FailedCancelledByEvent;
-            successfulCultures = Array.Empty<string>();
-            return publishStatus;
-        }
-    }
-
-    /// <summary>
-    ///     Performs the publishing operation for a content item
-    /// </summary>
-    /// <param name="contentItem"></param>
-    /// <param name="wasCancelled"></param>
-    /// <param name="successfulCultures"></param>
-    /// <param name="defaultCulture"></param>
-    /// <param name="cultureForInvariantErrors">
-    ///     if the content is variant this will return an array of cultures that will be published (passed validation rules)
-    /// </param>
-    /// <remarks>
-    ///     If this is a culture variant than we need to do some validation, if it's not we'll publish as normal
-    /// </remarks>
-    private PublishResult PublishInternal(ContentItemSave contentItem, string? defaultCulture, string? cultureForInvariantErrors, out bool wasCancelled, out string[]? successfulCultures)
-    {
-        if (!contentItem.PersistedContent?.ContentType.VariesByCulture() ?? false)
-        {
-            //its invariant, proceed normally
-            // NOTE: we don't really care about the correctness of this anymore, as this controller is being replaced by the Management API ... let's just ensure that save and publish works for happy paths
-            _contentService.Save(contentItem.PersistedContent!);
-            PublishResult publishStatus = _contentService.Publish(contentItem.PersistedContent!, new [] {"*"}, userId: _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-            wasCancelled = publishStatus.Result == PublishResultType.FailedPublishCancelledByEvent;
-            successfulCultures = null; //must be null! this implies invariant
-            return publishStatus;
-        }
-
-        var mandatoryCultures = _allLangs.Value.Values.Where(x => x.IsMandatory).Select(x => x.IsoCode).ToList();
-
-        IReadOnlyList<(string? culture, string? segment)>? variantErrors =
-            ModelState.GetVariantsWithErrors(cultureForInvariantErrors);
-
-        var variants = contentItem.Variants.ToList();
-
-        //validate if we can publish based on the mandatory languages selected
-        var canPublish = ValidatePublishingMandatoryLanguages(
-            variantErrors,
-            contentItem,
-            variants,
-            mandatoryCultures,
-            mandatoryVariant => mandatoryVariant.Publish);
-
-        //if none are published and there are validation errors for mandatory cultures, then we can't publish anything
-
-
-        //Now check if there are validation errors on each variant.
-        //If validation errors are detected on a variant and it's state is set to 'publish', then we
-        //need to change it to 'save'.
-        //It is a requirement that this is performed AFTER ValidatePublishingMandatoryLanguages.
-        foreach (ContentVariantSave variant in contentItem.Variants)
-        {
-            if (variantErrors?.Contains((variant.Culture, variant.Segment)) ?? false)
-            {
-                variant.Publish = false;
-            }
-        }
-
-        //At this stage all variants might have failed validation which means there are no cultures flagged for publishing!
-        var culturesToPublish = variants.Where(x => x.Publish).Select(x => x.Culture).WhereNotNull().ToArray();
-        canPublish = canPublish && culturesToPublish.Length > 0;
-
-        if (canPublish)
-        {
-            //proceed to publish if all validation still succeeds
-            // NOTE: we don't really care about the correctness of this anymore, as this controller is being replaced by the Management API ... let's just ensure that save and publish works for happy paths
-            _contentService.Save(contentItem.PersistedContent!);
-            PublishResult publishStatus = _contentService.Publish(
-                contentItem.PersistedContent!,
-                culturesToPublish,
-                _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-            wasCancelled = publishStatus.Result == PublishResultType.FailedPublishCancelledByEvent;
-            successfulCultures = culturesToPublish;
-
-            return publishStatus;
-        }
-        else
-        {
-            //can only save
-            OperationResult saveResult = _contentService.Save(
-                contentItem.PersistedContent!,
-                _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-            var publishStatus = new PublishResult(PublishResultType.FailedPublishMandatoryCultureMissing, null, contentItem.PersistedContent!);
-            wasCancelled = saveResult.Result == OperationResultType.FailedCancelledByEvent;
-            successfulCultures = Array.Empty<string>();
-            return publishStatus;
-        }
-    }
-
-    private void AddDomainWarnings(IEnumerable<PublishResult> publishResults, string[]? culturesPublished, SimpleNotificationModel globalNotifications)
-    {
-        foreach (PublishResult publishResult in publishResults)
-        {
-            AddDomainWarnings(publishResult.Content, culturesPublished, globalNotifications);
-        }
-    }
-
-    /// <summary>
-    ///     Verifies that there's an appropriate domain setup for the published cultures
-    /// </summary>
-    /// <remarks>
-    ///     Adds a warning and logs a message if a node varies by culture, there's at least 1 culture already published,
-    ///     and there's no domain added for the published cultures
-    /// </remarks>
-    /// <param name="persistedContent"></param>
-    /// <param name="culturesPublished"></param>
-    /// <param name="globalNotifications"></param>
-    internal void AddDomainWarnings(IContent? persistedContent, string[]? culturesPublished, SimpleNotificationModel globalNotifications)
-    {
-        if (_contentSettings.ShowDomainWarnings is false)
-        {
-            return;
-        }
-
-        // Don't try to verify if no cultures were published
-        if (culturesPublished is null)
-        {
-            return;
-        }
-
-        var publishedCultures = GetPublishedCulturesFromAncestors(persistedContent).ToList();
-        // If only a single culture is published we shouldn't have any routing issues
-        if (publishedCultures.Count < 2)
-        {
-            return;
-        }
-
-        // If more than a single culture is published we need to verify that there's a domain registered for each published culture
-        HashSet<IDomain>? assignedDomains = persistedContent is null
-            ? null
-            : _domainService.GetAssignedDomains(persistedContent.Id, true)?.ToHashSet();
-
-        IEnumerable<int>? ancestorIds = persistedContent?.GetAncestorIds();
-        if (ancestorIds is not null && assignedDomains is not null)
-        {
-            // We also have to check all of the ancestors, if any of those has the appropriate culture assigned we don't need to warn
-            foreach (var ancestorID in ancestorIds)
-            {
-                assignedDomains.UnionWith(_domainService.GetAssignedDomains(ancestorID, true) ??
-                                          Enumerable.Empty<IDomain>());
-            }
-        }
-
-        // No domains at all, add a warning, to add domains.
-        if (assignedDomains is null || assignedDomains.Count == 0)
-        {
-            globalNotifications.AddWarningNotification(
-                _localizedTextService.Localize("auditTrails", "publish"),
-                _localizedTextService.Localize("speechBubbles", "publishWithNoDomains"));
-
-            _logger.LogWarning(
-                "The root node {RootNodeName} was published with multiple cultures, but no domains are configured, this will cause routing and caching issues, please register domains for: {Cultures}",
-                persistedContent?.Name,
-                string.Join(", ", publishedCultures));
-            return;
-        }
-
-        // If there is some domains, verify that there's a domain for each of the published cultures
-        foreach (var culture in culturesPublished
-                     .Where(culture => assignedDomains.Any(x =>
-                         x.LanguageIsoCode?.Equals(culture, StringComparison.OrdinalIgnoreCase) ?? false) is false))
-        {
-            globalNotifications.AddWarningNotification(
-                _localizedTextService.Localize("auditTrails", "publish"),
-                _localizedTextService.Localize("speechBubbles", "publishWithMissingDomain", new[] { culture }));
-
-            _logger.LogWarning(
-                "The root node {RootNodeName} was published in culture {Culture}, but there's no domain configured for it, this will cause routing and caching issues, please register a domain for it",
-                persistedContent?.Name,
-                culture);
-        }
-    }
-
-    /// <summary>
-    ///     Validate if publishing is possible based on the mandatory language requirements
-    /// </summary>
-    /// <param name="variantsWithValidationErrors"></param>
-    /// <param name="contentItem"></param>
-    /// <param name="variants"></param>
-    /// <param name="mandatoryCultures"></param>
-    /// <param name="publishingCheck"></param>
-    /// <returns></returns>
-    private bool ValidatePublishingMandatoryLanguages(
-        IReadOnlyCollection<(string? culture, string? segment)>? variantsWithValidationErrors,
-        ContentItemSave contentItem,
-        IReadOnlyCollection<ContentVariantSave> variants,
-        IReadOnlyList<string> mandatoryCultures,
-        Func<ContentVariantSave, bool> publishingCheck)
-    {
-        var canPublish = true;
-        var result = new List<(ContentVariantSave model, bool publishing, bool isValid)>();
-
-        foreach (var culture in mandatoryCultures)
-        {
-            //Check if a mandatory language is missing from being published
-
-            ContentVariantSave mandatoryVariant = variants.First(x => x.Culture.InvariantEquals(culture));
-
-            var isPublished = (contentItem.PersistedContent?.Published ?? false) &&
-                              contentItem.PersistedContent.IsCulturePublished(culture);
-            var isPublishing = isPublished || publishingCheck(mandatoryVariant);
-            var isValid = !variantsWithValidationErrors?.Select(v => v.culture!).InvariantContains(culture) ?? false;
-
-            result.Add((mandatoryVariant, isPublished || isPublishing, isValid));
-        }
-
-        //iterate over the results by invalid first
-        string? firstInvalidMandatoryCulture = null;
-        foreach ((ContentVariantSave model, bool publishing, bool isValid) in result.OrderBy(x => x.isValid))
-        {
-            if (!isValid)
-            {
-                firstInvalidMandatoryCulture = model.Culture;
-            }
-
-            if (publishing && !isValid)
-            {
-                //flagged for publishing but the mandatory culture is invalid
-                AddVariantValidationError(model.Culture, model.Segment, "publish", "contentPublishedFailedReqCultureValidationError");
-                canPublish = false;
-            }
-            else if (publishing && isValid && firstInvalidMandatoryCulture != null)
-            {
-                //in this case this culture also cannot be published because another mandatory culture is invalid
-                AddVariantValidationError(model.Culture, model.Segment, "publish", "contentPublishedFailedReqCultureValidationError", firstInvalidMandatoryCulture);
-                canPublish = false;
-            }
-            else if (!publishing)
-            {
-                //cannot continue publishing since a required culture that is not currently being published isn't published
-                AddVariantValidationError(model.Culture, model.Segment, "speechBubbles", "contentReqCulturePublishError");
-                canPublish = false;
-            }
-        }
-
-        return canPublish;
-    }
-
-    private IEnumerable<string> GetPublishedCulturesFromAncestors(IContent? content)
-    {
-        if (content?.ParentId is not -1 && content?.HasIdentity is false)
-        {
-            content = _contentService.GetById(content.ParentId);
-        }
-
-        if (content?.ParentId == -1)
-        {
-            return content.PublishedCultures;
-        }
-
-        HashSet<string> publishedCultures = new();
-        publishedCultures.UnionWith(content?.PublishedCultures ?? Enumerable.Empty<string>());
-
-        IEnumerable<int>? ancestorIds = content?.GetAncestorIds();
-
-        if (ancestorIds is not null)
-        {
-            foreach (var id in ancestorIds)
-            {
-                IEnumerable<string>? cultures = _contentService.GetById(id)?.PublishedCultures;
-                publishedCultures.UnionWith(cultures ?? Enumerable.Empty<string>());
-            }
-        }
-
-        return publishedCultures;
-    }
-
-    /// <summary>
-    ///     Adds a generic culture error for use in displaying the culture validation error in the save/publish/etc... dialogs
-    /// </summary>
-    /// <param name="culture">Culture to assign the error to</param>
-    /// <param name="segment">Segment to assign the error to</param>
-    /// <param name="localizationArea"></param>
-    /// <param name="localizationAlias"></param>
-    /// <param name="cultureToken">
-    ///     The culture used in the localization message, null by default which means <paramref name="culture"/> will be used.
-    /// </param>
-    private void AddVariantValidationError(string? culture, string? segment, string localizationArea, string localizationAlias, string? cultureToken = null)
-    {
-        var cultureToUse = cultureToken ?? culture;
-        var variantName = GetVariantName(cultureToUse, segment);
-
-        var errMsg = _localizedTextService.Localize(localizationArea, localizationAlias, new[] { variantName });
-
-        ModelState.AddVariantValidationError(culture, segment, errMsg);
-    }
-
-    /// <summary>
-    ///     Creates the human readable variant name based on culture and segment
-    /// </summary>
-    /// <param name="culture">Culture</param>
-    /// <param name="segment">Segment</param>
-    /// <returns></returns>
-    private string GetVariantName(string? culture, string? segment)
-    {
-        if (culture.IsNullOrWhiteSpace() && segment.IsNullOrWhiteSpace())
-        {
-            // TODO: Get name for default variant from somewhere?
-            return "Default";
-        }
-
-        var cultureName = culture == null ? null : _allLangs.Value[culture].CultureName;
-        var variantName = string.Join(" — ", new[] { segment, cultureName }.Where(x => !x.IsNullOrWhiteSpace()));
-
-        // Format: <segment> [&mdash;] <culture name>
-        return variantName;
-    }
-
-    /// <summary>
-    ///     Publishes a document with a given ID
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     The EnsureUserPermissionForContent attribute will deny access to this method if the current user
-    ///     does not have Publish access to this node.
-    /// </remarks>
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionPublishById)]
-    public IActionResult PostPublishById(int id)
-    {
-        IContent? foundContent = GetObjectFromRequest(() => _contentService.GetById(id));
-
-        if (foundContent == null)
-        {
-            return HandleContentNotFound(id);
-        }
-
-        // NOTE: we don't really care about the correctness of this anymore, as this controller is being replaced by the Management API ... let's just ensure that save and publish works for happy paths
-        PublishResult publishResult = _contentService.Publish(foundContent, foundContent.AvailableCultures.ToArray(), userId: _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? 0);
-
-        if (publishResult.Success == false)
-        {
-            var notificationModel = new SimpleNotificationModel();
-            AddMessageForPublishStatus(new[] { publishResult }, notificationModel);
-            return ValidationProblem(notificationModel);
-        }
-
-        return Ok();
-    }
-
-    /// <summary>
-    ///     Publishes a document with a given ID and cultures.
-    /// </summary>
-    /// <param name="model"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     The EnsureUserPermissionForContent attribute will deny access to this method if the current user
-    ///     does not have Publish access to this node.
-    /// </remarks>
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionPublishById)]
-    public IActionResult PostPublishByIdAndCulture(PublishContent model)
-    {
-        var languageCount = _allLangs.Value.Count();
-
-        // If there is no culture specified or the cultures specified are equal to the total amount of languages, publish the content in all cultures.
-        if (model.Cultures == null || !model.Cultures.Any() || model.Cultures.Length == languageCount)
-        {
-            return PostPublishById(model.Id);
-        }
-
-        IContent? foundContent = GetObjectFromRequest(() => _contentService.GetById(model.Id));
-
-        if (foundContent == null)
-        {
-            return HandleContentNotFound(model.Id);
-        }
-
-        var results = new Dictionary<string, PublishResult>();
-
-        foreach (var culture in model.Cultures)
-        {
-            // NOTE: we don't really care about the correctness of this anymore, as this controller is being replaced by the Management API ... let's just ensure that save and publish works for happy paths
-            PublishResult publishResult = _contentService.Publish(foundContent, new[] { culture }, _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? 0);
-            results[culture] = publishResult;
-        }
-
-        if (results.Any(x => x.Value.Success == false))
-        {
-            var notificationModel = new SimpleNotificationModel();
-
-            foreach (var culture in results.Where(x => x.Value.Success == false))
-            {
-                AddMessageForPublishStatus(new[] { culture.Value }, notificationModel);
-            }
-
-            return ValidationProblem(notificationModel);
-        }
-
-        return Ok();
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    [HttpDelete]
-    [HttpPost]
-    public IActionResult DeleteBlueprint(int id)
-    {
-        IContent? found = _contentService.GetBlueprintById(id);
-
-        if (found == null)
-        {
-            return HandleContentNotFound(id);
-        }
-
-        _contentService.DeleteBlueprint(found);
-
-        return Ok();
-    }
-
-    /// <summary>
-    ///     Moves an item to the recycle bin, if it is already there then it will permanently delete it
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     The CanAccessContentAuthorize attribute will deny access to this method if the current user
-    ///     does not have Delete access to this node.
-    /// </remarks>
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionDeleteById)]
-    [HttpDelete]
-    [HttpPost]
-    public IActionResult DeleteById(int id)
-    {
-        IContent? foundContent = GetObjectFromRequest(() => _contentService.GetById(id));
-
-        if (foundContent == null)
-        {
-            return HandleContentNotFound(id);
-        }
-
-        //if the current item is in the recycle bin
-        if (foundContent.Trashed == false)
-        {
-            OperationResult moveResult = _contentService.MoveToRecycleBin(foundContent, _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1);
-            if (moveResult.Success == false)
-            {
-                return ValidationProblem();
-            }
-        }
-        else
-        {
-            OperationResult deleteResult = _contentService.Delete(
-                foundContent,
-                _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1);
-            if (deleteResult.Success == false)
-            {
-                return ValidationProblem();
-            }
-        }
-
-        return Ok();
-    }
-
-    /// <summary>
-    ///     Empties the recycle bin
-    /// </summary>
-    /// <returns></returns>
-    /// <remarks>
-    ///     attributed with EnsureUserPermissionForContent to verify the user has access to the recycle bin
-    /// </remarks>
-    [HttpDelete]
-    [HttpPost]
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionEmptyRecycleBin)]
-    public IActionResult EmptyRecycleBin()
-    {
-        _contentService.EmptyRecycleBin(_backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1);
-
-        return Ok(_localizedTextService.Localize("defaultdialogs", "recycleBinIsEmpty"));
-    }
-
-    /// <summary>
-    ///     Change the sort order for content
-    /// </summary>
-    /// <param name="sorted"></param>
-    /// <returns></returns>
-    public async Task<IActionResult> PostSort(ContentSortOrder sorted)
-    {
-        if (sorted == null)
-        {
-            return NotFound();
-        }
-
-        //if there's nothing to sort just return ok
-        if (sorted.IdSortOrder?.Length == 0)
-        {
-            return Ok();
-        }
-
-        // Authorize...
-        var resource =
-            new ContentPermissionsResource(_contentService.GetById(sorted.ParentId), ActionSort.ActionLetter);
-        AuthorizationResult authorizationResult =
-            await _authorizationService.AuthorizeAsync(User, resource, AuthorizationPolicies.ContentPermissionByResource);
-        if (!authorizationResult.Succeeded)
-        {
-            return Forbid();
-        }
-
-        try
-        {
-            // Save content with new sort order and update content xml in db accordingly
-            OperationResult sortResult = _contentService.Sort(
-                sorted.IdSortOrder,
-                _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-            if (!sortResult.Success)
-            {
-                _logger.LogWarning("Content sorting failed, this was probably caused by an event being cancelled");
-                // TODO: Now you can cancel sorting, does the event messages bubble up automatically?
-                return ValidationProblem(
-                    "Content sorting failed, this was probably caused by an event being cancelled");
-            }
-
-            return Ok();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Could not update content sort order");
-            throw;
-        }
-    }
-
-    /// <summary>
-    ///     Change the sort order for media
-    /// </summary>
-    /// <param name="move"></param>
-    /// <returns></returns>
-    public async Task<IActionResult?> PostMove(MoveOrCopy move)
-    {
-        // Authorize...
-        var resource = new ContentPermissionsResource(_contentService.GetById(move.ParentId), ActionMove.ActionLetter);
-        AuthorizationResult authorizationResult =
-            await _authorizationService.AuthorizeAsync(User, resource, AuthorizationPolicies.ContentPermissionByResource);
-        if (!authorizationResult.Succeeded)
-        {
-            return Forbid();
-        }
-
-        ActionResult<IContent> toMoveResult = ValidateMoveOrCopy(move);
-        if (!(toMoveResult.Result is null))
-        {
-            return toMoveResult.Result;
-        }
-
-        IContent? toMove = toMoveResult.Value;
-
-        if (toMove is null)
-        {
-            return null;
-        }
-
-        _contentService.Move(toMove, move.ParentId, _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1);
-
-        return Content(toMove.Path, MediaTypeNames.Text.Plain, Encoding.UTF8);
-    }
-
-    /// <summary>
-    ///     Copies a content item and places the copy as a child of a given parent Id
-    /// </summary>
-    /// <param name="copy"></param>
-    /// <returns></returns>
-    public async Task<ActionResult<IContent>?> PostCopy(MoveOrCopy copy)
-    {
-        // Authorize...
-        var resource = new ContentPermissionsResource(_contentService.GetById(copy.ParentId), ActionCopy.ActionLetter);
-        AuthorizationResult authorizationResult =
-            await _authorizationService.AuthorizeAsync(User, resource, AuthorizationPolicies.ContentPermissionByResource);
-        if (!authorizationResult.Succeeded)
-        {
-            return Forbid();
-        }
-
-        ActionResult<IContent> toCopyResult = ValidateMoveOrCopy(copy);
-        if (!(toCopyResult.Result is null))
-        {
-            return toCopyResult.Result;
-        }
-
-        IContent? toCopy = toCopyResult.Value;
-        if (toCopy is null)
-        {
-            return null;
-        }
-
-        IContent? c = _contentService.Copy(toCopy, copy.ParentId, copy.RelateToOriginal, copy.Recursive, _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1);
-
-        if (c is null)
-        {
-            return null;
-        }
-
-        return Content(c.Path, MediaTypeNames.Text.Plain, Encoding.UTF8);
-    }
-
-    /// <summary>
-    ///     Unpublishes a node with a given Id and returns the unpublished entity
-    /// </summary>
-    /// <param name="model">The content and variants to unpublish</param>
-    /// <returns></returns>
-    [OutgoingEditorModelEvent]
-    public async Task<ActionResult<ContentItemDisplayWithSchedule?>> PostUnpublish(UnpublishContent model)
-    {
-        IContent? foundContent = _contentService.GetById(model.Id);
-
-        if (foundContent == null)
-        {
-            return HandleContentNotFound(model.Id);
-        }
-
-        // Authorize...
-        var resource = new ContentPermissionsResource(foundContent, ActionUnpublish.ActionLetter);
-        AuthorizationResult authorizationResult =
-            await _authorizationService.AuthorizeAsync(User, resource, AuthorizationPolicies.ContentPermissionByResource);
-        if (!authorizationResult.Succeeded)
-        {
-            return Forbid();
-        }
-
-        var languageCount = _allLangs.Value.Count();
-        if (model.Cultures?.Length == 0 || model.Cultures?.Length == languageCount)
-        {
-            //this means that the entire content item will be unpublished
-            PublishResult unpublishResult = _contentService.Unpublish(foundContent, userId: _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1);
-
-            ContentItemDisplayWithSchedule? content = MapToDisplayWithSchedule(foundContent);
-
-            if (!unpublishResult.Success)
-            {
-                AddCancelMessage(content);
-                return ValidationProblem(content);
-            }
-
-            content?.AddSuccessNotification(
-                _localizedTextService.Localize("content", "unpublish"),
-                _localizedTextService.Localize("speechBubbles", "contentUnpublished"));
-            return content;
-        }
-        else
-        {
-            //we only want to unpublish some of the variants
-            var results = new Dictionary<string, PublishResult>();
-            if (model.Cultures is not null)
-            {
-                foreach (var c in model.Cultures)
-                {
-                    PublishResult result = _contentService.Unpublish(foundContent, c, _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1);
-                    results[c] = result;
-                    if (result.Result == PublishResultType.SuccessUnpublishMandatoryCulture)
-                    {
-                        //if this happens, it means they are all unpublished, we don't need to continue
-                        break;
-                    }
-                }
-            }
-
-            ContentItemDisplayWithSchedule? content = MapToDisplayWithSchedule(foundContent);
-
-            //check for this status and return the correct message
-            if (results.Any(x => x.Value.Result == PublishResultType.SuccessUnpublishMandatoryCulture))
-            {
-                content?.AddSuccessNotification(
-                    _localizedTextService.Localize("content", "unpublish"),
-                    _localizedTextService.Localize("speechBubbles", "contentMandatoryCultureUnpublished"));
-                return content;
-            }
-
-            //otherwise add a message for each one unpublished
-            foreach (KeyValuePair<string, PublishResult> r in results)
-            {
-                content?.AddSuccessNotification(
-                    _localizedTextService.Localize("conten", "unpublish"),
-                    _localizedTextService.Localize("speechBubbles", "contentCultureUnpublished", new[] { _allLangs.Value[r.Key].CultureName }));
-            }
-
-            return content;
-        }
-    }
-
-    public ContentDomainsAndCulture GetCultureAndDomains(int id)
-    {
-        IDomain[] assignedDomains = _domainService.GetAssignedDomains(id, true).ToArray();
-        IDomain? wildcard = assignedDomains.FirstOrDefault(d => d.IsWildcard);
-        IEnumerable<DomainDisplay> domains = assignedDomains.Where(d => !d.IsWildcard).Select(d => new DomainDisplay(d.DomainName, d.LanguageId.GetValueOrDefault(0)));
-
-        return new ContentDomainsAndCulture
-        {
-            Language = wildcard == null || !wildcard.LanguageId.HasValue ? "undefined" : wildcard.LanguageId.ToString(),
-            Domains = domains,
-        };
-    }
-
-    [HttpPost]
-    public ActionResult<DomainSave> PostSaveLanguageAndDomains(DomainSave model)
-    {
-        if (model.Domains is not null)
-        {
-            foreach (DomainDisplay domainDisplay in model.Domains)
-            {
-                try
-                {
-                    DomainUtilities.ParseUriFromDomainName(domainDisplay.Name, new Uri(Request.GetEncodedUrl()));
-                }
-                catch (UriFormatException)
-                {
-                    return ValidationProblem(_localizedTextService.Localize("assignDomain", "invalidDomain"));
-                }
-            }
-        }
-
-        // Validate node
-        IContent? node = _contentService.GetById(model.NodeId);
-        if (node == null)
-        {
-            HttpContext.SetReasonPhrase("Node Not Found.");
-            return NotFound("There is no content node with id {model.NodeId}.");
-        }
-
-        // Validate permissions on node
-        var permissions = _userService.GetAllPermissions(_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, node.Path);
-
-        if (permissions.Any(x =>
-                x.AssignedPermissions.Contains(ActionAssignDomain.ActionLetter.ToString(), StringComparer.Ordinal) && x.EntityId == node.Id) == false)
-        {
-            HttpContext.SetReasonPhrase("Permission Denied.");
-            return BadRequest("You do not have permission to assign domains on that node.");
-        }
-
-        model.Valid = true;
-
-        IDomain[] assignedDomains = _domainService.GetAssignedDomains(model.NodeId, true).ToArray();
-        ILanguage[] languages = _localizationService.GetAllLanguages().ToArray();
-
-        // Process language
-        ILanguage? language = model.Language > 0 ? languages.FirstOrDefault(l => l.Id == model.Language) : null;
-        if (language is not null)
-        {
-            // Update or create language on wildcard domain
-            IDomain? assignedWildcardDomain = assignedDomains.FirstOrDefault(d => d.IsWildcard);
-            if (assignedWildcardDomain is not null)
-            {
-                assignedWildcardDomain.LanguageId = language.Id;
-            }
-            else
-            {
-                assignedWildcardDomain = new UmbracoDomain("*" + model.NodeId)
-                {
-                    LanguageId = model.Language,
-                    RootContentId = model.NodeId
-                };
-            }
-
-            Attempt<OperationResult?> saveAttempt = _domainService.Save(assignedWildcardDomain);
-            if (saveAttempt.Success == false)
-            {
-                HttpContext.SetReasonPhrase(saveAttempt.Result?.Result.ToString());
-                return BadRequest("Saving domain failed");
-            }
-        }
-
-        // Delete every domain that's in the database, but not in the model
-        foreach (IDomain? assignedDomain in assignedDomains.Where(d => (d.IsWildcard && language is null) || (d.IsWildcard == false && (model.Domains is null || model.Domains.All(m => m.Name.InvariantEquals(d.DomainName) == false)))))
-        {
-            _domainService.Delete(assignedDomain);
-        }
-
-        // Process domains
-        if (model.Domains is not null)
-        {
-            var savedDomains = new List<IDomain>();
-            foreach (DomainDisplay domainDisplay in model.Domains.Where(m => string.IsNullOrWhiteSpace(m.Name) == false))
-            {
-                language = languages.FirstOrDefault(l => l.Id == domainDisplay.Lang);
-                if (language == null)
-                {
-                    continue;
-                }
-
-                var domainName = domainDisplay.Name.ToLowerInvariant();
-                if (savedDomains.Any(d => d.DomainName == domainName))
-                {
-                    domainDisplay.Duplicate = true;
-                    continue;
-                }
-
-                IDomain? domain = assignedDomains.FirstOrDefault(d => d.DomainName.InvariantEquals(domainName));
-                if (domain is null && _domainService.GetByName(domainName) is IDomain existingDomain)
-                {
-                    // Domain name already exists on another node
-                    domainDisplay.Duplicate = true;
-
-                    // Add node breadcrumbs
-                    if (existingDomain.RootContentId is int rootContentId)
-                    {
-                        var breadcrumbs = new List<string?>();
-
-                        IContent? content = _contentService.GetById(rootContentId);
-                        while (content is not null)
-                        {
-                            breadcrumbs.Add(content.Name);
-                            if (content.ParentId < -1)
-                            {
-                                breadcrumbs.Add("Recycle Bin");
-                            }
-
-                            content = _contentService.GetParent(content);
-                        }
-
-                        breadcrumbs.Reverse();
-                        domainDisplay.Other = "/" + string.Join("/", breadcrumbs);
-                    }
-
-                    continue;
-                }
-
-                // Update or create domain
-                if (domain != null)
-                {
-                    domain.LanguageId = language.Id;
-                }
-                else
-                {
-                    domain = new UmbracoDomain(domainName)
-                    {
-                        LanguageId = language.Id,
-                        RootContentId = model.NodeId,
-                    };
-                }
-
-                Attempt<OperationResult?> saveAttempt = _domainService.Save(domain);
-                if (saveAttempt.Success == false)
-                {
-                    HttpContext.SetReasonPhrase(saveAttempt.Result?.Result.ToString());
-                    return BadRequest("Saving domain failed");
-                }
-
-                savedDomains.Add(domain);
-            }
-
-            // Sort saved domains
-            _domainService.Sort(savedDomains);
-        }
-
-        model.Valid = model.Domains?.All(m => m.Duplicate == false) ?? false;
-
-        return model;
-    }
-
-    /// <summary>
-    ///     Ensure there is culture specific errors in the result if any errors are for culture properties
-    ///     and we're dealing with variant content, then call the base class HandleInvalidModelState
-    /// </summary>
-    /// <param name="display"></param>
-    /// <param name="cultureForInvariantErrors"></param>
-    /// <remarks>
-    ///     This is required to wire up the validation in the save/publish dialog
-    /// </remarks>
-    private void HandleInvalidModelState<TVariant>(
-        ContentItemDisplay<TVariant>? display,
-        string? cultureForInvariantErrors)
-        where TVariant : ContentVariantDisplay
-    {
-        if (!ModelState.IsValid && display?.Variants?.Count() > 1)
-        {
-            //Add any culture specific errors here
-            IReadOnlyList<(string? culture, string? segment)>? variantErrors =
-                ModelState.GetVariantsWithErrors(cultureForInvariantErrors);
-
-            if (variantErrors is not null)
-            {
-                foreach ((string? culture, string? segment) in variantErrors)
-                {
-                    AddVariantValidationError(culture, segment, "speechBubbles", "contentCultureValidationError");
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    ///     Maps the dto property values and names to the persisted model
-    /// </summary>
-    /// <param name="contentSave"></param>
-    private void MapValuesForPersistence(ContentItemSave contentSave)
-    {
-        // inline method to determine the culture and segment to persist the property
-        static (string? culture, string? segment) PropertyCultureAndSegment(IProperty? property, ContentVariantSave variant)
-        {
-            var culture = property?.PropertyType.VariesByCulture() ?? false ? variant.Culture : null;
-            var segment = property?.PropertyType.VariesBySegment() ?? false ? variant.Segment : null;
-            return (culture, segment);
-        }
-
-        var variantIndex = 0;
-        var defaultCulture = _allLangs.Value.Values.FirstOrDefault(x => x.IsDefault)?.IsoCode;
-
-        // loop through each variant, set the correct name and property values
-        foreach (ContentVariantSave variant in contentSave.Variants)
-        {
-            // Don't update anything for this variant if Save is not true
-            if (!variant.Save)
-            {
-                continue;
-            }
-
-            // Don't update the name if it is empty
-            if (!variant.Name.IsNullOrWhiteSpace())
-            {
-                if (contentSave.PersistedContent?.ContentType.VariesByCulture() ?? false)
-                {
-                    if (variant.Culture.IsNullOrWhiteSpace())
-                    {
-                        throw new InvalidOperationException("Cannot set culture name without a culture.");
-                    }
-
-                    contentSave.PersistedContent.SetCultureName(variant.Name, variant.Culture);
-
-                    // If the variant culture is the default culture we also want to update the name on the Content itself.
-                    if (variant.Culture?.Equals(defaultCulture, StringComparison.InvariantCultureIgnoreCase) ?? false)
-                    {
-                        contentSave.PersistedContent.Name = variant.Name;
-                    }
-                }
-                else
-                {
-                    if (contentSave.PersistedContent is not null)
-                    {
-                        contentSave.PersistedContent.Name = variant.Name;
-                    }
-                }
-            }
-
-            // This is important! We only want to process invariant properties with the first variant, for any other variant
-            // we need to exclude invariant properties from being processed, otherwise they will be double processed for the
-            // same value which can cause some problems with things such as file uploads.
-            ContentPropertyCollectionDto? propertyCollection = variantIndex == 0
-                ? variant.PropertyCollectionDto
-                : new ContentPropertyCollectionDto
-                {
-                    Properties = variant.PropertyCollectionDto?.Properties.Where(
-                                     x => !x.Culture.IsNullOrWhiteSpace() || !x.Segment.IsNullOrWhiteSpace()) ??
-                                 Enumerable.Empty<ContentPropertyDto>()
-                };
-
-            // for each variant, map the property values
-            MapPropertyValuesForPersistence<IContent, ContentItemSave>(
-                contentSave,
-                propertyCollection,
-                (save, property) =>
-                {
-                    // Get property value
-                    (string? culture, string? segment) = PropertyCultureAndSegment(property, variant);
-                    return property?.GetValue(culture, segment);
-                },
-                (save, property, v) =>
-                {
-                    // Set property value
-                    (string? culture, string? segment) = PropertyCultureAndSegment(property, variant);
-                    property?.SetValue(v, culture, segment);
-                },
-                variant.Culture);
-
-            variantIndex++;
-        }
-
-        // Map IsDirty cultures to edited cultures, to make it easier to verify changes on specific variants on Saving and Saved events.
-        IEnumerable<string>? editedCultures = contentSave.PersistedContent?.CultureInfos?.Values
-            .Where(x => x.IsDirty())
-            .Select(x => x.Culture);
-        contentSave.PersistedContent?.SetCultureEdited(editedCultures);
-
-        // handle template
-        if (string.IsNullOrWhiteSpace(contentSave.TemplateAlias)) // cleared: clear if not already null
-        {
-            if (contentSave.PersistedContent?.TemplateId != null)
-            {
-                contentSave.PersistedContent.TemplateId = null;
-            }
-        }
-        else // set: update if different
-        {
-            ITemplate? template = _fileService.GetTemplate(contentSave.TemplateAlias);
-            if (template is null)
-            {
-                // ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias);
-                _logger.LogWarning("No template exists with the specified alias: {TemplateAlias}", contentSave.TemplateAlias);
-            }
-            else if (contentSave.PersistedContent is not null && template.Id != contentSave.PersistedContent.TemplateId)
-            {
-                contentSave.PersistedContent.TemplateId = template.Id;
-            }
-        }
-    }
-
-    /// <summary>
-    ///     Ensures the item can be moved/copied to the new location
-    /// </summary>
-    /// <param name="model"></param>
-    /// <returns></returns>
-    private ActionResult<IContent> ValidateMoveOrCopy(MoveOrCopy model)
-    {
-        if (model == null)
-        {
-            return NotFound();
-        }
-
-        IContentService contentService = _contentService;
-        IContent? toMove = contentService.GetById(model.Id);
-        if (toMove == null)
-        {
-            return NotFound();
-        }
-
-        if (model.ParentId < 0)
-        {
-            //cannot move if the content item is not allowed at the root
-            if (toMove.ContentType.AllowedAsRoot == false)
-            {
-                return ValidationProblem(
-                    _localizedTextService.Localize("moveOrCopy", "notAllowedAtRoot"));
-            }
-        }
-        else
-        {
-            IContent? parent = contentService.GetById(model.ParentId);
-            if (parent == null)
-            {
-                return NotFound();
-            }
-
-            IContentType? parentContentType = _contentTypeService.Get(parent.ContentTypeId);
-            //check if the item is allowed under this one
-            if (parentContentType?.AllowedContentTypes?.Select(x => x.Key).ToArray()
-                    .Any(x => x == toMove.ContentType.Key) == false)
-            {
-                return ValidationProblem(
-                    _localizedTextService.Localize("moveOrCopy", "notAllowedByContentType"));
-            }
-
-            // Check on paths
-            if ($",{parent.Path},".IndexOf($",{toMove.Id},", StringComparison.Ordinal) > -1)
-            {
-                return ValidationProblem(
-                    _localizedTextService.Localize("moveOrCopy", "notAllowedByPath"));
-            }
-        }
-
-        return new ActionResult<IContent>(toMove);
-    }
-
-    /// <summary>
-    ///     Adds notification messages to the outbound display model for a given published status
-    /// </summary>
-    /// <param name="statuses"></param>
-    /// <param name="display"></param>
-    /// <param name="successfulCultures">
-    ///     This is null when dealing with invariant content, else it's the cultures that were successfully published
-    /// </param>
-    private void AddMessageForPublishStatus(IReadOnlyCollection<PublishResult> statuses, INotificationModel display, string[]? successfulCultures = null)
-    {
-        var totalStatusCount = statuses.Count();
-
-        //Put the statuses into groups, each group results in a different message
-        IEnumerable<IGrouping<PublishResultType, PublishResult>> statusGroup = statuses.GroupBy(x =>
-        {
-            switch (x.Result)
-            {
-                case PublishResultType.SuccessPublish:
-                case PublishResultType.SuccessPublishCulture:
-                    //these 2 belong to a single group
-                    return PublishResultType.SuccessPublish;
-                case PublishResultType.FailedPublishAwaitingRelease:
-                case PublishResultType.FailedPublishCultureAwaitingRelease:
-                    //these 2 belong to a single group
-                    return PublishResultType.FailedPublishAwaitingRelease;
-                case PublishResultType.FailedPublishHasExpired:
-                case PublishResultType.FailedPublishCultureHasExpired:
-                    //these 2 belong to a single group
-                    return PublishResultType.FailedPublishHasExpired;
-                case PublishResultType.SuccessPublishAlready:
-                case PublishResultType.FailedPublishPathNotPublished:
-                case PublishResultType.FailedPublishCancelledByEvent:
-                case PublishResultType.FailedPublishIsTrashed:
-                case PublishResultType.FailedPublishContentInvalid:
-                case PublishResultType.FailedPublishMandatoryCultureMissing:
-                    //the rest that we are looking for each belong in their own group
-                    return x.Result;
-                default:
-                    throw new IndexOutOfRangeException($"{x.Result}\" was not expected.");
-            }
-        });
-
-        foreach (IGrouping<PublishResultType, PublishResult> status in statusGroup)
-        {
-            switch (status.Key)
-            {
-                case PublishResultType.SuccessPublishAlready:
-                {
-                    // TODO: Here we should have messaging for when there are release dates specified like https://github.com/umbraco/Umbraco-CMS/pull/3507
-                    // but this will take a bit of effort because we need to deal with variants, different messaging, etc... A quick attempt was made here:
-                    // http://github.com/umbraco/Umbraco-CMS/commit/9b3de7b655e07c612c824699b48a533c0448131a
-
-                    //special case, we will only show messages for this if:
-                    // * it's not a bulk publish operation
-                    // * it's a bulk publish operation and all successful statuses are this one
-                    var itemCount = status.Count();
-                    if (totalStatusCount == 1 || totalStatusCount == itemCount)
-                    {
-                        if (successfulCultures == null || totalStatusCount == itemCount)
-                        {
-                            //either invariant single publish, or bulk publish where all statuses are already published
-                            display.AddSuccessNotification(
-                                _localizedTextService.Localize("speechBubbles", "editContentPublishedHeader"),
-                                _localizedTextService.Localize("speechBubbles", "editContentPublishedText"));
-                        }
-                        else
-                        {
-                            foreach (var c in successfulCultures)
-                            {
-                                display.AddSuccessNotification(
-                                    _localizedTextService.Localize("speechBubbles", "editContentPublishedHeader"),
-                                    _localizedTextService.Localize("speechBubbles", "editVariantPublishedText", new[] { _allLangs.Value[c].CultureName }));
-                            }
-                        }
-                    }
-                }
-                    break;
-                case PublishResultType.SuccessPublish:
-                {
-                    // TODO: Here we should have messaging for when there are release dates specified like https://github.com/umbraco/Umbraco-CMS/pull/3507
-                    // but this will take a bit of effort because we need to deal with variants, different messaging, etc... A quick attempt was made here:
-                    // http://github.com/umbraco/Umbraco-CMS/commit/9b3de7b655e07c612c824699b48a533c0448131a
-
-                    var itemCount = status.Count();
-                    if (successfulCultures == null)
-                    {
-                        display.AddSuccessNotification(
-                            _localizedTextService.Localize("speechBubbles", "editContentPublishedHeader"),
-                            totalStatusCount > 1
-                                ? _localizedTextService.Localize("speechBubbles", "editMultiContentPublishedText", new[] { itemCount.ToInvariantString() })
-                                : _localizedTextService.Localize("speechBubbles", "editContentPublishedText"));
-                    }
-                    else
-                    {
-                        foreach (var c in successfulCultures)
-                        {
-                            display.AddSuccessNotification(
-                                _localizedTextService.Localize("speechBubbles", "editContentPublishedHeader"),
-                                totalStatusCount > 1
-                                    ? _localizedTextService.Localize("speechBubbles", "editMultiVariantPublishedText", new[] { itemCount.ToInvariantString(), _allLangs.Value[c].CultureName })
-                                    : _localizedTextService.Localize("speechBubbles", "editVariantPublishedText", new[] { _allLangs.Value[c].CultureName }));
-                        }
-                    }
-                }
-                    break;
-                case PublishResultType.FailedPublishPathNotPublished:
-                {
-                    //TODO: This doesn't take into account variations with the successfulCultures param
-                    var names = string.Join(", ", status.Select(x => $"'{x.Content?.Name}'"));
-                    display.AddWarningNotification(
-                        _localizedTextService.Localize(null, "publish"),
-                        _localizedTextService.Localize("publish", "contentPublishedFailedByParent", new[] { names }).Trim());
-                }
-                    break;
-                case PublishResultType.FailedPublishCancelledByEvent:
-                {
-                    //TODO: This doesn't take into account variations with the successfulCultures param
-                    var names = string.Join(", ", status.Select(x => $"'{x.Content?.Name}'"));
-                    AddCancelMessage(display, "publish", "contentPublishedFailedByEvent", new[] { names });
-                }
-                    break;
-                case PublishResultType.FailedPublishAwaitingRelease:
-                {
-                    //TODO: This doesn't take into account variations with the successfulCultures param
-                    var names = string.Join(", ", status.Select(x => $"'{x.Content?.Name}'"));
-                    display.AddWarningNotification(
-                        _localizedTextService.Localize(null, "publish"),
-                        _localizedTextService.Localize("publish", "contentPublishedFailedAwaitingRelease", new[] { names }).Trim());
-                }
-                    break;
-                case PublishResultType.FailedPublishHasExpired:
-                {
-                    //TODO: This doesn't take into account variations with the successfulCultures param
-                    var names = string.Join(", ", status.Select(x => $"'{x.Content?.Name}'"));
-                    display.AddWarningNotification(
-                        _localizedTextService.Localize(null, "publish"),
-                        _localizedTextService.Localize("publish", "contentPublishedFailedExpired", new[] { names }).Trim());
-                }
-                    break;
-                case PublishResultType.FailedPublishIsTrashed:
-                {
-                    //TODO: This doesn't take into account variations with the successfulCultures param
-                    var names = string.Join(", ", status.Select(x => $"'{x.Content?.Name}'"));
-                    display.AddWarningNotification(
-                        _localizedTextService.Localize(null, "publish"),
-                        _localizedTextService.Localize("publish", "contentPublishedFailedIsTrashed", new[] { names }).Trim());
-                }
-                    break;
-                case PublishResultType.FailedPublishContentInvalid:
-                {
-                    if (successfulCultures == null)
-                    {
-                        var names = string.Join(", ", status.Select(x => $"'{x.Content?.Name}'"));
-                        display.AddWarningNotification(
-                            _localizedTextService.Localize(null, "publish"),
-                            _localizedTextService.Localize("publish", "contentPublishedFailedInvalid", new[] { names }).Trim());
-                    }
-                    else
-                    {
-                        foreach (var c in successfulCultures)
-                        {
-                            var names = string.Join(
-                                ", ",
-                                status.Select(x =>
-                                    $"'{(x.Content?.ContentType.VariesByCulture() ?? false ? x.Content.GetCultureName(c) : x.Content?.Name)}'"));
-                            display.AddWarningNotification(
-                                _localizedTextService.Localize(null, "publish"),
-                                _localizedTextService.Localize("publish", "contentPublishedFailedInvalid", new[] { names }).Trim());
-                        }
-                    }
-                }
-                    break;
-                case PublishResultType.FailedPublishMandatoryCultureMissing:
-                    display.AddWarningNotification(
-                        _localizedTextService.Localize(null, "publish"),
-                        "publish/contentPublishedFailedByCulture");
-                    break;
-                default:
-                    throw new IndexOutOfRangeException($"PublishedResultType \"{status.Key}\" was not expected.");
-            }
-        }
-    }
-
-    /// <summary>
-    ///     Used to map an <see cref="IContent" /> instance to a <see cref="ContentItemDisplay" /> and ensuring a language is
-    ///     present if required
-    /// </summary>
-    /// <param name="content"></param>
-    /// <returns></returns>
-    private ContentItemDisplay? MapToDisplay(IContent? content) =>
-        MapToDisplay(content, context =>
-        {
-            context.Items["CurrentUser"] = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-        });
-
-    private ContentItemDisplayWithSchedule? MapToDisplayWithSchedule(IContent? content)
-    {
-        if (content is null)
-        {
-            return null;
-        }
-
-        ContentItemDisplayWithSchedule? display = _umbracoMapper.Map<ContentItemDisplayWithSchedule>(content, context =>
-        {
-            context.Items["CurrentUser"] = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-            context.Items["Schedule"] = _contentService.GetContentScheduleByContentId(content.Id);
-        });
-
-        if (display is not null)
-        {
-            display.AllowPreview = display.AllowPreview && content?.Trashed == false &&
-                                   content.ContentType.IsElement == false;
-        }
-
-        return display;
-    }
-
-    /// <summary>
-    ///     Used to map an <see cref="IContent" /> instance to a <see cref="ContentItemDisplay" /> and ensuring AllowPreview is
-    ///     set correctly.
-    ///     Also allows you to pass in an action for the mapper context where you can pass additional information on to the
-    ///     mapper.
-    /// </summary>
-    /// <param name="content"></param>
-    /// <param name="contextOptions"></param>
-    /// <returns></returns>
-    private ContentItemDisplay? MapToDisplay(IContent? content, Action<MapperContext> contextOptions)
-    {
-        ContentItemDisplay? display = _umbracoMapper.Map<ContentItemDisplay>(content, contextOptions);
-        if (display is not null)
-        {
-            display.AllowPreview = display.AllowPreview && content?.Trashed == false &&
-                                   content.ContentType.IsElement == false;
-        }
-
-        return display;
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionBrowseById)]
-    public ActionResult<IEnumerable<NotifySetting>> GetNotificationOptions(int contentId)
-    {
-        var notifications = new List<NotifySetting>();
-        if (contentId <= 0)
-        {
-            return NotFound();
-        }
-
-        IContent? content = _contentService.GetById(contentId);
-        if (content == null)
-        {
-            return NotFound();
-        }
-
-        var userNotifications = _notificationService
-            .GetUserNotifications(_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, content.Path)?.ToList();
-
-        foreach (IAction a in _actionCollection.Where(x => x.ShowInNotifier))
-        {
-            var n = new NotifySetting
-            {
-                Name = _localizedTextService.Localize("actions", a.Alias),
-                Checked = userNotifications?.FirstOrDefault(x => x.Action == a.Letter.ToString()) != null,
-                NotifyCode = a.Letter.ToString()
-            };
-            notifications.Add(n);
-        }
-
-        return notifications;
-    }
-
-    public IActionResult PostNotificationOptions(
-        int contentId,
-        [FromQuery(Name = "notifyOptions[]")] string[] notifyOptions)
-    {
-        if (contentId <= 0)
-        {
-            return NotFound();
-        }
-
-        IContent? content = _contentService.GetById(contentId);
-        if (content == null)
-        {
-            return NotFound();
-        }
-
-        _notificationService.SetNotifications(_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, content, notifyOptions);
-
-        return NoContent();
-    }
-
-    [HttpGet]
-    [JsonCamelCaseFormatter]
-    public IActionResult GetPagedContentVersions(
-        int contentId,
-        int pageNumber = 1,
-        int pageSize = 10,
-        string? culture = null)
-    {
-        if (!string.IsNullOrEmpty(culture))
-        {
-            if (!_allLangs.Value.TryGetValue(culture, out _))
-            {
-                return NotFound();
-            }
-        }
-
-        IEnumerable<ContentVersionMeta>? results = _contentVersionService.GetPagedContentVersions(
-            contentId,
-            pageNumber - 1,
-            pageSize,
-            out var totalRecords,
-            culture);
-
-        var model = new PagedResult<ContentVersionMeta>(totalRecords, pageNumber, pageSize) { Items = results };
-
-        return Ok(model);
-    }
-
-    [HttpPost]
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionAdministrationById)]
-    public IActionResult PostSetContentVersionPreventCleanup(int contentId, int versionId, bool preventCleanup)
-    {
-        IContent? content = _contentService.GetVersion(versionId);
-
-        if (content == null || content.Id != contentId)
-        {
-            return NotFound();
-        }
-
-        _contentVersionService.SetPreventCleanup(versionId, preventCleanup, _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1);
-
-        return NoContent();
-    }
-
-    [HttpGet]
-    public IEnumerable<RollbackVersion> GetRollbackVersions(int contentId, string? culture = null)
-    {
-        var rollbackVersions = new List<RollbackVersion>();
-        var writerIds = new HashSet<int>();
-
-        IEnumerable<IContent> versions = _contentService.GetVersionsSlim(contentId, 0, 50);
-
-        //Not all nodes are variants & thus culture can be null
-        if (culture != null)
-        {
-            //Get cultures that were published with the version = their update date is equal to the version's
-            versions = versions.Where(x => x.UpdateDate == x.GetUpdateDate(culture));
-        }
-
-        //First item is our current item/state (cant rollback to ourselves)
-        versions = versions.Skip(1);
-
-        foreach (IContent version in versions)
-        {
-            var rollbackVersion = new RollbackVersion
-            {
-                VersionId = version.VersionId,
-                VersionDate = version.UpdateDate,
-                VersionAuthorId = version.WriterId
-            };
-
-            rollbackVersions.Add(rollbackVersion);
-
-            writerIds.Add(version.WriterId);
-        }
-
-        var users = _userService
-            .GetUsersById(writerIds.ToArray())
-            .ToDictionary(x => x.Id, x => x.Name);
-
-        foreach (RollbackVersion rollbackVersion in rollbackVersions)
-        {
-            if (users.TryGetValue(rollbackVersion.VersionAuthorId, out var userName))
-            {
-                rollbackVersion.VersionAuthorName = userName;
-            }
-        }
-
-        return rollbackVersions;
-    }
-
-    [HttpGet]
-    public ContentVariantDisplay? GetRollbackVersion(int versionId, string? culture = null)
-    {
-        IContent? version = _contentService.GetVersion(versionId);
-        ContentItemDisplay? content = MapToDisplay(version);
-
-        return culture == null
-            ? content?.Variants
-                ?.FirstOrDefault() //No culture set - so this is an invariant node - so just list me the first item in here
-            : content?.Variants?.FirstOrDefault(x => x.Language?.IsoCode == culture);
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionRollbackById)]
-    [HttpPost]
-    public IActionResult PostRollbackContent(int contentId, int versionId, string? culture = null)
-    {
-        OperationResult rollbackResult = _contentService.Rollback(contentId, versionId, culture ?? "*", _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1);
-
-        if (rollbackResult.Success)
-        {
-            return Ok();
-        }
-
-        switch (rollbackResult.Result)
-        {
-            case OperationResultType.Failed:
-            case OperationResultType.FailedCannot:
-            case OperationResultType.FailedExceptionThrown:
-            case OperationResultType.NoOperation:
-            default:
-                return ValidationProblem(_localizedTextService.Localize("speechBubbles", "operationFailedHeader"));
-            case OperationResultType.FailedCancelledByEvent:
-                return ValidationProblem(
-                    _localizedTextService.Localize("speechBubbles", "operationCancelledHeader"),
-                    _localizedTextService.Localize("speechBubbles", "operationCancelledText"));
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs
deleted file mode 100644
index 1f9e09940c..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core.Dictionary;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Editors;
-using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Web.Common.Filters;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     An abstract base controller used for media/content/members to try to reduce code replication.
-/// </summary>
-[JsonDateTimeFormat]
-public abstract class ContentControllerBase : BackOfficeNotificationsController
-{
-    private readonly ILogger<ContentControllerBase> _logger;
-    private readonly IJsonSerializer _serializer;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="ContentControllerBase" /> class.
-    /// </summary>
-    protected ContentControllerBase(
-        ICultureDictionary cultureDictionary,
-        ILoggerFactory loggerFactory,
-        IShortStringHelper shortStringHelper,
-        IEventMessagesFactory eventMessages,
-        ILocalizedTextService localizedTextService,
-        IJsonSerializer serializer)
-    {
-        CultureDictionary = cultureDictionary;
-        LoggerFactory = loggerFactory;
-        _logger = loggerFactory.CreateLogger<ContentControllerBase>();
-        ShortStringHelper = shortStringHelper;
-        EventMessages = eventMessages;
-        LocalizedTextService = localizedTextService;
-        _serializer = serializer;
-    }
-
-    /// <summary>
-    ///     Gets the <see cref="ICultureDictionary" />
-    /// </summary>
-    protected ICultureDictionary CultureDictionary { get; }
-
-    /// <summary>
-    ///     Gets the <see cref="ILoggerFactory" />
-    /// </summary>
-    protected ILoggerFactory LoggerFactory { get; }
-
-    /// <summary>
-    ///     Gets the <see cref="IShortStringHelper" />
-    /// </summary>
-    protected IShortStringHelper ShortStringHelper { get; }
-
-    /// <summary>
-    ///     Gets the <see cref="IEventMessagesFactory" />
-    /// </summary>
-    protected IEventMessagesFactory EventMessages { get; }
-
-    /// <summary>
-    ///     Gets the <see cref="ILocalizedTextService" />
-    /// </summary>
-    protected ILocalizedTextService LocalizedTextService { get; }
-
-    /// <summary>
-    ///     Handles if the content for the specified ID isn't found
-    /// </summary>
-    /// <param name="id">The content ID to find</param>
-    /// <returns>The error response</returns>
-    protected NotFoundObjectResult HandleContentNotFound(object id)
-    {
-        ModelState.AddModelError("id", $"content with id: {id} was not found");
-        NotFoundObjectResult errorResponse = NotFound(ModelState);
-
-        return errorResponse;
-    }
-
-    /// <summary>
-    ///     Maps the dto property values to the persisted model
-    /// </summary>
-    internal void MapPropertyValuesForPersistence<TPersisted, TSaved>(
-        TSaved contentItem,
-        ContentPropertyCollectionDto? dto,
-        Func<TSaved, IProperty?, object?> getPropertyValue,
-        Action<TSaved, IProperty?, object?> savePropertyValue,
-        string? culture)
-        where TPersisted : IContentBase
-        where TSaved : IContentSave<TPersisted>
-    {
-        if (dto is null)
-        {
-            return;
-        }
-
-        // map the property values
-        foreach (ContentPropertyDto propertyDto in dto.Properties)
-        {
-            // get the property editor
-            if (propertyDto.PropertyEditor == null)
-            {
-                _logger.LogWarning("No property editor found for property {PropertyAlias}", propertyDto.Alias);
-                continue;
-            }
-
-            // get the value editor
-            // nothing to save/map if it is readonly
-            IDataValueEditor valueEditor = propertyDto.PropertyEditor.GetValueEditor();
-            if (valueEditor.IsReadOnly)
-            {
-                continue;
-            }
-
-            // get the property
-            IProperty property = contentItem.PersistedContent.Properties[propertyDto.Alias]!;
-
-            // create the property data for the property editor
-            var data = new ContentPropertyData(propertyDto.Value, propertyDto.DataType?.ConfigurationObject)
-            {
-                ContentKey = contentItem.PersistedContent!.Key,
-                PropertyTypeKey = property.PropertyType.Key
-            };
-
-            // let the editor convert the value that was received, deal with files, etc
-            var value = valueEditor.FromEditor(data, getPropertyValue(contentItem, property));
-
-            // set the value - tags are special
-            TagsPropertyEditorAttribute? tagAttribute = propertyDto.PropertyEditor.GetTagAttribute();
-            // when TagsPropertyEditorAttribute is removed this whole if can also be removed
-            // since the call to sovePropertyValue is all that's needed now
-            if (tagAttribute is not null && valueEditor is not IDataValueTags)
-            {
-                TagConfiguration? tagConfiguration =
-                    ConfigurationEditor.ConfigurationAs<TagConfiguration>(propertyDto.DataType?.ConfigurationObject);
-                if (tagConfiguration is not null && tagConfiguration.Delimiter == default)
-                {
-                    tagConfiguration.Delimiter = tagAttribute.Delimiter;
-                }
-
-                var tagCulture = property?.PropertyType.VariesByCulture() ?? false ? culture : null;
-                property?.SetTagsValue(_serializer, value, tagConfiguration, tagCulture);
-            }
-            else
-            {
-                savePropertyValue(contentItem, property, value);
-            }
-        }
-    }
-
-    /// <summary>
-    ///     A helper method to attempt to get the instance from the request storage if it can be found there,
-    ///     otherwise gets it from the callback specified
-    /// </summary>
-    /// <typeparam name="TPersisted"></typeparam>
-    /// <param name="getFromService"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     This is useful for when filters have already looked up a persisted entity and we don't want to have
-    ///     to look it up again.
-    /// </remarks>
-    protected TPersisted? GetObjectFromRequest<TPersisted>(Func<TPersisted> getFromService) =>
-        // checks if the request contains the key and the item is not null, if that is the case, return it from the request, otherwise return
-        // it from the callback
-        HttpContext.Items.ContainsKey(typeof(TPersisted).ToString()) &&
-        HttpContext.Items[typeof(TPersisted).ToString()] != null
-            ? (TPersisted?)HttpContext.Items[typeof(TPersisted).ToString()]
-            : getFromService();
-
-    /// <summary>
-    ///     Returns true if the action passed in means we need to create something new
-    /// </summary>
-    /// <param name="action">The content action</param>
-    /// <returns>Returns true  if this is a creating action</returns>
-    internal static bool IsCreatingAction(ContentSaveAction action) => action.ToString().EndsWith("New");
-
-    /// <summary>
-    ///     Adds a cancelled message to the display
-    /// </summary>
-    /// <param name="display"></param>
-    /// <param name="messageArea"></param>
-    /// <param name="messageAlias"></param>
-    /// <param name="messageParams"></param>
-    protected void AddCancelMessage(
-        INotificationModel? display,
-        string messageArea = "speechBubbles",
-        string messageAlias = "operationCancelledText",
-        string[]? messageParams = null)
-    {
-        // if there's already a default event message, don't add our default one
-        IEventMessagesFactory messages = EventMessages;
-        if (messages != null && (messages.GetOrDefault()?.GetAll().Any(x => x.IsDefaultEventMessage) ?? false))
-        {
-            return;
-        }
-
-        display?.AddWarningNotification(
-            LocalizedTextService.Localize("speechBubbles", "operationCancelledHeader"),
-            LocalizedTextService.Localize(messageArea, messageAlias, messageParams));
-    }
-
-    /// <summary>
-    ///     Adds a cancelled message to the display
-    /// </summary>
-    /// <param name="display"></param>
-    /// <param name="header"></param>
-    /// <param name="message"></param>
-    /// <param name="headerArea"></param>
-    /// <param name="headerAlias"></param>
-    /// <param name="headerParams"></param>
-    protected void AddCancelMessage(INotificationModel display, string message)
-    {
-        // if there's already a default event message, don't add our default one
-        IEventMessagesFactory messages = EventMessages;
-        if (messages?.GetOrDefault()?.GetAll().Any(x => x.IsDefaultEventMessage) == true)
-        {
-            return;
-        }
-
-        display.AddWarningNotification(LocalizedTextService.Localize("speechBubbles", "operationCancelledHeader"),
-            message);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
deleted file mode 100644
index bd98d41d9b..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
+++ /dev/null
@@ -1,773 +0,0 @@
-using System.Net.Mime;
-using System.Text;
-using System.Xml;
-using System.Xml.Linq;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Dictionary;
-using Umbraco.Cms.Core.Editors;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Infrastructure.Packaging;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Cms.Web.Common.DependencyInjection;
-using Umbraco.Extensions;
-using ContentType = Umbraco.Cms.Core.Models.ContentType;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     An API controller used for dealing with content types
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[ParameterSwapControllerActionSelector(nameof(GetById), "id", typeof(int), typeof(Guid), typeof(Udi))]
-public class ContentTypeController : ContentTypeControllerBase<IContentType>
-{
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IContentService _contentService;
-    private readonly IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
-    private readonly IContentTypeService _contentTypeService;
-    private readonly IDataTypeService _dataTypeService;
-    private readonly IFileService _fileService;
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly ILogger<ContentTypeController> _logger;
-    private readonly PackageDataInstallation _packageDataInstallation;
-    private readonly BlockGridSampleHelper _blockGridSampleHelper;
-    private readonly ICoreScopeProvider _coreScopeProvider;
-
-    private readonly PropertyEditorCollection _propertyEditors;
-    // TODO: Split this controller apart so that authz is consistent, currently we need to authz each action individually.
-    // It would be possible to have something like a ContentTypeInfoController for the GetAllPropertyTypeAliases/GetCount/GetAllowedChildren/etc... actions
-
-    private readonly IEntityXmlSerializer _serializer;
-    private readonly IShortStringHelper _shortStringHelper;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-    [Obsolete("Use constructor that takes BlockGridSampleHelper as a parameter")]
-    public ContentTypeController(
-        ICultureDictionary cultureDictionary,
-        IContentTypeService contentTypeService,
-        IMediaTypeService mediaTypeService,
-        IMemberTypeService memberTypeService,
-        IUmbracoMapper umbracoMapper,
-        ILocalizedTextService localizedTextService,
-        IEntityXmlSerializer serializer,
-        PropertyEditorCollection propertyEditors,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IDataTypeService dataTypeService,
-        IShortStringHelper shortStringHelper,
-        IFileService fileService,
-        ILogger<ContentTypeController> logger,
-        IContentService contentService,
-        IContentTypeBaseServiceProvider contentTypeBaseServiceProvider,
-        IHostingEnvironment hostingEnvironment,
-        EditorValidatorCollection editorValidatorCollection,
-        PackageDataInstallation packageDataInstallation)
-        : this(
-            cultureDictionary,
-            contentTypeService,
-            mediaTypeService,
-            memberTypeService,
-            umbracoMapper,
-            localizedTextService,
-            serializer,
-            propertyEditors,
-            backofficeSecurityAccessor,
-            dataTypeService,
-            shortStringHelper,
-            fileService,
-            logger,
-            contentService,
-            contentTypeBaseServiceProvider,
-            hostingEnvironment,
-            editorValidatorCollection,
-            packageDataInstallation,
-            StaticServiceProvider.Instance.GetRequiredService<BlockGridSampleHelper>()
-        )
-    {
-    }
-
-    [Obsolete("Please use constructor that takes an ICoreScopeProvider")]
-    public ContentTypeController(
-           ICultureDictionary cultureDictionary,
-           IContentTypeService contentTypeService,
-           IMediaTypeService mediaTypeService,
-           IMemberTypeService memberTypeService,
-           IUmbracoMapper umbracoMapper,
-           ILocalizedTextService localizedTextService,
-           IEntityXmlSerializer serializer,
-           PropertyEditorCollection propertyEditors,
-           IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-           IDataTypeService dataTypeService,
-           IShortStringHelper shortStringHelper,
-           IFileService fileService,
-           ILogger<ContentTypeController> logger,
-           IContentService contentService,
-           IContentTypeBaseServiceProvider contentTypeBaseServiceProvider,
-           IHostingEnvironment hostingEnvironment,
-           EditorValidatorCollection editorValidatorCollection,
-           PackageDataInstallation packageDataInstallation,
-           BlockGridSampleHelper blockGridSampleHelper)
-        : this(
-            cultureDictionary,
-            contentTypeService,
-            mediaTypeService,
-            memberTypeService,
-            umbracoMapper,
-            localizedTextService,
-            serializer,
-            propertyEditors,
-            backofficeSecurityAccessor,
-            dataTypeService,
-            shortStringHelper,
-            fileService,
-            logger,
-            contentService,
-            contentTypeBaseServiceProvider,
-            hostingEnvironment,
-            editorValidatorCollection,
-            packageDataInstallation,
-            blockGridSampleHelper,
-            StaticServiceProvider.Instance.GetRequiredService<ICoreScopeProvider>())
-        {
-        }
-
-    [ActivatorUtilitiesConstructor]
-    public ContentTypeController(
-           ICultureDictionary cultureDictionary,
-           IContentTypeService contentTypeService,
-           IMediaTypeService mediaTypeService,
-           IMemberTypeService memberTypeService,
-           IUmbracoMapper umbracoMapper,
-           ILocalizedTextService localizedTextService,
-           IEntityXmlSerializer serializer,
-           PropertyEditorCollection propertyEditors,
-           IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-           IDataTypeService dataTypeService,
-           IShortStringHelper shortStringHelper,
-           IFileService fileService,
-           ILogger<ContentTypeController> logger,
-           IContentService contentService,
-           IContentTypeBaseServiceProvider contentTypeBaseServiceProvider,
-           IHostingEnvironment hostingEnvironment,
-           EditorValidatorCollection editorValidatorCollection,
-           PackageDataInstallation packageDataInstallation,
-           BlockGridSampleHelper blockGridSampleHelper,
-           ICoreScopeProvider coreScopeProvider)
-           : base(
-               cultureDictionary,
-               editorValidatorCollection,
-               contentTypeService,
-               mediaTypeService,
-               memberTypeService,
-               umbracoMapper,
-               localizedTextService)
-        {
-            _serializer = serializer;
-            _propertyEditors = propertyEditors;
-            _contentTypeService = contentTypeService;
-            _umbracoMapper = umbracoMapper;
-            _backofficeSecurityAccessor = backofficeSecurityAccessor;
-            _dataTypeService = dataTypeService;
-            _shortStringHelper = shortStringHelper;
-            _localizedTextService = localizedTextService;
-            _fileService = fileService;
-            _logger = logger;
-            _contentService = contentService;
-            _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
-            _hostingEnvironment = hostingEnvironment;
-            _packageDataInstallation = packageDataInstallation;
-            _blockGridSampleHelper = blockGridSampleHelper;
-            _coreScopeProvider = coreScopeProvider;
-        }
-
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public int GetCount() => _contentTypeService.Count();
-
-    [HttpGet]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public bool HasContentNodes(int id) => _contentTypeService.HasContentNodes(id);
-
-    /// <summary>
-    ///     Gets the document type a given id
-    /// </summary>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public ActionResult<DocumentTypeDisplay?> GetById(int id)
-    {
-        IContentType? ct = _contentTypeService.Get(id);
-        if (ct == null)
-        {
-            return NotFound();
-        }
-
-        DocumentTypeDisplay? dto = _umbracoMapper.Map<IContentType, DocumentTypeDisplay>(ct);
-        return dto;
-    }
-
-    /// <summary>
-    ///     Gets the document type a given guid
-    /// </summary>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public ActionResult<DocumentTypeDisplay?> GetById(Guid id)
-    {
-        IContentType? contentType = _contentTypeService.Get(id);
-        if (contentType == null)
-        {
-            return NotFound();
-        }
-
-        DocumentTypeDisplay? dto = _umbracoMapper.Map<IContentType, DocumentTypeDisplay>(contentType);
-        return dto;
-    }
-
-    /// <summary>
-    ///     Gets the document type a given udi
-    /// </summary>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public ActionResult<DocumentTypeDisplay?> GetById(Udi id)
-    {
-        var guidUdi = id as GuidUdi;
-        if (guidUdi == null)
-        {
-            return NotFound();
-        }
-
-        IContentType? contentType = _contentTypeService.Get(guidUdi.Guid);
-        if (contentType == null)
-        {
-            return NotFound();
-        }
-
-        DocumentTypeDisplay? dto = _umbracoMapper.Map<IContentType, DocumentTypeDisplay>(contentType);
-        return dto;
-    }
-
-    /// <summary>
-    ///     Deletes a document type with a given ID
-    /// </summary>
-    [HttpDelete]
-    [HttpPost]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public IActionResult DeleteById(int id)
-    {
-        IContentType? foundType = _contentTypeService.Get(id);
-        if (foundType == null)
-        {
-            return NotFound();
-        }
-
-        _contentTypeService.Delete(foundType, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-        return Ok();
-    }
-
-    /// <summary>
-    ///     Gets all user defined properties.
-    /// </summary>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessAnyContentOrTypes)]
-    public IEnumerable<string> GetAllPropertyTypeAliases() => _contentTypeService.GetAllPropertyTypeAliases();
-
-    /// <summary>
-    ///     Gets all the standard fields.
-    /// </summary>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessAnyContentOrTypes)]
-    public IEnumerable<string> GetAllStandardFields()
-    {
-        string[] preValuesSource =
-        {
-            "createDate", "creatorName", "level", "nodeType", "nodeTypeAlias", "pageID", "pageName", "parentID",
-            "path", "template", "updateDate", "writerID", "writerName"
-        };
-        return preValuesSource;
-    }
-
-    /// <summary>
-    ///     Returns the available compositions for this content type
-    ///     This has been wrapped in a dto instead of simple parameters to support having multiple parameters in post request
-    ///     body
-    /// </summary>
-    [HttpPost]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public ActionResult GetAvailableCompositeContentTypes(GetAvailableCompositionsFilter filter)
-    {
-        ActionResult<IEnumerable<Tuple<EntityBasic?, bool>>> actionResult = PerformGetAvailableCompositeContentTypes(
-            filter.ContentTypeId,
-            UmbracoObjectTypes.DocumentType,
-            filter.FilterContentTypes,
-            filter.FilterPropertyTypes,
-            filter.IsElement);
-
-        if (!(actionResult.Result is null))
-        {
-            return actionResult.Result;
-        }
-
-        var result = actionResult.Value?
-            .Select(x => new { contentType = x.Item1, allowed = x.Item2 });
-        return Ok(result);
-    }
-
-    /// <summary>
-    ///     Returns true if any content types have culture variation enabled
-    /// </summary>
-    [HttpGet]
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
-    public bool AllowsCultureVariation()
-    {
-        IEnumerable<IContentType> contentTypes = _contentTypeService.GetAll();
-        return contentTypes.Any(contentType => contentType.VariesByCulture());
-    }
-
-    /// <summary>
-    ///     Returns where a particular composition has been used
-    ///     This has been wrapped in a dto instead of simple parameters to support having multiple parameters in post request
-    ///     body
-    /// </summary>
-    [HttpPost]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public IActionResult GetWhereCompositionIsUsedInContentTypes(GetAvailableCompositionsFilter filter)
-    {
-        var result =
-            PerformGetWhereCompositionIsUsedInContentTypes(filter.ContentTypeId, UmbracoObjectTypes.DocumentType).Value?
-                .Select(x => new { contentType = x });
-        return Ok(result);
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessAnyContentOrTypes)]
-    public ActionResult<ContentPropertyDisplay> GetPropertyTypeScaffold(int id)
-    {
-        IDataType? dataTypeDiff = _dataTypeService.GetDataType(id);
-
-        if (dataTypeDiff == null)
-        {
-            return NotFound();
-        }
-
-        IDictionary<string, object>? configuration = _dataTypeService.GetDataType(id)?.ConfigurationData;
-        IDataEditor? editor = _propertyEditors[dataTypeDiff.EditorAlias];
-
-        return new ContentPropertyDisplay
-        {
-            Editor = dataTypeDiff.EditorAlias,
-            Validation = new PropertyTypeValidation(),
-            Config = configuration != null
-                ? editor?.GetConfigurationEditor().ToConfigurationEditor(configuration)
-                : null
-        };
-    }
-
-    /// <summary>
-    ///     Deletes a document type container with a given ID
-    /// </summary>
-    [HttpDelete]
-    [HttpPost]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public IActionResult DeleteContainer(int id)
-    {
-        _contentTypeService.DeleteContainer(id, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-
-        return Ok();
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public IActionResult PostCreateContainer(int parentId, string name)
-    {
-        Attempt<OperationResult<OperationResultType, EntityContainer>?> result =
-            _contentTypeService.CreateContainer(parentId, Guid.NewGuid(), name, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-
-        if (result.Success)
-        {
-            return Ok(result.Result); //return the id
-        }
-
-        return ValidationProblem(result.Exception?.Message);
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public IActionResult PostRenameContainer(int id, string name)
-    {
-        Attempt<OperationResult<OperationResultType, EntityContainer>?> result =
-            _contentTypeService.RenameContainer(id, name, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-
-        if (result.Success)
-        {
-            return Ok(result.Result); //return the id
-        }
-
-        return ValidationProblem(result.Exception?.Message);
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public ActionResult<DocumentTypeDisplay?> PostSave(DocumentTypeSave contentTypeSave)
-    {
-        // Before we send this model into this saving/mapping pipeline, we need to do some cleanup on variations.
-        // If the doc type does not allow content variations, we need to update all of it's property types to not allow this either
-        // else we may end up with ysods. I'm unsure if the service level handles this but we'll make sure it is updated here
-        if (!contentTypeSave.AllowCultureVariant)
-        {
-            foreach (PropertyTypeBasic prop in contentTypeSave.Groups.SelectMany(x => x.Properties))
-            {
-                prop.AllowCultureVariant = false;
-            }
-        }
-
-        ActionResult<IContentType?> savedCt = PerformPostSave<DocumentTypeDisplay, DocumentTypeSave, PropertyTypeBasic>(
-            contentTypeSave,
-            i => _contentTypeService.Get(i),
-            type => _contentTypeService.Save(type),
-            ctSave =>
-            {
-                //create a default template if it doesn't exist -but only if default template is == to the content type
-                if (ctSave.DefaultTemplate.IsNullOrWhiteSpace() == false && ctSave.DefaultTemplate == ctSave.Alias)
-                {
-                    ITemplate? template = CreateTemplateForContentType(ctSave.Alias, ctSave.Name);
-
-                    if (template is not null)
-                    {
-                        // If the alias has been manually updated before the first save,
-                        // make sure to also update the first allowed template, as the
-                        // name will come back as a SafeAlias of the document type name,
-                        // not as the actual document type alias.
-                        // For more info: http://issues.umbraco.org/issue/U4-11059
-                        if (ctSave.DefaultTemplate != template.Alias)
-                        {
-                            var allowedTemplates = ctSave.AllowedTemplates?.ToArray();
-                            if (allowedTemplates?.Any() ?? false)
-                            {
-                                allowedTemplates[0] = template.Alias;
-                            }
-
-                            ctSave.AllowedTemplates = allowedTemplates;
-                        }
-
-                        //make sure the template alias is set on the default and allowed template so we can map it back
-                        ctSave.DefaultTemplate = template.Alias;
-                    }
-                }
-            });
-
-        if (!(savedCt.Result is null))
-        {
-            return savedCt.Result;
-        }
-
-        DocumentTypeDisplay? display = _umbracoMapper.Map<DocumentTypeDisplay>(savedCt.Value);
-
-
-        display?.AddSuccessNotification(
-            _localizedTextService.Localize("speechBubbles", "contentTypeSavedHeader"),
-            string.Empty);
-
-        return display;
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public ActionResult<TemplateDisplay?> PostCreateDefaultTemplate(int id)
-    {
-        IContentType? contentType = _contentTypeService.Get(id);
-        if (contentType == null)
-        {
-            return NotFound("No content type found with id " + id);
-        }
-
-        ITemplate? template = CreateTemplateForContentType(contentType.Alias, contentType.Name);
-        if (template == null)
-        {
-            throw new InvalidOperationException("Could not create default template for content type with id " + id);
-        }
-
-        return _umbracoMapper.Map<TemplateDisplay>(template);
-    }
-
-    private ITemplate? CreateTemplateForContentType(string contentTypeAlias, string? contentTypeName)
-    {
-        using ICoreScope scope = _coreScopeProvider.CreateCoreScope();
-        ITemplate? template = _fileService.GetTemplate(contentTypeAlias);
-        if (template == null)
-        {
-            Attempt<OperationResult<OperationResultType, ITemplate>?> tryCreateTemplate =
-                _fileService.CreateTemplateForContentType(contentTypeAlias, contentTypeName);
-            if (tryCreateTemplate == false)
-            {
-                _logger.LogWarning(
-                    "Could not create a template for Content Type: \"{ContentTypeAlias}\", status: {Status}",
-                    contentTypeAlias,
-                    tryCreateTemplate.Result?.Result);
-            }
-
-            template = tryCreateTemplate.Result?.Entity;
-        }
-
-        scope.Complete();
-
-        return template;
-    }
-
-    /// <summary>
-    ///     Returns an empty content type for use as a scaffold when creating a new type
-    /// </summary>
-    /// <param name="parentId"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public DocumentTypeDisplay? GetEmpty(int parentId)
-    {
-        IContentType ct;
-        if (parentId != Constants.System.Root)
-        {
-            IContentType? parent = _contentTypeService.Get(parentId);
-            ct = parent != null
-                ? new ContentType(_shortStringHelper, parent, string.Empty)
-                : new ContentType(_shortStringHelper, parentId);
-        }
-        else
-        {
-            ct = new ContentType(_shortStringHelper, parentId);
-        }
-
-        ct.Icon = Constants.Icons.Content;
-
-        DocumentTypeDisplay? dto = _umbracoMapper.Map<IContentType, DocumentTypeDisplay>(ct);
-        return dto;
-    }
-
-
-    /// <summary>
-    ///     Returns all content type objects
-    /// </summary>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentsOrDocumentTypes)]
-    public IEnumerable<ContentTypeBasic> GetAll()
-    {
-        IEnumerable<IContentType> types = _contentTypeService.GetAll().Where(x => x.IsElement == false);
-
-        IEnumerable<ContentTypeBasic> basics = types.Select(_umbracoMapper.Map<IContentType, ContentTypeBasic>)
-            .WhereNotNull();
-
-        return basics.Select(basic =>
-        {
-            basic.Name = TranslateItem(basic.Name);
-            basic.Description = TranslateItem(basic.Description);
-            return basic;
-        });
-    }
-
-    /// <summary>
-    ///     Returns the allowed child content type objects for the content item id passed in
-    /// </summary>
-    /// <param name="contentId"></param>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentsOrDocumentTypes)]
-    [OutgoingEditorModelEvent]
-    public IEnumerable<ContentTypeBasic> GetAllowedChildren(int contentId)
-    {
-        if (contentId == Constants.System.RecycleBinContent)
-        {
-            return Enumerable.Empty<ContentTypeBasic>();
-        }
-
-        IEnumerable<IContentType> types;
-        if (contentId == Constants.System.Root)
-        {
-            types = _contentTypeService.GetAll().Where(x => x.AllowedAsRoot).ToList();
-        }
-        else
-        {
-            IContent? contentItem = _contentService.GetById(contentId);
-            if (contentItem == null)
-            {
-                return Enumerable.Empty<ContentTypeBasic>();
-            }
-
-            IContentTypeComposition? contentType = _contentTypeBaseServiceProvider.GetContentTypeOf(contentItem);
-            var keys = contentType?.AllowedContentTypes?.OrderBy(c => c.SortOrder).Select(x => x.Key).ToArray();
-
-            if (keys is null || keys.Any() == false)
-            {
-                return Enumerable.Empty<ContentTypeBasic>();
-            }
-
-            types = _contentTypeService.GetAll(keys).OrderBy(c => keys.IndexOf(c.Key)).ToList();
-        }
-
-        var basics = types.Where(type => type.IsElement == false)
-            .Select(_umbracoMapper.Map<IContentType, ContentTypeBasic>).WhereNotNull().ToList();
-
-        ILocalizedTextService localizedTextService = _localizedTextService;
-        foreach (ContentTypeBasic basic in basics)
-        {
-            basic.Name = localizedTextService.UmbracoDictionaryTranslate(CultureDictionary, basic.Name);
-            basic.Description = localizedTextService.UmbracoDictionaryTranslate(CultureDictionary, basic.Description);
-        }
-
-        //map the blueprints
-        IContent[]? blueprints =
-            _contentService.GetBlueprintsForContentTypes(types.Select(x => x.Id).ToArray())?.ToArray();
-        foreach (ContentTypeBasic basic in basics)
-        {
-            IContent[]? docTypeBluePrints = blueprints?.Where(x => x.ContentTypeId == (int?)basic.Id).ToArray();
-            if (docTypeBluePrints is not null)
-            {
-                foreach (IContent blueprint in docTypeBluePrints)
-                {
-                    basic.Blueprints[blueprint.Id] = blueprint.Name ?? string.Empty;
-                }
-            }
-        }
-
-        return basics.OrderBy(c => contentId == Constants.System.Root ? c.Name : string.Empty);
-    }
-
-    /// <summary>
-    ///     Move the content type
-    /// </summary>
-    /// <param name="move"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public IActionResult PostMove(MoveOrCopy move) =>
-        PerformMove(
-            move,
-            i => _contentTypeService.Get(i),
-            (type, i) => _contentTypeService.Move(type, i));
-
-    /// <summary>
-    ///     Copy the content type
-    /// </summary>
-    /// <param name="copy"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public IActionResult PostCopy(MoveOrCopy copy) =>
-        PerformCopy(
-            copy,
-            i => _contentTypeService.Get(i),
-            (type, i) => _contentTypeService.Copy(type, i));
-
-    [HttpGet]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public IActionResult Export(int id)
-    {
-        IContentType? contentType = _contentTypeService.Get(id);
-        if (contentType == null)
-        {
-            throw new NullReferenceException("No content type found with id " + id);
-        }
-
-        XElement xml = _serializer.Serialize(contentType);
-
-        var fileName = $"{contentType.Alias}.udt";
-        // Set custom header so umbRequestHelper.downloadFile can save the correct filename
-        HttpContext.Response.Headers.Add("x-filename", fileName);
-
-        return File(Encoding.UTF8.GetBytes(xml.ToDataString()), MediaTypeNames.Application.Octet, fileName);
-    }
-
-    [HttpPost]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public IActionResult Import(string file)
-    {
-        var filePath = Path.Combine(_hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempFileUploads), file);
-        if (string.IsNullOrEmpty(file) || !System.IO.File.Exists(filePath))
-        {
-            return NotFound();
-        }
-
-
-        var xd = new XmlDocument { XmlResolver = null };
-        xd.Load(filePath);
-
-        var userId = _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().ResultOr(0);
-        var element = XElement.Parse(xd.InnerXml);
-        if (userId is not null)
-        {
-            _packageDataInstallation.ImportDocumentType(element, userId.Value);
-        }
-
-        // Try to clean up the temporary file.
-        try
-        {
-            System.IO.File.Delete(filePath);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error cleaning up temporary udt file in {File}", filePath);
-        }
-
-        return Ok();
-    }
-
-    [HttpPost]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public ActionResult<ContentTypeImportModel> Upload(List<IFormFile> file)
-    {
-        var model = new ContentTypeImportModel();
-
-        foreach (IFormFile formFile in file)
-        {
-            var fileName = formFile.FileName.Trim(Constants.CharArrays.DoubleQuote);
-            var ext = fileName[(fileName.LastIndexOf('.') + 1)..].ToLower();
-
-            var root = _hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempFileUploads);
-            var tempPath = Path.Combine(root, fileName);
-            if (Path.GetFullPath(tempPath).StartsWith(Path.GetFullPath(root)))
-            {
-                using (FileStream stream = System.IO.File.Create(tempPath))
-                {
-                    formFile.CopyToAsync(stream).GetAwaiter().GetResult();
-                }
-
-                if (ext.InvariantEquals("udt"))
-                {
-                    model.TempFileName = fileName;
-
-                    var xd = new XmlDocument { XmlResolver = null };
-                    xd.Load(Path.Combine(root,  fileName));
-
-                    model.Alias = xd.DocumentElement?.SelectSingleNode("//DocumentType/Info/Alias")?.FirstChild?.Value;
-                    model.Name = xd.DocumentElement?.SelectSingleNode("//DocumentType/Info/Name")?.FirstChild?.Value;
-                }
-                else
-                {
-                    model.Notifications.Add(new BackOfficeNotification(
-                        _localizedTextService.Localize("speechBubbles", "operationFailedHeader"),
-                        _localizedTextService.Localize("media", "disallowedFileType"),
-                        NotificationStyle.Warning));
-                }
-            }
-            else
-            {
-                model.Notifications.Add(new BackOfficeNotification(
-                    _localizedTextService.Localize("speechBubbles", "operationFailedHeader"),
-                    _localizedTextService.Localize("media", "invalidFileName"),
-                    NotificationStyle.Warning));
-            }
-        }
-
-        return model;
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-    public ActionResult PostCreateBlockGridSample()
-    {
-        Dictionary<string, Udi>? elementUdisByAlias = _blockGridSampleHelper.CreateSampleElements(
-            documentTypeSave => PerformPostSave<DocumentTypeDisplay, DocumentTypeSave, PropertyTypeBasic>(
-                documentTypeSave,
-                i => _contentTypeService.Get(i),
-                type => _contentTypeService.Save(type)),
-            out string errorMessage);
-
-        // Create the partial views if they don't exist
-        _blockGridSampleHelper.CreateSamplePartialViews();
-
-        return elementUdisByAlias != null ? Ok(elementUdisByAlias) : ValidationProblem(errorMessage);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs
deleted file mode 100644
index b73a022eeb..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs
+++ /dev/null
@@ -1,709 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.Net.Mime;
-using System.Text;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Dictionary;
-using Umbraco.Cms.Core.Editors;
-using Umbraco.Cms.Core.Exceptions;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     Am abstract API controller providing functionality used for dealing with content and media types
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[PrefixlessBodyModelValidator]
-public abstract class ContentTypeControllerBase<TContentType> : BackOfficeNotificationsController
-    where TContentType : class, IContentTypeComposition
-{
-    private readonly EditorValidatorCollection _editorValidatorCollection;
-
-    protected ContentTypeControllerBase(
-        ICultureDictionary cultureDictionary,
-        EditorValidatorCollection editorValidatorCollection,
-        IContentTypeService contentTypeService,
-        IMediaTypeService mediaTypeService,
-        IMemberTypeService memberTypeService,
-        IUmbracoMapper umbracoMapper,
-        ILocalizedTextService localizedTextService)
-    {
-        _editorValidatorCollection = editorValidatorCollection ??
-                                     throw new ArgumentNullException(nameof(editorValidatorCollection));
-        CultureDictionary = cultureDictionary ?? throw new ArgumentNullException(nameof(cultureDictionary));
-        ContentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService));
-        MediaTypeService = mediaTypeService ?? throw new ArgumentNullException(nameof(mediaTypeService));
-        MemberTypeService = memberTypeService ?? throw new ArgumentNullException(nameof(memberTypeService));
-        UmbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        LocalizedTextService =
-            localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
-    }
-
-    protected ICultureDictionary CultureDictionary { get; }
-    public IContentTypeService ContentTypeService { get; }
-    public IMediaTypeService MediaTypeService { get; }
-    public IMemberTypeService MemberTypeService { get; }
-    public IUmbracoMapper UmbracoMapper { get; }
-    public ILocalizedTextService LocalizedTextService { get; }
-
-    /// <summary>
-    ///     Returns the available composite content types for a given content type
-    /// </summary>
-    /// <param name="type"></param>
-    /// <param name="filterContentTypes">
-    ///     This is normally an empty list but if additional content type aliases are passed in, any content types containing
-    ///     those aliases will be filtered out
-    ///     along with any content types that have matching property types that are included in the filtered content types
-    /// </param>
-    /// <param name="filterPropertyTypes">
-    ///     This is normally an empty list but if additional property type aliases are passed in, any content types that have
-    ///     these aliases will be filtered out.
-    ///     This is required because in the case of creating/modifying a content type because new property types being added to
-    ///     it are not yet persisted so cannot
-    ///     be looked up via the db, they need to be passed in.
-    /// </param>
-    /// <param name="contentTypeId"></param>
-    /// <param name="isElement">Whether the composite content types should be applicable for an element type</param>
-    /// <returns></returns>
-    protected ActionResult<IEnumerable<Tuple<EntityBasic?, bool>>> PerformGetAvailableCompositeContentTypes(
-        int contentTypeId,
-        UmbracoObjectTypes type,
-        string[]? filterContentTypes,
-        string[]? filterPropertyTypes,
-        bool isElement)
-    {
-        IContentTypeComposition? source = null;
-
-        //below is all ported from the old doc type editor and comes with the same weaknesses /insanity / magic
-
-        IContentTypeComposition[] allContentTypes;
-
-        switch (type)
-        {
-            case UmbracoObjectTypes.DocumentType:
-                if (contentTypeId > 0)
-                {
-                    source = ContentTypeService.Get(contentTypeId);
-                    if (source == null)
-                    {
-                        return NotFound();
-                    }
-                }
-
-                allContentTypes = ContentTypeService.GetAll().Cast<IContentTypeComposition>().ToArray();
-                break;
-
-            case UmbracoObjectTypes.MediaType:
-                if (contentTypeId > 0)
-                {
-                    source = MediaTypeService.Get(contentTypeId);
-                    if (source == null)
-                    {
-                        return NotFound();
-                    }
-                }
-
-                allContentTypes = MediaTypeService.GetAll().Cast<IContentTypeComposition>().ToArray();
-                break;
-
-            case UmbracoObjectTypes.MemberType:
-                if (contentTypeId > 0)
-                {
-                    source = MemberTypeService.Get(contentTypeId);
-                    if (source == null)
-                    {
-                        return NotFound();
-                    }
-                }
-
-                allContentTypes = MemberTypeService.GetAll().Cast<IContentTypeComposition>().ToArray();
-                break;
-
-            default:
-                throw new ArgumentOutOfRangeException("The entity type was not a content type");
-        }
-
-        ContentTypeAvailableCompositionsResults availableCompositions =
-            ContentTypeService.GetAvailableCompositeContentTypes(source, allContentTypes, filterContentTypes, filterPropertyTypes, isElement);
-
-
-        IContentTypeComposition[] currCompositions =
-            source == null ? new IContentTypeComposition[] { } : source.ContentTypeComposition.ToArray();
-        var compAliases = currCompositions.Select(x => x.Alias).ToArray();
-        IEnumerable<string> ancestors = availableCompositions.Ancestors.Select(x => x.Alias);
-
-        return availableCompositions.Results
-            .Select(x =>
-                new Tuple<EntityBasic?, bool>(UmbracoMapper.Map<IContentTypeComposition, EntityBasic>(x.Composition), x.Allowed))
-            .Select(x =>
-            {
-                //we need to ensure that the item is enabled if it is already selected
-                // but do not allow it if it is any of the ancestors
-                if (compAliases.Contains(x.Item1?.Alias) && ancestors.Contains(x.Item1?.Alias) == false)
-                {
-                    //re-set x to be allowed (NOTE: I didn't know you could set an enumerable item in a lambda!)
-                    x = new Tuple<EntityBasic?, bool>(x.Item1, true);
-                }
-
-                //translate the name
-                if (x.Item1 is not null)
-                {
-                    x.Item1.Name = TranslateItem(x.Item1.Name);
-                }
-
-                IContentTypeComposition? contentType = allContentTypes.FirstOrDefault(c => c.Key == x.Item1?.Key);
-                EntityContainer[] containers = GetEntityContainers(contentType, type).ToArray();
-                var containerPath =
-                    $"/{(containers.Any() ? $"{string.Join("/", containers.Select(c => c.Name))}/" : null)}";
-                if (x.Item1 is not null)
-                {
-                    x.Item1.AdditionalData["containerPath"] = containerPath;
-                }
-
-                return x;
-            })
-            .ToList();
-    }
-
-    private IEnumerable<EntityContainer> GetEntityContainers(IContentTypeComposition? contentType, UmbracoObjectTypes type)
-    {
-        if (contentType == null)
-        {
-            return Enumerable.Empty<EntityContainer>();
-        }
-
-        switch (type)
-        {
-            case UmbracoObjectTypes.DocumentType:
-                if (contentType is IContentType documentContentType)
-                {
-                    return ContentTypeService.GetContainers(documentContentType);
-                }
-
-                return Enumerable.Empty<EntityContainer>();
-            case UmbracoObjectTypes.MediaType:
-                if (contentType is IMediaType mediaContentType)
-                {
-                    return MediaTypeService.GetContainers(mediaContentType);
-                }
-
-                return Enumerable.Empty<EntityContainer>();
-            case UmbracoObjectTypes.MemberType:
-                return Enumerable.Empty<EntityContainer>();
-            default:
-                throw new ArgumentOutOfRangeException("The entity type was not a content type");
-        }
-    }
-
-    /// <summary>
-    ///     Returns a list of content types where a particular composition content type is used
-    /// </summary>
-    /// <param name="type">Type of content Type, eg documentType or mediaType</param>
-    /// <param name="contentTypeId">Id of composition content type</param>
-    /// <returns></returns>
-    protected ActionResult<IEnumerable<EntityBasic>> PerformGetWhereCompositionIsUsedInContentTypes(
-        int contentTypeId, UmbracoObjectTypes type)
-    {
-        var id = 0;
-
-        if (contentTypeId > 0)
-        {
-            IContentTypeComposition? source;
-
-            switch (type)
-            {
-                case UmbracoObjectTypes.DocumentType:
-                    source = ContentTypeService.Get(contentTypeId);
-                    break;
-
-                case UmbracoObjectTypes.MediaType:
-                    source = MediaTypeService.Get(contentTypeId);
-                    break;
-
-                case UmbracoObjectTypes.MemberType:
-                    source = MemberTypeService.Get(contentTypeId);
-                    break;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(type));
-            }
-
-            if (source == null)
-            {
-                return NotFound();
-            }
-
-            id = source.Id;
-        }
-
-        IEnumerable<IContentTypeComposition> composedOf;
-
-        switch (type)
-        {
-            case UmbracoObjectTypes.DocumentType:
-                composedOf = ContentTypeService.GetComposedOf(id);
-                break;
-
-            case UmbracoObjectTypes.MediaType:
-                composedOf = MediaTypeService.GetComposedOf(id);
-                break;
-
-            case UmbracoObjectTypes.MemberType:
-                composedOf = MemberTypeService.GetComposedOf(id);
-                break;
-
-            default:
-                throw new ArgumentOutOfRangeException(nameof(type));
-        }
-
-        EntityBasic TranslateName(EntityBasic e)
-        {
-            e.Name = TranslateItem(e.Name);
-            return e;
-        }
-
-        return composedOf
-            .Select(UmbracoMapper.Map<IContentTypeComposition, EntityBasic>)
-            .WhereNotNull()
-            .Select(TranslateName)
-            .ToList();
-    }
-
-    protected string? TranslateItem(string? text)
-    {
-        if (text == null)
-        {
-            return null;
-        }
-
-        if (text.StartsWith("#") == false)
-        {
-            return text;
-        }
-
-        text = text.Substring(1);
-        return CultureDictionary[text].IfNullOrWhiteSpace(text);
-    }
-
-    protected ActionResult<TContentType?> PerformPostSave<TContentTypeDisplay, TContentTypeSave, TPropertyType>(
-        TContentTypeSave contentTypeSave,
-        Func<int, TContentType?> getContentType,
-        Action<TContentType?> saveContentType,
-        Action<TContentTypeSave>? beforeCreateNew = null)
-        where TContentTypeDisplay : ContentTypeCompositionDisplay
-        where TContentTypeSave : ContentTypeSave<TPropertyType>
-        where TPropertyType : PropertyTypeBasic
-    {
-        var ctId = Convert.ToInt32(contentTypeSave.Id);
-        TContentType? ct = ctId > 0 ? getContentType(ctId) : null;
-        if (ctId > 0 && ct == null)
-        {
-            return NotFound();
-        }
-
-        // Validate that there's no other ct with the same alias
-        // it in fact cannot be the same as any content type alias (member, content or media) because
-        // this would interfere with how ModelsBuilder works and also how many of the published caches
-        // works since that is based on aliases.
-        IEnumerable<string> allAliases = ContentTypeService.GetAllContentTypeAliases();
-        var exists = allAliases.InvariantContains(contentTypeSave.Alias);
-        if (exists && (ctId == 0 || (!ct?.Alias.InvariantEquals(contentTypeSave.Alias) ?? false)))
-        {
-            ModelState.AddModelError("Alias", LocalizedTextService.Localize("editcontenttype", "aliasAlreadyExists"));
-        }
-
-        // execute the external validators
-        ValidateExternalValidators(ModelState, contentTypeSave);
-
-        if (ModelState.IsValid == false)
-        {
-            TContentTypeDisplay? err =
-                CreateModelStateValidationEror<TContentTypeSave, TContentTypeDisplay>(ctId, contentTypeSave, ct);
-            return ValidationProblem(err);
-        }
-
-        //filter out empty properties
-        contentTypeSave.Groups = contentTypeSave.Groups.Where(x => x.Name.IsNullOrWhiteSpace() == false).ToList();
-        foreach (PropertyGroupBasic<TPropertyType> group in contentTypeSave.Groups)
-        {
-            group.Properties = group.Properties.Where(x => x.Alias.IsNullOrWhiteSpace() == false).ToList();
-        }
-
-        if (ctId > 0)
-        {
-            //its an update to an existing content type
-
-            //This mapping will cause a lot of content type validation to occur which we need to deal with
-            try
-            {
-                UmbracoMapper.Map(contentTypeSave, ct);
-            }
-            catch (Exception ex)
-            {
-                TContentTypeDisplay? responseEx =
-                    CreateInvalidCompositionResponseException<TContentTypeDisplay, TContentTypeSave, TPropertyType>(
-                        ex, contentTypeSave, ct, ctId);
-                if (responseEx != null)
-                {
-                    return ValidationProblem(responseEx);
-                }
-            }
-
-            TContentTypeDisplay? exResult =
-                CreateCompositionValidationExceptionIfInvalid<TContentTypeSave, TPropertyType, TContentTypeDisplay>(
-                    contentTypeSave, ct);
-            if (exResult != null)
-            {
-                return ValidationProblem(exResult);
-            }
-
-            saveContentType(ct);
-
-            return ct;
-        }
-        else
-        {
-            beforeCreateNew?.Invoke(contentTypeSave);
-
-            //check if the type is trying to allow type 0 below itself - id zero refers to the currently unsaved type
-            //always filter these 0 types out
-            var allowItselfAsChild = false;
-            var allowIfselfAsChildSortOrder = -1;
-            if (contentTypeSave.AllowedContentTypes != null)
-            {
-                allowIfselfAsChildSortOrder = contentTypeSave.AllowedContentTypes.IndexOf(0);
-                allowItselfAsChild = contentTypeSave.AllowedContentTypes.Any(x => x == 0);
-
-                contentTypeSave.AllowedContentTypes =
-                    contentTypeSave.AllowedContentTypes.Where(x => x > 0).ToList();
-            }
-
-            //save as new
-
-            TContentType? newCt = null;
-            try
-            {
-                //This mapping will cause a lot of content type validation to occur which we need to deal with
-                newCt = UmbracoMapper.Map<TContentType>(contentTypeSave);
-            }
-            catch (Exception ex)
-            {
-                TContentTypeDisplay? responseEx =
-                    CreateInvalidCompositionResponseException<TContentTypeDisplay, TContentTypeSave, TPropertyType>(
-                        ex, contentTypeSave, ct, ctId);
-                if (responseEx is null)
-                {
-                    throw;
-                }
-
-                return ValidationProblem(responseEx);
-            }
-
-            TContentTypeDisplay? exResult =
-                CreateCompositionValidationExceptionIfInvalid<TContentTypeSave, TPropertyType, TContentTypeDisplay>(
-                    contentTypeSave, newCt);
-            if (exResult != null)
-            {
-                return ValidationProblem(exResult);
-            }
-
-            //set id to null to ensure its handled as a new type
-            contentTypeSave.Id = null;
-            contentTypeSave.CreateDate = DateTime.Now;
-            contentTypeSave.UpdateDate = DateTime.Now;
-
-            saveContentType(newCt);
-
-            //we need to save it twice to allow itself under itself.
-            if (allowItselfAsChild && newCt != null)
-            {
-                newCt.AllowedContentTypes =
-                    newCt.AllowedContentTypes?.Union(
-                        new[] { new ContentTypeSort(newCt.Key, allowIfselfAsChildSortOrder, newCt.Alias) });
-                saveContentType(newCt);
-            }
-
-            return newCt;
-        }
-    }
-
-    private void ValidateExternalValidators(ModelStateDictionary modelState, object model)
-    {
-        Type modelType = model.GetType();
-
-        IEnumerable<ValidationResult> validationResults = _editorValidatorCollection
-            .Where(x => x.ModelType == modelType)
-            .SelectMany(x => x.Validate(model))
-            .Where(x => !string.IsNullOrWhiteSpace(x.ErrorMessage) && x.MemberNames.Any());
-
-        foreach (ValidationResult r in validationResults)
-        {
-            foreach (var m in r.MemberNames)
-            {
-                modelState.AddModelError(m, r.ErrorMessage ?? string.Empty);
-            }
-        }
-    }
-
-    /// <summary>
-    ///     Move
-    /// </summary>
-    /// <param name="move"></param>
-    /// <param name="getContentType"></param>
-    /// <param name="doMove"></param>
-    /// <returns></returns>
-    protected IActionResult PerformMove(
-        MoveOrCopy move,
-        Func<int, TContentType?> getContentType,
-        Func<TContentType, int, Attempt<OperationResult<MoveOperationStatusType>?>> doMove)
-    {
-        TContentType? toMove = getContentType(move.Id);
-        if (toMove == null)
-        {
-            return NotFound();
-        }
-
-        Attempt<OperationResult<MoveOperationStatusType>?> result = doMove(toMove, move.ParentId);
-        if (result.Success)
-        {
-            return Content(toMove.Path, MediaTypeNames.Text.Plain, Encoding.UTF8);
-        }
-
-        switch (result.Result?.Result)
-        {
-            case MoveOperationStatusType.FailedParentNotFound:
-                return NotFound();
-            case MoveOperationStatusType.FailedCancelledByEvent:
-                return ValidationProblem();
-            case MoveOperationStatusType.FailedNotAllowedByPath:
-                return ValidationProblem(LocalizedTextService.Localize("moveOrCopy", "notAllowedByPath"));
-            default:
-                throw new ArgumentOutOfRangeException();
-        }
-    }
-
-    /// <summary>
-    ///     Move
-    /// </summary>
-    /// <param name="move"></param>
-    /// <param name="getContentType"></param>
-    /// <param name="doCopy"></param>
-    /// <returns></returns>
-    protected IActionResult PerformCopy(
-        MoveOrCopy move,
-        Func<int, TContentType?> getContentType,
-        Func<TContentType, int, Attempt<OperationResult<MoveOperationStatusType, TContentType>?>> doCopy)
-    {
-        TContentType? toMove = getContentType(move.Id);
-        if (toMove == null)
-        {
-            return NotFound();
-        }
-
-        Attempt<OperationResult<MoveOperationStatusType, TContentType>?> result = doCopy(toMove, move.ParentId);
-        if (result.Success)
-        {
-            return Content(toMove.Path, MediaTypeNames.Text.Plain, Encoding.UTF8);
-        }
-
-        switch (result.Result?.Result)
-        {
-            case MoveOperationStatusType.FailedParentNotFound:
-                return NotFound();
-            case MoveOperationStatusType.FailedCancelledByEvent:
-                return ValidationProblem();
-            case MoveOperationStatusType.FailedNotAllowedByPath:
-                return ValidationProblem(LocalizedTextService.Localize("moveOrCopy", "notAllowedByPath"));
-            default:
-                throw new ArgumentOutOfRangeException();
-        }
-    }
-
-    /// <summary>
-    ///     Validates the composition and adds errors to the model state if any are found then throws an error response if
-    ///     there are errors
-    /// </summary>
-    /// <param name="contentTypeSave"></param>
-    /// <param name="composition"></param>
-    /// <returns></returns>
-    private TContentTypeDisplay? CreateCompositionValidationExceptionIfInvalid<TContentTypeSave, TPropertyType,
-        TContentTypeDisplay>(TContentTypeSave contentTypeSave, TContentType? composition)
-        where TContentTypeSave : ContentTypeSave<TPropertyType>
-        where TPropertyType : PropertyTypeBasic
-        where TContentTypeDisplay : ContentTypeCompositionDisplay
-    {
-        IContentTypeBaseService<TContentType>? service = GetContentTypeService<TContentType>();
-        Attempt<string[]?> validateAttempt = service?.ValidateComposition(composition) ?? Attempt.Fail<string[]?>();
-        if (validateAttempt == false)
-        {
-            // if it's not successful then we need to return some model state for the property type and property group
-            // aliases that are duplicated
-            IEnumerable<string>? duplicatePropertyTypeAliases = validateAttempt.Result?.Distinct();
-            var invalidPropertyGroupAliases =
-                (validateAttempt.Exception as InvalidCompositionException)?.PropertyGroupAliases ??
-                Array.Empty<string>();
-
-            AddCompositionValidationErrors<TContentTypeSave, TPropertyType>(contentTypeSave, duplicatePropertyTypeAliases, invalidPropertyGroupAliases);
-
-            TContentTypeDisplay? display = UmbracoMapper.Map<TContentTypeDisplay>(composition);
-            //map the 'save' data on top
-            display = UmbracoMapper.Map(contentTypeSave, display);
-            if (display is not null)
-            {
-                display.Errors = ModelState.ToErrorDictionary();
-            }
-
-            return display;
-        }
-
-        return null;
-    }
-
-    public IContentTypeBaseService<T>? GetContentTypeService<T>()
-        where T : IContentTypeComposition
-    {
-        if (typeof(T).Implements<IContentType>())
-        {
-            return ContentTypeService as IContentTypeBaseService<T>;
-        }
-
-        if (typeof(T).Implements<IMediaType>())
-        {
-            return MediaTypeService as IContentTypeBaseService<T>;
-        }
-
-        if (typeof(T).Implements<IMemberType>())
-        {
-            return MemberTypeService as IContentTypeBaseService<T>;
-        }
-
-        throw new ArgumentException("Type " + typeof(T).FullName + " does not have a service.");
-    }
-
-    /// <summary>
-    ///     Adds errors to the model state if any invalid aliases are found then throws an error response if there are errors
-    /// </summary>
-    /// <param name="contentTypeSave"></param>
-    /// <param name="duplicatePropertyTypeAliases"></param>
-    /// <param name="invalidPropertyGroupAliases"></param>
-    /// <returns></returns>
-    private void AddCompositionValidationErrors<TContentTypeSave, TPropertyType>(
-        TContentTypeSave contentTypeSave,
-        IEnumerable<string>? duplicatePropertyTypeAliases,
-        IEnumerable<string>? invalidPropertyGroupAliases)
-        where TContentTypeSave : ContentTypeSave<TPropertyType>
-        where TPropertyType : PropertyTypeBasic
-    {
-        if (duplicatePropertyTypeAliases is not null)
-        {
-            foreach (var propertyTypeAlias in duplicatePropertyTypeAliases)
-            {
-                // Find the property type relating to these
-                TPropertyType property = contentTypeSave.Groups.SelectMany(x => x.Properties)
-                    .Single(x => x.Alias == propertyTypeAlias);
-                PropertyGroupBasic<TPropertyType> group =
-                    contentTypeSave.Groups.Single(x => x.Properties.Contains(property));
-                var propertyIndex = group.Properties.IndexOf(property);
-                var groupIndex = contentTypeSave.Groups.IndexOf(group);
-
-                var key = $"Groups[{groupIndex}].Properties[{propertyIndex}].Alias";
-                ModelState.AddModelError(key, "Duplicate property aliases aren't allowed between compositions");
-            }
-        }
-
-        if (invalidPropertyGroupAliases is not null)
-        {
-            foreach (var propertyGroupAlias in invalidPropertyGroupAliases)
-            {
-                // Find the property group relating to these
-                PropertyGroupBasic<TPropertyType> group =
-                    contentTypeSave.Groups.Single(x => x.Alias == propertyGroupAlias);
-                var groupIndex = contentTypeSave.Groups.IndexOf(group);
-                var key = $"Groups[{groupIndex}].Name";
-                ModelState.AddModelError(key, "Different group types aren't allowed between compositions");
-            }
-        }
-    }
-
-    /// <summary>
-    ///     If the exception is an InvalidCompositionException create a response exception to be thrown for validation errors
-    /// </summary>
-    /// <typeparam name="TContentTypeDisplay"></typeparam>
-    /// <typeparam name="TContentTypeSave"></typeparam>
-    /// <typeparam name="TPropertyType"></typeparam>
-    /// <param name="ex"></param>
-    /// <param name="contentTypeSave"></param>
-    /// <param name="ct"></param>
-    /// <param name="ctId"></param>
-    /// <returns></returns>
-    private TContentTypeDisplay? CreateInvalidCompositionResponseException<TContentTypeDisplay, TContentTypeSave,
-        TPropertyType>(
-        Exception ex, TContentTypeSave contentTypeSave, TContentType? ct, int ctId)
-        where TContentTypeDisplay : ContentTypeCompositionDisplay
-        where TContentTypeSave : ContentTypeSave<TPropertyType>
-        where TPropertyType : PropertyTypeBasic
-    {
-        InvalidCompositionException? invalidCompositionException = null;
-        if (ex is InvalidCompositionException)
-        {
-            invalidCompositionException = (InvalidCompositionException)ex;
-        }
-        else if (ex.InnerException is InvalidCompositionException)
-        {
-            invalidCompositionException = (InvalidCompositionException)ex.InnerException;
-        }
-
-        if (invalidCompositionException != null)
-        {
-            AddCompositionValidationErrors<TContentTypeSave, TPropertyType>(
-                contentTypeSave,
-                invalidCompositionException.PropertyTypeAliases,
-                invalidCompositionException.PropertyGroupAliases);
-            return CreateModelStateValidationEror<TContentTypeSave, TContentTypeDisplay>(ctId, contentTypeSave, ct);
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    ///     Used to throw the ModelState validation results when the ModelState is invalid
-    /// </summary>
-    /// <typeparam name="TContentTypeDisplay"></typeparam>
-    /// <typeparam name="TContentTypeSave"></typeparam>
-    /// <param name="ctId"></param>
-    /// <param name="contentTypeSave"></param>
-    /// <param name="ct"></param>
-    private TContentTypeDisplay? CreateModelStateValidationEror<TContentTypeSave, TContentTypeDisplay>(int ctId, TContentTypeSave contentTypeSave, TContentType? ct)
-        where TContentTypeDisplay : ContentTypeCompositionDisplay
-        where TContentTypeSave : ContentTypeSave
-    {
-        TContentTypeDisplay? forDisplay;
-        if (ctId > 0)
-        {
-            //Required data is invalid so we cannot continue
-            forDisplay = UmbracoMapper.Map<TContentTypeDisplay>(ct);
-            //map the 'save' data on top
-            forDisplay = UmbracoMapper.Map(contentTypeSave, forDisplay);
-        }
-        else
-        {
-            //map the 'save' data to display
-            forDisplay = UmbracoMapper.Map<TContentTypeDisplay>(contentTypeSave);
-        }
-
-        if (forDisplay is not null)
-        {
-            forDisplay.Errors = ModelState.ToErrorDictionary();
-        }
-
-        return forDisplay;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs b/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
deleted file mode 100644
index 0eff16b516..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
+++ /dev/null
@@ -1,364 +0,0 @@
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Media;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Cms.Web.Common.Security;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     Controller to back the User.Resource service, used for fetching user data when already authenticated. user.service
-///     is currently used for handling authentication
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class CurrentUserController : UmbracoAuthorizedJsonController
-{
-    private readonly AppCaches _appCaches;
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IBackOfficeUserManager _backOfficeUserManager;
-    private readonly ContentSettings _contentSettings;
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly IImageUrlGenerator _imageUrlGenerator;
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly MediaFileManager _mediaFileManager;
-    private readonly IPasswordChanger<BackOfficeIdentityUser> _passwordChanger;
-    private readonly IShortStringHelper _shortStringHelper;
-    private readonly IUmbracoMapper _umbracoMapper;
-    private readonly IUserDataService _userDataService;
-    private readonly IFileStreamSecurityValidator? _fileStreamSecurityValidator; // make non nullable in v14
-    private readonly IUserService _userService;
-
-    [ActivatorUtilitiesConstructor]
-    public CurrentUserController(
-        MediaFileManager mediaFileManager,
-        IOptionsSnapshot<ContentSettings> contentSettings,
-        IHostingEnvironment hostingEnvironment,
-        IImageUrlGenerator imageUrlGenerator,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IUserService userService,
-        IUmbracoMapper umbracoMapper,
-        IBackOfficeUserManager backOfficeUserManager,
-        ILocalizedTextService localizedTextService,
-        AppCaches appCaches,
-        IShortStringHelper shortStringHelper,
-        IPasswordChanger<BackOfficeIdentityUser> passwordChanger,
-        IUserDataService userDataService,
-        IFileStreamSecurityValidator fileStreamSecurityValidator)
-    {
-        _mediaFileManager = mediaFileManager;
-        _contentSettings = contentSettings.Value;
-        _hostingEnvironment = hostingEnvironment;
-        _imageUrlGenerator = imageUrlGenerator;
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-        _userService = userService;
-        _umbracoMapper = umbracoMapper;
-        _backOfficeUserManager = backOfficeUserManager;
-        _localizedTextService = localizedTextService;
-        _appCaches = appCaches;
-        _shortStringHelper = shortStringHelper;
-        _passwordChanger = passwordChanger;
-        _userDataService = userDataService;
-        _fileStreamSecurityValidator = fileStreamSecurityValidator;
-    }
-
-    [Obsolete("Use constructor overload that has fileStreamSecurityValidator, scheduled for removal in v14")]
-    public CurrentUserController(
-        MediaFileManager mediaFileManager,
-        IOptionsSnapshot<ContentSettings> contentSettings,
-        IHostingEnvironment hostingEnvironment,
-        IImageUrlGenerator imageUrlGenerator,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IUserService userService,
-        IUmbracoMapper umbracoMapper,
-        IBackOfficeUserManager backOfficeUserManager,
-        ILocalizedTextService localizedTextService,
-        AppCaches appCaches,
-        IShortStringHelper shortStringHelper,
-        IPasswordChanger<BackOfficeIdentityUser> passwordChanger,
-        IUserDataService userDataService)
-    {
-        _mediaFileManager = mediaFileManager;
-        _contentSettings = contentSettings.Value;
-        _hostingEnvironment = hostingEnvironment;
-        _imageUrlGenerator = imageUrlGenerator;
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-        _userService = userService;
-        _umbracoMapper = umbracoMapper;
-        _backOfficeUserManager = backOfficeUserManager;
-        _localizedTextService = localizedTextService;
-        _appCaches = appCaches;
-        _shortStringHelper = shortStringHelper;
-        _passwordChanger = passwordChanger;
-        _userDataService = userDataService;
-    }
-
-        /// <summary>
-        /// Returns permissions for all nodes passed in for the current user
-        /// </summary>
-        /// <param name="nodeIds"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public Dictionary<int, string[]> GetPermissions(int[] nodeIds)
-        {
-            EntityPermissionCollection permissions = _userService
-            .GetPermissions(_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, nodeIds);
-
-        var permissionsDictionary = new Dictionary<int, string[]>();
-        foreach (var nodeId in nodeIds)
-        {
-            var aggregatePerms = permissions.GetAllPermissions(nodeId).ToArray();
-            permissionsDictionary.Add(nodeId, aggregatePerms);
-        }
-
-        return permissionsDictionary;
-    }
-
-    /// <summary>
-    ///     Checks a nodes permission for the current user
-    /// </summary>
-    /// <param name="permissionToCheck"></param>
-    /// <param name="nodeId"></param>
-    /// <returns></returns>
-    [HttpGet]
-    public bool HasPermission(string permissionToCheck, int nodeId)
-    {
-        IEnumerable<string> p = _userService
-            .GetPermissions(_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, nodeId).GetAllPermissions();
-        if (p.Contains(permissionToCheck.ToString(CultureInfo.InvariantCulture)))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    ///     Saves a tour status for the current user
-    /// </summary>
-    /// <param name="status"></param>
-    /// <returns></returns>
-    public IEnumerable<UserTourStatus> PostSetUserTour(UserTourStatus? status)
-    {
-        if (status == null)
-        {
-            throw new ArgumentNullException(nameof(status));
-        }
-
-        List<UserTourStatus>? userTours = null;
-        if (_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.TourData.IsNullOrWhiteSpace() ?? true)
-        {
-            userTours = new List<UserTourStatus> { status };
-            if (_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser is not null)
-            {
-                _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.TourData =
-                    JsonConvert.SerializeObject(userTours);
-                _userService.Save(_backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser);
-            }
-
-            return userTours;
-        }
-
-        if (_backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.TourData is not null)
-        {
-            userTours = JsonConvert
-                .DeserializeObject<IEnumerable<UserTourStatus>>(_backofficeSecurityAccessor.BackOfficeSecurity
-                    .CurrentUser.TourData)?.ToList();
-            UserTourStatus? found = userTours?.FirstOrDefault(x => x.Alias == status.Alias);
-            if (found != null)
-            {
-                //remove it and we'll replace it next
-                userTours?.Remove(found);
-            }
-
-            userTours?.Add(status);
-        }
-
-        _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.TourData = JsonConvert.SerializeObject(userTours);
-        _userService.Save(_backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser);
-        return userTours ?? Enumerable.Empty<UserTourStatus>();
-    }
-
-    /// <summary>
-    ///     Returns the user's tours
-    /// </summary>
-    /// <returns></returns>
-    public IEnumerable<UserTourStatus>? GetUserTours()
-    {
-        if (_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.TourData.IsNullOrWhiteSpace() ?? true)
-        {
-            return Enumerable.Empty<UserTourStatus>();
-        }
-
-        IEnumerable<UserTourStatus>? userTours =
-            JsonConvert.DeserializeObject<IEnumerable<UserTourStatus>>(_backofficeSecurityAccessor.BackOfficeSecurity
-                .CurrentUser.TourData!);
-        return userTours ?? Enumerable.Empty<UserTourStatus>();
-    }
-
-    public IEnumerable<UserData> GetUserData() => _userDataService.GetUserData();
-
-    /// <summary>
-    ///     When a user is invited and they click on the invitation link, they will be partially logged in
-    ///     where they can set their username/password
-    /// </summary>
-    /// <param name="newPassword"></param>
-    /// <returns></returns>
-    /// <seealso cref="AuthenticationController.PostSetInvitedUserPassword"/>
-    /// <remarks>
-    ///     This only works when the user is logged in (partially)
-    /// </remarks>
-    [AllowAnonymous]
-    [Obsolete("This is no longer used and will be removed in future versions. Use the AuthenticationController.PostSetInvitedUserPassword instead.")]
-    public async Task<ActionResult<UserDetail?>> PostSetInvitedUserPassword([FromBody] string newPassword)
-    {
-        var userId = _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().ResultOr(0).ToString();
-        if (userId is null)
-        {
-            throw new InvalidOperationException("Could not find user Id");
-        }
-        var user = await _backOfficeUserManager.FindByIdAsync(userId);
-        if (user == null) throw new InvalidOperationException("Could not find user");
-
-        IdentityResult result = await _backOfficeUserManager.AddPasswordAsync(user, newPassword);
-
-        if (result.Succeeded == false)
-        {
-            //it wasn't successful, so add the change error to the model state, we've name the property alias _umb_password on the form
-            // so that is why it is being used here.
-            ModelState.AddModelError("value", result.Errors.ToErrorMessage());
-
-            return ValidationProblem(ModelState);
-        }
-
-        //They've successfully set their password, we can now update their user account to be approved
-        user.IsApproved = true;
-        //They've successfully set their password, and will now get fully logged into the back office, so the lastlogindate is set so the backoffice shows they have logged in
-        user.LastLoginDateUtc = DateTime.UtcNow;
-        await _backOfficeUserManager.UpdateAsync(user);
-
-
-        //now we can return their full object since they are now really logged into the back office
-        UserDetail? userDisplay =
-            _umbracoMapper.Map<UserDetail>(_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser);
-
-        if (userDisplay is not null)
-        {
-            userDisplay.SecondsUntilTimeout = HttpContext.User.GetRemainingAuthSeconds();
-        }
-
-        return userDisplay;
-    }
-
-    [AppendUserModifiedHeader]
-    public IActionResult PostSetAvatar(IList<IFormFile> file)
-    {
-        Attempt<int>? userId = _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId();
-        var result = userId?.ResultOr(0);
-        //borrow the logic from the user controller
-        return UsersController.PostSetAvatarInternal(
-            file,
-            _userService,
-            _appCaches.RuntimeCache,
-            _mediaFileManager,
-            _shortStringHelper,
-            _contentSettings,
-            _hostingEnvironment,
-            _imageUrlGenerator,
-            _fileStreamSecurityValidator,
-            _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? 0);
-    }
-
-    /// <summary>
-    ///     Changes the users password
-    /// </summary>
-    /// <param name="changingPasswordModel">The changing password model</param>
-    /// <returns>
-    ///     If the password is being reset it will return the newly reset password, otherwise will return an empty value
-    /// </returns>
-    public async Task<ActionResult<ModelWithNotifications<string?>>?> PostChangePassword(
-        ChangingPasswordModel changingPasswordModel)
-    {
-        IUser? currentUser = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-        if (currentUser is null)
-        {
-            return null;
-        }
-
-        changingPasswordModel.Id = currentUser.Id;
-
-        // all current users have access to reset/manually change their password
-
-        Attempt<PasswordChangedModel?> passwordChangeResult =
-            await _passwordChanger.ChangePasswordWithIdentityAsync(changingPasswordModel, _backOfficeUserManager, currentUser);
-
-        if (passwordChangeResult.Success)
-        {
-            // even if we weren't resetting this, it is the correct value (null), otherwise if we were resetting then it will contain the new pword
-            var result = new ModelWithNotifications<string?>(passwordChangeResult.Result?.ResetPassword);
-            result.AddSuccessNotification(_localizedTextService.Localize("user", "password"), _localizedTextService.Localize("user", "passwordChanged"));
-            return result;
-        }
-
-        if (passwordChangeResult.Result?.Error?.MemberNames is not null)
-        {
-            foreach (var memberName in passwordChangeResult.Result.Error.MemberNames)
-            {
-                ModelState.AddModelError(memberName, passwordChangeResult.Result.Error.ErrorMessage ?? string.Empty);
-            }
-        }
-
-        return ValidationProblem(ModelState);
-    }
-
-    // TODO: Why is this necessary? This inherits from UmbracoAuthorizedApiController
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
-    [ValidateAngularAntiForgeryToken]
-    public async Task<Dictionary<string, string>> GetCurrentUserLinkedLogins()
-    {
-        var userId = _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().ResultOr(0).ToString(CultureInfo.InvariantCulture);
-        if (userId is null)
-        {
-            throw new InvalidOperationException("Could not find user Id");
-        }
-
-        BackOfficeIdentityUser? identityUser = await _backOfficeUserManager.FindByIdAsync(userId);
-
-        if (identityUser is null)
-        {
-            throw new InvalidOperationException("Could not find user");
-        }
-
-        // deduplicate in case there are duplicates (there shouldn't be now since we have a unique constraint on the external logins
-        // but there didn't used to be)
-        var result = new Dictionary<string, string>();
-        foreach (IIdentityUserLogin l in identityUser.Logins)
-        {
-            result[l.LoginProvider] = l.ProviderKey;
-        }
-
-        return result;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs
deleted file mode 100644
index f6a7e4919c..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs
+++ /dev/null
@@ -1,621 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Net.Mime;
-using System.Text;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using NPoco;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers
-{
-    /// <summary>
-    /// The API controller used for editing data types
-    /// </summary>
-    /// <remarks>
-    /// The security for this controller is defined to allow full CRUD access to data types if the user has access to either:
-    /// Content Types, Member Types or Media Types ... and of course to Data Types
-    /// </remarks>
-    [PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentsOrDocumentTypes)]
-    [ParameterSwapControllerActionSelector(nameof(GetById), "id", typeof(int), typeof(Guid), typeof(Udi))]
-    public class DataTypeController : BackOfficeNotificationsController
-    {
-        private readonly PropertyEditorCollection _propertyEditors;
-        private readonly IDataTypeService _dataTypeService;
-        private readonly ContentSettings _contentSettings;
-        private readonly IUmbracoMapper _umbracoMapper;
-        private readonly PropertyEditorCollection _propertyEditorCollection;
-        private readonly IContentTypeService _contentTypeService;
-        private readonly IMediaTypeService _mediaTypeService;
-        private readonly IMemberTypeService _memberTypeService;
-        private readonly ILocalizedTextService _localizedTextService;
-        private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-        private readonly IConfigurationEditorJsonSerializer _serializer;
-        private readonly IDataTypeUsageService _dataTypeUsageService;
-
-        [Obsolete("Use constructor that takes IDataTypeUsageService, scheduled for removal in V12")]
-        public DataTypeController(
-            PropertyEditorCollection propertyEditors,
-            IDataTypeService dataTypeService,
-            IOptionsSnapshot<ContentSettings> contentSettings,
-            IUmbracoMapper umbracoMapper,
-            PropertyEditorCollection propertyEditorCollection,
-            IContentTypeService contentTypeService,
-            IMediaTypeService mediaTypeService,
-            IMemberTypeService memberTypeService,
-            ILocalizedTextService localizedTextService,
-            IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-            IConfigurationEditorJsonSerializer serializer)
-        : this(
-            propertyEditors,
-            dataTypeService,
-            contentSettings,
-            umbracoMapper,
-            propertyEditorCollection,
-            contentTypeService,
-            mediaTypeService,
-            memberTypeService,
-            localizedTextService,
-            backOfficeSecurityAccessor,
-            serializer,
-            StaticServiceProvider.Instance.GetRequiredService<IDataTypeUsageService>())
-         {
-         }
-
-        [ActivatorUtilitiesConstructor]
-        public DataTypeController(
-            PropertyEditorCollection propertyEditors,
-            IDataTypeService dataTypeService,
-            IOptionsSnapshot<ContentSettings> contentSettings,
-            IUmbracoMapper umbracoMapper,
-            PropertyEditorCollection propertyEditorCollection,
-            IContentTypeService contentTypeService,
-            IMediaTypeService mediaTypeService,
-            IMemberTypeService memberTypeService,
-            ILocalizedTextService localizedTextService,
-            IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-            IConfigurationEditorJsonSerializer serializer,
-            IDataTypeUsageService dataTypeUsageService)
-        {
-            _propertyEditors = propertyEditors ?? throw new ArgumentNullException(nameof(propertyEditors));
-            _dataTypeService = dataTypeService ?? throw new ArgumentNullException(nameof(dataTypeService));
-            _contentSettings = contentSettings.Value ?? throw new ArgumentNullException(nameof(contentSettings));
-            _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-            _propertyEditorCollection = propertyEditorCollection ?? throw new ArgumentNullException(nameof(propertyEditorCollection));
-            _contentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService));
-            _mediaTypeService = mediaTypeService ?? throw new ArgumentNullException(nameof(mediaTypeService));
-            _memberTypeService = memberTypeService ?? throw new ArgumentNullException(nameof(memberTypeService));
-            _localizedTextService = localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
-            _backOfficeSecurityAccessor = backOfficeSecurityAccessor ?? throw new ArgumentNullException(nameof(backOfficeSecurityAccessor));
-            _serializer = serializer ?? throw new ArgumentNullException(nameof(serializer));
-            _dataTypeUsageService = dataTypeUsageService ?? throw new ArgumentNullException(nameof(dataTypeUsageService));
-        }
-
-        /// <summary>
-        /// Gets data type by name
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public DataTypeDisplay? GetByName(string name)
-        {
-            var dataType = _dataTypeService.GetDataType(name);
-            return dataType == null ? null : _umbracoMapper.Map<IDataType, DataTypeDisplay>(dataType);
-        }
-
-        /// <summary>
-        /// Gets the datatype json for the datatype id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public ActionResult<DataTypeDisplay?> GetById(int id)
-        {
-            var dataType = _dataTypeService.GetDataType(id);
-            if (dataType == null)
-            {
-                return NotFound();
-            }
-
-            return _umbracoMapper.Map<IDataType, DataTypeDisplay>(dataType);
-        }
-
-        /// <summary>
-        /// Gets the datatype json for the datatype guid
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public ActionResult<DataTypeDisplay?> GetById(Guid id)
-        {
-            var dataType = _dataTypeService.GetDataType(id);
-            if (dataType == null)
-            {
-                return NotFound();
-            }
-
-            return _umbracoMapper.Map<IDataType, DataTypeDisplay>(dataType);
-        }
-
-        /// <summary>
-        /// Gets the datatype json for the datatype udi
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public ActionResult<DataTypeDisplay?> GetById(Udi id)
-        {
-            var guidUdi = id as GuidUdi;
-            if (guidUdi == null)
-                return NotFound();
-
-            var dataType = _dataTypeService.GetDataType(guidUdi.Guid);
-            if (dataType == null)
-            {
-                return NotFound();
-            }
-
-            return _umbracoMapper.Map<IDataType, DataTypeDisplay>(dataType);
-        }
-
-        /// <summary>
-        /// Deletes a data type with a given ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [HttpDelete]
-        [HttpPost]
-        public IActionResult DeleteById(int id)
-        {
-            var foundType = _dataTypeService.GetDataType(id);
-            if (foundType == null)
-            {
-                return NotFound();
-            }
-            var currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-            _dataTypeService.Delete(foundType, currentUser?.Id ?? -1);
-
-            return Ok();
-        }
-
-        public DataTypeDisplay? GetEmpty(int parentId)
-        {
-            // cannot create an "empty" data type, so use something by default.
-            var editor = _propertyEditors[Constants.PropertyEditors.Aliases.Label];
-            var dt = new DataType(editor, _serializer, parentId);
-            return _umbracoMapper.Map<IDataType, DataTypeDisplay>(dt);
-        }
-
-        /// <summary>
-        /// Returns a custom listview, based on a content type alias, if found
-        /// </summary>
-        /// <param name="contentTypeAlias"></param>
-        /// <returns>a DataTypeDisplay</returns>
-        public ActionResult<DataTypeDisplay?> GetCustomListView(string contentTypeAlias)
-        {
-            var dt = _dataTypeService.GetDataType(Constants.Conventions.DataTypes.ListViewPrefix + contentTypeAlias);
-            if (dt == null)
-            {
-                return NotFound();
-            }
-
-            return _umbracoMapper.Map<IDataType, DataTypeDisplay>(dt);
-        }
-
-        /// <summary>
-        /// Creates a custom list view - give a document type alias
-        /// </summary>
-        /// <param name="contentTypeAlias"></param>
-        /// <returns></returns>
-        public DataTypeDisplay? PostCreateCustomListView(string contentTypeAlias)
-        {
-            var dt = _dataTypeService.GetDataType(Constants.Conventions.DataTypes.ListViewPrefix + contentTypeAlias);
-
-            //if it doesn't exist yet, we will create it.
-            if (dt == null)
-            {
-                var editor = _propertyEditors[Constants.PropertyEditors.Aliases.ListView];
-                dt = new DataType(editor, _serializer) { Name = Constants.Conventions.DataTypes.ListViewPrefix + contentTypeAlias };
-                _dataTypeService.Save(dt);
-            }
-
-            return _umbracoMapper.Map<IDataType, DataTypeDisplay>(dt);
-        }
-
-        /// <summary>
-        /// Returns the pre-values for the specified property editor
-        /// </summary>
-        /// <param name="editorAlias"></param>
-        /// <param name="dataTypeId">The data type id for the pre-values, -1 if it is a new data type</param>
-        /// <returns></returns>
-        public ActionResult<IEnumerable<DataTypeConfigurationFieldDisplay>> GetPreValues(string editorAlias, int dataTypeId = -1)
-        {
-            var propEd = _propertyEditors[editorAlias];
-            if (propEd == null)
-            {
-                throw new InvalidOperationException("Could not find property editor with alias " + editorAlias);
-            }
-
-            if (dataTypeId == -1)
-            {
-                //this is a new data type, so just return the field editors with default values
-                return new ActionResult<IEnumerable<DataTypeConfigurationFieldDisplay>>(_umbracoMapper.Map<IDataEditor, IEnumerable<DataTypeConfigurationFieldDisplay>>(propEd) ?? Enumerable.Empty<DataTypeConfigurationFieldDisplay>());
-            }
-
-            //we have a data type associated
-            var dataType = _dataTypeService.GetDataType(dataTypeId);
-            if (dataType == null)
-            {
-                return NotFound();
-            }
-
-            //now, lets check if the data type has the current editor selected, if that is true
-            //we will need to wire up it's saved values. Otherwise it's an existing data type
-            //that is changing it's underlying property editor, in which case there's no values.
-            if (dataType.EditorAlias == editorAlias)
-            {
-                //this is the currently assigned pre-value editor, return with values.
-                return new ActionResult<IEnumerable<DataTypeConfigurationFieldDisplay>>(_umbracoMapper.Map<IDataType, IEnumerable<DataTypeConfigurationFieldDisplay>>(dataType) ?? Enumerable.Empty<DataTypeConfigurationFieldDisplay>());
-            }
-
-            //these are new pre-values, so just return the field editors with default values
-            return new ActionResult<IEnumerable<DataTypeConfigurationFieldDisplay>>(_umbracoMapper.Map<IDataEditor, IEnumerable<DataTypeConfigurationFieldDisplay>>(propEd) ?? Enumerable.Empty<DataTypeConfigurationFieldDisplay>());
-        }
-
-        /// <summary>
-        /// Deletes a data type container with a given ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [HttpDelete]
-        [HttpPost]
-        public IActionResult DeleteContainer(int id)
-        {
-
-            var currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-            _dataTypeService.DeleteContainer(id, currentUser?.Id ?? -1);
-
-            return Ok();
-        }
-
-        public IActionResult PostCreateContainer(int parentId, string name)
-        {
-            var currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-            var result = _dataTypeService.CreateContainer(parentId, Guid.NewGuid(), name, currentUser?.Id ?? -1);
-
-            if (result.Success)
-                return Ok(result.Result); //return the id
-            else
-                return ValidationProblem(result.Exception?.Message);
-        }
-
-        /// <summary>
-        /// Saves the data type
-        /// </summary>
-        /// <param name="dataType"></param>
-        /// <returns></returns>
-        [DataTypeValidate]
-        public ActionResult<DataTypeDisplay?> PostSave(DataTypeSave dataType)
-        {
-            //If we've made it here, then everything has been wired up and validated by the attribute
-
-            // TODO: Check if the property editor has changed, if it has ensure we don't pass the
-            // existing values to the new property editor!
-
-            // get the current configuration,
-            // get the new configuration as a dictionary (this is how we get it from model)
-            // and map to an actual configuration object
-            IConfigurationEditor? configurationEditor = dataType.PropertyEditor?.GetConfigurationEditor();
-            if (dataType.PersistedDataType is not null && configurationEditor is not null)
-            {
-                Dictionary<string, object> configurationDictionary = dataType
-                                                                         .ConfigurationFields?
-                                                                         .Where(f => f.Value is not null)
-                                                                         .ToDictionary(x => x.Key, x => x.Value!)
-                                                                     ?? new Dictionary<string, object>();
-
-                dataType.PersistedDataType.ConfigurationData = configurationEditor.FromConfigurationEditor(configurationDictionary);
-            }
-
-            var currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-            // save the data type
-            try
-            {
-                if (dataType.PersistedDataType is not null)
-                {
-                    _dataTypeService.Save(dataType.PersistedDataType, currentUser?.Id ?? -1);
-                }
-            }
-            catch (DuplicateNameException ex)
-            {
-                ModelState.AddModelError("Name", ex.Message);
-                return ValidationProblem(ModelState);
-            }
-
-            // map back to display model, and return
-            var display = _umbracoMapper.Map<IDataType, DataTypeDisplay>(dataType.PersistedDataType);
-            display?.AddSuccessNotification(_localizedTextService.Localize("speechBubbles", "dataTypeSaved"), "");
-            return display;
-        }
-
-        /// <summary>
-        /// Move the media type
-        /// </summary>
-        /// <param name="move"></param>
-        /// <returns></returns>
-        public IActionResult PostMove(MoveOrCopy move)
-        {
-            var toMove = _dataTypeService.GetDataType(move.Id);
-            if (toMove == null)
-            {
-                return NotFound();
-            }
-
-            var result = _dataTypeService.Move(toMove, move.ParentId);
-            if (result.Success)
-            {
-                return Content(toMove.Path,MediaTypeNames.Text.Plain, Encoding.UTF8);
-            }
-
-            switch (result.Result?.Result)
-            {
-                case MoveOperationStatusType.FailedParentNotFound:
-                    return NotFound();
-                case MoveOperationStatusType.FailedCancelledByEvent:
-                    return ValidationProblem();
-                case MoveOperationStatusType.FailedNotAllowedByPath:
-                    var notificationModel = new SimpleNotificationModel();
-                    notificationModel.AddErrorNotification(_localizedTextService.Localize("moveOrCopy", "notAllowedByPath"), "");
-                    return ValidationProblem(notificationModel);
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-        }
-
-        public IActionResult PostCopy(MoveOrCopy copy)
-        {
-            var toCopy = _dataTypeService.GetDataType(copy.Id);
-            if (toCopy is null)
-            {
-                return NotFound();
-            }
-
-            var currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-            Attempt<OperationResult<MoveOperationStatusType, IDataType>?> result = _dataTypeService.Copy(toCopy, copy.ParentId, currentUser?.Id ?? Constants.Security.SuperUserId);
-            if (result.Success)
-            {
-                return Content(toCopy.Path, MediaTypeNames.Text.Plain, Encoding.UTF8);
-            }
-
-            return result.Result?.Result switch
-            {
-                MoveOperationStatusType.FailedParentNotFound => NotFound(),
-                MoveOperationStatusType.FailedCancelledByEvent => ValidationProblem(),
-                MoveOperationStatusType.FailedNotAllowedByPath => ValidationProblem(
-                    _localizedTextService.Localize("moveOrCopy", "notAllowedByPath")),
-                _ => throw new ArgumentOutOfRangeException()
-            };
-        }
-
-        public IActionResult PostRenameContainer(int id, string name)
-        {
-            var currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-            var result = _dataTypeService.RenameContainer(id, name, currentUser?.Id ?? -1);
-
-            if (result.Success)
-                return Ok(result.Result);
-            else
-                return ValidationProblem(result.Exception?.Message);
-        }
-
-        /// <summary>
-        /// Returns the references (usages) for the data type
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public DataTypeReferences GetReferences(int id)
-        {
-            var result = new DataTypeReferences();
-            var usages = _dataTypeService.GetReferences(id);
-
-            // properties
-            foreach (var groupOfEntityType in usages.GroupBy(x => x.Key.EntityType))
-            {
-                //get all the GUIDs for the content types to find
-                var guidsAndPropertyAliases = groupOfEntityType.ToDictionary(i => ((GuidUdi)i.Key).Guid, i => i.Value);
-
-                if (groupOfEntityType.Key == ObjectTypes.GetUdiType(UmbracoObjectTypes.DocumentType))
-                    result.DocumentTypes = GetContentTypeUsages(_contentTypeService.GetAll(guidsAndPropertyAliases.Keys), guidsAndPropertyAliases);
-                else if (groupOfEntityType.Key == ObjectTypes.GetUdiType(UmbracoObjectTypes.MediaType))
-                    result.MediaTypes = GetContentTypeUsages(_mediaTypeService.GetAll(guidsAndPropertyAliases.Keys), guidsAndPropertyAliases);
-                else if (groupOfEntityType.Key == ObjectTypes.GetUdiType(UmbracoObjectTypes.MemberType))
-                    result.MemberTypes = GetContentTypeUsages(_memberTypeService.GetAll(guidsAndPropertyAliases.Keys), guidsAndPropertyAliases);
-            }
-
-            // ListView
-            var listViewUsages = _dataTypeService.GetListViewReferences(id);
-            foreach (var groupOfEntityType in listViewUsages.GroupBy(x => x.Key.EntityType))
-            {
-                //get all the GUIDs for the content types to find
-                var guidsAndPropertyAliases = groupOfEntityType.ToDictionary(i => ((GuidUdi)i.Key).Guid, i => i.Value);
-
-                if (groupOfEntityType.Key == ObjectTypes.GetUdiType(UmbracoObjectTypes.DocumentType))
-                    result.DocumentTypes = result.DocumentTypes.Concat(GetListViewContentTypeUsages(_contentTypeService.GetAll(guidsAndPropertyAliases.Keys), guidsAndPropertyAliases));
-                else if (groupOfEntityType.Key == ObjectTypes.GetUdiType(UmbracoObjectTypes.MediaType))
-                    result.MediaTypes = result.MediaTypes.Concat(GetListViewContentTypeUsages(_mediaTypeService.GetAll(guidsAndPropertyAliases.Keys), guidsAndPropertyAliases));
-                else if (groupOfEntityType.Key == ObjectTypes.GetUdiType(UmbracoObjectTypes.MemberType))
-                    result.MemberTypes = result.MemberTypes.Concat(GetListViewContentTypeUsages(_memberTypeService.GetAll(guidsAndPropertyAliases.Keys), guidsAndPropertyAliases));
-            }
-
-            return result;
-        }
-
-        [HttpGet]
-        public ActionResult<DataTypeHasValuesDisplay> HasValues(int id)
-        {
-            bool hasValue = _dataTypeUsageService.HasSavedValues(id);
-            return new DataTypeHasValuesDisplay(id, hasValue);
-        }
-
-        /// <summary>
-        /// Maps the found content types and usages to the resulting model
-        /// </summary>
-        /// <param name="cts"></param>
-        /// <param name="usages"></param>
-        /// <returns></returns>
-        private IEnumerable<DataTypeReferences.ContentTypeReferences> GetContentTypeUsages(
-            IEnumerable<IContentTypeBase> cts,
-            IReadOnlyDictionary<Guid, IEnumerable<string>> usages)
-        {
-            return cts.Select(x => new DataTypeReferences.ContentTypeReferences
-            {
-                Id = x.Id,
-                Key = x.Key,
-                Alias = x.Alias,
-                Icon = x.Icon,
-                Name = x.Name,
-                Udi = new GuidUdi(ObjectTypes.GetUdiType(UmbracoObjectTypes.DocumentType), x.Key),
-                //only select matching properties
-                Properties = x.PropertyTypes.Where(p => usages[x.Key].InvariantContains(p.Alias))
-                    .Select(p => new DataTypeReferences.ContentTypeReferences.PropertyTypeReferences
-                    {
-                        Alias = p.Alias,
-                        Name = p.Name
-                    })
-            });
-        }
-
-        private IEnumerable<DataTypeReferences.ContentTypeReferences> GetListViewContentTypeUsages(
-            IEnumerable<IContentTypeBase> cts,
-            IReadOnlyDictionary<Guid, IEnumerable<string>> usages) => cts.Select(x => new DataTypeReferences.ContentTypeReferences
-            {
-                Id = x.Id,
-                Key = x.Key,
-                Alias = x.Alias,
-                Icon = x.Icon,
-                Name = x.Name,
-                Udi = new GuidUdi(ObjectTypes.GetUdiType(UmbracoObjectTypes.DocumentType), x.Key),
-                ListViews = usages.GetValueOrDefault(x.Key)?.Select(lv => new DataTypeReferences.ContentTypeReferences.ListViewReferences
-                {
-                    Name = lv
-                })
-            });
-
-        #region ReadOnly actions to return basic data - allow access for: content ,media, members, settings, developer
-        /// <summary>
-        /// Gets the content json for all data types
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// Permission is granted to this method if the user has access to any of these sections: Content, media, settings, developer, members
-        /// </remarks>
-        [Authorize(Policy = AuthorizationPolicies.SectionAccessForDataTypeReading)]
-        public IEnumerable<DataTypeBasic>? GetAll()
-        {
-            return _dataTypeService
-                     .GetAll()
-                     .Select(_umbracoMapper.Map<IDataType, DataTypeBasic>).WhereNotNull().Where(x => x.IsSystemDataType == false);
-        }
-
-        /// <summary>
-        /// Returns all data types grouped by their property editor group
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// Permission is granted to this method if the user has access to any of these sections: Content, media, settings, developer, members
-        /// </remarks>
-        [Authorize(Policy = AuthorizationPolicies.SectionAccessForDataTypeReading)]
-        public IDictionary<string, IEnumerable<DataTypeBasic>>? GetGroupedDataTypes()
-        {
-            var dataTypes = _dataTypeService
-                     .GetAll()
-                     .Select(_umbracoMapper.Map<IDataType, DataTypeBasic>)
-                     .ToArray();
-
-            var propertyEditors =_propertyEditorCollection.ToArray();
-
-            if (dataTypes is not null)
-            {
-                foreach (var dataType in dataTypes)
-                {
-                    var propertyEditor = propertyEditors.SingleOrDefault(x => x.Alias == dataType?.Alias);
-                    if (propertyEditor != null && dataType is not null)
-                        dataType.HasPrevalues = propertyEditor.GetConfigurationEditor().Fields.Any();
-                }
-
-
-            }
-
-            var grouped = dataTypes?.WhereNotNull()
-                .GroupBy(x => string.Empty)
-                .ToDictionary(group => group.Key, group => group.OrderBy(d => d.Name).AsEnumerable());
-
-            return grouped;
-        }
-
-        /// <summary>
-        /// Returns all property editors grouped
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// Permission is granted to this method if the user has access to any of these sections: Content, media, settings, developer, members
-        /// </remarks>
-        [Authorize(Policy = AuthorizationPolicies.SectionAccessForDataTypeReading)]
-        public IDictionary<string, IEnumerable<DataTypeBasic>> GetGroupedPropertyEditors()
-        {
-            var datatypes = new List<DataTypeBasic>();
-            var showDeprecatedPropertyEditors = _contentSettings.ShowDeprecatedPropertyEditors;
-
-            var propertyEditors =_propertyEditorCollection
-                .Where(x=>x.IsDeprecated == false || showDeprecatedPropertyEditors);
-            foreach (var propertyEditor in propertyEditors)
-            {
-                var hasPrevalues = propertyEditor.GetConfigurationEditor().Fields.Any();
-                var basic = _umbracoMapper.Map<DataTypeBasic>(propertyEditor);
-                if (basic is not null)
-                {
-                    basic.HasPrevalues = hasPrevalues;
-                    datatypes.Add(basic);
-                }
-            }
-
-            var grouped = Enumerable.ToDictionary(datatypes
-                    .GroupBy(x => string.Empty), group => group.Key, group => group.OrderBy(d => d.Name).AsEnumerable());
-
-            return grouped;
-        }
-
-
-        /// <summary>
-        /// Gets all property editors defined
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// Permission is granted to this method if the user has access to any of these sections: Content, media, settings, developer, members
-        /// </remarks>
-        [Authorize(Policy = AuthorizationPolicies.SectionAccessForDataTypeReading)]
-        public IEnumerable<PropertyEditorBasic> GetAllPropertyEditors()
-        {
-            return _propertyEditorCollection
-                .OrderBy(x => x.Alias)
-                .Select(_umbracoMapper.Map<PropertyEditorBasic>).WhereNotNull();
-        }
-        #endregion
-    }
-}
-
diff --git a/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs b/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs
deleted file mode 100644
index 2b55ea5155..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs
+++ /dev/null
@@ -1,569 +0,0 @@
-using System.Xml;
-using System.Globalization;
-using System.Net.Mime;
-using System.Text;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-using Umbraco.Cms.Infrastructure.Packaging;
-using System.Xml.Linq;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <inheritdoc />
-/// <summary>
-///     The API controller used for editing dictionary items
-/// </summary>
-/// <remarks>
-///     The security for this controller is defined to allow full CRUD access to dictionary if the user has access to
-///     either:
-///     Dictionary
-/// </remarks>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessDictionary)]
-[ParameterSwapControllerActionSelector(nameof(GetById), "id", typeof(int), typeof(Guid), typeof(Udi))]
-public class DictionaryController : BackOfficeNotificationsController
-{
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly GlobalSettings _globalSettings;
-    private readonly ILocalizationService _localizationService;
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly ILogger<DictionaryController> _logger;
-    private readonly IUmbracoMapper _umbracoMapper;
-    private readonly IEntityXmlSerializer _serializer;
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly PackageDataInstallation _packageDataInstallation;
-
-    [ActivatorUtilitiesConstructor]
-    public DictionaryController(
-        ILogger<DictionaryController> logger,
-        ILocalizationService localizationService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IOptionsSnapshot<GlobalSettings> globalSettings,
-        ILocalizedTextService localizedTextService,
-        IUmbracoMapper umbracoMapper,
-        IEntityXmlSerializer serializer,
-        IHostingEnvironment hostingEnvironment,
-        PackageDataInstallation packageDataInstallation)
-    {
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        _localizationService = localizationService ?? throw new ArgumentNullException(nameof(localizationService));
-        _backofficeSecurityAccessor = backofficeSecurityAccessor ?? throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
-        _globalSettings = globalSettings.Value ?? throw new ArgumentNullException(nameof(globalSettings));
-        _localizedTextService = localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _serializer = serializer ?? throw new ArgumentNullException(nameof(serializer));
-        _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
-        _packageDataInstallation = packageDataInstallation ?? throw new ArgumentNullException(nameof(packageDataInstallation));
-    }
-
-    [Obsolete("Please use ctor that also takes an IEntityXmlSerializer, IHostingEnvironment & PackageDataInstallation instead, scheduled for removal in v12")]
-    public DictionaryController(
-        ILogger<DictionaryController> logger,
-        ILocalizationService localizationService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IOptionsSnapshot<GlobalSettings> globalSettings,
-        ILocalizedTextService localizedTextService,
-        IUmbracoMapper umbracoMapper)
-    : this(
-        logger,
-        localizationService,
-        backofficeSecurityAccessor,
-        globalSettings,
-        localizedTextService,
-        umbracoMapper,
-        StaticServiceProvider.Instance.GetRequiredService<IEntityXmlSerializer>(),
-        StaticServiceProvider.Instance.GetRequiredService<IHostingEnvironment>(),
-        StaticServiceProvider.Instance.GetRequiredService<PackageDataInstallation>())
-    {
-    }
-
-    /// <summary>
-    ///     Deletes a data type with a given ID
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns>
-    ///     <see cref="HttpResponseMessage" />
-    /// </returns>
-    [HttpDelete]
-    [HttpPost]
-    public IActionResult DeleteById(int id)
-    {
-        IDictionaryItem? foundDictionary = _localizationService.GetDictionaryItemById(id);
-
-        if (foundDictionary == null)
-        {
-            return NotFound();
-        }
-
-        IEnumerable<IDictionaryItem> foundDictionaryDescendants =
-            _localizationService.GetDictionaryItemDescendants(foundDictionary.Key);
-
-        foreach (IDictionaryItem dictionaryItem in foundDictionaryDescendants)
-        {
-            _localizationService.Delete(dictionaryItem, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-        }
-
-        _localizationService.Delete(foundDictionary, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-
-        return Ok();
-    }
-
-    /// <summary>
-    ///     Creates a new dictionary item
-    /// </summary>
-    /// <param name="parentId">
-    ///     The parent id.
-    /// </param>
-    /// <param name="key">
-    ///     The key.
-    /// </param>
-    /// <returns>
-    ///     The <see cref="HttpResponseMessage" />.
-    /// </returns>
-    [HttpPost]
-    public ActionResult<int> Create(int parentId, string key)
-    {
-        if (string.IsNullOrEmpty(key))
-        {
-            return ValidationProblem("Key can not be empty."); // TODO: translate
-        }
-
-        if (_localizationService.DictionaryItemExists(key))
-        {
-            var message = _localizedTextService.Localize(
-                "dictionaryItem",
-                "changeKeyError",
-                _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.GetUserCulture(_localizedTextService, _globalSettings),
-                new Dictionary<string, string?>
-                {
-                    {"0", key}
-                });
-            return ValidationProblem(message);
-        }
-
-        try
-        {
-            Guid? parentGuid = null;
-
-            if (parentId > 0)
-            {
-                parentGuid = _localizationService.GetDictionaryItemById(parentId)?.Key;
-            }
-
-            IDictionaryItem item = _localizationService.CreateDictionaryItemWithIdentity(
-                key,
-                parentGuid,
-                string.Empty);
-
-
-            return item.Id;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error creating dictionary with {Name} under {ParentId}", key, parentId);
-            return ValidationProblem("Error creating dictionary item");
-        }
-    }
-
-    /// <summary>
-    ///     Gets a dictionary item by id
-    /// </summary>
-    /// <param name="id">
-    ///     The id.
-    /// </param>
-    /// <returns>
-    ///     The <see cref="DictionaryDisplay" />. Returns a not found response when dictionary item does not exist
-    /// </returns>
-    public ActionResult<DictionaryDisplay?> GetById(int id)
-    {
-        IDictionaryItem? dictionary = _localizationService.GetDictionaryItemById(id);
-        if (dictionary == null)
-        {
-            return NotFound();
-        }
-
-        return _umbracoMapper.Map<IDictionaryItem, DictionaryDisplay>(dictionary);
-    }
-
-    /// <summary>
-    ///     Gets a dictionary item by guid
-    /// </summary>
-    /// <param name="id">
-    ///     The id.
-    /// </param>
-    /// <returns>
-    ///     The <see cref="DictionaryDisplay" />. Returns a not found response when dictionary item does not exist
-    /// </returns>
-    public ActionResult<DictionaryDisplay?> GetById(Guid id)
-    {
-        IDictionaryItem? dictionary = _localizationService.GetDictionaryItemById(id);
-        if (dictionary == null)
-        {
-            return NotFound();
-        }
-
-        return _umbracoMapper.Map<IDictionaryItem, DictionaryDisplay>(dictionary);
-    }
-
-    /// <summary>
-    ///     Gets a dictionary item by udi
-    /// </summary>
-    /// <param name="id">
-    ///     The id.
-    /// </param>
-    /// <returns>
-    ///     The <see cref="DictionaryDisplay" />. Returns a not found response when dictionary item does not exist
-    /// </returns>
-    public ActionResult<DictionaryDisplay?> GetById(Udi id)
-    {
-        var guidUdi = id as GuidUdi;
-        if (guidUdi == null)
-        {
-            return NotFound();
-        }
-
-        IDictionaryItem? dictionary = _localizationService.GetDictionaryItemById(guidUdi.Guid);
-        if (dictionary == null)
-        {
-            return NotFound();
-        }
-
-        return _umbracoMapper.Map<IDictionaryItem, DictionaryDisplay>(dictionary);
-    }
-
-    /// <summary>
-    ///     Changes the structure for dictionary items
-    /// </summary>
-    /// <param name="move"></param>
-    /// <returns></returns>
-    public IActionResult? PostMove(MoveOrCopy move)
-    {
-        IDictionaryItem? dictionaryItem = _localizationService.GetDictionaryItemById(move.Id);
-        if (dictionaryItem == null)
-        {
-            return ValidationProblem(_localizedTextService.Localize("dictionary", "itemDoesNotExists"));
-        }
-
-        if(dictionaryItem.ParentId == null && move.ParentId == Constants.System.Root)
-        {
-            return ValidationProblem(_localizedTextService.Localize("moveOrCopy", "notAllowedByPath"));
-        }
-
-        IDictionaryItem? parent = _localizationService.GetDictionaryItemById(move.ParentId);
-        if (parent == null)
-        {
-            if (move.ParentId == Constants.System.Root)
-            {
-                dictionaryItem.ParentId = null;
-            }
-            else
-            {
-                return ValidationProblem(_localizedTextService.Localize("dictionary", "parentDoesNotExists"));
-            }
-        }
-        else
-        {
-            if (dictionaryItem.ParentId == parent.Key)
-            {
-                return ValidationProblem(_localizedTextService.Localize("moveOrCopy", "notAllowedByPath"));
-            }
-
-            dictionaryItem.ParentId = parent.Key;
-            if (dictionaryItem.Key == parent.ParentId)
-            {
-                return ValidationProblem(_localizedTextService.Localize("moveOrCopy", "notAllowedByPath"));
-            }
-        }
-
-        _localizationService.Save(dictionaryItem);
-
-        DictionaryDisplay? model = _umbracoMapper.Map<IDictionaryItem, DictionaryDisplay>(dictionaryItem);
-
-        return Content(model!.Path, MediaTypeNames.Text.Plain, Encoding.UTF8);
-    }
-
-    /// <summary>
-    ///     Saves a dictionary item
-    /// </summary>
-    /// <param name="dictionary">
-    ///     The dictionary.
-    /// </param>
-    /// <returns>
-    ///     The <see cref="DictionaryDisplay" />.
-    /// </returns>
-    public ActionResult<DictionaryDisplay?> PostSave(DictionarySave dictionary)
-    {
-        IDictionaryItem? dictionaryItem = dictionary.Id is null
-            ? null
-            : _localizationService.GetDictionaryItemById(int.Parse(dictionary.Id.ToString()!, CultureInfo.InvariantCulture));
-
-        if (dictionaryItem == null)
-        {
-            return ValidationProblem("Dictionary item does not exist");
-        }
-
-        var currentUser = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-        CultureInfo? userCulture = currentUser?.GetUserCulture(_localizedTextService, _globalSettings);
-
-        if (dictionary.NameIsDirty)
-        {
-            // if the name (key) has changed, we need to check if the new key does not exist
-            IDictionaryItem? dictionaryByKey = _localizationService.GetDictionaryItemByKey(dictionary.Name!);
-
-            if (dictionaryByKey != null && dictionaryItem.Id != dictionaryByKey.Id)
-            {
-                var message = _localizedTextService.Localize(
-                    "dictionaryItem",
-                    "changeKeyError",
-                    userCulture,
-                    new Dictionary<string, string?> { { "0", dictionary.Name } });
-                ModelState.AddModelError("Name", message);
-                return ValidationProblem(ModelState);
-            }
-
-            dictionaryItem.ItemKey = dictionary.Name!;
-        }
-
-        var allowedLanguageIds = currentUser?.CalculateAllowedLanguageIds(_localizationService);
-        var allowedLanguageIdHashSet =allowedLanguageIds is null ? new HashSet<int>() : new HashSet<int>(allowedLanguageIds);
-
-        foreach (DictionaryTranslationSave translation in dictionary.Translations)
-        {
-            if (allowedLanguageIdHashSet.Contains(translation.LanguageId))
-            {
-                _localizationService.AddOrUpdateDictionaryValue(dictionaryItem, _localizationService.GetLanguageById(translation.LanguageId), translation.Translation);
-            }
-        }
-
-        try
-        {
-            _localizationService.Save(dictionaryItem);
-
-            DictionaryDisplay? model = _umbracoMapper.Map<IDictionaryItem, DictionaryDisplay>(dictionaryItem);
-
-            model?.Notifications.Add(new BackOfficeNotification(
-                _localizedTextService.Localize("speechBubbles", "dictionaryItemSaved", userCulture), string.Empty, NotificationStyle.Success));
-
-            return model;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error saving dictionary with {Name} under {ParentId}", dictionary.Name, dictionary.ParentId);
-            return ValidationProblem("Something went wrong saving dictionary");
-        }
-    }
-
-    /// <summary>
-    ///     Retrieves a list with all dictionary items
-    /// </summary>
-    /// <returns>
-    ///     The <see cref="IEnumerable{T}" />.
-    /// </returns>
-    public IEnumerable<DictionaryOverviewDisplay> GetList()
-    {
-        IDictionaryItem[] items = _localizationService.GetDictionaryItemDescendants(null).ToArray();
-        var list = new List<DictionaryOverviewDisplay>(items.Length);
-
-        // recursive method to build a tree structure from the flat structure returned above
-        void BuildTree(int level = 0, Guid? parentId = null)
-        {
-            IDictionaryItem[] children = items.Where(t => t.ParentId == parentId).ToArray();
-            if (children.Any() == false)
-            {
-                return;
-            }
-
-            foreach (IDictionaryItem child in children.OrderBy(ItemSort()))
-            {
-                DictionaryOverviewDisplay? display =
-                    _umbracoMapper.Map<IDictionaryItem, DictionaryOverviewDisplay>(child);
-                if (display is not null)
-                {
-                    display.Level = level;
-                    list.Add(display);
-                }
-
-                BuildTree(level + 1, child.Key);
-            }
-        }
-
-        BuildTree();
-
-        return list;
-    }
-
-    /// <summary>
-    ///     Get child items for list.
-    /// </summary>
-    /// <param name="dictionaryItem">
-    ///     The dictionary item.
-    /// </param>
-    /// <param name="level">
-    ///     The level.
-    /// </param>
-    /// <param name="list">
-    ///     The list.
-    /// </param>
-    private void GetChildItemsForList(IDictionaryItem dictionaryItem, int level, ICollection<DictionaryOverviewDisplay> list)
-    {
-        foreach (IDictionaryItem childItem in _localizationService.GetDictionaryItemChildren(dictionaryItem.Key)
-                     ?.OrderBy(ItemSort()) ?? Enumerable.Empty<IDictionaryItem>())
-        {
-            DictionaryOverviewDisplay? item = _umbracoMapper.Map<IDictionaryItem, DictionaryOverviewDisplay>(childItem);
-            if (item is not null)
-            {
-                item.Level = level;
-                list.Add(item);
-            }
-
-            GetChildItemsForList(childItem, level + 1, list);
-        }
-    }
-
-    public IActionResult ExportDictionary(int id, bool includeChildren = false)
-    {
-        IDictionaryItem? dictionaryItem = _localizationService.GetDictionaryItemById(id);
-        if (dictionaryItem == null)
-        {
-            throw new NullReferenceException("No dictionary item found with id " + id);
-        }
-
-        XElement xml = _serializer.Serialize(dictionaryItem, includeChildren);
-
-        var fileName = $"{dictionaryItem.ItemKey}.udt";
-        // Set custom header so umbRequestHelper.downloadFile can save the correct filename
-        HttpContext.Response.Headers.Add("x-filename", fileName);
-
-        return File(Encoding.UTF8.GetBytes(xml.ToDataString()), MediaTypeNames.Application.Octet, fileName);
-    }
-
-    public IActionResult ImportDictionary(string file, int parentId)
-    {
-        if (string.IsNullOrWhiteSpace(file))
-        {
-            return NotFound();
-        }
-
-        var filePath = Path.Combine(_hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.Data), file);
-        if (!System.IO.File.Exists(filePath))
-        {
-            return NotFound();
-        }
-
-        var xd = new XmlDocument { XmlResolver = null };
-        xd.Load(filePath);
-
-        var userId = _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? 0;
-        var element = XElement.Parse(xd.InnerXml);
-
-        IDictionaryItem? parentDictionaryItem = _localizationService.GetDictionaryItemById(parentId);
-        IEnumerable<IDictionaryItem> dictionaryItems = _packageDataInstallation
-            .ImportDictionaryItem(element, userId, parentDictionaryItem?.Key);
-
-        // Try to clean up the temporary file.
-        try
-        {
-            System.IO.File.Delete(filePath);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error cleaning up temporary udt file in {File}", filePath);
-        }
-
-        var model = _umbracoMapper.Map<IDictionaryItem, DictionaryDisplay>(dictionaryItems.FirstOrDefault());
-        return Content(model!.Path, MediaTypeNames.Text.Plain, Encoding.UTF8);
-    }
-
-    public ActionResult<DictionaryImportModel> Upload(IFormFile file)
-    {
-        if (file == null)
-        {
-            return ValidationProblem(
-                _localizedTextService.Localize("media", "failedFileUpload"),
-                _localizedTextService.Localize("speechBubbles", "fileErrorNotFound"));
-        }
-
-        var fileName = file.FileName.Trim(Constants.CharArrays.DoubleQuote);
-        var ext = fileName.Substring(fileName.LastIndexOf('.') + 1).ToLower();
-        var root = _hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempFileUploads);
-        var tempPath = Path.Combine(root, fileName);
-
-        if (!Path.GetFullPath(tempPath).StartsWith(Path.GetFullPath(root)))
-        {
-            return ValidationProblem(
-                _localizedTextService.Localize("media", "failedFileUpload"),
-                _localizedTextService.Localize("media", "invalidFileName"));
-        }
-
-        if (!ext.InvariantEquals("udt"))
-        {
-            return ValidationProblem(
-                _localizedTextService.Localize("media", "failedFileUpload"),
-                _localizedTextService.Localize("media", "disallowedFileType"));
-        }
-
-        using (FileStream stream = System.IO.File.Create(tempPath))
-        {
-            file.CopyToAsync(stream).GetAwaiter().GetResult();
-        }
-
-        var xd = new XmlDocument { XmlResolver = null };
-        xd.Load(tempPath);
-
-        if (xd.DocumentElement == null)
-        {
-            return ValidationProblem(
-                _localizedTextService.Localize("media", "failedFileUpload"),
-                _localizedTextService.Localize("speechBubbles", "fileErrorNotFound"));
-        }
-
-        var model = new DictionaryImportModel()
-        {
-            TempFileName = tempPath,
-            DictionaryItems = new List<DictionaryPreviewImportModel>(),
-        };
-
-        var level = 1;
-        var currentParent = string.Empty;
-        foreach (XmlNode dictionaryItem in xd.GetElementsByTagName("DictionaryItem"))
-        {
-            var name = dictionaryItem.Attributes?.GetNamedItem("Name")?.Value ?? string.Empty;
-            var parentKey = dictionaryItem?.ParentNode?.Attributes?.GetNamedItem("Key")?.Value ?? string.Empty;
-
-            if (parentKey != currentParent || level == 1)
-            {
-                level += 1;
-                currentParent = parentKey;
-            }
-
-            model.DictionaryItems.Add(new DictionaryPreviewImportModel() { Level = level, Name = name });
-        }
-
-        if (!model.DictionaryItems.Any())
-        {
-            return ValidationProblem(
-                _localizedTextService.Localize("media", "failedFileUpload"),
-                _localizedTextService.Localize("dictionary", "noItemsInFile"));
-        }
-
-        return model;
-    }
-
-    private static Func<IDictionaryItem, string> ItemSort() => item => item.ItemKey;
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/ElementTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/ElementTypeController.cs
deleted file mode 100644
index c2710c57c9..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/ElementTypeController.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController("UmbracoApi")]
-public class ElementTypeController : UmbracoAuthorizedJsonController
-{
-    private readonly IContentTypeService _contentTypeService;
-
-    public ElementTypeController(IContentTypeService contentTypeService) => _contentTypeService = contentTypeService;
-
-    [HttpGet]
-    public IEnumerable<object> GetAll() =>
-        _contentTypeService
-            .GetAllElementTypes()
-            .OrderBy(x => x.SortOrder)
-            .Select(x => new
-            {
-                id = x.Id,
-                key = x.Key,
-                name = x.Name,
-                description = x.Description,
-                alias = x.Alias,
-                icon = x.Icon
-            });
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs b/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
deleted file mode 100644
index f37031d841..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
+++ /dev/null
@@ -1,1745 +0,0 @@
-using System.Collections.Concurrent;
-using System.Dynamic;
-using System.Globalization;
-using System.IO;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Security.Cryptography;
-using Examine.Search;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.Models.TemplateQuery;
-using Umbraco.Cms.Core.Persistence;
-using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.DynamicRoot;
-using Umbraco.Cms.Core.DynamicRoot.QuerySteps;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Core.Xml;
-using Umbraco.Cms.Infrastructure.Persistence;
-using Umbraco.Cms.Infrastructure.Search;
-using Umbraco.Cms.Web.BackOffice.ModelBinders;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.ModelBinders;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     The API controller used for getting entity objects, basic name, icon, id representation of umbraco objects that are
-///     based on CMSNode
-/// </summary>
-/// <remarks>
-///     <para>
-///         This controller allows resolving basic entity data for various entities without placing the hard restrictions
-///         on users that may not have access
-///         to the sections these entities entities exist in. This is to allow pickers, etc... of data to work for all
-///         users. In some cases such as accessing
-///         Members, more explicit security checks are done.
-///     </para>
-///     <para>Some objects such as macros are not based on CMSNode</para>
-/// </remarks>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[ParameterSwapControllerActionSelector(nameof(GetAncestors), "id", typeof(int), typeof(Guid))]
-[ParameterSwapControllerActionSelector(nameof(GetPagedChildren), "id", typeof(int), typeof(string))]
-[ParameterSwapControllerActionSelector(nameof(GetPath), "id", typeof(int), typeof(Guid), typeof(Udi))]
-[ParameterSwapControllerActionSelector(nameof(GetUrlAndAnchors), "id", typeof(int), typeof(Guid), typeof(Udi))]
-[ParameterSwapControllerActionSelector(nameof(GetById), "id", typeof(int), typeof(Guid), typeof(Udi))]
-[ParameterSwapControllerActionSelector(nameof(GetByIds), "ids", typeof(int[]), typeof(Guid[]), typeof(Udi[]))]
-[ParameterSwapControllerActionSelector(nameof(GetUrl), "id", typeof(int), typeof(Udi))]
-[ParameterSwapControllerActionSelector(nameof(GetUrlsByIds), "ids", typeof(int[]), typeof(Guid[]), typeof(Udi[]))]
-public class EntityController : UmbracoAuthorizedJsonController
-{
-    private static readonly string[] _postFilterSplitStrings = { "=", "==", "!=", "<>", ">", "<", ">=", "<=" };
-
-    private readonly AppCaches _appCaches;
-    private readonly IDynamicRootService _dynamicRootService;
-    private readonly IVariationContextAccessor _variationContextAccessor;
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IContentService _contentService;
-    private readonly IContentTypeService _contentTypeService;
-    private readonly IDataTypeService _dataTypeService;
-    private readonly IEntityService _entityService;
-    private readonly IFileService _fileService;
-    private readonly ILocalizationService _localizationService;
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly IMacroService _macroService;
-    private readonly IMediaTypeService _mediaTypeService;
-    private readonly IPublishedContentQuery _publishedContentQuery;
-    private readonly IPublishedUrlProvider _publishedUrlProvider;
-    private readonly SearchableTreeCollection _searchableTreeCollection;
-    private readonly IShortStringHelper _shortStringHelper;
-    private readonly ISqlContext _sqlContext;
-    private readonly UmbracoTreeSearcher _treeSearcher;
-    private readonly ITreeService _treeService;
-    private readonly IUmbracoMapper _umbracoMapper;
-    private readonly IUserService _userService;
-
-    [ActivatorUtilitiesConstructor]
-    public EntityController(
-        ITreeService treeService,
-        UmbracoTreeSearcher treeSearcher,
-        SearchableTreeCollection searchableTreeCollection,
-        IPublishedContentQuery publishedContentQuery,
-        IShortStringHelper shortStringHelper,
-        IEntityService entityService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IPublishedUrlProvider publishedUrlProvider,
-        IContentService contentService,
-        IUmbracoMapper umbracoMapper,
-        IDataTypeService dataTypeService,
-        ISqlContext sqlContext,
-        ILocalizedTextService localizedTextService,
-        IFileService fileService,
-        IContentTypeService contentTypeService,
-        IMediaTypeService mediaTypeService,
-        IMacroService macroService,
-        IUserService userService,
-        ILocalizationService localizationService,
-        AppCaches appCaches,
-        IDynamicRootService dynamicRootService,
-        IVariationContextAccessor variationContextAccessor)
-    {
-        _treeService = treeService ?? throw new ArgumentNullException(nameof(treeService));
-        _treeSearcher = treeSearcher ?? throw new ArgumentNullException(nameof(treeSearcher));
-        _searchableTreeCollection = searchableTreeCollection ??
-                                    throw new ArgumentNullException(nameof(searchableTreeCollection));
-        _publishedContentQuery =
-            publishedContentQuery ?? throw new ArgumentNullException(nameof(publishedContentQuery));
-        _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
-        _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
-        _backofficeSecurityAccessor = backofficeSecurityAccessor ??
-                                      throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
-        _publishedUrlProvider =
-            publishedUrlProvider ?? throw new ArgumentNullException(nameof(publishedUrlProvider));
-        _contentService = contentService ?? throw new ArgumentNullException(nameof(contentService));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _dataTypeService = dataTypeService ?? throw new ArgumentNullException(nameof(dataTypeService));
-        _sqlContext = sqlContext ?? throw new ArgumentNullException(nameof(sqlContext));
-        _localizedTextService =
-            localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
-        _fileService = fileService ?? throw new ArgumentNullException(nameof(fileService));
-        _contentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService));
-        _mediaTypeService = mediaTypeService ?? throw new ArgumentNullException(nameof(mediaTypeService));
-        _macroService = macroService ?? throw new ArgumentNullException(nameof(macroService));
-        _userService = userService ?? throw new ArgumentNullException(nameof(userService));
-        _localizationService = localizationService ?? throw new ArgumentNullException(nameof(localizationService));
-        _appCaches = appCaches ?? throw new ArgumentNullException(nameof(appCaches));
-        _dynamicRootService = dynamicRootService;
-        _variationContextAccessor = variationContextAccessor;
-    }
-
-    [Obsolete("Use non-obsolete ctor. This will be removed in Umbraco 14.")]
-    public EntityController(
-        ITreeService treeService,
-        UmbracoTreeSearcher treeSearcher,
-        SearchableTreeCollection searchableTreeCollection,
-        IPublishedContentQuery publishedContentQuery,
-        IShortStringHelper shortStringHelper,
-        IEntityService entityService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IPublishedUrlProvider publishedUrlProvider,
-        IContentService contentService,
-        IUmbracoMapper umbracoMapper,
-        IDataTypeService dataTypeService,
-        ISqlContext sqlContext,
-        ILocalizedTextService localizedTextService,
-        IFileService fileService,
-        IContentTypeService contentTypeService,
-        IMediaTypeService mediaTypeService,
-        IMacroService macroService,
-        IUserService userService,
-        ILocalizationService localizationService,
-        AppCaches appCaches): this(
-        treeService,
-        treeSearcher,
-        searchableTreeCollection,
-        publishedContentQuery,
-        shortStringHelper,
-        entityService,
-        backofficeSecurityAccessor,
-        publishedUrlProvider,
-        contentService,
-        umbracoMapper,
-        dataTypeService,
-        sqlContext,
-        localizedTextService,
-        fileService,
-        contentTypeService,
-        mediaTypeService,
-        macroService,
-        userService,
-        localizationService,
-        appCaches,
-        StaticServiceProvider.Instance.GetRequiredService<IDynamicRootService>(),
-        StaticServiceProvider.Instance.GetRequiredService<IVariationContextAccessor>())
-    {
-
-    }
-
-
-    /// <summary>
-    ///     Returns an Umbraco alias given a string
-    /// </summary>
-    /// <param name="value"></param>
-    /// <param name="camelCase"></param>
-    /// <returns></returns>
-    public dynamic GetSafeAlias(string value, bool camelCase = true)
-    {
-        var returnValue = string.IsNullOrWhiteSpace(value)
-            ? string.Empty
-            : value.ToSafeAlias(_shortStringHelper, camelCase);
-        dynamic returnObj = new ExpandoObject();
-        returnObj.alias = returnValue;
-        returnObj.original = value;
-        returnObj.camelCase = camelCase;
-
-        return returnObj;
-    }
-
-    /// <summary>
-    ///     Searches for results based on the entity type
-    /// </summary>
-    /// <param name="query"></param>
-    /// <param name="type"></param>
-    /// <param name="searchFrom">
-    ///     A starting point for the search, generally a node id, but for members this is a member type alias
-    /// </param>
-    /// <param name="dataTypeKey">If set used to look up whether user and group start node permissions will be ignored.</param>
-    /// <returns></returns>
-    [HttpGet]
-    public IEnumerable<EntityBasic> Search(string query, UmbracoEntityTypes type, string? searchFrom = null, Guid? dataTypeKey = null)
-    {
-        // NOTE: Theoretically you shouldn't be able to see member data if you don't have access to members right? ... but there is a member picker, so can't really do that
-
-        if (string.IsNullOrEmpty(query))
-        {
-            return Enumerable.Empty<EntityBasic>();
-        }
-
-        //TODO: This uses the internal UmbracoTreeSearcher, this instead should delgate to the ISearchableTree implementation for the type
-
-        var ignoreUserStartNodes = dataTypeKey.HasValue &&
-                                   _dataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeKey.Value);
-        return ExamineSearch(query, type, searchFrom, ignoreUserStartNodes);
-    }
-
-        /// <summary>
-        ///     Searches for all content that the user is allowed to see (based on their allowed sections)
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        /// <remarks>
-        ///     Even though a normal entity search will allow any user to search on a entity type that they may not have access to
-        ///     edit, we need
-        ///     to filter these results to the sections they are allowed to edit since this search function is explicitly for the
-        ///     global search
-        ///     so if we showed entities that they weren't allowed to edit they would get errors when clicking on the result.
-        ///     The reason a user is allowed to search individual entity types that they are not allowed to edit is because those
-        ///     search
-        ///     methods might be used in things like pickers in the content editor.
-        /// </remarks>
-        [HttpGet]
-        public async Task<IDictionary<string, TreeSearchResult>> SearchAll(string query)
-        {
-            if (string.IsNullOrEmpty(query))
-            {
-                return new Dictionary<string, TreeSearchResult>();
-            }
-
-            var culture = ClientCulture();
-            var allowedSections = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.AllowedSections.ToArray();
-
-            var searchTasks = new List<Task<KeyValuePair<string, TreeSearchResult>>>();
-            foreach (KeyValuePair<string, SearchableApplicationTree> searchableTree in _searchableTreeCollection
-                         .SearchableApplicationTrees.OrderBy(t => t.Value.SortOrder))
-            {
-                if (allowedSections?.Contains(searchableTree.Value.AppAlias) ?? false)
-                {
-                    Tree? tree = _treeService.GetByAlias(searchableTree.Key);
-                    if (tree == null)
-                    {
-                        continue; //shouldn't occur
-                    }
-
-                    var rootNodeDisplayName = Tree.GetRootNodeDisplayName(tree, _localizedTextService);
-                    if (rootNodeDisplayName is not null)
-                    {
-                        searchTasks.Add(ExecuteSearchAsync(query, culture, searchableTree, rootNodeDisplayName));
-                    }
-                }
-            }
-
-            var taskResults = await Task.WhenAll(searchTasks);
-
-            return new Dictionary<string, TreeSearchResult>(taskResults);
-        }
-
-        private static async Task<KeyValuePair<string, TreeSearchResult>> ExecuteSearchAsync(
-            string query,
-            string? culture,
-            KeyValuePair<string, SearchableApplicationTree> searchableTree,
-            string rootNodeDisplayName)
-        {
-            ISearchableTree searcher = searchableTree.Value.SearchableTree;
-            const int pageSize = 200;
-            IEnumerable<SearchResultEntity> results = (
-                searcher is ISearchableTreeWithCulture searcherWithCulture
-                    ? await searcherWithCulture.SearchAsync(query, pageSize, 0, culture: culture)
-                    : await searcher.SearchAsync(query, pageSize, 0))
-            .WhereNotNull();
-
-            var searchResult = new TreeSearchResult
-            {
-                Results = results,
-                TreeAlias = searchableTree.Key,
-                AppAlias = searchableTree.Value.AppAlias,
-                JsFormatterService = searchableTree.Value.FormatterService,
-                JsFormatterMethod = searchableTree.Value.FormatterMethod
-            };
-
-            return new KeyValuePair<string, TreeSearchResult>(rootNodeDisplayName, searchResult);
-        }
-
-        /// <summary>
-        ///     Gets the path for a given node ID
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public IConvertToActionResult GetPath(int id, UmbracoEntityTypes type)
-        {
-            ActionResult<EntityBasic?> foundContentResult = GetResultForId(id, type);
-            EntityBasic? foundContent = foundContentResult.Value;
-            if (foundContent is null)
-            {
-                return foundContentResult;
-            }
-
-        return new ActionResult<IEnumerable<int>>(foundContent.Path
-            .Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).Select(
-                s => int.Parse(s, CultureInfo.InvariantCulture)));
-    }
-
-    /// <summary>
-    ///     Gets the path for a given node ID
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="type"></param>
-    /// <returns></returns>
-    public IConvertToActionResult GetPath(Guid id, UmbracoEntityTypes type)
-    {
-        ActionResult<EntityBasic?> foundContentResult = GetResultForKey(id, type);
-        EntityBasic? foundContent = foundContentResult.Value;
-        if (foundContent is null)
-        {
-            return foundContentResult;
-        }
-
-        return new ActionResult<IEnumerable<int>>(foundContent.Path
-            .Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).Select(
-                s => int.Parse(s, CultureInfo.InvariantCulture)));
-    }
-
-    /// <summary>
-    ///     Gets the path for a given node ID
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="type"></param>
-    /// <returns></returns>
-    public IActionResult GetPath(Udi id, UmbracoEntityTypes type)
-    {
-        var guidUdi = id as GuidUdi;
-        if (guidUdi != null)
-        {
-            return GetPath(guidUdi.Guid, type).Convert();
-        }
-
-        return NotFound();
-    }
-
-    /// <summary>
-    ///     Gets the URL of an entity
-    /// </summary>
-    /// <param name="id">UDI of the entity to fetch URL for</param>
-    /// <param name="culture">The culture to fetch the URL for</param>
-    /// <returns>The URL or path to the item</returns>
-    public IActionResult GetUrl(Udi id, string culture = "*")
-    {
-        Attempt<int> intId = _entityService.GetId(id);
-        if (!intId.Success)
-        {
-            return NotFound();
-        }
-
-        UmbracoEntityTypes entityType;
-        switch (id.EntityType)
-        {
-            case Constants.UdiEntityType.Document:
-                entityType = UmbracoEntityTypes.Document;
-                break;
-            case Constants.UdiEntityType.Media:
-                entityType = UmbracoEntityTypes.Media;
-                break;
-            case Constants.UdiEntityType.Member:
-                entityType = UmbracoEntityTypes.Member;
-                break;
-            default:
-                return NotFound();
-        }
-
-        return GetUrl(intId.Result, entityType, culture);
-    }
-
-    /// <summary>
-    ///     Get entity URLs by IDs
-    /// </summary>
-    /// <param name="ids">
-    ///     A list of IDs to lookup items by
-    /// </param>
-    /// <param name="type">The entity type to look for.</param>
-    /// <param name="culture">The culture to fetch the URL for.</param>
-    /// <returns>Dictionary mapping Udi -> Url</returns>
-    /// <remarks>
-    ///     We allow for POST because there could be quite a lot of Ids.
-    /// </remarks>
-    [HttpGet]
-    [HttpPost]
-    public IDictionary<int, string?> GetUrlsByIds([FromJsonPath] int[] ids, [FromQuery] UmbracoEntityTypes type, [FromQuery] string? culture = null)
-    {
-        if (ids == null || !ids.Any())
-        {
-            return new Dictionary<int, string?>();
-        }
-
-        string? MediaOrDocumentUrl(int id)
-        {
-            switch (type)
-            {
-                case UmbracoEntityTypes.Document:
-                    return _publishedUrlProvider.GetUrl(id, culture: culture ?? ClientCulture());
-
-                case UmbracoEntityTypes.Media:
-                {
-                    IPublishedContent? media = _publishedContentQuery.Media(id);
-
-                    // NOTE: If culture is passed here we get an empty string rather than a media item URL.
-                    return _publishedUrlProvider.GetMediaUrl(media, culture: null);
-                }
-
-                default:
-                    return null;
-            }
-        }
-
-        return ids
-            .Distinct()
-            .Select(id => new { Id = id, Url = MediaOrDocumentUrl(id) }).ToDictionary(x => x.Id, x => x.Url);
-    }
-
-    /// <summary>
-    ///     Get entity URLs by IDs
-    /// </summary>
-    /// <param name="ids">
-    ///     A list of IDs to lookup items by
-    /// </param>
-    /// <param name="type">The entity type to look for.</param>
-    /// <param name="culture">The culture to fetch the URL for.</param>
-    /// <returns>Dictionary mapping Udi -> Url</returns>
-    /// <remarks>
-    ///     We allow for POST because there could be quite a lot of Ids.
-    /// </remarks>
-    [HttpGet]
-    [HttpPost]
-    public IDictionary<Guid, string?> GetUrlsByIds([FromJsonPath] Guid[] ids, [FromQuery] UmbracoEntityTypes type, [FromQuery] string? culture = null)
-    {
-        if (ids == null || !ids.Any())
-        {
-            return new Dictionary<Guid, string?>();
-        }
-
-        string? MediaOrDocumentUrl(Guid id)
-        {
-            return type switch
-            {
-                UmbracoEntityTypes.Document => _publishedUrlProvider.GetUrl(id, culture: culture ?? ClientCulture()),
-
-                // NOTE: If culture is passed here we get an empty string rather than a media item URL.
-                UmbracoEntityTypes.Media => _publishedUrlProvider.GetMediaUrl(id, culture: null),
-
-                _ => null
-            };
-        }
-
-        return ids
-            .Distinct()
-            .Select(id => new { Id = id, Url = MediaOrDocumentUrl(id) }).ToDictionary(x => x.Id, x => x.Url);
-    }
-
-    /// <summary>
-    ///     Get entity URLs by IDs
-    /// </summary>
-    /// <param name="ids">
-    ///     A list of IDs to lookup items by
-    /// </param>
-    /// <param name="type">The entity type to look for.</param>
-    /// <param name="culture">The culture to fetch the URL for.</param>
-    /// <returns>Dictionary mapping Udi -> Url</returns>
-    /// <remarks>
-    ///     We allow for POST because there could be quite a lot of Ids.
-    /// </remarks>
-    [HttpGet]
-    [HttpPost]
-    public IDictionary<Udi, string?> GetUrlsByIds([FromJsonPath] Udi[] ids, [FromQuery] UmbracoEntityTypes type, [FromQuery] string? culture = null)
-    {
-        if (ids == null || !ids.Any())
-        {
-            return new Dictionary<Udi, string?>();
-        }
-
-        // TODO: PMJ 2021-09-27 - Should GetUrl(Udi) exist as an extension method on UrlProvider/IUrlProvider (in v9)
-        string? MediaOrDocumentUrl(Udi id)
-        {
-            if (id is not GuidUdi guidUdi)
-            {
-                return null;
-            }
-
-            return type switch
-            {
-                UmbracoEntityTypes.Document => _publishedUrlProvider.GetUrl(guidUdi.Guid, culture: culture ?? ClientCulture()),
-
-                // NOTE: If culture is passed here we get an empty string rather than a media item URL.
-                UmbracoEntityTypes.Media => _publishedUrlProvider.GetMediaUrl(guidUdi.Guid, culture: null),
-
-                _ => null
-            };
-        }
-
-        return ids
-            .Distinct()
-            .Select(id => new { Id = id, Url = MediaOrDocumentUrl(id) }).ToDictionary(x => x.Id, x => x.Url);
-    }
-
-    /// <summary>
-    ///     Gets the URL of an entity
-    /// </summary>
-    /// <param name="id">Int id of the entity to fetch URL for</param>
-    /// <param name="type">The type of entity such as Document, Media, Member</param>
-    /// <param name="culture">The culture to fetch the URL for</param>
-    /// <returns>The URL or path to the item</returns>
-    /// <remarks>
-    ///     We are not restricting this with security because there is no sensitive data
-    /// </remarks>
-    public IActionResult GetUrl(int id, UmbracoEntityTypes type, string? culture = null)
-    {
-        culture ??= ClientCulture();
-
-        var returnUrl = string.Empty;
-
-        if (type == UmbracoEntityTypes.Document)
-        {
-            var foundUrl = _publishedUrlProvider.GetUrl(id, culture: culture);
-            if (string.IsNullOrEmpty(foundUrl) == false && foundUrl != "#")
-            {
-                returnUrl = foundUrl;
-
-                return Ok(returnUrl);
-            }
-        }
-
-        IEnumerable<EntityBasic> ancestors = GetResultForAncestors(id, type);
-
-        //if content, skip the first node for replicating NiceUrl defaults
-        if (type == UmbracoEntityTypes.Document)
-        {
-            ancestors = ancestors.Skip(1);
-        }
-
-        returnUrl = "/" + string.Join("/", ancestors.Select(x => x.Name));
-
-        return Ok(returnUrl);
-    }
-
-    /// <summary>
-    ///     Gets an entity by a xpath query - OBSOLETE
-    /// </summary>
-    /// <param name="query"></param>
-    /// <param name="nodeContextId"></param>
-    /// <param name="type"></param>
-    /// <returns></returns>
-    [Obsolete("This will be removed in Umbraco 13. Use GetByXPath instead")]
-    public ActionResult<EntityBasic?>? GetByQuery(string query, int nodeContextId, UmbracoEntityTypes type) => GetByXPath(query, nodeContextId, null, type);
-
-    public class DynamicRootViewModel
-    {
-        public DynamicRoot Query { get; set; } = null!;
-
-        public int CurrentId { get; set; }
-        public string? CurrentCulture { get; set; }
-        public string? CurrentSegment { get; set; }
-
-        public int ParentId { get; set; }
-    }
-
-    [HttpPost]
-    public async Task<ActionResult<EntityBasic?>> GetDynamicRootAsync([FromBody]DynamicRootViewModel model)
-    {
-        var currentKey = model.CurrentId == 0 ? null : _entityService.Get(model.CurrentId)?.Key;
-        var parentKey = model.ParentId == 0 ? null : _entityService.Get(model.ParentId)?.Key;
-
-        if (parentKey is null)
-        {
-            throw new ArgumentException("Invalid parentId", nameof(model.ParentId));
-        }
-
-        var startNodeSelector = new DynamicRootNodeQuery()
-        {
-            Context = new DynamicRootContext()
-            {
-                CurrentKey = currentKey,
-                ParentKey = parentKey.Value
-            },
-            OriginKey = model.Query.OriginKey,
-            OriginAlias = model.Query.OriginAlias,
-            QuerySteps = model.Query.QuerySteps.Select(x=>new DynamicRootQueryStep()
-            {
-                Alias = x.Alias,
-                AnyOfDocTypeKeys = x.AnyOfDocTypeKeys
-            })
-        };
-
-        _variationContextAccessor.VariationContext = new VariationContext(model.CurrentCulture, model.CurrentSegment);
-        var startNodes = (await _dynamicRootService.GetDynamicRootsAsync(startNodeSelector)).ToArray();
-
-        Guid? first = startNodes.Any() ? startNodes.First() : null;
-        if (first.HasValue)
-        {
-            return GetById(first.Value, UmbracoEntityTypes.Document);
-        }
-
-        return Ok();
-    }
-
-    /// <summary>
-    ///     Gets an entity by a xpath query
-    /// </summary>
-    /// <param name="query"></param>
-    /// <param name="nodeContextId"></param>
-    /// <param name="type"></param>
-    /// <param name="parentId"></param>
-    /// <returns></returns>
-    [Obsolete("The current implementation of this method is suboptimal and will be removed entirely in a future version. Scheduled for removal in v14")]
-    public ActionResult<EntityBasic?>? GetByXPath(string query, int nodeContextId, int? parentId, UmbracoEntityTypes type)
-    {
-        if (type != UmbracoEntityTypes.Document)
-        {
-            throw new ArgumentException("Get by query is only compatible with entities of type Document");
-        }
-
-        var q = ParseXPathQuery(query, nodeContextId, parentId);
-        IPublishedContent? node = _publishedContentQuery.ContentSingleAtXPath(q);
-
-        if (node == null)
-        {
-            return null;
-        }
-
-        return GetById(node.Id, type);
-    }
-
-    // PP: Work in progress on the query parser
-    private string ParseXPathQuery(string query, int id, int? parentId) =>
-        UmbracoXPathPathSyntaxParser.ParseXPathQuery(
-            query,
-            id,
-            parentId,
-            nodeid =>
-            {
-                IEntitySlim? ent = _entityService.Get(nodeid);
-                return ent?.Path.Split(Constants.CharArrays.Comma).Reverse();
-            },
-            i => _publishedContentQuery.Content(i) != null);
-
-    [HttpGet]
-    public ActionResult<UrlAndAnchors> GetUrlAndAnchors(Udi id, string culture = "*")
-    {
-        Attempt<int> intId = _entityService.GetId(id);
-        if (!intId.Success)
-        {
-            return NotFound();
-        }
-
-        return GetUrlAndAnchors(intId.Result, culture);
-    }
-
-    [HttpGet]
-    public UrlAndAnchors GetUrlAndAnchors(int id, string? culture = "*")
-    {
-        culture = culture is null or "*" ? ClientCulture() : culture;
-
-        var url = _publishedUrlProvider.GetUrl(id, culture: culture);
-        IEnumerable<string> anchorValues = _contentService.GetAnchorValuesFromRTEs(id, culture);
-        return new UrlAndAnchors(url, anchorValues);
-    }
-
-    [HttpGet]
-    [HttpPost]
-    public IEnumerable<string> GetAnchors(AnchorsModel model)
-    {
-        if (model.RteContent is null)
-        {
-            return Enumerable.Empty<string>();
-        }
-
-        IEnumerable<string> anchorValues = _contentService.GetAnchorValuesFromRTEContent(model.RteContent);
-        return anchorValues;
-    }
-
-    public IEnumerable<EntityBasic> GetChildren(int id, UmbracoEntityTypes type, Guid? dataTypeKey = null)
-    {
-        UmbracoObjectTypes? objectType = ConvertToObjectType(type);
-        if (objectType.HasValue)
-        {
-            //TODO: Need to check for Object types that support hierarchy here, some might not.
-
-            var startNodes = GetStartNodes(type);
-
-            var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeKey);
-
-            // root is special: we reduce it to start nodes if the user's start node is not the default, then we need to return their start nodes
-            if (id == Constants.System.Root && startNodes.Length > 0 &&
-                startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes)
-            {
-                IEntitySlim[] nodes = _entityService.GetAll(objectType.Value, startNodes).ToArray();
-                if (nodes.Length == 0)
-                {
-                    return Enumerable.Empty<EntityBasic>();
-                }
-
-                var pr = new List<EntityBasic>(nodes.Select(_umbracoMapper.Map<EntityBasic>).WhereNotNull());
-                return pr;
-            }
-
-            // else proceed as usual
-
-            return _entityService.GetChildren(id, objectType.Value)
-                .Select(_umbracoMapper.Map<EntityBasic>)
-                .WhereNotNull();
-        }
-
-        //now we need to convert the unknown ones
-        switch (type)
-        {
-            case UmbracoEntityTypes.Language:
-            case UmbracoEntityTypes.User:
-            case UmbracoEntityTypes.Macro:
-            default:
-                throw new NotSupportedException("The " + typeof(EntityController) +
-                                                " does not currently support data for the type " + type);
-        }
-    }
-
-    /// <summary>
-    ///     Get paged child entities by id
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="type"></param>
-    /// <param name="pageNumber"></param>
-    /// <param name="pageSize"></param>
-    /// <param name="orderBy"></param>
-    /// <param name="orderDirection"></param>
-    /// <param name="filter"></param>
-    /// <param name="dataTypeKey"></param>
-    /// <returns></returns>
-    public ActionResult<PagedResult<EntityBasic>> GetPagedChildren(
-        string id,
-        UmbracoEntityTypes type,
-        int pageNumber,
-        int pageSize,
-        string orderBy = "SortOrder",
-        Direction orderDirection = Direction.Ascending,
-        string filter = "",
-        Guid? dataTypeKey = null)
-    {
-        if (int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intId))
-        {
-            return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter);
-        }
-
-        if (Guid.TryParse(id, out _))
-        {
-            //Not supported currently
-            return NotFound();
-        }
-
-        if (UdiParser.TryParse(id, out _))
-        {
-            //Not supported currently
-            return NotFound();
-        }
-
-        //so we don't have an INT, GUID or UDI, it's just a string, so now need to check if it's a special id or a member type
-        if (id == Constants.Conventions.MemberTypes.AllMembersListId)
-        {
-            //the EntityService can search paged members from the root
-
-            intId = -1;
-            return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter, dataTypeKey);
-        }
-
-        //the EntityService cannot search members of a certain type, this is currently not supported and would require
-        //quite a bit of plumbing to do in the Services/Repository, we'll revert to a paged search
-
-        //TODO: We should really fix this in the EntityService but if we don't we should allow the ISearchableTree for the members controller
-        // to be used for this search instead of the built in/internal searcher
-
-        IEnumerable<SearchResultEntity> searchResult = _treeSearcher.ExamineSearch(
-            filter ?? string.Empty,
-            type,
-            pageSize,
-            pageNumber - 1,
-            out var total,
-            null,
-            id);
-
-        return new PagedResult<EntityBasic>(total, pageNumber, pageSize) { Items = searchResult };
-    }
-
-    /// <summary>
-    ///     Get paged child entities by id
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="type"></param>
-    /// <param name="pageNumber"></param>
-    /// <param name="pageSize"></param>
-    /// <param name="orderBy"></param>
-    /// <param name="orderDirection"></param>
-    /// <param name="filter"></param>
-    /// <param name="dataTypeKey"></param>
-    /// <returns></returns>
-    public ActionResult<PagedResult<EntityBasic>> GetPagedChildren(
-        int id,
-        UmbracoEntityTypes type,
-        int pageNumber,
-        int pageSize,
-        string orderBy = "SortOrder",
-        Direction orderDirection = Direction.Ascending,
-        string filter = "",
-        Guid? dataTypeKey = null)
-    {
-        if (pageNumber <= 0)
-        {
-            return NotFound();
-        }
-
-        if (pageSize <= 0)
-        {
-            return NotFound();
-        }
-
-        UmbracoObjectTypes? objectType = ConvertToObjectType(type);
-        if (objectType.HasValue)
-        {
-            IEnumerable<IEntitySlim> entities;
-
-            var startNodes = GetStartNodes(type);
-
-            var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeKey);
-
-            // root is special: we reduce it to start nodes if the user's start node is not the default, then we need to return their start nodes
-            if (id == Constants.System.Root && startNodes.Length > 0 &&
-                startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes)
-            {
-                return new PagedResult<EntityBasic>(0, 0, 0);
-            }
-            //adding multiple conditions ,considering id,key & name as filter param
-            //for id as int
-            int.TryParse(filter, out int filterAsIntId);
-            //for key as Guid
-            Guid.TryParse(filter, out Guid filterAsGuid);
-            // else proceed as usual
-            entities = _entityService.GetPagedChildren(
-                id,
-                objectType.Value,
-                pageNumber - 1,
-                pageSize,
-                out long totalRecords,
-                filter.IsNullOrWhiteSpace()
-                    ? null
-                    : _sqlContext.Query<IUmbracoEntity>().Where(x => x.Name!.Contains(filter)
-                      || x.Id == filterAsIntId
-                      || x.Key == filterAsGuid),
-                Ordering.By(orderBy, orderDirection));
-
-
-            if (totalRecords == 0)
-            {
-                return new PagedResult<EntityBasic>(0, 0, 0);
-            }
-
-            var culture = ClientCulture();
-            var pagedResult = new PagedResult<EntityBasic>(totalRecords, pageNumber, pageSize)
-            {
-                Items = entities.Select(source =>
-                {
-                    EntityBasic? target = _umbracoMapper.Map<IEntitySlim, EntityBasic>(source, context =>
-                    {
-                        context.SetCulture(culture);
-                        context.SetCulture(culture);
-                    });
-
-                    if (target is not null)
-                    {
-                        //TODO: Why is this here and not in the mapping?
-                        target.AdditionalData["hasChildren"] = source.HasChildren;
-                    }
-
-                    return target;
-                }).WhereNotNull()
-            };
-
-            return pagedResult;
-        }
-
-        //now we need to convert the unknown ones
-        switch (type)
-        {
-            case UmbracoEntityTypes.PropertyType:
-            case UmbracoEntityTypes.PropertyGroup:
-            case UmbracoEntityTypes.Language:
-            case UmbracoEntityTypes.User:
-            case UmbracoEntityTypes.Macro:
-            default:
-                throw new NotSupportedException("The " + typeof(EntityController) +
-                                                " does not currently support data for the type " + type);
-        }
-    }
-
-    private int[] GetStartNodes(UmbracoEntityTypes type)
-    {
-        switch (type)
-        {
-            case UmbracoEntityTypes.Document:
-                return _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.CalculateContentStartNodeIds(
-                    _entityService, _appCaches) ?? Array.Empty<int>();
-            case UmbracoEntityTypes.Media:
-                return _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.CalculateMediaStartNodeIds(
-                    _entityService, _appCaches) ?? Array.Empty<int>();
-            default:
-                return Array.Empty<int>();
-        }
-    }
-
-    public ActionResult<PagedResult<EntityBasic>> GetPagedDescendants(
-        int id,
-        UmbracoEntityTypes type,
-        int pageNumber,
-        int pageSize,
-        string orderBy = "SortOrder",
-        Direction orderDirection = Direction.Ascending,
-        string filter = "",
-        Guid? dataTypeKey = null)
-    {
-        if (pageNumber <= 0)
-        {
-            return NotFound();
-        }
-
-        if (pageSize <= 0)
-        {
-            return NotFound();
-        }
-
-        // re-normalize since NULL can be passed in
-        filter ??= string.Empty;
-
-        UmbracoObjectTypes? objectType = ConvertToObjectType(type);
-        if (objectType.HasValue)
-        {
-            IEnumerable<IUmbracoEntity> entities;
-            long totalRecords;
-
-            if (id == Constants.System.Root)
-            {
-                // root is special: we reduce it to start nodes
-
-                var aids = GetStartNodes(type);
-
-                var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeKey);
-                entities = aids == null || aids.Contains(Constants.System.Root) || ignoreUserStartNodes
-                    ? _entityService.GetPagedDescendants(
-                        objectType.Value,
-                        pageNumber - 1,
-                        pageSize,
-                        out totalRecords,
-                        _sqlContext.Query<IUmbracoEntity>()
-                            .Where(x => x.Name!.Contains(filter)),
-                        Ordering.By(orderBy, orderDirection),
-                        false)
-                    : _entityService.GetPagedDescendants(
-                        aids,
-                        objectType.Value,
-                        pageNumber - 1,
-                        pageSize,
-                        out totalRecords,
-                        _sqlContext.Query<IUmbracoEntity>().Where(x => x.Name!.Contains(filter)),
-                        Ordering.By(orderBy, orderDirection));
-            }
-            else
-            {
-                entities = _entityService.GetPagedDescendants(
-                    id,
-                    objectType.Value,
-                    pageNumber - 1,
-                    pageSize,
-                    out totalRecords,
-                    _sqlContext.Query<IUmbracoEntity>()
-                        .Where(x => x.Name!.Contains(filter)),
-                    Ordering.By(orderBy, orderDirection));
-            }
-
-            if (totalRecords == 0)
-            {
-                return new PagedResult<EntityBasic>(0, 0, 0);
-            }
-
-            var pagedResult = new PagedResult<EntityBasic>(totalRecords, pageNumber, pageSize)
-            {
-                Items = entities.Select(MapEntities()).WhereNotNull()
-            };
-
-            return pagedResult;
-        }
-
-        //now we need to convert the unknown ones
-        switch (type)
-        {
-            case UmbracoEntityTypes.PropertyType:
-            case UmbracoEntityTypes.PropertyGroup:
-            case UmbracoEntityTypes.Language:
-            case UmbracoEntityTypes.User:
-            case UmbracoEntityTypes.Macro:
-            default:
-                throw new NotSupportedException("The " + typeof(EntityController) +
-                                                " does not currently support data for the type " + type);
-        }
-    }
-
-    private bool IsDataTypeIgnoringUserStartNodes(Guid? dataTypeKey) => dataTypeKey.HasValue &&
-                                                                        _dataTypeService
-                                                                            .IsDataTypeIgnoringUserStartNodes(
-                                                                                dataTypeKey.Value);
-
-    public IEnumerable<EntityBasic> GetAncestors(int id, UmbracoEntityTypes type, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection queryStrings) =>
-        GetResultForAncestors(id, type, queryStrings);
-
-    public ActionResult<IEnumerable<EntityBasic>> GetAncestors(Guid id, UmbracoEntityTypes type, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection queryStrings)
-    {
-        IEntitySlim? entity = _entityService.Get(id);
-        if (entity is null)
-        {
-            return NotFound();
-        }
-
-        return Ok(GetResultForAncestors(entity.Id, type, queryStrings));
-    }
-
-    /// <summary>
-    ///     Searches for results based on the entity type
-    /// </summary>
-    /// <param name="query"></param>
-    /// <param name="entityType"></param>
-    /// <param name="searchFrom"></param>
-    /// <param name="ignoreUserStartNodes">If set to true, user and group start node permissions will be ignored.</param>
-    /// <returns></returns>
-    private IEnumerable<SearchResultEntity> ExamineSearch(string query, UmbracoEntityTypes entityType, string? searchFrom = null, bool ignoreUserStartNodes = false)
-    {
-        var culture = ClientCulture();
-        return _treeSearcher.ExamineSearch(query, entityType, 200, 0, out _, culture, searchFrom, ignoreUserStartNodes);
-    }
-
-    private IEnumerable<EntityBasic> GetResultForChildren(int id, UmbracoEntityTypes entityType)
-    {
-        UmbracoObjectTypes? objectType = ConvertToObjectType(entityType);
-        if (objectType.HasValue)
-        {
-            // TODO: Need to check for Object types that support hierarchic here, some might not.
-
-            return _entityService.GetChildren(id, objectType.Value)
-                .Select(MapEntities())
-                .WhereNotNull();
-        }
-
-        //now we need to convert the unknown ones
-        switch (entityType)
-        {
-            case UmbracoEntityTypes.Language:
-            case UmbracoEntityTypes.User:
-            case UmbracoEntityTypes.Macro:
-            default:
-                throw new NotSupportedException("The " + typeof(EntityController) +
-                                                " does not currently support data for the type " + entityType);
-        }
-    }
-
-    private IEnumerable<EntityBasic> GetResultForAncestors(int id, UmbracoEntityTypes entityType, FormCollection? queryStrings = null)
-    {
-        UmbracoObjectTypes? objectType = ConvertToObjectType(entityType);
-        if (objectType.HasValue)
-        {
-            // TODO: Need to check for Object types that support hierarchic here, some might not.
-
-            var ids = _entityService.Get(id)?.Path.Split(Constants.CharArrays.Comma)
-                .Select(s => int.Parse(s, CultureInfo.InvariantCulture)).Distinct().ToArray();
-
-            var ignoreUserStartNodes =
-                IsDataTypeIgnoringUserStartNodes(queryStrings?.GetValue<Guid?>("dataTypeId"));
-            if (ignoreUserStartNodes == false)
-            {
-                int[]? aids = null;
-                switch (entityType)
-                {
-                    case UmbracoEntityTypes.Document:
-                        aids = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?
-                            .CalculateContentStartNodeIds(_entityService, _appCaches);
-                        break;
-                    case UmbracoEntityTypes.Media:
-                        aids =
-                            _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.CalculateMediaStartNodeIds(
-                                _entityService, _appCaches);
-                        break;
-                }
-
-                if (aids != null)
-                {
-                    var lids = new List<int>();
-                    var ok = false;
-                    if (ids is not null)
-                    {
-                        foreach (var i in ids)
-                        {
-                            if (ok)
-                            {
-                                lids.Add(i);
-                                continue;
-                            }
-
-                            if (aids.Contains(i))
-                            {
-                                lids.Add(i);
-                                ok = true;
-                            }
-                        }
-                    }
-
-                    ids = lids.ToArray();
-                }
-            }
-
-            var culture = queryStrings?.GetValue<string>("culture");
-
-            return ids is null || ids.Length == 0
-                ? Enumerable.Empty<EntityBasic>()
-                : _entityService.GetAll(objectType.Value, ids)
-                    .OrderBy(x => x.Level)
-                    .Select(MapEntities(culture))
-                    .WhereNotNull();
-        }
-
-        //now we need to convert the unknown ones
-        switch (entityType)
-        {
-            case UmbracoEntityTypes.PropertyType:
-            case UmbracoEntityTypes.PropertyGroup:
-            case UmbracoEntityTypes.Language:
-            case UmbracoEntityTypes.User:
-            case UmbracoEntityTypes.Macro:
-            default:
-                throw new NotSupportedException("The " + typeof(EntityController) +
-                                                " does not currently support data for the type " + entityType);
-        }
-    }
-
-    private IEnumerable<EntityBasic> GetResultForKeys(Guid[] keys, UmbracoEntityTypes entityType)
-    {
-        if (keys.Length == 0)
-        {
-            return Enumerable.Empty<EntityBasic>();
-        }
-
-        UmbracoObjectTypes? objectType = ConvertToObjectType(entityType);
-        if (objectType.HasValue)
-        {
-            IEnumerable<EntityBasic> entities = _entityService.GetAll(objectType.Value, keys)
-                .Select(MapEntities())
-                .WhereNotNull();
-
-            // entities are in "some" order, put them back in order
-            var xref = entities.ToDictionary(x => x.Key);
-            IEnumerable<EntityBasic> result = keys.Select(x => xref.ContainsKey(x) ? xref[x] : null)
-                .WhereNotNull();
-
-            return result;
-        }
-
-        //now we need to convert the unknown ones
-        switch (entityType)
-        {
-            case UmbracoEntityTypes.PropertyType:
-            case UmbracoEntityTypes.PropertyGroup:
-            case UmbracoEntityTypes.Language:
-            case UmbracoEntityTypes.User:
-            case UmbracoEntityTypes.Macro:
-            default:
-                throw new NotSupportedException("The " + typeof(EntityController) +
-                                                " does not currently support data for the type " + entityType);
-        }
-    }
-
-    private IEnumerable<EntityBasic> GetResultForIds(int[] ids, UmbracoEntityTypes entityType)
-    {
-        if (ids.Length == 0)
-        {
-            return Enumerable.Empty<EntityBasic>();
-        }
-
-        UmbracoObjectTypes? objectType = ConvertToObjectType(entityType);
-        if (objectType.HasValue)
-        {
-            IEnumerable<EntityBasic> entities = _entityService.GetAll(objectType.Value, ids)
-                .Select(MapEntities())
-                .WhereNotNull();
-
-            // entities are in "some" order, put them back in order
-            var xref = entities.Where(x => x.Id != null).ToDictionary(x => x.Id!);
-            IEnumerable<EntityBasic> result = ids.Select(x => xref.ContainsKey(x) ? xref[x] : null)
-                .WhereNotNull();
-
-            return result;
-        }
-
-        //now we need to convert the unknown ones
-        switch (entityType)
-        {
-            case UmbracoEntityTypes.PropertyType:
-            case UmbracoEntityTypes.PropertyGroup:
-            case UmbracoEntityTypes.Language:
-            case UmbracoEntityTypes.User:
-            case UmbracoEntityTypes.Macro:
-            default:
-                throw new NotSupportedException("The " + typeof(EntityController) +
-                                                " does not currently support data for the type " + entityType);
-        }
-    }
-
-    private ActionResult<EntityBasic?> GetResultForKey(Guid key, UmbracoEntityTypes entityType)
-    {
-        UmbracoObjectTypes? objectType = ConvertToObjectType(entityType);
-        if (objectType.HasValue)
-        {
-            IEntitySlim? found = _entityService.Get(key, objectType.Value);
-            if (found == null)
-            {
-                return NotFound();
-            }
-
-            return _umbracoMapper.Map<IEntitySlim, EntityBasic>(found);
-        }
-
-        //now we need to convert the unknown ones
-        switch (entityType)
-        {
-            case UmbracoEntityTypes.PropertyType:
-
-            case UmbracoEntityTypes.PropertyGroup:
-
-            case UmbracoEntityTypes.Language:
-
-            case UmbracoEntityTypes.User:
-
-            case UmbracoEntityTypes.Macro:
-
-            case UmbracoEntityTypes.Template:
-                ITemplate? template = _fileService.GetTemplate(key);
-                if (template is null)
-                {
-                    return NotFound();
-                }
-
-                return _umbracoMapper.Map<ITemplate, EntityBasic>(template);
-
-            default:
-                throw new NotSupportedException("The " + typeof(EntityController) +
-                                                " does not currently support data for the type " + entityType);
-        }
-    }
-
-    private ActionResult<EntityBasic?> GetResultForId(int id, UmbracoEntityTypes entityType)
-    {
-        UmbracoObjectTypes? objectType = ConvertToObjectType(entityType);
-        if (objectType.HasValue)
-        {
-            IEntitySlim? found = _entityService.Get(id, objectType.Value);
-            if (found == null)
-            {
-                return NotFound();
-            }
-
-            return MapEntity(found);
-        }
-
-        //now we need to convert the unknown ones
-        switch (entityType)
-        {
-            case UmbracoEntityTypes.PropertyType:
-
-            case UmbracoEntityTypes.PropertyGroup:
-
-            case UmbracoEntityTypes.Language:
-
-            case UmbracoEntityTypes.User:
-
-            case UmbracoEntityTypes.Macro:
-
-            case UmbracoEntityTypes.Template:
-                ITemplate? template = _fileService.GetTemplate(id);
-                if (template is null)
-                {
-                    return NotFound();
-                }
-
-                return _umbracoMapper.Map<ITemplate, EntityBasic>(template);
-
-            default:
-                throw new NotSupportedException("The " + typeof(EntityController) +
-                                                " does not currently support data for the type " + entityType);
-        }
-    }
-
-    private static UmbracoObjectTypes? ConvertToObjectType(UmbracoEntityTypes entityType)
-    {
-        switch (entityType)
-        {
-            case UmbracoEntityTypes.Document:
-                return UmbracoObjectTypes.Document;
-            case UmbracoEntityTypes.Media:
-                return UmbracoObjectTypes.Media;
-            case UmbracoEntityTypes.MemberType:
-                return UmbracoObjectTypes.MemberType;
-            case UmbracoEntityTypes.MemberGroup:
-                return UmbracoObjectTypes.MemberGroup;
-            case UmbracoEntityTypes.MediaType:
-                return UmbracoObjectTypes.MediaType;
-            case UmbracoEntityTypes.DocumentType:
-                return UmbracoObjectTypes.DocumentType;
-            case UmbracoEntityTypes.Member:
-                return UmbracoObjectTypes.Member;
-            case UmbracoEntityTypes.DataType:
-                return UmbracoObjectTypes.DataType;
-            default:
-                //There is no UmbracoEntity conversion (things like Macros, Users, etc...)
-                return null;
-        }
-    }
-
-    /// <summary>
-    /// </summary>
-    /// <param name="type">The type of entity.</param>
-    /// <param name="postFilter">
-    ///     Optional filter - Format like: "BoolVariable==true&amp;IntVariable>=6". Invalid filters are
-    ///     ignored.
-    /// </param>
-    /// <returns></returns>
-    public IEnumerable<EntityBasic>? GetAll(UmbracoEntityTypes type, string postFilter) =>
-        GetResultForAll(type, postFilter);
-
-    /// <summary>
-    ///     Gets the result for the entity list based on the type
-    /// </summary>
-    /// <param name="entityType"></param>
-    /// <param name="postFilter">A string where filter that will filter the results dynamically with linq - optional</param>
-    /// <returns></returns>
-    private IEnumerable<EntityBasic>? GetResultForAll(UmbracoEntityTypes entityType, string? postFilter = null)
-    {
-        UmbracoObjectTypes? objectType = ConvertToObjectType(entityType);
-        if (objectType.HasValue)
-        {
-            // TODO: Should we order this by something ?
-            IEnumerable<EntityBasic> entities =
-                _entityService.GetAll(objectType.Value).Select(MapEntities()).WhereNotNull();
-            return ExecutePostFilter(entities, postFilter);
-        }
-
-        //now we need to convert the unknown ones
-        switch (entityType)
-        {
-            case UmbracoEntityTypes.Template:
-                IEnumerable<ITemplate>? templates = _fileService.GetTemplates();
-                IEnumerable<ITemplate>? filteredTemplates = ExecutePostFilter(templates, postFilter);
-                return filteredTemplates?.Select(MapEntities()).WhereNotNull();
-
-            case UmbracoEntityTypes.Macro:
-                //Get all macros from the macro service
-                IOrderedEnumerable<IMacro> macros = _macroService.GetAll().WhereNotNull().OrderBy(x => x.Name);
-                IEnumerable<IMacro>? filteredMacros = ExecutePostFilter(macros, postFilter);
-                return filteredMacros?.Select(MapEntities()).WhereNotNull();
-
-            case UmbracoEntityTypes.PropertyType:
-
-                //get all document types, then combine all property types into one list
-                IEnumerable<IPropertyType> propertyTypes = _contentTypeService.GetAll()
-                    .Cast<IContentTypeComposition>()
-                    .Concat(_mediaTypeService.GetAll())
-                    .ToArray()
-                    .SelectMany(x => x.PropertyTypes)
-                    .DistinctBy(composition => composition.Alias);
-                IEnumerable<IPropertyType>? filteredPropertyTypes = ExecutePostFilter(propertyTypes, postFilter);
-                return _umbracoMapper
-                    .MapEnumerable<IPropertyType, EntityBasic>(filteredPropertyTypes ??
-                                                               Enumerable.Empty<IPropertyType>()).WhereNotNull();
-
-            case UmbracoEntityTypes.PropertyGroup:
-
-                //get all document types, then combine all property types into one list
-                IEnumerable<PropertyGroup> propertyGroups = _contentTypeService.GetAll()
-                    .Cast<IContentTypeComposition>()
-                    .Concat(_mediaTypeService.GetAll())
-                    .ToArray()
-                    .SelectMany(x => x.PropertyGroups)
-                    .DistinctBy(composition => composition.Name);
-                IEnumerable<PropertyGroup>? filteredpropertyGroups = ExecutePostFilter(propertyGroups, postFilter);
-                return _umbracoMapper
-                    .MapEnumerable<PropertyGroup, EntityBasic>(filteredpropertyGroups ??
-                                                               Enumerable.Empty<PropertyGroup>()).WhereNotNull();
-
-            case UmbracoEntityTypes.User:
-
-                IEnumerable<IUser> users = _userService.GetAll(0, int.MaxValue, out _);
-                IEnumerable<IUser>? filteredUsers = ExecutePostFilter(users, postFilter);
-                return _umbracoMapper.MapEnumerable<IUser, EntityBasic>(filteredUsers ?? Enumerable.Empty<IUser>())
-                    .WhereNotNull();
-
-            case UmbracoEntityTypes.Stylesheet:
-
-                if (!postFilter.IsNullOrWhiteSpace())
-                {
-                    throw new NotSupportedException("Filtering on stylesheets is not currently supported");
-                }
-
-                return _fileService.GetStylesheets().Select(MapEntities()).WhereNotNull();
-
-            case UmbracoEntityTypes.Script:
-
-                if (!postFilter.IsNullOrWhiteSpace())
-                {
-                    throw new NotSupportedException("Filtering on scripts is not currently supported");
-                }
-
-                return _fileService.GetScripts().Select(MapEntities()).WhereNotNull();
-
-            case UmbracoEntityTypes.PartialView:
-
-                if (!postFilter.IsNullOrWhiteSpace())
-                {
-                    throw new NotSupportedException("Filtering on partial views is not currently supported");
-                }
-
-                return _fileService.GetPartialViews().Select(MapEntities()).WhereNotNull();
-
-            case UmbracoEntityTypes.Language:
-
-                if (!postFilter.IsNullOrWhiteSpace())
-                {
-                    throw new NotSupportedException("Filtering on languages is not currently supported");
-                }
-
-                return _localizationService.GetAllLanguages().Select(MapEntities()).WhereNotNull();
-            case UmbracoEntityTypes.DictionaryItem:
-
-                if (!postFilter.IsNullOrWhiteSpace())
-                {
-                    throw new NotSupportedException("Filtering on dictionary items is not currently supported");
-                }
-
-                return GetAllDictionaryItems();
-
-            default:
-                throw new NotSupportedException("The " + typeof(EntityController) +
-                                                " does not currently support data for the type " + entityType);
-        }
-    }
-
-    private IEnumerable<T>? ExecutePostFilter<T>(IEnumerable<T>? entities, string? postFilter)
-    {
-        if (postFilter.IsNullOrWhiteSpace())
-        {
-            return entities;
-        }
-
-        var postFilterConditions = postFilter!.Split(Constants.CharArrays.Ampersand);
-
-        foreach (var postFilterCondition in postFilterConditions)
-        {
-            QueryCondition? queryCondition = BuildQueryCondition<T>(postFilterCondition);
-
-            if (queryCondition != null)
-            {
-                Expression<Func<T, bool>> whereClauseExpression = queryCondition.BuildCondition<T>("x");
-
-                entities = entities?.Where(whereClauseExpression.Compile());
-            }
-        }
-
-        return entities;
-    }
-
-    private static QueryCondition? BuildQueryCondition<T>(string postFilter)
-    {
-        var postFilterParts = postFilter.Split(_postFilterSplitStrings, 2, StringSplitOptions.RemoveEmptyEntries);
-
-        if (postFilterParts.Length != 2)
-        {
-            return null;
-        }
-
-        var propertyName = postFilterParts[0];
-        var constraintValue = postFilterParts[1];
-        var stringOperator = postFilter.Substring(propertyName.Length, postFilter.Length - propertyName.Length - constraintValue.Length);
-        Operator binaryOperator;
-
-        try
-        {
-            binaryOperator = OperatorFactory.FromString(stringOperator);
-        }
-        catch (ArgumentException)
-        {
-            // unsupported operators are ignored
-            return null;
-        }
-
-        Type type = typeof(T);
-        PropertyInfo? property = type.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance);
-
-        if (property == null)
-        {
-            return null;
-        }
-
-        var queryCondition = new QueryCondition
-        {
-            Term = new OperatorTerm { Operator = binaryOperator },
-            ConstraintValue = constraintValue,
-            Property = new PropertyModel
-            {
-                Alias = propertyName,
-                Name = propertyName,
-                Type = property.PropertyType.Name
-            }
-        };
-
-        return queryCondition;
-    }
-
-    private Func<object, EntityBasic?> MapEntities(string? culture = null)
-    {
-        culture ??= ClientCulture();
-        return x => MapEntity(x, culture);
-    }
-
-    private EntityBasic? MapEntity(object entity, string? culture = null)
-    {
-        culture ??= ClientCulture();
-        return _umbracoMapper.Map<EntityBasic>(entity, context => { context.SetCulture(culture); });
-    }
-
-    private string? ClientCulture() => Request.ClientCulture();
-
-
-    #region GetById
-
-    /// <summary>
-    ///     Gets an entity by it's id
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="type"></param>
-    /// <returns></returns>
-    public ActionResult<EntityBasic?> GetById(int id, UmbracoEntityTypes type) => GetResultForId(id, type);
-
-    /// <summary>
-    ///     Gets an entity by it's key
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="type"></param>
-    /// <returns></returns>
-    public ActionResult<EntityBasic?> GetById(Guid id, UmbracoEntityTypes type) => GetResultForKey(id, type);
-
-    /// <summary>
-    ///     Gets an entity by it's UDI
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="type"></param>
-    /// <returns></returns>
-    public ActionResult<EntityBasic?> GetById(Udi id, UmbracoEntityTypes type)
-    {
-        var guidUdi = id as GuidUdi;
-        if (guidUdi != null)
-        {
-            return GetResultForKey(guidUdi.Guid, type);
-        }
-
-        return NotFound();
-    }
-
-    #endregion
-
-    #region GetByIds
-
-    /// <summary>
-    ///     Get entities by integer ids
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <param name="type"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     We allow for POST because there could be quite a lot of Ids
-    /// </remarks>
-    [HttpGet]
-    [HttpPost]
-    public ActionResult<IEnumerable<EntityBasic>> GetByIds([FromJsonPath] int[] ids, [FromQuery] UmbracoEntityTypes type)
-    {
-        if (ids == null)
-        {
-            return NotFound();
-        }
-
-        return new ActionResult<IEnumerable<EntityBasic>>(GetResultForIds(ids, type));
-    }
-
-    /// <summary>
-    ///     Get entities by GUID ids
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <param name="type"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     We allow for POST because there could be quite a lot of Ids
-    /// </remarks>
-    [HttpGet]
-    [HttpPost]
-    public ActionResult<IEnumerable<EntityBasic>> GetByIds([FromJsonPath] Guid[] ids, [FromQuery] UmbracoEntityTypes type)
-    {
-        if (ids == null)
-        {
-            return NotFound();
-        }
-
-        return new ActionResult<IEnumerable<EntityBasic>>(GetResultForKeys(ids, type));
-    }
-
-    /// <summary>
-    ///     Get entities by UDIs
-    /// </summary>
-    /// <param name="ids">
-    ///     A list of UDIs to lookup items by, all UDIs must be of the same UDI type!
-    /// </param>
-    /// <param name="type"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     We allow for POST because there could be quite a lot of Ids.
-    /// </remarks>
-    [HttpGet]
-    [HttpPost]
-    public ActionResult<IEnumerable<EntityBasic>> GetByIds([FromJsonPath] Udi[] ids, [FromQuery] UmbracoEntityTypes type)
-    {
-        if (ids == null)
-        {
-            return NotFound();
-        }
-
-        if (ids.Length == 0)
-        {
-            return Enumerable.Empty<EntityBasic>().ToList();
-        }
-
-        //all udi types will need to be the same in this list so we'll determine by the first
-        //currently we only support GuidUdi for this method
-
-        var guidUdi = ids[0] as GuidUdi;
-        if (guidUdi != null)
-        {
-            return new ActionResult<IEnumerable<EntityBasic>>(
-                GetResultForKeys(ids.Select(x => ((GuidUdi)x).Guid).ToArray(), type));
-        }
-
-        return NotFound();
-    }
-
-    #endregion
-
-    #region Methods to get all dictionary items
-
-    private IEnumerable<EntityBasic> GetAllDictionaryItems()
-    {
-        var list = new List<EntityBasic>();
-
-        IEnumerable<IDictionaryItem>? rootDictionaryItems = _localizationService.GetRootDictionaryItems();
-        if (rootDictionaryItems is not null)
-        {
-            foreach (IDictionaryItem dictionaryItem in rootDictionaryItems
-                         .OrderBy(DictionaryItemSort()))
-            {
-                EntityBasic? item = _umbracoMapper.Map<IDictionaryItem, EntityBasic>(dictionaryItem);
-                if (item is not null)
-                {
-                    list.Add(item);
-                }
-
-                GetChildItemsForList(dictionaryItem, list);
-            }
-        }
-
-        return list;
-    }
-
-    private static Func<IDictionaryItem, string> DictionaryItemSort() => item => item.ItemKey;
-
-    private void GetChildItemsForList(IDictionaryItem dictionaryItem, ICollection<EntityBasic> list)
-    {
-        IEnumerable<IDictionaryItem>? itemChildren = _localizationService.GetDictionaryItemChildren(dictionaryItem.Key);
-
-        if (itemChildren is not null)
-        {
-            foreach (IDictionaryItem childItem in itemChildren
-                         .OrderBy(DictionaryItemSort()))
-            {
-                EntityBasic? item = _umbracoMapper.Map<IDictionaryItem, EntityBasic>(childItem);
-                if (item is not null)
-                {
-                    list.Add(item);
-                }
-
-                GetChildItemsForList(childItem, list);
-            }
-        }
-    }
-
-    #endregion
-}
-
-
diff --git a/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs b/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs
deleted file mode 100644
index 21cb7fdcd9..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-using Examine;
-using Examine.Search;
-using Lucene.Net.QueryParsers.Classic;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Infrastructure.Examine;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-using SearchResult = Umbraco.Cms.Core.Models.ContentEditing.SearchResult;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[Authorize(Policy = AuthorizationPolicies.SectionAccessSettings)]
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class ExamineManagementController : UmbracoAuthorizedJsonController
-{
-    private readonly IExamineManager _examineManager;
-    private readonly IIndexDiagnosticsFactory _indexDiagnosticsFactory;
-    private readonly IIndexRebuilder _indexRebuilder;
-    private readonly ILogger<ExamineManagementController> _logger;
-    private readonly IAppPolicyCache _runtimeCache;
-
-    public ExamineManagementController(
-        IExamineManager examineManager,
-        ILogger<ExamineManagementController> logger,
-        IIndexDiagnosticsFactory indexDiagnosticsFactory,
-        AppCaches appCaches,
-        IIndexRebuilder indexRebuilder)
-    {
-        _examineManager = examineManager;
-        _logger = logger;
-        _indexDiagnosticsFactory = indexDiagnosticsFactory;
-        _runtimeCache = appCaches.RuntimeCache;
-        _indexRebuilder = indexRebuilder;
-    }
-
-    /// <summary>
-    ///     Get the details for indexers
-    /// </summary>
-    /// <returns></returns>
-    public IEnumerable<ExamineIndexModel> GetIndexerDetails()
-        => _examineManager.Indexes
-            .Select(index => CreateModel(index))
-            .OrderBy(examineIndexModel => examineIndexModel.Name?.TrimEnd("Indexer"));
-
-    /// <summary>
-    ///     Get the details for searchers
-    /// </summary>
-    /// <returns></returns>
-    public IEnumerable<ExamineSearcherModel> GetSearcherDetails()
-    {
-        var model = new List<ExamineSearcherModel>(
-            _examineManager.RegisteredSearchers.Select(searcher => new ExamineSearcherModel { Name = searcher.Name })
-                .OrderBy(x =>
-                    x.Name?.TrimEnd("Searcher"))); //order by name , but strip the "Searcher" from the end if it exists
-        return model;
-    }
-
-    public ActionResult<SearchResults> GetSearchResults(string searcherName, string? query, int pageIndex = 0, int pageSize = 20)
-    {
-        query = query?.Trim();
-
-        if (query.IsNullOrWhiteSpace())
-        {
-            return SearchResults.Empty();
-        }
-
-        ActionResult msg = ValidateSearcher(searcherName, out ISearcher searcher);
-        if (!msg.IsSuccessStatusCode())
-        {
-            return msg;
-        }
-
-        ISearchResults results;
-
-        // NativeQuery will work for a single word/phrase too (but depends on the implementation) the lucene one will work.
-        try
-        {
-            results = searcher
-                .CreateQuery()
-                .NativeQuery(query)
-                .Execute(QueryOptions.SkipTake(pageSize * pageIndex, pageSize));
-        }
-        catch (ParseException)
-        {
-            // will occur if the query parser cannot parse this (i.e. starts with a *)
-            return SearchResults.Empty();
-        }
-
-        return new SearchResults
-        {
-            PageSize = pageSize,
-            TotalRecords = results.TotalItemCount,
-            Results = results.Select(x => new SearchResult
-            {
-                Id = x.Id,
-                Score = x.Score,
-                Values = x.AllValues.OrderBy(y => y.Key).ToDictionary(y => y.Key, y => y.Value)
-            })
-        };
-    }
-
-    /// <summary>
-    ///     Check if the index has been rebuilt
-    /// </summary>
-    /// <param name="indexName"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     This is kind of rudimentary since there's no way we can know that the index has rebuilt, we
-    ///     have a listener for the index op complete so we'll just check if that key is no longer there in the runtime cache
-    /// </remarks>
-    public ActionResult<ExamineIndexModel?> PostCheckRebuildIndex(string indexName)
-    {
-        ActionResult validate = ValidateIndex(indexName, out IIndex? index);
-
-        if (!validate.IsSuccessStatusCode())
-        {
-            return validate;
-        }
-
-        validate = ValidatePopulator(index!);
-        if (!validate.IsSuccessStatusCode())
-        {
-            return validate;
-        }
-
-        var cacheKey = "temp_indexing_op_" + indexName;
-        var found = _runtimeCache.Get(cacheKey);
-
-        //if its still there then it's not done
-        return found != null
-            ? null
-            : CreateModel(index!);
-    }
-
-    /// <summary>
-    ///     Rebuilds the index
-    /// </summary>
-    /// <param name="indexName"></param>
-    /// <returns></returns>
-    public IActionResult PostRebuildIndex(string indexName)
-    {
-        ActionResult validate = ValidateIndex(indexName, out IIndex? index);
-        if (!validate.IsSuccessStatusCode())
-        {
-            return validate;
-        }
-
-        validate = ValidatePopulator(index!);
-        if (!validate.IsSuccessStatusCode())
-        {
-            return validate;
-        }
-
-        _logger.LogInformation("Rebuilding index '{IndexName}'", indexName);
-
-        //remove it in case there's a handler there already
-        index!.IndexOperationComplete -= Indexer_IndexOperationComplete;
-
-        //now add a single handler
-        index.IndexOperationComplete += Indexer_IndexOperationComplete;
-
-        try
-        {
-            var cacheKey = "temp_indexing_op_" + index.Name;
-            //put temp val in cache which is used as a rudimentary way to know when the indexing is done
-            _runtimeCache.Insert(cacheKey, () => "tempValue", TimeSpan.FromMinutes(5));
-
-            _indexRebuilder.RebuildIndex(indexName);
-
-            return new OkResult();
-        }
-        catch (Exception ex)
-        {
-            //ensure it's not listening
-            index.IndexOperationComplete -= Indexer_IndexOperationComplete;
-            _logger.LogError(ex, "An error occurred rebuilding index");
-            var response = new ConflictObjectResult(
-                "The index could not be rebuilt at this time, most likely there is another thread currently writing to the index. Error: {ex}");
-
-            HttpContext.SetReasonPhrase("Could Not Rebuild");
-            return response;
-        }
-    }
-
-    private ExamineIndexModel CreateModel(IIndex index)
-    {
-        var indexName = index.Name;
-        IIndexDiagnostics indexDiag = _indexDiagnosticsFactory.Create(index);
-        Attempt<string?> isHealth = indexDiag.IsHealthy();
-        var healthResult = isHealth.Result;
-
-        long documentCount;
-        int fieldCount;
-
-        try
-        {
-            // This will throw if the index is corrupted - i.e. a file in the index folder cannot be found
-            // Which will break the UI and not give the possibility to rebuild the index
-            documentCount = indexDiag.GetDocumentCount();
-            fieldCount = indexDiag.GetFieldNames().Count();
-        }
-        catch (FileNotFoundException ex)
-        {
-            // Safe catch that will allow to rebuild a corrupted index
-            documentCount = 0;
-            fieldCount = 0;
-
-            _logger.LogWarning(ex, "{name} is corrupted.", indexName);
-
-            if (!string.IsNullOrWhiteSpace(healthResult))
-            {
-                healthResult += " ";
-            }
-
-            // Provide a useful message in the Examine dashboard
-            healthResult += $"It may not be possible to rebuild the index. Please try deleting the entire {indexName} folder and then attempt to rebuild it again.";
-        }
-
-        var properties = new Dictionary<string, object?>
-        {
-            ["DocumentCount"] = documentCount,
-            ["FieldCount"] = fieldCount
-        };
-
-        foreach (KeyValuePair<string, object?> p in indexDiag.Metadata)
-        {
-            properties[p.Key] = p.Value;
-        }
-
-        var indexerModel = new ExamineIndexModel
-        {
-            Name = indexName,
-            HealthStatus = isHealth.Success ? healthResult ?? "Healthy" : healthResult ?? "Unhealthy",
-            ProviderProperties = properties,
-            CanRebuild = _indexRebuilder.CanRebuild(index.Name)
-        };
-
-        return indexerModel;
-    }
-
-    private ActionResult ValidateSearcher(string searcherName, out ISearcher searcher)
-    {
-        //try to get the searcher from the indexes
-        if (_examineManager.TryGetIndex(searcherName, out IIndex index))
-        {
-            searcher = index.Searcher;
-            return new OkResult();
-        }
-
-        //if we didn't find anything try to find it by an explicitly declared searcher
-        if (_examineManager.TryGetSearcher(searcherName, out searcher))
-        {
-            return new OkResult();
-        }
-
-        var response1 = new BadRequestObjectResult($"No searcher found with name = {searcherName}");
-        HttpContext.SetReasonPhrase("Searcher Not Found");
-        return response1;
-    }
-
-    private ActionResult ValidatePopulator(IIndex index)
-    {
-        if (_indexRebuilder.CanRebuild(index.Name))
-        {
-            return new OkResult();
-        }
-
-        var response = new BadRequestObjectResult(
-            $"The index {index.Name} cannot be rebuilt because it does not have an associated {typeof(IIndexPopulator)}");
-        HttpContext.SetReasonPhrase("Index cannot be rebuilt");
-        return response;
-    }
-
-    private ActionResult ValidateIndex(string indexName, out IIndex? index)
-    {
-        index = null;
-
-        if (_examineManager.TryGetIndex(indexName, out index))
-        {
-            //return Ok!
-            return new OkResult();
-        }
-
-        var response = new BadRequestObjectResult($"No index found with name = {indexName}");
-        HttpContext.SetReasonPhrase("Index Not Found");
-        return response;
-    }
-
-    private void Indexer_IndexOperationComplete(object? sender, EventArgs e)
-    {
-        var indexer = (IIndex?)sender;
-        if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug))
-        {
-            _logger.LogDebug("Logging operation completed for index {IndexName}", indexer?.Name);
-        }
-
-        if (indexer is not null)
-        {
-            //ensure it's not listening anymore
-            indexer.IndexOperationComplete -= Indexer_IndexOperationComplete;
-        }
-
-        _logger.LogInformation("Rebuilding index '{indexerName}' done.", indexer?.Name);
-
-        var cacheKey = "temp_indexing_op_" + indexer?.Name;
-        _runtimeCache.Clear(cacheKey);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/HelpController.cs b/src/Umbraco.Web.BackOffice/Controllers/HelpController.cs
deleted file mode 100644
index da3ac9013f..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/HelpController.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System.Net;
-using System.Runtime.Serialization;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Web.Common.Attributes;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class HelpController : UmbracoAuthorizedJsonController
-{
-    private static HttpClient? _httpClient;
-    private readonly ILogger<HelpController> _logger;
-    private HelpPageSettings? _helpPageSettings;
-
-    [ActivatorUtilitiesConstructor]
-    public HelpController(
-        ILogger<HelpController> logger,
-        IOptionsMonitor<HelpPageSettings> helpPageSettings)
-    {
-        _logger = logger;
-
-        ResetHelpPageSettings(helpPageSettings.CurrentValue);
-        helpPageSettings.OnChange(ResetHelpPageSettings);
-    }
-
-    private void ResetHelpPageSettings(HelpPageSettings settings) => _helpPageSettings = settings;
-
-    public async Task<List<HelpPage>> GetContextHelpForPage(string section, string tree,
-        string baseUrl = "https://our.umbraco.com")
-    {
-        if (IsAllowedUrl(baseUrl) is false)
-        {
-            _logger.LogError(
-                $"The following URL is not listed in the allowlist for HelpPage in HelpPageSettings: {baseUrl}");
-            HttpContext.Response.StatusCode = (int)HttpStatusCode.BadRequest;
-
-            // Ideally we'd want to return a BadRequestResult here,
-            // however, since we're not returning ActionResult this is not possible and changing it would be a breaking change.
-            return new List<HelpPage>();
-        }
-
-        var url = string.Format(
-            baseUrl + "/Umbraco/Documentation/Lessons/GetContextHelpDocs?sectionAlias={0}&treeAlias={1}", section,
-            tree);
-
-        try
-        {
-            if (_httpClient == null)
-            {
-                _httpClient = new HttpClient();
-            }
-
-            //fetch dashboard json and parse to JObject
-            var json = await _httpClient.GetStringAsync(url);
-            List<HelpPage>? result = JsonConvert.DeserializeObject<List<HelpPage>>(json);
-            if (result != null)
-            {
-                return result;
-            }
-        }
-        catch (HttpRequestException rex)
-        {
-            _logger.LogInformation("Check your network connection, exception: {message}", rex.Message);
-        }
-
-        return new List<HelpPage>();
-    }
-
-    private bool IsAllowedUrl(string url)
-    {
-        if (_helpPageSettings?.HelpPageUrlAllowList is null ||
-            _helpPageSettings.HelpPageUrlAllowList.Contains(url))
-        {
-            return true;
-        }
-
-        return false;
-    }
-}
-
-[DataContract(Name = "HelpPage")]
-public class HelpPage
-{
-    [DataMember(Name = "name")] public string? Name { get; set; }
-
-    [DataMember(Name = "description")] public string? Description { get; set; }
-
-    [DataMember(Name = "url")] public string? Url { get; set; }
-
-    [DataMember(Name = "type")] public string? Type { get; set; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/IconController.cs b/src/Umbraco.Web.BackOffice/Controllers/IconController.cs
deleted file mode 100644
index 8dd5936a6b..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/IconController.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Controllers;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController("UmbracoApi")]
-[IsBackOffice]
-[UmbracoRequireHttps]
-[MiddlewareFilter(typeof(UnhandledExceptionLoggerFilter))]
-public class IconController : UmbracoApiController
-{
-    private readonly IIconService _iconService;
-
-    public IconController(IIconService iconService) => _iconService = iconService;
-
-    /// <summary>
-    ///     Gets an IconModel containing the icon name and SvgString according to an icon name found at the global icons path
-    /// </summary>
-    /// <param name="iconName"></param>
-    /// <returns></returns>
-    public IconModel? GetIcon(string iconName) => _iconService.GetIcon(iconName);
-
-
-    /// <summary>
-    ///     Gets a list of all svg icons found at at the global icons path.
-    /// </summary>
-    /// <returns></returns>
-    public IReadOnlyDictionary<string, string>? GetIcons() => _iconService.GetIcons();
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs b/src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs
deleted file mode 100644
index bcde978048..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Media;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Web.Common.Attributes;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     The API controller used for getting URLs for images with parameters
-/// </summary>
-/// <remarks>
-///     <para>
-///         This controller allows for retrieving URLs for processed images, such as resized, cropped,
-///         or otherwise altered.  These can be different based on the IImageUrlGenerator
-///         implementation in use, and so the BackOffice could should not rely on hard-coded string
-///         building to generate correct URLs
-///     </para>
-/// </remarks>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class ImageUrlGeneratorController : UmbracoAuthorizedJsonController
-{
-    private readonly IImageUrlGenerator _imageUrlGenerator;
-
-    public ImageUrlGeneratorController(IImageUrlGenerator imageUrlGenerator) => _imageUrlGenerator = imageUrlGenerator;
-
-    public string? GetCropUrl(string mediaPath, int? width = null, int? height = null, ImageCropMode? imageCropMode = null) => _imageUrlGenerator.GetImageUrl(
-        new ImageUrlGenerationOptions(mediaPath) { Width = width, Height = height, ImageCropMode = imageCropMode });
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs b/src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
deleted file mode 100644
index 90ef6e6cf4..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using System.Globalization;
-using System.Web;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Media;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.DependencyInjection;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-/// A controller used to return images for media.
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class ImagesController : UmbracoAuthorizedApiController
-{
-    private readonly MediaFileManager _mediaFileManager;
-    private readonly IImageUrlGenerator _imageUrlGenerator;
-    private ContentSettings _contentSettings;
-
-    [Obsolete("Use non obsolete-constructor. Scheduled for removal in Umbraco 13.")]
-    public ImagesController(
-        MediaFileManager mediaFileManager,
-        IImageUrlGenerator imageUrlGenerator)
-        : this(
-              mediaFileManager,
-              imageUrlGenerator,
-              StaticServiceProvider.Instance.GetRequiredService<IOptionsMonitor<ContentSettings>>())
-    {
-    }
-
-    [ActivatorUtilitiesConstructor]
-    public ImagesController(
-        MediaFileManager mediaFileManager,
-        IImageUrlGenerator imageUrlGenerator,
-        IOptionsMonitor<ContentSettings> contentSettingsMonitor)
-    {
-        _mediaFileManager = mediaFileManager;
-        _imageUrlGenerator = imageUrlGenerator;
-        _contentSettings = contentSettingsMonitor.CurrentValue;
-
-        contentSettingsMonitor.OnChange(x => _contentSettings = x);
-    }
-
-    /// <summary>
-    /// Gets the big thumbnail image for the original image path.
-    /// </summary>
-    /// <param name="originalImagePath"></param>
-    /// <returns></returns>
-    /// <remarks>
-    /// If there is no original image is found then this will return not found.
-    /// </remarks>
-    public IActionResult GetBigThumbnail(string originalImagePath)
-        => string.IsNullOrWhiteSpace(originalImagePath)
-        ? Ok()
-        : GetResized(originalImagePath, 500);
-
-    /// <summary>
-    /// Gets a resized image for the image at the given path.
-    /// </summary>
-    /// <param name="imagePath"></param>
-    /// <param name="width"></param>
-    /// <returns></returns>
-    /// <remarks>
-    /// If there is no media, image property or image file is found then this will return not found.
-    /// </remarks>
-    public IActionResult GetResized(string imagePath, int width)
-    {
-        // We have to use HttpUtility to encode the path here, for non-ASCII characters
-        // We cannot use the WebUtility, as we only want to encode the path, and not the entire string
-        var encodedImagePath = HttpUtility.UrlPathEncode(imagePath);
-
-        var ext = Path.GetExtension(encodedImagePath);
-
-        // check if imagePath is local to prevent open redirect
-        if (!IsAllowed(encodedImagePath))
-        {
-            return Unauthorized();
-        }
-
-        // we need to check if it is an image by extension
-        if (_imageUrlGenerator.IsSupportedImageFormat(ext) == false)
-        {
-            return NotFound();
-        }
-
-        // Redirect to thumbnail with cache buster value generated from last modified time of original media file
-        DateTimeOffset? imageLastModified = null;
-        try
-        {
-            imageLastModified = _mediaFileManager.FileSystem.GetLastModified(imagePath);
-        }
-        catch
-        {
-            // if we get an exception here it's probably because the image path being requested is an image that doesn't exist
-            // in the local media file system. This can happen if someone is storing an absolute path to an image online, which
-            // is perfectly legal but in that case the media file system isn't going to resolve it.
-            // so ignore and we won't set a last modified date.
-        }
-
-        var cacheBusterValue = imageLastModified.HasValue ? imageLastModified.Value.ToFileTime().ToString("x", CultureInfo.InvariantCulture) : null;
-        var imageUrl = _imageUrlGenerator.GetImageUrl(new ImageUrlGenerationOptions(encodedImagePath)
-        {
-            Width = width,
-            ImageCropMode = ImageCropMode.Max,
-            CacheBusterValue = cacheBusterValue
-        });
-
-        if (imageUrl is not null)
-        {
-            return new RedirectResult(imageUrl, false);
-        }
-
-        return NotFound();
-    }
-
-    private bool IsAllowed(string encodedImagePath)
-    {
-        if(Uri.IsWellFormedUriString(encodedImagePath, UriKind.Relative))
-        {
-            return true;
-        }
-
-        var builder = new UriBuilder(encodedImagePath);
-
-        foreach (var allowedMediaHost in _contentSettings.AllowedMediaHosts)
-        {
-            if (string.Equals(builder.Host, allowedMediaHost, StringComparison.InvariantCultureIgnoreCase))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    /// Gets a processed image for the image at the given path
-    /// </summary>
-    /// <param name="imagePath"></param>
-    /// <param name="width"></param>
-    /// <param name="height"></param>
-    /// <param name="focalPointLeft"></param>
-    /// <param name="focalPointTop"></param>
-    /// <param name="mode"></param>
-    /// <param name="cacheBusterValue"></param>
-    /// <param name="cropX1"></param>
-    /// <param name="cropX2"></param>
-    /// <param name="cropY1"></param>
-    /// <param name="cropY2"></param>
-    /// <returns></returns>
-    /// <remarks>
-    /// If there is no media, image property or image file is found then this will return not found.
-    /// </remarks>
-    public string? GetProcessedImageUrl(
-        string imagePath,
-        int? width = null,
-        int? height = null,
-        decimal? focalPointLeft = null,
-        decimal? focalPointTop = null,
-        ImageCropMode mode = ImageCropMode.Max,
-        string? cacheBusterValue = null,
-        decimal? cropX1 = null,
-        decimal? cropX2 = null,
-        decimal? cropY1 = null,
-        decimal? cropY2 = null)
-    {
-        var options = new ImageUrlGenerationOptions(imagePath)
-        {
-            Width = width,
-            Height = height,
-            ImageCropMode = mode,
-            CacheBusterValue = cacheBusterValue
-        };
-
-        if (focalPointLeft.HasValue && focalPointTop.HasValue)
-        {
-            options.FocalPoint = new ImageUrlGenerationOptions.FocalPointPosition(focalPointLeft.Value, focalPointTop.Value);
-        }
-        else if (cropX1.HasValue && cropX2.HasValue && cropY1.HasValue && cropY2.HasValue)
-        {
-            options.Crop = new ImageUrlGenerationOptions.CropCoordinates(cropX1.Value, cropY1.Value, cropX2.Value, cropY2.Value);
-        }
-
-        return _imageUrlGenerator.GetImageUrl(options);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs b/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs
deleted file mode 100644
index ca67aa6c20..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Language = Umbraco.Cms.Core.Models.ContentEditing.Language;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     Backoffice controller supporting the dashboard for language administration.
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class LanguageController : UmbracoAuthorizedJsonController
-{
-    private readonly ILocalizationService _localizationService;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-    [ActivatorUtilitiesConstructor]
-    public LanguageController(ILocalizationService localizationService, IUmbracoMapper umbracoMapper)
-    {
-        _localizationService = localizationService ?? throw new ArgumentNullException(nameof(localizationService));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-    }
-
-        /// <summary>
-        /// Returns all cultures available for creating languages.
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        [Authorize(Policy = AuthorizationPolicies.TreeAccessLanguages)]public IDictionary<string, string> GetAllCultures()
-            => CultureInfo.GetCultures(CultureTypes.AllCultures).DistinctBy(x => x.Name).OrderBy(x => x.EnglishName).ToDictionary(x => x.Name, x => x.EnglishName);
-
-    /// <summary>
-    ///     Returns all currently configured languages.
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet]
-    public IEnumerable<Language>? GetAllLanguages()
-    {
-        IEnumerable<ILanguage> allLanguages = _localizationService.GetAllLanguages();
-
-        return _umbracoMapper.Map<IEnumerable<ILanguage>, IEnumerable<Language>>(allLanguages);
-    }
-
-    [HttpGet]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessLanguages)]
-    public ActionResult<Language?> GetLanguage(int id)
-    {
-        ILanguage? lang = _localizationService.GetLanguageById(id);
-        if (lang == null)
-        {
-            return NotFound();
-        }
-
-        return _umbracoMapper.Map<Language>(lang);
-    }
-
-    /// <summary>
-    ///     Deletes a language with a given ID
-    /// </summary>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessLanguages)]
-    [HttpDelete]
-    [HttpPost]
-    public IActionResult DeleteLanguage(int id)
-    {
-        ILanguage? language = _localizationService.GetLanguageById(id);
-        if (language == null)
-        {
-            return NotFound();
-        }
-
-        // the service would not let us do it, but test here nevertheless
-        if (language.IsDefault)
-        {
-            var message = $"Language '{language.IsoCode}' is currently set to 'default' and can not be deleted.";
-            return ValidationProblem(message);
-        }
-
-        // service is happy deleting a language that's fallback for another language,
-        // will just remove it - so no need to check here
-        _localizationService.Delete(language);
-
-        return Ok();
-    }
-
-    /// <summary>
-    ///     Creates or saves a language
-    /// </summary>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessLanguages)]
-    [HttpPost]
-    public ActionResult<Language?> SaveLanguage(Language language)
-    {
-        if (!ModelState.IsValid)
-        {
-            return ValidationProblem(ModelState);
-        }
-
-        // this is prone to race conditions but the service will not let us proceed anyways
-        ILanguage? existingByCulture = _localizationService.GetLanguageByIsoCode(language.IsoCode);
-
-        // the localization service might return the generic language even when queried for specific ones (e.g. "da" when queried for "da-DK")
-        // - we need to handle that explicitly
-        if (existingByCulture?.IsoCode != language.IsoCode)
-        {
-            existingByCulture = null;
-        }
-
-        if (existingByCulture != null && language.Id != existingByCulture.Id)
-        {
-            // Someone is trying to create a language that already exist
-            ModelState.AddModelError("IsoCode", "The language " + language.IsoCode + " already exists");
-            return ValidationProblem(ModelState);
-        }
-
-        ILanguage? existingById = language.Id != default ? _localizationService.GetLanguageById(language.Id) : null;
-        if (existingById == null)
-        {
-            // Creating a new lang...
-            CultureInfo culture;
-            try
-            {
-                culture = CultureInfo.GetCultureInfo(language.IsoCode!);
-            }
-            catch (CultureNotFoundException)
-            {
-                ModelState.AddModelError("IsoCode", "No Culture found with name " + language.IsoCode);
-                return ValidationProblem(ModelState);
-            }
-
-            // create it (creating a new language cannot create a fallback cycle)
-            var newLang = new Core.Models.Language(culture.Name, language.Name ?? culture.EnglishName)
-            {
-                IsDefault = language.IsDefault,
-                IsMandatory = language.IsMandatory,
-                FallbackIsoCode = language.FallbackIsoCode
-            };
-
-            _localizationService.Save(newLang);
-            return _umbracoMapper.Map<Language>(newLang);
-        }
-
-        existingById.IsoCode = language.IsoCode;
-        if (!string.IsNullOrEmpty(language.Name))
-        {
-            existingById.CultureName = language.Name;
-        }
-
-        // note that the service will prevent the default language from being "un-defaulted"
-        // but does not hurt to test here - though the UI should prevent it too
-        if (existingById.IsDefault && !language.IsDefault)
-        {
-            ModelState.AddModelError("IsDefault", "Cannot un-default the default language.");
-            return ValidationProblem(ModelState);
-        }
-
-        existingById.IsDefault = language.IsDefault;
-        existingById.IsMandatory = language.IsMandatory;
-        existingById.FallbackIsoCode = language.FallbackIsoCode;
-
-        // modifying an existing language can create a fallback, verify
-        // note that the service will check again, dealing with race conditions
-        if (existingById.FallbackIsoCode != null)
-        {
-            var languages = _localizationService.GetAllLanguages().ToDictionary(x => x.IsoCode, x => x);
-            if (!languages.ContainsKey(existingById.FallbackIsoCode))
-            {
-                ModelState.AddModelError("FallbackLanguage", "The selected fall back language does not exist.");
-                return ValidationProblem(ModelState);
-            }
-
-            if (CreatesCycle(existingById, languages))
-            {
-                ModelState.AddModelError("FallbackLanguage",
-                    $"The selected fall back language {existingById.FallbackIsoCode} would create a circular path.");
-                return ValidationProblem(ModelState);
-            }
-        }
-
-        _localizationService.Save(existingById);
-        return _umbracoMapper.Map<Language>(existingById);
-    }
-
-    // see LocalizationService
-    private bool CreatesCycle(ILanguage language, IDictionary<string, ILanguage> languagesByIsoCode)
-    {
-        // a new language is not referenced yet, so cannot be part of a cycle
-        if (!language.HasIdentity)
-        {
-            return false;
-        }
-
-        var isoCode = language.FallbackIsoCode;
-        while (true) // assuming languages does not already contains a cycle, this must end
-        {
-            if (isoCode == null)
-            {
-                return false; // no fallback means no cycle
-            }
-
-            if (isoCode == language.IsoCode)
-            {
-                return true; // back to language = cycle!
-            }
-
-            isoCode = languagesByIsoCode[isoCode].FallbackIsoCode; // else keep chaining
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/LogController.cs b/src/Umbraco.Web.BackOffice/Controllers/LogController.cs
deleted file mode 100644
index 272890584f..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/LogController.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Media;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Persistence.Querying;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Persistence;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     The API controller used for getting log history
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class LogController : UmbracoAuthorizedJsonController
-{
-    private readonly AppCaches _appCaches;
-    private readonly IAuditService _auditService;
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IImageUrlGenerator _imageUrlGenerator;
-    private readonly MediaFileManager _mediaFileManager;
-    private readonly ISqlContext _sqlContext;
-    private readonly IUmbracoMapper _umbracoMapper;
-    private readonly IUserService _userService;
-
-    public LogController(
-        MediaFileManager mediaFileSystem,
-        IImageUrlGenerator imageUrlGenerator,
-        IAuditService auditService,
-        IUmbracoMapper umbracoMapper,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IUserService userService,
-        AppCaches appCaches,
-        ISqlContext sqlContext)
-    {
-        _mediaFileManager = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem));
-        _imageUrlGenerator = imageUrlGenerator ?? throw new ArgumentNullException(nameof(imageUrlGenerator));
-        _auditService = auditService ?? throw new ArgumentNullException(nameof(auditService));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _backofficeSecurityAccessor = backofficeSecurityAccessor ??
-                                      throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
-        _userService = userService ?? throw new ArgumentNullException(nameof(userService));
-        _appCaches = appCaches ?? throw new ArgumentNullException(nameof(appCaches));
-        _sqlContext = sqlContext ?? throw new ArgumentNullException(nameof(sqlContext));
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.SectionAccessContentOrMedia)]
-    public PagedResult<AuditLog> GetPagedEntityLog(
-        int id,
-        int pageNumber = 1,
-        int pageSize = 10,
-        Direction orderDirection = Direction.Descending,
-        DateTime? sinceDate = null)
-    {
-        if (pageSize <= 0 || pageNumber <= 0)
-        {
-            return new PagedResult<AuditLog>(0, pageNumber, pageSize);
-        }
-
-        IQuery<IAuditItem>? dateQuery = sinceDate.HasValue
-            ? _sqlContext.Query<IAuditItem>().Where(x => x.CreateDate >= sinceDate)
-            : null;
-        IEnumerable<IAuditItem> result = _auditService.GetPagedItemsByEntity(
-            id,
-            pageNumber - 1,
-            pageSize,
-            out long totalRecords,
-            orderDirection,
-            customFilter: dateQuery);
-        IEnumerable<AuditLog> mapped = result.Select(item => _umbracoMapper.Map<AuditLog>(item)).WhereNotNull();
-
-        var page = new PagedResult<AuditLog>(totalRecords, pageNumber, pageSize) { Items = MapAvatarsAndNames(mapped) };
-
-        return page;
-    }
-
-    public PagedResult<AuditLog> GetPagedCurrentUserLog(
-        int pageNumber = 1,
-        int pageSize = 10,
-        Direction orderDirection = Direction.Descending,
-        DateTime? sinceDate = null)
-    {
-        if (pageSize <= 0 || pageNumber <= 0)
-        {
-            return new PagedResult<AuditLog>(0, pageNumber, pageSize);
-        }
-
-        IQuery<IAuditItem>? dateQuery = sinceDate.HasValue
-            ? _sqlContext.Query<IAuditItem>().Where(x => x.CreateDate >= sinceDate)
-            : null;
-        var userId = _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1;
-        IEnumerable<IAuditItem> result = _auditService.GetPagedItemsByUser(
-            userId,
-            pageNumber - 1,
-            pageSize,
-            out long totalRecords,
-            orderDirection,
-            customFilter: dateQuery);
-        IEnumerable<AuditLog> mapped = _umbracoMapper.MapEnumerable<IAuditItem, AuditLog>(result).WhereNotNull();
-        return new PagedResult<AuditLog>(totalRecords, pageNumber, pageSize) { Items = MapAvatarsAndNames(mapped) };
-    }
-
-    public IEnumerable<AuditLog> GetLog(AuditType logType, DateTime? sinceDate = null)
-    {
-        IEnumerable<IAuditItem> result = _auditService.GetLogs(Enum<AuditType>.Parse(logType.ToString()), sinceDate);
-        IEnumerable<AuditLog> mapped = _umbracoMapper.MapEnumerable<IAuditItem, AuditLog>(result).WhereNotNull();
-        return mapped;
-    }
-
-    private IEnumerable<AuditLog> MapAvatarsAndNames(IEnumerable<AuditLog> items)
-    {
-        var mappedItems = items.ToList();
-        var userIds = mappedItems.Select(x => x.UserId).ToArray();
-        var userAvatars = _userService.GetUsersById(userIds).ToDictionary(
-            x => x.Id, x => x.GetUserAvatarUrls(_appCaches.RuntimeCache, _mediaFileManager, _imageUrlGenerator));
-        var userNames = _userService.GetUsersById(userIds).ToDictionary(x => x.Id, x => x.Name);
-        foreach (AuditLog item in mappedItems)
-        {
-            if (userAvatars.TryGetValue(item.UserId, out var avatars))
-            {
-                item.UserAvatars = avatars;
-            }
-
-            if (userNames.TryGetValue(item.UserId, out var name))
-            {
-                item.UserName = name;
-            }
-        }
-
-        return mappedItems;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs b/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
deleted file mode 100644
index 83e86aaeda..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using System.Collections.ObjectModel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Serilog.Events;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Logging.Viewer;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     Backoffice controller supporting the dashboard for viewing logs with some simple graphs &amp; filtering
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessSettings)]
-public class LogViewerController : BackOfficeNotificationsController
-{
-    private readonly ILogLevelLoader _logLevelLoader;
-    private readonly ILogViewer _logViewer;
-
-    [ActivatorUtilitiesConstructor]
-    public LogViewerController(ILogViewer logViewer, ILogLevelLoader logLevelLoader)
-    {
-        _logViewer = logViewer ?? throw new ArgumentNullException(nameof(logViewer));
-        _logLevelLoader = logLevelLoader ?? throw new ArgumentNullException(nameof(logLevelLoader));
-    }
-
-    private bool CanViewLogs(LogTimePeriod logTimePeriod)
-    {
-        //Can the interface deal with Large Files
-        if (_logViewer.CanHandleLargeLogs)
-        {
-            return true;
-        }
-
-        //Interface CheckCanOpenLogs
-        return _logViewer.CheckCanOpenLogs(logTimePeriod);
-    }
-
-    [HttpGet]
-    public bool GetCanViewLogs([FromQuery] DateTime? startDate = null, [FromQuery] DateTime? endDate = null)
-    {
-        LogTimePeriod logTimePeriod = GetTimePeriod(startDate, endDate);
-        return CanViewLogs(logTimePeriod);
-    }
-
-    [HttpGet]
-    public ActionResult<int> GetNumberOfErrors([FromQuery] DateTime? startDate = null,
-        [FromQuery] DateTime? endDate = null)
-    {
-        LogTimePeriod logTimePeriod = GetTimePeriod(startDate, endDate);
-        //We will need to stop the request if trying to do this on a 1GB file
-        if (CanViewLogs(logTimePeriod) == false)
-        {
-            return ValidationProblem("Unable to view logs, due to size");
-        }
-
-        return _logViewer.GetNumberOfErrors(logTimePeriod);
-    }
-
-    [HttpGet]
-    public ActionResult<LogLevelCounts> GetLogLevelCounts([FromQuery] DateTime? startDate = null,
-        [FromQuery] DateTime? endDate = null)
-    {
-        LogTimePeriod logTimePeriod = GetTimePeriod(startDate, endDate);
-        //We will need to stop the request if trying to do this on a 1GB file
-        if (CanViewLogs(logTimePeriod) == false)
-        {
-            return ValidationProblem("Unable to view logs, due to size");
-        }
-
-        return _logViewer.GetLogLevelCounts(logTimePeriod);
-    }
-
-    [HttpGet]
-    public ActionResult<IEnumerable<LogTemplate>> GetMessageTemplates([FromQuery] DateTime? startDate = null,
-        [FromQuery] DateTime? endDate = null)
-    {
-        LogTimePeriod logTimePeriod = GetTimePeriod(startDate, endDate);
-        //We will need to stop the request if trying to do this on a 1GB file
-        if (CanViewLogs(logTimePeriod) == false)
-        {
-            return ValidationProblem("Unable to view logs, due to size");
-        }
-
-        return new ActionResult<IEnumerable<LogTemplate>>(_logViewer.GetMessageTemplates(logTimePeriod));
-    }
-
-    [HttpGet]
-    public ActionResult<PagedResult<LogMessage>> GetLogs(string orderDirection = "Descending", int pageNumber = 1,
-        string? filterExpression = null, [FromQuery(Name = "logLevels[]")] string[]? logLevels = null,
-        [FromQuery] DateTime? startDate = null, [FromQuery] DateTime? endDate = null)
-    {
-        LogTimePeriod logTimePeriod = GetTimePeriod(startDate, endDate);
-
-        //We will need to stop the request if trying to do this on a 1GB file
-        if (CanViewLogs(logTimePeriod) == false)
-        {
-            return ValidationProblem("Unable to view logs, due to size");
-        }
-
-        Direction direction = orderDirection == "Descending" ? Direction.Descending : Direction.Ascending;
-
-        return _logViewer.GetLogs(logTimePeriod, filterExpression: filterExpression, pageNumber: pageNumber,
-            orderDirection: direction, logLevels: logLevels);
-    }
-
-    private static LogTimePeriod GetTimePeriod(DateTime? startDate, DateTime? endDate)
-    {
-        if (startDate == null || endDate == null)
-        {
-            DateTime now = DateTime.Now;
-            if (startDate == null)
-            {
-                startDate = now.AddDays(-1);
-            }
-
-            if (endDate == null)
-            {
-                endDate = now;
-            }
-        }
-
-        return new LogTimePeriod(startDate.Value, endDate.Value);
-    }
-
-    [HttpGet]
-    public IEnumerable<SavedLogSearch> GetSavedSearches() => _logViewer.GetSavedSearches();
-
-    [HttpPost]
-    public IEnumerable<SavedLogSearch> PostSavedSearch(SavedLogSearch item) =>
-        _logViewer.AddSavedSearch(item.Name, item.Query);
-
-    [HttpPost]
-    public IEnumerable<SavedLogSearch> DeleteSavedSearch(SavedLogSearch item) =>
-        _logViewer.DeleteSavedSearch(item.Name);
-
-    [HttpGet]
-    public ReadOnlyDictionary<string, LogEventLevel?> GetLogLevels() => _logLevelLoader.GetLogLevelsFromSinks();
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs b/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs
deleted file mode 100644
index efa322a88c..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-using System.Globalization;
-using System.Text;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Core.Templates;
-using Umbraco.Cms.Core.Web;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     API controller to deal with Macro data
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class MacroRenderingController : UmbracoAuthorizedJsonController
-{
-    private readonly IUmbracoComponentRenderer _componentRenderer;
-    private readonly IMacroService _macroService;
-    private readonly IShortStringHelper _shortStringHelper;
-    private readonly ISiteDomainMapper _siteDomainHelper;
-    private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-    private readonly IUmbracoMapper _umbracoMapper;
-    private readonly IVariationContextAccessor _variationContextAccessor;
-
-
-    public MacroRenderingController(
-        IUmbracoMapper umbracoMapper,
-        IUmbracoComponentRenderer componentRenderer,
-        IVariationContextAccessor variationContextAccessor,
-        IMacroService macroService,
-        IUmbracoContextAccessor umbracoContextAccessor,
-        IShortStringHelper shortStringHelper,
-        ISiteDomainMapper siteDomainHelper)
-
-    {
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _componentRenderer = componentRenderer ?? throw new ArgumentNullException(nameof(componentRenderer));
-        _variationContextAccessor = variationContextAccessor ??
-                                    throw new ArgumentNullException(nameof(variationContextAccessor));
-        _macroService = macroService ?? throw new ArgumentNullException(nameof(macroService));
-        _umbracoContextAccessor =
-            umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
-        _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
-        _siteDomainHelper = siteDomainHelper ?? throw new ArgumentNullException(nameof(siteDomainHelper));
-    }
-
-    /// <summary>
-    ///     Gets the macro parameters to be filled in for a particular macro
-    /// </summary>
-    /// <returns></returns>
-    /// <remarks>
-    ///     Note that ALL logged in users have access to this method because editors will need to insert macros into rte
-    ///     (content/media/members) and it's used for
-    ///     inserting into templates/views/etc... it doesn't expose any sensitive data.
-    /// </remarks>
-    public ActionResult<IEnumerable<MacroParameter>> GetMacroParameters(int macroId)
-    {
-        IMacro? macro = _macroService.GetById(macroId);
-        if (macro == null)
-        {
-            return NotFound();
-        }
-
-        return new ActionResult<IEnumerable<MacroParameter>>(
-            _umbracoMapper.Map<IEnumerable<MacroParameter>>(macro)!.OrderBy(x => x.SortOrder));
-    }
-
-    /// <summary>
-    ///     Gets a rendered macro as HTML for rendering in the rich text editor
-    /// </summary>
-    /// <param name="macroAlias"></param>
-    /// <param name="pageId"></param>
-    /// <param name="macroParams">
-    ///     To send a dictionary as a GET parameter the query should be structured like:
-    ///     ?macroAlias=Test&amp;pageId=3634&amp;macroParams[0].key=myKey&amp;macroParams[0].value=myVal&amp;macroParams[1].key=anotherKey
-    ///     &macroParams[1].value=anotherVal
-    /// </param>
-    /// <returns></returns>
-    [HttpGet]
-    public async Task<IActionResult> GetMacroResultAsHtmlForEditor(string macroAlias, int pageId,
-        [FromQuery] IDictionary<string, object> macroParams) =>
-        await GetMacroResultAsHtml(macroAlias, pageId, macroParams);
-
-    /// <summary>
-    ///     Gets a rendered macro as HTML for rendering in the rich text editor.
-    ///     Using HTTP POST instead of GET allows for more parameters to be passed as it's not dependent on URL-length
-    ///     limitations like GET.
-    ///     The method using GET is kept to maintain backwards compatibility
-    /// </summary>
-    /// <param name="model"></param>
-    /// <returns></returns>
-    [HttpPost]
-    public async Task<IActionResult> GetMacroResultAsHtmlForEditor(MacroParameterModel model) =>
-        await GetMacroResultAsHtml(model.MacroAlias, model.PageId, model.MacroParams);
-
-    private async Task<IActionResult> GetMacroResultAsHtml(string? macroAlias, int pageId,
-        IDictionary<string, object>? macroParams)
-    {
-        IMacro? m = macroAlias is null ? null : _macroService.GetByAlias(macroAlias);
-        if (m == null)
-        {
-            return NotFound();
-        }
-
-        IUmbracoContext umbracoContext = _umbracoContextAccessor.GetRequiredUmbracoContext();
-        IPublishedContent? publishedContent = umbracoContext.Content?.GetById(true, pageId);
-
-        //if it isn't supposed to be rendered in the editor then return an empty string
-        //currently we cannot render a macro if the page doesn't yet exist
-        if (pageId == -1 || publishedContent == null || m.DontRender)
-        {
-            //need to create a specific content result formatted as HTML since this controller has been configured
-            //with only json formatters.
-            return Content(string.Empty, "text/html", Encoding.UTF8);
-        }
-
-
-        // When rendering the macro in the backoffice the default setting would be to use the Culture of the logged in user.
-        // Since a Macro might contain thing thats related to the culture of the "IPublishedContent" (ie Dictionary keys) we want
-        // to set the current culture to the currently edited culture with fallback to the culture related to the content item.
-        var culture = Request.ClientCulture() ?? DomainUtilities.GetCultureFromDomains(publishedContent.Id, publishedContent.Path, null,
-            umbracoContext, _siteDomainHelper);
-
-        if (culture != null)
-        {
-            Thread.CurrentThread.CurrentCulture =
-                Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo(culture);
-        }
-
-        // must have an active variation context!
-        _variationContextAccessor.VariationContext = new VariationContext(culture);
-
-        using (umbracoContext.ForcedPreview(true))
-        {
-            //need to create a specific content result formatted as HTML since this controller has been configured
-            //with only json formatters.
-            return Content(
-                (await _componentRenderer.RenderMacroForContent(publishedContent, m.Alias, macroParams)).ToString() ??
-                string.Empty, "text/html",
-                Encoding.UTF8);
-        }
-    }
-
-    [HttpPost]
-    public IActionResult CreatePartialViewMacroWithFile(CreatePartialViewMacroWithFileModel model)
-    {
-        if (model == null)
-        {
-            throw new ArgumentNullException("model");
-        }
-
-        if (string.IsNullOrWhiteSpace(model.Filename))
-        {
-            throw new ArgumentException("Filename cannot be null or whitespace", "model.Filename");
-        }
-
-        if (string.IsNullOrWhiteSpace(model.VirtualPath))
-        {
-            throw new ArgumentException("VirtualPath cannot be null or whitespace", "model.VirtualPath");
-        }
-
-        var macroName = model.Filename.TrimEnd(".cshtml");
-
-        var macro = new Macro(_shortStringHelper)
-        {
-            Alias = macroName.ToSafeAlias(_shortStringHelper),
-            Name = macroName,
-            MacroSource = model.VirtualPath.EnsureStartsWith("~")
-        };
-
-        _macroService.Save(macro); // may throw
-        return Ok();
-    }
-
-    public class MacroParameterModel
-    {
-        public string? MacroAlias { get; set; }
-        public int PageId { get; set; }
-        public IDictionary<string, object>? MacroParams { get; set; }
-    }
-
-    public class CreatePartialViewMacroWithFileModel
-    {
-        public string? Filename { get; set; }
-        public string? VirtualPath { get; set; }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/MediaPickerThreeController.cs b/src/Umbraco.Web.BackOffice/Controllers/MediaPickerThreeController.cs
deleted file mode 100644
index 57b27e1df2..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/MediaPickerThreeController.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System.Net;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Dictionary;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Media;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Web.Common.ActionsResults;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessMedia)]
-public class MediaPickerThreeController : ContentControllerBase
-{
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly ContentSettings _contentSettings;
-    private readonly IImageUrlGenerator _imageUrlGenerator;
-    private readonly IIOHelper _ioHelper;
-
-    public MediaPickerThreeController(
-        ICultureDictionary cultureDictionary,
-        ILoggerFactory loggerFactory,
-        IShortStringHelper shortStringHelper,
-        IEventMessagesFactory eventMessages,
-        ILocalizedTextService localizedTextService,
-        IJsonSerializer serializer,
-        IHostingEnvironment hostingEnvironment,
-        IOptionsSnapshot<ContentSettings> contentSettings,
-        IImageUrlGenerator imageUrlGenerator,
-        IIOHelper ioHelper)
-        : base(cultureDictionary, loggerFactory, shortStringHelper, eventMessages, localizedTextService, serializer)
-    {
-        _hostingEnvironment = hostingEnvironment;
-        _contentSettings = contentSettings.Value;
-        _imageUrlGenerator = imageUrlGenerator;
-        _ioHelper = ioHelper;
-    }
-
-    [HttpPost]
-    public async Task<IActionResult> UploadMedia(List<IFormFile> file)
-    {
-        // Create an unique folder path to help with concurrent users to avoid filename clash
-        var imageTempPath =
-            _hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempFileUploads + "/" + Guid.NewGuid());
-
-        // Ensure image temp path exists
-        if (Directory.Exists(imageTempPath) == false)
-        {
-            Directory.CreateDirectory(imageTempPath);
-        }
-
-        // Must have a file
-        if (file.Count == 0)
-        {
-            return NotFound();
-        }
-
-        // Should only have one file
-        if (file.Count > 1)
-        {
-            return new UmbracoProblemResult("Only one file can be uploaded at a time", HttpStatusCode.BadRequest);
-        }
-
-        // Really we should only have one file per request to this endpoint
-        IFormFile formFile = file.First();
-
-        var fileName = formFile.FileName.Trim(new[] { '\"' }).TrimEnd();
-        var safeFileName = fileName.ToSafeFileName(ShortStringHelper);
-        var ext = safeFileName.Substring(safeFileName.LastIndexOf('.') + 1).ToLowerInvariant();
-
-        if (_contentSettings.IsFileAllowedForUpload(ext) == false)
-        {
-            // Throw some error - to say can't upload this IMG type
-            return new UmbracoProblemResult("This is not an image filetype extension that is approved", HttpStatusCode.BadRequest);
-        }
-
-        var newFilePath = imageTempPath + Path.DirectorySeparatorChar + safeFileName;
-        var relativeNewFilePath = GetRelativePath(newFilePath);
-
-        await using (FileStream stream = System.IO.File.Create(newFilePath))
-        {
-            await formFile.CopyToAsync(stream);
-        }
-
-        return Ok(new { tmpLocation = relativeNewFilePath });
-    }
-
-    // Use private method istead of _ioHelper.GetRelativePath as that is relative for the webroot and not the content root.
-    private string GetRelativePath(string path)
-    {
-        if (path.IsFullPath())
-        {
-            var rootDirectory = _hostingEnvironment.MapPathContentRoot("~");
-            var relativePath = _ioHelper.PathStartsWith(path, rootDirectory) ? path[rootDirectory.Length..] : path;
-            path = relativePath;
-        }
-
-        return PathUtility.EnsurePathIsApplicationRootPrefixed(path);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs
deleted file mode 100644
index 0e7b7f9667..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs
+++ /dev/null
@@ -1,458 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Dictionary;
-using Umbraco.Cms.Core.Editors;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     An API controller used for dealing with content types
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[ParameterSwapControllerActionSelector(nameof(GetById), "id", typeof(int), typeof(Guid), typeof(Udi))]
-[ParameterSwapControllerActionSelector(nameof(GetAllowedChildren), "contentId", typeof(int), typeof(Guid), typeof(Udi))]
-public class MediaTypeController : ContentTypeControllerBase<IMediaType>
-{
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    // TODO: Split this controller apart so that authz is consistent, currently we need to authz each action individually.
-    // It would be possible to have something like a MediaTypeInfoController for the GetById/GetAllowedChildren/etc... actions
-
-    private readonly IContentTypeService _contentTypeService;
-    private readonly IEntityService _entityService;
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly IMediaService _mediaService;
-    private readonly IMediaTypeService _mediaTypeService;
-    private readonly IShortStringHelper _shortStringHelper;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-    public MediaTypeController(
-        ICultureDictionary cultureDictionary,
-        EditorValidatorCollection editorValidatorCollection,
-        IContentTypeService contentTypeService,
-        IMediaTypeService mediaTypeService,
-        IMemberTypeService memberTypeService,
-        IUmbracoMapper umbracoMapper,
-        ILocalizedTextService localizedTextService,
-        IShortStringHelper shortStringHelper,
-        IEntityService entityService,
-        IMediaService mediaService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor)
-        : base(
-            cultureDictionary,
-            editorValidatorCollection,
-            contentTypeService,
-            mediaTypeService,
-            memberTypeService,
-            umbracoMapper,
-            localizedTextService)
-    {
-        _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
-        _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
-        _mediaTypeService = mediaTypeService ?? throw new ArgumentNullException(nameof(mediaTypeService));
-        _mediaService = mediaService ?? throw new ArgumentNullException(nameof(mediaService));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _contentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService));
-        _backofficeSecurityAccessor = backofficeSecurityAccessor ??
-                                      throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
-        _localizedTextService =
-            localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
-    }
-
-    public int GetCount() => _contentTypeService.Count();
-
-    /// <summary>
-    ///     Gets the media type a given id
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaOrMediaTypes)]
-    public ActionResult<MediaTypeDisplay?> GetById(int id)
-    {
-        IMediaType? ct = _mediaTypeService.Get(id);
-        if (ct == null)
-        {
-            return NotFound();
-        }
-
-        MediaTypeDisplay? dto = _umbracoMapper.Map<IMediaType, MediaTypeDisplay>(ct);
-        return dto;
-    }
-
-    /// <summary>
-    ///     Gets the media type a given guid
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaOrMediaTypes)]
-    public ActionResult<MediaTypeDisplay?> GetById(Guid id)
-    {
-        IMediaType? mediaType = _mediaTypeService.Get(id);
-        if (mediaType == null)
-        {
-            return NotFound();
-        }
-
-        MediaTypeDisplay? dto = _umbracoMapper.Map<IMediaType, MediaTypeDisplay>(mediaType);
-        return dto;
-    }
-
-    /// <summary>
-    ///     Gets the media type a given udi
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaOrMediaTypes)]
-    public ActionResult<MediaTypeDisplay?> GetById(Udi id)
-    {
-        var guidUdi = id as GuidUdi;
-        if (guidUdi == null)
-        {
-            return NotFound();
-        }
-
-        IMediaType? mediaType = _mediaTypeService.Get(guidUdi.Guid);
-        if (mediaType == null)
-        {
-            return NotFound();
-        }
-
-        MediaTypeDisplay? dto = _umbracoMapper.Map<IMediaType, MediaTypeDisplay>(mediaType);
-        return dto;
-    }
-
-    /// <summary>
-    ///     Returns a media type by alias
-    /// </summary>
-    /// <param name="aliases">Alias of the media type</param>
-    /// <returns></returns>
-    public IEnumerable<MediaTypeDisplay> GetAllFiltered([FromQuery] string[] aliases)
-    {
-        if (aliases.Length < 1)
-        {
-            return _mediaTypeService.GetAll().Select(_umbracoMapper.Map<IMediaType, MediaTypeDisplay>).WhereNotNull();
-        }
-
-        var mediaTypeDisplays = new List<MediaTypeDisplay>();
-
-        foreach (var alias in aliases)
-        {
-            IMediaType? mediaType = _mediaTypeService.Get(alias);
-
-            MediaTypeDisplay? mediaTypeDisplay = _umbracoMapper.Map<IMediaType, MediaTypeDisplay>(mediaType);
-
-            if (mediaTypeDisplay is not null)
-            {
-                mediaTypeDisplays.Add(mediaTypeDisplay);
-            }
-        }
-
-        return mediaTypeDisplays;
-    }
-
-    /// <summary>
-    ///     Deletes a media type with a given ID
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [HttpDelete]
-    [HttpPost]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]
-    public IActionResult DeleteById(int id)
-    {
-        IMediaType? foundType = _mediaTypeService.Get(id);
-        if (foundType == null)
-        {
-            return NotFound();
-        }
-
-        _mediaTypeService.Delete(foundType, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-        return Ok();
-    }
-
-    /// <summary>
-    ///     Returns the available compositions for this content type
-    ///     This has been wrapped in a dto instead of simple parameters to support having multiple parameters in post request
-    ///     body
-    /// </summary>
-    /// <param name="filter.contentTypeId"></param>
-    /// <param name="filter.ContentTypes">
-    ///     This is normally an empty list but if additional content type aliases are passed in, any content types containing
-    ///     those aliases will be filtered out
-    ///     along with any content types that have matching property types that are included in the filtered content types
-    /// </param>
-    /// <param name="filter.PropertyTypes">
-    ///     This is normally an empty list but if additional property type aliases are passed in, any content types that have
-    ///     these aliases will be filtered out.
-    ///     This is required because in the case of creating/modifying a content type because new property types being added to
-    ///     it are not yet persisted so cannot
-    ///     be looked up via the db, they need to be passed in.
-    /// </param>
-    /// <param name="filter">
-    ///     Filter applied when resolving compositions
-    /// </param>
-    /// <returns></returns>
-    [HttpPost]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]
-    public IActionResult GetAvailableCompositeMediaTypes(GetAvailableCompositionsFilter filter)
-    {
-        ActionResult<IEnumerable<Tuple<EntityBasic?, bool>>> actionResult = PerformGetAvailableCompositeContentTypes(
-            filter.ContentTypeId,
-            UmbracoObjectTypes.MediaType,
-            filter.FilterContentTypes,
-            filter.FilterPropertyTypes,
-            filter.IsElement);
-
-        if (!(actionResult.Result is null))
-        {
-            return actionResult.Result;
-        }
-
-        var result = actionResult.Value?.Select(x => new { contentType = x.Item1, allowed = x.Item2 });
-        return Ok(result);
-    }
-
-    /// <summary>
-    ///     Returns where a particular composition has been used
-    ///     This has been wrapped in a dto instead of simple parameters to support having multiple parameters in post request
-    ///     body
-    /// </summary>
-    /// <param name="filter"></param>
-    /// <returns></returns>
-    [HttpPost]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]
-    public IActionResult GetWhereCompositionIsUsedInContentTypes(GetAvailableCompositionsFilter filter)
-    {
-        var result =
-            PerformGetWhereCompositionIsUsedInContentTypes(filter.ContentTypeId, UmbracoObjectTypes.MediaType).Value?
-                .Select(x => new { contentType = x });
-        return Ok(result);
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]
-    public MediaTypeDisplay? GetEmpty(int parentId)
-    {
-        IMediaType mt;
-        if (parentId != Constants.System.Root)
-        {
-            IMediaType? parent = _mediaTypeService.Get(parentId);
-            mt = parent != null
-                ? new MediaType(_shortStringHelper, parent, string.Empty)
-                : new MediaType(_shortStringHelper, parentId);
-        }
-        else
-        {
-            mt = new MediaType(_shortStringHelper, parentId);
-        }
-
-        mt.Icon = Constants.Icons.MediaImage;
-
-        MediaTypeDisplay? dto = _umbracoMapper.Map<IMediaType, MediaTypeDisplay>(mt);
-        return dto;
-    }
-
-
-    /// <summary>
-    ///     Returns all media types
-    /// </summary>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]
-    public IEnumerable<ContentTypeBasic> GetAll() =>
-        _mediaTypeService.GetAll()
-            .Select(_umbracoMapper.Map<IMediaType, ContentTypeBasic>).WhereNotNull();
-
-    /// <summary>
-    ///     Deletes a media type container with a given ID
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [HttpDelete]
-    [HttpPost]
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]
-    public IActionResult DeleteContainer(int id)
-    {
-        _mediaTypeService.DeleteContainer(id, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-
-        return Ok();
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]
-    public IActionResult PostCreateContainer(int parentId, string name)
-    {
-        Attempt<OperationResult<OperationResultType, EntityContainer>?> result =
-            _mediaTypeService.CreateContainer(parentId, Guid.NewGuid(), name, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-
-        if (result.Success)
-        {
-            return Ok(result.Result); //return the id
-        }
-
-        return ValidationProblem(result.Exception?.Message);
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]
-    public IActionResult PostRenameContainer(int id, string name)
-    {
-        Attempt<OperationResult<OperationResultType, EntityContainer>?> result =
-            _mediaTypeService.RenameContainer(id, name, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-
-        if (result.Success)
-        {
-            return Ok(result.Result); //return the id
-        }
-
-        return ValidationProblem(result.Exception?.Message);
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]
-    public ActionResult<MediaTypeDisplay?> PostSave(MediaTypeSave contentTypeSave)
-    {
-        ActionResult<IMediaType?> savedCt = PerformPostSave<MediaTypeDisplay, MediaTypeSave, PropertyTypeBasic>(
-            contentTypeSave,
-            i => _mediaTypeService.Get(i),
-            type => _mediaTypeService.Save(type));
-
-        if (!(savedCt.Result is null))
-        {
-            return savedCt.Result;
-        }
-
-        MediaTypeDisplay? display = _umbracoMapper.Map<MediaTypeDisplay>(savedCt.Value);
-
-
-        display?.AddSuccessNotification(
-            _localizedTextService.Localize("speechBubbles", "mediaTypeSavedHeader"),
-            string.Empty);
-
-        return display;
-    }
-
-    /// <summary>
-    ///     Move the media type
-    /// </summary>
-    /// <param name="move"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]
-    public IActionResult PostMove(MoveOrCopy move) =>
-        PerformMove(
-            move,
-            i => _mediaTypeService.Get(i),
-            (type, i) => _mediaTypeService.Move(type, i));
-
-    /// <summary>
-    ///     Copy the media type
-    /// </summary>
-    /// <param name="copy"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]
-    public IActionResult PostCopy(MoveOrCopy copy) =>
-        PerformCopy(
-            copy,
-            i => _mediaTypeService.Get(i),
-            (type, i) => _mediaTypeService.Copy(type, i));
-
-
-    #region GetAllowedChildren
-
-    /// <summary>
-    ///     Returns the allowed child content type objects for the content item id passed in - based on an INT id
-    /// </summary>
-    /// <param name="contentId"></param>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaOrMediaTypes)]
-    [OutgoingEditorModelEvent]
-    public IEnumerable<ContentTypeBasic> GetAllowedChildren(int contentId)
-    {
-        if (contentId == Constants.System.RecycleBinContent)
-        {
-            return Enumerable.Empty<ContentTypeBasic>();
-        }
-
-        IEnumerable<IMediaType> types;
-        if (contentId == Constants.System.Root)
-        {
-            types = _mediaTypeService.GetAll().ToList();
-
-            //if no allowed root types are set, just return everything
-            if (types.Any(x => x.AllowedAsRoot))
-            {
-                types = types.Where(x => x.AllowedAsRoot);
-            }
-        }
-        else
-        {
-            IMedia? contentItem = _mediaService.GetById(contentId);
-            if (contentItem == null)
-            {
-                return Enumerable.Empty<ContentTypeBasic>();
-            }
-
-            IMediaType? contentType = _mediaTypeService.Get(contentItem.ContentTypeId);
-            var keys = contentType?.AllowedContentTypes?.OrderBy(c => c.SortOrder).Select(x => x.Key).ToArray();
-
-            if (keys is null || keys.Any() == false)
-            {
-                return Enumerable.Empty<ContentTypeBasic>();
-            }
-
-            types = _mediaTypeService.GetAll(keys).OrderBy(c => keys.IndexOf(c.Key)).ToList();
-        }
-
-        var basics = types.Select(_umbracoMapper.Map<IMediaType, ContentTypeBasic>).WhereNotNull().ToList();
-
-        foreach (ContentTypeBasic basic in basics)
-        {
-            basic.Name = TranslateItem(basic.Name);
-            basic.Description = TranslateItem(basic.Description);
-        }
-
-        return basics.OrderBy(c => contentId == Constants.System.Root ? c.Name : string.Empty);
-    }
-
-    /// <summary>
-    ///     Returns the allowed child content type objects for the content item id passed in - based on a GUID id
-    /// </summary>
-    /// <param name="contentId"></param>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaOrMediaTypes)]
-    public ActionResult<IEnumerable<ContentTypeBasic>> GetAllowedChildren(Guid contentId)
-    {
-        IEntitySlim? entity = _entityService.Get(contentId);
-        if (entity != null)
-        {
-            return new ActionResult<IEnumerable<ContentTypeBasic>>(GetAllowedChildren(entity.Id));
-        }
-
-        return NotFound();
-    }
-
-    /// <summary>
-    ///     Returns the allowed child content type objects for the content item id passed in - based on a UDI id
-    /// </summary>
-    /// <param name="contentId"></param>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaOrMediaTypes)]
-    public ActionResult<IEnumerable<ContentTypeBasic>> GetAllowedChildren(Udi contentId)
-    {
-        var guidUdi = contentId as GuidUdi;
-        if (guidUdi != null)
-        {
-            IEntitySlim? entity = _entityService.Get(guidUdi.Guid);
-            if (entity != null)
-            {
-                return new ActionResult<IEnumerable<ContentTypeBasic>>(GetAllowedChildren(entity.Id));
-            }
-        }
-
-        return NotFound();
-    }
-
-    #endregion
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs
deleted file mode 100644
index f39795f32e..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     An API controller used for dealing with member groups
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessMemberGroups)]
-[ParameterSwapControllerActionSelector(nameof(GetById), "id", typeof(int), typeof(Guid), typeof(Udi))]
-public class MemberGroupController : UmbracoAuthorizedJsonController
-{
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly IMemberGroupService _memberGroupService;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-    public MemberGroupController(
-        IMemberGroupService memberGroupService,
-        IUmbracoMapper umbracoMapper,
-        ILocalizedTextService localizedTextService)
-    {
-        _memberGroupService = memberGroupService ?? throw new ArgumentNullException(nameof(memberGroupService));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _localizedTextService =
-            localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
-    }
-
-    /// <summary>
-    ///     Gets the member group json for the member group id
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ActionResult<MemberGroupDisplay?> GetById(int id)
-    {
-        IMemberGroup? memberGroup = _memberGroupService.GetById(id);
-        if (memberGroup == null)
-        {
-            return NotFound();
-        }
-
-        MemberGroupDisplay? dto = _umbracoMapper.Map<IMemberGroup, MemberGroupDisplay>(memberGroup);
-        return dto;
-    }
-
-    /// <summary>
-    ///     Gets the member group json for the member group guid
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ActionResult<MemberGroupDisplay?> GetById(Guid id)
-    {
-        IMemberGroup? memberGroup = _memberGroupService.GetById(id);
-        if (memberGroup == null)
-        {
-            return NotFound();
-        }
-
-        return _umbracoMapper.Map<IMemberGroup, MemberGroupDisplay>(memberGroup);
-    }
-
-    /// <summary>
-    ///     Gets the member group json for the member group udi
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ActionResult<MemberGroupDisplay?> GetById(Udi id)
-    {
-        var guidUdi = id as GuidUdi;
-        if (guidUdi == null)
-        {
-            return NotFound();
-        }
-
-        IMemberGroup? memberGroup = _memberGroupService.GetById(guidUdi.Guid);
-        if (memberGroup == null)
-        {
-            return NotFound();
-        }
-
-        return _umbracoMapper.Map<IMemberGroup, MemberGroupDisplay>(memberGroup);
-    }
-
-    public IEnumerable<MemberGroupDisplay> GetByIds([FromQuery] int[] ids)
-        => _memberGroupService.GetByIds(ids).Select(_umbracoMapper.Map<IMemberGroup, MemberGroupDisplay>)
-            .WhereNotNull();
-
-    [HttpDelete]
-    [HttpPost]
-    public IActionResult DeleteById(int id)
-    {
-        IMemberGroup? memberGroup = _memberGroupService.GetById(id);
-        if (memberGroup == null)
-        {
-            return NotFound();
-        }
-
-        _memberGroupService.Delete(memberGroup);
-        return Ok();
-    }
-
-    public IEnumerable<MemberGroupDisplay> GetAllGroups()
-        => _memberGroupService.GetAll()
-            .Select(_umbracoMapper.Map<IMemberGroup, MemberGroupDisplay>).WhereNotNull();
-
-    public MemberGroupDisplay? GetEmpty()
-    {
-        var item = new MemberGroup();
-        return _umbracoMapper.Map<IMemberGroup, MemberGroupDisplay>(item);
-    }
-
-    public bool IsMemberGroupNameUnique(int id, string? oldName, string? newName)
-    {
-        if (newName == oldName)
-        {
-            return true; // name hasn't changed
-        }
-
-        IMemberGroup? memberGroup = _memberGroupService.GetByName(newName);
-        if (memberGroup == null)
-        {
-            return true; // no member group found
-        }
-
-        return memberGroup.Id == id;
-    }
-
-    public ActionResult<MemberGroupDisplay?> PostSave(MemberGroupSave saveModel)
-    {
-        var id = saveModel.Id is not null ? int.Parse(saveModel.Id.ToString()!, CultureInfo.InvariantCulture) : default;
-        IMemberGroup? memberGroup = id > 0 ? _memberGroupService.GetById(id) : new MemberGroup();
-        if (memberGroup == null)
-        {
-            return NotFound();
-        }
-
-        if (IsMemberGroupNameUnique(memberGroup.Id, memberGroup.Name, saveModel.Name))
-        {
-            memberGroup.Name = saveModel.Name;
-            _memberGroupService.Save(memberGroup);
-
-            MemberGroupDisplay? display = _umbracoMapper.Map<IMemberGroup, MemberGroupDisplay>(memberGroup);
-
-            display?.AddSuccessNotification(
-                _localizedTextService.Localize("speechBubbles", "memberGroupSavedHeader"),
-                string.Empty);
-
-            return display;
-        }
-        else
-        {
-            MemberGroupDisplay? display = _umbracoMapper.Map<IMemberGroup, MemberGroupDisplay>(memberGroup);
-            display?.AddErrorNotification(
-                _localizedTextService.Localize("speechBubbles", "memberGroupNameDuplicate"),
-                string.Empty);
-
-            return display;
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs
deleted file mode 100644
index 1c11c0fd59..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Dictionary;
-using Umbraco.Cms.Core.Editors;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     An API controller used for dealing with member types
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessMemberTypes)]
-[ParameterSwapControllerActionSelector(nameof(GetById), "id", typeof(int), typeof(Guid), typeof(Udi))]
-public class MemberTypeController : ContentTypeControllerBase<IMemberType>
-{
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly IMemberTypeService _memberTypeService;
-    private readonly IShortStringHelper _shortStringHelper;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-    public MemberTypeController(
-        ICultureDictionary cultureDictionary,
-        EditorValidatorCollection editorValidatorCollection,
-        IContentTypeService contentTypeService,
-        IMediaTypeService mediaTypeService,
-        IMemberTypeService memberTypeService,
-        IUmbracoMapper umbracoMapper,
-        ILocalizedTextService localizedTextService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IShortStringHelper shortStringHelper)
-        : base(
-            cultureDictionary,
-            editorValidatorCollection,
-            contentTypeService,
-            mediaTypeService,
-            memberTypeService,
-            umbracoMapper,
-            localizedTextService)
-    {
-        _memberTypeService = memberTypeService ?? throw new ArgumentNullException(nameof(memberTypeService));
-        _backofficeSecurityAccessor = backofficeSecurityAccessor ??
-                                      throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
-        _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _localizedTextService =
-            localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
-    }
-
-    public int GetCount() => _memberTypeService.Count();
-
-    /// <summary>
-    ///     Gets the member type a given id
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ActionResult<MemberTypeDisplay?> GetById(int id)
-    {
-        IMemberType? mt = _memberTypeService.Get(id);
-        if (mt == null)
-        {
-            return NotFound();
-        }
-
-        MemberTypeDisplay? dto = _umbracoMapper.Map<IMemberType, MemberTypeDisplay>(mt);
-        return dto;
-    }
-
-    /// <summary>
-    ///     Gets the member type a given guid
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ActionResult<MemberTypeDisplay?> GetById(Guid id)
-    {
-        IMemberType? memberType = _memberTypeService.Get(id);
-        if (memberType == null)
-        {
-            return NotFound();
-        }
-
-        MemberTypeDisplay? dto = _umbracoMapper.Map<IMemberType, MemberTypeDisplay>(memberType);
-        return dto;
-    }
-
-    /// <summary>
-    ///     Gets the member type a given udi
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ActionResult<MemberTypeDisplay?> GetById(Udi id)
-    {
-        var guidUdi = id as GuidUdi;
-        if (guidUdi == null)
-        {
-            return NotFound();
-        }
-
-        IMemberType? memberType = _memberTypeService.Get(guidUdi.Guid);
-        if (memberType == null)
-        {
-            return NotFound();
-        }
-
-        MemberTypeDisplay? dto = _umbracoMapper.Map<IMemberType, MemberTypeDisplay>(memberType);
-        return dto;
-    }
-
-    /// <summary>
-    ///     Deletes a document type with a given id
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [HttpDelete]
-    [HttpPost]
-    public IActionResult DeleteById(int id)
-    {
-        IMemberType? foundType = _memberTypeService.Get(id);
-        if (foundType == null)
-        {
-            return NotFound();
-        }
-
-        _memberTypeService.Delete(foundType, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
-        return Ok();
-    }
-
-    /// <summary>
-    ///     Returns the available compositions for this content type
-    /// </summary>
-    /// <param name="contentTypeId"></param>
-    /// <param name="filterContentTypes">
-    ///     This is normally an empty list but if additional content type aliases are passed in, any content types containing
-    ///     those aliases will be filtered out
-    ///     along with any content types that have matching property types that are included in the filtered content types
-    /// </param>
-    /// <param name="filterPropertyTypes">
-    ///     This is normally an empty list but if additional property type aliases are passed in, any content types that have
-    ///     these aliases will be filtered out.
-    ///     This is required because in the case of creating/modifying a content type because new property types being added to
-    ///     it are not yet persisted so cannot
-    ///     be looked up via the db, they need to be passed in.
-    /// </param>
-    /// <returns></returns>
-    public IActionResult GetAvailableCompositeMemberTypes(
-        int contentTypeId,
-        [FromQuery] string[] filterContentTypes,
-        [FromQuery] string[] filterPropertyTypes)
-    {
-        ActionResult<IEnumerable<Tuple<EntityBasic?, bool>>> actionResult = PerformGetAvailableCompositeContentTypes(
-            contentTypeId,
-            UmbracoObjectTypes.MemberType,
-            filterContentTypes,
-            filterPropertyTypes,
-            false);
-
-        if (!(actionResult.Result is null))
-        {
-            return actionResult.Result;
-        }
-
-        var result = actionResult.Value?
-            .Select(x => new { contentType = x.Item1, allowed = x.Item2 });
-        return Ok(result);
-    }
-
-    /// <summary>
-    ///     Returns where a particular composition has been used
-    ///     This has been wrapped in a dto instead of simple parameters to support having multiple parameters in post request
-    ///     body
-    /// </summary>
-    /// <param name="contentTypeId"></param>
-    /// <returns></returns>
-    public IActionResult GetWhereCompositionIsUsedInMemberTypes(int contentTypeId)
-    {
-        var result =
-            PerformGetWhereCompositionIsUsedInContentTypes(contentTypeId, UmbracoObjectTypes.MemberType).Value?
-                .Select(x => new { contentType = x });
-        return Ok(result);
-    }
-
-    public MemberTypeDisplay? GetEmpty()
-    {
-        var ct = new MemberType(_shortStringHelper, -1)
-        {
-            Icon = Constants.Icons.Member
-        };
-
-        MemberTypeDisplay? dto = _umbracoMapper.Map<IMemberType, MemberTypeDisplay>(ct);
-        return dto;
-    }
-
-    public ActionResult<MemberTypeDisplay?> PostSave(MemberTypeSave contentTypeSave)
-    {
-        //get the persisted member type
-        var ctId = Convert.ToInt32(contentTypeSave.Id);
-        IMemberType? ct = ctId > 0 ? _memberTypeService.Get(ctId) : null;
-
-        if (_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.HasAccessToSensitiveData() == false)
-        {
-            //We need to validate if any properties on the contentTypeSave have had their IsSensitiveValue changed,
-            //and if so, we need to check if the current user has access to sensitive values. If not, we have to return an error
-            IEnumerable<MemberPropertyTypeBasic> props = contentTypeSave.Groups.SelectMany(x => x.Properties);
-            if (ct != null)
-            {
-                foreach (MemberPropertyTypeBasic prop in props)
-                {
-                    // Id 0 means the property was just added, no need to look it up
-                    if (prop.Id == 0)
-                    {
-                        continue;
-                    }
-
-                    IPropertyType? foundOnContentType = ct.PropertyTypes.FirstOrDefault(x => x.Id == prop.Id);
-                    if (foundOnContentType == null)
-                    {
-                        return NotFound(new
-                        {
-                            Message = "No property type with id " + prop.Id + " found on the content type"
-                        });
-                    }
-
-                    if (ct.IsSensitiveProperty(foundOnContentType.Alias) && prop.IsSensitiveData == false)
-                    {
-                        //if these don't match, then we cannot continue, this user is not allowed to change this value
-                        return Forbid();
-                    }
-                }
-            }
-            else
-            {
-                //if it is new, then we can just verify if any property has sensitive data turned on which is not allowed
-                if (props.Any(prop => prop.IsSensitiveData))
-                {
-                    return Forbid();
-                }
-            }
-        }
-
-
-        ActionResult<IMemberType?> savedCt =
-            PerformPostSave<MemberTypeDisplay, MemberTypeSave, MemberPropertyTypeBasic>(
-                contentTypeSave,
-                i => ct,
-                type => _memberTypeService.Save(type));
-
-        if (!(savedCt.Result is null))
-        {
-            return savedCt.Result;
-        }
-
-        MemberTypeDisplay? display = _umbracoMapper.Map<MemberTypeDisplay>(savedCt.Value);
-
-        display?.AddSuccessNotification(
-            _localizedTextService.Localize("speechBubbles", "memberTypeSavedHeader"),
-            string.Empty);
-
-        return display;
-    }
-
-    /// <summary>
-    ///     Copy the member type
-    /// </summary>
-    /// <param name="copy"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthorizationPolicies.TreeAccessMemberTypes)]
-    public IActionResult PostCopy(MoveOrCopy copy) =>
-        PerformCopy(
-            copy,
-            i => _memberTypeService.Get(i),
-            (type, i) => _memberTypeService.Copy(type, i));
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberTypeQueryController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberTypeQueryController.cs
deleted file mode 100644
index 64464b4cb9..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/MemberTypeQueryController.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     An API controller used for dealing with member types
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessMembersOrMemberTypes)]
-public class MemberTypeQueryController : BackOfficeNotificationsController
-{
-    private readonly IMemberTypeService _memberTypeService;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-
-    public MemberTypeQueryController(
-        IMemberTypeService memberTypeService,
-        IUmbracoMapper umbracoMapper)
-    {
-        _memberTypeService = memberTypeService ?? throw new ArgumentNullException(nameof(memberTypeService));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-    }
-
-    /// <summary>
-    ///     Returns all member types
-    /// </summary>
-    public IEnumerable<ContentTypeBasic> GetAllTypes() =>
-        _memberTypeService.GetAll()
-            .Select(_umbracoMapper.Map<IMemberType, ContentTypeBasic>).WhereNotNull();
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs b/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs
deleted file mode 100644
index 33e52c6fea..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-using System.Net;
-using System.Net.Mime;
-using System.Text;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Microsoft.Net.Http.Headers;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Packaging;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Install;
-using Umbraco.Cms.Web.Common.ActionsResults;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     A controller used for managing packages in the back office
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessPackages)]
-public class PackageController : UmbracoAuthorizedJsonController
-{
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly ILogger<PackageController> _logger;
-    private readonly PackageMigrationRunner _packageMigrationRunner;
-    private readonly IPackagingService _packagingService;
-
-    public PackageController(
-        IPackagingService packagingService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        PackageMigrationRunner packageMigrationRunner,
-        ILogger<PackageController> logger)
-    {
-        _packagingService = packagingService ?? throw new ArgumentNullException(nameof(packagingService));
-        _backofficeSecurityAccessor = backofficeSecurityAccessor ??
-                                      throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
-        _packageMigrationRunner = packageMigrationRunner;
-        _logger = logger;
-    }
-
-    public IEnumerable<PackageDefinition> GetCreatedPackages() =>
-        _packagingService.GetAllCreatedPackages().WhereNotNull();
-
-    public ActionResult<PackageDefinition> GetCreatedPackageById(int id)
-    {
-        PackageDefinition? package = _packagingService.GetCreatedPackageById(id);
-        if (package == null)
-        {
-            return NotFound();
-        }
-
-        return package;
-    }
-
-    public PackageDefinition GetEmpty() => new();
-
-    /// <summary>
-    ///     Creates or updates a package
-    /// </summary>
-    /// <param name="model"></param>
-    /// <returns></returns>
-    public ActionResult<PackageDefinition> PostSavePackage(PackageDefinition model)
-    {
-        if (ModelState.IsValid == false)
-        {
-            return ValidationProblem(ModelState);
-        }
-
-        // Save it
-        if (!_packagingService.SaveCreatedPackage(model))
-        {
-            return ValidationProblem(
-                model.Id == default
-                    ? $"A package with the name {model.Name} already exists"
-                    : $"The package with id {model.Id} was not found");
-        }
-
-        // The packagePath will be on the model
-        return model;
-    }
-
-    /// <summary>
-    ///     Deletes a created package
-    /// </summary>
-    /// <param name="packageId"></param>
-    /// <returns></returns>
-    [HttpPost]
-    [HttpDelete]
-    public IActionResult DeleteCreatedPackage(int packageId)
-    {
-        _packagingService.DeleteCreatedPackage(packageId, _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId().Result ?? -1);
-
-        return Ok();
-    }
-
-    [HttpPost]
-    public ActionResult<IEnumerable<InstalledPackage>> RunMigrations([FromQuery] string packageName)
-    {
-        try
-        {
-            _packageMigrationRunner.RunPackageMigrationsIfPending(packageName);
-            return _packagingService.GetAllInstalledPackages().ToList();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Package migration failed on package {Package}", packageName);
-
-            return ValidationErrorResult.CreateNotificationValidationErrorResult(
-                $"Package migration failed on package {packageName} with error: {ex.Message}. Check log for full details.");
-        }
-    }
-
-    [HttpGet]
-    public IActionResult DownloadCreatedPackage(int id)
-    {
-        PackageDefinition? package = _packagingService.GetCreatedPackageById(id);
-        if (package == null)
-        {
-            return NotFound();
-        }
-
-        if (!System.IO.File.Exists(package.PackagePath))
-        {
-            return ValidationProblem("No file found for path " + package.PackagePath);
-        }
-
-        var fileName = Path.GetFileName(package.PackagePath);
-
-        Encoding encoding = Encoding.UTF8;
-
-        var cd = new ContentDisposition
-        {
-            FileName = WebUtility.UrlEncode(fileName),
-            Inline = false // false = prompt the user for downloading;  true = browser to try to show the file inline
-        };
-        Response.Headers.Add("Content-Disposition", cd.ToString());
-        // Set custom header so umbRequestHelper.downloadFile can save the correct filename
-        Response.Headers.Add("x-filename", WebUtility.UrlEncode(fileName));
-        return new FileStreamResult(System.IO.File.OpenRead(package.PackagePath), new MediaTypeHeaderValue("application/octet-stream") { Charset = encoding.WebName });
-    }
-
-    public ActionResult<InstalledPackage> GetInstalledPackageByName([FromQuery] string packageName)
-    {
-        InstalledPackage? pack = _packagingService.GetInstalledPackageByName(packageName);
-        if (pack == null)
-        {
-            return NotFound();
-        }
-
-        return pack;
-    }
-
-    /// <summary>
-    ///     Returns all installed packages - only shows their latest versions
-    /// </summary>
-    /// <returns></returns>
-    public IEnumerable<InstalledPackage> GetInstalled()
-        => _packagingService.GetAllInstalledPackages().ToList();
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/ParameterSwapControllerActionSelectorAttribute.cs b/src/Umbraco.Web.BackOffice/Controllers/ParameterSwapControllerActionSelectorAttribute.cs
deleted file mode 100644
index 32f6b2c14d..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/ParameterSwapControllerActionSelectorAttribute.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.ActionConstraints;
-using Microsoft.AspNetCore.Mvc.Controllers;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Umbraco.Cms.Core;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <remarks>
-///     <para>
-///         This attribute is odd because it applies at class level where some methods may use it whilst others don't.
-///     </para>
-///     <para>
-///         What we should probably have (if we really even need something like this at all) is an attribute for method
-///         level.
-///         <example>
-///             <code>
-/// 
-/// [HasParameterFromUriOrBodyOfType("ids", typeof(Guid[]))]
-/// public IActionResult GetByIds([FromJsonPath] Guid[] ids) { }
-/// 
-/// [HasParameterFromUriOrBodyOfType("ids", typeof(int[]))]
-/// public IActionResult GetByIds([FromJsonPath] int[] ids) { }
-/// </code>
-///         </example>
-///     </para>
-///     <para>
-///         That way we wouldn't need confusing things like Accept returning true when action name doesn't even match
-///         attribute metadata.
-///     </para>
-/// </remarks>
-[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-internal class ParameterSwapControllerActionSelectorAttribute : Attribute, IActionConstraint
-{
-    private readonly string _actionName;
-    private readonly string _parameterName;
-    private readonly Type[] _supportedTypes;
-
-    public ParameterSwapControllerActionSelectorAttribute(string actionName, string parameterName,
-        params Type[] supportedTypes)
-    {
-        _actionName = actionName;
-        _parameterName = parameterName;
-        _supportedTypes = supportedTypes;
-    }
-
-    /// <inheritdoc />
-    public int Order { get; set; } = 101;
-
-    /// <inheritdoc />
-    public bool Accept(ActionConstraintContext context)
-    {
-        if (!IsValidCandidate(context.CurrentCandidate))
-        {
-            // See remarks on class, required because we apply at class level
-            // and some controllers have some actions with parameter swaps and others without.
-            return true;
-        }
-
-        ActionSelectorCandidate? chosenCandidate = SelectAction(context);
-
-        var found = context.CurrentCandidate.Equals(chosenCandidate);
-        return found;
-    }
-
-    private ActionSelectorCandidate? SelectAction(ActionConstraintContext context)
-    {
-        if (TryBindFromUri(context, out ActionSelectorCandidate? candidate))
-        {
-            return candidate;
-        }
-
-        HttpContext httpContext = context.RouteContext.HttpContext;
-
-        // if it's a post we can try to read from the body and bind from the json value
-        if (context.RouteContext.HttpContext.Request.Method.Equals(HttpMethod.Post.Method))
-        {
-            JObject? postBodyJson;
-
-            if (httpContext.Items.TryGetValue(Constants.HttpContext.Items.RequestBodyAsJObject, out var value) &&
-                value is JObject cached)
-            {
-                postBodyJson = cached;
-            }
-            else
-            {
-                // We need to use the asynchronous method here if synchronous IO is not allowed (it may or may not be, depending
-                // on configuration in UmbracoBackOfficeServiceCollectionExtensions.AddUmbraco()).
-                // We can't use async/await due to the need to override IsValidForRequest, which doesn't have an async override, so going with
-                // this, which seems to be the least worst option for "sync to async" (https://stackoverflow.com/a/32429753/489433).
-                //
-                // To expand on the above, if KestrelServerOptions/IISServerOptions is AllowSynchronousIO=false
-                // And you attempt to read stream sync an InvalidOperationException is thrown with message
-                // "Synchronous operations are disallowed. Call ReadAsync or set AllowSynchronousIO to true instead."
-                var rawBody = Task.Run(() => httpContext.Request.GetRawBodyStringAsync()).GetAwaiter().GetResult();
-                try
-                {
-                    postBodyJson = JsonConvert.DeserializeObject<JObject>(rawBody);
-                    httpContext.Items[Constants.HttpContext.Items.RequestBodyAsJObject] = postBodyJson;
-                }
-                catch (JsonException)
-                {
-                    postBodyJson = null;
-                }
-            }
-
-            if (postBodyJson == null)
-            {
-                return null;
-            }
-
-            JToken? requestParam = postBodyJson[_parameterName];
-
-            if (requestParam != null)
-            {
-                Type[] paramTypes = _supportedTypes;
-
-                foreach (Type paramType in paramTypes)
-                {
-                    try
-                    {
-                        var converted = requestParam.ToObject(paramType);
-                        if (converted != null)
-                        {
-                            ActionSelectorCandidate? foundCandidate = MatchByType(paramType, context);
-                            if (foundCandidate.HasValue)
-                            {
-                                return foundCandidate;
-                            }
-                        }
-                    }
-                    catch (JsonException)
-                    {
-                        // can't convert
-                    }
-                }
-            }
-        }
-
-        return null;
-    }
-
-    private bool TryBindFromUri(ActionConstraintContext context, out ActionSelectorCandidate? foundCandidate)
-    {
-        string? requestParam = null;
-        if (context.RouteContext.HttpContext.Request.Query.TryGetValue(_parameterName, out StringValues stringValues))
-        {
-            requestParam = stringValues.ToString();
-        }
-
-        if (requestParam is null && context.RouteContext.RouteData.Values.TryGetValue(_parameterName, out var value))
-        {
-            requestParam = value?.ToString();
-        }
-
-        if (requestParam == string.Empty && _supportedTypes.Length > 0)
-        {
-            // if it's empty then in theory we can select any of the actions since they'll all need to deal with empty or null parameters
-            // so we'll try to use the first one available
-            foundCandidate = MatchByType(_supportedTypes[0], context);
-            if (foundCandidate.HasValue)
-            {
-                return true;
-            }
-        }
-
-        if (requestParam != null)
-        {
-            foreach (Type paramType in _supportedTypes)
-            {
-                // check if this is IEnumerable and if so this will get it's type
-                // we need to know this since the requestParam will always just be a string
-                Type? enumType = paramType.GetEnumeratedType();
-
-                Attempt<object?> converted = requestParam.TryConvertTo(enumType ?? paramType);
-                if (converted.Success)
-                {
-                    foundCandidate = MatchByType(paramType, context);
-                    if (foundCandidate.HasValue)
-                    {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        foundCandidate = null;
-        return false;
-    }
-
-    private ActionSelectorCandidate? MatchByType(Type idType, ActionConstraintContext context)
-    {
-        if (context.Candidates.Count() > 1)
-        {
-            // choose the one that has the parameter with the T type
-            ActionSelectorCandidate candidate = context.Candidates.FirstOrDefault(x =>
-                x.Action.Parameters.FirstOrDefault(p => p.Name == _parameterName && p.ParameterType == idType) != null);
-
-            return candidate;
-        }
-
-        return null;
-    }
-
-    private bool IsValidCandidate(ActionSelectorCandidate candidate)
-    {
-        if (!(candidate.Action is ControllerActionDescriptor controllerActionDescriptor))
-        {
-            return false;
-        }
-
-        if (controllerActionDescriptor.ActionName != _actionName)
-        {
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs b/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs
deleted file mode 100644
index 19ca323d9d..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ViewEngines;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Editors;
-using Umbraco.Cms.Core.Features;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.PublishedCache;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Web;
-using Umbraco.Cms.Core.WebAssets;
-using Umbraco.Cms.Infrastructure.WebAssets;
-using Umbraco.Cms.Web.BackOffice.ActionResults;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Cms.Web.Common.Filters;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[DisableBrowserCache]
-[Area(Constants.Web.Mvc.BackOfficeArea)]
-public class PreviewController : Controller
-{
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly ICookieManager _cookieManager;
-    private readonly UmbracoFeatures _features;
-    private readonly GlobalSettings _globalSettings;
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly ILocalizationService _localizationService;
-    private readonly IPublishedSnapshotService _publishedSnapshotService;
-    private readonly IRuntimeMinifier _runtimeMinifier;
-    private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-    private readonly ICompositeViewEngine _viewEngines;
-
-    public PreviewController(
-        UmbracoFeatures features,
-        IOptionsSnapshot<GlobalSettings> globalSettings,
-        IPublishedSnapshotService publishedSnapshotService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        ILocalizationService localizationService,
-        IHostingEnvironment hostingEnvironment,
-        ICookieManager cookieManager,
-        IRuntimeMinifier runtimeMinifier,
-        ICompositeViewEngine viewEngines,
-        IUmbracoContextAccessor umbracoContextAccessor)
-    {
-        _features = features;
-        _globalSettings = globalSettings.Value;
-        _publishedSnapshotService = publishedSnapshotService;
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-        _localizationService = localizationService;
-        _hostingEnvironment = hostingEnvironment;
-        _cookieManager = cookieManager;
-        _runtimeMinifier = runtimeMinifier;
-        _viewEngines = viewEngines;
-        _umbracoContextAccessor = umbracoContextAccessor;
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccessWithoutApproval)]
-    [DisableBrowserCache]
-    public ActionResult Index(int? id = null)
-    {
-        IEnumerable<ILanguage> availableLanguages = _localizationService.GetAllLanguages();
-        if (id.HasValue)
-        {
-            IUmbracoContext umbracoContext = _umbracoContextAccessor.GetRequiredUmbracoContext();
-            IPublishedContent? content = umbracoContext.Content?.GetById(true, id.Value);
-            if (content is null)
-            {
-                return NotFound();
-            }
-
-            availableLanguages = availableLanguages.Where(language => content.Cultures.ContainsKey(language.IsoCode));
-        }
-
-        var model = new BackOfficePreviewModel(_features, availableLanguages);
-
-        if (model.PreviewExtendedHeaderView.IsNullOrWhiteSpace() == false)
-        {
-            ViewEngineResult viewEngineResult =
-                _viewEngines.FindView(ControllerContext, model.PreviewExtendedHeaderView!, false);
-            if (viewEngineResult.View == null)
-            {
-                throw new InvalidOperationException("Could not find the view " + model.PreviewExtendedHeaderView +
-                                                    ", the following locations were searched: " + Environment.NewLine +
-                                                    string.Join(Environment.NewLine,
-                                                        viewEngineResult.SearchedLocations));
-            }
-        }
-
-        var viewPath = Path.Combine(
-                _globalSettings.UmbracoPath,
-                Constants.Web.Mvc.BackOfficeArea,
-                ControllerExtensions.GetControllerName<PreviewController>() + ".cshtml")
-            .Replace("\\", "/"); // convert to forward slashes since it's a virtual path
-
-        return View(viewPath, model);
-    }
-
-
-    /// <summary>
-    ///     Returns the JavaScript file for preview
-    /// </summary>
-    /// <returns></returns>
-    [MinifyJavaScriptResult(Order = 0)]
-    // TODO: Replace this with response caching https://docs.microsoft.com/en-us/aspnet/core/performance/caching/response?view=aspnetcore-3.1
-    //[OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)]
-    public async Task<JavaScriptResult> Application()
-    {
-        IEnumerable<string> files =
-            await _runtimeMinifier.GetJsAssetPathsAsync(BackOfficeWebAssets.UmbracoPreviewJsBundleName);
-        var result =
-            BackOfficeJavaScriptInitializer.GetJavascriptInitialization(files, "umbraco.preview", _globalSettings,
-                _hostingEnvironment);
-
-        return new JavaScriptResult(result);
-    }
-
-    /// <summary>
-    ///     The endpoint that is loaded within the preview iframe
-    /// </summary>
-    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
-    public ActionResult Frame(int id, string culture)
-    {
-        EnterPreview(id);
-
-        // use a numeric URL because content may not be in cache and so .Url would fail
-        var query = culture.IsNullOrWhiteSpace() ? string.Empty : $"?culture={culture}";
-
-        return RedirectPermanent($"../../{id}{query}");
-    }
-
-    public ActionResult? EnterPreview(int id)
-    {
-        IUser? user = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-        _cookieManager.SetCookieValue(Constants.Web.PreviewCookieName, "preview");
-
-        return new EmptyResult();
-    }
-
-    public ActionResult End(string? redir = null)
-    {
-        _cookieManager.ExpireCookie(Constants.Web.PreviewCookieName);
-
-        // Expire Client-side cookie that determines whether the user has accepted to be in Preview Mode when visiting the website.
-        _cookieManager.ExpireCookie(Constants.Web.AcceptPreviewCookieName);
-
-        if (Uri.IsWellFormedUriString(redir, UriKind.Relative)
-            && redir.StartsWith("//") == false
-            && Uri.TryCreate(redir, UriKind.Relative, out Uri? url))
-        {
-            return Redirect(url.ToString());
-        }
-
-        return Redirect("/");
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/PropertyTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/PropertyTypeController.cs
deleted file mode 100644
index c0a40d5a65..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/PropertyTypeController.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeArea)]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-public class PropertyTypeController : UmbracoAuthorizedJsonController
-{
-    private readonly IPropertyTypeUsageService _propertyTypeUsageService;
-
-    public PropertyTypeController(IPropertyTypeUsageService propertyTypeUsageService) => _propertyTypeUsageService = propertyTypeUsageService;
-
-    [HttpGet]
-    public ActionResult<PropertyTypeHasValuesDisplay> HasValues(string alias)
-    {
-        if (string.IsNullOrWhiteSpace(alias))
-        {
-            return BadRequest("A property type alias is required");
-        }
-
-        bool hasValue = _propertyTypeUsageService.HasSavedPropertyValues(alias);
-        return new PropertyTypeHasValuesDisplay(alias, hasValue);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/PublicAccessController.cs b/src/Umbraco.Web.BackOffice/Controllers/PublicAccessController.cs
deleted file mode 100644
index de2180c812..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/PublicAccessController.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Cms.Web.Common.Security;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessDocuments)]
-public class PublicAccessController : BackOfficeNotificationsController
-{
-    private readonly IContentService _contentService;
-    private readonly IEntityService _entityService;
-    private readonly IMemberRoleManager _memberRoleManager;
-    private readonly IMemberService _memberService;
-    private readonly IPublicAccessService _publicAccessService;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-    public PublicAccessController(
-        IPublicAccessService publicAccessService,
-        IContentService contentService,
-        IEntityService entityService,
-        IMemberService memberService,
-        IUmbracoMapper umbracoMapper,
-        IMemberRoleManager memberRoleManager)
-    {
-        _contentService = contentService;
-        _publicAccessService = publicAccessService;
-        _entityService = entityService;
-        _memberService = memberService;
-        _umbracoMapper = umbracoMapper;
-        _memberRoleManager = memberRoleManager;
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionProtectById)]
-    [HttpGet]
-    public ActionResult<PublicAccess> GetPublicAccess(int contentId)
-    {
-        IContent? content = _contentService.GetById(contentId);
-        if (content == null)
-        {
-            return NotFound();
-        }
-
-        PublicAccessEntry? entry = _publicAccessService.GetEntryForContent(content);
-        if (entry == null || entry.ProtectedNodeId != content.Id)
-        {
-            return Ok();
-        }
-
-        var nodes = _entityService
-            .GetAll(UmbracoObjectTypes.Document, entry.LoginNodeId, entry.NoAccessNodeId)
-            .ToDictionary(x => x.Id);
-
-        if (!nodes.TryGetValue(entry.LoginNodeId, out IEntitySlim? loginPageEntity))
-        {
-            throw new InvalidOperationException($"Login node with id ${entry.LoginNodeId} was not found");
-        }
-
-        if (!nodes.TryGetValue(entry.NoAccessNodeId, out IEntitySlim? errorPageEntity))
-        {
-            throw new InvalidOperationException($"Error node with id ${entry.LoginNodeId} was not found");
-        }
-
-        // unwrap the current public access setup for the client
-        // - this API method is the single point of entry for both "modes" of public access (single user and role based)
-        var usernames = entry.Rules
-            .Where(rule => rule.RuleType == Constants.Conventions.PublicAccess.MemberUsernameRuleType)
-            .Select(rule => rule.RuleValue)
-            .ToArray();
-
-        MemberDisplay[] members = usernames
-            .Select(username => _memberService.GetByUsername(username))
-            .Select(_umbracoMapper.Map<MemberDisplay>)
-            .WhereNotNull()
-            .ToArray();
-
-        var allGroups = _memberRoleManager.Roles.Where(x => x.Name != null).ToDictionary(x => x.Name!);
-        MemberGroupDisplay[] groups = entry.Rules
-            .Where(rule => rule.RuleType == Constants.Conventions.PublicAccess.MemberRoleRuleType)
-            .Select(rule =>
-                rule.RuleValue is not null && allGroups.TryGetValue(rule.RuleValue, out UmbracoIdentityRole? memberRole)
-                    ? memberRole
-                    : null)
-            .Select(_umbracoMapper.Map<MemberGroupDisplay>)
-            .WhereNotNull()
-            .ToArray();
-
-        return new PublicAccess
-        {
-            Members = members,
-            Groups = groups,
-            LoginPage = loginPageEntity != null ? _umbracoMapper.Map<EntityBasic>(loginPageEntity) : null,
-            ErrorPage = errorPageEntity != null ? _umbracoMapper.Map<EntityBasic>(errorPageEntity) : null
-        };
-    }
-
-    // set up public access using role based access
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionProtectById)]
-    [HttpPost]
-    public IActionResult PostPublicAccess(int contentId, [FromQuery(Name = "groups[]")] string[] groups,
-        [FromQuery(Name = "usernames[]")] string[] usernames, int loginPageId, int errorPageId)
-    {
-        if ((groups == null || groups.Any() == false) && (usernames == null || usernames.Any() == false))
-        {
-            return BadRequest();
-        }
-
-        IContent? content = _contentService.GetById(contentId);
-        IContent? loginPage = _contentService.GetById(loginPageId);
-        IContent? errorPage = _contentService.GetById(errorPageId);
-        if (content == null || loginPage == null || errorPage == null)
-        {
-            return BadRequest();
-        }
-
-        var isGroupBased = groups != null && groups.Any();
-        var candidateRuleValues = isGroupBased
-            ? groups
-            : usernames;
-        var newRuleType = isGroupBased
-            ? Constants.Conventions.PublicAccess.MemberRoleRuleType
-            : Constants.Conventions.PublicAccess.MemberUsernameRuleType;
-
-        PublicAccessEntry? entry = _publicAccessService.GetEntryForContent(content);
-
-        if (entry == null || entry.ProtectedNodeId != content.Id)
-        {
-            entry = new PublicAccessEntry(content, loginPage, errorPage, new List<PublicAccessRule>());
-
-            if (candidateRuleValues is not null)
-            {
-                foreach (var ruleValue in candidateRuleValues)
-                {
-                    entry.AddRule(ruleValue, newRuleType);
-                }
-            }
-        }
-        else
-        {
-            entry.LoginNodeId = loginPage.Id;
-            entry.NoAccessNodeId = errorPage.Id;
-
-            PublicAccessRule[] currentRules = entry.Rules.ToArray();
-            IEnumerable<PublicAccessRule> obsoleteRules = currentRules.Where(rule =>
-                rule.RuleType != newRuleType
-                || candidateRuleValues?.Contains(rule.RuleValue) == false
-            );
-            IEnumerable<string>? newRuleValues = candidateRuleValues?.Where(group =>
-                currentRules.Any(rule =>
-                    rule.RuleType == newRuleType
-                    && rule.RuleValue == group
-                ) == false
-            );
-            foreach (PublicAccessRule rule in obsoleteRules)
-            {
-                entry.RemoveRule(rule);
-            }
-
-            if (newRuleValues is not null)
-            {
-                foreach (var ruleValue in newRuleValues)
-                {
-                    entry.AddRule(ruleValue, newRuleType);
-                }
-            }
-        }
-
-        return _publicAccessService.Save(entry).Success
-            ? Ok()
-            : Problem();
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.ContentPermissionProtectById)]
-    [HttpPost]
-    public IActionResult RemovePublicAccess(int contentId)
-    {
-        IContent? content = _contentService.GetById(contentId);
-        if (content == null)
-        {
-            return NotFound();
-        }
-
-        PublicAccessEntry? entry = _publicAccessService.GetEntryForContent(content);
-        if (entry == null)
-        {
-            return Ok();
-        }
-
-        return _publicAccessService.Delete(entry).Success
-            ? Ok()
-            : Problem();
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs b/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs
deleted file mode 100644
index 91cd16a0f6..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.PublishedCache;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessSettings)]
-public class PublishedSnapshotCacheStatusController : UmbracoAuthorizedApiController
-{
-    private readonly DistributedCache _distributedCache;
-    private readonly IPublishedSnapshotService _publishedSnapshotService;
-    private readonly IPublishedSnapshotStatus _publishedSnapshotStatus;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="PublishedSnapshotCacheStatusController" /> class.
-    /// </summary>
-    public PublishedSnapshotCacheStatusController(
-        IPublishedSnapshotService publishedSnapshotService,
-        IPublishedSnapshotStatus publishedSnapshotStatus,
-        DistributedCache distributedCache)
-    {
-        _publishedSnapshotService = publishedSnapshotService ??
-                                    throw new ArgumentNullException(nameof(publishedSnapshotService));
-        _publishedSnapshotStatus = publishedSnapshotStatus;
-        _distributedCache = distributedCache;
-    }
-
-    /// <summary>
-    ///     Rebuilds the Database cache
-    /// </summary>
-    [HttpPost]
-    public string RebuildDbCache()
-    {
-        //Rebuild All
-        _publishedSnapshotService.RebuildAll();
-        return _publishedSnapshotStatus.GetStatus();
-    }
-
-    /// <summary>
-    ///     Gets a status report
-    /// </summary>
-    [HttpGet]
-    public string GetStatus() => _publishedSnapshotStatus.GetStatus();
-
-    /// <summary>
-    ///     Cleans up unused snapshots
-    /// </summary>
-    [HttpGet]
-    public async Task<string> Collect()
-    {
-        GC.Collect();
-        await _publishedSnapshotService.CollectAsync();
-        return _publishedSnapshotStatus.GetStatus();
-    }
-
-    [HttpPost]
-    public void ReloadCache() => _distributedCache.RefreshAllPublishedSnapshot();
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/PublishedStatusController.cs b/src/Umbraco.Web.BackOffice/Controllers/PublishedStatusController.cs
deleted file mode 100644
index fd30b2f109..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/PublishedStatusController.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core.PublishedCache;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-public class PublishedStatusController : UmbracoAuthorizedApiController
-{
-    private readonly IPublishedSnapshotStatus _publishedSnapshotStatus;
-
-    public PublishedStatusController(IPublishedSnapshotStatus publishedSnapshotStatus) => _publishedSnapshotStatus =
-        publishedSnapshotStatus ?? throw new ArgumentNullException(nameof(publishedSnapshotStatus));
-
-    [HttpGet]
-    public string GetPublishedStatusUrl()
-    {
-        if (!string.IsNullOrWhiteSpace(_publishedSnapshotStatus.StatusUrl))
-        {
-            return _publishedSnapshotStatus.StatusUrl;
-        }
-
-        throw new NotSupportedException("Not supported: " + _publishedSnapshotStatus.GetType().FullName);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs b/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
deleted file mode 100644
index 9e6f977d72..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Security;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[Authorize(Policy = AuthorizationPolicies.SectionAccessContent)]
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessContent)]
-public class RedirectUrlManagementController : UmbracoAuthorizedApiController
-{
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IConfigManipulator _configManipulator;
-    private readonly ILogger<RedirectUrlManagementController> _logger;
-    private readonly IRedirectUrlService _redirectUrlService;
-    private readonly IUmbracoMapper _umbracoMapper;
-    private readonly IOptionsMonitor<WebRoutingSettings> _webRoutingSettings;
-
-    public RedirectUrlManagementController(
-        ILogger<RedirectUrlManagementController> logger,
-        IOptionsMonitor<WebRoutingSettings> webRoutingSettings,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IRedirectUrlService redirectUrlService,
-        IUmbracoMapper umbracoMapper,
-        IConfigManipulator configManipulator)
-    {
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        _webRoutingSettings = webRoutingSettings ?? throw new ArgumentNullException(nameof(webRoutingSettings));
-        _backofficeSecurityAccessor = backofficeSecurityAccessor ??
-                                      throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
-        _redirectUrlService = redirectUrlService ?? throw new ArgumentNullException(nameof(redirectUrlService));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _configManipulator = configManipulator ?? throw new ArgumentNullException(nameof(configManipulator));
-    }
-
-    private bool IsEnabled => _webRoutingSettings.CurrentValue.DisableRedirectUrlTracking == false;
-
-    /// <summary>
-    ///     Returns true/false of whether redirect tracking is enabled or not
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet]
-    public IActionResult GetEnableState()
-    {
-        var userIsAdmin = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.IsAdmin() ?? false;
-        return Ok(new { enabled = IsEnabled, userIsAdmin });
-    }
-
-    //add paging
-    [HttpGet]
-    public RedirectUrlSearchResult SearchRedirectUrls(string searchTerm, int page = 0, int pageSize = 10)
-    {
-        var searchResult = new RedirectUrlSearchResult();
-
-        IEnumerable<IRedirectUrl> redirects = string.IsNullOrWhiteSpace(searchTerm)
-            ? _redirectUrlService.GetAllRedirectUrls(page, pageSize, out long resultCount)
-            : _redirectUrlService.SearchRedirectUrls(searchTerm, page, pageSize, out resultCount);
-
-        searchResult.SearchResults =
-            _umbracoMapper.MapEnumerable<IRedirectUrl, ContentRedirectUrl>(redirects).WhereNotNull();
-        searchResult.TotalCount = resultCount;
-        searchResult.CurrentPage = page;
-        searchResult.PageCount = ((int)resultCount + pageSize - 1) / pageSize;
-
-        return searchResult;
-    }
-
-    /// <summary>
-    ///     This lists the RedirectUrls for a particular content item
-    ///     Do we need to consider paging here?
-    /// </summary>
-    /// <param name="contentUdi">Udi of content item to retrieve RedirectUrls for</param>
-    /// <returns></returns>
-    [HttpGet]
-    public RedirectUrlSearchResult RedirectUrlsForContentItem(string contentUdi)
-    {
-        var redirectsResult = new RedirectUrlSearchResult();
-        if (UdiParser.TryParse(contentUdi, out GuidUdi? guidIdi))
-        {
-            IEnumerable<IRedirectUrl> redirects = _redirectUrlService.GetContentRedirectUrls(guidIdi!.Guid);
-            var mapped = _umbracoMapper.MapEnumerable<IRedirectUrl, ContentRedirectUrl>(redirects).WhereNotNull()
-                .ToList();
-            redirectsResult.SearchResults = mapped;
-            //not doing paging 'yet'
-            redirectsResult.TotalCount = mapped.Count;
-            redirectsResult.CurrentPage = 1;
-            redirectsResult.PageCount = 1;
-        }
-
-        return redirectsResult;
-    }
-
-    [HttpPost]
-    public IActionResult DeleteRedirectUrl(Guid id)
-    {
-        if (IsEnabled is false)
-        {
-            return BadRequest("Redirect URL tracking is disabled, and therefore no URLs can be deleted.");
-        }
-
-        _redirectUrlService.Delete(id);
-        return Ok();
-    }
-
-    [HttpPost]
-    public IActionResult ToggleUrlTracker(bool disable)
-    {
-        var userIsAdmin = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.IsAdmin();
-        if (userIsAdmin == false)
-        {
-            var errorMessage =
-                "User is not a member of the administrators group and so is not allowed to toggle the URL tracker";
-            if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug))
-            {
-                _logger.LogDebug(errorMessage);
-            }
-            throw new SecurityException(errorMessage);
-        }
-
-        var action = disable ? "disable" : "enable";
-
-        _configManipulator.SaveDisableRedirectUrlTracking(disable);
-
-        // TODO this is ridiculous, but we need to ensure the configuration is reloaded, before this request is ended.
-        // otherwise we can read the old value in GetEnableState.
-        // The value is equal to JsonConfigurationSource.ReloadDelay
-        Thread.Sleep(250);
-
-        return Ok($"URL tracker is now {action}d.");
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs b/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs
deleted file mode 100644
index 72c10a94a7..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessContent)]
-public class RelationController : UmbracoAuthorizedJsonController
-{
-    private readonly IRelationService _relationService;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-    public RelationController(IUmbracoMapper umbracoMapper, IRelationService relationService)
-    {
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _relationService = relationService ?? throw new ArgumentNullException(nameof(relationService));
-    }
-
-    public RelationDisplay? GetById(int id) =>
-        _umbracoMapper.Map<IRelation, RelationDisplay>(_relationService.GetById(id));
-
-    //[EnsureUserPermissionForContent("childId")]
-    public IEnumerable<RelationDisplay> GetByChildId(int childId, string relationTypeAlias = "")
-    {
-        IRelation[] relations = _relationService.GetByChildId(childId).ToArray();
-
-        if (relations.Any() == false)
-        {
-            return Enumerable.Empty<RelationDisplay>();
-        }
-
-        if (string.IsNullOrWhiteSpace(relationTypeAlias) == false)
-        {
-            return
-                _umbracoMapper.MapEnumerable<IRelation, RelationDisplay>(
-                    relations.Where(x => x.RelationType.Alias.InvariantEquals(relationTypeAlias))).WhereNotNull();
-        }
-
-        return _umbracoMapper.MapEnumerable<IRelation, RelationDisplay>(relations).WhereNotNull();
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs
deleted file mode 100644
index ffe9a40ca3..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     The API controller for editing relation types.
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessRelationTypes)]
-[ParameterSwapControllerActionSelector(nameof(GetById), "id", typeof(int), typeof(Guid), typeof(Udi))]
-public class RelationTypeController : BackOfficeNotificationsController
-{
-    private readonly ILogger<RelationTypeController> _logger;
-    private readonly IRelationService _relationService;
-    private readonly IShortStringHelper _shortStringHelper;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-    public RelationTypeController(
-        ILogger<RelationTypeController> logger,
-        IUmbracoMapper umbracoMapper,
-        IRelationService relationService,
-        IShortStringHelper shortStringHelper)
-    {
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _relationService = relationService ?? throw new ArgumentNullException(nameof(relationService));
-        _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
-    }
-
-    /// <summary>
-    ///     Gets a relation type by id
-    /// </summary>
-    /// <param name="id">The relation type ID.</param>
-    /// <returns>Returns the <see cref="RelationTypeDisplay" />.</returns>
-    public ActionResult<RelationTypeDisplay?> GetById(int id)
-    {
-        IRelationType? relationType = _relationService.GetRelationTypeById(id);
-
-        if (relationType == null)
-        {
-            return NotFound();
-        }
-
-        RelationTypeDisplay? display = _umbracoMapper.Map<IRelationType, RelationTypeDisplay>(relationType);
-
-        return display;
-    }
-
-    /// <summary>
-    ///     Gets a relation type by guid
-    /// </summary>
-    /// <param name="id">The relation type ID.</param>
-    /// <returns>Returns the <see cref="RelationTypeDisplay" />.</returns>
-    public ActionResult<RelationTypeDisplay?> GetById(Guid id)
-    {
-        IRelationType? relationType = _relationService.GetRelationTypeById(id);
-        if (relationType == null)
-        {
-            return NotFound();
-        }
-
-        return _umbracoMapper.Map<IRelationType, RelationTypeDisplay>(relationType);
-    }
-
-    /// <summary>
-    ///     Gets a relation type by udi
-    /// </summary>
-    /// <param name="id">The relation type ID.</param>
-    /// <returns>Returns the <see cref="RelationTypeDisplay" />.</returns>
-    public ActionResult<RelationTypeDisplay?> GetById(Udi id)
-    {
-        var guidUdi = id as GuidUdi;
-        if (guidUdi == null)
-        {
-            return NotFound();
-        }
-
-        IRelationType? relationType = _relationService.GetRelationTypeById(guidUdi.Guid);
-        if (relationType == null)
-        {
-            return NotFound();
-        }
-
-        return _umbracoMapper.Map<IRelationType, RelationTypeDisplay>(relationType);
-    }
-
-    public PagedResult<RelationDisplay?> GetPagedResults(int id, int pageNumber = 1, int pageSize = 100)
-    {
-        if (pageNumber <= 0 || pageSize <= 0)
-        {
-            throw new NotSupportedException("Both pageNumber and pageSize must be greater than zero");
-        }
-
-        // Ordering do we need to pass through?
-        IEnumerable<IRelation> relations =
-            _relationService.GetPagedByRelationTypeId(id, pageNumber - 1, pageSize, out var totalRecords);
-
-        return new PagedResult<RelationDisplay?>(totalRecords, pageNumber, pageSize)
-        {
-            Items = relations.Select(x => _umbracoMapper.Map<RelationDisplay>(x))
-        };
-    }
-
-    /// <summary>
-    ///     Gets a list of object types which can be associated via relations.
-    /// </summary>
-    /// <returns>A list of available object types.</returns>
-    public List<ObjectType> GetRelationObjectTypes()
-    {
-        var objectTypes = new List<ObjectType>
-        {
-            new()
-            {
-                Id = UmbracoObjectTypes.Document.GetGuid(), Name = UmbracoObjectTypes.Document.GetFriendlyName()
-            },
-            new() {Id = UmbracoObjectTypes.Media.GetGuid(), Name = UmbracoObjectTypes.Media.GetFriendlyName()},
-            new() {Id = UmbracoObjectTypes.Member.GetGuid(), Name = UmbracoObjectTypes.Member.GetFriendlyName()},
-            new()
-            {
-                Id = UmbracoObjectTypes.DocumentType.GetGuid(),
-                Name = UmbracoObjectTypes.DocumentType.GetFriendlyName()
-            },
-            new()
-            {
-                Id = UmbracoObjectTypes.MediaType.GetGuid(),
-                Name = UmbracoObjectTypes.MediaType.GetFriendlyName()
-            },
-            new()
-            {
-                Id = UmbracoObjectTypes.MemberType.GetGuid(),
-                Name = UmbracoObjectTypes.MemberType.GetFriendlyName()
-            },
-            new()
-            {
-                Id = UmbracoObjectTypes.DataType.GetGuid(), Name = UmbracoObjectTypes.DataType.GetFriendlyName()
-            },
-            new()
-            {
-                Id = UmbracoObjectTypes.MemberGroup.GetGuid(),
-                Name = UmbracoObjectTypes.MemberGroup.GetFriendlyName()
-            },
-            new() {Id = UmbracoObjectTypes.ROOT.GetGuid(), Name = UmbracoObjectTypes.ROOT.GetFriendlyName()},
-            new()
-            {
-                Id = UmbracoObjectTypes.RecycleBin.GetGuid(),
-                Name = UmbracoObjectTypes.RecycleBin.GetFriendlyName()
-            }
-        };
-
-        return objectTypes;
-    }
-
-    /// <summary>
-    ///     Creates a new relation type.
-    /// </summary>
-    /// <param name="relationType">The relation type to create.</param>
-    /// <returns>A <see cref="HttpResponseMessage" /> containing the persisted relation type's ID.</returns>
-    public ActionResult<int> PostCreate(RelationTypeSave relationType)
-    {
-        var relationTypePersisted = new RelationType(
-            relationType.Name,
-            relationType.Name?.ToSafeAlias(_shortStringHelper, true),
-            relationType.IsBidirectional,
-            relationType.ParentObjectType,
-            relationType.ChildObjectType,
-            relationType.IsDependency);
-
-        try
-        {
-            _relationService.Save(relationTypePersisted);
-
-            return relationTypePersisted.Id;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error creating relation type with {Name}", relationType.Name);
-            return ValidationProblem("Error creating relation type.");
-        }
-    }
-
-    /// <summary>
-    ///     Updates an existing relation type.
-    /// </summary>
-    /// <param name="relationType">The relation type to update.</param>
-    /// <returns>A display object containing the updated relation type.</returns>
-    public ActionResult<RelationTypeDisplay?> PostSave(RelationTypeSave relationType)
-    {
-        IRelationType? relationTypePersisted = _relationService.GetRelationTypeById(relationType.Key);
-
-        if (relationTypePersisted == null)
-        {
-            return ValidationProblem("Relation type does not exist");
-        }
-
-        _umbracoMapper.Map(relationType, relationTypePersisted);
-
-        try
-        {
-            _relationService.Save(relationTypePersisted);
-            RelationTypeDisplay? display = _umbracoMapper.Map<RelationTypeDisplay>(relationTypePersisted);
-            display?.AddSuccessNotification("Relation type saved", "");
-
-            return display;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error saving relation type with {Id}", relationType.Id);
-            return ValidationProblem("Something went wrong when saving the relation type");
-        }
-    }
-
-    /// <summary>
-    ///     Deletes a relation type with a given ID.
-    /// </summary>
-    /// <param name="id">The ID of the relation type to delete.</param>
-    /// <returns>A <see cref="HttpResponseMessage" />.</returns>
-    [HttpPost]
-    [HttpDelete]
-    public IActionResult DeleteById(int id)
-    {
-        IRelationType? relationType = _relationService.GetRelationTypeById(id);
-
-        if (relationType == null)
-        {
-            return NotFound();
-        }
-
-        _relationService.Delete(relationType);
-
-        return Ok();
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs b/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs
deleted file mode 100644
index 1fc5f641f6..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-using Stylesheet = Umbraco.Cms.Core.Models.ContentEditing.Stylesheet;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     The API controller used for retrieving available stylesheets
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessContent)]
-public class StylesheetController : UmbracoAuthorizedJsonController
-{
-    private readonly IFileService _fileService;
-
-    public StylesheetController(IFileService fileService) => _fileService = fileService;
-
-    public IEnumerable<Stylesheet> GetAll() =>
-        _fileService.GetStylesheets()
-            .Select(x =>
-                new Stylesheet { Name = x.Alias, Path = x.VirtualPath });
-
-    public IEnumerable<StylesheetRule> GetRulesByName(string name)
-    {
-        IStylesheet? css = _fileService.GetStylesheet(name.EnsureEndsWith(".css"));
-        if (css is null || css.Properties is null)
-        {
-            return Enumerable.Empty<StylesheetRule>();
-        }
-
-        return css.Properties.Select(x => new StylesheetRule { Name = x.Name, Selector = x.Alias });
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs b/src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs
deleted file mode 100644
index 5e5a5a5c3f..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.OperationStatus;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessTemplates)]
-[ParameterSwapControllerActionSelector(nameof(GetById), "id", typeof(int), typeof(Guid), typeof(Udi))]
-public class TemplateController : BackOfficeNotificationsController
-{
-    private readonly IDefaultViewContentProvider _defaultViewContentProvider;
-    private readonly ITemplateService _templateService;
-    private readonly IShortStringHelper _shortStringHelper;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-    [ActivatorUtilitiesConstructor]
-    public TemplateController(
-        ITemplateService templateService,
-        IUmbracoMapper umbracoMapper,
-        IShortStringHelper shortStringHelper,
-        IDefaultViewContentProvider defaultViewContentProvider,
-        IFileService fileService)
-    {
-        _templateService = templateService ?? throw new ArgumentNullException(nameof(templateService));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
-        _defaultViewContentProvider = defaultViewContentProvider ??
-                                      throw new ArgumentNullException(nameof(defaultViewContentProvider));
-    }
-
-    /// <summary>
-    /// Gets data type by alias
-    /// </summary>
-    /// <param name="alias"></param>
-    /// <returns></returns>
-    public TemplateDisplay? GetByAlias(string alias)
-    {
-        ITemplate? template = _templateService.GetAsync(alias).GetAwaiter().GetResult();
-        return template == null ? null : _umbracoMapper.Map<ITemplate, TemplateDisplay>(template);
-    }
-
-    /// <summary>
-    ///     Get all templates
-    /// </summary>
-    /// <returns></returns>
-    public IEnumerable<EntityBasic>? GetAll() => _templateService.GetAllAsync().GetAwaiter().GetResult()
-        ?.Select(_umbracoMapper.Map<ITemplate, EntityBasic>).WhereNotNull();
-
-    /// <summary>
-    ///     Gets the template json for the template id
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ActionResult<TemplateDisplay?> GetById(int id)
-    {
-        ITemplate? template = _templateService.GetAsync(id).GetAwaiter().GetResult();
-        if (template == null)
-        {
-            return NotFound();
-        }
-
-        return _umbracoMapper.Map<ITemplate, TemplateDisplay>(template);
-    }
-
-
-    /// <summary>
-    ///     Gets the template json for the template guid
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ActionResult<TemplateDisplay?> GetById(Guid id)
-    {
-        ITemplate? template = _templateService.GetAsync(id).GetAwaiter().GetResult();
-        if (template == null)
-        {
-            return NotFound();
-        }
-
-        return _umbracoMapper.Map<ITemplate, TemplateDisplay>(template);
-    }
-
-    /// <summary>
-    ///     Gets the template json for the template udi
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public ActionResult<TemplateDisplay?> GetById(Udi id)
-    {
-        var guidUdi = id as GuidUdi;
-        if (guidUdi == null)
-        {
-            return NotFound();
-        }
-
-        ITemplate? template = _templateService.GetAsync(guidUdi.Guid).GetAwaiter().GetResult();
-        if (template == null)
-        {
-            return NotFound();
-        }
-
-        return _umbracoMapper.Map<ITemplate, TemplateDisplay>(template);
-    }
-
-    /// <summary>
-    ///     Deletes a template with a given ID
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [HttpDelete]
-    [HttpPost]
-    public IActionResult DeleteById(int id)
-    {
-        ITemplate? template = _templateService.GetAsync(id).GetAwaiter().GetResult();
-        if (template == null)
-        {
-            return NotFound();
-        }
-
-        _templateService.DeleteAsync(template.Alias, Constants.Security.SuperUserKey).GetAwaiter().GetResult();
-        return Ok();
-    }
-
-    public TemplateDisplay? GetScaffold(int id)
-    {
-        //empty default
-        var dt = new Template(_shortStringHelper, string.Empty, string.Empty)
-        {
-            Path = "-1"
-        };
-
-        if (id > 0)
-        {
-            ITemplate? master = _templateService.GetAsync(id).GetAwaiter().GetResult();
-            if (master != null)
-            {
-                dt.SetMasterTemplate(master);
-            }
-        }
-
-        var content = _defaultViewContentProvider.GetDefaultFileContent(dt.MasterTemplateAlias);
-        TemplateDisplay? scaffold = _umbracoMapper.Map<ITemplate, TemplateDisplay>(dt);
-
-        if (scaffold is not null)
-        {
-            scaffold.Content = content;
-        }
-
-        return scaffold;
-    }
-
-    /// <summary>
-    ///     Saves the data type
-    /// </summary>
-    /// <param name="display"></param>
-    /// <returns></returns>
-    public ActionResult<TemplateDisplay> PostSave(TemplateDisplay display)
-    {
-        //Checking the submitted is valid with the Required attributes decorated on the ViewModel
-        if (ModelState.IsValid == false)
-        {
-            return ValidationProblem(ModelState);
-        }
-
-        if (display.Id > 0)
-        {
-            // update
-            ITemplate? template = _templateService.GetAsync(display.Id).GetAwaiter().GetResult();
-            if (template == null)
-            {
-                return NotFound();
-            }
-
-            var changeAlias = template.Alias != display.Alias;
-
-            _umbracoMapper.Map(display, template);
-
-            _templateService.UpdateAsync(template, Constants.Security.SuperUserKey).GetAwaiter().GetResult();
-
-            if (changeAlias)
-            {
-                template = _templateService.GetAsync(template.Id).GetAwaiter().GetResult();
-            }
-
-            _umbracoMapper.Map(template, display);
-        }
-        else
-        {
-            //create
-            ITemplate? master = null;
-            if (string.IsNullOrEmpty(display.MasterTemplateAlias) == false)
-            {
-                master = _templateService.GetAsync(display.MasterTemplateAlias).GetAwaiter().GetResult();
-                if (master == null)
-                {
-                    return NotFound();
-                }
-            }
-
-            // we need to pass the template name as alias to keep the template file casing consistent with templates created with content
-            // - see comment in FileService.CreateTemplateForContentType for additional details
-            Attempt<ITemplate, TemplateOperationStatus> result =
-                _templateService.CreateAsync(display.Name!, display.Name!, display.Content, Constants.Security.SuperUserKey).GetAwaiter().GetResult();
-            if (result.Success == false)
-            {
-                return NotFound();
-            }
-
-            _umbracoMapper.Map(result.Result, display);
-        }
-
-        return display;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs b/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs
deleted file mode 100644
index 0d9299e88c..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs
+++ /dev/null
@@ -1,290 +0,0 @@
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq.Expressions;
-using System.Text;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.Models.TemplateQuery;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     The API controller used for building content queries within the template
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[JsonCamelCaseFormatter]
-public class TemplateQueryController : UmbracoAuthorizedJsonController
-{
-    private readonly IContentTypeService _contentTypeService;
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly IPublishedContentQuery _publishedContentQuery;
-    private readonly IPublishedValueFallback _publishedValueFallback;
-    private readonly IVariationContextAccessor _variationContextAccessor;
-
-    public TemplateQueryController(
-        IVariationContextAccessor variationContextAccessor,
-        IPublishedContentQuery publishedContentQuery,
-        ILocalizedTextService localizedTextService,
-        IPublishedValueFallback publishedValueFallback,
-        IContentTypeService contentTypeService)
-    {
-        _variationContextAccessor = variationContextAccessor ??
-                                    throw new ArgumentNullException(nameof(variationContextAccessor));
-        _publishedContentQuery =
-            publishedContentQuery ?? throw new ArgumentNullException(nameof(publishedContentQuery));
-        _localizedTextService =
-            localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
-        _publishedValueFallback =
-            publishedValueFallback ?? throw new ArgumentNullException(nameof(publishedValueFallback));
-        _contentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService));
-    }
-
-    private IEnumerable<OperatorTerm> Terms => new List<OperatorTerm>
-    {
-        new(_localizedTextService.Localize("template", "is"), Operator.Equals, new[] {"string"}),
-        new(_localizedTextService.Localize("template", "isNot"), Operator.NotEquals, new[] {"string"}),
-        new(_localizedTextService.Localize("template", "before"), Operator.LessThan, new[] {"datetime"}),
-        new(_localizedTextService.Localize("template", "beforeIncDate"), Operator.LessThanEqualTo, new[] {"datetime"}),
-        new(
-            _localizedTextService.Localize("template", "after"),
-            Operator.GreaterThan,
-            new[]
-            {
-                "datetime"
-            }),
-        new(
-            _localizedTextService.Localize("template", "afterIncDate"),
-            Operator.GreaterThanEqualTo,
-            new[]
-            {
-                "datetime"
-            }),
-        new(_localizedTextService.Localize("template", "equals"), Operator.Equals, new[] {"int"}),
-        new(_localizedTextService.Localize("template", "doesNotEqual"), Operator.NotEquals, new[] {"int"}),
-        new(_localizedTextService.Localize("template", "contains"), Operator.Contains, new[] {"string"}),
-        new(_localizedTextService.Localize("template", "doesNotContain"), Operator.NotContains, new[] {"string"}),
-        new(_localizedTextService.Localize("template", "greaterThan"), Operator.GreaterThan, new[] {"int"}),
-        new(_localizedTextService.Localize("template", "greaterThanEqual"), Operator.GreaterThanEqualTo, new[] {"int"}),
-        new(_localizedTextService.Localize("template", "lessThan"), Operator.LessThan, new[] {"int"}),
-        new(_localizedTextService.Localize("template", "lessThanEqual"), Operator.LessThanEqualTo, new[] {"int"})
-    };
-
-    private IEnumerable<PropertyModel> Properties => new List<PropertyModel>
-    {
-        new() {Name = _localizedTextService.Localize("template", "id"), Alias = "Id", Type = "int"},
-        new() {Name = _localizedTextService.Localize("template", "name"), Alias = "Name", Type = "string"},
-        new()
-        {
-            Name = _localizedTextService.Localize("template", "createdDate"),
-            Alias = "CreateDate",
-            Type = "datetime"
-        },
-        new()
-        {
-            Name = _localizedTextService.Localize("template", "lastUpdatedDate"),
-            Alias = "UpdateDate",
-            Type = "datetime"
-        }
-    };
-
-    public QueryResultModel PostTemplateQuery(QueryModel model)
-    {
-        var queryExpression = new StringBuilder();
-        IEnumerable<IPublishedContent>? contents;
-
-        if (model == null)
-        {
-            contents = _publishedContentQuery.ContentAtRoot().FirstOrDefault()?.Children(_variationContextAccessor);
-            queryExpression.Append("Umbraco.ContentAtRoot().FirstOrDefault().Children()");
-        }
-        else
-        {
-            contents = PostTemplateValue(model, queryExpression);
-        }
-
-        // timing should be fairly correct, due to the fact that all the linq statements are yield returned.
-        var timer = new Stopwatch();
-        timer.Start();
-        List<IPublishedContent> results = contents?.ToList() ?? new List<IPublishedContent>();
-        timer.Stop();
-
-        return new QueryResultModel
-        {
-            QueryExpression = queryExpression.ToString(),
-            ResultCount = results.Count,
-            ExecutionTime = timer.ElapsedMilliseconds,
-            SampleResults = results.Take(20).Select(x => new TemplateQueryResult
-            {
-                Icon = "icon-document",
-                Name = x.Name
-            })
-        };
-    }
-
-    private IEnumerable<IPublishedContent>? PostTemplateValue(QueryModel model, StringBuilder queryExpression)
-    {
-        var indent = Environment.NewLine + "    ";
-
-        // set the source
-        IPublishedContent? sourceDocument;
-        if (model.Source != null && model.Source.Id > 0)
-        {
-            sourceDocument = _publishedContentQuery.Content(model.Source.Id);
-
-            if (sourceDocument == null)
-            {
-                queryExpression.AppendFormat("Umbraco.Content({0})", model.Source.Id);
-            }
-            else
-            {
-                queryExpression.AppendFormat("Umbraco.Content(Guid.Parse(\"{0}\"))", sourceDocument.Key);
-            }
-        }
-        else
-        {
-            sourceDocument = _publishedContentQuery.ContentAtRoot().FirstOrDefault();
-            queryExpression.Append("Umbraco.ContentAtRoot().FirstOrDefault()");
-        }
-
-        // get children, optionally filtered by type
-        IEnumerable<IPublishedContent>? contents;
-        queryExpression.Append(indent);
-        if (model.ContentType != null && !model.ContentType.Alias.IsNullOrWhiteSpace())
-        {
-            contents = sourceDocument == null
-                ? Enumerable.Empty<IPublishedContent>()
-                : sourceDocument.ChildrenOfType(_variationContextAccessor, model.ContentType.Alias);
-            queryExpression.AppendFormat(".ChildrenOfType(\"{0}\")", model.ContentType.Alias);
-        }
-        else
-        {
-            contents = sourceDocument == null
-                ? Enumerable.Empty<IPublishedContent>()
-                : sourceDocument.Children(_variationContextAccessor);
-            queryExpression.Append(".Children()");
-        }
-
-        if (model.Filters is not null)
-        {
-            // apply filters
-            foreach (QueryCondition condition in model.Filters.Where(x => !x.ConstraintValue.IsNullOrWhiteSpace()))
-            {
-                //x is passed in as the parameter alias for the linq where statement clause
-                Expression<Func<IPublishedContent, bool>> operation = condition.BuildCondition<IPublishedContent>("x");
-
-                //for review - this uses a tonized query rather then the normal linq query.
-                contents = contents?.Where(operation.Compile());
-                queryExpression.Append(indent);
-                queryExpression.AppendFormat(".Where({0})", operation);
-            }
-        }
-
-        // always add IsVisible() to the query
-        contents = contents?.Where(x => x.IsVisible(_publishedValueFallback));
-        queryExpression.Append(indent);
-        queryExpression.Append(".Where(x => x.IsVisible())");
-
-        // apply sort
-        if (model.Sort != null && (!model.Sort.Property?.Alias.IsNullOrWhiteSpace() ?? false))
-        {
-            contents = SortByDefaultPropertyValue(contents, model.Sort);
-
-            queryExpression.Append(indent);
-            queryExpression.AppendFormat(
-                model.Sort.Direction == "ascending"
-                    ? ".OrderBy(x => x.{0})"
-                    : ".OrderByDescending(x => x.{0})"
-                , model.Sort?.Property?.Alias);
-        }
-
-        // take
-        if (model.Take > 0)
-        {
-            contents = contents?.Take(model.Take);
-            queryExpression.Append(indent);
-            queryExpression.AppendFormat(".Take({0})", model.Take);
-        }
-
-        return contents;
-    }
-
-    private object GetConstraintValue(QueryCondition condition)
-    {
-        switch (condition.Property.Type)
-        {
-            case "int":
-                return int.Parse(condition.ConstraintValue, CultureInfo.InvariantCulture);
-            case "datetime":
-                DateTime dt;
-                return DateTime.TryParse(condition.ConstraintValue, out dt) ? dt : DateTime.Today;
-            default:
-                return condition.ConstraintValue;
-        }
-    }
-
-    private IEnumerable<IPublishedContent>? SortByDefaultPropertyValue(IEnumerable<IPublishedContent>? contents, SortExpression sortExpression)
-    {
-        switch (sortExpression.Property?.Alias)
-        {
-            case "id":
-                return sortExpression.Direction == "ascending"
-                    ? contents?.OrderBy(x => x.Id)
-                    : contents?.OrderByDescending(x => x.Id);
-            case "createDate":
-                return sortExpression.Direction == "ascending"
-                    ? contents?.OrderBy(x => x.CreateDate)
-                    : contents?.OrderByDescending(x => x.CreateDate);
-            case "publishDate":
-                return sortExpression.Direction == "ascending"
-                    ? contents?.OrderBy(x => x.UpdateDate)
-                    : contents?.OrderByDescending(x => x.UpdateDate);
-            case "name":
-                return sortExpression.Direction == "ascending"
-                    ? contents?.OrderBy(x => x.Name)
-                    : contents?.OrderByDescending(x => x.Name);
-            default:
-                return sortExpression.Direction == "ascending"
-                    ? contents?.OrderBy(x => x.Name)
-                    : contents?.OrderByDescending(x => x.Name);
-        }
-    }
-
-    /// <summary>
-    ///     Gets a list of all content types
-    /// </summary>
-    /// <returns></returns>
-    public IEnumerable<ContentTypeModel> GetContentTypes()
-    {
-        var contentTypes = _contentTypeService.GetAll()
-            .Select(x => new ContentTypeModel
-            {
-                Alias = x.Alias,
-                Name = _localizedTextService.Localize("template", "contentOfType", new[] { x.Name ?? string.Empty })
-            })
-            .OrderBy(x => x.Name).ToList();
-
-        contentTypes.Insert(
-            0,
-            new ContentTypeModel
-            {
-                Alias = string.Empty,
-                Name = _localizedTextService.Localize("template", "allContent")
-            });
-
-        return contentTypes;
-    }
-
-    /// <summary>
-    ///     Returns a collection of allowed properties.
-    /// </summary>
-    public IEnumerable<PropertyModel> GetAllowedProperties() => Properties.OrderBy(x => x.Name);
-
-    /// <summary>
-    ///     Returns a collection of constraint conditions that can be used in the query
-    /// </summary>
-    public IEnumerable<object> GetFilterConditions() => Terms;
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs b/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs
deleted file mode 100644
index a9f81344a0..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System.Net;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Media;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Web.Common.ActionsResults;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessForTinyMce)]
-public class TinyMceController : UmbracoAuthorizedApiController
-{
-    private readonly ContentSettings _contentSettings;
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly IImageUrlGenerator _imageUrlGenerator;
-    private readonly IIOHelper _ioHelper;
-    private readonly IShortStringHelper _shortStringHelper;
-
-    private readonly Dictionary<string, string> _fileContentTypeMappings =
-        new()
-        {
-            { "image/png", "png" },
-            { "image/jpeg", "jpg" },
-            { "image/gif", "gif" },
-            { "image/bmp", "bmp" },
-            { "image/x-icon", "ico" },
-            { "image/svg+xml", "svg" },
-            { "image/tiff", "tiff" },
-            { "image/webp", "webp" },
-        };
-
-    public TinyMceController(
-        IHostingEnvironment hostingEnvironment,
-        IShortStringHelper shortStringHelper,
-        IOptionsSnapshot<ContentSettings> contentSettings,
-        IIOHelper ioHelper,
-        IImageUrlGenerator imageUrlGenerator)
-    {
-        _hostingEnvironment = hostingEnvironment;
-        _shortStringHelper = shortStringHelper;
-        _contentSettings = contentSettings.Value;
-        _ioHelper = ioHelper;
-        _imageUrlGenerator = imageUrlGenerator;
-    }
-
-    [HttpPost]
-    public async Task<IActionResult> UploadImage(List<IFormFile> file)
-    {
-        // Must have a file
-        if (file.Count == 0)
-        {
-            return NotFound();
-        }
-
-        // Should only have one file
-        if (file.Count > 1)
-        {
-            return new UmbracoProblemResult("Only one file can be uploaded at a time", HttpStatusCode.BadRequest);
-        }
-
-        // Create an unique folder path to help with concurrent users to avoid filename clash
-        var imageTempPath =
-            _hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempImageUploads + "/" + Guid.NewGuid());
-
-        // Ensure image temp path exists
-        if (Directory.Exists(imageTempPath) == false)
-        {
-            Directory.CreateDirectory(imageTempPath);
-        }
-
-        IFormFile formFile = file.First();
-
-        // Really we should only have one file per request to this endpoint
-        //  var file = result.FileData[0];
-        var fileName = formFile.FileName.Trim(new[] {'\"'}).TrimEnd();
-        var safeFileName = fileName.ToSafeFileName(_shortStringHelper);
-        string ext;
-        var fileExtensionIndex = safeFileName.LastIndexOf('.');
-        if (fileExtensionIndex is not -1)
-        {
-            ext = safeFileName.Substring(fileExtensionIndex + 1).ToLowerInvariant();
-        }
-        else
-        {
-            _fileContentTypeMappings.TryGetValue(formFile.ContentType, out var fileExtension);
-            ext = fileExtension ?? string.Empty;
-
-            // safeFileName will not have a file extension, so we need to add it back
-            safeFileName += $".{ext}";
-        }
-
-        if (_contentSettings.IsFileAllowedForUpload(ext) == false ||
-            _imageUrlGenerator.IsSupportedImageFormat(ext) == false)
-        {
-            // Throw some error - to say can't upload this IMG type
-            return new UmbracoProblemResult("This is not an image filetype extension that is approved", HttpStatusCode.BadRequest);
-        }
-
-        var newFilePath = imageTempPath + Path.DirectorySeparatorChar + safeFileName;
-        var relativeNewFilePath = GetRelativePath(newFilePath);
-
-        await using (FileStream stream = System.IO.File.Create(newFilePath))
-        {
-            await formFile.CopyToAsync(stream);
-        }
-
-        return Ok(new { tmpLocation = relativeNewFilePath });
-    }
-
-    // Use private method istead of _ioHelper.GetRelativePath as that is relative for the webroot and not the content root.
-    private string GetRelativePath(string path)
-    {
-        if (path.IsFullPath())
-        {
-            var rootDirectory = _hostingEnvironment.MapPathContentRoot("~");
-            var relativePath = _ioHelper.PathStartsWith(path, rootDirectory) ? path[rootDirectory.Length..] : path;
-            path = relativePath;
-        }
-
-        return PathUtility.EnsurePathIsApplicationRootPrefixed(path);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/TourController.cs b/src/Umbraco.Web.BackOffice/Controllers/TourController.cs
deleted file mode 100644
index 4d708b4fc8..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/TourController.cs
+++ /dev/null
@@ -1,315 +0,0 @@
-using System.Text;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.FileProviders;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Tour;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.DependencyInjection;
-using Umbraco.Extensions;
-using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class TourController : UmbracoAuthorizedJsonController
-{
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IContentTypeService _contentTypeService;
-    private readonly TourFilterCollection _filters;
-    private readonly IWebHostEnvironment _webHostEnvironment;
-    private readonly TourSettings _tourSettings;
-
-    // IHostingEnvironment is still injected as when removing it, the number of
-    // parameters matches with the obsolete ctor and the two ctors become ambiguous
-    // [ActivatorUtilitiesConstructor] won't solve the problem in this case
-    // IHostingEnvironment can be removed when the obsolete ctor is removed
-    [ActivatorUtilitiesConstructor]
-    public TourController(
-        TourFilterCollection filters,
-        IHostingEnvironment hostingEnvironment,
-        IOptionsSnapshot<TourSettings> tourSettings,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IContentTypeService contentTypeService,
-        IWebHostEnvironment webHostEnvironment)
-    {
-        _filters = filters;
-        _tourSettings = tourSettings.Value;
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-        _contentTypeService = contentTypeService;
-        _webHostEnvironment = webHostEnvironment;
-    }
-
-    [Obsolete("Use other ctor - Will be removed in Umbraco 13")]
-    public TourController(
-        TourFilterCollection filters,
-        IHostingEnvironment hostingEnvironment,
-        IOptionsSnapshot<TourSettings> tourSettings,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IContentTypeService contentTypeService)
-        : this(
-              filters,
-              hostingEnvironment,
-              tourSettings,
-              backofficeSecurityAccessor,
-              contentTypeService,
-              StaticServiceProvider.Instance.GetRequiredService<IWebHostEnvironment>())
-    {
-    }
-
-    public async Task<IEnumerable<BackOfficeTourFile>> GetTours()
-    {
-        var result = new List<BackOfficeTourFile>();
-
-        if (_tourSettings.EnableTours == false)
-        {
-            return result;
-        }
-
-        IUser? user = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-        if (user == null)
-        {
-            return result;
-        }
-
-        // Get all filters that will be applied to all tour aliases
-        var aliasOnlyFilters = _filters.Where(x => x.PluginName == null && x.TourFileName == null).ToList();
-
-        // Don't pass in any filters for core tours that have a plugin name assigned
-        var nonPluginFilters = _filters.Where(x => x.PluginName == null).ToList();
-
-
-        // Get core tour files
-        IFileProvider toursProvider = new EmbeddedFileProvider(GetType().Assembly, "Umbraco.Cms.Web.BackOffice.EmbeddedResources.Tours");
-
-        IEnumerable<IFileInfo> embeddedTourFiles = toursProvider.GetDirectoryContents(string.Empty)
-                                    .Where(x => !x.IsDirectory && x.Name.EndsWith(".json"));
-
-        foreach (var embeddedTour in embeddedTourFiles)
-        {
-            using Stream stream = embeddedTour.CreateReadStream();
-            await TryParseTourFile(embeddedTour.Name, result, nonPluginFilters, aliasOnlyFilters, stream);
-        }
-
-        // Collect all tour files from packages - /App_Plugins physical or virtual locations
-        IEnumerable<Tuple<IFileInfo, string>> toursFromPackages = GetTourFiles(_webHostEnvironment.WebRootFileProvider, Constants.SystemDirectories.AppPlugins);
-
-        foreach (var tuple in toursFromPackages)
-        {
-            string pluginName = tuple.Item2;
-            var pluginFilters = _filters.Where(x => x.PluginName != null && x.PluginName.IsMatch(pluginName)).ToList();
-
-            // Combine matched package filters with filters not specific to a package
-            var combinedFilters = nonPluginFilters.Concat(pluginFilters).ToList();
-
-            IFileInfo tourFile = tuple.Item1;
-            using (Stream stream = tourFile.CreateReadStream())
-            {
-                await TryParseTourFile(
-                    tourFile.Name,
-                    result,
-                    combinedFilters,
-                    aliasOnlyFilters,
-                    stream,
-                    pluginName);
-            }
-        }
-
-        // Get all allowed sections for the current user
-        var allowedSections = user.AllowedSections.ToList();
-
-        var toursToBeRemoved = new List<BackOfficeTourFile>();
-
-        // Checking to see if the user has access to the required tour sections, else we remove the tour
-        foreach (BackOfficeTourFile backOfficeTourFile in result)
-        {
-            if (backOfficeTourFile.Tours != null)
-            {
-                foreach (BackOfficeTour tour in backOfficeTourFile.Tours)
-                {
-                    if (tour.RequiredSections != null)
-                    {
-                        foreach (var toursRequiredSection in tour.RequiredSections)
-                        {
-                            if (allowedSections.Contains(toursRequiredSection) == false)
-                            {
-                                toursToBeRemoved.Add(backOfficeTourFile);
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return result.Except(toursToBeRemoved).OrderBy(x => x.FileName, StringComparer.InvariantCultureIgnoreCase);
-    }
-
-    private IEnumerable<Tuple<IFileInfo, string>> GetTourFiles(IFileProvider fileProvider, string folder)
-    {
-        IEnumerable<IFileInfo> pluginFolders = fileProvider.GetDirectoryContents(folder).Where(x => x.IsDirectory);
-
-        foreach (IFileInfo pluginFolder in pluginFolders)
-        {
-            var pluginFilters = _filters.Where(x => x.PluginName != null && x.PluginName.IsMatch(pluginFolder.Name)).ToList();
-
-            // If there is any filter applied to match the plugin only (no file or tour alias) then ignore the plugin entirely
-            var isPluginFiltered = pluginFilters.Any(x => x.TourFileName == null && x.TourAlias == null);
-            if (isPluginFiltered)
-            {
-                continue;
-            }
-
-            // get the full virtual path for the plugin folder
-            var pluginFolderPath = WebPath.Combine(folder, pluginFolder.Name);
-
-            // loop through the folder(s) in order to find tours
-            //  - there could be multiple on case sensitive file system
-            // Hard-coding the "backoffice" directory name to gain a better performance when traversing the App_Plugins directory
-            foreach (var subDir in GetToursFolderPaths(fileProvider, pluginFolderPath, "backoffice"))
-            {
-                IEnumerable<IFileInfo> tourFiles = fileProvider
-                    .GetDirectoryContents(subDir)
-                    .Where(x => x.Name.InvariantEndsWith(".json"));
-
-                foreach (IFileInfo file in tourFiles)
-                {
-                    yield return new Tuple<IFileInfo, string>(file, pluginFolder.Name);
-                }
-            }
-        }
-    }
-
-    private static IEnumerable<string> GetToursFolderPaths(IFileProvider fileProvider, string path, string subDirName)
-    {
-        // Hard-coding the "tours" directory name to gain a better performance when traversing the sub directories
-        const string toursDirName = "tours";
-
-        // It is necessary to iterate through the subfolders because on Linux we'll get casing issues when
-        // we try to access {path}/{pluginDirectory.Name}/backoffice/tours directly
-        foreach (IFileInfo subDir in fileProvider.GetDirectoryContents(path))
-        {
-            // InvariantEquals({dirName}) is used to gain a better performance when looking for the tours folder
-            if (subDir.IsDirectory && subDir.Name.InvariantEquals(subDirName))
-            {
-                var virtualPath = WebPath.Combine(path, subDir.Name);
-
-                if (subDir.Name.InvariantEquals(toursDirName))
-                {
-                    yield return virtualPath;
-                }
-
-                foreach (var nested in GetToursFolderPaths(fileProvider, virtualPath, toursDirName))
-                {
-                    yield return nested;
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    ///     Gets a tours for a specific doctype.
-    /// </summary>
-    /// <param name="doctypeAlias">The documenttype alias</param>
-    /// <returns>A <see cref="BackOfficeTour" /></returns>
-    public async Task<IEnumerable<BackOfficeTour>> GetToursForDoctype(string doctypeAlias)
-    {
-        IEnumerable<BackOfficeTourFile> tourFiles = await GetTours();
-
-        var doctypeAliasWithCompositions = new List<string> { doctypeAlias };
-
-        IContentType? contentType = _contentTypeService.Get(doctypeAlias);
-
-        if (contentType != null)
-        {
-            doctypeAliasWithCompositions.AddRange(contentType.CompositionAliases());
-        }
-
-        return tourFiles.SelectMany(x => x.Tours)
-            .Where(x =>
-            {
-                if (string.IsNullOrEmpty(x.ContentType))
-                {
-                    return false;
-                }
-
-                IEnumerable<string> contentTypes = x.ContentType
-                    .Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).Select(ct => ct.Trim());
-                return contentTypes.Intersect(doctypeAliasWithCompositions).Any();
-            });
-    }
-
-    private async Task TryParseTourFile(
-        string tourFile,
-        ICollection<BackOfficeTourFile> result,
-        List<BackOfficeTourFilter> filters,
-        List<BackOfficeTourFilter> aliasOnlyFilters,
-        Stream fileStream,
-        string? pluginName = null)
-    {
-        var fileName = Path.GetFileNameWithoutExtension(tourFile);
-        if (fileName == null)
-        {
-            return;
-        }
-
-        // Get the filters specific to this file
-        var fileFilters = filters.Where(x => x.TourFileName != null && x.TourFileName.IsMatch(fileName)).ToList();
-
-        // If there is any filter applied to match the file only (no tour alias) then ignore the file entirely
-        var isFileFiltered = fileFilters.Any(x => x.TourAlias == null);
-        if (isFileFiltered)
-        {
-            return;
-        }
-
-        // Now combine all aliases to filter below
-        var aliasFilters = aliasOnlyFilters.Concat(filters.Where(x => x.TourAlias != null))
-            .Select(x => x.TourAlias)
-            .ToList();
-
-        try
-        {
-            using var reader = new StreamReader(fileStream, Encoding.UTF8);
-            var contents = reader.ReadToEnd();
-            BackOfficeTour[]? tours = JsonConvert.DeserializeObject<BackOfficeTour[]>(contents);
-
-            IEnumerable<BackOfficeTour>? backOfficeTours = tours?.Where(x =>
-                aliasFilters.Count == 0 || aliasFilters.WhereNotNull().All(filter => filter.IsMatch(x.Alias)) == false);
-
-            IUser? user = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-
-            var localizedTours = backOfficeTours?.Where(x =>
-                string.IsNullOrWhiteSpace(x.Culture) || x.Culture.Equals(user?.Language, StringComparison.InvariantCultureIgnoreCase)).ToList();
-
-            var tour = new BackOfficeTourFile
-            {
-                FileName = Path.GetFileNameWithoutExtension(tourFile),
-                PluginName = pluginName,
-                Tours = localizedTours ?? new List<BackOfficeTour>()
-            };
-
-            // Don't add if all of the tours are filtered
-            if (tour.Tours.Any())
-            {
-                result.Add(tour);
-            }
-        }
-        catch (IOException e)
-        {
-            throw new IOException("Error while trying to read file: " + tourFile, e);
-        }
-        catch (JsonReaderException e)
-        {
-            throw new JsonReaderException("Error while trying to parse content as tour data: " + tourFile, e);
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/TrackedReferencesController.cs b/src/Umbraco.Web.BackOffice/Controllers/TrackedReferencesController.cs
deleted file mode 100644
index c1c2a4f93b..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/TrackedReferencesController.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.ModelBinders;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessContentOrMedia)]
-public class TrackedReferencesController : BackOfficeNotificationsController
-{
-    private readonly ITrackedReferencesService _relationService;
-
-    public TrackedReferencesController(ITrackedReferencesService relationService) => _relationService = relationService;
-
-    /// <summary>
-    ///     Gets a page list of tracked references for the current item, so you can see where an item is being used.
-    /// </summary>
-    /// <remarks>
-    ///     Used by info tabs on content, media etc. and for the delete and unpublish of single items.
-    ///     This is basically finding parents of relations.
-    /// </remarks>
-    public ActionResult<PagedResult<RelationItem>> GetPagedReferences(int id, int pageNumber = 1, int pageSize = 100,
-        bool filterMustBeIsDependency = false)
-    {
-        if (pageNumber <= 0 || pageSize <= 0)
-        {
-            return BadRequest("Both pageNumber and pageSize must be greater than zero");
-        }
-
-        return _relationService.GetPagedRelationsForItem(id, pageNumber - 1, pageSize, filterMustBeIsDependency);
-    }
-
-    /// <summary>
-    ///     Gets a page list of the child nodes of the current item used in any kind of relation.
-    /// </summary>
-    /// <remarks>
-    ///     Used when deleting and unpublishing a single item to check if this item has any descending items that are in any
-    ///     kind of relation.
-    ///     This is basically finding the descending items which are children in relations.
-    /// </remarks>
-    public ActionResult<PagedResult<RelationItem>> GetPagedDescendantsInReferences(int parentId, int pageNumber = 1,
-        int pageSize = 100, bool filterMustBeIsDependency = true)
-    {
-        if (pageNumber <= 0 || pageSize <= 0)
-        {
-            return BadRequest("Both pageNumber and pageSize must be greater than zero");
-        }
-
-        return _relationService.GetPagedDescendantsInReferences(parentId, pageNumber - 1, pageSize,
-            filterMustBeIsDependency);
-    }
-
-    /// <summary>
-    ///     Gets a page list of the items used in any kind of relation from selected integer ids.
-    /// </summary>
-    /// <remarks>
-    ///     Used when bulk deleting content/media and bulk unpublishing content (delete and unpublish on List view).
-    ///     This is basically finding children of relations.
-    /// </remarks>
-    [HttpGet]
-    [HttpPost]
-    public ActionResult<PagedResult<RelationItem>> GetPagedReferencedItems([FromJsonPath] int[] ids, int pageNumber = 1,
-        int pageSize = 100, bool filterMustBeIsDependency = true)
-    {
-        if (pageNumber <= 0 || pageSize <= 0)
-        {
-            return BadRequest("Both pageNumber and pageSize must be greater than zero");
-        }
-
-        return _relationService.GetPagedItemsWithRelations(ids, pageNumber - 1, pageSize, filterMustBeIsDependency);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/TwoFactorLoginController.cs b/src/Umbraco.Web.BackOffice/Controllers/TwoFactorLoginController.cs
deleted file mode 100644
index 68a8773362..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/TwoFactorLoginController.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-public class TwoFactorLoginController : UmbracoAuthorizedJsonController
-{
-    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-    private readonly IBackOfficeSignInManager _backOfficeSignInManager;
-    private readonly IBackOfficeUserManager _backOfficeUserManager;
-    private readonly ILogger<TwoFactorLoginController> _logger;
-    private readonly ITwoFactorLoginService _twoFactorLoginService;
-    private readonly IOptionsSnapshot<TwoFactorLoginViewOptions> _twoFactorLoginViewOptions;
-
-    public TwoFactorLoginController(
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-        ILogger<TwoFactorLoginController> logger,
-        ITwoFactorLoginService twoFactorLoginService,
-        IBackOfficeSignInManager backOfficeSignInManager,
-        IBackOfficeUserManager backOfficeUserManager,
-        IOptionsSnapshot<TwoFactorLoginViewOptions> twoFactorLoginViewOptions)
-    {
-        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
-        _logger = logger;
-        _twoFactorLoginService = twoFactorLoginService;
-        _backOfficeSignInManager = backOfficeSignInManager;
-        _backOfficeUserManager = backOfficeUserManager;
-        _twoFactorLoginViewOptions = twoFactorLoginViewOptions;
-    }
-
-    /// <summary>
-    ///     Used to retrieve the 2FA providers for code submission
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet]
-    [AllowAnonymous]
-    public async Task<ActionResult<IEnumerable<string>>> GetEnabled2FAProvidersForCurrentUser()
-    {
-        BackOfficeIdentityUser? user = await _backOfficeSignInManager.GetTwoFactorAuthenticationUserAsync();
-        if (user == null)
-        {
-            _logger.LogWarning("No verified user found, returning 404");
-            return NotFound();
-        }
-
-        IList<string> userFactors = await _backOfficeUserManager.GetValidTwoFactorProvidersAsync(user);
-        return new ObjectResult(userFactors);
-    }
-
-
-    [HttpGet]
-    public async Task<ActionResult<IEnumerable<UserTwoFactorProviderModel>>> Get2FAProvidersForUser(int userId)
-    {
-        BackOfficeIdentityUser? user = await _backOfficeUserManager.FindByIdAsync(userId.ToString(CultureInfo.InvariantCulture));
-        if (user is null)
-        {
-            throw new InvalidOperationException("Could not find user");
-        }
-
-        var enabledProviderNameHashSet =
-            new HashSet<string>(await _twoFactorLoginService.GetEnabledTwoFactorProviderNamesAsync(user.Key));
-
-        IEnumerable<string> providerNames = await _backOfficeUserManager.GetValidTwoFactorProvidersAsync(user);
-
-        // Filter out any providers that does not have a view attached to it, since it's unusable then.
-        providerNames = providerNames.Where(providerName =>
-        {
-            TwoFactorLoginViewOptions options = _twoFactorLoginViewOptions.Get(providerName);
-            return options is not null && !string.IsNullOrWhiteSpace(options.SetupViewPath);
-        });
-
-        return providerNames.Select(providerName =>
-            new UserTwoFactorProviderModel(providerName, enabledProviderNameHashSet.Contains(providerName))).ToArray();
-    }
-
-    [HttpGet]
-    public async Task<ActionResult<object?>> SetupInfo(string providerName)
-    {
-        IUser? user = _backOfficeSecurityAccessor?.BackOfficeSecurity?.CurrentUser;
-
-        var setupInfo = await _twoFactorLoginService.GetSetupInfoAsync(user!.Key, providerName);
-
-        return setupInfo;
-    }
-
-
-    [HttpPost]
-    public async Task<ActionResult<bool>> ValidateAndSave(string providerName, string secret, string code)
-    {
-        IUser? user = _backOfficeSecurityAccessor?.BackOfficeSecurity?.CurrentUser;
-
-        return await _twoFactorLoginService.ValidateAndSaveAsync(providerName, user!.Key, secret, code);
-    }
-
-    [HttpPost]
-    [Authorize(Policy = AuthorizationPolicies.SectionAccessUsers)]
-    public async Task<ActionResult<bool>> Disable(string providerName, Guid userKey) =>
-        await _twoFactorLoginService.DisableAsync(userKey, providerName);
-
-    [HttpPost]
-    public async Task<ActionResult<bool>> DisableWithCode(string providerName, string code)
-    {
-        Guid? key = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Key;
-
-        return await _twoFactorLoginService.DisableWithCodeAsync(providerName, key!.Value, code);
-    }
-
-    [HttpGet]
-    public ActionResult<string?> ViewPathForProviderName(string providerName)
-    {
-        TwoFactorLoginViewOptions? options = _twoFactorLoginViewOptions.Get(providerName);
-        return options.SetupViewPath;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedApiController.cs b/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedApiController.cs
deleted file mode 100644
index 14308eb63b..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedApiController.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.Common.ActionsResults;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Cms.Web.Common.Controllers;
-using Umbraco.Cms.Web.Common.Filters;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     Provides a base class for authorized auto-routed Umbraco API controllers.
-/// </summary>
-/// <remarks>
-///     This controller will also append a custom header to the response if the user
-///     is logged in using forms authentication which indicates the seconds remaining
-///     before their timeout expires.
-/// </remarks>
-[AngularJsonOnlyConfiguration] // TODO: This could be applied with our Application Model conventions
-[JsonExceptionFilter]
-[IsBackOffice]
-[UmbracoUserTimeoutFilter]
-[Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
-[DisableBrowserCache]
-[UmbracoRequireHttps]
-[CheckIfUserTicketDataIsStale]
-[MiddlewareFilter(typeof(UnhandledExceptionLoggerFilter))]
-public abstract class UmbracoAuthorizedApiController : UmbracoApiController
-{
-    /// <summary>
-    ///     Returns a validation problem result for the <see cref="IErrorModel" /> and the <see cref="ModelStateDictionary" />
-    /// </summary>
-    /// <param name="model"></param>
-    /// <param name="modelStateDictionary"></param>
-    /// <param name="statusCode"></param>
-    /// <returns></returns>
-    protected virtual ActionResult ValidationProblem(IErrorModel? model, ModelStateDictionary modelStateDictionary,
-        int statusCode = StatusCodes.Status400BadRequest)
-    {
-        if (model is not null)
-        {
-            model.Errors = modelStateDictionary.ToErrorDictionary();
-        }
-
-        return ValidationProblem(model, statusCode);
-    }
-
-    /// <summary>
-    ///     Overridden to return Umbraco compatible errors
-    /// </summary>
-    /// <param name="modelStateDictionary"></param>
-    /// <returns></returns>
-    [NonAction]
-    public override ActionResult ValidationProblem(ModelStateDictionary modelStateDictionary) =>
-        new ValidationErrorResult(new SimpleValidationModel(modelStateDictionary.ToErrorDictionary()));
-
-    //ValidationProblemDetails problemDetails = GetValidationProblemDetails(modelStateDictionary: modelStateDictionary);
-    //return new ValidationErrorResult(problemDetails);
-    // creates validation problem details instance.
-    // borrowed from netcore: https://github.com/dotnet/aspnetcore/blob/main/src/Mvc/Mvc.Core/src/ControllerBase.cs#L1970
-    protected ValidationProblemDetails? GetValidationProblemDetails(
-        string? detail = null,
-        string? instance = null,
-        int? statusCode = null,
-        string? title = null,
-        string? type = null,
-        [ActionResultObjectValue] ModelStateDictionary? modelStateDictionary = null)
-    {
-        modelStateDictionary ??= ModelState;
-
-        ValidationProblemDetails? validationProblem;
-        if (ProblemDetailsFactory == null)
-        {
-            // ProblemDetailsFactory may be null in unit testing scenarios. Improvise to make this more testable.
-            validationProblem = new ValidationProblemDetails(modelStateDictionary)
-            {
-                Detail = detail,
-                Instance = instance,
-                Status = statusCode,
-                Title = title,
-                Type = type
-            };
-        }
-        else
-        {
-            validationProblem = ProblemDetailsFactory?.CreateValidationProblemDetails(
-                HttpContext,
-                modelStateDictionary,
-                statusCode,
-                title,
-                type,
-                detail,
-                instance);
-        }
-
-        return validationProblem;
-    }
-
-    /// <summary>
-    ///     Returns an Umbraco compatible validation problem for the given error message
-    /// </summary>
-    /// <param name="errorMessage"></param>
-    /// <returns></returns>
-    protected virtual ActionResult ValidationProblem(string errorMessage)
-    {
-        ValidationProblemDetails? problemDetails = GetValidationProblemDetails(errorMessage);
-        return new ValidationErrorResult(problemDetails);
-    }
-
-    /// <summary>
-    ///     Returns an Umbraco compatible validation problem for the object result
-    /// </summary>
-    /// <param name="value"></param>
-    /// <param name="statusCode"></param>
-    /// <returns></returns>
-    protected virtual ActionResult ValidationProblem(object? value, int statusCode)
-        => new ValidationErrorResult(value, statusCode);
-
-    /// <summary>
-    ///     Returns an Umbraco compatible validation problem for the given notification model
-    /// </summary>
-    /// <param name="model"></param>
-    /// <param name="statusCode"></param>
-    /// <returns></returns>
-    protected virtual ActionResult ValidationProblem(INotificationModel? model,
-        int statusCode = StatusCodes.Status400BadRequest)
-        => new ValidationErrorResult(model, statusCode);
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedJsonController.cs b/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedJsonController.cs
deleted file mode 100644
index e3d2e692c0..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/UmbracoAuthorizedJsonController.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Umbraco.Cms.Web.BackOffice.Filters;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-/// <summary>
-///     An abstract API controller that only supports JSON and all requests must contain the correct csrf header
-/// </summary>
-/// <remarks>
-///     Inheriting from this controller means that ALL of your methods are JSON methods that are called by Angular,
-///     methods that are not called by Angular or don't contain a valid csrf header will NOT work.
-/// </remarks>
-[ValidateAngularAntiForgeryToken]
-public abstract class UmbracoAuthorizedJsonController : UmbracoAuthorizedApiController
-{
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/UpdateCheckController.cs b/src/Umbraco.Web.BackOffice/Controllers/UpdateCheckController.cs
deleted file mode 100644
index 0c76bfdca5..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/UpdateCheckController.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Semver;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Web;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class UpdateCheckController : UmbracoAuthorizedJsonController
-{
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly ICookieManager _cookieManager;
-    private readonly GlobalSettings _globalSettings;
-    private readonly IUmbracoVersion _umbracoVersion;
-    private readonly IUpgradeService _upgradeService;
-
-    public UpdateCheckController(
-        IUpgradeService upgradeService,
-        IUmbracoVersion umbracoVersion,
-        ICookieManager cookieManager,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IOptionsSnapshot<GlobalSettings> globalSettings)
-    {
-        _upgradeService = upgradeService ?? throw new ArgumentNullException(nameof(upgradeService));
-        _umbracoVersion = umbracoVersion ?? throw new ArgumentNullException(nameof(umbracoVersion));
-        _cookieManager = cookieManager ?? throw new ArgumentNullException(nameof(cookieManager));
-        _backofficeSecurityAccessor = backofficeSecurityAccessor ??
-                                      throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
-        _globalSettings = globalSettings.Value ?? throw new ArgumentNullException(nameof(globalSettings));
-    }
-
-    [UpdateCheckResponseFilter]
-    public async Task<UpgradeCheckResponse?> GetCheck()
-    {
-        var updChkCookie = _cookieManager.GetCookieValue("UMB_UPDCHK");
-        var updateCheckCookie = updChkCookie ?? string.Empty;
-        if (_globalSettings.VersionCheckPeriod > 0 && string.IsNullOrEmpty(updateCheckCookie) &&
-            (_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.IsAdmin() ?? false))
-        {
-            try
-            {
-                var version = new SemVersion(_umbracoVersion.Version.Major, _umbracoVersion.Version.Minor,
-                    _umbracoVersion.Version.Build, _umbracoVersion.Comment);
-                UpgradeResult result = await _upgradeService.CheckUpgrade(version);
-
-                return new UpgradeCheckResponse(result.UpgradeType, result.Comment, result.UpgradeUrl, _umbracoVersion);
-            }
-            catch
-            {
-                //We don't want to crash due to this
-                return null;
-            }
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    ///     Adds the cookie response if it was successful
-    /// </summary>
-    /// <remarks>
-    ///     A filter is required because we are returning an object from the get method and not an HttpResponseMessage
-    /// </remarks>
-    internal class UpdateCheckResponseFilterAttribute : TypeFilterAttribute
-    {
-        public UpdateCheckResponseFilterAttribute() : base(typeof(UpdateCheckResponseFilter))
-        {
-        }
-
-        private class UpdateCheckResponseFilter : IActionFilter
-        {
-            private readonly GlobalSettings _globalSettings;
-
-            public UpdateCheckResponseFilter(IOptionsSnapshot<GlobalSettings> globalSettings) =>
-                _globalSettings = globalSettings.Value;
-
-            public void OnActionExecuted(ActionExecutedContext context)
-            {
-                if (context.HttpContext.Response == null)
-                {
-                    return;
-                }
-
-                if (context.Result is ObjectResult objectContent)
-                {
-                    if (objectContent.Value == null)
-                    {
-                        return;
-                    }
-
-                    context.HttpContext.Response.Cookies.Append("UMB_UPDCHK", "1",
-                        new CookieOptions
-                        {
-                            Path = "/",
-                            Expires = DateTimeOffset.Now.AddDays(_globalSettings.VersionCheckPeriod),
-                            HttpOnly = true,
-                            Secure = _globalSettings.UseHttps
-                        });
-                }
-            }
-
-            public void OnActionExecuting(ActionExecutingContext context)
-            {
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/UserGroupEditorAuthorizationHelper.cs b/src/Umbraco.Web.BackOffice/Controllers/UserGroupEditorAuthorizationHelper.cs
deleted file mode 100644
index 62f2a0cb45..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/UserGroupEditorAuthorizationHelper.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[Obsolete("Use IUserGroupPermissionService instead, should be removed alongside UserGroup controller in V13.")]
-internal class UserGroupEditorAuthorizationHelper
-{
-    private readonly AppCaches _appCaches;
-    private readonly IContentService _contentService;
-    private readonly IEntityService _entityService;
-    private readonly IMediaService _mediaService;
-    private readonly IUserService _userService;
-
-    public UserGroupEditorAuthorizationHelper(IUserService userService, IContentService contentService, IMediaService mediaService, IEntityService entityService, AppCaches appCaches)
-    {
-        _userService = userService;
-        _contentService = contentService;
-        _mediaService = mediaService;
-        _entityService = entityService;
-        _appCaches = appCaches;
-    }
-
-    /// <summary>
-    ///     Authorize that the current user belongs to these groups
-    /// </summary>
-    /// <param name="currentUser"></param>
-    /// <param name="groupIds"></param>
-    /// <returns></returns>
-    public Attempt<string?> AuthorizeGroupAccess(IUser? currentUser, params int[] groupIds)
-    {
-        if (currentUser?.IsAdmin() ?? false)
-        {
-            return Attempt<string?>.Succeed();
-        }
-
-        IEnumerable<IUserGroup> groups = _userService.GetAllUserGroups(groupIds.ToArray());
-        var groupAliases = groups.Select(x => x.Alias).ToArray();
-        var userGroups = currentUser?.Groups.Select(x => x.Alias).ToArray() ?? Array.Empty<string>();
-        var missingAccess = groupAliases.Except(userGroups).ToArray();
-        return missingAccess.Length == 0
-            ? Attempt<string?>.Succeed()
-            : Attempt.Fail("User is not a member of " + string.Join(", ", missingAccess));
-    }
-
-    /// <summary>
-    ///     Authorize that the current user belongs to these groups
-    /// </summary>
-    /// <param name="currentUser"></param>
-    /// <param name="groupAliases"></param>
-    /// <returns></returns>
-    public Attempt<string?> AuthorizeGroupAccess(IUser? currentUser, params string[] groupAliases)
-    {
-        if (currentUser?.IsAdmin() ?? false)
-        {
-            return Attempt<string?>.Succeed();
-        }
-
-        IEnumerable<IUserGroup> existingGroups = _userService.GetUserGroupsByAlias(groupAliases);
-
-        if (!existingGroups.Any())
-        {
-            // We're dealing with new groups,
-            // so authorization should be given to any user with access to Users section
-            if (currentUser?.AllowedSections.Contains(Constants.Applications.Users) ?? false)
-            {
-                return Attempt<string?>.Succeed();
-            }
-        }
-
-        var userGroups = currentUser?.Groups.Select(x => x.Alias).ToArray();
-        var missingAccess = groupAliases.Except(userGroups ?? Array.Empty<string>()).ToArray();
-        return missingAccess.Length == 0
-            ? Attempt<string?>.Succeed()
-            : Attempt.Fail("User is not a member of " + string.Join(", ", missingAccess));
-    }
-
-    /// <summary>
-    ///     Authorize that the user is not adding a section to the group that they don't have access to
-    /// </summary>
-    public Attempt<string?> AuthorizeSectionChanges(
-        IUser? currentUser,
-        IEnumerable<string>? existingSections,
-        IEnumerable<string>? proposedAllowedSections)
-    {
-        if (currentUser?.IsAdmin() ?? false)
-        {
-            return Attempt<string?>.Succeed();
-        }
-
-        var sectionsAdded = proposedAllowedSections?.Except(existingSections ?? Enumerable.Empty<string>()).ToArray();
-        var sectionAccessMissing =
-            sectionsAdded?.Except(currentUser?.AllowedSections ?? Enumerable.Empty<string>()).ToArray();
-        return sectionAccessMissing?.Length > 0
-            ? Attempt.Fail("Current user doesn't have access to add these sections " +
-                           string.Join(", ", sectionAccessMissing))
-            : Attempt<string?>.Succeed();
-    }
-
-    /// <summary>
-    ///     Authorize that the user is not changing to a start node that they don't have access to (including admins)
-    /// </summary>
-    /// <param name="currentUser"></param>
-    /// <param name="currentContentStartId"></param>
-    /// <param name="proposedContentStartId"></param>
-    /// <param name="currentMediaStartId"></param>
-    /// <param name="proposedMediaStartId"></param>
-    /// <returns></returns>
-    public Attempt<string?> AuthorizeStartNodeChanges(
-        IUser? currentUser,
-        int? currentContentStartId,
-        int? proposedContentStartId,
-        int? currentMediaStartId,
-        int? proposedMediaStartId)
-    {
-        if (currentContentStartId != proposedContentStartId && proposedContentStartId.HasValue)
-        {
-            IContent? content = _contentService.GetById(proposedContentStartId.Value);
-            if (content != null)
-            {
-                if (currentUser?.HasPathAccess(content, _entityService, _appCaches) == false)
-                {
-                    return Attempt.Fail("Current user doesn't have access to the content path " + content.Path);
-                }
-            }
-        }
-
-        if (currentMediaStartId != proposedMediaStartId && proposedMediaStartId.HasValue)
-        {
-            IMedia? media = _mediaService.GetById(proposedMediaStartId.Value);
-            if (media != null)
-            {
-                if (currentUser?.HasPathAccess(media, _entityService, _appCaches) == false)
-                {
-                    return Attempt.Fail("Current user doesn't have access to the media path " + media.Path);
-                }
-            }
-        }
-
-        return Attempt<string?>.Succeed();
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/UserGroupsController.cs b/src/Umbraco.Web.BackOffice/Controllers/UserGroupsController.cs
deleted file mode 100644
index b259fbc897..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/UserGroupsController.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessUsers)]
-[PrefixlessBodyModelValidator]
-[Obsolete("Use the new user group controllers instead.")]
-public class UserGroupsController : BackOfficeNotificationsController
-{
-    private readonly AppCaches _appCaches;
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IContentService _contentService;
-    private readonly IEntityService _entityService;
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly IMediaService _mediaService;
-    private readonly IShortStringHelper _shortStringHelper;
-    private readonly IUmbracoMapper _umbracoMapper;
-    private readonly IUserService _userService;
-
-    public UserGroupsController(
-        IUserService userService,
-        IContentService contentService,
-        IEntityService entityService,
-        IMediaService mediaService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IUmbracoMapper umbracoMapper,
-        ILocalizedTextService localizedTextService,
-        IShortStringHelper shortStringHelper,
-        AppCaches appCaches)
-    {
-        _userService = userService ?? throw new ArgumentNullException(nameof(userService));
-        _contentService = contentService ?? throw new ArgumentNullException(nameof(contentService));
-        _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
-        _mediaService = mediaService ?? throw new ArgumentNullException(nameof(mediaService));
-        _backofficeSecurityAccessor = backofficeSecurityAccessor ??
-                                      throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _localizedTextService =
-            localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
-        _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
-        _appCaches = appCaches ?? throw new ArgumentNullException(nameof(appCaches));
-    }
-
-    [UserGroupValidate]
-    public ActionResult<UserGroupDisplay?> PostSaveUserGroup(UserGroupSave userGroupSave)
-    {
-        if (userGroupSave == null)
-        {
-            throw new ArgumentNullException(nameof(userGroupSave));
-        }
-
-        //authorize that the user has access to save this user group
-        var authHelper = new UserGroupEditorAuthorizationHelper(
-            _userService, _contentService, _mediaService, _entityService, _appCaches);
-
-        Attempt<string?> isAuthorized =
-            authHelper.AuthorizeGroupAccess(_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, userGroupSave.Alias);
-        if (isAuthorized == false)
-        {
-            return Unauthorized(isAuthorized.Result);
-        }
-
-        //if sections were added we need to check that the current user has access to that section
-        isAuthorized = authHelper.AuthorizeSectionChanges(
-            _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser,
-            userGroupSave.PersistedUserGroup?.AllowedSections,
-            userGroupSave.Sections);
-        if (isAuthorized == false)
-        {
-            return Unauthorized(isAuthorized.Result);
-        }
-
-        //if start nodes were changed we need to check that the current user has access to them
-        isAuthorized = authHelper.AuthorizeStartNodeChanges(
-            _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser,
-            userGroupSave.PersistedUserGroup?.StartContentId,
-            userGroupSave.StartContentId,
-            userGroupSave.PersistedUserGroup?.StartMediaId,
-            userGroupSave.StartMediaId);
-        if (isAuthorized == false)
-        {
-            return Unauthorized(isAuthorized.Result);
-        }
-
-        //need to ensure current user is in a group if not an admin to avoid a 401
-        EnsureNonAdminUserIsInSavedUserGroup(userGroupSave);
-
-        //map the model to the persisted instance
-        _umbracoMapper.Map(userGroupSave, userGroupSave.PersistedUserGroup);
-
-        if (userGroupSave.PersistedUserGroup is not null)
-        {
-            //save the group
-            _userService.Save(userGroupSave.PersistedUserGroup, userGroupSave.Users?.ToArray());
-        }
-
-        //deal with permissions
-
-        //remove ones that have been removed
-        var existing = _userService.GetPermissions(userGroupSave.PersistedUserGroup, true)
-            .ToDictionary(x => x.EntityId, x => x);
-        if (userGroupSave.AssignedPermissions is not null)
-        {
-            IEnumerable<int> toRemove = existing.Keys.Except(userGroupSave.AssignedPermissions.Select(x => x.Key));
-            foreach (var contentId in toRemove)
-            {
-                _userService.RemoveUserGroupPermissions(userGroupSave.PersistedUserGroup?.Id ?? default, contentId);
-            }
-
-            //update existing
-            foreach (KeyValuePair<int, IEnumerable<string>> assignedPermission in userGroupSave.AssignedPermissions)
-            {
-                _userService.ReplaceUserGroupPermissions(
-                    userGroupSave.PersistedUserGroup?.Id ?? default,
-                    assignedPermission.Value.Select(x => x[0]),
-                    assignedPermission.Key);
-            }
-        }
-
-        UserGroupDisplay? display = _umbracoMapper.Map<UserGroupDisplay>(userGroupSave.PersistedUserGroup);
-
-        display?.AddSuccessNotification(
-            _localizedTextService.Localize("speechBubbles", "operationSavedHeader"),
-            _localizedTextService.Localize("speechBubbles", "editUserGroupSaved"));
-        return display;
-    }
-
-    private void EnsureNonAdminUserIsInSavedUserGroup(UserGroupSave userGroupSave)
-    {
-        if (_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.IsAdmin() ?? false)
-        {
-            return;
-        }
-
-        var userIds = userGroupSave.Users?.ToList();
-        if (_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser is null ||
-            userIds is null ||
-            userIds.Contains(_backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.Id))
-        {
-            return;
-        }
-
-        userIds.Add(_backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.Id);
-        userGroupSave.Users = userIds;
-    }
-
-    /// <summary>
-    ///     Returns the scaffold for creating a new user group
-    /// </summary>
-    /// <returns></returns>
-    public UserGroupDisplay? GetEmptyUserGroup() =>
-        _umbracoMapper.Map<UserGroupDisplay>(new UserGroup(_shortStringHelper));
-
-    /// <summary>
-    ///     Returns all user groups
-    /// </summary>
-    /// <returns></returns>
-    public IEnumerable<UserGroupBasic> GetUserGroups(bool onlyCurrentUserGroups = true)
-    {
-        var allGroups = _umbracoMapper.MapEnumerable<IUserGroup, UserGroupBasic>(_userService.GetAllUserGroups())
-            .ToList();
-
-        var isAdmin = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.IsAdmin() ?? false;
-        if (isAdmin)
-        {
-            return allGroups;
-        }
-
-        if (onlyCurrentUserGroups == false)
-        {
-            //this user is not an admin so in that case we need to exclude all admin users
-            allGroups.RemoveAt(
-                allGroups.IndexOf(allGroups.Find(basic => basic.Alias == Constants.Security.AdminGroupAlias)!));
-            return allGroups;
-        }
-
-        //we cannot return user groups that this user does not have access to
-        var currentUserGroups = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Groups.Select(x => x.Alias)
-            .ToArray();
-        return allGroups.WhereNotNull().Where(x => currentUserGroups?.Contains(x.Alias) ?? false).ToArray();
-    }
-
-    /// <summary>
-    ///     Return a user group
-    /// </summary>
-    /// <returns></returns>
-    [Authorize(Policy = AuthorizationPolicies.UserBelongsToUserGroupInRequest)]
-    public ActionResult<UserGroupDisplay?> GetUserGroup(int id)
-    {
-        IUserGroup? found = _userService.GetUserGroupById(id);
-        if (found == null)
-        {
-            return NotFound();
-        }
-
-        UserGroupDisplay? display = _umbracoMapper.Map<UserGroupDisplay>(found);
-
-        return display;
-    }
-
-    [HttpPost]
-    [HttpDelete]
-    [Authorize(Policy = AuthorizationPolicies.UserBelongsToUserGroupInRequest)]
-    public IActionResult PostDeleteUserGroups([FromQuery] int[] userGroupIds)
-    {
-        IUserGroup[] userGroups = _userService.GetAllUserGroups(userGroupIds)
-            //never delete the admin group, sensitive data or translators group
-            .Where(x => !x.IsSystemUserGroup())
-            .ToArray();
-        foreach (IUserGroup userGroup in userGroups)
-        {
-            _userService.DeleteUserGroup(userGroup);
-        }
-
-        if (userGroups.Length > 1)
-        {
-            return Ok(_localizedTextService.Localize("speechBubbles", "deleteUserGroupsSuccess", new[] { userGroups.Length.ToString() }));
-        }
-
-        return Ok(_localizedTextService.Localize("speechBubbles", "deleteUserGroupSuccess", new[] { userGroups[0].Name }));
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs b/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
deleted file mode 100644
index 0476d6ce67..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
+++ /dev/null
@@ -1,1030 +0,0 @@
-using System.Globalization;
-using System.Net;
-using System.Runtime.Serialization;
-using System.Security.Cryptography;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MimeKit;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Editors;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Mail;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Media;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Email;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Persistence.Querying;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Infrastructure.Persistence;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.BackOffice.ModelBinders;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Cms.Web.Common.ActionsResults;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Cms.Web.Common.Models;
-using Umbraco.Cms.Web.Common.Security;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Controllers;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessUsers)]
-[PrefixlessBodyModelValidator]
-[IsCurrentUserModelFilter]
-public class UsersController : BackOfficeNotificationsController
-{
-    private readonly AppCaches _appCaches;
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly ContentSettings _contentSettings;
-    private readonly IEmailSender _emailSender;
-    private readonly IBackOfficeExternalLoginProviders _externalLogins;
-    private readonly GlobalSettings _globalSettings;
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly IHttpContextAccessor _httpContextAccessor;
-    private readonly IFileStreamSecurityValidator? _fileStreamSecurityValidator; // make non nullable in v14
-    private readonly IImageUrlGenerator _imageUrlGenerator;
-    private readonly LinkGenerator _linkGenerator;
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly ILogger<UsersController> _logger;
-    private readonly ILoggerFactory _loggerFactory;
-    private readonly MediaFileManager _mediaFileManager;
-    private readonly IPasswordChanger<BackOfficeIdentityUser> _passwordChanger;
-    private readonly SecuritySettings _securitySettings;
-    private readonly IShortStringHelper _shortStringHelper;
-    private readonly ISqlContext _sqlContext;
-    private readonly IUmbracoMapper _umbracoMapper;
-    private readonly UserEditorAuthorizationHelper _userEditorAuthorizationHelper;
-    private readonly IBackOfficeUserManager _userManager;
-    private readonly IUserService _userService;
-    private readonly WebRoutingSettings _webRoutingSettings;
-
-    [ActivatorUtilitiesConstructor]
-    public UsersController(
-        MediaFileManager mediaFileManager,
-        IOptionsSnapshot<ContentSettings> contentSettings,
-        IHostingEnvironment hostingEnvironment,
-        ISqlContext sqlContext,
-        IImageUrlGenerator imageUrlGenerator,
-        IOptionsSnapshot<SecuritySettings> securitySettings,
-        IEmailSender emailSender,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        AppCaches appCaches,
-        IShortStringHelper shortStringHelper,
-        IUserService userService,
-        ILocalizedTextService localizedTextService,
-        IUmbracoMapper umbracoMapper,
-        IOptionsSnapshot<GlobalSettings> globalSettings,
-        IBackOfficeUserManager backOfficeUserManager,
-        ILoggerFactory loggerFactory,
-        LinkGenerator linkGenerator,
-        IBackOfficeExternalLoginProviders externalLogins,
-        UserEditorAuthorizationHelper userEditorAuthorizationHelper,
-        IPasswordChanger<BackOfficeIdentityUser> passwordChanger,
-        IHttpContextAccessor httpContextAccessor,
-        IOptions<WebRoutingSettings> webRoutingSettings,
-        IFileStreamSecurityValidator fileStreamSecurityValidator)
-    {
-        _mediaFileManager = mediaFileManager;
-        _contentSettings = contentSettings.Value;
-        _hostingEnvironment = hostingEnvironment;
-        _sqlContext = sqlContext;
-        _imageUrlGenerator = imageUrlGenerator;
-        _securitySettings = securitySettings.Value;
-        _emailSender = emailSender;
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-        _appCaches = appCaches;
-        _shortStringHelper = shortStringHelper;
-        _userService = userService;
-        _localizedTextService = localizedTextService;
-        _umbracoMapper = umbracoMapper;
-        _globalSettings = globalSettings.Value;
-        _userManager = backOfficeUserManager;
-        _loggerFactory = loggerFactory;
-        _linkGenerator = linkGenerator;
-        _externalLogins = externalLogins;
-        _userEditorAuthorizationHelper = userEditorAuthorizationHelper;
-        _passwordChanger = passwordChanger;
-        _logger = _loggerFactory.CreateLogger<UsersController>();
-        _httpContextAccessor = httpContextAccessor;
-        _fileStreamSecurityValidator = fileStreamSecurityValidator;
-        _webRoutingSettings = webRoutingSettings.Value;
-    }
-
-    [Obsolete("Use constructor overload that has fileStreamSecurityValidator, scheduled for removal in v14")]
-    public UsersController(
-        MediaFileManager mediaFileManager,
-        IOptionsSnapshot<ContentSettings> contentSettings,
-        IHostingEnvironment hostingEnvironment,
-        ISqlContext sqlContext,
-        IImageUrlGenerator imageUrlGenerator,
-        IOptionsSnapshot<SecuritySettings> securitySettings,
-        IEmailSender emailSender,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        AppCaches appCaches,
-        IShortStringHelper shortStringHelper,
-        IUserService userService,
-        ILocalizedTextService localizedTextService,
-        IUmbracoMapper umbracoMapper,
-        IOptionsSnapshot<GlobalSettings> globalSettings,
-        IBackOfficeUserManager backOfficeUserManager,
-        ILoggerFactory loggerFactory,
-        LinkGenerator linkGenerator,
-        IBackOfficeExternalLoginProviders externalLogins,
-        UserEditorAuthorizationHelper userEditorAuthorizationHelper,
-        IPasswordChanger<BackOfficeIdentityUser> passwordChanger,
-        IHttpContextAccessor httpContextAccessor,
-        IOptions<WebRoutingSettings> webRoutingSettings)
-    {
-        _mediaFileManager = mediaFileManager;
-        _contentSettings = contentSettings.Value;
-        _hostingEnvironment = hostingEnvironment;
-        _sqlContext = sqlContext;
-        _imageUrlGenerator = imageUrlGenerator;
-        _securitySettings = securitySettings.Value;
-        _emailSender = emailSender;
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-        _appCaches = appCaches;
-        _shortStringHelper = shortStringHelper;
-        _userService = userService;
-        _localizedTextService = localizedTextService;
-        _umbracoMapper = umbracoMapper;
-        _globalSettings = globalSettings.Value;
-        _userManager = backOfficeUserManager;
-        _loggerFactory = loggerFactory;
-        _linkGenerator = linkGenerator;
-        _externalLogins = externalLogins;
-        _userEditorAuthorizationHelper = userEditorAuthorizationHelper;
-        _passwordChanger = passwordChanger;
-        _logger = _loggerFactory.CreateLogger<UsersController>();
-        _httpContextAccessor = httpContextAccessor;
-        _webRoutingSettings = webRoutingSettings.Value;
-    }
-
-    /// <summary>
-    ///     Returns a list of the sizes of gravatar URLs for the user or null if the gravatar server cannot be reached
-    /// </summary>
-    /// <returns></returns>
-    public ActionResult<string[]> GetCurrentUserAvatarUrls()
-    {
-        var urls = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.GetUserAvatarUrls(
-            _appCaches.RuntimeCache, _mediaFileManager, _imageUrlGenerator);
-        if (urls == null)
-        {
-            return ValidationProblem("Could not access Gravatar endpoint");
-        }
-
-        return urls;
-    }
-
-    [AppendUserModifiedHeader("id")]
-    [Authorize(Policy = AuthorizationPolicies.AdminUserEditsRequireAdmin)]
-    public IActionResult PostSetAvatar(int id, IList<IFormFile> file)
-        => PostSetAvatarInternal(file, _userService,
-        _appCaches.RuntimeCache, _mediaFileManager, _shortStringHelper, _contentSettings, _hostingEnvironment,
-        _imageUrlGenerator,_fileStreamSecurityValidator, id);
-
-    internal static IActionResult PostSetAvatarInternal(IList<IFormFile> files, IUserService userService,
-        IAppCache cache, MediaFileManager mediaFileManager, IShortStringHelper shortStringHelper,
-        ContentSettings contentSettings, IHostingEnvironment hostingEnvironment, IImageUrlGenerator imageUrlGenerator,
-        IFileStreamSecurityValidator? fileStreamSecurityValidator,
-        int id)
-    {
-        if (files is null)
-        {
-            return new UnsupportedMediaTypeResult();
-        }
-
-        var root = hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempFileUploads);
-        //ensure it exists
-        Directory.CreateDirectory(root);
-
-        //must have a file
-        if (files.Count == 0)
-        {
-            return new NotFoundResult();
-        }
-
-        IUser? user = userService.GetUserById(id);
-        if (user == null)
-        {
-            return new NotFoundResult();
-        }
-
-        if (files.Count > 1)
-        {
-            return new ValidationErrorResult(
-                "The request was not formatted correctly, only one file can be attached to the request");
-        }
-
-        //get the file info
-        IFormFile file = files.First();
-        var fileName = file.FileName.Trim(new[] { '\"' }).TrimEnd();
-        var safeFileName = fileName.ToSafeFileName(shortStringHelper);
-        var ext = safeFileName.Substring(safeFileName.LastIndexOf('.') + 1).ToLower();
-        const string allowedAvatarFileTypes = "jpeg,jpg,gif,bmp,png,tiff,tif,webp";
-
-        if (allowedAvatarFileTypes.Contains(ext) == true && contentSettings.DisallowedUploadFiles.Contains(ext) == false)
-        {
-            //generate a path of known data, we don't want this path to be guessable
-            user.Avatar = "UserAvatars/" + (user.Id + safeFileName).GenerateHash<SHA1>() + "." + ext;
-
-            //todo implement Filestreamsecurity
-            using (var ms = new MemoryStream())
-            {
-                file.CopyTo(ms);
-                if(fileStreamSecurityValidator != null && fileStreamSecurityValidator.IsConsideredSafe(ms) == false)
-                    return new ValidationErrorResult("One or more file security analyzers deemed the contents of the file to be unsafe");
-
-                mediaFileManager.FileSystem.AddFile(user.Avatar, ms, true);
-            }
-
-            userService.Save(user);
-        }
-
-        return new OkObjectResult(user.GetUserAvatarUrls(cache, mediaFileManager, imageUrlGenerator));
-    }
-
-    [AppendUserModifiedHeader("id")]
-    [Authorize(Policy = AuthorizationPolicies.AdminUserEditsRequireAdmin)]
-    public ActionResult<string[]> PostClearAvatar(int id)
-    {
-        IUser? found = _userService.GetUserById(id);
-        if (found == null)
-        {
-            return NotFound();
-        }
-
-        var filePath = found.Avatar;
-
-        //if the filePath is already null it will mean that the user doesn't have a custom avatar and their gravatar is currently
-        //being used (if they have one). This means they want to remove their gravatar too which we can do by setting a special value
-        //for the avatar.
-        if (filePath.IsNullOrWhiteSpace() == false)
-        {
-            found.Avatar = null;
-        }
-        else
-        {
-            //set a special value to indicate to not have any avatar
-            found.Avatar = "none";
-        }
-
-        _userService.Save(found);
-
-        if (filePath.IsNullOrWhiteSpace() == false)
-        {
-            if (_mediaFileManager.FileSystem.FileExists(filePath!))
-            {
-                _mediaFileManager.FileSystem.DeleteFile(filePath!);
-            }
-        }
-
-        return found.GetUserAvatarUrls(_appCaches.RuntimeCache, _mediaFileManager, _imageUrlGenerator);
-    }
-
-    /// <summary>
-    ///     Gets a user by Id
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [OutgoingEditorModelEvent]
-    [Authorize(Policy = AuthorizationPolicies.AdminUserEditsRequireAdmin)]
-    public ActionResult<UserDisplay?> GetById(int id)
-    {
-        IUser? user = _userService.GetUserById(id);
-        if (user == null)
-        {
-            return NotFound();
-        }
-
-        UserDisplay? result = _umbracoMapper.Map<IUser, UserDisplay>(user);
-        return result;
-    }
-
-    /// <summary>
-    ///     Get users by integer ids
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    [OutgoingEditorModelEvent]
-    [Authorize(Policy = AuthorizationPolicies.AdminUserEditsRequireAdmin)]
-    public ActionResult<IEnumerable<UserDisplay?>> GetByIds([FromJsonPath] int[] ids)
-    {
-        if (ids == null)
-        {
-            return NotFound();
-        }
-
-        if (ids.Length == 0)
-        {
-            return Enumerable.Empty<UserDisplay>().ToList();
-        }
-
-        IEnumerable<IUser>? users = _userService.GetUsersById(ids);
-        if (users == null)
-        {
-            return NotFound();
-        }
-
-        List<UserDisplay> result = _umbracoMapper.MapEnumerable<IUser, UserDisplay>(users);
-        return result;
-    }
-
-    /// <summary>
-    ///     Returns a paged users collection
-    /// </summary>
-    /// <param name="pageNumber"></param>
-    /// <param name="pageSize"></param>
-    /// <param name="orderBy"></param>
-    /// <param name="orderDirection"></param>
-    /// <param name="userGroups"></param>
-    /// <param name="userStates"></param>
-    /// <param name="filter"></param>
-    /// <returns></returns>
-    public PagedUserResult GetPagedUsers(
-        int pageNumber = 1,
-        int pageSize = 10,
-        string orderBy = "username",
-        Direction orderDirection = Direction.Ascending,
-        [FromQuery] string[]? userGroups = null,
-        [FromQuery] UserState[]? userStates = null,
-        string filter = "")
-    {
-        //following the same principle we had in previous versions, we would only show admins to admins, see
-        // https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs#L91
-        // so to do that here, we'll need to check if this current user is an admin and if not we should exclude all user who are
-        // also admins
-
-        var hideDisabledUsers = _securitySettings.HideDisabledUsersInBackOffice;
-        var excludeUserGroups = new string[0];
-        var isAdmin = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.IsAdmin();
-        if (isAdmin == false)
-        {
-            //this user is not an admin so in that case we need to exclude all admin users
-            excludeUserGroups = new[] { Constants.Security.AdminGroupAlias };
-        }
-
-        IQuery<IUser> filterQuery = _sqlContext.Query<IUser>();
-
-        if (!_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.IsSuper() ?? false)
-        {
-            // only super can see super - but don't use IsSuper, cannot be mapped to SQL
-            //filterQuery.Where(x => !x.IsSuper());
-            filterQuery.Where(x => x.Id != Constants.Security.SuperUserId);
-        }
-
-        if (filter.IsNullOrWhiteSpace() == false)
-        {
-            filterQuery.Where(x => x.Name!.Contains(filter) || x.Username.Contains(filter));
-        }
-
-        if (hideDisabledUsers)
-        {
-            if (userStates == null || userStates.Any() == false)
-            {
-                userStates = new[] { UserState.Active, UserState.Invited, UserState.LockedOut, UserState.Inactive };
-            }
-        }
-
-        long pageIndex = pageNumber - 1;
-        IEnumerable<IUser> result = _userService.GetAll(pageIndex, pageSize, out long total, orderBy, orderDirection,
-            userStates, userGroups, excludeUserGroups, filterQuery);
-
-        var paged = new PagedUserResult(total, pageNumber, pageSize)
-        {
-            Items = _umbracoMapper.MapEnumerable<IUser, UserBasic>(result).WhereNotNull(),
-            UserStates = _userService.GetUserStates()
-        };
-
-        return paged;
-    }
-
-    /// <summary>
-    ///     Creates a new user
-    /// </summary>
-    /// <param name="userSave"></param>
-    /// <returns></returns>
-    public async Task<ActionResult<UserDisplay?>> PostCreateUser(UserInvite userSave)
-    {
-        if (userSave == null)
-        {
-            throw new ArgumentNullException("userSave");
-        }
-
-        if (ModelState.IsValid == false)
-        {
-            return ValidationProblem(ModelState);
-        }
-
-        if (_securitySettings.UsernameIsEmail)
-        {
-            //ensure they are the same if we're using it
-            userSave.Username = userSave.Email;
-        }
-        else
-        {
-            //first validate the username if were showing it
-            CheckUniqueUsername(userSave.Username, null);
-        }
-
-        CheckUniqueEmail(userSave.Email, null);
-
-        if (ModelState.IsValid == false)
-        {
-            return ValidationProblem(ModelState);
-        }
-
-        //Perform authorization here to see if the current user can actually save this user with the info being requested
-        Attempt<string?> canSaveUser = _userEditorAuthorizationHelper.IsAuthorized(
-            _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, null, null, null, userSave.UserGroups);
-        if (canSaveUser == false)
-        {
-            return Unauthorized(canSaveUser.Result);
-        }
-
-        //we want to create the user with the UserManager, this ensures the 'empty' (special) password
-        //format is applied without us having to duplicate that logic
-        var identityUser = BackOfficeIdentityUser.CreateNew(_globalSettings, userSave.Username, userSave.Email,
-            _globalSettings.DefaultUILanguage);
-        identityUser.Name = userSave.Name;
-
-        IdentityResult created = await _userManager.CreateAsync(identityUser);
-        if (created.Succeeded == false)
-        {
-            return ValidationProblem(created.Errors.ToErrorMessage());
-        }
-
-        string resetPassword;
-        var password = _userManager.GeneratePassword();
-
-        IdentityResult result = await _userManager.AddPasswordAsync(identityUser, password);
-        if (result.Succeeded == false)
-        {
-            return ValidationProblem(created.Errors.ToErrorMessage());
-        }
-
-        resetPassword = password;
-
-        //now re-look the user back up which will now exist
-        IUser? user = _userService.GetByEmail(userSave.Email);
-
-        //map the save info over onto the user
-        user = _umbracoMapper.Map(userSave, user);
-
-        if (user is not null)
-        {
-            // Since the back office user is creating this user, they will be set to approved
-            user.IsApproved = true;
-
-            _userService.Save(user);
-        }
-
-        UserDisplay? display = _umbracoMapper.Map<UserDisplay>(user);
-
-        if (display is not null)
-        {
-            display.ResetPasswordValue = resetPassword;
-        }
-
-        return display;
-    }
-
-    /// <summary>
-    ///     Invites a user
-    /// </summary>
-    /// <param name="userSave"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     This will email the user an invite and generate a token that will be validated in the email
-    /// </remarks>
-    public async Task<ActionResult<UserDisplay?>> PostInviteUser(UserInvite userSave)
-    {
-        if (userSave == null)
-        {
-            throw new ArgumentNullException(nameof(userSave));
-        }
-
-        if (userSave.Message.IsNullOrWhiteSpace())
-        {
-            ModelState.AddModelError("Message", "Message cannot be empty");
-        }
-
-        if (_securitySettings.UsernameIsEmail)
-        {
-            // ensure it's the same
-            userSave.Username = userSave.Email;
-        }
-        else
-        {
-            // first validate the username if we're showing it
-            ActionResult<IUser?> userResult = CheckUniqueUsername(userSave.Username,
-                u => u.UserState != UserState.Invited);
-            if (userResult.Result is not null)
-            {
-                return userResult.Result;
-            }
-        }
-
-        IUser? user = CheckUniqueEmail(userSave.Email,
-            u => u.UserState != UserState.Invited);
-
-        if (ModelState.IsValid == false)
-        {
-            return ValidationProblem(ModelState);
-        }
-
-        if (!_emailSender.CanSendRequiredEmail())
-        {
-            return ValidationProblem("No Email server is configured");
-        }
-
-        // Perform authorization here to see if the current user can actually save this user with the info being requested
-        Attempt<string?> canSaveUser = _userEditorAuthorizationHelper.IsAuthorized(
-            _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, user, null, null, userSave.UserGroups);
-        if (canSaveUser == false)
-        {
-            return ValidationProblem(canSaveUser.Result, StatusCodes.Status401Unauthorized);
-        }
-
-        if (user == null)
-        {
-            // we want to create the user with the UserManager, this ensures the 'empty' (special) password
-            // format is applied without us having to duplicate that logic
-            var identityUser = BackOfficeIdentityUser.CreateNew(_globalSettings, userSave.Username, userSave.Email,
-                _globalSettings.DefaultUILanguage);
-            identityUser.Name = userSave.Name;
-
-            IdentityResult created = await _userManager.CreateAsync(identityUser);
-            if (created.Succeeded == false)
-            {
-                return ValidationProblem(created.Errors.ToErrorMessage());
-            }
-
-            // now re-look the user back up
-            user = _userService.GetByEmail(userSave.Email);
-        }
-
-        // map the save info over onto the user
-        user = _umbracoMapper.Map(userSave, user);
-
-        if (user is not null)
-        {
-            // ensure the invited date is set
-            user.InvitedDate = DateTime.Now;
-
-            // Save the updated user (which will process the user groups too)
-            _userService.Save(user);
-        }
-
-        UserDisplay? display = _umbracoMapper.Map<UserDisplay>(user);
-
-        // send the email
-        await SendUserInviteEmailAsync(display, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Name,
-            _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Email, user, userSave.Message);
-
-        display?.AddSuccessNotification(_localizedTextService.Localize("speechBubbles", "resendInviteHeader"),
-            _localizedTextService.Localize("speechBubbles", "resendInviteSuccess", new[] { user?.Name }));
-        return display;
-    }
-
-    private IUser? CheckUniqueEmail(string email, Func<IUser, bool>? extraCheck)
-    {
-        IUser? user = _userService.GetByEmail(email);
-        if (user != null && (extraCheck == null || extraCheck(user)))
-        {
-            ModelState.AddModelError("Email", "A user with the email already exists");
-        }
-
-        return user;
-    }
-
-    private ActionResult<IUser?> CheckUniqueUsername(string? username, Func<IUser, bool>? extraCheck)
-    {
-        IUser? user = _userService.GetByUsername(username);
-        if (user != null && (extraCheck == null || extraCheck(user)))
-        {
-            ModelState.AddModelError(
-                _securitySettings.UsernameIsEmail ? "Email" : "Username",
-                "A user with the username already exists");
-            return ValidationProblem(ModelState);
-        }
-
-        return new ActionResult<IUser?>(user);
-    }
-
-    private async Task SendUserInviteEmailAsync(UserBasic? userDisplay, string? from, string? fromEmail, IUser? to, string? message)
-    {
-        var userId = userDisplay?.Id?.ToString();
-        if (userId is null)
-        {
-            throw new InvalidOperationException("Could not find user Id");
-        }
-        var user = await _userManager.FindByIdAsync(userId);
-
-        if (user is null)
-        {
-            throw new InvalidOperationException("Could not find user");
-        }
-
-        var token = await _userManager.GenerateEmailConfirmationTokenAsync(user);
-
-        // Use info from SMTP Settings if configured, otherwise set fromEmail as fallback
-        var senderEmail = !string.IsNullOrEmpty(_globalSettings.Smtp?.From) ? _globalSettings.Smtp.From : fromEmail;
-
-        var inviteToken = string.Format("{0}{1}{2}",
-            (int?)userDisplay?.Id,
-            WebUtility.UrlEncode("|"),
-            token.ToUrlBase64());
-
-        // Get an mvc helper to get the URL
-        var action = _linkGenerator.GetPathByAction(
-            nameof(BackOfficeController.VerifyInvite),
-            ControllerExtensions.GetControllerName<BackOfficeController>(),
-            new { area = Constants.Web.Mvc.BackOfficeArea, invite = inviteToken });
-
-        // Construct full URL using configured application URL (which will fall back to request)
-        Uri applicationUri = _httpContextAccessor.GetRequiredHttpContext().Request
-            .GetApplicationUri(_webRoutingSettings);
-        var inviteUri = new Uri(applicationUri, action);
-
-        var emailSubject = _localizedTextService.Localize("user", "inviteEmailCopySubject",
-            // Ensure the culture of the found user is used for the email!
-            UmbracoUserExtensions.GetUserCulture(to?.Language, _localizedTextService, _globalSettings));
-        var emailBody = _localizedTextService.Localize("user", "inviteEmailCopyFormat",
-            // Ensure the culture of the found user is used for the email!
-            UmbracoUserExtensions.GetUserCulture(to?.Language, _localizedTextService, _globalSettings),
-            new[] { userDisplay?.Name, from, WebUtility.HtmlEncode(message)!.ReplaceLineEndings("<br/>"), inviteUri.ToString(), senderEmail });
-
-        // This needs to be in the correct mailto format including the name, else
-        // the name cannot be captured in the email sending notification.
-        // i.e. "Some Person" <hello@example.com>
-        var toMailBoxAddress = new MailboxAddress(to?.Name, to?.Email);
-
-        var mailMessage = new EmailMessage(senderEmail, toMailBoxAddress.ToString(), emailSubject, emailBody, true);
-
-        await _emailSender.SendAsync(mailMessage, Constants.Web.EmailTypes.UserInvite, true);
-    }
-
-    /// <summary>
-    ///     Saves a user
-    /// </summary>
-    /// <param name="userSave"></param>
-    /// <returns></returns>
-    [OutgoingEditorModelEvent]
-    public ActionResult<UserDisplay?> PostSaveUser(UserSave userSave)
-    {
-        if (userSave == null)
-        {
-            throw new ArgumentNullException(nameof(userSave));
-        }
-
-        if (ModelState.IsValid == false)
-        {
-            return ValidationProblem(ModelState);
-        }
-
-        IUser? found = _userService.GetUserById(userSave.Id);
-        if (found == null)
-        {
-            return NotFound();
-        }
-
-        //Perform authorization here to see if the current user can actually save this user with the info being requested
-        Attempt<string?> canSaveUser = _userEditorAuthorizationHelper.IsAuthorized(
-            _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, found, userSave.StartContentIds,
-            userSave.StartMediaIds, userSave.UserGroups);
-        if (canSaveUser == false)
-        {
-            return Unauthorized(canSaveUser.Result);
-        }
-
-        var hasErrors = false;
-
-        // we need to check if there's any Deny Local login providers present, if so we need to ensure that the user's email address cannot be changed
-        var hasDenyLocalLogin = _externalLogins.HasDenyLocalLogin();
-        if (hasDenyLocalLogin)
-        {
-            userSave.Email =
-                found.Email; // it cannot change, this would only happen if people are mucking around with the request
-        }
-
-        IUser? existing = _userService.GetByEmail(userSave.Email);
-        if (existing != null && existing.Id != userSave.Id)
-        {
-            ModelState.AddModelError("Email", "A user with the email already exists");
-            hasErrors = true;
-        }
-
-        existing = _userService.GetByUsername(userSave.Username);
-        if (existing != null && existing.Id != userSave.Id)
-        {
-            ModelState.AddModelError("Username", "A user with the username already exists");
-            hasErrors = true;
-        }
-
-        // going forward we prefer to align usernames with email, so we should cross-check to make sure
-        // the email or username isn't somehow being used by anyone.
-        existing = _userService.GetByEmail(userSave.Username);
-        if (existing != null && existing.Id != userSave.Id)
-        {
-            ModelState.AddModelError("Username", "A user using this as their email already exists");
-            hasErrors = true;
-        }
-
-        existing = _userService.GetByUsername(userSave.Email);
-        if (existing != null && existing.Id != userSave.Id)
-        {
-            ModelState.AddModelError("Email", "A user using this as their username already exists");
-            hasErrors = true;
-        }
-
-        // if the found user has their email for username, we want to keep this synced when changing the email.
-        // we have already cross-checked above that the email isn't colliding with anything, so we can safely assign it here.
-        if (_securitySettings.UsernameIsEmail && found.Username == found.Email && userSave.Username != userSave.Email)
-        {
-            userSave.Username = userSave.Email;
-        }
-
-        if (hasErrors)
-        {
-            return ValidationProblem(ModelState);
-        }
-
-        //merge the save data onto the user
-        IUser user = _umbracoMapper.Map(userSave, found);
-
-        _userService.Save(user);
-
-        UserDisplay? display = _umbracoMapper.Map<UserDisplay>(user);
-
-        // determine if the user has changed their own language;
-        IUser? currentUser = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-        var userHasChangedOwnLanguage =
-            user.Id == currentUser?.Id && currentUser.Language != user.Language;
-
-        var textToLocalise = userHasChangedOwnLanguage ? "operationSavedHeaderReloadUser" : "operationSavedHeader";
-        CultureInfo culture = userHasChangedOwnLanguage
-            ? CultureInfo.GetCultureInfo(user.Language!)
-            : Thread.CurrentThread.CurrentUICulture;
-        display?.AddSuccessNotification(_localizedTextService.Localize("speechBubbles", textToLocalise, culture),
-            _localizedTextService.Localize("speechBubbles", "editUserSaved", culture));
-        return display;
-    }
-
-    /// <summary>
-    /// </summary>
-    /// <param name="changingPasswordModel"></param>
-    /// <returns></returns>
-    public async Task<ActionResult<ModelWithNotifications<string?>>> PostChangePassword(
-        ChangingPasswordModel changingPasswordModel)
-    {
-        changingPasswordModel = changingPasswordModel ?? throw new ArgumentNullException(nameof(changingPasswordModel));
-
-        if (ModelState.IsValid == false)
-        {
-            return ValidationProblem(ModelState);
-        }
-
-        IUser? found = _userService.GetUserById(changingPasswordModel.Id);
-        if (found == null)
-        {
-            return NotFound();
-        }
-
-        IUser? currentUser = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-
-        // if it's the current user, the current user cannot reset their own password without providing their old password
-        if (currentUser?.Username == found.Username && string.IsNullOrEmpty(changingPasswordModel.OldPassword))
-        {
-            return ValidationProblem("Password reset is not allowed without providing old password");
-        }
-
-        if ((!currentUser?.IsAdmin() ?? false) && found.IsAdmin())
-        {
-            return ValidationProblem("The current user cannot change the password for the specified user");
-        }
-
-        Attempt<PasswordChangedModel?> passwordChangeResult =
-            await _passwordChanger.ChangePasswordWithIdentityAsync(changingPasswordModel, _userManager, currentUser);
-
-        if (passwordChangeResult.Success)
-        {
-            var result = new ModelWithNotifications<string?>(passwordChangeResult.Result?.ResetPassword);
-            result.AddSuccessNotification(_localizedTextService.Localize("general", "success"),
-                _localizedTextService.Localize("user", "passwordChangedGeneric"));
-            return result;
-        }
-
-        if (passwordChangeResult.Result?.Error is not null)
-        {
-            foreach (var memberName in passwordChangeResult.Result.Error.MemberNames)
-            {
-                ModelState.AddModelError(memberName,
-                    passwordChangeResult.Result.Error.ErrorMessage ?? string.Empty);
-            }
-        }
-
-        return ValidationProblem(ModelState);
-    }
-
-
-    /// <summary>
-    ///     Disables the users with the given user ids
-    /// </summary>
-    /// <param name="userIds"></param>
-    [Authorize(Policy = AuthorizationPolicies.AdminUserEditsRequireAdmin)]
-    public IActionResult PostDisableUsers([FromQuery] int[] userIds)
-    {
-        Attempt<int> tryGetCurrentUserId =
-            _backofficeSecurityAccessor.BackOfficeSecurity?.GetUserId() ?? Attempt<int>.Fail();
-        if (tryGetCurrentUserId.Success && userIds.Contains(tryGetCurrentUserId.Result))
-        {
-            return ValidationProblem("The current user cannot disable itself");
-        }
-
-        var users = _userService.GetUsersById(userIds).ToList();
-        List<IUser> skippedUsers = new();
-        foreach (IUser u in users)
-        {
-            if (u.UserState is UserState.Invited)
-            {
-                _logger.LogWarning("Could not disable invited user {Username}", u.Name);
-                skippedUsers.Add(u);
-                continue;
-            }
-
-            u.IsApproved = false;
-            u.InvitedDate = null;
-        }
-
-        users = users.Except(skippedUsers).ToList();
-
-        if (users.Any())
-        {
-            _userService.Save(users);
-        }
-        else
-        {
-            return Ok(new DisabledUsersModel());
-        }
-
-        var disabledUsersModel = new DisabledUsersModel
-        {
-            DisabledUserIds = users.Select(x => x.Id),
-        };
-
-        var message= users.Count > 1
-            ? _localizedTextService.Localize("speechBubbles", "disableUsersSuccess", new[] { userIds.Length.ToString() })
-            : _localizedTextService.Localize("speechBubbles", "disableUserSuccess", new[] { users[0].Name });
-
-        var header = _localizedTextService.Localize("general", "success");
-        disabledUsersModel.Notifications.Add(new BackOfficeNotification(header, message, NotificationStyle.Success));
-        return Ok(disabledUsersModel);
-    }
-
-    /// <summary>
-    ///     Enables the users with the given user ids
-    /// </summary>
-    /// <param name="userIds"></param>
-    [Authorize(Policy = AuthorizationPolicies.AdminUserEditsRequireAdmin)]
-    public IActionResult PostEnableUsers([FromQuery] int[] userIds)
-    {
-        IUser[] users = _userService.GetUsersById(userIds).ToArray();
-        foreach (IUser u in users)
-        {
-            u.IsApproved = true;
-        }
-
-        _userService.Save(users);
-
-        if (users.Length > 1)
-        {
-            return Ok(
-                _localizedTextService.Localize("speechBubbles", "enableUsersSuccess",
-                    new[] { userIds.Length.ToString() }));
-        }
-
-        return Ok(
-            _localizedTextService.Localize("speechBubbles", "enableUserSuccess", new[] { users[0].Name }));
-    }
-
-    /// <summary>
-    ///     Unlocks the users with the given user ids
-    /// </summary>
-    /// <param name="userIds"></param>
-    [Authorize(Policy = AuthorizationPolicies.AdminUserEditsRequireAdmin)]
-    public async Task<IActionResult> PostUnlockUsers([FromQuery] int[] userIds)
-    {
-        if (userIds.Length <= 0)
-        {
-            return Ok();
-        }
-
-        var notFound = new List<int>();
-
-        foreach (var u in userIds)
-        {
-            BackOfficeIdentityUser? user = await _userManager.FindByIdAsync(u.ToString());
-            if (user == null)
-            {
-                notFound.Add(u);
-                continue;
-            }
-
-            IdentityResult unlockResult =
-                await _userManager.SetLockoutEndDateAsync(user, DateTimeOffset.Now.AddMinutes(-1));
-            if (unlockResult.Succeeded == false)
-            {
-                return ValidationProblem(
-                    $"Could not unlock for user {u} - error {unlockResult.Errors.ToErrorMessage()}");
-            }
-
-            if (userIds.Length == 1)
-            {
-                return Ok(
-                    _localizedTextService.Localize("speechBubbles", "unlockUserSuccess", new[] { user.Name }));
-            }
-        }
-
-        return Ok(
-            _localizedTextService.Localize("speechBubbles", "unlockUsersSuccess",
-                new[] { (userIds.Length - notFound.Count).ToString() }));
-    }
-
-    [Authorize(Policy = AuthorizationPolicies.AdminUserEditsRequireAdmin)]
-    public IActionResult PostSetUserGroupsOnUsers([FromQuery] string[] userGroupAliases, [FromQuery] int[] userIds)
-    {
-        IUser[] users = _userService.GetUsersById(userIds).ToArray();
-        IReadOnlyUserGroup[] userGroups = _userService.GetUserGroupsByAlias(userGroupAliases)
-            .Select(x => x.ToReadOnlyGroup()).ToArray();
-        foreach (IUser u in users)
-        {
-            u.ClearGroups();
-            foreach (IReadOnlyUserGroup userGroup in userGroups)
-            {
-                u.AddGroup(userGroup);
-            }
-        }
-
-        _userService.Save(users);
-        return Ok(
-            _localizedTextService.Localize("speechBubbles", "setUserGroupOnUsersSuccess"));
-    }
-
-    /// <summary>
-    ///     Deletes the non-logged in user provided id
-    /// </summary>
-    /// <param name="id">User Id</param>
-    /// <remarks>
-    ///     Limited to users that haven't logged in to avoid issues with related records constrained
-    ///     with a foreign key on the user Id
-    /// </remarks>
-    [Authorize(Policy = AuthorizationPolicies.AdminUserEditsRequireAdmin)]
-    public IActionResult PostDeleteNonLoggedInUser(int id)
-    {
-        IUser? user = _userService.GetUserById(id);
-        if (user == null)
-        {
-            return NotFound();
-        }
-
-        // Check user hasn't logged in.  If they have they may have made content changes which will mean
-        // the Id is associated with audit trails, versions etc. and can't be removed.
-        if (user.LastLoginDate is not null && user.LastLoginDate != default(DateTime))
-        {
-            return BadRequest();
-        }
-
-        var userName = user.Name;
-        _userService.Delete(user, true);
-
-        return Ok(
-            _localizedTextService.Localize("speechBubbles", "deleteUserSuccess", new[] { userName }));
-    }
-
-    public class PagedUserResult : PagedResult<UserBasic>
-    {
-        public PagedUserResult(long totalItems, long pageNumber, long pageSize) :
-            base(totalItems, pageNumber, pageSize) => UserStates = new Dictionary<UserState, int>();
-
-        /// <summary>
-        ///     This is basically facets of UserStates key = state, value = count
-        /// </summary>
-        [DataMember(Name = "userStates")]
-        public IDictionary<UserState, int> UserStates { get; set; }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.BackOfficeAuth.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.BackOfficeAuth.cs
deleted file mode 100644
index fcbb758f28..0000000000
--- a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.BackOfficeAuth.cs
+++ /dev/null
@@ -1,444 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Notifications;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-using Umbraco.Cms.Web.BackOffice.Middleware;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Cms.Web.Common.Security;
-
-namespace Umbraco.Extensions;
-
-/// <summary>
-///     Extension methods for <see cref="IUmbracoBuilder" /> for the Umbraco back office
-/// </summary>
-public static partial class UmbracoBuilderExtensions
-{
-    /// <summary>
-    ///     Adds Umbraco back office authentication requirements
-    /// </summary>
-    public static IUmbracoBuilder AddBackOfficeAuthentication(this IUmbracoBuilder builder)
-    {
-        builder.Services
-
-            // This just creates a builder, nothing more
-            .AddAuthentication()
-
-            // Add our custom schemes which are cookie handlers
-            .AddCookie(Constants.Security.BackOfficeAuthenticationType)
-            .AddCookie(Constants.Security.BackOfficeExternalAuthenticationType, o =>
-            {
-                o.Cookie.Name = Constants.Security.BackOfficeExternalAuthenticationType;
-                o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
-            })
-
-            // Although we don't natively support this, we add it anyways so that if end-users implement the required logic
-            // they don't have to worry about manually adding this scheme or modifying the sign in manager
-            .AddCookie(Constants.Security.BackOfficeTwoFactorAuthenticationType, o =>
-            {
-                o.Cookie.Name = Constants.Security.BackOfficeTwoFactorAuthenticationType;
-                o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
-            })
-            .AddCookie(Constants.Security.BackOfficeTwoFactorRememberMeAuthenticationType, o =>
-            {
-                o.Cookie.Name = Constants.Security.BackOfficeTwoFactorRememberMeAuthenticationType;
-                o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
-            });
-
-        builder.Services.ConfigureOptions<ConfigureBackOfficeCookieOptions>();
-
-        builder.Services.AddSingleton<BackOfficeExternalLoginProviderErrorMiddleware>();
-
-        builder.Services.AddUnique<IBackOfficeAntiforgery, BackOfficeAntiforgery>();
-        builder.Services.AddScoped<IBackOfficePasswordChanger, BackOfficePasswordChanger>();
-
-        builder.AddNotificationHandler<UserLoginSuccessNotification, BackOfficeUserManagerAuditer>();
-        builder.AddNotificationHandler<UserLogoutSuccessNotification, BackOfficeUserManagerAuditer>();
-        builder.AddNotificationHandler<UserLoginFailedNotification, BackOfficeUserManagerAuditer>();
-        builder.AddNotificationHandler<UserForgotPasswordRequestedNotification, BackOfficeUserManagerAuditer>();
-        builder.AddNotificationHandler<UserForgotPasswordChangedNotification, BackOfficeUserManagerAuditer>();
-        builder.AddNotificationHandler<UserPasswordChangedNotification, BackOfficeUserManagerAuditer>();
-        builder.AddNotificationHandler<UserPasswordResetNotification, BackOfficeUserManagerAuditer>();
-
-        return builder;
-    }
-
-    /// <summary>
-    ///     Adds Umbraco back office authorization policies
-    /// </summary>
-    public static IUmbracoBuilder AddBackOfficeAuthorizationPolicies(this IUmbracoBuilder builder,
-        string backOfficeAuthenticationScheme = Constants.Security.BackOfficeAuthenticationType)
-    {
-        builder.AddBackOfficeAuthorizationPoliciesInternal(backOfficeAuthenticationScheme);
-
-        builder.Services.AddSingleton<IAuthorizationHandler, FeatureAuthorizeHandler>();
-
-        builder.Services.AddAuthorization(options
-            => options.AddPolicy(AuthorizationPolicies.UmbracoFeatureEnabled, policy
-                => policy.Requirements.Add(new FeatureAuthorizeRequirement())));
-
-        return builder;
-    }
-
-    /// <summary>
-    ///     Add authorization handlers and policies
-    /// </summary>
-    private static void AddBackOfficeAuthorizationPoliciesInternal(this IUmbracoBuilder builder,
-        string backOfficeAuthenticationScheme = Constants.Security.BackOfficeAuthenticationType)
-    {
-        // NOTE: Even though we are registering these handlers globally they will only actually execute their logic for
-        // any auth defining a matching requirement and scheme.
-        builder.Services.AddSingleton<IAuthorizationHandler, BackOfficeHandler>();
-        builder.Services.AddSingleton<IAuthorizationHandler, TreeHandler>();
-        builder.Services.AddSingleton<IAuthorizationHandler, SectionHandler>();
-        builder.Services.AddSingleton<IAuthorizationHandler, AdminUsersHandler>();
-        builder.Services.AddSingleton<IAuthorizationHandler, UserGroupHandler>();
-        builder.Services.AddSingleton<IAuthorizationHandler, ContentPermissionsQueryStringHandler>();
-        builder.Services.AddSingleton<IAuthorizationHandler, ContentPermissionsResourceHandler>();
-        builder.Services.AddSingleton<IAuthorizationHandler, ContentPermissionsPublishBranchHandler>();
-        builder.Services.AddSingleton<IAuthorizationHandler, MediaPermissionsResourceHandler>();
-        builder.Services.AddSingleton<IAuthorizationHandler, MediaPermissionsQueryStringHandler>();
-        builder.Services.AddSingleton<IAuthorizationHandler, DenyLocalLoginHandler>();
-
-        builder.Services.AddAuthorization(o => CreatePolicies(o, backOfficeAuthenticationScheme));
-    }
-
-    private static void CreatePolicies(AuthorizationOptions options, string backOfficeAuthenticationScheme)
-    {
-        options.AddPolicy(AuthorizationPolicies.MediaPermissionByResource, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new MediaPermissionsResourceRequirement());
-        });
-
-        options.AddPolicy(AuthorizationPolicies.MediaPermissionPathById, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new MediaPermissionsQueryStringRequirement("id"));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.ContentPermissionByResource, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new ContentPermissionsResourceRequirement());
-        });
-
-        options.AddPolicy(AuthorizationPolicies.ContentPermissionEmptyRecycleBin, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new ContentPermissionsQueryStringRequirement(Constants.System.RecycleBinContent,
-                ActionDelete.ActionLetter));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.ContentPermissionAdministrationById, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new ContentPermissionsQueryStringRequirement(ActionRights.ActionLetter));
-            policy.Requirements.Add(
-                new ContentPermissionsQueryStringRequirement(ActionRights.ActionLetter, "contentId"));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.ContentPermissionProtectById, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new ContentPermissionsQueryStringRequirement(ActionProtect.ActionLetter));
-            policy.Requirements.Add(
-                new ContentPermissionsQueryStringRequirement(ActionProtect.ActionLetter, "contentId"));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.ContentPermissionRollbackById, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new ContentPermissionsQueryStringRequirement(ActionRollback.ActionLetter));
-            policy.Requirements.Add(
-                new ContentPermissionsQueryStringRequirement(ActionRollback.ActionLetter, "contentId"));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.ContentPermissionPublishById, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new ContentPermissionsQueryStringRequirement(ActionPublish.ActionLetter));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.ContentPermissionBrowseById, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new ContentPermissionsQueryStringRequirement(ActionBrowse.ActionLetter));
-            policy.Requirements.Add(
-                new ContentPermissionsQueryStringRequirement(ActionBrowse.ActionLetter, "contentId"));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.ContentPermissionDeleteById, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new ContentPermissionsQueryStringRequirement(ActionDelete.ActionLetter));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.ContentPermissionCreateBlueprintFromId, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(
-                new ContentPermissionsQueryStringRequirement(ActionCreateBlueprintFromContent.ActionLetter, "contentId"));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.BackOfficeAccess, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new BackOfficeRequirement());
-        });
-
-        options.AddPolicy(AuthorizationPolicies.BackOfficeAccessWithoutApproval, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new BackOfficeRequirement(false));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.AdminUserEditsRequireAdmin, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new AdminUsersRequirement());
-            policy.Requirements.Add(new AdminUsersRequirement("userIds"));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.UserBelongsToUserGroupInRequest, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new UserGroupRequirement());
-            policy.Requirements.Add(new UserGroupRequirement("userGroupIds"));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.DenyLocalLoginIfConfigured, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new DenyLocalLoginRequirement());
-        });
-
-        options.AddPolicy(AuthorizationPolicies.SectionAccessContent, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new SectionRequirement(Constants.Applications.Content));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.SectionAccessContentOrMedia, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(
-                new SectionRequirement(Constants.Applications.Content, Constants.Applications.Media));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.SectionAccessUsers, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new SectionRequirement(Constants.Applications.Users));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.SectionAccessForTinyMce, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new SectionRequirement(
-                Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Members));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.SectionAccessMedia, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new SectionRequirement(Constants.Applications.Media));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.SectionAccessMembers, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new SectionRequirement(Constants.Applications.Members));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.SectionAccessPackages, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new SectionRequirement(Constants.Applications.Packages));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.SectionAccessSettings, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new SectionRequirement(Constants.Applications.Settings));
-        });
-
-        // We will not allow the tree to render unless the user has access to any of the sections that the tree gets rendered
-        // this is not ideal but until we change permissions to be tree based (not section) there's not much else we can do here.
-        options.AddPolicy(AuthorizationPolicies.SectionAccessForContentTree, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new SectionRequirement(
-                Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Users,
-                Constants.Applications.Settings, Constants.Applications.Packages, Constants.Applications.Members));
-        });
-        options.AddPolicy(AuthorizationPolicies.SectionAccessForMediaTree, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new SectionRequirement(
-                Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Users,
-                Constants.Applications.Settings, Constants.Applications.Packages, Constants.Applications.Members));
-        });
-        options.AddPolicy(AuthorizationPolicies.SectionAccessForMemberTree, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new SectionRequirement(
-                Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Members));
-        });
-
-        // Permission is granted to this policy if the user has access to any of these sections: Content, media, settings, developer, members
-        options.AddPolicy(AuthorizationPolicies.SectionAccessForDataTypeReading, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new SectionRequirement(
-                Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Members,
-                Constants.Applications.Settings, Constants.Applications.Packages));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessDocuments, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.Content));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessUsers, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.Users));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessPartialViews, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.PartialViews));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessPartialViewMacros, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.PartialViewMacros));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessPackages, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.Packages));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessLogs, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.LogViewer));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessWebhooks, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.Webhooks));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessDataTypes, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.DataTypes));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessTemplates, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.Templates));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessMemberTypes, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.MemberTypes));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessRelationTypes, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.RelationTypes));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessDocumentTypes, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.DocumentTypes));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessMemberGroups, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.MemberGroups));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessMediaTypes, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.MediaTypes));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessMacros, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.Macros));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessLanguages, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.Languages));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessDictionary, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.Dictionary));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessDictionaryOrTemplates, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.Dictionary, Constants.Trees.Templates));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessDocumentsOrDocumentTypes, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.DocumentTypes, Constants.Trees.Content));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessMediaOrMediaTypes, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.MediaTypes, Constants.Trees.Media));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessMembersOrMemberTypes, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.MemberTypes, Constants.Trees.Members));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessAnySchemaTypes, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(Constants.Trees.DataTypes, Constants.Trees.DocumentTypes,
-                Constants.Trees.MediaTypes, Constants.Trees.MemberTypes));
-        });
-
-        options.AddPolicy(AuthorizationPolicies.TreeAccessAnyContentOrTypes, policy =>
-        {
-            policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-            policy.Requirements.Add(new TreeRequirement(
-                Constants.Trees.DocumentTypes, Constants.Trees.Content,
-                Constants.Trees.MediaTypes, Constants.Trees.Media,
-                Constants.Trees.MemberTypes, Constants.Trees.Members));
-        });
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
deleted file mode 100644
index 8e29c1ed45..0000000000
--- a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Notifications;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.DependencyInjection;
-using Umbraco.Cms.Infrastructure.Examine.DependencyInjection;
-using Umbraco.Cms.Infrastructure.WebAssets;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Cms.Web.BackOffice.Install;
-using Umbraco.Cms.Web.BackOffice.Mapping;
-using Umbraco.Cms.Web.BackOffice.Middleware;
-using Umbraco.Cms.Web.BackOffice.ModelsBuilder;
-using Umbraco.Cms.Web.BackOffice.Routing;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Cms.Web.BackOffice.Services;
-using Umbraco.Cms.Web.BackOffice.SignalR;
-using Umbraco.Cms.Web.BackOffice.Trees;
-using Umbraco.Cms.Web.Common.Hosting;
-
-namespace Umbraco.Extensions;
-
-/// <summary>
-/// Extension methods for <see cref="IUmbracoBuilder"/> for the Umbraco back office
-/// </summary>
-public static partial class UmbracoBuilderExtensions
-{
-    /// <summary>
-    /// Adds all required components to run the Umbraco back office
-    /// </summary>
-    public static IUmbracoBuilder AddBackOffice(this IUmbracoBuilder builder, Action<IMvcBuilder>? configureMvc = null) => builder
-            .AddConfiguration()
-            .AddUmbracoCore()
-            .AddWebComponents()
-            .AddRuntimeMinifier()
-            .AddBackOfficeCore()
-            .AddBackOfficeAuthentication()
-            .AddBackOfficeIdentity()
-            .AddMembersIdentity()
-            .AddBackOfficeAuthorizationPolicies()
-            .AddUmbracoProfiler()
-            .AddMvcAndRazor(configureMvc)
-            .AddWebServer()
-            .AddPreviewSupport()
-            .AddRecurringBackgroundJobs()
-            .AddNuCache()
-            .AddDistributedCache()
-            .TryAddModelsBuilderDashboard()
-            .AddUnattendedInstallInstallCreateUser()
-            .AddCoreNotifications()
-            .AddLogViewer()
-            .AddExamine()
-            .AddExamineIndexes()
-            .AddControllersWithAmbiguousConstructors()
-            .AddSupplemenataryLocalizedTextFileSources();
-
-    public static IUmbracoBuilder AddUnattendedInstallInstallCreateUser(this IUmbracoBuilder builder)
-    {
-        builder.AddNotificationAsyncHandler<UnattendedInstallNotification, CreateUnattendedUserNotificationHandler>();
-        return builder;
-    }
-
-    /// <summary>
-    ///     Adds Umbraco preview support
-    /// </summary>
-    public static IUmbracoBuilder AddPreviewSupport(this IUmbracoBuilder builder)
-    {
-        builder.Services.AddSignalR();
-
-        return builder;
-    }
-
-    /// <summary>
-    ///     Gets the back office tree collection builder
-    /// </summary>
-    public static TreeCollectionBuilder? Trees(this IUmbracoBuilder builder)
-        => builder.WithCollectionBuilder<TreeCollectionBuilder>();
-
-    public static IUmbracoBuilder AddBackOfficeCore(this IUmbracoBuilder builder)
-    {
-        builder.Services.AddUnique<IBackOfficePathGenerator, UmbracoBackOfficePathGenerator>();
-        builder.Services.AddSingleton<KeepAliveMiddleware>();
-        builder.Services.ConfigureOptions<ConfigureGlobalOptionsForKeepAliveMiddlware>();
-        builder.Services.AddSingleton<ServerVariablesParser>();
-        builder.Services.AddSingleton<InstallAreaRoutes>();
-        builder.Services.AddSingleton<BackOfficeAreaRoutes>();
-        builder.Services.AddSingleton<PreviewRoutes>();
-        builder.AddNotificationAsyncHandler<ContentCacheRefresherNotification, PreviewHubUpdater>();
-        builder.Services.AddSingleton<BackOfficeServerVariables>();
-        builder.Services.AddScoped<BackOfficeSessionIdValidator>();
-        builder.Services.AddScoped<BackOfficeSecurityStampValidator>();
-        // register back office trees
-        // the collection builder only accepts types inheriting from TreeControllerBase
-        // and will filter out those that are not attributed with TreeAttribute
-        var umbracoApiControllerTypes = builder.TypeLoader.GetUmbracoApiControllers().ToList();
-        builder.Trees()?
-            .AddTreeControllers(umbracoApiControllerTypes.Where(x => typeof(TreeControllerBase).IsAssignableFrom(x)));
-
-        builder.AddWebMappingProfiles();
-
-        builder.Services.AddUnique<IPhysicalFileSystem>(factory =>
-        {
-            var path = "~/";
-            IHostingEnvironment hostingEnvironment = factory.GetRequiredService<IHostingEnvironment>();
-            return new PhysicalFileSystem(
-                factory.GetRequiredService<IIOHelper>(),
-                hostingEnvironment,
-                factory.GetRequiredService<ILogger<PhysicalFileSystem>>(),
-                hostingEnvironment.MapPathContentRoot(path),
-                hostingEnvironment.ToAbsolute(path)
-            );
-        });
-
-        builder.Services.AddUnique<IIconService, IconService>();
-        builder.Services.AddUnique<IConflictingRouteService, ConflictingRouteService>();
-        builder.Services.AddSingleton<UnhandledExceptionLoggerMiddleware>();
-        builder.Services.AddTransient<BlockGridSampleHelper>();
-
-        return builder;
-    }
-
-    /// <summary>
-    ///     Adds explicit registrations for controllers with ambiguous constructors to prevent downstream issues for
-    ///     users who wish to use <see cref="Microsoft.AspNetCore.Mvc.Controllers.ServiceBasedControllerActivator" />
-    /// </summary>
-    public static IUmbracoBuilder AddControllersWithAmbiguousConstructors(
-        this IUmbracoBuilder builder)
-    {
-        builder.Services.TryAddTransient(sp =>
-            ActivatorUtilities.CreateInstance<CurrentUserController>(sp));
-
-        return builder;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/EmbeddedResources/Tours/getting-started.json b/src/Umbraco.Web.BackOffice/EmbeddedResources/Tours/getting-started.json
deleted file mode 100644
index 72bfee09d2..0000000000
--- a/src/Umbraco.Web.BackOffice/EmbeddedResources/Tours/getting-started.json
+++ /dev/null
@@ -1,488 +0,0 @@
-[
-  {
-    "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"
-      },
-      {
-        "title": "Thank you for subscribing to our mailing list",
-        "view": "confirm"
-      }
-    ]
-  },
-  {
-    "name": "Introduction",
-    "alias": "umbIntroIntroduction",
-    "group": "Getting Started",
-    "groupOrder": 100,
-    "allowDisable": true,
-    "requiredSections": [
-      "content"
-    ],
-    "steps": [
-      {
-        "title": "Welcome to Umbraco - The Friendly CMS",
-        "content": "<p>Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible.</p><p>In this quick tour we will introduce you to the main areas of Umbraco and show you how to best get started.</p><p><em>If you don't want to take the tour now you can always start it by opening the Help drawer in the top right corner.<em></p>",
-        "type": "intro"
-      },
-      {
-        "element": "[data-element='sections']",
-        "elementPreventClick": true,
-        "title": "Main Menu",
-        "content": "This is the main menu in Umbraco backoffice. Here you can navigate between the different sections, search for items, see your user profile and open the help drawer.",
-        "backdropOpacity": 0.6
-      },
-      {
-        "element": "[data-element='section-content']",
-        "elementPreventClick": true,
-        "title": "Sections",
-        "content": "Each area in Umbraco is called a <b>Section</b>. Right now you are in the Content section, when you want to go to another section simply click on the appropriate name in the main menu and you'll be there in no time.",
-        "backdropOpacity": 0.6
-      },
-      {
-        "element": "[data-element='section-content']",
-        "skipStepIfVisible": "[data-element='dashboard']",
-        "title": "Content section",
-        "content": "Try clicking <b>Content</b> to enter the content section.",
-        "event": "click",
-        "backdropOpacity": 0.6
-      },
-      {
-        "element": "#tree",
-        "elementPreventClick": true,
-        "title": "The Tree",
-        "content": "<p>This is the <b>Tree</b> and it is the main navigation inside a section.</p><p>In the Content section the tree is called the <b>Content tree</b> and here you can navigate the content of your website.</p>"
-      },
-      {
-        "element": "[data-element='dashboard']",
-        "elementPreventClick": true,
-        "title": "Dashboards",
-        "content": "<p>A dashboard is the main view you are presented with when entering a section within the backoffice, and can be used to show valuable information to the users of the system.</p><p>Notice that some sections have multiple dashboards.</p>"
-      },
-      {
-        "element": "[data-element='global-search']",
-        "title": "Search",
-        "content": "The search allows you to quickly find whatever you're looking for across sections within Umbraco."
-      },
-      {
-        "element": "[data-element='global-user']",
-        "title": "User profile",
-        "content": "Now click on your <b>user avatar</b> to open the user profile dialog.",
-        "event": "click",
-        "backdropOpacity": 0.6
-      },
-      {
-        "element": "[data-element~='overlay-user']",
-        "elementPreventClick": true,
-        "title": "User profile",
-        "content": "<p>Here you can see details about your user, change your password and log out of Umbraco.</p><p>In the <b>User section</b> you will be able to do more advanced user management.</p>"
-      },
-      {
-        "element": "[data-element~='overlay-user'] [data-element='button-overlayClose']",
-        "title": "User profile",
-        "content": "Let's close the user profile again.",
-        "event": "click"
-      },
-      {
-        "element": "[data-element='global-help']",
-        "title": "Help",
-        "content": "If you ever find yourself in trouble click here to open the Help drawer.",
-        "event": "click",
-        "backdropOpacity": 0.6
-      },
-      {
-        "element": "[data-element='drawer']",
-        "elementPreventClick": true,
-        "title": "Help",
-        "content": "<p>In the help drawer you will find articles and videos related to the section you are using.</p><p>This is also where you will find the next tour on how to get started with Umbraco.</p>",
-        "backdropOpacity": 0.6
-      },
-      {
-        "element": "[data-element='drawer'] [data-element='help-tours']",
-        "title": "Tours",
-        "content": "To continue your journey on getting started with Umbraco, you can find more tours right here."
-      }
-    ]
-  },
-  {
-    "name": "Create document type",
-    "alias": "umbIntroCreateDocType",
-    "group": "Getting Started",
-    "groupOrder": 100,
-    "requiredSections": [
-      "settings"
-    ],
-    "steps": [
-      {
-        "title": "Create your first Document Type",
-        "content": "<p>Step 1 of any site is to create a <strong>Document Type</strong>.<br> A Document Type is a template for content. For each <em>type</em> of content you want to create, you will need to create a Document Type. This will define where content based on this Document Type can be created, how many properties it holds and what the input method should be for these properties.</p><p>When you have at least one Document Type in place you can start creating content and this content can then be used in a template.</p><p>In this tour you will learn how to set up a basic Document Type with a property to enter a short text.</p>",
-        "type": "intro"
-      },
-      {
-        "element": "#applications [data-element='section-settings']",
-        "title": "Navigate to the Settings sections",
-        "content": "In the <b>Settings section</b> you can create and manage Document types.",
-        "event": "click",
-        "backdropOpacity": 0.6
-      },
-      {
-        "element": "#tree [data-element='tree-item-documentTypes']",
-        "title": "Create Document Type",
-        "content": "<p>Hover over the Document Type tree and click the <b>three small dots</b> to open the <b>context menu</b>.</p>",
-        "event": "click",
-        "eventElement": "#tree [data-element='tree-item-documentTypes'] [data-element='tree-item-options']"
-      },
-      {
-        "element": "#dialog [data-element='action-documentType']",
-        "title": "Create Document Type",
-        "content": "<p>Click <b>Document Type with Template</b> to create a new document type with a template. The template will be automatically created and set as the default template for this Document Type.</p><p>You will use the template in a later tour to render content.</p>",
-        "event": "click"
-      },
-      {
-        "element": "[data-element='editor-name-field']",
-        "title": "Enter a name",
-        "content": "<p>Your Document Type needs a name. Enter <code>Home Page</code> in the field and click <b>Next</b>.",
-        "view": "doctypename"
-      },
-      {
-        "element": "[data-element='editor-description']",
-        "title": "Enter a description",
-        "content": "<p>A description helps to pick the right document type when creating content.</p><p>Write a description for our Home page. It could be: <br/><pre>The home page of the website</pre></p>"
-      },
-      {
-        "element": "[data-element='groups-builder']",
-        "elementPreventClick": true,
-        "title": "Properties, groups, and tabs",
-        "content": "A Document Type consist of Properties (data fields/attributes) where an editor can input data. For complex Document Types you can organize Properties in groups and tabs."
-      },
-      {
-        "element": "[data-element='group-add']",
-        "title": "Add group",
-        "content": "In this tour we only need a group. Click <b>Add Group</b> to add a group.",
-        "event": "click"
-      },
-      {
-        "element": "[data-element='group-name-field']",
-        "title": "Name the group",
-        "content": "<p>Enter <code>Home</code> in the group name.</p><p><em>You can name a group anything you want and if you have a lot of properties it can be useful to add multiple groups.</em></p>",
-        "view": "tabName"
-      },
-      {
-        "element": "[data-element='property-add']",
-        "title": "Add a property",
-        "content": "<p>Properties are the different input fields on a content page.</p><p>On our Home Page we want to add a welcome text.</p><p>Click <b>Add property</b> to open the property dialog.</p>",
-        "event": "click"
-      },
-      {
-        "element": "[data-element='editor-property-settings'] [data-element='property-name']",
-        "title": "Name the property",
-        "content": "Enter <code>Welcome Text</code> as the name for the property.",
-        "view": "propertyname"
-      },
-      {
-        "element": "[data-element~='editor-property-settings'] [data-element='property-description']",
-        "title": "Enter a description",
-        "content": "<p>A description will help your editor fill in the right content.</p><p>Enter a description for the property editor. It could be:<br/> <pre>Write a nice introduction text so the visitors feel welcome</pre></p>"
-      },
-      {
-        "element": "[data-element~='editor-property-settings'] [data-element='editor-add']",
-        "title": "Select editor",
-        "content": "When you select an editor you choose what the input method for this property will be. Click <b>Select editor</b> to open the editor picker dialog.",
-        "event": "click"
-      },
-      {
-        "element": "[ng-controller*='Umbraco.Editors.DataTypePickerController'] [data-element='editor-data-type-picker']",
-        "elementPreventClick": true,
-        "title": "Editor picker",
-        "content": "<p>In the editor picker dialog we can pick one of the many built-in editors.</p>"
-      },
-      {
-        "element": "[data-element~='editor-data-type-picker'] [data-element='datatype-Textarea']",
-        "title": "Select editor",
-        "content": "Select the <b>Textarea</b> editor. This will add a textarea to the Welcome Text property.",
-        "event": "click"
-      },
-      {
-        "element": "[data-element='editor-data-type-picker'] [data-element='datatypeconfig-Textarea']",
-        "title": "Editor settings",
-        "content": "Each property editor can have individual settings. For the textarea editor you can set a character limit but in this case it is not needed.",
-        "event": "click"
-      },
-      {
-        "element": "[data-element~='editor-property-settings'] [data-element='button-submit']",
-        "title": "Add property to document type",
-        "content": "Click <b>Submit</b> to add the property to the document type.",
-        "event": "click"
-      },
-      {
-        "element": "[data-element~='sub-view-permissions']",
-        "title": "Check the document type permissions",
-        "content": "Click <b>Permissions</b> to view the permissions page.",
-        "event": "click"
-      },
-      {
-        "element": "[data-element~='permissions-allow-as-root']",
-        "title": "Allow this document type to work at the root of your site",
-        "content": "Toggle the switch <b>Allow as root</b> to allow new content pages based on this document type to be created at the root of your site",
-        "event": "click"
-      },
-      {
-        "element": "[data-element='button-save']",
-        "title": "Save the document type",
-        "content": "All we need now is to save the document type. Click <b>Save</b> to create and save your new document type.",
-        "event": "click"
-      }
-    ]
-  },
-  {
-    "name": "Create Content",
-    "alias": "umbIntroCreateContent",
-    "group": "Getting Started",
-    "groupOrder": 100,
-    "requiredSections": [
-      "content"
-    ],
-    "steps": [
-      {
-        "title": "Creating your first content node",
-        "content": "<p>In this tour you will learn how to create the home page for your website. It will use the <b>Home Page</b> Document type you created in the previous tour.</p>",
-        "type": "intro"
-      },
-      {
-        "element": "#applications [data-element='section-content']",
-        "title": "Navigate to the Content section",
-        "content": "<p>In the <b>Content section</b> you can create and manage the content of the website.</p><p>The <b>Content section</b> contains the content of your website. Content is displayed as <b>nodes</b> in the content tree.</p>",
-        "event": "click",
-        "backdropOpacity": 0.6
-      },
-      {
-        "element": "[data-element='tree-root']",
-        "title": "Open context menu",
-        "content": "<p>Open the context menu by hovering over the root of the content section.</p><p>Now click the <b>three small dots</b> to the right.</p>",
-        "event": "click",
-        "eventElement": "#tree [data-element='tree-root'] [data-element='tree-item-options']"
-      },
-      {
-        "element": "[data-element='action-create-homePage']",
-        "title": "Create Home page",
-        "content": "<p>The context menu shows you all the actions that are available on a node</p><p>Click on <b>Home Page</b> to create a new page of type <b>Home Page</b>.</p>",
-        "event": "click"
-      },
-      {
-        "element": "[data-element='editor-content'] [data-element='editor-name-field']",
-        "title": "Give your new page a name",
-        "content": "<p>Our new page needs a name. Enter <code>Home</code> in the field and click <b>Next</b>.</p>",
-        "view": "nodename"
-      },
-      {
-        "element": "[data-element='editor-content'] [data-element='property-welcomeText'] > div",
-        "title": "Add a welcome text",
-        "content": "<p>Add content to the <b>Welcome Text</b> field.</p><p>If you don't have any ideas here is a start:<br/> <pre>I am learning Umbraco. High Five I Rock #H5IR</pre></p>"
-      },
-      {
-        "element": "[data-element='editor-content'] [data-element='button-saveAndPublish']",
-        "title": "Publish",
-        "content": "<p>Now click the <b>Publish</b> button to publish your changes.</p>",
-        "event": "click"
-      }
-    ]
-  },
-  {
-    "name": "Render in template",
-    "alias": "umbIntroRenderInTemplate",
-    "group": "Getting Started",
-    "groupOrder": 100,
-    "requiredSections": [
-      "settings"
-    ],
-    "steps": [
-      {
-        "title": "Render your content in a template",
-        "content": "<p>Templating in Umbraco builds on the concept of <b>Razor Views</b> from ASP.NET MVC. This tour is a sneak peak on how to write templates in Umbraco.</p><p>In this tour you will learn how to render content from the <b>Home Page</b> document type so you can see the content added to our <b>Home</b> content page.</p>",
-        "type": "intro"
-      },
-      {
-        "element": "#applications [data-element='section-settings']",
-        "title": "Navigate to the Settings section",
-        "content": "<p>In the <b>Settings</b> section you will find all the templates.</p><p>It is of course also possible to edit all your code files in your favorite code editor.</p>",
-        "event": "click",
-        "backdropOpacity": 0.6
-      },
-      {
-        "element": "#tree [data-element='tree-item-templates']",
-        "title": "Expand the Templates node",
-        "content": "<p>To see all our templates click the <b>small triangle</b> to the left of the templates node.</p>",
-        "event": "click",
-        "eventElement": "#tree [data-element='tree-item-templates'] [data-element='tree-item-expand']",
-        "view": "templatetree",
-        "skipStepIfVisible": "#tree [data-element='tree-item-templates'] > div > button[data-element=tree-item-expand] span.icon-navigation-down"
-      },
-      {
-        "element": "#tree [data-element='tree-item-templates'] [data-element='tree-item-Home Page']",
-        "title": "Open Home template",
-        "content": "<p>Click the <b>Home Page</b> template to open and edit it.</p>",
-        "eventElement": "#tree [data-element='tree-item-templates'] [data-element='tree-item-Home Page'] a.umb-tree-item__label",
-        "event": "click"
-      },
-      {
-        "element": "[data-element='editor-templates'] [data-element='code-editor']",
-        "title": "Edit template",
-        "content": "<p>The template can be edited here or in your favorite code editor.</p><p>To render the field from the document type add the following to the template:<br/> <pre>&#60;h1&#62;@Model.Name&#60;/h1&#62;<br>&#60;p&#62;@Model.WelcomeText&#60;/p&#62;</pre></p>"
-      },
-      {
-        "element": "[data-element='editor-templates'] [data-element='button-save']",
-        "title": "Save the template",
-        "content": "Click the <b>Save button</b> and your template will be saved.",
-        "event": "click"
-      }
-    ]
-  },
-  {
-    "name": "View Home page",
-    "alias": "umbIntroViewHomePage",
-    "group": "Getting Started",
-    "groupOrder": 100,
-    "requiredSections": [
-      "content"
-    ],
-    "steps": [
-      {
-        "title": "View your Umbraco site",
-        "content": "<p>Our three main components for a page are done: <b>Document type, Template, and Content</b>. It is now time to see the result.</p><p>In this tour you will learn how to see your published website.</p>",
-        "type": "intro"
-      },
-      {
-        "element": "#applications [data-element='section-content']",
-        "title": "Navigate to the content sections",
-        "content": "In the <b>Content section</b> you will find the content of our website.",
-        "event": "click",
-        "backdropOpacity": 0.6
-      },
-      {
-        "element": "#tree [data-element='tree-item-Home']",
-        "title": "Open the Home page",
-        "content": "<p>Click the <b>Home</b> page to open it.</p>",
-        "event": "click",
-        "eventElement": "#tree [data-element='tree-item-Home'] a.umb-tree-item__label"
-      },
-      {
-        "element": "[data-element='editor-content'] [data-element='sub-view-umbInfo']",
-        "title": "Info",
-        "content": "<p>Under the Info-app you will find the default information about a content item.</p>",
-        "event": "click"
-      },
-      {
-        "element": "[data-element='editor-content'] [data-element='node-info-urls']",
-        "title": "Open page",
-        "content": "<p>Click the <b>Link to document</b> <i class='icon-out'></i> to view your page.</p><p>Tip: Click the preview button in the bottom right corner to preview changes without publishing them.</p>",
-        "event": "click",
-        "eventElement": "[data-element='editor-content'] [data-element='node-info-urls'] a[target='_blank']"
-      }
-    ]
-  },
-  {
-    "name": "The Media library",
-    "alias": "umbIntroMediaSection",
-    "group": "Getting Started",
-    "groupOrder": 100,
-    "requiredSections": [
-      "media"
-    ],
-    "steps": [
-      {
-        "title": "How to use the media library",
-        "content": "<p>A website would be boring without media content. In Umbraco you can manage all your images, documents, videos etc. in the <b>Media section</b>. Here you can upload and organise your media items and see details about each item.</p><p>In this tour you will learn how to upload and organise your Media library in Umbraco. It will also show you how to view details about a specific media item.</p>",
-        "type": "intro"
-      },
-      {
-        "element": "#applications [data-element='section-media']",
-        "title": "Navigate to the Media section",
-        "content": "The <b>media</b> section is where you manage all your media items.",
-        "event": "click",
-        "backdropOpacity": 0.6
-      },
-      {
-        "element": "#tree [data-element='tree-root']",
-        "title": "Create a new folder",
-        "content": "<p>First create a folder for your images. Hover over the media root node and click the <b>three small dots</b> on the right side of the item.</p>",
-        "event": "click",
-        "eventElement": "#tree [data-element='tree-root'] [data-element='tree-item-options']"
-      },
-      {
-        "element": "#dialog [data-element='action-Folder']",
-        "title": "Create a new folder",
-        "content": "<p>Select the <b>Folder</b> option to select the type folder.</p>",
-        "event": "click"
-      },
-      {
-        "element": "[data-element='editor-media'] [data-element='editor-name-field']",
-        "title": "Enter a name",
-        "content": "<p>Enter <code>My Images</code> in the field.</p>",
-        "view": "foldername"
-      },
-      {
-        "element": "[data-element='editor-media'] [data-element='button-save']",
-        "title": "Save the folder",
-        "content": "<p>Click the <b>Save</b> button to create the new folder.</p>",
-        "event": "click"
-      },
-      {
-        "element": "[data-element='editor-media'] [data-element='dropzone']",
-        "title": "Upload images",
-        "content": "<p>In the upload area you can upload your media items.</p><p>Click the <b>Click here to choose files</b> button and select a couple of images on your computer and upload them.</p>",
-        "view": "uploadimages"
-      },
-      {
-        "element": "[data-element='editor-media'] [data-element='media-grid-item-0']",
-        "title": "View media item details",
-        "content": "Hover over the media item and <b>Click the white bar</b> to view details about the media item.",
-        "event": "click",
-        "eventElement": "[data-element='editor-media'] [data-element='media-grid-item-0'] [data-element='media-grid-item-edit']"
-      },
-      {
-        "element": "[data-element='editor-media'] [data-element='property-umbracoFile']",
-        "elementPreventClick": true,
-        "title": "The uploaded image",
-        "content": "<p>Here you can see the image you have uploaded.</p>"
-      },
-      {
-        "element": "[data-element='editor-media'] [data-element='property-umbracoBytes']",
-        "title": "Image size",
-        "content": "<p>You will also find other details about the image, like the size.</p><p>Media items work in much the same way as content. So you can add extra properties to an image by creating or editing the <b>Media types</b> in the Settings section.</p>"
-      },
-      {
-        "element": "[data-element='editor-media'] [data-element='sub-view-umbInfo']",
-        "title": "Info",
-        "content": "Like the content section you can also find default information about the media item. You will find these under the info app.",
-        "event": "click"
-      },
-      {
-        "element": "[data-element='editor-media'] [data-element='node-info-urls']",
-        "title": "Link to media",
-        "content": "The path to the media item..."
-      },
-      {
-        "element": "[data-element='editor-media'] [data-element='node-info-update-date']",
-        "title": "Last edited",
-        "content": "...and information about when the media item has been created and edited."
-      },
-      {
-        "element": "[data-element='editor-container']",
-        "elementPreventClick": true,
-        "title": "Using media items",
-        "content": "You can reference a media item directly in a template by using the path or try adding a Media Picker to a document type property so you can select media items from the content section."
-      }
-    ]
-  }
-]
diff --git a/src/Umbraco.Web.BackOffice/Extensions/ControllerContextExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/ControllerContextExtensions.cs
deleted file mode 100644
index 4ea015e249..0000000000
--- a/src/Umbraco.Web.BackOffice/Extensions/ControllerContextExtensions.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Authorization.Policy;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Controllers;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Umbraco.Cms.Web.BackOffice.Extensions;
-
-internal static class ControllerContextExtensions
-{
-    /// <summary>
-    ///     Invokes the authorization filters for the controller action.
-    /// </summary>
-    /// <returns>Whether the user is authenticated or not.</returns>
-    internal static async Task<bool> InvokeAuthorizationFiltersForRequest(this ControllerContext controllerContext, ActionContext actionContext)
-    {
-        ControllerActionDescriptor actionDescriptor = controllerContext.ActionDescriptor;
-
-        var metadataCollection =
-            new EndpointMetadataCollection(actionDescriptor.EndpointMetadata.Union(new[] { actionDescriptor }));
-
-        IReadOnlyList<IAuthorizeData> authorizeData = metadataCollection.GetOrderedMetadata<IAuthorizeData>();
-        IAuthorizationPolicyProvider policyProvider = controllerContext.HttpContext.RequestServices
-            .GetRequiredService<IAuthorizationPolicyProvider>();
-        AuthorizationPolicy? policy = await AuthorizationPolicy.CombineAsync(policyProvider, authorizeData);
-        if (policy is not null)
-        {
-            IPolicyEvaluator policyEvaluator =
-                controllerContext.HttpContext.RequestServices.GetRequiredService<IPolicyEvaluator>();
-            AuthenticateResult authenticateResult =
-                await policyEvaluator.AuthenticateAsync(policy, controllerContext.HttpContext);
-
-            if (!authenticateResult.Succeeded)
-            {
-                return false;
-            }
-
-            // TODO this is super hacky, but we rely on the FeatureAuthorizeHandler can still handle endpoints
-            // (The way before .NET 5). The .NET 5 way would need to use han http context, for the "inner" request
-            // with the nested controller
-            var resource = new Endpoint(null, metadataCollection, null);
-            PolicyAuthorizationResult authorizeResult =
-                await policyEvaluator.AuthorizeAsync(policy, authenticateResult, controllerContext.HttpContext, resource);
-            if (!authorizeResult.Succeeded)
-            {
-                return false;
-            }
-        }
-
-        IList<FilterDescriptor> filters = actionDescriptor.FilterDescriptors;
-        var filterGrouping = new FilterGrouping(filters, controllerContext.HttpContext.RequestServices);
-
-        // because the continuation gets built from the inside out we need to reverse the filter list
-        // so that least specific filters (Global) get run first and the most specific filters (Action) get run last.
-        var authorizationFilters = filterGrouping.AuthorizationFilters.Reverse().ToList();
-        var asyncAuthorizationFilters = filterGrouping.AsyncAuthorizationFilters.Reverse().ToList();
-
-        if (authorizationFilters.Count == 0 && asyncAuthorizationFilters.Count == 0)
-        {
-            return true;
-        }
-
-        // if the authorization filter returns a result, it means it failed to authorize
-        var authorizationFilterContext =
-            new AuthorizationFilterContext(actionContext, filters.Select(x => x.Filter).ToArray());
-        return await ExecuteAuthorizationFiltersAsync(authorizationFilterContext, authorizationFilters, asyncAuthorizationFilters);
-    }
-
-    /// <summary>
-    ///     Executes a chain of filters.
-    /// </summary>
-    /// <remarks>
-    ///     Recursively calls in to itself as its continuation for the next filter in the chain.
-    /// </remarks>
-    private static async Task<bool> ExecuteAuthorizationFiltersAsync(
-        AuthorizationFilterContext authorizationFilterContext,
-        IList<IAuthorizationFilter> authorizationFilters,
-        IList<IAsyncAuthorizationFilter> asyncAuthorizationFilters)
-    {
-        foreach (IAuthorizationFilter authorizationFilter in authorizationFilters)
-        {
-            authorizationFilter.OnAuthorization(authorizationFilterContext);
-            if (!(authorizationFilterContext.Result is null))
-            {
-                return false;
-            }
-        }
-
-        foreach (IAsyncAuthorizationFilter asyncAuthorizationFilter in asyncAuthorizationFilters)
-        {
-            await asyncAuthorizationFilter.OnAuthorizationAsync(authorizationFilterContext);
-            if (!(authorizationFilterContext.Result is null))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Quickly split filters into different types
-    /// </summary>
-    private class FilterGrouping
-    {
-        private readonly List<IActionFilter> _actionFilters = new();
-        private readonly List<IAsyncActionFilter> _asyncActionFilters = new();
-        private readonly List<IAsyncAuthorizationFilter> _asyncAuthorizationFilters = new();
-        private readonly List<IAsyncExceptionFilter> _asyncExceptionFilters = new();
-        private readonly List<IAuthorizationFilter> _authorizationFilters = new();
-        private readonly List<IExceptionFilter> _exceptionFilters = new();
-
-        public FilterGrouping(IEnumerable<FilterDescriptor> filters, IServiceProvider serviceProvider)
-        {
-            if (filters == null)
-            {
-                throw new ArgumentNullException("filters");
-            }
-
-            foreach (FilterDescriptor f in filters)
-            {
-                IFilterMetadata filter = f.Filter;
-                Categorize(filter, _actionFilters, serviceProvider);
-                Categorize(filter, _authorizationFilters, serviceProvider);
-                Categorize(filter, _exceptionFilters, serviceProvider);
-                Categorize(filter, _asyncActionFilters, serviceProvider);
-                Categorize(filter, _asyncAuthorizationFilters, serviceProvider);
-            }
-        }
-
-        public IEnumerable<IActionFilter> ActionFilters => _actionFilters;
-        public IEnumerable<IAsyncActionFilter> AsyncActionFilters => _asyncActionFilters;
-        public IEnumerable<IAuthorizationFilter> AuthorizationFilters => _authorizationFilters;
-
-        public IEnumerable<IAsyncAuthorizationFilter> AsyncAuthorizationFilters => _asyncAuthorizationFilters;
-
-        public IEnumerable<IExceptionFilter> ExceptionFilters => _exceptionFilters;
-
-        public IEnumerable<IAsyncExceptionFilter> AsyncExceptionFilters => _asyncExceptionFilters;
-
-        private static void Categorize<T>(IFilterMetadata filter, List<T> list, IServiceProvider serviceProvider)
-            where T : class
-        {
-            if (filter is TypeFilterAttribute typeFilterAttribute)
-            {
-                filter = typeFilterAttribute.CreateInstance(serviceProvider);
-            }
-
-            if (filter is T match)
-            {
-                list.Add(match);
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs
deleted file mode 100644
index b46e3efb4b..0000000000
--- a/src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-using System.Text;
-using Microsoft.AspNetCore.Html;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using Newtonsoft.Json;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Manifest;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.WebAssets;
-using Umbraco.Cms.Infrastructure.WebAssets;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Cms.Web.Common.Hosting;
-
-namespace Umbraco.Extensions;
-
-/// <summary>
-///    Extensions for <see cref="IHtmlHelper" /> to render scripts for the BackOffice.
-/// </summary>
-public static class HtmlHelperBackOfficeExtensions
-{
-    /// <summary>
-    ///     Outputs a script tag containing the import map for the BackOffice.
-    /// </summary>
-    /// <remarks>
-    ///     It will replace the token %CACHE_BUSTER% with the cache buster hash.
-    ///     It will also replace the /umbraco/backoffice path with the correct path for the BackOffice assets.
-    /// </remarks>
-    /// <returns>A <see cref="Task"/> containing the html content for the BackOffice import map.</returns>
-    public static async Task<IHtmlContent> BackOfficeImportMapScriptAsync(
-        this IHtmlHelper html,
-        IJsonSerializer jsonSerializer,
-        IBackOfficePathGenerator backOfficePathGenerator,
-        IPackageManifestService packageManifestService)
-    {
-        try
-        {
-            PackageManifestImportmap packageImports = await packageManifestService.GetPackageManifestImportmapAsync();
-
-            var sb = new StringBuilder();
-            sb.AppendLine("""<script type="importmap">""");
-            sb.AppendLine(jsonSerializer.Serialize(packageImports));
-            sb.AppendLine("</script>");
-
-            // Inject the BackOffice cache buster into the import string to handle BackOffice assets
-            var importmapScript = sb.ToString()
-                .Replace(backOfficePathGenerator.BackOfficeVirtualDirectory, backOfficePathGenerator.BackOfficeAssetsPath)
-                .Replace(Constants.Web.CacheBusterToken, backOfficePathGenerator.BackOfficeCacheBustHash);
-
-            return html.Raw(importmapScript);
-        }
-        catch (NotSupportedException ex)
-        {
-            throw new NotSupportedException("Failed to serialize the BackOffice import map", ex);
-        }
-        catch (Exception ex)
-        {
-            throw new Exception("Failed to generate the BackOffice import map", ex);
-        }
-    }
-
-    /// <summary>
-    ///     Outputs a script tag containing the bare minimum (non secure) server vars for use with the angular app
-    /// </summary>
-    /// <param name="html"></param>
-    /// <param name="backOfficeServerVariables"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     These are the bare minimal server variables that are required for the application to start without being
-    ///     authenticated,
-    ///     we will load the rest of the server vars after the user is authenticated.
-    /// </remarks>
-    [Obsolete("This is deprecated and will be removed in V15")]
-    public static async Task<IHtmlContent> BareMinimumServerVariablesScriptAsync(this IHtmlHelper html,
-        BackOfficeServerVariables backOfficeServerVariables)
-    {
-        Dictionary<string, object> minVars = await backOfficeServerVariables.BareMinimumServerVariablesAsync();
-
-        var str = @"<script type=""text/javascript"">
-                var Umbraco = {};
-                Umbraco.Sys = {};
-                Umbraco.Sys.ServerVariables = " + JsonConvert.SerializeObject(minVars) + @";
-            </script>";
-
-        return html.Raw(str);
-    }
-
-    /// <summary>
-    ///     Used to render the script that will pass in the angular "externalLoginInfo" service/value on page load
-    /// </summary>
-    /// <param name="html"></param>
-    /// <param name="externalLogins"></param>
-    /// <param name="externalLoginErrors"></param>
-    /// <returns></returns>
-    [Obsolete("This is deprecated and will be removed in V15")]
-    public static async Task<IHtmlContent> AngularValueExternalLoginInfoScriptAsync(this IHtmlHelper html,
-        IBackOfficeExternalLoginProviders externalLogins,
-        BackOfficeExternalLoginProviderErrors externalLoginErrors)
-    {
-        IEnumerable<BackOfficeExternaLoginProviderScheme>
-            providers = await externalLogins.GetBackOfficeProvidersAsync();
-
-        var loginProviders = providers
-            .Select(p => new
-            {
-                authType = p.ExternalLoginProvider.AuthenticationType,
-                caption = p.AuthenticationScheme.DisplayName,
-                options = new
-                {
-                    allowManualLinking = p.ExternalLoginProvider.Options.AutoLinkOptions.AllowManualLinking,
-                    buttonStyle = p.ExternalLoginProvider.Options.ButtonStyle,
-                    buttonLook = p.ExternalLoginProvider.Options.ButtonLook.ToString().ToLowerInvariant(),
-                    buttonColor = p.ExternalLoginProvider.Options.ButtonColor.ToString().ToLowerInvariant(),
-                    customBackOfficeView = p.ExternalLoginProvider.Options.CustomBackOfficeView,
-                    denyLocalLogin = p.ExternalLoginProvider.Options.DenyLocalLogin,
-                    icon = p.ExternalLoginProvider.Options.Icon,
-                },
-                properties = p.ExternalLoginProvider.Options,
-            })
-            .ToArray();
-
-        var sb = new StringBuilder();
-        sb.AppendLine();
-        sb.AppendLine(@"var errors = [];");
-
-        if (externalLoginErrors != null)
-        {
-            if (externalLoginErrors.Errors is not null)
-            {
-                foreach (var error in externalLoginErrors.Errors)
-                {
-                    sb.AppendFormat(@"errors.push(""{0}"");", error.ToSingleLine()).AppendLine();
-                }
-            }
-        }
-
-        sb.AppendLine(@"app.value(""externalLoginInfo"", {");
-        if (externalLoginErrors?.AuthenticationType != null)
-        {
-            sb.AppendLine($@"errorProvider: '{externalLoginErrors.AuthenticationType}',");
-        }
-
-        sb.AppendLine(@"errors: errors,");
-        sb.Append(@"providers: ");
-        sb.AppendLine(JsonConvert.SerializeObject(loginProviders));
-        sb.AppendLine(@"});");
-
-        return html.Raw(sb.ToString());
-    }
-
-    /// <summary>
-    ///     Used to render the script that will pass in the angular "resetPasswordCodeInfo" service/value on page load
-    /// </summary>
-    /// <param name="html"></param>
-    /// <param name="val"></param>
-    /// <returns></returns>
-    [Obsolete("This is deprecated and will be removed in V15")]
-    public static IHtmlContent AngularValueResetPasswordCodeInfoScript(this IHtmlHelper html, object? val)
-    {
-        var sb = new StringBuilder();
-        sb.AppendLine();
-        sb.AppendLine(@"var errors = [];");
-
-        if (val is IEnumerable<string> errors)
-        {
-            foreach (var error in errors)
-            {
-                sb.AppendFormat(@"errors.push(""{0}"");", error).AppendLine();
-            }
-
-            val = null;
-        }
-
-        sb.AppendLine(@"app.value(""resetPasswordCodeInfo"", {");
-        sb.AppendLine(@"errors: errors,");
-        sb.Append(@"resetCodeModel: ");
-        sb.AppendLine(val?.ToString() ?? "null");
-        sb.AppendLine(@"});");
-
-        return html.Raw(sb.ToString());
-    }
-
-    [Obsolete("This is deprecated and will be removed in V15")]
-    public static async Task<IHtmlContent> AngularValueTinyMceAssetsAsync(this IHtmlHelper html,
-        IRuntimeMinifier runtimeMinifier)
-    {
-        IEnumerable<string> files =
-            await runtimeMinifier.GetJsAssetPathsAsync(BackOfficeWebAssets.UmbracoTinyMceJsBundleName);
-
-        var sb = new StringBuilder();
-
-        sb.AppendLine(@"app.value(""tinyMceAssets"",");
-        sb.AppendLine(JsonConvert.SerializeObject(files));
-        sb.AppendLine(@");");
-
-
-        return html.Raw(sb.ToString());
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Extensions/LinkGeneratorExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/LinkGeneratorExtensions.cs
deleted file mode 100644
index 8b528737bc..0000000000
--- a/src/Umbraco.Web.BackOffice/Extensions/LinkGeneratorExtensions.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Microsoft.AspNetCore.Routing;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Web.BackOffice.Install;
-
-namespace Umbraco.Extensions;
-
-public static class BackofficeLinkGeneratorExtensions
-{
-    /// <summary>
-    ///     Returns the URL for the installer
-    /// </summary>
-    public static string? GetInstallerUrl(this LinkGenerator linkGenerator)
-        => linkGenerator.GetPathByAction(nameof(InstallController.Index), ControllerExtensions.GetControllerName<InstallController>(), new { area = Constants.Web.Mvc.InstallArea });
-
-    /// <summary>
-    ///     Returns the URL for the installer api
-    /// </summary>
-    public static string? GetInstallerApiUrl(this LinkGenerator linkGenerator)
-        => linkGenerator.GetPathByAction(
-            nameof(InstallApiController.GetSetup),
-            ControllerExtensions.GetControllerName<InstallApiController>(),
-            new { area = Constants.Web.Mvc.InstallArea })?.TrimEnd(nameof(InstallApiController.GetSetup));
-}
diff --git a/src/Umbraco.Web.BackOffice/Extensions/ModelStateExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/ModelStateExtensions.cs
deleted file mode 100644
index 1b8effa5cd..0000000000
--- a/src/Umbraco.Web.BackOffice/Extensions/ModelStateExtensions.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Umbraco.Cms.Web.BackOffice.PropertyEditors.Validation;
-
-namespace Umbraco.Extensions;
-
-public static class ModelStateExtensions
-{
-    /// <summary>
-    ///     Adds the <see cref="ValidationResult" /> to the model state with the appropriate keys for property errors
-    /// </summary>
-    /// <param name="modelState"></param>
-    /// <param name="result"></param>
-    /// <param name="propertyAlias"></param>
-    /// <param name="culture"></param>
-    /// <param name="segment"></param>
-    internal static void AddPropertyValidationError(this ModelStateDictionary modelState,
-        ValidationResult result,
-        string propertyAlias,
-        string culture = "",
-        string segment = "") =>
-        modelState.AddValidationError(
-            result,
-            "_Properties",
-            propertyAlias,
-            //if the culture is null, we'll add the term 'invariant' as part of the key
-            culture.IsNullOrWhiteSpace() ? "invariant" : culture,
-            // if the segment is null, we'll add the term 'null' as part of the key
-            segment.IsNullOrWhiteSpace() ? "null" : segment);
-
-    /// <summary>
-    ///     Adds an <see cref="ContentPropertyValidationResult" /> error to model state for a property so we can use it on the
-    ///     client side.
-    /// </summary>
-    /// <param name="modelState"></param>
-    /// <param name="result"></param>
-    /// <param name="propertyAlias"></param>
-    /// <param name="culture">The culture for the property, if the property is invariant than this is empty</param>
-    /// <param name="segment"></param>
-    internal static void AddPropertyError(this ModelStateDictionary modelState,
-        ValidationResult result, string propertyAlias, string culture = "", string segment = "") =>
-        modelState.AddPropertyValidationError(new ContentPropertyValidationResult(result, culture, segment),
-            propertyAlias, culture, segment);
-
-    /// <summary>
-    ///     Adds a generic culture error for use in displaying the culture validation error in the save/publish/etc... dialogs
-    /// </summary>
-    /// <param name="modelState"></param>
-    /// <param name="culture"></param>
-    /// <param name="segment"></param>
-    /// <param name="errMsg"></param>
-    internal static void AddVariantValidationError(this ModelStateDictionary modelState,
-        string? culture, string? segment, string errMsg)
-    {
-        var key = "_content_variant_" + (culture.IsNullOrWhiteSpace() ? "invariant" : culture) + "_" +
-                  (segment.IsNullOrWhiteSpace() ? "null" : segment) + "_";
-        if (modelState.ContainsKey(key))
-        {
-            return;
-        }
-
-        modelState.AddModelError(key, errMsg);
-    }
-
-    /// <summary>
-    ///     Returns a list of cultures that have property validation errors
-    /// </summary>
-    /// <param name="modelState"></param>
-    /// <param name="localizationService"></param>
-    /// <param name="cultureForInvariantErrors">The culture to affiliate invariant errors with</param>
-    /// <returns>
-    ///     A list of cultures that have property validation errors. The default culture will be returned for any invariant
-    ///     property errors.
-    /// </returns>
-    internal static IReadOnlyList<(string? culture, string? segment)>? GetVariantsWithPropertyErrors(
-        this ModelStateDictionary modelState,
-        string? cultureForInvariantErrors)
-    {
-        //Add any variant specific errors here
-        var variantErrors = modelState.Keys
-            .Where(key => key.StartsWith("_Properties.")) //only choose _Properties errors
-            .Select(x => x.Split('.')) //split into parts
-            .Where(x => x.Length >= 4 && !x[2].IsNullOrWhiteSpace() && !x[3].IsNullOrWhiteSpace())
-            .Select(x => (culture: x[2], segment: x[3]))
-            //if the culture is marked "invariant" than return the default language, this is because we can only edit invariant properties on the default language
-            //so errors for those must show up under the default lang.
-            //if the segment is marked "null" then return an actual null
-            .Select(x =>
-            {
-                var culture = x.culture == "invariant" ? cultureForInvariantErrors : x.culture;
-                var segment = x.segment == "null" ? null : x.segment;
-                return (culture, segment);
-            })
-            .Distinct()
-            .ToList();
-
-        return variantErrors;
-    }
-
-    /// <summary>
-    ///     Returns a list of cultures that have any validation errors
-    /// </summary>
-    /// <param name="modelState"></param>
-    /// <param name="localizationService"></param>
-    /// <param name="cultureForInvariantErrors">The culture to affiliate invariant errors with</param>
-    /// <returns>
-    ///     A list of cultures that have validation errors. The default culture will be returned for any invariant errors.
-    /// </returns>
-    internal static IReadOnlyList<(string? culture, string? segment)>? GetVariantsWithErrors(
-        this ModelStateDictionary modelState, string? cultureForInvariantErrors)
-    {
-        IReadOnlyList<(string? culture, string? segment)>? propertyVariantErrors =
-            modelState.GetVariantsWithPropertyErrors(cultureForInvariantErrors);
-
-        //now check the other special variant errors that are
-        IEnumerable<(string? culture, string? segment)>? genericVariantErrors = modelState.Keys
-            .Where(x => x.StartsWith("_content_variant_") && x.EndsWith("_"))
-            .Select(x => x.TrimStart("_content_variant_").TrimEnd("_"))
-            .Select(x =>
-            {
-                // Format "<culture>_<segment>"
-                var cs = x.Split(new[] { '_' });
-                return (culture: cs[0], segment: cs[1]);
-            })
-            .Where(x => !x.culture.IsNullOrWhiteSpace())
-            //if it's marked "invariant" than return the default language, this is because we can only edit invariant properties on the default language
-            //so errors for those must show up under the default lang.
-            //if the segment is marked "null" then return an actual null
-            .Select(x =>
-            {
-                var culture = x.culture == "invariant" ? cultureForInvariantErrors : x.culture;
-                var segment = x.segment == "null" ? null : x.segment;
-                return (culture, segment);
-            })
-            .Distinct();
-
-        return propertyVariantErrors?.Union(genericVariantErrors).Distinct().ToList();
-    }
-
-    /// <summary>
-    ///     Adds the error to model state correctly for a property so we can use it on the client side.
-    /// </summary>
-    /// <param name="modelState"></param>
-    /// <param name="result"></param>
-    /// <param name="parts">
-    ///     Each model state validation error has a name and in most cases this name is made up of parts which are delimited by
-    ///     a '.'
-    /// </param>
-    internal static void AddValidationError(this ModelStateDictionary modelState,
-        ValidationResult result, params string[] parts)
-    {
-        // if there are assigned member names, we combine the member name with the owner name
-        // so that we can try to match it up to a real field. otherwise, we assume that the
-        // validation message is for the overall owner.
-        // Owner = the component being validated, like a content property but could be just an HTML field on another editor
-
-        var withNames = false;
-        var delimitedParts = string.Join(".", parts);
-        foreach (var memberName in result.MemberNames)
-        {
-            modelState.TryAddModelError($"{delimitedParts}.{memberName}", result.ErrorMessage ?? string.Empty);
-            withNames = true;
-        }
-
-        if (!withNames)
-        {
-            modelState.TryAddModelError($"{delimitedParts}", result.ToString());
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Extensions/UmbracoApplicationBuilder.Installer.cs b/src/Umbraco.Web.BackOffice/Extensions/UmbracoApplicationBuilder.Installer.cs
deleted file mode 100644
index e4241f9a96..0000000000
--- a/src/Umbraco.Web.BackOffice/Extensions/UmbracoApplicationBuilder.Installer.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Web.BackOffice.Install;
-using Umbraco.Cms.Web.Common.ApplicationBuilder;
-
-namespace Umbraco.Extensions;
-
-/// <summary>
-///     <see cref="IApplicationBuilder" /> extensions for Umbraco installer
-/// </summary>
-public static partial class UmbracoApplicationBuilderExtensions
-{
-    /// <summary>
-    ///     Enables the Umbraco installer
-    /// </summary>
-    public static IUmbracoEndpointBuilderContext UseInstallerEndpoints(this IUmbracoEndpointBuilderContext app)
-    {
-        if (!app.RuntimeState.UmbracoCanBoot())
-        {
-            return app;
-        }
-
-        InstallAreaRoutes installerRoutes = app.ApplicationServices.GetRequiredService<InstallAreaRoutes>();
-        installerRoutes.CreateRoutes(app.EndpointRouteBuilder);
-
-        return app;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Extensions/WebMappingProfiles.cs b/src/Umbraco.Web.BackOffice/Extensions/WebMappingProfiles.cs
deleted file mode 100644
index 7597feab69..0000000000
--- a/src/Umbraco.Web.BackOffice/Extensions/WebMappingProfiles.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Web.BackOffice.Mapping;
-
-namespace Umbraco.Extensions;
-
-public static class WebMappingProfiles
-{
-    public static IUmbracoBuilder AddWebMappingProfiles(this IUmbracoBuilder builder)
-    {
-        builder.WithCollectionBuilder<MapDefinitionCollectionBuilder>()
-            .Add<ContentMapDefinition>()
-            .Add<MediaMapDefinition>()
-            .Add<MemberMapDefinition>();
-
-        builder.Services.AddTransient<CommonTreeNodeMapper>();
-
-        return builder;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/AppendCurrentEventMessagesAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/AppendCurrentEventMessagesAttribute.cs
deleted file mode 100644
index a9d4485acc..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/AppendCurrentEventMessagesAttribute.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Web;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     Automatically checks if any request is a non-GET and if the
-///     resulting message is INotificationModel in which case it will append any Event Messages
-///     currently in the request.
-/// </summary>
-internal sealed class AppendCurrentEventMessagesAttribute : TypeFilterAttribute
-{
-    public AppendCurrentEventMessagesAttribute() : base(typeof(AppendCurrentEventMessagesFilter))
-    {
-    }
-
-    private class AppendCurrentEventMessagesFilter : IActionFilter
-    {
-        private readonly IEventMessagesFactory _eventMessagesFactory;
-        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-
-        public AppendCurrentEventMessagesFilter(IUmbracoContextAccessor umbracoContextAccessor, IEventMessagesFactory eventMessagesFactory)
-        {
-            _umbracoContextAccessor = umbracoContextAccessor;
-            _eventMessagesFactory = eventMessagesFactory;
-        }
-
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-            if (context.HttpContext.Response == null)
-            {
-                return;
-            }
-
-            if (context.HttpContext.Request.Method.Equals(HttpMethod.Get.ToString(), StringComparison.InvariantCultureIgnoreCase))
-            {
-                return;
-            }
-
-            if (!_umbracoContextAccessor.TryGetUmbracoContext(out _))
-            {
-                return;
-            }
-
-            if (!(context.Result is ObjectResult obj))
-            {
-                return;
-            }
-
-            if (obj.Value is not INotificationModel notifications)
-            {
-                return;
-            }
-
-            EventMessages? msgs = _eventMessagesFactory.GetOrDefault();
-            if (msgs == null)
-            {
-                return;
-            }
-
-            foreach (EventMessage eventMessage in msgs.GetAll())
-            {
-                NotificationStyle msgType;
-                switch (eventMessage.MessageType)
-                {
-                    case EventMessageType.Default:
-                        msgType = NotificationStyle.Save;
-                        break;
-                    case EventMessageType.Info:
-                        msgType = NotificationStyle.Info;
-                        break;
-                    case EventMessageType.Error:
-                        msgType = NotificationStyle.Error;
-                        break;
-                    case EventMessageType.Success:
-                        msgType = NotificationStyle.Success;
-                        break;
-                    case EventMessageType.Warning:
-                        msgType = NotificationStyle.Warning;
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException();
-                }
-
-                notifications.Notifications?.Add(new BackOfficeNotification
-                {
-                    Message = eventMessage.Message,
-                    Header = eventMessage.Category,
-                    NotificationType = msgType
-                });
-            }
-        }
-
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttribute.cs
deleted file mode 100644
index eaee8993cc..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttribute.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     Appends a custom response header to notify the UI that the current user data has been modified
-/// </summary>
-public sealed class AppendUserModifiedHeaderAttribute : ActionFilterAttribute
-{
-    private readonly string? _userIdParameter;
-
-    /// <summary>
-    ///     An empty constructor which will always set the header.
-    /// </summary>
-    public AppendUserModifiedHeaderAttribute()
-    {
-    }
-
-    /// <summary>
-    ///     A constructor specifying the action parameter name containing the user id to match against the
-    ///     current user and if they match the header will be appended.
-    /// </summary>
-    /// <param name="userIdParameter"></param>
-    public AppendUserModifiedHeaderAttribute(string userIdParameter) => _userIdParameter =
-        userIdParameter ?? throw new ArgumentNullException(nameof(userIdParameter));
-
-    public override void OnActionExecuting(ActionExecutingContext context)
-    {
-        if (_userIdParameter.IsNullOrWhiteSpace())
-        {
-            AppendHeader(context);
-        }
-        else
-        {
-            if (!context.ActionArguments.ContainsKey(_userIdParameter!))
-            {
-                throw new InvalidOperationException(
-                    $"No argument found for the current action with the name: {_userIdParameter}");
-            }
-
-            IBackOfficeSecurityAccessor? backofficeSecurityAccessor =
-                context.HttpContext.RequestServices.GetService<IBackOfficeSecurityAccessor>();
-            IUser? user = backofficeSecurityAccessor?.BackOfficeSecurity?.CurrentUser;
-            if (user == null)
-            {
-                return;
-            }
-
-            var userId = GetUserIdFromParameter(context.ActionArguments[_userIdParameter!]);
-            if (userId == user.Id)
-            {
-                AppendHeader(context);
-            }
-        }
-    }
-
-    public static void AppendHeader(ActionExecutingContext context)
-    {
-        const string HeaderName = "X-Umb-User-Modified";
-        if (context.HttpContext.Response.Headers.ContainsKey(HeaderName) == false)
-        {
-            context.HttpContext.Response.Headers.Add(HeaderName, "1");
-        }
-    }
-
-    private int GetUserIdFromParameter(object? parameterValue)
-    {
-        if (parameterValue is int)
-        {
-            return (int)parameterValue;
-        }
-
-        throw new InvalidOperationException($"The id type: {parameterValue?.GetType()} is not a supported id.");
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/CheckIfUserTicketDataIsStaleAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
deleted file mode 100644
index 7d0270d3ac..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System.Globalization;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-/// </summary>
-internal sealed class CheckIfUserTicketDataIsStaleAttribute : TypeFilterAttribute
-{
-    public CheckIfUserTicketDataIsStaleAttribute()
-        : base(typeof(CheckIfUserTicketDataIsStaleFilter))
-    {
-    }
-
-    private class CheckIfUserTicketDataIsStaleFilter : IAsyncActionFilter
-    {
-        private readonly AppCaches _appCaches;
-        private readonly IBackOfficeAntiforgery _backOfficeAntiforgery;
-        private readonly IBackOfficeSignInManager _backOfficeSignInManager;
-        private readonly IEntityService _entityService;
-        private readonly ILocalizedTextService _localizedTextService;
-        private readonly IRequestCache _requestCache;
-        private readonly ICoreScopeProvider _scopeProvider;
-        private readonly IUmbracoMapper _umbracoMapper;
-        private readonly IUserService _userService;
-        private readonly GlobalSettings _globalSettings;
-
-        public CheckIfUserTicketDataIsStaleFilter(
-            IRequestCache requestCache,
-            IUmbracoMapper umbracoMapper,
-            IUserService userService,
-            IEntityService entityService,
-            ILocalizedTextService localizedTextService,
-            IOptionsSnapshot<GlobalSettings> globalSettings,
-            IBackOfficeSignInManager backOfficeSignInManager,
-            IBackOfficeAntiforgery backOfficeAntiforgery,
-            ICoreScopeProvider scopeProvider,
-            AppCaches appCaches)
-        {
-            _requestCache = requestCache;
-            _umbracoMapper = umbracoMapper;
-            _userService = userService;
-            _entityService = entityService;
-            _localizedTextService = localizedTextService;
-            _globalSettings = globalSettings.Value;
-            _backOfficeSignInManager = backOfficeSignInManager;
-            _backOfficeAntiforgery = backOfficeAntiforgery;
-            _scopeProvider = scopeProvider;
-            _appCaches = appCaches;
-        }
-
-
-        public async Task OnActionExecutionAsync(ActionExecutingContext actionContext, ActionExecutionDelegate next)
-        {
-            await CheckStaleData(actionContext);
-
-            await next();
-
-            await CheckStaleData(actionContext);
-
-            // return if nothing is updated
-            if (_requestCache.Get(nameof(CheckIfUserTicketDataIsStaleFilter)) is null)
-            {
-                return;
-            }
-
-            await UpdateTokensAndAppendCustomHeaders(actionContext);
-        }
-
-        private async Task UpdateTokensAndAppendCustomHeaders(ActionExecutingContext actionContext)
-        {
-            var tokenFilter =
-                new SetAngularAntiForgeryTokensAttribute.SetAngularAntiForgeryTokensFilter(_backOfficeAntiforgery);
-            await tokenFilter.OnActionExecutionAsync(
-                actionContext,
-                () => Task.FromResult(new ActionExecutedContext(actionContext, new List<IFilterMetadata>(), new { })));
-
-            // add the header
-            AppendUserModifiedHeaderAttribute.AppendHeader(actionContext);
-        }
-
-
-        private async Task CheckStaleData(ActionExecutingContext actionContext)
-        {
-            using (ICoreScope scope = _scopeProvider.CreateCoreScope(autoComplete: true))
-            {
-                if (actionContext?.HttpContext.Request == null || actionContext.HttpContext.User?.Identity == null)
-                {
-                    return;
-                }
-
-                // don't execute if it's already been done
-                if (!(_requestCache.Get(nameof(CheckIfUserTicketDataIsStaleFilter)) is null))
-                {
-                    return;
-                }
-
-                if (actionContext.HttpContext.User.Identity is not ClaimsIdentity identity)
-                {
-                    return;
-                }
-
-                var id = identity.GetId();
-                if (id is null)
-                {
-                    return;
-                }
-
-                IUser? user = _userService.GetUserById(id.Value);
-                if (user == null)
-                {
-                    return;
-                }
-
-                // a list of checks to execute, if any of them pass then we resync
-                var checks = new Func<bool>[]
-                {
-                    () => user.Username != identity.GetUsername(), () =>
-                    {
-                        CultureInfo culture = user.GetUserCulture(_localizedTextService, _globalSettings);
-                        return culture != null && culture.ToString() != identity.GetCultureString();
-                    },
-                    () => user.AllowedSections.UnsortedSequenceEqual(identity.GetAllowedApplications()) == false,
-                    () => user.Groups.Select(x => x.Alias).UnsortedSequenceEqual(identity.GetRoles()) == false, () =>
-                    {
-                        var startContentIds = user.CalculateContentStartNodeIds(_entityService, _appCaches);
-                        return startContentIds.UnsortedSequenceEqual(identity.GetStartContentNodes()) == false;
-                    },
-                    () =>
-                    {
-                        var startMediaIds = user.CalculateMediaStartNodeIds(_entityService, _appCaches);
-                        return startMediaIds.UnsortedSequenceEqual(identity.GetStartMediaNodes()) == false;
-                    }
-                };
-
-                if (checks.Any(check => check()))
-                {
-                    await ReSync(user, actionContext);
-                }
-            }
-        }
-
-        /// <summary>
-        ///     This will update the current request IPrincipal to be correct and re-create the auth ticket
-        /// </summary>
-        private async Task ReSync(IUser user, ActionExecutingContext actionContext)
-        {
-            BackOfficeIdentityUser? backOfficeIdentityUser = _umbracoMapper.Map<BackOfficeIdentityUser>(user);
-            if (backOfficeIdentityUser is not null)
-            {
-                await _backOfficeSignInManager.SignInAsync(backOfficeIdentityUser, true);
-            }
-
-            // flag that we've made changes
-            _requestCache.Set(nameof(CheckIfUserTicketDataIsStaleFilter), true);
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/ContentModelValidator.cs b/src/Umbraco.Web.BackOffice/Filters/ContentModelValidator.cs
deleted file mode 100644
index e0caad339d..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/ContentModelValidator.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     A base class purely used for logging without generics
-/// </summary>
-internal abstract class ContentModelValidator
-{
-    protected ContentModelValidator(ILogger<ContentModelValidator> logger, IPropertyValidationService propertyValidationService)
-    {
-        Logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        PropertyValidationService = propertyValidationService ??
-                                    throw new ArgumentNullException(nameof(propertyValidationService));
-    }
-
-    public IPropertyValidationService PropertyValidationService { get; }
-    protected ILogger<ContentModelValidator> Logger { get; }
-}
-
-/// <summary>
-///     A validation helper class used with ContentItemValidationFilterAttribute to be shared between content, media,
-///     etc...
-/// </summary>
-/// <typeparam name="TPersisted"></typeparam>
-/// <typeparam name="TModelSave"></typeparam>
-/// <typeparam name="TModelWithProperties"></typeparam>
-/// <remarks>
-///     If any severe errors occur then the response gets set to an error and execution will not continue. Property
-///     validation
-///     errors will just be added to the ModelState.
-/// </remarks>
-internal abstract class ContentModelValidator<TPersisted, TModelSave, TModelWithProperties> : ContentModelValidator
-    where TPersisted : class, IContentBase
-    where TModelSave : IContentSave<TPersisted>
-    where TModelWithProperties : IContentProperties<ContentPropertyBasic>
-{
-    protected ContentModelValidator(
-        ILogger<ContentModelValidator> logger,
-        IPropertyValidationService propertyValidationService)
-        : base(logger, propertyValidationService)
-    {
-    }
-
-    /// <summary>
-    ///     Ensure the content exists
-    /// </summary>
-    /// <param name="postedItem"></param>
-    /// <param name="actionContext"></param>
-    /// <returns></returns>
-    public virtual bool ValidateExistingContent(TModelSave? postedItem, ActionExecutingContext actionContext)
-    {
-        TPersisted? persistedContent = postedItem?.PersistedContent;
-        if (persistedContent == null)
-        {
-            actionContext.Result = new NotFoundObjectResult("content was not found");
-            return false;
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Ensure all of the ids in the post are valid
-    /// </summary>
-    /// <param name="model"></param>
-    /// <param name="modelWithProperties"></param>
-    /// <param name="actionContext"></param>
-    /// <returns></returns>
-    public virtual bool ValidateProperties(TModelSave? model, IContentProperties<ContentPropertyBasic>? modelWithProperties, ActionExecutingContext actionContext)
-    {
-        TPersisted? persistedContent = model?.PersistedContent;
-        return ValidateProperties(modelWithProperties?.Properties.ToList() ?? new List<ContentPropertyBasic>(), persistedContent?.Properties.ToList(), actionContext);
-    }
-
-    /// <summary>
-    ///     This validates that all of the posted properties exist on the persisted entity
-    /// </summary>
-    /// <param name="postedProperties"></param>
-    /// <param name="persistedProperties"></param>
-    /// <param name="actionContext"></param>
-    /// <returns></returns>
-    protected bool ValidateProperties(List<ContentPropertyBasic>? postedProperties, List<IProperty>? persistedProperties, ActionExecutingContext actionContext)
-    {
-        if (postedProperties is null)
-        {
-            return false;
-        }
-
-        foreach (ContentPropertyBasic p in postedProperties)
-        {
-            if (persistedProperties?.Any(property => property.Alias == p.Alias) == false)
-            {
-                // TODO: Do we return errors here ? If someone deletes a property whilst their editing then should we just
-                //save the property data that remains? Or inform them they need to reload... not sure. This problem exists currently too i think.
-
-                var message = $"property with alias: {p.Alias} was not found";
-                actionContext.Result = new NotFoundObjectResult(new InvalidOperationException(message));
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Validates the data for each property
-    /// </summary>
-    /// <param name="model"></param>
-    /// <param name="modelWithProperties"></param>
-    /// <param name="dto"></param>
-    /// <param name="modelState"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     All property data validation goes into the model state with a prefix of "Properties"
-    /// </remarks>
-    public virtual bool ValidatePropertiesData(
-        TModelSave? model,
-        TModelWithProperties? modelWithProperties,
-        ContentPropertyCollectionDto? dto,
-        ModelStateDictionary modelState)
-    {
-        var properties = modelWithProperties?.Properties.ToDictionary(x => x.Alias, x => x);
-
-        if (dto is not null)
-        {
-            foreach (ContentPropertyDto p in dto.Properties)
-            {
-                IDataEditor? editor = p.PropertyEditor;
-
-                if (editor == null)
-                {
-                    var message =
-                        $"Could not find property editor \"{p.DataType?.EditorAlias}\" for property with id {p.Id}.";
-
-                    Logger.LogWarning(message);
-                    continue;
-                }
-
-                //get the posted value for this property, this may be null in cases where the property was marked as readonly which means
-                //the angular app will not post that value.
-                if (properties is null || !properties.TryGetValue(p.Alias, out ContentPropertyBasic? postedProp))
-                {
-                    continue;
-                }
-
-                var postedValue = postedProp.Value;
-
-                ValidatePropertyValue(model, modelWithProperties, editor, p, postedValue, modelState);
-            }
-        }
-
-
-        return modelState.IsValid;
-    }
-
-    /// <summary>
-    ///     Validates a property's value and adds the error to model state if found
-    /// </summary>
-    /// <param name="model"></param>
-    /// <param name="modelWithProperties"></param>
-    /// <param name="editor"></param>
-    /// <param name="property"></param>
-    /// <param name="postedValue"></param>
-    /// <param name="modelState"></param>
-    protected virtual void ValidatePropertyValue(
-        TModelSave? model,
-        TModelWithProperties? modelWithProperties,
-        IDataEditor editor,
-        ContentPropertyDto property,
-        object? postedValue,
-        ModelStateDictionary modelState)
-    {
-        if (property is null)
-        {
-            throw new ArgumentNullException(nameof(property));
-        }
-
-        if (property.DataType is null)
-        {
-            throw new InvalidOperationException($"{nameof(property)}.{nameof(property.DataType)} cannot be null");
-        }
-
-        foreach (ValidationResult validationResult in PropertyValidationService.ValidatePropertyValue(
-                     editor,
-                     property.DataType,
-                     postedValue,
-                     property.IsRequired ?? false,
-                     property.ValidationRegExp,
-                     property.IsRequiredMessage,
-                     property.ValidationRegExpMessage))
-        {
-            AddPropertyError(model, modelWithProperties, editor, property, validationResult, modelState);
-        }
-    }
-
-    protected virtual void AddPropertyError(
-        TModelSave? model,
-        TModelWithProperties? modelWithProperties,
-        IDataEditor editor,
-        ContentPropertyDto property,
-        ValidationResult validationResult,
-        ModelStateDictionary modelState) =>
-        modelState.AddPropertyError(validationResult, property.Alias, property.Culture ?? string.Empty, property.Segment ?? string.Empty);
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/ContentSaveModelValidator.cs b/src/Umbraco.Web.BackOffice/Filters/ContentSaveModelValidator.cs
deleted file mode 100644
index e11a130988..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/ContentSaveModelValidator.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Services;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     Validator for <see cref="ContentItemSave" />
-/// </summary>
-internal class ContentSaveModelValidator : ContentModelValidator<IContent, ContentItemSave, ContentVariantSave>
-{
-    public ContentSaveModelValidator(
-        ILogger<ContentSaveModelValidator> logger,
-        IPropertyValidationService propertyValidationService)
-        : base(logger, propertyValidationService)
-    {
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs
deleted file mode 100644
index c75bbd5a80..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     Validates the incoming <see cref="ContentItemSave" /> model along with if the user is allowed to perform the
-///     operation
-/// </summary>
-public sealed class ContentSaveValidationAttribute : TypeFilterAttribute
-{
-    public ContentSaveValidationAttribute(bool skipUserAccessValidation = false)
-        : base(typeof(ContentSaveValidationFilter))
-    {
-        Order = -3000; // More important than ModelStateInvalidFilter.FilterOrder
-        Arguments = new object[] { skipUserAccessValidation };
-    }
-
-    private sealed class ContentSaveValidationFilter : IAsyncActionFilter
-    {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IContentService _contentService;
-        private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-        private readonly ILocalizationService _localizationService;
-        private readonly ILoggerFactory _loggerFactory;
-        private readonly IPropertyValidationService _propertyValidationService;
-        private readonly bool _skipUserAccessValidation;
-
-
-        public ContentSaveValidationFilter(
-            ILoggerFactory loggerFactory,
-            IContentService contentService,
-            IPropertyValidationService propertyValidationService,
-            IAuthorizationService authorizationService,
-            IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-            ILocalizationService localizationService,
-            bool skipUserAccessValidation)
-        {
-            _loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
-            _contentService = contentService ?? throw new ArgumentNullException(nameof(contentService));
-            _propertyValidationService = propertyValidationService ??
-                                         throw new ArgumentNullException(nameof(propertyValidationService));
-            _authorizationService = authorizationService;
-            _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
-            _localizationService = localizationService;
-            _skipUserAccessValidation = skipUserAccessValidation;
-        }
-
-        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
-        {
-            // on executing...
-            await OnActionExecutingAsync(context);
-
-            if (context.Result == null)
-            {
-                //need to pass the execution to next if a result was not set
-                await next();
-            }
-
-
-            // on executed...
-        }
-
-        private async Task OnActionExecutingAsync(ActionExecutingContext context)
-        {
-            var model = (ContentItemSave?)context.ActionArguments["contentItem"];
-            var contentItemValidator =
-                new ContentSaveModelValidator(_loggerFactory.CreateLogger<ContentSaveModelValidator>(), _propertyValidationService);
-
-            if (context.ModelState.ContainsKey("contentItem"))
-            {
-                // if the entire model is marked as error, remove it, we handle everything separately
-                context.ModelState.Remove("contentItem");
-            }
-
-            if (!ValidateAtLeastOneVariantIsBeingSaved(model, context))
-            {
-                return;
-            }
-
-            if (!contentItemValidator.ValidateExistingContent(model, context))
-            {
-                return;
-            }
-
-            if (_skipUserAccessValidation is false && await ValidateUserAccessAsync(model, context) is false)
-            {
-                return;
-            }
-
-            if (model is not null)
-            {
-                //validate for each variant that is being updated
-                foreach (ContentVariantSave variant in model.Variants.Where(x => x.Save))
-                {
-                    if (contentItemValidator.ValidateProperties(model, variant, context))
-                    {
-                        contentItemValidator.ValidatePropertiesData(model, variant, variant.PropertyCollectionDto, context.ModelState);
-                    }
-                }
-            }
-        }
-
-
-        /// <summary>
-        ///     If there are no variants tagged for Saving, then this is an invalid request
-        /// </summary>
-        /// <param name="contentItem"></param>
-        /// <param name="actionContext"></param>
-        /// <returns></returns>
-        private bool ValidateAtLeastOneVariantIsBeingSaved(
-            ContentItemSave? contentItem,
-            ActionExecutingContext actionContext)
-        {
-            if (!contentItem?.Variants.Any(x => x.Save) ?? true)
-            {
-                actionContext.Result = new NotFoundObjectResult(new { Message = "No variants flagged for saving" });
-                return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        ///     Checks if the user has access to post a content item based on whether it's being created or saved.
-        /// </summary>
-        /// <param name="actionContext"></param>
-        /// <param name="contentItem"></param>
-        private async Task<bool> ValidateUserAccessAsync(
-            ContentItemSave? contentItem,
-            ActionExecutingContext actionContext)
-        {
-            // We now need to validate that the user is allowed to be doing what they are doing.
-            // Based on the action we need to check different permissions.
-            // Then if it is new, we need to lookup those permissions on the parent!
-
-            var permissionToCheck = new List<char>();
-            IContent? contentToCheck = null;
-            int contentIdToCheck;
-
-            // First check if user has Access to that language
-            IUser? currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-            bool hasAccess = false;
-            if (currentUser is null)
-            {
-                return false;
-            }
-
-            foreach (IReadOnlyUserGroup group in currentUser.Groups)
-            {
-                IEnumerable<ILanguage> languages = _localizationService.GetAllLanguages().Where(x => group.AllowedLanguages.Contains(x.Id));
-                if (group.AllowedLanguages.Count() is 0 ||
-                    languages.Select(x => x.IsoCode).Intersect(contentItem?.Variants.Where(x => x.Save || x.Publish).Select(x => x.Culture) ?? Enumerable.Empty<string>()).Count() is not 0)
-                {
-                    hasAccess = true;
-                }
-            }
-
-            if (!hasAccess && contentItem?.Variants.First().Culture is not null)
-            {
-                actionContext.ModelState.AddModelError(Constants.ModelStateErrorKeys.PermissionError, "User does not have access to save language");
-                return false;
-            }
-
-            switch (contentItem?.Action)
-            {
-                case ContentSaveAction.Save:
-                    permissionToCheck.Add(ActionUpdate.ActionLetter);
-                    contentToCheck = contentItem.PersistedContent;
-                    contentIdToCheck = contentToCheck?.Id ?? default;
-                    break;
-                case ContentSaveAction.Publish:
-                case ContentSaveAction.PublishWithDescendants:
-                case ContentSaveAction.PublishWithDescendantsForce:
-                    permissionToCheck.Add(ActionPublish.ActionLetter);
-                    contentToCheck = contentItem.PersistedContent;
-                    contentIdToCheck = contentToCheck?.Id ?? default;
-                    break;
-                case ContentSaveAction.SendPublish:
-                    permissionToCheck.Add(ActionToPublish.ActionLetter);
-                    contentToCheck = contentItem.PersistedContent;
-                    contentIdToCheck = contentToCheck?.Id ?? default;
-                    break;
-                case ContentSaveAction.Schedule:
-                    permissionToCheck.Add(ActionUpdate.ActionLetter);
-                    permissionToCheck.Add(ActionPublish.ActionLetter);
-                    contentToCheck = contentItem.PersistedContent;
-                    contentIdToCheck = contentToCheck?.Id ?? default;
-                    break;
-                case ContentSaveAction.SaveNew:
-                    //Save new requires ActionNew
-
-                    permissionToCheck.Add(ActionNew.ActionLetter);
-
-                    if (contentItem.ParentId != Constants.System.Root)
-                    {
-                        contentToCheck = _contentService.GetById(contentItem.ParentId);
-                        contentIdToCheck = contentToCheck?.Id ?? default;
-                    }
-                    else
-                    {
-                        contentIdToCheck = contentItem.ParentId;
-                    }
-
-                    break;
-                case ContentSaveAction.SendPublishNew:
-                    //Send new requires both ActionToPublish AND ActionNew
-
-                    permissionToCheck.Add(ActionNew.ActionLetter);
-                    permissionToCheck.Add(ActionToPublish.ActionLetter);
-                    if (contentItem.ParentId != Constants.System.Root)
-                    {
-                        contentToCheck = _contentService.GetById(contentItem.ParentId);
-                        contentIdToCheck = contentToCheck?.Id ?? default;
-                    }
-                    else
-                    {
-                        contentIdToCheck = contentItem.ParentId;
-                    }
-
-                    break;
-                case ContentSaveAction.PublishNew:
-                case ContentSaveAction.PublishWithDescendantsNew:
-                case ContentSaveAction.PublishWithDescendantsForceNew:
-                    //Publish new requires both ActionNew AND ActionPublish
-                    // TODO: Shouldn't publish also require ActionUpdate since it will definitely perform an update to publish but maybe that's just implied
-
-                    permissionToCheck.Add(ActionNew.ActionLetter);
-                    permissionToCheck.Add(ActionPublish.ActionLetter);
-
-                    if (contentItem.ParentId != Constants.System.Root)
-                    {
-                        contentToCheck = _contentService.GetById(contentItem.ParentId);
-                        contentIdToCheck = contentToCheck?.Id ?? default;
-                    }
-                    else
-                    {
-                        contentIdToCheck = contentItem.ParentId;
-                    }
-
-                    break;
-                case ContentSaveAction.ScheduleNew:
-
-                    permissionToCheck.Add(ActionNew.ActionLetter);
-                    permissionToCheck.Add(ActionUpdate.ActionLetter);
-                    permissionToCheck.Add(ActionPublish.ActionLetter);
-
-                    if (contentItem.ParentId != Constants.System.Root)
-                    {
-                        contentToCheck = _contentService.GetById(contentItem.ParentId);
-                        contentIdToCheck = contentToCheck?.Id ?? default;
-                    }
-                    else
-                    {
-                        contentIdToCheck = contentItem.ParentId;
-                    }
-
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-
-
-            ContentPermissionsResource resource = contentToCheck == null
-                ? new ContentPermissionsResource(contentToCheck, contentIdToCheck, permissionToCheck)
-                : new ContentPermissionsResource(contentToCheck, permissionToCheck);
-
-            AuthorizationResult authorizationResult = await _authorizationService.AuthorizeAsync(
-                actionContext.HttpContext.User,
-                resource,
-                AuthorizationPolicies.ContentPermissionByResource);
-
-            if (!authorizationResult.Succeeded)
-            {
-                actionContext.Result = new ForbidResult();
-                return false;
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/DataTypeValidateAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/DataTypeValidateAttribute.cs
deleted file mode 100644
index 165b5dbd6a..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/DataTypeValidateAttribute.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.ActionsResults;
-using Umbraco.Extensions;
-using DataType = Umbraco.Cms.Core.Models.DataType;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     An attribute/filter that wires up the persisted entity of the DataTypeSave model and validates the whole request
-/// </summary>
-internal sealed class DataTypeValidateAttribute : TypeFilterAttribute
-{
-    public DataTypeValidateAttribute() : base(typeof(DataTypeValidateFilter))
-    {
-    }
-
-    private class DataTypeValidateFilter : IActionFilter
-    {
-        private readonly IDataTypeService _dataTypeService;
-        private readonly PropertyEditorCollection _propertyEditorCollection;
-        private readonly IUmbracoMapper _umbracoMapper;
-
-        public DataTypeValidateFilter(IDataTypeService dataTypeService, PropertyEditorCollection propertyEditorCollection, IUmbracoMapper umbracoMapper)
-        {
-            _dataTypeService = dataTypeService ?? throw new ArgumentNullException(nameof(dataTypeService));
-            _propertyEditorCollection = propertyEditorCollection ??
-                                        throw new ArgumentNullException(nameof(propertyEditorCollection));
-            _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        }
-
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-        }
-
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-            var dataType = (DataTypeSave?)context.ActionArguments["dataType"];
-            if (dataType is not null)
-            {
-                dataType.Name = dataType.Name?.CleanForXss('[', ']', '(', ')', ':', '/', '\\');
-                dataType.Alias = dataType.Alias == null
-                    ? dataType.Name!
-                    : dataType.Alias.CleanForXss('[', ']', '(', ')', ':');
-            }
-
-            // get the property editor, ensuring that it exits
-            if (!_propertyEditorCollection.TryGet(dataType?.EditorAlias, out IDataEditor? propertyEditor))
-            {
-                var message = $"Property editor \"{dataType?.EditorAlias}\" was not found.";
-                context.Result = new UmbracoProblemResult(message, HttpStatusCode.NotFound);
-                return;
-            }
-
-            if (dataType is null)
-            {
-                return;
-            }
-
-            // assign
-            dataType.PropertyEditor = propertyEditor;
-
-            // validate that the data type exists, or create one if required
-            IDataType? persisted;
-            switch (dataType.Action)
-            {
-                case ContentSaveAction.Save:
-                    persisted = _dataTypeService.GetDataType(Convert.ToInt32(dataType.Id));
-                    if (persisted == null)
-                    {
-                        var message = $"Data type with id {dataType.Id} was not found.";
-                        context.Result = new UmbracoProblemResult(message, HttpStatusCode.NotFound);
-                        return;
-                    }
-
-                    // map the model to the persisted instance
-                    _umbracoMapper.Map(dataType, persisted);
-                    break;
-
-                case ContentSaveAction.SaveNew:
-                    // create the persisted model from mapping the saved model
-                    persisted = _umbracoMapper.Map<IDataType>(dataType);
-                    ((DataType?)persisted)?.ResetIdentity();
-                    break;
-
-                default:
-                    context.Result = new UmbracoProblemResult($"Data type action {dataType.Action} was not found.", HttpStatusCode.NotFound);
-                    return;
-            }
-
-            // assign (so it's available in the action)
-            dataType.PersistedDataType = persisted;
-
-            // validate the configuration
-            // which is posted as a set of fields with key (string) and value (object)
-            IConfigurationEditor configurationEditor = propertyEditor.GetConfigurationEditor();
-
-            if (dataType.ConfigurationFields is not null)
-            {
-                foreach (DataTypeConfigurationFieldSave field in dataType.ConfigurationFields)
-                {
-                    ConfigurationField? editorField =
-                        configurationEditor.Fields.SingleOrDefault(x => x.Key == field.Key);
-                    if (editorField == null)
-                    {
-                        continue;
-                    }
-
-                    // run each IValueValidator (with null valueType and dataTypeConfiguration: not relevant here)
-                    foreach (IValueValidator validator in editorField.Validators)
-                    {
-                        foreach (ValidationResult result in validator.Validate(field.Value, null, null))
-                        {
-                            context.ModelState.AddValidationError(result, "Properties", field.Key ?? string.Empty);
-                        }
-                    }
-                }
-            }
-
-            if (context.ModelState.IsValid == false)
-            {
-                // if it is not valid, do not continue and return the model state
-                context.Result = new ValidationErrorResult(context.ModelState);
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttribute.cs
deleted file mode 100644
index df3c08a7bc..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttribute.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System.Collections;
-using System.Globalization;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     This inspects the result of the action that returns a collection of content and removes
-///     any item that the current user doesn't have access to
-/// </summary>
-internal sealed class FilterAllowedOutgoingContentAttribute : TypeFilterAttribute
-{
-    internal FilterAllowedOutgoingContentAttribute(Type outgoingType)
-        : this(outgoingType, null, ActionBrowse.ActionLetter)
-    {
-    }
-
-    internal FilterAllowedOutgoingContentAttribute(Type outgoingType, char permissionToCheck)
-        : this(outgoingType, null, permissionToCheck)
-    {
-    }
-
-    internal FilterAllowedOutgoingContentAttribute(Type outgoingType, string propertyName)
-        : this(outgoingType, propertyName, ActionBrowse.ActionLetter)
-    {
-    }
-
-    internal FilterAllowedOutgoingContentAttribute(Type outgoingType, IUserService userService, IEntityService entityService)
-        : this(outgoingType, null, ActionBrowse.ActionLetter)
-    {
-    }
-
-    public FilterAllowedOutgoingContentAttribute(Type outgoingType, string? propertyName, char permissionToCheck)
-        : base(typeof(FilterAllowedOutgoingContentFilter)) =>
-        Arguments = new object[] { outgoingType, propertyName ?? string.Empty, permissionToCheck };
-}
-
-internal sealed class FilterAllowedOutgoingContentFilter : FilterAllowedOutgoingMediaFilter
-{
-    private readonly AppCaches _appCaches;
-    private readonly IEntityService _entityService;
-    private readonly char _permissionToCheck;
-    private readonly IUserService _userService;
-
-    public FilterAllowedOutgoingContentFilter(
-        Type outgoingType,
-        string propertyName,
-        char permissionToCheck,
-        IUserService userService,
-        IEntityService entityService,
-        AppCaches appCaches,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor)
-        : base(entityService, backofficeSecurityAccessor, appCaches, outgoingType, propertyName)
-    {
-        _permissionToCheck = permissionToCheck;
-        _userService = userService;
-        _entityService = entityService;
-        _appCaches = appCaches;
-    }
-
-    protected override int RecycleBinId => Constants.System.RecycleBinContent;
-
-    protected override void FilterItems(IUser user, IList items)
-    {
-        base.FilterItems(user, items);
-
-        FilterBasedOnPermissions(items, user);
-    }
-
-    protected override int[]? GetUserStartNodes(IUser user) =>
-        user.CalculateContentStartNodeIds(_entityService, _appCaches);
-
-    internal void FilterBasedOnPermissions(IList items, IUser user)
-    {
-        var length = items.Count;
-
-        if (length > 0)
-        {
-            var ids = new List<int>();
-            for (var i = 0; i < length; i++)
-            {
-                ids.Add(((dynamic)items[i]!).Id);
-            }
-
-            //get all the permissions for these nodes in one call
-            EntityPermissionCollection permissions = _userService.GetPermissions(user, ids.ToArray());
-            var toRemove = new List<dynamic>();
-            foreach (dynamic item in items)
-            {
-                //get the combined permission set across all user groups for this node
-                //we're in the world of dynamics here so we need to cast
-                var nodePermission = ((IEnumerable<string>)permissions.GetAllPermissions(item.Id)).ToArray();
-
-                //if the permission being checked doesn't exist then remove the item
-                if (nodePermission.Contains(_permissionToCheck.ToString(CultureInfo.InvariantCulture)) == false)
-                {
-                    toRemove.Add(item);
-                }
-            }
-
-            foreach (dynamic item in toRemove)
-            {
-                items.Remove(item);
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs
deleted file mode 100644
index c456d62a7a..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using System.Collections;
-using System.Reflection;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Composing;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     This inspects the result of the action that returns a collection of content and removes
-///     any item that the current user doesn't have access to
-/// </summary>
-internal class FilterAllowedOutgoingMediaAttribute : TypeFilterAttribute
-{
-    public FilterAllowedOutgoingMediaAttribute(Type outgoingType, string? propertyName = null)
-        : base(typeof(FilterAllowedOutgoingMediaFilter)) =>
-        Arguments = new object[] { outgoingType, propertyName ?? string.Empty };
-}
-
-internal class FilterAllowedOutgoingMediaFilter : IActionFilter
-{
-    private readonly AppCaches _appCaches;
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IEntityService _entityService;
-    private readonly Type _outgoingType;
-    private readonly string _propertyName;
-
-    public FilterAllowedOutgoingMediaFilter(
-        IEntityService entityService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        AppCaches appCaches,
-        Type outgoingType,
-        string propertyName)
-    {
-        _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
-        _backofficeSecurityAccessor = backofficeSecurityAccessor ??
-                                      throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
-        _appCaches = appCaches;
-
-        _propertyName = propertyName;
-        _outgoingType = outgoingType;
-    }
-
-    protected virtual int RecycleBinId => Constants.System.RecycleBinMedia;
-
-    public void OnActionExecuted(ActionExecutedContext context)
-    {
-        if (context.Result == null)
-        {
-            return;
-        }
-
-        IUser? user = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-        if (user == null)
-        {
-            return;
-        }
-
-        if (context.Result is ObjectResult objectContent)
-        {
-            dynamic? collection = GetValueFromResponse(objectContent);
-
-            if (collection != null)
-            {
-                var items = Enumerable.ToList(collection);
-
-                FilterItems(user, items);
-
-                //set the return value
-                SetValueForResponse(objectContent, items);
-            }
-        }
-    }
-
-
-    public void OnActionExecuting(ActionExecutingContext context)
-    {
-    }
-
-    protected virtual int[]? GetUserStartNodes(IUser user) =>
-        user.CalculateMediaStartNodeIds(_entityService, _appCaches);
-
-    protected virtual void FilterItems(IUser user, IList items) => FilterBasedOnStartNode(items, user);
-
-    internal void FilterBasedOnStartNode(IList items, IUser user)
-    {
-        var toRemove = new List<dynamic>();
-        foreach (dynamic item in items)
-        {
-            dynamic hasPathAccess = item != null &&
-                                ContentPermissions.HasPathAccess(item?.Path, GetUserStartNodes(user), RecycleBinId);
-            if (hasPathAccess == false)
-            {
-                toRemove.Add(item);
-            }
-        }
-
-        foreach (dynamic item in toRemove)
-        {
-            items.Remove(item);
-        }
-    }
-
-    private void SetValueForResponse(ObjectResult objectContent, dynamic newVal)
-    {
-        if (TypeHelper.IsTypeAssignableFrom(_outgoingType, objectContent.Value?.GetType()))
-        {
-            objectContent.Value = newVal;
-        }
-        else if (_propertyName.IsNullOrWhiteSpace() == false)
-        {
-            //try to get the enumerable collection from a property on the result object using reflection
-            PropertyInfo? property = objectContent.Value?.GetType().GetProperty(_propertyName);
-            if (property != null)
-            {
-                property.SetValue(objectContent.Value, newVal);
-            }
-        }
-    }
-
-    internal dynamic? GetValueFromResponse(ObjectResult objectContent)
-    {
-        if (TypeHelper.IsTypeAssignableFrom(_outgoingType, objectContent.Value?.GetType()))
-        {
-            return objectContent.Value;
-        }
-
-        if (_propertyName.IsNullOrWhiteSpace() == false)
-        {
-            //try to get the enumerable collection from a property on the result object using reflection
-            PropertyInfo? property = objectContent.Value?.GetType().GetProperty(_propertyName);
-            if (property != null)
-            {
-                var result = property.GetValue(objectContent.Value);
-                if (result != null && TypeHelper.IsTypeAssignableFrom(_outgoingType, result.GetType()))
-                {
-                    return result;
-                }
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/IsCurrentUserModelFilterAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/IsCurrentUserModelFilterAttribute.cs
deleted file mode 100644
index ab8fc1aa03..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/IsCurrentUserModelFilterAttribute.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-internal class IsCurrentUserModelFilterAttribute : TypeFilterAttribute
-{
-    public IsCurrentUserModelFilterAttribute() : base(typeof(IsCurrentUserModelFilter))
-    {
-    }
-
-    private class IsCurrentUserModelFilter : IActionFilter
-    {
-        private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-
-        public IsCurrentUserModelFilter(IBackOfficeSecurityAccessor backofficeSecurityAccessor) =>
-            _backofficeSecurityAccessor = backofficeSecurityAccessor;
-
-
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-            if (context.Result == null)
-            {
-                return;
-            }
-
-            IUser? user = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-            if (user == null)
-            {
-                return;
-            }
-
-            if (context.Result is ObjectResult objectContent)
-            {
-                if (objectContent.Value is UserBasic model)
-                {
-                    model.IsCurrentUser = (int?)model.Id == user.Id;
-                }
-                else
-                {
-                    if (objectContent.Value is IEnumerable<UserBasic> collection)
-                    {
-                        foreach (UserBasic userBasic in collection)
-                        {
-                            userBasic.IsCurrentUser = (int?)userBasic.Id == user.Id;
-                        }
-                    }
-                    else
-                    {
-                        if (objectContent.Value is UsersController.PagedUserResult paged && paged.Items != null)
-                        {
-                            foreach (UserBasic userBasic in paged.Items)
-                            {
-                                userBasic.IsCurrentUser = (int?)userBasic.Id == user.Id;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs
deleted file mode 100644
index d421a0aa40..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Buffers;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using Umbraco.Cms.Web.Common.Formatters;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-public class JsonCamelCaseFormatterAttribute : TypeFilterAttribute
-{
-    public JsonCamelCaseFormatterAttribute() : base(typeof(JsonCamelCaseFormatterFilter)) =>
-        Order = 2; //must be higher than AngularJsonOnlyConfigurationAttribute.Order
-
-    private class JsonCamelCaseFormatterFilter : IResultFilter
-    {
-        private readonly ArrayPool<char> _arrayPool;
-        private readonly MvcOptions _options;
-
-        public JsonCamelCaseFormatterFilter(ArrayPool<char> arrayPool, IOptionsSnapshot<MvcOptions> options)
-        {
-            _arrayPool = arrayPool;
-            _options = options.Value;
-        }
-
-        public void OnResultExecuted(ResultExecutedContext context)
-        {
-        }
-
-        public void OnResultExecuting(ResultExecutingContext context)
-        {
-            if (context.Result is ObjectResult objectResult)
-            {
-                var serializerSettings = new JsonSerializerSettings
-                {
-                    ContractResolver = new CamelCasePropertyNamesContractResolver()
-                };
-
-                objectResult.Formatters.Clear();
-                objectResult.Formatters.Add(
-                    new AngularJsonMediaTypeFormatter(serializerSettings, _arrayPool, _options));
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs
deleted file mode 100644
index 222efcd8f3..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     Validates the incoming <see cref="MediaItemSave" /> model
-/// </summary>
-internal class MediaItemSaveValidationAttribute : TypeFilterAttribute
-{
-    public MediaItemSaveValidationAttribute() : base(typeof(MediaItemSaveValidationFilter))
-    {
-    }
-
-    private sealed class MediaItemSaveValidationFilter : IAsyncActionFilter
-    {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly ILoggerFactory _loggerFactory;
-        private readonly IMediaService _mediaService;
-        private readonly IPropertyValidationService _propertyValidationService;
-
-        public MediaItemSaveValidationFilter(
-            ILoggerFactory loggerFactory,
-            IMediaService mediaService,
-            IPropertyValidationService propertyValidationService,
-            IAuthorizationService authorizationService)
-        {
-            _loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
-            _mediaService = mediaService ?? throw new ArgumentNullException(nameof(mediaService));
-            _propertyValidationService = propertyValidationService ??
-                                         throw new ArgumentNullException(nameof(propertyValidationService));
-            _authorizationService =
-                authorizationService ?? throw new ArgumentNullException(nameof(authorizationService));
-        }
-
-        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
-        {
-            // on executing...
-            await OnActionExecutingAsync(context);
-
-            if (context.Result == null)
-            {
-                //need to pass the execution to next if a result was not set
-                await next();
-            }
-
-            // on executed...
-        }
-
-        private async Task OnActionExecutingAsync(ActionExecutingContext context)
-        {
-            var model = (MediaItemSave?)context.ActionArguments["contentItem"];
-            var contentItemValidator =
-                new MediaSaveModelValidator(_loggerFactory.CreateLogger<MediaSaveModelValidator>(), _propertyValidationService);
-
-            if (await ValidateUserAccessAsync(model, context))
-            {
-                //now do each validation step
-                if (contentItemValidator.ValidateExistingContent(model, context))
-                {
-                    if (contentItemValidator.ValidateProperties(model, model, context))
-                    {
-                        contentItemValidator.ValidatePropertiesData(model, model, model?.PropertyCollectionDto, context.ModelState);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        ///     Checks if the user has access to post a content item based on whether it's being created or saved.
-        /// </summary>
-        /// <param name="mediaItem"></param>
-        /// <param name="actionContext"></param>
-        private async Task<bool> ValidateUserAccessAsync(MediaItemSave? mediaItem, ActionExecutingContext actionContext)
-        {
-            //We now need to validate that the user is allowed to be doing what they are doing.
-            //Then if it is new, we need to lookup those permissions on the parent.
-            IMedia? contentToCheck;
-            int contentIdToCheck;
-            switch (mediaItem?.Action)
-            {
-                case ContentSaveAction.Save:
-                    contentToCheck = mediaItem.PersistedContent;
-                    contentIdToCheck = contentToCheck?.Id ?? default;
-                    break;
-                case ContentSaveAction.SaveNew:
-                    contentToCheck = _mediaService.GetById(mediaItem.ParentId);
-
-                    if (mediaItem.ParentId != Constants.System.Root)
-                    {
-                        contentToCheck = _mediaService.GetById(mediaItem.ParentId);
-                        contentIdToCheck = contentToCheck?.Id ?? default;
-                    }
-                    else
-                    {
-                        contentIdToCheck = mediaItem.ParentId;
-                    }
-
-                    break;
-                default:
-                    //we don't support this for media
-                    actionContext.Result = new NotFoundResult();
-                    return false;
-            }
-
-            MediaPermissionsResource resource = contentToCheck == null
-                ? new MediaPermissionsResource(contentIdToCheck)
-                : new MediaPermissionsResource(contentToCheck);
-
-            AuthorizationResult authorizationResult = await _authorizationService.AuthorizeAsync(
-                actionContext.HttpContext.User,
-                resource,
-                AuthorizationPolicies.MediaPermissionByResource);
-
-            if (!authorizationResult.Succeeded)
-            {
-                actionContext.Result = new ForbidResult();
-                return false;
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/MediaSaveModelValidator.cs b/src/Umbraco.Web.BackOffice/Filters/MediaSaveModelValidator.cs
deleted file mode 100644
index 3847673191..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/MediaSaveModelValidator.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Services;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     Validator for <see cref="MediaItemSave" />
-/// </summary>
-internal class
-    MediaSaveModelValidator : ContentModelValidator<IMedia, MediaItemSave, IContentProperties<ContentPropertyBasic>>
-{
-    public MediaSaveModelValidator(
-        ILogger<MediaSaveModelValidator> logger,
-        IPropertyValidationService propertyValidationService)
-        : base(logger, propertyValidationService)
-    {
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/MemberSaveModelValidator.cs b/src/Umbraco.Web.BackOffice/Filters/MemberSaveModelValidator.cs
deleted file mode 100644
index 6b29803e05..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/MemberSaveModelValidator.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     Validator for <see cref="ContentItemSave" />
-/// </summary>
-internal class
-    MemberSaveModelValidator : ContentModelValidator<IMember, MemberSave, IContentProperties<ContentPropertyBasic>>
-{
-    private readonly IBackOfficeSecurity? _backofficeSecurity;
-    private readonly IMemberService _memberService;
-    private readonly IMemberTypeService _memberTypeService;
-    private readonly IShortStringHelper _shortStringHelper;
-
-    public MemberSaveModelValidator(
-        ILogger<MemberSaveModelValidator> logger,
-        IBackOfficeSecurity? backofficeSecurity,
-        IMemberTypeService memberTypeService,
-        IMemberService memberService,
-        IShortStringHelper shortStringHelper,
-        IPropertyValidationService propertyValidationService)
-        : base(logger, propertyValidationService)
-    {
-        _backofficeSecurity = backofficeSecurity;
-        _memberTypeService = memberTypeService ?? throw new ArgumentNullException(nameof(memberTypeService));
-        _memberService = memberService ?? throw new ArgumentNullException(nameof(memberService));
-        _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
-    }
-
-    public override bool ValidatePropertiesData(
-        MemberSave? model,
-        IContentProperties<ContentPropertyBasic>? modelWithProperties,
-        ContentPropertyCollectionDto? dto,
-        ModelStateDictionary modelState)
-    {
-        if (model is null)
-        {
-            return false;
-        }
-
-        if (model.Username.IsNullOrWhiteSpace())
-        {
-            modelState.AddPropertyError(
-                new ValidationResult("Invalid user name", new[] { "value" }),
-                $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}login");
-        }
-
-        if (model.Email.IsNullOrWhiteSpace() || new EmailAddressAttribute().IsValid(model.Email) == false)
-        {
-            modelState.AddPropertyError(
-                new ValidationResult("Invalid email", new[] { "value" }),
-                $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}email");
-        }
-
-        var validEmail = ValidateUniqueEmail(model);
-        if (validEmail == false)
-        {
-            modelState.AddPropertyError(
-                new ValidationResult("Email address is already in use", new[] { "value" }),
-                $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}email");
-        }
-
-        var validLogin = ValidateUniqueLogin(model);
-        if (validLogin == false)
-        {
-            modelState.AddPropertyError(
-                new ValidationResult("Username is already in use", new[] { "value" }),
-                $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}login");
-        }
-
-        return base.ValidatePropertiesData(model, modelWithProperties, dto, modelState);
-    }
-
-    /// <summary>
-    ///     This ensures that the internal membership property types are removed from validation before processing the
-    ///     validation
-    ///     since those properties are actually mapped to real properties of the IMember.
-    ///     This also validates any posted data for fields that are sensitive.
-    /// </summary>
-    /// <param name="model"></param>
-    /// <param name="modelWithProperties"></param>
-    /// <param name="actionContext"></param>
-    /// <returns></returns>
-    public override bool ValidateProperties(MemberSave? model, IContentProperties<ContentPropertyBasic>? modelWithProperties, ActionExecutingContext actionContext)
-    {
-        var propertiesToValidate = model?.Properties.ToList();
-        Dictionary<string, PropertyType> defaultProps =
-            ConventionsHelper.GetStandardPropertyTypeStubs(_shortStringHelper);
-        var exclude = defaultProps.Select(x => x.Value.Alias).ToArray();
-        foreach (var remove in exclude)
-        {
-            propertiesToValidate?.RemoveAll(property => property.Alias == remove);
-        }
-
-        //if the user doesn't have access to sensitive values, then we need to validate the incoming properties to check
-        //if a sensitive value is being submitted.
-        if (_backofficeSecurity?.CurrentUser?.HasAccessToSensitiveData() == false)
-        {
-            IMemberType? contentType = _memberTypeService.Get(model?.PersistedContent?.ContentTypeId ?? default);
-            var sensitiveProperties = contentType?
-                .PropertyTypes.Where(x => contentType.IsSensitiveProperty(x.Alias))
-                .ToList();
-
-            if (sensitiveProperties is not null)
-            {
-                foreach (IPropertyType sensitiveProperty in sensitiveProperties)
-                {
-                    ContentPropertyBasic? prop =
-                        propertiesToValidate?.FirstOrDefault(x => x.Alias == sensitiveProperty.Alias);
-
-                    if (prop != null)
-                    {
-                        //this should not happen, this means that there was data posted for a sensitive property that
-                        //the user doesn't have access to, which means that someone is trying to hack the values.
-
-                        var message = $"property with alias: {prop.Alias} cannot be posted";
-                        actionContext.Result = new NotFoundObjectResult(new InvalidOperationException(message));
-                        return false;
-                    }
-                }
-            }
-        }
-
-        return ValidateProperties(propertiesToValidate, model?.PersistedContent?.Properties.ToList(), actionContext);
-    }
-
-    internal bool ValidateUniqueLogin(MemberSave model)
-    {
-        if (model == null)
-        {
-            throw new ArgumentNullException(nameof(model));
-        }
-
-        IMember? existingByName = _memberService.GetByUsername(model.Username.Trim());
-        switch (model.Action)
-        {
-            case ContentSaveAction.Save:
-
-                //ok, we're updating the member, we need to check if they are changing their login and if so, does it exist already ?
-                if (model.PersistedContent?.Username.InvariantEquals(model.Username.Trim()) == false)
-                {
-                    //they are changing their login name
-                    if (existingByName != null && existingByName.Username == model.Username.Trim())
-                    {
-                        //the user cannot use this login
-                        return false;
-                    }
-                }
-
-                break;
-            case ContentSaveAction.SaveNew:
-                //check if the user's login already exists
-                if (existingByName != null && existingByName.Username == model.Username.Trim())
-                {
-                    //the user cannot use this login
-                    return false;
-                }
-
-                break;
-            default:
-                //we don't support this for members
-                throw new ArgumentOutOfRangeException();
-        }
-
-        return true;
-    }
-
-    internal bool ValidateUniqueEmail(MemberSave model)
-    {
-        if (model == null)
-        {
-            throw new ArgumentNullException(nameof(model));
-        }
-
-        IMember? existingByEmail = _memberService.GetByEmail(model.Email.Trim());
-        switch (model.Action)
-        {
-            case ContentSaveAction.Save:
-                //ok, we're updating the member, we need to check if they are changing their email and if so, does it exist already ?
-                if (model.PersistedContent?.Email.InvariantEquals(model.Email.Trim()) == false)
-                {
-                    //they are changing their email
-                    if (existingByEmail != null && existingByEmail.Email.InvariantEquals(model.Email.Trim()))
-                    {
-                        //the user cannot use this email
-                        return false;
-                    }
-                }
-
-                break;
-            case ContentSaveAction.SaveNew:
-                //check if the user's email already exists
-                if (existingByEmail != null && existingByEmail.Email.InvariantEquals(model.Email.Trim()))
-                {
-                    //the user cannot use this email
-                    return false;
-                }
-
-                break;
-            default:
-                //we don't support this for members
-                throw new ArgumentOutOfRangeException();
-        }
-
-        return true;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/MemberSaveValidationAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/MemberSaveValidationAttribute.cs
deleted file mode 100644
index 61e119b66a..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/MemberSaveValidationAttribute.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     Validates the incoming <see cref="MemberSave" /> model
-/// </summary>
-internal sealed class MemberSaveValidationAttribute : TypeFilterAttribute
-{
-    public MemberSaveValidationAttribute() : base(typeof(MemberSaveValidationFilter))
-    {
-    }
-
-    private sealed class MemberSaveValidationFilter : IActionFilter
-    {
-        private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-        private readonly ILoggerFactory _loggerFactory;
-        private readonly IMemberService _memberService;
-        private readonly IMemberTypeService _memberTypeService;
-        private readonly IPropertyValidationService _propertyValidationService;
-        private readonly IShortStringHelper _shortStringHelper;
-
-        public MemberSaveValidationFilter(
-            ILoggerFactory loggerFactory,
-            IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-            IMemberTypeService memberTypeService,
-            IMemberService memberService,
-            IShortStringHelper shortStringHelper,
-            IPropertyValidationService propertyValidationService)
-        {
-            _loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
-            _backofficeSecurityAccessor = backofficeSecurityAccessor ??
-                                          throw new ArgumentNullException(nameof(backofficeSecurityAccessor));
-            _memberTypeService = memberTypeService ?? throw new ArgumentNullException(nameof(memberTypeService));
-            _memberService = memberService ?? throw new ArgumentNullException(nameof(memberService));
-            _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
-            _propertyValidationService = propertyValidationService ??
-                                         throw new ArgumentNullException(nameof(propertyValidationService));
-        }
-
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-            var model = (MemberSave?)context.ActionArguments["contentItem"];
-            var contentItemValidator = new MemberSaveModelValidator(
-                _loggerFactory.CreateLogger<MemberSaveModelValidator>(),
-                _backofficeSecurityAccessor.BackOfficeSecurity,
-                _memberTypeService,
-                _memberService,
-                _shortStringHelper,
-                _propertyValidationService);
-            //now do each validation step
-            if (contentItemValidator.ValidateExistingContent(model, context))
-            {
-                if (contentItemValidator.ValidateProperties(model, model, context))
-                {
-                    contentItemValidator.ValidatePropertiesData(model, model, model?.PropertyCollectionDto, context.ModelState);
-                }
-            }
-        }
-
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs
deleted file mode 100644
index 0e11dd9fc3..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.WebAssets;
-using Umbraco.Cms.Web.BackOffice.ActionResults;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-public class MinifyJavaScriptResultAttribute : ActionFilterAttribute
-{
-    public override async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
-    {
-        // logic before action goes here
-        IServiceProvider serviceProvider = context.HttpContext.RequestServices;
-        IHostingEnvironment? hostingEnvironment = serviceProvider.GetService<IHostingEnvironment>();
-        if (!hostingEnvironment?.IsDebugMode ?? false)
-        {
-            IRuntimeMinifier? runtimeMinifier = serviceProvider.GetService<IRuntimeMinifier>();
-
-            if (context.Result is JavaScriptResult jsResult)
-            {
-                var result = jsResult.Content;
-                if (runtimeMinifier is not null)
-                {
-                    var minified = await runtimeMinifier.MinifyAsync(result, AssetType.Javascript);
-                    jsResult.Content = minified;
-                }
-            }
-        }
-
-        await next(); // the actual action
-
-        // logic after the action goes here
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/OutgoingEditorModelEventAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/OutgoingEditorModelEventAttribute.cs
deleted file mode 100644
index 61201bfb4f..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/OutgoingEditorModelEventAttribute.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using System.Collections;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Notifications;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Web;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     Used to emit outgoing editor model events
-/// </summary>
-internal sealed class OutgoingEditorModelEventAttribute : TypeFilterAttribute
-{
-    public OutgoingEditorModelEventAttribute() : base(typeof(OutgoingEditorModelEventFilter))
-    {
-    }
-
-
-    private class OutgoingEditorModelEventFilter : IActionFilter
-    {
-        private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-        private readonly IEventAggregator _eventAggregator;
-        private readonly IUmbracoMapper _mapper;
-        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-
-        [ActivatorUtilitiesConstructor]
-        public OutgoingEditorModelEventFilter(
-            IUmbracoContextAccessor umbracoContextAccessor,
-            IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-            IEventAggregator eventAggregator,
-            IUmbracoMapper mapper)
-        {
-            _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
-            _backOfficeSecurityAccessor = backOfficeSecurityAccessor ?? throw new ArgumentNullException(nameof(backOfficeSecurityAccessor));
-            _eventAggregator = eventAggregator ?? throw new ArgumentNullException(nameof(eventAggregator));
-            _mapper = mapper;
-        }
-
-        [Obsolete("Please use constructor that takes an IUmbracoMapper, scheduled for removal in V12")]
-        public OutgoingEditorModelEventFilter(
-            IUmbracoContextAccessor umbracoContextAccessor,
-            IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-            IEventAggregator eventAggregator)
-        : this(
-            umbracoContextAccessor,
-            backOfficeSecurityAccessor,
-            eventAggregator,
-            StaticServiceProvider.Instance.GetRequiredService<IUmbracoMapper>())
-        {
-        }
-
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-            if (context.Result == null)
-            {
-                return;
-            }
-
-            IUmbracoContext umbracoContext = _umbracoContextAccessor.GetRequiredUmbracoContext();
-            IUser? currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
-            if (currentUser == null)
-            {
-                return;
-            }
-
-            if (context.Result is ObjectResult objectContent)
-            {
-                // Support both batch (dictionary) and single results
-                IEnumerable models;
-                if (objectContent.Value is IDictionary modelDictionary)
-                {
-                    models = modelDictionary.Values;
-                }
-                else
-                {
-                    models = new[] { objectContent.Value };
-                }
-
-                foreach (var model in models)
-                {
-                    switch (model)
-                    {
-                        case ContentItemDisplay content:
-                            _eventAggregator.Publish(new SendingContentNotification(content, umbracoContext));
-                            break;
-
-                            case ContentItemDisplayWithSchedule contentWithSchedule:
-                            // This is a bit weird, since ContentItemDisplayWithSchedule was introduced later,
-                            // the SendingContentNotification only accepts ContentItemDisplay,
-                            // which means we have to map it to this before sending the notification.
-                            ContentItemDisplay? display = _mapper.Map<ContentItemDisplayWithSchedule, ContentItemDisplay>(contentWithSchedule);
-                            if (display is null)
-                            {
-                                // This will never happen.
-                                break;
-                            }
-
-                            // Now that the display is mapped to the non-schedule one we can publish the notification.
-                            _eventAggregator.Publish(new SendingContentNotification(display, umbracoContext));
-
-                            // We want the changes the handler makes to take effect.
-                            // So we have to map these changes back to the existing ContentItemWithSchedule.
-                            // To avoid losing the schedule information we add the old variants to context.
-                            _mapper.Map(display, contentWithSchedule, mapperContext => mapperContext.Items[nameof(contentWithSchedule.Variants)] = contentWithSchedule.Variants);
-                            break;
-                        case MediaItemDisplay media:
-                                _eventAggregator.Publish(new SendingMediaNotification(media, umbracoContext));
-                                break;
-                            case MemberDisplay member:
-                                _eventAggregator.Publish(new SendingMemberNotification(member, umbracoContext));
-                                break;
-                            case UserDisplay user:
-                                _eventAggregator.Publish(new SendingUserNotification(user, umbracoContext));
-                                break;
-                            case IEnumerable<ContentTypeBasic> allowedChildren:
-                                // Changing the Enumerable will generate a new instance, so we need to update the context result with the new content
-                                var notification = new SendingAllowedChildrenNotification(allowedChildren, umbracoContext);
-                                _eventAggregator.Publish(notification);
-                                context.Result = new ObjectResult(notification.Children);
-                                break;
-                        }
-                    }
-                }
-            }
-
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/PrefixlessBodyModelValidatorAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/PrefixlessBodyModelValidatorAttribute.cs
deleted file mode 100644
index a2bccb9814..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/PrefixlessBodyModelValidatorAttribute.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     Applying this attribute to any controller will ensure that the parameter name (prefix) is not part of the
-///     validation error keys.
-/// </summary>
-public class PrefixlessBodyModelValidatorAttribute : TypeFilterAttribute
-{
-    //TODO: Could be a better solution to replace the IModelValidatorProvider and ensure the errors are created
-    //without the prefix, instead of removing it afterwards. But I couldn't find any way to do this for only some
-    //of the controllers. IObjectModelValidator seems to be the interface to implement and replace in the container
-    //to handle it for the entire solution.
-    public PrefixlessBodyModelValidatorAttribute() : base(typeof(PrefixlessBodyModelValidatorFilter))
-    {
-    }
-
-    private class PrefixlessBodyModelValidatorFilter : IActionFilter
-    {
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-        }
-
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-            if (context.ModelState.IsValid)
-            {
-                return;
-            }
-
-            //Remove prefix from errors
-            foreach (KeyValuePair<string, ModelStateEntry> modelStateItem in context.ModelState)
-            {
-                foreach (var prefix in context.ActionArguments.Keys)
-                {
-                    if (modelStateItem.Key.StartsWith(prefix))
-                    {
-                        if (modelStateItem.Value.Errors.Any())
-                        {
-                            var newKey = modelStateItem.Key.Substring(prefix.Length).TrimStart('.');
-                            foreach (ModelError valueError in modelStateItem.Value.Errors)
-                            {
-                                context.ModelState.TryAddModelError(newKey, valueError.ErrorMessage);
-                            }
-
-                            context.ModelState.Remove(modelStateItem.Key);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/SetAngularAntiForgeryTokensAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/SetAngularAntiForgeryTokensAttribute.cs
deleted file mode 100644
index da58cf0b3a..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/SetAngularAntiForgeryTokensAttribute.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Umbraco.Cms.Web.BackOffice.Security;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     An attribute/filter to set the csrf cookie token based on angular conventions
-/// </summary>
-public class SetAngularAntiForgeryTokensAttribute : TypeFilterAttribute
-{
-    public SetAngularAntiForgeryTokensAttribute() : base(typeof(SetAngularAntiForgeryTokensFilter))
-    {
-    }
-
-    internal class SetAngularAntiForgeryTokensFilter : IAsyncActionFilter
-    {
-        private readonly IBackOfficeAntiforgery _antiforgery;
-
-        public SetAngularAntiForgeryTokensFilter(IBackOfficeAntiforgery antiforgery)
-            => _antiforgery = antiforgery;
-
-        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
-        {
-            await next();
-
-            // anti forgery tokens are based on the currently logged
-            // in user assigned to the HttpContext which will be assigned during signin so
-            // we can only execute after the action.
-            if (context.HttpContext.Response?.StatusCode == (int)HttpStatusCode.OK)
-            {
-                _antiforgery.GetAndStoreTokens(context.HttpContext);
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/UmbracoRequireHttpsAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/UmbracoRequireHttpsAttribute.cs
deleted file mode 100644
index 6857f9be8e..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/UmbracoRequireHttpsAttribute.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Configuration.Models;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     If Umbraco.Core.UseHttps property in web.config is set to true, this filter will redirect any http access to https.
-/// </summary>
-public class UmbracoRequireHttpsAttribute : RequireHttpsAttribute
-{
-    protected override void HandleNonHttpsRequest(AuthorizationFilterContext filterContext)
-    {
-        // just like the base class does, we'll just resolve the required services from the httpcontext.
-        // we want to re-use their code so we don't have much choice, else we have to do some code tricks,
-        // this is just easiest.
-        IOptionsSnapshot<GlobalSettings> optionsAccessor = filterContext.HttpContext.RequestServices
-            .GetRequiredService<IOptionsSnapshot<GlobalSettings>>();
-        if (optionsAccessor.Value.UseHttps)
-        {
-            // only continue if this flag is set
-            base.HandleNonHttpsRequest(filterContext);
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerFilter.cs b/src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerFilter.cs
deleted file mode 100644
index 2abcaff85f..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/UnhandledExceptionLoggerFilter.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     Applies the UnhandledExceptionLoggerMiddleware to a specific controller
-///     when used with this attribute [MiddlewareFilter(typeof(UnhandledExceptionLoggerFilter))]
-///     The middleware will run in the filter pipeline, at the same stage as resource filters
-/// </summary>
-public class UnhandledExceptionLoggerFilter
-{
-    public void Configure(IApplicationBuilder applicationBuilder) =>
-        applicationBuilder.UseMiddleware<UnhandledExceptionLoggerMiddleware>();
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs
deleted file mode 100644
index 77f87c449c..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Web.BackOffice.ActionResults;
-using Umbraco.Cms.Web.Common.ActionsResults;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-internal sealed class UserGroupValidateAttribute : TypeFilterAttribute
-{
-    public UserGroupValidateAttribute() : base(typeof(UserGroupValidateFilter))
-    {
-    }
-
-    private class UserGroupValidateFilter : IActionFilter
-    {
-        private readonly IShortStringHelper _shortStringHelper;
-        private readonly IUserGroupService _userGroupService;
-
-        public UserGroupValidateFilter(
-            IUserGroupService userGroupService,
-            IShortStringHelper shortStringHelper)
-        {
-            ArgumentNullException.ThrowIfNull(userGroupService);
-            _userGroupService = userGroupService;
-            _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
-        }
-
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-            var userGroupSave = (UserGroupSave?)context.ActionArguments["userGroupSave"];
-
-            if (userGroupSave is not null)
-            {
-                userGroupSave.Name = userGroupSave.Name?.CleanForXss('[', ']', '(', ')', ':');
-                userGroupSave.Alias = userGroupSave.Alias.CleanForXss('[', ']', '(', ')', ':');
-            }
-
-            //Validate the usergroup exists or create one if required
-            IUserGroup? persisted;
-            switch (userGroupSave?.Action)
-            {
-                case ContentSaveAction.Save:
-                    persisted = _userGroupService.GetAsync(Convert.ToInt32(userGroupSave.Id)).GetAwaiter().GetResult();
-                    if (persisted == null)
-                    {
-                        var message = $"User group with id: {userGroupSave.Id} was not found";
-                        context.Result = new UmbracoErrorResult(HttpStatusCode.NotFound, message);
-                        return;
-                    }
-
-                    if (persisted.Alias != userGroupSave.Alias && persisted.IsSystemUserGroup())
-                    {
-                        var message = $"User group with alias: {persisted.Alias} cannot be changed";
-                        context.Result = new UmbracoErrorResult(HttpStatusCode.BadRequest, message);
-                        return;
-                    }
-
-                    break;
-                case ContentSaveAction.SaveNew:
-                    persisted = new UserGroup(_shortStringHelper);
-                    break;
-                default:
-                    context.Result =
-                        new UmbracoErrorResult(HttpStatusCode.NotFound, new ArgumentOutOfRangeException());
-                    return;
-            }
-
-            //now assign the persisted entity to the model so we can use it in the action
-            userGroupSave.PersistedUserGroup = persisted;
-
-            IUserGroup? existing = _userGroupService.GetAsync(userGroupSave.Alias).GetAwaiter().GetResult();
-            if (existing != null && existing.Id != userGroupSave.PersistedUserGroup.Id)
-            {
-                context.ModelState.AddModelError("Alias", "A user group with this alias already exists");
-            }
-
-            // TODO: Validate the name is unique?
-
-            if (context.ModelState.IsValid == false)
-            {
-                //if it is not valid, do not continue and return the model state
-                context.Result = new ValidationErrorResult(context.ModelState);
-            }
-        }
-
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs
deleted file mode 100644
index c68f0fb0cf..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Net;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     An attribute/filter to check for the csrf token based on Angular's standard approach
-/// </summary>
-public sealed class ValidateAngularAntiForgeryTokenAttribute : TypeFilterAttribute
-{
-    public ValidateAngularAntiForgeryTokenAttribute()
-        : base(typeof(ValidateAngularAntiForgeryTokenFilter))
-    {
-    }
-
-    private class ValidateAngularAntiForgeryTokenFilter : IAsyncActionFilter
-    {
-        private readonly IBackOfficeAntiforgery _antiforgery;
-
-        public ValidateAngularAntiForgeryTokenFilter(IBackOfficeAntiforgery antiforgery) => _antiforgery = antiforgery;
-
-        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
-        {
-            if (context.Controller is ControllerBase controller &&
-                controller.User.Identity is ClaimsIdentity userIdentity)
-            {
-                // if there is not CookiePath claim, then exit
-                if (userIdentity.HasClaim(x => x.Type == ClaimTypes.CookiePath) == false)
-                {
-                    await next();
-                    return;
-                }
-            }
-
-            HttpContext httpContext = context.HttpContext;
-            Attempt<string?> validateResult = await _antiforgery.ValidateRequestAsync(httpContext);
-            if (!validateResult.Success)
-            {
-                httpContext.SetReasonPhrase(validateResult.Result);
-                context.Result = new StatusCodeResult((int)HttpStatusCode.ExpectationFailed);
-                return;
-            }
-
-            await next();
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Filters/ValidationFilterAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/ValidationFilterAttribute.cs
deleted file mode 100644
index 61e4f53867..0000000000
--- a/src/Umbraco.Web.BackOffice/Filters/ValidationFilterAttribute.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-
-namespace Umbraco.Cms.Web.BackOffice.Filters;
-
-/// <summary>
-///     An action filter used to do basic validation against the model and return a result
-///     straight away if it fails.
-/// </summary>
-internal sealed class ValidationFilterAttribute : ActionFilterAttribute
-{
-    public override void OnActionExecuting(ActionExecutingContext context)
-    {
-        ModelStateDictionary modelState = context.ModelState;
-        if (!modelState.IsValid)
-        {
-            context.Result = new BadRequestObjectResult(modelState);
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs b/src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs
deleted file mode 100644
index 1880b26ced..0000000000
--- a/src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.HealthChecks;
-using Umbraco.Cms.Core.Notifications;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.HealthChecks;
-
-/// <summary>
-///     The API controller used to display the health check info and execute any actions
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessSettings)]
-public class HealthCheckController : UmbracoAuthorizedJsonController
-{
-    private readonly HealthCheckCollection _checks;
-    private readonly IList<Guid> _disabledCheckIds;
-    private readonly ILogger<HealthCheckController> _logger;
-    private readonly IEventAggregator _eventAggregator;
-    private readonly HealthChecksSettings _healthChecksSettings;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="HealthCheckController" /> class.
-    /// </summary>
-    [Obsolete("Use constructor that accepts IEventAggregator as a parameter, scheduled for removal in V14")]
-    public HealthCheckController(HealthCheckCollection checks, ILogger<HealthCheckController> logger, IOptions<HealthChecksSettings> healthChecksSettings)
-        : this(checks, logger, healthChecksSettings, StaticServiceProvider.Instance.GetRequiredService<IEventAggregator>())
-    { }
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="HealthCheckController" /> class.
-    /// </summary>
-    [ActivatorUtilitiesConstructor]
-    public HealthCheckController(HealthCheckCollection checks, ILogger<HealthCheckController> logger, IOptions<HealthChecksSettings> healthChecksSettings, IEventAggregator eventAggregator)
-    {
-        _checks = checks ?? throw new ArgumentNullException(nameof(checks));
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        _eventAggregator = eventAggregator ?? throw new ArgumentException(nameof(eventAggregator));
-        _healthChecksSettings = healthChecksSettings?.Value ?? throw new ArgumentException(nameof(healthChecksSettings));
-
-        HealthChecksSettings healthCheckConfig =
-            healthChecksSettings.Value ?? throw new ArgumentNullException(nameof(healthChecksSettings));
-        _disabledCheckIds = healthCheckConfig.DisabledChecks
-            .Select(x => x.Id)
-            .ToList();
-    }
-
-    /// <summary>
-    ///     Gets a grouped list of health checks, but doesn't actively check the status of each health check.
-    /// </summary>
-    /// <returns>Returns a collection of anonymous objects representing each group.</returns>
-    public object GetAllHealthChecks()
-    {
-        IOrderedEnumerable<IGrouping<string?, HealthCheck>> groups = _checks
-            .Where(x => _disabledCheckIds.Contains(x.Id) == false)
-            .GroupBy(x => x.Group)
-            .OrderBy(x => x.Key);
-        var healthCheckGroups = new List<HealthCheckGroup>();
-        foreach (IGrouping<string?, HealthCheck> healthCheckGroup in groups)
-        {
-            var hcGroup = new HealthCheckGroup
-            {
-                Name = healthCheckGroup.Key,
-                Checks = healthCheckGroup
-                    .OrderBy(x => x.Name)
-                    .ToList()
-            };
-            healthCheckGroups.Add(hcGroup);
-        }
-
-        return healthCheckGroups;
-    }
-
-    /// <summary>
-    ///     Gets the status of the HealthCheck with the specified id.
-    /// </summary>
-    [HttpGet]
-    public async Task<object> GetStatus(Guid id)
-    {
-        HealthCheck check = GetCheckById(id);
-
-        try
-        {
-            if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug))
-            {
-                _logger.LogDebug("Running health check: " + check.Name);
-            }
-
-            if (!_healthChecksSettings.Notification.Enabled)
-            {
-                return await check.GetStatus();
-            }
-
-            HealthCheckResults results = await HealthCheckResults.Create(check);
-            _eventAggregator.Publish(new HealthCheckCompletedNotification(results));
-
-
-            return await check.GetStatus();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Exception in health check: {HealthCheckName}", check.Name);
-            throw;
-        }
-    }
-
-    /// <summary>
-    ///     Executes a given action from a HealthCheck.
-    /// </summary>
-    [HttpPost]
-    public HealthCheckStatus ExecuteAction(HealthCheckAction action)
-    {
-        HealthCheck check = GetCheckById(action.HealthCheckId);
-        return check.ExecuteAction(action);
-    }
-
-    private HealthCheck GetCheckById(Guid? id)
-    {
-        HealthCheck? check = _checks
-            .Where(x => _disabledCheckIds.Contains(x.Id) == false)
-            .FirstOrDefault(x => x.Id == id);
-
-        if (check == null)
-        {
-            throw new InvalidOperationException($"No health check found with id {id}");
-        }
-
-        return check;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Install/InstallApiController.cs b/src/Umbraco.Web.BackOffice/Install/InstallApiController.cs
deleted file mode 100644
index 1125d542da..0000000000
--- a/src/Umbraco.Web.BackOffice/Install/InstallApiController.cs
+++ /dev/null
@@ -1,305 +0,0 @@
-using System.Reflection;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json.Linq;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Install;
-using Umbraco.Cms.Core.Install.Models;
-using Umbraco.Cms.Core.Logging;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Install;
-using Umbraco.Cms.Infrastructure.Migrations.Install;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Cms.Web.Common.ActionsResults;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Filters;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Install;
-
-[Obsolete("Will be replaced with a new API controller in the new backoffice api")]
-[UmbracoApiController]
-[AngularJsonOnlyConfiguration]
-[InstallAuthorize]
-[Area(Constants.Web.Mvc.InstallArea)]
-public class InstallApiController : ControllerBase
-{
-    private readonly DatabaseBuilder _databaseBuilder;
-    private readonly InstallStatusTracker _installStatusTracker;
-    private readonly InstallStepCollection _installSteps;
-    private readonly ILogger<InstallApiController> _logger;
-    private readonly IProfilingLogger _proflog;
-    private readonly IRuntime _runtime;
-
-    [Obsolete("Use the constructor without IBackOfficeUserManager & IBackOfficeSignInManager instead, scheduled for removal in v14")]
-    public InstallApiController(
-        DatabaseBuilder databaseBuilder,
-        IProfilingLogger proflog,
-        ILogger<InstallApiController> logger,
-        InstallHelper installHelper,
-        InstallStepCollection installSteps,
-        InstallStatusTracker installStatusTracker,
-        IRuntime runtime,
-        IBackOfficeUserManager backOfficeUserManager,
-        IBackOfficeSignInManager backOfficeSignInManager)
-        : this(databaseBuilder, proflog, logger, installHelper, installSteps, installStatusTracker, runtime)
-    {
-    }
-
-    [ActivatorUtilitiesConstructor]
-    public InstallApiController(
-        DatabaseBuilder databaseBuilder,
-        IProfilingLogger proflog,
-        ILogger<InstallApiController> logger,
-        InstallHelper installHelper,
-        InstallStepCollection installSteps,
-        InstallStatusTracker installStatusTracker,
-        IRuntime runtime)
-    {
-        _databaseBuilder = databaseBuilder ?? throw new ArgumentNullException(nameof(databaseBuilder));
-        _proflog = proflog ?? throw new ArgumentNullException(nameof(proflog));
-        _installSteps = installSteps;
-        _installStatusTracker = installStatusTracker;
-        _runtime = runtime;
-        InstallHelper = installHelper;
-        _logger = logger;
-    }
-
-
-    internal InstallHelper InstallHelper { get; }
-
-    public bool PostValidateDatabaseConnection(DatabaseModel databaseSettings)
-    {
-        if (_runtime.State.Level != RuntimeLevel.Install)
-        {
-            return false;
-        }
-
-        return _databaseBuilder.ConfigureDatabaseConnection(databaseSettings, true);
-    }
-
-    /// <summary>
-    /// Gets the install setup.
-    /// </summary>
-    public InstallSetup GetSetup()
-    {
-        // Only get the steps that are targeting the current install type
-        var setup = new InstallSetup
-        {
-            Steps = _installSteps.GetStepsForCurrentInstallType().ToList()
-        };
-
-        _installStatusTracker.Initialize(setup.InstallId, setup.Steps);
-
-        return setup;
-    }
-
-    [HttpPost]
-    public async Task<ActionResult> CompleteInstall()
-    {
-        await _runtime.RestartAsync();
-
-        return NoContent();
-    }
-
-    public async Task<ActionResult<InstallProgressResultModel>> PostPerformInstall(InstallInstructions installModel)
-    {
-        if (installModel == null)
-        {
-            throw new ArgumentNullException(nameof(installModel));
-        }
-
-        // There won't be any statuses returned if the app pool has restarted so we need to re-read from file
-        InstallTrackingItem[] status = InstallStatusTracker.GetStatus().ToArray();
-        if (status.Any() == false)
-        {
-            status = _installStatusTracker.InitializeFromFile(installModel.InstallId).ToArray();
-        }
-
-        // Create a new queue of the non-finished ones
-        var queue = new Queue<InstallTrackingItem>(status.Where(x => x.IsComplete == false));
-        while (queue.Count > 0)
-        {
-            InstallTrackingItem item = queue.Dequeue();
-            InstallSetupStep step = _installSteps.GetAllSteps().Single(x => x.Name == item.Name);
-
-            // if this step has any instructions then extract them
-            var instruction = GetInstruction(installModel, item, step);
-
-            // if this step doesn't require execution then continue to the next one, this is just a fail-safe check.
-            if (StepRequiresExecution(step, instruction) == false)
-            {
-                // set this as complete and continue
-                _installStatusTracker.SetComplete(installModel.InstallId, item.Name);
-                continue;
-            }
-
-            try
-            {
-                InstallSetupResult? setupData = await ExecuteStepAsync(step, instruction);
-
-                // update the status
-                _installStatusTracker.SetComplete(installModel.InstallId, step.Name, setupData?.SavedStepData);
-
-                // determine's the next step in the queue and dequeue's any items that don't need to execute
-                var nextStep = IterateSteps(step, queue, installModel.InstallId, installModel);
-                bool processComplete = string.IsNullOrEmpty(nextStep) && InstallStatusTracker.GetStatus().All(x => x.IsComplete);
-
-                // check if there's a custom view to return for this step
-                if (setupData != null && setupData.View.IsNullOrWhiteSpace() == false)
-                {
-                    return new InstallProgressResultModel(processComplete, step.Name, nextStep, setupData.View, setupData.ViewModel);
-                }
-
-                return new InstallProgressResultModel(processComplete, step.Name, nextStep);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "An error occurred during installation step {Step}", step.Name);
-
-                if (ex is TargetInvocationException && ex.InnerException != null)
-                {
-                    ex = ex.InnerException;
-                }
-
-                if (ex is InstallException installException)
-                {
-                    return new ValidationErrorResult(new
-                    {
-                        view = installException.View,
-                        model = installException.ViewModel,
-                        message = installException.Message
-                    });
-                }
-
-                return new ValidationErrorResult(new { step = step.Name, view = "error", message = ex.Message });
-            }
-        }
-
-        _installStatusTracker.Reset();
-        return new InstallProgressResultModel(true, string.Empty, string.Empty);
-    }
-
-    private static object? GetInstruction(InstallInstructions installModel, InstallTrackingItem item, InstallSetupStep step)
-    {
-        object? instruction = null;
-        installModel.Instructions?.TryGetValue(item.Name, out instruction); // else null
-
-        if (instruction is JObject jObject)
-        {
-            instruction = jObject?.ToObject(step.StepType);
-        }
-
-        return instruction;
-    }
-
-    /// <summary>
-    ///     We'll peek ahead and check if it's RequiresExecution is returning true. If it
-    ///     is not, we'll dequeue that step and peek ahead again (recurse)
-    /// </summary>
-    /// <param name="current"></param>
-    /// <param name="queue"></param>
-    /// <param name="installId"></param>
-    /// <param name="installModel"></param>
-    /// <returns></returns>
-    private string IterateSteps(InstallSetupStep current, Queue<InstallTrackingItem> queue, Guid installId, InstallInstructions installModel)
-    {
-        while (queue.Count > 0)
-        {
-            InstallTrackingItem item = queue.Peek();
-
-            // if the current step restarts the app pool then we must simply return the next one in the queue,
-            // we cannot peek ahead as the next step might rely on the app restart and therefore RequiresExecution
-            // will rely on that too.
-            if (current.PerformsAppRestart)
-            {
-                return item.Name;
-            }
-
-            InstallSetupStep step = _installSteps.GetAllSteps().Single(x => x.Name == item.Name);
-
-            // if this step has any instructions then extract them
-            var instruction = GetInstruction(installModel, item, step);
-
-            // if the step requires execution then return its name
-            if (StepRequiresExecution(step, instruction))
-            {
-                return step.Name;
-            }
-
-            // no longer requires execution, could be due to a new config change during installation
-            // dequeue
-            queue.Dequeue();
-
-            // complete
-            _installStatusTracker.SetComplete(installId, step.Name);
-
-            // and continue
-            current = step;
-        }
-
-        return string.Empty;
-    }
-
-    // determines whether the step requires execution
-    internal bool StepRequiresExecution(InstallSetupStep step, object? instruction)
-    {
-        if (step == null)
-        {
-            throw new ArgumentNullException(nameof(step));
-        }
-
-        Attempt<object?> modelAttempt = instruction.TryConvertTo(step.StepType);
-        if (!modelAttempt.Success)
-        {
-            throw new InvalidCastException($"Cannot cast/convert {step.GetType().FullName} into {step.StepType.FullName}");
-        }
-
-        var model = modelAttempt.Result;
-        Type genericStepType = typeof(InstallSetupStep<>);
-        Type[] typeArgs = { step.StepType };
-        Type typedStepType = genericStepType.MakeGenericType(typeArgs);
-        try
-        {
-            MethodInfo method = typedStepType.GetMethods().Single(x => x.Name == "RequiresExecution");
-            var result = (bool?)method.Invoke(step, new[] { model });
-            return result ?? false;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Checking if step requires execution ({Step}) failed.", step.Name);
-            throw;
-        }
-    }
-
-    // executes the step
-    internal async Task<InstallSetupResult> ExecuteStepAsync(InstallSetupStep step, object? instruction)
-    {
-        using (!_proflog.IsEnabled(Core.Logging.LogLevel.Verbose) ? null : _proflog.TraceDuration<InstallApiController>($"Executing installation step: '{step.Name}'.", "Step completed"))
-        {
-            Attempt<object?> modelAttempt = instruction.TryConvertTo(step.StepType);
-            if (!modelAttempt.Success)
-            {
-                throw new InvalidCastException($"Cannot cast/convert {step.GetType().FullName} into {step.StepType.FullName}");
-            }
-
-            var model = modelAttempt.Result;
-            Type genericStepType = typeof(InstallSetupStep<>);
-            Type[] typeArgs = { step.StepType };
-            Type typedStepType = genericStepType.MakeGenericType(typeArgs);
-            try
-            {
-                MethodInfo method = typedStepType.GetMethods().Single(x => x.Name == "ExecuteAsync");
-                var task = (Task<InstallSetupResult>?)method.Invoke(step, new[] { model });
-                return await task!;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Installation step {Step} failed.", step.Name);
-                throw;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Install/InstallAreaRoutes.cs b/src/Umbraco.Web.BackOffice/Install/InstallAreaRoutes.cs
deleted file mode 100644
index 4e65aaef0f..0000000000
--- a/src/Umbraco.Web.BackOffice/Install/InstallAreaRoutes.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Routing;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Install;
-
-[Obsolete("Will be replaced with attribute routing in the new backoffice API")]
-public class InstallAreaRoutes : IAreaRoutes
-{
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly LinkGenerator _linkGenerator;
-    private readonly IRuntimeState _runtime;
-
-    public InstallAreaRoutes(IRuntimeState runtime, IHostingEnvironment hostingEnvironment, LinkGenerator linkGenerator)
-    {
-        _runtime = runtime;
-        _hostingEnvironment = hostingEnvironment;
-        _linkGenerator = linkGenerator;
-    }
-
-    public void CreateRoutes(IEndpointRouteBuilder endpoints)
-    {
-        var installPathSegment = _hostingEnvironment.ToAbsolute(Constants.SystemDirectories.Install).TrimStart('/');
-
-        switch (_runtime.Level)
-        {
-            case RuntimeLevel.Install:
-            case RuntimeLevel.Upgrade:
-            case RuntimeLevel.Run:
-
-                endpoints.MapUmbracoRoute<InstallApiController>(installPathSegment, Constants.Web.Mvc.InstallArea, "api", includeControllerNameInRoute: false);
-                endpoints.MapUmbracoRoute<InstallController>(installPathSegment, Constants.Web.Mvc.InstallArea, string.Empty, includeControllerNameInRoute: false);
-                break;
-            case RuntimeLevel.BootFailed:
-            case RuntimeLevel.Unknown:
-            case RuntimeLevel.Boot:
-                break;
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Install/InstallAuthorizeAttribute.cs b/src/Umbraco.Web.BackOffice/Install/InstallAuthorizeAttribute.cs
deleted file mode 100644
index 6d58e902d4..0000000000
--- a/src/Umbraco.Web.BackOffice/Install/InstallAuthorizeAttribute.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Install;
-
-/// <summary>
-/// Specifies the authorization filter that verifies whether the runtime level is <see cref="RuntimeLevel.Install" />, or <see cref="RuntimeLevel.Upgrade" /> and a user is logged in.
-/// </summary>
-public class InstallAuthorizeAttribute : TypeFilterAttribute
-{
-    public InstallAuthorizeAttribute()
-        : base(typeof(InstallAuthorizeFilter))
-    { }
-
-    private class InstallAuthorizeFilter : IAsyncAuthorizationFilter
-    {
-        private readonly ILogger<InstallAuthorizeFilter> _logger;
-        private readonly IRuntimeState _runtimeState;
-        private readonly LinkGenerator _linkGenerator;
-        private readonly IHostingEnvironment _hostingEnvironment;
-
-        public InstallAuthorizeFilter(IRuntimeState runtimeState, ILogger<InstallAuthorizeFilter> logger, LinkGenerator linkGenerator, IHostingEnvironment hostingEnvironment)
-        {
-            _runtimeState = runtimeState;
-            _logger = logger;
-            _linkGenerator = linkGenerator;
-            _hostingEnvironment = hostingEnvironment;
-        }
-
-        public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
-        {
-            if (_runtimeState.EnableInstaller() == false)
-            {
-                // Only authorize when the installer is enabled
-                context.Result = new ForbidResult(new AuthenticationProperties()
-                {
-                    RedirectUri = _linkGenerator.GetUmbracoBackOfficeUrl(_hostingEnvironment)
-                });
-            }
-            else if (_runtimeState.Level == RuntimeLevel.Upgrade && (await context.HttpContext.AuthenticateBackOfficeAsync()).Succeeded == false)
-            {
-                // Redirect to authorize upgrade
-                var authorizeUpgradePath = _linkGenerator.GetPathByAction(nameof(BackOfficeController.AuthorizeUpgrade), ControllerExtensions.GetControllerName<BackOfficeController>(), new
-                {
-                    area = Constants.Web.Mvc.BackOfficeArea,
-                    redir = _linkGenerator.GetInstallerUrl()
-                });
-                context.Result = new LocalRedirectResult(authorizeUpgradePath ?? "/");
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Install/InstallController.cs b/src/Umbraco.Web.BackOffice/Install/InstallController.cs
deleted file mode 100644
index a62a96f909..0000000000
--- a/src/Umbraco.Web.BackOffice/Install/InstallController.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.WebAssets;
-using Umbraco.Cms.Infrastructure.Install;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Filters;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Install;
-/// <summary>
-///     The Installation controller
-/// </summary>
-[Obsolete("Will no longer be required with the new backoffice API")]
-[InstallAuthorize]
-[Area(Constants.Web.Mvc.InstallArea)]
-public class InstallController : Controller
-{
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly GlobalSettings _globalSettings;
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly InstallHelper _installHelper;
-    private readonly LinkGenerator _linkGenerator;
-    private readonly ILogger<InstallController> _logger;
-    private readonly IRuntimeState _runtime;
-    private readonly IRuntimeMinifier _runtimeMinifier;
-    private readonly IUmbracoVersion _umbracoVersion;
-
-    public InstallController(
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        InstallHelper installHelper,
-        IRuntimeState runtime,
-        IOptions<GlobalSettings> globalSettings,
-        IRuntimeMinifier runtimeMinifier,
-        IHostingEnvironment hostingEnvironment,
-        IUmbracoVersion umbracoVersion,
-        ILogger<InstallController> logger,
-        LinkGenerator linkGenerator)
-    {
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-        _installHelper = installHelper;
-        _runtime = runtime;
-        _globalSettings = globalSettings.Value;
-        _runtimeMinifier = runtimeMinifier;
-        _hostingEnvironment = hostingEnvironment;
-        _umbracoVersion = umbracoVersion;
-        _logger = logger;
-        _linkGenerator = linkGenerator;
-    }
-
-    [HttpGet]
-    [StatusCodeResult(HttpStatusCode.ServiceUnavailable)]
-    public async Task<ActionResult> Index()
-    {
-        // Get the install base URL
-        ViewData.SetInstallApiBaseUrl(_linkGenerator.GetInstallerApiUrl());
-
-        // Get the base umbraco folder
-        var baseFolder = _hostingEnvironment.ToAbsolute(_globalSettings.UmbracoPath);
-        ViewData.SetUmbracoBaseFolder(baseFolder);
-
-        ViewData.SetUmbracoVersion(_umbracoVersion.SemanticVersion);
-
-        await _installHelper.SetInstallStatusAsync(false, string.Empty);
-
-        return View(Path.Combine(Constants.SystemDirectories.Umbraco.TrimStart("~"), Constants.Web.Mvc.InstallArea, nameof(Index) + ".cshtml"));
-    }
-
-    [HttpGet]
-    [IgnoreFromNotFoundSelectorPolicy]
-    public ActionResult Redirect() => NotFound();
-}
diff --git a/src/Umbraco.Web.BackOffice/Mapping/CommonTreeNodeMapper.cs b/src/Umbraco.Web.BackOffice/Mapping/CommonTreeNodeMapper.cs
deleted file mode 100644
index c0362e1a0d..0000000000
--- a/src/Umbraco.Web.BackOffice/Mapping/CommonTreeNodeMapper.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Microsoft.AspNetCore.Routing;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Web.BackOffice.Trees;
-using Umbraco.Cms.Web.Common.Controllers;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Mapping;
-
-public class CommonTreeNodeMapper
-{
-    private readonly LinkGenerator _linkGenerator;
-
-
-    public CommonTreeNodeMapper(LinkGenerator linkGenerator) => _linkGenerator = linkGenerator;
-
-
-    public string? GetTreeNodeUrl<TController>(IContentBase source)
-        where TController : UmbracoApiController, ITreeNodeController =>
-        _linkGenerator.GetUmbracoApiService<TController>(controller =>
-            controller.GetTreeNode(source.Key.ToString("N"), null));
-}
diff --git a/src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs b/src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
deleted file mode 100644
index e05fc3a955..0000000000
--- a/src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
+++ /dev/null
@@ -1,596 +0,0 @@
-using System.Globalization;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Dictionary;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Mapping;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Web;
-using Umbraco.Cms.Web.BackOffice.Trees;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Mapping;
-
-/// <summary>
-///     Declares how model mappings for content
-/// </summary>
-internal class ContentMapDefinition : IMapDefinition
-{
-    private readonly AppCaches _appCaches;
-    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-    private readonly ContentBasicSavedStateMapper<ContentPropertyBasic> _basicStateMapper;
-    private readonly CommonMapper _commonMapper;
-    private readonly CommonTreeNodeMapper _commonTreeNodeMapper;
-    private readonly IContentService _contentService;
-    private readonly IContentTypeService _contentTypeService;
-    private readonly ContentVariantMapper _contentVariantMapper;
-    private readonly ICultureDictionary _cultureDictionary;
-    private readonly IEntityService _entityService;
-    private readonly IFileService _fileService;
-    private readonly ILocalizationService _localizationService;
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly ILoggerFactory _loggerFactory;
-    private readonly IPublishedRouter _publishedRouter;
-    private readonly IPublishedUrlProvider _publishedUrlProvider;
-    private readonly ContentSavedStateMapper<ContentPropertyDisplay> _stateMapper;
-    private readonly TabsAndPropertiesMapper<IContent> _tabsAndPropertiesMapper;
-    private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-    private readonly UriUtility _uriUtility;
-    private readonly IUserService _userService;
-    private readonly IVariationContextAccessor _variationContextAccessor;
-
-
-    public ContentMapDefinition(
-        CommonMapper commonMapper,
-        CommonTreeNodeMapper commonTreeNodeMapper,
-        ICultureDictionary cultureDictionary,
-        ILocalizedTextService localizedTextService,
-        IContentService contentService,
-        IContentTypeService contentTypeService,
-        IFileService fileService,
-        IUmbracoContextAccessor umbracoContextAccessor,
-        IPublishedRouter publishedRouter,
-        ILocalizationService localizationService,
-        ILoggerFactory loggerFactory,
-        IUserService userService,
-        IVariationContextAccessor variationContextAccessor,
-        IContentTypeBaseServiceProvider contentTypeBaseServiceProvider,
-        UriUtility uriUtility,
-        IPublishedUrlProvider publishedUrlProvider,
-        IEntityService entityService,
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-        AppCaches appCaches)
-    {
-        _commonMapper = commonMapper;
-        _commonTreeNodeMapper = commonTreeNodeMapper;
-        _cultureDictionary = cultureDictionary;
-        _localizedTextService = localizedTextService;
-        _contentService = contentService;
-        _contentTypeService = contentTypeService;
-        _fileService = fileService;
-        _umbracoContextAccessor = umbracoContextAccessor;
-        _publishedRouter = publishedRouter;
-        _localizationService = localizationService;
-        _loggerFactory = loggerFactory;
-        _userService = userService;
-        _entityService = entityService;
-        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
-        _variationContextAccessor = variationContextAccessor;
-        _uriUtility = uriUtility;
-        _publishedUrlProvider = publishedUrlProvider;
-        _appCaches = appCaches;
-
-        _tabsAndPropertiesMapper = new TabsAndPropertiesMapper<IContent>(cultureDictionary, localizedTextService, contentTypeBaseServiceProvider);
-        _stateMapper = new ContentSavedStateMapper<ContentPropertyDisplay>();
-        _basicStateMapper = new ContentBasicSavedStateMapper<ContentPropertyBasic>();
-        _contentVariantMapper = new ContentVariantMapper(_localizationService, localizedTextService);
-    }
-
-    public void DefineMaps(IUmbracoMapper mapper)
-    {
-        mapper.Define<IContent, ContentItemBasic<ContentPropertyBasic>>((source, context) => new ContentItemBasic<ContentPropertyBasic>(), Map);
-        mapper.Define<IContent, ContentPropertyCollectionDto>((source, context) => new ContentPropertyCollectionDto(), Map);
-
-        mapper.Define<IContent, ContentItemDisplay>((source, context) => new ContentItemDisplay(), Map);
-        mapper.Define<IContent, ContentItemDisplayWithSchedule>((source, context) => new ContentItemDisplayWithSchedule(), Map);
-
-        mapper.Define<IContent, ContentVariantDisplay>((source, context) => new ContentVariantDisplay(), Map);
-        mapper.Define<IContent, ContentVariantScheduleDisplay>((source, context) => new ContentVariantScheduleDisplay(), Map);
-
-        mapper.Define<ContentItemDisplayWithSchedule, ContentItemDisplay>((source, context) => new ContentItemDisplay(), Map);
-        mapper.Define<ContentItemDisplay, ContentItemDisplayWithSchedule>((source, context) => new ContentItemDisplayWithSchedule(), Map);
-
-        mapper.Define<ContentVariantDisplay, ContentVariantScheduleDisplay>((source, context) => new ContentVariantScheduleDisplay(), Map);
-        mapper.Define<ContentVariantScheduleDisplay, ContentVariantDisplay>((source, context) => new ContentVariantDisplay(), Map);
-    }
-
-    // Umbraco.Code.MapAll
-    private void Map(ContentVariantScheduleDisplay source, ContentVariantDisplay target, MapperContext context)
-    {
-        target.CreateDate = source.CreateDate;
-        target.DisplayName = source.DisplayName;
-        target.Language = source.Language;
-        target.Name = source.Name;
-        target.PublishDate = source.PublishDate;
-        target.Segment = source.Segment;
-        target.State = source.State;
-        target.Tabs = source.Tabs;
-        target.UpdateDate = source.UpdateDate;
-        target.AllowedActions = source.AllowedActions;
-        target.AdditionalPreviewUrls = source.AdditionalPreviewUrls;
-    }
-
-    // Umbraco.Code.MapAll
-    private void Map(ContentItemDisplay source, ContentItemDisplayWithSchedule target, MapperContext context)
-    {
-        foreach (KeyValuePair<string, object> additionalData in source.AdditionalData)
-        {
-            target.AdditionalData.Add(additionalData);
-        }
-
-        target.AllowedActions = source.AllowedActions;
-        target.AllowedTemplates = source.AllowedTemplates;
-        target.AllowPreview = source.AllowPreview;
-        target.ContentDto = source.ContentDto;
-        target.ContentTypeAlias = source.ContentTypeAlias;
-        target.ContentTypeId = source.ContentTypeId;
-        target.ContentTypeKey = source.ContentTypeKey;
-        target.ContentTypeName = source.ContentTypeName;
-        target.DocumentType = source.DocumentType;
-        target.Errors = source.Errors;
-        target.Icon = source.Icon;
-        target.Id = source.Id;
-        target.IsBlueprint = source.IsBlueprint;
-        target.IsChildOfListView = source.IsChildOfListView;
-        target.IsContainer = source.IsContainer;
-        target.IsElement = source.IsElement;
-        target.Key = source.Key;
-        target.Owner = source.Owner;
-        target.ParentId = source.ParentId;
-        target.Path = source.Path;
-        target.PersistedContent = source.PersistedContent;
-        target.SortOrder = source.SortOrder;
-        target.TemplateAlias = source.TemplateAlias;
-        target.TemplateId = source.TemplateId;
-        target.Trashed = source.Trashed;
-        target.TreeNodeUrl = source.TreeNodeUrl;
-        target.Udi = source.Udi;
-        target.UpdateDate = source.UpdateDate;
-        target.Updater = source.Updater;
-        target.Urls = source.Urls;
-        target.Variants = context.MapEnumerable<ContentVariantDisplay, ContentVariantScheduleDisplay>(source.Variants);
-
-        foreach (BackOfficeNotification backOfficeNotification in source.Notifications)
-        {
-            target.Notifications.Add(backOfficeNotification);
-        }
-    }
-
-    // Umbraco.Code.MapAll
-    private void Map(ContentVariantDisplay source, ContentVariantScheduleDisplay target, MapperContext context)
-    {
-        target.CreateDate = source.CreateDate;
-        target.DisplayName = source.DisplayName;
-        target.Language = source.Language;
-        target.Name = source.Name;
-        target.PublishDate = source.PublishDate;
-        target.Segment = source.Segment;
-        target.State = source.State;
-        target.Tabs = source.Tabs;
-        target.UpdateDate = source.UpdateDate;
-        target.AllowedActions = source.AllowedActions;
-        target.AdditionalPreviewUrls = source.AdditionalPreviewUrls;
-
-        // We'll only try and map the ReleaseDate/ExpireDate if the "old" ContentVariantScheduleDisplay is in the context, otherwise we'll just skip it quietly.
-        _ = context.Items.TryGetValue(nameof(ContentItemDisplayWithSchedule.Variants), out var variants);
-        if (variants is IEnumerable<ContentVariantScheduleDisplay> scheduleDisplays)
-        {
-            ContentVariantScheduleDisplay? item = scheduleDisplays.FirstOrDefault(x => x.Language?.Id == source.Language?.Id && x.Segment == source.Segment);
-
-            if (item is null)
-            {
-                // If we can't find the old variants display, we'll just not try and map it.
-                return;
-            }
-
-            target.ReleaseDate = item.ReleaseDate;
-            target.ExpireDate = item.ExpireDate;
-        }
-    }
-
-    // Umbraco.Code.MapAll
-    private static void Map(ContentItemDisplayWithSchedule source, ContentItemDisplay target, MapperContext context)
-    {
-        foreach (KeyValuePair<string, object> additionalData in source.AdditionalData)
-        {
-            target.AdditionalData.Add(additionalData);
-        }
-
-        target.AllowedActions = source.AllowedActions;
-        target.AllowedTemplates = source.AllowedTemplates;
-        target.AllowPreview = source.AllowPreview;
-        target.ContentDto = source.ContentDto;
-        target.ContentTypeAlias = source.ContentTypeAlias;
-        target.ContentTypeId = source.ContentTypeId;
-        target.ContentTypeKey = source.ContentTypeKey;
-        target.ContentTypeName = source.ContentTypeName;
-        target.DocumentType = source.DocumentType;
-        target.Errors = source.Errors;
-        target.Icon = source.Icon;
-        target.Id = source.Id;
-        target.IsBlueprint = source.IsBlueprint;
-        target.IsChildOfListView = source.IsChildOfListView;
-        target.IsContainer = source.IsContainer;
-        target.IsElement = source.IsElement;
-        target.Key = source.Key;
-        target.Owner = source.Owner;
-        target.ParentId = source.ParentId;
-        target.Path = source.Path;
-        target.PersistedContent = source.PersistedContent;
-        target.SortOrder = source.SortOrder;
-        target.TemplateAlias = source.TemplateAlias;
-        target.TemplateId = source.TemplateId;
-        target.Trashed = source.Trashed;
-        target.TreeNodeUrl = source.TreeNodeUrl;
-        target.Udi = source.Udi;
-        target.UpdateDate = source.UpdateDate;
-        target.Updater = source.Updater;
-        target.Urls = source.Urls;
-        target.Variants = source.Variants;
-    }
-
-    // Umbraco.Code.MapAll
-    private static void Map(IContent source, ContentPropertyCollectionDto target, MapperContext context) =>
-        target.Properties = context.MapEnumerable<IProperty, ContentPropertyDto>(source.Properties).WhereNotNull();
-
-    // Umbraco.Code.MapAll -AllowPreview -Errors -PersistedContent
-    private void Map<TVariant>(IContent source, ContentItemDisplay<TVariant> target, MapperContext context)
-        where TVariant : ContentVariantDisplay
-    {
-        // Both GetActions and DetermineIsChildOfListView use parent, so get it once here
-        // Parent might already be in context, so check there before using content service
-        IContent? parent;
-        if (context.Items.TryGetValue("Parent", out var parentObj) &&
-            parentObj is IContent typedParent)
-        {
-            parent = typedParent;
-        }
-        else
-        {
-            parent = _contentService.GetParent(source);
-        }
-
-        target.AllowedActions = GetActions(source, parent, context);
-        target.AllowedTemplates = GetAllowedTemplates(source);
-        target.ContentTypeId = source.ContentType.Id;
-        target.ContentTypeKey = source.ContentType.Key;
-        target.ContentTypeAlias = source.ContentType.Alias;
-        target.ContentTypeName =
-            _localizedTextService.UmbracoDictionaryTranslate(_cultureDictionary, source.ContentType.Name);
-        target.DocumentType = _commonMapper.GetContentType(source, context);
-        target.Icon = source.ContentType.Icon;
-        target.Id = source.Id;
-        target.IsBlueprint = source.Blueprint;
-        target.IsChildOfListView = DetermineIsChildOfListView(source, parent, context);
-        target.IsContainer = source.ContentType.ListView is not null;
-        target.IsElement = source.ContentType.IsElement;
-        target.Key = source.Key;
-        target.Owner = _commonMapper.GetOwner(source, context);
-        target.ParentId = source.ParentId;
-        target.Path = source.Path;
-        target.SortOrder = source.SortOrder;
-        target.TemplateAlias = GetDefaultTemplate(source);
-        target.TemplateId = source.TemplateId ?? default;
-        target.Trashed = source.Trashed;
-        target.TreeNodeUrl = _commonTreeNodeMapper.GetTreeNodeUrl<ContentTreeController>(source);
-        target.Udi =
-            Udi.Create(source.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document, source.Key);
-        target.UpdateDate = source.UpdateDate;
-        target.Updater = _commonMapper.GetCreator(source, context);
-        target.Urls = GetUrls(source);
-        target.Variants = _contentVariantMapper.Map<TVariant>(source, context);
-
-        target.ContentDto = new ContentPropertyCollectionDto
-        {
-            Properties = context.MapEnumerable<IProperty, ContentPropertyDto>(source.Properties).WhereNotNull()
-        };
-    }
-
-    // Umbraco.Code.MapAll -Segment -Language -DisplayName -AdditionalPreviewUrls
-    private void Map(IContent source, ContentVariantDisplay target, MapperContext context)
-    {
-        target.CreateDate = source.CreateDate;
-        target.Name = source.Name;
-        target.PublishDate = source.PublishDate;
-        target.State = _stateMapper.Map(source, context);
-        target.Tabs = _tabsAndPropertiesMapper.Map(source, context);
-        target.UpdateDate = source.UpdateDate;
-        target.AllowedActions = new[] { ActionBrowse.ActionLetter.ToString() };
-    }
-
-    private void Map(IContent source, ContentVariantScheduleDisplay target, MapperContext context)
-    {
-        Map(source, (ContentVariantDisplay)target, context);
-        target.ReleaseDate = GetScheduledDate(source, ContentScheduleAction.Release, context);
-        target.ExpireDate = GetScheduledDate(source, ContentScheduleAction.Expire, context);
-    }
-
-    // Umbraco.Code.MapAll -Alias
-    private void Map(IContent source, ContentItemBasic<ContentPropertyBasic> target, MapperContext context)
-    {
-        target.ContentTypeId = source.ContentType.Id;
-        target.ContentTypeAlias = source.ContentType.Alias;
-        target.CreateDate = source.CreateDate;
-        target.Edited = source.Edited;
-        target.Icon = source.ContentType.Icon;
-        target.Id = source.Id;
-        target.Key = source.Key;
-        target.Name = GetName(source, context);
-        target.Owner = _commonMapper.GetOwner(source, context);
-        target.ParentId = source.ParentId;
-        target.Path = source.Path;
-        target.Properties = context.MapEnumerable<IProperty, ContentPropertyBasic>(source.Properties).WhereNotNull();
-        target.SortOrder = source.SortOrder;
-        target.State = _basicStateMapper.Map(source, context);
-        target.Trashed = source.Trashed;
-        target.Udi =
-            Udi.Create(source.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document, source.Key);
-        target.UpdateDate = GetUpdateDate(source, context);
-        target.Updater = _commonMapper.GetCreator(source, context);
-        target.VariesByCulture = source.ContentType.VariesByCulture();
-    }
-
-    private IEnumerable<string> GetActions(IContent source, IContent? parent, MapperContext context)
-    {
-        context.Items.TryGetValue("CurrentUser", out var currentBackofficeUser);
-
-        IUser? currentUser = null;
-
-        if (currentBackofficeUser is IUser currentIUserBackofficeUser)
-        {
-            currentUser = currentIUserBackofficeUser;
-        }
-        else if(_backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser is not null)
-        {
-            currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity.CurrentUser;
-        }
-
-        if (currentUser is null)
-        {
-            return Enumerable.Empty<string>();
-        }
-
-        string path;
-        if (source.HasIdentity)
-        {
-            path = source.Path;
-        }
-        else
-        {
-            path = parent == null ? "-1" : parent.Path;
-        }
-
-        // A bit of a mess, but we need to ensure that all the required values are here AND that they're the right type.
-        if (context.Items.TryGetValue("Permissions", out var permissionsObject) && permissionsObject is Dictionary<string, EntityPermissionSet> permissionsDict)
-        {
-            // If we already have permissions for a given path,
-            // and the current user is the same as was used to generate the permissions, return the stored permissions.
-            if (_backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id == currentUser.Id &&
-                permissionsDict.TryGetValue(path, out EntityPermissionSet? permissions))
-            {
-                return permissions.GetAllPermissions();
-            }
-        }
-
-        // TODO: This is certainly not ideal usage here - perhaps the best way to deal with this in the future is
-        // with the IUmbracoContextAccessor. In the meantime, if used outside of a web app this will throw a null
-        // reference exception :(
-
-        return _userService.GetPermissionsForPath(currentUser, path).GetAllPermissions();
-    }
-
-    private UrlInfo[] GetUrls(IContent source)
-    {
-        if (source.ContentType.IsElement)
-        {
-            return Array.Empty<UrlInfo>();
-        }
-
-        if (!_umbracoContextAccessor.TryGetUmbracoContext(out IUmbracoContext? umbracoContext))
-        {
-            return new[] { UrlInfo.Message("Cannot generate URLs without a current Umbraco Context") };
-        }
-
-        // NOTE: unfortunately we're not async, we'll use .Result and hope this won't cause a deadlock anywhere for now
-        UrlInfo[] urls = source.GetContentUrlsAsync(
-                _publishedRouter,
-                umbracoContext,
-                _localizationService,
-                _localizedTextService,
-                _contentService,
-                _variationContextAccessor,
-                _loggerFactory.CreateLogger<IContent>(),
-                _uriUtility,
-                _publishedUrlProvider)
-            .ConfigureAwait(false)
-            .GetAwaiter()
-            .GetResult()
-            .ToArray();
-
-        return urls;
-    }
-
-    private DateTime GetUpdateDate(IContent source, MapperContext context)
-    {
-        // invariant = global date
-        if (!source.ContentType.VariesByCulture())
-        {
-            return source.UpdateDate;
-        }
-
-        // variant = depends on culture
-        var culture = context.GetCulture();
-
-        // if there's no culture here, the issue is somewhere else (UI, whatever) - throw!
-        if (culture == null)
-        {
-            throw new InvalidOperationException("Missing culture in mapping options.");
-        }
-
-        // if we don't have a date for a culture, it means the culture is not available, and
-        // hey we should probably not be mapping it, but it's too late, return a fallback date
-        DateTime? date = source.GetUpdateDate(culture);
-        return date ?? source.UpdateDate;
-    }
-
-    private string? GetName(IContent source, MapperContext context)
-    {
-        // invariant = only 1 name
-        if (!source.ContentType.VariesByCulture())
-        {
-            return source.Name;
-        }
-
-        // variant = depends on culture
-        var culture = context.GetCulture();
-
-        // if there's no culture here, the issue is somewhere else (UI, whatever) - throw!
-        if (culture == null)
-        {
-            throw new InvalidOperationException("Missing culture in mapping options.");
-        }
-
-        // if we don't have a name for a culture, it means the culture is not available, and
-        // hey we should probably not be mapping it, but it's too late, return a fallback name
-        return source.CultureInfos is not null &&
-               source.CultureInfos.TryGetValue(culture, out ContentCultureInfos name) && !name.Name.IsNullOrWhiteSpace()
-            ? name.Name
-            : $"({source.Name})";
-    }
-
-    /// <summary>
-    ///     Checks if the content item is a descendant of a list view
-    /// </summary>
-    /// <param name="source"></param>
-    /// <param name="parent"></param>
-    /// <param name="context"></param>
-    /// <returns>
-    ///     Returns true if the content item is a descendant of a list view and where the content is
-    ///     not a current user's start node.
-    /// </returns>
-    /// <remarks>
-    ///     We must check if it's the current user's start node because in that case we will actually be
-    ///     rendering the tree node underneath the list view to visually show context. In this case we return
-    ///     false because the item is technically not being rendered as part of a list view but instead as a
-    ///     real tree node. If we didn't perform this check then tree syncing wouldn't work correctly.
-    /// </remarks>
-    private bool DetermineIsChildOfListView(IContent source, IContent? parent, MapperContext context)
-    {
-        var userStartNodes = Array.Empty<int>();
-
-        // In cases where a user's start node is below a list view, we will actually render
-        // out the tree to that start node and in that case for that start node, we want to return
-        // false here.
-        if (context.HasItems && context.Items.TryGetValue("CurrentUser", out var usr) && usr is IUser currentUser)
-        {
-            userStartNodes = currentUser.CalculateContentStartNodeIds(_entityService, _appCaches);
-            if (!userStartNodes?.Contains(Constants.System.Root) ?? false)
-            {
-                // return false if this is the user's actual start node, the node will be rendered in the tree
-                // regardless of if it's a list view or not
-                if (userStartNodes?.Contains(source.Id) ?? false)
-                {
-                    return false;
-                }
-            }
-        }
-
-        if (parent == null)
-        {
-            return false;
-        }
-
-        var pathParts = parent.Path.Split(Constants.CharArrays.Comma).Select(x =>
-            int.TryParse(x, NumberStyles.Integer, CultureInfo.InvariantCulture, out var i) ? i : 0).ToList();
-
-        if (userStartNodes is not null)
-        {
-            // reduce the path parts so we exclude top level content items that
-            // are higher up than a user's start nodes
-            foreach (var n in userStartNodes)
-            {
-                var index = pathParts.IndexOf(n);
-                if (index != -1)
-                {
-                    // now trim all top level start nodes to the found index
-                    for (var i = 0; i < index; i++)
-                    {
-                        pathParts.RemoveAt(0);
-                    }
-                }
-            }
-        }
-
-        return parent.ContentType.ListView is not null || _contentTypeService.HasContainerInPath(pathParts.ToArray());
-    }
-
-
-    private DateTime? GetScheduledDate(IContent source, ContentScheduleAction action, MapperContext context)
-    {
-        _ = context.Items.TryGetValue("Schedule", out var untypedSchedule);
-
-        if (untypedSchedule is not ContentScheduleCollection scheduleCollection)
-        {
-            throw new ApplicationException(
-                "GetScheduledDate requires a ContentScheduleCollection in the MapperContext for Key: Schedule");
-        }
-
-        var culture = context.GetCulture() ?? string.Empty;
-        IEnumerable<ContentSchedule> schedule = scheduleCollection.GetSchedule(culture, action);
-        return schedule.FirstOrDefault()?.Date; // take the first, it's ordered by date
-    }
-
-    private IDictionary<string, string?>? GetAllowedTemplates(IContent source)
-    {
-        // Element types can't have templates, so no need to query to get the content type
-        if (source.ContentType.IsElement)
-        {
-            return new Dictionary<string, string?>();
-        }
-
-        IContentType? contentType = _contentTypeService.Get(source.ContentTypeId);
-
-        return contentType?.AllowedTemplates?
-            .Where(t => t.Alias.IsNullOrWhiteSpace() == false && t.Name.IsNullOrWhiteSpace() == false)
-            .ToDictionary(t => t.Alias, t => _localizedTextService.UmbracoDictionaryTranslate(_cultureDictionary, t.Name));
-    }
-
-    private string? GetDefaultTemplate(IContent source)
-    {
-        if (source == null)
-        {
-            return null;
-        }
-
-        // If no template id was set...
-        if (!source.TemplateId.HasValue)
-        {
-            // ... and no default template is set, return null...
-            // ... otherwise return the content type default template alias.
-            return string.IsNullOrWhiteSpace(source.ContentType.DefaultTemplate?.Alias)
-                ? null
-                : source.ContentType.DefaultTemplate?.Alias;
-        }
-
-        ITemplate? template = _fileService.GetTemplate(source.TemplateId.Value);
-        return template?.Alias;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Mapping/MediaMapDefinition.cs b/src/Umbraco.Web.BackOffice/Mapping/MediaMapDefinition.cs
deleted file mode 100644
index 3f0f04853c..0000000000
--- a/src/Umbraco.Web.BackOffice/Mapping/MediaMapDefinition.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Dictionary;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Mapping;
-using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Trees;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Mapping;
-
-/// <summary>
-///     Declares model mappings for media.
-/// </summary>
-public class MediaMapDefinition : IMapDefinition
-{
-    private readonly CommonMapper _commonMapper;
-    private readonly CommonTreeNodeMapper _commonTreeNodeMapper;
-    private readonly ContentSettings _contentSettings;
-    private readonly IMediaService _mediaService;
-    private readonly IMediaTypeService _mediaTypeService;
-    private readonly MediaUrlGeneratorCollection _mediaUrlGenerators;
-    private readonly TabsAndPropertiesMapper<IMedia> _tabsAndPropertiesMapper;
-
-    public MediaMapDefinition(ICultureDictionary cultureDictionary, CommonMapper commonMapper,
-        CommonTreeNodeMapper commonTreeNodeMapper, IMediaService mediaService, IMediaTypeService mediaTypeService,
-        ILocalizedTextService localizedTextService, MediaUrlGeneratorCollection mediaUrlGenerators,
-        IOptions<ContentSettings> contentSettings, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
-    {
-        _commonMapper = commonMapper;
-        _commonTreeNodeMapper = commonTreeNodeMapper;
-        _mediaService = mediaService;
-        _mediaTypeService = mediaTypeService;
-        _mediaUrlGenerators = mediaUrlGenerators;
-        _contentSettings = contentSettings.Value ?? throw new ArgumentNullException(nameof(contentSettings));
-
-        _tabsAndPropertiesMapper =
-            new TabsAndPropertiesMapper<IMedia>(cultureDictionary, localizedTextService,
-                contentTypeBaseServiceProvider);
-    }
-
-    public void DefineMaps(IUmbracoMapper mapper)
-    {
-        mapper.Define<IMedia, ContentPropertyCollectionDto>((source, context) => new ContentPropertyCollectionDto(),
-            Map);
-        mapper.Define<IMedia, MediaItemDisplay>((source, context) => new MediaItemDisplay(), Map);
-        mapper.Define<IMedia, ContentItemBasic<ContentPropertyBasic>>(
-            (source, context) => new ContentItemBasic<ContentPropertyBasic>(), Map);
-    }
-
-    // Umbraco.Code.MapAll
-    private static void Map(IMedia source, ContentPropertyCollectionDto target, MapperContext context) =>
-        target.Properties = context.MapEnumerable<IProperty, ContentPropertyDto>(source.Properties).WhereNotNull();
-
-    // Umbraco.Code.MapAll -Properties -Errors -Edited -Updater -Alias -IsContainer
-    private void Map(IMedia source, MediaItemDisplay target, MapperContext context)
-    {
-        target.ContentType = _commonMapper.GetContentType(source, context);
-        target.ContentTypeId = source.ContentType.Id;
-        target.ContentTypeAlias = source.ContentType.Alias;
-        target.ContentTypeName = source.ContentType.Name;
-        target.CreateDate = source.CreateDate;
-        target.Icon = source.ContentType.Icon;
-        target.Id = source.Id;
-        target.IsChildOfListView = DetermineIsChildOfListView(source);
-        target.Key = source.Key;
-        target.MediaLink = string.Join(",", source.GetUrls(_contentSettings, _mediaUrlGenerators));
-        target.Name = source.Name;
-        target.Owner = _commonMapper.GetOwner(source, context);
-        target.ParentId = source.ParentId;
-        target.Path = source.Path;
-        target.SortOrder = source.SortOrder;
-        target.State = null;
-        target.Tabs = _tabsAndPropertiesMapper.Map(source, context);
-        target.Trashed = source.Trashed;
-        target.TreeNodeUrl = _commonTreeNodeMapper.GetTreeNodeUrl<MediaTreeController>(source);
-        target.Udi = Udi.Create(Constants.UdiEntityType.Media, source.Key);
-        target.UpdateDate = source.UpdateDate;
-        target.VariesByCulture = source.ContentType.VariesByCulture();
-    }
-
-    // Umbraco.Code.MapAll -Edited -Updater -Alias
-    private void Map(IMedia source, ContentItemBasic<ContentPropertyBasic> target, MapperContext context)
-    {
-        target.ContentTypeId = source.ContentType.Id;
-        target.ContentTypeAlias = source.ContentType.Alias;
-        target.CreateDate = source.CreateDate;
-        target.Icon = source.ContentType.Icon;
-        target.Id = source.Id;
-        target.Key = source.Key;
-        target.Name = source.Name;
-        target.Owner = _commonMapper.GetOwner(source, context);
-        target.ParentId = source.ParentId;
-        target.Path = source.Path;
-        target.Properties = context.MapEnumerable<IProperty, ContentPropertyBasic>(source.Properties).WhereNotNull();
-        target.SortOrder = source.SortOrder;
-        target.State = null;
-        target.Trashed = source.Trashed;
-        target.Udi = Udi.Create(Constants.UdiEntityType.Media, source.Key);
-        target.UpdateDate = source.UpdateDate;
-        target.VariesByCulture = source.ContentType.VariesByCulture();
-    }
-
-    private bool DetermineIsChildOfListView(IMedia source)
-    {
-        // map the IsChildOfListView (this is actually if it is a descendant of a list view!)
-        IMedia? parent = _mediaService.GetParent(source);
-        return parent != null && (parent.ContentType.ListView is not null || _mediaTypeService.HasContainerInPath(parent.Path));
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Mapping/MemberMapDefinition.cs b/src/Umbraco.Web.BackOffice/Mapping/MemberMapDefinition.cs
deleted file mode 100644
index 5428d586ef..0000000000
--- a/src/Umbraco.Web.BackOffice/Mapping/MemberMapDefinition.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Mapping;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Web.BackOffice.Trees;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Mapping;
-
-/// <summary>
-///     Declares model mappings for members.
-/// </summary>
-public class MemberMapDefinition : IMapDefinition
-{
-    private readonly CommonMapper _commonMapper;
-    private readonly CommonTreeNodeMapper _commonTreeNodeMapper;
-    private readonly MemberTabsAndPropertiesMapper _tabsAndPropertiesMapper;
-
-    public MemberMapDefinition(CommonMapper commonMapper, CommonTreeNodeMapper commonTreeNodeMapper,
-        MemberTabsAndPropertiesMapper tabsAndPropertiesMapper)
-    {
-        _commonMapper = commonMapper;
-        _commonTreeNodeMapper = commonTreeNodeMapper;
-        _tabsAndPropertiesMapper = tabsAndPropertiesMapper;
-    }
-
-    public void DefineMaps(IUmbracoMapper mapper)
-    {
-        mapper.Define<IMember, MemberDisplay>((source, context) => new MemberDisplay(), Map);
-        mapper.Define<IMember, MemberBasic>((source, context) => new MemberBasic(), Map);
-        mapper.Define<IMemberGroup, MemberGroupDisplay>((source, context) => new MemberGroupDisplay(), Map);
-        mapper.Define<UmbracoIdentityRole, MemberGroupDisplay>((source, context) => new MemberGroupDisplay(), Map);
-        mapper.Define<IMember, ContentPropertyCollectionDto>((source, context) => new ContentPropertyCollectionDto(),
-            Map);
-    }
-
-    // Umbraco.Code.MapAll -Properties -Errors -Edited -Updater -Alias -IsChildOfListView
-    // Umbraco.Code.MapAll -Trashed -IsContainer -VariesByCulture
-    private void Map(IMember source, MemberDisplay target, MapperContext context)
-    {
-        target.ContentType = _commonMapper.GetContentType(source, context);
-        target.ContentTypeId = source.ContentType.Id;
-        target.ContentTypeAlias = source.ContentType.Alias;
-        target.ContentTypeName = source.ContentType.Name;
-        target.CreateDate = source.CreateDate;
-        target.Icon = source.ContentType.Icon;
-        target.Id = source.Id;
-        target.Key = source.Key;
-        target.Name = source.Name;
-        target.Owner = _commonMapper.GetOwner(source, context);
-        target.ParentId = source.ParentId;
-        target.Path = source.Path;
-        target.SortOrder = source.SortOrder;
-        target.State = null;
-        target.Tabs = _tabsAndPropertiesMapper.Map(source, context);
-        target.TreeNodeUrl = _commonTreeNodeMapper.GetTreeNodeUrl<MemberTreeController>(source);
-        target.Udi = Udi.Create(Constants.UdiEntityType.Member, source.Key);
-        target.UpdateDate = source.UpdateDate;
-
-        //Membership
-        target.Username = source.Username;
-        target.Email = source.Email;
-        target.IsLockedOut = source.IsLockedOut;
-        target.IsApproved = source.IsApproved;
-        target.MembershipProperties = _tabsAndPropertiesMapper.MapMembershipProperties(source, context);
-    }
-
-    // Umbraco.Code.MapAll -Trashed -Edited -Updater -Alias -VariesByCulture
-    private void Map(IMember source, MemberBasic target, MapperContext context)
-    {
-        target.ContentTypeId = source.ContentType.Id;
-        target.ContentTypeAlias = source.ContentType.Alias;
-        target.CreateDate = source.CreateDate;
-        target.Email = source.Email;
-        target.Icon = source.ContentType.Icon;
-        target.Id = int.MaxValue;
-        target.Key = source.Key;
-        target.Name = source.Name;
-        target.Owner = _commonMapper.GetOwner(source, context);
-        target.ParentId = source.ParentId;
-        target.Path = source.Path;
-        target.Properties = context.MapEnumerable<IProperty, ContentPropertyBasic>(source.Properties).WhereNotNull();
-        target.SortOrder = source.SortOrder;
-        target.State = null;
-        target.Udi = Udi.Create(Constants.UdiEntityType.Member, source.Key);
-        target.UpdateDate = source.UpdateDate;
-        target.Username = source.Username;
-        target.FailedPasswordAttempts = source.FailedPasswordAttempts;
-        target.Approved = source.IsApproved;
-        target.LockedOut = source.IsLockedOut;
-        target.LastLockoutDate = source.LastLockoutDate;
-        target.LastLoginDate = source.LastLoginDate;
-        target.LastPasswordChangeDate = source.LastPasswordChangeDate;
-    }
-
-    // Umbraco.Code.MapAll -Icon -Trashed -ParentId -Alias
-    private void Map(IMemberGroup source, MemberGroupDisplay target, MapperContext context)
-    {
-        target.Icon = Constants.Icons.MemberGroup;
-        target.Id = source.Id;
-        target.Key = source.Key;
-        target.Name = source.Name;
-        target.Path = $"-1,{source.Id}";
-        target.Udi = Udi.Create(Constants.UdiEntityType.MemberGroup, source.Key);
-    }
-
-    // Umbraco.Code.MapAll -Icon -Trashed -ParentId -Alias -Key -Udi
-    private void Map(UmbracoIdentityRole source, MemberGroupDisplay target, MapperContext context)
-    {
-        target.Id = source.Id;
-        //target.Key = source.Key;
-        target.Name = source.Name;
-        target.Path = $"-1,{source.Id}";
-        //target.Udi = Udi.Create(Constants.UdiEntityType.MemberGroup, source.Key);
-    }
-
-    // Umbraco.Code.MapAll
-    private static void Map(IMember source, ContentPropertyCollectionDto target, MapperContext context) =>
-        target.Properties = context.MapEnumerable<IProperty, ContentPropertyDto>(source.Properties).WhereNotNull();
-}
diff --git a/src/Umbraco.Web.BackOffice/Middleware/ConfigureGlobalOptionsForKeepAliveMiddlware.cs b/src/Umbraco.Web.BackOffice/Middleware/ConfigureGlobalOptionsForKeepAliveMiddlware.cs
deleted file mode 100644
index 5156ad3af5..0000000000
--- a/src/Umbraco.Web.BackOffice/Middleware/ConfigureGlobalOptionsForKeepAliveMiddlware.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Configuration.Models;
-
-namespace Umbraco.Cms.Web.BackOffice.Middleware;
-
-/// <summary>
-///     Ensures the Keep Alive middleware is part of
-/// </summary>
-public sealed class ConfigureGlobalOptionsForKeepAliveMiddlware : IPostConfigureOptions<GlobalSettings>
-{
-    private readonly IOptions<KeepAliveSettings> _keepAliveSettings;
-
-    public ConfigureGlobalOptionsForKeepAliveMiddlware(IOptions<KeepAliveSettings> keepAliveSettings) =>
-        _keepAliveSettings = keepAliveSettings;
-
-    /// <summary>
-    ///     Append the keep alive ping url to the reserved URLs
-    /// </summary>
-    /// <param name="name"></param>
-    /// <param name="options"></param>
-    public void PostConfigure(string? name, GlobalSettings options) =>
-        options.ReservedUrls += _keepAliveSettings.Value.KeepAlivePingUrl;
-}
diff --git a/src/Umbraco.Web.BackOffice/Middleware/KeepAliveMiddleware.cs b/src/Umbraco.Web.BackOffice/Middleware/KeepAliveMiddleware.cs
deleted file mode 100644
index a5817c5f02..0000000000
--- a/src/Umbraco.Web.BackOffice/Middleware/KeepAliveMiddleware.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Microsoft.AspNetCore.Http;
-
-namespace Umbraco.Cms.Web.BackOffice.Middleware;
-
-/// <summary>
-///     Used for the Umbraco keep alive service. This is terminating middleware.
-/// </summary>
-public class KeepAliveMiddleware : IMiddleware
-{
-    public async Task InvokeAsync(HttpContext context, RequestDelegate next)
-    {
-        if (HttpMethods.IsGet(context.Request.Method) || HttpMethods.IsHead(context.Request.Method))
-        {
-            context.Response.StatusCode = StatusCodes.Status200OK;
-            await context.Response.WriteAsync("I'm alive");
-        }
-        else
-        {
-            context.Response.StatusCode = StatusCodes.Status404NotFound;
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelBinders/BlueprintItemBinder.cs b/src/Umbraco.Web.BackOffice/ModelBinders/BlueprintItemBinder.cs
deleted file mode 100644
index bf8c7372bc..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelBinders/BlueprintItemBinder.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.Services;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelBinders;
-
-public class BlueprintItemBinder : ContentItemBinder
-{
-    private readonly IContentService _contentService;
-
-    public BlueprintItemBinder(IJsonSerializer jsonSerializer, IUmbracoMapper umbracoMapper, IContentService contentService, IContentTypeService contentTypeService, IHostingEnvironment hostingEnvironment)
-        : base(jsonSerializer, umbracoMapper, contentService, contentTypeService, hostingEnvironment) =>
-        _contentService = contentService;
-
-    protected override IContent? GetExisting(ContentItemSave model) => _contentService.GetBlueprintById(model.Id);
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelBinders/ContentItemBinder.cs b/src/Umbraco.Web.BackOffice/ModelBinders/ContentItemBinder.cs
deleted file mode 100644
index c73a45f904..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelBinders/ContentItemBinder.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelBinders;
-
-/// <summary>
-///     The model binder for <see cref="T:Umbraco.Web.Models.ContentEditing.ContentItemSave" />
-/// </summary>
-public class ContentItemBinder : IModelBinder
-{
-    private readonly IContentService _contentService;
-    private readonly IContentTypeService _contentTypeService;
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly IJsonSerializer _jsonSerializer;
-    private readonly IUmbracoMapper _umbracoMapper;
-    private readonly ContentModelBinderHelper _modelBinderHelper;
-
-    public ContentItemBinder(
-        IJsonSerializer jsonSerializer,
-        IUmbracoMapper umbracoMapper,
-        IContentService contentService,
-        IContentTypeService contentTypeService,
-        IHostingEnvironment hostingEnvironment)
-    {
-        _jsonSerializer = jsonSerializer ?? throw new ArgumentNullException(nameof(jsonSerializer));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _contentService = contentService ?? throw new ArgumentNullException(nameof(contentService));
-        _contentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService));
-        _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
-        _modelBinderHelper = new ContentModelBinderHelper();
-    }
-
-
-    public async Task BindModelAsync(ModelBindingContext bindingContext)
-    {
-        if (bindingContext == null)
-        {
-            throw new ArgumentNullException(nameof(bindingContext));
-        }
-
-        ContentItemSave? model =
-            await _modelBinderHelper.BindModelFromMultipartRequestAsync<ContentItemSave>(_jsonSerializer,
-                _hostingEnvironment, bindingContext);
-
-        if (model is null)
-        {
-            return;
-        }
-
-        IContent? persistedContent =
-            ContentControllerBase.IsCreatingAction(model.Action) ? CreateNew(model) : GetExisting(model);
-        BindModel(model, persistedContent!, _modelBinderHelper, _umbracoMapper);
-
-        bindingContext.Result = ModelBindingResult.Success(model);
-    }
-
-    protected virtual IContent? GetExisting(ContentItemSave model) => _contentService.GetById(model.Id);
-
-    private IContent CreateNew(ContentItemSave model)
-    {
-        IContentType? contentType = _contentTypeService.Get(model.ContentTypeAlias);
-        if (contentType == null)
-        {
-            throw new InvalidOperationException("No content type found with alias " + model.ContentTypeAlias);
-        }
-
-        return new Content(
-            contentType.VariesByCulture() ? null : model.Variants.First().Name,
-            model.ParentId,
-            contentType);
-    }
-
-    internal static void BindModel(ContentItemSave model, IContent persistedContent,
-        ContentModelBinderHelper modelBinderHelper, IUmbracoMapper umbracoMapper)
-    {
-        model.PersistedContent = persistedContent;
-
-        //create the dto from the persisted model
-        if (model.PersistedContent != null)
-        {
-            foreach (ContentVariantSave variant in model.Variants)
-            {
-                //map the property dto collection with the culture of the current variant
-                variant.PropertyCollectionDto = umbracoMapper.Map<ContentPropertyCollectionDto>(
-                    model.PersistedContent,
-                    context =>
-                    {
-                        // either of these may be null and that is ok, if it's invariant they will be null which is what is expected
-                        context.SetCulture(variant.Culture);
-                        context.SetSegment(variant.Segment);
-                    });
-
-                //now map all of the saved values to the dto
-                modelBinderHelper.MapPropertyValuesFromSaved(variant, variant.PropertyCollectionDto);
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelBinders/ContentModelBinderHelper.cs b/src/Umbraco.Web.BackOffice/ModelBinders/ContentModelBinderHelper.cs
deleted file mode 100644
index 2904164b12..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelBinders/ContentModelBinderHelper.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelBinders;
-
-/// <summary>
-///     Helper methods to bind media/member models
-/// </summary>
-internal class ContentModelBinderHelper
-{
-    public async Task<T?> BindModelFromMultipartRequestAsync<T>(
-        IJsonSerializer jsonSerializer,
-        IHostingEnvironment hostingEnvironment,
-        ModelBindingContext bindingContext)
-        where T : class
-    {
-        var modelName = bindingContext.ModelName;
-
-        ValueProviderResult valueProviderResult = bindingContext.ValueProvider.GetValue(modelName);
-
-        if (valueProviderResult == ValueProviderResult.None)
-        {
-            return null;
-        }
-
-        bindingContext.ModelState.SetModelValue(modelName, valueProviderResult);
-
-        var value = valueProviderResult.FirstValue;
-
-        // Check if the argument value is null or empty
-        if (string.IsNullOrEmpty(value))
-        {
-            return null;
-        }
-
-        T? model = jsonSerializer.Deserialize<T>(value);
-        if (model is null)
-        {
-            // Non-integer arguments result in model state errors
-            bindingContext.ModelState.TryAddModelError(
-                modelName, $"Cannot deserialize {modelName} as {nameof(T)}.");
-
-            return null;
-        }
-
-        //Handle file uploads
-        foreach (IFormFile formFile in bindingContext.HttpContext.Request.Form.Files)
-        {
-            //The name that has been assigned in JS has 2 or more parts. The second part indicates the property id
-            // for which the file belongs, the remaining parts are just metadata that can be used by the property editor.
-            var parts = formFile.Name.Trim(Constants.CharArrays.DoubleQuote).Split(Constants.CharArrays.Underscore);
-            if (parts.Length < 2)
-            {
-                bindingContext.HttpContext.SetReasonPhrase(
-                    "The request was not formatted correctly the file name's must be underscore delimited");
-                return null;
-            }
-
-            var propAlias = parts[1];
-
-            //if there are 3 parts part 3 is always culture
-            string? culture = null;
-            if (parts.Length > 2)
-            {
-                culture = parts[2];
-                //normalize to null if empty
-                if (culture.IsNullOrWhiteSpace())
-                {
-                    culture = null;
-                }
-            }
-
-            //if there are 4 parts part 4 is always segment
-            string? segment = null;
-            if (parts.Length > 3)
-            {
-                segment = parts[3];
-                //normalize to null if empty
-                if (segment.IsNullOrWhiteSpace())
-                {
-                    segment = null;
-                }
-            }
-
-            // TODO: anything after 4 parts we can put in metadata
-
-            var fileName = formFile.FileName.Trim(Constants.CharArrays.DoubleQuote);
-
-            var tempFileUploadFolder =
-                hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempFileUploads);
-            Directory.CreateDirectory(tempFileUploadFolder);
-            var tempFilePath = Path.Combine(tempFileUploadFolder, Guid.NewGuid().ToString());
-
-            using (FileStream stream = File.Create(tempFilePath))
-            {
-                await formFile.CopyToAsync(stream);
-            }
-        }
-
-        return model;
-    }
-
-    /// <summary>
-    ///     we will now assign all of the values in the 'save' model to the DTO object
-    /// </summary>
-    /// <param name="saveModel"></param>
-    /// <param name="dto"></param>
-    public void MapPropertyValuesFromSaved(IContentProperties<ContentPropertyBasic> saveModel,
-        ContentPropertyCollectionDto? dto)
-    {
-        //NOTE: Don't convert this to linq, this is much quicker
-        foreach (ContentPropertyBasic p in saveModel.Properties)
-        {
-            if (dto is not null)
-            {
-                foreach (ContentPropertyDto propertyDto in dto.Properties)
-                {
-                    if (propertyDto.Alias != p.Alias)
-                    {
-                        continue;
-                    }
-
-                    propertyDto.Value = p.Value;
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelBinders/FromJsonPathAttribute.cs b/src/Umbraco.Web.BackOffice/ModelBinders/FromJsonPathAttribute.cs
deleted file mode 100644
index 996181e354..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelBinders/FromJsonPathAttribute.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Umbraco.Cms.Core;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelBinders;
-
-/// <summary>
-///     Used to bind a value from an inner json property
-/// </summary>
-/// <remarks>
-///     An example would be if you had json like:
-///     { ids: [1,2,3,4] }
-///     And you had an action like: GetByIds(int[] ids, UmbracoEntityTypes type)
-///     The ids array will not bind because the object being sent up is an object and not an array so the
-///     normal json formatter will not figure this out.
-///     This would also let you bind sub levels of the JSON being sent up too if you wanted with any jsonpath
-/// </remarks>
-public class FromJsonPathAttribute : ModelBinderAttribute
-{
-    public FromJsonPathAttribute() : base(typeof(JsonPathBinder))
-    {
-    }
-
-    internal class JsonPathBinder : IModelBinder
-    {
-        public async Task BindModelAsync(ModelBindingContext bindingContext)
-        {
-            if (bindingContext.HttpContext.Request.Method.Equals(HttpMethod.Get.ToString(), StringComparison.InvariantCultureIgnoreCase))
-            {
-                return;
-            }
-
-            if (TryModelBindFromHttpContextItems(bindingContext))
-            {
-                return;
-            }
-
-            var strJson = await bindingContext.HttpContext.Request.GetRawBodyStringAsync();
-
-
-            if (string.IsNullOrWhiteSpace(strJson))
-            {
-                return;
-            }
-
-            JObject? json = JsonConvert.DeserializeObject<JObject>(strJson);
-
-            //if no explicit json path then use the model name
-            JToken? match = json?.SelectToken(bindingContext.FieldName ?? bindingContext.ModelName);
-
-            if (match == null)
-            {
-                return;
-            }
-
-            var model = match.ToObject(bindingContext.ModelType);
-
-            bindingContext.Result = ModelBindingResult.Success(model);
-        }
-
-        public static bool TryModelBindFromHttpContextItems(ModelBindingContext bindingContext)
-        {
-            const string key = Constants.HttpContext.Items.RequestBodyAsJObject;
-
-            if (!bindingContext.HttpContext.Items.TryGetValue(key, out var cached))
-            {
-                return false;
-            }
-
-            if (cached is not JObject json)
-            {
-                return false;
-            }
-
-            JToken? match = json.SelectToken(bindingContext.FieldName);
-
-            // ReSharper disable once InvertIf
-            if (match != null)
-            {
-                bindingContext.Result = ModelBindingResult.Success(match.ToObject(bindingContext.ModelType));
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelBinders/MediaItemBinder.cs b/src/Umbraco.Web.BackOffice/ModelBinders/MediaItemBinder.cs
deleted file mode 100644
index a25496dc96..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelBinders/MediaItemBinder.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelBinders;
-
-/// <summary>
-///     The model binder for <see cref="T:Umbraco.Web.Models.ContentEditing.MediaItemSave" />
-/// </summary>
-internal class MediaItemBinder : IModelBinder
-{
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly IJsonSerializer _jsonSerializer;
-    private readonly IMediaService _mediaService;
-    private readonly IMediaTypeService _mediaTypeService;
-    private readonly ContentModelBinderHelper _modelBinderHelper;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-
-    public MediaItemBinder(
-        IJsonSerializer jsonSerializer,
-        IHostingEnvironment hostingEnvironment,
-        IMediaService mediaService,
-        IUmbracoMapper umbracoMapper,
-        IMediaTypeService mediaTypeService)
-    {
-        _jsonSerializer = jsonSerializer ?? throw new ArgumentNullException(nameof(jsonSerializer));
-        _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
-        _mediaService = mediaService ?? throw new ArgumentNullException(nameof(mediaService));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _mediaTypeService = mediaTypeService ?? throw new ArgumentNullException(nameof(mediaTypeService));
-
-        _modelBinderHelper = new ContentModelBinderHelper();
-    }
-
-    /// <summary>
-    ///     Creates the model from the request and binds it to the context
-    /// </summary>
-    /// <param name="bindingContext"></param>
-    /// <returns></returns>
-    public async Task BindModelAsync(ModelBindingContext bindingContext)
-    {
-        MediaItemSave? model =
-            await _modelBinderHelper.BindModelFromMultipartRequestAsync<MediaItemSave>(_jsonSerializer, _hostingEnvironment, bindingContext);
-        if (model == null)
-        {
-            return;
-        }
-
-        model.PersistedContent = ContentControllerBase.IsCreatingAction(model.Action)
-            ? CreateNew(model)
-            : GetExisting(model)!;
-
-        //create the dto from the persisted model
-        if (model.PersistedContent != null)
-        {
-            model.PropertyCollectionDto =
-                _umbracoMapper.Map<IMedia, ContentPropertyCollectionDto>(model.PersistedContent);
-            //now map all of the saved values to the dto
-            _modelBinderHelper.MapPropertyValuesFromSaved(model, model.PropertyCollectionDto);
-        }
-
-        model.Name = model.Name?.Trim();
-
-        bindingContext.Result = ModelBindingResult.Success(model);
-    }
-
-    private IMedia? GetExisting(MediaItemSave model) => _mediaService.GetById(Convert.ToInt32(model.Id));
-
-    private IMedia CreateNew(MediaItemSave model)
-    {
-        IMediaType? mediaType = _mediaTypeService.Get(model.ContentTypeAlias);
-        if (mediaType == null)
-        {
-            throw new InvalidOperationException("No media type found with alias " + model.ContentTypeAlias);
-        }
-
-        return new Media(model.Name, model.ParentId, mediaType);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelBinders/MemberBinder.cs b/src/Umbraco.Web.BackOffice/ModelBinders/MemberBinder.cs
deleted file mode 100644
index 4ae47bccc0..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelBinders/MemberBinder.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelBinders;
-
-/// <summary>
-///     The model binder for <see cref="T:Umbraco.Web.Models.ContentEditing.MemberSave" />
-/// </summary>
-internal class MemberBinder : IModelBinder
-{
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly IJsonSerializer _jsonSerializer;
-    private readonly IMemberService _memberService;
-    private readonly IMemberTypeService _memberTypeService;
-    private readonly ContentModelBinderHelper _modelBinderHelper;
-    private readonly IShortStringHelper _shortStringHelper;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-    public MemberBinder(
-        IJsonSerializer jsonSerializer,
-        IHostingEnvironment hostingEnvironment,
-        IShortStringHelper shortStringHelper,
-        IUmbracoMapper umbracoMapper,
-        IMemberService memberService,
-        IMemberTypeService memberTypeService)
-    {
-        _jsonSerializer = jsonSerializer ?? throw new ArgumentNullException(nameof(jsonSerializer));
-        _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
-        _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
-        _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
-        _memberService = memberService ?? throw new ArgumentNullException(nameof(memberService));
-        _memberTypeService = memberTypeService ?? throw new ArgumentNullException(nameof(memberTypeService));
-        _modelBinderHelper = new ContentModelBinderHelper();
-    }
-
-    /// <summary>
-    ///     Creates the model from the request and binds it to the context
-    /// </summary>
-    /// <param name="bindingContext"></param>
-    /// <returns></returns>
-    public async Task BindModelAsync(ModelBindingContext bindingContext)
-    {
-        MemberSave? model =
-            await _modelBinderHelper.BindModelFromMultipartRequestAsync<MemberSave>(_jsonSerializer, _hostingEnvironment, bindingContext);
-        if (model == null)
-        {
-            return;
-        }
-
-        model.PersistedContent =
-            ContentControllerBase.IsCreatingAction(model.Action) ? CreateNew(model) : GetExisting(model);
-
-        //create the dto from the persisted model
-        if (model.PersistedContent != null)
-        {
-            model.PropertyCollectionDto =
-                _umbracoMapper.Map<IMember, ContentPropertyCollectionDto>(model.PersistedContent);
-            //now map all of the saved values to the dto
-            _modelBinderHelper.MapPropertyValuesFromSaved(model, model.PropertyCollectionDto);
-        }
-
-        model.Name = model.Name?.Trim();
-
-        bindingContext.Result = ModelBindingResult.Success(model);
-    }
-
-    /// <summary>
-    ///     Returns an IMember instance used to bind values to and save (depending on the membership scenario)
-    /// </summary>
-    /// <param name="model"></param>
-    /// <returns></returns>
-    private IMember GetExisting(MemberSave model) => GetExisting(model.Key);
-
-    private IMember GetExisting(Guid key)
-    {
-        IMember? member = _memberService.GetByKey(key);
-        if (member == null)
-        {
-            throw new InvalidOperationException("Could not find member with key " + key);
-        }
-
-        return member;
-    }
-
-    /// <summary>
-    ///     Gets an instance of IMember used when creating a member
-    /// </summary>
-    /// <param name="model"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     Depending on whether a custom membership provider is configured this will return different results.
-    /// </remarks>
-    private IMember CreateNew(MemberSave model)
-    {
-        IMemberType? contentType = _memberTypeService.Get(model.ContentTypeAlias);
-        if (contentType == null)
-        {
-            throw new InvalidOperationException("No member type found with alias " + model.ContentTypeAlias);
-        }
-
-        //remove all membership properties, these values are set with the membership provider.
-        FilterMembershipProviderProperties(contentType);
-
-        //return the new member with the details filled in
-        return new Member(model.Name, model.Email, model.Username, model.Password?.NewPassword, contentType);
-    }
-
-    /// <summary>
-    ///     This will remove all of the special membership provider properties which were required to display the property
-    ///     editors
-    ///     for editing - but the values have been mapped back to the MemberSave object directly - we don't want to keep these
-    ///     properties
-    ///     on the IMember because they will attempt to be persisted which we don't want since they might not even exist.
-    /// </summary>
-    /// <param name="contentType"></param>
-    private void FilterMembershipProviderProperties(IContentTypeBase contentType)
-    {
-        Dictionary<string, PropertyType> defaultProps =
-            ConventionsHelper.GetStandardPropertyTypeStubs(_shortStringHelper);
-        //remove all membership properties, these values are set with the membership provider.
-        var exclude = defaultProps.Select(x => x.Value.Alias).ToArray();
-        FilterContentTypeProperties(contentType, exclude);
-    }
-
-    private void FilterContentTypeProperties(IContentTypeBase contentType, IEnumerable<string> exclude)
-    {
-        //remove all properties based on the exclusion list
-        foreach (var remove in exclude)
-        {
-            if (contentType.PropertyTypeExists(remove))
-            {
-                contentType.RemovePropertyType(remove);
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidator.cs b/src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidator.cs
deleted file mode 100644
index 31ac14f5d0..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidator.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelsBuilder;
-
-/// <summary>
-///     Used to validate the aliases for the content type when MB is enabled to ensure that
-///     no illegal aliases are used
-/// </summary>
-// ReSharper disable once UnusedMember.Global - This is typed scanned
-public class ContentTypeModelValidator : ContentTypeModelValidatorBase<DocumentTypeSave, PropertyTypeBasic>
-{
-    public ContentTypeModelValidator(IOptions<ModelsBuilderSettings> config) : base(config)
-    {
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidatorBase.cs b/src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidatorBase.cs
deleted file mode 100644
index 47ad9e4e80..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidatorBase.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Configuration;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Editors;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelsBuilder;
-
-public abstract class ContentTypeModelValidatorBase<TModel, TProperty> : EditorValidator<TModel>
-    where TModel : ContentTypeSave<TProperty>
-    where TProperty : PropertyTypeBasic
-{
-    private readonly IOptions<ModelsBuilderSettings> _config;
-
-    public ContentTypeModelValidatorBase(IOptions<ModelsBuilderSettings> config) => _config = config;
-
-    protected override IEnumerable<ValidationResult> Validate(TModel model)
-    {
-        // don't do anything if we're not enabled
-        if (_config.Value.ModelsMode == ModelsMode.Nothing)
-        {
-            yield break;
-        }
-
-        // list of reserved/disallowed aliases for content/media/member types - more can be added as the need arises
-        var reservedModelAliases = new[] { "system" };
-        if (reservedModelAliases.Contains(model.Alias, StringComparer.OrdinalIgnoreCase))
-        {
-            yield return new ValidationResult($"The model alias {model.Alias} is a reserved term and cannot be used", new[] { "Alias" });
-        }
-
-        TProperty[] properties = model.Groups.SelectMany(x => x.Properties)
-            .Where(x => x.Inherited == false)
-            .ToArray();
-
-        foreach (TProperty prop in properties)
-        {
-            PropertyGroupBasic<TProperty> propertyGroup = model.Groups.Single(x => x.Properties.Contains(prop));
-
-            if (model.Alias.ToLowerInvariant() == prop.Alias.ToLowerInvariant())
-            {
-                string[] memberNames =
-                {
-                    $"Groups[{model.Groups.IndexOf(propertyGroup)}].Properties[{propertyGroup.Properties.IndexOf(prop)}].Alias"
-                };
-
-                yield return new ValidationResult(
-                    string.Format(
-                        "With Models Builder enabled, you can't have a property with a the alias \"{0}\" when the content type alias is also \"{0}\".",
-                        prop.Alias),
-                    memberNames);
-            }
-
-            // we need to return the field name with an index so it's wired up correctly
-            var groupIndex = model.Groups.IndexOf(propertyGroup);
-            var propertyIndex = propertyGroup.Properties.IndexOf(prop);
-
-            ValidationResult? validationResult = ValidateProperty(prop, groupIndex, propertyIndex);
-            if (validationResult != null)
-            {
-                yield return validationResult;
-            }
-        }
-    }
-
-    private ValidationResult? ValidateProperty(PropertyTypeBasic property, int groupIndex, int propertyIndex)
-    {
-        // don't let them match any properties or methods in IPublishedContent (including those defined in any base interfaces like IPublishedElement)
-        // TODO: There are probably more!
-        var reservedProperties = typeof(IPublishedContent).GetPublicProperties().Select(x => x.Name).ToArray();
-        var reservedMethods = typeof(IPublishedContent).GetPublicMethods().Select(x => x.Name).ToArray();
-
-        var alias = property.Alias;
-
-        if (reservedProperties.InvariantContains(alias) || reservedMethods.InvariantContains(alias))
-        {
-            string[] memberNames = { $"Groups[{groupIndex}].Properties[{propertyIndex}].Alias" };
-
-            return new ValidationResult(
-                $"The alias {alias} is a reserved term and cannot be used",
-                memberNames);
-        }
-
-        return null;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelsBuilder/DashboardReport.cs b/src/Umbraco.Web.BackOffice/ModelsBuilder/DashboardReport.cs
deleted file mode 100644
index 481cda39b9..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelsBuilder/DashboardReport.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System.Text;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Infrastructure.ModelsBuilder;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelsBuilder;
-
-internal class DashboardReport
-{
-    private readonly ModelsBuilderSettings _config;
-    private readonly ModelsGenerationError _mbErrors;
-    private readonly OutOfDateModelsStatus _outOfDateModels;
-
-    public DashboardReport(IOptions<ModelsBuilderSettings> config, OutOfDateModelsStatus outOfDateModels,
-        ModelsGenerationError mbErrors)
-    {
-        _config = config.Value;
-        _outOfDateModels = outOfDateModels;
-        _mbErrors = mbErrors;
-    }
-
-    public bool CanGenerate() => _config.ModelsMode.SupportsExplicitGeneration();
-
-    public bool AreModelsOutOfDate() => _outOfDateModels.IsOutOfDate;
-
-    public string? LastError() => _mbErrors.GetLastError();
-
-    public string Text()
-    {
-        var sb = new StringBuilder();
-
-        sb.Append("<p>Version: ");
-        sb.Append(ApiVersion.Current.Version);
-        sb.Append("</p>");
-
-        sb.Append("<p>ModelsBuilder is enabled, with the following configuration:</p>");
-
-        sb.Append("<ul>");
-
-        sb.Append("<li>The <strong>models mode</strong> is '");
-        sb.Append(_config.ModelsMode.ToString());
-        sb.Append("'. ");
-
-        switch (_config.ModelsMode)
-        {
-            case ModelsMode.Nothing:
-                sb.Append(
-                    "Strongly typed models are not generated. All content and cache will operate from instance of IPublishedContent only.");
-                break;
-            case ModelsMode.InMemoryAuto:
-                sb.Append(
-                    "Strongly typed models are re-generated on startup and anytime schema changes (i.e. Content Type) are made. No recompilation necessary but the generated models are not available to code outside of Razor.");
-                break;
-            case ModelsMode.SourceCodeManual:
-                sb.Append(
-                    "Strongly typed models are generated on demand. Recompilation is necessary and models are available to all CSharp code.");
-                break;
-            case ModelsMode.SourceCodeAuto:
-                sb.Append(
-                    "Strong typed models are generated on demand and anytime schema changes (i.e. Content Type) are made. Recompilation is necessary and models are available to all CSharp code.");
-                break;
-        }
-
-        sb.Append("</li>");
-
-        if (_config.ModelsMode != ModelsMode.Nothing)
-        {
-            sb.Append(
-                $"<li>Models namespace is {_config.ModelsNamespace ?? Constants.ModelsBuilder.DefaultModelsNamespace}.</li>");
-
-            sb.Append("<li>Tracking of <strong>out-of-date models</strong> is ");
-            sb.Append(_config.FlagOutOfDateModels ? "enabled" : "not enabled");
-            sb.Append(".</li>");
-        }
-
-        sb.Append("</ul>");
-
-        return sb.ToString();
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelsBuilder/DisableModelsBuilderNotificationHandler.cs b/src/Umbraco.Web.BackOffice/ModelsBuilder/DisableModelsBuilderNotificationHandler.cs
deleted file mode 100644
index 2e11af0d1f..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelsBuilder/DisableModelsBuilderNotificationHandler.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Features;
-using Umbraco.Cms.Core.Notifications;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelsBuilder;
-
-/// <summary>
-/// Used in conjunction with <see cref="UmbracoBuilderExtensions.DisableModelsBuilderControllers"/>
-/// </summary>
-internal class DisableModelsBuilderNotificationHandler : INotificationHandler<UmbracoApplicationStartingNotification>
-{
-    private readonly UmbracoFeatures _features;
-
-    public DisableModelsBuilderNotificationHandler(UmbracoFeatures features) => _features = features;
-
-    /// <summary>
-    ///     Handles the <see cref="UmbracoApplicationStartingNotification" /> notification to disable MB controller features
-    /// </summary>
-    public void Handle(UmbracoApplicationStartingNotification notification) =>
-        // disable the embedded dashboard controller
-        _features.Disabled.Controllers.Add<ModelsBuilderDashboardController>();
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelsBuilder/MediaTypeModelValidator.cs b/src/Umbraco.Web.BackOffice/ModelsBuilder/MediaTypeModelValidator.cs
deleted file mode 100644
index 1322df860d..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelsBuilder/MediaTypeModelValidator.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelsBuilder;
-
-/// <summary>
-///     Used to validate the aliases for the content type when MB is enabled to ensure that
-///     no illegal aliases are used
-/// </summary>
-// ReSharper disable once UnusedMember.Global - This is typed scanned
-public class MediaTypeModelValidator : ContentTypeModelValidatorBase<MediaTypeSave, PropertyTypeBasic>
-{
-    public MediaTypeModelValidator(IOptions<ModelsBuilderSettings> config) : base(config)
-    {
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelsBuilder/MemberTypeModelValidator.cs b/src/Umbraco.Web.BackOffice/ModelsBuilder/MemberTypeModelValidator.cs
deleted file mode 100644
index b0cee23b56..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelsBuilder/MemberTypeModelValidator.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelsBuilder;
-
-/// <summary>
-///     Used to validate the aliases for the content type when MB is enabled to ensure that
-///     no illegal aliases are used
-/// </summary>
-// ReSharper disable once UnusedMember.Global - This is typed scanned
-public class MemberTypeModelValidator : ContentTypeModelValidatorBase<MemberTypeSave, MemberPropertyTypeBasic>
-{
-    public MemberTypeModelValidator(IOptions<ModelsBuilderSettings> config) : base(config)
-    {
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardController.cs b/src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardController.cs
deleted file mode 100644
index 94d0919a4f..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardController.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-using System.ComponentModel;
-using System.Runtime.Serialization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Configuration;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Infrastructure.ModelsBuilder;
-using Umbraco.Cms.Infrastructure.ModelsBuilder.Building;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelsBuilder;
-
-/// <summary>
-///     API controller for use in the Umbraco back office with Angular resources
-/// </summary>
-/// <remarks>
-///     We've created a different controller for the backoffice/angular specifically this is to ensure that the
-///     correct CSRF security is adhered to for angular and it also ensures that this controller is not subseptipal to
-///     global WebApi formatters being changed since this is always forced to only return Angular JSON Specific formats.
-/// </remarks>
-[Authorize(Policy = AuthorizationPolicies.SectionAccessSettings)]
-public class ModelsBuilderDashboardController : UmbracoAuthorizedJsonController
-{
-    public enum OutOfDateType
-    {
-        OutOfDate,
-        Current,
-        Unknown = 100
-    }
-
-    private readonly ModelsBuilderSettings _config;
-    private readonly DashboardReport _dashboardReport;
-    private readonly ModelsGenerationError _mbErrors;
-    private readonly IModelsGenerator _modelGenerator;
-    private readonly OutOfDateModelsStatus _outOfDateModels;
-
-    // TODO: Remove in v13
-    private readonly ModelsGenerator? _concreteModelGenerator;
-
-    [Obsolete("This constructor is obsolete and will be removed in v13. Use the constructor with IModelsGenerator instead.")]
-    [Browsable(false)]
-    public ModelsBuilderDashboardController(
-        IOptions<ModelsBuilderSettings> config,
-        ModelsGenerator modelsGenerator,
-        OutOfDateModelsStatus outOfDateModels,
-        ModelsGenerationError mbErrors)
-        : this(config, StaticServiceProvider.Instance.GetRequiredService<IModelsGenerator>(), outOfDateModels, mbErrors)
-    {
-    }
-
-    [Obsolete("This constructor is obsolete and will be removed in v13. Use the constructor with only IModelsGenerator instead.")]
-    [Browsable(false)]
-    public ModelsBuilderDashboardController(
-        IOptions<ModelsBuilderSettings> config,
-        ModelsGenerator concreteModelGenerator,
-        IModelsGenerator modelsGenerator,
-        OutOfDateModelsStatus outOfDateModels,
-        ModelsGenerationError mbErrors)
-        : this(config, modelsGenerator, outOfDateModels, mbErrors)
-    {
-    }
-
-    [ActivatorUtilitiesConstructor]
-    public ModelsBuilderDashboardController(IOptions<ModelsBuilderSettings> config,
-        IModelsGenerator modelsGenerator,
-        OutOfDateModelsStatus outOfDateModels,
-        ModelsGenerationError mbErrors)
-    {
-        _config = config.Value;
-        _modelGenerator = modelsGenerator;
-        _outOfDateModels = outOfDateModels;
-        _mbErrors = mbErrors;
-        _dashboardReport = new DashboardReport(config, outOfDateModels, mbErrors);
-    }
-
-    // invoked by the dashboard
-    // requires that the user is logged into the backoffice and has access to the settings section
-    // beware! the name of the method appears in modelsbuilder.controller.js
-    [HttpPost] // use the http one, not mvc, with api controllers!
-    public IActionResult BuildModels()
-    {
-        try
-        {
-            if (!_config.ModelsMode.SupportsExplicitGeneration())
-            {
-                var result2 = new BuildResult { Success = false, Message = "Models generation is not enabled." };
-
-                return Ok(result2);
-            }
-
-            _modelGenerator.GenerateModels();
-            _mbErrors.Clear();
-        }
-        catch (Exception e)
-        {
-            _mbErrors.Report("Failed to build models.", e);
-        }
-
-        return Ok(GetDashboardResult());
-    }
-
-    // invoked by the back-office
-    // requires that the user is logged into the backoffice and has access to the settings section
-    [HttpGet] // use the http one, not mvc, with api controllers!
-    public ActionResult<OutOfDateStatus> GetModelsOutOfDateStatus()
-    {
-        OutOfDateStatus status = _outOfDateModels.IsEnabled
-            ? _outOfDateModels.IsOutOfDate
-                ? new OutOfDateStatus { Status = OutOfDateType.OutOfDate }
-                : new OutOfDateStatus { Status = OutOfDateType.Current }
-            : new OutOfDateStatus { Status = OutOfDateType.Unknown };
-
-        return status;
-    }
-
-    // invoked by the back-office
-    // requires that the user is logged into the backoffice and has access to the settings section
-    // beware! the name of the method appears in modelsbuilder.controller.js
-    [HttpGet] // use the http one, not mvc, with api controllers!
-    public ActionResult<Dashboard> GetDashboard() => GetDashboardResult();
-
-    private Dashboard GetDashboardResult() => new()
-    {
-        Mode = _config.ModelsMode,
-        Text = _dashboardReport.Text(),
-        CanGenerate = _dashboardReport.CanGenerate(),
-        OutOfDateModels = _dashboardReport.AreModelsOutOfDate(),
-        LastError = _dashboardReport.LastError()
-    };
-
-    [DataContract]
-    public class BuildResult
-    {
-        [DataMember(Name = "success")] public bool Success { get; set; }
-
-        [DataMember(Name = "message")] public string? Message { get; set; }
-    }
-
-    [DataContract]
-    public class Dashboard
-    {
-        [DataMember(Name = "mode")] public ModelsMode Mode { get; set; }
-
-        [DataMember(Name = "text")] public string? Text { get; set; }
-
-        [DataMember(Name = "canGenerate")] public bool CanGenerate { get; set; }
-
-        [DataMember(Name = "outOfDateModels")] public bool OutOfDateModels { get; set; }
-
-        [DataMember(Name = "lastError")] public string? LastError { get; set; }
-    }
-
-    [DataContract]
-    public class OutOfDateStatus
-    {
-        [DataMember(Name = "status")] public OutOfDateType Status { get; set; }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardProvider.cs b/src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardProvider.cs
deleted file mode 100644
index abad45634e..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardProvider.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Routing;
-using Umbraco.Cms.Web.Common.ModelsBuilder;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelsBuilder;
-
-public class ModelsBuilderDashboardProvider : IModelsBuilderDashboardProvider
-{
-    private readonly LinkGenerator _linkGenerator;
-
-    public ModelsBuilderDashboardProvider(LinkGenerator linkGenerator) => _linkGenerator = linkGenerator;
-
-    public string? GetUrl() =>
-        _linkGenerator.GetUmbracoApiServiceBaseUrl<ModelsBuilderDashboardController>(controller =>
-            controller.BuildModels());
-}
diff --git a/src/Umbraco.Web.BackOffice/ModelsBuilder/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/ModelsBuilder/UmbracoBuilderExtensions.cs
deleted file mode 100644
index e1ba04e95a..0000000000
--- a/src/Umbraco.Web.BackOffice/ModelsBuilder/UmbracoBuilderExtensions.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Notifications;
-using Umbraco.Cms.Web.Common.Controllers;
-using Umbraco.Cms.Web.Common.ModelsBuilder;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.ModelsBuilder;
-
-/// <summary>
-/// Extension methods for <see cref="IUmbracoBuilder"/> for the common Umbraco functionality
-/// </summary>
-public static class UmbracoBuilderExtensions
-{
-    /// <summary>
-    /// Adds the ModelsBuilder dashboard, but only when not in production mode.
-    /// </summary>
-    internal static IUmbracoBuilder TryAddModelsBuilderDashboard(this IUmbracoBuilder builder)
-    {
-        if (builder.Config.GetRuntimeMode() == RuntimeMode.Production)
-        {
-            builder.RemoveModelsBuilderDashboard();
-        }
-        else
-        {
-            builder.AddModelsBuilderDashboard();
-        }
-
-        return builder;
-    }
-
-    /// <summary>
-    /// Adds the ModelsBuilder dashboard (dashboard and API controller are automatically added).
-    /// </summary>
-    public static IUmbracoBuilder AddModelsBuilderDashboard(this IUmbracoBuilder builder)
-    {
-        builder.Services.AddUnique<IModelsBuilderDashboardProvider, ModelsBuilderDashboardProvider>();
-
-        return builder;
-    }
-
-    /// <summary>
-    /// Removes the ModelsBuilder dashboard (and API controller).
-    /// </summary>
-    public static IUmbracoBuilder RemoveModelsBuilderDashboard(this IUmbracoBuilder builder)
-    {
-        builder.WithCollectionBuilder<UmbracoApiControllerTypeCollectionBuilder>().Remove<ModelsBuilderDashboardController>();
-
-        return builder;
-    }
-
-    /// <summary>
-    /// Can be called if using an external models builder to remove the embedded models builder controller features.
-    /// </summary>
-    public static IUmbracoBuilder DisableModelsBuilderControllers(this IUmbracoBuilder builder)
-        => builder.AddNotificationHandler<UmbracoApplicationStartingNotification, DisableModelsBuilderNotificationHandler>();
-}
diff --git a/src/Umbraco.Web.BackOffice/Profiling/WebProfilingController.cs b/src/Umbraco.Web.BackOffice/Profiling/WebProfilingController.cs
deleted file mode 100644
index dbbe0adbbf..0000000000
--- a/src/Umbraco.Web.BackOffice/Profiling/WebProfilingController.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Profiling;
-
-/// <summary>
-///     The API controller used to display the state of the web profiler
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Authorize(Policy = AuthorizationPolicies.SectionAccessSettings)]
-public class WebProfilingController : UmbracoAuthorizedJsonController
-{
-    private readonly IHostingEnvironment _hosting;
-
-    public WebProfilingController(IHostingEnvironment hosting) => _hosting = hosting;
-
-    public object GetStatus() =>
-        new { Enabled = _hosting.IsDebugMode };
-}
diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs
deleted file mode 100644
index 3b2124d560..0000000000
--- a/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.PropertyEditors;
-
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-[Obsolete("Nested content is obsolete, will be removed in V13")]
-public class NestedContentController : UmbracoAuthorizedJsonController
-{
-    private readonly IContentTypeService _contentTypeService;
-
-    public NestedContentController(IContentTypeService contentTypeService) => _contentTypeService = contentTypeService;
-
-    [HttpGet]
-    public IEnumerable<object> GetContentTypes() => _contentTypeService
-        .GetAllElementTypes()
-        .OrderBy(x => x.SortOrder)
-        .Select(x => new
-        {
-            id = x.Id,
-            guid = x.Key,
-            name = x.Name,
-            alias = x.Alias,
-            icon = x.Icon,
-            tabs = x.CompositionPropertyGroups
-                .Where(x => x.Type == PropertyGroupType.Group && x.GetParentAlias() is null)
-                .Select(y => y.Name).Distinct()
-        });
-}
diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/RichTextPreValueController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/RichTextPreValueController.cs
deleted file mode 100644
index f075199882..0000000000
--- a/src/Umbraco.Web.BackOffice/PropertyEditors/RichTextPreValueController.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Attributes;
-
-namespace Umbraco.Cms.Web.BackOffice.PropertyEditors;
-
-/// <summary>
-///     ApiController to provide RTE configuration with available plugins and commands from the RTE config
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class RichTextPreValueController : UmbracoAuthorizedJsonController
-{
-    private readonly IOptions<RichTextEditorSettings> _richTextEditorSettings;
-
-    public RichTextPreValueController(IOptions<RichTextEditorSettings> richTextEditorSettings) =>
-        _richTextEditorSettings = richTextEditorSettings;
-
-    public RichTextEditorConfiguration GetConfiguration()
-    {
-        RichTextEditorSettings? settings = _richTextEditorSettings.Value;
-
-        var config = new RichTextEditorConfiguration
-        {
-            Plugins = settings.Plugins.Select(x => new RichTextEditorPlugin { Name = x }),
-            Commands =
-                settings.Commands.Select(x =>
-                    new RichTextEditorCommand { Alias = x.Alias, Mode = x.Mode, Name = x.Name }),
-            ValidElements = settings.ValidElements,
-            InvalidElements = settings.InvalidElements,
-            CustomConfig = settings.CustomConfig,
-            CloudApiKey = settings.CloudApiKey,
-        };
-
-        return config;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
deleted file mode 100644
index 622b038b32..0000000000
--- a/src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System.Text.RegularExpressions;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Media;
-using Umbraco.Cms.Core.Media.EmbedProviders;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Attributes;
-
-namespace Umbraco.Cms.Web.BackOffice.PropertyEditors;
-
-/// <summary>
-///     A controller used for the embed dialog
-/// </summary>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class RteEmbedController : UmbracoAuthorizedJsonController
-{
-    private readonly EmbedProvidersCollection _embedCollection;
-    private readonly ILogger<RteEmbedController> _logger;
-
-    public RteEmbedController(EmbedProvidersCollection embedCollection, ILogger<RteEmbedController> logger)
-    {
-        _embedCollection = embedCollection ?? throw new ArgumentNullException(nameof(embedCollection));
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-    }
-
-    public OEmbedResult GetEmbed(string url, int width, int height)
-    {
-        var result = new OEmbedResult();
-        var foundMatch = false;
-        IEmbedProvider? matchedProvider = null;
-
-        foreach (IEmbedProvider provider in _embedCollection)
-        {
-            // UrlSchemeRegex is an array of possible regex patterns to match against the URL
-            foreach (var urlPattern in provider.UrlSchemeRegex)
-            {
-                var regexPattern = new Regex(urlPattern, RegexOptions.IgnoreCase);
-                if (regexPattern.IsMatch(url))
-                {
-                    foundMatch = true;
-                    matchedProvider = provider;
-                    break;
-                }
-            }
-
-            if (foundMatch)
-            {
-                break;
-            }
-        }
-
-        if (foundMatch == false)
-        {
-            //No matches return/ exit
-            result.OEmbedStatus = OEmbedStatus.NotSupported;
-            return result;
-        }
-
-        try
-        {
-            result.SupportsDimensions = true;
-            result.Markup = matchedProvider?.GetMarkup(url, width, height);
-            result.OEmbedStatus = OEmbedStatus.Success;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error embedding URL {Url} - width: {Width} height: {Height}", url, width, height);
-            result.OEmbedStatus = OEmbedStatus.Error;
-        }
-
-        return result;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs
deleted file mode 100644
index c8b32b220c..0000000000
--- a/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.PublishedCache;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Filters;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.PropertyEditors;
-
-/// <summary>
-///     A controller used for type-ahead values for tags
-/// </summary>
-/// <remarks>
-///     DO NOT inherit from UmbracoAuthorizedJsonController since we don't want to use the angularized
-///     json formatter as it causes problems.
-/// </remarks>
-[PluginController(Constants.Web.Mvc.BackOfficeApiArea)]
-public class TagsDataController : UmbracoAuthorizedApiController
-{
-    private readonly ITagQuery _tagQuery;
-
-    public TagsDataController(ITagQuery tagQuery) =>
-        _tagQuery = tagQuery ?? throw new ArgumentNullException(nameof(tagQuery));
-
-    /// <summary>
-    ///     Returns all tags matching tagGroup, culture and an optional query
-    /// </summary>
-    /// <param name="tagGroup"></param>
-    /// <param name="culture"></param>
-    /// <param name="query"></param>
-    /// <returns></returns>
-    [AllowHttpJsonConfigration]
-    public IEnumerable<TagModel> GetTags(string tagGroup, string? culture, string? query = null)
-    {
-        if (culture == string.Empty)
-        {
-            culture = null;
-        }
-
-        IEnumerable<TagModel?> result = _tagQuery.GetAllTags(tagGroup, culture);
-
-
-        if (!query.IsNullOrWhiteSpace())
-        {
-            //TODO: add the query to TagQuery + the tag service, this is ugly but all we can do for now.
-            //currently we are post filtering this :( but works for now
-            result = result.Where(x => x?.Text?.InvariantContains(query!) ?? false);
-        }
-
-        return result.WhereNotNull().OrderBy(x => x.Text);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ComplexEditorElementTypeValidationResult.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ComplexEditorElementTypeValidationResult.cs
deleted file mode 100644
index b18508f8de..0000000000
--- a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ComplexEditorElementTypeValidationResult.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Umbraco.Cms.Web.BackOffice.PropertyEditors.Validation;
-
-/// <summary>
-///     A collection of <see cref="ComplexEditorPropertyTypeValidationResult" /> for an element type within complex editor
-///     represented by an Element Type
-/// </summary>
-/// <remarks>
-///     For a more indepth explanation of how server side validation works with the angular app, see this GitHub PR:
-///     https://github.com/umbraco/Umbraco-CMS/pull/8339
-/// </remarks>
-public class ComplexEditorElementTypeValidationResult : ValidationResult
-{
-    public ComplexEditorElementTypeValidationResult(string elementTypeAlias, Guid blockId)
-        : base(string.Empty)
-    {
-        ElementTypeAlias = elementTypeAlias;
-        BlockId = blockId;
-    }
-
-    public IList<ComplexEditorPropertyTypeValidationResult> ValidationResults { get; } =
-        new List<ComplexEditorPropertyTypeValidationResult>();
-
-    /// <summary>
-    ///     The element type alias of the validation result
-    /// </summary>
-    /// <remarks>
-    ///     This is useful for debugging purposes but it's not actively used in the angular app
-    /// </remarks>
-    public string ElementTypeAlias { get; }
-
-    /// <summary>
-    ///     The Block ID of the validation result
-    /// </summary>
-    /// <remarks>
-    ///     This is the GUID id of the content item based on the element type
-    /// </remarks>
-    public Guid BlockId { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ComplexEditorPropertyTypeValidationResult.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ComplexEditorPropertyTypeValidationResult.cs
deleted file mode 100644
index 71ae1cb540..0000000000
--- a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ComplexEditorPropertyTypeValidationResult.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Umbraco.Cms.Web.BackOffice.PropertyEditors.Validation;
-
-/// <summary>
-///     A collection of <see cref="ValidationResult" /> for a property type within a complex editor represented by an
-///     Element Type
-/// </summary>
-/// <remarks>
-///     For a more indepth explanation of how server side validation works with the angular app, see this GitHub PR:
-///     https://github.com/umbraco/Umbraco-CMS/pull/8339
-/// </remarks>
-public class ComplexEditorPropertyTypeValidationResult : ValidationResult
-{
-    private readonly List<ValidationResult> _validationResults = new();
-
-    public ComplexEditorPropertyTypeValidationResult(string propertyTypeAlias)
-        : base(string.Empty) =>
-        PropertyTypeAlias = propertyTypeAlias;
-
-    public IReadOnlyList<ValidationResult> ValidationResults => _validationResults;
-
-    public string PropertyTypeAlias { get; }
-
-    public void AddValidationResult(ValidationResult validationResult)
-    {
-        if (validationResult is ComplexEditorValidationResult &&
-            _validationResults.Any(x => x is ComplexEditorValidationResult))
-        {
-            throw new InvalidOperationException($"Cannot add more than one {typeof(ComplexEditorValidationResult)}");
-        }
-
-        _validationResults.Add(validationResult);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ComplexEditorValidationResult.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ComplexEditorValidationResult.cs
deleted file mode 100644
index 9f0d1956d3..0000000000
--- a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ComplexEditorValidationResult.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Umbraco.Cms.Web.BackOffice.PropertyEditors.Validation;
-
-/// <summary>
-///     A collection of <see cref="ComplexEditorElementTypeValidationResult" /> for a complex editor represented by an
-///     Element Type
-/// </summary>
-/// <remarks>
-///     For example, each <see cref="ComplexEditorValidationResult" /> represents validation results for a row in Nested
-///     Content.
-///     For a more indepth explanation of how server side validation works with the angular app, see this GitHub PR:
-///     https://github.com/umbraco/Umbraco-CMS/pull/8339
-/// </remarks>
-public class ComplexEditorValidationResult : ValidationResult
-{
-    public ComplexEditorValidationResult()
-        : base(string.Empty)
-    {
-    }
-
-    public IList<ComplexEditorElementTypeValidationResult> ValidationResults { get; } =
-        new List<ComplexEditorElementTypeValidationResult>();
-}
diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ContentPropertyValidationResult.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ContentPropertyValidationResult.cs
deleted file mode 100644
index 6379cffc59..0000000000
--- a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ContentPropertyValidationResult.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using Newtonsoft.Json;
-using Umbraco.Cms.Core.PropertyEditors.Validation;
-
-namespace Umbraco.Cms.Web.BackOffice.PropertyEditors.Validation;
-
-/// <summary>
-///     Custom <see cref="ValidationResult" /> for content properties
-/// </summary>
-/// <remarks>
-///     This clones the original result and then ensures the nested result if it's the correct type.
-///     For a more indepth explanation of how server side validation works with the angular app, see this GitHub PR:
-///     https://github.com/umbraco/Umbraco-CMS/pull/8339
-/// </remarks>
-public class ContentPropertyValidationResult : ValidationResult
-{
-    private readonly string _culture;
-    private readonly string _segment;
-
-    public ContentPropertyValidationResult(ValidationResult nested, string culture, string segment)
-        : base(nested.ErrorMessage, nested.MemberNames)
-    {
-        ComplexEditorResults = nested as ComplexEditorValidationResult;
-        _culture = culture;
-        _segment = segment;
-    }
-
-    /// <summary>
-    ///     Nested validation results for the content property
-    /// </summary>
-    /// <remarks>
-    ///     There can be nested results for complex editors that contain other editors
-    /// </remarks>
-    public ComplexEditorValidationResult? ComplexEditorResults { get; }
-
-    /// <summary>
-    ///     Return the <see cref="ValidationResult.ErrorMessage" /> if <see cref="ComplexEditorResults" /> is null, else the
-    ///     serialized
-    ///     complex validation results
-    /// </summary>
-    /// <returns></returns>
-    public override string ToString()
-    {
-        if (ComplexEditorResults == null)
-        {
-            return base.ToString();
-        }
-
-        var json = JsonConvert.SerializeObject(this, new ValidationResultConverter(_culture, _segment));
-        return json;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ValidationResultConverter.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ValidationResultConverter.cs
deleted file mode 100644
index 53bc3bbb7d..0000000000
--- a/src/Umbraco.Web.BackOffice/PropertyEditors/Validation/ValidationResultConverter.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Serialization;
-using Umbraco.Cms.Core.PropertyEditors.Validation;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.PropertyEditors.Validation;
-
-/// <summary>
-///     Custom json converter for <see cref="ValidationResult" /> and <see cref="ContentPropertyValidationResult" />
-/// </summary>
-/// <remarks>
-///     This converter is specifically used to convert validation results for content in order to be able to have nested
-///     validation results for complex editors.
-///     For a more indepth explanation of how server side validation works with the angular app, see this GitHub PR:
-///     https://github.com/umbraco/Umbraco-CMS/pull/8339
-/// </remarks>
-internal class ValidationResultConverter : JsonConverter
-{
-    private readonly string _culture;
-    private readonly string _segment;
-
-    /// <summary>
-    ///     Constructor
-    /// </summary>
-    /// <param name="culture">The culture of the containing property which will be transfered to all child model state</param>
-    /// <param name="segment">The segment of the containing property which will be transfered to all child model state</param>
-    public ValidationResultConverter(string culture = "", string segment = "")
-    {
-        _culture = culture;
-        _segment = segment;
-    }
-
-    public override bool CanConvert(Type objectType) => typeof(ValidationResult).IsAssignableFrom(objectType);
-
-    public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) => throw new NotImplementedException();
-
-    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
-    {
-        var camelCaseSerializer = new JsonSerializer
-        {
-            ContractResolver = new CamelCasePropertyNamesContractResolver(),
-            DefaultValueHandling = DefaultValueHandling.Ignore
-        };
-        foreach (JsonConverter c in serializer.Converters)
-        {
-            camelCaseSerializer.Converters.Add(c);
-        }
-
-        var validationResult = (ValidationResult?)value;
-
-        if (validationResult is ComplexEditorValidationResult nestedResult && nestedResult.ValidationResults.Count > 0)
-        {
-            var ja = new JArray();
-            foreach (ComplexEditorElementTypeValidationResult nested in nestedResult.ValidationResults)
-            {
-                // recurse to write out the ComplexEditorElementTypeValidationResult
-                var block = JObject.FromObject(nested, camelCaseSerializer);
-                ja.Add(block);
-            }
-
-            if (nestedResult.ValidationResults.Count > 0)
-            {
-                ja.WriteTo(writer);
-            }
-        }
-        else if (validationResult is ComplexEditorElementTypeValidationResult elementTypeValidationResult &&
-                 elementTypeValidationResult.ValidationResults.Count > 0)
-        {
-            var joElementType = new JObject
-            {
-                {"$id", elementTypeValidationResult.BlockId},
-
-                // We don't use this anywhere, though it's nice for debugging
-                {"$elementTypeAlias", elementTypeValidationResult.ElementTypeAlias}
-            };
-
-            var modelState = new ModelStateDictionary();
-
-            // loop over property validations
-            foreach (ComplexEditorPropertyTypeValidationResult propTypeResult in elementTypeValidationResult
-                         .ValidationResults)
-            {
-                // group the results by their type and iterate the groups
-                foreach (IGrouping<Type, ValidationResult> result in propTypeResult.ValidationResults.GroupBy(x =>
-                             x.GetType()))
-                {
-                    // if the group's type isn't ComplexEditorValidationResult then it will in 99% of cases be
-                    // just ValidationResult for whcih we want to create the sub "ModelState" data. If it's not a normal
-                    // ValidationResult it will still just be converted to normal ModelState.
-
-                    if (result.Key == typeof(ComplexEditorValidationResult))
-                    {
-                        // if it's ComplexEditorValidationResult then there can only be one which is validated so just get the single
-                        if (result.Any())
-                        {
-                            ValidationResult complexResult = result.Single();
-                            // recurse to get the validation result object
-                            var obj = JToken.FromObject(complexResult, camelCaseSerializer);
-                            joElementType.Add(propTypeResult.PropertyTypeAlias, obj);
-
-                            // For any nested property error we add the model state as empty state for that nested property
-                            // NOTE: Instead of the empty validation message we could put in the translated
-                            // "errors/propertyHasErrors" message, however I think that leaves for less flexibility since it could/should be
-                            // up to the front-end validator to show whatever message it wants (if any) for an error indicating a nested property error.
-                            // Will leave blank.
-                            modelState.AddPropertyValidationError(new ValidationResult(string.Empty), propTypeResult.PropertyTypeAlias, _culture, _segment);
-                        }
-                    }
-                    else
-                    {
-                        foreach (ValidationResult v in result)
-                        {
-                            modelState.AddPropertyValidationError(v, propTypeResult.PropertyTypeAlias, _culture, _segment);
-                        }
-                    }
-                }
-            }
-
-            if (modelState.Count > 0)
-            {
-                joElementType.Add("ModelState", JObject.FromObject(modelState.ToErrorDictionary()));
-            }
-
-            joElementType.WriteTo(writer);
-        }
-        else
-        {
-            if (validationResult is ContentPropertyValidationResult propertyValidationResult
-                && propertyValidationResult.ComplexEditorResults?.ValidationResults.Count > 0)
-            {
-                // recurse to write out the NestedValidationResults
-                var obj = JToken.FromObject(propertyValidationResult.ComplexEditorResults, camelCaseSerializer);
-                obj.WriteTo(writer);
-            }
-
-            var jo = new JObject();
-            if (!validationResult?.ErrorMessage.IsNullOrWhiteSpace() ?? false)
-            {
-                var errObj = JToken.FromObject(validationResult!.ErrorMessage!, camelCaseSerializer);
-                jo.Add("errorMessage", errObj);
-            }
-
-            if (validationResult?.MemberNames.Any() ?? false)
-            {
-                var memberNamesObj = JToken.FromObject(validationResult.MemberNames, camelCaseSerializer);
-                jo.Add("memberNames", memberNamesObj);
-            }
-
-            if (jo.HasValues)
-            {
-                jo.WriteTo(writer);
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgery.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgery.cs
deleted file mode 100644
index cc1fc0c4bc..0000000000
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgery.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using Microsoft.AspNetCore.Antiforgery;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-
-namespace Umbraco.Cms.Web.BackOffice.Security;
-
-/// <summary>
-///     Anti-forgery implementation for the Umbraco back office
-/// </summary>
-/// <remarks>
-///     This is a wrapper around the global/default <see cref="IAntiforgery" /> .net service. Because this service is a
-///     single/global
-///     object and all of it is internal we don't have the flexibility to create our own segregated service so we have to
-///     work around
-///     that limitation by wrapping the default and doing a few tricks to have this segregated for the Back office only.
-/// </remarks>
-public class BackOfficeAntiforgery : IBackOfficeAntiforgery
-{
-    private readonly IAntiforgery _internalAntiForgery;
-    private readonly CookieBuilder _angularCookieBuilder;
-
-    [Obsolete($"Please use the constructor that accepts {nameof(ILoggerFactory)}. Will be removed in V14.")]
-    public BackOfficeAntiforgery(IOptionsMonitor<GlobalSettings> globalSettings)
-        : this(globalSettings, NullLoggerFactory.Instance)
-    { }
-
-    public BackOfficeAntiforgery(IOptionsMonitor<GlobalSettings> globalSettings, ILoggerFactory loggerFactory)
-    {
-        CookieSecurePolicy cookieSecurePolicy = globalSettings.CurrentValue.UseHttps ? CookieSecurePolicy.Always : CookieSecurePolicy.SameAsRequest;
-
-        // NOTE: This is the only way to create a separate IAntiForgery service :(
-        // Everything in netcore is internal. I have logged an issue here https://github.com/dotnet/aspnetcore/issues/22217
-        // but it will not be handled so we have to revert to this.
-        _internalAntiForgery = new ServiceCollection()
-            .AddSingleton(loggerFactory)
-            .AddAntiforgery(x =>
-            {
-                x.HeaderName = Constants.Web.AngularHeadername;
-                x.Cookie.Name = Constants.Web.CsrfValidationCookieName;
-                x.Cookie.SecurePolicy = cookieSecurePolicy;
-            })
-            .BuildServiceProvider()
-            .GetRequiredService<IAntiforgery>();
-
-        // Configure cookie builder using defaults from antiforgery options
-        _angularCookieBuilder = new AntiforgeryOptions().Cookie;
-        _angularCookieBuilder.HttpOnly = false; // Needs to be accessed from JavaScript
-        _angularCookieBuilder.SecurePolicy = cookieSecurePolicy;
-    }
-
-    /// <inheritdoc />
-    public async Task<Attempt<string?>> ValidateRequestAsync(HttpContext httpContext)
-    {
-        try
-        {
-            await _internalAntiForgery.ValidateRequestAsync(httpContext);
-            return Attempt<string?>.Succeed();
-        }
-        catch (Exception ex)
-        {
-            return Attempt.Fail(ex.Message);
-        }
-    }
-
-    /// <inheritdoc />
-    public void GetAndStoreTokens(HttpContext httpContext)
-    {
-        AntiforgeryTokenSet set = _internalAntiForgery.GetAndStoreTokens(httpContext);
-
-        if (set.RequestToken == null)
-        {
-            throw new InvalidOperationException("Could not resolve a request token.");
-        }
-
-        // We need to set 2 cookies:
-        // The cookie value that angular will use to set a header value on each request - we need to manually set this here
-        // The validation cookie value generated by the anti-forgery helper that we validate the header token against - set above in GetAndStoreTokens
-        httpContext.Response.Cookies.Append(Constants.Web.AngularCookieName, set.RequestToken, _angularCookieBuilder.Build(httpContext));
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeCookieManager.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeCookieManager.cs
deleted file mode 100644
index a85cec1bf8..0000000000
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeCookieManager.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Http;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Web;
-using Umbraco.Extensions;
-using ICookieManager = Microsoft.AspNetCore.Authentication.Cookies.ICookieManager;
-
-namespace Umbraco.Cms.Web.BackOffice.Security;
-
-/// <summary>
-///     A custom cookie manager that is used to read the cookie from the request.
-/// </summary>
-/// <remarks>
-///     Umbraco's back office cookie needs to be read on two paths: /umbraco and /install, therefore we cannot just set the
-///     cookie path to be /umbraco,
-///     instead we'll specify our own cookie manager and return null if the request isn't for an acceptable path.
-/// </remarks>
-public class BackOfficeCookieManager : ChunkingCookieManager, ICookieManager
-{
-    private readonly IBasicAuthService _basicAuthService;
-    private readonly string[]? _explicitPaths;
-    private readonly IRuntimeState _runtime;
-    private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-    private readonly UmbracoRequestPaths _umbracoRequestPaths;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="BackOfficeCookieManager" /> class.
-    /// </summary>
-    public BackOfficeCookieManager(
-        IUmbracoContextAccessor umbracoContextAccessor,
-        IRuntimeState runtime,
-        UmbracoRequestPaths umbracoRequestPaths,
-        IBasicAuthService basicAuthService)
-        : this(umbracoContextAccessor, runtime, null, umbracoRequestPaths, basicAuthService)
-    {
-    }
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="BackOfficeCookieManager" /> class.
-    /// </summary>
-    public BackOfficeCookieManager(
-        IUmbracoContextAccessor umbracoContextAccessor,
-        IRuntimeState runtime,
-        IEnumerable<string>? explicitPaths,
-        UmbracoRequestPaths umbracoRequestPaths,
-        IBasicAuthService basicAuthService)
-    {
-        _umbracoContextAccessor = umbracoContextAccessor;
-        _runtime = runtime;
-        _explicitPaths = explicitPaths?.ToArray();
-        _umbracoRequestPaths = umbracoRequestPaths;
-        _basicAuthService = basicAuthService;
-    }
-
-    /// <summary>
-    ///     Explicitly implement this so that we filter the request
-    /// </summary>
-    /// <inheritdoc />
-    string? ICookieManager.GetRequestCookie(HttpContext context, string key)
-    {
-        PathString absPath = context.Request.Path;
-        if (!_umbracoContextAccessor.TryGetUmbracoContext(out _) || _umbracoRequestPaths.IsClientSideRequest(absPath))
-        {
-            return null;
-        }
-
-        return ShouldAuthenticateRequest(absPath) == false
-
-            // Don't auth request, don't return a cookie
-            ? null
-
-            // Return the default implementation
-            : GetRequestCookie(context, key);
-    }
-
-    /// <summary>
-    ///     Determines if we should authenticate the request
-    /// </summary>
-    /// <returns>true if the request should be authenticated</returns>
-    /// <remarks>
-    ///     We auth the request when:
-    ///     * it is a back office request
-    ///     * it is an installer request
-    ///     * it is a preview request
-    /// </remarks>
-    public bool ShouldAuthenticateRequest(string absPath)
-    {
-        // Do not authenticate the request if we are not running (don't have a db, are not configured) - since we will never need
-        // to know a current user in this scenario - we treat it as a new install. Without this we can have some issues
-        // when people have older invalid cookies on the same domain since our user managers might attempt to lookup a user
-        // and we don't even have a db.
-        // was: app.IsConfigured == false (equiv to !Run) && dbContext.IsDbConfigured == false (equiv to Install)
-        // so, we handle .Install here and NOT .Upgrade
-        if (_runtime.Level == RuntimeLevel.Install)
-        {
-            return false;
-        }
-
-        // check the explicit paths
-        if (_explicitPaths != null)
-        {
-            return _explicitPaths.Any(x => x.InvariantEquals(absPath));
-        }
-
-        if ( // check back office
-            _umbracoRequestPaths.IsBackOfficeRequest(absPath)
-
-            // check installer
-            || _umbracoRequestPaths.IsInstallerRequest(absPath))
-        {
-            return true;
-        }
-
-        if (_basicAuthService.IsBasicAuthEnabled())
-        {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidator.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidator.cs
deleted file mode 100644
index 755367312f..0000000000
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidator.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Security;
-
-namespace Umbraco.Cms.Web.BackOffice.Security;
-
-/// <summary>
-///     A security stamp validator for the back office
-/// </summary>
-public class BackOfficeSecurityStampValidator : SecurityStampValidator<BackOfficeIdentityUser>
-{
-    public BackOfficeSecurityStampValidator(
-        IOptions<BackOfficeSecurityStampValidatorOptions> options,
-        BackOfficeSignInManager signInManager, ILoggerFactory logger)
-        : base(options, signInManager, logger)
-    {
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidatorOptions.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidatorOptions.cs
deleted file mode 100644
index 3dd10c08ee..0000000000
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidatorOptions.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Microsoft.AspNetCore.Identity;
-
-namespace Umbraco.Cms.Web.BackOffice.Security;
-
-/// <summary>
-///     Custom <see cref="SecurityStampValidatorOptions" /> for the back office
-/// </summary>
-public class BackOfficeSecurityStampValidatorOptions : SecurityStampValidatorOptions
-{
-}
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeSessionIdValidator.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeSessionIdValidator.cs
deleted file mode 100644
index 5078b20d4a..0000000000
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeSessionIdValidator.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Security.Claims;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Security;
-
-/// <summary>
-///     Used to validate a cookie against a user's session id
-/// </summary>
-/// <remarks>
-///     <para>
-///         This uses another cookie to track the last checked time which is done for a few reasons:
-///         * We can't use the user's auth ticket to do this because we'd be re-issuing the auth ticket all of the time and
-///         it would never expire
-///         plus the auth ticket size is much larger than this small value
-///         * This will execute quite often (every minute per user) and in some cases there might be several requests that
-///         end up re-issuing the cookie so the cookie value should be small
-///         * We want to avoid the user lookup if it's not required so that will only happen when the time diff is great
-///         enough in the cookie
-///     </para>
-///     <para>
-///         This is a scoped/request based object.
-///     </para>
-/// </remarks>
-public class BackOfficeSessionIdValidator
-{
-    public const string CookieName = "UMB_UCONTEXT_C";
-    private readonly GlobalSettings _globalSettings;
-    private readonly TimeProvider _timeProvider;
-    private readonly IBackOfficeUserManager _userManager;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="BackOfficeSessionIdValidator" /> class.
-    /// </summary>
-    public BackOfficeSessionIdValidator(TimeProvider timeProvider, IOptionsSnapshot<GlobalSettings> globalSettings, IBackOfficeUserManager userManager)
-    {
-        _timeProvider = timeProvider;
-        _globalSettings = globalSettings.Value;
-        _userManager = userManager;
-    }
-
-    public async Task ValidateSessionAsync(TimeSpan validateInterval, CookieValidatePrincipalContext context)
-    {
-        if (!context.Request.IsBackOfficeRequest())
-        {
-            return;
-        }
-
-        var valid = await ValidateSessionAsync(validateInterval, context.HttpContext, context.Options.CookieManager, _timeProvider, context.Properties.IssuedUtc, context.Principal?.Identity as ClaimsIdentity);
-
-        if (valid == false)
-        {
-            context.RejectPrincipal();
-            await context.HttpContext.SignOutAsync(Constants.Security.BackOfficeAuthenticationType);
-        }
-    }
-
-    private async Task<bool> ValidateSessionAsync(
-        TimeSpan validateInterval,
-        HttpContext httpContext,
-        ICookieManager cookieManager,
-        TimeProvider timeProvider,
-        DateTimeOffset? authTicketIssueDate,
-        ClaimsIdentity? currentIdentity)
-    {
-        if (httpContext == null)
-        {
-            throw new ArgumentNullException(nameof(httpContext));
-        }
-
-        if (cookieManager == null)
-        {
-            throw new ArgumentNullException(nameof(cookieManager));
-        }
-
-        if (timeProvider == null)
-        {
-            throw new ArgumentNullException(nameof(timeProvider));
-        }
-
-        if (currentIdentity == null)
-        {
-            return false;
-        }
-
-        DateTimeOffset? issuedUtc = null;
-        DateTimeOffset currentUtc = timeProvider.GetUtcNow();
-
-        // read the last checked time from a custom cookie
-        var lastCheckedCookie = cookieManager.GetRequestCookie(httpContext, CookieName);
-
-        if (lastCheckedCookie.IsNullOrWhiteSpace() == false)
-        {
-            if (DateTimeOffset.TryParse(lastCheckedCookie, out DateTimeOffset parsed))
-            {
-                issuedUtc = parsed;
-            }
-        }
-
-        // no cookie, use the issue time of the auth ticket
-        if (issuedUtc.HasValue == false)
-        {
-            issuedUtc = authTicketIssueDate;
-        }
-
-        // Only validate if enough time has elapsed
-        var validate = issuedUtc.HasValue == false;
-        if (issuedUtc.HasValue)
-        {
-            TimeSpan timeElapsed = currentUtc.Subtract(issuedUtc.Value);
-            validate = timeElapsed > validateInterval;
-        }
-
-        if (validate == false)
-        {
-            return true;
-        }
-
-        var userId = currentIdentity.GetUserId();
-        if (userId is null)
-        {
-            return false;
-        }
-
-        var user = await _userManager.FindByIdAsync(userId);
-        if (user == null)
-        {
-            return false;
-        }
-
-        var sessionId = currentIdentity.FindFirstValue(Constants.Security.SessionIdClaimType);
-        if (await _userManager.ValidateSessionIdAsync(userId, sessionId) == false)
-        {
-            return false;
-        }
-
-        // we will re-issue the cookie last checked cookie
-        cookieManager.AppendResponseCookie(
-            httpContext,
-            CookieName,
-            DateTimeOffset.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffffffzzz"),
-            new CookieOptions
-            {
-                HttpOnly = true,
-                Secure = _globalSettings.UseHttps || httpContext.Request.IsHttps,
-                Path = "/"
-            });
-
-        return true;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs
deleted file mode 100644
index 242b246c0f..0000000000
--- a/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System.Globalization;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Notifications;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Security;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Security;
-
-/// <summary>
-///     Binds to notifications to write audit logs for the <see cref="BackOfficeUserManager" />
-/// </summary>
-internal class BackOfficeUserManagerAuditer :
-    INotificationHandler<UserLoginSuccessNotification>,
-    INotificationHandler<UserLogoutSuccessNotification>,
-    INotificationHandler<UserLoginFailedNotification>,
-    INotificationHandler<UserForgotPasswordRequestedNotification>,
-    INotificationHandler<UserForgotPasswordChangedNotification>,
-    INotificationHandler<UserPasswordChangedNotification>,
-    INotificationHandler<UserPasswordResetNotification>
-{
-    private readonly IAuditService _auditService;
-    private readonly IUserService _userService;
-
-    public BackOfficeUserManagerAuditer(IAuditService auditService, IUserService userService)
-    {
-        _auditService = auditService;
-        _userService = userService;
-    }
-
-    public void Handle(UserForgotPasswordChangedNotification notification) =>
-        WriteAudit(notification.PerformingUserId, notification.AffectedUserId, notification.IpAddress,
-            "umbraco/user/password/forgot/change", "password forgot/change");
-
-    public void Handle(UserForgotPasswordRequestedNotification notification) =>
-        WriteAudit(notification.PerformingUserId, notification.AffectedUserId, notification.IpAddress,
-            "umbraco/user/password/forgot/request", "password forgot/request");
-
-    public void Handle(UserLoginFailedNotification notification) =>
-        WriteAudit(notification.PerformingUserId, "0", notification.IpAddress, "umbraco/user/sign-in/failed",
-            "login failed", "");
-
-    public void Handle(UserLoginSuccessNotification notification)
-        => WriteAudit(notification.PerformingUserId, notification.AffectedUserId, notification.IpAddress,
-            "umbraco/user/sign-in/login", "login success");
-
-    public void Handle(UserLogoutSuccessNotification notification)
-        => WriteAudit(notification.PerformingUserId, notification.AffectedUserId, notification.IpAddress,
-            "umbraco/user/sign-in/logout", "logout success");
-
-    public void Handle(UserPasswordChangedNotification notification) =>
-        WriteAudit(notification.PerformingUserId, notification.AffectedUserId, notification.IpAddress,
-            "umbraco/user/password/change", "password change");
-
-    public void Handle(UserPasswordResetNotification notification) =>
-        WriteAudit(notification.PerformingUserId, notification.AffectedUserId, notification.IpAddress,
-            "umbraco/user/password/reset", "password reset");
-
-    private static string FormatEmail(IMembershipUser user) =>
-        user == null ? string.Empty : user.Email.IsNullOrWhiteSpace() ? "" : $"<{user.Email}>";
-
-    private void WriteAudit(string performingId, string? affectedId, string ipAddress, string eventType,
-        string eventDetails, string? affectedDetails = null)
-    {
-        IUser? performingUser = null;
-        if (int.TryParse(performingId, NumberStyles.Integer, CultureInfo.InvariantCulture, out var asInt))
-        {
-            performingUser = _userService.GetUserById(asInt);
-        }
-
-        var performingDetails = performingUser == null
-            ? $"User UNKNOWN:{performingId}"
-            : $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}";
-
-        if (!int.TryParse(performingId, NumberStyles.Integer, CultureInfo.InvariantCulture, out var performingIdAsInt))
-        {
-            performingIdAsInt = 0;
-        }
-
-        if (!int.TryParse(affectedId, NumberStyles.Integer, CultureInfo.InvariantCulture, out var affectedIdAsInt))
-        {
-            affectedIdAsInt = 0;
-        }
-
-        WriteAudit(performingIdAsInt, performingDetails, affectedIdAsInt, ipAddress, eventType, eventDetails,
-            affectedDetails);
-    }
-
-    private void WriteAudit(int performingId, string performingDetails, int affectedId, string ipAddress,
-        string eventType, string eventDetails, string? affectedDetails = null)
-    {
-        if (affectedDetails == null)
-        {
-            IUser? affectedUser = _userService.GetUserById(affectedId);
-            affectedDetails = affectedUser == null
-                ? $"User UNKNOWN:{affectedId}"
-                : $"User \"{affectedUser.Name}\" {FormatEmail(affectedUser)}";
-        }
-
-        _auditService.Write(
-            performingId,
-            performingDetails,
-            ipAddress,
-            DateTime.UtcNow,
-            affectedId,
-            affectedDetails,
-            eventType,
-            eventDetails);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs b/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs
deleted file mode 100644
index a7be05ad55..0000000000
--- a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs
+++ /dev/null
@@ -1,337 +0,0 @@
-using System.Security.Claims;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.DataProtection;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Net;
-using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Web;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Security;
-
-/// <summary>
-///     Used to configure <see cref="CookieAuthenticationOptions" /> for the back office authentication type
-/// </summary>
-public class ConfigureBackOfficeCookieOptions : IConfigureNamedOptions<CookieAuthenticationOptions>
-{
-    private readonly IBasicAuthService _basicAuthService;
-    private readonly IOptions<BackOfficeAuthenticationTypeSettings> _backOfficeAuthenticationTypeSettings;
-    private readonly IDataProtectionProvider _dataProtection;
-    private readonly GlobalSettings _globalSettings;
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly IIpResolver _ipResolver;
-    private readonly IRuntimeState _runtimeState;
-    private readonly SecuritySettings _securitySettings;
-    private readonly IServiceProvider _serviceProvider;
-    private readonly TimeProvider _timeProvider;
-    private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-    private readonly UmbracoRequestPaths _umbracoRequestPaths;
-    private readonly IUserService _userService;
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="ConfigureBackOfficeCookieOptions" /> class.
-    /// </summary>
-    /// <param name="serviceProvider">The <see cref="IServiceProvider" /></param>
-    /// <param name="umbracoContextAccessor">The <see cref="IUmbracoContextAccessor" /></param>
-    /// <param name="securitySettings">The <see cref="SecuritySettings" /> options</param>
-    /// <param name="globalSettings">The <see cref="GlobalSettings" /> options</param>
-    /// <param name="hostingEnvironment">The <see cref="IHostingEnvironment" /></param>
-    /// <param name="runtimeState">The <see cref="IRuntimeState" /></param>
-    /// <param name="dataProtection">The <see cref="IDataProtectionProvider" /></param>
-    /// <param name="userService">The <see cref="IUserService" /></param>
-    /// <param name="ipResolver">The <see cref="IIpResolver" /></param>
-    /// <param name="timeProvider">The <see cref="TimeProvider" /></param>
-    /// <param name="umbracoRequestPaths">The <see cref="UmbracoRequestPaths"/></param>
-    /// <param name="basicAuthService">The <see cref="IBasicAuthService"/></param>
-    public ConfigureBackOfficeCookieOptions(
-        IServiceProvider serviceProvider,
-        IUmbracoContextAccessor umbracoContextAccessor,
-        IOptions<SecuritySettings> securitySettings,
-        IOptions<GlobalSettings> globalSettings,
-        IHostingEnvironment hostingEnvironment,
-        IRuntimeState runtimeState,
-        IDataProtectionProvider dataProtection,
-        IUserService userService,
-        IIpResolver ipResolver,
-        TimeProvider timeProvider,
-        UmbracoRequestPaths umbracoRequestPaths,
-        IBasicAuthService basicAuthService,
-        IOptions<BackOfficeAuthenticationTypeSettings> backOfficeAuthenticationTypeSettings
-        )
-    {
-        _serviceProvider = serviceProvider;
-        _umbracoContextAccessor = umbracoContextAccessor;
-        _securitySettings = securitySettings.Value;
-        _globalSettings = globalSettings.Value;
-        _hostingEnvironment = hostingEnvironment;
-        _runtimeState = runtimeState;
-        _dataProtection = dataProtection;
-        _userService = userService;
-        _ipResolver = ipResolver;
-        _timeProvider = timeProvider;
-        _umbracoRequestPaths = umbracoRequestPaths;
-        _basicAuthService = basicAuthService;
-        _backOfficeAuthenticationTypeSettings = backOfficeAuthenticationTypeSettings;
-    }
-
-    private string AuthenticationType => _backOfficeAuthenticationTypeSettings.Value.AuthenticationType;
-    /// <inheritdoc />
-    public void Configure(string? name, CookieAuthenticationOptions options)
-    {
-        if (name != AuthenticationType)
-        {
-            return;
-        }
-
-        Configure(options);
-    }
-
-    /// <inheritdoc />
-    public void Configure(CookieAuthenticationOptions options)
-    {
-        options.SlidingExpiration = false;
-        options.ExpireTimeSpan = _globalSettings.TimeOut;
-        options.Cookie.Domain = _securitySettings.AuthCookieDomain;
-        options.Cookie.Name = _securitySettings.AuthCookieName;
-        options.Cookie.HttpOnly = true;
-        options.Cookie.SecurePolicy =
-            _globalSettings.UseHttps ? CookieSecurePolicy.Always : CookieSecurePolicy.SameAsRequest;
-        options.Cookie.Path = "/";
-
-        // For any redirections that may occur for the back office, they all go to the same path
-        var backOfficePath = _globalSettings.GetBackOfficePath(_hostingEnvironment);
-        backOfficePath += "/login";
-        options.AccessDeniedPath = backOfficePath;
-        options.LoginPath = backOfficePath;
-        options.LogoutPath = backOfficePath;
-
-        options.DataProtectionProvider = _dataProtection;
-
-        // NOTE: This is borrowed directly from aspnetcore source
-        // Note: the purpose for the data protector must remain fixed for interop to work.
-        IDataProtector dataProtector = options.DataProtectionProvider.CreateProtector(
-            "Microsoft.AspNetCore.Authentication.Cookies.CookieAuthenticationMiddleware",
-            AuthenticationType,
-            "v2");
-        var ticketDataFormat = new TicketDataFormat(dataProtector);
-
-        options.TicketDataFormat = new BackOfficeSecureDataFormat(_globalSettings.TimeOut, ticketDataFormat);
-
-        // Custom cookie manager so we can filter requests
-        options.CookieManager = new BackOfficeCookieManager(
-            _umbracoContextAccessor,
-            _runtimeState,
-            _umbracoRequestPaths,
-            _basicAuthService);
-
-        options.Events = new CookieAuthenticationEvents
-        {
-            // IMPORTANT! If you set any of OnRedirectToLogin, OnRedirectToAccessDenied, OnRedirectToLogout, OnRedirectToReturnUrl
-            // you need to be aware that this will bypass the default behavior of returning the correct status codes for ajax requests and
-            // not redirecting for non-ajax requests. This is because the default behavior is baked into this class here:
-            // https://github.com/dotnet/aspnetcore/blob/master/src/Security/Authentication/Cookies/src/CookieAuthenticationEvents.cs#L58
-            // It would be possible to re-use the default behavior if any of these need to be set but that must be taken into account else
-            // our back office requests will not function correctly. For now we don't need to set/configure any of these callbacks because
-            // the defaults work fine with our setup.
-            OnValidatePrincipal = async ctx =>
-            {
-                // We need to resolve the BackOfficeSecurityStampValidator per request as a requirement (even in aspnetcore they do this)
-                BackOfficeSecurityStampValidator securityStampValidator =
-                    ctx.HttpContext.RequestServices.GetRequiredService<BackOfficeSecurityStampValidator>();
-
-                // Same goes for the signinmanager
-                IBackOfficeSignInManager signInManager =
-                    ctx.HttpContext.RequestServices.GetRequiredService<IBackOfficeSignInManager>();
-
-                ClaimsIdentity? backOfficeIdentity = ctx.Principal?.GetUmbracoIdentity();
-                if (backOfficeIdentity == null)
-                {
-                    ctx.RejectPrincipal();
-                    await signInManager.SignOutAsync();
-                }
-
-                // ensure the thread culture is set
-                backOfficeIdentity?.EnsureCulture();
-
-                EnsureTicketRenewalIfKeepUserLoggedIn(ctx);
-
-                // add or update a claim to track when the cookie expires, we use this to track time remaining
-                backOfficeIdentity?.AddOrUpdateClaim(new Claim(
-                    Constants.Security.TicketExpiresClaimType,
-                    ctx.Properties.ExpiresUtc!.Value.ToString("o"),
-                    ClaimValueTypes.DateTime,
-                    AuthenticationType,
-                    AuthenticationType,
-                    backOfficeIdentity));
-
-                await securityStampValidator.ValidateAsync(ctx);
-
-                // This might have been called from GetRemainingTimeoutSeconds, in this case we don't want to ensure valid session
-                // since that in it self will keep the session valid since we renew the lastVerified date.
-                // Similarly don't renew the token
-                if (IsRemainingSecondsRequest(ctx))
-                {
-                    return;
-                }
-
-                // This relies on IssuedUtc, so call it before updating it.
-                await EnsureValidSessionId(ctx);
-
-                // We have to manually specify Issued and Expires,
-                // because the SecurityStampValidator refreshes the principal every 30 minutes,
-                // When the principal is refreshed the Issued is update to time of refresh, however, the Expires remains unchanged
-                // When we then try and renew, the difference of issued and expires effectively becomes the new ExpireTimeSpan
-                // meaning we effectively lose 30 minutes of our ExpireTimeSpan for EVERY principal refresh if we don't
-                // https://github.com/dotnet/aspnetcore/blob/main/src/Security/Authentication/Cookies/src/CookieAuthenticationHandler.cs#L115
-                ctx.Properties.IssuedUtc = _timeProvider.GetUtcNow();
-                ctx.Properties.ExpiresUtc = _timeProvider.GetUtcNow().Add(_globalSettings.TimeOut);
-                ctx.ShouldRenew = true;
-            },
-            OnSigningIn = ctx =>
-            {
-                // occurs when sign in is successful but before the ticket is written to the outbound cookie
-                ClaimsIdentity? backOfficeIdentity = ctx.Principal?.GetUmbracoIdentity();
-                if (backOfficeIdentity != null)
-                {
-                    // generate a session id and assign it
-                    // create a session token - if we are configured and not in an upgrade state then use the db, otherwise just generate one
-                    Guid session = _runtimeState.Level == RuntimeLevel.Run
-                        ? _userService.CreateLoginSession(
-                            backOfficeIdentity.GetId()!.Value,
-                            _ipResolver.GetCurrentRequestIpAddress())
-                        : Guid.NewGuid();
-
-                    // add our session claim
-                    backOfficeIdentity.AddClaim(new Claim(
-                        Constants.Security.SessionIdClaimType,
-                        session.ToString(),
-                        ClaimValueTypes.String,
-                        AuthenticationType,
-                        AuthenticationType,
-                        backOfficeIdentity));
-
-                    // since it is a cookie-based authentication add that claim
-                    backOfficeIdentity.AddClaim(new Claim(
-                        ClaimTypes.CookiePath,
-                        "/",
-                        ClaimValueTypes.String,
-                        AuthenticationType,
-                        AuthenticationType,
-                        backOfficeIdentity));
-                }
-
-                return Task.CompletedTask;
-            },
-            OnSignedIn = ctx =>
-            {
-                // occurs when sign in is successful and after the ticket is written to the outbound cookie
-
-                // When we are signed in with the cookie, assign the principal to the current HttpContext
-                ctx.HttpContext.SetPrincipalForRequest(ctx.Principal);
-
-                return Task.CompletedTask;
-            },
-            OnSigningOut = ctx =>
-            {
-                // Clear the user's session on sign out
-                if (ctx.HttpContext?.User?.Identity != null)
-                {
-                    var claimsIdentity = ctx.HttpContext.User.Identity as ClaimsIdentity;
-                    var sessionId = claimsIdentity?.FindFirstValue(Constants.Security.SessionIdClaimType);
-                    if (sessionId.IsNullOrWhiteSpace() == false && Guid.TryParse(sessionId, out Guid guidSession))
-                    {
-                        _userService.ClearLoginSession(guidSession);
-                    }
-                }
-
-                // Remove all of our cookies
-                var cookies = new[]
-                {
-                    BackOfficeSessionIdValidator.CookieName, _securitySettings.AuthCookieName,
-                    Constants.Web.PreviewCookieName, Constants.Security.BackOfficeExternalCookieName,
-                    Constants.Web.AngularCookieName, Constants.Web.CsrfValidationCookieName
-                };
-                foreach (var cookie in cookies)
-                {
-                    ctx.Options.CookieManager.DeleteCookie(ctx.HttpContext!, cookie, new CookieOptions { Path = "/" });
-                }
-
-                return Task.CompletedTask;
-            }
-        };
-    }
-
-    /// <summary>
-    ///     Ensures that the user has a valid session id
-    /// </summary>
-    /// <remarks>
-    ///     So that we are not overloading the database this throttles it's check to every minute
-    /// </remarks>
-    private async Task EnsureValidSessionId(CookieValidatePrincipalContext context)
-    {
-        if (_runtimeState.Level != RuntimeLevel.Run)
-        {
-            return;
-        }
-
-        using IServiceScope scope = _serviceProvider.CreateScope();
-        BackOfficeSessionIdValidator validator =
-            scope.ServiceProvider.GetRequiredService<BackOfficeSessionIdValidator>();
-        await validator.ValidateSessionAsync(TimeSpan.FromMinutes(1), context);
-    }
-
-    /// <summary>
-    ///     Ensures the ticket is renewed if the <see cref="SecuritySettings.KeepUserLoggedIn" /> is set to true
-    ///     and the current request is for the get user seconds endpoint
-    /// </summary>
-    /// <param name="context">The <see cref="CookieValidatePrincipalContext" /></param>
-    private void EnsureTicketRenewalIfKeepUserLoggedIn(CookieValidatePrincipalContext context)
-    {
-        if (!_securitySettings.KeepUserLoggedIn)
-        {
-            return;
-        }
-
-        DateTimeOffset currentUtc = _timeProvider.GetUtcNow();
-        DateTimeOffset? issuedUtc = context.Properties.IssuedUtc;
-        DateTimeOffset? expiresUtc = context.Properties.ExpiresUtc;
-
-        if (expiresUtc.HasValue && issuedUtc.HasValue)
-        {
-            TimeSpan timeElapsed = currentUtc.Subtract(issuedUtc.Value);
-            TimeSpan timeRemaining = expiresUtc.Value.Subtract(currentUtc);
-
-            // if it's time to renew, then do it
-            if (timeRemaining < timeElapsed)
-            {
-                context.ShouldRenew = true;
-            }
-        }
-    }
-
-    private bool IsRemainingSecondsRequest(CookieValidatePrincipalContext context)
-    {
-        RouteValueDictionary routeValues = context.HttpContext.Request.RouteValues;
-        if (routeValues.TryGetValue("controller", out var controllerName) &&
-            routeValues.TryGetValue("action", out var action))
-        {
-            if (controllerName?.ToString() == ControllerExtensions.GetControllerName<AuthenticationController>()
-                && action?.ToString() == nameof(AuthenticationController.GetRemainingTimeoutSeconds))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeSecurityStampValidatorOptions.cs b/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeSecurityStampValidatorOptions.cs
deleted file mode 100644
index fcb1801703..0000000000
--- a/src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeSecurityStampValidatorOptions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Web.Common.Security;
-
-namespace Umbraco.Cms.Web.BackOffice.Security;
-
-/// <summary>
-///     Configures the back office security stamp options.
-/// </summary>
-public class ConfigureBackOfficeSecurityStampValidatorOptions : IConfigureOptions<BackOfficeSecurityStampValidatorOptions>
-{
-    private readonly SecuritySettings _securitySettings;
-
-    public ConfigureBackOfficeSecurityStampValidatorOptions()
-        : this(StaticServiceProvider.Instance.GetRequiredService<IOptions<SecuritySettings>>())
-    {
-    }
-
-    public ConfigureBackOfficeSecurityStampValidatorOptions(IOptions<SecuritySettings> securitySettings)
-        => _securitySettings = securitySettings.Value;
-
-    /// <inheritdoc />
-    public void Configure(BackOfficeSecurityStampValidatorOptions options)
-        => ConfigureSecurityStampOptions.ConfigureOptions(options, _securitySettings);
-}
diff --git a/src/Umbraco.Web.BackOffice/Security/IBackOfficeAntiforgery.cs b/src/Umbraco.Web.BackOffice/Security/IBackOfficeAntiforgery.cs
deleted file mode 100644
index 594ab55576..0000000000
--- a/src/Umbraco.Web.BackOffice/Security/IBackOfficeAntiforgery.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Umbraco.Cms.Core;
-
-namespace Umbraco.Cms.Web.BackOffice.Security;
-
-/// <summary>
-///     Antiforgery implementation for the Umbraco back office
-/// </summary>
-public interface IBackOfficeAntiforgery
-{
-    /// <summary>
-    ///     Validates the headers/cookies passed in for the request
-    /// </summary>
-    /// <param name="httpContext"></param>
-    /// <returns></returns>
-    Task<Attempt<string?>> ValidateRequestAsync(HttpContext httpContext);
-
-    /// <summary>
-    ///     Generates tokens to use for the cookie and header antiforgery values
-    /// </summary>
-    /// <param name="httpContext"></param>
-    void GetAndStoreTokens(HttpContext httpContext);
-}
diff --git a/src/Umbraco.Web.BackOffice/Security/NoopBackOfficeTwoFactorOptions.cs b/src/Umbraco.Web.BackOffice/Security/NoopBackOfficeTwoFactorOptions.cs
deleted file mode 100644
index ce4ea203ad..0000000000
--- a/src/Umbraco.Web.BackOffice/Security/NoopBackOfficeTwoFactorOptions.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Umbraco.Cms.Web.BackOffice.Security;
-
-[Obsolete("Not used anymore")]
-public class NoopBackOfficeTwoFactorOptions : IBackOfficeTwoFactorOptions
-{
-    public string? GetTwoFactorView(string username) => null;
-}
diff --git a/src/Umbraco.Web.BackOffice/Services/IconService.cs b/src/Umbraco.Web.BackOffice/Services/IconService.cs
deleted file mode 100644
index 2870808151..0000000000
--- a/src/Umbraco.Web.BackOffice/Services/IconService.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.FileProviders;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Extensions;
-using File = System.IO.File;
-using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
-
-namespace Umbraco.Cms.Web.BackOffice.Services;
-
-public class IconService : IIconService
-{
-    private readonly IAppPolicyCache _cache;
-    private readonly IHostingEnvironment _hostingEnvironment;
-    private readonly IWebHostEnvironment _webHostEnvironment;
-    private GlobalSettings _globalSettings;
-
-    [Obsolete("Use other ctor - Will be removed in Umbraco 12")]
-    public IconService(
-        IOptionsMonitor<GlobalSettings> globalSettings,
-        IHostingEnvironment hostingEnvironment,
-        AppCaches appCaches)
-        : this(
-            globalSettings,
-            hostingEnvironment,
-            appCaches,
-            StaticServiceProvider.Instance.GetRequiredService<IWebHostEnvironment>())
-    {
-    }
-
-    public IconService(
-        IOptionsMonitor<GlobalSettings> globalSettings,
-        IHostingEnvironment hostingEnvironment,
-        AppCaches appCaches,
-        IWebHostEnvironment webHostEnvironment)
-    {
-        _globalSettings = globalSettings.CurrentValue;
-        _hostingEnvironment = hostingEnvironment;
-        _webHostEnvironment = webHostEnvironment;
-        _cache = appCaches.RuntimeCache;
-
-        globalSettings.OnChange(x => _globalSettings = x);
-    }
-
-    /// <inheritdoc />
-    public IReadOnlyDictionary<string, string>? GetIcons() => GetIconDictionary();
-
-    /// <inheritdoc />
-    public IconModel? GetIcon(string iconName)
-    {
-        if (iconName.IsNullOrWhiteSpace())
-        {
-            return null;
-        }
-
-        IReadOnlyDictionary<string, string>? allIconModels = GetIconDictionary();
-        if (allIconModels?.ContainsKey(iconName) ?? false)
-        {
-            return new IconModel { Name = iconName, SvgString = allIconModels[iconName] };
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    ///     Gets an IconModel using values from a FileInfo model
-    /// </summary>
-    /// <param name="fileInfo"></param>
-    /// <returns></returns>
-    private IconModel? GetIcon(FileInfo fileInfo) =>
-        fileInfo == null || string.IsNullOrWhiteSpace(fileInfo.Name)
-            ? null
-            : CreateIconModel(fileInfo.Name.StripFileExtension(), fileInfo.FullName);
-
-    /// <summary>
-    ///     Gets an IconModel containing the icon name and SvgString
-    /// </summary>
-    /// <param name="iconName"></param>
-    /// <param name="iconPath"></param>
-    /// <returns></returns>
-    private IconModel? CreateIconModel(string iconName, string iconPath)
-    {
-        try
-        {
-            var svgContent = File.ReadAllText(iconPath);
-
-            var svg = new IconModel { Name = iconName, SvgString = svgContent };
-
-            return svg;
-        }
-        catch
-        {
-            return null;
-        }
-    }
-
-    // TODO: Refactor to return IEnumerable<FileInfo>
-    private IEnumerable<FileInfo> GetAllIconsFiles()
-    {
-        var icons = new HashSet<FileInfo>(new CaseInsensitiveFileInfoComparer());
-
-        // add icons from plugins
-        var appPluginsDirectoryPath = _hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.AppPlugins);
-        if (Directory.Exists(appPluginsDirectoryPath))
-        {
-            var appPlugins = new DirectoryInfo(appPluginsDirectoryPath);
-
-            // iterate sub directories of app plugins
-            foreach (DirectoryInfo dir in appPlugins.EnumerateDirectories())
-            {
-                // AppPluginIcons path was previoulsy the wrong case, so we first check for the prefered directory
-                // and then check the legacy directory.
-                var iconPath = _hostingEnvironment.MapPathContentRoot(
-                    $"{Constants.SystemDirectories.AppPlugins}/{dir.Name}{Constants.SystemDirectories.PluginIcons}");
-                var iconPathExists = Directory.Exists(iconPath);
-
-                if (!iconPathExists)
-                {
-                    iconPath = _hostingEnvironment.MapPathContentRoot(
-                        $"{Constants.SystemDirectories.AppPlugins}/{dir.Name}{Constants.SystemDirectories.AppPluginIcons}");
-                    iconPathExists = Directory.Exists(iconPath);
-                }
-
-                if (iconPathExists)
-                {
-                    IEnumerable<FileInfo> dirIcons =
-                        new DirectoryInfo(iconPath).EnumerateFiles("*.svg", SearchOption.TopDirectoryOnly);
-                    icons.UnionWith(dirIcons);
-                }
-            }
-        }
-
-        // Get icons from the web root file provider (both physical and virtual)
-        icons.UnionWith(GetIconsFiles(_webHostEnvironment.WebRootFileProvider, Constants.SystemDirectories.AppPlugins));
-
-        IDirectoryContents? iconFolder =
-            _webHostEnvironment.WebRootFileProvider.GetDirectoryContents(_globalSettings.IconsPath);
-
-        IEnumerable<FileInfo> coreIcons = iconFolder
-            .Where(x => !x.IsDirectory && x.Name.EndsWith(".svg"))
-            .Select(x => new FileInfo(x.PhysicalPath!));
-
-        icons.UnionWith(coreIcons);
-
-        return icons;
-    }
-
-
-    /// <summary>
-    /// Finds all SVG icon files based on the specified <paramref name="fileProvider"/> and <paramref name="path"/>.
-    /// The method will find both physical and virtual (eg. from a Razor Class Library) icons.
-    /// </summary>
-    /// <param name="fileProvider">The file provider to be used.</param>
-    /// <param name="path">The sub path to start from - should probably always be <see cref="Constants.SystemDirectories.AppPlugins"/>.</param>
-    /// <returns>A collection of <see cref="FileInfo"/> representing the found SVG icon files.</returns>
-    private static IEnumerable<FileInfo> GetIconsFiles(IFileProvider fileProvider, string path)
-    {
-        // Iterate through all plugin folders and their subfolders, this is necessary because on Linux we'll get casing issues when
-        // we directly try to access {path}/{pluginDirectory.Name}/{Constants.SystemDirectories.PluginIcons}
-        foreach (IFileInfo pluginDirectory in fileProvider.GetDirectoryContents(path))
-        {
-            if (!pluginDirectory.IsDirectory)
-            {
-                continue;
-            }
-
-            // Iterate through the sub directories of each plugin folder in order to support case insensitive paths (for Linux)
-            foreach (IFileInfo subDir1 in fileProvider.GetDirectoryContents($"{path}/{pluginDirectory.Name}"))
-            {
-                // Hard-coding the "backoffice" directory name to gain a better performance when traversing the pluginDirectory directories
-                if (subDir1.IsDirectory && subDir1.Name.InvariantEquals("backoffice"))
-                {
-                    // Iterate through second level sub directories in order to support case insensitive paths (for Linux)
-                    foreach (IFileInfo subDir2 in fileProvider.GetDirectoryContents($"{path}/{pluginDirectory.Name}/{subDir1.Name}"))
-                    {
-                        if (!subDir2.IsDirectory)
-                        {
-                            continue;
-                        }
-
-                        // Does the directory match the plugin icons folder? (case insensitive for legacy support)
-                        if (!$"/{subDir1.Name}/{subDir2.Name}".InvariantEquals(Constants.SystemDirectories.PluginIcons))
-                        {
-                            continue;
-                        }
-
-                        // Iterate though the files of the second level sub directory. This should be where the SVG files are located :D
-                        foreach (IFileInfo file in fileProvider.GetDirectoryContents($"{path}/{pluginDirectory.Name}/{subDir1.Name}/{subDir2.Name}"))
-                        {
-                            // TODO: Refactor to work with IFileInfo, then we can also remove the .PhysicalPath check
-                            // as this won't work for files that aren't located on a physical file system
-                            // (e.g. embedded resource, Azure Blob Storage, etc.)
-                            if (file.Name.InvariantEndsWith(".svg") && !string.IsNullOrEmpty(file.PhysicalPath))
-                            {
-                                yield return new FileInfo(file.PhysicalPath);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private IReadOnlyDictionary<string, string>? GetIconDictionary() => _cache.GetCacheItem(
-        $"{typeof(IconService).FullName}.{nameof(GetIconDictionary)}",
-        () => GetAllIconsFiles()
-            .Select(GetIcon)
-            .WhereNotNull()
-            .GroupBy(i => i.Name, StringComparer.OrdinalIgnoreCase)
-            .ToDictionary(g => g.Key, g => g.First().SvgString, StringComparer.OrdinalIgnoreCase));
-
-    private class CaseInsensitiveFileInfoComparer : IEqualityComparer<FileInfo>
-    {
-        public bool Equals(FileInfo? one, FileInfo? two) =>
-            StringComparer.InvariantCultureIgnoreCase.Equals(one?.Name, two?.Name);
-
-        public int GetHashCode(FileInfo item) => StringComparer.InvariantCultureIgnoreCase.GetHashCode(item.Name);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs
deleted file mode 100644
index 5987dc9460..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs
+++ /dev/null
@@ -1,370 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Controllers;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.Primitives;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.BackOffice.Extensions;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Filters;
-using Umbraco.Cms.Web.Common.ModelBinders;
-using Umbraco.Extensions;
-using static Umbraco.Cms.Core.Constants.Web.Routing;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-/// <summary>
-///     Used to return tree root nodes
-/// </summary>
-[AngularJsonOnlyConfiguration]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-public class ApplicationTreeController : UmbracoAuthorizedApiController
-{
-    private readonly ITreeService _treeService;
-    private readonly ILocalizedTextService _localizedTextService;
-    private readonly IControllerFactory _controllerFactory;
-    private readonly IActionDescriptorCollectionProvider _actionDescriptorCollectionProvider;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApplicationTreeController"/> class.
-    /// </summary>
-    public ApplicationTreeController(
-        ITreeService treeService,
-        ILocalizedTextService localizedTextService,
-        IControllerFactory controllerFactory,
-        IActionDescriptorCollectionProvider actionDescriptorCollectionProvider)
-    {
-        _treeService = treeService;
-        _localizedTextService = localizedTextService;
-        _controllerFactory = controllerFactory;
-        _actionDescriptorCollectionProvider = actionDescriptorCollectionProvider;
-    }
-
-    /// <summary>
-    ///     Returns the tree nodes for an application
-    /// </summary>
-    /// <param name="application">The application to load tree for</param>
-    /// <param name="tree">An optional single tree alias, if specified will only load the single tree for the request app</param>
-    /// <param name="queryStrings">The query strings</param>
-    /// <param name="use">Tree use.</param>
-    public async Task<ActionResult<TreeRootNode>> GetApplicationTrees(string? application, string? tree, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection? queryStrings, TreeUse use = TreeUse.Main)
-    {
-        application = application?.CleanForXss();
-
-        if (string.IsNullOrEmpty(application))
-        {
-            return NotFound();
-        }
-
-        // find all tree definitions that have the current application alias
-        IDictionary<string, IEnumerable<Tree>> groupedTrees = _treeService.GetBySectionGrouped(application, use);
-        var allTrees = groupedTrees.Values.SelectMany(x => x).ToList();
-
-        if (allTrees.Count == 0)
-        {
-            // if there are no trees defined for this section but the section is defined then we can have a simple
-            // full screen section without trees
-            var name = _localizedTextService.Localize("sections", application);
-            return TreeRootNode.CreateSingleTreeRoot(Constants.System.RootString, null, null, name, TreeNodeCollection.Empty, true);
-        }
-
-        // handle request for a specific tree / or when there is only one tree
-        if (!tree.IsNullOrWhiteSpace() || allTrees.Count == 1)
-        {
-            Tree? t = tree.IsNullOrWhiteSpace()
-                ? allTrees[0]
-                : allTrees.FirstOrDefault(x => x.TreeAlias == tree);
-
-            if (t == null)
-            {
-                return NotFound();
-            }
-
-            ActionResult<TreeRootNode>? treeRootNode = await GetTreeRootNode(t, Constants.System.Root, queryStrings);
-
-            if (treeRootNode != null)
-            {
-                return treeRootNode;
-            }
-
-            return NotFound();
-        }
-
-        // handle requests for all trees
-        // for only 1 group
-        if (groupedTrees.Count == 1)
-        {
-            var nodes = new TreeNodeCollection();
-            foreach (Tree t in allTrees)
-            {
-                ActionResult<TreeNode?>? nodeResult = await TryGetRootNode(t, queryStrings);
-                if (!(nodeResult?.Result is null))
-                {
-                    return nodeResult.Result;
-                }
-
-                TreeNode? node = nodeResult?.Value;
-                if (node != null)
-                {
-                    nodes.Add(node);
-                }
-            }
-
-            var name = _localizedTextService.Localize("sections", application);
-
-            if (nodes.Count > 0)
-            {
-                var treeRootNode = TreeRootNode.CreateMultiTreeRoot(nodes);
-                treeRootNode.Name = name;
-                return treeRootNode;
-            }
-
-            // otherwise it's a section with all empty trees, aka a fullscreen section
-            // todo is this true? what if we just failed to TryGetRootNode on all of them? SD: Yes it's true but we should check the result of TryGetRootNode and throw?
-            return TreeRootNode.CreateSingleTreeRoot(Constants.System.RootString, null, null, name, TreeNodeCollection.Empty, true);
-        }
-
-        // for many groups
-        var treeRootNodes = new List<TreeRootNode>();
-        foreach ((var groupName, IEnumerable<Tree> trees) in groupedTrees)
-        {
-            var nodes = new TreeNodeCollection();
-            foreach (Tree t in trees)
-            {
-                ActionResult<TreeNode?>? nodeResult = await TryGetRootNode(t, queryStrings);
-                if (nodeResult != null && nodeResult.Result is not null)
-                {
-                    return nodeResult.Result;
-                }
-
-                TreeNode? node = nodeResult?.Value;
-
-                if (node != null)
-                {
-                    nodes.Add(node);
-                }
-            }
-
-            if (nodes.Count == 0)
-            {
-                continue;
-            }
-
-            // no name => third party
-            // use localization key treeHeaders/thirdPartyGroup
-            // todo this is an odd convention
-            var name = groupName.IsNullOrWhiteSpace() ? "thirdPartyGroup" : groupName;
-
-            var groupRootNode = TreeRootNode.CreateGroupNode(nodes, application);
-            groupRootNode.Name = _localizedTextService.Localize("treeHeaders", name);
-            treeRootNodes.Add(groupRootNode);
-        }
-
-        return TreeRootNode.CreateGroupedMultiTreeRoot(new TreeNodeCollection(treeRootNodes.OrderBy(x => x.Name)));
-    }
-
-    /// <summary>
-    ///     Tries to get the root node of a tree.
-    /// </summary>
-    /// <remarks>
-    ///     <para>
-    ///         Returns null if the root node could not be obtained due to that
-    ///         the user isn't authorized to view that tree. In this case since we are
-    ///         loading multiple trees we will just return null so that it's not added
-    ///         to the list
-    ///     </para>
-    /// </remarks>
-    private async Task<ActionResult<TreeNode?>?> TryGetRootNode(Tree tree, FormCollection? querystring)
-    {
-        if (tree == null)
-        {
-            throw new ArgumentNullException(nameof(tree));
-        }
-
-        return await GetRootNode(tree, querystring);
-    }
-
-    /// <summary>
-    ///     Get the tree root node of a tree.
-    /// </summary>
-    private async Task<ActionResult<TreeRootNode>> GetTreeRootNode(Tree tree, int id, FormCollection? querystring)
-    {
-        if (tree == null)
-        {
-            throw new ArgumentNullException(nameof(tree));
-        }
-
-        // Force tree querystring param
-        Dictionary<string, StringValues>? td = querystring?.ToDictionary(x => x.Key, x => x.Value) ?? new Dictionary<string, StringValues>();
-        td["tree"] = tree.TreeAlias;
-        var qs = new FormCollection(td);
-
-        ActionResult<TreeNodeCollection?>? childrenResult = await GetChildren(tree, id, qs);
-        if (!(childrenResult?.Result is null))
-        {
-            return new ActionResult<TreeRootNode>(childrenResult.Result);
-        }
-
-        TreeNodeCollection? children = childrenResult?.Value;
-        ActionResult<TreeNode?>? rootNodeResult = await GetRootNode(tree, qs);
-        if (!(rootNodeResult?.Result is null))
-        {
-            return rootNodeResult.Result;
-        }
-
-        TreeNode? rootNode = rootNodeResult?.Value;
-
-        var sectionRoot = TreeRootNode.CreateSingleTreeRoot(
-            Constants.System.RootString,
-            rootNode!.ChildNodesUrl,
-            rootNode.MenuUrl,
-            rootNode.Name,
-            children,
-            tree.IsSingleNodeTree);
-
-        // assign the route path based on the root node, this means it will route there when the
-        // section is navigated to and no dashboards will be available for this section
-        sectionRoot.RoutePath = rootNode.RoutePath;
-        sectionRoot.Path = rootNode.Path;
-
-        foreach (KeyValuePair<string, object?> d in rootNode.AdditionalData)
-        {
-            sectionRoot.AdditionalData[d.Key] = d.Value;
-        }
-
-        return sectionRoot;
-    }
-
-    /// <summary>
-    ///     Gets the root node of a tree.
-    /// </summary>
-    private async Task<ActionResult<TreeNode?>?> GetRootNode(Tree tree, FormCollection? querystring)
-    {
-        if (tree == null)
-        {
-            throw new ArgumentNullException(nameof(tree));
-        }
-
-        // Force tree querystring param
-        Dictionary<string, StringValues>? td = querystring?.ToDictionary(x => x.Key, x => x.Value) ?? new Dictionary<string, StringValues>();
-        td["tree"] = tree.TreeAlias;
-        var qs = new FormCollection(td);
-
-        ActionResult<object> result = await GetApiControllerProxy(tree.TreeControllerType, "GetRootNode", qs);
-
-        // return null if the user isn't authorized to view that tree
-        if (!((ForbidResult?)result.Result is null))
-        {
-            return null;
-        }
-
-        var controller = (TreeControllerBase?)result.Value;
-        TreeNode? rootNode = null;
-        if (controller is not null)
-        {
-            ActionResult<TreeNode?> rootNodeResult = await controller.GetRootNode(qs);
-            if (!(rootNodeResult.Result is null))
-            {
-                return rootNodeResult.Result;
-            }
-
-            rootNode = rootNodeResult.Value;
-
-            if (rootNode == null)
-            {
-                throw new InvalidOperationException($"Failed to get root node for tree \"{tree.TreeAlias}\".");
-            }
-        }
-
-        return rootNode;
-    }
-
-    /// <summary>
-    ///     Get the child nodes of a tree node.
-    /// </summary>
-    private async Task<ActionResult<TreeNodeCollection?>?> GetChildren(Tree tree, int id, FormCollection? querystring)
-    {
-        if (tree == null)
-        {
-            throw new ArgumentNullException(nameof(tree));
-        }
-
-        // the method we proxy has an 'id' parameter which is *not* in the querystring,
-        // we need to add it for the proxy to work (else, it does not find the method,
-        // when trying to run auth filters etc).
-        Dictionary<string, StringValues> d = querystring?.ToDictionary(x => x.Key, x => x.Value) ??
-                                             new Dictionary<string, StringValues>();
-        d["id"] = StringValues.Empty;
-        var proxyQuerystring = new FormCollection(d);
-
-        ActionResult<object> controllerResult =
-            await GetApiControllerProxy(tree.TreeControllerType, "GetNodes", proxyQuerystring);
-        if (!(controllerResult.Result is null))
-        {
-            return new ActionResult<TreeNodeCollection?>(controllerResult.Result);
-        }
-
-        var controller = (TreeControllerBase?)controllerResult.Value;
-        return controller is not null ? await controller.GetNodes(id.ToInvariantString(), querystring) : null;
-    }
-
-    /// <summary>
-    ///     Gets a proxy to a controller for a specified action.
-    /// </summary>
-    /// <param name="controllerType">The type of the controller.</param>
-    /// <param name="action">The action.</param>
-    /// <param name="querystring">The querystring.</param>
-    /// <returns>An instance of the controller.</returns>
-    /// <remarks>
-    ///     <para>
-    ///         Creates an instance of the <paramref name="controllerType" /> and initializes it with a route
-    ///         and context etc. so it can execute the specified <paramref name="action" />. Runs the authorization
-    ///         filters for that action, to ensure that the user has permission to execute it.
-    ///     </para>
-    /// </remarks>
-    private async Task<ActionResult<object>> GetApiControllerProxy(Type controllerType, string action, FormCollection? querystring)
-    {
-        // note: this is all required in order to execute the auth-filters for the sub request, we
-        // need to "trick" mvc into thinking that it is actually executing the proxied controller.
-
-        var controllerName = ControllerExtensions.GetControllerName(controllerType);
-
-        // create proxy route data specifying the action & controller to execute
-        var routeData = new RouteData(new RouteValueDictionary
-        {
-            [ActionToken] = action,
-            [ControllerToken] = controllerName
-        });
-        if (!(querystring is null))
-        {
-            foreach ((var key, StringValues value) in querystring)
-            {
-                routeData.Values[key] = value;
-            }
-        }
-
-        ControllerActionDescriptor? actionDescriptor = _actionDescriptorCollectionProvider.ActionDescriptors.Items
-            .Cast<ControllerActionDescriptor>()
-            .First(x =>
-                x.ControllerName.Equals(controllerName) &&
-                x.ActionName == action);
-
-        var actionContext = new ActionContext(HttpContext, routeData, actionDescriptor);
-        var proxyControllerContext = new ControllerContext(actionContext);
-        var controller = (TreeControllerBase)_controllerFactory.CreateController(proxyControllerContext);
-
-        // TODO: What about other filters? Will they execute?
-        var isAllowed = await controller.ControllerContext.InvokeAuthorizationFiltersForRequest(actionContext);
-        if (!isAllowed)
-        {
-            return Forbid();
-        }
-
-        return controller;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs
deleted file mode 100644
index d1f559be24..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-/// <summary>
-///     The content blueprint tree controller
-/// </summary>
-/// <remarks>
-///     This authorizes based on access to the content section even though it exists in the settings
-/// </remarks>
-[Authorize(Policy = AuthorizationPolicies.SectionAccessContent)]
-[Tree(Constants.Applications.Settings, Constants.Trees.ContentBlueprints, SortOrder = 12,
-    TreeGroup = Constants.Trees.Groups.Settings)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class ContentBlueprintTreeController : TreeController
-{
-    private readonly IContentService _contentService;
-    private readonly IContentTypeService _contentTypeService;
-    private readonly IEntityService _entityService;
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-
-    public ContentBlueprintTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        IContentService contentService,
-        IContentTypeService contentTypeService,
-        IEntityService entityService,
-        IEventAggregator eventAggregator)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator)
-    {
-        _menuItemCollectionFactory = menuItemCollectionFactory ??
-                                     throw new ArgumentNullException(nameof(menuItemCollectionFactory));
-        _contentService = contentService ?? throw new ArgumentNullException(nameof(contentService));
-        _contentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService));
-        _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
-    }
-
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> rootResult = base.CreateRootNode(queryStrings);
-        if (!(rootResult.Result is null))
-        {
-            return rootResult;
-        }
-
-        TreeNode? root = rootResult.Value;
-
-        if (root is not null)
-        {
-            //this will load in a custom UI instead of the dashboard for the root node
-            root.RoutePath = $"{Constants.Applications.Settings}/{Constants.Trees.ContentBlueprints}/intro";
-
-            //check if there are any content blueprints
-            root.HasChildren = _contentService.GetBlueprintsForContentTypes()?.Any() ?? false;
-        }
-
-        return root;
-    }
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
-    {
-        var nodes = new TreeNodeCollection();
-
-        //get all blueprints
-        IEnumerable<IEntitySlim> entities = _entityService.GetChildren(Constants.System.Root, UmbracoObjectTypes.DocumentBlueprint);
-
-        //check if we're rendering the root in which case we'll render the content types that have blueprints
-        if (id == Constants.System.RootString)
-        {
-            //get all blueprint content types
-            IEnumerable<string> contentTypeAliases = entities.Select(x => ((IContentEntitySlim)x).ContentTypeAlias).Distinct();
-
-            //get the ids
-            var contentTypeIds = _contentTypeService.GetAllContentTypeIds(contentTypeAliases.ToArray()).ToArray();
-
-            if (contentTypeIds.Any())
-            {
-                //now get the entities ... it's a bit round about but still smaller queries than getting all document types
-                IEnumerable<IEntitySlim> docTypeEntities = _entityService.GetAll(UmbracoObjectTypes.DocumentType, contentTypeIds);
-
-                nodes.AddRange(docTypeEntities
-                    .OrderBy(entity => entity.Name)
-                    .Select(entity =>
-                    {
-                        TreeNode treeNode = CreateTreeNode(entity, Constants.ObjectTypes.DocumentBlueprint, id, queryStrings, Constants.Icons.ContentType, true);
-                        treeNode.Path = $"-1,{entity.Id}";
-                        treeNode.NodeType = "document-type-blueprints";
-                        // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now.
-                        treeNode.AdditionalData["jsClickCallback"] = "javascript:void(0);";
-                        return treeNode;
-                    }));
-            }
-
-            return nodes;
-        }
-
-        if (!int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intId))
-        {
-            return nodes;
-        }
-
-        //Get the content type
-        IContentType? ct = _contentTypeService.Get(intId);
-
-        if (ct == null)
-        {
-            return nodes;
-        }
-
-        IEnumerable<IEntitySlim> blueprintsForDocType = entities.Where(x => ct.Alias == ((IContentEntitySlim)x).ContentTypeAlias);
-
-        nodes.AddRange(blueprintsForDocType
-            .OrderBy(entity => entity.Name)
-            .Select(entity =>
-            {
-                TreeNode treeNode = CreateTreeNode(entity, Constants.ObjectTypes.DocumentBlueprint, id, queryStrings,
-                    Constants.Icons.Blueprint, false);
-                treeNode.Path = $"-1,{ct.Id},{entity.Id}";
-                return treeNode;
-            }));
-
-        return nodes;
-    }
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings)
-    {
-        MenuItemCollection menu = _menuItemCollectionFactory.Create();
-
-        if (id == Constants.System.RootString)
-        {
-            // root actions
-            menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-            return menu;
-        }
-
-        IEntitySlim? cte =
-            _entityService.Get(int.Parse(id, CultureInfo.InvariantCulture), UmbracoObjectTypes.DocumentType);
-        //only refresh & create if it's a content type
-        if (cte != null)
-        {
-            IContentType? ct = _contentTypeService.Get(cte.Id);
-            MenuItem? createItem =
-                menu.Items.Add<ActionCreateBlueprintFromContent>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            createItem?.NavigateToRoute("/settings/contentBlueprints/edit/-1?create=true&doctype=" + ct?.Alias);
-
-            menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-
-            return menu;
-        }
-
-        menu.Items.Add<ActionDelete>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-        return menu;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
deleted file mode 100644
index 4cdd8cef7c..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
+++ /dev/null
@@ -1,411 +0,0 @@
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Mail;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Infrastructure.Search;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.SectionAccessForContentTree)]
-[Tree(Constants.Applications.Content, Constants.Trees.Content)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-[SearchableTree("searchResultFormatter", "configureContentResult", 10)]
-public class ContentTreeController : ContentTreeControllerBase, ISearchableTreeWithCulture
-{
-    private readonly ActionCollection _actions;
-    private readonly AppCaches _appCaches;
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IContentService _contentService;
-    private readonly IEmailSender _emailSender;
-    private readonly IEntityService _entityService;
-    private readonly ILocalizationService _localizationService;
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-    private readonly IPublicAccessService _publicAccessService;
-    private readonly UmbracoTreeSearcher _treeSearcher;
-    private readonly IUserService _userService;
-
-    private int[]? _userStartNodes;
-
-    public ContentTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        IEntityService entityService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        ILogger<ContentTreeController> logger,
-        ActionCollection actionCollection,
-        IUserService userService,
-        IDataTypeService dataTypeService,
-        UmbracoTreeSearcher treeSearcher,
-        ActionCollection actions,
-        IContentService contentService,
-        IPublicAccessService publicAccessService,
-        ILocalizationService localizationService,
-        IEventAggregator eventAggregator,
-        IEmailSender emailSender,
-        AppCaches appCaches)
-        : base(
-            localizedTextService,
-            umbracoApiControllerTypeCollection,
-            menuItemCollectionFactory,
-            entityService,
-            backofficeSecurityAccessor,
-            logger,
-            actionCollection,
-            userService,
-            dataTypeService,
-            eventAggregator,
-            appCaches)
-    {
-        _treeSearcher = treeSearcher;
-        _actions = actions;
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-        _contentService = contentService;
-        _entityService = entityService;
-        _publicAccessService = publicAccessService;
-        _userService = userService;
-        _localizationService = localizationService;
-        _emailSender = emailSender;
-        _appCaches = appCaches;
-    }
-
-    protected override int RecycleBinId => Constants.System.RecycleBinContent;
-
-    protected override bool RecycleBinSmells => _contentService.RecycleBinSmells();
-
-    protected override int[] UserStartNodes
-        => _userStartNodes ??=
-            _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.CalculateContentStartNodeIds(_entityService, _appCaches) ?? Array.Empty<int>();
-
-    protected override UmbracoObjectTypes UmbracoObjectType => UmbracoObjectTypes.Document;
-
-    public async Task<EntitySearchResults> SearchAsync(string query, int pageSize, long pageIndex, string? searchFrom = null)
-    {
-        IEnumerable<SearchResultEntity> results = _treeSearcher.ExamineSearch(query, UmbracoEntityTypes.Document, pageSize, pageIndex, out var totalFound, searchFrom);
-        return new EntitySearchResults(results, totalFound);
-    }
-
-    /// <inheritdoc />
-    protected override TreeNode? GetSingleTreeNode(IEntitySlim entity, string parentId, FormCollection? queryStrings)
-    {
-        var culture = queryStrings?["culture"].ToString();
-
-        if(culture.IsNullOrWhiteSpace())
-        {
-            culture = _localizationService.GetDefaultLanguageIsoCode();
-        }
-
-        IEnumerable<MenuItem> allowedUserOptions = GetAllowedUserMenuItemsForNode(entity);
-        if (CanUserAccessNode(entity, allowedUserOptions, culture))
-        {
-            //Special check to see if it is a container, if so then we'll hide children.
-            var isContainer = entity.IsContainer; // && (queryStrings.Get("isDialog") != "true");
-
-            TreeNode node = CreateTreeNode(
-                entity,
-                Constants.ObjectTypes.Document,
-                parentId,
-                queryStrings,
-                entity.HasChildren);
-
-            // set container style if it is one
-            if (isContainer)
-            {
-                node.AdditionalData.Add("isContainer", true);
-                node.SetContainerStyle();
-            }
-
-            var documentEntity = (IDocumentEntitySlim)entity;
-
-            if (!documentEntity.Variations.VariesByCulture() || culture.IsNullOrWhiteSpace())
-            {
-                if (!documentEntity.Published)
-                {
-                    node.SetNotPublishedStyle();
-                }
-                else if (documentEntity.Edited)
-                {
-                    node.SetHasPendingVersionStyle();
-                }
-            }
-            else
-            {
-                if (!culture.IsNullOrWhiteSpace())
-                {
-                    if (!documentEntity.Published || !documentEntity.PublishedCultures.Contains(culture))
-                    {
-                        node.SetNotPublishedStyle();
-                    }
-                    else if (documentEntity.EditedCultures.Contains(culture))
-                    {
-                        node.SetHasPendingVersionStyle();
-                    }
-                }
-            }
-
-            node.AdditionalData.Add("variesByCulture", documentEntity.Variations.VariesByCulture());
-            node.AdditionalData.Add("contentType", documentEntity.ContentTypeAlias);
-
-            if (_publicAccessService.IsProtected(entity.Path).Success)
-            {
-                node.SetProtectedStyle();
-            }
-
-            return node;
-        }
-
-        return null;
-    }
-
-    protected override ActionResult<MenuItemCollection> PerformGetMenuForNode(string id, FormCollection queryStrings)
-    {
-        if (id == Constants.System.RootString)
-        {
-            MenuItemCollection menu = _menuItemCollectionFactory.Create();
-
-            // if the user's start node is not the root then the only menu item to display is refresh
-            if (UserStartNodes.Contains(Constants.System.Root) == false)
-            {
-                menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-                return menu;
-            }
-
-            //set the default to create
-            menu.DefaultMenuAlias = ActionNew.ActionAlias;
-
-            // we need to get the default permissions as you can't set permissions on the very root node
-            EntityPermission permission = _userService
-                .GetPermissions(_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, Constants.System.Root)
-                .First();
-            IEnumerable<MenuItem> nodeActions = _actions.FromEntityPermission(permission)
-                .Select(x => new MenuItem(x));
-
-            //these two are the standard items
-            menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add<ActionSort>(LocalizedTextService, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-
-            //filter the standard items
-            FilterUserAllowedMenuItems(menu, nodeActions);
-
-            if (menu.Items.Any())
-            {
-                menu.Items.Last().SeparatorBefore = true;
-            }
-
-            // add default actions for *all* users
-            menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-
-            return menu;
-        }
-
-
-        //return a normal node menu:
-        if (int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out int iid) == false)
-        {
-            return NotFound();
-        }
-
-        IEntitySlim? item = _entityService.Get(iid, UmbracoObjectTypes.Document);
-        if (item == null)
-        {
-            return NotFound();
-        }
-
-        //if the user has no path access for this node, all they can do is refresh
-        if (!_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.HasContentPathAccess(item, _entityService, _appCaches) ?? false)
-        {
-            MenuItemCollection menu = _menuItemCollectionFactory.Create();
-            menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-            return menu;
-        }
-
-        MenuItemCollection nodeMenu = GetAllNodeMenuItems(item);
-
-        //if the content node is in the recycle bin, don't have a default menu, just show the regular menu
-        if (item.Path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)
-            .Contains(RecycleBinId.ToInvariantString()))
-        {
-            nodeMenu.DefaultMenuAlias = null;
-            nodeMenu = GetNodeMenuItemsForDeletedContent(item);
-        }
-        else
-        {
-            //set the default to create
-            nodeMenu.DefaultMenuAlias = ActionNew.ActionAlias;
-        }
-
-        IEnumerable<MenuItem> allowedMenuItems = GetAllowedUserMenuItemsForNode(item);
-        FilterUserAllowedMenuItems(nodeMenu, allowedMenuItems);
-
-        return nodeMenu;
-    }
-
-    /// <summary>
-    ///     Returns true or false if the current user has access to the node based on the user's allowed start node (path)
-    ///     access
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    protected override bool HasPathAccess(string id, FormCollection queryStrings)
-    {
-        IEntitySlim? entity = GetEntityFromId(id);
-        return HasPathAccess(entity, queryStrings);
-    }
-
-    protected override ActionResult<IEnumerable<IEntitySlim>> GetChildEntities(string id, FormCollection queryStrings)
-    {
-        ActionResult<IEnumerable<IEntitySlim>> result = base.GetChildEntities(id, queryStrings);
-
-        if (!(result.Result is null))
-        {
-            return result.Result;
-        }
-
-        Attempt<string> culture = queryStrings["culture"].TryConvertTo<string>();
-
-        //if this is null we'll set it to the default.
-        var cultureVal =
-            (culture.Success ? culture.Result : null).IfNullOrWhiteSpace(
-                _localizationService.GetDefaultLanguageIsoCode());
-
-        // set names according to variations
-        foreach (IEntitySlim entity in result.Value!)
-        {
-            EnsureName(entity, cultureVal);
-        }
-
-        return result;
-    }
-
-    /// <summary>
-    ///     Returns a collection of all menu items that can be on a content node
-    /// </summary>
-    /// <param name="item"></param>
-    /// <returns></returns>
-    protected MenuItemCollection GetAllNodeMenuItems(IUmbracoEntity item)
-    {
-        MenuItemCollection menu = _menuItemCollectionFactory.Create();
-        AddActionNode<ActionNew>(item, menu, opensDialog: true, useLegacyIcon: false);
-        AddActionNode<ActionDelete>(item, menu, opensDialog: true, useLegacyIcon: false);
-        AddActionNode<ActionCreateBlueprintFromContent>(item, menu, opensDialog: true, useLegacyIcon: false);
-        AddActionNode<ActionMove>(item, menu, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-        AddActionNode<ActionCopy>(item, menu, opensDialog: true, useLegacyIcon: false);
-        AddActionNode<ActionSort>(item, menu, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-        AddActionNode<ActionAssignDomain>(item, menu, opensDialog: true, useLegacyIcon: false);
-        AddActionNode<ActionRights>(item, menu, opensDialog: true, useLegacyIcon: false);
-        AddActionNode<ActionProtect>(item, menu, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-
-        if (_emailSender.CanSendRequiredEmail())
-        {
-            menu.Items.Add(new MenuItem("notify", LocalizedTextService)
-            {
-                Icon = "icon-megaphone",
-                SeparatorBefore = true,
-                OpensDialog = true,
-                UseLegacyIcon = false
-            });
-        }
-
-        if ((item is DocumentEntitySlim documentEntity && documentEntity.IsContainer) == false)
-        {
-            menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-        }
-
-        return menu;
-    }
-
-    /// <summary>
-    ///     Returns a collection of all menu items that can be on a deleted (in recycle bin) content node
-    /// </summary>
-    /// <param name="item"></param>
-    /// <returns></returns>
-    protected MenuItemCollection GetNodeMenuItemsForDeletedContent(IUmbracoEntity item)
-    {
-        MenuItemCollection menu = _menuItemCollectionFactory.Create();
-        menu.Items.Add<ActionRestore>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-        menu.Items.Add<ActionMove>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-        menu.Items.Add<ActionDelete>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-        menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-
-        return menu;
-    }
-
-    /// <summary>
-    ///     set name according to variations
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <param name="culture"></param>
-    private void EnsureName(IEntitySlim entity, string? culture)
-    {
-        if (culture == null)
-        {
-            if (string.IsNullOrWhiteSpace(entity.Name))
-            {
-                entity.Name = "[[" + entity.Id + "]]";
-            }
-
-            return;
-        }
-
-        if (!(entity is IDocumentEntitySlim docEntity))
-        {
-            throw new InvalidOperationException(
-                $"Cannot render a tree node for a culture when the entity isn't {typeof(IDocumentEntitySlim)}, instead it is {entity.GetType()}");
-        }
-
-        // we are getting the tree for a given culture,
-        // for those items that DO support cultures, we need to get the proper name, IF it exists
-        // otherwise, invariant is fine (with brackets)
-
-        if (docEntity.Variations.VariesByCulture())
-        {
-            if (docEntity.CultureNames.TryGetValue(culture, out var name) &&
-                !string.IsNullOrWhiteSpace(name))
-            {
-                entity.Name = name;
-            }
-            else
-            {
-                entity.Name = "(" + entity.Name + ")";
-            }
-        }
-
-        if (string.IsNullOrWhiteSpace(entity.Name))
-        {
-            entity.Name = "[[" + entity.Id + "]]";
-        }
-    }
-
-    private void AddActionNode<TAction>(IUmbracoEntity item, MenuItemCollection menu, bool hasSeparator = false, bool opensDialog = false, bool useLegacyIcon = true)
-        where TAction : IAction
-    {
-        MenuItem? menuItem = menu.Items.Add<TAction>(LocalizedTextService, hasSeparator, opensDialog, useLegacyIcon);
-    }
-
-    public async Task<EntitySearchResults> SearchAsync(string query, int pageSize, long pageIndex, string? searchFrom = null, string? culture = null)
-    {
-        var results = _treeSearcher.ExamineSearch(query, UmbracoEntityTypes.Document, pageSize, pageIndex, out long totalFound, culture: culture, searchFrom: searchFrom);
-        return new EntitySearchResults(results, totalFound);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
deleted file mode 100644
index 930c51c713..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
+++ /dev/null
@@ -1,674 +0,0 @@
-using System.Collections.Concurrent;
-using System.Globalization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.ModelBinders;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-public abstract class ContentTreeControllerBase : TreeController, ITreeNodeController
-{
-    private static readonly char[] Comma = { ',' };
-    private readonly ActionCollection _actionCollection;
-    private readonly AppCaches _appCaches;
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IDataTypeService _dataTypeService;
-
-    private readonly ConcurrentDictionary<string, IEntitySlim?> _entityCache = new();
-    private readonly IEntityService _entityService;
-    private readonly ILogger<ContentTreeControllerBase> _logger;
-    private readonly IUserService _userService;
-
-    private bool? _ignoreUserStartNodes;
-
-
-    protected ContentTreeControllerBase(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        IEntityService entityService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        ILogger<ContentTreeControllerBase> logger,
-        ActionCollection actionCollection,
-        IUserService userService,
-        IDataTypeService dataTypeService,
-        IEventAggregator eventAggregator,
-        AppCaches appCaches)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator)
-    {
-        _entityService = entityService;
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-        _logger = logger;
-        _actionCollection = actionCollection;
-        _userService = userService;
-        _dataTypeService = dataTypeService;
-        _appCaches = appCaches;
-        MenuItemCollectionFactory = menuItemCollectionFactory;
-    }
-
-    public IMenuItemCollectionFactory MenuItemCollectionFactory { get; }
-
-    /// <summary>
-    ///     Returns the
-    /// </summary>
-    protected abstract int RecycleBinId { get; }
-
-    /// <summary>
-    ///     Returns true if the recycle bin has items in it
-    /// </summary>
-    protected abstract bool RecycleBinSmells { get; }
-
-    /// <summary>
-    ///     Returns the user's start node for this tree
-    /// </summary>
-    protected abstract int[] UserStartNodes { get; }
-
-    protected abstract UmbracoObjectTypes UmbracoObjectType { get; }
-
-
-    #region Actions
-
-    /// <summary>
-    ///     Gets an individual tree node
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    public ActionResult<TreeNode?> GetTreeNode([FromRoute] string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection? queryStrings)
-    {
-        Guid asGuid = Guid.Empty;
-        if (int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out int asInt) == false)
-        {
-            if (Guid.TryParse(id, out asGuid) == false)
-            {
-                return NotFound();
-            }
-        }
-
-        IEntitySlim? entity = asGuid == Guid.Empty
-            ? _entityService.Get(asInt, UmbracoObjectType)
-            : _entityService.Get(asGuid, UmbracoObjectType);
-        if (entity == null)
-        {
-            return NotFound();
-        }
-
-        TreeNode? node = GetSingleTreeNode(entity, entity.ParentId.ToInvariantString(), queryStrings);
-
-        if (node is not null)
-        {
-            // Add the tree alias to the node since it is standalone (has no root for which this normally belongs)
-            node.AdditionalData["treeAlias"] = TreeAlias;
-        }
-
-        return node;
-    }
-
-    #endregion
-
-    /// <summary>
-    ///     Ensure the noAccess metadata is applied for the root node if in dialog mode and the user doesn't have path access
-    ///     to it
-    /// </summary>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> nodeResult = base.CreateRootNode(queryStrings);
-        if (nodeResult.Result is null)
-        {
-            return nodeResult;
-        }
-
-        TreeNode? node = nodeResult.Value;
-
-        if (node is not null && IsDialog(queryStrings) && UserStartNodes.Contains(Constants.System.Root) == false &&
-            IgnoreUserStartNodes(queryStrings) == false)
-        {
-            node.AdditionalData["noAccess"] = true;
-        }
-
-        return node;
-    }
-
-    protected abstract TreeNode? GetSingleTreeNode(IEntitySlim entity, string parentId, FormCollection? queryStrings);
-
-    /// <summary>
-    ///     Returns a <see cref="TreeNode" /> for the <see cref="IUmbracoEntity" /> and
-    ///     attaches some meta data to the node if the user doesn't have start node access to it when in dialog mode
-    /// </summary>
-    /// <param name="e"></param>
-    /// <param name="parentId"></param>
-    /// <param name="queryStrings"></param>
-    /// <param name="startNodeIds"></param>
-    /// <param name="startNodePaths"></param>
-    /// <returns></returns>
-    internal TreeNode? GetSingleTreeNodeWithAccessCheck(IEntitySlim e, string parentId, FormCollection queryStrings, int[]? startNodeIds, string[]? startNodePaths)
-    {
-        var entityIsAncestorOfStartNodes =
-            ContentPermissions.IsInBranchOfStartNode(e.Path, startNodeIds, startNodePaths, out var hasPathAccess);
-        var ignoreUserStartNodes = IgnoreUserStartNodes(queryStrings);
-        if (ignoreUserStartNodes == false && entityIsAncestorOfStartNodes == false)
-        {
-            return null;
-        }
-
-        TreeNode? treeNode = GetSingleTreeNode(e, parentId, queryStrings);
-        if (treeNode == null)
-        {
-            //this means that the user has NO access to this node via permissions! They at least need to have browse permissions to see
-            //the node so we need to return null;
-            return null;
-        }
-
-        if (!ignoreUserStartNodes && !hasPathAccess)
-        {
-            treeNode.AdditionalData["noAccess"] = true;
-        }
-
-        return treeNode;
-    }
-
-    private void GetUserStartNodes(out int[]? startNodeIds, out string[]? startNodePaths)
-    {
-        switch (RecycleBinId)
-        {
-            case Constants.System.RecycleBinMedia:
-                startNodeIds =
-                    _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.CalculateMediaStartNodeIds(
-                        _entityService, _appCaches);
-                startNodePaths =
-                    _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.GetMediaStartNodePaths(_entityService, _appCaches);
-                break;
-            case Constants.System.RecycleBinContent:
-                startNodeIds =
-                    _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.CalculateContentStartNodeIds(
-                        _entityService, _appCaches);
-                startNodePaths =
-                    _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.GetContentStartNodePaths(
-                        _entityService, _appCaches);
-                break;
-            default:
-                throw new NotSupportedException("Path access is only determined on content or media");
-        }
-    }
-
-    protected virtual ActionResult<TreeNodeCollection> PerformGetTreeNodes(string id, FormCollection queryStrings)
-    {
-        var nodes = new TreeNodeCollection();
-
-        var rootIdString = Constants.System.RootString;
-        var hasAccessToRoot = UserStartNodes.Contains(Constants.System.Root);
-
-        var startNodeId = queryStrings.HasKey(TreeQueryStringParameters.StartNodeId)
-            ? queryStrings.GetValue<string>(TreeQueryStringParameters.StartNodeId)
-            : string.Empty;
-
-        var ignoreUserStartNodes = IgnoreUserStartNodes(queryStrings);
-
-        if (string.IsNullOrEmpty(startNodeId) == false && startNodeId != "undefined" && startNodeId != rootIdString)
-        {
-            // request has been made to render from a specific, non-root, start node
-            id = startNodeId;
-
-            // ensure that the user has access to that node, otherwise return the empty tree nodes collection
-            // TODO: in the future we could return a validation statement so we can have some UI to notify the user they don't have access
-            if (ignoreUserStartNodes == false && HasPathAccess(id, queryStrings) == false)
-            {
-                _logger.LogWarning(
-                    "User {Username} does not have access to node with id {Id}",
-                    _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Username,
-                    id);
-                return nodes;
-            }
-
-            // if the tree is rendered...
-            // - in a dialog: render only the children of the specific start node, nothing to do
-            // - in a section: if the current user's start nodes do not contain the root node, we need
-            //   to include these start nodes in the tree too, to provide some context - i.e. change
-            //   start node back to root node, and then GetChildEntities method will take care of the rest.
-            if (IsDialog(queryStrings) == false && hasAccessToRoot == false)
-            {
-                id = rootIdString;
-            }
-        }
-
-        // get child entities - if id is root, but user's start nodes do not contain the
-        // root node, this returns the start nodes instead of root's children
-        ActionResult<IEnumerable<IEntitySlim>> entitiesResult = GetChildEntities(id, queryStrings);
-        if (!(entitiesResult.Result is null))
-        {
-            return entitiesResult.Result;
-        }
-
-        var entities = entitiesResult.Value?.ToList();
-
-        //get the current user start node/paths
-        GetUserStartNodes(out var userStartNodes, out var userStartNodePaths);
-
-        // if the user does not have access to the root node, what we have is the start nodes,
-        // but to provide some context we need to add their topmost nodes when they are not
-        // topmost nodes themselves (level > 1).
-        if (id == rootIdString && hasAccessToRoot == false)
-        {
-            // first add the entities that are topmost to the nodes collection
-            IEntitySlim[]? topMostEntities = entities?.Where(x => x.Level == 1).ToArray();
-            nodes.AddRange(
-                topMostEntities?.Select(x =>
-                        GetSingleTreeNodeWithAccessCheck(x, id, queryStrings, userStartNodes, userStartNodePaths))
-                    .WhereNotNull() ?? Enumerable.Empty<TreeNode>());
-
-            // now add the topmost nodes of the entities that aren't topmost to the nodes collection as well
-            // - these will appear as "no-access" nodes in the tree, but will allow the editors to drill down through the tree
-            //   until they reach their start nodes
-            var topNodeIds = entities?.Except(topMostEntities ?? Enumerable.Empty<IEntitySlim>()).Select(GetTopNodeId)
-                .Where(x => x != 0).Distinct().ToArray();
-            if (topNodeIds?.Length > 0)
-            {
-                IEnumerable<IEntitySlim> topNodes = _entityService.GetAll(UmbracoObjectType, topNodeIds.ToArray());
-                nodes.AddRange(topNodes.Select(x =>
-                        GetSingleTreeNodeWithAccessCheck(x, id, queryStrings, userStartNodes, userStartNodePaths))
-                    .WhereNotNull());
-            }
-        }
-        else
-        {
-            // the user has access to the root, just add the entities
-            nodes.AddRange(
-                entities?.Select(x =>
-                        GetSingleTreeNodeWithAccessCheck(x, id, queryStrings, userStartNodes, userStartNodePaths))
-                    .WhereNotNull() ?? Enumerable.Empty<TreeNode>());
-        }
-
-        return nodes;
-    }
-
-    private int GetTopNodeId(IUmbracoEntity entity)
-    {
-        var parts = entity.Path.Split(Comma, StringSplitOptions.RemoveEmptyEntries);
-        return parts.Length >= 2 && int.TryParse(parts[1], NumberStyles.Integer, CultureInfo.InvariantCulture, out int id)
-            ? id
-            : 0;
-    }
-
-    protected abstract ActionResult<MenuItemCollection> PerformGetMenuForNode(string id, FormCollection queryStrings);
-
-    protected virtual ActionResult<IEnumerable<IEntitySlim>> GetChildEntities(string id, FormCollection queryStrings)
-    {
-        // try to parse id as an integer else use GetEntityFromId
-        // which will grok Guids, Udis, etc and let use obtain the id
-        if (!int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out var entityId))
-        {
-            IEntitySlim? entity = GetEntityFromId(id);
-            if (entity == null)
-            {
-                return NotFound();
-            }
-
-            entityId = entity.Id;
-        }
-
-        var ignoreUserStartNodes = IgnoreUserStartNodes(queryStrings);
-
-        IEntitySlim[] result;
-
-        // if a request is made for the root node but user has no access to
-        // root node, return start nodes instead
-        if (!ignoreUserStartNodes && entityId == Constants.System.Root &&
-            UserStartNodes.Contains(Constants.System.Root) == false)
-        {
-            result = UserStartNodes.Length > 0
-                ? _entityService.GetAll(UmbracoObjectType, UserStartNodes).ToArray()
-                : Array.Empty<IEntitySlim>();
-        }
-        else
-        {
-            result = GetChildrenFromEntityService(entityId).ToArray();
-        }
-
-        return result;
-    }
-
-    private IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId)
-        => _entityService.GetChildren(entityId, UmbracoObjectType).ToList();
-
-    /// <summary>
-    ///     Returns true or false if the current user has access to the node based on the user's allowed start node (path)
-    ///     access
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    //we should remove this in v8, it's now here for backwards compat only
-    protected abstract bool HasPathAccess(string id, FormCollection queryStrings);
-
-    /// <summary>
-    ///     Returns true or false if the current user has access to the node based on the user's allowed start node (path)
-    ///     access
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    protected bool HasPathAccess(IUmbracoEntity? entity, FormCollection queryStrings)
-    {
-        if (entity == null)
-        {
-            return false;
-        }
-
-        return RecycleBinId == Constants.System.RecycleBinContent
-            ? _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.HasContentPathAccess(entity, _entityService, _appCaches) ?? false
-            : _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.HasMediaPathAccess(entity, _entityService, _appCaches) ?? false;
-    }
-
-    /// <summary>
-    ///     Ensures the recycle bin is appended when required (i.e. user has access to the root and it's not in dialog mode)
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     This method is overwritten strictly to render the recycle bin, it should serve no other purpose
-    /// </remarks>
-    protected sealed override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
-    {
-        //check if we're rendering the root
-        if (id == Constants.System.RootString && UserStartNodes.Contains(Constants.System.Root))
-        {
-            var altStartId = string.Empty;
-
-            if (queryStrings.HasKey(TreeQueryStringParameters.StartNodeId))
-            {
-                altStartId = queryStrings.GetValue<string>(TreeQueryStringParameters.StartNodeId);
-            }
-
-            //check if a request has been made to render from a specific start node
-            if (string.IsNullOrEmpty(altStartId) == false && altStartId != "undefined" &&
-                altStartId != Constants.System.RootString)
-            {
-                id = altStartId;
-            }
-
-            ActionResult<TreeNodeCollection> nodesResult = GetTreeNodesInternal(id, queryStrings);
-            if (!(nodesResult.Result is null))
-            {
-                return nodesResult.Result;
-            }
-
-            TreeNodeCollection? nodes = nodesResult.Value;
-
-            //only render the recycle bin if we are not in dialog and the start id is still the root
-            //we need to check for the "application" key in the queryString because its value is required here,
-            //and for some reason when there are no dashboards, this parameter is missing
-            if (IsDialog(queryStrings) == false && id == Constants.System.RootString &&
-                queryStrings.HasKey("application"))
-            {
-                nodes?.Add(CreateTreeNode(
-                    RecycleBinId.ToInvariantString(),
-                    id,
-                    queryStrings,
-                    LocalizedTextService.Localize("general", "recycleBin"),
-                    "icon-trash",
-                    RecycleBinSmells,
-                    queryStrings.GetRequiredValue<string>("application") + TreeAlias.EnsureStartsWith('/') +
-                    "/recyclebin"));
-            }
-
-            return nodes ?? new TreeNodeCollection();
-        }
-
-        return GetTreeNodesInternal(id, queryStrings);
-    }
-
-    /// <summary>
-    ///     Check to see if we should return children of a container node
-    /// </summary>
-    /// <param name="e"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     This is required in case a user has custom start nodes that are children of a list view since in that case we'll
-    ///     need to render the tree node. In normal cases we don't render
-    ///     children of a list view.
-    /// </remarks>
-    protected bool ShouldRenderChildrenOfContainer(IEntitySlim e)
-    {
-        var isContainer = e.IsContainer;
-
-        var renderChildren = e.HasChildren && isContainer == false;
-
-        //Here we need to figure out if the node is a container and if so check if the user has a custom start node, then check if that start node is a child
-        // of this container node. If that is true, the HasChildren must be true so that the tree node still renders even though this current node is a container/list view.
-        if (isContainer && UserStartNodes.Length > 0 && UserStartNodes.Contains(Constants.System.Root) == false)
-        {
-            IEnumerable<IEntitySlim> startNodes = _entityService.GetAll(UmbracoObjectType, UserStartNodes);
-            //if any of these start nodes' parent is current, then we need to render children normally so we need to switch some logic and tell
-            // the UI that this node does have children and that it isn't a container
-
-            if (startNodes.Any(x =>
-                {
-                    var pathParts = x.Path.Split(Constants.CharArrays.Comma);
-                    return pathParts.Contains(e.Id.ToInvariantString());
-                }))
-            {
-                renderChildren = true;
-            }
-        }
-
-        return renderChildren;
-    }
-
-    /// <summary>
-    ///     Before we make a call to get the tree nodes we have to check if they can actually be rendered
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     Currently this just checks if it is a container type, if it is we cannot render children. In the future this might
-    ///     check for other things.
-    /// </remarks>
-    private ActionResult<TreeNodeCollection> GetTreeNodesInternal(string id, FormCollection queryStrings)
-    {
-        IEntitySlim? current = GetEntityFromId(id);
-
-        //before we get the children we need to see if this is a container node
-
-        //test if the parent is a listview / container
-        if (current != null && ShouldRenderChildrenOfContainer(current) == false)
-        {
-            //no children!
-            return new TreeNodeCollection();
-        }
-
-        return PerformGetTreeNodes(id, queryStrings);
-    }
-
-    /// <summary>
-    ///     Checks if the menu requested is for the recycle bin and renders that, otherwise renders the result of
-    ///     PerformGetMenuForNode
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    protected sealed override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings)
-    {
-        if (RecycleBinId.ToInvariantString() == id)
-        {
-            // get the default assigned permissions for this user
-            var deleteAllowed = false;
-            IAction? deleteAction = _actionCollection.FirstOrDefault(y => y.Letter == ActionDelete.ActionLetter);
-            if (deleteAction != null)
-            {
-                IEnumerable<string>? perms =
-                    _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.GetPermissions(
-                        Constants.System.RecycleBinContentString, _userService);
-                deleteAllowed = perms?.FirstOrDefault(x => x.Contains(deleteAction.Letter)) != null;
-            }
-
-            MenuItemCollection menu = MenuItemCollectionFactory.Create();
-
-            // only add empty recycle bin if the current user is allowed to delete by default
-            if (deleteAllowed)
-            {
-                menu.Items.Add(new MenuItem("emptyrecyclebin", LocalizedTextService)
-                {
-                    Icon = "icon-trash",
-                    OpensDialog = true,
-                    UseLegacyIcon = false,
-                });
-
-                menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-            }
-
-            return menu;
-        }
-
-        return PerformGetMenuForNode(id, queryStrings);
-    }
-
-    /// <summary>
-    ///     Based on the allowed actions, this will filter the ones that the current user is allowed
-    /// </summary>
-    /// <param name="menuWithAllItems"></param>
-    /// <param name="userAllowedMenuItems"></param>
-    /// <returns></returns>
-    protected void FilterUserAllowedMenuItems(MenuItemCollection menuWithAllItems, IEnumerable<MenuItem> userAllowedMenuItems)
-    {
-        IAction?[] userAllowedActions =
-            userAllowedMenuItems.Where(x => x.Action != null).Select(x => x.Action).ToArray();
-
-        MenuItem[] notAllowed = menuWithAllItems.Items.Where(
-                a => a.Action != null
-                     && a.Action.CanBePermissionAssigned
-                     && (a.Action.CanBePermissionAssigned == false || userAllowedActions.Contains(a.Action) == false))
-            .ToArray();
-
-        //remove the ones that aren't allowed.
-        foreach (MenuItem m in notAllowed)
-        {
-            menuWithAllItems.Items.Remove(m);
-            // if the disallowed action is set as default action, make sure to reset the default action as well
-            if (menuWithAllItems.DefaultMenuAlias == m.Alias)
-            {
-                menuWithAllItems.DefaultMenuAlias = null;
-            }
-        }
-    }
-
-    internal IEnumerable<MenuItem> GetAllowedUserMenuItemsForNode(IUmbracoEntity dd)
-    {
-        IEnumerable<string> permissionsForPath = _userService
-            .GetPermissionsForPath(_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, dd.Path)
-            .GetAllPermissions();
-        return _actionCollection.GetByLetters(permissionsForPath).Select(x => new MenuItem(x));
-    }
-
-    /// <summary>
-    ///     Determines if the user has access to view the node/document
-    /// </summary>
-    /// <param name="doc">The Document to check permissions against</param>
-    /// <param name="allowedUserOptions">A list of MenuItems that the user has permissions to execute on the current document</param>
-    /// <param name="culture">The culture of the node</param>
-    /// <remarks>By default the user must have Browse permissions to see the node in the Content tree</remarks>
-    /// <returns></returns>
-    internal bool CanUserAccessNode(IUmbracoEntity doc, IEnumerable<MenuItem> allowedUserOptions, string? culture) =>
-        // TODO: At some stage when we implement permissions on languages we'll need to take care of culture
-        allowedUserOptions.Select(x => x.Action).OfType<ActionBrowse>().Any();
-
-
-    /// <summary>
-    ///     this will parse the string into either a GUID or INT
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    internal Tuple<Guid?, int?>? GetIdentifierFromString(string id)
-    {
-
-        if (Guid.TryParse(id, out Guid idGuid))
-        {
-            return new Tuple<Guid?, int?>(idGuid, null);
-        }
-
-        if (int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out int idInt))
-        {
-            return new Tuple<Guid?, int?>(null, idInt);
-        }
-
-        if (UdiParser.TryParse(id, out Udi? idUdi))
-        {
-            var guidUdi = idUdi as GuidUdi;
-            if (guidUdi != null)
-            {
-                return new Tuple<Guid?, int?>(guidUdi.Guid, null);
-            }
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    ///     Get an entity via an id that can be either an integer, Guid or UDI
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     This object has it's own contextual cache for these lookups
-    /// </remarks>
-    internal IEntitySlim? GetEntityFromId(string id) =>
-        _entityCache.GetOrAdd(id, s =>
-        {
-            IEntitySlim? entity;
-
-            if (Guid.TryParse(s, out Guid idGuid))
-            {
-                entity = _entityService.Get(idGuid, UmbracoObjectType);
-            }
-            else if (int.TryParse(s, NumberStyles.Integer, CultureInfo.InvariantCulture, out var idInt))
-            {
-                entity = _entityService.Get(idInt, UmbracoObjectType);
-            }
-            else if (UdiParser.TryParse(s, out Udi? idUdi))
-            {
-                var guidUdi = idUdi as GuidUdi;
-                entity = guidUdi != null ? _entityService.Get(guidUdi.Guid, UmbracoObjectType) : null;
-            }
-            else
-            {
-                entity = null;
-            }
-
-            return entity;
-        });
-
-
-    /// <summary>
-    ///     If the request should allows a user to choose nodes that they normally don't have access to
-    /// </summary>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    internal bool IgnoreUserStartNodes(FormCollection queryStrings)
-    {
-        if (_ignoreUserStartNodes.HasValue)
-        {
-            return _ignoreUserStartNodes.Value;
-        }
-
-        Guid? dataTypeKey = queryStrings.GetValue<Guid?>(TreeQueryStringParameters.DataTypeKey);
-        _ignoreUserStartNodes =
-            dataTypeKey.HasValue && _dataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeKey.Value);
-
-        return _ignoreUserStartNodes.Value;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs
deleted file mode 100644
index f68b4f8783..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Infrastructure.Search;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
-[Tree(Constants.Applications.Settings, Constants.Trees.DocumentTypes, SortOrder = 0, TreeGroup = Constants.Trees.Groups.Settings)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class ContentTypeTreeController : TreeController, ISearchableTree
-{
-    private readonly IContentTypeService _contentTypeService;
-    private readonly IEntityService _entityService;
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-    private readonly UmbracoTreeSearcher _treeSearcher;
-
-    public ContentTypeTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        UmbracoTreeSearcher treeSearcher,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        IContentTypeService contentTypeService,
-        IEntityService entityService,
-        IEventAggregator eventAggregator)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator)
-    {
-        _treeSearcher = treeSearcher;
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-        _contentTypeService = contentTypeService;
-        _entityService = entityService;
-    }
-
-    public async Task<EntitySearchResults> SearchAsync(string query, int pageSize, long pageIndex, string? searchFrom = null)
-    {
-        IEnumerable<SearchResultEntity?> results = _treeSearcher.EntitySearch(UmbracoObjectTypes.DocumentType, query, pageSize, pageIndex, out var totalFound, searchFrom);
-        return new EntitySearchResults(results, totalFound);
-    }
-
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> rootResult = base.CreateRootNode(queryStrings);
-        if (!(rootResult.Result is null))
-        {
-            return rootResult;
-        }
-
-        TreeNode? root = rootResult.Value;
-
-        if (root is not null)
-        {
-            // check if there are any types or containers
-            root.HasChildren = _contentTypeService.GetAll().Any() || _contentTypeService.GetContainers(Array.Empty<int>()).Any();
-        }
-
-        return root;
-    }
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
-    {
-        if (!int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intId))
-        {
-            throw new InvalidOperationException("Id must be an integer");
-        }
-
-        var nodes = new TreeNodeCollection();
-
-        nodes.AddRange(
-            _entityService.GetChildren(intId, UmbracoObjectTypes.DocumentTypeContainer)
-                .OrderBy(entity => entity.Name)
-                .Select(dt =>
-                {
-                    TreeNode node = CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, Constants.Icons.Folder, dt.HasChildren, string.Empty);
-                    node.Path = dt.Path;
-                    node.NodeType = "container";
-
-                    // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now.
-                    node.AdditionalData["jsClickCallback"] = "javascript:void(0);";
-                    return node;
-                }));
-
-        //if the request is for folders only then just return
-        if (queryStrings["foldersonly"].ToString().IsNullOrWhiteSpace() == false && queryStrings["foldersonly"] == "1")
-        {
-            return nodes;
-        }
-
-        IEntitySlim[] children = _entityService.GetChildren(intId, UmbracoObjectTypes.DocumentType).ToArray();
-        var contentTypes = _contentTypeService.GetAll(children.Select(c => c.Id).ToArray()).ToDictionary(c => c.Id);
-        nodes.AddRange(
-            children
-                .OrderBy(entity => entity.Name)
-                .Select(dt =>
-                {
-                    // get the content type here so we can get the icon from it to use when we create the tree node
-                    // and we can enrich the result with content type data that's not available in the entity service output
-                    IContentType? contentType = contentTypes[dt.Id];
-
-                    // since 7.4+ child type creation is enabled by a config option. It defaults to on, but can be disabled if we decide to.
-                    // need this check to keep supporting sites where children have already been created.
-                    var hasChildren = dt.HasChildren;
-                    TreeNode node = CreateTreeNode(dt, Constants.ObjectTypes.DocumentType, id, queryStrings, contentType?.Icon ?? Constants.Icons.ContentType, hasChildren);
-
-                    node.Path = dt.Path;
-
-                    // now we can enrich the result with content type data that's not available in the entity service output
-                    node.Alias = contentType?.Alias ?? string.Empty;
-                    node.AdditionalData["isElement"] = contentType?.IsElement;
-
-                    return node;
-                }));
-
-        return nodes;
-    }
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings)
-    {
-        MenuItemCollection menu = _menuItemCollectionFactory.Create();
-
-        if (id == Constants.System.RootString)
-        {
-                //set the default to create
-            menu.DefaultMenuAlias = ActionNew.ActionAlias;
-
-            // root actions
-            menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add(new MenuItem("importdocumenttype", LocalizedTextService)
-            {
-                Icon = "icon-page-up",
-                SeparatorBefore = true,
-                OpensDialog = true,
-                UseLegacyIcon = false,
-            });
-
-            menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-
-            return menu;
-        }
-
-        IEntitySlim? container = _entityService.Get(int.Parse(id, CultureInfo.InvariantCulture), UmbracoObjectTypes.DocumentTypeContainer);
-        if (container != null)
-        {
-            //set the default to create
-            menu.DefaultMenuAlias = ActionNew.ActionAlias;
-
-            menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-            menu.Items.Add(new MenuItem("rename", LocalizedTextService)
-            {
-                Icon = "icon-edit",
-                UseLegacyIcon = false
-            });
-
-            if (container.HasChildren == false)
-            {
-                //can delete doc type
-                menu.Items.Add<ActionDelete>(LocalizedTextService, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-            }
-
-            menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-        }
-        else
-        {
-            IContentType? ct = _contentTypeService.Get(int.Parse(id, CultureInfo.InvariantCulture));
-            IContentType? parent = ct == null ? null : _contentTypeService.Get(ct.ParentId);
-
-            menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-            // No move action if this is a child doc type
-            if (parent == null)
-            {
-                menu.Items.Add<ActionMove>(LocalizedTextService, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-            }
-
-            menu.Items.Add<ActionCopy>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add(new MenuItem("export", LocalizedTextService)
-            {
-                Icon = "icon-download-alt",
-                SeparatorBefore = true,
-                OpensDialog = true,
-                UseLegacyIcon = false,
-            });
-
-            menu.Items.Add<ActionDelete>(LocalizedTextService, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-        }
-
-        return menu;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs
deleted file mode 100644
index 4b7cc5f15c..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Infrastructure.Search;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.TreeAccessDataTypes)]
-[Tree(Constants.Applications.Settings, Constants.Trees.DataTypes, SortOrder = 3,
-    TreeGroup = Constants.Trees.Groups.Settings)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class DataTypeTreeController : TreeController, ISearchableTree
-{
-    private readonly IDataTypeService _dataTypeService;
-    private readonly IEntityService _entityService;
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-    private readonly UmbracoTreeSearcher _treeSearcher;
-
-
-    public DataTypeTreeController(ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection, UmbracoTreeSearcher treeSearcher,
-        IMenuItemCollectionFactory menuItemCollectionFactory, IEntityService entityService,
-        IDataTypeService dataTypeService, IEventAggregator eventAggregator) : base(localizedTextService,
-        umbracoApiControllerTypeCollection, eventAggregator)
-    {
-        _treeSearcher = treeSearcher;
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-        _entityService = entityService;
-        _dataTypeService = dataTypeService;
-    }
-
-    public async Task<EntitySearchResults> SearchAsync(string query, int pageSize, long pageIndex,
-        string? searchFrom = null)
-    {
-        IEnumerable<SearchResultEntity?> results = _treeSearcher.EntitySearch(UmbracoObjectTypes.DataType, query,
-            pageSize, pageIndex, out var totalFound, searchFrom);
-        return new EntitySearchResults(results, totalFound);
-    }
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
-    {
-        if (!int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intId))
-        {
-            throw new InvalidOperationException("Id must be an integer");
-        }
-
-        var nodes = new TreeNodeCollection();
-
-        //Folders first
-        nodes.AddRange(
-            _entityService.GetChildren(intId, UmbracoObjectTypes.DataTypeContainer)
-                .OrderBy(entity => entity.Name)
-                .Select(dt =>
-                {
-                    TreeNode node = CreateTreeNode(dt, Constants.ObjectTypes.DataType, id, queryStrings,
-                        Constants.Icons.Folder, dt.HasChildren);
-                    node.Path = dt.Path;
-                    node.NodeType = "container";
-                    // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now.
-                    node.AdditionalData["jsClickCallback"] = "javascript:void(0);";
-                    return node;
-                }));
-
-        //if the request is for folders only then just return
-        if (queryStrings["foldersonly"].ToString().IsNullOrWhiteSpace() == false && queryStrings["foldersonly"] == "1")
-        {
-            return nodes;
-        }
-
-        //System ListView nodes
-        IEnumerable<int> systemListViewDataTypeIds = GetNonDeletableSystemListViewDataTypeIds();
-
-        IEntitySlim[] children = _entityService.GetChildren(intId, UmbracoObjectTypes.DataType).ToArray();
-        var dataTypes = _dataTypeService.GetAll(children.Select(c => c.Id).ToArray()).ToDictionary(dt => dt.Id);
-
-        nodes.AddRange(
-            children
-                .OrderBy(entity => entity.Name)
-                .Select(dt =>
-                {
-                    IDataType dataType = dataTypes[dt.Id];
-                    TreeNode node = CreateTreeNode(dt.Id.ToInvariantString(), id, queryStrings, dt.Name,
-                        icon: null, false);
-                    node.Path = dt.Path;
-                    return node;
-                })
-        );
-
-        return nodes;
-    }
-
-    /// <summary>
-    ///     Get all integer identifiers for the non-deletable system datatypes.
-    /// </summary>
-    private static IEnumerable<int> GetNonDeletableSystemDataTypeIds()
-    {
-        var systemIds = new[]
-        {
-            Constants.DataTypes.Boolean, // Used by the Member Type: "Member"
-            Constants.DataTypes.Textarea, // Used by the Member Type: "Member"
-            Constants.DataTypes.LabelBigint, // Used by the Media Type: "Image"; Used by the Media Type: "File"
-            Constants.DataTypes.LabelDateTime, // Used by the Member Type: "Member"
-            Constants.DataTypes.LabelDecimal, // Used by the Member Type: "Member"
-            Constants.DataTypes.LabelInt, // Used by the Media Type: "Image"; Used by the Member Type: "Member"
-            Constants.DataTypes.LabelString, // Used by the Media Type: "Image"; Used by the Media Type: "File"
-            Constants.DataTypes.ImageCropper, // Used by the Media Type: "Image"
-            Constants.DataTypes.Upload // Used by the Media Type: "File"
-        };
-
-        return systemIds.Concat(GetNonDeletableSystemListViewDataTypeIds());
-    }
-
-    /// <summary>
-    ///     Get all integer identifiers for the non-deletable system listviews.
-    /// </summary>
-    private static IEnumerable<int> GetNonDeletableSystemListViewDataTypeIds() =>
-        new[]
-        {
-            Constants.DataTypes.DefaultContentListView, Constants.DataTypes.DefaultMediaListView,
-            Constants.DataTypes.DefaultMembersListView
-        };
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings)
-    {
-        MenuItemCollection menu = _menuItemCollectionFactory.Create();
-
-        if (id == Constants.System.RootString)
-        {
-            //set the default to create
-            menu.DefaultMenuAlias = ActionNew.ActionAlias;
-
-            // root actions
-            menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-            return menu;
-        }
-
-        IEntitySlim? container = _entityService.Get(int.Parse(id, CultureInfo.InvariantCulture),
-            UmbracoObjectTypes.DataTypeContainer);
-        if (container != null)
-        {
-                //set the default to create
-            menu.DefaultMenuAlias = ActionNew.ActionAlias;
-
-            menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-            menu.Items.Add(new MenuItem("rename", LocalizedTextService.Localize("actions", "rename"))
-            {
-                Icon = "icon-edit",
-                UseLegacyIcon = false,
-            });
-
-            if (container.HasChildren == false)
-            {
-                //can delete data type
-                menu.Items.Add<ActionDelete>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            }
-
-            menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-        }
-        else
-        {
-            IEnumerable<int> nonDeletableSystemDataTypeIds = GetNonDeletableSystemDataTypeIds();
-
-            if (nonDeletableSystemDataTypeIds.Contains(int.Parse(id, CultureInfo.InvariantCulture)) == false)
-            {
-                menu.Items.Add<ActionDelete>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            }
-
-                menu.Items.Add<ActionMove>(LocalizedTextService, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-                menu.Items.Add<ActionCopy>(LocalizedTextService, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-            }
-
-        return menu;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs
deleted file mode 100644
index c23adf76d9..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-// We are allowed to see the dictionary tree, if we are allowed to manage templates, such that se can use the
-// dictionary items in templates, even when we dont have authorization to manage the dictionary items
-[Authorize(Policy = AuthorizationPolicies.TreeAccessDictionaryOrTemplates)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-[Tree(Constants.Applications.Translation, Constants.Trees.Dictionary, TreeGroup = Constants.Trees.Groups.Settings)]
-public class DictionaryTreeController : TreeController
-{
-    private readonly ILocalizationService _localizationService;
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-
-    public DictionaryTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        ILocalizationService localizationService,
-        IEventAggregator eventAggregator)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator)
-    {
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-        _localizationService = localizationService;
-    }
-
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> rootResult = base.CreateRootNode(queryStrings);
-        if (!(rootResult.Result is null))
-        {
-            return rootResult;
-        }
-
-        TreeNode? root = rootResult.Value;
-
-        // the default section is settings, falling back to this if we can't
-        // figure out where we are from the querystring parameters
-        var section = Constants.Applications.Translation;
-        if (!queryStrings["application"].ToString().IsNullOrWhiteSpace())
-        {
-            section = queryStrings["application"];
-        }
-
-        if (root is not null)
-        {
-            // this will load in a custom UI instead of the dashboard for the root node
-            root.RoutePath = $"{section}/{Constants.Trees.Dictionary}/list";
-        }
-
-        return root;
-    }
-
-    /// <summary>
-    ///     The method called to render the contents of the tree structure
-    /// </summary>
-    /// <param name="id">The id of the tree item</param>
-    /// <param name="queryStrings">
-    ///     All of the query string parameters passed from jsTree
-    /// </param>
-    /// <remarks>
-    ///     We are allowing an arbitrary number of query strings to be passed in so that developers are able to persist custom
-    ///     data from the front-end
-    ///     to the back end to be used in the query for model data.
-    /// </remarks>
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
-    {
-        if (!int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intId))
-        {
-            throw new InvalidOperationException("Id must be an integer");
-        }
-
-        var nodes = new TreeNodeCollection();
-
-        static Func<IDictionaryItem, string> ItemSort()
-        {
-            return item => item.ItemKey;
-        }
-
-        if (id == Constants.System.RootString)
-        {
-            nodes.AddRange(
-                _localizationService.GetRootDictionaryItems()?.OrderBy(ItemSort()).Select(
-                    x => CreateTreeNode(
-                        x.Id.ToInvariantString(),
-                        id,
-                        queryStrings,
-                        x.ItemKey,
-                        Constants.Icons.Dictionary,
-                        _localizationService.GetDictionaryItemChildren(x.Key)?.Any() ?? false)) ??
-                Enumerable.Empty<TreeNode>());
-        }
-        else
-        {
-            // maybe we should use the guid as URL param to avoid the extra call for getting dictionary item
-            IDictionaryItem? parentDictionary = _localizationService.GetDictionaryItemById(intId);
-            if (parentDictionary == null)
-            {
-                return nodes;
-            }
-
-            nodes.AddRange(_localizationService.GetDictionaryItemChildren(parentDictionary.Key)?.ToList()
-                               .OrderBy(ItemSort()).Select(
-                                   x => CreateTreeNode(
-                                       x.Id.ToInvariantString(),
-                                       id,
-                                       queryStrings,
-                                       x.ItemKey,
-                                       Constants.Icons.Dictionary,
-                                       _localizationService.GetDictionaryItemChildren(x.Key)?.Any() ?? false)) ??
-                           Enumerable.Empty<TreeNode>());
-        }
-
-        return nodes;
-    }
-
-    /// <summary>
-    ///     Returns the menu structure for the node
-    /// </summary>
-    /// <param name="id">The id of the tree item</param>
-    /// <param name="queryStrings">
-    ///     All of the query string parameters passed from jsTree
-    /// </param>
-    /// <returns></returns>
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings)
-    {
-        MenuItemCollection menu = _menuItemCollectionFactory.Create();
-
-        menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-        if (id != Constants.System.RootString)
-        {
-            menu.Items.Add<ActionMove>(LocalizedTextService, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add(new MenuItem("export", LocalizedTextService)
-            {
-                Icon = "icon-download-alt",
-                SeparatorBefore = true,
-                OpensDialog = true,
-                UseLegacyIcon = false,
-            });
-            menu.Items.Add<ActionDelete>(LocalizedTextService, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-        }
-        else
-        {
-            menu.Items.Add(new MenuItem("import", LocalizedTextService)
-            {
-                Icon = "icon-page-up",
-                SeparatorBefore = true,
-                OpensDialog = true,
-                UseLegacyIcon = false,
-            });
-        }
-
-        menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-
-        return menu;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs
deleted file mode 100644
index 210955bccb..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-using System.Net;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-public abstract class FileSystemTreeController : TreeController
-{
-    protected FileSystemTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        IEventAggregator eventAggregator
-    )
-        : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator) =>
-        MenuItemCollectionFactory = menuItemCollectionFactory;
-
-    protected abstract IFileSystem? FileSystem { get; }
-    protected IMenuItemCollectionFactory MenuItemCollectionFactory { get; }
-    protected abstract string[] Extensions { get; }
-    protected abstract string FileIcon { get; }
-
-    /// <summary>
-    ///     Inheritors can override this method to modify the file node that is created.
-    /// </summary>
-    /// <param name="treeNode"></param>
-    protected virtual void OnRenderFileNode(ref TreeNode treeNode) { }
-
-    /// <summary>
-    ///     Inheritors can override this method to modify the folder node that is created.
-    /// </summary>
-    /// <param name="treeNode"></param>
-    protected virtual void OnRenderFolderNode(ref TreeNode treeNode) =>
-        // TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
-        treeNode.AdditionalData["jsClickCallback"] = "javascript:void(0);";
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
-    {
-        var path = string.IsNullOrEmpty(id) == false && id != Constants.System.RootString
-            ? WebUtility.UrlDecode(id).TrimStart("/")
-            : "";
-
-        IEnumerable<string>? directories = FileSystem?.GetDirectories(path);
-
-        var nodes = new TreeNodeCollection();
-        if (directories is not null)
-        {
-            foreach (var directory in directories)
-            {
-                var hasChildren = FileSystem is not null &&
-                                  (FileSystem.GetFiles(directory).Any() || FileSystem.GetDirectories(directory).Any());
-
-                var name = Path.GetFileName(directory);
-                TreeNode? node = CreateTreeNode(WebUtility.UrlEncode(directory), path, queryStrings, name,
-                    Constants.Icons.Folder, hasChildren);
-
-                OnRenderFolderNode(ref node);
-
-                if (node != null)
-                {
-                    nodes.Add(node);
-                }
-            }
-        }
-
-
-        //this is a hack to enable file system tree to support multiple file extension look-up
-        //so the pattern both support *.* *.xml and xml,js,vb for lookups
-        IEnumerable<string>? files = FileSystem?.GetFiles(path).Where(x =>
-        {
-            var extension = Path.GetExtension(x);
-
-            if (Extensions.Contains("*"))
-            {
-                return true;
-            }
-
-            return extension != null && Extensions.Contains(extension.Trim(Constants.CharArrays.Period),
-                StringComparer.InvariantCultureIgnoreCase);
-        });
-
-        if (files is not null)
-        {
-            foreach (var file in files)
-            {
-                var withoutExt = Path.GetFileNameWithoutExtension(file);
-                if (withoutExt.IsNullOrWhiteSpace())
-                {
-                    continue;
-                }
-
-                var name = Path.GetFileName(file);
-                TreeNode? node = CreateTreeNode(WebUtility.UrlEncode(file), path, queryStrings, name, FileIcon, false);
-
-                OnRenderFileNode(ref node);
-
-                if (node != null)
-                {
-                    nodes.Add(node);
-                }
-            }
-        }
-
-        return nodes;
-    }
-
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> rootResult = base.CreateRootNode(queryStrings);
-        if (!(rootResult.Result is null))
-        {
-            return rootResult;
-        }
-
-        TreeNode? root = rootResult.Value;
-
-            //check if there are any children
-        ActionResult<TreeNodeCollection> treeNodesResult = GetTreeNodes(Constants.System.RootString, queryStrings);
-
-        if (!(treeNodesResult.Result is null))
-        {
-            return treeNodesResult.Result;
-        }
-
-        if (root is not null)
-        {
-            root.HasChildren = treeNodesResult.Value?.Any() ?? false;
-        }
-
-        return root;
-    }
-
-    protected virtual MenuItemCollection GetMenuForRootNode(FormCollection queryStrings)
-    {
-        MenuItemCollection menu = MenuItemCollectionFactory.Create();
-
-            //set the default to create
-        menu.DefaultMenuAlias = ActionNew.ActionAlias;
-
-            //create action
-        menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-            //refresh action
-        menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-
-        return menu;
-    }
-
-    protected virtual MenuItemCollection GetMenuForFolder(string path, FormCollection queryStrings)
-    {
-        MenuItemCollection menu = MenuItemCollectionFactory.Create();
-
-            //set the default to create
-        menu.DefaultMenuAlias = ActionNew.ActionAlias;
-
-        //create action
-        menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-        var hasChildren = FileSystem is not null &&
-                          (FileSystem.GetFiles(path).Any() || FileSystem.GetDirectories(path).Any());
-
-            //We can only delete folders if it doesn't have any children (folders or files)
-        if (hasChildren == false)
-        {
-            //delete action
-            menu.Items.Add<ActionDelete>(LocalizedTextService, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-        }
-
-            //refresh action
-        menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-
-        return menu;
-    }
-
-    protected virtual MenuItemCollection GetMenuForFile(string path, FormCollection queryStrings)
-    {
-        MenuItemCollection menu = MenuItemCollectionFactory.Create();
-
-        //if it's not a directory then we only allow to delete the item
-        menu.Items.Add<ActionDelete>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-        return menu;
-    }
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings)
-    {
-        //if root node no need to visit the filesystem so lets just create the menu and return it
-        if (id == Constants.System.RootString)
-        {
-            return GetMenuForRootNode(queryStrings);
-        }
-
-        MenuItemCollection menu = MenuItemCollectionFactory.Create();
-
-        var path = string.IsNullOrEmpty(id) == false && id != Constants.System.RootString
-            ? WebUtility.UrlDecode(id).TrimStart("/")
-            : "";
-
-        var isFile = FileSystem?.FileExists(path) ?? false;
-        var isDirectory = FileSystem?.DirectoryExists(path) ?? false;
-
-        if (isDirectory)
-        {
-            return GetMenuForFolder(path, queryStrings);
-        }
-
-        return isFile ? GetMenuForFile(path, queryStrings) : menu;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/FilesTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/FilesTreeController.cs
deleted file mode 100644
index eb630460e8..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/FilesTreeController.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Tree(Constants.Applications.Settings, "files", TreeTitle = "Files", TreeUse = TreeUse.Dialog)]
-[CoreTree]
-public class FilesTreeController : FileSystemTreeController
-{
-    private static readonly string[] ExtensionsStatic = { "*" };
-
-    public FilesTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        IPhysicalFileSystem fileSystem,
-        IEventAggregator eventAggregator)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, menuItemCollectionFactory, eventAggregator) =>
-        FileSystem = fileSystem;
-
-    protected override IFileSystem FileSystem { get; }
-
-    protected override string[] Extensions => ExtensionsStatic;
-
-    protected override string FileIcon => Constants.Icons.MediaFile;
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/ITreeNodeController.cs b/src/Umbraco.Web.BackOffice/Trees/ITreeNodeController.cs
deleted file mode 100644
index 2ec1e7f520..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/ITreeNodeController.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.ModelBinders;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-/// <summary>
-///     Represents an TreeNodeController
-/// </summary>
-public interface ITreeNodeController
-{
-    /// <summary>
-    ///     Gets an individual tree node
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    ActionResult<TreeNode?> GetTreeNode(
-        string id,
-        [ModelBinder(typeof(HttpQueryStringModelBinder))]
-        FormCollection? queryStrings
-    );
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/LanguageTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/LanguageTreeController.cs
deleted file mode 100644
index bf1d019f85..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/LanguageTreeController.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.TreeAccessLanguages)]
-[Tree(Constants.Applications.Settings, Constants.Trees.Languages, SortOrder = 11,
-    TreeGroup = Constants.Trees.Groups.Settings)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class LanguageTreeController : TreeController
-{
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-
-    public LanguageTreeController(
-        ILocalizedTextService textService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IEventAggregator eventAggregator,
-        IMenuItemCollectionFactory menuItemCollectionFactory)
-        : base(textService, umbracoApiControllerTypeCollection, eventAggregator) =>
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings) =>
-        //We don't have any child nodes & only use the root node to load a custom UI
-        new TreeNodeCollection();
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings) =>
-        //We don't have any menu item options (such as create/delete/reload) & only use the root node to load a custom UI
-        _menuItemCollectionFactory.Create();
-
-    /// <summary>
-    ///     Helper method to create a root model for a tree
-    /// </summary>
-    /// <returns></returns>
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> rootResult = base.CreateRootNode(queryStrings);
-        if (!(rootResult.Result is null))
-        {
-            return rootResult;
-        }
-
-        TreeNode? root = rootResult.Value;
-
-        if (root is not null)
-        {
-            // This will load in a custom UI instead of the dashboard for the root node
-            root.RoutePath = $"{Constants.Applications.Settings}/{Constants.Trees.Languages}/overview";
-            root.Icon = Constants.Icons.Language;
-            root.HasChildren = false;
-            root.MenuUrl = null;
-        }
-
-        return root;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/LogViewerTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/LogViewerTreeController.cs
deleted file mode 100644
index c493cd86b4..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/LogViewerTreeController.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.TreeAccessLogs)]
-[Tree(Constants.Applications.Settings, Constants.Trees.LogViewer, SortOrder = 9,
-    TreeGroup = Constants.Trees.Groups.Settings)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class LogViewerTreeController : TreeController
-{
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-
-    public LogViewerTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IEventAggregator eventAggregator,
-        IMenuItemCollectionFactory menuItemCollectionFactory)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator) =>
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings) =>
-        //We don't have any child nodes & only use the root node to load a custom UI
-        new TreeNodeCollection();
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings) =>
-        //We don't have any menu item options (such as create/delete/reload) & only use the root node to load a custom UI
-        _menuItemCollectionFactory.Create();
-
-    /// <summary>
-    ///     Helper method to create a root model for a tree
-    /// </summary>
-    /// <returns></returns>
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> rootResult = base.CreateRootNode(queryStrings);
-        if (!(rootResult.Result is null))
-        {
-            return rootResult;
-        }
-
-        TreeNode? root = rootResult.Value;
-
-        if (root is not null)
-        {
-            // This will load in a custom UI instead of the dashboard for the root node
-            root.RoutePath = $"{Constants.Applications.Settings}/{Constants.Trees.LogViewer}/overview";
-            root.Icon = Constants.Icons.LogViewer;
-            root.HasChildren = false;
-            root.MenuUrl = null;
-        }
-
-        return root;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs
deleted file mode 100644
index c0b45444e9..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.TreeAccessMacros)]
-[Tree(Constants.Applications.Settings, Constants.Trees.Macros, TreeTitle = "Macros", SortOrder = 4,
-    TreeGroup = Constants.Trees.Groups.Settings)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class MacrosTreeController : TreeController
-{
-    private readonly IMacroService _macroService;
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-
-    public MacrosTreeController(ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory, IMacroService macroService,
-        IEventAggregator eventAggregator) : base(localizedTextService, umbracoApiControllerTypeCollection,
-        eventAggregator)
-    {
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-        _macroService = macroService;
-    }
-
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> rootResult = base.CreateRootNode(queryStrings);
-        if (!(rootResult.Result is null))
-        {
-            return rootResult;
-        }
-
-        TreeNode? root = rootResult.Value;
-
-        if (root is not null)
-        {
-            // Check if there are any macros
-            root.HasChildren = _macroService.GetAll().Any();
-        }
-
-        return root;
-    }
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
-    {
-        var nodes = new TreeNodeCollection();
-
-        if (id == Constants.System.RootString)
-        {
-            foreach (IMacro macro in _macroService.GetAll().OrderBy(m => m.Name))
-            {
-                nodes.Add(CreateTreeNode(
-                    macro.Id.ToString(),
-                    id,
-                    queryStrings,
-                    macro.Name,
-                    Constants.Icons.Macro,
-                    false));
-            }
-        }
-
-        return nodes;
-    }
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings)
-    {
-        MenuItemCollection menu = _menuItemCollectionFactory.Create();
-
-        if (id == Constants.System.RootString)
-        {
-            //Create the normal create action
-            menu.Items.Add<ActionNew>(LocalizedTextService, useLegacyIcon: false);
-
-            //refresh action
-            menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-
-            return menu;
-        }
-
-        IMacro? macro = _macroService.GetById(int.Parse(id, CultureInfo.InvariantCulture));
-        if (macro == null)
-        {
-            return menu;
-        }
-
-        //add delete option for all macros
-        menu.Items.Add<ActionDelete>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-        return menu;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs
deleted file mode 100644
index 0fbf606db8..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Infrastructure.Search;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.SectionAccessForMediaTree)]
-[Tree(Constants.Applications.Media, Constants.Trees.Media)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-[SearchableTree("searchResultFormatter", "configureMediaResult", 20)]
-public class MediaTreeController : ContentTreeControllerBase, ISearchableTree, ITreeNodeController
-{
-    private readonly AppCaches _appCaches;
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IEntityService _entityService;
-    private readonly IMediaService _mediaService;
-    private readonly UmbracoTreeSearcher _treeSearcher;
-
-    private int[]? _userStartNodes;
-
-    public MediaTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        IEntityService entityService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        ILogger<MediaTreeController> logger,
-        ActionCollection actionCollection,
-        IUserService userService,
-        IDataTypeService dataTypeService,
-        UmbracoTreeSearcher treeSearcher,
-        IMediaService mediaService,
-        IEventAggregator eventAggregator,
-        AppCaches appCaches)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, menuItemCollectionFactory, entityService,
-            backofficeSecurityAccessor, logger, actionCollection, userService, dataTypeService, eventAggregator,
-            appCaches)
-    {
-        _treeSearcher = treeSearcher;
-        _mediaService = mediaService;
-        _appCaches = appCaches;
-        _entityService = entityService;
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-    }
-
-    protected override int RecycleBinId => Constants.System.RecycleBinMedia;
-
-    protected override bool RecycleBinSmells => _mediaService.RecycleBinSmells();
-
-    protected override int[] UserStartNodes
-        => _userStartNodes ??
-           (_userStartNodes =
-               _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.CalculateMediaStartNodeIds(_entityService,
-                   _appCaches)) ?? Array.Empty<int>();
-
-    protected override UmbracoObjectTypes UmbracoObjectType => UmbracoObjectTypes.Media;
-
-    public async Task<EntitySearchResults> SearchAsync(string query, int pageSize, long pageIndex,
-        string? searchFrom = null)
-    {
-        IEnumerable<SearchResultEntity> results = _treeSearcher.ExamineSearch(query, UmbracoEntityTypes.Media, pageSize,
-            pageIndex, out var totalFound, searchFrom);
-        return new EntitySearchResults(results, totalFound);
-    }
-
-    /// <summary>
-    ///     Creates a tree node for a content item based on an UmbracoEntity
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <param name="parentId"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    protected override TreeNode GetSingleTreeNode(IEntitySlim entity, string parentId, FormCollection? queryStrings)
-    {
-        TreeNode node = CreateTreeNode(
-            entity,
-            Constants.ObjectTypes.Media,
-            parentId,
-            queryStrings,
-            entity.HasChildren);
-
-        // entity is either a container, or a media
-        if (entity.IsContainer)
-        {
-            node.SetContainerStyle();
-            node.AdditionalData.Add("isContainer", true);
-        }
-        else
-        {
-            var contentEntity = (IContentEntitySlim)entity;
-            node.AdditionalData.Add("contentType", contentEntity.ContentTypeAlias);
-        }
-
-        return node;
-    }
-
-    protected override ActionResult<MenuItemCollection> PerformGetMenuForNode(string id, FormCollection queryStrings)
-    {
-        MenuItemCollection menu = MenuItemCollectionFactory.Create();
-
-        //set the default
-        menu.DefaultMenuAlias = ActionNew.ActionAlias;
-
-        if (id == Constants.System.RootString)
-        {
-            // if the user's start node is not the root then the only menu item to display is refresh
-            if (UserStartNodes.Contains(Constants.System.Root) == false)
-            {
-                menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-                return menu;
-            }
-
-            // root actions
-            menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add<ActionSort>(LocalizedTextService, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-
-            return menu;
-        }
-
-        if (int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out var iid) == false)
-        {
-            return NotFound();
-        }
-
-        IEntitySlim? item = _entityService.Get(iid, UmbracoObjectTypes.Media);
-        if (item == null)
-        {
-            return NotFound();
-        }
-
-            //if the user has no path access for this node, all they can do is refresh
-        if (!_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.HasMediaPathAccess(item, _entityService,
-                _appCaches) ?? false)
-        {
-            menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-            return menu;
-        }
-
-
-            //if the media item is in the recycle bin, we don't have a default menu and we need to show a limited menu
-        if (item.Path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries)
-            .Contains(RecycleBinId.ToInvariantString()))
-        {
-            menu.Items.Add<ActionRestore>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add<ActionMove>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add<ActionDelete>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-
-            menu.DefaultMenuAlias = null;
-        }
-        else
-        {
-            //return a normal node menu:
-            menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add<ActionMove>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add<ActionDelete>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add<ActionSort>(LocalizedTextService, useLegacyIcon: false);
-            menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-
-            //set the default to create
-            menu.DefaultMenuAlias = ActionNew.ActionAlias;
-        }
-
-        return menu;
-    }
-
-    /// <summary>
-        /// Returns true or false if the current user has access to the node based on the user's allowed start node (path) access
-    ///     access
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    protected override bool HasPathAccess(string id, FormCollection queryStrings)
-    {
-        IEntitySlim? entity = GetEntityFromId(id);
-
-        return HasPathAccess(entity, queryStrings);
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs
deleted file mode 100644
index 0732248182..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Infrastructure.Search;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]
-[Tree(Constants.Applications.Settings, Constants.Trees.MediaTypes, SortOrder = 1,
-    TreeGroup = Constants.Trees.Groups.Settings)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class MediaTypeTreeController : TreeController, ISearchableTree
-{
-    private readonly IEntityService _entityService;
-    private readonly IMediaTypeService _mediaTypeService;
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-    private readonly UmbracoTreeSearcher _treeSearcher;
-
-    public MediaTypeTreeController(ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection, UmbracoTreeSearcher treeSearcher,
-        IMenuItemCollectionFactory menuItemCollectionFactory, IMediaTypeService mediaTypeService,
-        IEntityService entityService, IEventAggregator eventAggregator) : base(localizedTextService,
-        umbracoApiControllerTypeCollection, eventAggregator)
-    {
-        _treeSearcher = treeSearcher;
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-        _mediaTypeService = mediaTypeService;
-        _entityService = entityService;
-    }
-
-    public async Task<EntitySearchResults> SearchAsync(string query, int pageSize, long pageIndex,
-        string? searchFrom = null)
-    {
-        IEnumerable<SearchResultEntity?> results = _treeSearcher.EntitySearch(UmbracoObjectTypes.MediaType, query,
-            pageSize, pageIndex, out var totalFound, searchFrom);
-        return new EntitySearchResults(results, totalFound);
-    }
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
-    {
-        if (!int.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intId))
-        {
-            throw new InvalidOperationException("Id must be an integer");
-        }
-
-        var nodes = new TreeNodeCollection();
-
-        nodes.AddRange(
-            _entityService.GetChildren(intId, UmbracoObjectTypes.MediaTypeContainer)
-                .OrderBy(entity => entity.Name)
-                .Select(dt =>
-                {
-                    TreeNode node = CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, Constants.Icons.Folder,
-                        dt.HasChildren, "");
-                    node.Path = dt.Path;
-                    node.NodeType = "container";
-                    // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now.
-                    node.AdditionalData["jsClickCallback"] = "javascript:void(0);";
-                    return node;
-                }));
-
-        // if the request is for folders only then just return
-        if (queryStrings["foldersonly"].ToString().IsNullOrWhiteSpace() == false &&
-            queryStrings["foldersonly"].ToString() == "1")
-        {
-            return nodes;
-        }
-
-        IEnumerable<IMediaType> mediaTypes = _mediaTypeService.GetAll();
-
-        nodes.AddRange(
-            _entityService.GetChildren(intId, UmbracoObjectTypes.MediaType)
-                .OrderBy(entity => entity.Name)
-                .Select(dt =>
-                {
-                    // since 7.4+ child type creation is enabled by a config option. It defaults to on, but can be disabled if we decide to.
-                    // need this check to keep supporting sites where children have already been created.
-                    var hasChildren = dt.HasChildren;
-                    IMediaType? mt = mediaTypes.FirstOrDefault(x => x.Id == dt.Id);
-                    TreeNode node = CreateTreeNode(dt, Constants.ObjectTypes.MediaType, id, queryStrings,
-                        mt?.Icon ?? Constants.Icons.MediaType, hasChildren);
-
-                    node.Path = dt.Path;
-                    return node;
-                }));
-
-        return nodes;
-    }
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings)
-    {
-        MenuItemCollection menu = _menuItemCollectionFactory.Create();
-
-        if (id == Constants.System.RootString)
-        {
-            // set the default to create
-            menu.DefaultMenuAlias = ActionNew.ActionAlias;
-
-            // root actions
-            menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-            return menu;
-        }
-
-        IEntitySlim? container = _entityService.Get(int.Parse(id, CultureInfo.InvariantCulture),
-            UmbracoObjectTypes.MediaTypeContainer);
-        if (container != null)
-        {
-            // set the default to create
-            menu.DefaultMenuAlias = ActionNew.ActionAlias;
-
-            menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-            menu.Items.Add(new MenuItem("rename", LocalizedTextService.Localize("actions", "rename"))
-            {
-                Icon = "icon-edit",
-                UseLegacyIcon = false,
-            });
-
-            if (container.HasChildren == false)
-            {
-                // can delete doc type
-                    menu.Items.Add<ActionDelete>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            }
-
-            menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-        }
-        else
-        {
-            IMediaType? ct = _mediaTypeService.Get(int.Parse(id, CultureInfo.InvariantCulture));
-            IMediaType? parent = ct == null ? null : _mediaTypeService.Get(ct.ParentId);
-
-            menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-            // no move action if this is a child doc type
-            if (parent == null)
-            {
-                menu.Items.Add<ActionMove>(LocalizedTextService, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-            }
-
-            menu.Items.Add<ActionCopy>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            if (ct?.IsSystemMediaType() == false)
-            {
-                menu.Items.Add<ActionDelete>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-            }
-
-            menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-        }
-
-        return menu;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs
deleted file mode 100644
index 8d457169d2..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.TreeAccessMemberGroups)]
-[Tree(Constants.Applications.Members, Constants.Trees.MemberGroups, SortOrder = 1)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class MemberGroupTreeController : MemberTypeAndGroupTreeControllerBase
-{
-    private readonly IMemberGroupService _memberGroupService;
-
-    [ActivatorUtilitiesConstructor]
-    public MemberGroupTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        IMemberGroupService memberGroupService,
-        IEventAggregator eventAggregator,
-        IMemberTypeService memberTypeService)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, menuItemCollectionFactory, eventAggregator,
-            memberTypeService)
-        => _memberGroupService = memberGroupService;
-
-    [Obsolete("Use ctor with all params")]
-    public MemberGroupTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        IMemberGroupService memberGroupService,
-        IEventAggregator eventAggregator)
-        : this(localizedTextService,
-            umbracoApiControllerTypeCollection,
-            menuItemCollectionFactory,
-            memberGroupService,
-            eventAggregator,
-            StaticServiceProvider.Instance.GetRequiredService<IMemberTypeService>())
-    {
-    }
-
-    protected override IEnumerable<TreeNode> GetTreeNodesFromService(string id, FormCollection queryStrings)
-        => _memberGroupService.GetAll()
-            .OrderBy(x => x.Name)
-            .Select(dt =>
-                CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, Constants.Icons.MemberGroup, false));
-
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> rootResult = base.CreateRootNode(queryStrings);
-        if (!(rootResult.Result is null))
-        {
-            return rootResult.Result;
-        }
-
-        TreeNode? root = rootResult.Value;
-
-        if (root is not null)
-        {
-            // Check if there are any groups
-            root.HasChildren = _memberGroupService.GetAll().Any();
-        }
-
-        return root;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs
deleted file mode 100644
index 22cef9c085..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Infrastructure.Search;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Cms.Web.Common.ModelBinders;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.SectionAccessForMemberTree)]
-[Tree(Constants.Applications.Members, Constants.Trees.Members, SortOrder = 0)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-[SearchableTree("searchResultFormatter", "configureMemberResult")]
-public class MemberTreeController : TreeController, ISearchableTree, ITreeNodeController
-{
-    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
-    private readonly IMemberService _memberService;
-    private readonly IMemberTypeService _memberTypeService;
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-    private readonly UmbracoTreeSearcher _treeSearcher;
-
-    public MemberTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        UmbracoTreeSearcher treeSearcher,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        IMemberService memberService,
-        IMemberTypeService memberTypeService,
-        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
-        IEventAggregator eventAggregator)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator)
-    {
-        _treeSearcher = treeSearcher;
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-        _memberService = memberService;
-        _memberTypeService = memberTypeService;
-        _backofficeSecurityAccessor = backofficeSecurityAccessor;
-    }
-
-    public async Task<EntitySearchResults> SearchAsync(string query, int pageSize, long pageIndex, string? searchFrom = null)
-    {
-        IEnumerable<SearchResultEntity> results = _treeSearcher.ExamineSearch(query, UmbracoEntityTypes.Member, pageSize, pageIndex, out var totalFound, searchFrom);
-        return new EntitySearchResults(results, totalFound);
-    }
-
-    /// <summary>
-    ///     Gets an individual tree node
-    /// </summary>
-    public ActionResult<TreeNode?> GetTreeNode([FromRoute] string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection? queryStrings)
-    {
-        ActionResult<TreeNode?> node = GetSingleTreeNode(id, queryStrings);
-
-        if (!(node.Result is null))
-        {
-            return node.Result;
-        }
-
-        if (node.Value is not null)
-        {
-            // Add the tree alias to the node since it is standalone (has no root for which this normally belongs)
-            node.Value.AdditionalData["treeAlias"] = TreeAlias;
-        }
-
-        return node;
-    }
-
-    protected ActionResult<TreeNode?> GetSingleTreeNode(string id, FormCollection? queryStrings)
-    {
-        if (Guid.TryParse(id, out Guid asGuid) == false)
-        {
-            return NotFound();
-        }
-
-        IMember? member = _memberService.GetByKey(asGuid);
-        if (member == null)
-        {
-            return NotFound();
-        }
-
-        TreeNode node = CreateTreeNode(
-            member.Key.ToString("N"),
-            "-1",
-            queryStrings,
-            member.Name,
-            Constants.Icons.Member,
-            false,
-            string.Empty,
-            Udi.Create(ObjectTypes.GetUdiType(Constants.ObjectTypes.Member), member.Key));
-
-        node.AdditionalData.Add("contentType", member.ContentTypeAlias);
-        node.AdditionalData.Add("isContainer", true);
-
-        return node;
-    }
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
-    {
-        var nodes = new TreeNodeCollection();
-
-        if (id == Constants.System.RootString)
-        {
-            nodes.Add(
-                CreateTreeNode(
-                    Constants.Conventions.MemberTypes.AllMembersListId,
-                    id,
-                    queryStrings,
-                    LocalizedTextService.Localize("member", "allMembers"),
-                    Constants.Icons.MemberType,
-                    true,
-                    queryStrings.GetRequiredValue<string>("application") +
-                    TreeAlias.EnsureStartsWith('/') +
-                    "/list/" +
-                    Constants.Conventions.MemberTypes.AllMembersListId));
-
-            nodes.AddRange(_memberTypeService.GetAll()
-                .Select(memberType =>
-                    CreateTreeNode(
-                        memberType.Alias,
-                        id,
-                        queryStrings,
-                        memberType.Name,
-                        memberType.Icon.IfNullOrWhiteSpace(Constants.Icons.Member),
-                        true,
-                        queryStrings.GetRequiredValue<string>("application") + TreeAlias.EnsureStartsWith('/') +
-                        "/list/" + memberType.Alias)));
-        }
-
-            //There is no menu for any of these nodes
-        nodes.ForEach(x => x.MenuUrl = null);
-
-            //All nodes are containers
-        nodes.ForEach(x => x.AdditionalData.Add("isContainer", true));
-
-        return nodes;
-    }
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings)
-    {
-        MenuItemCollection menu = _menuItemCollectionFactory.Create();
-
-        if (id == Constants.System.RootString)
-        {
-            // root actions
-            //set default
-            menu.DefaultMenuAlias = ActionNew.ActionAlias;
-
-            //Create the normal create action
-            menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-            menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-
-            return menu;
-        }
-
-        //add delete option for all members
-        menu.Items.Add<ActionDelete>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-        if (_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.HasAccessToSensitiveData() ?? false)
-        {
-            menu.Items.Add(new ExportMember(LocalizedTextService));
-        }
-
-        return menu;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs b/src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs
deleted file mode 100644
index 977205e893..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public abstract class MemberTypeAndGroupTreeControllerBase : TreeController
-{
-    private readonly IMemberTypeService _memberTypeService;
-
-    protected MemberTypeAndGroupTreeControllerBase(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        IEventAggregator eventAggregator,
-        IMemberTypeService memberTypeService)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator)
-    {
-        MenuItemCollectionFactory = menuItemCollectionFactory;
-
-        _memberTypeService = memberTypeService;
-    }
-
-    public IMenuItemCollectionFactory MenuItemCollectionFactory { get; }
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
-    {
-        var nodes = new TreeNodeCollection();
-
-        // if the request is for folders only then just return
-        if (queryStrings["foldersonly"].ToString().IsNullOrWhiteSpace() == false &&
-            queryStrings["foldersonly"].ToString() == "1")
-        {
-            return nodes;
-        }
-
-        nodes.AddRange(GetTreeNodesFromService(id, queryStrings));
-        return nodes;
-    }
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings)
-    {
-        MenuItemCollection menu = MenuItemCollectionFactory.Create();
-
-        if (id == Constants.System.RootString)
-        {
-            // root actions
-            menu.Items.Add(new CreateChildEntity(LocalizedTextService));
-            menu.Items.Add(new RefreshNode(LocalizedTextService, true));
-            return menu;
-        }
-
-        IMemberType? memberType = _memberTypeService.Get(int.Parse(id));
-        if (memberType != null)
-        {
-            menu.Items.Add<ActionCopy>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-        }
-
-        // delete member type/group
-        menu.Items.Add<ActionDelete>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-
-        return menu;
-    }
-
-    protected abstract IEnumerable<TreeNode> GetTreeNodesFromService(string id, FormCollection queryStrings);
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs
deleted file mode 100644
index 5325e7728e..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Infrastructure.Search;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[CoreTree]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessMemberTypes)]
-[Tree(Constants.Applications.Settings, Constants.Trees.MemberTypes, SortOrder = 2,
-    TreeGroup = Constants.Trees.Groups.Settings)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-public class MemberTypeTreeController : MemberTypeAndGroupTreeControllerBase, ISearchableTree
-{
-    private readonly IMemberTypeService _memberTypeService;
-    private readonly UmbracoTreeSearcher _treeSearcher;
-
-    public MemberTypeTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        UmbracoTreeSearcher treeSearcher,
-        IMemberTypeService memberTypeService,
-        IEventAggregator eventAggregator)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, menuItemCollectionFactory, eventAggregator,
-            memberTypeService)
-    {
-        _treeSearcher = treeSearcher;
-        _memberTypeService = memberTypeService;
-    }
-
-    public async Task<EntitySearchResults> SearchAsync(string query, int pageSize, long pageIndex,
-        string? searchFrom = null)
-    {
-        IEnumerable<SearchResultEntity?> results = _treeSearcher.EntitySearch(UmbracoObjectTypes.MemberType, query,
-            pageSize, pageIndex, out var totalFound, searchFrom);
-        return new EntitySearchResults(results, totalFound);
-    }
-
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> rootResult = base.CreateRootNode(queryStrings);
-        if (!(rootResult.Result is null))
-        {
-            return rootResult;
-        }
-
-        TreeNode? root = rootResult.Value;
-
-        if (root is not null)
-        {
-            // Check if there are any member types
-            root.HasChildren = _memberTypeService.GetAll().Any();
-        }
-
-        return root;
-    }
-
-    protected override IEnumerable<TreeNode> GetTreeNodesFromService(string id, FormCollection queryStrings) =>
-        _memberTypeService.GetAll()
-            .OrderBy(x => x.Name)
-            .Select(dt => CreateTreeNode(dt, Constants.ObjectTypes.MemberType, id, queryStrings,
-                dt?.Icon ?? Constants.Icons.MemberType, false));
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/MenuRenderingNotification.cs b/src/Umbraco.Web.BackOffice/Trees/MenuRenderingNotification.cs
deleted file mode 100644
index b46278be4a..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/MenuRenderingNotification.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Umbraco.Cms.Core.Trees;
-
-namespace Umbraco.Cms.Core.Notifications;
-
-/// <summary>
-///     A notification that allows developers to modify the menu that is being rendered
-/// </summary>
-/// <remarks>
-///     Developers can add/remove/replace/insert/update/etc... any of the tree items in the collection.
-/// </remarks>
-public class MenuRenderingNotification : INotification
-{
-    public MenuRenderingNotification(string nodeId, MenuItemCollection menu, FormCollection queryString,
-        string treeAlias)
-    {
-        NodeId = nodeId;
-        Menu = menu;
-        QueryString = queryString;
-        TreeAlias = treeAlias;
-    }
-
-    /// <summary>
-    ///     The tree node id that the menu is rendering for
-    /// </summary>
-    public string NodeId { get; }
-
-    /// <summary>
-    ///     The alias of the tree the menu is rendering for
-    /// </summary>
-    public string TreeAlias { get; }
-
-    /// <summary>
-    ///     The menu being rendered
-    /// </summary>
-    public MenuItemCollection Menu { get; }
-
-    /// <summary>
-    ///     The query string of the current request
-    /// </summary>
-    public FormCollection QueryString { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/PackagesTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/PackagesTreeController.cs
deleted file mode 100644
index 2fec0ae075..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/PackagesTreeController.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.TreeAccessPackages)]
-[Tree(Constants.Applications.Packages, Constants.Trees.Packages, SortOrder = 0, IsSingleNodeTree = true)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class PackagesTreeController : TreeController
-{
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-
-    public PackagesTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        IEventAggregator eventAggregator)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator) =>
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-
-
-    /// <summary>
-    ///     Helper method to create a root model for a tree
-    /// </summary>
-    /// <returns></returns>
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> rootResult = base.CreateRootNode(queryStrings);
-        if (!(rootResult.Result is null))
-        {
-            return rootResult;
-        }
-
-        TreeNode? root = rootResult.Value;
-
-        if (root is not null)
-        {
-            // This will load in a custom UI instead of the dashboard for the root node
-            root.RoutePath = $"{Constants.Applications.Packages}/{Constants.Trees.Packages}/repo";
-            root.Icon = Constants.Icons.Package;
-
-            root.HasChildren = false;
-        }
-
-        return root;
-    }
-
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings) =>
-        //full screen app without tree nodes
-        TreeNodeCollection.Empty;
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings) =>
-        //doesn't have a menu, this is a full screen app without tree nodes
-        _menuItemCollectionFactory.Create();
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/PartialViewMacrosTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/PartialViewMacrosTreeController.cs
deleted file mode 100644
index 6f27c2bc60..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/PartialViewMacrosTreeController.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-/// <summary>
-///     Tree for displaying partial view macros in the developer app
-/// </summary>
-[Tree(Constants.Applications.Settings, Constants.Trees.PartialViewMacros, SortOrder = 8, TreeGroup = Constants.Trees.Groups.Templating)]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessPartialViewMacros)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class PartialViewMacrosTreeController : PartialViewsTreeController
-{
-    private static readonly string[] ExtensionsStatic = { "cshtml" };
-
-    public PartialViewMacrosTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        FileSystems fileSystems,
-        IEventAggregator eventAggregator)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, menuItemCollectionFactory, fileSystems, eventAggregator) =>
-        FileSystem = fileSystems.MacroPartialsFileSystem;
-
-    protected override IFileSystem? FileSystem { get; }
-
-    protected override string[] Extensions => ExtensionsStatic;
-
-    protected override string FileIcon => "icon-article";
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/PartialViewsTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/PartialViewsTreeController.cs
deleted file mode 100644
index d18beb6047..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/PartialViewsTreeController.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-/// <summary>
-///     Tree for displaying partial views in the settings app
-/// </summary>
-[Tree(Constants.Applications.Settings, Constants.Trees.PartialViews, SortOrder = 7, TreeGroup = Constants.Trees.Groups.Templating)]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessPartialViews)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class PartialViewsTreeController : FileSystemTreeController
-{
-    private static readonly string[] ExtensionsStatic = { "cshtml" };
-
-    public PartialViewsTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        FileSystems fileSystems,
-        IEventAggregator eventAggregator)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, menuItemCollectionFactory, eventAggregator) =>
-        FileSystem = fileSystems.PartialViewsFileSystem;
-
-    protected override IFileSystem? FileSystem { get; }
-
-    protected override string[] Extensions => ExtensionsStatic;
-
-    protected override string FileIcon => "icon-article";
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs
deleted file mode 100644
index 40512caae7..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.TreeAccessRelationTypes)]
-[Tree(Constants.Applications.Settings, Constants.Trees.RelationTypes, SortOrder = 5,
-    TreeGroup = Constants.Trees.Groups.Settings)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class RelationTypeTreeController : TreeController
-{
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-    private readonly IRelationService _relationService;
-
-    public RelationTypeTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        IRelationService relationService,
-        IEventAggregator eventAggregator)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator)
-    {
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-        _relationService = relationService;
-    }
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings)
-    {
-        MenuItemCollection menu = _menuItemCollectionFactory.Create();
-
-        if (id == Constants.System.RootString)
-        {
-            //Create the normal create action
-            menu.Items.Add<ActionNew>(LocalizedTextService, useLegacyIcon: false);
-
-            //refresh action
-            menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-
-            return menu;
-        }
-
-        IRelationType? relationType = _relationService.GetRelationTypeById(int.Parse(id, CultureInfo.InvariantCulture));
-        if (relationType == null)
-        {
-            return menu;
-        }
-
-        if (relationType.IsSystemRelationType() == false)
-        {
-            menu.Items.Add<ActionDelete>(LocalizedTextService, useLegacyIcon: false);
-        }
-
-        return menu;
-    }
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
-    {
-        var nodes = new TreeNodeCollection();
-
-        if (id == Constants.System.RootString)
-        {
-            nodes.AddRange(_relationService.GetAllRelationTypes()
-                .Select(rt => CreateTreeNode(rt.Id.ToString(), id, queryStrings, rt.Name, "icon-trafic", hasChildren: false)));
-        }
-
-        return nodes;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/RootNodeRenderingNotification.cs b/src/Umbraco.Web.BackOffice/Trees/RootNodeRenderingNotification.cs
deleted file mode 100644
index 3348bdc7ff..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/RootNodeRenderingNotification.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Umbraco.Cms.Core.Trees;
-
-namespace Umbraco.Cms.Core.Notifications;
-
-/// <summary>
-///     A notification that allows developer to modify the root tree node that is being rendered
-/// </summary>
-public class RootNodeRenderingNotification : INotification
-{
-    public RootNodeRenderingNotification(TreeNode node, FormCollection queryString, string treeAlias)
-    {
-        Node = node;
-        QueryString = queryString;
-        TreeAlias = treeAlias;
-    }
-
-    /// <summary>
-    ///     The root node being rendered
-    /// </summary>
-    public TreeNode Node { get; }
-
-    /// <summary>
-    ///     The alias of the tree the menu is rendering for
-    /// </summary>
-    public string TreeAlias { get; }
-
-    /// <summary>
-    ///     The query string of the current request
-    /// </summary>
-    public FormCollection QueryString { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/ScriptsTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ScriptsTreeController.cs
deleted file mode 100644
index 630584a839..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/ScriptsTreeController.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[CoreTree]
-[Tree(Constants.Applications.Settings, Constants.Trees.Scripts, TreeTitle = "Scripts", SortOrder = 10, TreeGroup = Constants.Trees.Groups.Templating)]
-public class ScriptsTreeController : FileSystemTreeController
-{
-    private static readonly string[] ExtensionsStatic = { "js" };
-
-    public ScriptsTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        FileSystems fileSystems,
-        IEventAggregator eventAggregator)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, menuItemCollectionFactory, eventAggregator) =>
-        FileSystem = fileSystems.ScriptsFileSystem;
-
-    protected override IFileSystem? FileSystem { get; }
-
-    protected override string[] Extensions => ExtensionsStatic;
-
-    protected override string FileIcon => "icon-script";
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/StaticFilesTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/StaticFilesTreeController.cs
deleted file mode 100644
index 7e2b21f9c6..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/StaticFilesTreeController.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System.Net;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Tree(Constants.Applications.Settings, "staticFiles", TreeTitle = "Static Files", TreeUse = TreeUse.Dialog)]
-public class StaticFilesTreeController : TreeController
-{
-    private const string AppPlugins = "App_Plugins";
-    private const string Webroot = "wwwroot";
-    private readonly IFileSystem _fileSystem;
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-
-    public StaticFilesTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IEventAggregator eventAggregator,
-        IPhysicalFileSystem fileSystem,
-        IMenuItemCollectionFactory menuItemCollectionFactory)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator)
-    {
-        _fileSystem = fileSystem;
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-    }
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
-    {
-        var path = string.IsNullOrEmpty(id) == false && id != Constants.System.RootString
-            ? WebUtility.UrlDecode(id).TrimStart("/")
-            : "";
-
-        var nodes = new TreeNodeCollection();
-        IEnumerable<string> directories = _fileSystem.GetDirectories(path);
-
-        foreach (var directory in directories)
-        {
-            // We don't want any other directories under the root node other than the ones serving static files - App_Plugins and wwwroot
-            if (id == Constants.System.RootString && directory != AppPlugins && directory != Webroot)
-            {
-                continue;
-            }
-
-            var hasChildren = _fileSystem.GetFiles(directory).Any() || _fileSystem.GetDirectories(directory).Any();
-
-            var name = Path.GetFileName(directory);
-            TreeNode? node = CreateTreeNode(WebUtility.UrlEncode(directory), path, queryStrings, name,
-                Constants.Icons.Folder, hasChildren);
-
-            if (node != null)
-            {
-                nodes.Add(node);
-            }
-        }
-
-        // Only get the files inside App_Plugins and wwwroot
-        IEnumerable<string> files = _fileSystem.GetFiles(path)
-            .Where(x => x.StartsWith(AppPlugins) || x.StartsWith(Webroot));
-
-        foreach (var file in files)
-        {
-            var name = Path.GetFileName(file);
-            TreeNode? node = CreateTreeNode(WebUtility.UrlEncode(file), path, queryStrings, name,
-                Constants.Icons.DefaultIcon, false);
-
-            if (node != null)
-            {
-                nodes.Add(node);
-            }
-        }
-
-        return nodes;
-    }
-
-    // We don't have any menu item options (such as create/delete/reload) & only use the root node to load a custom UI
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings) =>
-        _menuItemCollectionFactory.Create();
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/StylesheetsTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/StylesheetsTreeController.cs
deleted file mode 100644
index 3ff7a7ecfc..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/StylesheetsTreeController.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[CoreTree]
-[Tree(Constants.Applications.Settings, Constants.Trees.Stylesheets, TreeTitle = "Stylesheets", SortOrder = 9, TreeGroup = Constants.Trees.Groups.Templating)]
-public class StylesheetsTreeController : FileSystemTreeController
-{
-    private static readonly string[] ExtensionsStatic = { "css" };
-
-    public StylesheetsTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        FileSystems fileSystems,
-        IEventAggregator eventAggregator)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, menuItemCollectionFactory, eventAggregator) =>
-        FileSystem = fileSystems.StylesheetsFileSystem;
-
-    protected override IFileSystem? FileSystem { get; }
-
-    protected override string[] Extensions => ExtensionsStatic;
-
-    protected override string FileIcon => "icon-brackets";
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs
deleted file mode 100644
index 0753170d72..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-using System.Globalization;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Trees;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Infrastructure.Search;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.TreeAccessTemplates)]
-[Tree(Constants.Applications.Settings, Constants.Trees.Templates, SortOrder = 6,
-    TreeGroup = Constants.Trees.Groups.Templating)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class TemplatesTreeController : TreeController, ISearchableTree
-{
-    private readonly IFileService _fileService;
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-    private readonly UmbracoTreeSearcher _treeSearcher;
-
-    public TemplatesTreeController(
-        UmbracoTreeSearcher treeSearcher,
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IFileService fileService,
-        IEventAggregator eventAggregator
-    ) : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator)
-    {
-        _treeSearcher = treeSearcher;
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-        _fileService = fileService;
-    }
-
-    public async Task<EntitySearchResults> SearchAsync(string query, int pageSize, long pageIndex,
-        string? searchFrom = null)
-    {
-        IEnumerable<SearchResultEntity?> results = _treeSearcher.EntitySearch(UmbracoObjectTypes.Template, query,
-            pageSize, pageIndex, out var totalFound, searchFrom);
-        return new EntitySearchResults(results, totalFound);
-    }
-
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> rootResult = base.CreateRootNode(queryStrings);
-        if (!(rootResult.Result is null))
-        {
-            return rootResult;
-        }
-
-        TreeNode? root = rootResult.Value;
-
-        if (root is not null)
-        {
-            //check if there are any templates
-            root.HasChildren = _fileService.GetTemplates(-1)?.Any() ?? false;
-        }
-
-        return root;
-    }
-
-    /// <summary>
-    ///     The method called to render the contents of the tree structure
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings">
-    ///     All of the query string parameters passed from jsTree
-    /// </param>
-    /// <remarks>
-    ///     We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom
-    ///     data from the front-end
-    ///     to the back end to be used in the query for model data.
-    /// </remarks>
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
-    {
-        var nodes = new TreeNodeCollection();
-
-        IEnumerable<ITemplate>? found = id == Constants.System.RootString
-            ? _fileService.GetTemplates(-1)
-            : _fileService.GetTemplates(int.Parse(id, CultureInfo.InvariantCulture));
-
-        if (found is not null)
-        {
-            nodes.AddRange(found.Select(template => CreateTreeNode(
-                template.Id.ToString(CultureInfo.InvariantCulture),
-                // TODO: Fix parent ID stuff for templates
-                "-1",
-                queryStrings,
-                template.Name,
-                template.IsMasterTemplate ? "icon-newspaper" : "icon-newspaper-alt",
-                template.IsMasterTemplate,
-                null,
-                Udi.Create(ObjectTypes.GetUdiType(Constants.ObjectTypes.TemplateType), template.Key)
-            )));
-        }
-
-        return nodes;
-    }
-
-    /// <summary>
-    ///     Returns the menu structure for the node
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings)
-    {
-        MenuItemCollection menu = _menuItemCollectionFactory.Create();
-
-        //Create the normal create action
-        MenuItem? item = menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true, useLegacyIcon: false);
-        item?.NavigateToRoute(
-            $"{queryStrings.GetRequiredValue<string>("application")}/templates/edit/{id}?create=true");
-
-        if (id == Constants.System.RootString)
-        {
-                //refresh action
-            menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-
-            return menu;
-        }
-
-        ITemplate? template = _fileService.GetTemplate(int.Parse(id, CultureInfo.InvariantCulture));
-        if (template == null)
-        {
-            return menu;
-        }
-
-        EntitySlim entity = FromTemplate(template);
-
-            //don't allow delete if it has child layouts
-        if (template.IsMasterTemplate == false)
-        {
-            //add delete option if it doesn't have children
-            menu.Items.Add<ActionDelete>(LocalizedTextService, hasSeparator: true, opensDialog: true, useLegacyIcon: false);
-        }
-
-            //add refresh
-        menu.Items.Add(new RefreshNode(LocalizedTextService, separatorBefore: true));
-
-        return menu;
-    }
-
-    private EntitySlim FromTemplate(ITemplate template) =>
-        new()
-        {
-            CreateDate = template.CreateDate,
-            Id = template.Id,
-            Key = template.Key,
-            Name = template.Name,
-            NodeObjectType = Constants.ObjectTypes.Template,
-            // TODO: Fix parent/paths on templates
-            ParentId = -1,
-            Path = template.Path,
-            UpdateDate = template.UpdateDate
-        };
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeAttribute.cs b/src/Umbraco.Web.BackOffice/Trees/TreeAttribute.cs
deleted file mode 100644
index 4428886312..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/TreeAttribute.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Umbraco.Cms.Core.Trees;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-/// <summary>
-///     Identifies a section tree.
-/// </summary>
-[AttributeUsage(AttributeTargets.Class)]
-public class TreeAttribute : Attribute, ITree
-{
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="TreeAttribute" /> class.
-    /// </summary>
-    public TreeAttribute(string sectionAlias, string treeAlias)
-    {
-        SectionAlias = sectionAlias;
-        TreeAlias = treeAlias;
-    }
-
-    /// <summary>
-    ///     Gets the section alias.
-    /// </summary>
-    public string SectionAlias { get; }
-
-    /// <summary>
-    ///     Gets the tree alias.
-    /// </summary>
-    public string TreeAlias { get; }
-
-    /// <summary>
-    ///     Gets or sets the tree title.
-    /// </summary>
-    public string? TreeTitle { get; set; }
-
-    /// <summary>
-    ///     Gets or sets the group of the tree.
-    /// </summary>
-    public string? TreeGroup { get; set; }
-
-    /// <summary>
-    ///     Gets the usage of the tree.
-    /// </summary>
-    public TreeUse TreeUse { get; set; } = TreeUse.Main | TreeUse.Dialog;
-
-    /// <summary>
-    ///     Gets or sets the tree sort order.
-    /// </summary>
-    public int SortOrder { get; set; }
-
-    /// <summary>
-    ///     Gets or sets a value indicating whether the tree is a single-node tree (no child nodes, full screen app).
-    /// </summary>
-    public bool IsSingleNodeTree { get; set; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeCollectionBuilder.cs b/src/Umbraco.Web.BackOffice/Trees/TreeCollectionBuilder.cs
deleted file mode 100644
index 9934138d3c..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/TreeCollectionBuilder.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.Composing;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-/// <summary>
-///     Builds a <see cref="TreeCollection" />.
-/// </summary>
-public class TreeCollectionBuilder : ICollectionBuilder<TreeCollection, Tree>
-{
-    private readonly List<Tree> _trees = new();
-
-    public TreeCollection CreateCollection(IServiceProvider factory) => new(() => _trees);
-
-    public void RegisterWith(IServiceCollection services) =>
-        services.Add(new ServiceDescriptor(typeof(TreeCollection), CreateCollection, ServiceLifetime.Singleton));
-
-
-    /// <summary>
-    ///     Registers a custom tree definition
-    /// </summary>
-    /// <param name="treeDefinition"></param>
-    /// <remarks>
-    ///     This is useful if a developer wishes to have a single tree controller for different tree aliases. In this case the
-    ///     tree controller
-    ///     cannot be decorated with the TreeAttribute (since then it will be auto-registered).
-    /// </remarks>
-    public void AddTree(Tree treeDefinition)
-    {
-        if (treeDefinition == null)
-        {
-            throw new ArgumentNullException(nameof(treeDefinition));
-        }
-
-        _trees.Add(treeDefinition);
-    }
-
-    public void AddTreeController<TController>()
-        where TController : TreeControllerBase
-        => AddTreeController(typeof(TController));
-
-    public void AddTreeController(Type controllerType)
-    {
-        if (!typeof(TreeControllerBase).IsAssignableFrom(controllerType))
-        {
-            throw new ArgumentException(
-                $"Type {controllerType} does not inherit from {typeof(TreeControllerBase).FullName}.");
-        }
-
-        // not all TreeControllerBase are meant to be used here,
-        // ignore those that don't have the attribute
-
-        TreeAttribute? attribute = controllerType.GetCustomAttribute<TreeAttribute>(false);
-        if (attribute == null)
-        {
-            return;
-        }
-
-        var isCoreTree = controllerType.HasCustomAttribute<CoreTreeAttribute>(false);
-
-        // Use section as tree group if core tree, so it isn't grouped by empty key and thus end up in "Third Party" tree group if adding custom tree nodes in other groups, e.g. "Settings" tree group.
-        attribute.TreeGroup ??= isCoreTree ? attribute.SectionAlias : attribute.TreeGroup;
-
-        var tree = new Tree(
-            attribute.SortOrder,
-            attribute.SectionAlias,
-            attribute.TreeGroup,
-            attribute.TreeAlias,
-            attribute.TreeTitle,
-            attribute.TreeUse,
-            controllerType,
-            attribute.IsSingleNodeTree);
-        _trees.Add(tree);
-    }
-
-    public void AddTreeControllers(IEnumerable<Type> controllerTypes)
-    {
-        foreach (Type controllerType in controllerTypes)
-        {
-            AddTreeController(controllerType);
-        }
-    }
-
-    public void RemoveTree(Tree treeDefinition)
-    {
-        if (treeDefinition == null)
-        {
-            throw new ArgumentNullException(nameof(treeDefinition));
-        }
-
-        _trees.Remove(treeDefinition);
-    }
-
-    public void RemoveTreeController<T>()
-        where T : TreeControllerBase
-        => RemoveTreeController(typeof(T));
-
-    // TODO: Change parameter name to "controllerType" in a major version to make it consistent with AddTreeController method.
-    public void RemoveTreeController(Type type)
-    {
-        if (!typeof(TreeControllerBase).IsAssignableFrom(type))
-        {
-            throw new ArgumentException($"Type {type} does not inherit from {typeof(TreeControllerBase).FullName}.");
-        }
-
-        Tree? tree = _trees.FirstOrDefault(x => x.TreeControllerType == type);
-        if (tree != null)
-        {
-            _trees.Remove(tree);
-        }
-    }
-
-    public void RemoveTreeControllers(IEnumerable<Type> controllerTypes)
-    {
-        foreach (Type controllerType in controllerTypes)
-        {
-            RemoveTreeController(controllerType);
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeController.cs b/src/Umbraco.Web.BackOffice/Trees/TreeController.cs
deleted file mode 100644
index 068daaaa25..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/TreeController.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System.Collections.Concurrent;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-/// <summary>
-///     The base controller for all tree requests
-/// </summary>
-public abstract class TreeController : TreeControllerBase
-{
-    private static readonly ConcurrentDictionary<Type, TreeAttribute> _treeAttributeCache = new();
-
-    private readonly TreeAttribute _treeAttribute;
-
-    protected TreeController(ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection, IEventAggregator eventAggregator)
-        : base(umbracoApiControllerTypeCollection, eventAggregator)
-    {
-        LocalizedTextService = localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService));
-        _treeAttribute = GetTreeAttribute();
-    }
-
-    protected ILocalizedTextService LocalizedTextService { get; }
-
-    /// <inheritdoc />
-    public override string? RootNodeDisplayName => Tree.GetRootNodeDisplayName(this, LocalizedTextService);
-
-    /// <inheritdoc />
-    public override string? TreeGroup => _treeAttribute.TreeGroup;
-
-    /// <inheritdoc />
-    public override string TreeAlias => _treeAttribute.TreeAlias;
-
-    /// <inheritdoc />
-    public override string? TreeTitle => _treeAttribute.TreeTitle;
-
-    /// <inheritdoc />
-    public override TreeUse TreeUse => _treeAttribute.TreeUse;
-
-    /// <inheritdoc />
-    public override string SectionAlias => _treeAttribute.SectionAlias;
-
-    /// <inheritdoc />
-    public override int SortOrder => _treeAttribute.SortOrder;
-
-    /// <inheritdoc />
-    public override bool IsSingleNodeTree => _treeAttribute.IsSingleNodeTree;
-
-    private TreeAttribute GetTreeAttribute() =>
-        _treeAttributeCache.GetOrAdd(GetType(), type =>
-        {
-            TreeAttribute? treeAttribute = type.GetCustomAttribute<TreeAttribute>(false);
-            if (treeAttribute == null)
-            {
-                throw new InvalidOperationException("The Tree controller is missing the " +
-                                                    typeof(TreeAttribute).FullName + " attribute");
-            }
-
-            return treeAttribute;
-        });
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeControllerBase.cs b/src/Umbraco.Web.BackOffice/Trees/TreeControllerBase.cs
deleted file mode 100644
index 33b4c47fda..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/TreeControllerBase.cs
+++ /dev/null
@@ -1,440 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Notifications;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Filters;
-using Umbraco.Cms.Web.Common.ModelBinders;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-/// <summary>
-///     A base controller reference for non-attributed trees (un-registered).
-/// </summary>
-/// <remarks>
-///     Developers should generally inherit from TreeController.
-/// </remarks>
-[AngularJsonOnlyConfiguration]
-public abstract class TreeControllerBase : UmbracoAuthorizedApiController, ITree
-{
-    // TODO: Need to set this, but from where?
-    //       Presumably not injecting as this will be a base controller for package/solution developers.
-    private readonly UmbracoApiControllerTypeCollection _apiControllers;
-    private readonly IEventAggregator _eventAggregator;
-
-    protected TreeControllerBase(UmbracoApiControllerTypeCollection apiControllers, IEventAggregator eventAggregator)
-    {
-        _apiControllers = apiControllers;
-        _eventAggregator = eventAggregator;
-    }
-
-    /// <summary>
-    ///     The name to display on the root node
-    /// </summary>
-    public abstract string? RootNodeDisplayName { get; }
-
-    /// <inheritdoc />
-    public abstract string? TreeGroup { get; }
-
-    /// <inheritdoc />
-    public abstract string TreeAlias { get; }
-
-    /// <inheritdoc />
-    public abstract string? TreeTitle { get; }
-
-    /// <inheritdoc />
-    public abstract TreeUse TreeUse { get; }
-
-    /// <inheritdoc />
-    public abstract string SectionAlias { get; }
-
-    /// <inheritdoc />
-    public abstract int SortOrder { get; }
-
-    /// <inheritdoc />
-    public abstract bool IsSingleNodeTree { get; }
-
-    /// <summary>
-    ///     The method called to render the contents of the tree structure
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings">
-    ///     All of the query string parameters passed from jsTree
-    /// </param>
-    /// <remarks>
-    ///     We are allowing an arbitrary number of query strings to be passed in so that developers are able to persist custom
-    ///     data from the front-end
-    ///     to the back end to be used in the query for model data.
-    /// </remarks>
-    protected abstract ActionResult<TreeNodeCollection> GetTreeNodes(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection queryStrings);
-
-    /// <summary>
-    ///     Returns the menu structure for the node
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    protected abstract ActionResult<MenuItemCollection> GetMenuForNode(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection queryStrings);
-
-    /// <summary>
-    ///     The method called to render the contents of the tree structure
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings">
-    ///     All of the query string parameters passed from jsTree
-    /// </param>
-    /// <remarks>
-    ///     If overriden, GetTreeNodes will not be called
-    ///     We are allowing an arbitrary number of query strings to be passed in so that developers are able to persist custom
-    ///     data from the front-end
-    ///     to the back end to be used in the query for model data.
-    /// </remarks>
-    protected virtual async Task<ActionResult<TreeNodeCollection>> GetTreeNodesAsync(
-        string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection queryStrings) =>
-        GetTreeNodes(id, queryStrings);
-
-    /// <summary>
-    ///     Returns the menu structure for the node
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    /// <remarks>
-    ///     If overriden, GetMenuForNode will not be called
-    /// </remarks>
-    protected virtual async Task<ActionResult<MenuItemCollection>> GetMenuForNodeAsync(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection queryStrings) =>
-        GetMenuForNode(id, queryStrings);
-
-    /// <summary>
-    ///     Returns the root node for the tree
-    /// </summary>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    public async Task<ActionResult<TreeNode?>> GetRootNode(
-        [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection? queryStrings)
-    {
-        if (queryStrings == null)
-        {
-            queryStrings = FormCollection.Empty;
-        }
-
-        ActionResult<TreeNode?> nodeResult = CreateRootNode(queryStrings);
-        if (!(nodeResult.Result is null))
-        {
-            return nodeResult.Result;
-        }
-
-        TreeNode? node = nodeResult.Value;
-
-        if (node is not null)
-        {
-            // Add the tree alias to the root
-            node.AdditionalData["treeAlias"] = TreeAlias;
-            AddQueryStringsToAdditionalData(node, queryStrings);
-
-            // Check if the tree is searchable and add that to the meta data as well
-            if (this is ISearchableTree)
-            {
-                node.AdditionalData.Add("searchable", "true");
-            }
-
-            // Now update all data based on some of the query strings, like if we are running in dialog mode
-            if (IsDialog(queryStrings))
-            {
-                node.RoutePath = "#";
-            }
-
-            await _eventAggregator.PublishAsync(new RootNodeRenderingNotification(node, queryStrings, TreeAlias));
-        }
-
-        return node;
-    }
-
-    /// <summary>
-    ///     The action called to render the contents of the tree structure
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings">
-    ///     All of the query string parameters passed from jsTree
-    /// </param>
-    /// <returns>JSON markup for jsTree</returns>
-    /// <remarks>
-    ///     We are allowing an arbitrary number of query strings to be passed in so that developers are able to persist custom
-    ///     data from the front-end
-    ///     to the back end to be used in the query for model data.
-    /// </remarks>
-    public async Task<ActionResult<TreeNodeCollection?>> GetNodes(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection? queryStrings)
-    {
-        if (queryStrings == null)
-        {
-            queryStrings = FormCollection.Empty;
-        }
-
-        ActionResult<TreeNodeCollection> nodesResult = await GetTreeNodesAsync(id, queryStrings);
-
-        if (!(nodesResult.Result is null))
-        {
-            return nodesResult.Result;
-        }
-
-        TreeNodeCollection? nodes = nodesResult.Value;
-
-        if (nodes is not null)
-        {
-            foreach (TreeNode node in nodes)
-            {
-                AddQueryStringsToAdditionalData(node, queryStrings);
-            }
-
-            // Now update all data based on some of the query strings, like if we are running in dialog mode
-            if (IsDialog(queryStrings))
-            {
-                foreach (TreeNode node in nodes)
-                {
-                    node.RoutePath = "#";
-                }
-            }
-
-            // Raise the event
-            await _eventAggregator.PublishAsync(new TreeNodesRenderingNotification(nodes, queryStrings, TreeAlias, id));
-        }
-
-        return nodes;
-    }
-
-    /// <summary>
-    ///     The action called to render the menu for a tree node
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    public async Task<ActionResult<MenuItemCollection?>> GetMenu(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection queryStrings)
-    {
-        if (queryStrings == null)
-        {
-            queryStrings = FormCollection.Empty;
-        }
-
-        ActionResult<MenuItemCollection>? menuResult = await GetMenuForNodeAsync(id, queryStrings);
-        if (!(menuResult?.Result is null))
-        {
-            return menuResult.Result;
-        }
-
-        MenuItemCollection? menu = menuResult?.Value;
-
-        if (menu is not null)
-        {
-            //raise the event
-            await _eventAggregator.PublishAsync(new MenuRenderingNotification(id, menu, queryStrings, TreeAlias));
-        }
-
-        return menu;
-    }
-
-    /// <summary>
-    ///     Helper method to create a root model for a tree
-    /// </summary>
-    /// <returns></returns>
-    protected virtual ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        var rootNodeAsString = Constants.System.RootString;
-        queryStrings.TryGetValue(TreeQueryStringParameters.Application, out StringValues currApp);
-
-        var node = new TreeNode(
-            rootNodeAsString,
-            null, //this is a root node, there is no parent
-            Url.GetTreeUrl(_apiControllers, GetType(), rootNodeAsString, queryStrings),
-            Url.GetMenuUrl(_apiControllers, GetType(), rootNodeAsString, queryStrings))
-        {
-            HasChildren = true,
-            RoutePath = currApp,
-            Name = RootNodeDisplayName
-        };
-
-        return node;
-    }
-
-    /// <summary>
-    ///     The AdditionalData of a node is always populated with the query string data, this method performs this
-    ///     operation and ensures that special values are not inserted or that duplicate keys are not added.
-    /// </summary>
-    /// <param name="node"></param>
-    /// <param name="queryStrings"></param>
-    protected void AddQueryStringsToAdditionalData(TreeNode node, FormCollection queryStrings)
-    {
-        foreach (KeyValuePair<string, StringValues> q in queryStrings.Where(x =>
-                     node.AdditionalData.ContainsKey(x.Key) == false))
-        {
-            node.AdditionalData.Add(q.Key, q.Value);
-        }
-    }
-
-    /// <summary>
-    ///     If the request is for a dialog mode tree
-    /// </summary>
-    /// <param name="queryStrings"></param>
-    /// <returns></returns>
-    protected bool IsDialog(FormCollection queryStrings)
-    {
-        queryStrings.TryGetValue(TreeQueryStringParameters.Use, out StringValues use);
-        return use == "dialog";
-    }
-
-    #region Create TreeNode methods
-
-    /// <summary>
-    ///     Helper method to create tree nodes
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="parentId"></param>
-    /// <param name="queryStrings"></param>
-    /// <param name="title"></param>
-    /// <returns></returns>
-    public TreeNode CreateTreeNode(string id, string parentId, FormCollection queryStrings, string title)
-    {
-        var jsonUrl = Url.GetTreeUrl(_apiControllers, GetType(), id, queryStrings);
-        var menuUrl = Url.GetMenuUrl(_apiControllers, GetType(), id, queryStrings);
-        var node = new TreeNode(id, parentId, jsonUrl, menuUrl) { Name = title };
-        return node;
-    }
-
-    /// <summary>
-    ///     Helper method to create tree nodes
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="parentId"></param>
-    /// <param name="queryStrings"></param>
-    /// <param name="title"></param>
-    /// <param name="icon"></param>
-    /// <returns></returns>
-    public TreeNode CreateTreeNode(string id, string parentId, FormCollection? queryStrings, string? title, string? icon)
-    {
-        var jsonUrl = Url.GetTreeUrl(_apiControllers, GetType(), id, queryStrings);
-        var menuUrl = Url.GetMenuUrl(_apiControllers, GetType(), id, queryStrings);
-        var node = new TreeNode(id, parentId, jsonUrl, menuUrl) { Name = title, Icon = icon, NodeType = TreeAlias };
-        return node;
-    }
-
-    /// <summary>
-    ///     Helper method to create tree nodes
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="parentId"></param>
-    /// <param name="queryStrings"></param>
-    /// <param name="title"></param>
-    /// <param name="routePath"></param>
-    /// <param name="icon"></param>
-    /// <returns></returns>
-    public TreeNode CreateTreeNode(string id, string parentId, FormCollection queryStrings, string title, string icon, string routePath)
-    {
-        var jsonUrl = Url.GetTreeUrl(_apiControllers, GetType(), id, queryStrings);
-        var menuUrl = Url.GetMenuUrl(_apiControllers, GetType(), id, queryStrings);
-        var node = new TreeNode(id, parentId, jsonUrl, menuUrl) { Name = title, RoutePath = routePath, Icon = icon };
-        return node;
-    }
-
-    /// <summary>
-    ///     Helper method to create tree nodes and automatically generate the json URL + UDI
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <param name="entityObjectType"></param>
-    /// <param name="parentId"></param>
-    /// <param name="queryStrings"></param>
-    /// <param name="hasChildren"></param>
-    /// <returns></returns>
-    public TreeNode CreateTreeNode(IEntitySlim entity, Guid entityObjectType, string parentId, FormCollection? queryStrings, bool hasChildren)
-    {
-        var contentTypeIcon = entity is IContentEntitySlim contentEntity ? contentEntity.ContentTypeIcon : null;
-        TreeNode treeNode = CreateTreeNode(entity.Id.ToInvariantString(), parentId, queryStrings, entity.Name, contentTypeIcon);
-        treeNode.Path = entity.Path;
-        treeNode.Udi = Udi.Create(ObjectTypes.GetUdiType(entityObjectType), entity.Key);
-        treeNode.HasChildren = hasChildren;
-        treeNode.Trashed = entity.Trashed;
-        return treeNode;
-    }
-
-    /// <summary>
-    ///     Helper method to create tree nodes and automatically generate the json URL + UDI
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <param name="entityObjectType"></param>
-    /// <param name="parentId"></param>
-    /// <param name="queryStrings"></param>
-    /// <param name="icon"></param>
-    /// <param name="hasChildren"></param>
-    /// <returns></returns>
-    public TreeNode CreateTreeNode(IUmbracoEntity entity, Guid entityObjectType, string parentId, FormCollection queryStrings, string icon, bool hasChildren)
-    {
-        TreeNode treeNode = CreateTreeNode(entity.Id.ToInvariantString(), parentId, queryStrings, entity.Name, icon);
-        treeNode.Udi = Udi.Create(ObjectTypes.GetUdiType(entityObjectType), entity.Key);
-        treeNode.Path = entity.Path;
-        treeNode.HasChildren = hasChildren;
-        return treeNode;
-    }
-
-    /// <summary>
-    ///     Helper method to create tree nodes and automatically generate the json URL
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="parentId"></param>
-    /// <param name="queryStrings"></param>
-    /// <param name="title"></param>
-    /// <param name="icon"></param>
-    /// <param name="hasChildren"></param>
-    /// <returns></returns>
-    public TreeNode CreateTreeNode(string id, string parentId, FormCollection queryStrings, string? title, string? icon, bool hasChildren)
-    {
-        TreeNode treeNode = CreateTreeNode(id, parentId, queryStrings, title, icon);
-        treeNode.HasChildren = hasChildren;
-        return treeNode;
-    }
-
-    /// <summary>
-    ///     Helper method to create tree nodes and automatically generate the json URL
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="parentId"></param>
-    /// <param name="queryStrings"></param>
-    /// <param name="title"></param>
-    /// <param name="routePath"></param>
-    /// <param name="hasChildren"></param>
-    /// <param name="icon"></param>
-    /// <returns></returns>
-    public TreeNode CreateTreeNode(string id, string parentId, FormCollection queryStrings, string? title, string? icon, bool hasChildren, string routePath)
-    {
-        TreeNode treeNode = CreateTreeNode(id, parentId, queryStrings, title, icon);
-        treeNode.HasChildren = hasChildren;
-        treeNode.RoutePath = routePath;
-        return treeNode;
-    }
-
-    /// <summary>
-    ///     Helper method to create tree nodes and automatically generate the json URL + UDI
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="parentId"></param>
-    /// <param name="queryStrings"></param>
-    /// <param name="title"></param>
-    /// <param name="routePath"></param>
-    /// <param name="hasChildren"></param>
-    /// <param name="icon"></param>
-    /// <param name="udi"></param>
-    /// <returns></returns>
-    public TreeNode CreateTreeNode(string id, string parentId, FormCollection? queryStrings, string? title, string icon, bool hasChildren, string? routePath, Udi udi)
-    {
-        TreeNode treeNode = CreateTreeNode(id, parentId, queryStrings, title, icon);
-        treeNode.HasChildren = hasChildren;
-        treeNode.RoutePath = routePath;
-        treeNode.Udi = udi;
-        return treeNode;
-    }
-
-    #endregion
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeNodesRenderingNotification.cs b/src/Umbraco.Web.BackOffice/Trees/TreeNodesRenderingNotification.cs
deleted file mode 100644
index 18a48919a8..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/TreeNodesRenderingNotification.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Umbraco.Cms.Core.Trees;
-
-namespace Umbraco.Cms.Core.Notifications;
-
-/// <summary>
-///     A notification that allows developers to modify the tree node collection that is being rendered
-/// </summary>
-/// <remarks>
-///     Developers can add/remove/replace/insert/update/etc... any of the tree items in the collection.
-/// </remarks>
-public class TreeNodesRenderingNotification : INotification
-{
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="TreeNodesRenderingNotification" /> class.
-    /// </summary>
-    /// <param name="nodes">The tree nodes being rendered</param>
-    /// <param name="queryString">The query string of the current request</param>
-    /// <param name="treeAlias">The alias of the tree rendered</param>
-    /// <param name="id">The id of the node rendered</param>
-    public TreeNodesRenderingNotification(TreeNodeCollection nodes, FormCollection queryString, string treeAlias,
-        string id)
-    {
-        Nodes = nodes;
-        QueryString = queryString;
-        TreeAlias = treeAlias;
-        Id = id;
-    }
-
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="TreeNodesRenderingNotification" /> class.
-    ///     Constructor
-    /// </summary>
-    /// <param name="nodes">The tree nodes being rendered</param>
-    /// <param name="queryString">The query string of the current request</param>
-    /// <param name="treeAlias">The alias of the tree rendered</param>
-    [Obsolete("Use ctor with all parameters")]
-    public TreeNodesRenderingNotification(TreeNodeCollection nodes, FormCollection queryString, string treeAlias)
-    {
-        Nodes = nodes;
-        QueryString = queryString;
-        TreeAlias = treeAlias;
-        Id = default;
-    }
-
-    /// <summary>
-    ///     Gets the tree nodes being rendered
-    /// </summary>
-    public TreeNodeCollection Nodes { get; }
-
-    /// <summary>
-    ///     Gets the query string of the current request
-    /// </summary>
-    public FormCollection QueryString { get; }
-
-    /// <summary>
-    ///     Gets the alias of the tree rendered
-    /// </summary>
-    public string TreeAlias { get; }
-
-    /// <summary>
-    ///     Gets the id of the node rendered
-    /// </summary>
-    public string? Id { get; }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeQueryStringParameters.cs b/src/Umbraco.Web.BackOffice/Trees/TreeQueryStringParameters.cs
deleted file mode 100644
index 56abf2cdba..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/TreeQueryStringParameters.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-/// <summary>
-///     Common query string parameters used for tree query strings
-/// </summary>
-internal struct TreeQueryStringParameters
-{
-    public const string Use = "use";
-    public const string Application = "application";
-    public const string StartNodeId = "startNodeId";
-    public const string DataTypeKey = "dataTypeKey";
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/UrlHelperExtensions.cs b/src/Umbraco.Web.BackOffice/Trees/UrlHelperExtensions.cs
deleted file mode 100644
index 1688a99ec2..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/UrlHelperExtensions.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System.Net;
-using System.Text;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-public static class UrlHelperExtensions
-{
-    internal static string GetTreePathFromFilePath(this IUrlHelper urlHelper, string? virtualPath, string basePath = "")
-    {
-        //This reuses the Logic from umbraco.cms.helpers.DeepLink class
-        //to convert a filepath to a tree syncing path string.
-
-        //removes the basepath from the path
-        //and normalizes paths - / is used consistently between trees and editors
-        basePath = basePath.TrimStart("~");
-        virtualPath = virtualPath?.TrimStart("~");
-        virtualPath = virtualPath?.Substring(basePath.Length);
-        virtualPath = virtualPath?.Replace('\\', '/');
-
-        //-1 is the default root id for trees
-        var sb = new StringBuilder("-1");
-
-        //split the virtual path and iterate through it
-        var pathPaths = virtualPath?.Split(Constants.CharArrays.ForwardSlash);
-
-        for (var p = 0; p < pathPaths?.Length; p++)
-        {
-            var path = WebUtility.UrlEncode(string.Join("/", pathPaths.Take(p + 1)));
-            if (string.IsNullOrEmpty(path) == false)
-            {
-                sb.Append(",");
-                sb.Append(path);
-            }
-        }
-
-        return sb.ToString().TrimEnd(",");
-    }
-
-    public static string GetTreeUrl(
-        this IUrlHelper urlHelper,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        Type treeType,
-        string nodeId,
-        FormCollection? queryStrings)
-    {
-        var actionUrl = urlHelper.GetUmbracoApiService(umbracoApiControllerTypeCollection, "GetNodes", treeType)?
-            .EnsureEndsWith('?');
-
-        //now we need to append the query strings
-        actionUrl += "id=" + nodeId.EnsureEndsWith('&') + queryStrings?.ToQueryString("id",
-            //Always ignore the custom start node id when generating URLs for tree nodes since this is a custom once-only parameter
-            // that should only ever be used when requesting a tree to render (root), not a tree node
-            TreeQueryStringParameters.StartNodeId);
-        return actionUrl;
-    }
-
-    public static string GetMenuUrl(
-        this IUrlHelper urlHelper,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        Type treeType,
-        string nodeId,
-        FormCollection? queryStrings)
-    {
-        var actionUrl = urlHelper.GetUmbracoApiService(umbracoApiControllerTypeCollection, "GetMenu", treeType)?
-            .EnsureEndsWith('?');
-
-        //now we need to append the query strings
-        actionUrl += "id=" + nodeId.EnsureEndsWith('&') + queryStrings?.ToQueryString("id");
-        return actionUrl;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/UserTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/UserTreeController.cs
deleted file mode 100644
index f02420c971..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/UserTreeController.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.TreeAccessUsers)]
-[Tree(Constants.Applications.Users, Constants.Trees.Users, SortOrder = 0, IsSingleNodeTree = true)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class UserTreeController : TreeController
-{
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-
-    public UserTreeController(
-        IMenuItemCollectionFactory menuItemCollectionFactory,
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IEventAggregator eventAggregator
-    ) : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator) =>
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-
-    /// <summary>
-    ///     Helper method to create a root model for a tree
-    /// </summary>
-    /// <returns></returns>
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> rootResult = base.CreateRootNode(queryStrings);
-        if (!(rootResult.Result is null))
-        {
-            return rootResult.Result;
-        }
-
-        TreeNode? root = rootResult.Value;
-
-        if (root is not null)
-        {
-            // this will load in a custom UI instead of the dashboard for the root node
-            root.RoutePath = $"{Constants.Applications.Users}/{Constants.Trees.Users}/users";
-            root.Icon = Constants.Icons.UserGroup;
-            root.HasChildren = false;
-        }
-
-        return root;
-    }
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings) =>
-        //full screen app without tree nodes
-        TreeNodeCollection.Empty;
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings) =>
-        //doesn't have a menu, this is a full screen app without tree nodes
-        _menuItemCollectionFactory.Create();
-}
diff --git a/src/Umbraco.Web.BackOffice/Trees/WebhooksTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/WebhooksTreeController.cs
deleted file mode 100644
index 5767846f8d..0000000000
--- a/src/Umbraco.Web.BackOffice/Trees/WebhooksTreeController.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Web.BackOffice.Trees;
-
-[Authorize(Policy = AuthorizationPolicies.TreeAccessWebhooks)]
-[Tree(Constants.Applications.Settings, Constants.Trees.Webhooks, SortOrder = 9, TreeGroup = Constants.Trees.Groups.Settings)]
-[PluginController(Constants.Web.Mvc.BackOfficeTreeArea)]
-[CoreTree]
-public class WebhooksTreeController : TreeController
-{
-    private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
-
-    public WebhooksTreeController(
-        ILocalizedTextService localizedTextService,
-        UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
-        IEventAggregator eventAggregator,
-        IMenuItemCollectionFactory menuItemCollectionFactory)
-        : base(localizedTextService, umbracoApiControllerTypeCollection, eventAggregator) =>
-        _menuItemCollectionFactory = menuItemCollectionFactory;
-
-    protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings) =>
-        //We don't have any child nodes & only use the root node to load a custom UI
-        new TreeNodeCollection();
-
-    protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, FormCollection queryStrings) =>
-        //We don't have any menu item options (such as create/delete/reload) & only use the root node to load a custom UI
-        _menuItemCollectionFactory.Create();
-
-    /// <summary>
-    ///     Helper method to create a root model for a tree
-    /// </summary>
-    /// <returns></returns>
-    protected override ActionResult<TreeNode?> CreateRootNode(FormCollection queryStrings)
-    {
-        ActionResult<TreeNode?> rootResult = base.CreateRootNode(queryStrings);
-        if (!(rootResult.Result is null))
-        {
-            return rootResult;
-        }
-
-        TreeNode? root = rootResult.Value;
-
-        if (root is not null)
-        {
-            // This will load in a custom UI instead of the dashboard for the root node
-            root.RoutePath = $"{Constants.Applications.Settings}/{Constants.Trees.Webhooks}/overview";
-            root.Icon = Constants.Icons.Webhook;
-            root.HasChildren = false;
-            root.MenuUrl = null;
-        }
-
-        return root;
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
deleted file mode 100644
index 8a9f3f8033..0000000000
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ /dev/null
@@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <PackageId>Umbraco.Cms.Web.BackOffice</PackageId>
-    <Title>Umbraco CMS - Web - Backoffice</Title>
-    <Description>Contains the backoffice assembly needed to run the backend of Umbraco CMS.</Description>
-    <RootNamespace>Umbraco.Cms.Web.BackOffice</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" />
-    <PackageReference Include="Serilog.AspNetCore" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Web.Common\Umbraco.Web.Common.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>Umbraco.Tests.UnitTests</_Parameter1>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>Umbraco.Tests.Integration</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="EmbeddedResources\**\*" />
-  </ItemGroup>
-</Project>
diff --git a/src/Umbraco.Web.Common/Security/IBackOfficeSignInManager.cs b/src/Umbraco.Web.Common/Security/IBackOfficeSignInManager.cs
index f76912743b..51cc795704 100644
--- a/src/Umbraco.Web.Common/Security/IBackOfficeSignInManager.cs
+++ b/src/Umbraco.Web.Common/Security/IBackOfficeSignInManager.cs
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Identity;
 using Umbraco.Cms.Core.Security;
 
-namespace Umbraco.Cms.Web.BackOffice.Security;
+namespace Umbraco.Cms.Web.Common.Security;
 
 /// <summary>
 ///     A <see cref="SignInManager{BackOfficeIdentityUser}" /> for the back office with a
diff --git a/src/Umbraco.Web.UI.Client/.babelrc b/src/Umbraco.Web.UI.Client/.babelrc
deleted file mode 100644
index 5d148e346a..0000000000
--- a/src/Umbraco.Web.UI.Client/.babelrc
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "presets": [
-        [
-            "@babel/preset-env",
-            {
-                "targets": "last 2 version, not dead, > 0.5%, not ie 11"
-            }
-        ]
-    ],
-    "plugins": [
-        "@babel/plugin-proposal-nullish-coalescing-operator",
-        "@babel/plugin-proposal-optional-chaining",
-        [
-            "@babel/plugin-proposal-object-rest-spread",
-            {
-                "useBuiltIns": true
-            }
-        ]
-    ]
-}
diff --git a/src/Umbraco.Web.UI.Client/.eslintrc b/src/Umbraco.Web.UI.Client/.eslintrc
deleted file mode 100644
index 42492d802c..0000000000
--- a/src/Umbraco.Web.UI.Client/.eslintrc
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "rules": {
-        "comma-dangle": ["error", "never"]
-    },
-
-    "parserOptions": {
-        "ecmaVersion": "latest"
-    },
-
-    "overrides": [
-        {
-            "env": {
-                "browser": true,
-                "es6": true,
-                "jquery": true
-            },
-
-            "files": ["src/**/*.js"],
-
-            "extends": ["eslint:recommended"],
-
-            "rules": {
-                "no-extra-semi": "off",
-                "no-mixed-spaces-and-tabs": "off",
-                "no-unused-vars": "off",
-                "no-control-regex": "off",
-                "no-self-assign": "warn",
-                "no-useless-escape": "warn",
-                "no-extra-boolean-cast": "warn",
-                "no-prototype-builtins": "warn"
-            },
-
-            "globals": {
-                "angular": "readonly",
-                "_": "readonly",
-                "$": "readonly",
-                "jQuery": "readonly",
-                "tinymce": "readonly",
-                "tinyMCE": "readonly",
-                "FileReader": "readonly",
-                "Umbraco": "readonly",
-                "Utilities": "readonly",
-                "window": "readonly",
-                "LazyLoad": "readonly",
-                "ActiveXObject": "readonly",
-                "Bloodhound": "readonly",
-                "Diff": "readonly",
-                "moment": "readonly",
-                "signalR": "readonly",
-                "Markdown": "readonly",
-                "Sortable": "readonly",
-                "noUiSlider": "readonly",
-                "ClipboardJS": "readonly",
-                "anime": "readonly",
-                "flatpickr": "readonly",
-                "FlatpickrInstance": "readonly"
-            }
-        }
-    ]
-}
diff --git a/src/Umbraco.Web.UI.Client/.nvmrc b/src/Umbraco.Web.UI.Client/.nvmrc
deleted file mode 100644
index 48ef2c10ba..0000000000
--- a/src/Umbraco.Web.UI.Client/.nvmrc
+++ /dev/null
@@ -1 +0,0 @@
-20.9
diff --git a/src/Umbraco.Web.UI.Client/Umbraco.Web.UI.Client.proj.DotSettings b/src/Umbraco.Web.UI.Client/Umbraco.Web.UI.Client.proj.DotSettings
deleted file mode 100644
index c54c126d26..0000000000
--- a/src/Umbraco.Web.UI.Client/Umbraco.Web.UI.Client.proj.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp70</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/assets/img/loader.gif b/src/Umbraco.Web.UI.Client/assets/img/loader.gif
deleted file mode 100644
index bf2875b84e..0000000000
Binary files a/src/Umbraco.Web.UI.Client/assets/img/loader.gif and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
deleted file mode 100755
index 859f5958c9..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ /dev/null
@@ -1,104 +0,0 @@
-'use strict';
-
-module.exports = {
-    compile: {
-        build: {
-            sourcemaps: false,
-            embedtemplates: true,
-            minify: true,
-            lint: true
-        },
-        dev: {
-            sourcemaps: true,
-            embedtemplates: true,
-            minify: false,
-            lint: false
-        },
-        test: {
-            sourcemaps: false,
-            embedtemplates: true,
-            minify: true,
-            lint: true
-        }
-    },
-    sources: {
-        // css files used in backoffice
-        css: {
-            blockgridlayout: { files: "./src/views/propertyeditors/blockgrid/umbraco-blockgridlayout.css", watch: "./src/views/propertyeditors/blockgrid/umbraco-blockgridlayout.css", out: "umbraco-blockgridlayout.css", dist: "/css" },
-            blockgridlayout_flexbox: { files: "./src/views/propertyeditors/blockgrid/umbraco-blockgridlayout-flexbox.css", watch: "./src/views/propertyeditors/blockgrid/umbraco-blockgridlayout-flexbox.css", out: "umbraco-blockgridlayout-flexbox.css", dist: "/css" }
-        },
-
-        // less files used by backoffice and preview
-        // processed in the less task
-        less: {
-            installer: { files: "./src/less/installer.less", watch: "./src/less/**/*.less", out: "installer.min.css" },
-            nonodes: { files: "./src/less/pages/nonodes.less", watch: "./src/less/**/*.less", out: "nonodes.style.min.css"},
-            preview: { files: "./src/less/canvas-designer.less", watch: "./src/less/**/*.less", out: "canvasdesigner.min.css" },
-            umbraco: { files: "./src/less/belle.less", watch: "./src/**/*.less", out: "umbraco.min.css" },
-            rteContent: { files: "./src/less/rte-content.less", watch: "./src/less/**/*.less", out: "rte-content.css" },
-            icons: { files: "./src/less/icons.less", watch: "./src/less/**/*.less", out: "icons.css" },
-            blockgridui: { files: "./src/views/propertyeditors/blockgrid/blockgridui.less", watch: "./src/views/propertyeditors/blockgrid/blockgridui.less", out: "blockgridui.css" },
-            blockrteui: { files: "./src/views/propertyeditors/rte/blockrteui.less", watch: "./src/views/propertyeditors/rte/blockrteui.less", out: "blockrteui.css" }
-        },
-
-        // js files for backoffice
-        // processed in the js task
-        js: {
-            websitepreview: { files: "./src/websitepreview/**/*.js", out: "umbraco.websitepreview.js" },
-            preview: { files: "./src/preview/**/*.js", out: "umbraco.preview.js" },
-            installer: { files: "./src/installer/**/*.js", out: "umbraco.installer.js" },
-            filters: { files: "./src/common/filters/**/*.js", out: "umbraco.filters.js" },
-            resources: { files: "./src/common/resources/**/*.js", out: "umbraco.resources.js" },
-            services: { files: ["./src/common/services/**/*.js", "./src/utilities.js"], out: "umbraco.services.js" },
-            security: { files: "./src/common/interceptors/**/*.js", out: "umbraco.interceptors.js" },
-
-            //the controllers for views
-            controllers: {
-                files: [
-                    "./src/views/**/*.controller.js",
-                    "./src/*.controller.js"
-                ], out: "umbraco.controllers.js"
-            },
-
-            //directives/components
-            // - any JS file found in common / directives or common/ components
-            // - any JS file found inside views that has the suffix .directive.js or .component.js
-            directives: {
-                files: [
-                    "./src/common/directives/_module.js",
-                    "./src/{common/directives,common/components}/**/*.js",
-                    "./src/views/**/*.{directive,component}.js"
-                ],
-                out: "umbraco.directives.js"
-            }
-
-        },
-
-        //selectors for copying all views into the build
-        //processed in the views task
-        views:{
-            views: {files: "./src/views/**/*.html", folder: ""},
-            directives: {files: "./src/common/directives/**/*.html", folder: ""},
-            components: {files: "./src/common/components/**/*.html", folder: ""},
-            installer: {files: "./src/installer/steps/*.html", folder: "install/"}
-        },
-
-        //globs for file-watching
-        globs:{
-            views: ["./src/views/**/*.html", "./src/common/directives/**/*.html", "./src/common/components/**/*.html" ],
-            less: "./src/less/**/*.less",
-            js: "./src/*.js",
-            lib: "./lib/**/*",
-            assets: "./src/assets/**"
-        }
-    },
-    roots: ["../Umbraco.Cms.StaticAssets/wwwroot/"],
-    targets: {
-        js: "umbraco/js/",
-        lib: "umbraco/lib/",
-        views: "umbraco/views/",
-        less: "umbraco/assets/css/",
-        css: "umbraco/assets/css/",
-        assets: "umbraco/assets/"
-    }
-};
diff --git a/src/Umbraco.Web.UI.Client/gulp/modes.js b/src/Umbraco.Web.UI.Client/gulp/modes.js
deleted file mode 100644
index 21609cdcf8..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/modes.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict';
-
-var config = require('./config');
-var gulp = require('gulp');
-
-function setDevelopmentMode(cb) {
-
-    config.compile.current = config.compile.dev;
-
-    return cb();
-};
-
-function setTestMode(cb) {
-
-    config.compile.current = config.compile.test;
-
-    return cb();
-};
-
-module.exports = { 
-    setDevelopmentMode: setDevelopmentMode,
-    setTestMode: setTestMode
- };
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/css.js b/src/Umbraco.Web.UI.Client/gulp/tasks/css.js
deleted file mode 100644
index bc17ec288e..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/css.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict';
-
-var config = require('../config');
-
-var _ = require('lodash');
-var MergeStream = require('merge-stream');
-
-var processCss = require('../util/processCss');
-
-function css() {
-
-    var stream = new MergeStream();
-
-    _.forEach(config.sources.css, function (group) {
-        stream.add( processCss(group.files, group.out) );
-    });
-
-    return stream;
-};
-
-module.exports = { css: css };
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js b/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
deleted file mode 100644
index 41693fa9b4..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
+++ /dev/null
@@ -1,373 +0,0 @@
-'use strict';
-
-var config = require('../config');
-var gulp = require('gulp');
-
-var MergeStream = require('merge-stream');
-
-var imagemin = require('gulp-imagemin');
-var _ = require('lodash');
-
-/**************************
- * Task processes and copies all dependencies, either installed by npm or stored locally in the project
- **************************/
-function dependencies() {
-
-    //as we do multiple things in this task, we merge the multiple streams
-    var stream = new MergeStream();
-
-    // Pick the dependencies we need from each package
-    // so we don't just ship with a lot of files that aren't needed
-    const nodeModules = [
-        {
-            "name": "ace-builds",
-            "src":  [
-                "./node_modules/ace-builds/src-min-noconflict/ace.js",
-                "./node_modules/ace-builds/src-min-noconflict/ext-language_tools.js",
-                "./node_modules/ace-builds/src-min-noconflict/ext-searchbox.js",
-                "./node_modules/ace-builds/src-min-noconflict/ext-settings_menu.js",
-                "./node_modules/ace-builds/src-min-noconflict/snippets/text.js",
-                "./node_modules/ace-builds/src-min-noconflict/snippets/javascript.js",
-                "./node_modules/ace-builds/src-min-noconflict/snippets/css.js",
-                "./node_modules/ace-builds/src-min-noconflict/snippets/json.js",
-                "./node_modules/ace-builds/src-min-noconflict/snippets/xml.js",
-                "./node_modules/ace-builds/src-min-noconflict/theme-chrome.js",
-                "./node_modules/ace-builds/src-min-noconflict/mode-razor.js",
-                "./node_modules/ace-builds/src-min-noconflict/mode-javascript.js",
-                "./node_modules/ace-builds/src-min-noconflict/mode-css.js",
-                "./node_modules/ace-builds/src-min-noconflict/mode-json.js",
-                "./node_modules/ace-builds/src-min-noconflict/mode-xml.js",
-                "./node_modules/ace-builds/src-min-noconflict/worker-javascript.js",
-                "./node_modules/ace-builds/src-min-noconflict/worker-css.js",
-                "./node_modules/ace-builds/src-min-noconflict/worker-json.js",
-                "./node_modules/ace-builds/src-min-noconflict/worker-xml.js"
-            ],
-            "base": "./node_modules/ace-builds"
-        },
-        {
-            "name": "angular",
-            "src":  [
-                "./node_modules/angular/angular.min.js",
-                "./node_modules/angular/angular.min.js.map"
-            ],
-            "base": "./node_modules/angular"
-        },
-        {
-            "name": "angular-aria",
-            "src":  ["./node_modules/angular-aria/angular-aria.min.js",
-                    "./node_modules/angular-aria/angular-aria.min.js.map"],
-            "base": "./node_modules/angular-aria"
-        },
-        {
-            "name": "angular-cookies",
-            "src":  [
-                "./node_modules/angular-cookies/angular-cookies.min.js",
-                "./node_modules/angular-cookies/angular-cookies.min.js.map"
-            ],
-            "base": "./node_modules/angular-cookies"
-        },
-        {
-            "name": "angular-dynamic-locale",
-            "src":  [
-                "./node_modules/angular-dynamic-locale/dist/tmhDynamicLocale.min.js",
-                "./node_modules/angular-dynamic-locale/dist/tmhDynamicLocale.min.js.map"
-            ],
-            "base": "./node_modules/angular-dynamic-locale/dist"
-        },
-        {
-            "name": "angular-sanitize",
-            "src":  [
-                "./node_modules/angular-sanitize/angular-sanitize.min.js",
-                "./node_modules/angular-sanitize/angular-sanitize.min.js.map"
-            ],
-            "base": "./node_modules/angular-sanitize"
-        },
-        {
-            "name": "angular-touch",
-            "src":  [
-                "./node_modules/angular-touch/angular-touch.min.js",
-                "./node_modules/angular-touch/angular-touch.min.js.map"
-            ],
-            "base": "./node_modules/angular-touch"
-        },
-        {
-            "name": "angular-ui-sortable",
-            "src":  ["./node_modules/angular-ui-sortable/dist/sortable.min.js"],
-            "base": "./node_modules/angular-ui-sortable/dist"
-        },
-        {
-            "name": "angular-route",
-            "src":  [
-                "./node_modules/angular-route/angular-route.min.js",
-                "./node_modules/angular-route/angular-route.min.js.map"
-            ],
-            "base": "./node_modules/angular-route"
-        },
-        {
-            "name": "angular-animate",
-            "src":  [
-                "./node_modules/angular-animate/angular-animate.min.js",
-                "./node_modules/angular-animate/angular-animate.min.js.map"
-            ],
-            "base": "./node_modules/angular-animate"
-        },
-        {
-            "name": "angular-i18n",
-            "src":  [
-                "./node_modules/angular-i18n/angular-i18n.js",
-                "./node_modules/angular-i18n/angular-locale_*.js"
-            ],
-            "base": "./node_modules/angular-i18n"
-        },
-        {
-            "name": "angular-local-storage",
-            "src":  [
-                "./node_modules/angular-local-storage/dist/angular-local-storage.min.js",
-                "./node_modules/angular-local-storage/dist/angular-local-storage.min.js.map"
-            ],
-            "base": "./node_modules/angular-local-storage/dist"
-        },
-        {
-            "name": "angular-messages",
-            "src":  [
-                "./node_modules/angular-messages/angular-messages.min.js",
-                "./node_modules/angular-messages/angular-messages.min.js.map"
-            ],
-            "base": "./node_modules/angular-messages"
-        },
-        {
-            "name": "angular-mocks",
-            "src":  ["./node_modules/angular-mocks/angular-mocks.js"],
-            "base": "./node_modules/angular-mocks"
-        },
-        {
-            "name": "animejs",
-            "src":  ["./node_modules/animejs/lib/anime.min.js"],
-            "base": "./node_modules/animejs/lib"
-        },
-        {
-            "name": "bootstrap-social",
-            "src":  ["./node_modules/bootstrap-social/bootstrap-social.css"],
-            "base": "./node_modules/bootstrap-social"
-        },
-
-        {
-            "name": "angular-chart.js",
-            "src":  [
-                "./node_modules/angular-chart.js/dist/angular-chart.min.js",
-                "./node_modules/angular-chart.js/dist/angular-chart.min.js.map"
-            ],
-            "base": "./node_modules/angular-chart.js/dist"
-        },
-        {
-            "name": "chart.js",
-            "src":  ["./node_modules/chart.js/dist/Chart.min.js"],
-            "base": "./node_modules/chart.js/dist"
-        },
-        {
-            "name": "clipboard",
-            "src":  ["./node_modules/clipboard/dist/clipboard.min.js"],
-            "base": "./node_modules/clipboard/dist"
-        },
-        {
-            "name": "jsdiff",
-            "src":  ["./node_modules/diff/dist/diff.js"],
-            "base": "./node_modules/diff/dist"
-        },
-        {
-            "name": "flatpickr",
-            "src":  [
-                "./node_modules/flatpickr/dist/flatpickr.min.js",
-                "./node_modules/flatpickr/dist/flatpickr.min.css",
-                "./node_modules/flatpickr/dist/l10n/*.js"
-            ],
-            "base": "./node_modules/flatpickr/dist"
-        },
-        {
-            "name": "font-awesome",
-            "src":  [
-                "./node_modules/font-awesome/fonts/*",
-                "./node_modules/font-awesome/css/font-awesome.min.css"
-            ],
-            "base": "./node_modules/font-awesome"
-        },
-        {
-            "name": "jquery",
-            "src":  [
-                "./node_modules/jquery/dist/jquery.min.js",
-                "./node_modules/jquery/dist/jquery.min.map"
-            ],
-            "base": "./node_modules/jquery/dist"
-        },
-        {
-            "name": "jquery-ui",
-            "src":  ["./node_modules/jquery-ui-dist/jquery-ui.min.js"],
-            "base": "./node_modules/jquery-ui-dist"
-        },
-        {
-            "name": "jquery-ui-touch-punch",
-            "src":  ["./node_modules/jquery-ui-touch-punch/jquery.ui.touch-punch.min.js"],
-            "base": "./node_modules/jquery-ui-touch-punch"
-        },
-        {
-            "name": "lazyload-js",
-            "src":  ["./node_modules/lazyload-js/LazyLoad.min.js"],
-            "base": "./node_modules/lazyload-js"
-        },
-        {
-            "name": "moment",
-            "src":  ["./node_modules/moment/min/moment.min.js"],
-            "base": "./node_modules/moment/min"
-        },
-        {
-            "name": "moment",
-            "src":  ["./node_modules/moment/locale/*.js"],
-            "base": "./node_modules/moment/locale"
-        },
-        {
-            "name": "ng-file-upload",
-            "src":  ["./node_modules/ng-file-upload/dist/ng-file-upload.min.js"],
-            "base": "./node_modules/ng-file-upload/dist"
-        },
-        {
-            "name": "nouislider",
-            "src":  [
-                "./node_modules/nouislider/dist/nouislider.min.js",
-                "./node_modules/nouislider/dist/nouislider.min.css"
-            ],
-            "base": "./node_modules/nouislider/dist"
-        },
-        {
-            "name": "signalr",
-            "src":  [
-                "./node_modules/@microsoft/signalr/dist/browser/signalr.min.js"
-            ],
-            "base": "./node_modules/@microsoft/signalr/dist/browser"
-        },
-        {
-            "name": "spectrum",
-            "src":  [
-                "./node_modules/spectrum-colorpicker2/dist/spectrum.js",
-                "./node_modules/spectrum-colorpicker2/dist/spectrum.min.css"
-            ],
-            "base": "./node_modules/spectrum-colorpicker2/dist"
-        },
-        {
-            "name": "tinymce",
-            "src":  [
-                "./node_modules/tinymce/tinymce.min.js",
-                "./node_modules/tinymce/plugins/**",
-                "./node_modules/tinymce/skins/**",
-                "./node_modules/tinymce/themes/**",
-                "./node_modules/tinymce/models/**",
-                "./node_modules/tinymce/icons/**"
-            ],
-            "base": "./node_modules/tinymce"
-        },
-        {
-            "name": "typeahead.js",
-            "src":  ["./node_modules/typeahead.js/dist/typeahead.bundle.min.js"],
-            "base": "./node_modules/typeahead.js/dist"
-        },
-        {
-            "name": "underscore",
-            "src":  ["node_modules/underscore/underscore-min.js"],
-            "base": "./node_modules/underscore"
-        },
-        {
-            "name": "wicg-inert",
-            "src": [
-                "./node_modules/wicg-inert/dist/inert.min.js",
-                "./node_modules/wicg-inert/dist/inert.min.js.map"
-            ],
-            "base": "./node_modules/wicg-inert"
-        },
-        {
-          "name": "umbraco-ui",
-          "src": [
-            "./node_modules/@umbraco-ui/uui/dist/uui.min.js",
-            "./node_modules/@umbraco-ui/uui/dist/uui.min.js.map",
-            "./node_modules/@umbraco-ui/uui-css/dist/custom-properties.css",
-            "./node_modules/@umbraco-ui/uui-css/dist/uui-text.css",
-            "./node_modules/@umbraco-ui/uui-css/dist/uui-css.css",
-            "./node_modules/@umbraco-ui/uui-css/assets/fonts/lato/LatoLatin-Black.woff2",
-            "./node_modules/@umbraco-ui/uui-css/assets/fonts/lato/LatoLatin-Light.woff2",
-            "./node_modules/@umbraco-ui/uui-css/assets/fonts/lato/LatoLatin-Regular.woff2",
-            "./node_modules/@umbraco-ui/uui-css/assets/fonts/lato/LatoLatin-Italic.woff2",
-            "./node_modules/@umbraco-ui/uui-css/assets/fonts/lato/LatoLatin-Bold.woff2"
-          ],
-          "base": "./node_modules/@umbraco-ui"
-        },
-    ];
-
-    // add streams for node modules
-    nodeModules.forEach(module => {
-        var task = gulp.src(module.src, { base: module.base, allowEmpty: true });
-
-        _.forEach(config.roots, function(root){
-            task = task.pipe(gulp.dest(root + config.targets.lib + "/" + module.name))
-        });
-
-        stream.add(task);
-    });
-
-    //copy over libs which are not on npm (/lib)
-    var libTask = gulp.src(config.sources.globs.lib, { allowEmpty: true });
-
-    _.forEach(config.roots, function(root){
-        libTask = libTask.pipe(gulp.dest(root + config.targets.lib))
-    });
-
-    stream.add(libTask);
-
-    //Copies all static assets into /root / assets folder
-    //css, fonts and image files
-
-    var assetsTask = gulp.src(config.sources.globs.assets, { allowEmpty: true });
-    assetsTask = assetsTask.pipe(imagemin([
-        imagemin.gifsicle({interlaced: true}),
-        imagemin.mozjpeg({progressive: true}),
-        imagemin.optipng({optimizationLevel: 5}),
-        imagemin.svgo({
-            plugins: [
-                {removeViewBox: true},
-                {cleanupIDs: false}
-            ]
-        })
-    ]));
-
-    _.forEach(config.roots, function(root){
-        assetsTask = assetsTask.pipe(gulp.dest(root + config.targets.assets));
-    });
-
-
-    stream.add(assetsTask);
-
-    // Copies all the less files related to the preview into their folder
-    //these are not pre-processed as preview has its own less compiler client side
-    var lessTask = gulp.src("src/canvasdesigner/editors/*.less", { allowEmpty: true });
-
-    _.forEach(config.roots, function(root){
-        lessTask = lessTask.pipe(gulp.dest(root + config.targets.assets + "/less"));
-    });
-    stream.add(lessTask);
-
-
-
-	// TODO: check if we need these fileSize
-    var configTask = gulp.src("src/views/propertyeditors/grid/config/*.*", { allowEmpty: true });
-    _.forEach(config.roots, function(root){
-        configTask = configTask.pipe(gulp.dest(root + config.targets.views + "/propertyeditors/grid/config"));
-    });
-    stream.add(configTask);
-
-    var dashboardTask = gulp.src("src/views/dashboard/default/*.jpg", { allowEmpty: true });
-    _.forEach(config.roots, function(root){
-        dashboardTask = dashboardTask .pipe(gulp.dest(root + config.targets.views + "/dashboard/default"));
-    });
-    stream.add(dashboardTask);
-
-    return stream;
-};
-
-module.exports = { dependencies: dependencies };
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/js.js b/src/Umbraco.Web.UI.Client/gulp/tasks/js.js
deleted file mode 100644
index bfe02e858e..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/js.js
+++ /dev/null
@@ -1,55 +0,0 @@
-'use strict';
-
-var config = require('../config');
-var gulp = require('gulp');
-
-var minify = require('gulp-minify');
-var rename = require('gulp-rename');
-var _ = require('lodash');
-var MergeStream = require('merge-stream');
-
-var processJs = require('../util/processJs');
-
-/**************************
- * Copies all angular JS files into their separate umbraco.*.js file
- **************************/
-function js() {
-
-    //we run multiple streams, so merge them all together
-    var stream = new MergeStream();
-
-    var task = gulp.src(config.sources.globs.js);
-    // NOTE: if you change something here, you probably also need to change it in the processJs util
-    if (config.compile.current.minify === true) {
-      task = task.pipe(
-        minify({
-          noSource: true,
-          ext: { min: '.min.js' },
-          mangle: false,
-          compress: {
-            keep_classnames: true,
-            keep_fnames: true
-          }
-        })
-      );
-    } else {
-      // rename the un-minified file so the client can reference it as '.min.js'
-      task = task.pipe(rename(function(path) {
-        path.basename += '.min';
-      }));
-    }
-    _.forEach(config.roots, function(root){
-        task = task.pipe( gulp.dest(root + config.targets.js) )
-    })
-    stream.add(task);
-  
-    _.forEach(config.sources.js, function (group) {
-        stream.add(
-            processJs(group.files, group.out)
-        );
-    });
-
-     return stream;
-};
-
-module.exports = { js: js };
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/less.js b/src/Umbraco.Web.UI.Client/gulp/tasks/less.js
deleted file mode 100644
index 8ad5814394..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/less.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict';
-
-var config = require('../config');
-
-var _ = require('lodash');
-var MergeStream = require('merge-stream');
-
-var processLess = require('../util/processLess');
-
-function less() {
-
-    var stream = new MergeStream();
-
-    _.forEach(config.sources.less, function (group) {
-        stream.add( processLess(group.files, group.out) );
-    });
-
-    return stream;
-};
-
-module.exports = { less: less };
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js b/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
deleted file mode 100644
index b5239d35e7..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
+++ /dev/null
@@ -1,39 +0,0 @@
-'use strict';
-
-var karmaServer = require('karma').Server;
-
-/**************************
- * Build tests
- **************************/
-
-// Karma test
-function testUnit() {
-
-    return new karmaServer({
-        configFile: __dirname + "/../../test/config/karma.conf.js"
-    })
-    .start();
-};
-
-// Run karma test server
-function runUnitTestServer() {
-
-    return new karmaServer({
-        configFile: __dirname + "/../../test/config/karma.conf.js",
-        autoWatch: true,
-        port: 9999,
-        singleRun: false,
-        keepalive: true
-    })
-    .start();
-};
-
-function testE2e() {
-    return new karmaServer({
-        configFile: __dirname + "/../../test/config/e2e.js",
-        keepalive: true
-    })
-    .start();
-};
-
-module.exports = { testUnit: testUnit, testE2e: testE2e, runUnitTestServer: runUnitTestServer };
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/views.js b/src/Umbraco.Web.UI.Client/gulp/tasks/views.js
deleted file mode 100644
index d7eae62877..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/views.js
+++ /dev/null
@@ -1,31 +0,0 @@
-'use strict';
-
-var config = require('../config');
-var gulp = require('gulp');
-
-var _ = require('lodash');
-var MergeStream = require('merge-stream');
-
-function views() {
-
-    var stream = new MergeStream();
-
-    _.forEach(config.sources.views, function (group) {
-
-        var task = gulp.src(group.files);
-
-        _.forEach(config.roots, function(root){
-            var destPath = root + config.targets.views + group.folder;
-            console.log("copying " + group.files + " to " + destPath)
-            task = task.pipe( gulp.dest(destPath));
-        })
-
-        stream.add (task);
-
-    });
-
-    return stream;
-};
-
-module.exports = { views: views };
-
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js b/src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
deleted file mode 100644
index c4b1c2e9ef..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
+++ /dev/null
@@ -1,65 +0,0 @@
-'use strict';
-
-const config = require('../config');
-const {watch, series, parallel, dest, src} = require('gulp');
-
-var _ = require('lodash');
-var MergeStream = require('merge-stream');
-
-var processJs = require('../util/processJs');
-var processLess = require('../util/processLess');
-var processCss = require('../util/processCss');
-
-var {js} = require('./js');
-
-function watchTask(cb) {
-
-    var watchInterval = 500;
-
-    //Setup a watcher for all groups of JS files
-    _.forEach(config.sources.js, function (group) {
-        if(group.watch !== false) {
-            watch(group.files, { ignoreInitial: true, interval: watchInterval }, function JS_Group_Compile() { return processJs(group.files, group.out);});
-        }
-    });
-
-    //Setup a watcher for all groups of CSS files
-    _.forEach(config.sources.css, function (group) {
-        if(group.watch !== false) {
-            watch(group.watch, { ignoreInitial: true, interval: watchInterval }, function Css_Group_Compile() { return processCss(group.files, group.out); });
-        }
-    });
-
-    //Setup a watcher for all groups of LESS files
-    _.forEach(config.sources.less, function (group) {
-        if(group.watch !== false) {
-            watch(group.watch, { ignoreInitial: true, interval: watchInterval }, function Less_Group_Compile() { return processLess(group.files, group.out); });
-        }
-    });
-
-    //Setup a watcher for all groups of view files
-    var viewWatcher;
-    _.forEach(config.sources.views, function (group) {
-        if(group.watch !== false) {
-            viewWatcher = watch(group.files, { ignoreInitial: true, interval: watchInterval },
-                parallel(
-                    function MoveViewsAndRegenerateJS() {
-                        var task = src(group.files);
-
-                        _.forEach(config.roots, function(root){
-                            var destPath = root + config.targets.views + group.folder;
-                            console.log("copying " + group.files + " to " + destPath);
-                            task = task.pipe( dest(destPath) );
-                        });
-                        return task;
-                    },
-                    js
-                )
-            );
-        }
-    });
-
-    return cb();
-};
-
-module.exports = { watchTask: watchTask };
diff --git a/src/Umbraco.Web.UI.Client/gulp/util/handleErrors.js b/src/Umbraco.Web.UI.Client/gulp/util/handleErrors.js
deleted file mode 100755
index 3c32a928dd..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/util/handleErrors.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-
-var notify = require('gulp-notify');
-
-module.exports = function(error) {
-
-	var args = Array.prototype.slice.call(arguments);
-
-	// Send error to notification center with gulp-notify
-	notify.onError({
-		title: 'Compile Error',
-		message: '<%= error.message %>'
-	}).apply(this, args);
-
-	// Keep gulp from hanging on this task
-	this.emit('end');
-
-};
diff --git a/src/Umbraco.Web.UI.Client/gulp/util/processCss.js b/src/Umbraco.Web.UI.Client/gulp/util/processCss.js
deleted file mode 100644
index 1572a81451..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/util/processCss.js
+++ /dev/null
@@ -1,41 +0,0 @@
-
-var config = require('../config');
-var gulp = require('gulp');
-
-var postcss = require('gulp-postcss');
-var autoprefixer = require('autoprefixer');
-var cssnano = require('cssnano');
-var cleanCss = require('gulp-clean-css');
-var rename = require('gulp-rename');
-var sourcemaps = require('gulp-sourcemaps');
-var _ = require('lodash');
-
-module.exports = function(files, out) {
-
-    var processors = [
-        autoprefixer
-    ];
-    _.forEach(config.roots, function(root){
-        console.log("CSS: ", files, " -> ", root + config.targets.css + out);
-    });
-
-    var task = gulp.src(files);
-
-    if(config.compile.current.sourcemaps === true) {
-        task = task.pipe(sourcemaps.init());
-    }
-    
-    //task = task.pipe(cleanCss());
-    task = task.pipe(postcss(processors));
-
-    if(config.compile.current.sourcemaps === true) {
-        task = task.pipe(sourcemaps.write('./maps'));
-    }
-
-    _.forEach(config.roots, function(root){
-        task = task.pipe(gulp.dest(root + config.targets.css));
-    })
-
-    
-    return task;
-};
diff --git a/src/Umbraco.Web.UI.Client/gulp/util/processJs.js b/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
deleted file mode 100644
index 23b7ae50b7..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
+++ /dev/null
@@ -1,75 +0,0 @@
-
-var config = require('../config');
-var gulp = require('gulp');
-
-var eslint = require('gulp-eslint-new');
-var babel = require("gulp-babel");
-var sort = require('gulp-sort');
-var concat = require('gulp-concat');
-var wrap = require("gulp-wrap-js");
-var embedTemplates = require('gulp-angular-embed-templates');
-var minify = require('gulp-minify');
-var rename = require('gulp-rename');
-var _ = require('lodash');
-
-module.exports = function (files, out) {
-
-    _.forEach(config.roots, function(root){
-        console.log("JS: ", files, " -> ", root + config.targets.js + out)
-    })
-
-    var task = gulp.src(files);
-
-    // check for js errors
-    task = task.pipe(eslint({
-      warnIgnored: true,
-      quiet: true
-    }));
-
-    if (config.compile.current.lint === true) {
-      // outputs the lint results to the console
-      task = task.pipe(eslint.format());
-      // fail after all errors have been discovered
-      task = task.pipe(eslint.failAfterError());
-    }
-
-    // sort files in stream by path or any custom sort comparator
-    task = task.pipe(babel())
-        .pipe(sort());
-
-    //in production, embed the templates
-    if(config.compile.current.embedtemplates === true) {
-        task = task.pipe(embedTemplates({ basePath: "./src/", minimize: { loose: true } }));
-    }
-
-    task = task.pipe(concat(out)).pipe(wrap('(function(){\n%= body %\n})();'))
-
-    // NOTE: if you change something here, you probably also need to change it in the js task
-    if (config.compile.current.minify === true) {
-      task = task.pipe(
-        minify({
-          noSource:true,
-          ext: {min:'.min.js'},
-          mangle: false,
-          compress: {
-            keep_classnames: true,
-            keep_fnames: true
-          }
-        })
-      );
-    } else {
-      // rename the un-minified file so the client can reference it as '.min.js'
-      task = task.pipe(rename(function(path) {
-        path.basename += '.min';
-      }));
-    }
-
-    _.forEach(config.roots, function(root){
-        task = task.pipe(gulp.dest(root + config.targets.js));
-    })
-
-
-
-    return task;
-
-};
diff --git a/src/Umbraco.Web.UI.Client/gulp/util/processLess.js b/src/Umbraco.Web.UI.Client/gulp/util/processLess.js
deleted file mode 100644
index cf4763ecff..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/util/processLess.js
+++ /dev/null
@@ -1,49 +0,0 @@
-
-var config = require('../config');
-var gulp = require('gulp');
-
-var postcss = require('gulp-postcss');
-var less = require('gulp-less');
-var autoprefixer = require('autoprefixer');
-var cssnano = require('cssnano');
-var cleanCss = require('gulp-clean-css');
-var rename = require('gulp-rename');
-var sourcemaps = require('gulp-sourcemaps');
-var _ = require('lodash');
-
-module.exports = function(files, out) {
-
-    var processors = [
-        autoprefixer,
-        cssnano({zindex: false})
-    ];
-    _.forEach(config.roots, function(root){
-        console.log("LESS: ", files, " -> ", root + config.targets.less + out);
-    })
-    
-
-    var task = gulp.src(files);
-
-    if(config.compile.current.sourcemaps === true) {
-        task = task.pipe(sourcemaps.init());
-    }
-
-    task = task.pipe(less());
-    task = task.pipe(cleanCss());
-    task = task.pipe(postcss(processors));
-    task = task.pipe(rename(out));
-
-    if(config.compile.current.sourcemaps === true) {
-        task = task.pipe(sourcemaps.write('./maps'));
-    }
-
-    _.forEach(config.roots, function(root){
-        task = task.pipe(gulp.dest(root + config.targets.less));
-    })
-
-    
-   
-
-    return task;
-
-};
diff --git a/src/Umbraco.Web.UI.Client/gulp/util/scriptFilter.js b/src/Umbraco.Web.UI.Client/gulp/util/scriptFilter.js
deleted file mode 100755
index 7d8ce45f82..0000000000
--- a/src/Umbraco.Web.UI.Client/gulp/util/scriptFilter.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict';
-
-var path = require('path');
-
-// Filters out non .js files. Prevents
-// accidental inclusion of possible hidden files
-module.exports = function(name) {
-	return /(\.(js)$)/i.test(path.extname(name));
-};
diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
deleted file mode 100644
index d2286bd8dc..0000000000
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ /dev/null
@@ -1,44 +0,0 @@
-
-'use strict';
-
-/*
-    * gulpfile.js
-    * ===========
-    * This is now using Gulp 4, each child task is now a child function in its own corresponding file.
-    *
-    * To add a new task, simply add a new task file to gulp/tasks folder, add a require statement below to include the one or more methods
-    * and then add the exports command to add the new item into the task menu.
-    */
-
-const { series, parallel } = require('gulp');
-
-const config = require('./gulp/config');
-const { setDevelopmentMode, setTestMode } = require('./gulp/modes');
-const { dependencies } = require('./gulp/tasks/dependencies');
-const { js } = require('./gulp/tasks/js');
-const { less } = require('./gulp/tasks/less');
-const { css } = require('./gulp/tasks/css');
-const { testE2e, testUnit, runUnitTestServer } = require('./gulp/tasks/test');
-const { views } = require('./gulp/tasks/views');
-const { watchTask } = require('./gulp/tasks/watchTask');
-
-// set default current compile mode:
-config.compile.current = config.compile.build;
-
-const coreBuild = parallel(dependencies, js, less, css, views);
-
-// ***********************************************************
-// These Exports are the new way of defining Tasks in Gulp 4.x
-// ***********************************************************
-
-exports.build = series(coreBuild, testUnit);
-exports.buildDev = series(setDevelopmentMode, coreBuild);
-
-exports.coreBuild = coreBuild;
-exports.dev = series(setDevelopmentMode, coreBuild, runUnitTestServer, watchTask);
-exports.fastdev = series(setDevelopmentMode, coreBuild, watchTask);
-exports.watch = series(setDevelopmentMode, watchTask);
-//
-exports.runTests = series(setTestMode, series(js, testUnit));
-exports.runUnit = series(setTestMode, series(js, runUnitTestServer), watchTask);
-exports.testE2e = series(setTestMode, parallel(testE2e));
diff --git a/src/Umbraco.Web.UI.Client/lib/ace-razor-mode/theme/razor_chrome.css b/src/Umbraco.Web.UI.Client/lib/ace-razor-mode/theme/razor_chrome.css
deleted file mode 100644
index 7f401520d5..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/ace-razor-mode/theme/razor_chrome.css
+++ /dev/null
@@ -1,161 +0,0 @@
-.ace-chrome .ace_gutter {
-  background: white !important;
-  color: #ccc  !important;
-  overflow : hidden;
-}
-
-.ace-chrome .ace_print-margin {
-  
-}
-
-.ace-chrome {
-  background-color: #FFFFFF;
-  color: black;
-}
-
-.ace-chrome .ace_cursor {
-  color: black;
-}
-
-.ace-chrome .ace_invisible {
-  color: rgb(191, 191, 191);
-}
-
-.ace-chrome .ace_constant.ace_buildin {
-  color: rgb(88, 72, 246);
-}
-
-.ace-chrome .ace_constant.ace_language {
-  color: rgb(88, 92, 246);
-}
-
-.ace-chrome .ace_constant.ace_library {
-  color: rgb(6, 150, 14);
-}
-
-.ace-chrome .ace_invalid {
-  background-color: rgb(153, 0, 0);
-  color: white;
-}
-
-.ace_punctuation.ace_short.ace_razor{
-  background: yellow;
-}
-
-.ace-chrome .ace_fold {
-}
-
-.ace-chrome .ace_support.ace_function {
-  color: rgb(60, 76, 114);
-}
-
-.ace-chrome .ace_support.ace_constant {
-  color: rgb(6, 150, 14);
-}
-
-.ace-chrome .ace_support.ace_type,
-.ace-chrome .ace_support.ace_class
-.ace-chrome .ace_support.ace_other {
-  color: rgb(109, 121, 222);
-}
-
-.ace-chrome .ace_variable.ace_parameter {
-  font-style:italic;
-  color:#FD971F;
-}
-.ace-chrome .ace_keyword.ace_operator {
-  color: rgb(104, 118, 135);
-}
-
-.ace-chrome .ace_comment {
-  color: #236e24;
-}
-
-.ace-chrome .ace_comment.ace_doc {
-  color: #236e24;
-}
-
-.ace-chrome .ace_comment.ace_doc.ace_tag {
-  color: #236e24;
-}
-
-.ace-chrome .ace_constant.ace_numeric {
-  color: rgb(0, 0, 205);
-}
-
-.ace-chrome .ace_variable {
-  color: rgb(49, 132, 149);
-}
-
-.ace-chrome .ace_xml-pe {
-  color: rgb(104, 104, 91);
-}
-
-.ace-chrome .ace_entity.ace_name.ace_function {
-  color: #0000A2;
-}
-
-
-.ace-chrome .ace_heading {
-  color: rgb(12, 7, 255);
-}
-
-.ace-chrome .ace_list {
-  color:rgb(185, 6, 144);
-}
-
-.ace-chrome .ace_marker-layer .ace_selection {
-  background: rgb(181, 213, 255);
-}
-
-.ace-chrome .ace_marker-layer .ace_step {
-  background: rgb(252, 255, 0);
-}
-
-.ace-chrome .ace_marker-layer .ace_stack {
-  background: rgb(164, 229, 101);
-}
-
-.ace-chrome .ace_marker-layer .ace_bracket {
-  margin: -1px 0 0 -1px;
-  border: 1px solid rgb(192, 192, 192);
-}
-
-.ace-chrome .ace_marker-layer .ace_active-line {
-  background: rgba(0, 0, 0, 0.07)  !important;
-}
-
-.ace-chrome .ace_gutter-active-line {
-  background: rgba(0, 0, 0, 0.07)  !important;
-}
-
-.ace-chrome .ace_marker-layer .ace_selected-word {
-  background: rgb(250, 250, 255);
-  border: 1px solid rgb(200, 200, 250);
-}
-
-.ace-chrome .ace_storage,
-.ace-chrome .ace_keyword,
-.ace-chrome .ace_meta.ace_tag {
-  color: rgb(147, 15, 128);
-}
-
-.ace-chrome .ace_string.ace_regex {
-  color: rgb(255, 0, 0)
-}
-
-.ace-chrome .ace_string {
-  color: #1A1AA6;
-}
-
-.ace-chrome .ace_entity.ace_other.ace_attribute-name {
-  color: #994409;
-}
-
-.ace-chrome .ace_indent-guide {
-  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;
-}
-
-.ace-chrome .ace_razor {
-  background: yellow;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap-responsive.css b/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap-responsive.css
deleted file mode 100644
index 0f4cb1dc75..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap-responsive.css
+++ /dev/null
@@ -1,1036 +0,0 @@
-/*!
- * Bootstrap Responsive v2.1.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-.clearfix {
-  *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  box-sizing: border-box;
-}
-
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-
-.visible-phone {
-  display: none !important;
-}
-
-.visible-tablet {
-  display: none !important;
-}
-
-.hidden-desktop {
-  display: none !important;
-}
-
-.visible-desktop {
-  display: inherit !important;
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important ;
-  }
-  .visible-tablet {
-    display: inherit !important;
-  }
-  .hidden-tablet {
-    display: none !important;
-  }
-}
-
-@media (max-width: 767px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important;
-  }
-  .visible-phone {
-    display: inherit !important;
-  }
-  .hidden-phone {
-    display: none !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .row {
-    margin-left: -30px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 30px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 1170px;
-  }
-  .span12 {
-    width: 1170px;
-  }
-  .span11 {
-    width: 1070px;
-  }
-  .span10 {
-    width: 970px;
-  }
-  .span9 {
-    width: 870px;
-  }
-  .span8 {
-    width: 770px;
-  }
-  .span7 {
-    width: 670px;
-  }
-  .span6 {
-    width: 570px;
-  }
-  .span5 {
-    width: 470px;
-  }
-  .span4 {
-    width: 370px;
-  }
-  .span3 {
-    width: 270px;
-  }
-  .span2 {
-    width: 170px;
-  }
-  .span1 {
-    width: 70px;
-  }
-  .offset12 {
-    margin-left: 1230px;
-  }
-  .offset11 {
-    margin-left: 1130px;
-  }
-  .offset10 {
-    margin-left: 1030px;
-  }
-  .offset9 {
-    margin-left: 930px;
-  }
-  .offset8 {
-    margin-left: 830px;
-  }
-  .offset7 {
-    margin-left: 730px;
-  }
-  .offset6 {
-    margin-left: 630px;
-  }
-  .offset5 {
-    margin-left: 530px;
-  }
-  .offset4 {
-    margin-left: 430px;
-  }
-  .offset3 {
-    margin-left: 330px;
-  }
-  .offset2 {
-    margin-left: 230px;
-  }
-  .offset1 {
-    margin-left: 130px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 30px;
-    margin-left: 2.564102564102564%;
-    *margin-left: 2.5109110747408616%;
-    box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.45299145299145%;
-    *width: 91.39979996362975%;
-  }
-  .row-fluid .span10 {
-    width: 82.90598290598291%;
-    *width: 82.8527914166212%;
-  }
-  .row-fluid .span9 {
-    width: 74.35897435897436%;
-    *width: 74.30578286961266%;
-  }
-  .row-fluid .span8 {
-    width: 65.81196581196582%;
-    *width: 65.75877432260411%;
-  }
-  .row-fluid .span7 {
-    width: 57.26495726495726%;
-    *width: 57.21176577559556%;
-  }
-  .row-fluid .span6 {
-    width: 48.717948717948715%;
-    *width: 48.664757228587014%;
-  }
-  .row-fluid .span5 {
-    width: 40.17094017094017%;
-    *width: 40.11774868157847%;
-  }
-  .row-fluid .span4 {
-    width: 31.623931623931625%;
-    *width: 31.570740134569924%;
-  }
-  .row-fluid .span3 {
-    width: 23.076923076923077%;
-    *width: 23.023731587561375%;
-  }
-  .row-fluid .span2 {
-    width: 14.52991452991453%;
-    *width: 14.476723040552828%;
-  }
-  .row-fluid .span1 {
-    width: 5.982905982905983%;
-    *width: 5.929714493544281%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.12820512820512%;
-    *margin-left: 105.02182214948171%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.56410256410257%;
-    *margin-left: 102.45771958537915%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.58119658119658%;
-    *margin-left: 96.47481360247316%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.01709401709402%;
-    *margin-left: 93.91071103837061%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.03418803418803%;
-    *margin-left: 87.92780505546462%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.47008547008548%;
-    *margin-left: 85.36370249136206%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.48717948717949%;
-    *margin-left: 79.38079650845607%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 76.92307692307693%;
-    *margin-left: 76.81669394435352%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 70.94017094017094%;
-    *margin-left: 70.83378796144753%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.37606837606839%;
-    *margin-left: 68.26968539734497%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.393162393162385%;
-    *margin-left: 62.28677941443899%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.82905982905982%;
-    *margin-left: 59.72267685033642%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 53.84615384615384%;
-    *margin-left: 53.739770867430444%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.28205128205128%;
-    *margin-left: 51.175668303327875%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.299145299145295%;
-    *margin-left: 45.1927623204219%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.73504273504273%;
-    *margin-left: 42.62865975631933%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 36.75213675213675%;
-    *margin-left: 36.645753773413354%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.18803418803419%;
-    *margin-left: 34.081651209310785%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.205128205128204%;
-    *margin-left: 28.0987452264048%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.641025641025642%;
-    *margin-left: 25.53464266230224%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.65811965811966%;
-    *margin-left: 19.551736679396257%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.094017094017094%;
-    *margin-left: 16.98763411529369%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.11111111111111%;
-    *margin-left: 11.004728132387708%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.547008547008547%;
-    *margin-left: 8.440625568285142%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 30px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 1156px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 1056px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 956px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 856px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 756px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 656px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 556px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 456px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 356px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 256px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 156px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 56px;
-  }
-  .thumbnails {
-    margin-left: -30px;
-  }
-  .thumbnails > li {
-    margin-left: 30px;
-  }
-  .row-fluid .thumbnails {
-    margin-left: 0;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .row {
-    margin-left: -20px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 20px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 724px;
-  }
-  .span12 {
-    width: 724px;
-  }
-  .span11 {
-    width: 662px;
-  }
-  .span10 {
-    width: 600px;
-  }
-  .span9 {
-    width: 538px;
-  }
-  .span8 {
-    width: 476px;
-  }
-  .span7 {
-    width: 414px;
-  }
-  .span6 {
-    width: 352px;
-  }
-  .span5 {
-    width: 290px;
-  }
-  .span4 {
-    width: 228px;
-  }
-  .span3 {
-    width: 166px;
-  }
-  .span2 {
-    width: 104px;
-  }
-  .span1 {
-    width: 42px;
-  }
-  .offset12 {
-    margin-left: 764px;
-  }
-  .offset11 {
-    margin-left: 702px;
-  }
-  .offset10 {
-    margin-left: 640px;
-  }
-  .offset9 {
-    margin-left: 578px;
-  }
-  .offset8 {
-    margin-left: 516px;
-  }
-  .offset7 {
-    margin-left: 454px;
-  }
-  .offset6 {
-    margin-left: 392px;
-  }
-  .offset5 {
-    margin-left: 330px;
-  }
-  .offset4 {
-    margin-left: 268px;
-  }
-  .offset3 {
-    margin-left: 206px;
-  }
-  .offset2 {
-    margin-left: 144px;
-  }
-  .offset1 {
-    margin-left: 82px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 30px;
-    margin-left: 2.7624309392265194%;
-    *margin-left: 2.709239449864817%;
-    box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.43646408839778%;
-    *width: 91.38327259903608%;
-  }
-  .row-fluid .span10 {
-    width: 82.87292817679558%;
-    *width: 82.81973668743387%;
-  }
-  .row-fluid .span9 {
-    width: 74.30939226519337%;
-    *width: 74.25620077583166%;
-  }
-  .row-fluid .span8 {
-    width: 65.74585635359117%;
-    *width: 65.69266486422946%;
-  }
-  .row-fluid .span7 {
-    width: 57.18232044198895%;
-    *width: 57.12912895262725%;
-  }
-  .row-fluid .span6 {
-    width: 48.61878453038674%;
-    *width: 48.56559304102504%;
-  }
-  .row-fluid .span5 {
-    width: 40.05524861878453%;
-    *width: 40.00205712942283%;
-  }
-  .row-fluid .span4 {
-    width: 31.491712707182323%;
-    *width: 31.43852121782062%;
-  }
-  .row-fluid .span3 {
-    width: 22.92817679558011%;
-    *width: 22.87498530621841%;
-  }
-  .row-fluid .span2 {
-    width: 14.3646408839779%;
-    *width: 14.311449394616199%;
-  }
-  .row-fluid .span1 {
-    width: 5.801104972375691%;
-    *width: 5.747913483013988%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.52486187845304%;
-    *margin-left: 105.41847889972962%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.76243093922652%;
-    *margin-left: 102.6560479605031%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.96132596685082%;
-    *margin-left: 96.8549429881274%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.1988950276243%;
-    *margin-left: 94.09251204890089%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.39779005524862%;
-    *margin-left: 88.2914070765252%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.6353591160221%;
-    *margin-left: 85.52897613729868%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.8342541436464%;
-    *margin-left: 79.72787116492299%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 77.07182320441989%;
-    *margin-left: 76.96544022569647%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 71.2707182320442%;
-    *margin-left: 71.16433525332079%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.50828729281768%;
-    *margin-left: 68.40190431409427%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.70718232044199%;
-    *margin-left: 62.600799341718584%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.94475138121547%;
-    *margin-left: 59.838368402492065%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 54.14364640883978%;
-    *margin-left: 54.037263430116376%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.38121546961326%;
-    *margin-left: 51.27483249088986%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.58011049723757%;
-    *margin-left: 45.47372751851417%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.81767955801105%;
-    *margin-left: 42.71129657928765%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 37.01657458563536%;
-    *margin-left: 36.91019160691196%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.25414364640884%;
-    *margin-left: 34.14776066768544%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.45303867403315%;
-    *margin-left: 28.346655695309746%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.69060773480663%;
-    *margin-left: 25.584224756083227%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.88950276243094%;
-    *margin-left: 19.783119783707537%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.12707182320442%;
-    *margin-left: 17.02068884448102%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.32596685082873%;
-    *margin-left: 11.219583872105325%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.56353591160221%;
-    *margin-left: 8.457152932878806%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 20px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 710px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 648px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 586px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 524px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 462px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 400px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 338px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 276px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 214px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 152px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 90px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 28px;
-  }
-}
-
-@media (max-width: 767px) {
-  body {
-    padding-right: 20px;
-    padding-left: 20px;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom,
-  .navbar-static-top {
-    margin-right: -20px;
-    margin-left: -20px;
-  }
-  .container-fluid {
-    padding: 0;
-  }
-  .dl-horizontal dt {
-    float: none;
-    width: auto;
-    clear: none;
-    text-align: left;
-  }
-  .dl-horizontal dd {
-    margin-left: 0;
-  }
-  .container {
-    width: auto;
-  }
-  .row-fluid {
-    width: 100%;
-  }
-  .row,
-  .thumbnails {
-    margin-left: 0;
-  }
-  .thumbnails > li {
-    float: none;
-    margin-left: 0;
-  }
-  [class*="span"],
-  .row-fluid [class*="span"] {
-    display: block;
-    float: none;
-    width: 100%;
-    margin-left: 0;
-    box-sizing: border-box;
-  }
-  .span12,
-  .row-fluid .span12 {
-    width: 100%;
-    box-sizing: border-box;
-  }
-  .input-large,
-  .input-xlarge,
-  .input-xxlarge,
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    display: block;
-    width: 100%;
-    min-height: 30px;
-    box-sizing: border-box;
-  }
-  .input-prepend input,
-  .input-append input,
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"] {
-    display: inline-block;
-    width: auto;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 0;
-  }
-  .modal {
-    position: fixed;
-    top: 20px;
-    right: 20px;
-    left: 20px;
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade.in {
-    top: auto;
-  }
-}
-
-@media (max-width: 480px) {
-  .nav-collapse {
-    transform: translate3d(0,0,0);
-  }
-  .page-header h1 small {
-    display: block;
-    line-height: 20px;
-  }
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-  .form-horizontal .control-label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  .form-horizontal .control-list {
-    padding-top: 0;
-  }
-  .form-horizontal .form-actions {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-  .modal {
-    top: 10px;
-    right: 10px;
-    left: 10px;
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-  .carousel-caption {
-    position: static;
-  }
-}
-
-@media (max-width: 979px) {
-  body {
-    padding-top: 0;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: static;
-  }
-  .navbar-fixed-top {
-    margin-bottom: 20px;
-  }
-  .navbar-fixed-bottom {
-    margin-top: 20px;
-  }
-  .navbar-fixed-top .navbar-inner,
-  .navbar-fixed-bottom .navbar-inner {
-    padding: 5px;
-  }
-  .navbar .container {
-    width: auto;
-    padding: 0;
-  }
-  .navbar .brand {
-    padding-right: 10px;
-    padding-left: 10px;
-    margin: 0 0 0 -5px;
-  }
-  .nav-collapse {
-    clear: both;
-  }
-  .nav-collapse .nav {
-    float: none;
-    margin: 0 0 10px;
-  }
-  .nav-collapse .nav > li {
-    float: none;
-  }
-  .nav-collapse .nav > li > a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > .divider-vertical {
-    display: none;
-  }
-  .nav-collapse .nav .nav-header {
-    color: #777777;
-    text-shadow: none;
-  }
-  .nav-collapse .nav > li > a,
-  .nav-collapse .dropdown-menu a {
-    padding: 9px 15px;
-    font-weight: bold;
-    color: #777777;
-    border-radius: 3px;
-  }
-  .nav-collapse .btn {
-    padding: 4px 10px 4px;
-    font-weight: normal;
-    border-radius: 4px;
-  }
-  .nav-collapse .dropdown-menu li + li a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > li > a:hover,
-  .nav-collapse .dropdown-menu a:hover {
-    background-color: #f2f2f2;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a:hover,
-  .navbar-inverse .nav-collapse .dropdown-menu a:hover {
-    background-color: #111111;
-  }
-  .nav-collapse.in .btn-group {
-    padding: 0;
-    margin-top: 5px;
-  }
-  .nav-collapse .dropdown-menu {
-    position: static;
-    top: auto;
-    left: auto;
-    display: block;
-    float: none;
-    max-width: none;
-    padding: 0;
-    margin: 0 15px;
-    background-color: transparent;
-    border: none;
-    border-radius: 0;
-    box-shadow: none;
-  }
-  .nav-collapse .dropdown-menu:before,
-  .nav-collapse .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .dropdown-menu .divider {
-    display: none;
-  }
-  .nav-collapse .nav > li > .dropdown-menu:before,
-  .nav-collapse .nav > li > .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .navbar-form,
-  .nav-collapse .navbar-search {
-    float: none;
-    padding: 10px 15px;
-    margin: 10px 0;
-    border-top: 1px solid #f2f2f2;
-    border-bottom: 1px solid #f2f2f2;
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-  }
-  .navbar-inverse .nav-collapse .navbar-form,
-  .navbar-inverse .nav-collapse .navbar-search {
-    border-top-color: #111111;
-    border-bottom-color: #111111;
-  }
-  .navbar .nav-collapse .nav.pull-right {
-    float: none;
-    margin-left: 0;
-  }
-  .nav-collapse,
-  .nav-collapse.collapse {
-    height: 0;
-    overflow: hidden;
-  }
-  .navbar .btn-navbar {
-    display: block;
-  }
-  .navbar-static .navbar-inner {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-}
-
-@media (min-width: 980px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap-responsive.min.css b/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap-responsive.min.css
deleted file mode 100644
index d1b7f4b0b8..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap-responsive.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap Responsive v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap.css b/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap.css
deleted file mode 100644
index b06e082ef1..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}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}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{max-width:100%;width:auto\9;height:auto;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}@media print{*{text-shadow:none!important;color:#000!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover,a:focus{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;content:"";line-height:0}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.127659574468085%;*margin-left:2.074468085106383%}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%}.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%}.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%}.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%}.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%}.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%}.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%}.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%}.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%}.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%}.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%}.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%}.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%}.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%}.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%}.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%}[class*="span"].hide,.row-fluid [class*="span"].hide{display:none}[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;content:"";line-height:0}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;content:"";line-height:0}.container-fluid:after{clear:both}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px}small{font-size:85%}strong{font-weight:bold}em{font-style:italic}cite{font-style:normal}.muted{color:#999}a.muted:hover,a.muted:focus{color:#808080}.text-warning{color:#c09853}a.text-warning:hover,a.text-warning:focus{color:#a47e3c}.text-error{color:#b94a48}a.text-error:hover,a.text-error:focus{color:#953b39}.text-info{color:#3a87ad}a.text-info:hover,a.text-info:focus{color:#2d6987}.text-success{color:#468847}a.text-success:hover,a.text-success:focus{color:#356635}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{line-height:40px}h1{font-size:38.5px}h2{font-size:31.5px}h3{font-size:24.5px}h4{font-size:17.5px}h5{font-size:14px}h6{font-size:11.9px}h1 small{font-size:24.5px}h2 small{font-size:17.5px}h3 small{font-size:14px}h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eee}ul,ol{padding:0;margin:0 0 10px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}li{line-height:20px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}ul.inline,ol.inline{margin-left:0;list-style:none}ul.inline>li,ol.inline>li{display:inline-block;*display:inline;*zoom:1;padding-left:5px;padding-right:5px}dl{margin-bottom:20px}dt,dd{line-height:20px}dt{font-weight:bold}dd{margin-left:10px}.dl-horizontal{*zoom:1}.dl-horizontal:before,.dl-horizontal:after{display:table;content:"";line-height:0}.dl-horizontal:after{clear:both}.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}hr{margin:20px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:17.5px;font-weight:300;line-height:1.25}blockquote small{display:block;line-height:20px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:20px}code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;white-space:nowrap}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 20px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5}legend small{font-size:15px;color:#999}label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#555;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;vertical-align:middle}input,textarea,.uneditable-input{width:206px}textarea{height:auto}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#fff;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(82,168,236,.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(82,168,236,.6)}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;*margin-top:0;margin-top:1px \9;line-height:normal}input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto}select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px}select{width:220px;border:1px solid #ccc;background-color:#fff}select[multiple],select[size]{height:auto}select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.uneditable-input,.uneditable-textarea{color:#999;background-color:#fcfcfc;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);cursor:not-allowed}.uneditable-input{overflow:hidden;white-space:nowrap}.uneditable-textarea{width:auto;height:auto}input:-moz-placeholder,textarea:-moz-placeholder{color:#999}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999}.radio,.checkbox{min-height:20px;padding-left:20px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:926px}input.span11,textarea.span11,.uneditable-input.span11{width:846px}input.span10,textarea.span10,.uneditable-input.span10{width:766px}input.span9,textarea.span9,.uneditable-input.span9{width:686px}input.span8,textarea.span8,.uneditable-input.span8{width:606px}input.span7,textarea.span7,.uneditable-input.span7{width:526px}input.span6,textarea.span6,.uneditable-input.span6{width:446px}input.span5,textarea.span5,.uneditable-input.span5{width:366px}input.span4,textarea.span4,.uneditable-input.span4{width:286px}input.span3,textarea.span3,.uneditable-input.span3{width:206px}input.span2,textarea.span2,.uneditable-input.span2{width:126px}input.span1,textarea.span1,.uneditable-input.span1{width:46px}.controls-row{*zoom:1}.controls-row:before,.controls-row:after{display:table;content:"";line-height:0}.controls-row:after{clear:both}.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left}.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}.control-group.info .control-label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad}.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad}.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3}.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1}.form-actions:before,.form-actions:after{display:table;content:"";line-height:0}.form-actions:after{clear:both}.help-block,.help-inline{color:#595959}.help-block{display:block;margin-bottom:10px}.help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px}.input-append,.input-prepend{display:inline-block;margin-bottom:10px;vertical-align:middle;font-size:0;white-space:nowrap}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu,.input-append .popover,.input-prepend .popover{font-size:14px}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2}.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #fff;background-color:#eee;border:1px solid #ccc}.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input+.btn-group .btn:last-child,.input-append select+.btn-group .btn:last-child,.input-append .uneditable-input+.btn-group .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px}.input-append .add-on:last-child,.input-append .btn:last-child,.input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .btn-group:first-child{margin-left:0}input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;*zoom:1;margin-bottom:0;vertical-align:middle}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:10px}legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:20px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";line-height:0}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:180px}.form-horizontal .help-block{margin-bottom:0}.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px}.form-horizontal .form-actions{padding-left:180px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:20px}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child,.table-bordered tbody:first-child tr:first-child>th:first-child{-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px}.table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child,.table-bordered tbody:first-child tr:first-child>th:last-child{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px}.table-bordered thead:last-child tr:last-child>th:first-child,.table-bordered tbody:last-child tr:last-child>td:first-child,.table-bordered tbody:last-child tr:last-child>th:first-child,.table-bordered tfoot:last-child tr:last-child>td:first-child,.table-bordered tfoot:last-child tr:last-child>th:first-child{-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px}.table-bordered thead:last-child tr:last-child>th:last-child,.table-bordered tbody:last-child tr:last-child>td:last-child,.table-bordered tbody:last-child tr:last-child>th:last-child,.table-bordered tfoot:last-child tr:last-child>td:last-child,.table-bordered tfoot:last-child tr:last-child>th:last-child{-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px}.table-bordered tfoot+tbody:last-child tr:last-child td:first-child{-webkit-border-bottom-left-radius:0;-moz-border-radius-bottomleft:0;border-bottom-left-radius:0}.table-bordered tfoot+tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:0;-moz-border-radius-bottomright:0;border-bottom-right-radius:0}.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px}.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px}.table-striped tbody>tr:nth-child(odd)>td,.table-striped tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover tbody tr:hover>td,.table-hover tbody tr:hover>th{background-color:#f5f5f5}table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0}.table td.span1,.table th.span1{float:none;width:44px;margin-left:0}.table td.span2,.table th.span2{float:none;width:124px;margin-left:0}.table td.span3,.table th.span3{float:none;width:204px;margin-left:0}.table td.span4,.table th.span4{float:none;width:284px;margin-left:0}.table td.span5,.table th.span5{float:none;width:364px;margin-left:0}.table td.span6,.table th.span6{float:none;width:444px;margin-left:0}.table td.span7,.table th.span7{float:none;width:524px;margin-left:0}.table td.span8,.table th.span8{float:none;width:604px;margin-left:0}.table td.span9,.table th.span9{float:none;width:684px;margin-left:0}.table td.span10,.table th.span10{float:none;width:764px;margin-left:0}.table td.span11,.table th.span11{float:none;width:844px;margin-left:0}.table td.span12,.table th.span12{float:none;width:924px;margin-left:0}.table tbody tr.success>td{background-color:#dff0d8}.table tbody tr.error>td{background-color:#f2dede}.table tbody tr.warning>td{background-color:#fcf8e3}.table tbody tr.info>td{background-color:#d9edf7}.table-hover tbody tr.success:hover>td{background-color:#d0e9c6}.table-hover tbody tr.error:hover>td{background-color:#ebcccc}.table-hover tbody tr.warning:hover>td{background-color:#faf2cc}.table-hover tbody tr.info:hover>td{background-color:#c4e3f3}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{background-position:-216px -120px;width:16px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{background-position:-384px -120px;width:16px}.icon-folder-open{background-position:-408px -120px;width:16px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-submenu:hover>a,.dropdown-submenu:focus>a{text-decoration:none;color:#fff;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:default}.open{*z-index:1000}.open>.dropdown-menu{display:block}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0}.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#ccc;margin-top:5px;margin-right:-10px}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.dropdown .dropdown-menu .nav-header{padding-left:20px;padding-right:20px}.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:0;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #ccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05)}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover,.btn:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-left:0;padding-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#04c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#f89406;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{border-color:transparent;cursor:pointer;color:#08c;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333;text-decoration:none}.btn-group{position:relative;display:inline-block;*display:inline;*zoom:1;font-size:0;vertical-align:middle;white-space:nowrap;*margin-left:.3em}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{font-size:0;margin-top:10px;margin-bottom:10px}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px}.btn-group>.btn-mini{font-size:10.5px}.btn-group>.btn-small{font-size:11.9px}.btn-group>.btn-large{font-size:17.5px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,.125),inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,.125),inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 1px 0 0 rgba(255,255,255,.125),inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);*padding-top:5px;*padding-bottom:5px}.btn-group>.btn-mini+.dropdown-toggle{padding-left:5px;padding-right:5px;*padding-top:2px;*padding-bottom:2px}.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px}.btn-group>.btn-large+.dropdown-toggle{padding-left:12px;padding-right:12px;*padding-top:7px;*padding-bottom:7px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:8px;margin-left:0}.btn-large .caret{margin-top:6px}.btn-large .caret{border-left-width:5px;border-right-width:5px;border-top-width:5px}.btn-mini .caret,.btn-small .caret{margin-top:8px}.dropup .btn-large .caret{border-bottom-width:5px}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff}.btn-group-vertical{display:inline-block;*display:inline;*zoom:1}.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group-vertical>.btn+.btn{margin-left:0;margin-top:-1px}.btn-group-vertical>.btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0}.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert,.alert h4{color:#c09853}.alert h4{margin:0}.alert .close{position:relative;top:-2px;right:-21px;line-height:20px}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847}.alert-success h4{color:#468847}.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48}.alert-danger h4,.alert-error h4{color:#b94a48}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad}.alert-info h4{color:#3a87ad}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-left:0;margin-bottom:20px;list-style:none}.nav>li>a{display:block}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li>a>img{max-width:none}.nav>.pull-right{float:right}.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-left:15px;padding-right:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover,.nav-list>.active>a:focus{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";line-height:0}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover,.nav-tabs>li>a:focus{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover,.nav-tabs>.active>a:focus{color:#555;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover,.nav-pills>.active>a:focus{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px}.nav-tabs.nav-stacked>li>a:hover,.nav-tabs.nav-stacked>li>a:focus{border-color:#ddd;z-index:2}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.nav .dropdown-toggle .caret{border-top-color:#08c;border-bottom-color:#08c;margin-top:6px}.nav .dropdown-toggle:hover .caret,.nav .dropdown-toggle:focus .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .dropdown-toggle .caret{margin-top:8px}.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.nav>.dropdown.active>a:hover,.nav>.dropdown.active>a:focus{cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover,.nav>li.dropdown.open.active>a:focus{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret,.nav li.dropdown.open a:focus .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover,.tabs-stacked .open>a:focus{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;content:"";line-height:0}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover,.tabs-below>.nav-tabs>li>a:focus{border-bottom-color:transparent;border-top-color:#ddd}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover,.tabs-below>.nav-tabs>.active>a:focus{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover,.tabs-left>.nav-tabs>li>a:focus{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover,.tabs-left>.nav-tabs .active>a:focus{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover,.tabs-right>.nav-tabs>li>a:focus{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover,.tabs-right>.nav-tabs .active>a:focus{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.nav>.disabled>a{color:#999}.nav>.disabled>a:hover,.nav>.disabled>a:focus{text-decoration:none;background-color:transparent;cursor:default}.navbar{overflow:visible;margin-bottom:20px;*position:relative;*z-index:2}.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top,#fff,#f2f2f2);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:-o-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff2f2f2',GradientType=0);border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065);*zoom:1}.navbar-inner:before,.navbar-inner:after{display:table;content:"";line-height:0}.navbar-inner:after{clear:both}.navbar .container{width:auto}.nav-collapse.collapse{height:auto;overflow:visible}.navbar .brand{float:left;display:block;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.navbar .brand:hover,.navbar .brand:focus{text-decoration:none}.navbar-text{margin-bottom:0;line-height:40px;color:#777}.navbar-link{color:#777}.navbar-link:hover,.navbar-link:focus{color:#333}.navbar .divider-vertical{height:40px;margin:0 9px;border-left:1px solid #f2f2f2;border-right:1px solid #fff}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn,.navbar .input-prepend .btn-group,.navbar .input-append .btn-group{margin-top:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;content:"";line-height:0}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:5px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0}.navbar-search .search-query{margin-bottom:0;padding:4px 14px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.navbar-static-top{position:static;margin-bottom:0}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px}.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,.1);box-shadow:0 1px 10px rgba(0,0,0,.1)}.navbar-fixed-bottom{bottom:0}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,.1);box-shadow:0 -1px 10px rgba(0,0,0,.1)}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right;margin-right:0}.navbar .nav>li{float:left}.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777;text-decoration:none;text-shadow:0 1px 0 #fff}.navbar .nav .dropdown-toggle .caret{margin-top:8px}.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{background-color:transparent;color:#333;text-decoration:none}.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);box-shadow:inset 0 3px 8px rgba(0,0,0,0.125)}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#ededed;background-image:-moz-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e5e5e5));background-image:-webkit-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-o-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:linear-gradient(to bottom,#f2f2f2,#e5e5e5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffe5e5e5',GradientType=0);border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#e5e5e5;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:focus,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#fff;background-color:#e5e5e5;*background-color:#d9d9d9}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#ccc \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,0.2);position:absolute;top:-7px;left:9px}.navbar .nav>li>.dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:10px}.navbar-fixed-bottom .nav>li>.dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0,0,0,0.2);border-bottom:0;bottom:-7px;top:auto}.navbar-fixed-bottom .nav>li>.dropdown-menu:after{border-top:6px solid #fff;border-bottom:0;bottom:-6px;top:auto}.navbar .nav li.dropdown>a:hover .caret,.navbar .nav li.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{background-color:#e5e5e5;color:#555}.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777;border-bottom-color:#777}.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{left:auto;right:0}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{left:auto;right:12px}.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{left:auto;right:13px}.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{left:auto;right:100%;margin-left:0;margin-right:-1px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top,#222,#111);background-image:-webkit-gradient(linear,0 0,0 100%,from(#222),to(#111));background-image:-webkit-linear-gradient(top,#222,#111);background-image:-o-linear-gradient(top,#222,#111);background-image:linear-gradient(to bottom,#222,#111);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0);border-color:#252525}.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover,.navbar-inverse .brand:focus,.navbar-inverse .nav>li>a:focus{color:#fff}.navbar-inverse .brand{color:#999}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{background-color:transparent;color:#fff}.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#fff;background-color:#111}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover,.navbar-inverse .navbar-link:focus{color:#fff}.navbar-inverse .divider-vertical{border-left-color:#111;border-right-color:#222}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{background-color:#111;color:#fff}.navbar-inverse .nav li.dropdown>a:hover .caret,.navbar-inverse .nav li.dropdown>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-search .search-query{color:#fff;background-color:#515151;border-color:#111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1),0 1px 0 rgba(255,255,255,.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1),0 1px 0 rgba(255,255,255,.15);box-shadow:inset 0 1px 2px rgba(0,0,0,.1),0 1px 0 rgba(255,255,255,.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15);outline:0}.navbar-inverse .btn-navbar{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e0e0e;background-image:-moz-linear-gradient(top,#151515,#040404);background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));background-image:-webkit-linear-gradient(top,#151515,#040404);background-image:-o-linear-gradient(top,#151515,#040404);background-image:linear-gradient(to bottom,#151515,#040404);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515',endColorstr='#ff040404',GradientType=0);border-color:#040404 #040404 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#040404;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:focus,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#fff;background-color:#040404;*background-color:#000}.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000 \9}.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.breadcrumb>li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #fff}.breadcrumb>li>.divider{padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{margin:20px 0}.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination ul>li{display:inline}.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination ul>li>a:hover,.pagination ul>li>a:focus,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5}.pagination ul>.active>a,.pagination ul>.active>span{color:#999;cursor:default}.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>a:focus{color:#999;background-color:transparent;cursor:default}.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px}.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px}.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px}.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px}.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-top-left-radius:3px;-moz-border-radius-topleft:3px;border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;-moz-border-radius-bottomleft:3px;border-bottom-left-radius:3px}.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;-moz-border-radius-topright:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;-moz-border-radius-bottomright:3px;border-bottom-right-radius:3px}.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px}.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:0 6px;font-size:10.5px}.pager{margin:20px 0;list-style:none;text-align:center;*zoom:1}.pager:before,.pager:after{display:table;content:"";line-height:0}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f5f5}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;background-color:#fff;cursor:default}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:10%;left:50%;z-index:1050;width:560px;margin-left:-280px;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;outline:0}.modal.fade{-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out;top:-25%}.modal.fade.in{top:10%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-header h3{margin:0;line-height:30px}.modal-body{position:relative;overflow-y:auto;max-height:400px;padding:15px}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff;*zoom:1}.modal-footer:before,.modal-footer:after{display:table;content:"";line-height:0}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.tooltip{position:absolute;z-index:1030;display:block;visibility:visible;font-size:11px;line-height:1.4;opacity:0;filter:alpha(opacity=0)}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{margin-top:-3px;padding:5px 0}.tooltip.right{margin-left:3px;padding:0 5px}.tooltip.bottom{margin-top:3px;padding:5px 0}.tooltip.left{margin-left:-3px;padding:0 5px}.tooltip-inner{max-width:200px;padding:8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;background-color:#fff;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);white-space:normal}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{margin:0;padding:8px 14px;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.popover-title:empty{display:none}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);bottom:-11px}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#fff}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-left-width:0;border-right-color:#999;border-right-color:rgba(0,0,0,0.25)}.popover.right .arrow:after{left:1px;bottom:-10px;border-left-width:0;border-right-color:#fff}.popover.bottom .arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,0.25)}.popover.left .arrow:after{right:1px;border-right-width:0;border-left-color:#fff;bottom:-10px}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;content:"";line-height:0}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);box-shadow:0 1px 3px rgba(0,0,0,0.055);-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}a.thumbnail:hover,a.thumbnail:focus{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto}.thumbnail .caption{padding:9px;color:#555}.media,.media-body{overflow:hidden;*overflow:visible;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{margin-left:0;list-style:none}.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#fff;vertical-align:baseline;white-space:nowrap;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#999}.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding-left:9px;padding-right:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}.label:empty,.badge:empty{display:none}a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}.btn .label,.btn .badge{position:relative;top:-1px}.btn-mini .label,.btn-mini .badge{top:0}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{overflow:hidden;height:20px;margin-bottom:20px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.progress .bar{width:0;height:100%;color:#fff;float:left;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(to bottom,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf',endColorstr='#ff0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,.15),inset 0 -1px 0 rgba(0,0,0,.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,.15),inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 1px 0 0 rgba(0,0,0,.15),inset 0 -1px 0 rgba(0,0,0,.15)}.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffc43c35',GradientType=0)}.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(to bottom,#62c462,#57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff57a957',GradientType=0)}.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(to bottom,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff339bb9',GradientType=0)}.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0)}.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:20px;line-height:1}.carousel-inner{overflow:hidden;width:100%;position:relative}.carousel-inner>.item{display:none;position:relative;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{left:auto;right:15px}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-indicators{position:absolute;top:15px;right:15px;z-index:5;margin:0;list-style:none}.carousel-indicators li{display:block;float:left;width:10px;height:10px;margin-left:5px;text-indent:-999px;background-color:#ccc;background-color:rgba(255,255,255,0.25);border-radius:5px}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:15px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{color:#fff;line-height:20px}.carousel-caption h4{margin:0 0 5px}.carousel-caption p{margin-bottom:0}.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px}.hero-unit li{line-height:30px}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}.affix{position:fixed}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap.min.3.0.1.css b/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap.min.3.0.1.css
deleted file mode 100644
index 871123f956..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap.min.3.0.1.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap v3.0.1 by @fat and @mdo
- * Copyright 2013 Twitter, Inc.
- * Licensed under http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
- */
-
-/*! normalize.css v2.1.3 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a{background:transparent}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{height:0;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid #c0c0c0}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{padding:0;box-sizing:border-box}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:2cm .5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;height:auto;max-width:100%}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}@media(min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}.text-muted{color:#999}.text-primary{color:#428bca}.text-primary:hover{color:#3071a9}.text-warning{color:#c09853}.text-warning:hover{color:#a47e3c}.text-danger{color:#b94a48}.text-danger:hover{color:#953b39}.text-success{color:#468847}.text-success:hover{color:#356635}.text-info{color:#3a87ad}.text-info:hover{color:#2d6987}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{margin-top:20px;margin-bottom:10px}h1 small,h2 small,h3 small,h1 .small,h2 .small,h3 .small{font-size:65%}h4,h5,h6{margin-top:10px;margin-bottom:10px}h4 small,h5 small,h6 small,h4 .small,h5 .small,h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}.list-inline>li:first-child{padding-left:0}dl{margin-bottom:20px}dt,dd{line-height:1.428571429}dt{font-weight:bold}dd{margin-left:0}@media(min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25}blockquote p:last-child{margin-bottom:0}blockquote small{display:block;line-height:1.428571429;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small,blockquote.pull-right .small{text-align:right}blockquote.pull-right small:before,blockquote.pull-right .small:before{content:''}blockquote.pull-right small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.428571429}code,kbd,pre,samp{font-family:Monaco,Menlo,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;white-space:nowrap;background-color:#f9f2f4;border-radius:4px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.row{margin-right:-15px;margin-left:-15px}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.col-xs-1,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666666666666%}.col-xs-10{width:83.33333333333334%}.col-xs-9{width:75%}.col-xs-8{width:66.66666666666666%}.col-xs-7{width:58.333333333333336%}.col-xs-6{width:50%}.col-xs-5{width:41.66666666666667%}.col-xs-4{width:33.33333333333333%}.col-xs-3{width:25%}.col-xs-2{width:16.666666666666664%}.col-xs-1{width:8.333333333333332%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666666666666%}.col-xs-pull-10{right:83.33333333333334%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666666666666%}.col-xs-pull-7{right:58.333333333333336%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666666666667%}.col-xs-pull-4{right:33.33333333333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.666666666666664%}.col-xs-pull-1{right:8.333333333333332%}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666666666666%}.col-xs-push-10{left:83.33333333333334%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666666666666%}.col-xs-push-7{left:58.333333333333336%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666666666667%}.col-xs-push-4{left:33.33333333333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.666666666666664%}.col-xs-push-1{left:8.333333333333332%}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666666666666%}.col-xs-offset-10{margin-left:83.33333333333334%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666666666666%}.col-xs-offset-7{margin-left:58.333333333333336%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666666666667%}.col-xs-offset-4{margin-left:33.33333333333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.666666666666664%}.col-xs-offset-1{margin-left:8.333333333333332%}@media(min-width:768px){.container{width:750px}.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666666666666%}.col-sm-10{width:83.33333333333334%}.col-sm-9{width:75%}.col-sm-8{width:66.66666666666666%}.col-sm-7{width:58.333333333333336%}.col-sm-6{width:50%}.col-sm-5{width:41.66666666666667%}.col-sm-4{width:33.33333333333333%}.col-sm-3{width:25%}.col-sm-2{width:16.666666666666664%}.col-sm-1{width:8.333333333333332%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666666666666%}.col-sm-pull-10{right:83.33333333333334%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666666666666%}.col-sm-pull-7{right:58.333333333333336%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666666666667%}.col-sm-pull-4{right:33.33333333333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.666666666666664%}.col-sm-pull-1{right:8.333333333333332%}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666666666666%}.col-sm-push-10{left:83.33333333333334%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666666666666%}.col-sm-push-7{left:58.333333333333336%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666666666667%}.col-sm-push-4{left:33.33333333333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.666666666666664%}.col-sm-push-1{left:8.333333333333332%}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666666666666%}.col-sm-offset-10{margin-left:83.33333333333334%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666666666666%}.col-sm-offset-7{margin-left:58.333333333333336%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666666666667%}.col-sm-offset-4{margin-left:33.33333333333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.666666666666664%}.col-sm-offset-1{margin-left:8.333333333333332%}}@media(min-width:992px){.container{width:970px}.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666666666666%}.col-md-10{width:83.33333333333334%}.col-md-9{width:75%}.col-md-8{width:66.66666666666666%}.col-md-7{width:58.333333333333336%}.col-md-6{width:50%}.col-md-5{width:41.66666666666667%}.col-md-4{width:33.33333333333333%}.col-md-3{width:25%}.col-md-2{width:16.666666666666664%}.col-md-1{width:8.333333333333332%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666666666666%}.col-md-pull-10{right:83.33333333333334%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666666666666%}.col-md-pull-7{right:58.333333333333336%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666666666667%}.col-md-pull-4{right:33.33333333333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.666666666666664%}.col-md-pull-1{right:8.333333333333332%}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666666666666%}.col-md-push-10{left:83.33333333333334%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666666666666%}.col-md-push-7{left:58.333333333333336%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666666666667%}.col-md-push-4{left:33.33333333333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.666666666666664%}.col-md-push-1{left:8.333333333333332%}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666666666666%}.col-md-offset-10{margin-left:83.33333333333334%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666666666666%}.col-md-offset-7{margin-left:58.333333333333336%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666666666667%}.col-md-offset-4{margin-left:33.33333333333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.666666666666664%}.col-md-offset-1{margin-left:8.333333333333332%}}@media(min-width:1200px){.container{width:1170px}.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666666666666%}.col-lg-10{width:83.33333333333334%}.col-lg-9{width:75%}.col-lg-8{width:66.66666666666666%}.col-lg-7{width:58.333333333333336%}.col-lg-6{width:50%}.col-lg-5{width:41.66666666666667%}.col-lg-4{width:33.33333333333333%}.col-lg-3{width:25%}.col-lg-2{width:16.666666666666664%}.col-lg-1{width:8.333333333333332%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666666666666%}.col-lg-pull-10{right:83.33333333333334%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666666666666%}.col-lg-pull-7{right:58.333333333333336%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666666666667%}.col-lg-pull-4{right:33.33333333333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.666666666666664%}.col-lg-pull-1{right:8.333333333333332%}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666666666666%}.col-lg-push-10{left:83.33333333333334%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666666666666%}.col-lg-push-7{left:58.333333333333336%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666666666667%}.col-lg-push-4{left:33.33333333333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.666666666666664%}.col-lg-push-1{left:8.333333333333332%}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666666666666%}.col-lg-offset-10{margin-left:83.33333333333334%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666666666666%}.col-lg-offset-7{margin-left:58.333333333333336%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666666666667%}.col-lg-offset-4{margin-left:33.33333333333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.666666666666664%}.col-lg-offset-1{margin-left:8.333333333333332%}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{display:table-column;float:none}table td[class*="col-"],table th[class*="col-"]{display:table-cell;float:none}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc}@media(max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-x:scroll;overflow-y:hidden;border:1px solid #ddd;-ms-overflow-style:-ms-autohiding-scrollbar;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}select[multiple],select[size]{height:auto}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto}output{display:block;padding-top:7px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle}.form-control:-moz-placeholder{color:#999}.form-control::-moz-placeholder{color:#999}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee}textarea.form-control{height:auto}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;padding-left:20px;margin-top:10px;margin-bottom:10px;vertical-align:middle}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:normal;vertical-align:middle;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm{height:auto}.input-lg{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:45px;line-height:45px}textarea.input-lg{height:auto}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#c09853}.has-warning .form-control{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.has-warning .input-group-addon{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#b94a48}.has-error .form-control{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.has-error .input-group-addon{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#468847}.has-success .form-control{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.has-success .input-group-addon{color:#468847;background-color:#dff0d8;border-color:#468847}.form-control-static{margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media(min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block}.form-inline .radio,.form-inline .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-control-static{padding-top:7px}@media(min-width:768px){.form-horizontal .control-label{text-align:right}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-link{font-weight:normal;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-xs{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs{padding:1px 5px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';-webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;line-height:1;-moz-osx-font-smoothing:grayscale}.glyphicon:empty{width:1em}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid #000;border-right:4px solid transparent;border-bottom:0 dotted;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#428bca;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0 dotted;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media(min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.btn-default .caret{border-top-color:#333}.btn-primary .caret,.btn-success .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret{border-top-color:#fff}.dropup .btn-default .caret{border-bottom-color:#333}.dropup .btn-primary .caret,.dropup .btn-success .caret,.dropup .btn-warning .caret,.dropup .btn-danger .caret,.dropup .btn-info .caret{border-bottom-color:#fff}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar .btn-group{float:left}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group,.btn-toolbar>.btn-group+.btn-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:5px 10px;padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-right-radius:0;border-bottom-left-radius:4px;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;border-collapse:separate;table-layout:fixed}.btn-group-justified .btn{display:table-cell;float:none;width:1%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group.col{float:none;padding-right:0;padding-left:0}.input-group .form-control{width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:45px;line-height:45px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;white-space:nowrap}.input-group-btn:first-child>.btn{margin-right:-1px}.input-group-btn:last-child>.btn{margin-left:-1px}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-4px}.input-group-btn>.btn:hover,.input-group-btn>.btn:active{z-index:2}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .open>a .caret,.nav .open>a:hover .caret,.nav .open>a:focus .caret{border-top-color:#2a6496;border-bottom-color:#2a6496}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media(min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-pills>li.active>a .caret,.nav-pills>li.active>a:hover .caret,.nav-pills>li.active>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media(min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav .caret{border-top-color:#428bca;border-bottom-color:#428bca}.nav a:hover .caret{border-top-color:#2a6496;border-bottom-color:#2a6496}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}@media(min-width:768px){.navbar{border-radius:4px}}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}@media(min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse.in{overflow-y:auto}@media(min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:auto}.navbar-collapse .navbar-nav.navbar-left:first-child{margin-left:-15px}.navbar-collapse .navbar-nav.navbar-right:last-child{margin-right:-15px}.navbar-collapse .navbar-text:last-child{margin-right:0}}.container>.navbar-header,.container>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media(min-width:768px){.container>.navbar-header,.container>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media(min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media(min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media(min-width:768px){.navbar>.container .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;border:1px solid transparent;border-radius:4px}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media(min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media(max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media(min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}@media(min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}@media(min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}}@media(max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media(min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-nav.pull-right>li>.dropdown-menu,.navbar-nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-text{float:left;margin-top:15px;margin-bottom:15px}@media(min-width:768px){.navbar-text{margin-right:15px;margin-left:15px}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#ccc}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.dropdown>a:hover .caret,.navbar-default .navbar-nav>.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.open>a .caret,.navbar-default .navbar-nav>.open>a:hover .caret,.navbar-default .navbar-nav>.open>a:focus .caret{border-top-color:#555;border-bottom-color:#555}.navbar-default .navbar-nav>.dropdown>a .caret{border-top-color:#777;border-bottom-color:#777}@media(max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-nav>.dropdown>a .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .navbar-nav>.open>a .caret,.navbar-inverse .navbar-nav>.open>a:hover .caret,.navbar-inverse .navbar-nav>.open>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}@media(max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{background-color:#eee}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;cursor:default;background-color:#428bca;border-color:#428bca}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#999;border-radius:10px}.badge:empty{display:none}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.btn .badge{position:relative;top:-1px}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#eee}.jumbotron h1{line-height:1;color:inherit}.jumbotron p{line-height:1.4}.container .jumbotron{border-radius:6px}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-right:60px;padding-left:60px}.jumbotron h1{font-size:63px}}.thumbnail{display:inline-block;display:block;height:auto;max-width:100%;padding:4px;margin-bottom:20px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img{display:block;height:auto;max-width:100%;margin-right:auto;margin-left:auto}a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#428bca}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#356635}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#2d6987}.alert-warning{color:#c09853;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#a47e3c}.alert-danger{color:#b94a48;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#953b39}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active,a.list-group-item.active:hover,a.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading,a.list-group-item.active:hover .list-group-item-heading,a.list-group-item.active:focus .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .list-group-item-text,a.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-body{padding:15px}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0}.panel>.list-group .list-group-item:first-child{border-top-right-radius:0;border-top-left-radius:0}.panel>.list-group .list-group-item:last-child{border-bottom:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table,.panel>.table-responsive{margin-bottom:0}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive{border-top:1px solid #ddd}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:last-child>th,.panel>.table-responsive>.table-bordered>thead>tr:last-child>th,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th,.panel>.table-bordered>thead>tr:last-child>td,.panel>.table-responsive>.table-bordered>thead>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-group .panel{margin-bottom:0;overflow:hidden;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-heading>.dropdown .caret{border-color:#333 transparent}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-heading>.dropdown .caret{border-color:#fff transparent}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading>.dropdown .caret{border-color:#468847 transparent}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#c09853;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading>.dropdown .caret{border-color:#c09853 transparent}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#b94a48;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading>.dropdown .caret{border-color:#b94a48 transparent}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ebccd1}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading>.dropdown .caret{border-color:#3a87ad transparent}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:auto;overflow-y:scroll}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{position:relative;z-index:1050;width:auto;padding:10px;margin-right:auto;margin-left:auto}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{min-height:16.428571429px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.428571429}.modal-body{position:relative;padding:20px}.modal-footer{padding:19px 20px 20px;margin-top:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media screen and (min-width:768px){.modal-dialog{width:600px;padding-top:30px;padding-bottom:30px}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0;content:" "}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0;content:" "}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0;content:" "}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0;content:" "}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;height:auto;max-width:100%;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6);opacity:.5;filter:alpha(opacity=50)}.carousel-control.left{background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.5)),to(rgba(0,0,0,0.0001)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.5) 0),color-stop(rgba(0,0,0,0.0001) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000',endColorstr='#00000000',GradientType=1)}.carousel-control.right{right:0;left:auto;background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.0001)),to(rgba(0,0,0,0.5)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.0001) 0),color-stop(rgba(0,0,0,0.5) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#80000000',GradientType=1)}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .glyphicon-chevron-left{left:50%}.carousel-control .icon-next,.carousel-control .glyphicon-chevron-right{right:50%}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicons-chevron-left,.carousel-control .glyphicons-chevron-right,.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;margin-left:-15px;font-size:30px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after{display:table;content:" "}.clearfix:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,tr.visible-xs,th.visible-xs,td.visible-xs{display:none!important}@media(max-width:767px){.visible-xs{display:block!important}tr.visible-xs{display:table-row!important}th.visible-xs,td.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-xs.visible-sm{display:block!important}tr.visible-xs.visible-sm{display:table-row!important}th.visible-xs.visible-sm,td.visible-xs.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-xs.visible-md{display:block!important}tr.visible-xs.visible-md{display:table-row!important}th.visible-xs.visible-md,td.visible-xs.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-xs.visible-lg{display:block!important}tr.visible-xs.visible-lg{display:table-row!important}th.visible-xs.visible-lg,td.visible-xs.visible-lg{display:table-cell!important}}.visible-sm,tr.visible-sm,th.visible-sm,td.visible-sm{display:none!important}@media(max-width:767px){.visible-sm.visible-xs{display:block!important}tr.visible-sm.visible-xs{display:table-row!important}th.visible-sm.visible-xs,td.visible-sm.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-sm{display:block!important}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-sm.visible-md{display:block!important}tr.visible-sm.visible-md{display:table-row!important}th.visible-sm.visible-md,td.visible-sm.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-sm.visible-lg{display:block!important}tr.visible-sm.visible-lg{display:table-row!important}th.visible-sm.visible-lg,td.visible-sm.visible-lg{display:table-cell!important}}.visible-md,tr.visible-md,th.visible-md,td.visible-md{display:none!important}@media(max-width:767px){.visible-md.visible-xs{display:block!important}tr.visible-md.visible-xs{display:table-row!important}th.visible-md.visible-xs,td.visible-md.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-md.visible-sm{display:block!important}tr.visible-md.visible-sm{display:table-row!important}th.visible-md.visible-sm,td.visible-md.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-md{display:block!important}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-md.visible-lg{display:block!important}tr.visible-md.visible-lg{display:table-row!important}th.visible-md.visible-lg,td.visible-md.visible-lg{display:table-cell!important}}.visible-lg,tr.visible-lg,th.visible-lg,td.visible-lg{display:none!important}@media(max-width:767px){.visible-lg.visible-xs{display:block!important}tr.visible-lg.visible-xs{display:table-row!important}th.visible-lg.visible-xs,td.visible-lg.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-lg.visible-sm{display:block!important}tr.visible-lg.visible-sm{display:table-row!important}th.visible-lg.visible-sm,td.visible-lg.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-lg.visible-md{display:block!important}tr.visible-lg.visible-md{display:table-row!important}th.visible-lg.visible-md,td.visible-lg.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-lg{display:block!important}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}}.hidden-xs{display:block!important}tr.hidden-xs{display:table-row!important}th.hidden-xs,td.hidden-xs{display:table-cell!important}@media(max-width:767px){.hidden-xs,tr.hidden-xs,th.hidden-xs,td.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-xs.hidden-sm,tr.hidden-xs.hidden-sm,th.hidden-xs.hidden-sm,td.hidden-xs.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-xs.hidden-md,tr.hidden-xs.hidden-md,th.hidden-xs.hidden-md,td.hidden-xs.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-xs.hidden-lg,tr.hidden-xs.hidden-lg,th.hidden-xs.hidden-lg,td.hidden-xs.hidden-lg{display:none!important}}.hidden-sm{display:block!important}tr.hidden-sm{display:table-row!important}th.hidden-sm,td.hidden-sm{display:table-cell!important}@media(max-width:767px){.hidden-sm.hidden-xs,tr.hidden-sm.hidden-xs,th.hidden-sm.hidden-xs,td.hidden-sm.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-sm,tr.hidden-sm,th.hidden-sm,td.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-sm.hidden-md,tr.hidden-sm.hidden-md,th.hidden-sm.hidden-md,td.hidden-sm.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-sm.hidden-lg,tr.hidden-sm.hidden-lg,th.hidden-sm.hidden-lg,td.hidden-sm.hidden-lg{display:none!important}}.hidden-md{display:block!important}tr.hidden-md{display:table-row!important}th.hidden-md,td.hidden-md{display:table-cell!important}@media(max-width:767px){.hidden-md.hidden-xs,tr.hidden-md.hidden-xs,th.hidden-md.hidden-xs,td.hidden-md.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-md.hidden-sm,tr.hidden-md.hidden-sm,th.hidden-md.hidden-sm,td.hidden-md.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-md,tr.hidden-md,th.hidden-md,td.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-md.hidden-lg,tr.hidden-md.hidden-lg,th.hidden-md.hidden-lg,td.hidden-md.hidden-lg{display:none!important}}.hidden-lg{display:block!important}tr.hidden-lg{display:table-row!important}th.hidden-lg,td.hidden-lg{display:table-cell!important}@media(max-width:767px){.hidden-lg.hidden-xs,tr.hidden-lg.hidden-xs,th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm,tr.hidden-lg.hidden-sm,th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md,tr.hidden-lg.hidden-md,th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-lg,tr.hidden-lg,th.hidden-lg,td.hidden-lg{display:none!important}}.visible-print,tr.visible-print,th.visible-print,td.visible-print{display:none!important}@media print{.visible-print{display:block!important}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}.hidden-print,tr.hidden-print,th.hidden-print,td.hidden-print{display:none!important}}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap.min.css b/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap.min.css
deleted file mode 100644
index c10c7f417f..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}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}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover,a:focus{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%}.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%}.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%}.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%}.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%}.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%}.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%}.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%}.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%}.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%}.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%}.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%}.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%}.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%}.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%}.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%}[class*="span"].hide,.row-fluid [class*="span"].hide{display:none}[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;line-height:0;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;line-height:0;content:""}.container-fluid:after{clear:both}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px}small{font-size:85%}strong{font-weight:bold}em{font-style:italic}cite{font-style:normal}.muted{color:#999}a.muted:hover,a.muted:focus{color:#808080}.text-warning{color:#c09853}a.text-warning:hover,a.text-warning:focus{color:#a47e3c}.text-error{color:#b94a48}a.text-error:hover,a.text-error:focus{color:#953b39}.text-info{color:#3a87ad}a.text-info:hover,a.text-info:focus{color:#2d6987}.text-success{color:#468847}a.text-success:hover,a.text-success:focus{color:#356635}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{line-height:40px}h1{font-size:38.5px}h2{font-size:31.5px}h3{font-size:24.5px}h4{font-size:17.5px}h5{font-size:14px}h6{font-size:11.9px}h1 small{font-size:24.5px}h2 small{font-size:17.5px}h3 small{font-size:14px}h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eee}ul,ol{padding:0;margin:0 0 10px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}li{line-height:20px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}ul.inline,ol.inline{margin-left:0;list-style:none}ul.inline>li,ol.inline>li{display:inline-block;*display:inline;padding-right:5px;padding-left:5px;*zoom:1}dl{margin-bottom:20px}dt,dd{line-height:20px}dt{font-weight:bold}dd{margin-left:10px}.dl-horizontal{*zoom:1}.dl-horizontal:before,.dl-horizontal:after{display:table;line-height:0;content:""}.dl-horizontal:after{clear:both}.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}hr{margin:20px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:17.5px;font-weight:300;line-height:1.25}blockquote small{display:block;line-height:20px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:20px}code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;white-space:nowrap;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 20px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5}legend small{font-size:15px;color:#999}label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#555;vertical-align:middle;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}input,textarea,.uneditable-input{width:206px}textarea{height:auto}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#fff;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;*margin-top:0;line-height:normal}input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto}select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px}select{width:220px;background-color:#fff;border:1px solid #ccc}select[multiple],select[size]{height:auto}select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.uneditable-input,.uneditable-textarea{color:#999;cursor:not-allowed;background-color:#fcfcfc;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}.uneditable-input{overflow:hidden;white-space:nowrap}.uneditable-textarea{width:auto;height:auto}input:-moz-placeholder,textarea:-moz-placeholder{color:#999}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999}.radio,.checkbox{min-height:20px;padding-left:20px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:926px}input.span11,textarea.span11,.uneditable-input.span11{width:846px}input.span10,textarea.span10,.uneditable-input.span10{width:766px}input.span9,textarea.span9,.uneditable-input.span9{width:686px}input.span8,textarea.span8,.uneditable-input.span8{width:606px}input.span7,textarea.span7,.uneditable-input.span7{width:526px}input.span6,textarea.span6,.uneditable-input.span6{width:446px}input.span5,textarea.span5,.uneditable-input.span5{width:366px}input.span4,textarea.span4,.uneditable-input.span4{width:286px}input.span3,textarea.span3,.uneditable-input.span3{width:206px}input.span2,textarea.span2,.uneditable-input.span2{width:126px}input.span1,textarea.span1,.uneditable-input.span1{width:46px}.controls-row{*zoom:1}.controls-row:before,.controls-row:after{display:table;line-height:0;content:""}.controls-row:after{clear:both}.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left}.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}.control-group.info .control-label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad}.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad}.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3}.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1}.form-actions:before,.form-actions:after{display:table;line-height:0;content:""}.form-actions:after{clear:both}.help-block,.help-inline{color:#595959}.help-block{display:block;margin-bottom:10px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-append,.input-prepend{display:inline-block;margin-bottom:10px;font-size:0;white-space:nowrap;vertical-align:middle}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu,.input-append .popover,.input-prepend .popover{font-size:14px}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2}.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #fff;background-color:#eee;border:1px solid #ccc}.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input+.btn-group .btn:last-child,.input-append select+.btn-group .btn:last-child,.input-append .uneditable-input+.btn-group .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px}.input-append .add-on:last-child,.input-append .btn:last-child,.input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .btn-group:first-child{margin-left:0}input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;vertical-align:middle;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:10px}legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:20px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;line-height:0;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:180px}.form-horizontal .help-block{margin-bottom:0}.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px}.form-horizontal .form-actions{padding-left:180px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:20px}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child,.table-bordered tbody:first-child tr:first-child>th:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child,.table-bordered tbody:first-child tr:first-child>th:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child>th:first-child,.table-bordered tbody:last-child tr:last-child>td:first-child,.table-bordered tbody:last-child tr:last-child>th:first-child,.table-bordered tfoot:last-child tr:last-child>td:first-child,.table-bordered tfoot:last-child tr:last-child>th:first-child{-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child>th:last-child,.table-bordered tbody:last-child tr:last-child>td:last-child,.table-bordered tbody:last-child tr:last-child>th:last-child,.table-bordered tfoot:last-child tr:last-child>td:last-child,.table-bordered tfoot:last-child tr:last-child>th:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-bordered tfoot+tbody:last-child tr:last-child td:first-child{-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-moz-border-radius-bottomleft:0}.table-bordered tfoot+tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-moz-border-radius-bottomright:0}.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-striped tbody>tr:nth-child(odd)>td,.table-striped tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover tbody tr:hover>td,.table-hover tbody tr:hover>th{background-color:#f5f5f5}table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0}.table td.span1,.table th.span1{float:none;width:44px;margin-left:0}.table td.span2,.table th.span2{float:none;width:124px;margin-left:0}.table td.span3,.table th.span3{float:none;width:204px;margin-left:0}.table td.span4,.table th.span4{float:none;width:284px;margin-left:0}.table td.span5,.table th.span5{float:none;width:364px;margin-left:0}.table td.span6,.table th.span6{float:none;width:444px;margin-left:0}.table td.span7,.table th.span7{float:none;width:524px;margin-left:0}.table td.span8,.table th.span8{float:none;width:604px;margin-left:0}.table td.span9,.table th.span9{float:none;width:684px;margin-left:0}.table td.span10,.table th.span10{float:none;width:764px;margin-left:0}.table td.span11,.table th.span11{float:none;width:844px;margin-left:0}.table td.span12,.table th.span12{float:none;width:924px;margin-left:0}.table tbody tr.success>td{background-color:#dff0d8}.table tbody tr.error>td{background-color:#f2dede}.table tbody tr.warning>td{background-color:#fcf8e3}.table tbody tr.info>td{background-color:#d9edf7}.table-hover tbody tr.success:hover>td{background-color:#d0e9c6}.table-hover tbody tr.error:hover>td{background-color:#ebcccc}.table-hover tbody tr.warning:hover>td{background-color:#faf2cc}.table-hover tbody tr.info:hover>td{background-color:#c4e3f3}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{width:16px;background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{width:16px;background-position:-384px -120px}.icon-folder-open{width:16px;background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-submenu:hover>a,.dropdown-submenu:focus>a{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open{*z-index:1000}.open>.dropdown-menu{display:block}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;border-color:transparent;border-left-color:#ccc;border-style:solid;border-width:5px 0 5px 5px;content:" "}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.dropdown .dropdown-menu .nav-header{padding-right:20px;padding-left:20px}.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #ccc;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover,.btn:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#04c;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{color:#08c;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333;text-decoration:none}.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:10px;margin-bottom:10px;font-size:0}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px}.btn-group>.btn-mini{font-size:10.5px}.btn-group>.btn-small{font-size:11.9px}.btn-group>.btn-large{font-size:17.5px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{*padding-top:5px;padding-right:8px;*padding-bottom:5px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini+.dropdown-toggle{*padding-top:2px;padding-right:5px;*padding-bottom:2px;padding-left:5px}.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px}.btn-group>.btn-large+.dropdown-toggle{*padding-top:7px;padding-right:12px;*padding-bottom:7px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:8px;margin-left:0}.btn-large .caret{margin-top:6px}.btn-large .caret{border-top-width:5px;border-right-width:5px;border-left-width:5px}.btn-mini .caret,.btn-small .caret{margin-top:8px}.dropup .btn-large .caret{border-bottom-width:5px}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff}.btn-group-vertical{display:inline-block;*display:inline;*zoom:1}.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group-vertical>.btn+.btn{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0}.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert,.alert h4{color:#c09853}.alert h4{margin:0}.alert .close{position:relative;top:-2px;right:-21px;line-height:20px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success h4{color:#468847}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger h4,.alert-error h4{color:#b94a48}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info h4{color:#3a87ad}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:20px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li>a>img{max-width:none}.nav>.pull-right{float:right}.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover,.nav-list>.active>a:focus{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;line-height:0;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover,.nav-tabs>li>a:focus{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover,.nav-tabs>.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover,.nav-pills>.active>a:focus{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-topleft:4px}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-moz-border-radius-bottomleft:4px}.nav-tabs.nav-stacked>li>a:hover,.nav-tabs.nav-stacked>li>a:focus{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.nav .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav .dropdown-toggle:hover .caret,.nav .dropdown-toggle:focus .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .dropdown-toggle .caret{margin-top:8px}.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.nav>.dropdown.active>a:hover,.nav>.dropdown.active>a:focus{cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover,.nav>li.dropdown.open.active>a:focus{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret,.nav li.dropdown.open a:focus .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover,.tabs-stacked .open>a:focus{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;line-height:0;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover,.tabs-below>.nav-tabs>li>a:focus{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover,.tabs-below>.nav-tabs>.active>a:focus{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover,.tabs-left>.nav-tabs>li>a:focus{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover,.tabs-left>.nav-tabs .active>a:focus{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover,.tabs-right>.nav-tabs>li>a:focus{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover,.tabs-right>.nav-tabs .active>a:focus{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.nav>.disabled>a{color:#999}.nav>.disabled>a:hover,.nav>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent}.navbar{*position:relative;*z-index:2;margin-bottom:20px;overflow:visible}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top,#fff,#f2f2f2);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:-o-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);background-repeat:repeat-x;border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff2f2f2',GradientType=0);*zoom:1;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.navbar-inner:before,.navbar-inner:after{display:table;line-height:0;content:""}.navbar-inner:after{clear:both}.navbar .container{width:auto}.nav-collapse.collapse{height:auto;overflow:visible}.navbar .brand{display:block;float:left;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.navbar .brand:hover,.navbar .brand:focus{text-decoration:none}.navbar-text{margin-bottom:0;line-height:40px;color:#777}.navbar-link{color:#777}.navbar-link:hover,.navbar-link:focus{color:#333}.navbar .divider-vertical{height:40px;margin:0 9px;border-right:1px solid #fff;border-left:1px solid #f2f2f2}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn,.navbar .input-prepend .btn-group,.navbar .input-append .btn-group{margin-top:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;line-height:0;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:5px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0}.navbar-search .search-query{padding:4px 14px;margin-bottom:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.navbar-static-top{position:static;margin-bottom:0}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px}.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,0.1);box-shadow:0 1px 10px rgba(0,0,0,0.1)}.navbar-fixed-bottom{bottom:0}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,0.1);box-shadow:0 -1px 10px rgba(0,0,0,0.1)}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right;margin-right:0}.navbar .nav>li{float:left}.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777;text-decoration:none;text-shadow:0 1px 0 #fff}.navbar .nav .dropdown-toggle .caret{margin-top:8px}.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{color:#333;text-decoration:none;background-color:transparent}.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);box-shadow:inset 0 3px 8px rgba(0,0,0,0.125)}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#ededed;*background-color:#e5e5e5;background-image:-moz-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e5e5e5));background-image:-webkit-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-o-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:linear-gradient(to bottom,#f2f2f2,#e5e5e5);background-repeat:repeat-x;border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffe5e5e5',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:focus,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#fff;background-color:#e5e5e5;*background-color:#d9d9d9}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#ccc \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .nav>li>.dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .nav>li>.dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .nav>li>.dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .nav>li>.dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown>a:hover .caret,.navbar .nav li.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{color:#555;background-color:#e5e5e5}.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777;border-bottom-color:#777}.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{right:13px;left:auto}.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top,#222,#111);background-image:-webkit-gradient(linear,0 0,0 100%,from(#222),to(#111));background-image:-webkit-linear-gradient(top,#222,#111);background-image:-o-linear-gradient(top,#222,#111);background-image:linear-gradient(to bottom,#222,#111);background-repeat:repeat-x;border-color:#252525;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)}.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover,.navbar-inverse .brand:focus,.navbar-inverse .nav>li>a:focus{color:#fff}.navbar-inverse .brand{color:#999}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#fff;background-color:#111}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover,.navbar-inverse .navbar-link:focus{color:#fff}.navbar-inverse .divider-vertical{border-right-color:#222;border-left-color:#111}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{color:#fff;background-color:#111}.navbar-inverse .nav li.dropdown>a:hover .caret,.navbar-inverse .nav li.dropdown>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-search .search-query{color:#fff;background-color:#515151;border-color:#111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-inverse .btn-navbar{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e0e0e;*background-color:#040404;background-image:-moz-linear-gradient(top,#151515,#040404);background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));background-image:-webkit-linear-gradient(top,#151515,#040404);background-image:-o-linear-gradient(top,#151515,#040404);background-image:linear-gradient(to bottom,#151515,#040404);background-repeat:repeat-x;border-color:#040404 #040404 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515',endColorstr='#ff040404',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:focus,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#fff;background-color:#040404;*background-color:#000}.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000 \9}.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.breadcrumb>li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb>li>.divider{padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{margin:20px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination ul>li{display:inline}.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination ul>li>a:hover,.pagination ul>li>a:focus,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5}.pagination ul>.active>a,.pagination ul>.active>span{color:#999;cursor:default}.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>a:focus{color:#999;cursor:default;background-color:transparent}.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px}.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-moz-border-radius-topleft:3px}.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-moz-border-radius-topright:3px;-moz-border-radius-bottomright:3px}.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px}.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:0 6px;font-size:10.5px}.pager{margin:20px 0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;line-height:0;content:""}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f5f5}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:default;background-color:#fff}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:10%;left:50%;z-index:1050;width:560px;margin-left:-280px;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;outline:0;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:10%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-header h3{margin:0;line-height:30px}.modal-body{position:relative;max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;line-height:0;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.tooltip{position:absolute;z-index:1030;display:block;font-size:11px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.popover-title:empty{display:none}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;line-height:0;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);box-shadow:0 1px 3px rgba(0,0,0,0.055);-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}a.thumbnail:hover,a.thumbnail:focus{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#555}.media,.media-body{overflow:hidden;*overflow:visible;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{margin-left:0;list-style:none}.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding-right:9px;padding-left:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}.label:empty,.badge:empty{display:none}a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}.btn .label,.btn .badge{position:relative;top:-1px}.btn-mini .label,.btn-mini .badge{top:0}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(to bottom,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf',endColorstr='#ff0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15)}.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffc43c35',GradientType=0)}.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(to bottom,#62c462,#57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff57a957',GradientType=0)}.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(to bottom,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff339bb9',GradientType=0)}.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0)}.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:20px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-indicators{position:absolute;top:15px;right:15px;z-index:5;margin:0;list-style:none}.carousel-indicators li{display:block;float:left;width:10px;height:10px;margin-left:5px;text-indent:-999px;background-color:#ccc;background-color:rgba(255,255,255,0.25);border-radius:5px}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:15px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{line-height:20px;color:#fff}.carousel-caption h4{margin:0 0 5px}.carousel-caption p{margin-bottom:0}.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit li{line-height:30px}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}.affix{position:fixed}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/css/responsive.css b/src/Umbraco.Web.UI.Client/lib/bootstrap/css/responsive.css
deleted file mode 100644
index 7cc4d69a2a..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/css/responsive.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap Responsive v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;content:"";line-height:0}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;content:"";line-height:0}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-left:20px;padding-right:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-left:-20px;margin-right:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;clear:none;width:auto;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{float:none;display:block;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;left:20px;right:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-left:10px;padding-right:10px}.media .pull-left,.media .pull-right{float:none;display:block;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;left:10px;right:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-left:10px;padding-right:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111}.nav-collapse.in .btn-group{margin-top:5px;padding:0}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;float:none;display:none;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{overflow:hidden;height:0}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-left:10px;padding-right:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/img/glyphicons-halflings-white.png b/src/Umbraco.Web.UI.Client/lib/bootstrap/img/glyphicons-halflings-white.png
deleted file mode 100644
index 3bf6484a29..0000000000
Binary files a/src/Umbraco.Web.UI.Client/lib/bootstrap/img/glyphicons-halflings-white.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/img/glyphicons-halflings.png b/src/Umbraco.Web.UI.Client/lib/bootstrap/img/glyphicons-halflings.png
deleted file mode 100644
index a996999320..0000000000
Binary files a/src/Umbraco.Web.UI.Client/lib/bootstrap/img/glyphicons-halflings.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/accordion.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/accordion.less
deleted file mode 100644
index d63523bc8c..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/accordion.less
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Accordion
-// --------------------------------------------------
-
-
-// Parent container
-.accordion {
-  margin-bottom: @baseLineHeight;
-}
-
-// Group == heading + body
-.accordion-group {
-  margin-bottom: 2px;
-  border: 1px solid #e5e5e5;
-  .border-radius(@baseBorderRadius);
-}
-.accordion-heading {
-  border-bottom: 0;
-}
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
-}
-
-// General toggle styles
-.accordion-toggle {
-  cursor: pointer;
-}
-
-// Inner needs the styles because you can't animate properly with any styles on the element
-.accordion-inner {
-  padding: 9px 15px;
-  border-top: 1px solid #e5e5e5;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/alerts.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/alerts.less
deleted file mode 100644
index 0116b191b3..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/alerts.less
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Alerts
-// --------------------------------------------------
-
-
-// Base styles
-// -------------------------
-
-.alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: @baseLineHeight;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-  background-color: @warningBackground;
-  border: 1px solid @warningBorder;
-  .border-radius(@baseBorderRadius);
-}
-.alert,
-.alert h4 {
-  // Specified for the h4 to prevent conflicts of changing @headingsColor
-  color: @warningText;
-}
-.alert h4 {
-  margin: 0;
-}
-
-// Adjust close link position
-.alert .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: @baseLineHeight;
-}
-
-
-// Alternate styles
-// -------------------------
-
-.alert-success {
-  background-color: @successBackground;
-  border-color: @successBorder;
-  color: @successText;
-}
-.alert-success h4 {
-  color: @successText;
-}
-.alert-danger,
-.alert-error {
-  background-color: @errorBackground;
-  border-color: @errorBorder;
-  color: @errorText;
-}
-.alert-danger h4,
-.alert-error h4 {
-  color: @errorText;
-}
-.alert-info {
-  background-color: @infoBackground;
-  border-color: @infoBorder;
-  color: @infoText;
-}
-.alert-info h4 {
-  color: @infoText;
-}
-
-
-// Block alerts
-// -------------------------
-
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
-}
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-.alert-block p + p {
-  margin-top: 5px;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/bootstrap.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/bootstrap.less
deleted file mode 100644
index b56327adce..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/bootstrap.less
+++ /dev/null
@@ -1,63 +0,0 @@
-/*!
- * Bootstrap v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-// Core variables and mixins
-@import "variables.less"; // Modify this for custom colors, font-sizes, etc
-@import "mixins.less";
-
-// CSS Reset
-@import "reset.less";
-
-// Grid system and page structure
-@import "scaffolding.less";
-@import "grid.less";
-@import "layouts.less";
-
-// Base CSS
-@import "type.less";
-@import "code.less";
-@import "forms.less";
-@import "tables.less";
-
-// Components: common
-@import "sprites.less";
-@import "dropdowns.less";
-@import "wells.less";
-@import "component-animations.less";
-@import "close.less";
-
-// Components: Buttons & Alerts
-@import "buttons.less";
-@import "button-groups.less";
-@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
-
-// Components: Nav
-@import "navs.less";
-@import "navbar.less";
-@import "breadcrumbs.less";
-@import "pagination.less";
-@import "pager.less";
-
-// Components: Popovers
-@import "modals.less";
-@import "tooltip.less";
-@import "popovers.less";
-
-// Components: Misc
-@import "thumbnails.less";
-@import "media.less";
-@import "labels-badges.less";
-@import "progress-bars.less";
-@import "accordion.less";
-@import "carousel.less";
-@import "hero-unit.less";
-
-// Utility classes
-@import "utilities.less"; // Has to be last to override when necessary
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/breadcrumbs.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/breadcrumbs.less
deleted file mode 100644
index 68b3086072..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/breadcrumbs.less
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// Breadcrumbs
-// --------------------------------------------------
-
-
-.breadcrumb {
-  padding: 8px 15px;
-  margin: 0 0 @baseLineHeight;
-  list-style: none;
-  background-color: #f5f5f5;
-  .border-radius(@baseBorderRadius);
-  > li {
-    display: inline-block;
-    text-shadow: 0 1px 0 @white;
-    > .divider {
-      padding: 0 5px;
-      color: #ccc;
-    }
-  }
-  > .active {
-    color: @grayLight;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/button-groups.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/button-groups.less
deleted file mode 100644
index 5f6da2a984..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/button-groups.less
+++ /dev/null
@@ -1,226 +0,0 @@
-//
-// Button groups
-// --------------------------------------------------
-
-
-// Make the div behave like a button
-.btn-group {
-  position: relative;
-  display: inline-block;
-  font-size: 0; // remove as part 1 of font-size inline-block hack
-  vertical-align: middle; // match .btn alignment given font-size hack above
-  white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
-}
-
-// Space out series of button groups
-.btn-group + .btn-group {
-  margin-left: 5px;
-}
-
-// Optional: Group multiple button groups together for a toolbar
-.btn-toolbar {
-  font-size: 0; // Hack to remove whitespace that results from using inline-block
-  margin-top: (@baseLineHeight / 2);
-  margin-bottom: (@baseLineHeight / 2);
-  > .btn + .btn,
-  > .btn-group + .btn,
-  > .btn + .btn-group {
-    margin-left: 5px;
-  }
-}
-
-// Float them, remove border radius, then re-add to first and last elements
-.btn-group > .btn {
-  position: relative;
-  .border-radius(0);
-}
-.btn-group > .btn + .btn {
-  margin-left: -1px;
-}
-.btn-group > .btn,
-.btn-group > .dropdown-menu,
-.btn-group > .popover {
-  font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
-}
-
-// Reset fonts for other sizes
-.btn-group > .btn-mini {
-  font-size: @fontSizeMini;
-}
-.btn-group > .btn-small {
-  font-size: @fontSizeSmall;
-}
-.btn-group > .btn-large {
-  font-size: @fontSizeLarge;
-}
-
-// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
-.btn-group > .btn:first-child {
-  margin-left: 0;
-  .border-top-left-radius(@baseBorderRadius);
-  .border-bottom-left-radius(@baseBorderRadius);
-}
-// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-  .border-top-right-radius(@baseBorderRadius);
-  .border-bottom-right-radius(@baseBorderRadius);
-}
-// Reset corners for large buttons
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-  .border-top-left-radius(@borderRadiusLarge);
-  .border-bottom-left-radius(@borderRadiusLarge);
-}
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-  .border-top-right-radius(@borderRadiusLarge);
-  .border-bottom-right-radius(@borderRadiusLarge);
-}
-
-// On hover/focus/active, bring the proper btn to front
-.btn-group > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group > .btn:active,
-.btn-group > .btn.active {
-  z-index: 2;
-}
-
-// On active and open, don't show outline
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
-}
-
-
-
-// Split button dropdowns
-// ----------------------
-
-// Give the line between buttons some depth
-.btn-group > .btn + .dropdown-toggle {
-  padding-left: 8px;
-  padding-right: 8px;
-  .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
-  *padding-top: 5px;
-  *padding-bottom: 5px;
-}
-.btn-group > .btn-mini + .dropdown-toggle {
-  padding-left: 5px;
-  padding-right: 5px;
-  *padding-top: 2px;
-  *padding-bottom: 2px;
-}
-.btn-group > .btn-small + .dropdown-toggle {
-  *padding-top: 5px;
-  *padding-bottom: 4px;
-}
-.btn-group > .btn-large + .dropdown-toggle {
-  padding-left: 12px;
-  padding-right: 12px;
-  *padding-top: 7px;
-  *padding-bottom: 7px;
-}
-
-.btn-group.open {
-
-  // The clickable button for toggling the menu
-  // Remove the gradient and set the same inset shadow as the :active state
-  .dropdown-toggle {
-    background-image: none;
-    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
-  }
-
-  // Keep the hover's background when dropdown is open
-  .btn.dropdown-toggle {
-    background-color: @btnBackgroundHighlight;
-  }
-  .btn-primary.dropdown-toggle {
-    background-color: @btnPrimaryBackgroundHighlight;
-  }
-  .btn-warning.dropdown-toggle {
-    background-color: @btnWarningBackgroundHighlight;
-  }
-  .btn-danger.dropdown-toggle {
-    background-color: @btnDangerBackgroundHighlight;
-  }
-  .btn-success.dropdown-toggle {
-    background-color: @btnSuccessBackgroundHighlight;
-  }
-  .btn-info.dropdown-toggle {
-    background-color: @btnInfoBackgroundHighlight;
-  }
-  .btn-inverse.dropdown-toggle {
-    background-color: @btnInverseBackgroundHighlight;
-  }
-}
-
-
-// Reposition the caret
-.btn .caret {
-  margin-top: 8px;
-  margin-left: 0;
-}
-// Carets in other button sizes
-.btn-large .caret {
-  margin-top: 6px;
-}
-.btn-large .caret {
-  border-left-width:  5px;
-  border-right-width: 5px;
-  border-top-width:   5px;
-}
-.btn-mini .caret,
-.btn-small .caret {
-  margin-top: 8px;
-}
-// Upside down carets for .dropup
-.dropup .btn-large .caret {
-  border-bottom-width: 5px;
-}
-
-
-
-// Account for other colors
-.btn-primary,
-.btn-warning,
-.btn-danger,
-.btn-info,
-.btn-success,
-.btn-inverse {
-  .caret {
-    border-top-color: @white;
-    border-bottom-color: @white;
-  }
-}
-
-
-
-// Vertical button groups
-// ----------------------
-
-.btn-group-vertical {
-  display: inline-block; // makes buttons only take up the width they need
-}
-.btn-group-vertical > .btn {
-  display: block;
-  float: none;
-  max-width: 100%;
-  .border-radius(0);
-}
-.btn-group-vertical > .btn + .btn {
-  margin-left: 0;
-  margin-top: -1px;
-}
-.btn-group-vertical > .btn:first-child {
-  .border-radius(@baseBorderRadius @baseBorderRadius 0 0);
-}
-.btn-group-vertical > .btn:last-child {
-  .border-radius(0 0 @baseBorderRadius @baseBorderRadius);
-}
-.btn-group-vertical > .btn-large:first-child {
-  .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0);
-}
-.btn-group-vertical > .btn-large:last-child {
-  .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge);
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/buttons.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/buttons.less
deleted file mode 100644
index e522ab536a..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/buttons.less
+++ /dev/null
@@ -1,208 +0,0 @@
-//
-// Buttons
-// --------------------------------------------------
-
-
-// Base styles
-// --------------------------------------------------
-
-// Core
-.btn {
-  display: inline-block;
-  padding: 4px 12px;
-  margin-bottom: 0; // For input.btn
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  text-align: center;
-  vertical-align: middle;
-  cursor: pointer;
-  .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75));
-  border: 1px solid @btnBorder;
-  border-bottom-color: darken(@btnBorder, 10%);
-  .border-radius(@baseBorderRadius);
-  .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
-
-  // Hover/focus state
-  &:hover,
-  &:focus {
-    color: @grayDark;
-    text-decoration: none;
-    background-position: 0 -15px;
-
-    // transition is only when going to hover/focus, otherwise the background
-    // behind the gradient (there for IE<=9 fallback) gets mismatched
-    .transition(background-position .1s linear);
-  }
-
-  // Focus state for keyboard and accessibility
-  &:focus {
-    .tab-focus();
-  }
-
-  // Active state
-  &.active,
-  &:active {
-    background-image: none;
-    outline: 0;
-    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
-  }
-
-  // Disabled state
-  &.disabled,
-  &[disabled] {
-    cursor: default;
-    background-image: none;
-    .opacity(65);
-    .box-shadow(none);
-  }
-
-}
-
-
-
-// Button Sizes
-// --------------------------------------------------
-
-// Large
-.btn-large {
-  padding: @paddingLarge;
-  font-size: @fontSizeLarge;
-  .border-radius(@borderRadiusLarge);
-}
-.btn-large [class^="icon-"],
-.btn-large [class*=" icon-"] {
-  margin-top: 4px;
-}
-
-// Small
-.btn-small {
-  padding: @paddingSmall;
-  font-size: @fontSizeSmall;
-  .border-radius(@borderRadiusSmall);
-}
-.btn-small [class^="icon-"],
-.btn-small [class*=" icon-"] {
-  margin-top: 0;
-}
-.btn-mini [class^="icon-"],
-.btn-mini [class*=" icon-"] {
-  margin-top: -1px;
-}
-
-// Mini
-.btn-mini {
-  padding: @paddingMini;
-  font-size: @fontSizeMini;
-  .border-radius(@borderRadiusSmall);
-}
-
-
-// Block button
-// -------------------------
-
-.btn-block {
-  display: block;
-  width: 100%;
-  padding-left: 0;
-  padding-right: 0;
-  .box-sizing(border-box);
-}
-
-// Vertically space out multiple block buttons
-.btn-block + .btn-block {
-  margin-top: 5px;
-}
-
-// Specificity overrides
-input[type="submit"],
-input[type="reset"],
-input[type="button"] {
-  &.btn-block {
-    width: 100%;
-  }
-}
-
-
-
-// Alternate buttons
-// --------------------------------------------------
-
-// Provide *some* extra contrast for those who can get it
-.btn-primary.active,
-.btn-warning.active,
-.btn-danger.active,
-.btn-success.active,
-.btn-info.active,
-.btn-inverse.active {
-  color: rgba(255,255,255,.75);
-}
-
-// Set the backgrounds
-// -------------------------
-.btn-primary {
-  .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
-}
-// Warning appears are orange
-.btn-warning {
-  .buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight);
-}
-// Danger and error appear as red
-.btn-danger {
-  .buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight);
-}
-// Success appears as green
-.btn-success {
-  .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight);
-}
-// Info appears as a neutral blue
-.btn-info {
-  .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight);
-}
-// Inverse appears as dark gray
-.btn-inverse {
-  .buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight);
-}
-
-
-// Cross-browser Jank
-// --------------------------------------------------
-
-button.btn,
-input[type="submit"].btn {
-
-  // Firefox 3.6 only I believe
-  &::-moz-focus-inner {
-    padding: 0;
-    border: 0;
-  }
-}
-
-
-// Link buttons
-// --------------------------------------------------
-
-// Make a button look and behave like a link
-.btn-link,
-.btn-link:active,
-.btn-link[disabled] {
-  background-color: transparent;
-  background-image: none;
-  .box-shadow(none);
-}
-.btn-link {
-  border-color: transparent;
-  cursor: pointer;
-  color: @linkColor;
-  .border-radius(0);
-}
-.btn-link:hover,
-.btn-link:focus {
-  color: @linkColorHover;
-  text-decoration: underline;
-  background-color: transparent;
-}
-.btn-link[disabled]:hover,
-.btn-link[disabled]:focus {
-  color: @grayDark;
-  text-decoration: none;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/carousel.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/carousel.less
deleted file mode 100644
index 55bc050144..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/carousel.less
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-// Carousel
-// --------------------------------------------------
-
-
-.carousel {
-  position: relative;
-  margin-bottom: @baseLineHeight;
-  line-height: 1;
-}
-
-.carousel-inner {
-  overflow: hidden;
-  width: 100%;
-  position: relative;
-}
-
-.carousel-inner {
-
-  > .item {
-    display: none;
-    position: relative;
-    .transition(.6s ease-in-out left);
-
-    // Account for jankitude on images
-    > img,
-    > a > img {
-      display: block;
-      line-height: 1;
-    }
-  }
-
-  > .active,
-  > .next,
-  > .prev { display: block; }
-
-  > .active {
-    left: 0;
-  }
-
-  > .next,
-  > .prev {
-    position: absolute;
-    top: 0;
-    width: 100%;
-  }
-
-  > .next {
-    left: 100%;
-  }
-  > .prev {
-    left: -100%;
-  }
-  > .next.left,
-  > .prev.right {
-    left: 0;
-  }
-
-  > .active.left {
-    left: -100%;
-  }
-  > .active.right {
-    left: 100%;
-  }
-
-}
-
-// Left/right controls for nav
-// ---------------------------
-
-.carousel-control {
-  position: absolute;
-  top: 40%;
-  left: 15px;
-  width: 40px;
-  height: 40px;
-  margin-top: -20px;
-  font-size: 60px;
-  font-weight: 100;
-  line-height: 30px;
-  color: @white;
-  text-align: center;
-  background: @grayDarker;
-  border: 3px solid @white;
-  .border-radius(23px);
-  .opacity(50);
-
-  // we can't have this transition here
-  // because webkit cancels the carousel
-  // animation if you trip this while
-  // in the middle of another animation
-  // ;_;
-  // .transition(opacity .2s linear);
-
-  // Reposition the right one
-  &.right {
-    left: auto;
-    right: 15px;
-  }
-
-  // Hover/focus state
-  &:hover,
-  &:focus {
-    color: @white;
-    text-decoration: none;
-    .opacity(90);
-  }
-}
-
-// Carousel indicator pips
-// -----------------------------
-.carousel-indicators {
-  position: absolute;
-  top: 15px;
-  right: 15px;
-  z-index: 5;
-  margin: 0;
-  list-style: none;
-
-  li {
-    display: block;
-    float: left;
-    width: 10px;
-    height: 10px;
-    margin-left: 5px;
-    text-indent: -999px;
-    background-color: #ccc;
-    background-color: rgba(255,255,255,.25);
-    border-radius: 5px;
-  }
-  .active {
-    background-color: #fff;
-  }
-}
-
-// Caption for text below images
-// -----------------------------
-
-.carousel-caption {
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding: 15px;
-  background: @grayDark;
-  background: rgba(0,0,0,.75);
-}
-.carousel-caption h4,
-.carousel-caption p {
-  color: @white;
-  line-height: @baseLineHeight;
-}
-.carousel-caption h4 {
-  margin: 0 0 5px;
-}
-.carousel-caption p {
-  margin-bottom: 0;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/close.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/close.less
deleted file mode 100644
index 4c626bda6c..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/close.less
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Close icons
-// --------------------------------------------------
-
-
-.close {
-  float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: @baseLineHeight;
-  color: @black;
-  text-shadow: 0 1px 0 rgba(255,255,255,1);
-  .opacity(20);
-  &:hover,
-  &:focus {
-    color: @black;
-    text-decoration: none;
-    cursor: pointer;
-    .opacity(40);
-  }
-}
-
-// Additional properties for button version
-// iOS requires the button element instead of an anchor tag.
-// If you want the anchor version, it requires `href="#"`.
-button.close {
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/code.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/code.less
deleted file mode 100644
index 36a6ae743e..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/code.less
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Code (inline and blocK)
-// --------------------------------------------------
-
-
-// Inline and block code styles
-code,
-pre.code {
-  padding: 0 3px 2px;
-  #font > #family > .monospace;
-  font-size: (@baseFontSize - 2);
-  color: @blueExtraDark;
-  .border-radius(3px);
-}
-
-// Inline code
-code {
-  padding: 2px 4px;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-  white-space: nowrap;
-}
-
-// Blocks of code
-pre.code {
-  display: block;
-  padding: ((@baseLineHeight - 1) / 2);
-  margin: 0 0 (@baseLineHeight / 2);
-  font-size: (@baseFontSize - 1); // 14px to 13px
-  line-height: @baseLineHeight;
-  word-break: break-all;
-  word-wrap: break-word;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: #f5f5f5;
-  border: 1px solid rgba(0,0,0,.15);
-  .border-radius(@baseBorderRadius);
-
-  // Make prettyprint styles more spaced out for readability
-  &.prettyprint {
-    margin-bottom: @baseLineHeight;
-  }
-
-  // Account for some code outputs that place code tags in pre tags
-  code {
-    padding: 0;
-    color: inherit;
-    white-space: pre;
-    white-space: pre-wrap;
-    background-color: transparent;
-    border: 0;
-  }
-}
-
-// Enable scrollable blocks of code
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/component-animations.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/component-animations.less
deleted file mode 100644
index d614263a76..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/component-animations.less
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Component animations
-// --------------------------------------------------
-
-
-.fade {
-  opacity: 0;
-  .transition(opacity .15s linear);
-  &.in {
-    opacity: 1;
-  }
-}
-
-.collapse {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  .transition(height .35s ease);
-  &.in {
-    height: auto;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/dropdowns.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/dropdowns.less
deleted file mode 100644
index 5d0e1c8e7e..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/dropdowns.less
+++ /dev/null
@@ -1,222 +0,0 @@
-//
-// Dropdown menus
-// --------------------------------------------------
-
-
-// Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
-.dropup,
-.dropdown {
-  position: relative;
-}
-
-.dropdown-toggle:active,
-.open .dropdown-toggle {
-  outline: 0;
-}
-
-// Dropdown arrow/caret
-// --------------------
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  vertical-align: top;
-  border-top:   4px solid @black;
-  border-right: 4px solid transparent;
-  border-left:  4px solid transparent;
-  content: "";
-}
-
-// Place the caret
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
-}
-
-// The dropdown menu (ul)
-// ----------------------
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: @zindexDropdown;
-  display: none; // none by default, but block on "open" of the menu
-  float: left;
-  min-width: 160px;
-  padding: 5px 0;
-  margin: 2px 0 0; // override default ul
-  list-style: none;
-  background-color: @dropdownBackground;
-  border: 1px solid @dropdownBorder;
-  .border-radius(6px);
-  .box-shadow(0 5px 10px rgba(0,0,0,.2));
-  background-clip: padding-box;
-
-  // Aligns the dropdown menu to right
-  &.pull-right {
-    right: 0;
-    left: auto;
-  }
-
-  // Dividers (basically an hr) within the dropdown
-  .divider {
-    .nav-divider(@dropdownDividerTop, @dropdownDividerBottom);
-  }
-
-  // Links within the dropdown menu
-  > li > a {
-    display: block;
-    padding: 3px 20px;
-    clear: both;
-    font-weight: normal;
-    line-height: @baseLineHeight;
-    color: @dropdownLinkColor;
-    white-space: nowrap;
-    cursor:pointer;
-  }
-}
-
-// Hover/Focus state
-// -----------
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > button:hover,
-.dropdown-submenu:hover > a,
-.dropdown-submenu:hover > button {
-  text-decoration: none;
-  color: @dropdownLinkColorHover;
-  #gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
-}
-
-// Active state
-// ------------
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover {
-  color: @dropdownLinkColorActive;
-  text-decoration: none;
-  outline: 0;
-  #gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%));
-}
-
-// Disabled state
-// --------------
-// Gray out text and ensure the hover/focus state remains gray
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover {
-  color: @grayLight;
-}
-// Nuke hover/focus effects
-.dropdown-menu > .disabled > a:hover {
-  text-decoration: none;
-  background-color: transparent;
-  background-image: none; // Remove CSS gradient
-  cursor: default;
-}
-
-// Open state for the dropdown
-// ---------------------------
-.open {
-  & > .dropdown-menu {
-    display: block;
-  }
-}
-
-// Right aligned dropdowns
-// ---------------------------
-.pull-right > .dropdown-menu {
-  right: 0;
-  left: auto;
-}
-
-// Allow for dropdowns to go bottom up (aka, dropup-menu)
-// ------------------------------------------------------
-// Just add .dropup after the standard .dropdown class and you're set, bro.
-// TODO: abstract this so that the navbar fixed styles are not placed here?
-.dropup,
-.navbar-fixed-bottom .dropdown {
-  // Reverse the caret
-  .caret {
-    border-top: 0;
-    border-bottom: 4px solid @black;
-    content: "";
-  }
-  // Different positioning for bottom up menu
-  .dropdown-menu {
-    top: auto;
-    bottom: 100%;
-    margin-bottom: 1px;
-  }
-}
-
-// Sub menus
-// ---------------------------
-.dropdown-submenu {
-  position: relative;
-}
-// Default dropdowns
-.dropdown-submenu > .dropdown-menu {
-  top: 0;
-  left: 100%;
-  margin-top: -6px;
-  margin-left: -1px;
-  .border-radius(0 6px 6px 6px);
-}
-.dropdown-submenu:hover > .dropdown-menu {
-  display: block;
-}
-
-// Dropups
-.dropup .dropdown-submenu > .dropdown-menu {
-  top: auto;
-  bottom: 0;
-  margin-top: 0;
-  margin-bottom: -2px;
-  .border-radius(5px 5px 5px 0);
-}
-
-// Caret to indicate there is a submenu
-.dropdown-submenu > a:after {
-  display: block;
-  content: " ";
-  float: right;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-  border-width: 5px 0 5px 5px;
-  border-left-color: darken(@dropdownBackground, 20%);
-  margin-top: 5px;
-  margin-right: -10px;
-}
-.dropdown-submenu:hover > a:after {
-  border-left-color: @dropdownLinkColorHover;
-}
-
-// Left aligned submenus
-.dropdown-submenu.pull-left {
-  // Undo the float
-  // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere.
-  float: none;
-
-  // Positioning the submenu
-  > .dropdown-menu {
-    left: -100%;
-    margin-left: 10px;
-    .border-radius(6px 0 6px 6px);
-  }
-}
-
-// Tweak nav headers
-// -----------------
-// Increase padding from 15px to 20px on sides
-.dropdown .dropdown-menu .nav-header {
-  padding-left: 20px;
-  padding-right: 20px;
-}
-
-// Typeahead
-// ---------
-.typeahead {
-  z-index: 1051;
-  margin-top: 2px; // give it some space to breathe
-  .border-radius(@baseBorderRadius);
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/forms.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/forms.less
deleted file mode 100644
index 0df6c459bd..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/forms.less
+++ /dev/null
@@ -1,675 +0,0 @@
-//
-// Forms
-// --------------------------------------------------
-
-
-// GENERAL STYLES
-// --------------
-
-// Make all forms have space below them
-form {
-  margin: 0 0 @baseLineHeight;
-}
-
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-// Groups of fields with labels on top (legends)
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: @baseLineHeight;
-  font-size: (@baseFontSize * 1.5);
-  line-height: (@baseLineHeight * 2);
-  color: @grayDark;
-  border: 0;
-  border-bottom: 1px solid #e5e5e5;
-
-  // Small
-  small {
-    font-size: (@baseLineHeight * .75);
-    color: @grayLight;
-  }
-}
-
-// Set font for forms
-label,
-input,
-button,
-select,
-textarea {
-  #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here
-}
-input,
-button,
-select,
-textarea {
-  font-family: @baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
-}
-
-// Identify controls by their labels
-label {
-  display: block;
-  margin-bottom: 5px;
-}
-
-// Form controls
-// -------------------------
-
-// Shared size and type resets
-select,
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  display: inline-block;
-  height: @baseLineHeight;
-  padding: 4px 6px;
-  margin-bottom: (@baseLineHeight / 2);
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  color: @gray;
-  .border-radius(@inputBorderRadius);
-  vertical-align: middle;
-}
-
-// Reset appearance properties for textual inputs and textarea
-// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
-input,
-textarea,
-.uneditable-input {
-  width: 206px; // plus 12px padding and 2px border
-}
-// Reset height since textareas have rows
-textarea {
-  height: auto;
-}
-// Everything else
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  background-color: @inputBackground;
-  border: 1px solid @inputBorder;
-  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
-  .transition(~"border linear .2s, box-shadow linear .2s");
-
-  // Focus state
-  &:focus {
-    border-color: rgba(82,168,236,.8);
-    outline: 0;
-    outline: thin dotted \9; /* IE6-9 */
-    .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
-  }
-}
-
-// Position radios and checkboxes better
-input[type="radio"],
-input[type="checkbox"] {
-  margin: 4px 0 0;
-  line-height: normal;
-}
-
-// Reset width of input images, buttons, radios, checkboxes
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
-  width: auto; // Override of generic input selector
-}
-
-// Set the height of select and file controls to match text inputs
-select,
-input[type="file"] {
-  height: @inputHeight;
-  line-height: @inputHeight;
-}
-
-// Make select elements obey height by applying a border
-select {
-  width: 220px; // default input width + 10px of padding that doesn't get applied
-  border: 1px solid @inputBorder;
-  background-color: @inputBackground; // Chrome on Linux and Mobile Safari need background-color
-}
-
-// Make multiple select elements height not fixed
-select[multiple],
-select[size] {
-  height: auto;
-}
-
-// Focus for select, file, radio, and checkbox
-select:focus,
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
-  .tab-focus();
-}
-
-
-// Uneditable inputs
-// -------------------------
-
-// Make uneditable inputs look inactive
-.uneditable-input,
-.uneditable-textarea {
-  color: @grayLight;
-  background-color: darken(@inputBackground, 1%);
-  border-color: @inputBorder;
-  .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
-  cursor: not-allowed;
-}
-
-// For text that needs to appear as an input but should not be an input
-.uneditable-input {
-  overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
-  white-space: nowrap;
-}
-
-// Make uneditable textareas behave like a textarea
-.uneditable-textarea {
-  width: auto;
-  height: auto;
-}
-
-
-// Placeholder
-// -------------------------
-
-// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector
-input,
-textarea {
-  .placeholder();
-}
-
-
-// CHECKBOXES & RADIOS
-// -------------------
-
-// Indent the labels to position radios/checkboxes as hanging
-.radio,
-.checkbox {
-  min-height: @baseLineHeight; // clear the floating input if there is no label text
-  padding-left: 20px;
-}
-.radio input[type="radio"],
-.checkbox input[type="checkbox"] {
-  float: left;
-  margin-left: 0px;
-}
-
-// Move the options list down to align with labels
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
-  padding-top: 5px; // has to be padding because margin collaspes
-}
-
-// Radios and checkboxes on same line
-// TODO: v3: Convert .inline to .control-inline
-.radio.inline,
-.checkbox.inline {
-  display: inline-block;
-  padding-top: 5px;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-.radio.inline + .radio.inline,
-.checkbox.inline + .checkbox.inline {
-  margin-left: 10px; // space out consecutive inline controls
-}
-
-
-
-// INPUT SIZES
-// -----------
-
-// General classes for quick sizes
-.input-mini       { width: 60px; }
-.input-small      { width: 90px; }
-.input-medium     { width: 150px; }
-.input-large      { width: 210px; }
-.input-xlarge     { width: 270px; }
-.input-xxlarge    { width: 530px; }
-
-// Grid style input sizes
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input[class*="span"],
-// Redeclare since the fluid row class is more specific
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"] {
-  float: none;
-  margin-left: 0;
-}
-// Ensure input-prepend/append never wraps
-.input-append input[class*="span"],
-.input-append .uneditable-input[class*="span"],
-.input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"],
-.row-fluid .input-prepend [class*="span"],
-.row-fluid .input-append [class*="span"] {
-  display: inline-block;
-}
-
-
-
-// GRID SIZING FOR INPUTS
-// ----------------------
-
-// Grid sizes
-#grid > .input(@gridColumnWidth, @gridGutterWidth);
-
-// Control row for multiple inputs per line
-.controls-row {
-  .clearfix(); // Clear the float from controls
-}
-
-// Float to collapse white-space for proper grid alignment
-.controls-row [class*="span"],
-// Redeclare the fluid grid collapse since we undo the float for inputs
-.row-fluid .controls-row [class*="span"] {
-  float: left;
-}
-// Explicity set top padding on all checkboxes/radios, not just first-child
-.controls-row .checkbox[class*="span"],
-.controls-row .radio[class*="span"] {
-  padding-top: 5px;
-}
-
-
-
-
-// DISABLED STATE
-// --------------
-
-// Disabled and read-only inputs
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  cursor: not-allowed;
-  background-color: @inputDisabledBackground;
-}
-// Explicitly reset the colors here
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
-}
-
-
-
-
-// FORM FIELD FEEDBACK STATES
-// --------------------------
-
-// Warning
-.control-group.warning {
-  .formFieldState(@warningText, @warningText, @warningBackground);
-}
-// Error
-.control-group.error {
-  .formFieldState(@errorText, @errorText, @errorBackground);
-}
-// Success
-.control-group.success {
-  .formFieldState(@successText, @successText, @successBackground);
-}
-// Success
-.control-group.info {
-  .formFieldState(@infoText, @infoText, @infoBackground);
-}
-
-// HTML5 invalid states
-// Shares styles with the .control-group.error above
-input:focus:invalid,
-textarea:focus:invalid,
-select:focus:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-  &:focus {
-    border-color: darken(#ee5f5b, 10%);
-    @shadow: 0 0 6px lighten(#ee5f5b, 20%);
-    .box-shadow(@shadow);
-  }
-}
-
-
-
-// FORM ACTIONS
-// ------------
-
-.form-actions {
-  padding: (@baseLineHeight - 1) 20px @baseLineHeight;
-  margin-top: @baseLineHeight;
-  margin-bottom: @baseLineHeight;
-  background-color: @formActionsBackground;
-  border-top: 1px solid #e5e5e5;
-  .clearfix(); // Adding clearfix to allow for .pull-right button containers
-}
-
-
-
-// HELP TEXT
-// ---------
-
-.help-block,
-.help-inline {
-  color: lighten(@textColor, 15%); // lighten the text some for contrast
-}
-
-.help-block {
-  display: block; // account for any element using help-block
-  margin-bottom: (@baseLineHeight / 2);
-}
-
-.help-inline {
-  display: inline-block;
-  vertical-align: middle;
-  padding-left: 5px;
-}
-
-
-
-// INPUT GROUPS
-// ------------
-
-// Allow us to put symbols and text within the input field for a cleaner look
-.input-append,
-.input-prepend {
-  display: inline-block;
-  margin-bottom: (@baseLineHeight / 2);
-  vertical-align: middle;
-  font-size: 0; // white space collapse hack
-  white-space: nowrap; // Prevent span and input from separating
-
-  // Reset the white space collapse hack
-  input,
-  select,
-  .uneditable-input,
-  .dropdown-menu,
-  .popover {
-    font-size: @baseFontSize;
-  }
-
-  input,
-  select,
-  .uneditable-input {
-    position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
-    margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
-    *margin-left: 0;
-    vertical-align: top;
-    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
-    // Make input on top when focused so blue border and shadow always show
-    &:focus {
-      z-index: 2;
-    }
-  }
-  .add-on {
-    display: inline-block;
-    width: auto;
-    height: @baseLineHeight;
-    min-width: 16px;
-    padding: 4px 5px;
-    font-size: @baseFontSize;
-    font-weight: normal;
-    line-height: @baseLineHeight;
-    text-align: center;
-    text-shadow: 0 1px 0 @white;
-    background-color: @grayLighter;
-    border: 1px solid #ccc;
-  }
-  .add-on,
-  .btn,
-  .btn-group > .dropdown-toggle {
-    vertical-align: top;
-    .border-radius(0);
-  }
-  .active {
-    background-color: lighten(@green, 30);
-    border-color: @green;
-  }
-}
-
-.input-prepend {
-  .add-on,
-  .btn {
-    margin-right: -1px;
-  }
-  .add-on:first-child,
-  .btn:first-child {
-    // FYI, `.btn:first-child` accounts for a button group that's prepended
-    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
-  }
-}
-
-.input-append {
-  input,
-  select,
-  .uneditable-input {
-    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
-    + .btn-group .btn:last-child {
-      .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
-    }
-  }
-  .add-on,
-  .btn,
-  .btn-group {
-    margin-left: -1px;
-  }
-  .add-on:last-child,
-  .btn:last-child,
-  .btn-group:last-child > .dropdown-toggle {
-    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
-  }
-}
-
-// Remove all border-radius for inputs with both prepend and append
-.input-prepend.input-append {
-  input,
-  select,
-  .uneditable-input {
-    .border-radius(0);
-    + .btn-group .btn {
-      .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
-    }
-  }
-  .add-on:first-child,
-  .btn:first-child {
-    margin-right: -1px;
-    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
-  }
-  .add-on:last-child,
-  .btn:last-child {
-    margin-left: -1px;
-    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
-  }
-  .btn-group:first-child {
-    margin-left: 0;
-  }
-}
-
-
-
-
-// SEARCH FORM
-// -----------
-
-input.search-query {
-  padding-right: 14px;
-  padding-left: 14px;
-  margin-bottom: 0; // Remove the default margin on all inputs
-  .border-radius(15px);
-}
-
-/* Allow for input prepend/append in search forms */
-.form-search .input-append .search-query,
-.form-search .input-prepend .search-query {
-  .border-radius(0); // Override due to specificity
-}
-.form-search .input-append .search-query {
-  .border-radius(14px 0 0 14px);
-}
-.form-search .input-append .btn {
-  .border-radius(0 14px 14px 0);
-}
-.form-search .input-prepend .search-query {
-  .border-radius(0 14px 14px 0);
-}
-.form-search .input-prepend .btn {
-  .border-radius(14px 0 0 14px);
-}
-
-
-
-
-// HORIZONTAL & VERTICAL FORMS
-// ---------------------------
-
-// Common properties
-// -----------------
-
-.form-search,
-.form-inline,
-.form-horizontal {
-  input,
-  textarea,
-  select,
-  .help-inline,
-  .uneditable-input,
-  .input-prepend,
-  .input-append {
-    display: inline-block;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  // Re-hide hidden elements due to specifity
-  .hide {
-    display: none;
-  }
-}
-.form-search label,
-.form-inline label,
-.form-search .btn-group,
-.form-inline .btn-group {
-  display: inline-block;
-}
-// Remove margin for input-prepend/-append
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
-  margin-bottom: 0;
-}
-// Inline checkbox/radio labels (remove padding on left)
-.form-search .radio,
-.form-search .checkbox,
-.form-inline .radio,
-.form-inline .checkbox {
-  padding-left: 0;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-// Remove float and margin, set to inline-block
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
-  float: left;
-  margin-right: 3px;
-  margin-left: 0;
-}
-
-
-// Margin to space out fieldsets
-.control-group {
-  margin-bottom: (@baseLineHeight / 2);
-}
-
-// Legend collapses margin, so next element is responsible for spacing
-legend + .control-group {
-  margin-top: @baseLineHeight;
-  -webkit-margin-top-collapse: separate;
-}
-
-// Horizontal-specific styles
-// --------------------------
-
-.form-horizontal {
-  // Increase spacing between groups
-  .control-group {
-    margin-bottom: @baseLineHeight;
-    .clearfix();
-  }
-  // Float the labels left
-  .control-label {
-    float: left;
-    width: (@horizontalComponentOffset - 20);
-    padding-top: 5px;
-    text-align: right;
-  }
-  // Move over all input controls and content
-  .controls {
-    margin-left: @horizontalComponentOffset;
-  }
-  // Remove bottom margin on block level help text since that's accounted for on .control-group
-  .help-block {
-    margin-bottom: 0;
-  }
-  // And apply it only to .help-block instances that follow a form control
-  input,
-  select,
-  textarea,
-  .uneditable-input,
-  .input-prepend,
-  .input-append {
-    + .help-block {
-      margin-top: (@baseLineHeight / 2);
-    }
-  }
-  // Move over buttons in .form-actions to align with .controls
-  .form-actions {
-    padding-left: @horizontalComponentOffset;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/grid.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/grid.less
deleted file mode 100644
index 750d203514..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/grid.less
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Grid system
-// --------------------------------------------------
-
-
-// Fixed (940px)
-#grid > .core(@gridColumnWidth, @gridGutterWidth);
-
-// Fluid (940px)
-#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
-
-// Reset utility classes due to specificity
-[class*="span"].hide,
-.row-fluid [class*="span"].hide {
-  display: none;
-}
-
-[class*="span"].pull-right,
-.row-fluid [class*="span"].pull-right {
-  float: right;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/hero-unit.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/hero-unit.less
deleted file mode 100644
index a1889ad3c6..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/hero-unit.less
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Hero unit
-// --------------------------------------------------
-
-
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  font-size: 18px;
-  font-weight: 200;
-  line-height: (@baseLineHeight * 1.5);
-  color: @heroUnitLeadColor;
-  background-color: @heroUnitBackground;
-  .border-radius(6px);
-  h1 {
-    margin-bottom: 0;
-    font-size: 60px;
-    line-height: 1;
-    color: @heroUnitHeadingColor;
-    letter-spacing: -1px;
-  }
-  li {
-    line-height: (@baseLineHeight * 1.5); // Reset since we specify in type.less
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/labels-badges.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/labels-badges.less
deleted file mode 100644
index 13e1553fbe..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/labels-badges.less
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Labels and badges
-// --------------------------------------------------
-
-
-// Base classes
-.label,
-.badge {
-  display: inline-block;
-  padding: 2px 4px;
-  font-size: (@baseFontSize * .846);
-  font-weight: bold;
-  line-height: 14px; // ensure proper line-height if floated
-  color: @white;
-  vertical-align: baseline;
-  white-space: nowrap;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  background-color: @grayLight;
-}
-// Set unique padding and border-radii
-.label {
-  .border-radius(3px);
-}
-.badge {
-  padding-left: 9px;
-  padding-right: 9px;
-  .border-radius(9px);
-}
-
-// Empty labels/badges collapse
-.label,
-.badge {
-  &:empty {
-    display: none;
-  }
-}
-
-// Hover/focus state, but only for links
-a {
-  &.label:hover,
-  &.label:focus,
-  &.badge:hover,
-  &.badge:focus {
-    color: @white;
-    text-decoration: none;
-    cursor: pointer;
-  }
-}
-
-// Colors
-// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
-.label,
-.badge {
-  // Important (red)
-  &-important         { background-color: @errorText; }
-  &-important[href]   { background-color: darken(@errorText, 10%); }
-  // Warnings (orange)
-  &-warning           { background-color: @orange; }
-  &-warning[href]     { background-color: darken(@orange, 10%); }
-  // Success (green)
-  &-success           { background-color: @successText; }
-  &-success[href]     { background-color: darken(@successText, 10%); }
-  // Info (turquoise)
-  &-info              { background-color: @infoText; }
-  &-info[href]        { background-color: darken(@infoText, 10%); }
-  // Inverse (black)
-  &-inverse           { background-color: @grayDark; }
-  &-inverse[href]     { background-color: darken(@grayDark, 10%); }
-}
-
-// Quick fix for labels/badges in buttons
-.btn {
-  .label,
-  .badge {
-    position: relative;
-    top: -1px;
-  }
-}
-.btn-mini {
-  .label,
-  .badge {
-    top: 0;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/layouts.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/layouts.less
deleted file mode 100644
index 24a2062117..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/layouts.less
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Layouts
-// --------------------------------------------------
-
-
-// Container (centered, fixed-width layouts)
-.container {
-  .container-fixed();
-}
-
-// Fluid layouts (left aligned, with sidebar, min- & max-width content)
-.container-fluid {
-  padding-right: @gridGutterWidth;
-  padding-left: @gridGutterWidth;
-  .clearfix();
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/media.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/media.less
deleted file mode 100644
index e461e446d2..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/media.less
+++ /dev/null
@@ -1,55 +0,0 @@
-// Media objects
-// Source: http://stubbornella.org/content/?p=497
-// --------------------------------------------------
-
-
-// Common styles
-// -------------------------
-
-// Clear the floats
-.media,
-.media-body {
-  overflow: hidden;
-  *overflow: visible;
-  zoom: 1;
-}
-
-// Proper spacing between instances of .media
-.media,
-.media .media {
-  margin-top: 15px;
-}
-.media:first-child {
-  margin-top: 0;
-}
-
-// For images and videos, set to block
-.media-object {
-  display: block;
-}
-
-// Reset margins on headings for tighter default spacing
-.media-heading {
-  margin: 0 0 5px;
-}
-
-
-// Media image alignment
-// -------------------------
-
-.media > .pull-left {
-  margin-right: 10px;
-}
-.media > .pull-right {
-  margin-left: 10px;
-}
-
-
-// Media list variation
-// -------------------------
-
-// Undo default ul/ol styles
-.media-list {
-  margin-left: 0;
-  list-style: none;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/mixins.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/mixins.less
deleted file mode 100644
index 0e795a5987..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/mixins.less
+++ /dev/null
@@ -1,611 +0,0 @@
-//
-// Mixins
-// --------------------------------------------------
-
-
-// UTILITY MIXINS
-// --------------------------------------------------
-
-// Clearfix
-// --------
-// For clearing floats like a boss h5bp.com/q
-.clearfix {
-  *zoom: 1;
-  &:before,
-  &:after {
-    display: table;
-    content: "";
-    // Fixes Opera/contenteditable bug:
-    // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
-    line-height: 0;
-  }
-  &:after {
-    clear: both;
-  }
-}
-
-// Webkit-style focus
-// ------------------
-.tab-focus() {
-  // Default
-  outline: thin dotted #333;
-  // Webkit
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-// Center-align a block level element
-// ----------------------------------
-.center-block() {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-// Sizing shortcuts
-// -------------------------
-.size(@height, @width) {
-  width: @width;
-  height: @height;
-}
-.square(@size) {
-  .size(@size, @size);
-}
-
-// Placeholder text
-// -------------------------
-.placeholder(@color: @placeholderText) {
-  &:-moz-placeholder {
-    color: @color;
-  }
-  &:-ms-input-placeholder {
-    color: @color;
-  }
-  &::-webkit-input-placeholder {
-    color: @color;
-  }
-}
-
-// Text overflow
-// -------------------------
-// Requires inline-block or block for proper styling
-.text-overflow() {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-// CSS image replacement
-// -------------------------
-// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-
-// FONTS
-// --------------------------------------------------
-
-#font {
-  #family {
-    .serif() {
-      font-family: @serifFontFamily;
-    }
-    .sans-serif() {
-      font-family: @sansFontFamily;
-    }
-    .monospace() {
-      font-family: @monoFontFamily;
-    }
-  }
-  .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    font-size: @size;
-    font-weight: @weight;
-    line-height: @lineHeight;
-  }
-  .serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    #font > #family > .serif;
-    #font > .shorthand(@size, @weight, @lineHeight);
-  }
-  .sans-serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    #font > #family > .sans-serif;
-    #font > .shorthand(@size, @weight, @lineHeight);
-  }
-  .monospace(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    #font > #family > .monospace;
-    #font > .shorthand(@size, @weight, @lineHeight);
-  }
-}
-
-
-// FORMS
-// --------------------------------------------------
-
-// Block level inputs
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: @inputHeight; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
-  .box-sizing(border-box); // Makes inputs behave like true block-level elements
-}
-
-
-
-// Mixin for form field states
-.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
-  // Set the text color
-  .control-label,
-  .help-block,
-  .help-inline {
-    color: @textColor;
-  }
-  // Style inputs accordingly
-  .checkbox,
-  .radio,
-  input,
-  select,
-  textarea {
-    color: @textColor;
-  }
-  input,
-  select,
-  textarea {
-    border-color: @borderColor;
-    .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
-    &:focus {
-      border-color: darken(@borderColor, 10%);
-      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
-      .box-shadow(@shadow);
-    }
-  }
-  // Give a small background color for input-prepend/-append
-  .input-prepend .add-on,
-  .input-append .add-on {
-    color: @textColor;
-    background-color: @backgroundColor;
-    border-color: @textColor;
-  }
-}
-
-
-
-// CSS3 PROPERTIES
-// --------------------------------------------------
-
-// Border Radius
-.border-radius(@radius) {
-    border-radius: @radius;
-}
-
-// Single Corner Border Radius
-.border-top-left-radius(@radius) {
-    border-top-left-radius: @radius;
-}
-.border-top-right-radius(@radius) {
-    border-top-right-radius: @radius;
-}
-.border-bottom-right-radius(@radius) {
-    border-bottom-right-radius: @radius;
-}
-.border-bottom-left-radius(@radius) {
-    border-bottom-left-radius: @radius;
-}
-
-// Single Side Border Radius
-.border-top-radius(@radius) {
-  .border-top-right-radius(@radius);
-  .border-top-left-radius(@radius);
-}
-.border-right-radius(@radius) {
-  .border-top-right-radius(@radius);
-  .border-bottom-right-radius(@radius);
-}
-.border-bottom-radius(@radius) {
-  .border-bottom-right-radius(@radius);
-  .border-bottom-left-radius(@radius);
-}
-.border-left-radius(@radius) {
-  .border-top-left-radius(@radius);
-  .border-bottom-left-radius(@radius);
-}
-
-// Drop shadows
-.box-shadow(@shadow) {
-    box-shadow: @shadow;
-}
-
-// Transitions
-.transition(@transition) {
-    transition: @transition;
-}
-.transition-delay(@transition-delay) {
-    transition-delay: @transition-delay;
-}
-.transition-duration(@transition-duration) {
-    transition-duration: @transition-duration;
-}
-
-// Transformations
-.rotate(@degrees) {
-    transform: rotate(@degrees);
-}
-.scale(@ratio) {
-    transform: scale(@ratio);
-}
-.translate(@x, @y) {
-    transform: translate(@x, @y);
-}
-.skew(@x, @y) {
-  transform: skew(@x, @y);
-  -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319
-}
-.translate3d(@x, @y, @z) {
-    transform: translate3d(@x, @y, @z);
-}
-
-// Backface visibility
-// Prevent browsers from flickering when using CSS 3D transforms.
-// Default value is `visible`, but can be changed to `hidden
-// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
-.backface-visibility(@visibility){
-	-webkit-backface-visibility: @visibility;
-	   -moz-backface-visibility: @visibility;
-	        backface-visibility: @visibility;
-}
-
-// Background clipping
-// Heads up: FF 3.6 and under need "padding" instead of "padding-box"
-.background-clip(@clip) {
-    background-clip: @clip;
-}
-
-// Background sizing
-.background-size(@size) {
-    background-size: @size;
-}
-
-
-// Box sizing
-.box-sizing(@boxmodel) {
-    box-sizing: @boxmodel;
-}
-
-// User select
-// For selecting text on the page
-.user-select(@select) {
-  -webkit-user-select: @select;
-     -moz-user-select: @select;
-      -ms-user-select: @select;
-       -o-user-select: @select;
-          user-select: @select;
-}
-
-// Resize anything
-.resizable(@direction) {
-  resize: @direction; // Options: horizontal, vertical, both
-  overflow: auto; // Safari fix
-}
-
-// CSS3 Content Columns
-.content-columns(@columnCount, @columnGap: @gridGutterWidth) {
-  -webkit-column-count: @columnCount;
-     -moz-column-count: @columnCount;
-          column-count: @columnCount;
-  -webkit-column-gap: @columnGap;
-     -moz-column-gap: @columnGap;
-          column-gap: @columnGap;
-}
-
-// Optional hyphenation
-.hyphens(@mode: auto) {
-  word-wrap: break-word;
-  -webkit-hyphens: @mode;
-     -moz-hyphens: @mode;
-      -ms-hyphens: @mode;
-       -o-hyphens: @mode;
-          hyphens: @mode;
-}
-
-// Opacity
-.opacity(@opacity) {
-  opacity: (@opacity / 100);
-}
-
-
-
-// BACKGROUNDS
-// --------------------------------------------------
-
-// Add an alphatransparency value to any background or border color (via Elyse Holladay)
-#translucent {
-  .background(@color: @white, @alpha: 1) {
-    background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
-  }
-  .border(@color: @white, @alpha: 1) {
-    border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
-    .background-clip(padding-box);
-  }
-}
-
-// Gradient Bar Colors for buttons and alerts
-.gradientBar(@primaryColor, @secondaryColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
-  color: @textColor;
-  text-shadow: @textShadow;
-  #gradient > .vertical(@primaryColor, @secondaryColor);
-  border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
-}
-
-// Gradients
-#gradient {
-  .horizontal(@startColor: #555, @endColor: #333) {
-    background-color: @endColor;
-    background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+
-    background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10
-    background-repeat: repeat-x;
-  }
-  .vertical(@startColor: #555, @endColor: #333) {
-    background-color: mix(@startColor, @endColor, 60%);
-    background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10
-    background-repeat: repeat-x;
-  }
-  .directional(@startColor: #555, @endColor: #333, @deg: 45deg) {
-    background-color: @endColor;
-    background-repeat: repeat-x;
-    background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+
-    background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10
-  }
-  .horizontal-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
-    background-color: mix(@midColor, @endColor, 80%);
-    background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
-    background-image: -webkit-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
-    background-image: -moz-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
-    background-image: -o-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
-    background-image: linear-gradient(to right, @startColor, @midColor @colorStop, @endColor);
-    background-repeat: no-repeat;
-  }
-
-  .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
-    background-color: mix(@midColor, @endColor, 80%);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
-    background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
-    background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-repeat: no-repeat;
-  }
-  .radial(@innerColor: #555, @outerColor: #333) {
-    background-color: @outerColor;
-    background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor));
-    background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor);
-    background-image: -moz-radial-gradient(circle, @innerColor, @outerColor);
-    background-image: -o-radial-gradient(circle, @innerColor, @outerColor);
-    background-repeat: no-repeat;
-  }
-  .striped(@color: #555, @angle: 45deg) {
-    background-color: @color;
-    background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
-    background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-    background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-    background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-    background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-  }
-}
-
-
-
-// COMPONENT MIXINS
-// --------------------------------------------------
-
-// Horizontal dividers
-// -------------------------
-// Dividers (basically an hr) within dropdowns and nav lists
-.nav-divider(@top: #e5e5e5, @bottom: @white) {
-  height: 1px;
-  margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
-  overflow: hidden;
-  background-color: @top;
-  border-bottom: 1px solid @bottom;
-}
-
-// Button backgrounds
-// ------------------
-.buttonBackground(@startColor, @endColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
-  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
-  .gradientBar(@startColor, @endColor, @textColor, @textShadow);
-
-  // in these cases the gradient won't cover the background, so we override
-  &:hover, &:focus, &:active, &.active, &.disabled, &[disabled] {
-    color: @textColor;
-    background-color: @endColor;
-  }
-
-  &:active,
-  &.active {
-    background-color: darken(@endColor, 10%) e("\9");
-  }
-}
-
-// Navbar vertical align
-// -------------------------
-// Vertically center elements in the navbar.
-// Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin.
-.navbarVerticalAlign(@elementHeight) {
-  margin-top: ((@navbarHeight - @elementHeight) / 2);
-}
-
-
-
-// Grid System
-// -----------
-
-// Centered container element
-.container-fixed() {
-  margin-right: auto;
-  margin-left: auto;
-  .clearfix();
-}
-
-// Table columns
-.tableColumns(@columnSpan: 1) {
-  float: none; // undo default grid column styles
-  width: ((@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16); // 16 is total padding on left and right of table cells
-  margin-left: 0; // undo default grid column styles
-}
-
-// Make a Grid
-// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
-.makeRow() {
-  margin-left: @gridGutterWidth * -1;
-  .clearfix();
-}
-.makeColumn(@columns: 1, @offset: 0) {
-  float: left;
-  margin-left: ((@gridColumnWidth * @offset) + (@gridGutterWidth * (@offset - 1)) + (@gridGutterWidth * 2));
-  width: ((@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)));
-}
-
-// The Grid
-#grid {
-
-  .core (@gridColumnWidth, @gridGutterWidth) {
-
-    .spanX (@index) when (@index > 0) {
-      .span@{index} { .span(@index); }
-      .spanX((@index - 1));
-    }
-    .spanX (0) {}
-
-    .offsetX (@index) when (@index > 0) {
-      .offset@{index} { .offset(@index); }
-      .offsetX((@index - 1));
-    }
-    .offsetX (0) {}
-
-    .offset (@columns) {
-      margin-left: ((@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1)));
-    }
-
-    .span (@columns) {
-      width: ((@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)));
-    }
-
-    .row {
-      margin-left: @gridGutterWidth * -1;
-      .clearfix();
-    }
-
-    [class*="span"] {
-      float: left;
-      min-height: 1px; // prevent collapsing columns
-      margin-left: @gridGutterWidth;
-    }
-
-    // Set the container width, and override it for fixed navbars in media queries
-    .container,
-    .navbar-static-top .container,
-    .navbar-fixed-top .container,
-    .navbar-fixed-bottom .container { .span(@gridColumns); }
-
-    // generate .spanX and .offsetX
-    .spanX (@gridColumns);
-    .offsetX (@gridColumns);
-
-  }
-
-  .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) {
-
-    .spanX (@index) when (@index > 0) {
-      .span@{index} { .span(@index); }
-      .spanX((@index - 1));
-    }
-    .spanX (0) {}
-
-    .offsetX (@index) when (@index > 0) {
-      .offset@{index} { .offset(@index); }
-      .offset@{index}:first-child { .offsetFirstChild(@index); }
-      .offsetX((@index - 1));
-    }
-    .offsetX (0) {}
-
-    .offset (@columns) {
-      margin-left: ((@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth * 2));
-  	  *margin-left: ((@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%));
-    }
-
-    .offsetFirstChild (@columns) {
-      margin-left: ((@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth));
-      *margin-left: ((@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%));
-    }
-
-    .span (@columns) {
-      width: ((@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)));
-      *width: ((@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%));
-    }
-
-    .row-fluid {
-      width: 100%;
-      .clearfix();
-      [class*="span"] {
-        .input-block-level();
-        float: left;
-        margin-left: @fluidGridGutterWidth;
-        *margin-left: (@fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%));
-      }
-      [class*="span"]:first-child {
-        margin-left: 0;
-      }
-
-      // Space grid-sized controls properly if multiple per line
-      .controls-row [class*="span"] + [class*="span"] {
-        margin-left: @fluidGridGutterWidth;
-      }
-
-      // generate .spanX and .offsetX
-      .spanX (@gridColumns);
-      .offsetX (@gridColumns);
-    }
-
-  }
-
-  .input(@gridColumnWidth, @gridGutterWidth) {
-
-    .spanX (@index) when (@index > 0) {
-      input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index} { .span(@index); }
-      .spanX((@index - 1));
-    }
-    .spanX (0) {}
-
-    .span(@columns) {
-      width: ((@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) - 14);
-    }
-
-    input,
-    textarea,
-    .uneditable-input {
-      margin-left: 0; // override margin-left from core grid system
-    }
-
-    // Space grid-sized controls properly if multiple per line
-    .controls-row [class*="span"] + [class*="span"] {
-      margin-left: @gridGutterWidth;
-    }
-
-    // generate .spanX
-    .spanX (@gridColumns);
-
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/modals.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/modals.less
deleted file mode 100644
index 8e272d409f..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/modals.less
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Modals
-// --------------------------------------------------
-
-// Background
-.modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: @zindexModalBackdrop;
-  background-color: @black;
-  // Fade for backdrop
-  &.fade { opacity: 0; }
-}
-
-.modal-backdrop,
-.modal-backdrop.fade.in {
-  .opacity(80);
-}
-
-// Base modal
-.modal {
-  position: fixed;
-  top: 10%;
-  left: 50%;
-  z-index: @zindexModal;
-  width: 560px;
-  margin-left: -280px;
-  background-color: @white;
-  border: 1px solid #999;
-  border: 1px solid rgba(0,0,0,.3);
-  *border: 1px solid #999; /* IE6-7 */
-  .border-radius(6px);
-  .box-shadow(0 3px 7px rgba(0,0,0,0.3));
-  .background-clip(padding-box);
-  // Remove focus outline from opened modal
-  outline: none;
-
-  &.fade {
-    .transition(e('opacity .3s linear, top .3s ease-out'));
-    top: -25%;
-  }
-  &.fade.in { top: 10%; }
-}
-.modal-header {
-  padding: 9px 15px;
-  border-bottom: 1px solid #eee;
-  // Close icon
-  .close { margin-top: 2px; }
-  // Heading
-  h3 {
-    margin: 0;
-    line-height: 30px;
-  }
-}
-
-// Body (where all modal content resides)
-.modal-body {
-  position: relative;
-  overflow-y: auto;
-  max-height: 400px;
-  padding: 15px;
-}
-// Remove bottom margin if need be
-.modal-form {
-  margin-bottom: 0;
-}
-
-// Footer (for actions)
-.modal-footer {
-  padding: 14px 15px 15px;
-  margin-bottom: 0;
-  text-align: right; // right align buttons
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  .border-radius(0 0 6px 6px);
-  .box-shadow(inset 0 1px 0 @white);
-  .clearfix(); // clear it in case folks use .pull-* classes on buttons
-
-  // Properly space out buttons
-  .btn + .btn {
-    margin-left: 5px;
-    margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
-  }
-  // but override that for button groups
-  .btn-group .btn + .btn {
-    margin-left: -1px;
-  }
-  // and override it for block buttons as well
-  .btn-block + .btn-block {
-    margin-left: 0;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/navbar.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/navbar.less
deleted file mode 100644
index dd1a5b0650..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/navbar.less
+++ /dev/null
@@ -1,491 +0,0 @@
-//
-// Navbars (Redux)
-// --------------------------------------------------
-
-
-// COMMON STYLES
-// -------------
-
-// Base class and wrapper
-.navbar {
-  overflow: visible;
-  margin-bottom: @baseLineHeight;
-}
-
-// Inner for background effects
-// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present
-.navbar-inner {
-  min-height: @navbarHeight;
-  padding-left:  20px;
-  padding-right: 20px;
-  #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
-  border: 1px solid @navbarBorder;
-  .border-radius(@baseBorderRadius);
-  .box-shadow(0 1px 4px rgba(0,0,0,.065));
-
-  // Prevent floats from breaking the navbar
-  .clearfix();
-}
-
-// Set width to auto for default container
-// We then reset it for fixed navbars in the #gridSystem mixin
-.navbar .container {
-  width: auto;
-}
-
-// Override the default collapsed state
-.nav-collapse.collapse {
-  height: auto;
-  overflow: visible;
-}
-
-
-// Brand: website or project name
-// -------------------------
-.navbar .brand {
-  float: left;
-  display: block;
-  // Vertically center the text given @navbarHeight
-  padding: ((@navbarHeight - @baseLineHeight) / 2) 20px ((@navbarHeight - @baseLineHeight) / 2);
-  margin-left: -20px; // negative indent to left-align the text down the page
-  font-size: 20px;
-  font-weight: 200;
-  color: @navbarBrandColor;
-  text-shadow: 0 1px 0 @navbarBackgroundHighlight;
-  &:hover,
-  &:focus {
-    text-decoration: none;
-  }
-}
-
-// Plain text in topbar
-// -------------------------
-.navbar-text {
-  margin-bottom: 0;
-  line-height: @navbarHeight;
-  color: @navbarText;
-}
-
-// Janky solution for now to account for links outside the .nav
-// -------------------------
-.navbar-link {
-  color: @navbarLinkColor;
-  &:hover,
-  &:focus {
-    color: @navbarLinkColorHover;
-  }
-}
-
-// Dividers in navbar
-// -------------------------
-.navbar .divider-vertical {
-  height: @navbarHeight;
-  margin: 0 9px;
-  border-left: 1px solid @navbarBackground;
-  border-right: 1px solid @navbarBackgroundHighlight;
-}
-
-// Buttons in navbar
-// -------------------------
-.navbar .btn,
-.navbar .btn-group {
-  .navbarVerticalAlign(30px); // Vertically center in navbar
-}
-.navbar .btn-group .btn,
-.navbar .input-prepend .btn,
-.navbar .input-append .btn,
-.navbar .input-prepend .btn-group,
-.navbar .input-append .btn-group {
-  margin-top: 0; // then undo the margin here so we don't accidentally double it
-}
-
-// Navbar forms
-// -------------------------
-.navbar-form {
-  margin-bottom: 0; // remove default bottom margin
-  .clearfix();
-  input,
-  select,
-  .radio,
-  .checkbox {
-    .navbarVerticalAlign(30px); // Vertically center in navbar
-  }
-  input,
-  select,
-  .btn {
-    display: inline-block;
-    margin-bottom: 0;
-  }
-  input[type="image"],
-  input[type="checkbox"],
-  input[type="radio"] {
-    margin-top: 3px;
-  }
-  .input-append,
-  .input-prepend {
-    margin-top: 5px;
-    white-space: nowrap; // preven two  items from separating within a .navbar-form that has .pull-left
-    input {
-      margin-top: 0; // remove the margin on top since it's on the parent
-    }
-  }
-}
-
-// Navbar search
-// -------------------------
-.navbar-search {
-  position: relative;
-  float: left;
-  .navbarVerticalAlign(30px); // Vertically center in navbar
-  margin-bottom: 0;
-  .search-query {
-    margin-bottom: 0;
-    padding: 4px 14px;
-    #font > .sans-serif(13px, normal, 1);
-    .border-radius(15px); // redeclare because of specificity of the type attribute
-  }
-}
-
-
-
-// Static navbar
-// -------------------------
-
-.navbar-static-top {
-  position: static;
-  margin-bottom: 0; // remove 18px margin for default navbar
-  .navbar-inner {
-    .border-radius(0);
-  }
-}
-
-
-
-// Fixed navbar
-// -------------------------
-
-// Shared (top/bottom) styles
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  position: fixed;
-  right: 0;
-  left: 0;
-  z-index: @zindexFixedNavbar;
-  margin-bottom: 0; // remove 18px margin for default navbar
-}
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
-  border-width: 0 0 1px;
-}
-.navbar-fixed-bottom .navbar-inner {
-  border-width: 1px 0 0;
-}
-.navbar-fixed-top .navbar-inner,
-.navbar-fixed-bottom .navbar-inner {
-  padding-left:  0;
-  padding-right: 0;
-  .border-radius(0);
-}
-
-// Reset container width
-// Required here as we reset the width earlier on and the grid mixins don't override early enough
-.navbar-static-top .container,  
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container { 
-width: ((@gridColumnWidth * @gridColumns) + (@gridGutterWidth * (@gridColumns - 1)));
-}
-
-// Fixed to top
-.navbar-fixed-top {
-  top: 0;
-}
-.navbar-fixed-top,
-.navbar-static-top {
-  .navbar-inner {
-    .box-shadow(~"0 1px 10px rgba(0,0,0,.1)");
-  }
-}
-
-// Fixed to bottom
-.navbar-fixed-bottom {
-  bottom: 0;
-  .navbar-inner {
-    .box-shadow(~"0 -1px 10px rgba(0,0,0,.1)");
-  }
-}
-
-
-
-// NAVIGATION
-// ----------
-
-.navbar .nav {
-  position: relative;
-  left: 0;
-  display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-.navbar .nav.pull-right {
-  float: right; // redeclare due to specificity
-  margin-right: 0; // remove margin on float right nav
-}
-.navbar .nav > li {
-  float: left;
-}
-
-// Links
-.navbar .nav > li > a {
-  float: none;
-  // Vertically center the text given @navbarHeight
-  padding: ((@navbarHeight - @baseLineHeight) / 2) 15px ((@navbarHeight - @baseLineHeight) / 2);
-  color: @navbarLinkColor;
-  text-decoration: none;
-  text-shadow: 0 1px 0 @navbarBackgroundHighlight;
-}
-.navbar .nav .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-// Hover/focus
-.navbar .nav > li > a:focus,
-.navbar .nav > li > a:hover {
-  background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover/:focus from .active
-  color: @navbarLinkColorHover;
-  text-decoration: none;
-}
-
-// Active nav items
-.navbar .nav > .active > a,
-.navbar .nav > .active > a:hover,
-.navbar .nav > .active > a:focus {
-  color: @navbarLinkColorActive;
-  text-decoration: none;
-  background-color: @navbarLinkBackgroundActive;
-  .box-shadow(inset 0 3px 8px rgba(0,0,0,.125));
-}
-
-// Navbar button for toggling navbar items in responsive layouts
-// These definitions need to come after '.navbar .btn'
-.navbar .btn-navbar {
-  display: none;
-  float: right;
-  padding: 7px 10px;
-  margin-left: 5px;
-  margin-right: 5px;
-  .buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%));
-  .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)");
-}
-.navbar .btn-navbar .icon-bar {
-  display: block;
-  width: 18px;
-  height: 2px;
-  background-color: #f5f5f5;
-  .border-radius(1px);
-  .box-shadow(0 1px 0 rgba(0,0,0,.25));
-}
-.btn-navbar .icon-bar + .icon-bar {
-  margin-top: 3px;
-}
-
-
-
-// Dropdown menus
-// --------------
-
-// Menu position and menu carets
-.navbar .nav > li > .dropdown-menu {
-  &:before {
-    content: '';
-    display: inline-block;
-    border-left:   7px solid transparent;
-    border-right:  7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-bottom-color: @dropdownBorder;
-    position: absolute;
-    top: -7px;
-    left: 9px;
-  }
-  &:after {
-    content: '';
-    display: inline-block;
-    border-left:   6px solid transparent;
-    border-right:  6px solid transparent;
-    border-bottom: 6px solid @dropdownBackground;
-    position: absolute;
-    top: -6px;
-    left: 10px;
-  }
-}
-// Menu position and menu caret support for dropups via extra dropup class
-.navbar-fixed-bottom .nav > li > .dropdown-menu {
-  &:before {
-    border-top: 7px solid #ccc;
-    border-top-color: @dropdownBorder;
-    border-bottom: 0;
-    bottom: -7px;
-    top: auto;
-  }
-  &:after {
-    border-top: 6px solid @dropdownBackground;
-    border-bottom: 0;
-    bottom: -6px;
-    top: auto;
-  }
-}
-
-// Caret should match text color on hover/focus
-.navbar .nav li.dropdown > a:hover .caret,
-.navbar .nav li.dropdown > a:focus .caret {
-  border-top-color: @navbarLinkColorHover;
-  border-bottom-color: @navbarLinkColorHover;
-}
-
-// Remove background color from open dropdown
-.navbar .nav li.dropdown.open > .dropdown-toggle,
-.navbar .nav li.dropdown.active > .dropdown-toggle,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle {
-  background-color: @navbarLinkBackgroundActive;
-  color: @navbarLinkColorActive;
-}
-.navbar .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: @navbarLinkColor;
-  border-bottom-color: @navbarLinkColor;
-}
-.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: @navbarLinkColorActive;
-  border-bottom-color: @navbarLinkColorActive;
-}
-
-// Right aligned menus need alt position
-.navbar .pull-right > li > .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right {
-  left: auto;
-  right: 0;
-  &:before {
-    left: auto;
-    right: 12px;
-  }
-  &:after {
-    left: auto;
-    right: 13px;
-  }
-  .dropdown-menu {
-    left: auto;
-    right: 100%;
-    margin-left: 0;
-    margin-right: -1px;
-    .border-radius(6px 0 6px 6px);
-  }
-}
-
-
-// Inverted navbar
-// -------------------------
-
-.navbar-inverse {
-
-  .navbar-inner {
-    #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
-    border-color: @navbarInverseBorder;
-  }
-
-  .brand,
-  .nav > li > a {
-    color: @navbarInverseLinkColor;
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-    &:hover,
-    &:focus {
-      color: @navbarInverseLinkColorHover;
-    }
-  }
-
-  .brand {
-    color: @navbarInverseBrandColor;
-  }
-
-  .navbar-text {
-    color: @navbarInverseText;
-  }
-
-  .nav > li > a:focus,
-  .nav > li > a:hover {
-    background-color: @navbarInverseLinkBackgroundHover;
-    color: @navbarInverseLinkColorHover;
-  }
-
-  .nav .active > a,
-  .nav .active > a:hover,
-  .nav .active > a:focus {
-    color: @navbarInverseLinkColorActive;
-    background-color: @navbarInverseLinkBackgroundActive;
-  }
-
-  // Inline text links
-  .navbar-link {
-    color: @navbarInverseLinkColor;
-    &:hover,
-    &:focus {
-      color: @navbarInverseLinkColorHover;
-    }
-  }
-
-  // Dividers in navbar
-  .divider-vertical {
-    border-left-color: @navbarInverseBackground;
-    border-right-color: @navbarInverseBackgroundHighlight;
-  }
-
-  // Dropdowns
-  .nav li.dropdown.open > .dropdown-toggle,
-  .nav li.dropdown.active > .dropdown-toggle,
-  .nav li.dropdown.open.active > .dropdown-toggle {
-    background-color: @navbarInverseLinkBackgroundActive;
-    color: @navbarInverseLinkColorActive;
-  }
-  .nav li.dropdown > a:hover .caret,
-  .nav li.dropdown > a:focus .caret {
-    border-top-color: @navbarInverseLinkColorActive;
-    border-bottom-color: @navbarInverseLinkColorActive;
-  }
-  .nav li.dropdown > .dropdown-toggle .caret {
-    border-top-color: @navbarInverseLinkColor;
-    border-bottom-color: @navbarInverseLinkColor;
-  }
-  .nav li.dropdown.open > .dropdown-toggle .caret,
-  .nav li.dropdown.active > .dropdown-toggle .caret,
-  .nav li.dropdown.open.active > .dropdown-toggle .caret {
-    border-top-color: @navbarInverseLinkColorActive;
-    border-bottom-color: @navbarInverseLinkColorActive;
-  }
-
-  // Navbar search
-  .navbar-search {
-    .search-query {
-      color: @white;
-      background-color: @navbarInverseSearchBackground;
-      border-color: @navbarInverseSearchBorder;
-      .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
-      .transition(none);
-      .placeholder(@navbarInverseSearchPlaceholderColor);
-
-      &:focus{
-        padding: 5px 15px;
-        color: @grayDark;
-        text-shadow: 0 1px 0 @white;
-        background-color: @navbarInverseSearchBackgroundFocus;
-        border: 0;
-        .box-shadow(0 0 3px rgba(0,0,0,.15));
-        outline: 0;
-      }
-    }
-  }
-
-  // Navbar collapse button
-  .btn-navbar {
-    .buttonBackground(darken(@navbarInverseBackgroundHighlight, 5%), darken(@navbarInverseBackground, 5%));
-  }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/navs.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/navs.less
deleted file mode 100644
index 01cd805bde..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/navs.less
+++ /dev/null
@@ -1,409 +0,0 @@
-//
-// Navs
-// --------------------------------------------------
-
-
-// BASE CLASS
-// ----------
-
-.nav {
-  margin-left: 0;
-  margin-bottom: @baseLineHeight;
-  list-style: none;
-}
-
-// Make links block level
-.nav > li > a {
-  display: block;
-}
-.nav > li > a:hover,
-.nav > li > a:focus {
-  text-decoration: none;
-  background-color: @grayLighter;
-}
-
-// Prevent IE8 from misplacing imgs
-// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
-.nav > li > a > img {
-  max-width: none;
-}
-
-// Redeclare pull classes because of specifity
-.nav > .pull-right {
-  float: right;
-}
-
-// Nav headers (for dropdowns and lists)
-.nav-header {
-  display: block;
-  padding: 3px 15px;
-  font-size: 11px;
-  font-weight: bold;
-  line-height: @baseLineHeight;
-  color: @grayLight;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-  text-transform: uppercase;
-}
-// Space them out when they follow another list item (link)
-.nav li + .nav-header {
-  margin-top: 9px;
-}
-
-
-
-// NAV LIST
-// --------
-
-.nav-list {
-  padding-left: 15px;
-  padding-right: 15px;
-  margin-bottom: 0;
-}
-.nav-list > li > a,
-.nav-list .nav-header {
-  margin-left:  -15px;
-  margin-right: -15px;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-}
-.nav-list > li > a {
-  padding: 3px 15px;
-}
-.nav-list > .active > a,
-.nav-list > .active > a:hover,
-.nav-list > .active > a:focus {
-  color: @white;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
-  background-color: @linkColor;
-}
-.nav-list [class^="icon-"],
-.nav-list [class*=" icon-"] {
-  margin-right: 2px;
-}
-// Dividers (basically an hr) within the dropdown
-.nav-list .divider {
-  .nav-divider();
-}
-
-
-
-// TABS AND PILLS
-// -------------
-
-// Common styles
-.nav-tabs,
-.nav-pills {
-  .clearfix();
-}
-.nav-tabs > li,
-.nav-pills > li {
-  float: left;
-}
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px; // keeps the overall height an even number
-}
-
-// TABS
-// ----
-
-// Give the tabs something to sit on
-.nav-tabs {
-  border-bottom: 1px solid #ddd;
-}
-// Make the list-items overlay the bottom border
-.nav-tabs > li {
-  margin-bottom: -1px;
-}
-// Actual tabs (as links)
-.nav-tabs > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  line-height: @baseLineHeight;
-  border: 1px solid transparent;
-  .border-radius(4px 4px 0 0);
-  &:hover,
-  &:focus {
-    border-color: @grayLighter @grayLighter #ddd;
-  }
-}
-// Active state, and it's :hover/:focus to override normal :hover/:focus
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover,
-.nav-tabs > .active > a:focus {
-  color: @gray;
-  background-color: @bodyBackground;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-  cursor: default;
-}
-
-
-// PILLS
-// -----
-
-// Links rendered as pills
-.nav-pills > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  .border-radius(5px);
-}
-
-// Active state
-.nav-pills > .active > a,
-.nav-pills > .active > a:hover,
-.nav-pills > .active > a:focus {
-  color: @white;
-  background-color: @linkColor;
-}
-
-
-
-// STACKED NAV
-// -----------
-
-// Stacked tabs and pills
-.nav-stacked > li {
-  float: none;
-}
-.nav-stacked > li > a {
-  margin-right: 0; // no need for the gap between nav items
-}
-
-// Tabs
-.nav-tabs.nav-stacked {
-  border-bottom: 0;
-}
-.nav-tabs.nav-stacked > li > a {
-  border: 1px solid #ddd;
-  .border-radius(0);
-}
-.nav-tabs.nav-stacked > li:first-child > a {
-  .border-top-radius(4px);
-}
-.nav-tabs.nav-stacked > li:last-child > a {
-  .border-bottom-radius(4px);
-}
-.nav-tabs.nav-stacked > li > a:hover,
-.nav-tabs.nav-stacked > li > a:focus {
-  border-color: #ddd;
-  z-index: 2;
-}
-
-// Pills
-.nav-pills.nav-stacked > li > a {
-  margin-bottom: 3px;
-}
-.nav-pills.nav-stacked > li:last-child > a {
-  margin-bottom: 1px; // decrease margin to match sizing of stacked tabs
-}
-
-
-
-// DROPDOWNS
-// ---------
-
-.nav-tabs .dropdown-menu {
-  .border-radius(0 0 6px 6px); // remove the top rounded corners here since there is a hard edge above the menu
-}
-.nav-pills .dropdown-menu {
-  .border-radius(6px); // make rounded corners match the pills
-}
-
-// Default dropdown links
-// -------------------------
-// Make carets use linkColor to start
-.nav .dropdown-toggle .caret {
-  border-top-color: @linkColor;
-  border-bottom-color: @linkColor;
-  margin-top: 6px;
-}
-.nav .dropdown-toggle:hover .caret,
-.nav .dropdown-toggle:focus .caret {
-  border-top-color: @linkColorHover;
-  border-bottom-color: @linkColorHover;
-}
-/* move down carets for tabs */
-.nav-tabs .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-// Active dropdown links
-// -------------------------
-.nav .active .dropdown-toggle .caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
-}
-.nav-tabs .active .dropdown-toggle .caret {
-  border-top-color: @gray;
-  border-bottom-color: @gray;
-}
-
-// Active:hover/:focus dropdown links
-// -------------------------
-.nav > .dropdown.active > a:hover,
-.nav > .dropdown.active > a:focus {
-  cursor: pointer;
-}
-
-// Open dropdowns
-// -------------------------
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > li.dropdown.open.active > a:hover,
-.nav > li.dropdown.open.active > a:focus {
-  color: @white;
-  background-color: @grayLight;
-  border-color: @grayLight;
-}
-.nav li.dropdown.open .caret,
-.nav li.dropdown.open.active .caret,
-.nav li.dropdown.open a:hover .caret,
-.nav li.dropdown.open a:focus .caret {
-  border-top-color: @white;
-  border-bottom-color: @white;
-  .opacity(100);
-}
-
-// Dropdowns in stacked tabs
-.tabs-stacked .open > a:hover,
-.tabs-stacked .open > a:focus {
-  border-color: @grayLight;
-}
-
-
-
-// TABBABLE
-// --------
-
-
-// COMMON STYLES
-// -------------
-
-// Clear any floats
-.tabbable {
-  .clearfix();
-}
-.tab-content {
-  overflow: auto; // prevent content from running below tabs
-}
-
-// Remove border on bottom, left, right
-.tabs-below > .nav-tabs,
-.tabs-right > .nav-tabs,
-.tabs-left > .nav-tabs {
-  border-bottom: 0;
-}
-
-// Show/hide tabbable areas
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
-
-
-// BOTTOM
-// ------
-
-.tabs-below > .nav-tabs {
-  border-top: 1px solid #ddd;
-}
-.tabs-below > .nav-tabs > li {
-  margin-top: -1px;
-  margin-bottom: 0;
-}
-.tabs-below > .nav-tabs > li > a {
-  .border-radius(0 0 4px 4px);
-  &:hover,
-  &:focus {
-    border-bottom-color: transparent;
-    border-top-color: #ddd;
-  }
-}
-.tabs-below > .nav-tabs > .active > a,
-.tabs-below > .nav-tabs > .active > a:hover,
-.tabs-below > .nav-tabs > .active > a:focus {
-  border-color: transparent #ddd #ddd #ddd;
-}
-
-// LEFT & RIGHT
-// ------------
-
-// Common styles
-.tabs-left > .nav-tabs > li,
-.tabs-right > .nav-tabs > li {
-  float: none;
-}
-.tabs-left > .nav-tabs > li > a,
-.tabs-right > .nav-tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-
-// Tabs on the left
-.tabs-left > .nav-tabs {
-  float: left;
-  margin-right: 19px;
-  border-right: 1px solid #ddd;
-}
-.tabs-left > .nav-tabs > li > a {
-  margin-right: -1px;
-  .border-radius(4px 0 0 4px);
-}
-.tabs-left > .nav-tabs > li > a:hover,
-.tabs-left > .nav-tabs > li > a:focus {
-  border-color: @grayLighter #ddd @grayLighter @grayLighter;
-}
-.tabs-left > .nav-tabs .active > a,
-.tabs-left > .nav-tabs .active > a:hover,
-.tabs-left > .nav-tabs .active > a:focus {
-  border-color: #ddd transparent #ddd #ddd;
-  *border-right-color: @white;
-}
-
-// Tabs on the right
-.tabs-right > .nav-tabs {
-  float: right;
-  margin-left: 19px;
-  border-left: 1px solid #ddd;
-}
-.tabs-right > .nav-tabs > li > a {
-  margin-left: -1px;
-  .border-radius(0 4px 4px 0);
-}
-.tabs-right > .nav-tabs > li > a:hover,
-.tabs-right > .nav-tabs > li > a:focus {
-  border-color: @grayLighter @grayLighter @grayLighter #ddd;
-}
-.tabs-right > .nav-tabs .active > a,
-.tabs-right > .nav-tabs .active > a:hover,
-.tabs-right > .nav-tabs .active > a:focus {
-  border-color: #ddd #ddd #ddd transparent;
-  *border-left-color: @white;
-}
-
-
-
-// DISABLED STATES
-// ---------------
-
-// Gray out text
-.nav > .disabled > a {
-  color: @grayLight;
-}
-// Nuke hover/focus effects
-.nav > .disabled > a:hover,
-.nav > .disabled > a:focus {
-  text-decoration: none;
-  background-color: transparent;
-  cursor: default;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pager.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pager.less
deleted file mode 100644
index 718ade757e..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pager.less
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Pager pagination
-// --------------------------------------------------
-
-
-.pager {
-  margin: @baseLineHeight 0;
-  list-style: none;
-  text-align: center;
-  .clearfix();
-}
-.pager li {
-  display: inline;
-}
-.pager li > a,
-.pager li > button,
-.pager li > span {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  .border-radius(15px);
-}
-.pager li > a:hover,
-.pager li > a:focus,
-.pager li > button:hover,
-.pager li > button:focus {
-    text-decoration: none;
-    background-color: #f5f5f5;
-}
-.pager .next > a,
-.pager .next > button,
-.pager .next > span {
-  float: right;
-}
-.pager .previous > a,
-.pager .previous > button,
-.pager .previous > span {
-    float: left;
-}
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > button,
-.pager .disabled > button:hover,
-.pager .disabled > button:focus
-.pager .disabled > span {
-    color: @grayLight;
-    background-color: #fff;
-    cursor: default;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pagination.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pagination.less
deleted file mode 100644
index ae10700eb3..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/pagination.less
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Pagination (multiple pages)
-// --------------------------------------------------
-
-// Space out pagination from surrounding content
-.pagination {
-  margin: @baseLineHeight 0;
-}
-
-.pagination ul {
-  // Allow for text-based alignment
-  display: inline-block;
-  // Reset default ul styles
-  margin-left: 0;
-  margin-bottom: 0;
-  // Visuals
-  .border-radius(@baseBorderRadius);
-  .box-shadow(0 1px 2px rgba(0,0,0,.05));
-}
-.pagination ul > li {
-  display: inline; // Remove list-style and block-level defaults
-}
-.pagination ul > li > a,
-.pagination ul > li > button,
-.pagination ul > li > span {
-  float: left; // Collapse white-space
-  padding: 4px 12px;
-  line-height: @baseLineHeight;
-  text-decoration: none;
-  background-color: @paginationBackground;
-  border: 1px solid @paginationBorder;
-  border-left-width: 0;
-}
-.pagination ul > li > a:hover,
-.pagination ul > li > a:focus,
-.pagination ul > li > button:hover,
-.pagination ul > li > button:focus,
-.pagination ul > .active > a,
-.pagination ul > .active > button,
-.pagination ul > .active > span {
-    background-color: @paginationActiveBackground;
-}
-.pagination ul > .active > a,
-.pagination ul > .active > button,
-.pagination ul > .active > span {
-    color: @grayLight;
-    cursor: default;
-}
-.pagination ul > .disabled > span,
-.pagination ul > .disabled > a,
-.pagination ul > .disabled > a:hover,
-.pagination ul > .disabled > a:focus,
-.pagination ul > .disabled > button,
-.pagination ul > .disabled > button:hover,
-.pagination ul > .disabled > button:focus {
-    color: @grayLight;
-    background-color: transparent;
-    cursor: default;
-}
-.pagination ul > li:first-child > a,
-.pagination ul > li:first-child > button,
-.pagination ul > li:first-child > span {
-  border-left-width: 1px;
-  .border-left-radius(@baseBorderRadius);
-}
-.pagination ul > li:last-child > a,
-.pagination ul > li:last-child > button,
-.pagination ul > li:last-child > span {
-  .border-right-radius(@baseBorderRadius);
-}
-
-
-// Alignment
-// --------------------------------------------------
-
-.pagination-centered {
-  text-align: center;
-}
-.pagination-right {
-  text-align: right;
-}
-
-
-// Sizing
-// --------------------------------------------------
-
-// Large
-.pagination-large {
-  ul > li > a,
-  ul > li > button,
-  ul > li > span {
-    padding: @paddingLarge;
-    font-size: @fontSizeLarge;
-  }
-  ul > li:first-child > a,
-  ul > li:first-child > button,
-  ul > li:first-child > span {
-    .border-left-radius(@borderRadiusLarge);
-  }
-  ul > li:last-child > a,
-  ul > li:last-child > button,
-  ul > li:last-child > span {
-    .border-right-radius(@borderRadiusLarge);
-  }
-}
-
-// Small and mini
-.pagination-mini,
-.pagination-small {
-  ul > li:first-child > a,
-  ul > li:first-child > button,
-  ul > li:first-child > span {
-    .border-left-radius(@borderRadiusSmall);
-  }
-  ul > li:last-child > a,
-  ul > li:last-child > button,
-  ul > li:last-child > span {
-    .border-right-radius(@borderRadiusSmall);
-  }
-}
-
-// Small
-.pagination-small {
-  ul > li > a,
-  ul > li > button,
-  ul > li > span {
-    padding: @paddingSmall;
-    font-size: @fontSizeSmall;
-  }
-}
-// Mini
-.pagination-mini {
-  ul > li > a,
-  ul > li > button,
-  ul > li > span {
-    padding: @paddingMini;
-    font-size: @fontSizeMini;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/popovers.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/popovers.less
deleted file mode 100644
index f7d2924406..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/popovers.less
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Popovers
-// --------------------------------------------------
-
-
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: @zindexPopover;
-  display: none;
-  max-width: 276px;
-  padding: 1px;
-  text-align: left; // Reset given new insertion method
-  background-color: @popoverBackground;
-  background-clip: padding-box;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0,0,0,.2);
-  .border-radius(6px);
-  .box-shadow(0 5px 10px rgba(0,0,0,.2));
-
-  // Overrides for proper insertion
-  white-space: normal;
-
-  // Offset the popover to account for the popover arrow
-  &.top     { margin-top: -10px; }
-  &.right   { margin-left: 10px; }
-  &.bottom  { margin-top: 10px; }
-  &.left    { margin-left: -10px; }
-}
-
-.popover-title {
-  margin: 0; // reset heading margin
-  padding: 8px 14px;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 18px;
-  background-color: @popoverTitleBackground;
-  border-bottom: 1px solid darken(@popoverTitleBackground, 5%);
-  .border-radius(5px 5px 0 0);
-
-  &:empty {
-    display: none;
-  }
-}
-
-.popover-content {
-  padding: 9px 14px;
-}
-
-// Arrows
-//
-// .arrow is outer, .arrow:after is inner
-
-.popover .arrow,
-.popover .arrow:after {
-  position: absolute;
-  display: block;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-.popover .arrow {
-  border-width: @popoverArrowOuterWidth;
-}
-.popover .arrow:after {
-  border-width: @popoverArrowWidth;
-  content: "";
-}
-
-.popover {
-  &.top .arrow {
-    left: 50%;
-    margin-left: (@popoverArrowOuterWidth * -1);
-    border-bottom-width: 0;
-    border-top-color: #999; // IE8 fallback
-    border-top-color: @popoverArrowOuterColor;
-    bottom: (@popoverArrowOuterWidth * -1);
-    &:after {
-      bottom: 1px;
-      margin-left: (@popoverArrowWidth * -1);
-      border-bottom-width: 0;
-      border-top-color: @popoverArrowColor;
-    }
-  }
-  &.right .arrow {
-    top: 50%;
-    left: (@popoverArrowOuterWidth * -1);
-    margin-top: (@popoverArrowOuterWidth * -1);
-    border-left-width: 0;
-    border-right-color: #999; // IE8 fallback
-    border-right-color: @popoverArrowOuterColor;
-    &:after {
-      left: 1px;
-      bottom: (@popoverArrowWidth * -1);
-      border-left-width: 0;
-      border-right-color: @popoverArrowColor;
-    }
-  }
-  &.bottom .arrow {
-    left: 50%;
-    margin-left: (@popoverArrowOuterWidth * -1);
-    border-top-width: 0;
-    border-bottom-color: #999; // IE8 fallback
-    border-bottom-color: @popoverArrowOuterColor;
-    top: (@popoverArrowOuterWidth * -1);
-    &:after {
-      top: 1px;
-      margin-left: (@popoverArrowWidth * -1);
-      border-top-width: 0;
-      border-bottom-color: @popoverArrowColor;
-    }
-  }
-
-  &.left .arrow {
-    top: 50%;
-    right: (@popoverArrowOuterWidth * -1);
-    margin-top: (@popoverArrowOuterWidth * -1);
-    border-right-width: 0;
-    border-left-color: #999; // IE8 fallback
-    border-left-color: @popoverArrowOuterColor;
-    &:after {
-      right: 1px;
-      border-right-width: 0;
-      border-left-color: @popoverArrowColor;
-      bottom: (@popoverArrowWidth * -1);
-    }
-  }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/progress-bars.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/progress-bars.less
deleted file mode 100644
index d8822ee848..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/progress-bars.less
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Progress bars
-// --------------------------------------------------
-
-
-// ANIMATIONS
-// ----------
-
-// Spec
-@keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
-
-
-// THE BARS
-// --------
-
-// Outer container
-.progress {
-  overflow: hidden;
-  height: @baseLineHeight;
-  margin-bottom: @baseLineHeight;
-  #gradient > .vertical(#f5f5f5, #f9f9f9);
-  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
-  .border-radius(@baseBorderRadius);
-}
-
-// Bar of progress
-.progress .bar {
-  width: 0%;
-  height: 100%;
-  color: @white;
-  float: left;
-  font-size: 12px;
-  text-align: center;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  #gradient > .vertical(#149bdf, #0480be);
-  .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
-  .box-sizing(border-box);
-  .transition(width .6s ease);
-}
-.progress .bar + .bar {
-  .box-shadow(~"inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)");
-}
-
-// Striped bars
-.progress-striped .bar {
-  #gradient > .striped(#149bdf);
-  .background-size(40px 40px);
-}
-
-// Call animation for the active one
-.progress.active .bar {
-    animation: progress-bar-stripes 2s linear infinite;
-}
-
-
-
-// COLORS
-// ------
-
-// Danger (red)
-.progress-danger .bar, .progress .bar-danger {
-  #gradient > .vertical(#ee5f5b, #c43c35);
-}
-.progress-danger.progress-striped .bar, .progress-striped .bar-danger {
-  #gradient > .striped(#ee5f5b);
-}
-
-// Success (green)
-.progress-success .bar, .progress .bar-success {
-  #gradient > .vertical(#62c462, #57a957);
-}
-.progress-success.progress-striped .bar, .progress-striped .bar-success {
-  #gradient > .striped(#62c462);
-}
-
-// Info (teal)
-.progress-info .bar, .progress .bar-info {
-  #gradient > .vertical(#5bc0de, #339bb9);
-}
-.progress-info.progress-striped .bar, .progress-striped .bar-info {
-  #gradient > .striped(#5bc0de);
-}
-
-// Warning (orange)
-.progress-warning .bar, .progress .bar-warning {
-  #gradient > .vertical(lighten(@orange, 15%), @orange);
-}
-.progress-warning.progress-striped .bar, .progress-striped .bar-warning {
-  #gradient > .striped(lighten(@orange, 15%));
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/reset.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/reset.less
deleted file mode 100644
index 01be666671..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/reset.less
+++ /dev/null
@@ -1,215 +0,0 @@
-//
-// Reset CSS
-// Adapted from http://github.com/necolas/normalize.css
-// --------------------------------------------------
-
-
-// Display in IE6-9 and FF3
-// -------------------------
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section {
-  display: block;
-}
-
-// Display block in IE6-9 and FF3
-// -------------------------
-
-audio,
-canvas,
-video {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-}
-
-// Prevents modern browsers from displaying 'audio' without controls
-// -------------------------
-
-audio:not([controls]) {
-    display: none;
-}
-
-// Base settings
-// -------------------------
-
-html {
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-// Focus states
-a:focus {
-  .tab-focus();
-}
-// Hover & Active
-a:hover,
-a:active {
-  outline: 0;
-}
-
-// Prevents sub and sup affecting line-height in all browsers
-// -------------------------
-
-sub,
-sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-sup {
-  top: -0.5em;
-}
-sub {
-  bottom: -0.25em;
-}
-
-// Img border in a's and image quality
-// -------------------------
-
-img {
-  /* Responsive images (ensure images don't scale beyond their parents) */
-  max-width: 100%; /* Part 1: Set a maxium relative to the parent */
-  height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */
-
-  vertical-align: middle;
-  border: 0;
-  -ms-interpolation-mode: bicubic;
-}
-
-// Prevent max-width from affecting Google Maps
-#map_canvas img,
-.google-maps img {
-  max-width: none;
-}
-
-// Forms
-// -------------------------
-
-// Font size in all browsers, margin changes, misc consistency
-button,
-input,
-select,
-textarea {
-  margin: 0;
-  font-size: 100%;
-  vertical-align: middle;
-}
-button,
-input {
-  *overflow: visible; // Inner spacing ie IE6/7
-  line-height: normal; // FF3/4 have !important on line-height in UA stylesheet
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
-  padding: 0;
-  border: 0;
-}
-button,
-html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls.
-input[type="reset"],
-input[type="submit"] {
-    -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS.
-    cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
-}
-label,
-select,
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"],
-input[type="radio"],
-input[type="checkbox"] {
-    cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
-}
-input[type="search"] { // Appearance in Safari/Chrome
-  .box-sizing(content-box);
-  -webkit-appearance: textfield;
-}
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
-}
-textarea {
-  overflow: auto; // Remove vertical scrollbar in IE6-9
-  vertical-align: top; // Readability and alignment cross-browser
-}
-
-
-// Printing
-// -------------------------
-// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
-
-@media print {
-
-  * {
-    text-shadow: none !important;
-    color: #000 !important; // Black prints faster: h5bp.com/s
-    background: transparent !important;
-    box-shadow: none !important;
-  }
-
-  a,
-  a:visited {
-    text-decoration: underline;
-  }
-
-  a[href]:after {
-    content: " (" attr(href) ")";
-  }
-
-  abbr[title]:after {
-    content: " (" attr(title) ")";
-  }
-
-  // Don't show links for images, or javascript/internal links
-  .ir a:after,
-  a[href^="javascript:"]:after,
-  a[href^="#"]:after {
-    content: "";
-  }
-
-  pre,
-  blockquote {
-    border: 1px solid #999;
-    page-break-inside: avoid;
-  }
-
-  thead {
-    display: table-header-group; // h5bp.com/t
-  }
-
-  tr,
-  img {
-    page-break-inside: avoid;
-  }
-
-  img {
-    max-width: 100% !important;
-  }
-
-  @page {
-    margin: 0.5cm;
-  }
-
-  p,
-  h2,
-  h3 {
-    orphans: 3;
-    widows: 3;
-  }
-
-  h2,
-  h3 {
-    page-break-after: avoid;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-1200px-min.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-1200px-min.less
deleted file mode 100644
index a92b65c9e1..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-1200px-min.less
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// Responsive: Large desktop and up
-// --------------------------------------------------
-
-
-@media (min-width: 1200px) {
-
-  // Fixed grid
-  #grid > .core(@gridColumnWidth1200, @gridGutterWidth1200);
-
-  // Fluid grid
-  #grid > .fluid(@fluidGridColumnWidth1200, @fluidGridGutterWidth1200);
-
-  // Input grid
-  #grid > .input(@gridColumnWidth1200, @gridGutterWidth1200);
-
-  // Thumbnails
-  .thumbnails {
-    margin-left: (@gridGutterWidth1200 * -1);
-  }
-  .thumbnails > li {
-    margin-left: @gridGutterWidth1200;
-  }
-  .row-fluid .thumbnails {
-    margin-left: 0;
-  }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-767px-max.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-767px-max.less
deleted file mode 100644
index 0829546ba2..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-767px-max.less
+++ /dev/null
@@ -1,193 +0,0 @@
-//
-// Responsive: Landscape phone to desktop/tablet
-// --------------------------------------------------
-
-
-@media (max-width: 767px) {
-
-  // Padding to set content in a bit
-  body {
-    padding-left: 20px;
-    padding-right: 20px;
-  }
-  // Negative indent the now static "fixed" navbar
-  .navbar-fixed-top,
-  .navbar-fixed-bottom,
-  .navbar-static-top {
-    margin-left: -20px;
-    margin-right: -20px;
-  }
-  // Remove padding on container given explicit padding set on body
-  .container-fluid {
-    padding: 0;
-  }
-
-  // TYPOGRAPHY
-  // ----------
-  // Reset horizontal dl
-  .dl-horizontal {
-    dt {
-      float: none;
-      clear: none;
-      width: auto;
-      text-align: left;
-    }
-    dd {
-      margin-left: 0;
-    }
-  }
-
-  // GRID & CONTAINERS
-  // -----------------
-  // Remove width from containers
-  .container {
-    width: auto;
-  }
-  // Fluid rows
-  .row-fluid {
-    width: 100%;
-  }
-  // Undo negative margin on rows and thumbnails
-  .row,
-  .thumbnails {
-    margin-left: 0;
-  }
-  .thumbnails > li {
-    float: none;
-    margin-left: 0; // Reset the default margin for all li elements when no .span* classes are present
-  }
-  // Make all grid-sized elements block level again
-  [class*="span"],
-  .uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing
-  .row-fluid [class*="span"] {
-    float: none;
-    display: block;
-    width: 100%;
-    margin-left: 0;
-    .box-sizing(border-box);
-  }
-  .span12,
-  .row-fluid .span12 {
-    width: 100%;
-    .box-sizing(border-box);
-  }
-  .row-fluid [class*="offset"]:first-child {
-    margin-left: 0;
-  }
-
-  // FORM FIELDS
-  // -----------
-  // Make span* classes full width
-  .input-large,
-  .input-xlarge,
-  .input-xxlarge,
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    .input-block-level();
-  }
-  // But don't let it screw up prepend/append inputs
-  .input-prepend input,
-  .input-append input,
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"] {
-    display: inline-block; // redeclare so they don't wrap to new lines
-    width: auto;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 0;
-  }
-
-  // Modals
-  .modal {
-    position: fixed;
-    top:   20px;
-    left:  20px;
-    right: 20px;
-    width: auto;
-    margin: 0;
-    &.fade  { top: -100px; }
-    &.fade.in { top: 20px; }
-  }
-
-}
-
-
-
-// UP TO LANDSCAPE PHONE
-// ---------------------
-
-@media (max-width: 480px) {
-
-  // Smooth out the collapsing/expanding nav
-  .nav-collapse {
-    transform: translate3d(0, 0, 0); // activate the GPU
-  }
-
-  // Block level the page header small tag for readability
-  .page-header h1 small {
-    display: block;
-    line-height: @baseLineHeight;
-  }
-
-  // Update checkboxes for iOS
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-
-  // Remove the horizontal form styles
-  .form-horizontal {
-    .control-label {
-      float: none;
-      width: auto;
-      padding-top: 0;
-      text-align: left;
-    }
-    // Move over all input controls and content
-    .controls {
-      margin-left: 0;
-    }
-    // Move the options list down to align with labels
-    .control-list {
-      padding-top: 0; // has to be padding because margin collaspes
-    }
-    // Move over buttons in .form-actions to align with .controls
-    .form-actions {
-      padding-left: 10px;
-      padding-right: 10px;
-    }
-  }
-
-  // Medias
-  // Reset float and spacing to stack
-  .media .pull-left,
-  .media .pull-right  {
-    float: none;
-    display: block;
-    margin-bottom: 10px;
-  }
-  // Remove side margins since we stack instead of indent
-  .media-object {
-    margin-right: 0;
-    margin-left: 0;
-  }
-
-  // Modals
-  .modal {
-    top:   10px;
-    left:  10px;
-    right: 10px;
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-
-  // Carousel
-  .carousel-caption {
-    position: static;
-  }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-768px-979px.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-768px-979px.less
deleted file mode 100644
index 8e8c486a06..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-768px-979px.less
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Responsive: Tablet to desktop
-// --------------------------------------------------
-
-
-@media (min-width: 768px) and (max-width: 979px) {
-
-  // Fixed grid
-  #grid > .core(@gridColumnWidth768, @gridGutterWidth768);
-
-  // Fluid grid
-  #grid > .fluid(@fluidGridColumnWidth768, @fluidGridGutterWidth768);
-
-  // Input grid
-  #grid > .input(@gridColumnWidth768, @gridGutterWidth768);
-
-  // No need to reset .thumbnails here since it's the same @gridGutterWidth
-
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-navbar.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-navbar.less
deleted file mode 100644
index 21cd3ba671..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-navbar.less
+++ /dev/null
@@ -1,189 +0,0 @@
-//
-// Responsive: Navbar
-// --------------------------------------------------
-
-
-// TABLETS AND BELOW
-// -----------------
-@media (max-width: @navbarCollapseWidth) {
-
-  // UNFIX THE TOPBAR
-  // ----------------
-  // Remove any padding from the body
-  body {
-    padding-top: 0;
-  }
-  // Unfix the navbars
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: static;
-  }
-  .navbar-fixed-top {
-    margin-bottom: @baseLineHeight;
-  }
-  .navbar-fixed-bottom {
-    margin-top: @baseLineHeight;
-  }
-  .navbar-fixed-top .navbar-inner,
-  .navbar-fixed-bottom .navbar-inner {
-    padding: 5px;
-  }
-  .navbar .container {
-    width: auto;
-    padding: 0;
-  }
-  // Account for brand name
-  .navbar .brand {
-    padding-left: 10px;
-    padding-right: 10px;
-    margin: 0 0 0 -5px;
-  }
-
-  // COLLAPSIBLE NAVBAR
-  // ------------------
-  // Nav collapse clears brand
-  .nav-collapse {
-    clear: both;
-  }
-  // Block-level the nav
-  .nav-collapse .nav {
-    float: none;
-    margin: 0 0 (@baseLineHeight / 2);
-  }
-  .nav-collapse .nav > li {
-    float: none;
-  }
-  .nav-collapse .nav > li > a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > .divider-vertical {
-    display: none;
-  }
-  .nav-collapse .nav .nav-header {
-    color: @navbarText;
-    text-shadow: none;
-  }
-  // Nav and dropdown links in navbar
-  .nav-collapse .nav > li > a,
-  .nav-collapse .dropdown-menu a {
-    padding: 9px 15px;
-    font-weight: bold;
-    color: @navbarLinkColor;
-    .border-radius(3px);
-  }
-  // Buttons
-  .nav-collapse .btn {
-    padding: 4px 10px 4px;
-    font-weight: normal;
-    .border-radius(@baseBorderRadius);
-  }
-  .nav-collapse .dropdown-menu li + li a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > li > a:hover,
-  .nav-collapse .nav > li > a:focus,
-  .nav-collapse .dropdown-menu a:hover,
-  .nav-collapse .dropdown-menu a:focus {
-    background-color: @navbarBackground;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a,
-  .navbar-inverse .nav-collapse .dropdown-menu a {
-    color: @navbarInverseLinkColor;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a:hover,
-  .navbar-inverse .nav-collapse .nav > li > a:focus,
-  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
-  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
-    background-color: @navbarInverseBackground;
-  }
-  // Buttons in the navbar
-  .nav-collapse.in .btn-group {
-    margin-top: 5px;
-    padding: 0;
-  }
-  // Dropdowns in the navbar
-  .nav-collapse .dropdown-menu {
-    position: static;
-    top: auto;
-    left: auto;
-    float: none;
-    display: none;
-    max-width: none;
-    margin: 0 15px;
-    padding: 0;
-    background-color: transparent;
-    border: none;
-    .border-radius(0);
-    .box-shadow(none);
-  }
-  .nav-collapse .open > .dropdown-menu { 
-    display: block; 
-  }
-
-  .nav-collapse .dropdown-menu:before,
-  .nav-collapse .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .dropdown-menu .divider {
-    display: none;
-  }
-  .nav-collapse .nav > li > .dropdown-menu {
-    &:before,
-    &:after {
-      display: none;
-    }
-  }
-  // Forms in navbar
-  .nav-collapse .navbar-form,
-  .nav-collapse .navbar-search {
-    float: none;
-    padding: (@baseLineHeight / 2) 15px;
-    margin: (@baseLineHeight / 2) 0;
-    border-top: 1px solid @navbarBackground;
-    border-bottom: 1px solid @navbarBackground;
-    .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
-  }
-  .navbar-inverse .nav-collapse .navbar-form,
-  .navbar-inverse .nav-collapse .navbar-search {
-    border-top-color: @navbarInverseBackground;
-    border-bottom-color: @navbarInverseBackground;
-  }
-  // Pull right (secondary) nav content
-  .navbar .nav-collapse .nav.pull-right {
-    float: none;
-    margin-left: 0;
-  }
-  // Hide everything in the navbar save .brand and toggle button */
-  .nav-collapse,
-  .nav-collapse.collapse {
-    overflow: hidden;
-    height: 0;
-  }
-  // Navbar button
-  .navbar .btn-navbar {
-    display: block;
-  }
-
-  // STATIC NAVBAR
-  // -------------
-  .navbar-static .navbar-inner {
-    padding-left:  10px;
-    padding-right: 10px;
-  }
-
-
-}
-
-
-// DEFAULT DESKTOP
-// ---------------
-
-@media (min-width: @navbarCollapseDesktopWidth) {
-
-  // Required to make the collapsing navbar work on regular desktops
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-utilities.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-utilities.less
deleted file mode 100644
index bf43e8ef73..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive-utilities.less
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Responsive: Utility classes
-// --------------------------------------------------
-
-
-// IE10 Metro responsive
-// Required for Windows 8 Metro split-screen snapping with IE10
-// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
-@-ms-viewport{
-  width: device-width;
-}
-
-// Hide from screenreaders and browsers
-// Credit: HTML5 Boilerplate
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-
-// Visibility utilities
-
-// For desktops
-.visible-phone     { display: none !important; }
-.visible-tablet    { display: none !important; }
-.hidden-phone      { }
-.hidden-tablet     { }
-.hidden-desktop    { display: none !important; }
-.visible-desktop   { display: inherit !important; }
-
-// Tablets & small desktops only
-@media (min-width: 768px) and (max-width: 979px) {
-  // Hide everything else
-  .hidden-desktop    { display: inherit !important; }
-  .visible-desktop   { display: none !important ; }
-  // Show
-  .visible-tablet    { display: inherit !important; }
-  // Hide
-  .hidden-tablet     { display: none !important; }
-}
-
-// Phones only
-@media (max-width: 767px) {
-  // Hide everything else
-  .hidden-desktop    { display: inherit !important; }
-  .visible-desktop   { display: none !important; }
-  // Show
-  .visible-phone     { display: inherit !important; } // Use inherit to restore previous behavior
-  // Hide
-  .hidden-phone      { display: none !important; }
-}
-
-// Print utilities
-.visible-print    { display: none !important; }
-.hidden-print     { }
-
-@media print {
-  .visible-print  { display: inherit !important; }
-  .hidden-print   { display: none !important; }
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive.less
deleted file mode 100644
index b8366defbd..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/responsive.less
+++ /dev/null
@@ -1,48 +0,0 @@
-/*!
- * Bootstrap Responsive v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-
-// Responsive.less
-// For phone and tablet devices
-// -------------------------------------------------------------
-
-
-// REPEAT VARIABLES & MIXINS
-// -------------------------
-// Required since we compile the responsive stuff separately
-
-@import "variables.less"; // Modify this for custom colors, font-sizes, etc
-@import "mixins.less";
-
-
-// RESPONSIVE CLASSES
-// ------------------
-
-@import "responsive-utilities.less";
-
-
-// MEDIA QUERIES
-// ------------------
-
-// Large desktops
-@import "responsive-1200px-min.less";
-
-// Tablets to regular desktops
-@import "responsive-768px-979px.less";
-
-// Phones to portrait tablets and narrow desktops
-@import "responsive-767px-max.less";
-
-
-// RESPONSIVE NAVBAR
-// ------------------
-
-// From 979px and below, show a button to toggle navbar contents
-@import "responsive-navbar.less";
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/scaffolding.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/scaffolding.less
deleted file mode 100644
index 2c01fb771c..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/scaffolding.less
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Scaffolding
-// --------------------------------------------------
-
-
-// Body reset
-// -------------------------
-
-body {
-  margin: 0;
-  font-family: @baseFontFamily;
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  color: @textColor;
-  background-color: @bodyBackground;
-}
-
-
-// Links
-// -------------------------
-
-a {
-  color: @linkColor;
-  text-decoration: none;
-}
-a:hover,
-a:focus {
-  color: @linkColorHover;
-  text-decoration: underline;
-}
-a[ng-click],
-a[data-ng-click],
-a[x-ng-click] {
-  cursor: pointer;
-}
-
-
-// Images
-// -------------------------
-
-// Rounded corners
-.img-rounded {
-  .border-radius(6px);
-}
-
-// Add polaroid-esque trim
-.img-polaroid {
-  padding: 4px;
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0,0,0,.2);
-  .box-shadow(0 1px 3px rgba(0,0,0,.1));
-}
-
-// Perfect circle
-.img-circle {
-  .border-radius(500px); // crank the border-radius so it works with most reasonably sized images
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/sprites.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/sprites.less
deleted file mode 100644
index dd60f10cee..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/sprites.less
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// Sprites
-// --------------------------------------------------
-
-
-// ICONS
-// -----
-
-// All icons receive the styles of the <i> tag with a base class
-// of .i and are then given a unique class to add width, height,
-// and background-position. Your resulting HTML will look like
-// <i class="icon-inbox"></i>.
-
-// For the white version of the icons, just add the .icon-white class:
-// <i class="icon-inbox icon-white"></i>
-
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  line-height: 14px;
-  vertical-align: text-top;
-  background-image: url("@{iconSpritePath}");
-  background-position: 14px 14px;
-  background-repeat: no-repeat;
-  margin-top: 1px;
-}
-
-/* White icons with optional class, or on hover/focus/active states of certain elements */
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:focus > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > li > a:focus > [class*=" icon-"],
-.dropdown-menu > li > button:hover > [class^="icon-"],
-.dropdown-menu > li > button:focus > [class^="icon-"],
-.dropdown-menu > li > button:hover > [class*=" icon-"],
-.dropdown-menu > li > button:focus > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:focus > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"],
-.dropdown-submenu:focus > a > [class*=" icon-"] {
-  background-image: url("@{iconWhiteSpritePath}");
-}
-
-.icon-glass              { background-position: 0      0; }
-.icon-music              { background-position: -24px  0; }
-.icon-search             { background-position: -48px  0; }
-.icon-envelope           { background-position: -72px  0; }
-.icon-heart              { background-position: -96px  0; }
-.icon-star               { background-position: -120px 0; }
-.icon-star-empty         { background-position: -144px 0; }
-.icon-user               { background-position: -168px 0; }
-.icon-film               { background-position: -192px 0; }
-.icon-th-large           { background-position: -216px 0; }
-.icon-th                 { background-position: -240px 0; }
-.icon-th-list            { background-position: -264px 0; }
-.icon-ok                 { background-position: -288px 0; }
-.icon-remove             { background-position: -312px 0; }
-.icon-zoom-in            { background-position: -336px 0; }
-.icon-zoom-out           { background-position: -360px 0; }
-.icon-off                { background-position: -384px 0; }
-.icon-signal             { background-position: -408px 0; }
-.icon-cog                { background-position: -432px 0; }
-.icon-trash              { background-position: -456px 0; }
-
-.icon-home               { background-position: 0      -24px; }
-.icon-file               { background-position: -24px  -24px; }
-.icon-time               { background-position: -48px  -24px; }
-.icon-road               { background-position: -72px  -24px; }
-.icon-download-alt       { background-position: -96px  -24px; }
-.icon-download           { background-position: -120px -24px; }
-.icon-upload             { background-position: -144px -24px; }
-.icon-inbox              { background-position: -168px -24px; }
-.icon-play-circle        { background-position: -192px -24px; }
-.icon-repeat             { background-position: -216px -24px; }
-.icon-refresh            { background-position: -240px -24px; }
-.icon-list-alt           { background-position: -264px -24px; }
-.icon-lock               { background-position: -287px -24px; } // 1px off
-.icon-flag               { background-position: -312px -24px; }
-.icon-headphones         { background-position: -336px -24px; }
-.icon-volume-off         { background-position: -360px -24px; }
-.icon-volume-down        { background-position: -384px -24px; }
-.icon-volume-up          { background-position: -408px -24px; }
-.icon-qrcode             { background-position: -432px -24px; }
-.icon-barcode            { background-position: -456px -24px; }
-
-.icon-tag                { background-position: 0      -48px; }
-.icon-tags               { background-position: -25px  -48px; } // 1px off
-.icon-book               { background-position: -48px  -48px; }
-.icon-bookmark           { background-position: -72px  -48px; }
-.icon-print              { background-position: -96px  -48px; }
-.icon-camera             { background-position: -120px -48px; }
-.icon-font               { background-position: -144px -48px; }
-.icon-bold               { background-position: -167px -48px; } // 1px off
-.icon-italic             { background-position: -192px -48px; }
-.icon-text-height        { background-position: -216px -48px; }
-.icon-text-width         { background-position: -240px -48px; }
-.icon-align-left         { background-position: -264px -48px; }
-.icon-align-center       { background-position: -288px -48px; }
-.icon-align-right        { background-position: -312px -48px; }
-.icon-align-justify      { background-position: -336px -48px; }
-.icon-list               { background-position: -360px -48px; }
-.icon-indent-left        { background-position: -384px -48px; }
-.icon-indent-right       { background-position: -408px -48px; }
-.icon-facetime-video     { background-position: -432px -48px; }
-.icon-picture            { background-position: -456px -48px; }
-
-.icon-pencil             { background-position: 0      -72px; }
-.icon-map-marker         { background-position: -24px  -72px; }
-.icon-adjust             { background-position: -48px  -72px; }
-.icon-tint               { background-position: -72px  -72px; }
-.icon-edit               { background-position: -96px  -72px; }
-.icon-share              { background-position: -120px -72px; }
-.icon-check              { background-position: -144px -72px; }
-.icon-move               { background-position: -168px -72px; }
-.icon-step-backward      { background-position: -192px -72px; }
-.icon-fast-backward      { background-position: -216px -72px; }
-.icon-backward           { background-position: -240px -72px; }
-.icon-play               { background-position: -264px -72px; }
-.icon-pause              { background-position: -288px -72px; }
-.icon-stop               { background-position: -312px -72px; }
-.icon-forward            { background-position: -336px -72px; }
-.icon-fast-forward       { background-position: -360px -72px; }
-.icon-step-forward       { background-position: -384px -72px; }
-.icon-eject              { background-position: -408px -72px; }
-.icon-chevron-left       { background-position: -432px -72px; }
-.icon-chevron-right      { background-position: -456px -72px; }
-
-.icon-plus-sign          { background-position: 0      -96px; }
-.icon-minus-sign         { background-position: -24px  -96px; }
-.icon-remove-sign        { background-position: -48px  -96px; }
-.icon-ok-sign            { background-position: -72px  -96px; }
-.icon-question-sign      { background-position: -96px  -96px; }
-.icon-info-sign          { background-position: -120px -96px; }
-.icon-screenshot         { background-position: -144px -96px; }
-.icon-remove-circle      { background-position: -168px -96px; }
-.icon-ok-circle          { background-position: -192px -96px; }
-.icon-ban-circle         { background-position: -216px -96px; }
-.icon-arrow-left         { background-position: -240px -96px; }
-.icon-arrow-right        { background-position: -264px -96px; }
-.icon-arrow-up           { background-position: -289px -96px; } // 1px off
-.icon-arrow-down         { background-position: -312px -96px; }
-.icon-share-alt          { background-position: -336px -96px; }
-.icon-resize-full        { background-position: -360px -96px; }
-.icon-resize-small       { background-position: -384px -96px; }
-.icon-plus               { background-position: -408px -96px; }
-.icon-minus              { background-position: -433px -96px; }
-.icon-asterisk           { background-position: -456px -96px; }
-
-.icon-exclamation-sign   { background-position: 0      -120px; }
-.icon-gift               { background-position: -24px  -120px; }
-.icon-leaf               { background-position: -48px  -120px; }
-.icon-fire               { background-position: -72px  -120px; }
-.icon-eye-open           { background-position: -96px  -120px; }
-.icon-eye-close          { background-position: -120px -120px; }
-.icon-warning-sign       { background-position: -144px -120px; }
-.icon-plane              { background-position: -168px -120px; }
-.icon-calendar           { background-position: -192px -120px; }
-.icon-random             { background-position: -216px -120px; width: 16px; }
-.icon-comment            { background-position: -240px -120px; }
-.icon-magnet             { background-position: -264px -120px; }
-.icon-chevron-up         { background-position: -288px -120px; }
-.icon-chevron-down       { background-position: -313px -119px; } // 1px, 1px off
-.icon-retweet            { background-position: -336px -120px; }
-.icon-shopping-cart      { background-position: -360px -120px; }
-.icon-folder-close       { background-position: -384px -120px; width: 16px; }
-.icon-folder-open        { background-position: -408px -120px; width: 16px; }
-.icon-resize-vertical    { background-position: -432px -119px; } // 1px, 1px off
-.icon-resize-horizontal  { background-position: -456px -118px; } // 1px, 2px off
-
-.icon-hdd                     { background-position: 0      -144px; }
-.icon-bullhorn                { background-position: -24px  -144px; }
-.icon-bell                    { background-position: -48px  -144px; }
-.icon-certificate             { background-position: -72px  -144px; }
-.icon-thumbs-up               { background-position: -96px  -144px; }
-.icon-thumbs-down             { background-position: -120px -144px; }
-.icon-hand-right              { background-position: -144px -144px; }
-.icon-hand-left               { background-position: -168px -144px; }
-.icon-hand-up                 { background-position: -192px -144px; }
-.icon-hand-down               { background-position: -216px -144px; }
-.icon-circle-arrow-right      { background-position: -240px -144px; }
-.icon-circle-arrow-left       { background-position: -264px -144px; }
-.icon-circle-arrow-up         { background-position: -288px -144px; }
-.icon-circle-arrow-down       { background-position: -312px -144px; }
-.icon-globe                   { background-position: -336px -144px; }
-.icon-wrench                  { background-position: -360px -144px; }
-.icon-tasks                   { background-position: -384px -144px; }
-.icon-filter                  { background-position: -408px -144px; }
-.icon-briefcase               { background-position: -432px -144px; }
-.icon-fullscreen              { background-position: -456px -144px; }
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tables.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tables.less
deleted file mode 100644
index ff1f96296a..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tables.less
+++ /dev/null
@@ -1,247 +0,0 @@
-//
-// Tables
-// --------------------------------------------------
-
-
-// BASE TABLES
-// -----------------
-
-table {
-  max-width: 100%;
-  background-color: @tableBackground;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-// BASELINE STYLES
-// ---------------
-
-.table {
-  width: 100%;
-  margin-bottom: @baseLineHeight;
-  // Cells
-  th,
-  td {
-    padding: 8px;
-    line-height: @baseLineHeight;
-    text-align: left;
-    vertical-align: top;
-    border-top: 1px solid @tableBorder;
-  }
-  th {
-    font-weight: bold;
-  }
-  // Bottom align for column headings
-  thead th {
-    vertical-align: bottom;
-  }
-  // Remove top border from thead by default
-  caption + thead tr:first-child th,
-  caption + thead tr:first-child td,
-  colgroup + thead tr:first-child th,
-  colgroup + thead tr:first-child td,
-  thead:first-child tr:first-child th,
-  thead:first-child tr:first-child td {
-    border-top: 0;
-  }
-  // Account for multiple tbody instances
-  tbody + tbody {
-    border-top: 2px solid @tableBorder;
-  }
-
-  // Nesting
-  .table {
-    background-color: @bodyBackground;
-  }
-}
-
-
-
-// CONDENSED TABLE W/ HALF PADDING
-// -------------------------------
-
-.table-condensed {
-  th,
-  td {
-    padding: 4px 5px;
-  }
-}
-
-
-// BORDERED VERSION
-// ----------------
-
-.table-bordered {
-  border: 1px solid @tableBorder;
-  border-collapse: separate; // Done so we can round those corners!
-  border-left: 0;
-  .border-radius(@baseBorderRadius);
-  th,
-  td {
-    border-left: 1px solid @tableBorder;
-  }
-  // Prevent a double border
-  caption + thead tr:first-child th,
-  caption + tbody tr:first-child th,
-  caption + tbody tr:first-child td,
-  colgroup + thead tr:first-child th,
-  colgroup + tbody tr:first-child th,
-  colgroup + tbody tr:first-child td,
-  thead:first-child tr:first-child th,
-  tbody:first-child tr:first-child th,
-  tbody:first-child tr:first-child td {
-    border-top: 0;
-  }
-  // For first th/td in the first row in the first thead or tbody
-  thead:first-child tr:first-child > th:first-child,
-  tbody:first-child tr:first-child > td:first-child,
-  tbody:first-child tr:first-child > th:first-child {
-    .border-top-left-radius(@baseBorderRadius);
-  }
-  // For last th/td in the first row in the first thead or tbody
-  thead:first-child tr:first-child > th:last-child,
-  tbody:first-child tr:first-child > td:last-child,
-  tbody:first-child tr:first-child > th:last-child {
-    .border-top-right-radius(@baseBorderRadius);
-  }
-  // For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
-  thead:last-child tr:last-child > th:first-child,
-  tbody:last-child tr:last-child > td:first-child,
-  tbody:last-child tr:last-child > th:first-child,
-  tfoot:last-child tr:last-child > td:first-child,
-  tfoot:last-child tr:last-child > th:first-child {
-    .border-bottom-left-radius(@baseBorderRadius);
-  }
-  // For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
-  thead:last-child tr:last-child > th:last-child,
-  tbody:last-child tr:last-child > td:last-child,
-  tbody:last-child tr:last-child > th:last-child,
-  tfoot:last-child tr:last-child > td:last-child,
-  tfoot:last-child tr:last-child > th:last-child {
-    .border-bottom-right-radius(@baseBorderRadius);
-  }
-
-  // Clear border-radius for first and last td in the last row in the last tbody for table with tfoot
-  tfoot + tbody:last-child tr:last-child td:first-child {
-    .border-bottom-left-radius(0);
-  }
-  tfoot + tbody:last-child tr:last-child td:last-child {
-    .border-bottom-right-radius(0);
-  }
-
-  // Special fixes to round the left border on the first td/th
-  caption + thead tr:first-child th:first-child,
-  caption + tbody tr:first-child td:first-child,
-  colgroup + thead tr:first-child th:first-child,
-  colgroup + tbody tr:first-child td:first-child {
-    .border-top-left-radius(@baseBorderRadius);
-  }
-  caption + thead tr:first-child th:last-child,
-  caption + tbody tr:first-child td:last-child,
-  colgroup + thead tr:first-child th:last-child,
-  colgroup + tbody tr:first-child td:last-child {
-    .border-top-right-radius(@baseBorderRadius);
-  }
-
-}
-
-
-
-
-// ZEBRA-STRIPING
-// --------------
-
-// Default zebra-stripe styles (alternating gray and transparent backgrounds)
-.table-striped {
-  tbody {
-    > tr:nth-child(odd) > td,
-    > tr:nth-child(odd) > th {
-      background-color: @tableBackgroundAccent;
-    }
-  }
-}
-
-
-// HOVER EFFECT
-// ------------
-// Placed here since it has to come after the potential zebra striping
-.table-hover {
-  tbody {
-    tr:hover > td,
-    tr:hover > th {
-      background-color: @tableBackgroundHover;
-    }
-  }
-}
-
-
-// TABLE CELL SIZING
-// -----------------
-
-// Reset default grid behavior
-table td[class*="span"],
-table th[class*="span"],
-.row-fluid table td[class*="span"],
-.row-fluid table th[class*="span"] {
-  display: table-cell;
-  float: none; // undo default grid column styles
-  margin-left: 0; // undo default grid column styles
-}
-
-// Change the column widths to account for td/th padding
-.table td,
-.table th {
-  &.span1     { .tableColumns(1); }
-  &.span2     { .tableColumns(2); }
-  &.span3     { .tableColumns(3); }
-  &.span4     { .tableColumns(4); }
-  &.span5     { .tableColumns(5); }
-  &.span6     { .tableColumns(6); }
-  &.span7     { .tableColumns(7); }
-  &.span8     { .tableColumns(8); }
-  &.span9     { .tableColumns(9); }
-  &.span10    { .tableColumns(10); }
-  &.span11    { .tableColumns(11); }
-  &.span12    { .tableColumns(12); }
-}
-
-
-
-// TABLE BACKGROUNDS
-// -----------------
-// Exact selectors below required to override .table-striped
-
-.table tbody tr {
-  &.success > td {
-    background-color: @successBackground;
-  }
-  &.error > td {
-    background-color: @errorBackground;
-  }
-  &.warning > td {
-    background-color: @warningBackground;
-  }
-  &.info > td {
-    background-color: @infoBackground;
-  }
-}
-
-// Hover states for .table-hover
-.table-hover tbody tr {
-  &.success:hover > td {
-    background-color: darken(@successBackground, 5%);
-  }
-  &.error:hover > td {
-    background-color: darken(@errorBackground, 5%);
-  }
-  &.warning:hover > td {
-    background-color: darken(@warningBackground, 5%);
-  }
-  &.info:hover > td {
-    background-color: darken(@infoBackground, 5%);
-  }
-}
-
-.table .icon {
-    vertical-align: bottom;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/buttons.html b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/buttons.html
deleted file mode 100644
index 9b3c2c572c..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/buttons.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Buttons &middot; Bootstrap</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
-    <style>
-      body {
-        padding-top: 30px;
-        padding-bottom: 30px;
-      }
-    </style>
-    <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le fav and touch icons -->
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
-      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
-                    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
-                                   <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
-  </head>
-
-  <body>
-
-    <div class="container">
-
-      <h2>Dropups</h2>
-      <div class="btn-toolbar">
-        <div class="btn-group dropup">
-          <button class="btn">Dropup</button>
-          <button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-          <ul class="dropdown-menu">
-            <li><a href="#">Action</a></li>
-            <li><a href="#">Another action</a></li>
-            <li><a href="#">Something else here</a></li>
-            <li class="divider"></li>
-            <li><a href="#">Separated link</a></li>
-          </ul>
-        </div><!-- /btn-group -->
-        <div class="btn-group dropup">
-          <button class="btn btn-primary">Dropup</button>
-          <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-          <ul class="dropdown-menu">
-            <li><a href="#">Action</a></li>
-            <li><a href="#">Another action</a></li>
-            <li><a href="#">Something else here</a></li>
-            <li class="divider"></li>
-            <li><a href="#">Separated link</a></li>
-          </ul>
-        </div><!-- /btn-group -->
-        <div class="btn-group dropup">
-          <button class="btn btn-danger">Dropup</button>
-          <button class="btn btn-danger dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-          <ul class="dropdown-menu">
-            <li><a href="#">Action</a></li>
-            <li><a href="#">Another action</a></li>
-            <li><a href="#">Something else here</a></li>
-            <li class="divider"></li>
-            <li><a href="#">Separated link</a></li>
-          </ul>
-        </div><!-- /btn-group -->
-        <div class="btn-group dropup">
-          <button class="btn btn-warning">Dropup</button>
-          <button class="btn btn-warning dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-          <ul class="dropdown-menu">
-            <li><a href="#">Action</a></li>
-            <li><a href="#">Another action</a></li>
-            <li><a href="#">Something else here</a></li>
-            <li class="divider"></li>
-            <li><a href="#">Separated link</a></li>
-          </ul>
-        </div><!-- /btn-group -->
-        <div class="btn-group dropup">
-          <button class="btn btn-success">Dropup</button>
-          <button class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-          <ul class="dropdown-menu">
-            <li><a href="#">Action</a></li>
-            <li><a href="#">Another action</a></li>
-            <li><a href="#">Something else here</a></li>
-            <li class="divider"></li>
-            <li><a href="#">Separated link</a></li>
-          </ul>
-        </div><!-- /btn-group -->
-        <div class="btn-group dropup">
-          <button class="btn btn-info">Dropup</button>
-          <button class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-          <ul class="dropdown-menu">
-            <li><a href="#">Action</a></li>
-            <li><a href="#">Another action</a></li>
-            <li><a href="#">Something else here</a></li>
-            <li class="divider"></li>
-            <li><a href="#">Separated link</a></li>
-          </ul>
-        </div><!-- /btn-group -->
-        <div class="btn-group dropup">
-          <button class="btn btn-inverse">Dropup</button>
-          <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-          <ul class="dropdown-menu">
-            <li><a href="#">Action</a></li>
-            <li><a href="#">Another action</a></li>
-            <li><a href="#">Something else here</a></li>
-            <li class="divider"></li>
-            <li><a href="#">Separated link</a></li>
-          </ul>
-        </div><!-- /btn-group -->
-      </div><!-- /btn-toolbar -->
-
-
-    </div> <!-- /container -->
-
-    <!-- Le javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs/assets/js/jquery.js"></script>
-    <script src="../../docs/assets/js/bootstrap-transition.js"></script>
-    <script src="../../docs/assets/js/bootstrap-alert.js"></script>
-    <script src="../../docs/assets/js/bootstrap-modal.js"></script>
-    <script src="../../docs/assets/js/bootstrap-dropdown.js"></script>
-    <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script>
-    <script src="../../docs/assets/js/bootstrap-tab.js"></script>
-    <script src="../../docs/assets/js/bootstrap-tooltip.js"></script>
-    <script src="../../docs/assets/js/bootstrap-popover.js"></script>
-    <script src="../../docs/assets/js/bootstrap-button.js"></script>
-    <script src="../../docs/assets/js/bootstrap-collapse.js"></script>
-    <script src="../../docs/assets/js/bootstrap-carousel.js"></script>
-    <script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
-
-  </body>
-</html>
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/css-tests.css b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/css-tests.css
deleted file mode 100644
index 98ba23f816..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/css-tests.css
+++ /dev/null
@@ -1,144 +0,0 @@
-/*!
- * Bootstrap CSS Tests
- */
-
-
-/* Remove background image */
-body {
-  background-image: none;
-}
-
-/* Space out subhead */
-.subhead {
-  margin-bottom: 36px;
-}
-/*h4 {
-  margin-bottom: 5px;
-}
-*/
-
-.type-test {
-  margin-bottom: 20px;
-  padding: 0 20px 20px;
-  background: url(../../docs/assets/img/grid-baseline-20px.png);
-}
-.type-test h1,
-.type-test h2,
-.type-test h3,
-.type-test h4,
-.type-test h5,
-.type-test h6 {
-  background-color: rgba(255,0,0,.2);
-}
-
-
-/* colgroup tests */
-.col1 {
-  background-color: rgba(255,0,0,.1);
-}
-.col2 {
-  background-color: rgba(0,255,0,.1);
-}
-.col3 {
-  background-color: rgba(0,0,255,.1);
-}
-
-
-/* Fluid row inputs */
-#rowInputs .row > [class*=span],
-#fluidRowInputs .row-fluid > [class*=span] {
-  background-color: rgba(255,0,0,.1);
-}
-
-
-/* Fluid grid */
-.fluid-grid {
-  margin-bottom: 45px;
-}
-.fluid-grid .row {
-  height: 40px;
-  padding-top: 10px;
-  margin-top: 10px;
-  color: #ddd;
-  text-align: center;
-}
-.fluid-grid .span1 {
-  background-color: #999;
-}
-
-
-/* Gradients */
-
-[class^="gradient-"] {
-  width: 100%;
-  height: 400px;
-  margin: 20px 0;
-  border-radius: 5px;
-}
-
-.gradient-horizontal {
-  background-color: #333333;
-  background-image: -moz-linear-gradient(left, #555555, #333333);
-  background-image: -webkit-gradient(linear, 0 0, 100% 0, from(#555555), to(#333333));
-  background-image: -webkit-linear-gradient(left, #555555, #333333);
-  background-image: -o-linear-gradient(left, #555555, #333333);
-  background-image: linear-gradient(to right, #555555, #333333);
-  background-repeat: repeat-x;
-}
-
-.gradient-vertical {
-  background-color: #474747;
-  background-image: -moz-linear-gradient(top, #555555, #333333);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
-  background-image: -webkit-linear-gradient(top, #555555, #333333);
-  background-image: -o-linear-gradient(top, #555555, #333333);
-  background-image: linear-gradient(to bottom, #555555, #333333);
-  background-repeat: repeat-x;
-}
-
-.gradient-directional {
-  background-color: #333333;
-  background-image: -moz-linear-gradient(45deg, #555555, #333333);
-  background-image: -webkit-linear-gradient(45deg, #555555, #333333);
-  background-image: -o-linear-gradient(45deg, #555555, #333333);
-  background-image: linear-gradient(45deg, #555555, #333333);
-  background-repeat: repeat-x;
-}
-
-.gradient-vertical-three {
-  background-color: #8940a5;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#00b3ee), color-stop(50%, #7a43b6), to(#c3325f));
-  background-image: -webkit-linear-gradient(#00b3ee, #7a43b6 50%, #c3325f);
-  background-image: -moz-linear-gradient(top, #00b3ee, #7a43b6 50%, #c3325f);
-  background-image: -o-linear-gradient(#00b3ee, #7a43b6 50%, #c3325f);
-  background-image: linear-gradient(#00b3ee, #7a43b6 50%, #c3325f);
-  background-repeat: no-repeat;
-}
-
-.gradient-radial {
-  background-color: #333333;
-  background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(#555555), to(#333333));
-  background-image: -webkit-radial-gradient(circle, #555555, #333333);
-  background-image: -moz-radial-gradient(circle, #555555, #333333);
-  background-image: -o-radial-gradient(circle, #555555, #333333);
-  background-repeat: no-repeat;
-}
-
-.gradient-striped {
-  background-color: #555555;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.gradient-horizontal-three {
-  background-color: #00b3ee;
-  background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(#00b3ee), color-stop(50%, #7a43b6), to(#c3325f));
-  background-image: -webkit-linear-gradient(left, #00b3ee, #7a43b6 50%, #c3325f);
-  background-image: -moz-linear-gradient(left, #00b3ee, #7a43b6 50%, #c3325f);
-  background-image: -o-linear-gradient(left, #00b3ee, #7a43b6 50%, #c3325f);
-  background-image: linear-gradient(to right, #00b3ee, #7a43b6 50%, #c3325f);
-  background-repeat: no-repeat;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/css-tests.html b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/css-tests.html
deleted file mode 100644
index e3c3f725b7..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/css-tests.html
+++ /dev/null
@@ -1,1399 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Tests · Twitter Bootstrap</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
-    <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
-    <link href="../../docs/assets/css/docs.css" rel="stylesheet">
-    <link href="../../docs/assets/js/google-code-prettify/prettify.css" rel="stylesheet">
-
-    <!-- CSS just for the tests page -->
-    <link href="css-tests.css" rel="stylesheet">
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le fav and touch icons -->
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
-      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
-                    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
-                                   <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
-  </head>
-
-  <body>
-
-
-  <!-- Navbar
-    ================================================== -->
-    <div class="navbar navbar-inverse navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="brand" href="../../docs/index.html">Bootstrap</a>
-        </div>
-      </div>
-    </div>
-
-
-<!-- Masthead
-================================================== -->
-<header class="jumbotron subhead" id="overview">
-  <div class="container">
-    <h1>CSS Tests</h1>
-    <p class="lead">One stop shop for quick debugging and edge-case tests of CSS.</p>
-  </div>
-</header>
-
-
-<div class="bs-docs-canvas">
-
-  <div class="container">
-
-
-
-<!-- Typography
-================================================== -->
-
-<div class="page-header">
-  <h1>Typography</h1>
-</div>
-
-<div class="row">
-  <div class="span6">
-    <div class="type-test">
-      <h1>h1. Heading 1</h1>
-      <h2>h2. Heading 2</h2>
-      <h3>h3. Heading 3</h3>
-      <h4>h4. Heading 4</h4>
-      <h5>h5. Heading 5</h5>
-      <h6>h6. Heading 6</h6>
-      <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
-    </div>
-  </div>
-  <div class="span6">
-    <div class="type-test">
-      <h1>h1. Heading 1</h1>
-      <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
-      <h2>h2. Heading 2</h2>
-      <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
-      <h3>h3. Heading 3</h3>
-      <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
-      <h4>h4. Heading 4</h4>
-      <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
-      <h5>h5. Heading 5</h5>
-      <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
-      <h6>h6. Heading 6</h6>
-      <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
-    </div>
-  </div>
-</div>
-
-
-
-<!-- Responsive images
-================================================== -->
-
-<div class="page-header">
-  <h1>Responsive images</h1>
-</div>
-
-<div class="row">
-  <div class="span4">
-    <img data-src="holder.js/600x600" height="200">
-  </div>
-  <div class="span4">
-    <img data-src="holder.js/600x600">
-  </div>
-  <div class="span4">
-    <img data-src="holder.js/600x600">
-  </div>
-</div>
-
-<br>
-
-<div class="row">
-  <div class="span4">
-    <img data-src="holder.js/600x900" style="width: 200px;">
-  </div>
-  <div class="span4">
-    <img data-src="holder.js/200x300">
-  </div>
-  <div class="span4">
-    <img data-src="holder.js/600x600">
-  </div>
-</div>
-
-<br><br>
-
-
-
-
-<!-- Fluid grid
-================================================== -->
-
-<div class="page-header">
-  <h1>Fluid grids</h1>
-</div>
-
-<div class="fluid-grid">
-  <div class="row">
-    <div class="span12">12
-      <div class="row-fluid">
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-      </div>
-    </div>
-  </div>
-  <div class="row">
-    <div class="span11">11
-      <div class="row-fluid">
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-      </div>
-    </div>
-    <div class="span1">1
-      <div class="row-fluid">
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-      </div>
-    </div>
-  </div>
-  <div class="row">
-    <div class="span10">10
-      <div class="row-fluid">
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-      </div>
-    </div>
-    <div class="span2">2
-      <div class="row-fluid">
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-      </div>
-    </div>
-  </div>
-  <div class="row">
-    <div class="span9">9
-      <div class="row-fluid">
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-      </div>
-    </div>
-    <div class="span3">3
-      <div class="row-fluid">
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-      </div>
-    </div>
-  </div>
-  <div class="row">
-    <div class="span8">8
-      <div class="row-fluid">
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-      </div>
-    </div>
-    <div class="span4">4
-      <div class="row-fluid">
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-      </div>
-    </div>
-  </div>
-  <div class="row">
-    <div class="span7">7
-      <div class="row-fluid">
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-      </div>
-    </div>
-    <div class="span5">5
-      <div class="row-fluid">
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-      </div>
-    </div>
-  </div>
-  <div class="row">
-    <div class="span6">6
-      <div class="row-fluid">
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-      </div>
-    </div>
-    <div class="span6">6
-      <div class="row-fluid">
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-        <div class="span1">1</div>
-      </div>
-    </div>
-  </div>
-</div> <!-- fluid grids -->
-
-
-
-<!-- Tables
-================================================== -->
-
-<div class="page-header">
-  <h1>Tables</h1>
-</div>
-
-<div class="row">
-  <div class="span6">
-    <h4>Bordered without thead</h4>
-    <table class="table table-bordered">
-      <tbody>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-      </tbody>
-    </table>
-    <h4>Bordered without thead, with caption</h4>
-    <table class="table table-bordered">
-      <caption>Table caption</caption>
-      <tbody>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-      </tbody>
-    </table>
-    <h4>Bordered without thead, with colgroup</h4>
-    <table class="table table-bordered">
-      <colgroup>
-        <col class="col1">
-        <col class="col2">
-        <col class="col3">
-      </colgroup>
-      <tbody>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-      </tbody>
-      <tfoot>
-        <tr>
-          <td>3</td>
-          <td>6</td>
-          <td>9</td>
-        </tr>
-      </tfoot>
-    </table>
-    <h4>Bordered with thead, with colgroup</h4>
-    <table class="table table-bordered">
-      <colgroup>
-        <col class="col1">
-        <col class="col2">
-        <col class="col3">
-      </colgroup>
-      <thead>
-        <tr>
-          <th>A</th>
-          <th>B</th>
-          <th>C</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-      </tbody>
-      <tfoot>
-        <tr>
-          <td>3</td>
-          <td>6</td>
-          <td>9</td>
-        </tr>
-      </tfoot>
-    </table>
-  </div><!--/span-->
-  <div class="span6">
-    <h4>Bordered with thead and caption</h4>
-    <table class="table table-bordered">
-      <caption>Table caption</caption>
-      <thead>
-        <tr>
-          <th>1</th>
-          <th>2</th>
-          <th>3</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-        </tr>
-      </tbody>
-      <tfoot>
-        <tr>
-          <td>3</td>
-          <td>6</td>
-          <td>9</td>
-        </tr>
-      </tfoot>
-    </table>
-    <h4>Bordered with rowspan and colspan</h4>
-    <table class="table table-bordered">
-      <thead>
-        <tr>
-          <th>1</th>
-          <th>2</th>
-          <th>3</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td colspan="2">1 and 2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td>1</td>
-          <td rowspan="2">2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td rowspan="2">1</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td colspan="2">2 and 3</td>
-        </tr>
-      </tbody>
-    </table>
-  </div><!--/span-->
-</div><!--/row-->
-
-
-<h4>Grid sizing</h4>
-<div class="row">
-  <div class="span12">
-    <table class="table table-bordered">
-      <thead>
-        <tr>
-          <th class="span3">1</th>
-          <th class="span4">2</th>
-          <th>3</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td colspan="2">1 and 2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td>1</td>
-          <td rowspan="2">2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td rowspan="2">1</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td colspan="2">2 and 3</td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-</div><!--/row-->
-
-<h4>Nesting and striping</h4>
-<table class="table table-bordered table-striped">
-  <thead>
-    <tr>
-      <th>Test</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>
-        <table class="table table-bordered table-striped">
-          <thead>
-            <tr>
-              <th>Test</th>
-              <th>Test</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>
-                test
-              </td>
-              <td>
-                test
-              </td>
-            </tr>
-            <tr>
-              <td>
-                test
-              </td>
-              <td>
-                test
-              </td>
-            </tr>
-            <tr>
-              <td>
-                test
-              </td>
-              <td>
-                test
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-<h4>Fluid grid sizing</h4>
-<div class="row-fluid">
-  <div class="span12">
-    <table class="table table-bordered">
-      <thead>
-        <tr>
-          <th class="span3">1</th>
-          <th class="span4">2</th>
-          <th>3</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td colspan="2">1 and 2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td>1</td>
-          <td rowspan="2">2</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td rowspan="2">1</td>
-          <td>3</td>
-        </tr>
-        <tr>
-          <td colspan="2">2 and 3</td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-</div><!--/row-->
-
-
-
-<!-- Forms
-================================================== -->
-
-<div class="page-header">
-  <h1>Forms</h1>
-</div>
-
-<h4>Buttons and button groups</h4>
-<form class="form-inline">
-  <button class="btn btn-success">Save</button>
-  <button class="btn btn-info">Add new</button>
-  <div class="btn-group">
-    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-      <i class="icon-user"></i> User
-      <span class="caret"></span>
-    </a>
-    <ul class="dropdown-menu">
-      <li><a href="#">Profile</a></li>
-      <li class="divider"></li>
-      <li><a href="#">Sign Out</a></li>
-    </ul>
-  </div>
-</form>
-
-<h4>Horizontal form errors</h4>
-<form class="form-horizontal">
-  <div class="control-group error">
-    <label class="control-label" for="inputError">Radio with error</label>
-    <div class="controls">
-      <label class="radio">
-        <input type="radio" id="inputError"> Oh hai
-      </label>
-      <span class="help-inline">Please correct the error</span>
-    </div>
-  </div>
-</form>
-
-<div class="row">
-  <div class="span4">
-    <h4>Prepend and append on inputs</h4>
-    <form>
-      <div class="controls">
-        <div class="input-prepend">
-          <span class="add-on">@</span>
-          <input class="span2" id="prependedInput" size="16" type="text">
-        </div>
-      </div>
-      <div class="controls">
-        <div class="input-append">
-          <input class="span2" id="prependedInput" size="16" type="text">
-          <span class="add-on">@</span>
-        </div>
-      </div>
-      <div class="controls">
-        <div class="input-prepend input-append">
-          <span class="add-on">$</span>
-          <input class="span2" id="prependedInput" size="16" type="text">
-          <span class="add-on">.00</span>
-        </div>
-      </div>
-    </form>
-  </div><!--/span-->
-  <div class="span4">
-    <h4>Prepend and append with uneditable</h4>
-    <form>
-      <div class="input-prepend">
-        <span class="add-on">$</span>
-        <span class="span2 uneditable-input">Some value here</span>
-      </div>
-      <div class="input-append">
-        <span class="span2 uneditable-input">Some value here</span>
-        <span class="add-on">.00</span>
-      </div>
-      <div class="input-prepend input-append">
-        <span class="add-on">$</span>
-        <span class="span2 uneditable-input">Some value here</span>
-        <span class="add-on">.00</span>
-      </div>
-    </form>
-  </div><!--/span-->
-  <div class="span4">
-    <h4>Prepend with type="submit"</h4>
-    <form class="form-search">
-      <div class="input-append">
-        <input type="text" class="span2 search-query" value="" name="q">
-        <input type="submit" value="Search" class="btn">
-      </div>
-    </form>
-    <div class="input-append">
-      <input type="text" class="span2" value="" name="">
-      <input type="submit" value="Button" class="btn">
-    </div>
-    <div class="input-append">
-      <input type="text" size="16" id="appendedInputButtons" class="span2">
-      <input type="submit" value="Search" class="btn">
-      <button type="button" class="btn">Options</button>
-    </div>
-  </div><!--/span-->
-</div><!--/row-->
-
-<h4>Fluid prepended and appended inputs</h4>
-<div class="row-fluid">
-  <div class="span6">
-    <form>
-      <div class="controls">
-        <div class="input-prepend">
-          <span class="add-on">@</span><input class="span2" id="prependedInput" size="16" type="text">
-        </div>
-      </div>
-      <div class="controls">
-        <div class="input-append">
-          <input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">@</span>
-        </div>
-      </div>
-      <div class="controls">
-        <div class="input-prepend input-append">
-          <span class="add-on">$</span><input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">.00</span>
-        </div>
-      </div>
-    </form>
-  </div>
-</div>
-
-<h4>Fixed row with inputs</h4>
-<p>Inputs should not extend past the light red background, set on their parent, a <code>.span*</code> column.</p>
-
-<div class="rowInputs">
-  <div class="row">
-    <div class="span12">
-      <input type="text" class="span1" placeholder="span1">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row">
-    <div class="span12">
-      <input type="text" class="span2" placeholder="span2">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row">
-    <div class="span12">
-      <input type="text" class="span3" placeholder="span3">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row">
-    <div class="span12">
-      <input type="text" class="span4" placeholder="span4">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row">
-    <div class="span12">
-      <input type="text" class="span5" placeholder="span5">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row">
-    <div class="span12">
-      <input type="text" class="span6" placeholder="span6">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row">
-    <div class="span12">
-      <input type="text" class="span7" placeholder="span7">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row">
-    <div class="span12">
-      <input type="text" class="span8" placeholder="span8">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row">
-    <div class="span12">
-      <input type="text" class="span9" placeholder="span9">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row">
-    <div class="span12">
-      <input type="text" class="span10" placeholder="span10">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row">
-    <div class="span12">
-      <input type="text" class="span11" placeholder="span11">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row">
-    <div class="span12">
-      <input type="text" class="span12" placeholder="span12">
-    </div><!--/span-->
-  </div><!--/row-->
-</div>
-<br>
-
-<h4>Fluid row with inputs</h4>
-<p>Inputs should not extend past the light red background, set on their parent, a <code>.span*</code> column.</p>
-<div id="fluidRowInputs">
-  <div class="row-fluid">
-    <div class="span12">
-      <input type="text" class="span1" placeholder="span1">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row-fluid">
-    <div class="span12">
-      <input type="text" class="span2" placeholder="span2">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row-fluid">
-    <div class="span12">
-      <input type="text" class="span3" placeholder="span3">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row-fluid">
-    <div class="span12">
-      <input type="text" class="span4" placeholder="span4">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row-fluid">
-    <div class="span12">
-      <input type="text" class="span5" placeholder="span5">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row-fluid">
-    <div class="span12">
-      <input type="text" class="span6" placeholder="span6">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row-fluid">
-    <div class="span12">
-      <input type="text" class="span7" placeholder="span7">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row-fluid">
-    <div class="span12">
-      <input type="text" class="span8" placeholder="span8">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row-fluid">
-    <div class="span12">
-      <input type="text" class="span9" placeholder="span9">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row-fluid">
-    <div class="span12">
-      <input type="text" class="span10" placeholder="span10">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row-fluid">
-    <div class="span12">
-      <input type="text" class="span11" placeholder="span11">
-    </div><!--/span-->
-  </div><!--/row-->
-  <div class="row-fluid">
-    <div class="span12">
-      <input type="text" class="span12" placeholder="span12">
-    </div><!--/span-->
-  </div><!--/row-->
-</div>
-
-<br>
-
-<h4>Inline form in fluid row</h4>
-
-<div class="row-fluid">
-  <div class="span12">
-    <form class="form-inline">
-      <input type="text" class="span3" placeholder="Email">
-      <input type="password" class="span3" placeholder="Password" spellcheck="false">
-      <label class="checkbox">
-        <input type="checkbox"> Remember me
-      </label>
-      <button type="submit" class="btn">Sign in</button>
-    </form>
-  </div>
-</div>
-
-
-<br>
-
-
-<h4>Fluid textarea at .span12</h4>
-<div class="row-fluid">
-  <div class="span12">
-    <textarea class="span12"></textarea>
-  </div>
-</div>
-
-
-<br>
-
-
-<h4>Selects</h4>
-<form>
-  <select class="span4">
-    <option>Option</option>
-  </select>
-</form>
-
-
-<br>
-
-
-
-
-<!-- Dropdowns
-================================================== -->
-
-<div class="page-header">
-  <h1>Dropdowns</h1>
-</div>
-
-<h4>Dropdown link with hash URL</h4>
-<ul class="nav nav-pills">
-  <li class="active"><a href="#">Link</a></li>
-  <li><a href="#">Example link</a></li>
-  <li class="dropdown">
-    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-      Dropdown <span class="caret"></span>
-    </a>
-    <ul class="dropdown-menu">
-      <li><a href="#">Action</a></li>
-      <li><a href="#">Another action</a></li>
-      <li><a href="#">Something else here</a></li>
-      <li class="divider"></li>
-      <li><a href="#">Separated link</a></li>
-    </ul>
-  </li>
-</ul>
-
-<h4>Dropdown link with custom URL and data-target</h4>
-<ul class="nav nav-pills">
-  <li class="active"><a href="#">Link</a></li>
-  <li><a href="#">Example link</a></li>
-  <li class="dropdown">
-    <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html">
-      Dropdown <span class="caret"></span>
-    </a>
-    <ul class="dropdown-menu">
-      <li><a href="#">Action</a></li>
-      <li><a href="#">Another action</a></li>
-      <li><a href="#">Something else here</a></li>
-      <li class="divider"></li>
-      <li><a href="#">Separated link</a></li>
-    </ul>
-  </li>
-</ul>
-
-<h4>Dropdown on a button</h4>
-<div style="position: relative;">
-  <button class="btn" type="button" data-toggle="dropdown">Dropdown <span class="caret"></span></button>
-  <ul class="dropdown-menu">
-    <li><a href="#">Action</a></li>
-    <li><a href="#">Another action</a></li>
-    <li><a href="#">Something else here</a></li>
-    <li class="divider"></li>
-    <li><a href="#">Separated link</a></li>
-  </ul>
-</div>
-
-<br>
-
-
-<!-- Thumbnails
-================================================== -->
-
-<div class="page-header">
-  <h1>Thumbnails</h1>
-</div>
-
-<h4>Default thumbnails (no grid sizing)</h4>
-<ul class="thumbnails">
-  <li class="thumbnail">
-    <img data-src="holder.js/260x180" alt="">
-  </li>
-  <li class="thumbnail">
-    <img data-src="holder.js/260x180" alt="">
-  </li>
-  <li class="thumbnail">
-    <img data-src="holder.js/260x180" alt="">
-  </li>
-  <li class="thumbnail">
-    <img data-src="holder.js/260x180" alt="">
-  </li>
-</ul>
-
-<!-- NOT CURRENTLY SUPPORTED
-<h4>Offset thumbnails</h4>
-<ul class="thumbnails">
-  <li class="span3 offset3">
-    <a href="#" class="thumbnail">
-      <img data-src="holder.js/260x180" alt="">
-    </a>
-  </li>
-  <li class="span3">
-    <a href="#" class="thumbnail">
-      <img data-src="holder.js/260x180" alt="">
-    </a>
-  </li>
-  <li class="span3">
-    <a href="#" class="thumbnail">
-      <img data-src="holder.js/260x180" alt="">
-    </a>
-  </li>
-</ul>
--->
-
-<h4>Standard grid sizing</h4>
-<ul class="thumbnails">
-  <li class="span3">
-    <a href="#" class="thumbnail">
-      <img data-src="holder.js/260x180" alt="">
-    </a>
-  </li>
-  <li class="span3 offset3">
-    <a href="#" class="thumbnail">
-      <img data-src="holder.js/260x180" alt="">
-    </a>
-  </li>
-  <li class="span3">
-    <a href="#" class="thumbnail">
-      <img data-src="holder.js/260x180" alt="">
-    </a>
-  </li>
-</ul>
-
-<h4>Fluid thumbnails</h4>
-<div class="row-fluid">
-  <div class="span8">
-    <ul class="thumbnails">
-      <li class="span4">
-        <a href="#" class="thumbnail">
-          <img data-src="holder.js/260x180" alt="">
-        </a>
-      </li>
-      <li class="span4">
-        <a href="#" class="thumbnail">
-          <img data-src="holder.js/260x180" alt="">
-        </a>
-      </li>
-      <li class="span4">
-        <a href="#" class="thumbnail">
-          <img data-src="holder.js/260x180" alt="">
-        </a>
-      </li>
-    </ul>
-  </div>
-</div>
-
-
-
-<!-- Tabs
-================================================== -->
-
-<div class="page-header">
-  <h1>Tabs</h1>
-</div>
-
-<div class="tabbable tabs-left" style="margin-bottom: 18px;">
-  <ul class="nav nav-tabs">
-    <li class="active"><a href="#tab1" data-toggle="tab">Section 1</a></li>
-    <li><a href="#tab2" data-toggle="tab">Section 2</a></li>
-    <li><a href="#tab3" data-toggle="tab">Section 3</a></li>
-  </ul>
-  <div class="tab-content" style="padding-bottom: 9px; border-bottom: 1px solid #ddd;">
-    <div class="tab-pane active" id="tab1">
-      <p>I'm in Section 1.</p>
-
-      <div class="tabbable" style="background: #f5f5f5; padding: 20px;">
-        <ul class="nav nav-tabs">
-          <li class="active"><a href="#tab1-1" data-toggle="tab">1.1</a></li>
-          <li><a href="#tab1-2" data-toggle="tab">1.2</a></li>
-          <li><a href="#tab1-3" data-toggle="tab">1.3</a></li>
-        </ul>
-        <div class="tab-content" style="padding-bottom: 9px; border-bottom: 1px solid #ddd;">
-          <div class="tab-pane active" id="tab1-1">
-            <p>I'm in Section 1.1.</p>
-          </div>
-          <div class="tab-pane" id="tab1-2">
-            <p>I'm in Section 1.2.</p>
-          </div>
-          <div class="tab-pane" id="tab1-3">
-            <p>I'm in Section 1.3.</p>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="tab-pane" id="tab2">
-      <p>Howdy, I'm in Section 2.</p>
-    </div>
-    <div class="tab-pane" id="tab3">
-      <p>What up girl, this is Section 3.</p>
-    </div>
-  </div>
-</div> <!-- /tabbable -->
-
-<br>
-
-
-<!-- Labels
-================================================== -->
-
-<div class="page-header">
-  <h1>Labels</h1>
-</div>
-
-<div class="row">
-  <div class="span4">
-    <h4>Inline label</h4>
-    <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Maecenas sed diam <span class="label label-warning">Label name</span> eget risus varius blandit sit amet non magna. Fusce <code>.class-name</code> dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
-  </div><!--/span-->
-  <div class="span4">
-    <form class="form-horizontal">
-      <label>Example label</label>
-      <input type="text" placeholder="Input"> <span class="help-inline"><span class="label">Hey!</span> Read this.</span>
-    </form>
-  </div><!--/span-->
-  <div class="span4">
-    <button class="btn">Action <span class="badge">2</span></button>
-    <button class="btn">Action <span class="label">2</span></button>
-  </div><!--/span-->
-</div><!--/row-->
-
-<br>
-
-
-<!-- Button groups
-================================================== -->
-
-<div class="page-header">
-  <h1>Buttons</h1>
-</div>
-
-<table class="table table-bordered">
-  <tbody>
-    <tr>
-      <td>
-        Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue. Donec ullamcorper nulla non metus auctor fringilla. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
-      </td>
-      <td>
-        <div class="btn-group">
-          <button class="btn">1</button>
-          <button class="btn">2</button>
-          <button class="btn">3</button>
-          <button class="btn">4</button>
-        </div>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-<h4>Mini buttons: text and icon</h4>
-<div class="btn-group">
-  <button class="btn btn-mini">Button text</button>
-  <button class="btn btn-mini"><i class="icon-cog"></i></button>
-</div>
-
-<br>
-
-
-
-<!-- Responsive utility classes
-================================================== -->
-
-<div class="page-header">
-  <h1>Responsive utility classes</h1>
-</div>
-
-<h4>Visible on...</h4>
-<ul class="responsive-utilities-test visible-on">
-  <li>Phone<span class="visible-phone">✔ Phone</span></li>
-  <li>Tablet<span class="visible-tablet">✔ Tablet</span></li>
-  <li>Desktop<span class="visible-desktop">✔ Desktop</span></li>
-</ul>
-<ul class="responsive-utilities-test visible-on">
-  <li>Phone + Tablet<span class="visible-phone visible-tablet">✔ Phone + Tablet</span></li>
-  <li>Tablet + Desktop<span class="visible-tablet visible-desktop">✔ Tablet + Desktop</span></li>
-  <li>All<span class="visible-phone visible-tablet visible-desktop">✔ All</span></li>
-</ul>
-
-<h4>Hidden on...</h4>
-<ul class="responsive-utilities-test hidden-on">
-  <li>Phone<span class="hidden-phone">✔ Phone</span></li>
-  <li>Tablet<span class="hidden-tablet">✔ Tablet</span></li>
-  <li>Desktop<span class="hidden-desktop">✔ Desktop</span></li>
-</ul>
-<ul class="responsive-utilities-test hidden-on">
-  <li>Phone + Tablet<span class="hidden-phone hidden-tablet">✔ Phone + Tablet</span></li>
-  <li>Tablet + Desktop<span class="hidden-tablet hidden-desktop">✔ Tablet + Desktop</span></li>
-  <li>All<span class="hidden-phone hidden-tablet hidden-desktop">✔ All</span></li>
-</ul>
-
-
-
-<!-- Gradients
-================================================== -->
-
-<div class="page-header">
-  <h1>Gradients</h1>
-</div>
-
-<h4>Horizontal</h4>
-<div class="gradient-horizontal"></div>
-
-<h4>Vertical</h4>
-<div class="gradient-vertical"></div>
-
-<h4>Directional</h4>
-<div class="gradient-directional"></div>
-
-<h4>Three colors</h4>
-<div class="gradient-vertical-three"></div>
-
-<h4>Radial</h4>
-<div class="gradient-radial"></div>
-
-<h4>Striped</h4>
-<div class="gradient-striped"></div>
-
-<h4>Horizontal three colors</h4>
-<div class="gradient-horizontal-three"></div>
-
-
-
-<div class="page-header">
-  <h1>Alerts</h1>
-</div>
-
-<h4>Alert default</h4>
-<div class="alert">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <strong>Alert!</strong> Best check yourself, you're not looking too good.
-</div>
-<div class="alert alert-block">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <p><strong>Alert!</strong> Best check yourself, you're not looking too good.</p>
-</div>
-
-<h4>Success</h4>
-<div class="alert alert-success">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <strong>Success!</strong> Best check yourself, you're not looking too good.
-</div>
-<div class="alert alert-block alert-success">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <p><strong>Success!</strong> Best check yourself, you're not looking too good.</p>
-</div>
-
-<h4>Info</h4>
-<div class="alert alert-info">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <strong>Info!</strong> Best check yourself, you're not looking too good.
-</div>
-<div class="alert alert-block alert-info">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <p><strong>Info!</strong> Best check yourself, you're not looking too good.</p>
-</div>
-
-<h4>Warning</h4>
-<div class="alert ">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <strong>Warning!</strong> Best check yourself, you're not looking too good.
-</div>
-<div class="alert alert-block alert-warning">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <p><strong>Warning!</strong> Best check yourself, you're not looking too good.</p>
-</div>
-
-<h4>Error</h4>
-<div class="alert alert-error">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <strong>Error!</strong> Best check yourself, you're not looking too good.
-</div>
-<div class="alert alert-block alert-error">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <p><strong>Error!</strong> Best check yourself, you're not looking too good.</p>
-</div>
-
-
-    </div><!-- /container -->
-
-
-
-    <!-- Footer
-    ================================================== -->
-    <footer class="footer">
-      <div class="container">
-        <p class="pull-right"><a href="#">Back to top</a></p>
-        <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
-        <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
-        <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
-        <ul class="footer-links">
-          <li><a href="http://blog.getbootstrap.com">Read the blog</a></li>
-          <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li>
-          <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
-        </ul>
-      </div>
-    </footer>
-
-</div>
-
-
-    <!-- Le javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-    <script src="../../docs/assets/js/jquery.js"></script>
-    <script src="../../docs/assets/js/google-code-prettify/prettify.js"></script>
-    <script src="../../docs/assets/js/bootstrap-transition.js"></script>
-    <script src="../../docs/assets/js/bootstrap-alert.js"></script>
-    <script src="../../docs/assets/js/bootstrap-modal.js"></script>
-    <script src="../../docs/assets/js/bootstrap-dropdown.js"></script>
-    <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script>
-    <script src="../../docs/assets/js/bootstrap-tab.js"></script>
-    <script src="../../docs/assets/js/bootstrap-tooltip.js"></script>
-    <script src="../../docs/assets/js/bootstrap-popover.js"></script>
-    <script src="../../docs/assets/js/bootstrap-button.js"></script>
-    <script src="../../docs/assets/js/bootstrap-collapse.js"></script>
-    <script src="../../docs/assets/js/bootstrap-carousel.js"></script>
-    <script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
-    <script src="../../docs/assets/js/application.js"></script>
-
-
-  </body>
-</html>
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/forms-responsive.html b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/forms-responsive.html
deleted file mode 100644
index c3e208d021..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/forms-responsive.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
-    <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
-    <style>
-      body {
-        padding-top: 30px;
-        padding-bottom: 30px;
-      }
-    </style>
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le fav and touch icons -->
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
-      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
-                    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
-                                   <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
-  </head>
-
-  <body>
-
-    <form class="container">
-
-      <div class="page-header">
-        <h1>Fixed grid</h1>
-      </div>
-
-      <h3>Vertical alignment</h3>
-      <input type="text" class="span2" placeholder="span2">
-      <select class="span2"><option>span2</option></select>
-      <span class="uneditable-input span2">span1</span>
-
-      <h3>Width across elements</h3>
-      <div>
-        <input type="text" class="span2" placeholder="span2">
-      </div>
-      <div>
-        <select class="span2"><option>span2</option></select>
-      </div>
-      <div>
-        <span class="uneditable-input span2">span2</span>
-      </div>
-
-
-      <div class="page-header">
-        <h1>Fluid grid</h1>
-      </div>
-
-      <div class="row-fluid">
-        <input type="text" class="span2" placeholder="span2">
-        <select class="span2"><option>span2</option></select>
-        <span class="uneditable-input span2">span1</span>
-      </div>
-
-    </form> <!-- /container -->
-
-  </body>
-</html>
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/forms.html b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/forms.html
deleted file mode 100644
index f0f861e600..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/forms.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
-    <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
-    <style>
-      body {
-        padding-top: 30px;
-        padding-bottom: 30px;
-      }
-    </style>
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
-  </head>
-
-  <body>
-
-    <form class="container">
-
-      <div class="page-header">
-        <h1>Form controls</h1>
-      </div>
-
-      <div class="row">
-        <div class="span4">
-
-          <label>Select</label>
-          <select>
-            <option>Select</option>
-            <option>Option 2</option>
-            <option>Option 3</option>
-          </select>
-
-          <hr>
-
-          <label>textarea</label>
-          <textarea>Textarea</textarea>
-
-          <hr>
-
-          <label>text</label>
-          <input type="text" value="Text input">
-
-          <hr>
-
-          <label>password</label>
-          <input type="password" value="Password input" spellcheck="false">
-
-          <hr>
-
-          <label>checkbox</label>
-          <input type="checkbox" value="">
-
-          <hr>
-
-          <label>radio</label>
-          <input type="radio" value="">
-
-          <hr>
-
-          <label>button</label>
-          <input type="button" value="Button">
-
-          <hr>
-
-          <label>submit</label>
-          <input type="submit" value="Submit">
-
-          <hr>
-
-          <label>reset</label>
-          <input type="reset" value="Reset">
-
-        </div><!-- /span4 -->
-        <div class="span4">
-
-          <label>file</label>
-          <input type="file" value="">
-
-          <hr>
-
-          <label>hidden</label>
-          <input type="hidden" value="hidden">
-
-          <hr>
-
-          <label>image</label>
-          <input type="image" value="">
-
-          <hr>
-
-          <label>datetime</label>
-          <input type="datetime" value="">
-
-          <hr>
-
-          <label>datetime-local</label>
-          <input type="datetime-local" value="">
-
-          <hr>
-
-          <label>date</label>
-          <input type="date" value="">
-
-          <hr>
-
-          <label>month</label>
-          <input type="month" value="">
-
-          <hr>
-
-          <label>time</label>
-          <input type="time" value="">
-
-          <hr>
-
-          <label>week</label>
-          <input type="week" value="">
-
-        </div><!-- /span4 -->
-        <div class="span4">
-
-          <label>number</label>
-          <input type="number" value="">
-
-          <hr>
-
-          <label>range</label>
-          <input type="range" value="">
-
-          <hr>
-
-          <label>email</label>
-          <input type="email" value="">
-
-          <hr>
-
-          <label>url</label>
-          <input type="url" value="">
-
-          <hr>
-
-          <label>search</label>
-          <input type="search" value="">
-
-          <hr>
-
-          <label>tel</label>
-          <input type="tel" value="">
-
-          <hr>
-
-          <label>color</label>
-          <input type="color" value="">
-
-        </div><!-- /span4 -->
-      </div><!-- /row -->
-
-    </form> <!-- /container -->
-
-  </body>
-</html>
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/navbar-fixed-top.html b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/navbar-fixed-top.html
deleted file mode 100644
index 2d9a7a718c..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/navbar-fixed-top.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
-    <style>
-      body {
-        padding-top: 60px;
-        padding-bottom: 30px;
-      }
-    </style>
-    <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le fav and touch icons -->
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
-      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
-                    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
-                                   <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
-  </head>
-
-  <body>
-
-    <!-- Fixed navbar -->
-    <div class="navbar navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </a>
-          <a class="brand" href="#">Project name</a>
-          <div class="nav-collapse collapse">
-            <ul class="nav">
-              <li class="active"><a href="#">Home</a></li>
-              <li><a href="#about">About</a></li>
-              <li><a href="#contact">Contact</a></li>
-              <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Action</a></li>
-                  <li><a href="#">Another action</a></li>
-                  <li><a href="#">Something else here</a></li>
-                  <li class="divider"></li>
-                  <li class="nav-header">Nav header</li>
-                  <li><a href="#">Separated link</a></li>
-                  <li><a href="#">One more separated link</a></li>
-                </ul>
-              </li>
-            </ul>
-            <ul class="nav pull-right">
-              <li><a href="./navbar.html">Default</a></li>
-              <li><a href="./navbar-static-top.html">Static top</a></li>
-              <li class="active"><a href="./navbar-fixed-top.html">Fixed top</a></li>
-            </ul>
-          </div><!--/.nav-collapse -->
-        </div>
-      </div>
-    </div>
-
-    <div class="container">
-
-      <!-- Main hero unit for a primary marketing message or call to action -->
-      <div class="hero-unit">
-        <h1>Navbar example</h1>
-        <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
-        <p>
-          <a class="btn btn-large btn-primary" href="../components.html#navbar">View navbar docs &raquo;</a>
-        </p>
-      </div>
-
-    </div> <!-- /container -->
-
-    <!-- Le javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs/assets/js/jquery.js"></script>
-    <script src="../../docs/assets/js/bootstrap-transition.js"></script>
-    <script src="../../docs/assets/js/bootstrap-alert.js"></script>
-    <script src="../../docs/assets/js/bootstrap-modal.js"></script>
-    <script src="../../docs/assets/js/bootstrap-dropdown.js"></script>
-    <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script>
-    <script src="../../docs/assets/js/bootstrap-tab.js"></script>
-    <script src="../../docs/assets/js/bootstrap-tooltip.js"></script>
-    <script src="../../docs/assets/js/bootstrap-popover.js"></script>
-    <script src="../../docs/assets/js/bootstrap-button.js"></script>
-    <script src="../../docs/assets/js/bootstrap-collapse.js"></script>
-    <script src="../../docs/assets/js/bootstrap-carousel.js"></script>
-    <script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
-
-  </body>
-</html>
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/navbar-static-top.html b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/navbar-static-top.html
deleted file mode 100644
index 4bead8ec67..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/navbar-static-top.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
-    <style>
-      body {
-        padding-bottom: 30px;
-      }
-      .hero-unit {
-        margin-top: 20px;
-      }
-    </style>
-    <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le fav and touch icons -->
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
-      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
-                    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
-                                   <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
-  </head>
-
-  <body>
-
-    <!-- Static navbar -->
-    <div class="navbar navbar-static-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </a>
-          <a class="brand" href="#">Project name</a>
-          <div class="nav-collapse collapse">
-            <ul class="nav">
-              <li class="active"><a href="#">Home</a></li>
-              <li><a href="#about">About</a></li>
-              <li><a href="#contact">Contact</a></li>
-              <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Action</a></li>
-                  <li><a href="#">Another action</a></li>
-                  <li><a href="#">Something else here</a></li>
-                  <li class="divider"></li>
-                  <li class="nav-header">Nav header</li>
-                  <li><a href="#">Separated link</a></li>
-                  <li><a href="#">One more separated link</a></li>
-                </ul>
-              </li>
-            </ul>
-          <ul class="nav pull-right">
-            <li><a href="./navbar.html">Default</a></li>
-            <li class="active"><a href="./navbar-static-top.html">Static top</a></li>
-            <li><a href="./navbar-fixed-top.html">Fixed top</a></li>
-          </ul>
-          </div><!--/.nav-collapse -->
-        </div>
-      </div>
-    </div>
-
-
-    <div class="container">
-
-      <!-- Main hero unit for a primary marketing message or call to action -->
-      <div class="hero-unit">
-        <h1>Navbar example</h1>
-        <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
-        <p>
-          <a class="btn btn-large btn-primary" href="../components.html#navbar">View navbar docs &raquo;</a>
-        </p>
-      </div>
-
-    </div> <!-- /container -->
-
-    <!-- Le javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs/assets/js/jquery.js"></script>
-    <script src="../../docs/assets/js/bootstrap-transition.js"></script>
-    <script src="../../docs/assets/js/bootstrap-alert.js"></script>
-    <script src="../../docs/assets/js/bootstrap-modal.js"></script>
-    <script src="../../docs/assets/js/bootstrap-dropdown.js"></script>
-    <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script>
-    <script src="../../docs/assets/js/bootstrap-tab.js"></script>
-    <script src="../../docs/assets/js/bootstrap-tooltip.js"></script>
-    <script src="../../docs/assets/js/bootstrap-popover.js"></script>
-    <script src="../../docs/assets/js/bootstrap-button.js"></script>
-    <script src="../../docs/assets/js/bootstrap-collapse.js"></script>
-    <script src="../../docs/assets/js/bootstrap-carousel.js"></script>
-    <script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
-
-  </body>
-</html>
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/navbar.html b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/navbar.html
deleted file mode 100644
index d5ad4784ef..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tests/navbar.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
-    <style>
-      body {
-        padding-top: 0;
-        padding-bottom: 30px;
-      }
-      .navbar {
-        margin-top: 20px;
-      }
-    </style>
-    <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le fav and touch icons -->
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
-      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
-                    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
-                                   <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
-  </head>
-
-  <body>
-
-    <div class="container">
-
-      <!-- Static navbar -->
-      <div class="navbar">
-        <div class="navbar-inner">
-          <div class="container">
-            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-            </a>
-            <a class="brand" href="#">Project name</a>
-            <div class="nav-collapse collapse">
-              <ul class="nav">
-                <li class="active"><a href="#">Home</a></li>
-                <li><a href="#about">About</a></li>
-                <li><a href="#contact">Contact</a></li>
-                <li class="dropdown">
-                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-                  <ul class="dropdown-menu">
-                    <li><a href="#">Action</a></li>
-                    <li><a href="#">Another action</a></li>
-                    <li><a href="#">Something else here</a></li>
-                    <li class="divider"></li>
-                    <li class="nav-header">Nav header</li>
-                    <li><a href="#">Separated link</a></li>
-                    <li><a href="#">One more separated link</a></li>
-                  </ul>
-                </li>
-              </ul>
-              <ul class="nav pull-right">
-                <li class="active"><a href="./navbar.html">Default</a></li>
-                <li><a href="./navbar-static-top.html">Static top</a></li>
-                <li><a href="./navbar-fixed-top.html">Fixed top</a></li>
-              </ul>
-            </div><!--/.nav-collapse -->
-          </div>
-        </div>
-      </div>
-
-      <!-- Main hero unit for a primary marketing message or call to action -->
-      <div class="hero-unit">
-        <h1>Navbar example</h1>
-        <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
-        <p>
-          <a class="btn btn-large btn-primary" href="../components.html#navbar">View navbar docs &raquo;</a>
-        </p>
-      </div>
-
-    </div> <!-- /container -->
-
-    <!-- Le javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs/assets/js/jquery.js"></script>
-    <script src="../../docs/assets/js/bootstrap-transition.js"></script>
-    <script src="../../docs/assets/js/bootstrap-alert.js"></script>
-    <script src="../../docs/assets/js/bootstrap-modal.js"></script>
-    <script src="../../docs/assets/js/bootstrap-dropdown.js"></script>
-    <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script>
-    <script src="../../docs/assets/js/bootstrap-tab.js"></script>
-    <script src="../../docs/assets/js/bootstrap-tooltip.js"></script>
-    <script src="../../docs/assets/js/bootstrap-popover.js"></script>
-    <script src="../../docs/assets/js/bootstrap-button.js"></script>
-    <script src="../../docs/assets/js/bootstrap-collapse.js"></script>
-    <script src="../../docs/assets/js/bootstrap-carousel.js"></script>
-    <script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
-
-  </body>
-</html>
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less
deleted file mode 100644
index ce2bc0b079..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Thumbnails
-// --------------------------------------------------
-
-
-// Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
-
-// Make wrapper ul behave like the grid
-.thumbnails {
-  margin-left: (@gridGutterWidth * -1);
-  list-style: none;
-  .clearfix();
-}
-// Fluid rows have no left margin
-.row-fluid .thumbnails {
-  margin-left: 0;
-}
-
-// Float li to make thumbnails appear in a row
-.thumbnails > li {
-  float: left; // Explicity set the float since we don't require .span* classes
-  margin-bottom: @baseLineHeight;
-  margin-left: @gridGutterWidth;
-  a:hover{
-    text-decoration:none;
-  }
-}
-
-// The actual thumbnail (can be `a` or `div`)
-.thumbnail {
-  display: block;
-  padding: 4px;
-  line-height: @baseLineHeight;
-  border: 1px solid @gray-8;
-  .border-radius(@baseBorderRadius);
-  .box-shadow(0 1px 3px rgba(0,0,0,.055));
-  .transition(all .2s ease-in-out);
-}
-// Add a hover/focus state for linked versions only.
-a.thumbnail:hover, 
-a.thumbnail:focus,
-a div.thumbnail:hover,
-a div.thumbnail:focus {
-  border-color: @pinkLight;
-  .box-shadow(0 1px 4px rgba(245, 193, 188, .25));
-}
-
-// Images and captions
-.thumbnail > img {
-  display: block;
-  max-width: 100%;
-  margin-left: auto;
-  margin-right: auto;
-}
-.thumbnail .caption {
-  padding: 9px;
-  color: @gray;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tooltip.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tooltip.less
deleted file mode 100644
index 3ee494f432..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/tooltip.less
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Tooltips
-// --------------------------------------------------
-
-
-// Base class
-.tooltip {
-  position: absolute;
-  z-index: @zindexTooltip;
-  display: block;
-  visibility: visible;
-  font-size: 11px;
-  line-height: 1.4;
-  .opacity(0);
-  &.in     { .opacity(80); }
-  &.top    { margin-top:  -3px; padding: 5px 0; }
-  &.right  { margin-left:  3px; padding: 0 5px; }
-  &.bottom { margin-top:   3px; padding: 5px 0; }
-  &.left   { margin-left: -3px; padding: 0 5px; }
-}
-
-// Wrapper for the tooltip content
-.tooltip-inner {
-  max-width: 200px;
-  padding: 8px;
-  color: @tooltipColor;
-  text-align: center;
-  text-decoration: none;
-  background-color: @tooltipBackground;
-  .border-radius(@baseBorderRadius);
-}
-
-// Arrows
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-.tooltip {
-  &.top .tooltip-arrow {
-    bottom: 0;
-    left: 50%;
-    margin-left: (@tooltipArrowWidth * -1);
-    border-width: @tooltipArrowWidth @tooltipArrowWidth 0;
-    border-top-color: @tooltipArrowColor;
-  }
-  &.right .tooltip-arrow {
-    top: 50%;
-    left: 0;
-    margin-top: (@tooltipArrowWidth * -1);
-    border-width: @tooltipArrowWidth @tooltipArrowWidth @tooltipArrowWidth 0;
-    border-right-color: @tooltipArrowColor;
-  }
-  &.left .tooltip-arrow {
-    top: 50%;
-    right: 0;
-    margin-top: (@tooltipArrowWidth * -1);
-    border-width: @tooltipArrowWidth 0 @tooltipArrowWidth @tooltipArrowWidth;
-    border-left-color: @tooltipArrowColor;
-  }
-  &.bottom .tooltip-arrow {
-    top: 0;
-    left: 50%;
-    margin-left: (@tooltipArrowWidth * -1);
-    border-width: 0 @tooltipArrowWidth @tooltipArrowWidth;
-    border-bottom-color: @tooltipArrowColor;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/type.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/type.less
deleted file mode 100644
index a5dfeaefba..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/type.less
+++ /dev/null
@@ -1,250 +0,0 @@
-//
-// Typography
-// --------------------------------------------------
-
-
-// Body text
-// -------------------------
-
-p {
-  margin: 0 0 (@baseLineHeight / 2);
-}
-.lead {
-  margin-bottom: @baseLineHeight;
-  font-size: (@baseFontSize * 1.5);
-  font-weight: 200;
-  line-height: (@baseLineHeight * 1.5);
-}
-
-
-// Emphasis & misc
-// -------------------------
-
-// Ex: 14px base font * 85% = about 12px
-small   { font-size: 85%; }
-
-strong  { font-weight: bold; }
-em      { font-style: italic; }
-cite    { font-style: normal; }
-
-// Utility classes
-.muted               { color: @grayLight; }
-a.muted:hover,
-a.muted:focus        { color: darken(@grayLight, 10%); }
-
-.text-warning        { color: @warningText; }
-a.text-warning:hover,
-a.text-warning:focus { color: darken(@warningText, 10%); }
-
-.text-error          { color: @errorText; }
-a.text-error:hover,
-a.text-error:focus   { color: darken(@errorText, 10%); }
-
-.text-info           { color: @infoText; }
-a.text-info:hover,
-a.text-info:focus    { color: darken(@infoText, 10%); }
-
-.text-success        { color: @successText; }
-a.text-success:hover,
-a.text-success:focus { color: darken(@successText, 10%); }
-
-.text-left           { text-align: left; }
-.text-right          { text-align: right; }
-.text-center         { text-align: center; }
-
-
-// Headings
-// -------------------------
-
-h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6 {
-  margin: (@baseLineHeight / 2) 0;
-  font-family: @headingsFontFamily;
-  font-weight: @headingsFontWeight;
-  line-height: @baseLineHeight;
-  color: @headingsColor;
-  text-rendering: optimizelegibility; // Fix the character spacing for headings
-  small {
-    font-weight: normal;
-    line-height: 1;
-    color: @grayLight;
-  }
-}
-
-h1, .h1,
-h2, .h2,
-h3, .h3 { line-height: (@baseLineHeight * 2); }
-
-h1, .h1 { font-size: (@baseFontSize * 2.75); } // ~38px
-h2, .h2 { font-size: (@baseFontSize * 2.25); } // ~32px
-h3, .h3 { font-size: (@baseFontSize * 1.75); } // ~24px
-h4, .h4 { font-size: (@baseFontSize * 1.25); } // ~18px
-h5, .h5 { font-size: @baseFontSize; }
-h6, .h6 { font-size: (@baseFontSize * 0.85); } // ~12px
-
-h1 small, .h1 small { font-size: (@baseFontSize * 1.75); } // ~24px
-h2 small, .h2 small { font-size: (@baseFontSize * 1.25); } // ~18px
-h3 small, .h3 small { font-size: @baseFontSize; }
-h4 small, .h4 small { font-size: @baseFontSize; }
-
-
-// Page header
-// -------------------------
-
-.page-header {
-  padding-bottom: ((@baseLineHeight / 2) - 1);
-  margin: @baseLineHeight 0 (@baseLineHeight * 1.5);
-  border-bottom: 1px solid @grayLighter;
-}
-
-
-
-// Lists
-// --------------------------------------------------
-
-// Unordered and Ordered lists
-ul, ol {
-  padding: 0;
-  margin: 0 0 (@baseLineHeight / 2) 25px;
-}
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-li {
-  line-height: @baseLineHeight;
-}
-
-// Remove default list styles
-ul.unstyled,
-ol.unstyled {
-  margin-left: 0;
-  list-style: none;
-}
-
-// Single-line list items
-ul.inline,
-ol.inline {
-  margin-left: 0;
-  list-style: none;
-  > li {
-    display: inline-block;
-    padding-left: 5px;
-    padding-right: 5px;
-
-    &.-no-padding-left{
-      padding-left: 0;
-    }
-  }
-}
-
-// Description Lists
-dl {
-  margin-bottom: @baseLineHeight;
-}
-dt,
-dd {
-  line-height: @baseLineHeight;
-}
-dt {
-  font-weight: bold;
-}
-dd {
-  margin-left: (@baseLineHeight / 2);
-}
-// Horizontal layout (like forms)
-.dl-horizontal {
-  .clearfix(); // Ensure dl clears floats if empty dd elements present
-  dt {
-    float: left;
-    width: (@horizontalComponentOffset - 20);
-    clear: left;
-    text-align: right;
-    .text-overflow();
-  }
-  dd {
-    margin-left: @horizontalComponentOffset;
-  }
-}
-
-// MISC
-// ----
-
-// Horizontal rules
-hr {
-  margin: @baseLineHeight 0;
-  border: 0;
-  border-top: 1px solid @hrBorder;
-  border-bottom: 1px solid @white;
-}
-
-// Abbreviations and acronyms
-abbr[title],
-// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
-abbr[data-original-title] {
-  cursor: help;
-  border-bottom: 1px dotted @grayLight;
-}
-abbr.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
-
-// Blockquotes
-blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 @baseLineHeight;
-  border-left: 5px solid @grayLighter;
-  p {
-    margin-bottom: 0;
-    font-size: (@baseFontSize * 1.25);
-    font-weight: 300;
-    line-height: 1.25;
-  }
-  small {
-    display: block;
-    line-height: @baseLineHeight;
-    color: @grayLight;
-    &:before {
-      content: '\2014 \00A0';
-    }
-  }
-
-  // Float right with text-align: right
-  &.pull-right {
-    float: right;
-    padding-right: 15px;
-    padding-left: 0;
-    border-right: 5px solid @grayLighter;
-    border-left: 0;
-    p,
-    small {
-      text-align: right;
-    }
-    small {
-      &:before {
-        content: '';
-      }
-      &:after {
-        content: '\00A0 \2014';
-      }
-    }
-  }
-}
-
-// Quotes
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-
-// Addresses
-address {
-  display: block;
-  margin-bottom: @baseLineHeight;
-  font-style: normal;
-  line-height: @baseLineHeight;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/utilities.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/utilities.less
deleted file mode 100644
index 314b4ffdb4..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/utilities.less
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// Utility classes
-// --------------------------------------------------
-
-
-// Quick floats
-.pull-right {
-  float: right;
-}
-.pull-left {
-  float: left;
-}
-
-// Toggling content
-.hide {
-  display: none;
-}
-.show {
-  display: block;
-}
-
-// Visibility
-.invisible {
-  visibility: hidden;
-}
-
-// For Affix plugin
-.affix {
-  position: fixed;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/variables.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/variables.less
deleted file mode 100644
index 220bbde37d..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/variables.less
+++ /dev/null
@@ -1,301 +0,0 @@
-//
-// Variables
-// --------------------------------------------------
-
-
-// Global values
-// --------------------------------------------------
-
-
-// Grays
-// -------------------------
-@black:                 #000;
-@grayDarker:            #222;
-@grayDark:              #333;
-@gray:                  #555;
-@grayLight:             #999;
-@grayLighter:           #eee;
-@white:                 #fff;
-
-
-// Accent colors
-// -------------------------
-@blue:                  #049cdb;
-@blueDark:              #0064cd;
-@green:                 #46a546;
-@red:                   #9d261d;
-@yellow:                #ffc40d;
-@orange:                #f89406;
-@pink:                  #c3325f;
-@purple:                #7a43b6;
-
-
-// Scaffolding
-// -------------------------
-@bodyBackground:        @white;
-@textColor:             @grayDark;
-
-
-// Links
-// -------------------------
-@linkColor:             #08c;
-@linkColorHover:        darken(@linkColor, 15%);
-
-
-// Typography
-// -------------------------
-@sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
-@serifFontFamily:       Georgia, "Times New Roman", Times, serif;
-@monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace;
-
-@baseFontSize:          14px;
-@baseFontFamily:        @sansFontFamily;
-@baseLineHeight:        20px;
-@altFontFamily:         @serifFontFamily;
-
-@headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
-@headingsFontWeight:    bold;    // instead of browser default, bold
-@headingsColor:         inherit; // empty to use BS default, @textColor
-
-
-// Component sizing
-// -------------------------
-// Based on 14px font-size and 20px line-height
-
-@fontSizeLarge:         (@baseFontSize * 1.25); // ~18px
-@fontSizeSmall:         (@baseFontSize * 0.85); // ~12px
-@fontSizeMini:          (@baseFontSize * 0.75); // ~11px
-
-@paddingLarge:          11px 19px; // 44px
-@paddingSmall:          2px 10px;  // 26px
-@paddingMini:           0 6px;   // 22px
-
-@baseBorderRadius:      4px;
-@borderRadiusLarge:     6px;
-@borderRadiusSmall:     3px;
-
-
-// Tables
-// -------------------------
-@tableBackground:                   transparent; // overall background-color
-@tableBackgroundAccent:             #f9f9f9; // for striping
-@tableBackgroundHover:              #f5f5f5; // for hover
-@tableBorder:                       #ddd; // table and cell border
-
-// Buttons
-// -------------------------
-@btnBackground:                     @white;
-@btnBackgroundHighlight:            darken(@white, 10%);
-@btnBorder:                         #ccc;
-
-@btnPrimaryBackground:              @linkColor;
-@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 20%);
-
-@btnInfoBackground:                 #5bc0de;
-@btnInfoBackgroundHighlight:        #2f96b4;
-
-@btnSuccessBackground:              #62c462;
-@btnSuccessBackgroundHighlight:     #51a351;
-
-@btnWarningBackground:              lighten(@orange, 15%);
-@btnWarningBackgroundHighlight:     @orange;
-
-@btnDangerBackground:               #ee5f5b;
-@btnDangerBackgroundHighlight:      #bd362f;
-
-@btnInverseBackground:              #444;
-@btnInverseBackgroundHighlight:     @grayDarker;
-
-
-// Forms
-// -------------------------
-@inputBackground:               @white;
-@inputBorder:                   #ccc;
-@inputBorderRadius:             @baseBorderRadius;
-@inputDisabledBackground:       @grayLighter;
-@formActionsBackground:         #f5f5f5;
-@inputHeight:                   (@baseLineHeight + 10px); // base line-height + 8px vertical padding + 2px top/bottom border
-
-
-// Dropdowns
-// -------------------------
-@dropdownBackground:            @white;
-@dropdownBorder:                rgba(0,0,0,.2);
-@dropdownDividerTop:            #e5e5e5;
-@dropdownDividerBottom:         @white;
-
-@dropdownLinkColor:             @grayDark;
-@dropdownLinkColorHover:        @white;
-@dropdownLinkColorActive:       @white;
-
-@dropdownLinkBackgroundActive:  @linkColor;
-@dropdownLinkBackgroundHover:   @dropdownLinkBackgroundActive;
-
-
-
-// COMPONENT VARIABLES
-// --------------------------------------------------
-
-
-// Z-index master list
-// -------------------------
-// Used for a bird's eye view of components dependent on the z-axis
-// Try to avoid customizing these :)
-@zindexDropdown:          1000;
-@zindexPopover:           1010;
-@zindexTooltip:           1030;
-@zindexFixedNavbar:       1030;
-@zindexModalBackdrop:     1040;
-@zindexModal:             1050;
-
-
-// Sprite icons path
-// -------------------------
-@iconSpritePath:          "../img/glyphicons-halflings.png";
-@iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
-
-
-// Input placeholder text color
-// -------------------------
-@placeholderText:         @grayLight;
-
-
-// Hr border color
-// -------------------------
-@hrBorder:                @grayLighter;
-
-
-// Horizontal forms & lists
-// -------------------------
-@horizontalComponentOffset:       180px;
-
-
-// Wells
-// -------------------------
-@wellBackground:                  #f5f5f5;
-
-
-// Navbar
-// -------------------------
-@navbarCollapseWidth:             979px;
-@navbarCollapseDesktopWidth:      (@navbarCollapseWidth + 1);
-
-@navbarHeight:                    40px;
-@navbarBackgroundHighlight:       #ffffff;
-@navbarBackground:                darken(@navbarBackgroundHighlight, 5%);
-@navbarBorder:                    darken(@navbarBackground, 12%);
-
-@navbarText:                      #777;
-@navbarLinkColor:                 #777;
-@navbarLinkColorHover:            @grayDark;
-@navbarLinkColorActive:           @gray;
-@navbarLinkBackgroundHover:       transparent;
-@navbarLinkBackgroundActive:      darken(@navbarBackground, 5%);
-
-@navbarBrandColor:                @navbarLinkColor;
-
-// Inverted navbar
-@navbarInverseBackground:                #111111;
-@navbarInverseBackgroundHighlight:       #222222;
-@navbarInverseBorder:                    #252525;
-
-@navbarInverseText:                      @grayLight;
-@navbarInverseLinkColor:                 @grayLight;
-@navbarInverseLinkColorHover:            @white;
-@navbarInverseLinkColorActive:           @navbarInverseLinkColorHover;
-@navbarInverseLinkBackgroundHover:       transparent;
-@navbarInverseLinkBackgroundActive:      @navbarInverseBackground;
-
-@navbarInverseSearchBackground:          lighten(@navbarInverseBackground, 25%);
-@navbarInverseSearchBackgroundFocus:     @white;
-@navbarInverseSearchBorder:              @navbarInverseBackground;
-@navbarInverseSearchPlaceholderColor:    #ccc;
-
-@navbarInverseBrandColor:                @navbarInverseLinkColor;
-
-
-// Pagination
-// -------------------------
-@paginationBackground:                #fff;
-@paginationBorder:                    #ddd;
-@paginationActiveBackground:          #f5f5f5;
-
-
-// Hero unit
-// -------------------------
-@heroUnitBackground:              @grayLighter;
-@heroUnitHeadingColor:            inherit;
-@heroUnitLeadColor:               inherit;
-
-
-// Form states and alerts
-// -------------------------
-@warningText:             #c09853;
-@warningBackground:       #fcf8e3;
-@warningBorder:           darken(spin(@warningBackground, -10), 3%);
-
-@errorText:               #b94a48;
-@errorBackground:         #f2dede;
-@errorBorder:             darken(spin(@errorBackground, -10), 3%);
-
-@successText:             #468847;
-@successBackground:       #dff0d8;
-@successBorder:           darken(spin(@successBackground, -10), 5%);
-
-@infoText:                #3a87ad;
-@infoBackground:          #d9edf7;
-@infoBorder:              darken(spin(@infoBackground, -10), 7%);
-
-
-// Tooltips and popovers
-// -------------------------
-@tooltipColor:            #fff;
-@tooltipBackground:       #000;
-@tooltipArrowWidth:       5px;
-@tooltipArrowColor:       @tooltipBackground;
-
-@popoverBackground:       #fff;
-@popoverArrowWidth:       10px;
-@popoverArrowColor:       #fff;
-@popoverTitleBackground:  darken(@popoverBackground, 3%);
-
-// Special enhancement for popovers
-@popoverArrowOuterWidth:  (@popoverArrowWidth + 1);
-@popoverArrowOuterColor:  rgba(0,0,0,.25);
-
-
-
-// GRID
-// --------------------------------------------------
-
-
-// Default 940px grid
-// -------------------------
-@gridColumns:             12;
-@gridColumnWidth:         60px;
-@gridGutterWidth:         20px;
-@gridRowWidth:            ((@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)));
-
-// 1200px min
-@gridColumnWidth1200:     70px;
-@gridGutterWidth1200:     30px;
-@gridRowWidth1200:        ((@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1)));
-
-// 768px-979px
-@gridColumnWidth768:      42px;
-@gridGutterWidth768:      20px;
-@gridRowWidth768:         ((@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1)));
-
-
-// Fluid grid
-// -------------------------
-@fluidGridColumnWidth:    percentage(@gridColumnWidth/@gridRowWidth);
-@fluidGridGutterWidth:    percentage(@gridGutterWidth/@gridRowWidth);
-
-// 1200px min
-@fluidGridColumnWidth1200:     percentage(@gridColumnWidth1200/@gridRowWidth1200);
-@fluidGridGutterWidth1200:     percentage(@gridGutterWidth1200/@gridRowWidth1200);
-
-// 768px-979px
-@fluidGridColumnWidth768:      percentage(@gridColumnWidth768/@gridRowWidth768);
-@fluidGridGutterWidth768:      percentage(@gridGutterWidth768/@gridRowWidth768);
diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/wells.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/wells.less
deleted file mode 100644
index 84a744b1c5..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/wells.less
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Wells
-// --------------------------------------------------
-
-
-// Base class
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: @wellBackground;
-  border: 1px solid darken(@wellBackground, 7%);
-  .border-radius(@baseBorderRadius);
-  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
-  blockquote {
-    border-color: #ddd;
-    border-color: rgba(0,0,0,.15);
-  }
-}
-
-// Sizes
-.well-large {
-  padding: 24px;
-  .border-radius(@borderRadiusLarge);
-}
-.well-small {
-  padding: 9px;
-  .border-radius(@borderRadiusSmall);
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/markdown/._Markdown.Editor.Icons.fw.png b/src/Umbraco.Web.UI.Client/lib/markdown/._Markdown.Editor.Icons.fw.png
deleted file mode 100644
index 0ce16c2f9b..0000000000
Binary files a/src/Umbraco.Web.UI.Client/lib/markdown/._Markdown.Editor.Icons.fw.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/lib/markdown/._Markdown.Editor.Icons.png b/src/Umbraco.Web.UI.Client/lib/markdown/._Markdown.Editor.Icons.png
deleted file mode 100644
index a71df0492c..0000000000
Binary files a/src/Umbraco.Web.UI.Client/lib/markdown/._Markdown.Editor.Icons.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/lib/markdown/markdown.converter.js b/src/Umbraco.Web.UI.Client/lib/markdown/markdown.converter.js
deleted file mode 100644
index 8e1af69a68..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/markdown/markdown.converter.js
+++ /dev/null
@@ -1,1344 +0,0 @@
-var Markdown;
-
-if (typeof exports === "object" && typeof require === "function") // we're in a CommonJS (e.g. Node.js) module
-	Markdown = exports;
-else
-	Markdown = {};
-
-// The following text is included for historical reasons, but should
-// be taken with a pinch of salt; it's not all true anymore.
-
-//
-// Wherever possible, Showdown is a straight, line-by-line port
-// of the Perl version of Markdown.
-//
-// This is not a normal parser design; it's basically just a
-// series of string substitutions.  It's hard to read and
-// maintain this way,  but keeping Showdown close to the original
-// design makes it easier to port new features.
-//
-// More importantly, Showdown behaves like markdown.pl in most
-// edge cases.  So web applications can do client-side preview
-// in Javascript, and then build identical HTML on the server.
-//
-// This port needs the new RegExp functionality of ECMA 262,
-// 3rd Edition (i.e. Javascript 1.5).  Most modern web browsers
-// should do fine.  Even with the new regular expression features,
-// We do a lot of work to emulate Perl's regex functionality.
-// The tricky changes in this file mostly have the "attacklab:"
-// label.  Major or self-explanatory changes don't.
-//
-// Smart diff tools like Araxis Merge will be able to match up
-// this file with markdown.pl in a useful way.  A little tweaking
-// helps: in a copy of markdown.pl, replace "#" with "//" and
-// replace "$text" with "text".  Be sure to ignore whitespace
-// and line endings.
-//
-
-
-//
-// Usage:
-//
-//   var text = "Markdown *rocks*.";
-//
-//   var converter = new Markdown.Converter();
-//   var html = converter.makeHtml(text);
-//
-//   alert(html);
-//
-// Note: move the sample code to the bottom of this
-// file before uncommenting it.
-//
-
-(function () {
-
-	function identity(x) { return x; }
-	function returnFalse(x) { return false; }
-
-	function HookCollection() { }
-
-	HookCollection.prototype = {
-
-		chain: function (hookname, func) {
-			var original = this[hookname];
-			if (!original)
-				throw new Error("unknown hook " + hookname);
-
-			if (original === identity)
-				this[hookname] = func;
-			else
-				this[hookname] = function (x) { return func(original(x)); }
-		},
-		set: function (hookname, func) {
-			if (!this[hookname])
-				throw new Error("unknown hook " + hookname);
-			this[hookname] = func;
-		},
-		addNoop: function (hookname) {
-			this[hookname] = identity;
-		},
-		addFalse: function (hookname) {
-			this[hookname] = returnFalse;
-		}
-	};
-
-	Markdown.HookCollection = HookCollection;
-
-	// g_urls and g_titles allow arbitrary user-entered strings as keys. This
-	// caused an exception (and hence stopped the rendering) when the user entered
-	// e.g. [push] or [__proto__]. Adding a prefix to the actual key prevents this
-	// (since no builtin property starts with "s_"). See
-	// http://meta.stackoverflow.com/questions/64655/strange-wmd-bug
-	// (granted, switching from Array() to Object() alone would have left only __proto__
-	// to be a problem)
-	function SaveHash() { }
-	SaveHash.prototype = {
-		set: function (key, value) {
-			this["s_" + key] = value;
-		},
-		get: function (key) {
-			return this["s_" + key];
-		}
-	};
-
-	Markdown.Converter = function () {
-		var pluginHooks = this.hooks = new HookCollection();
-		pluginHooks.addNoop("plainLinkText");  // given a URL that was encountered by itself (without markup), should return the link text that's to be given to this link
-		pluginHooks.addNoop("preConversion");  // called with the orignal text as given to makeHtml. The result of this plugin hook is the actual markdown source that will be cooked
-		pluginHooks.addNoop("postConversion"); // called with the final cooked HTML code. The result of this plugin hook is the actual output of makeHtml
-
-		//
-		// Private state of the converter instance:
-		//
-
-		// Global hashes, used by various utility routines
-		var g_urls;
-		var g_titles;
-		var g_html_blocks;
-
-		// Used to track when we're inside an ordered or unordered list
-		// (see _ProcessListItems() for details):
-		var g_list_level;
-
-		this.makeHtml = function (text) {
-
-			//
-			// Main function. The order in which other subs are called here is
-			// essential. Link and image substitutions need to happen before
-			// _EscapeSpecialCharsWithinTagAttributes(), so that any *'s or _'s in the <a>
-			// and <img> tags get encoded.
-			//
-
-			// This will only happen if makeHtml on the same converter instance is called from a plugin hook.
-			// Don't do that.
-			if (g_urls)
-				throw new Error("Recursive call to converter.makeHtml");
-
-			// Create the private state objects.
-			g_urls = new SaveHash();
-			g_titles = new SaveHash();
-			g_html_blocks = [];
-			g_list_level = 0;
-
-			text = pluginHooks.preConversion(text);
-
-			// attacklab: Replace ~ with ~T
-			// This lets us use tilde as an escape char to avoid md5 hashes
-			// The choice of character is arbitray; anything that isn't
-			// magic in Markdown will work.
-			text = text.replace(/~/g, "~T");
-
-			// attacklab: Replace $ with ~D
-			// RegExp interprets $ as a special character
-			// when it's in a replacement string
-			text = text.replace(/\$/g, "~D");
-
-			// Standardize line endings
-			text = text.replace(/\r\n/g, "\n"); // DOS to Unix
-			text = text.replace(/\r/g, "\n"); // Mac to Unix
-
-			// Make sure text begins and ends with a couple of newlines:
-			text = "\n\n" + text + "\n\n";
-
-			// Convert all tabs to spaces.
-			text = _Detab(text);
-
-			// Strip any lines consisting only of spaces and tabs.
-			// This makes subsequent regexen easier to write, because we can
-			// match consecutive blank lines with /\n+/ instead of something
-			// contorted like /[ \t]*\n+/ .
-			text = text.replace(/^[ \t]+$/mg, "");
-
-			// Turn block-level HTML blocks into hash entries
-			text = _HashHTMLBlocks(text);
-
-			// Strip link definitions, store in hashes.
-			text = _StripLinkDefinitions(text);
-
-			text = _RunBlockGamut(text);
-
-			text = _UnescapeSpecialChars(text);
-
-			// attacklab: Restore dollar signs
-			text = text.replace(/~D/g, "$$");
-
-			// attacklab: Restore tildes
-			text = text.replace(/~T/g, "~");
-
-			text = pluginHooks.postConversion(text);
-
-			g_html_blocks = g_titles = g_urls = null;
-
-			return text;
-		};
-
-		function _StripLinkDefinitions(text) {
-			//
-			// Strips link definitions from text, stores the URLs and titles in
-			// hash references.
-			//
-
-			// Link defs are in the form: ^[id]: url "optional title"
-
-			/*
-            text = text.replace(/
-                ^[ ]{0,3}\[(.+)\]:  // id = $1  attacklab: g_tab_width - 1
-                [ \t]*
-                \n?                 // maybe *one* newline
-                [ \t]*
-                <?(\S+?)>?          // url = $2
-                (?=\s|$)            // lookahead for whitespace instead of the lookbehind removed below
-                [ \t]*
-                \n?                 // maybe one newline
-                [ \t]*
-                (                   // (potential) title = $3
-                    (\n*)           // any lines skipped = $4 attacklab: lookbehind removed
-                    [ \t]+
-                    ["(]
-                    (.+?)           // title = $5
-                    [")]
-                    [ \t]*
-                )?                  // title is optional
-                (?:\n+|$)
-            /gm, function(){...});
-            */
-
-			text = text.replace(/^[ ]{0,3}\[(.+)\]:[ \t]*\n?[ \t]*<?(\S+?)>?(?=\s|$)[ \t]*\n?[ \t]*((\n*)["(](.+?)[")][ \t]*)?(?:\n+)/gm,
-                function (wholeMatch, m1, m2, m3, m4, m5) {
-                	m1 = m1.toLowerCase();
-                	g_urls.set(m1, _EncodeAmpsAndAngles(m2));  // Link IDs are case-insensitive
-                	if (m4) {
-                		// Oops, found blank lines, so it's not a title.
-                		// Put back the parenthetical statement we stole.
-                		return m3;
-                	} else if (m5) {
-                		g_titles.set(m1, m5.replace(/"/g, "&quot;"));
-                	}
-
-                	// Completely remove the definition from the text
-                	return "";
-                }
-            );
-
-			return text;
-		}
-
-		function _HashHTMLBlocks(text) {
-
-			// Hashify HTML blocks:
-			// We only want to do this for block-level HTML tags, such as headers,
-			// lists, and tables. That's because we still want to wrap <p>s around
-			// "paragraphs" that are wrapped in non-block-level tags, such as anchors,
-			// phrase emphasis, and spans. The list of tags we're looking for is
-			// hard-coded:
-			var block_tags_a = "p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del"
-			var block_tags_b = "p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math"
-
-			// First, look for nested blocks, e.g.:
-			//   <div>
-			//     <div>
-			//     tags for inner block must be indented.
-			//     </div>
-			//   </div>
-			//
-			// The outermost tags must start at the left margin for this to match, and
-			// the inner nested divs must be indented.
-			// We need to do this before the next, more liberal match, because the next
-			// match will start at the first `<div>` and stop at the first `</div>`.
-
-			// attacklab: This regex can be expensive when it fails.
-
-			/*
-            text = text.replace(/
-                (                       // save in $1
-                    ^                   // start of line  (with /m)
-                    <($block_tags_a)    // start tag = $2
-                    \b                  // word break
-                                        // attacklab: hack around khtml/pcre bug...
-                    [^\r]*?\n           // any number of lines, minimally matching
-                    </\2>               // the matching end tag
-                    [ \t]*              // trailing spaces/tabs
-                    (?=\n+)             // followed by a newline
-                )                       // attacklab: there are sentinel newlines at end of document
-            /gm,function(){...}};
-            */
-			text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del)\b[^\r]*?\n<\/\2>[ \t]*(?=\n+))/gm, hashElement);
-
-			//
-			// Now match more liberally, simply from `\n<tag>` to `</tag>\n`
-			//
-
-			/*
-            text = text.replace(/
-                (                       // save in $1
-                    ^                   // start of line  (with /m)
-                    <($block_tags_b)    // start tag = $2
-                    \b                  // word break
-                                        // attacklab: hack around khtml/pcre bug...
-                    [^\r]*?             // any number of lines, minimally matching
-                    .*</\2>             // the matching end tag
-                    [ \t]*              // trailing spaces/tabs
-                    (?=\n+)             // followed by a newline
-                )                       // attacklab: there are sentinel newlines at end of document
-            /gm,function(){...}};
-            */
-			text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math)\b[^\r]*?.*<\/\2>[ \t]*(?=\n+)\n)/gm, hashElement);
-
-			// Special case just for <hr />. It was easier to make a special case than
-			// to make the other regex more complicated.  
-
-			/*
-            text = text.replace(/
-                \n                  // Starting after a blank line
-                [ ]{0,3}
-                (                   // save in $1
-                    (<(hr)          // start tag = $2
-                        \b          // word break
-                        ([^<>])*?
-                    \/?>)           // the matching end tag
-                    [ \t]*
-                    (?=\n{2,})      // followed by a blank line
-                )
-            /g,hashElement);
-            */
-			text = text.replace(/\n[ ]{0,3}((<(hr)\b([^<>])*?\/?>)[ \t]*(?=\n{2,}))/g, hashElement);
-
-			// Special case for standalone HTML comments:
-
-			/*
-            text = text.replace(/
-                \n\n                                            // Starting after a blank line
-                [ ]{0,3}                                        // attacklab: g_tab_width - 1
-                (                                               // save in $1
-                    <!
-                    (--(?:|(?:[^>-]|-[^>])(?:[^-]|-[^-])*)--)   // see http://www.w3.org/TR/html-markup/syntax.html#comments and http://meta.stackoverflow.com/q/95256
-                    >
-                    [ \t]*
-                    (?=\n{2,})                                  // followed by a blank line
-                )
-            /g,hashElement);
-            */
-			text = text.replace(/\n\n[ ]{0,3}(<!(--(?:|(?:[^>-]|-[^>])(?:[^-]|-[^-])*)--)>[ \t]*(?=\n{2,}))/g, hashElement);
-
-			// PHP and ASP-style processor instructions (<?...?> and <%...%>)
-
-			/*
-            text = text.replace(/
-                (?:
-                    \n\n            // Starting after a blank line
-                )
-                (                   // save in $1
-                    [ ]{0,3}        // attacklab: g_tab_width - 1
-                    (?:
-                        <([?%])     // $2
-                        [^\r]*?
-                        \2>
-                    )
-                    [ \t]*
-                    (?=\n{2,})      // followed by a blank line
-                )
-            /g,hashElement);
-            */
-			text = text.replace(/(?:\n\n)([ ]{0,3}(?:<([?%])[^\r]*?\2>)[ \t]*(?=\n{2,}))/g, hashElement);
-
-			return text;
-		}
-
-		function hashElement(wholeMatch, m1) {
-			var blockText = m1;
-
-			// Undo double lines
-			blockText = blockText.replace(/^\n+/, "");
-
-			// strip trailing blank lines
-			blockText = blockText.replace(/\n+$/g, "");
-
-			// Replace the element text with a marker ("~KxK" where x is its key)
-			blockText = "\n\n~K" + (g_html_blocks.push(blockText) - 1) + "K\n\n";
-
-			return blockText;
-		}
-
-		function _RunBlockGamut(text, doNotUnhash) {
-			//
-			// These are all the transformations that form block-level
-			// tags like paragraphs, headers, and list items.
-			//
-			text = _DoHeaders(text);
-
-			// Do Horizontal Rules:
-			var replacement = "<hr />\n";
-			text = text.replace(/^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$/gm, replacement);
-			text = text.replace(/^[ ]{0,2}([ ]?-[ ]?){3,}[ \t]*$/gm, replacement);
-			text = text.replace(/^[ ]{0,2}([ ]?_[ ]?){3,}[ \t]*$/gm, replacement);
-
-			text = _DoLists(text);
-			text = _DoCodeBlocks(text);
-			text = _DoBlockQuotes(text);
-
-			// We already ran _HashHTMLBlocks() before, in Markdown(), but that
-			// was to escape raw HTML in the original Markdown source. This time,
-			// we're escaping the markup we've just created, so that we don't wrap
-			// <p> tags around block-level tags.
-			text = _HashHTMLBlocks(text);
-			text = _FormParagraphs(text, doNotUnhash);
-
-			return text;
-		}
-
-		function _RunSpanGamut(text) {
-			//
-			// These are all the transformations that occur *within* block-level
-			// tags like paragraphs, headers, and list items.
-			//
-
-			text = _DoCodeSpans(text);
-			text = _EscapeSpecialCharsWithinTagAttributes(text);
-			text = _EncodeBackslashEscapes(text);
-
-			// Process anchor and image tags. Images must come first,
-			// because ![foo][f] looks like an anchor.
-			text = _DoImages(text);
-			text = _DoAnchors(text);
-
-			// Make links out of things like `<http://example.com/>`
-			// Must come after _DoAnchors(), because you can use < and >
-			// delimiters in inline links like [this](<url>).
-			text = _DoAutoLinks(text);
-
-			text = text.replace(/~P/g, "://"); // put in place to prevent autolinking; reset now
-
-			text = _EncodeAmpsAndAngles(text);
-			text = _DoItalicsAndBold(text);
-
-			// Do hard breaks:
-			text = text.replace(/  +\n/g, " <br>\n");
-
-			return text;
-		}
-
-		function _EscapeSpecialCharsWithinTagAttributes(text) {
-			//
-			// Within tags -- meaning between < and > -- encode [\ ` * _] so they
-			// don't conflict with their use in Markdown for code, italics and strong.
-			//
-
-			// Build a regex to find HTML tags and comments.  See Friedl's 
-			// "Mastering Regular Expressions", 2nd Ed., pp. 200-201.
-
-			// SE: changed the comment part of the regex
-
-			var regex = /(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])*>|<!(--(?:|(?:[^>-]|-[^>])(?:[^-]|-[^-])*)--)>)/gi;
-
-			text = text.replace(regex, function (wholeMatch) {
-				var tag = wholeMatch.replace(/(.)<\/?code>(?=.)/g, "$1`");
-				tag = escapeCharacters(tag, wholeMatch.charAt(1) == "!" ? "\\`*_/" : "\\`*_"); // also escape slashes in comments to prevent autolinking there -- http://meta.stackoverflow.com/questions/95987
-				return tag;
-			});
-
-			return text;
-		}
-
-		function _DoAnchors(text) {
-			//
-			// Turn Markdown link shortcuts into XHTML <a> tags.
-			//
-			//
-			// First, handle reference-style links: [link text] [id]
-			//
-
-			/*
-            text = text.replace(/
-                (                           // wrap whole match in $1
-                    \[
-                    (
-                        (?:
-                            \[[^\]]*\]      // allow brackets nested one level
-                            |
-                            [^\[]           // or anything else
-                        )*
-                    )
-                    \]
-
-                    [ ]?                    // one optional space
-                    (?:\n[ ]*)?             // one optional newline followed by spaces
-
-                    \[
-                    (.*?)                   // id = $3
-                    \]
-                )
-                ()()()()                    // pad remaining backreferences
-            /g, writeAnchorTag);
-            */
-			text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\][ ]?(?:\n[ ]*)?\[(.*?)\])()()()()/g, writeAnchorTag);
-
-			//
-			// Next, inline-style links: [link text](url "optional title")
-			//
-
-			/*
-            text = text.replace(/
-                (                           // wrap whole match in $1
-                    \[
-                    (
-                        (?:
-                            \[[^\]]*\]      // allow brackets nested one level
-                            |
-                            [^\[\]]         // or anything else
-                        )*
-                    )
-                    \]
-                    \(                      // literal paren
-                    [ \t]*
-                    ()                      // no id, so leave $3 empty
-                    <?(                     // href = $4
-                        (?:
-                            \([^)]*\)       // allow one level of (correctly nested) parens (think MSDN)
-                            |
-                            [^()]
-                        )*?
-                    )>?                
-                    [ \t]*
-                    (                       // $5
-                        (['"])              // quote char = $6
-                        (.*?)               // Title = $7
-                        \6                  // matching quote
-                        [ \t]*              // ignore any spaces/tabs between closing quote and )
-                    )?                      // title is optional
-                    \)
-                )
-            /g, writeAnchorTag);
-            */
-
-			text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\]\([ \t]*()<?((?:\([^)]*\)|[^()])*?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g, writeAnchorTag);
-
-			//
-			// Last, handle reference-style shortcuts: [link text]
-			// These must come last in case you've also got [link test][1]
-			// or [link test](/foo)
-			//
-
-			/*
-            text = text.replace(/
-                (                   // wrap whole match in $1
-                    \[
-                    ([^\[\]]+)      // link text = $2; can't contain '[' or ']'
-                    \]
-                )
-                ()()()()()          // pad rest of backreferences
-            /g, writeAnchorTag);
-            */
-			text = text.replace(/(\[([^\[\]]+)\])()()()()()/g, writeAnchorTag);
-
-			return text;
-		}
-
-		function writeAnchorTag(wholeMatch, m1, m2, m3, m4, m5, m6, m7) {
-			if (m7 == undefined) m7 = "";
-			var whole_match = m1;
-			var link_text = m2.replace(/:\/\//g, "~P"); // to prevent auto-linking withing the link. will be converted back after the auto-linker runs
-			var link_id = m3.toLowerCase();
-			var url = m4;
-			var title = m7;
-
-			if (url == "") {
-				if (link_id == "") {
-					// lower-case and turn embedded newlines into spaces
-					link_id = link_text.toLowerCase().replace(/ ?\n/g, " ");
-				}
-				url = "#" + link_id;
-
-				if (g_urls.get(link_id) != undefined) {
-					url = g_urls.get(link_id);
-					if (g_titles.get(link_id) != undefined) {
-						title = g_titles.get(link_id);
-					}
-				}
-				else {
-					if (whole_match.search(/\(\s*\)$/m) > -1) {
-						// Special case for explicit empty url
-						url = "";
-					} else {
-						return whole_match;
-					}
-				}
-			}
-			url = encodeProblemUrlChars(url);
-			url = escapeCharacters(url, "*_");
-			var result = "<a href=\"" + url + "\"";
-
-			if (title != "") {
-				title = attributeEncode(title);
-				title = escapeCharacters(title, "*_");
-				result += " title=\"" + title + "\"";
-			}
-
-			result += ">" + link_text + "</a>";
-
-			return result;
-		}
-
-		function _DoImages(text) {
-			//
-			// Turn Markdown image shortcuts into <img> tags.
-			//
-
-			//
-			// First, handle reference-style labeled images: ![alt text][id]
-			//
-
-			/*
-            text = text.replace(/
-                (                   // wrap whole match in $1
-                    !\[
-                    (.*?)           // alt text = $2
-                    \]
-
-                    [ ]?            // one optional space
-                    (?:\n[ ]*)?     // one optional newline followed by spaces
-
-                    \[
-                    (.*?)           // id = $3
-                    \]
-                )
-                ()()()()            // pad rest of backreferences
-            /g, writeImageTag);
-            */
-			text = text.replace(/(!\[(.*?)\][ ]?(?:\n[ ]*)?\[(.*?)\])()()()()/g, writeImageTag);
-
-			//
-			// Next, handle inline images:  ![alt text](url "optional title")
-			// Don't forget: encode * and _
-
-			/*
-            text = text.replace(/
-                (                   // wrap whole match in $1
-                    !\[
-                    (.*?)           // alt text = $2
-                    \]
-                    \s?             // One optional whitespace character
-                    \(              // literal paren
-                    [ \t]*
-                    ()              // no id, so leave $3 empty
-                    <?(\S+?)>?      // src url = $4
-                    [ \t]*
-                    (               // $5
-                        (['"])      // quote char = $6
-                        (.*?)       // title = $7
-                        \6          // matching quote
-                        [ \t]*
-                    )?              // title is optional
-                    \)
-                )
-            /g, writeImageTag);
-            */
-			text = text.replace(/(!\[(.*?)\]\s?\([ \t]*()<?(\S+?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g, writeImageTag);
-
-			return text;
-		}
-
-		function attributeEncode(text) {
-			// unconditionally replace angle brackets here -- what ends up in an attribute (e.g. alt or title)
-			// never makes sense to have verbatim HTML in it (and the sanitizer would totally break it)
-			return text.replace(/>/g, "&gt;").replace(/</g, "&lt;").replace(/"/g, "&quot;");
-		}
-
-		function writeImageTag(wholeMatch, m1, m2, m3, m4, m5, m6, m7) {
-			var whole_match = m1;
-			var alt_text = m2;
-			var link_id = m3.toLowerCase();
-			var url = m4;
-			var title = m7;
-
-			if (!title) title = "";
-
-			if (url == "") {
-				if (link_id == "") {
-					// lower-case and turn embedded newlines into spaces
-					link_id = alt_text.toLowerCase().replace(/ ?\n/g, " ");
-				}
-				url = "#" + link_id;
-
-				if (g_urls.get(link_id) != undefined) {
-					url = g_urls.get(link_id);
-					if (g_titles.get(link_id) != undefined) {
-						title = g_titles.get(link_id);
-					}
-				}
-				else {
-					return whole_match;
-				}
-			}
-
-			alt_text = escapeCharacters(attributeEncode(alt_text), "*_[]()");
-			url = escapeCharacters(url, "*_");
-			var result = "<img src=\"" + url + "\" alt=\"" + alt_text + "\"";
-
-			// attacklab: Markdown.pl adds empty title attributes to images.
-			// Replicate this bug.
-
-			//if (title != "") {
-			title = attributeEncode(title);
-			title = escapeCharacters(title, "*_");
-			result += " title=\"" + title + "\"";
-			//}
-
-			result += " />";
-
-			return result;
-		}
-
-		function _DoHeaders(text) {
-
-			// Setext-style headers:
-			//  Header 1
-			//  ========
-			//  
-			//  Header 2
-			//  --------
-			//
-			text = text.replace(/^(.+)[ \t]*\n=+[ \t]*\n+/gm,
-                function (wholeMatch, m1) { return "<h1>" + _RunSpanGamut(m1) + "</h1>\n\n"; }
-            );
-
-			text = text.replace(/^(.+)[ \t]*\n-+[ \t]*\n+/gm,
-                function (matchFound, m1) { return "<h2>" + _RunSpanGamut(m1) + "</h2>\n\n"; }
-            );
-
-			// atx-style headers:
-			//  # Header 1
-			//  ## Header 2
-			//  ## Header 2 with closing hashes ##
-			//  ...
-			//  ###### Header 6
-			//
-
-			/*
-            text = text.replace(/
-                ^(\#{1,6})      // $1 = string of #'s
-                [ \t]*
-                (.+?)           // $2 = Header text
-                [ \t]*
-                \#*             // optional closing #'s (not counted)
-                \n+
-            /gm, function() {...});
-            */
-
-			text = text.replace(/^(\#{1,6})[ \t]*(.+?)[ \t]*\#*\n+/gm,
-                function (wholeMatch, m1, m2) {
-                	var h_level = m1.length;
-                	return "<h" + h_level + ">" + _RunSpanGamut(m2) + "</h" + h_level + ">\n\n";
-                }
-            );
-
-			return text;
-		}
-
-		function _DoLists(text) {
-			//
-			// Form HTML ordered (numbered) and unordered (bulleted) lists.
-			//
-
-			// attacklab: add sentinel to hack around khtml/safari bug:
-			// http://bugs.webkit.org/show_bug.cgi?id=11231
-			text += "~0";
-
-			// Re-usable pattern to match any entirel ul or ol list:
-
-			/*
-            var whole_list = /
-                (                                   // $1 = whole list
-                    (                               // $2
-                        [ ]{0,3}                    // attacklab: g_tab_width - 1
-                        ([*+-]|\d+[.])              // $3 = first list item marker
-                        [ \t]+
-                    )
-                    [^\r]+?
-                    (                               // $4
-                        ~0                          // sentinel for workaround; should be $
-                        |
-                        \n{2,}
-                        (?=\S)
-                        (?!                         // Negative lookahead for another list item marker
-                            [ \t]*
-                            (?:[*+-]|\d+[.])[ \t]+
-                        )
-                    )
-                )
-            /g
-            */
-			var whole_list = /^(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;
-
-			if (g_list_level) {
-				text = text.replace(whole_list, function (wholeMatch, m1, m2) {
-					var list = m1;
-					var list_type = (m2.search(/[*+-]/g) > -1) ? "ul" : "ol";
-
-					var result = _ProcessListItems(list, list_type);
-
-					// Trim any trailing whitespace, to put the closing `</$list_type>`
-					// up on the preceding line, to get it past the current stupid
-					// HTML block parser. This is a hack to work around the terrible
-					// hack that is the HTML block parser.
-					result = result.replace(/\s+$/, "");
-					result = "<" + list_type + ">" + result + "</" + list_type + ">\n";
-					return result;
-				});
-			} else {
-				whole_list = /(\n\n|^\n?)(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/g;
-				text = text.replace(whole_list, function (wholeMatch, m1, m2, m3) {
-					var runup = m1;
-					var list = m2;
-
-					var list_type = (m3.search(/[*+-]/g) > -1) ? "ul" : "ol";
-					var result = _ProcessListItems(list, list_type);
-					result = runup + "<" + list_type + ">\n" + result + "</" + list_type + ">\n";
-					return result;
-				});
-			}
-
-			// attacklab: strip sentinel
-			text = text.replace(/~0/, "");
-
-			return text;
-		}
-
-		var _listItemMarkers = { ol: "\\d+[.]", ul: "[*+-]" };
-
-		function _ProcessListItems(list_str, list_type) {
-			//
-			//  Process the contents of a single ordered or unordered list, splitting it
-			//  into individual list items.
-			//
-			//  list_type is either "ul" or "ol".
-
-			// The $g_list_level global keeps track of when we're inside a list.
-			// Each time we enter a list, we increment it; when we leave a list,
-			// we decrement. If it's zero, we're not in a list anymore.
-			//
-			// We do this because when we're not inside a list, we want to treat
-			// something like this:
-			//
-			//    I recommend upgrading to version
-			//    8. Oops, now this line is treated
-			//    as a sub-list.
-			//
-			// As a single paragraph, despite the fact that the second line starts
-			// with a digit-period-space sequence.
-			//
-			// Whereas when we're inside a list (or sub-list), that line will be
-			// treated as the start of a sub-list. What a kludge, huh? This is
-			// an aspect of Markdown's syntax that's hard to parse perfectly
-			// without resorting to mind-reading. Perhaps the solution is to
-			// change the syntax rules such that sub-lists must start with a
-			// starting cardinal number; e.g. "1." or "a.".
-
-			g_list_level++;
-
-			// trim trailing blank lines:
-			list_str = list_str.replace(/\n{2,}$/, "\n");
-
-			// attacklab: add sentinel to emulate \z
-			list_str += "~0";
-
-			// In the original attacklab showdown, list_type was not given to this function, and anything
-			// that matched /[*+-]|\d+[.]/ would just create the next <li>, causing this mismatch:
-			//
-			//  Markdown          rendered by WMD        rendered by MarkdownSharp
-			//  ------------------------------------------------------------------
-			//  1. first          1. first               1. first
-			//  2. second         2. second              2. second
-			//  - third           3. third                   * third
-			//
-			// We changed this to behave identical to MarkdownSharp. This is the constructed RegEx,
-			// with {MARKER} being one of \d+[.] or [*+-], depending on list_type:
-
-			/*
-            list_str = list_str.replace(/
-                (^[ \t]*)                       // leading whitespace = $1
-                ({MARKER}) [ \t]+               // list marker = $2
-                ([^\r]+?                        // list item text   = $3
-                    (\n+)
-                )
-                (?=
-                    (~0 | \2 ({MARKER}) [ \t]+)
-                )
-            /gm, function(){...});
-            */
-
-			var marker = _listItemMarkers[list_type];
-			var re = new RegExp("(^[ \\t]*)(" + marker + ")[ \\t]+([^\\r]+?(\\n+))(?=(~0|\\1(" + marker + ")[ \\t]+))", "gm");
-			var last_item_had_a_double_newline = false;
-			list_str = list_str.replace(re,
-                function (wholeMatch, m1, m2, m3) {
-                	var item = m3;
-                	var leading_space = m1;
-                	var ends_with_double_newline = /\n\n$/.test(item);
-                	var contains_double_newline = ends_with_double_newline || item.search(/\n{2,}/) > -1;
-
-                	if (contains_double_newline || last_item_had_a_double_newline) {
-                		item = _RunBlockGamut(_Outdent(item), /* doNotUnhash = */true);
-                	}
-                	else {
-                		// Recursion for sub-lists:
-                		item = _DoLists(_Outdent(item));
-                		item = item.replace(/\n$/, ""); // chomp(item)
-                		item = _RunSpanGamut(item);
-                	}
-                	last_item_had_a_double_newline = ends_with_double_newline;
-                	return "<li>" + item + "</li>\n";
-                }
-            );
-
-			// attacklab: strip sentinel
-			list_str = list_str.replace(/~0/g, "");
-
-			g_list_level--;
-			return list_str;
-		}
-
-		function _DoCodeBlocks(text) {
-			//
-			//  Process Markdown `<pre><code>` blocks.
-			//  
-
-			/*
-            text = text.replace(/
-                (?:\n\n|^)
-                (                               // $1 = the code block -- one or more lines, starting with a space/tab
-                    (?:
-                        (?:[ ]{4}|\t)           // Lines must start with a tab or a tab-width of spaces - attacklab: g_tab_width
-                        .*\n+
-                    )+
-                )
-                (\n*[ ]{0,3}[^ \t\n]|(?=~0))    // attacklab: g_tab_width
-            /g ,function(){...});
-            */
-
-			// attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
-			text += "~0";
-
-			text = text.replace(/(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g,
-                function (wholeMatch, m1, m2) {
-                	var codeblock = m1;
-                	var nextChar = m2;
-
-                	codeblock = _EncodeCode(_Outdent(codeblock));
-                	codeblock = _Detab(codeblock);
-                	codeblock = codeblock.replace(/^\n+/g, ""); // trim leading newlines
-                	codeblock = codeblock.replace(/\n+$/g, ""); // trim trailing whitespace
-
-                	codeblock = '<pre class="prettyprint linenums"><code>' + codeblock + '\n</code></pre>';
-
-                	return "\n\n" + codeblock + "\n\n" + nextChar;
-                }
-            );
-
-			// attacklab: strip sentinel
-			text = text.replace(/~0/, "");
-
-			return text;
-		}
-
-		function hashBlock(text) {
-			text = text.replace(/(^\n+|\n+$)/g, "");
-			return "\n\n~K" + (g_html_blocks.push(text) - 1) + "K\n\n";
-		}
-
-		function _DoCodeSpans(text) {
-			//
-			// * Backtick quotes are used for <code></code> spans.
-			// 
-			// * You can use multiple backticks as the delimiters if you want to
-			//   include literal backticks in the code span. So, this input:
-			//     
-			//      Just type ``foo `bar` baz`` at the prompt.
-			//     
-			//   Will translate to:
-			//     
-			//      <p>Just type <code>foo `bar` baz</code> at the prompt.</p>
-			//     
-			//   There's no arbitrary limit to the number of backticks you
-			//   can use as delimters. If you need three consecutive backticks
-			//   in your code, use four for delimiters, etc.
-			//
-			// * You can use spaces to get literal backticks at the edges:
-			//     
-			//      ... type `` `bar` `` ...
-			//     
-			//   Turns to:
-			//     
-			//      ... type <code>`bar`</code> ...
-			//
-
-			/*
-            text = text.replace(/
-                (^|[^\\])       // Character before opening ` can't be a backslash
-                (`+)            // $2 = Opening run of `
-                (               // $3 = The code block
-                    [^\r]*?
-                    [^`]        // attacklab: work around lack of lookbehind
-                )
-                \2              // Matching closer
-                (?!`)
-            /gm, function(){...});
-            */
-
-			text = text.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,
-                function (wholeMatch, m1, m2, m3, m4) {
-                	var c = m3;
-                	c = c.replace(/^([ \t]*)/g, ""); // leading whitespace
-                	c = c.replace(/[ \t]*$/g, ""); // trailing whitespace
-                	c = _EncodeCode(c);
-                	c = c.replace(/:\/\//g, "~P"); // to prevent auto-linking. Not necessary in code *blocks*, but in code spans. Will be converted back after the auto-linker runs.
-                	return m1 + "<code>" + c + "</code>";
-                }
-            );
-
-			return text;
-		}
-
-		function _EncodeCode(text) {
-			//
-			// Encode/escape certain characters inside Markdown code runs.
-			// The point is that in code, these characters are literals,
-			// and lose their special Markdown meanings.
-			//
-			// Encode all ampersands; HTML entities are not
-			// entities within a Markdown code span.
-			text = text.replace(/&/g, "&amp;");
-
-			// Do the angle bracket song and dance:
-			text = text.replace(/</g, "&lt;");
-			text = text.replace(/>/g, "&gt;");
-
-			// Now, escape characters that are magic in Markdown:
-			text = escapeCharacters(text, "\*_{}[]\\", false);
-
-			// jj the line above breaks this:
-			//---
-
-			//* Item
-
-			//   1. Subitem
-
-			//            special char: *
-			//---
-
-			return text;
-		}
-
-		function _DoItalicsAndBold(text) {
-
-			// <strong> must go first:
-			text = text.replace(/([\W_]|^)(\*\*|__)(?=\S)([^\r]*?\S[\*_]*)\2([\W_]|$)/g,
-            "$1<strong>$3</strong>$4");
-
-			text = text.replace(/([\W_]|^)(\*|_)(?=\S)([^\r\*_]*?\S)\2([\W_]|$)/g,
-            "$1<em>$3</em>$4");
-
-			return text;
-		}
-
-		function _DoBlockQuotes(text) {
-
-			/*
-            text = text.replace(/
-                (                           // Wrap whole match in $1
-                    (
-                        ^[ \t]*>[ \t]?      // '>' at the start of a line
-                        .+\n                // rest of the first line
-                        (.+\n)*             // subsequent consecutive lines
-                        \n*                 // blanks
-                    )+
-                )
-            /gm, function(){...});
-            */
-
-			text = text.replace(/((^[ \t]*>[ \t]?.+\n(.+\n)*\n*)+)/gm,
-                function (wholeMatch, m1) {
-                	var bq = m1;
-
-                	// attacklab: hack around Konqueror 3.5.4 bug:
-                	// "----------bug".replace(/^-/g,"") == "bug"
-
-                	bq = bq.replace(/^[ \t]*>[ \t]?/gm, "~0"); // trim one level of quoting
-
-                	// attacklab: clean up hack
-                	bq = bq.replace(/~0/g, "");
-
-                	bq = bq.replace(/^[ \t]+$/gm, "");     // trim whitespace-only lines
-                	bq = _RunBlockGamut(bq);             // recurse
-
-                	bq = bq.replace(/(^|\n)/g, "$1  ");
-                	// These leading spaces screw with <pre> content, so we need to fix that:
-                	bq = bq.replace(
-                            /(\s*<pre>[^\r]+?<\/pre>)/gm,
-                        function (wholeMatch, m1) {
-                        	var pre = m1;
-                        	// attacklab: hack around Konqueror 3.5.4 bug:
-                        	pre = pre.replace(/^  /mg, "~0");
-                        	pre = pre.replace(/~0/g, "");
-                        	return pre;
-                        });
-
-                	return hashBlock("<blockquote>\n" + bq + "\n</blockquote>");
-                }
-            );
-			return text;
-		}
-
-		function _FormParagraphs(text, doNotUnhash) {
-			//
-			//  Params:
-			//    $text - string to process with html <p> tags
-			//
-
-			// Strip leading and trailing lines:
-			text = text.replace(/^\n+/g, "");
-			text = text.replace(/\n+$/g, "");
-
-			var grafs = text.split(/\n{2,}/g);
-			var grafsOut = [];
-
-			var markerRe = /~K(\d+)K/;
-
-			//
-			// Wrap <p> tags.
-			//
-			var end = grafs.length;
-			for (var i = 0; i < end; i++) {
-				var str = grafs[i];
-
-				// if this is an HTML marker, copy it
-				if (markerRe.test(str)) {
-					grafsOut.push(str);
-				}
-				else if (/\S/.test(str)) {
-					str = _RunSpanGamut(str);
-					str = str.replace(/^([ \t]*)/g, "<p>");
-					str += "</p>"
-					grafsOut.push(str);
-				}
-
-			}
-			//
-			// Unhashify HTML blocks
-			//
-			if (!doNotUnhash) {
-				end = grafsOut.length;
-				for (var i = 0; i < end; i++) {
-					var foundAny = true;
-					while (foundAny) { // we may need several runs, since the data may be nested
-						foundAny = false;
-						grafsOut[i] = grafsOut[i].replace(/~K(\d+)K/g, function (wholeMatch, id) {
-							foundAny = true;
-							return g_html_blocks[id];
-						});
-					}
-				}
-			}
-			return grafsOut.join("\n\n");
-		}
-
-		function _EncodeAmpsAndAngles(text) {
-			// Smart processing for ampersands and angle brackets that need to be encoded.
-
-			// Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
-			//   http://bumppo.net/projects/amputator/
-			text = text.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g, "&amp;");
-
-			// Encode naked <'s
-			text = text.replace(/<(?![a-z\/?\$!])/gi, "&lt;");
-
-			return text;
-		}
-
-		function _EncodeBackslashEscapes(text) {
-			//
-			//   Parameter:  String.
-			//   Returns:    The string, with after processing the following backslash
-			//               escape sequences.
-			//
-
-			// attacklab: The polite way to do this is with the new
-			// escapeCharacters() function:
-			//
-			//     text = escapeCharacters(text,"\\",true);
-			//     text = escapeCharacters(text,"`*_{}[]()>#+-.!",true);
-			//
-			// ...but we're sidestepping its use of the (slow) RegExp constructor
-			// as an optimization for Firefox.  This function gets called a LOT.
-
-			text = text.replace(/\\(\\)/g, escapeCharacters_callback);
-			text = text.replace(/\\([`*_{}\[\]()>#+-.!])/g, escapeCharacters_callback);
-			return text;
-		}
-
-		function _DoAutoLinks(text) {
-
-			// note that at this point, all other URL in the text are already hyperlinked as <a href=""></a>
-			// *except* for the <http://www.foo.com> case
-
-			// automatically add < and > around unadorned raw hyperlinks
-			// must be preceded by space/BOF and followed by non-word/EOF character    
-			text = text.replace(/(^|\s)(https?|ftp)(:\/\/[-A-Z0-9+&@#\/%?=~_|\[\]\(\)!:,\.;]*[-A-Z0-9+&@#\/%=~_|\[\]])($|\W)/gi, "$1<$2$3>$4");
-
-			//  autolink anything like <http://example.com>
-
-			var replacer = function (wholematch, m1) { return "<a href=\"" + m1 + "\">" + pluginHooks.plainLinkText(m1) + "</a>"; }
-			text = text.replace(/<((https?|ftp):[^'">\s]+)>/gi, replacer);
-
-			// Email addresses: <address@domain.foo>
-			/*
-            text = text.replace(/
-                <
-                (?:mailto:)?
-                (
-                    [-.\w]+
-                    \@
-                    [-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+
-                )
-                >
-            /gi, _DoAutoLinks_callback());
-            */
-
-			var email_replacer = function (wholematch, m1) {
-				var mailto = 'mailto:'
-				var link
-				var email
-				if (m1.substring(0, mailto.length) != mailto) {
-					link = mailto + m1;
-					email = m1;
-				} else {
-					link = m1;
-					email = m1.substring(mailto.length, m1.length);
-				}
-				return "<a href=\"" + link + "\">" + pluginHooks.plainLinkText(email) + "</a>";
-			}
-			text = text.replace(/<((?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+))>/gi, email_replacer);
-
-			return text;
-		}
-
-		function _UnescapeSpecialChars(text) {
-			//
-			// Swap back in all the special characters we've hidden.
-			//
-			text = text.replace(/~E(\d+)E/g,
-                function (wholeMatch, m1) {
-                	var charCodeToReplace = parseInt(m1);
-                	return String.fromCharCode(charCodeToReplace);
-                }
-            );
-			return text;
-		}
-
-		function _Outdent(text) {
-			//
-			// Remove one level of line-leading tabs or spaces
-			//
-
-			// attacklab: hack around Konqueror 3.5.4 bug:
-			// "----------bug".replace(/^-/g,"") == "bug"
-
-			text = text.replace(/^(\t|[ ]{1,4})/gm, "~0"); // attacklab: g_tab_width
-
-			// attacklab: clean up hack
-			text = text.replace(/~0/g, "")
-
-			return text;
-		}
-
-		function _Detab(text) {
-			if (!/\t/.test(text))
-				return text;
-
-			var spaces = ["    ", "   ", "  ", " "],
-            skew = 0,
-            v;
-
-			return text.replace(/[\n\t]/g, function (match, offset) {
-				if (match === "\n") {
-					skew = offset + 1;
-					return match;
-				}
-				v = (offset - skew) % 4;
-				skew = offset + 1;
-				return spaces[v];
-			});
-		}
-
-		//
-		//  attacklab: Utility functions
-		//
-
-		var _problemUrlChars = /(?:["'*()[\]:]|~D)/g;
-
-		// hex-encodes some unusual "problem" chars in URLs to avoid URL detection problems 
-		function encodeProblemUrlChars(url) {
-			if (!url)
-				return "";
-
-			var len = url.length;
-
-			return url.replace(_problemUrlChars, function (match, offset) {
-				if (match == "~D") // escape for dollar
-					return "%24";
-				if (match == ":") {
-					if (offset == len - 1 || /[0-9\/]/.test(url.charAt(offset + 1)))
-						return ":";
-					if (url.substring(0, 'mailto:'.length) === 'mailto:')
-						return ":";
-					if (url.substring(0, 'magnet:'.length) === 'magnet:')
-						return ":";
-				}
-				return "%" + match.charCodeAt(0).toString(16);
-			});
-		}
-
-
-		function escapeCharacters(text, charsToEscape, afterBackslash) {
-			// First we have to escape the escape characters so that
-			// we can build a character class out of them
-			var regexString = "([" + charsToEscape.replace(/([\[\]\\])/g, "\\$1") + "])";
-
-			if (afterBackslash) {
-				regexString = "\\\\" + regexString;
-			}
-
-			var regex = new RegExp(regexString, "g");
-			text = text.replace(regex, escapeCharacters_callback);
-
-			return text;
-		}
-
-
-		function escapeCharacters_callback(wholeMatch, m1) {
-			var charCodeToEscape = m1.charCodeAt(0);
-			return "~E" + charCodeToEscape + "E";
-		}
-
-	}; // end of the Markdown.Converter constructor
-
-})();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/markdown/markdown.css b/src/Umbraco.Web.UI.Client/lib/markdown/markdown.css
deleted file mode 100644
index 9d13d93003..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/markdown/markdown.css
+++ /dev/null
@@ -1,83 +0,0 @@
-.wmd-panel {
-	width: 100%;
-}
-
-.wmd-input {
-	height: 300px;
-	width: 100%;
-	box-sizing: border-box;
-}
-
-.wmd-preview {
-	.well;
-	width: 100%;
-	box-sizing: border-box;
-}
-
-.wmd-panel .btn-toolbar {
-	margin-bottom: 0;
-	padding: 0;
-	width: 100%;
-}
-
-.wmd-panel .btn-toolbar-container[readonly] .btn-toolbar {
-	display: none;
-}
-
-/* unset the negative margin applied in button-groups.less to avoid flickering when hovering the button bar */
-.wmd-panel .btn-toolbar .btn-group>.btn+.btn {
-    margin-left: 0;
-}
-
-/*
-.icon-link,
-.icon-blockquote,
-.icon-code,
-.icon-bullet-list,
-.icon-list,
-.icon-header,
-.icon-hr-line,
-.icon-undo {
-	background-image: url(Markdown.Editor.Icons.png);
-}
-.icon-link              { background-position: 0      0; }
-.icon-blockquote        { background-position: -24px  0; }
-.icon-code              { background-position: -48px  0; }
-.icon-bullet-list       { background-position: -72px  0; }
-.icon-list              { background-position: -96px  0; }
-.icon-header            { background-position: -120px 0; }
-.icon-hr-line           { background-position: -144px 0; }
-.icon-undo               { background-position: -168px 0; }
-    */
-
-
-
-
-.wmd-prompt-background
-{
-	background-color: Black;
-}
-
-.wmd-prompt-dialog
-{
-	border: 1px solid #999999;
-	background-color: #F5F5F5;
-}
-
-.wmd-prompt-dialog > div {
-	font-size: 0.8em;
-	font-family: arial, helvetica, sans-serif;
-}
-
-
-.wmd-prompt-dialog > form > input[type="text"] {
-	border: 1px solid #999999;
-	color: black;
-}
-
-.wmd-prompt-dialog > form > input[type="button"]{
-	border: 1px solid #888888;
-	font-family: trebuchet MS, helvetica, sans-serif;
-	font-size: 0.8em;
-	font-weight: bold;
-}
diff --git a/src/Umbraco.Web.UI.Client/lib/markdown/markdown.editor.js b/src/Umbraco.Web.UI.Client/lib/markdown/markdown.editor.js
deleted file mode 100644
index 5822e6df89..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/markdown/markdown.editor.js
+++ /dev/null
@@ -1,2117 +0,0 @@
-// needs Markdown.Converter.js at the moment
-
-(function () {
-
-    var util = {},
-        position = {},
-        ui = {},
-        doc = window.document,
-        re = window.RegExp,
-        nav = window.navigator,
-        SETTINGS = { lineLength: 72 },
-
-    // Used to work around some browser bugs where we can't use feature testing.
-        uaSniffed = {
-            isIE: /msie/.test(nav.userAgent.toLowerCase()),
-            isIE_5or6: /msie 6/.test(nav.userAgent.toLowerCase()) || /msie 5/.test(nav.userAgent.toLowerCase()),
-            isOpera: /opera/.test(nav.userAgent.toLowerCase())
-        };
-
-
-    // -------------------------------------------------------------------
-    //  YOUR CHANGES GO HERE
-    //
-    // I've tried to localize the things you are likely to change to 
-    // this area.
-    // -------------------------------------------------------------------
-
-    // The text that appears on the upper part of the dialog box when
-    // entering links.
-    var linkDialogText = "<p>http://example.com/ \"optional title\"</p>";
-    var imageDialogText = "<p>http://example.com/images/diagram.jpg \"optional title\"</p>";
-
-    // The default text that appears in the dialog input box when entering
-    // links.
-    var imageDefaultText = "http://";
-    var linkDefaultText = "http://";
-
-    var defaultHelpHoverTitle = "Markdown Editing Help";
-
-    // -------------------------------------------------------------------
-    //  END OF YOUR CHANGES
-    // -------------------------------------------------------------------
-
-    // help, if given, should have a property "handler", the click handler for the help button,
-    // and can have an optional property "title" for the button's tooltip (defaults to "Markdown Editing Help").
-    // If help isn't given, not help button is created.
-    //
-    // The constructed editor object has the methods:
-    // - getConverter() returns the markdown converter object that was passed to the constructor
-    // - run() actually starts the editor; should be called after all necessary plugins are registered. Calling this more than once is a no-op.
-    // - refreshPreview() forces the preview to be updated. This method is only available after run() was called.
-    Markdown.Editor = function (markdownConverter, idPostfix, help) {
-
-        idPostfix = idPostfix || "";
-
-        var hooks = this.hooks = new Markdown.HookCollection();
-        hooks.addNoop("onPreviewRefresh");       // called with no arguments after the preview has been refreshed
-        hooks.addNoop("postBlockquoteCreation"); // called with the user's selection *after* the blockquote was created; should return the actual to-be-inserted text
-        hooks.addFalse("insertImageDialog");     /* called with one parameter: a callback to be called with the URL of the image. If the application creates
-                                                  * its own image insertion dialog, this hook should return true, and the callback should be called with the chosen
-                                                  * image url (or null if the user cancelled). If this hook returns false, the default dialog will be used.
-                                                  */
-        hooks.addFalse("insertLinkDialog");
-
-        this.getConverter = function () { return markdownConverter; }
-
-        var that = this,
-            panels;
-
-        this.run = function () {
-            if (panels)
-                return; // already initialized
-
-            panels = new PanelCollection(idPostfix);
-            var commandManager = new CommandManager(hooks);
-            var previewManager = new PreviewManager(markdownConverter, panels, function () { hooks.onPreviewRefresh(); });
-            var undoManager, uiManager;
-
-            if (!/\?noundo/.test(doc.location.href)) {
-                undoManager = new UndoManager(function () {
-                    previewManager.refresh();
-                    if (uiManager) // not available on the first call
-                        uiManager.setUndoRedoButtonStates();
-                }, panels);
-                this.textOperation = function (f) {
-                    undoManager.setCommandMode();
-                    f();
-                    that.refreshPreview();
-                }
-            }
-
-            uiManager = new UIManager(idPostfix, panels, undoManager, previewManager, commandManager, help);
-            uiManager.setUndoRedoButtonStates();
-
-            var forceRefresh = that.refreshPreview = function () { previewManager.refresh(true); };
-
-            forceRefresh();
-        };
-
-    }
-
-    // before: contains all the text in the input box BEFORE the selection.
-    // after: contains all the text in the input box AFTER the selection.
-    function Chunks() { }
-
-    // startRegex: a regular expression to find the start tag
-    // endRegex: a regular expresssion to find the end tag
-    Chunks.prototype.findTags = function (startRegex, endRegex) {
-
-        var chunkObj = this;
-        var regex;
-
-        if (startRegex) {
-
-            regex = util.extendRegExp(startRegex, "", "$");
-
-            this.before = this.before.replace(regex,
-                function (match) {
-                    chunkObj.startTag = chunkObj.startTag + match;
-                    return "";
-                });
-
-            regex = util.extendRegExp(startRegex, "^", "");
-
-            this.selection = this.selection.replace(regex,
-                function (match) {
-                    chunkObj.startTag = chunkObj.startTag + match;
-                    return "";
-                });
-        }
-
-        if (endRegex) {
-
-            regex = util.extendRegExp(endRegex, "", "$");
-
-            this.selection = this.selection.replace(regex,
-                function (match) {
-                    chunkObj.endTag = match + chunkObj.endTag;
-                    return "";
-                });
-
-            regex = util.extendRegExp(endRegex, "^", "");
-
-            this.after = this.after.replace(regex,
-                function (match) {
-                    chunkObj.endTag = match + chunkObj.endTag;
-                    return "";
-                });
-        }
-    };
-
-    // If remove is false, the whitespace is transferred
-    // to the before/after regions.
-    //
-    // If remove is true, the whitespace disappears.
-    Chunks.prototype.trimWhitespace = function (remove) {
-        var beforeReplacer, afterReplacer, that = this;
-        if (remove) {
-            beforeReplacer = afterReplacer = "";
-        } else {
-            beforeReplacer = function (s) { that.before += s; return ""; }
-            afterReplacer = function (s) { that.after = s + that.after; return ""; }
-        }
-
-        this.selection = this.selection.replace(/^(\s*)/, beforeReplacer).replace(/(\s*)$/, afterReplacer);
-    };
-
-
-    Chunks.prototype.skipLines = function (nLinesBefore, nLinesAfter, findExtraNewlines) {
-
-        if (nLinesBefore === undefined) {
-            nLinesBefore = 1;
-        }
-
-        if (nLinesAfter === undefined) {
-            nLinesAfter = 1;
-        }
-
-        nLinesBefore++;
-        nLinesAfter++;
-
-        var regexText;
-        var replacementText;
-
-        // chrome bug ... documented at: http://meta.stackoverflow.com/questions/63307/blockquote-glitch-in-editor-in-chrome-6-and-7/65985#65985
-        if (navigator.userAgent.match(/Chrome/)) {
-            "X".match(/()./);
-        }
-
-        this.selection = this.selection.replace(/(^\n*)/, "");
-
-        this.startTag = this.startTag + re.$1;
-
-        this.selection = this.selection.replace(/(\n*$)/, "");
-        this.endTag = this.endTag + re.$1;
-        this.startTag = this.startTag.replace(/(^\n*)/, "");
-        this.before = this.before + re.$1;
-        this.endTag = this.endTag.replace(/(\n*$)/, "");
-        this.after = this.after + re.$1;
-
-        if (this.before) {
-
-            regexText = replacementText = "";
-
-            while (nLinesBefore--) {
-                regexText += "\\n?";
-                replacementText += "\n";
-            }
-
-            if (findExtraNewlines) {
-                regexText = "\\n*";
-            }
-            this.before = this.before.replace(new re(regexText + "$", ""), replacementText);
-        }
-
-        if (this.after) {
-
-            regexText = replacementText = "";
-
-            while (nLinesAfter--) {
-                regexText += "\\n?";
-                replacementText += "\n";
-            }
-            if (findExtraNewlines) {
-                regexText = "\\n*";
-            }
-
-            this.after = this.after.replace(new re(regexText, ""), replacementText);
-        }
-    };
-
-    // end of Chunks 
-
-    // A collection of the important regions on the page.
-    // Cached so we don't have to keep traversing the DOM.
-    // Also holds ieCachedRange and ieCachedScrollTop, where necessary; working around
-    // this issue:
-    // Internet explorer has problems with CSS sprite buttons that use HTML
-    // lists.  When you click on the background image "button", IE will 
-    // select the non-existent link text and discard the selection in the
-    // textarea.  The solution to this is to cache the textarea selection
-    // on the button's mousedown event and set a flag.  In the part of the
-    // code where we need to grab the selection, we check for the flag
-    // and, if it's set, use the cached area instead of querying the
-    // textarea.
-    //
-    // This ONLY affects Internet Explorer (tested on versions 6, 7
-    // and 8) and ONLY on button clicks.  Keyboard shortcuts work
-    // normally since the focus never leaves the textarea.
-    function PanelCollection(postfix) {
-        this.buttonBar = doc.getElementById("wmd-button-bar" + postfix);
-        this.preview = doc.getElementById("wmd-preview" + postfix);
-        this.input = doc.getElementById("wmd-input" + postfix);
-    };
-
-    // Returns true if the DOM element is visible, false if it's hidden.
-    // Checks if display is anything other than none.
-    util.isVisible = function (elem) {
-
-        if (window.getComputedStyle) {
-            // Most browsers
-            return window.getComputedStyle(elem, null).getPropertyValue("display") !== "none";
-        }
-        else if (elem.currentStyle) {
-            // IE
-            return elem.currentStyle["display"] !== "none";
-        }
-    };
-
-
-    // Adds a listener callback to a DOM element which is fired on a specified
-    // event.
-    util.addEvent = function (elem, event, listener) {
-        if (elem.attachEvent) {
-            // IE only.  The "on" is mandatory.
-            elem.attachEvent("on" + event, listener);
-        }
-        else {
-            // Other browsers.
-            elem.addEventListener(event, listener, false);
-        }
-    };
-
-
-    // Removes a listener callback from a DOM element which is fired on a specified
-    // event.
-    util.removeEvent = function (elem, event, listener) {
-        if (elem.detachEvent) {
-            // IE only.  The "on" is mandatory.
-            elem.detachEvent("on" + event, listener);
-        }
-        else {
-            // Other browsers.
-            elem.removeEventListener(event, listener, false);
-        }
-    };
-
-    // Converts \r\n and \r to \n.
-    util.fixEolChars = function (text) {
-        text = text.replace(/\r\n/g, "\n");
-        text = text.replace(/\r/g, "\n");
-        return text;
-    };
-
-    // Extends a regular expression.  Returns a new RegExp
-    // using pre + regex + post as the expression.
-    // Used in a few functions where we have a base
-    // expression and we want to pre- or append some
-    // conditions to it (e.g. adding "$" to the end).
-    // The flags are unchanged.
-    //
-    // regex is a RegExp, pre and post are strings.
-    util.extendRegExp = function (regex, pre, post) {
-
-        if (pre === null || pre === undefined) {
-            pre = "";
-        }
-        if (post === null || post === undefined) {
-            post = "";
-        }
-
-        var pattern = regex.toString();
-        var flags;
-
-        // Replace the flags with empty space and store them.
-        pattern = pattern.replace(/\/([gim]*)$/, function (wholeMatch, flagsPart) {
-            flags = flagsPart;
-            return "";
-        });
-
-        // Remove the slash delimiters on the regular expression.
-        pattern = pattern.replace(/(^\/|\/$)/g, "");
-        pattern = pre + pattern + post;
-
-        return new re(pattern, flags);
-    }
-
-    // UNFINISHED
-    // The assignment in the while loop makes jslint cranky.
-    // I'll change it to a better loop later.
-    position.getTop = function (elem, isInner) {
-        var result = elem.offsetTop;
-        if (!isInner) {
-            while (elem = elem.offsetParent) {
-                result += elem.offsetTop;
-            }
-        }
-        return result;
-    };
-
-    position.getHeight = function (elem) {
-        return elem.offsetHeight || elem.scrollHeight;
-    };
-
-    position.getWidth = function (elem) {
-        return elem.offsetWidth || elem.scrollWidth;
-    };
-
-    position.getPageSize = function () {
-
-        var scrollWidth, scrollHeight;
-        var innerWidth, innerHeight;
-
-        // It's not very clear which blocks work with which browsers.
-        if (self.innerHeight && self.scrollMaxY) {
-            scrollWidth = doc.body.scrollWidth;
-            scrollHeight = self.innerHeight + self.scrollMaxY;
-        }
-        else if (doc.body.scrollHeight > doc.body.offsetHeight) {
-            scrollWidth = doc.body.scrollWidth;
-            scrollHeight = doc.body.scrollHeight;
-        }
-        else {
-            scrollWidth = doc.body.offsetWidth;
-            scrollHeight = doc.body.offsetHeight;
-        }
-
-        if (self.innerHeight) {
-            // Non-IE browser
-            innerWidth = self.innerWidth;
-            innerHeight = self.innerHeight;
-        }
-        else if (doc.documentElement && doc.documentElement.clientHeight) {
-            // Some versions of IE (IE 6 w/ a DOCTYPE declaration)
-            innerWidth = doc.documentElement.clientWidth;
-            innerHeight = doc.documentElement.clientHeight;
-        }
-        else if (doc.body) {
-            // Other versions of IE
-            innerWidth = doc.body.clientWidth;
-            innerHeight = doc.body.clientHeight;
-        }
-
-        var maxWidth = Math.max(scrollWidth, innerWidth);
-        var maxHeight = Math.max(scrollHeight, innerHeight);
-        return [maxWidth, maxHeight, innerWidth, innerHeight];
-    };
-
-    // Handles pushing and popping TextareaStates for undo/redo commands.
-    // I should rename the stack variables to list.
-    function UndoManager(callback, panels) {
-
-        var undoObj = this;
-        var undoStack = []; // A stack of undo states
-        var stackPtr = 0; // The index of the current state
-        var mode = "none";
-        var lastState; // The last state
-        var timer; // The setTimeout handle for cancelling the timer
-        var inputStateObj;
-
-        // Set the mode for later logic steps.
-        var setMode = function (newMode, noSave) {
-            if (mode != newMode) {
-                mode = newMode;
-                if (!noSave) {
-                    saveState();
-                }
-            }
-
-            if (!uaSniffed.isIE || mode != "moving") {
-                timer = setTimeout(refreshState, 1);
-            }
-            else {
-                inputStateObj = null;
-            }
-        };
-
-        var refreshState = function (isInitialState) {
-            inputStateObj = new TextareaState(panels, isInitialState);
-            timer = undefined;
-        };
-
-        this.setCommandMode = function () {
-            mode = "command";
-            saveState();
-            timer = setTimeout(refreshState, 0);
-        };
-
-        this.canUndo = function () {
-            return stackPtr > 1;
-        };
-
-        this.canRedo = function () {
-            if (undoStack[stackPtr + 1]) {
-                return true;
-            }
-            return false;
-        };
-
-        // Removes the last state and restores it.
-        this.undo = function () {
-
-            if (undoObj.canUndo()) {
-                if (lastState) {
-                    // What about setting state -1 to null or checking for undefined?
-                    lastState.restore();
-                    lastState = null;
-                }
-                else {
-                    undoStack[stackPtr] = new TextareaState(panels);
-                    undoStack[--stackPtr].restore();
-
-                    if (callback) {
-                        callback();
-                    }
-                }
-            }
-
-            mode = "none";
-            panels.input.focus();
-            refreshState();
-        };
-
-        // Redo an action.
-        this.redo = function () {
-
-            if (undoObj.canRedo()) {
-
-                undoStack[++stackPtr].restore();
-
-                if (callback) {
-                    callback();
-                }
-            }
-
-            mode = "none";
-            panels.input.focus();
-            refreshState();
-        };
-
-        // Push the input area state to the stack.
-        var saveState = function () {
-            var currState = inputStateObj || new TextareaState(panels);
-
-            if (!currState) {
-                return false;
-            }
-            if (mode == "moving") {
-                if (!lastState) {
-                    lastState = currState;
-                }
-                return;
-            }
-            if (lastState) {
-                if (undoStack[stackPtr - 1].text != lastState.text) {
-                    undoStack[stackPtr++] = lastState;
-                }
-                lastState = null;
-            }
-            undoStack[stackPtr++] = currState;
-            undoStack[stackPtr + 1] = null;
-            if (callback) {
-                callback();
-            }
-        };
-
-        var handleCtrlYZ = function (event) {
-
-            var handled = false;
-
-            if (event.ctrlKey || event.metaKey) {
-
-                // IE and Opera do not support charCode.
-                var keyCode = event.charCode || event.keyCode;
-                var keyCodeChar = String.fromCharCode(keyCode);
-
-                switch (keyCodeChar) {
-
-                    case "y":
-                        undoObj.redo();
-                        handled = true;
-                        break;
-
-                    case "z":
-                        if (!event.shiftKey) {
-                            undoObj.undo();
-                        }
-                        else {
-                            undoObj.redo();
-                        }
-                        handled = true;
-                        break;
-                }
-            }
-
-            if (handled) {
-                if (event.preventDefault) {
-                    event.preventDefault();
-                }
-                if (window.event) {
-                    window.event.returnValue = false;
-                }
-                return;
-            }
-        };
-
-        // Set the mode depending on what is going on in the input area.
-        var handleModeChange = function (event) {
-
-            if (!event.ctrlKey && !event.metaKey) {
-
-                var keyCode = event.keyCode;
-
-                if ((keyCode >= 33 && keyCode <= 40) || (keyCode >= 63232 && keyCode <= 63235)) {
-                    // 33 - 40: page up/dn and arrow keys
-                    // 63232 - 63235: page up/dn and arrow keys on safari
-                    setMode("moving");
-                }
-                else if (keyCode == 8 || keyCode == 46 || keyCode == 127) {
-                    // 8: backspace
-                    // 46: delete
-                    // 127: delete
-                    setMode("deleting");
-                }
-                else if (keyCode == 13) {
-                    // 13: Enter
-                    setMode("newlines");
-                }
-                else if (keyCode == 27) {
-                    // 27: escape
-                    setMode("escape");
-                }
-                else if ((keyCode < 16 || keyCode > 20) && keyCode != 91) {
-                    // 16-20 are shift, etc. 
-                    // 91: left window key
-                    // I think this might be a little messed up since there are
-                    // a lot of nonprinting keys above 20.
-                    setMode("typing");
-                }
-            }
-        };
-
-        var setEventHandlers = function () {
-            util.addEvent(panels.input, "keypress", function (event) {
-                // keyCode 89: y
-                // keyCode 90: z
-                if ((event.ctrlKey || event.metaKey) && (event.keyCode == 89 || event.keyCode == 90)) {
-                    event.preventDefault();
-                }
-            });
-
-            var handlePaste = function () {
-                if (uaSniffed.isIE || (inputStateObj && inputStateObj.text != panels.input.value)) {
-                    if (timer == undefined) {
-                        mode = "paste";
-                        saveState();
-                        refreshState();
-                    }
-                }
-            };
-
-            util.addEvent(panels.input, "keydown", handleCtrlYZ);
-            util.addEvent(panels.input, "keydown", handleModeChange);
-            util.addEvent(panels.input, "mousedown", function () {
-                setMode("moving");
-            });
-
-            panels.input.onpaste = handlePaste;
-            panels.input.ondrop = handlePaste;
-        };
-
-        var init = function () {
-            setEventHandlers();
-            refreshState(true);
-            saveState();
-        };
-
-        init();
-    }
-
-    // end of UndoManager
-
-    // The input textarea state/contents.
-    // This is used to implement undo/redo by the undo manager.
-    function TextareaState(panels, isInitialState) {
-
-        // Aliases
-        var stateObj = this;
-        var inputArea = panels.input;
-        this.init = function () {
-            if (!util.isVisible(inputArea)) {
-                return;
-            }
-            if (!isInitialState && doc.activeElement && doc.activeElement !== inputArea) { // this happens when tabbing out of the input box
-                return;
-            }
-
-            this.setInputAreaSelectionStartEnd();
-            this.scrollTop = inputArea.scrollTop;
-            if (!this.text && inputArea.selectionStart || inputArea.selectionStart === 0) {
-                this.text = inputArea.value;
-            }
-
-        }
-
-        // Sets the selected text in the input box after we've performed an
-        // operation.
-        this.setInputAreaSelection = function () {
-
-            if (!util.isVisible(inputArea)) {
-                return;
-            }
-
-            if (inputArea.selectionStart !== undefined && !uaSniffed.isOpera) {
-
-                inputArea.focus();
-                inputArea.selectionStart = stateObj.start;
-                inputArea.selectionEnd = stateObj.end;
-                inputArea.scrollTop = stateObj.scrollTop;
-            }
-            else if (doc.selection) {
-
-                if (doc.activeElement && doc.activeElement !== inputArea) {
-                    return;
-                }
-
-                inputArea.focus();
-                var range = inputArea.createTextRange();
-                range.moveStart("character", -inputArea.value.length);
-                range.moveEnd("character", -inputArea.value.length);
-                range.moveEnd("character", stateObj.end);
-                range.moveStart("character", stateObj.start);
-                range.select();
-            }
-        };
-
-        this.setInputAreaSelectionStartEnd = function () {
-
-            if (!panels.ieCachedRange && (inputArea.selectionStart || inputArea.selectionStart === 0)) {
-
-                stateObj.start = inputArea.selectionStart;
-                stateObj.end = inputArea.selectionEnd;
-            }
-            else if (doc.selection) {
-
-                stateObj.text = util.fixEolChars(inputArea.value);
-
-                // IE loses the selection in the textarea when buttons are
-                // clicked.  On IE we cache the selection. Here, if something is cached,
-                // we take it.
-                var range = panels.ieCachedRange || doc.selection.createRange();
-
-                var fixedRange = util.fixEolChars(range.text);
-                var marker = "\x07";
-                var markedRange = marker + fixedRange + marker;
-                range.text = markedRange;
-                var inputText = util.fixEolChars(inputArea.value);
-
-                range.moveStart("character", -markedRange.length);
-                range.text = fixedRange;
-
-                stateObj.start = inputText.indexOf(marker);
-                stateObj.end = inputText.lastIndexOf(marker) - marker.length;
-
-                var len = stateObj.text.length - util.fixEolChars(inputArea.value).length;
-
-                if (len) {
-                    range.moveStart("character", -fixedRange.length);
-                    while (len--) {
-                        fixedRange += "\n";
-                        stateObj.end += 1;
-                    }
-                    range.text = fixedRange;
-                }
-
-                if (panels.ieCachedRange)
-                    stateObj.scrollTop = panels.ieCachedScrollTop; // this is set alongside with ieCachedRange
-
-                panels.ieCachedRange = null;
-
-                this.setInputAreaSelection();
-            }
-        };
-
-        // Restore this state into the input area.
-        this.restore = function () {
-
-            if (stateObj.text != undefined && stateObj.text != inputArea.value) {
-                inputArea.value = stateObj.text;
-            }
-            this.setInputAreaSelection();
-            inputArea.scrollTop = stateObj.scrollTop;
-        };
-
-        // Gets a collection of HTML chunks from the inptut textarea.
-        this.getChunks = function () {
-
-            var chunk = new Chunks();
-            chunk.before = util.fixEolChars(stateObj.text.substring(0, stateObj.start));
-            chunk.startTag = "";
-            chunk.selection = util.fixEolChars(stateObj.text.substring(stateObj.start, stateObj.end));
-            chunk.endTag = "";
-            chunk.after = util.fixEolChars(stateObj.text.substring(stateObj.end));
-            chunk.scrollTop = stateObj.scrollTop;
-
-            return chunk;
-        };
-
-        // Sets the TextareaState properties given a chunk of markdown.
-        this.setChunks = function (chunk) {
-
-            chunk.before = chunk.before + chunk.startTag;
-            chunk.after = chunk.endTag + chunk.after;
-
-            this.start = chunk.before.length;
-            this.end = chunk.before.length + chunk.selection.length;
-            this.text = chunk.before + chunk.selection + chunk.after;
-            this.scrollTop = chunk.scrollTop;
-        };
-        this.init();
-    };
-
-    function PreviewManager(converter, panels, previewRefreshCallback) {
-
-        var managerObj = this;
-        var timeout;
-        var elapsedTime;
-        var oldInputText;
-        var maxDelay = 3000;
-        var startType = "delayed"; // The other legal value is "manual"
-
-        // Adds event listeners to elements
-        var setupEvents = function (inputElem, listener) {
-
-            util.addEvent(inputElem, "input", listener);
-            inputElem.onpaste = listener;
-            inputElem.ondrop = listener;
-
-            util.addEvent(inputElem, "keypress", listener);
-            util.addEvent(inputElem, "keydown", listener);
-        };
-
-        var getDocScrollTop = function () {
-
-            var result = 0;
-
-            if (window.innerHeight) {
-                result = window.pageYOffset;
-            }
-            else
-                if (doc.documentElement && doc.documentElement.scrollTop) {
-                    result = doc.documentElement.scrollTop;
-                }
-                else
-                    if (doc.body) {
-                        result = doc.body.scrollTop;
-                    }
-
-            return result;
-        };
-
-        var makePreviewHtml = function () {
-
-            // If there is no registered preview panel
-            // there is nothing to do.
-            if (!panels.preview)
-                return;
-
-
-            var text = panels.input.value;
-            if (text && text == oldInputText) {
-                return; // Input text hasn't changed.
-            }
-            else {
-                oldInputText = text;
-            }
-
-            var prevTime = new Date().getTime();
-
-            text = converter.makeHtml(text);
-
-            // Calculate the processing time of the HTML creation.
-            // It's used as the delay time in the event listener.
-            var currTime = new Date().getTime();
-            elapsedTime = currTime - prevTime;
-
-            pushPreviewHtml(text);
-        };
-
-        // setTimeout is already used.  Used as an event listener.
-        var applyTimeout = function () {
-
-            if (timeout) {
-                clearTimeout(timeout);
-                timeout = undefined;
-            }
-
-            if (startType !== "manual") {
-
-                var delay = 0;
-
-                if (startType === "delayed") {
-                    delay = elapsedTime;
-                }
-
-                if (delay > maxDelay) {
-                    delay = maxDelay;
-                }
-                timeout = setTimeout(makePreviewHtml, delay);
-            }
-        };
-
-        var getScaleFactor = function (panel) {
-            if (panel.scrollHeight <= panel.clientHeight) {
-                return 1;
-            }
-            return panel.scrollTop / (panel.scrollHeight - panel.clientHeight);
-        };
-
-        var setPanelScrollTops = function () {
-            if (panels.preview) {
-                panels.preview.scrollTop = (panels.preview.scrollHeight - panels.preview.clientHeight) * getScaleFactor(panels.preview);
-            }
-        };
-
-        this.refresh = function (requiresRefresh) {
-
-            if (requiresRefresh) {
-                oldInputText = "";
-                makePreviewHtml();
-            }
-            else {
-                applyTimeout();
-            }
-        };
-
-        this.processingTime = function () {
-            return elapsedTime;
-        };
-
-        var isFirstTimeFilled = true;
-
-        // IE doesn't let you use innerHTML if the element is contained somewhere in a table
-        // (which is the case for inline editing) -- in that case, detach the element, set the
-        // value, and reattach. Yes, that *is* ridiculous.
-        var ieSafePreviewSet = function (text) {
-            var preview = panels.preview;
-            var parent = preview.parentNode;
-            var sibling = preview.nextSibling;
-            parent.removeChild(preview);
-            preview.innerHTML = text;
-            if (!sibling)
-                parent.appendChild(preview);
-            else
-                parent.insertBefore(preview, sibling);
-        }
-
-        var nonSuckyBrowserPreviewSet = function (text) {
-            panels.preview.innerHTML = text;
-        }
-
-        var previewSetter;
-
-        var previewSet = function (text) {
-            if (previewSetter)
-                return previewSetter(text);
-
-            try {
-                nonSuckyBrowserPreviewSet(text);
-                previewSetter = nonSuckyBrowserPreviewSet;
-            } catch (e) {
-                previewSetter = ieSafePreviewSet;
-                previewSetter(text);
-            }
-        };
-
-        var pushPreviewHtml = function (text) {
-
-            var emptyTop = position.getTop(panels.input) - getDocScrollTop();
-
-            if (panels.preview) {
-                previewSet(text);
-                previewRefreshCallback();
-            }
-
-            setPanelScrollTops();
-
-            if (isFirstTimeFilled) {
-                isFirstTimeFilled = false;
-                return;
-            }
-
-            var fullTop = position.getTop(panels.input) - getDocScrollTop();
-
-            if (uaSniffed.isIE) {
-                setTimeout(function () {
-                    window.scrollBy(0, fullTop - emptyTop);
-                }, 0);
-            }
-            else {
-                window.scrollBy(0, fullTop - emptyTop);
-            }
-        };
-
-        var init = function () {
-
-            setupEvents(panels.input, applyTimeout);
-            makePreviewHtml();
-
-            if (panels.preview) {
-                panels.preview.scrollTop = 0;
-            }
-        };
-
-        init();
-    };
-
-
-    // This simulates a modal dialog box and asks for the URL when you
-    // click the hyperlink or image buttons.
-    //
-    // text: The html for the input box.
-    // defaultInputText: The default value that appears in the input box.
-    // callback: The function which is executed when the prompt is dismissed, either via OK or Cancel.
-    //      It receives a single argument; either the entered text (if OK was chosen) or null (if Cancel
-    //      was chosen).
-    ui.prompt = function (title, text, defaultInputText, callback) {
-
-        // These variables need to be declared at this level since they are used
-        // in multiple functions.
-        var dialog;         // The dialog box.
-        var input;         // The text box where you enter the hyperlink.
-
-
-        if (defaultInputText === undefined) {
-            defaultInputText = "";
-        }
-
-        // Used as a keydown event handler. Esc dismisses the prompt.
-        // Key code 27 is ESC.
-        var checkEscape = function (key) {
-            var code = (key.charCode || key.keyCode);
-            if (code === 27) {
-                close(true);
-            }
-        };
-
-        // Dismisses the hyperlink input box.
-        // isCancel is true if we don't care about the input text.
-        // isCancel is false if we are going to keep the text.
-        var close = function (isCancel) {
-            util.removeEvent(doc.body, "keydown", checkEscape);
-            var text = input.value;
-
-            if (isCancel) {
-                text = null;
-            }
-            else {
-                // Fixes common pasting errors.
-                text = text.replace(/^http:\/\/(https?|ftp):\/\//, '$1://');
-                if (!/^(?:https?|ftp):\/\//.test(text))
-                    text = 'http://' + text;
-            }
-
-            $(dialog).modal('hide');
-
-            callback(text);
-            return false;
-        };
-
-
-
-        // Create the text input box form/window.
-        var createDialog = function () {
-            // <div class="modal" id="myModal">
-            //   <div class="modal-header">
-            //     <a class="close" data-dismiss="modal">×</a>
-            //     <h3>Modal header</h3>
-            //   </div>
-            //   <div class="modal-body">
-            //     <p>One fine body…</p>
-            //   </div>
-            //   <div class="modal-footer">
-            //     <a href="#" class="btn btn-primary">Save changes</a>
-            //     <a href="#" class="btn">Close</a>
-            //   </div>
-            // </div>
-
-            // The main dialog box.
-            dialog = doc.createElement("div");
-            dialog.className = "modal hide fade";
-            dialog.style.display = "none";
-
-            // The header.
-            var header = doc.createElement("div");
-            header.className = "modal-header";
-            header.innerHTML = '<a class="close" data-dismiss="modal">×</a> <h3>' + title + '</h3>';
-            dialog.appendChild(header);
-
-            // The body.
-            var body = doc.createElement("div");
-            body.className = "modal-body";
-            dialog.appendChild(body);
-
-            // The footer.
-            var footer = doc.createElement("div");
-            footer.className = "modal-footer";
-            dialog.appendChild(footer);
-
-            // The dialog text.
-            var question = doc.createElement("p");
-            question.innerHTML = text;
-            question.style.padding = "5px";
-            body.appendChild(question);
-
-            // The web form container for the text box and buttons.
-            var form = doc.createElement("form"),
-                style = form.style;
-            form.onsubmit = function () { return close(false); };
-            style.padding = "0";
-            style.margin = "0";
-            body.appendChild(form);
-
-            // The input text box
-            input = doc.createElement("input");
-            input.type = "text";
-            input.value = defaultInputText;
-            style = input.style;
-            style.display = "block";
-            style.width = "80%";
-            style.marginLeft = style.marginRight = "auto";
-            form.appendChild(input);
-
-            // The ok button
-            var okButton = doc.createElement("button");
-            okButton.className = "btn btn-primary";
-            okButton.type = "button";
-            okButton.onclick = function () { return close(false); };
-            okButton.innerHTML = "OK";
-
-            // The cancel button
-            var cancelButton = doc.createElement("button");
-            cancelButton.className = "btn btn-primary";
-            cancelButton.type = "button";
-            cancelButton.onclick = function () { return close(true); };
-            cancelButton.innerHTML = "Cancel";
-
-            footer.appendChild(okButton);
-            footer.appendChild(cancelButton);
-
-            util.addEvent(doc.body, "keydown", checkEscape);
-
-            doc.body.appendChild(dialog);
-
-        };
-
-        // Why is this in a zero-length timeout?
-        // Is it working around a browser bug?
-        setTimeout(function () {
-
-            createDialog();
-
-            var defTextLen = defaultInputText.length;
-            if (input.selectionStart !== undefined) {
-                input.selectionStart = 0;
-                input.selectionEnd = defTextLen;
-            }
-            else if (input.createTextRange) {
-                var range = input.createTextRange();
-                range.collapse(false);
-                range.moveStart("character", -defTextLen);
-                range.moveEnd("character", defTextLen);
-                range.select();
-            }
-
-            $(dialog).on('shown', function () {
-                input.focus();
-            })
-
-            $(dialog).on('hidden', function () {
-                dialog.parentNode.removeChild(dialog);
-            })
-
-            $(dialog).modal()
-
-        }, 0);
-    };
-
-    function UIManager(postfix, panels, undoManager, previewManager, commandManager, helpOptions) {
-
-        var inputBox = panels.input,
-            buttons = {}; // buttons.undo, buttons.link, etc. The actual DOM elements.
-
-        makeSpritedButtonRow();
-
-        var keyEvent = "keydown";
-        if (uaSniffed.isOpera) {
-            keyEvent = "keypress";
-        }
-
-        util.addEvent(inputBox, keyEvent, function (key) {
-
-            // Check to see if we have a button key and, if so execute the callback.
-            if ((key.ctrlKey || key.metaKey) && !key.altKey && !key.shiftKey) {
-
-                var keyCode = key.charCode || key.keyCode;
-                var keyCodeStr = String.fromCharCode(keyCode).toLowerCase();
-
-                switch (keyCodeStr) {
-                    case "b":
-                        doClick(buttons.bold);
-                        break;
-                    case "i":
-                        doClick(buttons.italic);
-                        break;
-                    case "l":
-                        doClick(buttons.link);
-                        break;
-                    case "q":
-                        doClick(buttons.quote);
-                        break;
-                    case "k":
-                        doClick(buttons.code);
-                        break;
-                    case "g":
-                        doClick(buttons.image);
-                        break;
-                    case "o":
-                        doClick(buttons.olist);
-                        break;
-                    case "u":
-                        doClick(buttons.ulist);
-                        break;
-                    case "h":
-                        doClick(buttons.heading);
-                        break;
-                    case "r":
-                        doClick(buttons.hr);
-                        break;
-                    case "y":
-                        doClick(buttons.redo);
-                        break;
-                    case "z":
-                        if (key.shiftKey) {
-                            doClick(buttons.redo);
-                        }
-                        else {
-                            doClick(buttons.undo);
-                        }
-                        break;
-                    default:
-                        return;
-                }
-
-
-                if (key.preventDefault) {
-                    key.preventDefault();
-                }
-
-                if (window.event) {
-                    window.event.returnValue = false;
-                }
-            }
-        });
-
-        // Auto-indent on shift-enter
-        util.addEvent(inputBox, "keyup", function (key) {
-            if (key.shiftKey && !key.ctrlKey && !key.metaKey) {
-                var keyCode = key.charCode || key.keyCode;
-                // Character 13 is Enter
-                if (keyCode === 13) {
-                    var fakeButton = {};
-                    fakeButton.textOp = bindCommand("doAutoindent");
-                    doClick(fakeButton);
-                }
-            }
-        });
-
-        // special handler because IE clears the context of the textbox on ESC
-        if (uaSniffed.isIE) {
-            util.addEvent(inputBox, "keydown", function (key) {
-                var code = key.keyCode;
-                if (code === 27) {
-                    return false;
-                }
-            });
-        }
-
-
-        // Perform the button's action.
-        function doClick(button) {
-
-            // don't do anything if the editor input or button bar isn't the currently active element
-            if (document.activeElement !== panels.input && !panels.buttonBar.contains(document.activeElement)) {
-                return;
-            }
-
-            inputBox.focus();
-
-            if (button.textOp) {
-
-                if (undoManager) {
-                    undoManager.setCommandMode();
-                }
-
-                var state = new TextareaState(panels);
-
-                if (!state) {
-                    return;
-                }
-
-                var chunks = state.getChunks();
-
-                // Some commands launch a "modal" prompt dialog.  Javascript
-                // can't really make a modal dialog box and the WMD code
-                // will continue to execute while the dialog is displayed.
-                // This prevents the dialog pattern I'm used to and means
-                // I can't do something like this:
-                //
-                // var link = CreateLinkDialog();
-                // makeMarkdownLink(link);
-                // 
-                // Instead of this straightforward method of handling a
-                // dialog I have to pass any code which would execute
-                // after the dialog is dismissed (e.g. link creation)
-                // in a function parameter.
-                //
-                // Yes this is awkward and I think it sucks, but there's
-                // no real workaround.  Only the image and link code
-                // create dialogs and require the function pointers.
-                var fixupInputArea = function () {
-
-                    inputBox.focus();
-
-                    if (chunks) {
-                        state.setChunks(chunks);
-                    }
-
-                    state.restore();
-                    previewManager.refresh();
-                };
-
-                var noCleanup = button.textOp(chunks, fixupInputArea);
-
-                if (!noCleanup) {
-                    fixupInputArea();
-                }
-
-            }
-
-            if (button.execute) {
-                button.execute(undoManager);
-            }
-        };
-
-        function setupButton(button, isEnabled) {
-
-            if (isEnabled) {
-                button.disabled = false;
-
-                if (!button.isHelp) {
-                    button.onclick = function () {
-                        if (this.onmouseout) {
-                            this.onmouseout();
-                        }
-                        doClick(this);
-                        return false;
-                    }
-                }
-            }
-            else {
-                button.disabled = true;
-            }
-        }
-
-        function bindCommand(method) {
-            if (typeof method === "string")
-                method = commandManager[method];
-            return function () { method.apply(commandManager, arguments); }
-        }
-
-        function makeSpritedButtonRow() {
-
-            var buttonBar = panels.buttonBar;
-            var buttonRow = document.createElement("div");
-            buttonRow.id = "wmd-button-row" + postfix;
-            buttonRow.className = 'btn-toolbar';
-            buttonRow = buttonBar.appendChild(buttonRow);
-
-            var makeButton = function (id, title, icon, textOp, group) {
-                var button = document.createElement("button");
-                button.className = "btn";
-                var buttonImage = document.createElement("i");
-                buttonImage.className = icon;
-                button.id = id + postfix;
-                button.appendChild(buttonImage);
-                button.title = title;
-                $(button).tooltip({ placement: 'bottom' })
-                if (textOp)
-                    button.textOp = textOp;
-                setupButton(button, true);
-                if (group) {
-                    group.appendChild(button);
-                } else {
-                    buttonRow.appendChild(button);
-                }
-                return button;
-            };
-            var makeGroup = function (num) {
-                var group = document.createElement("div");
-                group.className = "btn-group wmd-button-group" + num;
-                group.id = "wmd-button-group" + num + postfix;
-                buttonRow.appendChild(group);
-                return group
-            }
-
-            group1 = makeGroup(1);
-            buttons.bold = makeButton("wmd-bold-button", "Bold - Ctrl+B", "icon-drop", bindCommand("doBold"), group1);
-            buttons.italic = makeButton("wmd-italic-button", "Italic - Ctrl+I", "icon-font", bindCommand("doItalic"), group1);
-
-            group2 = makeGroup(2);
-            buttons.link = makeButton("wmd-link-button", "Link - Ctrl+L", "icon-link", bindCommand(function (chunk, postProcessing) {
-                return this.doLinkOrImage(chunk, postProcessing, false);
-            }), group2);
-            buttons.quote = makeButton("wmd-quote-button", "Blockquote - Ctrl+Q", "icon-quote", bindCommand("doBlockquote"), group2);
-            buttons.code = makeButton("wmd-code-button", "Code Sample - Ctrl+K", "icon-code", bindCommand("doCode"), group2);
-            buttons.image = makeButton("wmd-image-button", "Image - Ctrl+G", "icon-picture", bindCommand(function (chunk, postProcessing) {
-                return this.doLinkOrImage(chunk, postProcessing, true);
-            }), group2);
-
-            group3 = makeGroup(3);
-            buttons.olist = makeButton("wmd-olist-button", "Numbered List - Ctrl+O", "icon-ordered-list", bindCommand(function (chunk, postProcessing) {
-                this.doList(chunk, postProcessing, true);
-            }), group3);
-            buttons.ulist = makeButton("wmd-ulist-button", "Bulleted List - Ctrl+U", "icon-bulleted-list", bindCommand(function (chunk, postProcessing) {
-                this.doList(chunk, postProcessing, false);
-            }), group3);
-            buttons.heading = makeButton("wmd-heading-button", "Heading - Ctrl+H", "icon-shift", bindCommand("doHeading"), group3);
-            buttons.hr = makeButton("wmd-hr-button", "Horizontal Rule - Ctrl+R", "icon-remove", bindCommand("doHorizontalRule"), group3);
-
-            group4 = makeGroup(4);
-            buttons.undo = makeButton("wmd-undo-button", "Undo - Ctrl+Z", "icon-undo", null, group4);
-            buttons.undo.execute = function (manager) { if (manager) manager.undo(); };
-
-            var redoTitle = /win/.test(nav.platform.toLowerCase()) ?
-                "Redo - Ctrl+Y" :
-                "Redo - Ctrl+Shift+Z"; // mac and other non-Windows platforms
-
-            buttons.redo = makeButton("wmd-redo-button", redoTitle, "icon-redo", null, group4);
-            buttons.redo.execute = function (manager) { if (manager) manager.redo(); };
-
-            if (helpOptions) {
-                group5 = makeGroup(5);
-                group5.className = group5.className + " pull-right";
-                var helpButton = document.createElement("button");
-                var helpButtonImage = document.createElement("i");
-                helpButtonImage.className = "icon-question-sign";
-                helpButton.appendChild(helpButtonImage);
-                helpButton.className = "btn";
-                helpButton.id = "wmd-help-button" + postfix;
-                helpButton.isHelp = true;
-                helpButton.title = helpOptions.title || defaultHelpHoverTitle;
-                $(helpButton).tooltip({ placement: 'bottom' })
-                helpButton.onclick = helpOptions.handler;
-
-                setupButton(helpButton, true);
-                group5.appendChild(helpButton);
-                buttons.help = helpButton;
-            }
-
-            setUndoRedoButtonStates();
-        }
-
-        function setUndoRedoButtonStates() {
-            if (undoManager) {
-                setupButton(buttons.undo, undoManager.canUndo());
-                setupButton(buttons.redo, undoManager.canRedo());
-            }
-        };
-
-        this.setUndoRedoButtonStates = setUndoRedoButtonStates;
-
-    }
-
-    function CommandManager(pluginHooks) {
-        this.hooks = pluginHooks;
-    }
-
-    var commandProto = CommandManager.prototype;
-
-    // The markdown symbols - 4 spaces = code, > = blockquote, etc.
-    commandProto.prefixes = "(?:\\s{4,}|\\s*>|\\s*-\\s+|\\s*\\d+\\.|=|\\+|-|_|\\*|#|\\s*\\[[^\n]]+\\]:)";
-
-    // Remove markdown symbols from the chunk selection.
-    commandProto.unwrap = function (chunk) {
-        var txt = new re("([^\\n])\\n(?!(\\n|" + this.prefixes + "))", "g");
-        chunk.selection = chunk.selection.replace(txt, "$1 $2");
-    };
-
-    commandProto.wrap = function (chunk, len) {
-        this.unwrap(chunk);
-        var regex = new re("(.{1," + len + "})( +|$\\n?)", "gm"),
-            that = this;
-
-        chunk.selection = chunk.selection.replace(regex, function (line, marked) {
-            if (new re("^" + that.prefixes, "").test(line)) {
-                return line;
-            }
-            return marked + "\n";
-        });
-
-        chunk.selection = chunk.selection.replace(/\s+$/, "");
-    };
-
-    commandProto.doBold = function (chunk, postProcessing) {
-        return this.doBorI(chunk, postProcessing, 2, "strong text");
-    };
-
-    commandProto.doItalic = function (chunk, postProcessing) {
-        return this.doBorI(chunk, postProcessing, 1, "emphasized text");
-    };
-
-    // chunk: The selected region that will be enclosed with */**
-    // nStars: 1 for italics, 2 for bold
-    // insertText: If you just click the button without highlighting text, this gets inserted
-    commandProto.doBorI = function (chunk, postProcessing, nStars, insertText) {
-
-        // Get rid of whitespace and fixup newlines.
-        chunk.trimWhitespace();
-        chunk.selection = chunk.selection.replace(/\n{2,}/g, "\n");
-
-        // Look for stars before and after.  Is the chunk already marked up?
-        // note that these regex matches cannot fail
-        var starsBefore = /(\**$)/.exec(chunk.before)[0];
-        var starsAfter = /(^\**)/.exec(chunk.after)[0];
-
-        var prevStars = Math.min(starsBefore.length, starsAfter.length);
-
-        // Remove stars if we have to since the button acts as a toggle.
-        if ((prevStars >= nStars) && (prevStars != 2 || nStars != 1)) {
-            chunk.before = chunk.before.replace(re("[*]{" + nStars + "}$", ""), "");
-            chunk.after = chunk.after.replace(re("^[*]{" + nStars + "}", ""), "");
-        }
-        else if (!chunk.selection && starsAfter) {
-            // It's not really clear why this code is necessary.  It just moves
-            // some arbitrary stuff around.
-            chunk.after = chunk.after.replace(/^([*_]*)/, "");
-            chunk.before = chunk.before.replace(/(\s?)$/, "");
-            var whitespace = re.$1;
-            chunk.before = chunk.before + starsAfter + whitespace;
-        }
-        else {
-
-            // In most cases, if you don't have any selected text and click the button
-            // you'll get a selected, marked up region with the default text inserted.
-            if (!chunk.selection && !starsAfter) {
-                chunk.selection = insertText;
-            }
-
-            // Add the true markup.
-            var markup = nStars <= 1 ? "*" : "**"; // shouldn't the test be = ?
-            chunk.before = chunk.before + markup;
-            chunk.after = markup + chunk.after;
-        }
-
-        return;
-    };
-
-    commandProto.stripLinkDefs = function (text, defsToAdd) {
-
-        text = text.replace(/^[ ]{0,3}\[(\d+)\]:[ \t]*\n?[ \t]*<?(\S+?)>?[ \t]*\n?[ \t]*(?:(\n*)["(](.+?)[")][ \t]*)?(?:\n+|$)/gm,
-            function (totalMatch, id, link, newlines, title) {
-                defsToAdd[id] = totalMatch.replace(/\s*$/, "");
-                if (newlines) {
-                    // Strip the title and return that separately.
-                    defsToAdd[id] = totalMatch.replace(/["(](.+?)[")]$/, "");
-                    return newlines + title;
-                }
-                return "";
-            });
-
-        return text;
-    };
-
-    commandProto.addLinkDef = function (chunk, linkDef) {
-
-        var refNumber = 0; // The current reference number
-        var defsToAdd = {}; //
-        // Start with a clean slate by removing all previous link definitions.
-        chunk.before = this.stripLinkDefs(chunk.before, defsToAdd);
-        chunk.selection = this.stripLinkDefs(chunk.selection, defsToAdd);
-        chunk.after = this.stripLinkDefs(chunk.after, defsToAdd);
-
-        var defs = "";
-        var regex = /(\[)((?:\[[^\]]*\]|[^\[\]])*)(\][ ]?(?:\n[ ]*)?\[)(\d+)(\])/g;
-
-        var addDefNumber = function (def) {
-            refNumber++;
-            def = def.replace(/^[ ]{0,3}\[(\d+)\]:/, "  [" + refNumber + "]:");
-            defs += "\n" + def;
-        };
-
-        // note that
-        // a) the recursive call to getLink cannot go infinite, because by definition
-        //    of regex, inner is always a proper substring of wholeMatch, and
-        // b) more than one level of nesting is neither supported by the regex
-        //    nor making a lot of sense (the only use case for nesting is a linked image)
-        var getLink = function (wholeMatch, before, inner, afterInner, id, end) {
-            inner = inner.replace(regex, getLink);
-            if (defsToAdd[id]) {
-                addDefNumber(defsToAdd[id]);
-                return before + inner + afterInner + refNumber + end;
-            }
-            return wholeMatch;
-        };
-
-        chunk.before = chunk.before.replace(regex, getLink);
-
-        if (linkDef) {
-            addDefNumber(linkDef);
-        }
-        else {
-            chunk.selection = chunk.selection.replace(regex, getLink);
-        }
-
-        var refOut = refNumber;
-
-        chunk.after = chunk.after.replace(regex, getLink);
-
-        if (chunk.after) {
-            chunk.after = chunk.after.replace(/\n*$/, "");
-        }
-        if (!chunk.after) {
-            chunk.selection = chunk.selection.replace(/\n*$/, "");
-        }
-
-        chunk.after += "\n\n" + defs;
-
-        return refOut;
-    };
-
-    // takes the line as entered into the add link/as image dialog and makes
-    // sure the URL and the optional title are "nice".
-    function properlyEncoded(linkdef) {
-        return linkdef.replace(/^\s*(.*?)(?:\s+"(.+)")?\s*$/, function (wholematch, link, title) {
-            link = link.replace(/\?.*$/, function (querypart) {
-                return querypart.replace(/\+/g, " "); // in the query string, a plus and a space are identical
-            });
-            link = decodeURIComponent(link); // unencode first, to prevent double encoding
-            link = encodeURI(link).replace(/'/g, '%27').replace(/\(/g, '%28').replace(/\)/g, '%29');
-            link = link.replace(/\?.*$/, function (querypart) {
-                return querypart.replace(/\+/g, "%2b"); // since we replaced plus with spaces in the query part, all pluses that now appear where originally encoded
-            });
-            if (title) {
-                title = title.trim ? title.trim() : title.replace(/^\s*/, "").replace(/\s*$/, "");
-                title = $.trim(title).replace(/"/g, "quot;").replace(/\(/g, "&#40;").replace(/\)/g, "&#41;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-            }
-            return title ? link + ' "' + title + '"' : link;
-        });
-    }
-
-    commandProto.doLinkOrImage = function (chunk, postProcessing, isImage) {
-
-        chunk.trimWhitespace();
-        chunk.findTags(/\s*!?\[/, /\][ ]?(?:\n[ ]*)?(\[.*?\])?/);
-        var background;
-
-        if (chunk.endTag.length > 1 && chunk.startTag.length > 0) {
-
-            chunk.startTag = chunk.startTag.replace(/!?\[/, "");
-            chunk.endTag = "";
-            this.addLinkDef(chunk, null);
-
-        }
-        else {
-
-            // We're moving start and end tag back into the selection, since (as we're in the else block) we're not
-            // *removing* a link, but *adding* one, so whatever findTags() found is now back to being part of the
-            // link text. linkEnteredCallback takes care of escaping any brackets.
-            chunk.selection = chunk.startTag + chunk.selection + chunk.endTag;
-            chunk.startTag = chunk.endTag = "";
-
-            if (/\n\n/.test(chunk.selection)) {
-                this.addLinkDef(chunk, null);
-                return;
-            }
-            var that = this;
-            // The function to be executed when you enter a link and press OK or Cancel.
-            // Marks up the link and adds the ref.
-            var linkEnteredCallback = function (link, title) {
-
-                if (link !== null) {
-                    // (                          $1
-                    //     [^\\]                  anything that's not a backslash
-                    //     (?:\\\\)*              an even number (this includes zero) of backslashes
-                    // )
-                    // (?=                        followed by
-                    //     [[\]]                  an opening or closing bracket
-                    // )
-                    //
-                    // In other words, a non-escaped bracket. These have to be escaped now to make sure they
-                    // don't count as the end of the link or similar.
-                    // Note that the actual bracket has to be a lookahead, because (in case of to subsequent brackets),
-                    // the bracket in one match may be the "not a backslash" character in the next match, so it
-                    // should not be consumed by the first match.
-                    // The "prepend a space and finally remove it" steps makes sure there is a "not a backslash" at the
-                    // start of the string, so this also works if the selection begins with a bracket. We cannot solve
-                    // this by anchoring with ^, because in the case that the selection starts with two brackets, this
-                    // would mean a zero-width match at the start. Since zero-width matches advance the string position,
-                    // the first bracket could then not act as the "not a backslash" for the second.
-                    chunk.selection = (" " + chunk.selection).replace(/([^\\](?:\\\\)*)(?=[[\]])/g, "$1\\").substr(1);
-
-                    var linkDef = " [999]: " + properlyEncoded(link);
-
-                    var num = that.addLinkDef(chunk, linkDef);
-                    chunk.startTag = isImage ? "![" : "[";
-                    chunk.endTag = "][" + num + "]";
-
-                    if (!chunk.selection) {
-                        if (isImage) {
-                            chunk.selection = title || "enter image description here";
-                        }
-                        else {
-                            chunk.selection = title || "enter link description here";
-                        }
-                    }
-                }
-                postProcessing();
-            };
-
-
-            if (isImage) {
-                if (!this.hooks.insertImageDialog(linkEnteredCallback))
-                    ui.prompt('Insert Image', imageDialogText, imageDefaultText, linkEnteredCallback);
-            }
-            else {
-                if (!this.hooks.insertLinkDialog(linkEnteredCallback))
-                    ui.prompt('Insert Link', linkDialogText, linkDefaultText, linkEnteredCallback);
-            }
-            return true;
-        }
-    };
-
-    // When making a list, hitting shift-enter will put your cursor on the next line
-    // at the current indent level.
-    commandProto.doAutoindent = function (chunk, postProcessing) {
-
-        var commandMgr = this,
-            fakeSelection = false;
-
-        chunk.before = chunk.before.replace(/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]*\n$/, "\n\n");
-        chunk.before = chunk.before.replace(/(\n|^)[ ]{0,3}>[ \t]*\n$/, "\n\n");
-        chunk.before = chunk.before.replace(/(\n|^)[ \t]+\n$/, "\n\n");
-
-        // There's no selection, end the cursor wasn't at the end of the line:
-        // The user wants to split the current list item / code line / blockquote line
-        // (for the latter it doesn't really matter) in two. Temporarily select the
-        // (rest of the) line to achieve this.
-        if (!chunk.selection && !/^[ \t]*(?:\n|$)/.test(chunk.after)) {
-            chunk.after = chunk.after.replace(/^[^\n]*/, function (wholeMatch) {
-                chunk.selection = wholeMatch;
-                return "";
-            });
-            fakeSelection = true;
-        }
-
-        if (/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]+.*\n$/.test(chunk.before)) {
-            if (commandMgr.doList) {
-                commandMgr.doList(chunk);
-            }
-        }
-        if (/(\n|^)[ ]{0,3}>[ \t]+.*\n$/.test(chunk.before)) {
-            if (commandMgr.doBlockquote) {
-                commandMgr.doBlockquote(chunk);
-            }
-        }
-        if (/(\n|^)(\t|[ ]{4,}).*\n$/.test(chunk.before)) {
-            if (commandMgr.doCode) {
-                commandMgr.doCode(chunk);
-            }
-        }
-
-        if (fakeSelection) {
-            chunk.after = chunk.selection + chunk.after;
-            chunk.selection = "";
-        }
-    };
-
-    commandProto.doBlockquote = function (chunk, postProcessing) {
-
-        chunk.selection = chunk.selection.replace(/^(\n*)([^\r]+?)(\n*)$/,
-            function (totalMatch, newlinesBefore, text, newlinesAfter) {
-                chunk.before += newlinesBefore;
-                chunk.after = newlinesAfter + chunk.after;
-                return text;
-            });
-
-        chunk.before = chunk.before.replace(/(>[ \t]*)$/,
-            function (totalMatch, blankLine) {
-                chunk.selection = blankLine + chunk.selection;
-                return "";
-            });
-
-        chunk.selection = chunk.selection.replace(/^(\s|>)+$/, "");
-        chunk.selection = chunk.selection || "Blockquote";
-
-        // The original code uses a regular expression to find out how much of the
-        // text *directly before* the selection already was a blockquote:
-
-        /*
-        if (chunk.before) {
-        chunk.before = chunk.before.replace(/\n?$/, "\n");
-        }
-        chunk.before = chunk.before.replace(/(((\n|^)(\n[ \t]*)*>(.+\n)*.*)+(\n[ \t]*)*$)/,
-        function (totalMatch) {
-        chunk.startTag = totalMatch;
-        return "";
-        });
-        */
-
-        // This comes down to:
-        // Go backwards as many lines a possible, such that each line
-        //  a) starts with ">", or
-        //  b) is almost empty, except for whitespace, or
-        //  c) is preceeded by an unbroken chain of non-empty lines
-        //     leading up to a line that starts with ">" and at least one more character
-        // and in addition
-        //  d) at least one line fulfills a)
-        //
-        // Since this is essentially a backwards-moving regex, it's susceptible to
-        // catstrophic backtracking and can cause the browser to hang;
-        // see e.g. http://meta.stackoverflow.com/questions/9807.
-        //
-        // Hence we replaced this by a simple state machine that just goes through the
-        // lines and checks for a), b), and c).
-
-        var match = "",
-            leftOver = "",
-            line;
-        if (chunk.before) {
-            var lines = chunk.before.replace(/\n$/, "").split("\n");
-            var inChain = false;
-            for (var i = 0; i < lines.length; i++) {
-                var good = false;
-                line = lines[i];
-                inChain = inChain && line.length > 0; // c) any non-empty line continues the chain
-                if (/^>/.test(line)) {                // a)
-                    good = true;
-                    if (!inChain && line.length > 1)  // c) any line that starts with ">" and has at least one more character starts the chain
-                        inChain = true;
-                } else if (/^[ \t]*$/.test(line)) {   // b)
-                    good = true;
-                } else {
-                    good = inChain;                   // c) the line is not empty and does not start with ">", so it matches if and only if we're in the chain
-                }
-                if (good) {
-                    match += line + "\n";
-                } else {
-                    leftOver += match + line;
-                    match = "\n";
-                }
-            }
-            if (!/(^|\n)>/.test(match)) {             // d)
-                leftOver += match;
-                match = "";
-            }
-        }
-
-        chunk.startTag = match;
-        chunk.before = leftOver;
-
-        // end of change
-
-        if (chunk.after) {
-            chunk.after = chunk.after.replace(/^\n?/, "\n");
-        }
-
-        chunk.after = chunk.after.replace(/^(((\n|^)(\n[ \t]*)*>(.+\n)*.*)+(\n[ \t]*)*)/,
-            function (totalMatch) {
-                chunk.endTag = totalMatch;
-                return "";
-            }
-        );
-
-        var replaceBlanksInTags = function (useBracket) {
-
-            var replacement = useBracket ? "> " : "";
-
-            if (chunk.startTag) {
-                chunk.startTag = chunk.startTag.replace(/\n((>|\s)*)\n$/,
-                    function (totalMatch, markdown) {
-                        return "\n" + markdown.replace(/^[ ]{0,3}>?[ \t]*$/gm, replacement) + "\n";
-                    });
-            }
-            if (chunk.endTag) {
-                chunk.endTag = chunk.endTag.replace(/^\n((>|\s)*)\n/,
-                    function (totalMatch, markdown) {
-                        return "\n" + markdown.replace(/^[ ]{0,3}>?[ \t]*$/gm, replacement) + "\n";
-                    });
-            }
-        };
-
-        if (/^(?![ ]{0,3}>)/m.test(chunk.selection)) {
-            this.wrap(chunk, SETTINGS.lineLength - 2);
-            chunk.selection = chunk.selection.replace(/^/gm, "> ");
-            replaceBlanksInTags(true);
-            chunk.skipLines();
-        } else {
-            chunk.selection = chunk.selection.replace(/^[ ]{0,3}> ?/gm, "");
-            this.unwrap(chunk);
-            replaceBlanksInTags(false);
-
-            if (!/^(\n|^)[ ]{0,3}>/.test(chunk.selection) && chunk.startTag) {
-                chunk.startTag = chunk.startTag.replace(/\n{0,2}$/, "\n\n");
-            }
-
-            if (!/(\n|^)[ ]{0,3}>.*$/.test(chunk.selection) && chunk.endTag) {
-                chunk.endTag = chunk.endTag.replace(/^\n{0,2}/, "\n\n");
-            }
-        }
-
-        chunk.selection = this.hooks.postBlockquoteCreation(chunk.selection);
-
-        if (!/\n/.test(chunk.selection)) {
-            chunk.selection = chunk.selection.replace(/^(> *)/,
-            function (wholeMatch, blanks) {
-                chunk.startTag += blanks;
-                return "";
-            });
-        }
-    };
-
-    commandProto.doCode = function (chunk, postProcessing) {
-
-        var hasTextBefore = /\S[ ]*$/.test(chunk.before);
-        var hasTextAfter = /^[ ]*\S/.test(chunk.after);
-
-        // Use 'four space' markdown if the selection is on its own
-        // line or is multiline.
-        if ((!hasTextAfter && !hasTextBefore) || /\n/.test(chunk.selection)) {
-
-            chunk.before = chunk.before.replace(/[ ]{4}$/,
-                function (totalMatch) {
-                    chunk.selection = totalMatch + chunk.selection;
-                    return "";
-                });
-
-            var nLinesBack = 1;
-            var nLinesForward = 1;
-
-            if (/(\n|^)(\t|[ ]{4,}).*\n$/.test(chunk.before)) {
-                nLinesBack = 0;
-            }
-            if (/^\n(\t|[ ]{4,})/.test(chunk.after)) {
-                nLinesForward = 0;
-            }
-
-            chunk.skipLines(nLinesBack, nLinesForward);
-
-            if (!chunk.selection) {
-                chunk.startTag = "    ";
-                chunk.selection = "enter code here";
-            }
-            else {
-                if (/^[ ]{0,3}\S/m.test(chunk.selection)) {
-                    if (/\n/.test(chunk.selection))
-                        chunk.selection = chunk.selection.replace(/^/gm, "    ");
-                    else // if it's not multiline, do not select the four added spaces; this is more consistent with the doList behavior
-                        chunk.before += "    ";
-                }
-                else {
-                    chunk.selection = chunk.selection.replace(/^[ ]{4}/gm, "");
-                }
-            }
-        }
-        else {
-            // Use backticks (`) to delimit the code block.
-
-            chunk.trimWhitespace();
-            chunk.findTags(/`/, /`/);
-
-            if (!chunk.startTag && !chunk.endTag) {
-                chunk.startTag = chunk.endTag = "`";
-                if (!chunk.selection) {
-                    chunk.selection = "enter code here";
-                }
-            }
-            else if (chunk.endTag && !chunk.startTag) {
-                chunk.before += chunk.endTag;
-                chunk.endTag = "";
-            }
-            else {
-                chunk.startTag = chunk.endTag = "";
-            }
-        }
-    };
-
-    commandProto.doList = function (chunk, postProcessing, isNumberedList) {
-
-        // These are identical except at the very beginning and end.
-        // Should probably use the regex extension function to make this clearer.
-        var previousItemsRegex = /(\n|^)(([ ]{0,3}([*+-]|\d+[.])[ \t]+.*)(\n.+|\n{2,}([*+-].*|\d+[.])[ \t]+.*|\n{2,}[ \t]+\S.*)*)\n*$/;
-        var nextItemsRegex = /^\n*(([ ]{0,3}([*+-]|\d+[.])[ \t]+.*)(\n.+|\n{2,}([*+-].*|\d+[.])[ \t]+.*|\n{2,}[ \t]+\S.*)*)\n*/;
-
-        // The default bullet is a dash but others are possible.
-        // This has nothing to do with the particular HTML bullet,
-        // it's just a markdown bullet.
-        var bullet = "-";
-
-        // The number in a numbered list.
-        var num = 1;
-
-        // Get the item prefix - e.g. " 1. " for a numbered list, " - " for a bulleted list.
-        var getItemPrefix = function () {
-            var prefix;
-            if (isNumberedList) {
-                prefix = " " + num + ". ";
-                num++;
-            }
-            else {
-                prefix = " " + bullet + " ";
-            }
-            return prefix;
-        };
-
-        // Fixes the prefixes of the other list items.
-        var getPrefixedItem = function (itemText) {
-
-            // The numbering flag is unset when called by autoindent.
-            if (isNumberedList === undefined) {
-                isNumberedList = /^\s*\d/.test(itemText);
-            }
-
-            // Renumber/bullet the list element.
-            itemText = itemText.replace(/^[ ]{0,3}([*+-]|\d+[.])\s/gm,
-                function (_) {
-                    return getItemPrefix();
-                });
-
-            return itemText;
-        };
-
-        chunk.findTags(/(\n|^)*[ ]{0,3}([*+-]|\d+[.])\s+/, null);
-
-        if (chunk.before && !/\n$/.test(chunk.before) && !/^\n/.test(chunk.startTag)) {
-            chunk.before += chunk.startTag;
-            chunk.startTag = "";
-        }
-
-        if (chunk.startTag) {
-
-            var hasDigits = /\d+[.]/.test(chunk.startTag);
-            chunk.startTag = "";
-            chunk.selection = chunk.selection.replace(/\n[ ]{4}/g, "\n");
-            this.unwrap(chunk);
-            chunk.skipLines();
-
-            if (hasDigits) {
-                // Have to renumber the bullet points if this is a numbered list.
-                chunk.after = chunk.after.replace(nextItemsRegex, getPrefixedItem);
-            }
-            if (isNumberedList == hasDigits) {
-                return;
-            }
-        }
-
-        var nLinesUp = 1;
-
-        chunk.before = chunk.before.replace(previousItemsRegex,
-            function (itemText) {
-                if (/^\s*([*+-])/.test(itemText)) {
-                    bullet = re.$1;
-                }
-                nLinesUp = /[^\n]\n\n[^\n]/.test(itemText) ? 1 : 0;
-                return getPrefixedItem(itemText);
-            });
-
-        if (!chunk.selection) {
-            chunk.selection = "List item";
-        }
-
-        var prefix = getItemPrefix();
-
-        var nLinesDown = 1;
-
-        chunk.after = chunk.after.replace(nextItemsRegex,
-            function (itemText) {
-                nLinesDown = /[^\n]\n\n[^\n]/.test(itemText) ? 1 : 0;
-                return getPrefixedItem(itemText);
-            });
-
-        chunk.trimWhitespace(true);
-        chunk.skipLines(nLinesUp, nLinesDown, true);
-        chunk.startTag = prefix;
-        var spaces = prefix.replace(/./g, " ");
-        this.wrap(chunk, SETTINGS.lineLength - spaces.length);
-        chunk.selection = chunk.selection.replace(/\n/g, "\n" + spaces);
-
-    };
-
-    commandProto.doHeading = function (chunk, postProcessing) {
-
-        // Remove leading/trailing whitespace and reduce internal spaces to single spaces.
-        chunk.selection = chunk.selection.replace(/\s+/g, " ");
-        chunk.selection = chunk.selection.replace(/(^\s+|\s+$)/g, "");
-
-        // If we clicked the button with no selected text, we just
-        // make a level 2 hash header around some default text.
-        if (!chunk.selection) {
-            chunk.startTag = "## ";
-            chunk.selection = "Heading";
-            chunk.endTag = " ##";
-            return;
-        }
-
-        var headerLevel = 0;     // The existing header level of the selected text.
-
-        // Remove any existing hash heading markdown and save the header level.
-        chunk.findTags(/#+[ ]*/, /[ ]*#+/);
-        if (/#+/.test(chunk.startTag)) {
-            headerLevel = re.lastMatch.length;
-        }
-        chunk.startTag = chunk.endTag = "";
-
-        // Try to get the current header level by looking for - and = in the line
-        // below the selection.
-        chunk.findTags(null, /\s?(-+|=+)/);
-        if (/=+/.test(chunk.endTag)) {
-            headerLevel = 1;
-        }
-        if (/-+/.test(chunk.endTag)) {
-            headerLevel = 2;
-        }
-
-        // Skip to the next line so we can create the header markdown.
-        chunk.startTag = chunk.endTag = "";
-        chunk.skipLines(1, 1);
-
-        // We make a level 2 header if there is no current header.
-        // If there is a header level, we substract one from the header level.
-        // If it's already a level 1 header, it's removed.
-        var headerLevelToCreate = headerLevel == 0 ? 2 : headerLevel - 1;
-
-        if (headerLevelToCreate > 0) {
-
-            // The button only creates level 1 and 2 underline headers.
-            // Why not have it iterate over hash header levels?  Wouldn't that be easier and cleaner?
-            var headerChar = headerLevelToCreate >= 2 ? "-" : "=";
-            var len = chunk.selection.length;
-            if (len > SETTINGS.lineLength) {
-                len = SETTINGS.lineLength;
-            }
-            chunk.endTag = "\n";
-            while (len--) {
-                chunk.endTag += headerChar;
-            }
-        }
-    };
-
-    commandProto.doHorizontalRule = function (chunk, postProcessing) {
-        chunk.startTag = "----------\n";
-        chunk.selection = "";
-        chunk.skipLines(2, 1, true);
-    }
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/lib/markdown/markdown.sanitizer.js b/src/Umbraco.Web.UI.Client/lib/markdown/markdown.sanitizer.js
deleted file mode 100644
index 6076514962..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/markdown/markdown.sanitizer.js
+++ /dev/null
@@ -1,111 +0,0 @@
-(function () {
-    var output, Converter;
-    if (typeof exports === "object" && typeof require === "function") { // we're in a CommonJS (e.g. Node.js) module
-        output = exports;
-        Converter = require("./Markdown.Converter").Converter;
-    } else {
-        output = window.Markdown;
-        Converter = output.Converter;
-    }
-
-    output.getSanitizingConverter = function () {
-        var converter = new Converter();
-        converter.hooks.chain("postConversion", sanitizeHtml);
-        converter.hooks.chain("postConversion", balanceTags);
-        return converter;
-    }
-
-    function sanitizeHtml(html) {
-        return html.replace(/<[^>]*>?/gi, sanitizeTag);
-    }
-
-    // (tags that can be opened/closed) | (tags that stand alone)
-    var basic_tag_whitelist = /^(<\/?(b|blockquote|code|del|dd|dl|dt|em|h1|h2|h3|i|kbd|li|ol|p|s|sup|sub|strong|strike|ul)>|<(br|hr)\s?\/?>)$/i;
-    // <a href="url..." optional title>|</a>
-    var a_white = /^(<a\shref="(https?:(\/\/|\/)|ftp:(\/\/|\/)|mailto:|magnet:)[-A-Za-z0-9+&@#\/%?=~_|!:,.;\(\)]+"(\stitle="[^"<>]+")?\s?>|<\/a>)$/i;
-
-    // <img src="url..." optional width  optional height  optional alt  optional title
-    var img_white = /^(<img\ssrc="(https?:\/\/|\/)[-A-Za-z0-9+&@#\/%?=~_|!:,.;\(\)]+"(\swidth="\d{1,3}")?(\sheight="\d{1,3}")?(\salt="[^"<>]*")?(\stitle="[^"<>]*")?\s?\/?>)$/i;
-
-    // <pre optional class="prettyprint linenums">|</pre> for twitter bootstrap
-    var pre_white = /^(<pre(\sclass="prettyprint linenums")?>|<\/pre>)$/i;
-
-    function sanitizeTag(tag) {
-        if (tag.match(basic_tag_whitelist) || tag.match(a_white) || tag.match(img_white) || tag.match(pre_white))
-            return tag;
-        else
-            return "";
-    }
-
-    /// <summary>
-    /// attempt to balance HTML tags in the html string
-    /// by removing any unmatched opening or closing tags
-    /// IMPORTANT: we *assume* HTML has *already* been 
-    /// sanitized and is safe/sane before balancing!
-    /// 
-    /// adapted from CODESNIPPET: A8591DBA-D1D3-11DE-947C-BA5556D89593
-    /// </summary>
-    function balanceTags(html) {
-
-        if (html == "")
-            return "";
-
-        var re = /<\/?\w+[^>]*(\s|$|>)/g;
-        // convert everything to lower case; this makes
-        // our case insensitive comparisons easier
-        var tags = html.toLowerCase().match(re);
-
-        // no HTML tags present? nothing to do; exit now
-        var tagcount = (tags || []).length;
-        if (tagcount == 0)
-            return html;
-
-        var tagname, tag;
-        var ignoredtags = "<p><img><br><li><hr>";
-        var match;
-        var tagpaired = [];
-        var tagremove = [];
-        var needsRemoval = false;
-
-        // loop through matched tags in forward order
-        for (var ctag = 0; ctag < tagcount; ctag++) {
-            tagname = tags[ctag].replace(/<\/?(\w+).*/, "$1");
-            // skip any already paired tags
-            // and skip tags in our ignore list; assume they're self-closed
-            if (tagpaired[ctag] || ignoredtags.search("<" + tagname + ">") > -1)
-                continue;
-
-            tag = tags[ctag];
-            match = -1;
-
-            if (!/^<\//.test(tag)) {
-                // this is an opening tag
-                // search forwards (next tags), look for closing tags
-                for (var ntag = ctag + 1; ntag < tagcount; ntag++) {
-                    if (!tagpaired[ntag] && tags[ntag] == "</" + tagname + ">") {
-                        match = ntag;
-                        break;
-                    }
-                }
-            }
-
-            if (match == -1)
-                needsRemoval = tagremove[ctag] = true; // mark for removal
-            else
-                tagpaired[match] = true; // mark paired
-        }
-
-        if (!needsRemoval)
-            return html;
-
-        // delete all orphaned tags from the string
-
-        var ctag = 0;
-        html = html.replace(re, function (match) {
-            var res = tagremove[ctag] ? "" : match;
-            ctag++;
-            return res;
-        });
-        return html;
-    }
-})();
diff --git a/src/Umbraco.Web.UI.Client/lib/markdown/red.css b/src/Umbraco.Web.UI.Client/lib/markdown/red.css
deleted file mode 100644
index b317f56b86..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/markdown/red.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.icon-rs-custom{
-	background: red;
-	display: inline-block;
-	height: 32px;
-	width: 32px;
-};
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/af_ZA.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/af_ZA.js
deleted file mode 100644
index b6068bc7ec..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/af_ZA.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('af_ZA',{
-"Cut": "Sny",
-"Heading 5": "Opskrif 5",
-"Header 2": "Hooflyn 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Jou webblaaier ondersteun nie toegang tot die knipbord nie. Gebruik asb. Ctrl+X\/C\/V",
-"Heading 4": "Opskrif 4",
-"Div": "Div",
-"Heading 2": "Opskrif 2",
-"Paste": "Plak",
-"Close": "Sluit",
-"Font Family": "Font Familie",
-"Pre": "Pre",
-"Align right": "Regsgerig",
-"New document": "Nuwe Dokument",
-"Blockquote": "Aanhaling",
-"Numbered list": "Genommerde lys",
-"Heading 1": "Opskrif 1",
-"Headings": "Opskrifte",
-"Increase indent": "Inkeping vergroot",
-"Formats": "Formate",
-"Headers": "Hooflyn-tekste",
-"Select all": "Alles selekteer",
-"Header 3": "Hooflyn 3",
-"Blocks": "Blokke",
-"Undo": "Ongedaan maak",
-"Strikethrough": "Deurhaal",
-"Bullet list": "Opsommingsteken-lys",
-"Header 1": "Hooflyn 1",
-"Superscript": "Superskrif",
-"Clear formatting": "Herstel Formateering",
-"Font Sizes": "Font Groote",
-"Subscript": "Subskrif",
-"Header 6": "Hooflyn 6",
-"Redo": "Herdoen",
-"Paragraph": "Paragraaf",
-"Ok": "OK",
-"Bold": "Vetdruk",
-"Code": "Kode",
-"Italic": "Kursief",
-"Align center": "Senteer",
-"Header 5": "Hooflyn 5",
-"Heading 6": "Opskrif 6",
-"Heading 3": "Opskrif 3",
-"Decrease indent": "Inkeping verklein",
-"Header 4": "Hooflyn 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Die plak funksie is nou in plat-teks modus. Teks word ingevoeg sonder enige formateering, todat jy hierdie opsie wissel.",
-"Underline": "Onderlyn",
-"Cancel": "Kanselleer",
-"Justify": "Gerigstelling",
-"Inline": "Inlyn",
-"Copy": "Kopieer",
-"Align left": "Linksgerig",
-"Visual aids": "Hulpmiddels",
-"Lower Greek": "Griekse letters",
-"Square": "Vierkantjie",
-"Default": "Verstek",
-"Lower Alpha": "Klein letters",
-"Circle": "Sirkeltjie",
-"Disc": "Balletjie",
-"Upper Alpha": "Hoofletters",
-"Upper Roman": "Romeinse syfers groot",
-"Lower Roman": "Romeinse syfers klein",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id moet met 'n letter begin en kan slegs deur letters, koppeltekens, syfers, punte en onderstreep-karakters gevolg word.",
-"Name": "Geen",
-"Anchor": "Anker",
-"Id": "Id",
-"You have unsaved changes are you sure you want to navigate away?": "Jy het ongestoorde wysigings op hierdier bladsy - is jy seker dat jy die bladsy wil verlaat?",
-"Restore last draft": "Herstel die laatste konsep",
-"Special character": "Spesiaale karakter",
-"Source code": "Bron kode",
-"Language": "Taal",
-"Insert\/Edit code sample": "Voeg\/Redigeer voorbeeld-kode",
-"B": "Blou",
-"R": "Rooi",
-"G": "Groen",
-"Color": "Kleur",
-"Right to left": "Regs na links",
-"Left to right": "Links na regs",
-"Emoticons": "Emoticons",
-"Robots": "Robotte",
-"Document properties": "Dokument eienskappe",
-"Title": "Titel",
-"Keywords": "Sleutelwoorde",
-"Encoding": "Enkodeering",
-"Description": "Beskrywing",
-"Author": "Outeur",
-"Fullscreen": "Volskerm",
-"Horizontal line": "Horisontale lyn",
-"Horizontal space": "Horisontale Spasie",
-"Insert\/edit image": "Afbeelding invoeg\/bewerk",
-"General": "Algemeen",
-"Advanced": "Gevorderd",
-"Source": "Bron",
-"Border": "Rand",
-"Constrain proportions": "Behou verhoudings",
-"Vertical space": "Vertikale Spasie",
-"Image description": "Afbeelding bemskrywing",
-"Style": "Styl",
-"Dimensions": "Afmetings",
-"Insert image": "Afbeelding invoeg",
-"Image": "Afbeelding",
-"Zoom in": "Inzoem",
-"Contrast": "Kontras",
-"Back": "Terug",
-"Gamma": "Gamma",
-"Flip horizontally": "Horisontaal weerspie\\u00ebl",
-"Resize": "Grootte wysig",
-"Sharpen": "Verskerp",
-"Zoom out": "Uitzoem",
-"Image options": "Afbeelding opsies",
-"Apply": "Toepas",
-"Brightness": "Helderheid",
-"Rotate clockwise": "Regsom draai",
-"Rotate counterclockwise": "Linksom draai",
-"Edit image": "Bewerk afbeelding",
-"Color levels": "Kleurvlakke",
-"Crop": "Afknip",
-"Orientation": "Orienteering",
-"Flip vertically": "Vertikaal weerspie\\u00ebl",
-"Invert": "Omkeer",
-"Date\/time": "Datum\/tyd",
-"Insert date\/time": "Voeg datum\/tyd in",
-"Remove link": "Verwyder skakel",
-"Url": "URL",
-"Text to display": "Skakelteks",
-"Anchors": "Ankers",
-"Insert link": "Skakel invoeg",
-"Link": "Skakel",
-"New window": "Nuwe Skerm",
-"None": "Geen",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Die URL verwys na 'n eksterne adres. Wil jy die \"http:\/\/\" voorvoegsel byvoeg?",
-"Paste or type a link": "Plak of tik 'n skalel in",
-"Target": "Teiken",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Die URL lyk soos 'n eposadres. Wil jy die \"mailto:\" voorvoegsel byvoeg?",
-"Insert\/edit link": "Skakel invoeg\/bewerk",
-"Insert\/edit video": "Video invoeg\/bewerk",
-"Media": "Media",
-"Alternative source": "Alternatiewe bron",
-"Paste your embed code below:": "Plak jou ingesluite kode hieronder in:",
-"Insert video": "Video invoeg",
-"Poster": "Plakaat",
-"Insert\/edit media": "Media invoeg\/bewerk",
-"Embed": "Insluit",
-"Nonbreaking space": "Vaste spasie invoeg",
-"Page break": "Nuwe Bladsy",
-"Paste as text": "As teks plak",
-"Preview": "Voorskou",
-"Print": "Druk",
-"Save": "Stoor",
-"Could not find the specified string.": "Kon nie die gesoekde string vind nie",
-"Replace": "Vervang",
-"Next": "Volgende",
-"Whole words": "Hele woorde",
-"Find and replace": "Soek en vervang",
-"Replace with": "Vervang Met",
-"Find": "Soek",
-"Replace all": "Vervang alles",
-"Match case": "Kassensitief",
-"Prev": "Vorige",
-"Spellcheck": "Toets spelling",
-"Finish": "Einde",
-"Ignore all": "Ignoreer alles",
-"Ignore": "Ignoreer",
-"Add to Dictionary": "Voeg by woordeboek",
-"Insert row before": "Voeg nuwe ry boaan",
-"Rows": "Rye",
-"Height": "Hoogte",
-"Paste row after": "Plak ry na",
-"Alignment": "Gerigdheid",
-"Border color": "Randkleur",
-"Column group": "Kolom Groep",
-"Row": "Ry",
-"Insert column before": "Voeg kolom vooraan",
-"Split cell": "Sel split",
-"Cell padding": "Ruimte binnein sel",
-"Cell spacing": "Ruimte rondom sel",
-"Row type": "Ry tipe",
-"Insert table": "Tabel invoeg",
-"Body": "Tabel Inhoud",
-"Caption": "Onderskrif",
-"Footer": "Voetskrif",
-"Delete row": "Verwyder ry",
-"Paste row before": "Plak ry vooraan",
-"Scope": "Bereik",
-"Delete table": "Skrap tabel",
-"H Align": "Horisontaal-gerigdheid",
-"Top": "Bo",
-"Header cell": "Kop Sel",
-"Column": "Kolom",
-"Row group": "Ry Groep",
-"Cell": "Sel",
-"Middle": "Middel",
-"Cell type": "Sel tipe",
-"Copy row": "Kopieer ry",
-"Row properties": "Ry eienskappe",
-"Table properties": "Tabel eienskappe",
-"Bottom": "Onder",
-"V Align": "Vertikaal-rerigdheid",
-"Header": "Kopteks",
-"Right": "Regs",
-"Insert column after": "Voeg kolom na",
-"Cols": "Kolomme",
-"Insert row after": "Voeg nuwe ry na",
-"Width": "Wydte",
-"Cell properties": "Sel eienskappe",
-"Left": "Links",
-"Cut row": "Knip ry",
-"Delete column": "Verwyder kolom",
-"Center": "Middel",
-"Merge cells": "Selle saamvoeg",
-"Insert template": "Sjabloon invoeg",
-"Templates": "Sjablone",
-"Background color": "Agtergrond Kleur",
-"Custom...": "Spesifiek...",
-"Custom color": "Spesifieke Kleur",
-"No color": "Geen Kleur",
-"Text color": "Teks Kleur",
-"Table of Contents": "Inhoudsopgawe",
-"Show blocks": "Blokke vertoon",
-"Show invisible characters": "Onsigbare karakters vertoon",
-"Words: {0}": "Woorde: {0}",
-"Insert": "Invoeg",
-"File": "L\u00eaer",
-"Edit": "Wysig",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Ryk Teks Area. Druk ALT-F9 vir menu, ALT-F10 vir die nutsbalk, ALT-0 vir hulp.",
-"Tools": "Gereedskap",
-"View": "Formaat",
-"Table": "Tabel",
-"Format": "Formateer"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ar.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ar.js
deleted file mode 100644
index 2bd07a8a91..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ar.js
+++ /dev/null
@@ -1,262 +0,0 @@
-tinymce.addI18n('ar',{
-"Redo": "\u0625\u0639\u0627\u062f\u0629",
-"Undo": "\u062a\u0631\u0627\u062c\u0639",
-"Cut": "\u0642\u0635",
-"Copy": "\u0646\u0633\u062e",
-"Paste": "\u0644\u0635\u0642",
-"Select all": "\u062a\u062d\u062f\u064a\u062f \u0627\u0644\u0643\u0644",
-"New document": "\u0645\u0633\u062a\u0646\u062f \u062c\u062f\u064a\u062f",
-"Ok": "\u0645\u0648\u0627\u0641\u0642",
-"Cancel": "\u0625\u0644\u063a\u0627\u0621",
-"Visual aids": "\u0627\u0644\u0645\u0639\u064a\u0646\u0627\u062a \u0627\u0644\u0628\u0635\u0631\u064a\u0629",
-"Bold": "\u063a\u0627\u0645\u0642",
-"Italic": "\u0645\u0627\u0626\u0644",
-"Underline": "\u062a\u0633\u0637\u064a\u0631",
-"Strikethrough": "\u064a\u062a\u0648\u0633\u0637 \u062e\u0637",
-"Superscript": "\u0645\u0631\u062a\u0641\u0639",
-"Subscript": "\u0645\u0646\u062e\u0641\u0636",
-"Clear formatting": "\u0645\u0633\u062d \u0627\u0644\u062a\u0646\u0633\u064a\u0642",
-"Align left": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0627\u0644\u0646\u0635 \u0644\u0644\u064a\u0633\u0627\u0631",
-"Align center": "\u062a\u0648\u0633\u064a\u0637",
-"Align right": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0627\u0644\u0646\u0635 \u0644\u0644\u064a\u0645\u064a\u0646",
-"Justify": "\u0636\u0628\u0637",
-"Bullet list": "\u062a\u0639\u062f\u0627\u062f \u0646\u0642\u0637\u064a",
-"Numbered list": "\u062a\u0631\u0642\u064a\u0645",
-"Decrease indent": "\u0625\u0646\u0642\u0627\u0635 \u0627\u0644\u0645\u0633\u0627\u0641\u0629 \u0627\u0644\u0628\u0627\u062f\u0626\u0629",
-"Increase indent": "\u0632\u064a\u0627\u062f\u0629 \u0627\u0644\u0645\u0633\u0627\u0641\u0629 \u0627\u0644\u0628\u0627\u062f\u0626\u0629",
-"Close": "\u0625\u063a\u0644\u0627\u0642",
-"Formats": "\u0627\u0644\u062a\u0646\u0633\u064a\u0642\u0627\u062a",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0645\u062a\u0635\u0641\u062d\u0643 \u0644\u0627 \u064a\u062f\u0639\u0645 \u0627\u0644\u0648\u0635\u0648\u0644 \u0627\u0644\u0645\u0628\u0627\u0634\u0631 \u0625\u0644\u0649 \u0627\u0644\u062d\u0627\u0641\u0638\u0629. \u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0627\u062e\u062a\u0635\u0627\u0631\u0627\u062a \u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0641\u0627\u062a\u064a\u062d Ctrl+X\/C\/V \u0628\u062f\u0644\u0627 \u0645\u0646 \u0630\u0644\u0643.",
-"Headers": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646",
-"Header 1": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 1",
-"Header 2": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 2",
-"Header 3": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 3",
-"Header 4": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 4",
-"Header 5": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 5",
-"Header 6": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 6",
-"Headings": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a\u0629",
-"Heading 1": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 1",
-"Heading 2": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 2",
-"Heading 3": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 3",
-"Heading 4": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 4",
-"Heading 5": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 5",
-"Heading 6": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 6",
-"Preformatted": "\u0645\u0647\u064a\u0623 \u0645\u0633\u0628\u0642\u0627",
-"Div": "Div",
-"Pre": "\u0633\u0627\u0628\u0642",
-"Code": "\u0631\u0645\u0632",
-"Paragraph": "\u0641\u0642\u0631\u0629",
-"Blockquote": "\u0639\u0644\u0627\u0645\u0627\u062a \u0627\u0644\u0627\u0642\u062a\u0628\u0627\u0633",
-"Inline": "\u062e\u0644\u0627\u0644",
-"Blocks": "\u0627\u0644\u0623\u0642\u0633\u0627\u0645",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u064a\u062a\u0645 \u0627\u0644\u0644\u0635\u0642 \u062d\u0627\u0644\u064a\u0627\u064b \u0643\u0646\u0635 \u0639\u0627\u062f\u064a. \u0627\u0644\u0645\u062d\u062a\u0648\u0649 \u0633\u064a\u0628\u0642\u0649 \u0643\u0646\u0635 \u0639\u0627\u062f\u064a \u062d\u062a\u0649 \u062a\u0642\u0648\u0645 \u0628\u062a\u0639\u0637\u064a\u0644 \u0647\u0630\u0627 \u0627\u0644\u062e\u064a\u0627\u0631.",
-"Font Family": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u062e\u0637",
-"Font Sizes": "\u062d\u062c\u0645 \u0627\u0644\u062e\u0637",
-"Class": "\u0627\u0644\u0641\u0626\u0629",
-"Browse for an image": "\u0627\u0633\u062a\u0639\u0631\u0627\u0636 \u0635\u0648\u0631\u0629",
-"OR": "\u0623\u0648",
-"Drop an image here": "\u0627\u0633\u0642\u0637 \u0627\u0644\u0635\u0648\u0631\u0629 \u0647\u0646\u0627",
-"Upload": "\u0631\u0641\u0639",
-"Block": "\u0642\u0633\u0645",
-"Align": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0623\u0641\u0642\u064a\u0629",
-"Default": "\u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a",
-"Circle": "\u062f\u0627\u0626\u0631\u0629",
-"Disc": "\u0642\u0631\u0635",
-"Square": "\u0645\u0631\u0628\u0639",
-"Lower Alpha": "\u062a\u0631\u0642\u064a\u0645 \u0623\u062e\u0631\u0641 \u0635\u063a\u064a\u0631\u0629",
-"Lower Greek": "\u062a\u0631\u0642\u064a\u0645 \u064a\u0648\u0646\u0627\u0646\u064a \u0635\u063a\u064a\u0631",
-"Lower Roman": "\u062a\u0631\u0642\u064a\u0645 \u0631\u0648\u0645\u0627\u0646\u064a \u0635\u063a\u064a\u0631",
-"Upper Alpha": "\u062a\u0631\u0642\u064a\u0645 \u0623\u062d\u0631\u0641 \u0643\u0628\u064a\u0631\u0629",
-"Upper Roman": "\u062a\u0631\u0642\u064a\u0645 \u0631\u0648\u0645\u0627\u0646\u064a \u0643\u0628\u064a\u0631",
-"Anchor": "\u0645\u0631\u0633\u0627\u0629",
-"Name": "\u0627\u0644\u0627\u0633\u0645",
-"Id": "\u0631\u0642\u0645 \u0627\u0644\u0645\u0639\u0631\u0641",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0631\u0642\u0645 \u0627\u0644\u0645\u0639\u0631\u0641 \u064a\u062c\u0628 \u0623\u0646 \u062a\u0628\u062f\u0623 \u0628\u062d\u0631\u0641\u060c \u064a\u062a\u0628\u0639 \u0641\u0642\u0637 \u0628\u062d\u0631\u0648\u0641 \u0648\u0623\u0631\u0642\u0627\u0645\u060c \u0634\u0631\u0637\u0627\u062a\u060c \u0623\u0648 \u0627\u0644\u0646\u0642\u0627\u0637\u060c \u0627\u0644\u0646\u0642\u0637\u062a\u064a\u0646 \u0623\u0648 \u0627\u0644\u0634\u0631\u0637\u0627\u062a \u0627\u0644\u0633\u0641\u0644\u064a\u0629.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0644\u062f\u064a\u0643 \u062a\u063a\u064a\u064a\u0631\u0627\u062a \u0644\u0645 \u064a\u062a\u0645 \u062d\u0641\u0638\u0647\u0627 \u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0628\u0639\u064a\u062f\u0627\u061f",
-"Restore last draft": "\u0627\u0633\u062a\u0639\u0627\u062f\u0629 \u0623\u062e\u0631 \u0645\u0633\u0648\u062f\u0629",
-"Special character": "\u0631\u0645\u0632",
-"Source code": "\u0634\u0641\u0631\u0629 \u0627\u0644\u0645\u0635\u062f\u0631",
-"Insert\/Edit code sample": "\u0625\u062f\u0631\u0627\u062c\/\u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0643\u0648\u062f",
-"Language": "\u0627\u0644\u0644\u063a\u0629",
-"Code sample": "\u0639\u064a\u0651\u0646\u0629 \u0639\u0646 \u0627\u0644\u0643\u0648\u062f \u0627\u0644\u0628\u0631\u0645\u062c\u064a",
-"Color": "\u0627\u0644\u0644\u0648\u0646",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0645\u0646 \u0627\u0644\u064a\u0633\u0627\u0631 \u0644\u0644\u064a\u0645\u064a\u0646",
-"Right to left": "\u0645\u0646 \u0627\u0644\u064a\u0645\u064a\u0646 \u0644\u0644\u064a\u0633\u0627\u0631",
-"Emoticons": "\u0627\u0644\u0631\u0645\u0648\u0632",
-"Document properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u0645\u0633\u062a\u0646\u062f",
-"Title": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646",
-"Keywords": "\u0643\u0644\u0645\u0627\u062a \u0627\u0644\u0628\u062d\u062b",
-"Description": "\u0627\u0644\u0648\u0635\u0641",
-"Robots": "\u0627\u0644\u0631\u0648\u0628\u0648\u062a\u0627\u062a",
-"Author": "\u0627\u0644\u0643\u0627\u062a\u0628",
-"Encoding": "\u0627\u0644\u062a\u0631\u0645\u064a\u0632",
-"Fullscreen": "\u0645\u0644\u0621 \u0627\u0644\u0634\u0627\u0634\u0629",
-"Action": "\u0627\u0644\u0639\u0645\u0644\u064a\u0629",
-"Shortcut": "\u0627\u0644\u0627\u062e\u062a\u0635\u0627\u0631",
-"Help": "\u0627\u0644\u0645\u0633\u0627\u0639\u062f\u0629",
-"Address": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646",
-"Focus to menubar": "\u0627\u0644\u062a\u0631\u0643\u064a\u0632 \u0639\u0644\u0649 \u0634\u0631\u064a\u0637 \u0627\u0644\u0642\u0648\u0627\u0626\u0645",
-"Focus to toolbar": "\u0627\u0644\u062a\u0631\u0643\u064a\u0632 \u0639\u0644\u0649 \u0634\u0631\u064a\u0637 \u0627\u0644\u0623\u062f\u0648\u0627\u062a",
-"Focus to element path": "\u0627\u0644\u062a\u0631\u0643\u064a\u0632 \u0639\u0644\u0649 \u0645\u0633\u0627\u0631 \u0627\u0644\u0639\u0646\u0635\u0631",
-"Focus to contextual toolbar": "\u0627\u0644\u062a\u0631\u0643\u064a\u0632 \u0639\u0644\u0649 \u0634\u0631\u064a\u0637 \u0623\u062f\u0648\u0627\u062a \u0627\u0644\u0633\u064a\u0627\u0642",
-"Insert link (if link plugin activated)": "\u0625\u0636\u0627\u0641\u0629 \u0631\u0627\u0628\u0637 (\u0625\u0630\u0627 \u0643\u0627\u0646\u062a \u0625\u0636\u0627\u0641\u0629 \u0627\u0644\u0631\u0648\u0627\u0628\u0637 \u0645\u0641\u0639\u0644\u0629)",
-"Save (if save plugin activated)": "\u062d\u0641\u0638 (\u0625\u0630\u0627 \u0643\u0627\u0646\u062a \u0625\u0636\u0627\u0641\u0629 \u0627\u0644\u062d\u0641\u0638 \u0645\u0641\u0639\u0644\u0629)",
-"Find (if searchreplace plugin activated)": "\u0627\u0644\u0628\u062d\u062b (\u0625\u0630\u0627 \u0643\u0627\u0646\u062a \u0625\u0636\u0627\u0641\u0629 \u0627\u0644\u0628\u062d\u062b \u0645\u0641\u0639\u0644\u0629)",
-"Plugins installed ({0}):": "\u0627\u0644\u0625\u0636\u0627\u0641\u0627\u062a \u0627\u0644\u0645\u062b\u0628\u062a\u0629 ({0}):",
-"Premium plugins:": "\u0627\u0644\u0625\u0636\u0627\u0641\u0627\u062a \u0627\u0644\u0645\u0645\u064a\u0632\u0629:",
-"Learn more...": "\u0645\u0639\u0631\u0641\u0629 \u0627\u0644\u0645\u0632\u064a\u062f...",
-"You are using {0}": "\u0623\u0646\u062a \u062a\u0633\u062a\u062e\u062f\u0645 {0}",
-"Plugins": "\u0627\u0644\u0625\u0636\u0627\u0641\u0627\u062a",
-"Handy Shortcuts": "\u0627\u062e\u062a\u0635\u0627\u0631\u0627\u062a \u0645\u0633\u0627\u0639\u0650\u062f\u0629",
-"Horizontal line": "\u062e\u0637 \u0623\u0641\u0642\u064a",
-"Insert\/edit image": "\u0625\u062f\u0631\u0627\u062c\/\u062a\u062d\u0631\u064a\u0631 \u0635\u0648\u0631\u0629",
-"Image description": "\u0648\u0635\u0641 \u0627\u0644\u0635\u0648\u0631\u0629",
-"Source": "\u0627\u0644\u0645\u0635\u062f\u0631",
-"Dimensions": "\u0627\u0644\u0623\u0628\u0639\u0627\u062f",
-"Constrain proportions": "\u0627\u0644\u062a\u0646\u0627\u0633\u0628",
-"General": "\u0639\u0627\u0645",
-"Advanced": "\u062e\u0635\u0627\u0626\u0635 \u0645\u062a\u0642\u062f\u0645\u0647",
-"Style": "\u0627\u0644\u0646\u0645\u0637 \/ \u0627\u0644\u0634\u0643\u0644",
-"Vertical space": "\u0645\u0633\u0627\u0641\u0629 \u0639\u0645\u0648\u062f\u064a\u0629",
-"Horizontal space": "\u0645\u0633\u0627\u0641\u0629 \u0623\u0641\u0642\u064a\u0629",
-"Border": "\u062d\u062f\u0648\u062f",
-"Insert image": "\u0625\u062f\u0631\u0627\u062c \u0635\u0648\u0631\u0629",
-"Image": "\u0627\u0644\u0635\u0648\u0631\u0629",
-"Image list": "\u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0635\u0648\u0631",
-"Rotate counterclockwise": "\u062a\u062f\u0648\u064a\u0631 \u0639\u0643\u0633 \u0627\u062a\u062c\u0627\u0647 \u0639\u0642\u0627\u0631\u0628 \u0627\u0644\u0633\u0627\u0639\u0629",
-"Rotate clockwise": "\u062a\u062f\u0648\u064a\u0631 \u0641\u064a \u0627\u062a\u062c\u0627\u0647 \u0639\u0642\u0627\u0631\u0628 \u0627\u0644\u0633\u0627\u0639\u0629",
-"Flip vertically": "\u0627\u0646\u0639\u0643\u0627\u0633 \u0639\u0627\u0645\u0648\u062f\u064a",
-"Flip horizontally": "\u0627\u0646\u0639\u0643\u0627\u0633 \u0623\u0641\u0642\u064a",
-"Edit image": "\u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0635\u0648\u0631\u0629",
-"Image options": "\u0627\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0635\u0648\u0631\u0629",
-"Zoom in": "\u062a\u0643\u0628\u064a\u0631",
-"Zoom out": "\u062a\u0635\u063a\u064a\u0631",
-"Crop": "\u0642\u0635",
-"Resize": "\u062a\u063a\u064a\u064a\u0631 \u062d\u062c\u0645",
-"Orientation": "\u0627\u0644\u0645\u062d\u0627\u0630\u0627\u0629",
-"Brightness": "\u0627\u0644\u0625\u0636\u0627\u0621\u0629",
-"Sharpen": "\u062d\u0627\u062f\u0629",
-"Contrast": "\u0627\u0644\u062a\u0628\u0627\u064a\u0646",
-"Color levels": "\u0645\u0633\u062a\u0648\u0649 \u0627\u0644\u0644\u0648\u0646",
-"Gamma": "\u063a\u0627\u0645\u0627",
-"Invert": "\u0639\u0643\u0633",
-"Apply": "\u062a\u0637\u0628\u064a\u0642",
-"Back": "\u0644\u0644\u062e\u0644\u0641",
-"Insert date\/time": "\u0625\u062f\u0631\u0627\u062c \u062a\u0627\u0631\u064a\u062e\/\u0648\u0642\u062a",
-"Date\/time": "\u0627\u0644\u062a\u0627\u0631\u064a\u062e\/\u0627\u0644\u0648\u0642\u062a",
-"Insert link": "\u0625\u062f\u0631\u0627\u062c \u0631\u0627\u0628\u0637",
-"Insert\/edit link": "\u0625\u062f\u0631\u0627\u062c\/\u062a\u062d\u0631\u064a\u0631 \u0631\u0627\u0628\u0637",
-"Text to display": "\u0627\u0644\u0646\u0635 \u0627\u0644\u0645\u0637\u0644\u0648\u0628 \u0639\u0631\u0636\u0647",
-"Url": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646",
-"Target": "\u0627\u0644\u0625\u0637\u0627\u0631 \u0627\u0644\u0647\u062f\u0641",
-"None": "\u0628\u0644\u0627",
-"New window": "\u0646\u0627\u0641\u0630\u0629 \u062c\u062f\u064a\u062f\u0629",
-"Remove link": "\u062d\u0630\u0641 \u0627\u0644\u0631\u0627\u0628\u0637",
-"Anchors": "\u0627\u0644\u0645\u0631\u0633\u0627\u0629",
-"Link": "\u0627\u0644\u0631\u0627\u0628\u0637",
-"Paste or type a link": "\u0623\u062f\u062e\u0644 \u0623\u0648 \u0627\u0643\u062a\u0628 \u0627\u0644\u0631\u0627\u0628\u0637",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0627\u0644\u0631\u0627\u0628\u0637 \u0627\u0644\u0630\u064a \u0642\u0645\u062a \u0628\u0625\u062f\u0631\u0627\u062c\u0647 \u064a\u0634\u0627\u0628\u0647 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0627\u0644\u0643\u062a\u0631\u0648\u0646\u064a. \u0647\u0644 \u062a\u0631\u064a\u062f \u0627\u0646 \u062a\u0636\u064a\u0641 \u0627\u0644\u0644\u0627\u062d\u0642\u0629 mailto: \u0645\u0639\u062a\u0628\u0631\u0627\u064b \u0647\u0630\u0627 \u0627\u0644\u0631\u0627\u0628\u0637 \u0628\u0631\u064a\u062f\u0627 \u0627\u0644\u0643\u062a\u0631\u0648\u0646\u064a\u0627\u064b\u061f",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0646\u062a\u0648\u0642\u0639 \u0627\u0646\u0643 \u0642\u0645\u062a \u0628\u0625\u062f\u0631\u0627\u062c \u0631\u0627\u0628\u0637 \u0644\u0645\u0648\u0642\u0639 \u062e\u0627\u0631\u062c\u064a. \u0647\u0644 \u062a\u0631\u064a\u062f \u0627\u0646 \u0646\u0636\u064a\u0641 \u0627\u0644\u0644\u0627\u062d\u0642\u0629 http:\/\/ \u0644\u0644\u0631\u0627\u0628\u0637 \u0627\u0644\u0630\u064a \u0627\u062f\u062e\u0644\u062a\u0647\u061f",
-"Link list": "\u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0631\u0648\u0627\u0628\u0637",
-"Insert video": "\u0625\u062f\u0631\u0627\u062c \u0641\u064a\u062f\u064a\u0648",
-"Insert\/edit video": "\u0625\u062f\u0631\u0627\u062c\/\u062a\u062d\u0631\u064a\u0631 \u0641\u064a\u062f\u064a\u0648",
-"Insert\/edit media": "\u0625\u062f\u0631\u0627\u062c\/\u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0648\u0633\u0627\u0626\u0637 \u0627\u0644\u0645\u062a\u0639\u062f\u062f\u0629",
-"Alternative source": "\u0645\u0635\u062f\u0631 \u0628\u062f\u064a\u0644",
-"Poster": "\u0645\u0644\u0635\u0642",
-"Paste your embed code below:": "\u0644\u0635\u0642 \u0643\u0648\u062f \u0627\u0644\u062a\u0636\u0645\u064a\u0646 \u0647\u0646\u0627:",
-"Embed": "\u062a\u0636\u0645\u064a\u0646",
-"Media": "\u0627\u0644\u0648\u0633\u0627\u0626\u0637 \u0627\u0644\u0645\u062a\u0639\u062f\u062f\u0629",
-"Nonbreaking space": "\u0645\u0633\u0627\u0641\u0629 \u063a\u064a\u0631 \u0645\u0646\u0642\u0633\u0645\u0629",
-"Page break": "\u0641\u0627\u0635\u0644 \u0644\u0644\u0635\u0641\u062d\u0629",
-"Paste as text": "\u0644\u0635\u0642 \u0643\u0646\u0635",
-"Preview": "\u0645\u0639\u0627\u064a\u0646\u0629",
-"Print": "\u0637\u0628\u0627\u0639\u0629",
-"Save": "\u062d\u0641\u0638",
-"Find": "\u0628\u062d\u062b",
-"Replace with": "\u0627\u0633\u062a\u0628\u062f\u0627\u0644 \u0628\u0640",
-"Replace": "\u0627\u0633\u062a\u0628\u062f\u0627\u0644",
-"Replace all": "\u0627\u0633\u062a\u0628\u062f\u0627\u0644 \u0627\u0644\u0643\u0644",
-"Prev": "\u0627\u0644\u0633\u0627\u0628\u0642",
-"Next": "\u0627\u0644\u062a\u0627\u0644\u064a",
-"Find and replace": "\u0628\u062d\u062b \u0648\u0627\u0633\u062a\u0628\u062f\u0627\u0644",
-"Could not find the specified string.": "\u062a\u0639\u0630\u0631 \u0627\u0644\u0639\u062b\u0648\u0631 \u0639\u0644\u0649 \u0627\u0644\u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u062d\u062f\u062f\u0629",
-"Match case": "\u0645\u0637\u0627\u0628\u0642\u0629 \u062d\u0627\u0644\u0629 \u0627\u0644\u0623\u062d\u0631\u0641",
-"Whole words": "\u0645\u0637\u0627\u0628\u0642\u0629 \u0627\u0644\u0643\u0644\u0645\u0627\u062a \u0628\u0627\u0644\u0643\u0627\u0645\u0644",
-"Spellcheck": "\u062a\u062f\u0642\u064a\u0642 \u0625\u0645\u0644\u0627\u0626\u064a",
-"Ignore": "\u062a\u062c\u0627\u0647\u0644",
-"Ignore all": "\u062a\u062c\u0627\u0647\u0644 \u0627\u0644\u0643\u0644",
-"Finish": "\u0627\u0646\u062a\u0647\u064a",
-"Add to Dictionary": "\u0627\u0636\u0641 \u0627\u0644\u064a \u0627\u0644\u0642\u0627\u0645\u0648\u0633",
-"Insert table": "\u0625\u062f\u0631\u0627\u062c \u062c\u062f\u0648\u0644",
-"Table properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u062c\u062f\u0648\u0644",
-"Delete table": "\u062d\u0630\u0641 \u062c\u062f\u0648\u0644",
-"Cell": "\u062e\u0644\u064a\u0629",
-"Row": "\u0635\u0641",
-"Column": "\u0639\u0645\u0648\u062f",
-"Cell properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u062e\u0644\u064a\u0629",
-"Merge cells": "\u062f\u0645\u062c \u062e\u0644\u0627\u064a\u0627",
-"Split cell": "\u062a\u0642\u0633\u064a\u0645 \u0627\u0644\u062e\u0644\u0627\u064a\u0627",
-"Insert row before": "\u0625\u062f\u0631\u0627\u062c \u0635\u0641 \u0644\u0644\u0623\u0639\u0644\u0649",
-"Insert row after": "\u0625\u062f\u0631\u0627\u062c \u0635\u0641 \u0644\u0644\u0623\u0633\u0641\u0644",
-"Delete row": "\u062d\u0630\u0641 \u0635\u0641",
-"Row properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u0635\u0641",
-"Cut row": "\u0642\u0635 \u0627\u0644\u0635\u0641",
-"Copy row": "\u0646\u0633\u062e \u0627\u0644\u0635\u0641",
-"Paste row before": "\u0644\u0635\u0642 \u0627\u0644\u0635\u0641 \u0644\u0644\u0623\u0639\u0644\u0649",
-"Paste row after": "\u0644\u0635\u0642 \u0627\u0644\u0635\u0641 \u0644\u0644\u0623\u0633\u0641\u0644",
-"Insert column before": "\u0625\u062f\u0631\u0627\u062c \u0639\u0645\u0648\u062f \u0644\u0644\u064a\u0633\u0627\u0631",
-"Insert column after": "\u0625\u062f\u0631\u0627\u062c \u0639\u0645\u0648\u062f \u0644\u0644\u064a\u0645\u064a\u0646",
-"Delete column": "\u062d\u0630\u0641 \u0639\u0645\u0648\u062f",
-"Cols": "\u0639\u062f\u062f \u0627\u0644\u0623\u0639\u0645\u062f\u0629",
-"Rows": "\u0639\u062f\u062f \u0627\u0644\u0635\u0641\u0648\u0641",
-"Width": "\u0639\u0631\u0636",
-"Height": "\u0627\u0631\u062a\u0641\u0627\u0639",
-"Cell spacing": "\u0627\u0644\u0645\u0633\u0627\u0641\u0629 \u0628\u064a\u0646 \u0627\u0644\u062e\u0644\u0627\u064a\u0627",
-"Cell padding": "\u062a\u0628\u0627\u0639\u062f \u0627\u0644\u062e\u0644\u064a\u0629",
-"Caption": "\u0634\u0631\u062d",
-"Left": "\u064a\u0633\u0627\u0631",
-"Center": "\u062a\u0648\u0633\u064a\u0637",
-"Right": "\u064a\u0645\u064a\u0646",
-"Cell type": "\u0646\u0648\u0639 \u0627\u0644\u062e\u0644\u064a\u0629",
-"Scope": "\u0627\u0644\u0645\u062c\u0627\u0644",
-"Alignment": "\u0645\u062d\u0627\u0630\u0627\u0629",
-"H Align": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0623\u0641\u0642\u064a\u0629",
-"V Align": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0631\u0623\u0633\u064a\u0629",
-"Top": "\u0623\u0639\u0644\u064a",
-"Middle": "\u0627\u0644\u0648\u0633\u0637",
-"Bottom": "\u0627\u0644\u0623\u0633\u0641\u0644",
-"Header cell": "\u0631\u0623\u0633 \u0627\u0644\u062e\u0644\u064a\u0629",
-"Row group": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0635\u0641",
-"Column group": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0639\u0645\u0648\u062f",
-"Row type": "\u0646\u0648\u0639 \u0627\u0644\u0635\u0641",
-"Header": "\u0627\u0644\u0631\u0623\u0633",
-"Body": "\u0647\u064a\u0643\u0644",
-"Footer": "\u062a\u0630\u064a\u064a\u0644",
-"Border color": "\u0644\u0648\u0646 \u0627\u0644\u0625\u0637\u0627\u0631",
-"Insert template": "\u0625\u062f\u0631\u0627\u062c \u0642\u0627\u0644\u0628",
-"Templates": "\u0642\u0648\u0627\u0644\u0628",
-"Template": "\u0627\u0644\u0642\u0627\u0644\u0628",
-"Text color": "\u0644\u0648\u0646 \u0627\u0644\u0646\u0635",
-"Background color": "\u0644\u0648\u0646 \u0627\u0644\u062e\u0644\u0641\u064a\u0629",
-"Custom...": "\u062a\u062e\u0635\u064a\u0635 ...",
-"Custom color": "\u0644\u0648\u0646 \u0645\u062e\u0635\u0635",
-"No color": "\u0628\u062f\u0648\u0646 \u0644\u0648\u0646",
-"Table of Contents": "\u062c\u062f\u0648\u0644 \u0627\u0644\u0645\u062d\u062a\u0648\u064a\u0627\u062a",
-"Show blocks": "\u0645\u0634\u0627\u0647\u062f\u0629 \u0627\u0644\u0643\u062a\u0644",
-"Show invisible characters": "\u0623\u0638\u0647\u0631 \u0627\u0644\u0623\u062d\u0631\u0641 \u0627\u0644\u063a\u064a\u0631 \u0645\u0631\u0626\u064a\u0629",
-"Words: {0}": "\u0627\u0644\u0643\u0644\u0645\u0627\u062a:{0}",
-"{0} words": "{0} \u0643\u0644\u0645\u0627\u062a",
-"File": "\u0645\u0644\u0641",
-"Edit": "\u062a\u062d\u0631\u064a\u0631",
-"Insert": "\u0625\u062f\u0631\u0627\u062c",
-"View": "\u0639\u0631\u0636",
-"Format": "\u062a\u0646\u0633\u064a\u0642",
-"Table": "\u062c\u062f\u0648\u0644",
-"Tools": "\u0623\u062f\u0627\u0648\u0627\u062a",
-"Powered by {0}": "\u0645\u062f\u0639\u0648\u0645 \u0645\u0646 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0645\u0646\u0637\u0642\u0629 \u0646\u0635 \u0645\u0646\u0633\u0642. \u0627\u0636\u063a\u0637 ALT-F9 \u0644\u0644\u0642\u0627\u0626\u0645\u0629. \u0627\u0636\u063a\u0637 ALT-F10 \u0644\u0634\u0631\u064a\u0637 \u0627\u0644\u0623\u062f\u0648\u0627\u062a. \u0627\u0636\u063a\u0637 ALT-0 \u0644\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0645\u0633\u0627\u0639\u062f\u0629",
-"_dir": "rtl"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/az.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/az.js
deleted file mode 100644
index cbd5d4700e..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/az.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('az',{
-"Redo": "\u0130r\u0259li",
-"Undo": "Geriy\u0259",
-"Cut": "K\u0259s",
-"Copy": "K\u00f6\u00e7\u00fcr",
-"Paste": "\u018flav\u0259 et",
-"Select all": "Ham\u0131s\u0131n\u0131 se\u00e7",
-"New document": "Yeni s\u0259n\u0259d",
-"Ok": "Oldu",
-"Cancel": "L\u0259\u011fv et",
-"Visual aids": "Konturlar\u0131 g\u00f6st\u0259r",
-"Bold": "Qal\u0131n",
-"Italic": "Maili",
-"Underline": "Alt x\u0259ttli",
-"Strikethrough": "Silinmi\u015f",
-"Superscript": "Yuxar\u0131 indeks",
-"Subscript": "A\u015fa\u011f\u0131 indeks",
-"Clear formatting": "Format\u0131 t\u0259mizl\u0259",
-"Align left": "Sol t\u0259r\u0259f \u00fczr\u0259",
-"Align center": "M\u0259rk\u0259z \u00fczr\u0259",
-"Align right": "Sa\u011f t\u0259r\u0259f \u00fczr\u0259",
-"Justify": "H\u0259r iki t\u0259r\u0259f \u00fczr\u0259",
-"Bullet list": "S\u0131ras\u0131z siyah\u0131",
-"Numbered list": "N\u00f6mr\u0259l\u0259nmi\u015f siyah\u0131",
-"Decrease indent": "Bo\u015flu\u011fu azalt",
-"Increase indent": "Bo\u015flu\u011fu art\u0131r",
-"Close": "Ba\u011fla",
-"Formats": "Formatlar",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Sizin brauzeriniz m\u00fcbadil\u0259 buferin\u0259 birba\u015fa yolu d\u0259st\u0259kl\u0259mir. Z\u0259hm\u0259t olmasa, bunun yerin\u0259 klaviaturan\u0131n Ctrl+X\/C\/V d\u00fcym\u0259l\u0259rind\u0259n istifad\u0259 edin.",
-"Headers": "Ba\u015fl\u0131qlar",
-"Header 1": "Ba\u015fl\u0131q 1",
-"Header 2": "Ba\u015fl\u0131q 2",
-"Header 3": "Ba\u015fl\u0131q 3",
-"Header 4": "Ba\u015fl\u0131q 4",
-"Header 5": "Ba\u015fl\u0131q 5",
-"Header 6": "Ba\u015fl\u0131q 6",
-"Headings": "Ba\u015fl\u0131qlar",
-"Heading 1": "Ba\u015fl\u0131q 1",
-"Heading 2": "Ba\u015fl\u0131q 2",
-"Heading 3": "Ba\u015fl\u0131q 3",
-"Heading 4": "Ba\u015fl\u0131q 4",
-"Heading 5": "Ba\u015fl\u0131q 5",
-"Heading 6": "Ba\u015fl\u0131q 6",
-"Preformatted": "\u018fvv\u0259lc\u0259d\u0259n formatland\u0131r\u0131lm\u0131\u015f",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kod",
-"Paragraph": "Paraqraf",
-"Blockquote": "Sitat",
-"Inline": "S\u0259tir i\u00e7i",
-"Blocks": "Bloklar",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Hal-haz\u0131rda adi m\u0259tn rejimind\u0259 yerl\u0259\u015fdirilir. M\u0259zmun sad\u0259 m\u0259tn \u015f\u0259klind\u0259 yerl\u0259\u015fdiril\u0259c\u0259k, h\u0259l\u0259 bu se\u00e7imi d\u0259yi\u015fdirm\u0259.",
-"Font Family": "Font stili",
-"Font Sizes": "Font \u00f6l\u00e7\u00fcl\u0259ri",
-"Class": "Sinif",
-"Browse for an image": "\u015e\u0259kil se\u00e7",
-"OR": "V\u018f YA",
-"Drop an image here": "\u015e\u0259kli buraya s\u00fcr\u00fckl\u0259yin",
-"Upload": "Y\u00fckl\u0259",
-"Block": "Blokla",
-"Align": "D\u00fczl\u0259ndir",
-"Default": "Susmaya g\u00f6r\u0259",
-"Circle": "Dair\u0259",
-"Disc": "Disk",
-"Square": "Sah\u0259",
-"Lower Alpha": "Ki\u00e7ik Alfa \u0259lifbas\u0131",
-"Lower Greek": "Ki\u00e7ik Yunan \u0259lifbas\u0131",
-"Lower Roman": "Ki\u00e7ik Roma \u0259lifbas\u0131",
-"Upper Alpha": "B\u00f6y\u00fck Alfa \u0259lifbas\u0131",
-"Upper Roman": "B\u00f6y\u00fck Roma \u0259lifbas\u0131",
-"Anchor": "L\u00f6vb\u0259r",
-"Name": "Ad",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0130D h\u0259rfl\u0259 ba\u015flamal\u0131d\u0131r. Daha sonra is\u0259 h\u0259rf, r\u0259q\u0259m, tire, n\u00f6qt\u0259, qo\u015fan\u00f6qt\u0259, v\u0259 altx\u0259tt kimi simvollardan istifad\u0259 oluna bil\u0259r.",
-"You have unsaved changes are you sure you want to navigate away?": "Sizd\u0259 yadda saxlan\u0131lmayan d\u0259yi\u015fiklikl\u0259r var \u0259minsiniz ki, getm\u0259k ist\u0259yirsiniz?",
-"Restore last draft": "Son layih\u0259nin b\u0259rpas\u0131",
-"Special character": "X\u00fcsusi simvollar",
-"Source code": "M\u0259nb\u0259 kodu",
-"Insert\/Edit code sample": "Kod n\u00fcmun\u0259sin\u0259 \u0259lav\u0259\/d\u00fcz\u0259li\u015f et",
-"Language": "Dil",
-"Code sample": "Kod n\u00fcmun\u0259si",
-"Color": "R\u0259ng",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Soldan sa\u011fa",
-"Right to left": "Sa\u011fdan sola",
-"Emoticons": "Emosiyalar",
-"Document properties": "S\u0259n\u0259din x\u00fcsusiyy\u0259tl\u0259ri",
-"Title": "Ba\u015fl\u0131q",
-"Keywords": "A\u00e7ar s\u00f6zl\u0259r",
-"Description": "T\u0259sviri",
-"Robots": "Robotlar",
-"Author": "M\u00fc\u0259llif",
-"Encoding": "Kodla\u015fd\u0131rma",
-"Fullscreen": "Tam ekran rejimi",
-"Action": "\u018fmr",
-"Shortcut": "Q\u0131sayol",
-"Help": "K\u00f6m\u0259k",
-"Address": "Adres",
-"Focus to menubar": "Menyu \u00e7ubu\u011funa diqq\u0259t et",
-"Focus to toolbar": "Al\u0259tl\u0259r \u00e7ubu\u011funa diqq\u0259t et",
-"Focus to element path": "Elementin m\u0259nb\u0259yin\u0259 diqq\u0259t et",
-"Focus to contextual toolbar": "Kontekst menyuya diqq\u0259t et",
-"Insert link (if link plugin activated)": "Link \u0259lav\u0259 et (\u0259g\u0259r link \u0259lav\u0259si aktivdirs\u0259)",
-"Save (if save plugin activated)": "Yadda\u015fa yaz (\u0259g\u0259r yadda\u015fa yaz \u0259lav\u0259si aktivdirs\u0259)",
-"Find (if searchreplace plugin activated)": "Tap (\u0259g\u0259r axtar\u0131\u015f \u0259lav\u0259si aktivdirs\u0259)",
-"Plugins installed ({0}):": "\u018flav\u0259l\u0259r y\u00fckl\u0259ndi ({0}):",
-"Premium plugins:": "Premium \u0259lav\u0259l\u0259r",
-"Learn more...": "Daha \u00e7ox \u00f6yr\u0259n...",
-"You are using {0}": "Siz {0} istifad\u0259 edirsiniz",
-"Plugins": "\u018flav\u0259l\u0259r",
-"Handy Shortcuts": "Laz\u0131ml\u0131 q\u0131sayollar",
-"Horizontal line": "Horizontal x\u0259tt",
-"Insert\/edit image": "\u015e\u0259kilin \u0259lav\u0259\/redakt\u0259 edilm\u0259si",
-"Image description": "\u015e\u0259kilin t\u0259sviri",
-"Source": "M\u0259nb\u0259",
-"Dimensions": "\u00d6l\u00e7\u00fcl\u0259r",
-"Constrain proportions": "Nisb\u0259tl\u0259rin saxlan\u0131lmas\u0131",
-"General": "\u00dcmumi",
-"Advanced": "Geni\u015fl\u0259nmi\u015f",
-"Style": "Stil",
-"Vertical space": "Vertikal sah\u0259",
-"Horizontal space": "Horizontal sah\u0259",
-"Border": "\u00c7\u0259r\u00e7iv\u0259",
-"Insert image": "\u015e\u0259kil yerl\u0259\u015fdir",
-"Image": "\u015e\u0259kil",
-"Image list": "\u015e\u0259kil listi",
-"Rotate counterclockwise": "Saat \u0259qr\u0259binin \u0259ksin\u0259 f\u0131rlat",
-"Rotate clockwise": "Saat \u0259qr\u0259bi istiqam\u0259tind\u0259 f\u0131rlat",
-"Flip vertically": "\u015eaquli \u00e7evir",
-"Flip horizontally": "\u00dcfiqi \u00e7evir",
-"Edit image": "\u015e\u0259kili redakt\u0259 et",
-"Image options": "\u015e\u0259kil parametrl\u0259ri",
-"Zoom in": "Yax\u0131nla\u015fd\u0131r",
-"Zoom out": "Uzaqla\u015fd\u0131r",
-"Crop": "K\u0259s",
-"Resize": "\u00d6l\u00e7\u00fcl\u0259ri d\u0259yi\u015f",
-"Orientation": "Oriyentasiya",
-"Brightness": "Parlaql\u0131q",
-"Sharpen": "K\u0259skinl\u0259\u015fdir",
-"Contrast": "Ziddiyy\u0259t",
-"Color levels": "R\u0259ng s\u0259viyy\u0259l\u0259ri",
-"Gamma": "Qamma",
-"Invert": "T\u0259rsin\u0259 \u00e7evir",
-"Apply": "T\u0259tbiq et",
-"Back": "Geri",
-"Insert date\/time": "G\u00fcn\/tarix \u0259lav\u0259 et",
-"Date\/time": "Tarix\/saat",
-"Insert link": "Linkin \u0259lav\u0259 edilm\u0259si",
-"Insert\/edit link": "Linkin \u0259lav\u0259\/redakt\u0259 edilm\u0259si",
-"Text to display": "G\u00f6r\u00fcn\u0259n yaz\u0131n\u0131n t\u0259sviri",
-"Url": "Linkin \u00fcnvan\u0131",
-"Target": "H\u0259d\u0259f",
-"None": "Yoxdur",
-"New window": "Yeni p\u0259nc\u0259r\u0259d\u0259 a\u00e7\u0131ls\u0131n",
-"Remove link": "Linki sil",
-"Anchors": "L\u00f6vb\u0259rl\u0259r",
-"Link": "Ke\u00e7id",
-"Paste or type a link": "Ke\u00e7idi yerl\u0259\u015fdirin v\u0259 ya yaz\u0131n",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Daxil etdiyiniz URL bir e-mail kimi g\u00f6r\u00fcn\u00fcr. \u018fg\u0259r t\u0259l\u0259b olunan mailto: prefix \u0259lav\u0259 etm\u0259k ist\u0259yirsiniz?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Daxil etdiyiniz URL bir e-mail kimi g\u00f6r\u00fcn\u00fcr. \u018fg\u0259r t\u0259l\u0259b olunan mailto: prefix \u0259lav\u0259 etm\u0259k ist\u0259yirsiniz?",
-"Link list": "Ke\u00e7id listi",
-"Insert video": "Videonun \u0259lav\u0259 edilm\u0259si",
-"Insert\/edit video": "Videonun \u0259lav\u0259\/redakt\u0259 edilm\u0259si",
-"Insert\/edit media": "Media \u0259lav\u0259\/d\u00fcz\u0259li\u015f et",
-"Alternative source": "Alternativ m\u0259nb\u0259",
-"Poster": "Poster",
-"Paste your embed code below:": "\u00d6z kodunuzu a\u015fa\u011f\u0131 \u0259lav\u0259 edin:",
-"Embed": "\u018flav\u0259 etm\u0259k \u00fc\u00e7\u00fcn kod",
-"Media": "Media",
-"Nonbreaking space": "Q\u0131r\u0131lmaz sah\u0259",
-"Page break": "S\u0259hif\u0259nin q\u0131r\u0131lmas\u0131",
-"Paste as text": "M\u0259tn kimi \u0259lav\u0259 et",
-"Preview": "\u0130lkinbax\u0131\u015f",
-"Print": "\u00c7ap et",
-"Save": "Yadda saxla",
-"Find": "Tap",
-"Replace with": "Bununla d\u0259yi\u015fdir",
-"Replace": "D\u0259yi\u015fdir",
-"Replace all": "Ham\u0131s\u0131n\u0131 d\u0259yi\u015fdir",
-"Prev": "\u018fvv\u0259lki",
-"Next": "N\u00f6vb\u0259ti",
-"Find and replace": "Tap v\u0259 d\u0259yi\u015fdir",
-"Could not find the specified string.": "G\u00f6st\u0259ril\u0259n s\u0259tiri tapmaq olmur",
-"Match case": "Registri n\u0259z\u0259r\u0259 al",
-"Whole words": "Tam s\u00f6zl\u0259r",
-"Spellcheck": "Orfoqrafiyan\u0131 yoxla",
-"Ignore": "\u0130qnorla",
-"Ignore all": "Ham\u0131s\u0131n\u0131 iqnorla",
-"Finish": "Bitir",
-"Add to Dictionary": "L\u00fc\u011f\u0259t\u0259 \u0259lav\u0259 edilsin",
-"Insert table": "S\u0259tir \u0259lav\u0259 et",
-"Table properties": "C\u0259dv\u0259lin x\u00fcsusiyy\u0259tl\u0259ri",
-"Delete table": "C\u0259dv\u0259li sil",
-"Cell": "H\u00fccr\u0259",
-"Row": "S\u0259tir",
-"Column": "S\u00fctun",
-"Cell properties": "H\u00fccr\u0259nin x\u00fcsusiyy\u0259tl\u0259ri",
-"Merge cells": "H\u00fccr\u0259l\u0259ri birl\u0259\u015ftir",
-"Split cell": "H\u00fccr\u0259l\u0259rin say\u0131",
-"Insert row before": "\u018fvv\u0259lin\u0259 s\u0259tir \u0259lav\u0259 et",
-"Insert row after": "Sonras\u0131na s\u0259tir \u0259lav\u0259 et",
-"Delete row": "S\u0259tri sil",
-"Row properties": "S\u0259trin x\u00fcsusiyy\u0259tl\u0259ri",
-"Cut row": "S\u0259tiri k\u0259s",
-"Copy row": "S\u0259tiri k\u00f6\u00e7\u00fcr",
-"Paste row before": "\u018fvv\u0259lin\u0259 s\u0259tir \u0259lav\u0259 et",
-"Paste row after": "Sonras\u0131na s\u0259tir \u0259lav\u0259 et",
-"Insert column before": "\u018fvv\u0259lin\u0259 s\u0259tir \u0259lav\u0259 et",
-"Insert column after": "\u018fvv\u0259lin\u0259 s\u00fctun \u0259lav\u0259 et",
-"Delete column": "S\u00fctunu sil",
-"Cols": "S\u00fctunlar",
-"Rows": "S\u0259tirl\u0259r",
-"Width": "Eni",
-"Height": "H\u00fcnd\u00fcrl\u00fcy\u00fc",
-"Cell spacing": "H\u00fccr\u0259l\u0259rin aras\u0131nda m\u0259saf\u0259",
-"Cell padding": "H\u00fccr\u0259l\u0259rin sah\u0259l\u0259ri",
-"Caption": "Ba\u015flan\u011f\u0131c",
-"Left": "Sol t\u0259r\u0259f \u00fczr\u0259",
-"Center": "M\u0259rk\u0259z \u00fczr\u0259",
-"Right": "Sa\u011f t\u0259r\u0259f \u00fczr\u0259",
-"Cell type": "H\u00fccr\u0259nin tipi",
-"Scope": "Sfera",
-"Alignment": "D\u00fczl\u0259ndirm\u0259",
-"H Align": "H D\u00fczl\u0259ndir",
-"V Align": "V D\u00fczl\u0259ndir",
-"Top": "Yuxar\u0131",
-"Middle": "Orta",
-"Bottom": "A\u015fa\u011f\u0131",
-"Header cell": "H\u00fccr\u0259nin ba\u015fl\u0131\u011f\u0131",
-"Row group": "S\u0259tirin qrupu",
-"Column group": "S\u00fctunun qrupu",
-"Row type": "S\u0259tirin tipi",
-"Header": "Ba\u015fl\u0131q",
-"Body": "K\u00fctl\u0259",
-"Footer": "\u018fn a\u015fa\u011f\u0131",
-"Border color": "\u00c7\u0259r\u00e7iv\u0259 r\u0259ngi",
-"Insert template": "\u015eablon \u0259lav\u0259 et",
-"Templates": "\u015eablonlar",
-"Template": "\u015eablon",
-"Text color": "M\u0259tnin r\u0259ngi",
-"Background color": "Arxafon r\u0259ngi",
-"Custom...": "\u00c7\u0259kilm\u0259...",
-"Custom color": "\u00c7\u0259kilm\u0259 r\u0259ng",
-"No color": "R\u0259ngsiz",
-"Table of Contents": "M\u00fcnd\u0259ricat",
-"Show blocks": "Bloklar\u0131 g\u00f6st\u0259r",
-"Show invisible characters": "G\u00f6r\u00fcnm\u0259y\u0259n simvollar\u0131 g\u00f6st\u0259r",
-"Words: {0}": "S\u00f6zl\u0259r: {0}",
-"{0} words": "{0} s\u00f6z",
-"File": "Fayl",
-"Edit": "Redakt\u0259 et",
-"Insert": "\u018flav\u0259 et",
-"View": "G\u00f6r\u00fcn\u00fc\u015f",
-"Format": "Format",
-"Table": "C\u0259dv\u0259l",
-"Tools": "Al\u0259tl\u0259r",
-"Powered by {0}": "{0} t\u0259r\u0259find\u0259n t\u0259chiz edilib",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "B\u00f6y\u00fck m\u0259tn sah\u0259si \u0259lav\u0259 edilib. Menyu \u00fc\u00e7\u00fcn ALT-F9 d\u00fcym\u0259sini bas\u0131n. Al\u0259tl\u0259r paneli \u00fc\u00e7\u00fcn ALT-F10 d\u00fcym\u0259sini bas\u0131n. K\u00f6m\u0259k \u00fc\u00e7\u00fcn ALT-0 d\u00fcym\u0259l\u0259rin bas\u0131n."
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/be.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/be.js
deleted file mode 100644
index bc9fc08f76..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/be.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('be',{
-"Redo": "\u0410\u0434\u043c\u044f\u043d\u0456\u0446\u044c",
-"Undo": "\u0412\u044f\u0440\u043d\u0443\u0446\u044c",
-"Cut": "\u0412\u044b\u0440\u0430\u0437\u0430\u0446\u044c",
-"Copy": "\u041a\u0430\u043f\u0456\u0440\u0430\u0432\u0430\u0446\u044c",
-"Paste": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c",
-"Select all": "\u0412\u044b\u043b\u0443\u0447\u044b\u0446\u044c \u0443\u0441\u0451",
-"New document": "\u041d\u043e\u0432\u044b \u0434\u0430\u043a\u0443\u043c\u0435\u043d\u0442",
-"Ok": "Ok",
-"Cancel": "\u0410\u0434\u043c\u044f\u043d\u0456\u0446\u044c",
-"Visual aids": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u043a\u043e\u043d\u0442\u0443\u0440\u044b",
-"Bold": "\u0422\u043b\u0443\u0441\u0442\u044b",
-"Italic": "\u041a\u0443\u0440\u0441\u0456\u045e",
-"Underline": "\u041f\u0430\u0434\u043a\u0440\u044d\u0441\u043b\u0435\u043d\u044b",
-"Strikethrough": "\u0417\u0430\u043a\u0440\u044d\u0441\u043b\u0435\u043d\u044b",
-"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0456 \u0456\u043d\u0434\u044d\u043a\u0441",
-"Subscript": "\u041d\u0456\u0436\u043d\u0456 \u0456\u043d\u0434\u044d\u043a\u0441",
-"Clear formatting": "\u0410\u0447\u044b\u0441\u0446\u0456\u0446\u044c \u0444\u0430\u0440\u043c\u0430\u0442",
-"Align left": "\u041f\u0430 \u043b\u0435\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
-"Align center": "\u041f\u0430 \u0446\u044d\u043d\u0442\u0440\u044b",
-"Align right": "\u041f\u0430 \u043f\u0440\u0430\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
-"Justify": "\u041f\u0430 \u0448\u044b\u0440\u044b\u043d\u0456",
-"Bullet list": "\u041c\u0430\u0440\u043a\u0456\u0440\u0430\u0432\u0430\u043d\u044b \u0441\u043f\u0456\u0441",
-"Numbered list": "\u041d\u0443\u043c\u0430\u0440\u0430\u0432\u0430\u043d\u044b \u0441\u043f\u0456\u0441",
-"Decrease indent": "\u041f\u0430\u043c\u0435\u043d\u0448\u044b\u0446\u044c \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
-"Increase indent": "\u041f\u0430\u0432\u044f\u043b\u0456\u0447\u044b\u0446\u044c \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
-"Close": "\u0417\u0430\u0447\u044b\u043d\u0456\u0446\u044c",
-"Formats": "\u0424\u0430\u0440\u043c\u0430\u0442",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u045e\u0437\u044d\u0440 \u043d\u0435 \u043f\u0430\u0434\u0442\u0440\u044b\u043c\u043b\u0456\u0432\u0430\u0435 \u043f\u0440\u0430\u043c\u044b \u0434\u043e\u0441\u0442\u0443\u043f \u0434\u0430 \u0431\u0443\u0444\u0435\u0440\u0430 \u0430\u0431\u043c\u0435\u043d\u0443. \u041a\u0430\u043b\u0456 \u043b\u0430\u0441\u043a\u0430, \u0432\u044b\u043a\u0430\u0440\u044b\u0441\u0442\u043e\u045e\u0432\u0430\u0439\u0446\u0435 \u043d\u0430\u0441\u0442\u0443\u043f\u043d\u044b\u044f \u0441\u043f\u0430\u043b\u0443\u0447\u044d\u043d\u043d\u044f \u043a\u043b\u0430\u0432\u0456\u0448: Ctrl + X\/C\/V.",
-"Headers": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043a\u0456",
-"Header 1": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 1",
-"Header 2": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 2",
-"Header 3": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 3",
-"Header 4": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 4",
-"Header 5": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 5",
-"Header 6": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 6",
-"Headings": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043a\u0456",
-"Heading 1": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 1",
-"Heading 2": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 2",
-"Heading 3": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 3",
-"Heading 4": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 4",
-"Heading 5": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 5",
-"Heading 6": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 6",
-"Preformatted": "\u0412\u044b\u0440\u0430\u045e\u043d\u0430\u0432\u0430\u043d\u044b",
-"Div": "\u0411\u043b\u043e\u043a",
-"Pre": "\u041f\u0440\u0430\u0434\u0444\u0430\u0440\u043c\u0430\u0442\u0430\u0432\u0430\u043d\u043d\u0435",
-"Code": "\u041a\u043e\u0434",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Blockquote": "\u0426\u044b\u0442\u0430\u0442\u0430",
-"Inline": "\u0420\u0430\u0434\u043a\u043e\u0432\u044b",
-"Blocks": "\u0411\u043b\u043e\u043a\u0456",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0423\u0441\u0442\u0430\u045e\u043a\u0430 \u0437\u0434\u0437\u044f\u0439\u0441\u043d\u044f\u0435\u0446\u0446\u0430 \u045e \u0432\u044b\u0433\u043b\u044f\u0434\u0437\u0435 \u043f\u0440\u043e\u0441\u0442\u0430\u0433\u0430 \u0442\u044d\u043a\u0441\u0442\u0443, \u043f\u0430\u043a\u0443\u043b\u044c \u043d\u0435 \u0430\u0434\u043a\u043b\u044e\u0447\u044b\u0446\u044c \u0434\u0430\u0434\u0437\u0435\u043d\u0443\u044e \u043e\u043f\u0446\u044b\u044e.",
-"Font Family": "\u0428\u0440\u044b\u0444\u0442",
-"Font Sizes": "\u041f\u0430\u043c\u0435\u0440 \u0448\u0440\u044b\u0444\u0442\u0430",
-"Class": "\u041a\u043b\u0430\u0441",
-"Browse for an image": "\u041f\u043e\u0448\u0443\u043a \u0432\u044b\u044f\u0432\u044b",
-"OR": "\u0410\u0411\u041e",
-"Drop an image here": "\u0410\u0434\u043a\u0456\u043d\u044c\u0446\u0435 \u0432\u044b\u044f\u0432\u0443 \u0442\u0443\u0442",
-"Upload": "\u0417\u0430\u043f\u0430\u043c\u043f\u0430\u0432\u0430\u0446\u044c",
-"Block": "\u0417\u0430\u0431\u043b\u0430\u043a\u0430\u0432\u0430\u0446\u044c",
-"Align": "\u0412\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
-"Default": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b",
-"Circle": "\u0410\u043a\u0440\u0443\u0436\u043d\u0430\u0441\u0446\u0456",
-"Disc": "\u041a\u0440\u0443\u0433\u0456",
-"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u044b",
-"Lower Alpha": "\u041c\u0430\u043b\u044b\u044f \u043b\u0430\u0446\u0456\u043d\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
-"Lower Greek": "\u041c\u0430\u043b\u044b\u044f \u0433\u0440\u044d\u0447\u0430\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
-"Lower Roman": "\u041c\u0430\u043b\u044b\u044f \u0440\u044b\u043c\u0441\u043a\u0456\u044f \u043b\u0456\u0447\u0431\u044b",
-"Upper Alpha": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043d\u044b\u044f \u043b\u0430\u0446\u0456\u043d\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
-"Upper Roman": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043d\u044b\u044f \u0440\u044b\u043c\u0441\u043a\u0456\u044f \u043b\u0456\u0447\u0431\u044b",
-"Anchor": "\u042f\u043a\u0430\u0440",
-"Name": "\u0406\u043c\u044f",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u043f\u0430\u0432\u0456\u043d\u0435\u043d \u043f\u0430\u0447\u044b\u043d\u0430\u0446\u0446\u0430 \u0437 \u043b\u0456\u0442\u0430\u0440\u044b, \u0430 \u043f\u043e\u0442\u044b\u043c \u0443\u0442\u0440\u044b\u043c\u043b\u0456\u0432\u0430\u0446\u044c \u0442\u043e\u043b\u044c\u043a\u0456 \u043b\u0456\u0442\u0430\u0440\u044b, \u043b\u0456\u0447\u0431\u044b, \u043f\u0440\u0430\u0446\u044f\u0436\u043d\u0456\u043a, \u043a\u0440\u043e\u043f\u043a\u0456, \u0434\u0432\u0443\u043a\u0440\u043e\u043f'\u044f \u0446\u0456 \u043f\u0430\u0434\u043a\u0440\u044d\u0441\u043b\u0456\u0432\u0430\u043d\u043d\u0456.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0432\u0430\u0441 \u0451\u0441\u0446\u044c \u043d\u0435\u0437\u0430\u0445\u0430\u0432\u0430\u043d\u044b\u044f \u0437\u043c\u0435\u043d\u044b. \u0412\u044b \u045e\u043f\u044d\u045e\u043d\u0435\u043d\u044b\u044f, \u0448\u0442\u043e \u0445\u043e\u0447\u0430\u0446\u0435 \u0432\u044b\u0439\u0441\u0446\u0456?",
-"Restore last draft": "\u0410\u0434\u043d\u0430\u045e\u043b\u0435\u043d\u043d\u0435 \u0430\u043f\u043e\u0448\u043d\u044f\u0433\u0430 \u043f\u0440\u0430\u0435\u043a\u0442\u0430",
-"Special character": "\u0421\u043f\u0435\u0446\u044b\u044f\u043b\u044c\u043d\u044b\u044f \u0441\u0456\u043c\u0432\u0430\u043b\u044b",
-"Source code": "\u0417\u044b\u0445\u043e\u0434\u043d\u044b \u043a\u043e\u0434",
-"Insert\/Edit code sample": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u043a\u043e\u0434",
-"Language": "\u041c\u043e\u0432\u0430",
-"Code sample": "\u041f\u0440\u044b\u043a\u043b\u0430\u0434 \u043a\u043e\u0434\u0430",
-"Color": "\u041a\u043e\u043b\u0435\u0440",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0417\u043b\u0435\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u0430",
-"Right to left": "\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0435\u0432\u0430",
-"Emoticons": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043c\u0430\u0439\u043b",
-"Document properties": "\u0423\u043b\u0430\u0441\u0446\u0456\u0432\u0430\u0441\u0446\u0456 \u0434\u0430\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Title": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
-"Keywords": "\u041a\u043b\u044e\u0447\u0430\u0432\u044b\u044f \u0441\u043b\u043e\u0432\u044b",
-"Description": "\u0410\u043f\u0456\u0441\u0430\u043d\u043d\u0435",
-"Robots": "\u0420\u043e\u0431\u0430\u0442\u044b",
-"Author": "\u0410\u045e\u0442\u0430\u0440",
-"Encoding": "\u041a\u0430\u0434\u044b\u0440\u043e\u045e\u043a\u0430",
-"Fullscreen": "\u041f\u043e\u045e\u043d\u0430\u044d\u043a\u0440\u0430\u043d\u043d\u044b \u0440\u044d\u0436\u044b\u043c",
-"Action": "\u0414\u0437\u0435\u044f\u043d\u043d\u0435",
-"Shortcut": "\u0428\u043e\u0440\u0442\u043a\u0430\u0442",
-"Help": "\u0414\u0430\u043f\u0430\u043c\u043e\u0433\u0430",
-"Address": "\u0410\u0434\u0440\u0430\u0441",
-"Focus to menubar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u0440\u0430\u0434\u043e\u043a \u043c\u0435\u043d\u044e",
-"Focus to toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043f\u0430\u043d\u044d\u043b\u044c \u0456\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430\u045e",
-"Focus to element path": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u0448\u043b\u044f\u0445 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430",
-"Focus to contextual toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043a\u0430\u043d\u0442\u044d\u043a\u0441\u0442\u043d\u0443\u044e \u043f\u0430\u043d\u044d\u043b\u044c \u0456\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430\u045e",
-"Insert link (if link plugin activated)": "\u040e\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443 (\u043a\u0430\u043b\u0456 \u043f\u043b\u0430\u0433\u0456\u043d \u0441\u043f\u0430\u0441\u044b\u043b\u0430\u043a \u0430\u043a\u0442\u044b\u0432\u0430\u0432\u0430\u043d\u044b)",
-"Save (if save plugin activated)": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c (\u043a\u0430\u043b\u0456 \u043f\u043b\u0430\u0433\u0456\u043d \u0437\u0430\u0445\u0430\u0432\u0430\u043d\u043d\u044f \u0430\u043a\u0442\u044b\u0432\u0430\u0432\u0430\u043d\u044b)",
-"Find (if searchreplace plugin activated)": "\u0428\u0443\u043a\u0430\u0446\u044c (\u043a\u0430\u043b\u0456 \u043f\u043b\u0430\u0433\u0456\u043d \u043f\u043e\u0448\u0443\u043a\u0443 \u0430\u043a\u0442\u044b\u0432\u0430\u0432\u0430\u043d\u044b)",
-"Plugins installed ({0}):": "\u0423\u0441\u0442\u0430\u043b\u044f\u0432\u0430\u043d\u0430 \u043f\u043b\u0430\u0433\u0456\u043d\u0430\u045e ({0}):",
-"Premium plugins:": "\u041f\u0440\u044d\u043c\u0456\u044f\u043b\u044c\u043d\u044b\u044f \u043f\u043b\u0430\u0433\u0456\u043d\u044b:",
-"Learn more...": "\u041f\u0430\u0434\u0440\u0430\u0431\u044f\u0437\u043d\u0435\u0439 ...",
-"You are using {0}": "\u0412\u044b \u043a\u0430\u0440\u044b\u0441\u0442\u0430\u0435\u0446\u0435\u0441\u044f  {0}",
-"Plugins": "\u041f\u043b\u0430\u0433\u0456\u043d\u044b",
-"Handy Shortcuts": "\u0417\u0440\u0443\u0447\u043d\u044b\u044f \u0448\u043e\u0440\u0442\u043a\u0430\u0442\u044b",
-"Horizontal line": "\u0413\u0430\u0440\u044b\u0437\u0430\u043d\u0442\u0430\u043b\u044c\u043d\u0430\u044f \u043b\u0456\u043d\u0456\u044f",
-"Insert\/edit image": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
-"Image description": "\u0410\u043f\u0456\u0441\u0430\u043d\u043d\u0435 \u0432\u044b\u044f\u0432\u044b",
-"Source": "\u041a\u0440\u044b\u043d\u0456\u0446\u0430",
-"Dimensions": "\u041f\u0430\u043c\u0435\u0440",
-"Constrain proportions": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c \u043f\u0440\u0430\u043f\u043e\u0440\u0446\u044b\u0456",
-"General": "\u0410\u0433\u0443\u043b\u044c\u043d\u0430\u0435",
-"Advanced": "\u041f\u0430\u0448\u044b\u0440\u0430\u043d\u0430\u0435",
-"Style": "\u0421\u0442\u044b\u043b\u044c",
-"Vertical space": "\u0412\u0435\u0440\u0442\u044b\u043a\u0430\u043b\u044c\u043d\u044b \u0456\u043d\u0442\u044d\u0440\u0432\u0430\u043b",
-"Horizontal space": "\u0413\u0430\u0440\u044b\u0437\u0430\u043d\u0442\u0430\u043b\u044c\u043d\u044b \u0456\u043d\u0442\u044d\u0440\u0432\u0430\u043b",
-"Border": "\u041c\u044f\u0436\u0430",
-"Insert image": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
-"Image": "\u0412\u044b\u044f\u0432\u0430",
-"Image list": "\u0421\u043f\u0456\u0441 \u0432\u044b\u044f\u045e",
-"Rotate counterclockwise": "\u041f\u0430\u0432\u044f\u0440\u043d\u0443\u0446\u044c counterclockwise",
-"Rotate clockwise": "\u041f\u0430\u0432\u044f\u0440\u043d\u0443\u0446\u044c clockwise",
-"Flip vertically": "\u0410\u0434\u043b\u044e\u0441\u0442\u0440\u0430\u0432\u0430\u0446\u044c \u0432\u0435\u0440\u0442\u044b\u043a\u0430\u043b\u044c\u043d\u0430",
-"Flip horizontally": "\u0410\u0434\u043b\u044e\u0441\u0442\u0440\u0430\u0432\u0430\u0446\u044c \u0433\u0430\u0440\u044b\u0437\u0430\u043d\u0442\u0430\u043b\u044c\u043d\u0430",
-"Edit image": "\u0420\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
-"Image options": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0432\u044b\u044f\u0432\u044b",
-"Zoom in": "\u041f\u0430\u0432\u044f\u043b\u0456\u0447\u044b\u0446\u044c",
-"Zoom out": "\u041f\u0430\u043c\u0435\u043d\u0448\u044b\u0446\u044c",
-"Crop": "\u0410\u0431\u0440\u044d\u0437\u0430\u0446\u044c",
-"Resize": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c \u043f\u0430\u043c\u0435\u0440",
-"Orientation": "\u0410\u0440\u044b\u0435\u043d\u0442\u0430\u0446\u044b\u044f",
-"Brightness": "\u042f\u0440\u043a\u0430\u0441\u0446\u044c",
-"Sharpen": "\u0412\u044b\u0440\u0430\u0437\u043d\u0430\u0441\u0446\u044c",
-"Contrast": "\u041a\u0430\u043d\u0442\u0440\u0430\u0441\u0442",
-"Color levels": "\u0423\u0437\u0440\u043e\u045e\u043d\u0456 \u043a\u043e\u043b\u0435\u0440\u0430\u045e",
-"Gamma": "\u0413\u0430\u043c\u0430",
-"Invert": "\u0406\u043d\u0432\u0435\u0440\u0442\u0430\u0432\u0430\u0446\u044c",
-"Apply": "\u0423\u0436\u044b\u0446\u044c",
-"Back": "\u041d\u0430\u0437\u0430\u0434",
-"Insert date\/time": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0434\u0430\u0442\u0443\/\u0447\u0430\u0441",
-"Date\/time": "\u0414\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Insert link": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"Insert\/edit link": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"Text to display": "\u0422\u044d\u043a\u0441\u0442 \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0456",
-"Url": "\u0410\u0434\u0440\u0430\u0441 \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0456",
-"Target": "\u0410\u0434\u043a\u0440\u044b\u0432\u0430\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"None": "\u041d\u044f\u043c\u0430",
-"New window": "\u0423 \u043d\u043e\u0432\u044b\u043c \u0430\u043a\u043d\u0435",
-"Remove link": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"Anchors": "\u042f\u043a\u0430\u0440\u044b",
-"Link": "\u0421\u043f\u0430\u0441\u044b\u043b\u043a\u0430",
-"Paste or type a link": "\u0423\u0441\u0442\u0430\u045e\u0446\u0435 \u0430\u0431\u043e \u045e\u0432\u044f\u0434\u0437\u0456\u0446\u0435 \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0423\u0432\u0435\u0434\u0437\u0435\u043d\u044b \u0430\u0434\u0440\u0430\u0441 \u043f\u0430\u0434\u043e\u0431\u043d\u044b \u043d\u0430 \u0430\u0434\u0440\u0430\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u0430\u0439 \u043f\u043e\u0448\u0442\u044b. \u0416\u0430\u0434\u0430\u0435\u0446\u0435 \u0434\u0430\u0434\u0430\u0446\u044c \u043d\u0435\u0430\u0431\u0445\u043e\u0434\u043d\u044b mailto: \u043f\u0440\u044d\u0444\u0456\u043a\u0441?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0423\u0432\u0435\u0434\u0437\u0435\u043d\u044b \u0430\u0434\u0440\u0430\u0441 \u043f\u0430\u0434\u043e\u0431\u043d\u044b \u043d\u0430 \u0437\u043d\u0435\u0448\u043d\u044e\u044e \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443. \u0416\u0430\u0434\u0430\u0435\u0446\u0435 \u0434\u0430\u0434\u0430\u0446\u044c \u043d\u0435\u0430\u0431\u0445\u043e\u0434\u043d\u044b http:\/\/ \u043f\u0440\u044d\u0444\u0456\u043a\u0441?",
-"Link list": "\u0421\u043f\u0456\u0441 \u0441\u043f\u0430\u0441\u044b\u043b\u0430\u043a",
-"Insert video": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0432\u0456\u0434\u044d\u0430",
-"Insert\/edit video": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0432\u0456\u0434\u044d\u0430",
-"Insert\/edit media": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u043c\u0435\u0434\u044b\u044f",
-"Alternative source": "\u0410\u043b\u044c\u0442\u044d\u0440\u043d\u0430\u0442\u044b\u045e\u043d\u0430\u044f \u043a\u0440\u044b\u043d\u0456\u0446\u0430",
-"Poster": "\u0412\u044b\u044f\u0432\u0430",
-"Paste your embed code below:": "\u0423\u0441\u0442\u0430\u045e\u0446\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0456\u0436\u044d\u0439:",
-"Embed": "\u041a\u043e\u0434 \u0434\u043b\u044f \u045e\u0441\u0442\u0430\u045e\u043a\u0456",
-"Media": "\u041c\u0435\u0434\u044b\u044f",
-"Nonbreaking space": "\u041d\u0435\u043f\u0430\u0440\u044b\u045e\u043d\u044b \u043f\u0440\u0430\u0431\u0435\u043b",
-"Page break": "\u0420\u0430\u0437\u0440\u044b\u045e \u0441\u0442\u0430\u0440\u043e\u043d\u043a\u0456",
-"Paste as text": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u044f\u043a \u0442\u044d\u043a\u0441\u0442",
-"Preview": "\u041f\u0440\u0430\u0434\u043f\u0440\u0430\u0433\u043b\u044f\u0434",
-"Print": "\u0414\u0440\u0443\u043a",
-"Save": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c",
-"Find": "\u0417\u043d\u0430\u0439\u0441\u0446\u0456",
-"Replace with": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c \u043d\u0430",
-"Replace": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c",
-"Replace all": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c \u0443\u0441\u0435",
-"Prev": "\u0423\u0432\u0435\u0440\u0445",
-"Next": "\u0423\u043d\u0456\u0437",
-"Find and replace": "\u041f\u043e\u0448\u0443\u043a \u0456 \u0437\u0430\u043c\u0435\u043d\u0430",
-"Could not find the specified string.": "\u0417\u0430\u0434\u0430\u0434\u0437\u0435\u043d\u044b \u0440\u0430\u0434\u043e\u043a \u043d\u0435 \u0437\u043d\u043e\u0439\u0434\u0437\u0435\u043d\u044b",
-"Match case": "\u0423\u043b\u0456\u0447\u0432\u0430\u0446\u044c \u0440\u044d\u0433\u0456\u0441\u0442\u0440",
-"Whole words": "\u0421\u043b\u043e\u0432\u044b \u0446\u0430\u043b\u043a\u0430\u043c",
-"Spellcheck": "\u041f\u0440\u0430\u0432\u0435\u0440\u043a\u0430 \u043f\u0440\u0430\u0432\u0430\u043f\u0456\u0441\u0443",
-"Ignore": "\u0406\u0433\u043d\u0430\u0440\u0430\u0432\u0430\u0446\u044c",
-"Ignore all": "\u0406\u0433\u043d\u0430\u0440\u0430\u0432\u0430\u0446\u044c \u0443\u0441\u0435",
-"Finish": "\u0421\u043a\u043e\u043d\u0447\u044b\u0446\u044c",
-"Add to Dictionary": "\u0414\u0430\u0434\u0430\u0446\u044c \u0443 \u0441\u043b\u043e\u045e\u043d\u0456\u043a",
-"Insert table": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0442\u0430\u0431\u043b\u0456\u0446\u0443",
-"Table properties": "\u0423\u043b\u0430\u0441\u0446\u0456\u0432\u0430\u0441\u0446\u0456 \u0442\u0430\u0431\u043b\u0456\u0446\u044b",
-"Delete table": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0442\u0430\u0431\u043b\u0456\u0446\u0443",
-"Cell": "\u042f\u0447\u044d\u0439\u043a\u0430",
-"Row": "\u0420\u0430\u0434\u043e\u043a",
-"Column": "\u0421\u043b\u0443\u043f\u043e\u043a",
-"Cell properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u044f\u0447\u044d\u0439\u043a\u0456",
-"Merge cells": "\u0410\u0431'\u044f\u0434\u043d\u0430\u0446\u044c \u044f\u0447\u044d\u0439\u043a\u0456",
-"Split cell": "\u0420\u0430\u0437\u0431\u0456\u0446\u044c \u044f\u0447\u044d\u0439\u043a\u0443",
-"Insert row before": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
-"Insert row after": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u043d\u0456\u0437\u0443",
-"Delete row": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
-"Row properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0440\u0430\u0434\u043a\u0430",
-"Cut row": "\u0412\u044b\u0440\u0430\u0437\u0430\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
-"Copy row": "\u041a\u0430\u043f\u0456\u044f\u0432\u0430\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
-"Paste row before": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
-"Paste row after": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u043d\u0456\u0437\u0443",
-"Insert column before": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a \u0437\u043b\u0435\u0432\u0430",
-"Insert column after": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a \u0441\u043f\u0440\u0430\u0432\u0430",
-"Delete column": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a",
-"Cols": "\u0421\u043b\u0443\u043f\u043a\u0456",
-"Rows": "\u0420\u0430\u0434\u043a\u0456",
-"Width": "\u0428\u044b\u0440\u044b\u043d\u044f",
-"Height": "\u0412\u044b\u0448\u044b\u043d\u044f",
-"Cell spacing": "\u0417\u043d\u0435\u0448\u043d\u0456 \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
-"Cell padding": "\u0423\u043d\u0443\u0442\u0440\u0430\u043d\u044b \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
-"Caption": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
-"Left": "\u041f\u0430 \u043b\u0435\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
-"Center": "\u041f\u0430 \u0446\u044d\u043d\u0442\u0440\u044b",
-"Right": "\u041f\u0430 \u043f\u0440\u0430\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
-"Cell type": "\u0422\u044b\u043f \u044f\u0447\u044d\u0439\u043a\u0456",
-"Scope": "\u0421\u0444\u0435\u0440\u0430",
-"Alignment": "\u0412\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
-"H Align": "\u0413\u0430\u0440. \u0432\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
-"V Align": "\u0412\u0435\u0440. \u0432\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
-"Top": "\u0412\u0435\u0440\u0445",
-"Middle": "\u0421\u044f\u0440\u044d\u0434\u0437\u0456\u043d\u0430",
-"Bottom": "\u041d\u0456\u0437",
-"Header cell": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
-"Row group": "\u0413\u0440\u0443\u043f\u0430 \u0440\u0430\u0434\u043a\u043e\u045e",
-"Column group": "\u0413\u0440\u0443\u043f\u0430 \u0441\u043b\u0443\u043f\u043a\u043e\u045e",
-"Row type": "\u0422\u044b\u043f \u0440\u0430\u0434\u043a\u0430",
-"Header": "\u0428\u0430\u043f\u043a\u0430",
-"Body": "\u0426\u0435\u043b\u0430",
-"Footer": "\u041d\u0456\u0437",
-"Border color": "\u041a\u043e\u043b\u0435\u0440 \u043c\u044f\u0436\u044b",
-"Insert template": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0448\u0430\u0431\u043b\u043e\u043d",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u044b",
-"Template": "\u0428\u0430\u0431\u043b\u043e\u043d",
-"Text color": "\u041a\u043e\u043b\u0435\u0440 \u0442\u044d\u043a\u0441\u0442\u0443",
-"Background color": "\u041a\u043e\u043b\u0435\u0440 \u0444\u043e\u043d\u0443",
-"Custom...": "\u041a\u0430\u0440\u044b\u0441\u0442\u0430\u0446\u043a\u0456...",
-"Custom color": "\u041a\u0430\u0440\u044b\u0441\u0442\u0430\u0446\u043a\u0456 \u043a\u043e\u043b\u0435\u0440",
-"No color": "\u0411\u0435\u0437 \u043a\u043e\u043b\u0435\u0440\u0443",
-"Table of Contents": "\u0422\u0430\u0431\u043b\u0456\u0446\u0443 \u0437\u043c\u0435\u0441\u0442\u0443",
-"Show blocks": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u0431\u043b\u043e\u043a\u0456",
-"Show invisible characters": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u043d\u044f\u0431\u0430\u0447\u043d\u044b\u044f \u0441\u0456\u043c\u0432\u0430\u043b\u044b",
-"Words: {0}": "\u041a\u043e\u043b\u044c\u043a\u0430\u0441\u0446\u044c \u0441\u043b\u043e\u045e: {0}",
-"{0} words": "{0} \u0441\u043b\u043e\u045e",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c",
-"Insert": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c",
-"View": "\u0412\u044b\u0433\u043b\u044f\u0434",
-"Format": "\u0424\u0430\u0440\u043c\u0430\u0442",
-"Table": "\u0422\u0430\u0431\u043b\u0456\u0446\u0430",
-"Tools": "\u041f\u0440\u044b\u043b\u0430\u0434\u044b",
-"Powered by {0}": "\u041f\u0440\u0430\u0446\u0443\u0435 \u043d\u0430 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0422\u044d\u043a\u0441\u0442\u0430\u0432\u0430\u0435 \u043f\u043e\u043b\u0435. \u041d\u0430\u0446\u0456\u0441\u043d\u0456\u0446\u0435 ALT-F9, \u043a\u0430\u0431 \u0432\u044b\u043a\u043b\u0456\u043a\u0430\u0446\u044c \u043c\u0435\u043d\u044e, ALT-F10 - \u043f\u0430\u043d\u044d\u043b\u044c \u043f\u0440\u044b\u043b\u0430\u0434\u0430\u045e, ALT-0 - \u0434\u043b\u044f \u0432\u044b\u043a\u043b\u0456\u043a\u0443 \u0434\u0430\u043f\u0430\u043c\u043e\u0433\u0456."
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/bg_BG.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/bg_BG.js
deleted file mode 100644
index 9ef72576a2..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/bg_BG.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('bg_BG',{
-"Redo": "\u041e\u0442\u043c\u0435\u043d\u0438",
-"Undo": "\u0412\u044a\u0440\u043d\u0438",
-"Cut": "\u0418\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435",
-"Copy": "\u041a\u043e\u043f\u0438\u0440\u0430\u043d\u0435",
-"Paste": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435",
-"Select all": "\u041c\u0430\u0440\u043a\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0446\u044f\u043b\u043e\u0442\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435",
-"New document": "\u041d\u043e\u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Ok": "\u0414\u043e\u0431\u0440\u0435",
-"Cancel": "\u041e\u0442\u043a\u0430\u0437",
-"Visual aids": "\u0412\u0438\u0437\u0443\u0430\u043b\u043d\u043e \u043e\u0442\u043a\u0440\u043e\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0438 \u0431\u0435\u0437 \u043a\u0430\u043d\u0442\u043e\u0432\u0435 (\u0440\u0430\u043c\u043a\u0438)",
-"Bold": "\u0423\u0434\u0435\u0431\u0435\u043b\u0435\u043d (\u043f\u043e\u043b\u0443\u0447\u0435\u0440)",
-"Italic": "\u041d\u0430\u043a\u043b\u043e\u043d\u0435\u043d (\u043a\u0443\u0440\u0441\u0438\u0432)",
-"Underline": "\u041f\u043e\u0434\u0447\u0435\u0440\u0442\u0430\u043d",
-"Strikethrough": "\u0417\u0430\u0447\u0435\u0440\u0442\u0430\u0432\u0430\u043d\u0435",
-"Superscript": "\u0413\u043e\u0440\u0435\u043d \u0438\u043d\u0434\u0435\u043a\u0441",
-"Subscript": "\u0414\u043e\u043b\u0435\u043d \u0438\u043d\u0434\u0435\u043a\u0441",
-"Clear formatting": "\u0418\u0437\u0447\u0438\u0441\u0442\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435\u0442\u043e",
-"Align left": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435 \u043e\u0442\u043b\u044f\u0432\u043e",
-"Align center": "\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u0430\u043d\u043e",
-"Align right": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435 \u043e\u0442\u0434\u044f\u0441\u043d\u043e",
-"Justify": "\u0414\u0432\u0443\u0441\u0442\u0440\u0430\u043d\u043d\u043e \u043f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"Bullet list": "\u0421\u043f\u0438\u0441\u044a\u043a \u0441 \u0432\u043e\u0434\u0430\u0447\u0438",
-"Numbered list": "\u041d\u043e\u043c\u0435\u0440\u0438\u0440\u0430\u043d \u0441\u043f\u0438\u0441\u044a\u043a",
-"Decrease indent": "\u041d\u0430\u043c\u0430\u043b\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u0442\u0441\u0442\u044a\u043f\u0430",
-"Increase indent": "\u0423\u0432\u0435\u043b\u0438\u0447\u0430\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u0442\u0441\u0442\u044a\u043f\u0430",
-"Close": "\u0417\u0430\u0442\u0432\u0430\u0440\u044f\u043d\u0435",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448\u0438\u044f\u0442 \u0431\u0440\u0430\u0443\u0437\u044a\u0440 \u043d\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u0435\u043d \u0434\u043e\u0441\u0442\u044a\u043f \u0434\u043e \u043a\u043b\u0438\u043f\u0431\u043e\u0440\u0434\u0430. \u0412\u043c\u0435\u0441\u0442\u043e \u0442\u043e\u0432\u0430 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439\u0442\u0435 \u043a\u043b\u0430\u0432\u0438\u0448\u043d\u0438\u0442\u0435 \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u0438 Ctrl+X (\u0437\u0430 \u0438\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435), Ctrl+C (\u0437\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435) \u0438 Ctrl+V (\u0437\u0430 \u043f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435).",
-"Headers": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u044f",
-"Header 1": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 1",
-"Header 2": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 2",
-"Header 3": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 3",
-"Header 4": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 4",
-"Header 5": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 5",
-"Header 6": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 6",
-"Headings": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u044f",
-"Heading 1": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 1",
-"Heading 2": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 2",
-"Heading 3": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 3",
-"Heading 4": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 4",
-"Heading 5": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 5",
-"Heading 6": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 6",
-"Preformatted": "\u041f\u0440\u0435\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d",
-"Div": "\u0411\u043b\u043e\u043a",
-"Pre": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u043d\u043e \u043e\u0444\u043e\u0440\u043c\u0435\u043d \u0442\u0435\u043a\u0441\u0442",
-"Code": "\u041a\u043e\u0434",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Blockquote": "\u0426\u0438\u0442\u0430\u0442",
-"Inline": "\u041d\u0430 \u0435\u0434\u0438\u043d \u0440\u0435\u0434",
-"Blocks": "\u0411\u043b\u043e\u043a\u043e\u0432\u0435",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435\u0442\u043e \u0432 \u043c\u043e\u043c\u0435\u043d\u0442\u0430 \u0435 \u0432 \u043e\u0431\u0438\u043a\u043d\u043e\u0432\u0435\u043d \u0440\u0435\u0436\u0438\u043c. \u0421\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435\u0442\u043e \u0449\u0435 \u0431\u044a\u0434\u0435 \u043f\u043e\u0441\u0442\u0430\u0432\u0435\u043d\u043e \u043a\u0430\u0442\u043e \u043d\u0435\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d \u0442\u0435\u043a\u0441\u0442, \u0434\u043e\u043a\u0430\u0442\u043e \u0438\u0437\u043a\u043b\u044e\u0447\u0438\u0442\u0435 \u0442\u0430\u0437\u0438 \u043e\u043f\u0446\u0438\u044f.",
-"Font Family": "\u0428\u0440\u0438\u0444\u0442",
-"Font Sizes": "\u0420\u0430\u0437\u043c\u0435\u0440 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430",
-"Class": "\u041a\u043b\u0430\u0441",
-"Browse for an image": "\u041f\u043e\u0442\u044a\u0440\u0441\u0438 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0430",
-"OR": "\u0418\u041b\u0418",
-"Drop an image here": "\u041f\u0443\u0441\u043d\u0435\u0442\u0435 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0430\u0442\u0430 \u0442\u0443\u043a",
-"Upload": "\u041a\u0430\u0447\u0438",
-"Block": "\u0411\u043b\u043e\u043a",
-"Align": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"Default": "\u041f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435",
-"Circle": "\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442\u0438",
-"Disc": "\u041a\u0440\u044a\u0433\u0447\u0435\u0442\u0430",
-"Square": "\u0417\u0430\u043f\u044a\u043b\u043d\u0435\u043d\u0438 \u043a\u0432\u0430\u0434\u0440\u0430\u0442\u0438",
-"Lower Alpha": "\u041c\u0430\u043b\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Lower Greek": "\u041c\u0430\u043b\u043a\u0438 \u0433\u0440\u044a\u0446\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Lower Roman": "\u0420\u0438\u043c\u0441\u043a\u0438 \u0447\u0438\u0441\u043b\u0430 \u0441 \u043c\u0430\u043b\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Upper Alpha": "\u0413\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Upper Roman": "\u0420\u0438\u043c\u0441\u043a\u0438 \u0447\u0438\u0441\u043b\u0430 \u0441 \u0433\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Anchor": "\u041a\u043e\u0442\u0432\u0430 (\u0432\u0440\u044a\u0437\u043a\u0430 \u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430)",
-"Name": "\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435",
-"Id": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 (id)",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u0430 (id) \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0437\u0430\u043f\u043e\u0447\u0432\u0430 \u0441 \u0431\u0443\u043a\u0432\u0430, \u043f\u043e\u0441\u043b\u0435\u0434\u0432\u0430\u043d \u043e\u0442 \u0431\u0443\u043a\u0432\u0438, \u0447\u0438\u0444\u0440\u0438, \u0442\u0438\u0440\u0435\u0442\u0430, \u0442\u043e\u0447\u043a\u0438, \u0434\u0432\u043e\u0435\u0442\u043e\u0447\u0438\u0435 \u0438 \u0434\u043e\u043b\u043d\u043e \u0442\u0438\u0440\u0435.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0412 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0438\u043c\u0430 \u043d\u0435\u0437\u0430\u043f\u0430\u0437\u0435\u043d\u0438 \u043f\u0440\u043e\u043c\u0435\u043d\u0438. \u0429\u0435 \u043f\u0440\u043e\u0434\u044a\u043b\u0436\u0438\u0442\u0435 \u043b\u0438?",
-"Restore last draft": "\u0412\u044a\u0437\u0441\u0442\u0430\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0430\u0442\u0430 \u0447\u0435\u0440\u043d\u043e\u0432\u0430",
-"Special character": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u0435\u043d \u0437\u043d\u0430\u043a",
-"Source code": "\u0418\u0437\u0445\u043e\u0434\u0435\u043d \u043a\u043e\u0434 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0432 HTML",
-"Insert\/Edit code sample": "\u0412\u043c\u044a\u043a\u043d\u0438\/ \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u0439 \u043f\u0440\u0438\u043c\u0435\u0440\u0435\u043d \u043a\u043e\u0434",
-"Language": "\u0415\u0437\u0438\u043a",
-"Code sample": "\u041f\u0440\u0438\u043c\u0435\u0440\u0435\u043d \u043a\u043e\u0434",
-"Color": "\u0426\u0432\u044f\u0442",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u041e\u0442\u043b\u044f\u0432\u043e \u043d\u0430\u0434\u044f\u0441\u043d\u043e",
-"Right to left": "\u041e\u0442\u0434\u044f\u0441\u043d\u043e \u043d\u0430\u043b\u044f\u0432\u043e",
-"Emoticons": "\u0415\u043c\u043e\u0442\u0438\u043a\u043e\u043d\u0438",
-"Document properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Title": "\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435",
-"Keywords": "\u041a\u043b\u044e\u0447\u043e\u0432\u0438 \u0434\u0443\u043c\u0438",
-"Description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438 \u043d\u0430 \u0443\u0435\u0431 \u0442\u044a\u0440\u0441\u0430\u0447\u043a\u0438",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Encoding": "\u041a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0437\u043d\u0430\u0446\u0438\u0442\u0435",
-"Fullscreen": "\u041d\u0430 \u0446\u044f\u043b \u0435\u043a\u0440\u0430\u043d",
-"Action": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435",
-"Shortcut": "\u0411\u044a\u0440\u0437 \u043a\u043b\u0430\u0432\u0438\u0448",
-"Help": "\u041f\u043e\u043c\u043e\u0449",
-"Address": "\u0410\u0434\u0440\u0435\u0441",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "\u041f\u043e\u0441\u0442\u0430\u0432\u0438 \u0432\u0440\u044a\u0437\u043a\u0430 (\u0430\u043a\u043e \u043f\u043b\u044a\u0433\u0438\u043d\u0430 \u0437\u0430 \u0432\u0440\u044a\u0437\u043a\u0438 \u0435 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u0430\u043d)",
-"Save (if save plugin activated)": "\u0417\u0430\u043f\u0438\u0448\u0438 (\u0430\u043a\u043e \u043f\u043b\u044a\u0433\u0438\u043d\u0430 \u0437\u0430 \u0437\u0430\u043f\u0438\u0441 \u0435 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u0430\u043d)",
-"Find (if searchreplace plugin activated)": "\u041d\u0430\u043c\u0435\u0440\u0438 (\u0430\u043a\u043e \u043f\u043b\u044a\u0433\u0438\u043d\u0430 \u0437\u0430 \u0442\u044a\u0440\u0441\u0435\u043d\u0435\/\u0437\u0430\u043c\u044f\u043d\u0430 \u0435 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u0430\u043d)",
-"Plugins installed ({0}):": "\u0418\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0438 \u043f\u043b\u044a\u0433\u0438\u043d\u0438 ({0}):",
-"Premium plugins:": "\u041f\u0440\u0435\u043c\u0438\u0439\u043d\u0438 \u043f\u043b\u044a\u0433\u0438\u043d\u0438:",
-"Learn more...": "\u041d\u0430\u0443\u0447\u0435\u0442\u0435 \u043f\u043e\u0432\u0435\u0447\u0435...",
-"You are using {0}": "\u0418\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0442\u0435 {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Handy Shortcuts",
-"Horizontal line": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u0430 \u0447\u0435\u0440\u0442\u0430",
-"Insert\/edit image": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0430",
-"Image description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
-"Source": "\u0410\u0434\u0440\u0435\u0441",
-"Dimensions": "\u0420\u0430\u0437\u043c\u0435\u0440",
-"Constrain proportions": "\u0417\u0430\u0432\u0430\u0437\u043d\u0430\u0432\u0435 \u043d\u0430 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438\u0442\u0435",
-"General": "\u041e\u0431\u0449\u043e",
-"Advanced": "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u043e",
-"Style": "\u0421\u0442\u0438\u043b",
-"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e",
-"Horizontal space": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e",
-"Border": "\u041a\u0430\u043d\u0442 (\u0440\u0430\u043c\u043a\u0430)",
-"Insert image": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"Image": "\u041a\u0430\u0440\u0442\u0438\u043d\u043a\u0430",
-"Image list": "\u0421\u043f\u0438\u0441\u044a\u043a \u0441 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438",
-"Rotate counterclockwise": "\u0417\u0430\u0432\u044a\u0440\u0442\u0430\u043d\u0435 \u043e\u0431\u0440\u0430\u0442\u043d\u043e \u043d\u0430 \u0447\u0430\u0441\u043e\u0432\u043d\u0438\u043a\u0430",
-"Rotate clockwise": "\u0417\u0430\u0432\u044a\u0440\u0442\u0430\u043d\u0435 \u043f\u043e \u0447\u0430\u0441\u043e\u0432\u043d\u0438\u043a\u0430",
-"Flip vertically": "\u041e\u0431\u044a\u0440\u043d\u0438 \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e",
-"Flip horizontally": "\u041e\u0431\u044a\u0440\u043d\u0438 \u0445\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e",
-"Edit image": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
-"Image options": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
-"Zoom in": "\u041f\u0440\u0438\u0431\u043b\u0438\u0436\u0438",
-"Zoom out": "\u041e\u0442\u0434\u0430\u043b\u0435\u0447\u0438",
-"Crop": "\u0418\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435",
-"Resize": "\u041f\u0440\u0435\u043e\u0440\u0430\u0437\u043c\u0435\u0440\u044f\u0432\u0430\u043d\u0435",
-"Orientation": "\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f",
-"Brightness": "\u042f\u0440\u043a\u043e\u0441\u0442",
-"Sharpen": "\u0418\u0437\u043e\u0441\u0442\u0440\u044f\u043d\u0435",
-"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
-"Color levels": "\u0426\u0432\u0435\u0442\u043d\u0438 \u043d\u0438\u0432\u0430",
-"Gamma": "\u0413\u0430\u043c\u0430",
-"Invert": "\u0418\u043d\u0432\u0435\u0440\u0441\u0438\u044f",
-"Apply": "\u041f\u0440\u0438\u043b\u043e\u0436\u0438",
-"Back": "\u041d\u0430\u0437\u0430\u0434",
-"Insert date\/time": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0434\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Date\/time": "\u0414\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Insert link": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 (\u043b\u0438\u043d\u043a)",
-"Insert\/edit link": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 (\u043b\u0438\u043d\u043a)",
-"Text to display": "\u0422\u0435\u043a\u0441\u0442",
-"Url": "\u0410\u0434\u0440\u0435\u0441 (URL)",
-"Target": "\u0426\u0435\u043b \u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"None": "\u0411\u0435\u0437",
-"New window": "\u0412 \u043d\u043e\u0432 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446 (\u043f\u043e\u0434\u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446)",
-"Remove link": "\u041f\u0440\u0435\u043c\u0430\u0445\u0432\u0430\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430",
-"Anchors": "\u041a\u043e\u0442\u0432\u0438",
-"Link": "\u0412\u0440\u044a\u0437\u043a\u0430(\u043b\u0438\u043d\u043a)",
-"Paste or type a link": "\u041f\u043e\u0441\u0442\u0430\u0432\u0435\u0442\u0435 \u0438\u043b\u0438 \u043d\u0430\u043f\u0438\u0448\u0435\u0442\u0435 \u0432\u0440\u044a\u0437\u043a\u0430(\u043b\u0438\u043d\u043a)",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL \u0430\u0434\u0440\u0435\u0441\u044a\u0442, \u043a\u043e\u0439\u0442\u043e \u0432\u044a\u0432\u0434\u043e\u0445\u0442\u0435 \u043f\u0440\u0438\u043b\u0438\u0447\u0430 \u043d\u0430 \u0435-\u043c\u0435\u0439\u043b \u0430\u0434\u0440\u0435\u0441. \u0418\u0441\u043a\u0430\u0442\u0435 \u043b\u0438 \u0434\u0430 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0438\u044f mailto: \u043f\u0440\u0435\u0444\u0438\u043a\u0441?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL \u0430\u0434\u0440\u0435\u0441\u044a\u0442, \u043a\u043e\u0439\u0442\u043e \u0432\u044a\u0432\u0434\u043e\u0445\u0442\u0435 \u043f\u0440\u0438\u043b\u0438\u0447\u0430 \u0432\u044a\u043d\u0448\u0435\u043d \u0430\u0434\u0440\u0435\u0441. \u0418\u0441\u043a\u0430\u0442\u0435 \u043b\u0438 \u0434\u0430 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0438\u044f http:\/\/ \u043f\u0440\u0435\u0444\u0438\u043a\u0441?",
-"Link list": "\u0421\u043f\u0438\u0441\u044a\u043a \u0441 \u0432\u0440\u044a\u0437\u043a\u0438",
-"Insert video": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0432\u0438\u0434\u0435\u043e",
-"Insert\/edit video": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u0432\u0438\u0434\u0435\u043e",
-"Insert\/edit media": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043c\u0435\u0434\u0438\u044f",
-"Alternative source": "\u0410\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0435\u043d \u0430\u0434\u0440\u0435\u0441",
-"Poster": "\u041f\u043e\u0441\u0442\u0435\u0440",
-"Paste your embed code below:": "\u041f\u043e\u0441\u0442\u0430\u0432\u0435\u0442\u0435 \u043a\u043e\u0434\u0430 \u0437\u0430 \u0432\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435 \u0432 \u043f\u043e\u043b\u0435\u0442\u043e \u043f\u043e-\u0434\u043e\u043b\u0443:",
-"Embed": "\u0412\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435",
-"Media": "\u041c\u0435\u0434\u0438\u044f",
-"Nonbreaking space": "\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Page break": "\u041d\u043e\u0432\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430",
-"Paste as text": "\u041f\u043e\u0441\u0442\u0430\u0432\u0438 \u043a\u0430\u0442\u043e \u0442\u0435\u043a\u0441\u0442",
-"Preview": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u0435\u043d \u0438\u0437\u0433\u043b\u0435\u0434",
-"Print": "\u041f\u0435\u0447\u0430\u0442",
-"Save": "\u0421\u044a\u0445\u0440\u0430\u043d\u044f\u0432\u0430\u043d\u0435",
-"Find": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435 \u0437\u0430",
-"Replace with": "\u0417\u0430\u043c\u044f\u043d\u0430 \u0441",
-"Replace": "\u0417\u0430\u043c\u044f\u043d\u0430",
-"Replace all": "\u0417\u0430\u043c\u044f\u043d\u0430 \u043d\u0430 \u0432\u0441\u0438\u0447\u043a\u0438 \u0441\u0440\u0435\u0449\u0430\u043d\u0438\u044f",
-"Prev": "\u041f\u0440\u0435\u0434\u0438\u0448\u0435\u043d",
-"Next": "\u0421\u043b\u0435\u0434\u0432\u0430\u0449",
-"Find and replace": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435 \u0438 \u0437\u0430\u043c\u044f\u043d\u0430",
-"Could not find the specified string.": "\u0422\u044a\u0440\u0441\u0435\u043d\u0438\u044f\u0442 \u0442\u0435\u043a\u0441\u0442 \u043d\u0435 \u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d.",
-"Match case": "\u0421\u044a\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435 \u043d\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u044a\u0440\u0430 (\u043c\u0430\u043b\u043a\u0438\/\u0433\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438)",
-"Whole words": "\u0421\u0430\u043c\u043e \u0446\u0435\u043b\u0438 \u0434\u0443\u043c\u0438",
-"Spellcheck": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043d\u0430 \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430",
-"Ignore": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u043d\u0435",
-"Ignore all": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0432\u0441\u0438\u0447\u043a\u043e",
-"Finish": "\u041a\u0440\u0430\u0439",
-"Add to Dictionary": "\u0414\u043e\u0431\u0430\u0432\u0438 \u0432 \u0440\u0435\u0447\u043d\u0438\u043a\u0430",
-"Insert table": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430",
-"Table properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
-"Delete table": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
-"Cell": "\u041a\u043b\u0435\u0442\u043a\u0430",
-"Row": "\u0420\u0435\u0434",
-"Column": "\u041a\u043e\u043b\u043e\u043d\u0430",
-"Cell properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430\u0442\u0430",
-"Merge cells": "\u0421\u043b\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435",
-"Split cell": "\u0420\u0430\u0437\u0434\u0435\u043b\u044f\u043d\u0435 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430",
-"Insert row before": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434\u0438",
-"Insert row after": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u0441\u043b\u0435\u0434",
-"Delete row": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434\u0430",
-"Row properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0440\u0435\u0434\u0430",
-"Cut row": "\u0418\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434",
-"Copy row": "\u041a\u043e\u043f\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434",
-"Paste row before": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434\u0438",
-"Paste row after": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u0441\u043b\u0435\u0434",
-"Insert column before": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u043f\u0440\u0435\u0434\u0438",
-"Insert column after": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u0441\u043b\u0435\u0434",
-"Delete column": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430\u0442\u0430",
-"Cols": "\u041a\u043e\u043b\u043e\u043d\u0438",
-"Rows": "\u0420\u0435\u0434\u043e\u0432\u0435",
-"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
-"Height": "\u0412\u0438\u0441\u043e\u0447\u0438\u043d\u0430",
-"Cell spacing": "\u0420\u0430\u0437\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u043c\u0435\u0436\u0434\u0443 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435",
-"Cell padding": "\u0420\u0430\u0437\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u0434\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435\u0442\u043e",
-"Caption": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0437\u0430\u0433\u043b\u0430\u0432\u0438\u0435 \u043f\u0440\u0435\u0434\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
-"Left": "\u041b\u044f\u0432\u043e",
-"Center": "\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u0430\u043d\u043e",
-"Right": "\u0414\u044f\u0441\u043d\u043e",
-"Cell type": "\u0422\u0438\u043f \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430\u0442\u0430",
-"Scope": "\u041e\u0431\u0445\u0432\u0430\u0442",
-"Alignment": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"H Align": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e \u043f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e \u043f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"Top": "\u0413\u043e\u0440\u0435",
-"Middle": "\u041f\u043e \u0441\u0440\u0435\u0434\u0430\u0442\u0430",
-"Bottom": "\u0414\u043e\u043b\u0443",
-"Header cell": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430 (\u0430\u043d\u0442\u0435\u0442\u043a\u0430)",
-"Row group": "Row group",
-"Column group": "Column group",
-"Row type": "\u0422\u0438\u043f \u043d\u0430 \u0440\u0435\u0434\u0430",
-"Header": "\u0413\u043e\u0440\u0435\u043d \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b (header)",
-"Body": "\u0421\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435 (body)",
-"Footer": "\u0414\u043e\u043b\u0435\u043d \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b (footer)",
-"Border color": "\u0426\u0432\u044f\u0442 \u043d\u0430 \u0440\u0430\u043c\u043a\u0430\u0442\u0430",
-"Insert template": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0448\u0430\u0431\u043b\u043e\u043d",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
-"Template": "\u0428\u0430\u0431\u043b\u043e\u043d",
-"Text color": "\u0426\u0432\u044f\u0442 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430",
-"Background color": "\u0424\u043e\u043d\u043e\u0432 \u0446\u0432\u044f\u0442",
-"Custom...": "\u0418\u0437\u0431\u0440\u0430\u043d...",
-"Custom color": "\u0426\u0432\u044f\u0442 \u043f\u043e \u0438\u0437\u0431\u043e\u0440",
-"No color": "\u0411\u0435\u0437 \u0446\u0432\u044f\u0442",
-"Table of Contents": "\u0421\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435",
-"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0431\u043b\u043e\u043a\u043e\u0432\u0435\u0442\u0435",
-"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u043d\u0435\u043f\u0435\u0447\u0430\u0442\u0430\u0435\u043c\u0438 \u0437\u043d\u0430\u0446\u0438",
-"Words: {0}": "\u0411\u0440\u043e\u0439 \u0434\u0443\u043c\u0438: {0}",
-"{0} words": "{0} \u0431\u0440\u043e\u0439 \u0434\u0443\u043c\u0438",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u043d\u0435",
-"Insert": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435",
-"View": "\u0418\u0437\u0433\u043b\u0435\u0434",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435",
-"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430",
-"Tools": "\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438",
-"Powered by {0}": "\u0421\u044a\u0437\u0434\u0430\u0434\u0435\u043d\u043e \u0441 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u041f\u043e\u043b\u0435 \u0437\u0430 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d \u0442\u0435\u043a\u0441\u0442. \u041d\u0430\u0442\u0438\u0441\u043d\u0435\u0442\u0435 Alt+F9 \u0437\u0430 \u043c\u0435\u043d\u044e; Alt+F10 \u0437\u0430 \u043b\u0435\u043d\u0442\u0430 \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438; Alt+0 \u0437\u0430 \u043f\u043e\u043c\u043e\u0449."
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/bn_BD.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/bn_BD.js
deleted file mode 100644
index 0ce5a29140..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/bn_BD.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('bn_BD',{
-"Redo": "\u09aa\u09c1\u09a8\u09b0\u09be\u09af\u09bc \u0995\u09b0\u09c1\u09a8",
-"Undo": "\u09aa\u09c2\u09b0\u09cd\u09ac\u09be\u09ac\u09b8\u09cd\u09a5\u09be\u09af\u09bc \u09ab\u09bf\u09b0\u09c1\u09a8",
-"Cut": "\u0995\u09b0\u09cd\u09a4\u09a8",
-"Copy": "\u0985\u09a8\u09c1\u0995\u09b0\u09a3",
-"Paste": "\u09aa\u09cd\u09b0\u09a4\u09bf\u09b2\u09c7\u09aa\u09a8 \u0995\u09b0\u09c1\u09a8",
-"Select all": "\u09b8\u09ac \u09a8\u09bf\u09b0\u09cd\u09ac\u09be\u099a\u09a8 \u0995\u09b0\u09c1\u09a8",
-"New document": "\u09a8\u09a4\u09c1\u09a8 \u09a6\u09b8\u09cd\u09a4\u09be\u09ac\u09c7\u099c",
-"Ok": "\u09a0\u09bf\u0995 \u0986\u099b\u09c7",
-"Cancel": "\u09ac\u09be\u09a4\u09bf\u09b2",
-"Visual aids": "\u09ac\u09cd\u09af\u09be\u0996\u09cd\u09af\u09be\u09ae\u09c2\u09b2\u0995 \u09b8\u09be\u09b9\u09be\u09af\u09cd\u09af",
-"Bold": "\u09b8\u09cd\u09a5\u09c2\u09b2",
-"Italic": "\u09a4\u09bf\u09b0\u09cd\u09af\u0995",
-"Underline": "\u09a8\u09bf\u09ae\u09cd\u09a8\u09b0\u09c7\u0996\u09be",
-"Strikethrough": "\u09b8\u09cd\u099f\u09cd\u09b0\u09be\u0987\u0995\u09a5\u09cd\u09b0\u09c1",
-"Superscript": "\u098a\u09b0\u09cd\u09a7\u09cd\u09ac\u09b2\u09bf\u09aa\u09bf",
-"Subscript": "\u09a8\u09bf\u09ae\u09cd\u09a8\u09b2\u09bf\u09aa\u09bf",
-"Clear formatting": "\u09ac\u09bf\u09a8\u09cd\u09af\u09be\u09b8 \u0985\u09aa\u09b8\u09be\u09b0\u09a3",
-"Align left": "\u09ac\u09be\u09ae\u09c7 \u09b8\u09be\u09b0\u09bf\u0995\u09b0\u09a3",
-"Align center": "\u09ae\u09a7\u09cd\u09af\u09b8\u09cd\u09a5\u09be\u09a8\u09c7 \u09b8\u09be\u09b0\u09bf\u0995\u09b0\u09a3",
-"Align right": "\u09a1\u09be\u09a8\u09c7 \u09b8\u09be\u09b0\u09bf\u0995\u09b0\u09a3",
-"Justify": "\u0989\u09ad\u09af\u09bc\u09aa\u09cd\u09b0\u09be\u09a8\u09cd\u09a4\u09c7 \u09b8\u09ae\u09be\u09a8 \u0995\u09b0\u09c1\u09a8",
-"Bullet list": "\u09ac\u09c1\u09b2\u09c7\u099f \u09a4\u09be\u09b2\u09bf\u0995\u09be",
-"Numbered list": "\u09b8\u0982\u0996\u09cd\u09af\u09be\u09af\u09c1\u0995\u09cd\u09a4 \u09a4\u09be\u09b2\u09bf\u0995\u09be",
-"Decrease indent": "\u0987\u09a8\u09cd\u09a1\u09c7\u09a8\u09cd\u099f \u0995\u09ae\u09be\u09a8",
-"Increase indent": "\u0987\u09a8\u09cd\u09a1\u09c7\u09a8\u09cd\u099f \u09ac\u09be\u09a1\u09bc\u09be\u09a8",
-"Close": "\u09ac\u09a8\u09cd\u09a7",
-"Formats": "\u09ac\u09bf\u09a8\u09cd\u09af\u09be\u09b8",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0986\u09aa\u09a8\u09be\u09b0 \u09ac\u09cd\u09b0\u09be\u0989\u099c\u09be\u09b0 \u0995\u09cd\u09b2\u09bf\u09aa\u09ac\u09cb\u09b0\u09cd\u09a1 \u09a5\u09c7\u0995\u09c7 \u09b8\u09b0\u09be\u09b8\u09b0\u09bf \u09aa\u09cd\u09b0\u09ac\u09c7\u09b6\u09be\u09a7\u09bf\u0995\u09be\u09b0 \u09b8\u09ae\u09b0\u09cd\u09a5\u09a8 \u0995\u09b0\u09c7 \u09a8\u09be\u0964 \u0985\u09a8\u09c1\u0997\u09cd\u09b0\u09b9 \u0995\u09b0\u09c7 \u0995\u09c0\u09ac\u09cb\u09b0\u09cd\u09a1 \u09b6\u09b0\u09cd\u099f\u0995\u09be\u099f Ctrl +X\/C\/V \u09ac\u09cd\u09af\u09ac\u09b9\u09be\u09b0 \u0995\u09b0\u09c1\u09a8\u0964",
-"Headers": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09b8\u09ae\u09c1\u09b9",
-"Header 1": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09e7",
-"Header 2": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09e8",
-"Header 3": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09e9",
-"Header 4": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09ea",
-"Header 5": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09eb",
-"Header 6": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09ec",
-"Headings": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae",
-"Heading 1": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae \u09e7",
-"Heading 2": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae \u09e8",
-"Heading 3": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae \u09e9",
-"Heading 4": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae \u09ea",
-"Heading 5": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae \u09eb",
-"Heading 6": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae \u09ec",
-"Preformatted": "\u09aa\u09c2\u09b0\u09cd\u09ac\u09ac\u09bf\u09a8\u09cd\u09af\u09be\u09b8\u09bf\u09a4",
-"Div": "\u09a1\u09bf\u09ad",
-"Pre": "\u09aa\u09cd\u09b0\u09be\u0995",
-"Code": "\u09b8\u0982\u0995\u09c7\u09a4\u09b2\u09bf\u09aa\u09bf",
-"Paragraph": "\u09aa\u09cd\u09af\u09be\u09b0\u09be\u0997\u09cd\u09b0\u09be\u09ab",
-"Blockquote": "\u09ac\u09cd\u09b2\u0995\u0995\u09cb\u099f",
-"Inline": "\u09b8\u0999\u09cd\u0997\u09a4\u09bf\u09aa\u09c2\u09b0\u09cd\u09a3\u09ad\u09be\u09ac\u09c7",
-"Blocks": "\u09b8\u09cd\u09a5\u09c2\u09b2 ",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u09aa\u09c7\u09b8\u09cd\u099f \u098f\u0996\u09a8 \u09aa\u09cd\u09b2\u09c7\u0987\u09a8 \u099f\u09c7\u0995\u09cd\u09b8\u099f \u09ae\u09cb\u09a1\u09c7\u0964 \u0986\u09aa\u09a8\u09bf \u098f\u0996\u09a8 \u098f\u0987 \u09ac\u09bf\u0995\u09b2\u09cd\u09aa \u09ac\u09a8\u09cd\u09a7 \u099f\u0997\u09b2 \u09aa\u09b0\u09cd\u09af\u09a8\u09cd\u09a4 \u09ac\u09bf\u09b7\u09af\u09bc\u09ac\u09b8\u09cd\u09a4\u09c1 \u098f\u0996\u09a8 \u09aa\u09cd\u09b2\u09c7\u0987\u09a8 \u099f\u09c7\u0995\u09cd\u09b8\u099f \u09b9\u09bf\u09b8\u09be\u09ac\u09c7 \u0986\u099f\u0995\u09be\u09a8\u09cb \u09b9\u09ac\u09c7\u0964",
-"Font Family": "\u09ab\u09a8\u09cd\u099f \u09ab\u09cd\u09af\u09be\u09ae\u09bf\u09b2\u09bf",
-"Font Sizes": "\u09ab\u09a8\u09cd\u099f \u09ae\u09be\u09aa",
-"Class": "\u0995\u09cd\u09b2\u09be\u09b8",
-"Browse for an image": "\u098f\u0995\u099f\u09bf \u099b\u09ac\u09bf \u09ac\u09cd\u09b0\u09be\u0989\u099c \u0995\u09b0\u09c1\u09a8",
-"OR": "\u0985\u09a5\u09ac\u09be",
-"Drop an image here": "\u098f\u0996\u09be\u09a8\u09c7 \u098f\u0995\u099f\u09bf \u099b\u09ac\u09bf \u09a1\u09cd\u09b0\u09aa \u0995\u09b0\u09c1\u09a8",
-"Upload": "\u0986\u09aa\u09b2\u09cb\u09a1",
-"Block": "\u09ac\u09cd\u09b2\u0995",
-"Align": "\u09ac\u09bf\u09a8\u09cd\u09af\u09b8\u09cd\u09a4\u0995\u09b0\u09c1\u09a8",
-"Default": "\u09a1\u09bf\u09ab\u09b2\u09cd\u099f",
-"Circle": "\u09ac\u09c3\u09a4\u09cd\u09a4",
-"Disc": "\u09a1\u09bf\u09b8\u09cd\u0995",
-"Square": "\u09ac\u09b0\u09cd\u0997\u0995\u09cd\u09b7\u09c7\u09a4\u09cd\u09b0",
-"Lower Alpha": "\u09a8\u09bf\u09ae\u09cd\u09a8 \u0986\u09b2\u09ab\u09be",
-"Lower Greek": "\u09a8\u09bf\u09ae\u09cd\u09a8 \u0997\u09cd\u09b0\u09bf\u0995",
-"Lower Roman": "\u09a8\u09bf\u09ae\u09cd\u09a8 \u09b0\u09cb\u09ae\u09be\u09a8",
-"Upper Alpha": "\u0989\u099a\u09cd\u099a\u09a4\u09b0 \u0986\u09b2\u09ab\u09be",
-"Upper Roman": "\u098a\u09b0\u09cd\u09a7\u09cd\u09ac \u09b0\u09cb\u09ae\u09be\u09a8",
-"Anchor": "\u09a8\u09cb\u0999\u09cd\u0997\u09b0",
-"Name": "\u09a8\u09be\u09ae",
-"Id": "\u0986\u0987\u09a1\u09bf",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0986\u0987\u09a1\u09bf\u099f\u09bf \u0985\u0995\u09cd\u09b7\u09b0, \u09b8\u0982\u0996\u09cd\u09af\u09be, \u09a1\u09cd\u09af\u09be\u09b6, \u09a1\u099f\u09b8, \u0995\u09b2\u09cb\u09a8 \u09ac\u09be \u0986\u09a8\u09cd\u09a1\u09be\u09b0\u09b8\u09cd\u0995\u09cb\u09b0 \u09a6\u09cd\u09ac\u09be\u09b0\u09be \u0985\u09a8\u09c1\u09b8\u09b0\u09a3 \u0995\u09b0\u09be \u098f\u0995\u099f\u09bf \u099a\u09bf\u09a0\u09bf \u09a6\u09bf\u09af\u09bc\u09c7 \u09b6\u09c1\u09b0\u09c1 \u0995\u09b0\u09be \u0989\u099a\u09bf\u09a4\u0964",
-"You have unsaved changes are you sure you want to navigate away?": "\u0986\u09aa\u09a8\u09be\u09b0 \u0985\u09b8\u0982\u09b0\u0995\u09cd\u09b7\u09bf\u09a4 \u09aa\u09b0\u09bf\u09ac\u09b0\u09cd\u09a4\u09a8\u0997\u09c1\u09b2\u09bf \u0986\u09aa\u09a8\u09bf \u0995\u09bf \u09a8\u09bf\u09b6\u09cd\u099a\u09bf\u09a4 \u09af\u09c7 \u0986\u09aa\u09a8\u09bf \u09a8\u09c7\u09ad\u09bf\u0997\u09c7\u099f \u0995\u09b0\u09a4\u09c7 \u099a\u09be\u09a8?",
-"Restore last draft": "\u09b6\u09c7\u09b7 \u0996\u09b8\u09a1\u09bc\u09be\u099f\u09bf \u09aa\u09c1\u09a8\u09b0\u09c1\u09a6\u09cd\u09a7\u09be\u09b0 \u0995\u09b0\u09c1\u09a8",
-"Special character": "\u09ac\u09bf\u09b6\u09c7\u09b7 \u099a\u09b0\u09bf\u09a4\u09cd\u09b0",
-"Source code": "\u09b8\u09cb\u09b0\u09cd\u09b8 \u0995\u09cb\u09a1",
-"Insert\/Edit code sample": "\u0995\u09cb\u09a1 \u09a8\u09ae\u09c1\u09a8\u09be \u09a2\u09cb\u0995\u09be\u09a8 \/ \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8\u09be \u0995\u09b0\u09c1\u09a8",
-"Language": "\u09ad\u09be\u09b7\u09be",
-"Code sample": "\u09a8\u09ae\u09c1\u09a8\u09be \u0995\u09cb\u09a1",
-"Color": "\u09b0\u0999",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u09ac\u09be\u09ae \u09a5\u09c7\u0995\u09c7 \u09a1\u09be\u09a8",
-"Right to left": "\u09a1\u09be\u09a8 \u09a5\u09c7\u0995\u09c7 \u09ac\u09be\u09ae",
-"Emoticons": "\u0987\u09ae\u09cb\u099f\u09bf\u0995\u09a8",
-"Document properties": "\u09a8\u09a5\u09bf\u09b0 \u09ac\u09c8\u09b6\u09bf\u09b7\u09cd\u099f\u09cd\u09af",
-"Title": "\u09b6\u09bf\u09b0\u09cb\u09a8\u09be\u09ae",
-"Keywords": "\u0995\u09c0\u0993\u09af\u09bc\u09be\u09b0\u09cd\u09a1",
-"Description": "\u09ac\u09bf\u09ac\u09b0\u09a3",
-"Robots": "\u09b0\u09cb\u09ac\u099f",
-"Author": "\u09b2\u09c7\u0996\u0995",
-"Encoding": "\u098f\u09a8\u0995\u09cb\u09a1\u09bf\u0982",
-"Fullscreen": "\u09aa\u09c2\u09b0\u09cd\u09a3 \u09aa\u09b0\u09cd\u09a6\u09be",
-"Action": "\u0995\u09b0\u09cd\u09ae",
-"Shortcut": "\u09b6\u09b0\u09cd\u099f\u0995\u09be\u099f",
-"Help": "\u09b8\u09be\u09b9\u09be\u09af\u09cd\u09af \u0995\u09b0\u09c1\u09a8",
-"Address": "\u09a0\u09bf\u0995\u09be\u09a8\u09be",
-"Focus to menubar": "\u09ae\u09c7\u09a8\u09c1\u09ac\u09be\u09b0\u09c7 \u09ab\u09cb\u0995\u09be\u09b8 \u0995\u09b0\u09c1\u09a8",
-"Focus to toolbar": "\u099f\u09c1\u09b2\u09ac\u09be\u09b0\u09c7 \u09ab\u09cb\u0995\u09be\u09b8 \u0995\u09b0\u09c1\u09a8",
-"Focus to element path": "\u0989\u09aa\u09be\u09a6\u09be\u09a8 \u09aa\u09be\u09a5 \u09ab\u09cb\u0995\u09be\u09b8 \u0995\u09b0\u09c1\u09a8",
-"Focus to contextual toolbar": "\u09aa\u09cd\u09b0\u09be\u09b8\u0999\u09cd\u0997\u09bf\u0995 \u099f\u09c1\u09b2\u09ac\u09be\u09b0\u09c7 \u09ab\u09cb\u0995\u09be\u09b8 \u0995\u09b0\u09c1\u09a8",
-"Insert link (if link plugin activated)": "\u09b2\u09bf\u0999\u09cd\u0995 \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \u0995\u09b0\u09c1\u09a8 (\u09af\u09a6\u09bf \u09b2\u09bf\u0999\u09cd\u0995 \u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8 \u0985\u09cd\u09af\u09be\u0995\u09cd\u099f\u09bf\u09ad\u09c7\u099f \u0995\u09b0\u09be \u09b9\u09af\u09bc)",
-"Save (if save plugin activated)": "\u09b8\u0982\u09b0\u0995\u09cd\u09b7\u09a3 \u0995\u09b0\u09c1\u09a8 (\u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8 \u0985\u09cd\u09af\u09be\u0995\u09cd\u099f\u09bf\u09ad\u09c7\u099f \u09b9\u09b2\u09c7)",
-"Find (if searchreplace plugin activated)": "\u09b8\u09a8\u09cd\u09a7\u09be\u09a8 \u0995\u09b0\u09c1\u09a8 (\u09af\u09a6\u09bf \u0985\u09a8\u09c1\u09b8\u09a8\u09cd\u09a7\u09be\u09a8\u09af\u09cb\u0997\u09cd\u09af \u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8 \u09b8\u0995\u09cd\u09b0\u09bf\u09af\u09bc \u0995\u09b0\u09be \u09b9\u09af\u09bc)",
-"Plugins installed ({0}):": "\u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8 \u0987\u09a8\u09b8\u09cd\u099f\u09b2 ({0}):",
-"Premium plugins:": "\u09aa\u09cd\u09b0\u09bf\u09ae\u09bf\u09af\u09bc\u09be\u09ae \u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8:",
-"Learn more...": "\u0986\u09b0\u0993 \u099c\u09be\u09a8\u09c1\u09a8...",
-"You are using {0}": "\u0986\u09aa\u09a8\u09bf \u09ac\u09cd\u09af\u09ac\u09b9\u09be\u09b0 \u0995\u09b0\u099b\u09c7\u09a8 {0}",
-"Plugins": "\u09aa\u09cd\u09b2\u09be\u0997\u0987\u09a8",
-"Handy Shortcuts": "\u09b8\u09b9\u099c \u09b6\u09b0\u09cd\u099f\u0995\u09be\u099f ",
-"Horizontal line": "\u0985\u09a8\u09c1\u09ad\u09c2\u09ae\u09bf\u0995 \u09b0\u09c7\u0996\u09be",
-"Insert\/edit image": "\u0987\u09ae\u09c7\u099c \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \/ \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8\u09be \u0995\u09b0\u09c1\u09a8",
-"Image description": "\u099b\u09ac\u09bf\u09b0 \u09ac\u09b0\u09cd\u09a3\u09a8\u09be",
-"Source": "\u0989\u09ce\u09b8",
-"Dimensions": "\u09ae\u09be\u09a4\u09cd\u09b0\u09be",
-"Constrain proportions": "\u0985\u09a8\u09c1\u09aa\u09be\u09a4 \u09b8\u09c0\u09ae\u09be\u09ac\u09a6\u09cd\u09a7",
-"General": "\u09b8\u09be\u09a7\u09be\u09b0\u09a3",
-"Advanced": "\u0985\u0997\u09cd\u09b0\u09b8\u09b0",
-"Style": "\u09b6\u09c8\u09b2\u09c0",
-"Vertical space": "\u0989\u09b2\u09cd\u09b2\u09ae\u09cd\u09ac \u09b8\u09cd\u09a5\u09be\u09a8",
-"Horizontal space": "\u0985\u09a8\u09c1\u09ad\u09c2\u09ae\u09bf\u0995 \u09b8\u09cd\u09a5\u09be\u09a8",
-"Border": "\u09b8\u09c0\u09ae\u09be\u09a8\u09cd\u09a4",
-"Insert image": "\u099a\u09bf\u09a4\u09cd\u09b0 \u09a2\u09cb\u0995\u09be\u09a8",
-"Image": "\u099b\u09ac\u09bf",
-"Image list": "\u099a\u09bf\u09a4\u09cd\u09b0 \u09a4\u09be\u09b2\u09bf\u0995\u09be",
-"Rotate counterclockwise": "\u09ac\u09be\u09ae\u09be\u09ac\u09b0\u09cd\u09a4\u09c7 \u0998\u09cb\u09b0\u09be\u09a4\u09c7",
-"Rotate clockwise": "\u0998\u09a1\u09bc\u09bf\u09b0 \u0995\u09be\u0981\u099f\u09be\u09b0 \u09a6\u09bf\u0995\u09c7 \u0998\u09cb\u09b0\u09be\u09a8",
-"Flip vertically": "\u0989\u09b2\u09cd\u09b2\u09ae\u09cd\u09ac\u09ad\u09be\u09ac\u09c7 \u09ab\u09cd\u09b2\u09bf\u09aa \u0995\u09b0\u09c1\u09a8",
-"Flip horizontally": "\u0985\u09a8\u09c1\u09ad\u09c2\u09ae\u09bf\u0995\u09ad\u09be\u09ac\u09c7 \u09ab\u09cd\u09b2\u09bf\u09aa \u0995\u09b0\u09c1\u09a8",
-"Edit image": "\u099a\u09bf\u09a4\u09cd\u09b0 \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8\u09be \u0995\u09b0\u09c1\u09a8",
-"Image options": "\u099a\u09bf\u09a4\u09cd\u09b0 \u09ac\u09bf\u0995\u09b2\u09cd\u09aa\u0997\u09c1\u09b2\u09bf",
-"Zoom in": "\u09aa\u09cd\u09b0\u09b8\u09be\u09b0\u09bf\u09a4 \u0995\u09b0\u09cb",
-"Zoom out": "\u099b\u09cb\u099f \u0995\u09b0\u09be",
-"Crop": "\u0995\u09be\u099f\u09be",
-"Resize": "\u09ae\u09be\u09aa \u09aa\u09b0\u09bf\u09ac\u09b0\u09cd\u09a4\u09a8 \u0995\u09b0\u09c1\u09a8",
-"Orientation": "\u099d\u09cb\u0981\u0995",
-"Brightness": "\u0989\u099c\u09cd\u099c\u09cd\u09ac\u09b2\u09a4\u09be",
-"Sharpen": "\u09a7\u09be\u09b0 \u0995\u09b0\u09be",
-"Contrast": "\u09ac\u09bf\u09aa\u09b0\u09c0\u09a4 \u09b9\u09a4\u09cd\u09a4\u09af\u09bc\u09be",
-"Color levels": "\u09b0\u0999\u09c7\u09b0 \u09ae\u09be\u09a4\u09cd\u09b0\u09be",
-"Gamma": "Gamma",
-"Invert": "\u09ac\u09bf\u09a8\u09b7\u09cd\u099f \u0995\u09b0\u09be",
-"Apply": "\u09aa\u09cd\u09b0\u09af\u09bc\u09cb\u0997 \u0995\u09b0\u09be",
-"Back": "\u09aa\u09bf\u099b\u09a8\u09c7",
-"Insert date\/time": "\u09a4\u09be\u09b0\u09bf\u0996 \/ \u09b8\u09ae\u09af\u09bc \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \u0995\u09b0\u09c1\u09a8",
-"Date\/time": "\u09a4\u09be\u09b0\u09bf\u0996 \/ \u09b8\u09ae\u09af\u09bc",
-"Insert link": "\u09b2\u09bf\u0999\u09cd\u0995 \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \u0995\u09b0\u09c1\u09a8",
-"Insert\/edit link": "\u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \/ \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8\u09be \u09b2\u09bf\u0999\u09cd\u0995",
-"Text to display": "\u09aa\u09cd\u09b0\u09a6\u09b0\u09cd\u09b6\u09a8 \u099f\u09c7\u0995\u09cd\u09b8\u099f",
-"Url": "URL",
-"Target": "\u09b2\u0995\u09cd\u09b7\u09cd\u09af",
-"None": "\u09a8\u09be",
-"New window": "\u09a8\u09a4\u09c1\u09a8 \u0989\u0987\u09a8\u09cd\u09a1\u09cb",
-"Remove link": "\u09b2\u09bf\u0999\u09cd\u0995 \u09b8\u09b0\u09be\u09a8",
-"Anchors": "\u09a8\u09cb\u0999\u09cd\u0997\u09b0",
-"Link": "\u09b2\u09bf\u0982\u0995",
-"Paste or type a link": "\u098f\u0995\u099f\u09bf \u09b2\u09bf\u0999\u09cd\u0995 \u0986\u099f\u0995\u09be\u09a8 \u09ac\u09be \u099f\u09be\u0987\u09aa \u0995\u09b0\u09c1\u09a8",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0986\u09aa\u09a8\u09be\u09b0 \u09aa\u09cd\u09b0\u09ac\u09c7\u09b6 \u0995\u09b0\u09be URL\u099f\u09bf \u098f\u0995\u099f\u09bf \u0987\u09ae\u09c7\u09b2 \u09a0\u09bf\u0995\u09be\u09a8\u09be \u09ac\u09b2\u09c7 \u09ae\u09a8\u09c7 \u09b9\u099a\u09cd\u099b\u09c7\u0964 \u0986\u09aa\u09a8\u09bf \u09aa\u09cd\u09b0\u09af\u09bc\u09cb\u099c\u09a8\u09c0\u09af\u09bc \u09ae\u09c7\u0987\u09b2\u099f\u09cb \u09af\u09cb\u0997 \u0995\u09b0\u09a4\u09c7 \u099a\u09be\u09a8: \u0989\u09aa\u09b8\u09b0\u09cd\u0997?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0986\u09aa\u09a8\u09be\u09b0 \u09aa\u09cd\u09b0\u09ac\u09c7\u09b6 \u0995\u09b0\u09be URL\u099f\u09bf \u098f\u0995\u099f\u09bf \u09ac\u09b9\u09bf\u09b0\u09be\u0997\u09a4 \u09b2\u09bf\u0999\u09cd\u0995 \u09ac\u09b2\u09c7 \u09ae\u09a8\u09c7 \u09b9\u099a\u09cd\u099b\u09c7\u0964 \u0986\u09aa\u09a8\u09bf \u0995\u09bf \u09aa\u09cd\u09b0\u09af\u09bc\u09cb\u099c\u09a8\u09c0\u09af\u09bc http:\/\/ \u09aa\u09cd\u09b0\u09bf\u09ab\u09bf\u0995\u09cd\u09b8 \u09af\u09cb\u0997 \u0995\u09b0\u09a4\u09c7 \u099a\u09be\u09a8?",
-"Link list": "\u09b2\u09bf\u0999\u09cd\u0995 \u09a4\u09be\u09b2\u09bf\u0995\u09be",
-"Insert video": "\u09ad\u09bf\u09a1\u09bf\u0993 \u09a2\u09cb\u0995\u09be\u09a8",
-"Insert\/edit video": "\u09ad\u09bf\u09a1\u09bf\u0993 \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \/ \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8\u09be \u0995\u09b0\u09c1\u09a8",
-"Insert\/edit media": "\u09ae\u09bf\u09a1\u09bf\u09af\u09bc\u09be \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \u0995\u09b0\u09c1\u09a8 \/ \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8\u09be \u0995\u09b0\u09c1\u09a8",
-"Alternative source": "\u09ac\u09bf\u0995\u09b2\u09cd\u09aa \u0989\u09ce\u09b8",
-"Poster": "\u09aa\u09cb\u09b8\u09cd\u099f\u09be\u09b0",
-"Paste your embed code below:": "\u09a8\u09c0\u099a\u09c7\u09b0 \u0986\u09aa\u09a8\u09be\u09b0 \u098f\u09ae\u09cd\u09ac\u09c7\u09a1 \u0995\u09cb\u09a1 \u0986\u099f\u0995\u09be\u09a8:",
-"Embed": "\u098f\u09ae\u09cd\u09ac\u09c7\u09a1",
-"Media": "\u09ae\u09bf\u09a1\u09bf\u09af\u09bc\u09be",
-"Nonbreaking space": "\u0985\u09ac\u09bf\u099a\u09cd\u099b\u09bf\u09a8\u09cd\u09a8 \u09b8\u09cd\u09a5\u09be\u09a8",
-"Page break": "\u09aa\u09c3\u09b7\u09cd\u09a0\u09be \u09ac\u09bf\u09b0\u09a4\u09bf",
-"Paste as text": "\u09aa\u09be\u09a0\u09cd\u09af \u09b9\u09bf\u09b8\u09be\u09ac\u09c7 \u09aa\u09c7\u09b8\u09cd\u099f \u0995\u09b0\u09c1\u09a8",
-"Preview": "\u09aa\u09c2\u09b0\u09cd\u09ac\u09b0\u09c2\u09aa",
-"Print": "\u099b\u09be\u09aa\u09be",
-"Save": "\u09b8\u0982\u09b0\u0995\u09cd\u09b7\u09a3",
-"Find": "\u0986\u09ac\u09bf\u09b7\u09cd\u0995\u09be\u09b0",
-"Replace with": "\u09aa\u09cd\u09b0\u09a4\u09bf\u09b8\u09cd\u09a5\u09be\u09aa\u09a8",
-"Replace": "\u09aa\u09cd\u09b0\u09a4\u09bf\u09b8\u09cd\u09a5\u09be\u09aa\u09a8 \u0995\u09b0\u09be",
-"Replace all": "\u09b8\u09ae\u09b8\u09cd\u09a4 \u09aa\u09cd\u09b0\u09a4\u09bf\u09b8\u09cd\u09a5\u09be\u09aa\u09a8",
-"Prev": "\u09aa\u09c2\u09b0\u09cd\u09ac\u09ac\u09b0\u09cd\u09a4\u09c0",
-"Next": "\u09aa\u09b0\u09ac\u09b0\u09cd\u09a4\u09c0",
-"Find and replace": "\u0996\u09c1\u0981\u099c\u09c1\u09a8 \u0993 \u09aa\u09cd\u09b0\u09a4\u09bf\u09b8\u09cd\u09a5\u09be\u09aa\u09a8 \u0995\u09b0\u09c1\u09a8",
-"Could not find the specified string.": "\u09a8\u09bf\u09b0\u09cd\u09a6\u09bf\u09b7\u09cd\u099f \u09b8\u09cd\u099f\u09cd\u09b0\u09bf\u0982\u099f\u09bf \u0996\u09c1\u0981\u099c\u09c7 \u09aa\u09be\u0993\u09af\u09bc\u09be \u09af\u09be\u09af\u09bc\u09a8\u09bf\u0964",
-"Match case": "\u09ae\u09cd\u09af\u09be\u099a \u0995\u09cd\u09b7\u09c7\u09a4\u09cd\u09b0\u09c7",
-"Whole words": "\u09b8\u09ae\u09cd\u09aa\u09c2\u09b0\u09cd\u09a3 \u09b6\u09ac\u09cd\u09a6\u09c7\u09b0",
-"Spellcheck": "\u09ac\u09be\u09a8\u09be\u09a8 \u09af\u09be\u099a\u09be\u0987",
-"Ignore": "\u0989\u09aa\u09c7\u0995\u09cd\u09b7\u09be \u0995\u09b0\u09be",
-"Ignore all": "\u09b8\u09ac\u0997\u09c1\u09b2\u09cb \u0989\u09aa\u09c7\u0995\u09cd\u09b7\u09be \u0995\u09b0\u09c1\u09a8",
-"Finish": "\u09b6\u09c7\u09b7",
-"Add to Dictionary": "\u0985\u09ad\u09bf\u09a7\u09be\u09a8 \u09af\u09cb\u0997 \u0995\u09b0\u09c1\u09a8",
-"Insert table": "\u099f\u09c7\u09ac\u09bf\u09b2 \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \u0995\u09b0\u09c1\u09a8",
-"Table properties": "\u099f\u09c7\u09ac\u09bf\u09b2 \u09ac\u09c8\u09b6\u09bf\u09b7\u09cd\u099f\u09cd\u09af",
-"Delete table": "\u09b8\u09be\u09b0\u09a3\u09bf \u09ae\u09c1\u099b\u09c1\u09a8",
-"Cell": "\u09b8\u09c7\u09b2",
-"Row": "\u09b8\u09be\u09b0\u09bf",
-"Column": "\u0995\u09b2\u09be\u09ae",
-"Cell properties": "\u09b8\u09c7\u09b2 \u09ac\u09c8\u09b6\u09bf\u09b7\u09cd\u099f\u09cd\u09af",
-"Merge cells": "\u09b8\u09c7\u09b2 \u09ae\u09be\u09b0\u09cd\u099c \u0995\u09b0\u09c1\u09a8",
-"Split cell": "\u09b8\u09cd\u09aa\u09cd\u09b2\u09bf\u099f \u09b8\u09c7\u09b2",
-"Insert row before": "\u0986\u0997\u09c7 \u09b8\u09be\u09b0\u09bf \u09a2\u09cb\u0995\u09be\u09a8",
-"Insert row after": "\u09aa\u09b0\u09c7 \u09b8\u09be\u09b0\u09bf \u09a2\u09cb\u0995\u09be\u09a8",
-"Delete row": "\u09b8\u09be\u09b0\u09bf \u09ae\u09c1\u099b\u09c1\u09a8",
-"Row properties": "\u09b8\u09be\u09b0\u09bf \u09ac\u09c8\u09b6\u09bf\u09b7\u09cd\u099f\u09cd\u09af",
-"Cut row": "\u09b8\u09be\u09b0\u09bf \u0995\u09be\u099f\u09c1\u09a8",
-"Copy row": "\u09b8\u09be\u09b0\u09bf \u0985\u09a8\u09c1\u09b2\u09bf\u09aa\u09bf \u0995\u09b0\u09c1\u09a8",
-"Paste row before": "\u0986\u0997\u09c7 \u09b8\u09be\u09b0\u09bf \u09aa\u09c7\u09b8\u09cd\u099f \u0995\u09b0\u09c1\u09a8",
-"Paste row after": "\u09aa\u09b0\u09c7 \u09b8\u09be\u09b0\u09bf \u09aa\u09c7\u09b8\u09cd\u099f \u0995\u09b0\u09c1\u09a8",
-"Insert column before": "\u0986\u0997\u09c7 \u0995\u09b2\u09be\u09ae \u09a2\u09cb\u0995\u09be\u09a8",
-"Insert column after": "\u09aa\u09b0\u09c7 \u0995\u09b2\u09be\u09ae \u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6 \u0995\u09b0\u09c1\u09a8",
-"Delete column": "\u0995\u09b2\u09be\u09ae \u09ae\u09c1\u099b\u09c1\u09a8",
-"Cols": "\u0995\u09b2\u09be\u09ae \u0997\u09c1\u09b2\u09cb",
-"Rows": "\u09b8\u09be\u09b0\u09bf\u0997\u09c1\u09b2\u09cb",
-"Width": "\u09aa\u09cd\u09b0\u09b8\u09cd\u09a5",
-"Height": "\u0989\u099a\u09cd\u099a\u09a4\u09be",
-"Cell spacing": "\u09b8\u09c7\u09b2 \u09ab\u09be\u0981\u0995\u09be",
-"Cell padding": "\u09b8\u09c7\u09b2 \u09aa\u09cd\u09af\u09be\u09a1\u09bf\u0982",
-"Caption": "\u0995\u09cd\u09af\u09be\u09aa\u09b6\u09a8",
-"Left": "\u09ac\u09be\u09ae",
-"Center": "\u0995\u09c7\u09a8\u09cd\u09a6\u09cd\u09b0",
-"Right": "\u09a1\u09be\u09a8",
-"Cell type": "\u09b8\u09c7\u09b2 \u099f\u09be\u0987\u09aa",
-"Scope": "\u09ac\u09cd\u09af\u09be\u09aa\u09cd\u09a4\u09bf",
-"Alignment": "\u09b6\u09cd\u09b0\u09c7\u09a3\u09c0\u09ac\u09bf\u09a8\u09cd\u09af\u09be\u09b8",
-"H Align": "H \u09b8\u09be\u09b0\u09bf\u09ac\u09a6\u09cd\u09a7",
-"V Align": "V \u09b8\u09be\u09b0\u09bf\u09ac\u09a6\u09cd\u09a7",
-"Top": "\u0989\u09aa\u09b0",
-"Middle": "\u09ae\u09a7\u09cd\u09af\u09ae",
-"Bottom": "\u09a8\u09bf\u099a\u09c7",
-"Header cell": "\u09b9\u09c7\u09a1\u09be\u09b0 \u09b8\u09c7\u09b2",
-"Row group": "\u09b8\u09be\u09b0\u09bf \u0997\u09cd\u09b0\u09c1\u09aa",
-"Column group": "\u0995\u09b2\u09be\u09ae \u0997\u09cd\u09b0\u09c1\u09aa",
-"Row type": "\u09b8\u09be\u09b0\u09bf\u09b0 \u09a7\u09b0\u09a8",
-"Header": "\u09b9\u09c7\u09a1\u09be\u09b0",
-"Body": "\u09ac\u09a1\u09bf",
-"Footer": "\u09ab\u09c1\u099f\u09be\u09b0",
-"Border color": "\u09b8\u09c0\u09ae\u09be\u09a8\u09cd\u09a4 \u09b0\u0999",
-"Insert template": "\u099f\u09c7\u09ae\u09aa\u09cd\u09b2\u09c7\u099f \u09a2\u09cb\u0995\u09be\u09a8",
-"Templates": "\u099f\u09c7\u09ae\u09aa\u09cd\u09b2\u09c7\u099f",
-"Template": "\u099f\u09c7\u09ae\u09aa\u09cd\u09b2\u09c7\u099f",
-"Text color": "\u09b2\u09c7\u0996\u09be\u09b0 \u09b0\u0999",
-"Background color": "\u09aa\u09c7\u099b\u09a8\u09c7\u09b0 \u09b0\u0982",
-"Custom...": "\u0995\u09be\u09b8\u09cd\u099f\u09ae...",
-"Custom color": "\u0995\u09be\u09b8\u09cd\u099f\u09ae \u09b0\u0982",
-"No color": "\u0995\u09cb\u09a8 \u09b0\u0982 \u09a8\u09c7\u0987",
-"Table of Contents": "\u09b8\u09c1\u099a\u09bf\u09aa\u09a4\u09cd\u09b0",
-"Show blocks": "\u09ac\u09cd\u09b2\u0995 \u09a6\u09c7\u0996\u09be\u09a8",
-"Show invisible characters": "\u0985\u09a6\u09c3\u09b6\u09cd\u09af \u0985\u0995\u09cd\u09b7\u09b0 \u09a6\u09c7\u0996\u09be\u09a8",
-"Words: {0}": "\u09b6\u09ac\u09cd\u09a6: {0}",
-"{0} words": "{0} \u09b6\u09ac\u09cd\u09a6",
-"File": "\u09ab\u09be\u0987\u09b2",
-"Edit": "\u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8 \u0995\u09b0\u09be",
-"Insert": "\u09b8\u09a8\u09cd\u09a8\u09bf\u09ac\u09c7\u09b6",
-"View": "\u09a6\u09c3\u09b6\u09cd\u09af",
-"Format": "\u09ac\u09bf\u09a8\u09cd\u09af\u09be\u09b8",
-"Table": "\u099f\u09c7\u09ac\u09bf\u09b2",
-"Tools": "\u09b8\u09b0\u099e\u09cd\u099c\u09be\u09ae\u09b8\u09ae\u09c2\u09b9",
-"Powered by {0}": "{0} \u09a6\u09cd\u09ac\u09be\u09b0\u09be \u099a\u09be\u09b2\u09bf\u09a4",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u09b0\u09bf\u099a \u099f\u09c7\u0995\u09cd\u09b8\u099f \u098f\u09b0\u09bf\u09af\u09bc\u09be \u09ae\u09c7\u09a8\u09c1 \u099c\u09a8\u09cd\u09af ALT-F9 \u099a\u09be\u09aa\u09c1\u09a8 \u099f\u09c1\u09b2\u09ac\u09be\u09b0\u09c7\u09b0 \u099c\u09a8\u09cd\u09af ALT-F10 \u099f\u09bf\u09aa\u09c1\u09a8 \u09b8\u09be\u09b9\u09be\u09af\u09cd\u09af\u09c7\u09b0 \u099c\u09a8\u09cd\u09af ALT-0 \u099a\u09be\u09aa\u09c1\u09a8"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ca.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ca.js
deleted file mode 100644
index 671e875351..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ca.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('ca',{
-"Redo": "Refer",
-"Undo": "Desfer",
-"Cut": "Retalla",
-"Copy": "Copia",
-"Paste": "Enganxa",
-"Select all": "Seleccionar-ho tot",
-"New document": "Nou document",
-"Ok": "Acceptar",
-"Cancel": "Cancel\u00b7la",
-"Visual aids": "Assist\u00e8ncia visual",
-"Bold": "Negreta",
-"Italic": "Cursiva",
-"Underline": "Subratllat",
-"Strikethrough": "Ratllat",
-"Superscript": "Super\u00edndex",
-"Subscript": "Sub\u00edndex",
-"Clear formatting": "Eliminar format",
-"Align left": "Aliniat a l'esquerra",
-"Align center": "Centrat",
-"Align right": "Aliniat a la dreta",
-"Justify": "Justificat",
-"Bullet list": "Llista no ordenada",
-"Numbered list": "Llista enumerada",
-"Decrease indent": "Disminuir sagnat",
-"Increase indent": "Augmentar sagnat",
-"Close": "Tanca",
-"Formats": "Formats",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "El vostre navegador no suporta l'acc\u00e9s directe al portaobjectes. Si us plau, feu servir les dreceres de teclat Ctrl+X\/C\/V.",
-"Headers": "Cap\u00e7aleres",
-"Header 1": "Cap\u00e7alera 1",
-"Header 2": "Cap\u00e7alera 2",
-"Header 3": "Cap\u00e7alera 3",
-"Header 4": "Cap\u00e7alera 4",
-"Header 5": "Cap\u00e7alera 5",
-"Header 6": "Cap\u00e7alera 6",
-"Headings": "Encap\u00e7alaments",
-"Heading 1": "Encap\u00e7alament 1",
-"Heading 2": "Encap\u00e7alament 2",
-"Heading 3": "Encap\u00e7alament 3",
-"Heading 4": "Encap\u00e7alament 4",
-"Heading 5": "Encap\u00e7alament 5",
-"Heading 6": "Encap\u00e7alament 6",
-"Preformatted": "Preformatted",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Codi",
-"Paragraph": "Par\u00e0graf",
-"Blockquote": "Cita",
-"Inline": "En l\u00ednia",
-"Blocks": "Blocs",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Enganxar ara est\u00e0 en mode text pla. Els continguts s'enganxaran com a text pla fins que desactivis aquesta opci\u00f3. ",
-"Font Family": "Fam\u00edlia de la font",
-"Font Sizes": "Mides de la font",
-"Class": "Classe",
-"Browse for an image": "Explorar una imatge",
-"OR": "O",
-"Drop an image here": "Deixar anar una imatge aqu\u00ed",
-"Upload": "Pujar",
-"Block": "Bloc",
-"Align": "Alinear",
-"Default": "Per defecte",
-"Circle": "Cercle",
-"Disc": "Disc",
-"Square": "Quadrat",
-"Lower Alpha": "Alfa menor",
-"Lower Greek": "Grec menor",
-"Lower Roman": "Roman menor",
-"Upper Alpha": "Alfa major",
-"Upper Roman": "Roman major",
-"Anchor": "\u00c0ncora",
-"Name": "Nom",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "La Id ha de comen\u00e7ar amb una lletra, seguida d'altres lletres, n\u00fameros, punts, ratlles, comes, o guions baixos",
-"You have unsaved changes are you sure you want to navigate away?": "Teniu canvis sense desar, esteu segur que voleu deixar-ho ara?",
-"Restore last draft": "Restaurar l'\u00faltim esborrany",
-"Special character": "Car\u00e0cter especial",
-"Source code": "Codi font",
-"Insert\/Edit code sample": "Inserir\/Editar tros de codi",
-"Language": "Idioma",
-"Code sample": "Mostra de codi",
-"Color": "Color",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "D'esquerra a dreta",
-"Right to left": "De dreta a esquerra",
-"Emoticons": "Emoticones",
-"Document properties": "Propietats del document",
-"Title": "T\u00edtol",
-"Keywords": "Paraules clau",
-"Description": "Descripci\u00f3",
-"Robots": "Robots",
-"Author": "Autor",
-"Encoding": "Codificaci\u00f3",
-"Fullscreen": "Pantalla completa",
-"Action": "Acci\u00f3",
-"Shortcut": "Drecera",
-"Help": "Ajuda",
-"Address": "Adre\u00e7a",
-"Focus to menubar": "Enfocar la barra de men\u00fa",
-"Focus to toolbar": "Enfocar la barra d'eines",
-"Focus to element path": "Enfocar la ruta d'elements",
-"Focus to contextual toolbar": "Enfocar la barra d'eines contextual",
-"Insert link (if link plugin activated)": "Inserir enlla\u00e7 (si el complement d'enlla\u00e7 est\u00e0 activat)",
-"Save (if save plugin activated)": "Desar (si el complement desar est\u00e0 activat)",
-"Find (if searchreplace plugin activated)": "Cercar (si el complement cercar-reempla\u00e7ar est\u00e0 activat)",
-"Plugins installed ({0}):": "Complements instal\u00b7lats ({0}):",
-"Premium plugins:": "Complements premium",
-"Learn more...": "Apr\u00e8n m\u00e9s...",
-"You are using {0}": "Est\u00e0s utilitzant {0}",
-"Plugins": "Complements",
-"Handy Shortcuts": "Dreceres a m\u00e0",
-"Horizontal line": "L\u00ednia horitzontal",
-"Insert\/edit image": "Inserir\/editar imatge",
-"Image description": "Descripci\u00f3 de la imatge",
-"Source": "Font",
-"Dimensions": "Dimensions",
-"Constrain proportions": "Mantenir proporcions",
-"General": "General",
-"Advanced": "Avan\u00e7at",
-"Style": "Estil",
-"Vertical space": "Espai vertical",
-"Horizontal space": "Espai horitzontal",
-"Border": "Vora",
-"Insert image": "Inserir imatge",
-"Image": "Imatge",
-"Image list": "Llista d'imatges",
-"Rotate counterclockwise": "Girar a l'esquerra",
-"Rotate clockwise": "Girar a la dreta",
-"Flip vertically": "Capgirar verticalment",
-"Flip horizontally": "Capgirar horitzontalment",
-"Edit image": "Editar imatge",
-"Image options": "Opcions d'imatge",
-"Zoom in": "Ampliar",
-"Zoom out": "Empetitir",
-"Crop": "Escap\u00e7ar",
-"Resize": "Canviar mida",
-"Orientation": "Orientaci\u00f3",
-"Brightness": "Brillantor",
-"Sharpen": "Remarcar vores",
-"Contrast": "Contrast",
-"Color levels": "Nivells de color",
-"Gamma": "Gamma",
-"Invert": "Invertir",
-"Apply": "Aplicar",
-"Back": "Tornar",
-"Insert date\/time": "Inserir data\/hora",
-"Date\/time": "Data\/hora",
-"Insert link": "Inserir enlla\u00e7",
-"Insert\/edit link": "Inserir\/editar enlla\u00e7",
-"Text to display": "Text per mostrar",
-"Url": "URL",
-"Target": "Dest\u00ed",
-"None": "Cap",
-"New window": "Finestra nova",
-"Remove link": "Treure enlla\u00e7",
-"Anchors": "\u00c0ncores",
-"Link": "Enlla\u00e7",
-"Paste or type a link": "Enganxa o escriu un enlla\u00e7",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL que has escrit sembla una adre\u00e7a de correu electr\u00f2nic. Vols afegir-li el prefix obligatori mailto: ?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL que has escrit sembla un enlla\u00e7 extern. Vols afegir-li el prefix obligatori http:\/\/ ?",
-"Link list": "Llista d'enlla\u00e7os",
-"Insert video": "Inserir v\u00eddeo",
-"Insert\/edit video": "Inserir\/editar v\u00eddeo",
-"Insert\/edit media": "Inserir\/editar mitj\u00e0",
-"Alternative source": "Font alternativa",
-"Poster": "P\u00f3ster",
-"Paste your embed code below:": "Enganxau el codi a sota:",
-"Embed": "Incloure",
-"Media": "Mitjans",
-"Nonbreaking space": "Espai fixe",
-"Page break": "Salt de p\u00e0gina",
-"Paste as text": "Enganxar com a text",
-"Preview": "Previsualitzaci\u00f3",
-"Print": "Imprimir",
-"Save": "Desa",
-"Find": "Buscar",
-"Replace with": "Rempla\u00e7ar amb",
-"Replace": "Rempla\u00e7ar",
-"Replace all": "Rempla\u00e7ar-ho tot",
-"Prev": "Anterior",
-"Next": "Seg\u00fcent",
-"Find and replace": "Buscar i rempla\u00e7ar",
-"Could not find the specified string.": "No es pot trobar el text especificat.",
-"Match case": "Coincidir maj\u00fascules",
-"Whole words": "Paraules senceres",
-"Spellcheck": "Comprovar ortrografia",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar tots",
-"Finish": "Finalitzar",
-"Add to Dictionary": "Afegir al diccionari",
-"Insert table": "Inserir taula",
-"Table properties": "Propietats de taula",
-"Delete table": "Esborrar taula",
-"Cell": "Cel\u00b7la",
-"Row": "Fila",
-"Column": "Columna",
-"Cell properties": "Propietats de cel\u00b7la",
-"Merge cells": "Fusionar cel\u00b7les",
-"Split cell": "Dividir cel\u00b7les",
-"Insert row before": "Inserir fila a sobre",
-"Insert row after": "Inserir fila a sota",
-"Delete row": "Esborrar fila",
-"Row properties": "Propietats de fila",
-"Cut row": "Retallar fila",
-"Copy row": "Copiar fila",
-"Paste row before": "Enganxar fila a sobre",
-"Paste row after": "Enganxar fila a sota",
-"Insert column before": "Inserir columna abans",
-"Insert column after": "Inserir columna despr\u00e9s",
-"Delete column": "Esborrar columna",
-"Cols": "Cols",
-"Rows": "Files",
-"Width": "Amplada",
-"Height": "Al\u00e7ada",
-"Cell spacing": "Espai entre cel\u00b7les",
-"Cell padding": "Marge intern",
-"Caption": "Encap\u00e7alament",
-"Left": "A l'esquerra",
-"Center": "Centrat",
-"Right": "A la dreta",
-"Cell type": "Tipus de cel\u00b7la",
-"Scope": "\u00c0mbit",
-"Alignment": "Aliniament",
-"H Align": "Al\u00edniament H",
-"V Align": "Al\u00edniament V",
-"Top": "Superior",
-"Middle": "Mitj\u00e0",
-"Bottom": "Inferior",
-"Header cell": "Cel\u00b7la de cap\u00e7alera",
-"Row group": "Grup de fila",
-"Column group": "Grup de columna",
-"Row type": "Tipus de fila",
-"Header": "Cap\u00e7alera",
-"Body": "Cos",
-"Footer": "Peu",
-"Border color": "Color de vora",
-"Insert template": "Inserir plantilla",
-"Templates": "Plantilles",
-"Template": "Plantilla",
-"Text color": "Color del text",
-"Background color": "Color del fons",
-"Custom...": "Personalitzar...",
-"Custom color": "Personalitzar el color",
-"No color": "Sense color",
-"Table of Contents": "Taula de continguts",
-"Show blocks": "Mostrar blocs",
-"Show invisible characters": "Mostrar car\u00e0cters invisibles",
-"Words: {0}": "Paraules: {0}",
-"{0} words": "{0} paraules",
-"File": "Arxiu",
-"Edit": "Edici\u00f3",
-"Insert": "Inserir",
-"View": "Veure",
-"Format": "Format",
-"Table": "Taula",
-"Tools": "Eines",
-"Powered by {0}": "Impulsat per {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c0rea de text amb format. Premeu ALT-F9 per mostrar el men\u00fa, ALT F10 per la barra d'eines i ALT-0 per ajuda."
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cs.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cs.js
deleted file mode 100644
index 264b32fcd0..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cs.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('cs',{
-"Redo": "Znovu",
-"Undo": "Zp\u011bt",
-"Cut": "Vyjmout",
-"Copy": "Kop\u00edrovat",
-"Paste": "Vlo\u017eit",
-"Select all": "Vybrat v\u0161e",
-"New document": "Nov\u00fd dokument",
-"Ok": "OK",
-"Cancel": "Zru\u0161it",
-"Visual aids": "Vizu\u00e1ln\u00ed pom\u016fcky",
-"Bold": "Tu\u010dn\u00e9",
-"Italic": "Kurz\u00edva",
-"Underline": "Podtr\u017een\u00e9",
-"Strikethrough": "P\u0159e\u0161rktnut\u00e9",
-"Superscript": "Horn\u00ed index",
-"Subscript": "Doln\u00ed index",
-"Clear formatting": "Vymazat form\u00e1tov\u00e1n\u00ed",
-"Align left": "Zarovnat vlevo",
-"Align center": "Zarovnat na st\u0159ed",
-"Align right": "Zarovnat vpravo",
-"Justify": "Zarovnat do bloku",
-"Bullet list": "Odr\u00e1\u017eky",
-"Numbered list": "\u010c\u00edslov\u00e1n\u00ed",
-"Decrease indent": "Zmen\u0161it odsazen\u00ed",
-"Increase indent": "Zv\u011bt\u0161it odsazen\u00ed",
-"Close": "Zav\u0159\u00edt",
-"Formats": "Form\u00e1ty",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "V\u00e1\u0161 prohl\u00ed\u017ee\u010d nepodporuje p\u0159\u00edm\u00fd p\u0159\u00edstup do schr\u00e1nky. Pou\u017eijte pros\u00edm kl\u00e1vesov\u00e9 zkratky Ctrl+X\/C\/V.",
-"Headers": "Nadpisy",
-"Header 1": "Nadpis 1",
-"Header 2": "Nadpis 2",
-"Header 3": "Nadpis 3",
-"Header 4": "Nadpis 4",
-"Header 5": "Nadpis 5",
-"Header 6": "Nadpis 6",
-"Headings": "Nadpisy",
-"Heading 1": "Nadpis 1",
-"Heading 2": "Nadpis 2",
-"Heading 3": "Nadpis 3",
-"Heading 4": "Nadpis 4",
-"Heading 5": "Nadpis 5",
-"Heading 6": "Nadpis 6",
-"Preformatted": "P\u0159edform\u00e1tov\u00e1no",
-"Div": "Div (blok)",
-"Pre": "Pre (p\u0159edform\u00e1tov\u00e1no)",
-"Code": "Code (k\u00f3d)",
-"Paragraph": "Odstavec",
-"Blockquote": "Citace",
-"Inline": "\u0158\u00e1dkov\u00e9 zobrazen\u00ed (inline)",
-"Blocks": "Blokov\u00e9 zobrazen\u00ed (block)",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Je zapnuto vkl\u00e1d\u00e1n\u00ed \u010dist\u00e9ho textu. Dokud nebude tato volba vypnuta, bude ve\u0161ker\u00fd obsah vlo\u017een jako \u010dist\u00fd text.",
-"Font Family": "Typ p\u00edsma",
-"Font Sizes": "Velikost p\u00edsma",
-"Class": "T\u0159\u00edda",
-"Browse for an image": "Vyhledat obr\u00e1zek",
-"OR": "nebo",
-"Drop an image here": "Nahr\u00e1t obr\u00e1zek",
-"Upload": "Nahr\u00e1t",
-"Block": "Blok",
-"Align": "Zarovnat",
-"Default": "V\u00fdchoz\u00ed",
-"Circle": "Kole\u010dko",
-"Disc": "Punt\u00edk",
-"Square": "\u010ctvere\u010dek",
-"Lower Alpha": "Norm\u00e1ln\u00ed \u010d\u00edslov\u00e1n\u00ed",
-"Lower Greek": "Mal\u00e9 p\u00edsmenkov\u00e1n\u00ed",
-"Lower Roman": "Mal\u00e9 \u0159\u00edmsk\u00e9 \u010d\u00edslice",
-"Upper Alpha": "velk\u00e9 p\u00edsmenkov\u00e1n\u00ed",
-"Upper Roman": "\u0158\u00edmsk\u00e9 \u010d\u00edslice",
-"Anchor": "Kotva",
-"Name": "N\u00e1zev",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id by m\u011blo za\u010d\u00ednat p\u00edsmenem a d\u00e1le obsahovat pouze p\u00edsmena, \u010d\u00edsla, poml\u010dky, te\u010dky, dvojte\u010dky, nebo podtr\u017e\u00edtka.",
-"You have unsaved changes are you sure you want to navigate away?": "M\u00e1te neulo\u017een\u00e9 zm\u011bny. Opravdu chcete opustit str\u00e1nku?",
-"Restore last draft": "Obnovit posledn\u00ed koncept",
-"Special character": "Speci\u00e1ln\u00ed znak",
-"Source code": "Zdrojov\u00fd k\u00f3d",
-"Insert\/Edit code sample": "Vlo\u017eit \/ Upravit uk\u00e1zkov\u00fd k\u00f3d",
-"Language": "Jazyk",
-"Code sample": "Uk\u00e1zkov\u00fd k\u00f3d",
-"Color": "Barva",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Zleva doprava",
-"Right to left": "Zprava doleva",
-"Emoticons": "Emotikony",
-"Document properties": "Vlastnosti dokumentu",
-"Title": "Titulek",
-"Keywords": "Kl\u00ed\u010dov\u00e1 slova",
-"Description": "Popis",
-"Robots": "Roboti",
-"Author": "Autor",
-"Encoding": "K\u00f3dov\u00e1n\u00ed",
-"Fullscreen": "Na celou obrazovku",
-"Action": "Akce",
-"Shortcut": "Kl\u00e1vesov\u00e1 zkratka",
-"Help": "N\u00e1pov\u011bda",
-"Address": "Blok s po\u0161tovn\u00ed adresou",
-"Focus to menubar": "P\u0159ej\u00edt do menu",
-"Focus to toolbar": "P\u0159ej\u00edt na panel n\u00e1stroj\u016f",
-"Focus to element path": "P\u0159ej\u00edt na element path",
-"Focus to contextual toolbar": "P\u0159ej\u00edt na kontextov\u00fd panel n\u00e1stroj\u016f",
-"Insert link (if link plugin activated)": "Vlo\u017eit odkaz (pokud je aktivn\u00ed link plugin)",
-"Save (if save plugin activated)": "Ulo\u017eit (pokud je aktivni save plugin)",
-"Find (if searchreplace plugin activated)": "Hledat (pokud je aktivn\u00ed plugin searchreplace)",
-"Plugins installed ({0}):": "Instalovan\u00e9 pluginy ({0}):",
-"Premium plugins:": "Pr\u00e9miov\u00e9 pluginy:",
-"Learn more...": "Zjistit v\u00edce...",
-"You are using {0}": "Pou\u017e\u00edv\u00e1te {0}",
-"Plugins": "Pluginy",
-"Handy Shortcuts": "U\u017eite\u010dn\u00e9 kl\u00e1vesov\u00e9 zkratky",
-"Horizontal line": "Vodorovn\u00e1 \u010d\u00e1ra",
-"Insert\/edit image": "Vlo\u017eit \/ upravit obr\u00e1zek",
-"Image description": "Popis obr\u00e1zku",
-"Source": "URL",
-"Dimensions": "Rozm\u011bry",
-"Constrain proportions": "Zachovat proporce",
-"General": "Obecn\u00e9",
-"Advanced": "Pokro\u010dil\u00e9",
-"Style": "Styl",
-"Vertical space": "Vertik\u00e1ln\u00ed mezera",
-"Horizontal space": "Horizont\u00e1ln\u00ed mezera",
-"Border": "R\u00e1me\u010dek",
-"Insert image": "Vlo\u017eit obr\u00e1zek",
-"Image": "Obr\u00e1zek",
-"Image list": "Seznam obr\u00e1zk\u016f",
-"Rotate counterclockwise": "Oto\u010dit doleva",
-"Rotate clockwise": "Oto\u010dit doprava",
-"Flip vertically": "P\u0159evr\u00e1tit svisle",
-"Flip horizontally": "P\u0159evr\u00e1tit vodorovn\u011b",
-"Edit image": "Upravit obr\u00e1zek",
-"Image options": "Vlastnosti obr\u00e1zku",
-"Zoom in": "P\u0159ibl\u00ed\u017eit",
-"Zoom out": "Odd\u00e1lit",
-"Crop": "O\u0159\u00edznout",
-"Resize": "Zm\u011bnit velikost",
-"Orientation": "Transformovat",
-"Brightness": "Jas",
-"Sharpen": "Ostrost",
-"Contrast": "Kontrast",
-"Color levels": "\u00darovn\u011b barev",
-"Gamma": "Gama",
-"Invert": "Invertovat",
-"Apply": "Pou\u017e\u00edt",
-"Back": "Zp\u011bt",
-"Insert date\/time": "Vlo\u017eit datum \/ \u010das",
-"Date\/time": "Datum\/\u010das",
-"Insert link": "Vlo\u017eit odkaz",
-"Insert\/edit link": "Vlo\u017eit \/ upravit odkaz",
-"Text to display": "Text k zobrazen\u00ed",
-"Url": "URL",
-"Target": "C\u00edl",
-"None": "\u017d\u00e1dn\u00e9",
-"New window": "Nov\u00e9 okno",
-"Remove link": "Odstranit odkaz",
-"Anchors": "Kotvy",
-"Link": "Odkaz",
-"Paste or type a link": "Vlo\u017eit nebo napsat odkaz",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Zadan\u00e9 URL vypad\u00e1 jako e-mailov\u00e1 adresa. Chcete doplnit povinn\u00fd prefix mailto:?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Zadan\u00e9 URL vypad\u00e1 jako odkaz na jin\u00fd web. Chcete doplnit povinn\u00fd prefix http:\/\/?",
-"Link list": "Seznam odkaz\u016f",
-"Insert video": "Vlo\u017eit video",
-"Insert\/edit video": "Vlo\u017eit \/ upravit video",
-"Insert\/edit media": "Vlo\u017eit \/ upravit m\u00e9dia",
-"Alternative source": "Alternativn\u00ed zdroj",
-"Poster": "N\u00e1hled",
-"Paste your embed code below:": "Vlo\u017ete k\u00f3d pro vlo\u017een\u00ed n\u00ed\u017ee:",
-"Embed": "Vlo\u017eit",
-"Media": "M\u00e9dia",
-"Nonbreaking space": "Pevn\u00e1 mezera",
-"Page break": "Konec str\u00e1nky",
-"Paste as text": "Vlo\u017eit jako \u010dist\u00fd text",
-"Preview": "N\u00e1hled",
-"Print": "Tisk",
-"Save": "Ulo\u017eit",
-"Find": "Naj\u00edt",
-"Replace with": "Nahradit za",
-"Replace": "Nahradit",
-"Replace all": "Nahradit v\u0161e",
-"Prev": "P\u0159edchoz\u00ed",
-"Next": "Dal\u0161\u00ed",
-"Find and replace": "Naj\u00edt a nahradit",
-"Could not find the specified string.": "Zadan\u00fd \u0159et\u011bzec nebyl nalezen.",
-"Match case": "Rozli\u0161ovat mal\u00e1 a velk\u00e1 p\u00edsmena",
-"Whole words": "Pouze cel\u00e1 slova",
-"Spellcheck": "Kontrola pravopisu",
-"Ignore": "Ignorovat",
-"Ignore all": "Ignorovat v\u0161e",
-"Finish": "Ukon\u010dit",
-"Add to Dictionary": "P\u0159idat do slovn\u00edku",
-"Insert table": "Vlo\u017eit tabulku",
-"Table properties": "Vlastnosti tabulky",
-"Delete table": "Smazat tabulku",
-"Cell": "Bu\u0148ka",
-"Row": "\u0158\u00e1dek",
-"Column": "Sloupec",
-"Cell properties": "Vlastnosti bu\u0148ky",
-"Merge cells": "Slou\u010dit bu\u0148ky",
-"Split cell": "Rozd\u011blit bu\u0148ky",
-"Insert row before": "Vlo\u017eit \u0159\u00e1dek nad",
-"Insert row after": "Vlo\u017eit \u0159\u00e1dek pod",
-"Delete row": "Smazat \u0159\u00e1dek",
-"Row properties": "Vlastnosti \u0159\u00e1dku",
-"Cut row": "Vyjmout \u0159\u00e1dek",
-"Copy row": "Kop\u00edrovat \u0159\u00e1dek",
-"Paste row before": "Vlo\u017eit \u0159\u00e1dek nad",
-"Paste row after": "Vlo\u017eit \u0159\u00e1dek pod",
-"Insert column before": "Vlo\u017eit sloupec vlevo",
-"Insert column after": "Vlo\u017eit sloupec vpravo",
-"Delete column": "Smazat sloupec",
-"Cols": "Sloupc\u016f",
-"Rows": "\u0158\u00e1dek",
-"Width": "\u0160\u00ed\u0159ka",
-"Height": "V\u00fd\u0161ka",
-"Cell spacing": "Vn\u011bj\u0161\u00ed okraj bun\u011bk",
-"Cell padding": "Vnit\u0159n\u00ed okraj bun\u011bk",
-"Caption": "Nadpis",
-"Left": "Vlevo",
-"Center": "Na st\u0159ed",
-"Right": "Vpravo",
-"Cell type": "Typ bu\u0148ky",
-"Scope": "Rozsah",
-"Alignment": "Zarovn\u00e1n\u00ed",
-"H Align": "Horizont\u00e1ln\u00ed zarovn\u00e1n\u00ed",
-"V Align": "Vertik\u00e1ln\u00ed zarovn\u00e1n\u00ed",
-"Top": "Nahoru",
-"Middle": "Uprost\u0159ed",
-"Bottom": "Dol\u016f",
-"Header cell": "Hlavi\u010dkov\u00e1 bu\u0148ka",
-"Row group": "Skupina \u0159\u00e1dk\u016f",
-"Column group": "Skupina sloupc\u016f",
-"Row type": "Typ \u0159\u00e1dku",
-"Header": "Hlavi\u010dka",
-"Body": "T\u011blo",
-"Footer": "Pati\u010dka",
-"Border color": "Barva r\u00e1me\u010dku",
-"Insert template": "Vlo\u017eit \u0161ablonu",
-"Templates": "\u0160ablony",
-"Template": "\u0160ablona",
-"Text color": "Barva p\u00edsma",
-"Background color": "Barva pozad\u00ed",
-"Custom...": "Vlastn\u00ed...",
-"Custom color": "Vlastn\u00ed barva",
-"No color": "Bez barvy",
-"Table of Contents": "Obsah",
-"Show blocks": "Uk\u00e1zat bloky",
-"Show invisible characters": "Zobrazit speci\u00e1ln\u00ed znaky",
-"Words: {0}": "Po\u010det slov: {0}",
-"{0} words": "Po\u010det slov: {0}",
-"File": "Soubor",
-"Edit": "\u00dapravy",
-"Insert": "Vlo\u017eit",
-"View": "Zobrazit",
-"Format": "Form\u00e1t",
-"Table": "Tabulka",
-"Tools": "N\u00e1stroje",
-"Powered by {0}": "Vytvo\u0159il {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Editor. Stiskn\u011bte ALT-F9 pro menu, ALT-F10 pro n\u00e1strojovou li\u0161tu a ALT-0 pro n\u00e1pov\u011bdu."
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cs_CZ.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cs_CZ.js
deleted file mode 100644
index b5b47394c0..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cs_CZ.js
+++ /dev/null
@@ -1,260 +0,0 @@
-tinymce.addI18n('cs_CZ',{
-"Redo": "Znovu",
-"Undo": "Zp\u011bt",
-"Cut": "Vyjmout",
-"Copy": "Kop\u00edrovat",
-"Paste": "Vlo\u017eit",
-"Select all": "Vybrat v\u0161e",
-"New document": "Nov\u00fd dokument",
-"Ok": "Ok",
-"Cancel": "Zru\u0161it",
-"Visual aids": "Vizu\u00e1ln\u00ed pom\u016fcky",
-"Bold": "Tu\u010dn\u011b",
-"Italic": "Kurz\u00edva",
-"Underline": "Podtr\u017een\u00e9",
-"Strikethrough": "P\u0159e\u0161krtnut\u00e9",
-"Superscript": "Horn\u00ed index",
-"Subscript": "Doln\u00ed index",
-"Clear formatting": "Vymazat form\u00e1tov\u00e1n\u00ed",
-"Align left": "Vlevo",
-"Align center": "Na st\u0159ed",
-"Align right": "Vpravo",
-"Justify": "Zarovnat do bloku",
-"Bullet list": "Odr\u00e1\u017eky",
-"Numbered list": "\u010c\u00edslov\u00e1n\u00ed",
-"Decrease indent": "Zmen\u0161it odsazen\u00ed",
-"Increase indent": "Zv\u011b\u0161it odsazen\u00ed",
-"Close": "Zav\u0159\u00edt",
-"Formats": "Form\u00e1ty",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "V\u00e1\u0161 prohl\u00ed\u017ee\u010d nepodporuje p\u0159\u00edm\u00fd p\u0159\u00edstup do schr\u00e1nky. Pou\u017eijte pros\u00edm kl\u00e1vesov\u00e9 zkratky Ctrl+X\/C\/V.",
-"Headers": "Nadpisy",
-"Header 1": "Nadpis 1",
-"Header 2": "Nadpis 2",
-"Header 3": "Nadpis 3",
-"Header 4": "Nadpis 4",
-"Header 5": "Nadpis 5",
-"Header 6": "Nadpis 6",
-"Headings": "Nadpisy",
-"Heading 1": "Nadpis 1",
-"Heading 2": "Nadpis 2",
-"Heading 3": "Nadpis 3",
-"Heading 4": "Nadpis 4",
-"Heading 5": "Nadpis 5",
-"Heading 6": "Nadpis 6",
-"Div": "Div (blok)",
-"Pre": "Pre (p\u0159edform\u00e1tov\u00e1no)",
-"Code": "Code (k\u00f3d)",
-"Paragraph": "Odstavec",
-"Blockquote": "Citace",
-"Inline": "\u0158\u00e1dkov\u00e9 zobrazen\u00ed (inline)",
-"Blocks": "Blokov\u00e9 zobrazen\u00ed (block)",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Je zapnuto vkl\u00e1d\u00e1n\u00ed \u010dist\u00e9ho textu. Dokud nebude tato volba vypnuta, bude ve\u0161ker\u00fd obsah vlo\u017een jako \u010dist\u00fd text.",
-"Font Family": "Rodina p\u00edsma",
-"Font Sizes": "Velikost p\u00edsma",
-"Class": "T\u0159\u00edda",
-"Browse for an image": "Vybrat obr\u00e1zek",
-"OR": "NEBO",
-"Drop an image here": "P\u0159et\u00e1hn\u011bte obr\u00e1zek sem",
-"Upload": "Nahr\u00e1t",
-"Block": "Blok",
-"Align": "Zarovnat",
-"Default": "V\u00fdchoz\u00ed",
-"Circle": "Kole\u010dko",
-"Disc": "Punt\u00edk",
-"Square": "\u010ctvere\u010dek",
-"Lower Alpha": "Mal\u00e1 p\u00edsmena",
-"Lower Greek": "\u0158eck\u00e1 p\u00edsmena",
-"Lower Roman": "Mal\u00e9 \u0159\u00edmsl\u00e9 \u010d\u00edslice",
-"Upper Alpha": "Velk\u00e1 p\u00edsmena",
-"Upper Roman": "\u0158\u00edmsk\u00e9 \u010d\u00edslice",
-"Anchor": "Kotva",
-"Name": "N\u00e1zev",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID by m\u011blo za\u010d\u00ednat p\u00edsmenem, n\u00e1sledovan\u00fdm pouze p\u00edsmeny, \u010d\u00edsly, poml\u010dkami, te\u010dkami, \u010d\u00e1rkami a nebo podtr\u017e\u00edtky.",
-"You have unsaved changes are you sure you want to navigate away?": "M\u00e1te neulo\u017een\u00e9 zm\u011bny. Opravdu chcete opustit str\u00e1nku?",
-"Restore last draft": "Obnovit posledn\u00ed koncept.",
-"Special character": "Speci\u00e1ln\u00ed znak",
-"Source code": "Zdrojov\u00fd k\u00f3d",
-"Insert\/Edit code sample": "Vlo\u017eit\/Upravit uk\u00e1zku k\u00f3du",
-"Language": "Jazyk",
-"Code sample": "Uk\u00e1zka k\u00f3du",
-"Color": "Barva",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Zleva doprava",
-"Right to left": "Zprava doleva",
-"Emoticons": "Emotikony",
-"Document properties": "Vlastnosti dokumentu",
-"Title": "Titulek",
-"Keywords": "Kl\u00ed\u010dov\u00e1 slova",
-"Description": "Popis",
-"Robots": "Roboti",
-"Author": "Autor",
-"Encoding": "K\u00f3dov\u00e1n\u00ed",
-"Fullscreen": "Celk\u00e1 obrazovka",
-"Action": "Akce",
-"Shortcut": "Kl\u00e1vesov\u00e1 zkratka",
-"Help": "N\u00e1pov\u011bda",
-"Address": "Blok s po\u0161tovn\u00ed adresou",
-"Focus to menubar": "P\u0159ej\u00edt do menu",
-"Focus to toolbar": "P\u0159ej\u00edt na panel n\u00e1stroj\u016f",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "P\u0159ej\u00edt na kontextov\u00fd panel n\u00e1stroj\u016f",
-"Insert link (if link plugin activated)": "Vlo\u017eit odkaz (pokud je aktivn\u00ed link plugin)",
-"Save (if save plugin activated)": "Ulo\u017eit (pokud je aktivni save plugin)",
-"Find (if searchreplace plugin activated)": "Hledat (pokud je aktivn\u00ed plugin searchreplace)",
-"Plugins installed ({0}):": "Instalovan\u00e9 pluginy ({0}):",
-"Premium plugins:": "Pr\u00e9miov\u00e9 pluginy:",
-"Learn more...": "Zjistit v\u00edce...",
-"You are using {0}": "Pou\u017e\u00edv\u00e1te {0}",
-"Plugins": "Pluginy",
-"Handy Shortcuts": "U\u017eite\u010dn\u00e9 kl\u00e1vesov\u00e9 zkratky",
-"Horizontal line": "Vodorovn\u00e1 linka",
-"Insert\/edit image": "Vlo\u017eit \/ upravit obr\u00e1zek",
-"Image description": "Popis obr\u00e1zku",
-"Source": "URL",
-"Dimensions": "Rozm\u011bry",
-"Constrain proportions": "Zachovat proporce",
-"General": "Obecn\u00e9",
-"Advanced": "Pokro\u010dil\u00e9",
-"Style": "Styl",
-"Vertical space": "Vertik\u00e1ln\u00ed mezera",
-"Horizontal space": "Horizont\u00e1ln\u00ed mezera",
-"Border": "R\u00e1me\u010dek",
-"Insert image": "Vlo\u017eit obr\u00e1zek",
-"Image": "Obr\u00e1zek",
-"Image list": "Seznam obr\u00e1zk\u016f",
-"Rotate counterclockwise": "Oto\u010dit doleva",
-"Rotate clockwise": "Oto\u010dit doprava",
-"Flip vertically": "P\u0159evr\u00e1tit svisle",
-"Flip horizontally": "P\u0159evr\u00e1tit vodorovn\u011b",
-"Edit image": "Upravit obr\u00e1zek",
-"Image options": "Vlastnosti obr\u00e1zku",
-"Zoom in": "P\u0159ibl\u00ed\u017eit",
-"Zoom out": "Odd\u00e1lit",
-"Crop": "O\u0159\u00edznout",
-"Resize": "Zm\u011bnit velikost",
-"Orientation": "Orientace",
-"Brightness": "Jas",
-"Sharpen": "Ostrost",
-"Contrast": "Kontrast",
-"Color levels": "\u00darovn\u011b barev",
-"Gamma": "Gama",
-"Invert": "Invertovat",
-"Apply": "Pou\u017e\u00edt",
-"Back": "Zp\u011bt",
-"Insert date\/time": "Vlo\u017eit datum \/ \u010das",
-"Date\/time": "Datum\/\u010das",
-"Insert link": "Vlo\u017eit odkaz",
-"Insert\/edit link": "Vlo\u017eit \/ upravit odkaz",
-"Text to display": "Text odkazu",
-"Url": "URL",
-"Target": "C\u00edl",
-"None": "\u017d\u00e1dn\u00fd",
-"New window": "Nov\u00e9 okno",
-"Remove link": "Odstranit odkaz",
-"Anchors": "Kotvy",
-"Link": "Odkaz",
-"Paste or type a link": "Vlo\u017ete nebo napi\u0161te adresu odkazu",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Zadan\u00e9 URL vypad\u00e1 jako e-mailov\u00e1 adresa. Chcete doplnit povinn\u00fd prefix mailto:?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Zadan\u00e9 URL vypad\u00e1 jako odkaz na jin\u00fd web. Chcete doplnit povinn\u00fd prefix http:\/\/?",
-"Link list": "Seznam odkaz\u016f",
-"Insert video": "Vlo\u017eit video",
-"Insert\/edit video": "Vlo\u017eit \/ upravit video",
-"Insert\/edit media": "Vlo\u017eit\/upravit m\u00e9dia",
-"Alternative source": "Alternativn\u00ed zdroj",
-"Poster": "Poster",
-"Paste your embed code below:": "Vlo\u017ete k\u00f3d pro vlo\u017een\u00ed",
-"Embed": "Vlo\u017een\u00fd",
-"Media": "M\u00e9dia",
-"Nonbreaking space": "Pevn\u00e1 mezera",
-"Page break": "Konec str\u00e1nky",
-"Paste as text": "Vlo\u017eit jako \u010dist\u00fd text",
-"Preview": "N\u00e1hled",
-"Print": "Tisk",
-"Save": "Ulo\u017eit",
-"Find": "Naj\u00edt",
-"Replace with": "Nahradit za",
-"Replace": "Nahradit",
-"Replace all": "Nahradit v\u0161e",
-"Prev": "P\u0159edchoz\u00ed",
-"Next": "Dal\u0161\u00ed",
-"Find and replace": "Naj\u00edt a nahradit",
-"Could not find the specified string.": "Zadan\u00fd \u0159et\u011bzec nebyl nalezen.",
-"Match case": "Rozli\u0161ovat mal\u00e1 a velk\u00e1 p\u00edsmena",
-"Whole words": "Pouze cel\u00e1 slova",
-"Spellcheck": "Kontrola pravopisu",
-"Ignore": "Ignorovat",
-"Ignore all": "Ignorovat v\u0161e",
-"Finish": "Dokon\u010dit",
-"Add to Dictionary": "P\u0159idat do slovn\u00edku",
-"Insert table": "Vlo\u017eit tabulku",
-"Table properties": "Vlastnosti tabulky",
-"Delete table": "Smazat tabulku",
-"Cell": "Bu\u0148ka",
-"Row": "\u0158\u00e1dek",
-"Column": "Sloupec",
-"Cell properties": "Vlastnosti bu\u0148ky",
-"Merge cells": "Slou\u010dit bu\u0148ky",
-"Split cell": "Rozd\u011blit bu\u0148ku",
-"Insert row before": "Vlo\u017eit \u0159\u00e1dek p\u0159ed",
-"Insert row after": "Vlo\u017eit \u0159\u00e1dek za",
-"Delete row": "Smazat \u0159\u00e1dek",
-"Row properties": "Vlastnosti \u0159\u00e1dku",
-"Cut row": "Vyjmout \u0159\u00e1dek",
-"Copy row": "Kop\u00edrovat \u0159\u00e1dek",
-"Paste row before": "Vlo\u017eit \u0159\u00e1dek nad",
-"Paste row after": "Vlo\u017eit \u0159\u00e1dek pod",
-"Insert column before": "Vlo\u017eit sloupec vlevo",
-"Insert column after": "Vlo\u017eit sloupec vpravo",
-"Delete column": "Smazat sloupec",
-"Cols": "Sloupce",
-"Rows": "\u0158\u00e1dky",
-"Width": "\u0160\u00ed\u0159ka",
-"Height": "V\u00fd\u0161ka",
-"Cell spacing": "Vn\u011bj\u0161\u00ed okraj bun\u011bk",
-"Cell padding": "Vnit\u0159n\u00ed okraj bun\u011bk",
-"Caption": "Titulek",
-"Left": "Vlevo",
-"Center": "Na st\u0159ed",
-"Right": "Vpravo",
-"Cell type": "Typ bu\u0148ky",
-"Scope": "Rozsah",
-"Alignment": "Zarovn\u00e1n\u00ed",
-"H Align": "Horizont\u00e1ln\u00ed zarovn\u00e1n\u00ed",
-"V Align": "Vertik\u00e1ln\u00ed zarovn\u00e1n\u00ed",
-"Top": "Nahoru",
-"Middle": "Na st\u0159ed",
-"Bottom": "Dol\u016f",
-"Header cell": "Hlavi\u010dkov\u00e1 bu\u0148ka",
-"Row group": "Skupina \u0159\u00e1dk\u016f",
-"Column group": "Skupina sloupc\u016f",
-"Row type": "Typ \u0159\u00e1dku",
-"Header": "Hlavi\u010dka",
-"Body": "T\u011blo",
-"Footer": "Pati\u010dka",
-"Border color": "Barva r\u00e1me\u010dku",
-"Insert template": "Vlo\u017eit ze \u0161ablony",
-"Templates": "\u0160ablony",
-"Template": "\u0160ablona",
-"Text color": "Barva p\u00edsma",
-"Background color": "Barva pozad\u00ed",
-"Custom...": "Vlastn\u00ed",
-"Custom color": "Vlastn\u00ed barva",
-"No color": "Bez barvy",
-"Table of Contents": "Generovat obsah",
-"Show blocks": "Uk\u00e1zat bloky",
-"Show invisible characters": "Uk\u00e1zat skryt\u00e9 znaky",
-"Words: {0}": "Slova: {0}",
-"{0} words": "{0} slov",
-"File": "Soubor",
-"Edit": "\u00dapravy",
-"Insert": "Vlo\u017eit",
-"View": "Zobrazit",
-"Format": "Form\u00e1t",
-"Table": "Tabulka",
-"Tools": "N\u00e1stroje",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "RTF dokument. Stikn\u011bte ALT-F9 pro zobrazen\u00ed menu, ALT-F10 pro zobrazen\u00ed n\u00e1strojov\u00e9 li\u0161ty, ALT-0 pro n\u00e1pov\u011bdu."
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cy.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cy.js
deleted file mode 100644
index 2863840abb..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cy.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('cy',{
-"Cut": "Torri",
-"Heading 5": "Pennawd 5",
-"Header 2": "Pennawd 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Dyw eich porwr ddim yn cynnal mynediad uniongyrchol i'r clipfwrdd. Yn hytrach defnyddiwch y bysellau llwybrau byr Ctrl+X\/C\/V.",
-"Heading 4": "Pennawd 4",
-"Div": "Div",
-"Heading 2": "Pennawd 2",
-"Paste": "Gludo",
-"Close": "Cau",
-"Font Family": "Teulu Ffont",
-"Pre": "Pre",
-"Align right": "Aliniad de",
-"New document": "Dogfen newydd",
-"Blockquote": "Dyfyniad bloc",
-"Numbered list": "Rhestr rifol",
-"Heading 1": "Pennawd 1",
-"Headings": "Penawdau",
-"Increase indent": "Cynyddu mewnoliad",
-"Formats": "Fformatau",
-"Headers": "Penawdau",
-"Select all": "Dewis popeth",
-"Header 3": "Pennawd 3",
-"Blocks": "Blociau",
-"Undo": "Dadwneud",
-"Strikethrough": "Llinell drwodd",
-"Bullet list": "Rhestr fwled",
-"Header 1": "Pennawd 1",
-"Superscript": "Uwchsgript",
-"Clear formatting": "Clirio pob fformat",
-"Font Sizes": "Meintiau Ffont",
-"Subscript": "Is-sgript",
-"Header 6": "Pennawd 6",
-"Redo": "Ailwneud",
-"Paragraph": "Paragraff",
-"Ok": "Iawn",
-"Bold": "Bras",
-"Code": "Cod",
-"Italic": "Italig",
-"Align center": "Aliniad canol",
-"Header 5": "Pennawd 5",
-"Heading 6": "Pennawd 6",
-"Heading 3": "Pennawd 3",
-"Decrease indent": "Lleihau mewnoliad",
-"Header 4": "Pennawd 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Mae gludo nawr yn gweithio yn y modd testun plaen.  Caiff testun plaen ei ludo nawr tan gaiff yr opsiwn ei doglo i'w ddiffodd.",
-"Underline": "Tanlinellu",
-"Cancel": "Canslo",
-"Justify": "Unioni",
-"Inline": "Mewnlin",
-"Copy": "Cop\u00efo",
-"Align left": "Aliniad chwith",
-"Visual aids": "Cymorth gweledol",
-"Lower Greek": "Groeg Is",
-"Square": "Sgw\u00e2r",
-"Default": "Diofyn",
-"Lower Alpha": "Alffa Is",
-"Circle": "Cylch",
-"Disc": "Disg",
-"Upper Alpha": "Alffa Uwch",
-"Upper Roman": "Rhufeinig Uwch",
-"Lower Roman": "Rhufeinig Is",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Dylai Id gychwyn gyda llythyren ac yna dim ond llythrennau, rhifau, llinellau toriad,dotiau, colonau neu danlinellau.",
-"Name": "Enw",
-"Anchor": "Angor",
-"Id": "Id",
-"You have unsaved changes are you sure you want to navigate away?": "Mae newidiadau heb eu cadw - ydych chi wir am symud i ffwrdd?",
-"Restore last draft": "Adfer y drafft olaf",
-"Special character": "Nod arbennig",
-"Source code": "Cod gwreiddiol",
-"Language": "Iaith",
-"Insert\/Edit code sample": "Mewnosod\/golygu sampl cod",
-"B": "Gl",
-"R": "C",
-"G": "Gw",
-"Color": "Lliw",
-"Right to left": "De i'r chwith",
-"Left to right": "Chwith i'r dde",
-"Emoticons": "Gwenogluniau",
-"Robots": "Robotiaid",
-"Document properties": "Priodweddau'r ddogfen",
-"Title": "Teitl",
-"Keywords": "Allweddeiriau",
-"Encoding": "Amgodiad",
-"Description": "Disgrifiad",
-"Author": "Awdur",
-"Fullscreen": "Sgrin llawn",
-"Horizontal line": "Llinell lorweddol",
-"Horizontal space": "Gofod llorweddol",
-"Insert\/edit image": "Mewnosod\/golygu delwedd",
-"General": "Cyffredinol",
-"Advanced": "Uwch",
-"Source": "Ffynhonnell",
-"Border": "Border",
-"Constrain proportions": "Gorfodi cyfrannedd",
-"Vertical space": "Gofod fertigol",
-"Image description": "Disgrifiad y ddelwedd",
-"Style": "Arddull",
-"Dimensions": "Dimensiynau",
-"Insert image": "Mewnosod delwedd",
-"Image": "Delwedd",
-"Zoom in": "Chwyddo mewn",
-"Contrast": "Cyferbynnedd",
-"Back": "Nol",
-"Gamma": "Gamma",
-"Flip horizontally": "Fflipio llorweddol",
-"Resize": "Ailfeintio",
-"Sharpen": "Hogi",
-"Zoom out": "Chwyddo allan",
-"Image options": "Dewisiadau delwedd",
-"Apply": "Rhoi ar waith",
-"Brightness": "Disgleirdeb",
-"Rotate clockwise": "Troi clocwedd",
-"Rotate counterclockwise": "Troi gwrthgloc",
-"Edit image": "Golygu delwedd",
-"Color levels": "Lefelau Lliw",
-"Crop": "Tocio",
-"Orientation": "Cyfeiriadaeth",
-"Flip vertically": "Fflipio fertigol",
-"Invert": "Gwrthdroi",
-"Date\/time": "Dyddiad\/amser",
-"Insert date\/time": "Mewnosod dyddiad\/amser",
-"Remove link": "Tynnu dolen",
-"Url": "URL",
-"Text to display": "Testun i'w ddangos",
-"Anchors": "Angorau",
-"Insert link": "Mewnosod dolen",
-"Link": "Dolen",
-"New window": "Ffenest newydd",
-"None": "Dim",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Mae'n debyg mai dolen allanol yw'r URL hwn. Ydych chi am ychwanegu'r rhagddodiad http:\/\/ ?",
-"Paste or type a link": "Pastio neu deipio dolen",
-"Target": "Targed",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Mae'n debyg mai cyfeiriad e-bost yw'r URL hwn. Ydych chi am ychwanegu'r rhagddoddiad mailto:?",
-"Insert\/edit link": "Mewnosod\/golygu dolen",
-"Insert\/edit video": "Mewnosod\/golygu fideo",
-"Media": "Cyfrwng",
-"Alternative source": "Ffynhonnell amgen",
-"Paste your embed code below:": "Gludwch eich cod mewnosod isod:",
-"Insert video": "Mewnosod fideo",
-"Poster": "Poster",
-"Insert\/edit media": "Mewnosod\/golygu cyfrwng",
-"Embed": "Mewnosod",
-"Nonbreaking space": "Bwlch heb dorri",
-"Page break": "Toriad tudalen",
-"Paste as text": "Gludo fel testun",
-"Preview": "Rhagolwg",
-"Print": "Argraffu",
-"Save": "Cadw",
-"Could not find the specified string.": "Methu ffeindio'r llinyn hwnnw.",
-"Replace": "Amnewid",
-"Next": "Nesaf",
-"Whole words": "Geiriau cyfan",
-"Find and replace": "Chwilio ac amnewid",
-"Replace with": "Amnewid gyda",
-"Find": "Chwilio",
-"Replace all": "Amnewid y cwbl",
-"Match case": "Cas yn cyfateb",
-"Prev": "Blaenorol",
-"Spellcheck": "Sillafydd",
-"Finish": "Gorffen",
-"Ignore all": "Amwybyddu pob",
-"Ignore": "Anwybyddu",
-"Add to Dictionary": "Adio i'r Geiriadur",
-"Insert row before": "Mewnosod rhes cyn",
-"Rows": "Rhesi",
-"Height": "Uchder",
-"Paste row after": "Gludo rhes ar \u00f4l",
-"Alignment": "Aliniad",
-"Border color": "Lliw Border",
-"Column group": "Gr\u0175p colofn",
-"Row": "Rhes",
-"Insert column before": "Mewnosod colofn cyn",
-"Split cell": "Hollti celloedd",
-"Cell padding": "Padio celloedd",
-"Cell spacing": "Bylchiad celloedd",
-"Row type": "Math y rhes",
-"Insert table": "Mewnosod tabl",
-"Body": "Corff",
-"Caption": "Pennawd",
-"Footer": "Troedyn",
-"Delete row": "Dileu rhes",
-"Paste row before": "Gludo rhes cyn",
-"Scope": "Cwmpas",
-"Delete table": "Dileu'r tabl",
-"H Align": "Aliniad Ll",
-"Top": "Brig",
-"Header cell": "Cell bennawd",
-"Column": "Colofn",
-"Row group": "Gr\u0175p rhes",
-"Cell": "Cell",
-"Middle": "Canol",
-"Cell type": "Math y gell",
-"Copy row": "Cop\u00efo rhes",
-"Row properties": "Priodweddau rhes",
-"Table properties": "Priodweddau tabl",
-"Bottom": "Gwaelod",
-"V Align": "Aliniad F",
-"Header": "Pennyn",
-"Right": "De",
-"Insert column after": "Mewnosod colofn ar \u00f4l",
-"Cols": "Colofnau",
-"Insert row after": "Mewnosod rhes ar \u00f4l",
-"Width": "Lled",
-"Cell properties": "Priodweddau'r gell",
-"Left": "Chwith",
-"Cut row": "Torri rhes",
-"Delete column": "Dileu colofn",
-"Center": "Canol",
-"Merge cells": "Cyfuno celloedd",
-"Insert template": "Mewnosod templed",
-"Templates": "Templedi",
-"Background color": "Lliw cefndir",
-"Custom...": "Personol...",
-"Custom color": "Lliw personol",
-"No color": "Dim Lliw",
-"Text color": "Lliw testun",
-"Table of Contents": "Tabl Cynnwys",
-"Show blocks": "Dangos blociau",
-"Show invisible characters": "Dangos nodau anweledig",
-"Words: {0}": "Geiriau: {0}",
-"Insert": "Mewnosod",
-"File": "Ffeil",
-"Edit": "Golygu",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Ardal Testun Uwch. Pwyswch ALT-F9 ar gyfer y ddewislen, Pwyswch ALT-F10 ar gyfer y bar offer. Pwyswch ALT-0 am gymorth",
-"Tools": "Offer",
-"View": "Dangos",
-"Table": "Tabl",
-"Format": "Fformat"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/da.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/da.js
deleted file mode 100644
index a50f2f10ec..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/da.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('da',{
-"Redo": "Genopret",
-"Undo": "Fortryd",
-"Cut": "Klip",
-"Copy": "Kopier",
-"Paste": "Inds\u00e6t",
-"Select all": "V\u00e6lg alle",
-"New document": "Nyt dokument",
-"Ok": "Ok",
-"Cancel": "Fortryd",
-"Visual aids": "Visuel hj\u00e6lp",
-"Bold": "Fed",
-"Italic": "Kursiv",
-"Underline": "Understreg",
-"Strikethrough": "Gennemstreg",
-"Superscript": "H\u00e6vet",
-"Subscript": "S\u00e6nket",
-"Clear formatting": "Nulstil formattering",
-"Align left": "Venstrejusteret",
-"Align center": "Centreret",
-"Align right": "H\u00f8jrejusteret",
-"Justify": "Justering",
-"Bullet list": "Punkt tegn",
-"Numbered list": "Nummerering",
-"Decrease indent": "Formindsk indrykning",
-"Increase indent": "For\u00f8g indrykning",
-"Close": "Luk",
-"Formats": "Formater",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Din browser underst\u00f8tter ikke direkte adgang til clipboard. Benyt Ctrl+X\/C\/ keybord shortcuts i stedet for.",
-"Headers": "Overskrifter",
-"Header 1": "Overskrift 1",
-"Header 2": "Overskrift 2",
-"Header 3": "Overskrift 3",
-"Header 4": "Overskrift 4",
-"Header 5": "Overskrift 5",
-"Header 6": "Overskrift 6",
-"Headings": "Overskrifter",
-"Heading 1": "Overskrift 1",
-"Heading 2": "Overskrift 2",
-"Heading 3": "Overskrift 3",
-"Heading 4": "Overskrift 4",
-"Heading 5": "Overskrift 5",
-"Heading 6": "Overskrift 6",
-"Preformatted": "Pr\u00e6formateret",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Code",
-"Paragraph": "S\u00e6tning",
-"Blockquote": "Indrykning",
-"Inline": "Inline",
-"Blocks": "Blokke",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "S\u00e6t ind er indstillet til at inds\u00e6tte som ren tekst. Indhold bliver nu indsat uden formatering indtil du \u00e6ndrer indstillingen.",
-"Font Family": "Skrifttype",
-"Font Sizes": "Skriftst\u00f8rrelse",
-"Class": "Klasse",
-"Browse for an image": "S\u00f8g efter et billede",
-"OR": "ELLER",
-"Drop an image here": "Slip et billede her",
-"Upload": "Opload",
-"Block": "Blok",
-"Align": "Tilpas",
-"Default": "Standard",
-"Circle": "Cirkel",
-"Disc": "Disk",
-"Square": "Kvadrat",
-"Lower Alpha": "Lower Alpha",
-"Lower Greek": "Lower Gr\u00e6sk",
-"Lower Roman": "Lower Roman",
-"Upper Alpha": "Upper Alpha",
-"Upper Roman": "Upper Roman",
-"Anchor": "Anchor",
-"Name": "Navn",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id b\u00f8r starte med et bogstav, efterfulgt af bogstaver, tal, bindestreger, punktummer, koloner eller underscores.",
-"You have unsaved changes are you sure you want to navigate away?": "Du har ikke gemte \u00e6ndringer. Er du sikker p\u00e5 at du vil forts\u00e6tte?",
-"Restore last draft": "Genopret sidste kladde",
-"Special character": "Specielle tegn",
-"Source code": "Kildekode",
-"Insert\/Edit code sample": "Inds\u00e6t\/Ret kodeeksempel",
-"Language": "Sprog",
-"Code sample": "Kodepr\u00f8ve",
-"Color": "Farve",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Venstre til h\u00f8jre",
-"Right to left": "H\u00f8jre til venstre",
-"Emoticons": "Emot-ikoner",
-"Document properties": "Dokument egenskaber",
-"Title": "Titel",
-"Keywords": "S\u00f8geord",
-"Description": "Beskrivelse",
-"Robots": "Robotter",
-"Author": "Forfatter",
-"Encoding": "Kodning",
-"Fullscreen": "Fuldsk\u00e6rm",
-"Action": "Handling",
-"Shortcut": "Genvej",
-"Help": "Hj\u00e6lp",
-"Address": "Adresse",
-"Focus to menubar": "Fokus p\u00e5 menulinjen",
-"Focus to toolbar": "Fokus p\u00e5 v\u00e6rkt\u00f8jslinjen",
-"Focus to element path": "Fokuser p\u00e5 elementvej",
-"Focus to contextual toolbar": "Fokuser p\u00e5 kontekstuelle v\u00e6rkt\u00f8jslinje",
-"Insert link (if link plugin activated)": "Inds\u00e6t link (hvis link plugin er aktiveret)",
-"Save (if save plugin activated)": "Gem (hvis save plugin er aktiveret)",
-"Find (if searchreplace plugin activated)": "Find (hvis searchreplace plugin er aktiveret)",
-"Plugins installed ({0}):": "Installerede plugins ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "L\u00e6r mere...",
-"You are using {0}": "Du benytter {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Praktiske Genveje",
-"Horizontal line": "Vandret linie",
-"Insert\/edit image": "Inds\u00e6t\/ret billede",
-"Image description": "Billede beskrivelse",
-"Source": "Kilde",
-"Dimensions": "Dimensioner",
-"Constrain proportions": "Behold propertioner",
-"General": "Generet",
-"Advanced": "Avanceret",
-"Style": "Stil",
-"Vertical space": "Lodret afstand",
-"Horizontal space": "Vandret afstand",
-"Border": "Kant",
-"Insert image": "Inds\u00e6t billede",
-"Image": "Billede",
-"Image list": "Billede liste",
-"Rotate counterclockwise": "Drej modsat urets retning",
-"Rotate clockwise": "Drej med urets retning",
-"Flip vertically": "Flip vertikalt",
-"Flip horizontally": "Flip horisontalt",
-"Edit image": "Rediger billede",
-"Image options": "Billede indstillinger",
-"Zoom in": "Zoom ind",
-"Zoom out": "Zoom ud",
-"Crop": "Besk\u00e6r",
-"Resize": "Skaler",
-"Orientation": "Retning",
-"Brightness": "Lysstyrke",
-"Sharpen": "G\u00f8r skarpere",
-"Contrast": "Kontrast",
-"Color levels": "Farve niveauer",
-"Gamma": "Gamma",
-"Invert": "Inverter",
-"Apply": "Anvend",
-"Back": "Tilbage",
-"Insert date\/time": "Inds\u00e6t dato\/klokkeslet",
-"Date\/time": "Dato\/klokkeslet",
-"Insert link": "Inds\u00e6t link",
-"Insert\/edit link": "Inds\u00e6t\/ret link",
-"Text to display": "Vis tekst",
-"Url": "URL",
-"Target": "Target",
-"None": "Ingen",
-"New window": "Nyt vindue",
-"Remove link": "Fjern link",
-"Anchors": "Ankre",
-"Link": "Link",
-"Paste or type a link": "Inds\u00e6t eller skriv et link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URLen som du angav ser ud til at v\u00e6re en email adresse. \u00d8nsker du at tilf\u00f8je det kr\u00e6vede prefiks  mailto: ?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URLen som du angav ser ud til at v\u00e6re et eksternt link. \u00d8nsker du at tilf\u00f8je det kr\u00e6vede prefiks http:\/\/ ?",
-"Link list": "Link liste",
-"Insert video": "Inds\u00e6t video",
-"Insert\/edit video": "Inds\u00e6t\/ret video",
-"Insert\/edit media": "Inds\u00e6t\/ret medier",
-"Alternative source": "Alternativ kilde",
-"Poster": "Poster",
-"Paste your embed code below:": "Inds\u00e6t din embed kode herunder:",
-"Embed": "Integrer",
-"Media": "Medier",
-"Nonbreaking space": "H\u00e5rdt mellemrum",
-"Page break": "Sideskift",
-"Paste as text": "Inds\u00e6t som ren tekst",
-"Preview": "Forh\u00e5ndsvisning",
-"Print": "Udskriv",
-"Save": "Gem",
-"Find": "Find",
-"Replace with": "Erstat med",
-"Replace": "Erstat",
-"Replace all": "Erstat alt",
-"Prev": "Forrige",
-"Next": "N\u00e6ste",
-"Find and replace": "Find og erstat",
-"Could not find the specified string.": "Kunne ikke finde s\u00f8getekst",
-"Match case": "STORE og sm\u00e5 bogstaver",
-"Whole words": "Hele ord",
-"Spellcheck": "Stavekontrol",
-"Ignore": "Ignorer",
-"Ignore all": "Ignorer alt",
-"Finish": "F\u00e6rdig",
-"Add to Dictionary": "Tilf\u00f8j til ordbog",
-"Insert table": "Inds\u00e6t tabel",
-"Table properties": "Tabel egenskaber",
-"Delete table": "Slet tabel",
-"Cell": "Celle",
-"Row": "R\u00e6kke",
-"Column": "Kolonne",
-"Cell properties": "Celle egenskaber",
-"Merge cells": "Flet celler",
-"Split cell": "Split celle",
-"Insert row before": "Inds\u00e6t r\u00e6kke f\u00f8r",
-"Insert row after": "Inds\u00e6t r\u00e6kke efter",
-"Delete row": "Slet r\u00e6kke",
-"Row properties": "R\u00e6kke egenskaber",
-"Cut row": "Klip r\u00e6kke",
-"Copy row": "Kopier r\u00e6kke",
-"Paste row before": "Inds\u00e6t r\u00e6kke f\u00f8r",
-"Paste row after": "Inds\u00e6t r\u00e6kke efter",
-"Insert column before": "Inds\u00e6t kolonne f\u00f8r",
-"Insert column after": "Inds\u00e6t kolonne efter",
-"Delete column": "Slet kolonne",
-"Cols": "Kolonne",
-"Rows": "R\u00e6kker",
-"Width": "Bredde",
-"Height": "H\u00f8jde",
-"Cell spacing": "Celle afstand",
-"Cell padding": "Celle padding",
-"Caption": "Tekst",
-"Left": "Venstre",
-"Center": "Centrering",
-"Right": "H\u00f8jre",
-"Cell type": "Celle type",
-"Scope": "Anvendelsesomr\u00e5de",
-"Alignment": "Tilpasning",
-"H Align": "H juster",
-"V Align": "V juster",
-"Top": "Top",
-"Middle": "Midt",
-"Bottom": "Bund",
-"Header cell": "Sidehoved celle",
-"Row group": "R\u00e6kke gruppe",
-"Column group": "Kolonne gruppe",
-"Row type": "R\u00e6kke type",
-"Header": "Sidehoved",
-"Body": "Krop",
-"Footer": "Sidefod",
-"Border color": "Kant farve",
-"Insert template": "Inds\u00e6t skabelon",
-"Templates": "Skabeloner",
-"Template": "Skabelon",
-"Text color": "Tekst farve",
-"Background color": "Baggrunds farve",
-"Custom...": "Brugerdefineret...",
-"Custom color": "Brugerdefineret farve",
-"No color": "Ingen farve",
-"Table of Contents": "Indholdsfortegnelse",
-"Show blocks": "Vis klokke",
-"Show invisible characters": "Vis usynlige tegn",
-"Words: {0}": "Ord: {0}",
-"{0} words": "{0} ord",
-"File": "Fil",
-"Edit": "Rediger",
-"Insert": "Inds\u00e6t",
-"View": "Vis",
-"Format": "Format",
-"Table": "Tabel",
-"Tools": "V\u00e6rkt\u00f8j",
-"Powered by {0}": "Drevet af {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text omr\u00e5de. Tryk ALT-F9 for menu. Tryk ALT-F10 for toolbar. Tryk ALT-0 for hj\u00e6lp"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de.js
deleted file mode 100644
index 32a45747bc..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('de',{
-"Redo": "Wiederholen",
-"Undo": "R\u00fcckg\u00e4ngig",
-"Cut": "Ausschneiden",
-"Copy": "Kopieren",
-"Paste": "Einf\u00fcgen",
-"Select all": "Alles ausw\u00e4hlen",
-"New document": "Neues Dokument",
-"Ok": "Ok",
-"Cancel": "Abbrechen",
-"Visual aids": "Visuelle Hilfen",
-"Bold": "Fett",
-"Italic": "Kursiv",
-"Underline": "Unterstrichen",
-"Strikethrough": "Durchgestrichen",
-"Superscript": "Hochgestellt",
-"Subscript": "Tiefgestellt",
-"Clear formatting": "Formatierung entfernen",
-"Align left": "Linksb\u00fcndig ausrichten",
-"Align center": "Zentriert ausrichten",
-"Align right": "Rechtsb\u00fcndig ausrichten",
-"Justify": "Blocksatz",
-"Bullet list": "Aufz\u00e4hlung",
-"Numbered list": "Nummerierte Liste",
-"Decrease indent": "Einzug verkleinern",
-"Increase indent": "Einzug vergr\u00f6\u00dfern",
-"Close": "Schlie\u00dfen",
-"Formats": "Formate",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Ihr Browser unterst\u00fctzt leider keinen direkten Zugriff auf die Zwischenablage. Bitte benutzen Sie die Strg + X \/ C \/ V Tastenkombinationen.",
-"Headers": "\u00dcberschriften",
-"Header 1": "\u00dcberschrift 1",
-"Header 2": "\u00dcberschrift 2",
-"Header 3": "\u00dcberschrift 3",
-"Header 4": "\u00dcberschrift 4",
-"Header 5": "\u00dcberschrift 5",
-"Header 6": "\u00dcberschrift 6",
-"Headings": "\u00dcberschriften",
-"Heading 1": "\u00dcberschrift 1",
-"Heading 2": "\u00dcberschrift 2",
-"Heading 3": "\u00dcberschrift 3",
-"Heading 4": "\u00dcberschrift 4",
-"Heading 5": "\u00dcberschrift 5",
-"Heading 6": "\u00dcberschrift 6",
-"Preformatted": "Preformatted",
-"Div": "Textblock",
-"Pre": "Vorformatierter Text",
-"Code": "Quelltext",
-"Paragraph": "Absatz",
-"Blockquote": "Zitat",
-"Inline": "Zeichenformate",
-"Blocks": "Absatzformate",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Einf\u00fcgen ist nun im einfachen Textmodus. Inhalte werden ab jetzt als unformatierter Text eingef\u00fcgt, bis Sie diese Einstellung wieder ausschalten!",
-"Font Family": "Schriftart",
-"Font Sizes": "Schriftgr\u00f6\u00dfe",
-"Class": "Klasse",
-"Browse for an image": "Bild...",
-"OR": "ODER",
-"Drop an image here": "Bild hier ablegen",
-"Upload": "Hochladen",
-"Block": "Blocksatz",
-"Align": "Ausrichtung",
-"Default": "Standard",
-"Circle": "Kreis",
-"Disc": "Punkt",
-"Square": "Quadrat",
-"Lower Alpha": "Kleinbuchstaben",
-"Lower Greek": "Griechische Kleinbuchstaben",
-"Lower Roman": "R\u00f6mische Zahlen (Kleinbuchstaben)",
-"Upper Alpha": "Gro\u00dfbuchstaben",
-"Upper Roman": "R\u00f6mische Zahlen (Gro\u00dfbuchstaben)",
-"Anchor": "Textmarke",
-"Name": "Name",
-"Id": "Kennung",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Die Kennung sollte mit einem Buchstaben anfangen. Nachfolgend nur Buchstaben, Zahlen, Striche (Minus), Punkte, Kommas und Unterstriche.",
-"You have unsaved changes are you sure you want to navigate away?": "Die \u00c4nderungen wurden noch nicht gespeichert, sind Sie sicher, dass Sie diese Seite verlassen wollen?",
-"Restore last draft": "Letzten Entwurf wiederherstellen",
-"Special character": "Sonderzeichen",
-"Source code": "Quelltext",
-"Insert\/Edit code sample": "Codebeispiel einf\u00fcgen\/bearbeiten",
-"Language": "Sprache",
-"Code sample": "Codebeispiel",
-"Color": "Farbe",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Von links nach rechts",
-"Right to left": "Von rechts nach links",
-"Emoticons": "Emoticons",
-"Document properties": "Dokumenteigenschaften",
-"Title": "Titel",
-"Keywords": "Sch\u00fcsselw\u00f6rter",
-"Description": "Beschreibung",
-"Robots": "Robots",
-"Author": "Verfasser",
-"Encoding": "Zeichenkodierung",
-"Fullscreen": "Vollbild",
-"Action": "Aktion",
-"Shortcut": "Shortcut",
-"Help": "Hilfe",
-"Address": "Adresse",
-"Focus to menubar": "Fokus auf Men\u00fcleiste",
-"Focus to toolbar": "Fokus auf Werkzeugleiste",
-"Focus to element path": "Fokus auf Elementpfad",
-"Focus to contextual toolbar": "Fokus auf kontextbezogene Werkzeugleiste",
-"Insert link (if link plugin activated)": "Link einf\u00fcgen (wenn Link-Plugin aktiviert ist)",
-"Save (if save plugin activated)": "Speichern (wenn Save-Plugin aktiviert ist)",
-"Find (if searchreplace plugin activated)": "Suchen einf\u00fcgen (wenn Suchen\/Ersetzen-Plugin aktiviert ist)",
-"Plugins installed ({0}):": "installierte Plugins ({0}):",
-"Premium plugins:": "Premium Plugins:",
-"Learn more...": "Erfahren Sie mehr dazu...",
-"You are using {0}": "Sie verwenden {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Praktische Tastenkombinationen",
-"Horizontal line": "Horizontale Linie",
-"Insert\/edit image": "Bild einf\u00fcgen\/bearbeiten",
-"Image description": "Bildbeschreibung",
-"Source": "Quelle",
-"Dimensions": "Abmessungen",
-"Constrain proportions": "Seitenverh\u00e4ltnis beibehalten",
-"General": "Allgemein",
-"Advanced": "Erweitert",
-"Style": "Stil",
-"Vertical space": "Vertikaler Abstand",
-"Horizontal space": "Horizontaler Abstand",
-"Border": "Rahmen",
-"Insert image": "Bild einf\u00fcgen",
-"Image": "Bild",
-"Image list": "Bildliste",
-"Rotate counterclockwise": "Gegen den Uhrzeigersinn drehen",
-"Rotate clockwise": "Im Uhrzeigersinn drehen",
-"Flip vertically": "Vertikal spiegeln",
-"Flip horizontally": "Horizontal spiegeln",
-"Edit image": "Bild bearbeiten",
-"Image options": "Bildeigenschaften",
-"Zoom in": "Ansicht vergr\u00f6\u00dfern",
-"Zoom out": "Ansicht verkleinern",
-"Crop": "Bescheiden",
-"Resize": "Skalieren",
-"Orientation": "Ausrichtung",
-"Brightness": "Helligkeit",
-"Sharpen": "Sch\u00e4rfen",
-"Contrast": "Kontrast",
-"Color levels": "Farbwerte",
-"Gamma": "Gamma",
-"Invert": "Invertieren",
-"Apply": "Anwenden",
-"Back": "Zur\u00fcck",
-"Insert date\/time": "Datum\/Uhrzeit einf\u00fcgen ",
-"Date\/time": "Datum\/Uhrzeit",
-"Insert link": "Link einf\u00fcgen",
-"Insert\/edit link": "Link einf\u00fcgen\/bearbeiten",
-"Text to display": "Anzuzeigender Text",
-"Url": "URL",
-"Target": "Ziel",
-"None": "Keine",
-"New window": "Neues Fenster",
-"Remove link": "Link entfernen",
-"Anchors": "Textmarken",
-"Link": "Link",
-"Paste or type a link": "Link einf\u00fcgen oder eintippen",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Diese Adresse scheint eine E-Mail-Adresse zu sein. M\u00f6chten Sie das dazu ben\u00f6tigte \"mailto:\" voranstellen?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Diese Adresse scheint ein externer Link zu sein. M\u00f6chten Sie das dazu ben\u00f6tigte \"http:\/\/\" voranstellen?",
-"Link list": "Linkliste",
-"Insert video": "Video einf\u00fcgen",
-"Insert\/edit video": "Video einf\u00fcgen\/bearbeiten",
-"Insert\/edit media": "Medien einf\u00fcgen\/bearbeiten",
-"Alternative source": "Alternative Quelle",
-"Poster": "Poster",
-"Paste your embed code below:": "F\u00fcgen Sie Ihren Einbettungscode hier ein:",
-"Embed": "Einbetten",
-"Media": "Medium",
-"Nonbreaking space": "Gesch\u00fctztes Leerzeichen",
-"Page break": "Seitenumbruch",
-"Paste as text": "Als Text einf\u00fcgen",
-"Preview": "Vorschau",
-"Print": "Drucken",
-"Save": "Speichern",
-"Find": "Suchen",
-"Replace with": "Ersetzen durch",
-"Replace": "Ersetzen",
-"Replace all": "Alles ersetzen",
-"Prev": "Zur\u00fcck",
-"Next": "Weiter",
-"Find and replace": "Suchen und ersetzen",
-"Could not find the specified string.": "Die Zeichenfolge wurde nicht gefunden.",
-"Match case": "Gro\u00df-\/Kleinschreibung beachten",
-"Whole words": "Nur ganze W\u00f6rter",
-"Spellcheck": "Rechtschreibpr\u00fcfung",
-"Ignore": "Ignorieren",
-"Ignore all": "Alles Ignorieren",
-"Finish": "Ende",
-"Add to Dictionary": "Zum W\u00f6rterbuch hinzuf\u00fcgen",
-"Insert table": "Tabelle einf\u00fcgen",
-"Table properties": "Tabelleneigenschaften",
-"Delete table": "Tabelle l\u00f6schen",
-"Cell": "Zelle",
-"Row": "Zeile",
-"Column": "Spalte",
-"Cell properties": "Zelleneigenschaften",
-"Merge cells": "Zellen verbinden",
-"Split cell": "Zelle aufteilen",
-"Insert row before": "Neue Zeile davor einf\u00fcgen ",
-"Insert row after": "Neue Zeile danach einf\u00fcgen",
-"Delete row": "Zeile l\u00f6schen",
-"Row properties": "Zeileneigenschaften",
-"Cut row": "Zeile ausschneiden",
-"Copy row": "Zeile kopieren",
-"Paste row before": "Zeile davor einf\u00fcgen",
-"Paste row after": "Zeile danach einf\u00fcgen",
-"Insert column before": "Neue Spalte davor einf\u00fcgen",
-"Insert column after": "Neue Spalte danach einf\u00fcgen",
-"Delete column": "Spalte l\u00f6schen",
-"Cols": "Spalten",
-"Rows": "Zeilen",
-"Width": "Breite",
-"Height": "H\u00f6he",
-"Cell spacing": "Zellenabstand",
-"Cell padding": "Zelleninnenabstand",
-"Caption": "Beschriftung",
-"Left": "Linksb\u00fcndig",
-"Center": "Zentriert",
-"Right": "Rechtsb\u00fcndig",
-"Cell type": "Zellentyp",
-"Scope": "G\u00fcltigkeitsbereich",
-"Alignment": "Ausrichtung",
-"H Align": "Horizontale Ausrichtung",
-"V Align": "Vertikale Ausrichtung",
-"Top": "Oben",
-"Middle": "Mitte",
-"Bottom": "Unten",
-"Header cell": "Kopfzelle",
-"Row group": "Zeilengruppe",
-"Column group": "Spaltengruppe",
-"Row type": "Zeilentyp",
-"Header": "Kopfzeile",
-"Body": "Inhalt",
-"Footer": "Fu\u00dfzeile",
-"Border color": "Rahmenfarbe",
-"Insert template": "Vorlage einf\u00fcgen ",
-"Templates": "Vorlagen",
-"Template": "Vorlage",
-"Text color": "Textfarbe",
-"Background color": "Hintergrundfarbe",
-"Custom...": "Benutzerdefiniert...",
-"Custom color": "Benutzerdefinierte Farbe",
-"No color": "Keine Farbe",
-"Table of Contents": "Inhaltsverzeichnis",
-"Show blocks": "Bl\u00f6cke anzeigen",
-"Show invisible characters": "Unsichtbare Zeichen anzeigen",
-"Words: {0}": "W\u00f6rter: {0}",
-"{0} words": "{0} W\u00f6rter",
-"File": "Datei",
-"Edit": "Bearbeiten",
-"Insert": "Einf\u00fcgen",
-"View": "Ansicht",
-"Format": "Format",
-"Table": "Tabelle",
-"Tools": "Werkzeuge",
-"Powered by {0}": "Betrieben von {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich-Text- Area. Dr\u00fccken Sie ALT-F9 f\u00fcr das Men\u00fc. Dr\u00fccken Sie ALT-F10 f\u00fcr Symbolleiste. Dr\u00fccken Sie ALT-0 f\u00fcr Hilfe"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de_AT.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de_AT.js
deleted file mode 100644
index 0073810c1a..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de_AT.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('de_AT',{
-"Redo": "Wiederholen",
-"Undo": "R\u00fcckg\u00e4ngig",
-"Cut": "Ausschneiden",
-"Copy": "Kopieren",
-"Paste": "Einf\u00fcgen",
-"Select all": "Alles ausw\u00e4hlen",
-"New document": "Neues Dokument",
-"Ok": "Ok",
-"Cancel": "Abbrechen",
-"Visual aids": "Hilfslinien und unsichtbare Elemente einblenden",
-"Bold": "Fett",
-"Italic": "Kursiv",
-"Underline": "Unterstrichen",
-"Strikethrough": "Durchgestrichen",
-"Superscript": "Hochgestellt",
-"Subscript": "Tiefgestellt",
-"Clear formatting": "Formatierungen zur\u00fccksetzen",
-"Align left": "Linksb\u00fcndig",
-"Align center": "Zentriert",
-"Align right": "Rechtsb\u00fcndig",
-"Justify": "Blocksatz",
-"Bullet list": "Unsortierte Liste",
-"Numbered list": "Sortierte Liste",
-"Decrease indent": "Ausr\u00fccken",
-"Increase indent": "Einr\u00fccken",
-"Close": "Schlie\u00dfen",
-"Formats": "Formate",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Ihr Browser unterst\u00fctzt keinen direkten Zugriff auf die Zwischenablage. Bitte nutzen Sie die Tastaturk\u00fcrzel Strg+X\/C\/V stattdessen.",
-"Headers": "\u00dcberschriften",
-"Header 1": "\u00dcberschrift 1",
-"Header 2": "\u00dcberschrift 2",
-"Header 3": "\u00dcberschrift 3",
-"Header 4": "\u00dcberschrift 4",
-"Header 5": "\u00dcberschrift 5",
-"Header 6": "\u00dcberschrift 6",
-"Headings": "\u00dcberschriften",
-"Heading 1": "\u00dcberschrift 1",
-"Heading 2": "\u00dcberschrift 2",
-"Heading 3": "\u00dcberschrift 3",
-"Heading 4": "\u00dcberschrift 4",
-"Heading 5": "\u00dcberschrift 5",
-"Heading 6": "\u00dcberschrift 6",
-"Preformatted": "Vorformatiert",
-"Div": "Block (div)",
-"Pre": "Vorformatierter Text (pre)",
-"Code": "Code (code)",
-"Paragraph": "Absatz (p)",
-"Blockquote": "Zitat (blockquote)",
-"Inline": "Inline",
-"Blocks": "Bl\u00f6cke",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Alle Texte werden nun ohne Formatierung eingef\u00fcgt, bis diese Einstellung wieder ge\u00e4ndert wird.",
-"Font Family": "Schriftart",
-"Font Sizes": "Schriftgr\u00f6\u00dfen",
-"Class": "Klasse",
-"Browse for an image": "Bild...",
-"OR": "oder",
-"Drop an image here": "Bild hierher ziehen",
-"Upload": "Hochladen",
-"Block": "Block",
-"Align": "Ausrichtung",
-"Default": "Standard",
-"Circle": "Kreis",
-"Disc": "Gef\u00fcllter Kreis",
-"Square": "Quadrat",
-"Lower Alpha": "Kleinbuchstaben",
-"Lower Greek": "Griechische Kleinbuchstaben",
-"Lower Roman": "R\u00f6mische Zahlen (Kleinbuchstaben)",
-"Upper Alpha": "Gro\u00dfbuchstaben",
-"Upper Roman": "R\u00f6mische Zahlen (Gro\u00dfbuchstaben)",
-"Anchor": "Anker",
-"Name": "Name",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Eine ID f\u00e4ngt mit einem Buchstaben an, gefolgt von Buchstaben, Ziffern, Bindestrichen, Punkten, Doppelpunkten oder Unterstrichen.",
-"You have unsaved changes are you sure you want to navigate away?": "Sie haben ungespeicherte \u00c4nderungen. Sind Sie sicher, dass Sie die Seite verlassen wollen?",
-"Restore last draft": "Letzten Entwurf wiederherstellen.",
-"Special character": "Sonderzeichen",
-"Source code": "Quelltext",
-"Insert\/Edit code sample": "Beispielcode einf\u00fcgen\/bearbeiten",
-"Language": "Sprache",
-"Code sample": "Code Beispiel",
-"Color": "Farbe",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Links nach rechts",
-"Right to left": "Rechts nach links",
-"Emoticons": "Emoticons",
-"Document properties": "Dokumenteigenschaften",
-"Title": "Titel",
-"Keywords": "Schl\u00fcsselw\u00f6rter",
-"Description": "Beschreibung",
-"Robots": "Suchmaschinen",
-"Author": "Autor",
-"Encoding": "Enkodierung",
-"Fullscreen": "Vollbild",
-"Action": "Aktion",
-"Shortcut": "Tastenkombination",
-"Help": "Hilfe",
-"Address": "Adresse",
-"Focus to menubar": "Fokus auf Men\u00fcleiste",
-"Focus to toolbar": "Fokus auf Werkzeugleiste",
-"Focus to element path": "Fokus auf Elementpfad",
-"Focus to contextual toolbar": "Fokus auf kontextbezogene Werkzeugleiste",
-"Insert link (if link plugin activated)": "Link einf\u00fcgen (wenn Plugin aktiv ist)",
-"Save (if save plugin activated)": "Speichern (wenn Plugin aktiv ist)",
-"Find (if searchreplace plugin activated)": "Suchen (wenn Plugin aktiv ist)",
-"Plugins installed ({0}):": "Installierte Plugins ({0}):",
-"Premium plugins:": "Premium Plugins:",
-"Learn more...": "Mehr Informationen...",
-"You are using {0}": "Sie verwenden {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Praktische Abk\u00fcrzungen",
-"Horizontal line": "Horizontale Trennlinie",
-"Insert\/edit image": "Bild einf\u00fcgen\/bearbeiten",
-"Image description": "Bildbeschreibung",
-"Source": "Adresse",
-"Dimensions": "Ausma\u00dfe",
-"Constrain proportions": "Seitenverh\u00e4ltnis beibehalten",
-"General": "Allgemein",
-"Advanced": "Erweitert",
-"Style": "Format",
-"Vertical space": "Vertikaler Abstand",
-"Horizontal space": "Horizontaler Abstand",
-"Border": "Rahmen",
-"Insert image": "Bild einf\u00fcgen",
-"Image": "Bild",
-"Image list": "Bilderliste",
-"Rotate counterclockwise": "Gegen den Uhrzeigersinn drehen",
-"Rotate clockwise": "Im Uhrzeigersinn drehen",
-"Flip vertically": "Vertikal kippen",
-"Flip horizontally": "Horizontal kippen",
-"Edit image": "Bild bearbeiten",
-"Image options": "Bildeinstellungen",
-"Zoom in": "Einzoomen",
-"Zoom out": "Auszoomen",
-"Crop": "Zuschneiden",
-"Resize": "Gr\u00f6\u00dfe \u00e4ndern",
-"Orientation": "Orientierung",
-"Brightness": "Helligkeit",
-"Sharpen": "Sch\u00e4rfen",
-"Contrast": "Kontrast",
-"Color levels": "Farbwerte",
-"Gamma": "Gamma",
-"Invert": "Invertieren",
-"Apply": "Anwenden",
-"Back": "Zur\u00fcck",
-"Insert date\/time": "Zeit\/Datum einf\u00fcgen",
-"Date\/time": "Zeit\/Datum",
-"Insert link": "Link einf\u00fcgen",
-"Insert\/edit link": "Link einf\u00fcgen\/bearbeiten",
-"Text to display": "Angezeigter Text",
-"Url": "URL",
-"Target": "Ziel",
-"None": "Keine",
-"New window": "Neues Fenster",
-"Remove link": "Link entfernen",
-"Anchors": "Anker",
-"Link": "Link",
-"Paste or type a link": "Link einf\u00fcgen oder eintippen",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Die eingegebene URL scheint eine E-Mail-Adresse zu sein. Soll das notwendige \"mailto:\"-Pr\u00e4fix hinzugef\u00fcgt werden?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Die eingegebene URL scheint eine externe Web-Adresse zu sein. Soll das notwendige \"http:\/\/\"-Pr\u00e4fix hinzugef\u00fcgt werden?",
-"Link list": "Linkliste",
-"Insert video": "Video einf\u00fcgen",
-"Insert\/edit video": "Video einf\u00fcgen\/bearbeiten",
-"Insert\/edit media": "Medien einf\u00fcgen\/bearbeiten",
-"Alternative source": "Alternative Quelle",
-"Poster": "Poster",
-"Paste your embed code below:": "F\u00fcgen unten Sie Ihren Quellcode zum einbetten ein",
-"Embed": "Einbetten",
-"Media": "Medien",
-"Nonbreaking space": "gesch\u00fctztes Leerzeichen",
-"Page break": "Seitenumbruch",
-"Paste as text": "Als Text einf\u00fcgen",
-"Preview": "Vorschau",
-"Print": "Drucken",
-"Save": "Speichern",
-"Find": "Suchen",
-"Replace with": "Ersetzen durch",
-"Replace": "Ersetzen",
-"Replace all": "Alle ersetzen",
-"Prev": "Vorheriges",
-"Next": "N\u00e4chstes",
-"Find and replace": "Suchen und ersetzen",
-"Could not find the specified string.": "Keine \u00dcbereinstimmung gefunden",
-"Match case": "Gro\u00df-\/Kleinschreibung beachten",
-"Whole words": "Vollst\u00e4ndige W\u00f6rter",
-"Spellcheck": "Rechtschreibung \u00fcberpr\u00fcfen",
-"Ignore": "Ignorieren",
-"Ignore all": "Alle ignorieren",
-"Finish": "Fertig",
-"Add to Dictionary": "Zum W\u00f6rterbuch hinzuf\u00fcgen",
-"Insert table": "Tabelle einf\u00fcgen",
-"Table properties": "Tabelleneigenschaften",
-"Delete table": "Tabelle l\u00f6schen",
-"Cell": "Zelle",
-"Row": "Zeile",
-"Column": "Spalte",
-"Cell properties": "Zelleneigenschaften",
-"Merge cells": "Zellen vereinen",
-"Split cell": "Verbundene Zellen trennen",
-"Insert row before": "Neue Zeile oberhalb einf\u00fcgen",
-"Insert row after": "Neue Zeile unterhalb einf\u00fcgen",
-"Delete row": "Zeile l\u00f6schen",
-"Row properties": "Zeileneigenschaften",
-"Cut row": "Zeile ausschneiden",
-"Copy row": "Zeile kopieren",
-"Paste row before": "Zeile oberhalb einf\u00fcgen",
-"Paste row after": "Zeile unterhalb einf\u00fcgen",
-"Insert column before": "Neue Spalte links einf\u00fcgen",
-"Insert column after": "Neue Spalte rechts einf\u00fcgen",
-"Delete column": "Spalte l\u00f6schen",
-"Cols": "Spalten",
-"Rows": "Zeilen",
-"Width": "Breite",
-"Height": "H\u00f6he",
-"Cell spacing": "Zellenabstand",
-"Cell padding": "Abstand innerhalb der Zellen",
-"Caption": "Beschriftung der Tabelle",
-"Left": "Links",
-"Center": "Zentriert",
-"Right": "Rechts",
-"Cell type": "Zellentyp",
-"Scope": "Geltungsbereich",
-"Alignment": "Ausrichtung",
-"H Align": "Ausrichtung H",
-"V Align": "Ausrichtung V",
-"Top": "Oben",
-"Middle": "Mitte",
-"Bottom": "Unten",
-"Header cell": "\u00dcberschrift",
-"Row group": "Zeilengruppe",
-"Column group": "Spaltengruppe",
-"Row type": "Zeilentyp",
-"Header": "Tabellen\u00fcberschrift",
-"Body": "Tabellenk\u00f6rper",
-"Footer": "Tabellenfu\u00df",
-"Border color": "Rahmenfarbe",
-"Insert template": "Vorlage einf\u00fcgen",
-"Templates": "Vorlagen",
-"Template": "Vorlage",
-"Text color": "Textfarbe",
-"Background color": "Hintergrundfarbe",
-"Custom...": "Benutzerdefiniert...",
-"Custom color": "Benutzerdefinierte Farbe",
-"No color": "Keine Farbe",
-"Table of Contents": "Inhaltsverzeichnis",
-"Show blocks": "Blockelemente einblenden",
-"Show invisible characters": "Unsichtbare Zeichen einblenden",
-"Words: {0}": "W\u00f6rter: {0}",
-"{0} words": "{0} W\u00f6rter",
-"File": "Datei",
-"Edit": "Bearbeiten",
-"Insert": "Einf\u00fcgen",
-"View": "Ansicht",
-"Format": "Format",
-"Table": "Tabelle",
-"Tools": "Extras",
-"Powered by {0}": "Betrieben von {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Dr\u00fccken Sie ALT-F9 f\u00fcr das Men\u00fc. Dr\u00fccken Sie ALT-F10 f\u00fcr die Werkzeugleiste. Dr\u00fccken Sie ALT-0 f\u00fcr Hilfe"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/dv.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/dv.js
deleted file mode 100644
index 3de3a6d9ac..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/dv.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('dv',{
-"Cut": "\u0786\u07a6\u0793\u07b0",
-"Heading 5": "\u0780\u07ac\u0791\u07a8\u0782\u07b0 5",
-"Header 2": "\u0780\u07ac\u0791\u07a7 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0786\u07b0\u078d\u07a8\u0795\u07b0\u0784\u07af\u0791\u07b0 \u0784\u07ad\u0782\u07aa\u0782\u07b0 \u0786\u07aa\u0783\u07aa\u0789\u07aa\u078e\u07ac \u0780\u07aa\u0787\u07b0\u078b\u07a6\u060c \u0784\u07b0\u0783\u07af\u0792\u07a6\u0783\u0787\u07a6\u0786\u07aa\u0782\u07b0 \u0782\u07aa\u078b\u07ad! Ctrl+X\/C\/V \u0784\u07ad\u0782\u07aa\u0782\u07b0 \u0786\u07aa\u0783\u07ad!",
-"Heading 4": "\u0780\u07ac\u0791\u07a8\u0782\u07b0 4",
-"Div": "\u0791\u07a6\u0787\u07a8\u0788\u07b0",
-"Heading 2": "\u0780\u07ac\u0791\u07a8\u0782\u07b0 2",
-"Paste": "\u0795\u07ad\u0790\u07b0\u0793\u07b0",
-"Close": "\u0782\u07a8\u0787\u07b0\u0788\u07a7",
-"Font Family": "\u078a\u07ae\u0782\u07b0\u0793\u07b0",
-"Pre": "\u0795\u07b0\u0783\u07a9",
-"Align right": "\u0786\u07a6\u0782\u07a7\u078c\u07a6\u0781\u07b0 \u0796\u07a6\u0787\u07b0\u0790\u07a7",
-"New document": "\u0787\u07a7 \u0791\u07ae\u0786\u07a8\u0787\u07aa\u0789\u07ac\u0782\u07b0\u0793\u07b0",
-"Blockquote": "\u0784\u07b0\u078d\u07ae\u0786\u07b0-\u0786\u07af\u0793\u07b0",
-"Numbered list": "\u0782\u07a6\u0782\u07b0\u0784\u07a6\u0783\u07aa \u078d\u07a8\u0790\u07b0\u0793\u07b0",
-"Heading 1": "\u0780\u07ac\u0791\u07a8\u0782\u07b0 1",
-"Headings": "\u0780\u07ac\u0791\u07a8\u0782\u07b0",
-"Increase indent": "\u078b\u07aa\u0783\u07aa\u0789\u07a8\u0782\u07b0 \u0784\u07ae\u0791\u07aa\u0786\u07aa\u0783\u07ad",
-"Formats": "\u078a\u07af\u0789\u07ac\u0793\u07b0\u078c\u07a6\u0787\u07b0",
-"Headers": "\u0780\u07ac\u0791\u07a7\u078c\u07a6\u0787\u07b0",
-"Select all": "\u0790\u07ac\u078d\u07ac\u0786\u07b0\u0793\u07b0 \u0787\u07af\u078d\u07b0",
-"Header 3": "\u0780\u07ac\u0791\u07a7 3",
-"Blocks": "\u0784\u07b0\u078d\u07ae\u0786\u07b0\u078c\u07a6\u0787\u07b0",
-"Undo": "\u0787\u07a6\u0782\u07b0\u0791\u07ab",
-"Strikethrough": "\u0789\u07ac\u078b\u07aa \u0783\u07ae\u0782\u078e\u07ae",
-"Bullet list": "\u0784\u07aa\u078d\u07ac\u0793\u07b0 \u078d\u07a8\u0790\u07b0\u0793\u07b0",
-"Header 1": "\u0780\u07ac\u0791\u07a7 1",
-"Superscript": "\u0789\u07a6\u078c\u07a9\u0787\u07a6\u0786\u07aa\u0783\u07aa",
-"Clear formatting": "\u078a\u07af\u0789\u07ac\u0793\u07b0\u078c\u07a6\u0787\u07b0 \u078a\u07ae\u0780\u07ad",
-"Font Sizes": "\u078a\u07ae\u0782\u07b0\u0793\u07b0 \u0790\u07a6\u0787\u07a8\u0792\u07b0",
-"Subscript": "\u078c\u07a8\u0783\u07a9\u0787\u07a6\u0786\u07aa\u0783\u07aa",
-"Header 6": "\u0780\u07ac\u0791\u07a7 6",
-"Redo": "\u0783\u07a9\u0791\u07ab",
-"Paragraph": "\u0795\u07ac\u0783\u07ac\u078e\u07b0\u0783\u07a7\u078a\u07b0",
-"Ok": "\u0787\u07af\u0786\u07ad",
-"Bold": "\u0784\u07af\u078d\u07b0\u0791\u07b0",
-"Code": "\u0786\u07af\u0791\u07b0",
-"Italic": "\u0787\u07a8\u0793\u07a6\u078d\u07a8\u0786\u07b0",
-"Align center": "\u0789\u07ac\u078b\u07a6\u0781\u07b0 \u0796\u07a6\u0787\u07b0\u0790\u07a7",
-"Header 5": "\u0780\u07ac\u0791\u07a7 5",
-"Heading 6": "\u0780\u07ac\u0791\u07a8\u0782\u07b0 6",
-"Heading 3": "\u0780\u07ac\u0791\u07a8\u0782\u07b0 3",
-"Decrease indent": "\u078b\u07aa\u0783\u07aa\u0789\u07a8\u0782\u07b0 \u0786\u07aa\u0791\u07a6\u0786\u07aa\u0783\u07ad",
-"Header 4": "\u0780\u07ac\u0791\u07a7 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0795\u07ad\u0790\u07b0\u0793\u07b0 \u0786\u07aa\u0783\u07ac\u0788\u07ad\u0782\u07a9 \u0795\u07b0\u078d\u07ac\u0787\u07a8\u0782\u07b0\u0786\u07ae\u0781\u07b0! \u0784\u07a6\u078b\u07a6\u078d\u07aa \u0786\u07aa\u0783\u07ac\u0787\u07b0\u0788\u07aa\u0789\u07a6\u0781\u07b0 \u0789\u07a8 \u0787\u07ae\u0795\u07b0\u079d\u07a6\u0782\u07b0 \u0787\u07ae\u078a\u07b0 \u0786\u07ae\u0781\u07b0\u078d\u07a6\u0787\u07b0\u0788\u07a7!",
-"Underline": "\u078b\u07a6\u0781\u07aa\u0783\u07ae\u0782\u078e\u07aa",
-"Cancel": "\u0786\u07ac\u0782\u07b0\u0790\u07a6\u078d\u07b0",
-"Justify": "\u0787\u07ac\u0787\u07b0\u0788\u07a6\u0783\u07aa \u0786\u07aa\u0783\u07ad",
-"Inline": "\u0787\u07a8\u0782\u07b0\u078d\u07a6\u0787\u07a8\u0782\u07b0",
-"Copy": "\u0786\u07ae\u0795\u07a9",
-"Align left": "\u0788\u07a7\u078c\u07a6\u0781\u07b0 \u0796\u07a6\u0787\u07b0\u0790\u07a7",
-"Visual aids": "\u0788\u07a8\u079d\u07aa\u0787\u07a6\u078d\u07b0 \u0787\u07ac\u0787\u07a8\u0791\u07b0\u0790\u07b0",
-"Lower Greek": "\u078d\u07af\u0788\u07a6\u0783 \u078e\u07b0\u0783\u07a9\u0786\u07b0",
-"Square": "\u078e\u07ae\u0785\u07a8",
-"Default": "\u0791\u07a8\u078a\u07af\u078d\u07b0\u0793\u07b0",
-"Lower Alpha": "\u078d\u07af\u0788\u07a6\u0783 \u0787\u07a6\u078d\u07b0\u078a\u07a7",
-"Circle": "\u0784\u07ae\u0785\u07aa",
-"Disc": "\u0788\u07a6\u0781\u07b0\u0784\u07aa\u0783\u07aa",
-"Upper Alpha": "\u0787\u07a6\u0795\u07a7 \u0787\u07a6\u078d\u07b0\u078a\u07a7",
-"Upper Roman": "\u0787\u07a6\u0795\u07a7 \u0783\u07af\u0789\u07a6\u0782\u07b0",
-"Lower Roman": "\u078d\u07af\u0788\u07a6\u0783 \u0783\u07af\u0789\u07a6\u0782\u07b0",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0787\u07a6\u0787\u07a8\u0791\u07a9 \u078a\u07ac\u0781\u07ac\u0782\u07b0\u0788\u07a7\u0782\u07a9 \u0787\u07a6\u0786\u07aa\u0783\u07a6\u0786\u07aa\u0782\u07b0\u060c \u0787\u07ad\u078e\u07ac \u078a\u07a6\u0780\u07aa\u078e\u07a6\u0787\u07a8 \u0787\u07a6\u0786\u07aa\u0783\u07aa\u078c\u07a6\u0786\u07ac\u0787\u07b0\u060c \u0782\u07a6\u0782\u07b0\u0784\u07a6\u0783\u07aa\u078c\u07a6\u0787\u07b0\u060c \u0791\u07ad\u079d\u07b0\u078c\u07a6\u0787\u07b0\u060c \u078c\u07a8\u0786\u07a8\u078c\u07a6\u0787\u07b0\u060c \u0786\u07ae\u078d\u07ae\u0782\u07b0\u078c\u07a6\u0787\u07b0 \u0782\u07aa\u0788\u07a6\u078c\u07a6 \u078b\u07a6\u0781\u07aa \u0783\u07ae\u0782\u078e\u07aa\u078c\u07a6\u0787\u07b0",
-"Name": "\u0782\u07a6\u0782\u07b0",
-"Anchor": "\u0787\u07ac\u0782\u07b0\u0786\u07a6\u0783",
-"Id": "\u0787\u07a6\u0787\u07a8\u0791\u07a9",
-"You have unsaved changes are you sure you want to navigate away?": "\u0784\u07a6\u078b\u07a6\u078d\u07aa\u078c\u07a6\u0787\u07b0 \u0790\u07ad\u0788\u07b0 \u0782\u07aa\u0786\u07ae\u0781\u07b0 \u078b\u07ab\u0786\u07ae\u0781\u07b0\u078d\u07a6\u0782\u07b0\u0788\u07a9\u078c\u07a6\u061f",
-"Restore last draft": "\u078a\u07a6\u0780\u07aa\u078e\u07ac \u0791\u07b0\u0783\u07a7\u078a\u07b0\u0793\u07b0 \u0783\u07ac\u0790\u07b0\u0793\u07af \u0786\u07aa\u0783\u07ad",
-"Special character": "\u079a\u07a7\u0787\u07b0\u0790\u07a6 \u0787\u07a6\u0786\u07aa\u0783\u07aa\u078c\u07a6\u0787\u07b0",
-"Source code": "\u0789\u07a6\u0790\u07b0\u078b\u07a6\u0783\u07aa",
-"Language": "\u0784\u07a6\u0790\u07b0",
-"Insert\/Edit code sample": "\u0786\u07af\u0791\u07aa \u0789\u07a8\u0790\u07a7\u078d\u07aa \u0787\u07a8\u0782\u07b0\u0790\u07a7\u0793\u07aa\/\u0787\u07ac\u0791\u07a8\u0793\u07b0 \u0786\u07aa\u0783\u07aa\u0782\u07b0",
-"B": "\u0784\u07a9",
-"R": "\u0787\u07a7\u0783\u07aa",
-"G": "\u0796\u07a9",
-"Color": "\u0786\u07aa\u078d\u07a6",
-"Right to left": "\u0786\u07a6\u0782\u07a7\u078c\u07aa\u0782\u07b0 \u0788\u07a7\u078c\u07a6\u0781\u07b0",
-"Left to right": "\u0788\u07a7\u078c\u07aa\u0782\u07b0 \u0786\u07a6\u0782\u07a7\u078c\u07a6\u0781\u07b0",
-"Emoticons": "\u079d\u07aa\u0787\u07ab\u0783\u07aa \u078a\u07ae\u0793\u07af",
-"Robots": "\u0783\u07af\u0784\u07ae\u0793\u07b0\u0790\u07b0",
-"Document properties": "\u0791\u07ae\u0786\u07a8\u0787\u07aa\u0789\u07ac\u0782\u07b0\u0793\u07b0\u078e\u07ac \u0790\u07a8\u078a\u07a6\u078c\u07a6\u0787\u07b0",
-"Title": "\u0793\u07a6\u0787\u07a8\u0793\u07a6\u078d\u07b0",
-"Keywords": "\u0786\u07a9\u0788\u07af\u0791\u07b0\u078c\u07a6\u0787\u07b0",
-"Encoding": "\u0787\u07ac\u0782\u07b0\u0786\u07af\u0791\u07a8\u0782\u07b0",
-"Description": "\u078c\u07a6\u078a\u07b0\u0790\u07a9\u078d\u07aa",
-"Author": "\u0788\u07ac\u0783\u07a8\u078a\u07a6\u0783\u07a7\u078c\u07b0",
-"Fullscreen": "\u078a\u07aa\u078d\u07b0\u0790\u07b0\u0786\u07b0\u0783\u07a9\u0782\u07b0",
-"Horizontal line": "\u0780\u07aa\u0783\u07a6\u0790\u07b0 \u0783\u07ae\u0782\u078e\u07aa",
-"Horizontal space": "\u0780\u07ae\u0783\u07a8\u0792\u07af\u0782\u07b0\u0793\u07a6\u078d\u07b0 \u0790\u07b0\u0795\u07ad\u0790\u07b0",
-"Insert\/edit image": "\u078a\u07ae\u0793\u07af\u078d\u07aa\u0782\u07b0\/\u0784\u07a6\u078b\u07a6\u078d\u07aa\u0786\u07aa\u0783\u07aa\u0782\u07b0",
-"General": "\u0787\u07a7\u0782\u07b0\u0789\u07aa",
-"Advanced": "\u0787\u07ac\u0791\u07b0\u0788\u07a7\u0782\u07b0\u0790\u07b0\u0791\u07b0",
-"Source": "\u0789\u07a6\u0790\u07b0\u078b\u07a6\u0783\u07aa",
-"Border": "\u0784\u07af\u0791\u07a6\u0783\u07aa",
-"Constrain proportions": "\u0788\u07a6\u0792\u07a6\u0782\u07b0 \u0780\u07a8\u078a\u07a6\u0780\u07a6\u0787\u07b0\u0793\u07a7",
-"Vertical space": "\u0788\u07a7\u0793\u07a8\u0786\u07a6\u078d\u07b0 \u0790\u07b0\u0795\u07ad\u0790\u07b0",
-"Image description": "\u078a\u07ae\u0793\u07af\u078e\u07ac \u078c\u07a6\u078a\u07b0\u0790\u07a9\u078d\u07aa",
-"Style": "\u0790\u07b0\u0793\u07a6\u0787\u07a8\u078d\u07b0",
-"Dimensions": "\u0789\u07a8\u0782\u07b0\u078c\u07a6\u0787\u07b0",
-"Insert image": "\u078a\u07ae\u0793\u07af \u0787\u07a8\u0782\u07b0\u0790\u07a7\u0793\u07b0 \u0786\u07aa\u0783\u07ad",
-"Image": "\u078a\u07ae\u0793\u07af",
-"Zoom in": "\u0784\u07ae\u0791\u07aa\u0786\u07aa\u0783\u07ad",
-"Contrast": "\u078c\u07a6\u078a\u07a7\u078c\u07aa\u0786\u07a6\u0782\u07b0",
-"Back": "\u078a\u07a6\u0780\u07a6\u078c\u07a6\u0781\u07b0",
-"Gamma": "\u078e\u07ad\u0789\u07a7",
-"Flip horizontally": "\u0780\u07aa\u0783\u07a6\u0780\u07a6\u0781\u07b0\u0788\u07a7\u078e\u07ae\u078c\u07a6\u0781\u07b0 \u078a\u07aa\u0781\u07aa\u0782\u07b0\u0796\u07a6\u0780\u07a7",
-"Resize": "\u0790\u07a6\u0787\u07a8\u0792\u07aa\u0784\u07a6\u078b\u07a6\u078d\u07aa\u0786\u07aa\u0783\u07aa\u0782\u07b0",
-"Sharpen": "\u078c\u07ab\u0782\u07aa\u0786\u07a6\u0782\u07b0",
-"Zoom out": "\u0786\u07aa\u0791\u07a6\u0786\u07aa\u0783\u07ad",
-"Image options": "\u078a\u07ae\u0793\u07af \u0787\u07ae\u0795\u07b0\u079d\u07a6\u0782\u07b0\u078c\u07a6\u0787\u07b0",
-"Apply": "\u0787\u07ac\u0795\u07b0\u078d\u07a6\u0787\u07a8\u0786\u07aa\u0783\u07ad",
-"Brightness": "\u0787\u07a6\u078d\u07a8\u0789\u07a8\u0782\u07b0",
-"Rotate clockwise": "\u0786\u07a6\u0782\u07a7\u078c\u07a6\u0781\u07b0 \u0787\u07a6\u0782\u0784\u07aa\u0783\u07a7",
-"Rotate counterclockwise": "\u0788\u07a7\u078c\u07a6\u0781\u07b0 \u0787\u07a6\u0782\u0784\u07aa\u0783\u07a7",
-"Edit image": "\u078a\u07ae\u0793\u07af \u0787\u07ac\u0791\u07a8\u0793\u07b0\u0786\u07aa\u07aa\u0783\u07aa\u0782\u07b0",
-"Color levels": "\u0786\u07aa\u078d\u07a6\u0787\u07a8\u078e\u07ac \u078d\u07ac\u0788\u07ac\u078d\u07b0\u078c\u07a6\u0787\u07b0",
-"Crop": "\u0786\u07b0\u0783\u07ae\u0795\u07b0\u0786\u07aa\u0783\u07aa\u0782\u07b0",
-"Orientation": "\u0787\u07ae\u0783\u07a8\u0787\u07ac\u0782\u07b0\u0793\u07ad\u079d\u07a6\u0782\u07b0",
-"Flip vertically": "\u0789\u07a6\u078c\u07a8\u0782\u07b0\u078c\u07a8\u0783\u07a8\u0787\u07a6\u0781\u07b0\u0788\u07a7\u078e\u07ae\u078c\u07a6\u0781\u07b0 \u078a\u07aa\u0781\u07aa\u0782\u07b0\u0796\u07a6\u0780\u07a7",
-"Invert": "\u0787\u07a8\u0782\u07b0\u0788\u07a7\u0793\u07aa",
-"Date\/time": "\u078c\u07a7\u0783\u07a9\u079a\u07b0\/\u0788\u07a6\u078e\u07aa\u078c\u07aa",
-"Insert date\/time": "\u0788\u07a6\u078e\u07aa\u078c\u07aa\/\u078c\u07a7\u0783\u07a9\u079a\u07b0 \u078d\u07aa\u0782\u07b0",
-"Remove link": "\u078d\u07a8\u0782\u07b0\u0786\u07b0 \u078a\u07ae\u0780\u07ad",
-"Url": "\u0794\u07ab.\u0787\u07a7\u0783\u07b0.\u0787\u07ac\u078d\u07b0",
-"Text to display": "\u078b\u07a6\u0787\u07b0\u0786\u07a6\u0782\u07b0\u0788\u07a9 \u0787\u07a8\u0784\u07a7\u0783\u07a7\u078c\u07b0",
-"Anchors": "\u0787\u07ac\u0782\u07b0\u0786\u07a6\u0783\u078c\u07a6\u0787\u07b0",
-"Insert link": "\u078d\u07a8\u0782\u07b0\u0786\u07b0 \u078d\u07aa\u0782\u07b0",
-"Link": "\u078d\u07a8\u0782\u07b0\u0786\u07aa",
-"New window": "\u0787\u07a7 \u0788\u07a8\u0782\u07b0\u0791\u07af\u0787\u07a6\u0786\u07a6\u0781\u07b0",
-"None": "\u0782\u07ae\u0782\u07b0",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u078c\u07a8\u0794\u07a6 \u078d\u07a8\u0794\u07aa\u0787\u07b0\u0788\u07a9 \u0787\u07ac\u0780\u07ac\u0782\u07b0 \u0790\u07a6\u0787\u07a8\u0793\u07ac\u0787\u07b0\u078e\u07ac \u078d\u07a8\u0782\u07b0\u0786\u07ac\u0787\u07b0\u0786\u07a6\u0789\u07aa\u0782\u07b0 \u0787\u07ac\u0797\u07b0.\u0793\u07a9.\u0793\u07a9.\u0795\u07a9 \u0786\u07aa\u0783\u07a8\u0787\u07a6\u0781\u07b0 \u0787\u07a8\u078c\u07aa\u0783\u07aa \u0786\u07aa\u0783\u07a6\u0782\u07b0\u078c\u07af\u061f",
-"Paste or type a link": "\u078d\u07a8\u0782\u07b0\u0786\u07aa \u078d\u07a8\u0794\u07aa\u0787\u07b0\u0788\u07a7 \u0782\u07aa\u0788\u07a6\u078c\u07a6 \u0795\u07ad\u0790\u07b0\u0793\u07b0 \u0786\u07aa\u0783\u07a6\u0787\u07b0\u0788\u07a7",
-"Target": "\u0793\u07a7\u078e\u07ac\u0793\u07b0",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0789\u07ac\u0787\u07a8\u078d\u07b0\u0793\u07ab - \u0786\u07aa\u0783\u07a8\u0787\u07a6\u0781\u07b0 \u0787\u07a8\u078c\u07aa\u0783\u07aa\u0786\u07aa\u0783\u07a6\u0787\u07b0\u0788\u07a6\u0782\u07b0 \u0784\u07ad\u0782\u07aa\u0782\u07b0\u078a\u07aa\u0785\u07aa\u078c\u07af\u061f",
-"Insert\/edit link": "\u078d\u07a8\u0782\u07b0\u0786\u07b0 \u078d\u07aa\u0782\u07b0\/\u0784\u07a6\u078b\u07a6\u078d\u07aa \u078e\u07ac\u0782\u07a6\u0787\u07aa\u0782\u07b0",
-"Insert\/edit video": "\u0788\u07a9\u0791\u07a8\u0787\u07af \u078d\u07aa\u0782\u07b0\/\u0784\u07a6\u078b\u07a6\u078d\u07aa \u078e\u07ac\u0782\u07a6\u0787\u07aa\u0782\u07b0",
-"Media": "\u0789\u07a9\u0791\u07a8\u0787\u07a7",
-"Alternative source": "\u0787\u07a6\u078d\u07b0\u0793\u07a6\u0782\u07ad\u0793\u07a8\u0788\u07b0 \u0790\u07af\u0790\u07b0",
-"Paste your embed code below:": "\u0787\u07ac\u0789\u07b0\u0784\u07ac\u0791\u07b0 \u0786\u07af\u0791\u07b0 \u078c\u07a8\u0783\u07a9\u078e\u07a6\u0787\u07a8 \u0795\u07ad\u0790\u07b0\u0793\u07b0 \u0786\u07aa\u0783\u07ad",
-"Insert video": "\u0788\u07a9\u0791\u07a8\u0787\u07af \u078d\u07aa\u0782\u07b0",
-"Poster": "\u0795\u07af\u0790\u07b0\u0793\u07a6\u0783",
-"Insert\/edit media": "\u0787\u07a8\u0782\u07b0\u0790\u07a7\u0793\u07b0\/\u0787\u07ac\u0791\u07a8\u0793\u07b0 \u0789\u07a9\u0791\u07a8\u0787\u07a7",
-"Embed": "\u0787\u07ac\u0789\u07b0\u0784\u07ac\u0791\u07b0",
-"Nonbreaking space": "\u0782\u07ae\u0782\u07b0 \u0784\u07b0\u0783\u07ad\u0786\u07a8\u0782\u07b0 \u0790\u07b0\u0795\u07ad\u0790\u07b0",
-"Page break": "\u0795\u07ad\u0796\u07b0 \u0784\u07b0\u0783\u07ad\u0786\u07b0",
-"Paste as text": "\u0793\u07ac\u0786\u07b0\u0790\u07b0\u0793\u07b0 \u078e\u07ae\u078c\u07a6\u0781\u07b0 \u0795\u07ad\u0790\u07b0\u0793\u07b0 \u0786\u07aa\u0783\u07ad",
-"Preview": "\u0795\u07b0\u0783\u07a9\u0788\u07a8\u0787\u07aa",
-"Print": "\u0795\u07b0\u0783\u07a8\u0782\u07b0\u0793\u07b0 \u0786\u07aa\u0783\u07ad",
-"Save": "\u0790\u07ad\u0788\u07b0 \u0786\u07aa\u0783\u07ad",
-"Could not find the specified string.": "\u078c\u07a8\u0794\u07a6 \u0780\u07af\u0787\u07b0\u078b\u07a6\u0788\u07a7 \u078d\u07a6\u078a\u07aa\u0792\u07ac\u0787\u07b0 \u0782\u07aa\u078a\u07ac\u0782\u07aa\u0782\u07aa",
-"Replace": "\u0784\u07a6\u078b\u07a6\u078d\u07aa \u0786\u07aa\u0783\u07ad",
-"Next": "\u078a\u07a6\u0780\u07a6\u078c\u07a6\u0781\u07b0",
-"Whole words": "\u0784\u07a6\u0790\u07b0\u078c\u07a6\u0787\u07b0 \u0787\u07ac\u0787\u07b0\u0786\u07ae\u0781\u07b0",
-"Find and replace": "\u0780\u07af\u078b\u07aa\u0789\u07a6\u0781\u07b0\u078a\u07a6\u0780\u07aa \u0784\u07a6\u078b\u07a6\u078d\u07aa \u0786\u07aa\u0783\u07aa\u0782\u07b0",
-"Replace with": "\u0784\u07a6\u078b\u07a6\u078d\u07aa\u078e\u07a6\u0787\u07a8 \u0784\u07ad\u0782\u07aa\u0782\u07b0 \u0786\u07aa\u0783\u07a7\u0782\u07a9",
-"Find": "\u0780\u07af\u078b\u07a7",
-"Replace all": "\u0780\u07aa\u0783\u07a8\u0780\u07a7 \u0787\u07ac\u0787\u07b0\u0797\u07ac\u0787\u07b0 \u0784\u07a6\u078b\u07a6\u078d\u07aa \u0786\u07aa\u0783\u07ad",
-"Match case": "\u0786\u07ad\u0790\u07b0 \u0787\u07a6\u0781\u07b0 \u0784\u07a6\u078d\u07a7",
-"Prev": "\u0786\u07aa\u0783\u07a8\u0787\u07a6\u0781\u07b0",
-"Spellcheck": "\u0786\u07aa\u0781\u07b0 \u0780\u07af\u078b\u07a7",
-"Finish": "\u0782\u07a8\u0782\u07b0\u0789\u07a7",
-"Ignore all": "\u0780\u07aa\u0783\u07a8\u0780\u07a7 \u0787\u07ac\u0787\u07b0\u0797\u07ac\u0787\u07b0 \u078b\u07ab\u0786\u07ae\u0781\u07b0\u078d\u07a7",
-"Ignore": "\u078b\u07ab\u0786\u07ae\u0781\u07b0\u078d\u07a7",
-"Add to Dictionary": "\u0783\u07a6\u078b\u07a9\u078a\u07a6\u0781\u07b0 \u0787\u07a8\u078c\u07aa\u0783\u07aa\u0786\u07aa\u0783\u07ad",
-"Insert row before": "\u0786\u07aa\u0783\u07a8\u0787\u07a6\u0781\u07b0 \u0783\u07af\u0787\u07ac\u0787\u07b0 \u0787\u07a8\u078c\u07aa\u0783\u07aa \u0786\u07aa\u0783\u07ad",
-"Rows": "\u0783\u07af",
-"Height": "\u078b\u07a8\u078e\u07aa\u0789\u07a8\u0782\u07b0",
-"Paste row after": "\u078a\u07a6\u0780\u07a6\u078c\u07a6\u0781\u07b0 \u0783\u07af \u0795\u07ad\u0790\u07b0\u0793\u07b0 \u0786\u07aa\u0783\u07ad",
-"Alignment": "\u0787\u07ac\u078d\u07a6\u0787\u07a8\u0782\u07b0\u0789\u07ac\u0782\u07b0\u0793\u07b0",
-"Border color": "\u0784\u07af\u0791\u07a6\u0783\u07aa \u0786\u07aa\u078d\u07a6",
-"Column group": "\u0786\u07ae\u078d\u07a6\u0789\u07b0 \u078e\u07b0\u0783\u07ab\u0795\u07b0",
-"Row": "\u0783\u07af",
-"Insert column before": "\u0786\u07aa\u0783\u07a8\u0787\u07a6\u0781\u07b0 \u0786\u07ae\u078d\u07a6\u0789\u07ac\u0787\u07b0 \u0787\u07a8\u078c\u07aa\u0783\u07aa \u0786\u07aa\u0783\u07ad",
-"Split cell": "\u0790\u07ac\u078d\u07b0 \u0788\u07a6\u0786\u07a8\u0786\u07aa\u0783\u07ad",
-"Cell padding": "\u0790\u07ac\u078d\u07b0 \u0795\u07ac\u0791\u07a8\u0782\u07b0",
-"Cell spacing": "\u0790\u07ac\u078d\u07b0 \u0790\u07b0\u0795\u07ad\u0790\u07a8\u0782\u07b0\u078e",
-"Row type": "\u0783\u07af\u078e\u07ac \u0788\u07a6\u0787\u07b0\u078c\u07a6\u0783\u07aa",
-"Insert table": "\u0793\u07ad\u0784\u07a6\u078d\u07b0 \u078d\u07aa\u0782\u07b0",
-"Body": "\u0784\u07ae\u0791\u07a9",
-"Caption": "\u0786\u07ac\u0795\u07b0\u079d\u07a6\u0782\u07b0",
-"Footer": "\u078a\u07ab\u0793\u07a6\u0783",
-"Delete row": "\u0783\u07af \u078a\u07ae\u0780\u07ad",
-"Paste row before": "\u0786\u07aa\u0783\u07a8\u0787\u07a6\u0781\u07b0 \u0783\u07af \u0795\u07ad\u0790\u07b0\u0793\u07b0 \u0786\u07aa\u0783\u07ad",
-"Scope": "\u0790\u07b0\u0786\u07af\u0795\u07b0",
-"Delete table": "\u0793\u07ad\u0784\u07a6\u078d\u07b0 \u078a\u07ae\u0780\u07ad",
-"H Align": "\u0780\u07aa\u0783\u07a6\u0790\u07b0 \u0787\u07ac\u078d\u07a6\u0787\u07a8\u0782\u07b0",
-"Top": "\u0789\u07a6\u078c\u07a8",
-"Header cell": "\u0780\u07ac\u0791\u07a7 \u0790\u07ac\u078d\u07b0",
-"Column": "\u0786\u07ae\u078d\u07a6\u0789\u07b0",
-"Row group": "\u0783\u07af \u078e\u07b0\u0783\u07ab\u0795\u07b0",
-"Cell": "\u0790\u07ac\u078d\u07b0",
-"Middle": "\u0789\u07ac\u078b\u07aa",
-"Cell type": "\u0790\u07ac\u078d\u07b0\u078e\u07ac \u0788\u07a6\u0787\u07b0\u078c\u07a6\u0783\u07aa",
-"Copy row": "\u0783\u07af \u0786\u07ae\u0795\u07a9\u0786\u07aa\u0783\u07ad",
-"Row properties": "\u0783\u07af\u078e\u07ac \u0790\u07a8\u078a\u07a6\u078c\u07a6\u0787\u07b0",
-"Table properties": "\u0793\u07ad\u0784\u07a6\u078d\u07b0\u078e\u07ac \u0790\u07a8\u078a\u07a6\u078c\u07a6\u0787\u07b0",
-"Bottom": "\u078c\u07a8\u0783\u07a8",
-"V Align": "\u078b\u07a8\u078e\u07a6\u0781\u07b0 \u0787\u07ac\u078d\u07a6\u0787\u07a8\u0782\u07b0",
-"Header": "\u0780\u07ac\u0791\u07a7",
-"Right": "\u0786\u07a6\u0782\u07a7\u078c\u07a6\u0781\u07b0",
-"Insert column after": "\u078a\u07a6\u0780\u07a6\u078c\u07a6\u0781\u07b0 \u0786\u07ae\u078d\u07a6\u0789\u07ac\u0787\u07b0 \u0787\u07a8\u078c\u07aa\u0783\u07aa \u0786\u07aa\u0783\u07ad",
-"Cols": "\u0786\u07ae\u078d\u07a6\u0789\u07b0",
-"Insert row after": "\u078a\u07a6\u0780\u07a6\u078c\u07a6\u0781\u07b0 \u0783\u07af\u0787\u07ac\u0787\u07b0 \u0787\u07a8\u078c\u07aa\u0783\u07aa \u0786\u07aa\u0783\u07ad",
-"Width": "\u078a\u07aa\u0785\u07a7\u0789\u07a8\u0782\u07b0",
-"Cell properties": "\u0790\u07ac\u078d\u07b0\u078e\u07ac \u0790\u07a8\u078a\u07a6\u078c\u07a6\u0787\u07b0",
-"Left": "\u0788\u07a7\u078c\u07a6\u0781\u07b0",
-"Cut row": "\u0783\u07af \u0786\u07a6\u0793\u07b0\u0786\u07aa\u0783\u07ad",
-"Delete column": "\u0786\u07ae\u078d\u07a6\u0789\u07b0 \u078a\u07ae\u0780\u07ad",
-"Center": "\u0789\u07ac\u078b\u07a6\u0781\u07b0",
-"Merge cells": "\u0790\u07ac\u078d\u07b0 \u0787\u07ac\u0787\u07b0\u0786\u07aa\u0783\u07ad",
-"Insert template": "\u0793\u07ac\u0789\u07b0\u0795\u07b0\u078d\u07ad\u0793\u07b0 \u0787\u07a8\u0782\u07b0\u0790\u07a7\u0793\u07b0 \u0786\u07aa\u0783\u07aa\u0782\u07b0",
-"Templates": "\u0793\u07ac\u0789\u07b0\u0795\u07b0\u078d\u07ad\u0793\u07b0\u078c\u07a6\u0787\u07b0",
-"Background color": "\u0784\u07ac\u0786\u07b0\u078e\u07b0\u0783\u07a6\u0787\u07aa\u0782\u07b0\u0791\u07b0\u078e\u07ac \u0786\u07aa\u078d\u07a6",
-"Custom...": "\u0787\u07a6\u0789\u07a8\u0787\u07b0\u078d\u07a6",
-"Custom color": "\u0787\u07a6\u0789\u07a8\u0787\u07b0\u078d\u07a6 \u0786\u07aa\u078d\u07a6",
-"No color": "\u0786\u07aa\u078d\u07a6 \u0782\u07aa\u0796\u07a6\u0787\u07b0\u0790\u07a7",
-"Text color": "\u0787\u07a6\u0786\u07aa\u0783\u07aa\u078e\u07ac \u0786\u07aa\u078d\u07a6",
-"Table of Contents": "\u0780\u07a8\u0789\u07ac\u0782\u07ad \u0784\u07a6\u0787\u07a8\u078c\u07a6\u0787\u07b0",
-"Show blocks": "\u0784\u07b0\u078d\u07ae\u0786\u07b0\u078c\u07a6\u0787\u07b0 \u078b\u07a6\u0787\u07b0\u0786\u07a7",
-"Show invisible characters": "\u0782\u07aa\u078a\u07ac\u0782\u07b0\u0782\u07a6 \u0787\u07a6\u0786\u07aa\u0783\u07aa\u078c\u07a6\u0787\u07b0 \u078b\u07a6\u0787\u07b0\u0786\u07a7",
-"Words: {0}": "\u0784\u07a6\u0790\u07b0: {0}",
-"Insert": "\u0787\u07a8\u0782\u07b0\u0790\u07a7\u0793\u07b0",
-"File": "\u078a\u07a6\u0787\u07a8\u078d\u07b0",
-"Edit": "\u0784\u07a6\u078b\u07a6\u078d\u07aa \u078e\u07ac\u0782\u07a6\u0787\u07aa\u0782\u07b0",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0783\u07a8\u0797\u07b0 \u0793\u07ac\u0786\u07b0\u0790\u07b0\u0793\u07b0 \u0787\u07ad\u0783\u07a8\u0787\u07a7. \u0789\u07ac\u0782\u07ab \u0780\u07af\u078b\u07aa\u0789\u07a6\u0781\u07b0 ALT-F9. \u0793\u07ab\u078d\u07b0\u0784\u07a6\u0783 \u0780\u07af\u078b\u07aa\u0789\u07a6\u0781\u07b0 ALT-F10. \u0787\u07ac\u0780\u07a9 \u0780\u07af\u078b\u07aa\u0789\u07a6\u0781\u07b0 ALT-0",
-"Tools": "\u0793\u07ab\u078d\u07b0\u078c\u07a6\u0787\u07b0",
-"View": "\u0788\u07a8\u0787\u07aa",
-"Table": "\u0793\u07ad\u0784\u07a6\u078d\u07b0",
-"Format": "\u078a\u07af\u0789\u07ac\u0793\u07b0"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/el.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/el.js
deleted file mode 100644
index b5f840da87..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/el.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('el',{
-"Redo": "\u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7",
-"Undo": "\u0391\u03bd\u03b1\u03af\u03c1\u03b5\u03c3\u03b7",
-"Cut": "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae",
-"Copy": "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
-"Paste": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7",
-"Select all": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03cc\u03bb\u03c9\u03bd",
-"New document": "\u039d\u03ad\u03bf \u03ad\u03b3\u03b3\u03c1\u03b1\u03c6\u03bf",
-"Ok": "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9",
-"Cancel": "\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7",
-"Visual aids": "O\u03c0\u03c4\u03b9\u03ba\u03ac \u03b2\u03bf\u03b7\u03b8\u03ae\u03bc\u03b1\u03c4\u03b1 ",
-"Bold": "\u0388\u03bd\u03c4\u03bf\u03bd\u03b7",
-"Italic": "\u03a0\u03bb\u03ac\u03b3\u03b9\u03b1",
-"Underline": "\u03a5\u03c0\u03bf\u03b3\u03c1\u03ac\u03bc\u03bc\u03b9\u03c3\u03b7",
-"Strikethrough": "\u0394\u03b9\u03b1\u03ba\u03c1\u03b9\u03c4\u03ae \u03b4\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae",
-"Superscript": "\u0395\u03ba\u03b8\u03ad\u03c4\u03b7\u03c2",
-"Subscript": "\u0394\u03b5\u03af\u03ba\u03c4\u03b7\u03c2",
-"Clear formatting": "\u0391\u03c0\u03b1\u03bb\u03bf\u03b9\u03c6\u03ae \u03bc\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7\u03c2",
-"Align left": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
-"Align center": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03c3\u03c4\u03bf \u03ba\u03ad\u03bd\u03c4\u03c1\u03bf",
-"Align right": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03b4\u03b5\u03be\u03b9\u03ac",
-"Justify": "\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03c3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
-"Bullet list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03bc\u03b5 \u03ba\u03bf\u03c5\u03ba\u03ba\u03af\u03b4\u03b5\u03c2",
-"Numbered list": "\u0391\u03c1\u03b9\u03b8\u03bc\u03b7\u03bc\u03ad\u03bd\u03b7 \u03bb\u03af\u03c3\u03c4\u03b1",
-"Decrease indent": "\u039c\u03b5\u03af\u03c9\u03c3\u03b7 \u03b5\u03c3\u03bf\u03c7\u03ae\u03c2",
-"Increase indent": "\u0391\u03cd\u03be\u03b7\u03c3\u03b7 \u03b5\u03c3\u03bf\u03c7\u03ae\u03c2",
-"Close": "\u039a\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf",
-"Formats": "\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u039f \u03c0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03c4\u03ae\u03c2 \u03c3\u03b1\u03c2 \u03b4\u03b5\u03bd \u03c5\u03c0\u03bf\u03c3\u03c4\u03b7\u03c1\u03af\u03b6\u03b5\u03b9 \u03ac\u03bc\u03b5\u03c3\u03b7 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03c3\u03c4\u03bf \u03c0\u03c1\u03cc\u03c7\u03b5\u03b9\u03c1\u03bf. \u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03c3\u03c5\u03bd\u03c4\u03bf\u03bc\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2 \u03c0\u03bb\u03b7\u03ba\u03c4\u03c1\u03bf\u03bb\u03bf\u03b3\u03af\u03bf\u03c5 Ctrl+X\/C\/V.",
-"Headers": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b5\u03c2",
-"Header 1": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 1",
-"Header 2": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 2",
-"Header 3": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 3",
-"Header 4": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 4",
-"Header 5": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 5",
-"Header 6": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 6",
-"Headings": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b5\u03c2",
-"Heading 1": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 1",
-"Heading 2": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 2",
-"Heading 3": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 3",
-"Heading 4": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 4",
-"Heading 5": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 5",
-"Heading 6": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 6",
-"Preformatted": "\u03a0\u03c1\u03bf\u03b4\u03b9\u03b1\u03bc\u03bf\u03c1\u03c6\u03c9\u03bc\u03ad\u03bd\u03bf",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u039a\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2",
-"Paragraph": "\u03a0\u03b1\u03c1\u03ac\u03b3\u03c1\u03b1\u03c6\u03bf\u03c2",
-"Blockquote": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ae \u03c0\u03b1\u03c1\u03ac\u03b8\u03b5\u03c3\u03b7\u03c2",
-"Inline": "\u0395\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03b7",
-"Blocks": "\u03a4\u03bc\u03ae\u03bc\u03b1\u03c4\u03b1",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0397 \u03b5\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c4\u03ce\u03c1\u03b1 \u03c3\u03b5 \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03b1\u03c0\u03bb\u03bf\u03cd \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5. \u03a4\u03b1 \u03c0\u03b5\u03c1\u03b9\u03b5\u03c7\u03cc\u03bc\u03b5\u03bd\u03b1 \u03bc\u03b9\u03b1\u03c2 \u03b5\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7\u03c2 \u03b8\u03b1 \u03b5\u03c0\u03b9\u03ba\u03bf\u03bb\u03bb\u03bf\u03cd\u03bd\u03c4\u03b1\u03b9 \u03c9\u03c2 \u03b1\u03c0\u03bb\u03cc \u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf \u03cc\u03c3\u03bf \u03b7 \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03b1\u03c5\u03c4\u03ae \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03bd\u03b5\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03ae.",
-"Font Family": "\u0393\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac",
-"Font Sizes": "\u039c\u03ad\u03b3\u03b5\u03b8\u03bf\u03c2",
-"Class": "\u039a\u03bb\u03ac\u03c3\u03b7",
-"Browse for an image": "\u0391\u03bd\u03b1\u03b6\u03b7\u03c4\u03ae\u03c3\u03c4\u03b5 \u03bc\u03b9\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1",
-"OR": "\u0389",
-"Drop an image here": "\u03a1\u03af\u03be\u03c4\u03b5 \u03bc\u03b9\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1 \u03b5\u03b4\u03ce",
-"Upload": "\u039c\u03b5\u03c4\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7",
-"Block": "\u03a4\u03bc\u03ae\u03bc\u03b1",
-"Align": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
-"Default": "\u03a0\u03c1\u03bf\u03ba\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf",
-"Circle": "\u039a\u03cd\u03ba\u03bb\u03bf\u03c2",
-"Disc": "\u0394\u03af\u03c3\u03ba\u03bf\u03c2",
-"Square": "\u03a4\u03b5\u03c4\u03c1\u03ac\u03b3\u03c9\u03bd\u03bf",
-"Lower Alpha": "\u03a0\u03b5\u03b6\u03ac \u03bb\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac",
-"Lower Greek": "\u03a0\u03b5\u03b6\u03ac \u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac",
-"Lower Roman": "\u03a0\u03b5\u03b6\u03ac \u03c1\u03c9\u03bc\u03b1\u03ca\u03ba\u03ac",
-"Upper Alpha": "\u039a\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03b1 \u03bb\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac",
-"Upper Roman": "\u039a\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03b1 \u03c1\u03c9\u03bc\u03b1\u03ca\u03ba\u03ac",
-"Anchor": "\u0391\u03b3\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7",
-"Name": "\u038c\u03bd\u03bf\u03bc\u03b1",
-"Id": "\u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u039f \u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b1\u03c1\u03c7\u03af\u03b6\u03b5\u03b9 \u03bc\u03b5 \u03ad\u03bd\u03b1 \u03b3\u03c1\u03ac\u03bc\u03bc\u03b1, \u03b1\u03ba\u03bf\u03bb\u03bf\u03c5\u03b8\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03bc\u03cc\u03bd\u03bf \u03b1\u03c0\u03cc \u03b3\u03c1\u03ac\u03bc\u03bc\u03b1\u03c4\u03b1, \u03b1\u03c1\u03b9\u03b8\u03bc\u03bf\u03cd\u03c2, \u03c0\u03b1\u03cd\u03bb\u03b5\u03c2, \u03c4\u03b5\u03bb\u03b5\u03af\u03b5\u03c2, \u03ac\u03bd\u03c9 \u03c4\u03b5\u03bb\u03b5\u03af\u03b1 \u03ae \u03c5\u03c0\u03bf\u03b3\u03c1\u03b1\u03bc\u03bc\u03af\u03c3\u03b5\u03b9\u03c2.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0388\u03c7\u03b5\u03c4\u03b5 \u03bc\u03b7 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03c5\u03bc\u03ad\u03bd\u03b5\u03c2 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ad\u03c2. \u0395\u03af\u03c3\u03c4\u03b5 \u03b2\u03ad\u03b2\u03b1\u03b9\u03bf\u03b9 \u03cc\u03c4\u03b9 \u03b8\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c6\u03cd\u03b3\u03b5\u03c4\u03b5 \u03b1\u03c0\u03cc \u03c4\u03b7\u03bd \u03c3\u03b5\u03bb\u03af\u03b4\u03b1;",
-"Restore last draft": "\u0395\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac \u03c4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03bf\u03c5 \u03c3\u03c7\u03b5\u03b4\u03af\u03bf\u03c5",
-"Special character": "\u0395\u03b9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03b1\u03c2",
-"Source code": "\u03a0\u03b7\u03b3\u03b1\u03af\u03bf\u03c2 \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2",
-"Insert\/Edit code sample": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b4\u03b5\u03af\u03b3\u03bc\u03b1\u03c4\u03bf\u03c2 \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1",
-"Language": "\u0393\u03bb\u03ce\u03c3\u03c3\u03b1",
-"Code sample": "\u0394\u03b5\u03af\u03b3\u03bc\u03b1 \u039a\u03ce\u03b4\u03b9\u03ba\u03b1",
-"Color": "\u03a7\u03c1\u03ce\u03bc\u03b1",
-"R": "\u03ba",
-"G": "\u03a0",
-"B": "\u039c",
-"Left to right": "\u0391\u03c0\u03cc \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b4\u03b5\u03be\u03b9\u03ac",
-"Right to left": "\u0391\u03c0\u03cc \u03b4\u03b5\u03be\u03b9\u03ac \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
-"Emoticons": "\u03a6\u03b1\u03c4\u03c3\u03bf\u03cd\u03bb\u03b5\u03c2",
-"Document properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03b5\u03b3\u03b3\u03c1\u03ac\u03c6\u03bf\u03c5",
-"Title": "\u03a4\u03af\u03c4\u03bb\u03bf\u03c2",
-"Keywords": "\u039b\u03ad\u03be\u03b5\u03b9\u03c2 \u03ba\u03bb\u03b5\u03b9\u03b4\u03b9\u03ac",
-"Description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
-"Robots": "\u03a1\u03bf\u03bc\u03c0\u03cc\u03c4",
-"Author": "\u03a3\u03c5\u03bd\u03c4\u03ac\u03ba\u03c4\u03b7\u03c2",
-"Encoding": "\u039a\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
-"Fullscreen": "\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03bf\u03b8\u03cc\u03bd\u03b7",
-"Action": "\u0395\u03bd\u03ad\u03c1\u03b3\u03b5\u03b9\u03b1",
-"Shortcut": "\u03a3\u03c5\u03bd\u03c4\u03cc\u03bc\u03b5\u03c5\u03c3\u03b7",
-"Help": "\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1",
-"Address": "\u0394\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7",
-"Focus to menubar": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03bf \u03bc\u03b5\u03bd\u03bf\u03cd",
-"Focus to toolbar": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd",
-"Focus to element path": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03b4\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ae \u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af\u03bf\u03c5",
-"Focus to contextual toolbar": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03c3\u03c5\u03bd\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd",
-"Insert link (if link plugin activated)": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5 (\u03b5\u03ac\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf \u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03bf \u03c4\u03bf\u03c5 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5)",
-"Save (if save plugin activated)": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 (\u03b5\u03ac\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf \u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03bf \u03c4\u03b7\u03c2 \u03b1\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7\u03c2)",
-"Find (if searchreplace plugin activated)": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7 (\u03b5\u03ac\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf \u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03bf \u03c4\u03b7\u03c2 \u03b1\u03bd\u03b1\u03b6\u03ae\u03c4\u03b7\u03c3\u03b7\u03c2)",
-"Plugins installed ({0}):": "\u0395\u03b3\u03ba\u03b1\u03c4\u03b5\u03c3\u03c4\u03b7\u03bc\u03ad\u03bd\u03b1 \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03b1 ({0}):",
-"Premium plugins:": "\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03b1 \u03c5\u03c8\u03b7\u03bb\u03ae\u03c2 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2:",
-"Learn more...": "\u039c\u03ac\u03b8\u03b5\u03c4\u03b5 \u03c0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03b1...",
-"You are using {0}": "\u03a7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af\u03c4\u03b5 {0}",
-"Plugins": "\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03b1",
-"Handy Shortcuts": "\u03a7\u03c1\u03ae\u03c3\u03b9\u03bc\u03b5\u03c2 \u03c3\u03c5\u03bd\u03c4\u03bf\u03bc\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2",
-"Horizontal line": "\u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae",
-"Insert\/edit image": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
-"Image description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
-"Source": "\u03a0\u03b7\u03b3\u03ae",
-"Dimensions": "\u0394\u03b9\u03b1\u03c3\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2",
-"Constrain proportions": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u03b1\u03bd\u03b1\u03bb\u03bf\u03b3\u03b9\u03ce\u03bd",
-"General": "\u0393\u03b5\u03bd\u03b9\u03ba\u03ac",
-"Advanced": "\u0393\u03b9\u03b1 \u03a0\u03c1\u03bf\u03c7\u03c9\u03c1\u03b7\u03bc\u03ad\u03bd\u03bf\u03c5\u03c2",
-"Style": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7",
-"Vertical space": "\u039a\u03ac\u03b8\u03b5\u03c4\u03bf \u03b4\u03b9\u03ac\u03c3\u03c4\u03b7\u03bc\u03b1",
-"Horizontal space": "\u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03bf \u03b4\u03b9\u03ac\u03c3\u03c4\u03b7\u03bc\u03b1",
-"Border": "\u03a0\u03bb\u03b1\u03af\u03c3\u03b9\u03bf",
-"Insert image": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
-"Image": "\u0395\u03b9\u03ba\u03cc\u03bd\u03b1",
-"Image list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03c9\u03bd",
-"Rotate counterclockwise": "\u03a0\u03b5\u03c1\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03cc\u03c3\u03c4\u03c1\u03bf\u03c6\u03b1",
-"Rotate clockwise": "\u03a0\u03b5\u03c1\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03b4\u03b5\u03be\u03b9\u03cc\u03c3\u03c4\u03c1\u03bf\u03c6\u03b1",
-"Flip vertically": "\u0391\u03bd\u03b1\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03ba\u03b1\u03b8\u03ad\u03c4\u03c9\u03c2",
-"Flip horizontally": "\u0391\u03bd\u03b1\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03bf\u03c1\u03b9\u03b6\u03bf\u03bd\u03c4\u03af\u03c9\u03c2",
-"Edit image": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
-"Image options": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
-"Zoom in": "\u039c\u03b5\u03b3\u03ad\u03b8\u03c5\u03bd\u03c3\u03b7",
-"Zoom out": "\u03a3\u03bc\u03af\u03ba\u03c1\u03c5\u03bd\u03c3\u03b7",
-"Crop": "\u03a0\u03b5\u03c1\u03b9\u03ba\u03bf\u03c0\u03ae",
-"Resize": "\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03bc\u03b5\u03b3\u03ad\u03b8\u03bf\u03c5\u03c2",
-"Orientation": "\u03a0\u03c1\u03bf\u03c3\u03b1\u03bd\u03b1\u03c4\u03bf\u03bb\u03b9\u03c3\u03bc\u03cc\u03c2",
-"Brightness": "\u03a6\u03c9\u03c4\u03b5\u03b9\u03bd\u03cc\u03c4\u03b7\u03c4\u03b1",
-"Sharpen": "\u038c\u03be\u03c5\u03bd\u03c3\u03b7",
-"Contrast": "\u0391\u03bd\u03c4\u03af\u03b8\u03b5\u03c3\u03b7",
-"Color levels": "\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03b1 \u03c7\u03c1\u03ce\u03bc\u03b1\u03c4\u03bf\u03c2",
-"Gamma": "\u0393\u03ac\u03bc\u03bc\u03b1",
-"Invert": "\u0391\u03bd\u03c4\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae",
-"Apply": "\u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae",
-"Back": "\u03a0\u03af\u03c3\u03c9",
-"Insert date\/time": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b7\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1\u03c2\/\u03ce\u03c1\u03b1\u03c2",
-"Date\/time": "\u0397\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1\/\u03ce\u03c1\u03b1",
-"Insert link": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
-"Insert\/edit link": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
-"Text to display": "\u039a\u03b5\u03af\u03bc\u03b5\u03bd\u03bf \u03b3\u03b9\u03b1 \u03b5\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7",
-"Url": "URL",
-"Target": "\u03a0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2",
-"None": "\u039a\u03b1\u03bc\u03af\u03b1",
-"New window": "\u039d\u03ad\u03bf \u03c0\u03b1\u03c1\u03ac\u03b8\u03c5\u03c1\u03bf",
-"Remove link": "\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
-"Anchors": "\u0386\u03b3\u03ba\u03c5\u03c1\u03b5\u03c2",
-"Link": "\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03c2",
-"Paste or type a link": "\u0395\u03c0\u03b9\u03ba\u03bf\u03bb\u03bb\u03ae\u03c3\u03c4\u03b5 \u03ae \u03c0\u03bb\u03b7\u03ba\u03c4\u03c1\u03bf\u03bb\u03bf\u03b3\u03ae\u03c3\u03c4\u03b5 \u03ad\u03bd\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0397 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL \u03c0\u03bf\u03c5 \u03b5\u03b9\u03c3\u03ac\u03c7\u03b8\u03b7\u03ba\u03b5 \u03c0\u03b9\u03b8\u03b1\u03bd\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 email. \u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03c0\u03c1\u03cc\u03b8\u03b7\u03bc\u03b1 mailto:;",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0397 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL \u03c0\u03bf\u03c5 \u03b5\u03b9\u03c3\u03ac\u03c7\u03b8\u03b7\u03ba\u03b5 \u03c0\u03b9\u03b8\u03b1\u03bd\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03be\u03c9\u03c4\u03b5\u03c1\u03b9\u03ba\u03cc\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03c2. \u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03c0\u03c1\u03cc\u03b8\u03b7\u03bc\u03b1 http:\/\/;",
-"Link list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03c9\u03bd",
-"Insert video": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b2\u03af\u03bd\u03c4\u03b5\u03bf",
-"Insert\/edit video": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b2\u03af\u03bd\u03c4\u03b5\u03bf",
-"Insert\/edit media": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 media",
-"Alternative source": "\u0395\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7",
-"Poster": "\u0391\u03c6\u03af\u03c3\u03b1",
-"Paste your embed code below:": "\u0395\u03b9\u03c3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03b5\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03bf \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1 \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9:",
-"Embed": "\u0395\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7",
-"Media": "\u039c\u03ad\u03c3\u03b1 (\u03bc\u03af\u03bd\u03c4\u03b9\u03b1)",
-"Nonbreaking space": "\u039a\u03b5\u03bd\u03cc \u03c7\u03c9\u03c1\u03af\u03c2 \u03b4\u03b9\u03b1\u03ba\u03bf\u03c0\u03ae",
-"Page break": "\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2",
-"Paste as text": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03c9\u03c2 \u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf",
-"Preview": "\u03a0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7",
-"Print": "\u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7",
-"Save": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7",
-"Find": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7",
-"Replace with": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03bc\u03b5",
-"Replace": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7",
-"Replace all": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03cc\u03bb\u03c9\u03bd",
-"Prev": "\u03a0\u03c1\u03bf\u03b7\u03b3.",
-"Next": "\u0395\u03c0\u03cc\u03bc.",
-"Find and replace": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7 \u03ba\u03b1\u03b9 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7",
-"Could not find the specified string.": "\u0394\u03b5\u03bd \u03ae\u03c4\u03b1\u03bd \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b5\u03cd\u03c1\u03b5\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03ba\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf\u03c5 \u03b1\u03bb\u03c6\u03b1\u03c1\u03b9\u03b8\u03bc\u03b7\u03c4\u03b9\u03ba\u03bf\u03cd.",
-"Match case": "\u03a4\u03b1\u03af\u03c1\u03b9\u03b1\u03c3\u03bc\u03b1 \u03c0\u03b5\u03b6\u03ce\u03bd\/\u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03c9\u03bd",
-"Whole words": "\u039f\u03bb\u03cc\u03ba\u03bb\u03b7\u03c1\u03b5\u03c2 \u03bb\u03ad\u03be\u03b5\u03b9\u03c2",
-"Spellcheck": "\u039f\u03c1\u03b8\u03bf\u03b3\u03c1\u03b1\u03c6\u03b9\u03ba\u03cc\u03c2 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf\u03c2 ",
-"Ignore": "\u03a0\u03b1\u03c1\u03ac\u03b2\u03bb\u03b5\u03c8\u03b7",
-"Ignore all": "\u03a0\u03b1\u03c1\u03ac\u03b2\u03bb\u03b5\u03c8\u03b7 \u03cc\u03bb\u03c9\u03bd",
-"Finish": "\u03a4\u03ad\u03bb\u03bf\u03c2",
-"Add to Dictionary": "\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 \u03c3\u03c4\u03bf \u039b\u03b5\u03be\u03b9\u03ba\u03cc",
-"Insert table": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
-"Table properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
-"Delete table": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
-"Cell": "\u039a\u03b5\u03bb\u03af",
-"Row": "\u0393\u03c1\u03b1\u03bc\u03bc\u03ae",
-"Column": "\u03a3\u03c4\u03ae\u03bb\u03b7",
-"Cell properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
-"Merge cells": "\u03a3\u03c5\u03b3\u03c7\u03ce\u03bd\u03b5\u03c5\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
-"Split cell": "\u0394\u03b9\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
-"Insert row before": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03b5\u03c0\u03ac\u03bd\u03c9",
-"Insert row after": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03ba\u03ac\u03c4\u03c9",
-"Delete row": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Row properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Cut row": "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Copy row": "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Paste row before": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03b5\u03c0\u03ac\u03bd\u03c9",
-"Paste row after": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03ba\u03ac\u03c4\u03c9",
-"Insert column before": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
-"Insert column after": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03b4\u03b5\u03be\u03b9\u03ac",
-"Delete column": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2",
-"Cols": "\u03a3\u03c4\u03ae\u03bb\u03b5\u03c2",
-"Rows": "\u0393\u03c1\u03b1\u03bc\u03bc\u03ad\u03c2",
-"Width": "\u03a0\u03bb\u03ac\u03c4\u03bf\u03c2",
-"Height": "\u038e\u03c8\u03bf\u03c2",
-"Cell spacing": "\u0391\u03c0\u03cc\u03c3\u03c4\u03b1\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
-"Cell padding": "\u0391\u03bd\u03b1\u03c0\u03bb\u03ae\u03c1\u03c9\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
-"Caption": "\u039b\u03b5\u03b6\u03ac\u03bd\u03c4\u03b1",
-"Left": "\u0391\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
-"Center": "\u039a\u03b5\u03bd\u03c4\u03c1\u03b1\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03b7",
-"Right": "\u0394\u03b5\u03be\u03b9\u03ac",
-"Cell type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
-"Scope": "\u0388\u03ba\u03c4\u03b1\u03c3\u03b7",
-"Alignment": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
-"H Align": "\u039f\u03c1. \u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
-"V Align": "\u039a. \u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
-"Top": "\u039a\u03bf\u03c1\u03c5\u03c6\u03ae",
-"Middle": "\u039c\u03ad\u03c3\u03b7",
-"Bottom": "\u039a\u03ac\u03c4\u03c9",
-"Header cell": "\u039a\u03b5\u03bb\u03af-\u03ba\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1",
-"Row group": "\u039f\u03bc\u03ac\u03b4\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ce\u03bd",
-"Column group": "\u039f\u03bc\u03ac\u03b4\u03b1 \u03c3\u03c4\u03b7\u03bb\u03ce\u03bd",
-"Row type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Header": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1",
-"Body": "\u03a3\u03ce\u03bc\u03b1",
-"Footer": "\u03a5\u03c0\u03bf\u03c3\u03ad\u03bb\u03b9\u03b4\u03bf",
-"Border color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03c0\u03bb\u03b1\u03b9\u03c3\u03af\u03bf\u03c5",
-"Insert template": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c0\u03c1\u03bf\u03c4\u03cd\u03c0\u03bf\u03c5 ",
-"Templates": "\u03a0\u03c1\u03cc\u03c4\u03c5\u03c0\u03b1",
-"Template": "\u03a0\u03c1\u03cc\u03c4\u03c5\u03c0\u03bf",
-"Text color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5 ",
-"Background color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03c6\u03cc\u03bd\u03c4\u03bf\u03c5",
-"Custom...": "\u03a0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae...",
-"Custom color": "\u03a0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03c3\u03bc\u03ad\u03bd\u03bf \u03c7\u03c1\u03ce\u03bc\u03b1",
-"No color": "\u03a7\u03c9\u03c1\u03af\u03c2 \u03c7\u03c1\u03ce\u03bc\u03b1",
-"Table of Contents": "\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2 \u03a0\u03b5\u03c1\u03b9\u03b5\u03c7\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd",
-"Show blocks": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03c4\u03bc\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd",
-"Show invisible characters": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03ba\u03c1\u03c5\u03c6\u03ce\u03bd \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03c9\u03bd",
-"Words: {0}": "\u039b\u03ad\u03be\u03b5\u03b9\u03c2: {0}",
-"{0} words": "{0} \u03bb\u03ad\u03be\u03b5\u03b9\u03c2",
-"File": "\u0391\u03c1\u03c7\u03b5\u03af\u03bf",
-"Edit": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1",
-"Insert": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae",
-"View": "\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae",
-"Format": "\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
-"Table": "\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2",
-"Tools": "\u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03b1",
-"Powered by {0}": "\u03a4\u03c1\u03bf\u03c6\u03bf\u03b4\u03bf\u03c4\u03b5\u03af\u03c4\u03b1\u03b9 \u03b1\u03c0\u03cc {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ae \u0395\u03bc\u03c0\u03bb\u03bf\u03c5\u03c4\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-F9 \u03b3\u03b9\u03b1 \u03c4\u03bf \u03bc\u03b5\u03bd\u03bf\u03cd. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-F10 \u03b3\u03b9\u03b1  \u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-0 \u03b3\u03b9\u03b1 \u03b2\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_CA.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_CA.js
deleted file mode 100644
index cc07ffd23e..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_CA.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('en_CA',{
-"Redo": "Redo",
-"Undo": "Undo",
-"Cut": "Cut",
-"Copy": "Copy",
-"Paste": "Paste",
-"Select all": "Select all",
-"New document": "New document",
-"Ok": "Ok",
-"Cancel": "Cancel",
-"Visual aids": "Visual aids",
-"Bold": "Bold",
-"Italic": "Italic",
-"Underline": "Underline",
-"Strikethrough": "Strikethrough",
-"Superscript": "Superscript",
-"Subscript": "Subscript",
-"Clear formatting": "Clear formatting",
-"Align left": "Align left",
-"Align center": "Align center",
-"Align right": "Align right",
-"Justify": "Justify",
-"Bullet list": "Bullet list",
-"Numbered list": "Numbered list",
-"Decrease indent": "Decrease indent",
-"Increase indent": "Increase indent",
-"Close": "Close",
-"Formats": "Formats",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.",
-"Headers": "Headers",
-"Header 1": "Header 1",
-"Header 2": "Header 2",
-"Header 3": "Header 3",
-"Header 4": "Header 4",
-"Header 5": "Header 5",
-"Header 6": "Header 6",
-"Headings": "Headings",
-"Heading 1": "Heading 1",
-"Heading 2": "Heading 2",
-"Heading 3": "Heading 3",
-"Heading 4": "Heading 4",
-"Heading 5": "Heading 5",
-"Heading 6": "Heading 6",
-"Preformatted": "Preformatted",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Code",
-"Paragraph": "Paragraph",
-"Blockquote": "Blockquote",
-"Inline": "Inline",
-"Blocks": "Blocks",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
-"Font Family": "Font Family",
-"Font Sizes": "Font Sizes",
-"Class": "Class",
-"Browse for an image": "Browse for an image",
-"OR": "OR",
-"Drop an image here": "Drop an image here",
-"Upload": "Upload",
-"Block": "Blocks",
-"Align": "Align",
-"Default": "Default",
-"Circle": "Circle",
-"Disc": "Disc",
-"Square": "Square",
-"Lower Alpha": "Lower Alpha",
-"Lower Greek": "Lower Greek",
-"Lower Roman": "Lower Roman",
-"Upper Alpha": "Upper Alpha",
-"Upper Roman": "Upper Roman",
-"Anchor": "Anchor",
-"Name": "Name",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID should start with a letter, followed only by letters, numbers, dashes, dots, colons, or underscores.",
-"You have unsaved changes are you sure you want to navigate away?": "You have unsaved changes are you sure you want to navigate away?",
-"Restore last draft": "Restore last draft",
-"Special character": "Special character",
-"Source code": "Source code",
-"Insert\/Edit code sample": "Insert\/Edit code sample",
-"Language": "Language",
-"Code sample": "Code sample",
-"Color": "Colour",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Left to right",
-"Right to left": "Right to left",
-"Emoticons": "Emoticons",
-"Document properties": "Document properties",
-"Title": "Title",
-"Keywords": "Keywords",
-"Description": "Description",
-"Robots": "Robots",
-"Author": "Author",
-"Encoding": "Encoding",
-"Fullscreen": "Fullscreen",
-"Action": "Action",
-"Shortcut": "Shortcut",
-"Help": "Help",
-"Address": "Address",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "Insert link (if link plugin activated)",
-"Save (if save plugin activated)": "Save (if save plugin activated)",
-"Find (if searchreplace plugin activated)": "Find (if searchreplace plugin activated)",
-"Plugins installed ({0}):": "Plugins installed ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "Learn more...",
-"You are using {0}": "You are using {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Handy Shortcuts",
-"Horizontal line": "Horizontal line",
-"Insert\/edit image": "Insert\/edit image",
-"Image description": "Image description",
-"Source": "Source",
-"Dimensions": "Dimensions",
-"Constrain proportions": "Constrain proportions",
-"General": "General",
-"Advanced": "Advanced",
-"Style": "Style",
-"Vertical space": "Vertical space",
-"Horizontal space": "Horizontal space",
-"Border": "Border",
-"Insert image": "Insert image",
-"Image": "Image",
-"Image list": "Image list",
-"Rotate counterclockwise": "Rotate counterclockwise",
-"Rotate clockwise": "Rotate clockwise",
-"Flip vertically": "Flip vertically",
-"Flip horizontally": "Flip horizontally",
-"Edit image": "Edit image",
-"Image options": "Image options",
-"Zoom in": "Zoom in",
-"Zoom out": "Zoom out",
-"Crop": "Crop",
-"Resize": "Resize",
-"Orientation": "Orientation",
-"Brightness": "Brightness",
-"Sharpen": "Sharpen",
-"Contrast": "Contrast",
-"Color levels": "Colour levels",
-"Gamma": "Gamma",
-"Invert": "Invert",
-"Apply": "Apply",
-"Back": "Back",
-"Insert date\/time": "Insert date\/time",
-"Date\/time": "Date\/time",
-"Insert link": "Insert link",
-"Insert\/edit link": "Insert\/edit link",
-"Text to display": "Text to display",
-"Url": "URL",
-"Target": "Target",
-"None": "None",
-"New window": "New window",
-"Remove link": "Remove link",
-"Anchors": "Anchors",
-"Link": "Link",
-"Paste or type a link": "Paste or type a link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Link list": "Link list",
-"Insert video": "Insert video",
-"Insert\/edit video": "Insert\/edit video",
-"Insert\/edit media": "Insert\/edit media",
-"Alternative source": "Alternative source",
-"Poster": "Poster",
-"Paste your embed code below:": "Paste your embed code below:",
-"Embed": "Embed",
-"Media": "Media",
-"Nonbreaking space": "Nonbreaking space",
-"Page break": "Page break",
-"Paste as text": "Paste as text",
-"Preview": "Preview",
-"Print": "Print",
-"Save": "Save",
-"Find": "Find",
-"Replace with": "Replace with",
-"Replace": "Replace",
-"Replace all": "Replace all",
-"Prev": "Prev",
-"Next": "Next",
-"Find and replace": "Find and replace",
-"Could not find the specified string.": "Could not find the specified string.",
-"Match case": "Match case",
-"Whole words": "Whole words",
-"Spellcheck": "Spellcheck",
-"Ignore": "Ignore",
-"Ignore all": "Ignore all",
-"Finish": "Finish",
-"Add to Dictionary": "Add to Dictionary",
-"Insert table": "Insert table",
-"Table properties": "Table properties",
-"Delete table": "Delete table",
-"Cell": "Cell",
-"Row": "Row",
-"Column": "Column",
-"Cell properties": "Cell properties",
-"Merge cells": "Merge cells",
-"Split cell": "Split cell",
-"Insert row before": "Insert row before",
-"Insert row after": "Insert row after",
-"Delete row": "Delete row",
-"Row properties": "Row properties",
-"Cut row": "Cut row",
-"Copy row": "Copy row",
-"Paste row before": "Paste row before",
-"Paste row after": "Paste row after",
-"Insert column before": "Insert column before",
-"Insert column after": "Insert column after",
-"Delete column": "Delete column",
-"Cols": "Cols",
-"Rows": "Rows",
-"Width": "Width",
-"Height": "Height",
-"Cell spacing": "Cell spacing",
-"Cell padding": "Cell padding",
-"Caption": "Caption",
-"Left": "Left",
-"Center": "Center",
-"Right": "Right",
-"Cell type": "Cell type",
-"Scope": "Scope",
-"Alignment": "Alignment",
-"H Align": "H Align",
-"V Align": "V Align",
-"Top": "Top",
-"Middle": "Middle",
-"Bottom": "Bottom",
-"Header cell": "Header cell",
-"Row group": "Row group",
-"Column group": "Column group",
-"Row type": "Row type",
-"Header": "Header",
-"Body": "Body",
-"Footer": "Footer",
-"Border color": "Border colour",
-"Insert template": "Insert template",
-"Templates": "Templates",
-"Template": "Template",
-"Text color": "Text colour",
-"Background color": "Background colour",
-"Custom...": "Custom...",
-"Custom color": "Custom colour",
-"No color": "No colour",
-"Table of Contents": "Table of Contents",
-"Show blocks": "Show blocks",
-"Show invisible characters": "Show invisible characters",
-"Words: {0}": "Words: {0}",
-"{0} words": "{0} words",
-"File": "File",
-"Edit": "Edit",
-"Insert": "Insert",
-"View": "View",
-"Format": "Format",
-"Table": "Table",
-"Tools": "Tools",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_GB.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_GB.js
deleted file mode 100644
index 312698a93b..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_GB.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('en_GB',{
-"Redo": "Redo",
-"Undo": "Undo",
-"Cut": "Cut",
-"Copy": "Copy",
-"Paste": "Paste",
-"Select all": "Select all",
-"New document": "New document",
-"Ok": "Ok",
-"Cancel": "Cancel",
-"Visual aids": "Visual aids",
-"Bold": "Bold",
-"Italic": "Italic",
-"Underline": "Underline",
-"Strikethrough": "Strike-through",
-"Superscript": "Superscript",
-"Subscript": "Subscript",
-"Clear formatting": "Clear formatting",
-"Align left": "Align left",
-"Align center": "Align centre",
-"Align right": "Align right",
-"Justify": "Justify",
-"Bullet list": "Bullet list",
-"Numbered list": "Numbered list",
-"Decrease indent": "Decrease indent",
-"Increase indent": "Increase indent",
-"Close": "Close",
-"Formats": "Formats",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.",
-"Headers": "Headers",
-"Header 1": "Header 1",
-"Header 2": "Header 2",
-"Header 3": "Header 3",
-"Header 4": "Header 4",
-"Header 5": "Header 5",
-"Header 6": "Header 6",
-"Headings": "Headings",
-"Heading 1": "Heading 1",
-"Heading 2": "Heading 2",
-"Heading 3": "Heading 3",
-"Heading 4": "Heading 4",
-"Heading 5": "Heading 5",
-"Heading 6": "Heading 6",
-"Preformatted": "Preformatted",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Code",
-"Paragraph": "Paragraph",
-"Blockquote": "Blockquote",
-"Inline": "Inline",
-"Blocks": "Blocks",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
-"Font Family": "Font Family",
-"Font Sizes": "Font Sizes",
-"Class": "Class",
-"Browse for an image": "Browse for an image",
-"OR": "OR",
-"Drop an image here": "Drop an image here",
-"Upload": "Upload",
-"Block": "Block",
-"Align": "Align",
-"Default": "Default",
-"Circle": "Circle",
-"Disc": "Disc",
-"Square": "Square",
-"Lower Alpha": "Lower Alpha",
-"Lower Greek": "Lower Greek",
-"Lower Roman": "Lower Roman",
-"Upper Alpha": "Upper Alpha",
-"Upper Roman": "Upper Roman",
-"Anchor": "Anchor",
-"Name": "Name",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.",
-"You have unsaved changes are you sure you want to navigate away?": "You have unsaved changes are you sure you want to navigate away?",
-"Restore last draft": "Restore last draft",
-"Special character": "Special character",
-"Source code": "Source code",
-"Insert\/Edit code sample": "Insert\/Edit code sample",
-"Language": "Language",
-"Code sample": "Code sample",
-"Color": "Colour",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Left to right",
-"Right to left": "Right to left",
-"Emoticons": "Emoticons",
-"Document properties": "Document properties",
-"Title": "Title",
-"Keywords": "Keywords",
-"Description": "Description",
-"Robots": "Robots",
-"Author": "Author",
-"Encoding": "Encoding",
-"Fullscreen": "Full-screen",
-"Action": "Action",
-"Shortcut": "Shortcut",
-"Help": "Help",
-"Address": "Address",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "Insert link (if link plugin activated)",
-"Save (if save plugin activated)": "Save (if save plugin activated)",
-"Find (if searchreplace plugin activated)": "Find (if searchreplace plugin activated)",
-"Plugins installed ({0}):": "Plugins installed ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "Learn more...",
-"You are using {0}": "You are using {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Handy Shortcuts",
-"Horizontal line": "Horizontal line",
-"Insert\/edit image": "Insert\/edit image",
-"Image description": "Image description",
-"Source": "Source",
-"Dimensions": "Dimensions",
-"Constrain proportions": "Constrain proportions",
-"General": "General",
-"Advanced": "Advanced",
-"Style": "Style",
-"Vertical space": "Vertical space",
-"Horizontal space": "Horizontal space",
-"Border": "Border",
-"Insert image": "Insert image",
-"Image": "Image",
-"Image list": "Image list",
-"Rotate counterclockwise": "Rotate counterclockwise",
-"Rotate clockwise": "Rotate clockwise",
-"Flip vertically": "Flip vertically",
-"Flip horizontally": "Flip horizontally",
-"Edit image": "Edit image",
-"Image options": "Image options",
-"Zoom in": "Zoom in",
-"Zoom out": "Zoom out",
-"Crop": "Crop",
-"Resize": "Resize",
-"Orientation": "Orientation",
-"Brightness": "Brightness",
-"Sharpen": "Sharpen",
-"Contrast": "Contrast",
-"Color levels": "Colour levels",
-"Gamma": "Gamma",
-"Invert": "Invert",
-"Apply": "Apply",
-"Back": "Back",
-"Insert date\/time": "Insert date\/time",
-"Date\/time": "Date\/time",
-"Insert link": "Insert link",
-"Insert\/edit link": "Insert\/edit link",
-"Text to display": "Text to display",
-"Url": "URL",
-"Target": "Target",
-"None": "None",
-"New window": "New window",
-"Remove link": "Remove link",
-"Anchors": "Anchors",
-"Link": "Link",
-"Paste or type a link": "Paste or type a link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Link list": "Link list",
-"Insert video": "Insert video",
-"Insert\/edit video": "Insert\/edit video",
-"Insert\/edit media": "Insert\/edit media",
-"Alternative source": "Alternative source",
-"Poster": "Poster",
-"Paste your embed code below:": "Paste your embed code below:",
-"Embed": "Embed",
-"Media": "Media",
-"Nonbreaking space": "Non-breaking space",
-"Page break": "Page break",
-"Paste as text": "Paste as text",
-"Preview": "Preview",
-"Print": "Print",
-"Save": "Save",
-"Find": "Find",
-"Replace with": "Replace with",
-"Replace": "Replace",
-"Replace all": "Replace all",
-"Prev": "Prev",
-"Next": "Next",
-"Find and replace": "Find and replace",
-"Could not find the specified string.": "Could not find the specified string.",
-"Match case": "Match case",
-"Whole words": "Whole words",
-"Spellcheck": "Spell-check",
-"Ignore": "Ignore",
-"Ignore all": "Ignore all",
-"Finish": "Finish",
-"Add to Dictionary": "Add to Dictionary",
-"Insert table": "Insert table",
-"Table properties": "Table properties",
-"Delete table": "Delete table",
-"Cell": "Cell",
-"Row": "Row",
-"Column": "Column",
-"Cell properties": "Cell properties",
-"Merge cells": "Merge cells",
-"Split cell": "Split cell",
-"Insert row before": "Insert row before",
-"Insert row after": "Insert row after",
-"Delete row": "Delete row",
-"Row properties": "Row properties",
-"Cut row": "Cut row",
-"Copy row": "Copy row",
-"Paste row before": "Paste row before",
-"Paste row after": "Paste row after",
-"Insert column before": "Insert column before",
-"Insert column after": "Insert column after",
-"Delete column": "Delete column",
-"Cols": "Cols",
-"Rows": "Rows",
-"Width": "Width",
-"Height": "Height",
-"Cell spacing": "Cell spacing",
-"Cell padding": "Cell padding",
-"Caption": "Caption",
-"Left": "Left",
-"Center": "Centre",
-"Right": "Right",
-"Cell type": "Cell type",
-"Scope": "Scope",
-"Alignment": "Alignment",
-"H Align": "H Align",
-"V Align": "V Align",
-"Top": "Top",
-"Middle": "Middle",
-"Bottom": "Bottom",
-"Header cell": "Header cell",
-"Row group": "Row group",
-"Column group": "Column group",
-"Row type": "Row type",
-"Header": "Header",
-"Body": "Body",
-"Footer": "Footer",
-"Border color": "Border colour",
-"Insert template": "Insert template",
-"Templates": "Templates",
-"Template": "Template",
-"Text color": "Text colour",
-"Background color": "Background colour",
-"Custom...": "Custom...",
-"Custom color": "Custom colour",
-"No color": "No colour",
-"Table of Contents": "Table of Contents",
-"Show blocks": "Show blocks",
-"Show invisible characters": "Show invisible characters",
-"Words: {0}": "Words: {0}",
-"{0} words": "{0} words",
-"File": "File",
-"Edit": "Edit",
-"Insert": "Insert",
-"View": "View",
-"Format": "Format",
-"Table": "Table",
-"Tools": "Tools",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_US.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_US.js
deleted file mode 100644
index 0b50212fd9..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_US.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('en_US',{
-"Redo": "Redo",
-"Undo": "Undo",
-"Cut": "Cut",
-"Copy": "Copy",
-"Paste": "Paste",
-"Select all": "Select all",
-"New document": "New document",
-"Ok": "Ok",
-"Cancel": "Cancel",
-"Visual aids": "Visual aids",
-"Bold": "Bold",
-"Italic": "Italic",
-"Underline": "Underline",
-"Strikethrough": "Strikethrough",
-"Superscript": "Superscript",
-"Subscript": "Subscript",
-"Clear formatting": "Clear formatting",
-"Align left": "Align left",
-"Align center": "Align center",
-"Align right": "Align right",
-"Justify": "Justify",
-"Bullet list": "Bullet list",
-"Numbered list": "Numbered list",
-"Decrease indent": "Decrease indent",
-"Increase indent": "Increase indent",
-"Close": "Close",
-"Formats": "Formats",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.",
-"Headers": "Headers",
-"Header 1": "Header 1",
-"Header 2": "Header 2",
-"Header 3": "Header 3",
-"Header 4": "Header 4",
-"Header 5": "Header 5",
-"Header 6": "Header 6",
-"Headings": "Headings",
-"Heading 1": "Heading 1",
-"Heading 2": "Heading 2",
-"Heading 3": "Heading 3",
-"Heading 4": "Heading 4",
-"Heading 5": "Heading 5",
-"Heading 6": "Heading 6",
-"Preformatted": "Preformatted",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Code",
-"Paragraph": "Paragraph",
-"Blockquote": "Blockquote",
-"Inline": "Inline",
-"Blocks": "Blocks",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
-"Font Family": "Font Family",
-"Font Sizes": "Font Sizes",
-"Class": "Class",
-"Browse for an image": "Browse for an image",
-"OR": "OR",
-"Drop an image here": "Drop an image here",
-"Upload": "Upload",
-"Block": "Blocks",
-"Align": "Align",
-"Default": "Default",
-"Circle": "Circle",
-"Disc": "Disc",
-"Square": "Square",
-"Lower Alpha": "Lower Alpha",
-"Lower Greek": "Lower Greek",
-"Lower Roman": "Lower Roman",
-"Upper Alpha": "Upper Alpha",
-"Upper Roman": "Upper Roman",
-"Anchor": "Anchor",
-"Name": "Name",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID should start with a letter, followed only by letters, numbers, dashes, dots, colons, or underscores.",
-"You have unsaved changes are you sure you want to navigate away?": "You have unsaved changes are you sure you want to navigate away?",
-"Restore last draft": "Restore last draft",
-"Special character": "Special character",
-"Source code": "Source code",
-"Insert\/Edit code sample": "Insert\/Edit code sample",
-"Language": "Language",
-"Code sample": "Code sample",
-"Color": "color",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Left to right",
-"Right to left": "Right to left",
-"Emoticons": "Emoticons",
-"Document properties": "Document properties",
-"Title": "Title",
-"Keywords": "Keywords",
-"Description": "Description",
-"Robots": "Robots",
-"Author": "Author",
-"Encoding": "Encoding",
-"Fullscreen": "Fullscreen",
-"Action": "Action",
-"Shortcut": "Shortcut",
-"Help": "Help",
-"Address": "Address",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "Insert link (if link plugin activated)",
-"Save (if save plugin activated)": "Save (if save plugin activated)",
-"Find (if searchreplace plugin activated)": "Find (if searchreplace plugin activated)",
-"Plugins installed ({0}):": "Plugins installed ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "Learn more...",
-"You are using {0}": "You are using {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Handy Shortcuts",
-"Horizontal line": "Horizontal line",
-"Insert\/edit image": "Insert\/edit image",
-"Image description": "Image description",
-"Source": "Source",
-"Dimensions": "Dimensions",
-"Constrain proportions": "Constrain proportions",
-"General": "General",
-"Advanced": "Advanced",
-"Style": "Style",
-"Vertical space": "Vertical space",
-"Horizontal space": "Horizontal space",
-"Border": "Border",
-"Insert image": "Insert image",
-"Image": "Image",
-"Image list": "Image list",
-"Rotate counterclockwise": "Rotate counterclockwise",
-"Rotate clockwise": "Rotate clockwise",
-"Flip vertically": "Flip vertically",
-"Flip horizontally": "Flip horizontally",
-"Edit image": "Edit image",
-"Image options": "Image options",
-"Zoom in": "Zoom in",
-"Zoom out": "Zoom out",
-"Crop": "Crop",
-"Resize": "Resize",
-"Orientation": "Orientation",
-"Brightness": "Brightness",
-"Sharpen": "Sharpen",
-"Contrast": "Contrast",
-"Color levels": "color levels",
-"Gamma": "Gamma",
-"Invert": "Invert",
-"Apply": "Apply",
-"Back": "Back",
-"Insert date\/time": "Insert date\/time",
-"Date\/time": "Date\/time",
-"Insert link": "Insert link",
-"Insert\/edit link": "Insert\/edit link",
-"Text to display": "Text to display",
-"Url": "URL",
-"Target": "Target",
-"None": "None",
-"New window": "New window",
-"Remove link": "Remove link",
-"Anchors": "Anchors",
-"Link": "Link",
-"Paste or type a link": "Paste or type a link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Link list": "Link list",
-"Insert video": "Insert video",
-"Insert\/edit video": "Insert\/edit video",
-"Insert\/edit media": "Insert\/edit media",
-"Alternative source": "Alternative source",
-"Poster": "Poster",
-"Paste your embed code below:": "Paste your embed code below:",
-"Embed": "Embed",
-"Media": "Media",
-"Nonbreaking space": "Nonbreaking space",
-"Page break": "Page break",
-"Paste as text": "Paste as text",
-"Preview": "Preview",
-"Print": "Print",
-"Save": "Save",
-"Find": "Find",
-"Replace with": "Replace with",
-"Replace": "Replace",
-"Replace all": "Replace all",
-"Prev": "Prev",
-"Next": "Next",
-"Find and replace": "Find and replace",
-"Could not find the specified string.": "Could not find the specified string.",
-"Match case": "Match case",
-"Whole words": "Whole words",
-"Spellcheck": "Spellcheck",
-"Ignore": "Ignore",
-"Ignore all": "Ignore all",
-"Finish": "Finish",
-"Add to Dictionary": "Add to Dictionary",
-"Insert table": "Insert table",
-"Table properties": "Table properties",
-"Delete table": "Delete table",
-"Cell": "Cell",
-"Row": "Row",
-"Column": "Column",
-"Cell properties": "Cell properties",
-"Merge cells": "Merge cells",
-"Split cell": "Split cell",
-"Insert row before": "Insert row before",
-"Insert row after": "Insert row after",
-"Delete row": "Delete row",
-"Row properties": "Row properties",
-"Cut row": "Cut row",
-"Copy row": "Copy row",
-"Paste row before": "Paste row before",
-"Paste row after": "Paste row after",
-"Insert column before": "Insert column before",
-"Insert column after": "Insert column after",
-"Delete column": "Delete column",
-"Cols": "Cols",
-"Rows": "Rows",
-"Width": "Width",
-"Height": "Height",
-"Cell spacing": "Cell spacing",
-"Cell padding": "Cell padding",
-"Caption": "Caption",
-"Left": "Left",
-"Center": "Center",
-"Right": "Right",
-"Cell type": "Cell type",
-"Scope": "Scope",
-"Alignment": "Alignment",
-"H Align": "H Align",
-"V Align": "V Align",
-"Top": "Top",
-"Middle": "Middle",
-"Bottom": "Bottom",
-"Header cell": "Header cell",
-"Row group": "Row group",
-"Column group": "Column group",
-"Row type": "Row type",
-"Header": "Header",
-"Body": "Body",
-"Footer": "Footer",
-"Border color": "Border color",
-"Insert template": "Insert template",
-"Templates": "Templates",
-"Template": "Template",
-"Text color": "Text color",
-"Background color": "Background color",
-"Custom...": "Custom...",
-"Custom color": "Custom color",
-"No color": "No color",
-"Table of Contents": "Table of Contents",
-"Show blocks": "Show blocks",
-"Show invisible characters": "Show invisible characters",
-"Words: {0}": "Words: {0}",
-"{0} words": "{0} words",
-"File": "File",
-"Edit": "Edit",
-"Insert": "Insert",
-"View": "View",
-"Format": "Format",
-"Table": "Table",
-"Tools": "Tools",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es.js
deleted file mode 100644
index 9cb0e9d53a..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('es',{
-"Redo": "Rehacer",
-"Undo": "Deshacer",
-"Cut": "Cortar",
-"Copy": "Copiar",
-"Paste": "Pegar",
-"Select all": "Seleccionar todo",
-"New document": "Nuevo documento",
-"Ok": "Ok",
-"Cancel": "Cancelar",
-"Visual aids": "Ayudas visuales",
-"Bold": "Negrita",
-"Italic": "It\u00e1lica",
-"Underline": "Subrayado",
-"Strikethrough": "Tachado",
-"Superscript": "Super\u00edndice",
-"Subscript": "Sub\u00edndice",
-"Clear formatting": "Limpiar formato",
-"Align left": "Alinear a la izquierda",
-"Align center": "Alinear al centro",
-"Align right": "Alinear a la derecha",
-"Justify": "Justificar",
-"Bullet list": "Lista de vi\u00f1etas",
-"Numbered list": "Lista numerada",
-"Decrease indent": "Disminuir sangr\u00eda",
-"Increase indent": "Incrementar sangr\u00eda",
-"Close": "Cerrar",
-"Formats": "Formatos",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Tu navegador no soporta acceso directo al portapapeles. Por favor usa las teclas Crtl+X\/C\/V de tu teclado",
-"Headers": "Encabezados",
-"Header 1": "Encabezado 1",
-"Header 2": "Encabezado 2 ",
-"Header 3": "Encabezado 3",
-"Header 4": "Encabezado 4",
-"Header 5": "Encabezado 5 ",
-"Header 6": "Encabezado 6",
-"Headings": "Encabezados",
-"Heading 1": "Encabezado 1",
-"Heading 2": "Encabezado 2",
-"Heading 3": "Encabezado 3",
-"Heading 4": "Encabezado 4",
-"Heading 5": "Encabezado 5",
-"Heading 6": "Encabezado 6",
-"Preformatted": "Preformateado",
-"Div": "Capa",
-"Pre": "Pre",
-"Code": "C\u00f3digo",
-"Paragraph": "P\u00e1rrafo",
-"Blockquote": "Bloque de cita",
-"Inline": "en l\u00ednea",
-"Blocks": "Bloques",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Pegar est\u00e1 ahora en modo de texto plano. El contenido se pegar\u00e1 como texto plano hasta que desactive esta opci\u00f3n.",
-"Font Family": "Familia de fuentes",
-"Font Sizes": "Tama\u00f1os de fuente",
-"Class": "Clase",
-"Browse for an image": "Exporador de imagenes",
-"OR": "O",
-"Drop an image here": "Arrastre una imagen aqu\u00ed",
-"Upload": "Subir",
-"Block": "Bloque",
-"Align": "Alinear",
-"Default": "Por defecto",
-"Circle": "C\u00edrculo",
-"Disc": "Disco",
-"Square": "Cuadrado",
-"Lower Alpha": "Inferior Alfa",
-"Lower Greek": "Inferior Griega",
-"Lower Roman": "Inferior Romana",
-"Upper Alpha": "Superior Alfa",
-"Upper Roman": "Superior Romana",
-"Anchor": "Ancla",
-"Name": "Nombre",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Deber\u00eda comenzar por una letra, seguida solo de letras, n\u00fameros, guiones, puntos, dos puntos o guiones bajos.",
-"You have unsaved changes are you sure you want to navigate away?": "Tiene cambios sin guardar. \u00bfEst\u00e1 seguro de que quiere salir?",
-"Restore last draft": "Restaurar el \u00faltimo borrador",
-"Special character": "Car\u00e1cter especial",
-"Source code": "C\u00f3digo fuente",
-"Insert\/Edit code sample": "Insertar\/editar c\u00f3digo de prueba",
-"Language": "Idioma",
-"Code sample": "Ejemplo de c\u00f3digo",
-"Color": "Color",
-"R": "R",
-"G": "V",
-"B": "A",
-"Left to right": "De izquierda a derecha",
-"Right to left": "De derecha a izquierda",
-"Emoticons": "Emoticonos",
-"Document properties": "Propiedades del documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palabras clave",
-"Description": "Descripci\u00f3n",
-"Robots": "Robots",
-"Author": "Autor",
-"Encoding": "Codificaci\u00f3n",
-"Fullscreen": "Pantalla completa",
-"Action": "Acci\u00f3n",
-"Shortcut": "Atajo",
-"Help": "Ayuda",
-"Address": "Direcci\u00f3n",
-"Focus to menubar": "Enfocar la barra del men\u00fa",
-"Focus to toolbar": "Enfocar la barra de herramientas",
-"Focus to element path": "Enfocar la ruta del elemento",
-"Focus to contextual toolbar": "Enfocar la barra de herramientas contextual",
-"Insert link (if link plugin activated)": "Insertar enlace (si el complemento de enlace est\u00e1 activado)",
-"Save (if save plugin activated)": "Guardar (si el componente de salvar est\u00e1 activado)",
-"Find (if searchreplace plugin activated)": "Buscar (si el complemento buscar-remplazar est\u00e1 activado)",
-"Plugins installed ({0}):": "Plugins instalados ({0}):",
-"Premium plugins:": "Complementos premium:",
-"Learn more...": "Aprende m\u00e1s...",
-"You are using {0}": "Estas usando {0}",
-"Plugins": "Complementos",
-"Handy Shortcuts": "Accesos directos",
-"Horizontal line": "L\u00ednea horizontal",
-"Insert\/edit image": "Insertar\/editar imagen",
-"Image description": "Descripci\u00f3n de la imagen",
-"Source": "Enlace",
-"Dimensions": "Dimensiones",
-"Constrain proportions": "Restringir proporciones",
-"General": "General",
-"Advanced": "Avanzado",
-"Style": "Estilo",
-"Vertical space": "Espacio vertical",
-"Horizontal space": "Espacio horizontal",
-"Border": "Borde",
-"Insert image": "Insertar imagen",
-"Image": "Imagen",
-"Image list": "Lista de im\u00e1genes",
-"Rotate counterclockwise": "Girar a la izquierda",
-"Rotate clockwise": "Girar a la derecha",
-"Flip vertically": "Invertir verticalmente",
-"Flip horizontally": "Invertir horizontalmente",
-"Edit image": "Editar imagen",
-"Image options": "Opciones de imagen",
-"Zoom in": "Acercar",
-"Zoom out": "Alejar",
-"Crop": "Recortar",
-"Resize": "Redimensionar",
-"Orientation": "Orientaci\u00f3n",
-"Brightness": "Brillo",
-"Sharpen": "Forma",
-"Contrast": "Contraste",
-"Color levels": "Niveles de color",
-"Gamma": "Gamma",
-"Invert": "Invertir",
-"Apply": "Aplicar",
-"Back": "Atr\u00e1s",
-"Insert date\/time": "Insertar fecha\/hora",
-"Date\/time": "Fecha\/hora",
-"Insert link": "Insertar enlace",
-"Insert\/edit link": "Insertar\/editar enlace",
-"Text to display": "Texto para mostrar",
-"Url": "URL",
-"Target": "Destino",
-"None": "Ninguno",
-"New window": "Nueva ventana",
-"Remove link": "Quitar enlace",
-"Anchors": "Anclas",
-"Link": "Enlace",
-"Paste or type a link": "Pega o introduce un enlace",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "El enlace que has introducido no parece ser una direcci\u00f3n de correo electr\u00f3nico. Quieres a\u00f1adir el prefijo necesario mailto: ?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "El enlace que has introducido no parece ser una enlace externo. Quieres a\u00f1adir el prefijo necesario http:\/\/ ?",
-"Link list": "Lista de enlaces",
-"Insert video": "Insertar video",
-"Insert\/edit video": "Insertar\/editar video",
-"Insert\/edit media": "Insertar\/editar medio",
-"Alternative source": "Enlace alternativo",
-"Poster": "Miniatura",
-"Paste your embed code below:": "Pega tu c\u00f3digo embebido debajo",
-"Embed": "Incrustado",
-"Media": "Media",
-"Nonbreaking space": "Espacio fijo",
-"Page break": "Salto de p\u00e1gina",
-"Paste as text": "Pegar como texto",
-"Preview": "Previsualizar",
-"Print": "Imprimir",
-"Save": "Guardar",
-"Find": "Buscar",
-"Replace with": "Reemplazar con",
-"Replace": "Reemplazar",
-"Replace all": "Reemplazar todo",
-"Prev": "Anterior",
-"Next": "Siguiente",
-"Find and replace": "Buscar y reemplazar",
-"Could not find the specified string.": "No se encuentra la cadena de texto especificada",
-"Match case": "Coincidencia exacta",
-"Whole words": "Palabras completas",
-"Spellcheck": "Corrector ortogr\u00e1fico",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar todos",
-"Finish": "Finalizar",
-"Add to Dictionary": "A\u00f1adir al Diccionario",
-"Insert table": "Insertar tabla",
-"Table properties": "Propiedades de la tabla",
-"Delete table": "Eliminar tabla",
-"Cell": "Celda",
-"Row": "Fila",
-"Column": "Columna",
-"Cell properties": "Propiedades de la celda",
-"Merge cells": "Combinar celdas",
-"Split cell": "Dividir celdas",
-"Insert row before": "Insertar fila antes",
-"Insert row after": "Insertar fila despu\u00e9s ",
-"Delete row": "Eliminar fila",
-"Row properties": "Propiedades de la fila",
-"Cut row": "Cortar fila",
-"Copy row": "Copiar fila",
-"Paste row before": "Pegar la fila antes",
-"Paste row after": "Pegar la fila despu\u00e9s",
-"Insert column before": "Insertar columna antes",
-"Insert column after": "Insertar columna despu\u00e9s",
-"Delete column": "Eliminar columna",
-"Cols": "Columnas",
-"Rows": "Filas",
-"Width": "Ancho",
-"Height": "Alto",
-"Cell spacing": "Espacio entre celdas",
-"Cell padding": "Relleno de celda",
-"Caption": "Subt\u00edtulo",
-"Left": "Izquierda",
-"Center": "Centrado",
-"Right": "Derecha",
-"Cell type": "Tipo de celda",
-"Scope": "\u00c1mbito",
-"Alignment": "Alineaci\u00f3n",
-"H Align": "Alineamiento Horizontal",
-"V Align": "Alineamiento Vertical",
-"Top": "Arriba",
-"Middle": "Centro",
-"Bottom": "Abajo",
-"Header cell": "Celda de la cebecera",
-"Row group": "Grupo de filas",
-"Column group": "Grupo de columnas",
-"Row type": "Tipo de fila",
-"Header": "Cabecera",
-"Body": "Cuerpo",
-"Footer": "Pie de p\u00e1gina",
-"Border color": "Color del borde",
-"Insert template": "Insertar plantilla",
-"Templates": "Plantillas",
-"Template": "Plantilla",
-"Text color": "Color del texto",
-"Background color": "Color de fondo",
-"Custom...": "Personalizar...",
-"Custom color": "Color personalizado",
-"No color": "Sin color",
-"Table of Contents": "Tabla de contenidos",
-"Show blocks": "Mostrar bloques",
-"Show invisible characters": "Mostrar caracteres invisibles",
-"Words: {0}": "Palabras: {0}",
-"{0} words": "{0} palabras",
-"File": "Archivo",
-"Edit": "Editar",
-"Insert": "Insertar",
-"View": "Ver",
-"Format": "Formato",
-"Table": "Tabla",
-"Tools": "Herramientas",
-"Powered by {0}": "Desarrollado por {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c1rea de texto enriquecido. Pulse ALT-F9 para el menu. Pulse ALT-F10 para la barra de herramientas. Pulse ALT-0 para ayuda"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es_MX.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es_MX.js
deleted file mode 100644
index 688f14ba51..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es_MX.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('es_MX',{
-"Redo": "Deshacer",
-"Undo": "Rehacer",
-"Cut": "Cortar",
-"Copy": "Copiar",
-"Paste": "Pegar",
-"Select all": "Seleccionar todo",
-"New document": "Nuevo documento",
-"Ok": "Aceptar",
-"Cancel": "Cancelar",
-"Visual aids": "Ayuda visual",
-"Bold": "Negrita",
-"Italic": "Cursiva",
-"Underline": "Subrayado",
-"Strikethrough": "Tachado",
-"Superscript": "\u00cdndice",
-"Subscript": "Sub\u00edndice",
-"Clear formatting": "Limpiar formato",
-"Align left": "Alinear a la izquierda",
-"Align center": "Centrar",
-"Align right": "Alinear a la derecha",
-"Justify": "Justificar",
-"Bullet list": "Lista de vi\u00f1eta",
-"Numbered list": "Lista numerada",
-"Decrease indent": "Decrementar identado",
-"Increase indent": "Incrementar identado",
-"Close": "Cerrar",
-"Formats": "Formato",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Su navegador no soporta acceso directo al portapapeles. Por favor haga uso de la combinaci\u00f3n de teclas Ctrl+X para cortar, Ctrl+C para copiar y Ctrl+V para pegar con el teclado. ",
-"Headers": "Encabezado",
-"Header 1": "Encabezado 1",
-"Header 2": "Encabezado 2",
-"Header 3": "Encabezado 3",
-"Header 4": "Encabezado 4",
-"Header 5": "Encabezado 5",
-"Header 6": "Encabezado 6",
-"Headings": "Encabezados",
-"Heading 1": "Encabezados 1",
-"Heading 2": "Encabezados 2",
-"Heading 3": "Encabezados 3",
-"Heading 4": "Encabezados 4",
-"Heading 5": "Encabezados 5",
-"Heading 6": "Encabezados 6",
-"Preformatted": "Pre-formateado",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "C\u00f3digo",
-"Paragraph": "P\u00e1rrafo",
-"Blockquote": "Blockquote",
-"Inline": "En l\u00ednea",
-"Blocks": "Bloque",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Se pegar\u00e1 en texto plano. El contenido se pegar\u00e1 como texto plano hasta que desactive esta opci\u00f3n.",
-"Font Family": "Tipo de letra",
-"Font Sizes": "Tama\u00f1o de letra",
-"Class": "Clase",
-"Browse for an image": "Ver por imagen",
-"OR": "OR",
-"Drop an image here": "Arrastra una imagen aqu\u00ed",
-"Upload": "Subir",
-"Block": "Bloque",
-"Align": "Alineaci\u00f3n",
-"Default": "Por defecto",
-"Circle": "Circulo",
-"Disc": "Disco",
-"Square": "Cuadro",
-"Lower Alpha": "Alfa min\u00fascula",
-"Lower Greek": "Griega min\u00fascula",
-"Lower Roman": "Romano min\u00fascula",
-"Upper Alpha": "Alfa may\u00fascula",
-"Upper Roman": "May\u00fascula Romana",
-"Anchor": "Anclar",
-"Name": "Nombre",
-"Id": "Identificador",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "El Identificador debe comenzar con una letra, seguido solo por letras, n\u00fameros, puntos, guiones medios o guiones bajos.  ",
-"You have unsaved changes are you sure you want to navigate away?": "No se  han guardado los cambios. \u00bfSeguro que desea abandonar la p\u00e1gina?",
-"Restore last draft": "Restaurar el \u00faltimo borrador",
-"Special character": "Caracter especial",
-"Source code": "C\u00f3digo fuente",
-"Insert\/Edit code sample": "Insertar\/Editar c\u00f3digo muestra",
-"Language": "idioma",
-"Code sample": "C\u00f3digo muestra",
-"Color": "Color",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Izquierda a derecha",
-"Right to left": "Derecha a Izquierda",
-"Emoticons": "Emoticones",
-"Document properties": "Propiedades del documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palabras clave",
-"Description": "Descripci\u00f3n ",
-"Robots": "Robots",
-"Author": "Autor",
-"Encoding": "Codificaci\u00f3n",
-"Fullscreen": "Pantalla completa",
-"Action": "Acci\u00f3n",
-"Shortcut": "Atajo",
-"Help": "Ayuda",
-"Address": "Direcci\u00f3n",
-"Focus to menubar": "Enfocar en barra de menu",
-"Focus to toolbar": "Enfocar en barra de herramientas",
-"Focus to element path": "Enfocar ruta del elemento",
-"Focus to contextual toolbar": "Enfocar en barra de herramientas contextual",
-"Insert link (if link plugin activated)": "Insertar enlace (si enlace del plugin est\u00e1 activo)",
-"Save (if save plugin activated)": "Guardar (si el plugin guardar est\u00e1 activo)",
-"Find (if searchreplace plugin activated)": "Buscar (si el plugin buscar\/reemplazar est\u00e1 activo)",
-"Plugins installed ({0}):": "Plugins instalados ({0}):",
-"Premium plugins:": "Plugins premium:",
-"Learn more...": "Aprende m\u00e1s...",
-"You are using {0}": "est\u00e1s usando {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Atajos \u00fatiles",
-"Horizontal line": "L\u00ednea Horizontal",
-"Insert\/edit image": "Insertar\/editar imagen",
-"Image description": "Descripci\u00f3n de imagen",
-"Source": "Origen",
-"Dimensions": "Dimensiones",
-"Constrain proportions": "Restringir proporciones",
-"General": "General",
-"Advanced": "Avanzado",
-"Style": "Estilo",
-"Vertical space": "Espacio vertical",
-"Horizontal space": "Espacio horizontal",
-"Border": "Borde",
-"Insert image": "Insertar imagen",
-"Image": "Imagen",
-"Image list": "Lista de im\u00e1genes",
-"Rotate counterclockwise": "Rotar en sentido contrario a las manecillas",
-"Rotate clockwise": "Rotar en sentido de las manecillas",
-"Flip vertically": "Voltear verticalmente",
-"Flip horizontally": "Volter horizontalmente",
-"Edit image": "Editar imagen",
-"Image options": "Opciones de la imagen",
-"Zoom in": "Acercar",
-"Zoom out": "Alejar",
-"Crop": "Recortar",
-"Resize": "Cambiar tama\u00f1o",
-"Orientation": "Orientaci\u00f3n",
-"Brightness": "Brillo",
-"Sharpen": "Nitidez",
-"Contrast": "Contraste",
-"Color levels": "Niveles de Color",
-"Gamma": "Gamma",
-"Invert": "Invertir",
-"Apply": "Aplicar",
-"Back": "Regresar",
-"Insert date\/time": "Insertar fecha\/hora",
-"Date\/time": "Fecha\/hora",
-"Insert link": "Insertar enlace",
-"Insert\/edit link": "Inserta\/editar enlace",
-"Text to display": "Texto a mostrar",
-"Url": "URL",
-"Target": "Objetivo",
-"None": "Ninguno",
-"New window": "Nueva ventana",
-"Remove link": "Eliminar elnace",
-"Anchors": "Anclas",
-"Link": "Enlace",
-"Paste or type a link": "Pega o escribe un enlace",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "El URL que ha insertado tiene formato de correo electr\u00f3nico. \u00bfDesea agregar con prefijo \"mailto:\"?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "El URL que ha ingresado es un enlace externo. \u00bfDesea agregar el prefijo \"http:\/\/\"?",
-"Link list": "Lista de enlaces",
-"Insert video": "Insertar video",
-"Insert\/edit video": "Insertar\/editar video",
-"Insert\/edit media": "Insertar\/editar multimedia",
-"Alternative source": "Fuente alternativa",
-"Poster": "Cartel",
-"Paste your embed code below:": "Pegue su c\u00f3digo de inserci\u00f3n abajo:",
-"Embed": "Incrustar",
-"Media": "Multimedia",
-"Nonbreaking space": "Espacio de no separaci\u00f3n",
-"Page break": "Salto de p\u00e1gina ",
-"Paste as text": "Copiar como texto",
-"Preview": "Vista previa ",
-"Print": "Imprimir",
-"Save": "Guardar",
-"Find": "Buscar",
-"Replace with": "Remplazar con",
-"Replace": "Remplazar",
-"Replace all": "Remplazar todo",
-"Prev": "Anterior",
-"Next": "Siguiente",
-"Find and replace": "Buscar y reemplazar",
-"Could not find the specified string.": "No se ha encontrado la cadena especificada.",
-"Match case": "Coincidencia",
-"Whole words": "Palabras completas",
-"Spellcheck": "Revisi\u00f3n ortogr\u00e1fica",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar todo",
-"Finish": "Terminar",
-"Add to Dictionary": "Agregar al diccionario ",
-"Insert table": "Insertar tabla",
-"Table properties": "Propiedades de tabla",
-"Delete table": "Eliminar tabla",
-"Cell": "Celda",
-"Row": "Rengl\u00f3n ",
-"Column": "Columna",
-"Cell properties": "Propiedades de celda",
-"Merge cells": "Unir celdas",
-"Split cell": "Dividir celdas",
-"Insert row before": "Insertar rengl\u00f3n antes",
-"Insert row after": "Insertar rengl\u00f3n despu\u00e9s",
-"Delete row": "Eliminar rengl\u00f3n ",
-"Row properties": "Propiedades del rengl\u00f3n ",
-"Cut row": "Cortar renglon",
-"Copy row": "Copiar rengl\u00f3n ",
-"Paste row before": "Pegar rengl\u00f3n antes",
-"Paste row after": "Pegar rengl\u00f3n despu\u00e9s",
-"Insert column before": "Insertar columna antes",
-"Insert column after": "Insertar columna despu\u00e9s",
-"Delete column": "Eliminar columna",
-"Cols": "Columnas",
-"Rows": "Renglones ",
-"Width": "Ancho",
-"Height": "Alto",
-"Cell spacing": "Espacio entre celdas",
-"Cell padding": "Relleno de la celda",
-"Caption": "Subt\u00edtulo",
-"Left": "Izquierda",
-"Center": "Centro",
-"Right": "Derecha",
-"Cell type": "Tipo de celda",
-"Scope": "Alcance",
-"Alignment": "Alineaci\u00f3n ",
-"H Align": "Alineaci\u00f3n Horizontal",
-"V Align": "Alineaci\u00f3n Vertical",
-"Top": "Arriba",
-"Middle": "Centrado",
-"Bottom": "Abajo",
-"Header cell": "Celda de encabezado",
-"Row group": "Grupo de renglones",
-"Column group": "Grupo de columnas",
-"Row type": "Tipo de rengl\u00f3n ",
-"Header": "Encabezado",
-"Body": "Cuerpo",
-"Footer": "Pie",
-"Border color": "Color del borde",
-"Insert template": "Insertar plantilla",
-"Templates": "Plantilla",
-"Template": "Plantilla",
-"Text color": "Color de letra",
-"Background color": "Color de fondo",
-"Custom...": "Personalizar",
-"Custom color": "Perzonalizar color",
-"No color": "Sin color",
-"Table of Contents": "Tabla de Contenidos",
-"Show blocks": "Mostrar bloques",
-"Show invisible characters": "Mostrar caracteres invisibles",
-"Words: {0}": "Palabras:{0}",
-"{0} words": "{0} palabras",
-"File": "Archivo",
-"Edit": "Editar",
-"Insert": "Insertar",
-"View": "Vistas",
-"Format": "Formato",
-"Table": "Tabla",
-"Tools": "Herramientas",
-"Powered by {0}": "Creado con {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Presione dentro del \u00e1rea de texto ALT-F9 para invocar el men\u00fa, ALT-F10 para la barra de herramientas y ALT-0 para la ayuda."
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/et.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/et.js
deleted file mode 100644
index 96b763506c..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/et.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('et',{
-"Redo": "Tee uuesti",
-"Undo": "V\u00f5ta tagasi",
-"Cut": "L\u00f5ika",
-"Copy": "Kopeeri",
-"Paste": "Kleebi",
-"Select all": "Vali k\u00f5ik",
-"New document": "Uus dokument",
-"Ok": "Ok",
-"Cancel": "Katkesta",
-"Visual aids": "N\u00e4itevahendid",
-"Bold": "Rasvane",
-"Italic": "Kaldkiri",
-"Underline": "Allakriipsutatud",
-"Strikethrough": "L\u00e4bikriipsutatud",
-"Superscript": "\u00dclaindeks",
-"Subscript": "Alaindeks",
-"Clear formatting": "Puhasta vorming",
-"Align left": "Joonda vasakule",
-"Align center": "Joonda keskele",
-"Align right": "Joonda paremale",
-"Justify": "Joonda r\u00f6\u00f6pselt",
-"Bullet list": "J\u00e4rjestamata loend",
-"Numbered list": "J\u00e4rjestatud loend",
-"Decrease indent": "V\u00e4henda taanet",
-"Increase indent": "Suurenda taanet",
-"Close": "Sulge",
-"Formats": "Vormingud",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Sinu veebilehitseja ei toeta otsest ligip\u00e4\u00e4su l\u00f5ikelauale. Palun kasuta selle asemel klaviatuuri kiirk\u00e4sklusi Ctrl+X\/C\/V.",
-"Headers": "P\u00e4ised",
-"Header 1": "Pealkiri 1",
-"Header 2": "Pealkiri 2",
-"Header 3": "Pealkiri 3",
-"Header 4": "Pealkiri 4",
-"Header 5": "Pealkiri 5",
-"Header 6": "Pealkiri 6",
-"Headings": "Pealkirjad",
-"Heading 1": "Pealkiri 1",
-"Heading 2": "Pealkiri 2",
-"Heading 3": "Pealkiri 3",
-"Heading 4": "Pealkiri 4",
-"Heading 5": "Pealkiri 5",
-"Heading 6": "Pealkiri 6",
-"Preformatted": "Eelvormindaud",
-"Div": "Sektsioon",
-"Pre": "Eelvormindatud",
-"Code": "Kood",
-"Paragraph": "L\u00f5ik",
-"Blockquote": "Plokktsitaat",
-"Inline": "Reasisene",
-"Blocks": "Plokid",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Asetamine on n\u00fc\u00fcd tekstire\u017eiimis. Sisu asetatakse n\u00fc\u00fcd lihttekstina, kuni sa l\u00fclitad selle valiku v\u00e4lja.",
-"Font Family": "Kirjastiilid",
-"Font Sizes": "Kirja suurused",
-"Class": "Klass",
-"Browse for an image": "Sirvi pilte",
-"OR": "V\u00d5I",
-"Drop an image here": "Kukuta pilt siia",
-"Upload": "\u00dcles laadimine",
-"Block": "Plokk",
-"Align": "Joonda",
-"Default": "Vaikimisi",
-"Circle": "Ring",
-"Disc": "Ketas",
-"Square": "Ruut",
-"Lower Alpha": "V\u00e4iket\u00e4hed (a, b, c)",
-"Lower Greek": "Kreeka v\u00e4iket\u00e4hed (\u03b1, \u03b2, \u03b3)",
-"Lower Roman": "Rooma v\u00e4iket\u00e4hed (i, ii, iii)",
-"Upper Alpha": "Suurt\u00e4hed (A, B, C)",
-"Upper Roman": "Rooma suurt\u00e4hed (I, II, III)",
-"Anchor": "Ankur",
-"Name": "Nimi",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID peaks algama t\u00e4hega ning sellele peaks j\u00e4rgnema ainult t\u00e4hed, arvud, sidekriipsud, punktid, koolonid v\u00f5i alakriipsud.",
-"You have unsaved changes are you sure you want to navigate away?": "Sul on salvestamata muudatusi. Oled Sa kindel, et soovid mujale navigeeruda?",
-"Restore last draft": "Taasta viimane mustand",
-"Special character": "Erim\u00e4rk",
-"Source code": "L\u00e4htekood",
-"Insert\/Edit code sample": "Sisesta\/muuda koodin\u00e4idis",
-"Language": "Keel",
-"Code sample": "Koodi n\u00e4idis",
-"Color": "V\u00e4rv",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Vasakult paremale",
-"Right to left": "Paremalt vasakule",
-"Emoticons": "Emotikonid",
-"Document properties": "Dokumendi omadused",
-"Title": "Pealkiri",
-"Keywords": "M\u00e4rks\u00f5nad",
-"Description": "Kirjeldus",
-"Robots": "Robotid",
-"Author": "Autor",
-"Encoding": "M\u00e4rgistik",
-"Fullscreen": "T\u00e4isekraan",
-"Action": "Tegevus",
-"Shortcut": "Otsetee",
-"Help": "Abiinfo",
-"Address": "Aadress",
-"Focus to menubar": "Fookus men\u00fc\u00fcribale",
-"Focus to toolbar": "Fookus t\u00f6\u00f6riistaribale",
-"Focus to element path": "Fookus elemendi asukohale",
-"Focus to contextual toolbar": "Fookus kontekstimen\u00fc\u00fcle",
-"Insert link (if link plugin activated)": "Sisesta link (kui lingi plugin on aktiveeritud)",
-"Save (if save plugin activated)": "Salvesta (kui salvestamise plugin on aktiveeritud)",
-"Find (if searchreplace plugin activated)": "Otsi (kui plugin searchreplace on aktiveeritud)",
-"Plugins installed ({0}):": "Pluginad on paigaldatud ({0}):",
-"Premium plugins:": "Tasulised pluginad:",
-"Learn more...": "Vaata lisainfot...",
-"You are using {0}": "Sa kasutad {0}",
-"Plugins": "Pluginad",
-"Handy Shortcuts": "Mugavad otseteed",
-"Horizontal line": "Horisontaaljoon",
-"Insert\/edit image": "Lisa\/muuda pilt",
-"Image description": "Pildi kirjeldus",
-"Source": "Allikas",
-"Dimensions": "M\u00f5\u00f5tmed",
-"Constrain proportions": "S\u00e4ilita kuvasuhe",
-"General": "\u00dcldine",
-"Advanced": "T\u00e4iendavad seaded",
-"Style": "Stiil",
-"Vertical space": "P\u00fcstine vahe",
-"Horizontal space": "Reavahe",
-"Border": "\u00c4\u00e4ris",
-"Insert image": "Lisa pilt",
-"Image": "Pilt",
-"Image list": "Piltide nimekiri",
-"Rotate counterclockwise": "P\u00f6\u00f6ra vastup\u00e4eva",
-"Rotate clockwise": "P\u00f6\u00f6ra p\u00e4rip\u00e4eva",
-"Flip vertically": "Peegelda vertikaalselt",
-"Flip horizontally": "Peegelda horisontaalselt",
-"Edit image": "Muuda pilti",
-"Image options": "Pildi valikud",
-"Zoom in": "Suumi sisse",
-"Zoom out": "Suumi v\u00e4lja",
-"Crop": "L\u00f5ika",
-"Resize": "Muuda suurust",
-"Orientation": "Suund",
-"Brightness": "Heledus",
-"Sharpen": "Teravamaks",
-"Contrast": "Kontrast",
-"Color levels": "V\u00e4rvi tasemed",
-"Gamma": "Gamma",
-"Invert": "P\u00f6\u00f6ra v\u00e4rvid",
-"Apply": "Rakenda",
-"Back": "Tagasi",
-"Insert date\/time": "Lisa kuup\u00e4ev\/kellaaeg",
-"Date\/time": "Kuup\u00e4ev\/kellaaeg",
-"Insert link": "Lisa link",
-"Insert\/edit link": "Lisa\/muuda link",
-"Text to display": "Kuvatav tekst",
-"Url": "Viide (URL)",
-"Target": "Sihtm\u00e4rk",
-"None": "Puudub",
-"New window": "Uus aken",
-"Remove link": "Eemalda link",
-"Anchors": "Ankrud",
-"Link": "Link",
-"Paste or type a link": "Aseta v\u00f5i sisesta link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL, mille sa sisestasid, n\u00e4ib olevat e-posti aadress. Kas sa soovid lisada sellele eesliite mailto: ?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL, mille sa sisestasid, n\u00e4ib olevat v\u00e4line link. Kas sa soovid lisada sellele eesliite http:\/\/ ?",
-"Link list": "Linkide nimekiri",
-"Insert video": "Lisa video",
-"Insert\/edit video": "Lisa\/muuda video",
-"Insert\/edit media": "Lisa\/muuda multimeediat",
-"Alternative source": "Teine allikas",
-"Poster": "Lisaja",
-"Paste your embed code below:": "Kleebi oma manustamiskood siia alla:",
-"Embed": "Manusta",
-"Media": "Multimeedia",
-"Nonbreaking space": "T\u00fchim\u00e4rk (nbsp)",
-"Page break": "Lehevahetus",
-"Paste as text": "Aseta tekstina",
-"Preview": "Eelvaade",
-"Print": "Tr\u00fcki",
-"Save": "Salvesta",
-"Find": "Otsi",
-"Replace with": "Asendus",
-"Replace": "Asenda",
-"Replace all": "Asenda k\u00f5ik",
-"Prev": "Eelm",
-"Next": "J\u00e4rg",
-"Find and replace": "Otsi ja asenda",
-"Could not find the specified string.": "Ei suutnud leida etteantud s\u00f5net.",
-"Match case": "Erista suur- ja v\u00e4iket\u00e4hti",
-"Whole words": "Terviks\u00f5nad",
-"Spellcheck": "\u00d5igekirja kontroll",
-"Ignore": "Eira",
-"Ignore all": "Eira k\u00f5iki",
-"Finish": "L\u00f5peta",
-"Add to Dictionary": "Lisa s\u00f5naraamatusse",
-"Insert table": "Lisa tabel",
-"Table properties": "Tabeli omadused",
-"Delete table": "Kustuta tabel",
-"Cell": "Lahter",
-"Row": "Rida",
-"Column": "Tulp",
-"Cell properties": "Lahtri omadused",
-"Merge cells": "\u00dchenda lahtrid",
-"Split cell": "T\u00fckelda lahter",
-"Insert row before": "Lisa rida enne",
-"Insert row after": "Lisa rida j\u00e4rele",
-"Delete row": "Kustuta rida",
-"Row properties": "Rea omadused",
-"Cut row": "L\u00f5ika rida",
-"Copy row": "Kopeeri rida",
-"Paste row before": "Kleebi rida enne",
-"Paste row after": "Kleebi rida j\u00e4rele",
-"Insert column before": "Lisa tulp enne",
-"Insert column after": "Lisa tulp j\u00e4rele",
-"Delete column": "Kustuta tulp",
-"Cols": "Veerud",
-"Rows": "Read",
-"Width": "Laius",
-"Height": "K\u00f5rgus",
-"Cell spacing": "Lahtrivahe",
-"Cell padding": "Lahtri sisu ja tabeli \u00e4\u00e4rise vahe",
-"Caption": "Alapealkiri",
-"Left": "Vasakul",
-"Center": "Keskel",
-"Right": "Paremal",
-"Cell type": "Lahtri t\u00fc\u00fcp",
-"Scope": "Ulatus",
-"Alignment": "Joondus",
-"H Align": "H Joondus",
-"V Align": "V Joondus",
-"Top": "\u00dcleval",
-"Middle": "Keskel",
-"Bottom": "All",
-"Header cell": "P\u00e4islahter",
-"Row group": "Ridade r\u00fchm",
-"Column group": "Veergude r\u00fchm",
-"Row type": "Rea t\u00fc\u00fcp",
-"Header": "P\u00e4is",
-"Body": "P\u00f5hiosa",
-"Footer": "Jalus",
-"Border color": "Piirjoone v\u00e4rv",
-"Insert template": "Lisa mall",
-"Templates": "Mallid",
-"Template": "Mall",
-"Text color": "Teksti v\u00e4rv",
-"Background color": "Tausta v\u00e4rv",
-"Custom...": "Kohandatud...",
-"Custom color": "Kohandatud v\u00e4rv",
-"No color": "V\u00e4rvi pole",
-"Table of Contents": "Sisukord",
-"Show blocks": "N\u00e4ita plokke",
-"Show invisible characters": "N\u00e4ita peidetud m\u00e4rke",
-"Words: {0}": "S\u00f5nu: {0}",
-"{0} words": "{0} s\u00f5na",
-"File": "Fail",
-"Edit": "Muuda",
-"Insert": "Sisesta",
-"View": "Vaade",
-"Format": "Vorming",
-"Table": "Tabel",
-"Tools": "T\u00f6\u00f6riistad",
-"Powered by {0}": "Kasutatud tarkvara {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rikastatud teksti ala. Men\u00fc\u00fc jaoks vajuta ALT-F9. T\u00f6\u00f6riistariba jaoks vajuta ALT-F10. Abi saamiseks vajuta ALT-0."
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/eu.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/eu.js
deleted file mode 100644
index 44e62db3f8..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/eu.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('eu',{
-"Redo": "Berregin",
-"Undo": "Desegin",
-"Cut": "Ebaki",
-"Copy": "Kopiatu",
-"Paste": "Itsatsi",
-"Select all": "Hautatu dena",
-"New document": "Dokumentu berria",
-"Ok": "Ondo",
-"Cancel": "Ezeztatu",
-"Visual aids": "Laguntza bisualak",
-"Bold": "Lodia",
-"Italic": "Etzana",
-"Underline": "Azpimarratua",
-"Strikethrough": "Marratua",
-"Superscript": "Goi-indize",
-"Subscript": "Azpiindize",
-"Clear formatting": "Garbitu formatua",
-"Align left": "Lerrokatu ezkerrean",
-"Align center": "Lerrokatu erdian",
-"Align right": "Lerrokatu eskuinean",
-"Justify": "Justifikatuta",
-"Bullet list": "Bulet zerrenda",
-"Numbered list": "Zerrenda  zenbatua",
-"Decrease indent": "Txikitu koska",
-"Increase indent": "Handitu koska",
-"Close": "Itxi",
-"Formats": "Formatuak",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Zure nabigatzaileak ez du arbela zuzenean erabiltzeko euskarririk. Mesedez erabili CTRL+X\/C\/V teklatuko lasterbideak.",
-"Headers": "Goiburuak",
-"Header 1": "1 Goiburua",
-"Header 2": "2 Goiburua",
-"Header 3": "3 Goiburua",
-"Header 4": "4 Goiburua",
-"Header 5": "5 Goiburua",
-"Header 6": "6 Goiburua",
-"Headings": "Izenburuak",
-"Heading 1": "1. izenburua",
-"Heading 2": "2. izenburua",
-"Heading 3": "3. izenburua",
-"Heading 4": "4. izenburua",
-"Heading 5": "5. izenburua",
-"Heading 6": "6. izenburua",
-"Preformatted": "Aurreformateatuta",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kodea",
-"Paragraph": "Paragrafoa",
-"Blockquote": "Blockquote",
-"Inline": "Lerroan",
-"Blocks": "Blokeak",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Itsatsi testu arrunt moduan dago orain. Edukiak testu arruntak bezala itsatsiko dira aukera hau itzaltzen duzunera arte.",
-"Font Family": "Letra-tipo familia",
-"Font Sizes": "Letra-tamainak",
-"Class": "Klasea",
-"Browse for an image": "Irudia arakatu",
-"OR": "EDO",
-"Drop an image here": "Irudia hona ekarri",
-"Upload": "Kargatu",
-"Block": "Blokea",
-"Align": "Alineatu",
-"Default": "Lehenetstia",
-"Circle": "Zirkulua",
-"Disc": "Diskoa",
-"Square": "Karratua",
-"Lower Alpha": "Behe alfa",
-"Lower Greek": "Behe grekoa",
-"Lower Roman": "Behe erromatarra",
-"Upper Alpha": "Goi alfa",
-"Upper Roman": "Goi erromatarra",
-"Anchor": "Esteka",
-"Name": "Izena",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Ida hizki batekin hasi behar da, jarraian hizkiak, zenbakiak, gidoiak, puntuak, bi-puntu edo azpiko marrak bakarrik izan ditzake.",
-"You have unsaved changes are you sure you want to navigate away?": "Gorde gabeko aldaketak dituzu, zihur zaude hemendik irten nahi duzula?",
-"Restore last draft": "Leheneratu azken zirriborroa",
-"Special character": "Karaktere bereziak",
-"Source code": "Iturburu-kodea",
-"Insert\/Edit code sample": "Txertatu\/editatu kode adibidea",
-"Language": "Hizkuntza",
-"Code sample": "Kode adibidea",
-"Color": "Kolorea",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Ezkerretik eskuinera",
-"Right to left": "Eskuinetik ezkerrera",
-"Emoticons": "Irrifartxoak",
-"Document properties": "Dokumentuaren propietateak",
-"Title": "Titulua",
-"Keywords": "Hitz gakoak",
-"Description": "Deskribapena",
-"Robots": "Robotak",
-"Author": "Egilea",
-"Encoding": "Encoding",
-"Fullscreen": "Pantaila osoa",
-"Action": "Akzioa",
-"Shortcut": "Laster tekla",
-"Help": "Laguntza",
-"Address": "Helbidea",
-"Focus to menubar": "Fokoa menu-barrara eraman",
-"Focus to toolbar": "Fokoa tresna-barrara eraman",
-"Focus to element path": "Fokoa elementuaren bidera eraman",
-"Focus to contextual toolbar": "Fokoa kontestuko tresna-barrara eraman",
-"Insert link (if link plugin activated)": "Lotura txertatu (lotura plugina aktibatuta badago)",
-"Save (if save plugin activated)": "Gorde (gordetzeko plugina aktibatuta badago)",
-"Find (if searchreplace plugin activated)": "Bilatu (bilatuordezkatu plugina instalatuta badago)",
-"Plugins installed ({0}):": "Instalatutako pluginak ({0}):",
-"Premium plugins:": "Premium pluginak:",
-"Learn more...": "Gehiago ikasi...",
-"You are using {0}": "{0} erabiltzen ari zara",
-"Plugins": "Pluginak",
-"Handy Shortcuts": "Laster-tekla erabilgarriak",
-"Horizontal line": "Marra horizontala",
-"Insert\/edit image": "Irudia txertatu\/editatu",
-"Image description": "Irudiaren deskribapena",
-"Source": "Iturburua",
-"Dimensions": "Neurriak",
-"Constrain proportions": "Zerraditu proportzioak",
-"General": "Orokorra",
-"Advanced": "Aurreratua",
-"Style": "Estiloa",
-"Vertical space": "Hutsune bertikala",
-"Horizontal space": "Hutsune horizontala",
-"Border": "Ertza",
-"Insert image": "Irudia txertatu",
-"Image": "Irudia",
-"Image list": "Irudi zerrenda",
-"Rotate counterclockwise": "Erlojuaren aurkako eran biratu",
-"Rotate clockwise": "Erlojuaren eran biratu",
-"Flip vertically": "Bertikalki irauli",
-"Flip horizontally": "Horizontalki irauli",
-"Edit image": "Irudia editatu",
-"Image options": "Irudiaren aukerak",
-"Zoom in": "Zooma handiagotu",
-"Zoom out": "Zooma txikiagotu",
-"Crop": "Moztu",
-"Resize": "Tamaina aldatu",
-"Orientation": "Orientazioa",
-"Brightness": "Distira",
-"Sharpen": "Zorroztu",
-"Contrast": "Kontrastatu",
-"Color levels": "Kolore mailak",
-"Gamma": "Gamma",
-"Invert": "Biratu",
-"Apply": "Gorde",
-"Back": "Atzera",
-"Insert date\/time": "Data\/ordua txertatu",
-"Date\/time": "Data\/ordua",
-"Insert link": "Esteka txertatu",
-"Insert\/edit link": "Esteka txertatu\/editatu",
-"Text to display": "Bistaratzeko testua",
-"Url": "URL",
-"Target": "Target",
-"None": "Bat ere ez",
-"New window": "Lehio berria",
-"Remove link": "Kendu esteka",
-"Anchors": "Estekak",
-"Link": "Lotura",
-"Paste or type a link": "Itsatsu edo idatzi lotura",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Sartu duzun URL-ak e-posta helbidea dela dirudi. Nahi duzu dagokion mailto: aurrizkia gehitzea?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Sartu duzun URL-ak kanpoko esteka dela dirudi. Nahi duzu dagokion http:\/\/ aurrizkia gehitzea?",
-"Link list": "Loturen zerrenda",
-"Insert video": "Bideoa txertatu",
-"Insert\/edit video": "Bideoa txertatu\/editatu",
-"Insert\/edit media": "Media txertatu\/editatu",
-"Alternative source": "Iturburu alternatiboa",
-"Poster": "Poster-a",
-"Paste your embed code below:": "Itsatsi hemen zure enkapsulatzeko kodea:",
-"Embed": "Kapsulatu",
-"Media": "Media",
-"Nonbreaking space": "Zuriune zatiezina",
-"Page break": "Orrialde-jauzia",
-"Paste as text": "Itsatsi testu bezala",
-"Preview": "Aurrebista",
-"Print": "Inprimatu",
-"Save": "Gorde",
-"Find": "Bilatu",
-"Replace with": "Honekin ordeztu",
-"Replace": "Ordeztu",
-"Replace all": "Ordeztu dena",
-"Prev": "Aurrekoa",
-"Next": "Hurrengoa",
-"Find and replace": "Bilatu eta ordeztu",
-"Could not find the specified string.": "Ezin izan da zehaztutako katea aurkitu.",
-"Match case": "Maiuskula\/minuskula",
-"Whole words": "hitz osoak",
-"Spellcheck": "Egiaztapenak",
-"Ignore": "Ez ikusi",
-"Ignore all": "Ez ikusi guztia",
-"Finish": "Amaitu",
-"Add to Dictionary": "Hiztegira gehitu",
-"Insert table": "Txertatu taula",
-"Table properties": "Taularen propietateak",
-"Delete table": "Taula ezabatu",
-"Cell": "Gelaxka",
-"Row": "Errenkada",
-"Column": "Zutabea",
-"Cell properties": "Gelaxkaren propietateak",
-"Merge cells": "Batu gelaxkak",
-"Split cell": "Banatu gelaxkak",
-"Insert row before": "Txertatu errenkada aurretik",
-"Insert row after": "Txertatu errenkada ostean",
-"Delete row": "Ezabatu errenkada",
-"Row properties": "Errenkadaren propietateak",
-"Cut row": "Ebaki errenkada",
-"Copy row": "Kopiatu errenkada",
-"Paste row before": "Itsatsi errenkada aurretik",
-"Paste row after": "Itsatsi errenkada ostean",
-"Insert column before": "Txertatu zutabe aurretik",
-"Insert column after": "Txertatu zutabea ostean",
-"Delete column": "Ezabatu zutabea",
-"Cols": "Zutabeak",
-"Rows": "Errenkadak",
-"Width": "Zabalera",
-"Height": "Altuera",
-"Cell spacing": "Gelaxka arteko tartea",
-"Cell padding": "Gelaxken betegarria",
-"Caption": "Epigrafea",
-"Left": "Ezkerra",
-"Center": "Erdia",
-"Right": "Eskuina",
-"Cell type": "Gelaxka mota",
-"Scope": "Esparrua",
-"Alignment": "Lerrokatzea",
-"H Align": "Lerrokatze horizontala",
-"V Align": "Lerrokatze bertikala",
-"Top": "Goian",
-"Middle": "Erdian",
-"Bottom": "Behean",
-"Header cell": "Goiburuko gelaxka",
-"Row group": "Lerro taldea",
-"Column group": "Zutabe taldea",
-"Row type": "Lerro mota",
-"Header": "Goiburua",
-"Body": "Gorputza",
-"Footer": "Oina",
-"Border color": "Inguruko marraren kolorea",
-"Insert template": "Txertatu txantiloia",
-"Templates": "Txantiloiak",
-"Template": "Txantiloia",
-"Text color": "Testuaren kolorea",
-"Background color": "Atzeko kolorea",
-"Custom...": "Pertsonalizatu",
-"Custom color": "Pertsonalizatutako kolorea",
-"No color": "Kolorerik ez",
-"Table of Contents": "Edukien taula",
-"Show blocks": "Erakutsi blokeak",
-"Show invisible characters": "Erakutsi karaktere izkutuak",
-"Words: {0}": "Hitzak: {0}",
-"{0} words": "{0} hitz",
-"File": "Fitxategia",
-"Edit": "Editatu",
-"Insert": "Sartu",
-"View": "Ikusi",
-"Format": "Formatua",
-"Table": "Taula",
-"Tools": "Tresnak",
-"Powered by {0}": "{0}rekin egina",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Testu aberastuko area. Sakatu ALT-F9 menurako. Sakatu ALT-F10 tresna-barrarako. Sakatu ALT-0 laguntzarako"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fa_IR.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fa_IR.js
deleted file mode 100644
index 7ac42b6831..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fa_IR.js
+++ /dev/null
@@ -1,262 +0,0 @@
-tinymce.addI18n('fa_IR',{
-"Redo": "\u0628\u0627\u0632 \u0646\u0634\u0627\u0646",
-"Undo": "\u0628\u0627\u0632 \u06af\u0631\u062f\u0627\u0646",
-"Cut": "\u0628\u0631\u0634",
-"Copy": "\u0631\u0648\u0646\u0648\u06cc\u0633\u06cc",
-"Paste": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646",
-"Select all": "\u0627\u0646\u062a\u062e\u0627\u0628 \u0647\u0645\u0647",
-"New document": "\u0633\u0646\u062f \u062c\u062f\u06cc\u062f",
-"Ok": "\u062a\u0627\u06cc\u06cc\u062f",
-"Cancel": "\u0627\u0646\u0635\u0631\u0627\u0641",
-"Visual aids": "\u06a9\u0645\u06a9 \u0628\u0635\u0631\u06cc",
-"Bold": "\u062f\u0631\u0634\u062a",
-"Italic": "\u06a9\u062c",
-"Underline": "\u0632\u06cc\u0631 \u062e\u0637",
-"Strikethrough": "\u062e\u0637 \u062e\u0648\u0631\u062f\u0647",
-"Superscript": "\u0646\u0645\u0627",
-"Subscript": "\u067e\u0627\u06cc\u0647",
-"Clear formatting": "\u067e\u0627\u06a9 \u06a9\u0631\u062f\u0646 \u0642\u0627\u0644\u0628 \u0628\u0646\u062f\u06cc",
-"Align left": "\u0686\u067e \u0686\u06cc\u0646",
-"Align center": "\u0648\u0633\u0637 \u0686\u06cc\u0646",
-"Align right": "\u0631\u0627\u0633\u062a \u0686\u06cc\u0646",
-"Justify": "\u062a\u0631\u0627\u0632 \u062f\u0648 \u0637\u0631\u0641\u0647",
-"Bullet list": "\u0641\u0647\u0631\u0633\u062a \u0646\u0634\u0627\u0646\u0647 \u062f\u0627\u0631",
-"Numbered list": "\u0641\u0647\u0631\u0633\u062a \u0634\u0645\u0627\u0631\u0647 \u062f\u0627\u0631",
-"Decrease indent": "\u06a9\u0627\u0647\u0634 \u062a\u0648\u0631\u0641\u062a\u06af\u06cc",
-"Increase indent": "\u0627\u0641\u0632\u0627\u06cc\u0634 \u062a\u0648\u0631\u0641\u062a\u06af\u06cc",
-"Close": "\u0628\u0633\u062a\u0646",
-"Formats": "\u0642\u0627\u0644\u0628 \u0647\u0627",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0645\u0631\u0648\u0631\u06af\u0631 \u0634\u0645\u0627 \u062f\u0633\u062a\u0631\u0633\u06cc \u0645\u0633\u062a\u0642\u06cc\u0645 \u0628\u0647 \u06a9\u0644\u06cc\u067e \u0628\u0648\u0631\u062f \u0631\u0627 \u067e\u0634\u062a\u06cc\u0628\u0627\u0646\u06cc \u0646\u0645\u06cc \u06a9\u0646\u062f\u060c \u0644\u0637\u0641\u0627 \u0627\u0632 \u0645\u06cc\u0627\u0646\u0628\u0631\u0647\u0627\u06cc  Ctrl+X\/C\/V  \u0635\u0641\u062d\u0647 \u06a9\u0644\u06cc\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0646\u0645\u0627\u06cc\u06cc\u062f . ",
-"Headers": "\u0633\u0631 \u0622\u0645\u062f\u0647\u0627",
-"Header 1": "\u0633\u0631 \u0622\u0645\u062f 1",
-"Header 2": "\u0633\u0631 \u0622\u0645\u062f 2",
-"Header 3": "\u0633\u0631 \u0622\u0645\u062f 3",
-"Header 4": "\u0633\u0631 \u0622\u0645\u062f 4",
-"Header 5": "\u0633\u0631 \u0622\u0645\u062f 5",
-"Header 6": "\u0633\u0631 \u0622\u0645\u062f 6",
-"Headings": "\u0639\u0646\u0627\u0648\u06cc\u0646",
-"Heading 1": "\u0639\u0646\u0648\u0627\u0646 1",
-"Heading 2": "\u0639\u0646\u0648\u0627\u0646 2",
-"Heading 3": "\u0639\u0646\u0648\u0627\u0646 3",
-"Heading 4": "\u0639\u0646\u0648\u0627\u0646 4",
-"Heading 5": "\u0639\u0646\u0648\u0627\u0646 5",
-"Heading 6": "\u0639\u0646\u0648\u0627\u0646 6",
-"Preformatted": "\u0627\u0632 \u067e\u06cc\u0634 \u0642\u0627\u0644\u0628 \u0628\u0646\u062f\u06cc \u0634\u062f\u0647",
-"Div": "\u0628\u0644\u0648\u06a9 \u062c\u062f\u0627 \u0633\u0627\u0632 (\u062a\u06af Div)",
-"Pre": "\u0628\u0644\u0648\u06a9 \u0645\u062a\u0646 \u0642\u0627\u0644\u0628 \u062f\u0627\u0631 (\u062a\u06af Pre)",
-"Code": "\u0628\u0644\u0648\u06a9 \u06a9\u062f\u0646\u0648\u06cc\u0633\u06cc (\u062a\u06a9 Code)",
-"Paragraph": "\u067e\u0627\u0631\u0627\u06af\u0631\u0627\u0641 (\u062a\u06af P)",
-"Blockquote": "\u0628\u0644\u0648\u06a9 \u0646\u0642\u0644 \u0642\u0648\u0644 (\u062a\u06af BlockQuote)",
-"Inline": "\u0631\u0648 \u062e\u0637",
-"Blocks": "\u0628\u0644\u0648\u06a9 \u0647\u0627",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0627\u0645\u06a9\u0627\u0646 \u0686\u0633\u0628\u0627\u0646\u062f\u0646\u060c \u062f\u0631 \u062d\u0627\u0644\u062a \u0645\u062a\u0646 \u062e\u0627\u0644\u0635 \u062a\u0646\u0638\u06cc\u0645 \u06af\u0634\u062a\u0647. \u062a\u0627 \u0632\u0645\u0627\u0646 \u062a\u063a\u06cc\u06cc\u0631 \u0627\u06cc\u0646 \u062d\u0627\u0644\u062a\u060c \u0645\u062d\u062a\u0648\u0627\u06cc \u0645\u0648\u0631\u062f \u0686\u0633\u0628\u0627\u0646\u062f\u0646\u060c \u0628\u0647 \u0635\u0648\u0631\u062a \u0645\u062a\u0646 \u062e\u0627\u0644\u0635 \u062e\u0648\u0627\u0647\u062f \u0686\u0633\u0628\u06cc\u062f.",
-"Font Family": "\u0646\u0648\u0639 \u0642\u0644\u0645",
-"Font Sizes": "\u0627\u0646\u062f\u0627\u0632\u0647\u0621 \u0642\u0644\u0645",
-"Class": "\u0631\u062f\u0647",
-"Browse for an image": "\u06cc\u0627\u0641\u062a\u0646 \u06cc\u06a9 \u062a\u0635\u0648\u06cc\u0631",
-"OR": "\u00ab\u06cc\u0627\u00bb",
-"Drop an image here": "\u06cc\u06a9 \u062a\u0635\u0648\u06cc\u0631 \u0627\u06cc\u0646\u062c\u0627 \u0631\u0647\u0627 \u06a9\u0646\u06cc\u062f",
-"Upload": "\u0628\u0627\u0631\u06af\u0630\u0627\u0631\u06cc",
-"Block": "\u0628\u0644\u0648\u06a9",
-"Align": "\u0686\u06cc\u062f\u0645\u0627\u0646",
-"Default": "\u067e\u06cc\u0634 \u0641\u0631\u0636",
-"Circle": "\u062f\u0627\u06cc\u0631\u0647",
-"Disc": "\u062f\u0627\u06cc\u0631\u0647\u0621 \u062a\u0648\u067e\u0631",
-"Square": "\u0686\u0647\u0627\u0631 \u06af\u0648\u0634",
-"Lower Alpha": "\u062d\u0631\u0648\u0641 \u06a9\u0648\u0686\u06a9",
-"Lower Greek": "\u062d\u0631\u0648\u0641 \u06a9\u0648\u0686\u06a9 \u06cc\u0648\u0646\u0627\u0646\u06cc",
-"Lower Roman": "\u0627\u0631\u0642\u0627\u0645 \u06a9\u0648\u0686\u06a9 \u0631\u0648\u0645\u06cc",
-"Upper Alpha": "\u062d\u0631\u0648\u0641 \u0628\u0632\u0631\u06af",
-"Upper Roman": "\u0627\u0631\u0642\u0627\u0645 \u0628\u0632\u0631\u06af \u0631\u0648\u0645\u06cc",
-"Anchor": "\u0642\u0644\u0627\u0628",
-"Name": "\u0646\u0627\u0645",
-"Id": "\u0634\u0646\u0627\u0633\u0647",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0634\u0646\u0627\u0633\u0647 \u0645\u06cc \u0628\u0627\u06cc\u0633\u062a \u0628\u0627 \u06cc\u06a9 \u062d\u0631\u0641 \u0627\u0644\u0641\u0628\u0627 \u0622\u063a\u0627\u0632 \u0648 \u0628\u0627 \u062f\u0646\u0628\u0627\u0644\u0647 \u0627\u06cc \u0627\u0632 \u062d\u0631\u0648\u0641\u060c \u0627\u0639\u062f\u0627\u062f\u060c \u0639\u0644\u0627\u0645\u062a \u0645\u0650\u0646\u0647\u0627\u060c \u0646\u0642\u0637\u0647\u060c \u062f\u0648 \u0646\u0642\u0637\u0647 \u06cc\u0627 \u062e\u0637 \u062a\u06cc\u0631\u0647 \u0627\u062f\u0627\u0645\u0647 \u06cc\u0627\u0628\u062f.",
-"You have unsaved changes are you sure you want to navigate away?": "\u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0634\u0645\u0627 \u0630\u062e\u06cc\u0631\u0647 \u0646\u0634\u062f\u0647 \u0627\u0646\u062f\u060c \u0622\u06cc\u0627 \u062c\u0647\u062a \u062e\u0631\u0648\u062c \u0627\u0637\u0645\u06cc\u0646\u0627\u0646 \u062f\u0627\u0631\u06cc\u062f\u061f",
-"Restore last draft": "\u0628\u0627\u0632\u06cc\u0627\u0628\u06cc \u0622\u062e\u0631\u06cc\u0646 \u067e\u06cc\u0634 \u0646\u0648\u06cc\u0633",
-"Special character": "\u0646\u0648\u06cc\u0633\u0647 \u0647\u0627\u06cc \u062e\u0627\u0635",
-"Source code": "\u0645\u062a\u0646 \u06a9\u062f \u0645\u0646\u0628\u0639",
-"Insert\/Edit code sample": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u0646\u0645\u0648\u0646\u0647\u0621 \u06a9\u062f",
-"Language": "\u0632\u0628\u0627\u0646",
-"Code sample": "\u0646\u0645\u0648\u0646\u0647 \u06a9\u064f\u062f",
-"Color": "\u0631\u0646\u06af",
-"R": "\u0642\u0631\u0645\u0632",
-"G": "\u0633\u0628\u0632",
-"B": "\u0622\u0628\u06cc",
-"Left to right": "\u0686\u067e \u0628\u0647 \u0631\u0627\u0633\u062a",
-"Right to left": "\u0631\u0627\u0633\u062a \u0628\u0647 \u0686\u067e",
-"Emoticons": "\u0635\u0648\u0631\u062a\u06a9 \u0647\u0627",
-"Document properties": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0633\u0646\u062f",
-"Title": "\u0639\u0646\u0648\u0627\u0646",
-"Keywords": "\u0648\u0627\u0698\u06af\u0627\u0646 \u06a9\u0644\u06cc\u062f\u06cc",
-"Description": "\u062a\u0648\u0636\u06cc\u062d",
-"Robots": "\u0631\u0648\u0628\u0627\u062a\u0647\u0627",
-"Author": "\u0645\u0648\u0644\u0641",
-"Encoding": "\u06a9\u062f\u06af\u0632\u0627\u0631\u06cc \u0645\u062a\u0646",
-"Fullscreen": "\u062a\u0645\u0627\u0645 \u0635\u0641\u062d\u0647",
-"Action": "\u0639\u0645\u0644",
-"Shortcut": "\u0645\u06cc\u0627\u0646\u0628\u064f\u0631",
-"Help": "\u0631\u0627\u0647\u0646\u0645\u0627",
-"Address": "\u0646\u0634\u0627\u0646\u06cc",
-"Focus to menubar": "\u062a\u0645\u0631\u06a9\u0632 \u0628\u0631 \u0646\u0648\u0627\u0631 \u0645\u0646\u0648",
-"Focus to toolbar": "\u062a\u0645\u0631\u06a9\u0632 \u0628\u0631 \u0646\u0648\u0627\u0631 \u0627\u0628\u0632\u0627\u0631",
-"Focus to element path": "\u062a\u0645\u0631\u06a9\u0632 \u0628\u0631 \u0645\u0633\u06cc\u0631 \u0627\u0650\u0644\u0650\u0645\u0627\u0646",
-"Focus to contextual toolbar": "\u062a\u0645\u0631\u06a9\u0632 \u0628\u0631 \u0646\u0648\u0627\u0631 \u0627\u0628\u0632\u0627\u0631 \u0645\u062a\u0646\u06cc",
-"Insert link (if link plugin activated)": "\u062f\u0631\u062c \u067e\u06cc\u0648\u0646\u062f (\u0627\u06af\u0631 \u0627\u0641\u0632\u0648\u0646\u0647\u0621 \u067e\u06cc\u0648\u0646\u062f \u0641\u0639\u0627\u0644 \u0634\u062f)",
-"Save (if save plugin activated)": "\u062b\u0628\u062a\u00a0(\u0627\u06af\u0631 \u0627\u0641\u0632\u0648\u0646\u0647\u0621 \u0630\u062e\u06cc\u0631\u0647 \u0633\u0627\u0632\u06cc \u0641\u0639\u0627\u0644 \u0634\u062f)",
-"Find (if searchreplace plugin activated)": "\u06cc\u0627\u0641\u062a\u0646 (\u0627\u06af\u0631 \u0627\u0641\u0632\u0648\u0646\u0647\u0621 \u062c\u0633\u062a\u062c\u0648\/\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646\u06cc \u0641\u0639\u0627\u0644 \u0634\u062f)",
-"Plugins installed ({0}):": "\u0627\u0641\u0632\u0648\u0646\u0647 \u0647\u0627\u06cc\u06cc \u06a9\u0647 \u0646\u0635\u0628 \u0634\u062f\u0646\u062f ({0}):",
-"Premium plugins:": "\u0627\u0641\u0632\u0648\u0646\u0647 \u0647\u0627\u06cc \u0645\u062e\u0635\u0648\u0635:",
-"Learn more...": "\u06cc\u0627\u062f\u06af\u06cc\u0631\u06cc \u0628\u06cc\u0634\u062a\u0631...",
-"You are using {0}": "\u0634\u0645\u0627 \u062f\u0631 \u062d\u0627\u0644 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 {0} \u0645\u06cc \u0628\u0627\u0634\u06cc\u062f",
-"Plugins": "\u0627\u0641\u0632\u0648\u0646\u0647 \u0647\u0627",
-"Handy Shortcuts": "\u0645\u06cc\u0627\u0646\u0628\u064f\u0631\u0647\u0627\u06cc \u0633\u0648\u062f\u0645\u0646\u062f",
-"Horizontal line": "\u062e\u0637 \u0627\u0641\u0642\u06cc",
-"Insert\/edit image": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u062a\u0635\u0648\u06cc\u0631",
-"Image description": "\u062a\u0648\u0635\u06cc\u0641 \u062a\u0635\u0648\u06cc\u0631",
-"Source": "\u0645\u0646\u0628\u0639",
-"Dimensions": "\u0627\u0628\u0639\u0627\u062f",
-"Constrain proportions": "\u062d\u0641\u0638 \u062a\u0646\u0627\u0633\u0628",
-"General": "\u0639\u0645\u0648\u0645\u06cc",
-"Advanced": "\u067e\u06cc\u0634\u0631\u0641\u062a\u0647",
-"Style": "\u0633\u0628\u06a9",
-"Vertical space": "\u0641\u0636\u0627\u06cc \u0639\u0645\u0648\u062f\u06cc",
-"Horizontal space": "\u0641\u0636\u0627\u06cc \u0627\u0641\u0642\u06cc",
-"Border": "\u0644\u0628\u0647",
-"Insert image": "\u062f\u0631\u062c \u062a\u0635\u0648\u06cc\u0631",
-"Image": "\u062a\u0635\u0648\u06cc\u0631",
-"Image list": "\u0641\u0647\u0631\u0633\u062a \u062a\u0635\u0648\u06cc\u0631\u06cc",
-"Rotate counterclockwise": "\u062f\u064e\u0648\u064e\u0631\u0627\u0646 \u067e\u0627\u062f \u0633\u0627\u0639\u062a \u06af\u0631\u062f",
-"Rotate clockwise": "\u062f\u064e\u0648\u064e\u0631\u0627\u0646 \u0633\u0627\u0639\u062a \u06af\u0631\u062f",
-"Flip vertically": "\u0642\u0631\u06cc\u0646\u0647 \u0639\u0645\u0648\u062f\u06cc",
-"Flip horizontally": "\u0642\u0631\u06cc\u0646\u0647 \u0627\u0641\u0642\u06cc",
-"Edit image": "\u0648\u06cc\u0631\u0627\u0633\u062a \u062a\u0635\u0648\u06cc\u0631",
-"Image options": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u062a\u0635\u0648\u06cc\u0631",
-"Zoom in": "\u0628\u0632\u0631\u06af \u0646\u0645\u0627\u06cc\u06cc",
-"Zoom out": "\u06a9\u0648\u0686\u06a9 \u0646\u0645\u0627\u06cc\u06cc",
-"Crop": "\u0628\u064f\u0631\u0634 \u062f\u064f\u0648\u0631",
-"Resize": "\u062a\u063a\u06cc\u06cc\u0631 \u0627\u0646\u062f\u0627\u0632\u0647",
-"Orientation": "\u06af\u0650\u0631\u0627",
-"Brightness": "\u0631\u0648\u0634\u0646\u0627\u06cc\u06cc",
-"Sharpen": "\u0628\u0647\u0628\u0648\u062f \u0644\u0628\u0647",
-"Contrast": "\u062a\u0636\u0627\u062f \u0631\u0646\u06af",
-"Color levels": "\u0633\u0637\u0648\u062d \u0631\u0646\u06af",
-"Gamma": "\u06af\u0627\u0645\u0627",
-"Invert": "\u0628\u0631\u06af\u0634\u062a \u0631\u0646\u06af",
-"Apply": "\u0627\u0650\u0639\u0645\u0627\u0644",
-"Back": "\u0628\u0627\u0632\u06af\u0634\u062a",
-"Insert date\/time": "\u062f\u0631\u062c \u062a\u0627\u0631\u06cc\u062e\/\u0632\u0645\u0627\u0646",
-"Date\/time": "\u062a\u0627\u0631\u06cc\u062e\/\u0632\u0645\u0627\u0646",
-"Insert link": "\u062f\u0631\u062c \u067e\u06cc\u0648\u0646\u062f",
-"Insert\/edit link": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u067e\u06cc\u0648\u0646\u062f",
-"Text to display": "\u0645\u062a\u0646 \u0646\u0645\u0627\u06cc\u0634\u06cc",
-"Url": "\u0622\u062f\u0631\u0633",
-"Target": "\u0645\u0642\u0635\u062f",
-"None": "\u0647\u06cc\u0686",
-"New window": "\u067e\u0646\u062c\u0631\u0647\u0621 \u062c\u062f\u06cc\u062f",
-"Remove link": "\u062d\u0630\u0641 \u067e\u06cc\u0648\u0646\u062f",
-"Anchors": "\u0642\u0644\u0627\u0628 \u0647\u0627",
-"Link": "\u067e\u06cc\u0648\u0646\u062f",
-"Paste or type a link": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u06cc\u0627 \u062a\u0627\u06cc\u067e \u067e\u06cc\u0648\u0646\u062f",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0628\u0647 \u0646\u0638\u0631 \u0645\u06cc \u0631\u0633\u062f \u0622\u062f\u0631\u0633 \u0648\u0631\u0648\u062f\u06cc \u06cc\u06a9 \u0631\u0627\u06cc\u0627\u0646\u0627\u0645\u0647 \u0628\u0627\u0634\u062f. \u0622\u06cc\u0627 \u062a\u0645\u0627\u06cc\u0644 \u0628\u0647 \u0627\u0641\u0632\u0648\u0631\u062f\u0646 \u067e\u06cc\u0634\u0648\u0646\u062f mailto: \u062f\u0627\u0631\u06cc\u062f\u061f",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0628\u0647 \u0646\u0638\u0631 \u0645\u06cc \u0631\u0633\u062f \u0622\u062f\u0631\u0633 \u0648\u0631\u0648\u062f\u06cc \u0627\u0631\u062c\u0627\u0639\u06cc \u0628\u0647 \u062e\u0627\u0631\u062c \u0627\u0632 \u0627\u06cc\u0646 \u0633\u0627\u06cc\u062a \u0645\u06cc \u0628\u0627\u0634\u062f. \u0622\u06cc\u0627 \u062a\u0645\u0627\u06cc\u0644 \u0628\u0647 \u0627\u0641\u0632\u0648\u0631\u062f\u0646 \u067e\u06cc\u0634\u0648\u0646\u062f http:\/\/ \u062f\u0627\u0631\u06cc\u062f\u061f",
-"Link list": "\u0641\u0647\u0631\u0633\u062a \u067e\u06cc\u0648\u0646\u062f",
-"Insert video": "\u062f\u0631\u062c \u0648\u06cc\u062f\u06cc\u0648",
-"Insert\/edit video": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u0648\u06cc\u062f\u06cc\u0648",
-"Insert\/edit media": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u0631\u0633\u0627\u0646\u0647",
-"Alternative source": "\u0645\u0646\u0628\u0639 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646",
-"Poster": "\u067e\u0648\u0633\u062a\u0631",
-"Paste your embed code below:": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u06a9\u062f \u062c\u0627\u0633\u0627\u0632\u06cc \u0634\u0645\u0627 \u062f\u0631 \u0632\u06cc\u0631: ",
-"Embed": "\u062c\u0627\u0633\u0627\u0632\u06cc",
-"Media": "\u0631\u0633\u0627\u0646\u0647",
-"Nonbreaking space": "\u0641\u0636\u0627\u06cc \u062e\u0627\u0644\u06cc \u0628\u0631\u0634 \u0646\u0627\u067e\u0630\u06cc\u0631",
-"Page break": "\u0628\u0631\u0634 \u0635\u0641\u062d\u0647",
-"Paste as text": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0645\u062a\u0646",
-"Preview": "\u067e\u06cc\u0634 \u0646\u0645\u0627\u06cc\u0634",
-"Print": "\u0686\u0627\u067e",
-"Save": "\u0630\u062e\u06cc\u0631\u0647",
-"Find": "\u062c\u0633\u062a\u062c\u0648",
-"Replace with": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646\u06cc \u0628\u0627",
-"Replace": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646\u06cc",
-"Replace all": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u0647\u0645\u0647",
-"Prev": "\u0642\u0628\u0644\u06cc",
-"Next": "\u0628\u0639\u062f\u06cc",
-"Find and replace": "\u062c\u0633\u062a\u062c\u0648 \u0648 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646\u06cc",
-"Could not find the specified string.": "\u0631\u0634\u062a\u0647\u0621 \u0645\u0648\u0631\u062f \u0646\u0638\u0631 \u06cc\u0627\u0641\u062a \u0646\u06af\u0631\u062f\u06cc\u062f.",
-"Match case": "\u062a\u0637\u0627\u0628\u0642 \u062d\u0631\u0648\u0641",
-"Whole words": "\u062a\u0645\u0627\u0645 \u0648\u0627\u0698\u06af\u0627\u0646",
-"Spellcheck": "\u0628\u0631\u0631\u0633\u06cc \u0627\u0645\u0644\u0627\u0621",
-"Ignore": "\u0628\u06cc \u062e\u06cc\u0627\u0644",
-"Ignore all": "\u0628\u06cc \u062e\u06cc\u0627\u0644 \u0647\u0645\u0647",
-"Finish": "\u0627\u062a\u0645\u0627\u0645",
-"Add to Dictionary": "\u0628\u0647 \u0648\u0627\u0698\u0647 \u0646\u0627\u0645\u0647 \u0628\u06cc \u0627\u0641\u0632\u0627",
-"Insert table": "\u062f\u0631\u062c \u062c\u062f\u0648\u0644",
-"Table properties": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u062c\u062f\u0648\u0644",
-"Delete table": "\u062d\u0630\u0641 \u062c\u062f\u0648\u0644",
-"Cell": "\u0633\u0644\u0648\u0644",
-"Row": "\u0633\u0637\u0631",
-"Column": "\u0633\u062a\u0648\u0646",
-"Cell properties": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0633\u0644\u0648\u0644",
-"Merge cells": "\u067e\u06cc\u0648\u0646\u062f \u0633\u0644\u0648\u0644 \u0647\u0627",
-"Split cell": "\u062c\u062f\u0627 \u0633\u0627\u0632\u06cc \u0633\u0644\u0648\u0644",
-"Insert row before": "\u062f\u0631\u062c \u0633\u0637\u0631 \u062f\u0631 \u0628\u0627\u0644\u0627",
-"Insert row after": "\u062f\u0631\u062c \u0633\u0637\u0631 \u062f\u0631 \u067e\u0627\u06cc\u06cc\u0646",
-"Delete row": "\u062d\u0630\u0641 \u0633\u0637\u0631",
-"Row properties": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0633\u0637\u0631",
-"Cut row": "\u0628\u0631\u0634 \u0633\u0637\u0631",
-"Copy row": "\u0631\u0648\u0646\u0648\u06cc\u0633\u06cc \u0633\u0637\u0631",
-"Paste row before": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0633\u0637\u0631 \u062f\u0631 \u0628\u0627\u0644\u0627",
-"Paste row after": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0633\u0637\u0631 \u062f\u0631 \u067e\u0627\u06cc\u06cc\u0646",
-"Insert column before": "\u062f\u0631\u062c \u0633\u062a\u0648\u0646 \u0642\u0628\u0644",
-"Insert column after": "\u062f\u0631\u062c \u0633\u062a\u0648\u0646 \u0628\u0639\u062f",
-"Delete column": "\u062d\u0630\u0641 \u0633\u062a\u0648\u0646",
-"Cols": "\u0633\u062a\u0648\u0646 \u0647\u0627",
-"Rows": "\u0633\u0637\u0631 \u0647\u0627",
-"Width": "\u0639\u0631\u0636",
-"Height": "\u0627\u0631\u062a\u0641\u0627\u0639",
-"Cell spacing": "\u0641\u0627\u0635\u0644\u0647 \u0645\u06cc\u0627\u0646 \u0633\u0644\u0648\u0644\u06cc",
-"Cell padding": "\u062d\u0627\u0634\u06cc\u0647 \u062f\u0631\u0648\u0646 \u0633\u0644\u0648\u0644\u06cc",
-"Caption": "\u0639\u0646\u0648\u0627\u0646",
-"Left": "\u0686\u067e",
-"Center": "\u0645\u06cc\u0627\u0646\u0647",
-"Right": "\u0631\u0627\u0633\u062a",
-"Cell type": "\u0646\u0648\u0639 \u0633\u0644\u0648\u0644",
-"Scope": "\u062d\u0648\u0632\u0647",
-"Alignment": "\u0647\u0645 \u062a\u0631\u0627\u0632\u06cc",
-"H Align": "\u062a\u0631\u0627\u0632 \u0627\u0641\u0642\u06cc",
-"V Align": "\u062a\u0631\u0627\u0632 \u0639\u0645\u0648\u062f\u06cc",
-"Top": "\u0628\u0627\u0644\u0627",
-"Middle": "\u0645\u06cc\u0627\u0646\u0647",
-"Bottom": "\u067e\u0627\u06cc\u06cc\u0646",
-"Header cell": "\u0633\u0644\u0648\u0644 \u0633\u0631 \u0633\u062a\u0648\u0646",
-"Row group": "\u06af\u0631\u0648\u0647 \u0633\u0637\u0631\u06cc",
-"Column group": "\u06af\u0631\u0648\u0647 \u0633\u062a\u0648\u0646\u06cc",
-"Row type": "\u0646\u0648\u0639 \u0633\u0637\u0631",
-"Header": "\u0633\u0631 \u0622\u0645\u062f",
-"Body": "\u0628\u062f\u0646\u0647",
-"Footer": "\u067e\u0627 \u0646\u0648\u0634\u062a",
-"Border color": "\u0631\u0646\u06af \u0644\u0628\u0647",
-"Insert template": "\u062f\u0631\u062c \u0627\u0644\u06af\u0648",
-"Templates": "\u0627\u0644\u06af\u0648\u0647\u0627",
-"Template": "\u0627\u0644\u06af\u0648",
-"Text color": "\u0631\u0646\u06af \u0645\u062a\u0646",
-"Background color": "\u0631\u0646\u06af \u067e\u0633 \u0632\u0645\u06cc\u0646\u0647",
-"Custom...": "\u062f\u0644\u062e\u0648\u0627\u0647...",
-"Custom color": "\u0631\u0646\u06af \u062f\u0644\u062e\u0648\u0627\u0647",
-"No color": "\u0628\u062f\u0648\u0646 \u0631\u0646\u06af",
-"Table of Contents": "\u0641\u0647\u0631\u0633\u062a \u0639\u0646\u0627\u0648\u06cc\u0646",
-"Show blocks": "\u0646\u0645\u0627\u06cc\u0634 \u0628\u0644\u0648\u06a9 \u0647\u0627",
-"Show invisible characters": "\u0646\u0645\u0627\u06cc\u0634 \u0646\u0648\u06cc\u0633\u0647 \u0647\u0627\u06cc \u0646\u0627\u067e\u06cc\u062f\u0627",
-"Words: {0}": "\u0648\u0627\u0698\u0647 \u0647\u0627: {0}",
-"{0} words": "{0} \u0648\u0627\u0698\u0647",
-"File": "\u067e\u0631\u0648\u0646\u062f\u0647",
-"Edit": "\u0648\u06cc\u0631\u0627\u06cc\u0634",
-"Insert": "\u062f\u0631\u062c",
-"View": "\u0646\u0645\u0627\u06cc\u0634",
-"Format": "\u0642\u0627\u0644\u0628",
-"Table": "\u062c\u062f\u0648\u0644",
-"Tools": "\u0627\u0628\u0632\u0627\u0631\u0647\u0627",
-"Powered by {0}": "\u062a\u0648\u0627\u0646 \u06af\u0631\u0641\u062a\u0647 \u0627\u0632 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0646\u0627\u062d\u06cc\u0647 \u0645\u062a\u0646 \u063a\u0646\u06cc.\n\u062c\u0647\u062a \u0645\u0634\u0627\u0647\u062f\u0647 \u0645\u0646\u0648 \u0627\u0632 \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc \u062a\u0631\u06a9\u06cc\u0628\u06cc ALT + F9 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0646\u0645\u0627\u06cc\u06cc\u062f.\n\u062c\u0647\u062a \u0645\u0634\u0627\u0647\u062f\u0647 \u0646\u0648\u0627\u0631 \u0627\u0628\u0632\u0627\u0631 \u0627\u0632 \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc \u062a\u0631\u06a9\u06cc\u0628\u06cc ALT + F10 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0646\u0645\u0627\u06cc\u06cc\u062f.\n\u062c\u0647\u062a \u0645\u0634\u0627\u0647\u062f\u0647 \u0631\u0627\u0647\u0646\u0645\u0627 \u0627\u0632 \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc \u062a\u0631\u06a9\u06cc\u0628\u06cc ALT + 0 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0646\u0645\u0627\u06cc\u06cc\u062f.",
-"_dir": "rtl"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fi.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fi.js
deleted file mode 100644
index db521d6dec..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fi.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('fi',{
-"Redo": "Tee uudelleen",
-"Undo": "Peru",
-"Cut": "Leikkaa",
-"Copy": "Kopioi",
-"Paste": "Liit\u00e4",
-"Select all": "Valitse kaikki",
-"New document": "Uusi dokumentti",
-"Ok": "Ok",
-"Cancel": "Peruuta",
-"Visual aids": "Visuaaliset neuvot",
-"Bold": "Lihavointi",
-"Italic": "Kursivointi",
-"Underline": "Alleviivaus",
-"Strikethrough": "Yliviivaus",
-"Superscript": "Yl\u00e4indeksi",
-"Subscript": "Alaindeksi",
-"Clear formatting": "Poista muotoilu",
-"Align left": "Tasaa vasemmalle",
-"Align center": "Keskit\u00e4",
-"Align right": "Tasaa oikealle",
-"Justify": "Tasaa",
-"Bullet list": "J\u00e4rjest\u00e4m\u00e4t\u00f6n lista",
-"Numbered list": "J\u00e4rjestetty lista",
-"Decrease indent": "Sisenn\u00e4",
-"Increase indent": "Loitonna",
-"Close": "Sulje",
-"Formats": "Muotoilut",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Selaimesi ei tue leikep\u00f6yd\u00e4n suoraa k\u00e4ytt\u00e4mist\u00e4. Ole hyv\u00e4 ja k\u00e4yt\u00e4 n\u00e4pp\u00e4imist\u00f6n Ctrl+X\/C\/V n\u00e4pp\u00e4inyhdistelmi\u00e4.",
-"Headers": "Otsikot",
-"Header 1": "Otsikko 1",
-"Header 2": "Otsikko 2",
-"Header 3": "Otsikko 3",
-"Header 4": "Otsikko 4",
-"Header 5": "Otsikko 5",
-"Header 6": "Otsikko 6",
-"Headings": "Otsikot",
-"Heading 1": "Otsikko 1",
-"Heading 2": "Otsikko 2",
-"Heading 3": "Otsikko 3",
-"Heading 4": "Otsikko 4",
-"Heading 5": "Otsikko 5",
-"Heading 6": "Otsikko 6",
-"Preformatted": "Preformatted",
-"Div": "Div",
-"Pre": "Esimuotoiltu",
-"Code": "Koodi",
-"Paragraph": "Kappale",
-"Blockquote": "Lainauslohko",
-"Inline": "Samalla rivill\u00e4",
-"Blocks": "Lohkot",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Liitt\u00e4minen on nyt pelk\u00e4n tekstin -tilassa. Sis\u00e4ll\u00f6t liitet\u00e4\u00e4n nyt pelkk\u00e4n\u00e4 tekstin\u00e4, kunnes otat vaihtoehdon pois k\u00e4yt\u00f6st\u00e4.",
-"Font Family": "Fontti",
-"Font Sizes": "Fonttikoko",
-"Class": "Luokka",
-"Browse for an image": "Selaa kuvia",
-"OR": "TAI",
-"Drop an image here": "Pudota kuva t\u00e4h\u00e4n",
-"Upload": "Vie",
-"Block": "Lohko",
-"Align": "Tasaa",
-"Default": "Oletus",
-"Circle": "Pallo",
-"Disc": "Ympyr\u00e4",
-"Square": "Neli\u00f6",
-"Lower Alpha": "pienet kirjaimet: a, b, c",
-"Lower Greek": "pienet kirjaimet: \u03b1, \u03b2, \u03b3",
-"Lower Roman": "pienet kirjaimet: i, ii, iii",
-"Upper Alpha": "isot kirjaimet: A, B, C",
-"Upper Roman": "isot kirjaimet: I, II, III",
-"Anchor": "Ankkuri",
-"Name": "Nimi",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id voi alkaa kirjaimella, sen j\u00e4lkeen voi k\u00e4ytt\u00e4\u00e4 kirjaimia, numeroja, viivoja, pisteit\u00e4, kaksoispistett\u00e4 ja alaviivausta",
-"You have unsaved changes are you sure you want to navigate away?": "Sinulla on tallentamattomia muutoksia, haluatko varmasti siirty\u00e4 toiselle sivulle?",
-"Restore last draft": "Palauta aiempi luonnos",
-"Special character": "Erikoismerkki",
-"Source code": "L\u00e4hdekoodi",
-"Insert\/Edit code sample": "Lis\u00e4\u00e4\/muokkaa koodiesimerkki",
-"Language": "Kieli",
-"Code sample": "Koodiesimerkki",
-"Color": "V\u00e4ri",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Vasemmalta oikealle",
-"Right to left": "Oikealta vasemmalle",
-"Emoticons": "Hymi\u00f6t",
-"Document properties": "Dokumentin ominaisuudet",
-"Title": "Otsikko",
-"Keywords": "Avainsanat",
-"Description": "Kuvaus",
-"Robots": "Robotit",
-"Author": "Tekij\u00e4",
-"Encoding": "Merkist\u00f6",
-"Fullscreen": "Koko ruutu",
-"Action": "Toiminto",
-"Shortcut": "Oikotie",
-"Help": "Ohje",
-"Address": "Osoite",
-"Focus to menubar": "Kohdistus valikkoon",
-"Focus to toolbar": "Kohdistus ty\u00f6kalupalkkiin",
-"Focus to element path": "Kohdistus elementtiin",
-"Focus to contextual toolbar": "Kohdistus kontekstuaaliseen ty\u00f6kalupalkkiin",
-"Insert link (if link plugin activated)": "Lis\u00e4\u00e4 linkki (jos linkki-liit\u00e4nn\u00e4inen aktiivinen)",
-"Save (if save plugin activated)": "Tallenna (jos tallenna-liit\u00e4nn\u00e4inen aktiivinen)",
-"Find (if searchreplace plugin activated)": "Etsi (jos etsikorvaa-liit\u00e4nn\u00e4inen aktiivinen)",
-"Plugins installed ({0}):": "Asennetut liit\u00e4nn\u00e4iset ({0}):",
-"Premium plugins:": "Premium liit\u00e4nn\u00e4iset:",
-"Learn more...": "Lis\u00e4tietoja...",
-"You are using {0}": "K\u00e4yt\u00e4t {0}",
-"Plugins": "Liit\u00e4nn\u00e4iset",
-"Handy Shortcuts": "K\u00e4tev\u00e4t pikan\u00e4pp\u00e4imet",
-"Horizontal line": "Vaakasuora viiva",
-"Insert\/edit image": "Lis\u00e4\u00e4\/muokkaa kuva",
-"Image description": "Kuvaus",
-"Source": "L\u00e4hde",
-"Dimensions": "Mittasuhteet",
-"Constrain proportions": "S\u00e4ilyt\u00e4 mittasuhteet",
-"General": "Yleiset",
-"Advanced": "Lis\u00e4asetukset",
-"Style": "Tyyli",
-"Vertical space": "Vertikaalinen tila",
-"Horizontal space": "Horisontaalinen tila",
-"Border": "Reunus",
-"Insert image": "Lis\u00e4\u00e4 kuva",
-"Image": "Kuva",
-"Image list": "Kuvalista",
-"Rotate counterclockwise": "Kierr\u00e4 vastap\u00e4iv\u00e4\u00e4n",
-"Rotate clockwise": "Kierr\u00e4 my\u00f6t\u00e4p\u00e4iv\u00e4\u00e4n",
-"Flip vertically": "K\u00e4\u00e4nn\u00e4 pystysuunnassa",
-"Flip horizontally": "K\u00e4\u00e4nn\u00e4 vaakasuunnassa",
-"Edit image": "Muokkaa kuvaa",
-"Image options": "Kuvan asetukset",
-"Zoom in": "L\u00e4henn\u00e4",
-"Zoom out": "Loitonna",
-"Crop": "Rajaa valintaan",
-"Resize": "Kuvan koon muutos",
-"Orientation": "Suunta",
-"Brightness": "Kirkkaus",
-"Sharpen": "Ter\u00e4vyys",
-"Contrast": "Kontrasti",
-"Color levels": "V\u00e4ritasot",
-"Gamma": "Gamma",
-"Invert": "K\u00e4\u00e4nteinen",
-"Apply": "Aseta",
-"Back": "Takaisin",
-"Insert date\/time": "Lis\u00e4\u00e4 p\u00e4iv\u00e4m\u00e4\u00e4r\u00e4 tai aika",
-"Date\/time": "P\u00e4iv\u00e4m\u00e4\u00e4r\u00e4\/aika",
-"Insert link": "Lis\u00e4\u00e4 linkki",
-"Insert\/edit link": "Lis\u00e4\u00e4\/muokkaa linkki",
-"Text to display": "N\u00e4ytett\u00e4v\u00e4 teksti",
-"Url": "Osoite",
-"Target": "Kohde",
-"None": "Ei mit\u00e4\u00e4n",
-"New window": "Uusi ikkuna",
-"Remove link": "Poista linkki",
-"Anchors": "Ankkurit",
-"Link": "Linkki",
-"Paste or type a link": "Sijoita tai kirjoita linkki",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Antamasi osoite n\u00e4ytt\u00e4\u00e4 olevan s\u00e4hk\u00f6postiosoite. Haluatko lis\u00e4t\u00e4 osoitteeseen vaaditun mailto: -etuliitteen?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Antamasi osoite n\u00e4ytt\u00e4\u00e4 olevan ulkoinen linkki. Haluatko lis\u00e4t\u00e4 osoitteeseen vaaditun http:\/\/ -etuliitteen?",
-"Link list": "Linkkilista",
-"Insert video": "Lis\u00e4\u00e4 video",
-"Insert\/edit video": "Lis\u00e4\u00e4\/muokkaa video",
-"Insert\/edit media": "Lis\u00e4\u00e4\/muokkaa media",
-"Alternative source": "Vaihtoehtoinen l\u00e4hde",
-"Poster": "L\u00e4hett\u00e4j\u00e4",
-"Paste your embed code below:": "Liit\u00e4 upotuskoodisi alapuolelle:",
-"Embed": "Upota",
-"Media": "Media",
-"Nonbreaking space": "Sitova v\u00e4lily\u00f6nti",
-"Page break": "Sivunvaihto",
-"Paste as text": "Liit\u00e4 tekstin\u00e4",
-"Preview": "Esikatselu",
-"Print": "Tulosta",
-"Save": "Tallenna",
-"Find": "Etsi",
-"Replace with": "Korvaa",
-"Replace": "Korvaa",
-"Replace all": "Korvaa kaikki",
-"Prev": "Edel.",
-"Next": "Seur.",
-"Find and replace": "Etsi ja korvaa",
-"Could not find the specified string.": "Haettua merkkijonoa ei l\u00f6ytynyt.",
-"Match case": "Erota isot ja pienet kirjaimet",
-"Whole words": "Koko sanat",
-"Spellcheck": "Oikolue",
-"Ignore": "\u00c4l\u00e4 huomioi",
-"Ignore all": "\u00c4l\u00e4 huomioi mit\u00e4\u00e4n",
-"Finish": "Lopeta",
-"Add to Dictionary": "Lis\u00e4\u00e4 sanakirjaan",
-"Insert table": "Lis\u00e4\u00e4 taulukko",
-"Table properties": "Taulukon ominaisuudet",
-"Delete table": "Poista taulukko",
-"Cell": "Solu",
-"Row": "Rivi",
-"Column": "Sarake",
-"Cell properties": "Solun ominaisuudet",
-"Merge cells": "Yhdist\u00e4 solut",
-"Split cell": "Jaa solu",
-"Insert row before": "Lis\u00e4\u00e4 rivi ennen",
-"Insert row after": "Lis\u00e4\u00e4 rivi j\u00e4lkeen",
-"Delete row": "Poista rivi",
-"Row properties": "Rivin ominaisuudet",
-"Cut row": "Leikkaa rivi",
-"Copy row": "Kopioi rivi",
-"Paste row before": "Liit\u00e4 rivi ennen",
-"Paste row after": "Liit\u00e4 rivi j\u00e4lkeen",
-"Insert column before": "Lis\u00e4\u00e4 rivi ennen",
-"Insert column after": "Lis\u00e4\u00e4 rivi j\u00e4lkeen",
-"Delete column": "Poista sarake",
-"Cols": "Sarakkeet",
-"Rows": "Rivit",
-"Width": "Leveys",
-"Height": "Korkeus",
-"Cell spacing": "Solun v\u00e4li",
-"Cell padding": "Solun tyhj\u00e4 tila",
-"Caption": "Seloste",
-"Left": "Vasen",
-"Center": "Keskell\u00e4",
-"Right": "Oikea",
-"Cell type": "Solun tyyppi",
-"Scope": "Laajuus",
-"Alignment": "Tasaus",
-"H Align": "H tasaus",
-"V Align": "V tasaus",
-"Top": "Yl\u00e4reuna",
-"Middle": "Keskikohta",
-"Bottom": "Alareuna",
-"Header cell": "Otsikkosolu",
-"Row group": "Riviryhm\u00e4",
-"Column group": "Sarakeryhm\u00e4",
-"Row type": "Rivityyppi",
-"Header": "Otsikko",
-"Body": "Runko",
-"Footer": "Alaosa",
-"Border color": "Reunuksen v\u00e4ri",
-"Insert template": "Lis\u00e4\u00e4 pohja",
-"Templates": "Pohjat",
-"Template": "Pohja",
-"Text color": "Tekstin v\u00e4ri",
-"Background color": "Taustan v\u00e4ri",
-"Custom...": "Mukauta...",
-"Custom color": "Mukautettu v\u00e4ri",
-"No color": "Ei v\u00e4ri\u00e4",
-"Table of Contents": "Sis\u00e4llysluettelo",
-"Show blocks": "N\u00e4yt\u00e4 lohkot",
-"Show invisible characters": "N\u00e4yt\u00e4 n\u00e4kym\u00e4tt\u00f6m\u00e4t merkit",
-"Words: {0}": "Sanat: {0}",
-"{0} words": "{0} sanaa",
-"File": "Tiedosto",
-"Edit": "Muokkaa",
-"Insert": "Lis\u00e4\u00e4",
-"View": "N\u00e4yt\u00e4",
-"Format": "Muotoilu",
-"Table": "Taulukko",
-"Tools": "Ty\u00f6kalut",
-"Powered by {0}": "Tehty {0}:ll\u00e4",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rikastetun tekstin alue. Paina ALT-F9 valikkoon. Paina ALT-F10 ty\u00f6kaluriviin. Paina ALT-0 ohjeeseen."
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr.js
deleted file mode 100644
index d61015efa0..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr.js
+++ /dev/null
@@ -1,389 +0,0 @@
-tinymce.addI18n('fr_FR',{
-"Redo": "R\u00e9tablir",
-"Undo": "Annuler",
-"Cut": "Couper",
-"Copy": "Copier",
-"Paste": "Coller",
-"Select all": "S\u00e9lectionner tout",
-"New document": "Nouveau document",
-"Ok": "OK",
-"Cancel": "Annuler",
-"Visual aids": "Aides visuelles",
-"Bold": "Gras",
-"Italic": "Italique",
-"Underline": "Soulign\u00e9",
-"Strikethrough": "Barr\u00e9",
-"Superscript": "Exposant",
-"Subscript": "Indice",
-"Clear formatting": "Effacer la mise en forme",
-"Align left": "Aligner \u00e0 gauche",
-"Align center": "Centrer",
-"Align right": "Aligner \u00e0 droite",
-"Justify": "Justifier",
-"Bullet list": "Liste \u00e0 puces",
-"Numbered list": "Liste num\u00e9rot\u00e9e",
-"Decrease indent": "R\u00e9duire le retrait",
-"Increase indent": "Augmenter le retrait",
-"Close": "Fermer",
-"Formats": "Formats",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Votre navigateur ne supporte pas l\u2019acc\u00e8s direct au presse-papiers. Merci d'utiliser les raccourcis clavier Ctrl+X\/C\/V.",
-"Headers": "En-t\u00eates",
-"Header 1": "En-t\u00eate 1",
-"Header 2": "En-t\u00eate 2",
-"Header 3": "En-t\u00eate 3",
-"Header 4": "En-t\u00eate 4",
-"Header 5": "En-t\u00eate 5",
-"Header 6": "En-t\u00eate 6",
-"Headings": "Titres",
-"Heading 1": "Titre\u00a01",
-"Heading 2": "Titre\u00a02",
-"Heading 3": "Titre\u00a03",
-"Heading 4": "Titre\u00a04",
-"Heading 5": "Titre\u00a05",
-"Heading 6": "Titre\u00a06",
-"Preformatted": "Pr\u00e9format\u00e9",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Code",
-"Paragraph": "Paragraphe",
-"Blockquote": "Blockquote",
-"Inline": "En ligne",
-"Blocks": "Blocs",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Le presse-papiers est maintenant en mode \"texte plein\". Les contenus seront coll\u00e9s sans retenir les formatages jusqu'\u00e0 ce que vous d\u00e9sactiviez cette option.",
-"Fonts": "Polices",
-"Font Sizes": "Tailles de police",
-"Class": "Classe",
-"Browse for an image": "Rechercher une image",
-"OR": "OU",
-"Drop an image here": "D\u00e9poser une image ici",
-"Upload": "T\u00e9l\u00e9charger",
-"Block": "Bloc",
-"Align": "Aligner",
-"Default": "Par d\u00e9faut",
-"Circle": "Cercle",
-"Disc": "Disque",
-"Square": "Carr\u00e9",
-"Lower Alpha": "Alpha minuscule",
-"Lower Greek": "Grec minuscule",
-"Lower Roman": "Romain minuscule",
-"Upper Alpha": "Alpha majuscule",
-"Upper Roman": "Romain majuscule",
-"Anchor...": "Ancre...",
-"Name": "Nom",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "L'Id doit commencer par une lettre suivi par des lettres, nombres, tirets, points, deux-points ou underscores",
-"You have unsaved changes are you sure you want to navigate away?": "Vous avez des modifications non enregistr\u00e9es, \u00eates-vous s\u00fbr de quitter la page?",
-"Restore last draft": "Restaurer le dernier brouillon",
-"Special characters...": "Caract\u00e8res sp\u00e9ciaux...",
-"Source code": "Code source",
-"Insert\/Edit code sample": "Ins\u00e9rer \/ modifier une exemple de code",
-"Language": "Langue",
-"Code sample...": "Exemple de code...",
-"Color Picker": "S\u00e9lecteur de couleurs",
-"R": "R",
-"G": "V",
-"B": "B",
-"Left to right": "Gauche \u00e0 droite",
-"Right to left": "Droite \u00e0 gauche",
-"Emoticons...": "\u00c9motic\u00f4nes...",
-"Metadata and Document Properties": "M\u00e9tadonn\u00e9es et propri\u00e9t\u00e9s du document",
-"Title": "Titre",
-"Keywords": "Mots-cl\u00e9s",
-"Description": "Description",
-"Robots": "Robots",
-"Author": "Auteur",
-"Encoding": "Encodage",
-"Fullscreen": "Plein \u00e9cran",
-"Action": "Action",
-"Shortcut": "Raccourci",
-"Help": "Aide",
-"Address": "Adresse",
-"Focus to menubar": "Cibler la barre de menu",
-"Focus to toolbar": "Cibler la barre d'outils",
-"Focus to element path": "Cibler le chemin vers l'\u00e9l\u00e9ment",
-"Focus to contextual toolbar": "Cibler la barre d'outils contextuelle",
-"Insert link (if link plugin activated)": "Ins\u00e9rer un lien (si le module link est activ\u00e9)",
-"Save (if save plugin activated)": "Enregistrer (si le module save est activ\u00e9)",
-"Find (if searchreplace plugin activated)": "Rechercher (si le module searchreplace est activ\u00e9)",
-"Plugins installed ({0}):": "Modules install\u00e9s ({0}) : ",
-"Premium plugins:": "Modules premium :",
-"Learn more...": "En savoir plus...",
-"You are using {0}": "Vous utilisez {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Raccourcis utiles",
-"Horizontal line": "Ligne horizontale",
-"Insert\/edit image": "Ins\u00e9rer\/modifier une image",
-"Image description": "Description de l'image",
-"Source": "Source",
-"Dimensions": "Dimensions",
-"Constrain proportions": "Conserver les proportions",
-"General": "G\u00e9n\u00e9ral",
-"Advanced": "Avanc\u00e9",
-"Style": "Style",
-"Vertical space": "Espacement vertical",
-"Horizontal space": "Espacement horizontal",
-"Border": "Bordure",
-"Insert image": "Ins\u00e9rer une image",
-"Image...": "Image...",
-"Image list": "Liste d'images",
-"Rotate counterclockwise": "Rotation anti-horaire",
-"Rotate clockwise": "Rotation horaire",
-"Flip vertically": "Retournement vertical",
-"Flip horizontally": "Retournement horizontal",
-"Edit image": "Modifier l'image",
-"Image options": "Options de l'image",
-"Zoom in": "Zoomer",
-"Zoom out": "D\u00e9zoomer",
-"Crop": "Rogner",
-"Resize": "Redimensionner",
-"Orientation": "Orientation",
-"Brightness": "Luminosit\u00e9",
-"Sharpen": "Affiner",
-"Contrast": "Contraste",
-"Color levels": "Niveaux de couleur",
-"Gamma": "Gamma",
-"Invert": "Inverser",
-"Apply": "Appliquer",
-"Back": "Retour",
-"Insert date\/time": "Ins\u00e9rer date\/heure",
-"Date\/time": "Date\/heure",
-"Insert\/Edit Link": "Ins\u00e9rer\/Modifier lien",
-"Insert\/edit link": "Ins\u00e9rer\/modifier un lien",
-"Text to display": "Texte \u00e0 afficher",
-"Url": "URL",
-"Open link in...": "Ouvrir le lien dans...",
-"Current window": "Fen\u00eatre active",
-"None": "n\/a",
-"New window": "Nouvelle fen\u00eatre",
-"Remove link": "Enlever le lien",
-"Anchors": "Ancres",
-"Link...": "Lien...",
-"Paste or type a link": "Coller ou taper un lien",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre une adresse e-mail. Voulez-vous ajouter le pr\u00e9fixe mailto: n\u00e9cessaire?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre un lien externe. Voulez-vous ajouter le pr\u00e9fixe http:\/\/ n\u00e9cessaire?",
-"Link list": "Liste de liens",
-"Insert video": "Ins\u00e9rer une vid\u00e9o",
-"Insert\/edit video": "Ins\u00e9rer\/modifier une vid\u00e9o",
-"Insert\/edit media": "Ins\u00e9rer\/modifier un m\u00e9dia",
-"Alternative source": "Source alternative",
-"Alternative source URL": "URL de la source alternative",
-"Media poster (Image URL)": "Affiche de m\u00e9dia (URL de l'image)",
-"Paste your embed code below:": "Collez votre code d'int\u00e9gration ci-dessous :",
-"Embed": "Int\u00e9grer",
-"Media...": "M\u00e9dia...",
-"Nonbreaking space": "Espace ins\u00e9cable",
-"Page break": "Saut de page",
-"Paste as text": "Coller comme texte",
-"Preview": "Pr\u00e9visualiser",
-"Print...": "Imprimer...",
-"Save": "Enregistrer",
-"Find": "Chercher",
-"Replace with": "Remplacer par",
-"Replace": "Remplacer",
-"Replace all": "Tout remplacer",
-"Previous": "Pr\u00e9c\u00e9dente",
-"Next": "Suiv",
-"Find and replace...": "Trouver et remplacer...",
-"Could not find the specified string.": "Impossible de trouver la cha\u00eene sp\u00e9cifi\u00e9e.",
-"Match case": "Respecter la casse",
-"Find whole words only": "Mot entier",
-"Spell check": "V\u00e9rification de l'orthographe",
-"Ignore": "Ignorer",
-"Ignore all": "Tout ignorer",
-"Finish": "Finie",
-"Add to Dictionary": "Ajouter au dictionnaire",
-"Insert table": "Ins\u00e9rer un tableau",
-"Table properties": "Propri\u00e9t\u00e9s du tableau",
-"Delete table": "Supprimer le tableau",
-"Cell": "Cellule",
-"Row": "Ligne",
-"Column": "Colonne",
-"Cell properties": "Propri\u00e9t\u00e9s de la cellule",
-"Merge cells": "Fusionner les cellules",
-"Split cell": "Diviser la cellule",
-"Insert row before": "Ins\u00e9rer une ligne avant",
-"Insert row after": "Ins\u00e9rer une ligne apr\u00e8s",
-"Delete row": "Effacer la ligne",
-"Row properties": "Propri\u00e9t\u00e9s de la ligne",
-"Cut row": "Couper la ligne",
-"Copy row": "Copier la ligne",
-"Paste row before": "Coller la ligne avant",
-"Paste row after": "Coller la ligne apr\u00e8s",
-"Insert column before": "Ins\u00e9rer une colonne avant",
-"Insert column after": "Ins\u00e9rer une colonne apr\u00e8s",
-"Delete column": "Effacer la colonne",
-"Cols": "Colonnes",
-"Rows": "Lignes",
-"Width": "Largeur",
-"Height": "Hauteur",
-"Cell spacing": "Espacement inter-cellulles",
-"Cell padding": "Espacement interne cellule",
-"Show caption": "Afficher le sous-titrage",
-"Left": "Gauche",
-"Center": "Centr\u00e9",
-"Right": "Droite",
-"Cell type": "Type de cellule",
-"Scope": "Etendue",
-"Alignment": "Alignement",
-"H Align": "Alignement H",
-"V Align": "Alignement V",
-"Top": "Haut",
-"Middle": "Milieu",
-"Bottom": "Bas",
-"Header cell": "Cellule d'en-t\u00eate",
-"Row group": "Groupe de lignes",
-"Column group": "Groupe de colonnes",
-"Row type": "Type de ligne",
-"Header": "En-t\u00eate",
-"Body": "Corps",
-"Footer": "Pied",
-"Border color": "Couleur de la bordure",
-"Insert template...": "Ins\u00e9rer un mod\u00e8le...",
-"Templates": "Th\u00e8mes",
-"Template": "Mod\u00e8le",
-"Text color": "Couleur du texte",
-"Background color": "Couleur d'arri\u00e8re-plan",
-"Custom...": "Personnalis\u00e9...",
-"Custom color": "Couleur personnalis\u00e9e",
-"No color": "Aucune couleur",
-"Remove color": "Supprimer la couleur",
-"Table of Contents": "Table des mati\u00e8res",
-"Show blocks": "Afficher les blocs",
-"Show invisible characters": "Afficher les caract\u00e8res invisibles",
-"Word count": "Nombre de mots",
-"Words: {0}": "Mots : {0}",
-"{0} words": "{0} mots",
-"File": "Fichier",
-"Edit": "Editer",
-"Insert": "Ins\u00e9rer",
-"View": "Voir",
-"Format": "Format",
-"Table": "Tableau",
-"Tools": "Outils",
-"Powered by {0}": "Propuls\u00e9 par {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zone Texte Riche. Appuyer sur ALT-F9 pour le menu. Appuyer sur ALT-F10 pour la barre d'outils. Appuyer sur ALT-0 pour de l'aide.",
-"Image title": "Titre d'image",
-"Border width": "\u00c9paisseur de la bordure",
-"Border style": "Style de la bordure",
-"Error": "Erreur",
-"Warn": "Avertir",
-"Valid": "Valide",
-"To open the popup, press Shift+Enter": "Pour ouvrir la popup, appuyez sur Maj+Entr\u00e9e",
-"Rich Text Area. Press ALT-0 for help.": "Zone de texte riche. Appuyez sur ALT-0 pour l'aide.",
-"System Font": "Police syst\u00e8me",
-"Failed to upload image: {0}": "\u00c9chec d'envoi de l'image\u00a0: {0}",
-"Failed to load plugin: {0} from url {1}": "\u00c9chec de chargement du plug-in\u00a0: {0} \u00e0 partir de l\u2019URL {1} ",
-"Failed to load plugin url: {0}": "\u00c9chec de chargement de l'URL du plug-in\u00a0: {0}",
-"Failed to initialize plugin: {0}": "\u00c9chec d'initialisation du plug-in\u00a0: {0}",
-"example": "exemple",
-"Search": "Rechercher",
-"All": "Tout",
-"Currency": "Devise",
-"Text": "Texte",
-"Quotations": "Citations",
-"Mathematical": "Op\u00e9rateurs math\u00e9matiques",
-"Extended Latin": "Latin \u00e9tendu",
-"Symbols": "Symboles",
-"Arrows": "Fl\u00e8ches",
-"User Defined": "D\u00e9fini par l'utilisateur",
-"dollar sign": "Symbole dollar",
-"currency sign": "Symbole devise",
-"euro-currency sign": "Symbole euro",
-"colon sign": "Symbole col\u00f3n",
-"cruzeiro sign": "Symbole cruzeiro",
-"french franc sign": "Symbole franc fran\u00e7ais",
-"lira sign": "Symbole lire",
-"mill sign": "Symbole milli\u00e8me",
-"naira sign": "Symbole naira",
-"peseta sign": "Symbole peseta",
-"rupee sign": "Symbole roupie",
-"won sign": "Symbole won",
-"new sheqel sign": "Symbole nouveau ch\u00e9kel",
-"dong sign": "Symbole dong",
-"kip sign": "Symbole kip",
-"tugrik sign": "Symbole tougrik",
-"drachma sign": "Symbole drachme",
-"german penny symbol": "Symbole pfennig",
-"peso sign": "Symbole peso",
-"guarani sign": "Symbole guarani",
-"austral sign": "Symbole austral",
-"hryvnia sign": "Symbole hryvnia",
-"cedi sign": "Symbole cedi",
-"livre tournois sign": "Symbole livre tournois",
-"spesmilo sign": "Symbole spesmilo",
-"tenge sign": "Symbole tenge",
-"indian rupee sign": "Symbole roupie indienne",
-"turkish lira sign": "Symbole lire turque",
-"nordic mark sign": "Symbole du mark nordique",
-"manat sign": "Symbole manat",
-"ruble sign": "Symbole rouble",
-"yen character": "Sinogramme Yen",
-"yuan character": "Sinogramme Yuan",
-"yuan character, in hong kong and taiwan": "Sinogramme Yuan, Hong Kong et Taiwan",
-"yen\/yuan character variant one": "Sinogramme Yen\/Yuan, premi\u00e8re variante",
-"Loading emoticons...": "Chargement des \u00e9motic\u00f4nes en cours...",
-"Could not load emoticons": "\u00c9chec de chargement des \u00e9motic\u00f4nes",
-"People": "Personnes",
-"Animals and Nature": "Animaux & nature",
-"Food and Drink": "Nourriture & boissons",
-"Activity": "Activit\u00e9",
-"Travel and Places": "Voyages & lieux",
-"Objects": "Objets",
-"Flags": "Drapeaux",
-"Characters": "Caract\u00e8res",
-"Characters (no spaces)": "Caract\u00e8res (espaces non compris)",
-"Error: Form submit field collision.": "Erreur : conflit de champs lors de la soumission du formulaire",
-"Error: No form element found.": "Erreur : aucun \u00e9l\u00e9ment de formulaire trouv\u00e9.",
-"Update": "Mettre \u00e0 jour",
-"Color swatch": "\u00c9chantillon de couleurs",
-"Turquoise": "Turquoise",
-"Green": "Vert",
-"Blue": "Bleu",
-"Purple": "Violet",
-"Navy Blue": "Bleu marine",
-"Dark Turquoise": "Turquoise fonc\u00e9",
-"Dark Green": "Vert fonc\u00e9",
-"Medium Blue": "Bleu moyen",
-"Medium Purple": "Violet moyen",
-"Midnight Blue": "Bleu de minuit",
-"Yellow": "Jaune",
-"Orange": "Orange",
-"Red": "Rouge",
-"Light Gray": "Gris clair",
-"Gray": "Gris",
-"Dark Yellow": "Jaune fonc\u00e9",
-"Dark Orange": "Orange fonc\u00e9",
-"Dark Red": "Rouge fonc\u00e9",
-"Medium Gray": "Gris moyen",
-"Dark Gray": "Gris fonc\u00e9",
-"Black": "Noir",
-"White": "Blanc",
-"Switch to or from fullscreen mode": "Passer en ou quitter le mode plein \u00e9cran",
-"Open help dialog": "Ouvrir la bo\u00eete de dialogue d'aide",
-"history": "historique",
-"styles": "styles",
-"formatting": "mise en forme",
-"alignment": "alignement",
-"indentation": "retrait",
-"permanent pen": "feutre ind\u00e9l\u00e9bile",
-"comments": "commentaires",
-"Anchor": "Ancre",
-"Special character": "Caract\u00e8res sp\u00e9ciaux",
-"Code sample": "Extrait de code",
-"Color": "Couleur",
-"Emoticons": "Emotic\u00f4nes",
-"Document properties": "Propri\u00e9t\u00e9 du document",
-"Image": "Image",
-"Insert link": "Ins\u00e9rer un lien",
-"Target": "Cible",
-"Link": "Lien",
-"Poster": "Publier",
-"Media": "M\u00e9dia",
-"Print": "Imprimer",
-"Prev": "Pr\u00e9c ",
-"Find and replace": "Trouver et remplacer",
-"Whole words": "Mots entiers",
-"Spellcheck": "V\u00e9rification orthographique",
-"Caption": "Titre",
-"Insert template": "Ajouter un th\u00e8me"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr_FR.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr_FR.js
deleted file mode 100644
index 5ed177c9fc..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr_FR.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('fr_FR',{
-"Redo": "R\u00e9tablir",
-"Undo": "Annuler",
-"Cut": "Couper",
-"Copy": "Copier",
-"Paste": "Coller",
-"Select all": "Tout s\u00e9lectionner",
-"New document": "Nouveau document",
-"Ok": "Ok",
-"Cancel": "Annuler",
-"Visual aids": "Aides visuelle",
-"Bold": "Gras",
-"Italic": "Italique",
-"Underline": "Soulign\u00e9",
-"Strikethrough": "Barr\u00e9",
-"Superscript": "Exposant",
-"Subscript": "Indice",
-"Clear formatting": "Effacer la mise en forme",
-"Align left": "Aligner \u00e0 gauche",
-"Align center": "Centrer",
-"Align right": "Aligner \u00e0 droite",
-"Justify": "Justifier",
-"Bullet list": "Puces",
-"Numbered list": "Num\u00e9rotation",
-"Decrease indent": "Diminuer le retrait",
-"Increase indent": "Augmenter le retrait",
-"Close": "Fermer",
-"Formats": "Formats",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Votre navigateur ne supporte pas la copie directe. Merci d'utiliser les touches Ctrl+X\/C\/V.",
-"Headers": "Titres",
-"Header 1": "Titre 1",
-"Header 2": "Titre 2",
-"Header 3": "Titre 3",
-"Header 4": "Titre 4",
-"Header 5": "Titre 5",
-"Header 6": "Titre 6",
-"Headings": "En-t\u00eates",
-"Heading 1": "En-t\u00eate 1",
-"Heading 2": "En-t\u00eate 2",
-"Heading 3": "En-t\u00eate 3",
-"Heading 4": "En-t\u00eate 4",
-"Heading 5": "En-t\u00eate 5",
-"Heading 6": "En-t\u00eate 6",
-"Preformatted": "Pr\u00e9-formatt\u00e9",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Code",
-"Paragraph": "Paragraphe",
-"Blockquote": "Citation",
-"Inline": "En ligne",
-"Blocks": "Blocs",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Le presse-papiers est maintenant en mode \"texte plein\". Les contenus seront coll\u00e9s sans retenir les formatages jusqu'\u00e0 ce que vous d\u00e9sactiviez cette option.",
-"Font Family": "Police",
-"Font Sizes": "Taille de police",
-"Class": "Classe",
-"Browse for an image": "Parcourir pour s\u00e9lectionner une image",
-"OR": "OU",
-"Drop an image here": "Glisser une image ici",
-"Upload": "D\u00e9poser",
-"Block": "Bloquer",
-"Align": "Aligner",
-"Default": "Par d\u00e9faut",
-"Circle": "Cercle",
-"Disc": "Disque",
-"Square": "Carr\u00e9",
-"Lower Alpha": "Alpha minuscule",
-"Lower Greek": "Grec minuscule",
-"Lower Roman": "Romain minuscule",
-"Upper Alpha": "Alpha majuscule",
-"Upper Roman": "Romain majuscule",
-"Anchor": "Ancre",
-"Name": "Nom",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "L'Id doit commencer par une lettre suivi par des lettres, nombres, tirets, points, deux-points ou underscores",
-"You have unsaved changes are you sure you want to navigate away?": "Vous avez des modifications non enregistr\u00e9es, \u00eates-vous s\u00fbr de quitter la page?",
-"Restore last draft": "Restaurer le dernier brouillon",
-"Special character": "Caract\u00e8res sp\u00e9ciaux",
-"Source code": "Code source",
-"Insert\/Edit code sample": "Ins\u00e9rer \/ modifier une exemple de code",
-"Language": "Langue",
-"Code sample": "Extrait de code",
-"Color": "Couleur",
-"R": "R",
-"G": "V",
-"B": "B",
-"Left to right": "Gauche \u00e0 droite",
-"Right to left": "Droite \u00e0 gauche",
-"Emoticons": "Emotic\u00f4nes",
-"Document properties": "Propri\u00e9t\u00e9 du document",
-"Title": "Titre",
-"Keywords": "Mots-cl\u00e9s",
-"Description": "Description",
-"Robots": "Robots",
-"Author": "Auteur",
-"Encoding": "Encodage",
-"Fullscreen": "Plein \u00e9cran",
-"Action": "Action",
-"Shortcut": "Raccourci",
-"Help": "Aide",
-"Address": "Adresse",
-"Focus to menubar": "Cibler la barre de menu",
-"Focus to toolbar": "Cibler la barre d'outils",
-"Focus to element path": "Cibler le chemin vers l'\u00e9l\u00e9ment",
-"Focus to contextual toolbar": "Cibler la barre d'outils contextuelle",
-"Insert link (if link plugin activated)": "Ins\u00e9rer un lien (si le module link est activ\u00e9)",
-"Save (if save plugin activated)": "Enregistrer (si le module save est activ\u00e9)",
-"Find (if searchreplace plugin activated)": "Rechercher (si le module searchreplace est activ\u00e9)",
-"Plugins installed ({0}):": "Modules install\u00e9s ({0}) : ",
-"Premium plugins:": "Modules premium :",
-"Learn more...": "En savoir plus...",
-"You are using {0}": "Vous utilisez {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Raccourcis utiles",
-"Horizontal line": "Ligne horizontale",
-"Insert\/edit image": "Ins\u00e9rer\/modifier une image",
-"Image description": "Description de l'image",
-"Source": "Source",
-"Dimensions": "Dimensions",
-"Constrain proportions": "Conserver les proportions",
-"General": "G\u00e9n\u00e9ral",
-"Advanced": "Avanc\u00e9",
-"Style": "Style",
-"Vertical space": "Espacement vertical",
-"Horizontal space": "Espacement horizontal",
-"Border": "Bordure",
-"Insert image": "Ins\u00e9rer une image",
-"Image": "Image",
-"Image list": "Liste d'images",
-"Rotate counterclockwise": "Rotation anti-horaire",
-"Rotate clockwise": "Rotation horaire",
-"Flip vertically": "Retournement vertical",
-"Flip horizontally": "Retournement horizontal",
-"Edit image": "Modifier l'image",
-"Image options": "Options de l'image",
-"Zoom in": "Zoomer",
-"Zoom out": "D\u00e9zoomer",
-"Crop": "Rogner",
-"Resize": "Redimensionner",
-"Orientation": "Orientation",
-"Brightness": "Luminosit\u00e9",
-"Sharpen": "Affiner",
-"Contrast": "Contraste",
-"Color levels": "Niveaux de couleur",
-"Gamma": "Gamma",
-"Invert": "Inverser",
-"Apply": "Appliquer",
-"Back": "Retour",
-"Insert date\/time": "Ins\u00e9rer date\/heure",
-"Date\/time": "Date\/heure",
-"Insert link": "Ins\u00e9rer un lien",
-"Insert\/edit link": "Ins\u00e9rer\/modifier un lien",
-"Text to display": "Texte \u00e0 afficher",
-"Url": "URL",
-"Target": "Cible",
-"None": "n\/a",
-"New window": "Nouvelle fen\u00eatre",
-"Remove link": "Enlever le lien",
-"Anchors": "Ancres",
-"Link": "Lien",
-"Paste or type a link": "Coller ou taper un lien",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre une adresse e-mail. Voulez-vous ajouter le pr\u00e9fixe mailto: n\u00e9cessaire?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre un lien externe. Voulez-vous ajouter le pr\u00e9fixe http:\/\/ n\u00e9cessaire?",
-"Link list": "Liste de liens",
-"Insert video": "Ins\u00e9rer une vid\u00e9o",
-"Insert\/edit video": "Ins\u00e9rer\/modifier une vid\u00e9o",
-"Insert\/edit media": "Ins\u00e9rer\/modifier un m\u00e9dia",
-"Alternative source": "Source alternative",
-"Poster": "Publier",
-"Paste your embed code below:": "Collez votre code d'int\u00e9gration ci-dessous :",
-"Embed": "Int\u00e9grer",
-"Media": "M\u00e9dia",
-"Nonbreaking space": "Espace ins\u00e9cable",
-"Page break": "Saut de page",
-"Paste as text": "Coller comme texte",
-"Preview": "Pr\u00e9visualiser",
-"Print": "Imprimer",
-"Save": "Enregistrer",
-"Find": "Chercher",
-"Replace with": "Remplacer par",
-"Replace": "Remplacer",
-"Replace all": "Tout remplacer",
-"Prev": "Pr\u00e9c ",
-"Next": "Suiv",
-"Find and replace": "Trouver et remplacer",
-"Could not find the specified string.": "Impossible de trouver la cha\u00eene sp\u00e9cifi\u00e9e.",
-"Match case": "Respecter la casse",
-"Whole words": "Mots entiers",
-"Spellcheck": "V\u00e9rification orthographique",
-"Ignore": "Ignorer",
-"Ignore all": "Tout ignorer",
-"Finish": "Finie",
-"Add to Dictionary": "Ajouter au dictionnaire",
-"Insert table": "Ins\u00e9rer un tableau",
-"Table properties": "Propri\u00e9t\u00e9s du tableau",
-"Delete table": "Supprimer le tableau",
-"Cell": "Cellule",
-"Row": "Ligne",
-"Column": "Colonne",
-"Cell properties": "Propri\u00e9t\u00e9s de la cellule",
-"Merge cells": "Fusionner les cellules",
-"Split cell": "Diviser la cellule",
-"Insert row before": "Ins\u00e9rer une ligne avant",
-"Insert row after": "Ins\u00e9rer une ligne apr\u00e8s",
-"Delete row": "Effacer la ligne",
-"Row properties": "Propri\u00e9t\u00e9s de la ligne",
-"Cut row": "Couper la ligne",
-"Copy row": "Copier la ligne",
-"Paste row before": "Coller la ligne avant",
-"Paste row after": "Coller la ligne apr\u00e8s",
-"Insert column before": "Ins\u00e9rer une colonne avant",
-"Insert column after": "Ins\u00e9rer une colonne apr\u00e8s",
-"Delete column": "Effacer la colonne",
-"Cols": "Colonnes",
-"Rows": "Lignes",
-"Width": "Largeur",
-"Height": "Hauteur",
-"Cell spacing": "Espacement inter-cellulles",
-"Cell padding": "Espacement interne cellule",
-"Caption": "Titre",
-"Left": "Gauche",
-"Center": "Centr\u00e9",
-"Right": "Droite",
-"Cell type": "Type de cellule",
-"Scope": "Etendue",
-"Alignment": "Alignement",
-"H Align": "Alignement H",
-"V Align": "Alignement V",
-"Top": "Haut",
-"Middle": "Milieu",
-"Bottom": "Bas",
-"Header cell": "Cellule d'en-t\u00eate",
-"Row group": "Groupe de lignes",
-"Column group": "Groupe de colonnes",
-"Row type": "Type de ligne",
-"Header": "En-t\u00eate",
-"Body": "Corps",
-"Footer": "Pied",
-"Border color": "Couleur de la bordure",
-"Insert template": "Ajouter un th\u00e8me",
-"Templates": "Th\u00e8mes",
-"Template": "Mod\u00e8le",
-"Text color": "Couleur du texte",
-"Background color": "Couleur d'arri\u00e8re-plan",
-"Custom...": "Personnalis\u00e9...",
-"Custom color": "Couleur personnalis\u00e9e",
-"No color": "Aucune couleur",
-"Table of Contents": "Table des mati\u00e8res",
-"Show blocks": "Afficher les blocs",
-"Show invisible characters": "Afficher les caract\u00e8res invisibles",
-"Words: {0}": "Mots : {0}",
-"{0} words": "{0} mots",
-"File": "Fichier",
-"Edit": "Editer",
-"Insert": "Ins\u00e9rer",
-"View": "Voir",
-"Format": "Format",
-"Table": "Tableau",
-"Tools": "Outils",
-"Powered by {0}": "Propuls\u00e9 par {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zone Texte Riche. Appuyer sur ALT-F9 pour le menu. Appuyer sur ALT-F10 pour la barre d'outils. Appuyer sur ALT-0 pour de l'aide."
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ga.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ga.js
deleted file mode 100644
index c2a942c121..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ga.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('ga',{
-"Redo": "Athdh\u00e9an",
-"Undo": "Cealaigh",
-"Cut": "Gearr",
-"Copy": "C\u00f3ipe\u00e1il",
-"Paste": "Greamaigh",
-"Select all": "Roghnaigh uile",
-"New document": "C\u00e1ip\u00e9is nua",
-"Ok": "OK",
-"Cancel": "Cealaigh",
-"Visual aids": "\u00c1iseanna amhairc",
-"Bold": "Trom",
-"Italic": "Iod\u00e1lach",
-"Underline": "Fol\u00edne",
-"Strikethrough": "L\u00edne tr\u00edd",
-"Superscript": "Forscript",
-"Subscript": "Foscript",
-"Clear formatting": "Glan form\u00e1idi\u00fa",
-"Align left": "Ail\u00ednigh ar chl\u00e9",
-"Align center": "Ail\u00ednigh sa l\u00e1r",
-"Align right": "Ail\u00ednigh ar dheis",
-"Justify": "Comhfhadaigh",
-"Bullet list": "Liosta Urchar",
-"Numbered list": "Liosta Uimhrithe",
-"Decrease indent": "Laghdaigh eang",
-"Increase indent": "M\u00e9adaigh eang",
-"Close": "D\u00fan",
-"Formats": "Form\u00e1id\u00ed",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "N\u00ed f\u00e9idir le do bhrabhs\u00e1la\u00ed teacht go d\u00edreach ar an ngearrthaisce. Bain \u00fas\u00e1id as na haicearra\u00ed Ctrl+X\/C\/V. ",
-"Headers": "Ceannt\u00e1sca",
-"Header 1": "Ceannt\u00e1sc 1",
-"Header 2": "Ceannt\u00e1sc 2",
-"Header 3": "Ceannt\u00e1sc 3",
-"Header 4": "Ceannt\u00e1sc 4",
-"Header 5": "Ceannt\u00e1sc 5",
-"Header 6": "Ceannt\u00e1sc 6",
-"Headings": "Ceannteidil",
-"Heading 1": "Ceannteideal 1",
-"Heading 2": "Ceannteideal 2",
-"Heading 3": "Ceannteideal 3",
-"Heading 4": "Ceannteideal 4",
-"Heading 5": "Ceannteideal 5",
-"Heading 6": "Ceannteideal 6",
-"Preformatted": "R\u00e9amhfhorm\u00e1idithe",
-"Div": "Deighilt",
-"Pre": "R\u00e9amh",
-"Code": "C\u00f3d",
-"Paragraph": "Alt",
-"Blockquote": "Athfhriotal",
-"Inline": "Inl\u00edne",
-"Blocks": "Blocanna",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Sa m\u00f3d gn\u00e1th-th\u00e9acs anois. Gream\u00f3far \u00e1bhar mar ghn\u00e1th-th\u00e9acs go dt\u00ed go m\u00fachfaidh t\u00fa an rogha seo.",
-"Font Family": "Cl\u00f3fhoireann",
-"Font Sizes": "Cl\u00f3mh\u00e9ideanna",
-"Class": "Aicme",
-"Browse for an image": "Brabhs\u00e1il le haghaidh \u00edomh\u00e1",
-"OR": "N\u00d3",
-"Drop an image here": "Scaoil \u00edomh\u00e1 anseo",
-"Upload": "Uasl\u00f3d\u00e1il",
-"Block": "Bloc",
-"Align": "Ail\u00ednigh",
-"Default": "R\u00e9amhshocr\u00fa",
-"Circle": "Ciorcal",
-"Disc": "Diosca",
-"Square": "Cearn\u00f3g",
-"Lower Alpha": "Alfa Beag",
-"Lower Greek": "Litir Bheag Ghr\u00e9agach",
-"Lower Roman": "Litir Bheag R\u00f3mh\u00e1nach",
-"Upper Alpha": "Alfa M\u00f3r",
-"Upper Roman": "Litir Mh\u00f3r R\u00f3mh\u00e1nach",
-"Anchor": "Ancaire",
-"Name": "Ainm",
-"Id": "Aitheantas",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "N\u00ed m\u00f3r don aitheantas tos\u00fa le litir, agus gan ach litreacha, uimhreacha, daiseanna, poncanna, idirstadanna, n\u00f3 fostr\u00edoca ina dhiaidh sin.",
-"You have unsaved changes are you sure you want to navigate away?": "T\u00e1 athruithe gan s\u00e1bh\u00e1il ann. An bhfuil t\u00fa cinnte gur mhaith leat imeacht amach as seo?",
-"Restore last draft": "Oscail an dr\u00e9acht is d\u00e9ana\u00ed",
-"Special character": "Carachtar speisialta",
-"Source code": "C\u00f3d foinseach",
-"Insert\/Edit code sample": "Cuir sampla c\u00f3id isteach\/in eagar",
-"Language": "Teanga",
-"Code sample": "Sampla c\u00f3id",
-"Color": "Dath",
-"R": "D",
-"G": "U",
-"B": "G",
-"Left to right": "Cl\u00e9-go-deas",
-"Right to left": "Deas-go-cl\u00e9",
-"Emoticons": "Straoiseoga",
-"Document properties": "Air\u00edonna na C\u00e1ip\u00e9ise",
-"Title": "Teideal",
-"Keywords": "Lorgfhocail",
-"Description": "Cur S\u00edos",
-"Robots": "R\u00f3bait",
-"Author": "\u00dadar",
-"Encoding": "Ionch\u00f3d\u00fa",
-"Fullscreen": "L\u00e1nsc\u00e1ile\u00e1n",
-"Action": "Gn\u00edomh",
-"Shortcut": "Aicearra",
-"Help": "Cabhair",
-"Address": "Seoladh",
-"Focus to menubar": "F\u00f3cas sa bharra roghchl\u00e1ir",
-"Focus to toolbar": "F\u00f3cas sa bharra uirlis\u00ed",
-"Focus to element path": "F\u00f3cas sa chonair eiliminte",
-"Focus to contextual toolbar": "F\u00f3cas sa bharra uirlis\u00ed comhth\u00e9acs\u00fail",
-"Insert link (if link plugin activated)": "Cuir nasc isteach (m\u00e1 t\u00e1 an breise\u00e1n naisc ar si\u00fal)",
-"Save (if save plugin activated)": "S\u00e1bh\u00e1il (m\u00e1 t\u00e1 an breise\u00e1n s\u00e1bh\u00e1la ar si\u00fal)",
-"Find (if searchreplace plugin activated)": "Aimsigh (m\u00e1 t\u00e1 an breise\u00e1n cuardaigh ar si\u00fal)",
-"Plugins installed ({0}):": "Breise\u00e1in shuite\u00e1ilte ({0}):",
-"Premium plugins:": "Scothbhreise\u00e1in:",
-"Learn more...": "Tuilleadh eolais...",
-"You are using {0}": "T\u00e1 t\u00fa ag \u00fas\u00e1id {0}",
-"Plugins": "Breise\u00e1in",
-"Handy Shortcuts": "Aicearra\u00ed \u00das\u00e1ideacha",
-"Horizontal line": "L\u00edne chothrom\u00e1nach",
-"Insert\/edit image": "Cuir \u00edomh\u00e1 isteach\/in eagar",
-"Image description": "Cur s\u00edos ar an \u00edomh\u00e1",
-"Source": "Foinse",
-"Dimensions": "Tois\u00ed",
-"Constrain proportions": "Comhr\u00e9ir faoi ghlas",
-"General": "Ginear\u00e1lta",
-"Advanced": "Casta",
-"Style": "St\u00edl",
-"Vertical space": "Sp\u00e1s ingearach",
-"Horizontal space": "Sp\u00e1s cothrom\u00e1nach",
-"Border": "Iml\u00edne",
-"Insert image": "Cuir \u00edomh\u00e1 isteach",
-"Image": "\u00cdomh\u00e1",
-"Image list": "Liosta \u00edomh\u00e1nna",
-"Rotate counterclockwise": "Rothlaigh ar tuathal",
-"Rotate clockwise": "Rothlaigh ar deiseal",
-"Flip vertically": "Cas go hingearach",
-"Flip horizontally": "Cas go cothrom\u00e1nach",
-"Edit image": "Cuir an \u00edomh\u00e1 in eagar",
-"Image options": "Roghanna \u00edomh\u00e1",
-"Zoom in": "Z\u00fam\u00e1il isteach",
-"Zoom out": "Z\u00fam\u00e1il amach",
-"Crop": "Bear",
-"Resize": "Athraigh m\u00e9id",
-"Orientation": "Treoshu\u00edomh",
-"Brightness": "Gile",
-"Sharpen": "G\u00e9araigh",
-"Contrast": "Codarsnacht",
-"Color levels": "Leibh\u00e9il datha",
-"Gamma": "G\u00e1ma",
-"Invert": "Inbh\u00e9artaigh",
-"Apply": "Cuir i bhfeidhm",
-"Back": "Siar",
-"Insert date\/time": "Cuir d\u00e1ta\/am isteach",
-"Date\/time": "D\u00e1ta\/am",
-"Insert link": "Cuir nasc isteach",
-"Insert\/edit link": "Cuir nasc isteach\/in eagar",
-"Text to display": "T\u00e9acs le taispe\u00e1int",
-"Url": "URL",
-"Target": "Sprioc",
-"None": "Dada",
-"New window": "Fuinneog nua",
-"Remove link": "Bain an nasc",
-"Anchors": "Ancair\u00ed",
-"Link": "Nasc",
-"Paste or type a link": "Greamaigh n\u00f3 cl\u00f3scr\u00edobh nasc",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Is seoladh r\u00edomhphoist \u00e9 an URL a chuir t\u00fa isteach. An bhfuil fonn ort an r\u00e9im\u00edr riachtanach mailto: a chur leis?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Is nasc seachtrach \u00e9 an URL a chuir t\u00fa isteach. An bhfuil fonn ort an r\u00e9im\u00edr riachtanach http:\/\/ a chur leis?",
-"Link list": "Liosta nascanna",
-"Insert video": "Cuir f\u00edse\u00e1n isteach",
-"Insert\/edit video": "Cuir f\u00edse\u00e1n isteach\/in eagar",
-"Insert\/edit media": "Cuir me\u00e1n isteach\/in eagar",
-"Alternative source": "Foinse mhalartach",
-"Poster": "P\u00f3staer",
-"Paste your embed code below:": "Greamaigh do ch\u00f3d leabaithe th\u00edos:",
-"Embed": "Leabaigh",
-"Media": "Me\u00e1in",
-"Nonbreaking space": "Sp\u00e1s neamhbhristeach",
-"Page break": "Briseadh leathanaigh",
-"Paste as text": "Greamaigh mar th\u00e9acs",
-"Preview": "R\u00e9amhamharc",
-"Print": "Priont\u00e1il",
-"Save": "S\u00e1bh\u00e1il",
-"Find": "Aimsigh",
-"Replace with": "Ionadaigh le",
-"Replace": "Ionadaigh",
-"Replace all": "Ionadaigh uile",
-"Prev": "Siar",
-"Next": "Ar aghaidh",
-"Find and replace": "Aimsigh agus ionadaigh",
-"Could not find the specified string.": "N\u00edor aims\u00edodh an teaghr\u00e1n.",
-"Match case": "C\u00e1s-\u00edogair",
-"Whole words": "Focail ioml\u00e1na",
-"Spellcheck": "Seice\u00e1il an litri\u00fa",
-"Ignore": "D\u00e9an neamhaird air",
-"Ignore all": "D\u00e9an neamhaird orthu go l\u00e9ir",
-"Finish": "Cr\u00edochnaigh",
-"Add to Dictionary": "Cuir leis an bhFocl\u00f3ir \u00e9",
-"Insert table": "Ions\u00e1igh t\u00e1bla",
-"Table properties": "Air\u00edonna an t\u00e1bla",
-"Delete table": "Scrios an t\u00e1bla",
-"Cell": "Cill",
-"Row": "R\u00f3",
-"Column": "Col\u00fan",
-"Cell properties": "Air\u00edonna na cille",
-"Merge cells": "Cumaisc cealla",
-"Split cell": "Roinn cill",
-"Insert row before": "Ions\u00e1igh r\u00f3 os a chionn",
-"Insert row after": "Ions\u00e1igh r\u00f3 faoi",
-"Delete row": "Scrios an r\u00f3",
-"Row properties": "Air\u00edonna an r\u00f3",
-"Cut row": "Gearr an r\u00f3",
-"Copy row": "C\u00f3ipe\u00e1il an r\u00f3",
-"Paste row before": "Greamaigh r\u00f3 os a chionn",
-"Paste row after": "Greamaigh r\u00f3 faoi",
-"Insert column before": "Ions\u00e1igh col\u00fan ar chl\u00e9",
-"Insert column after": "Ions\u00e1igh col\u00fan ar dheis",
-"Delete column": "Scrios an col\u00fan",
-"Cols": "Col\u00fain",
-"Rows": "R\u00f3nna",
-"Width": "Leithead",
-"Height": "Airde",
-"Cell spacing": "Sp\u00e1s\u00e1il ceall",
-"Cell padding": "Stu\u00e1il ceall",
-"Caption": "Fotheideal",
-"Left": "Ar Chl\u00e9",
-"Center": "Sa L\u00e1r",
-"Right": "Ar Dheis",
-"Cell type": "Cine\u00e1l na cille",
-"Scope": "Sc\u00f3ip",
-"Alignment": "Ail\u00edni\u00fa",
-"H Align": "Ail\u00edni\u00fa C.",
-"V Align": "Ail\u00edni\u00fa I.",
-"Top": "Barr",
-"Middle": "L\u00e1r",
-"Bottom": "Bun",
-"Header cell": "Cill cheannt\u00e1isc",
-"Row group": "Gr\u00fapa r\u00f3nna",
-"Column group": "Gr\u00fapa col\u00fan",
-"Row type": "Cine\u00e1l an r\u00f3",
-"Header": "Ceannt\u00e1sc",
-"Body": "Corp",
-"Footer": "Bunt\u00e1sc",
-"Border color": "Dath na himl\u00edne",
-"Insert template": "Ions\u00e1igh teimpl\u00e9ad",
-"Templates": "Teimpl\u00e9id",
-"Template": "Teimpl\u00e9ad",
-"Text color": "Dath an t\u00e9acs",
-"Background color": "Dath an ch\u00falra",
-"Custom...": "Saincheap...",
-"Custom color": "Dath saincheaptha",
-"No color": "Gan dath",
-"Table of Contents": "Cl\u00e1r na n\u00c1bhar",
-"Show blocks": "Taispe\u00e1in blocanna",
-"Show invisible characters": "Taispe\u00e1in carachtair dhofheicthe",
-"Words: {0}": "Focail: {0}",
-"{0} words": "{0} focal",
-"File": "Comhad",
-"Edit": "Eagar",
-"Insert": "Ions\u00e1ig",
-"View": "Amharc",
-"Format": "Form\u00e1id",
-"Table": "T\u00e1bla",
-"Tools": "Uirlis\u00ed",
-"Powered by {0}": "\u00c1 chumhacht\u00fa ag {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Limist\u00e9ar M\u00e9ith-Th\u00e9acs. Br\u00faigh ALT-F9 le haghaidh roghchl\u00e1ir, ALT-F10 le haghaidh barra uirlis\u00ed, agus ALT-0 le c\u00fanamh a fh\u00e1il"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/gl.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/gl.js
deleted file mode 100644
index 43c1900da7..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/gl.js
+++ /dev/null
@@ -1,253 +0,0 @@
-tinymce.addI18n('gl',{
-"Redo": "Refacer",
-"Undo": "Desfacer",
-"Cut": "Cortar",
-"Copy": "Copiar",
-"Paste": "Pegar",
-"Select all": "Seleccionar todo",
-"New document": "Novo documento",
-"Ok": "Aceptar",
-"Cancel": "Cancelar",
-"Visual aids": "Axudas visuais",
-"Bold": "Negra",
-"Italic": "Cursiva",
-"Underline": "Subli\u00f1ado",
-"Strikethrough": "Riscado",
-"Superscript": "Super\u00edndice",
-"Subscript": "Sub\u00edndice",
-"Clear formatting": "Limpar o formato",
-"Align left": "Ali\u00f1ar \u00e1 esquerda",
-"Align center": "Ali\u00f1ar ao centro",
-"Align right": "Ali\u00f1ar \u00e1 dereita",
-"Justify": "Xustificar",
-"Bullet list": "Lista de vi\u00f1etas",
-"Numbered list": "Lista numerada",
-"Decrease indent": "Reducir a sangr\u00eda",
-"Increase indent": "Aumentar a sangr\u00eda",
-"Close": "Pechar",
-"Formats": "Formatos",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "O seu navegador non admite o acceso directo ao portapapeis. Empregue os atallos de teclado Ctrl+X\/C\/V no seu canto.",
-"Headers": "Cabeceiras",
-"Header 1": "Cabeceira 1",
-"Header 2": "Cabeceira 2",
-"Header 3": "Cabeceira 3",
-"Header 4": "Cabeceira 4",
-"Header 5": "Cabeceira 5",
-"Header 6": "Cabeceira 6",
-"Headings": "T\u00edtulo",
-"Heading 1": "T\u00edtulo 1",
-"Heading 2": "T\u00edtulo 2",
-"Heading 3": "T\u00edtulo 3",
-"Heading 4": "T\u00edtulo 4",
-"Heading 5": "T\u00edtulo 5",
-"Heading 6": "T\u00edtulo 6",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "C\u00f3digo",
-"Paragraph": "Par\u00e1grafo",
-"Blockquote": "Bloque entre comi\u00f1as",
-"Inline": "En li\u00f1a",
-"Blocks": "Bloques",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Neste momento o pegado est\u00e1 definido en modo de texto simple. Os contidos p\u00e9garanse como texto sen formato ata que se active esta opci\u00f3n.",
-"Font Family": "Tipo de letra",
-"Font Sizes": "Tama\u00f1o da letra",
-"Class": "Clase",
-"Browse for an image": "Buscar unha imaxe",
-"OR": "OU",
-"Drop an image here": "Soltar unha imaxe",
-"Upload": "Cargar",
-"Default": "Predeterminada",
-"Circle": "Circulo",
-"Disc": "Disco",
-"Square": "Cadrado",
-"Lower Alpha": "Alfa min\u00fascula",
-"Lower Greek": "Grega min\u00fascula",
-"Lower Roman": "Romana min\u00fascula",
-"Upper Alpha": "Alfa mai\u00fascula",
-"Upper Roman": "Romana mai\u00fascula",
-"Anchor": "Ancoraxe",
-"Name": "Nome",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "O ID debe comezar cunha letra, seguida s\u00f3 por letras, n\u00fameros, gui\u00f3ns, puntos, dos puntos ou gui\u00f3ns baixos.",
-"You have unsaved changes are you sure you want to navigate away?": "Ten cambios sen gardar. Confirma que quere sa\u00edr?",
-"Restore last draft": "Restaurar o \u00faltimo borrador",
-"Special character": "Car\u00e1cter especial",
-"Source code": "C\u00f3digo fonte",
-"Insert\/Edit code sample": "Inserir\/editar mostra de c\u00f3digo",
-"Language": "Idioma",
-"Color": "Cor",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "De esquerda a dereita",
-"Right to left": "De dereita a esquerda",
-"Emoticons": "Emoticonas",
-"Document properties": "Propiedades do documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palabras clave",
-"Description": "Descrici\u00f3n",
-"Robots": "Robots",
-"Author": "Autor",
-"Encoding": "Codificaci\u00f3n",
-"Fullscreen": "Pantalla completa",
-"Action": "Action",
-"Shortcut": "Shortcut",
-"Help": "Help",
-"Address": "Address",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "Insert link (if link plugin activated)",
-"Save (if save plugin activated)": "Save (if save plugin activated)",
-"Find (if searchreplace plugin activated)": "Find (if searchreplace plugin activated)",
-"Plugins installed ({0}):": "Plugins installed ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "Learn more...",
-"You are using {0}": "You are using {0}",
-"Horizontal line": "Li\u00f1a horizontal",
-"Insert\/edit image": "Inserir\/editar imaxe",
-"Image description": "Descrici\u00f3n da imaxe",
-"Source": "Orixe",
-"Dimensions": "Dimensi\u00f3ns",
-"Constrain proportions": "Restrinxir as proporci\u00f3ns",
-"General": "Xeral",
-"Advanced": "Avanzado",
-"Style": "Estilo",
-"Vertical space": "Espazo vertical",
-"Horizontal space": "Espazo horizontal",
-"Border": "Bordo",
-"Insert image": "Inserir imaxe",
-"Image": "Imaxe",
-"Image list": "Lista de imaxes",
-"Rotate counterclockwise": "Rotate counterclockwise",
-"Rotate clockwise": "Rotate clockwise",
-"Flip vertically": "Flip vertically",
-"Flip horizontally": "Flip horizontally",
-"Edit image": "Edit image",
-"Image options": "Image options",
-"Zoom in": "Zoom in",
-"Zoom out": "Zoom out",
-"Crop": "Crop",
-"Resize": "Resize",
-"Orientation": "Orientation",
-"Brightness": "Brightness",
-"Sharpen": "Sharpen",
-"Contrast": "Contrast",
-"Color levels": "Color levels",
-"Gamma": "Gamma",
-"Invert": "Invert",
-"Apply": "Apply",
-"Back": "Back",
-"Insert date\/time": "Inserir data\/hora",
-"Date\/time": "Data\/hora",
-"Insert link": "Inserir ligaz\u00f3n",
-"Insert\/edit link": "Inserir\/editar ligaz\u00f3n",
-"Text to display": "Texto que amosar",
-"Url": "URL",
-"Target": "Destino",
-"None": "Ning\u00fan",
-"New window": "Nova xanela",
-"Remove link": "Retirar a ligaz\u00f3n",
-"Anchors": "Ancoraxes",
-"Link": "Ligaz\u00f3n",
-"Paste or type a link": "Pegue ou escriba unha ligaz\u00f3n",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "O URL que introduciu semella seren un enderezo de correo. Quere engadirlle o prefixo mailto: requirido?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "O URL que introduciu semella seren unha ligaz\u00f3n externa. Quere engadirlle o prefixo http:\/\/ requirido?",
-"Link list": "Lista de ligaz\u00f3ns",
-"Insert video": "Inserir v\u00eddeo",
-"Insert\/edit video": "Inserir\/editar v\u00eddeo",
-"Insert\/edit media": "Inserir\/editar medios",
-"Alternative source": "Orixe alternativa",
-"Poster": "Cartel",
-"Paste your embed code below:": "Pegue embaixo o c\u00f3digo integrado:",
-"Embed": "Integrado",
-"Media": "Medios",
-"Nonbreaking space": "Espazo irromp\u00edbel",
-"Page break": "Quebra de p\u00e1xina",
-"Paste as text": "Pegar como texto",
-"Preview": "Vista previa",
-"Print": "Imprimir",
-"Save": "Gardar",
-"Find": "Buscar",
-"Replace with": "Substitu\u00edr con",
-"Replace": "Substitu\u00edr",
-"Replace all": "Substitu\u00edr todo",
-"Prev": "Anterior",
-"Next": "Seguinte",
-"Find and replace": "Buscar e substitu\u00edr",
-"Could not find the specified string.": "Non foi pos\u00edbel atopar a cadea de texto especificada.",
-"Match case": "Distinguir mai\u00fasculas",
-"Whole words": "Palabras completas",
-"Spellcheck": "Corrector ortogr\u00e1fico",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar todo",
-"Finish": "Rematar",
-"Add to Dictionary": "Engadir ao dicionario",
-"Insert table": "Inserir t\u00e1boa",
-"Table properties": "Propiedades da t\u00e1boa",
-"Delete table": "Eliminar t\u00e1boa",
-"Cell": "Cela",
-"Row": "Fila",
-"Column": "Columna",
-"Cell properties": "Propiedades da cela",
-"Merge cells": "Combinar celas",
-"Split cell": "Dividir celas",
-"Insert row before": "Inserir unha fila enriba",
-"Insert row after": "Inserir unha fila embaixo",
-"Delete row": "Eliminar fila",
-"Row properties": "Propiedades das filas",
-"Cut row": "Cortar fila",
-"Copy row": "Copiar fila",
-"Paste row before": "Pegar fila embaixo",
-"Paste row after": "Pegar fila enriba",
-"Insert column before": "Inserir columna \u00e1 esquerda",
-"Insert column after": "Inserir columna \u00e1 dereita",
-"Delete column": "Eliminar columna",
-"Cols": "Cols.",
-"Rows": "Filas",
-"Width": "Largo",
-"Height": "Alto",
-"Cell spacing": "Marxe entre celas",
-"Cell padding": "Marxe interior da cela",
-"Caption": "Subt\u00edtulo",
-"Left": "Esquerda",
-"Center": "Centro",
-"Right": "Dereita",
-"Cell type": "Tipo de cela",
-"Scope": "\u00c1mbito",
-"Alignment": "Ali\u00f1amento",
-"H Align": "Ali\u00f1amento H",
-"V Align": "Ali\u00f1amento V",
-"Top": "Arriba",
-"Middle": "Medio",
-"Bottom": "Abaixo",
-"Header cell": "Cela de cabeceira",
-"Row group": "Grupo de filas",
-"Column group": "Grupo de columnas",
-"Row type": "Tipo de fila",
-"Header": "Cabeceira",
-"Body": "Corpo",
-"Footer": "Rodap\u00e9",
-"Border color": "Cor do bordo",
-"Insert template": "Inserir modelo",
-"Templates": "Modelos",
-"Template": "Modelo",
-"Text color": "Cor do texto",
-"Background color": "Cor do fondo",
-"Custom...": "Personalizado...",
-"Custom color": "Cor personalizado",
-"No color": "Sen cor",
-"Table of Contents": "\u00cdndice de contidos",
-"Show blocks": "Amosar os bloques",
-"Show invisible characters": "Amosar caracteres invis\u00edbeis",
-"Words: {0}": "Palabras: {0}",
-"File": "Ficheiro",
-"Edit": "Editar",
-"Insert": "Inserir",
-"View": "Ver",
-"Format": "Formato",
-"Table": "T\u00e1boa",
-"Tools": "Ferramentas",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c1rea de texto mellorado. Prema ALT-F9 para o men\u00fa. Prema ALT-F10 para a barra de ferramentas. Prema ALT-0 para a axuda"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/he_IL.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/he_IL.js
deleted file mode 100644
index e1af3e3866..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/he_IL.js
+++ /dev/null
@@ -1,262 +0,0 @@
-tinymce.addI18n('he_IL',{
-"Redo": "\u05d1\u05e6\u05e2 \u05e9\u05d5\u05d1",
-"Undo": "\u05d1\u05d8\u05dc \u05e4\u05e2\u05d5\u05dc\u05d4",
-"Cut": "\u05d2\u05d6\u05d5\u05e8",
-"Copy": "\u05d4\u05e2\u05ea\u05e7",
-"Paste": "\u05d4\u05d3\u05d1\u05e7",
-"Select all": "\u05d1\u05d7\u05e8 \u05d4\u05db\u05dc",
-"New document": "\u05de\u05e1\u05de\u05da \u05d7\u05d3\u05e9",
-"Ok": "\u05d0\u05d9\u05e9\u05d5\u05e8",
-"Cancel": "\u05d1\u05d8\u05dc",
-"Visual aids": "\u05e2\u05d6\u05e8\u05d9\u05dd \u05d7\u05d6\u05d5\u05ea\u05d9\u05d9\u05dd",
-"Bold": "\u05de\u05d5\u05d3\u05d2\u05e9",
-"Italic": "\u05e0\u05d8\u05d5\u05d9",
-"Underline": "\u05e7\u05d5 \u05ea\u05d7\u05ea\u05d9",
-"Strikethrough": "\u05e7\u05d5 \u05d7\u05d5\u05e6\u05d4",
-"Superscript": "\u05db\u05ea\u05d1 \u05e2\u05d9\u05dc\u05d9",
-"Subscript": "\u05db\u05ea\u05d1 \u05ea\u05d7\u05ea\u05d9",
-"Clear formatting": "\u05e0\u05e7\u05d4 \u05e2\u05d9\u05e6\u05d5\u05d1",
-"Align left": "\u05d9\u05d9\u05e9\u05e8 \u05dc\u05e9\u05de\u05d0\u05dc",
-"Align center": "\u05de\u05e8\u05db\u05d6",
-"Align right": "\u05d9\u05d9\u05e9\u05e8 \u05dc\u05d9\u05de\u05d9\u05df",
-"Justify": "\u05de\u05ea\u05d7 \u05dc\u05e6\u05d3\u05d3\u05d9\u05dd",
-"Bullet list": "\u05e8\u05e9\u05d9\u05de\u05ea \u05ea\u05d1\u05dc\u05d9\u05d8\u05d9\u05dd",
-"Numbered list": "\u05e8\u05e9\u05d9\u05de\u05d4 \u05de\u05de\u05d5\u05e1\u05e4\u05e8\u05ea",
-"Decrease indent": "\u05d4\u05e7\u05d8\u05df \u05d4\u05d6\u05d7\u05d4",
-"Increase indent": "\u05d4\u05d2\u05d3\u05dc \u05d4\u05d6\u05d7\u05d4",
-"Close": "\u05e1\u05d2\u05d5\u05e8",
-"Formats": "\u05e2\u05d9\u05e6\u05d5\u05d1\u05d9\u05dd",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u05d4\u05d3\u05e4\u05d3\u05e4\u05df \u05e9\u05dc\u05da \u05d0\u05d9\u05e0\u05d5 \u05de\u05d0\u05e4\u05e9\u05e8 \u05d2\u05d9\u05e9\u05d4 \u05d9\u05e9\u05d9\u05e8\u05d4 \u05dc\u05dc\u05d5\u05d7. \u05d0\u05e0\u05d0 \u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e7\u05d9\u05e6\u05d5\u05e8\u05d9 \u05d4\u05de\u05e7\u05dc\u05d3\u05ea Ctrl+X\/C\/V \u05d1\u05de\u05e7\u05d5\u05dd.",
-"Headers": "\u05db\u05d5\u05ea\u05e8\u05d5\u05ea",
-"Header 1": "\u05db\u05d5\u05ea\u05e8\u05ea 1",
-"Header 2": "\u05db\u05d5\u05ea\u05e8\u05ea 2",
-"Header 3": "\u05db\u05d5\u05ea\u05e8\u05ea 3",
-"Header 4": "\u05db\u05d5\u05ea\u05e8\u05ea 4",
-"Header 5": "\u05db\u05d5\u05ea\u05e8\u05ea 5",
-"Header 6": "\u05db\u05d5\u05ea\u05e8\u05ea 6",
-"Headings": "\u05db\u05d5\u05ea\u05e8\u05d5\u05ea",
-"Heading 1": "\u05db\u05d5\u05ea\u05e8\u05d5\u05ea 1",
-"Heading 2": "\u05db\u05d5\u05ea\u05e8\u05d5\u05ea 2",
-"Heading 3": "\u05db\u05d5\u05ea\u05e8\u05d5\u05ea 3",
-"Heading 4": "\u05db\u05d5\u05ea\u05e8\u05d5\u05ea 4",
-"Heading 5": "\u05db\u05d5\u05ea\u05e8\u05d5\u05ea 5",
-"Heading 6": "\u05db\u05d5\u05ea\u05e8\u05d5\u05ea 6",
-"Preformatted": "\u05e2\u05e6\u05d1 \u05de\u05d7\u05d3\u05e9",
-"Div": "\u05de\u05e7\u05d8\u05e2 \u05e7\u05d5\u05d3 Div",
-"Pre": "\u05e7\u05d8\u05e2 \u05de\u05e7\u05d3\u05d9\u05dd Pre",
-"Code": "\u05e7\u05d5\u05d3",
-"Paragraph": "\u05e4\u05d9\u05e1\u05e7\u05d4",
-"Blockquote": "\u05de\u05e7\u05d8\u05e2 \u05e6\u05d9\u05d8\u05d5\u05d8",
-"Inline": "\u05d1\u05d2\u05d5\u05e3 \u05d4\u05d8\u05e7\u05e1\u05d8",
-"Blocks": "\u05de\u05d1\u05e0\u05d9\u05dd",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u05d4\u05d3\u05d1\u05e7\u05d4 \u05d1\u05de\u05e6\u05d1 \u05d8\u05e7\u05e1\u05d8 \u05e8\u05d2\u05d9\u05dc. \u05ea\u05db\u05e0\u05d9\u05dd \u05d9\u05d5\u05d3\u05d1\u05e7\u05d5 \u05de\u05e2\u05ea\u05d4 \u05db\u05d8\u05e7\u05e1\u05d8 \u05e8\u05d2\u05d9\u05dc \u05e2\u05d3 \u05e9\u05ea\u05db\u05d1\u05d4 \u05d0\u05e4\u05e9\u05e8\u05d5\u05ea \u05d6\u05d5.",
-"Font Family": "\u05e1\u05d5\u05d2 \u05d2\u05d5\u05e4\u05df",
-"Font Sizes": "\u05d2\u05d5\u05d3\u05dc \u05d2\u05d5\u05e4\u05df",
-"Class": "\u05de\u05d7\u05dc\u05e7\u05d4",
-"Browse for an image": "\u05d1\u05d7\u05e8 \u05ea\u05de\u05d5\u05e0\u05d4 \u05dc\u05d4\u05e2\u05dc\u05d5\u05ea",
-"OR": "\u05d0\u05d5",
-"Drop an image here": "\u05e9\u05d7\u05e8\u05e8 \u05ea\u05de\u05d5\u05e0\u05d4 \u05db\u05d0\u05df",
-"Upload": "\u05d4\u05e2\u05dc\u05d4",
-"Block": "\u05d1\u05dc\u05d5\u05e7",
-"Align": "\u05d9\u05d9\u05e9\u05e8",
-"Default": "\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc",
-"Circle": "\u05e2\u05d9\u05d2\u05d5\u05dc",
-"Disc": "\u05d7\u05d9\u05e9\u05d5\u05e7",
-"Square": "\u05e8\u05d9\u05d1\u05d5\u05e2",
-"Lower Alpha": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05d0\u05e0\u05d2\u05dc\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea",
-"Lower Greek": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05d9\u05d5\u05d5\u05e0\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea",
-"Lower Roman": "\u05e1\u05e4\u05e8\u05d5\u05ea \u05e8\u05d5\u05de\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea",
-"Upper Alpha": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05d0\u05e0\u05d2\u05dc\u05d9\u05d5\u05ea \u05d2\u05d3\u05d5\u05dc\u05d5\u05ea",
-"Upper Roman": "\u05e1\u05e4\u05e8\u05d5\u05ea \u05e8\u05d5\u05de\u05d9\u05d5\u05ea \u05d2\u05d3\u05d5\u05dc\u05d5\u05ea",
-"Anchor": "\u05de\u05e7\u05d5\u05dd \u05e2\u05d9\u05d2\u05d5\u05df",
-"Name": "\u05e9\u05dd",
-"Id": "\u05de\u05d6\u05d4\u05d4",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u05d4\u05de\u05d6\u05d4\u05d4 \u05d7\u05d9\u05d9\u05d1 \u05dc\u05d4\u05ea\u05d7\u05d9\u05dc \u05d1\u05d0\u05d5\u05ea \u05d5\u05dc\u05d0\u05d7\u05e8\u05d9\u05d4 \u05e8\u05e7 \u05d0\u05d5\u05ea\u05d9\u05d5\u05ea, \u05de\u05e1\u05e4\u05e8\u05d9\u05dd, \u05de\u05e7\u05e4\u05d9\u05dd, \u05e0\u05e7\u05d5\u05d3\u05d5\u05ea, \u05e0\u05e7\u05d5\u05d3\u05ea\u05d9\u05d9\u05dd \u05d0\u05d5 \u05e7\u05d5\u05d5\u05d9\u05dd \u05ea\u05d7\u05ea\u05d9\u05d9\u05dd.",
-"You have unsaved changes are you sure you want to navigate away?": "\u05d4\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05dc\u05d0 \u05e0\u05e9\u05de\u05e8\u05d5. \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05e6\u05d0\u05ea \u05de\u05d4\u05d3\u05e3?",
-"Restore last draft": "\u05e9\u05d7\u05d6\u05e8 \u05d8\u05d9\u05d5\u05d8\u05d4 \u05d0\u05d7\u05e8\u05d5\u05e0\u05d4",
-"Special character": "\u05ea\u05d5\u05d5\u05d9\u05dd \u05de\u05d9\u05d5\u05d7\u05d3\u05d9\u05dd",
-"Source code": "\u05e7\u05d5\u05d3 \u05de\u05e7\u05d5\u05e8",
-"Insert\/Edit code sample": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05d3\u05d5\u05d2\u05de\u05ea \u05e7\u05d5\u05d3",
-"Language": "\u05e9\u05e4\u05d4",
-"Code sample": "\u05d3\u05d5\u05d2\u05de\u05ea \u05e7\u05d5\u05d3",
-"Color": "\u05e6\u05d1\u05e2",
-"R": "\u05d0'",
-"G": "\u05d9'",
-"B": "\u05db'",
-"Left to right": "\u05de\u05e9\u05de\u05d0\u05dc \u05dc\u05d9\u05de\u05d9\u05df",
-"Right to left": "\u05de\u05d9\u05de\u05d9\u05df \u05dc\u05e9\u05de\u05d0\u05dc",
-"Emoticons": "\u05de\u05d7\u05d5\u05d5\u05ea",
-"Document properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05de\u05e1\u05de\u05da",
-"Title": "\u05db\u05d5\u05ea\u05e8\u05ea",
-"Keywords": "\u05de\u05d9\u05dc\u05d5\u05ea \u05de\u05e4\u05ea\u05d7",
-"Description": "\u05ea\u05d9\u05d0\u05d5\u05e8",
-"Robots": "\u05e8\u05d5\u05d1\u05d5\u05d8\u05d9\u05dd",
-"Author": "\u05de\u05d7\u05d1\u05e8",
-"Encoding": "\u05e7\u05d9\u05d3\u05d5\u05d3",
-"Fullscreen": "\u05de\u05e1\u05da \u05de\u05dc\u05d0",
-"Action": "\u05e4\u05e2\u05d5\u05dc\u05d4",
-"Shortcut": "\u05e7\u05d9\u05e6\u05d5\u05e8",
-"Help": "\u05e2\u05d6\u05e8\u05d4",
-"Address": "\u05db\u05ea\u05d5\u05d1\u05ea",
-"Focus to menubar": "\u05d4\u05e2\u05d1\u05e8 \u05de\u05d9\u05e7\u05d5\u05d3 \u05dc\u05e1\u05e8\u05d2\u05dc \u05d4\u05ea\u05e4\u05e8\u05d8\u05d9\u05dd",
-"Focus to toolbar": "\u05d4\u05e2\u05d1\u05e8 \u05de\u05d9\u05e7\u05d5\u05d3 \u05dc\u05e1\u05e8\u05d2\u05dc \u05d4\u05db\u05dc\u05d9\u05dd",
-"Focus to element path": "\u05e2\u05d1\u05e8 \u05de\u05d9\u05e7\u05d5\u05d3 \u05dc\u05db\u05ea\u05d5\u05d1\u05ea \u05d4\u05e4\u05e8\u05d9\u05d8",
-"Focus to contextual toolbar": "\u05d4\u05e2\u05d1\u05e8 \u05de\u05d9\u05e7\u05d5\u05d3 \u05dc\u05e1\u05e8\u05d2\u05dc \u05ea\u05d5\u05db\u05df",
-"Insert link (if link plugin activated)": "\u05d4\u05db\u05e0\u05e1 \u05e7\u05d9\u05e9\u05d5\u05e8 (\u05d0\u05dd \u05ea\u05d5\u05e1\u05e3 \"\u05e7\u05d9\u05e9\u05d5\u05e8\u05d9\u05dd\" \u05e4\u05e2\u05d9\u05dc)",
-"Save (if save plugin activated)": "\u05e9\u05de\u05d5\u05e8 (\u05d0\u05dd \u05ea\u05d5\u05e1\u05e3 \"\u05e9\u05de\u05d9\u05e8\u05d4\" \u05e4\u05e2\u05d9\u05dc)",
-"Find (if searchreplace plugin activated)": "\u05d7\u05e4\u05e9 (\u05d0\u05dd \u05ea\u05d5\u05e1\u05e3 \"\u05d7\u05e4\u05e9 \u05d5\u05d4\u05d7\u05dc\u05e3\" \u05e4\u05e2\u05d9\u05dc)",
-"Plugins installed ({0}):": "\u05ea\u05d5\u05e1\u05e4\u05d9\u05dd \u05de\u05d5\u05ea\u05e7\u05e0\u05d9\u05dd ({0}):",
-"Premium plugins:": "\u05ea\u05d5\u05e1\u05e4\u05d9\u05dd \u05d1\u05ea\u05e9\u05dc\u05d5\u05dd:",
-"Learn more...": "\u05dc\u05de\u05d3 \u05e2\u05d5\u05d3...",
-"You are using {0}": "\u05d0\u05ea\\\u05d4 \u05de\u05e9\u05ea\u05de\u05e9\\\u05ea {0}",
-"Plugins": "\u05ea\u05d5\u05e1\u05e4\u05d9\u05dd",
-"Handy Shortcuts": "\u05e7\u05d9\u05e6\u05d5\u05e8\u05d9\u05dd \u05e9\u05d9\u05de\u05d5\u05e9\u05d9\u05d9\u05dd",
-"Horizontal line": "\u05e7\u05d5 \u05d0\u05d5\u05e4\u05e7\u05d9",
-"Insert\/edit image": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05ea\u05de\u05d5\u05e0\u05d4",
-"Image description": "\u05ea\u05d9\u05d0\u05d5\u05e8 \u05d4\u05ea\u05de\u05d5\u05e0\u05d4",
-"Source": "\u05de\u05e7\u05d5\u05e8",
-"Dimensions": "\u05de\u05d9\u05de\u05d3\u05d9\u05dd",
-"Constrain proportions": "\u05d4\u05d2\u05d1\u05dc\u05ea \u05e4\u05e8\u05d5\u05e4\u05d5\u05e8\u05e6\u05d9\u05d5\u05ea",
-"General": "\u05db\u05dc\u05dc\u05d9",
-"Advanced": "\u05de\u05ea\u05e7\u05d3\u05dd",
-"Style": "\u05e1\u05d2\u05e0\u05d5\u05df",
-"Vertical space": "\u05de\u05e8\u05d5\u05d5\u05d7 \u05d0\u05e0\u05db\u05d9",
-"Horizontal space": "\u05de\u05e8\u05d5\u05d5\u05d7 \u05d0\u05d5\u05e4\u05e7\u05d9",
-"Border": "\u05de\u05e1\u05d2\u05e8\u05ea",
-"Insert image": "\u05d4\u05db\u05e0\u05e1 \u05ea\u05de\u05d5\u05e0\u05d4",
-"Image": "\u05ea\u05de\u05d5\u05e0\u05d4",
-"Image list": "\u05e8\u05e9\u05d9\u05de\u05ea \u05ea\u05de\u05d5\u05e0\u05d5\u05ea",
-"Rotate counterclockwise": "\u05e1\u05d5\u05d1\u05d1 \u05d1\u05db\u05d9\u05d5\u05d5\u05df \u05d4\u05e4\u05d5\u05da \u05dc\u05e9\u05e2\u05d5\u05df",
-"Rotate clockwise": "\u05e1\u05d5\u05d1\u05d1 \u05d1\u05db\u05d9\u05d5\u05d5\u05df \u05d4\u05e9\u05e2\u05d5\u05df",
-"Flip vertically": "\u05d4\u05e4\u05d5\u05da \u05d0\u05e0\u05db\u05d9\u05ea",
-"Flip horizontally": "\u05d4\u05e4\u05d5\u05da \u05d0\u05d5\u05e4\u05e7\u05d9\u05ea",
-"Edit image": "\u05e2\u05e8\u05d5\u05da \u05ea\u05de\u05d5\u05e0\u05d4",
-"Image options": "\u05d0\u05e4\u05e9\u05e8\u05d5\u05d9\u05d5\u05ea \u05ea\u05de\u05d5\u05e0\u05d4",
-"Zoom in": "\u05d4\u05d2\u05d3\u05dc \u05ea\u05e6\u05d5\u05d2\u05d4",
-"Zoom out": "\u05d4\u05e7\u05d8\u05df \u05ea\u05e6\u05d5\u05d2\u05d4",
-"Crop": "\u05e7\u05e6\u05e5",
-"Resize": "\u05e9\u05e0\u05d4 \u05d2\u05d5\u05d3\u05dc",
-"Orientation": "\u05db\u05d9\u05d5\u05d5\u05df \u05dc\u05d0\u05d5\u05e8\u05da \/ \u05dc\u05e8\u05d5\u05d7\u05d1",
-"Brightness": "\u05d1\u05d4\u05d9\u05e8\u05d5\u05ea",
-"Sharpen": "\u05d7\u05d3\u05d3",
-"Contrast": "\u05e0\u05d9\u05d2\u05d5\u05d3\u05d9\u05d5\u05ea",
-"Color levels": "\u05e8\u05de\u05d5\u05ea \u05e6\u05d1\u05e2\u05d9\u05dd",
-"Gamma": "\u05d2\u05d0\u05de\u05d4",
-"Invert": "\u05d4\u05d9\u05e4\u05d5\u05da \u05e6\u05d1\u05e2\u05d9\u05dd",
-"Apply": "\u05d9\u05d9\u05e9\u05dd",
-"Back": "\u05d7\u05d6\u05d5\u05e8",
-"Insert date\/time": "\u05d4\u05db\u05e0\u05e1 \u05ea\u05d0\u05e8\u05d9\u05da\/\u05e9\u05e2\u05d4",
-"Date\/time": "\u05ea\u05d0\u05e8\u05d9\u05da\/\u05e9\u05e2\u05d4",
-"Insert link": "\u05d4\u05db\u05e0\u05e1 \u05e7\u05d9\u05e9\u05d5\u05e8",
-"Insert\/edit link": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05e7\u05d9\u05e9\u05d5\u05e8",
-"Text to display": "\u05d8\u05e7\u05e1\u05d8 \u05dc\u05d4\u05e6\u05d2\u05d4",
-"Url": "\u05db\u05ea\u05d5\u05d1\u05ea \u05e7\u05d9\u05e9\u05d5\u05e8",
-"Target": "\u05de\u05d8\u05e8\u05d4",
-"None": "\u05dc\u05dc\u05d0",
-"New window": "\u05d7\u05dc\u05d5\u05df \u05d7\u05d3\u05e9",
-"Remove link": "\u05de\u05d7\u05e7 \u05e7\u05d9\u05e9\u05d5\u05e8",
-"Anchors": "\u05e2\u05d5\u05d2\u05e0\u05d9\u05dd",
-"Link": "\u05e7\u05d9\u05e9\u05d5\u05e8",
-"Paste or type a link": "\u05d4\u05d3\u05d1\u05e7 \u05d0\u05d5 \u05d4\u05e7\u05dc\u05d3 \u05e7\u05d9\u05e9\u05d5\u05e8",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u05e0\u05e8\u05d0\u05d4 \u05e9\u05d4\u05db\u05ea\u05d5\u05d1\u05ea \u05e9\u05d4\u05db\u05e0\u05e1\u05ea \u05d4\u05d9\u05d0 \u05db\u05ea\u05d5\u05d1\u05ea \u05d0\u05d9\u05de\u05d9\u05d9\u05dc. \u05d4\u05d0\u05dd \u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05d0\u05ea \u05d4\u05e7\u05d9\u05d3\u05d5\u05de\u05ea :mailto?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u05e0\u05e8\u05d0\u05d4 \u05e9\u05d4\u05db\u05ea\u05d5\u05d1\u05ea \u05e9\u05d4\u05db\u05e0\u05e1\u05ea \u05d4\u05d9\u05d0 \u05e7\u05d9\u05e9\u05d5\u05e8 \u05d7\u05d9\u05e6\u05d5\u05e0\u05d9 \u05d4\u05d0\u05dd \u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05e7\u05d9\u05d3\u05d5\u05de\u05ea http:\/\/?",
-"Link list": "\u05e8\u05e9\u05d9\u05de\u05ea \u05e7\u05d9\u05e9\u05d5\u05e8\u05d9\u05dd",
-"Insert video": "\u05d4\u05db\u05e0\u05e1 \u05e1\u05e8\u05d8\u05d5\u05df",
-"Insert\/edit video": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05e1\u05e8\u05d8\u05d5\u05df",
-"Insert\/edit media": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05de\u05d3\u05d9\u05d4",
-"Alternative source": "\u05de\u05e7\u05d5\u05e8 \u05de\u05e9\u05e0\u05d9",
-"Poster": "\u05e4\u05d5\u05e1\u05d8\u05e8",
-"Paste your embed code below:": "\u05d4\u05d3\u05d1\u05e7 \u05e7\u05d5\u05d3 \u05d4\u05d8\u05de\u05e2\u05d4 \u05de\u05ea\u05d7\u05ea:",
-"Embed": "\u05d4\u05d8\u05de\u05e2",
-"Media": "\u05de\u05d3\u05d9\u05d4",
-"Nonbreaking space": "\u05e8\u05d5\u05d5\u05d7 (\u05dc\u05dc\u05d0 \u05e9\u05d1\u05d9\u05e8\u05ea \u05e9\u05d5\u05e8\u05d4)",
-"Page break": "\u05d3\u05e3 \u05d7\u05d3\u05e9",
-"Paste as text": "\u05d4\u05d3\u05d1\u05e7 \u05db\u05d8\u05e7\u05e1\u05d8",
-"Preview": "\u05ea\u05e6\u05d5\u05d2\u05d4 \u05de\u05e7\u05d3\u05d9\u05de\u05d4",
-"Print": "\u05d4\u05d3\u05e4\u05e1",
-"Save": "\u05e9\u05de\u05d9\u05e8\u05d4",
-"Find": "\u05d7\u05e4\u05e9",
-"Replace with": "\u05d4\u05d7\u05dc\u05e3 \u05d1",
-"Replace": "\u05d4\u05d7\u05dc\u05e3",
-"Replace all": "\u05d4\u05d7\u05dc\u05e3 \u05d4\u05db\u05dc",
-"Prev": "\u05e7\u05d5\u05d3\u05dd",
-"Next": "\u05d4\u05d1\u05d0",
-"Find and replace": "\u05d7\u05e4\u05e9 \u05d5\u05d4\u05d7\u05dc\u05e3",
-"Could not find the specified string.": "\u05de\u05d7\u05e8\u05d5\u05d6\u05ea \u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d4",
-"Match case": "\u05d4\u05d1\u05d7\u05df \u05d1\u05d9\u05df \u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea \u05dc\u05d2\u05d3\u05d5\u05dc\u05d5\u05ea",
-"Whole words": "\u05de\u05d9\u05dc\u05d4 \u05e9\u05dc\u05de\u05d4",
-"Spellcheck": "\u05d1\u05d5\u05d3\u05e7 \u05d0\u05d9\u05d5\u05ea",
-"Ignore": "\u05d4\u05ea\u05e2\u05dc\u05dd",
-"Ignore all": "\u05d4\u05ea\u05e2\u05dc\u05dd \u05de\u05d4\u05db\u05dc",
-"Finish": "\u05e1\u05d9\u05d9\u05dd",
-"Add to Dictionary": "\u05d4\u05d5\u05e1\u05e3 \u05dc\u05de\u05d9\u05dc\u05d5\u05df",
-"Insert table": "\u05d4\u05db\u05e0\u05e1 \u05d8\u05d1\u05dc\u05d4",
-"Table properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05d8\u05d1\u05dc\u05d4",
-"Delete table": "\u05de\u05d7\u05e7 \u05d8\u05d1\u05dc\u05d4",
-"Cell": "\u05ea\u05d0",
-"Row": "\u05e9\u05d5\u05e8\u05d4",
-"Column": "\u05e2\u05de\u05d5\u05d3\u05d4",
-"Cell properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05ea\u05d0",
-"Merge cells": "\u05de\u05d6\u05d2 \u05ea\u05d0\u05d9\u05dd",
-"Split cell": "\u05e4\u05e6\u05dc \u05ea\u05d0",
-"Insert row before": "\u05d4\u05d5\u05e1\u05e3 \u05e9\u05d5\u05e8\u05d4 \u05dc\u05e4\u05e0\u05d9",
-"Insert row after": "\u05d4\u05d5\u05e1\u05e3 \u05e9\u05d5\u05e8\u05d4 \u05d0\u05d7\u05e8\u05d9",
-"Delete row": "\u05de\u05d7\u05e7 \u05e9\u05d5\u05e8\u05d4",
-"Row properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05e9\u05d5\u05e8\u05d4",
-"Cut row": "\u05d2\u05d6\u05d5\u05e8 \u05e9\u05d5\u05e8\u05d4",
-"Copy row": "\u05d4\u05e2\u05ea\u05e7 \u05e9\u05d5\u05e8\u05d4",
-"Paste row before": "\u05d4\u05d3\u05d1\u05e7 \u05e9\u05d5\u05e8\u05d4 \u05dc\u05e4\u05e0\u05d9",
-"Paste row after": "\u05d4\u05e2\u05ea\u05e7 \u05e9\u05d5\u05e8\u05d4 \u05d0\u05d7\u05e8\u05d9",
-"Insert column before": "\u05d4\u05e2\u05ea\u05e7 \u05e2\u05de\u05d5\u05d3\u05d4 \u05dc\u05e4\u05e0\u05d9",
-"Insert column after": "\u05d4\u05e2\u05ea\u05e7 \u05e2\u05de\u05d5\u05d3\u05d4 \u05d0\u05d7\u05e8\u05d9",
-"Delete column": "\u05de\u05d7\u05e7 \u05e2\u05de\u05d5\u05d3\u05d4",
-"Cols": "\u05e2\u05de\u05d5\u05d3\u05d5\u05ea",
-"Rows": "\u05e9\u05d5\u05e8\u05d5\u05ea",
-"Width": "\u05e8\u05d5\u05d7\u05d1",
-"Height": "\u05d2\u05d5\u05d1\u05d4",
-"Cell spacing": "\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05d7\u05d9\u05e6\u05d5\u05e0\u05d9\u05dd \u05dc\u05ea\u05d0",
-"Cell padding": "\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05e4\u05e0\u05d9\u05de\u05d9\u05d9\u05dd \u05dc\u05ea\u05d0",
-"Caption": "\u05db\u05d9\u05ea\u05d5\u05d1",
-"Left": "\u05e9\u05de\u05d0\u05dc",
-"Center": "\u05de\u05e8\u05db\u05d6",
-"Right": "\u05d9\u05de\u05d9\u05df",
-"Cell type": "\u05e1\u05d5\u05d2 \u05ea\u05d0",
-"Scope": "\u05d4\u05d9\u05e7\u05e3",
-"Alignment": "\u05d9\u05d9\u05e9\u05d5\u05e8",
-"H Align": "\u05d9\u05d9\u05e9\u05d5\u05e8 \u05d0\u05d5\u05e4\u05e7\u05d9",
-"V Align": "\u05d9\u05d9\u05e9\u05d5\u05e8 \u05d0\u05e0\u05db\u05d9",
-"Top": "\u05e2\u05dc\u05d9\u05d5\u05df",
-"Middle": "\u05d0\u05de\u05e6\u05e2",
-"Bottom": "\u05ea\u05d7\u05ea\u05d9\u05ea",
-"Header cell": "\u05db\u05d5\u05ea\u05e8\u05ea \u05dc\u05ea\u05d0",
-"Row group": "\u05e7\u05d9\u05d1\u05d5\u05e5 \u05e9\u05d5\u05e8\u05d5\u05ea",
-"Column group": "\u05e7\u05d9\u05d1\u05d5\u05e5 \u05e2\u05de\u05d5\u05d3\u05d5\u05ea",
-"Row type": "\u05e1\u05d5\u05d2 \u05e9\u05d5\u05e8\u05d4",
-"Header": "\u05db\u05d5\u05ea\u05e8\u05ea",
-"Body": "\u05d2\u05d5\u05e3 \u05d4\u05d8\u05d1\u05dc\u05d0",
-"Footer": "\u05db\u05d5\u05ea\u05e8\u05ea \u05ea\u05d7\u05ea\u05d5\u05e0\u05d4",
-"Border color": "\u05e6\u05d1\u05e2 \u05d2\u05d1\u05d5\u05dc",
-"Insert template": "\u05d4\u05db\u05e0\u05e1 \u05ea\u05d1\u05e0\u05d9\u05ea",
-"Templates": "\u05ea\u05d1\u05e0\u05d9\u05d5\u05ea",
-"Template": "\u05ea\u05d1\u05e0\u05d9\u05ea",
-"Text color": "\u05e6\u05d1\u05e2 \u05d4\u05db\u05ea\u05d1",
-"Background color": "\u05e6\u05d1\u05e2 \u05e8\u05e7\u05e2",
-"Custom...": "\u05de\u05d5\u05ea\u05d0\u05dd \u05d0\u05d9\u05e9\u05d9\u05ea...",
-"Custom color": "\u05e6\u05d1\u05e2 \u05de\u05d5\u05ea\u05d0\u05dd \u05d0\u05d9\u05e9\u05d9\u05ea",
-"No color": "\u05dc\u05dc\u05d0 \u05e6\u05d1\u05e2",
-"Table of Contents": "\u05ea\u05d5\u05db\u05df \u05e2\u05e0\u05d9\u05d9\u05e0\u05d9\u05dd",
-"Show blocks": "\u05d4\u05e6\u05d2 \u05ea\u05d9\u05d1\u05d5\u05ea",
-"Show invisible characters": "\u05d4\u05e6\u05d2 \u05ea\u05d5\u05d5\u05d9\u05dd \u05dc\u05d0 \u05e0\u05e8\u05d0\u05d9\u05dd",
-"Words: {0}": "\u05de\u05d9\u05dc\u05d9\u05dd: {0}",
-"{0} words": "{0} \u05de\u05d9\u05dc\u05d9\u05dd",
-"File": "\u05e7\u05d5\u05d1\u05e5",
-"Edit": "\u05e2\u05e8\u05d9\u05db\u05d4",
-"Insert": "\u05d4\u05d5\u05e1\u05e4\u05d4",
-"View": "\u05ea\u05e6\u05d5\u05d2\u05d4",
-"Format": "\u05e4\u05d5\u05e8\u05de\u05d8",
-"Table": "\u05d8\u05d1\u05dc\u05d4",
-"Tools": "\u05db\u05dc\u05d9\u05dd",
-"Powered by {0}": "\u05de\u05d5\u05e4\u05e2\u05dc \u05e2\"\u05d9 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u05ea\u05d9\u05d1\u05ea \u05e2\u05e8\u05d9\u05db\u05d4 \u05d7\u05db\u05de\u05d4. \u05dc\u05d7\u05e5 Alt-F9 \u05dc\u05ea\u05e4\u05e8\u05d9\u05d8. Alt-F10 \u05dc\u05ea\u05e6\u05d5\u05d2\u05ea \u05db\u05e4\u05ea\u05d5\u05e8\u05d9\u05dd, Alt-0 \u05dc\u05e2\u05d6\u05e8\u05d4",
-"_dir": "rtl"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hr.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hr.js
deleted file mode 100644
index 617e1f4823..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hr.js
+++ /dev/null
@@ -1,253 +0,0 @@
-tinymce.addI18n('hr',{
-"Redo": "Vrati",
-"Undo": "Poni\u0161ti",
-"Cut": "Izre\u017ei",
-"Copy": "Kopiraj",
-"Paste": "Zalijepi",
-"Select all": "Ozna\u010di sve",
-"New document": "Novi dokument",
-"Ok": "U redu",
-"Cancel": "Odustani",
-"Visual aids": "Vizualna pomo\u0107",
-"Bold": "Podebljano",
-"Italic": "Kurziv",
-"Underline": "Crta ispod",
-"Strikethrough": "Crta kroz sredinu",
-"Superscript": "Eksponent",
-"Subscript": "Indeks",
-"Clear formatting": "Ukloni oblikovanje",
-"Align left": "Poravnaj lijevo",
-"Align center": "Poravnaj po sredini",
-"Align right": "Poravnaj desno",
-"Justify": "Obostrano poravnanje",
-"Bullet list": "Lista",
-"Numbered list": "Numerirana lista",
-"Decrease indent": "Smanji uvla\u010denje",
-"Increase indent": "Pove\u0107aj uvla\u010denje",
-"Close": "Zatvori",
-"Formats": "Formati",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Va\u0161 preglednik ne podr\u017eava direktan pristup me\u0111uspremniku. Molimo Vas da umjesto toga koristite tipkovni\u010dke kratice Ctrl+X\/C\/V.",
-"Headers": "Zaglavlja",
-"Header 1": "Zaglavlje 1",
-"Header 2": "Zaglavlje 2",
-"Header 3": "Zaglavlje 3",
-"Header 4": "Zaglavlje 4",
-"Header 5": "Zaglavlje 5",
-"Header 6": "Zaglavlje 6",
-"Headings": "Naslovi",
-"Heading 1": "Naslov 1",
-"Heading 2": "Naslov 2",
-"Heading 3": "Naslov 3",
-"Heading 4": "Naslov 4",
-"Heading 5": "Naslov 5",
-"Heading 6": "Naslov 6",
-"Div": "DIV",
-"Pre": "PRE",
-"Code": "CODE oznaka",
-"Paragraph": "Paragraf",
-"Blockquote": "BLOCKQUOTE",
-"Inline": "Unutarnje",
-"Blocks": "Blokovi",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Akcija zalijepi od sada lijepi \u010disti tekst. Sadr\u017eaj \u0107e biti zaljepljen kao \u010disti tekst sve dok ne isklju\u010dite ovu opciju.",
-"Font Family": "Obitelj fonta",
-"Font Sizes": "Veli\u010dine fonta",
-"Class": "Class",
-"Browse for an image": "Browse for an image",
-"OR": "OR",
-"Drop an image here": "Drop an image here",
-"Upload": "Upload",
-"Default": "Zadano",
-"Circle": "Krug",
-"Disc": "To\u010dka",
-"Square": "Kvadrat",
-"Lower Alpha": "Mala slova",
-"Lower Greek": "Mala gr\u010dka slova",
-"Lower Roman": "Mala rimska slova",
-"Upper Alpha": "Velika slova",
-"Upper Roman": "Velika rimska slova",
-"Anchor": "Sidro",
-"Name": "Ime",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id treba po\u010dinjati slovom, a nakon toga slijede samo slova, brojevi, crtice, to\u010dke, dvoto\u010dke i podvlake.",
-"You have unsaved changes are you sure you want to navigate away?": "Postoje ne pohranjene izmjene, jeste li sigurni da \u017eelite oti\u0107i?",
-"Restore last draft": "Vrati posljednju skicu",
-"Special character": "Poseban znak",
-"Source code": "Izvorni kod",
-"Insert\/Edit code sample": "Umetni\/Uredi primjer k\u00f4da",
-"Language": "Jezik",
-"Color": "Boja",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "S lijeva na desno",
-"Right to left": "S desna na lijevo",
-"Emoticons": "Emotikoni",
-"Document properties": "Svojstva dokumenta",
-"Title": "Naslov",
-"Keywords": "Klju\u010dne rije\u010di",
-"Description": "Opis",
-"Robots": "Roboti pretra\u017eiva\u010da",
-"Author": "Autor",
-"Encoding": "Kodna stranica",
-"Fullscreen": "Cijeli ekran",
-"Action": "Action",
-"Shortcut": "Shortcut",
-"Help": "Help",
-"Address": "Address",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "Insert link (if link plugin activated)",
-"Save (if save plugin activated)": "Save (if save plugin activated)",
-"Find (if searchreplace plugin activated)": "Find (if searchreplace plugin activated)",
-"Plugins installed ({0}):": "Plugins installed ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "Learn more...",
-"You are using {0}": "You are using {0}",
-"Horizontal line": "Horizontalna linija",
-"Insert\/edit image": "Umetni\/izmijeni sliku",
-"Image description": "Opis slike",
-"Source": "Izvor",
-"Dimensions": "Dimenzije",
-"Constrain proportions": "Zadr\u017ei proporcije",
-"General": "Op\u0107enito",
-"Advanced": "Napredno",
-"Style": "Stil",
-"Vertical space": "Okomit razmak",
-"Horizontal space": "Horizontalan razmak",
-"Border": "Rub",
-"Insert image": "Umetni sliku",
-"Image": "Slika",
-"Image list": "Image list",
-"Rotate counterclockwise": "Rotiraj lijevo",
-"Rotate clockwise": "Rotiraj desno",
-"Flip vertically": "Obrni vertikalno",
-"Flip horizontally": "Obrni horizontalno",
-"Edit image": "Uredi sliku",
-"Image options": "Opcije slike",
-"Zoom in": "Pove\u0107aj",
-"Zoom out": "Smanji",
-"Crop": "Obre\u017ei",
-"Resize": "Promjeni veli\u010dinu",
-"Orientation": "Orijentacija",
-"Brightness": "Svjetlina",
-"Sharpen": "Izo\u0161travanje",
-"Contrast": "Kontrast",
-"Color levels": "Razine boje",
-"Gamma": "Gamma",
-"Invert": "Invertiraj",
-"Apply": "Primijeni",
-"Back": "Natrag",
-"Insert date\/time": "Umetni datum\/vrijeme",
-"Date\/time": "Datum\/vrijeme",
-"Insert link": "Umetni poveznicu",
-"Insert\/edit link": "Umetni\/izmijeni poveznicu",
-"Text to display": "Tekst za prikaz",
-"Url": "URL",
-"Target": "Meta",
-"None": "Ni\u0161ta",
-"New window": "Novi prozor",
-"Remove link": "Ukloni poveznicu",
-"Anchors": "Kra\u0107e poveznice",
-"Link": "Link",
-"Paste or type a link": "Zalijepi ili upi\u0161i link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Izgleda da je URL koji ste upisali e-mail adresa. \u017delite li dodati obavezan mailto: prefiks?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Izgleda da je URL koji ste upisali vanjski link. \u017delite li dodati obavezan http:\/\/ prefiks?",
-"Link list": "Link list",
-"Insert video": "Umetni video",
-"Insert\/edit video": "Umetni\/izmijeni video",
-"Insert\/edit media": "Umetni\/uredi mediju",
-"Alternative source": "Alternativni izvor",
-"Poster": "Poster",
-"Paste your embed code below:": "Umetnite va\u0161 kod za ugradnju ispod:",
-"Embed": "Ugradi",
-"Media": "Media",
-"Nonbreaking space": "Neprekidaju\u0107i razmak",
-"Page break": "Prijelom stranice",
-"Paste as text": "Zalijepi kao tekst",
-"Preview": "Pregled",
-"Print": "Ispis",
-"Save": "Spremi",
-"Find": "Tra\u017ei",
-"Replace with": "Zamijeni s",
-"Replace": "Zamijeni",
-"Replace all": "Zamijeni sve",
-"Prev": "Prethodni",
-"Next": "Slijede\u0107i",
-"Find and replace": "Prona\u0111i i zamijeni",
-"Could not find the specified string.": "Tra\u017eeni tekst nije prona\u0111en",
-"Match case": "Pazi na mala i velika slova",
-"Whole words": "Cijele rije\u010di",
-"Spellcheck": "Provjeri pravopis",
-"Ignore": "Zanemari",
-"Ignore all": "Zanemari sve",
-"Finish": "Zavr\u0161i",
-"Add to Dictionary": "Dodaj u rje\u010dnik",
-"Insert table": "Umetni tablicu",
-"Table properties": "Svojstva tablice",
-"Delete table": "Izbri\u0161i tablicu",
-"Cell": "Polje",
-"Row": "Redak",
-"Column": "Stupac",
-"Cell properties": "Svojstva polja",
-"Merge cells": "Spoji polja",
-"Split cell": "Razdvoji polja",
-"Insert row before": "Umetni redak prije",
-"Insert row after": "Umetni redak nakon",
-"Delete row": "Izbri\u0161i redak",
-"Row properties": "Svojstva redka",
-"Cut row": "Izre\u017ei redak",
-"Copy row": "Kopiraj redak",
-"Paste row before": "Zalijepi redak prije",
-"Paste row after": "Zalijepi redak nakon",
-"Insert column before": "Umetni stupac prije",
-"Insert column after": "Umetni stupac nakon",
-"Delete column": "Izbri\u0161i stupac",
-"Cols": "Stupci",
-"Rows": "Redci",
-"Width": "\u0160irina",
-"Height": "Visina",
-"Cell spacing": "Razmak izme\u0111u polja",
-"Cell padding": "Razmak unutar polja",
-"Caption": "Natpis",
-"Left": "Lijevo",
-"Center": "Sredina",
-"Right": "Desno",
-"Cell type": "Vrsta polja",
-"Scope": "Doseg",
-"Alignment": "Poravnanje",
-"H Align": "H Poravnavanje",
-"V Align": "V Poravnavanje",
-"Top": "Vrh",
-"Middle": "Sredina",
-"Bottom": "Dno",
-"Header cell": "Polje zaglavlja",
-"Row group": "Grupirani redci",
-"Column group": "Grupirani stupci",
-"Row type": "Vrsta redka",
-"Header": "Zaglavlje",
-"Body": "Sadr\u017eaj",
-"Footer": "Podno\u017eje",
-"Border color": "Boja ruba",
-"Insert template": "Umetni predlo\u017eak",
-"Templates": "Predlo\u0161ci",
-"Template": "Predlo\u017eak",
-"Text color": "Boja teksta",
-"Background color": "Boja pozadine",
-"Custom...": "Prilago\u0111eno...",
-"Custom color": "Prilago\u0111ena boja",
-"No color": "Bez boje",
-"Table of Contents": "Sadr\u017eaj",
-"Show blocks": "Prika\u017ei blokove",
-"Show invisible characters": "Prika\u017ei nevidljive znakove",
-"Words: {0}": "Rije\u010di: {0}",
-"File": "Datoteka",
-"Edit": "Izmijeni",
-"Insert": "Umetni",
-"View": "Pogled",
-"Format": "Oblikuj",
-"Table": "Tablica",
-"Tools": "Alati",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Pritisni ALT-F9 za izbornik. Pritisni ALT-F10 za alatnu traku. Pritisni ALT-0 za pomo\u0107"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hu_HU.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hu_HU.js
deleted file mode 100644
index 13bb4984a9..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hu_HU.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('hu_HU',{
-"Redo": "Ism\u00e9t",
-"Undo": "Visszavon\u00e1s",
-"Cut": "Kiv\u00e1g\u00e1s",
-"Copy": "M\u00e1sol\u00e1s",
-"Paste": "Beilleszt\u00e9s",
-"Select all": "Minden kijel\u00f6l\u00e9se",
-"New document": "\u00daj dokumentum",
-"Ok": "Rendben",
-"Cancel": "M\u00e9gse",
-"Visual aids": "Vizu\u00e1lis seg\u00e9deszk\u00f6z\u00f6k",
-"Bold": "F\u00e9lk\u00f6v\u00e9r",
-"Italic": "D\u0151lt",
-"Underline": "Al\u00e1h\u00fazott",
-"Strikethrough": "\u00c1th\u00fazott",
-"Superscript": "Fels\u0151 index",
-"Subscript": "Als\u00f3 index",
-"Clear formatting": "Form\u00e1z\u00e1s t\u00f6rl\u00e9se",
-"Align left": "Balra igaz\u00edt",
-"Align center": "K\u00f6z\u00e9pre z\u00e1r",
-"Align right": "Jobbra igaz\u00edt",
-"Justify": "Sorkiz\u00e1r\u00e1s",
-"Bullet list": "Felsorol\u00e1s",
-"Numbered list": "Sz\u00e1moz\u00e1s",
-"Decrease indent": "Beh\u00faz\u00e1s cs\u00f6kkent\u00e9se",
-"Increase indent": "Beh\u00faz\u00e1s n\u00f6vel\u00e9se",
-"Close": "Bez\u00e1r",
-"Formats": "Form\u00e1tumok",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "A b\u00f6ng\u00e9sz\u0151d nem t\u00e1mogatja a k\u00f6zvetlen hozz\u00e1f\u00e9r\u00e9st a v\u00e1g\u00f3laphoz. K\u00e9rlek haszn\u00e1ld a Ctrl+X\/C\/V billenty\u0171ket.",
-"Headers": "C\u00edmsorok",
-"Header 1": "C\u00edmsor 1",
-"Header 2": "C\u00edmsor 2",
-"Header 3": "C\u00edmsor 3",
-"Header 4": "C\u00edmsor 4",
-"Header 5": "C\u00edmsor 5",
-"Header 6": "C\u00edmsor 6",
-"Headings": "Fejl\u00e9cek",
-"Heading 1": "Fejl\u00e9c 1",
-"Heading 2": "Fejl\u00e9c 2",
-"Heading 3": "Fejl\u00e9c 3",
-"Heading 4": "Fejl\u00e9c 4",
-"Heading 5": "Fejl\u00e9c 5",
-"Heading 6": "Fejl\u00e9c 6",
-"Preformatted": "El\u0151form\u00e1zott",
-"Div": "Div",
-"Pre": "El\u0151form\u00e1zott",
-"Code": "K\u00f3d",
-"Paragraph": "Bekezd\u00e9s",
-"Blockquote": "Id\u00e9zetblokk",
-"Inline": "Sz\u00f6vegk\u00f6zi",
-"Blocks": "Blokkok",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Beilleszt\u00e9s mostant\u00f3l egyszer\u0171 sz\u00f6veg m\u00f3dban. A tartalmak mostant\u00f3l egyszer\u0171 sz\u00f6vegk\u00e9nt lesznek beillesztve, am\u00edg nem kapcsolod ki ezt az opci\u00f3t.",
-"Font Family": "Bet\u0171t\u00edpus",
-"Font Sizes": "Bet\u0171m\u00e9retek",
-"Class": "Oszt\u00e1ly",
-"Browse for an image": "K\u00e9p tall\u00f3z\u00e1sa",
-"OR": "vagy",
-"Drop an image here": "Dobj ide egy k\u00e9pet",
-"Upload": "Felt\u00f6lt\u00e9s",
-"Block": "Blokk",
-"Align": "Igaz\u00edt\u00e1s",
-"Default": "Alap\u00e9rtelmezett",
-"Circle": "K\u00f6r",
-"Disc": "Pont",
-"Square": "N\u00e9gyzet",
-"Lower Alpha": "Kisbet\u0171",
-"Lower Greek": "Kis g\u00f6r\u00f6g sz\u00e1m",
-"Lower Roman": "Kis r\u00f3mai sz\u00e1m",
-"Upper Alpha": "Nagybet\u0171",
-"Upper Roman": "Nagy r\u00f3mai sz\u00e1m",
-"Anchor": "Horgony",
-"Name": "N\u00e9v",
-"Id": "Azonos\u00edt\u00f3",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Az azonos\u00edt\u00f3nak bet\u0171vel kell kezd\u0151dnie, azut\u00e1n csak bet\u0171ket, sz\u00e1mokat, gondolatjeleket, pontokat, kett\u0151spontokat vagy al\u00e1h\u00faz\u00e1st tartalmazhat.",
-"You have unsaved changes are you sure you want to navigate away?": "Nem mentett m\u00f3dos\u00edt\u00e1said vannak, biztos hogy el akarsz navig\u00e1lni?",
-"Restore last draft": "Utols\u00f3 piszkozat vissza\u00e1ll\u00edt\u00e1sa",
-"Special character": "Speci\u00e1lis karakter",
-"Source code": "Forr\u00e1sk\u00f3d",
-"Insert\/Edit code sample": "K\u00f3dminta besz\u00far\u00e1sa\/szerkeszt\u00e9se",
-"Language": "Nyelv",
-"Code sample": "K\u00f3d p\u00e9lda",
-"Color": "Sz\u00edn",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Balr\u00f3l jobbra",
-"Right to left": "Jobbr\u00f3l balra",
-"Emoticons": "Vigyorok",
-"Document properties": "Dokumentum tulajdons\u00e1gai",
-"Title": "C\u00edm",
-"Keywords": "Kulcsszavak",
-"Description": "Le\u00edr\u00e1s",
-"Robots": "Robotok",
-"Author": "Szerz\u0151",
-"Encoding": "K\u00f3dol\u00e1s",
-"Fullscreen": "Teljes k\u00e9perny\u0151",
-"Action": "M\u0171velet",
-"Shortcut": "Parancsikon",
-"Help": "S\u00fag\u00f3",
-"Address": "C\u00edm",
-"Focus to menubar": "F\u00f3kusz a men\u00fcre",
-"Focus to toolbar": "F\u00f3kusz az eszk\u00f6zt\u00e1rra",
-"Focus to element path": "F\u00f3kusz az elemek \u00fatvonal\u00e1ra",
-"Focus to contextual toolbar": "F\u00f3kusz a k\u00f6rnyezetf\u00fcgg\u0151 eszk\u00f6zt\u00e1rra",
-"Insert link (if link plugin activated)": "Hivatkoz\u00e1s besz\u00far\u00e1sa (ha a hivatkoz\u00e1s b\u0151v\u00edtm\u00e9ny enged\u00e9lyezett)",
-"Save (if save plugin activated)": "Ment\u00e9s (ha a ment\u00e9s b\u0151v\u00edtm\u00e9ny enged\u00e9lyezett)",
-"Find (if searchreplace plugin activated)": "Keres\u00e9s (ha a keres\u00e9s \u00e9s csere b\u0151v\u00edtm\u00e9ny enged\u00e9lyezett)",
-"Plugins installed ({0}):": "Telep\u00edtett b\u0151v\u00edtm\u00e9nyek ({0}):",
-"Premium plugins:": "Pr\u00e9mium b\u0151v\u00edtm\u00e9nyek:",
-"Learn more...": "Tudj meg t\u00f6bbet...",
-"You are using {0}": "Haszn\u00e1latban: {0}",
-"Plugins": "Pluginek",
-"Handy Shortcuts": "Hasznos linkek",
-"Horizontal line": "V\u00edzszintes vonal",
-"Insert\/edit image": "K\u00e9p beilleszt\u00e9se\/szerkeszt\u00e9se",
-"Image description": "K\u00e9p le\u00edr\u00e1sa",
-"Source": "Forr\u00e1s",
-"Dimensions": "M\u00e9retek",
-"Constrain proportions": "M\u00e9retar\u00e1ny",
-"General": "\u00c1ltal\u00e1nos",
-"Advanced": "Halad\u00f3",
-"Style": "St\u00edlus",
-"Vertical space": "Vertik\u00e1lis hely",
-"Horizontal space": "Horizont\u00e1lis hely",
-"Border": "Szeg\u00e9ly",
-"Insert image": "K\u00e9p beilleszt\u00e9se",
-"Image": "K\u00e9p",
-"Image list": "K\u00e9p lista",
-"Rotate counterclockwise": "Forgat\u00e1s az \u00f3ramutat\u00f3 j\u00e1r\u00e1s\u00e1val ellent\u00e9tesen",
-"Rotate clockwise": "Forgat\u00e1s az \u00f3ramutat\u00f3 j\u00e1r\u00e1s\u00e1val megegyez\u0151en",
-"Flip vertically": "F\u00fcgg\u0151leges t\u00fckr\u00f6z\u00e9s",
-"Flip horizontally": "V\u00edzszintes t\u00fckr\u00f6z\u00e9s",
-"Edit image": "K\u00e9p szerkeszt\u00e9se",
-"Image options": "K\u00e9p be\u00e1ll\u00edt\u00e1sok",
-"Zoom in": "Nagy\u00edt\u00e1s",
-"Zoom out": "Kicsiny\u00edt\u00e9s",
-"Crop": "K\u00e9p v\u00e1g\u00e1s",
-"Resize": "\u00c1tm\u00e9retez\u00e9s",
-"Orientation": "K\u00e9p t\u00e1jol\u00e1s",
-"Brightness": "F\u00e9nyer\u0151",
-"Sharpen": "\u00c9less\u00e9g",
-"Contrast": "Kontraszt",
-"Color levels": "Sz\u00ednszint",
-"Gamma": "Gamma",
-"Invert": "Inverz k\u00e9p",
-"Apply": "Ment\u00e9s",
-"Back": "Vissza",
-"Insert date\/time": "D\u00e1tum\/id\u0151 beilleszt\u00e9se",
-"Date\/time": "D\u00e1tum\/id\u0151",
-"Insert link": "Hivatkoz\u00e1s beilleszt\u00e9se",
-"Insert\/edit link": "Hivatkoz\u00e1s beilleszt\u00e9se\/szerkeszt\u00e9se",
-"Text to display": "Megjelen\u0151 sz\u00f6veg",
-"Url": "URL",
-"Target": "C\u00e9l",
-"None": "Nincs",
-"New window": "\u00daj ablak",
-"Remove link": "Hivatkoz\u00e1s t\u00f6rl\u00e9se",
-"Anchors": "Horgonyok",
-"Link": "Hivatkoz\u00e1s",
-"Paste or type a link": "Hivatkoz\u00e1s be\u00edr\u00e1sa vagy beilleszt\u00e9se",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "A megadott URL email c\u00edmnek t\u0171nik. Szeretn\u00e9d hozz\u00e1adni a sz\u00fcks\u00e9ges mailto: el\u0151tagot?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "A megadott URL k\u00fcls\u0151 c\u00edmnek t\u0171nik. Szeretn\u00e9d hozz\u00e1adni a sz\u00fcks\u00e9ges http:\/\/ el\u0151tagot?",
-"Link list": "Hivatkoz\u00e1slista",
-"Insert video": "Vide\u00f3 beilleszt\u00e9se",
-"Insert\/edit video": "Vide\u00f3 beilleszt\u00e9se\/szerkeszt\u00e9se",
-"Insert\/edit media": "M\u00e9dia besz\u00far\u00e1sa\/beilleszt\u00e9se",
-"Alternative source": "Alternat\u00edv forr\u00e1s",
-"Poster": "El\u0151n\u00e9zeti k\u00e9p",
-"Paste your embed code below:": "Illeszd be a be\u00e1gyaz\u00f3 k\u00f3dot alulra:",
-"Embed": "Be\u00e1gyaz\u00e1s",
-"Media": "M\u00e9dia",
-"Nonbreaking space": "Nem t\u00f6rhet\u0151 sz\u00f3k\u00f6z",
-"Page break": "Oldalt\u00f6r\u00e9s",
-"Paste as text": "Beilleszt\u00e9s sz\u00f6vegk\u00e9nt",
-"Preview": "El\u0151n\u00e9zet",
-"Print": "Nyomtat\u00e1s",
-"Save": "Ment\u00e9s",
-"Find": "Keres\u00e9s",
-"Replace with": "Csere erre",
-"Replace": "Csere",
-"Replace all": "Az \u00f6sszes cser\u00e9je",
-"Prev": "El\u0151z\u0151",
-"Next": "K\u00f6vetkez\u0151",
-"Find and replace": "Keres\u00e9s \u00e9s csere",
-"Could not find the specified string.": "A be\u00edrt kifejez\u00e9s nem tal\u00e1lhat\u00f3.",
-"Match case": "Kis \u00e9s nagybet\u0171k megk\u00fcl\u00f6nb\u00f6ztet\u00e9se",
-"Whole words": "Csak ha ez a teljes sz\u00f3",
-"Spellcheck": "Helyes\u00edr\u00e1s ellen\u0151rz\u00e9s",
-"Ignore": "Figyelmen k\u00edv\u00fcl hagy",
-"Ignore all": "Mindent figyelmen k\u00edv\u00fcl hagy",
-"Finish": "Befejez\u00e9s",
-"Add to Dictionary": "Sz\u00f3t\u00e1rhoz ad",
-"Insert table": "T\u00e1bl\u00e1zat beilleszt\u00e9se",
-"Table properties": "T\u00e1bl\u00e1zat tulajdons\u00e1gok",
-"Delete table": "T\u00e1bl\u00e1zat t\u00f6rl\u00e9se",
-"Cell": "Cella",
-"Row": "Sor",
-"Column": "Oszlop",
-"Cell properties": "Cella tulajdons\u00e1gok",
-"Merge cells": "Cell\u00e1k egyes\u00edt\u00e9se",
-"Split cell": "Cell\u00e1k sz\u00e9tv\u00e1laszt\u00e1sa",
-"Insert row before": "Sor besz\u00far\u00e1sa el\u00e9",
-"Insert row after": "Sor besz\u00far\u00e1sa m\u00f6g\u00e9",
-"Delete row": "Sor t\u00f6rl\u00e9se",
-"Row properties": "Sor tulajdons\u00e1gai",
-"Cut row": "Sor kiv\u00e1g\u00e1sa",
-"Copy row": "Sor m\u00e1sol\u00e1sa",
-"Paste row before": "Sor beilleszt\u00e9se el\u00e9",
-"Paste row after": "Sor beilleszt\u00e9se m\u00f6g\u00e9",
-"Insert column before": "Oszlop besz\u00far\u00e1sa el\u00e9",
-"Insert column after": "Oszlop besz\u00far\u00e1sa m\u00f6g\u00e9",
-"Delete column": "Oszlop t\u00f6rl\u00e9se",
-"Cols": "Oszlopok",
-"Rows": "Sorok",
-"Width": "Sz\u00e9less\u00e9g",
-"Height": "Magass\u00e1g",
-"Cell spacing": "Cell\u00e1k t\u00e1vols\u00e1ga",
-"Cell padding": "Cella m\u00e9rete",
-"Caption": "Felirat",
-"Left": "Bal",
-"Center": "K\u00f6z\u00e9p",
-"Right": "Jobb",
-"Cell type": "Cella t\u00edpusa",
-"Scope": "Hat\u00f3k\u00f6r",
-"Alignment": "Igaz\u00edt\u00e1s",
-"H Align": "V\u00edzszintes igaz\u00edt\u00e1s",
-"V Align": "F\u00fcgg\u0151leges igaz\u00edt\u00e1s",
-"Top": "Fel\u00fcl",
-"Middle": "K\u00f6z\u00e9pen",
-"Bottom": "Alul",
-"Header cell": "Fejl\u00e9c cella",
-"Row group": "Sor csoport",
-"Column group": "Oszlop csoport",
-"Row type": "Sor t\u00edpus",
-"Header": "Fejl\u00e9c",
-"Body": "Sz\u00f6vegt\u00f6rzs",
-"Footer": "L\u00e1bl\u00e9c",
-"Border color": "Szeg\u00e9ly sz\u00edne",
-"Insert template": "Sablon beilleszt\u00e9se",
-"Templates": "Sablonok",
-"Template": "Sablon",
-"Text color": "Sz\u00f6veg sz\u00edne",
-"Background color": "H\u00e1tt\u00e9r sz\u00edn",
-"Custom...": "Egy\u00e9ni...",
-"Custom color": "Egy\u00e9ni sz\u00edn",
-"No color": "Nincs sz\u00edn",
-"Table of Contents": "Tartalomjegyz\u00e9k",
-"Show blocks": "Blokkok mutat\u00e1sa",
-"Show invisible characters": "L\u00e1thatatlan karakterek mutat\u00e1sa",
-"Words: {0}": "Szavak: {0}",
-"{0} words": "{0} sz\u00f3",
-"File": "F\u00e1jl",
-"Edit": "Szerkeszt\u00e9s",
-"Insert": "Beilleszt\u00e9s",
-"View": "N\u00e9zet",
-"Format": "Form\u00e1tum",
-"Table": "T\u00e1bl\u00e1zat",
-"Tools": "Eszk\u00f6z\u00f6k",
-"Powered by {0}": "\u00dczemelteti: {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text ter\u00fclet. Nyomj ALT-F9-et a men\u00fch\u00f6z. Nyomj ALT-F10-et az eszk\u00f6zt\u00e1rhoz. Nyomj ALT-0-t a s\u00fag\u00f3hoz"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/id.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/id.js
deleted file mode 100644
index af2d4078d3..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/id.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('id',{
-"Redo": "Ulang",
-"Undo": "Batal",
-"Cut": "Penggal",
-"Copy": "Salin",
-"Paste": "Tempel",
-"Select all": "Pilih semua",
-"New document": "Dokumen baru",
-"Ok": "Ok",
-"Cancel": "Batal",
-"Visual aids": "Alat bantu visual",
-"Bold": "Tebal",
-"Italic": "Miring",
-"Underline": "Garis bawah",
-"Strikethrough": "Coret",
-"Superscript": "Superskrip",
-"Subscript": "Subskrip",
-"Clear formatting": "Hapus format",
-"Align left": "Rata kiri",
-"Align center": "Rata tengah",
-"Align right": "Rata kanan",
-"Justify": "Penuh",
-"Bullet list": "Daftar bersimbol",
-"Numbered list": "Daftar bernomor",
-"Decrease indent": "Turunkan inden",
-"Increase indent": "Tambah inden",
-"Close": "Tutup",
-"Formats": "Format",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Browser anda tidak mendukung akses langsung ke clipboard. Silahkan gunakan Ctrl+X\/C\/V dari keyboard.",
-"Headers": "Judul",
-"Header 1": "Judul 1",
-"Header 2": "Judul 2",
-"Header 3": "Judul 3",
-"Header 4": "Judul 4",
-"Header 5": "Judul 5",
-"Header 6": "Judul 6",
-"Headings": "Judul",
-"Heading 1": "Judul 1",
-"Heading 2": "Judul 2",
-"Heading 3": "Judul 3",
-"Heading 4": "Judul 4",
-"Heading 5": "Judul 5",
-"Heading 6": "Judul 6",
-"Preformatted": "Monokode",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kode",
-"Paragraph": "Paragraf",
-"Blockquote": "Kutipan",
-"Inline": "Baris",
-"Blocks": "Blok",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Penempelan sekarang dalam modus teks biasa. Konten sekarang akan disisipkan sebagai teks biasa sampai Anda memadamkan pilihan ini.",
-"Font Family": "Jenis Huruf",
-"Font Sizes": "Ukuran Huruf",
-"Class": "Klas",
-"Browse for an image": "Cari gambar",
-"OR": "Atau",
-"Drop an image here": "Letakan gambar di sini",
-"Upload": "Unggah",
-"Block": "Blok",
-"Align": "Menyelaraskan",
-"Default": "Bawaan",
-"Circle": "Lingkaran",
-"Disc": "Cakram",
-"Square": "Kotak",
-"Lower Alpha": "Huruf Kecil",
-"Lower Greek": "Huruf Kecil Yunani",
-"Lower Roman": "Huruf Kecil Romawi",
-"Upper Alpha": "Huruf Besar",
-"Upper Roman": "Huruf Besar Romawi",
-"Anchor": "Jangkar",
-"Name": "Nama",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id harus dimulai dengan huruf, dan hanya diikuti oleh huruf, angka, koma, titik, titik koma atau garis bawah.",
-"You have unsaved changes are you sure you want to navigate away?": "Anda memiliki perubahan yang belum disimpan, yakin ingin beralih ?",
-"Restore last draft": "Muat kembali draft sebelumnya",
-"Special character": "Spesial karakter",
-"Source code": "Kode sumber",
-"Insert\/Edit code sample": "Tambah\/Edit contoh kode",
-"Language": "Bahasa",
-"Code sample": "Contoh kode",
-"Color": "Warna",
-"R": "M",
-"G": "H",
-"B": "B",
-"Left to right": "Kiri ke kanan",
-"Right to left": "Kanan ke kiri",
-"Emoticons": "Emotikon",
-"Document properties": "Properti dokumwn",
-"Title": "Judul",
-"Keywords": "Kata kunci",
-"Description": "Deskripsi",
-"Robots": "Robot",
-"Author": "Penulis",
-"Encoding": "Enkoding",
-"Fullscreen": "Layar penuh",
-"Action": "Tindakan",
-"Shortcut": "Pintasan",
-"Help": "Bantuan",
-"Address": "Alamat",
-"Focus to menubar": "Fokus ke menubar",
-"Focus to toolbar": "Fokus ke toolbar",
-"Focus to element path": "Fokus ke jalur elemen",
-"Focus to contextual toolbar": "Fokus ke toolbar kontekstual",
-"Insert link (if link plugin activated)": "Masukan link (jika plugin diaktifkan)",
-"Save (if save plugin activated)": "Simpan (jika plugin simpan diaktifkan)",
-"Find (if searchreplace plugin activated)": "Cari (jika plugin searchplace diaktifkan)",
-"Plugins installed ({0}):": "Plugin terpasang ({0})",
-"Premium plugins:": "Plugin premium:",
-"Learn more...": "Pelajari selengkapnya...",
-"You are using {0}": "Anda menggunakan {0}",
-"Plugins": "Plugin",
-"Handy Shortcuts": "Pintasan Praktis",
-"Horizontal line": "Garis horisontal",
-"Insert\/edit image": "Sisip\/sunting gambar",
-"Image description": "Deskripsi gambar",
-"Source": "Sumber",
-"Dimensions": "Dimensi",
-"Constrain proportions": "Samakan proporsi",
-"General": "Umum",
-"Advanced": "Lanjutan",
-"Style": "Gaya",
-"Vertical space": "Spasi vertikal",
-"Horizontal space": "Spasi horisontal",
-"Border": "Batas",
-"Insert image": "Sisipkan gambar",
-"Image": "Gambar",
-"Image list": "Daftar gambar",
-"Rotate counterclockwise": "Putar berlawananjarumjam",
-"Rotate clockwise": "Putar searahjarumjam",
-"Flip vertically": "Balik vertikal",
-"Flip horizontally": "Balik horisontal",
-"Edit image": "Sunting gambar",
-"Image options": "Opsi gambar",
-"Zoom in": "Perbesar",
-"Zoom out": "Perkecil",
-"Crop": "Krop",
-"Resize": "Ubah ukuran",
-"Orientation": "Orientasi",
-"Brightness": "Kecerahan",
-"Sharpen": "Ketajaman",
-"Contrast": "Kontras",
-"Color levels": "Tingakt warna",
-"Gamma": "Gamma",
-"Invert": "Kebalikan",
-"Apply": "Terapkan",
-"Back": "Kembali",
-"Insert date\/time": "Sisipkan tanggal\/waktu",
-"Date\/time": "Tanggal\/waktu",
-"Insert link": "Sisipkan tautan",
-"Insert\/edit link": "Sisip\/sunting tautan",
-"Text to display": "Teks yang ditampilkan",
-"Url": "Tautan",
-"Target": "Jendela tujuan",
-"None": "Tidak ada",
-"New window": "Jendela baru",
-"Remove link": "Buang tautan",
-"Anchors": "Jangkar",
-"Link": "Tautan",
-"Paste or type a link": "Tempel atau ketik sebuah tautan",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Tautan yang anda masukkan sepertinya adalah alamat email. Apakah Anda ingin menambahkan prefiks mailto: yang dibutuhkan?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Tautan yang anda masukkan sepertinya adalah tautan eksternal. Apakah Anda ingin menambahkan prefiks http:\/\/ yang dibutuhkan?",
-"Link list": "Daftar tautan",
-"Insert video": "Sisipkan video",
-"Insert\/edit video": "Sisip\/sunting video",
-"Insert\/edit media": "Sisip\/sunting media",
-"Alternative source": "Sumber alternatif",
-"Poster": "Penulis",
-"Paste your embed code below:": "Tempel kode yang diembed dibawah ini:",
-"Embed": "Embed",
-"Media": "Media",
-"Nonbreaking space": "Spasi",
-"Page break": "Baris baru",
-"Paste as text": "Tempel sebagai teks biasa",
-"Preview": "Pratinjau",
-"Print": "Cetak",
-"Save": "Simpan",
-"Find": "Cari",
-"Replace with": "Ganti dengan",
-"Replace": "Ganti",
-"Replace all": "Ganti semua",
-"Prev": "Sebelumnya",
-"Next": "Berikutnya",
-"Find and replace": "Cari dan ganti",
-"Could not find the specified string.": "Tidak dapat menemukan string yang dimaksud.",
-"Match case": "Samakan besar kecil huruf",
-"Whole words": "Semua kata",
-"Spellcheck": "Periksa ejaan",
-"Ignore": "Abaikan",
-"Ignore all": "Abaikan semua",
-"Finish": "Selesai",
-"Add to Dictionary": "Tambahkan ke kamus",
-"Insert table": "Sisipkan tabel",
-"Table properties": "Properti tabel",
-"Delete table": "Hapus tabel",
-"Cell": "Sel",
-"Row": "Baris",
-"Column": "Kolom",
-"Cell properties": "Properti sel",
-"Merge cells": "Gabung sel",
-"Split cell": "Bagi sel",
-"Insert row before": "Sisipkan baris sebelum",
-"Insert row after": "Sisipkan baris setelah",
-"Delete row": "Hapus baris",
-"Row properties": "Properti baris",
-"Cut row": "Penggal baris",
-"Copy row": "Salin baris",
-"Paste row before": "Tempel baris sebelum",
-"Paste row after": "Tempel baris setelah",
-"Insert column before": "Sisipkan kolom sebelum",
-"Insert column after": "Sisipkan kolom setelah",
-"Delete column": "Hapus kolom",
-"Cols": "Kolom",
-"Rows": "Baris",
-"Width": "Lebar",
-"Height": "Tinggi",
-"Cell spacing": "Spasi sel ",
-"Cell padding": "Lapisan sel",
-"Caption": "Caption",
-"Left": "Kiri",
-"Center": "Tengah",
-"Right": "Kanan",
-"Cell type": "Tipe sel",
-"Scope": "Skup",
-"Alignment": "Penjajaran",
-"H Align": "Rata Samping",
-"V Align": "Rata Atas",
-"Top": "Atas",
-"Middle": "Tengah",
-"Bottom": "Bawah",
-"Header cell": "Judul sel",
-"Row group": "Kelompok baris",
-"Column group": "Kelompok kolom",
-"Row type": "Tipe baris",
-"Header": "Judul",
-"Body": "Body",
-"Footer": "Footer",
-"Border color": "Warna batas",
-"Insert template": "Sisipkan templat",
-"Templates": "Templat",
-"Template": "Templat",
-"Text color": "Warna teks",
-"Background color": "Warna latar",
-"Custom...": "Atur sendiri...",
-"Custom color": "Warna sendiri",
-"No color": "Tidak berwarna",
-"Table of Contents": "Daftar Isi",
-"Show blocks": "Tampilkan blok",
-"Show invisible characters": "Tampilkan karakter tak tampak",
-"Words: {0}": "Kata: {0}",
-"{0} words": "{0} kata",
-"File": "Berkas",
-"Edit": "Sunting",
-"Insert": "Sisip",
-"View": "Tampilan",
-"Format": "Format",
-"Table": "Tabel",
-"Tools": "Alat",
-"Powered by {0}": "Didukung oleh {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Area teks kaya. Tekan ALT-F9 untuk menu. Tekan ALT-F10 untuk toolbar. Tekan ALT-0 untuk bantuan"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/it.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/it.js
deleted file mode 100644
index a97118da21..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/it.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('it',{
-"Redo": "Ripeti",
-"Undo": "Indietro",
-"Cut": "Taglia",
-"Copy": "Copia",
-"Paste": "Incolla",
-"Select all": "Seleziona Tutto",
-"New document": "Nuovo Documento",
-"Ok": "Ok",
-"Cancel": "Annulla",
-"Visual aids": "Elementi Visivi",
-"Bold": "Grassetto",
-"Italic": "Corsivo",
-"Underline": "Sottolineato",
-"Strikethrough": "Barrato",
-"Superscript": "Apice",
-"Subscript": "Pedice",
-"Clear formatting": "Cancella Formattazione",
-"Align left": "Allinea a Sinistra",
-"Align center": "Allinea al Cento",
-"Align right": "Allinea a Destra",
-"Justify": "Giustifica",
-"Bullet list": "Elenchi Puntati",
-"Numbered list": "Elenchi Numerati",
-"Decrease indent": "Riduci Rientro",
-"Increase indent": "Aumenta Rientro",
-"Close": "Chiudi",
-"Formats": "Formattazioni",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Il tuo browser non supporta l'accesso diretto negli Appunti. Per favore usa i tasti di scelta rapida Ctrl+X\/C\/V.",
-"Headers": "Intestazioni",
-"Header 1": "Intestazione 1",
-"Header 2": "Header 2",
-"Header 3": "Intestazione 3",
-"Header 4": "Intestazione 4",
-"Header 5": "Intestazione 5",
-"Header 6": "Intestazione 6",
-"Headings": "Intestazioni",
-"Heading 1": "Intestazione 1",
-"Heading 2": "Intestazione 2",
-"Heading 3": "Intestazione 3",
-"Heading 4": "Intestazione 4",
-"Heading 5": "Intestazione 5",
-"Heading 6": "Intestazione 6",
-"Preformatted": "Preformattato",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Codice",
-"Paragraph": "Paragrafo",
-"Blockquote": "Blockquote",
-"Inline": "Inlinea",
-"Blocks": "Blocchi",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Incolla \u00e8 in modalit\u00e0 testo normale. I contenuti sono incollati come testo normale se non disattivi l'opzione.",
-"Font Family": "Famiglia font",
-"Font Sizes": "Dimensioni font",
-"Class": "Classe",
-"Browse for an image": "Scegli un'immagine",
-"OR": "o",
-"Drop an image here": "Incolla un'immagine qui",
-"Upload": "Carica",
-"Block": "Blocco",
-"Align": "Allinea",
-"Default": "Default",
-"Circle": "Cerchio",
-"Disc": "Disco",
-"Square": "Quadrato",
-"Lower Alpha": "Alpha Minore",
-"Lower Greek": "Greek Minore",
-"Lower Roman": "Roman Minore",
-"Upper Alpha": "Alpha Superiore",
-"Upper Roman": "Roman Superiore",
-"Anchor": "Fissa",
-"Name": "Nome",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "L'id dovrebbe cominciare con una lettera, seguito solo da lettere, numeri, linee, punti, virgole.",
-"You have unsaved changes are you sure you want to navigate away?": "Non hai salvato delle modifiche, sei sicuro di andartene?",
-"Restore last draft": "Ripristina l'ultima bozza.",
-"Special character": "Carattere Speciale",
-"Source code": "Codice Sorgente",
-"Insert\/Edit code sample": "Inserisci\/Modifica esempio di codice",
-"Language": "Lingua",
-"Code sample": "Esempio di codice",
-"Color": "Colore",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Da Sinistra a Destra",
-"Right to left": "Da Destra a Sinistra",
-"Emoticons": "Emoction",
-"Document properties": "Propriet\u00e0 Documento",
-"Title": "Titolo",
-"Keywords": "Parola Chiave",
-"Description": "Descrizione",
-"Robots": "Robot",
-"Author": "Autore",
-"Encoding": "Codifica",
-"Fullscreen": "Schermo Intero",
-"Action": "Azione",
-"Shortcut": "Scorciatoia",
-"Help": "Aiuto",
-"Address": "Indirizzo",
-"Focus to menubar": "Focus sulla barra del menu",
-"Focus to toolbar": "Focus sulla barra degli strumenti",
-"Focus to element path": "Focus sul percorso dell'elemento",
-"Focus to contextual toolbar": "Focus sulla barra degli strumenti contestuale",
-"Insert link (if link plugin activated)": "Inserisci link (se il plugin link \u00e8 attivato)",
-"Save (if save plugin activated)": "Salva (se il plugin save \u00e8 attivato)",
-"Find (if searchreplace plugin activated)": "Trova (se il plugin searchreplace \u00e8 attivato)",
-"Plugins installed ({0}):": "Plugin installati ({0}):",
-"Premium plugins:": "Plugin Premium:",
-"Learn more...": "Per saperne di pi\u00f9...",
-"You are using {0}": "Stai usando {0}",
-"Plugins": "Plugin",
-"Handy Shortcuts": "Scorciatoia pratica",
-"Horizontal line": "Linea Orizzontale",
-"Insert\/edit image": "Aggiungi\/Modifica Immagine",
-"Image description": "Descrizione Immagine",
-"Source": "Fonte",
-"Dimensions": "Dimenzioni",
-"Constrain proportions": "Mantieni Proporzioni",
-"General": "Generale",
-"Advanced": "Avanzato",
-"Style": "Stile",
-"Vertical space": "Spazio Verticale",
-"Horizontal space": "Spazio Orizzontale",
-"Border": "Bordo",
-"Insert image": "Inserisci immagine",
-"Image": "Immagine",
-"Image list": "Elenco immagini",
-"Rotate counterclockwise": "Ruota in senso antiorario",
-"Rotate clockwise": "Ruota in senso orario",
-"Flip vertically": "Rifletti verticalmente",
-"Flip horizontally": "Rifletti orizzontalmente",
-"Edit image": "Modifica immagine",
-"Image options": "Opzioni immagine",
-"Zoom in": "Ingrandisci",
-"Zoom out": "Rimpicciolisci",
-"Crop": "Taglia",
-"Resize": "Ridimensiona",
-"Orientation": "Orientamento",
-"Brightness": "Luminosit\u00e0",
-"Sharpen": "Contrasta",
-"Contrast": "Contrasto",
-"Color levels": "Livelli colore",
-"Gamma": "Gamma",
-"Invert": "Inverti",
-"Apply": "Applica",
-"Back": "Indietro",
-"Insert date\/time": "Inserisci Data\/Ora",
-"Date\/time": "Data\/Ora",
-"Insert link": "Inserisci il Link",
-"Insert\/edit link": "Inserisci\/Modifica Link",
-"Text to display": "Testo da Visualizzare",
-"Url": "URL",
-"Target": "Target",
-"None": "No",
-"New window": "Nuova Finestra",
-"Remove link": "Rimuovi link",
-"Anchors": "Anchors",
-"Link": "Collegamento",
-"Paste or type a link": "Incolla o digita un collegamento",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL inserito sembra essere un indirizzo email. Vuoi aggiungere il prefisso necessario mailto:?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL inserito sembra essere un collegamento esterno. Vuoi aggiungere il prefisso necessario http:\/\/?",
-"Link list": "Elenco link",
-"Insert video": "Inserisci Video",
-"Insert\/edit video": "Inserisci\/Modifica Video",
-"Insert\/edit media": "Inserisci\/Modifica Media",
-"Alternative source": "Alternativo",
-"Poster": "Anteprima",
-"Paste your embed code below:": "Incolla il codice d'incorporamento qui:",
-"Embed": "Incorporare",
-"Media": "Media",
-"Nonbreaking space": "Spazio unificatore",
-"Page break": "Interruzione di pagina",
-"Paste as text": "incolla come testo",
-"Preview": "Anteprima",
-"Print": "Stampa",
-"Save": "Salva",
-"Find": "Trova",
-"Replace with": "Sostituisci Con",
-"Replace": "Sostituisci",
-"Replace all": "Sostituisci Tutto",
-"Prev": "Precedente",
-"Next": "Successivo",
-"Find and replace": "Trova e Sostituisci",
-"Could not find the specified string.": "Impossibile trovare la parola specifica.",
-"Match case": "Maiuscole\/Minuscole ",
-"Whole words": "Parole Sbagliate",
-"Spellcheck": "Controllo ortografico",
-"Ignore": "Ignora",
-"Ignore all": "Ignora Tutto",
-"Finish": "Termina",
-"Add to Dictionary": "Aggiungi al Dizionario",
-"Insert table": "Inserisci Tabella",
-"Table properties": "Propiet\u00e0 della Tabella",
-"Delete table": "Cancella Tabella",
-"Cell": "Cella",
-"Row": "Riga",
-"Column": "Colonna",
-"Cell properties": "Propiet\u00e0 della Cella",
-"Merge cells": "Unisci Cella",
-"Split cell": "Dividi Cella",
-"Insert row before": "Inserisci una Riga Prima",
-"Insert row after": "Inserisci una Riga Dopo",
-"Delete row": "Cancella Riga",
-"Row properties": "Propriet\u00e0 della Riga",
-"Cut row": "Taglia Riga",
-"Copy row": "Copia Riga",
-"Paste row before": "Incolla una Riga Prima",
-"Paste row after": "Incolla una Riga Dopo",
-"Insert column before": "Inserisci una Colonna Prima",
-"Insert column after": "Inserisci una Colonna Dopo",
-"Delete column": "Cancella Colonna",
-"Cols": "Colonne",
-"Rows": "Righe",
-"Width": "Larghezza",
-"Height": "Altezza",
-"Cell spacing": "Spaziatura della Cella",
-"Cell padding": "Padding della Cella",
-"Caption": "Didascalia",
-"Left": "Sinistra",
-"Center": "Centro",
-"Right": "Destra",
-"Cell type": "Tipo di Cella",
-"Scope": "Campo",
-"Alignment": "Allineamento",
-"H Align": "Allineamento H",
-"V Align": "Allineamento V",
-"Top": "In alto",
-"Middle": "In mezzo",
-"Bottom": "In fondo",
-"Header cell": "cella d'intestazione",
-"Row group": "Gruppo di Righe",
-"Column group": "Gruppo di Colonne",
-"Row type": "Tipo di Riga",
-"Header": "Header",
-"Body": "Body",
-"Footer": "Footer",
-"Border color": "Colore bordo",
-"Insert template": "Inserisci Template",
-"Templates": "Template",
-"Template": "Modello",
-"Text color": "Colore Testo",
-"Background color": "Colore Background",
-"Custom...": "Personalizzato...",
-"Custom color": "Colore personalizzato",
-"No color": "Nessun colore",
-"Table of Contents": "Tabella dei contenuti",
-"Show blocks": "Mostra Blocchi",
-"Show invisible characters": "Mostra Caratteri Invisibili",
-"Words: {0}": "Parole: {0}",
-"{0} words": "{0} parole",
-"File": "File",
-"Edit": "Modifica",
-"Insert": "Inserisci",
-"View": "Visualiza",
-"Format": "Formato",
-"Table": "Tabella",
-"Tools": "Strumenti",
-"Powered by {0}": "Fornito da {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Premi ALT-F9 per il men\u00f9. Premi ALT-F10 per la barra degli strumenti. Premi ALT-0 per l'aiuto."
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ja.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ja.js
deleted file mode 100644
index 61f0ba61a1..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ja.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('ja',{
-"Redo": "\u3084\u308a\u76f4\u3059",
-"Undo": "\u5143\u306b\u623b\u3059",
-"Cut": "\u5207\u308a\u53d6\u308a",
-"Copy": "\u30b3\u30d4\u30fc",
-"Paste": "\u8cbc\u308a\u4ed8\u3051",
-"Select all": "\u5168\u3066\u3092\u9078\u629e",
-"New document": "\u65b0\u898f\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8",
-"Ok": "OK",
-"Cancel": "\u30ad\u30e3\u30f3\u30bb\u30eb",
-"Visual aids": "\u8868\u306e\u67a0\u7dda\u3092\u70b9\u7dda\u3067\u8868\u793a",
-"Bold": "\u592a\u5b57",
-"Italic": "\u659c\u4f53",
-"Underline": "\u4e0b\u7dda",
-"Strikethrough": "\u53d6\u308a\u6d88\u3057\u7dda",
-"Superscript": "\u4e0a\u4ed8\u304d\u6587\u5b57",
-"Subscript": "\u4e0b\u4ed8\u304d\u6587\u5b57",
-"Clear formatting": "\u66f8\u5f0f\u3092\u30af\u30ea\u30a2",
-"Align left": "\u5de6\u5bc4\u305b",
-"Align center": "\u4e2d\u592e\u63c3\u3048",
-"Align right": "\u53f3\u5bc4\u305b",
-"Justify": "\u4e21\u7aef\u63c3\u3048",
-"Bullet list": "\u7b87\u6761\u66f8\u304d",
-"Numbered list": "\u756a\u53f7\u4ed8\u304d\u7b87\u6761\u66f8\u304d",
-"Decrease indent": "\u30a4\u30f3\u30c7\u30f3\u30c8\u3092\u6e1b\u3089\u3059",
-"Increase indent": "\u30a4\u30f3\u30c7\u30f3\u30c8\u3092\u5897\u3084\u3059",
-"Close": "\u9589\u3058\u308b",
-"Formats": "\u66f8\u5f0f",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u304a\u4f7f\u3044\u306e\u30d6\u30e9\u30a6\u30b6\u3067\u306f\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u6a5f\u80fd\u3092\u5229\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002\u30ad\u30fc\u30dc\u30fc\u30c9\u306e\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8\uff08Ctrl+X, Ctrl+C, Ctrl+V\uff09\u3092\u304a\u4f7f\u3044\u4e0b\u3055\u3044\u3002",
-"Headers": "\u30d8\u30c3\u30c0\u30fc",
-"Header 1": "\u30d8\u30c3\u30c0\u30fc 1",
-"Header 2": "\u30d8\u30c3\u30c0\u30fc 2",
-"Header 3": "\u30d8\u30c3\u30c0\u30fc 3",
-"Header 4": "\u30d8\u30c3\u30c0\u30fc 4",
-"Header 5": "\u30d8\u30c3\u30c0\u30fc 5",
-"Header 6": "\u30d8\u30c3\u30c0\u30fc 6",
-"Headings": "\u898b\u51fa\u3057",
-"Heading 1": "\u898b\u51fa\u3057 1",
-"Heading 2": "\u898b\u51fa\u3057 2",
-"Heading 3": "\u898b\u51fa\u3057 3",
-"Heading 4": "\u898b\u51fa\u3057 4",
-"Heading 5": "\u898b\u51fa\u3057 5",
-"Heading 6": "\u898b\u51fa\u3057 6",
-"Preformatted": "Preformatted",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u30b3\u30fc\u30c9",
-"Paragraph": "\u6bb5\u843d",
-"Blockquote": "\u5f15\u7528",
-"Inline": "\u30a4\u30f3\u30e9\u30a4\u30f3",
-"Blocks": "\u30d6\u30ed\u30c3\u30af",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u8cbc\u308a\u4ed8\u3051\u306f\u73fe\u5728\u30d7\u30ec\u30fc\u30f3\u30c6\u30ad\u30b9\u30c8\u30e2\u30fc\u30c9\u3067\u3059\u3002\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u30aa\u30d5\u306b\u3057\u306a\u3044\u9650\u308a\u5185\u5bb9\u306f\u30d7\u30ec\u30fc\u30f3\u30c6\u30ad\u30b9\u30c8\u3068\u3057\u3066\u8cbc\u308a\u4ed8\u3051\u3089\u308c\u307e\u3059\u3002",
-"Font Family": "\u30d5\u30a9\u30f3\u30c8\u30d5\u30a1\u30df\u30ea\u30fc",
-"Font Sizes": "\u30d5\u30a9\u30f3\u30c8\u30b5\u30a4\u30ba",
-"Class": "\u30af\u30e9\u30b9",
-"Browse for an image": "\u30a4\u30e1\u30fc\u30b8\u3092\u53c2\u7167",
-"OR": "\u307e\u305f\u306f",
-"Drop an image here": "\u3053\u3053\u306b\u753b\u50cf\u3092\u30c9\u30ed\u30c3\u30d7",
-"Upload": "\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9",
-"Block": "\u30d6\u30ed\u30c3\u30af",
-"Align": "\u914d\u7f6e",
-"Default": "\u30c7\u30d5\u30a9\u30eb\u30c8",
-"Circle": "\u5186",
-"Disc": "\u70b9",
-"Square": "\u56db\u89d2",
-"Lower Alpha": "\u5c0f\u6587\u5b57\u306e\u30a2\u30eb\u30d5\u30a1\u30d9\u30c3\u30c8",
-"Lower Greek": "\u5c0f\u6587\u5b57\u306e\u30ae\u30ea\u30b7\u30e3\u6587\u5b57",
-"Lower Roman": "\u5c0f\u6587\u5b57\u306e\u30ed\u30fc\u30de\u6570\u5b57",
-"Upper Alpha": "\u5927\u6587\u5b57\u306e\u30a2\u30eb\u30d5\u30a1\u30d9\u30c3\u30c8",
-"Upper Roman": "\u5927\u6587\u5b57\u306e\u30ed\u30fc\u30de\u6570\u5b57",
-"Anchor": "\u30a2\u30f3\u30ab\u30fc\uff08\u30ea\u30f3\u30af\u306e\u5230\u9054\u70b9\uff09",
-"Name": "\u30a2\u30f3\u30ab\u30fc\u540d",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID\u306f\u6587\u5b57\u3067\u59cb\u307e\u308a\u3001\u6587\u5b57\u3001\u6570\u5b57\u3001\u30c0\u30c3\u30b7\u30e5\u3001\u30c9\u30c3\u30c8\u3001\u30b3\u30ed\u30f3\u307e\u305f\u306f\u30a2\u30f3\u30c0\u30fc\u30b9\u30b3\u30a2\u3067\u59cb\u307e\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002",
-"You have unsaved changes are you sure you want to navigate away?": "\u307e\u3060\u4fdd\u5b58\u3057\u3066\u3044\u306a\u3044\u5909\u66f4\u304c\u3042\u308a\u307e\u3059\u304c\u3001\u672c\u5f53\u306b\u3053\u306e\u30da\u30fc\u30b8\u3092\u96e2\u308c\u307e\u3059\u304b\uff1f",
-"Restore last draft": "\u524d\u56de\u306e\u4e0b\u66f8\u304d\u3092\u5fa9\u6d3b\u3055\u305b\u308b",
-"Special character": "\u7279\u6b8a\u6587\u5b57",
-"Source code": "\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9",
-"Insert\/Edit code sample": "\u30b3\u30fc\u30c9\u30b5\u30f3\u30d7\u30eb\u306e\u633f\u5165\u30fb\u7de8\u96c6",
-"Language": "\u8a00\u8a9e",
-"Code sample": "\u30b3\u30fc\u30c9\u30b5\u30f3\u30d7\u30eb",
-"Color": "\u30ab\u30e9\u30fc",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u5de6\u304b\u3089\u53f3",
-"Right to left": "\u53f3\u304b\u3089\u5de6",
-"Emoticons": "\u7d75\u6587\u5b57",
-"Document properties": "\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u30d7\u30ed\u30d1\u30c6\u30a3",
-"Title": "\u30bf\u30a4\u30c8\u30eb",
-"Keywords": "\u30ad\u30fc\u30ef\u30fc\u30c9",
-"Description": "\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u5185\u5bb9",
-"Robots": "\u30ed\u30dc\u30c3\u30c4",
-"Author": "\u8457\u8005",
-"Encoding": "\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0",
-"Fullscreen": "\u5168\u753b\u9762\u8868\u793a",
-"Action": "\u30a2\u30af\u30b7\u30e7\u30f3",
-"Shortcut": "\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8",
-"Help": "\u30d8\u30eb\u30d7",
-"Address": "\u30a2\u30c9\u30ec\u30b9",
-"Focus to menubar": "\u30e1\u30cb\u30e5\u30fc\u30d0\u30fc\u306b\u30d5\u30a9\u30fc\u30ab\u30b9",
-"Focus to toolbar": "\u30c4\u30fc\u30eb\u30d0\u30fc\u306b\u30d5\u30a9\u30fc\u30ab\u30b9",
-"Focus to element path": "\u8981\u7d20\u30d1\u30b9\u306b\u30d5\u30a9\u30fc\u30ab\u30b9",
-"Focus to contextual toolbar": "\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30c4\u30fc\u30eb\u30d0\u30fc\u306b\u30d5\u30a9\u30fc\u30ab\u30b9",
-"Insert link (if link plugin activated)": "\u30ea\u30f3\u30af\u3092\u633f\u5165 (\u30ea\u30f3\u30af\u30d7\u30e9\u30b0\u30a4\u30f3\u6709\u52b9\u6642)",
-"Save (if save plugin activated)": "\u4fdd\u5b58 (\u4fdd\u5b58\u30d7\u30e9\u30b0\u30a4\u30f3\u6709\u52b9\u6642)",
-"Find (if searchreplace plugin activated)": "\u691c\u7d22(\u7f6e\u63db\u30d7\u30e9\u30b0\u30a4\u30f3\u6709\u52b9\u6642)",
-"Plugins installed ({0}):": "\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u6e08\u30d7\u30e9\u30b0\u30a4\u30f3 ({0}):",
-"Premium plugins:": "\u30d7\u30ec\u30df\u30a2\u30e0\u30d7\u30e9\u30b0\u30a4\u30f3:",
-"Learn more...": "\u8a73\u7d30...",
-"You are using {0}": "\u3042\u306a\u305f\u306f {0} \u4f7f\u7528\u4e2d",
-"Plugins": "\u30d7\u30e9\u30b0\u30a4\u30f3",
-"Handy Shortcuts": "\u4fbf\u5229\u306a\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8",
-"Horizontal line": "\u6c34\u5e73\u7f6b\u7dda",
-"Insert\/edit image": "\u753b\u50cf\u306e\u633f\u5165\u30fb\u7de8\u96c6",
-"Image description": "\u753b\u50cf\u306e\u8aac\u660e\u6587",
-"Source": "\u753b\u50cf\u306e\u30bd\u30fc\u30b9",
-"Dimensions": "\u753b\u50cf\u30b5\u30a4\u30ba\uff08\u6a2a\u30fb\u7e26\uff09",
-"Constrain proportions": "\u7e26\u6a2a\u6bd4\u3092\u4fdd\u6301\u3059\u308b",
-"General": "\u4e00\u822c",
-"Advanced": "\u8a73\u7d30\u8a2d\u5b9a",
-"Style": "\u30b9\u30bf\u30a4\u30eb",
-"Vertical space": "\u7e26\u65b9\u5411\u306e\u4f59\u767d",
-"Horizontal space": "\u6a2a\u65b9\u5411\u306e\u4f59\u767d",
-"Border": "\u67a0\u7dda",
-"Insert image": "\u753b\u50cf\u306e\u633f\u5165",
-"Image": "\u753b\u50cf",
-"Image list": "\u753b\u50cf\u4e00\u89a7",
-"Rotate counterclockwise": "\u53cd\u6642\u8a08\u56de\u308a\u306b\u56de\u8ee2",
-"Rotate clockwise": "\u6642\u8a08\u56de\u308a\u306b\u56de\u8ee2",
-"Flip vertically": "\u4e0a\u4e0b\u306b\u53cd\u8ee2",
-"Flip horizontally": "\u6c34\u5e73\u306b\u53cd\u8ee2",
-"Edit image": "\u753b\u50cf\u306e\u7de8\u96c6",
-"Image options": "\u753b\u50cf\u30aa\u30d7\u30b7\u30e7\u30f3",
-"Zoom in": "\u30ba\u30fc\u30e0\u30a4\u30f3",
-"Zoom out": "\u30ba\u30fc\u30e0\u30a2\u30a6\u30c8",
-"Crop": "\u30af\u30ed\u30c3\u30d7",
-"Resize": "\u30ea\u30b5\u30a4\u30ba",
-"Orientation": "\u5411\u304d",
-"Brightness": "\u660e\u308b\u3055",
-"Sharpen": "\u30b7\u30e3\u30fc\u30d7\u5316",
-"Contrast": "\u30b3\u30f3\u30c8\u30e9\u30b9\u30c8",
-"Color levels": "\u30ab\u30e9\u30fc\u30ec\u30d9\u30eb",
-"Gamma": "\u30ac\u30f3\u30de",
-"Invert": "\u53cd\u8ee2",
-"Apply": "\u9069\u7528",
-"Back": "\u623b\u308b",
-"Insert date\/time": "\u65e5\u4ed8\u30fb\u6642\u523b",
-"Date\/time": "\u65e5\u4ed8\u30fb\u6642\u523b",
-"Insert link": "\u30ea\u30f3\u30af",
-"Insert\/edit link": "\u30ea\u30f3\u30af\u306e\u633f\u5165\u30fb\u7de8\u96c6",
-"Text to display": "\u30ea\u30f3\u30af\u5143\u30c6\u30ad\u30b9\u30c8",
-"Url": "\u30ea\u30f3\u30af\u5148URL",
-"Target": "\u30bf\u30fc\u30b2\u30c3\u30c8\u5c5e\u6027",
-"None": "\u306a\u3057",
-"New window": "\u65b0\u898f\u30a6\u30a3\u30f3\u30c9\u30a6",
-"Remove link": "\u30ea\u30f3\u30af\u306e\u524a\u9664",
-"Anchors": "\u30a2\u30f3\u30ab\u30fc\uff08\u30ea\u30f3\u30af\u306e\u5230\u9054\u70b9\uff09",
-"Link": "\u30ea\u30f3\u30af",
-"Paste or type a link": "\u30ea\u30f3\u30af\u3092\u30da\u30fc\u30b9\u30c8\u307e\u305f\u306f\u5165\u529b",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u5165\u529b\u3055\u308c\u305fURL\u306f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306e\u3088\u3046\u3067\u3059\u3002\u300cmailto:\u300d\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u304b\uff1f",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u5165\u529b\u3055\u308c\u305fURL\u306f\u5916\u90e8\u30ea\u30f3\u30af\u306e\u3088\u3046\u3067\u3059\u3002\u300chttp:\/\/\u300d\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u304b\uff1f",
-"Link list": "\u30ea\u30f3\u30af\u4e00\u89a7",
-"Insert video": "\u52d5\u753b",
-"Insert\/edit video": "\u52d5\u753b\u306e\u633f\u5165\u30fb\u7de8\u96c6",
-"Insert\/edit media": "\u30e1\u30c7\u30a3\u30a2\u306e\u633f\u5165\u30fb\u7de8\u96c6",
-"Alternative source": "\u4ee3\u66ff\u52d5\u753b\u306e\u5834\u6240",
-"Poster": "\u4ee3\u66ff\u753b\u50cf\u306e\u5834\u6240",
-"Paste your embed code below:": "\u57cb\u3081\u8fbc\u307f\u7528\u30b3\u30fc\u30c9\u3092\u4e0b\u8a18\u306b\u8cbc\u308a\u4ed8\u3051\u3066\u304f\u3060\u3055\u3044\u3002",
-"Embed": "\u57cb\u3081\u8fbc\u307f",
-"Media": "\u30e1\u30c7\u30a3\u30a2",
-"Nonbreaking space": "\u56fa\u5b9a\u30b9\u30da\u30fc\u30b9\uff08&nbsp;\uff09",
-"Page break": "\u30da\u30fc\u30b8\u533a\u5207\u308a",
-"Paste as text": "\u30c6\u30ad\u30b9\u30c8\u3068\u3057\u3066\u8cbc\u308a\u4ed8\u3051",
-"Preview": "\u30d7\u30ec\u30d3\u30e5\u30fc",
-"Print": "\u5370\u5237",
-"Save": "\u4fdd\u5b58",
-"Find": "\u691c\u7d22",
-"Replace with": "\u7f6e\u304d\u63db\u3048\u308b\u6587\u5b57",
-"Replace": "\u7f6e\u304d\u63db\u3048",
-"Replace all": "\u5168\u3066\u3092\u7f6e\u304d\u63db\u3048\u308b",
-"Prev": "\u524d",
-"Next": "\u6b21",
-"Find and replace": "\u691c\u7d22\u3068\u7f6e\u304d\u63db\u3048",
-"Could not find the specified string.": "\u304a\u63a2\u3057\u306e\u6587\u5b57\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002",
-"Match case": "\u5927\u6587\u5b57\u30fb\u5c0f\u6587\u5b57\u3092\u533a\u5225\u3059\u308b",
-"Whole words": "\u5358\u8a9e\u5358\u4f4d\u3067\u691c\u7d22\u3059\u308b",
-"Spellcheck": "\u30b9\u30da\u30eb\u30c1\u30a7\u30c3\u30af",
-"Ignore": "\u7121\u8996",
-"Ignore all": "\u5168\u3066\u3092\u7121\u8996",
-"Finish": "\u7d42\u4e86",
-"Add to Dictionary": "\u8f9e\u66f8\u306b\u8ffd\u52a0",
-"Insert table": "\u8868\u306e\u633f\u5165",
-"Table properties": "\u8868\u306e\u8a73\u7d30\u8a2d\u5b9a",
-"Delete table": "\u8868\u306e\u524a\u9664",
-"Cell": "\u30bb\u30eb",
-"Row": "\u884c",
-"Column": "\u5217",
-"Cell properties": "\u30bb\u30eb\u306e\u8a73\u7d30\u8a2d\u5b9a",
-"Merge cells": "\u30bb\u30eb\u306e\u7d50\u5408",
-"Split cell": "\u30bb\u30eb\u306e\u5206\u5272",
-"Insert row before": "\u4e0a\u5074\u306b\u884c\u3092\u633f\u5165",
-"Insert row after": "\u4e0b\u5074\u306b\u884c\u3092\u633f\u5165",
-"Delete row": "\u884c\u306e\u524a\u9664",
-"Row properties": "\u884c\u306e\u8a73\u7d30\u8a2d\u5b9a",
-"Cut row": "\u884c\u306e\u5207\u308a\u53d6\u308a",
-"Copy row": "\u884c\u306e\u30b3\u30d4\u30fc",
-"Paste row before": "\u4e0a\u5074\u306b\u884c\u3092\u8cbc\u308a\u4ed8\u3051",
-"Paste row after": "\u4e0b\u5074\u306b\u884c\u3092\u8cbc\u308a\u4ed8\u3051",
-"Insert column before": "\u5de6\u5074\u306b\u5217\u3092\u633f\u5165",
-"Insert column after": "\u53f3\u5074\u306b\u5217\u3092\u633f\u5165",
-"Delete column": "\u5217\u306e\u524a\u9664",
-"Cols": "\u5217\u6570",
-"Rows": "\u884c\u6570",
-"Width": "\u5e45",
-"Height": "\u9ad8\u3055",
-"Cell spacing": "\u30bb\u30eb\u306e\u9593\u9694",
-"Cell padding": "\u30bb\u30eb\u5185\u4f59\u767d\uff08\u30d1\u30c7\u30a3\u30f3\u30b0\uff09",
-"Caption": "\u8868\u984c",
-"Left": "\u5de6\u5bc4\u305b",
-"Center": "\u4e2d\u592e\u63c3\u3048",
-"Right": "\u53f3\u5bc4\u305b",
-"Cell type": "\u30bb\u30eb\u30bf\u30a4\u30d7",
-"Scope": "\u30b9\u30b3\u30fc\u30d7",
-"Alignment": "\u914d\u7f6e",
-"H Align": "\u6c34\u5e73\u65b9\u5411\u306e\u914d\u7f6e",
-"V Align": "\u5782\u76f4\u65b9\u5411\u306e\u914d\u7f6e",
-"Top": "\u4e0a",
-"Middle": "\u4e2d\u592e",
-"Bottom": "\u4e0b",
-"Header cell": "\u30d8\u30c3\u30c0\u30fc\u30bb\u30eb",
-"Row group": "\u884c\u30b0\u30eb\u30fc\u30d7",
-"Column group": "\u5217\u30b0\u30eb\u30fc\u30d7",
-"Row type": "\u884c\u30bf\u30a4\u30d7",
-"Header": "\u30d8\u30c3\u30c0\u30fc",
-"Body": "\u30dc\u30c7\u30a3\u30fc",
-"Footer": "\u30d5\u30c3\u30bf\u30fc",
-"Border color": "\u67a0\u7dda\u306e\u8272",
-"Insert template": "\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u633f\u5165",
-"Templates": "\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u540d",
-"Template": "\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8",
-"Text color": "\u30c6\u30ad\u30b9\u30c8\u306e\u8272",
-"Background color": "\u80cc\u666f\u8272",
-"Custom...": "\u30ab\u30b9\u30bf\u30e0...",
-"Custom color": "\u30ab\u30b9\u30bf\u30e0\u30ab\u30e9\u30fc",
-"No color": "\u30ab\u30e9\u30fc\u306a\u3057",
-"Table of Contents": "\u76ee\u6b21",
-"Show blocks": "\u6587\u7ae0\u306e\u533a\u5207\u308a\u3092\u70b9\u7dda\u3067\u8868\u793a",
-"Show invisible characters": "\u4e0d\u53ef\u8996\u6587\u5b57\u3092\u8868\u793a",
-"Words: {0}": "\u5358\u8a9e\u6570: {0}",
-"{0} words": "{0} \u30ef\u30fc\u30c9",
-"File": "\u30d5\u30a1\u30a4\u30eb",
-"Edit": "\u7de8\u96c6",
-"Insert": "\u633f\u5165",
-"View": "\u8868\u793a",
-"Format": "\u66f8\u5f0f",
-"Table": "\u8868",
-"Tools": "\u30c4\u30fc\u30eb",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u66f8\u5f0f\u4ed8\u304d\u30c6\u30ad\u30b9\u30c8\u306e\u7de8\u96c6\u753b\u9762\u3002ALT-F9\u3067\u30e1\u30cb\u30e5\u30fc\u3001ALT-F10\u3067\u30c4\u30fc\u30eb\u30d0\u30fc\u3001ALT-0\u3067\u30d8\u30eb\u30d7\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ka_GE.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ka_GE.js
deleted file mode 100644
index 805a966489..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ka_GE.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('ka_GE',{
-"Cut": "\u10d0\u10db\u10dd\u10ed\u10e0\u10d0",
-"Heading 5": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 5",
-"Header 2": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u10d7\u10e5\u10d5\u10d4\u10dc \u10d1\u10e0\u10d0\u10e3\u10d6\u10d4\u10e0\u10e1 \u10d0\u10e0 \u10d0\u10e5\u10d5\u10e1 \u10d1\u10e3\u10e4\u10e0\u10e2\u10e8\u10d8 \u10e8\u10d4\u10ee\u10ec\u10d4\u10d5\u10d8\u10e1 \u10db\u10ee\u10d0\u10e0\u10d3\u10d0\u10ed\u10d4\u10e0\u10d0. \u10d2\u10d7\u10ee\u10dd\u10d5\u10d7 \u10e1\u10d0\u10dc\u10d0\u10ea\u10d5\u10da\u10dd\u10d3 \u10d8\u10e1\u10d0\u10e0\u10d2\u10d4\u10d1\u10da\u10dd\u10d7 Ctrl+X\/C\/V \u10db\u10d0\u10da\u10e1\u10d0\u10ee\u10db\u10dd\u10d1\u10d8 \u10d9\u10dd\u10db\u10d1\u10d8\u10dc\u10d0\u10ea\u10d8\u10d4\u10d1\u10d8\u10d7.",
-"Heading 4": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 4",
-"Div": "\u10d2\u10d0\u10dc\u10d0\u10ec\u10d8\u10da\u10d4\u10d1\u10d0",
-"Heading 2": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 2",
-"Paste": "\u10e9\u10d0\u10e1\u10db\u10d0",
-"Close": "\u10d3\u10d0\u10ee\u10e3\u10e0\u10d5\u10d0",
-"Font Family": "\u10e4\u10dd\u10dc\u10e2\u10d8",
-"Pre": "\u10de\u10e0\u10d4\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8",
-"Align right": "\u10d2\u10d0\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d5",
-"New document": "\u10d0\u10ee\u10d0\u10da\u10d8 \u10d3\u10dd\u10d9\u10e3\u10db\u10d4\u10dc\u10e2\u10d8",
-"Blockquote": "\u10d1\u10da\u10dd\u10d9\u10d8\u10e0\u10d4\u10d1\u10e3\u10da\u10d8 \u10ea\u10d8\u10e2\u10d0\u10e2\u10d0",
-"Numbered list": "\u10d3\u10d0\u10dc\u10dd\u10db\u10e0\u10d8\u10da\u10d8 \u10e1\u10d8\u10d0",
-"Heading 1": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 1",
-"Headings": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8",
-"Increase indent": "\u10d0\u10d1\u10d6\u10d0\u10ea\u10d8\u10e1 \u10d2\u10d0\u10d6\u10e0\u10d3\u10d0",
-"Formats": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d4\u10d1\u10d8",
-"Headers": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d4\u10d1\u10d8",
-"Select all": "\u10e7\u10d5\u10d4\u10da\u10d0\u10e1 \u10db\u10dd\u10e6\u10dc\u10d8\u10e8\u10d5\u10dc\u10d0",
-"Header 3": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 3",
-"Blocks": "\u10d1\u10da\u10dd\u10d9\u10d4\u10d1\u10d8",
-"Undo": "\u10d3\u10d0\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
-"Strikethrough": "\u10e8\u10e3\u10d0 \u10ee\u10d0\u10d6\u10d8",
-"Bullet list": "\u10d1\u10e3\u10da\u10d4\u10e2 \u10e1\u10d8\u10d0",
-"Header 1": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 1",
-"Superscript": "\u10d6\u10d4\u10d3\u10d0 \u10d8\u10dc\u10d3\u10d4\u10e5\u10e1\u10d8",
-"Clear formatting": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8\u10e0\u10d4\u10d1\u10d8\u10e1 \u10d2\u10d0\u10e1\u10e3\u10e4\u10d7\u10d0\u10d5\u10d4\u10d1\u10d0",
-"Font Sizes": "\u10e4\u10dd\u10dc\u10e2\u10d8\u10e1 \u10d6\u10dd\u10db\u10d0",
-"Subscript": "\u10e5\u10d5\u10d4\u10d3\u10d0 \u10d8\u10dc\u10d3\u10d4\u10e5\u10e1\u10d8",
-"Header 6": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 6",
-"Redo": "\u10d2\u10d0\u10db\u10d4\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Paragraph": "\u10de\u10d0\u10e0\u10d0\u10d2\u10e0\u10d0\u10e4\u10d8",
-"Ok": "\u10d9\u10d0\u10e0\u10d2\u10d8",
-"Bold": "\u10db\u10d9\u10d5\u10d4\u10d7\u10e0\u10d8",
-"Code": "\u10d9\u10dd\u10d3\u10d8",
-"Italic": "\u10d3\u10d0\u10ee\u10e0\u10d8\u10da\u10d8",
-"Align center": "\u10d2\u10d0\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10ea\u10d4\u10dc\u10e2\u10e0\u10e8\u10d8",
-"Header 5": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 5",
-"Heading 6": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 6",
-"Heading 3": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 3",
-"Decrease indent": "\u10d0\u10d1\u10d6\u10d0\u10ea\u10d8\u10e1 \u10e8\u10d4\u10db\u10ea\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Header 4": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0 \u10e9\u10d5\u10d4\u10e3\u10da\u10d4\u10d1\u10e0\u10d8\u10d5 \u10e0\u10d4\u10df\u10d8\u10db\u10e8\u10d8\u10d0. \u10e2\u10d4\u10e5\u10e1\u10e2\u10d8 \u10e9\u10d0\u10d8\u10e1\u10db\u10d4\u10d5\u10d0 \u10e3\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10dd\u10d7 \u10e1\u10d0\u10dc\u10d0\u10db \u10d0\u10db \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d0\u10e1 \u10d0\u10e0 \u10d2\u10d0\u10d7\u10d8\u10e8\u10d0\u10d5\u10d7.",
-"Underline": "\u10e5\u10d5\u10d4\u10d3\u10d0 \u10ee\u10d0\u10d6\u10d8",
-"Cancel": "\u10d2\u10d0\u10e3\u10e5\u10db\u10d4\u10d1\u10d0",
-"Justify": "\u10d2\u10d0\u10db\u10d0\u10e0\u10d7\u10e3\u10da\u10d8",
-"Inline": "\u10ee\u10d0\u10d6\u10e8\u10d8\u10d3\u10d0",
-"Copy": "\u10d9\u10dd\u10de\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Align left": "\u10d2\u10d0\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d5",
-"Visual aids": "\u10d5\u10d8\u10d6\u10e3\u10d0\u10da\u10d8\u10d6\u10d0\u10ea\u10d8\u10d0",
-"Lower Greek": "\u10d3\u10d0\u10d1\u10d0\u10da\u10d8 \u10d1\u10d4\u10e0\u10eb\u10dc\u10e3\u10da\u10d8",
-"Square": "\u10d9\u10d5\u10d0\u10d3\u10e0\u10d0\u10e2\u10d8",
-"Default": "\u10e1\u10e2\u10d0\u10dc\u10d3\u10d0\u10e0\u10e2\u10e3\u10da\u10d8",
-"Lower Alpha": "\u10d3\u10d0\u10d1\u10d0\u10da\u10d8 \u10d0\u10da\u10e4\u10d0",
-"Circle": "\u10ec\u10e0\u10d4",
-"Disc": "\u10d3\u10d8\u10e1\u10d9\u10d8",
-"Upper Alpha": "\u10db\u10d0\u10e6\u10d0\u10da\u10d8 \u10d0\u10da\u10e4\u10d0",
-"Upper Roman": "\u10db\u10d0\u10e6\u10d0\u10da\u10d8 \u10e0\u10dd\u10db\u10d0\u10e3\u10da\u10d8",
-"Lower Roman": "\u10d3\u10d0\u10d1\u10d0\u10da\u10d8 \u10e0\u10dd\u10db\u10d0\u10e3\u10da\u10d8",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "id \u10e3\u10dc\u10d3\u10d0 \u10d8\u10ec\u10e7\u10d4\u10d1\u10dd\u10d3\u10d4\u10e1 \u10d0\u10e1\u10dd\u10d7\u10d8, \u10e0\u10dd\u10db\u10d4\u10da\u10e1\u10d0\u10ea \u10db\u10dd\u10e7\u10d5\u10d4\u10d1\u10d0 \u10db\u10ee\u10dd\u10da\u10dd\u10d3 \u10d0\u10e1\u10dd\u10d4\u10d1\u10d8, \u10ea\u10d8\u10e4\u10e0\u10d4\u10d1\u10d8, \u10e2\u10d8\u10e0\u10d4, \u10ec\u10d4\u10e0\u10e2\u10d8\u10da\u10d4\u10d1\u10d8, \u10dd\u10e0\u10d8 \u10ec\u10d4\u10e0\u10e2\u10d8\u10da\u10d8 \u10d0\u10dc \u10e5\u10d5\u10d4\u10d3\u10d0 \u10e2\u10d8\u10e0\u10d4. ",
-"Name": "\u10e1\u10d0\u10ee\u10d4\u10da\u10d8",
-"Anchor": "\u10e6\u10e3\u10d6\u10d0",
-"Id": "id",
-"You have unsaved changes are you sure you want to navigate away?": "\u10d7\u10e5\u10d5\u10d4\u10dc \u10d2\u10d0\u10e5\u10d5\u10d7 \u10e8\u10d4\u10e3\u10dc\u10d0\u10ee\u10d0\u10d5\u10d8 \u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d4\u10d1\u10d8, \u10d3\u10d0\u10e0\u10ec\u10db\u10e3\u10dc\u10d4\u10d1\u10e3\u10da\u10d8 \u10ee\u10d0\u10d7 \u10e0\u10dd\u10db \u10e1\u10ee\u10d5\u10d0\u10d2\u10d0\u10dc \u10d2\u10d0\u10d3\u10d0\u10e1\u10d5\u10da\u10d0 \u10d2\u10e1\u10e3\u10e0\u10d7?",
-"Restore last draft": "\u10d1\u10dd\u10da\u10dd\u10e1 \u10e8\u10d4\u10dc\u10d0\u10ee\u10e3\u10da\u10d8\u10e1 \u10d0\u10e6\u10d3\u10d2\u10d4\u10dc\u10d0",
-"Special character": "\u10e1\u10de\u10d4\u10ea\u10d8\u10d0\u10da\u10e3\u10e0\u10d8 \u10e1\u10d8\u10db\u10d1\u10dd\u10da\u10dd",
-"Source code": "\u10ec\u10e7\u10d0\u10e0\u10dd\u10e1 \u10d9\u10dd\u10d3\u10d8",
-"Language": "\u10d4\u10dc\u10d0",
-"Insert\/Edit code sample": "\u10e9\u10d0\u10e1\u10d5\u10d8\/\u10e8\u10d4\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10d9\u10dd\u10d3\u10d8\u10e1 \u10db\u10d0\u10d2\u10d0\u10da\u10d8\u10d7\u10d8",
-"B": "\u10da",
-"R": "\u10ec",
-"G": "\u10db",
-"Color": "\u10e4\u10d4\u10e0\u10d8",
-"Right to left": "\u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d3\u10d0\u10dc \u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d5",
-"Left to right": "\u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d3\u10d0\u10dc \u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d5",
-"Emoticons": "\u10e1\u10db\u10d0\u10d8\u10da\u10d8\u10d9\u10d4\u10d1\u10d8",
-"Robots": "\u10e0\u10dd\u10d1\u10dd\u10d4\u10d1\u10d8",
-"Document properties": "\u10d3\u10dd\u10d9\u10e3\u10db\u10d4\u10dc\u10e2\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
-"Title": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8",
-"Keywords": "\u10e1\u10d0\u10d9\u10d5\u10d0\u10dc\u10eb\u10dd \u10e1\u10d8\u10e2\u10e7\u10d5\u10d4\u10d1\u10d8",
-"Encoding": "\u10d9\u10dd\u10d3\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Description": "\u10d0\u10ee\u10ec\u10d4\u10e0\u10d0",
-"Author": "\u10d0\u10d5\u10e2\u10dd\u10e0\u10d8",
-"Fullscreen": "\u10e1\u10d0\u10d5\u10e1\u10d4 \u10d4\u10d9\u10e0\u10d0\u10dc\u10d8",
-"Horizontal line": "\u10f0\u10dd\u10e0\u10d8\u10d6\u10dd\u10dc\u10e2\u10d0\u10da\u10e3\u10e0\u10d8 \u10ee\u10d0\u10d6\u10d8",
-"Horizontal space": "\u10f0\u10dd\u10e0\u10d8\u10d6\u10dd\u10dc\u10e2\u10d0\u10da\u10e3\u10e0\u10d8 \u10e1\u10d8\u10d5\u10e0\u10ea\u10d4",
-"Insert\/edit image": "\u10e9\u10d0\u10e1\u10d5\u10d8\/\u10e8\u10d4\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10e1\u10e3\u10e0\u10d0\u10d7\u10d8",
-"General": "\u10db\u10d7\u10d0\u10d5\u10d0\u10e0\u10d8",
-"Advanced": "\u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d8\u10d7\u10d8",
-"Source": "\u10d1\u10db\u10e3\u10da\u10d8",
-"Border": "\u10e1\u10d0\u10d6\u10e6\u10d5\u10d0\u10e0\u10d8",
-"Constrain proportions": "\u10de\u10e0\u10dd\u10de\u10dd\u10e0\u10ea\u10d8\u10d8\u10e1 \u10d3\u10d0\u10ea\u10d5\u10d0",
-"Vertical space": "\u10d5\u10d4\u10e0\u10e2\u10d8\u10d9\u10d0\u10da\u10e3\u10e0\u10d8 \u10e1\u10d8\u10d5\u10e0\u10ea\u10d4",
-"Image description": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10d3\u10d0\u10ee\u10d0\u10e1\u10d8\u10d0\u10d7\u10d4\u10d1\u10d0",
-"Style": "\u10e1\u10e2\u10d8\u10da\u10d8",
-"Dimensions": "\u10d2\u10d0\u10dc\u10d6\u10dd\u10db\u10d8\u10da\u10d4\u10d1\u10d0",
-"Insert image": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Image": "\u10d2\u10d0\u10db\u10dd\u10e1\u10d0\u10ee\u10e3\u10da\u10d4\u10d1\u10d0",
-"Zoom in": "\u10d2\u10d0\u10d3\u10d8\u10d3\u10d8\u10d4\u10d1\u10d0",
-"Contrast": "\u10d9\u10dd\u10dc\u10e2\u10e0\u10d0\u10e1\u10e2\u10d8",
-"Back": "\u10e3\u10d9\u10d0\u10dc",
-"Gamma": "\u10d2\u10d0\u10db\u10d0",
-"Flip horizontally": "\u10f0\u10dd\u10e0\u10d8\u10d6\u10dd\u10dc\u10e2\u10d0\u10da\u10e3\u10e0\u10d0\u10d3 \u10e8\u10d4\u10e2\u10e0\u10d8\u10d0\u10da\u10d4\u10d1\u10d0",
-"Resize": "\u10d6\u10dd\u10db\u10d8\u10e1 \u10e8\u10d4\u10ea\u10d5\u10da\u10d0",
-"Sharpen": "\u10d2\u10d0\u10da\u10d4\u10e1\u10d5\u10d0",
-"Zoom out": "\u10d3\u10d0\u10de\u10d0\u10e2\u10d0\u10e0\u10d0\u10d5\u10d4\u10d1\u10d0",
-"Image options": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10de\u10d0\u10e0\u10d0\u10db\u10d4\u10e2\u10e0\u10d4\u10d1\u10d8",
-"Apply": "\u10db\u10d8\u10e6\u10d4\u10d1\u10d0",
-"Brightness": "\u10e1\u10d8\u10d9\u10d0\u10e8\u10d9\u10d0\u10e8\u10d4",
-"Rotate clockwise": "\u10e1\u10d0\u10d0\u10d7\u10d8\u10e1 \u10d8\u10e1\u10e0\u10d8\u10e1 \u10db\u10d8\u10db\u10d0\u10e0\u10d7\u10e3\u10da\u10d4\u10d1\u10d8\u10d7 \u10db\u10dd\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
-"Rotate counterclockwise": "\u10e1\u10d0\u10d0\u10d7\u10d8\u10e1 \u10d8\u10e1\u10e0\u10d8\u10e1 \u10db\u10d8\u10db\u10d0\u10e0\u10d7\u10e3\u10da\u10d4\u10d1\u10d8\u10e1 \u10e1\u10d0\u10ec\u10d8\u10dc\u10d0\u10d0\u10e6\u10db\u10d3\u10d4\u10d2\u10dd\u10d2 \u10db\u10dd\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
-"Edit image": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Color levels": "\u10e4\u10d4\u10e0\u10d8\u10e1 \u10d3\u10dd\u10dc\u10d4",
-"Crop": "\u10db\u10dd\u10ed\u10e0\u10d0",
-"Orientation": "\u10dd\u10e0\u10d8\u10d4\u10dc\u10e2\u10d0\u10ea\u10d8\u10d0",
-"Flip vertically": "\u10d5\u10d4\u10e0\u10e2\u10d8\u10d9\u10d0\u10da\u10e3\u10e0\u10d0\u10d3 \u10d0\u10e2\u10e0\u10d8\u10d0\u10da\u10d4\u10d1\u10d0",
-"Invert": "\u10e8\u10d4\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
-"Date\/time": "\u10d7\u10d0\u10e0\u10d8\u10e6\u10d8\/\u10d3\u10e0\u10dd",
-"Insert date\/time": "\u10d7\u10d0\u10e0\u10d8\u10e6\u10d8\/\u10d3\u10e0\u10dd\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Remove link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
-"Url": "URL",
-"Text to display": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8",
-"Anchors": "\u10e6\u10e3\u10d6\u10d0",
-"Insert link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Link": "\u10d1\u10db\u10e3\u10da\u10d8",
-"New window": "\u10d0\u10ee\u10d0\u10da \u10e4\u10d0\u10dc\u10ef\u10d0\u10e0\u10d0\u10e8\u10d8",
-"None": "\u10d0\u10e0\u10ea\u10d4\u10e0\u10d7\u10d8",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u10d7\u10e5\u10d5\u10d4\u10dc\u10e1 \u10db\u10d8\u10d4\u10e0 \u10db\u10d8\u10d7\u10d8\u10d7\u10d4\u10d1\u10e3\u10da\u10d8 \u10db\u10d8\u10e1\u10d0\u10db\u10d0\u10e0\u10d7\u10d8 \u10ec\u10d0\u10e0\u10db\u10dd\u10d0\u10d3\u10d2\u10d4\u10dc\u10e1 \u10d2\u10d0\u10e0\u10d4 \u10d1\u10db\u10e3\u10da\u10e1. \u10d2\u10e1\u10e3\u10e0\u10d7, \u10e0\u10dd\u10db \u10db\u10d8\u10d5\u10d0\u10dc\u10d8\u10ed\u10dd http:\/\/ \u10e4\u10e0\u10d4\u10e4\u10d8\u10e5\u10e1\u10d8?",
-"Paste or type a link": "\u10e9\u10d0\u10e1\u10d5\u10d8\u10d7 \u10d0\u10dc \u10e8\u10d4\u10d8\u10e7\u10d5\u10d0\u10dc\u10d4\u10d7 \u10d1\u10db\u10e3\u10da\u10d8",
-"Target": "\u10d2\u10d0\u10ee\u10e1\u10dc\u10d0",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u10d7\u10e5\u10d5\u10d4\u10dc \u10db\u10d8\u10e3\u10d7\u10d8\u10d7\u10d4\u10d7 \u10d4\u10da-\u10e4\u10dd\u10e1\u10e2\u10d8\u10e1 \u10db\u10d8\u10e1\u10d0\u10db\u10d0\u10e0\u10d7\u10d8 \u10dc\u10d0\u10ea\u10d5\u10da\u10d0\u10d3 \u10d5\u10d4\u10d1-\u10d2\u10d5\u10d4\u10e0\u10d3\u10d8\u10e1\u10d0. \u10d2\u10e1\u10e3\u10e0\u10d7, \u10e0\u10dd\u10db \u10db\u10d8\u10d5\u10d0\u10dc\u10d8\u10ed\u10dd mailto: \u10e4\u10e0\u10d4\u10e4\u10d8\u10e5\u10e1\u10d8?",
-"Insert\/edit link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0\/\u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d0",
-"Insert\/edit video": "\u10d5\u10d8\u10d3\u10d4\u10dd\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0\/\u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Media": "\u10db\u10d4\u10d3\u10d8\u10d0",
-"Alternative source": "\u10d0\u10da\u10e2\u10d4\u10e0\u10dc\u10d0\u10e2\u10d8\u10e3\u10da\u10d8 \u10ec\u10e7\u10d0\u10e0\u10dd",
-"Paste your embed code below:": "\u10d0\u10e5 \u10e9\u10d0\u10e1\u10d5\u10d8\u10d7 \u10d7\u10e5\u10d5\u10d4\u10dc\u10d8 \u10d9\u10dd\u10d3\u10d8:",
-"Insert video": "\u10d5\u10d8\u10d3\u10d4\u10dd\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Poster": "\u10de\u10da\u10d0\u10d9\u10d0\u10e2\u10d8",
-"Insert\/edit media": "\u10db\u10d4\u10d3\u10d8\u10d0\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0\/\u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Embed": "\u10e9\u10d0\u10e8\u10d4\u10dc\u10d4\u10d1\u10d0",
-"Nonbreaking space": "\u10e3\u10ec\u10e7\u10d5\u10d4\u10e2\u10d8 \u10e1\u10d8\u10d5\u10e0\u10ea\u10d4",
-"Page break": "\u10d2\u10d5\u10d4\u10e0\u10d3\u10d8\u10e1 \u10d2\u10d0\u10ec\u10e7\u10d5\u10d4\u10e2\u10d0",
-"Paste as text": "\u10e9\u10d0\u10e1\u10d5\u10d8\u10d7 \u10e0\u10dd\u10d2\u10dd\u10e0\u10ea \u10e2\u10d4\u10e5\u10e1\u10e2\u10d8",
-"Preview": "\u10ec\u10d8\u10dc\u10d0\u10e1\u10ec\u10d0\u10e0 \u10dc\u10d0\u10ee\u10d5\u10d0",
-"Print": "\u10d0\u10db\u10dd\u10d1\u10d4\u10ed\u10d5\u10d3\u10d0",
-"Save": "\u10e8\u10d4\u10dc\u10d0\u10ee\u10d5\u10d0",
-"Could not find the specified string.": "\u10db\u10dd\u10ea\u10d4\u10db\u10e3\u10da\u10d8 \u10e9\u10d0\u10dc\u10d0\u10ec\u10d4\u10e0\u10d8 \u10d5\u10d4\u10e0 \u10db\u10dd\u10d8\u10eb\u10d4\u10d1\u10dc\u10d0.",
-"Replace": "\u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Next": "\u10e8\u10d4\u10db\u10d3\u10d4\u10d2\u10d8",
-"Whole words": "\u10e1\u10e0\u10e3\u10da\u10d8 \u10e1\u10d8\u10e2\u10e7\u10d5\u10d4\u10d1\u10d8",
-"Find and replace": "\u10db\u10dd\u10eb\u10d4\u10d1\u10dc\u10d4 \u10d3\u10d0 \u10e8\u10d4\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4",
-"Replace with": "\u10e8\u10d4\u10e1\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d4\u10da\u10d8 \u10e1\u10d8\u10e2\u10e7\u10d5\u10d0",
-"Find": "\u10eb\u10d4\u10d1\u10dc\u10d0",
-"Replace all": "\u10e7\u10d5\u10d4\u10da\u10d0\u10e1 \u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Match case": "\u10d3\u10d0\u10d0\u10db\u10d7\u10ee\u10d5\u10d8\u10d4 \u10d0\u10e1\u10dd\u10d4\u10d1\u10d8\u10e1 \u10d6\u10dd\u10db\u10d0",
-"Prev": "\u10ec\u10d8\u10dc\u10d0",
-"Spellcheck": "\u10db\u10d0\u10e0\u10d7\u10da\u10ec\u10d4\u10e0\u10d8\u10e1 \u10e8\u10d4\u10db\u10dd\u10ec\u10db\u10d4\u10d1\u10d0",
-"Finish": "\u10d3\u10d0\u10e1\u10d0\u10e1\u10e0\u10e3\u10da\u10d8",
-"Ignore all": "\u10e7\u10d5\u10d4\u10da\u10d0\u10e1 \u10d8\u10d2\u10dc\u10dd\u10e0\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Ignore": "\u10d8\u10d2\u10dc\u10dd\u10e0\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Add to Dictionary": "\u10da\u10d4\u10e5\u10e1\u10d8\u10d9\u10dd\u10dc\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Insert row before": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d7\u10d0\u10d5\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Rows": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d4\u10d1\u10d8",
-"Height": "\u10e1\u10d8\u10db\u10d0\u10e6\u10da\u10d4",
-"Paste row after": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d1\u10dd\u10da\u10dd\u10e8\u10d8 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Alignment": "\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Border color": "\u10e1\u10d0\u10d6\u10d0\u10e0\u10d8\u10e1 \u10e4\u10d4\u10e0\u10d8",
-"Column group": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10ef\u10d2\u10e3\u10e4\u10d8",
-"Row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8",
-"Insert column before": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10d7\u10d0\u10d5\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Split cell": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10d2\u10d0\u10e7\u10dd\u10e4\u10d0",
-"Cell padding": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10e4\u10d0\u10e0\u10d7\u10dd\u10d1\u10d8",
-"Cell spacing": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10d3\u10d0\u10e8\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Row type": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10e2\u10d8\u10de\u10d8",
-"Insert table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Body": "\u10e2\u10d0\u10dc\u10d8",
-"Caption": "\u10ec\u10d0\u10e0\u10ec\u10d4\u10e0\u10d0",
-"Footer": "\u10eb\u10d8\u10e0\u10d8",
-"Delete row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
-"Paste row before": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d7\u10d0\u10d5\u10e8\u10d8 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Scope": "\u10e9\u10d0\u10e0\u10e9\u10dd",
-"Delete table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
-"H Align": "H \u10e9\u10d0\u10db\u10ec\u10d9\u10e0\u10d8\u10d5\u10d4\u10d1\u10d0",
-"Top": "\u10db\u10d0\u10e6\u10da\u10d0",
-"Header cell": "\u10d7\u10d0\u10d5\u10d8\u10e1 \u10e3\u10ef\u10e0\u10d0",
-"Column": "\u10e1\u10d5\u10d4\u10e2\u10d8",
-"Row group": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10ef\u10d2\u10e3\u10e4\u10d8",
-"Cell": "\u10e3\u10ef\u10e0\u10d0",
-"Middle": "\u10e8\u10e3\u10d0",
-"Cell type": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10e2\u10d8\u10de\u10d8",
-"Copy row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d9\u10dd\u10de\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Row properties": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
-"Table properties": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
-"Bottom": "\u10e5\u10d5\u10d4\u10d3\u10d0",
-"V Align": "V \u10e9\u10d0\u10db\u10ec\u10d9\u10e0\u10d8\u10d5\u10d4\u10d1\u10d0",
-"Header": "\u10d7\u10d0\u10d5\u10d8",
-"Right": "\u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d5",
-"Insert column after": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10d1\u10dd\u10da\u10dd\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Cols": "\u10e1\u10d5\u10d4\u10e2\u10d4\u10d1\u10d8",
-"Insert row after": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d1\u10dd\u10da\u10dd\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Width": "\u10e1\u10d8\u10d2\u10d0\u10dc\u10d4",
-"Cell properties": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
-"Left": "\u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d5",
-"Cut row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d0\u10db\u10dd\u10ed\u10e0\u10d0",
-"Delete column": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
-"Center": "\u10ea\u10d4\u10dc\u10e2\u10e0\u10e8\u10d8",
-"Merge cells": "\u10e3\u10ef\u10e0\u10d4\u10d1\u10d8\u10e1 \u10d2\u10d0\u10d4\u10e0\u10d7\u10d8\u10d0\u10dc\u10d4\u10d1\u10d0",
-"Insert template": "\u10e8\u10d0\u10d1\u10da\u10dd\u10dc\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Templates": "\u10e8\u10d0\u10d1\u10da\u10dd\u10dc\u10d4\u10d1\u10d8",
-"Background color": "\u10e3\u10d9\u10d0\u10dc\u10d0 \u10e4\u10d4\u10e0\u10d8",
-"Custom...": "\u10db\u10dd\u10e0\u10d2\u10d4\u10d1\u10e3\u10da\u10d8",
-"Custom color": "\u10db\u10dd\u10e0\u10d2\u10d4\u10d1\u10e3\u10da\u10d8 \u10e4\u10d4\u10e0\u10d8",
-"No color": "\u10e4\u10d4\u10e0\u10d8\u10e1 \u10d2\u10d0\u10e0\u10d4\u10e8\u10d4",
-"Text color": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8\u10e1 \u10e4\u10d4\u10e0\u10d8",
-"Table of Contents": "\u10e1\u10d0\u10e0\u10e9\u10d4\u10d5\u10d8",
-"Show blocks": "\u10d1\u10da\u10dd\u10d9\u10d4\u10d1\u10d8\u10e1 \u10e9\u10d5\u10d4\u10dc\u10d4\u10d1\u10d0",
-"Show invisible characters": "\u10e3\u10ee\u10d8\u10da\u10d0\u10d5\u10d8 \u10e1\u10d8\u10db\u10d1\u10dd\u10da\u10dd\u10d4\u10d1\u10d8\u10e1 \u10e9\u10d5\u10d4\u10dc\u10d4\u10d1\u10d0",
-"Words: {0}": "\u10e1\u10d8\u10e2\u10e7\u10d5\u10d4\u10d1\u10d8: {0}",
-"Insert": "\u10e9\u10d0\u10e1\u10db\u10d0",
-"File": "\u10e4\u10d0\u10d8\u10da\u10d8",
-"Edit": "\u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8\u10e1 \u10e4\u10d0\u10e0\u10d7\u10d8. \u10d3\u10d0\u10d0\u10ed\u10d8\u10e0\u10d4\u10d7 ALT-F9\u10e1 \u10db\u10d4\u10dc\u10d8\u10e3\u10e1 \u10d2\u10d0\u10db\u10dd\u10e1\u10d0\u10eb\u10d0\u10ee\u10d4\u10d1\u10da\u10d0\u10d3. \u10d3\u10d0\u10d0\u10ed\u10d8\u10e0\u10d4\u10d7 ALT-F10\u10e1 \u10de\u10d0\u10dc\u10d4\u10da\u10d8\u10e1\u10d7\u10d5\u10d8\u10e1. \u10d3\u10d0\u10d0\u10ed\u10d8\u10e0\u10d4\u10d7 ALT-0\u10e1 \u10d3\u10d0\u10ee\u10db\u10d0\u10e0\u10d4\u10d1\u10d8\u10e1\u10d7\u10d5\u10d8\u10e1",
-"Tools": "\u10d8\u10d0\u10e0\u10d0\u10e6\u10d4\u10d1\u10d8",
-"View": "\u10dc\u10d0\u10ee\u10d5\u10d0",
-"Table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8",
-"Format": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kab.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kab.js
deleted file mode 100644
index 48f7d3bf55..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kab.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('kab',{
-"Redo": "Err-d",
-"Undo": "Semmet",
-"Cut": "Gzem",
-"Copy": "N\u0263el",
-"Paste": "Sente\u1e0d",
-"Select all": "Fren kulec",
-"New document": "Attaftar amaynut",
-"Ok": "Ih",
-"Cancel": "Semmet",
-"Visual aids": "Visual aids",
-"Bold": "Tira tazurant",
-"Italic": "Tira yeknan",
-"Underline": "Aderrer",
-"Strikethrough": "Strikethrough",
-"Superscript": "Superscript",
-"Subscript": "Subscript",
-"Clear formatting": "Clear formatting",
-"Align left": "Tarigla \u0263er zelma\u1e0d",
-"Align center": "Di tlemast",
-"Align right": "tarigla \u0263er zelma\u1e0d",
-"Justify": "Justify",
-"Bullet list": "Tabdart s tlillac",
-"Numbered list": "Tabdart s wu\u1e6d\u1e6dunen",
-"Decrease indent": "Simc\u1e6du\u1e25 asi\u1e93i",
-"Increase indent": "Sim\u0263ur asi\u1e93i",
-"Close": "Mdel",
-"Formats": "Imasalen",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.",
-"Headers": "Izwal",
-"Header 1": "Azwel 1",
-"Header 2": "Azwel 2",
-"Header 3": "Azwel 3",
-"Header 4": "Azwel 4",
-"Header 5": "Header 5",
-"Header 6": "Azwel 6",
-"Headings": "Izewlen",
-"Heading 1": "Inixf 1",
-"Heading 2": "Inixf 2",
-"Heading 3": "Inixf 3",
-"Heading 4": "Inixf 4",
-"Heading 5": "Inixf 5",
-"Heading 6": "Inixf 6",
-"Preformatted": "Yettwamsel si tazwara",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Tangalt",
-"Paragraph": "taseddart",
-"Blockquote": "Tanebdurt",
-"Inline": "Inline",
-"Blocks": "I\u1e25edran",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
-"Font Family": "Tasefsit",
-"Font Sizes": "Tiddi n tsefsit",
-"Class": "Asmil",
-"Browse for an image": "Snirem iwakken ad tferne\u1e0d tugna",
-"OR": "Ih",
-"Drop an image here": "Ssers tugna dagi",
-"Upload": "Sili",
-"Block": "Sew\u1e25el",
-"Align": "Settef",
-"Default": "Lex\u1e63as",
-"Circle": "Tawinest",
-"Disc": "A\u1e0debsi",
-"Square": "Amku\u1e93",
-"Lower Alpha": "Alpha ame\u1e93yan",
-"Lower Greek": "Grik ame\u1e93yan",
-"Lower Roman": "Ruman amectu\u1e25",
-"Upper Alpha": "Alfa ameqran",
-"Upper Roman": "Ruman ameqran",
-"Anchor": "Tamdeyt",
-"Name": "Isem",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "id ilaq ad ibdu s usekkil, ad yettwa\u1e0dfer kan s isekkilen, im\u1e0danen, ijerri\u1e0den, tinqi\u1e0din, snat n tenqi\u1e0din ne\u0263 ijerri\u1e0den n wadda.",
-"You have unsaved changes are you sure you want to navigate away?": "Ibeddilen ur twaskelsen ara teb\u0263i\u1e0d ad teff\u0263e\u1e0d ?",
-"Restore last draft": "Restore last draft",
-"Special character": "Askil uslig",
-"Source code": "Tangalt ta\u0263balut",
-"Insert\/Edit code sample": "Ger\/\u1e92reg tangalt n umedya",
-"Language": "Tutlayt",
-"Code sample": "Tikkest n tengalt",
-"Color": "Ini",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Seg zelma\u1e0d \u0263er yefus",
-"Right to left": "Seg yefus \u0263er zelma\u1e0d",
-"Emoticons": "Emoticons",
-"Document properties": "Iraten n warat",
-"Title": "Azwel",
-"Keywords": "Awalen yufraren",
-"Description": "Aglam",
-"Robots": "Robots",
-"Author": "Ameskar",
-"Encoding": "Asettengel",
-"Fullscreen": "Agdil a\u010duran",
-"Action": "Tigawt",
-"Shortcut": "Anegzum",
-"Help": "Tallalt",
-"Address": "Tansa",
-"Focus to menubar": "Asa\u1e0des \u0263ef tfeggagt n wumu\u0263",
-"Focus to toolbar": "Asa\u1e0des \u0263ef tfeggagt n ifecka",
-"Focus to element path": "Asa\u1e0des \u0263ef ubrid n uferdis",
-"Focus to contextual toolbar": "Asa\u1e0des \u0263ef tfeggagt n ifecka tanattalt",
-"Insert link (if link plugin activated)": "Ger ase\u0263wen (ma yermed uzegrir n use\u0263wen)",
-"Save (if save plugin activated)": "Sekles (ma yermed uzegrir save)",
-"Find (if searchreplace plugin activated)": "Nadi (ma yermed uzegrir searchreplace)",
-"Plugins installed ({0}):": "Izegriren yettwasbedden ({0}):",
-"Premium plugins:": "Izegriren premium :",
-"Learn more...": "\u1e92er ugar...",
-"You are using {0}": "Tsseqdace\u1e0d {0}",
-"Plugins": "Isi\u0263zifen",
-"Handy Shortcuts": "Inegzumen",
-"Horizontal line": "Ajerri\u1e0d aglawan",
-"Insert\/edit image": "Ger\/\u1e92reg tugna",
-"Image description": "Aglam n tugna",
-"Source": "A\u0263balu",
-"Dimensions": "Tisekta",
-"Constrain proportions": "Constrain proportions",
-"General": "Amatu",
-"Advanced": "Ana\u1e93i",
-"Style": "A\u0263anib",
-"Vertical space": "Talunt taratakt",
-"Horizontal space": "Talunt taglawant",
-"Border": "Iri",
-"Insert image": "Ger tugna",
-"Image": "Tugna",
-"Image list": "Tabdart n tugniwin",
-"Rotate counterclockwise": "Tuzya mgal tamrilt",
-"Rotate clockwise": "Tuzya yugdan tamrilt",
-"Flip vertically": "Tuzya taratakt",
-"Flip horizontally": "Tuzttya tagrawant",
-"Edit image": "\u1e92reg tugna",
-"Image options": "Tixti\u1e5biyin n tugna",
-"Zoom in": "Zoom in",
-"Zoom out": "Zoom out",
-"Crop": "Rogner",
-"Resize": "Beddel tiddi",
-"Orientation": "Ta\u0263da",
-"Brightness": "Tafat",
-"Sharpen": "Affiner",
-"Contrast": "Contrast",
-"Color levels": "Iswiren n yini",
-"Gamma": "Gamma",
-"Invert": "Tti",
-"Apply": "Snes",
-"Back": "Tu\u0263alin",
-"Insert date\/time": "Ger azemz\/asrag",
-"Date\/time": "Azemz\/Asrag",
-"Insert link": "Ger azday",
-"Insert\/edit link": "Ger\/\u1e93reg azday",
-"Text to display": "A\u1e0dris ara yettwabeqq\u1e0den",
-"Url": "URL",
-"Target": "Target",
-"None": "Ulac",
-"New window": "Asfaylu amaynut",
-"Remove link": "Kkes azday",
-"Anchors": "Timdyin",
-"Link": "Ase\u0263wen",
-"Paste or type a link": "Sente\u1e0d ne\u0263 sekcem ase\u0263wen",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL i teskecme\u1e0d tettban-d d tansa email. teb\u0263i\u1e0d ad s-ternu\u1e0d azwir mailto : ?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL i teskecme\u1e0d tettban-d d azday uffi\u0263. Teb\u0263i\u1e0d ad s-ternu\u1e0d azwir http:\/\/  ?",
-"Link list": "Tabdart n is\u0263ewnen",
-"Insert video": "Ger avidyu",
-"Insert\/edit video": "Ger\/\u1e93reg avidyu",
-"Insert\/edit media": "Ger\/\u1e92reg amiya",
-"Alternative source": "A\u0263balu amlellay",
-"Poster": "Poster",
-"Paste your embed code below:": "Paste your embed code below:",
-"Embed": "Embed",
-"Media": "Amidya",
-"Nonbreaking space": "Talunt ur nettwagzam ara",
-"Page break": "Angaz n usebter",
-"Paste as text": "Sente\u1e0d d a\u1e0dris",
-"Preview": "Sken",
-"Print": "Siggez",
-"Save": "Sekles",
-"Find": "Nadi",
-"Replace with": "Semselsi s",
-"Replace": "Semselsi",
-"Replace all": "Semselsi kulec",
-"Prev": "Win yezrin",
-"Next": "Win \u0263ers",
-"Find and replace": "Nadi semselsi",
-"Could not find the specified string.": "Ur d-nufi ara azrar i d-yettunefken.",
-"Match case": "Match case",
-"Whole words": "Awal ummid",
-"Spellcheck": "Ase\u0263ti n tira",
-"Ignore": "Zgel",
-"Ignore all": "Zgel kulec",
-"Finish": "Fak",
-"Add to Dictionary": "Rnu-t s amawal",
-"Insert table": "Ger tafelwit",
-"Table properties": "Iraten n tfelwit",
-"Delete table": "Kkes tafelwit",
-"Cell": "Taxxamt",
-"Row": "Adur",
-"Column": "Tagejdit",
-"Cell properties": "Iraten n texxamt",
-"Merge cells": "Seddukel tixxamin",
-"Split cell": "B\u1e0du tixxamin",
-"Insert row before": "Ger adur deffir",
-"Insert row after": "Ger adur sdat",
-"Delete row": "Kkes tagejdit",
-"Row properties": "Iraten n udur",
-"Cut row": "Gzem adur",
-"Copy row": "N\u0263el adur",
-"Paste row before": "Sente\u1e0d adur sdat",
-"Paste row after": "Sente\u1e0d adur deffir",
-"Insert column before": "Sente\u1e0d tagejdit sdat",
-"Insert column after": "Sente\u1e0d tagejdit deffir",
-"Delete column": "Kkes tagejdit",
-"Cols": "Tigejda",
-"Rows": "Aduren",
-"Width": "Tehri",
-"Height": "Te\u0263zi",
-"Cell spacing": "Tlunt ger texxamin",
-"Cell padding": "Tama n texxamt",
-"Caption": "Caption",
-"Left": "\u0194er zelma\u1e0d",
-"Center": "Di tlemmast",
-"Right": "\u0194er yefus",
-"Cell type": "Anaw n texxamt",
-"Scope": "Scope",
-"Alignment": "Tarigla",
-"H Align": "Tarigla taglawant",
-"V Align": "Tarigla taratakt",
-"Top": "Uksawen",
-"Middle": "Di tlemmast",
-"Bottom": "Uksar",
-"Header cell": "Tasen\u1e6di\u1e0dt n texxamt",
-"Row group": "Agraw n waduren",
-"Column group": "Agraw n tgejda",
-"Row type": "Anaw n wadur",
-"Header": "Tasenti\u1e0dt",
-"Body": "Tafka",
-"Footer": "A\u1e0dar",
-"Border color": "Ini n yiri",
-"Insert template": "Ger tamuddimt",
-"Templates": "Timudimin",
-"Template": "Tine\u0263rufin",
-"Text color": "Ini n u\u1e0dris",
-"Background color": "Ini n ugilal",
-"Custom...": "Custom...",
-"Custom color": "Custom color",
-"No color": "Ulac ini",
-"Table of Contents": "Tafelwit n ugbur",
-"Show blocks": "Beqqe\u1e0d i\u1e25edran",
-"Show invisible characters": "Beqqe\u1e0d isekkilen uffiren",
-"Words: {0}": "Words: {0}",
-"{0} words": "{0} n wawalen",
-"File": "Afaylu",
-"Edit": "\u1e92reg",
-"Insert": "Ger",
-"View": "Tamu\u0263li",
-"Format": "Amasal",
-"Table": "Tafelwit",
-"Tools": "Ifecka",
-"Powered by {0}": "Iteddu s {0} ",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kk.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kk.js
deleted file mode 100644
index 7cec8ab1d3..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kk.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('kk',{
-"Cut": "\u049a\u0438\u044b\u043f \u0430\u043b\u0443",
-"Heading 5": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f 5",
-"Header 2": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0411\u0440\u0430\u0443\u0437\u0435\u0440\u0456\u04a3\u0456\u0437 \u0430\u043b\u043c\u0430\u0441\u0443 \u0431\u0443\u0444\u0435\u0440\u0456\u043d\u0435 \u0442\u0456\u043a\u0435\u043b\u0435\u0439 \u049b\u0430\u0442\u044b\u043d\u0430\u0439 \u0430\u043b\u043c\u0430\u0439\u0434\u044b. Ctrl+X\/C\/V \u043f\u0435\u0440\u043d\u0435\u043b\u0435\u0440 \u0442\u0456\u0440\u043a\u0435\u0441\u0456\u043c\u0456\u043d \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u04a3\u044b\u0437.",
-"Heading 4": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f 4",
-"Div": "Div",
-"Heading 2": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f 2",
-"Paste": "\u049a\u043e\u044e",
-"Close": "\u0416\u0430\u0431\u0443",
-"Font Family": "\u049a\u0430\u0440\u0456\u043f\u0442\u0435\u0440 \u0442\u043e\u0431\u044b",
-"Pre": "Pre",
-"Align right": "\u041e\u04a3\u0493\u0430 \u043e\u0440\u043d\u0430\u043b\u0430\u0441\u0442\u044b\u0440\u0443",
-"New document": "\u0416\u0430\u04a3\u0430 \u049b\u04b1\u0436\u0430\u0442",
-"Blockquote": "\u0414\u04d9\u0439\u0435\u043a\u0441\u04e9\u0437",
-"Numbered list": "\u041d\u04e9\u043c\u0456\u0440\u043b\u0435\u043d\u0433\u0435\u043d \u0442\u0456\u0437\u0456\u043c",
-"Heading 1": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f 1",
-"Headings": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f",
-"Increase indent": "\u0428\u0435\u0433\u0456\u043d\u0456\u0441\u0442\u0456 \u0430\u0440\u0442\u0442\u044b\u0440\u0443",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0442\u0430\u0440",
-"Headers": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430",
-"Select all": "\u0411\u0430\u0440\u043b\u044b\u0493\u044b\u043d \u0442\u0430\u04a3\u0434\u0430\u0443",
-"Header 3": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 3",
-"Blocks": "\u0411\u043b\u043e\u043a\u0442\u0435\u043a\u0442\u0435\u0441 (Block)",
-"Undo": "\u0411\u043e\u043b\u0434\u044b\u0440\u043c\u0430\u0443",
-"Strikethrough": "\u0411\u0435\u043b\u0456\u043d\u0435\u043d \u0441\u044b\u0437\u044b\u043b\u0493\u0430\u043d",
-"Bullet list": "\u0422\u0430\u04a3\u0431\u0430\u043b\u0430\u043d\u0493\u0430\u043d \u0442\u0456\u0437\u0456\u043c",
-"Header 1": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 1",
-"Superscript": "\u04ae\u0441\u0442\u0456\u04a3\u0433\u0456 \u0438\u043d\u0434\u0435\u043a\u0441",
-"Clear formatting": "\u0424\u043e\u0440\u043c\u0430\u0442\u0442\u0430\u0443\u0434\u0430\u043d \u0442\u0430\u0437\u0430\u0440\u0442\u0443",
-"Font Sizes": "\u049a\u0430\u0440\u0456\u043f\u0442\u0435\u0440 \u04e9\u043b\u0448\u0435\u043c\u0456",
-"Subscript": "\u0410\u0441\u0442\u044b\u04a3\u0493\u044b \u0438\u043d\u0434\u0435\u043a\u0441",
-"Header 6": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 6",
-"Redo": "\u049a\u0430\u0439\u0442\u0430\u0440\u0443",
-"Paragraph": "\u0410\u0431\u0437\u0430\u0446",
-"Ok": "\u041e\u041a",
-"Bold": "\u0416\u0443\u0430\u043d",
-"Code": "\u041a\u043e\u0434",
-"Italic": "\u041a\u04e9\u043b\u0431\u0435\u0443",
-"Align center": "\u041e\u0440\u0442\u0430\u0441\u044b\u043d\u0430 \u043e\u0440\u043d\u0430\u043b\u0430\u0441\u0442\u044b\u0440\u0443",
-"Header 5": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 5",
-"Heading 6": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f 6",
-"Heading 3": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f 3",
-"Decrease indent": "\u0428\u0435\u0433\u0456\u043d\u0456\u0441\u0442\u0456 \u043a\u0435\u043c\u0456\u0442\u0443",
-"Header 4": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u041e\u0441\u044b \u043e\u043f\u0446\u0438\u044f \u04e9\u0448\u0456\u0440\u0456\u043b\u043c\u0435\u0433\u0435\u043d\u0448\u0435, \u0431\u0443\u0444\u0435\u0440\u0434\u0435\u0433\u0456 \u043c\u04d9\u0442\u0456\u043d \u043a\u04d9\u0434\u0456\u043c\u0433\u0456 \u043c\u04d9\u0442\u0456\u043d \u0440\u0435\u0442\u0456\u043d\u0434\u0435 \u049b\u043e\u0439\u044b\u043b\u0430\u0434\u044b.",
-"Underline": "\u0410\u0441\u0442\u044b \u0441\u044b\u0437\u044b\u043b\u0493\u0430\u043d",
-"Cancel": "\u0411\u0430\u0441 \u0442\u0430\u0440\u0442\u0443",
-"Justify": "\u0422\u043e\u043b\u0442\u044b\u0440\u0443",
-"Inline": "\u041a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0456\u043b\u0433\u0435\u043d (Inline)",
-"Copy": "\u041a\u04e9\u0448\u0456\u0440\u0443",
-"Align left": "\u0421\u043e\u043b\u0493\u0430 \u043e\u0440\u043d\u0430\u043b\u0430\u0441\u0442\u044b\u0440\u0443",
-"Visual aids": "\u041a\u04e9\u043c\u0435\u043a\u0448\u0456 \u0431\u0435\u043b\u0433\u0456\u043b\u0435\u0440",
-"Lower Greek": "\u041a\u0456\u0448\u0456 \u0433\u0440\u0435\u043a \u04d9\u0440\u0456\u043f\u0442\u0435\u0440\u0456",
-"Square": "\u0428\u0430\u0440\u0448\u044b",
-"Default": "\u04d8\u0434\u0435\u043f\u043a\u0456",
-"Lower Alpha": "\u041a\u0456\u0448\u0456 \u04d9\u0440\u0456\u043f\u0442\u0435\u0440",
-"Circle": "\u0428\u0435\u04a3\u0431\u0435\u0440",
-"Disc": "\u0414\u0438\u0441\u043a",
-"Upper Alpha": "\u0411\u0430\u0441 \u04d9\u0440\u0456\u043f\u0442\u0435\u0440",
-"Upper Roman": "\u0411\u0430\u0441 \u0440\u0438\u043c \u0446\u0438\u0444\u0440\u043b\u0430\u0440\u044b",
-"Lower Roman": "\u041a\u0456\u0448\u0456 \u0440\u0438\u043c \u0446\u0438\u0444\u0440\u043b\u0430\u0440\u044b",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0442\u0435\u043a \u049b\u0430\u043d\u0430 \u04d9\u0440\u0456\u043f\u0442\u0435\u043d \u0431\u0430\u0441\u0442\u0430\u043b\u044b\u043f, \u04d9\u0440\u0456\u043f\u0442\u0435\u0440, \u0441\u0430\u043d\u0434\u0430\u0440, \u0441\u044b\u0437\u044b\u049b\u0448\u0430\u043b\u0430\u0440, \u043d\u04af\u043a\u0442\u0435\u043b\u0435\u0440 \u0436\u04d9\u043d\u0435 \u0442.\u0431 \u0436\u0430\u043b\u0493\u0430\u0441\u0443\u044b \u0442\u0438\u0456\u0441.",
-"Name": "\u0410\u0442\u044b",
-"Anchor": "\u0411\u0435\u0442\u0431\u0435\u043b\u0433\u0456",
-"Id": "Id",
-"You have unsaved changes are you sure you want to navigate away?": "\u0421\u0430\u049b\u0442\u0430\u043b\u043c\u0430\u0493\u0430\u043d \u04e9\u0437\u0433\u0435\u0440\u0456\u0441\u0442\u0435\u0440 \u0431\u0430\u0440. \u0421\u0456\u0437 \u0448\u044b\u043d\u044b\u043c\u0435\u043d \u0431\u0430\u0441\u049b\u0430 \u0436\u0435\u0440\u0433\u0435 \u043a\u0435\u0442\u0443\u0434\u0456 \u049b\u0430\u043b\u0430\u0439\u0441\u044b\u0437 \u0431\u0430?",
-"Restore last draft": "\u0421\u043e\u04a3\u0493\u044b \u0441\u0430\u049b\u0442\u0430\u043b\u0493\u0430\u043d\u0434\u044b \u049b\u0430\u043b\u043f\u044b\u043d\u0430 \u043a\u0435\u043b\u0442\u0456\u0440\u0443",
-"Special character": "\u0410\u0440\u043d\u0430\u0439\u044b \u0442\u0430\u04a3\u0431\u0430",
-"Source code": "\u0411\u0430\u0441\u0442\u0430\u043f\u049b\u044b \u043a\u043e\u0434",
-"Language": "\u0422\u0456\u043b",
-"Insert\/Edit code sample": "\u041a\u043e\u0434 \u04af\u043b\u0433\u0456\u0441\u0456\u043d \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443\/\u0442\u04af\u0437\u0435\u0442\u0443",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "\u0422\u04af\u0441",
-"Right to left": "\u041e\u04a3\u043d\u0430\u043d \u0441\u043e\u043b\u0493\u0430",
-"Left to right": "\u0421\u043e\u043b\u0434\u0430\u043d \u043e\u04a3\u0493\u0430",
-"Emoticons": "\u0421\u043c\u0430\u0439\u043b\u0438\u043a\u0442\u0430\u0440",
-"Robots": "Meta-robots",
-"Document properties": "\u049a\u04b1\u0436\u0430\u0442 \u0441\u0438\u043f\u0430\u0442\u0442\u0430\u0440\u044b",
-"Title": "\u0410\u0442\u0430\u0443\u044b",
-"Keywords": "Meta-keywords",
-"Encoding": "Meta-charset",
-"Description": "\u0421\u0438\u043f\u0430\u0442\u0442\u0430\u043c\u0430\u0441\u044b",
-"Author": "Meta-author",
-"Fullscreen": "\u0422\u043e\u043b\u044b\u049b \u044d\u043a\u0440\u0430\u043d",
-"Horizontal line": "\u041a\u04e9\u043b\u0434\u0435\u043d\u0435\u04a3 \u0441\u044b\u0437\u044b\u049b",
-"Horizontal space": "\u041a\u04e9\u043b\u0434\u0435\u043d\u0435\u04a3\u0456\u043d\u0435\u043d \u049b\u0430\u043b\u0430\u0442\u044b\u043d \u043e\u0440\u044b\u043d",
-"Insert\/edit image": "\u0421\u0443\u0440\u0435\u0442 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443\/\u0442\u04af\u0437\u0435\u0442\u0443",
-"General": "\u0416\u0430\u043b\u043f\u044b",
-"Advanced": "\u049a\u043e\u0441\u044b\u043c\u0448\u0430",
-"Source": "\u0410\u0434\u0440\u0435\u0441\u0456",
-"Border": "\u0416\u0438\u0435\u0433\u0456",
-"Constrain proportions": "\u041f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u044f\u043b\u0430\u0440\u0434\u044b \u0441\u0430\u049b\u0442\u0430\u0443",
-"Vertical space": "\u0422\u0456\u043a \u043a\u0435\u04a3\u0434\u0456\u0433\u0456",
-"Image description": "\u0421\u0443\u0440\u0435\u0442 \u0441\u0438\u043f\u0430\u0442\u0442\u0430\u043c\u0430\u0441\u044b",
-"Style": "\u0421\u0442\u0438\u043b\u0456",
-"Dimensions": "\u04e8\u043b\u0448\u0435\u043c\u0434\u0435\u0440\u0456",
-"Insert image": "\u0421\u0443\u0440\u0435\u0442 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Image": "\u0421\u0443\u0440\u0435\u0442",
-"Zoom in": "\u0416\u0430\u049b\u044b\u043d\u0434\u0430\u0442\u0443",
-"Contrast": "\u049a\u043e\u044e\u043b\u0430\u0442\u0443",
-"Back": "\u0410\u0440\u0442\u049b\u0430",
-"Gamma": "\u0413\u0430\u043c\u043c\u0430",
-"Flip horizontally": "\u041a\u04e9\u043b\u0434\u0435\u043d\u0435\u04a3\u043d\u0435\u043d \u0430\u0443\u0434\u0430\u0440\u0443",
-"Resize": "\u04e8\u043b\u0448\u0435\u043c\u0456\u043d \u04e9\u0437\u0433\u0435\u0440\u0442\u0443",
-"Sharpen": "\u041d\u0430\u049b\u0442\u044b\u043b\u0430\u0443",
-"Zoom out": "\u0410\u043b\u044b\u0441\u0442\u0430\u0442\u0443",
-"Image options": "\u0421\u0443\u0440\u0435\u0442 \u0431\u0430\u043f\u0442\u0430\u0443\u043b\u0430\u0440\u044b",
-"Apply": "\u0421\u0430\u049b\u0442\u0430\u0443",
-"Brightness": "\u0410\u0448\u044b\u049b\u0442\u0430\u0443",
-"Rotate clockwise": "\u0421\u0430\u0493\u0430\u0442 \u0442\u0456\u043b\u0456\u043d\u0456\u04a3 \u0431\u0430\u0493\u044b\u0442\u044b\u043c\u0435\u043d \u0431\u04b1\u0440\u0443",
-"Rotate counterclockwise": "\u0421\u0430\u0493\u0430\u0442 \u0442\u0456\u043b\u0456\u043d\u0456\u04a3 \u0431\u0430\u0493\u044b\u0442\u044b\u043d\u0430 \u049b\u0430\u0440\u0441\u044b \u0431\u04b1\u0440\u0443",
-"Edit image": "\u0421\u0443\u0440\u0435\u0442\u0442\u0456 \u04e9\u0437\u0433\u0435\u0440\u0442\u0443",
-"Color levels": "\u0422\u04af\u0441 \u0434\u0435\u04a3\u0433\u0435\u0439\u043b\u0435\u0440\u0456",
-"Crop": "\u041a\u0435\u0441\u0443",
-"Orientation": "\u0411\u0430\u0493\u0434\u0430\u0440",
-"Flip vertically": "\u0422\u0456\u0433\u0456\u043d\u0435\u043d \u0430\u0443\u0434\u0430\u0440\u0443",
-"Invert": "\u041a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Date\/time": "\u041a\u04af\u043d\/\u0443\u0430\u049b\u044b\u0442",
-"Insert date\/time": "\u041a\u04af\u043d\/\u0443\u0430\u049b\u044b\u0442 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Remove link": "\u0421\u0456\u043b\u0442\u0435\u043c\u0435\u043d\u0456 \u0430\u043b\u044b\u043f \u0442\u0430\u0441\u0442\u0430\u0443",
-"Url": "URL-\u0430\u0434\u0440\u0435\u0441\u0456",
-"Text to display": "\u041a\u04e9\u0440\u0441\u0435\u0442\u0456\u043b\u0435\u0442\u0456\u043d \u043c\u04d9\u0442\u0456\u043d",
-"Anchors": "\u0421\u0456\u043b\u0442\u0435\u043c\u0435\u043b\u0435\u0440",
-"Insert link": "\u0421\u0456\u043b\u0442\u0435\u043c\u0435 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Link": "\u0421\u0456\u043b\u0442\u0435\u043c\u0435",
-"New window": "\u0416\u0430\u04a3\u0430 \u0442\u0435\u0440\u0435\u0437\u0435",
-"None": "\u0416\u043e\u049b",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0421\u0456\u0437 \u0435\u04a3\u0433\u0456\u0437\u0456\u043f \u0442\u04b1\u0440\u0493\u0430\u043d URL \u0441\u044b\u0440\u0442\u049b\u044b \u0441\u0456\u043b\u0442\u0435\u043c\u0435 \u0431\u043e\u043b\u044b\u043f \u0442\u0430\u0431\u044b\u043b\u0430\u0434\u044b. \u0410\u043b\u0434\u044b\u043d\u0430 http:\/\/ \u043f\u0440\u0435\u0444\u0438\u043a\u0441\u0456\u043d \u049b\u043e\u0441\u0443\u0434\u044b \u049b\u0430\u043b\u0430\u0439\u0441\u044b\u0437 \u0431\u0430?",
-"Paste or type a link": "\u0421\u0456\u043b\u0442\u0435\u043c\u0435\u043d\u0456 \u049b\u043e\u0439\u044b\u04a3\u044b\u0437 \u043d\u0435\u043c\u0435\u0441\u0435 \u0442\u0435\u0440\u0456\u04a3\u0456\u0437",
-"Target": "\u0410\u0448\u044b\u043b\u0430\u0442\u044b\u043d \u0436\u0435\u0440\u0456",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0421\u0456\u0437 \u0435\u04a3\u0433\u0456\u0437\u0456\u043f \u0442\u04b1\u0440\u0493\u0430\u043d URL e-mail \u0430\u0434\u0440\u0435\u0441\u0456 \u0431\u043e\u043b\u044b\u043f \u0442\u0430\u0431\u044b\u043b\u0430\u0434\u044b. \u0410\u043b\u0434\u044b\u043d\u0430 mailto: \u043f\u0440\u0435\u0444\u0438\u043a\u0441\u0456\u043d \u049b\u043e\u0441\u0443\u0434\u044b \u049b\u0430\u043b\u0430\u0439\u0441\u044b\u0437 \u0431\u0430?",
-"Insert\/edit link": "\u0421\u0456\u043b\u0442\u0435\u043c\u0435 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443\/\u0442\u04af\u0437\u0435\u0442\u0443",
-"Insert\/edit video": "\u0412\u0438\u0434\u0435\u043e \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443\/\u0442\u04af\u0437\u0435\u0442\u0443",
-"Media": "\u041c\u0435\u0434\u0438\u0430",
-"Alternative source": "\u049a\u043e\u0441\u044b\u043c\u0448\u0430 \u0430\u0434\u0440\u0435\u0441\u0456",
-"Paste your embed code below:": "\u0422\u04e9\u043c\u0435\u043d\u0434\u0435\u0433\u0456 \u043a\u043e\u0434\u0442\u044b \u043a\u04e9\u0448\u0456\u0440\u0456\u043f \u0430\u043b\u044b\u043f, \u049b\u043e\u0439\u044b\u04a3\u044b\u0437:",
-"Insert video": "\u0412\u0438\u0434\u0435\u043e \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Poster": "\u041f\u043e\u0441\u0442\u0435\u0440\u0456",
-"Insert\/edit media": "\u041c\u0435\u0434\u0438\u0430 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443\/\u0442\u04af\u0437\u0435\u0442\u0443",
-"Embed": "\u0415\u043d\u0434\u0456\u0440\u0443",
-"Nonbreaking space": "\u04ae\u0437\u0434\u0456\u043a\u0441\u0456\u0437 \u0431\u043e\u0441 \u043e\u0440\u044b\u043d",
-"Page break": "\u0411\u0435\u0442 \u04af\u0437\u0456\u043b\u0456\u043c\u0456",
-"Paste as text": "\u041c\u04d9\u0442\u0456\u043d \u0440\u0435\u0442\u0456\u043d\u0434\u0435 \u049b\u043e\u044e",
-"Preview": "\u0410\u043b\u0434\u044b\u043d-\u0430\u043b\u0430 \u049b\u0430\u0440\u0430\u0443",
-"Print": "\u0411\u0430\u0441\u044b\u043f \u0448\u044b\u0493\u0430\u0440\u0443",
-"Save": "\u0421\u0430\u049b\u0442\u0430\u0443",
-"Could not find the specified string.": "\u041a\u04e9\u0440\u0441\u0435\u0442\u0456\u043b\u0433\u0435\u043d \u0436\u043e\u043b \u0442\u0430\u0431\u044b\u043b\u043c\u0430\u0434\u044b.",
-"Replace": "\u0410\u0443\u044b\u0441\u0442\u044b\u0440\u0443",
-"Next": "\u041a\u0435\u043b\u0435\u0441\u0456",
-"Whole words": "\u0422\u04b1\u0442\u0430\u0441 \u0441\u04e9\u0437\u0434\u0435\u0440",
-"Find and replace": "\u0422\u0430\u0431\u0443 \u0436\u04d9\u043d\u0435 \u0430\u0443\u044b\u0441\u0442\u044b\u0440\u0443",
-"Replace with": "\u0410\u0443\u044b\u0441\u0442\u044b\u0440\u0430\u0442\u044b\u043d \u043c\u04d9\u0442\u0456\u043d",
-"Find": "\u0422\u0430\u0431\u044b\u043b\u0430\u0442\u044b\u043d \u043c\u04d9\u0442\u0456\u043d",
-"Replace all": "\u0411\u0430\u0440\u043b\u044b\u0493\u044b\u043d \u0430\u0443\u044b\u0441\u0442\u044b\u0440\u0443",
-"Match case": "\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0434\u0456 \u0435\u0441\u043a\u0435\u0440\u0443",
-"Prev": "\u0410\u043b\u0434\u044b\u04a3\u0493\u044b",
-"Spellcheck": "\u0415\u043c\u043b\u0435 \u0442\u0435\u043a\u0441\u0435\u0440\u0443",
-"Finish": "\u0410\u044f\u049b\u0442\u0430\u0443",
-"Ignore all": "\u0415\u0448\u049b\u0430\u0439\u0441\u044b\u0441\u044b\u043d \u0435\u043b\u0435\u043c\u0435\u0443",
-"Ignore": "\u0415\u043b\u0435\u043c\u0435\u0443",
-"Add to Dictionary": "\u0421\u04e9\u0437\u0434\u0456\u043a\u043a\u0435 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Insert row before": "\u04ae\u0441\u0442\u0456\u043d\u0435 \u0436\u043e\u043b \u049b\u043e\u0441\u0443",
-"Rows": "\u0416\u043e\u043b\u044b",
-"Height": "\u0411\u0438\u0456\u043a\u0442\u0456\u0433\u0456",
-"Paste row after": "\u0416\u043e\u043b\u0434\u044b\u04a3 \u0430\u0441\u0442\u044b\u043d\u0430 \u049b\u043e\u044e",
-"Alignment": "\u041e\u0440\u043d\u0430\u043b\u0430\u0441\u0443\u044b",
-"Border color": "\u0416\u0438\u0435\u043a \u0442\u04af\u0441\u0456",
-"Column group": "\u0411\u0430\u0493\u0430\u043d \u0442\u043e\u0431\u044b",
-"Row": "\u0416\u043e\u043b",
-"Insert column before": "\u0410\u043b\u0434\u044b\u043d\u0430 \u0431\u0430\u0493\u0430\u043d \u049b\u043e\u0441\u0443",
-"Split cell": "\u04b0\u044f\u0448\u044b\u049b\u0442\u044b \u0431\u04e9\u043b\u0443",
-"Cell padding": "\u04b0\u044f\u0448\u044b\u049b \u043a\u0435\u04a3\u0434\u0456\u0433\u0456",
-"Cell spacing": "\u04b0\u044f\u0448\u044b\u049b \u0430\u0440\u0430\u043b\u044b\u0493\u044b",
-"Row type": "\u0416\u043e\u043b \u0442\u0438\u043f\u0456",
-"Insert table": "\u041a\u0435\u0441\u0442\u0435 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Body": "\u041d\u0435\u0433\u0456\u0437\u0433\u0456 \u0431\u04e9\u043b\u0456\u0433\u0456",
-"Caption": "\u0410\u0442\u0430\u0443\u044b",
-"Footer": "\u0410\u044f\u049b \u0436\u0430\u0493\u044b",
-"Delete row": "\u0416\u043e\u043b\u0434\u044b \u0436\u043e\u044e",
-"Paste row before": "\u0416\u043e\u043b\u0434\u044b\u04a3 \u04af\u0441\u0442\u0456\u043d\u0435 \u049b\u043e\u044e",
-"Scope": "\u0410\u0443\u043c\u0430\u0493\u044b",
-"Delete table": "\u041a\u0435\u0441\u0442\u0435\u043d\u0456 \u0436\u043e\u044e",
-"H Align": "\u041a\u04e9\u043b\u0434\u0435\u043d\u0435\u04a3\u043d\u0435\u043d \u0442\u0443\u0440\u0430\u043b\u0430\u0443",
-"Top": "\u04ae\u0441\u0442\u0456",
-"Header cell": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 \u04b1\u044f\u0448\u044b\u049b",
-"Column": "\u0411\u0430\u0493\u0430\u043d",
-"Row group": "\u0416\u043e\u043b \u0442\u043e\u0431\u044b",
-"Cell": "\u04b0\u044f\u0448\u044b\u049b",
-"Middle": "\u041e\u0440\u0442\u0430\u0441\u044b",
-"Cell type": "\u04b0\u044f\u0448\u044b\u049b \u0442\u0438\u043f\u0456",
-"Copy row": "\u0416\u043e\u043b\u0434\u044b \u043a\u04e9\u0448\u0456\u0440\u0443",
-"Row properties": "\u0416\u043e\u043b \u0441\u0438\u043f\u0430\u0442\u0442\u0430\u0440\u044b",
-"Table properties": "\u041a\u0435\u0441\u0442\u0435 \u0441\u0438\u043f\u0430\u0442\u0442\u0430\u0440\u044b",
-"Bottom": "\u0410\u0441\u0442\u044b",
-"V Align": "\u0422\u0456\u0433\u0456\u043d\u0435\u043d \u0442\u0443\u0440\u0430\u043b\u0430\u0443",
-"Header": "\u0411\u0430\u0441 \u0436\u0430\u0493\u044b",
-"Right": "\u041e\u04a3\u0493\u0430",
-"Insert column after": "\u0410\u0440\u0442\u044b\u043d\u0430 \u0431\u0430\u0493\u0430\u043d \u049b\u043e\u0441\u0443",
-"Cols": "\u0411\u0430\u0493\u0430\u043d\u044b",
-"Insert row after": "\u0410\u0441\u0442\u044b\u043d\u0430 \u0436\u043e\u043b \u049b\u043e\u0441\u0443",
-"Width": "\u04b0\u0437\u044b\u043d\u0434\u044b\u0493\u044b",
-"Cell properties": "\u04b0\u044f\u0448\u044b\u049b \u0441\u0438\u043f\u0430\u0442\u0442\u0430\u0440\u044b",
-"Left": "\u0421\u043e\u043b\u0493\u0430",
-"Cut row": "\u0416\u043e\u043b\u0434\u044b \u049b\u0438\u044b\u043f \u0430\u043b\u0443",
-"Delete column": "\u0411\u0430\u0493\u0430\u043d\u0434\u044b \u0436\u043e\u044e",
-"Center": "\u041e\u0440\u0442\u0430\u0441\u044b\u043d\u0430",
-"Merge cells": "\u04b0\u044f\u0448\u044b\u049b\u0442\u0430\u0440\u0434\u044b \u0431\u0456\u0440\u0456\u043a\u0442\u0456\u0440\u0443",
-"Insert template": "\u04ae\u043b\u0433\u0456 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Templates": "\u04ae\u043b\u0433\u0456\u043b\u0435\u0440",
-"Background color": "\u04e8\u04a3\u0456\u043d\u0456\u04a3 \u0442\u04af\u0441\u0456",
-"Custom...": "\u04e8\u0437\u0433\u0435\u0440\u0442\u0443",
-"Custom color": "\u0422\u04af\u0441 \u04e9\u0437\u0433\u0435\u0440\u0442\u0443",
-"No color": "\u0422\u04af\u0441\u0441\u0456\u0437",
-"Text color": "\u041c\u04d9\u0442\u0456\u043d \u0442\u04af\u0441\u0456",
-"Table of Contents": "\u041c\u0430\u0437\u043c\u04b1\u043d\u0434\u0430\u0440 \u043a\u0435\u0441\u0442\u0435\u0441\u0456",
-"Show blocks": "\u0411\u043b\u043e\u043a\u0442\u0430\u0440\u0434\u044b \u043a\u04e9\u0440\u0441\u0435\u0442\u0443",
-"Show invisible characters": "\u041a\u04e9\u0440\u0456\u043d\u0431\u0435\u0439\u0442\u0456\u043d \u0442\u0430\u04a3\u0431\u0430\u043b\u0430\u0440\u0434\u044b \u043a\u04e9\u0440\u0441\u0435\u0442\u0443",
-"Words: {0}": "\u0421\u04e9\u0437 \u0441\u0430\u043d\u044b: {0}",
-"Insert": "\u041a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0422\u04af\u0437\u0435\u0442\u0443",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0424\u043e\u0440\u043c\u0430\u0442\u0442\u0430\u043b\u0493\u0430\u043d \u043c\u04d9\u0442\u0456\u043d \u0430\u0443\u043c\u0430\u0493\u044b. \u041c\u0435\u043d\u044e \u043a\u04e9\u0440\u0441\u0435\u0442\u0443 \u04af\u0448\u0456\u043d ALT-F9 \u0431\u0430\u0441\u044b\u04a3\u044b\u0437. \u049a\u04b1\u0440\u0430\u043b\u0434\u0430\u0440 \u043f\u0430\u043d\u0435\u043b\u0456\u043d \u043a\u04e9\u0440\u0441\u0435\u0442\u0443 \u04af\u0448\u0456\u043d ALT-F10 \u0431\u0430\u0441\u044b\u04a3\u044b\u0437. \u041a\u04e9\u043c\u0435\u043a \u0430\u043b\u0443 \u04af\u0448\u0456\u043d ALT-0 \u0431\u0430\u0441\u044b\u04a3\u044b\u0437.",
-"Tools": "\u049a\u04b1\u0440\u0430\u043b\u0434\u0430\u0440",
-"View": "\u041a\u04e9\u0440\u0456\u043d\u0456\u0441",
-"Table": "\u041a\u0435\u0441\u0442\u0435",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/km_KH.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/km_KH.js
deleted file mode 100644
index 381d4c4a46..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/km_KH.js
+++ /dev/null
@@ -1,253 +0,0 @@
-tinymce.addI18n('km_KH',{
-"Redo": "\u1792\u17d2\u179c\u17be\u200b\u179c\u17b7\u1789",
-"Undo": "\u1798\u17b7\u1793\u200b\u1792\u17d2\u179c\u17be\u200b\u179c\u17b7\u1789",
-"Cut": "\u1780\u17b6\u178f\u17cb",
-"Copy": "\u1785\u1798\u17d2\u179b\u1784",
-"Paste": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb",
-"Select all": "\u1787\u17d2\u179a\u17be\u179f\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a2\u179f\u17cb",
-"New document": "\u17af\u1780\u179f\u17b6\u179a\u200b\u17a2\u178f\u17d2\u1790\u1794\u1791\u200b\u1790\u17d2\u1798\u17b8",
-"Ok": "\u1796\u17d2\u179a\u1798",
-"Cancel": "\u1794\u17c4\u17c7\u200b\u1794\u1784\u17cb",
-"Visual aids": "\u1791\u17b7\u178a\u17d2\u178b\u1797\u17b6\u1796\u200b\u1787\u17c6\u1793\u17bd\u1799",
-"Bold": "\u178a\u17b7\u178f",
-"Italic": "\u1791\u17d2\u179a\u17c1\u178f",
-"Underline": "\u1782\u17bc\u179f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1798",
-"Strikethrough": "\u1782\u17bc\u179f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1786\u17bc\u178f",
-"Superscript": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17bc\u1785\u200b\u179b\u17be",
-"Subscript": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17bc\u1785\u200b\u1780\u17d2\u179a\u17c4\u1798",
-"Clear formatting": "\u179f\u1798\u17d2\u17a2\u17b6\u178f\u200b\u1791\u1798\u17d2\u179a\u1784\u17cb",
-"Align left": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1791\u17c5\u200b\u1786\u17d2\u179c\u17c1\u1784",
-"Align center": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1791\u17c5\u200b\u1780\u178e\u17d2\u178a\u17b6\u179b",
-"Align right": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1791\u17c5\u200b\u179f\u17d2\u178a\u17b6\u17c6",
-"Justify": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1796\u17c1\u1789",
-"Bullet list": "\u1794\u1789\u17d2\u1787\u17b8\u200b\u1787\u17b6\u200b\u1785\u17c6\u178e\u17bb\u1785",
-"Numbered list": "\u1794\u1789\u17d2\u1787\u17b8\u200b\u1787\u17b6\u200b\u179b\u17c1\u1781",
-"Decrease indent": "\u1781\u17b7\u178f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1785\u17c1\u1789",
-"Increase indent": "\u1781\u17b7\u178f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1785\u17bc\u179b",
-"Close": "\u1794\u17b7\u1791",
-"Formats": "\u1791\u17d2\u179a\u1784\u17cb\u1791\u17d2\u179a\u17b6\u1799",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8\u200b\u17a2\u17ca\u17b8\u1793\u1792\u17ba\u178e\u17b7\u178f\u200b\u179a\u1794\u179f\u17cb\u200b\u17a2\u17d2\u1793\u1780\u200b\u1798\u17b7\u1793\u200b\u17a2\u17b6\u1785\u200b\u1785\u17bc\u179b\u200b\u1795\u17d2\u1791\u17b6\u179b\u17cb\u200b\u1791\u17c5\u200b\u1780\u17b6\u1793\u17cb\u200b\u1783\u17d2\u179b\u17b8\u1794\u1794\u178f\u200b\u1791\u17c1\u17d4 \u179f\u17bc\u1798\u200b\u1794\u17d2\u179a\u17be Ctrl+X\/C\/V \u179b\u17be\u200b\u1780\u17d2\u178a\u17b6\u179a\u200b\u1785\u17bb\u1785\u200b\u1787\u17c6\u1793\u17bd\u179f\u200b\u179c\u17b7\u1789\u17d4",
-"Headers": "\u1780\u17d2\u1794\u17b6\u179b",
-"Header 1": "\u1780\u17d2\u1794\u17b6\u179b 1",
-"Header 2": "\u1780\u17d2\u1794\u17b6\u179b 2",
-"Header 3": "\u1780\u17d2\u1794\u17b6\u179b 3",
-"Header 4": "\u1780\u17d2\u1794\u17b6\u179b 4",
-"Header 5": "\u1780\u17d2\u1794\u17b6\u179b 5",
-"Header 6": "\u1780\u17d2\u1794\u17b6\u179b 6",
-"Headings": "\u1780\u17d2\u1794\u17b6\u179b",
-"Heading 1": "\u1780\u17d2\u1794\u17b6\u179b 1",
-"Heading 2": "\u1780\u17d2\u1794\u17b6\u179b 2",
-"Heading 3": "\u1780\u17d2\u1794\u17b6\u179b 3",
-"Heading 4": "\u1780\u17d2\u1794\u17b6\u179b 4",
-"Heading 5": "\u1780\u17d2\u1794\u17b6\u179b 5",
-"Heading 6": "\u1780\u17d2\u1794\u17b6\u179b 6",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u1780\u17bc\u178a",
-"Paragraph": "\u1780\u1790\u17b6\u1781\u178e\u17d2\u178c",
-"Blockquote": "\u1794\u17d2\u179b\u17bb\u1780\u200b\u1796\u17b6\u1780\u17d2\u1799\u200b\u179f\u1798\u17d2\u179a\u1784\u17cb",
-"Inline": "\u1780\u17d2\u1793\u17bb\u1784\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb",
-"Blocks": "\u1794\u17d2\u179b\u17bb\u1780",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u1780\u17b6\u179a\u200b\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1796\u17c1\u179b\u200b\u1793\u17c1\u17c7 \u179f\u17d2\u1790\u17b7\u178f\u200b\u1780\u17d2\u1793\u17bb\u1784\u200b\u1794\u17c2\u1794\u200b\u1795\u17c2\u1793\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1792\u1798\u17d2\u1798\u178f\u17b6\u17d4 \u1794\u1785\u17d2\u1785\u17bb\u1794\u17d2\u1794\u1793\u17d2\u1793\u200b\u1793\u17c1\u17c7 \u1798\u17b6\u178f\u17b7\u1780\u17b6\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a1\u17b6\u1799\u200b\u1793\u17b9\u1784\u200b\u178f\u17d2\u179a\u17bc\u179c\u200b\u1794\u17b6\u1793\u200b\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17b6\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1792\u1798\u17d2\u1798\u178f\u17b6 \u179b\u17bb\u17c7\u178f\u17d2\u179a\u17b6\u200b\u178f\u17c2\u200b\u17a2\u17d2\u1793\u1780\u200b\u1794\u17b7\u1791\u200b\u1787\u1798\u17d2\u179a\u17be\u179f\u200b\u1793\u17c1\u17c7\u17d4",
-"Font Family": "\u1782\u17d2\u179a\u17bd\u179f\u17b6\u179a\u200b\u1796\u17bb\u1798\u17d2\u1796\u200b\u17a2\u1780\u17d2\u179f\u179a",
-"Font Sizes": "\u1791\u17c6\u17a0\u17c6\u200b\u17a2\u1780\u17d2\u179f\u179a",
-"Class": "Class",
-"Browse for an image": "\u179a\u1780\u1798\u17be\u179b\u200b\u179a\u17bc\u1794\u1797\u17b6\u1796",
-"OR": "\u17ac",
-"Drop an image here": "\u1791\u1798\u17d2\u179b\u17b6\u1794\u17cb\u200b\u179a\u17bc\u1794\u1797\u17b6\u1796\u200b\u1793\u17c5\u200b\u178f\u17d2\u179a\u1784\u17cb\u200b\u1793\u17c1\u17c7",
-"Upload": "\u1795\u17d2\u1791\u17bb\u1780\u17a1\u17be\u1784",
-"Default": "\u179b\u17c6\u1793\u17b6\u17c6\u200b\u178a\u17be\u1798",
-"Circle": "\u1798\u17bc\u179b",
-"Disc": "\u1790\u17b6\u179f",
-"Square": "\u1787\u17d2\u179a\u17bb\u1784",
-"Lower Alpha": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17bc\u1785",
-"Lower Greek": "\u179b\u17c1\u1781\u200b\u1780\u17d2\u179a\u17b7\u1780\u200b\u178f\u17bc\u1785",
-"Lower Roman": "\u179b\u17c1\u1781\u200b\u179a\u17c9\u17bc\u1798\u17c9\u17b6\u17c6\u1784\u200b\u178f\u17bc\u1785",
-"Upper Alpha": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u1792\u17c6",
-"Upper Roman": "\u179b\u17c1\u1781\u200b\u179a\u17c9\u17bc\u1798\u17c9\u17b6\u17c6\u1784\u200b\u1792\u17c6",
-"Anchor": "\u1799\u17bb\u1790\u17d2\u1780\u17b6",
-"Name": "\u1788\u17d2\u1798\u17c4\u17c7",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u1782\u17bd\u179a\u178f\u17c2\u200b\u1795\u17d2\u178a\u17be\u1798\u200b\u1787\u17b6\u1798\u17bd\u1799\u200b\u178f\u17bd\u17a2\u1780\u17d2\u179f\u179a \u17a0\u17be\u1799\u200b\u1794\u1793\u17d2\u178f\u200b\u1787\u17b6\u1798\u17bd\u1799\u200b\u178f\u17c2\u200b\u178f\u17bd\u17a2\u1780\u17d2\u179f\u179a \u179b\u17c1\u1781 \u179f\u1789\u17d2\u1789\u17b6\u200b\u178a\u1780 \u179f\u1789\u17d2\u1789\u17b6\u200b\u1785\u17bb\u1785 \u179f\u1789\u17d2\u1789\u17b6\u200b\u1785\u17bb\u1785\u1796\u17b8\u179a \u17ac\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1780\u17d2\u179a\u17c4\u1798\u17d4",
-"You have unsaved changes are you sure you want to navigate away?": "\u1798\u17b6\u1793\u200b\u1794\u1793\u17d2\u179b\u17b6\u179f\u17cb\u200b\u1794\u17d2\u178a\u17bc\u179a\u200b\u1798\u17b7\u1793\u200b\u1791\u17b6\u1793\u17cb\u200b\u1794\u17b6\u1793\u200b\u179a\u1780\u17d2\u179f\u17b6\u200b\u1791\u17bb\u1780\u17d4 \u178f\u17be\u200b\u17a2\u17d2\u1793\u1780\u200b\u1796\u17b7\u178f\u200b\u1787\u17b6\u200b\u1785\u1784\u17cb\u200b\u1785\u17b6\u1780\u200b\u1785\u17c1\u1789\u200b\u1796\u17b8\u1791\u17b8\u1793\u17c1\u17c7\u200b\u1798\u17c2\u1793\u1791\u17c1?",
-"Restore last draft": "\u179f\u17d2\u178a\u17b6\u179a\u200b\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8\u200b\u1796\u17d2\u179a\u17b6\u1784\u200b\u1796\u17b8\u200b\u1798\u17bb\u1793",
-"Special character": "\u178f\u17bd\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1796\u17b7\u179f\u17c1\u179f",
-"Source code": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u1780\u17bc\u178a",
-"Insert\/Edit code sample": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2\u179f\u1798\u17d2\u179a\u17bd\u179b \u1780\u17bc\u178a\u200b\u1782\u17c6\u179a\u17bc",
-"Language": "\u1797\u17b6\u179f\u17b6",
-"Color": "\u1796\u178e\u17cc",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u1786\u17d2\u179c\u17c1\u1784\u200b\u1791\u17c5\u200b\u179f\u17d2\u178a\u17b6\u17c6",
-"Right to left": "\u179f\u17d2\u178a\u17b6\u17c6\u200b\u1791\u17c5\u200b\u1786\u17d2\u179c\u17c1\u1784",
-"Emoticons": "\u179a\u17bc\u1794\u200b\u179f\u1789\u17d2\u1789\u17b6\u178e\u200b\u17a2\u17b6\u179a\u1798\u17d2\u1798\u178e\u17cd",
-"Document properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u179f\u1798\u17d2\u1794\u178f\u17d2\u178f\u17b7\u200b\u17af\u1780\u179f\u17b6\u179a",
-"Title": "\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
-"Keywords": "\u1796\u17b6\u1780\u17d2\u1799\u200b\u1782\u1793\u17d2\u179b\u17b9\u17c7",
-"Description": "\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8\u200b\u17a2\u1792\u17b7\u1794\u17d2\u1794\u17b6\u1799",
-"Robots": "\u179a\u17bc\u1794\u1799\u1793\u17d2\u178f",
-"Author": "\u17a2\u17d2\u1793\u1780\u200b\u1793\u17b7\u1796\u1793\u17d2\u1792",
-"Encoding": "\u1780\u17b6\u179a\u200b\u17a2\u17ca\u17b8\u1793\u1780\u17bc\u178a",
-"Fullscreen": "\u1796\u17c1\u1789\u200b\u17a2\u17c1\u1780\u17d2\u179a\u1784\u17cb",
-"Action": "\u179f\u1780\u1798\u17d2\u1798\u1797\u17b6\u1796",
-"Shortcut": "\u1795\u17d2\u179b\u17bc\u179c\u1780\u17b6\u178f\u17cb",
-"Help": "\u1787\u17c6\u1793\u17bd\u1799",
-"Address": "\u17a2\u17b6\u179f\u1799\u178a\u17d2\u178b\u17b6\u1793",
-"Focus to menubar": "\u1795\u17d2\u178a\u17c4\u178f\u200b\u1791\u17c5\u179b\u17be\u200b\u179a\u1794\u17b6\u179a\u200b\u1798\u17c9\u17ba\u1793\u17bb\u1799",
-"Focus to toolbar": "\u1795\u17d2\u178a\u17c4\u178f\u200b\u1791\u17c5\u179b\u17be\u200b\u179a\u1794\u17b6\u179a\u200b\u17a7\u1794\u1780\u179a\u178e\u17cd",
-"Focus to element path": "\u1795\u17d2\u178a\u17c4\u178f\u200b\u1791\u17c5\u179b\u17be\u200b\u1791\u17b8\u178f\u17b6\u17c6\u1784\u200b\u179a\u1794\u179f\u17cb\u200b\u1792\u17b6\u178f\u17bb",
-"Focus to contextual toolbar": "\u1795\u17d2\u178a\u17c4\u178f\u200b\u1791\u17c5\u200b\u179b\u17be\u200b\u179a\u1794\u17b6\u179a\u17a7\u1794\u1780\u179a\u178e\u17cd\u200b\u178f\u17b6\u1798\u200b\u1794\u179a\u17b7\u1794\u1791",
-"Insert link (if link plugin activated)": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17c6\u178e (\u1794\u17d2\u179a\u179f\u17b7\u1793\u1794\u17be\u200b\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8 plugin \u1794\u17b6\u1793\u1794\u17be\u1780)",
-"Save (if save plugin activated)": "\u179a\u1780\u17d2\u179f\u17b6\u1791\u17bb\u1780 (\u1794\u17d2\u179a\u179f\u17b7\u1793\u1794\u17be\u200b\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8 save \u1794\u17b6\u1793\u1794\u17be\u1780)",
-"Find (if searchreplace plugin activated)": "\u179f\u17d2\u179c\u17c2\u1784\u179a\u1780 (\u1794\u17d2\u179a\u179f\u17b7\u1793\u200b\u1794\u17be\u200b\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8 searchreplace \u1794\u17b6\u1793\u200b\u1794\u17be\u1780)",
-"Plugins installed ({0}):": "\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8\u200b\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u178a\u17c2\u179b\u1794\u17b6\u1793\u200b\u178a\u17c6\u17a1\u17be\u1784 ({0})\u17d6",
-"Premium plugins:": "\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8\u200b\u1782\u17b7\u178f\u200b\u1794\u17d2\u179a\u17b6\u1780\u17cb\u17d6",
-"Learn more...": "\u179f\u17b7\u1780\u17d2\u179f\u17b6\u200b\u1794\u1793\u17d2\u1790\u17c2\u1798...",
-"You are using {0}": "\u17a2\u17d2\u1793\u1780\u200b\u1780\u17c6\u1796\u17bb\u1784\u200b\u1794\u17d2\u179a\u17be {0}",
-"Horizontal line": "\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u178a\u17c1\u1780",
-"Insert\/edit image": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u179a\u17bc\u1794\u200b\u1797\u17b6\u1796",
-"Image description": "\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8\u200b\u17a2\u1792\u17b7\u1794\u17d2\u1794\u17b6\u1799\u200b\u1796\u17b8\u200b\u179a\u17bc\u1794",
-"Source": "\u1794\u17d2\u179a\u1797\u1796",
-"Dimensions": "\u179c\u17b7\u1798\u17b6\u178f\u17d2\u179a",
-"Constrain proportions": " \u1794\u1784\u17d2\u1781\u17c6\u200b\u17b2\u17d2\u1799\u200b\u1798\u17b6\u1793\u200b\u179f\u1798\u17b6\u1798\u17b6\u178f\u17d2\u179a",
-"General": "\u1791\u17bc\u1791\u17c5",
-"Advanced": "\u1780\u1798\u17d2\u179a\u17b7\u178f\u200b\u1781\u17d2\u1796\u179f\u17cb",
-"Style": "\u179a\u1785\u1793\u17b6\u1794\u1790",
-"Vertical space": "\u179b\u17c6\u17a0\u200b\u1794\u1789\u17d2\u1788\u179a",
-"Horizontal space": "\u179b\u17c6\u17a0\u200b\u1795\u17d2\u178a\u17c1\u1780",
-"Border": "\u179f\u17ca\u17bb\u1798",
-"Insert image": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u179a\u17bc\u1794\u200b\u1797\u17b6\u1796",
-"Image": "\u179a\u17bc\u1794\u1797\u17b6\u1796",
-"Image list": "\u1794\u1789\u17d2\u1787\u17b8\u179a\u17bc\u1794\u1797\u17b6\u1796",
-"Rotate counterclockwise": "\u1794\u1784\u17d2\u179c\u17b7\u179b\u200b\u1785\u17d2\u179a\u17b6\u179f\u200b\u1791\u17d2\u179a\u1793\u17b7\u1785\u200b\u1793\u17b6\u17a1\u17b7\u1780\u17b6",
-"Rotate clockwise": "\u1794\u1784\u17d2\u179c\u17b7\u179b\u200b\u179f\u17d2\u179a\u1794\u200b\u1791\u17d2\u179a\u1793\u17b7\u1785\u200b\u1793\u17b6\u17a1\u17b7\u1780\u17b6",
-"Flip vertically": "\u178f\u17d2\u179a\u17a1\u1794\u17cb\u200b\u1794\u1789\u17d2\u1788\u179a",
-"Flip horizontally": "\u178f\u17d2\u179a\u17a1\u1794\u17cb\u200b\u1795\u17d2\u178a\u17c1\u1780",
-"Edit image": "\u1780\u17c2\u179f\u1798\u17d2\u179a\u17bd\u179b\u200b\u179a\u17bc\u1794\u1797\u17b6\u1796",
-"Image options": "\u1787\u1798\u17d2\u179a\u17be\u179f\u200b\u179a\u17bc\u1794\u1797\u17b6\u1796",
-"Zoom in": "\u1796\u1784\u17d2\u179a\u17b8\u1780",
-"Zoom out": "\u1794\u1784\u17d2\u179a\u17bd\u1798",
-"Crop": "\u1785\u17d2\u179a\u17b9\u1794",
-"Resize": "\u1794\u17d2\u178a\u17bc\u179a\u200b\u1791\u17c6\u17a0\u17c6",
-"Orientation": "\u1791\u17b7\u179f",
-"Brightness": "\u1796\u1793\u17d2\u179b\u17ba",
-"Sharpen": "\u1785\u17d2\u1794\u17b6\u179f\u17cb",
-"Contrast": "\u1780\u1798\u17d2\u179a\u17b7\u178f\u200b\u1796\u178e\u17cc",
-"Color levels": "\u1780\u1798\u17d2\u179a\u17b7\u178f\u200b\u1796\u178e\u17cc",
-"Gamma": "\u17a0\u17d2\u1782\u17b6\u1798\u17c9\u17b6",
-"Invert": "\u178a\u17b6\u1780\u17cb\u200b\u1794\u1789\u17d2\u1785\u17d2\u179a\u17b6\u179f",
-"Apply": "\u17a2\u1793\u17bb\u179c\u178f\u17d2\u178f",
-"Back": "\u1790\u1799\u1780\u17d2\u179a\u17c4\u1799",
-"Insert date\/time": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1780\u17b6\u179b\u200b\u1794\u179a\u17b7\u1785\u17d2\u1786\u17c1\u1791\/\u1798\u17c9\u17c4\u1784",
-"Date\/time": "\u1780\u17b6\u179b\u1794\u179a\u17b7\u1785\u17d2\u1786\u17c1\u1791\/\u1798\u17c9\u17c4\u1784",
-"Insert link": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17c6\u178e",
-"Insert\/edit link": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u178f\u17c6\u178e",
-"Text to display": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17d2\u179a\u17bc\u179c\u200b\u1794\u1784\u17d2\u17a0\u17b6\u1789",
-"Url": "URL",
-"Target": "\u1791\u17b7\u179f\u178a\u17c5",
-"None": "\u1798\u17b7\u1793\u200b\u1798\u17b6\u1793",
-"New window": "\u1795\u17d2\u1791\u17b6\u17c6\u1784\u200b\u179c\u17b8\u1793\u178a\u17bc\u200b\u1790\u17d2\u1798\u17b8",
-"Remove link": "\u178a\u1780\u200b\u178f\u17c6\u178e\u200b\u1785\u17c1\u1789",
-"Anchors": "\u1799\u17bb\u1790\u17d2\u1780\u17b6",
-"Link": "\u178f\u17c6\u178e",
-"Paste or type a link": "\u1794\u17b7\u1791\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u17ac\u200b\u179c\u17b6\u1799\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17c6\u178e",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u17a2\u17d2\u1793\u1780\u200b\u1794\u17b6\u1793\u200b\u1794\u1789\u17d2\u1785\u17bc\u179b URL \u178a\u17c2\u179b\u200b\u1798\u17b6\u1793\u200b\u179f\u178e\u17d2\u178b\u17b6\u1793\u200b\u178a\u17bc\u1785\u200b\u17a2\u17b6\u179f\u1799\u178a\u17d2\u178b\u17b6\u1793\u200b\u17a2\u17ca\u17b8\u1798\u17c2\u179b\u17d4 \u178f\u17be\u200b\u17a2\u17d2\u1793\u1780\u200b\u1785\u1784\u17cb\u200b\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u1794\u17bb\u1796\u17d2\u179c\u1794\u200b\u1791 mailto: \u178a\u17c2\u179a\u200b\u17ac\u1791\u17c1?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u17a2\u17d2\u1793\u1780\u200b\u1794\u17b6\u1793\u200b\u1794\u1789\u17d2\u1785\u17bc\u179b URL \u178a\u17c2\u179b\u200b\u1787\u17b6\u200b\u178f\u17c6\u178e\u200b\u1791\u17c5\u200b\u1781\u17b6\u1784\u200b\u1780\u17d2\u179a\u17c5\u17d4 \u178f\u17be\u200b\u17a2\u17d2\u1793\u1780\u200b\u1785\u1784\u17cb\u200b\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u1794\u17bb\u1796\u17d2\u179c\u1794\u200b\u1791 http:\/\/ \u178a\u17c2\u179a\u200b\u17ac\u1791\u17c1?",
-"Link list": "\u1794\u1789\u17d2\u1787\u17b8\u178f\u17c6\u178e",
-"Insert video": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u179c\u17b8\u178a\u17c1\u17a2\u17bc",
-"Insert\/edit video": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u179c\u17b8\u178a\u17c1\u17a2\u17bc",
-"Insert\/edit media": "\u1794\u1789\u17d2\u1787\u17bc\u179b\u200b\/\u1780\u17c2\u179f\u1798\u17d2\u179a\u17bd\u179b \u1798\u17c1\u178c\u17b6",
-"Alternative source": "\u1794\u17d2\u179a\u1797\u1796\u200b\u178a\u1791\u17c3\u200b\u1791\u17c0\u178f",
-"Poster": "\u17a2\u17d2\u1793\u1780\u200b\u1795\u17d2\u179f\u17b6\u1799",
-"Paste your embed code below:": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1780\u17bc\u178a\u200b\u1794\u1784\u17d2\u1780\u1794\u17cb\u200b\u1793\u17c5\u200b\u1781\u17b6\u1784\u200b\u1780\u17d2\u179a\u17c4\u1798:",
-"Embed": "\u1794\u1784\u17d2\u1780\u1794\u17cb",
-"Media": "\u1798\u17c1\u178c\u17b6",
-"Nonbreaking space": "\u178a\u17c6\u178e\u1780\u200b\u1783\u17d2\u179b\u17b6\u200b\u1798\u17b7\u1793\u200b\u1794\u17c6\u1794\u17c2\u1780",
-"Page break": "\u1794\u17c6\u1794\u17c2\u1780\u200b\u1791\u17c6\u1796\u17d0\u179a",
-"Paste as text": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17b6\u200b\u17a2\u1780\u17d2\u179f\u179a",
-"Preview": "\u1798\u17be\u179b\u200b\u1787\u17b6\u200b\u1798\u17bb\u1793",
-"Print": "\u1794\u17c4\u17c7\u200b\u1796\u17bb\u1798\u17d2\u1796",
-"Save": "\u179a\u1780\u17d2\u179f\u17b6\u200b\u1791\u17bb\u1780",
-"Find": "\u179f\u17d2\u179c\u17c2\u1784\u200b\u179a\u1780",
-"Replace with": "\u1787\u17c6\u1793\u17bd\u179f\u200b\u178a\u17c4\u1799",
-"Replace": "\u1787\u17c6\u1793\u17bd\u179f",
-"Replace all": "\u1787\u17c6\u1793\u17bd\u179f\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a2\u179f\u17cb",
-"Prev": "\u1780\u17d2\u179a\u17c4\u1799",
-"Next": "\u1798\u17bb\u1781",
-"Find and replace": "\u179f\u17d2\u179c\u17c2\u1784\u200b\u179a\u1780\u200b\u1793\u17b7\u1784\u200b\u1787\u17c6\u1793\u17bd\u179f",
-"Could not find the specified string.": "\u1798\u17b7\u1793\u200b\u17a2\u17b6\u1785\u200b\u179a\u1780\u200b\u1783\u17be\u1789\u200b\u1781\u17d2\u179f\u17c2\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u178a\u17c2\u179b\u200b\u1794\u17b6\u1793\u200b\u1780\u17c6\u178e\u178f\u17cb\u17d4",
-"Match case": "\u1780\u179a\u178e\u17b8\u200b\u178a\u17c6\u178e\u17bc\u1785",
-"Whole words": "\u1796\u17b6\u1780\u17d2\u1799\u200b\u1791\u17b6\u17c6\u1784\u200b\u1798\u17bc\u179b",
-"Spellcheck": "\u1796\u17b7\u1793\u17b7\u178f\u17d2\u1799\u200b\u17a2\u1780\u17d2\u1781\u179a\u17b6\u179c\u17b7\u179a\u17bb\u1791\u17d2\u1792",
-"Ignore": "\u1798\u17b7\u1793\u200b\u17a2\u17be\u200b\u1796\u17be",
-"Ignore all": "\u1798\u17b7\u1793\u200b\u17a2\u17be\u1796\u17be\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a2\u179f\u17cb",
-"Finish": "\u1794\u1789\u17d2\u1785\u1794\u17cb",
-"Add to Dictionary": "\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u1791\u17c5\u200b\u179c\u1785\u1793\u17b6\u1793\u17bb\u1780\u17d2\u179a\u1798",
-"Insert table": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17b6\u179a\u17b6\u1784",
-"Table properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u178f\u17b6\u179a\u17b6\u1784",
-"Delete table": "\u179b\u17bb\u1794\u200b\u178f\u17b6\u179a\u17b6\u1784",
-"Cell": "\u1780\u17d2\u179a\u17a1\u17b6",
-"Row": "\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Column": "\u1787\u17bd\u179a\u200b\u1788\u179a",
-"Cell properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Merge cells": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1780\u17d2\u179a\u17a1\u17b6\u200b\u1785\u17bc\u179b\u200b\u1782\u17d2\u1793\u17b6",
-"Split cell": "\u1789\u17c2\u1780\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Insert row before": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1788\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1798\u17bb\u1781",
-"Insert row after": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1799",
-"Delete row": "\u179b\u17bb\u1794\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Row properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Cut row": "\u1780\u17b6\u178f\u17cb\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Copy row": "\u1785\u1798\u17d2\u179b\u1784\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Paste row before": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1798\u17bb\u1781",
-"Paste row after": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1799",
-"Insert column before": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1787\u17bd\u179a\u200b\u1788\u179a\u200b\u1796\u17b8\u200b\u1798\u17bb\u1781",
-"Insert column after": "\u1794\u1789\u17d2\u1787\u17bc\u179b\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1799",
-"Delete column": "\u179b\u17bb\u1794\u200b\u1787\u17bd\u179a\u200b\u1788\u179a",
-"Cols": "\u1787\u17bd\u179a\u200b\u1788\u179a",
-"Rows": "\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Width": "\u1791\u1791\u17b9\u1784",
-"Height": "\u1780\u1798\u17d2\u1796\u179f\u17cb",
-"Cell spacing": "\u1782\u1798\u17d2\u179b\u17b6\u178f\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Cell padding": "\u1785\u1793\u17d2\u179b\u17c4\u17c7\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Caption": "\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
-"Left": "\u1786\u17d2\u179c\u17c1\u1784",
-"Center": "\u1780\u178e\u17d2\u178a\u17b6\u179b",
-"Right": "\u179f\u17d2\u178a\u17b6\u17c6",
-"Cell type": "\u1794\u17d2\u179a\u1797\u17c1\u1791\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Scope": "\u179c\u17b7\u179f\u17b6\u179b\u200b\u1797\u17b6\u1796",
-"Alignment": "\u1780\u17b6\u179a\u200b\u178f\u1798\u17d2\u179a\u17b9\u1798",
-"H Align": "\u1780\u17b6\u179a\u200b\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1795\u17d2\u178a\u17c1\u1780",
-"V Align": "\u1780\u17b6\u179a\u200b\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1794\u1789\u17d2\u1788\u179a",
-"Top": "\u179b\u17be",
-"Middle": "\u1780\u178e\u17d2\u178a\u17b6\u179b",
-"Bottom": "\u1780\u17d2\u179a\u17c4\u1798",
-"Header cell": "\u1780\u17d2\u179a\u17a1\u17b6\u200b\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
-"Row group": "\u1780\u17d2\u179a\u17bb\u1798\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Column group": "\u1780\u17d2\u179a\u17bb\u1798\u200b\u1787\u17bd\u179a\u200b\u1788\u179a",
-"Row type": "\u1794\u17d2\u179a\u1797\u17c1\u1791\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Header": "\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
-"Body": "\u178f\u17bd\u200b\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8",
-"Footer": "\u1794\u178b\u1798\u200b\u1780\u1790\u17b6",
-"Border color": "\u1796\u178e\u17cc\u200b\u179f\u17ca\u17bb\u1798",
-"Insert template": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1796\u17bb\u1798\u17d2\u1796\u200b\u1782\u1798\u17d2\u179a\u17bc",
-"Templates": "\u1796\u17bb\u1798\u17d2\u1796\u200b\u1782\u17c6\u179a\u17bc",
-"Template": "\u1796\u17bb\u1798\u17d2\u1796\u1782\u17c6\u179a\u17bc",
-"Text color": "\u1796\u178e\u17cc\u200b\u17a2\u1780\u17d2\u179f\u179a",
-"Background color": "\u1796\u178e\u17cc\u200b\u1795\u17d2\u1791\u17c3\u200b\u1780\u17d2\u179a\u17c4\u1799",
-"Custom...": "\u1795\u17d2\u1791\u17b6\u179b\u17cb\u200b\u1781\u17d2\u179b\u17bd\u1793...",
-"Custom color": "\u1796\u178e\u17cc\u200b\u1795\u17d2\u1791\u17b6\u179b\u17cb\u200b\u1781\u17d2\u179b\u17bd\u1793",
-"No color": "\u1782\u17d2\u1798\u17b6\u1793\u200b\u1796\u178e\u17cc",
-"Table of Contents": "\u178f\u17b6\u179a\u17b6\u1784\u200b\u1793\u17c3\u200b\u1798\u17b6\u178f\u17b7\u1780\u17b6",
-"Show blocks": "\u1794\u1784\u17d2\u17a0\u17b6\u1789\u200b\u1794\u17d2\u179b\u17bb\u1780",
-"Show invisible characters": "\u1794\u1784\u17d2\u17a0\u17b6\u1789\u200b\u178f\u17bd\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1780\u17c6\u1794\u17b6\u17c6\u1784",
-"Words: {0}": "\u1796\u17b6\u1780\u17d2\u1799: {0}",
-"File": "\u17af\u1780\u179f\u17b6\u179a",
-"Edit": "\u1780\u17c2\u1794\u17d2\u179a\u17c2",
-"Insert": "\u1794\u1789\u17d2\u1785\u17bc\u179b",
-"View": "\u1791\u17b7\u178a\u17d2\u178b\u1797\u17b6\u1796",
-"Format": "\u1791\u17d2\u179a\u1784\u17cb\u1791\u17d2\u179a\u17b6\u1799",
-"Table": "\u178f\u17b6\u179a\u17b6\u1784",
-"Tools": "\u17a7\u1794\u1780\u179a\u178e\u17cd",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u1791\u17b8\u178f\u17b6\u17c6\u1784\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u179f\u17c6\u1794\u17bc\u179a\u1794\u17c2\u1794\u17d4 \u1785\u17bb\u1785 ALT-F9 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u1798\u17c9\u17ba\u1793\u17bb\u1799\u17d4 \u1785\u17bb\u1785 ALT-F10 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u179a\u1794\u17b6\u179a\u200b\u17a7\u1794\u1780\u179a\u178e\u17cd\u17d4 \u1785\u17bb\u1785 ALT-0 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u1787\u17c6\u1793\u17bd\u1799\u17d4"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ko_KR.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ko_KR.js
deleted file mode 100644
index ce0e42c7cf..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ko_KR.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('ko_KR',{
-"Redo": "\ub2e4\uc2dc\uc2e4\ud589",
-"Undo": "\uc2e4\ud589\ucde8\uc18c",
-"Cut": "\uc798\ub77c\ub0b4\uae30",
-"Copy": "\ubcf5\uc0ac\ud558\uae30",
-"Paste": "\ubd99\uc5ec\ub123\uae30",
-"Select all": "\uc804\uccb4\uc120\ud0dd",
-"New document": "\uc0c8 \ubb38\uc11c",
-"Ok": "\ud655\uc778",
-"Cancel": "\ucde8\uc18c",
-"Visual aids": "\uc2dc\uac01\uad50\uc7ac",
-"Bold": "\uad75\uac8c",
-"Italic": "\uae30\uc6b8\uc784\uaf34",
-"Underline": "\ubc11\uc904",
-"Strikethrough": "\ucde8\uc18c\uc120",
-"Superscript": "\uc717\ucca8\uc790",
-"Subscript": "\uc544\ub798\ucca8\uc790",
-"Clear formatting": "\ud3ec\ub9f7\ucd08\uae30\ud654",
-"Align left": "\uc67c\ucabd\uc815\ub82c",
-"Align center": "\uac00\uc6b4\ub370\uc815\ub82c",
-"Align right": "\uc624\ub978\ucabd\uc815\ub82c",
-"Justify": "\uc591\ucabd\uc815\ub82c",
-"Bullet list": "\uc810\ub9ac\uc2a4\ud2b8",
-"Numbered list": "\uc22b\uc790\ub9ac\uc2a4\ud2b8",
-"Decrease indent": "\ub0b4\uc5b4\uc4f0\uae30",
-"Increase indent": "\ub4e4\uc5ec\uc4f0\uae30",
-"Close": "\ub2eb\uae30",
-"Formats": "\ud3ec\ub9f7",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\ube0c\ub77c\uc6b0\uc838\uac00 \ud074\ub9bd\ubcf4\ub4dc \uc811\uadfc\uc744 \ud5c8\uc6a9\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. Ctrl+X\/C\/V \ud0a4\ub97c \uc774\uc6a9\ud574 \uc8fc\uc138\uc694.",
-"Headers": "\uc2a4\ud0c0\uc77c",
-"Header 1": "\uc81c\ubaa9 1",
-"Header 2": "\uc81c\ubaa9 2",
-"Header 3": "\uc81c\ubaa9 3",
-"Header 4": "\uc81c\ubaa9 4",
-"Header 5": "\uc81c\ubaa9 5",
-"Header 6": "\uc81c\ubaa9 6",
-"Headings": "\uc81c\ubaa9",
-"Heading 1": "\uc81c\ubaa9 1",
-"Heading 2": "\uc81c\ubaa9 2",
-"Heading 3": "\uc81c\ubaa9 3",
-"Heading 4": "\uc81c\ubaa9 4",
-"Heading 5": "\uc81c\ubaa9 5",
-"Heading 6": "\uc81c\ubaa9 6",
-"Preformatted": "Preformatted",
-"Div": "\uad6c\ubd84",
-"Pre": "Pre",
-"Code": "\ucf54\ub4dc",
-"Paragraph": "\ub2e8\ub77d",
-"Blockquote": "\uad6c\ud68d",
-"Inline": "\ub77c\uc778 \uc124\uc815",
-"Blocks": "\ube14\ub85d \uc124\uc815",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\uc2a4\ud0c0\uc77c\ubcf5\uc0ac \ub044\uae30. \uc774 \uc635\uc158\uc744 \ub044\uae30 \uc804\uc5d0\ub294 \ubcf5\uc0ac \uc2dc, \uc2a4\ud0c0\uc77c\uc774 \ubcf5\uc0ac\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.",
-"Font Family": "\uae00\uaf34",
-"Font Sizes": "\ud3f0\ud2b8 \uc0ac\uc774\uc988",
-"Class": "\ud074\ub798\uc2a4",
-"Browse for an image": "\uc774\ubbf8\uc9c0 \ucc3e\uae30",
-"OR": "\ud639\uc740",
-"Drop an image here": "\uc774\ubbf8\uc9c0 \ub4dc\ub86d",
-"Upload": "\uc5c5\ub85c\ub4dc",
-"Block": "\ube14\ub85d",
-"Align": "\uc815\ub82c",
-"Default": "\uae30\ubcf8",
-"Circle": "\uc6d0",
-"Disc": "\uc6d0\ubc18",
-"Square": "\uc0ac\uac01",
-"Lower Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
-"Lower Greek": "\uadf8\ub9ac\uc2a4\uc5b4 \uc18c\ubb38\uc790",
-"Lower Roman": "\ub85c\ub9c8\uc790 \uc18c\ubb38\uc790",
-"Upper Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
-"Upper Roman": "\ub85c\ub9c8\uc790 \ub300\ubb38\uc790",
-"Anchor": "\uc575\ucee4",
-"Name": "\uc774\ub984",
-"Id": "\uc544\uc774\ub514",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\uc544\uc774\ub514\ub294 \ubb38\uc790, \uc22b\uc790, \ub300\uc2dc, \uc810, \ucf5c\ub860 \ub610\ub294 \ubc11\uc904\ub85c \uc2dc\uc791\ud574\uc57c\ud569\ub2c8\ub2e4.",
-"You have unsaved changes are you sure you want to navigate away?": "\uc800\uc7a5\ud558\uc9c0 \uc54a\uc740 \uc815\ubcf4\uac00 \uc788\uc2b5\ub2c8\ub2e4. \uc774 \ud398\uc774\uc9c0\ub97c \ubc97\uc5b4\ub098\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
-"Restore last draft": "\ub9c8\uc9c0\ub9c9 \ucd08\uc548 \ubcf5\uc6d0",
-"Special character": "\ud2b9\uc218\ubb38\uc790",
-"Source code": "\uc18c\uc2a4\ucf54\ub4dc",
-"Insert\/Edit code sample": "\ucf54\ub4dc\uc0d8\ud50c \uc0bd\uc785\/\ud3b8\uc9d1",
-"Language": "\uc5b8\uc5b4",
-"Code sample": "\ucf54\ub4dc\uc0d8\ud50c",
-"Color": "\uc0c9\uc0c1",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\uc67c\ucabd\uc5d0\uc11c \uc624\ub978\ucabd",
-"Right to left": "\uc624\ub978\ucabd\uc5d0\uc11c \uc67c\ucabd",
-"Emoticons": "\uc774\ubaa8\ud2f0\ucf58",
-"Document properties": "\ubb38\uc11c \uc18d\uc131",
-"Title": "\uc81c\ubaa9",
-"Keywords": "\ud0a4\uc6cc\ub4dc",
-"Description": "\uc124\uba85",
-"Robots": "\ub85c\ubd07",
-"Author": "\uc800\uc790",
-"Encoding": "\uc778\ucf54\ub529",
-"Fullscreen": "\uc804\uccb4\ud654\uba74",
-"Action": "\ub3d9\uc791",
-"Shortcut": "\ub2e8\ucd95\ud0a4",
-"Help": "\ub3c4\uc6c0\ub9d0",
-"Address": "\uc8fc\uc18c",
-"Focus to menubar": "\uba54\ub274\uc5d0 \ud3ec\ucee4\uc2a4",
-"Focus to toolbar": "\ud234\ubc14\uc5d0 \ud3ec\ucee4\uc2a4",
-"Focus to element path": "element path\uc5d0 \ud3ec\ucee4\uc2a4",
-"Focus to contextual toolbar": "\ucf04\ud14d\uc2a4\ud2b8 \ud234\ubc14\uc5d0 \ud3ec\ucee4\uc2a4",
-"Insert link (if link plugin activated)": "\ub9c1\ud06c \uc0bd\uc785 (link \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
-"Save (if save plugin activated)": "\uc800\uc7a5 (save \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
-"Find (if searchreplace plugin activated)": "\ucc3e\uae30(searchreplace \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
-"Plugins installed ({0}):": "\uc124\uce58\ub41c \ud50c\ub7ec\uadf8\uc778 ({0}):",
-"Premium plugins:": "\uace0\uae09 \ud50c\ub7ec\uadf8\uc778",
-"Learn more...": "\uc880 \ub354 \uc0b4\ud3b4\ubcf4\uae30",
-"You are using {0}": "{0}\ub97c \uc0ac\uc6a9\uc911",
-"Plugins": "\ud50c\ub7ec\uadf8\uc778",
-"Handy Shortcuts": "\ub2e8\ucd95\ud0a4",
-"Horizontal line": "\uac00\ub85c",
-"Insert\/edit image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785\/\uc218\uc815",
-"Image description": "\uc774\ubbf8\uc9c0 \uc124\uba85",
-"Source": "\uc18c\uc2a4",
-"Dimensions": "\ud06c\uae30",
-"Constrain proportions": "\uc791\uc5c5 \uc81c\ud55c",
-"General": "\uc77c\ubc18",
-"Advanced": "\uace0\uae09",
-"Style": "\uc2a4\ud0c0\uc77c",
-"Vertical space": "\uc218\uc9c1 \uacf5\ubc31",
-"Horizontal space": "\uc218\ud3c9 \uacf5\ubc31",
-"Border": "\ud14c\ub450\ub9ac",
-"Insert image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785",
-"Image": "\uc774\ubbf8\uc9c0",
-"Image list": "\uc774\ubbf8\uc9c0 \ubaa9\ub85d",
-"Rotate counterclockwise": "\uc2dc\uacc4\ubc18\ub300\ubc29\ud5a5\uc73c\ub85c \ud68c\uc804",
-"Rotate clockwise": "\uc2dc\uacc4\ubc29\ud5a5\uc73c\ub85c \ud68c\uc804",
-"Flip vertically": "\uc218\uc9c1 \ub4a4\uc9d1\uae30",
-"Flip horizontally": "\uc218\ud3c9 \ub4a4\uc9d1\uae30",
-"Edit image": "\uc774\ubbf8\uc9c0 \ud3b8\uc9d1",
-"Image options": "\uc774\ubbf8\uc9c0 \uc635\uc158",
-"Zoom in": "\ud655\ub300",
-"Zoom out": "\ucd95\uc18c",
-"Crop": "\uc790\ub974\uae30",
-"Resize": "\ud06c\uae30 \uc870\uc808",
-"Orientation": "\ubc29\ud5a5",
-"Brightness": "\ubc1d\uae30",
-"Sharpen": "\uc120\uba85\ud558\uac8c",
-"Contrast": "\ub300\ube44",
-"Color levels": "\uc0c9\uc0c1\ub808\ubca8",
-"Gamma": "\uac10\ub9c8",
-"Invert": "\ubc18\uc804",
-"Apply": "\uc801\uc6a9",
-"Back": "\ub4a4\ub85c",
-"Insert date\/time": "\ub0a0\uc9dc\/\uc2dc\uac04\uc0bd\uc785",
-"Date\/time": "\ub0a0\uc9dc\/\uc2dc\uac04",
-"Insert link": "\ub9c1\ud06c \uc0bd\uc785 ",
-"Insert\/edit link": "\ub9c1\ud06c \uc0bd\uc785\/\uc218\uc815",
-"Text to display": "\ubcf8\ubb38",
-"Url": "\uc8fc\uc18c",
-"Target": "\ub300\uc0c1",
-"None": "\uc5c6\uc74c",
-"New window": "\uc0c8\ucc3d",
-"Remove link": "\ub9c1\ud06c\uc0ad\uc81c",
-"Anchors": "\ucc45\uac08\ud53c",
-"Link": "\ub9c1\ud06c",
-"Paste or type a link": "\ub9c1\ud06c\ub97c \ubd99\uc5ec\ub123\uac70\ub098 \uc785\ub825\ud558\uc138\uc694",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\ud604\uc7ac E-mail\uc8fc\uc18c\ub97c \uc785\ub825\ud558\uc168\uc2b5\ub2c8\ub2e4. E-mail \uc8fc\uc18c\uc5d0 \ub9c1\ud06c\ub97c \uac78\uae4c\uc694?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\ud604\uc7ac \uc6f9\uc0ac\uc774\ud2b8 \uc8fc\uc18c\ub97c \uc785\ub825\ud558\uc168\uc2b5\ub2c8\ub2e4. \ud574\ub2f9 \uc8fc\uc18c\uc5d0 \ub9c1\ud06c\ub97c \uac78\uae4c\uc694?",
-"Link list": "\ub9c1\ud06c \ub9ac\uc2a4\ud2b8",
-"Insert video": "\ube44\ub514\uc624 \uc0bd\uc785",
-"Insert\/edit video": "\ube44\ub514\uc624 \uc0bd\uc785\/\uc218\uc815",
-"Insert\/edit media": "\ubbf8\ub514\uc5b4 \uc0bd\uc785\/\uc218\uc815",
-"Alternative source": "\ub300\uccb4 \uc18c\uc2a4",
-"Poster": "\ud3ec\uc2a4\ud130",
-"Paste your embed code below:": "\uc544\ub798\uc5d0 \ucf54\ub4dc\ub97c \ubd99\uc5ec\ub123\uc73c\uc138\uc694:",
-"Embed": "\uc0bd\uc785",
-"Media": "\ubbf8\ub514\uc5b4",
-"Nonbreaking space": "\ub744\uc5b4\uc4f0\uae30",
-"Page break": "\ud398\uc774\uc9c0 \uad6c\ubd84\uc790",
-"Paste as text": "\ud14d\uc2a4\ud2b8\ub85c \ubd99\uc5ec\ub123\uae30",
-"Preview": "\ubbf8\ub9ac\ubcf4\uae30",
-"Print": "\ucd9c\ub825",
-"Save": "\uc800\uc7a5",
-"Find": "\ucc3e\uae30",
-"Replace with": "\uad50\uccb4",
-"Replace": "\uad50\uccb4",
-"Replace all": "\uc804\uccb4 \uad50\uccb4",
-"Prev": "\uc774\uc804",
-"Next": "\ub2e4\uc74c",
-"Find and replace": "\ucc3e\uc544\uc11c \uad50\uccb4",
-"Could not find the specified string.": "\ubb38\uc790\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
-"Match case": "\ub300\uc18c\ubb38\uc790 \uc77c\uce58",
-"Whole words": "\uc804\uccb4 \ub2e8\uc5b4",
-"Spellcheck": "\ubb38\ubc95\uccb4\ud06c",
-"Ignore": "\ubb34\uc2dc",
-"Ignore all": "\uc804\uccb4\ubb34\uc2dc",
-"Finish": "\uc644\ub8cc",
-"Add to Dictionary": "\uc0ac\uc804\uc5d0 \ucd94\uac00",
-"Insert table": "\ud14c\uc774\ube14 \uc0bd\uc785",
-"Table properties": "\ud14c\uc774\ube14 \uc18d\uc131",
-"Delete table": "\ud14c\uc774\ube14 \uc0ad\uc81c",
-"Cell": "\uc140",
-"Row": "\uc5f4",
-"Column": "\ud589",
-"Cell properties": "\uc140 \uc18d",
-"Merge cells": "\uc140 \ud569\uce58\uae30",
-"Split cell": "\uc140 \ub098\ub204\uae30",
-"Insert row before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
-"Insert row after": "\ub2e4\uc74c\uc5d0 \ud589 \uc0bd\uc785",
-"Delete row": "\ud589 \uc9c0\uc6b0\uae30",
-"Row properties": "\ud589 \uc18d\uc131",
-"Cut row": "\ud589 \uc798\ub77c\ub0b4\uae30",
-"Copy row": "\ud589 \ubcf5\uc0ac",
-"Paste row before": "\uc774\uc804\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
-"Paste row after": "\ub2e4\uc74c\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
-"Insert column before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
-"Insert column after": "\ub2e4\uc74c\uc5d0 \uc5f4 \uc0bd\uc785",
-"Delete column": "\uc5f4 \uc9c0\uc6b0\uae30",
-"Cols": "\uc5f4",
-"Rows": "\ud589",
-"Width": "\ub113\uc774",
-"Height": "\ub192\uc774",
-"Cell spacing": "\uc140 \uac04\uaca9",
-"Cell padding": "\uc140 \uc548\ucabd \uc5ec\ubc31",
-"Caption": "\ucea1\uc158",
-"Left": "\uc67c\ucabd",
-"Center": "\uac00\uc6b4\ub370",
-"Right": "\uc624\ub978\ucabd",
-"Cell type": "\uc140 \ud0c0\uc785",
-"Scope": "\ubc94\uc704",
-"Alignment": "\uc815\ub82c",
-"H Align": "\uac00\ub85c \uc815\ub82c",
-"V Align": "\uc138\ub85c \uc815\ub82c",
-"Top": "\uc0c1\ub2e8",
-"Middle": "\uc911\uac04",
-"Bottom": "\ud558\ub2e8",
-"Header cell": "\ud5e4\ub354 \uc140",
-"Row group": "\ud589 \uadf8\ub8f9",
-"Column group": "\uc5f4 \uadf8\ub8f9",
-"Row type": "\ud589 \ud0c0\uc785",
-"Header": "\ud5e4\ub354",
-"Body": "\ubc14\ub514",
-"Footer": "\ud478\ud130",
-"Border color": "\ud14c\ub450\ub9ac \uc0c9",
-"Insert template": "\ud15c\ud50c\ub9bf \uc0bd\uc785",
-"Templates": "\ud15c\ud50c\ub9bf",
-"Template": "\ud15c\ud50c\ub9bf",
-"Text color": "\ubb38\uc790 \uc0c9\uae54",
-"Background color": "\ubc30\uacbd\uc0c9",
-"Custom...": "\uc9c1\uc811 \uc0c9\uae54 \uc9c0\uc815\ud558\uae30",
-"Custom color": "\uc9c1\uc811 \uc9c0\uc815\ud55c \uc0c9\uae54",
-"No color": "\uc0c9\uc0c1 \uc5c6\uc74c",
-"Table of Contents": "\ubaa9\ucc28",
-"Show blocks": "\ube14\ub7ed \ubcf4\uc5ec\uc8fc\uae30",
-"Show invisible characters": "\uc548\ubcf4\uc774\ub294 \ubb38\uc790 \ubcf4\uc774\uae30",
-"Words: {0}": "\ub2e8\uc5b4: {0}",
-"{0} words": "{0} \ub2e8\uc5b4",
-"File": "\ud30c\uc77c",
-"Edit": "\uc218\uc815",
-"Insert": "\uc0bd\uc785",
-"View": "\ubcf4\uae30",
-"Format": "\ud3ec\ub9f7",
-"Table": "\ud14c\uc774\ube14",
-"Tools": "\ub3c4\uad6c",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\uc11c\uc2dd \uc788\ub294 \ud14d\uc2a4\ud2b8 \ud3b8\uc9d1\uae30 \uc785\ub2c8\ub2e4. ALT-F9\ub97c \ub204\ub974\uba74 \uba54\ub274, ALT-F10\ub97c \ub204\ub974\uba74 \ud234\ubc14, ALT-0\uc744 \ub204\ub974\uba74 \ub3c4\uc6c0\ub9d0\uc744 \ubcfc \uc218 \uc788\uc2b5\ub2c8\ub2e4."
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/lt.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/lt.js
deleted file mode 100644
index 2a279686be..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/lt.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('lt',{
-"Redo": "Gr\u0105\u017einti",
-"Undo": "Atstatyti",
-"Cut": "I\u0161kirpti",
-"Copy": "Kopijuoti",
-"Paste": "\u012ed\u0117ti",
-"Select all": "Pa\u017eym\u0117ti visk\u0105",
-"New document": "Naujas dokumentas",
-"Ok": "Gerai",
-"Cancel": "Atsisakyti",
-"Visual aids": "Vaizdin\u0117s priemon\u0117s",
-"Bold": "Pary\u0161kintas",
-"Italic": "Kursyvinis",
-"Underline": "Pabrauktas",
-"Strikethrough": "Perbrauktas",
-"Superscript": "Vir\u0161utinis indeksas",
-"Subscript": "Apatinis indeksas",
-"Clear formatting": "Naikinti formatavim\u0105",
-"Align left": "Lygiuoti kair\u0117je",
-"Align center": "Centruoti",
-"Align right": "Lygiuoti de\u0161in\u0117je",
-"Justify": "I\u0161d\u0117styti per vis\u0105 plot\u012f",
-"Bullet list": "\u017denklinimo s\u0105ra\u0161as",
-"Numbered list": "Skaitmeninis s\u0105ra\u0161as",
-"Decrease indent": "Ma\u017einti \u012ftrauk\u0105",
-"Increase indent": "Didinti \u012ftrauk\u0105",
-"Close": "U\u017edaryti",
-"Formats": "Formatai",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Nar\u0161ykl\u0117s nustatymai neleid\u017eia redaktoriui tiesiogiai pasiekti laikinosios atminties. Pra\u0161ome naudoti klaviat\u016bros klavi\u0161us Ctrl+X\/C\/V.",
-"Headers": "Antra\u0161t\u0117s",
-"Header 1": "Antra\u0161t\u0117 1",
-"Header 2": "Antra\u0161t\u0117 2",
-"Header 3": "Antra\u0161t\u0117 3",
-"Header 4": "Antra\u0161t\u0117 4",
-"Header 5": "Antra\u0161t\u0117 5",
-"Header 6": "Antra\u0161t\u0117 6",
-"Headings": "Antra\u0161t\u0117s",
-"Heading 1": "Antra\u0161t\u0117 1",
-"Heading 2": "Antra\u0161t\u0117 2",
-"Heading 3": "Antra\u0161t\u0117 3",
-"Heading 4": "Antra\u0161t\u0117 4",
-"Heading 5": "Antra\u0161t\u0117 5",
-"Heading 6": "Antra\u0161t\u0117 6",
-"Preformatted": "Suformuotas i\u0161 anksto",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kodas",
-"Paragraph": "Paragrafas",
-"Blockquote": "Citata",
-"Inline": "Inline",
-"Blocks": "Blokai",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Dabar \u012fterpiama paprastojo teksto re\u017eimu. Kol \u0161i parinktis \u012fjungta, turinys bus \u012fterptas kaip paprastas tekstas.",
-"Font Family": "\u0160riftas",
-"Font Sizes": "\u0160rifto dyd\u017eiai",
-"Class": "Klas\u0117",
-"Browse for an image": "Ie\u0161koti paveiksl\u0117lio",
-"OR": "ARBA",
-"Drop an image here": "Tempkite paveiksl\u0117l\u012f \u010dia",
-"Upload": "\u012ekelti",
-"Block": "Blokas",
-"Align": "Lygiavimas",
-"Default": "Pagrindinis",
-"Circle": "Apskritimas",
-"Disc": "Diskas",
-"Square": "Kvadratas",
-"Lower Alpha": "Ma\u017eosios raid\u0117s",
-"Lower Greek": "Ma\u017eosios graik\u0173",
-"Lower Roman": "Ma\u017eosios rom\u0117n\u0173",
-"Upper Alpha": "Did\u017eiosios raid\u0117s",
-"Upper Roman": "Did\u017eiosios rom\u0117n\u0173",
-"Anchor": "\u017dym\u0117",
-"Name": "Pavadinimas",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID turi prasid\u0117ti raide, po kurios gali b\u016bti raid\u0117s, skai\u010diai, br\u016bk\u0161niai, ta\u0161kai, kabliata\u0161kiai ar apatiniai pabraukimai.",
-"You have unsaved changes are you sure you want to navigate away?": "Turite nei\u0161saugot\u0173 pakeitim\u0173! Ar tikrai norite i\u0161eiti?",
-"Restore last draft": "Atstatyti paskutin\u012f projekt\u0105",
-"Special character": "Specialus simbolis",
-"Source code": "Pirminis \u0161altinis",
-"Insert\/Edit code sample": "Prid\u0117ti \/ keisti kodo pavyzd\u012f",
-"Language": "Kalba",
-"Code sample": "Kodo pavyzdys",
-"Color": "Spalva",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "I\u0161 kair\u0117s \u012f de\u0161in\u0119",
-"Right to left": "I\u0161 de\u0161in\u0117s \u012f kair\u0119",
-"Emoticons": "Jaustukai",
-"Document properties": "Dokumento savyb\u0117s",
-"Title": "Pavadinimas",
-"Keywords": "\u017dymos",
-"Description": "Apra\u0161as",
-"Robots": "Robotai",
-"Author": "Autorius",
-"Encoding": "Kodavimas",
-"Fullscreen": "Visas ekranas",
-"Action": "Veiksmas",
-"Shortcut": "Nuoroda",
-"Help": "Pagalba",
-"Address": "Adresas",
-"Focus to menubar": "Fokusuoti \u012f meniu",
-"Focus to toolbar": "Fokusuoti \u012f \u012franki\u0173 juost\u0105",
-"Focus to element path": "Fokusuoti \u012f elemento keli\u0105",
-"Focus to contextual toolbar": "Fokusuoti \u012f kontekstin\u012f \u012franki\u0173 juost\u0105",
-"Insert link (if link plugin activated)": "Prid\u0117ti nuorod\u0105 (jei link priedas aktyvuotas)",
-"Save (if save plugin activated)": "I\u0161saugoti (jei save priedas aktyvuotas)",
-"Find (if searchreplace plugin activated)": "Ie\u0161koti (jei searchreplace priedas aktyvuotas)",
-"Plugins installed ({0}):": "\u012ediegti priedai ({0}):",
-"Premium plugins:": "Mokami priedai:",
-"Learn more...": "Su\u017einoti daugiau...",
-"You are using {0}": "Naudojate {0}",
-"Plugins": "Priedai",
-"Handy Shortcuts": "Patogios nuorodos",
-"Horizontal line": "Horizontali linija",
-"Insert\/edit image": "\u012eterpti|Tvarkyti paveiksl\u0117l\u012f",
-"Image description": "Paveiksl\u0117lio apra\u0161as",
-"Source": "Pirmin\u0117 nuoroda",
-"Dimensions": "Matmenys",
-"Constrain proportions": "Laikytis proporcij\u0173",
-"General": "Bendra",
-"Advanced": "I\u0161pl\u0117stas",
-"Style": "Stilius",
-"Vertical space": "Vertikalus tarpas",
-"Horizontal space": "Horizontalus tarpas",
-"Border": "R\u0117melis",
-"Insert image": "\u012eterpti paveiksl\u0117l\u012f",
-"Image": "Paveiksl\u0117lis",
-"Image list": "Paveiksl\u0117li\u0173 s\u0105ra\u0161as",
-"Rotate counterclockwise": "Pasukti prie\u0161 laikrod\u017eio rodykl\u0119",
-"Rotate clockwise": "Pasukti pagal laikrod\u017eio rodykl\u0119",
-"Flip vertically": "Apversti vertikaliai",
-"Flip horizontally": "Apversti horizontaliai",
-"Edit image": "Redaguoti paveiksl\u0117l\u012f",
-"Image options": "Paveiksl\u0117lio nustatymai",
-"Zoom in": "Priartinti",
-"Zoom out": "Atitolinti",
-"Crop": "Atkarpyti",
-"Resize": "Keisti dyd\u012f",
-"Orientation": "Pasukimas",
-"Brightness": "\u0160viesumas",
-"Sharpen": "Ry\u0161kumas",
-"Contrast": "Kontrastas",
-"Color levels": "Spalv\u0173 lygiai",
-"Gamma": "Gama",
-"Invert": "Prie\u0161ingos spalvos",
-"Apply": "Taikyti",
-"Back": "Atgal",
-"Insert date\/time": "\u012eterpti dat\u0105\/laik\u0105",
-"Date\/time": "Data \/ laikas",
-"Insert link": "\u012eterpti nuorod\u0105",
-"Insert\/edit link": "\u012eterpti\/taisyti nuorod\u0105",
-"Text to display": "Rodomas tekstas",
-"Url": "Nuoroda",
-"Target": "Tikslin\u0117 nuoroda",
-"None": "Nieko",
-"New window": "Naujas langas",
-"Remove link": "\u0160alinti nuorod\u0105",
-"Anchors": "\u017dym\u0117",
-"Link": "Nuoroda",
-"Paste or type a link": "\u012eklijuokite arba \u012fra\u0161ykite nuorod\u0105",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Atrodo, kad \u012fvesta nuoroda yra elektroninio pa\u0161to adresas. Ar norite prie\u0161 j\u012f \u012fvesti reikalaujam\u0105 \u201emailto:\u201c?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Atrodo, kad \u012fved\u0117te nuotolin\u0119 nuorod\u0105. Ar norite prie\u0161 j\u0105 \u012fvesti reikalaujam\u0105 \u201ehttp:\/\/\u201c?",
-"Link list": "Nuorod\u0173 s\u0105ra\u0161as",
-"Insert video": "\u012eterpti video",
-"Insert\/edit video": "\u012eterpti\/tvarkyti video",
-"Insert\/edit media": "Prid\u0117ti \/ keisti medij\u0105",
-"Alternative source": "Alternatyvus \u0161altinis",
-"Poster": "Plakatas",
-"Paste your embed code below:": "\u012eterpkite kod\u0105 \u017eemiau:",
-"Embed": "\u012eterpti",
-"Media": "Medija",
-"Nonbreaking space": "Nepertraukiamos vietos",
-"Page break": "Puslapio skirtukas",
-"Paste as text": "\u012eklijuoti kaip tekst\u0105",
-"Preview": "Per\u017ei\u016bra",
-"Print": "Spausdinti",
-"Save": "I\u0161saugoti",
-"Find": "Ie\u0161koti",
-"Replace with": "Kuo pakeisti",
-"Replace": "Pakeisti",
-"Replace all": "Pakeisti visk\u0105",
-"Prev": "Ankstesnis",
-"Next": "Sekantis",
-"Find and replace": "Surasti ir pakeisti",
-"Could not find the specified string.": "Nepavyko rasti nurodytos eilut\u0117s.",
-"Match case": "Atitinkamus",
-"Whole words": "Visus \u017eod\u017eius",
-"Spellcheck": "Ra\u0161ybos tikrinimas",
-"Ignore": "Ignoruoti",
-"Ignore all": "Ignoruoti visk\u0105",
-"Finish": "Baigti",
-"Add to Dictionary": "Prid\u0117ti \u012f \u017dodyn\u0105",
-"Insert table": "\u012eterpti lentel\u0119",
-"Table properties": "Lentel\u0117s savyb\u0117s",
-"Delete table": "\u0160alinti lentel\u0119",
-"Cell": "Langeliai",
-"Row": "Eilut\u0117s",
-"Column": "Stulpelis",
-"Cell properties": "Langelio savyb\u0117s",
-"Merge cells": "Sujungti langelius",
-"Split cell": "Skaidyti langelius",
-"Insert row before": "\u012eterpti eilut\u0119 prie\u0161",
-"Insert row after": "\u012eterpti eilut\u0119 po",
-"Delete row": "Naikinti eilut\u0119",
-"Row properties": "Eilut\u0117s savyb\u0117s",
-"Cut row": "I\u0161kirpti eilut\u0119",
-"Copy row": "Kopijuoti eilut\u0119",
-"Paste row before": "\u012ed\u0117ti eilut\u0119 prie\u0161",
-"Paste row after": "\u012ed\u0117ti eilut\u0119 po",
-"Insert column before": "\u012eterpti stulpel\u012f prie\u0161",
-"Insert column after": "\u012eterpti stulpel\u012f po",
-"Delete column": "Naikinti stulpel\u012f",
-"Cols": "Stulpeliai",
-"Rows": "Eilut\u0117s",
-"Width": "Plotis",
-"Height": "Auk\u0161tis",
-"Cell spacing": "Tarpas tarp langeli\u0173",
-"Cell padding": "Tarpas nuo langelio iki teksto",
-"Caption": "Antra\u0161t\u0117",
-"Left": "Kair\u0117",
-"Center": "Centras",
-"Right": "De\u0161in\u0117",
-"Cell type": "Langelio tipas",
-"Scope": "Strukt\u016bra",
-"Alignment": "Lygiavimas",
-"H Align": "H Lygiavimas",
-"V Align": "V Lygiavimas",
-"Top": "Vir\u0161uje",
-"Middle": "Viduryje",
-"Bottom": "Apa\u010dioje",
-"Header cell": "Antra\u0161t\u0117s langelis",
-"Row group": "Eilu\u010di\u0173 grup\u0117",
-"Column group": "Stulpeli\u0173 grup\u0117",
-"Row type": "Eilu\u010di\u0173 tipas",
-"Header": "Antra\u0161t\u0117",
-"Body": "Turinys",
-"Footer": "Apa\u010dia",
-"Border color": "R\u0117melio spalva",
-"Insert template": "\u012eterpti \u0161ablon\u0105",
-"Templates": "\u0160ablonai",
-"Template": "\u0160ablonas",
-"Text color": "Teksto spalva",
-"Background color": "Fono spalva",
-"Custom...": "Pasirinktinas...",
-"Custom color": "Pasirinktina spalva",
-"No color": "Jokios spalvos",
-"Table of Contents": "Turinys",
-"Show blocks": "Rodyti blokus",
-"Show invisible characters": "Rodyti nematomus simbolius",
-"Words: {0}": "\u017dod\u017eiai: {0}",
-"{0} words": "{0} \u017eod\u017eiai",
-"File": "Failas",
-"Edit": "Redaguoti",
-"Insert": "\u012eterpti",
-"View": "Per\u017ei\u016bra",
-"Format": "Formatas",
-"Table": "Lentel\u0117",
-"Tools": "\u012erankiai",
-"Powered by {0}": "Sukurta {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Suformatuoto teksto laukas. D\u0117l meniu spauskite ALT-F9. U\u017eduo\u010di\u0173 juostos \u012fjungimui spauskite ALT-F10. Pagalbai - spauskite ALT-0."
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/lv.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/lv.js
deleted file mode 100644
index 9f88e6f5c3..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/lv.js
+++ /dev/null
@@ -1,260 +0,0 @@
-tinymce.addI18n('lv',{
-"Redo": "Solis uz priek\u0161u",
-"Undo": "Solis atpaka\u013c",
-"Cut": "Izgriezt",
-"Copy": "Kop\u0113t",
-"Paste": "Iel\u012bm\u0113t",
-"Select all": "Iez\u012bm\u0113t visu",
-"New document": "Jauns dokuments",
-"Ok": "Ok",
-"Cancel": "Atcelt",
-"Visual aids": "Vizu\u0101l\u0101 pal\u012bdz\u012bba",
-"Bold": "Treknraksts",
-"Italic": "Sl\u012bpraksts",
-"Underline": "Pasv\u012btrot",
-"Strikethrough": "Nosv\u012btrot",
-"Superscript": "Aug\u0161raksts",
-"Subscript": "Apak\u0161raksts",
-"Clear formatting": "No\u0146emt format\u0113jumu",
-"Align left": "Pa kreisi",
-"Align center": "Centr\u0113t",
-"Align right": "Pa labi",
-"Justify": "Gar ab\u0101m mal\u0101m",
-"Bullet list": "Nenumur\u0113ts saraksts",
-"Numbered list": "Numur\u0113ts saraksts",
-"Decrease indent": "Samazin\u0101t atk\u0101pi",
-"Increase indent": "Palielin\u0101t atk\u0101pi",
-"Close": "Aizv\u0113rt",
-"Formats": "Format\u0113jumi",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "J\u016bsu p\u0101rl\u016bkprogramma neatbalsta piek\u013cuvi starpliktuvei. L\u016bdzu, lietojiet Ctrl+X\/C\/V klaviat\u016bras sa\u012bsnes.",
-"Headers": "Virsraksti",
-"Header 1": "1. l\u012bme\u0146a virsraksts",
-"Header 2": "2. l\u012bme\u0146a virsraksts",
-"Header 3": "3. l\u012bme\u0146a virsraksts",
-"Header 4": "4. l\u012bme\u0146a virsraksts",
-"Header 5": "5. l\u012bme\u0146a virsraksts",
-"Header 6": "6. l\u012bme\u0146a virsraksts",
-"Headings": "Virsraksti",
-"Heading 1": "1. l\u012bme\u0146a virsraksts",
-"Heading 2": "2. l\u012bme\u0146a virsraksts",
-"Heading 3": "3. l\u012bme\u0146a virsraksts",
-"Heading 4": "4. l\u012bme\u0146a virsraksts",
-"Heading 5": "5. l\u012bme\u0146a virsraksts",
-"Heading 6": "6. l\u012bme\u0146a virsraksts",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kods",
-"Paragraph": "Rindkopa",
-"Blockquote": "Cit\u0101ts",
-"Inline": "Inline elementi",
-"Blocks": "Bloka elementi",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Iel\u012bm\u0113\u0161ana vienk\u0101r\u0161\u0101 teksta re\u017e\u012bm\u0101. Saturs tiks iel\u012bm\u0113ts bez format\u0113juma l\u012bdz \u0161\u012b opcija tiks atsl\u0113gta.",
-"Font Family": "Fontu saime",
-"Font Sizes": "Fontu izm\u0113ri",
-"Class": "Klase",
-"Browse for an image": "Izv\u0113l\u0113ties att\u0113lu",
-"OR": "VAI",
-"Drop an image here": "Ievelciet att\u0113lu \u0161eit",
-"Upload": "Aug\u0161upiel\u0101d\u0113t",
-"Block": "Bloks",
-"Align": "L\u012bdzin\u0101t",
-"Default": "Parastais",
-"Circle": "Aplis",
-"Disc": "Disks",
-"Square": "Kvadr\u0101ts",
-"Lower Alpha": "Lat\u012b\u0146u mazie burti",
-"Lower Greek": "Grie\u0137u mazie burti",
-"Lower Roman": "Romie\u0161u mazie burti",
-"Upper Alpha": "Lat\u012b\u0146u lielie burti",
-"Upper Roman": "Romie\u0161u lielie burti",
-"Anchor": "Iek\u0161\u0113j\u0101 saite",
-"Name": "Nosaukums",
-"Id": "Identifikators",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Identifikatoram j\u0101s\u0101kas ar burtu, p\u0113c tam var satur\u0113t: burtus, ciparus, domuz\u012bmes, punktus, kolus vai pasv\u012btrojumz\u012bmes. ",
-"You have unsaved changes are you sure you want to navigate away?": "Saturs ir labots un nav saglab\u0101ts. Vai tie\u0161\u0101m v\u0113laties atst\u0101t \u0161o lapu?",
-"Restore last draft": "Atjaunot p\u0113d\u0113jo melnrakstu",
-"Special character": "Speci\u0101l\u0101 rakstz\u012bme",
-"Source code": "Pirmkods",
-"Insert\/Edit code sample": "Ievad\u012bt\/Labot koda paraugu",
-"Language": "Valoda",
-"Code sample": "Koda paraugs",
-"Color": "Kr\u0101sa",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "No kreis\u0101s uz labo",
-"Right to left": "No lab\u0101s uz kreiso",
-"Emoticons": "Emocijas",
-"Document properties": "Dokumenta parametri",
-"Title": "Nosaukums",
-"Keywords": "Atsl\u0113gv\u0101rdi",
-"Description": "Apraksts",
-"Robots": "Programmas",
-"Author": "Autors",
-"Encoding": "Kod\u0113\u0161ana",
-"Fullscreen": "Pilnekr\u0101na re\u017e\u012bms",
-"Action": "Darb\u012bba",
-"Shortcut": "Sa\u012bsne",
-"Help": "Pal\u012bdz\u012bba",
-"Address": "Adrese",
-"Focus to menubar": "Fokuss uz izv\u0113lni",
-"Focus to toolbar": "Fokuss uz r\u012bkjoslu",
-"Focus to element path": "Fokuss uz elementa ce\u013cu",
-"Focus to contextual toolbar": "Fokuss uz papildizv\u0113lni",
-"Insert link (if link plugin activated)": "Ievietot saiti (Ja sai\u0161u spraudnis ir akt\u012bvs)",
-"Save (if save plugin activated)": "Saglab\u0101t (Ja saglab\u0101\u0161anas spraudnis ir akt\u012bvs)",
-"Find (if searchreplace plugin activated)": "Atrast (Ja \"searchreplace\" spraudnis ir akt\u012bvs)",
-"Plugins installed ({0}):": "Spraud\u0146i instal\u0113ti ({0}):",
-"Premium plugins:": "\u012apa\u0161ie spraud\u0146i:",
-"Learn more...": "Uzzin\u0101t vair\u0101k...",
-"You are using {0}": "J\u016bs lietojiet {0}",
-"Plugins": "Spraud\u0146i",
-"Handy Shortcuts": "Paroc\u012bgi \u012bsce\u013ci",
-"Horizontal line": "Horizont\u0101l\u0101 l\u012bnija",
-"Insert\/edit image": "Ievietot\/labot att\u0113lu",
-"Image description": "Apraksts",
-"Source": "Avots",
-"Dimensions": "Izm\u0113ri",
-"Constrain proportions": "Saglab\u0101t malu attiec\u012bbu",
-"General": "Pamata info",
-"Advanced": "Papildus",
-"Style": "Stils",
-"Vertical space": "Vertik\u0101l\u0101 atstarpe",
-"Horizontal space": "Horizont\u0101l\u0101 atstarpe",
-"Border": "Apmale",
-"Insert image": "Ievietot att\u0113lu",
-"Image": "Att\u0113ls",
-"Image list": "Att\u0113lu saraksts",
-"Rotate counterclockwise": "Pagriezt pret\u0113ji pulkste\u0146a r\u0101d\u012bt\u0101ja virzienam",
-"Rotate clockwise": "Pagriezt pulkste\u0146a r\u0101d\u012bt\u0101ja virzien\u0101",
-"Flip vertically": "Apmest vertik\u0101li",
-"Flip horizontally": "Apmest horizont\u0101li",
-"Edit image": "Redi\u0123\u0113t att\u0113lu",
-"Image options": "Att\u0113la parametri",
-"Zoom in": "Pietuvin\u0101t",
-"Zoom out": "Att\u0101lin\u0101t",
-"Crop": "Apgriezt",
-"Resize": "Main\u012bt izm\u0113ru",
-"Orientation": "Orient\u0101cija",
-"Brightness": "Gai\u0161ums",
-"Sharpen": "Asums",
-"Contrast": "Kontrasts",
-"Color levels": "Kr\u0101su l\u012bme\u0146i",
-"Gamma": "Gamma",
-"Invert": "Pret\u0113j\u0101s kr\u0101sas",
-"Apply": "Pielietot",
-"Back": "Atgriezties",
-"Insert date\/time": "Ievietot datumu\/laiku",
-"Date\/time": "Datums\/laiks",
-"Insert link": "Ievietot saiti",
-"Insert\/edit link": "Ievietot\/labot saiti",
-"Text to display": "Nosaukums",
-"Url": "Adrese",
-"Target": "Kur atv\u0113rt",
-"None": "\u2014",
-"New window": "Jaun\u0101 \u0161\u0137irkl\u012b",
-"Remove link": "No\u0146emt saiti",
-"Anchors": "Saites",
-"Link": "Saite",
-"Paste or type a link": "Iekop\u0113jiet vai ierakstiet saiti",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "J\u016bs ievad\u012bj\u0101t e-pasta adresi. Lai t\u0101 korekti darbotos, ir nepiecie\u0161ams to papildin\u0101t ar \"mailto:\" priek\u0161\u0101. Vai v\u0113laties to izdar\u012bt?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "J\u016bs ievad\u012bj\u0101t \u0101r\u0113jo saiti. Lai t\u0101 korekti darbotos, ir nepiecie\u0161ams to papildin\u0101t ar \"http:\/\/\" priek\u0161\u0101. Vai v\u0113laties to izdar\u012bt?",
-"Link list": "Sai\u0161u saraksts",
-"Insert video": "Ievietot video",
-"Insert\/edit video": "Ievietot\/redi\u0123\u0113t video",
-"Insert\/edit media": "Ievietot\/labot att\u0113lu",
-"Alternative source": "Alternat\u012bvs avots",
-"Poster": "Att\u0113ls",
-"Paste your embed code below:": "Iekop\u0113jiet Embed kodu \u0161eit:",
-"Embed": "Embed kods",
-"Media": "Att\u0113ls vai video",
-"Nonbreaking space": "Nedal\u0101m\u0101 atstarpe",
-"Page break": "P\u0101reja uz jauno lapu",
-"Paste as text": "Iel\u012bm\u0113t bez format\u0113juma",
-"Preview": "Priek\u0161skat\u012bt",
-"Print": "Druk\u0101t",
-"Save": "Saglab\u0101t",
-"Find": "Mekl\u0113t",
-"Replace with": "Aizvietot ar",
-"Replace": "Aizvietot",
-"Replace all": "Aizvietot visu",
-"Prev": "Iepriek\u0161\u0113jais",
-"Next": "N\u0101kamais",
-"Find and replace": "Mekl\u0113t un aizvietot",
-"Could not find the specified string.": "Mekl\u0113tais teksts netika atrasts",
-"Match case": "At\u0161\u0137irt lielos un mazos burtus",
-"Whole words": "Tikai pilnos v\u0101rdus",
-"Spellcheck": "Pareizrakst\u012bbas p\u0101rbaude",
-"Ignore": "Ignor\u0113t",
-"Ignore all": "Ignor\u0113t visu",
-"Finish": "Pabeigt",
-"Add to Dictionary": "Pievienot v\u0101rdn\u012bcai",
-"Insert table": "Ievietot tabulu",
-"Table properties": "Tabulas parametri",
-"Delete table": "Dz\u0113st tabulu",
-"Cell": "\u0160\u016bna",
-"Row": "Rinda",
-"Column": "Kolonna",
-"Cell properties": "\u0160\u016bnas parametri",
-"Merge cells": "Apvienot \u0161\u016bnas",
-"Split cell": "Sadal\u012bt \u0161\u016bnas",
-"Insert row before": "Jauna rinda augst\u0101k",
-"Insert row after": "Jauna rinda zem\u0101k",
-"Delete row": "Dz\u0113st rindu",
-"Row properties": "Rindas parametri",
-"Cut row": "Izgriezt rindu",
-"Copy row": "Kop\u0113t rindu",
-"Paste row before": "Iel\u012bm\u0113t rindu augst\u0101k",
-"Paste row after": "Iel\u012bm\u0113t rindu zem\u0101k",
-"Insert column before": "Jauna kolonna pa kreisi",
-"Insert column after": "Jauna kolonna pa labi",
-"Delete column": "Dz\u0113st kolonu",
-"Cols": "Kolonnas",
-"Rows": "Rindas",
-"Width": "Platums",
-"Height": "Augstums",
-"Cell spacing": "\u0160\u016bnu atstarpe",
-"Cell padding": "Iek\u0161\u0113j\u0101 atstarpe",
-"Caption": "Ar virsrakstu",
-"Left": "Pa kreisi",
-"Center": "Centr\u0113t",
-"Right": "Pa labi",
-"Cell type": "\u0160\u016bnas veids",
-"Scope": "Attiecin\u0101t uz",
-"Alignment": "Izl\u012bdzin\u0101\u0161ana",
-"H Align": "Horizont\u0101lais novietojums",
-"V Align": "Vertik\u0101lais novietojums",
-"Top": "Aug\u0161\u0101",
-"Middle": "Pa vidu",
-"Bottom": "Apak\u0161\u0101",
-"Header cell": "Galvenes \u0161\u016bna",
-"Row group": "Rindu grupa",
-"Column group": "Kolonnu grupa",
-"Row type": "Rindas veids",
-"Header": "Galvene",
-"Body": "Saturs",
-"Footer": "K\u0101jene",
-"Border color": "Apmales kr\u0101sa",
-"Insert template": "Ievietot veidni",
-"Templates": "Veidnes",
-"Template": "Veidne",
-"Text color": "Teksta kr\u0101sa",
-"Background color": "Fona kr\u0101sa",
-"Custom...": "Izv\u0113l\u0113ties citu...",
-"Custom color": "Specifisk\u0101 kr\u0101sa",
-"No color": "Nenor\u0101d\u012bt kr\u0101su",
-"Table of Contents": "Saturs",
-"Show blocks": "R\u0101d\u012bt blokus",
-"Show invisible characters": "R\u0101d\u012bt neredzam\u0101s rakstz\u012bmes",
-"Words: {0}": "V\u0101rdi: {0}",
-"{0} words": "{0} v\u0101rdi",
-"File": "Datne",
-"Edit": "Labot",
-"Insert": "Ievietot",
-"View": "Skat\u012bt",
-"Format": "Format\u0113t",
-"Table": "Tabula",
-"Tools": "R\u012bki",
-"Powered by {0}": "Darb\u012bbu nodro\u0161ina {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Satura redaktors. Nospiediet ALT-F9 lai par\u0101d\u012btu izv\u0113lni, ALT-F10 - r\u012bkjoslu vai ALT-0 - pal\u012bdz\u012bbu."
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nb_NO.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nb_NO.js
deleted file mode 100644
index e6f1df8971..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nb_NO.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('nb_NO',{
-"Redo": "Utf\u00f8r likevel",
-"Undo": "Angre",
-"Cut": "Klipp ut",
-"Copy": "Kopier",
-"Paste": "Lim inn",
-"Select all": "Marker alt",
-"New document": "Nytt dokument",
-"Ok": "OK",
-"Cancel": "Avbryt",
-"Visual aids": "Visuelle hjelpemidler",
-"Bold": "Halvfet",
-"Italic": "Kursiv",
-"Underline": "Understreket",
-"Strikethrough": "Gjennomstreket",
-"Superscript": "Hevet skrift",
-"Subscript": "Senket skrift",
-"Clear formatting": "Fjern formateringer",
-"Align left": "Venstrejustert",
-"Align center": "Midtstilt",
-"Align right": "H\u00f8yrejustert",
-"Justify": "Juster alle linjer",
-"Bullet list": "Punktliste",
-"Numbered list": "Nummerliste",
-"Decrease indent": "Reduser innrykk",
-"Increase indent": "\u00d8k innrykk",
-"Close": "Lukk",
-"Formats": "Stiler",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Nettleseren din st\u00f8tter ikke direkte tilgang til utklippsboken. Bruk istedet tastatur-snarveiene Ctrl+X\/C\/V, eller Cmd+X\/C\/V p\u00e5 Mac.",
-"Headers": "Overskrifter",
-"Header 1": "Overskrift 1",
-"Header 2": "Overskrift 2",
-"Header 3": "Overskrift 3",
-"Header 4": "Overskrift 4",
-"Header 5": "Overskrift 5",
-"Header 6": "Overskrift 6",
-"Headings": "Overskrifter",
-"Heading 1": "Overskrift 1",
-"Heading 2": "Overskrift 2",
-"Heading 3": "Overskrift 3",
-"Heading 4": "Overskrift 4",
-"Heading 5": "Overskrift 5",
-"Heading 6": "Overskrift 6",
-"Preformatted": "Forh\u00e5ndsformatert",
-"Div": "Delblokk <div>",
-"Pre": "Definert <pre>",
-"Code": "Kode <code>",
-"Paragraph": "Avsnitt <p>",
-"Blockquote": "Sitatblokk <blockquote>",
-"Inline": "Innkapslet <span>",
-"Blocks": "Blokker",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Lim inn er n\u00e5 i ren-tekst modus. Kopiert innhold vil bli limt inn som ren tekst inntil du sl\u00e5r av dette valget.",
-"Font Family": "Skriftsnitt",
-"Font Sizes": "St\u00f8rrelse",
-"Class": "Klasse",
-"Browse for an image": "S\u00f8k etter bilde",
-"OR": "ELLER",
-"Drop an image here": "Slipp et bilde her",
-"Upload": "Last opp",
-"Block": "Blokk",
-"Align": "Juster",
-"Default": "Normal",
-"Circle": "\u00c5pen sirkel",
-"Disc": "Fylt sirkel",
-"Square": "Fylt firkant",
-"Lower Alpha": "Minuskler",
-"Lower Greek": "Greske minuskler",
-"Lower Roman": "Romerske minuskler",
-"Upper Alpha": "Versaler",
-"Upper Roman": "Romerske versaler",
-"Anchor": "Anker",
-"Name": "Navn",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id burde starte med en bokstav, bare fulgt av bokstaver, nummer, streker, punktum, koloner eller understreker.",
-"You have unsaved changes are you sure you want to navigate away?": "Du har ikke arkivert endringene. Vil du fortsette uten \u00e5 arkivere?",
-"Restore last draft": "Gjenopprett siste utkast",
-"Special character": "Spesialtegn",
-"Source code": "Kildekode",
-"Insert\/Edit code sample": "Sett inn\/endre kodeeksempel",
-"Language": "Spr\u00e5k",
-"Code sample": "Kodeeksempel",
-"Color": "Farge",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Venstre til h\u00f8yre",
-"Right to left": "H\u00f8yre til venstre",
-"Emoticons": "Hum\u00f8rfjes",
-"Document properties": "Dokumentegenskaper",
-"Title": "Tittel",
-"Keywords": "N\u00f8kkelord",
-"Description": "Beskrivelse",
-"Robots": "Roboter",
-"Author": "Forfatter",
-"Encoding": "Tegnkoding",
-"Fullscreen": "Fullskjerm",
-"Action": "Handling",
-"Shortcut": "Snarvei",
-"Help": "Hjelp",
-"Address": "Adresse",
-"Focus to menubar": "Fokus p\u00e5 menylinje",
-"Focus to toolbar": "Fokus p\u00e5 verkt\u00f8ylinje",
-"Focus to element path": "Fokus p\u00e5 elementsti",
-"Focus to contextual toolbar": "Fokus p\u00e5 kontekstuell verkt\u00f8ylinje",
-"Insert link (if link plugin activated)": "Sett inn lenke (dersom lenketillegg er aktivert)",
-"Save (if save plugin activated)": "Lagre (dersom lagretillegg er aktivert)",
-"Find (if searchreplace plugin activated)": "Finn (dersom tillegg for s\u00f8k og erstatt er aktivert)",
-"Plugins installed ({0}):": "Installerte tillegg ({0}):",
-"Premium plugins:": "Premiumtillegg:",
-"Learn more...": "Les mer ...",
-"You are using {0}": "Du bruker {0}",
-"Plugins": "Tillegg",
-"Handy Shortcuts": "Nyttige snarveier",
-"Horizontal line": "Horisontal linje",
-"Insert\/edit image": "Sett inn\/endre bilde",
-"Image description": "Bildebeskrivelse",
-"Source": "Bildelenke",
-"Dimensions": "Dimensjoner",
-"Constrain proportions": "Behold proporsjoner",
-"General": "Generelt",
-"Advanced": "Avansert",
-"Style": "Stil",
-"Vertical space": "Vertikal marg",
-"Horizontal space": "Horisontal marg",
-"Border": "Ramme",
-"Insert image": "Sett inn bilde",
-"Image": "Bilde",
-"Image list": "Bildeliste",
-"Rotate counterclockwise": "Roter mot venstre",
-"Rotate clockwise": "Roter mot h\u00f8yre",
-"Flip vertically": "Speilvend vertikalt",
-"Flip horizontally": "Speilvend horisontalt",
-"Edit image": "Rediger bilde",
-"Image options": "Bilde innstillinger",
-"Zoom in": "Zoom inn",
-"Zoom out": "Zoom ut",
-"Crop": "Beskj\u00e6r",
-"Resize": "Skaler",
-"Orientation": "Orientering",
-"Brightness": "Lysstyrke",
-"Sharpen": "Skarphet",
-"Contrast": "Kontrast",
-"Color levels": "Fargeniv\u00e5",
-"Gamma": "Gamma",
-"Invert": "Inverter",
-"Apply": "Utf\u00f8r",
-"Back": "Tilbake",
-"Insert date\/time": "Sett inn dato\/tid",
-"Date\/time": "Dato\/tid",
-"Insert link": "Sett inn lenke",
-"Insert\/edit link": "Sett inn\/endre lenke",
-"Text to display": "Tekst som skal vises",
-"Url": "URL",
-"Target": "M\u00e5l",
-"None": "Ingen",
-"New window": "Nytt vindu",
-"Remove link": "Fjern lenke",
-"Anchors": "Anker",
-"Link": "Lenke",
-"Paste or type a link": "Lim inn eller skriv en lenke",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Oppgitte URL ser ut til \u00e5 v\u00e6re en epost-adresse. \u00d8nsker du \u00e5 sette inn p\u00e5krevet mailto: prefiks forran epost-adressen?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Oppgitt URL ser ut til \u00e5 v\u00e6re en e-postadresse. \u00d8nsker du \u00e5 sette inn p\u00e5krevd mailto:-prefiks foran e-postadressen?",
-"Link list": "Lenkeliste",
-"Insert video": "Sett inn video",
-"Insert\/edit video": "Sett inn\/rediger video",
-"Insert\/edit media": "Sett inn\/endre media",
-"Alternative source": "Alternativ kilde",
-"Poster": "Plakatbilde",
-"Paste your embed code below:": "Lim inn  inkluderings-koden nedenfor",
-"Embed": "Inkluder",
-"Media": "Media",
-"Nonbreaking space": "Hardt mellomrom",
-"Page break": "Sideskifte",
-"Paste as text": "Lim inn som tekst",
-"Preview": "Forh\u00e5ndsvisning",
-"Print": "Skriv ut",
-"Save": "Arkiver",
-"Find": "Finn",
-"Replace with": "Erstatt med",
-"Replace": "Erstatt",
-"Replace all": "Erstatt alle",
-"Prev": "Forrige",
-"Next": "Neste",
-"Find and replace": "Finn og erstatt",
-"Could not find the specified string.": "Kunne ikke finne den spesifiserte teksten",
-"Match case": "Match store og sm\u00e5 bokstaver",
-"Whole words": "Hele ord",
-"Spellcheck": "Stavekontroll",
-"Ignore": "Ignorer",
-"Ignore all": "Ignorer alle",
-"Finish": "Avslutt",
-"Add to Dictionary": "Legg til i ordliste",
-"Insert table": "Sett inn tabell",
-"Table properties": "Tabell egenskaper",
-"Delete table": "Slett tabell",
-"Cell": "Celle",
-"Row": "Rad",
-"Column": "Kolonne",
-"Cell properties": "Celle egenskaper",
-"Merge cells": "Sl\u00e5 sammen celler",
-"Split cell": "Splitt celle",
-"Insert row before": "Sett inn rad f\u00f8r",
-"Insert row after": "Sett in rad etter",
-"Delete row": "Slett rad",
-"Row properties": "Rad egenskaper",
-"Cut row": "Klipp ut rad",
-"Copy row": "Kopier rad",
-"Paste row before": "Lim inn rad f\u00f8r",
-"Paste row after": "Lim inn rad etter",
-"Insert column before": "Sett inn kolonne f\u00f8r",
-"Insert column after": "Sett inn kolonne etter",
-"Delete column": "Slett kolonne",
-"Cols": "Kolonner",
-"Rows": "Rader",
-"Width": "Bredde",
-"Height": "H\u00f8yde",
-"Cell spacing": "Celleavstand",
-"Cell padding": "Cellemarg",
-"Caption": "Tittel",
-"Left": "Venstre",
-"Center": "Midtstilt",
-"Right": "H\u00f8yre",
-"Cell type": "Celletype",
-"Scope": "Omfang",
-"Alignment": "Justering",
-"H Align": "H Justering",
-"V Align": "V Justering",
-"Top": "Topp",
-"Middle": "Midten",
-"Bottom": "Bunn",
-"Header cell": "Topptekst-celle",
-"Row group": "Radgruppe",
-"Column group": "Kolonnegruppe",
-"Row type": "Rad-type",
-"Header": "Topptekst",
-"Body": "Br\u00f8dtekst",
-"Footer": "Bunntekst",
-"Border color": "Rammefarge",
-"Insert template": "Sett inn mal",
-"Templates": "Maler",
-"Template": "Mal",
-"Text color": "Tekstfarge",
-"Background color": "Bakgrunnsfarge",
-"Custom...": "Tilpass...",
-"Custom color": "Tilpasset farge",
-"No color": "Ingen farge",
-"Table of Contents": "Innholdsfortegnelse",
-"Show blocks": "Vis blokker",
-"Show invisible characters": "Vis skjulte tegn",
-"Words: {0}": "Antall ord: {0}",
-"{0} words": "{0} ord",
-"File": "Arkiv",
-"Edit": "Rediger",
-"Insert": "Sett inn",
-"View": "Vis",
-"Format": "Format",
-"Table": "Tabell",
-"Tools": "Verkt\u00f8y",
-"Powered by {0}": "Redigert med {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Tekstredigering. Tast ALT-F9 for meny. Tast ALT-F10 for verkt\u00f8ys-rader. Tast ALT-0 for hjelp."
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nl.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nl.js
deleted file mode 100644
index d8631c9ab6..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nl.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('nl',{
-"Redo": "Opnieuw",
-"Undo": "Ongedaan maken",
-"Cut": "Knippen",
-"Copy": "Kopi\u00ebren",
-"Paste": "Plakken",
-"Select all": "Alles selecteren",
-"New document": "Nieuw document",
-"Ok": "Ok\u00e9",
-"Cancel": "Annuleren",
-"Visual aids": "Hulpmiddelen",
-"Bold": "Vet",
-"Italic": "Cursief",
-"Underline": "Onderstreept",
-"Strikethrough": "Doorhalen",
-"Superscript": "Superscript",
-"Subscript": "Subscript",
-"Clear formatting": "Opmaak verwijderen",
-"Align left": "Links uitlijnen",
-"Align center": "Centreren",
-"Align right": "Rechts uitlijnen",
-"Justify": "Uitlijnen",
-"Bullet list": "Opsommingsteken",
-"Numbered list": "Nummering",
-"Decrease indent": "Inspringen verkleinen",
-"Increase indent": "Inspringen vergroten",
-"Close": "Sluiten",
-"Formats": "Opmaak",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Uw browser ondersteunt geen toegang tot het clipboard. Gelieve ctrl+X\/C\/V sneltoetsen te gebruiken.",
-"Headers": "Kopteksten",
-"Header 1": "Kop 1",
-"Header 2": "Kop 2",
-"Header 3": "Kop 3",
-"Header 4": "Kop 4",
-"Header 5": "Kop 5",
-"Header 6": "Kop 6",
-"Headings": "Koppen",
-"Heading 1": "Kop 1",
-"Heading 2": "Kop 2",
-"Heading 3": "Kop 3",
-"Heading 4": "Kop 4",
-"Heading 5": "Kop 5",
-"Heading 6": "Kop 6",
-"Preformatted": "Voor-opgemaakt",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Code",
-"Paragraph": "Paragraaf",
-"Blockquote": "Quote",
-"Inline": "Inlijn",
-"Blocks": "Blok",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Plakken gebeurt nu als platte tekst. Tekst wordt nu ingevoegd zonder opmaak tot deze optie uitgeschakeld wordt.",
-"Font Family": "Lettertype",
-"Font Sizes": "Tekengrootte",
-"Class": "Class",
-"Browse for an image": "Zoek naar een afbeelding",
-"OR": "OF",
-"Drop an image here": "Plaats hier een afbeelding",
-"Upload": "Uploaden",
-"Block": "Blok",
-"Align": "Uitlijnen",
-"Default": "Standaard",
-"Circle": "Cirkel",
-"Disc": "Bolletje",
-"Square": "Vierkant",
-"Lower Alpha": "Kleine letters",
-"Lower Greek": "Griekse letters",
-"Lower Roman": "Romeinse cijfers klein",
-"Upper Alpha": "Hoofdletters",
-"Upper Roman": "Romeinse cijfers groot",
-"Anchor": "Anker",
-"Name": "Naam",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID moet beginnen met een letter, gevolgd door letters, nummers, streepjes, punten, dubbele punten of underscores.",
-"You have unsaved changes are you sure you want to navigate away?": "U hebt niet alles opgeslagen bent u zeker dat u de pagina wenst te verlaten?",
-"Restore last draft": "Herstel het laatste concept",
-"Special character": "Speciale karakters",
-"Source code": "Broncode",
-"Insert\/Edit code sample": "Broncode invoegen\/bewerken",
-"Language": "Programmeertaal",
-"Code sample": "Broncode voorbeeld",
-"Color": "Kleur",
-"R": "Rood",
-"G": "Groen",
-"B": "Blauw",
-"Left to right": "Links naar rechts",
-"Right to left": "Rechts naar links",
-"Emoticons": "Emoticons",
-"Document properties": "Document eigenschappen",
-"Title": "Titel",
-"Keywords": "Sleutelwoorden",
-"Description": "Omschrijving",
-"Robots": "Robots",
-"Author": "Auteur",
-"Encoding": "Codering",
-"Fullscreen": "Volledig scherm",
-"Action": "Actie",
-"Shortcut": "Snelkoppeling",
-"Help": "Help",
-"Address": "Adres",
-"Focus to menubar": "Menubalk selecteren",
-"Focus to toolbar": "Werkbalk selecteren",
-"Focus to element path": "Element pad selecteren",
-"Focus to contextual toolbar": "Contextuele werkbalk selecteren",
-"Insert link (if link plugin activated)": "Link invoegen (als link plug-in geactiveerd is)",
-"Save (if save plugin activated)": "Opslaan (als opslaan plug-in ingeschakeld is)",
-"Find (if searchreplace plugin activated)": "Zoeken (als zoeken\/vervangen plug-in ingeschakeld is)",
-"Plugins installed ({0}):": "Plug-ins ge\u00efnstalleerd ({0}):",
-"Premium plugins:": "Premium plug-ins:",
-"Learn more...": "Leer meer...",
-"You are using {0}": "Je gebruikt {0}",
-"Plugins": "Plug-ins",
-"Handy Shortcuts": "Handige snelkoppelingen",
-"Horizontal line": "Horizontale lijn",
-"Insert\/edit image": "Afbeelding invoegen\/bewerken",
-"Image description": "Afbeelding omschrijving",
-"Source": "Bron",
-"Dimensions": "Afmetingen",
-"Constrain proportions": "Verhoudingen behouden",
-"General": "Algemeen",
-"Advanced": "Geavanceerd",
-"Style": "Stijl",
-"Vertical space": "Verticale ruimte",
-"Horizontal space": "Horizontale ruimte",
-"Border": "Rand",
-"Insert image": "Afbeelding invoegen",
-"Image": "Afbeelding",
-"Image list": "Afbeeldingenlijst",
-"Rotate counterclockwise": "Linksom draaien",
-"Rotate clockwise": "Rechtsom draaien",
-"Flip vertically": "Verticaal spiegelen",
-"Flip horizontally": "Horizontaal spiegelen",
-"Edit image": "Bewerk afbeelding",
-"Image options": "Afbeelding opties",
-"Zoom in": "Inzoomen",
-"Zoom out": "Uitzoomen",
-"Crop": "Uitsnijden",
-"Resize": "Formaat aanpassen",
-"Orientation": "Orientatie",
-"Brightness": "Helderheid",
-"Sharpen": "Scherpte",
-"Contrast": "Contrast",
-"Color levels": "Kleurniveau's",
-"Gamma": "Gamma",
-"Invert": "Omkeren",
-"Apply": "Toepassen",
-"Back": "Terug",
-"Insert date\/time": "Voeg datum\/tijd in",
-"Date\/time": "Datum\/tijd",
-"Insert link": "Hyperlink invoegen",
-"Insert\/edit link": "Hyperlink invoegen\/bewerken",
-"Text to display": "Linktekst",
-"Url": "URL",
-"Target": "Doel",
-"None": "Geen",
-"New window": "Nieuw venster",
-"Remove link": "Link verwijderen",
-"Anchors": "Anker",
-"Link": "Link",
-"Paste or type a link": "Plak of typ een link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "De ingegeven URL lijkt op een e-mailadres. Wil je er \"mailto:\" aan toevoegen?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "De ingegeven URL verwijst naar een extern adres. Wil je er \"http:\/\/\" aan toevoegen?",
-"Link list": "Linklijst",
-"Insert video": "Video invoegen",
-"Insert\/edit video": "Video invoegen\/bewerken",
-"Insert\/edit media": "Media invoegen\/bewerken",
-"Alternative source": "Alternatieve bron",
-"Poster": "Poster",
-"Paste your embed code below:": "Plak u in te sluiten code hieronder:",
-"Embed": "Insluiten",
-"Media": "Media",
-"Nonbreaking space": "Vaste spatie invoegen",
-"Page break": "Pagina einde",
-"Paste as text": "Plakken als tekst",
-"Preview": "Voorbeeld",
-"Print": "Print",
-"Save": "Opslaan",
-"Find": "Zoeken",
-"Replace with": "Vervangen door",
-"Replace": "Vervangen",
-"Replace all": "Alles vervangen",
-"Prev": "Vorige",
-"Next": "Volgende",
-"Find and replace": "Zoek en vervang",
-"Could not find the specified string.": "Geen resultaten gevonden",
-"Match case": "Identieke hoofd\/kleine letters",
-"Whole words": "Alleen hele woorden",
-"Spellcheck": "Spellingscontrole",
-"Ignore": "Negeren",
-"Ignore all": "Alles negeren",
-"Finish": "Einde",
-"Add to Dictionary": "Toevoegen aan woordenlijst",
-"Insert table": "Tabel invoegen",
-"Table properties": "Tabel eigenschappen",
-"Delete table": "Verwijder tabel",
-"Cell": "Cel",
-"Row": "Rij",
-"Column": "Kolom",
-"Cell properties": "Cel eigenschappen",
-"Merge cells": "Cellen samenvoegen",
-"Split cell": "Cel splitsen",
-"Insert row before": "Voeg rij boven toe",
-"Insert row after": "Voeg rij onder toe",
-"Delete row": "Verwijder rij",
-"Row properties": "Rij eigenschappen",
-"Cut row": "Knip rij",
-"Copy row": "Kopieer rij",
-"Paste row before": "Plak rij boven",
-"Paste row after": "Plak rij onder",
-"Insert column before": "Voeg kolom in voor",
-"Insert column after": "Voeg kolom in na",
-"Delete column": "Verwijder kolom",
-"Cols": "Kolommen",
-"Rows": "Rijen",
-"Width": "Breedte",
-"Height": "Hoogte",
-"Cell spacing": "Celruimte",
-"Cell padding": "Ruimte binnen cel",
-"Caption": "Onderschrift",
-"Left": "Links",
-"Center": "Midden",
-"Right": "Rechts",
-"Cell type": "Celtype",
-"Scope": "Bereik",
-"Alignment": "Uitlijning",
-"H Align": "Links uitlijnen",
-"V Align": "Boven uitlijnen",
-"Top": "Bovenaan",
-"Middle": "Centreren",
-"Bottom": "Onderaan",
-"Header cell": "Kopcel",
-"Row group": "Rijgroep",
-"Column group": "Kolomgroep",
-"Row type": "Rijtype",
-"Header": "Koptekst",
-"Body": "Body",
-"Footer": "Voettekst",
-"Border color": "Randkleur",
-"Insert template": "Sjabloon invoegen",
-"Templates": "Sjablonen",
-"Template": "Sjabloon",
-"Text color": "Tekstkleur",
-"Background color": "Achtergrondkleur",
-"Custom...": "Eigen...",
-"Custom color": "Eigen kleur",
-"No color": "Geen kleur",
-"Table of Contents": "Inhoudsopgave",
-"Show blocks": "Blokken tonen",
-"Show invisible characters": "Onzichtbare karakters tonen",
-"Words: {0}": "Woorden: {0}",
-"{0} words": "{0} woorden",
-"File": "Bestand",
-"Edit": "Bewerken",
-"Insert": "Invoegen",
-"View": "Beeld",
-"Format": "Opmaak",
-"Table": "Tabel",
-"Tools": "Gereedschap",
-"Powered by {0}": "Gemaakt door {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Druk ALT-F9 voor het menu. Druk ALT-F10 voor de toolbar. Druk ALT-0 voor help."
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pl.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pl.js
deleted file mode 100644
index 92dc74dfa6..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pl.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('pl',{
-"Redo": "Pon\u00f3w",
-"Undo": "Cofnij",
-"Cut": "Wytnij",
-"Copy": "Kopiuj",
-"Paste": "Wklej",
-"Select all": "Zaznacz wszystko",
-"New document": "Nowy dokument",
-"Ok": "Ok",
-"Cancel": "Anuluj",
-"Visual aids": "Pomoce wizualne",
-"Bold": "Pogrubienie",
-"Italic": "Kursywa",
-"Underline": "Podkre\u015blenie",
-"Strikethrough": "Przekre\u015blenie",
-"Superscript": "Indeks g\u00f3rny",
-"Subscript": "Indeks dolny",
-"Clear formatting": "Wyczy\u015b\u0107 formatowanie",
-"Align left": "Wyr\u00f3wnaj do lewej",
-"Align center": "Wyr\u00f3wnaj do \u015brodka",
-"Align right": "Wyr\u00f3wnaj do prawej",
-"Justify": "Do lewej i prawej",
-"Bullet list": "Lista wypunktowana",
-"Numbered list": "Lista numerowana",
-"Decrease indent": "Zmniejsz wci\u0119cie",
-"Increase indent": "Zwi\u0119ksz wci\u0119cie",
-"Close": "Zamknij",
-"Formats": "Formaty",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Twoja przegl\u0105darka nie obs\u0142uguje bezpo\u015bredniego dost\u0119pu do schowka. U\u017cyj zamiast tego kombinacji klawiszy Ctrl+X\/C\/V.",
-"Headers": "Nag\u0142\u00f3wki",
-"Header 1": "Nag\u0142\u00f3wek 1",
-"Header 2": "Nag\u0142\u00f3wek 2",
-"Header 3": "Nag\u0142\u00f3wek 3",
-"Header 4": "Nag\u0142\u00f3wek 4",
-"Header 5": "Nag\u0142\u00f3wek 5",
-"Header 6": "Nag\u0142\u00f3wek 6",
-"Headings": "Nag\u0142\u00f3wki",
-"Heading 1": "Nag\u0142\u00f3wek 1",
-"Heading 2": "Nag\u0142\u00f3wek 2",
-"Heading 3": "Nag\u0142\u00f3wek 3",
-"Heading 4": "Nag\u0142\u00f3wek 4",
-"Heading 5": "Nag\u0142\u00f3wek 5",
-"Heading 6": "Nag\u0142\u00f3wek 6",
-"Preformatted": "Sformatowany tekst",
-"Div": "Div",
-"Pre": "Sformatowany tekst",
-"Code": "Kod \u017ar\u00f3d\u0142owy",
-"Paragraph": "Akapit",
-"Blockquote": "Blok cytatu",
-"Inline": "W tek\u015bcie",
-"Blocks": "Bloki",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Wklejanie jest w trybie tekstowym. Zawarto\u015b\u0107 zostanie wklejona jako zwyk\u0142y tekst dop\u00f3ki nie wy\u0142\u0105czysz tej opcji.",
-"Font Family": "Kr\u00f3j fontu",
-"Font Sizes": "Rozmiar fontu",
-"Class": "Klasa",
-"Browse for an image": "Przegl\u0105daj za zdj\u0119ciem",
-"OR": "LUB",
-"Drop an image here": "Upu\u015b\u0107 obraz tutaj",
-"Upload": "Prze\u015blij",
-"Block": "Zablokuj",
-"Align": "Wyr\u00f3wnaj",
-"Default": "Domy\u015blne",
-"Circle": "K\u00f3\u0142ko",
-"Disc": "Dysk",
-"Square": "Kwadrat",
-"Lower Alpha": "Ma\u0142e litery",
-"Lower Greek": "Ma\u0142e greckie",
-"Lower Roman": "Ma\u0142e rzymskie",
-"Upper Alpha": "Wielkie litery",
-"Upper Roman": "Wielkie rzymskie",
-"Anchor": "Kotwica",
-"Name": "Nazwa",
-"Id": "Identyfikator",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Identyfikator powinien zaczyna\u0107 si\u0119 liter\u0105, dozwolone s\u0105 tylko litery, numery, uko\u015bniki, kropki, dwukropki i podkre\u015blniki - tzw. pod\u0142ogi",
-"You have unsaved changes are you sure you want to navigate away?": "Masz niezapisane zmiany. Czy na pewno chcesz opu\u015bci\u0107 stron\u0119?",
-"Restore last draft": "Przywr\u00f3\u0107 ostatni szkic",
-"Special character": "Znak specjalny",
-"Source code": "Kod \u017ar\u00f3d\u0142owy",
-"Insert\/Edit code sample": "Dodaj\/Edytuj przyk\u0142adowy kod",
-"Language": "J\u0119zyk",
-"Code sample": "Przyk\u0142ad kodu \u017ar\u00f3d\u0142owego",
-"Color": "Kolor",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Od lewej do prawej",
-"Right to left": "Od prawej do lewej",
-"Emoticons": "Ikony emocji",
-"Document properties": "W\u0142a\u015bciwo\u015bci dokumentu",
-"Title": "Tytu\u0142",
-"Keywords": "S\u0142owa kluczowe",
-"Description": "Opis",
-"Robots": "Roboty",
-"Author": "Autor",
-"Encoding": "Kodowanie",
-"Fullscreen": "Pe\u0142ny ekran",
-"Action": "Akcja",
-"Shortcut": "Skr\u00f3t",
-"Help": "Pomoc",
-"Address": "Adres",
-"Focus to menubar": "Skup si\u0119 na pasku menu",
-"Focus to toolbar": "Skupi\u0107 si\u0119 na pasku",
-"Focus to element path": "Skup si\u0119 na \u015bcie\u017cce elementu",
-"Focus to contextual toolbar": "Skupi\u0107 si\u0119 na pasku narz\u0119dzi kontekstowych",
-"Insert link (if link plugin activated)": "Wstaw \u0142\u0105cze (je\u015bli w\u0142\u0105czysz wtyczk\u0119 link\u00f3w)",
-"Save (if save plugin activated)": "Zapisz (je\u015bli aktywowana jest wtyczka do zapisu)",
-"Find (if searchreplace plugin activated)": "Znajd\u017a (je\u015bli w\u0142\u0105czysz wtyczk\u0119 do wyszukiwania)",
-"Plugins installed ({0}):": "Zainstalowane wtyczki ({0}):",
-"Premium plugins:": "Wtyczki Premium:",
-"Learn more...": "Dowiedz si\u0119 wi\u0119cej...",
-"You are using {0}": "U\u017cywasz {0}",
-"Plugins": "Pluginy",
-"Handy Shortcuts": "Przydatne skr\u00f3ty",
-"Horizontal line": "Pozioma linia",
-"Insert\/edit image": "Wstaw\/edytuj obrazek",
-"Image description": "Opis obrazka",
-"Source": "\u0179r\u00f3d\u0142o",
-"Dimensions": "Wymiary",
-"Constrain proportions": "Zachowaj proporcje",
-"General": "Og\u00f3lne",
-"Advanced": "Zaawansowane",
-"Style": "Styl",
-"Vertical space": "Odst\u0119p pionowy",
-"Horizontal space": "Odst\u0119p poziomy",
-"Border": "Ramka",
-"Insert image": "Wstaw obrazek",
-"Image": "Obraz",
-"Image list": "Lista obrazk\u00f3w",
-"Rotate counterclockwise": "Obr\u00f3\u0107 w lewo",
-"Rotate clockwise": "Obr\u00f3\u0107 w prawo",
-"Flip vertically": "Przerzu\u0107 w pionie",
-"Flip horizontally": "Przerzu\u0107 w poziomie",
-"Edit image": "Edytuj obrazek",
-"Image options": "Opcje obrazu",
-"Zoom in": "Powi\u0119ksz",
-"Zoom out": "Pomniejsz",
-"Crop": "Przytnij",
-"Resize": "Zmiana rozmiaru",
-"Orientation": "Orientacja",
-"Brightness": "Jasno\u015b\u0107",
-"Sharpen": "Wyostrz",
-"Contrast": "Kontrast",
-"Color levels": "Poziom koloru",
-"Gamma": "Gamma",
-"Invert": "Odwr\u00f3\u0107",
-"Apply": "Zaakceptuj",
-"Back": "Cofnij",
-"Insert date\/time": "Wstaw dat\u0119\/czas",
-"Date\/time": "Data\/Czas",
-"Insert link": "Wstaw \u0142\u0105cze",
-"Insert\/edit link": "Wstaw\/edytuj \u0142\u0105cze",
-"Text to display": "Tekst do wy\u015bwietlenia",
-"Url": "URL",
-"Target": "Cel",
-"None": "\u017baden",
-"New window": "Nowe okno",
-"Remove link": "Usu\u0144 \u0142\u0105cze",
-"Anchors": "Kotwice",
-"Link": "Adres \u0142\u0105cza",
-"Paste or type a link": "Wklej lub wpisz adres \u0142\u0105cza",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL, kt\u00f3ry wprowadzi\u0142e\u015b wygl\u0105da na adres e-mail. Czy chcesz doda\u0107 mailto: jako prefiks?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL, kt\u00f3ry wprowadzi\u0142e\u015b wygl\u0105da na link zewn\u0119trzny. Czy chcesz doda\u0107 http:\/\/ jako prefiks?",
-"Link list": "Lista link\u00f3w",
-"Insert video": "Wstaw wideo",
-"Insert\/edit video": "Wstaw\/edytuj wideo",
-"Insert\/edit media": "Wstaw\/Edytuj media",
-"Alternative source": "Alternatywne \u017ar\u00f3d\u0142o",
-"Poster": "Plakat",
-"Paste your embed code below:": "Wklej tutaj kod do osadzenia:",
-"Embed": "Osad\u017a",
-"Media": "Media",
-"Nonbreaking space": "Nie\u0142amliwa spacja",
-"Page break": "Podzia\u0142 strony",
-"Paste as text": "Wklej jako zwyk\u0142y tekst",
-"Preview": "Podgl\u0105d",
-"Print": "Drukuj",
-"Save": "Zapisz",
-"Find": "Znajd\u017a",
-"Replace with": "Zamie\u0144 na",
-"Replace": "Zamie\u0144",
-"Replace all": "Zamie\u0144 wszystko",
-"Prev": "Poprz.",
-"Next": "Nast.",
-"Find and replace": "Znajd\u017a i zamie\u0144",
-"Could not find the specified string.": "Nie znaleziono szukanego tekstu.",
-"Match case": "Dopasuj wielko\u015b\u0107 liter",
-"Whole words": "Ca\u0142e s\u0142owa",
-"Spellcheck": "Sprawdzanie pisowni",
-"Ignore": "Ignoruj",
-"Ignore all": "Ignoruj wszystko",
-"Finish": "Zako\u0144cz",
-"Add to Dictionary": "Dodaj do s\u0142ownika",
-"Insert table": "Wstaw tabel\u0119",
-"Table properties": "W\u0142a\u015bciwo\u015bci tabeli",
-"Delete table": "Usu\u0144 tabel\u0119",
-"Cell": "Kom\u00f3rka",
-"Row": "Wiersz",
-"Column": "Kolumna",
-"Cell properties": "W\u0142a\u015bciwo\u015bci kom\u00f3rki",
-"Merge cells": "\u0141\u0105cz kom\u00f3rki",
-"Split cell": "Podziel kom\u00f3rk\u0119",
-"Insert row before": "Wstaw wiersz przed",
-"Insert row after": "Wstaw wiersz po",
-"Delete row": "Usu\u0144 wiersz",
-"Row properties": "W\u0142a\u015bciwo\u015bci wiersza",
-"Cut row": "Wytnij wiersz",
-"Copy row": "Kopiuj wiersz",
-"Paste row before": "Wklej wiersz przed",
-"Paste row after": "Wklej wiersz po",
-"Insert column before": "Wstaw kolumn\u0119 przed",
-"Insert column after": "Wstaw kolumn\u0119 po",
-"Delete column": "Usu\u0144 kolumn\u0119",
-"Cols": "Kol.",
-"Rows": "Wiersz.",
-"Width": "Szeroko\u015b\u0107",
-"Height": "Wysoko\u015b\u0107",
-"Cell spacing": "Odst\u0119py kom\u00f3rek",
-"Cell padding": "Dope\u0142nienie kom\u00f3rki",
-"Caption": "Tytu\u0142",
-"Left": "Lewo",
-"Center": "\u015arodek",
-"Right": "Prawo",
-"Cell type": "Typ kom\u00f3rki",
-"Scope": "Kontekst",
-"Alignment": "Wyr\u00f3wnanie",
-"H Align": "Wyr\u00f3wnanie w pionie",
-"V Align": "Wyr\u00f3wnanie w poziomie",
-"Top": "G\u00f3ra",
-"Middle": "\u015arodek",
-"Bottom": "D\u00f3\u0142",
-"Header cell": "Kom\u00f3rka nag\u0142\u00f3wka",
-"Row group": "Grupa wierszy",
-"Column group": "Grupa kolumn",
-"Row type": "Typ wiersza",
-"Header": "Nag\u0142\u00f3wek",
-"Body": "Tre\u015b\u0107",
-"Footer": "Stopka",
-"Border color": "Kolor ramki",
-"Insert template": "Wstaw szablon",
-"Templates": "Szablony",
-"Template": "Szablon",
-"Text color": "Kolor tekstu",
-"Background color": "Kolor t\u0142a",
-"Custom...": "Niestandardowy...",
-"Custom color": "Kolor niestandardowy",
-"No color": "Bez koloru",
-"Table of Contents": "Spis tre\u015bci",
-"Show blocks": "Poka\u017c bloki",
-"Show invisible characters": "Poka\u017c niewidoczne znaki",
-"Words: {0}": "S\u0142\u00f3w: {0}",
-"{0} words": "{0} s\u0142\u00f3w",
-"File": "Plik",
-"Edit": "Edycja",
-"Insert": "Wstaw",
-"View": "Widok",
-"Format": "Format",
-"Table": "Tabela",
-"Tools": "Narz\u0119dzia",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Obszar Edycji. ALT-F9 - menu. ALT-F10 - pasek narz\u0119dzi. ALT-0 - pomoc"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_BR.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_BR.js
deleted file mode 100644
index 2beccd413b..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_BR.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('pt_BR',{
-"Redo": "Refazer",
-"Undo": "Desfazer",
-"Cut": "Recortar",
-"Copy": "Copiar",
-"Paste": "Colar",
-"Select all": "Selecionar tudo",
-"New document": "Novo documento",
-"Ok": "Ok",
-"Cancel": "Cancelar",
-"Visual aids": "Ajuda visual",
-"Bold": "Negrito",
-"Italic": "It\u00e1lico",
-"Underline": "Sublinhar",
-"Strikethrough": "Riscar",
-"Superscript": "Sobrescrito",
-"Subscript": "Subscrever",
-"Clear formatting": "Limpar formata\u00e7\u00e3o",
-"Align left": "Alinhar \u00e0 esquerda",
-"Align center": "Centralizar",
-"Align right": "Alinhar \u00e0 direita",
-"Justify": "Justificar",
-"Bullet list": "Lista n\u00e3o ordenada",
-"Numbered list": "Lista ordenada",
-"Decrease indent": "Diminuir recuo",
-"Increase indent": "Aumentar recuo",
-"Close": "Fechar",
-"Formats": "Formatos",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Seu navegador n\u00e3o suporta acesso direto \u00e0 \u00e1rea de transfer\u00eancia. Por favor use os atalhos Ctrl+X - C - V do teclado",
-"Headers": "Cabe\u00e7alhos",
-"Header 1": "Cabe\u00e7alho 1",
-"Header 2": "Cabe\u00e7alho 2",
-"Header 3": "Cabe\u00e7alho 3",
-"Header 4": "Cabe\u00e7alho 4",
-"Header 5": "Cabe\u00e7alho 5",
-"Header 6": "Cabe\u00e7alho 6",
-"Headings": "Cabe\u00e7alhos",
-"Heading 1": "Cabe\u00e7alho 1",
-"Heading 2": "Cabe\u00e7alho 2",
-"Heading 3": "Cabe\u00e7alho 3",
-"Heading 4": "Cabe\u00e7alho 4",
-"Heading 5": "Cabe\u00e7alho 5",
-"Heading 6": "Cabe\u00e7alho 6",
-"Preformatted": "Preformatado",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "C\u00f3digo",
-"Paragraph": "Par\u00e1grafo",
-"Blockquote": "Aspas",
-"Inline": "Em linha",
-"Blocks": "Blocos",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "O comando colar est\u00e1 agora em modo texto plano. O conte\u00fado ser\u00e1 colado como texto plano at\u00e9 voc\u00ea desligar esta op\u00e7\u00e3o.",
-"Font Family": "Fonte",
-"Font Sizes": "Tamanho",
-"Class": "Classe",
-"Browse for an image": "Procure uma imagem",
-"OR": "OU",
-"Drop an image here": "Arraste uma imagem aqui",
-"Upload": "Carregar",
-"Block": "Bloco",
-"Align": "Alinhamento",
-"Default": "Padr\u00e3o",
-"Circle": "C\u00edrculo",
-"Disc": "Disco",
-"Square": "Quadrado",
-"Lower Alpha": "a. b. c. ...",
-"Lower Greek": "\u03b1. \u03b2. \u03b3. ...",
-"Lower Roman": "i. ii. iii. ...",
-"Upper Alpha": "A. B. C. ...",
-"Upper Roman": "I. II. III. ...",
-"Anchor": "\u00c2ncora",
-"Name": "Nome",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id deve come\u00e7ar com uma letra, seguido apenas por letras, n\u00fameros, tra\u00e7os, pontos, dois pontos ou sublinhados.",
-"You have unsaved changes are you sure you want to navigate away?": "Voc\u00ea tem mudan\u00e7as n\u00e3o salvas. Voc\u00ea tem certeza que deseja sair?",
-"Restore last draft": "Restaurar \u00faltimo rascunho",
-"Special character": "Caracteres especiais",
-"Source code": "C\u00f3digo fonte",
-"Insert\/Edit code sample": "Inserir\/Editar c\u00f3digo de exemplo",
-"Language": "Idioma",
-"Code sample": "Exemplo de c\u00f3digo",
-"Color": "Cor",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Da esquerda para a direita",
-"Right to left": "Da direita para a esquerda",
-"Emoticons": "Emoticons",
-"Document properties": "Propriedades do documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palavras-chave",
-"Description": "Descri\u00e7\u00e3o",
-"Robots": "Rob\u00f4s",
-"Author": "Autor",
-"Encoding": "Codifica\u00e7\u00e3o",
-"Fullscreen": "Tela cheia",
-"Action": "A\u00e7\u00e3o",
-"Shortcut": "Atalho",
-"Help": "Ajuda",
-"Address": "Endere\u00e7o",
-"Focus to menubar": "Foco no menu",
-"Focus to toolbar": "Foco na barra de ferramentas",
-"Focus to element path": "Foco no caminho do elemento",
-"Focus to contextual toolbar": "Foco na barra de ferramentas contextual",
-"Insert link (if link plugin activated)": "Inserir link (se o plugin de link estiver ativado)",
-"Save (if save plugin activated)": "Salvar (se o plugin de salvar estiver ativado)",
-"Find (if searchreplace plugin activated)": "Procurar (se o plugin de procurar e substituir estiver ativado)",
-"Plugins installed ({0}):": "Plugins instalados ({0}):",
-"Premium plugins:": "Plugins premium:",
-"Learn more...": "Saiba mais...",
-"You are using {0}": "Voc\u00ea est\u00e1 usando {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Atalhos \u00fateis",
-"Horizontal line": "Linha horizontal",
-"Insert\/edit image": "Inserir\/editar imagem",
-"Image description": "Inserir descri\u00e7\u00e3o",
-"Source": "Endere\u00e7o da imagem",
-"Dimensions": "Dimens\u00f5es",
-"Constrain proportions": "Manter propor\u00e7\u00f5es",
-"General": "Geral",
-"Advanced": "Avan\u00e7ado",
-"Style": "Estilo",
-"Vertical space": "Espa\u00e7amento vertical",
-"Horizontal space": "Espa\u00e7amento horizontal",
-"Border": "Borda",
-"Insert image": "Inserir imagem",
-"Image": "Imagem",
-"Image list": "Lista de Imagens",
-"Rotate counterclockwise": "Girar em sentido hor\u00e1rio",
-"Rotate clockwise": "Girar em sentido anti-hor\u00e1rio",
-"Flip vertically": "Virar verticalmente",
-"Flip horizontally": "Virar horizontalmente",
-"Edit image": "Editar imagem",
-"Image options": "Op\u00e7\u00f5es de Imagem",
-"Zoom in": "Aumentar zoom",
-"Zoom out": "Diminuir zoom",
-"Crop": "Cortar",
-"Resize": "Redimensionar",
-"Orientation": "Orienta\u00e7\u00e3o",
-"Brightness": "Brilho",
-"Sharpen": "Aumentar nitidez",
-"Contrast": "Contraste",
-"Color levels": "N\u00edveis de cor",
-"Gamma": "Gama",
-"Invert": "Inverter",
-"Apply": "Aplicar",
-"Back": "Voltar",
-"Insert date\/time": "Inserir data\/hora",
-"Date\/time": "data\/hora",
-"Insert link": "Inserir link",
-"Insert\/edit link": "Inserir\/editar link",
-"Text to display": "Texto para mostrar",
-"Url": "URL",
-"Target": "Alvo",
-"None": "Nenhum",
-"New window": "Nova janela",
-"Remove link": "Remover link",
-"Anchors": "\u00c2ncoras",
-"Link": "Link",
-"Paste or type a link": "Cole ou digite um Link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "A URL que voc\u00ea informou parece ser um link externo. Deseja incluir o prefixo http:\/\/?",
-"Link list": "Lista de Links",
-"Insert video": "Inserir v\u00eddeo",
-"Insert\/edit video": "Inserir\/editar v\u00eddeo",
-"Insert\/edit media": "Inserir\/editar imagem",
-"Alternative source": "Fonte alternativa",
-"Poster": "Autor",
-"Paste your embed code below:": "Insira o c\u00f3digo de incorpora\u00e7\u00e3o abaixo:",
-"Embed": "Incorporar",
-"Media": "imagem",
-"Nonbreaking space": "Espa\u00e7o n\u00e3o separ\u00e1vel",
-"Page break": "Quebra de p\u00e1gina",
-"Paste as text": "Colar como texto",
-"Preview": "Pr\u00e9-visualizar",
-"Print": "Imprimir",
-"Save": "Salvar",
-"Find": "Localizar",
-"Replace with": "Substituir por",
-"Replace": "Substituir",
-"Replace all": "Substituir tudo",
-"Prev": "Anterior",
-"Next": "Pr\u00f3ximo",
-"Find and replace": "Localizar e substituir",
-"Could not find the specified string.": "N\u00e3o foi poss\u00edvel encontrar o termo especificado",
-"Match case": "Diferenciar mai\u00fasculas e min\u00fasculas",
-"Whole words": "Palavras inteiras",
-"Spellcheck": "Corretor ortogr\u00e1fico",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar tudo",
-"Finish": "Finalizar",
-"Add to Dictionary": "Adicionar ao Dicion\u00e1rio",
-"Insert table": "Inserir tabela",
-"Table properties": "Propriedades da tabela",
-"Delete table": "Excluir tabela",
-"Cell": "C\u00e9lula",
-"Row": "Linha",
-"Column": "Coluna",
-"Cell properties": "Propriedades da c\u00e9lula",
-"Merge cells": "Agrupar c\u00e9lulas",
-"Split cell": "Dividir c\u00e9lula",
-"Insert row before": "Inserir linha antes",
-"Insert row after": "Inserir linha depois",
-"Delete row": "Excluir linha",
-"Row properties": "Propriedades da linha",
-"Cut row": "Recortar linha",
-"Copy row": "Copiar linha",
-"Paste row before": "Colar linha antes",
-"Paste row after": "Colar linha depois",
-"Insert column before": "Inserir coluna antes",
-"Insert column after": "Inserir coluna depois",
-"Delete column": "Excluir coluna",
-"Cols": "Colunas",
-"Rows": "Linhas",
-"Width": "Largura",
-"Height": "Altura",
-"Cell spacing": "Espa\u00e7amento da c\u00e9lula",
-"Cell padding": "Espa\u00e7amento interno da c\u00e9lula",
-"Caption": "Legenda",
-"Left": "Esquerdo",
-"Center": "Centro",
-"Right": "Direita",
-"Cell type": "Tipo de c\u00e9lula",
-"Scope": "Escopo",
-"Alignment": "Alinhamento",
-"H Align": "Alinhamento H",
-"V Align": "Alinhamento V",
-"Top": "Superior",
-"Middle": "Meio",
-"Bottom": "Inferior",
-"Header cell": "C\u00e9lula cabe\u00e7alho",
-"Row group": "Agrupar linha",
-"Column group": "Agrupar coluna",
-"Row type": "Tipo de linha",
-"Header": "Cabe\u00e7alho",
-"Body": "Corpo",
-"Footer": "Rodap\u00e9",
-"Border color": "Cor da borda",
-"Insert template": "Inserir modelo",
-"Templates": "Modelos",
-"Template": "Modelo",
-"Text color": "Cor do texto",
-"Background color": "Cor do fundo",
-"Custom...": "Personalizado...",
-"Custom color": "Cor personalizada",
-"No color": "Nenhuma cor",
-"Table of Contents": "\u00edndice de Conte\u00fado",
-"Show blocks": "Mostrar blocos",
-"Show invisible characters": "Exibir caracteres invis\u00edveis",
-"Words: {0}": "Palavras: {0}",
-"{0} words": "{0} palavras",
-"File": "Arquivo",
-"Edit": "Editar",
-"Insert": "Inserir",
-"View": "Visualizar",
-"Format": "Formatar",
-"Table": "Tabela",
-"Tools": "Ferramentas",
-"Powered by {0}": "Distribu\u00eddo por  {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c1rea de texto formatado. Pressione ALT-F9 para exibir o menu, ALT-F10 para exibir a barra de ferramentas ou ALT-0 para exibir a ajuda"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_PT.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_PT.js
deleted file mode 100644
index 0376e82429..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_PT.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('pt_PT',{
-"Redo": "Refazer",
-"Undo": "Desfazer",
-"Cut": "Cortar",
-"Copy": "Copiar",
-"Paste": "Colar",
-"Select all": "Selecionar tudo",
-"New document": "Novo documento",
-"Ok": "Ok",
-"Cancel": "Cancelar",
-"Visual aids": "Ajuda visual",
-"Bold": "Negrito",
-"Italic": "It\u00e1lico",
-"Underline": "Sublinhado",
-"Strikethrough": "Rasurado",
-"Superscript": "Superior \u00e0 linha",
-"Subscript": "Inferior \u00e0 linha",
-"Clear formatting": "Limpar formata\u00e7\u00e3o",
-"Align left": "Alinhar \u00e0 esquerda",
-"Align center": "Alinhar ao centro",
-"Align right": "Alinhar \u00e0 direita",
-"Justify": "Justificado",
-"Bullet list": "Lista com marcadores",
-"Numbered list": "Lista numerada",
-"Decrease indent": "Diminuir avan\u00e7o",
-"Increase indent": "Aumentar avan\u00e7o",
-"Close": "Fechar",
-"Formats": "Formatos",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "O seu navegador n\u00e3o suporta acesso direto \u00e0 \u00e1rea de transfer\u00eancia. Por favor use os atalhos Ctrl+X\/C\/V do seu teclado.",
-"Headers": "Cabe\u00e7alhos",
-"Header 1": "Cabe\u00e7alho 1",
-"Header 2": "Cabe\u00e7alho 2",
-"Header 3": "Cabe\u00e7alho 3",
-"Header 4": "Cabe\u00e7alho 4",
-"Header 5": "Cabe\u00e7alho 5",
-"Header 6": "Cabe\u00e7alho 6",
-"Headings": "T\u00edtulos",
-"Heading 1": "T\u00edtulo 1",
-"Heading 2": "T\u00edtulo 2",
-"Heading 3": "T\u00edtulo 3",
-"Heading 4": "T\u00edtulo 4",
-"Heading 5": "T\u00edtulo 5",
-"Heading 6": "T\u00edtulo 6",
-"Preformatted": "Pr\u00e9-formatado",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "C\u00f3digo",
-"Paragraph": "Par\u00e1grafo",
-"Blockquote": "Cita\u00e7\u00e3o em bloco",
-"Inline": "Na linha",
-"Blocks": "Blocos",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "O comando colar est\u00e1 em modo de texto simples. O conte\u00fado ser\u00e1 colado como texto simples at\u00e9 desativar esta op\u00e7\u00e3o.",
-"Font Family": "Fonte",
-"Font Sizes": "Tamanhos",
-"Class": "Classe",
-"Browse for an image": "Procurar por uma imagem",
-"OR": "Ou",
-"Drop an image here": "Solte uma imagem aqui",
-"Upload": "Carregar",
-"Block": "Bloco",
-"Align": "Alinhar",
-"Default": "Padr\u00e3o",
-"Circle": "C\u00edrculo",
-"Disc": "Disco",
-"Square": "Quadrado",
-"Lower Alpha": "a. b. c. ...",
-"Lower Greek": "\\u03b1. \\u03b2. \\u03b3. ...",
-"Lower Roman": "i. ii. iii. ...",
-"Upper Alpha": "A. B. C. ...",
-"Upper Roman": "I. II. III. ...",
-"Anchor": "\u00c2ncora",
-"Name": "Nome",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "O ID deve come\u00e7ar com uma letra, seguido apenas por letras, n\u00fameros, pontos, dois pontos, tra\u00e7os ou sobtra\u00e7os.",
-"You have unsaved changes are you sure you want to navigate away?": "Existem altera\u00e7\u00f5es que ainda n\u00e3o foram guardadas. Tem a certeza que pretende sair?",
-"Restore last draft": "Restaurar o \u00faltimo rascunho",
-"Special character": "Car\u00e1cter especial",
-"Source code": "C\u00f3digo fonte",
-"Insert\/Edit code sample": "Inserir\/editar amostra de c\u00f3digo",
-"Language": "Idioma",
-"Code sample": "Amostra de c\u00f3digo",
-"Color": "Cor",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Da esquerda para a direita",
-"Right to left": "Da direita para a esquerda",
-"Emoticons": "Emo\u00e7\u00f5es",
-"Document properties": "Propriedades do documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palavras-chave",
-"Description": "Descri\u00e7\u00e3o",
-"Robots": "Rob\u00f4s",
-"Author": "Autor",
-"Encoding": "Codifica\u00e7\u00e3o",
-"Fullscreen": "Ecr\u00e3 completo",
-"Action": "A\u00e7\u00e3o",
-"Shortcut": "Atalho",
-"Help": "Ajuda",
-"Address": "Endere\u00e7o",
-"Focus to menubar": "Foco na barra de menu",
-"Focus to toolbar": "Foco na barra de ferramentas",
-"Focus to element path": "Foco no caminho do elemento",
-"Focus to contextual toolbar": "Foco na barra de contexto",
-"Insert link (if link plugin activated)": "Inserir hiperliga\u00e7\u00e3o (se o plugin de liga\u00e7\u00f5es estiver ativado)",
-"Save (if save plugin activated)": "Guardar (se o plugin de guardar estiver ativado)",
-"Find (if searchreplace plugin activated)": "Pesquisar (se o plugin pesquisar e substituir estiver ativado)",
-"Plugins installed ({0}):": "Plugins instalados ({0}):",
-"Premium plugins:": "Plugins comerciais:",
-"Learn more...": "Saiba mais...",
-"You are using {0}": "Est\u00e1 a usar {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Atalhos \u00fateis",
-"Horizontal line": "Linha horizontal",
-"Insert\/edit image": "Inserir\/editar imagem",
-"Image description": "Descri\u00e7\u00e3o da imagem",
-"Source": "Localiza\u00e7\u00e3o",
-"Dimensions": "Dimens\u00f5es",
-"Constrain proportions": "Manter propor\u00e7\u00f5es",
-"General": "Geral",
-"Advanced": "Avan\u00e7ado",
-"Style": "Estilo",
-"Vertical space": "Espa\u00e7amento vertical",
-"Horizontal space": "Espa\u00e7amento horizontal",
-"Border": "Contorno",
-"Insert image": "Inserir imagem",
-"Image": "Imagem",
-"Image list": "Lista de imagens",
-"Rotate counterclockwise": "Rota\u00e7\u00e3o anti-hor\u00e1ria",
-"Rotate clockwise": "Rota\u00e7\u00e3o hor\u00e1ria",
-"Flip vertically": "Inverter verticalmente",
-"Flip horizontally": "Inverter horizontalmente",
-"Edit image": "Editar imagem",
-"Image options": "Op\u00e7\u00f5es de imagem",
-"Zoom in": "Mais zoom",
-"Zoom out": "Menos zoom",
-"Crop": "Recortar",
-"Resize": "Redimensionar",
-"Orientation": "Orienta\u00e7\u00e3o",
-"Brightness": "Brilho",
-"Sharpen": "Mais nitidez",
-"Contrast": "Contraste",
-"Color levels": "N\u00edveis de cor",
-"Gamma": "Gama",
-"Invert": "Inverter",
-"Apply": "Aplicar",
-"Back": "Voltar",
-"Insert date\/time": "Inserir data\/hora",
-"Date\/time": "Data\/hora",
-"Insert link": "Inserir liga\u00e7\u00e3o",
-"Insert\/edit link": "Inserir\/editar liga\u00e7\u00e3o",
-"Text to display": "Texto a exibir",
-"Url": "URL",
-"Target": "Alvo",
-"None": "Nenhum",
-"New window": "Nova janela",
-"Remove link": "Remover liga\u00e7\u00e3o",
-"Anchors": "\u00c2ncora",
-"Link": "Liga\u00e7\u00e3o",
-"Paste or type a link": "Copiar ou escrever uma hiperliga\u00e7\u00e3o",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "O URL que indicou parece ser um endere\u00e7o de email. Quer adicionar o prefixo mailto: tal como necess\u00e1rio?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "O URL que indicou parece ser um endere\u00e7o web. Quer adicionar o prefixo http:\/\/ tal como necess\u00e1rio?",
-"Link list": "Lista de liga\u00e7\u00f5es",
-"Insert video": "Inserir v\u00eddeo",
-"Insert\/edit video": "Inserir\/editar v\u00eddeo",
-"Insert\/edit media": "Inserir\/editar media",
-"Alternative source": "Localiza\u00e7\u00e3o alternativa",
-"Poster": "Autor",
-"Paste your embed code below:": "Colar c\u00f3digo para embeber:",
-"Embed": "Embeber",
-"Media": "Media",
-"Nonbreaking space": "Espa\u00e7o n\u00e3o quebr\u00e1vel",
-"Page break": "Quebra de p\u00e1gina",
-"Paste as text": "Colar como texto",
-"Preview": "Pr\u00e9-visualizar",
-"Print": "Imprimir",
-"Save": "Guardar",
-"Find": "Pesquisar",
-"Replace with": "Substituir por",
-"Replace": "Substituir",
-"Replace all": "Substituir tudo",
-"Prev": "Anterior",
-"Next": "Pr\u00f3ximo",
-"Find and replace": "Pesquisar e substituir",
-"Could not find the specified string.": "N\u00e3o foi poss\u00edvel localizar o termo especificado.",
-"Match case": "Diferenciar mai\u00fasculas e min\u00fasculas",
-"Whole words": "Palavras completas",
-"Spellcheck": "Corretor ortogr\u00e1fico",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar tudo",
-"Finish": "Concluir",
-"Add to Dictionary": "Adicionar ao dicion\u00e1rio",
-"Insert table": "Inserir tabela",
-"Table properties": "Propriedades da tabela",
-"Delete table": "Eliminar tabela",
-"Cell": "C\u00e9lula",
-"Row": "Linha",
-"Column": "Coluna",
-"Cell properties": "Propriedades da c\u00e9lula",
-"Merge cells": "Unir c\u00e9lulas",
-"Split cell": "Dividir c\u00e9lula",
-"Insert row before": "Inserir linha antes",
-"Insert row after": "Inserir linha depois",
-"Delete row": "Eliminar linha",
-"Row properties": "Propriedades da linha",
-"Cut row": "Cortar linha",
-"Copy row": "Copiar linha",
-"Paste row before": "Colar linha antes",
-"Paste row after": "Colar linha depois",
-"Insert column before": "Inserir coluna antes",
-"Insert column after": "Inserir coluna depois",
-"Delete column": "Eliminar coluna",
-"Cols": "Colunas",
-"Rows": "Linhas",
-"Width": "Largura",
-"Height": "Altura",
-"Cell spacing": "Espa\u00e7amento entre c\u00e9lulas",
-"Cell padding": "Espa\u00e7amento interno da c\u00e9lula",
-"Caption": "Legenda",
-"Left": "Esquerda",
-"Center": "Centro",
-"Right": "Direita",
-"Cell type": "Tipo de c\u00e9lula",
-"Scope": "Escopo",
-"Alignment": "Alinhamento",
-"H Align": "Alinhamento H",
-"V Align": "Alinhamento V",
-"Top": "Superior",
-"Middle": "Meio",
-"Bottom": "Inferior",
-"Header cell": "C\u00e9lula de cabe\u00e7alho",
-"Row group": "Agrupar linha",
-"Column group": "Agrupar coluna",
-"Row type": "Tipo de linha",
-"Header": "Cabe\u00e7alho",
-"Body": "Corpo",
-"Footer": "Rodap\u00e9",
-"Border color": "Cor de contorno",
-"Insert template": "Inserir modelo",
-"Templates": "Modelos",
-"Template": "Tema",
-"Text color": "Cor do texto",
-"Background color": "Cor de fundo",
-"Custom...": "Personalizada...",
-"Custom color": "Cor personalizada",
-"No color": "Sem cor",
-"Table of Contents": "\u00cdndice",
-"Show blocks": "Mostrar blocos",
-"Show invisible characters": "Mostrar caracteres invis\u00edveis",
-"Words: {0}": "Palavras: {0}",
-"{0} words": "{0} palavras",
-"File": "Ficheiro",
-"Edit": "Editar",
-"Insert": "Inserir",
-"View": "Ver",
-"Format": "Formatar",
-"Table": "Tabela",
-"Tools": "Ferramentas",
-"Powered by {0}": "Criado em {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Caixa de texto formatado. Pressione ALT-F9 para exibir o menu. Pressione ALT-F10 para exibir a barra de ferramentas. Pressione ALT-0 para exibir a ajuda"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ro.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ro.js
deleted file mode 100644
index a2f3caec80..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ro.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('ro',{
-"Cut": "Taie",
-"Heading 5": "Titlu 5",
-"Header 2": "Antet 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Browser-ul dumneavoastr\u0103 nu support\u0103 acces direct la clipboard. Folosi\u0163i combina\u0163ile de tastatur\u0103 Ctrl+X\/C\/V.",
-"Heading 4": "Titlu 4",
-"Div": "Div",
-"Heading 2": "Titlu 2",
-"Paste": "Insereaz\u0103",
-"Close": "\u00cenchide",
-"Font Family": "Familie font",
-"Pre": "Pre",
-"Align right": "Aliniere la dreapta",
-"New document": "Document nou",
-"Blockquote": "Citat",
-"Numbered list": "List\u0103 ordonat\u0103",
-"Heading 1": "Titlu 1",
-"Headings": "Titluri",
-"Increase indent": "Indenteaz\u0103",
-"Formats": "Formate",
-"Headers": "Antete",
-"Select all": "Selecteaz\u0103 tot",
-"Header 3": "Antet 3",
-"Blocks": "Blocuri",
-"Undo": "Ref\u0103 la loc",
-"Strikethrough": "T\u0103iat",
-"Bullet list": "List\u0103 neordonat\u0103",
-"Header 1": "Antet 1",
-"Superscript": "Superscript",
-"Clear formatting": "\u015eterge format\u0103rile",
-"Font Sizes": "Dimensiuni font",
-"Subscript": "Subscript",
-"Header 6": "Antet 6",
-"Redo": "Execut\u0103 din nou",
-"Paragraph": "Paragraf",
-"Ok": "Ok",
-"Bold": "\u00cengro\u015fat",
-"Code": "Cod",
-"Italic": "Italic",
-"Align center": "Centrare",
-"Header 5": "Antet 5",
-"Heading 6": "Titlu 6",
-"Heading 3": "Titlu 3",
-"Decrease indent": "De-indenteaz\u0103",
-"Header 4": "Antet 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Functia \"lipe\u015fte\" este acum \u00een modul text simplu. Continutul va fi acum inserat ca text simplu p\u00e2n\u0103 c\u00e2nd aceast\u0103 op\u021biune va fi dezactivat.",
-"Underline": "Subliniat",
-"Cancel": "Anuleaz\u0103",
-"Justify": "Aliniere pe toat\u0103 l\u0103\u021bimea",
-"Inline": "Inline",
-"Copy": "Copiaz\u0103",
-"Align left": "Aliniere la st\u00e2nga",
-"Visual aids": "Ajutor vizual",
-"Lower Greek": "Minuscule Grecesti",
-"Square": "P\u0103trat",
-"Default": "Implicit",
-"Lower Alpha": "Minuscule Alfanumerice",
-"Circle": "Cerc",
-"Disc": "Disc",
-"Upper Alpha": "Majuscule Alfanumerice",
-"Upper Roman": "Majuscule Romane",
-"Lower Roman": "Minuscule Romane",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id-ul trebuie s\u0103 inceap\u0103 cu o liter\u0103, urmat\u0103 exclusiv de litere, numere, cratime, puncte, punct \u0219i virgul\u0103 sau underscore-uri.",
-"Name": "Nume",
-"Anchor": "Ancor\u0103",
-"Id": "Id",
-"You have unsaved changes are you sure you want to navigate away?": "Ave\u021bi modific\u0103ri nesalvate! Sunte\u0163i sigur c\u0103 dori\u0163i s\u0103 ie\u015fiti?",
-"Restore last draft": "Restaurare la ultima salvare",
-"Special character": "Caractere speciale",
-"Source code": "Codul surs\u0103",
-"Language": "Limba",
-"Insert\/Edit code sample": "Inserare\/Editare mostr\u0103 cod",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Culoare",
-"Right to left": "Dreapta la st\u00e2nga",
-"Left to right": "St\u00e2nga la dreapta",
-"Emoticons": "Emoticoane",
-"Robots": "Robo\u021bi",
-"Document properties": "Propriet\u0103\u021bi document",
-"Title": "Titlu",
-"Keywords": "Cuvinte cheie",
-"Encoding": "Codare",
-"Description": "Descriere",
-"Author": "Autor",
-"Fullscreen": "Pe tot ecranul",
-"Horizontal line": "Linie orizontal\u0103",
-"Horizontal space": "Spa\u021biul orizontal",
-"Insert\/edit image": "Inserare\/editarea imaginilor",
-"General": "General",
-"Advanced": "Avansat",
-"Source": "Surs\u0103",
-"Border": "Bordur\u0103",
-"Constrain proportions": "Constr\u00e2nge propor\u021biile",
-"Vertical space": "Spa\u021biul vertical",
-"Image description": "Descrierea imaginii",
-"Style": "Stil",
-"Dimensions": "Dimensiuni",
-"Insert image": "Inserare imagine",
-"Image": "Imagine",
-"Zoom in": "M\u0103rire",
-"Contrast": "Contrast",
-"Back": "\u00cenapoi",
-"Gamma": "Gamma",
-"Flip horizontally": "R\u0103sturn\u0103 orizontal",
-"Resize": "Redimensionare",
-"Sharpen": "Accentuare",
-"Zoom out": "Mic\u015forare",
-"Image options": "Op\u021biuni imagine",
-"Apply": "Salveaz\u0103",
-"Brightness": "Str\u0103lucire",
-"Rotate clockwise": "Rotire \u00een sensul orar",
-"Rotate counterclockwise": "Rotire \u00een sensul antiorar",
-"Edit image": "Editare imagine",
-"Color levels": "Niveluri de culoare",
-"Crop": "Decupare",
-"Orientation": "Orientare",
-"Flip vertically": "R\u0103sturn\u0103 vertical",
-"Invert": "Invers\u0103",
-"Date\/time": "Data\/ora",
-"Insert date\/time": "Insereaz\u0103 data\/ora",
-"Remove link": "\u0218terge link-ul",
-"Url": "URL",
-"Text to display": "Text de afi\u0219at",
-"Anchors": "Ancor\u0103",
-"Insert link": "Inserare link",
-"Link": "Link",
-"New window": "Fereastr\u0103 nou\u0103",
-"None": "Nici unul",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL-ul introdus pare s\u0103 fie o adres\u0103 web. Dori\u021bi s\u0103 ad\u0103uga\u021bi prefixul http:\/\/ ?",
-"Paste or type a link": "Introduce\u021bi un link",
-"Target": "\u021aint\u0103",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL-ul introdus pare s\u0103 fie o adres\u0103 de e-mail. Dori\u021bi s\u0103 ad\u0103uga\u021bi prefixul mailto: ?",
-"Insert\/edit link": "Inserare\/editare link",
-"Insert\/edit video": "Inserare\/editare video",
-"Media": "Media",
-"Alternative source": "Surs\u0103 alternativ\u0103",
-"Paste your embed code below:": "Insera\u021bi codul:",
-"Insert video": "Inserare video",
-"Poster": "Poster",
-"Insert\/edit media": "Inserare\/editare media",
-"Embed": "Embed",
-"Nonbreaking space": "Spa\u021biu neseparator",
-"Page break": "\u00centrerupere de pagin\u0103",
-"Paste as text": "Lipe\u015fte ca text",
-"Preview": "Previzualizare",
-"Print": "Tip\u0103re\u0219te",
-"Save": "Salveaz\u0103",
-"Could not find the specified string.": "Nu am putut g\u0103si \u0219irul specificat.",
-"Replace": "\u00cenlocuie\u015fte",
-"Next": "Precedent",
-"Whole words": "Doar cuv\u00eentul \u00eentreg",
-"Find and replace": "Caut\u0103 \u015fi \u00eenlocuie\u015fte",
-"Replace with": "\u00cenlocuie\u015fte cu",
-"Find": "Caut\u0103",
-"Replace all": "\u00cenlocuie\u015fte toate",
-"Match case": "Distinge majuscule\/minuscule",
-"Prev": "Anterior",
-"Spellcheck": "Verificarea ortografic\u0103",
-"Finish": "Finalizeaz\u0103",
-"Ignore all": "Ignor\u0103 toate",
-"Ignore": "Ignor\u0103",
-"Add to Dictionary": "Adaug\u0103 \u00een Dic\u021bionar",
-"Insert row before": "Insereaz\u0103 \u00eenainte de linie",
-"Rows": "Linii",
-"Height": "\u00cen\u0103l\u0163ime",
-"Paste row after": "Lipe\u015fte linie dup\u0103",
-"Alignment": "Aliniament",
-"Border color": "Culoare bordur\u0103",
-"Column group": "Grup de coloane",
-"Row": "Linie",
-"Insert column before": "Insereaza \u00eenainte de coloan\u0103",
-"Split cell": "\u00cemp\u0103r\u021birea celulelor",
-"Cell padding": "Spa\u021biere",
-"Cell spacing": "Spa\u021biere celule",
-"Row type": "Tip de linie",
-"Insert table": "Insereaz\u0103 tabel\u0103",
-"Body": "Corp",
-"Caption": "Titlu",
-"Footer": "Subsol",
-"Delete row": "\u0218terge linia",
-"Paste row before": "Lipe\u015fte \u00eenainte de linie",
-"Scope": "Domeniu",
-"Delete table": "\u0218terge tabel\u0103",
-"H Align": "Aliniere H",
-"Top": "Sus",
-"Header cell": "Antet celul\u0103",
-"Column": "Coloan\u0103",
-"Row group": "Grup de linii",
-"Cell": "Celul\u0103",
-"Middle": "Mijloc",
-"Cell type": "Tip celul\u0103",
-"Copy row": "Copiaz\u0103 linie",
-"Row properties": "Propriet\u0103\u021bi linie",
-"Table properties": "Propriet\u0103\u021bi tabel\u0103",
-"Bottom": "Jos",
-"V Align": "Aliniere V",
-"Header": "Antet",
-"Right": "Dreapta",
-"Insert column after": "Insereaza dup\u0103 coloan\u0103",
-"Cols": "Coloane",
-"Insert row after": "Insereaz\u0103 dup\u0103 linie",
-"Width": "L\u0103\u0163ime",
-"Cell properties": "Propriet\u0103\u021bi celul\u0103",
-"Left": "St\u00e2nga",
-"Cut row": "Taie linie",
-"Delete column": "\u0218terge coloana",
-"Center": "Centru",
-"Merge cells": "\u00cembinarea celulelor",
-"Insert template": "Insereaz\u0103 \u0219ablon",
-"Templates": "\u015eabloane",
-"Background color": "Culoare fundal",
-"Custom...": "Personalizat...",
-"Custom color": "Culoare personalizat\u0103",
-"No color": "F\u0103r\u0103 culoare",
-"Text color": "Culoare text",
-"Table of Contents": "Cuprins",
-"Show blocks": "Afi\u0219are blocuri",
-"Show invisible characters": "Afi\u0219are caractere invizibile",
-"Words: {0}": "Cuvinte: {0}",
-"Insert": "Insereaz\u0103",
-"File": "Fil\u0103",
-"Edit": "Editeaz\u0103",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zon\u0103 cu Rich Text. Apas\u0103 ALT-F9 pentru meniu. Apas\u0103 ALT-F10 pentru bara de unelte. Apas\u0103 ALT-0 pentru ajutor",
-"Tools": "Unelte",
-"View": "Vezi",
-"Table": "Tabel\u0103",
-"Format": "Formateaz\u0103"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ru.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ru.js
deleted file mode 100644
index dfae77d955..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ru.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('ru',{
-"Redo": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c",
-"Undo": "\u0412\u0435\u0440\u043d\u0443\u0442\u044c",
-"Cut": "\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c",
-"Copy": "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
-"Paste": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c",
-"Select all": "\u0412\u044b\u0434\u0435\u043b\u0438\u0442\u044c \u0432\u0441\u0435",
-"New document": "\u041d\u043e\u0432\u044b\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Ok": "\u041e\u043a",
-"Cancel": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c",
-"Visual aids": "\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u043a\u043e\u043d\u0442\u0443\u0440\u044b",
-"Bold": "\u041f\u043e\u043b\u0443\u0436\u0438\u0440\u043d\u044b\u0439",
-"Italic": "\u041a\u0443\u0440\u0441\u0438\u0432",
-"Underline": "\u041f\u043e\u0434\u0447\u0435\u0440\u043a\u043d\u0443\u0442\u044b\u0439",
-"Strikethrough": "\u0417\u0430\u0447\u0435\u0440\u043a\u043d\u0443\u0442\u044b\u0439",
-"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0438\u0439 \u0438\u043d\u0434\u0435\u043a\u0441",
-"Subscript": "\u041d\u0438\u0436\u043d\u0438\u0439 \u0438\u043d\u0434\u0435\u043a\u0441",
-"Clear formatting": "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u0444\u043e\u0440\u043c\u0430\u0442",
-"Align left": "\u041f\u043e \u043b\u0435\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Align center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Align right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Justify": "\u041f\u043e \u0448\u0438\u0440\u0438\u043d\u0435",
-"Bullet list": "\u041c\u0430\u0440\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Numbered list": "\u041d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Decrease indent": "\u0423\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c \u043e\u0442\u0441\u0442\u0443\u043f",
-"Increase indent": "\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c \u043e\u0442\u0441\u0442\u0443\u043f",
-"Close": "\u0417\u0430\u043a\u0440\u044b\u0442\u044c",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u043f\u0440\u044f\u043c\u043e\u0439 \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u0431\u0443\u0444\u0435\u0440\u0443 \u043e\u0431\u043c\u0435\u043d\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u0441\u043e\u0447\u0435\u0442\u0430\u043d\u0438\u044f \u043a\u043b\u0430\u0432\u0438\u0448: Ctrl+X\/C\/V.",
-"Headers": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
-"Header 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
-"Header 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
-"Header 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
-"Header 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
-"Header 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
-"Header 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-"Headings": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
-"Heading 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
-"Heading 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
-"Heading 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
-"Heading 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
-"Heading 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
-"Heading 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-"Preformatted": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435",
-"Div": "\u0411\u043b\u043e\u043a",
-"Pre": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435",
-"Code": "\u041a\u043e\u0434",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Blockquote": "\u0426\u0438\u0442\u0430\u0442\u0430",
-"Inline": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0435",
-"Blocks": "\u0411\u043b\u043e\u043a\u0438",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0412\u0441\u0442\u0430\u0432\u043a\u0430 \u043e\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0432 \u0432\u0438\u0434\u0435 \u043f\u0440\u043e\u0441\u0442\u043e\u0433\u043e \u0442\u0435\u043a\u0441\u0442\u0430, \u043f\u043e\u043a\u0430 \u043d\u0435 \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u0443\u044e \u043e\u043f\u0446\u0438\u044e.",
-"Font Family": "\u0428\u0440\u0438\u0444\u0442",
-"Font Sizes": "\u0420\u0430\u0437\u043c\u0435\u0440 \u0448\u0440\u0438\u0444\u0442\u0430",
-"Class": "\u041a\u043b\u0430\u0441\u0441",
-"Browse for an image": "\u0412\u044b\u0431\u043e\u0440 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
-"OR": "\u0418\u041b\u0418",
-"Drop an image here": "\u041f\u0435\u0440\u0435\u0442\u0430\u0449\u0438\u0442\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0441\u044e\u0434\u0430",
-"Upload": "\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c",
-"Block": "\u0411\u043b\u043e\u043a",
-"Align": "\u0412\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
-"Default": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b\u0439",
-"Circle": "\u041e\u043a\u0440\u0443\u0436\u043d\u043e\u0441\u0442\u0438",
-"Disc": "\u041a\u0440\u0443\u0433\u0438",
-"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u044b",
-"Lower Alpha": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0435 \u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438\u0435 \u0431\u0443\u043a\u0432\u044b",
-"Lower Greek": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0435 \u0433\u0440\u0435\u0447\u0435\u0441\u043a\u0438\u0435 \u0431\u0443\u043a\u0432\u044b",
-"Lower Roman": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0435 \u0440\u0438\u043c\u0441\u043a\u0438\u0435 \u0446\u0438\u0444\u0440\u044b",
-"Upper Alpha": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u044b\u0435 \u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438\u0435 \u0431\u0443\u043a\u0432\u044b",
-"Upper Roman": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u044b\u0435 \u0440\u0438\u043c\u0441\u043a\u0438\u0435 \u0446\u0438\u0444\u0440\u044b",
-"Anchor": "\u042f\u043a\u043e\u0440\u044c",
-"Name": "\u0418\u043c\u044f",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0434\u043e\u043b\u0436\u0435\u043d \u043d\u0430\u0447\u0438\u043d\u0430\u0442\u044c\u0441\u044f \u0441 \u0431\u0443\u043a\u0432\u044b, \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0441 \u0431\u0443\u043a\u0432\u044b, \u0446\u0438\u0444\u0440\u044b, \u0442\u0438\u0440\u0435, \u0442\u043e\u0447\u043a\u0438, \u0434\u0432\u043e\u0435\u0442\u043e\u0447\u0438\u044f \u0438\u043b\u0438 \u043f\u043e\u0434\u0447\u0435\u0440\u043a\u0438\u0432\u0430\u043d\u0438\u044f.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c \u043d\u0435 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f. \u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0439\u0442\u0438?",
-"Restore last draft": "\u0412\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0430",
-"Special character": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b",
-"Source code": "\u0418\u0441\u0445\u043e\u0434\u043d\u044b\u0439 \u043a\u043e\u0434",
-"Insert\/Edit code sample": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c\/\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0440\u0438\u043c\u0435\u0440 \u043a\u043e\u0434\u0430",
-"Language": "\u042f\u0437\u044b\u043a",
-"Code sample": "\u041f\u0440\u0438\u043c\u0435\u0440 \u043a\u043e\u0434\u0430",
-"Color": "\u0426\u0432\u0435\u0442",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u041d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043b\u0435\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043e",
-"Right to left": "\u041d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0435\u0432\u043e",
-"Emoticons": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u043c\u0430\u0439\u043b",
-"Document properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Keywords": "\u041a\u043b\u044e\u0447\u0438\u0432\u044b\u0435 \u0441\u043b\u043e\u0432\u0430",
-"Description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u044b",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Encoding": "\u041a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0430",
-"Fullscreen": "\u041f\u043e\u043b\u043d\u043e\u044d\u043a\u0440\u0430\u043d\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c",
-"Action": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435",
-"Shortcut": "\u042f\u0440\u043b\u044b\u043a",
-"Help": "\u041f\u043e\u043c\u043e\u0449\u044c",
-"Address": "\u0410\u0434\u0440\u0435\u0441",
-"Focus to menubar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043f\u0430\u043d\u0435\u043b\u0438 \u043c\u0435\u043d\u044e",
-"Focus to toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043f\u0430\u043d\u0435\u043b\u0438 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432",
-"Focus to element path": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0435 \u043f\u0443\u0442\u0438",
-"Focus to contextual toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u043d\u043e\u0439 \u043f\u0430\u043d\u0435\u043b\u0438 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432",
-"Insert link (if link plugin activated)": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443 (\u0435\u0441\u043b\u0438 \u043f\u043b\u0430\u0433\u0438\u043d link \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d)",
-"Save (if save plugin activated)": "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c (\u0435\u0441\u043b\u0438 \u043f\u043b\u0430\u0433\u0438\u043d save \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d)",
-"Find (if searchreplace plugin activated)": "\u041d\u0430\u0439\u0442\u0438 (\u0435\u0441\u043b\u0438 \u043f\u043b\u0430\u0433\u0438\u043d searchreplace \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d)",
-"Plugins installed ({0}):": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044b\u0435 \u043f\u043b\u0430\u0433\u0438\u043d\u044b ({0}):",
-"Premium plugins:": "\u041f\u0440\u0435\u043c\u0438\u0443\u043c \u043f\u043b\u0430\u0433\u0438\u043d\u044b:",
-"Learn more...": "\u0423\u0437\u043d\u0430\u0442\u044c \u0431\u043e\u043b\u044c\u0448\u0435...",
-"You are using {0}": "\u0412\u044b \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0435 {0}",
-"Plugins": "\u041f\u043b\u0430\u0433\u0438\u043d\u044b",
-"Handy Shortcuts": "\u0413\u043e\u0440\u044f\u0447\u0438\u0435 \u043a\u043b\u0430\u0432\u0438\u0448\u0438",
-"Horizontal line": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0430\u044f \u043b\u0438\u043d\u0438\u044f",
-"Insert\/edit image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"Image description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
-"Source": "\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a",
-"Dimensions": "\u0420\u0430\u0437\u043c\u0435\u0440",
-"Constrain proportions": "\u0421\u043e\u0445\u0440\u0430\u043d\u044f\u0442\u044c \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438",
-"General": "\u041e\u0431\u0449\u0435\u0435",
-"Advanced": "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u0435",
-"Style": "\u0421\u0442\u0438\u043b\u044c",
-"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Horizontal space": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u044b\u0439 \u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Border": "\u0420\u0430\u043c\u043a\u0430",
-"Insert image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"Image": "\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
-"Image list": "\u0421\u043f\u0438\u0441\u043e\u043a \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0439",
-"Rotate counterclockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u044c \u043f\u0440\u043e\u0442\u0438\u0432 \u0447\u0430\u0441\u043e\u0432\u043e\u0439 \u0441\u0442\u0440\u0435\u043b\u043a\u0438",
-"Rotate clockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u044c \u043f\u043e \u0447\u0430\u0441\u043e\u0432\u043e\u0439 \u0441\u0442\u0440\u0435\u043b\u043a\u0435",
-"Flip vertically": "\u041e\u0442\u0440\u0430\u0437\u0438\u0442\u044c \u043f\u043e \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0438",
-"Flip horizontally": "\u041e\u0442\u0440\u0430\u0437\u0438\u0442\u044c \u043f\u043e \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u0438",
-"Edit image": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"Image options": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
-"Zoom in": "\u041f\u0440\u0438\u0431\u043b\u0438\u0437\u0438\u0442\u044c",
-"Zoom out": "\u041e\u0442\u0434\u0430\u043b\u0438\u0442\u044c",
-"Crop": "\u041e\u0431\u0440\u0435\u0437\u0430\u0442\u044c",
-"Resize": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0430\u0437\u043c\u0435\u0440",
-"Orientation": "\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f",
-"Brightness": "\u042f\u0440\u043a\u043e\u0441\u0442\u044c",
-"Sharpen": "\u0427\u0435\u0442\u043a\u043e\u0441\u0442\u044c",
-"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
-"Color levels": "\u0426\u0432\u0435\u0442\u043e\u0432\u044b\u0435 \u0443\u0440\u043e\u0432\u043d\u0438",
-"Gamma": "\u0413\u0430\u043c\u043c\u0430",
-"Invert": "\u0418\u043d\u0432\u0435\u0440\u0441\u0438\u044f",
-"Apply": "\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c",
-"Back": "\u041d\u0430\u0437\u0430\u0434",
-"Insert date\/time": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0434\u0430\u0442\u0443\/\u0432\u0440\u0435\u043c\u044f",
-"Date\/time": "\u0414\u0430\u0442\u0430\/\u0432\u0440\u0435\u043c\u044f",
-"Insert link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
-"Insert\/edit link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
-"Text to display": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u044b\u0439 \u0442\u0435\u043a\u0441\u0442",
-"Url": "\u0410\u0434\u0440\u0435\u0441 \u0441\u0441\u044b\u043b\u043a\u0438",
-"Target": "\u041e\u0442\u043a\u0440\u044b\u0432\u0430\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
-"None": "\u041d\u0435\u0442",
-"New window": "\u0412 \u043d\u043e\u0432\u043e\u043c \u043e\u043a\u043d\u0435",
-"Remove link": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
-"Anchors": "\u042f\u043a\u043e\u0440\u044f",
-"Link": "\u0421\u0441\u044b\u043b\u043a\u0430",
-"Paste or type a link": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043b\u0438 \u0432\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u0441\u0441\u044b\u043b\u043a\u0443",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0412\u0432\u0435\u0434\u0451\u043d\u043d\u044b\u0439 URL \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u043c \u0430\u0434\u0440\u0435\u0441\u043e\u043c \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b. \u0412\u044b \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u00abmailto:\u00bb?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0412\u0432\u0435\u0434\u0451\u043d\u043d\u044b\u0439 URL \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0432\u043d\u0435\u0448\u043d\u0435\u0439 \u0441\u0441\u044b\u043b\u043a\u043e\u0439. \u0412\u044b \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u00abhttp:\/\/\u00bb?",
-"Link list": "\u0421\u043f\u0438\u0441\u043e\u043a \u0441\u0441\u044b\u043b\u043e\u043a",
-"Insert video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0432\u0438\u0434\u0435\u043e",
-"Insert\/edit video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0438\u0434\u0435\u043e",
-"Insert\/edit media": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0438\u0434\u0435\u043e",
-"Alternative source": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a",
-"Poster": "\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"Paste your embed code below:": "\u0412\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0438\u0436\u0435:",
-"Embed": "\u041a\u043e\u0434 \u0434\u043b\u044f \u0432\u0441\u0442\u0430\u0432\u043a\u0438",
-"Media": "\u0412\u0438\u0434\u0435\u043e",
-"Nonbreaking space": "\u041d\u0435\u0440\u0430\u0437\u0440\u044b\u0432\u043d\u044b\u0439 \u043f\u0440\u043e\u0431\u0435\u043b",
-"Page break": "\u0420\u0430\u0437\u0440\u044b\u0432 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b",
-"Paste as text": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043a\u0430\u043a \u0442\u0435\u043a\u0441\u0442",
-"Preview": "\u041f\u0440\u0435\u0434\u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440",
-"Print": "\u041f\u0435\u0447\u0430\u0442\u044c",
-"Save": "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c",
-"Find": "\u041d\u0430\u0439\u0442\u0438",
-"Replace with": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u043d\u0430",
-"Replace": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c",
-"Replace all": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0441\u0435",
-"Prev": "\u0412\u0432\u0435\u0440\u0445",
-"Next": "\u0412\u043d\u0438\u0437",
-"Find and replace": "\u041f\u043e\u0438\u0441\u043a \u0438 \u0437\u0430\u043c\u0435\u043d\u0430",
-"Could not find the specified string.": "\u0417\u0430\u0434\u0430\u043d\u043d\u0430\u044f \u0441\u0442\u0440\u043e\u043a\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430",
-"Match case": "\u0423\u0447\u0438\u0442\u044b\u0432\u0430\u0442\u044c \u0440\u0435\u0433\u0438\u0441\u0442\u0440",
-"Whole words": "\u0421\u043b\u043e\u0432\u043e \u0446\u0435\u043b\u0438\u043a\u043e\u043c",
-"Spellcheck": "\u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
-"Ignore": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
-"Ignore all": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0441\u0435",
-"Finish": "\u0417\u0430\u043a\u043e\u043d\u0447\u0438\u0442\u044c",
-"Add to Dictionary": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0441\u043b\u043e\u0432\u0430\u0440\u044c",
-"Insert table": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0442\u0430\u0431\u043b\u0438\u0446\u0443",
-"Table properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u044b",
-"Delete table": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0430\u0431\u043b\u0438\u0446\u0443",
-"Cell": "\u042f\u0447\u0435\u0439\u043a\u0430",
-"Row": "\u0421\u0442\u0440\u043e\u043a\u0430",
-"Column": "\u0421\u0442\u043e\u043b\u0431\u0435\u0446",
-"Cell properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u044f\u0447\u0435\u0439\u043a\u0438",
-"Merge cells": "\u041e\u0431\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c \u044f\u0447\u0435\u0439\u043a\u0438",
-"Split cell": "\u0420\u0430\u0437\u0431\u0438\u0442\u044c \u044f\u0447\u0435\u0439\u043a\u0443",
-"Insert row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043f\u0443\u0441\u0442\u0443\u044e \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u0432\u0435\u0440\u0445\u0443",
-"Insert row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043f\u0443\u0441\u0442\u0443\u044e \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u043d\u0438\u0437\u0443",
-"Delete row": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443",
-"Row properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0441\u0442\u0440\u043e\u043a\u0438",
-"Cut row": "\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443",
-"Copy row": "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443",
-"Paste row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u0432\u0435\u0440\u0445\u0443",
-"Paste row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u043d\u0438\u0437\u0443",
-"Insert column before": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u043e\u043b\u0431\u0435\u0446 \u0441\u043b\u0435\u0432\u0430",
-"Insert column after": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u043e\u043b\u0431\u0435\u0446 \u0441\u043f\u0440\u0430\u0432\u0430",
-"Delete column": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0442\u043e\u043b\u0431\u0435\u0446",
-"Cols": "\u0421\u0442\u043e\u043b\u0431\u0446\u044b",
-"Rows": "\u0421\u0442\u0440\u043e\u043a\u0438",
-"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
-"Height": "\u0412\u044b\u0441\u043e\u0442\u0430",
-"Cell spacing": "\u0412\u043d\u0435\u0448\u043d\u0438\u0439 \u043e\u0442\u0441\u0442\u0443\u043f",
-"Cell padding": "\u0412\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u0438\u0439 \u043e\u0442\u0441\u0442\u0443\u043f",
-"Caption": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Left": "\u041f\u043e \u043b\u0435\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Cell type": "\u0422\u0438\u043f \u044f\u0447\u0435\u0439\u043a\u0438",
-"Scope": "Scope",
-"Alignment": "\u0412\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
-"H Align": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
-"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
-"Top": "\u041f\u043e \u0432\u0435\u0440\u0445\u0443",
-"Middle": "\u041f\u043e \u0441\u0435\u0440\u0435\u0434\u0438\u043d\u0435",
-"Bottom": "\u041f\u043e \u043d\u0438\u0437\u0443",
-"Header cell": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Row group": "\u0413\u0440\u0443\u043f\u043f\u0430 \u0441\u0442\u0440\u043e\u043a",
-"Column group": "\u0413\u0440\u0443\u043f\u043f\u0430 \u043a\u043e\u043b\u043e\u043d\u043e\u043a",
-"Row type": "\u0422\u0438\u043f \u0441\u0442\u0440\u043e\u043a\u0438",
-"Header": "\u0428\u0430\u043f\u043a\u0430",
-"Body": "\u0422\u0435\u043b\u043e",
-"Footer": "\u041d\u0438\u0437",
-"Border color": "\u0426\u0432\u0435\u0442 \u0440\u0430\u043c\u043a\u0438",
-"Insert template": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u044b",
-"Template": "\u0428\u0430\u0431\u043b\u043e\u043d",
-"Text color": "\u0426\u0432\u0435\u0442 \u0442\u0435\u043a\u0441\u0442\u0430",
-"Background color": "\u0426\u0432\u0435\u0442 \u0444\u043e\u043d\u0430",
-"Custom...": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c\u2026",
-"Custom color": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u0446\u0432\u0435\u0442",
-"No color": "\u0411\u0435\u0437 \u0446\u0432\u0435\u0442\u0430",
-"Table of Contents": "\u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435",
-"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u0431\u043b\u043e\u043a\u0438",
-"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b",
-"Words: {0}": "\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0441\u043b\u043e\u0432: {0}",
-"{0} words": "\u0441\u043b\u043e\u0432: {0}",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c",
-"Insert": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c",
-"View": "\u0412\u0438\u0434",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442",
-"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430",
-"Tools": "\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u044b",
-"Powered by {0}": "\u041f\u0440\u0438 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0435 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u043e\u0435 \u043f\u043e\u043b\u0435. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 ALT-F9 \u0447\u0442\u043e\u0431\u044b \u0432\u044b\u0437\u0432\u0430\u0442\u044c \u043c\u0435\u043d\u044e, ALT-F10 \u043f\u0430\u043d\u0435\u043b\u044c \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432, ALT-0 \u0434\u043b\u044f \u0432\u044b\u0437\u043e\u0432\u0430 \u043f\u043e\u043c\u043e\u0449\u0438."
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sk.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sk.js
deleted file mode 100644
index 5cc085abdc..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sk.js
+++ /dev/null
@@ -1,253 +0,0 @@
-tinymce.addI18n('sk',{
-"Redo": "Znova",
-"Undo": "Vr\u00e1ti\u0165",
-"Cut": "Vystrihn\u00fa\u0165",
-"Copy": "Kop\u00edrova\u0165",
-"Paste": "Vlo\u017ei\u0165",
-"Select all": "Ozna\u010di\u0165 v\u0161etko",
-"New document": "Nov\u00fd dokument",
-"Ok": "Ok",
-"Cancel": "Zru\u0161i\u0165",
-"Visual aids": "Vizu\u00e1lne pom\u00f4cky",
-"Bold": "Tu\u010dn\u00e9",
-"Italic": "Kurz\u00edva",
-"Underline": "Pod\u010diarknut\u00e9",
-"Strikethrough": "Pre\u010diarknut\u00e9",
-"Superscript": "Horn\u00fd index",
-"Subscript": "Spodn\u00fd index",
-"Clear formatting": "Vymaza\u0165 form\u00e1tovanie",
-"Align left": "Zarovna\u0165 v\u013eavo",
-"Align center": "Zarovna\u0165 na stred",
-"Align right": "Zarovna\u0165 vpravo",
-"Justify": "Zarovna\u0165",
-"Bullet list": "Odr\u00e1\u017eky",
-"Numbered list": "\u010c\u00edslovan\u00fd zoznam",
-"Decrease indent": "Zmen\u0161i\u0165 odsadenie",
-"Increase indent": "Zv\u00e4\u010d\u0161i\u0165 odsadenie",
-"Close": "Zatvori\u0165",
-"Formats": "Form\u00e1ty",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "V\u00e1\u0161 prehliada\u010d nepodporuje priamy pr\u00edstup do schr\u00e1nky. Pou\u017eite kl\u00e1vesov\u00e9 skratky Ctrl+X\/C\/V.",
-"Headers": "Nadpisy",
-"Header 1": "Nadpis 1",
-"Header 2": "Nadpis 2",
-"Header 3": "Nadpis 3",
-"Header 4": "Nadpis 4",
-"Header 5": "Nadpis 5",
-"Header 6": "Nadpis 6",
-"Headings": "Nadpisy",
-"Heading 1": "Nadpis 1",
-"Heading 2": "Nadpis 2",
-"Heading 3": "Nadpis 3",
-"Heading 4": "Nadpis 4",
-"Heading 5": "Nadpis 5",
-"Heading 6": "Nadpis 6",
-"Div": "Blok",
-"Pre": "Preform\u00e1tovan\u00fd",
-"Code": "K\u00f3d",
-"Paragraph": "Odsek",
-"Blockquote": "Cit\u00e1cia",
-"Inline": "\u0160t\u00fdly",
-"Blocks": "Bloky",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Vkladanie je v m\u00f3de neform\u00e1tovan\u00e9ho textu. Vkladan\u00fd obsah bude vlo\u017een\u00fd ako neform\u00e1tovan\u00fd, a\u017e pok\u00fdm t\u00fato mo\u017enos\u0165 nevypnete.",
-"Font Family": "P\u00edsmo",
-"Font Sizes": "Ve\u013ekos\u0165 p\u00edsma",
-"Class": "Trieda",
-"Browse for an image": "N\u00e1js\u0165 obr\u00e1zok",
-"OR": "ALEBO",
-"Drop an image here": "Pretiahnite obr\u00e1zok sem",
-"Upload": "Nahra\u0165",
-"Default": "V\u00fdchodzie",
-"Circle": "Kruh",
-"Disc": "Disk",
-"Square": "\u0160tvorec",
-"Lower Alpha": "Mal\u00e9 p\u00edsmen\u00e1",
-"Lower Greek": "Mal\u00e9 gr\u00e9cke p\u00edsmen\u00e1",
-"Lower Roman": "Mal\u00e9 r\u00edmske \u010d\u00edslice",
-"Upper Alpha": "Ve\u013ek\u00e9 p\u00edsmen\u00e1",
-"Upper Roman": "Ve\u013ek\u00e9 r\u00edmske \u010d\u00edslice",
-"Anchor": "Odkaz",
-"Name": "N\u00e1zov",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id by malo za\u010d\u00edna\u0165 p\u00edsmenom, nasledovan\u00e9 p\u00edsmenami, \u010d\u00edslami, pom\u013a\u010dkami, bodkami, dvojbodkami alebo podtr\u017en\u00edkmi.",
-"You have unsaved changes are you sure you want to navigate away?": "M\u00e1te neulo\u017een\u00e9 zmeny, naozaj chcete opusti\u0165 str\u00e1nku?",
-"Restore last draft": "Obnovi\u0165 posledn\u00fd koncept",
-"Special character": "\u0160peci\u00e1lny znak",
-"Source code": "Zdrojov\u00fd k\u00f3d",
-"Insert\/Edit code sample": "Vlo\u017ei\u0165\/upravi\u0165 vzorku k\u00f3du",
-"Language": "Jazyk",
-"Color": "Farba",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Z\u013eava doprava",
-"Right to left": "Sprava do\u013eava",
-"Emoticons": "Smajl\u00edci",
-"Document properties": "Vlastnosti dokumentu",
-"Title": "Nadpis",
-"Keywords": "K\u013e\u00fa\u010dov\u00e9 slov\u00e1",
-"Description": "Popis",
-"Robots": "Preh\u013ead\u00e1vacie roboty",
-"Author": "Autor",
-"Encoding": "K\u00f3dovanie",
-"Fullscreen": "Na cel\u00fa obrazovku",
-"Action": "Action",
-"Shortcut": "Shortcut",
-"Help": "Help",
-"Address": "Address",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "Insert link (if link plugin activated)",
-"Save (if save plugin activated)": "Save (if save plugin activated)",
-"Find (if searchreplace plugin activated)": "Find (if searchreplace plugin activated)",
-"Plugins installed ({0}):": "Plugins installed ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "Learn more...",
-"You are using {0}": "You are using {0}",
-"Horizontal line": "Horizont\u00e1lna \u010diara",
-"Insert\/edit image": "Vlo\u017ei\u0165\/upravi\u0165 obr\u00e1zok",
-"Image description": "Popis obr\u00e1zku",
-"Source": "Zdroj",
-"Dimensions": "Rozmery",
-"Constrain proportions": "Vymedzen\u00e9 proporcie",
-"General": "Hlavn\u00e9",
-"Advanced": "Pokro\u010dil\u00e9",
-"Style": "\u0160t\u00fdl",
-"Vertical space": "Vertik\u00e1lny priestor",
-"Horizontal space": "Horizont\u00e1lny priestor",
-"Border": "Or\u00e1movanie",
-"Insert image": "Vlo\u017ei\u0165 obr\u00e1zok",
-"Image": "Obr\u00e1zok",
-"Image list": "Zoznam obr\u00e1zkov",
-"Rotate counterclockwise": "Oto\u010di\u0165 proti smeru hodinov\u00fdch ru\u010di\u010diek",
-"Rotate clockwise": "Oto\u010di\u0165 v smere hodinov\u00fdch ru\u010di\u010diek",
-"Flip vertically": "Preklopi\u0165 vertik\u00e1lne",
-"Flip horizontally": "Preklopi\u0165 horizont\u00e1lne",
-"Edit image": "Upravi\u0165 obr\u00e1zok",
-"Image options": "Mo\u017enosti obr\u00e1zku",
-"Zoom in": "Pribl\u00ed\u017ei\u0165",
-"Zoom out": "Oddiali\u0165",
-"Crop": "Vyreza\u0165",
-"Resize": "Zmeni\u0165 ve\u013ekos\u0165",
-"Orientation": "Orient\u00e1cia",
-"Brightness": "Jas",
-"Sharpen": "Zaostri\u0165",
-"Contrast": "Kontrast",
-"Color levels": "\u00darovne farieb",
-"Gamma": "Gama",
-"Invert": "Invertova\u0165",
-"Apply": "Pou\u017ei\u0165",
-"Back": "Sp\u00e4\u0165",
-"Insert date\/time": "Vlo\u017ei\u0165 d\u00e1tum\/\u010das",
-"Date\/time": "D\u00e1tum\/\u010das",
-"Insert link": "Vlo\u017ei\u0165 odkaz",
-"Insert\/edit link": "Vlo\u017ei\u0165\/upravi\u0165 odkaz",
-"Text to display": "Zobrazen\u00fd text",
-"Url": "URL",
-"Target": "Cie\u013e",
-"None": "\u017diadne",
-"New window": "Nov\u00e9 okno",
-"Remove link": "Odstr\u00e1ni\u0165 odkaz",
-"Anchors": "Kotvy",
-"Link": "Odkaz",
-"Paste or type a link": "Prilepte alebo nap\u00ed\u0161te odkaz",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL, ktor\u00fa ste vlo\u017eili je pravdepodobne emailov\u00e1 adresa. \u017del\u00e1te si prida\u0165 vy\u017eadovan\u00fa mailto: predponu?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL adresa ktor\u00fa ste zadali vyzer\u00e1 ako extern\u00fd odkaz. Chcete prida\u0165 vy\u017eadovan\u00fa http:\/\/ predponu?",
-"Link list": "Zoznam odkazov",
-"Insert video": "Vlo\u017ei\u0165 video",
-"Insert\/edit video": "Vlo\u017ei\u0165\/upravi\u0165 video",
-"Insert\/edit media": "Vlo\u017ei\u0165\/upravi\u0165 m\u00e9di\u00e1",
-"Alternative source": "Alternat\u00edvny zdroj",
-"Poster": "Uk\u00e1\u017eka",
-"Paste your embed code below:": "Vlo\u017ete k\u00f3d pre vlo\u017eenie na str\u00e1nku:",
-"Embed": "Vlo\u017een\u00e9",
-"Media": "M\u00e9di\u00e1",
-"Nonbreaking space": "Nedelite\u013en\u00e1 medzera",
-"Page break": "Zalomenie str\u00e1nky",
-"Paste as text": "Vlo\u017ei\u0165 ako text",
-"Preview": "N\u00e1h\u013ead",
-"Print": "Tla\u010di\u0165",
-"Save": "Ulo\u017ei\u0165",
-"Find": "H\u013eada\u0165",
-"Replace with": "Nahradi\u0165 za",
-"Replace": "Nahradi\u0165",
-"Replace all": "Nahradi\u0165 v\u0161etko",
-"Prev": "Predch\u00e1dzaj\u00face",
-"Next": "Nasleduj\u00face",
-"Find and replace": "Vyh\u013eada\u0165 a nahradi\u0165",
-"Could not find the specified string.": "Zadan\u00fd re\u0165azec sa nena\u0161iel.",
-"Match case": "Rozli\u0161ova\u0165 ve\u013ek\u00e9\/mal\u00e9",
-"Whole words": "Cel\u00e9 slov\u00e1",
-"Spellcheck": "Kontrola pravopisu",
-"Ignore": "Ignorova\u0165",
-"Ignore all": "Ignorova\u0165 v\u0161etko",
-"Finish": "Dokon\u010di\u0165",
-"Add to Dictionary": "Prida\u0165 do slovn\u00edka",
-"Insert table": "Vlo\u017ei\u0165 tabu\u013eku",
-"Table properties": "Nastavenia tabu\u013eky",
-"Delete table": "Zmaza\u0165 tabu\u013eku",
-"Cell": "Bunka",
-"Row": "Riadok",
-"Column": "St\u013apec",
-"Cell properties": "Vlastnosti bunky",
-"Merge cells": "Spoji\u0165 bunky",
-"Split cell": "Rozdeli\u0165 bunku",
-"Insert row before": "Vlo\u017ei\u0165 nov\u00fd riadok pred",
-"Insert row after": "Vlo\u017ei\u0165 nov\u00fd riadok za",
-"Delete row": "Zmaza\u0165 riadok",
-"Row properties": "Vlastnosti riadku",
-"Cut row": "Vystrihn\u00fa\u0165 riadok",
-"Copy row": "Kop\u00edrova\u0165 riadok",
-"Paste row before": "Vlo\u017ei\u0165 riadok pred",
-"Paste row after": "Vlo\u017ei\u0165 riadok za",
-"Insert column before": "Prida\u0165 nov\u00fd st\u013apec pred",
-"Insert column after": "Prida\u0165 nov\u00fd st\u013apec za",
-"Delete column": "Vymaza\u0165 st\u013apec",
-"Cols": "St\u013apce",
-"Rows": "Riadky",
-"Width": "\u0160\u00edrka",
-"Height": "V\u00fd\u0161ka",
-"Cell spacing": "Priestor medzi bunkami",
-"Cell padding": "Odsadenie v bunk\u00e1ch",
-"Caption": "Popisok",
-"Left": "V\u013eavo",
-"Center": "Na stred",
-"Right": "Vpravo",
-"Cell type": "Typ bunky",
-"Scope": "Oblas\u0165",
-"Alignment": "Zarovnanie",
-"H Align": "Horizont\u00e1lne zarovnanie",
-"V Align": "Vertik\u00e1lne zarovnanie",
-"Top": "Vrch",
-"Middle": "Stred",
-"Bottom": "Spodok",
-"Header cell": "Bunka z\u00e1hlavia",
-"Row group": "Skupina riadkov",
-"Column group": "Skupina st\u013apcov",
-"Row type": "Typ riadku",
-"Header": "Z\u00e1hlavie",
-"Body": "Telo",
-"Footer": "P\u00e4ti\u010dka",
-"Border color": "Farba or\u00e1movania",
-"Insert template": "Vlo\u017ei\u0165 \u0161abl\u00f3nu",
-"Templates": "\u0160abl\u00f3ny",
-"Template": "\u0160abl\u00f3na",
-"Text color": "Farba textu",
-"Background color": "Farba pozadia",
-"Custom...": "Vlastn\u00e1...",
-"Custom color": "Vlastn\u00e1 farba",
-"No color": "Bez farby",
-"Table of Contents": "Obsah",
-"Show blocks": "Zobrazi\u0165 bloky",
-"Show invisible characters": "Zobrazi\u0165 skryt\u00e9 znaky",
-"Words: {0}": "Slov: {0}",
-"File": "S\u00fabor",
-"Edit": "Upravi\u0165",
-"Insert": "Vlo\u017ei\u0165",
-"View": "Zobrazi\u0165",
-"Format": "Form\u00e1t",
-"Table": "Tabu\u013eka",
-"Tools": "N\u00e1stroje",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Textov\u00e9 pole. Stla\u010dte ALT-F9 pre zobrazenie menu, ALT-F10 pre zobrazenie panela n\u00e1strojov, ALT-0 pre n\u00e1povedu."
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sl_SI.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sl_SI.js
deleted file mode 100644
index ba6c89a584..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sl_SI.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('sl_SI',{
-"Cut": "Izre\u017ei",
-"Heading 5": "Podnaslov 5",
-"Header 2": "Naslov 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Varnostne nastavitve brskalnika ne dopu\u0161\u010dajo direktnega dostopa do odlo\u017ei\u0161\u010da. Uporabite kombinacijo tipk Ctrl+X\/C\/V na tipkovnici.",
-"Heading 4": "Podnaslov 4",
-"Div": "Div",
-"Heading 2": "Podnaslov 2",
-"Paste": "Prilepi",
-"Close": "Zapri",
-"Font Family": "Dru\u017eina pisav",
-"Pre": "Predformat",
-"Align right": "Desna poravnava",
-"New document": "Nov dokument",
-"Blockquote": "Zamik besedila",
-"Numbered list": "O\u0161tevil\u010den seznam",
-"Heading 1": "Podnaslov 1",
-"Headings": "Podnaslovi",
-"Increase indent": "Pove\u010daj zamik",
-"Formats": "Oblika",
-"Headers": "Naslovi",
-"Select all": "Izberi vse",
-"Header 3": "Naslov 3",
-"Blocks": "Grupe",
-"Undo": "Razveljavi",
-"Strikethrough": "Pre\u010drtano",
-"Bullet list": "Ozna\u010den seznam",
-"Header 1": "Naslov 1",
-"Superscript": "Nadpisano",
-"Clear formatting": "Odstrani oblikovanje",
-"Font Sizes": "Velikosti pisave",
-"Subscript": "Podpisano",
-"Header 6": "Naslov 6",
-"Redo": "Ponovi",
-"Paragraph": "Odstavek",
-"Ok": "V redu",
-"Bold": "Krepko",
-"Code": "Koda",
-"Italic": "Le\u017ee\u010de",
-"Align center": "Sredinska poravnava",
-"Header 5": "Naslov 5",
-"Heading 6": "Podnaslov 6",
-"Heading 3": "Podnaslov 3",
-"Decrease indent": "Zmanj\u0161aj zamik",
-"Header 4": "Naslov 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Odlagali\u0161\u010de je zdaj v tekstovnem na\u010dinu. Vsebina bo preslikana kot golo besedilo brez oblike, dokler te mo\u017enosti ne izklju\u010dite.",
-"Underline": "Pod\u010drtano",
-"Cancel": "Prekli\u010di",
-"Justify": "Obojestranska poravnava",
-"Inline": "Med besedilom",
-"Copy": "Kopiraj",
-"Align left": "Leva poravnava",
-"Visual aids": "Vizualni pripomo\u010dki",
-"Lower Greek": "Male gr\u0161ke \u010drke",
-"Square": "Kvadratek",
-"Default": "Privzeto",
-"Lower Alpha": "Male tiskane \u010drke",
-"Circle": "Pikica",
-"Disc": "Kroglica",
-"Upper Alpha": "Velike tiskane \u010drke",
-"Upper Roman": "Velike rimske \u0161tevilke",
-"Lower Roman": "Male rimske \u0161tevilke",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id se mora za\u010deti s \u010drko, sledijo samo \u010drke, \u0161tevilke, pomi\u0161ljaj, pike, dvopi\u010dje ali pod\u010drtaj.",
-"Name": "Naziv zaznamka",
-"Anchor": "Zaznamek",
-"Id": "Id",
-"You have unsaved changes are you sure you want to navigate away?": "Imate neshranjene spremembe. Ste prepri\u010dati, da \u017eelite zapustiti stran?",
-"Restore last draft": "Obnovi zadnji osnutek",
-"Special character": "Posebni znaki",
-"Source code": "Izvorna koda",
-"Language": "Jezik",
-"Insert\/Edit code sample": "Vstavi\/Uredi vzor\u010dno kodo",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Barva",
-"Right to left": "Od desne proti levi",
-"Left to right": "Od leve proti desni",
-"Emoticons": "Sme\u0161ki",
-"Robots": "Robotki",
-"Document properties": "Lastnosti dokumenta",
-"Title": "Naslov",
-"Keywords": "Klju\u010dne besede",
-"Encoding": "Kodiranje",
-"Description": "Opis",
-"Author": "Avtor",
-"Fullscreen": "\u010cez cel zaslon",
-"Horizontal line": "Vodoravna \u010drta",
-"Horizontal space": "Vodoravni prostor",
-"Insert\/edit image": "Vstavi\/uredi sliko",
-"General": "Splo\u0161no",
-"Advanced": "Napredno",
-"Source": "Pot",
-"Border": "Obroba",
-"Constrain proportions": "Obdr\u017ei razmerje",
-"Vertical space": "Navpi\u010dni prostor",
-"Image description": "Opis slike",
-"Style": "Slog",
-"Dimensions": "Dimenzije",
-"Insert image": "Vnesi sliko",
-"Image": "Slika",
-"Zoom in": "Pove\u010daj",
-"Contrast": "Kontrast",
-"Back": "Nazaj",
-"Gamma": "Gama",
-"Flip horizontally": "Obrni vodoravno",
-"Resize": "Spremeni velikost",
-"Sharpen": "Izostri",
-"Zoom out": "Pomanj\u0161aj",
-"Image options": "Mo\u017enosti slike",
-"Apply": "Uporabi",
-"Brightness": "Svetlost",
-"Rotate clockwise": "Zavrti v smeri urinega kazalca",
-"Rotate counterclockwise": "Zavrti v nasprotni smeri urnega kazalca",
-"Edit image": "Uredi sliko",
-"Color levels": "Barvni nivo",
-"Crop": "Obre\u017ei",
-"Orientation": "Usmerjenost",
-"Flip vertically": "Obrni navpi\u010dno",
-"Invert": "Obrni",
-"Date\/time": "Datum\/\u010das",
-"Insert date\/time": "Vstavi datum\/\u010das",
-"Remove link": "Odstrani povezavo",
-"Url": "Povezava",
-"Text to display": "Prikazno besedilo",
-"Anchors": "Sidra",
-"Insert link": "Vstavi povezavo",
-"Link": "Povezava",
-"New window": "Novo okno",
-"None": "Brez",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Vne\u0161eni URL predstavlja zunanjo povezavo. Ali \u017eelite dodati \"http:\/\/\" predpono?",
-"Paste or type a link": "Prilepite ali vnesite povezavo",
-"Target": "Cilj",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Vne\u0161eni URL predstavlja e-po\u0161tni naslov. Ali \u017eelite dodati potrebno \"mailto:\" predpono?",
-"Insert\/edit link": "Vstavi\/uredi povezavo",
-"Insert\/edit video": "Vstavi\/uredi video",
-"Media": "Medij",
-"Alternative source": "Nadomestni vir",
-"Paste your embed code below:": "Prilepite kodo za vdelavo:",
-"Insert video": "Vstavi video",
-"Poster": "Poster",
-"Insert\/edit media": "Vstavi\/uredi medij",
-"Embed": "Vdelaj",
-"Nonbreaking space": "Nedeljivi presledek",
-"Page break": "Prelom strani",
-"Paste as text": "Vnesi kot besedilo",
-"Preview": "Predogled",
-"Print": "Natisni",
-"Save": "Shrani",
-"Could not find the specified string.": "Iskanje ni vrnilo rezultatov.",
-"Replace": "Zamenjaj",
-"Next": "Naprej",
-"Whole words": "Cele besede",
-"Find and replace": "Poi\u0161\u010di in zamenjaj",
-"Replace with": "Zamenjaj z",
-"Find": "I\u0161\u010di",
-"Replace all": "Zamenjaj vse",
-"Match case": "Ujemanje malih in velikih \u010drk",
-"Prev": "Nazaj",
-"Spellcheck": "Preverjanje \u010drkovanja",
-"Finish": "Zaklju\u010di",
-"Ignore all": "Prezri vse",
-"Ignore": "Prezri",
-"Add to Dictionary": "Dodaj v slovar",
-"Insert row before": "Vstavi vrstico pred",
-"Rows": "Vrstice",
-"Height": "Vi\u0161ina",
-"Paste row after": "Prilepi vrstico za",
-"Alignment": "Poravnava",
-"Border color": "Barva obrobe",
-"Column group": "Grupiranje stolpcev",
-"Row": "Vrstica",
-"Insert column before": "Vstavi stolpec pred",
-"Split cell": "Razdeli celico",
-"Cell padding": "Polnilo med celicami",
-"Cell spacing": "Razmik med celicami",
-"Row type": "Tip vrstice",
-"Insert table": "Vstavi tabelo",
-"Body": "Vsebina",
-"Caption": "Naslov",
-"Footer": "Noga",
-"Delete row": "Izbri\u0161i vrstico",
-"Paste row before": "Prilepi vrstico pred",
-"Scope": "Obseg",
-"Delete table": "Izbri\u0161i tabelo",
-"H Align": "Horizontalna poravnava",
-"Top": "Vrh",
-"Header cell": "Celica glave",
-"Column": "Stolpec",
-"Row group": "Grupiranje vrstic",
-"Cell": "Celica",
-"Middle": "Sredina",
-"Cell type": "Tip celice",
-"Copy row": "Kopiraj vrstico",
-"Row properties": "Lastnosti vrstice",
-"Table properties": "Lastnosti tabele",
-"Bottom": "Dno",
-"V Align": "Vertikalna poravnava",
-"Header": "Glava",
-"Right": "Desno",
-"Insert column after": "Vstavi stolpec za",
-"Cols": "Stolpci",
-"Insert row after": "Vstavi vrstico za",
-"Width": "\u0160irina",
-"Cell properties": "Lastnosti celice",
-"Left": "Levo",
-"Cut row": "Izre\u017ei vrstico",
-"Delete column": "Izbri\u0161i stolpec",
-"Center": "Sredinsko",
-"Merge cells": "Zdru\u017ei celice",
-"Insert template": "Vstavi predlogo",
-"Templates": "Predloge",
-"Background color": "Barva ozadja",
-"Custom...": "Po meri ...",
-"Custom color": "Barva po meri",
-"No color": "Brezbarvno",
-"Text color": "Barva besedila",
-"Table of Contents": "Kazalo",
-"Show blocks": "Prika\u017ei bloke",
-"Show invisible characters": "Prika\u017ei skrite znake",
-"Words: {0}": "Besed: {0}",
-"Insert": "Vstavi",
-"File": "Datoteka",
-"Edit": "Uredi",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Bogato besedilo. Pritisnite ALT-F9 za meni. Pritisnite ALT-F10 za orodno vrstico. Pritisnite ALT-0 za pomo\u010d",
-"Tools": "Orodja",
-"View": "Pogled",
-"Table": "Tabela",
-"Format": "Oblika"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sr.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sr.js
deleted file mode 100644
index 01bfad7303..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sr.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('sr',{
-"Redo": "Napred",
-"Undo": "Nazad",
-"Cut": "Iseci",
-"Copy": "Kopiraj",
-"Paste": "Nalepi",
-"Select all": "Obele\u017ei sve",
-"New document": "Novi dokument",
-"Ok": "Ok",
-"Cancel": "Opozovi",
-"Visual aids": "Vizuelna pomagala",
-"Bold": "Podebljan",
-"Italic": "isko\u0161en",
-"Underline": "Podvu\u010den",
-"Strikethrough": "Precrtan",
-"Superscript": "Natpis",
-"Subscript": "Potpisan",
-"Clear formatting": "Brisanje formatiranja",
-"Align left": "Poravnano levo",
-"Align center": "Poravnano centar",
-"Align right": "Poravnano  desno",
-"Justify": "Poravnanje",
-"Bullet list": "Lista nabrajanja",
-"Numbered list": "Numerisana lista",
-"Decrease indent": "Smanji uvla\u010denje",
-"Increase indent": "Pove\u0107aj uvla\u010denje",
-"Close": "Zatvori",
-"Formats": "Formatiraj",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Va\u0161 pretra\u017eiva\u010d nepodr\u017eava direktan pristup prenosu.Koristite Ctrl+X\/C\/V pre\u010dice na tastaturi",
-"Headers": "Zaglavlje",
-"Header 1": "Zaglavlje 1",
-"Header 2": "Zaglavlje 2",
-"Header 3": "Zaglavlje 3",
-"Header 4": "Zaglavlje 4",
-"Header 5": "Zaglavlje 5",
-"Header 6": "Zaglavlje 6",
-"Headings": "Naslovi",
-"Heading 1": "Naslov 1",
-"Heading 2": "Naslov 2",
-"Heading 3": "Naslov 3",
-"Heading 4": "Naslov 4",
-"Heading 5": "Naslov 5",
-"Heading 6": "Naslov 6",
-"Preformatted": "Formatirano",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kod",
-"Paragraph": "Paragraf",
-"Blockquote": "Navodnici",
-"Inline": "U liniji",
-"Blocks": "Blokovi",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Nalepiti je sada u obi\u010dnom text modu.Sadr\u017eaj \u0107e biti nalepljen kao obi\u010dan tekst dok ne ugasite ovu opciju.",
-"Font Family": "Vrsta fonta",
-"Font Sizes": "Veli\u010dine fontova",
-"Class": "Klasa",
-"Browse for an image": "Prona\u0111i sliku",
-"OR": "ili",
-"Drop an image here": "Prevuci sliku ovde",
-"Upload": "Po\u0161alji",
-"Block": "Blok",
-"Align": "Poravnaj",
-"Default": "Podrazumevano",
-"Circle": "Krug",
-"Disc": "Disk",
-"Square": "Kvadrat",
-"Lower Alpha": "Donja Alpha",
-"Lower Greek": "Ni\u017ei gr\u010dki",
-"Lower Roman": "Donji Roman",
-"Upper Alpha": "Gornji Alpha",
-"Upper Roman": "Gornji Roman",
-"Anchor": "Sidro",
-"Name": "Ime",
-"Id": "id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id treba da po\u010dinje slovom, pra\u0107eno samo slovima, brojevima, crticama, ta\u010dkama, dvota\u010dkom ili donjim crtama",
-"You have unsaved changes are you sure you want to navigate away?": "Imate nesa\u010duvane promene dali ste sigurni da \u017eelite da iza\u0111ete?",
-"Restore last draft": "Vrati  poslednji nacrt",
-"Special character": "Specijalni karakter",
-"Source code": "Izvorni kod",
-"Insert\/Edit code sample": "Dodaj\/Izmeni primer koda",
-"Language": "Jezik",
-"Code sample": "Primer koda",
-"Color": "Boja",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Sa leve na desnu",
-"Right to left": "Sa desne na levu",
-"Emoticons": "Smajliji",
-"Document properties": "Postavke dokumenta",
-"Title": "Naslov",
-"Keywords": "Klju\u010dne re\u010di",
-"Description": "Opis",
-"Robots": "Roboti",
-"Author": "Autor",
-"Encoding": "Kodiranje",
-"Fullscreen": "Pun ekran",
-"Action": "Akcija",
-"Shortcut": "Pre\u010dica",
-"Help": "Pomo\u0107",
-"Address": "Adresa",
-"Focus to menubar": "Fokus na meni",
-"Focus to toolbar": "Fokus na traku sa alatima",
-"Focus to element path": "Fokus na putanju elementa",
-"Focus to contextual toolbar": "Fokus na kontekstualnu traku alata",
-"Insert link (if link plugin activated)": "Dodaj link (ukoliko je link dodatak aktiviran)",
-"Save (if save plugin activated)": "Sa\u010duvaj (ukoliko je sa\u010duvaj dodatak aktiviran)",
-"Find (if searchreplace plugin activated)": "Prona\u0111i (ako je dodatak pretrage i zamene aktiviran)",
-"Plugins installed ({0}):": "Dodataka instalirano ({0}):",
-"Premium plugins:": "Premium dodaci",
-"Learn more...": "Saznaj vi\u0161e",
-"You are using {0}": "Koristite {0}",
-"Plugins": "Dadaci",
-"Handy Shortcuts": "Prakti\u010dne pre\u010dice",
-"Horizontal line": "Horizontalna linija",
-"Insert\/edit image": "Ubaci\/Promeni sliku",
-"Image description": "Opis slike",
-"Source": "Izvor",
-"Dimensions": "Dimenzije",
-"Constrain proportions": "Ograni\u010dene proporcije",
-"General": "Op\u0161te",
-"Advanced": "Napredno",
-"Style": "Stil",
-"Vertical space": "Vertikalni razmak",
-"Horizontal space": "Horizontalni razmak",
-"Border": "Okvir",
-"Insert image": "Ubaci sliku",
-"Image": "Slika",
-"Image list": "Lista slika",
-"Rotate counterclockwise": "Rotiraj levo",
-"Rotate clockwise": "Rotiraj desno",
-"Flip vertically": "Okreni vertikalno",
-"Flip horizontally": "Okreni horizontalno",
-"Edit image": "Izmeni sliku",
-"Image options": "Opcije slike",
-"Zoom in": "Uve\u0107aj",
-"Zoom out": "Umanji",
-"Crop": "Izeci",
-"Resize": "Promeni veli\u010dinu",
-"Orientation": "Orijentacija",
-"Brightness": "Osvetljenje",
-"Sharpen": "Izo\u0161travanje",
-"Contrast": "Kontrast",
-"Color levels": "Nivo boja",
-"Gamma": "Gama",
-"Invert": "Izokreni",
-"Apply": "Primeni",
-"Back": "Nazad",
-"Insert date\/time": "Ubaci datum\/vreme",
-"Date\/time": "Datum\/vreme",
-"Insert link": "Ubaci vezu",
-"Insert\/edit link": "Ubaci\/promeni vezu",
-"Text to display": "Tekst za prikaz",
-"Url": "URL",
-"Target": "Meta",
-"None": "Ni\u0161ta",
-"New window": "Novi prozor",
-"Remove link": "Ukloni link",
-"Anchors": "sidro",
-"Link": "Link",
-"Paste or type a link": "Nalepi ili ukucaj link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Izgleda da je URL koji ste uneli email adresa. Da li \u017eelite da dodate zahtevani mailto: prefiks?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Izgleda da je URL koji ste uneli spolja\u0161nja veza. Da li \u017eelite da dodate zahtevani http:\/\/ prefiks?",
-"Link list": "Lista veza",
-"Insert video": "Ubaci video",
-"Insert\/edit video": "Ubaci\/promeni video",
-"Insert\/edit media": "Ubaci\/izmeni mediju",
-"Alternative source": "Alternativni izvor",
-"Poster": "Poster",
-"Paste your embed code below:": "Nalepite ugra\u0111eni kod ispod:",
-"Embed": "Ugra\u0111eno",
-"Media": "Medija",
-"Nonbreaking space": "bez ramaka",
-"Page break": "Lomljenje stranice",
-"Paste as text": "Nalepi kao tekst",
-"Preview": "Pregled",
-"Print": "\u0160tampanje",
-"Save": "Sa\u010duvati",
-"Find": "Na\u0111i",
-"Replace with": "Zameni sa",
-"Replace": "Zameni",
-"Replace all": "Zameni sve",
-"Prev": "Prethodni",
-"Next": "Slede\u0107i",
-"Find and replace": "Na\u0111i i zameni",
-"Could not find the specified string.": "Nije mogu\u0107e prona\u0107i navedeni niz.",
-"Match case": "Predmet za upore\u0111ivanje",
-"Whole words": "Cele re\u010di",
-"Spellcheck": "Provera pravopisa",
-"Ignore": "ignori\u0161i",
-"Ignore all": "Ignori\u0161i sve",
-"Finish": "Kraj",
-"Add to Dictionary": "Dodaj u re\u010dnik",
-"Insert table": "ubaci tabelu",
-"Table properties": "Postavke tabele",
-"Delete table": "Obri\u0161i tabelu",
-"Cell": "\u0106elija",
-"Row": "Red",
-"Column": "Kolona",
-"Cell properties": "Postavke \u0107elije",
-"Merge cells": "Spoji \u0107elije",
-"Split cell": "Razdvoji \u0107elije",
-"Insert row before": "Ubaci red pre",
-"Insert row after": "Ubaci red posle",
-"Delete row": "Obri\u0161i red",
-"Row properties": "Postavke reda",
-"Cut row": "Iseci red",
-"Copy row": "Kopiraj red",
-"Paste row before": "Nalepi red pre",
-"Paste row after": "Nalepi red posle",
-"Insert column before": "Ubaci kolonu pre",
-"Insert column after": "Ubaci kolonu posle",
-"Delete column": "Obri\u0161i kolonu",
-"Cols": "Kolone",
-"Rows": "Redovi",
-"Width": "\u0160irina",
-"Height": "Visina",
-"Cell spacing": "Prostor \u0107elije",
-"Cell padding": "Razmak \u0107elije",
-"Caption": "Natpis",
-"Left": "Levo",
-"Center": "Centar",
-"Right": "Desno",
-"Cell type": "Tip \u0107elije",
-"Scope": "Obim",
-"Alignment": "Svrstavanje",
-"H Align": "Horizontalno poravnanje",
-"V Align": "Vertikalno poravnanje",
-"Top": "Vrh",
-"Middle": "Sredina",
-"Bottom": "Podno\u017eje",
-"Header cell": "Visina \u0107elije",
-"Row group": "Grupa reda",
-"Column group": "Grupa kolone",
-"Row type": "Tip reda",
-"Header": "Zaglavlje",
-"Body": "Telo",
-"Footer": "Podno\u017eje",
-"Border color": "Boja ivice",
-"Insert template": "Ubaci \u0161ablon",
-"Templates": "\u0160abloni",
-"Template": "\u0160ablon",
-"Text color": "Boja tekst",
-"Background color": "Boja pozadine",
-"Custom...": "Posebno...",
-"Custom color": "Posebna boja",
-"No color": "Bez boje",
-"Table of Contents": "Tabela sadr\u017eaja",
-"Show blocks": "Prikaz blokova",
-"Show invisible characters": "Prika\u017ei nevidljive karaktere",
-"Words: {0}": "Re\u010di:{0}",
-"{0} words": "{0} re\u010di",
-"File": "Datoteka",
-"Edit": "Ure\u0111ivanje",
-"Insert": "Umetni",
-"View": "Prikaz",
-"Format": "Format",
-"Table": "Tabela",
-"Tools": "Alatke",
-"Powered by {0}": "Pokre\u0107e ga {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Oboga\u0107en tekst. Pritisni te ALT-F9 za meni.Pritisnite ALT-F10 za traku sa alatkama.Pritisnite ALT-0 za pomo\u0107"
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sv_SE.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sv_SE.js
deleted file mode 100644
index b97ea68a18..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sv_SE.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('sv_SE',{
-"Redo": "G\u00f6r om",
-"Undo": "\u00c5ngra",
-"Cut": "Klipp ut",
-"Copy": "Kopiera",
-"Paste": "Klistra in",
-"Select all": "Markera allt",
-"New document": "Nytt dokument",
-"Ok": "Ok",
-"Cancel": "Avbryt",
-"Visual aids": "Visuella hj\u00e4lpmedel",
-"Bold": "Fetstil",
-"Italic": "Kursiv stil",
-"Underline": "Understruken",
-"Strikethrough": "Genomstruken",
-"Superscript": "Upph\u00f6jd text",
-"Subscript": "Neds\u00e4nkt text",
-"Clear formatting": "Avformatera",
-"Align left": "V\u00e4nsterst\u00e4ll",
-"Align center": "Centrera",
-"Align right": "H\u00f6gerst\u00e4ll",
-"Justify": "Justera",
-"Bullet list": "Punktlista",
-"Numbered list": "Nummerlista",
-"Decrease indent": "Minska indrag",
-"Increase indent": "\u00d6ka indrag",
-"Close": "St\u00e4ng",
-"Formats": "Format",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Din browser st\u00f6djer inte direkt \u00e5tkomst till klippboken. V\u00e4nligen anv\u00e4nd kortkommandona Ctrl+X\/C\/V i st\u00e4llet.",
-"Headers": "Rubriker",
-"Header 1": "Rubrik 1",
-"Header 2": "Rubrik 2",
-"Header 3": "Rubrik 3",
-"Header 4": "Rubrik 4",
-"Header 5": "Rubrik 5",
-"Header 6": "Rubrik 6",
-"Headings": "Rubriker",
-"Heading 1": "Rubrik 1",
-"Heading 2": "Rubrik 2",
-"Heading 3": "Rubrik 3",
-"Heading 4": "Rubrik 4",
-"Heading 5": "Rubrik 5",
-"Heading 6": "Rubrik 6",
-"Preformatted": "Preformaterad",
-"Div": "Div",
-"Pre": "F\u00f6rformaterad",
-"Code": "Kod",
-"Paragraph": "Br\u00f6dtext",
-"Blockquote": "Blockcitat",
-"Inline": "Inline",
-"Blocks": "Block",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Klistra in \u00e4r nu i textl\u00e4ge. Inneh\u00e5ll kommer att konverteras till text tills du sl\u00e5r av detta l\u00e4ge.",
-"Font Family": "Teckensnitt",
-"Font Sizes": "Storlek",
-"Class": "Klass",
-"Browse for an image": "Bl\u00e4ddra efter en bild",
-"OR": "ELLER",
-"Drop an image here": "Sl\u00e4pp en bild h\u00e4r",
-"Upload": "Ladda upp",
-"Block": "Block",
-"Align": "Justera",
-"Default": "Original",
-"Circle": "Cirkel",
-"Disc": "Disk",
-"Square": "Fyrkant",
-"Lower Alpha": "Gemener",
-"Lower Greek": "Grekiska gemener",
-"Lower Roman": "Romerska gemener",
-"Upper Alpha": "Versaler",
-"Upper Roman": "Romerska versaler",
-"Anchor": "Ankare",
-"Name": "Namn",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id skall b\u00f6rja med en bokstav och f\u00f6ljande tecken ska vara bokst\u00e4ver, nummer, punkter, understr\u00e4ck eller kolon.",
-"You have unsaved changes are you sure you want to navigate away?": "Du har f\u00f6r\u00e4ndringar som du inte har sparat. \u00c4r du s\u00e4ker p\u00e5 att du vill navigera vidare?",
-"Restore last draft": "\u00c5terst\u00e4ll senaste utkast",
-"Special character": "Specialtecken",
-"Source code": "K\u00e4llkod",
-"Insert\/Edit code sample": "Infoga\/Redigera k\u00e5d exempel",
-"Language": "Spr\u00e5k",
-"Code sample": "K\u00e5dexempel",
-"Color": "F\u00e4rg",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "V\u00e4nster till h\u00f6ger",
-"Right to left": "H\u00f6ger till v\u00e4nster",
-"Emoticons": "Emoticons",
-"Document properties": "Dokumentegenskaper",
-"Title": "Titel",
-"Keywords": "Nyckelord",
-"Description": "Beskrivning",
-"Robots": "Robotar",
-"Author": "F\u00f6rfattare",
-"Encoding": "Encoding",
-"Fullscreen": "Fullsk\u00e4rm",
-"Action": "H\u00e4ndelse",
-"Shortcut": "Kortkommando",
-"Help": "Hj\u00e4lp",
-"Address": "Adress",
-"Focus to menubar": "Fokusera p\u00e5 menyrad",
-"Focus to toolbar": "Fokusera p\u00e5 verktygsrad",
-"Focus to element path": "Fokusera p\u00e5 elements\u00f6kv\u00e4gsrad",
-"Focus to contextual toolbar": "Fokusera p\u00e5 den kontextuella verktygsraden",
-"Insert link (if link plugin activated)": "Infoga l\u00e4nk (om link-pluginet \u00e4r aktiverat)",
-"Save (if save plugin activated)": "Spara (om save-pluginet \u00e4r aktiverat)",
-"Find (if searchreplace plugin activated)": "S\u00f6k (om searchreplace-pluginet \u00e4r aktiverat)",
-"Plugins installed ({0}):": "Installerade plugins ({0}):",
-"Premium plugins:": "Premiumplugins:",
-"Learn more...": "L\u00e4s mer...",
-"You are using {0}": "Du anv\u00e4nder {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Kortkommandon",
-"Horizontal line": "Horisontell linje",
-"Insert\/edit image": "Infoga\/redigera bild",
-"Image description": "Bildbeskrivning",
-"Source": "K\u00e4lla",
-"Dimensions": "Dimensioner",
-"Constrain proportions": "Begr\u00e4nsa proportioner",
-"General": "Generella",
-"Advanced": "Avancerat",
-"Style": "Stil",
-"Vertical space": "Vertikaltutrymme",
-"Horizontal space": "Horisontellt utrymme",
-"Border": "Ram",
-"Insert image": "Infoga bild",
-"Image": "Bild",
-"Image list": "Bildlista",
-"Rotate counterclockwise": "Rotera moturs",
-"Rotate clockwise": "Rotera medurs",
-"Flip vertically": "Spegelv\u00e4nd vertikalt",
-"Flip horizontally": "Spegelv\u00e4nd horisontellt",
-"Edit image": "Redigera bild",
-"Image options": "Bild inst\u00e4llningar",
-"Zoom in": "Zooma in",
-"Zoom out": "Zooma ut",
-"Crop": "Besk\u00e4r",
-"Resize": "Skala om",
-"Orientation": "Orientera",
-"Brightness": "Ljusstyrka",
-"Sharpen": "Sk\u00e4rpa",
-"Contrast": "Kontrast",
-"Color levels": "F\u00e4rgniv\u00e5er",
-"Gamma": "Gamma",
-"Invert": "Invertera",
-"Apply": "Applicera",
-"Back": "Tillbaka",
-"Insert date\/time": "Infoga datum\/tid",
-"Date\/time": "Datum\/tid",
-"Insert link": "Infoga l\u00e4nk",
-"Insert\/edit link": "Infoga\/redigera l\u00e4nk",
-"Text to display": "Text att visa",
-"Url": "URL",
-"Target": "M\u00e5l",
-"None": "Ingen",
-"New window": "Nytt f\u00f6nster",
-"Remove link": "Ta bort l\u00e4nk",
-"Anchors": "Bokm\u00e4rken",
-"Link": "L\u00e4nk",
-"Paste or type a link": "Klistra in eller skriv en l\u00e4nk",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URLen du angav verkar vara en epost adress. Vill du l\u00e4gga till ett mailto: prefix?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URLen du angav verkar vara en extern l\u00e4nk. Vill du l\u00e4gga till http:\/\/ prefixet?",
-"Link list": "L\u00e4nklista",
-"Insert video": "Infoga video",
-"Insert\/edit video": "Infoga\/redigera video",
-"Insert\/edit media": "Infoga\/redigera media",
-"Alternative source": "Alternativ k\u00e4lla",
-"Poster": "Affish",
-"Paste your embed code below:": "Klistra in din inb\u00e4ddningskod nedan:",
-"Embed": "Inb\u00e4ddning",
-"Media": "Media",
-"Nonbreaking space": "Avbrottsfritt mellanrum",
-"Page break": "Sidbrytning",
-"Paste as text": "Klistra in som text",
-"Preview": "F\u00f6rhandsgranska",
-"Print": "Skriv ut",
-"Save": "Spara",
-"Find": "S\u00f6k",
-"Replace with": "Ers\u00e4tt med",
-"Replace": "Ers\u00e4tt",
-"Replace all": "Ers\u00e4tt alla",
-"Prev": "F\u00f6reg\u00e5ende",
-"Next": "N\u00e4sta",
-"Find and replace": "S\u00f6k och ers\u00e4tt",
-"Could not find the specified string.": "Kunde inte hitta den specifierade st\u00e4ngen.",
-"Match case": "Matcha gemener\/versaler",
-"Whole words": "Hela ord",
-"Spellcheck": "R\u00e4ttstava",
-"Ignore": "Ignorera",
-"Ignore all": "Ignorera alla",
-"Finish": "Avsluta",
-"Add to Dictionary": "L\u00e4gg till i ordlista",
-"Insert table": "Infoga tabell",
-"Table properties": "Tabellegenskaper",
-"Delete table": "Radera tabell",
-"Cell": "Cell",
-"Row": "Rad",
-"Column": "Kolumn",
-"Cell properties": "Cellegenskaper",
-"Merge cells": "Sammanfoga celler",
-"Split cell": "Bryt is\u00e4r celler",
-"Insert row before": "Infoga rad f\u00f6re",
-"Insert row after": "Infoga rad efter",
-"Delete row": "Radera rad",
-"Row properties": "Radegenskaper",
-"Cut row": "Klipp ut rad",
-"Copy row": "Kopiera rad",
-"Paste row before": "Klista in rad f\u00f6re",
-"Paste row after": "Klistra in rad efter",
-"Insert column before": "Infoga kolumn f\u00f6re",
-"Insert column after": "Infoga kolumn efter",
-"Delete column": "Radera kolumn",
-"Cols": "Kolumner",
-"Rows": "Rader",
-"Width": "Bredd",
-"Height": "H\u00f6jd",
-"Cell spacing": "Cellmellanrum",
-"Cell padding": "Cellpaddning",
-"Caption": "Rubrik",
-"Left": "V\u00e4nster",
-"Center": "Centrum",
-"Right": "H\u00f6ger",
-"Cell type": "Celltyp",
-"Scope": "Omf\u00e5ng",
-"Alignment": "Justering",
-"H Align": "H-justering",
-"V Align": "V-justering",
-"Top": "Toppen",
-"Middle": "Mitten",
-"Bottom": "Botten",
-"Header cell": "Huvudcell",
-"Row group": "Radgrupp",
-"Column group": "Kolumngrupp",
-"Row type": "Radtyp",
-"Header": "Huvud",
-"Body": "Kropp",
-"Footer": "Fot",
-"Border color": "Ramf\u00e4rg",
-"Insert template": "Infoga mall",
-"Templates": "Mallar",
-"Template": "Mall",
-"Text color": "Textf\u00e4rg",
-"Background color": "Bakgrundsf\u00e4rg",
-"Custom...": "Anpassad...",
-"Custom color": "Anpassad f\u00e4rg",
-"No color": "Ingen f\u00e4rg",
-"Table of Contents": "Inneh\u00e5llsf\u00f6rteckning",
-"Show blocks": "Visa block",
-"Show invisible characters": "Visa onsynliga tecken",
-"Words: {0}": "Ord: {0}",
-"{0} words": "{0} ord",
-"File": "Fil",
-"Edit": "Redigera",
-"Insert": "Infoga",
-"View": "Visa",
-"Format": "Format",
-"Table": "Tabell",
-"Tools": "Verktyg",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Textredigerare. Tryck ALT-F9 f\u00f6r menyn. Tryck ALT-F10 f\u00f6r verktygsrader. Tryck ALT-0 f\u00f6r hj\u00e4lp."
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ta.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ta.js
deleted file mode 100644
index 6d0736cf72..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ta.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('ta',{
-"Redo": "\u0bae\u0bc0\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"Undo": "\u0b9a\u0bc6\u0baf\u0bb2\u0bcd\u0ba4\u0bb5\u0bbf\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Cut": "\u0bb5\u0bc6\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Copy": "\u0ba8\u0b95\u0bb2\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
-"Paste": "\u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Select all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"New document": "\u0baa\u0bc1\u0ba4\u0bbf\u0baf \u0b86\u0bb5\u0ba3\u0bae\u0bcd",
-"Ok": "\u0b9a\u0bb0\u0bbf",
-"Cancel": "\u0bb0\u0ba4\u0bcd\u0ba4\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"Visual aids": "\u0b95\u0bbe\u0b9f\u0bcd\u0b9a\u0bbf\u0ba4\u0bcd \u0ba4\u0bc1\u0ba3\u0bc8\u0baf\u0ba9\u0bcd\u0b95\u0bb3\u0bcd",
-"Bold": "\u0ba4\u0b9f\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Italic": "\u0b9a\u0bbe\u0baf\u0bcd\u0bb5\u0bc1",
-"Underline": "\u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bcb\u0b9f\u0bc1",
-"Strikethrough": "\u0ba8\u0b9f\u0bc1\u0b95\u0bcd\u0b95\u0bcb\u0b9f\u0bc1",
-"Superscript": "\u0bae\u0bc7\u0bb2\u0bcd\u0b92\u0b9f\u0bcd\u0b9f\u0bc1",
-"Subscript": "\u0b95\u0bc0\u0bb4\u0bcd\u0b92\u0b9f\u0bcd\u0b9f\u0bc1",
-"Clear formatting": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b85\u0bb4\u0bbf\u0b95\u0bcd\u0b95",
-"Align left": "\u0b87\u0b9f\u0ba4\u0bc1 \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Align center": "\u0bae\u0bc8\u0baf \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Align right": "\u0bb5\u0bb2\u0ba4\u0bc1 \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Justify": "\u0ba8\u0bc7\u0bb0\u0bcd\u0ba4\u0bcd\u0ba4\u0bbf \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"Bullet list": "\u0baa\u0bca\u0b9f\u0bcd\u0b9f\u0bbf\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f  \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Numbered list": "\u0b8e\u0ba3\u0bcd\u0ba3\u0bbf\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Decrease indent": "\u0b89\u0bb3\u0bcd\u0ba4\u0bb3\u0bcd\u0bb3\u0bc1\u0ba4\u0bb2\u0bc8 \u0b95\u0bc1\u0bb1\u0bc8\u0b95\u0bcd\u0b95",
-"Increase indent": "\u0b89\u0bb3\u0bcd\u0ba4\u0bb3\u0bcd\u0bb3\u0bc1\u0ba4\u0bb2\u0bc8 \u0b85\u0ba4\u0bbf\u0b95\u0bb0\u0bbf\u0b95\u0bcd\u0b95",
-"Close": "\u0bae\u0bc2\u0b9f\u0bc1\u0b95",
-"Formats": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0ba8\u0b95\u0bb2\u0b95\u0ba4\u0bcd\u0ba4\u0bbf\u0bb1\u0bcd\u0b95\u0bc1 \u0ba8\u0bc7\u0bb0\u0b9f\u0bbf \u0b85\u0ba3\u0bc1\u0b95\u0bb2\u0bc8 \u0ba4\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb2\u0bbe\u0bb5\u0bbf \u0b86\u0ba4\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8. \u0b86\u0b95\u0bb5\u0bc7 \u0bb5\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0bb2\u0b95\u0bc8 \u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf\u0b95\u0bb3\u0bbe\u0ba9 Ctrl+X\/C\/V \u0b87\u0bb5\u0bb1\u0bcd\u0bb1\u0bc8 \u0ba4\u0baf\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0ba4\u0bc1 \u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95.",
-"Headers": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Header 1": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 1",
-"Header 2": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 2",
-"Header 3": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 3",
-"Header 4": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 4",
-"Header 5": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 5",
-"Header 6": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 6",
-"Headings": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Heading 1": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 1",
-"Heading 2": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 2",
-"Heading 3": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 3",
-"Heading 4": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 4",
-"Heading 5": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 5",
-"Heading 6": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 6",
-"Preformatted": "\u0bae\u0bc1\u0ba9\u0bcd\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1",
-"Div": "\u0baa\u0bbf\u0bb0\u0bbf\u0bb5\u0bc1 (Div)",
-"Pre": "\u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1 (Pre)",
-"Code": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1",
-"Paragraph": "\u0baa\u0ba4\u0bcd\u0ba4\u0bbf",
-"Blockquote": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf \u0bae\u0bc7\u0bb1\u0bcd\u0b95\u0bcb\u0bb3\u0bcd",
-"Inline": "\u0b89\u0bb3\u0bcd\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
-"Blocks": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf\u0b95\u0bb3\u0bcd",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0b87\u0baf\u0bb2\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc8 \u0bae\u0bc1\u0bb1\u0bc8\u0bae\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0ba4\u0bb1\u0bcd\u0baa\u0bcb\u0ba4\u0bc1 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0ba4\u0bb2\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0ba4\u0bc1. \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b87\u0ba8\u0bcd\u0ba4 \u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc8 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0bb5\u0bb0\u0bc8 \u0b89\u0bb3\u0bcd\u0bb3\u0b9f\u0b95\u0bcd\u0b95\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b87\u0baf\u0bb2\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b95 \u0b92\u0b9f\u0bcd\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0bae\u0bcd.",
-"Font Family": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1 \u0b95\u0bc1\u0b9f\u0bc1\u0bae\u0bcd\u0baa\u0bae\u0bcd",
-"Font Sizes": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1 \u0b85\u0bb3\u0bb5\u0bc1\u0b95\u0bb3\u0bcd",
-"Class": "Class",
-"Browse for an image": "\u0b92\u0bb0\u0bc1 \u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bc1 \u0b89\u0bb2\u0bbe\u0bb5\u0bc1\u0b95",
-"OR": "\u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1",
-"Drop an image here": "\u0b92\u0bb0\u0bc1 \u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc8 \u0b87\u0b99\u0bcd\u0b95\u0bc1 \u0b87\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd \u0baa\u0bcb\u0b9f\u0bb5\u0bc1\u0bae\u0bcd",
-"Upload": "\u0baa\u0ba4\u0bbf\u0bb5\u0bc7\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Block": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf",
-"Align": "\u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Default": "\u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc1",
-"Circle": "\u0bb5\u0b9f\u0bcd\u0b9f\u0bae\u0bcd",
-"Disc": "\u0bb5\u0b9f\u0bcd\u0b9f\u0bc1",
-"Square": "\u0b9a\u0ba4\u0bc1\u0bb0\u0bae\u0bcd",
-"Lower Alpha": "\u0b95\u0bc0\u0bb4\u0bcd \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Lower Greek": "\u0b95\u0bc0\u0bb4\u0bcd \u0b95\u0bbf\u0bb0\u0bc7\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"Lower Roman": "\u0b95\u0bc0\u0bb4\u0bcd \u0bb0\u0bcb\u0bae\u0bbe\u0ba9\u0bbf\u0baf\u0bae\u0bcd",
-"Upper Alpha": "\u0bae\u0bc7\u0bb2\u0bcd \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Upper Roman": "\u0bae\u0bc7\u0bb2\u0bcd \u0bb0\u0bcb\u0bae\u0bbe\u0ba9\u0bbf\u0baf\u0bae\u0bcd",
-"Anchor": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0bae\u0bcd",
-"Name": "\u0baa\u0bc6\u0baf\u0bb0\u0bcd",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0b86\u0ba9\u0ba4\u0bc1 \u0b92\u0bb0\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0bb2\u0bcd \u0ba4\u0bca\u0b9f\u0b99\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd; \u0b87\u0ba4\u0ba9\u0bc8\u0ba4\u0bcd \u0ba4\u0bca\u0b9f\u0bb0\u0bcd\u0ba8\u0bcd\u0ba4\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd, \u0b8e\u0ba3\u0bcd\u0b95\u0bb3\u0bcd, \u0b87\u0b9f\u0bc8\u0b95\u0bcd\u0b95\u0bc7\u0bbe\u0b9f\u0bc1\u0b95\u0bb3\u0bcd (-), \u0baa\u0bc1\u0bb3\u0bcd\u0bb3\u0bbf\u0b95\u0bb3\u0bcd (.), \u0bae\u0bc1\u0b95\u0bcd\u0b95\u0bbe\u0bb1\u0bcd\u0baa\u0bc1\u0bb3\u0bcd\u0bb3\u0bbf\u0b95\u0bb3\u0bcd (:) \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc7\u0bbe\u0b9f\u0bc1\u0b95\u0bb3\u0bcd (_) \u0bae\u0b9f\u0bcd\u0b9f\u0bc1\u0bae\u0bc7 \u0b87\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bbe\u0ba4 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0ba9; \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb1\u0bc1\u0ba4\u0bbf\u0baf\u0bbe\u0b95 \u0bb5\u0bc6\u0bb3\u0bbf\u0baf\u0bc7\u0bb1 \u0bb5\u0bbf\u0bb0\u0bc1\u0bae\u0bcd\u0baa\u0bc1\u0b95\u0bbf\u0bb1\u0bc0\u0bb0\u0bcd\u0b95\u0bbe\u0bb3\u0bbe?",
-"Restore last draft": "\u0b95\u0b9f\u0ba8\u0bcd\u0ba4 \u0bb5\u0bb0\u0bc8\u0bb5\u0bc8 \u0bae\u0bc0\u0b9f\u0bcd\u0b9f\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
-"Special character": "\u0b9a\u0bbf\u0bb1\u0baa\u0bcd\u0baa\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1",
-"Source code": "\u0bae\u0bc2\u0bb2 \u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1",
-"Insert\/Edit code sample": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0bae\u0bbe\u0ba4\u0bbf\u0bb0\u0bbf \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Language": "\u0bae\u0bca\u0bb4\u0bbf",
-"Code sample": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0bae\u0bbe\u0ba4\u0bbf\u0bb0\u0bbf",
-"Color": "\u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0b87\u0b9f\u0bae\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0bb5\u0bb2\u0bae\u0bcd",
-"Right to left": "\u0bb5\u0bb2\u0bae\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0b87\u0b9f\u0bae\u0bcd",
-"Emoticons": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Document properties": "\u0b86\u0bb5\u0ba3\u0ba4\u0bcd\u0ba4\u0bbf\u0ba9\u0bcd \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Title": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Keywords": "\u0bae\u0bc1\u0ba4\u0ba9\u0bcd\u0bae\u0bc8\u0b9a\u0bcd\u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"Description": "\u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
-"Robots": "\u0baa\u0bca\u0bb1\u0bbf\u0baf\u0ba9\u0bcd\u0b95\u0bb3\u0bcd (Robots)",
-"Author": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbe\u0bb3\u0bb0\u0bcd",
-"Encoding": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bbe\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"Fullscreen": "\u0bae\u0bc1\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0bb0\u0bc8",
-"Action": "\u0b9a\u0bc6\u0baf\u0bb2\u0bcd",
-"Shortcut": "\u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf",
-"Help": "\u0b89\u0ba4\u0bb5\u0bbf",
-"Address": "\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf",
-"Focus to menubar": "\u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Focus to toolbar": "\u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Focus to element path": "\u0bae\u0bc2\u0bb2\u0b95\u0baa\u0bcd \u0baa\u0bbe\u0ba4\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Focus to contextual toolbar": "\u0b9a\u0bc2\u0bb4\u0bcd\u0ba8\u0bbf\u0bb2\u0bc8 \u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Insert link (if link plugin activated)": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95 (\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b9a\u0bc6\u0baf\u0bb2\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0baf\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd)",
-"Save (if save plugin activated)": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95 (\u0b9a\u0bc7\u0bae\u0bbf\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b9a\u0bc6\u0baf\u0bb2\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0baf\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd)",
-"Find (if searchreplace plugin activated)": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95 (\u0ba4\u0bc7\u0b9f\u0bbf\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bb2\u0bcd \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b9a\u0bc6\u0baf\u0bb2\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0baf\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd)",
-"Plugins installed ({0}):": "\u0ba8\u0bbf\u0bb1\u0bc1\u0bb5\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc1\u0bb3\u0bcd\u0bb3 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf\u0b95\u0bb3\u0bcd ({0}):",
-"Premium plugins:": "\u0b89\u0baf\u0bb0\u0bcd\u0bae\u0ba4\u0bbf\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf\u0b95\u0bb3\u0bcd:",
-"Learn more...": "\u0bae\u0bc7\u0bb2\u0bc1\u0bae\u0bcd \u0b85\u0bb1\u0bbf\u0b95...",
-"You are using {0}": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb5\u0ba4\u0bc1 {0}",
-"Plugins": "\u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf\u0b95\u0bb3\u0bcd",
-"Handy Shortcuts": "\u0b8e\u0bb3\u0bbf\u0ba4\u0bbf\u0bb2\u0bcd \u0b95\u0bc8\u0baf\u0bbe\u0bb3\u0b95\u0bcd\u0b95\u0bc2\u0b9f\u0bbf\u0baf \u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf\u0b95\u0bb3\u0bcd",
-"Horizontal line": "\u0b95\u0bbf\u0b9f\u0bc8 \u0b95\u0bcb\u0b9f\u0bc1",
-"Insert\/edit image": "\u0baa\u0b9f\u0bae\u0bcd \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Image description": "\u0baa\u0b9f \u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
-"Source": "\u0bae\u0bc2\u0bb2\u0bae\u0bcd",
-"Dimensions": "\u0baa\u0bb0\u0bbf\u0bae\u0bbe\u0ba3\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Constrain proportions": "\u0bb5\u0bbf\u0b95\u0bbf\u0ba4\u0bbe\u0b9a\u0bcd\u0b9a\u0bbe\u0bb0\u0ba4\u0bcd\u0ba4\u0bbf\u0bb2\u0bcd \u0b95\u0b9f\u0bcd\u0b9f\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"General": "\u0baa\u0bca\u0ba4\u0bc1",
-"Advanced": "\u0bae\u0bc7\u0bae\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1",
-"Style": "\u0baa\u0bbe\u0ba3\u0bbf",
-"Vertical space": "\u0ba8\u0bc6\u0b9f\u0bc1\u0ba4\u0bb3 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Horizontal space": "\u0b95\u0bbf\u0b9f\u0bc8\u0bae\u0b9f\u0bcd\u0b9f \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Border": "\u0b95\u0bb0\u0bc8",
-"Insert image": "\u0baa\u0b9f\u0bae\u0bcd \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Image": "\u0baa\u0b9f\u0bae\u0bcd",
-"Image list": "\u0baa\u0b9f\u0baa\u0bcd \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Rotate counterclockwise": "\u0b95\u0b9f\u0bbf\u0b95\u0bbe\u0bb0 \u0b8e\u0ba4\u0bbf\u0bb0\u0bcd\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc1\u0bb4\u0bb1\u0bcd\u0bb1\u0bc1",
-"Rotate clockwise": "\u0b95\u0b9f\u0bbf\u0b95\u0bbe\u0bb0\u0ba4\u0bcd\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc1\u0bb4\u0bb1\u0bcd\u0bb1\u0bc1",
-"Flip vertically": "\u0b9a\u0bc6\u0b99\u0bcd\u0b95\u0bc1\u0ba4\u0bcd\u0ba4\u0bbe\u0b95 \u0baa\u0bc1\u0bb0\u0b9f\u0bcd\u0b9f\u0bc1",
-"Flip horizontally": "\u0b95\u0bbf\u0b9f\u0bc8\u0bae\u0b9f\u0bcd\u0b9f\u0bae\u0bbe\u0b95 \u0baa\u0bc1\u0bb0\u0b9f\u0bcd\u0b9f\u0bc1",
-"Edit image": "\u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc8 \u0ba4\u0bca\u0b95\u0bc1",
-"Image options": "\u0baa\u0b9f \u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Zoom in": "\u0baa\u0bc6\u0bb0\u0bbf\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
-"Zoom out": "\u0b9a\u0bbf\u0bb1\u0bbf\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
-"Crop": "\u0b9a\u0bc6\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bc1",
-"Resize": "\u0bae\u0bb1\u0bc1\u0b85\u0bb3\u0bb5\u0bbf\u0b9f\u0bc1",
-"Orientation": "\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bae\u0bc8\u0bb5\u0bc1",
-"Brightness": "\u0b92\u0bb3\u0bbf\u0bb0\u0bcd\u0bb5\u0bc1",
-"Sharpen": "\u0b95\u0bc2\u0bb0\u0bcd\u0bae\u0bc8\u0baf\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
-"Contrast": "\u0ba8\u0bbf\u0bb1\u0bae\u0bbe\u0bb1\u0bc1\u0baa\u0bbe\u0b9f\u0bc1",
-"Color levels": "\u0bb5\u0ba3\u0bcd\u0ba3 \u0ba8\u0bbf\u0bb2\u0bc8\u0b95\u0bb3\u0bcd",
-"Gamma": "Gamma",
-"Invert": "\u0ba8\u0bc7\u0bb0\u0bcd\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1",
-"Apply": "\u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Back": "\u0baa\u0bbf\u0ba9\u0bcd",
-"Insert date\/time": "\u0ba4\u0bc7\u0ba4\u0bbf\/\u0ba8\u0bc7\u0bb0\u0bae\u0bcd \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Date\/time": "\u0ba4\u0bc7\u0ba4\u0bbf\/\u0ba8\u0bc7\u0bb0\u0bae\u0bcd",
-"Insert link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert\/edit link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Text to display": "\u0b95\u0bbe\u0b9f\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bbf\u0baf \u0b89\u0bb0\u0bc8",
-"Url": "\u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf",
-"Target": "\u0b87\u0bb2\u0b95\u0bcd\u0b95\u0bc1",
-"None": "\u0b8f\u0ba4\u0bc1\u0bae\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
-"New window": "\u0baa\u0bc1\u0ba4\u0bbf\u0baf \u0b9a\u0bbe\u0bb3\u0bb0\u0bae\u0bcd",
-"Remove link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc8 \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Anchors": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Paste or type a link": "\u0b92\u0bb0\u0bc1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95 \u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1 \u0ba4\u0b9f\u0bcd\u0b9f\u0b9a\u0bcd\u0b9a\u0bbf\u0b9f\u0bc1\u0b95",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bae\u0bbf\u0ba9\u0bcd-\u0b85\u0b9e\u0bcd\u0b9a\u0bb2\u0bcd \u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 mailto: \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8\u0ba4\u0bcd (prefix) \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bbe?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bb5\u0bc6\u0bb3\u0bbf\u0baa\u0bcd\u0baa\u0bc1\u0bb1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 (external link) \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 http:\/\/ \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8\u0ba4\u0bcd (prefix) \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bbe?",
-"Link list": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0baa\u0bcd \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Insert video": "\u0b95\u0bbe\u0ba3\u0bca\u0bb3\u0bbf \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert\/edit video": "\u0b95\u0bbe\u0ba3\u0bca\u0bb3\u0bbf \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Insert\/edit media": "\u0b8a\u0b9f\u0b95\u0bae\u0bcd \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Alternative source": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0bae\u0bc2\u0bb2\u0bae\u0bcd",
-"Poster": "\u0b9a\u0bc1\u0bb5\u0bb0\u0bca\u0b9f\u0bcd\u0b9f\u0bbf",
-"Paste your embed code below:": "\u0ba4\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0b9f\u0bcd\u0baa\u0bc6\u0bbe\u0ba4\u0bbf \u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bcd\u0b9f\u0bc8 \u0b95\u0bc0\u0bb4\u0bc7 \u0b92\u0b9f\u0bcd\u0b9f\u0bb5\u0bc1\u0bae\u0bcd:",
-"Embed": "\u0b89\u0b9f\u0bcd\u0baa\u0bca\u0ba4\u0bbf",
-"Media": "\u0b8a\u0b9f\u0b95\u0bae\u0bcd",
-"Nonbreaking space": "\u0baa\u0bbf\u0bb0\u0bbf\u0baf\u0bbe\u0ba4 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Page break": "\u0baa\u0b95\u0bcd\u0b95 \u0baa\u0bbf\u0bb0\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Paste as text": "\u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b95 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Preview": "\u0bae\u0bc1\u0ba9\u0bcd\u0ba8\u0bcb\u0b95\u0bcd\u0b95\u0bc1",
-"Print": "\u0b85\u0b9a\u0bcd\u0b9a\u0bbf\u0b9f\u0bc1\u0b95",
-"Save": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95",
-"Find": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
-"Replace with": "\u0b87\u0ba4\u0ba9\u0bc1\u0b9f\u0ba9\u0bcd \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Replace": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Replace all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Prev": "\u0bae\u0bc1\u0ba8\u0bcd\u0ba4\u0bc8\u0baf",
-"Next": "\u0b85\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4",
-"Find and replace": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Could not find the specified string.": "\u0b95\u0bc1\u0bb1\u0bbf\u0baa\u0bcd\u0baa\u0bbf\u0b9f\u0bcd\u0b9f \u0b9a\u0bb0\u0bae\u0bcd \u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95 \u0bae\u0bc1\u0b9f\u0bbf\u0baf\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
-"Match case": "\u0bb5\u0b9f\u0bbf\u0bb5\u0ba4\u0bcd\u0ba4\u0bc8 \u0baa\u0bca\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Whole words": "\u0bae\u0bc1\u0bb4\u0bc1 \u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"Spellcheck": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8\u0baf\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Ignore": "\u0baa\u0bc1\u0bb1\u0b95\u0bcd\u0b95\u0ba3\u0bbf\u0b95\u0bcd\u0b95",
-"Ignore all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0baa\u0bc1\u0bb1\u0b95\u0bcd\u0b95\u0ba3\u0bbf\u0b95\u0bcd\u0b95",
-"Finish": "\u0bae\u0bc1\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
-"Add to Dictionary": "\u0b85\u0b95\u0bb0\u0bbe\u0ba4\u0bbf\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Insert table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Table properties": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Delete table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Cell": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8",
-"Row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
-"Column": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
-"Cell properties": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Merge cells": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Split cell": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0baa\u0bbf\u0bb0\u0bbf\u0b95\u0bcd\u0b95",
-"Insert row before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert row after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Delete row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Row properties": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Cut row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0bb5\u0bc6\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Copy row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0b95\u0bb2\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
-"Paste row before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Paste row after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Insert column before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert column after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Delete column": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Cols": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0b95\u0bb3\u0bcd",
-"Rows": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0b95\u0bb3\u0bcd",
-"Width": "\u0b85\u0b95\u0bb2\u0bae\u0bcd",
-"Height": "\u0b89\u0baf\u0bb0\u0bae\u0bcd",
-"Cell spacing": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Cell padding": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0ba8\u0bbf\u0bb0\u0baa\u0bcd\u0baa\u0bb2\u0bcd",
-"Caption": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Left": "\u0b87\u0b9f\u0bae\u0bcd",
-"Center": "\u0bae\u0bc8\u0baf\u0bae\u0bcd",
-"Right": "\u0bb5\u0bb2\u0bae\u0bcd",
-"Cell type": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0bb5\u0b95\u0bc8",
-"Scope": "\u0bb5\u0bb0\u0bc8\u0baf\u0bc6\u0bb2\u0bcd\u0bb2\u0bc8",
-"Alignment": "\u0b9a\u0bc0\u0bb0\u0bae\u0bc8\u0bb5\u0bc1",
-"H Align": "\u0b95\u0bbf (H) \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"V Align": "\u0b9a\u0bc6 (V) \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Top": "\u0bae\u0bc7\u0bb2\u0bcd",
-"Middle": "\u0ba8\u0b9f\u0bc1",
-"Bottom": "\u0b95\u0bc0\u0bb4\u0bcd",
-"Header cell": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8",
-"Row group": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b95\u0bc1\u0bb4\u0bc1",
-"Column group": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b95\u0bc1\u0bb4\u0bc1",
-"Row type": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0bb5\u0b95\u0bc8",
-"Header": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Body": "\u0b89\u0b9f\u0bb2\u0bcd",
-"Footer": "\u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc1\u0bb1\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Border color": "\u0b95\u0bb0\u0bc8\u0baf\u0bbf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Insert template": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Templates": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
-"Template": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1",
-"Text color": "\u0b89\u0bb0\u0bc8\u0baf\u0bbf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Background color": "\u0baa\u0bbf\u0ba9\u0bcd\u0ba9\u0ba3\u0bbf \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Custom...": "\u0ba4\u0ba9\u0bbf\u0baa\u0bcd\u0baa\u0baf\u0ba9\u0bcd...",
-"Custom color": "\u0ba4\u0ba9\u0bbf\u0baa\u0bcd\u0baa\u0baf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"No color": "\u0ba8\u0bbf\u0bb1\u0bae\u0bcd \u0b87\u0bb2\u0bcd\u0bb2\u0bc8",
-"Table of Contents": "\u0baa\u0bca\u0bb0\u0bc1\u0bb3\u0b9f\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"Show blocks": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf\u0b95\u0bb3\u0bc8 \u0b95\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Show invisible characters": "\u0b95\u0ba3\u0bcd\u0ba3\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0ba4\u0bcd \u0ba4\u0bc6\u0bb0\u0bbf\u0baf\u0bbe\u0ba4 \u0b89\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bc8 \u0b95\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Words: {0}": "\u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd: {0}",
-"{0} words": "{0} \u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"File": "\u0b95\u0bcb\u0baa\u0bcd\u0baa\u0bc1",
-"Edit": "\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Insert": "\u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"View": "\u0ba8\u0bcb\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Format": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8",
-"Tools": "\u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0b95\u0bb3\u0bcd",
-"Powered by {0}": "\u0bb5\u0bb2\u0bc1\u0bb5\u0bb3\u0bbf\u0baa\u0bcd\u0baa\u0ba4\u0bc1 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0b89\u0baf\u0bb0\u0bcd \u0b89\u0bb0\u0bc8 \u0baa\u0b95\u0bc1\u0ba4\u0bbf. \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc1 ALT-F9 , \u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0b95\u0bcd\u0b95\u0bc1 ALT-F10 , \u0b89\u0ba4\u0bb5\u0bbf\u0b95\u0bcd\u0b95\u0bc1 ALT-0"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ta_IN.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ta_IN.js
deleted file mode 100644
index faa20ef916..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ta_IN.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('ta_IN',{
-"Redo": "\u0bae\u0bc0\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"Undo": "\u0b9a\u0bc6\u0baf\u0bb2\u0bcd\u0ba4\u0bb5\u0bbf\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Cut": "\u0bb5\u0bc6\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Copy": "\u0ba8\u0b95\u0bb2\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
-"Paste": "\u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Select all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"New document": "\u0baa\u0bc1\u0ba4\u0bbf\u0baf \u0b86\u0bb5\u0ba3\u0bae\u0bcd",
-"Ok": "\u0b9a\u0bb0\u0bbf",
-"Cancel": "\u0bb0\u0ba4\u0bcd\u0ba4\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"Visual aids": "\u0b95\u0bbe\u0b9f\u0bcd\u0b9a\u0bbf\u0ba4\u0bcd \u0ba4\u0bc1\u0ba3\u0bc8\u0baf\u0ba9\u0bcd\u0b95\u0bb3\u0bcd",
-"Bold": "\u0ba4\u0b9f\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Italic": "\u0b9a\u0bbe\u0baf\u0bcd\u0bb5\u0bc1",
-"Underline": "\u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bcb\u0b9f\u0bc1",
-"Strikethrough": "\u0ba8\u0b9f\u0bc1\u0b95\u0bcd\u0b95\u0bcb\u0b9f\u0bc1",
-"Superscript": "\u0bae\u0bc7\u0bb2\u0bcd\u0b92\u0b9f\u0bcd\u0b9f\u0bc1",
-"Subscript": "\u0b95\u0bc0\u0bb4\u0bcd\u0b92\u0b9f\u0bcd\u0b9f\u0bc1",
-"Clear formatting": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b85\u0bb4\u0bbf\u0b95\u0bcd\u0b95",
-"Align left": "\u0b87\u0b9f\u0ba4\u0bc1 \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Align center": "\u0bae\u0bc8\u0baf \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Align right": "\u0bb5\u0bb2\u0ba4\u0bc1 \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Justify": "\u0ba8\u0bc7\u0bb0\u0bcd\u0ba4\u0bcd\u0ba4\u0bbf \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"Bullet list": "\u0baa\u0bca\u0b9f\u0bcd\u0b9f\u0bbf\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f  \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Numbered list": "\u0b8e\u0ba3\u0bcd\u0ba3\u0bbf\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Decrease indent": "\u0b89\u0bb3\u0bcd\u0ba4\u0bb3\u0bcd\u0bb3\u0bc1\u0ba4\u0bb2\u0bc8 \u0b95\u0bc1\u0bb1\u0bc8\u0b95\u0bcd\u0b95",
-"Increase indent": "\u0b89\u0bb3\u0bcd\u0ba4\u0bb3\u0bcd\u0bb3\u0bc1\u0ba4\u0bb2\u0bc8 \u0b85\u0ba4\u0bbf\u0b95\u0bb0\u0bbf\u0b95\u0bcd\u0b95",
-"Close": "\u0bae\u0bc2\u0b9f\u0bc1\u0b95",
-"Formats": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0ba8\u0b95\u0bb2\u0b95\u0ba4\u0bcd\u0ba4\u0bbf\u0bb1\u0bcd\u0b95\u0bc1 \u0ba8\u0bc7\u0bb0\u0b9f\u0bbf \u0b85\u0ba3\u0bc1\u0b95\u0bb2\u0bc8 \u0ba4\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb2\u0bbe\u0bb5\u0bbf \u0b86\u0ba4\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8. \u0b86\u0b95\u0bb5\u0bc7 \u0bb5\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0bb2\u0b95\u0bc8 \u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf\u0b95\u0bb3\u0bbe\u0ba9 Ctrl+X\/C\/V \u0b87\u0bb5\u0bb1\u0bcd\u0bb1\u0bc8 \u0ba4\u0baf\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0ba4\u0bc1 \u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95.",
-"Headers": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Header 1": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 1",
-"Header 2": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 2",
-"Header 3": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 3",
-"Header 4": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 4",
-"Header 5": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 5",
-"Header 6": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 6",
-"Headings": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Heading 1": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 1",
-"Heading 2": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 2",
-"Heading 3": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 3",
-"Heading 4": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 4",
-"Heading 5": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 5",
-"Heading 6": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 6",
-"Preformatted": "\u0bae\u0bc1\u0ba9\u0bcd\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1",
-"Div": "\u0baa\u0bbf\u0bb0\u0bbf\u0bb5\u0bc1 (Div)",
-"Pre": "\u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1 (Pre)",
-"Code": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1",
-"Paragraph": "\u0baa\u0ba4\u0bcd\u0ba4\u0bbf",
-"Blockquote": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf \u0bae\u0bc7\u0bb1\u0bcd\u0b95\u0bcb\u0bb3\u0bcd",
-"Inline": "\u0b89\u0bb3\u0bcd\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
-"Blocks": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf\u0b95\u0bb3\u0bcd",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0b87\u0baf\u0bb2\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc8 \u0bae\u0bc1\u0bb1\u0bc8\u0bae\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0ba4\u0bb1\u0bcd\u0baa\u0bcb\u0ba4\u0bc1 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0ba4\u0bb2\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0ba4\u0bc1. \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b87\u0ba8\u0bcd\u0ba4 \u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc8 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0bb5\u0bb0\u0bc8 \u0b89\u0bb3\u0bcd\u0bb3\u0b9f\u0b95\u0bcd\u0b95\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b87\u0baf\u0bb2\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b95 \u0b92\u0b9f\u0bcd\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0bae\u0bcd.",
-"Font Family": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1 \u0b95\u0bc1\u0b9f\u0bc1\u0bae\u0bcd\u0baa\u0bae\u0bcd",
-"Font Sizes": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1 \u0b85\u0bb3\u0bb5\u0bc1\u0b95\u0bb3\u0bcd",
-"Class": "Class",
-"Browse for an image": "\u0b92\u0bb0\u0bc1 \u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bc1 \u0b89\u0bb2\u0bbe\u0bb5\u0bc1\u0b95",
-"OR": "\u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1",
-"Drop an image here": "\u0b92\u0bb0\u0bc1 \u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc8 \u0b87\u0b99\u0bcd\u0b95\u0bc1 \u0b87\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd \u0baa\u0bcb\u0b9f\u0bb5\u0bc1\u0bae\u0bcd",
-"Upload": "\u0baa\u0ba4\u0bbf\u0bb5\u0bc7\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Block": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf",
-"Align": "\u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Default": "\u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc1",
-"Circle": "\u0bb5\u0b9f\u0bcd\u0b9f\u0bae\u0bcd",
-"Disc": "\u0bb5\u0b9f\u0bcd\u0b9f\u0bc1",
-"Square": "\u0b9a\u0ba4\u0bc1\u0bb0\u0bae\u0bcd",
-"Lower Alpha": "\u0b95\u0bc0\u0bb4\u0bcd \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Lower Greek": "\u0b95\u0bc0\u0bb4\u0bcd \u0b95\u0bbf\u0bb0\u0bc7\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"Lower Roman": "\u0b95\u0bc0\u0bb4\u0bcd \u0bb0\u0bcb\u0bae\u0bbe\u0ba9\u0bbf\u0baf\u0bae\u0bcd",
-"Upper Alpha": "\u0bae\u0bc7\u0bb2\u0bcd \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Upper Roman": "\u0bae\u0bc7\u0bb2\u0bcd \u0bb0\u0bcb\u0bae\u0bbe\u0ba9\u0bbf\u0baf\u0bae\u0bcd",
-"Anchor": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0bae\u0bcd",
-"Name": "\u0baa\u0bc6\u0baf\u0bb0\u0bcd",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0b86\u0ba9\u0ba4\u0bc1 \u0b92\u0bb0\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0bb2\u0bcd \u0ba4\u0bca\u0b9f\u0b99\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd; \u0b87\u0ba4\u0ba9\u0bc8\u0ba4\u0bcd \u0ba4\u0bca\u0b9f\u0bb0\u0bcd\u0ba8\u0bcd\u0ba4\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd, \u0b8e\u0ba3\u0bcd\u0b95\u0bb3\u0bcd, \u0b87\u0b9f\u0bc8\u0b95\u0bcd\u0b95\u0bc7\u0bbe\u0b9f\u0bc1\u0b95\u0bb3\u0bcd (-), \u0baa\u0bc1\u0bb3\u0bcd\u0bb3\u0bbf\u0b95\u0bb3\u0bcd (.), \u0bae\u0bc1\u0b95\u0bcd\u0b95\u0bbe\u0bb1\u0bcd\u0baa\u0bc1\u0bb3\u0bcd\u0bb3\u0bbf\u0b95\u0bb3\u0bcd (:) \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc7\u0bbe\u0b9f\u0bc1\u0b95\u0bb3\u0bcd (_) \u0bae\u0b9f\u0bcd\u0b9f\u0bc1\u0bae\u0bc7 \u0b87\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bbe\u0ba4 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0ba9; \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb1\u0bc1\u0ba4\u0bbf\u0baf\u0bbe\u0b95 \u0bb5\u0bc6\u0bb3\u0bbf\u0baf\u0bc7\u0bb1 \u0bb5\u0bbf\u0bb0\u0bc1\u0bae\u0bcd\u0baa\u0bc1\u0b95\u0bbf\u0bb1\u0bc0\u0bb0\u0bcd\u0b95\u0bbe\u0bb3\u0bbe?",
-"Restore last draft": "\u0b95\u0b9f\u0ba8\u0bcd\u0ba4 \u0bb5\u0bb0\u0bc8\u0bb5\u0bc8 \u0bae\u0bc0\u0b9f\u0bcd\u0b9f\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
-"Special character": "\u0b9a\u0bbf\u0bb1\u0baa\u0bcd\u0baa\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1",
-"Source code": "\u0bae\u0bc2\u0bb2 \u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1",
-"Insert\/Edit code sample": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0bae\u0bbe\u0ba4\u0bbf\u0bb0\u0bbf \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Language": "\u0bae\u0bca\u0bb4\u0bbf",
-"Code sample": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0bae\u0bbe\u0ba4\u0bbf\u0bb0\u0bbf",
-"Color": "\u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0b87\u0b9f\u0bae\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0bb5\u0bb2\u0bae\u0bcd",
-"Right to left": "\u0bb5\u0bb2\u0bae\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0b87\u0b9f\u0bae\u0bcd",
-"Emoticons": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Document properties": "\u0b86\u0bb5\u0ba3\u0ba4\u0bcd\u0ba4\u0bbf\u0ba9\u0bcd \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Title": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Keywords": "\u0bae\u0bc1\u0ba4\u0ba9\u0bcd\u0bae\u0bc8\u0b9a\u0bcd\u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"Description": "\u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
-"Robots": "\u0baa\u0bca\u0bb1\u0bbf\u0baf\u0ba9\u0bcd\u0b95\u0bb3\u0bcd (Robots)",
-"Author": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbe\u0bb3\u0bb0\u0bcd",
-"Encoding": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bbe\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"Fullscreen": "\u0bae\u0bc1\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0bb0\u0bc8",
-"Action": "\u0b9a\u0bc6\u0baf\u0bb2\u0bcd",
-"Shortcut": "\u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf",
-"Help": "\u0b89\u0ba4\u0bb5\u0bbf",
-"Address": "\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf",
-"Focus to menubar": "\u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Focus to toolbar": "\u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Focus to element path": "\u0bae\u0bc2\u0bb2\u0b95\u0baa\u0bcd \u0baa\u0bbe\u0ba4\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Focus to contextual toolbar": "\u0b9a\u0bc2\u0bb4\u0bcd\u0ba8\u0bbf\u0bb2\u0bc8 \u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Insert link (if link plugin activated)": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95 (\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b9a\u0bc6\u0baf\u0bb2\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0baf\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd)",
-"Save (if save plugin activated)": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95 (\u0b9a\u0bc7\u0bae\u0bbf\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b9a\u0bc6\u0baf\u0bb2\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0baf\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd)",
-"Find (if searchreplace plugin activated)": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95 (\u0ba4\u0bc7\u0b9f\u0bbf\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bb2\u0bcd \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b9a\u0bc6\u0baf\u0bb2\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0baf\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd)",
-"Plugins installed ({0}):": "\u0ba8\u0bbf\u0bb1\u0bc1\u0bb5\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc1\u0bb3\u0bcd\u0bb3 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf\u0b95\u0bb3\u0bcd ({0}):",
-"Premium plugins:": "\u0b89\u0baf\u0bb0\u0bcd\u0bae\u0ba4\u0bbf\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf\u0b95\u0bb3\u0bcd:",
-"Learn more...": "\u0bae\u0bc7\u0bb2\u0bc1\u0bae\u0bcd \u0b85\u0bb1\u0bbf\u0b95...",
-"You are using {0}": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb5\u0ba4\u0bc1 {0}",
-"Plugins": "\u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf\u0b95\u0bb3\u0bcd",
-"Handy Shortcuts": "\u0b8e\u0bb3\u0bbf\u0ba4\u0bbf\u0bb2\u0bcd \u0b95\u0bc8\u0baf\u0bbe\u0bb3\u0b95\u0bcd\u0b95\u0bc2\u0b9f\u0bbf\u0baf \u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf\u0b95\u0bb3\u0bcd",
-"Horizontal line": "\u0b95\u0bbf\u0b9f\u0bc8 \u0b95\u0bcb\u0b9f\u0bc1",
-"Insert\/edit image": "\u0baa\u0b9f\u0bae\u0bcd \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Image description": "\u0baa\u0b9f \u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
-"Source": "\u0bae\u0bc2\u0bb2\u0bae\u0bcd",
-"Dimensions": "\u0baa\u0bb0\u0bbf\u0bae\u0bbe\u0ba3\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Constrain proportions": "\u0bb5\u0bbf\u0b95\u0bbf\u0ba4\u0bbe\u0b9a\u0bcd\u0b9a\u0bbe\u0bb0\u0ba4\u0bcd\u0ba4\u0bbf\u0bb2\u0bcd \u0b95\u0b9f\u0bcd\u0b9f\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"General": "\u0baa\u0bca\u0ba4\u0bc1",
-"Advanced": "\u0bae\u0bc7\u0bae\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1",
-"Style": "\u0baa\u0bbe\u0ba3\u0bbf",
-"Vertical space": "\u0ba8\u0bc6\u0b9f\u0bc1\u0ba4\u0bb3 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Horizontal space": "\u0b95\u0bbf\u0b9f\u0bc8\u0bae\u0b9f\u0bcd\u0b9f \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Border": "\u0b95\u0bb0\u0bc8",
-"Insert image": "\u0baa\u0b9f\u0bae\u0bcd \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Image": "\u0baa\u0b9f\u0bae\u0bcd",
-"Image list": "\u0baa\u0b9f\u0baa\u0bcd \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Rotate counterclockwise": "\u0b95\u0b9f\u0bbf\u0b95\u0bbe\u0bb0 \u0b8e\u0ba4\u0bbf\u0bb0\u0bcd\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc1\u0bb4\u0bb1\u0bcd\u0bb1\u0bc1",
-"Rotate clockwise": "\u0b95\u0b9f\u0bbf\u0b95\u0bbe\u0bb0\u0ba4\u0bcd\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc1\u0bb4\u0bb1\u0bcd\u0bb1\u0bc1",
-"Flip vertically": "\u0b9a\u0bc6\u0b99\u0bcd\u0b95\u0bc1\u0ba4\u0bcd\u0ba4\u0bbe\u0b95 \u0baa\u0bc1\u0bb0\u0b9f\u0bcd\u0b9f\u0bc1",
-"Flip horizontally": "\u0b95\u0bbf\u0b9f\u0bc8\u0bae\u0b9f\u0bcd\u0b9f\u0bae\u0bbe\u0b95 \u0baa\u0bc1\u0bb0\u0b9f\u0bcd\u0b9f\u0bc1",
-"Edit image": "\u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc8 \u0ba4\u0bca\u0b95\u0bc1",
-"Image options": "\u0baa\u0b9f \u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Zoom in": "\u0baa\u0bc6\u0bb0\u0bbf\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
-"Zoom out": "\u0b9a\u0bbf\u0bb1\u0bbf\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
-"Crop": "\u0b9a\u0bc6\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bc1",
-"Resize": "\u0bae\u0bb1\u0bc1\u0b85\u0bb3\u0bb5\u0bbf\u0b9f\u0bc1",
-"Orientation": "\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bae\u0bc8\u0bb5\u0bc1",
-"Brightness": "\u0b92\u0bb3\u0bbf\u0bb0\u0bcd\u0bb5\u0bc1",
-"Sharpen": "\u0b95\u0bc2\u0bb0\u0bcd\u0bae\u0bc8\u0baf\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
-"Contrast": "\u0ba8\u0bbf\u0bb1\u0bae\u0bbe\u0bb1\u0bc1\u0baa\u0bbe\u0b9f\u0bc1",
-"Color levels": "\u0bb5\u0ba3\u0bcd\u0ba3 \u0ba8\u0bbf\u0bb2\u0bc8\u0b95\u0bb3\u0bcd",
-"Gamma": "Gamma",
-"Invert": "\u0ba8\u0bc7\u0bb0\u0bcd\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1",
-"Apply": "\u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Back": "\u0baa\u0bbf\u0ba9\u0bcd",
-"Insert date\/time": "\u0ba4\u0bc7\u0ba4\u0bbf\/\u0ba8\u0bc7\u0bb0\u0bae\u0bcd \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Date\/time": "\u0ba4\u0bc7\u0ba4\u0bbf\/\u0ba8\u0bc7\u0bb0\u0bae\u0bcd",
-"Insert link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert\/edit link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Text to display": "\u0b95\u0bbe\u0b9f\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bbf\u0baf \u0b89\u0bb0\u0bc8",
-"Url": "\u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf",
-"Target": "\u0b87\u0bb2\u0b95\u0bcd\u0b95\u0bc1",
-"None": "\u0b8f\u0ba4\u0bc1\u0bae\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
-"New window": "\u0baa\u0bc1\u0ba4\u0bbf\u0baf \u0b9a\u0bbe\u0bb3\u0bb0\u0bae\u0bcd",
-"Remove link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc8 \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Anchors": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Paste or type a link": "\u0b92\u0bb0\u0bc1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95 \u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1 \u0ba4\u0b9f\u0bcd\u0b9f\u0b9a\u0bcd\u0b9a\u0bbf\u0b9f\u0bc1\u0b95",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bae\u0bbf\u0ba9\u0bcd-\u0b85\u0b9e\u0bcd\u0b9a\u0bb2\u0bcd \u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 mailto: \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8\u0ba4\u0bcd (prefix) \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bbe?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bb5\u0bc6\u0bb3\u0bbf\u0baa\u0bcd\u0baa\u0bc1\u0bb1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 (external link) \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 http:\/\/ \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8\u0ba4\u0bcd (prefix) \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bbe?",
-"Link list": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0baa\u0bcd \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Insert video": "\u0b95\u0bbe\u0ba3\u0bca\u0bb3\u0bbf \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert\/edit video": "\u0b95\u0bbe\u0ba3\u0bca\u0bb3\u0bbf \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Insert\/edit media": "\u0b8a\u0b9f\u0b95\u0bae\u0bcd \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Alternative source": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0bae\u0bc2\u0bb2\u0bae\u0bcd",
-"Poster": "\u0b9a\u0bc1\u0bb5\u0bb0\u0bca\u0b9f\u0bcd\u0b9f\u0bbf",
-"Paste your embed code below:": "\u0ba4\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0b9f\u0bcd\u0baa\u0bc6\u0bbe\u0ba4\u0bbf \u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bcd\u0b9f\u0bc8 \u0b95\u0bc0\u0bb4\u0bc7 \u0b92\u0b9f\u0bcd\u0b9f\u0bb5\u0bc1\u0bae\u0bcd:",
-"Embed": "\u0b89\u0b9f\u0bcd\u0baa\u0bca\u0ba4\u0bbf",
-"Media": "\u0b8a\u0b9f\u0b95\u0bae\u0bcd",
-"Nonbreaking space": "\u0baa\u0bbf\u0bb0\u0bbf\u0baf\u0bbe\u0ba4 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Page break": "\u0baa\u0b95\u0bcd\u0b95 \u0baa\u0bbf\u0bb0\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Paste as text": "\u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b95 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Preview": "\u0bae\u0bc1\u0ba9\u0bcd\u0ba8\u0bcb\u0b95\u0bcd\u0b95\u0bc1",
-"Print": "\u0b85\u0b9a\u0bcd\u0b9a\u0bbf\u0b9f\u0bc1\u0b95",
-"Save": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95",
-"Find": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
-"Replace with": "\u0b87\u0ba4\u0ba9\u0bc1\u0b9f\u0ba9\u0bcd \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Replace": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Replace all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Prev": "\u0bae\u0bc1\u0ba8\u0bcd\u0ba4\u0bc8\u0baf",
-"Next": "\u0b85\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4",
-"Find and replace": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Could not find the specified string.": "\u0b95\u0bc1\u0bb1\u0bbf\u0baa\u0bcd\u0baa\u0bbf\u0b9f\u0bcd\u0b9f \u0b9a\u0bb0\u0bae\u0bcd \u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95 \u0bae\u0bc1\u0b9f\u0bbf\u0baf\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
-"Match case": "\u0bb5\u0b9f\u0bbf\u0bb5\u0ba4\u0bcd\u0ba4\u0bc8 \u0baa\u0bca\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Whole words": "\u0bae\u0bc1\u0bb4\u0bc1 \u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"Spellcheck": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8\u0baf\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Ignore": "\u0baa\u0bc1\u0bb1\u0b95\u0bcd\u0b95\u0ba3\u0bbf\u0b95\u0bcd\u0b95",
-"Ignore all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0baa\u0bc1\u0bb1\u0b95\u0bcd\u0b95\u0ba3\u0bbf\u0b95\u0bcd\u0b95",
-"Finish": "\u0bae\u0bc1\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
-"Add to Dictionary": "\u0b85\u0b95\u0bb0\u0bbe\u0ba4\u0bbf\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Insert table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Table properties": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Delete table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Cell": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8",
-"Row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
-"Column": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
-"Cell properties": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Merge cells": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Split cell": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0baa\u0bbf\u0bb0\u0bbf\u0b95\u0bcd\u0b95",
-"Insert row before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert row after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Delete row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Row properties": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Cut row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0bb5\u0bc6\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Copy row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0b95\u0bb2\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
-"Paste row before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Paste row after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Insert column before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert column after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Delete column": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Cols": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0b95\u0bb3\u0bcd",
-"Rows": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0b95\u0bb3\u0bcd",
-"Width": "\u0b85\u0b95\u0bb2\u0bae\u0bcd",
-"Height": "\u0b89\u0baf\u0bb0\u0bae\u0bcd",
-"Cell spacing": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Cell padding": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0ba8\u0bbf\u0bb0\u0baa\u0bcd\u0baa\u0bb2\u0bcd",
-"Caption": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Left": "\u0b87\u0b9f\u0bae\u0bcd",
-"Center": "\u0bae\u0bc8\u0baf\u0bae\u0bcd",
-"Right": "\u0bb5\u0bb2\u0bae\u0bcd",
-"Cell type": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0bb5\u0b95\u0bc8",
-"Scope": "\u0bb5\u0bb0\u0bc8\u0baf\u0bc6\u0bb2\u0bcd\u0bb2\u0bc8",
-"Alignment": "\u0b9a\u0bc0\u0bb0\u0bae\u0bc8\u0bb5\u0bc1",
-"H Align": "\u0b95\u0bbf (H) \u0b87\u0b9a\u0bc8\u0bb5\u0bc1",
-"V Align": "\u0b9a\u0bc6 (V) \u0b87\u0b9a\u0bc8\u0bb5\u0bc1",
-"Top": "\u0bae\u0bc7\u0bb2\u0bcd",
-"Middle": "\u0ba8\u0b9f\u0bc1",
-"Bottom": "\u0bae\u0bc7\u0bb2\u0bcd",
-"Header cell": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8",
-"Row group": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b95\u0bc1\u0bb4\u0bc1",
-"Column group": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b95\u0bc1\u0bb4\u0bc1",
-"Row type": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0bb5\u0b95\u0bc8",
-"Header": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Body": "\u0b89\u0b9f\u0bb2\u0bcd",
-"Footer": "\u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc1\u0bb1\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Border color": "\u0b95\u0bb0\u0bc8\u0baf\u0bbf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Insert template": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Templates": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
-"Template": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1",
-"Text color": "\u0b89\u0bb0\u0bc8\u0baf\u0bbf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Background color": "\u0baa\u0bbf\u0ba9\u0bcd\u0ba9\u0ba3\u0bbf \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Custom...": "\u0ba4\u0ba9\u0bbf\u0baa\u0bcd\u0baa\u0baf\u0ba9\u0bcd...",
-"Custom color": "\u0ba4\u0ba9\u0bbf\u0baa\u0bcd\u0baa\u0baf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"No color": "\u0ba8\u0bbf\u0bb1\u0bae\u0bcd \u0b87\u0bb2\u0bcd\u0bb2\u0bc8",
-"Table of Contents": "\u0baa\u0bca\u0bb0\u0bc1\u0bb3\u0b9f\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"Show blocks": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf\u0b95\u0bb3\u0bc8 \u0b95\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Show invisible characters": "\u0b95\u0ba3\u0bcd\u0ba3\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0ba4\u0bcd \u0ba4\u0bc6\u0bb0\u0bbf\u0baf\u0bbe\u0ba4 \u0b89\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bc8 \u0b95\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Words: {0}": "\u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd: {0}",
-"{0} words": "{0} \u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"File": "\u0b95\u0bcb\u0baa\u0bcd\u0baa\u0bc1",
-"Edit": "\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Insert": "\u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"View": "\u0ba8\u0bcb\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Format": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8",
-"Tools": "\u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0b95\u0bb3\u0bcd",
-"Powered by {0}": "\u0bb5\u0bb2\u0bc1\u0bb5\u0bb3\u0bbf\u0baa\u0bcd\u0baa\u0ba4\u0bc1 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0b89\u0baf\u0bb0\u0bcd \u0b89\u0bb0\u0bc8 \u0baa\u0b95\u0bc1\u0ba4\u0bbf. \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc1 ALT-F9 , \u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0b95\u0bcd\u0b95\u0bc1 ALT-F10 , \u0b89\u0ba4\u0bb5\u0bbf\u0b95\u0bcd\u0b95\u0bc1 ALT-0"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/th_TH.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/th_TH.js
deleted file mode 100644
index 9e42a9243a..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/th_TH.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('th_TH',{
-"Redo": "\u0e17\u0e4d\u0e32\u0e0b\u0e49\u0e33",
-"Undo": "\u0e40\u0e25\u0e34\u0e01\u0e17\u0e33",
-"Cut": "\u0e15\u0e31\u0e14",
-"Copy": "\u0e04\u0e31\u0e14\u0e25\u0e2d\u0e01",
-"Paste": "\u0e27\u0e32\u0e07",
-"Select all": "\u0e40\u0e25\u0e37\u0e2d\u0e01\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14",
-"New document": "\u0e40\u0e2d\u0e01\u0e2a\u0e32\u0e23\u0e43\u0e2b\u0e21\u0e48",
-"Ok": "\u0e15\u0e01\u0e25\u0e07",
-"Cancel": "\u0e22\u0e01\u0e40\u0e25\u0e34\u0e01",
-"Visual aids": "\u0e17\u0e31\u0e28\u0e19\u0e39\u0e1b\u0e01\u0e23\u0e13\u0e4c",
-"Bold": "\u0e15\u0e31\u0e27\u0e2b\u0e19\u0e32",
-"Italic": "\u0e15\u0e31\u0e27\u0e40\u0e2d\u0e35\u0e22\u0e07",
-"Underline": "\u0e02\u0e35\u0e14\u0e40\u0e2a\u0e49\u0e19\u0e43\u0e15\u0e49",
-"Strikethrough": "\u0e02\u0e35\u0e14\u0e17\u0e31\u0e1a",
-"Superscript": "\u0e15\u0e31\u0e27\u0e22\u0e01",
-"Subscript": "\u0e15\u0e31\u0e27\u0e2b\u0e49\u0e2d\u0e22",
-"Clear formatting": "\u0e25\u0e49\u0e32\u0e07\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"Align left": "\u0e08\u0e31\u0e14\u0e0a\u0e34\u0e14\u0e0b\u0e49\u0e32\u0e22",
-"Align center": "\u0e08\u0e31\u0e14\u0e01\u0e36\u0e48\u0e07\u0e01\u0e25\u0e32\u0e07",
-"Align right": "\u0e08\u0e31\u0e14\u0e0a\u0e34\u0e14\u0e02\u0e27\u0e32",
-"Justify": "\u0e40\u0e15\u0e47\u0e21\u0e41\u0e19\u0e27",
-"Bullet list": "\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2b\u0e31\u0e27\u0e02\u0e49\u0e2d\u0e22\u0e48\u0e2d\u0e22",
-"Numbered list": "\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e25\u0e33\u0e14\u0e31\u0e1a\u0e40\u0e25\u0e02",
-"Decrease indent": "\u0e25\u0e14\u0e01\u0e32\u0e23\u0e40\u0e22\u0e37\u0e49\u0e2d\u0e07",
-"Increase indent": "\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e01\u0e32\u0e23\u0e40\u0e22\u0e37\u0e49\u0e2d\u0e07",
-"Close": "\u0e1b\u0e34\u0e14",
-"Formats": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0e40\u0e1a\u0e23\u0e32\u0e27\u0e4c\u0e40\u0e0b\u0e2d\u0e23\u0e4c\u0e02\u0e2d\u0e07\u0e04\u0e38\u0e13\u0e44\u0e21\u0e48\u0e2a\u0e19\u0e31\u0e1a\u0e2a\u0e19\u0e38\u0e19\u0e01\u0e32\u0e23\u0e40\u0e02\u0e49\u0e32\u0e16\u0e36\u0e07\u0e42\u0e14\u0e22\u0e15\u0e23\u0e07\u0e44\u0e1b\u0e22\u0e31\u0e07\u0e04\u0e25\u0e34\u0e1b\u0e1a\u0e2d\u0e23\u0e4c\u0e14 \u0e01\u0e23\u0e38\u0e13\u0e32\u0e43\u0e0a\u0e49\u0e41\u0e1b\u0e49\u0e19\u0e1e\u0e34\u0e21\u0e1e\u0e4c\u0e25\u0e31\u0e14 Ctrl+X\/C\/V \u0e41\u0e17\u0e19",
-"Headers": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27",
-"Header 1": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 1",
-"Header 2": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 2",
-"Header 3": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 3",
-"Header 4": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 4",
-"Header 5": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 5",
-"Header 6": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 6",
-"Headings": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07",
-"Heading 1": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 1",
-"Heading 2": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 2",
-"Heading 3": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 3",
-"Heading 4": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 4",
-"Heading 5": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 5",
-"Heading 6": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 6",
-"Preformatted": "\u0e08\u0e31\u0e14\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"Div": "Div",
-"Pre": "\u0e01\u0e48\u0e2d\u0e19",
-"Code": "\u0e42\u0e04\u0e49\u0e14",
-"Paragraph": "\u0e22\u0e48\u0e2d\u0e2b\u0e19\u0e49\u0e32",
-"Blockquote": "\u0e22\u0e01\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e17\u0e31\u0e49\u0e07\u0e22\u0e48\u0e2d\u0e2b\u0e19\u0e49\u0e32",
-"Inline": "\u0e41\u0e1a\u0e1a\u0e2d\u0e34\u0e19\u0e44\u0e25\u0e19\u0e4c",
-"Blocks": "\u0e1a\u0e25\u0e47\u0e2d\u0e01",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0e01\u0e32\u0e23\u0e27\u0e32\u0e07\u0e15\u0e2d\u0e19\u0e19\u0e35\u0e49\u0e2d\u0e22\u0e39\u0e48\u0e43\u0e19\u0e42\u0e2b\u0e21\u0e14\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e18\u0e23\u0e23\u0e21\u0e14\u0e32 \u0e40\u0e19\u0e37\u0e49\u0e2d\u0e2b\u0e32\u0e08\u0e30\u0e16\u0e39\u0e01\u0e27\u0e32\u0e07\u0e40\u0e1b\u0e47\u0e19\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e18\u0e23\u0e23\u0e21\u0e14\u0e32\u0e08\u0e19\u0e01\u0e27\u0e48\u0e32\u0e04\u0e38\u0e13\u0e08\u0e30\u0e1b\u0e34\u0e14\u0e15\u0e31\u0e27\u0e40\u0e25\u0e37\u0e2d\u0e01\u0e19\u0e35\u0e49",
-"Font Family": "\u0e15\u0e23\u0e30\u0e01\u0e39\u0e25\u0e41\u0e1a\u0e1a\u0e2d\u0e31\u0e01\u0e29\u0e23",
-"Font Sizes": "\u0e02\u0e19\u0e32\u0e14\u0e41\u0e1a\u0e1a\u0e2d\u0e31\u0e01\u0e29\u0e23",
-"Class": "\u0e04\u0e25\u0e32\u0e2a",
-"Browse for an image": "\u0e40\u0e23\u0e35\u0e22\u0e01\u0e14\u0e39\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"OR": "\u0e2b\u0e23\u0e37\u0e2d",
-"Drop an image here": "\u0e27\u0e32\u0e07\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e\u0e17\u0e35\u0e48\u0e19\u0e35\u0e48",
-"Upload": "\u0e2d\u0e31\u0e1b\u0e42\u0e2b\u0e25\u0e14",
-"Block": "\u0e1a\u0e25\u0e47\u0e2d\u0e01",
-"Align": "\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e41\u0e19\u0e27",
-"Default": "\u0e04\u0e48\u0e32\u0e40\u0e23\u0e34\u0e48\u0e21\u0e15\u0e49\u0e19",
-"Circle": "\u0e27\u0e07\u0e01\u0e25\u0e21",
-"Disc": "\u0e14\u0e34\u0e2a\u0e01\u0e4c",
-"Square": "\u0e08\u0e31\u0e15\u0e38\u0e23\u0e31\u0e2a",
-"Lower Alpha": "\u0e2d\u0e31\u0e25\u0e1f\u0e32\u0e17\u0e35\u0e48\u0e15\u0e48\u0e33\u0e01\u0e27\u0e48\u0e32",
-"Lower Greek": "\u0e01\u0e23\u0e35\u0e01\u0e17\u0e35\u0e48\u0e15\u0e48\u0e33\u0e01\u0e27\u0e48\u0e32",
-"Lower Roman": "\u0e42\u0e23\u0e21\u0e31\u0e19\u0e17\u0e35\u0e48\u0e15\u0e48\u0e33\u0e01\u0e27\u0e48\u0e32",
-"Upper Alpha": "\u0e2d\u0e31\u0e25\u0e1f\u0e32\u0e17\u0e35\u0e48\u0e2a\u0e39\u0e07\u0e01\u0e27\u0e48\u0e32",
-"Upper Roman": "\u0e42\u0e23\u0e21\u0e31\u0e19\u0e17\u0e35\u0e48\u0e2a\u0e39\u0e07\u0e01\u0e27\u0e48\u0e32",
-"Anchor": "\u0e08\u0e38\u0e14\u0e22\u0e36\u0e14",
-"Name": "\u0e0a\u0e37\u0e48\u0e2d",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0e04\u0e27\u0e23\u0e08\u0e30\u0e02\u0e36\u0e49\u0e19\u0e15\u0e49\u0e19\u0e14\u0e49\u0e27\u0e22\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23 \u0e15\u0e32\u0e21\u0e14\u0e49\u0e27\u0e22\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23 \u0e15\u0e31\u0e27\u0e40\u0e25\u0e02 \u0e02\u0e35\u0e14\u0e01\u0e25\u0e32\u0e07 \u0e08\u0e38\u0e14 \u0e2d\u0e31\u0e12\u0e20\u0e32\u0e04 \u0e2b\u0e23\u0e37\u0e2d \u0e02\u0e35\u0e14\u0e25\u0e48\u0e32\u0e07",
-"You have unsaved changes are you sure you want to navigate away?": "\u0e04\u0e38\u0e13\u0e21\u0e35\u0e01\u0e32\u0e23\u0e40\u0e1b\u0e25\u0e35\u0e48\u0e22\u0e19\u0e41\u0e1b\u0e25\u0e07\u0e17\u0e35\u0e48\u0e44\u0e21\u0e48\u0e44\u0e14\u0e49\u0e1a\u0e31\u0e19\u0e17\u0e36\u0e01 \u0e04\u0e38\u0e13\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e17\u0e35\u0e48\u0e08\u0e30\u0e2d\u0e2d\u0e01\u0e2b\u0e23\u0e37\u0e2d\u0e44\u0e21\u0e48?",
-"Restore last draft": "\u0e04\u0e37\u0e19\u0e04\u0e48\u0e32\u0e41\u0e1a\u0e1a\u0e23\u0e48\u0e32\u0e07\u0e25\u0e48\u0e32\u0e2a\u0e38\u0e14",
-"Special character": "\u0e2d\u0e31\u0e01\u0e02\u0e23\u0e30\u0e1e\u0e34\u0e40\u0e28\u0e29",
-"Source code": "\u0e42\u0e04\u0e49\u0e14\u0e15\u0e49\u0e19\u0e09\u0e1a\u0e31\u0e1a",
-"Insert\/Edit code sample": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e15\u0e31\u0e27\u0e2d\u0e22\u0e48\u0e32\u0e07\u0e42\u0e04\u0e49\u0e14",
-"Language": "\u0e20\u0e32\u0e29\u0e32",
-"Code sample": "\u0e15\u0e31\u0e27\u0e2d\u0e22\u0e48\u0e32\u0e07\u0e42\u0e04\u0e49\u0e14",
-"Color": "\u0e2a\u0e35",
-"R": "\u0e41\u0e14\u0e07",
-"G": "\u0e40\u0e02\u0e35\u0e22\u0e27",
-"B": "\u0e19\u0e49\u0e33\u0e40\u0e07\u0e34\u0e19",
-"Left to right": "\u0e0b\u0e49\u0e32\u0e22\u0e44\u0e1b\u0e02\u0e27\u0e32",
-"Right to left": "\u0e02\u0e27\u0e32\u0e44\u0e1b\u0e0b\u0e49\u0e32\u0e22",
-"Emoticons": "\u0e2d\u0e34\u0e42\u0e21\u0e15\u0e34\u0e04\u0e2d\u0e19",
-"Document properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e40\u0e2d\u0e01\u0e2a\u0e32\u0e23",
-"Title": "\u0e0a\u0e37\u0e48\u0e2d\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07",
-"Keywords": "\u0e04\u0e33\u0e2a\u0e33\u0e04\u0e31\u0e0d",
-"Description": "\u0e04\u0e33\u0e2d\u0e18\u0e34\u0e1a\u0e32\u0e22",
-"Robots": "\u0e2b\u0e38\u0e48\u0e19\u0e22\u0e19\u0e15\u0e4c",
-"Author": "\u0e1c\u0e39\u0e49\u0e40\u0e02\u0e35\u0e22\u0e19",
-"Encoding": "\u0e01\u0e32\u0e23\u0e40\u0e02\u0e49\u0e32\u0e23\u0e2b\u0e31\u0e2a",
-"Fullscreen": "\u0e40\u0e15\u0e47\u0e21\u0e08\u0e2d",
-"Action": "\u0e01\u0e32\u0e23\u0e01\u0e23\u0e30\u0e17\u0e33",
-"Shortcut": "\u0e17\u0e32\u0e07\u0e25\u0e31\u0e14",
-"Help": "\u0e0a\u0e48\u0e27\u0e22\u0e40\u0e2b\u0e25\u0e37\u0e2d",
-"Address": "\u0e17\u0e35\u0e48\u0e2d\u0e22\u0e39\u0e48",
-"Focus to menubar": "\u0e42\u0e1f\u0e01\u0e31\u0e2a\u0e44\u0e1b\u0e17\u0e35\u0e48\u0e40\u0e21\u0e19\u0e39\u0e1a\u0e32\u0e23\u0e4c",
-"Focus to toolbar": "\u0e42\u0e1f\u0e01\u0e31\u0e2a\u0e44\u0e1b\u0e17\u0e35\u0e48\u0e41\u0e16\u0e1a\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d",
-"Focus to element path": "\u0e42\u0e1f\u0e01\u0e31\u0e2a\u0e44\u0e1b\u0e17\u0e35\u0e48\u0e40\u0e2a\u0e49\u0e19\u0e17\u0e32\u0e07\u0e02\u0e2d\u0e07\u0e2d\u0e07\u0e04\u0e4c\u0e1b\u0e23\u0e30\u0e01\u0e2d\u0e1a",
-"Focus to contextual toolbar": "\u0e42\u0e1f\u0e01\u0e31\u0e2a\u0e44\u0e1b\u0e17\u0e35\u0e48\u0e41\u0e16\u0e1a\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d\u0e15\u0e32\u0e21\u0e1a\u0e23\u0e34\u0e1a\u0e17",
-"Insert link (if link plugin activated)": "\u0e41\u0e17\u0e23\u0e01\u0e25\u0e34\u0e07\u0e01\u0e4c (\u0e2b\u0e32\u0e01\u0e40\u0e1b\u0e34\u0e14\u0e43\u0e0a\u0e49\u0e07\u0e32\u0e19\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19\u0e25\u0e34\u0e07\u0e01\u0e4c)",
-"Save (if save plugin activated)": "\u0e1a\u0e31\u0e19\u0e17\u0e36\u0e01 (\u0e2b\u0e32\u0e01\u0e40\u0e1b\u0e34\u0e14\u0e43\u0e0a\u0e49\u0e07\u0e32\u0e19\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19\u0e1a\u0e31\u0e19\u0e17\u0e36\u0e01)",
-"Find (if searchreplace plugin activated)": "\u0e04\u0e49\u0e19\u0e2b\u0e32 (\u0e2b\u0e32\u0e01\u0e40\u0e1b\u0e34\u0e14\u0e43\u0e0a\u0e49\u0e07\u0e32\u0e19\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19 searchreplace)",
-"Plugins installed ({0}):": "\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19\u0e17\u0e35\u0e48\u0e15\u0e34\u0e14\u0e15\u0e31\u0e49\u0e07\u0e41\u0e25\u0e49\u0e27 ({0}):",
-"Premium plugins:": "\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19\u0e1e\u0e23\u0e35\u0e40\u0e21\u0e35\u0e22\u0e21:",
-"Learn more...": "\u0e40\u0e23\u0e35\u0e22\u0e19\u0e23\u0e39\u0e49\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e40\u0e15\u0e34\u0e21...",
-"You are using {0}": "\u0e04\u0e38\u0e13\u0e01\u0e33\u0e25\u0e31\u0e07\u0e43\u0e0a\u0e49 {0}",
-"Plugins": "\u0e1b\u0e25\u0e31\u0e4a\u0e01\u0e2d\u0e34\u0e19",
-"Handy Shortcuts": "\u0e17\u0e32\u0e07\u0e25\u0e31\u0e14\u0e14\u0e49\u0e27\u0e22\u0e21\u0e37\u0e2d",
-"Horizontal line": "\u0e40\u0e2a\u0e49\u0e19\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
-"Insert\/edit image": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e23\u0e39\u0e1b",
-"Image description": "\u0e04\u0e33\u0e2d\u0e18\u0e34\u0e1a\u0e32\u0e22\u0e23\u0e39\u0e1b",
-"Source": "\u0e41\u0e2b\u0e25\u0e48\u0e07\u0e17\u0e35\u0e48\u0e21\u0e32",
-"Dimensions": "\u0e02\u0e19\u0e32\u0e14",
-"Constrain proportions": "\u0e08\u0e33\u0e01\u0e31\u0e14\u0e2a\u0e31\u0e14\u0e2a\u0e48\u0e27\u0e19",
-"General": "\u0e17\u0e31\u0e48\u0e27\u0e44\u0e1b",
-"Advanced": "\u0e02\u0e31\u0e49\u0e19\u0e2a\u0e39\u0e07",
-"Style": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"Vertical space": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e41\u0e19\u0e27\u0e15\u0e31\u0e49\u0e07",
-"Horizontal space": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
-"Border": "\u0e40\u0e2a\u0e49\u0e19\u0e02\u0e2d\u0e1a",
-"Insert image": "\u0e41\u0e17\u0e23\u0e01\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"Image": "\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"Image list": "\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"Rotate counterclockwise": "\u0e2b\u0e21\u0e38\u0e19\u0e17\u0e27\u0e19\u0e40\u0e02\u0e47\u0e21\u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32",
-"Rotate clockwise": "\u0e2b\u0e21\u0e38\u0e19\u0e15\u0e32\u0e21\u0e40\u0e02\u0e47\u0e21\u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32",
-"Flip vertically": "\u0e1e\u0e25\u0e34\u0e01\u0e15\u0e32\u0e21\u0e41\u0e19\u0e27\u0e15\u0e31\u0e49\u0e07",
-"Flip horizontally": "\u0e1e\u0e25\u0e34\u0e01\u0e15\u0e32\u0e21\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
-"Edit image": "\u0e41\u0e01\u0e49\u0e44\u0e02\u0e23\u0e39\u0e1b",
-"Image options": "\u0e15\u0e31\u0e27\u0e40\u0e25\u0e37\u0e2d\u0e01\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"Zoom in": "\u0e02\u0e22\u0e32\u0e22\u0e40\u0e02\u0e49\u0e32",
-"Zoom out": "\u0e22\u0e48\u0e2d\u0e2d\u0e2d\u0e01",
-"Crop": "\u0e04\u0e23\u0e2d\u0e1b\u0e15\u0e31\u0e14",
-"Resize": "\u0e1b\u0e23\u0e31\u0e1a\u0e02\u0e19\u0e32\u0e14",
-"Orientation": "\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e27\u0e32\u0e07",
-"Brightness": "\u0e04\u0e27\u0e32\u0e21\u0e2a\u0e27\u0e48\u0e32\u0e07",
-"Sharpen": "\u0e04\u0e27\u0e32\u0e21\u0e04\u0e21",
-"Contrast": "\u0e04\u0e27\u0e32\u0e21\u0e40\u0e1b\u0e23\u0e35\u0e22\u0e1a\u0e15\u0e48\u0e32\u0e07",
-"Color levels": "\u0e23\u0e30\u0e14\u0e31\u0e1a\u0e2a\u0e35",
-"Gamma": "\u0e41\u0e01\u0e21\u0e21\u0e32",
-"Invert": "\u0e22\u0e49\u0e2d\u0e19\u0e01\u0e25\u0e31\u0e1a",
-"Apply": "\u0e19\u0e33\u0e44\u0e1b\u0e43\u0e0a\u0e49",
-"Back": "\u0e01\u0e25\u0e31\u0e1a",
-"Insert date\/time": "\u0e41\u0e17\u0e23\u0e01\u0e27\u0e31\u0e19\u0e17\u0e35\u0e48\/\u0e40\u0e27\u0e25\u0e32",
-"Date\/time": "\u0e27\u0e31\u0e19\u0e17\u0e35\u0e48\/\u0e40\u0e27\u0e25\u0e32",
-"Insert link": "\u0e41\u0e17\u0e23\u0e01\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"Insert\/edit link": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"Text to display": "\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e17\u0e35\u0e48\u0e08\u0e30\u0e41\u0e2a\u0e14\u0e07",
-"Url": "URL",
-"Target": "\u0e40\u0e1b\u0e49\u0e32\u0e2b\u0e21\u0e32\u0e22",
-"None": "\u0e44\u0e21\u0e48\u0e21\u0e35",
-"New window": "\u0e40\u0e1b\u0e34\u0e14\u0e2b\u0e19\u0e49\u0e32\u0e15\u0e48\u0e32\u0e07\u0e43\u0e2b\u0e21\u0e48",
-"Remove link": "\u0e40\u0e2d\u0e32\u0e25\u0e34\u0e07\u0e01\u0e4c\u0e2d\u0e2d\u0e01",
-"Anchors": "\u0e08\u0e38\u0e14\u0e22\u0e36\u0e14",
-"Link": "\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"Paste or type a link": "\u0e27\u0e32\u0e07\u0e2b\u0e23\u0e37\u0e2d\u0e1b\u0e49\u0e2d\u0e19\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL \u0e17\u0e35\u0e48\u0e04\u0e38\u0e13\u0e23\u0e30\u0e1a\u0e38\u0e14\u0e39\u0e40\u0e2b\u0e21\u0e37\u0e2d\u0e19\u0e27\u0e48\u0e32\u0e40\u0e1b\u0e47\u0e19\u0e2d\u0e35\u0e40\u0e21\u0e25\u0e41\u0e2d\u0e14\u0e40\u0e14\u0e23\u0e2a \u0e04\u0e38\u0e13\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e43\u0e2a\u0e48 mailto: \u0e19\u0e33\u0e2b\u0e19\u0e49\u0e32\u0e2b\u0e23\u0e37\u0e2d\u0e44\u0e21\u0e48",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL \u0e17\u0e35\u0e48\u0e04\u0e38\u0e13\u0e23\u0e30\u0e1a\u0e38\u0e14\u0e39\u0e40\u0e2b\u0e21\u0e37\u0e2d\u0e19\u0e27\u0e48\u0e32\u0e40\u0e1b\u0e47\u0e19\u0e25\u0e34\u0e07\u0e01\u0e4c\u0e20\u0e32\u0e22\u0e19\u0e2d\u0e01 \u0e04\u0e38\u0e13\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e43\u0e2a\u0e48 http:\/\/ \u0e19\u0e33\u0e2b\u0e19\u0e49\u0e32\u0e2b\u0e23\u0e37\u0e2d\u0e44\u0e21\u0e48",
-"Link list": "\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"Insert video": "\u0e41\u0e17\u0e23\u0e01\u0e27\u0e34\u0e14\u0e35\u0e42\u0e2d",
-"Insert\/edit video": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e27\u0e34\u0e14\u0e35\u0e42\u0e2d",
-"Insert\/edit media": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e2a\u0e37\u0e48\u0e2d",
-"Alternative source": "\u0e41\u0e2b\u0e25\u0e48\u0e07\u0e17\u0e35\u0e48\u0e21\u0e32\u0e2a\u0e33\u0e23\u0e2d\u0e07",
-"Poster": "\u0e42\u0e1b\u0e2a\u0e40\u0e15\u0e2d\u0e23\u0e4c",
-"Paste your embed code below:": "\u0e27\u0e32\u0e07\u0e42\u0e04\u0e49\u0e14\u0e1d\u0e31\u0e07\u0e15\u0e31\u0e27\u0e02\u0e2d\u0e07\u0e04\u0e38\u0e13\u0e14\u0e49\u0e32\u0e19\u0e25\u0e48\u0e32\u0e07:",
-"Embed": "\u0e1d\u0e31\u0e07",
-"Media": "\u0e2a\u0e37\u0e48\u0e2d",
-"Nonbreaking space": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e44\u0e21\u0e48\u0e41\u0e22\u0e01",
-"Page break": "\u0e15\u0e31\u0e27\u0e41\u0e1a\u0e48\u0e07\u0e2b\u0e19\u0e49\u0e32",
-"Paste as text": "\u0e27\u0e32\u0e07\u0e40\u0e1b\u0e47\u0e19\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
-"Preview": "\u0e41\u0e2a\u0e14\u0e07\u0e15\u0e31\u0e27\u0e2d\u0e22\u0e48\u0e32\u0e07",
-"Print": "\u0e1e\u0e34\u0e21\u0e1e\u0e4c",
-"Save": "\u0e1a\u0e31\u0e19\u0e17\u0e36\u0e01",
-"Find": "\u0e04\u0e49\u0e19\u0e2b\u0e32",
-"Replace with": "\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48\u0e14\u0e49\u0e27\u0e22",
-"Replace": "\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48",
-"Replace all": "\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14",
-"Prev": "\u0e01\u0e48\u0e2d\u0e19\u0e2b\u0e19\u0e49\u0e32",
-"Next": "\u0e16\u0e31\u0e14\u0e44\u0e1b",
-"Find and replace": "\u0e04\u0e49\u0e19\u0e2b\u0e32\u0e41\u0e25\u0e30\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48",
-"Could not find the specified string.": "\u0e44\u0e21\u0e48\u0e1e\u0e1a\u0e2a\u0e15\u0e23\u0e34\u0e07\u0e17\u0e35\u0e48\u0e23\u0e30\u0e1a\u0e38",
-"Match case": "\u0e15\u0e23\u0e07\u0e15\u0e32\u0e21\u0e15\u0e31\u0e27\u0e1e\u0e34\u0e21\u0e1e\u0e4c\u0e43\u0e2b\u0e0d\u0e48-\u0e40\u0e25\u0e47\u0e01",
-"Whole words": "\u0e17\u0e31\u0e49\u0e07\u0e04\u0e33",
-"Spellcheck": "\u0e15\u0e23\u0e27\u0e08\u0e01\u0e32\u0e23\u0e2a\u0e30\u0e01\u0e14",
-"Ignore": "\u0e25\u0e30\u0e40\u0e27\u0e49\u0e19",
-"Ignore all": "\u0e25\u0e30\u0e40\u0e27\u0e49\u0e19\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14",
-"Finish": "\u0e40\u0e2a\u0e23\u0e47\u0e08\u0e2a\u0e34\u0e49\u0e19",
-"Add to Dictionary": "\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e43\u0e19\u0e1e\u0e08\u0e19\u0e32\u0e19\u0e38\u0e01\u0e23\u0e21",
-"Insert table": "\u0e41\u0e17\u0e23\u0e01\u0e15\u0e32\u0e23\u0e32\u0e07",
-"Table properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e15\u0e32\u0e23\u0e32\u0e07",
-"Delete table": "\u0e25\u0e1a\u0e15\u0e32\u0e23\u0e32\u0e07",
-"Cell": "\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Row": "\u0e41\u0e16\u0e27",
-"Column": "\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
-"Cell properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Merge cells": "\u0e1c\u0e2a\u0e32\u0e19\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Split cell": "\u0e41\u0e22\u0e01\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Insert row before": "\u0e41\u0e17\u0e23\u0e01\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e1a\u0e19",
-"Insert row after": "\u0e41\u0e17\u0e23\u0e01\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e25\u0e48\u0e32\u0e07",
-"Delete row": "\u0e25\u0e1a\u0e41\u0e16\u0e27",
-"Row properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e41\u0e16\u0e27",
-"Cut row": "\u0e15\u0e31\u0e14\u0e41\u0e16\u0e27",
-"Copy row": "\u0e04\u0e31\u0e14\u0e25\u0e2d\u0e01\u0e41\u0e16\u0e27",
-"Paste row before": "\u0e27\u0e32\u0e07\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e1a\u0e19",
-"Paste row after": "\u0e27\u0e32\u0e07\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e25\u0e48\u0e32\u0e07",
-"Insert column before": "\u0e41\u0e17\u0e23\u0e01\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c\u0e02\u0e49\u0e32\u0e07\u0e2b\u0e19\u0e49\u0e32",
-"Insert column after": "\u0e41\u0e17\u0e23\u0e01\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c\u0e02\u0e49\u0e32\u0e07\u0e2b\u0e25\u0e31\u0e07",
-"Delete column": "\u0e25\u0e1a\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
-"Cols": "\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
-"Rows": "\u0e41\u0e16\u0e27",
-"Width": "\u0e04\u0e27\u0e32\u0e21\u0e01\u0e27\u0e49\u0e32\u0e07",
-"Height": "\u0e04\u0e27\u0e32\u0e21\u0e2a\u0e39\u0e07",
-"Cell spacing": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e23\u0e30\u0e2b\u0e27\u0e48\u0e32\u0e07\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Cell padding": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e20\u0e32\u0e22\u0e43\u0e19\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Caption": "\u0e1b\u0e49\u0e32\u0e22\u0e04\u0e33\u0e2d\u0e18\u0e34\u0e1a\u0e32\u0e22",
-"Left": "\u0e0b\u0e49\u0e32\u0e22",
-"Center": "\u0e01\u0e36\u0e48\u0e07\u0e01\u0e25\u0e32\u0e07",
-"Right": "\u0e02\u0e27\u0e32",
-"Cell type": "\u0e0a\u0e19\u0e34\u0e14\u0e02\u0e2d\u0e07\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Scope": "\u0e02\u0e2d\u0e1a\u0e40\u0e02\u0e15",
-"Alignment": "\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e41\u0e19\u0e27",
-"H Align": "\u0e01\u0e32\u0e23\u0e40\u0e23\u0e35\u0e22\u0e07\u0e43\u0e19\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
-"V Align": "\u0e01\u0e32\u0e23\u0e40\u0e23\u0e35\u0e22\u0e07\u0e43\u0e19\u0e41\u0e19\u0e27\u0e15\u0e31\u0e49\u0e07",
-"Top": "\u0e1a\u0e19",
-"Middle": "\u0e01\u0e25\u0e32\u0e07",
-"Bottom": "\u0e25\u0e48\u0e32\u0e07",
-"Header cell": "\u0e40\u0e0b\u0e25\u0e25\u0e4c\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27",
-"Row group": "\u0e01\u0e25\u0e38\u0e48\u0e21\u0e41\u0e16\u0e27",
-"Column group": "\u0e01\u0e25\u0e38\u0e48\u0e21\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
-"Row type": "\u0e0a\u0e19\u0e34\u0e14\u0e02\u0e2d\u0e07\u0e41\u0e16\u0e27",
-"Header": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27",
-"Body": "\u0e40\u0e19\u0e37\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
-"Footer": "\u0e2a\u0e48\u0e27\u0e19\u0e17\u0e49\u0e32\u0e22",
-"Border color": "\u0e2a\u0e35\u0e02\u0e2d\u0e1a",
-"Insert template": "\u0e41\u0e17\u0e23\u0e01\u0e41\u0e21\u0e48\u0e41\u0e1a\u0e1a",
-"Templates": "\u0e41\u0e21\u0e48\u0e41\u0e1a\u0e1a",
-"Template": "\u0e41\u0e21\u0e48\u0e41\u0e1a\u0e1a",
-"Text color": "\u0e2a\u0e35\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
-"Background color": "\u0e2a\u0e35\u0e1e\u0e37\u0e49\u0e19\u0e2b\u0e25\u0e31\u0e07",
-"Custom...": "\u0e01\u0e33\u0e2b\u0e19\u0e14\u0e40\u0e2d\u0e07",
-"Custom color": "\u0e2a\u0e35\u0e17\u0e35\u0e48\u0e01\u0e33\u0e2b\u0e19\u0e14\u0e40\u0e2d\u0e07",
-"No color": "\u0e44\u0e21\u0e48\u0e21\u0e35\u0e2a\u0e35",
-"Table of Contents": "\u0e2a\u0e32\u0e23\u0e1a\u0e31\u0e0d",
-"Show blocks": "\u0e41\u0e2a\u0e14\u0e07\u0e1a\u0e25\u0e47\u0e2d\u0e01",
-"Show invisible characters": "\u0e41\u0e2a\u0e14\u0e07\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23\u0e17\u0e35\u0e48\u0e21\u0e2d\u0e07\u0e44\u0e21\u0e48\u0e40\u0e2b\u0e47\u0e19",
-"Words: {0}": "\u0e04\u0e33: {0}",
-"{0} words": "{0} \u0e04\u0e33",
-"File": "\u0e44\u0e1f\u0e25\u0e4c",
-"Edit": "\u0e41\u0e01\u0e49\u0e44\u0e02",
-"Insert": "\u0e41\u0e17\u0e23\u0e01",
-"View": "\u0e21\u0e38\u0e21\u0e21\u0e2d\u0e07",
-"Format": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"Table": "\u0e15\u0e32\u0e23\u0e32\u0e07",
-"Tools": "\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d",
-"Powered by {0}": "\u0e02\u0e31\u0e1a\u0e40\u0e04\u0e25\u0e37\u0e48\u0e2d\u0e19\u0e42\u0e14\u0e22 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0e1e\u0e37\u0e49\u0e19\u0e17\u0e35\u0e48 Rich Text \u0e01\u0e14 ALT-F9 \u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e40\u0e21\u0e19\u0e39 \u0e01\u0e14 ALT-F10 \u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e41\u0e16\u0e1a\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d \u0e01\u0e14 ALT-0 \u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e04\u0e27\u0e32\u0e21\u0e0a\u0e48\u0e27\u0e22\u0e40\u0e2b\u0e25\u0e37\u0e2d"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr.js
deleted file mode 100644
index 3dd22ca25f..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('tr',{
-"Redo": "Yinele",
-"Undo": "Geri al",
-"Cut": "Kes",
-"Copy": "Kopyala",
-"Paste": "Yap\u0131\u015ft\u0131r",
-"Select all": "T\u00fcm\u00fcn\u00fc se\u00e7",
-"New document": "Yeni dok\u00fcman",
-"Ok": "Tamam",
-"Cancel": "\u0130ptal",
-"Visual aids": "G\u00f6rsel ara\u00e7lar",
-"Bold": "Kal\u0131n",
-"Italic": "\u0130talik",
-"Underline": "Alt\u0131 \u00e7izili",
-"Strikethrough": "\u00dcst\u00fc \u00e7izili",
-"Superscript": "\u00dcst simge",
-"Subscript": "Alt simge",
-"Clear formatting": "Bi\u00e7imi temizle",
-"Align left": "Sola hizala",
-"Align center": "Ortala",
-"Align right": "Sa\u011fa hizala",
-"Justify": "\u0130ki yana yasla",
-"Bullet list": "\u0130\u015faretli liste",
-"Numbered list": "Numaral\u0131 liste ",
-"Decrease indent": "Girintiyi azalt",
-"Increase indent": "Girintiyi art\u0131r",
-"Close": "Kapat",
-"Formats": "Bi\u00e7imler",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Taray\u0131c\u0131n\u0131z panoya do\u011frudan eri\u015fimi desteklemiyor. L\u00fctfen Ctrl+X\\\/C\\\/V klavye k\u0131sayollar\u0131n\u0131 kullan\u0131n\u0131z.",
-"Headers": "Ba\u015fl\u0131klar",
-"Header 1": "Ba\u015fl\u0131k 1",
-"Header 2": "Ba\u015fl\u0131k 2",
-"Header 3": "Ba\u015fl\u0131k 3",
-"Header 4": "Ba\u015fl\u0131k 4",
-"Header 5": "Ba\u015fl\u0131k 5",
-"Header 6": "Ba\u015fl\u0131k 6",
-"Headings": "Ba\u015fl\u0131klar",
-"Heading 1": "Ba\u015fl\u0131k 1",
-"Heading 2": "Ba\u015fl\u0131k 2",
-"Heading 3": "Ba\u015fl\u0131k 3",
-"Heading 4": "Ba\u015fl\u0131k 4",
-"Heading 5": "Ba\u015fl\u0131k 5",
-"Heading 6": "Ba\u015fl\u0131k 6",
-"Preformatted": "\u00d6nceden bi\u00e7imlendirilmi\u015f",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kod",
-"Paragraph": "Paragraf",
-"Blockquote": "Al\u0131nt\u0131",
-"Inline": "Sat\u0131r i\u00e7i",
-"Blocks": "Bloklar",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "D\u00fcz metin modunda yap\u0131\u015ft\u0131r. Bu se\u00e7ene\u011fi kapatana kadar i\u00e7erikler d\u00fcz metin olarak yap\u0131\u015ft\u0131r\u0131l\u0131r.",
-"Font Family": "Yaz\u0131 Tipleri",
-"Font Sizes": "Yaz\u0131 Boyutlar\u0131",
-"Class": "Class",
-"Browse for an image": "G\u00f6rsel se\u00e7",
-"OR": "ya da",
-"Drop an image here": "G\u00f6rseli buraya s\u00fcr\u00fckleyin",
-"Upload": "Y\u00fckle",
-"Block": "Blok",
-"Align": "Hizala",
-"Default": "Varsay\u0131lan",
-"Circle": "Daire",
-"Disc": "Disk",
-"Square": "Kare",
-"Lower Alpha": "K\u00fc\u00e7\u00fck Harf",
-"Lower Greek": "K\u00fc\u00e7\u00fck Yunan Harfleri",
-"Lower Roman": "K\u00fc\u00e7\u00fck Roman Harfleri ",
-"Upper Alpha": "B\u00fcy\u00fck Harf",
-"Upper Roman": "B\u00fcy\u00fck Roman Harfleri ",
-"Anchor": "\u00c7apa",
-"Name": "\u0130sim",
-"Id": "Kimlik",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id bir harf ile ba\u015flamal\u0131d\u0131r ve harf, rakam, \u00e7izgi, nokta, iki nokta \u00fcst\u00fcste veya alt \u00e7izgi kullan\u0131labilir.",
-"You have unsaved changes are you sure you want to navigate away?": "Kaydedilmemi\u015f de\u011fi\u015fiklikler var, sayfadan ayr\u0131lmak istedi\u011finize emin misiniz?",
-"Restore last draft": "Son tasla\u011f\u0131 geri y\u00fckle",
-"Special character": "\u00d6zel karakter",
-"Source code": "Kaynak kodu",
-"Insert\/Edit code sample": "\u00d6rnek kod ekle\/d\u00fczenle",
-"Language": "Dil",
-"Code sample": "Code sample",
-"Color": "Renk",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Soldan sa\u011fa",
-"Right to left": "Sa\u011fdan sola",
-"Emoticons": "\u0130fadeler",
-"Document properties": "Dok\u00fcman \u00f6zellikleri",
-"Title": "Ba\u015fl\u0131k",
-"Keywords": "Anahtar kelimeler",
-"Description": "A\u00e7\u0131klama",
-"Robots": "Robotlar",
-"Author": "Yazar",
-"Encoding": "Kodlama",
-"Fullscreen": "Tam ekran",
-"Action": "Eylem",
-"Shortcut": "K\u0131sayol",
-"Help": "Yard\u0131m",
-"Address": "Adres",
-"Focus to menubar": "Men\u00fcye odaklan",
-"Focus to toolbar": "Ara\u00e7 tak\u0131m\u0131na odaklan",
-"Focus to element path": "\u00d6\u011fe yoluna odaklan",
-"Focus to contextual toolbar": "Ba\u011flamsal ara\u00e7 tak\u0131m\u0131na odaklan",
-"Insert link (if link plugin activated)": "Ba\u011flant\u0131 ekle (Ba\u011flant\u0131 eklentisi aktif ise)",
-"Save (if save plugin activated)": "Kaydet (Kay\u0131t eklentisi aktif ise)",
-"Find (if searchreplace plugin activated)": "Bul (Bul\/De\u011fi\u015ftir eklentisi aktif ise)",
-"Plugins installed ({0}):": "Eklentiler y\u00fcklendi ({0}):",
-"Premium plugins:": "Premium eklentiler:",
-"Learn more...": "Detayl\u0131 bilgi...",
-"You are using {0}": "\u015eu an {0} kullan\u0131yorsunuz",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Handy Shortcuts",
-"Horizontal line": "Yatay \u00e7izgi",
-"Insert\/edit image": "Resim ekle\/d\u00fczenle",
-"Image description": "Resim a\u00e7\u0131klamas\u0131",
-"Source": "Kaynak",
-"Dimensions": "Boyutlar",
-"Constrain proportions": "Oranlar\u0131 koru",
-"General": "Genel",
-"Advanced": "Geli\u015fmi\u015f",
-"Style": "Stil",
-"Vertical space": "Dikey bo\u015fluk",
-"Horizontal space": "Yatay bo\u015fluk",
-"Border": "Kenarl\u0131k",
-"Insert image": "Resim ekle",
-"Image": "Resim",
-"Image list": "G\u00f6rsel listesi",
-"Rotate counterclockwise": "Saatin tersi y\u00f6n\u00fcnde d\u00f6nd\u00fcr",
-"Rotate clockwise": "Saat y\u00f6n\u00fcnde d\u00f6nd\u00fcr",
-"Flip vertically": "Dikine \u00e7evir",
-"Flip horizontally": "Enine \u00e7evir",
-"Edit image": "Resmi d\u00fczenle",
-"Image options": "Resim ayarlar\u0131",
-"Zoom in": "Yak\u0131nla\u015ft\u0131r",
-"Zoom out": "Uzakla\u015ft\u0131r",
-"Crop": "K\u0131rp",
-"Resize": "Yeniden Boyutland\u0131r",
-"Orientation": "Oryantasyon",
-"Brightness": "Parlakl\u0131k",
-"Sharpen": "Keskinle\u015ftir",
-"Contrast": "Kontrast",
-"Color levels": "Renk d\u00fczeyleri",
-"Gamma": "Gama",
-"Invert": "Ters \u00c7evir",
-"Apply": "Uygula",
-"Back": "Geri",
-"Insert date\/time": "Tarih\/saat ekle",
-"Date\/time": "Tarih\/saat",
-"Insert link": "Ba\u011flant\u0131 ekle",
-"Insert\/edit link": "Ba\u011flant\u0131 ekle\/d\u00fczenle",
-"Text to display": "Yaz\u0131y\u0131 g\u00f6r\u00fcnt\u00fcle",
-"Url": "URL",
-"Target": "Hedef",
-"None": "Hi\u00e7biri",
-"New window": "Yeni pencere",
-"Remove link": "Ba\u011flant\u0131y\u0131 kald\u0131r",
-"Anchors": "\u00c7apalar",
-"Link": "Ba\u011flant\u0131",
-"Paste or type a link": "Bir ba\u011flant\u0131 yaz\u0131n yada yap\u0131\u015ft\u0131r\u0131n",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Girdi\u011finiz URL bir e-posta adresi gibi g\u00f6r\u00fcn\u00fcyor. Gerekli olan mailto: \u00f6nekini eklemek ister misiniz?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Girdi\u011finiz URL bir d\u0131\u015f ba\u011flant\u0131 gibi g\u00f6r\u00fcn\u00fcyor. Gerekli olan http:\/\/ \u00f6nekini eklemek ister misiniz?",
-"Link list": "Ba\u011flant\u0131 listesi",
-"Insert video": "Video ekle",
-"Insert\/edit video": "Video ekle\/d\u00fczenle",
-"Insert\/edit media": "Medya ekle\/d\u00fczenle",
-"Alternative source": "Alternatif kaynak",
-"Poster": "Poster",
-"Paste your embed code below:": "Video g\u00f6mme kodunu a\u015fa\u011f\u0131ya yap\u0131\u015ft\u0131r\u0131n\u0131z:",
-"Embed": "G\u00f6mme",
-"Media": "Medya",
-"Nonbreaking space": "B\u00f6l\u00fcnemez bo\u015fluk",
-"Page break": "Sayfa sonu",
-"Paste as text": "Metin olarak yap\u0131\u015ft\u0131r",
-"Preview": "\u00d6nizleme",
-"Print": "Yazd\u0131r",
-"Save": "Kaydet",
-"Find": "Bul",
-"Replace with": "Bununla de\u011fi\u015ftir",
-"Replace": "De\u011fi\u015ftir",
-"Replace all": "T\u00fcm\u00fcn\u00fc de\u011fi\u015ftir",
-"Prev": "\u00d6nceki",
-"Next": "Sonraki",
-"Find and replace": "Bul ve de\u011fi\u015ftir",
-"Could not find the specified string.": "Herhangi bir sonu\u00e7 bulunamad\u0131.",
-"Match case": "B\u00fcy\u00fck\/k\u00fc\u00e7\u00fck harf duyarl\u0131",
-"Whole words": "Tam kelimeler",
-"Spellcheck": "Yaz\u0131m denetimi",
-"Ignore": "Yoksay",
-"Ignore all": "T\u00fcm\u00fcn\u00fc yoksay",
-"Finish": "Bitir",
-"Add to Dictionary": "S\u00f6zl\u00fc\u011fe Ekle",
-"Insert table": "Tablo ekle",
-"Table properties": "Tablo \u00f6zellikleri",
-"Delete table": "Tablo sil",
-"Cell": "H\u00fccre",
-"Row": "Sat\u0131r",
-"Column": "S\u00fctun",
-"Cell properties": "H\u00fccre \u00f6zellikleri",
-"Merge cells": "H\u00fccreleri birle\u015ftir",
-"Split cell": "H\u00fccre b\u00f6l",
-"Insert row before": "\u00dcste sat\u0131r ekle",
-"Insert row after": "Alta sat\u0131r ekle ",
-"Delete row": "Sat\u0131r sil",
-"Row properties": "Sat\u0131r \u00f6zellikleri",
-"Cut row": "Sat\u0131r\u0131 kes",
-"Copy row": "Sat\u0131r\u0131 kopyala",
-"Paste row before": "\u00dcste sat\u0131r yap\u0131\u015ft\u0131r",
-"Paste row after": "Alta sat\u0131r yap\u0131\u015ft\u0131r",
-"Insert column before": "Sola s\u00fctun ekle",
-"Insert column after": "Sa\u011fa s\u00fctun ekle",
-"Delete column": "S\u00fctun sil",
-"Cols": "S\u00fctunlar",
-"Rows": "Sat\u0131rlar",
-"Width": "Geni\u015flik",
-"Height": "Y\u00fckseklik",
-"Cell spacing": "H\u00fccre aral\u0131\u011f\u0131",
-"Cell padding": "H\u00fccre dolgusu",
-"Caption": "Ba\u015fl\u0131k",
-"Left": "Sol",
-"Center": "Orta",
-"Right": "Sa\u011f",
-"Cell type": "H\u00fccre tipi",
-"Scope": "Kapsam",
-"Alignment": "Hizalama",
-"H Align": "Yatay Hizalama",
-"V Align": "Dikey Hizalama",
-"Top": "\u00dcst",
-"Middle": "Orta",
-"Bottom": "Alt",
-"Header cell": "Ba\u015fl\u0131k h\u00fccresi",
-"Row group": "Sat\u0131r grubu",
-"Column group": "S\u00fctun grubu",
-"Row type": "Sat\u0131r tipi",
-"Header": "Ba\u015fl\u0131k",
-"Body": "G\u00f6vde",
-"Footer": "Alt",
-"Border color": "Kenarl\u0131k rengi",
-"Insert template": "\u015eablon ekle",
-"Templates": "\u015eablonlar",
-"Template": "Taslak",
-"Text color": "Yaz\u0131 rengi",
-"Background color": "Arka plan rengi",
-"Custom...": "\u00d6zel...",
-"Custom color": "\u00d6zel renk",
-"No color": "Renk yok",
-"Table of Contents": "\u0130\u00e7erik tablosu",
-"Show blocks": "Bloklar\u0131 g\u00f6ster",
-"Show invisible characters": "G\u00f6r\u00fcnmez karakterleri g\u00f6ster",
-"Words: {0}": "Kelime: {0}",
-"{0} words": "{0} words",
-"File": "Dosya",
-"Edit": "D\u00fczenle",
-"Insert": "Ekle",
-"View": "G\u00f6r\u00fcn\u00fcm",
-"Format": "Bi\u00e7im",
-"Table": "Tablo",
-"Tools": "Ara\u00e7lar",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zengin Metin Alan\u0131. Men\u00fc i\u00e7in ALT-F9 tu\u015funa bas\u0131n\u0131z. Ara\u00e7 \u00e7ubu\u011fu i\u00e7in ALT-F10 tu\u015funa bas\u0131n\u0131z. Yard\u0131m i\u00e7in ALT-0 tu\u015funa bas\u0131n\u0131z."
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr_TR.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr_TR.js
deleted file mode 100644
index 496fe3dc21..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr_TR.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('tr_TR',{
-"Redo": "Yinele",
-"Undo": "Geri Al",
-"Cut": "Kes",
-"Copy": "Kopyala",
-"Paste": "Yap\u0131\u015ft\u0131r",
-"Select all": "T\u00fcm\u00fcn\u00fc se\u00e7",
-"New document": "Yeni dok\u00fcman",
-"Ok": "Tamam",
-"Cancel": "\u0130ptal",
-"Visual aids": "G\u00f6rsel ara\u00e7lar",
-"Bold": "Kal\u0131n",
-"Italic": "\u0130talik",
-"Underline": "Alt\u0131 \u00e7izili",
-"Strikethrough": "\u00dcst\u00fc \u00e7izili",
-"Superscript": "\u00dcst simge",
-"Subscript": "Alt simge",
-"Clear formatting": "Bi\u00e7imi temizle",
-"Align left": "Sola hizala",
-"Align center": "Ortala",
-"Align right": "Sa\u011fa hizala",
-"Justify": "\u0130ki yana yasla",
-"Bullet list": "S\u0131ras\u0131z liste",
-"Numbered list": "S\u0131ral\u0131 liste",
-"Decrease indent": "Girintiyi azalt",
-"Increase indent": "Girintiyi art\u0131r",
-"Close": "Kapat",
-"Formats": "Bi\u00e7imler",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Taray\u0131c\u0131n\u0131z panoya direk eri\u015fimi desteklemiyor. L\u00fctfen Ctrl+X\/C\/V klavye k\u0131sayollar\u0131n\u0131 kullan\u0131n.",
-"Headers": "Ba\u015fl\u0131klar",
-"Header 1": "Ba\u015fl\u0131k 1",
-"Header 2": "Ba\u015fl\u0131k 2",
-"Header 3": "Ba\u015fl\u0131k 3",
-"Header 4": "Ba\u015fl\u0131k 4",
-"Header 5": "Ba\u015fl\u0131k 5",
-"Header 6": "Ba\u015fl\u0131k 6",
-"Headings": "Ba\u015fl\u0131klar",
-"Heading 1": "Ba\u015fl\u0131k 1",
-"Heading 2": "Ba\u015fl\u0131k 2",
-"Heading 3": "Ba\u015fl\u0131k 3",
-"Heading 4": "Ba\u015fl\u0131k 4",
-"Heading 5": "Ba\u015fl\u0131k 5",
-"Heading 6": "Ba\u015fl\u0131k 6",
-"Preformatted": "\u00d6nceden bi\u00e7imlendirilmi\u015f",
-"Div": "Div",
-"Pre": "\u00d6n",
-"Code": "Kod",
-"Paragraph": "Paragraf",
-"Blockquote": "Al\u0131nt\u0131",
-"Inline": "Sat\u0131r i\u00e7i",
-"Blocks": "Bloklar",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "D\u00fcz metin modunda yap\u0131\u015ft\u0131r. Bu se\u00e7ene\u011fi kapatana kadar i\u00e7erikler d\u00fcz metin olarak yap\u0131\u015ft\u0131r\u0131l\u0131r.",
-"Font Family": "Yaz\u0131tipi Ailesi",
-"Font Sizes": "Yaz\u0131tipi B\u00fcy\u00fckl\u00fc\u011f\u00fc",
-"Class": "S\u0131n\u0131f",
-"Browse for an image": "Bir resim aray\u0131n",
-"OR": "ya da",
-"Drop an image here": "Buraya bir resim koy",
-"Upload": "Y\u00fckle",
-"Block": "Blok",
-"Align": "Hizala",
-"Default": "Varsay\u0131lan",
-"Circle": "Daire",
-"Disc": "Disk",
-"Square": "Kare",
-"Lower Alpha": "K\u00fc\u00e7\u00fck ABC",
-"Lower Greek": "K\u00fc\u00e7\u00fck Yunan alfabesi",
-"Lower Roman": "K\u00fc\u00e7\u00fck Roman alfabesi",
-"Upper Alpha": "B\u00fcy\u00fck ABC",
-"Upper Roman": "B\u00fcy\u00fck Roman alfabesi",
-"Anchor": "\u00c7apa",
-"Name": "\u0130sim",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id bir harf ile ba\u015flamal\u0131d\u0131r ve sadece harfleri, rakamlar\u0131, \u00e7izgileri, noktalar\u0131, virg\u00fclleri veya alt \u00e7izgileri i\u00e7ermelidir.",
-"You have unsaved changes are you sure you want to navigate away?": "Kaydedilmemi\u015f de\u011fi\u015fiklikler var, sayfadan ayr\u0131lmak istedi\u011finize emin misiniz?",
-"Restore last draft": "Son tasla\u011f\u0131 kurtar",
-"Special character": "\u00d6zel karakter",
-"Source code": "Kaynak kodu",
-"Insert\/Edit code sample": "Kod \u00f6rne\u011fini Kaydet\/D\u00fczenle",
-"Language": "Dil",
-"Code sample": "Kod \u00f6rne\u011fi",
-"Color": "Renk",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Soldan sa\u011fa",
-"Right to left": "Sa\u011fdan sola",
-"Emoticons": "G\u00fcl\u00fcc\u00fckler",
-"Document properties": "Dok\u00fcman \u00f6zellikleri",
-"Title": "Ba\u015fl\u0131k",
-"Keywords": "Anahtar kelimeler",
-"Description": "A\u00e7\u0131klama",
-"Robots": "Robotlar",
-"Author": "Yazar",
-"Encoding": "Kodlama",
-"Fullscreen": "Tam ekran",
-"Action": "Eylem",
-"Shortcut": "K\u0131sayol",
-"Help": "Yard\u0131m",
-"Address": "Adres",
-"Focus to menubar": "Men\u00fc \u00e7ubu\u011funa odaklan.",
-"Focus to toolbar": "Ara\u00e7 \u00e7ubu\u011funa odaklan.",
-"Focus to element path": "Eleman yoluna odaklan",
-"Focus to contextual toolbar": "Ba\u011flamsal ara\u00e7 \u00e7ubu\u011funa odaklan",
-"Insert link (if link plugin activated)": "Link ekle (Link eklentisi aktif ise)",
-"Save (if save plugin activated)": "Kaydet (Kay\u0131t eklentisi aktif ise)",
-"Find (if searchreplace plugin activated)": "Bul (SearchReplace eklentisi aktif ise)",
-"Plugins installed ({0}):": "Y\u00fckl\u00fc eklenti say\u0131s\u0131 : ({0}):",
-"Premium plugins:": "Premium eklentileri",
-"Learn more...": "Daha fazla bilgi edinin.",
-"You are using {0}": "{0} kullan\u0131yorsun.",
-"Plugins": "Eklentiler",
-"Handy Shortcuts": "Kullan\u0131\u015fl\u0131 K\u0131sayollar",
-"Horizontal line": "Yatay \u00e7izgi",
-"Insert\/edit image": "Resim ekle\/d\u00fczenle",
-"Image description": "Resim a\u00e7\u0131klamas\u0131",
-"Source": "Kaynak",
-"Dimensions": "Boyutlar",
-"Constrain proportions": "En - Boy oran\u0131n\u0131 koru",
-"General": "Genel",
-"Advanced": "Geli\u015fmi\u015f",
-"Style": "Stil",
-"Vertical space": "Dikey bo\u015fluk",
-"Horizontal space": "Yatay bo\u015fluk",
-"Border": "\u00c7er\u00e7eve",
-"Insert image": "Resim ekle",
-"Image": "Resim",
-"Image list": "Resim listesi",
-"Rotate counterclockwise": "Saat y\u00f6n\u00fcn\u00fcn tersine d\u00f6nd\u00fcr",
-"Rotate clockwise": "Saat y\u00f6n\u00fcnde d\u00f6nd\u00fcr",
-"Flip vertically": "Dikey \u00e7evir",
-"Flip horizontally": "Yatay \u00e7evir",
-"Edit image": "G\u00f6r\u00fcnt\u00fcy\u00fc d\u00fczenle",
-"Image options": "G\u00f6r\u00fcnt\u00fc se\u00e7enekleri",
-"Zoom in": "Yak\u0131nla\u015ft\u0131r",
-"Zoom out": "Uzakla\u015ft\u0131r",
-"Crop": "Kes",
-"Resize": "Yeniden Boyutland\u0131r",
-"Orientation": "Y\u00f6n\u00fcn\u00fc Belirle",
-"Brightness": "Parlakl\u0131k",
-"Sharpen": "Keskinle\u015ftir",
-"Contrast": "Kontrast",
-"Color levels": "Renk seviyesi",
-"Gamma": "Gama",
-"Invert": "Tersine \u00e7evir",
-"Apply": "Uygula",
-"Back": "Geri",
-"Insert date\/time": "Tarih \/ Zaman ekle",
-"Date\/time": "Tarih\/zaman",
-"Insert link": "Ba\u011flant\u0131 ekle",
-"Insert\/edit link": "Ba\u011flant\u0131 ekle\/d\u00fczenle",
-"Text to display": "G\u00f6r\u00fcnen yaz\u0131",
-"Url": "URL",
-"Target": "Hedef",
-"None": "Hi\u00e7biri",
-"New window": "Yeni pencere",
-"Remove link": "Ba\u011flant\u0131y\u0131 kald\u0131r",
-"Anchors": "\u00c7apalar",
-"Link": "Ba\u011flant\u0131",
-"Paste or type a link": "Bir ba\u011flant\u0131 yap\u0131\u015ft\u0131r\u0131n yada yaz\u0131n.",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Girdi\u011finiz URL bir eposta adresi gibi g\u00f6z\u00fck\u00fcyor. Gerekli olan mailto: \u00f6nekini eklemek ister misiniz?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Girdi\u011finiz URL bir d\u0131\u015f ba\u011flant\u0131 gibi g\u00f6z\u00fck\u00fcyor. Gerekli olan http:\/\/ \u00f6nekini eklemek ister misiniz?",
-"Link list": "Link listesi",
-"Insert video": "Video ekle",
-"Insert\/edit video": "Video ekle\/d\u00fczenle",
-"Insert\/edit media": "Medya ekle\/d\u00fczenle",
-"Alternative source": "Alternatif kaynak",
-"Poster": "Poster",
-"Paste your embed code below:": "Medya g\u00f6mme kodunu buraya yap\u0131\u015ft\u0131r:",
-"Embed": "G\u00f6mme",
-"Media": "Medya",
-"Nonbreaking space": "B\u00f6l\u00fcnemez bo\u015fluk",
-"Page break": "Sayfa sonu",
-"Paste as text": "Metin olarak yap\u0131\u015ft\u0131r",
-"Preview": "\u00d6nizleme",
-"Print": "Yazd\u0131r",
-"Save": "Kaydet",
-"Find": "Bul",
-"Replace with": "Bununla de\u011fi\u015ftir",
-"Replace": "De\u011fi\u015ftir",
-"Replace all": "T\u00fcm\u00fcn\u00fc de\u011fi\u015ftir",
-"Prev": "\u00d6nceki",
-"Next": "Sonraki",
-"Find and replace": "Bul ve de\u011fi\u015ftir",
-"Could not find the specified string.": "Herhangi bir sonu\u00e7 bulunamad\u0131.",
-"Match case": "B\u00fcy\u00fck \/ K\u00fc\u00e7\u00fck harfe duyarl\u0131",
-"Whole words": "Tam s\u00f6zc\u00fckler",
-"Spellcheck": "Yaz\u0131m denetimi",
-"Ignore": "Yoksay",
-"Ignore all": "T\u00fcm\u00fcn\u00fc yoksay",
-"Finish": "Bitir",
-"Add to Dictionary": "S\u00f6zl\u00fc\u011fe ekle",
-"Insert table": "Tablo ekle",
-"Table properties": "Tablo \u00f6zellikleri",
-"Delete table": "Tabloyu sil",
-"Cell": "H\u00fccre",
-"Row": "Sat\u0131r",
-"Column": "S\u00fctun",
-"Cell properties": "H\u00fccre \u00f6zellikleri",
-"Merge cells": "H\u00fccreleri birle\u015ftir",
-"Split cell": "H\u00fccreleri ay\u0131r",
-"Insert row before": "\u00d6ncesine yeni sat\u0131r ekle",
-"Insert row after": "Sonras\u0131na yeni sat\u0131r ekle",
-"Delete row": "Sat\u0131r\u0131 sil",
-"Row properties": "Sat\u0131r \u00f6zellikleri",
-"Cut row": "Sat\u0131r\u0131 kes",
-"Copy row": "Sat\u0131r\u0131 kopyala",
-"Paste row before": "\u00d6ncesine sat\u0131r yap\u0131\u015ft\u0131r",
-"Paste row after": "Sonras\u0131na sat\u0131r  yap\u0131\u015ft\u0131r",
-"Insert column before": "\u00d6ncesine yeni s\u00fctun ekle",
-"Insert column after": "Sonras\u0131na yeni s\u00fctun ekle",
-"Delete column": "S\u00fctunu sil",
-"Cols": "S\u00fctunlar",
-"Rows": "Sat\u0131rlar",
-"Width": "Geni\u015flik",
-"Height": "Y\u00fckseklik",
-"Cell spacing": "H\u00fccre aral\u0131\u011f\u0131",
-"Cell padding": "H\u00fccre i\u00e7 bo\u015flu\u011fu",
-"Caption": "Ba\u015fl\u0131k",
-"Left": "Sol",
-"Center": "Orta",
-"Right": "Sa\u011f",
-"Cell type": "H\u00fccre tipi",
-"Scope": "Kapsam",
-"Alignment": "Hizalama",
-"H Align": "Yatay Hizalama",
-"V Align": "Dikey Hizalama",
-"Top": "\u00dcst",
-"Middle": "Orta",
-"Bottom": "Alt",
-"Header cell": "Ba\u015fl\u0131k h\u00fccresi",
-"Row group": "Sat\u0131r grubu",
-"Column group": "S\u00fctun grubu",
-"Row type": "Sat\u0131r tipi",
-"Header": "Ba\u015fl\u0131k",
-"Body": "G\u00f6vde",
-"Footer": "Alt",
-"Border color": "Kenarl\u0131k Rengi",
-"Insert template": "\u015eablon ekle",
-"Templates": "\u015eablonlar",
-"Template": "Tema",
-"Text color": "Yaz\u0131 rengi",
-"Background color": "Arkaplan rengi",
-"Custom...": "\u00d6zel",
-"Custom color": "\u00d6zel Renk",
-"No color": "Renk Yok",
-"Table of Contents": "\u0130\u00e7indekiler",
-"Show blocks": "Bloklar\u0131 g\u00f6r\u00fcnt\u00fcle",
-"Show invisible characters": "G\u00f6r\u00fcnmez karakterleri g\u00f6ster",
-"Words: {0}": "Kelime: {0}",
-"{0} words": "{0} kelime",
-"File": "Dosya",
-"Edit": "D\u00fczenle",
-"Insert": "Ekle",
-"View": "G\u00f6r\u00fcnt\u00fcle",
-"Format": "Bi\u00e7im",
-"Table": "Tablo",
-"Tools": "Ara\u00e7lar",
-"Powered by {0}": "{0} taraf\u0131ndan yap\u0131lm\u0131\u015ft\u0131r ",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zengin Metin Alan\u0131. Men\u00fc i\u00e7in ALT-F9 k\u0131sayolunu kullan\u0131n. Ara\u00e7 \u00e7ubu\u011fu i\u00e7in ALT-F10 k\u0131sayolunu kullan\u0131n. Yard\u0131m i\u00e7in ALT-0 k\u0131sayolunu kullan\u0131n."
-});
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ug.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ug.js
deleted file mode 100644
index 55fe840b13..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ug.js
+++ /dev/null
@@ -1,260 +0,0 @@
-tinymce.addI18n('ug',{
-"Redo": "\u0642\u0627\u064a\u062a\u0627 \u0642\u0649\u0644\u0649\u0634",
-"Undo": "\u0626\u0627\u0631\u0642\u0649\u063a\u0627 \u064a\u06d0\u0646\u0649\u0634",
-"Cut": "\u0643\u06d0\u0633\u0649\u0634",
-"Copy": "\u0643\u06c6\u0686\u06c8\u0631\u06c8\u0634",
-"Paste": "\u0686\u0627\u067e\u0644\u0627\u0634",
-"Select all": "\u06be\u06d5\u0645\u0645\u0649\u0646\u0649 \u062a\u0627\u0644\u0644\u0627\u0634",
-"New document": "\u064a\u06d0\u06ad\u0649 \u067e\u06c8\u062a\u06c8\u0643",
-"Ok": "\u062c\u06d5\u0632\u0649\u0645\u0644\u06d5\u0634",
-"Cancel": "\u0642\u0627\u0644\u062f\u06c7\u0631\u06c7\u0634",
-"Visual aids": "\u0626\u06d5\u0633\u0643\u06d5\u0631\u062a\u0649\u0634",
-"Bold": "\u062a\u0648\u0645",
-"Italic": "\u064a\u0627\u0646\u062a\u06c7",
-"Underline": "\u0626\u0627\u0633\u062a\u0649 \u0633\u0649\u0632\u0649\u0642",
-"Strikethrough": "\u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634 \u0633\u0649\u0632\u0649\u0642\u0649",
-"Superscript": "\u0626\u06c8\u0633\u062a\u06c8\u0646\u0643\u0649 \u0628\u06d5\u0644\u06af\u06d5",
-"Subscript": "\u0626\u0627\u0633\u062a\u0649\u0646\u0642\u0649 \u0628\u06d5\u0644\u06af\u06d5",
-"Clear formatting": "\u0641\u0648\u0631\u0645\u0627\u062a\u0646\u0649 \u062a\u0627\u0632\u0644\u0627\u0634",
-"Align left": "\u0633\u0648\u0644\u063a\u0627 \u062a\u0648\u063a\u0631\u0649\u0644\u0627\u0634",
-"Align center": "\u0645\u06d5\u0631\u0643\u06d5\u0632\u06af\u06d5 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
-"Align right": "\u0626\u0648\u06ad\u063a\u0627 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
-"Justify": "\u0626\u0649\u0643\u0643\u0649 \u064a\u0627\u0646\u063a\u0627 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
-"Bullet list": "\u0628\u06d5\u0644\u06af\u06d5 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643",
-"Numbered list": "\u0633\u0627\u0646\u0644\u0649\u0642 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643",
-"Decrease indent": "\u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0633\u06c8\u0631\u06c8\u0634",
-"Increase indent": "\u0643\u06d5\u064a\u0646\u0649\u06af\u06d5 \u0633\u06c8\u0631\u06c8\u0634",
-"Close": "\u062a\u0627\u0642\u0627\u0634",
-"Formats": "\u0641\u0648\u0631\u0645\u0627\u062a",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0633\u0649\u0632\u0646\u0649\u06ad \u062a\u0648\u0631 \u0643\u06c6\u0631\u06af\u06c8\u0686\u0649\u06ad\u0649\u0632 \u0642\u0649\u064a\u0649\u067e \u0686\u0627\u067e\u0644\u0627\u0634 \u062a\u0627\u062e\u062a\u0649\u0633\u0649 \u0632\u0649\u064a\u0627\u0631\u06d5\u062a \u0642\u0649\u0644\u0649\u0634\u0646\u0649 \u0642\u0648\u0644\u0644\u0649\u0645\u0627\u064a\u062f\u06c7.  Ctrl+X\/C\/V \u062a\u06d0\u0632\u0644\u06d5\u062a\u0645\u06d5 \u0643\u06c7\u0646\u06c7\u067e\u0643\u0649\u0633\u0649 \u0626\u0627\u0631\u0642\u0649\u0644\u0649\u0642 \u0643\u06d0\u0633\u0649\u067e \u0686\u0627\u067e\u0644\u0627\u0634 \u0645\u06d5\u0634\u063a\u06c7\u0644\u0627\u062a\u0649 \u0642\u0649\u0644\u0649\u06ad.",
-"Headers": "\u0628\u06d0\u0634\u0649",
-"Header 1": "\u062a\u06d0\u0645\u0627 1",
-"Header 2": "\u062a\u06d0\u0645\u0627 2",
-"Header 3": "\u062a\u06d0\u0645\u0627 3",
-"Header 4": "\u062a\u06d0\u0645\u0627 4",
-"Header 5": "\u062a\u06d0\u0645\u0627 5",
-"Header 6": "\u062a\u06d0\u0645\u0627 6",
-"Headings": "\u0645\u0627\u06cb\u0632\u06c7",
-"Heading 1": "1 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
-"Heading 2": "2 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
-"Heading 3": "3 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
-"Heading 4": "4 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
-"Heading 5": "5 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
-"Heading 6": "6 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u0643\u0648\u062f",
-"Paragraph": "\u067e\u0627\u0631\u0627\u06af\u0649\u0631\u0627 \u0641",
-"Blockquote": "\u0626\u06d5\u0633\u0643\u06d5\u0631\u062a\u0649\u0634",
-"Inline": "\u0626\u0649\u0686\u0643\u0649",
-"Blocks": "\u0631\u0627\u064a\u0648\u0646",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u06be\u0627\u0632\u0649\u0631 \u0686\u0627\u067e\u0644\u0649\u0633\u0649\u06ad\u0649\u0632 \u0633\u0627\u067e \u062a\u06d0\u0643\u0649\u0634 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0649 \u0686\u0627\u067e\u0644\u0649\u0646\u0649\u062f\u06c7. \u062a\u06d0\u0643\u0649\u0634 \u0634\u06d5\u0643\u0644\u0649\u062f\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634 \u062a\u06d5\u06ad\u0634\u0649\u0643\u0649\u0646\u0649 \u062a\u0627\u0642\u0649\u06cb\u06d5\u062a\u0643\u06d5\u0646\u06af\u06d5 \u0642\u06d5\u062f\u06d5\u0631.",
-"Font Family": "\u062e\u06d5\u062a \u0646\u06c7\u0633\u062e\u0649\u0633\u0649",
-"Font Sizes": "\u062e\u06d5\u062a \u0686\u0648\u06ad\u0644\u06c7\u0642\u0649",
-"Class": "\u062a\u06c8\u0631",
-"Browse for an image": "\u0631\u06d5\u0633\u0649\u0645\u0646\u0649  \u0643\u06c6\u0631\u0633\u0649\u062a\u0649\u0634",
-"OR": "\u064a\u0627\u0643\u0649",
-"Drop an image here": "\u0628\u06c7 \u064a\u06d5\u0631\u062f\u0649\u0643\u0649 \u0631\u06d5\u0633\u0649\u0645\u0646\u0649 \u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634",
-"Upload": "\u0686\u0649\u0642\u0649\u0631\u0649\u0634",
-"Block": "\u067e\u0627\u0631\u0686\u06d5",
-"Align": "\u062a\u0648\u063a\u0631\u0649\u0644\u0649\u0646\u0649\u0634\u0649",
-"Default": "\u0633\u06c8\u0643\u06c8\u062a",
-"Circle": "\u0686\u06d5\u0645\u0628\u06d5\u0631",
-"Disc": "\u062f\u06d0\u0633\u0643\u0627",
-"Square": "\u0643\u06cb\u0627\u062f\u0631\u0627\u062a",
-"Lower Alpha": "\u0626\u0649\u0646\u06af\u0649\u0644\u0649\u0632\u0686\u06d5 \u0643\u0649\u0686\u0649\u0643 \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
-"Lower Greek": "\u06af\u0631\u06d0\u062a\u0633\u0649\u064a\u0649\u0686\u06d5 \u0643\u0649\u0686\u0649\u0643 \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
-"Lower Roman": "\u0631\u0649\u0645\u0686\u06d5 \u0643\u0649\u0686\u0649\u0643 \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
-"Upper Alpha": "\u0626\u0649\u0646\u06af\u0649\u0644\u0649\u0632\u0686\u06d5 \u0686\u0648\u06ad \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
-"Upper Roman": "\u0631\u0649\u0645\u0686\u06d5 \u0686\u0648\u06ad \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
-"Anchor": "\u0626\u06c7\u0644\u0627\u0646\u0645\u0627",
-"Name": "\u0646\u0627\u0645\u0649",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID \u0686\u0648\u0642\u06c7\u0645 \u06be\u06d5\u0631\u0649\u067e \u0628\u0649\u0644\u06d5\u0646 \u0628\u0627\u0634\u0644\u0649\u0646\u0649\u0634\u0649 \u0643\u06d0\u0631\u06d5\u0643 \u060c \u0626\u0627\u0631\u0642\u0649\u0633\u0649 \u067e\u06d5\u0642\u06d5\u062a \u06be\u06d5\u0631\u0649\u067e \u060c \u0633\u0627\u0646 \u060c \u0626\u0627\u064a\u0631\u0649\u0634 \u0628\u06d5\u0644\u06af\u0649\u0633\u0649 \u060c \u0686\u0649\u0643\u0649\u062a \u06cb\u06d5 \u0626\u0627\u0633\u062a\u0649 \u0633\u0649\u0632\u0649\u0642\u0649 \u062f\u0649\u0646 \u0626\u0649\u0628\u0627\u0631\u06d5\u062a .",
-"You have unsaved changes are you sure you want to navigate away?": "\u0633\u0649\u0632 \u062a\u06d0\u062e\u0649 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0646\u0649 \u0633\u0627\u0642\u0644\u0649\u0645\u0649\u062f\u0649\u06ad\u0649\u0632\u060c \u0626\u0627\u064a\u0631\u0649\u0644\u0627\u0645\u0633\u0649\u0632\u061f",
-"Restore last draft": "\u0626\u0627\u062e\u0649\u0631\u0642\u0649 \u0643\u06c7\u067e\u0649\u064a\u0649\u06af\u06d5 \u0642\u0627\u064a\u062a\u0649\u0634",
-"Special character": "\u0626\u0627\u0644\u0627\u06be\u0649\u062f\u06d5 \u0628\u06d5\u0644\u06af\u0649\u0644\u06d5\u0631",
-"Source code": "\u0626\u06d5\u0633\u0644\u0649 \u0643\u0648\u062f\u0649",
-"Insert\/Edit code sample": "\u0643\u0648\u062f \u0645\u0649\u0633\u0627\u0644\u0649\\\u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Language": "\u062a\u0649\u0644",
-"Code sample": "\u0643\u0648\u062f \u0645\u0649\u0633\u0627\u0644\u0649",
-"Color": "\u0631\u06d5\u06ad",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0633\u0648\u0644\u062f\u0649\u0646 \u0626\u0648\u06ad\u063a\u0627 ",
-"Right to left": "\u0626\u0648\u06ad\u062f\u0649\u0646 \u0633\u0648\u0644\u063a\u0627",
-"Emoticons": "\u0686\u0649\u0631\u0627\u064a \u0626\u0649\u067e\u0627\u062f\u06d5",
-"Document properties": "\u06be\u06c6\u062c\u062c\u06d5\u062a \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
-"Title": "\u062a\u06d0\u0645\u0627",
-"Keywords": "\u06be\u0627\u0644\u0642\u0649\u0644\u0649\u0642 \u0633\u06c6\u0632",
-"Description": "\u062a\u06d5\u0633\u0649\u06cb\u0649\u0631",
-"Robots": "\u0645\u0627\u0634\u0649\u0646\u0627 \u0626\u0627\u062f\u06d5\u0645",
-"Author": "\u0626\u06c7\u0644\u0627\u0646\u0645\u0627",
-"Encoding": "\u0643\u0648\u062f\u0644\u0627\u0634",
-"Fullscreen": "\u067e\u06c8\u062a\u06c8\u0646 \u0626\u06d0\u0643\u0631\u0627\u0646",
-"Action": "\u06be\u06d5\u0631\u0649\u0643\u06d5\u062a",
-"Shortcut": "\u0642\u0649\u0633\u0642\u0627 \u064a\u0648\u0644",
-"Help": "\u064a\u0627\u0631\u062f\u06d5\u0645",
-"Address": "\u0626\u0627\u062f\u0649\u0631\u0649\u0633",
-"Focus to menubar": "\u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643 \u0633\u0649\u062a\u0648\u0646\u0649\u063a\u0627 \u062f\u0649\u0642\u06d5\u062a",
-"Focus to toolbar": "\u0642\u06c7\u0631\u0627\u0644 \u0633\u0649\u062a\u0648\u0646\u0649\u063a\u0627 \u062f\u0649\u0642\u06d5\u062a",
-"Focus to element path": "\u0626\u06d0\u0644\u0649\u0645\u0649\u0646\u062a\u0644\u0627\u0631 \u064a\u0648\u0644\u0649\u063a\u0627 \u062f\u0649\u0642\u06d5\u062a",
-"Focus to contextual toolbar": "\u0643\u0648\u0646\u062a\u06d0\u0643\u0649\u0633\u062a \u0642\u0648\u0631\u0627\u0644 \u0626\u0649\u0633\u062a\u0648\u0646\u0649\u063a\u0627 \u062f\u06d0\u0642\u06d5\u062a",
-"Insert link (if link plugin activated)": "\u0626\u06c7\u0644\u0627\u0646\u0645\u0627 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u06ad (\u0626\u06c7\u0644\u0627\u0646\u0645\u0627 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634 \u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0649\u0633\u0649\u0646\u0649 \u0642\u0648\u0632\u063a\u0627\u062a\u0642\u0627\u0646 \u0626\u06d5\u06be\u06cb\u0627\u0644\u062f\u0627)",
-"Save (if save plugin activated)": "\u0633\u0627\u0642\u0644\u0627\u0634 (\u0633\u0627\u0642\u0644\u0627\u0634 \u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0649\u0633\u0649\u0646\u0649 \u0642\u0648\u0632\u063a\u0627\u062a\u0642\u0627\u0646 \u0626\u06d5\u06be\u06cb\u0627\u0644\u062f\u0627)",
-"Find (if searchreplace plugin activated)": "\u0626\u0649\u0632\u062f\u06d5\u0634 (\u0626\u0649\u0632\u062f\u06d5\u0634 \u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0649\u0633\u0649 \u0642\u0648\u0632\u063a\u0649\u062a\u0649\u0644\u063a\u0627\u0646 \u0626\u06d5\u06be\u06cb\u0627\u0644\u062f\u0627)",
-"Plugins installed ({0}):": "\u0642\u0627\u0686\u0649\u0644\u0627\u0646\u063a\u0627\u0646 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0644\u0645\u0627 ({0}):",
-"Premium plugins:": "\u064a\u06c7\u0642\u0649\u0631\u0649 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0644\u0645\u0627 :",
-"Learn more...": "\u062a\u06d0\u062e\u0649\u0645\u06c7 \u0686\u06c8\u0634\u0649\u0646\u0649\u0634 ...",
-"You are using {0}": "\u0626\u0649\u0634\u0644\u0649\u062a\u0649\u06cb\u0627\u062a\u0642\u0649\u0646\u0649\u06ad\u0649\u0632 {0}",
-"Plugins": "\u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0644\u0645\u0627",
-"Handy Shortcuts": "\u0642\u0648\u0644\u0627\u064a\u0644\u0649\u0642 \u0642\u0649\u0633\u0642\u0627 \u064a\u0648\u0644",
-"Horizontal line": "\u06af\u0648\u0631\u0632\u0649\u0646\u062a\u0627\u0644 \u0642\u06c7\u0631",
-"Insert\/edit image": "\u0631\u06d5\u0633\u0649\u0645 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634 \u064a\u0627\u0643\u0649 \u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
-"Image description": "\u0631\u06d5\u0633\u0649\u0645 \u062a\u06d5\u0633\u06cb\u0649\u0631\u0649",
-"Source": "\u0645\u06d5\u0646\u0628\u06d5",
-"Dimensions": "\u0686\u0648\u06ad-\u0643\u0649\u0686\u0649\u0643",
-"Constrain proportions": "\u0626\u06d0\u06af\u0649\u0632\u0644\u0649\u0643-\u0643\u06d5\u06ad\u0644\u0649\u0643 \u0646\u0649\u0633\u067e\u0649\u062a\u0649\u0646\u0649 \u0633\u0627\u0642\u0644\u0627\u0634",
-"General": "\u0626\u0627\u062f\u06d5\u062a\u062a\u0649\u0643\u0649",
-"Advanced": "\u0626\u0627\u0644\u0627\u06be\u0649\u062f\u06d5",
-"Style": "\u0626\u06c7\u0633\u0644\u06c7\u067e",
-"Vertical space": "\u06cb\u06d0\u0631\u062a\u0649\u0643\u0627\u0644 \u0628\u0648\u0634\u0644\u06c7\u0642",
-"Horizontal space": "\u06af\u0648\u0631\u0632\u0649\u0646\u062a\u0627\u0644 \u0628\u0648\u0634\u0644\u06c7\u0642",
-"Border": "\u064a\u0627\u0642\u0627",
-"Insert image": "\u0631\u06d5\u0633\u0649\u0645 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Image": "\u0631\u06d5\u0633\u0649\u0645",
-"Image list": "\u0631\u06d5\u0633\u0649\u0645 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643\u0649",
-"Rotate counterclockwise": "\u200f\u200f\u0633\u0627\u0626\u06d5\u062a\u0643\u06d5 \u0642\u0627\u0631\u0634\u0649 \u0686\u06c6\u0631\u06c8\u0634",
-"Rotate clockwise": "\u200f\u200f\u0633\u0627\u0626\u06d5\u062a \u064a\u06c6\u0646\u0649\u0644\u0649\u0634\u0649\u062f\u06d5 \u0686\u06c6\u0631\u06c8\u0634",
-"Flip vertically": "\u06cb\u06d0\u0631\u062a\u0649\u0643\u0627\u0644 \u0626\u06c6\u0631\u06c8\u0634",
-"Flip horizontally": "\u06af\u0648\u0631\u0649\u0632\u0648\u0646\u062a\u0627\u0644 \u0626\u06c6\u0631\u06c8\u0634",
-"Edit image": "\u0631\u06d5\u0633\u0649\u0645 \u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
-"Image options": "\u0631\u06d5\u0633\u0649\u0645 \u062a\u0627\u0644\u0644\u0627\u0646\u0645\u0649\u0644\u0649\u0631\u0649",
-"Zoom in": "\u064a\u06d0\u0642\u0649\u0646\u0644\u0627\u062a\u0645\u0627\u0642",
-"Zoom out": "\u064a\u0649\u0631\u0627\u0642\u0644\u0627\u062a\u0645\u0627\u0642",
-"Crop": "\u0642\u0649\u064a\u0649\u0634",
-"Resize": "\u0686\u0648\u06ad\u0644\u06c7\u0642\u0649\u0646\u0649 \u0626\u06c6\u0632\u06af\u06d5\u0631\u062a\u0649\u0634",
-"Orientation": "\u064a\u06c6\u0646\u0649\u0644\u0649\u0634",
-"Brightness": "\u064a\u0648\u0631\u06c7\u0642\u0644\u06c7\u0642\u0649",
-"Sharpen": "\u0626\u06c6\u062a\u0643\u06c8\u0631\u0644\u06d5\u0634\u062a\u06c8\u0631\u06c8\u0634",
-"Contrast": "\u0633\u06d0\u0644\u0649\u0634\u062a\u06c7\u0631\u0645\u0627",
-"Color levels": "\u0631\u06d5\u06ad \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0631\u0649",
-"Gamma": "\u06af\u0627\u0645\u0645\u0627",
-"Invert": "\u062a\u06d5\u062a\u06c8\u0631",
-"Apply": "\u0642\u0648\u0644\u0644\u0649\u0646\u0649\u0634",
-"Back": "\u0642\u0627\u064a\u062a\u0649\u0634",
-"Insert date\/time": "\u0686\u0649\u0633\u0644\u0627\/\u06cb\u0627\u0642\u0649\u062a \u0643\u0649\u0631\u06af\u06c8\u0632\u06c8\u0634",
-"Date\/time": "\u0686\u06d0\u0633\u0644\u0627\\\u06cb\u0627\u0642\u0649\u062a",
-"Insert link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Insert\/edit link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0642\u06c7\u0633\u062a\u06c7\u0631\u06c7\u0634\/\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
-"Text to display": "\u0643\u06c6\u0631\u06c8\u0646\u0649\u062f\u0649\u063a\u0627\u0646 \u0645\u06d5\u0632\u0645\u06c7\u0646",
-"Url": "\u0626\u0627\u062f\u0631\u0649\u0633",
-"Target": "\u0646\u0649\u0634\u0627\u0646",
-"None": "\u064a\u0648\u0642",
-"New window": "\u064a\u06d0\u06ad\u0649 \u0643\u06c6\u0632\u0646\u06d5\u0643",
-"Remove link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634",
-"Anchors": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634",
-"Link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634",
-"Paste or type a link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0686\u0627\u067e\u0644\u0627\u06ad \u064a\u0627\u0643\u0649 \u0643\u0649\u0631\u06af\u06c8\u0632\u06c8\u06ad",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0633\u0649\u0632 \u0643\u0649\u0631\u06af\u06c8\u0632\u06af\u06d5\u0646 URL \u0628\u0649\u0631 \u0626\u06d0\u0644\u062e\u06d5\u062a \u0626\u0627\u062f\u0631\u06d0\u0633\u0649\u062f\u06d5\u0643 \u0642\u0649\u0644\u0649\u067e \u062a\u06c7\u0631\u0649\u062f\u06c7\u060c\u062a\u06d5\u0644\u06d5\u067e \u0642\u0649\u0644\u0649\u0646\u063a\u0627\u0646 mailto \u0646\u0649 \u0642\u06c7\u0634\u0627\u0645\u0633\u0649\u0632\u061f",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0633\u0649\u0632 \u0643\u0649\u0631\u06af\u06c8\u0632\u06af\u06d5\u0646 \u062a\u0648\u0631 \u0626\u0627\u062f\u0631\u06d0\u0633\u0649 \u0633\u0649\u0631\u062a\u0642\u0649 \u0626\u06c7\u0644\u0627\u0646\u0645\u0649\u062f\u06d5\u0643 \u0642\u0649\u0644\u0649\u067e \u062a\u06c7\u0631\u0649\u062f\u06c7 \u060c\u062a\u06d5\u0644\u06d5\u067e \u0642\u0649\u0644\u0649\u0646\u063a\u0627\u0646 http:\/\/ \u0646\u0649 \u0642\u0648\u0634\u0627\u0645\u0633\u0649\u0632\u061f",
-"Link list": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u062a\u06c8\u0631\u0649",
-"Insert video": "\u0633\u0649\u0646 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Insert\/edit video": "\u0633\u0649\u0646 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634\/\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
-"Insert\/edit media": "\u0645\u06d0\u062f\u0649\u064a\u0627 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634\/\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
-"Alternative source": "\u062a\u06d5\u0633\u06cb\u0649\u0631\u0649",
-"Poster": "\u064a\u0648\u0644\u0644\u0649\u063a\u06c7\u0686\u0649",
-"Paste your embed code below:": "\u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0627\u0642\u0686\u0649 \u0628\u0648\u0644\u063a\u0627\u0646 \u0643\u0648\u062f\u0646\u0649 \u0686\u0627\u067e\u0644\u0627\u06ad",
-"Embed": "\u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Media": "\u0645\u06d0\u062f\u0649\u064a\u0627",
-"Nonbreaking space": "\u0628\u0648\u0634\u0644\u06c7\u0642",
-"Page break": "\u0628\u06d5\u062a \u0626\u0627\u062e\u0649\u0631\u0644\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Paste as text": "\u062a\u06d0\u0643\u0649\u0634 \u0634\u06d5\u0643\u0644\u0649\u062f\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634",
-"Preview": "\u0643\u06c6\u0631\u06c8\u0634",
-"Print": "\u0628\u06d0\u0633\u0649\u0634",
-"Save": "\u0633\u0627\u0642\u0644\u0627\u0634",
-"Find": "\u0626\u0649\u0632\u062f\u06d5\u0634",
-"Replace with": "\u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Replace": "\u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Replace all": "\u06be\u06d5\u0645\u0645\u0649\u0646\u0649 \u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Prev": "\u0626\u0627\u0644\u062f\u0649\u0646\u0642\u0649\u0633\u0649",
-"Next": "\u0643\u06d0\u064a\u0649\u0646\u0643\u0649\u0633\u0649",
-"Find and replace": "\u0626\u0649\u0632\u062f\u06d5\u0634 \u06cb\u06d5 \u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Could not find the specified string.": "\u0626\u0649\u0632\u062f\u0649\u0645\u06d5\u0643\u0686\u0649 \u0628\u0648\u0644\u063a\u0627\u0646 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0646\u0649 \u062a\u0627\u067e\u0627\u0644\u0645\u0649\u062f\u0649.",
-"Match case": "\u0686\u0648\u06ad \u0643\u0649\u0686\u0649\u0643 \u06be\u06d5\u0631\u0649\u067e\u0646\u0649 \u067e\u06d5\u0631\u0649\u0642\u0644\u06d5\u0646\u062f\u06c8\u0631\u06c8\u0634",
-"Whole words": "\u062a\u0648\u0644\u06c7\u0642  \u0645\u0627\u0633\u0644\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Spellcheck": "\u0626\u0649\u0645\u0644\u0627 \u062a\u06d5\u0643\u0634\u06c8\u0631\u06c8\u0634",
-"Ignore": "\u0626\u06c6\u062a\u0643\u06c8\u0632\u06c8\u0634",
-"Ignore all": "\u06be\u06d5\u0645\u0645\u0649\u0646\u0649 \u0626\u06c6\u062a\u0643\u06c8\u0632\u06c8\u0634",
-"Finish": "\u0626\u0627\u062e\u0649\u0631\u0644\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Add to Dictionary": "\u0644\u06c7\u063a\u06d5\u062a \u0642\u0648\u0634\u06c7\u0634",
-"Insert table": "\u062c\u06d5\u062f\u06cb\u06d5\u0644 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Table properties": "\u062c\u06d5\u062f\u06cb\u06d5\u0644 \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
-"Delete table": "\u062c\u06d5\u062f\u06cb\u06d5\u0644 \u0626\u06c6\u0686\u06c8\u0631\u0634",
-"Cell": "\u0643\u0627\u062a\u06d5\u0643",
-"Row": "\u0642\u06c7\u0631",
-"Column": "\u0631\u06d5\u062a",
-"Cell properties": "\u0643\u0627\u062a\u06d5\u0643 \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
-"Merge cells": "\u0643\u0627\u062a\u06d5\u0643 \u0628\u0649\u0631\u0644\u06d5\u0634\u062a\u06c8\u0631\u06c8\u0634",
-"Split cell": "\u0643\u0627\u062a\u06d5\u0643 \u067e\u0627\u0631\u0686\u0649\u0644\u0627\u0634",
-"Insert row before": "\u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0642\u06c7\u0631 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Insert row after": "\u0626\u0627\u0631\u0642\u0649\u063a\u0627 \u0642\u06c7\u0631 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Delete row": "\u0642\u06c7\u0631 \u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634",
-"Row properties": "\u0642\u06c7\u0631 \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
-"Cut row": "\u0642\u06c7\u0631 \u0643\u06d0\u0633\u0649\u0634",
-"Copy row": "\u0642\u06c7\u0631 \u0643\u06c6\u0686\u06c8\u0631\u06c8\u0634",
-"Paste row before": "\u0642\u06c7\u0631 \u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0686\u0627\u067e\u0644\u0627\u0634",
-"Paste row after": "\u0642\u06c7\u0631 \u0643\u06d5\u064a\u0646\u0649\u06af\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634",
-"Insert column before": "\u0631\u06d5\u062a \u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Insert column after": "\u0631\u06d5\u062a \u0643\u06d5\u064a\u0646\u0649\u06af\u06d5 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Delete column": "\u0631\u06d5\u062a \u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634",
-"Cols": "\u0631\u06d5\u062a",
-"Rows": "\u0642\u06c7\u0631",
-"Width": "\u0643\u06d5\u06ad\u0644\u0649\u0643\u0649",
-"Height": "\u0626\u06d0\u06af\u0649\u0632\u0644\u0649\u0643\u0649",
-"Cell spacing": "\u0643\u0627\u062a\u06d5\u0643 \u0633\u0649\u0631\u062a\u0642\u0649 \u0626\u0627\u0631\u0649\u0644\u0649\u0642\u0649",
-"Cell padding": "\u0643\u0627\u062a\u06d5\u0643 \u0626\u0649\u0686\u0643\u0649 \u0626\u0627\u0631\u0649\u0644\u0649\u0642\u0649",
-"Caption": "\u0686\u06c8\u0634\u06d5\u0646\u062f\u06c8\u0631\u06c8\u0634",
-"Left": "\u0633\u0648\u0644",
-"Center": "\u0645\u06d5\u0631\u0643\u06d5\u0632",
-"Right": "\u0626\u0648\u06ad",
-"Cell type": "\u0643\u0627\u062a\u06d5\u0643 \u062a\u0649\u067e\u0649",
-"Scope": "\u062f\u0627\u0626\u0649\u0631\u06d5",
-"Alignment": "\u064a\u06c6\u0644\u0649\u0646\u0649\u0634\u0649",
-"H Align": "\u06af\u0648\u0631\u0632\u0649\u0646\u062a\u0627\u0644 \u062a\u0648\u063a\u0631\u0649\u0644\u0627\u0634",
-"V Align": "\u06cb\u06d0\u0631\u062a\u0649\u0643\u0627\u0644 \u062a\u0648\u063a\u0631\u0649\u0644\u0627\u0634",
-"Top": "\u0626\u06c8\u0633\u062a\u0649",
-"Middle": "\u0626\u0648\u062a\u062a\u06c7\u0631\u0633\u0649",
-"Bottom": "\u0626\u0627\u0633\u062a\u0649",
-"Header cell": "\u0628\u0627\u0634 \u0643\u0627\u062a\u06d5\u0643",
-"Row group": "\u0642\u06c7\u0631 \u06af\u06c7\u0631\u06c7\u067e\u067e\u0649\u0633\u0649",
-"Column group": "\u0631\u06d5\u062a \u06af\u06c7\u0631\u06c7\u067e\u067e\u0649\u0633\u0649",
-"Row type": "\u0642\u06c7\u0631 \u062a\u0649\u067e\u0649",
-"Header": "\u0628\u06d0\u0634\u0649",
-"Body": "\u0628\u06d5\u062f\u0649\u0646\u0649",
-"Footer": "\u067e\u06c7\u062a\u0649",
-"Border color": "\u0631\u0627\u0645\u0643\u0627 \u0631\u06d5\u06ad\u06af\u0649",
-"Insert template": "\u0626\u06c8\u0644\u06af\u06d5 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Templates": "\u0626\u06c8\u0644\u06af\u0649\u0644\u06d5\u0631",
-"Template": "\u0626\u06c8\u0644\u06af\u0649\u0644\u06d5\u0631",
-"Text color": "\u062e\u06d5\u062a \u0631\u06d5\u06ad\u06af\u0649",
-"Background color": "\u0626\u0627\u0631\u0642\u0627 \u0631\u06d5\u06ad\u06af\u0649",
-"Custom...": "\u0626\u0649\u062e\u062a\u0649\u064a\u0627\u0631\u0649",
-"Custom color": "\u0626\u0649\u062e\u062a\u0649\u064a\u0627\u0631\u0649 \u0631\u06d5\u06ad",
-"No color": "\u0631\u06d5\u06ad \u064a\u0648\u0642",
-"Table of Contents": "\u062c\u06d5\u062f\u06d5\u0644\u0646\u0649\u06ad \u0645\u06d5\u0632\u0645\u06c7\u0646\u0649",
-"Show blocks": "\u0631\u0627\u064a\u0648\u0646 \u0643\u06c6\u0631\u0633\u0649\u062a\u0649\u0634",
-"Show invisible characters": "\u0643\u06c6\u0631\u06c8\u0646\u0645\u06d5\u064a\u062f\u0649\u063a\u0627\u0646 \u06be\u06d5\u0631\u0649\u067e\u0644\u06d5\u0631\u0646\u0649 \u0643\u06c6\u0631\u0633\u0649\u062a\u0649\u0634",
-"Words: {0}": "\u0633\u06c6\u0632: {0}",
-"{0} words": "{0} \u0633\u06c6\u0632",
-"File": "\u06be\u06c6\u062c\u062c\u06d5\u062a",
-"Edit": "\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
-"Insert": "\u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"View": "\u0643\u06c6\u0631\u06c8\u0634",
-"Format": "\u0641\u0648\u0631\u0645\u0627\u062a",
-"Table": "\u062c\u06d5\u062f\u06cb\u06d5\u0644",
-"Tools": "\u0642\u06c7\u0631\u0627\u0644",
-"Powered by {0}": "\u062a\u06d0\u062e\u0646\u0649\u0643\u0649\u062f\u0627 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0645\u0648\u0644 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0644\u06c7\u0642 \u062a\u06d0\u0643\u06d0\u0633\u0649\u062a \u0631\u0627\u0645\u0643\u0649\u0633\u0649 \u0631\u0627\u064a\u0648\u0646\u0649\u062f\u0627 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643 \u0626\u06c8\u0686\u06c8\u0646 ALT-F9 \u0646\u0649\u060c \u0642\u0648\u0631\u0627\u0644 \u0628\u0627\u0644\u062f\u0649\u0642\u0649 \u0626\u06c8\u0686\u06c8\u0646 ALT-F10 \u0646\u0649\u060c \u064a\u0627\u0631\u062f\u06d5\u0645 \u0626\u06c8\u0686\u06c8\u0646 ALT-0 \u0646\u0649 \u0628\u06d0\u0633\u0649\u06ad"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/uk.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/uk.js
deleted file mode 100644
index 976ca53ace..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/uk.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('uk',{
-"Redo": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438",
-"Undo": "\u0421\u043a\u0430\u0441\u0443\u0432\u0430\u0442\u0438",
-"Cut": "\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438",
-"Copy": "\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438",
-"Paste": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438",
-"Select all": "\u0412\u0438\u0434\u0456\u043b\u0438\u0442\u0438 \u0432\u0441\u0435",
-"New document": "\u041d\u043e\u0432\u0438\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Ok": "\u0413\u0430\u0440\u0430\u0437\u0434",
-"Cancel": "\u0421\u043a\u0430\u0441\u0443\u0432\u0430\u0442\u0438",
-"Visual aids": "\u041d\u0430\u043e\u0447\u043d\u0456 \u043f\u0440\u0438\u043b\u0430\u0434\u0434\u044f",
-"Bold": "\u0416\u0438\u0440\u043d\u0438\u0439",
-"Italic": "\u041a\u0443\u0440\u0441\u0438\u0432",
-"Underline": "\u041f\u0456\u0434\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u0438\u0439",
-"Strikethrough": "\u0417\u0430\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u0438\u0439",
-"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0456\u0439 \u0456\u043d\u0434\u0435\u043a\u0441",
-"Subscript": "\u041d\u0438\u0436\u043d\u0456\u0439 \u0456\u043d\u0434\u0435\u043a\u0441",
-"Clear formatting": "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
-"Align left": "\u041f\u043e \u043b\u0456\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Align center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Align right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Justify": "\u041f\u043e \u0448\u0438\u0440\u0438\u043d\u0456",
-"Bullet list": "\u041d\u0435\u043d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u0438\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Numbered list": "\u041d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u0438\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Decrease indent": "\u0417\u043c\u0435\u043d\u0448\u0438\u0442\u0438\u0442\u0438 \u0432\u0456\u0434\u0441\u0442\u0443\u043f",
-"Increase indent": "\u0417\u0431\u0456\u043b\u044c\u0448\u0438\u0442\u0438  \u0432\u0456\u0434\u0441\u0442\u0443\u043f",
-"Close": "\u0417\u0430\u043a\u0440\u0438\u0442\u0438",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043d\u0435 \u043f\u0456\u0434\u0442\u0440\u0438\u043c\u0443\u0454 \u043f\u0440\u044f\u043c\u0438\u0439 \u0434\u043e\u0441\u0442\u0443\u043f \u0434\u043e \u0431\u0443\u0444\u0435\u0440\u0443 \u043e\u0431\u043c\u0456\u043d\u0443. \u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0439\u0442\u0435 \u0441\u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043d\u044f \u043a\u043b\u0430\u0432\u0456\u0448 Ctrl+C\/V\/X.",
-"Headers": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
-"Header 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
-"Header 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
-"Header 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
-"Header 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
-"Header 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
-"Header 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-"Headings": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Heading 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
-"Heading 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
-"Heading 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
-"Heading 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
-"Heading 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
-"Heading 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-"Preformatted": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u044c\u043e \u0432\u0456\u0434\u0444\u043e\u0440\u043c\u0430\u0442\u043e\u0432\u0430\u043d\u0438\u0439",
-"Div": "\u0411\u043b\u043e\u043a",
-"Pre": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0454 \u0444\u043e\u0440\u043c\u0430\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
-"Code": "\u041a\u043e\u0434",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Blockquote": "\u0426\u0438\u0442\u0430\u0442\u0430",
-"Inline": "\u0412\u0431\u0443\u0434\u043e\u0432\u0430\u043d\u0456",
-"Blocks": "\u0411\u043b\u043e\u043a\u0438",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0412\u0441\u0442\u0430\u0432\u043a\u0430 \u0437\u0434\u0456\u0439\u0441\u043d\u044e\u0454\u0442\u044c\u0441\u044f \u0443 \u0432\u0438\u0433\u043b\u044f\u0434\u0456 \u043f\u0440\u043e\u0441\u0442\u043e\u0433\u043e \u0442\u0435\u043a\u0441\u0442\u0443, \u043f\u043e\u043a\u0438 \u043d\u0435 \u0432\u0456\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u0438 \u0434\u0430\u043d\u0443 \u043e\u043f\u0446\u0456\u044e.",
-"Font Family": "\u0422\u0438\u043f \u0448\u0440\u0438\u0444\u0442\u0443",
-"Font Sizes": "\u0420\u043e\u0437\u043c\u0456\u0440 \u0448\u0440\u0438\u0444\u0442\u0443",
-"Class": "\u041a\u043b\u0430\u0441",
-"Browse for an image": "\u0412\u0438\u0431\u0456\u0440 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"OR": "\u0410\u0411\u041e",
-"Drop an image here": "\u041f\u0435\u0440\u0435\u043c\u0456\u0441\u0442\u0456\u0442\u044c \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f \u0441\u044e\u0434\u0438",
-"Upload": "\u0417\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0438\u0442\u0438",
-"Block": "\u0411\u043b\u043e\u043a",
-"Align": "\u0412\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"Default": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u0438\u0439",
-"Circle": "\u041e\u043a\u0440\u0443\u0436\u043d\u043e\u0441\u0442\u0456",
-"Disc": "\u041a\u0440\u0443\u0433\u0438",
-"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u0438",
-"Lower Alpha": "\u041c\u0430\u043b\u0456 \u043b\u0430\u0442\u0438\u043d\u0441\u044c\u043a\u0456 \u0431\u0443\u043a\u0432\u0438",
-"Lower Greek": "\u041c\u0430\u043b\u0456 \u0433\u0440\u0435\u0446\u044c\u043a\u0456 \u0431\u0443\u043a\u0432\u0438",
-"Lower Roman": "\u041c\u0430\u043b\u0456 \u0440\u0438\u043c\u0441\u044c\u043a\u0456 \u0446\u0438\u0444\u0440\u0438",
-"Upper Alpha": "\u0412\u0435\u043b\u0438\u043a\u0456 \u043b\u0430\u0442\u0438\u043d\u0441\u044c\u043a\u0456 \u0431\u0443\u043a\u0432\u0438",
-"Upper Roman": "\u0420\u0438\u043c\u0441\u044c\u043a\u0456 \u0446\u0438\u0444\u0440\u0438",
-"Anchor": "\u042f\u043a\u0456\u0440",
-"Name": "\u041d\u0430\u0437\u0432\u0430",
-"Id": "\u041a\u043e\u0434",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u041a\u043e\u0434 \u043c\u0430\u0454 \u043f\u043e\u0447\u0438\u043d\u0430\u0442\u0438\u0441\u044f \u0437 \u043b\u0456\u0442\u0435\u0440\u0438 \u0456 \u043c\u043e\u0436\u0435 \u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043b\u0438\u0448\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u0438 \u043b\u0456\u0442\u0435\u0440, \u0446\u0438\u0444\u0440, \u0434\u0435\u0444\u0456\u0441\u0443, \u043a\u0440\u0430\u043f\u043a\u0438, \u043a\u043e\u043c\u0438 \u0430\u0431\u043e \u043d\u0438\u0436\u043d\u044c\u043e\u0433\u043e \u043f\u0456\u0434\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u043d\u044f.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0412\u0430\u0441 \u0454 \u043d\u0435\u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0456 \u0437\u043c\u0456\u043d\u0438. \u0412\u0438 \u0432\u043f\u0435\u0432\u043d\u0435\u043d\u0456, \u0449\u043e \u0445\u043e\u0447\u0435\u0442\u0435 \u043f\u0456\u0442\u0438?",
-"Restore last draft": "\u0412\u0456\u0434\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044f \u043e\u0441\u0442\u0430\u043d\u043d\u044c\u043e\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0443",
-"Special character": "\u0421\u043f\u0435\u0446\u0456\u0430\u043b\u044c\u043d\u0456 \u0441\u0438\u043c\u0432\u043e\u043b\u0438",
-"Source code": "\u0412\u0438\u0445\u0456\u0434\u043d\u0438\u0439 \u043a\u043e\u0434",
-"Insert\/Edit code sample": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0437\u043c\u0456\u043d\u0438\u0442\u0438 \u043f\u0440\u0438\u043a\u043b\u0430\u0434 \u043a\u043e\u0434\u0443",
-"Language": "\u041c\u043e\u0432\u0430",
-"Code sample": "\u041f\u0440\u0438\u043a\u043b\u0430\u0434 \u043a\u043e\u0434\u0443",
-"Color": "\u043a\u043e\u043b\u0456\u0440",
-"R": "\u0427",
-"G": "\u0417",
-"B": "\u0411",
-"Left to right": "\u0417\u043b\u0456\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043e",
-"Right to left": "\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0456\u0432\u043e",
-"Emoticons": "\u0415\u043c\u043e\u0446\u0456\u0457",
-"Document properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Keywords": "\u041a\u043b\u044e\u0447\u043e\u0432\u0456 \u0441\u043b\u043e\u0432\u0430",
-"Description": "\u041e\u043f\u0438\u0441",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Encoding": "\u041a\u043e\u0434\u0443\u0432\u0430\u043d\u043d\u044f",
-"Fullscreen": "\u041f\u043e\u0432\u043d\u043e\u0435\u043a\u0440\u0430\u043d\u043d\u0438\u0439 \u0440\u0435\u0436\u0438\u043c",
-"Action": "\u0414\u0456\u044f",
-"Shortcut": "\u042f\u0440\u043b\u0438\u043a",
-"Help": "\u0414\u043e\u043f\u043e\u043c\u043e\u0433\u0430",
-"Address": "\u0410\u0434\u0440\u0435\u0441\u0430",
-"Focus to menubar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043c\u0435\u043d\u044e",
-"Focus to toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u0456\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430\u0445",
-"Focus to element path": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u0448\u043b\u044f\u0445\u0443",
-"Focus to contextual toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u0456",
-"Insert link (if link plugin activated)": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f (\u044f\u043a\u0449\u043e \u043f\u043b\u0430\u0433\u0456\u043d \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u044c \u0430\u043a\u0442\u0438\u0432\u043e\u0432\u0430\u043d\u0438\u0439)",
-"Save (if save plugin activated)": "\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 (\u044f\u043a\u0449\u043e \u043f\u043b\u0430\u0433\u0456\u043d \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u043d\u044f \u0430\u043a\u0442\u0438\u0432\u043e\u0432\u0430\u043d\u043e)",
-"Find (if searchreplace plugin activated)": "\u0417\u043d\u0430\u0439\u0442\u0438 (\u044f\u043a\u0449\u043e \u043f\u043b\u0430\u0433\u0456\u043d \u043f\u043e\u0448\u0443\u043a\u0443 \u0430\u043a\u0442\u0438\u0432\u043e\u0432\u0430\u043d\u043e)",
-"Plugins installed ({0}):": "\u0412\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0456 \u043f\u043b\u0430\u0433\u0456\u043d\u0438 ({0}):",
-"Premium plugins:": "\u041f\u0440\u0435\u043c\u0456\u0443\u043c \u043f\u043b\u0430\u0433\u0456\u043d\u0438:",
-"Learn more...": "\u0414\u043e\u0434\u0430\u0442\u043a\u043e\u0432\u043e...",
-"You are using {0}": "\u0423 \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u0430\u043d\u043d\u0456 {0}",
-"Plugins": "\u041f\u043b\u0430\u0433\u0456\u043d\u0438",
-"Handy Shortcuts": "\u041a\u043b\u0430\u0432\u0456\u0430\u0442\u0443\u0440\u043d\u0456 \u0441\u043a\u043e\u0440\u043e\u0447\u0435\u043d\u043d\u044f",
-"Horizontal line": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0430 \u043b\u0456\u043d\u0456\u044f",
-"Insert\/edit image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0437\u043c\u0456\u043d\u0438\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image description": "\u041e\u043f\u0438\u0441 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Source": "\u0414\u0436\u0435\u0440\u0435\u043b\u043e",
-"Dimensions": "\u0420\u043e\u0437\u043c\u0456\u0440",
-"Constrain proportions": "\u0417\u0431\u0435\u0440\u0456\u0433\u0430\u0442\u0438 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0456\u0457",
-"General": "\u0417\u0430\u0433\u0430\u043b\u044c\u043d\u0456",
-"Advanced": "\u0420\u043e\u0437\u0448\u0438\u0440\u0435\u043d\u0456",
-"Style": "\u0421\u0442\u0438\u043b\u044c",
-"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0438\u0439 \u0456\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Horizontal space": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0438\u0439 \u0456\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Border": "\u041c\u0435\u0436\u0430",
-"Insert image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image": "\u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image list": "\u041f\u0435\u0440\u0435\u043b\u0456\u043a \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u044c",
-"Rotate counterclockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438 \u043f\u0440\u043e\u0442\u0438 \u0433\u043e\u0434\u0438\u043d\u043d\u0438\u043a\u043e\u0432\u043e\u0457 \u0441\u0442\u0440\u0456\u043b\u043a\u0438",
-"Rotate clockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438 \u0437\u0430 \u0433\u043e\u0434\u0438\u043d\u043d\u0438\u043a\u043e\u0432\u043e\u044e \u0441\u0442\u0440\u0456\u043b\u043a\u043e\u044e",
-"Flip vertically": "\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u043f\u043e \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0456",
-"Flip horizontally": "\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u043f\u043e \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u0456",
-"Edit image": "\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image options": "\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Zoom in": "\u041d\u0430\u0431\u043b\u0438\u0437\u0438\u0442\u0438",
-"Zoom out": "\u0412\u0456\u0434\u0434\u0430\u043b\u0438\u0442\u0438",
-"Crop": "\u041e\u0431\u0440\u0456\u0437\u0430\u0442\u0438",
-"Resize": "\u0417\u043c\u0456\u043d\u0438\u0442\u0438 \u0440\u043e\u0437\u043c\u0456\u0440",
-"Orientation": "\u041e\u0440\u0456\u0454\u043d\u0442\u0430\u0446\u0456\u044f",
-"Brightness": "\u042f\u0441\u043a\u0440\u0430\u0432\u0456\u0441\u0442\u044c",
-"Sharpen": "\u0427\u0456\u0442\u043a\u0456\u0441\u0442\u044c",
-"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
-"Color levels": "\u0420\u0456\u0432\u043d\u0456 \u043a\u043e\u043b\u044c\u043e\u0440\u0456\u0432",
-"Gamma": "\u0413\u0430\u043c\u043c\u0430",
-"Invert": "\u0406\u043d\u0432\u0435\u0440\u0441\u0456\u044f",
-"Apply": "\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438",
-"Back": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438\u0441\u044f",
-"Insert date\/time": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0434\u0430\u0442\u0443\/\u0447\u0430\u0441",
-"Date\/time": "\u0414\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Insert link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Insert\/edit link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Text to display": "\u0422\u0435\u043a\u0441\u0442 \u0434\u043b\u044f \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Url": "\u0410\u0434\u0440\u0435\u0441\u0430 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Target": "\u0412\u0456\u0434\u043a\u0440\u0438\u0432\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"None": "\u041d\u0456",
-"New window": "\u0423 \u043d\u043e\u0432\u043e\u043c\u0443 \u0432\u0456\u043a\u043d\u0456",
-"Remove link": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Anchors": "\u042f\u043a\u043e\u0440\u0456",
-"Link": "\u041f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Paste or type a link": "\u041d\u0430\u043f\u0438\u0441\u0430\u0442\u0438 \u0430\u0431\u043e \u0432\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0430\u0434\u0440\u0435\u0441\u0443 \u0435\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0457 \u043f\u043e\u0448\u0442\u0438. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 mailto: \u043f\u0440\u0435\u0444\u0456\u043a\u0441?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0437\u043e\u0432\u043d\u0456\u0448\u043d\u0454 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 http:\/\/ \u043f\u0440\u0435\u0444\u0456\u043a\u0441?",
-"Link list": "\u041f\u0435\u0440\u0435\u043b\u0456\u043a \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u044c",
-"Insert video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0432\u0456\u0434\u0435\u043e",
-"Insert\/edit video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0432\u0456\u0434\u0435\u043e",
-"Insert\/edit media": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0430\u0443\u0434\u0456\u043e",
-"Alternative source": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0435 \u0434\u0436\u0435\u0440\u0435\u043b\u043e",
-"Poster": "\u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Paste your embed code below:": "\u0412\u0441\u0442\u0430\u0432\u0442\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0438\u0436\u0447\u0435:",
-"Embed": "\u041a\u043e\u0434 \u0434\u043b\u044f \u0432\u0441\u0442\u0430\u0432\u043a\u0438",
-"Media": "\u041c\u0435\u0434\u0456\u0430\u0434\u0430\u043d\u0456",
-"Nonbreaking space": "\u041d\u0435\u0440\u043e\u0437\u0440\u0438\u0432\u043d\u0438\u0439 \u043f\u0440\u043e\u0431\u0456\u043b",
-"Page break": "\u0420\u043e\u0437\u0440\u0438\u0432 \u0441\u0442\u043e\u0440\u0456\u043d\u043a\u0438",
-"Paste as text": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u044f\u043a \u0442\u0435\u043a\u0441\u0442",
-"Preview": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439 \u043f\u0435\u0440\u0435\u0433\u043b\u044f\u0434",
-"Print": "\u0414\u0440\u0443\u043a\u0443\u0432\u0430\u0442\u0438",
-"Save": "\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438",
-"Find": "\u0417\u043d\u0430\u0439\u0442\u0438",
-"Replace with": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u043d\u0430",
-"Replace": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438",
-"Replace all": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u0432\u0441\u0435",
-"Prev": "\u0412\u0433\u043e\u0440\u0443",
-"Next": "\u0412\u043d\u0438\u0437",
-"Find and replace": "\u041f\u043e\u0448\u0443\u043a \u0456 \u0437\u0430\u043c\u0456\u043d\u0430",
-"Could not find the specified string.": "\u0412\u043a\u0430\u0437\u0430\u043d\u0438\u0439 \u0440\u044f\u0434\u043e\u043a \u043d\u0435 \u0437\u043d\u0430\u0439\u0434\u0435\u043d\u043e",
-"Match case": "\u0412\u0440\u0430\u0445\u043e\u0432\u0443\u0432\u0430\u0442\u0438 \u0440\u0435\u0433\u0456\u0441\u0442\u0440",
-"Whole words": "\u0426\u0456\u043b\u0456 \u0441\u043b\u043e\u0432\u0430",
-"Spellcheck": "\u041f\u0435\u0440\u0435\u0432\u0456\u0440\u043a\u0430 \u043e\u0440\u0444\u043e\u0433\u0440\u0430\u0444\u0456\u0457",
-"Ignore": "\u0406\u0433\u043d\u043e\u0440\u0443\u0432\u0430\u0442\u0438",
-"Ignore all": "\u0406\u0433\u043d\u043e\u0440\u0443\u0432\u0430\u0442\u0438 \u0432\u0441\u0435",
-"Finish": "\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u0438",
-"Add to Dictionary": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0434\u043e \u0421\u043b\u043e\u0432\u043d\u0438\u043a\u0430",
-"Insert table": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u044e",
-"Table properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0442\u0430\u0431\u043b\u0438\u0446\u0456",
-"Delete table": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u044e",
-"Cell": "\u041a\u043e\u043c\u0456\u0440\u043a\u0430",
-"Row": "\u0420\u044f\u0434\u043e\u043a",
-"Column": "\u0421\u0442\u043e\u0432\u043f\u0435\u0446\u044c",
-"Cell properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Merge cells": "\u041e\u0431'\u0454\u0434\u043d\u0430\u0442\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Split cell": "\u0420\u043e\u0437\u0431\u0438\u0442\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0443",
-"Insert row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u0439 \u0440\u044f\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
-"Insert row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u0439 \u0440\u044f\u0434\u043e\u043a \u0437\u043d\u0438\u0437\u0443",
-"Delete row": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Row properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u0440\u044f\u0434\u043a\u0430",
-"Cut row": "\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Copy row": "\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Paste row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
-"Paste row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u0437\u043d\u0438\u0437\u0443",
-"Insert column before": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c \u043b\u0456\u0432\u043e\u0440\u0443\u0447",
-"Insert column after": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c \u043f\u0440\u0430\u0432\u043e\u0440\u0443\u0447",
-"Delete column": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c",
-"Cols": "\u0421\u0442\u043e\u0432\u043f\u0446\u0456",
-"Rows": "\u0420\u044f\u0434\u043a\u0438",
-"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
-"Height": "\u0412\u0438\u0441\u043e\u0442\u0430",
-"Cell spacing": "\u0412\u0456\u0434\u0441\u0442\u0430\u043d\u044c \u043c\u0456\u0436 \u043a\u043e\u043c\u0456\u0440\u043a\u0430\u043c\u0438",
-"Cell padding": "\u041f\u043e\u043b\u044f \u043a\u043e\u043c\u0456\u0440\u043e\u043a",
-"Caption": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Left": "\u041f\u043e \u043b\u0456\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Cell type": "\u0422\u0438\u043f \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Scope": "\u0421\u0444\u0435\u0440\u0430",
-"Alignment": "\u0412\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"H Align": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0435  \u0432\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0435 \u0432\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"Top": "\u041f\u043e \u0432\u0435\u0440\u0445\u043d\u044c\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Middle": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Bottom": "\u041f\u043e \u043d\u0438\u0436\u043d\u044c\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Header cell": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Row group": "\u0413\u0440\u0443\u043f\u0430 \u0440\u044f\u0434\u043a\u0456\u0432",
-"Column group": "\u0413\u0440\u0443\u043f\u0430 \u0441\u0442\u043e\u0432\u043f\u0446\u0456\u0432",
-"Row type": "\u0422\u0438\u043f \u0440\u044f\u0434\u043a\u0430",
-"Header": "\u0412\u0435\u0440\u0445\u043d\u0456\u0439 \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b",
-"Body": "\u0422\u0456\u043b\u043e",
-"Footer": "\u041d\u0438\u0436\u043d\u0456\u0439 \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b",
-"Border color": "\u043a\u043e\u043b\u0456\u0440 \u0440\u0430\u043c\u043a\u0438",
-"Insert template": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0448\u0430\u0431\u043b\u043e\u043d",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
-"Template": "\u0428\u0430\u0431\u043b\u043e\u043d",
-"Text color": "\u041a\u043e\u043b\u0456\u0440 \u0442\u0435\u043a\u0441\u0442\u0443",
-"Background color": "\u041a\u043e\u043b\u0456\u0440 \u0444\u043e\u043d\u0443",
-"Custom...": "\u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044c\u043a\u0438\u0439",
-"Custom color": "\u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044c\u043a\u0438\u0439 \u043a\u043e\u043b\u0456\u0440",
-"No color": "\u0431\u0435\u0437 \u043a\u043e\u043b\u044c\u043e\u0440\u0443",
-"Table of Contents": "\u0417\u043c\u0456\u0441\u0442",
-"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u0431\u043b\u043e\u043a\u0438",
-"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u0456 \u0441\u0438\u043c\u0432\u043e\u043b\u0438",
-"Words: {0}": "\u041a\u0456\u043b\u044c\u043a\u0456\u0441\u0442\u044c \u0441\u043b\u0456\u0432: {0}",
-"{0} words": "{0} \u0441\u043b\u0456\u0432",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0417\u043c\u0456\u043d\u0438\u0442\u0438",
-"Insert": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438",
-"View": "\u0412\u0438\u0433\u043b\u044f\u0434",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442",
-"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u044f",
-"Tools": "\u0406\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438",
-"Powered by {0}": "\u041f\u0440\u0430\u0446\u044e\u0454 \u043d\u0430 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u0435 \u043f\u043e\u043b\u0435. \u041d\u0430\u0442\u0438\u0441\u043d\u0456\u0442\u044c ALT-F9 \u0449\u043e\u0431 \u0432\u0438\u043a\u043b\u0438\u043a\u0430\u0442\u0438 \u043c\u0435\u043d\u044e, ALT-F10 \u043f\u0430\u043d\u0435\u043b\u044c \u0456\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0456\u0432, ALT-0 \u0434\u043b\u044f \u0432\u0438\u043a\u043b\u0438\u043a\u0443 \u0434\u043e\u043f\u043e\u043c\u043e\u0433\u0438."
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/uk_UA.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/uk_UA.js
deleted file mode 100644
index b2d3bae286..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/uk_UA.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('uk_UA',{
-"Redo": "\u0412\u0456\u0434\u043d\u043e\u0432\u0438\u0442\u0438",
-"Undo": "\u0412\u0456\u0434\u043c\u0456\u043d\u0438\u0442\u0438",
-"Cut": "\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438",
-"Copy": "\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438",
-"Paste": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438",
-"Select all": "\u0412\u0438\u0431\u0435\u0440\u0456\u0442\u044c \u0443\u0441\u0435",
-"New document": "\u041d\u043e\u0432\u0438\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Ok": "Ok",
-"Cancel": "\u0412\u0456\u0434\u043c\u0456\u043d\u0438\u0442\u0438",
-"Visual aids": "\u0412\u0456\u0437\u0443\u0430\u043b\u044c\u043d\u0456 \u0437\u0430\u0441\u043e\u0431\u0438",
-"Bold": "\u0416\u0438\u0440\u043d\u0438\u0439",
-"Italic": "\u041a\u0443\u0440\u0441\u0438\u0432",
-"Underline": "\u041f\u0456\u0434\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u0438\u0439",
-"Strikethrough": "\u041f\u0435\u0440\u0435\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u0438\u0439",
-"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0456\u0439 \u0456\u043d\u0434\u0435\u043a\u0441",
-"Subscript": "\u0406\u043d\u0434\u0435\u043a\u0441",
-"Clear formatting": "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
-"Align left": "\u041b\u0456\u0432\u043e\u0440\u0443\u0447",
-"Align center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Align right": "\u041f\u0440\u0430\u0432\u043e\u0440\u0443\u0447",
-"Justify": "\u0412\u0438\u0440\u0456\u0432\u043d\u044f\u0442\u0438",
-"Bullet list": "\u041c\u0430\u0440\u043a\u0456\u0440\u043e\u0432\u0430\u043d\u0438\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Numbered list": "\u041f\u0440\u043e\u043d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u0438\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Decrease indent": "\u0417\u043c\u0435\u043d\u0448\u0438\u0442\u0438 \u0432\u0456\u0434\u0441\u0442\u0443\u043f",
-"Increase indent": "\u0417\u0431\u0456\u043b\u044c\u0448\u0438\u0442\u0438 \u0432\u0456\u0434\u0441\u0442\u0443\u043f",
-"Close": "\u0417\u0430\u043a\u0440\u0438\u0442\u0438",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043d\u0435 \u043f\u0456\u0434\u0442\u0440\u0438\u043c\u0443\u0454 \u043f\u0440\u044f\u043c\u0438\u0439 \u0434\u043e\u0441\u0442\u0443\u043f \u0434\u043e \u0431\u0443\u0444\u0435\u0440\u0430 \u043e\u0431\u043c\u0456\u043d\u0443. \u0417\u0430\u043c\u0456\u0441\u0442\u044c \u0446\u044c\u043e\u0433\u043e \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0439\u0442\u0435 \u043f\u043e\u0454\u0434\u043d\u0430\u043d\u043d\u044f \u043a\u043b\u0430\u0432\u0456\u0448 Ctrl + X\/C\/V.",
-"Headers": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
-"Header 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
-"Header 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
-"Header 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
-"Header 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
-"Header 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
-"Header 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-"Headings": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
-"Heading 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
-"Heading 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
-"Heading 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
-"Heading 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
-"Heading 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
-"Heading 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-"Preformatted": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u044c\u043e \u0432\u0456\u0434\u0444\u043e\u0440\u043c\u0430\u0442\u043e\u0432\u0430\u043d\u0438\u0439",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u041a\u043e\u0434",
-"Paragraph": "\u0410\u0431\u0437\u0430\u0446",
-"Blockquote": "\u0426\u0438\u0442\u0430\u0442\u0430",
-"Inline": "\u0412\u0431\u0443\u0434\u043e\u0432\u0430\u043d\u0438\u0439",
-"Blocks": "\u0411\u043b\u043e\u043a\u0438",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0412\u0441\u0442\u0430\u0432\u043a\u0430 \u0437\u0430\u0440\u0430\u0437 \u0432 \u0440\u0435\u0436\u0438\u043c\u0456 \u0437\u0432\u0438\u0447\u0430\u0439\u043d\u043e\u0433\u043e \u0442\u0435\u043a\u0441\u0442\u0443. \u0417\u043c\u0456\u0441\u0442 \u0431\u0443\u0434\u0435 \u0432\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0439 \u044f\u043a \u043f\u0440\u043e\u0441\u0442\u0438\u0439 \u0442\u0435\u043a\u0441\u0442, \u043f\u043e\u043a\u0438 \u0412\u0438 \u043d\u0435 \u0432\u0438\u043c\u043a\u043d\u0435\u0442\u0435 \u0446\u044e \u043e\u043f\u0446\u0456\u044e.",
-"Font Family": "\u0428\u0440\u0438\u0444\u0442",
-"Font Sizes": "\u0420\u043e\u0437\u043c\u0456\u0440 \u0448\u0440\u0438\u0444\u0442\u0430",
-"Class": "\u041a\u043b\u0430\u0441",
-"Browse for an image": "\u0412\u0438\u0431\u0456\u0440 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"OR": "\u0410\u0411\u041e",
-"Drop an image here": "\u041f\u0435\u0440\u0435\u043c\u0456\u0441\u0442\u0456\u0442\u044c \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f \u0441\u044e\u0434\u0438",
-"Upload": "\u0417\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0438\u0442\u0438",
-"Block": "\u0411\u043b\u043e\u043a",
-"Align": "\u0412\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"Default": "\u0423\u043c\u043e\u0432\u0447\u0430\u043d\u043d\u044f",
-"Circle": "\u041a\u043e\u043b\u043e",
-"Disc": "\u0414\u0438\u0441\u043a",
-"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442",
-"Lower Alpha": "\u041d\u0438\u0436\u043d\u0456\u0439 \u0440\u0435\u0433\u0456\u0441\u0442\u0440",
-"Lower Greek": "\u041c\u0430\u043b\u0456 \u0433\u0440\u0435\u0446\u044c\u043a\u0456 \u043b\u0456\u0442\u0435\u0440\u0438",
-"Lower Roman": "\u0420\u0438\u043c\u0441\u044c\u043a\u0456 \u0446\u0438\u0444\u0440\u0438 \u0443 \u043d\u0438\u0436\u043d\u044c\u043e\u043c\u0443 \u0440\u0435\u0433\u0456\u0441\u0442\u0440\u0456",
-"Upper Alpha": "\u0412\u0435\u0440\u0445\u043d\u0456\u0439 \u0440\u0435\u0433\u0456\u0441\u0442\u0440",
-"Upper Roman": "\u0420\u0438\u043c\u0441\u044c\u043a\u0456 \u0446\u0438\u0444\u0440\u0438 \u0443 \u0432\u0435\u0440\u0445\u043d\u044c\u043e\u043c\u0443 \u0440\u0435\u0433\u0456\u0441\u0442\u0440\u0456",
-"Anchor": "\u041f\u0440\u0438\u0432'\u044f\u0437\u043a\u0430",
-"Name": "\u0406\u043c'\u044f",
-"Id": "\u041a\u043e\u0434",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u041a\u043e\u0434 \u043c\u0430\u0454 \u043f\u043e\u0447\u0438\u043d\u0430\u0442\u0438\u0441\u044f \u0437 \u043b\u0456\u0442\u0435\u0440\u0438 \u0456 \u043c\u043e\u0436\u0435 \u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043b\u0438\u0448\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u0438 \u043b\u0456\u0442\u0435\u0440, \u0446\u0438\u0444\u0440, \u0434\u0435\u0444\u0456\u0441\u0443, \u043a\u0440\u0430\u043f\u043a\u0438, \u043a\u043e\u043c\u0438 \u0430\u0431\u043e \u043d\u0438\u0436\u043d\u044c\u043e\u0433\u043e \u043f\u0456\u0434\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u043d\u044f.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0432\u0430\u0441 \u0454 \u043d\u0435\u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0456 \u0437\u043c\u0456\u043d\u0438. \u0412\u0438 \u0432\u043f\u0435\u0432\u043d\u0435\u043d\u0456, \u0449\u043e \u0445\u043e\u0447\u0435\u0442\u0435 \u043f\u0456\u0442\u0438 ?",
-"Restore last draft": "\u0412\u0456\u0434\u043d\u043e\u0432\u0438\u0442\u0438 \u043e\u0441\u0442\u0430\u043d\u043d\u0456\u0439 \u043f\u0440\u043e\u0435\u043a\u0442",
-"Special character": "\u0421\u043f\u0435\u0446\u0456\u0430\u043b\u044c\u043d\u0438\u0439 \u0441\u0438\u043c\u0432\u043e\u043b",
-"Source code": "\u0414\u0436\u0435\u0440\u0435\u043b\u043e",
-"Insert\/Edit code sample": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u041d\u0430\u043f\u0438\u0441\u0430\u0442\u0438 \u043f\u0440\u0438\u043a\u043b\u0430\u0434 \u043a\u043e\u0434\u0443",
-"Language": "\u041c\u043e\u0432\u0430",
-"Code sample": "\u041f\u0440\u0438\u043a\u043b\u0430\u0434 \u043a\u043e\u0434\u0443",
-"Color": "\u041a\u043e\u043b\u0456\u0440",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0417\u043b\u0456\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043e",
-"Right to left": "\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0456\u0432\u043e",
-"Emoticons": "\u0421\u043c\u0430\u0439\u043b\u0438",
-"Document properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0443",
-"Title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Keywords": "\u041a\u043b\u044e\u0447\u043e\u0432\u0456 \u0441\u043b\u043e\u0432\u0430",
-"Description": "\u041e\u043f\u0438\u0441",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Encoding": "\u041a\u043e\u0434\u0443\u0432\u0430\u043d\u043d\u044f",
-"Fullscreen": "\u041d\u0430 \u0432\u0435\u0441\u044c \u0435\u043a\u0440\u0430\u043d",
-"Action": "\u0414\u0456\u044f",
-"Shortcut": "\u042f\u0440\u043b\u0438\u043a",
-"Help": "\u0414\u043e\u043f\u043e\u043c\u043e\u0433\u0430",
-"Address": "\u0410\u0434\u0440\u0435\u0441\u0430",
-"Focus to menubar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043c\u0435\u043d\u044e",
-"Focus to toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u0456\u043d\u0441\u0442\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430\u0445",
-"Focus to element path": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u0448\u043b\u044f\u0445\u0443",
-"Focus to contextual toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442",
-"Insert link (if link plugin activated)": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f (\u044f\u043a\u0449\u043e \u0434\u043e\u0437\u0432\u043e\u043b\u0435\u043d\u043e)",
-"Save (if save plugin activated)": "\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 (\u044f\u043a\u0449\u043e \u0434\u043e\u0437\u0432\u043e\u043b\u0435\u043d\u043e)",
-"Find (if searchreplace plugin activated)": "\u0417\u043d\u0430\u0439\u0442\u0438 (\u044f\u043a\u0449\u043e \u0434\u043e\u0437\u0432\u043e\u043b\u0435\u043d\u043e)",
-"Plugins installed ({0}):": "\u041d\u0430\u044f\u0432\u043d\u0456 \u0434\u043e\u0434\u0430\u0442\u043a\u0438 ({0}):",
-"Premium plugins:": "\u041f\u0440\u0435\u043c\u0456\u0430\u043b\u044c\u043d\u0456 \u0434\u043e\u0434\u0430\u0442\u043a\u0438:",
-"Learn more...": "\u0414\u043e\u0434\u0430\u0442\u043a\u043e\u0432\u043e...",
-"You are using {0}": "\u0423 \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u0430\u043d\u043d\u0456 {0}",
-"Plugins": "\u041f\u043b\u0430\u0433\u0456\u043d\u0438",
-"Handy Shortcuts": "\u041a\u043e\u0440\u0438\u0441\u043d\u0456 \u044f\u0440\u043b\u0438\u043a\u0438",
-"Horizontal line": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0430 \u043b\u0456\u043d\u0456\u044f",
-"Insert\/edit image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image description": "\u041e\u043f\u0438\u0441 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Source": "\u0414\u0436\u0435\u0440\u0435\u043b\u043e",
-"Dimensions": "\u0420\u043e\u0437\u043c\u0456\u0440",
-"Constrain proportions": "\u0417\u0431\u0435\u0440\u0456\u0433\u0430\u0442\u0438 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0456\u0457",
-"General": "\u0417\u0430\u0433\u0430\u043b\u044c\u043d\u0435",
-"Advanced": "\u0414\u043e\u0434\u0430\u0442\u043a\u043e\u0432\u043e",
-"Style": "\u0421\u0442\u0438\u043b\u044c",
-"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0438\u0439 \u043f\u0440\u043e\u043f\u0443\u0441\u043a",
-"Horizontal space": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0438\u0439 \u043f\u0440\u043e\u043f\u0443\u0441\u043a",
-"Border": "\u041c\u0435\u0436\u0430",
-"Insert image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image": "\u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image list": "\u0421\u043f\u0438\u0441\u043e\u043a \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u044c",
-"Rotate counterclockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438 \u043f\u0440\u043e\u0442\u0438 \u0433\u043e\u0434\u0438\u043d\u043d\u0438\u043a\u043e\u0432\u043e\u0457 \u0441\u0442\u0440\u0456\u043b\u043a\u0438",
-"Rotate clockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438 \u0437\u0430 \u0433\u043e\u0434\u0438\u043d\u043d\u0438\u043a\u043e\u0432\u043e\u044e \u0441\u0442\u0440\u0456\u043b\u043a\u043e\u044e",
-"Flip vertically": "\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u043f\u043e \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0456",
-"Flip horizontally": "\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u043f\u043e \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u0456",
-"Edit image": "\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image options": "\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Zoom in": "\u0417\u0431\u0456\u043b\u044c\u0448\u0438\u0442\u0438",
-"Zoom out": "\u0417\u043c\u0435\u043d\u0448\u0438\u0442\u0438",
-"Crop": "\u041e\u0431\u0440\u0456\u0437\u0430\u0442\u0438",
-"Resize": "\u0417\u043c\u0456\u043d\u0438\u0442\u0438 \u0440\u043e\u0437\u043c\u0456\u0440",
-"Orientation": "\u041e\u0440\u0456\u0454\u043d\u0442\u0430\u0446\u0456\u044f",
-"Brightness": "\u042f\u0441\u043a\u0440\u0430\u0432\u0456\u0441\u0442\u044c",
-"Sharpen": "\u0427\u0456\u0442\u043a\u0456\u0441\u0442\u044c",
-"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
-"Color levels": "\u0420\u0456\u0432\u043d\u0456 \u043a\u043e\u043b\u044c\u043e\u0440\u0456\u0432",
-"Gamma": "\u0413\u0430\u043c\u043c\u0430",
-"Invert": "\u0406\u043d\u0432\u0435\u0440\u0441\u0456\u044f",
-"Apply": "\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438",
-"Back": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438\u0441\u044f",
-"Insert date\/time": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0434\u0430\u0442\u0443\/\u0447\u0430\u0441",
-"Date\/time": "\u0414\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Insert link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Insert\/edit link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Text to display": "\u0422\u0435\u043a\u0441\u0442 \u0434\u043b\u044f \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Url": "URL",
-"Target": "\u041c\u0435\u0442\u0430",
-"None": "\u041d\u0456",
-"New window": "\u041d\u043e\u0432\u0435 \u0432\u0456\u043a\u043d\u043e",
-"Remove link": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Anchors": "\u042f\u043a\u043e\u0440\u044f",
-"Link": "\u041f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Paste or type a link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0430\u0431\u043e \u043d\u0430\u043f\u0438\u0441\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0430\u0434\u0440\u0435\u0441\u0443 \u0435\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0457 \u043f\u043e\u0448\u0442\u0438. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 \u043f\u0440\u0435\u0444\u0456\u043a\u0441 mailto:?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0437\u043e\u0432\u043d\u0456\u0448\u043d\u0454 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 \u043f\u0440\u0435\u0444\u0456\u043a\u0441 http:\/\/?",
-"Link list": "\u0421\u043f\u0438\u0441\u043e\u043a \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u044c",
-"Insert video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0432\u0456\u0434\u0435\u043e",
-"Insert\/edit video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0432\u0456\u0434\u0435\u043e",
-"Insert\/edit media": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043c\u0435\u0434\u0456\u0430\u0434\u0430\u043d\u0456",
-"Alternative source": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0435 \u0434\u0436\u0435\u0440\u0435\u043b\u043e",
-"Poster": "\u041f\u043b\u0430\u043a\u0430\u0442",
-"Paste your embed code below:": "\u0412\u0441\u0442\u0430\u0432\u0442\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0438\u0436\u0447\u0435:",
-"Embed": "\u0412\u043f\u0440\u043e\u0432\u0430\u0434\u0438\u0442\u0438",
-"Media": "\u041c\u0435\u0434\u0456\u0430\u0434\u0430\u043d\u0456",
-"Nonbreaking space": "\u041d\u0435\u0440\u043e\u0437\u0440\u0438\u0432\u043d\u0438\u0439 \u043f\u0440\u043e\u043f\u0443\u0441\u043a",
-"Page break": "\u0420\u043e\u0437\u0440\u0438\u0432 \u0441\u0442\u043e\u0440\u0456\u043d\u043a\u0438",
-"Paste as text": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u044f\u043a \u0442\u0435\u043a\u0441\u0442",
-"Preview": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439 \u043f\u0435\u0440\u0435\u0433\u043b\u044f\u0434",
-"Print": "\u0414\u0440\u0443\u043a",
-"Save": "\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438",
-"Find": "\u0417\u043d\u0430\u0439\u0442\u0438",
-"Replace with": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u043d\u0430",
-"Replace": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438",
-"Replace all": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u0432\u0441\u0435",
-"Prev": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439",
-"Next": "\u041d\u0430\u0441\u0442\u0443\u043f\u043d\u0438\u0439",
-"Find and replace": "\u0417\u043d\u0430\u0439\u0442\u0438 \u0456 \u0437\u0430\u043c\u0456\u043d\u0438\u0442\u0438",
-"Could not find the specified string.": "\u041d\u0435 \u0432\u0434\u0430\u043b\u043e\u0441\u044f \u0437\u043d\u0430\u0439\u0442\u0438 \u0437\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u0440\u044f\u0434\u043e\u043a.",
-"Match case": "\u0417 \u0443\u0440\u0430\u0445\u0443\u0432\u0430\u043d\u043d\u044f\u043c \u0440\u0435\u0433\u0456\u0441\u0442\u0440\u0443",
-"Whole words": "\u0426\u0456\u043b\u0456 \u0441\u043b\u043e\u0432\u0430",
-"Spellcheck": "\u041f\u0435\u0440\u0435\u0432\u0456\u0440\u043a\u0430 \u043e\u0440\u0444\u043e\u0433\u0440\u0430\u0444\u0456\u0457",
-"Ignore": "\u0406\u0433\u043d\u043e\u0440\u0443\u0432\u0430\u0442\u0438",
-"Ignore all": "\u0406\u0433\u043d\u043e\u0440\u0443\u0432\u0430\u0442\u0438 \u0432\u0441\u0435",
-"Finish": "\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u0438",
-"Add to Dictionary": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0432 \u0441\u043b\u043e\u0432\u043d\u0438\u043a",
-"Insert table": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u044e",
-"Table properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0442\u0430\u0431\u043b\u0438\u0446\u0456",
-"Delete table": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u044e",
-"Cell": "\u041a\u043e\u043c\u0456\u0440\u043a\u0430",
-"Row": "\u0420\u044f\u0434\u043e\u043a",
-"Column": "\u0421\u0442\u043e\u0432\u043f\u0435\u0446\u044c",
-"Cell properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Merge cells": "\u041e\u0431'\u0454\u0434\u043d\u0430\u0442\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Split cell": "\u0420\u043e\u0437\u0431\u0438\u0442\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0443",
-"Insert row before": "\u0412\u0441\u0442\u0430\u0432\u0442\u0435 \u0440\u044f\u0434\u043e\u043a \u043f\u0435\u0440\u0435\u0434",
-"Insert row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u043f\u0456\u0441\u043b\u044f",
-"Delete row": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Row properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0440\u044f\u0434\u043a\u0430",
-"Cut row": "\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Copy row": "\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Paste row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u043f\u0435\u0440\u0435\u0434",
-"Paste row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u043f\u0456\u0441\u043b\u044f",
-"Insert column before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c \u043f\u0435\u0440\u0435\u0434",
-"Insert column after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c \u043f\u0456\u0441\u043b\u044f",
-"Delete column": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c",
-"Cols": "\u0421\u0442\u043e\u0432\u043f\u0446\u0456",
-"Rows": "\u0420\u044f\u0434\u043a\u0438",
-"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
-"Height": "\u0412\u0438\u0441\u043e\u0442\u0430",
-"Cell spacing": "\u0406\u043d\u0442\u0435\u0440\u0432\u0430\u043b \u043c\u0456\u0436 \u043a\u043e\u043c\u0456\u0440\u043a\u0430\u043c\u0438",
-"Cell padding": "\u0417\u0430\u043f\u043e\u0432\u043d\u0435\u043d\u043d\u044f \u043a\u043e\u043c\u0456\u0440\u043e\u043a",
-"Caption": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Left": "\u041b\u0456\u0432\u043e\u0440\u0443\u0447",
-"Center": "\u0426\u0435\u043d\u0442\u0440",
-"Right": "\u041f\u0440\u0430\u0432\u043e\u0440\u0443\u0447",
-"Cell type": "\u0422\u0438\u043f \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Scope": "\u0423 \u043c\u0435\u0436\u0430\u0445",
-"Alignment": "\u0412\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"H Align": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0435 \u0432\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0435 \u0432\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"Top": "\u041f\u043e \u0432\u0435\u0440\u0445\u043d\u044c\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Middle": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Bottom": "\u041f\u043e \u043d\u0438\u0436\u043d\u044c\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Header cell": "\u041a\u043e\u043c\u0456\u0440\u043a\u0430 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0443",
-"Row group": "\u0413\u0440\u0443\u043f\u0430 \u0440\u044f\u0434\u043a\u0456\u0432",
-"Column group": "\u0413\u0440\u0443\u043f\u0430 \u0441\u0442\u043e\u0432\u043f\u0446\u0456\u0432",
-"Row type": "\u0422\u0438\u043f \u0440\u044f\u0434\u043a\u0430",
-"Header": "\u0412\u0435\u0440\u0445\u043d\u0456\u0439 \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b",
-"Body": "\u0422\u0456\u043b\u043e",
-"Footer": "\u041d\u0438\u0436\u043d\u0456\u0439 \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b",
-"Border color": "\u041a\u043e\u043b\u0456\u0440 \u043c\u0435\u0436\u0456",
-"Insert template": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0448\u0430\u0431\u043b\u043e\u043d",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
-"Template": "\u0428\u0430\u0431\u043b\u043e\u043d",
-"Text color": "\u041a\u043e\u043b\u0456\u0440 \u0442\u0435\u043a\u0441\u0442\u0443",
-"Background color": "\u041a\u043e\u043b\u0456\u0440 \u0444\u043e\u043d\u0443",
-"Custom...": "\u0406\u043d\u0448\u0438\u0439...",
-"Custom color": "\u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044c\u043a\u0438\u0439 \u043a\u043e\u043b\u0456\u0440",
-"No color": "\u0411\u0435\u0437 \u043a\u043e\u043b\u044c\u043e\u0440\u0443",
-"Table of Contents": "\u0417\u043c\u0456\u0441\u0442",
-"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u0431\u043b\u043e\u043a\u0438",
-"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u0456 \u0441\u0438\u043c\u0432\u043e\u043b\u0438",
-"Words: {0}": "\u0421\u043b\u043e\u0432\u0430: {0}",
-"{0} words": "{0} \u0441\u043b\u0456\u0432",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u041f\u0440\u0430\u0432\u043a\u0430",
-"Insert": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438",
-"View": "\u0412\u0438\u0434",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442",
-"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u044f",
-"Tools": "\u0406\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438",
-"Powered by {0}": "\u0417\u0430 \u043f\u0456\u0434\u0442\u0440\u0438\u043c\u0438\u043a\u0438 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u041e\u0431\u043b\u0430\u0441\u0442\u044c Rich \u0442\u0435\u043a\u0441\u0442\u0443. \u041d\u0430\u0442\u0438\u0441\u043d\u0456\u0442\u044c ALT-F9 - \u043c\u0435\u043d\u044e. \u041d\u0430\u0442\u0438\u0441\u043d\u0456\u0442\u044c ALT-F10 - \u043f\u0430\u043d\u0435\u043b\u044c \u0456\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0456\u0432. \u041d\u0430\u0442\u0438\u0441\u043d\u0456\u0442\u044c ALT-0 - \u0434\u043e\u0432\u0456\u0434\u043a\u0430"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/uz.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/uz.js
deleted file mode 100644
index 5e977a0825..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/uz.js
+++ /dev/null
@@ -1,260 +0,0 @@
-tinymce.addI18n('uz',{
-"Redo": "Bekor qilish",
-"Undo": "Orqaga qaytarish",
-"Cut": "Kesib olish",
-"Copy": "Nusxa olish",
-"Paste": "Qo\u2018yish",
-"Select all": "Barchasini belgilash",
-"New document": "Yangi hujjat",
-"Ok": "Bajarish",
-"Cancel": "Bekor qilish",
-"Visual aids": "Ko\u2018rgazmali o\u2018quv qurollar",
-"Bold": "Yo'g'on",
-"Italic": "Yotiq",
-"Underline": "Tagi chizilgan",
-"Strikethrough": "O'chirilgan yozuv",
-"Superscript": "Yuqori yozuv",
-"Subscript": "Quyi yozuv",
-"Clear formatting": "Formatlashni tozalash",
-"Align left": "Chapga tekislash",
-"Align center": "Markazga tekislash",
-"Align right": "O'ngga tekislash",
-"Justify": "Ikki tomondan tekislash",
-"Bullet list": "Nuqtali ro\u2018yxat",
-"Numbered list": "Raqamli ro\u2018yxat",
-"Decrease indent": "Satr boshini kamaytirish",
-"Increase indent": "Satr boshini oshirish",
-"Close": "Yopish",
-"Formats": "Formatlar",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Sizning brauzeringiz buferga to\u2018g\u2018ridan-to\u2018g\u2018ri kirish qo\u2018llab-quvvatlamaydi. O\u2018rniga klaviaturaning Ctrl+X\/C\/V qisqartirishlarni foydalaning.",
-"Headers": "Sarlavhalar",
-"Header 1": "Sarlavha 1",
-"Header 2": "Sarlavha 2",
-"Header 3": "Sarlavha 3",
-"Header 4": "Sarlavha 4",
-"Header 5": "Sarlavha 5",
-"Header 6": "Sarlavha 6",
-"Headings": "Sarlavhalar",
-"Heading 1": "Sarlavha 1",
-"Heading 2": "Sarlavha 2",
-"Heading 3": "Sarlavha 3",
-"Heading 4": "Sarlavha 4",
-"Heading 5": "Sarlavha 5",
-"Heading 6": "Sarlavha 6",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kod",
-"Paragraph": "Paragraf",
-"Blockquote": "Matn blok parchasi",
-"Inline": "Bir qator ketma-ketlikda",
-"Blocks": "Bloklar",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Qo'shish oddiy matn rejimida amalga oshiriladi. Ushbu hususiyatni o'chirmaguningizcha, kontent oddiy matn sifatida qo'shiladi.",
-"Font Family": "Srift turi",
-"Font Sizes": "Shrift kattaligi",
-"Class": "Klass",
-"Browse for an image": "Rasmni yuklash",
-"OR": "YOKI",
-"Drop an image here": "Bu erga rasmni olib o'ting",
-"Upload": "Yuklash",
-"Block": "Blok",
-"Align": "Saflamoq",
-"Default": "Standart",
-"Circle": "Doira",
-"Disc": "Disk",
-"Square": "Kvadrat",
-"Lower Alpha": "Kichik lotincha",
-"Lower Greek": "Pastki yunon",
-"Lower Roman": "Kichik kirilcha",
-"Upper Alpha": "Katta lotincha",
-"Upper Roman": "Katta kirilcha",
-"Anchor": "Langar",
-"Name": "Nomi",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id faqat harf bilan boshlanishi lozim, o'z ichiga faqat harflar, sonlar, tire, nuqtalar, pastgi chiziqlardan iborat bo'lishi mumkin",
-"You have unsaved changes are you sure you want to navigate away?": "Sizda saqlanmagan o'zgartirishlar bor. Boshqa yerga chiqib ketish uchun ishonchingiz komilmi?",
-"Restore last draft": "Oxirgi ",
-"Special character": "Maxsus belgilar",
-"Source code": "Manba kodi",
-"Insert\/Edit code sample": "Kod namunasini qo'shish \/ tahrirlash",
-"Language": "Til",
-"Code sample": "Kod namunasi",
-"Color": "Rang",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Chapdan o'ngga",
-"Right to left": "O'ngdan chapga",
-"Emoticons": "Hissiyot ikonkalari",
-"Document properties": "Hujjatning xususiyatlari",
-"Title": "Nomi",
-"Keywords": "Kalit so'zlar",
-"Description": "Tavsif",
-"Robots": "Robotlar",
-"Author": "Muallif",
-"Encoding": "Kodlash",
-"Fullscreen": "Butun ekran rejimi",
-"Action": "Harakat",
-"Shortcut": "Yorliq",
-"Help": "Yordam",
-"Address": "Manzil",
-"Focus to menubar": "Menubarga e'tibor qaratish",
-"Focus to toolbar": "Vositalar paneliga e'tibor qaratish",
-"Focus to element path": "Elementlar manziliga e'tibor qaratish",
-"Focus to contextual toolbar": "Kontekstli vositalar paneliga e'tibor qaratish",
-"Insert link (if link plugin activated)": "Havolani qo'shish (havola plagini o'rnatilgan bo'lsa)",
-"Save (if save plugin activated)": "Saqlash (saqlash plagini o'rnatilgan bo'lsa)",
-"Find (if searchreplace plugin activated)": "Qidirish (qidirish plagini o'rnatilgan bo'lsa)",
-"Plugins installed ({0}):": "O'rnatilgan plaginlar ({0})",
-"Premium plugins:": "Premium plaginlar:",
-"Learn more...": "Batafsil ma'lumot...",
-"You are using {0}": "Siz {0} ishlatmoqdasiz",
-"Plugins": "Plaginlar",
-"Handy Shortcuts": "Foydalanadigan yorliqlar",
-"Horizontal line": "Gorizontal chiziq",
-"Insert\/edit image": "Rasmni qo'shish \/ tahrirlash",
-"Image description": "Rasm tavsifi",
-"Source": "Manba",
-"Dimensions": "O'lchamlari",
-"Constrain proportions": "Nisbatlarni cheklash",
-"General": "Umumiy",
-"Advanced": "Ilg'or",
-"Style": "Uslub",
-"Vertical space": "Vertikal o'lchov",
-"Horizontal space": "Gorizontal o'lchov",
-"Border": "Chegara",
-"Insert image": "Rasm qo'shish",
-"Image": "Rasm",
-"Image list": "Rasmlar ro'yhati",
-"Rotate counterclockwise": "Soatga qarshi yo'nalishda aylantirish",
-"Rotate clockwise": "Soat yo'nalishda aylantirish",
-"Flip vertically": "Vertikal o'girish",
-"Flip horizontally": "Gorizontal o'girish",
-"Edit image": "Rasmni tahrirlash",
-"Image options": "Rasm imkoniyatlari",
-"Zoom in": "Yaqinlashtirish",
-"Zoom out": "Uzoqlashtirish",
-"Crop": "Kesib olish",
-"Resize": "O'lchamini o'zgartirish",
-"Orientation": "Orientatsiya",
-"Brightness": "Yorqinligi",
-"Sharpen": "Keskinligi",
-"Contrast": "Ravshanligi",
-"Color levels": "Rang sathi",
-"Gamma": "Gamma",
-"Invert": "Ranglarni ag'darish",
-"Apply": "Qo'llash",
-"Back": "Ortga qaytish",
-"Insert date\/time": "Kun \/ vaqtni qo'shish",
-"Date\/time": "Kun\/vaqt",
-"Insert link": "Havola qo'shish",
-"Insert\/edit link": "Havola qo'shish \/ tahrirlash",
-"Text to display": "Ko'rsatiladigan matn",
-"Url": "URL",
-"Target": "Nishon",
-"None": "Hech bir",
-"New window": "Yangi oyna",
-"Remove link": "Havolani olib tashlash",
-"Anchors": "Langarlar",
-"Link": "Havola",
-"Paste or type a link": "Havolani joylashtirish yoki kiritish",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Siz kiritgan URL elektron pochta manziliga oxshayapti. \"mailto:\" prefiksi qo'shilsinmi?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Siz kiritgan URL tashqi havolaga oxshayapti. \"http:\/\/\" prefiksi qo'shilsinmi?",
-"Link list": "Havolalar ro'yhati",
-"Insert video": "Video qo'shish",
-"Insert\/edit video": "Videoni qo'shish \/ tahrirlash",
-"Insert\/edit media": "Media qo'shish \/ tahrirlash",
-"Alternative source": "Muqobil manba",
-"Poster": "Poster",
-"Paste your embed code below:": "Kodni quyiga joylashtiring:",
-"Embed": "Ichiga olgan",
-"Media": "Media",
-"Nonbreaking space": "Buzilmas bo'sh joy",
-"Page break": "Yangi bet",
-"Paste as text": "Tekst qo'shish",
-"Preview": "Tahrirni avvaldan ko'rish",
-"Print": "Chop etish",
-"Save": "Saqlash",
-"Find": "Qidirish",
-"Replace with": "bilan almashtirish",
-"Replace": "Almashtirish",
-"Replace all": "Barchasini almashtirish",
-"Prev": "Avvalgisi",
-"Next": "Keyingisi",
-"Find and replace": "Topib almashtirish",
-"Could not find the specified string.": "Belgilangan satr topilmadi.",
-"Match case": "O'xshashliklar",
-"Whole words": "Butun so'z",
-"Spellcheck": "Imloni tekshirish",
-"Ignore": "E'tiborsiz qoldirish",
-"Ignore all": "Barchasini e'tiborsiz qoldirish",
-"Finish": "Tugatish",
-"Add to Dictionary": "Lug'atga qo'shish",
-"Insert table": "Jadvalni qo'shish",
-"Table properties": "Jadval xususiyatlari",
-"Delete table": "Jadvalni o'chirib tashlash",
-"Cell": "Katak",
-"Row": "Satr",
-"Column": "Ustun",
-"Cell properties": "Katak hususiyatlari",
-"Merge cells": "Kataklarni birlashtirish",
-"Split cell": "Kataklarni bo'lish",
-"Insert row before": "Yuqorisiga satr qo'shish",
-"Insert row after": "Ketidan satr qo'shish",
-"Delete row": "Satrni olib tashlash",
-"Row properties": "Satr hususiyatlari",
-"Cut row": "Satrni kesib olish",
-"Copy row": "Satrdan nusxa ko'chirish",
-"Paste row before": "Yuqorisiga satrni joylashtirish",
-"Paste row after": "Ketidan satrni joylashtirish",
-"Insert column before": "Ustunni oldi tomoniga qo'shish",
-"Insert column after": "Ustunni ketidan qo'shish",
-"Delete column": "Ustunni olib tashlash",
-"Cols": "Ustunlar",
-"Rows": "Satrlar",
-"Width": "Kengligi",
-"Height": "Balandligi",
-"Cell spacing": "Kataklar orasi",
-"Cell padding": "Kataklar chegarasidan bo'sh joy",
-"Caption": "Taglavha",
-"Left": "Chapga",
-"Center": "Markazga",
-"Right": "O'ngga",
-"Cell type": "Katak turi",
-"Scope": "Muhit",
-"Alignment": "Tekislash",
-"H Align": "Gorizontal tekislash",
-"V Align": "Vertikal tekislash",
-"Top": "Yuqoriga",
-"Middle": "Markaziga",
-"Bottom": "Tagiga",
-"Header cell": "Sarlavha katagi",
-"Row group": "Satrlar guruhi",
-"Column group": "Ustunlar guruhi",
-"Row type": "Satr turi",
-"Header": "Sarlavha",
-"Body": "Tanasi",
-"Footer": "Tag qismi",
-"Border color": "Chegara rangi",
-"Insert template": "Andozani qo'shish",
-"Templates": "Andozalar",
-"Template": "Andoza",
-"Text color": "Matn rangi",
-"Background color": "Orqa fon rangi",
-"Custom...": "O'zgacha...",
-"Custom color": "O'zgacha rang",
-"No color": "Rangsiz",
-"Table of Contents": "Mundarija",
-"Show blocks": "Bloklarni ko'rsatish",
-"Show invisible characters": "Ko'rinmas belgilarni ko'rsatish",
-"Words: {0}": "So'zlar soni: {0}",
-"{0} words": "{0} so`z",
-"File": "Fayl",
-"Edit": "Tahrirlash",
-"Insert": "Qo'shish",
-"View": "Ko'rish",
-"Format": "Shakllar",
-"Table": "Jadval",
-"Tools": "Vositalar",
-"Powered by {0}": "{0} bilan ishlaydi",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Murakkab matn maydoni. Menyu uchun ALT-F9 tugmalarini bosing. Vositalar paneli uchun ALT-F10 tugmasini bosing. Yordamni chaqirish uchun ALT-0-ni bosing"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/vi_VN.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/vi_VN.js
deleted file mode 100644
index 3c0a859d63..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/vi_VN.js
+++ /dev/null
@@ -1,260 +0,0 @@
-tinymce.addI18n('vi_VN',{
-"Redo": "Ho\u00e0n t\u00e1t",
-"Undo": "Hu\u1ef7 thao t\u00e1c",
-"Cut": "C\u1eaft",
-"Copy": "Ch\u00e9p",
-"Paste": "D\u00e1n",
-"Select all": "Ch\u1ecdn t\u1ea5t c\u1ea3",
-"New document": "T\u1ea1o t\u00e0i li\u1ec7u m\u1edbi",
-"Ok": "OK",
-"Cancel": "Hu\u1ef7",
-"Visual aids": "Hi\u1ec7n khung so\u1ea1n th\u1ea3o",
-"Bold": "T\u00f4 \u0111\u1eadm",
-"Italic": "In nghi\u00eang",
-"Underline": "G\u1ea1ch d\u01b0\u1edbi",
-"Strikethrough": "G\u1ea1ch ngang",
-"Superscript": "Tr\u00ean d\u00f2ng",
-"Subscript": "D\u01b0\u1edbi d\u00f2ng",
-"Clear formatting": "Xo\u00e1 \u0111\u1ecbnh d\u1ea1ng",
-"Align left": "Canh tr\u00e1i",
-"Align center": "Canh gi\u1eefa",
-"Align right": "Canh ph\u1ea3i",
-"Justify": "Canh \u0111\u1ec1u hai b\u00ean",
-"Bullet list": "D\u1ea5u \u0111\u1ea7u d\u00f2ng",
-"Numbered list": "Danh s\u00e1ch s\u1ed1",
-"Decrease indent": "L\u00f9i ra",
-"Increase indent": "L\u00f9i v\u00e0o",
-"Close": "\u0110\u00f3ng",
-"Formats": "\u0110\u1ecbnh d\u1ea1ng",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Tr\u00ecnh duy\u1ec7t c\u1ee7a b\u1ea1n kh\u00f4ng h\u1ed7 tr\u1ee3 truy c\u1eadp clipboard, vui l\u00f2ng s\u1eed d\u1ee5ng c\u00e1c t\u1ed5 h\u1ee3p Ctrl + X, C, V.",
-"Headers": "\u0110\u1ea7u trang",
-"Header 1": "Ti\u00eau \u0111\u1ec1 1",
-"Header 2": "Ti\u00eau \u0111\u1ec1 2",
-"Header 3": "Ti\u00eau \u0111\u1ec1 3",
-"Header 4": "Ti\u00eau \u0111\u1ec1 4",
-"Header 5": "Ti\u00eau \u0111\u1ec1 5",
-"Header 6": "Ti\u00eau \u0111\u1ec1 6",
-"Headings": "Ti\u00eau \u0111\u1ec1",
-"Heading 1": "Ti\u00eau \u0111\u1ec1 1",
-"Heading 2": "Ti\u00eau \u0111\u1ec1 2",
-"Heading 3": "Ti\u00eau \u0111\u1ec1 3",
-"Heading 4": "Ti\u00eau \u0111\u1ec1 4",
-"Heading 5": "Ti\u00eau \u0111\u1ec1 5",
-"Heading 6": "Ti\u00eau \u0111\u1ec1 6",
-"Div": "Khung",
-"Pre": "\u0110\u1ecbnh d\u1ea1ng",
-"Code": "M\u00e3",
-"Paragraph": "\u0110o\u1ea1n v\u0103n",
-"Blockquote": "Tr\u00edch",
-"Inline": "C\u00f9ng d\u00f2ng",
-"Blocks": "Bao",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "D\u00e1n b\u00e2y gi\u1edd l\u00e0 \u1edf ch\u1ebf \u0111\u1ed9 v\u0103n b\u1ea3n \u0111\u01a1n gi\u1ea3n. N\u1ed9i dung s\u1ebd \u0111\u01b0\u1ee3c d\u00e1n nh\u01b0 \u0111\u1ed3ng b\u1eb1ng v\u0103n b\u1ea3n cho \u0111\u1ebfn khi b\u1ea1n chuy\u1ec3n \u0111\u1ed5i t\u00f9y ch\u1ecdn n\u00e0y.",
-"Font Family": "Ph\u00f4ng",
-"Font Sizes": "K\u00edch th\u01b0\u1edbc ph\u00f4ng",
-"Class": "L\u1edbp",
-"Browse for an image": "Duy\u1ec7t \u1ea3nh",
-"OR": "HO\u1eb6C",
-"Drop an image here": "Th\u1ea3 h\u00ecnh \u1ea3nh \u1edf \u0111\u00e2y",
-"Upload": "T\u1ea3i l\u00ean",
-"Block": "Kh\u1ed1i",
-"Align": "C\u0103n ch\u1ec9nh",
-"Default": "Ng\u1ea7m \u0111\u1ecbnh",
-"Circle": "H\u00ecnh tr\u00f2n",
-"Disc": "H\u00ecnh tr\u00f2n m\u1ecfng",
-"Square": "\u00d4 vu\u00f4ng",
-"Lower Alpha": "K\u00fd t\u1ef1 th\u01b0\u1eddng",
-"Lower Greek": "S\u1ed1 hy l\u1ea1p th\u01b0\u1eddng",
-"Lower Roman": "S\u1ed1 la m\u00e3 th\u01b0\u1eddng",
-"Upper Alpha": "K\u00fd t\u1ef1 hoa",
-"Upper Roman": "S\u1ed1 la m\u00e3 hoa",
-"Anchor": "Neo",
-"Name": "T\u00ean",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id ph\u1ea3i b\u1eaft \u0111\u1ea7u b\u1eb1ng m\u1ed9t ch\u1eef c\u00e1i, ch\u1ec9 theo sau b\u1edfi c\u00e1c ch\u1eef c\u00e1i, s\u1ed1, d\u1ea5u g\u1ea1ch ngang, d\u1ea5u ch\u1ea5m, d\u1ea5u hai ch\u1ea5m ho\u1eb7c d\u1ea5u g\u1ea1ch d\u01b0\u1edbi.",
-"You have unsaved changes are you sure you want to navigate away?": "B\u1ea1n ch\u01b0a l\u01b0u c\u00e1c thay \u0111\u1ed5i, b\u1ea1n c\u00f3 th\u1eadt s\u1ef1 mu\u1ed1n \u0111\u00f3ng ?",
-"Restore last draft": "Ph\u1ee5c h\u1ed3i b\u1ea3n l\u01b0u g\u1ea7n nh\u1ea5t",
-"Special character": "K\u00fd t\u1ef1 \u0111\u1eb7c bi\u1ec7t",
-"Source code": "M\u00e3 ngu\u1ed3n",
-"Insert\/Edit code sample": "Ch\u00e8n\/Ch\u1ec9nh s\u1eeda m\u1eabu",
-"Language": "Ng\u00f4n ng\u1eef",
-"Code sample": "\u0110o\u1ea1n m\u00e3 m\u1eabu",
-"Color": "M\u00e0u",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Tr\u00e1i sang ph\u1ea3i",
-"Right to left": "Ph\u1ea3i sang tr\u00e1i",
-"Emoticons": "Bi\u1ec3u t\u01b0\u1ee3ng c\u1ea3m x\u00fac",
-"Document properties": "Thu\u1ed9c t\u00ednh t\u00e0i li\u1ec7u",
-"Title": "Ti\u00eau \u0111\u1ec1",
-"Keywords": "T\u1eeb kho\u00e1",
-"Description": "Mi\u00eau t\u1ea3",
-"Robots": "Robots",
-"Author": "Neo",
-"Encoding": "M\u00e3 ho\u00e1",
-"Fullscreen": "\u0110\u1ea7y m\u00e0n h\u00ecnh",
-"Action": "H\u00e0nh \u0111\u1ed9ng",
-"Shortcut": "L\u1ed1i t\u1eaft",
-"Help": "Tr\u1ee3 gi\u00fap",
-"Address": "\u0110\u1ecba ch\u1ec9",
-"Focus to menubar": "G\u1eafn l\u00ean thanh tr\u00ecnh \u0111\u01a1n",
-"Focus to toolbar": "G\u1eafn l\u00ean thanh c\u00f4ng c\u1ee5",
-"Focus to element path": "G\u1eafn v\u00e0o \u0111\u01b0\u1eddng d\u1eabn",
-"Focus to contextual toolbar": "G\u1eafn v\u00e0o thanh c\u00f4ng c\u1ee5 ng\u1eef c\u1ea3nh",
-"Insert link (if link plugin activated)": "Ch\u00e8n li\u00ean k\u1ebft (n\u1ebfu plugin li\u00ean k\u1ebft \u0111\u1ea3 k\u00edch ho\u1ea1t)",
-"Save (if save plugin activated)": "L\u01b0u (n\u1ebfu plugin l\u01b0u \u0111\u1ea3 k\u00edch ho\u1ea1t)",
-"Find (if searchreplace plugin activated)": "T\u00ecm (n\u1ebfu plugin t\u00ecm v\u00e0 thay th\u1ebf \u0111\u1ea3 k\u00edch ho\u1ea1t)",
-"Plugins installed ({0}):": "Plugin \u0111\u00e3 c\u00e0i \u0111\u1eb7t ({0}):",
-"Premium plugins:": "C\u00e1c Plugin tr\u1ea3 ph\u00ed:",
-"Learn more...": "T\u00ecm hi\u1ec3u th\u00eam...",
-"You are using {0}": "B\u1ea1n \u0111ang s\u1eed d\u1ee5ng {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Ph\u00edm t\u1eaft ti\u1ec7n d\u1ee5ng",
-"Horizontal line": "G\u1ea1ch ngang",
-"Insert\/edit image": "Th\u00eam \/ s\u1eeda h\u00ecnh \u1ea3nh",
-"Image description": "Mi\u00eau t\u1ea3 h\u00ecnh \u1ea3nh",
-"Source": "Ngu\u1ed3n",
-"Dimensions": "K\u00edch th\u01b0\u1edbc",
-"Constrain proportions": "H\u1ea1n ch\u1ebf t\u1ef7 l\u1ec7",
-"General": "T\u1ed5ng h\u1ee3p",
-"Advanced": "N\u00e2ng cao",
-"Style": "Ki\u1ec3u",
-"Vertical space": "Kho\u1ea3ng c\u00e1ch d\u1ecdc",
-"Horizontal space": "Kho\u1ea3ng c\u00e1ch ngang",
-"Border": "\u0110\u01b0\u1eddng vi\u1ec1n",
-"Insert image": "Ch\u00e8n \u1ea3nh",
-"Image": "H\u00ecnh \u1ea3nh",
-"Image list": "Danh s\u00e1ch \u1ea3nh",
-"Rotate counterclockwise": "Xoay ng\u01b0\u1ee3c chi\u1ec1u kim \u0111\u1ed3ng",
-"Rotate clockwise": "Xoay theo chi\u1ec1u kim \u0111\u1ed3ng h\u1ed3",
-"Flip vertically": "L\u1eadt d\u1ecdc",
-"Flip horizontally": "L\u1eadt ngang",
-"Edit image": "S\u1eeda \u1ea3nh",
-"Image options": "T\u00f9y ch\u1ecdn h\u00ecnh \u1ea3nh",
-"Zoom in": "Ph\u00f3ng to",
-"Zoom out": "Thu nh\u1ecf",
-"Crop": "X\u00e9n",
-"Resize": "Thay \u0111\u1ed5i k\u00edch th\u01b0\u1edbc",
-"Orientation": "\u0110\u1ecbnh h\u01b0\u1edbng",
-"Brightness": "\u0110\u1ed9 s\u00e1ng",
-"Sharpen": "\u0110\u1ed9 s\u1eafc n\u00e9t",
-"Contrast": "\u0110\u1ed9 t\u01b0\u01a1ng ph\u1ea3n",
-"Color levels": "M\u1ee9c \u0111\u1ed9 m\u00e0u s\u1eafc",
-"Gamma": "M\u00e0u Gamma",
-"Invert": "\u0110\u1ea3o ng\u01b0\u1ee3c",
-"Apply": "\u00c1p d\u1ee5ng",
-"Back": "Tr\u1edf l\u1ea1i",
-"Insert date\/time": "Th\u00eam ng\u00e0y \/ gi\u1edd",
-"Date\/time": "Ng\u00e0y\/gi\u1edd",
-"Insert link": "Th\u00eam li\u00ean k\u1ebft",
-"Insert\/edit link": "Th\u00eam \/ s\u1eeda li\u00ean k\u1ebft",
-"Text to display": "Ch\u1eef hi\u1ec3n th\u1ecb",
-"Url": "Li\u00ean k\u1ebft",
-"Target": "M\u1ee5c ti\u00eau",
-"None": "Kh\u00f4ng",
-"New window": "C\u1eeda s\u1ed5 m\u1edbi",
-"Remove link": "Xo\u00e1 li\u00ean k\u1ebft",
-"Anchors": "Ghim",
-"Link": "Li\u00ean k\u1ebft",
-"Paste or type a link": "D\u00e1n ho\u1eb7c nh\u1eadp li\u00ean k\u1ebft",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL b\u1ea1n nh\u1eadp v\u00e0o c\u00f3 v\u1ebb l\u00e0 m\u1ed9t \u0111\u1ecba ch\u1ec9 email. B\u1ea1n c\u00f3 mu\u1ed1n th\u00eam c\u00e1c y\u00eau c\u1ea7u mailto: ti\u1ec1n t\u1ed1?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL b\u1ea1n nh\u1eadp v\u00e0o c\u00f3 v\u1ebb l\u00e0 m\u1ed9t li\u00ean k\u1ebft b\u00ean ngo\u00e0i. B\u1ea1n c\u00f3 mu\u1ed1n th\u00eam ti\u1ec1n t\u1ed1 http:\/\/ c\u1ea7n thi\u1ebft?",
-"Link list": "Danh s\u00e1ch li\u00ean k\u1ebft",
-"Insert video": "Th\u00eam video",
-"Insert\/edit video": "Th\u00eam \/ s\u1eeda video",
-"Insert\/edit media": "Ch\u00e8n\/ch\u1ec9nh s\u1eeda ph\u01b0\u01a1ng ti\u1ec7n truy\u1ec1n th\u00f4ng",
-"Alternative source": "Ngu\u1ed3n thay th\u1ebf",
-"Poster": "Ng\u01b0\u1eddi \u0111\u0103ng",
-"Paste your embed code below:": "D\u00e1n m\u00e3 embed v\u00e0o:",
-"Embed": "Embed",
-"Media": "Ph\u01b0\u01a1ng ti\u1ec7n truy\u1ec1n th\u00f4ng",
-"Nonbreaking space": "Kh\u00f4ng ng\u1eaft kho\u1ea3ng",
-"Page break": "Ng\u1eaft trang",
-"Paste as text": "D\u00e1n nh\u01b0 v\u0103n b\u1ea3n",
-"Preview": "Xem tr\u01b0\u1edbc",
-"Print": "In",
-"Save": "L\u01b0u",
-"Find": "T\u00ecm",
-"Replace with": "Thay th\u1ebf b\u1eb1ng",
-"Replace": "Thay th\u1ebf",
-"Replace all": "Thay th\u1ebf t\u1ea5t c\u1ea3",
-"Prev": "Tr\u01b0\u1edbc",
-"Next": "Sau",
-"Find and replace": "T\u00ecm v\u00e0 thay th\u1ebf",
-"Could not find the specified string.": "Kh\u00f4ng t\u00ecm th\u1ea5y chu\u1ed7i y\u00eau c\u1ea7u",
-"Match case": "Ph\u00e2n bi\u1ec7t hoa th\u01b0\u1eddng",
-"Whole words": "T\u1ea5t c\u1ea3 \u0111o\u1ea1n",
-"Spellcheck": "Ki\u1ec3m tra ch\u00ednh t\u1ea3",
-"Ignore": "L\u1edd qua",
-"Ignore all": "L\u1edd t\u1ea5t c\u1ea3",
-"Finish": "Ho\u00e0n t\u1ea5t",
-"Add to Dictionary": "Th\u00eam v\u00e0o t\u1eeb \u0111i\u1ec3n",
-"Insert table": "Th\u00eam b\u1ea3ng",
-"Table properties": "Thu\u1ed9c t\u00ednh b\u1ea3ng",
-"Delete table": "Xo\u00e1 b\u1ea3ng",
-"Cell": "\u00d4",
-"Row": "D\u00f2ng",
-"Column": "C\u1ed9t",
-"Cell properties": "Thu\u1ed9c t\u00ednh \u00f4",
-"Merge cells": "N\u1ed1i \u00f4",
-"Split cell": "Chia \u00f4",
-"Insert row before": "Th\u00eam d\u00f2ng ph\u00eda tr\u00ean",
-"Insert row after": "Th\u00eam d\u00f2ng ph\u00eda d\u01b0\u1edbi",
-"Delete row": "Xo\u00e1 d\u00f2ng",
-"Row properties": "Thu\u1ed9c t\u00ednh d\u00f2ng",
-"Cut row": "C\u1eaft d\u00f2ng",
-"Copy row": "Ch\u00e9p d\u00f2ng",
-"Paste row before": "D\u00e1n v\u00e0o ph\u00eda tr\u01b0\u1edbc, tr\u00ean",
-"Paste row after": "D\u00e1n v\u00e0o ph\u00eda sau, d\u01b0\u1edbi",
-"Insert column before": "Th\u00eam c\u1ed9t b\u00ean tr\u00e1i",
-"Insert column after": "Th\u00eam c\u1ed9t b\u00ean ph\u1ea3i",
-"Delete column": "Xo\u00e1 c\u1ed9t",
-"Cols": "C\u1ed9t",
-"Rows": "D\u00f2ng",
-"Width": "R\u1ed9ng",
-"Height": "Cao",
-"Cell spacing": "Kho\u1ea3ng c\u00e1ch \u00f4",
-"Cell padding": "Kho\u1ea3ng c\u00e1ch trong \u00f4",
-"Caption": "Ti\u00eau \u0111\u1ec1",
-"Left": "Tr\u00e1i",
-"Center": "Gi\u1eefa",
-"Right": "Ph\u1ea3i",
-"Cell type": "Lo\u1ea1i \u00f4",
-"Scope": "Quy\u1ec1n",
-"Alignment": "Canh ch\u1ec9nh",
-"H Align": "X\u1ebfp ngang",
-"V Align": "X\u1ebfp d\u1ecdc",
-"Top": "\u0110\u1ec9nh",
-"Middle": "Gi\u1eefa",
-"Bottom": "\u0110\u00e1y",
-"Header cell": "Ti\u00eau \u0111\u1ec1 \u00f4",
-"Row group": "Nh\u00f3m d\u00f2ng",
-"Column group": "Nh\u00f3m c\u1ed9t",
-"Row type": "Lo\u1ea1i d\u00f2ng",
-"Header": "Ti\u00eau \u0111\u1ec1",
-"Body": "N\u1ed9i dung",
-"Footer": "Ch\u00e2n",
-"Border color": "M\u00e0u vi\u1ec1n",
-"Insert template": "Th\u00eam m\u1eabu",
-"Templates": "M\u1eabu",
-"Template": "B\u1ea3n m\u1eabu",
-"Text color": "M\u00e0u ch\u1eef",
-"Background color": "M\u00e0u n\u1ec1n",
-"Custom...": "T\u00f9y ch\u1ecdn...",
-"Custom color": "M\u00e0u t\u00f9y ch\u1ecdn",
-"No color": "Kh\u00f4ng m\u00e0u",
-"Table of Contents": "M\u1ee5c l\u1ee5c",
-"Show blocks": "Hi\u1ec3n th\u1ecb kh\u1ed1i",
-"Show invisible characters": "Hi\u1ec3n th\u1ecb c\u00e1c k\u00fd t\u1ef1 \u1ea9n",
-"Words: {0}": "T\u1eeb: {0}",
-"{0} words": "{0} t\u1eeb",
-"File": "T\u1eadp tin",
-"Edit": "S\u1eeda",
-"Insert": "Th\u00eam",
-"View": "Xem",
-"Format": "\u0110\u1ecbnh d\u1ea1ng",
-"Table": "B\u1ea3ng",
-"Tools": "C\u00f4ng c\u1ee5",
-"Powered by {0}": "\u0110\u01b0\u1ee3c cung c\u1ea5p b\u1edfi {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Khu v\u1ef1c so\u1ea1n th\u1ea3o. Nh\u1ea5n ALT-F9 \u0111\u1ec3 hi\u1ec7n menu, ALT-F10 \u0111\u1ec3 hi\u1ec7n thanh c\u00f4ng c\u1ee5. C\u1ea7n tr\u1ee3 gi\u00fap nh\u1ea5n ALT-0"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/zh_CN.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/zh_CN.js
deleted file mode 100644
index 0f3cf923ef..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/zh_CN.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('zh_CN',{
-"Redo": "\u91cd\u590d",
-"Undo": "\u64a4\u6d88",
-"Cut": "\u526a\u5207",
-"Copy": "\u590d\u5236",
-"Paste": "\u7c98\u8d34",
-"Select all": "\u5168\u9009",
-"New document": "\u65b0\u6587\u6863",
-"Ok": "\u786e\u5b9a",
-"Cancel": "\u53d6\u6d88",
-"Visual aids": "\u7f51\u683c\u7ebf",
-"Bold": "\u7c97\u4f53",
-"Italic": "\u659c\u4f53",
-"Underline": "\u4e0b\u5212\u7ebf",
-"Strikethrough": "\u5220\u9664\u7ebf",
-"Superscript": "\u4e0a\u6807",
-"Subscript": "\u4e0b\u6807",
-"Clear formatting": "\u6e05\u9664\u683c\u5f0f",
-"Align left": "\u5de6\u5bf9\u9f50",
-"Align center": "\u5c45\u4e2d",
-"Align right": "\u53f3\u5bf9\u9f50",
-"Justify": "\u4e24\u7aef\u5bf9\u9f50",
-"Bullet list": "\u9879\u76ee\u7b26\u53f7",
-"Numbered list": "\u7f16\u53f7\u5217\u8868",
-"Decrease indent": "\u51cf\u5c11\u7f29\u8fdb",
-"Increase indent": "\u589e\u52a0\u7f29\u8fdb",
-"Close": "\u5173\u95ed",
-"Formats": "\u683c\u5f0f",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u4f60\u7684\u6d4f\u89c8\u5668\u4e0d\u652f\u6301\u5bf9\u526a\u8d34\u677f\u7684\u8bbf\u95ee\uff0c\u8bf7\u4f7f\u7528Ctrl+X\/C\/V\u952e\u8fdb\u884c\u590d\u5236\u7c98\u8d34\u3002",
-"Headers": "\u6807\u9898",
-"Header 1": "\u6807\u98981",
-"Header 2": "\u6807\u98982",
-"Header 3": "\u6807\u98983",
-"Header 4": "\u6807\u98984",
-"Header 5": "\u6807\u98985",
-"Header 6": "\u6807\u98986",
-"Headings": "\u6807\u9898",
-"Heading 1": "\u6807\u98981",
-"Heading 2": "\u6807\u98982",
-"Heading 3": "\u6807\u98983",
-"Heading 4": "\u6807\u98984",
-"Heading 5": "\u6807\u98985",
-"Heading 6": "\u6807\u98986",
-"Preformatted": "\u9884\u683c\u5f0f\u5316",
-"Div": "Div\u533a\u5757",
-"Pre": "\u9884\u683c\u5f0f\u6587\u672c",
-"Code": "\u4ee3\u7801",
-"Paragraph": "\u6bb5\u843d",
-"Blockquote": "\u5f15\u7528",
-"Inline": "\u6587\u672c",
-"Blocks": "\u533a\u5757",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u5f53\u524d\u4e3a\u7eaf\u6587\u672c\u7c98\u8d34\u6a21\u5f0f\uff0c\u518d\u6b21\u70b9\u51fb\u53ef\u4ee5\u56de\u5230\u666e\u901a\u7c98\u8d34\u6a21\u5f0f\u3002",
-"Font Family": "\u5b57\u4f53",
-"Font Sizes": "\u5b57\u53f7",
-"Class": "Class",
-"Browse for an image": "\u6d4f\u89c8\u56fe\u50cf",
-"OR": "\u6216",
-"Drop an image here": "\u62d6\u653e\u4e00\u5f20\u56fe\u50cf\u81f3\u6b64",
-"Upload": "\u4e0a\u4f20",
-"Block": "\u5757",
-"Align": "\u5bf9\u9f50",
-"Default": "\u9ed8\u8ba4",
-"Circle": "\u7a7a\u5fc3\u5706",
-"Disc": "\u5b9e\u5fc3\u5706",
-"Square": "\u65b9\u5757",
-"Lower Alpha": "\u5c0f\u5199\u82f1\u6587\u5b57\u6bcd",
-"Lower Greek": "\u5c0f\u5199\u5e0c\u814a\u5b57\u6bcd",
-"Lower Roman": "\u5c0f\u5199\u7f57\u9a6c\u5b57\u6bcd",
-"Upper Alpha": "\u5927\u5199\u82f1\u6587\u5b57\u6bcd",
-"Upper Roman": "\u5927\u5199\u7f57\u9a6c\u5b57\u6bcd",
-"Anchor": "\u951a\u70b9",
-"Name": "\u540d\u79f0",
-"Id": "\u6807\u8bc6\u7b26",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u6807\u8bc6\u7b26\u5e94\u8be5\u4ee5\u5b57\u6bcd\u5f00\u5934\uff0c\u540e\u8ddf\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7834\u6298\u53f7\u3001\u70b9\u3001\u5192\u53f7\u6216\u4e0b\u5212\u7ebf\u3002",
-"You have unsaved changes are you sure you want to navigate away?": "\u4f60\u8fd8\u6709\u6587\u6863\u5c1a\u672a\u4fdd\u5b58\uff0c\u786e\u5b9a\u8981\u79bb\u5f00\uff1f",
-"Restore last draft": "\u6062\u590d\u4e0a\u6b21\u7684\u8349\u7a3f",
-"Special character": "\u7279\u6b8a\u7b26\u53f7",
-"Source code": "\u6e90\u4ee3\u7801",
-"Insert\/Edit code sample": "\u63d2\u5165\/\u7f16\u8f91\u4ee3\u7801\u793a\u4f8b",
-"Language": "\u8bed\u8a00",
-"Code sample": "\u4ee3\u7801\u793a\u4f8b",
-"Color": "\u989c\u8272",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u4ece\u5de6\u5230\u53f3",
-"Right to left": "\u4ece\u53f3\u5230\u5de6",
-"Emoticons": "\u8868\u60c5",
-"Document properties": "\u6587\u6863\u5c5e\u6027",
-"Title": "\u6807\u9898",
-"Keywords": "\u5173\u952e\u8bcd",
-"Description": "\u63cf\u8ff0",
-"Robots": "\u673a\u5668\u4eba",
-"Author": "\u4f5c\u8005",
-"Encoding": "\u7f16\u7801",
-"Fullscreen": "\u5168\u5c4f",
-"Action": "\u64cd\u4f5c",
-"Shortcut": "\u5feb\u6377\u952e",
-"Help": "\u5e2e\u52a9",
-"Address": "\u5730\u5740",
-"Focus to menubar": "\u79fb\u52a8\u7126\u70b9\u5230\u83dc\u5355\u680f",
-"Focus to toolbar": "\u79fb\u52a8\u7126\u70b9\u5230\u5de5\u5177\u680f",
-"Focus to element path": "\u79fb\u52a8\u7126\u70b9\u5230\u5143\u7d20\u8def\u5f84",
-"Focus to contextual toolbar": "\u79fb\u52a8\u7126\u70b9\u5230\u4e0a\u4e0b\u6587\u83dc\u5355",
-"Insert link (if link plugin activated)": "\u63d2\u5165\u94fe\u63a5 (\u5982\u679c\u94fe\u63a5\u63d2\u4ef6\u5df2\u6fc0\u6d3b)",
-"Save (if save plugin activated)": "\u4fdd\u5b58(\u5982\u679c\u4fdd\u5b58\u63d2\u4ef6\u5df2\u6fc0\u6d3b)",
-"Find (if searchreplace plugin activated)": "\u67e5\u627e(\u5982\u679c\u67e5\u627e\u66ff\u6362\u63d2\u4ef6\u5df2\u6fc0\u6d3b)",
-"Plugins installed ({0}):": "\u5df2\u5b89\u88c5\u63d2\u4ef6 ({0}):",
-"Premium plugins:": "\u4f18\u79c0\u63d2\u4ef6\uff1a",
-"Learn more...": "\u4e86\u89e3\u66f4\u591a...",
-"You are using {0}": "\u4f60\u6b63\u5728\u4f7f\u7528 {0}",
-"Plugins": "\u63d2\u4ef6",
-"Handy Shortcuts": "\u5feb\u6377\u952e",
-"Horizontal line": "\u6c34\u5e73\u5206\u5272\u7ebf",
-"Insert\/edit image": "\u63d2\u5165\/\u7f16\u8f91\u56fe\u7247",
-"Image description": "\u56fe\u7247\u63cf\u8ff0",
-"Source": "\u5730\u5740",
-"Dimensions": "\u5927\u5c0f",
-"Constrain proportions": "\u4fdd\u6301\u7eb5\u6a2a\u6bd4",
-"General": "\u666e\u901a",
-"Advanced": "\u9ad8\u7ea7",
-"Style": "\u6837\u5f0f",
-"Vertical space": "\u5782\u76f4\u8fb9\u8ddd",
-"Horizontal space": "\u6c34\u5e73\u8fb9\u8ddd",
-"Border": "\u8fb9\u6846",
-"Insert image": "\u63d2\u5165\u56fe\u7247",
-"Image": "\u56fe\u7247",
-"Image list": "\u56fe\u7247\u5217\u8868",
-"Rotate counterclockwise": "\u9006\u65f6\u9488\u65cb\u8f6c",
-"Rotate clockwise": "\u987a\u65f6\u9488\u65cb\u8f6c",
-"Flip vertically": "\u5782\u76f4\u7ffb\u8f6c",
-"Flip horizontally": "\u6c34\u5e73\u7ffb\u8f6c",
-"Edit image": "\u7f16\u8f91\u56fe\u7247",
-"Image options": "\u56fe\u7247\u9009\u9879",
-"Zoom in": "\u653e\u5927",
-"Zoom out": "\u7f29\u5c0f",
-"Crop": "\u88c1\u526a",
-"Resize": "\u8c03\u6574\u5927\u5c0f",
-"Orientation": "\u65b9\u5411",
-"Brightness": "\u4eae\u5ea6",
-"Sharpen": "\u9510\u5316",
-"Contrast": "\u5bf9\u6bd4\u5ea6",
-"Color levels": "\u989c\u8272\u5c42\u6b21",
-"Gamma": "\u4f3d\u9a6c\u503c",
-"Invert": "\u53cd\u8f6c",
-"Apply": "\u5e94\u7528",
-"Back": "\u540e\u9000",
-"Insert date\/time": "\u63d2\u5165\u65e5\u671f\/\u65f6\u95f4",
-"Date\/time": "\u65e5\u671f\/\u65f6\u95f4",
-"Insert link": "\u63d2\u5165\u94fe\u63a5",
-"Insert\/edit link": "\u63d2\u5165\/\u7f16\u8f91\u94fe\u63a5",
-"Text to display": "\u663e\u793a\u6587\u5b57",
-"Url": "\u5730\u5740",
-"Target": "\u6253\u5f00\u65b9\u5f0f",
-"None": "\u65e0",
-"New window": "\u5728\u65b0\u7a97\u53e3\u6253\u5f00",
-"Remove link": "\u5220\u9664\u94fe\u63a5",
-"Anchors": "\u951a\u70b9",
-"Link": "\u94fe\u63a5",
-"Paste or type a link": "\u7c98\u8d34\u6216\u8f93\u5165\u94fe\u63a5",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u4e3a\u90ae\u4ef6\u5730\u5740\uff0c\u9700\u8981\u52a0\u4e0amailto:\u524d\u7f00\u5417\uff1f",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u5c5e\u4e8e\u5916\u90e8\u94fe\u63a5\uff0c\u9700\u8981\u52a0\u4e0ahttp:\/\/:\u524d\u7f00\u5417\uff1f",
-"Link list": "\u94fe\u63a5\u5217\u8868",
-"Insert video": "\u63d2\u5165\u89c6\u9891",
-"Insert\/edit video": "\u63d2\u5165\/\u7f16\u8f91\u89c6\u9891",
-"Insert\/edit media": "\u63d2\u5165\/\u7f16\u8f91\u5a92\u4f53",
-"Alternative source": "\u955c\u50cf",
-"Poster": "\u5c01\u9762",
-"Paste your embed code below:": "\u5c06\u5185\u5d4c\u4ee3\u7801\u7c98\u8d34\u5728\u4e0b\u9762:",
-"Embed": "\u5185\u5d4c",
-"Media": "\u5a92\u4f53",
-"Nonbreaking space": "\u4e0d\u95f4\u65ad\u7a7a\u683c",
-"Page break": "\u5206\u9875\u7b26",
-"Paste as text": "\u7c98\u8d34\u4e3a\u6587\u672c",
-"Preview": "\u9884\u89c8",
-"Print": "\u6253\u5370",
-"Save": "\u4fdd\u5b58",
-"Find": "\u67e5\u627e",
-"Replace with": "\u66ff\u6362\u4e3a",
-"Replace": "\u66ff\u6362",
-"Replace all": "\u5168\u90e8\u66ff\u6362",
-"Prev": "\u4e0a\u4e00\u4e2a",
-"Next": "\u4e0b\u4e00\u4e2a",
-"Find and replace": "\u67e5\u627e\u548c\u66ff\u6362",
-"Could not find the specified string.": "\u672a\u627e\u5230\u641c\u7d22\u5185\u5bb9.",
-"Match case": "\u533a\u5206\u5927\u5c0f\u5199",
-"Whole words": "\u5168\u5b57\u5339\u914d",
-"Spellcheck": "\u62fc\u5199\u68c0\u67e5",
-"Ignore": "\u5ffd\u7565",
-"Ignore all": "\u5168\u90e8\u5ffd\u7565",
-"Finish": "\u5b8c\u6210",
-"Add to Dictionary": "\u6dfb\u52a0\u5230\u5b57\u5178",
-"Insert table": "\u63d2\u5165\u8868\u683c",
-"Table properties": "\u8868\u683c\u5c5e\u6027",
-"Delete table": "\u5220\u9664\u8868\u683c",
-"Cell": "\u5355\u5143\u683c",
-"Row": "\u884c",
-"Column": "\u5217",
-"Cell properties": "\u5355\u5143\u683c\u5c5e\u6027",
-"Merge cells": "\u5408\u5e76\u5355\u5143\u683c",
-"Split cell": "\u62c6\u5206\u5355\u5143\u683c",
-"Insert row before": "\u5728\u4e0a\u65b9\u63d2\u5165",
-"Insert row after": "\u5728\u4e0b\u65b9\u63d2\u5165",
-"Delete row": "\u5220\u9664\u884c",
-"Row properties": "\u884c\u5c5e\u6027",
-"Cut row": "\u526a\u5207\u884c",
-"Copy row": "\u590d\u5236\u884c",
-"Paste row before": "\u7c98\u8d34\u5230\u4e0a\u65b9",
-"Paste row after": "\u7c98\u8d34\u5230\u4e0b\u65b9",
-"Insert column before": "\u5728\u5de6\u4fa7\u63d2\u5165",
-"Insert column after": "\u5728\u53f3\u4fa7\u63d2\u5165",
-"Delete column": "\u5220\u9664\u5217",
-"Cols": "\u5217",
-"Rows": "\u884c",
-"Width": "\u5bbd",
-"Height": "\u9ad8",
-"Cell spacing": "\u5355\u5143\u683c\u5916\u95f4\u8ddd",
-"Cell padding": "\u5355\u5143\u683c\u5185\u8fb9\u8ddd",
-"Caption": "\u6807\u9898",
-"Left": "\u5de6\u5bf9\u9f50",
-"Center": "\u5c45\u4e2d",
-"Right": "\u53f3\u5bf9\u9f50",
-"Cell type": "\u5355\u5143\u683c\u7c7b\u578b",
-"Scope": "\u8303\u56f4",
-"Alignment": "\u5bf9\u9f50\u65b9\u5f0f",
-"H Align": "\u6c34\u5e73\u5bf9\u9f50",
-"V Align": "\u5782\u76f4\u5bf9\u9f50",
-"Top": "\u9876\u90e8\u5bf9\u9f50",
-"Middle": "\u5782\u76f4\u5c45\u4e2d",
-"Bottom": "\u5e95\u90e8\u5bf9\u9f50",
-"Header cell": "\u8868\u5934\u5355\u5143\u683c",
-"Row group": "\u884c\u7ec4",
-"Column group": "\u5217\u7ec4",
-"Row type": "\u884c\u7c7b\u578b",
-"Header": "\u8868\u5934",
-"Body": "\u8868\u4f53",
-"Footer": "\u8868\u5c3e",
-"Border color": "\u8fb9\u6846\u989c\u8272",
-"Insert template": "\u63d2\u5165\u6a21\u677f",
-"Templates": "\u6a21\u677f",
-"Template": "\u6a21\u677f",
-"Text color": "\u6587\u5b57\u989c\u8272",
-"Background color": "\u80cc\u666f\u8272",
-"Custom...": "\u81ea\u5b9a\u4e49...",
-"Custom color": "\u81ea\u5b9a\u4e49\u989c\u8272",
-"No color": "\u65e0",
-"Table of Contents": "\u5185\u5bb9\u5217\u8868",
-"Show blocks": "\u663e\u793a\u533a\u5757\u8fb9\u6846",
-"Show invisible characters": "\u663e\u793a\u4e0d\u53ef\u89c1\u5b57\u7b26",
-"Words: {0}": "\u5b57\u6570\uff1a{0}",
-"{0} words": "{0} \u5b57",
-"File": "\u6587\u4ef6",
-"Edit": "\u7f16\u8f91",
-"Insert": "\u63d2\u5165",
-"View": "\u89c6\u56fe",
-"Format": "\u683c\u5f0f",
-"Table": "\u8868\u683c",
-"Tools": "\u5de5\u5177",
-"Powered by {0}": "\u7531{0}\u9a71\u52a8",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u5728\u7f16\u8f91\u533a\u6309ALT-F9\u6253\u5f00\u83dc\u5355\uff0c\u6309ALT-F10\u6253\u5f00\u5de5\u5177\u680f\uff0c\u6309ALT-0\u67e5\u770b\u5e2e\u52a9"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/zh_TW.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/zh_TW.js
deleted file mode 100644
index cc5f157949..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/zh_TW.js
+++ /dev/null
@@ -1,261 +0,0 @@
-tinymce.addI18n('zh_TW',{
-"Redo": "\u53d6\u6d88\u5fa9\u539f",
-"Undo": "\u5fa9\u539f",
-"Cut": "\u526a\u4e0b",
-"Copy": "\u8907\u88fd",
-"Paste": "\u8cbc\u4e0a",
-"Select all": "\u5168\u9078",
-"New document": "\u65b0\u6587\u4ef6",
-"Ok": "\u78ba\u5b9a",
-"Cancel": "\u53d6\u6d88",
-"Visual aids": "\u5c0f\u5e6b\u624b",
-"Bold": "\u7c97\u9ad4",
-"Italic": "\u659c\u9ad4",
-"Underline": "\u5e95\u7dda",
-"Strikethrough": "\u522a\u9664\u7dda",
-"Superscript": "\u4e0a\u6a19",
-"Subscript": "\u4e0b\u6a19",
-"Clear formatting": "\u6e05\u9664\u683c\u5f0f",
-"Align left": "\u7f6e\u5de6\u5c0d\u9f4a",
-"Align center": "\u7f6e\u4e2d\u5c0d\u9f4a",
-"Align right": "\u7f6e\u53f3\u5c0d\u9f4a",
-"Justify": "\u5de6\u53f3\u5c0d\u9f4a",
-"Bullet list": "\u9805\u76ee\u6e05\u55ae",
-"Numbered list": "\u6578\u5b57\u6e05\u55ae",
-"Decrease indent": "\u6e1b\u5c11\u7e2e\u6392",
-"Increase indent": "\u589e\u52a0\u7e2e\u6392",
-"Close": "\u95dc\u9589",
-"Formats": "\u683c\u5f0f",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u60a8\u7684\u700f\u89bd\u5668\u4e0d\u652f\u63f4\u5b58\u53d6\u526a\u8cbc\u7c3f\uff0c\u53ef\u4ee5\u4f7f\u7528\u5feb\u901f\u9375 Ctrl + X\/C\/V \u4ee3\u66ff\u526a\u4e0b\u3001\u8907\u88fd\u8207\u8cbc\u4e0a\u3002",
-"Headers": "\u6a19\u984c",
-"Header 1": "\u6a19\u984c 1",
-"Header 2": "\u6a19\u984c 2",
-"Header 3": "\u6a19\u984c 3",
-"Header 4": "\u6a19\u984c 4",
-"Header 5": "\u6a19\u984c 5",
-"Header 6": "\u6a19\u984c 6",
-"Headings": "\u6a19\u984c",
-"Heading 1": "\u6a19\u984c 1",
-"Heading 2": "\u6a19\u984c 2",
-"Heading 3": "\u6a19\u984c 3",
-"Heading 4": "\u6a19\u984c 4",
-"Heading 5": "\u6a19\u984c 5",
-"Heading 6": "\u6a19\u984c 6",
-"Preformatted": "\u9810\u5148\u6392\u7248",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u7a0b\u5f0f\u78bc",
-"Paragraph": "\u6bb5\u843d",
-"Blockquote": "\u5f15\u7528",
-"Inline": "Inline",
-"Blocks": "\u5340\u584a",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u76ee\u524d\u5c07\u4ee5\u7d14\u6587\u5b57\u7684\u6a21\u5f0f\u8cbc\u4e0a\uff0c\u60a8\u53ef\u4ee5\u518d\u9ede\u9078\u4e00\u6b21\u53d6\u6d88\u3002",
-"Font Family": "\u5b57\u9ad4",
-"Font Sizes": "\u5b57\u578b\u5927\u5c0f",
-"Class": "\u985e\u5225",
-"Browse for an image": "\u5f9e\u5716\u7247\u4e2d\u700f\u89bd",
-"OR": "\u6216",
-"Drop an image here": "\u62d6\u66f3\u5716\u7247\u81f3\u6b64",
-"Upload": "\u4e0a\u50b3",
-"Block": "\u5340\u584a",
-"Align": "\u5c0d\u9f4a",
-"Default": "\u9810\u8a2d",
-"Circle": "\u7a7a\u5fc3\u5713",
-"Disc": "\u5be6\u5fc3\u5713",
-"Square": "\u6b63\u65b9\u5f62",
-"Lower Alpha": "\u5c0f\u5beb\u82f1\u6587\u5b57\u6bcd",
-"Lower Greek": "\u5e0c\u81d8\u5b57\u6bcd",
-"Lower Roman": "\u5c0f\u5beb\u7f85\u99ac\u6578\u5b57",
-"Upper Alpha": "\u5927\u5beb\u82f1\u6587\u5b57\u6bcd",
-"Upper Roman": "\u5927\u5beb\u7f85\u99ac\u6578\u5b57",
-"Anchor": "\u52a0\u5165\u9328\u9ede",
-"Name": "\u540d\u7a31",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id\u61c9\u4ee5\u5b57\u6bcd\u958b\u982d\uff0c\u5f8c\u9762\u63a5\u8457\u5b57\u6bcd\uff0c\u6578\u5b57\uff0c\u7834\u6298\u865f\uff0c\u9ede\u6578\uff0c\u5192\u865f\u6216\u4e0b\u5283\u7dda\u3002",
-"You have unsaved changes are you sure you want to navigate away?": "\u7de8\u8f2f\u5c1a\u672a\u88ab\u5132\u5b58\uff0c\u4f60\u78ba\u5b9a\u8981\u96e2\u958b\uff1f",
-"Restore last draft": "\u8f09\u5165\u4e0a\u4e00\u6b21\u7de8\u8f2f\u7684\u8349\u7a3f",
-"Special character": "\u7279\u6b8a\u5b57\u5143",
-"Source code": "\u539f\u59cb\u78bc",
-"Insert\/Edit code sample": "\u63d2\u5165\/\u7de8\u8f2f \u7a0b\u5f0f\u78bc\u7bc4\u4f8b",
-"Language": "\u8a9e\u8a00",
-"Code sample": "\u7a0b\u5f0f\u78bc\u7bc4\u4f8b",
-"Color": "\u984f\u8272",
-"R": "\u7d05",
-"G": "\u7da0",
-"B": "\u85cd",
-"Left to right": "\u5f9e\u5de6\u5230\u53f3",
-"Right to left": "\u5f9e\u53f3\u5230\u5de6",
-"Emoticons": "\u8868\u60c5",
-"Document properties": "\u6587\u4ef6\u7684\u5c6c\u6027",
-"Title": "\u6a19\u984c",
-"Keywords": "\u95dc\u9375\u5b57",
-"Description": "\u63cf\u8ff0",
-"Robots": "\u6a5f\u5668\u4eba",
-"Author": "\u4f5c\u8005",
-"Encoding": "\u7de8\u78bc",
-"Fullscreen": "\u5168\u87a2\u5e55",
-"Action": "\u52d5\u4f5c",
-"Shortcut": "\u5feb\u901f\u9375",
-"Help": "\u5e6b\u52a9",
-"Address": "\u5730\u5740",
-"Focus to menubar": "\u8df3\u81f3\u9078\u55ae\u5217",
-"Focus to toolbar": "\u8df3\u81f3\u5de5\u5177\u5217",
-"Focus to element path": "\u8df3\u81f3HTML\u5143\u7d20\u5217",
-"Focus to contextual toolbar": "\u8df3\u81f3\u5feb\u6377\u9078\u55ae",
-"Insert link (if link plugin activated)": "\u65b0\u589e\u6377\u5f91 (\u6377\u5f91\u5916\u639b\u555f\u7528\u6642)",
-"Save (if save plugin activated)": "\u5132\u5b58 (\u5132\u5b58\u5916\u639b\u555f\u7528\u6642)",
-"Find (if searchreplace plugin activated)": "\u5c0b\u627e (\u5c0b\u627e\u53d6\u4ee3\u5916\u639b\u555f\u7528\u6642)",
-"Plugins installed ({0}):": "({0}) \u500b\u5916\u639b\u5df2\u5b89\u88dd\uff1a",
-"Premium plugins:": "\u52a0\u503c\u5916\u639b\uff1a",
-"Learn more...": "\u4e86\u89e3\u66f4\u591a...",
-"You are using {0}": "\u60a8\u6b63\u5728\u4f7f\u7528 {0}",
-"Plugins": "\u5916\u639b",
-"Handy Shortcuts": "\u5feb\u901f\u9375",
-"Horizontal line": "\u6c34\u5e73\u7dda",
-"Insert\/edit image": "\u63d2\u5165\/\u7de8\u8f2f \u5716\u7247",
-"Image description": "\u5716\u7247\u63cf\u8ff0",
-"Source": "\u5716\u7247\u7db2\u5740",
-"Dimensions": "\u5c3a\u5bf8",
-"Constrain proportions": "\u7b49\u6bd4\u4f8b\u7e2e\u653e",
-"General": "\u4e00\u822c",
-"Advanced": "\u9032\u968e",
-"Style": "\u6a23\u5f0f",
-"Vertical space": "\u9ad8\u5ea6",
-"Horizontal space": "\u5bec\u5ea6",
-"Border": "\u908a\u6846",
-"Insert image": "\u63d2\u5165\u5716\u7247",
-"Image": "\u5716\u7247",
-"Image list": "\u5716\u7247\u6e05\u55ae",
-"Rotate counterclockwise": "\u9006\u6642\u91dd\u65cb\u8f49",
-"Rotate clockwise": "\u9806\u6642\u91dd\u65cb\u8f49",
-"Flip vertically": "\u5782\u76f4\u7ffb\u8f49",
-"Flip horizontally": "\u6c34\u5e73\u7ffb\u8f49",
-"Edit image": "\u7de8\u8f2f\u5716\u7247",
-"Image options": "\u5716\u7247\u9078\u9805",
-"Zoom in": "\u653e\u5927",
-"Zoom out": "\u7e2e\u5c0f",
-"Crop": "\u88c1\u526a",
-"Resize": "\u8abf\u6574\u5927\u5c0f",
-"Orientation": "\u65b9\u5411",
-"Brightness": "\u4eae\u5ea6",
-"Sharpen": "\u92b3\u5316",
-"Contrast": "\u5c0d\u6bd4",
-"Color levels": "\u984f\u8272\u5c64\u6b21",
-"Gamma": "\u4f3d\u99ac\u503c",
-"Invert": "\u53cd\u8f49",
-"Apply": "\u61c9\u7528",
-"Back": "\u5f8c\u9000",
-"Insert date\/time": "\u63d2\u5165 \u65e5\u671f\/\u6642\u9593",
-"Date\/time": "\u65e5\u671f\/\u6642\u9593",
-"Insert link": "\u63d2\u5165\u9023\u7d50",
-"Insert\/edit link": "\u63d2\u5165\/\u7de8\u8f2f\u9023\u7d50",
-"Text to display": "\u986f\u793a\u6587\u5b57",
-"Url": "\u7db2\u5740",
-"Target": "\u958b\u555f\u65b9\u5f0f",
-"None": "\u7121",
-"New window": "\u53e6\u958b\u8996\u7a97",
-"Remove link": "\u79fb\u9664\u9023\u7d50",
-"Anchors": "\u52a0\u5165\u9328\u9ede",
-"Link": "\u9023\u7d50",
-"Paste or type a link": "\u8cbc\u4e0a\u6216\u8f38\u5165\u9023\u7d50",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u4f60\u6240\u586b\u5beb\u7684URL\u70ba\u96fb\u5b50\u90f5\u4ef6\uff0c\u9700\u8981\u52a0\u4e0amailto:\u524d\u7db4\u55ce\uff1f",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u4f60\u6240\u586b\u5beb\u7684URL\u5c6c\u65bc\u5916\u90e8\u93c8\u63a5\uff0c\u9700\u8981\u52a0\u4e0ahttp:\/\/:\u524d\u7db4\u55ce\uff1f",
-"Link list": "\u9023\u7d50\u6e05\u55ae",
-"Insert video": "\u63d2\u5165\u5f71\u97f3",
-"Insert\/edit video": "\u63d2\u4ef6\/\u7de8\u8f2f \u5f71\u97f3",
-"Insert\/edit media": "\u63d2\u5165\/\u7de8\u8f2f \u5a92\u9ad4",
-"Alternative source": "\u66ff\u4ee3\u5f71\u97f3",
-"Poster": "\u9810\u89bd\u5716\u7247",
-"Paste your embed code below:": "\u8acb\u5c07\u60a8\u7684\u5d4c\u5165\u5f0f\u7a0b\u5f0f\u78bc\u8cbc\u5728\u4e0b\u9762:",
-"Embed": "\u5d4c\u5165\u78bc",
-"Media": "\u5a92\u9ad4",
-"Nonbreaking space": "\u4e0d\u5206\u884c\u7684\u7a7a\u683c",
-"Page break": "\u5206\u9801",
-"Paste as text": "\u4ee5\u7d14\u6587\u5b57\u8cbc\u4e0a",
-"Preview": "\u9810\u89bd",
-"Print": "\u5217\u5370",
-"Save": "\u5132\u5b58",
-"Find": "\u641c\u5c0b",
-"Replace with": "\u66f4\u63db",
-"Replace": "\u66ff\u63db",
-"Replace all": "\u66ff\u63db\u5168\u90e8",
-"Prev": "\u4e0a\u4e00\u500b",
-"Next": "\u4e0b\u4e00\u500b",
-"Find and replace": "\u5c0b\u627e\u53ca\u53d6\u4ee3",
-"Could not find the specified string.": "\u7121\u6cd5\u67e5\u8a62\u5230\u6b64\u7279\u5b9a\u5b57\u4e32",
-"Match case": "\u76f8\u5339\u914d\u6848\u4ef6",
-"Whole words": "\u6574\u500b\u55ae\u5b57",
-"Spellcheck": "\u62fc\u5b57\u6aa2\u67e5",
-"Ignore": "\u5ffd\u7565",
-"Ignore all": "\u5ffd\u7565\u6240\u6709",
-"Finish": "\u5b8c\u6210",
-"Add to Dictionary": "\u52a0\u5165\u5b57\u5178\u4e2d",
-"Insert table": "\u63d2\u5165\u8868\u683c",
-"Table properties": "\u8868\u683c\u5c6c\u6027",
-"Delete table": "\u522a\u9664\u8868\u683c",
-"Cell": "\u5132\u5b58\u683c",
-"Row": "\u5217",
-"Column": "\u884c",
-"Cell properties": "\u5132\u5b58\u683c\u5c6c\u6027",
-"Merge cells": "\u5408\u4f75\u5132\u5b58\u683c",
-"Split cell": "\u5206\u5272\u5132\u5b58\u683c",
-"Insert row before": "\u63d2\u5165\u5217\u5728...\u4e4b\u524d",
-"Insert row after": "\u63d2\u5165\u5217\u5728...\u4e4b\u5f8c",
-"Delete row": "\u522a\u9664\u5217",
-"Row properties": "\u5217\u5c6c\u6027",
-"Cut row": "\u526a\u4e0b\u5217",
-"Copy row": "\u8907\u88fd\u5217",
-"Paste row before": "\u8cbc\u4e0a\u5217\u5728...\u4e4b\u524d",
-"Paste row after": "\u8cbc\u4e0a\u5217\u5728...\u4e4b\u5f8c",
-"Insert column before": "\u63d2\u5165\u6b04\u4f4d\u5728...\u4e4b\u524d",
-"Insert column after": "\u63d2\u5165\u6b04\u4f4d\u5728...\u4e4b\u5f8c",
-"Delete column": "\u522a\u9664\u884c",
-"Cols": "\u6b04\u4f4d\u6bb5",
-"Rows": "\u5217",
-"Width": "\u5bec\u5ea6",
-"Height": "\u9ad8\u5ea6",
-"Cell spacing": "\u5132\u5b58\u683c\u5f97\u9593\u8ddd",
-"Cell padding": "\u5132\u5b58\u683c\u7684\u908a\u8ddd",
-"Caption": "\u8868\u683c\u6a19\u984c",
-"Left": "\u5de6\u908a",
-"Center": "\u4e2d\u9593",
-"Right": "\u53f3\u908a",
-"Cell type": "\u5132\u5b58\u683c\u7684\u985e\u578b",
-"Scope": "\u7bc4\u570d",
-"Alignment": "\u5c0d\u9f4a",
-"H Align": "\u6c34\u5e73\u4f4d\u7f6e",
-"V Align": "\u5782\u76f4\u4f4d\u7f6e",
-"Top": "\u7f6e\u9802",
-"Middle": "\u7f6e\u4e2d",
-"Bottom": "\u7f6e\u5e95",
-"Header cell": "\u6a19\u982d\u5132\u5b58\u683c",
-"Row group": "\u5217\u7fa4\u7d44",
-"Column group": "\u6b04\u4f4d\u7fa4\u7d44",
-"Row type": "\u884c\u7684\u985e\u578b",
-"Header": "\u6a19\u982d",
-"Body": "\u4e3b\u9ad4",
-"Footer": "\u9801\u5c3e",
-"Border color": "\u908a\u6846\u984f\u8272",
-"Insert template": "\u63d2\u5165\u6a23\u7248",
-"Templates": "\u6a23\u7248",
-"Template": "\u6a23\u677f",
-"Text color": "\u6587\u5b57\u984f\u8272",
-"Background color": "\u80cc\u666f\u984f\u8272",
-"Custom...": "\u81ea\u8a02",
-"Custom color": "\u81ea\u8a02\u984f\u8272",
-"No color": "No color",
-"Table of Contents": "\u76ee\u9304",
-"Show blocks": "\u986f\u793a\u5340\u584a\u8cc7\u8a0a",
-"Show invisible characters": "\u986f\u793a\u96b1\u85cf\u5b57\u5143",
-"Words: {0}": "\u5b57\u6578\uff1a{0}",
-"{0} words": "{0} \u5b57\u5143",
-"File": "\u6a94\u6848",
-"Edit": "\u7de8\u8f2f",
-"Insert": "\u63d2\u5165",
-"View": "\u6aa2\u8996",
-"Format": "\u683c\u5f0f",
-"Table": "\u8868\u683c",
-"Tools": "\u5de5\u5177",
-"Powered by {0}": "\u7531 {0} \u63d0\u4f9b",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u8c50\u5bcc\u7684\u6587\u672c\u5340\u57df\u3002\u6309ALT-F9\u524d\u5f80\u4e3b\u9078\u55ae\u3002\u6309ALT-F10\u547c\u53eb\u5de5\u5177\u6b04\u3002\u6309ALT-0\u5c0b\u6c42\u5e6b\u52a9"
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js b/src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
deleted file mode 100644
index 54fda13a0d..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
+++ /dev/null
@@ -1,359 +0,0 @@
-(function () {
-
-    //JavaScript extension methods on the core JavaScript objects (like String, Date, etc...)
-    if (!Date.prototype.toIsoDateTimeString) {
-        /** Converts a Date object to a globally acceptable ISO string, NOTE: This is different from the built in 
-            JavaScript toISOString method which returns date/time like "2013-08-07T02:04:11.487Z" but we want "yyyy-MM-dd HH:mm:ss" */
-        Date.prototype.toIsoDateTimeString = function (str) {
-            var month = (this.getMonth() + 1).toString();
-            if (month.length === 1) {
-                month = "0" + month;
-            }
-            var day = this.getDate().toString();
-            if (day.length === 1) {
-                day = "0" + day;
-            }
-            var hour = this.getHours().toString();
-            if (hour.length === 1) {
-                hour = "0" + hour;
-            }
-            var mins = this.getMinutes().toString();
-            if (mins.length === 1) {
-                mins = "0" + mins;
-            }
-            var secs = this.getSeconds().toString();
-            if (secs.length === 1) {
-                secs = "0" + secs;
-            }
-            return this.getFullYear() + "-" + month + "-" + day + " " + hour + ":" + mins + ":" + secs;
-        };
-    }
-    
-    if (!Date.prototype.toIsoDateString) {
-        /** Converts a Date object to a globally acceptable ISO string, NOTE: This is different from the built in 
-            JavaScript toISOString method which returns date/time like "2013-08-07T02:04:11.487Z" but we want "yyyy-MM-dd" */
-        Date.prototype.toIsoDateString = function (str) {
-            var month = (this.getMonth() + 1).toString();
-            if (month.length === 1) {
-                month = "0" + month;
-            }
-            var day = this.getDate().toString();
-            if (day.length === 1) {
-                day = "0" + day;
-            }
-            
-            return this.getFullYear() + "-" + month + "-" + day;
-        };
-    }
-
-    //create guid method on the String
-    if (String.CreateGuid == null) {
-        
-        /** generates a new Guid */
-        String.CreateGuid = function () {            
-            return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-                var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
-                return v.toString(16);
-            });
-        };
-    }
-
-    if (!window.__debug__) {
-        
-        /** global method to send debug statements to console that is cross browser (or at least checks if its possible)*/
-        window.__debug__ = function (msg, category, isErr) {
-            if (((typeof console) != "undefined") && console.log && console.error) {
-                if (isErr) console.error(category + ": " + msg);
-                else console.log(category + ": " + msg);
-            }
-        };
-    }
-
-    if (!String.prototype.trimStartSpecial) {
-        /** trimSpecial extension method for string */
-        // Removes all non printable chars from beginning of a string
-        String.prototype.trimStartSpecial = function () {            
-            var index = 0;
-            while (this.charCodeAt(index) <= 46) {
-                index++;
-            }            
-            return this.substr(index);
-        };
-    }
-
-    if (!String.prototype.startsWith) {
-        /** startsWith extension method for string */
-        String.prototype.startsWith = function (str) {            
-            return this.substr(0, str.length) === str;
-        };
-    }
-
-    if (!String.prototype.endsWith) {
-        
-        /** endsWith extension method for string*/
-        String.prototype.endsWith = function (str) {            
-            return this.substr(this.length - str.length) === str;
-        };
-    }
-    
-    /** trims the start of the string*/
-    String.prototype.trimStart = function (str) {
-        if (this.startsWith(str)) {
-            return this.substring(str.length);
-        }
-        return this;
-    };
-
-    /** trims the end of the string*/
-    String.prototype.trimEnd = function (str) {
-        if (this.endsWith(str)) {
-            return this.substring(0, this.length - str.length);
-        }
-        return this;
-    };
-
-    if (!String.prototype.utf8Encode) {
-
-        /** UTF8 encoder for string*/
-        String.prototype.utf8Encode = function () {
-            var str = this.replace(/\r\n/g, "\n");
-            var utftext = "";
-            for (var n = 0; n < str.length; n++) {
-                var c = str.charCodeAt(n);
-                if (c < 128) {
-                    utftext += String.fromCharCode(c);
-                }
-                else if ((c > 127) && (c < 2048)) {
-                    utftext += String.fromCharCode((c >> 6) | 192);
-                    utftext += String.fromCharCode((c & 63) | 128);
-                }
-                else {
-                    utftext += String.fromCharCode((c >> 12) | 224);
-                    utftext += String.fromCharCode(((c >> 6) & 63) | 128);
-                    utftext += String.fromCharCode((c & 63) | 128);
-                }
-            }
-            return utftext;
-        };
-    }
-
-    if (!String.prototype.utf8Decode) {
-        
-        /** UTF8 decoder for string*/
-        String.prototype.utf8Decode = function () {
-            var utftext = this;
-            var string = "";
-            var i = 0;
-            var c = c1 = c2 = 0;
-
-            while (i < utftext.length) {
-
-                c = utftext.charCodeAt(i);
-
-                if (c < 128) {
-                    string += String.fromCharCode(c);
-                    i++;
-                }
-                else if ((c > 191) && (c < 224)) {
-                    c2 = utftext.charCodeAt(i + 1);
-                    string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
-                    i += 2;
-                }
-                else {
-                    c2 = utftext.charCodeAt(i + 1);
-                    c3 = utftext.charCodeAt(i + 2);
-                    string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
-                    i += 3;
-                }
-
-            }
-
-            return string;
-        };
-    }
-
-    if (!String.prototype.base64Encode) {
-        
-        /** Base64 encoder for string*/
-        String.prototype.base64Encode = function () {
-            var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-            var output = "";
-            var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
-            var i = 0;
-
-            var input = this.utf8Encode();
-
-            while (i < input.length) {
-
-                chr1 = input.charCodeAt(i++);
-                chr2 = input.charCodeAt(i++);
-                chr3 = input.charCodeAt(i++);
-
-                enc1 = chr1 >> 2;
-                enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-                enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-                enc4 = chr3 & 63;
-
-                if (isNaN(chr2)) {
-                    enc3 = enc4 = 64;
-                } else if (isNaN(chr3)) {
-                    enc4 = 64;
-                }
-
-                output = output +
-			        keyStr.charAt(enc1) + keyStr.charAt(enc2) +
-			        keyStr.charAt(enc3) + keyStr.charAt(enc4);
-
-            }
-
-            return output;
-        };
-    }
-
-    if (!String.prototype.base64Decode) {
-        
-        /** Base64 decoder for string*/
-        String.prototype.base64Decode = function () {
-
-            var input = this;
-            var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-            var output = "";
-            var chr1, chr2, chr3;
-            var enc1, enc2, enc3, enc4;
-            var i = 0;
-
-            input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-
-            while (i < input.length) {
-
-                enc1 = keyStr.indexOf(input.charAt(i++));
-                enc2 = keyStr.indexOf(input.charAt(i++));
-                enc3 = keyStr.indexOf(input.charAt(i++));
-                enc4 = keyStr.indexOf(input.charAt(i++));
-
-                chr1 = (enc1 << 2) | (enc2 >> 4);
-                chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-                chr3 = ((enc3 & 3) << 6) | enc4;
-
-                output = output + String.fromCharCode(chr1);
-
-                if (enc3 != 64) {
-                    output = output + String.fromCharCode(chr2);
-                }
-                if (enc4 != 64) {
-                    output = output + String.fromCharCode(chr3);
-                }
-
-            }
-
-            return output.utf8Decode();
-
-        };
-    }
-
-
-    if (!Math.randomRange) {
-        
-        /** randomRange extension for math*/
-        Math.randomRange = function (from, to) {
-            return Math.floor(Math.random() * (to - from + 1) + from);
-        };
-    }
-
-    if (!String.prototype.toCamelCase) {
-        
-        /** toCamelCase extension method for string*/
-        String.prototype.toCamelCase = function () {
-
-            var s = this.toPascalCase();
-            if ($.trim(s) == "")
-                return "";
-            if (s.length > 1) {
-                var regex = /^([A-Z]*)([A-Z].*)/g;
-                if (s.match(regex)) {
-                    var match = regex.exec(s);
-                    s = match[1].toLowerCase() + match[2];
-                    s = s.substr(0, 1).toLowerCase() + s.substr(1);
-                }
-            } else {
-                s = s.toLowerCase();
-            }
-            return s;
-        };
-    }
-
-    if (!String.prototype.toPascalCase) {
-        
-        /** toPascalCase extension method for string*/
-        String.prototype.toPascalCase = function () {
-            
-            var s = "";
-            $.each($.trim(this).split(/[\s\.-]+/g), function (idx, val) {
-                if ($.trim(val) == "")
-                    return;
-                if (val.length > 1)
-                    s += val.substr(0, 1).toUpperCase() + val.substr(1);
-                else
-                    s += val.toUpperCase();
-            });
-            return s;
-        };
-    }
-
-    if (!String.prototype.toUmbracoAlias) {
-        
-        /** toUmbracoAlias extension method for string*/
-        String.prototype.toUmbracoAlias = function () {
-            
-            var s = this.replace(/[^a-zA-Z0-9\s\.-]+/g, ''); // Strip none alphanumeric chars
-            return s.toCamelCase(); // Convert to camelCase
-        };
-    }
-
-    if (!String.prototype.toFunction) {
-        
-        /** Converts a string into a function if it is found */
-        String.prototype.toFunction = function () {
-            var arr = this.split(".");
-            var fn = (window || this);
-            for (var i = 0, len = arr.length; i < len; i++) {
-                fn = fn[arr[i]];
-            }
-            if (typeof fn !== "function") {
-                throw new Error("function not found");
-            }
-            return fn;
-        };
-    }
-
-    if (!String.prototype.detectIsJson) {
-
-        /** Rudimentary check to see if the string is a json encoded string */
-        String.prototype.detectIsJson = function () {
-            if ((this.startsWith("{") && this.endsWith("}")) || (this.startsWith("[") || this.endsWith("]"))) {
-                return true;
-            }
-            return false;
-        };
-    }
-
-    if (!Object.toBoolean) {
-
-        /** Converts a string/integer/bool to true/false */
-        Object.toBoolean = function (obj) {
-            if (obj === undefined || obj === null) {
-                return false;
-            }
-
-            if ((typeof obj) === "boolean") {
-                return obj;
-            }
-
-            if (obj === "1" || obj === 1 || obj.toString().toLowerCase() === "true") {
-                return true;
-            }
-            return false;
-        };
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/LegacySpeechBubble.js b/src/Umbraco.Web.UI.Client/lib/umbraco/LegacySpeechBubble.js
deleted file mode 100644
index 05568354e6..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/umbraco/LegacySpeechBubble.js
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// TODO: WE NEED TO CONVERT ALL OF THESE METHODS TO PROXY TO OUR APPLICATION SINCE MANY CUSTOM APPS USE THIS!
-
-Umbraco.Sys.registerNamespace("Umbraco.Application");
-
-(function($) {
-    Umbraco.Application.SpeechBubble = function() {
-
-        /**
-         * @ngdoc function
-         * @name getRootScope
-         * @methodOf UmbClientMgr
-         * @function
-         *
-         * @description
-         * Returns the root angular scope
-         */
-        function getRootScope() {
-            return angular.element(document.getElementById("umbracoMainPageBody")).scope();
-        }
-        
-        /**
-         * @ngdoc function
-         * @name getRootInjector
-         * @methodOf UmbClientMgr
-         * @function
-         *
-         * @description
-         * Returns the root angular injector
-         */
-        function getRootInjector() {
-            return angular.element(document.getElementById("umbracoMainPageBody")).injector();
-        }
-
-
-        return {
-            
-            /**
-             * @ngdoc function
-             * @name ShowMessage
-             * @methodOf Umbraco.Application.SpeechBubble
-             * @function
-             *
-             * @description
-             * Proxies a legacy call to the new notification service
-             */               
-            ShowMessage: function (icon, header, message) {
-                //get our angular navigation service
-                var injector = getRootInjector();
-                var notifyService = injector.get("notificationsService");
-
-                switch(icon){
-                    case "save":
-                        notifyService.success(header, message);
-                        break;
-                    case "success":
-                        notifyService.success(header, message);
-                        break;    
-                    case "warning":
-                        notifyService.warning(header, message);
-                        break;
-                    case "error":
-                        notifyService.error(header, message);
-                        break;
-                    default:
-                        notifyService.info(header, message);
-                }
-
-                
-            }
-        };
-    };
-})(jQuery);
-
-//define alias for use throughout application
-var UmbSpeechBubble = new Umbraco.Application.SpeechBubble();
diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/NamespaceManager.js b/src/Umbraco.Web.UI.Client/lib/umbraco/NamespaceManager.js
deleted file mode 100644
index 9d4b86b2ba..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/umbraco/NamespaceManager.js
+++ /dev/null
@@ -1,17 +0,0 @@
-if (typeof Umbraco == 'undefined') var Umbraco = {};
-if (!Umbraco.Sys) Umbraco.Sys = {};
-
-Umbraco.Sys.registerNamespace = function(namespace) {
-    /// <summary>
-    /// Used to easily register namespaces for classes without doing the syntax listed on line 1/2 for each class.
-    /// Pretty much the same as ASP.NET's Type.registerNamespace, except in order to use it, you must register
-    /// all of your scripts with ScriptManager, this class doesn't require this.
-    /// </summary>
-    namespace = namespace.split('.');
-    if (!window[namespace[0]]) window[namespace[0]] = {};
-    var strFullNamespace = namespace[0];
-    for (var i = 1; i < namespace.length; i++) {
-        strFullNamespace += "." + namespace[i];
-        eval("if(!window." + strFullNamespace + ")window." + strFullNamespace + "={};");
-    }
-}; 
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/legacytreeicons.css b/src/Umbraco.Web.UI.Client/lib/umbraco/legacytreeicons.css
deleted file mode 100644
index acd1b33f4c..0000000000
--- a/src/Umbraco.Web.UI.Client/lib/umbraco/legacytreeicons.css
+++ /dev/null
@@ -1,38 +0,0 @@
-.sprTreeDeveloperCacheItem {background-position: -6px -8px ! important;}
-.sprTreeDeveloperCacheTypes {background-position: -6px -40px ! important;}
-.sprTreeDeveloperMacro {background-position: -6px -72px ! important;}
-.sprTreeDeveloperPython {background-position: -6px -104px ! important; width: 15px; height: 15px}
-.sprTreeDeveloperRegistry {background-position: -6px -135px ! important;}
-.sprTreeDoc {background-position: -6px -199px ! important;}
-.sprTreeDoc2 {background-position: -6px -231px ! important;}
-.sprTreeDoc3 {background-position: -6px -263px ! important;}
-.sprTreeDoc4 {background-position: -6px -295px ! important;}
-.sprTreeDoc5 {background-position: -6px -327px ! important;}
-.sprTreeDocPic {background-position: -6px -359px ! important;}
-.sprTreeFolder {background-position: -6px -391px ! important;}
-.sprTreeFolder_o {background-position: -6px -423px ! important;}
-.sprTreeMediaFile {background-position: -6px -455px ! important;}
-.sprTreeMediaMovie {background-position: -6px -487px ! important;}
-.sprTreemediaFile {background-position: -6px -519px ! important;}
-.sprTreeMediaPhoto {background-position: -6px -551px ! important;}
-.sprTreeMember {background-position: -6px -583px ! important;}
-.sprTreeMemberGroup {background-position: -6px -615px ! important;}
-.sprTreeMemberType {background-position: -6px -647px ! important;}
-.sprTreeNewsletter {background-position: -6px -679px ! important;}
-.sprTreePackage {background-position: -6px -711px ! important;}
-.sprTreeRepository {background-position: -6px -743px ! important;}
-.sprTreeSettingAgent {background-position: -6px -775px ! important;}
-.sprTreeSettingCss {background-position: -6px -807px ! important;}
-.sprTreeSettingCssItem {background-position: -6px -839px ! important;}
-.sprTreeSettingDataType {background-position: -6px -871px ! important;}
-.sprTreeSettingDataTypeChild {background-position: -6px -903px ! important;}
-.sprTreeSettingDomain {background-position: -6px -935px ! important;}
-.sprTreeSettingLanguage {background-position: -6px -967px ! important;}
-.sprTreeSettingScript {background-position: -6px -999px ! important;}
-.sprTreeSettingTemplate {background-position: -6px -1031px ! important;}
-.sprTreeSettingXml {background-position: -6px -1063px ! important;}
-.sprTreeStatistik {background-position: -6px -1095px ! important;}
-.sprTreeUser {background-position: -6px -1127px ! important;}
-.sprTreeUserGroup {background-position: -6px -1159px ! important;}
-.sprTreeUserType {background-position: -6px -1191px ! important;}
-.sprNew{background-position: -6px -339px;}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
deleted file mode 100644
index 642285aeaf..0000000000
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ /dev/null
@@ -1,31871 +0,0 @@
-{
-  "name": "ui",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "ui",
-      "dependencies": {
-        "@microsoft/signalr": "7.0.12",
-        "@umbraco-ui/uui": "1.7.1",
-        "@umbraco-ui/uui-css": "1.7.0",
-        "ace-builds": "1.31.1",
-        "angular": "1.8.3",
-        "angular-animate": "1.8.3",
-        "angular-aria": "1.8.3",
-        "angular-chart.js": "1.1.1",
-        "angular-cookies": "1.8.3",
-        "angular-dynamic-locale": "0.1.38",
-        "angular-i18n": "1.8.3",
-        "angular-local-storage": "0.7.1",
-        "angular-messages": "1.8.3",
-        "angular-mocks": "1.8.3",
-        "angular-route": "1.8.3",
-        "angular-sanitize": "1.8.3",
-        "angular-touch": "1.8.3",
-        "angular-ui-sortable": "0.19.0",
-        "animejs": "3.2.1",
-        "bootstrap-social": "5.1.1",
-        "chart.js": "^2.9.3",
-        "clipboard": "2.0.11",
-        "diff": "5.1.0",
-        "flatpickr": "4.6.13",
-        "font-awesome": "4.7.0",
-        "jquery": "3.7.1",
-        "jquery-ui-dist": "1.13.2",
-        "jquery-ui-touch-punch": "0.2.3",
-        "lazyload-js": "1.0.0",
-        "moment": "2.29.4",
-        "ng-file-upload": "12.2.13",
-        "nouislider": "15.7.1",
-        "spectrum-colorpicker2": "2.0.10",
-        "tinymce": "6.8.2",
-        "typeahead.js": "0.11.1",
-        "underscore": "1.13.6",
-        "wicg-inert": "3.1.2"
-      },
-      "devDependencies": {
-        "@babel/core": "7.21.8",
-        "@babel/preset-env": "7.21.5",
-        "autoprefixer": "10.4.16",
-        "cssnano": "6.0.1",
-        "eslint": "8.52.0",
-        "gulp": "4.0.2",
-        "gulp-angular-embed-templates": "2.3.0",
-        "gulp-babel": "8.0.0",
-        "gulp-clean-css": "4.3.0",
-        "gulp-cli": "2.3.0",
-        "gulp-concat": "2.6.1",
-        "gulp-eslint-new": "1.8.4",
-        "gulp-imagemin": "7.1.0",
-        "gulp-less": "5.0.0",
-        "gulp-minify": "3.1.0",
-        "gulp-notify": "4.0.0",
-        "gulp-postcss": "9.0.1",
-        "gulp-rename": "2.0.0",
-        "gulp-sort": "2.0.0",
-        "gulp-sourcemaps": "3.0.0",
-        "gulp-watch": "5.0.1",
-        "gulp-wrap": "0.15.0",
-        "gulp-wrap-js": "0.4.1",
-        "jasmine-core": "5.1.1",
-        "jsdom": "22.1.0",
-        "karma": "6.4.2",
-        "karma-jasmine": "5.1.0",
-        "karma-jsdom-launcher": "15.0.0",
-        "karma-junit-reporter": "2.0.1",
-        "karma-spec-reporter": "0.0.36",
-        "less": "4.2.0",
-        "lodash": "4.17.21",
-        "merge-stream": "2.0.0",
-        "postcss": "8.4.31",
-        "run-sequence": "2.2.1"
-      },
-      "engines": {
-        "node": ">=20.9",
-        "npm": ">=10.1"
-      }
-    },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.22.13",
-        "chalk": "^2.4.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz",
-      "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.21.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.8.tgz",
-      "integrity": "sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.21.5",
-        "@babel/helper-compilation-targets": "^7.21.5",
-        "@babel/helper-module-transforms": "^7.21.5",
-        "@babel/helpers": "^7.21.5",
-        "@babel/parser": "^7.21.8",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.5",
-        "@babel/types": "^7.21.5",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.23.0",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
-      "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
-      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.15",
-        "browserslist": "^4.21.9",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz",
-      "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
-      "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "regexpu-core": "^5.3.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
-      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.15"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz",
-      "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
-      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-wrap-function": "^7.22.20"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
-      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
-        "@babel/helper-optimise-call-expression": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
-      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
-      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.22.19"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",
-      "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.2",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz",
-      "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz",
-      "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.15"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
-      "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz",
-      "integrity": "sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-static-block instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-dynamic-import instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-export-namespace-from instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-json-strings instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz",
-      "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-logical-assignment-operators instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
-      "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.20.5",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.20.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-catch-binding instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
-      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.21.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz",
-      "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-unicode-property-regex instead.",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
-      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
-      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
-      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
-      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz",
-      "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz",
-      "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.9",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
-      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/template": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz",
-      "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
-      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
-      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
-      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz",
-      "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
-      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
-      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
-      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz",
-      "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz",
-      "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-simple-access": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz",
-      "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
-      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
-      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
-      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
-      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz",
-      "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz",
-      "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
-      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
-      "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "regenerator-transform": "^0.15.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
-      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
-      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
-      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
-      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
-      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
-      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
-      "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
-      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-env": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.21.5.tgz",
-      "integrity": "sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.21.5",
-        "@babel/helper-compilation-targets": "^7.21.5",
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-validator-option": "^7.21.0",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.20.7",
-        "@babel/plugin-proposal-async-generator-functions": "^7.20.7",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-class-static-block": "^7.21.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
-        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-        "@babel/plugin-proposal-json-strings": "^7.18.6",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-        "@babel/plugin-proposal-optional-chaining": "^7.21.0",
-        "@babel/plugin-proposal-private-methods": "^7.18.6",
-        "@babel/plugin-proposal-private-property-in-object": "^7.21.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.20.0",
-        "@babel/plugin-syntax-import-meta": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.21.5",
-        "@babel/plugin-transform-async-to-generator": "^7.20.7",
-        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-        "@babel/plugin-transform-block-scoping": "^7.21.0",
-        "@babel/plugin-transform-classes": "^7.21.0",
-        "@babel/plugin-transform-computed-properties": "^7.21.5",
-        "@babel/plugin-transform-destructuring": "^7.21.3",
-        "@babel/plugin-transform-dotall-regex": "^7.18.6",
-        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
-        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-for-of": "^7.21.5",
-        "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
-        "@babel/plugin-transform-modules-amd": "^7.20.11",
-        "@babel/plugin-transform-modules-commonjs": "^7.21.5",
-        "@babel/plugin-transform-modules-systemjs": "^7.20.11",
-        "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.20.5",
-        "@babel/plugin-transform-new-target": "^7.18.6",
-        "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-parameters": "^7.21.3",
-        "@babel/plugin-transform-property-literals": "^7.18.6",
-        "@babel/plugin-transform-regenerator": "^7.21.5",
-        "@babel/plugin-transform-reserved-words": "^7.18.6",
-        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.20.7",
-        "@babel/plugin-transform-sticky-regex": "^7.18.6",
-        "@babel/plugin-transform-template-literals": "^7.18.9",
-        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
-        "@babel/plugin-transform-unicode-escapes": "^7.21.5",
-        "@babel/plugin-transform-unicode-regex": "^7.18.6",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.21.5",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "core-js-compat": "^3.25.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz",
-      "integrity": "sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
-      "dev": true
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
-      "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@colors/colors": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.1.90"
-      }
-    },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
-      }
-    },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
-      "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
-      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.23.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@eslint/js": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
-      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/identity-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz",
-      "integrity": "sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^6.4.1",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.16",
-        "source-map": "^0.6.0",
-        "through2": "^3.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/identity-map/node_modules/acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/identity-map/node_modules/picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-      "dev": true
-    },
-    "node_modules/@gulp-sourcemaps/identity-map/node_modules/postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-      "dev": true,
-      "dependencies": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/identity-map/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/identity-map/node_modules/through2": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "2 || 3"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/map-sources": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
-      "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^2.0.1",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/@gulp-sourcemaps/map-sources/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@gulpjs/to-absolute-glob": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz",
-      "integrity": "sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==",
-      "dev": true,
-      "dependencies": {
-        "is-negated-glob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.13",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
-      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
-      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      }
-    },
-    "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-      "dev": true
-    },
-    "node_modules/@lit-labs/ssr-dom-shim": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.0.tgz",
-      "integrity": "sha512-yWJKmpGE6lUURKAaIltoPIE/wrbY3TEkqQt+X0m+7fQNnAv0keydnYvbiJFP1PnMhizmIWRWOG5KLhYyc/xl+g==",
-      "peer": true
-    },
-    "node_modules/@lit/reactive-element": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz",
-      "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==",
-      "peer": true,
-      "dependencies": {
-        "@lit-labs/ssr-dom-shim": "^1.2.0"
-      }
-    },
-    "node_modules/@microsoft/signalr": {
-      "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-7.0.12.tgz",
-      "integrity": "sha512-k1Xu+a73PsWgHwHDm6ctHwHTBnlqCzq7L33cbxdWhj90AGDFpxDSzaGCkZDoJFNHveUetix65zIWiazMvmMg3w==",
-      "dependencies": {
-        "abort-controller": "^3.0.0",
-        "eventsource": "^2.0.2",
-        "fetch-cookie": "^2.0.3",
-        "node-fetch": "^2.6.7",
-        "ws": "^7.4.5"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@sindresorhus/is": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
-      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@socket.io/component-emitter": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
-      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
-      "dev": true
-    },
-    "node_modules/@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@trysound/sax": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/@types/angular": {
-      "version": "1.8.4",
-      "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.8.4.tgz",
-      "integrity": "sha512-wPS/ncJWhyxJsndsW1B6Ta8D4mi97x1yItSu+rkLDytU3oRIh2CFAjMuJceYwFAh9+DIohndWM0QBA9OU2Hv0g=="
-    },
-    "node_modules/@types/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
-      "dev": true
-    },
-    "node_modules/@types/cors": {
-      "version": "2.8.15",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.15.tgz",
-      "integrity": "sha512-n91JxbNLD8eQIuXDIChAN1tCKNWCEgpceU9b7ZMbFA+P+Q4yIeh80jizFLEvolRPc1ES0VdwFlGv+kJTSirogw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/eslint": {
-      "version": "8.44.5",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.5.tgz",
-      "integrity": "sha512-Ol2eio8LtD/tGM4Ga7Jb83NuFwEv3NqvssSlifXL9xuFpSyQZw0ecmm2Kux6iU0KxQmp95hlPmGCzGJ0TCFeRA==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.3.tgz",
-      "integrity": "sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ==",
-      "dev": true
-    },
-    "node_modules/@types/glob": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
-      "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.14",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz",
-      "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==",
-      "dev": true
-    },
-    "node_modules/@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "16.11.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.0.tgz",
-      "integrity": "sha512-8MLkBIYQMuhRBQzGN9875bYsOhPnf/0rgXGo66S2FemHkhbn9qtsz9ywV1iCG+vbjigE4WUNVvw37Dx+L0qsPg==",
-      "dev": true
-    },
-    "node_modules/@types/q": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
-      "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/@types/trusted-types": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
-      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
-      "peer": true
-    },
-    "node_modules/@umbraco-ui/uui": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui/-/uui-1.7.1.tgz",
-      "integrity": "sha512-wHGMW8NQaWJTdbbb7r03sah2Esab4Iy8bFWaTU+UtnrOpNsZclPwxZ3kZcjHnFu32xDFFBF0+iQiCki8Uy4dkA==",
-      "dependencies": {
-        "@umbraco-ui/uui-action-bar": "1.7.0",
-        "@umbraco-ui/uui-avatar": "1.7.0",
-        "@umbraco-ui/uui-avatar-group": "1.7.0",
-        "@umbraco-ui/uui-badge": "1.7.0",
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-boolean-input": "1.7.0",
-        "@umbraco-ui/uui-box": "1.7.0",
-        "@umbraco-ui/uui-breadcrumbs": "1.7.0",
-        "@umbraco-ui/uui-button": "1.7.1",
-        "@umbraco-ui/uui-button-group": "1.7.0",
-        "@umbraco-ui/uui-button-inline-create": "1.7.0",
-        "@umbraco-ui/uui-card": "1.7.0",
-        "@umbraco-ui/uui-card-block-type": "1.7.0",
-        "@umbraco-ui/uui-card-content-node": "1.7.0",
-        "@umbraco-ui/uui-card-media": "1.7.0",
-        "@umbraco-ui/uui-card-user": "1.7.0",
-        "@umbraco-ui/uui-caret": "1.7.0",
-        "@umbraco-ui/uui-checkbox": "1.7.0",
-        "@umbraco-ui/uui-color-area": "1.7.0",
-        "@umbraco-ui/uui-color-picker": "1.7.0",
-        "@umbraco-ui/uui-color-slider": "1.7.0",
-        "@umbraco-ui/uui-color-swatch": "1.7.0",
-        "@umbraco-ui/uui-color-swatches": "1.7.0",
-        "@umbraco-ui/uui-combobox": "1.7.1",
-        "@umbraco-ui/uui-combobox-list": "1.7.0",
-        "@umbraco-ui/uui-css": "1.7.0",
-        "@umbraco-ui/uui-dialog": "1.7.0",
-        "@umbraco-ui/uui-dialog-layout": "1.7.0",
-        "@umbraco-ui/uui-file-dropzone": "1.7.0",
-        "@umbraco-ui/uui-file-preview": "1.7.0",
-        "@umbraco-ui/uui-form": "1.7.0",
-        "@umbraco-ui/uui-form-layout-item": "1.7.0",
-        "@umbraco-ui/uui-form-validation-message": "1.7.0",
-        "@umbraco-ui/uui-icon": "1.7.0",
-        "@umbraco-ui/uui-icon-registry": "1.7.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.7.0",
-        "@umbraco-ui/uui-input": "1.7.0",
-        "@umbraco-ui/uui-input-file": "1.7.1",
-        "@umbraco-ui/uui-input-lock": "1.7.1",
-        "@umbraco-ui/uui-input-password": "1.7.0",
-        "@umbraco-ui/uui-keyboard-shortcut": "1.7.0",
-        "@umbraco-ui/uui-label": "1.7.0",
-        "@umbraco-ui/uui-loader": "1.7.0",
-        "@umbraco-ui/uui-loader-bar": "1.7.0",
-        "@umbraco-ui/uui-loader-circle": "1.7.0",
-        "@umbraco-ui/uui-menu-item": "1.7.0",
-        "@umbraco-ui/uui-modal": "1.7.0",
-        "@umbraco-ui/uui-pagination": "1.7.1",
-        "@umbraco-ui/uui-popover": "1.7.0",
-        "@umbraco-ui/uui-popover-container": "1.7.0",
-        "@umbraco-ui/uui-progress-bar": "1.7.0",
-        "@umbraco-ui/uui-radio": "1.7.0",
-        "@umbraco-ui/uui-range-slider": "1.7.0",
-        "@umbraco-ui/uui-ref": "1.7.0",
-        "@umbraco-ui/uui-ref-list": "1.7.0",
-        "@umbraco-ui/uui-ref-node": "1.7.0",
-        "@umbraco-ui/uui-ref-node-data-type": "1.7.0",
-        "@umbraco-ui/uui-ref-node-document-type": "1.7.0",
-        "@umbraco-ui/uui-ref-node-form": "1.7.0",
-        "@umbraco-ui/uui-ref-node-member": "1.7.0",
-        "@umbraco-ui/uui-ref-node-package": "1.7.0",
-        "@umbraco-ui/uui-ref-node-user": "1.7.0",
-        "@umbraco-ui/uui-scroll-container": "1.7.0",
-        "@umbraco-ui/uui-select": "1.7.0",
-        "@umbraco-ui/uui-slider": "1.7.0",
-        "@umbraco-ui/uui-symbol-expand": "1.7.0",
-        "@umbraco-ui/uui-symbol-file": "1.7.0",
-        "@umbraco-ui/uui-symbol-file-dropzone": "1.7.0",
-        "@umbraco-ui/uui-symbol-file-thumbnail": "1.7.0",
-        "@umbraco-ui/uui-symbol-folder": "1.7.0",
-        "@umbraco-ui/uui-symbol-lock": "1.7.0",
-        "@umbraco-ui/uui-symbol-more": "1.7.0",
-        "@umbraco-ui/uui-symbol-sort": "1.7.0",
-        "@umbraco-ui/uui-table": "1.7.0",
-        "@umbraco-ui/uui-tabs": "1.7.1",
-        "@umbraco-ui/uui-tag": "1.7.0",
-        "@umbraco-ui/uui-textarea": "1.7.0",
-        "@umbraco-ui/uui-toast-notification": "1.7.1",
-        "@umbraco-ui/uui-toast-notification-container": "1.7.1",
-        "@umbraco-ui/uui-toast-notification-layout": "1.7.0",
-        "@umbraco-ui/uui-toggle": "1.7.0",
-        "@umbraco-ui/uui-visually-hidden": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-action-bar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-action-bar/-/uui-action-bar-1.7.0.tgz",
-      "integrity": "sha512-Lw067iEU4DihiOsL3cg2QqE4x7B7bqjYQK0EouBbD+mhJaE2IOw5eve2UIBN1KU/iQ+7V9q4qa++is1nitvUWA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-button-group": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-avatar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar/-/uui-avatar-1.7.0.tgz",
-      "integrity": "sha512-cW3qTTarFqXK4Ze5xMERo9pj3pRRKTvTDB57a5uA0gQ1/70uhgPnozWSX7EK22ml4w/5pmtxXXgRKfSiU9DGtQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-avatar-group": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar-group/-/uui-avatar-group-1.7.0.tgz",
-      "integrity": "sha512-TFDR0Mb+ug1NzVXq9RnxMiQ9pcxBcmzfOoxpR1NWMB/sAgNs/H/pTTqjieLel0/A5Am9q//8f7f9vmhTPpybGg==",
-      "dependencies": {
-        "@umbraco-ui/uui-avatar": "1.7.0",
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-badge": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-badge/-/uui-badge-1.7.0.tgz",
-      "integrity": "sha512-cdPHjXMag8KkYLaWfyYfp9N1qqG+th2Ijx7ms8EpTHAX2gtU1L/A3ShxWox0Ck1TJ75jrW66+HrqiMwDOmbn6g==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-base": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-base/-/uui-base-1.7.0.tgz",
-      "integrity": "sha512-66aDdgTrq2nx4BNzM9A/lc9dZYz/fyX5OVpkQDRsrpYeOLJMN3oOnE7aChIdBNW3I9lfVNJf6fh0iL27K5JCiQ==",
-      "peerDependencies": {
-        "lit": ">=2.8.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-boolean-input": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-boolean-input/-/uui-boolean-input-1.7.0.tgz",
-      "integrity": "sha512-Hp6wOFqFLaZU0oW63GlMJ8s4va/TG+i7Sjs0qT91//5iJhJtpvgwY3j4ARoDfk0d8rKRIapiPT+hNMo9xr1sfQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-box": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-box/-/uui-box-1.7.0.tgz",
-      "integrity": "sha512-1P13tsVJXPEpMiHrw1FmsM0dvCLce8DevZAcP1ArDwtqWrwdArR2eRwlhVEZYu2MJkR2tESE3XGTaSOWHyC8og==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-css": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-breadcrumbs": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-breadcrumbs/-/uui-breadcrumbs-1.7.0.tgz",
-      "integrity": "sha512-y0sB4UypNwCle9qPlQ7Y++a4BkmFpn9vSTeJ6WRWueVyjKT99icmCV1c8/Q47blMajp0FLG2/ajevxg/aZSO4Q==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-button": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button/-/uui-button-1.7.1.tgz",
-      "integrity": "sha512-z2nZccn/Hel2QvytWVejDzqjNPRLJ/jLgCmLpgHoKU2IlckEgZqy4wxKcgH2Iu2bJ+wgIwpAAmlidLK0LX0tCw==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-button-group": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-group/-/uui-button-group-1.7.0.tgz",
-      "integrity": "sha512-CM0sytzzEXiDmFfB6GXnmQw5LzCNuwSo66BC6zYI4cg1+mk2a1UBu1Z8CVpvS3tsTkzk/nGd/ZFKkoIziDVKJg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-button-inline-create": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-inline-create/-/uui-button-inline-create-1.7.0.tgz",
-      "integrity": "sha512-SVep/tcsTJuO8jvZIX0e3EOaY1S+sOk0ZFmq+HxUJDt6csFjXsqJO48DjIon1AKq95ATTM9Iqs/hPSDVHrqNvw==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-card": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card/-/uui-card-1.7.0.tgz",
-      "integrity": "sha512-BBWJ62UH1dmcHvZ3H0fRCnM9c+ebQMNaZlGDDWP5lPfv+2KjXXkLRuj6tPUthHa53e5Rf6AAKjKsjRssM4dsLQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-card-block-type": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-block-type/-/uui-card-block-type-1.7.0.tgz",
-      "integrity": "sha512-SrLgooo2imluSV8S3bp+0kA2K7zuMDAXZTuzQJRf2hzq208In65D5rBxn8OcEJsGD3lHMp6+w8rg8Ol5NlEbXA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-card": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-card-content-node": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-content-node/-/uui-card-content-node-1.7.0.tgz",
-      "integrity": "sha512-wkb9BaUfuZkrMczsm1q4vuP0zSOp0gfiiiXCxFRDNmWJc3jKiL3zF619PzviEZrz10/f7WRnA7MLfDgsAmQpAQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-card": "1.7.0",
-        "@umbraco-ui/uui-icon": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-card-media": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-media/-/uui-card-media-1.7.0.tgz",
-      "integrity": "sha512-Jwli2j//U1v4zG5fvkrekduf3qCa5w0RNP28RBxeqqQKzO8B5UpWqIP86/qaV7hvlp/ZuTCYrdkeWLgUV85tBg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-card": "1.7.0",
-        "@umbraco-ui/uui-symbol-file": "1.7.0",
-        "@umbraco-ui/uui-symbol-folder": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-card-user": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-user/-/uui-card-user-1.7.0.tgz",
-      "integrity": "sha512-4fBXEICxi4ICAM2wn40DrUV1pPGSDFJmzacOA1PXxb1pzQjxw/hb/hnu96xqjHscX+bUAWnWHkb60RnrWmmcsg==",
-      "dependencies": {
-        "@umbraco-ui/uui-avatar": "1.7.0",
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-card": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-caret": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-caret/-/uui-caret-1.7.0.tgz",
-      "integrity": "sha512-sVWUQGaLCAwhFH5mmE83+cwDjTyZamRWHgmVakTac2L9qYkwhTwzRgIol1t4i0DQMDFd4oLZ1zq+ysWvAOCmmQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-checkbox": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-checkbox/-/uui-checkbox-1.7.0.tgz",
-      "integrity": "sha512-7bY8FgSEscGtMYf0EtvmU4XuchV8bdjs+gwBKCVYogAELDdKbCTxWI6/HRqR6wDUOltpP1okFYN6rISugkUKtw==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-boolean-input": "1.7.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-color-area": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-area/-/uui-color-area-1.7.0.tgz",
-      "integrity": "sha512-7FashEB3hoh9p833gEhseq1t2mICVzb5zRe+FJ+vKFnTI2uuIRLjwD0pqSwmVAxoFCPgb81B6V5yH/pSrrzZEQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "colord": "^2.9.3"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-color-picker": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-picker/-/uui-color-picker-1.7.0.tgz",
-      "integrity": "sha512-9JYlgg6i/gxwTIYsCJ8QnSjhZzZjJBiu2HZwDJ/2rm8uy/jNmbCf5aK+WHR7RbwMGNrF4/X/58t5woBzwSMUIA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-popover-container": "1.7.0",
-        "colord": "^2.9.3"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-color-slider": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-slider/-/uui-color-slider-1.7.0.tgz",
-      "integrity": "sha512-DVyYeZsBG35430Cay6Dv8oO7dvi+aow6fVAJDHA4+CXdOSet4RTLO3oc1i51JwDmBiBhtLKGfo/wflrFxyfr0w==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-color-swatch": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatch/-/uui-color-swatch-1.7.0.tgz",
-      "integrity": "sha512-hp4Oicv7eLMvSn6jUerjDkYY6R/8JCRxbXabfbfZOZ/YwocSLN6DBc0nxlb/W8IETy26VCEFXH+tYKvZbsAB2Q==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.7.0",
-        "colord": "^2.9.3"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-color-swatches": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatches/-/uui-color-swatches-1.7.0.tgz",
-      "integrity": "sha512-XIPP4BhaRB6nL3HAt2KRsEeslq/I2hMl8eQzgbz8y9V6yf7uq8q0OCMqQy2XB6bQ48N+sOqXfjKLPIT4yTIH7A==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-color-swatch": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-combobox": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox/-/uui-combobox-1.7.1.tgz",
-      "integrity": "sha512-4nbsRyqJO+rifoug+1PlWA8oI1L6f3aj7P/p9UT4pgcT8mpJ5Fv70XaFXMPEaCWh8HgZLsvMKDClXNzHXlvcLA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-button": "1.7.1",
-        "@umbraco-ui/uui-combobox-list": "1.7.0",
-        "@umbraco-ui/uui-icon": "1.7.0",
-        "@umbraco-ui/uui-popover-container": "1.7.0",
-        "@umbraco-ui/uui-scroll-container": "1.7.0",
-        "@umbraco-ui/uui-symbol-expand": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-combobox-list": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox-list/-/uui-combobox-list-1.7.0.tgz",
-      "integrity": "sha512-vRMz1eDqogVqsuRlzzwq+F2SoXxUoquQ9DqBJPif1LO1LgRUZ3G/j1XyOR+CaMRiPEbu0olyNBHOt15dFbgqhA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-css": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.7.0.tgz",
-      "integrity": "sha512-//nk4+w55eB+EI3hP3O+2RWKg+gXuwKqfcIjEZiP6Nn2epA2XQUV7K5NmcUwKStPyPh9NCz2+EtSvNqJZaaKhA==",
-      "peerDependencies": {
-        "lit": ">=2.8.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-dialog": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog/-/uui-dialog-1.7.0.tgz",
-      "integrity": "sha512-wlvpchoIrD+HQJw5fNrxQ4UP2iSfYss+uJwcxDnoQLvLHR8KyS9jdZVCUe1ozMe5KAJ7w1Tw+qEIiXumMFTUAA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-css": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-dialog-layout": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog-layout/-/uui-dialog-layout-1.7.0.tgz",
-      "integrity": "sha512-xuRXkAWlqAq2eO8VthT4JfOvVwpLeDwQwPOqwz4K50lR/6QHQAZdObG0g0DJuhlvehMMXPXrRneWZrAOWeIYGw==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-file-dropzone": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-dropzone/-/uui-file-dropzone-1.7.0.tgz",
-      "integrity": "sha512-quMmD9iKg4EqV7JKs7k3pcAnxn/RGQjlXgIMrTAUbZbMclLAtTQrowij7ydX5rAdkPgtpQAWRmRuUTcufse64g==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-symbol-file-dropzone": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-file-preview": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-preview/-/uui-file-preview-1.7.0.tgz",
-      "integrity": "sha512-QJg36PvN5LIHcl+fmcuhMFrkrTc5FDuj5L9DRStB/8V//HMhOKwjhOPcmc6xsxXm26R+jnS/7R67r/9PyjjhsQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-symbol-file": "1.7.0",
-        "@umbraco-ui/uui-symbol-file-thumbnail": "1.7.0",
-        "@umbraco-ui/uui-symbol-folder": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-form": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form/-/uui-form-1.7.0.tgz",
-      "integrity": "sha512-gHNCYq/kwa7hXLHLKGBYrub8jTJHup7hf+mBf3g1LjipS+8M2a9tdpoO8yWzyEauzFsS4YJo45XqN6SRC1f2MQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-form-layout-item": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-layout-item/-/uui-form-layout-item-1.7.0.tgz",
-      "integrity": "sha512-gorUH9jCcCPdlDUy41xD6+4PQyZEL+9H3rnnKGg4xGQRw1+RnLCgmGa7mYiLfj1ycgi8l7MU50zCsQyNvPAPgg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-form-validation-message": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-form-validation-message": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-validation-message/-/uui-form-validation-message-1.7.0.tgz",
-      "integrity": "sha512-CU2ykzuIA3153EYKkRsqZ0SuGDxoy1zrdYVczWZ+sVxggyIWwazLMm5EZvdoiF8s3iP0m/v2LyyUh9GkBZ66LA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-icon": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon/-/uui-icon-1.7.0.tgz",
-      "integrity": "sha512-PtOSZkTxWskRrppdhxf17D+d54OylvtjE7muyLb2eJEYoP7KEaWdJ8Lfei5LtaUCRJlstFwQrCh/QbtWhe8Dfw==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-icon-registry": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry/-/uui-icon-registry-1.7.0.tgz",
-      "integrity": "sha512-hG3VlF5VLt2XaNYHRUdqs2m5F4s9FUS4WxMc/TRu9Dzhqtie3A7UZ23qtONAcTCSPUxEXW5t809JUyxFi8kpBg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-icon": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-icon-registry-essential": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry-essential/-/uui-icon-registry-essential-1.7.0.tgz",
-      "integrity": "sha512-zgNKwT5L8Ez1R9WUO+vFRPbaUHHoSc6ohOfLA790WCA+F2krzbc7z3hNk6fHkFTR73K4rCaMu6gRbDX/PvuD8w==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-icon-registry": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-input": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input/-/uui-input-1.7.0.tgz",
-      "integrity": "sha512-c99s0hoggDTWFb3cq0uVcZcHCmstK82tVFJ4yPpaTMjJsilVCg9JnXE1B4tHvT25ZyAvN/pjJ/SYvLmKtU/MZA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-input-file": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-file/-/uui-input-file-1.7.1.tgz",
-      "integrity": "sha512-bzakMaaE1iSR7ioIzp2TGoBbwmBM+k712+0x+sK2dnQswRlLHL/Y95e7Byp/Aq6fNPayIwP6FaotB72JADDTig==",
-      "dependencies": {
-        "@umbraco-ui/uui-action-bar": "1.7.0",
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-button": "1.7.1",
-        "@umbraco-ui/uui-file-dropzone": "1.7.0",
-        "@umbraco-ui/uui-icon": "1.7.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-input-lock": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-lock/-/uui-input-lock-1.7.1.tgz",
-      "integrity": "sha512-kfHYiX9844/yE2yIwgk/e73BXiFYi5qn/aCJiy9T3lO6DEFaaHOJUccMyWsNIvSiPHYRX/11Mm0sP30jotjgGQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-button": "1.7.1",
-        "@umbraco-ui/uui-icon": "1.7.0",
-        "@umbraco-ui/uui-input": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-input-password": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-password/-/uui-input-password-1.7.0.tgz",
-      "integrity": "sha512-IU7/obNqFaHfuAyga8/wXC26+nqUEaovw67SeA83+2VUSyE7FeNTwW+AV7WFU7ZxeMYUvdJyxIpY43fClFg97A==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.7.0",
-        "@umbraco-ui/uui-input": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-keyboard-shortcut": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-keyboard-shortcut/-/uui-keyboard-shortcut-1.7.0.tgz",
-      "integrity": "sha512-PJmHNDCTiif89zkLUbBCdlnjY87TkqDfYQVjmhNwaO0DPxpQDh8gG2TvwD3Wp+aqdoVjR8FPIQH5pst+ulBa4g==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-label": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-label/-/uui-label-1.7.0.tgz",
-      "integrity": "sha512-uk1m3wux4dNb/0AqSGslODLo6yVT9aXKBYcHTsvW2P0NQI8IImiJVWw9TWmNrfuBPACJhEqo3pVvfe/PCfsWzQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-loader": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader/-/uui-loader-1.7.0.tgz",
-      "integrity": "sha512-RKKThaEF1jqG+iU/vwH91QfXxaRvO10hABEReUj6IJYiU0sVCHxmZJczXnJFZKbl5pyEycOznV//b66J5kUddw==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-loader-bar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-bar/-/uui-loader-bar-1.7.0.tgz",
-      "integrity": "sha512-9lDRavgADrcQss5mbdmBrorzgSFNBr4srDA3B6PCya9pFpGdu/NgvQr/SrQzU0U2YSeW4jB88pyHwZaI6PCYug==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-loader-circle": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-circle/-/uui-loader-circle-1.7.0.tgz",
-      "integrity": "sha512-7/FqKCntviNUS8yzKhw4lYCWj598gYbzxBRvGJxVPinMOfAgMa8MAOGKpi7VDFHsqfHASfDCzHkqdywq0ku3nQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-menu-item": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-menu-item/-/uui-menu-item-1.7.0.tgz",
-      "integrity": "sha512-RTsrBmD1zjcP7XGPIGsxfBfOH+u4k3Jtw1qy/bxD1XLNH3ggOtfpQrpMzn/kxaer/wxYrUnXoDZDRjRuhHwvbg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-loader-bar": "1.7.0",
-        "@umbraco-ui/uui-symbol-expand": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-modal": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-modal/-/uui-modal-1.7.0.tgz",
-      "integrity": "sha512-/XTu5kbPAgkbMrm1MISz+hvvEh3d2guBl7bs5EhiLBsq4XqnaDQwh15joS4wub5R2lfaodvJg7Or2VvFV+v5ug==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-pagination": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-pagination/-/uui-pagination-1.7.1.tgz",
-      "integrity": "sha512-T6oomUkqf6xFc4ZMGX4YHmeBDBLwSfkTz/9sksqTpFpiK86XGJMQ0yOfPhlWNZ9TrC4OJZDurZ/jnY1l97OxcQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-button": "1.7.1",
-        "@umbraco-ui/uui-button-group": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-popover": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover/-/uui-popover-1.7.0.tgz",
-      "integrity": "sha512-aGG2AOXWfiRSo+0HAZkmZkWCXZTWyBB6mQ7+1XVcSHubsGLTimc6jcs+9y8c/OgMlFlm+YhDmp0bVSdmUKmYIg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-popover-container": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover-container/-/uui-popover-container-1.7.0.tgz",
-      "integrity": "sha512-az2Em1ZKaBLbPBKS3SePeCh6dk4NpdqsM+uRC5DFDLc95oAciKnC/gSjjZf1VtlL+hjb907R+nDQmszC9K7qfA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-progress-bar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-progress-bar/-/uui-progress-bar-1.7.0.tgz",
-      "integrity": "sha512-LjoK+DbO6BcNBJXr6ZKUHTfXPf4ZeChCVDEf1YfsiyLGxoKgt605YqJ8t8OWLInlO3m1rZmB7f0Uxc58nnPjxg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-radio": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-radio/-/uui-radio-1.7.0.tgz",
-      "integrity": "sha512-dNuBdHKNVJUaeemA87uCNTBIeN6S+dLdgxGI2ayQNzA/71EDSdBlIMrdm8FTJ0H8Un/itvgaujhu7EHbckai3w==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-range-slider": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-range-slider/-/uui-range-slider-1.7.0.tgz",
-      "integrity": "sha512-3LV9H0HciGSMEpX1I7zSzmPssGvF+C907bl8hWnlmaVVKGirBjrKPHmeZQW/zpqRCtvDWipFYKOcgbKQzCA2Vw==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-ref": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref/-/uui-ref-1.7.0.tgz",
-      "integrity": "sha512-/llhIEmVoJ4gb3LmOH1cfJ5zOSJry7TfJTxzruUpCxi+O68zMscgRZr+eh9DdF+Lz7zMbRxlubbVOZ58HhEPmQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-ref-list": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-list/-/uui-ref-list-1.7.0.tgz",
-      "integrity": "sha512-BEb878VsSmRJuq1FCtoS9ryBvUErUfK8bQy93ErwgmesdUcuYpBJK1PfSe4x7SiLjD1vDlH9GHaWLyFiSJKfIQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-ref-node": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node/-/uui-ref-node-1.7.0.tgz",
-      "integrity": "sha512-yqTS6B3uA0e8g29+nqbUnyPncyRdeYGNR4mjA4gdL4iwPumBvC49tPoWds8Nq0lEyxJg9fLNMezokPOMs2fKvw==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-icon": "1.7.0",
-        "@umbraco-ui/uui-ref": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-ref-node-data-type": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-data-type/-/uui-ref-node-data-type-1.7.0.tgz",
-      "integrity": "sha512-TmnpFGaG1QqUqvwlmXlXzpPZ+tCigqCxv4VVOYA9XwfUeqwoWmziQJ1jJyqdxSrHxRYkgg9Or8ZqObpKZ0HrCg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-ref-node": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-ref-node-document-type": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-document-type/-/uui-ref-node-document-type-1.7.0.tgz",
-      "integrity": "sha512-KiZWbggePxAmHWr31yJzWOrA4DLGMbw8goMSC49zinBX4X2FOqgOTG8dl4dCXMxN114wxcTDRFvdTcWpIOHeEQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-ref-node": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-ref-node-form": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-form/-/uui-ref-node-form-1.7.0.tgz",
-      "integrity": "sha512-FUZA7jjWOOA8HILRhD30mKO6NX0Hv+wL61gfIbWt95iGsmPwknth550Dm+i1Cc/3L63QmZD0qBQRTKRl7zfynA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-ref-node": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-ref-node-member": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-member/-/uui-ref-node-member-1.7.0.tgz",
-      "integrity": "sha512-PFXZzlPmJaNLrvCO3p9n5ViIBXfr7nJtm+3WphuUM6KiJMMa0Fv7au1CINv6abu+TzjBh6VcmoNdt8Hu2MfS7g==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-ref-node": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-ref-node-package": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-package/-/uui-ref-node-package-1.7.0.tgz",
-      "integrity": "sha512-OVvo+YDs0a3jqtm09XwaZdRNFwmDnSIBCTAllG+fLRbYQfwF0pCp96WOmuwQfGjlXhPrIjbhJ6YJH7R8QRUzbw==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-ref-node": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-ref-node-user": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-user/-/uui-ref-node-user-1.7.0.tgz",
-      "integrity": "sha512-Z2qF53n9O7Ft/xgexY/lzUd8xeFusCLSnz7hkqfWgTIbSvdI9FXtMiqCWqD1nWmijIPYBKaqujBfibGtx1DcSg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-ref-node": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-scroll-container": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-scroll-container/-/uui-scroll-container-1.7.0.tgz",
-      "integrity": "sha512-W4rETai/KAyXkDRUn6h14S6PLigswzkE45ufHAc7K2QZGUgXikpntbE8UpsEfq1QdMQRTHDmjorGn2qT+C6ULA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-select": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-select/-/uui-select-1.7.0.tgz",
-      "integrity": "sha512-pkPWTciiL9hPXpDO26wkkZFLze+jgL/xZkGgtrULrMRS5mJ6gan+8bB14iGtPt/ekFdgDmt6YcKozjp8g15xGg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-slider": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-slider/-/uui-slider-1.7.0.tgz",
-      "integrity": "sha512-kP93yvwsvRUEyS4+PhkhwXpkWZUm77sKerB6Dte0Z579WMQclSAivy6va9kkj5zKxZYPcRbJ3H498FvfhxhMkw==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-symbol-expand": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-expand/-/uui-symbol-expand-1.7.0.tgz",
-      "integrity": "sha512-Z9bv8uYU2+tQ3UoJM2Ymdpmey73bLBNuaIKJG1AOXi1c2CB1UHaIn0C0Cvj4eHLoIEVp29UZOpQM7ri3/zb7lg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-symbol-file": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file/-/uui-symbol-file-1.7.0.tgz",
-      "integrity": "sha512-m/vx7WnCbYw0cNqS7TM6JeS7S/AMEQlnVUOWa2w2GDIuKNy6Jb1bk0soW1B3Fi6Hc6Pq+pMeaKgVPIM5F7F4Cg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-symbol-file-dropzone": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-dropzone/-/uui-symbol-file-dropzone-1.7.0.tgz",
-      "integrity": "sha512-lyhROAhwbmgK24DerwTiP5iP8GeOiAcgbgkUfHhG8X6hWMx9nV3H1nJHil5jFAeXk9nbAzDw4UfUgQWeKePLTg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-symbol-file-thumbnail": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-thumbnail/-/uui-symbol-file-thumbnail-1.7.0.tgz",
-      "integrity": "sha512-ZyS82vIqgqpPTx1atPaN+bw+Wr5e2lY2G9dpjTVx15PZtlI2Hp9aouiWyDRuCai8cc9Cj7n+7wF/K8QC7J8uCw==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-symbol-folder": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-folder/-/uui-symbol-folder-1.7.0.tgz",
-      "integrity": "sha512-0EgbdXHY/aKniF0GZV6q64BWBsHK/dmar2hRNa/CpXHOGr04caY2svs44adWo4AOdGbPy9ayIglEzwSBRV+vXA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-symbol-lock": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-lock/-/uui-symbol-lock-1.7.0.tgz",
-      "integrity": "sha512-w+f3jvnVhkETiT3NERIsHJrYDZJC5zfihtW/KRE7isJflF8vrnEyUylv5ZJEih2kj0qCphoCswfMNQjwZbmMFQ==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-symbol-more": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-more/-/uui-symbol-more-1.7.0.tgz",
-      "integrity": "sha512-mYG0BKW3F8quwsBRck3mhINDJrl+bmfTzQsQRBjjCtP/BuIlqb2JSZDn0KBK1Jj7gl2MJINgZSzsL89zjyRVHg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-symbol-sort": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-sort/-/uui-symbol-sort-1.7.0.tgz",
-      "integrity": "sha512-gE8KNPAKZbUkAf+ZYLWe0zK4TC914sNfoCZJY4v8aEJ8xkZ/mYXJ7FxVvE+gvYuZ033VqrO5Ko5AwWEXfw1iIA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-table": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-table/-/uui-table-1.7.0.tgz",
-      "integrity": "sha512-9t9vdWOQ0NKg6aHTWqoIfAEK0M/DDrGkcn96FGvxxbPd+qkta4XDYCMEfOfMjGnGz+lukWoACectczEHXuI6gA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-tabs": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tabs/-/uui-tabs-1.7.1.tgz",
-      "integrity": "sha512-HYX5abtHKEse8UC17bUJM0LV4Kt0MNVIV4I2PtOOMIbLFx8kIVL/bdi/IO5T8VzYtecLQI8dgELc0Y2wgRSvNA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-button": "1.7.1",
-        "@umbraco-ui/uui-popover-container": "1.7.0",
-        "@umbraco-ui/uui-symbol-more": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-tag": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tag/-/uui-tag-1.7.0.tgz",
-      "integrity": "sha512-twrXe2U733r92ubBGXxWV9F5QP7SCJhKwYZbC2jbFOGoHpcxCtELvy36vEvgoWUF2BorPLQZSci7RHO0Hbnasw==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-textarea": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-textarea/-/uui-textarea-1.7.0.tgz",
-      "integrity": "sha512-rMqd4h5U/hW/wRacbr6D7/MoK8gqgiLh341Q+CFTEAnWdXNvRakHe4DNspguDIYCPUTjjRshTJowj9ZdbxHO7w==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-toast-notification": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification/-/uui-toast-notification-1.7.1.tgz",
-      "integrity": "sha512-SDAW0oYyboC5GvKg6GP0ZbNkr2C1qkVxSsO3gSAxI9+aUUbYuc3SijudyGCuESzdNshTbmya5OpUC3mnd5zdGA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-button": "1.7.1",
-        "@umbraco-ui/uui-css": "1.7.0",
-        "@umbraco-ui/uui-icon": "1.7.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-toast-notification-container": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-container/-/uui-toast-notification-container-1.7.1.tgz",
-      "integrity": "sha512-m/B0XqBjAfEe30y2gHKJNbPxijF17zTU0VXb0sxTVa+1pb+eOtIMXVB6+DaYsr0TcsqPnq09kQruVEmvO8uWkg==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-toast-notification": "1.7.1"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-toast-notification-layout": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-layout/-/uui-toast-notification-layout-1.7.0.tgz",
-      "integrity": "sha512-5edQz3E84q3dKCvqFhZoMYY8258m9rPXak6gnqtZyGhAzwx8qZ8r9TDTcXftBnW+EB7Th9DheCUZLrphs35ZlA==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-css": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-toggle": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toggle/-/uui-toggle-1.7.0.tgz",
-      "integrity": "sha512-1Rz7CyBy38IF926maF1fyNjLG/my/4oWQRl0/22h/Xr6SYj/wWNE/1u4rg2bW1HGSu9mNtiel4wd7tDJ4g30Ew==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0",
-        "@umbraco-ui/uui-boolean-input": "1.7.0"
-      }
-    },
-    "node_modules/@umbraco-ui/uui-visually-hidden": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-visually-hidden/-/uui-visually-hidden-1.7.0.tgz",
-      "integrity": "sha512-yPa1Z4S+ItjS+i9xgIobZ5QxfUyLRLguzqX8VARgCCxyoh5yXkoABhI9Fb0siSwc9TOtKuRaB+qQoV5rLnpu/g==",
-      "dependencies": {
-        "@umbraco-ui/uui-base": "1.7.0"
-      }
-    },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
-    },
-    "node_modules/abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "dev": true
-    },
-    "node_modules/abort-controller": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "dependencies": {
-        "event-target-shim": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6.5"
-      }
-    },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
-      "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/ace-builds": {
-      "version": "1.31.1",
-      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.31.1.tgz",
-      "integrity": "sha512-3DnE5bZF6Ji+l4F5acoLk+rV7mxrUt1C4r61Xy9owp5rVM4lj5NL8GJfoX6Jnnbhx6kKV7Vdpb+Tco+0ORTvhg=="
-    },
-    "node_modules/acorn": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
-      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.2"
-      }
-    },
-    "node_modules/angular": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular/-/angular-1.8.3.tgz",
-      "integrity": "sha512-5qjkWIQQVsHj4Sb5TcEs4WZWpFeVFHXwxEBHUhrny41D8UrBAd6T/6nPPAsLngJCReIOqi95W3mxdveveutpZw==",
-      "deprecated": "For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward."
-    },
-    "node_modules/angular-animate": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.8.3.tgz",
-      "integrity": "sha512-/LtTKvy5sD6MZbV0v+nHgOIpnFF0mrUp+j5WIxVprVhcrJriYpuCZf4S7Owj1o76De/J0eRzANUozNJ6hVepnQ==",
-      "deprecated": "For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward."
-    },
-    "node_modules/angular-aria": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-aria/-/angular-aria-1.8.3.tgz",
-      "integrity": "sha512-qTXclmTW/KGw5JNKKQPcCKKq6hCBZ39jYINmLgMsjUHBAoxULaMRRTaRj/L2VTOjKvK5f9enkx+EUqRqzXDSFQ==",
-      "deprecated": "For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward."
-    },
-    "node_modules/angular-chart.js": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/angular-chart.js/-/angular-chart.js-1.1.1.tgz",
-      "integrity": "sha512-6lqkeQvoEOMqtIzHLeOC68fdeqjdgeQ4b3bUG3Lm6X1Y6IBM0m91G6VuVA3EV0puwPuIWz4VYkzjd0DPHhIcpA==",
-      "dependencies": {
-        "angular": "1.x",
-        "chart.js": "2.3.x"
-      }
-    },
-    "node_modules/angular-chart.js/node_modules/chart.js": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.3.0.tgz",
-      "integrity": "sha512-LwJ6j1FNneojxFYewnz9QDQyjV++KN2s/Lgm0eipDUaKV3Fj5jOA3xtJg7AUGFcbhsYB4+Kn16c1bXwRxbOXow==",
-      "dependencies": {
-        "chartjs-color": "^2.0.0",
-        "moment": "^2.10.6"
-      }
-    },
-    "node_modules/angular-cookies": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.8.3.tgz",
-      "integrity": "sha512-uRd+zWgqiVnly7+YFRosM8E9tUQeY82dAZdtvonh/CeD/sf5SKN/BNIlMlHxZtoAk72ahTIjqUQGfeHdYcSsRQ==",
-      "deprecated": "For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward."
-    },
-    "node_modules/angular-dynamic-locale": {
-      "version": "0.1.38",
-      "resolved": "https://registry.npmjs.org/angular-dynamic-locale/-/angular-dynamic-locale-0.1.38.tgz",
-      "integrity": "sha512-O+bWvCNkIhnedBCYPUgYzVrzXlaYwN8Ke4XpoXoGDu4zIyWNdaFAzMWsuB+dnOD7pKrp8pVkk+ShPSGVnj/3uQ==",
-      "dependencies": {
-        "@types/angular": "^1.8.4"
-      }
-    },
-    "node_modules/angular-i18n": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-i18n/-/angular-i18n-1.8.3.tgz",
-      "integrity": "sha512-TWJXIRsq7Qkgyms5dHIgG3s2swn2YKGwJzrIC8u59P9BWV3+gorNhgXCR6nqutApldz7jGBmTNjMgpnF32CIVg==",
-      "deprecated": "For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward."
-    },
-    "node_modules/angular-local-storage": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/angular-local-storage/-/angular-local-storage-0.7.1.tgz",
-      "integrity": "sha1-+9JzB2PCn6mvVyXgGGx4BiHozdI="
-    },
-    "node_modules/angular-messages": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-messages/-/angular-messages-1.8.3.tgz",
-      "integrity": "sha512-f/ywtg32lqzX8FnXkBJOyn13lbCbo333/xy/5TTFcsH/gZdXoiuERj+dLTOs8xHCkOeFQhFx0VD0DgtMgSag7A=="
-    },
-    "node_modules/angular-mocks": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.8.3.tgz",
-      "integrity": "sha512-vqsT6zwu80cZ8RY7qRQBZuy6Fq5X7/N5hkV9LzNT0c8b546rw4ErGK6muW1u2JnDKYa7+jJuaGM702bWir4HGw=="
-    },
-    "node_modules/angular-route": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-route/-/angular-route-1.8.3.tgz",
-      "integrity": "sha512-kpIcRmDR2+o1FxDVVYy8Rvfab86/7LDbOgTRb9T+X9ewPQiBRuDEnZtM3oJYBiQLvAXDYTJXHV48n/bGE9Mv2g==",
-      "deprecated": "For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward."
-    },
-    "node_modules/angular-sanitize": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.8.3.tgz",
-      "integrity": "sha512-2rxdqzlUVafUeWOwvY/FtyWk1pFTyCtzreeiTytG9m4smpuAEKaIJAjYeVwWsoV+nlTOcgpwV4W1OCmR+BQbUg==",
-      "deprecated": "For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward."
-    },
-    "node_modules/angular-touch": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-touch/-/angular-touch-1.8.3.tgz",
-      "integrity": "sha512-QFLhJl5K7AsMBgK87Mxx/XtBYiFl2lBnjgGNCjGyAh5gM8eHsBWgaOxZsovP6qZSljG4wIA9dA9NPkXXtbo/WQ==",
-      "deprecated": "For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward."
-    },
-    "node_modules/angular-ui-sortable": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/angular-ui-sortable/-/angular-ui-sortable-0.19.0.tgz",
-      "integrity": "sha512-u/uc981Nzg4XN1bMU9qKleMTSt7F1XjMWnyGw6gxPLIeQeLZm8jWNy7tj8y2r2HmvzXFbQVq2z6rObznFKAekQ==",
-      "dependencies": {
-        "angular": ">=1.2.x",
-        "jquery": ">=3.1.x",
-        "jquery-ui-dist": ">=1.12.x"
-      }
-    },
-    "node_modules/animejs": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/animejs/-/animejs-3.2.1.tgz",
-      "integrity": "sha512-sWno3ugFryK5nhiDm/2BKeFCpZv7vzerWUcUPyAZLDhMek3+S/p418ldZJbJXo5ZUOpfm2kP2XRO4NJcULMy9A=="
-    },
-    "node_modules/ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-cyan": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
-      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-gray": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-red": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
-      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-wrap": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/append-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
-      "dev": true,
-      "dependencies": {
-        "buffer-equal": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arch": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
-      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "optional": true
-    },
-    "node_modules/archive-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz",
-      "integrity": "sha1-+S5yIzBW38aWlHJ0nCZ72wRrHXA=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "file-type": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/archive-type/node_modules/file-type": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
-      "integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-      "dev": true
-    },
-    "node_modules/argh": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/argh/-/argh-0.1.4.tgz",
-      "integrity": "sha1-PrTWEpc/xrbcbvM49W91nyrFw6Y=",
-      "dev": true
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-filter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
-      "dev": true,
-      "dependencies": {
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
-      "dev": true,
-      "dependencies": {
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-differ": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-initial": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
-      "dev": true,
-      "dependencies": {
-        "array-slice": "^1.0.0",
-        "is-number": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-initial/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-last": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-last/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-slice": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-sort": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
-      "dev": true,
-      "dependencies": {
-        "default-compare": "^1.0.0",
-        "get-value": "^2.0.6",
-        "kind-of": "^5.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/async": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.14"
-      }
-    },
-    "node_modules/async-done": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.2",
-        "process-nextick-args": "^2.0.0",
-        "stream-exhaust": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
-    },
-    "node_modules/async-settle": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
-      "dev": true,
-      "dependencies": {
-        "async-done": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
-    },
-    "node_modules/atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true,
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
-    "node_modules/autoprefixer": {
-      "version": "10.4.16",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz",
-      "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "browserslist": "^4.21.10",
-        "caniuse-lite": "^1.0.30001538",
-        "fraction.js": "^4.3.6",
-        "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "semver": "^6.1.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "core-js-compat": "^3.25.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/bach": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
-      "dev": true,
-      "dependencies": {
-        "arr-filter": "^1.1.1",
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "array-each": "^1.0.0",
-        "array-initial": "^1.0.0",
-        "array-last": "^1.1.1",
-        "async-done": "^1.2.2",
-        "async-settle": "^1.0.0",
-        "now-and-later": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "dependencies": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/base64id": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
-      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
-      "dev": true,
-      "engines": {
-        "node": "^4.5.0 || >= 5.9"
-      }
-    },
-    "node_modules/beeper": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/bin-build": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bin-build/-/bin-build-3.0.0.tgz",
-      "integrity": "sha512-jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "decompress": "^4.0.0",
-        "download": "^6.2.2",
-        "execa": "^0.7.0",
-        "p-map-series": "^1.0.0",
-        "tempfile": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-build/node_modules/cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "lru-cache": "^4.0.1",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
-    "node_modules/bin-build/node_modules/execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "cross-spawn": "^5.0.1",
-        "get-stream": "^3.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-build/node_modules/get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-check": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz",
-      "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "execa": "^0.7.0",
-        "executable": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-check/node_modules/cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "lru-cache": "^4.0.1",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
-    "node_modules/bin-check/node_modules/execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "cross-spawn": "^5.0.1",
-        "get-stream": "^3.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-check/node_modules/get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-version": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-3.1.0.tgz",
-      "integrity": "sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "execa": "^1.0.0",
-        "find-versions": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/bin-version-check": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-4.0.0.tgz",
-      "integrity": "sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "bin-version": "^3.0.0",
-        "semver": "^5.6.0",
-        "semver-truncate": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/bin-wrapper": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-4.1.0.tgz",
-      "integrity": "sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "bin-check": "^4.1.0",
-        "bin-version-check": "^4.0.0",
-        "download": "^7.1.0",
-        "import-lazy": "^3.1.0",
-        "os-filter-obj": "^2.0.0",
-        "pify": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/bin-wrapper/node_modules/download": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz",
-      "integrity": "sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "archive-type": "^4.0.0",
-        "caw": "^2.0.1",
-        "content-disposition": "^0.5.2",
-        "decompress": "^4.2.0",
-        "ext-name": "^5.0.0",
-        "file-type": "^8.1.0",
-        "filenamify": "^2.0.0",
-        "get-stream": "^3.0.0",
-        "got": "^8.3.1",
-        "make-dir": "^1.2.0",
-        "p-event": "^2.1.0",
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/bin-wrapper/node_modules/download/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-wrapper/node_modules/file-type": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz",
-      "integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/bin-wrapper/node_modules/get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-wrapper/node_modules/got": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
-      "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "@sindresorhus/is": "^0.7.0",
-        "cacheable-request": "^2.1.1",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^3.0.0",
-        "into-stream": "^3.1.0",
-        "is-retry-allowed": "^1.1.0",
-        "isurl": "^1.0.0-alpha5",
-        "lowercase-keys": "^1.0.0",
-        "mimic-response": "^1.0.0",
-        "p-cancelable": "^0.4.0",
-        "p-timeout": "^2.0.1",
-        "pify": "^3.0.0",
-        "safe-buffer": "^5.1.1",
-        "timed-out": "^4.0.1",
-        "url-parse-lax": "^3.0.0",
-        "url-to-options": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-wrapper/node_modules/got/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-wrapper/node_modules/make-dir": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-wrapper/node_modules/make-dir/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-wrapper/node_modules/p-cancelable": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
-      "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-wrapper/node_modules/p-event": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz",
-      "integrity": "sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "p-timeout": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/bin-wrapper/node_modules/p-timeout": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
-      "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "p-finally": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-wrapper/node_modules/prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/bin-wrapper/node_modules/url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "prepend-http": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "node_modules/bl": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
-      "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "readable-stream": "^2.3.5",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "node_modules/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-      "dev": true
-    },
-    "node_modules/bootstrap": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
-      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/bootstrap-social": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/bootstrap-social/-/bootstrap-social-5.1.1.tgz",
-      "integrity": "sha1-dTDGeK31bPj60/qCwp1NPl0CdQE=",
-      "dependencies": {
-        "bootstrap": "~3",
-        "font-awesome": "~4.7"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
-      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001541",
-        "electron-to-chromium": "^1.4.535",
-        "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.13"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "optional": true,
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/buffer-alloc": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "buffer-alloc-unsafe": "^1.1.0",
-        "buffer-fill": "^1.0.0"
-      }
-    },
-    "node_modules/buffer-alloc-unsafe": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/buffer-fill": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "node_modules/bufferstreams": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz",
-      "integrity": "sha1-z7GtlWjTujz+k1upq92VLeiKqyo=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^1.0.33"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/bufferstreams/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/bufferstreams/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/bufferstreams/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "dependencies": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cacheable-request": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
-      "integrity": "sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "clone-response": "1.0.2",
-        "get-stream": "3.0.0",
-        "http-cache-semantics": "3.8.1",
-        "keyv": "3.0.0",
-        "lowercase-keys": "1.0.0",
-        "normalize-url": "2.0.1",
-        "responselike": "1.0.2"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/lowercase-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-      "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/normalize-url": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
-      "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "prepend-http": "^2.0.0",
-        "query-string": "^5.0.1",
-        "sort-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/sort-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
-      "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-plain-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001550",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001550.tgz",
-      "integrity": "sha512-p82WjBYIypO0ukTsd/FG3Xxs+4tFeaY9pfT4amQL8KWtYH7H9nYwReGAbMTJ0hsmRO8IfDtsS6p3ZWj8+1c2RQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ]
-    },
-    "node_modules/caw": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
-      "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "get-proxy": "^2.0.0",
-        "isurl": "^1.0.0-alpha5",
-        "tunnel-agent": "^0.6.0",
-        "url-to-options": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chart.js": {
-      "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz",
-      "integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==",
-      "dependencies": {
-        "chartjs-color": "^2.1.0",
-        "moment": "^2.10.2"
-      }
-    },
-    "node_modules/chartjs-color": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz",
-      "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==",
-      "dependencies": {
-        "chartjs-color-string": "^0.6.0",
-        "color-convert": "^1.9.3"
-      }
-    },
-    "node_modules/chartjs-color-string": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
-      "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
-      "dependencies": {
-        "color-name": "^1.0.0"
-      }
-    },
-    "node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clean-css": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
-      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "~0.6.0"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/clean-css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cli-color": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-1.4.0.tgz",
-      "integrity": "sha512-xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.1.1",
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "memoizee": "^0.4.14",
-        "timers-ext": "^0.1.5"
-      }
-    },
-    "node_modules/clipboard": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
-      "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
-      "dependencies": {
-        "good-listener": "^1.2.2",
-        "select": "^1.1.2",
-        "tiny-emitter": "^2.0.0"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
-      }
-    },
-    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cliui/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "node_modules/clone-stats": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-      "dev": true
-    },
-    "node_modules/cloneable-readable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^2.0.0",
-        "readable-stream": "^2.3.5"
-      }
-    },
-    "node_modules/coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/collection-map": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-      "dev": true,
-      "dependencies": {
-        "arr-map": "^2.0.2",
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "dependencies": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/color": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
-      "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.2"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-convert/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/color-string": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz",
-      "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "node_modules/color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true,
-      "bin": {
-        "color-support": "bin.js"
-      }
-    },
-    "node_modules/colord": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
-    },
-    "node_modules/colornames": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz",
-      "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=",
-      "dev": true
-    },
-    "node_modules/colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.1.90"
-      }
-    },
-    "node_modules/colorspace": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz",
-      "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==",
-      "dev": true,
-      "dependencies": {
-        "color": "3.0.x",
-        "text-hex": "1.0.x"
-      }
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/concat-with-sourcemaps": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
-      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/concat-with-sourcemaps/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/config-chain": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
-      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "ini": "^1.3.4",
-        "proto-list": "~1.2.1"
-      }
-    },
-    "node_modules/connect": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/connect/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/connect/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/console-stream": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz",
-      "integrity": "sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/consolidate": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "safe-buffer": "5.1.2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/copy-anything": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
-      "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
-      "dev": true,
-      "dependencies": {
-        "is-what": "^3.14.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
-      }
-    },
-    "node_modules/copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/copy-props": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
-      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
-      "dev": true,
-      "dependencies": {
-        "each-props": "^1.3.2",
-        "is-plain-object": "^5.0.0"
-      }
-    },
-    "node_modules/core-js-compat": {
-      "version": "3.33.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz",
-      "integrity": "sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.22.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "node_modules/cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4",
-        "vary": "^1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/css": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.6.0"
-      }
-    },
-    "node_modules/css-declaration-sorter": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz",
-      "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.9"
-      }
-    },
-    "node_modules/css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/css-select/node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/css-select/node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "optional": true
-    },
-    "node_modules/css-select/node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/css-select/node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/css-select/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "optional": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/css-tree/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/css/node_modules/source-map-resolve": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0"
-      }
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cssnano": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.1.tgz",
-      "integrity": "sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-preset-default": "^6.0.1",
-        "lilconfig": "^2.1.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/cssnano"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/cssnano-preset-default": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz",
-      "integrity": "sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ==",
-      "dev": true,
-      "dependencies": {
-        "css-declaration-sorter": "^6.3.1",
-        "cssnano-utils": "^4.0.0",
-        "postcss-calc": "^9.0.0",
-        "postcss-colormin": "^6.0.0",
-        "postcss-convert-values": "^6.0.0",
-        "postcss-discard-comments": "^6.0.0",
-        "postcss-discard-duplicates": "^6.0.0",
-        "postcss-discard-empty": "^6.0.0",
-        "postcss-discard-overridden": "^6.0.0",
-        "postcss-merge-longhand": "^6.0.0",
-        "postcss-merge-rules": "^6.0.1",
-        "postcss-minify-font-values": "^6.0.0",
-        "postcss-minify-gradients": "^6.0.0",
-        "postcss-minify-params": "^6.0.0",
-        "postcss-minify-selectors": "^6.0.0",
-        "postcss-normalize-charset": "^6.0.0",
-        "postcss-normalize-display-values": "^6.0.0",
-        "postcss-normalize-positions": "^6.0.0",
-        "postcss-normalize-repeat-style": "^6.0.0",
-        "postcss-normalize-string": "^6.0.0",
-        "postcss-normalize-timing-functions": "^6.0.0",
-        "postcss-normalize-unicode": "^6.0.0",
-        "postcss-normalize-url": "^6.0.0",
-        "postcss-normalize-whitespace": "^6.0.0",
-        "postcss-ordered-values": "^6.0.0",
-        "postcss-reduce-initial": "^6.0.0",
-        "postcss-reduce-transforms": "^6.0.0",
-        "postcss-svgo": "^6.0.0",
-        "postcss-unique-selectors": "^6.0.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/cssnano-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.0.tgz",
-      "integrity": "sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw==",
-      "dev": true,
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "css-tree": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/csso/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cssstyle": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
-      "integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==",
-      "dev": true,
-      "dependencies": {
-        "rrweb-cssom": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "array-find-index": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/custom-event": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
-      "dev": true
-    },
-    "node_modules/d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
-      "dependencies": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "node_modules/data-urls": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
-      "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^12.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/date-format": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz",
-      "integrity": "sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/dateformat": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/debug-fabulous": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
-      "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "3.X",
-        "memoizee": "0.4.X",
-        "object-assign": "4.X"
-      }
-    },
-    "node_modules/debug-fabulous/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decimal.js": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-      "dev": true
-    },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/decompress": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz",
-      "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "decompress-tar": "^4.0.0",
-        "decompress-tarbz2": "^4.0.0",
-        "decompress-targz": "^4.0.0",
-        "decompress-unzip": "^4.0.1",
-        "graceful-fs": "^4.1.10",
-        "make-dir": "^1.0.0",
-        "pify": "^2.3.0",
-        "strip-dirs": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/decompress-tar": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
-      "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "file-type": "^5.2.0",
-        "is-stream": "^1.1.0",
-        "tar-stream": "^1.5.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/decompress-tar/node_modules/file-type": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
-      "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/decompress-tarbz2": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
-      "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "decompress-tar": "^4.1.0",
-        "file-type": "^6.1.0",
-        "is-stream": "^1.1.0",
-        "seek-bzip": "^1.0.5",
-        "unbzip2-stream": "^1.0.9"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/decompress-tarbz2/node_modules/file-type": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
-      "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/decompress-targz": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
-      "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "decompress-tar": "^4.1.1",
-        "file-type": "^5.2.0",
-        "is-stream": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/decompress-targz/node_modules/file-type": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
-      "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/decompress-unzip": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
-      "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "file-type": "^3.8.0",
-        "get-stream": "^2.2.0",
-        "pify": "^2.3.0",
-        "yauzl": "^2.4.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/decompress-unzip/node_modules/file-type": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
-      "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decompress-unzip/node_modules/get-stream": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
-      "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "object-assign": "^4.0.1",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decompress-unzip/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decompress/node_modules/make-dir": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/decompress/node_modules/make-dir/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/decompress/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/default-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^5.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-resolution": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "dependencies": {
-        "object-keys": "^1.0.12"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/delegate": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
-      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
-    },
-    "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/detect-newline": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/di": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
-      "dev": true
-    },
-    "node_modules/diagnostics": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz",
-      "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==",
-      "dev": true,
-      "dependencies": {
-        "colorspace": "1.1.x",
-        "enabled": "1.0.x",
-        "kuler": "1.0.x"
-      }
-    },
-    "node_modules/diff": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
-      "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/dom-serialize": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
-      "dev": true,
-      "dependencies": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/dom-serializer/node_modules/domelementtype": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/dom-serializer/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "node_modules/domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "dev": true,
-      "dependencies": {
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/download": {
-      "version": "6.2.5",
-      "resolved": "https://registry.npmjs.org/download/-/download-6.2.5.tgz",
-      "integrity": "sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "caw": "^2.0.0",
-        "content-disposition": "^0.5.2",
-        "decompress": "^4.0.0",
-        "ext-name": "^5.0.0",
-        "file-type": "5.2.0",
-        "filenamify": "^2.0.0",
-        "get-stream": "^3.0.0",
-        "got": "^7.0.0",
-        "make-dir": "^1.0.0",
-        "p-event": "^1.0.0",
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/download/node_modules/file-type": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
-      "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/download/node_modules/get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/download/node_modules/make-dir": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/download/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "node_modules/duplexer2/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/duplexer2/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/duplexer2/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/each-props": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.1",
-        "object.defaults": "^1.1.0"
-      }
-    },
-    "node_modules/each-props/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.557",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.557.tgz",
-      "integrity": "sha512-6x0zsxyMXpnMJnHrondrD3SuAeKcwij9S+83j2qHAQPXbGTDDfgImzzwgGlzrIcXbHQ42tkG4qA6U860cImNhw==",
-      "dev": true
-    },
-    "node_modules/emits": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emits/-/emits-3.0.0.tgz",
-      "integrity": "sha1-MnUrupXhcHshlWI4Srm7ix/WL3A=",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/enabled": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
-      "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=",
-      "dev": true,
-      "dependencies": {
-        "env-variable": "0.0.x"
-      }
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/engine.io": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.3.tgz",
-      "integrity": "sha512-IML/R4eG/pUS5w7OfcDE0jKrljWS9nwnEfsxWCIJF5eO6AHo6+Hlv+lQbdlAYsiJPHzUthLm1RUjnBzWOs45cw==",
-      "dev": true,
-      "dependencies": {
-        "@types/cookie": "^0.4.1",
-        "@types/cors": "^2.8.12",
-        "@types/node": ">=10.0.0",
-        "accepts": "~1.3.4",
-        "base64id": "2.0.0",
-        "cookie": "~0.4.1",
-        "cors": "~2.8.5",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.2.1",
-        "ws": "~8.11.0"
-      },
-      "engines": {
-        "node": ">=10.2.0"
-      }
-    },
-    "node_modules/engine.io-parser": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz",
-      "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/engine.io/node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ent": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
-      "dev": true
-    },
-    "node_modules/entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
-    "node_modules/env-variable": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz",
-      "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==",
-      "dev": true
-    },
-    "node_modules/errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "prr": "~1.0.1"
-      },
-      "bin": {
-        "errno": "cli.js"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "dev": true,
-      "dependencies": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      }
-    },
-    "node_modules/es5-ext/node_modules/next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-      "dev": true
-    },
-    "node_modules/es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
-      "dev": true
-    },
-    "node_modules/es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
-      "dependencies": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "node_modules/es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/escodegen": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=4.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/escodegen/node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/escodegen/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
-      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.52.0",
-        "@humanwhocodes/config-array": "^0.11.13",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-scope/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.19.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/eslint/node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-      "dev": true,
-      "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estemplate": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/estemplate/-/estemplate-0.5.1.tgz",
-      "integrity": "sha1-FxSp1GGQc4rJWLyv1J4CnNpWo54=",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^2.7.2",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "node_modules/event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "node_modules/eventsource": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz",
-      "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==",
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/exec-buffer": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz",
-      "integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "execa": "^0.7.0",
-        "p-finally": "^1.0.0",
-        "pify": "^3.0.0",
-        "rimraf": "^2.5.4",
-        "tempfile": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/exec-buffer/node_modules/cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "lru-cache": "^4.0.1",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
-    "node_modules/exec-buffer/node_modules/execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "cross-spawn": "^5.0.1",
-        "get-stream": "^3.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/exec-buffer/node_modules/get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/exec-buffer/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/executable": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
-      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "pify": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/executable/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-range/node_modules/fill-range": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^3.0.0",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-range/node_modules/is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-range/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dev": true,
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-range/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-      "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ext": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
-      "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
-      "dev": true,
-      "dependencies": {
-        "type": "^2.5.0"
-      }
-    },
-    "node_modules/ext-list": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
-      "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "mime-db": "^1.28.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ext-name": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
-      "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "ext-list": "^2.0.0",
-        "sort-keys-length": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ext/node_modules/type": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
-      "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
-      "dev": true
-    },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fancy-log": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-fifo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
-      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-glob/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-glob/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/fast-glob/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/fast-glob/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "node_modules/fast-xml-parser": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz",
-      "integrity": "sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/naturalintelligence"
-        }
-      ],
-      "optional": true,
-      "dependencies": {
-        "strnum": "^1.0.5"
-      },
-      "bin": {
-        "fxparser": "src/cli/cli.js"
-      }
-    },
-    "node_modules/fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
-    },
-    "node_modules/fetch-cookie": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-2.1.0.tgz",
-      "integrity": "sha512-39+cZRbWfbibmj22R2Jy6dmTbAWC+oqun1f1FzQaNurkPDUP4C38jpeZbiXCR88RKRVDp8UcDrbFXkNhN+NjYg==",
-      "dependencies": {
-        "set-cookie-parser": "^2.4.8",
-        "tough-cookie": "^4.0.0"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/file-type": {
-      "version": "12.4.2",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz",
-      "integrity": "sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/filename-reserved-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
-      "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/filenamify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
-      "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "filename-reserved-regex": "^2.0.0",
-        "strip-outer": "^1.0.0",
-        "trim-repeated": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/find-versions": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz",
-      "integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "semver-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/findup-sync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
-      "dev": true,
-      "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fined": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
-        "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fined/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/first-chunk-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
-      "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/flagged-respawn": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flat-cache/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/flatpickr": {
-      "version": "4.6.13",
-      "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.13.tgz",
-      "integrity": "sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw=="
-    },
-    "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
-    },
-    "node_modules/flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.15.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
-      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
-      "engines": {
-        "node": ">=0.10.3"
-      }
-    },
-    "node_modules/for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fork-stream": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
-      "integrity": "sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==",
-      "dev": true
-    },
-    "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/fraction.js": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
-      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://github.com/sponsors/rawify"
-      }
-    },
-    "node_modules/fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "dependencies": {
-        "map-cache": "^0.2.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/fs-extra": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-      "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/fs-mkdirp-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fs-readfile-promise": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-readfile-promise/-/fs-readfile-promise-3.0.1.tgz",
-      "integrity": "sha512-LsSxMeaJdYH27XrW7Dmq0Gx63mioULCRel63B5VeELYLavi1wF5s0XfsIdKDFdCL9hsfQ2qBvXJszQtQJ9h17A==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-      "dev": true
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-proxy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
-      "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "npm-conf": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gifsicle": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-5.3.0.tgz",
-      "integrity": "sha512-FJTpgdj1Ow/FITB7SVza5HlzXa+/lqEY0tHQazAJbuAdvyJtkH4wIdsR2K414oaTwRXHFLLF+tYbipj+OpYg+Q==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "dependencies": {
-        "bin-build": "^3.0.0",
-        "bin-wrapper": "^4.0.0",
-        "execa": "^5.0.0"
-      },
-      "bin": {
-        "gifsicle": "cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/imagemin/gisicle-bin?sponsor=1"
-      }
-    },
-    "node_modules/gifsicle/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/gifsicle/node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/gifsicle/node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/gifsicle/node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/gifsicle/node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/gifsicle/node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/gifsicle/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/gifsicle/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/gifsicle/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
-      "dev": true,
-      "dependencies": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-base/node_modules/glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^2.0.0"
-      }
-    },
-    "node_modules/glob-base/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-base/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-stream": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==",
-      "dev": true,
-      "dependencies": {
-        "extend": "^3.0.0",
-        "glob": "^7.1.1",
-        "glob-parent": "^3.1.0",
-        "is-negated-glob": "^1.0.0",
-        "ordered-read-streams": "^1.0.0",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.1.5",
-        "remove-trailing-separator": "^1.0.1",
-        "to-absolute-glob": "^2.0.0",
-        "unique-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/glob-watcher": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
-      "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-done": "^1.2.0",
-        "chokidar": "^2.0.0",
-        "is-negated-glob": "^1.0.0",
-        "just-debounce": "^1.0.0",
-        "normalize-path": "^3.0.0",
-        "object.defaults": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globby": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz",
-      "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.0.3",
-        "glob": "^7.1.3",
-        "ignore": "^5.1.1",
-        "merge2": "^1.2.3",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/globby/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-      "dev": true,
-      "dependencies": {
-        "sparkles": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/good-listener": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
-      "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
-      "dependencies": {
-        "delegate": "^3.1.2"
-      }
-    },
-    "node_modules/got": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
-      "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "decompress-response": "^3.2.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^3.0.0",
-        "is-plain-obj": "^1.1.0",
-        "is-retry-allowed": "^1.0.0",
-        "is-stream": "^1.0.0",
-        "isurl": "^1.0.0-alpha5",
-        "lowercase-keys": "^1.0.0",
-        "p-cancelable": "^0.3.0",
-        "p-timeout": "^1.1.1",
-        "safe-buffer": "^5.0.1",
-        "timed-out": "^4.0.0",
-        "url-parse-lax": "^1.0.0",
-        "url-to-options": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/got/node_modules/get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
-    },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "node_modules/growly": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
-      "dev": true
-    },
-    "node_modules/gulp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
-      "dev": true,
-      "dependencies": {
-        "glob-watcher": "^5.0.3",
-        "gulp-cli": "^2.2.0",
-        "undertaker": "^1.2.1",
-        "vinyl-fs": "^3.0.0"
-      },
-      "bin": {
-        "gulp": "bin/gulp.js"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-angular-embed-templates": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-angular-embed-templates/-/gulp-angular-embed-templates-2.3.0.tgz",
-      "integrity": "sha512-D4lOP2G9JYbRpuZo6rsiF5f/PpzU1BgaaAxbgxNQtyNp4zME/E3c/0F73F5J/nK+ZRMwdYblgqa4vCgRS9iVwg==",
-      "dev": true,
-      "dependencies": {
-        "gulp-util": "^3.0.6",
-        "htmlparser2": "~3.9.1",
-        "minimize": "^2.0.0",
-        "object-assign": "4.1.0",
-        "through2": "^2.0.1"
-      }
-    },
-    "node_modules/gulp-babel": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-babel/-/gulp-babel-8.0.0.tgz",
-      "integrity": "sha512-oomaIqDXxFkg7lbpBou/gnUkX51/Y/M2ZfSjL2hdqXTAlSWZcgZtd2o0cOH0r/eE8LWD0+Q/PsLsr2DKOoqToQ==",
-      "dev": true,
-      "dependencies": {
-        "plugin-error": "^1.0.1",
-        "replace-ext": "^1.0.0",
-        "through2": "^2.0.0",
-        "vinyl-sourcemaps-apply": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/gulp-clean-css": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz",
-      "integrity": "sha512-mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg==",
-      "dev": true,
-      "dependencies": {
-        "clean-css": "4.2.3",
-        "plugin-error": "1.0.1",
-        "through2": "3.0.1",
-        "vinyl-sourcemaps-apply": "0.2.1"
-      }
-    },
-    "node_modules/gulp-clean-css/node_modules/through2": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-      "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "2 || 3"
-      }
-    },
-    "node_modules/gulp-cli": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "archy": "^1.0.0",
-        "array-sort": "^1.0.0",
-        "color-support": "^1.1.3",
-        "concat-stream": "^1.6.0",
-        "copy-props": "^2.0.1",
-        "fancy-log": "^1.3.2",
-        "gulplog": "^1.0.0",
-        "interpret": "^1.4.0",
-        "isobject": "^3.0.1",
-        "liftoff": "^3.1.0",
-        "matchdep": "^2.0.0",
-        "mute-stdout": "^1.0.0",
-        "pretty-hrtime": "^1.0.0",
-        "replace-homedir": "^1.0.0",
-        "semver-greatest-satisfied-range": "^1.1.0",
-        "v8flags": "^3.2.0",
-        "yargs": "^7.1.0"
-      },
-      "bin": {
-        "gulp": "bin/gulp.js"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-concat": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
-      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
-      "dev": true,
-      "dependencies": {
-        "concat-with-sourcemaps": "^1.0.0",
-        "through2": "^2.0.0",
-        "vinyl": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-eslint-new": {
-      "version": "1.8.4",
-      "resolved": "https://registry.npmjs.org/gulp-eslint-new/-/gulp-eslint-new-1.8.4.tgz",
-      "integrity": "sha512-T/eY9OWHJ0LGYvHUagPpC8tOMgLpniYKkgtwn3XA83e3IgeZV0NjlcWbhxkBHwO/LX/lbK01jp/Xqs6REyy+Vg==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "^8.44.3",
-        "@types/node": ">=12",
-        "eslint": "8",
-        "fancy-log": "^2.0.0",
-        "plugin-error": "^2.0.1",
-        "semver": "^7.5.4",
-        "ternary-stream": "^3.0.0",
-        "vinyl-fs": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20 || ^14.13 || >=16"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
-    "node_modules/gulp-eslint-new/node_modules/fancy-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz",
-      "integrity": "sha512-9CzxZbACXMUXW13tS0tI8XsGGmxWzO2DmYrGuBJOJ8k8q2K7hwfJA5qHjuPPe8wtsco33YR9wc+Rlr5wYFvhSA==",
-      "dev": true,
-      "dependencies": {
-        "color-support": "^1.1.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/fs-mkdirp-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz",
-      "integrity": "sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.8",
-        "streamx": "^2.12.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/glob-stream": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.0.tgz",
-      "integrity": "sha512-CdIUuwOkYNv9ZadR3jJvap8CMooKziQZ/QCSPhEb7zqfsEI5YnPmvca7IvbaVE3z58ZdUYD2JsU6AUWjL8WZJA==",
-      "dev": true,
-      "dependencies": {
-        "@gulpjs/to-absolute-glob": "^4.0.0",
-        "anymatch": "^3.1.3",
-        "fastq": "^1.13.0",
-        "glob-parent": "^6.0.2",
-        "is-glob": "^4.0.3",
-        "is-negated-glob": "^1.0.0",
-        "normalize-path": "^3.0.0",
-        "streamx": "^2.12.5"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/lead": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/lead/-/lead-4.0.0.tgz",
-      "integrity": "sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/now-and-later": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-3.0.0.tgz",
-      "integrity": "sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.4.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/plugin-error": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz",
-      "integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/replace-ext": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
-      "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/resolve-options": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-2.0.0.tgz",
-      "integrity": "sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==",
-      "dev": true,
-      "dependencies": {
-        "value-or-function": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/to-through": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/to-through/-/to-through-3.0.0.tgz",
-      "integrity": "sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==",
-      "dev": true,
-      "dependencies": {
-        "streamx": "^2.12.5"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/value-or-function": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz",
-      "integrity": "sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/vinyl": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-      "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
-      "dev": true,
-      "dependencies": {
-        "clone": "^2.1.2",
-        "clone-stats": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0",
-        "replace-ext": "^2.0.0",
-        "teex": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/vinyl-fs": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.0.tgz",
-      "integrity": "sha512-7GbgBnYfaquMk3Qu9g22x000vbYkOex32930rBnc3qByw6HfMEAoELjCjoJv4HuEQxHAurT+nvMHm6MnJllFLw==",
-      "dev": true,
-      "dependencies": {
-        "fs-mkdirp-stream": "^2.0.1",
-        "glob-stream": "^8.0.0",
-        "graceful-fs": "^4.2.11",
-        "iconv-lite": "^0.6.3",
-        "is-valid-glob": "^1.0.0",
-        "lead": "^4.0.0",
-        "normalize-path": "3.0.0",
-        "resolve-options": "^2.0.0",
-        "stream-composer": "^1.0.2",
-        "streamx": "^2.14.0",
-        "to-through": "^3.0.0",
-        "value-or-function": "^4.0.0",
-        "vinyl": "^3.0.0",
-        "vinyl-sourcemap": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/vinyl-sourcemap": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz",
-      "integrity": "sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==",
-      "dev": true,
-      "dependencies": {
-        "convert-source-map": "^2.0.0",
-        "graceful-fs": "^4.2.10",
-        "now-and-later": "^3.0.0",
-        "streamx": "^2.12.5",
-        "vinyl": "^3.0.0",
-        "vinyl-contents": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/gulp-eslint-new/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/gulp-imagemin": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/gulp-imagemin/-/gulp-imagemin-7.1.0.tgz",
-      "integrity": "sha512-6xBTNybmPY2YrvrhhlS8Mxi0zn0ypusLon63p9XXxDtIf7U7c6KcViz94K7Skosucr3378A6IY2kJSjJyuwylQ==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^3.0.0",
-        "fancy-log": "^1.3.2",
-        "imagemin": "^7.0.0",
-        "plugin-error": "^1.0.1",
-        "plur": "^3.0.1",
-        "pretty-bytes": "^5.3.0",
-        "through2-concurrent": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      },
-      "optionalDependencies": {
-        "imagemin-gifsicle": "^7.0.0",
-        "imagemin-mozjpeg": "^8.0.0",
-        "imagemin-optipng": "^7.0.0",
-        "imagemin-svgo": "^7.0.0"
-      },
-      "peerDependencies": {
-        "gulp": ">=4"
-      },
-      "peerDependenciesMeta": {
-        "gulp": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/gulp-imagemin/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/gulp-imagemin/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/gulp-imagemin/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/gulp-imagemin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/gulp-imagemin/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/gulp-less": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-less/-/gulp-less-5.0.0.tgz",
-      "integrity": "sha512-W2I3TewO/By6UZsM/wJG3pyK5M6J0NYmJAAhwYXQHR+38S0iDtZasmUgFCH3CQj+pQYw/PAIzxvFvwtEXz1HhQ==",
-      "dev": true,
-      "dependencies": {
-        "less": "^3.7.1 || ^4.0.0",
-        "object-assign": "^4.0.1",
-        "plugin-error": "^1.0.0",
-        "replace-ext": "^2.0.0",
-        "through2": "^4.0.0",
-        "vinyl-sourcemaps-apply": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/gulp-less/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/gulp-less/node_modules/replace-ext": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
-      "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/gulp-less/node_modules/through2": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
-      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "3"
-      }
-    },
-    "node_modules/gulp-minify": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/gulp-minify/-/gulp-minify-3.1.0.tgz",
-      "integrity": "sha512-ixF41aYg+NQikI8hpoHdEclYcQkbGdXQu1CBdHaU7Epg8H6e8d2jWXw1+rBPgYwl/XpKgjHj7NI6gkhoSNSSAg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "minimatch": "^3.0.2",
-        "plugin-error": "^0.1.2",
-        "terser": "^3.7.6",
-        "through2": "^2.0.3",
-        "vinyl": "^2.1.0"
-      }
-    },
-    "node_modules/gulp-minify/node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-minify/node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-minify/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-minify/node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-minify/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-minify/node_modules/plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-      "dev": true,
-      "dependencies": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-notify": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-notify/-/gulp-notify-4.0.0.tgz",
-      "integrity": "sha512-0cdDvZkHVqu4tqrcOI/jL5YdxYEIPQ7+p3YxnO48w5hhPSisvogZ887qL+fpYItg9m4MUhJ5Se8p8xGy3uJESA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^4.1.1",
-        "fancy-log": "^1.3.3",
-        "lodash.template": "^4.5.0",
-        "node-notifier": "^9.0.1",
-        "node.extend": "^2.0.2",
-        "plugin-error": "^1.0.1",
-        "through2": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=0.8.0",
-        "npm": ">=1.2.10"
-      }
-    },
-    "node_modules/gulp-notify/node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/gulp-notify/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/gulp-notify/node_modules/through2": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
-      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "3"
-      }
-    },
-    "node_modules/gulp-postcss": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-9.0.1.tgz",
-      "integrity": "sha512-9QUHam5JyXwGUxaaMvoFQVT44tohpEFpM8xBdPfdwTYGM0AItS1iTQz0MpsF8Jroh7GF5Jt2GVPaYgvy8qD2Fw==",
-      "dev": true,
-      "dependencies": {
-        "fancy-log": "^1.3.3",
-        "plugin-error": "^1.0.1",
-        "postcss-load-config": "^3.0.0",
-        "vinyl-sourcemaps-apply": "^0.2.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.0"
-      }
-    },
-    "node_modules/gulp-rename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
-      "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/gulp-sort": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-sort/-/gulp-sort-2.0.0.tgz",
-      "integrity": "sha1-xnYqLx8N4KP8WVohWZ0/rI26Gso=",
-      "dev": true,
-      "dependencies": {
-        "through2": "^2.0.1"
-      }
-    },
-    "node_modules/gulp-sourcemaps": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz",
-      "integrity": "sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==",
-      "dev": true,
-      "dependencies": {
-        "@gulp-sourcemaps/identity-map": "^2.0.1",
-        "@gulp-sourcemaps/map-sources": "^1.0.0",
-        "acorn": "^6.4.1",
-        "convert-source-map": "^1.0.0",
-        "css": "^3.0.0",
-        "debug-fabulous": "^1.0.0",
-        "detect-newline": "^2.0.0",
-        "graceful-fs": "^4.0.0",
-        "source-map": "^0.6.0",
-        "strip-bom-string": "^1.0.0",
-        "through2": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/gulp-sourcemaps/node_modules/acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/gulp-sourcemaps/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-util": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-      "integrity": "sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==",
-      "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5",
-      "dev": true,
-      "dependencies": {
-        "array-differ": "^1.0.0",
-        "array-uniq": "^1.0.2",
-        "beeper": "^1.0.0",
-        "chalk": "^1.0.0",
-        "dateformat": "^2.0.0",
-        "fancy-log": "^1.1.0",
-        "gulplog": "^1.0.0",
-        "has-gulplog": "^0.1.0",
-        "lodash._reescape": "^3.0.0",
-        "lodash._reevaluate": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.template": "^3.0.0",
-        "minimist": "^1.1.0",
-        "multipipe": "^0.1.2",
-        "object-assign": "^3.0.0",
-        "replace-ext": "0.0.1",
-        "through2": "^2.0.0",
-        "vinyl": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/gulp-util/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-util/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-util/node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/gulp-util/node_modules/clone-stats": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-      "dev": true
-    },
-    "node_modules/gulp-util/node_modules/lodash.template": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-      "integrity": "sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash._basetostring": "^3.0.0",
-        "lodash._basevalues": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0",
-        "lodash.keys": "^3.0.0",
-        "lodash.restparam": "^3.0.0",
-        "lodash.templatesettings": "^3.0.0"
-      }
-    },
-    "node_modules/gulp-util/node_modules/lodash.templatesettings": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0"
-      }
-    },
-    "node_modules/gulp-util/node_modules/object-assign": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-      "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-util/node_modules/replace-ext": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/gulp-util/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-util/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/gulp-util/node_modules/vinyl": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-      "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-      "dev": true,
-      "dependencies": {
-        "clone": "^1.0.0",
-        "clone-stats": "^0.0.1",
-        "replace-ext": "0.0.1"
-      },
-      "engines": {
-        "node": ">= 0.9"
-      }
-    },
-    "node_modules/gulp-watch": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-watch/-/gulp-watch-5.0.1.tgz",
-      "integrity": "sha512-HnTSBdzAOFIT4wmXYPDUn783TaYAq9bpaN05vuZNP5eni3z3aRx0NAKbjhhMYtcq76x4R1wf4oORDGdlrEjuog==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "1.1.0",
-        "anymatch": "^1.3.0",
-        "chokidar": "^2.0.0",
-        "fancy-log": "1.3.2",
-        "glob-parent": "^3.0.1",
-        "object-assign": "^4.1.0",
-        "path-is-absolute": "^1.0.1",
-        "plugin-error": "1.0.1",
-        "readable-stream": "^2.2.2",
-        "slash": "^1.0.0",
-        "vinyl": "^2.1.0",
-        "vinyl-file": "^2.0.0"
-      }
-    },
-    "node_modules/gulp-watch/node_modules/anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-      "dev": true,
-      "dependencies": {
-        "micromatch": "^2.1.5",
-        "normalize-path": "^2.0.0"
-      }
-    },
-    "node_modules/gulp-watch/node_modules/arr-diff": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-watch/node_modules/array-unique": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-watch/node_modules/braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
-      "dev": true,
-      "dependencies": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-watch/node_modules/expand-brackets": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-      "dev": true,
-      "dependencies": {
-        "is-posix-bracket": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-watch/node_modules/extglob": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-watch/node_modules/fancy-log": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz",
-      "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=",
-      "dev": true,
-      "dependencies": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "time-stamp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-watch/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-watch/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-watch/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-watch/node_modules/micromatch": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^2.0.0",
-        "array-unique": "^0.2.1",
-        "braces": "^1.8.2",
-        "expand-brackets": "^0.1.4",
-        "extglob": "^0.3.1",
-        "filename-regex": "^2.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "normalize-path": "^2.0.1",
-        "object.omit": "^2.0.0",
-        "parse-glob": "^3.0.4",
-        "regex-cache": "^0.4.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-watch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-wrap": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/gulp-wrap/-/gulp-wrap-0.15.0.tgz",
-      "integrity": "sha512-f17zkGObA+hE/FThlg55gfA0nsXbdmHK1WqzjjB2Ytq1TuhLR7JiCBJ3K4AlMzCyoFaCjfowos+VkToUNE0WTQ==",
-      "dev": true,
-      "dependencies": {
-        "consolidate": "^0.15.1",
-        "es6-promise": "^4.2.6",
-        "fs-readfile-promise": "^3.0.1",
-        "js-yaml": "^3.13.0",
-        "lodash": "^4.17.11",
-        "node.extend": "2.0.2",
-        "plugin-error": "^1.0.1",
-        "through2": "^3.0.1",
-        "tryit": "^1.0.1",
-        "vinyl-bufferstream": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=6.14",
-        "npm": ">=1.4.3"
-      }
-    },
-    "node_modules/gulp-wrap-js": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/gulp-wrap-js/-/gulp-wrap-js-0.4.1.tgz",
-      "integrity": "sha512-5bWQ6ZQrUDVN0w3ufWP1ZtY8qcGQABKCSb84++qGzyqw6F8kFVeTxIQtEqF4Qzi1YOpLo0NvPlNATqBqKpA6eg==",
-      "dev": true,
-      "dependencies": {
-        "escodegen": "^1.6.1",
-        "esprima": "^2.3.0",
-        "estemplate": "*",
-        "gulp-util": "~3.0.5",
-        "through2": "*",
-        "vinyl-sourcemaps-apply": "^0.1.4"
-      },
-      "engines": {
-        "node": ">=0.8.0",
-        "npm": ">=1.2.10"
-      }
-    },
-    "node_modules/gulp-wrap-js/node_modules/source-map": {
-      "version": "0.1.43",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-      "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-      "dev": true,
-      "dependencies": {
-        "amdefine": ">=0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/gulp-wrap-js/node_modules/vinyl-sourcemaps-apply": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.1.4.tgz",
-      "integrity": "sha1-xfy9Q+LyOEI8LcmL3db3m3K8NFs=",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.1.39"
-      }
-    },
-    "node_modules/gulp-wrap/node_modules/through2": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "2 || 3"
-      }
-    },
-    "node_modules/gulplog": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "dev": true,
-      "dependencies": {
-        "glogg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true,
-      "optional": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-gulplog": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-      "dev": true,
-      "dependencies": {
-        "sparkles": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/has-symbol-support-x": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
-      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-to-string-tag-x": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
-      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "has-symbol-support-x": "^1.4.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "dependencies": {
-        "parse-passwd": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/html-encoding-sniffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-encoding": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/htmlparser2": {
-      "version": "3.9.2",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^1.3.0",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/http-cache-semantics": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
-      "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/image-size": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "image-size": "bin/image-size.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/imagemin": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-7.0.1.tgz",
-      "integrity": "sha512-33AmZ+xjZhg2JMCe+vDf6a9mzWukE7l+wAtesjE7KyteqqKjzxv7aVQeWnul1Ve26mWvEQqyPwl0OctNBfSR9w==",
-      "dev": true,
-      "dependencies": {
-        "file-type": "^12.0.0",
-        "globby": "^10.0.0",
-        "graceful-fs": "^4.2.2",
-        "junk": "^3.1.0",
-        "make-dir": "^3.0.0",
-        "p-pipe": "^3.0.0",
-        "replace-ext": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/imagemin-gifsicle": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/imagemin-gifsicle/-/imagemin-gifsicle-7.0.0.tgz",
-      "integrity": "sha512-LaP38xhxAwS3W8PFh4y5iQ6feoTSF+dTAXFRUEYQWYst6Xd+9L/iPk34QGgK/VO/objmIlmq9TStGfVY2IcHIA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "execa": "^1.0.0",
-        "gifsicle": "^5.0.0",
-        "is-gif": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/imagemin/imagemin-gifsicle?sponsor=1"
-      }
-    },
-    "node_modules/imagemin-mozjpeg": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/imagemin-mozjpeg/-/imagemin-mozjpeg-8.0.0.tgz",
-      "integrity": "sha512-+EciPiIjCb8JWjQNr1q8sYWYf7GDCNDxPYnkD11TNIjjWNzaV+oTg4DpOPQjl5ZX/KRCPMEgS79zLYAQzLitIA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "execa": "^1.0.0",
-        "is-jpg": "^2.0.0",
-        "mozjpeg": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/imagemin-optipng": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/imagemin-optipng/-/imagemin-optipng-7.1.0.tgz",
-      "integrity": "sha512-JNORTZ6j6untH7e5gF4aWdhDCxe3ODsSLKs/f7Grewy3ebZpl1ZsU+VUTPY4rzeHgaFA8GSWOoA8V2M3OixWZQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "exec-buffer": "^3.0.0",
-        "is-png": "^2.0.0",
-        "optipng-bin": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/imagemin-svgo": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/imagemin-svgo/-/imagemin-svgo-7.1.0.tgz",
-      "integrity": "sha512-0JlIZNWP0Luasn1HT82uB9nU9aa+vUj6kpT+MjPW11LbprXC+iC4HDwn1r4Q2/91qj4iy9tRZNsFySMlEpLdpg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-svg": "^4.2.1",
-        "svgo": "^1.3.2"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/imagemin-svgo?sponsor=1"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-lazy": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz",
-      "integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "repeating": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/into-stream": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
-      "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "from2": "^2.1.1",
-        "p-is-promise": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/irregular-plurals": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-2.0.0.tgz",
-      "integrity": "sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz",
-      "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/is-absolute": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-      "dev": true,
-      "dependencies": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true,
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-      "dev": true,
-      "dependencies": {
-        "is-primitive": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-gif": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-gif/-/is-gif-3.0.0.tgz",
-      "integrity": "sha512-IqJ/jlbw5WJSNfwQ/lHEDXF8rxhRgF6ythk2oiEvhpG29F704eX9NO6TvPfMiq9DrbwgcEDnETYNcZDPewQoVw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "file-type": "^10.4.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-gif/node_modules/file-type": {
-      "version": "10.11.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
-      "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-jpg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-jpg/-/is-jpg-2.0.0.tgz",
-      "integrity": "sha1-LhmX+m6RZuqsAkLarkQ0A+TvHZc=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-natural-number": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
-      "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/is-negated-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
-      "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
-      "dev": true,
-      "optional": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-png": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-png/-/is-png-2.0.0.tgz",
-      "integrity": "sha512-4KPGizaVGj2LK7xwJIz8o5B2ubu1D/vcQsgOGFEDlpcvgZHto4gBnyd0ig7Ws+67ixmwKoNmu0hYnpo6AaKb5g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
-    },
-    "node_modules/is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-      "dev": true
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-      "dev": true,
-      "dependencies": {
-        "is-unc-path": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-retry-allowed": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
-      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-svg": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-4.4.0.tgz",
-      "integrity": "sha512-v+AgVwiK5DsGtT9ng+m4mClp6zDAmwrW8nZi6Gg15qzvBnRWWdfWA1TGaXyCDnWq5g5asofIgMVl3PjKxvk1ug==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "fast-xml-parser": "^4.1.3"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-unc-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-      "dev": true,
-      "dependencies": {
-        "unc-path-regex": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
-    "node_modules/is-valid-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-what": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
-      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
-      "dev": true
-    },
-    "node_modules/is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "node_modules/isbinaryfile": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
-      "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/gjtorikian/"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/isurl": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
-      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "has-to-string-tag-x": "^1.2.0",
-        "is-object": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/jasmine-core": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.1.1.tgz",
-      "integrity": "sha512-UrzO3fL7nnxlQXlvTynNAenL+21oUQRlzqQFsA2U11ryb4+NLOCOePZ70PTojEaUKhiFugh7dG0Q+I58xlPdWg==",
-      "dev": true
-    },
-    "node_modules/jquery": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
-      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
-    },
-    "node_modules/jquery-ui-dist": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz",
-      "integrity": "sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==",
-      "dependencies": {
-        "jquery": ">=1.8.0 <4.0.0"
-      }
-    },
-    "node_modules/jquery-ui-touch-punch": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/jquery-ui-touch-punch/-/jquery-ui-touch-punch-0.2.3.tgz",
-      "integrity": "sha1-7tgiQnM7okP0az6HwYQbMIGR2mg="
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/js-yaml/node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/jsdom": {
-      "version": "22.1.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz",
-      "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.6",
-        "cssstyle": "^3.0.0",
-        "data-urls": "^4.0.0",
-        "decimal.js": "^10.4.3",
-        "domexception": "^4.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.1",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.4",
-        "parse5": "^7.1.2",
-        "rrweb-cssom": "^0.6.0",
-        "saxes": "^6.0.0",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.1.2",
-        "w3c-xmlserializer": "^4.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^12.0.1",
-        "ws": "^8.13.0",
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsdom/node_modules/ws": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/junk": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
-      "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/just-debounce": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
-      "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
-      "dev": true
-    },
-    "node_modules/karma": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.2.tgz",
-      "integrity": "sha512-C6SU/53LB31BEgRg+omznBEMY4SjHU3ricV6zBcAe1EeILKkeScr+fZXtaI5WyDbkVowJxxAI6h73NcFPmXolQ==",
-      "dev": true,
-      "dependencies": {
-        "@colors/colors": "1.5.0",
-        "body-parser": "^1.19.0",
-        "braces": "^3.0.2",
-        "chokidar": "^3.5.1",
-        "connect": "^3.7.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.1",
-        "glob": "^7.1.7",
-        "graceful-fs": "^4.2.6",
-        "http-proxy": "^1.18.1",
-        "isbinaryfile": "^4.0.8",
-        "lodash": "^4.17.21",
-        "log4js": "^6.4.1",
-        "mime": "^2.5.2",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.5",
-        "qjobs": "^1.2.0",
-        "range-parser": "^1.2.1",
-        "rimraf": "^3.0.2",
-        "socket.io": "^4.4.1",
-        "source-map": "^0.6.1",
-        "tmp": "^0.2.1",
-        "ua-parser-js": "^0.7.30",
-        "yargs": "^16.1.1"
-      },
-      "bin": {
-        "karma": "bin/karma"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/karma-jasmine": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-5.1.0.tgz",
-      "integrity": "sha512-i/zQLFrfEpRyQoJF9fsCdTMOF5c2dK7C7OmsuKg2D0YSsuZSfQDiLuaiktbuio6F2wiCsZSnSnieIQ0ant/uzQ==",
-      "dev": true,
-      "dependencies": {
-        "jasmine-core": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "karma": "^6.0.0"
-      }
-    },
-    "node_modules/karma-jasmine/node_modules/jasmine-core": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.6.0.tgz",
-      "integrity": "sha512-O236+gd0ZXS8YAjFx8xKaJ94/erqUliEkJTDedyE7iHvv4ZVqi+q+8acJxu05/WJDKm512EUNn809In37nWlAQ==",
-      "dev": true
-    },
-    "node_modules/karma-jsdom-launcher": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/karma-jsdom-launcher/-/karma-jsdom-launcher-15.0.0.tgz",
-      "integrity": "sha512-F5KkE7qNS93cLk6BZtGI1V+OAHoruGIhZm+zCViT9J4oqJ2tn9hScIk+KXQL6Zmq6exddhpFKNw+hVIQYUocpg==",
-      "dev": true,
-      "peerDependencies": {
-        "jsdom": ">=15 <=22",
-        "karma": ">=2 <=6"
-      }
-    },
-    "node_modules/karma-junit-reporter": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-2.0.1.tgz",
-      "integrity": "sha512-VtcGfE0JE4OE1wn0LK8xxDKaTP7slN8DO3I+4xg6gAi1IoAHAXOJ1V9G/y45Xg6sxdxPOR3THCFtDlAfBo9Afw==",
-      "dev": true,
-      "dependencies": {
-        "path-is-absolute": "^1.0.0",
-        "xmlbuilder": "12.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      },
-      "peerDependencies": {
-        "karma": ">=0.9"
-      }
-    },
-    "node_modules/karma-spec-reporter": {
-      "version": "0.0.36",
-      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.36.tgz",
-      "integrity": "sha512-11bvOl1x6ryKZph7kmbmMpbi8vsngEGxGOoeTlIcDaH3ab3j8aPJnZ+r+K/SS0sBSGy5VGkGYO2+hLct7hw/6w==",
-      "dev": true,
-      "dependencies": {
-        "colors": "1.4.0"
-      },
-      "peerDependencies": {
-        "karma": ">=0.9"
-      }
-    },
-    "node_modules/karma/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/karma/node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/karma/node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/karma/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/karma/node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/karma/node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/karma/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/karma/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/karma/node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/karma/node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/karma/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/karma/node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/karma/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/karma/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/karma/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/karma/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma/node_modules/tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-      "dev": true,
-      "dependencies": {
-        "rimraf": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.17.0"
-      }
-    },
-    "node_modules/karma/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/karma/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/karma/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/karma/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/karma/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/keyv": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
-      "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "json-buffer": "3.0.0"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/kuler": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz",
-      "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==",
-      "dev": true,
-      "dependencies": {
-        "colornames": "^1.1.1"
-      }
-    },
-    "node_modules/last-run": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-      "dev": true,
-      "dependencies": {
-        "default-resolution": "^2.0.0",
-        "es6-weak-map": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/lazyload-js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazyload-js/-/lazyload-js-1.0.0.tgz",
-      "integrity": "sha1-jBA5sbaRec1J/cMkICOvSM4IOSU="
-    },
-    "node_modules/lazystream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^2.0.5"
-      },
-      "engines": {
-        "node": ">= 0.6.3"
-      }
-    },
-    "node_modules/lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "dependencies": {
-        "invert-kv": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lead": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-      "dev": true,
-      "dependencies": {
-        "flush-write-stream": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/less": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.2.0.tgz",
-      "integrity": "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==",
-      "dev": true,
-      "dependencies": {
-        "copy-anything": "^2.0.1",
-        "parse-node-version": "^1.0.1",
-        "tslib": "^2.3.0"
-      },
-      "bin": {
-        "lessc": "bin/lessc"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "optionalDependencies": {
-        "errno": "^0.1.1",
-        "graceful-fs": "^4.1.2",
-        "image-size": "~0.5.0",
-        "make-dir": "^2.1.0",
-        "mime": "^1.4.1",
-        "needle": "^3.1.0",
-        "source-map": "~0.6.0"
-      }
-    },
-    "node_modules/less/node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/less/node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/less/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/less/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
-    "node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/liftoff": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-      "dev": true,
-      "dependencies": {
-        "extend": "^3.0.0",
-        "findup-sync": "^3.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/liftoff/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lilconfig": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
-      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/lit": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.2.tgz",
-      "integrity": "sha512-VZx5iAyMtX7CV4K8iTLdCkMaYZ7ipjJZ0JcSdJ0zIdGxxyurjIn7yuuSxNBD7QmjvcNJwr0JS4cAdAtsy7gZ6w==",
-      "peer": true,
-      "dependencies": {
-        "@lit/reactive-element": "^2.0.4",
-        "lit-element": "^4.0.4",
-        "lit-html": "^3.1.2"
-      }
-    },
-    "node_modules/lit-element": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.4.tgz",
-      "integrity": "sha512-98CvgulX6eCPs6TyAIQoJZBCQPo80rgXR+dVBs61cstJXqtI+USQZAbA4gFHh6L/mxBx9MrgPLHLsUgDUHAcCQ==",
-      "peer": true,
-      "dependencies": {
-        "@lit-labs/ssr-dom-shim": "^1.2.0",
-        "@lit/reactive-element": "^2.0.4",
-        "lit-html": "^3.1.2"
-      }
-    },
-    "node_modules/lit-html": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.2.tgz",
-      "integrity": "sha512-3OBZSUrPnAHoKJ9AMjRL/m01YJxQMf+TMHanNtTHG68ubjnZxK0RFl102DPzsw4mWnHibfZIBJm3LWCZ/LmMvg==",
-      "peer": true,
-      "dependencies": {
-        "@types/trusted-types": "^2.0.2"
-      }
-    },
-    "node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-      "dev": true
-    },
-    "node_modules/lodash._basetostring": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-      "dev": true
-    },
-    "node_modules/lodash._basevalues": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-      "dev": true
-    },
-    "node_modules/lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-      "dev": true
-    },
-    "node_modules/lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-      "dev": true
-    },
-    "node_modules/lodash._reescape": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-      "dev": true
-    },
-    "node_modules/lodash._reevaluate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-      "dev": true
-    },
-    "node_modules/lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-      "dev": true
-    },
-    "node_modules/lodash._root": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-      "dev": true
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-      "dev": true
-    },
-    "node_modules/lodash.escape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-      "dev": true,
-      "dependencies": {
-        "lodash._root": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-      "dev": true
-    },
-    "node_modules/lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
-    },
-    "node_modules/lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "dev": true,
-      "dependencies": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-      "dev": true
-    },
-    "node_modules/lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "node_modules/lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
-      "dev": true
-    },
-    "node_modules/log4js": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz",
-      "integrity": "sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==",
-      "dev": true,
-      "dependencies": {
-        "date-format": "^4.0.3",
-        "debug": "^4.3.3",
-        "flatted": "^3.2.4",
-        "rfdc": "^1.3.0",
-        "streamroller": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/log4js/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/logalot": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz",
-      "integrity": "sha1-X46MkNME7fElMJUaVVSruMXj9VI=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "figures": "^1.3.5",
-        "squeak": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/logalot/node_modules/figures": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5",
-        "object-assign": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lpad-align": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.2.tgz",
-      "integrity": "sha1-IfYArBwwlcPG5JfuZyce4ISB/p4=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "get-stdin": "^4.0.1",
-        "indent-string": "^2.1.0",
-        "longest": "^1.0.0",
-        "meow": "^3.3.0"
-      },
-      "bin": {
-        "lpad-align": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "node_modules/lru-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-      "dev": true,
-      "dependencies": {
-        "es5-ext": "~0.10.2"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/make-iterator/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "dependencies": {
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-      "dev": true,
-      "dependencies": {
-        "findup-sync": "^2.0.0",
-        "micromatch": "^3.0.4",
-        "resolve": "^1.4.0",
-        "stack-trace": "0.0.10"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/findup-sync": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-      "dev": true,
-      "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^3.1.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/matchdep/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/math-random": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
-      "dev": true
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/memoizee": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
-      "dev": true,
-      "dependencies": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.53",
-        "es6-weak-map": "^2.0.3",
-        "event-emitter": "^0.3.5",
-        "is-promise": "^2.2.2",
-        "lru-queue": "^0.1.0",
-        "next-tick": "^1.1.0",
-        "timers-ext": "^0.1.7"
-      }
-    },
-    "node_modules/meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/minimize": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/minimize/-/minimize-2.2.0.tgz",
-      "integrity": "sha512-IxR2XMbw9pXCxApkdD9BTcH2U4XlXhbeySUrv71rmMS9XDA8BVXEsIuFu24LtwCfBgfbL7Fuh8/ZzkO5DaTLlQ==",
-      "dev": true,
-      "dependencies": {
-        "argh": "^0.1.4",
-        "async": "^2.1.5",
-        "cli-color": "^1.2.0",
-        "diagnostics": "^1.1.0",
-        "emits": "^3.0.0",
-        "htmlparser2": "^3.9.2",
-        "uuid": "^3.0.0"
-      },
-      "bin": {
-        "minimize": "bin/minimize"
-      }
-    },
-    "node_modules/mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mixin-deep/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mixin-deep/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/mozjpeg": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/mozjpeg/-/mozjpeg-6.0.1.tgz",
-      "integrity": "sha512-9Z59pJMi8ni+IUvSH5xQwK5tNLw7p3dwDNCZ3o1xE+of3G5Hc/yOz6Ue/YuLiBXU3ZB5oaHPURyPdqfBX/QYJA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "dependencies": {
-        "bin-build": "^3.0.0",
-        "bin-wrapper": "^4.0.0",
-        "logalot": "^2.1.0"
-      },
-      "bin": {
-        "mozjpeg": "cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/multipipe": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-      "dev": true,
-      "dependencies": {
-        "duplexer2": "0.0.2"
-      }
-    },
-    "node_modules/mute-stdout": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/nan": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
-      "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "node_modules/needle": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-3.1.0.tgz",
-      "integrity": "sha512-gCE9weDhjVGCRqS8dwDR/D3GTAeyXLXuqp7I8EzH6DllZGXSUyxuqqLh+YX9rMAWaaTFyVAg6rHGL25dqvczKw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "debug": "^3.2.6",
-        "iconv-lite": "^0.6.3",
-        "sax": "^1.2.4"
-      },
-      "bin": {
-        "needle": "bin/needle"
-      },
-      "engines": {
-        "node": ">= 4.4.x"
-      }
-    },
-    "node_modules/needle/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/needle/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/next-tick": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
-      "dev": true
-    },
-    "node_modules/ng-file-upload": {
-      "version": "12.2.13",
-      "resolved": "https://registry.npmjs.org/ng-file-upload/-/ng-file-upload-12.2.13.tgz",
-      "integrity": "sha1-AYAPOHLlJvlTEPhHfpnk8S0NjRQ="
-    },
-    "node_modules/nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/node-fetch/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-    },
-    "node_modules/node-fetch/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-    },
-    "node_modules/node-fetch/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "node_modules/node-notifier": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-9.0.1.tgz",
-      "integrity": "sha512-fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg==",
-      "dev": true,
-      "dependencies": {
-        "growly": "^1.3.0",
-        "is-wsl": "^2.2.0",
-        "semver": "^7.3.2",
-        "shellwords": "^0.1.1",
-        "uuid": "^8.3.0",
-        "which": "^2.0.2"
-      }
-    },
-    "node_modules/node-notifier/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/node-notifier/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/node-notifier/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/node-notifier/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/node-notifier/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
-      "dev": true
-    },
-    "node_modules/node.extend": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-2.0.2.tgz",
-      "integrity": "sha512-pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3",
-        "is": "^3.2.1"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nouislider": {
-      "version": "15.7.1",
-      "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-15.7.1.tgz",
-      "integrity": "sha512-5N7C1ru/i8y3dg9+Z6ilj6+m1EfabvOoaRa7ztpxBSKKRZso4vA52DGSbBJjw5XLtFr/LZ9SgGAXqyVtlVHO5w=="
-    },
-    "node_modules/now-and-later": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/npm-conf": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
-      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "config-chain": "^1.1.11",
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/npm-conf/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "path-key": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
-      }
-    },
-    "node_modules/number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nwsapi": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.5.tgz",
-      "integrity": "sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==",
-      "dev": true
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
-      "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "dependencies": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true,
-      "optional": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.defaults": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-      "dev": true,
-      "dependencies": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz",
-      "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-      "dev": true,
-      "dependencies": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-      "dev": true,
-      "dependencies": {
-        "for-own": "^0.1.4",
-        "is-extendable": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.omit/node_modules/for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.reduce": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-      "dev": true,
-      "dependencies": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/optipng-bin": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/optipng-bin/-/optipng-bin-6.0.0.tgz",
-      "integrity": "sha512-95bB4y8IaTsa/8x6QH4bLUuyvyOoGBCLDA7wOgDL8UFqJpSUh1Hob8JRJhit+wC1ZLN3tQ7mFt7KuBj0x8F2Wg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "dependencies": {
-        "bin-build": "^3.0.0",
-        "bin-wrapper": "^4.0.0",
-        "logalot": "^2.0.0"
-      },
-      "bin": {
-        "optipng": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ordered-read-streams": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/os-filter-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz",
-      "integrity": "sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "arch": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
-      "dependencies": {
-        "lcid": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/p-cancelable": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz",
-      "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-event": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-event/-/p-event-1.3.0.tgz",
-      "integrity": "sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "p-timeout": "^1.1.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-is-promise": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
-      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-map-series": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz",
-      "integrity": "sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "p-reduce": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-pipe": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz",
-      "integrity": "sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-reduce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
-      "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-timeout": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
-      "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "p-finally": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-filepath": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-      "dev": true,
-      "dependencies": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
-      "dev": true,
-      "dependencies": {
-        "glob-base": "^0.3.0",
-        "is-dotfile": "^1.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse-glob/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse-glob/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-      "dev": true,
-      "dependencies": {
-        "entities": "^4.4.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
-      }
-    },
-    "node_modules/parse5/node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
-    "node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-root": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-      "dev": true,
-      "dependencies": {
-        "path-root-regex": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-root-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "arr-diff": "^4.0.0",
-        "arr-union": "^3.1.0",
-        "extend-shallow": "^3.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/plugin-error/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plur": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/plur/-/plur-3.1.1.tgz",
-      "integrity": "sha512-t1Ax8KUvV3FFII8ltczPn2tJdjqbd1sIzu6t4JL7nQ3EyeL/lTrj5PWKb06ic5/6XYDr65rQ4uzQEGN70/6X5w==",
-      "dev": true,
-      "dependencies": {
-        "irregular-plurals": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.6",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-calc": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
-      "integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.11",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.2"
-      }
-    },
-    "node_modules/postcss-colormin": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.0.tgz",
-      "integrity": "sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "caniuse-api": "^3.0.0",
-        "colord": "^2.9.1",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-convert-values": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz",
-      "integrity": "sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-comments": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz",
-      "integrity": "sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw==",
-      "dev": true,
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-duplicates": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz",
-      "integrity": "sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA==",
-      "dev": true,
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-empty": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz",
-      "integrity": "sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ==",
-      "dev": true,
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-overridden": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz",
-      "integrity": "sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==",
-      "dev": true,
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-load-config": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
-      "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
-      "dev": true,
-      "dependencies": {
-        "lilconfig": "^2.0.5",
-        "yaml": "^1.10.2"
-      },
-      "engines": {
-        "node": ">= 10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": ">=8.0.9",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "postcss": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/postcss-merge-longhand": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz",
-      "integrity": "sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0",
-        "stylehacks": "^6.0.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-merge-rules": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz",
-      "integrity": "sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^4.0.0",
-        "postcss-selector-parser": "^6.0.5"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-minify-font-values": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz",
-      "integrity": "sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-minify-gradients": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz",
-      "integrity": "sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA==",
-      "dev": true,
-      "dependencies": {
-        "colord": "^2.9.1",
-        "cssnano-utils": "^4.0.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-minify-params": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz",
-      "integrity": "sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "cssnano-utils": "^4.0.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-minify-selectors": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz",
-      "integrity": "sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.5"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-charset": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz",
-      "integrity": "sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ==",
-      "dev": true,
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-display-values": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz",
-      "integrity": "sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-positions": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz",
-      "integrity": "sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-repeat-style": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz",
-      "integrity": "sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-string": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz",
-      "integrity": "sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-timing-functions": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz",
-      "integrity": "sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-unicode": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz",
-      "integrity": "sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-url": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz",
-      "integrity": "sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-whitespace": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz",
-      "integrity": "sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-ordered-values": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz",
-      "integrity": "sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-utils": "^4.0.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-reduce-initial": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz",
-      "integrity": "sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "caniuse-api": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-reduce-transforms": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz",
-      "integrity": "sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.13",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-svgo": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.0.tgz",
-      "integrity": "sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0",
-        "svgo": "^3.0.2"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >= 18"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/css-select": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.1.0",
-        "domhandler": "^5.0.2",
-        "domutils": "^3.0.1",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/css-tree": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
-      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.30",
-        "source-map-js": "^1.0.1"
-      },
-      "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/csso": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
-      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
-      "dev": true,
-      "dependencies": {
-        "css-tree": "~2.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
-        "npm": ">=7.0.0"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/csso/node_modules/css-tree": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
-      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.28",
-        "source-map-js": "^1.0.1"
-      },
-      "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
-        "npm": ">=7.0.0"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/csso/node_modules/mdn-data": {
-      "version": "2.0.28",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
-      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
-      "dev": true
-    },
-    "node_modules/postcss-svgo/node_modules/dom-serializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/postcss-svgo/node_modules/domhandler": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.3.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/domutils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^2.0.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/mdn-data": {
-      "version": "2.0.30",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
-      "dev": true
-    },
-    "node_modules/postcss-svgo/node_modules/svgo": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz",
-      "integrity": "sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==",
-      "dev": true,
-      "dependencies": {
-        "@trysound/sax": "0.2.0",
-        "commander": "^7.2.0",
-        "css-select": "^5.1.0",
-        "css-tree": "^2.2.1",
-        "csso": "^5.0.5",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "svgo": "bin/svgo"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/svgo"
-      }
-    },
-    "node_modules/postcss-unique-selectors": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz",
-      "integrity": "sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.5"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pretty-bytes": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "node_modules/proto-list": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "dependencies": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      }
-    },
-    "node_modules/pumpify/node_modules/pump": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.6.0",
-        "teleport": ">=0.2.0"
-      }
-    },
-    "node_modules/qjobs": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.9"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/query-string": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
-      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "decode-uri-component": "^0.2.0",
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/queue-tick": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
-      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
-      "dev": true
-    },
-    "node_modules/randomatic": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^4.0.0",
-        "kind-of": "^6.0.0",
-        "math-random": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/randomatic/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/randomatic/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "1.8.1",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.1.6"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==",
-      "dev": true
-    },
-    "node_modules/regenerator-transform": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
-      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "node_modules/regex-cache": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-      "dev": true,
-      "dependencies": {
-        "is-equal-shallow": "^0.1.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regex-not/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regex-not/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regex-not/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/regjsgen": "^0.8.0",
-        "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
-        "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
-      "dev": true,
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/remove-bom-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5",
-        "is-utf8": "^0.2.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/remove-bom-stream": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
-      "dev": true,
-      "dependencies": {
-        "remove-bom-buffer": "^3.0.0",
-        "safe-buffer": "^5.1.0",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
-    },
-    "node_modules/repeat-element": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-finite": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/replace-ext": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/replace-homedir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
-      "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1",
-        "is-absolute": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-      "dev": true
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
-    },
-    "node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-options": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
-      "dev": true,
-      "dependencies": {
-        "value-or-function": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
-      "dev": true
-    },
-    "node_modules/responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
-    "node_modules/ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-      "dev": true
-    },
-    "node_modules/rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/rrweb-cssom": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
-      "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
-      "dev": true
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/run-sequence": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-2.2.1.tgz",
-      "integrity": "sha512-qkzZnQWMZjcKbh3CNly2srtrkaO/2H/SI5f2eliMCapdRD3UhMrwjfOAZJAnZ2H8Ju4aBzFZkBGXUqFs9V0yxw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^1.1.3",
-        "fancy-log": "^1.3.2",
-        "plugin-error": "^0.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/run-sequence/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/run-sequence/node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/run-sequence/node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/run-sequence/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/run-sequence/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/run-sequence/node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/run-sequence/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/run-sequence/node_modules/plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-      "dev": true,
-      "dependencies": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/run-sequence/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/run-sequence/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "dependencies": {
-        "ret": "~0.1.10"
-      }
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/saxes": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
-      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
-      "dev": true,
-      "dependencies": {
-        "xmlchars": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=v12.22.7"
-      }
-    },
-    "node_modules/seek-bzip": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz",
-      "integrity": "sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "commander": "^2.8.1"
-      },
-      "bin": {
-        "seek-bunzip": "bin/seek-bunzip",
-        "seek-table": "bin/seek-bzip-table"
-      }
-    },
-    "node_modules/select": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
-      "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
-    },
-    "node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/semver-greatest-satisfied-range": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
-      "dev": true,
-      "dependencies": {
-        "sver-compat": "^1.5.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/semver-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz",
-      "integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/semver-truncate": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz",
-      "integrity": "sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "semver": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "node_modules/set-cookie-parser": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.5.1.tgz",
-      "integrity": "sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ=="
-    },
-    "node_modules/set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
-    },
-    "node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/shellwords": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
-      "dev": true
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
-      "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.3.1"
-      }
-    },
-    "node_modules/simple-swizzle/node_modules/is-arrayish": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-      "dev": true
-    },
-    "node_modules/slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "dependencies": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/socket.io": {
-      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.2.tgz",
-      "integrity": "sha512-bvKVS29/I5fl2FGLNHuXlQaUH/BlzX1IN6S+NKLNZpBsPZIDH+90eQmCs2Railn4YUiww4SzUedJ6+uzwFnKLw==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "base64id": "~2.0.0",
-        "cors": "~2.8.5",
-        "debug": "~4.3.2",
-        "engine.io": "~6.5.2",
-        "socket.io-adapter": "~2.5.2",
-        "socket.io-parser": "~4.2.4"
-      },
-      "engines": {
-        "node": ">=10.2.0"
-      }
-    },
-    "node_modules/socket.io-adapter": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
-      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
-      "dev": true,
-      "dependencies": {
-        "ws": "~8.11.0"
-      }
-    },
-    "node_modules/socket.io-adapter/node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/socket.io-parser": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
-      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
-      "dev": true,
-      "dependencies": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/sort-keys": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-plain-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sort-keys-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
-      "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "sort-keys": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.20",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
-      "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
-      "dev": true
-    },
-    "node_modules/sparkles": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz",
-      "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==",
-      "dev": true
-    },
-    "node_modules/spectrum-colorpicker2": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/spectrum-colorpicker2/-/spectrum-colorpicker2-2.0.10.tgz",
-      "integrity": "sha512-WXyR8qT2tZ71u1W2cdwOPd28jGpuxjwJBeLVTN8xVEWsgQDotlK6DuUwocOyL9qAxTh9570qxTfZYbY7m2wuvQ=="
-    },
-    "node_modules/split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/split-string/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/split-string/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/split-string/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "node_modules/squeak": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/squeak/-/squeak-1.3.0.tgz",
-      "integrity": "sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "chalk": "^1.0.0",
-        "console-stream": "^0.1.1",
-        "lpad-align": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/squeak/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/squeak/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/squeak/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/squeak/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/stack-trace": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/stream-composer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz",
-      "integrity": "sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==",
-      "dev": true,
-      "dependencies": {
-        "streamx": "^2.13.2"
-      }
-    },
-    "node_modules/stream-exhaust": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
-      "dev": true
-    },
-    "node_modules/stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
-    "node_modules/streamroller": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz",
-      "integrity": "sha512-ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA==",
-      "dev": true,
-      "dependencies": {
-        "date-format": "^4.0.3",
-        "debug": "^4.1.1",
-        "fs-extra": "^10.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/streamx": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.1.tgz",
-      "integrity": "sha512-fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA==",
-      "dev": true,
-      "dependencies": {
-        "fast-fifo": "^1.1.0",
-        "queue-tick": "^1.0.1"
-      }
-    },
-    "node_modules/strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-bom-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz",
-      "integrity": "sha1-+H217yYT9paKpUWr/h7HKLaoKco=",
-      "dev": true,
-      "dependencies": {
-        "first-chunk-stream": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-bom-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-      "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-dirs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
-      "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-natural-number": "^4.0.1"
-      }
-    },
-    "node_modules/strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "get-stdin": "^4.0.1"
-      },
-      "bin": {
-        "strip-indent": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/strip-outer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
-      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strnum": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
-      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/stylehacks": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.0.tgz",
-      "integrity": "sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/sver-compat": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
-      "dev": true,
-      "dependencies": {
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      },
-      "bin": {
-        "svgo": "bin/svgo"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "node_modules/tar-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
-      "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "bl": "^1.0.0",
-        "buffer-alloc": "^1.2.0",
-        "end-of-stream": "^1.0.0",
-        "fs-constants": "^1.0.0",
-        "readable-stream": "^2.3.0",
-        "to-buffer": "^1.1.1",
-        "xtend": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/teex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
-      "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==",
-      "dev": true,
-      "dependencies": {
-        "streamx": "^2.12.5"
-      }
-    },
-    "node_modules/temp-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
-      "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/tempfile": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz",
-      "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "temp-dir": "^1.0.0",
-        "uuid": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ternary-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-3.0.0.tgz",
-      "integrity": "sha512-oIzdi+UL/JdktkT+7KU5tSIQjj8pbShj3OASuvDEhm0NT5lppsm7aXWAmAq4/QMaBIyfuEcNLbAQA+HpaISobQ==",
-      "dev": true,
-      "dependencies": {
-        "duplexify": "^4.1.1",
-        "fork-stream": "^0.0.4",
-        "merge-stream": "^2.0.0",
-        "through2": "^3.0.1"
-      }
-    },
-    "node_modules/ternary-stream/node_modules/duplexify": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
-      "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.4.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/ternary-stream/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/ternary-stream/node_modules/through2": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "2 || 3"
-      }
-    },
-    "node_modules/terser": {
-      "version": "3.17.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
-      "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^2.19.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.10"
-      },
-      "bin": {
-        "terser": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/text-hex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
-      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
-      "dev": true
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/through2-concurrent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/through2-concurrent/-/through2-concurrent-2.0.0.tgz",
-      "integrity": "sha512-R5/jLkfMvdmDD+seLwN7vB+mhbqzWop5fAjx5IX8/yQq7VhBhzDmhXgaHAOnhnWkCpRMM7gToYHycB0CS/pd+A==",
-      "dev": true,
-      "dependencies": {
-        "through2": "^2.0.0"
-      }
-    },
-    "node_modules/through2-filter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
-      "dev": true,
-      "dependencies": {
-        "through2": "~2.0.0",
-        "xtend": "~4.0.0"
-      }
-    },
-    "node_modules/time-stamp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/timed-out": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/timers-ext": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
-      "dev": true,
-      "dependencies": {
-        "es5-ext": "~0.10.46",
-        "next-tick": "1"
-      }
-    },
-    "node_modules/tiny-emitter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
-    },
-    "node_modules/tinymce": {
-      "version": "6.8.2",
-      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.8.2.tgz",
-      "integrity": "sha512-Lho79o2Y1Yn+XdlTEkHTEkEmzwYWTXz7IUsvPwxJF3VTtgHUIAAuBab29kik+f2KED3rZvQavr9D7sHVMJ9x4A=="
-    },
-    "node_modules/to-absolute-glob": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
-      "dev": true,
-      "dependencies": {
-        "is-absolute": "^1.0.0",
-        "is-negated-glob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-buffer": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-object-path/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-through": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
-      "dev": true,
-      "dependencies": {
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
-      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.3.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/trim-repeated": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
-      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/tryit": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
-      "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
-      "dev": true
-    },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
-    },
-    "node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/typeahead.js": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/typeahead.js/-/typeahead.js-0.11.1.tgz",
-      "integrity": "sha1-TmTmcbIjEKhgb0rsgFkkuoSwFbg=",
-      "dependencies": {
-        "jquery": ">=1.7"
-      }
-    },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "node_modules/ua-parser-js": {
-      "version": "0.7.33",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
-      "integrity": "sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        }
-      ],
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/unbzip2-stream": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "buffer": "^5.2.1",
-        "through": "^2.3.8"
-      }
-    },
-    "node_modules/unc-path-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/underscore": {
-      "version": "1.13.6",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
-      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="
-    },
-    "node_modules/undertaker": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
-      "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "bach": "^1.0.0",
-        "collection-map": "^1.0.0",
-        "es6-weak-map": "^2.0.1",
-        "fast-levenshtein": "^1.0.0",
-        "last-run": "^1.1.0",
-        "object.defaults": "^1.0.0",
-        "object.reduce": "^1.0.0",
-        "undertaker-registry": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/undertaker-registry": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/undertaker/node_modules/fast-levenshtein": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
-      "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=",
-      "dev": true
-    },
-    "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dev": true,
-      "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unique-stream": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
-      "dev": true,
-      "dependencies": {
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "through2-filter": "^3.0.0"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "dependencies": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.3",
-        "has-values": "^0.1.4",
-        "isobject": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dev": true,
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-values": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
-    },
-    "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "update-browserslist-db": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
-      "dev": true
-    },
-    "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "node_modules/url-parse-lax": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "prepend-http": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/url-to-options": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
-      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "dev": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
-    "node_modules/v8flags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
-      "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/value-or-function": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/vinyl": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
-      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
-      "dev": true,
-      "dependencies": {
-        "clone": "^2.1.1",
-        "clone-buffer": "^1.0.0",
-        "clone-stats": "^1.0.0",
-        "cloneable-readable": "^1.0.0",
-        "remove-trailing-separator": "^1.0.1",
-        "replace-ext": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-bufferstream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/vinyl-bufferstream/-/vinyl-bufferstream-1.0.1.tgz",
-      "integrity": "sha1-BTeGn1gO/6TKRay0dXnkuf5jCBo=",
-      "dev": true,
-      "dependencies": {
-        "bufferstreams": "1.0.1"
-      }
-    },
-    "node_modules/vinyl-contents": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz",
-      "integrity": "sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^5.0.0",
-        "vinyl": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/vinyl-contents/node_modules/bl": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz",
-      "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==",
-      "dev": true,
-      "dependencies": {
-        "buffer": "^6.0.3",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/vinyl-contents/node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
-    "node_modules/vinyl-contents/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/vinyl-contents/node_modules/replace-ext": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
-      "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/vinyl-contents/node_modules/vinyl": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-      "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
-      "dev": true,
-      "dependencies": {
-        "clone": "^2.1.2",
-        "clone-stats": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0",
-        "replace-ext": "^2.0.0",
-        "teex": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/vinyl-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz",
-      "integrity": "sha1-p+v1/779obfRjRQPyweyI++2dRo=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.3.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0",
-        "strip-bom-stream": "^2.0.0",
-        "vinyl": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/vinyl-file/node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/vinyl-file/node_modules/clone-stats": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-      "dev": true
-    },
-    "node_modules/vinyl-file/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/vinyl-file/node_modules/replace-ext": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/vinyl-file/node_modules/vinyl": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-      "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-      "dev": true,
-      "dependencies": {
-        "clone": "^1.0.0",
-        "clone-stats": "^0.0.1",
-        "replace-ext": "0.0.1"
-      },
-      "engines": {
-        "node": ">= 0.9"
-      }
-    },
-    "node_modules/vinyl-fs": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
-      "dev": true,
-      "dependencies": {
-        "fs-mkdirp-stream": "^1.0.0",
-        "glob-stream": "^6.1.0",
-        "graceful-fs": "^4.0.0",
-        "is-valid-glob": "^1.0.0",
-        "lazystream": "^1.0.0",
-        "lead": "^1.0.0",
-        "object.assign": "^4.0.4",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.3.3",
-        "remove-bom-buffer": "^3.0.0",
-        "remove-bom-stream": "^1.2.0",
-        "resolve-options": "^1.1.0",
-        "through2": "^2.0.0",
-        "to-through": "^2.0.0",
-        "value-or-function": "^3.0.0",
-        "vinyl": "^2.0.0",
-        "vinyl-sourcemap": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-sourcemap": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
-      "dev": true,
-      "dependencies": {
-        "append-buffer": "^1.0.2",
-        "convert-source-map": "^1.5.0",
-        "graceful-fs": "^4.1.6",
-        "normalize-path": "^2.1.1",
-        "now-and-later": "^2.0.0",
-        "remove-bom-buffer": "^3.0.0",
-        "vinyl": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-sourcemap/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/vinyl-sourcemaps-apply": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
-      "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.5.1"
-      }
-    },
-    "node_modules/void-elements": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/w3c-xmlserializer": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
-      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
-      "dev": true,
-      "dependencies": {
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-encoding": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-      "dev": true,
-      "dependencies": {
-        "iconv-lite": "0.6.3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/whatwg-mimetype": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-url": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
-      "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "^4.1.1",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true
-    },
-    "node_modules/wicg-inert": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.2.tgz",
-      "integrity": "sha512-Ba9tGNYxXwaqKEi9sJJvPMKuo063umUPsHN0JJsjrs2j8KDSzkWLMZGZ+MH1Jf1Fq4OWZ5HsESJID6nRza2ang=="
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
-      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "node_modules/ws": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
-      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xml-name-validator": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/xmlbuilder": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-12.0.0.tgz",
-      "integrity": "sha512-lMo8DJ8u6JRWp0/Y4XLa/atVDr75H9litKlb2E5j3V3MesoL50EBgZDWoLT3F/LztVnG67GjPXLZpqcky/UMnQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
-      "dev": true
-    },
-    "node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/yargs": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
-      "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^5.0.1"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
-      "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "object.assign": "^4.1.0"
-      }
-    },
-    "node_modules/yargs-parser/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yargs/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yargs/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  },
-  "dependencies": {
-    "@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true
-    },
-    "@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "@babel/code-frame": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.22.13",
-        "chalk": "^2.4.2"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz",
-      "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==",
-      "dev": true
-    },
-    "@babel/core": {
-      "version": "7.21.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.8.tgz",
-      "integrity": "sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==",
-      "dev": true,
-      "requires": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.21.5",
-        "@babel/helper-compilation-targets": "^7.21.5",
-        "@babel/helper-module-transforms": "^7.21.5",
-        "@babel/helpers": "^7.21.5",
-        "@babel/parser": "^7.21.8",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.5",
-        "@babel/types": "^7.21.5",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/generator": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.23.0",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
-      }
-    },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
-      "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
-      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.15",
-        "browserslist": "^4.21.9",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz",
-      "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "semver": "^6.3.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
-      "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "regexpu-core": "^5.3.1",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true
-    },
-    "@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
-      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.23.0"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.15"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz",
-      "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
-      }
-    },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
-      "dev": true
-    },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
-      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-wrap-function": "^7.22.20"
-      }
-    },
-    "@babel/helper-replace-supers": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
-      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
-        "@babel/helper-optimise-call-expression": "^7.22.5"
-      }
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
-      "dev": true
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-      "dev": true
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
-      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
-      "dev": true
-    },
-    "@babel/helper-wrap-function": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
-      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.22.19"
-      }
-    },
-    "@babel/helpers": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",
-      "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.2",
-        "@babel/types": "^7.23.0"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "@babel/parser": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
-      "dev": true
-    },
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz",
-      "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz",
-      "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.15"
-      }
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
-      "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      }
-    },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-proposal-class-static-block": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz",
-      "integrity": "sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz",
-      "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
-      "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.20.5",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.20.7"
-      }
-    },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
-      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.21.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz",
-      "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
-    "@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-syntax-import-assertions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
-      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-transform-arrow-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
-      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-async-to-generator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
-      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
-      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-block-scoping": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz",
-      "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-classes": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz",
-      "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.9",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/plugin-transform-computed-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
-      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/template": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-destructuring": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz",
-      "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-dotall-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
-      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
-      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
-      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-for-of": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz",
-      "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
-      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
-      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
-      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-modules-amd": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz",
-      "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz",
-      "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-simple-access": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz",
-      "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20"
-      }
-    },
-    "@babel/plugin-transform-modules-umd": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
-      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
-      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
-      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
-      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-optional-chaining": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz",
-      "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz",
-      "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
-      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
-      "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "regenerator-transform": "^0.15.2"
-      }
-    },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
-      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
-      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-spread": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
-      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
-      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
-      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
-      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
-      "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/plugin-transform-unicode-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
-      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/preset-env": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.21.5.tgz",
-      "integrity": "sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.21.5",
-        "@babel/helper-compilation-targets": "^7.21.5",
-        "@babel/helper-plugin-utils": "^7.21.5",
-        "@babel/helper-validator-option": "^7.21.0",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.20.7",
-        "@babel/plugin-proposal-async-generator-functions": "^7.20.7",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-class-static-block": "^7.21.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
-        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-        "@babel/plugin-proposal-json-strings": "^7.18.6",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-        "@babel/plugin-proposal-optional-chaining": "^7.21.0",
-        "@babel/plugin-proposal-private-methods": "^7.18.6",
-        "@babel/plugin-proposal-private-property-in-object": "^7.21.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.20.0",
-        "@babel/plugin-syntax-import-meta": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.21.5",
-        "@babel/plugin-transform-async-to-generator": "^7.20.7",
-        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-        "@babel/plugin-transform-block-scoping": "^7.21.0",
-        "@babel/plugin-transform-classes": "^7.21.0",
-        "@babel/plugin-transform-computed-properties": "^7.21.5",
-        "@babel/plugin-transform-destructuring": "^7.21.3",
-        "@babel/plugin-transform-dotall-regex": "^7.18.6",
-        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
-        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-for-of": "^7.21.5",
-        "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
-        "@babel/plugin-transform-modules-amd": "^7.20.11",
-        "@babel/plugin-transform-modules-commonjs": "^7.21.5",
-        "@babel/plugin-transform-modules-systemjs": "^7.20.11",
-        "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.20.5",
-        "@babel/plugin-transform-new-target": "^7.18.6",
-        "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-parameters": "^7.21.3",
-        "@babel/plugin-transform-property-literals": "^7.18.6",
-        "@babel/plugin-transform-regenerator": "^7.21.5",
-        "@babel/plugin-transform-reserved-words": "^7.18.6",
-        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.20.7",
-        "@babel/plugin-transform-sticky-regex": "^7.18.6",
-        "@babel/plugin-transform-template-literals": "^7.18.9",
-        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
-        "@babel/plugin-transform-unicode-escapes": "^7.21.5",
-        "@babel/plugin-transform-unicode-regex": "^7.18.6",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.21.5",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "core-js-compat": "^3.25.1",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/preset-modules": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz",
-      "integrity": "sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      }
-    },
-    "@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
-      "dev": true
-    },
-    "@babel/runtime": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
-      "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
-      "dev": true,
-      "requires": {
-        "regenerator-runtime": "^0.14.0"
-      }
-    },
-    "@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/types": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@colors/colors": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
-      "dev": true
-    },
-    "@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^3.3.0"
-      }
-    },
-    "@eslint-community/regexpp": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
-      "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
-      "dev": true
-    },
-    "@eslint/eslintrc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
-      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "globals": {
-          "version": "13.23.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-          "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        }
-      }
-    },
-    "@eslint/js": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
-      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
-      "dev": true
-    },
-    "@gulp-sourcemaps/identity-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz",
-      "integrity": "sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==",
-      "dev": true,
-      "requires": {
-        "acorn": "^6.4.1",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.16",
-        "source-map": "^0.6.0",
-        "through2": "^3.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.4.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-          "dev": true
-        },
-        "picocolors": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-          "dev": true
-        },
-        "postcss": {
-          "version": "7.0.39",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-          "dev": true,
-          "requires": {
-            "picocolors": "^0.2.1",
-            "source-map": "^0.6.1"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "through2": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.4",
-            "readable-stream": "2 || 3"
-          }
-        }
-      }
-    },
-    "@gulp-sourcemaps/map-sources": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
-      "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
-      "dev": true,
-      "requires": {
-        "normalize-path": "^2.0.1",
-        "through2": "^2.0.3"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
-      }
-    },
-    "@gulpjs/to-absolute-glob": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz",
-      "integrity": "sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==",
-      "dev": true,
-      "requires": {
-        "is-negated-glob": "^1.0.0"
-      }
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.11.13",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
-      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
-      "dev": true,
-      "requires": {
-        "@humanwhocodes/object-schema": "^2.0.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      }
-    },
-    "@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
-      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
-      "dev": true
-    },
-    "@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-      "dev": true
-    },
-    "@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "dev": true
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      },
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": {
-          "version": "1.4.14",
-          "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-          "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-          "dev": true
-        }
-      }
-    },
-    "@lit-labs/ssr-dom-shim": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz",
-      "integrity": "sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g=="
-    },
-    "@lit/reactive-element": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.6.3.tgz",
-      "integrity": "sha512-QuTgnG52Poic7uM1AN5yJ09QMe0O28e10XzSvWDz02TJiiKee4stsiownEIadWm8nYzyDAyT+gKzUoZmiWQtsQ==",
-      "requires": {
-        "@lit-labs/ssr-dom-shim": "^1.0.0"
-      }
-    },
-    "@microsoft/signalr": {
-      "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-7.0.12.tgz",
-      "integrity": "sha512-k1Xu+a73PsWgHwHDm6ctHwHTBnlqCzq7L33cbxdWhj90AGDFpxDSzaGCkZDoJFNHveUetix65zIWiazMvmMg3w==",
-      "requires": {
-        "abort-controller": "^3.0.0",
-        "eventsource": "^2.0.2",
-        "fetch-cookie": "^2.0.3",
-        "node-fetch": "^2.6.7",
-        "ws": "^7.4.5"
-      }
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@sindresorhus/is": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
-      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
-      "dev": true,
-      "optional": true
-    },
-    "@socket.io/component-emitter": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
-      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
-      "dev": true
-    },
-    "@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "dev": true
-    },
-    "@trysound/sax": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-      "dev": true
-    },
-    "@types/angular": {
-      "version": "1.8.4",
-      "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.8.4.tgz",
-      "integrity": "sha512-wPS/ncJWhyxJsndsW1B6Ta8D4mi97x1yItSu+rkLDytU3oRIh2CFAjMuJceYwFAh9+DIohndWM0QBA9OU2Hv0g=="
-    },
-    "@types/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
-      "dev": true
-    },
-    "@types/cors": {
-      "version": "2.8.15",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.15.tgz",
-      "integrity": "sha512-n91JxbNLD8eQIuXDIChAN1tCKNWCEgpceU9b7ZMbFA+P+Q4yIeh80jizFLEvolRPc1ES0VdwFlGv+kJTSirogw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/eslint": {
-      "version": "8.44.5",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.5.tgz",
-      "integrity": "sha512-Ol2eio8LtD/tGM4Ga7Jb83NuFwEv3NqvssSlifXL9xuFpSyQZw0ecmm2Kux6iU0KxQmp95hlPmGCzGJ0TCFeRA==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "@types/estree": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.3.tgz",
-      "integrity": "sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ==",
-      "dev": true
-    },
-    "@types/glob": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
-      "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
-      "dev": true,
-      "requires": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/json-schema": {
-      "version": "7.0.14",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz",
-      "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==",
-      "dev": true
-    },
-    "@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "16.11.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.0.tgz",
-      "integrity": "sha512-8MLkBIYQMuhRBQzGN9875bYsOhPnf/0rgXGo66S2FemHkhbn9qtsz9ywV1iCG+vbjigE4WUNVvw37Dx+L0qsPg==",
-      "dev": true
-    },
-    "@types/q": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
-      "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@types/trusted-types": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.5.tgz",
-      "integrity": "sha512-I3pkr8j/6tmQtKV/ZzHtuaqYSQvyjGRKH4go60Rr0IDLlFxuRT5V32uvB1mecM5G1EVAUyF/4r4QZ1GHgz+mxA=="
-    },
-    "@umbraco-ui/uui": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui/-/uui-1.5.0.tgz",
-      "integrity": "sha512-V9pAdCsiaBy+Vq23sZd9JJCk+TX6xMsclJtTUWhwCq8/YUh6KNERbdoVfMYGUZ1yyJ/g+yddQsWlYOxHNp8msw==",
-      "requires": {
-        "@umbraco-ui/uui-action-bar": "1.5.0",
-        "@umbraco-ui/uui-avatar": "1.5.0",
-        "@umbraco-ui/uui-avatar-group": "1.5.0",
-        "@umbraco-ui/uui-badge": "1.5.0",
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-boolean-input": "1.5.0",
-        "@umbraco-ui/uui-box": "1.5.0",
-        "@umbraco-ui/uui-breadcrumbs": "1.5.0",
-        "@umbraco-ui/uui-button": "1.5.0",
-        "@umbraco-ui/uui-button-group": "1.5.0",
-        "@umbraco-ui/uui-button-inline-create": "1.5.0",
-        "@umbraco-ui/uui-card": "1.5.0",
-        "@umbraco-ui/uui-card-content-node": "1.5.0",
-        "@umbraco-ui/uui-card-media": "1.5.0",
-        "@umbraco-ui/uui-card-user": "1.5.0",
-        "@umbraco-ui/uui-caret": "1.5.0",
-        "@umbraco-ui/uui-checkbox": "1.5.0",
-        "@umbraco-ui/uui-color-area": "1.5.0",
-        "@umbraco-ui/uui-color-picker": "1.5.0",
-        "@umbraco-ui/uui-color-slider": "1.5.0",
-        "@umbraco-ui/uui-color-swatch": "1.5.0",
-        "@umbraco-ui/uui-color-swatches": "1.5.0",
-        "@umbraco-ui/uui-combobox": "1.5.0",
-        "@umbraco-ui/uui-combobox-list": "1.5.0",
-        "@umbraco-ui/uui-css": "1.5.0",
-        "@umbraco-ui/uui-dialog": "1.5.0",
-        "@umbraco-ui/uui-dialog-layout": "1.5.0",
-        "@umbraco-ui/uui-file-dropzone": "1.5.0",
-        "@umbraco-ui/uui-file-preview": "1.5.0",
-        "@umbraco-ui/uui-form": "1.5.0",
-        "@umbraco-ui/uui-form-layout-item": "1.5.0",
-        "@umbraco-ui/uui-form-validation-message": "1.5.0",
-        "@umbraco-ui/uui-icon": "1.5.0",
-        "@umbraco-ui/uui-icon-registry": "1.5.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.5.0",
-        "@umbraco-ui/uui-input": "1.5.0",
-        "@umbraco-ui/uui-input-file": "1.5.0",
-        "@umbraco-ui/uui-input-lock": "1.5.0",
-        "@umbraco-ui/uui-input-password": "1.5.0",
-        "@umbraco-ui/uui-keyboard-shortcut": "1.5.0",
-        "@umbraco-ui/uui-label": "1.5.0",
-        "@umbraco-ui/uui-loader": "1.5.0",
-        "@umbraco-ui/uui-loader-bar": "1.5.0",
-        "@umbraco-ui/uui-loader-circle": "1.5.0",
-        "@umbraco-ui/uui-menu-item": "1.5.0",
-        "@umbraco-ui/uui-modal": "1.5.0",
-        "@umbraco-ui/uui-pagination": "1.5.0",
-        "@umbraco-ui/uui-popover": "1.5.0",
-        "@umbraco-ui/uui-popover-container": "1.5.0",
-        "@umbraco-ui/uui-progress-bar": "1.5.0",
-        "@umbraco-ui/uui-radio": "1.5.0",
-        "@umbraco-ui/uui-range-slider": "1.5.0",
-        "@umbraco-ui/uui-ref": "1.5.0",
-        "@umbraco-ui/uui-ref-list": "1.5.0",
-        "@umbraco-ui/uui-ref-node": "1.5.0",
-        "@umbraco-ui/uui-ref-node-data-type": "1.5.0",
-        "@umbraco-ui/uui-ref-node-document-type": "1.5.0",
-        "@umbraco-ui/uui-ref-node-form": "1.5.0",
-        "@umbraco-ui/uui-ref-node-member": "1.5.0",
-        "@umbraco-ui/uui-ref-node-package": "1.5.0",
-        "@umbraco-ui/uui-ref-node-user": "1.5.0",
-        "@umbraco-ui/uui-scroll-container": "1.5.0",
-        "@umbraco-ui/uui-select": "1.5.0",
-        "@umbraco-ui/uui-slider": "1.5.0",
-        "@umbraco-ui/uui-symbol-expand": "1.5.0",
-        "@umbraco-ui/uui-symbol-file": "1.5.0",
-        "@umbraco-ui/uui-symbol-file-dropzone": "1.5.0",
-        "@umbraco-ui/uui-symbol-file-thumbnail": "1.5.0",
-        "@umbraco-ui/uui-symbol-folder": "1.5.0",
-        "@umbraco-ui/uui-symbol-lock": "1.5.0",
-        "@umbraco-ui/uui-symbol-more": "1.5.0",
-        "@umbraco-ui/uui-symbol-sort": "1.5.0",
-        "@umbraco-ui/uui-table": "1.5.0",
-        "@umbraco-ui/uui-tabs": "1.5.0",
-        "@umbraco-ui/uui-tag": "1.5.0",
-        "@umbraco-ui/uui-textarea": "1.5.0",
-        "@umbraco-ui/uui-toast-notification": "1.5.0",
-        "@umbraco-ui/uui-toast-notification-container": "1.5.0",
-        "@umbraco-ui/uui-toast-notification-layout": "1.5.0",
-        "@umbraco-ui/uui-toggle": "1.5.0",
-        "@umbraco-ui/uui-visually-hidden": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-action-bar": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-action-bar/-/uui-action-bar-1.5.0.tgz",
-      "integrity": "sha512-2B4ONNRTEtoKjnBo8mtvQo2Y9WW7LDSx6q85UuA+YEWfMOgZ0hr0lFepPg+qq/q90/8ZIoItoxRo16UFrPVaHQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-button-group": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-avatar": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar/-/uui-avatar-1.5.0.tgz",
-      "integrity": "sha512-Iw4MQ2IMfJq590ydA6d2WXJ3gC7wO1vpA6tZj3T772B81LBZR31ftoMn3ho4cpavV5Nv4LvBnGhc2YajbsVn5A==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-avatar-group": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar-group/-/uui-avatar-group-1.5.0.tgz",
-      "integrity": "sha512-hlmqOGLQIN8uJMoLgT+RPHFWIxi8Ridhp/MrKgEjuNF6sTu4bCQyN28XuC9JD+4vBcSjU4a893QGvckalQxZiA==",
-      "requires": {
-        "@umbraco-ui/uui-avatar": "1.5.0",
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-badge": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-badge/-/uui-badge-1.5.0.tgz",
-      "integrity": "sha512-6azqqcqRzVHXYz/JfAody6kDZQG3hiBTiCS8EEYY9GcFNqh8BvFLX4yK9R6zz5BVrjgT3qkmPpE2iIpqV6J58A==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-base": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-base/-/uui-base-1.5.0.tgz",
-      "integrity": "sha512-HzKRvbf/aPA1y8l9ZLTvF5Up7W6jX8UwqVUr1B8lwckI6tgxOEFPqLya+U4papqZDh4wz/lysXSDESeVfUy8cw==",
-      "requires": {
-        "lit": "^2.3.1"
-      }
-    },
-    "@umbraco-ui/uui-boolean-input": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-boolean-input/-/uui-boolean-input-1.5.0.tgz",
-      "integrity": "sha512-uhIPzi7n3Z4Li3n688Q8v3725apwasZvPntm7kMdtssXay6hUHOcor+hkpPavGXRVxZGg+9gIYRM6sQWp853cA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-box": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-box/-/uui-box-1.5.0.tgz",
-      "integrity": "sha512-uTHBvwzS9pRu0MVfN74+bux6lK0m1AmY/7xor9ez9/uzDyIK096D9jSLTQkfDyngIhqnV6kFLbG7PqcfQURFJQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-css": "1.4.0"
-      },
-      "dependencies": {
-        "@umbraco-ui/uui-css": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.4.0.tgz",
-          "integrity": "sha512-HBCFPuXJijeZbjnjdqmg3oqOGB3RmpQKT/s/Uy0TSJfaQGfz0e73o2eRghYHWF2rdqHw6brKFrZTZHBVvCE/xA==",
-          "requires": {
-            "lit": "^2.2.2"
-          }
-        }
-      }
-    },
-    "@umbraco-ui/uui-breadcrumbs": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-breadcrumbs/-/uui-breadcrumbs-1.5.0.tgz",
-      "integrity": "sha512-mXuzt5o4NZ1E/HVTLYq+TklX9VQSH5zce+Ef1t2EgUE3EFQH0fwcdCRBC9SpklueNj46ngGHmVhyfv8ekne1Wg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-button": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button/-/uui-button-1.5.0.tgz",
-      "integrity": "sha512-ujicvfqUAN0JtBcgj8OG1YcyDaArTBdP5LvNsyYB8s0dePgcws71XzJ1mbHbXhuA386ioNue04yGDL+gSFlJ/A==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-button-group": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-group/-/uui-button-group-1.5.0.tgz",
-      "integrity": "sha512-8yhFdfg7p1B8MM2fIxIlc0Mmhnx46scdGhqeRhvaQ2/dcdpVTI1j1hI2JyOM18TUhJeot4olLqwatlXxlFFT+A==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-button-inline-create": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-inline-create/-/uui-button-inline-create-1.5.0.tgz",
-      "integrity": "sha512-J60vRf7nzQyRYKj+qYhMQR6LrQH6PyTrxyqyfDOVGzcWKzsTuRahxuVOIOzrs489cznwRYwL11jtK32MlrSjGQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-card": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card/-/uui-card-1.5.0.tgz",
-      "integrity": "sha512-RgpnQca3rpjMG/3DAmmrExI7gmNNHBNYwfjRqgCd/3QkBwRrtT/+jdppVsGRxxW5xAN90sJ/eLP7i3F5EfWlSA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-card-content-node": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-content-node/-/uui-card-content-node-1.5.0.tgz",
-      "integrity": "sha512-aYGeTsppWT0KS9orrqkl9DF2v5l3gSGhBJZqIPiHVBOzczYIcgLWJbdAkaCgpwh1Zacbv3tnB/76965fd4EwPw==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-card": "1.5.0",
-        "@umbraco-ui/uui-icon": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-card-media": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-media/-/uui-card-media-1.5.0.tgz",
-      "integrity": "sha512-0KktT0IExh06W7QP1FMNqU+tpUL1qDwWeeA19PbZPXwHg15hbSW15a+Hc4aiwqlHYHOPT2gxXoiVc7jqWlMcSQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-card": "1.5.0",
-        "@umbraco-ui/uui-symbol-file": "1.5.0",
-        "@umbraco-ui/uui-symbol-folder": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-card-user": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-user/-/uui-card-user-1.5.0.tgz",
-      "integrity": "sha512-xJjfkRHkt2xim1o+IvEPQiTpIQR+Z9+69096ssuGb3EkxyyUsDmH3aZZH6/+LKdtKR+7mPZVJub9TTWB4VRnwQ==",
-      "requires": {
-        "@umbraco-ui/uui-avatar": "1.5.0",
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-card": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-caret": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-caret/-/uui-caret-1.5.0.tgz",
-      "integrity": "sha512-4Apw4TMALEydo5o31gsIyICuPVyKvG/oySNup+5psU3apS0JDQ1RXCgGVDFoFxt5xzM+iJ6/J8ZOOILMVNFM6Q==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-checkbox": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-checkbox/-/uui-checkbox-1.5.0.tgz",
-      "integrity": "sha512-Kve+XAIkSFG9kowbZI1MpDEKihpMTtD9q36pcHiVENqxL1+Tydy60yjy3tHV8o6uamJ8qjR6ZlvLttRwLId9tQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-boolean-input": "1.5.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-color-area": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-area/-/uui-color-area-1.5.0.tgz",
-      "integrity": "sha512-FF6PrUCBo2nOg5iLbD+iB8aa3Vh+skIfqjFsPD80qLE0sKQ/53juZCnCbvvp7Z0YmIqwBlWP7xGEzJBGfS6OlA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "colord": "^2.9.3"
-      }
-    },
-    "@umbraco-ui/uui-color-picker": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-picker/-/uui-color-picker-1.5.0.tgz",
-      "integrity": "sha512-y/IwXhtaQJWNjwnZtYTvv47+bsmUYJzFLtXqxGckcUmyJQvoZ6DDxslTSv1B9J3QTXU0zpakqpxPszlNNHUygw==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "colord": "^2.9.3"
-      }
-    },
-    "@umbraco-ui/uui-color-slider": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-slider/-/uui-color-slider-1.5.0.tgz",
-      "integrity": "sha512-nkUpUxfD7VlayBHirM56xKqi1h0Opg7Q2suzxEC4KLDVLO1+L0KzsDORn1tfeantSG0PahBMbuve1XOoOwCrAA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-color-swatch": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatch/-/uui-color-swatch-1.5.0.tgz",
-      "integrity": "sha512-UDqlGmJIMGyn7C23q33v8dkJoISmIAL0XZNTiPkEhwGjKRlxkbexmGd4L4vFt+nhJDRrN86JoZ64BRTHVN8V7A==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.5.0",
-        "colord": "^2.9.3"
-      }
-    },
-    "@umbraco-ui/uui-color-swatches": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatches/-/uui-color-swatches-1.5.0.tgz",
-      "integrity": "sha512-SvTKINbckKvqkkS4XnQfpELkW2x47CUa4PsnXqioXNIWP5sBJb9Kydiu0N1+lV57fAkteqNp+YY8mFxn3a6iPA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-color-swatch": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-combobox": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox/-/uui-combobox-1.5.0.tgz",
-      "integrity": "sha512-SoK4+yR0dJViXZinZ7iqowl6tvWPTTPSOBVE7FfOqOAgFoccOE/nQqjeNjSM0co80OKXqHUsh+kX/HwLjdyNEA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-button": "1.5.0",
-        "@umbraco-ui/uui-combobox-list": "1.5.0",
-        "@umbraco-ui/uui-icon": "1.5.0",
-        "@umbraco-ui/uui-scroll-container": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-combobox-list": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox-list/-/uui-combobox-list-1.5.0.tgz",
-      "integrity": "sha512-5cVlhnst3p6eEHFqn6O8LMswx3wdwpzlfAghleQJW+ZUIVo7ZPXznZz7+6yvnVWxnI7+xxFebHgC0KFxGMUVvg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-css": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.5.0.tgz",
-      "integrity": "sha512-jBSJg8KTWDG7DOVzz7A+UpMxMNHtddcLgt9k25vC4H+84xl+TN51RFTqF8C0JCZdWFK0eKWYlJsGqVrDfoVCcg==",
-      "requires": {
-        "lit": "^2.2.2"
-      }
-    },
-    "@umbraco-ui/uui-dialog": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog/-/uui-dialog-1.5.0.tgz",
-      "integrity": "sha512-m6J5i+eiLdNApryIY1KW/4kyunAuTpkcWBjQmxyESmlDIqRGdW0lqaahQvcZSZHto03jleUdH5wYTLNgKIb/rw==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-css": "1.4.0"
-      },
-      "dependencies": {
-        "@umbraco-ui/uui-css": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.4.0.tgz",
-          "integrity": "sha512-HBCFPuXJijeZbjnjdqmg3oqOGB3RmpQKT/s/Uy0TSJfaQGfz0e73o2eRghYHWF2rdqHw6brKFrZTZHBVvCE/xA==",
-          "requires": {
-            "lit": "^2.2.2"
-          }
-        }
-      }
-    },
-    "@umbraco-ui/uui-dialog-layout": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog-layout/-/uui-dialog-layout-1.5.0.tgz",
-      "integrity": "sha512-vfZ3FMzYccGBVvSSXvCeoHYX+VU8QppXtFR2OGDZwU0b8BOKtfKTP/2VLPEWCG4vJYKPmqZESo3N9bZXWDkWSg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-file-dropzone": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-dropzone/-/uui-file-dropzone-1.5.0.tgz",
-      "integrity": "sha512-3rkTWidY4k2fyktRxfsMVTSvF+EIguv9p1Fga7v4DCNkplCp6OyJnwWby5F//+NvTHphaGchxZirOWMLgLyDog==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-symbol-file-dropzone": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-file-preview": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-preview/-/uui-file-preview-1.5.0.tgz",
-      "integrity": "sha512-Re+R8uZSD3t3jUgZvzG/DfQtihss7aw+rG41IAjmRO9wBZuUAsowfgCd2OJnuOYJXeaqOYYl+QQr7pmR2a/HNQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-symbol-file": "1.5.0",
-        "@umbraco-ui/uui-symbol-file-thumbnail": "1.5.0",
-        "@umbraco-ui/uui-symbol-folder": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-form": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form/-/uui-form-1.5.0.tgz",
-      "integrity": "sha512-rbXFZzAg93/fzvNkxHavUr62DnSeWuVghd9CK9lhe6A9ER9cfjOcGn/INTYK3HHPBalay9IOq+WV1xxC5H6zyg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-form-layout-item": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-layout-item/-/uui-form-layout-item-1.5.0.tgz",
-      "integrity": "sha512-owla3DWo1deVUEG0JzC7pE70h6Ll6lmbR+B+utbMdEgM6shEMdokpPioeCaXb8v7On9Whz+zJGAGBAYl/oyjug==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-form-validation-message": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-form-validation-message": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-validation-message/-/uui-form-validation-message-1.5.0.tgz",
-      "integrity": "sha512-wuWCzttkUlEctqdJi9qzSzT8h10WvoK3+5usYB9V8NpdPYzOmbXU5RDYpoTWS0nPO56C6rlRlt3TH1khIQtPJA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-icon": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon/-/uui-icon-1.5.0.tgz",
-      "integrity": "sha512-8Sz6PaYTC8KDCKj5ed+xnlnuh9/NOs0tQGPOma1bnVxGJN8LNjl+cJSLp+iU1m3Qq50H0TG+0K/dS3WUExjbZw==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-icon-registry": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry/-/uui-icon-registry-1.5.0.tgz",
-      "integrity": "sha512-ei+HnaCKFjcCYjHYC0hqncY2vDfbgRkWhftOnrhqVZPJkE4omWDmVsLSGg/vm88ar1QleDmVj+CAa4J9T+uVeg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-icon": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-icon-registry-essential": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry-essential/-/uui-icon-registry-essential-1.5.0.tgz",
-      "integrity": "sha512-nxNEQDI4SNBXnI2/Ov60vcdzKFyRCInwZDFNAKyt31F1yTNM0EM0ne5yV4AqM6YPOKVoWzqFcLz2rx64X+oLvQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-icon-registry": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-input": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input/-/uui-input-1.5.0.tgz",
-      "integrity": "sha512-TlbSIRh2Z7xJxW0GEPENd369W1hHgr9Y8IIRE5RDllXzZc8yho4QXPJSDFQTiHMf41LIkOTfIkrQst5047FiXg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-input-file": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-file/-/uui-input-file-1.5.0.tgz",
-      "integrity": "sha512-8h/qGED5KE7sb/YE7dHapZxcWXGm0qCPJft8AGOu/ZK/WdOUV1WHynLjV4yGVZgY9PVZGc+GQTzvdgwxxpltQw==",
-      "requires": {
-        "@umbraco-ui/uui-action-bar": "1.5.0",
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-button": "1.5.0",
-        "@umbraco-ui/uui-file-dropzone": "1.5.0",
-        "@umbraco-ui/uui-icon": "1.5.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-input-lock": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-lock/-/uui-input-lock-1.5.0.tgz",
-      "integrity": "sha512-KBhZLLD+5qyibbcp0AiJo7V4e/+GiKouGz/rCk6/3vxEKpe8CtWekcHhjrdlsHcOluQeBcb1Pdqng0wC9UTO5Q==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-button": "1.5.0",
-        "@umbraco-ui/uui-icon": "1.5.0",
-        "@umbraco-ui/uui-input": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-input-password": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-password/-/uui-input-password-1.5.0.tgz",
-      "integrity": "sha512-8wvQ/10jfufU0QWhK3gBVo5V/fzk4AuX8wPuieKZDY9Jnwkr7ugZ11DOJtaV3Az/4a0nrfF3TQ2gbBC7zHx2JA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.5.0",
-        "@umbraco-ui/uui-input": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-keyboard-shortcut": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-keyboard-shortcut/-/uui-keyboard-shortcut-1.5.0.tgz",
-      "integrity": "sha512-KVTMHl6X0T4cUA3bUgM06xzwCN3VD5W3tZloF0i6e3PTHhkyCE5tKD/2Hizm56OGb+ifaI/oN3L1m7vEPC8IHw==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-label": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-label/-/uui-label-1.5.0.tgz",
-      "integrity": "sha512-Sc6XuMEyivBEQDfMOA6JT7nW5H4/eD6dzUtUNabOwzCG5GUpvTMfRccpdjmzOvl9VCGNWtE9ikqCBZWexWA6YA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-loader": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader/-/uui-loader-1.5.0.tgz",
-      "integrity": "sha512-lhl1KqRbM5NTp08fvxgzOsbHFz04z8/WjaOar6lqNnL0R+CcFtVWQrv69Opht9Sj1NdHESmHEVnX0yodod2LhQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-loader-bar": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-bar/-/uui-loader-bar-1.5.0.tgz",
-      "integrity": "sha512-qUcVXi4i+ClozPc0Vfw7g90CLAQVj04F71xtatxDY5nhSWDEMEI6b/pXtN/B9TklkqfgE1mf/gRziFrpbVjLhA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-loader-circle": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-circle/-/uui-loader-circle-1.5.0.tgz",
-      "integrity": "sha512-059/DJDYbgOmr/LPXbiDaTkBcInmzUUu/YDtQt/SkZPCO33uuB7TDc+++cMgFYskdXBpqesNvVfZOUd4P6zJyA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-menu-item": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-menu-item/-/uui-menu-item-1.5.0.tgz",
-      "integrity": "sha512-rmKuTz0Xgf0LyQRqs3tr2Z4O6oaNCd7UmI8kEbluk4yKpk5MU38BlFY9p39fpiEVUuzjcg9pBjrEyxrC/H9xjA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-loader-bar": "1.5.0",
-        "@umbraco-ui/uui-symbol-expand": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-modal": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-modal/-/uui-modal-1.5.0.tgz",
-      "integrity": "sha512-q9g4rA8OYCPlOmZMES/O17NiAu18wtMxNHMuT6dADP2tuULE+TKT6A8vqC7aq8JkWOTAXRAFvTjTmcvm6L2pvg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-pagination": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-pagination/-/uui-pagination-1.5.0.tgz",
-      "integrity": "sha512-I3gCWbyLRFvi5fAlezQZarvj7FuEZ7NVZbbKJxqEhbo1bwOxDMXlDNxIIrxSg3R8YAuDNP9Pbdw+rnQwupuOMQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-button": "1.5.0",
-        "@umbraco-ui/uui-button-group": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-popover": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover/-/uui-popover-1.5.0.tgz",
-      "integrity": "sha512-Ab8UL4UGxTUn6hYbTqPrMtyGpQr3Xw1E/PVKG3+j+UrNw1Ro5piKgh0TahwxLnrsXWOPXfy53oaXNYsMGenndA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-popover-container": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover-container/-/uui-popover-container-1.5.0.tgz",
-      "integrity": "sha512-issjf86TwvwLA6sJOs5pLRMFY+WBc4oeTZiJMz5mhZ5C5UoRmU65L6RP/0UnzZ4ZGY2Gpdh2YatNnZ7hVMg5ig==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-progress-bar": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-progress-bar/-/uui-progress-bar-1.5.0.tgz",
-      "integrity": "sha512-B/v7VsBBwo19Y+4NBRllt7Ls+WLQfx6vY57rfO8MQG7zxGznxpTSIYvd3wxdRuDsFQeVwwoYjF1/YBJ7iWUnEQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-radio": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-radio/-/uui-radio-1.5.0.tgz",
-      "integrity": "sha512-3e52VZHcgHB/17eLTmiZwdm7ENgfX6AF4Dw+8H2x8jdRjyvt8lbykCq+6xewAZFsLAu7vTOEKtd2RhQFI2+hwg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-range-slider": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-range-slider/-/uui-range-slider-1.5.0.tgz",
-      "integrity": "sha512-oHmIoF+KrHDWiOKonIWq7n94C6CzStBXrleS6iwCgWY++ayaHKCPlCuQIYp3BmGjnMQn8Ou0r2x/RuBPuraLVQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-ref": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref/-/uui-ref-1.5.0.tgz",
-      "integrity": "sha512-wba/OP6b/mG5kp4bUgBBcBAAy3RWTbokVyjb52FR7nyqNMnIE/UBdgi0XeBx4j6lZeEbr5k5ZOGQ1knEHbPWyQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-ref-list": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-list/-/uui-ref-list-1.5.0.tgz",
-      "integrity": "sha512-sxs3hC97zDuFaV8mvXLAbqqtWk0kqDdHY9ORt9CxacdT36nQS58Sw60/plCryqoyp7P2cUZVtlEeff53OKOTCQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-ref-node": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node/-/uui-ref-node-1.5.0.tgz",
-      "integrity": "sha512-bjmMgrIW+/4bmUXwMwFFaPrg2MeTxXssb6EpbBItJ+s0QhTEcTNyAD/DK3RlSMRE5VPO11sRwgCr06aIhklx0Q==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-icon": "1.5.0",
-        "@umbraco-ui/uui-ref": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-ref-node-data-type": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-data-type/-/uui-ref-node-data-type-1.5.0.tgz",
-      "integrity": "sha512-k14MI3cRELOmAwmtFeBzgCFw4+uin0JSqf85ZaqNkXSAmg+4I0ayUI6PGz+Jw66yGHvw3YNeUMKPmLO8l6M79A==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-ref-node": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-ref-node-document-type": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-document-type/-/uui-ref-node-document-type-1.5.0.tgz",
-      "integrity": "sha512-ouytDUaSls7Hsd0WaDy4wgfKMLpxlxx16WWyHlzX5lMyhkR+S3olyNZcgDRtz9xIQV+dVE3iDsUeQcNAigCdaw==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-ref-node": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-ref-node-form": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-form/-/uui-ref-node-form-1.5.0.tgz",
-      "integrity": "sha512-D86A1+ScVGTer2kci6Y9X4ZAhCnm4kxUi7bCFH7dn7oi/Fq8fhs3PBuA7mr1FrZgrPvXVdW+Qa7ldxxU58NIWA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-ref-node": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-ref-node-member": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-member/-/uui-ref-node-member-1.5.0.tgz",
-      "integrity": "sha512-/UPmUNk6KP2unKnJKjr1qGkdPlFGTRj3K7H/mczCY7IbtzEccdEswWJCdUy/doIkAKbDdaqKe3/9HBoA3JtWPw==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-ref-node": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-ref-node-package": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-package/-/uui-ref-node-package-1.5.0.tgz",
-      "integrity": "sha512-XkET8XKb3XxmjlIDrmtwm9o0QsaG81bcpUBEBA/wUC0OcJNrjTKyv6ciAVDP7HaW6XpN8XwsRbqdcrYwM8lXDQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-ref-node": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-ref-node-user": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-user/-/uui-ref-node-user-1.5.0.tgz",
-      "integrity": "sha512-9TrIr1JWw3cIkWfQrdv9iLRIqm/dd10d6uZEWaGJ/MuxyCywqMg/LSApV/NLapB4HXhIG4pGCiXvUa8OVW99ew==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-ref-node": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-scroll-container": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-scroll-container/-/uui-scroll-container-1.5.0.tgz",
-      "integrity": "sha512-Xj5jnmCEDyRENmWtuPI1QYEMzrmi/9/LaajkPEIZEYVu2owI940F0viS5X+X/FvKehSxoSt9ainCwkLphgzNiw==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-select": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-select/-/uui-select-1.5.0.tgz",
-      "integrity": "sha512-lcMiIM6WxF5YraIXAqSpujx3OJzq6Snfik0BUypTWbUZdKVQTgLPh3A6We9PdD6K64AX2Zk4eH8yhQ+5GNImzQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-slider": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-slider/-/uui-slider-1.5.0.tgz",
-      "integrity": "sha512-Mp6xz7C7GbAuQ1Totd2WLzvS56ekx4l31mAvUvor0GqrUF/hHxwfrGZOAWoBqoTdKQAFKbZVSM782a+cwNv3hg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-symbol-expand": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-expand/-/uui-symbol-expand-1.5.0.tgz",
-      "integrity": "sha512-ZCuGAJT2qFs4wQ6Z+g/qV3obv/SbriMnaIOGy6XTTAuMlh2+aNAwm33Je0wYKCTwHNUmnl427wTMEkQcMziD4g==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-symbol-file": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file/-/uui-symbol-file-1.5.0.tgz",
-      "integrity": "sha512-ClB/lT/ebyUBmPqExB2ZinMOo/bCMEgjGxjkXy2THX4lOLUqvjDNEKLq99MAREKSh/mmGq7iB3Z/hd9/EDu75Q==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-symbol-file-dropzone": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-dropzone/-/uui-symbol-file-dropzone-1.5.0.tgz",
-      "integrity": "sha512-0YL88rFFI5SOzzORtm1VtMihN4if7r0CIRe5Q3Sv0WwHjrMfIM08DeONCgN2j+ZoKgnTvt9KpE1OGigshouRug==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-symbol-file-thumbnail": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-thumbnail/-/uui-symbol-file-thumbnail-1.5.0.tgz",
-      "integrity": "sha512-/qkf6AdAIsRmUfsBdtFkFk5wPWw6JvSVHvgk/UvZulHHb2F8TamPSJfb6voh86Vq8DzVIcy3ZbqatxH7LZBY1g==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-symbol-folder": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-folder/-/uui-symbol-folder-1.5.0.tgz",
-      "integrity": "sha512-Sxt4n5IBT+XIqu2nJxP4RnhourwC+1X5bD40YgUBmqZJ9KV//tox4zo2elU19WCeRZFkklZGfn2smLY1FD0OGg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-symbol-lock": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-lock/-/uui-symbol-lock-1.5.0.tgz",
-      "integrity": "sha512-EH7tEPCB+PTyjWbW+bdekk4M5hcjvYYpCKTnl3Pdpzh0mrxHPt9xa8908JB0tG8n0m0EcP+L7k8pthUmkgpK7A==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-symbol-more": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-more/-/uui-symbol-more-1.5.0.tgz",
-      "integrity": "sha512-EuhU4kle4swMFZnsguWPz77rOtrk0IQcXuEA60fjzFGJCwsg7yyu9Ns209IEUsYh5ktstj8pXKT8+ZDila5umg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-symbol-sort": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-sort/-/uui-symbol-sort-1.5.0.tgz",
-      "integrity": "sha512-/cifoZXuZbDmuZFPD0rr95Gpuy18DnboOYb/Ir6G3PANJ0fWOhzykHUrdx18ItLzhhwfE3dcZk4EWcGrEkfnfg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-table": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-table/-/uui-table-1.5.0.tgz",
-      "integrity": "sha512-tjhpEzBYCQdgieoXcIgcOjROrScF0Ifutz/6gmpcdrXYbgZ+YkWX7dSLAeQj3fzGebaPbNYzGOmGZA9/opZ1rg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-tabs": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tabs/-/uui-tabs-1.5.0.tgz",
-      "integrity": "sha512-0D5NLufis9Tzc5Vr+fl8Z0wABHyz1Tep76Qnx0nXyYzAZvdNq2IxThHbGqA1cb+FjVJSKdfp6ONfiPc/SIVAzA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-button": "1.5.0",
-        "@umbraco-ui/uui-popover-container": "1.5.0",
-        "@umbraco-ui/uui-symbol-more": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-tag": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tag/-/uui-tag-1.5.0.tgz",
-      "integrity": "sha512-OZGitHjdn4coj1x7F7zfeIx5M9NhGd8+CqpD915V9Qm8YlTQxFLq1M8tqjIxaYAB5EcHXuyzRpSUCrt/WUvipA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-textarea": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-textarea/-/uui-textarea-1.5.0.tgz",
-      "integrity": "sha512-+zDqbYKYfaiG0IXEaQatUaWsD4umtkTtbCMnqVPMhxwneVoE9d69ejat2zLFUI/ERm3nKMyq/NRfxzXJgzlDng==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-toast-notification": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification/-/uui-toast-notification-1.5.0.tgz",
-      "integrity": "sha512-cFjz4/uZudR3yuSqK5gqzAio55ZOOxQAOc8bC5keS0HXL84JcDwrEP4/Nz7X/uUNUqauYZG/iBUirAvqfv7Osw==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-button": "1.5.0",
-        "@umbraco-ui/uui-css": "1.4.0",
-        "@umbraco-ui/uui-icon": "1.5.0",
-        "@umbraco-ui/uui-icon-registry-essential": "1.5.0"
-      },
-      "dependencies": {
-        "@umbraco-ui/uui-css": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.4.0.tgz",
-          "integrity": "sha512-HBCFPuXJijeZbjnjdqmg3oqOGB3RmpQKT/s/Uy0TSJfaQGfz0e73o2eRghYHWF2rdqHw6brKFrZTZHBVvCE/xA==",
-          "requires": {
-            "lit": "^2.2.2"
-          }
-        }
-      }
-    },
-    "@umbraco-ui/uui-toast-notification-container": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-container/-/uui-toast-notification-container-1.5.0.tgz",
-      "integrity": "sha512-AB4kwgocUeDwkxiCYNH0AOMEtExDS6sEq9sk2i8AGDAEjprAB3m0HM9AlrA+T0V1GtSuv+Q1DEuCyxnVbuK0WQ==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-toast-notification": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-toast-notification-layout": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-layout/-/uui-toast-notification-layout-1.5.0.tgz",
-      "integrity": "sha512-rM7cGCdMolhsndfZT9zGAPI9P3bl1lNpjDhWI124Mgx+KS8t2Q2h9O+7FGqFnjCTJOQES1pdQ+enl2NxCuEkNg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-css": "1.4.0"
-      },
-      "dependencies": {
-        "@umbraco-ui/uui-css": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.4.0.tgz",
-          "integrity": "sha512-HBCFPuXJijeZbjnjdqmg3oqOGB3RmpQKT/s/Uy0TSJfaQGfz0e73o2eRghYHWF2rdqHw6brKFrZTZHBVvCE/xA==",
-          "requires": {
-            "lit": "^2.2.2"
-          }
-        }
-      }
-    },
-    "@umbraco-ui/uui-toggle": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toggle/-/uui-toggle-1.5.0.tgz",
-      "integrity": "sha512-vsJSpBSmlrLzspCa1dGQGYXfc6RwTGTzSlNQdnzzP7qefVRP4GlOaqYV0TJhHMcYdbai+iEkrLznzJQvM9JFLA==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0",
-        "@umbraco-ui/uui-boolean-input": "1.5.0"
-      }
-    },
-    "@umbraco-ui/uui-visually-hidden": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-visually-hidden/-/uui-visually-hidden-1.5.0.tgz",
-      "integrity": "sha512-3Imqxp8+hvirakPogqzvRlU+uhshpGRdrEMU7phCS5VGzDEl8NL1BhxR31EQAw7DspwbD5non3ZwbTwLYydfCg==",
-      "requires": {
-        "@umbraco-ui/uui-base": "1.5.0"
-      }
-    },
-    "@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
-    },
-    "abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "dev": true
-    },
-    "abort-controller": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "requires": {
-        "event-target-shim": "^5.0.0"
-      }
-    },
-    "accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
-      "requires": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      }
-    },
-    "ace-builds": {
-      "version": "1.31.1",
-      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.31.1.tgz",
-      "integrity": "sha512-3DnE5bZF6Ji+l4F5acoLk+rV7mxrUt1C4r61Xy9owp5rVM4lj5NL8GJfoX6Jnnbhx6kKV7Vdpb+Tco+0ORTvhg=="
-    },
-    "acorn": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
-      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "requires": {
-        "debug": "4"
-      }
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
-    },
-    "angular": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular/-/angular-1.8.3.tgz",
-      "integrity": "sha512-5qjkWIQQVsHj4Sb5TcEs4WZWpFeVFHXwxEBHUhrny41D8UrBAd6T/6nPPAsLngJCReIOqi95W3mxdveveutpZw=="
-    },
-    "angular-animate": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.8.3.tgz",
-      "integrity": "sha512-/LtTKvy5sD6MZbV0v+nHgOIpnFF0mrUp+j5WIxVprVhcrJriYpuCZf4S7Owj1o76De/J0eRzANUozNJ6hVepnQ=="
-    },
-    "angular-aria": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-aria/-/angular-aria-1.8.3.tgz",
-      "integrity": "sha512-qTXclmTW/KGw5JNKKQPcCKKq6hCBZ39jYINmLgMsjUHBAoxULaMRRTaRj/L2VTOjKvK5f9enkx+EUqRqzXDSFQ=="
-    },
-    "angular-chart.js": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/angular-chart.js/-/angular-chart.js-1.1.1.tgz",
-      "integrity": "sha512-6lqkeQvoEOMqtIzHLeOC68fdeqjdgeQ4b3bUG3Lm6X1Y6IBM0m91G6VuVA3EV0puwPuIWz4VYkzjd0DPHhIcpA==",
-      "requires": {
-        "angular": "1.x",
-        "chart.js": "2.3.x"
-      },
-      "dependencies": {
-        "chart.js": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.3.0.tgz",
-          "integrity": "sha512-LwJ6j1FNneojxFYewnz9QDQyjV++KN2s/Lgm0eipDUaKV3Fj5jOA3xtJg7AUGFcbhsYB4+Kn16c1bXwRxbOXow==",
-          "requires": {
-            "chartjs-color": "^2.0.0",
-            "moment": "^2.10.6"
-          }
-        }
-      }
-    },
-    "angular-cookies": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.8.3.tgz",
-      "integrity": "sha512-uRd+zWgqiVnly7+YFRosM8E9tUQeY82dAZdtvonh/CeD/sf5SKN/BNIlMlHxZtoAk72ahTIjqUQGfeHdYcSsRQ=="
-    },
-    "angular-dynamic-locale": {
-      "version": "0.1.38",
-      "resolved": "https://registry.npmjs.org/angular-dynamic-locale/-/angular-dynamic-locale-0.1.38.tgz",
-      "integrity": "sha512-O+bWvCNkIhnedBCYPUgYzVrzXlaYwN8Ke4XpoXoGDu4zIyWNdaFAzMWsuB+dnOD7pKrp8pVkk+ShPSGVnj/3uQ==",
-      "requires": {
-        "@types/angular": "^1.8.4"
-      }
-    },
-    "angular-i18n": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-i18n/-/angular-i18n-1.8.3.tgz",
-      "integrity": "sha512-TWJXIRsq7Qkgyms5dHIgG3s2swn2YKGwJzrIC8u59P9BWV3+gorNhgXCR6nqutApldz7jGBmTNjMgpnF32CIVg=="
-    },
-    "angular-local-storage": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/angular-local-storage/-/angular-local-storage-0.7.1.tgz",
-      "integrity": "sha1-+9JzB2PCn6mvVyXgGGx4BiHozdI="
-    },
-    "angular-messages": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-messages/-/angular-messages-1.8.3.tgz",
-      "integrity": "sha512-f/ywtg32lqzX8FnXkBJOyn13lbCbo333/xy/5TTFcsH/gZdXoiuERj+dLTOs8xHCkOeFQhFx0VD0DgtMgSag7A=="
-    },
-    "angular-mocks": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.8.3.tgz",
-      "integrity": "sha512-vqsT6zwu80cZ8RY7qRQBZuy6Fq5X7/N5hkV9LzNT0c8b546rw4ErGK6muW1u2JnDKYa7+jJuaGM702bWir4HGw=="
-    },
-    "angular-route": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-route/-/angular-route-1.8.3.tgz",
-      "integrity": "sha512-kpIcRmDR2+o1FxDVVYy8Rvfab86/7LDbOgTRb9T+X9ewPQiBRuDEnZtM3oJYBiQLvAXDYTJXHV48n/bGE9Mv2g=="
-    },
-    "angular-sanitize": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.8.3.tgz",
-      "integrity": "sha512-2rxdqzlUVafUeWOwvY/FtyWk1pFTyCtzreeiTytG9m4smpuAEKaIJAjYeVwWsoV+nlTOcgpwV4W1OCmR+BQbUg=="
-    },
-    "angular-touch": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/angular-touch/-/angular-touch-1.8.3.tgz",
-      "integrity": "sha512-QFLhJl5K7AsMBgK87Mxx/XtBYiFl2lBnjgGNCjGyAh5gM8eHsBWgaOxZsovP6qZSljG4wIA9dA9NPkXXtbo/WQ=="
-    },
-    "angular-ui-sortable": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/angular-ui-sortable/-/angular-ui-sortable-0.19.0.tgz",
-      "integrity": "sha512-u/uc981Nzg4XN1bMU9qKleMTSt7F1XjMWnyGw6gxPLIeQeLZm8jWNy7tj8y2r2HmvzXFbQVq2z6rObznFKAekQ==",
-      "requires": {
-        "angular": ">=1.2.x",
-        "jquery": ">=3.1.x",
-        "jquery-ui-dist": ">=1.12.x"
-      }
-    },
-    "animejs": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/animejs/-/animejs-3.2.1.tgz",
-      "integrity": "sha512-sWno3ugFryK5nhiDm/2BKeFCpZv7vzerWUcUPyAZLDhMek3+S/p418ldZJbJXo5ZUOpfm2kP2XRO4NJcULMy9A=="
-    },
-    "ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "^0.1.0"
-      }
-    },
-    "ansi-cyan": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
-      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
-    "ansi-gray": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
-    "ansi-red": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
-      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "ansi-wrap": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-      "dev": true
-    },
-    "anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
-      }
-    },
-    "append-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
-      "dev": true,
-      "requires": {
-        "buffer-equal": "^1.0.0"
-      }
-    },
-    "arch": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
-      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
-      "dev": true,
-      "optional": true
-    },
-    "archive-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz",
-      "integrity": "sha1-+S5yIzBW38aWlHJ0nCZ72wRrHXA=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "file-type": "^4.2.0"
-      },
-      "dependencies": {
-        "file-type": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
-          "integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-      "dev": true
-    },
-    "argh": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/argh/-/argh-0.1.4.tgz",
-      "integrity": "sha1-PrTWEpc/xrbcbvM49W91nyrFw6Y=",
-      "dev": true
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
-    },
-    "arr-filter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
-      "dev": true,
-      "requires": {
-        "make-iterator": "^1.0.0"
-      }
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
-    },
-    "arr-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
-      "dev": true,
-      "requires": {
-        "make-iterator": "^1.0.0"
-      }
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
-    },
-    "array-differ": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-      "dev": true
-    },
-    "array-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-      "dev": true
-    },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true,
-      "optional": true
-    },
-    "array-initial": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
-      "dev": true,
-      "requires": {
-        "array-slice": "^1.0.0",
-        "is-number": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        }
-      }
-    },
-    "array-last": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
-      "dev": true,
-      "requires": {
-        "is-number": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        }
-      }
-    },
-    "array-slice": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-      "dev": true
-    },
-    "array-sort": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
-      "dev": true,
-      "requires": {
-        "default-compare": "^1.0.0",
-        "get-value": "^2.0.6",
-        "kind-of": "^5.0.2"
-      }
-    },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
-    },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
-    },
-    "async": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.14"
-      }
-    },
-    "async-done": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.2",
-        "process-nextick-args": "^2.0.0",
-        "stream-exhaust": "^1.0.1"
-      }
-    },
-    "async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
-    },
-    "async-settle": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
-      "dev": true,
-      "requires": {
-        "async-done": "^1.2.2"
-      }
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
-    "autoprefixer": {
-      "version": "10.4.16",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz",
-      "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.21.10",
-        "caniuse-lite": "^1.0.30001538",
-        "fraction.js": "^4.3.6",
-        "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "babel-plugin-polyfill-corejs2": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "semver": "^6.1.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "babel-plugin-polyfill-corejs3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "core-js-compat": "^3.25.1"
-      }
-    },
-    "babel-plugin-polyfill-regenerator": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3"
-      }
-    },
-    "bach": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
-      "dev": true,
-      "requires": {
-        "arr-filter": "^1.1.1",
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "array-each": "^1.0.0",
-        "array-initial": "^1.0.0",
-        "array-last": "^1.1.1",
-        "async-done": "^1.2.2",
-        "async-settle": "^1.0.0",
-        "now-and-later": "^2.0.0"
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        }
-      }
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true
-    },
-    "base64id": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
-      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
-      "dev": true
-    },
-    "beeper": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-      "dev": true
-    },
-    "bin-build": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bin-build/-/bin-build-3.0.0.tgz",
-      "integrity": "sha512-jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "decompress": "^4.0.0",
-        "download": "^6.2.2",
-        "execa": "^0.7.0",
-        "p-map-series": "^1.0.0",
-        "tempfile": "^2.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "bin-check": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz",
-      "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "execa": "^0.7.0",
-        "executable": "^4.1.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "bin-version": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-3.1.0.tgz",
-      "integrity": "sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "execa": "^1.0.0",
-        "find-versions": "^3.0.0"
-      }
-    },
-    "bin-version-check": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-4.0.0.tgz",
-      "integrity": "sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "bin-version": "^3.0.0",
-        "semver": "^5.6.0",
-        "semver-truncate": "^1.1.2"
-      }
-    },
-    "bin-wrapper": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-4.1.0.tgz",
-      "integrity": "sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "bin-check": "^4.1.0",
-        "bin-version-check": "^4.0.0",
-        "download": "^7.1.0",
-        "import-lazy": "^3.1.0",
-        "os-filter-obj": "^2.0.0",
-        "pify": "^4.0.1"
-      },
-      "dependencies": {
-        "download": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz",
-          "integrity": "sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "archive-type": "^4.0.0",
-            "caw": "^2.0.1",
-            "content-disposition": "^0.5.2",
-            "decompress": "^4.2.0",
-            "ext-name": "^5.0.0",
-            "file-type": "^8.1.0",
-            "filenamify": "^2.0.0",
-            "get-stream": "^3.0.0",
-            "got": "^8.3.1",
-            "make-dir": "^1.2.0",
-            "p-event": "^2.1.0",
-            "pify": "^3.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-              "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "file-type": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz",
-          "integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==",
-          "dev": true,
-          "optional": true
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true,
-          "optional": true
-        },
-        "got": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
-          "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@sindresorhus/is": "^0.7.0",
-            "cacheable-request": "^2.1.1",
-            "decompress-response": "^3.3.0",
-            "duplexer3": "^0.1.4",
-            "get-stream": "^3.0.0",
-            "into-stream": "^3.1.0",
-            "is-retry-allowed": "^1.1.0",
-            "isurl": "^1.0.0-alpha5",
-            "lowercase-keys": "^1.0.0",
-            "mimic-response": "^1.0.0",
-            "p-cancelable": "^0.4.0",
-            "p-timeout": "^2.0.1",
-            "pify": "^3.0.0",
-            "safe-buffer": "^5.1.1",
-            "timed-out": "^4.0.1",
-            "url-parse-lax": "^3.0.0",
-            "url-to-options": "^1.0.1"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-              "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "make-dir": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "pify": "^3.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-              "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "p-cancelable": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
-          "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
-          "dev": true,
-          "optional": true
-        },
-        "p-event": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz",
-          "integrity": "sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "p-timeout": "^2.0.1"
-          }
-        },
-        "p-timeout": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
-          "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "p-finally": "^1.0.0"
-          }
-        },
-        "prepend-http": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-          "dev": true,
-          "optional": true
-        },
-        "url-parse-lax": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-          "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "prepend-http": "^2.0.0"
-          }
-        }
-      }
-    },
-    "binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true
-    },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "bl": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
-      "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "readable-stream": "^2.3.5",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-      "dev": true
-    },
-    "bootstrap": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
-      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="
-    },
-    "bootstrap-social": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/bootstrap-social/-/bootstrap-social-5.1.1.tgz",
-      "integrity": "sha1-dTDGeK31bPj60/qCwp1NPl0CdQE=",
-      "requires": {
-        "bootstrap": "~3",
-        "font-awesome": "~4.7"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      }
-    },
-    "browserslist": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
-      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "^1.0.30001541",
-        "electron-to-chromium": "^1.4.535",
-        "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.13"
-      }
-    },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "buffer-alloc": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "buffer-alloc-unsafe": "^1.1.0",
-        "buffer-fill": "^1.0.0"
-      }
-    },
-    "buffer-alloc-unsafe": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
-      "dev": true,
-      "optional": true
-    },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true,
-      "optional": true
-    },
-    "buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-      "dev": true
-    },
-    "buffer-fill": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
-      "dev": true,
-      "optional": true
-    },
-    "buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "bufferstreams": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz",
-      "integrity": "sha1-z7GtlWjTujz+k1upq92VLeiKqyo=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^1.0.33"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
-    "bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true
-    },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      }
-    },
-    "cacheable-request": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
-      "integrity": "sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "clone-response": "1.0.2",
-        "get-stream": "3.0.0",
-        "http-cache-semantics": "3.8.1",
-        "keyv": "3.0.0",
-        "lowercase-keys": "1.0.0",
-        "normalize-url": "2.0.1",
-        "responselike": "1.0.2"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true,
-          "optional": true
-        },
-        "lowercase-keys": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-          "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
-          "dev": true,
-          "optional": true
-        },
-        "normalize-url": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
-          "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "prepend-http": "^2.0.0",
-            "query-string": "^5.0.1",
-            "sort-keys": "^2.0.0"
-          }
-        },
-        "prepend-http": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-          "dev": true,
-          "optional": true
-        },
-        "sort-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
-          "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-plain-obj": "^1.0.0"
-          }
-        }
-      }
-    },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "dev": true,
-      "optional": true
-    },
-    "camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      }
-    },
-    "caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001550",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001550.tgz",
-      "integrity": "sha512-p82WjBYIypO0ukTsd/FG3Xxs+4tFeaY9pfT4amQL8KWtYH7H9nYwReGAbMTJ0hsmRO8IfDtsS6p3ZWj8+1c2RQ==",
-      "dev": true
-    },
-    "caw": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
-      "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "get-proxy": "^2.0.0",
-        "isurl": "^1.0.0-alpha5",
-        "tunnel-agent": "^0.6.0",
-        "url-to-options": "^1.0.1"
-      }
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "chart.js": {
-      "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz",
-      "integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==",
-      "requires": {
-        "chartjs-color": "^2.1.0",
-        "moment": "^2.10.2"
-      }
-    },
-    "chartjs-color": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz",
-      "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==",
-      "requires": {
-        "chartjs-color-string": "^0.6.0",
-        "color-convert": "^1.9.3"
-      }
-    },
-    "chartjs-color-string": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
-      "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
-      "requires": {
-        "color-name": "^1.0.0"
-      }
-    },
-    "chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "requires": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "fsevents": "^1.2.7",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      }
-    },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        }
-      }
-    },
-    "clean-css": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
-      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
-      "dev": true,
-      "requires": {
-        "source-map": "~0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "cli-color": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-1.4.0.tgz",
-      "integrity": "sha512-xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.1.1",
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "memoizee": "^0.4.14",
-        "timers-ext": "^0.1.5"
-      }
-    },
-    "clipboard": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
-      "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
-      "requires": {
-        "good-listener": "^1.2.2",
-        "select": "^1.1.2",
-        "tiny-emitter": "^2.0.0"
-      }
-    },
-    "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dev": true,
-      "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
-      }
-    },
-    "clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-      "dev": true
-    },
-    "clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-      "dev": true
-    },
-    "clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "clone-stats": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-      "dev": true
-    },
-    "cloneable-readable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^2.0.0",
-        "readable-stream": "^2.3.5"
-      }
-    },
-    "coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      }
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
-    },
-    "collection-map": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-      "dev": true,
-      "requires": {
-        "arr-map": "^2.0.2",
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      }
-    },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      }
-    },
-    "color": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
-      "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.2"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
-      },
-      "dependencies": {
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        }
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "color-string": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz",
-      "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==",
-      "dev": true,
-      "requires": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true
-    },
-    "colord": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
-    },
-    "colornames": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz",
-      "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=",
-      "dev": true
-    },
-    "colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-      "dev": true
-    },
-    "colorspace": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz",
-      "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==",
-      "dev": true,
-      "requires": {
-        "color": "3.0.x",
-        "text-hex": "1.0.x"
-      }
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "concat-with-sourcemaps": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
-      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "config-chain": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
-      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "ini": "^1.3.4",
-        "proto-list": "~1.2.1"
-      }
-    },
-    "connect": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "console-stream": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz",
-      "integrity": "sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=",
-      "dev": true,
-      "optional": true
-    },
-    "consolidate": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.1.1"
-      }
-    },
-    "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
-    },
-    "convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-      "dev": true
-    },
-    "copy-anything": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
-      "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
-      "dev": true,
-      "requires": {
-        "is-what": "^3.14.1"
-      }
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
-    },
-    "copy-props": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
-      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
-      "dev": true,
-      "requires": {
-        "each-props": "^1.3.2",
-        "is-plain-object": "^5.0.0"
-      }
-    },
-    "core-js-compat": {
-      "version": "3.33.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz",
-      "integrity": "sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.22.1"
-      }
-    },
-    "core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4",
-        "vary": "^1"
-      }
-    },
-    "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
-    "css": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.4",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "source-map-resolve": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-          "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-          "dev": true,
-          "requires": {
-            "atob": "^2.1.2",
-            "decode-uri-component": "^0.2.0"
-          }
-        }
-      }
-    },
-    "css-declaration-sorter": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz",
-      "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==",
-      "dev": true,
-      "requires": {}
-    },
-    "css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      },
-      "dependencies": {
-        "dom-serializer": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-          "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "domelementtype": "^2.0.1",
-            "domhandler": "^4.2.0",
-            "entities": "^2.0.0"
-          }
-        },
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-          "dev": true,
-          "optional": true
-        },
-        "domhandler": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-          "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "domelementtype": "^2.2.0"
-          }
-        },
-        "domutils": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-          "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "dom-serializer": "^1.0.1",
-            "domelementtype": "^2.2.0",
-            "domhandler": "^4.2.0"
-          }
-        },
-        "entities": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
-      "dev": true,
-      "optional": true
-    },
-    "css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true
-    },
-    "cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true
-    },
-    "cssnano": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.1.tgz",
-      "integrity": "sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg==",
-      "dev": true,
-      "requires": {
-        "cssnano-preset-default": "^6.0.1",
-        "lilconfig": "^2.1.0"
-      }
-    },
-    "cssnano-preset-default": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz",
-      "integrity": "sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ==",
-      "dev": true,
-      "requires": {
-        "css-declaration-sorter": "^6.3.1",
-        "cssnano-utils": "^4.0.0",
-        "postcss-calc": "^9.0.0",
-        "postcss-colormin": "^6.0.0",
-        "postcss-convert-values": "^6.0.0",
-        "postcss-discard-comments": "^6.0.0",
-        "postcss-discard-duplicates": "^6.0.0",
-        "postcss-discard-empty": "^6.0.0",
-        "postcss-discard-overridden": "^6.0.0",
-        "postcss-merge-longhand": "^6.0.0",
-        "postcss-merge-rules": "^6.0.1",
-        "postcss-minify-font-values": "^6.0.0",
-        "postcss-minify-gradients": "^6.0.0",
-        "postcss-minify-params": "^6.0.0",
-        "postcss-minify-selectors": "^6.0.0",
-        "postcss-normalize-charset": "^6.0.0",
-        "postcss-normalize-display-values": "^6.0.0",
-        "postcss-normalize-positions": "^6.0.0",
-        "postcss-normalize-repeat-style": "^6.0.0",
-        "postcss-normalize-string": "^6.0.0",
-        "postcss-normalize-timing-functions": "^6.0.0",
-        "postcss-normalize-unicode": "^6.0.0",
-        "postcss-normalize-url": "^6.0.0",
-        "postcss-normalize-whitespace": "^6.0.0",
-        "postcss-ordered-values": "^6.0.0",
-        "postcss-reduce-initial": "^6.0.0",
-        "postcss-reduce-transforms": "^6.0.0",
-        "postcss-svgo": "^6.0.0",
-        "postcss-unique-selectors": "^6.0.0"
-      }
-    },
-    "cssnano-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.0.tgz",
-      "integrity": "sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw==",
-      "dev": true,
-      "requires": {}
-    },
-    "csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "css-tree": "^1.1.2"
-      },
-      "dependencies": {
-        "css-tree": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-          "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "mdn-data": "2.0.14",
-            "source-map": "^0.6.1"
-          }
-        },
-        "mdn-data": {
-          "version": "2.0.14",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-          "dev": true,
-          "optional": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "cssstyle": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
-      "integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==",
-      "dev": true,
-      "requires": {
-        "rrweb-cssom": "^0.6.0"
-      }
-    },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "array-find-index": "^1.0.1"
-      }
-    },
-    "custom-event": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
-      "dev": true
-    },
-    "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
-      "requires": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "data-urls": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
-      "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^12.0.0"
-      }
-    },
-    "date-format": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz",
-      "integrity": "sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==",
-      "dev": true
-    },
-    "dateformat": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-      "dev": true
-    },
-    "debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dev": true,
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "debug-fabulous": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
-      "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
-      "dev": true,
-      "requires": {
-        "debug": "3.X",
-        "memoizee": "0.4.X",
-        "object-assign": "4.X"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "decimal.js": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-      "dev": true
-    },
-    "decode-uri-component": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true
-    },
-    "decompress": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz",
-      "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "decompress-tar": "^4.0.0",
-        "decompress-tarbz2": "^4.0.0",
-        "decompress-targz": "^4.0.0",
-        "decompress-unzip": "^4.0.1",
-        "graceful-fs": "^4.1.10",
-        "make-dir": "^1.0.0",
-        "pify": "^2.3.0",
-        "strip-dirs": "^2.0.0"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "pify": "^3.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-              "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "decompress-tar": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
-      "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "file-type": "^5.2.0",
-        "is-stream": "^1.1.0",
-        "tar-stream": "^1.5.2"
-      },
-      "dependencies": {
-        "file-type": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
-          "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "decompress-tarbz2": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
-      "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "decompress-tar": "^4.1.0",
-        "file-type": "^6.1.0",
-        "is-stream": "^1.1.0",
-        "seek-bzip": "^1.0.5",
-        "unbzip2-stream": "^1.0.9"
-      },
-      "dependencies": {
-        "file-type": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
-          "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "decompress-targz": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
-      "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "decompress-tar": "^4.1.1",
-        "file-type": "^5.2.0",
-        "is-stream": "^1.1.0"
-      },
-      "dependencies": {
-        "file-type": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
-          "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "decompress-unzip": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
-      "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "file-type": "^3.8.0",
-        "get-stream": "^2.2.0",
-        "pify": "^2.3.0",
-        "yauzl": "^2.4.2"
-      },
-      "dependencies": {
-        "file-type": {
-          "version": "3.9.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
-          "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
-        },
-        "get-stream": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
-          "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "object-assign": "^4.0.1",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "default-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^5.0.2"
-      }
-    },
-    "default-resolution": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
-    },
-    "delegate": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
-      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true
-    },
-    "detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "dev": true
-    },
-    "detect-newline": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
-      "dev": true
-    },
-    "di": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
-      "dev": true
-    },
-    "diagnostics": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz",
-      "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==",
-      "dev": true,
-      "requires": {
-        "colorspace": "1.1.x",
-        "enabled": "1.0.x",
-        "kuler": "1.0.x"
-      }
-    },
-    "diff": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
-      "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw=="
-    },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "dom-serialize": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
-      "dev": true,
-      "requires": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
-      }
-    },
-    "dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-          "dev": true
-        },
-        "entities": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-          "dev": true
-        }
-      }
-    },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "dev": true,
-      "requires": {
-        "webidl-conversions": "^7.0.0"
-      }
-    },
-    "domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1"
-      }
-    },
-    "domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "download": {
-      "version": "6.2.5",
-      "resolved": "https://registry.npmjs.org/download/-/download-6.2.5.tgz",
-      "integrity": "sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "caw": "^2.0.0",
-        "content-disposition": "^0.5.2",
-        "decompress": "^4.0.0",
-        "ext-name": "^5.0.0",
-        "file-type": "5.2.0",
-        "filenamify": "^2.0.0",
-        "get-stream": "^3.0.0",
-        "got": "^7.0.0",
-        "make-dir": "^1.0.0",
-        "p-event": "^1.0.0",
-        "pify": "^3.0.0"
-      },
-      "dependencies": {
-        "file-type": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
-          "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-          "dev": true,
-          "optional": true
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true,
-          "optional": true
-        },
-        "make-dir": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "pify": "^3.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~1.1.9"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
-    "duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-      "dev": true,
-      "optional": true
-    },
-    "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "each-props": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "^2.0.1",
-        "object.defaults": "^1.1.0"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "electron-to-chromium": {
-      "version": "1.4.557",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.557.tgz",
-      "integrity": "sha512-6x0zsxyMXpnMJnHrondrD3SuAeKcwij9S+83j2qHAQPXbGTDDfgImzzwgGlzrIcXbHQ42tkG4qA6U860cImNhw==",
-      "dev": true
-    },
-    "emits": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emits/-/emits-3.0.0.tgz",
-      "integrity": "sha1-MnUrupXhcHshlWI4Srm7ix/WL3A=",
-      "dev": true
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "enabled": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
-      "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=",
-      "dev": true,
-      "requires": {
-        "env-variable": "0.0.x"
-      }
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "engine.io": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.3.tgz",
-      "integrity": "sha512-IML/R4eG/pUS5w7OfcDE0jKrljWS9nwnEfsxWCIJF5eO6AHo6+Hlv+lQbdlAYsiJPHzUthLm1RUjnBzWOs45cw==",
-      "dev": true,
-      "requires": {
-        "@types/cookie": "^0.4.1",
-        "@types/cors": "^2.8.12",
-        "@types/node": ">=10.0.0",
-        "accepts": "~1.3.4",
-        "base64id": "2.0.0",
-        "cookie": "~0.4.1",
-        "cors": "~2.8.5",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.2.1",
-        "ws": "~8.11.0"
-      },
-      "dependencies": {
-        "ws": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-          "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-          "dev": true,
-          "requires": {}
-        }
-      }
-    },
-    "engine.io-parser": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz",
-      "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==",
-      "dev": true
-    },
-    "ent": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
-      "dev": true
-    },
-    "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
-    "env-variable": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz",
-      "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==",
-      "dev": true
-    },
-    "errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "prr": "~1.0.1"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      },
-      "dependencies": {
-        "next-tick": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-          "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-          "dev": true
-        }
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
-      "dev": true
-    },
-    "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
-      "requires": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "escodegen": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
-      "dev": true,
-      "requires": {
-        "esprima": "^4.0.1",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "eslint": {
-      "version": "8.52.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
-      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
-      "dev": true,
-      "requires": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.52.0",
-        "@humanwhocodes/config-array": "^0.11.13",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "cross-spawn": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^6.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "glob-parent": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.3"
-          }
-        },
-        "globals": {
-          "version": "13.19.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-          "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "levn": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "^1.2.1",
-            "type-check": "~0.4.0"
-          }
-        },
-        "optionator": {
-          "version": "0.9.3",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-          "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-          "dev": true,
-          "requires": {
-            "@aashutoshrathi/word-wrap": "^1.2.3",
-            "deep-is": "^0.1.3",
-            "fast-levenshtein": "^2.0.6",
-            "levn": "^0.4.1",
-            "prelude-ls": "^1.2.1",
-            "type-check": "^0.4.0"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
-        },
-        "prelude-ls": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-          "dev": true
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "type-check": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "^1.2.1"
-          }
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true
-    },
-    "espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      }
-    },
-    "esprima": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-      "dev": true
-    },
-    "esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        }
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        }
-      }
-    },
-    "estemplate": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/estemplate/-/estemplate-0.5.1.tgz",
-      "integrity": "sha1-FxSp1GGQc4rJWLyv1J4CnNpWo54=",
-      "dev": true,
-      "requires": {
-        "esprima": "^2.7.2",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
-    },
-    "eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "eventsource": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz",
-      "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA=="
-    },
-    "exec-buffer": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz",
-      "integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "execa": "^0.7.0",
-        "p-finally": "^1.0.0",
-        "pify": "^3.0.0",
-        "rimraf": "^2.5.4",
-        "tempfile": "^2.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true,
-          "optional": true
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      }
-    },
-    "executable": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
-      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "pify": "^2.2.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-      "dev": true,
-      "requires": {
-        "fill-range": "^2.1.0"
-      },
-      "dependencies": {
-        "fill-range": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-          "dev": true,
-          "requires": {
-            "is-number": "^2.1.0",
-            "isobject": "^2.0.0",
-            "randomatic": "^3.0.0",
-            "repeat-element": "^1.1.2",
-            "repeat-string": "^1.5.2"
-          }
-        },
-        "is-number": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-          "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "isobject": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-          "dev": true,
-          "requires": {
-            "isarray": "1.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1"
-      }
-    },
-    "ext": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
-      "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
-      "dev": true,
-      "requires": {
-        "type": "^2.5.0"
-      },
-      "dependencies": {
-        "type": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
-          "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
-          "dev": true
-        }
-      }
-    },
-    "ext-list": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
-      "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "mime-db": "^1.28.0"
-      }
-    },
-    "ext-name": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
-      "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "ext-list": "^2.0.0",
-        "sort-keys-length": "^1.0.0"
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "requires": {
-        "is-extendable": "^0.1.0"
-      }
-    },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        }
-      }
-    },
-    "fancy-log": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-      "dev": true,
-      "requires": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
-      }
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "fast-fifo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
-      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
-      "dev": true
-    },
-    "fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "glob-parent": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-          "dev": true,
-          "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        }
-      }
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "fast-xml-parser": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz",
-      "integrity": "sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "strnum": "^1.0.5"
-      }
-    },
-    "fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "dev": true,
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "pend": "~1.2.0"
-      }
-    },
-    "fetch-cookie": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-2.1.0.tgz",
-      "integrity": "sha512-39+cZRbWfbibmj22R2Jy6dmTbAWC+oqun1f1FzQaNurkPDUP4C38jpeZbiXCR88RKRVDp8UcDrbFXkNhN+NjYg==",
-      "requires": {
-        "set-cookie-parser": "^2.4.8",
-        "tough-cookie": "^4.0.0"
-      }
-    },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "file-type": {
-      "version": "12.4.2",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz",
-      "integrity": "sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==",
-      "dev": true
-    },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
-    "filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-      "dev": true
-    },
-    "filename-reserved-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
-      "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
-      "dev": true,
-      "optional": true
-    },
-    "filenamify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
-      "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "filename-reserved-regex": "^2.0.0",
-        "strip-outer": "^1.0.0",
-        "trim-repeated": "^1.0.0"
-      }
-    },
-    "fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "requires": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "find-versions": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz",
-      "integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "semver-regex": "^2.0.0"
-      }
-    },
-    "findup-sync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
-      "dev": true,
-      "requires": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      }
-    },
-    "fined": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
-        "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
-      }
-    },
-    "first-chunk-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
-      "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "flagged-respawn": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-      "dev": true
-    },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "flatpickr": {
-      "version": "4.6.13",
-      "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.13.tgz",
-      "integrity": "sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw=="
-    },
-    "flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
-    },
-    "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "follow-redirects": {
-      "version": "1.15.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
-      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
-      "dev": true
-    },
-    "font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.1"
-      }
-    },
-    "fork-stream": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
-      "integrity": "sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==",
-      "dev": true
-    },
-    "form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "fraction.js": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
-      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
-      "dev": true
-    },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "requires": {
-        "map-cache": "^0.2.2"
-      }
-    },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true,
-      "optional": true
-    },
-    "fs-extra": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-      "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      }
-    },
-    "fs-mkdirp-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "through2": "^2.0.3"
-      }
-    },
-    "fs-readfile-promise": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-readfile-promise/-/fs-readfile-promise-3.0.1.tgz",
-      "integrity": "sha512-LsSxMeaJdYH27XrW7Dmq0Gx63mioULCRel63B5VeELYLavi1wF5s0XfsIdKDFdCL9hsfQ2qBvXJszQtQJ9h17A==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      }
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true
-    },
-    "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-      "dev": true
-    },
-    "get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "get-proxy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
-      "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "npm-conf": "^1.1.0"
-      }
-    },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true,
-      "optional": true
-    },
-    "get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
-    },
-    "gifsicle": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-5.3.0.tgz",
-      "integrity": "sha512-FJTpgdj1Ow/FITB7SVza5HlzXa+/lqEY0tHQazAJbuAdvyJtkH4wIdsR2K414oaTwRXHFLLF+tYbipj+OpYg+Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "bin-build": "^3.0.0",
-        "bin-wrapper": "^4.0.0",
-        "execa": "^5.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "execa": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "cross-spawn": "^7.0.3",
-            "get-stream": "^6.0.0",
-            "human-signals": "^2.1.0",
-            "is-stream": "^2.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^4.0.1",
-            "onetime": "^5.1.2",
-            "signal-exit": "^3.0.3",
-            "strip-final-newline": "^2.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-          "dev": true,
-          "optional": true
-        },
-        "is-stream": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-          "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-          "dev": true,
-          "optional": true
-        },
-        "npm-run-path": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "path-key": "^3.0.0"
-          }
-        },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true,
-          "optional": true
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true,
-          "optional": true
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
-      "dev": true,
-      "requires": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-          "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^2.0.0"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        }
-      }
-    },
-    "glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      },
-      "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
-      }
-    },
-    "glob-stream": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==",
-      "dev": true,
-      "requires": {
-        "extend": "^3.0.0",
-        "glob": "^7.1.1",
-        "glob-parent": "^3.1.0",
-        "is-negated-glob": "^1.0.0",
-        "ordered-read-streams": "^1.0.0",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.1.5",
-        "remove-trailing-separator": "^1.0.1",
-        "to-absolute-glob": "^2.0.0",
-        "unique-stream": "^2.0.2"
-      }
-    },
-    "glob-watcher": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
-      "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
-      "dev": true,
-      "requires": {
-        "anymatch": "^2.0.0",
-        "async-done": "^1.2.0",
-        "chokidar": "^2.0.0",
-        "is-negated-glob": "^1.0.0",
-        "just-debounce": "^1.0.0",
-        "normalize-path": "^3.0.0",
-        "object.defaults": "^1.1.0"
-      }
-    },
-    "global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dev": true,
-      "requires": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
-      }
-    },
-    "global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      }
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true
-    },
-    "globby": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz",
-      "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==",
-      "dev": true,
-      "requires": {
-        "@types/glob": "^7.1.1",
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.0.3",
-        "glob": "^7.1.3",
-        "ignore": "^5.1.1",
-        "merge2": "^1.2.3",
-        "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        }
-      }
-    },
-    "glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-      "dev": true,
-      "requires": {
-        "sparkles": "^1.0.0"
-      }
-    },
-    "good-listener": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
-      "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
-      "requires": {
-        "delegate": "^3.1.2"
-      }
-    },
-    "got": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
-      "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "decompress-response": "^3.2.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^3.0.0",
-        "is-plain-obj": "^1.1.0",
-        "is-retry-allowed": "^1.0.0",
-        "is-stream": "^1.0.0",
-        "isurl": "^1.0.0-alpha5",
-        "lowercase-keys": "^1.0.0",
-        "p-cancelable": "^0.3.0",
-        "p-timeout": "^1.1.1",
-        "safe-buffer": "^5.0.1",
-        "timed-out": "^4.0.0",
-        "url-parse-lax": "^1.0.0",
-        "url-to-options": "^1.0.1"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
-    },
-    "graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "growly": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
-      "dev": true
-    },
-    "gulp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
-      "dev": true,
-      "requires": {
-        "glob-watcher": "^5.0.3",
-        "gulp-cli": "^2.2.0",
-        "undertaker": "^1.2.1",
-        "vinyl-fs": "^3.0.0"
-      }
-    },
-    "gulp-angular-embed-templates": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-angular-embed-templates/-/gulp-angular-embed-templates-2.3.0.tgz",
-      "integrity": "sha512-D4lOP2G9JYbRpuZo6rsiF5f/PpzU1BgaaAxbgxNQtyNp4zME/E3c/0F73F5J/nK+ZRMwdYblgqa4vCgRS9iVwg==",
-      "dev": true,
-      "requires": {
-        "gulp-util": "^3.0.6",
-        "htmlparser2": "~3.9.1",
-        "minimize": "^2.0.0",
-        "object-assign": "4.1.0",
-        "through2": "^2.0.1"
-      }
-    },
-    "gulp-babel": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-babel/-/gulp-babel-8.0.0.tgz",
-      "integrity": "sha512-oomaIqDXxFkg7lbpBou/gnUkX51/Y/M2ZfSjL2hdqXTAlSWZcgZtd2o0cOH0r/eE8LWD0+Q/PsLsr2DKOoqToQ==",
-      "dev": true,
-      "requires": {
-        "plugin-error": "^1.0.1",
-        "replace-ext": "^1.0.0",
-        "through2": "^2.0.0",
-        "vinyl-sourcemaps-apply": "^0.2.0"
-      }
-    },
-    "gulp-clean-css": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz",
-      "integrity": "sha512-mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg==",
-      "dev": true,
-      "requires": {
-        "clean-css": "4.2.3",
-        "plugin-error": "1.0.1",
-        "through2": "3.0.1",
-        "vinyl-sourcemaps-apply": "0.2.1"
-      },
-      "dependencies": {
-        "through2": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "2 || 3"
-          }
-        }
-      }
-    },
-    "gulp-cli": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^1.0.1",
-        "archy": "^1.0.0",
-        "array-sort": "^1.0.0",
-        "color-support": "^1.1.3",
-        "concat-stream": "^1.6.0",
-        "copy-props": "^2.0.1",
-        "fancy-log": "^1.3.2",
-        "gulplog": "^1.0.0",
-        "interpret": "^1.4.0",
-        "isobject": "^3.0.1",
-        "liftoff": "^3.1.0",
-        "matchdep": "^2.0.0",
-        "mute-stdout": "^1.0.0",
-        "pretty-hrtime": "^1.0.0",
-        "replace-homedir": "^1.0.0",
-        "semver-greatest-satisfied-range": "^1.1.0",
-        "v8flags": "^3.2.0",
-        "yargs": "^7.1.0"
-      }
-    },
-    "gulp-concat": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
-      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
-      "dev": true,
-      "requires": {
-        "concat-with-sourcemaps": "^1.0.0",
-        "through2": "^2.0.0",
-        "vinyl": "^2.0.0"
-      }
-    },
-    "gulp-eslint-new": {
-      "version": "1.8.4",
-      "resolved": "https://registry.npmjs.org/gulp-eslint-new/-/gulp-eslint-new-1.8.4.tgz",
-      "integrity": "sha512-T/eY9OWHJ0LGYvHUagPpC8tOMgLpniYKkgtwn3XA83e3IgeZV0NjlcWbhxkBHwO/LX/lbK01jp/Xqs6REyy+Vg==",
-      "dev": true,
-      "requires": {
-        "@types/eslint": "^8.44.3",
-        "@types/node": ">=12",
-        "eslint": "8",
-        "fancy-log": "^2.0.0",
-        "plugin-error": "^2.0.1",
-        "semver": "^7.5.4",
-        "ternary-stream": "^3.0.0",
-        "vinyl-fs": "^4.0.0"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-          "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-          "dev": true,
-          "requires": {
-            "normalize-path": "^3.0.0",
-            "picomatch": "^2.0.4"
-          }
-        },
-        "convert-source-map": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-          "dev": true
-        },
-        "fancy-log": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz",
-          "integrity": "sha512-9CzxZbACXMUXW13tS0tI8XsGGmxWzO2DmYrGuBJOJ8k8q2K7hwfJA5qHjuPPe8wtsco33YR9wc+Rlr5wYFvhSA==",
-          "dev": true,
-          "requires": {
-            "color-support": "^1.1.3"
-          }
-        },
-        "fs-mkdirp-stream": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz",
-          "integrity": "sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.8",
-            "streamx": "^2.12.0"
-          }
-        },
-        "glob-parent": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.3"
-          }
-        },
-        "glob-stream": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.0.tgz",
-          "integrity": "sha512-CdIUuwOkYNv9ZadR3jJvap8CMooKziQZ/QCSPhEb7zqfsEI5YnPmvca7IvbaVE3z58ZdUYD2JsU6AUWjL8WZJA==",
-          "dev": true,
-          "requires": {
-            "@gulpjs/to-absolute-glob": "^4.0.0",
-            "anymatch": "^3.1.3",
-            "fastq": "^1.13.0",
-            "glob-parent": "^6.0.2",
-            "is-glob": "^4.0.3",
-            "is-negated-glob": "^1.0.0",
-            "normalize-path": "^3.0.0",
-            "streamx": "^2.12.5"
-          }
-        },
-        "iconv-lite": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3.0.0"
-          }
-        },
-        "lead": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/lead/-/lead-4.0.0.tgz",
-          "integrity": "sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "now-and-later": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-3.0.0.tgz",
-          "integrity": "sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==",
-          "dev": true,
-          "requires": {
-            "once": "^1.4.0"
-          }
-        },
-        "plugin-error": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz",
-          "integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==",
-          "dev": true,
-          "requires": {
-            "ansi-colors": "^1.0.1"
-          }
-        },
-        "replace-ext": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
-          "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
-          "dev": true
-        },
-        "resolve-options": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-2.0.0.tgz",
-          "integrity": "sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==",
-          "dev": true,
-          "requires": {
-            "value-or-function": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "to-through": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/to-through/-/to-through-3.0.0.tgz",
-          "integrity": "sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==",
-          "dev": true,
-          "requires": {
-            "streamx": "^2.12.5"
-          }
-        },
-        "value-or-function": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz",
-          "integrity": "sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==",
-          "dev": true
-        },
-        "vinyl": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-          "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
-          "dev": true,
-          "requires": {
-            "clone": "^2.1.2",
-            "clone-stats": "^1.0.0",
-            "remove-trailing-separator": "^1.1.0",
-            "replace-ext": "^2.0.0",
-            "teex": "^1.0.1"
-          }
-        },
-        "vinyl-fs": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.0.tgz",
-          "integrity": "sha512-7GbgBnYfaquMk3Qu9g22x000vbYkOex32930rBnc3qByw6HfMEAoELjCjoJv4HuEQxHAurT+nvMHm6MnJllFLw==",
-          "dev": true,
-          "requires": {
-            "fs-mkdirp-stream": "^2.0.1",
-            "glob-stream": "^8.0.0",
-            "graceful-fs": "^4.2.11",
-            "iconv-lite": "^0.6.3",
-            "is-valid-glob": "^1.0.0",
-            "lead": "^4.0.0",
-            "normalize-path": "3.0.0",
-            "resolve-options": "^2.0.0",
-            "stream-composer": "^1.0.2",
-            "streamx": "^2.14.0",
-            "to-through": "^3.0.0",
-            "value-or-function": "^4.0.0",
-            "vinyl": "^3.0.0",
-            "vinyl-sourcemap": "^2.0.0"
-          }
-        },
-        "vinyl-sourcemap": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz",
-          "integrity": "sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==",
-          "dev": true,
-          "requires": {
-            "convert-source-map": "^2.0.0",
-            "graceful-fs": "^4.2.10",
-            "now-and-later": "^3.0.0",
-            "streamx": "^2.12.5",
-            "vinyl": "^3.0.0",
-            "vinyl-contents": "^2.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
-    },
-    "gulp-imagemin": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/gulp-imagemin/-/gulp-imagemin-7.1.0.tgz",
-      "integrity": "sha512-6xBTNybmPY2YrvrhhlS8Mxi0zn0ypusLon63p9XXxDtIf7U7c6KcViz94K7Skosucr3378A6IY2kJSjJyuwylQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^3.0.0",
-        "fancy-log": "^1.3.2",
-        "imagemin": "^7.0.0",
-        "imagemin-gifsicle": "^7.0.0",
-        "imagemin-mozjpeg": "^8.0.0",
-        "imagemin-optipng": "^7.0.0",
-        "imagemin-svgo": "^7.0.0",
-        "plugin-error": "^1.0.1",
-        "plur": "^3.0.1",
-        "pretty-bytes": "^5.3.0",
-        "through2-concurrent": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "gulp-less": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-less/-/gulp-less-5.0.0.tgz",
-      "integrity": "sha512-W2I3TewO/By6UZsM/wJG3pyK5M6J0NYmJAAhwYXQHR+38S0iDtZasmUgFCH3CQj+pQYw/PAIzxvFvwtEXz1HhQ==",
-      "dev": true,
-      "requires": {
-        "less": "^3.7.1 || ^4.0.0",
-        "object-assign": "^4.0.1",
-        "plugin-error": "^1.0.0",
-        "replace-ext": "^2.0.0",
-        "through2": "^4.0.0",
-        "vinyl-sourcemaps-apply": "^0.2.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "replace-ext": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
-          "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
-          "dev": true
-        },
-        "through2": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
-          "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "3"
-          }
-        }
-      }
-    },
-    "gulp-minify": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/gulp-minify/-/gulp-minify-3.1.0.tgz",
-      "integrity": "sha512-ixF41aYg+NQikI8hpoHdEclYcQkbGdXQu1CBdHaU7Epg8H6e8d2jWXw1+rBPgYwl/XpKgjHj7NI6gkhoSNSSAg==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^1.0.1",
-        "minimatch": "^3.0.2",
-        "plugin-error": "^0.1.2",
-        "terser": "^3.7.6",
-        "through2": "^2.0.3",
-        "vinyl": "^2.1.0"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.0.1",
-            "array-slice": "^0.2.3"
-          }
-        },
-        "arr-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-          "dev": true
-        },
-        "array-slice": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-          "dev": true
-        },
-        "extend-shallow": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^1.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-          "dev": true
-        },
-        "plugin-error": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-          "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-          "dev": true,
-          "requires": {
-            "ansi-cyan": "^0.1.1",
-            "ansi-red": "^0.1.1",
-            "arr-diff": "^1.0.1",
-            "arr-union": "^2.0.1",
-            "extend-shallow": "^1.1.2"
-          }
-        }
-      }
-    },
-    "gulp-notify": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-notify/-/gulp-notify-4.0.0.tgz",
-      "integrity": "sha512-0cdDvZkHVqu4tqrcOI/jL5YdxYEIPQ7+p3YxnO48w5hhPSisvogZ887qL+fpYItg9m4MUhJ5Se8p8xGy3uJESA==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^4.1.1",
-        "fancy-log": "^1.3.3",
-        "lodash.template": "^4.5.0",
-        "node-notifier": "^9.0.1",
-        "node.extend": "^2.0.2",
-        "plugin-error": "^1.0.1",
-        "through2": "^4.0.2"
-      },
-      "dependencies": {
-        "ansi-colors": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "through2": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
-          "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "3"
-          }
-        }
-      }
-    },
-    "gulp-postcss": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-9.0.1.tgz",
-      "integrity": "sha512-9QUHam5JyXwGUxaaMvoFQVT44tohpEFpM8xBdPfdwTYGM0AItS1iTQz0MpsF8Jroh7GF5Jt2GVPaYgvy8qD2Fw==",
-      "dev": true,
-      "requires": {
-        "fancy-log": "^1.3.3",
-        "plugin-error": "^1.0.1",
-        "postcss-load-config": "^3.0.0",
-        "vinyl-sourcemaps-apply": "^0.2.1"
-      }
-    },
-    "gulp-rename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
-      "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
-      "dev": true
-    },
-    "gulp-sort": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-sort/-/gulp-sort-2.0.0.tgz",
-      "integrity": "sha1-xnYqLx8N4KP8WVohWZ0/rI26Gso=",
-      "dev": true,
-      "requires": {
-        "through2": "^2.0.1"
-      }
-    },
-    "gulp-sourcemaps": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz",
-      "integrity": "sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==",
-      "dev": true,
-      "requires": {
-        "@gulp-sourcemaps/identity-map": "^2.0.1",
-        "@gulp-sourcemaps/map-sources": "^1.0.0",
-        "acorn": "^6.4.1",
-        "convert-source-map": "^1.0.0",
-        "css": "^3.0.0",
-        "debug-fabulous": "^1.0.0",
-        "detect-newline": "^2.0.0",
-        "graceful-fs": "^4.0.0",
-        "source-map": "^0.6.0",
-        "strip-bom-string": "^1.0.0",
-        "through2": "^2.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.4.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "gulp-util": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-      "integrity": "sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==",
-      "dev": true,
-      "requires": {
-        "array-differ": "^1.0.0",
-        "array-uniq": "^1.0.2",
-        "beeper": "^1.0.0",
-        "chalk": "^1.0.0",
-        "dateformat": "^2.0.0",
-        "fancy-log": "^1.1.0",
-        "gulplog": "^1.0.0",
-        "has-gulplog": "^0.1.0",
-        "lodash._reescape": "^3.0.0",
-        "lodash._reevaluate": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.template": "^3.0.0",
-        "minimist": "^1.1.0",
-        "multipipe": "^0.1.2",
-        "object-assign": "^3.0.0",
-        "replace-ext": "0.0.1",
-        "through2": "^2.0.0",
-        "vinyl": "^0.5.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "clone": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-          "dev": true
-        },
-        "clone-stats": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-          "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-          "dev": true
-        },
-        "lodash.template": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-          "integrity": "sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==",
-          "dev": true,
-          "requires": {
-            "lodash._basecopy": "^3.0.0",
-            "lodash._basetostring": "^3.0.0",
-            "lodash._basevalues": "^3.0.0",
-            "lodash._isiterateecall": "^3.0.0",
-            "lodash._reinterpolate": "^3.0.0",
-            "lodash.escape": "^3.0.0",
-            "lodash.keys": "^3.0.0",
-            "lodash.restparam": "^3.0.0",
-            "lodash.templatesettings": "^3.0.0"
-          }
-        },
-        "lodash.templatesettings": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-          "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-          "dev": true,
-          "requires": {
-            "lodash._reinterpolate": "^3.0.0",
-            "lodash.escape": "^3.0.0"
-          }
-        },
-        "object-assign": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-          "dev": true
-        },
-        "replace-ext": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        },
-        "vinyl": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-          "dev": true,
-          "requires": {
-            "clone": "^1.0.0",
-            "clone-stats": "^0.0.1",
-            "replace-ext": "0.0.1"
-          }
-        }
-      }
-    },
-    "gulp-watch": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-watch/-/gulp-watch-5.0.1.tgz",
-      "integrity": "sha512-HnTSBdzAOFIT4wmXYPDUn783TaYAq9bpaN05vuZNP5eni3z3aRx0NAKbjhhMYtcq76x4R1wf4oORDGdlrEjuog==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "1.1.0",
-        "anymatch": "^1.3.0",
-        "chokidar": "^2.0.0",
-        "fancy-log": "1.3.2",
-        "glob-parent": "^3.0.1",
-        "object-assign": "^4.1.0",
-        "path-is-absolute": "^1.0.1",
-        "plugin-error": "1.0.1",
-        "readable-stream": "^2.2.2",
-        "slash": "^1.0.0",
-        "vinyl": "^2.1.0",
-        "vinyl-file": "^2.0.0"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-          "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^2.1.5",
-            "normalize-path": "^2.0.0"
-          }
-        },
-        "arr-diff": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.0.1"
-          }
-        },
-        "array-unique": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
-        },
-        "braces": {
-          "version": "1.8.5",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-          "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
-          "dev": true,
-          "requires": {
-            "expand-range": "^1.8.1",
-            "preserve": "^0.2.0",
-            "repeat-element": "^1.1.2"
-          }
-        },
-        "expand-brackets": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-          "dev": true,
-          "requires": {
-            "is-posix-bracket": "^0.1.0"
-          }
-        },
-        "extglob": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        },
-        "fancy-log": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz",
-          "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=",
-          "dev": true,
-          "requires": {
-            "ansi-gray": "^0.1.1",
-            "color-support": "^1.1.3",
-            "time-stamp": "^1.0.0"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        },
-        "micromatch": {
-          "version": "2.3.11",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-          "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^2.0.0",
-            "array-unique": "^0.2.1",
-            "braces": "^1.8.2",
-            "expand-brackets": "^0.1.4",
-            "extglob": "^0.3.1",
-            "filename-regex": "^2.0.0",
-            "is-extglob": "^1.0.0",
-            "is-glob": "^2.0.1",
-            "kind-of": "^3.0.2",
-            "normalize-path": "^2.0.1",
-            "object.omit": "^2.0.0",
-            "parse-glob": "^3.0.4",
-            "regex-cache": "^0.4.2"
-          }
-        },
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
-      }
-    },
-    "gulp-wrap": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/gulp-wrap/-/gulp-wrap-0.15.0.tgz",
-      "integrity": "sha512-f17zkGObA+hE/FThlg55gfA0nsXbdmHK1WqzjjB2Ytq1TuhLR7JiCBJ3K4AlMzCyoFaCjfowos+VkToUNE0WTQ==",
-      "dev": true,
-      "requires": {
-        "consolidate": "^0.15.1",
-        "es6-promise": "^4.2.6",
-        "fs-readfile-promise": "^3.0.1",
-        "js-yaml": "^3.13.0",
-        "lodash": "^4.17.11",
-        "node.extend": "2.0.2",
-        "plugin-error": "^1.0.1",
-        "through2": "^3.0.1",
-        "tryit": "^1.0.1",
-        "vinyl-bufferstream": "^1.0.1"
-      },
-      "dependencies": {
-        "through2": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.4",
-            "readable-stream": "2 || 3"
-          }
-        }
-      }
-    },
-    "gulp-wrap-js": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/gulp-wrap-js/-/gulp-wrap-js-0.4.1.tgz",
-      "integrity": "sha512-5bWQ6ZQrUDVN0w3ufWP1ZtY8qcGQABKCSb84++qGzyqw6F8kFVeTxIQtEqF4Qzi1YOpLo0NvPlNATqBqKpA6eg==",
-      "dev": true,
-      "requires": {
-        "escodegen": "^1.6.1",
-        "esprima": "^2.3.0",
-        "estemplate": "*",
-        "gulp-util": "~3.0.5",
-        "through2": "*",
-        "vinyl-sourcemaps-apply": "^0.1.4"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        },
-        "vinyl-sourcemaps-apply": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.1.4.tgz",
-          "integrity": "sha1-xfy9Q+LyOEI8LcmL3db3m3K8NFs=",
-          "dev": true,
-          "requires": {
-            "source-map": "^0.1.39"
-          }
-        }
-      }
-    },
-    "gulplog": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "dev": true,
-      "requires": {
-        "glogg": "^1.0.0"
-      }
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true,
-      "optional": true
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "has-gulplog": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-      "dev": true,
-      "requires": {
-        "sparkles": "^1.0.0"
-      }
-    },
-    "has-symbol-support-x": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
-      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
-      "dev": true,
-      "optional": true
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true
-    },
-    "has-to-string-tag-x": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
-      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "has-symbol-support-x": "^1.4.1"
-      }
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "requires": {
-        "parse-passwd": "^1.0.0"
-      }
-    },
-    "hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "html-encoding-sniffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-      "dev": true,
-      "requires": {
-        "whatwg-encoding": "^2.0.0"
-      }
-    },
-    "htmlparser2": {
-      "version": "3.9.2",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^1.3.0",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "http-cache-semantics": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
-      "dev": true,
-      "optional": true
-    },
-    "http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
-      "dev": true,
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.1"
-      }
-    },
-    "http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
-      "requires": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dev": true,
-      "requires": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      }
-    },
-    "https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
-      "requires": {
-        "agent-base": "6",
-        "debug": "4"
-      }
-    },
-    "human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "optional": true
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true
-    },
-    "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true
-    },
-    "image-size": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
-      "dev": true,
-      "optional": true
-    },
-    "imagemin": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-7.0.1.tgz",
-      "integrity": "sha512-33AmZ+xjZhg2JMCe+vDf6a9mzWukE7l+wAtesjE7KyteqqKjzxv7aVQeWnul1Ve26mWvEQqyPwl0OctNBfSR9w==",
-      "dev": true,
-      "requires": {
-        "file-type": "^12.0.0",
-        "globby": "^10.0.0",
-        "graceful-fs": "^4.2.2",
-        "junk": "^3.1.0",
-        "make-dir": "^3.0.0",
-        "p-pipe": "^3.0.0",
-        "replace-ext": "^1.0.0"
-      }
-    },
-    "imagemin-gifsicle": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/imagemin-gifsicle/-/imagemin-gifsicle-7.0.0.tgz",
-      "integrity": "sha512-LaP38xhxAwS3W8PFh4y5iQ6feoTSF+dTAXFRUEYQWYst6Xd+9L/iPk34QGgK/VO/objmIlmq9TStGfVY2IcHIA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "execa": "^1.0.0",
-        "gifsicle": "^5.0.0",
-        "is-gif": "^3.0.0"
-      }
-    },
-    "imagemin-mozjpeg": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/imagemin-mozjpeg/-/imagemin-mozjpeg-8.0.0.tgz",
-      "integrity": "sha512-+EciPiIjCb8JWjQNr1q8sYWYf7GDCNDxPYnkD11TNIjjWNzaV+oTg4DpOPQjl5ZX/KRCPMEgS79zLYAQzLitIA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "execa": "^1.0.0",
-        "is-jpg": "^2.0.0",
-        "mozjpeg": "^6.0.0"
-      }
-    },
-    "imagemin-optipng": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/imagemin-optipng/-/imagemin-optipng-7.1.0.tgz",
-      "integrity": "sha512-JNORTZ6j6untH7e5gF4aWdhDCxe3ODsSLKs/f7Grewy3ebZpl1ZsU+VUTPY4rzeHgaFA8GSWOoA8V2M3OixWZQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "exec-buffer": "^3.0.0",
-        "is-png": "^2.0.0",
-        "optipng-bin": "^6.0.0"
-      }
-    },
-    "imagemin-svgo": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/imagemin-svgo/-/imagemin-svgo-7.1.0.tgz",
-      "integrity": "sha512-0JlIZNWP0Luasn1HT82uB9nU9aa+vUj6kpT+MjPW11LbprXC+iC4HDwn1r4Q2/91qj4iy9tRZNsFySMlEpLdpg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "is-svg": "^4.2.1",
-        "svgo": "^1.3.2"
-      }
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "import-lazy": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz",
-      "integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==",
-      "dev": true,
-      "optional": true
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true
-    },
-    "into-stream": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
-      "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "from2": "^2.1.1",
-        "p-is-promise": "^1.1.0"
-      }
-    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
-    },
-    "irregular-plurals": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-2.0.0.tgz",
-      "integrity": "sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw==",
-      "dev": true
-    },
-    "is": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz",
-      "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==",
-      "dev": true
-    },
-    "is-absolute": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-      "dev": true,
-      "requires": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
-      }
-    },
-    "is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
-    },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^1.0.0"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "optional": true
-    },
-    "is-core-module": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
-      }
-    },
-    "is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true
-    },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-      "dev": true
-    },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-      "dev": true,
-      "requires": {
-        "is-primitive": "^2.0.0"
-      }
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "dev": true,
-      "optional": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
-    },
-    "is-gif": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-gif/-/is-gif-3.0.0.tgz",
-      "integrity": "sha512-IqJ/jlbw5WJSNfwQ/lHEDXF8rxhRgF6ythk2oiEvhpG29F704eX9NO6TvPfMiq9DrbwgcEDnETYNcZDPewQoVw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "file-type": "^10.4.0"
-      },
-      "dependencies": {
-        "file-type": {
-          "version": "10.11.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
-          "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-jpg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-jpg/-/is-jpg-2.0.0.tgz",
-      "integrity": "sha1-LhmX+m6RZuqsAkLarkQ0A+TvHZc=",
-      "dev": true,
-      "optional": true
-    },
-    "is-natural-number": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
-      "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
-      "dev": true,
-      "optional": true
-    },
-    "is-negated-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
-      "dev": true
-    },
-    "is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "optional": true
-    },
-    "is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
-      "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
-      "dev": true,
-      "optional": true
-    },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true
-    },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true,
-      "optional": true
-    },
-    "is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true
-    },
-    "is-png": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-png/-/is-png-2.0.0.tgz",
-      "integrity": "sha512-4KPGizaVGj2LK7xwJIz8o5B2ubu1D/vcQsgOGFEDlpcvgZHto4gBnyd0ig7Ws+67ixmwKoNmu0hYnpo6AaKb5g==",
-      "dev": true,
-      "optional": true
-    },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-      "dev": true
-    },
-    "is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-      "dev": true
-    },
-    "is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-      "dev": true,
-      "requires": {
-        "is-unc-path": "^1.0.0"
-      }
-    },
-    "is-retry-allowed": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
-      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
-      "dev": true,
-      "optional": true
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true,
-      "optional": true
-    },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-svg": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-4.4.0.tgz",
-      "integrity": "sha512-v+AgVwiK5DsGtT9ng+m4mClp6zDAmwrW8nZi6Gg15qzvBnRWWdfWA1TGaXyCDnWq5g5asofIgMVl3PjKxvk1ug==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "fast-xml-parser": "^4.1.3"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-unc-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-      "dev": true,
-      "requires": {
-        "unc-path-regex": "^0.1.2"
-      }
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
-    "is-valid-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-      "dev": true
-    },
-    "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-what": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
-      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
-      "dev": true
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
-    },
-    "is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "requires": {
-        "is-docker": "^2.0.0"
-      }
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "isbinaryfile": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
-      "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
-    },
-    "isurl": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
-      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "has-to-string-tag-x": "^1.2.0",
-        "is-object": "^1.0.1"
-      }
-    },
-    "jasmine-core": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.1.1.tgz",
-      "integrity": "sha512-UrzO3fL7nnxlQXlvTynNAenL+21oUQRlzqQFsA2U11ryb4+NLOCOePZ70PTojEaUKhiFugh7dG0Q+I58xlPdWg==",
-      "dev": true
-    },
-    "jquery": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
-      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
-    },
-    "jquery-ui-dist": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz",
-      "integrity": "sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==",
-      "requires": {
-        "jquery": ">=1.8.0 <4.0.0"
-      }
-    },
-    "jquery-ui-touch-punch": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/jquery-ui-touch-punch/-/jquery-ui-touch-punch-0.2.3.tgz",
-      "integrity": "sha1-7tgiQnM7okP0az6HwYQbMIGR2mg="
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-          "dev": true
-        }
-      }
-    },
-    "jsdom": {
-      "version": "22.1.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz",
-      "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.6",
-        "cssstyle": "^3.0.0",
-        "data-urls": "^4.0.0",
-        "decimal.js": "^10.4.3",
-        "domexception": "^4.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.1",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.4",
-        "parse5": "^7.1.2",
-        "rrweb-cssom": "^0.6.0",
-        "saxes": "^6.0.0",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.1.2",
-        "w3c-xmlserializer": "^4.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^12.0.1",
-        "ws": "^8.13.0",
-        "xml-name-validator": "^4.0.0"
-      },
-      "dependencies": {
-        "ws": {
-          "version": "8.13.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-          "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-          "dev": true,
-          "requires": {}
-        }
-      }
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
-    },
-    "json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
-      "dev": true,
-      "optional": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true
-    },
-    "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
-      }
-    },
-    "junk": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
-      "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==",
-      "dev": true
-    },
-    "just-debounce": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
-      "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
-      "dev": true
-    },
-    "karma": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.2.tgz",
-      "integrity": "sha512-C6SU/53LB31BEgRg+omznBEMY4SjHU3ricV6zBcAe1EeILKkeScr+fZXtaI5WyDbkVowJxxAI6h73NcFPmXolQ==",
-      "dev": true,
-      "requires": {
-        "@colors/colors": "1.5.0",
-        "body-parser": "^1.19.0",
-        "braces": "^3.0.2",
-        "chokidar": "^3.5.1",
-        "connect": "^3.7.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.1",
-        "glob": "^7.1.7",
-        "graceful-fs": "^4.2.6",
-        "http-proxy": "^1.18.1",
-        "isbinaryfile": "^4.0.8",
-        "lodash": "^4.17.21",
-        "log4js": "^6.4.1",
-        "mime": "^2.5.2",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.5",
-        "qjobs": "^1.2.0",
-        "range-parser": "^1.2.1",
-        "rimraf": "^3.0.2",
-        "socket.io": "^4.4.1",
-        "source-map": "^0.6.1",
-        "tmp": "^0.2.1",
-        "ua-parser-js": "^0.7.30",
-        "yargs": "^16.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "anymatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-          "dev": true,
-          "requires": {
-            "normalize-path": "^3.0.0",
-            "picomatch": "^2.0.4"
-          }
-        },
-        "binary-extensions": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-          "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-          "dev": true
-        },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "chokidar": {
-          "version": "3.5.3",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-          "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-          "dev": true,
-          "requires": {
-            "anymatch": "~3.1.2",
-            "braces": "~3.0.2",
-            "fsevents": "~2.3.2",
-            "glob-parent": "~5.1.2",
-            "is-binary-path": "~2.1.0",
-            "is-glob": "~4.0.1",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.6.0"
-          }
-        },
-        "cliui": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^7.0.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "fsevents": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-          "dev": true,
-          "optional": true
-        },
-        "get-caller-file": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-          "dev": true
-        },
-        "glob-parent": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        },
-        "is-binary-path": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-          "dev": true,
-          "requires": {
-            "binary-extensions": "^2.0.0"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "readdirp": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-          "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-          "dev": true,
-          "requires": {
-            "picomatch": "^2.2.1"
-          }
-        },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "tmp": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-          "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-          "dev": true,
-          "requires": {
-            "rimraf": "^3.0.0"
-          }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "y18n": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "16.2.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^7.0.2",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.0",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^20.2.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "20.2.9",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-          "dev": true
-        }
-      }
-    },
-    "karma-jasmine": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-5.1.0.tgz",
-      "integrity": "sha512-i/zQLFrfEpRyQoJF9fsCdTMOF5c2dK7C7OmsuKg2D0YSsuZSfQDiLuaiktbuio6F2wiCsZSnSnieIQ0ant/uzQ==",
-      "dev": true,
-      "requires": {
-        "jasmine-core": "^4.1.0"
-      },
-      "dependencies": {
-        "jasmine-core": {
-          "version": "4.6.0",
-          "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.6.0.tgz",
-          "integrity": "sha512-O236+gd0ZXS8YAjFx8xKaJ94/erqUliEkJTDedyE7iHvv4ZVqi+q+8acJxu05/WJDKm512EUNn809In37nWlAQ==",
-          "dev": true
-        }
-      }
-    },
-    "karma-jsdom-launcher": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/karma-jsdom-launcher/-/karma-jsdom-launcher-15.0.0.tgz",
-      "integrity": "sha512-F5KkE7qNS93cLk6BZtGI1V+OAHoruGIhZm+zCViT9J4oqJ2tn9hScIk+KXQL6Zmq6exddhpFKNw+hVIQYUocpg==",
-      "dev": true,
-      "requires": {}
-    },
-    "karma-junit-reporter": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-2.0.1.tgz",
-      "integrity": "sha512-VtcGfE0JE4OE1wn0LK8xxDKaTP7slN8DO3I+4xg6gAi1IoAHAXOJ1V9G/y45Xg6sxdxPOR3THCFtDlAfBo9Afw==",
-      "dev": true,
-      "requires": {
-        "path-is-absolute": "^1.0.0",
-        "xmlbuilder": "12.0.0"
-      }
-    },
-    "karma-spec-reporter": {
-      "version": "0.0.36",
-      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.36.tgz",
-      "integrity": "sha512-11bvOl1x6ryKZph7kmbmMpbi8vsngEGxGOoeTlIcDaH3ab3j8aPJnZ+r+K/SS0sBSGy5VGkGYO2+hLct7hw/6w==",
-      "dev": true,
-      "requires": {
-        "colors": "1.4.0"
-      }
-    },
-    "keyv": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
-      "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "json-buffer": "3.0.0"
-      }
-    },
-    "kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true
-    },
-    "kuler": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz",
-      "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==",
-      "dev": true,
-      "requires": {
-        "colornames": "^1.1.1"
-      }
-    },
-    "last-run": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-      "dev": true,
-      "requires": {
-        "default-resolution": "^2.0.0",
-        "es6-weak-map": "^2.0.1"
-      }
-    },
-    "lazyload-js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazyload-js/-/lazyload-js-1.0.0.tgz",
-      "integrity": "sha1-jBA5sbaRec1J/cMkICOvSM4IOSU="
-    },
-    "lazystream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.5"
-      }
-    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
-    "lead": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-      "dev": true,
-      "requires": {
-        "flush-write-stream": "^1.0.2"
-      }
-    },
-    "less": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.2.0.tgz",
-      "integrity": "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==",
-      "dev": true,
-      "requires": {
-        "copy-anything": "^2.0.1",
-        "errno": "^0.1.1",
-        "graceful-fs": "^4.1.2",
-        "image-size": "~0.5.0",
-        "make-dir": "^2.1.0",
-        "mime": "^1.4.1",
-        "needle": "^3.1.0",
-        "parse-node-version": "^1.0.1",
-        "source-map": "~0.6.0",
-        "tslib": "^2.3.0"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "mime": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-          "dev": true,
-          "optional": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
-        },
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
-        }
-      }
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
-    "liftoff": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-      "dev": true,
-      "requires": {
-        "extend": "^3.0.0",
-        "findup-sync": "^3.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
-      }
-    },
-    "lilconfig": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
-      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
-      "dev": true
-    },
-    "lit": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/lit/-/lit-2.8.0.tgz",
-      "integrity": "sha512-4Sc3OFX9QHOJaHbmTMk28SYgVxLN3ePDjg7hofEft2zWlehFL3LiAuapWc4U/kYwMYJSh2hTCPZ6/LIC7ii0MA==",
-      "requires": {
-        "@lit/reactive-element": "^1.6.0",
-        "lit-element": "^3.3.0",
-        "lit-html": "^2.8.0"
-      }
-    },
-    "lit-element": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.3.3.tgz",
-      "integrity": "sha512-XbeRxmTHubXENkV4h8RIPyr8lXc+Ff28rkcQzw3G6up2xg5E8Zu1IgOWIwBLEQsu3cOVFqdYwiVi0hv0SlpqUA==",
-      "requires": {
-        "@lit-labs/ssr-dom-shim": "^1.1.0",
-        "@lit/reactive-element": "^1.3.0",
-        "lit-html": "^2.8.0"
-      }
-    },
-    "lit-html": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.8.0.tgz",
-      "integrity": "sha512-o9t+MQM3P4y7M7yNzqAyjp7z+mQGa4NS4CxiyLqFPyFWyc4O+nodLrkrxSaCTrla6M5YOLaT3RpbbqjszB5g3Q==",
-      "requires": {
-        "@types/trusted-types": "^2.0.2"
-      }
-    },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "dependencies": {
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
-      }
-    },
-    "locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^5.0.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-      "dev": true
-    },
-    "lodash._basetostring": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-      "dev": true
-    },
-    "lodash._basevalues": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-      "dev": true
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-      "dev": true
-    },
-    "lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-      "dev": true
-    },
-    "lodash._reescape": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-      "dev": true
-    },
-    "lodash._reevaluate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-      "dev": true
-    },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-      "dev": true
-    },
-    "lodash._root": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-      "dev": true
-    },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-      "dev": true
-    },
-    "lodash.escape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-      "dev": true,
-      "requires": {
-        "lodash._root": "^3.0.0"
-      }
-    },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-      "dev": true
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
-    },
-    "lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "dev": true,
-      "requires": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-      "dev": true
-    },
-    "lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dev": true,
-      "requires": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dev": true,
-      "requires": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
-      "dev": true
-    },
-    "log4js": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz",
-      "integrity": "sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==",
-      "dev": true,
-      "requires": {
-        "date-format": "^4.0.3",
-        "debug": "^4.3.3",
-        "flatted": "^3.2.4",
-        "rfdc": "^1.3.0",
-        "streamroller": "^3.0.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
-      }
-    },
-    "logalot": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz",
-      "integrity": "sha1-X46MkNME7fElMJUaVVSruMXj9VI=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "figures": "^1.3.5",
-        "squeak": "^1.0.0"
-      },
-      "dependencies": {
-        "figures": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "escape-string-regexp": "^1.0.5",
-            "object-assign": "^4.1.0"
-          }
-        }
-      }
-    },
-    "longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-      "dev": true,
-      "optional": true
-    },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      }
-    },
-    "lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true,
-      "optional": true
-    },
-    "lpad-align": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.2.tgz",
-      "integrity": "sha1-IfYArBwwlcPG5JfuZyce4ISB/p4=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "get-stdin": "^4.0.1",
-        "indent-string": "^2.1.0",
-        "longest": "^1.0.0",
-        "meow": "^3.3.0"
-      }
-    },
-    "lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "lru-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-      "dev": true,
-      "requires": {
-        "es5-ext": "~0.10.2"
-      }
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
-    },
-    "map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "optional": true
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "matchdep": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-      "dev": true,
-      "requires": {
-        "findup-sync": "^2.0.0",
-        "micromatch": "^3.0.4",
-        "resolve": "^1.4.0",
-        "stack-trace": "0.0.10"
-      },
-      "dependencies": {
-        "findup-sync": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-          "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-          "dev": true,
-          "requires": {
-            "detect-file": "^1.0.0",
-            "is-glob": "^3.1.0",
-            "micromatch": "^3.0.4",
-            "resolve-dir": "^1.0.1"
-          }
-        },
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
-      }
-    },
-    "math-random": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
-      "dev": true
-    },
-    "mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
-      "dev": true,
-      "optional": true
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true
-    },
-    "memoizee": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
-      "dev": true,
-      "requires": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.53",
-        "es6-weak-map": "^2.0.3",
-        "event-emitter": "^0.3.5",
-        "is-promise": "^2.2.2",
-        "lru-queue": "^0.1.0",
-        "next-tick": "^1.1.0",
-        "timers-ext": "^0.1.7"
-      }
-    },
-    "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      }
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
-      }
-    },
-    "mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "dev": true
-    },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.52.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "optional": true
-    },
-    "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true,
-      "optional": true
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
-      "dev": true
-    },
-    "minimize": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/minimize/-/minimize-2.2.0.tgz",
-      "integrity": "sha512-IxR2XMbw9pXCxApkdD9BTcH2U4XlXhbeySUrv71rmMS9XDA8BVXEsIuFu24LtwCfBgfbL7Fuh8/ZzkO5DaTLlQ==",
-      "dev": true,
-      "requires": {
-        "argh": "^0.1.4",
-        "async": "^2.1.5",
-        "cli-color": "^1.2.0",
-        "diagnostics": "^1.1.0",
-        "emits": "^3.0.0",
-        "htmlparser2": "^3.9.2",
-        "uuid": "^3.0.0"
-      }
-    },
-    "mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
-    "moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
-    },
-    "mozjpeg": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/mozjpeg/-/mozjpeg-6.0.1.tgz",
-      "integrity": "sha512-9Z59pJMi8ni+IUvSH5xQwK5tNLw7p3dwDNCZ3o1xE+of3G5Hc/yOz6Ue/YuLiBXU3ZB5oaHPURyPdqfBX/QYJA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "bin-build": "^3.0.0",
-        "bin-wrapper": "^4.0.0",
-        "logalot": "^2.1.0"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "multipipe": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-      "dev": true,
-      "requires": {
-        "duplexer2": "0.0.2"
-      }
-    },
-    "mute-stdout": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-      "dev": true
-    },
-    "nan": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
-      "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
-      "dev": true,
-      "optional": true
-    },
-    "nanoid": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
-      "dev": true
-    },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
-      }
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "needle": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-3.1.0.tgz",
-      "integrity": "sha512-gCE9weDhjVGCRqS8dwDR/D3GTAeyXLXuqp7I8EzH6DllZGXSUyxuqqLh+YX9rMAWaaTFyVAg6rHGL25dqvczKw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "debug": "^3.2.6",
-        "iconv-lite": "^0.6.3",
-        "sax": "^1.2.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "iconv-lite": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3.0.0"
-          }
-        }
-      }
-    },
-    "negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true
-    },
-    "next-tick": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
-      "dev": true
-    },
-    "ng-file-upload": {
-      "version": "12.2.13",
-      "resolved": "https://registry.npmjs.org/ng-file-upload/-/ng-file-upload-12.2.13.tgz",
-      "integrity": "sha1-AYAPOHLlJvlTEPhHfpnk8S0NjRQ="
-    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      },
-      "dependencies": {
-        "tr46": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-        },
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-        },
-        "whatwg-url": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-          "requires": {
-            "tr46": "~0.0.3",
-            "webidl-conversions": "^3.0.0"
-          }
-        }
-      }
-    },
-    "node-notifier": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-9.0.1.tgz",
-      "integrity": "sha512-fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg==",
-      "dev": true,
-      "requires": {
-        "growly": "^1.3.0",
-        "is-wsl": "^2.2.0",
-        "semver": "^7.3.2",
-        "shellwords": "^0.1.1",
-        "uuid": "^8.3.0",
-        "which": "^2.0.2"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-          "dev": true
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
-    },
-    "node-releases": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
-      "dev": true
-    },
-    "node.extend": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-2.0.2.tgz",
-      "integrity": "sha512-pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3",
-        "is": "^3.2.1"
-      }
-    },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
-    },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true
-    },
-    "nouislider": {
-      "version": "15.7.1",
-      "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-15.7.1.tgz",
-      "integrity": "sha512-5N7C1ru/i8y3dg9+Z6ilj6+m1EfabvOoaRa7ztpxBSKKRZso4vA52DGSbBJjw5XLtFr/LZ9SgGAXqyVtlVHO5w=="
-    },
-    "now-and-later": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.2"
-      }
-    },
-    "npm-conf": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
-      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "config-chain": "^1.1.11",
-        "pify": "^3.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "path-key": "^2.0.0"
-      }
-    },
-    "nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "dev": true,
-      "requires": {
-        "boolbase": "^1.0.0"
-      }
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
-    "nwsapi": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.5.tgz",
-      "integrity": "sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
-      "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
-      "dev": true
-    },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true,
-      "optional": true
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.0"
-      }
-    },
-    "object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "object.defaults": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-      "dev": true,
-      "requires": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz",
-      "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "object.map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-      "dev": true,
-      "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      }
-    },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-      "dev": true,
-      "requires": {
-        "for-own": "^0.1.4",
-        "is-extendable": "^0.1.1"
-      },
-      "dependencies": {
-        "for-own": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-          "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-          "dev": true,
-          "requires": {
-            "for-in": "^1.0.1"
-          }
-        }
-      }
-    },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "object.reduce": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-      "dev": true,
-      "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      }
-    },
-    "object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      }
-    },
-    "optipng-bin": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/optipng-bin/-/optipng-bin-6.0.0.tgz",
-      "integrity": "sha512-95bB4y8IaTsa/8x6QH4bLUuyvyOoGBCLDA7wOgDL8UFqJpSUh1Hob8JRJhit+wC1ZLN3tQ7mFt7KuBj0x8F2Wg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "bin-build": "^3.0.0",
-        "bin-wrapper": "^4.0.0",
-        "logalot": "^2.0.0"
-      }
-    },
-    "ordered-read-streams": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "os-filter-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz",
-      "integrity": "sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "arch": "^2.1.0"
-      }
-    },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
-      "requires": {
-        "lcid": "^1.0.0"
-      }
-    },
-    "p-cancelable": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz",
-      "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==",
-      "dev": true,
-      "optional": true
-    },
-    "p-event": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-event/-/p-event-1.3.0.tgz",
-      "integrity": "sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "p-timeout": "^1.1.1"
-      }
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true,
-      "optional": true
-    },
-    "p-is-promise": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
-      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
-      "dev": true,
-      "optional": true
-    },
-    "p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "requires": {
-        "yocto-queue": "^0.1.0"
-      }
-    },
-    "p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^3.0.2"
-      }
-    },
-    "p-map-series": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz",
-      "integrity": "sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "p-reduce": "^1.0.0"
-      }
-    },
-    "p-pipe": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz",
-      "integrity": "sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==",
-      "dev": true
-    },
-    "p-reduce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
-      "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=",
-      "dev": true,
-      "optional": true
-    },
-    "p-timeout": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
-      "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "p-finally": "^1.0.0"
-      }
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-filepath": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-      "dev": true,
-      "requires": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
-      }
-    },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
-      "dev": true,
-      "requires": {
-        "glob-base": "^0.3.0",
-        "is-dotfile": "^1.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.0"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        }
-      }
-    },
-    "parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true
-    },
-    "parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "dev": true
-    },
-    "parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-      "dev": true,
-      "requires": {
-        "entities": "^4.4.0"
-      },
-      "dependencies": {
-        "entities": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-          "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-          "dev": true
-        }
-      }
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "requires": {
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true,
-      "optional": true
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "path-root": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-      "dev": true,
-      "requires": {
-        "path-root-regex": "^0.1.0"
-      }
-    },
-    "path-root-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-      "dev": true
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
-    },
-    "pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-      "dev": true,
-      "optional": true
-    },
-    "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-      "dev": true
-    },
-    "pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "optional": true
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "plugin-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^1.0.1",
-        "arr-diff": "^4.0.0",
-        "arr-union": "^3.1.0",
-        "extend-shallow": "^3.0.2"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
-      }
-    },
-    "plur": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/plur/-/plur-3.1.1.tgz",
-      "integrity": "sha512-t1Ax8KUvV3FFII8ltczPn2tJdjqbd1sIzu6t4JL7nQ3EyeL/lTrj5PWKb06ic5/6XYDr65rQ4uzQEGN70/6X5w==",
-      "dev": true,
-      "requires": {
-        "irregular-plurals": "^2.0.0"
-      }
-    },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
-    },
-    "postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
-      "dev": true,
-      "requires": {
-        "nanoid": "^3.3.6",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      }
-    },
-    "postcss-calc": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
-      "integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.11",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-colormin": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.0.tgz",
-      "integrity": "sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.21.4",
-        "caniuse-api": "^3.0.0",
-        "colord": "^2.9.1",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-convert-values": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz",
-      "integrity": "sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.21.4",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-discard-comments": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz",
-      "integrity": "sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-discard-duplicates": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz",
-      "integrity": "sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-discard-empty": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz",
-      "integrity": "sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-discard-overridden": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz",
-      "integrity": "sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-load-config": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
-      "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
-      "dev": true,
-      "requires": {
-        "lilconfig": "^2.0.5",
-        "yaml": "^1.10.2"
-      }
-    },
-    "postcss-merge-longhand": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz",
-      "integrity": "sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0",
-        "stylehacks": "^6.0.0"
-      }
-    },
-    "postcss-merge-rules": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz",
-      "integrity": "sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.21.4",
-        "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^4.0.0",
-        "postcss-selector-parser": "^6.0.5"
-      }
-    },
-    "postcss-minify-font-values": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz",
-      "integrity": "sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-minify-gradients": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz",
-      "integrity": "sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA==",
-      "dev": true,
-      "requires": {
-        "colord": "^2.9.1",
-        "cssnano-utils": "^4.0.0",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-minify-params": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz",
-      "integrity": "sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.21.4",
-        "cssnano-utils": "^4.0.0",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-minify-selectors": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz",
-      "integrity": "sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.5"
-      }
-    },
-    "postcss-normalize-charset": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz",
-      "integrity": "sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-normalize-display-values": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz",
-      "integrity": "sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-positions": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz",
-      "integrity": "sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-repeat-style": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz",
-      "integrity": "sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-string": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz",
-      "integrity": "sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-timing-functions": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz",
-      "integrity": "sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-unicode": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz",
-      "integrity": "sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.21.4",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-url": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz",
-      "integrity": "sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-whitespace": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz",
-      "integrity": "sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-ordered-values": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz",
-      "integrity": "sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg==",
-      "dev": true,
-      "requires": {
-        "cssnano-utils": "^4.0.0",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-reduce-initial": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz",
-      "integrity": "sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.21.4",
-        "caniuse-api": "^3.0.0"
-      }
-    },
-    "postcss-reduce-transforms": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz",
-      "integrity": "sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-selector-parser": {
-      "version": "6.0.13",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "postcss-svgo": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.0.tgz",
-      "integrity": "sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0",
-        "svgo": "^3.0.2"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-          "dev": true
-        },
-        "css-select": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-          "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-          "dev": true,
-          "requires": {
-            "boolbase": "^1.0.0",
-            "css-what": "^6.1.0",
-            "domhandler": "^5.0.2",
-            "domutils": "^3.0.1",
-            "nth-check": "^2.0.1"
-          }
-        },
-        "css-tree": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
-          "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
-          "dev": true,
-          "requires": {
-            "mdn-data": "2.0.30",
-            "source-map-js": "^1.0.1"
-          }
-        },
-        "csso": {
-          "version": "5.0.5",
-          "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
-          "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
-          "dev": true,
-          "requires": {
-            "css-tree": "~2.2.0"
-          },
-          "dependencies": {
-            "css-tree": {
-              "version": "2.2.1",
-              "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
-              "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
-              "dev": true,
-              "requires": {
-                "mdn-data": "2.0.28",
-                "source-map-js": "^1.0.1"
-              }
-            },
-            "mdn-data": {
-              "version": "2.0.28",
-              "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
-              "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
-              "dev": true
-            }
-          }
-        },
-        "dom-serializer": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-          "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^2.3.0",
-            "domhandler": "^5.0.2",
-            "entities": "^4.2.0"
-          }
-        },
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-          "dev": true
-        },
-        "domhandler": {
-          "version": "5.0.3",
-          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-          "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^2.3.0"
-          }
-        },
-        "domutils": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-          "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
-          "dev": true,
-          "requires": {
-            "dom-serializer": "^2.0.0",
-            "domelementtype": "^2.3.0",
-            "domhandler": "^5.0.3"
-          }
-        },
-        "entities": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-          "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-          "dev": true
-        },
-        "mdn-data": {
-          "version": "2.0.30",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-          "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
-          "dev": true
-        },
-        "svgo": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz",
-          "integrity": "sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==",
-          "dev": true,
-          "requires": {
-            "@trysound/sax": "0.2.0",
-            "commander": "^7.2.0",
-            "css-select": "^5.1.0",
-            "css-tree": "^2.2.1",
-            "csso": "^5.0.5",
-            "picocolors": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-unique-selectors": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz",
-      "integrity": "sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.5"
-      }
-    },
-    "postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
-    },
-    "prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true,
-      "optional": true
-    },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-      "dev": true
-    },
-    "pretty-bytes": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-      "dev": true
-    },
-    "pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "proto-list": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
-      "dev": true,
-      "optional": true
-    },
-    "prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true,
-      "optional": true
-    },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true,
-      "optional": true
-    },
-    "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
-      }
-    },
-    "punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
-    },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true,
-      "optional": true
-    },
-    "qjobs": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
-      "dev": true
-    },
-    "query-string": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
-      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "decode-uri-component": "^0.2.0",
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
-      }
-    },
-    "querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
-    },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true
-    },
-    "queue-tick": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
-      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
-      "dev": true
-    },
-    "randomatic": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
-      "dev": true,
-      "requires": {
-        "is-number": "^4.0.0",
-        "kind-of": "^6.0.0",
-        "math-random": "^1.0.1"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
-      }
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
-    },
-    "raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.2",
-        "http-errors": "1.8.1",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      }
-    },
-    "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "dependencies": {
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
-      }
-    },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
-      "requires": {
-        "resolve": "^1.1.6"
-      }
-    },
-    "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      }
-    },
-    "regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "regenerate-unicode-properties": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
-      "dev": true,
-      "requires": {
-        "regenerate": "^1.4.2"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==",
-      "dev": true
-    },
-    "regenerator-transform": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
-      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "regex-cache": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-      "dev": true,
-      "requires": {
-        "is-equal-shallow": "^0.1.3"
-      }
-    },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
-      }
-    },
-    "regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
-      "dev": true,
-      "requires": {
-        "@babel/regjsgen": "^0.8.0",
-        "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
-        "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.1.0"
-      }
-    },
-    "regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
-      "dev": true,
-      "requires": {
-        "jsesc": "~0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-          "dev": true
-        }
-      }
-    },
-    "remove-bom-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
-      "dev": true,
-      "requires": {
-        "is-buffer": "^1.1.5",
-        "is-utf8": "^0.2.1"
-      }
-    },
-    "remove-bom-stream": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
-      "dev": true,
-      "requires": {
-        "remove-bom-buffer": "^3.0.0",
-        "safe-buffer": "^5.1.0",
-        "through2": "^2.0.3"
-      }
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
-    },
-    "repeat-element": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
-    "replace-ext": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
-      "dev": true
-    },
-    "replace-homedir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1",
-        "is-absolute": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
-    },
-    "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-      "dev": true
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
-    },
-    "resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dev": true,
-      "requires": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      }
-    },
-    "resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true
-    },
-    "resolve-options": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
-      "dev": true,
-      "requires": {
-        "value-or-function": "^3.0.0"
-      }
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
-    },
-    "responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true
-    },
-    "rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "rrweb-cssom": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
-      "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
-      "dev": true
-    },
-    "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "run-sequence": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-2.2.1.tgz",
-      "integrity": "sha512-qkzZnQWMZjcKbh3CNly2srtrkaO/2H/SI5f2eliMCapdRD3UhMrwjfOAZJAnZ2H8Ju4aBzFZkBGXUqFs9V0yxw==",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "fancy-log": "^1.3.2",
-        "plugin-error": "^0.1.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "arr-diff": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.0.1",
-            "array-slice": "^0.2.3"
-          }
-        },
-        "arr-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-          "dev": true
-        },
-        "array-slice": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^1.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-          "dev": true
-        },
-        "plugin-error": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-          "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-          "dev": true,
-          "requires": {
-            "ansi-cyan": "^0.1.1",
-            "ansi-red": "^0.1.1",
-            "arr-diff": "^1.0.1",
-            "arr-union": "^2.0.1",
-            "extend-shallow": "^1.1.2"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true,
-      "optional": true
-    },
-    "saxes": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
-      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
-      "dev": true,
-      "requires": {
-        "xmlchars": "^2.2.0"
-      }
-    },
-    "seek-bzip": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz",
-      "integrity": "sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "commander": "^2.8.1"
-      }
-    },
-    "select": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
-      "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
-    },
-    "semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true
-    },
-    "semver-greatest-satisfied-range": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
-      "dev": true,
-      "requires": {
-        "sver-compat": "^1.5.0"
-      }
-    },
-    "semver-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz",
-      "integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==",
-      "dev": true,
-      "optional": true
-    },
-    "semver-truncate": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz",
-      "integrity": "sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "semver": "^5.3.0"
-      }
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "set-cookie-parser": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.5.1.tgz",
-      "integrity": "sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ=="
-    },
-    "set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
-      }
-    },
-    "setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true,
-      "optional": true
-    },
-    "shellwords": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
-      "dev": true
-    },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
-    "signal-exit": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
-      "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
-      "dev": true,
-      "optional": true
-    },
-    "simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.3.1"
-      },
-      "dependencies": {
-        "is-arrayish": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-          "dev": true
-        }
-      }
-    },
-    "slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-      "dev": true
-    },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        }
-      }
-    },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "socket.io": {
-      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.2.tgz",
-      "integrity": "sha512-bvKVS29/I5fl2FGLNHuXlQaUH/BlzX1IN6S+NKLNZpBsPZIDH+90eQmCs2Railn4YUiww4SzUedJ6+uzwFnKLw==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.4",
-        "base64id": "~2.0.0",
-        "cors": "~2.8.5",
-        "debug": "~4.3.2",
-        "engine.io": "~6.5.2",
-        "socket.io-adapter": "~2.5.2",
-        "socket.io-parser": "~4.2.4"
-      }
-    },
-    "socket.io-adapter": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
-      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
-      "dev": true,
-      "requires": {
-        "ws": "~8.11.0"
-      },
-      "dependencies": {
-        "ws": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-          "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-          "dev": true,
-          "requires": {}
-        }
-      }
-    },
-    "socket.io-parser": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
-      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
-      "dev": true,
-      "requires": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1"
-      }
-    },
-    "sort-keys": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "is-plain-obj": "^1.0.0"
-      }
-    },
-    "sort-keys-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
-      "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "sort-keys": "^1.0.0"
-      }
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
-    },
-    "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true
-    },
-    "source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "dev": true,
-      "requires": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "source-map-support": {
-      "version": "0.5.20",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
-      "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "dev": true
-    },
-    "sparkles": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-      "dev": true
-    },
-    "spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz",
-      "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==",
-      "dev": true
-    },
-    "spectrum-colorpicker2": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/spectrum-colorpicker2/-/spectrum-colorpicker2-2.0.10.tgz",
-      "integrity": "sha512-WXyR8qT2tZ71u1W2cdwOPd28jGpuxjwJBeLVTN8xVEWsgQDotlK6DuUwocOyL9qAxTh9570qxTfZYbY7m2wuvQ=="
-    },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "squeak": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/squeak/-/squeak-1.3.0.tgz",
-      "integrity": "sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^1.0.0",
-        "console-stream": "^0.1.1",
-        "lpad-align": "^1.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "dev": true,
-      "optional": true
-    },
-    "stack-trace": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-      "dev": true
-    },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        }
-      }
-    },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "dev": true
-    },
-    "stream-composer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz",
-      "integrity": "sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==",
-      "dev": true,
-      "requires": {
-        "streamx": "^2.13.2"
-      }
-    },
-    "stream-exhaust": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
-      "dev": true
-    },
-    "stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
-    "streamroller": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz",
-      "integrity": "sha512-ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA==",
-      "dev": true,
-      "requires": {
-        "date-format": "^4.0.3",
-        "debug": "^4.1.1",
-        "fs-extra": "^10.0.0"
-      }
-    },
-    "streamx": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.1.tgz",
-      "integrity": "sha512-fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA==",
-      "dev": true,
-      "requires": {
-        "fast-fifo": "^1.1.0",
-        "queue-tick": "^1.0.1"
-      }
-    },
-    "strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-      "dev": true,
-      "optional": true
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        }
-      }
-    },
-    "strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "requires": {
-        "is-utf8": "^0.2.0"
-      }
-    },
-    "strip-bom-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz",
-      "integrity": "sha1-+H217yYT9paKpUWr/h7HKLaoKco=",
-      "dev": true,
-      "requires": {
-        "first-chunk-stream": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      }
-    },
-    "strip-bom-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-      "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
-      "dev": true
-    },
-    "strip-dirs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
-      "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "is-natural-number": "^4.0.1"
-      }
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true,
-      "optional": true
-    },
-    "strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "optional": true
-    },
-    "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "get-stdin": "^4.0.1"
-      }
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
-    },
-    "strip-outer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
-      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.2"
-      }
-    },
-    "strnum": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
-      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
-      "dev": true,
-      "optional": true
-    },
-    "stylehacks": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.0.tgz",
-      "integrity": "sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.21.4",
-        "postcss-selector-parser": "^6.0.4"
-      }
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "sver-compat": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      }
-    },
-    "symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "tar-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
-      "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "bl": "^1.0.0",
-        "buffer-alloc": "^1.2.0",
-        "end-of-stream": "^1.0.0",
-        "fs-constants": "^1.0.0",
-        "readable-stream": "^2.3.0",
-        "to-buffer": "^1.1.1",
-        "xtend": "^4.0.0"
-      }
-    },
-    "teex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
-      "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==",
-      "dev": true,
-      "requires": {
-        "streamx": "^2.12.5"
-      }
-    },
-    "temp-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
-      "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=",
-      "dev": true,
-      "optional": true
-    },
-    "tempfile": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz",
-      "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "temp-dir": "^1.0.0",
-        "uuid": "^3.0.1"
-      }
-    },
-    "ternary-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-3.0.0.tgz",
-      "integrity": "sha512-oIzdi+UL/JdktkT+7KU5tSIQjj8pbShj3OASuvDEhm0NT5lppsm7aXWAmAq4/QMaBIyfuEcNLbAQA+HpaISobQ==",
-      "dev": true,
-      "requires": {
-        "duplexify": "^4.1.1",
-        "fork-stream": "^0.0.4",
-        "merge-stream": "^2.0.0",
-        "through2": "^3.0.1"
-      },
-      "dependencies": {
-        "duplexify": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
-          "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.4.1",
-            "inherits": "^2.0.3",
-            "readable-stream": "^3.1.1",
-            "stream-shift": "^1.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "through2": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.4",
-            "readable-stream": "2 || 3"
-          }
-        }
-      }
-    },
-    "terser": {
-      "version": "3.17.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
-      "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.19.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.10"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "text-hex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
-      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
-      "dev": true
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true,
-      "optional": true
-    },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "through2-concurrent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/through2-concurrent/-/through2-concurrent-2.0.0.tgz",
-      "integrity": "sha512-R5/jLkfMvdmDD+seLwN7vB+mhbqzWop5fAjx5IX8/yQq7VhBhzDmhXgaHAOnhnWkCpRMM7gToYHycB0CS/pd+A==",
-      "dev": true,
-      "requires": {
-        "through2": "^2.0.0"
-      }
-    },
-    "through2-filter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
-      "dev": true,
-      "requires": {
-        "through2": "~2.0.0",
-        "xtend": "~4.0.0"
-      }
-    },
-    "time-stamp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-      "dev": true
-    },
-    "timed-out": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
-      "dev": true,
-      "optional": true
-    },
-    "timers-ext": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
-      "dev": true,
-      "requires": {
-        "es5-ext": "~0.10.46",
-        "next-tick": "1"
-      }
-    },
-    "tiny-emitter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
-    },
-    "tinymce": {
-      "version": "6.8.2",
-      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.8.2.tgz",
-      "integrity": "sha512-Lho79o2Y1Yn+XdlTEkHTEkEmzwYWTXz7IUsvPwxJF3VTtgHUIAAuBab29kik+f2KED3rZvQavr9D7sHVMJ9x4A=="
-    },
-    "to-absolute-glob": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
-      "dev": true,
-      "requires": {
-        "is-absolute": "^1.0.0",
-        "is-negated-glob": "^1.0.0"
-      }
-    },
-    "to-buffer": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
-      "dev": true,
-      "optional": true
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
-      }
-    },
-    "to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      }
-    },
-    "to-through": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
-      "dev": true,
-      "requires": {
-        "through2": "^2.0.3"
-      }
-    },
-    "toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true
-    },
-    "tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
-      "requires": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "dependencies": {
-        "universalify": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="
-        }
-      }
-    },
-    "tr46": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
-      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.3.0"
-      }
-    },
-    "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
-      "dev": true,
-      "optional": true
-    },
-    "trim-repeated": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
-      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.2"
-      }
-    },
-    "tryit": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
-      "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
-      "dev": true
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2"
-      }
-    },
-    "type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typeahead.js": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/typeahead.js/-/typeahead.js-0.11.1.tgz",
-      "integrity": "sha1-TmTmcbIjEKhgb0rsgFkkuoSwFbg=",
-      "requires": {
-        "jquery": ">=1.7"
-      }
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "ua-parser-js": {
-      "version": "0.7.33",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
-      "integrity": "sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==",
-      "dev": true
-    },
-    "unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "unbzip2-stream": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "buffer": "^5.2.1",
-        "through": "^2.3.8"
-      }
-    },
-    "unc-path-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-      "dev": true
-    },
-    "underscore": {
-      "version": "1.13.6",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
-      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="
-    },
-    "undertaker": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
-      "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "bach": "^1.0.0",
-        "collection-map": "^1.0.0",
-        "es6-weak-map": "^2.0.1",
-        "fast-levenshtein": "^1.0.0",
-        "last-run": "^1.1.0",
-        "object.defaults": "^1.0.0",
-        "object.reduce": "^1.0.0",
-        "undertaker-registry": "^1.0.0"
-      },
-      "dependencies": {
-        "fast-levenshtein": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
-          "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=",
-          "dev": true
-        }
-      }
-    },
-    "undertaker-registry": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
-      "dev": true
-    },
-    "unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-      "dev": true
-    },
-    "unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dev": true,
-      "requires": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      }
-    },
-    "unicode-match-property-value-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
-      "dev": true
-    },
-    "unicode-property-aliases-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-      "dev": true
-    },
-    "union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      }
-    },
-    "unique-stream": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
-      "dev": true,
-      "requires": {
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "through2-filter": "^3.0.0"
-      }
-    },
-    "universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
-    },
-    "unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
-      "dev": true,
-      "optional": true
-    },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
-        }
-      }
-    },
-    "upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true
-    },
-    "update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
-      "dev": true,
-      "requires": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
-      }
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "url-parse-lax": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "prepend-http": "^1.0.1"
-      }
-    },
-    "url-to-options": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
-      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
-      "dev": true,
-      "optional": true
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      }
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "dev": true
-    },
-    "v8flags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1"
-      }
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "value-or-function": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
-      "dev": true
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true
-    },
-    "vinyl": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
-      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
-      "dev": true,
-      "requires": {
-        "clone": "^2.1.1",
-        "clone-buffer": "^1.0.0",
-        "clone-stats": "^1.0.0",
-        "cloneable-readable": "^1.0.0",
-        "remove-trailing-separator": "^1.0.1",
-        "replace-ext": "^1.0.0"
-      }
-    },
-    "vinyl-bufferstream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/vinyl-bufferstream/-/vinyl-bufferstream-1.0.1.tgz",
-      "integrity": "sha1-BTeGn1gO/6TKRay0dXnkuf5jCBo=",
-      "dev": true,
-      "requires": {
-        "bufferstreams": "1.0.1"
-      }
-    },
-    "vinyl-contents": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz",
-      "integrity": "sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==",
-      "dev": true,
-      "requires": {
-        "bl": "^5.0.0",
-        "vinyl": "^3.0.0"
-      },
-      "dependencies": {
-        "bl": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz",
-          "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==",
-          "dev": true,
-          "requires": {
-            "buffer": "^6.0.3",
-            "inherits": "^2.0.4",
-            "readable-stream": "^3.4.0"
-          }
-        },
-        "buffer": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-          "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-          "dev": true,
-          "requires": {
-            "base64-js": "^1.3.1",
-            "ieee754": "^1.2.1"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "replace-ext": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
-          "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
-          "dev": true
-        },
-        "vinyl": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-          "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
-          "dev": true,
-          "requires": {
-            "clone": "^2.1.2",
-            "clone-stats": "^1.0.0",
-            "remove-trailing-separator": "^1.1.0",
-            "replace-ext": "^2.0.0",
-            "teex": "^1.0.1"
-          }
-        }
-      }
-    },
-    "vinyl-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz",
-      "integrity": "sha1-p+v1/779obfRjRQPyweyI++2dRo=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.3.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0",
-        "strip-bom-stream": "^2.0.0",
-        "vinyl": "^1.1.0"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-          "dev": true
-        },
-        "clone-stats": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-          "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-          "dev": true
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
-        "replace-ext": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-          "dev": true
-        },
-        "vinyl": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-          "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-          "dev": true,
-          "requires": {
-            "clone": "^1.0.0",
-            "clone-stats": "^0.0.1",
-            "replace-ext": "0.0.1"
-          }
-        }
-      }
-    },
-    "vinyl-fs": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
-      "dev": true,
-      "requires": {
-        "fs-mkdirp-stream": "^1.0.0",
-        "glob-stream": "^6.1.0",
-        "graceful-fs": "^4.0.0",
-        "is-valid-glob": "^1.0.0",
-        "lazystream": "^1.0.0",
-        "lead": "^1.0.0",
-        "object.assign": "^4.0.4",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.3.3",
-        "remove-bom-buffer": "^3.0.0",
-        "remove-bom-stream": "^1.2.0",
-        "resolve-options": "^1.1.0",
-        "through2": "^2.0.0",
-        "to-through": "^2.0.0",
-        "value-or-function": "^3.0.0",
-        "vinyl": "^2.0.0",
-        "vinyl-sourcemap": "^1.1.0"
-      }
-    },
-    "vinyl-sourcemap": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
-      "dev": true,
-      "requires": {
-        "append-buffer": "^1.0.2",
-        "convert-source-map": "^1.5.0",
-        "graceful-fs": "^4.1.6",
-        "normalize-path": "^2.1.1",
-        "now-and-later": "^2.0.0",
-        "remove-bom-buffer": "^3.0.0",
-        "vinyl": "^2.0.0"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
-      }
-    },
-    "vinyl-sourcemaps-apply": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
-      "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.5.1"
-      }
-    },
-    "void-elements": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-      "dev": true
-    },
-    "w3c-xmlserializer": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
-      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
-      "dev": true,
-      "requires": {
-        "xml-name-validator": "^4.0.0"
-      }
-    },
-    "webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true
-    },
-    "whatwg-encoding": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-      "dev": true,
-      "requires": {
-        "iconv-lite": "0.6.3"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3.0.0"
-          }
-        }
-      }
-    },
-    "whatwg-mimetype": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
-      "dev": true
-    },
-    "whatwg-url": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
-      "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
-      "dev": true,
-      "requires": {
-        "tr46": "^4.1.1",
-        "webidl-conversions": "^7.0.0"
-      }
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true
-    },
-    "wicg-inert": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.2.tgz",
-      "integrity": "sha512-Ba9tGNYxXwaqKEi9sJJvPMKuo063umUPsHN0JJsjrs2j8KDSzkWLMZGZ+MH1Jf1Fq4OWZ5HsESJID6nRza2ang=="
-    },
-    "word-wrap": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
-      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
-      "dev": true
-    },
-    "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dev": true,
-      "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "ws": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
-      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
-      "requires": {}
-    },
-    "xml-name-validator": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-      "dev": true
-    },
-    "xmlbuilder": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-12.0.0.tgz",
-      "integrity": "sha512-lMo8DJ8u6JRWp0/Y4XLa/atVDr75H9litKlb2E5j3V3MesoL50EBgZDWoLT3F/LztVnG67GjPXLZpqcky/UMnQ==",
-      "dev": true
-    },
-    "xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
-    },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
-    },
-    "y18n": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
-      "dev": true
-    },
-    "yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true,
-      "optional": true
-    },
-    "yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true
-    },
-    "yargs": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
-      "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^5.0.1"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
-      "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^3.0.0",
-        "object.assign": "^4.1.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        }
-      }
-    },
-    "yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
-    }
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
deleted file mode 100644
index 1c244f4899..0000000000
--- a/src/Umbraco.Web.UI.Client/package.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "name": "ui",
-  "private": true,
-  "scripts": {
-    "test": "gulp runTests",
-    "unit": "gulp runUnit",
-    "e2e": "gulp testE2e",
-    "build": "gulp build",
-    "build:skip-tests": "gulp coreBuild",
-    "build:dev": "gulp buildDev",
-    "dev": "gulp dev",
-    "fastdev": "gulp fastdev",
-    "watch": "gulp watch",
-    "lint": "eslint src"
-  },
-  "engines": {
-    "node": ">=20.9",
-    "npm": ">=10.1"
-  },
-  "dependencies": {
-    "@microsoft/signalr": "7.0.12",
-    "@umbraco-ui/uui": "1.7.1",
-    "@umbraco-ui/uui-css": "1.7.0",
-    "ace-builds": "1.31.1",
-    "angular": "1.8.3",
-    "angular-animate": "1.8.3",
-    "angular-aria": "1.8.3",
-    "angular-chart.js": "1.1.1",
-    "angular-cookies": "1.8.3",
-    "angular-dynamic-locale": "0.1.38",
-    "angular-i18n": "1.8.3",
-    "angular-local-storage": "0.7.1",
-    "angular-messages": "1.8.3",
-    "angular-mocks": "1.8.3",
-    "angular-route": "1.8.3",
-    "angular-sanitize": "1.8.3",
-    "angular-touch": "1.8.3",
-    "angular-ui-sortable": "0.19.0",
-    "animejs": "3.2.1",
-    "bootstrap-social": "5.1.1",
-    "chart.js": "^2.9.3",
-    "clipboard": "2.0.11",
-    "diff": "5.1.0",
-    "flatpickr": "4.6.13",
-    "font-awesome": "4.7.0",
-    "jquery": "3.7.1",
-    "jquery-ui-dist": "1.13.2",
-    "jquery-ui-touch-punch": "0.2.3",
-    "lazyload-js": "1.0.0",
-    "moment": "2.29.4",
-    "ng-file-upload": "12.2.13",
-    "nouislider": "15.7.1",
-    "spectrum-colorpicker2": "2.0.10",
-    "tinymce": "6.8.2",
-    "typeahead.js": "0.11.1",
-    "underscore": "1.13.6",
-    "wicg-inert": "3.1.2"
-  },
-  "devDependencies": {
-    "@babel/core": "7.21.8",
-    "@babel/preset-env": "7.21.5",
-    "autoprefixer": "10.4.16",
-    "cssnano": "6.0.1",
-    "eslint": "8.52.0",
-    "gulp": "4.0.2",
-    "gulp-angular-embed-templates": "2.3.0",
-    "gulp-babel": "8.0.0",
-    "gulp-clean-css": "4.3.0",
-    "gulp-cli": "2.3.0",
-    "gulp-concat": "2.6.1",
-    "gulp-eslint-new": "1.8.4",
-    "gulp-imagemin": "7.1.0",
-    "gulp-less": "5.0.0",
-    "gulp-minify": "3.1.0",
-    "gulp-notify": "4.0.0",
-    "gulp-postcss": "9.0.1",
-    "gulp-rename": "2.0.0",
-    "gulp-sort": "2.0.0",
-    "gulp-sourcemaps": "3.0.0",
-    "gulp-watch": "5.0.1",
-    "gulp-wrap": "0.15.0",
-    "gulp-wrap-js": "0.4.1",
-    "jasmine-core": "5.1.1",
-    "jsdom": "22.1.0",
-    "karma": "6.4.2",
-    "karma-jasmine": "5.1.0",
-    "karma-jsdom-launcher": "15.0.0",
-    "karma-junit-reporter": "2.0.1",
-    "karma-spec-reporter": "0.0.36",
-    "less": "4.2.0",
-    "lodash": "4.17.21",
-    "merge-stream": "2.0.0",
-    "postcss": "8.4.31",
-    "run-sequence": "2.2.1"
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/app.js b/src/Umbraco.Web.UI.Client/src/app.js
deleted file mode 100644
index 645296f0e0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/app.js
+++ /dev/null
@@ -1,96 +0,0 @@
-var app = angular.module('umbraco', [
-	'umbraco.filters',
-	'umbraco.directives',
-	'umbraco.resources',
-	'umbraco.services',
-	'umbraco.packages',
-	'umbraco.views',
-
-    'ngRoute',
-	'ngAnimate',
-    'ngCookies',
-    'ngSanitize',
-    'ngTouch',
-    'ngMessages',
-    'ngAria',
-    'tmh.dynamicLocale',
-    'ngFileUpload',
-    'LocalStorageModule',
-    'chart.js'
-]);
-
-app.config(['$compileProvider', function ($compileProvider) {
-    // when not in debug mode remove all angularjs debug css classes and  HTML comments from the dom
-    $compileProvider.debugInfoEnabled(Umbraco.Sys.ServerVariables.isDebuggingEnabled);
-    // don't execute directives inside comments
-    $compileProvider.commentDirectivesEnabled(false);
-    // don't execute directives inside css classes
-    $compileProvider.cssClassDirectivesEnabled(false);
-}]);
-
-// I configure the $animate service during bootstrap.
-angular.module("umbraco").config(
-    function configureAnimate( $animateProvider ) {
-        // By default, the $animate service will check for animation styling
-        // on every structural change. This requires a lot of animateFrame-based
-        // DOM-inspection. However, we can tell $animate to only check for
-        // animations on elements that have a specific class name RegExp pattern
-        // present. In this case, we are requiring the "umb-animated" class.
-        $animateProvider.classNameFilter( /\bumb-animated\b/ );
-    }
-);
-
-var packages = angular.module("umbraco.packages", []);
-
-//this ensures we can inject our own views into templateCache and clear
-//the entire cache before the app runs, due to the module
-//order, clearing will always happen before umbraco.views and umbraco
-//module is initilized.
-angular.module("umbraco.views", ["umbraco.viewcache"]);
-angular.module("umbraco.viewcache", [])
-    .run(function ($rootScope, $templateCache, localStorageService) {
-        /** For debug mode, always clear template cache to cut down on
-            dev frustration and chrome cache on templates */
-        if (Umbraco.Sys.ServerVariables.isDebuggingEnabled) {
-            $templateCache.removeAll();
-        }
-        else {
-            var storedVersion = localStorageService.get("umbVersion");
-            if (!storedVersion || storedVersion !== Umbraco.Sys.ServerVariables.application.cacheBuster) {
-                //if the stored version doesn't match our cache bust version, clear the template cache
-                $templateCache.removeAll();
-                //store the current version
-                localStorageService.set("umbVersion", Umbraco.Sys.ServerVariables.application.cacheBuster);
-            }
-        }
-    })
-    .config([
-        //This ensures that all of our angular views are cache busted, if the path starts with views/ and ends with .html, then
-        // we will append the cache busting value to it. This way all upgraded sites will not have to worry about browser cache.
-        "$provide", function($provide) {
-            return $provide.decorator("$http", [
-                "$delegate", function($delegate) {
-                    var get = $delegate.get;
-                    $delegate.get = function (url, config) {
-
-                        if (Umbraco.Sys.ServerVariables.application && url.startsWith("views/") && url.endsWith(".html")) {
-                            var rnd = Umbraco.Sys.ServerVariables.application.cacheBuster;
-                            var _op = (url.indexOf("?") > 0) ? "&" : "?";
-                            url += _op + "umb__rnd=" + rnd;
-                        }
-
-                        return get(url, config);
-                    };
-                    return $delegate;
-                }
-            ]);
-        }
-    ]);
-
-//Call a document callback if defined, this is sort of a dodgy hack to
-// be able to configure angular values in the Default.cshtml
-// view which is much easier to do that configuring values by injecting them in  the back office controller
-// to follow through to the js initialization stuff
-if (_.isFunction(document.angularReady)) {
-    document.angularReady.apply(this, [app]);
-}
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/helveticons/helveticons.eot b/src/Umbraco.Web.UI.Client/src/assets/fonts/helveticons/helveticons.eot
deleted file mode 100644
index 913fd66248..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/helveticons/helveticons.eot and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/helveticons/helveticons.svg b/src/Umbraco.Web.UI.Client/src/assets/fonts/helveticons/helveticons.svg
deleted file mode 100644
index e4ae7c7536..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/fonts/helveticons/helveticons.svg
+++ /dev/null
@@ -1,6176 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG font generated by IcoMoon.
-<iconset grid="16"></iconset>
-</metadata>
-<defs>
-<font id="icomoon" horiz-adv-x="512" >
-<font-face units-per-em="512" ascent="480" descent="-32" />
-<missing-glyph horiz-adv-x="512" />
-<glyph class="hidden" unicode="&#xf000;" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
-<glyph unicode="&#xe000;" d="M 471.012,73.256l-2.691,2.688l 0.006,0.006L 360.812,183.471c 14.937,25.73, 23.615,55.564, 23.818,87.448
-	c 0.631,97.618-77.989,177.245-175.596,177.856c-0.393,0.004-0.774,0.004-1.167,0.004c-97.062-0.004-176.067-78.391-176.693-175.598
-	c-0.617-97.609, 78-177.237, 175.598-177.859c 0.387,0, 0.764,0, 1.15,0c 32.447,0, 62.846,8.787, 89,24.070l 107.421-107.429l 0.010,0.010
-	l 2.688-2.687c 8.123-8.123, 21.292-8.117, 29.414,0l 34.556,34.552C 479.129,51.957, 479.134,65.131, 471.012,73.256z M 300.693,178.643
-	c-24.835-24.668-57.778-38.252-92.77-38.252l-0.862,0 c-72.591,0.465-131.276,59.906-130.816,132.504
-	c 0.464,72.127, 59.511,130.809, 131.628,130.816l 0.877,0 c 35.169-0.223, 68.144-14.127, 92.849-39.15
-	c 24.706-25.027, 38.188-58.177, 37.963-93.352C 339.34,236.189, 325.537,203.314, 300.693,178.643z M 121.817,245.984l 177.254,0 l0,54.224 
-	L 121.817,300.208 L 121.817,245.984 z"  />
-<glyph unicode="&#xe001;" d="M 435.303,330.936l-98.088,0 l0-157.718 c 6.49,2.222, 13.489,3.465, 20.782,3.465c 30.004,0, 55.184-20.733, 61.983-48.691l 50.23,0 
-			L 470.21,246.271 L 435.303,330.936z M 387.264,241.528l-23.691,64.454l 55.039,0 l 26.566-64.454L 387.264,241.528 z M 286.919,374.301L 65.512,374.301 
-			c-13.359,0-24.183-10.829-24.183-24.17l0-223.154 l 31.347,0 c 6.426,28.45, 31.852,49.706, 62.211,49.706
-			c 30.414,0, 55.84-21.256, 62.25-49.706l 98.612,0 c 2.519,11.086, 7.882,21.092, 15.353,29.168L 311.102,350.131 
-			C 311.102,363.472, 300.277,374.301, 286.919,374.301z M 134.887,151.734c-21.418,0-38.847-17.436-38.847-38.887
-			s 17.429-38.887, 38.847-38.887c 21.47,0, 38.901,17.436, 38.901,38.887S 156.356,151.734, 134.887,151.734z M 357.997,151.734
-			c-21.452,0-38.901-17.436-38.901-38.887s 17.449-38.887, 38.901-38.887s 38.882,17.436, 38.882,38.887
-			S 379.449,151.734, 357.997,151.734z"  />
-<glyph unicode="&#xe002;" d="M 471.823,72.599l-2.69,2.691l 0.005,0.006L 361.623,182.814c 14.938,25.734, 23.617,55.566, 23.822,87.453
-	c 0.627,97.611-77.992,177.241-175.599,177.854c-0.394,0.002-0.773,0.002-1.167,0.002c-97.062-0.006-176.067-78.389-176.693-175.599
-	c-0.617-97.608, 78-177.231, 175.598-177.857c 0.385-0.005, 0.762-0.005, 1.149-0.005c 32.445,0, 62.846,8.792, 89.003,24.078
-	l 107.42-107.435l 0.010,0.010l 2.688-2.685c 8.121-8.125, 21.289-8.118, 29.412,0l 34.556,34.555
-	C 479.94,51.303, 479.944,64.479, 471.823,72.599z M 301.504,177.983c-24.832-24.667-57.781-38.251-92.77-38.251l-0.861,0.004
-	C 135.283,140.2, 76.598,199.64, 77.057,272.235c 0.226,35.015, 14.030,67.888, 38.875,92.563c 24.833,24.667, 57.773,38.252, 92.751,38.252
-	l 0.882,0 c 35.164-0.223, 68.138-14.121, 92.847-39.146c 24.705-25.028, 38.189-58.178, 37.963-93.354
-	C 340.152,235.537, 326.348,202.661, 301.504,177.983z M 238.365,364.2l-54.219,0 l0-61.519 l-61.516,0 l0-54.222 l 61.516,0 l0-61.519 l 54.219,0 L 238.365,248.46 
-	l 61.52,0 l0,54.222 l-61.52,0 L 238.365,364.2 z"  />
-<glyph unicode="&#xe003;" d="M 239.408,79.922l 27.732,0 l0,38.637 l-27.732,0 L 239.408,79.922 z M 398.535,441.859L 289.933,441.859 l0-12.911 l-52.355,0 L 237.578,411.68 l-21.519,0 l0,30.18 L 113.047,441.86 
-			c-13.373,0-24.164-10.822-24.164-24.162l0-386.011 c0-13.359, 10.791-24.169, 24.164-24.169l 285.488,0 
-			c 13.343,0, 24.164,10.81, 24.164,24.169L 422.699,417.697 C 422.699,431.037, 411.878,441.859, 398.535,441.859z M 252.621,413.572l 36.296,0 l0-30.771 L 267.4,382.801 
-			L 267.4,400.067 l-14.779,0 L 252.621,413.572 z M 252.621,356.545l 36.296,0 l0-30.771 L 267.4,325.774 l0,17.262 l-14.779,0 L 252.621,356.545 z M 252.621,300.559l 36.296,0 l0-30.771 L 267.4,269.788 
-			l0,17.264 l-14.779,0 L 252.621,300.559 z M 252.621,242.088l 36.296,0 l0-13.524 l-36.296,0 L 252.621,242.088 z M 216.059,385.423l 36.332,0 l0-13.511 l-14.813,0 l0-17.266 
-			l-21.519,0 L 216.059,385.423 z M 216.059,329.434l 36.332,0 l0-13.507 l-14.813,0 l0-17.263 l-21.519,0 L 216.059,329.434 z M 216.059,270.963l 36.332,0 l0-13.521 l-14.813,0 l0-17.283 
-			l-21.519,0 L 216.059,270.963 z M 275.608,63.209l-44.702,0 c-13.899,0-23.513,11.214-21.454,24.951l 7.522,49.15
-			c 2.062,13.707, 15.142,24.919, 29.007,24.919l 14.552,0 c 13.866,0, 26.913-11.212, 29.005-24.919l 7.491-49.15
-			C 299.153,74.423, 289.507,63.209, 275.608,63.209z M 266.713,178.909l-27.827,0 l-33.324,32.326l 94.475,0 L 266.713,178.909z"  />
-<glyph unicode="&#xe004;" d="M 374.236,367.104l 0.002,0.004c-34.665,28.842-76.951,42.994-118.78,42.969c-48.281,0.027-96.382-18.878-132.321-55.332
-	L 87.027,384.867l-0.608-116.069l 114.082,21.411l-37.78,31.516c 25.665,24.441, 59.003,36.957, 92.737,36.984
-	c 30.38-0.027, 60.723-10.141, 85.939-31.095c 32.061-26.661, 48.504-64.85, 48.546-103.566c-0.007-5.596-0.357-11.188-1.053-16.753
-	l 52.271,9.994c 0.081,2.255, 0.14,4.508, 0.14,6.759C 441.339,277.301, 418.419,330.38, 374.236,367.104z M 348.735,127.229
-	c-25.753-24.888-59.396-37.631-93.449-37.658c-30.388,0.018-60.733,10.15-85.939,31.084
-	c-32.057,26.664-48.517,64.861-48.552,103.569c 0.006,6.409, 0.486,12.812, 1.397,19.17l-52.507-9.854
-	c-0.153-3.104-0.255-6.21-0.255-9.315c-0.031-53.254, 22.898-106.347, 67.080-143.068c 34.652-28.817, 76.939-42.97, 118.775-42.952l 0.136,0 
-	c 48.598,0, 97.016,19.191, 133.003,56.146l 34.503-28.586l 0.214,116.073l-114.007-21.804L 348.735,127.229z"  />
-<glyph unicode="&#xe005;" d="M 324.816,307.228l 0.014-0.027c-0.080,0.108-0.146,0.213-0.242,0.319c-4.22,5.829-8.39,11.433-12.461,16.761
-			c-5.395,9.025-8.242,20.006-1.619,35.849l0,0.009 l 22.776,54.505l-35.808,16.298l 3.696,16.156l-89.834,0 l 4.708-20.585l-36.804-11.869
-			l 22.761-54.505l 0.018-0.009c 11.247-26.945-4.856-39.813-14.325-52.928c-46.861-64.796-99.313-157.564-99.313-213.49
-			c0-92.734, 72.008-89.646, 167.857-89.646c 95.881,0, 167.889-3.088, 167.889,89.646C 424.129,149.646, 371.662,242.414, 324.816,307.228z
-			 M 233.678,352.732l 45.879,0 l0-28.931 l-45.879,0 L 233.678,352.732 z M 307.109,173.363l0-20.791 l-31.283,0 l-3.282-6.344l0-10.058 l 34.565,0 l0-20.782 l-34.565,0 
-			l0-30.181 l-33.245,0 l0,30.181 l-34.336,0 l0,20.782 l 34.336,0 l0,10.058 l-3.041,6.344l-31.295,0 l0,20.791 l 20.801,0 l-33.489,68.015l 35.449,0 
-			l 28.859-68.015l 28.221,68.015l 35.435,0 l-33.915-68.015L 307.109,173.363 z"  />
-<glyph unicode="&#xe006;" d="M 314.439,158.699c-0.186-0.035-0.383-0.063-0.572-0.101l-48.846,40.456l-0.078-45.663c-3.168-0.091-6.352-0.155-9.566-0.153
-	c-47.775-0.073-90.82,10.348-119.785,25.578c-14.496,7.545-25.336,16.229-31.842,24.324c-6.559,8.225-8.87,15.079-8.914,21.718
-	c 0.034,7.984, 3.546,16.798, 13.858,27.144c 10.181,10.146, 26.818,20.4, 48.036,28.213c 1.189,0.44, 2.406,0.867, 3.621,1.293
-	l-44.539,36.889c-16.619-8.232-31.257-18.090-43.229-29.865c-17.119-16.768-29.14-38.85-29.106-63.673
-	c-0.046-20.229, 8.065-38.979, 20.353-54.034c 18.569-22.71, 46.073-39.182, 78.877-50.871c 32.865-11.58, 71.375-18.061, 112.67-18.078
-	c 3.18,0, 6.334,0.053, 9.479,0.131l-0.088-50.725l 89.646,73.732l-39.975,33.109L 314.439,158.699 z M 245.957,396.889l-89.646-73.73l 89.396-74.040
-	l 0.078,47.212c 3.18,0.092, 6.368,0.154, 9.591,0.152c 47.769,0.062, 90.814-10.352, 119.773-25.583
-	c 14.5-7.544, 25.336-16.229, 31.84-24.326c 6.555-8.226, 8.867-15.079, 8.915-21.715c-0.024-4.641-1.142-9.16-3.951-14.378
-	c-4.159-7.764-12.634-16.785-25.487-25.085c-9.574-6.226-21.463-12.005-35.111-16.857l 44.471-36.833
-	c 13.242,6.638, 25.173,14.355, 35.52,23.203c 10.465,9.006, 19.322,19.266, 25.735,31.030c 6.397,11.718, 10.208,25.077, 10.19,38.92l0,0.168 
-	c0,20.162-8.104,38.849-20.361,53.859c-18.572,22.716-46.064,39.181-78.877,50.872c-32.856,11.582-71.361,18.062-112.656,18.080
-	c-3.193,0-6.343-0.1-9.502-0.177L 245.957,396.889z"  />
-<glyph unicode="&#xe007;" d="M 190.071,161.481c-0.035,0.189-0.064,0.387-0.102,0.575l 40.457,48.848l-45.662,0.078c-0.091,3.168-0.155,6.35-0.153,9.566
-	c-0.072,47.771, 10.348,90.818, 25.58,119.785c 7.543,14.494, 16.227,25.336, 24.323,31.838c 8.224,6.562, 15.078,8.871, 21.716,8.918
-	c 7.986-0.035, 16.798-3.545, 27.148-13.859c 10.144-10.182, 20.397-26.819, 28.208-48.035c 0.439-1.189, 0.866-2.408, 1.293-3.621
-	l 36.89,44.537c-8.234,16.621-18.093,31.258-29.868,43.23c-16.765,17.115-38.849,29.141-63.671,29.104
-	c-20.229,0.047-38.979-8.065-54.033-20.353c-22.712-18.569-39.184-46.071-50.871-78.876c-11.58-32.864-18.061-71.377-18.080-112.668
-	c0-3.18, 0.056-6.336, 0.132-9.479l-50.725,0.084l 73.73-89.646l 33.111,39.974L 190.071,161.481 z M 428.264,229.967l-73.735,89.644
-	l-74.039-89.394l 47.216-0.078c 0.089-3.18, 0.151-6.366, 0.151-9.59c 0.061-47.768-10.354-90.816-25.586-119.775
-	c-7.544-14.498-16.229-25.332-24.325-31.836c-8.224-6.561-15.080-8.87-21.715-8.916c-4.641,0.021-9.16,1.14-14.378,3.949
-	c-7.76,4.158-16.786,12.632-25.084,25.487c-6.225,9.573-12.009,21.462-16.858,35.11l-36.834-44.471
-	c 6.64-13.242, 14.357-25.176, 23.206-35.52c 9.006-10.463, 19.268-19.326, 31.029-25.735c 11.718-6.399, 25.078-10.21, 38.919-10.189l 0.168,0 
-	c 20.164,0, 38.849,8.104, 53.86,20.358c 22.715,18.574, 39.18,46.066, 50.873,78.881c 11.58,32.855, 18.060,71.36, 18.080,112.656
-	c-0.002,3.191-0.103,6.34-0.177,9.5L 428.264,229.967z"  />
-<glyph unicode="&#xe008;" d="M 411.685,318.424l-48.849,13.089l-13.093,48.851l 49.864,49.864c-29.43,7.945-62.171,0.389-85.272-22.712
-	c-23.24-23.237-30.747-56.229-22.568-85.794L 157.22,187.174c-29.565,8.176-62.555,0.668-85.797-22.569
-	c-23.1-23.101-30.655-55.843-22.71-85.274l 49.866,49.861l 48.85-13.088l 13.090-48.851l-49.864-49.864
-	c 29.43-7.941, 62.172-0.386, 85.271,22.715c 24.258,24.254, 31.373,59.141, 21.405,89.658L 349.183,261.61
-	c 30.52-9.972, 65.401-2.853, 89.653,21.404c 23.103,23.101, 30.657,55.843, 22.713,85.273L 411.685,318.424z"  />
-<glyph unicode="&#xe009;" d="M 271.017,70.2L 271.017,205.803 c 64.194,7.588, 114.194,62.334, 114.194,128.535c0,18.39-4.25,55.384-15.729,76.408l-8.111,14.917
-	L 150.118,425.663 l-8.142-14.917c-11.447-21.050-15.697-58.018-15.697-76.408c0-66.889, 50.949-122.083, 116.122-128.777L 242.401,70.2 
-	c-52.388-1.594-92.806-11.767-92.806-24.070c0-13.414, 47.973-24.288, 107.131-24.288c 59.124,0, 107.066,10.874, 107.066,24.288
-	C 363.793,58.434, 323.371,68.606, 271.017,70.2z"  />
-<glyph unicode="&#xe00a;" d="M 422.952,108.695L 307.064,224.582L 422.948,340.469L 371.226,392.192L 255.34,276.307L 139.457,392.188L 87.731,340.469L 203.616,224.584L 87.731,108.695L 139.457,56.974L 255.344,172.86L 371.228,56.978 z"  />
-<glyph unicode="&#xe00b;" d="M 229.882,220.531c-18.919,11.596-37.020,21.375-59.731,23.158c-27.751,2.188-55.429-6.158-80.847-16.53L 52.779,99.361
-	c 48.963,18.699, 94.119,20.855, 139.427-7.877l 37.692,129.039C 229.898,220.523, 229.89,220.531, 229.882,220.531 M 181.049,270.079
-	c 23.059-2.835, 41.371-12.591, 56.304-21.974c 12.356,42.651, 24.59,85.335, 37.052,127.946c-17.793,11.319-35.975,21.131-57.284,23.254
-	c-28.043,3.347-57.26-5.064-82.912-15.557C 121.707,341, 109.463,298.17, 97.099,255.381
-	C 123.578,265.769, 152.391,273.596, 181.049,270.079 M 330.548,179.818c-34.347,0-57.722,12.104-77.752,25.426
-	c-0.097-0.113-0.251-0.211-0.364-0.293l-37.109-128.439c 47.042-31.178, 100.299-30.887, 151.458-9.285l 35.983,125.539l-0.323-0.082
-	C 375.313,183.609, 351.532,179.818, 330.548,179.818 M 448.455,351.443c-0.098,0.065-0.179,0.146-0.26,0.227
-	c-51.67-20.977-102.577-23.173-150.544,8.703c-2.195-7.568-4.214-13.289-5.492-17.728c-4.239-14.666-8.476-29.332-12.715-43.997
-	c-6.497-22.525-13.004-45.050-19.51-67.566c 46.889-30.312, 100.105-31.932, 150.933-9.092l 37.668,129.381L 448.455,351.443"  />
-<glyph unicode="&#xe00c;" d="M 49.525,187.208L 218.908,187.208L 218.908,73.265L 49.525,73.265zM 49.525,285.159L 49.525,210.886L 78.631,210.886L 78.631,256.050L 335.41,256.050L 335.41,102.368L 242.586,102.368L 242.586,73.265L 364.516,73.265L 364.516,102.368L 364.516,285.159L 78.631,285.159 	zM 49.525,374.735L 49.525,312.88L 78.631,312.88L 78.631,345.628L 433.369,345.628L 433.369,102.368L 392.238,102.368L 392.238,73.265L 462.477,73.265L 462.477,374.735 	z"  />
-<glyph unicode="&#xe00d;" d="M 366.118,241.708L 463.075,338.667L 418.829,382.916L 321.867,285.958L 282.296,325.533L 282.296,201.395L 406.431,201.395 	zM 426.79,101.374L 85.21,101.374L 85.21,346.628L 266.407,346.628L 266.407,382.916L 48.925,382.916L 48.925,65.084L 463.075,65.084L 463.075,175.637L 426.79,175.637 	z"  />
-<glyph unicode="&#xe00e;" d="M 162.073,145.271l 29.878-29.873c 16.092,17.093, 38.877,27.82, 64.209,27.82c 25.336,0, 48.119-10.728, 64.221-27.82
-		l 29.873,29.873c-23.778,24.761-57.131,40.255-94.094,40.255C 219.203,185.526, 185.857,170.032, 162.073,145.271z M 256.16,97.216
-		c-12.612,0-23.822-5.661-31.58-14.446l 31.586-31.586l 31.584,31.586C 279.986,91.555, 268.777,97.216, 256.16,97.216z
-		 M 476.211,274.958c-121.531,121.532-318.568,121.524-440.1,0c-0.625-0.625-1.195-1.283-1.812-1.906l 30.662-30.663
-		c 48.605,49.566, 116.294,80.354, 191.205,80.354c 74.906,0, 142.592-30.787, 191.203-80.354l 30.66,30.663
-		C 477.408,273.675, 476.838,274.333, 476.211,274.958z M 256.166,276.743c-59.254,0-114.965-23.073-156.863-64.971
-		c-0.622-0.623-1.197-1.279-1.818-1.909l 31.976-31.973c 32.094,33.061, 76.987,53.637, 126.7,53.637
-		c 49.72,0, 94.608-20.576, 126.711-53.637l 31.967,31.969c-0.617,0.634-1.195,1.29-1.819,1.913
-		C 371.121,253.67, 315.417,276.743, 256.166,276.743z"  />
-<glyph unicode="&#xe00f;" d="M 322.193,249.642L 192.709,249.642 l0,47.99 l-89.144-73.576l 89.144-73.565L 192.709,198.48 l 129.484,0 l0-47.989 l 89.143,73.565l-89.143,73.576L 322.193,249.642 
-	z M 37.735,128.922l 51.147,0 L 88.882,319.184 L 37.735,319.184 L 37.735,128.922 z M 422.699,319.184l0-190.262 l 51.146,0 L 473.845,319.184 L 422.699,319.184 z"  />
-<glyph unicode="&#xe010;" d="M 418.059,69.125l-38.232,206.578c-1.35,7.275-7.693,12.557-15.094,12.557l-60.451,0 
-	c 10.457,11.557, 16.834,26.867, 16.834,43.645c0,35.902-29.209,65.115-65.117,65.115c-35.902,0-65.115-29.213-65.115-65.115
-	c0-16.777, 6.381-32.088, 16.838-43.645l-60.457,0 c-7.398,0-13.744-5.281-15.092-12.557l-38.23-206.578
-	c-0.83-4.484, 0.375-9.105, 3.293-12.611c 2.916-3.506, 7.238-5.533, 11.799-5.533l 293.932,0 c 4.561,0, 8.885,2.027, 11.801,5.533
-	S 418.889,64.641, 418.059,69.125z M 255.998,368.158c 20.025,0, 36.258-16.232, 36.258-36.254c0-20.027-16.232-36.26-36.258-36.26
-	c-20.023,0-36.254,16.232-36.254,36.26C 219.744,351.926, 235.975,368.158, 255.998,368.158z M 223.418,104.588l-31.246,44.273
-	l-7.84-7.947l0-36.326 l-26.199,0 L 158.133,213.746 l 26.199,0 l0-39.406 l 36.953,39.406l 34.926,0 l-45.449-45.553l 46.609-63.605L 223.418,104.588 z M 359.311,104.588
-	l-18.82,0 l-1.715,10.172c-3.086-3.236-5.92-5.621-8.594-7.234c-6.1-3.732-13.664-5.627-22.473-5.627
-	c-14.461,0-26.492,5.092-35.746,15.135c-9.574,10.008-14.439,23.846-14.439,41.109c0,17.428, 4.902,31.637, 14.574,42.23
-	c 9.725,10.66, 22.732,16.064, 38.656,16.064c 13.779,0, 25.051-3.582, 33.504-10.646c 8.494-7.102, 13.434-16.092, 14.682-26.723
-	l 0.311-2.645l-26.008,0 l-0.426,1.832c-1.488,6.422-5.008,10.779-10.764,13.316c-3.26,1.416-6.971,2.139-11.014,2.139
-	c-7.752,0-13.939-2.842-18.92-8.682c-5.008-5.869-7.547-14.977-7.547-27.061c0-12.068, 2.693-20.637, 8.010-25.473
-	c 5.457-4.961, 11.469-7.373, 18.385-7.373c 6.777,0, 12.148,1.863, 16.41,5.693c 3.656,3.285, 6.068,7.354, 7.328,12.381l-23.629,0 l0,22.164 
-	l 48.234,0 L 359.31,104.588 z"  />
-<glyph unicode="&#xe011;" d="M 453.475,151.006L 57.719,151.006 c-14.093,0-20.271-10.201-13.734-22.697l 29.463-56.295c 6.576-12.474, 23.449-22.694, 37.575-22.694
-	l 289.15,0 c 14.093,0, 31,10.221, 37.538,22.694l 29.5,56.295C 473.75,140.805, 467.57,151.006, 453.475,151.006z M 119.329,74.616
-	c-14.095,0-25.539,11.445-25.539,25.539c0,14.112, 11.444,25.539, 25.539,25.539c 14.129,0, 25.54-11.427, 25.54-25.539
-	C 144.869,86.062, 133.458,74.616, 119.329,74.616z M 211.385,74.616c-14.094,0-25.509,11.445-25.509,25.539
-	c0,14.112, 11.415,25.539, 25.509,25.539c 14.127,0, 25.539-11.427, 25.539-25.539C 236.924,86.062, 225.512,74.616, 211.385,74.616z
-	 M 303.473,75.725c-13.506,0-24.428,10.959-24.428,24.431c0,13.504, 10.922,24.44, 24.428,24.44c 13.505,0, 24.43-10.937, 24.43-24.44
-	C 327.902,86.684, 316.978,75.725, 303.473,75.725z M 395.529,75.725c-13.474,0-24.432,10.959-24.432,24.431
-	c0,13.504, 10.958,24.44, 24.432,24.44c 13.504,0, 24.46-10.937, 24.46-24.44C 419.989,86.684, 409.033,75.725, 395.529,75.725z
-	 M 117.826,315.74l 60.367-35.057c0-0.26-0.032-0.523-0.032-0.802l0-42.625 l-49.447,0 l-32.831-56.755l 326.428,0 l-32.865,56.755l-48.398,0 
-	l0,42.625 c0,13.523-10.987,24.476-24.495,24.476L 202.656,304.357 c-0.493,0-0.919-0.031-1.375-0.046l-67.367,39.11l 7.719,13.277L 70.146,398.197
-	l-31.591-54.352l 71.487-41.5L 117.826,315.74z"  />
-<glyph unicode="&#xe012;" d="M 306.997,355.609c 8.992,0, 16.277,7.286, 16.277,16.276L 323.274,422.816 c 0.002,8.989-7.285,16.276-16.277,16.276
-	c-8.983,0-16.271-7.287-16.273-16.276l0-50.932 C 290.724,362.895, 298.014,355.606, 306.997,355.609z M 387.749,332.365l 36.015,36.017
-	c 6.356,6.357, 6.353,16.662,0,23.015c-6.357,6.356-16.662,6.356-23.019,0l-36.013-36.014c-6.356-6.356-6.358-16.661,0-23.018
-	C 371.086,326.009, 381.393,326.012, 387.749,332.365z M 226.683,329.813c 6.354-6.353, 16.663-6.353, 23.018,0
-	c 6.353,6.356, 6.353,16.662,0,23.018l-36.018,36.018c-6.355,6.353-16.661,6.353-23.015,0c-6.359-6.356-6.359-16.662,0-23.018
-	L 226.683,329.813z M 386.183,216.35c-6.356,6.357-16.663,6.357-23.020,0c-6.354-6.355-6.354-16.661,0-23.018l 36.015-36.014
-	c 6.356-6.356, 16.663-6.356, 23.018,0c 6.358,6.356, 6.358,16.658,0,23.015L 386.183,216.35z M 316.164,347.411L 37.625,68.875
-	l 58.761-58.76l 278.541,278.533L 316.164,347.411z M 250.969,248.239l 67.606,67.608l 24.787-24.788l-67.606-67.608L 250.969,248.239z
-	 M 456.169,289.923l-50.934,0 c-8.99,0-16.275-7.289-16.275-16.275c-0.004-8.985, 7.285-16.275, 16.275-16.275l 50.934,0 
-	c 8.988,0, 16.273,7.29, 16.273,16.275C 472.442,282.638, 465.157,289.923, 456.169,289.923z"  />
-<glyph unicode="&#xe013;" d="M 445.271,339.129c0,28.207-22.925,51.165-51.113,51.165L 65.932,390.294 l0-39.277 l 3.463,0 c 6.182,0, 11.218-5, 11.218-11.2
-	c0-6.18-5.036-11.201-11.218-11.201l-3.463,0 l0-211.153 l 3.463,0 c 6.182,0, 11.218-5.006, 11.218-11.201c0-6.164-5.036-11.201-11.218-11.201
-	l-3.463,0 l0-37.247 l 328.225,0 c 28.188,0, 51.113,22.94, 51.113,51.132l0,60.549 l-74.003,0 c-16.221,0-29.432,13.174-29.432,29.446l0,50.212 
-	c0,16.27, 13.211,29.446, 29.432,29.446l 74.003,0 L 445.27,339.129 z M 363.221,117.463l 19.752,0 l0,20.553 c0,6.181, 5.004,11.183, 11.185,11.183
-	c 6.182,0, 11.187-5.002, 11.187-11.183l0-29.25 c0-0.654-0.035-1.179-0.165-1.605c-0.817-6.803-6.508-12.1-13.474-12.1l-28.484,0 
-	c-6.179,0-11.183,5.037-11.183,11.201C 352.038,112.457, 357.042,117.463, 363.221,117.463z M 133.199,95.061l-22.402,0 
-	c-6.182,0-11.183,5.037-11.183,11.201c0,6.195, 5.001,11.201, 11.183,11.201l 22.402,0 c 6.181,0, 11.215-5.006, 11.215-11.201
-	C 144.414,100.098, 139.38,95.061, 133.199,95.061z M 133.199,328.616l-22.402,0 c-6.182,0-11.183,5.021-11.183,11.201
-	c0,6.199, 5.001,11.2, 11.183,11.2l 22.402,0 c 6.181,0, 11.215-5, 11.215-11.2C 144.414,333.638, 139.38,328.616, 133.199,328.616z
-	 M 196.313,95.061L 173.91,95.061 c-6.146,0-11.182,5.037-11.182,11.201c0,6.195, 5.035,11.201, 11.182,11.201l 22.403,0 
-	c 6.178,0, 11.183-5.006, 11.183-11.201C 207.496,100.098, 202.492,95.061, 196.313,95.061z M 196.313,328.616L 173.91,328.616 
-	c-6.146,0-11.182,5.021-11.182,11.201c0,6.199, 5.035,11.2, 11.182,11.2l 22.403,0 c 6.178,0, 11.183-5, 11.183-11.2
-	C 207.496,333.638, 202.492,328.616, 196.313,328.616z M 259.394,95.061l-22.37,0 c-6.177,0-11.216,5.037-11.216,11.201
-	c0,6.195, 5.039,11.201, 11.216,11.201l 22.37,0 c 6.213,0, 11.216-5.006, 11.216-11.201C 270.609,100.098, 265.606,95.061, 259.394,95.061z
-	 M 259.394,328.616l-22.37,0 c-6.177,0-11.216,5.021-11.216,11.201c0,6.199, 5.039,11.2, 11.216,11.2l 22.37,0 c 6.213,0, 11.216-5, 11.216-11.2
-	C 270.609,333.638, 265.606,328.616, 259.394,328.616z M 322.508,95.061l-22.399,0 c-6.183,0-11.185,5.037-11.185,11.201
-	c0,6.195, 5.002,11.201, 11.185,11.201l 22.399,0 c 6.18,0, 11.217-5.006, 11.217-11.201C 333.725,100.098, 328.688,95.061, 322.508,95.061z
-	 M 322.508,328.616l-22.399,0 c-6.183,0-11.185,5.021-11.185,11.201c0,6.199, 5.002,11.2, 11.185,11.2l 22.399,0 c 6.18,0, 11.217-5, 11.217-11.2
-	C 333.725,333.638, 328.688,328.616, 322.508,328.616z M 405.344,308.083c0-6.185-5.005-11.216-11.187-11.216
-	c-6.181,0-11.185,5.032-11.185,11.216l0,20.533 l-19.752,0 c-6.179,0-11.183,5.021-11.183,11.201c0,6.199, 5.004,11.2, 11.183,11.2l 28.484,0 
-	c 6.966,0, 12.656-5.281, 13.474-12.065c 0.13-0.445, 0.165-0.967, 0.165-1.602L 405.343,308.083 z M 368.681,224.056
-	c0-14.062, 11.417-25.459, 25.509-25.459c 14.029,0, 25.444,11.397, 25.444,25.459c0,14.042-11.415,25.455-25.444,25.455
-	C 380.098,249.511, 368.681,238.099, 368.681,224.056z"  />
-<glyph unicode="&#xe014;" d="M 401.938,326.528L 346.18,326.528 L 346.18,405.88 c0,14.128-11.445,25.572-25.539,25.572c-14.128,0-25.59-11.444-25.59-25.572l0-79.352 l-88.393,0 
-	L 206.658,405.88 c0,14.128-11.428,25.572-25.571,25.572c-14.112,0-25.557-11.444-25.557-25.572l0-79.352 l-46.403,0 l0-50.768 l 66.122-120.439l 160.565,0 
-	l 66.124,120.439L 401.938,326.528 z M 187.594,73.904l 42.364,0 l0-57.001 l 51.147,0 l0,57.001 l 42.38,0 l0,51.14 L 187.594,125.044 L 187.594,73.904 z"  />
-<glyph unicode="&#xe015;" d="M 455.184,392.56L 56.816,392.56 c-11.040,0-20-8.96-20-20l0-297.12 c0-11.040, 8.96-20, 20-20l 398.368,0 c 11.040,0, 20,8.96, 20,20
-		L 475.184,372.56 C 475.184,383.616, 466.24,392.56, 455.184,392.56z M 435.184,95.44L 76.816,95.44 L 76.816,352.56 l 54.128,0 l0-38.992 l 64,0 L 194.944,352.56 l 122.128,0 l0-38.992 l 64,0 L 381.072,352.56 l 54.128,0 L 435.2,95.44 z
-		M 152.304,212.848c 7.584-13.952, 17.2-16.864, 23.92-16.864c 6.704,0, 16.32,2.912, 23.968,16.816l 0.464,0.848
-		c 3.792,6.88, 6.528,11.856, 6.528,23.104c0,9.952,0,36.384-30.944,36.384c-30.784,0-30.784-25.504-30.784-36.384
-		c0-11.28, 2.704-16.256, 6.464-23.152L 152.304,212.848zM 234.896,178.384l-30.768,13.776c-1.312,0.592-2.784,0.624-4.096,0.048l-15.632-6.576l-16.224,0 L 152.544,192.16
-		c-1.312,0.56-2.784,0.528-4.064-0.048l-30.8-13.744c-1.856-0.832-3.040-2.672-3.040-4.688l0-18.768 c0-2.832, 2.304-5.136, 5.136-5.136
-		l 113.008,0 c 2.832,0, 5.136,2.304, 5.136,5.136l0,18.8 C 237.936,175.728, 236.736,177.568, 234.896,178.384zM 283.744,264.032L 397.376,264.032L 397.376,232.576L 283.744,232.576zM 283.744,191.52L 397.376,191.52L 397.376,160.064L 283.744,160.064z"  />
-<glyph unicode="&#xe016;" d="M 254.529,158.774c 38.885,0, 70.41,31.521, 70.41,70.41L 324.939,362.917 c0,38.886-31.525,70.41-70.41,70.41
-	c-38.888,0-70.409-31.524-70.409-70.41l0-133.733 C 184.121,190.296, 215.642,158.774, 254.529,158.774z M 350.33,275.973l0-46.968 
-	c-0.012-26.512-10.698-50.349-28.057-67.743c-17.395-17.363-41.233-28.051-67.744-28.061c-26.512,0.010-50.354,10.697-67.745,28.061
-	c-17.366,17.395-28.049,41.231-28.058,67.743l0,46.968 l-35.054,0 l-0.004-46.968c 0.014-66.331, 49.349-121.077, 113.332-129.651l0-48.715 
-	l-57.424,0 l0-35.057 l 149.899,0 l0,35.057 l-57.419,0 l0,48.715 c 63.977,8.574, 113.318,63.32, 113.33,129.651l0,46.968 L 350.33,275.973 z"  />
-<glyph unicode="&#xe017;" d="M 344.551,275.342l0-101.827 l 124.494-80.393L 469.045,355.732 L 344.551,275.342z M 299.064,340.054L 60.246,340.054 
-	c-11.292,0-20.447-9.156-20.447-20.447l0-190.358 c0-11.293, 9.155-20.447, 20.447-20.447l 238.818,0 c 11.293,0, 20.449,9.154, 20.449,20.447
-	L 319.513,319.606 C 319.514,330.898, 310.357,340.054, 299.064,340.054z"  />
-<glyph unicode="&#xe018;" d="M 36.742,359.937l0-272.518 l 93.897,0 l0,32.553 l-27.543,0 L 103.096,145.010 l 70.108,0 l0-25.038 l-27.541,0 l0-32.553 l 219.089,0 l0,32.553 l-27.543,0 L 337.209,145.010 
-	l 70.109,0 l0-25.038 l-27.543,0 l0-32.553 l 95.192,0 L 474.967,359.937 L 36.742,359.937 z M 245.817,288.985l 186.539,0 l0-25.038 L 245.817,263.947 L 245.817,288.985 z M 195.832,207.949
-	c-2.703,3.315-7.695,4.218-12.017,6.044c-5.773,2.436-12.173,5.253-17.932,7.616c-1.643,0.449-3.285,0.895-4.929,1.342
-	c-1.963,1.352-3.878,5.84-4.93,8.071c-1.045,0.148-2.086,0.3-3.135,0.443c 0.161,3.449, 2.295,3.642, 3.135,6.278
-	c 0.742,2.326, 0.078,5.345, 1.251,7.496c 0.814,1.496, 2.65,1.506, 3.567,2.789c 0.834,1.162, 1.389,3.193, 1.644,4.614
-	c 0.479,2.605, 0.891,6.17-0.346,8.748c-0.714,1.483-1.158,1.629-1.356,3.427c-0.24,2.182, 0.643,9.301, 0.68,10.839
-	c 0.088,3.991-0.004,7.612-0.97,11.499c0,0-1.175,3.52-3.016,4.586l-3.668,0.631l-2.264,2.096
-	c-9.135,5.622-18.921,1.683-24.165-0.444c-7.559-2.45-12.334-13.137-8.997-28.942c 0.567-2.7-1.481-3.91-1.344-5.382
-	c 0.291-3.218, 0.354-10.962, 3.396-12.873c 0.285-0.175, 2.443-0.72, 2.43-0.57c 0.297-3.131, 0.596-6.276, 0.894-9.409
-	c 0.765-2.088, 2.586-2.312, 3.112-5.258l-2.333-0.567c-1.045-2.231-2.967-6.72-4.927-8.071c-1.646-0.447-3.29-0.893-4.931-1.342
-	c-5.757-2.363-12.158-5.181-17.922-7.616c-3.906-1.643-8.364-2.515-11.189-5.099L 85.57,311.518 l 110.261,0 L 195.831,207.949 z M 432.358,216.367L 245.816,216.367 
-	l0,25.044 l 186.542,0 L 432.358,216.367 z"  />
-<glyph unicode="&#xe019;" d="M 305.692,211.381l0-58.607 l-99.905,0 l0,58.607 L 37.408,211.381 l0-173.058 l 436.666,0 L 474.074,211.381 L 305.692,211.381 z M 205.787,276.979l 99.905,0 l0-39.939 l 168.356,0 
-	l0,78.883 c0,11.743-9.525,21.27-21.273,21.27l-78.438,0 L 374.337,364.56 c-0.010,24.944-20.207,45.143-45.151,45.154L 182.010,409.714 
-	c-24.938-0.012-45.139-20.21-45.152-45.154l0-27.368 L 58.404,337.192 c-11.747,0-21.273-9.526-21.273-21.27l0-78.883 l 168.656,0 L 205.787,276.979 z
-	 M 167.638,364.56c 0.014,7.931, 6.44,14.36, 14.373,14.374l 147.175,0 c 7.937-0.014, 14.358-6.443, 14.378-14.374l0-27.368 L 167.638,337.192 L 167.638,364.56 z
-	 M 280.516,177.875l0,74.13 l-49.829,0 l0-74.13 L 280.516,177.875 z"  />
-<glyph unicode="&#xe01a;" d="M 310.761,342.579c 2.649-10.664, 2.913-20.567, 2.669-31.515c-0.099-4.223-2.521-23.736-1.865-29.717
-		c 0.541-4.936, 1.774-5.328, 3.72-9.395c 3.39-7.080, 2.255-16.842, 0.956-23.979c-0.712-3.906-2.216-9.468-4.502-12.653
-		c-2.521-3.518-7.562-3.541-9.793-7.641c-3.213-5.899-1.398-14.186-3.424-20.56c-2.302-7.23-8.16-7.737-8.604-17.195
-		c 2.875-0.412, 5.738-0.819, 8.604-1.23c 2.875-6.112, 8.139-18.406, 13.515-22.107c 4.504-1.231, 9.008-2.46, 13.514-3.686
-		c 15.781-6.475, 33.32-14.22, 49.139-20.889c 14.403-6.074, 31.645-8.24, 36.853-23.339c0-10.253, 0.968-34.471, 0.701-47.907L 98.489,70.766 
-		c-0.262,13.437, 0.702,37.654, 0.702,47.907c 5.209,15.099, 22.451,17.265, 36.854,23.339c 15.818,6.669, 33.357,14.414, 49.137,20.889
-		c 4.506,1.226, 9.011,2.454, 13.514,3.686c 5.379,3.701, 10.644,15.995, 13.519,22.107l 6.396,1.557
-		c-1.451,8.072-6.451,8.697-8.536,14.415c-0.815,8.597-1.636,17.201-2.452,25.802c 0.035-0.408-5.882,1.072-6.657,1.558
-		c-8.345,5.233-8.515,26.461-9.317,35.289c-0.366,4.038, 5.244,7.349, 3.686,14.745c-9.142,43.33, 3.954,72.625, 24.665,79.349
-		c 14.371,5.826, 41.207,16.63, 66.239,1.228l 6.216-5.76l 10.050-1.729C 307.542,352.239, 310.761,342.579, 310.761,342.579zM 179.18,266.012c-0.494,5.428, 1.757,9.537, 3.102,11.999c 0.258,0.477, 0.599,1.097, 0.766,1.472
-	c-1.146,5.464-1.957,10.697-2.49,15.715l-6.959,1.193l-4.427,4.104c-17.843,10.977-36.974,3.276-47.214-0.87
-	c-14.765-4.797-24.1-25.678-17.58-56.56c 1.108-5.274-2.892-7.633-2.628-10.513c 0.571-6.292, 0.688-21.426, 6.64-25.153
-	c 0.551-0.346, 4.77-1.404, 4.746-1.116c 0.583-6.127, 1.165-12.258, 1.747-18.385c 1.485-4.076, 5.052-4.521, 6.082-10.272l-4.56-1.114
-	c-2.048-4.357-5.799-13.122-9.631-15.76c-3.209-0.874-6.424-1.751-9.631-2.627c-11.249-4.611-23.751-10.134-35.028-14.888
-	c-10.264-4.329-22.555-5.875-26.268-16.633c0-7.308-0.69-24.576-0.498-34.15L 86.15,92.454 c 0.065,3.128, 0.138,6.257, 0.213,9.276
-	c 0.158,6.631, 0.309,12.892, 0.309,16.776l0,2.097 l 0.686,1.984c 6.035,17.492, 21.939,23.002, 34.72,27.426
-	c 3.229,1.116, 6.278,2.172, 9.104,3.367c 6.203,2.612, 12.673,5.396, 19.196,8.201c 9.602,4.128, 19.502,8.377, 28.808,12.213
-	c-0.465,1.008-0.893,1.936-1.26,2.717c-2.043,0.292-4.083,0.584-6.131,0.876c 0.316,6.743, 4.492,7.106, 6.131,12.258
-	c 1.445,4.548, 0.15,10.449, 2.442,14.653c 1.588,2.922, 5.183,2.943, 6.978,5.445c 1.627,2.273, 2.704,6.24, 3.21,9.021
-	c 0.272,1.495, 0.526,3.158, 0.697,4.877c-9.748,8.984-10.966,26.442-11.777,38.37C 179.373,263.517, 179.281,264.871, 179.18,266.012z
-	 M 474.654,126.604c-3.71,10.758-16.003,12.304-26.271,16.633c-11.273,4.754-23.774,10.276-35.024,14.888
-	c-3.209,0.876-6.422,1.753-9.631,2.627c-3.834,2.638-7.582,11.402-9.636,15.76c-2.040,0.292-4.084,0.584-6.129,0.876
-	c 0.316,6.743, 4.489,7.106, 6.129,12.258c 1.445,4.548, 0.152,10.449, 2.443,14.653c 1.587,2.922, 5.183,2.943, 6.979,5.445
-	c 1.63,2.273, 2.704,6.24, 3.211,9.021c 0.927,5.086, 1.733,12.047-0.684,17.093c-1.386,2.898-2.264,3.177-2.649,6.691
-	c-0.471,4.267, 1.256,18.175, 1.328,21.185c 0.176,7.804-0.014,14.862-1.9,22.463c0,0-2.296,6.887-5.888,8.963l-7.166,1.23
-	l-4.429,4.104c-17.843,10.977-36.974,3.276-47.214-0.87c-5.7-1.85-10.574-6.125-14.056-12.418c-0.113-2.086-0.152-3.793-0.061-4.668
-	c 0.049-0.457, 0.099-0.726, 0.124-0.858c 0.12-0.228, 0.26-0.451, 0.402-0.694c 0.521-0.893, 1.238-2.113, 2.042-3.799
-	c 5.022-10.492, 3.538-23.072, 1.981-31.629c-0.77-4.221-2.655-12.138-6.646-17.706c-1.044-1.453-2.195-2.626-3.354-3.603
-	c 0.634-6.669, 1.994-14.343, 5.998-16.851c 0.553-0.346, 4.771-1.404, 4.747-1.116c 0.582-6.127, 1.166-12.258, 1.749-18.385
-	c 1.483-4.076, 5.049-4.521, 6.082-10.272l-4.56-1.114c-0.357-0.76-0.769-1.659-1.224-2.633c 9.354-3.854, 19.317-8.128, 28.973-12.283
-	c 6.537-2.811, 13.017-5.597, 19.229-8.215c 2.824-1.195, 5.875-2.251, 9.104-3.367c 12.781-4.424, 28.688-9.934, 34.72-27.426l 0.686-1.984
-	l0-2.097 c0-3.885, 0.151-10.146, 0.312-16.776c 0.070-3.020, 0.146-6.148, 0.214-9.276l 50.566,0 
-	C 475.344,102.028, 474.654,119.297, 474.654,126.604z"  />
-<glyph unicode="&#xe01b;" d="M 306.818,144.449c-15.453,6.512-32.588,14.080-48.007,20.406c-4.398,1.196-8.8,2.396-13.202,3.6
-	c-5.251,3.611-10.395,15.626-13.204,21.602c-2.795,0.396-5.598,0.795-8.402,1.193c 0.434,9.242, 6.158,9.739, 8.402,16.8
-	c 1.981,6.229, 0.208,14.323, 3.348,20.089c 2.179,4.002, 7.103,4.029, 9.565,7.461c 2.232,3.117, 3.701,8.549, 4.398,12.361
-	c 1.269,6.971, 2.376,16.512-0.935,23.43c-1.903,3.97-3.104,4.353-3.632,9.176c-0.641,5.845, 1.723,24.907, 1.821,29.031
-	c 0.241,10.694-0.017,20.369-2.606,30.789c0,0-3.145,9.436-8.070,12.281l-9.817,1.687l-6.071,5.626
-	c-24.454,15.049-50.673,4.493-64.712-1.197c-20.235-6.568-33.030-35.189-24.098-77.518c 1.525-7.227-3.959-10.463-3.6-14.407
-	c 0.785-8.628, 0.947-29.365, 9.103-34.472c 0.756-0.479, 6.538-1.925, 6.504-1.528c 0.798-8.396, 1.597-16.806, 2.395-25.204
-	c 2.038-5.586, 6.919-6.197, 8.338-14.083l-6.247-1.515c-2.811-5.976-7.953-17.99-13.208-21.602c-4.397-1.203-8.8-2.403-13.198-3.6
-	c-15.418-6.326-32.555-13.895-48.005-20.406c-14.069-5.94-30.916-8.053-36.006-22.802c0-10.021-0.94-33.677-0.687-46.804l 306.521,0 
-	c 0.256,13.127-0.686,36.783-0.686,46.804C 337.735,136.396, 320.887,138.509, 306.818,144.449z M 393.537,145.812
-	c-11.013,4.641-23.227,10.036-34.215,14.543c-3.136,0.85-6.275,1.708-9.41,2.564c-3.744,2.576-7.408,11.139-9.41,15.396
-	c-1.996,0.286-3.991,0.572-5.989,0.856c 0.308,6.592, 4.384,6.941, 5.989,11.974c 1.41,4.442, 0.146,10.204, 2.383,14.316
-	c 1.554,2.856, 5.063,2.873, 6.816,5.319c 1.593,2.221, 2.645,6.098, 3.141,8.813c 0.904,4.966, 1.69,11.771-0.668,16.697
-	c-1.356,2.833-2.212,3.106-2.589,6.54c-0.46,4.168, 1.228,17.756, 1.296,20.695c 0.172,7.625-0.009,14.521-1.855,21.944
-	c0,0-2.24,6.729-5.754,8.754l-6.999,1.2l-4.328,4.011c-17.429,10.729-36.12,3.208-46.122-0.849
-	c-14.424-4.684-23.545-25.086-17.178-55.255c 1.088-5.151-2.823-7.456-2.562-10.265c 0.557-6.154, 0.671-20.936, 6.484-24.576
-	c 0.536-0.34, 4.66-1.373, 4.636-1.088c 0.567-5.984, 1.14-11.979, 1.708-17.965c 1.451-3.979, 4.932-4.418, 5.939-10.038l-4.449-1.086
-	c-1.428-3.032-3.702-8.226-6.245-11.904c 5.534-2.349, 11.138-4.748, 16.646-7.12c 6.428-2.764, 12.804-5.506, 18.918-8.080
-	c 2.908-1.232, 5.965-2.289, 9.198-3.41c 12.079-4.186, 25.772-8.925, 30.888-23.758l 0.4-1.163l0-1.232 c0-3.856, 0.15-10.017, 0.307-16.532
-	c 0.070-2.904, 0.143-5.915, 0.207-8.92l 68.973,0 c 0.186,9.353-0.486,26.225-0.486,33.363C 415.578,140.068, 403.569,141.579, 393.537,145.812
-	z M 473.146,139.048c-2.528,7.335-10.91,8.388-17.911,11.343c-7.685,3.24-16.209,7-23.882,10.151
-	c-2.184,0.592-4.372,1.192-6.562,1.788c-2.612,1.799-5.169,7.773-6.567,10.742c-1.394,0.202-2.787,0.4-4.18,0.602
-	c 0.215,4.594, 3.059,4.844, 4.18,8.354c 0.982,3.1, 0.102,7.124, 1.665,9.988c 1.083,1.996, 3.53,2.010, 4.757,3.72
-	c 1.111,1.548, 1.846,4.247, 2.189,6.146c 0.631,3.472, 1.181,8.216-0.468,11.653c-0.944,1.977-1.542,2.168-1.805,4.564
-	c-0.323,2.906, 0.858,12.392, 0.905,14.439c 0.121,5.322-0.008,10.135-1.297,15.321c0,0-1.564,4.689-4.014,6.101l-4.883,0.842
-	l-3.021,2.799c-12.168,7.486-25.207,2.239-32.189-0.594c-10.064-3.27-16.431-17.503-11.984-38.559c 0.756-3.6-1.971-5.205-1.79-7.169
-	c 0.386-4.29, 0.47-14.606, 4.523-17.147c 0.378-0.237, 3.254-0.956, 3.235-0.76c 0.396-4.176, 0.799-8.359, 1.196-12.536
-	c 1.009-2.778, 3.438-3.081, 4.143-7.003l-3.106-0.762c-1.184-2.516-3.201-7.16-5.379-9.624c 3.961-1.681, 7.971-3.401, 11.914-5.097
-	c 4.597-1.971, 9.155-3.935, 13.53-5.778c 2.011-0.847, 4.155-1.593, 6.425-2.378c 8.617-2.984, 19.345-6.697, 23.326-18.243l 0.4-1.165l0-1.229 
-	c0-2.719, 0.104-7.074, 0.215-11.688c 0.019-0.691, 0.035-1.4, 0.053-2.105l 46.723,0 C 473.617,122.293, 473.146,134.062, 473.146,139.048z"  />
-<glyph unicode="&#xe01c;" d="M 331.135,381.625c 3.677-14.798, 4.045-16.031, 3.702-31.225c-0.138-5.855-3.5-32.936-2.586-41.242
-	c 0.751-6.851, 2.46-7.395, 5.162-13.041c 4.705-9.824, 3.13-23.376, 1.325-33.282c-0.988-5.42-3.076-13.136-6.248-17.561
-	c-3.497-4.876-10.498-4.913-13.592-10.602c-4.459-8.195-1.941-19.692-4.752-28.54c-3.193-10.033-11.325-10.738-11.938-23.867
-	c 3.986-0.562, 7.962-1.134, 11.938-1.703c 3.99-8.484, 11.297-25.552, 18.759-30.688c 6.25-1.705, 12.505-3.411, 18.752-5.113
-	c 21.907-8.982, 46.251-19.732, 68.204-28.987c 19.991-8.434, 43.927-11.439, 51.151-32.396c0-14.229, 1.343-47.849, 0.976-66.497L 36.514,16.881 
-	c-0.367,18.648, 0.974,52.268, 0.974,66.497c 7.226,20.957, 31.16,23.963, 51.151,32.396c 21.953,9.255, 46.297,20.005, 68.201,28.987
-	c 6.25,1.702, 12.506,3.408, 18.754,5.113c 7.461,5.136, 14.77,22.203, 18.76,30.688l 8.877,2.158c-2.017,11.206-8.954,12.078-11.845,20.010
-	c-1.134,11.932-2.269,23.871-3.408,35.806c 0.055-0.563-8.163,1.497-9.238,2.171c-11.58,7.256-11.816,36.723-12.931,48.978
-	c-0.508,5.603, 7.283,10.193, 5.118,20.465c-12.69,60.138, 5.486,88.282, 34.229,97.614c 19.95,8.083, 57.198,23.074, 91.941,1.703
-	l 8.621-7.991l 13.952-2.405C 326.67,395.030, 331.135,381.625, 331.135,381.625z"  />
-<glyph unicode="&#xe01d;" d="M 178.432,318.285c 3.133,0.197, 6.268,0.369, 9.405,0.53c 3.166,0.163, 6.334,0.31, 9.498,0.435
-		c 0.949,0.040, 1.895,0.098, 2.84,0.159c 2.191,0.135, 4.479,0.275, 6.834,0.191c 0.574-0.020, 1.154-0.027, 1.734-0.027l 3.757,0.027
-		c 0.002,0, 0.006,0, 0.008,0c 0.932,0, 1.85-0.013, 2.766-0.056c 2.615-0.121, 5.396-0.398, 8.752-0.874
-		c 4.492-0.636, 8.928-1.472, 13.219-2.282c 1.551-0.292, 2.982-0.564, 4.416-0.824l 1.219-0.226c 3.82-0.709, 7.766-1.441, 11.383-1.441
-		l 0.693,0.008c 4.002,0.105, 8.352,0.929, 12.559,1.728l 4.178,0.788c 4.953,0.935, 10.031,1.894, 15.18,2.532
-		c 5.1,0.634, 9.945,0.686, 15.303,0.686l 1.932-0.001c 2.023,0, 3.947-0.134, 5.802-0.264c 1.056-0.073, 2.1-0.148, 3.146-0.192
-		c 2.754-0.113, 5.514-0.243, 8.271-0.387c 2.816-0.144, 5.633-0.3, 8.441-0.476c 0.543,10.772, 2.342,26.122, 2.442,30.262
-		c 0.324,14.369-0.021,15.532-3.5,29.527c0,0-4.223,12.683-10.842,16.501l-13.195,2.271l-8.152,7.557
-		c-32.857,20.215-68.080,6.035-86.947-1.61c-25.94-8.42-42.758-33.062-33.818-84.708L 178.432,318.285zM 460.991,96.058c-6.834,19.818-29.468,22.661-48.374,30.635c-20.761,8.756-43.783,18.92-64.498,27.416
-		c-5.912,1.61-11.826,3.223-17.737,4.837c-7.058,4.857-13.967,20.997-17.74,29.021c-3.762,0.537-7.52,1.076-11.291,1.609
-		c 0.584,12.418, 8.27,13.084, 11.291,22.573c 2.658,8.367, 0.277,19.241, 4.494,26.987c 2.927,5.38, 9.546,5.416, 12.854,10.027
-		c 3.002,4.186, 4.976,11.484, 5.91,16.608c 1.692,9.293, 3.164,21.98-1.158,31.252l-4.529,0 c-0.244-0.402-0.68-1.444-1.377-4.118
-		l-0.256-0.964c-1.543-11.029-6.34-20.264-13.512-26.014c-6.084-4.872-13.924-7.447-22.67-7.447c-1.912,0-3.851,0.128-5.761,0.383
-		c-6.237,0.827-12.092,3.042-16.934,6.407c-2.272,1.58-4.472,3.197-6.459,5.595c-1.619,1.953-3.018,4.182-4.398,7.009
-		c-0.816,1.668-1.504,3.354-2.114,4.841l-2.171,5.544c-0.088,0.229-0.248,0.637-0.416,0.993c-0.070-0.183-0.145-0.409-0.211-0.688
-		l-2.577-7.612c-1.64-3.955-3.567-7.966-6.944-11.481c-4.112-4.288-9.559-7.51-15.752-9.32c-3.86-1.129-7.875-1.703-11.932-1.703
-		c-6.848,0-13.316,1.658-18.709,4.792c-7.98,4.642-13.62,12.627-16.299,23.094c-0.375,1.458-0.783,2.908-1.19,4.362l-0.992,3.617
-		c-0.41,1.545-0.758,2.863-1.274,3.613c-0.005,0.007-0.011,0.016-0.016,0.022l-3.521,0.033c-1.324-2.434-2.574-4.54-2.367-6.823
-		c 1.054-11.59, 1.277-39.454, 12.229-46.317c 1.018-0.637, 8.787-2.585, 8.738-2.053c 1.076-11.285, 2.15-22.58, 3.22-33.863
-		c 2.734-7.501, 9.297-8.325, 11.204-18.92l-8.395-2.040c-3.774-8.024-10.684-24.164-17.741-29.021
-		c-5.91-1.614-11.826-3.227-17.738-4.837c-20.711-8.496-43.736-18.66-64.497-27.416c-18.906-7.974-41.539-10.817-48.375-30.635
-		c0-13.458-1.268-45.249-0.92-62.883l 411.822,0 C 462.258,50.809, 460.991,82.6, 460.991,96.058zM 193.311,288.073c 3.068-10.883, 10.52-17.841, 23.498-17.841c 12.982,0, 23.502,7.987, 23.502,17.841
-		c0,9.852, 3.17,17.089-23.502,18.992C 204.629,307.933, 186.512,312.17, 193.311,288.073zM 292.161,307.064c-26.672-1.903-23.502-9.14-23.502-18.992c0-9.854, 10.523-17.841, 23.502-17.841
-		c 12.977,0, 20.432,6.958, 23.5,17.841C 322.459,312.17, 304.338,307.933, 292.161,307.064z"  />
-<glyph unicode="&#xe01e;" d="M 338.739,141.797c-28.189,8.81-38.981,29.701-42.15,50.45c 3.071,3.513, 6.081,7.257, 8.991,11.134
-			c 18.477-5.912, 40.648-7.639, 59.615,6.115c-26.127,26.137-5.135,58.186-24.004,115.935c-16.054,49.087-81.852,46.67-90.32,29.41
-			c-34.859,12.352-61.186-4.172-70.898-56.17c-11.117-59.717, 10.466-66.029-15.665-92.159c 20.047-11.461, 38.456-8.652, 54.418-2.33
-			c 3.104-4.223, 6.407-8.312, 9.775-12.124c-3.268-20.677-14.061-41.483-42.151-50.261c-21.388-6.695-46.436-13.295-61.25-28.096
-			c-11.706-11.699-3.924-39.622-3.924-39.622l 282.738,0 c0,0, 7.749,27.923-3.927,39.622
-			C 385.209,128.502, 360.126,135.102, 338.739,141.797z M 470.561,129.932c-11.674,11.691-31.492,16.898-48.398,22.19
-			c-22.235,6.948-30.739,23.454-33.291,39.856c 2.421,2.766, 4.807,5.719, 7.098,8.776c 14.584-4.673, 32.111-6.031, 47.090,4.843
-			c-20.637,20.634-4.055,45.918-18.969,91.531c-12.687,38.773-64.617,36.874-71.321,23.242c-0.815,0.296-1.668,0.582-2.484,0.809
-			c 6.996-24.33, 7.325-44.175, 7.586-60.385c 0.327-20.422, 0.524-33.907, 12.624-46.003l 6.21-6.195l-7.094-5.143
-			c-10.071-7.292-21.681-11.238-34.566-11.834c-1.733-11.006-6.213-22.044-15.794-30.17c 5.754-5.608, 12.98-9.777, 21.746-12.518
-			c 2.060-0.643, 4.152-1.281, 6.278-1.938c 20.309-6.252, 43.331-13.335, 58.014-28c 5.429-5.404, 7.686-12.906, 8.403-20.349l 59.974,0 
-			C 473.665,98.646, 479.781,120.695, 470.561,129.932z M 177.848,146.994c 2.093,0.656, 4.186,1.295, 6.279,1.938
-			c 5.855,1.838, 11.053,4.341, 15.564,7.49c-14.848,8.23-21.123,21.91-23.25,35.557c 0.358,0.359, 0.687,0.766, 1.012,1.168
-			c-5.756,1.462-11.38,3.732-16.874,6.864l-8.502,4.862l 6.932,6.92c 12.493,12.517, 12.067,18.15, 10.892,33.207
-			c-0.913,12.031-2.224,28.5, 2.746,55.038c 1.931,10.474, 4.513,19.347, 7.523,26.881c-17.528,5.15-36.006,1.194-39.8-6.549
-			c-27.535,9.738-48.331-3.301-55.985-44.359c-8.797-47.172, 8.273-52.142-12.394-72.785c 15.86-9.057, 30.38-6.833, 42.969-1.832
-			c 2.488-3.352, 5.072-6.576, 7.72-9.59c-2.553-16.324-11.086-32.734-33.258-39.683c-16.907-5.292-36.693-10.499-48.366-22.19
-			c-9.254-9.236-3.106-31.286-3.106-31.286l 73.447,0 c 0.72,7.442, 3.009,14.944, 8.405,20.349
-			C 134.45,133.659, 157.507,140.742, 177.848,146.994z"  />
-<glyph unicode="&#xe01f;" d="M 257.006,141.835c-28.092,8.783-38.783,29.665-41.941,50.331c 3.076,3.516, 6.1,7.229, 8.977,11.121
-			c 18.379-5.889, 40.386-7.605, 59.255,6.047c-25.966,25.999-5.115,57.816-23.872,115.227c-15.94,48.808-81.327,46.384-89.767,29.214
-			c-34.63,12.265-60.81-4.118-70.439-55.819c-11.053-59.354, 10.383-65.603-15.597-91.579c 19.945-11.396, 38.21-8.587, 54.088-2.308
-			c 3.105-4.22, 6.408-8.291, 9.744-12.1c-3.188-20.601-13.897-41.366-41.923-50.134c-21.255-6.637-46.173-13.207-60.873-27.926
-			c-11.611-11.606-3.876-39.369-3.876-39.369l 280.974,0 c0,0, 7.75,27.763-3.877,39.369
-			C 303.179,128.628, 278.261,135.198, 257.006,141.835z M 360.344,154.854c-19.427,6.085-26.817,20.502-28.975,34.793
-			c 2.109,2.424, 4.2,5.006, 6.197,7.688c 12.703-4.072, 27.928-5.265, 40.957,4.184c-17.953,17.954-3.53,39.961-16.514,79.628
-			c-11.004,33.719-56.181,32.049-62.018,20.211c-10.254,3.626-19.377,3.595-27.028-0.346c 2.682-15.647, 2.908-29.119, 3.106-40.694
-			c 0.293-20.274, 0.524-33.683, 12.509-45.688l 6.213-6.211l-7.113-5.132c-3.042-2.208-6.245-4.087-9.598-5.692
-			c 2.108-2.811, 4.3-5.524, 6.556-8.076c-2.205-14.259-9.614-28.616-28.972-34.665c-2.027-0.622-4.086-1.263-6.149-1.896
-			c 3.010-1.536, 6.23-2.878, 9.714-3.991c 2.059-0.619, 4.119-1.272, 6.227-1.912c 20.229-6.196, 43.12-13.261, 57.721-27.847
-			c 3.074-3.074, 5.117-6.835, 6.459-10.858l 75.474,0 c0,0, 5.364,19.165-2.681,27.207C 392.259,145.729, 375.041,150.26, 360.344,154.854z
-			 M 472.903,155.768c-6.999,7.034-18.871,10.14-29.008,13.309c-13.391,4.188-18.476,14.147-19.979,23.971
-			c 1.453,1.699, 2.908,3.47, 4.284,5.319c 8.729-2.801, 19.259-3.62, 28.22,2.877c-12.359,12.374-2.42,27.552-11.378,54.902
-			c-7.591,23.268-38.737,22.122-42.743,13.947c-11.888,4.188-21.648,1.292-27.924-9.775c 1.172-8.893, 1.338-16.692, 1.437-23.528
-			c 0.242-15.092, 0.687-22.665, 7.978-29.975l 6.232-6.21l-2.83-2.029c 1.438-1.964, 2.959-3.829, 4.479-5.591
-			c-1.505-9.829-6.605-19.72-19.947-23.908c-4.757-1.484-9.878-2.975-14.716-4.838c 1.734-0.849, 3.563-1.637, 5.576-2.238
-			c 1.406-0.459, 2.828-0.883, 4.283-1.343c 14.227-4.367, 30.348-9.304, 40.861-19.799c 1.143-1.177, 2.091-2.485, 2.911-3.843l 64.11,0 
-			C 474.749,137.016, 478.463,150.244, 472.903,155.768z"  />
-<glyph unicode="&#xe020;" d="M 438.488,76.6c-19.689,19.678-53.045,28.459-81.495,37.354c-37.508,11.723-51.833,39.521-56.115,67.105
-		c 4.122,4.689, 8.144,9.643, 12.003,14.813c 24.59-7.862, 54.055-10.161, 79.3,8.134c-34.762,34.764-6.866,77.386-31.95,154.179
-		c-21.352,65.292-108.83,62.080-120.112,39.138c-46.402,16.392-81.396-5.549-94.277-74.71
-		c-14.814-79.438, 13.896-87.825-20.866-122.575c 26.684-15.252, 51.146-11.523, 72.368-3.094c 4.187-5.634, 8.536-11.052, 13.019-16.139
-		c-4.32-27.492-18.706-55.161-56.054-66.852c-28.48-8.895-61.804-17.676-81.493-37.354c-15.53-15.559-5.196-52.699-5.196-52.699
-		l 376.034,0 C 443.652,23.9, 454.020,61.041, 438.488,76.6z"  />
-<glyph unicode="&#xe021;" d="M 378.594,371.412l-51.951,0 l0-52.247 l 12.021,0 c-0.586-19.484-2.632-33.068-6.7-43.055c-4.973-12.141-12.647-20.826-28.882-31.934
-	c-11.669-7.908-22.107-16.011-30.842-25.602L 272.24,387.9 l 18.431,0 l-32.198,55.291L 226.278,387.9L 244.7,387.9 l0-225.768 
-	c-8.656,9.415-18.973,17.395-30.481,25.187c-16.23,11.107-23.908,19.794-28.882,31.934c-4.532,11.117-6.543,26.706-6.831,49.912
-	c 10.486,5.126, 17.726,15.868, 17.726,28.325c0,17.42-14.119,31.541-31.542,31.541c-17.417,0-31.542-14.121-31.542-31.541
-	c0-12.494, 7.285-23.263, 17.823-28.368c 0.313-24.652, 2.197-43.483, 8.81-60.126c 7.242-18.289, 20.47-32.060, 38.997-44.481
-	c 16.771-11.354, 27.846-21.156, 35.008-33.614c 4.676-8.122, 8.046-17.935, 9.838-31.074c-20.537-5.646-35.647-24.395-35.647-46.722
-	c0-26.792, 21.719-48.502, 48.507-48.502c 26.777,0, 48.496,21.71, 48.496,48.502c0,21.261-13.703,39.279-32.738,45.827l0,36.443 
-	c 0.299,24.722, 4.374,40.381, 11.277,52.387c 7.169,12.445, 18.232,22.251, 35.012,33.609c 18.519,12.419, 31.749,26.188, 38.995,44.479
-	c 5.988,15.080, 8.095,31.947, 8.677,53.315l 12.393,0 L 378.596,371.412 z"  />
-<glyph unicode="&#xe022;" d="M 187.154,303.142l0-139.633 c0-15.601, 12.656-28.259, 28.252-28.259l 14.748,0 l0-118.936 l 51.146,0 L 281.3,135.25 l 14.748,0 
-	c 15.615,0, 28.287,12.658, 28.287,28.259L 324.335,303.142 L 187.154,303.142 z M 289.445,241.694l-3.338,0 c-0.195-5.163-0.784-9.417-2.321-13.309
-	c-2.028-5.133-5.772-8.993-10.792-12.325c-4.381-2.979-7.129-5.466-8.861-8.486c-1.7-2.948-2.746-6.855-2.828-13.229l0-8.783 
-	c 5.084-2.139, 8.666-7.146, 8.666-12.98c0-7.768-6.295-14.080-14.078-14.080c-7.767,0-14.062,6.312-14.062,14.080
-	c0,6.083, 3.858,11.263, 9.271,13.229c-0.491,2.81-1.26,4.938-2.306,6.718c-1.735,3.042-4.48,5.53-8.864,8.486
-	c-5.019,3.354-8.729,7.194-10.756,12.331c-1.768,4.479-2.324,9.386-2.422,15.626c-2.812,1.639-4.725,4.712-4.725,8.229
-	c0,5.313, 4.298,9.596, 9.599,9.596c 5.28,0, 9.58-4.283, 9.58-9.596c0-3.486-1.879-6.526-4.676-8.229
-	c 0.1-5.654, 0.655-9.429, 1.701-11.997c 1.227-2.94, 2.975-4.97, 7.195-7.863c 2.192-1.49, 4.25-3.026, 6.099-4.727l0,55.493 l-5.771,0 
-	l 10.675,18.348l 10.677-18.348l-5.787,0 l0-40.517 c 1.896,1.716, 3.956,3.271, 6.215,4.774c 4.184,2.91, 5.934,4.938, 7.16,7.896
-	c 0.916,2.191, 1.455,5.265, 1.635,9.663l-3.123,0 l0,16.319 l 16.238,0 L 289.446,241.694 z M 308.723,431.792L 202.736,431.792 l0-100.43 l 105.987,0 L 308.723,431.792 z
-	 M 242.548,355.169l-17.446,0 L 225.102,381.314 l 17.446,0 L 242.548,355.169 z M 285.389,355.169l-17.461,0 L 267.928,381.314 l 17.461,0 L 285.389,355.169 z"  />
-<glyph unicode="&#xe023;" d="M 457.915,237.778L 269.053,237.778 l-0.004,78.416c0,33.277-12.63,63.824-33.538,86.175c-20.82,22.357-50.579,36.756-83.391,36.731
-	c-32.814,0.024-62.57-14.375-83.391-36.731c-20.915-22.351-33.541-52.897-33.547-86.175l0-103.859 l 61.008,0 l0,13.476 l-35.656,35.656
-	l 35.656,0 l0,54.728 c0,17.765, 6.717,33.406, 17.084,44.502c 10.463,11.090, 23.927,17.37, 38.845,17.394
-	c 14.916-0.024, 28.375-6.304, 38.837-17.394c 10.375-11.096, 17.092-26.738, 17.087-44.502l0-78.416 l-26.189,0 
-	c-9.159,0-16.582-7.426-16.582-16.585l0-194.53 c0-9.158, 7.423-16.583, 16.582-16.583l 276.060,0 c 9.164,0, 16.587,7.425, 16.587,16.583
-	l0,194.53 C 474.502,230.353, 467.079,237.778, 457.915,237.778z"  />
-<glyph unicode="&#xe024;" d="M 255.176,446.956c-122.418,0-222.014-99.596-222.014-222.017c0-122.417, 99.596-222.014, 222.014-222.014
-	c 122.421,0, 222.020,99.597, 222.020,222.014C 477.195,347.36, 377.597,446.956, 255.176,446.956z M 255.176,421.913
-	c 108.787,0, 196.982-88.187, 196.982-196.974c0-13.479-1.366-26.636-3.941-39.35c-12.725-40.065-50.199-69.1-94.465-69.1
-	c-54.748,0-99.137,44.377-99.137,99.123c0,54.744-44.379,99.124-99.126,99.124c-47.665,0-87.448-33.651-96.942-78.492
-	C 64.41,339.768, 150.189,421.913, 255.176,421.913z"  />
-<glyph unicode="&#xe025;" d="M 364.26,297.604c 12.688,0.081, 25.018-1.947, 36.66-5.971c-9.091,9.87-19.001,18.611-29.596,26.066
-	c-34.059,24.212-73.679,34.865-111.596,34.809c-44.784-0.105-88.015-14.132-124.348-39.161l-63.555,63.547L 49.442,142.803
-	l 234.077,22.416l-64.746,64.762C 267.057,272.785, 317.791,297.404, 364.26,297.604z M 462.887,69.279l0,35.424 
-	c0,39.219-5.164,74.258-15.27,105.242c-0.768,2.338-1.572,4.625-2.404,6.924c-2.992,6.385-6.277,12.166-9.794,17.327
-	c-18.476,26.829-42.119,38.233-71.159,38.472c-28.138,0.147-61.527-11.988-95.717-35.262c 8.092-0.806, 15.762-2.704, 22.793-5.65
-	c 14.259-6.177, 26.619-15.89, 37.494-34.859c 10.709-18.94, 19.391-48.411, 19.406-92.192l0-35.424 L 462.887,69.281 z"  />
-<glyph unicode="&#xe026;" d="M 267.709,408.923L 267.709,437.945 l-25.72,0 l0-29.022 C 127.396,402.26, 36.515,307.238, 36.515,190.971l 4.634,0 
-	c 7.414,20.715, 27.156,35.559, 50.416,35.559c 23.258,0, 43.001-14.844, 50.417-35.559l 8.023,0 c 7.416,20.715, 27.156,35.559, 50.417,35.559
-	c 17.003,0, 32.104-7.956, 41.906-20.316l0-148.201 c 0.006-25.669, 20.802-46.455, 46.465-46.461c 25.657,0.006, 46.454,20.792, 46.46,46.461
-	c0,6.917-5.606,12.518-12.522,12.518c-6.913,0-12.519-5.601-12.519-12.518c-0.023-11.826-9.598-21.403-21.419-21.419
-	c-11.828,0.016-21.401,9.593-21.428,21.419L 267.365,206.209 c 9.802,12.364, 24.905,20.32, 41.911,20.32c 23.26,0, 43.002-14.844, 50.418-35.559
-	l 8.022,0 c 7.417,20.715, 27.157,35.559, 50.417,35.559c 23.259,0, 43.002-14.844, 50.416-35.559l 4.632,0 
-	C 473.183,307.238, 382.304,402.262, 267.709,408.923z"  />
-<glyph unicode="&#xe027;" d="M 256.016,430.704c-117.152,0-212.112-94.96-212.112-212.096c0-80.32, 44.656-150.192, 110.496-186.192l0,47.616 
-		c-42.656,31.344-70.496,81.712-70.496,138.576c0,94.896, 77.2,172.096, 172.112,172.096c 94.896,0, 172.080-77.2, 172.080-172.096
-		c0-56.88-27.84-107.248-70.496-138.592l0-47.6 c 65.84,36, 110.496,105.872, 110.496,186.192C 468.096,335.744, 373.152,430.704, 256.016,430.704zM 261.936,299.936c-1.52,1.664-3.664,2.608-5.904,2.608s-4.384-0.944-5.904-2.608l-82.288-90.128
-		c-2.144-2.336-2.688-5.712-1.408-8.624c 1.264-2.896, 4.144-4.768, 7.312-4.768l 34.688,0 l0-171.12 c0-4.416, 3.584-8, 8-8l 79.136,0 
-		c 4.416,0, 8,3.584, 8,8L 303.568,196.4 l 34.672,0 c 3.168,0, 6.048,1.872, 7.312,4.768c 1.28,2.896, 0.736,6.272-1.408,8.624L 261.936,299.936z"  />
-<glyph unicode="&#xe028;" d="M 444.72,264.72L 67.28,264.72 c-11.040,0-20,8.96-20,20L 47.28,415.104 c0,11.040, 8.96,20, 20,20l 377.44,0 c 11.040,0, 20-8.96, 20-20
-			l0-130.384 C 464.72,273.664, 455.76,264.72, 444.72,264.72z M 87.28,304.72l 337.44,0 L 424.72,395.104 L 87.28,395.104 L 87.28,304.72 zM 272.784,89.024c0,6.848, 0.704,13.504, 1.936,20L 87.28,109.024 l0,90.384 l 337.44,0 l0-12.496 c 15.712-7.152, 29.424-17.968, 40-31.36l0,63.856 
-		c0,11.040-8.96,20-20,20L 67.28,239.408 c-11.040,0-20-8.96-20-20l0-130.384 c0-11.040, 8.96-20, 20-20L 274.72,69.024 
-		C 273.488,75.52, 272.784,82.176, 272.784,89.024zM 380.336,165.152c-41.968,0-76.112-34.16-76.112-76.128s 34.144-76.128, 76.112-76.128s 76.128,34.16, 76.128,76.128
-		S 422.32,165.152, 380.336,165.152z M 426.352,84.688c0-4.032-3.264-7.296-7.296-7.296l-27.072,0 l0-27.088 c0-4.032-3.264-7.296-7.296-7.296L 376,43.008 
-		c-4.032,0-7.296,3.264-7.296,7.296l0,27.088 l-27.072,0 c-4.032,0-7.296,3.264-7.296,7.296l0,8.672 c0,4.032, 3.264,7.296, 7.296,7.296l 27.072,0 
-		l0,27.088 c0,4.032, 3.264,7.296, 7.296,7.296l 8.688,0 c 4.032,0, 7.296-3.264, 7.296-7.296l0-27.088 l 27.072,0 c 4.032,0, 7.296-3.264, 7.296-7.296
-		L 426.352,84.688 z"  />
-<glyph unicode="&#xe029;" d="M 440.624,128.336c-0.192,0.176-189.248,167.392-189.248,167.392c 3.088,9.776, 4.72,20.080, 4.72,30.64
-		c0,27.056-10.528,52.496-29.664,71.632s-44.56,29.664-71.632,29.664c-12.72,0-25.056-2.416-36.56-6.88l 54.848-54.864l0-57.856 L 115.248,308.064 L 60.432,362.896
-		c-13.968-36.256-6.432-78.976, 22.752-108.16c 19.12-19.12, 44.56-29.664, 71.632-29.664c 9.312,0, 18.4,1.328, 27.12,3.744
-		c0,0, 166.72-189.008, 167.472-189.76c 12.064-12.064, 28.096-18.704, 45.152-18.704c 17.088,0, 33.12,6.656, 45.184,18.72
-		C 464.32,63.632, 464.528,103.344, 440.624,128.336z M 394.816,58.384c-14.288,0-25.84,11.584-25.84,25.856s 11.568,25.856, 25.84,25.856
-		c 14.256,0, 25.84-11.584, 25.84-25.856S 409.056,58.384, 394.816,58.384z"  />
-<glyph unicode="&#xe02a;" d="M 184.32,236.608c 23.136-42.592, 51.664-51.536, 71.52-51.536c 19.824,0, 48.352,8.928, 71.68,51.424l 1.552,2.816
-		c 12.512,22.72, 20.784,37.728, 20.784,73.072c0,55.616-11.168,112.448-94.016,112.448c-93.472,0-93.472-75.952-93.472-112.448
-		c0-35.376, 8.176-50.432, 20.544-73.2L 184.32,236.608zM 452.336,109.808l-104.192,46.672c-3.040,1.344-6.496,1.392-9.568,0.112l-53.936-22.688l-57.152,0 l-53.952,22.528
-		c-3.040,1.28-6.48,1.232-9.52-0.112l-104.336-46.56c-4.336-1.936-7.104-6.224-7.104-10.96l0-63.632 c0-6.624, 5.376-12, 12-12l 382.848,0 
-		c 6.624,0, 12,5.376, 12,12l0,63.696 C 459.424,103.584, 456.64,107.872, 452.336,109.808z"  />
-<glyph unicode="&#xe02b;" d="M 451.056,407.424L 60.944,407.424 c-10.72,0-19.424-8.688-19.424-19.424l0-328 c0-10.72, 8.688-19.424, 19.424-19.424l 390.128,0 
-		c 10.72,0, 19.424,8.688, 19.424,19.424L 470.496,388 C 470.48,398.72, 461.776,407.424, 451.056,407.424z M 431.648,79.424L 80.352,79.424 L 80.352,368.576 l 351.28,0 L 431.632,79.424 zM 122.224,113.904l 267.568,0 c 6.112,0, 11.472,4.096, 13.056,10c 1.616,5.904-0.944,12.144-6.224,15.232l-111.488,65.36
-		c-4.992,2.928-11.28,2.368-15.68-1.424l-27.264-23.504l-52.736,45.328c-2.944,2.528-6.816,3.616-10.656,3.152
-		c-3.84-0.528-7.264-2.672-9.424-5.888l-58.4-87.168c-2.784-4.16-3.056-9.504-0.688-13.92C 112.624,116.672, 117.216,113.904, 122.224,113.904zM 320.192,281.744A41.056,41.056 180 1 1 402.304,281.744A41.056,41.056 180 1 1 320.192,281.744z"  />
-<glyph unicode="&#xe02c;" d="M 410.48,331.6l-93.312,93.312c-7.504,7.504-17.664,11.712-28.288,11.712L 129.808,436.624 c-22.096,0-40-17.904-40-40l0-345.248 
-		c0-22.096, 17.904-40, 40-40l 252.368,0 c 22.096,0, 40,17.904, 40,40L 422.176,303.312 C 422.192,313.92, 417.984,324.096, 410.48,331.6z M 129.808,51.376L 129.808,396.624 
-		l 151.088,0 l 0.064-0.192c 0.080-0.304, 8.64-31.28-6.128-88.064c-0.784-2.992, 0.224-6.16, 2.544-8.16c 2.336-2.016, 5.632-2.512, 8.448-1.296
-		c 62.528,26.784, 94.704-3.36, 96.336-4.976l0-242.576 L 129.808,51.36 z"  />
-<glyph unicode="&#xe02d;" d="M 451.936,264.736l-38.080,13.552c-2.224,6.464-4.864,12.8-7.856,18.944l 17.344,36.496c 2.912,6.112, 1.648,13.392-3.136,18.176
-		l-36.288,36.304c-4.768,4.784-12.064,6.064-18.192,3.136l-36.496-17.36c-6.144,3.008-12.48,5.632-18.96,7.856l-13.536,38.080
-		c-2.272,6.384-8.32,10.64-15.072,10.64l-51.328,0 c-6.768,0-12.816-4.272-15.072-10.64l-13.536-38.080c-6.464-2.224-12.816-4.848-18.96-7.856
-		L 146.272,391.344C 140.144,394.272, 132.848,392.992, 128.080,388.208L 91.792,351.904C 87.008,347.12, 85.744,339.84, 88.656,333.728l 17.36-36.496
-		c-3.008-6.16-5.648-12.48-7.856-18.96l-38.080-13.536c-6.368-2.272-10.64-8.32-10.64-15.072l0-51.328 c0-6.768, 4.256-12.8, 10.64-15.072
-		l 38.064-13.536c 2.224-6.464, 4.848-12.8, 7.856-18.96l-17.36-36.512c-2.912-6.112-1.648-13.392, 3.136-18.176l 36.288-36.288
-		c 4.768-4.784, 12.064-6.016, 18.176-3.136l 36.496,17.36c 6.16-3.008, 12.496-5.648, 18.96-7.872l 13.536-38.064
-		c 2.272-6.384, 8.304-10.64, 15.072-10.64l 51.328,0 c 6.768,0, 12.8,4.256, 15.072,10.64l 13.552,38.064c 6.464,2.224, 12.8,4.864, 18.944,7.872
-		l 36.496-17.36c 6.112-2.896, 13.408-1.648, 18.176,3.136l 36.288,36.288c 4.784,4.784, 6.048,12.064, 3.136,18.176l-17.344,36.496
-		c 3.008,6.144, 5.632,12.496, 7.856,18.96l 38.064,13.536c 6.384,2.272, 10.64,8.304, 10.64,15.072l0,51.328 
-		C 462.56,256.416, 458.304,262.464, 451.936,264.736z M 256,149.488c-41.136,0-74.512,33.344-74.512,74.512s 33.36,74.512, 74.512,74.512
-		s 74.512-33.344, 74.512-74.512S 297.136,149.488, 256,149.488z"  />
-<glyph unicode="&#xe02e;" d="M 256.209,40.253c 55.070,0, 99.705,22.302, 99.705,49.868L 156.469,90.121 C 156.469,62.555, 201.138,40.253, 256.209,40.253z
-	 M 460.528,408.106L 51.887,408.106 c-6.801,0-12.329-5.51-12.329-12.327l0-268.51 c0-6.803, 5.528-12.325, 12.329-12.325l 408.642,0 
-	c 6.802,0, 12.296,5.522, 12.296,12.325L 472.825,395.779 C 472.824,402.597, 467.33,408.106, 460.528,408.106z M 442.904,144.854L 69.482,144.854 L 69.482,378.182 l 373.422,0 
-	L 442.904,144.854 z"  />
-<glyph unicode="&#xe02f;" d="M 462.346,405.841L 50.471,405.841 c-6.803,0-12.328-5.509-12.328-12.343L 38.143,111.8 c0-6.803, 5.525-12.324, 12.328-12.324l 411.875,0 
-	c 6.836,0, 12.329,5.521, 12.329,12.324L 474.675,393.498 C 474.675,400.332, 469.182,405.841, 462.346,405.841z M 356.394,198.541
-	c0-12.754-8.798-28.853-19.554-35.726c0,0-41.86-26.78-117.598-26.78c-75.702,0-117.562,26.78-117.562,26.78
-	c-10.758,6.873-19.556,22.972-19.556,35.726L 82.124,306.312 c0,12.787, 8.798,28.862, 19.556,35.745c0,0, 41.86,26.786, 117.562,26.786
-	c 75.737,0, 117.598-26.786, 117.598-26.786c 10.756-6.883, 19.554-22.958, 19.554-35.745L 356.394,198.541 z M 420.066,241.858
-	c-10.369,0-18.773,8.405-18.773,18.769c0,10.365, 8.404,18.743, 18.773,18.743c 10.362,0, 18.736-8.378, 18.736-18.743
-	C 438.803,250.264, 430.429,241.858, 420.066,241.858z M 420.066,307.030c-10.369,0-18.773,8.409-18.773,18.737
-	c0,10.369, 8.404,18.774, 18.773,18.774c 10.362,0, 18.736-8.405, 18.736-18.774C 438.803,315.439, 430.429,307.030, 420.066,307.030z
-	 M 106.684,42.506l 287.58,0 l0,30.643 l-287.58,0 L 106.684,42.506 z"  />
-<glyph unicode="&#xe030;" d="M 281.693,139.078l0,41.975 c-8.16-1.815-16.615-2.763-25.297-2.763c-8.86,0-17.527,1.017-25.85,2.878l0-42.761 
-	c-0.36-28.267-23.363-51.078-51.749-51.078l-3.237,0 l0-30.656 L 336.68,56.673 l0,30.656 l-3.204,0 C 304.861,87.329, 281.693,110.498, 281.693,139.078z
-	 M 423.601,361.19l-0.589,12.264l-73.84,0 L 349.172,391.699 l-185.55,0 l0-18.276 L 89.817,373.423 l-0.623-12.184c0-0.179-0.064-1.453-0.064-3.528
-	c 0.064-8.62, 0.817-31.513, 11.413-54.044c 5.329-11.216, 13.375-22.464, 25.343-30.888c 11.674-8.221, 26.947-13.32, 45.325-13.536
-	c 14.226-32.979, 46.991-56.035, 85.186-56.035c 38.164,0, 70.965,23.056, 85.189,56.035c 18.346,0.216, 33.65,5.315, 45.325,13.536
-	c 18.019,12.705, 26.946,31.381, 31.588,47.63c 4.645,16.352, 5.151,30.843, 5.151,37.315C 423.65,359.786, 423.601,360.995, 423.601,361.19z
-	 M 140.669,293.825c-11.252,7.816-17.957,20.649-21.634,33.649c-2.11,7.309-3.172,14.502-3.71,20.244l 48.297,0 l0-51.733 
-	c0-3.566, 0.23-7.099, 0.623-10.562C 154.156,286.564, 146.683,289.677, 140.669,293.825z M 389.005,314.723
-	c-3.942-8.292-9.354-15.602-16.875-20.897c-6.001-4.148-13.508-7.261-23.577-8.402c 0.392,3.464, 0.619,6.996, 0.619,10.562l0,51.733 
-	l 48.285,0 C 396.592,338.607, 394.383,325.871, 389.005,314.723z"  />
-<glyph unicode="&#xe031;" d="M 406.566,256.252c0,21.37-9.564,40.481-24.657,53.335c 1.699,6.181, 2.616,12.673, 2.616,19.408
-	c0,40.075-32.211,72.616-72.139,73.186c-8.078,22.124-29.303,37.95-54.221,37.95c-24.919,0-46.16-15.826-54.219-37.95
-	c-39.962-0.569-72.173-33.11-72.173-73.186c0-5.934, 0.753-11.708, 2.076-17.253c-16.627-12.784-27.353-32.895-27.353-55.49
-	c0-32.211, 21.81-59.354, 51.44-67.499c 0.099-2.481, 0.195-5.049, 0.195-7.684c0-22.763, 28.976-41.202, 64.685-41.202
-	c 0.586,0, 1.16,0, 1.749,0.015l0-131.643 l 65.894,0 L 290.459,139.882 c 0.753-0.015, 1.486-0.015, 2.241-0.015c 35.726,0, 64.683,18.439, 64.683,41.202
-	c0,2.831-0.033,5.593-0.194,8.274C 385.77,198.138, 406.566,224.791, 406.566,256.252z"  />
-<glyph unicode="&#xe032;" d="M 122.844,4.481l 263.145,0 L 385.989,284.297 L 122.844,284.297 L 122.844,4.481 z M 304.125,228.271c0,8.498, 6.891,15.386, 15.395,15.386
-	c 8.494,0, 15.385-6.888, 15.385-15.386l0-162.128 c0-8.496-6.891-15.394-15.385-15.394c-8.504,0-15.395,6.897-15.395,15.394L 304.125,228.271 z
-	 M 239.024,228.268c0,8.496, 6.892,15.392, 15.39,15.392c 8.496,0, 15.392-6.896, 15.392-15.392l0-162.125 
-	c0-8.496-6.896-15.391-15.392-15.391c-8.498,0-15.39,6.895-15.39,15.391L 239.024,228.268 z M 173.926,228.268
-	c0,8.501, 6.895,15.392, 15.389,15.392c 8.498,0, 15.391-6.891, 15.391-15.392l0-162.127 c0-8.498-6.893-15.389-15.391-15.389
-	c-8.494,0-15.389,6.891-15.389,15.389L 173.926,228.268 z M 399.020,389.77l-57.209,0 l0,9.36 c-0.004,24.942-20.209,45.145-45.148,45.152l-84.498,0 
-	c-24.941-0.007-45.145-20.209-45.153-45.152l0-9.36 l-57.2,0 c-11.744,0-21.273-9.526-21.273-21.275l0-56.348 l 331.756,0 l0,56.348 
-	C 420.293,380.243, 410.768,389.77, 399.020,389.77z M 311.031,389.77L 197.785,389.77 l-0.004,9.36c 0.023,7.938, 6.445,14.359, 14.383,14.372l 84.498,0 
-	c 7.929-0.013, 14.359-6.433, 14.369-14.372L 311.031,389.77 z"  />
-<glyph unicode="&#xe033;" d="M 123.8,4.271l 263.142,0 l 25.235,287.633L 98.566,291.904 L 123.8,4.271z M 425.020,389.554l-82.252,0 l0,9.367 
-	c-0.011,24.943-20.209,45.144-45.146,45.146l-84.502,0 c-24.945-0.002-45.144-20.202-45.156-45.146l0-9.367 L 85.724,389.554 
-	c-11.746,0-21.273-9.525-21.273-21.272l0-51.338 l 381.841,0 l0,51.338 C 446.292,380.028, 436.766,389.554, 425.020,389.554z M 311.992,389.554
-	L 198.746,389.554 l0,9.367 c 0.009,7.93, 6.441,14.355, 14.373,14.376l 84.502,0 c 7.928-0.021, 14.354-6.446, 14.371-14.376L 311.992,389.554 z"  />
-<glyph unicode="&#xe034;" d="M 438.474,362.9c0,36.855-50.238,48.518-66.746,52.348c-31.23,7.25-72.334,11.242-115.73,11.242
-	c-43.395,0-84.496-3.992-115.727-11.242c-16.508-3.83-66.744-15.492-66.744-52.348c0-13.449, 9.605-24.643, 22.328-27.127
-	l 53.32-251.887c-3.867-4.383-6.23-10.121-6.23-16.426c0-19.967, 15.898-33.471, 47.252-40.139c 17.645-3.75, 41.014-5.812, 65.801-5.812
-	c 24.789,0, 48.158,2.062, 65.803,5.812c 31.354,6.668, 47.252,20.172, 47.252,40.139c0,6.305-2.365,12.043-6.232,16.426l 53.326,251.887
-	C 428.866,338.258, 438.474,349.451, 438.474,362.9z M 125.798,350.344c 0.434,0.848, 0.838,1.707, 1.182,2.6
-	c 3.309,1.84, 8.799,3.941, 16.309,6.047l 76.107-35.805l-79.559-39.162L 125.798,350.344z M 253.093,307.332l 82.639-38.881
-	l-79.732-38.186l-80.828,38.709L 253.093,307.332z M 222.306,214.131l-61.445-29.428l-13.863,65.494L 222.306,214.131z
-	 M 255.999,197.994l 69.279-33.178l-69.279-33.18l-69.277,33.18L 255.999,197.994z M 222.308,115.5l-42.49-20.348l-9.586,45.291
-	L 222.308,115.5z M 255.999,99.367l 50.756-24.309c-12.172-2.127-29.57-3.824-50.758-3.824c-21.186,0-38.582,1.697-50.754,3.824
-	L 255.999,99.367z M 332.177,95.154L 289.69,115.5l 52.074,24.939L 332.177,95.154z M 351.136,184.705l-61.443,29.426l 75.307,36.064
-	L 351.136,184.705z M 286.503,323.777l 75.223,37.025c 11.164-2.689, 19.035-5.492, 23.293-7.859c 0.344-0.893, 0.75-1.752, 1.182-2.6
-	l-14.145-66.816L 286.503,323.777z M 311.796,368.668l-58.99-29.037l-60.092,28.273c 17.965,1.988, 39.156,3.285, 63.283,3.285
-	C 276.858,371.189, 295.511,370.217, 311.796,368.668z"  />
-<glyph unicode="&#xe035;" d="M 377.747,131.255L 377.747,370.108 c0,0-5.349,63.34-121.355,63.34c-116.027,0-121.358-63.31-121.358-63.31l0-238.884 
-	c0-13.346, 10.072-24.15, 22.484-24.15l 48.709,0 l-68.379-93.034l 38.031,0 l 11.903,16.199l 139.031,0 l 11.805-16.199l 37.92,0 l-67.791,93.034
-	l 46.501,0 C 367.673,107.104, 377.747,117.909, 377.747,131.255z M 210.314,60.928l 12.195,16.582l 69.869,0 l 12.098-16.582L 210.314,60.928 z
-	 M 239.874,416.037l 32.997,0 c 10.334,0, 18.705-8.387, 18.705-18.722c0-10.318-8.371-18.688-18.705-18.688l-32.997,0 
-	c-10.316,0-18.687,8.37-18.687,18.688C 221.187,407.649, 229.558,416.037, 239.874,416.037z M 168.356,345.435
-	c0,6.49, 6.508,11.755, 14.536,11.755l 147.010,0 c 8.013,0, 14.521-5.265, 14.521-11.755l0-82.216 c0,0-13.112-22.578-88.031-22.578
-	c-74.921,0-88.035,22.6-88.035,22.6L 168.357,345.435 z M 167.9,162.909c0,15.072, 12.23,27.305, 27.305,27.305
-	c 15.076,0, 27.305-12.232, 27.305-27.305c0-15.077-12.229-27.307-27.305-27.307C 180.13,135.603, 167.9,147.832, 167.9,162.909z
-	 M 319.635,135.603c-15.060,0-27.272,12.229-27.272,27.307c0,15.072, 12.213,27.305, 27.272,27.305
-	c 15.092,0, 27.307-12.232, 27.307-27.305C 346.941,147.832, 334.727,135.603, 319.635,135.603z"  />
-<glyph unicode="&#xe036;" d="M 324.727,234.449l 89.521,73.883l-89.521,73.885l0-48.2 L 140.551,334.017 l0-51.362 l 184.175,0 L 324.726,234.449 z M 185.927,213.932L 96.406,140.050
-	l 89.521-73.887L 185.927,114.37 l 183.761,0 l0,51.363 L 185.927,165.733 L 185.927,213.932 z"  />
-<glyph unicode="&#xe037;" d="M 196.861,221.796l 89.142,73.582l-89.142,73.574l0-48.004 L 38.404,320.948 l0-51.147 l 158.457,0 L 196.861,221.796 z M 315.765,226.311l-89.144-73.583
-	l 89.144-73.574L 315.765,127.16 l 158.046,0 l0,51.146 L 315.765,178.306 L 315.765,226.311 z"  />
-<glyph unicode="&#xe038;" d="M 368.928,41.073L 368.928,252.865 c0,0-30.216,11.004-30.216,154.301l-24.068,0 c0,0, 5.982-100.604-54.774-100.604l-8.504,0 
-	c-60.758,0-54.774,100.604-54.774,100.604L 172.49,407.166 c0-143.296-30.218-154.301-30.218-154.301l0-211.792 L 368.928,41.073 z"  />
-<glyph unicode="&#xe039;" d="M 167.564,242.117c 0.098-0.098, 0.18-0.207, 0.279-0.307l 41.582-41.581l 14.504,14.504l-15.655,15.652l-7.078,7.085
-	l 36.284,36.283l 4.785-0.532c 1.221-0.14, 2.468-0.208, 3.709-0.208c 2.506,0, 4.96,0.308, 7.346,0.841l-26.714,26.717
-	c-0.539,0.541-1.122,1.017-1.685,1.524c 8.233,29.596, 0.738,62.65-22.536,85.922c-23.101,23.104-55.84,30.654-85.27,22.712
-	l 49.864-49.861l-13.092-48.849l-48.85-13.095L 55.173,348.79c-7.944-29.435-0.386-62.177, 22.715-85.276
-	C 102.146,239.253, 137.041,232.136, 167.564,242.117z M 314.902,212.272c-0.812-3.578-1.030-7.315-0.612-11.079l 0.531-4.783
-	l-3.406-3.405l-25.792-25.8l-7.084-7.078l-22.736,22.736l-14.506-14.506l 131.626-131.632c 8.116-8.113, 18.749-12.168, 29.385-12.168
-	c 10.632,0, 21.266,4.055, 29.376,12.168c 16.231,16.229, 16.231,42.537,0,58.762L 314.902,212.272z M 416.531,50.365l-20.877-5.594
-	l-16.938,16.94l 5.595,20.873l 20.879,5.597l 16.937-16.939L 416.531,50.365z M 255.954,196.874l 22.742-22.741l 25.797,25.797
-	c-1.399,12.586, 2.698,25.662, 12.346,35.307c 9.644,9.645, 22.721,13.74, 35.302,12.346l 112.796,112.796l-63.181,63.177L 288.963,310.76
-	c 1.398-12.582-2.701-25.658-12.346-35.307c-9.646-9.646-22.722-13.74-35.307-12.342l-25.794-25.799l 22.731-22.733L 126.792,103.123
-	l-4.077,4.078l-21.396-17.233l-35.987-56.832l 9.187-9.189l 56.838,35.985l 17.228,21.396l-4.092,4.088L 255.954,196.874z"  />
-<glyph unicode="&#xe03a;" d="M 401.477,344.996c-28.908,28.903-64.812,46.452-102.289,52.749L 299.188,438.486 l-65.894,0 l0-41.235 
-	c-19.261-3.515-38.063-10.038-55.659-19.587L 144.15,411.115l 11.38,11.38l-21.685,21.687l-96.401-96.408l 21.681-21.685l 13.537,13.571
-	l 32.080-32.077c-43.102-72.631-33.387-167.825, 29.074-230.282c 73.904-73.893, 193.756-73.893, 267.66,0
-	C 475.418,151.201, 475.418,271.057, 401.477,344.996z M 360.862,117.946c-51.407-51.41-135.026-51.41-186.431,0
-	c-51.377,51.376-51.377,134.992,0,186.435c 51.404,51.373, 135.023,51.373, 186.431,0C 412.236,252.938, 412.236,169.322, 360.862,117.946
-	z M 333.947,226.383l-59.451,0.951l-64.941,64.946c-6.379,6.372-16.68,6.372-23.057,0c-6.375-6.331-6.375-16.679,0-23.058
-	l 74.299-74.267l 72.631-1.142c 4.641-0.084, 8.796,1.731, 11.805,4.742c 2.876,2.909, 4.705,6.864, 4.775,11.28
-	C 350.139,218.832, 342.976,226.273, 333.947,226.383z"  />
-<glyph unicode="&#xe03b;" d="M 255.169,442.284c 120.399,0, 217.999-97.602, 217.999-217.999c0-120.394-97.6-217.996-217.999-217.996
-				c-120.397,0-217.998,97.603-217.998,217.996C 37.171,344.683, 134.772,442.284, 255.169,442.284 M 255.169,376.111
-				c-83.716,0-151.826-68.108-151.826-151.826c0-83.715, 68.11-151.826, 151.826-151.826s 151.826,68.111, 151.826,151.826
-				C 406.995,308.003, 338.885,376.111, 255.169,376.111L 255.169,376.111zM 294.625,156.57l-58.234,60.113L 236.391,337.687 c0,10.371, 8.405,18.775, 18.779,18.775l0,0c 10.371,0, 18.78-8.405, 18.78-18.775l0,0
-		l-0.005-105.793l 47.654-49.194c 7.217-7.447, 7.030-19.334-0.424-26.553l0,0c-3.646-3.531-8.355-5.289-13.064-5.289l0,0
-		C 303.208,150.857, 298.307,152.766, 294.625,156.57L 294.625,156.57z"  />
-<glyph unicode="&#xe03c;" d="M 368.631,380.329l-43.018,14.093c-4.054-10.667-10.809-19.829-19.147-26.833c-13.506-11.443-31.147-17.844-49.951-17.85
-	c-18.787,0.005-36.413,6.417-49.886,17.814c-8.372,7.022-15.126,16.201-19.195,26.869l-43.002-14.093l-77.078-67.022l 30.673-41.5
-	l 49.509,0 l0-220.054 l 217.992,0 L 365.528,271.806 l 49.476,0.011l 30.705,41.489L 368.631,380.329z"  />
-<glyph unicode="&#xe03d;" d="M 252.263,249.037L 92.58,249.037 l0-51.146 l 159.683,0 l0-48.007 l 89.16,73.576l-89.16,73.582L 252.263,249.037 z M 368.975,332.097L 368.975,117.28 l 51.18,0 L 420.155,332.097 
-	L 368.975,332.097 zM 157.459,224.691"  />
-<glyph unicode="&#xe03e;" d="M 422.444,196.3l0,95.826 c0,13.828-11.21,25.039-25.038,25.039l-282.47,0 c-13.828,0-25.038-11.211-25.038-25.039L 89.898,196.3 L 37.838,196.3 
-	l0-65.401 l 436.664,0 L 474.502,196.3 L 422.444,196.3 z"  />
-<glyph unicode="&#xe03f;" d="M 137.991,397.691L 108.788,368.486L 79.584,397.691L 53.221,371.33L 82.427,342.125L 53.221,312.92L 79.584,286.559L 108.788,315.762L 137.991,286.559L 164.355,312.92L 135.149,342.125L 164.355,371.33 	zM 137.991,161.578L 108.788,132.373L 79.584,161.578L 53.221,135.215L 82.427,106.008L 53.221,76.803L 79.584,50.441L 108.788,79.645L 137.991,50.441L 164.355,76.803L 135.149,106.008L 164.355,135.215 	zM 458.779,260.508L 432.418,286.873L 403.212,257.668L 374.006,286.873L 347.643,260.508L 376.849,231.305L 347.643,202.1L 374.006,175.736L 403.212,204.943L 432.418,175.736L 458.779,202.1L 429.575,231.305 	zM 323.469,145.52c-35.204,0-63.744-28.539-63.744-63.742c0-35.207, 28.54-63.75, 63.744-63.75
-		c 35.207,0, 63.746,28.543, 63.746,63.75C 387.215,116.98, 358.676,145.52, 323.469,145.52z M 323.469,55.314
-		c-14.59,0-26.461,11.867-26.461,26.463c0,14.59, 11.871,26.461, 26.461,26.461c 14.592,0, 26.463-11.871, 26.463-26.461
-		C 349.932,67.182, 338.062,55.314, 323.469,55.314zM 223.84,241.764l 112.612,112.613l 28.023-28.021l 21.212,103.617L 282.067,408.76l 28.022-28.023L 184.297,254.949
-		c-7.28-7.285-7.28-19.086,0-26.367l 71.525-71.521l 26.361,26.359L 223.84,241.764z"  />
-<glyph unicode="&#xe040;" d="M 396.022,395.967l-108.391-0.003L 84.305,193.696L 224.947,53.050l 199.867,199.87L 424.814,367.172 L 396.022,395.967z M 388.122,318.239
-		c-11.337-11.339-29.72-11.339-41.058,0c-11.34,11.334-11.34,29.718,0,41.055c 11.336,11.344, 29.721,11.344, 41.058,0.004
-		C 399.459,347.957, 399.46,329.574, 388.122,318.239z"  />
-<glyph unicode="&#xe041;" d="M 411.412,353.621L 303.020,353.621 L 99.692,151.353l 140.645-140.649l 199.869,199.87L 440.206,324.829 L 411.412,353.621z M 403.511,275.896
-		c-11.336-11.338-29.72-11.338-41.058,0c-11.34,11.337-11.34,29.72,0,41.054c 11.338,11.344, 29.722,11.344, 41.058,0.004
-		C 414.848,305.615, 414.849,287.232, 403.511,275.896zM 287.236,369.485L 293.785,376.003L 411.414,376.003L 411.414,407.924L 382.621,436.72L 274.229,436.714L 70.903,234.446L 111.090,194.257 z"  />
-<glyph unicode="&#xe042;" d="M 368.255,349.423l-3.824,0 l-17.005,40.696L 165.178,390.119 l-17.004-40.696l-3.86,0 c-6.865,0-12.458-5.592-12.458-12.464
-	c0-6.896, 5.593-12.49, 12.458-12.49l 223.941,0 c 6.902,0, 12.493,5.594, 12.493,12.49C 380.748,343.831, 375.157,349.423, 368.255,349.423z
-	 M 318.681,350.303l-15.107,0 c-6.672,0-12.067,5.362-12.067,12.070c0,6.668, 5.396,12.096, 12.067,12.096l 15.107,0 
-	c 6.668,0, 12.067-5.428, 12.067-12.096C 330.748,355.665, 325.349,350.303, 318.681,350.303z M 175.513,58.832l 161.578,0 l 23.969,242.023
-	L 151.542,300.855 L 175.513,58.832z"  />
-<glyph unicode="&#xe043;" d="M 323.389,223.484c0-37.027-30.018-67.046-67.042-67.046c-37.026,0-67.044,30.019-67.044,67.046
-		c0,37.025, 30.018,67.038, 67.044,67.038C 293.371,290.522, 323.389,260.51, 323.389,223.484zM 71.543,223.484C 71.56,325.562, 154.27,408.265, 256.345,408.29l0,0c 102.074-0.025, 184.781-82.729, 184.804-184.806l0,0
-		c-0.022-102.073-82.729-184.779-184.804-184.8l0,0C 154.27,38.705, 71.56,121.411, 71.543,223.484L 71.543,223.484z M 167.729,312.094
-		c-22.726-22.771-36.689-53.906-36.705-88.609l0,0c 0.016-34.698, 13.979-65.839, 36.705-88.612l0,0
-		c 22.775-22.721, 53.914-36.683, 88.615-36.7l0,0c 34.7,0.018, 65.839,13.979, 88.616,36.7l0,0
-		c 22.725,22.773, 36.688,53.914, 36.705,88.612l0,0c-0.018,34.703-13.986,65.838-36.705,88.609l0,0
-		c-22.777,22.728-53.916,36.695-88.616,36.707l0,0C 221.643,348.789, 190.505,334.821, 167.729,312.094L 167.729,312.094z"  />
-<glyph unicode="&#xe044;" d="M 256.39,420.202c-108.323,0-196.144-87.821-196.144-196.165c0-108.324, 87.821-196.157, 196.144-196.157
-	c 108.338,0, 196.145,87.833, 196.145,196.157C 452.535,332.381, 364.729,420.202, 256.39,420.202z M 259.824,81.053
-	c-21.666,0-39.243,17.593-39.243,39.275c0,16.937, 10.726,31.296, 25.753,36.82L 246.334,269.088 l 24.935,0 l0-111.221 
-	c 16.089-4.87, 27.813-19.847, 27.813-37.539C 299.082,98.646, 281.506,81.053, 259.824,81.053z M 359.205,229.173
-	c-0.492,27.78-11.871,52.768-30.119,71.075c-18.754,18.674-44.393,30.186-72.942,30.186l0,25.15 c-0.13,0-0.276,0.015-0.405,0.015
-	c-34.943-0.015-66.452-14.14-89.375-37.035c-22.91-22.894-37.053-54.433-37.053-89.391l-22.727,0 
-	c 0.015,82.392, 66.775,149.168, 149.154,149.168c 79.855,0, 145.030-62.704, 148.985-141.612c 0.164-2.488, 0.245-4.987, 0.296-7.556L 359.205,229.173 
-	z"  />
-<glyph unicode="&#xe045;" d="M 326.578,220.347L 326.578,356.993 c0,38.717-31.493,70.213-70.21,70.213c-38.703,0-70.179-31.496-70.179-70.213l0-136.646 
-	c-26.375-21.109-42.152-53.285-42.152-87.687c0-61.952, 50.395-112.35, 112.331-112.35c 61.935,0, 112.33,50.397, 112.33,112.35
-	C 368.697,167.062, 352.934,199.237, 326.578,220.347z M 256.368,50.973c-45.112,0-81.672,36.561-81.672,81.688
-	c0,30.758, 17.020,57.554, 42.133,71.485L 216.829,356.993 c0,21.844, 17.708,39.551, 39.539,39.551c 21.843,0, 39.537-17.707, 39.537-39.551l0-152.879 
-	c 25.129-13.933, 42.133-40.695, 42.133-71.453C 338.037,87.533, 301.496,50.973, 256.368,50.973z M 271.671,183.185L 271.671,284.021 
-	c0,8.472-6.833,15.32-15.303,15.32c-8.471,0-15.337-6.849-15.337-15.32l0-100.836 c-21.68-6.576-37.478-26.702-37.478-50.524
-	c0-29.173, 23.643-52.816, 52.815-52.816c 29.169,0, 52.796,23.644, 52.796,52.816C 309.164,156.482, 293.384,176.608, 271.671,183.185z"  />
-<glyph unicode="&#xe046;" d="M 425.286,324.206L 87.838,324.206 l0-238.792 l 337.448,0 L 425.286,324.206 z M 194.583,249.435l-72.7-30.599l0,20.195 l 55.191,19.644l-55.191,19.828
-	l0,19.645 l 72.7-30.848L 194.583,249.435 z M 285.146,222.086l-68.578,0 l0,16.568 l 68.578,0 L 285.146,222.086 z M 37.761,412.445l0-377.107 l 436.664,0 L 474.425,412.445 L 37.761,412.445 z
-	 M 450.325,60.376L 62.798,60.376 L 62.798,349.244 l 387.527,0 L 450.325,60.376 z"  />
-<glyph unicode="&#xe047;" d="M 272.366,380.487c-26.162,91.959-3.893,28.323-120.474-4.865C 35.345,342.448, 20.562,408.903, 46.921,316.312
-	c 17.625-61.947, 86.071-184.552, 167.76-161.3C 296.401,178.259, 289.992,318.534, 272.366,380.487z M 116.544,297.232
-	c-14.587-1.882-26.098-9.75-28.845-18.855c-1.046,1.717-1.732,3.566-1.962,5.535c-1.47,11.381, 11.677,22.434, 29.368,24.704
-	c 17.693,2.267, 33.192-5.128, 34.63-16.48c 0.293-1.976, 0.099-3.939-0.492-5.863C 144.306,294.385, 131.159,299.096, 116.544,297.232z
-	 M 203.889,199.631c-24.528-6.998-47.091-3.336-54.056,21.077l 88.622,26.195C 245.388,222.498, 228.415,206.614, 203.889,199.631z
-	 M 224.621,327.982c-13.407-6.095-22.107-17.021-22.040-26.512c-1.471,1.327-2.715,2.89-3.499,4.7
-	c-4.775,10.437, 4.545,24.88, 20.8,32.247c 16.218,7.389, 33.222,4.922, 37.964-5.503c 0.82-1.822, 1.21-3.753, 1.21-5.762
-	C 251.961,333.448, 238.030,334.083, 224.621,327.982z M 359.482,220.265c-24.297,8.43-42.25,17.882-55.753,26.701
-	c-4.614-30.377-13.345-53.044-24.104-69.974c 3.074-0.915, 6.311-1.569, 9.778-1.886c 14.685-1.293, 27.603,3.94, 32.244,12.21
-	c 0.653-1.858, 0.917-3.834, 0.72-5.809c-1.013-11.425-16.221-19.408-34.010-17.814c-5.625,0.487-10.824,1.912-15.273,3.955
-	c-15.401-19.749-33.714-29.826-50.032-34.811c-0.916-55.902, 13.245-112.614, 61.25-129.292
-	c 80.282-27.831, 155.529,90.703, 176.62,151.556C 492.285,245.444, 474.004,180.541, 359.482,220.265z M 350.688,48.371l-87.606,29.363
-	c 8.339,23.987, 31.358,27.266, 55.46,18.901C 342.641,88.265, 358.992,72.357, 350.688,48.371z M 419.62,125.105
-	c-6.899-9.167-24.001-7.917-38.261,2.804c-14.225,10.716-20.207,26.839-13.339,36.002c 1.208,1.579, 2.71,2.856, 4.478,3.828
-	c-2.156-9.264, 3.99-21.795, 15.729-30.651c 11.807-8.851, 25.54-11.259, 33.814-6.653C 421.617,128.489, 420.832,126.68, 419.62,125.105z"  />
-<glyph unicode="&#xe048;" d="M 471.68,79.465c-0.098,3.891-2.715,8.992-5.821,11.364c0,0-25.409,19.57-45.324,27.973
-	c-21.843,9.22-61.413,26.1-61.413,26.1c-3.564,1.536-9.321,3.526-12.721,4.462c-1.83,0.493-5.823,2.072-9.517,3.877
-	c-29.957-11.514-59.093-15.422-84.666-15.422c-37.313,0.029-67.104,8.188-81.624,13.112c-3.89-1.094-15.041-4.562-18.474-6.029
-	c0,0-39.54-16.88-61.415-26.1c-19.882-8.402-45.325-27.973-45.325-27.973c-3.071-2.372-5.723-7.474-5.821-11.364l-0.622-52.096
-	c-0.096-3.89, 3.043-7.047, 6.935-7.047L 465.4,20.322 c 3.856,0, 6.964,3.157, 6.934,7.047L 471.68,79.465z M 167.816,284.764
-	c0,0, 1.108-34.369, 12.62-41.566c 1.079-0.689, 2.979-9.027, 2.879-8.451c 1.145-11.886, 9.059-22.318, 9.059-22.318
-	c 0.359-3.893-0.948-9.779-2.877-13.178l-9.747-16.907c-4.054-0.017-7.88-2.388-9.581-6.349c-2.353-5.328, 0.099-11.537, 5.428-13.894
-	l0,0c 0.852-0.312, 33.488-14.507, 79.433-14.538l 0.066,0 c 24.724,0, 53.337,4.188, 82.507,17.090c 5.364,2.354, 7.749,8.615, 5.396,13.945
-	c-1.861,4.172-6.080,6.521-10.398,6.227c-4.611,7.426-10.563,15.127-10.563,15.127c-2.353,3.055-3.236,8.555-1.961,12.247
-	l 8.666,24.724c 1.273,3.66, 2.451,7.162, 2.519,7.701c 0.096,0.57, 0.882,1.616, 1.697,2.305c0,0,0,0, 0.592,0.814
-	c 3.138,4.418, 5.231,12.117, 6.213,17.516c 1.47,7.947, 0.981,20.061, 0.981,20.061c-0.133,3.892, 0.325,10.203, 1.078,14.033l 2.551,13.337
-	c 0.751,3.793, 0.884,10.075, 0.325,13.9l-10.233,50.44c-0.295,1.917-9.551,52.029-81.329,52.029c-71.78,0-83.455-50.112-83.652-52.076
-	l-7.52-65.93c-0.326-3.855, 0.783-9.774, 2.484-13.143C 166.148,294.555, 167.649,288.641, 167.816,284.764z M 298.032,314.93
-	c 11.643,0, 21.126-9.484, 21.126-21.157c0-11.69-9.483-21.139-21.126-21.139c-11.708,0-35.090,9.448-35.090,21.139
-	C 262.942,305.445, 286.324,314.93, 298.032,314.93z M 253.986,246.239c 7.423,0, 13.439-4.608, 13.439-10.333
-	c0-5.721-6.017-10.332-13.439-10.332c-7.394,0-13.41,4.611-13.41,10.332C 240.576,241.631, 246.593,246.239, 253.986,246.239z
-	 M 208.266,314.93c 11.643,0, 35.027-9.484, 35.027-21.157c0-11.69-23.385-21.139-35.027-21.139c-11.705,0-21.188,9.448-21.188,21.139
-	C 187.078,305.445, 196.561,314.93, 208.266,314.93z"  />
-<glyph unicode="&#xe049;" d="M 267.179,87.051c-1.756,15.215-17.393,25.909-34.934,23.89c-17.537-2.023-30.33-16.001-28.578-31.213
-		c 1.756-15.217, 17.396-25.912, 34.936-23.886C 256.14,57.86, 268.933,71.837, 267.179,87.051zM 271.315,54.872c-8.928-3.498-13.697-12.612-10.664-20.351c 3.037-7.747, 12.73-11.186, 21.654-7.685
-		c 8.924,3.498, 13.697,12.612, 10.664,20.352C 289.931,54.931, 280.237,58.371, 271.315,54.872zM 443.157,297.718c-9.924,26.373-30.6,47.198-56.51,57.506c-0.721,4.56-1.908,9.048-3.555,13.429
-		c-9.979,26.521-35.719,44.339-64.047,44.339c-8.229,0-16.332-1.479-24.086-4.398c-5.465-2.055-10.611-4.786-15.332-8.112
-		c-14.807,14.041-34.523,22.049-55.537,22.052c-9.715,0-19.287-1.747-28.447-5.194c-22.584-8.498-39.711-26.091-47.625-48.301
-		c-7.129-1.024-14.135-2.824-20.945-5.386c-24.916-9.374-44.689-27.891-55.678-52.136c-10.99-24.245-11.879-51.319-2.506-76.233
-		c 10.172-27.038, 31.549-48.174, 58.312-58.214c 0.645-2.611, 1.441-5.185, 2.389-7.71c 9.984-26.527, 35.723-44.347, 64.051-44.347
-		c 8.229,0, 16.332,1.479, 24.086,4.396c 4.957,1.866, 9.604,4.247, 13.918,7.124c 13.051-8.539, 28.314-13.129, 44.188-13.129
-		c 9.715,0, 19.287,1.748, 28.447,5.193c 17.293,6.507, 31.756,18.754, 41.072,34.464c 1.531-0.071, 3.062-0.106, 4.588-0.106
-		c 11.973,0, 23.76,2.15, 35.033,6.393C 436.407,188.698, 462.511,246.284, 443.157,297.718z"  />
-<glyph unicode="&#xe04a;" d="M 401.858,272.948c0,18.415-3.433,33.365-21.861,33.365l-0.138,0 c 13.774,2.35, 16.537,15.661, 16.537,31.804
-		c0,17.775-3.312,32.195-21.104,32.195l-15.285,0 c 12.057,3.413, 14.562,16.354, 14.562,31.854c0,18.089-3.373,32.758-21.458,32.758
-		L 198.813,434.924 c-50.815,0-92.016-41.194-92.016-92.017c0,0,0-98.127,0-98.203c0-36.040, 19.936-64.626, 51.273-76.835
-		c 24.394-16.037, 73.521-54.229, 83.988-107.306c0-20.663,0-40.044,0-40.044s 68.626-7.453, 68.626,57.061
-		c0,75.979-47.833,88.326-9.752,90.177l 56.8,0 c 20.065,0, 23.791,16.267, 23.791,36.337c0,17.426-2.824,31.959-16.699,35.49l 15.173,0 
-		C 398.426,239.584, 401.858,254.518, 401.858,272.948z"  />
-<glyph unicode="&#xe04b;" d="M 261.992,240.246c0-16.044, 2.982-29.038, 19.029-29.038l 88.588,0 c 16.043,0, 19.022,12.994, 19.022,29.038l0,0
-		c0,16.046-2.979,29.050-19.022,29.050l-88.588,0 C 264.975,269.296, 261.992,256.292, 261.992,240.246L 261.992,240.246zM 245.909,171.4c0-16.035, 2.988-29.050, 19.017-29.050L 383.48,142.35 c 16.047,0, 19.035,13.015, 19.035,29.050l0,0
-		c0,16.043-2.988,29.047-19.035,29.047L 264.926,200.447 C 248.897,200.447, 245.909,187.443, 245.909,171.4L 245.909,171.4zM 261.773,101.5c0-16.033, 2.988-29.036, 19.014-29.036l 93.52,0 c 16.043,0, 19.034,13.003, 19.034,29.036l0,0
-		c0,16.054-2.991,29.050-19.034,29.050l-93.52,0 C 264.762,130.55, 261.773,117.554, 261.773,101.5L 261.773,101.5zM 277.208,30.14c0-16.035, 2.988-29.039, 19.021-29.039L 349.5,1.101 c 16.034,0, 19.027,13.004, 19.027,29.039l0,0
-		c0,16.053-2.993,29.050-19.027,29.050l-53.271,0 C 280.196,59.189, 277.208,46.192, 277.208,30.14L 277.208,30.14zM 269.819,4.681c-3.258,6.221-4.71,14.074-4.71,25.459c0,11.392, 1.452,19.251, 4.71,25.47
-	c 1.126,2.159, 2.671,4.441, 4.749,6.54c-11.305,1.479-17.19,8.165-20.19,13.895c-3.256,6.222-4.703,14.071-4.703,25.456
-	c0,11.394, 1.447,19.248, 4.703,25.473c 0.891,1.696, 2.040,3.476, 3.501,5.185c-10.767,1.689-16.441,8.195-19.365,13.781
-	c-3.257,6.222-4.709,14.076-4.709,25.462c0,11.388, 1.452,19.243, 4.709,25.466c 2.874,5.486, 8.411,11.852, 18.818,13.677
-	c-1.101,1.409-2.007,2.854-2.732,4.238c-3.257,6.22-4.71,14.074-4.71,25.465c0,11.393, 1.453,19.246, 4.71,25.468
-	c 3.394,6.479, 10.475,14.206, 24.944,14.206l 18.061,0 c 1.859,13.459, 39.114,42.243, 39.114,101.103c0,64.51-68.624,57.057-68.624,57.057
-	s0-19.38,0-40.044c-12.038-44.633-91.93-113.537-114.558-132.355c-26.783-13.676-43.424-40.396-43.424-73.333
-	c0-0.073,0-98.201,0-98.201c0-50.822, 41.199-92.019, 92.015-92.019l 69.2,0 C 270.758,2.986, 270.255,3.844, 269.819,4.681z"  />
-<glyph unicode="&#xe04c;" d="M 260.584,338.621L 260.584,389.983L 422.158,389.983L 422.158,338.621L 260.584,338.621 	zM 260.584,260.295L 260.584,311.657L 422.158,311.657L 422.158,260.295L 260.584,260.295 	zM 260.584,137.496L 260.584,188.863L 422.158,188.863L 422.158,137.496L 260.584,137.496 	zM 260.584,59.176L 260.584,110.539L 422.158,110.539L 422.158,59.176L 260.584,59.176 	zM 87.979,388.72L 216.847,388.72L 216.847,259.85L 87.979,259.85zM 87.979,188.411L 216.847,188.411L 216.847,59.541L 87.979,59.541z"  />
-<glyph unicode="&#xe04d;" d="M 57.012,310.11l 112.223,0 L 169.235,422.333 L 57.012,422.333 L 57.012,310.11 z M 198.9,310.11l 112.223,0 L 311.123,422.333 L 198.9,422.333 L 198.9,310.11 z M 340.79,422.333L 340.79,310.11 l 112.218,0 
-	L 453.008,422.333 L 340.79,422.333 z M 57.012,168.864l 112.223,0 L 169.235,281.090 L 57.012,281.090 L 57.012,168.864 z M 198.9,168.864l 112.223,0 L 311.123,281.090 L 198.9,281.090 L 198.9,168.864 z M 340.79,168.864
-	l 112.218,0 L 453.008,281.090 L 340.79,281.090 L 340.79,168.864 z M 57.012,27.62l 112.223,0 L 169.235,139.844 L 57.012,139.844 L 57.012,27.62 z M 198.9,27.62l 112.223,0 L 311.123,139.844 L 198.9,139.844 L 198.9,27.62 z
-	 M 340.79,27.62l 112.218,0 L 453.008,139.844 L 340.79,139.844 L 340.79,27.62 z"  />
-<glyph unicode="&#xe04e;" d="M 87.898,388.72L 216.766,388.72L 216.766,259.85L 87.898,259.85zM 291.964,388.72L 420.834,388.72L 420.834,259.85L 291.964,259.85zM 87.898,188.411L 216.766,188.411L 216.766,59.541L 87.898,59.541zM 291.964,188.411L 420.834,188.411L 420.834,59.541L 291.964,59.541z"  />
-<glyph unicode="&#xe04f;" d="M 473.307,289.824l0,13.668 c-21.581,2.176-36.070,19.555-37.802,41.239L 76.078,344.731 c-1.699-21.685-16.218-39.063-37.802-41.239
-	l0-9.972 c 6.899,0, 9.974-5.591, 9.974-12.479c0-6.912-3.074-12.49-9.974-12.49l0-12.1 c 6.899,0, 9.974-5.607, 9.974-12.494
-	c0-6.896-3.074-12.488-9.974-12.488l0-11.904 c 6.899,0, 9.974-5.609, 9.974-12.495c0-6.896-3.074-12.489-9.974-12.489l0-11.903 
-	c 6.899,0, 9.974-5.593, 9.974-12.494c0-6.883-3.074-12.491-9.974-12.491l0-13.684 c 21.584-2.16, 36.103-19.539, 37.802-41.239l 359.427,0 
-	c 1.731,21.7, 16.221,39.079, 37.802,41.239l0,9.987 c-6.899,0-9.975,5.594-9.975,12.494c0,6.882, 3.075,12.49, 9.975,12.49l0,12.083 
-	c-6.899,0-9.975,5.593-9.975,12.495c0,6.896, 3.075,12.49, 9.975,12.49l0,11.902 c-6.899,0-9.975,5.592-9.975,12.494
-	c0,6.898, 3.075,12.491, 9.975,12.491l0,11.919 c-6.899,0-9.975,5.593-9.975,12.49C 463.332,284.231, 466.407,289.824, 473.307,289.824z
-	 M 116.564,154.144L 91.482,154.144 L 91.482,293.39 l 25.082,0 L 116.564,154.144 z M 274.842,158.526l-28.025,0 l0,89.65 l-34.762,0 l0,21.141 
-	c 4.87-0.127, 9.58,0.233, 14.126,1.083c 4.513,0.85, 8.634,2.348, 12.23,4.54c 3.63,2.177, 6.702,5.023, 9.189,8.588
-	c 2.484,3.548, 4.152,7.947, 4.938,13.23l 22.303,0 L 274.841,158.526 z M 420.102,154.144l-25.050,0 L 395.052,293.39 l 25.050,0 L 420.102,154.144 z"  />
-<glyph unicode="&#xe050;" d="M 203.447,277.069l-54.568,54.566c 27.503,27.173, 65.183,43.913, 106.927,43.913c 42.13-0.014, 79.972-16.983, 107.622-44.577
-	c 27.594-27.648, 44.561-65.492, 44.578-107.629l 66.177,0 c-0.024,120.624-97.761,218.361-218.376,218.386
-	c-59.897,0-114.277-24.203-153.724-63.295l-50.36,50.36l 0.003-151.725L 203.447,277.068 z M 363.991,116.33
-	c-27.605-27.918-65.809-45.184-108.183-45.176c-42.139,0.008-79.978,16.981-107.623,44.574
-	c-27.601,27.645-44.565,65.482-44.582,107.614L 37.436,223.342 c 0.017-120.614, 97.751-218.347, 218.373-218.374
-	c 60.54,0.008, 115.433,24.73, 154.979,64.562l 48.997-49L 459.785,168.577 L 311.742,168.577 L 363.991,116.33z"  />
-<glyph unicode="&#xe051;" d="M 368.49,384.396l-51.635,16.922c-3.596-9.144-9.45-16.99-16.58-23.022c-11.903-10.022-27.371-15.646-43.885-15.663
-	c-16.515,0.017-31.982,5.64-43.788,15.632c-7.194,6.063-13.047,13.909-16.643,23.053l-51.64-16.922L 42.293,142.839l 40.648-41.498
-	l 64.487,149.598l0-204.007 l 217.957,0 L 365.385,250.938 l 64.455-149.598l 40.648,41.498L 368.49,384.396z"  />
-<glyph unicode="&#xe052;" d="M 256.175,336.344c-61.939,0-112.299-50.391-112.299-112.312c0-61.92, 50.36-112.302, 112.299-112.302
-	c 61.905,0, 112.28,50.382, 112.28,112.302C 368.455,285.953, 318.080,336.344, 256.175,336.344z M 256.175,142.375
-	c-45.114,0-81.656,36.561-81.656,81.656s 36.542,81.639, 81.656,81.639c 45.078,0, 81.621-36.543, 81.621-81.639
-	S 301.253,142.375, 256.175,142.375z M 256.14,90.854c-12.166,0-22.009-9.86-22.009-22.028l0-31.769 
-	c0-12.162, 9.844-22.023, 22.009-22.023c 12.199,0, 22.042,9.861, 22.042,22.023l0,31.769 C 278.182,80.993, 268.339,90.854, 256.14,90.854
-	z M 256.14,357.21c 12.165,0, 22.042,9.875, 22.042,22.038l0,31.77 c0,12.147-9.877,22.022-22.042,22.022
-	c-12.131,0-22.009-9.875-22.009-22.022l0-31.77 C 234.131,367.085, 244.009,357.21, 256.14,357.21z M 365.904,311.75
-	c 5.623,0, 11.282,2.144, 15.581,6.442l 22.467,22.466c 8.599,8.603, 8.599,22.55,0,31.169c-8.633,8.597-22.563,8.597-31.164,0
-	l-22.466-22.473c-8.6-8.582-8.6-22.543,0-31.163C 354.637,313.894, 360.265,311.75, 365.904,311.75z M 130.83,129.85l-22.467-22.451
-	c-8.604-8.601-8.604-22.549,0-31.146c 4.299-4.301, 9.942-6.476, 15.566-6.476c 5.639,0, 11.298,2.175, 15.582,6.476l 22.481,22.464
-	c 8.584,8.582, 8.584,22.544,0,31.133C 153.392,138.469, 139.428,138.469, 130.83,129.85z M 443.127,246.069l-31.751,0 
-	c-12.164,0-22.042-9.875-22.042-22.038c0-12.167, 9.878-22.026, 22.042-22.026l 31.751,0 c 12.166,0, 22.043,9.859, 22.043,22.012
-	C 465.17,236.194, 455.293,246.054, 443.127,246.069z M 122.98,224.017c0,12.178-9.86,22.037-22.044,22.053L 69.184,246.070 
-	c-12.164,0-22.023-9.875-22.023-22.038c0-12.167, 9.859-22.026, 22.023-22.026l 31.752,0 C 113.12,202.005, 122.98,211.864, 122.98,224.017z
-	 M 381.501,129.85c-8.614,8.635-22.562,8.635-31.163,0.016c-8.615-8.604-8.615-22.55-0.016-31.148l 22.466-22.464
-	c 4.317-4.301, 9.942-6.476, 15.597-6.476c 5.625,0, 11.253,2.155, 15.551,6.458c 8.615,8.614, 8.615,22.562, 0.017,31.163L 381.501,129.85z
-	 M 130.83,318.192c 4.297-4.298, 9.94-6.442, 15.564-6.442c 5.656,0, 11.281,2.144, 15.599,6.442c 8.584,8.62, 8.584,22.566,0,31.163
-	l-22.466,22.473c-8.602,8.597-22.531,8.597-31.147,0c-8.62-8.619-8.62-22.566,0-31.169L 130.83,318.192z"  />
-<glyph unicode="&#xe053;" d="M 146.435,284.859c 6.213,17.369, 13.604,31.495, 23.118,42.387c 9.32,10.756, 22.012,18.604, 36.234,18.572
-	c 14.225,0.031, 26.914-7.816, 36.236-18.572c 9.515-10.892, 16.903-25.018, 23.119-42.402l 34.858-98.123
-	c 4.709-13.305, 9.976-22.231, 13.965-26.747c 4.218-4.595, 5.918-4.416, 6.082-4.448c 0.131,0.032, 1.83-0.146, 6.017,4.448
-	c 4.022,4.516, 9.288,13.442, 13.998,26.747l 34.859,98.139c 9.842,27.504, 26.49,51.902, 46.858,71.945
-	C 382.934,405.447, 323.186,436.66, 256.084,436.66c-117.039,0-211.939-94.898-211.939-211.969c0-37.902, 10.006-73.447, 27.438-104.254
-	c 16.316,17.41, 31.13,41.124, 39.992,66.283L 146.435,284.859z M 446.375,318.12c-14.456-15.173-25.901-32.802-32.146-50.591
-	l-34.864-98.104c-6.211-17.36-13.599-31.489-23.085-42.38c-9.317-10.748-22.009-18.609-36.232-18.579
-	c-14.257-0.030-26.946,7.817-36.267,18.579c-9.518,10.891-16.908,25.020-23.119,42.38l-34.828,98.104
-	c-4.742,13.342-10.007,22.268-13.998,26.784c-4.186,4.577-5.885,4.416-6.049,4.444c-0.16-0.028-1.862,0.133-6.049-4.444
-	c-4.023-4.493-9.287-13.442-13.998-26.784l-34.823-98.104c-11.938-33.485-30.938-63.278-52.915-85.876
-	c 38.818-43.443, 95.264-70.832, 158.082-70.832c 117.070,0, 211.97,94.915, 211.97,211.975
-	C 468.054,258.211, 460.241,289.912, 446.375,318.12z"  />
-<glyph unicode="&#xe054;" d="M 60.328,53.207L 451.671,53.207L 451.671,24.098L 60.328,24.098zM 462.409,295.061c-0.042,8.307-70.976,128.842-70.976,128.842L 120.567,423.903 c0,0-71.042-120.58-71.042-128.992
-		c0-16.285, 13.205-29.492, 29.493-29.492c 16.288,0, 29.493,13.207, 29.493,29.492c0-16.285, 13.204-29.492, 29.492-29.492
-		c 16.286,0, 29.492,13.207, 29.492,29.492c0-16.285, 13.204-29.492, 29.491-29.492c 16.289,0, 29.493,13.207, 29.493,29.492
-		c0-16.285, 13.203-29.492, 29.492-29.492s 29.493,13.207, 29.493,29.492c0-16.285, 13.204-29.492, 29.492-29.492
-		c 16.287,0, 29.493,13.207, 29.493,29.492c0-16.285, 13.204-29.492, 29.492-29.492c 16.288,0, 29.492,13.207, 29.492,29.492
-		c0-16.285, 13.204-29.492, 29.493-29.492c 16.288,0, 29.492,13.207, 29.492,29.492l 0.058,0 L 462.409,295.061zM 432.889,84.826L 432.889,241.742 c-10.888,0.006-21.021,3.301-29.457,8.943c-8.445-5.65-18.591-8.945-29.492-8.945
-		s-21.047,3.295-29.492,8.945c-8.445-5.65-18.59-8.945-29.493-8.945c-10.902,0-21.047,3.295-29.492,8.945
-		c-8.445-5.65-18.591-8.945-29.493-8.945s-21.047,3.295-29.492,8.945c-8.446-5.65-18.591-8.945-29.493-8.945
-		s-21.046,3.295-29.491,8.945c-8.445-5.65-18.59-8.945-29.492-8.945s-21.047,3.295-29.492,8.945
-		c-8.421-5.633-18.534-8.926-29.4-8.943l0-156.916 l 213.294,0 L 292.404,209.357 l 94.716,0 l0-124.531 L 432.889,84.826 z M 249.044,129.35L 122.978,129.35 l0,80.508 l 126.066,0 
-		L 249.044,129.35 z"  />
-<glyph unicode="&#xe055;" d="M 87.412,392.441L 421.683,392.441L 421.683,56.294L 87.412,56.294z"  />
-<glyph unicode="&#xe056;" d="M 388.45,243.248c-12.509,6.719-28.093,2.024-34.829-10.467l-36.202-66.758L 317.419,379.337 c0,11.295-9.123,20.453-20.452,20.453
-	c-11.299,0-20.457-9.157-20.457-20.453l0-151.362 c0-4.267-3.465-7.736-7.75-7.736c-4.281,0-7.749,3.469-7.749,7.736L 261.011,419.916 
-	c0,11.318-9.158,20.475-20.474,20.475c-11.28,0-20.469-9.157-20.469-20.475l0-195.652 c0-4.283-3.467-7.735-7.734-7.735
-	c-4.268,0-7.769,3.452-7.769,7.735L 204.565,381.739 c0,11.312-9.138,20.468-20.437,20.468c-11.316,0-20.472-9.156-20.472-20.468l0-157.476 
-	c0-4.283-3.465-7.752-7.75-7.752c-4.284,0-7.75,3.469-7.75,7.752L 148.156,328.29 c0,11.313-9.155,20.47-20.472,20.47
-	c-11.281,0-20.453-9.157-20.453-20.47l0-236.074 c0-7.245, 3.876-17.628, 8.65-23.087l 44.799-51.426
-	c 4.743-5.426, 14.571-9.926, 21.831-9.926l 100.738,0 c 7.259,0, 16.007,5.233, 19.456,11.593l 96.21,189.065
-	C 405.619,220.926, 400.942,236.509, 388.45,243.248z"  />
-<glyph unicode="&#xe057;" d="M 169.763,14.549L 47.189,137.125L 47.189,310.469L 169.763,433.046L 343.109,433.046L 465.688,310.469L 465.688,137.125L 343.109,14.549 	z"  />
-<glyph unicode="&#xe058;" d="M 153.638,326.362L 358.363,326.362L 358.363,121.637L 153.638,121.637zM 385.554,44.351c0-2.915, 3.021-5.379, 6.602-5.379l 41.705,0 c 3.58,0, 6.604,3.024, 6.604,6.604l0,41.697 
-	c0,3.89-2.537,6.602-4.818,6.602c-13.682,0-24.811,11.248-24.811,25.074c0,13.825, 11.129,25.072, 24.811,25.072
-	c 1.42,0, 2.492,0.963, 3.002,1.537c 1.152,1.291, 1.812,3.137, 1.812,5.065l0,41.7 c0,3.89-2.537,6.604-4.816,6.604
-	c-13.68,0-24.809,11.245-24.809,25.070c0,13.824, 11.129,25.071, 24.811,25.071c 2.281,0, 4.818,2.711, 4.818,6.603l0,41.701 
-	c0,3.892-2.537,6.603-4.818,6.603c-13.682,0-24.811,11.248-24.811,25.072c0,13.825, 11.129,25.072, 24.811,25.072
-	c 2.281,0, 4.818,2.712, 4.818,6.604L 440.465,402.426 c0,3.579-3.023,6.603-6.604,6.603l-41.705,0 c-3.58,0-6.602-2.547-6.602-5.562
-	c0-14.094-11.162-25.561-24.883-25.561s-24.883,11.467-24.883,25.561c0,3.015-3.021,5.562-6.6,5.562l-41.705,0 
-	c-3.576,0-6.604-2.547-6.604-5.562c0-14.094-11.162-25.561-24.881-25.561c-13.723,0-24.881,11.467-24.885,25.56
-	c0,3.016-3.025,5.562-6.605,5.562l-41.697,0 c-3.578,0-6.602-2.547-6.602-5.562c0-14.094-11.162-25.561-24.885-25.561
-	c-13.721,0-24.883,11.467-24.883,25.561c0,3.015-3.021,5.562-6.602,5.562L 78.14,409.028 c-3.58,0-6.604-3.023-6.604-6.603l0-41.702 
-	c0-3.58, 2.547-6.604, 5.561-6.604c 14.092,0, 25.557-11.247, 25.557-25.072c0-13.824-11.465-25.072-25.557-25.072
-	c-3.014,0-5.561-3.023-5.561-6.603l0-41.699 c0-3.58, 2.547-6.604, 5.561-6.604c 14.094-0.002, 25.557-11.249, 25.557-25.071
-	c0-13.825-11.465-25.070-25.557-25.070c-3.014,0-5.561-3.025-5.561-6.604l0-41.698 c0-3.58, 2.547-6.604, 5.561-6.604
-	c 14.092,0, 25.557-11.247, 25.557-25.072c0-13.826-11.465-25.074-25.557-25.074c-3.014,0-5.561-3.022-5.561-6.602l0-41.697 
-	c0-3.58, 3.023-6.604, 6.604-6.604l 41.701,0 c 3.58,0, 6.602,2.464, 6.602,5.379c0,13.991, 11.162,25.374, 24.883,25.374
-	c 13.723,0, 24.885-11.383, 24.885-25.374c0-2.915, 3.023-5.379, 6.602-5.379l 41.701,0 c 3.58,0, 6.604,2.464, 6.604,5.379
-	c0,13.991, 11.16,25.374, 24.883,25.374c 13.719,0, 24.881-11.383, 24.881-25.374c0-2.915, 3.027-5.379, 6.604-5.379l 41.705,0 
-	c 3.578,0, 6.6,2.464, 6.6,5.379c0,13.991, 11.162,25.374, 24.883,25.374S 385.554,58.342, 385.554,44.351z M 129.958,97.959L 129.958,350.043 
-	l 252.084,0 l0-252.084 L 129.958,97.959 z"  />
-<glyph unicode="&#xe059;" d="M 36.571,210.314l0-85.244 l 11.836,0 l-0.016-0.053l 415.982,0 l-0.018,0.053l 11.854,0 l0,85.244 L 36.571,210.314 z M 92.539,148.228L 67.637,148.228 l0,33.657 
-	l 24.902,0 L 92.539,148.228 z M 153.527,148.228l-24.919,0 l0,33.661 l 24.919,0 L 153.527,148.228 z M 214.501,148.228l-24.919,0 l0,33.661 l 24.919,0 L 214.501,148.228 z
-	 M 426.537,146.836c-10.842,0-19.652,8.797-19.652,19.645c0,10.857, 8.811,19.67, 19.652,19.67c 10.857,0, 19.654-8.812, 19.654-19.67
-	C 446.191,155.633, 437.395,146.836, 426.537,146.836z M 387.328,438.037L 125.372,438.037 l-76.98-197.079l 415.982,0 L 387.328,438.037z
-	 M 36.571,9.113L 476.21,9.113 l0,85.254 L 36.571,94.367 L 36.571,9.113 z M 426.537,70.189c 10.857,0, 19.654-8.793, 19.654-19.635
-	c0-10.868-8.797-19.662-19.654-19.662c-10.842,0-19.652,8.794-19.652,19.662C 406.885,61.396, 415.695,70.189, 426.537,70.189z
-	 M 189.582,65.949l 24.919,0 l0-33.684 l-24.919,0 L 189.582,65.949 z M 128.608,65.949l 24.919,0 l0-33.684 l-24.919,0 L 128.608,65.949 z M 67.637,65.949l 24.902,0 l0-33.684 
-	L 67.637,32.265 L 67.637,65.949 z"  />
-<glyph unicode="&#xe05a;" d="M 391.744,367.454c-2.849,7.245-11.481,13.144-19.297,13.144L 138.762,380.598 c-7.752,0-16.449-5.898-19.26-13.144l-77.57-198.531
-	l 427.41,0 L 391.744,367.454z M 35.85,138.266l0-56.496 c0-7.765, 6.344-14.127, 14.129-14.127L 180.49,67.643 l0,24.055 l 24.95,0 l0-24.055 l 20.079,0 l0,24.055 
-	l 24.953,0 l0-24.055 l 20.074,0 l0,24.055 l 24.92,0 l0-24.055 l 20.082,0 l0,24.055 L 340.5,91.698 l0-24.055 l 120.832,0 c 7.752,0, 14.125,6.362, 14.125,14.127l0,56.496 L 35.85,138.266 
-	z"  />
-<glyph unicode="&#xe05b;" d="M 166.792,61.687c-28.153,0-51.056,22.903-51.056,51.055L 115.736,335.259 c0,4.648-3.783,8.432-8.432,8.432
-		c-4.65,0-8.434-3.783-8.434-8.432l0-126.3 L 56.249,208.959 l0,126.3 c0,28.149, 22.904,51.055, 51.057,51.055c 28.15,0, 51.054-22.905, 51.054-51.055
-		l0-222.518 c0-4.649, 3.782-8.433, 8.434-8.433c 4.648,0, 8.433,3.783, 8.433,8.433L 175.227,313.069 c0,28.151, 22.902,51.055, 51.055,51.055
-		c 28.151,0, 51.055-22.903, 51.055-51.055l0-176.924 c0-4.649, 3.783-8.433, 8.433-8.433s 8.433,3.783, 8.433,8.433l0,154.32 l-0.045,0 
-		c0,28.15, 22.903,51.056, 51.055,51.056s 51.055-22.905, 51.055-51.056l0-133.761 c0-4.651, 3.783-8.432, 8.433-8.432
-		s 8.433,3.78, 8.433,8.432l0,65.702 l 42.622,0 l0-65.702 c0-28.152-22.903-51.055-51.055-51.055c-28.152,0-51.056,22.902-51.056,51.055
-		L 353.645,290.466 c0,4.649-3.781,8.434-8.432,8.434c-4.354,0-7.947-3.319-8.388-7.559l0-155.195 c0-28.15-22.903-51.055-51.055-51.055
-		c-27.745,0-50.392,22.247-51.040,49.839l-0.015,0 l0,178.14 c0,4.651-3.782,8.435-8.433,8.435s-8.434-3.783-8.434-8.435l0-200.328 
-		C 217.846,84.59, 194.944,61.687, 166.792,61.687L 166.792,61.687z"  />
-<glyph unicode="&#xe05c;" d="M 252.555,118.178c-43.691,0-65.025-21.736-100.373-57.748c-1.793-1.826-3.639-3.701-5.494-5.59l 211.734,0 
-		c-1.904,1.938-3.797,3.859-5.637,5.73C 317.521,96.494, 296.236,118.178, 252.555,118.178zM 313.51,393.16c-34.564,0-62.586-28.021-62.586-62.592l0-0.607 c0,24.131-19.562,43.693-43.695,43.693l-36.162,0 l0-34.262 
-		c0-24.131, 19.561-43.693, 43.689-43.693l 18.855,0 l0-155.086 c 5.941,0.818, 12.232,1.242, 18.943,1.242c 6.713,0, 13.004-0.424, 18.943-1.242
-		L 271.497,281.49 l 31.227,0 c 34.566,0, 62.588,28.023, 62.588,62.59L 365.312,393.16 L 313.51,393.16 z"  />
-<glyph unicode="&#xe05d;" d="M 400.424,139.884l0,41.529 c-0.131,13.113-3.236,24.411-7.686,35.385c-4.609,10.921-10.431,21.124-19.618,30.461
-	l-75.247,75.261c-0.492,0.326-3.534,4.578-5.299,9.108c-1.964,4.432-2.815,9.551-2.681,10.175L 289.893,422.193 l-65.896,0 l0,0l0,0l0-40.191 l0-40.199 
-	c 0.131-0.624-0.718-5.743-2.648-10.175c-1.766-4.53-4.807-8.782-5.331-9.108l-75.279-75.261
-	c-9.154-9.337-14.944-19.557-19.587-30.461c-4.447-10.974-7.554-22.271-7.685-35.385l0-41.529 l-57,0 l 89.964-114.019l 89.962,114.019l-57,0 
-	l0,41.529 c-0.13,0.604, 0.688,5.76, 2.649,10.169c 1.799,4.545, 4.806,8.749, 5.332,9.092l 69.586,69.588l 69.592-69.588
-	c 0.489-0.343, 3.562-4.547, 5.33-9.092c 1.927-4.463, 2.777-9.565, 2.646-10.169l0-41.529 l-58.667,0 l 89.966-114.019l 89.926,114.019L 400.424,139.884 z"  />
-<glyph unicode="&#xe05e;" d="M 455.854,224.055l-81.985,64.687l0-39.098 L 216.115,249.644 l 87.116,85.074c 1.408,1.505, 6.379,4.858, 11.711,6.934
-	c 5.229,2.224, 11.148,3.333, 13.177,3.238l 45.749,0 l0-39.128 l 81.985,64.669l-81.985,64.663l0-39.056 l-45.749,0 
-	c-11.643-0.133-22.236-2.934-32.472-7.034c-10.204-4.221-19.754-9.613-28.157-17.691L 153.296,259.78
-	c-1.406-1.537-6.376-4.821-11.707-6.912c-5.166-2.192-10.954-3.271-13.081-3.225L 57.383,249.643 l0,0l-1.964,0 l0-51.162 l 1.964,0 l0,0l 72.989,0 
-	c 2.059,0.099, 7.945-1.014, 13.209-3.22c 5.299-2.074, 10.271-5.413, 11.678-6.951l 114.227-111.508
-	c 8.404-8.082, 17.954-13.44, 28.156-17.692c 10.235-4.125, 20.831-6.918, 32.473-6.997l 43.754,0 l0-39.135 l 81.985,64.689l-81.985,64.668
-	l0-39.113 l-43.754,0 c-2.062-0.063-7.946,1.047-13.179,3.238c-5.33,2.060-10.302,5.431-11.706,6.935l-87.152,85.086l 155.791,0 l0-39.109 
-	L 455.854,224.055z"  />
-<glyph unicode="&#xe05f;" d="M 255.79,378.081c-120.28,0-217.73-97.483-217.765-217.759c 0.065-17.729, 0.852-32.161, 4.711-45.164
-	c 2.844-9.683, 8.012-18.707, 15.729-25.494c 11.706-10.184, 26.684-14.467, 45.258-16.855c 18.676-2.371, 41.894-2.809, 72.207-2.809
-	c 22.5,0, 48.825,0.227, 79.86,0.227c 31.031,0, 57.356-0.227, 79.856-0.227c 26.911,0, 48.266,0.328, 65.793,2.089
-	c 13.146,1.312, 24.232,3.341, 34.027,7.133c 7.357,2.845, 14.061,6.833, 19.489,12.216c 8.308,8.026, 13.049,18.65, 15.472,29.939
-	c 2.448,11.396, 3.070,23.999, 3.103,38.945C 473.498,280.598, 376.030,378.081, 255.79,378.081z M 275.996,333.838
-	c 11.086-1.279, 21.878-3.668, 32.213-7l-7.099-21.982c-8.927,2.882-18.247,4.945-27.86,6.056L 275.996,333.838z M 109.35,164.426L 86.229,164.426 
-	c0,11.201, 1.111,22.186, 3.14,32.816l 22.694-4.418C 110.266,183.637, 109.35,174.152, 109.35,164.426z M 122.104,224.545l-21.127,9.384
-	l 0.032,0 c 4.513,10.142, 9.974,19.757, 16.316,28.714l 18.873-13.311C 130.735,241.551, 125.995,233.28, 122.104,224.545z M 158.304,274.187
-	l-15.468,17.168c 8.175,7.325, 17.039,13.933, 26.554,19.591l 11.871-19.816C 173.051,286.221, 165.367,280.566, 158.304,274.187z
-	 M 204.444,326.838c 10.336,3.332, 21.092,5.721, 32.212,7l 2.713-22.927c-9.582-1.11-18.899-3.174-27.86-6.056L 204.444,326.838z
-	 M 284.562,118.689l-54.513-9.709l-13.863,53.63l 140.844,144.052L 284.562,118.689z M 376.423,249.332l 18.869,13.311
-	c 6.344-8.957, 11.84-18.572, 16.352-28.714l0,0l-21.092-9.384C 386.627,233.28, 381.919,241.551, 376.423,249.332z M 403.305,164.426
-	c0,9.727-0.949,19.211-2.748,28.398l 22.695,4.418c 2.059-10.631, 3.141-21.615, 3.141-32.816L 403.305,164.426 z M 243.326,129.695
-	c 9.516-6.099, 22.14-3.367, 28.256,6.133c 6.083,9.479, 3.302,22.124-6.179,28.223c-9.484,6.115-22.107,3.332-28.225-6.184
-	C 231.098,148.436, 233.812,135.759, 243.326,129.695z"  />
-<glyph unicode="&#xe060;" d="M 255.999,249.124c-45.492,0-82.502-37.008-82.502-82.501c0-45.491, 37.010-82.502, 82.502-82.502s 82.503,37.011, 82.503,82.502
-		C 338.502,212.116, 301.491,249.124, 255.999,249.124z M 255.999,131.822c-19.217,0-34.8,15.581-34.8,34.801
-		c0,19.222, 15.583,34.802, 34.8,34.802c 19.22,0, 34.802-15.58, 34.802-34.802C 290.801,147.403, 275.219,131.822, 255.999,131.822zM 380.909,430.746l-72.157,0 l-123.57,0 l-54.095,0 c-11.105,0-20.115-9.007-20.115-20.117l0-393.375 l 290.057,0 L 401.029,410.629 
-		C 401.028,421.739, 392.018,430.746, 380.909,430.746z M 255.999,372.494c 15.651,0, 28.342-12.688, 28.342-28.339
-		c0-15.653-12.69-28.341-28.342-28.341c-15.65,0-28.338,12.688-28.338,28.341C 227.661,359.807, 240.349,372.494, 255.999,372.494z
-		 M 255.999,55.043c-61.525,0-111.582,50.056-111.582,111.58s 50.057,111.582, 111.582,111.582c 61.527,0, 111.58-50.058, 111.58-111.582
-		S 317.526,55.043, 255.999,55.043z"  />
-<glyph unicode="&#xe061;" d="M 43.602,279.743l0-113.096 l 50.839,0 l 113.564-84.29l0,281.68 L 94.441,279.743L 43.602,279.743 z M 267.719,326.748
-	c-6.67,6.671-17.488,6.671-24.158,0c-6.671-6.671-6.671-17.48, 0.005-24.152l-0.005,0 c 21.941-21.955, 32.863-50.555, 32.886-79.312
-	c-0.022-28.833-10.919-57.503-32.886-79.485c-6.671-6.677-6.671-17.492, 0.005-24.163c 3.335-3.332, 7.706-4.997, 12.077-4.997
-	c 4.371,0, 8.746,1.665, 12.081,5.003c 28.579,28.583, 42.903,66.207, 42.885,103.643C 310.627,260.692, 296.25,298.227, 267.719,326.748z
-	 M 321.658,380.845c-6.672,6.668-17.486,6.668-24.159,0c-6.669-6.674-6.669-17.486, 0.005-24.158l-0.005,0.006
-	c 36.835-36.852, 55.274-84.963, 55.291-133.223c-0.022-48.486-18.349-96.805-55.291-133.768c-6.673-6.671-6.669-17.489, 0.005-24.157
-	c 3.336-3.334, 7.705-5.004, 12.074-5.004c 4.375,0, 8.748,1.67, 12.085,5.004c 43.572,43.578, 65.308,100.86, 65.286,157.925
-	C 386.967,280.406, 365.070,337.443, 321.658,380.845z M 378.358,435.947c-6.679,6.671-17.493,6.671-24.161,0
-	c-6.669-6.671-6.669-17.483,0-24.155c 52.050-52.071, 78.095-120.128, 78.111-188.341c-0.017-68.417-25.954-136.67-78.111-188.851
-	c-6.674-6.671-6.669-17.487,0-24.155c 3.336-3.337, 7.705-5.006, 12.079-5.006c 4.372,0, 8.742,1.669, 12.082,5.006
-	c 58.782,58.781, 88.136,135.992, 88.114,213.006C 466.494,300.325, 436.992,377.313, 378.358,435.947z"  />
-<glyph unicode="&#xe062;" d="M 255.485,392.104c0,0-164.85-92.901-164.85-198.3c0-46.212, 37.266-83.656, 83.257-83.656c 28.828,0, 54.222,8.082, 69.133,26.133
-	c-9.893-36.531-22.615-80.119-26.979-80.119l 80.969,0 c-4.364,0-17.070,43.588-26.979,80.080c 14.928-18.012, 40.306-26.094, 69.148-26.094
-	c 45.961,0, 83.242,37.444, 83.242,83.656C 422.428,299.203, 255.485,392.104, 255.485,392.104z"  />
-<glyph unicode="&#xe063;" d="M 461.444,212.847c0,6.132-6.645,11.151-14.76,11.151c-8.119,0-17.688,3.494-21.264,7.765
-	c-3.576,4.271-6.504,15.902-6.504,25.846c0,9.948-8.029,18.083-17.844,18.083s-17.846-8.135-17.846-18.083
-	c0-9.943-4.926-18.084-10.947-18.084c-6.020,0-10.945,8.539-10.945,18.973l0,24.824 c0,10.432-8.031,18.967-17.848,18.967
-	c-9.812,0-17.844-8.535-17.844-18.967l0-24.824 c0-10.434-4.926-18.973-10.945-18.973s-10.945,8.539-10.945,18.973l0,62.815 
-	c0,10.434-8.033,18.97-17.848,18.97c-9.812,0-17.844-8.536-17.844-18.97l0-62.815 c0-10.434-4.928-18.973-10.947-18.973
-	c-6.021,0-10.945,8.539-10.945,18.973l0,24.824 c0,10.432-8.031,18.967-17.846,18.967c-9.816,0-17.846-8.535-17.846-18.967l0-24.824 
-	c0-10.434-4.928-18.973-10.947-18.973s-10.945,8.539-10.945,18.973l0,98.242 c0,10.432-8.029,18.969-17.846,18.969
-	c-9.814,0-17.844-8.537-17.844-18.969l0-98.242 c0-10.434-4.928-18.973-10.949-18.973c-6.020,0-10.945,8.141-10.945,18.084
-	c0,9.948-8.031,18.083-17.846,18.083c-9.816,0-17.844-8.135-17.844-18.083c0-9.943-2.518-21.574-5.592-25.846
-	c-3.074-4.271-13.143-7.765-22.377-7.765s-16.787-5.020-16.787-11.151c0-6.136, 7.553-11.155, 16.787-11.155s 19.303-3.493, 22.377-7.764
-	c 3.074-4.271, 5.592-15.902, 5.592-25.846c0-9.947, 8.027-18.084, 17.844-18.084c 9.814,0, 17.846,8.137, 17.846,18.084
-	c0,9.943, 4.926,18.083, 10.945,18.083c 6.021,0, 10.949-8.537, 10.949-18.971l0-75.933 c0-10.432, 8.029-18.97, 17.844-18.97
-	c 9.816,0, 17.846,8.538, 17.846,18.97l0,75.933 c0,10.434, 4.926,18.971, 10.945,18.971s 10.947-8.537, 10.947-18.971l0-24.824 
-	c0-10.431, 8.029-18.969, 17.846-18.969c 9.814,0, 17.846,8.538, 17.846,18.969l0,24.824 c0,10.434, 4.924,18.971, 10.945,18.971
-	c 6.020,0, 10.947-8.537, 10.947-18.971l0-62.816 c0-10.432, 8.031-18.968, 17.844-18.968c 9.814,0, 17.848,8.536, 17.848,18.968l0,62.816 
-	c0,10.434, 4.926,18.971, 10.945,18.971s 10.945-8.537, 10.945-18.971l0-24.824 c0-10.431, 8.031-18.969, 17.844-18.969
-	c 9.816,0, 17.848,8.538, 17.848,18.969l0,24.824 c0,10.434, 4.926,18.971, 10.945,18.971c 6.021,0, 10.947-8.14, 10.947-18.083
-	c0-9.947, 8.031-18.084, 17.846-18.084s 17.844,8.137, 17.844,18.084c0,9.943, 2.928,21.574, 6.504,25.846
-	c 3.576,4.271, 13.145,7.764, 21.264,7.764C 454.8,201.691, 461.444,206.711, 461.444,212.847z"  />
-<glyph unicode="&#xe064;" d="M 376.106,344.168L 135.012,344.168 l0-44.769 l 241.094,0 L 376.106,344.168 z M 135.012,103.070l 241.094,0 l0,44.762 L 135.012,147.832 L 135.012,103.070 z M 376.106,216.582
-	L 135.012,216.582 l0-54.673 l 241.094,0 L 376.106,216.582 z M 376.106,285.328L 135.012,285.328 l0-54.676 l 241.094,0 L 376.106,285.328 z M 122.467,78.218l-45.125-45.12l 356.442,0 
-	l-45.118,45.12L 122.467,78.218 z M 400.97,356.716l0-266.2 l 45.12-45.122L 446.090,401.844 L 400.97,356.716z M 388.665,369.021l 45.118,45.121L 77.344,414.142 
-	l 45.121-45.121L 388.665,369.021 z M 110.16,356.721L 65.039,401.841l0-356.444 l 45.121,45.121L 110.16,356.721 z"  />
-<glyph unicode="&#xe065;" d="M 316.074,150.968L 316.074,150.968c 0.867,0, 1.732-0.064, 2.582-0.079L 158.844,354.34
-	c-10.726,13.637-26.849,20.797-42.839,20.767c-11.674,0.030-23.675-3.792-33.585-11.608l-50.017-39.312l 31.607-40.207l 50,39.293
-	c 0.622,0.475, 1.179,0.654, 1.995,0.688c 1.112-0.033, 1.995-0.438, 2.601-1.209l 149.168-189.865
-	C 280.771,144.165, 297.729,150.952, 316.074,150.968z M 447.21,236.712l-112.301-88.18c 18.151-4.774, 33.309-16.172, 43.086-31.217
-	l 100.802,79.174L 447.21,236.712z M 321.96,125.654c-1.978,0.264-3.94,0.374-5.886,0.374c-24.363,0-45.421-18.228-48.397-43.014
-	c-3.206-26.751, 15.874-51.050, 42.641-54.287c 1.979-0.229, 3.959-0.361, 5.886-0.361c 24.365,0, 45.426,18.214, 48.434,43.006
-	C 367.844,98.159, 348.744,122.448, 321.96,125.654z M 461.336,288.738L 358.21,420.022L 226.93,316.896l 103.139-131.281L 461.336,288.738z
-	 M 348.252,353.781l 37.559-47.807l-22.531-17.695l-37.559,47.795L 348.252,353.781z"  />
-<glyph unicode="&#xe066;" d="M 384.793,237.494c-24.33,0-41.48,6.568-41.48,6.568l-143.608,82.246l-48.171-38.409l-90.158,7.669
-	c-25.654,0-26.767-45.707-26.767-45.707l0-79.222 l 435.945,0 C 470.554,170.64, 477.438,237.494, 384.793,237.494z M 220.060,286.839
-	c-1.422-5.73-7.244-9.237-12.999-7.8c-5.738,1.437-9.239,7.26-7.799,13.017c 1.423,5.736, 7.244,9.236, 13,7.792
-	C 218,298.416, 221.498,292.602, 220.060,286.839z M 260.381,264.272c-1.439-5.755-7.276-9.252-13.014-7.816
-	c-5.739,1.447-9.239,7.252-7.783,13.018c 1.406,5.729, 7.242,9.238, 12.998,7.79C 258.338,275.833, 261.818,270.014, 260.381,264.272z
-	 M 299.1,242.582c-1.439-5.746-7.262-9.246-13.016-7.805c-5.738,1.438-9.256,7.252-7.797,12.997
-	c 1.437,5.757, 7.257,9.247, 12.997,7.815C 297.041,254.144, 300.539,248.339, 299.1,242.582z M 34.609,152.509l0-30.644 l 437.793,0 l0,30.644 
-	L 34.609,152.509 z"  />
-<glyph unicode="&#xe067;" d="M 199.17,259.963c0,11.993, 3.6,23.389, 10.303,33.012L 43.381,292.975 l0-65.881 l 166.025,0 C 202.77,236.701, 199.17,248.038, 199.17,259.963z
-	 M 372.263,292.975L 306.4,227.094l 162.952,0 l0,65.881 L 372.263,292.975 z M 114.834,9.111l 283.064,0 l 40.844,181.026L 74.022,190.137 L 114.834,9.111z
-	 M 257.186,227.094c 8.468,0, 16.938,3.225, 23.412,9.669l 142.777,142.773c 12.949,12.935, 12.918,33.888,0,46.821
-	c-12.918,12.919-33.881,12.919-46.83,0L 233.77,283.576c-12.918-12.918-12.918-33.889,0-46.787
-	C 240.243,230.319, 248.714,227.094, 257.186,227.094z"  />
-<glyph unicode="&#xe068;" d="M 105.538,408.619M 408.991,79.996c-17.772,0-32.183-14.405-32.183-32.18c0-17.777, 14.41-32.187, 32.183-32.187
-	c 17.774,0, 32.185,14.409, 32.185,32.187C 441.176,65.591, 426.766,79.996, 408.991,79.996z M 155.85,79.996
-	c-17.774,0-32.18-14.405-32.18-32.18c0-17.777, 14.406-32.187, 32.18-32.187c 17.776,0, 32.186,14.409, 32.186,32.187
-	C 188.036,65.591, 173.626,79.996, 155.85,79.996z M 386.716,208.455l 73.421,73.417L 460.137,382.307 l-315.22,0 l-18.358,50.098L 73.497,432.405 
-	c-13.136,0-23.789-10.647-23.789-23.79c0-13.133, 10.653-23.784, 23.789-23.784l 19.826,0 l 64.049-174.794l-34.105-105.721l 309.034,0 
-	c 13.133,0, 23.781,10.649, 23.781,23.784c0,13.143-10.648,23.791-23.781,23.791L 188.604,151.891 l 18.247,56.562L 386.716,208.453 z"  />
-<glyph unicode="&#xe069;" d="M 198.664,318.415l-0.005,0.006c0,0-0.006,0.065-0.030,0.437c-0.061,1.088-0.216,4.063-0.216,8.293
-	c-0.066,11.91, 1.413,33.954, 8.334,50.872c 3.407,8.498, 7.999,15.48, 13.565,20.059c 5.634,4.538, 12.123,7.381, 22.623,7.475l 6.512,0 
-	c0,0, 18.039,0, 18.043,0l 0.481,0 c 10.6-0.104, 17.123-3.033, 22.855-7.782c 8.52-7.062, 14.715-20.391, 18.013-34.776
-	c 3.379-14.284, 4.059-29.022, 4.043-37.48c0-2.375-0.045-4.256-0.092-5.516c-0.028-0.627-0.046-1.106-0.060-1.399
-	c-0.018-0.301-0.023-0.35-0.018-0.35l 30.712-2.042c 0.016,0.284, 0.238,3.735, 0.238,9.307c-0.069,13.335-1.102,38.549-10.403,62.546
-	c-4.704,11.974-11.637,23.883-22.485,33.149c-10.771,9.299-25.656,15.219-42.804,15.116l-0.481,0 c-0.005,0-18.043,0-18.043,0l-6.512,0 
-	c-16.848,0.099-31.511-5.544-42.241-14.533c-16.178-13.552-23.803-32.524-28.089-49.949c-4.221-17.538-4.954-34.179-4.97-44.695
-	c0-6.62, 0.316-10.785, 0.339-11.105L 198.664,318.415z M 384.365,289.686L 126.94,289.686 l-20.033-277.87l 297.489,0 L 384.365,289.686z"  />
-<glyph unicode="&#xe06a;" d="M 221.72,58.421L 256.382,260.37L 290.98,58.421L 406.074,58.421L 384.248,332.874L 384.248,389.819L 129.254,389.819L 129.254,342.533L 106.659,58.421 z"  />
-<glyph unicode="&#xe06b;" d="M 346.724,282.21l 35.438-0.007l0-48.204 l 89.522,73.886l-89.522,73.885l0-48.205 l-56.624,0 l-46.73-46.446l 36.209-36.433
-	L 346.724,282.21z M 381.629,165.879l-39.592,0 L 168.019,339.895L 33.328,339.895 l0-51.362 l 113.413,0 l 174.020-174.020l 60.868,0 l0-48.204 l 89.521,73.887
-	l-89.521,73.886L 381.629,165.879 z M 157.228,165.877L 33.331,165.877 l0-51.36 l 145.176,0 l 43.485,43.485l-36.314,36.321L 157.228,165.877z"  />
-<glyph unicode="&#xe06c;" d="M 415.374,213.318c-3.175,3.611-6.512,7.241-10.042,10.844c 3.53,3.625, 6.867,7.254, 10.042,10.849
-	c 41.496,47.631, 38.098,78.668, 27.895,96.312c-7.36,12.733-23.909,27.896-60.99,27.896c-14.978,0-32.212-2.503-50.788-7.2
-	c-14.386,50.281-38.651,86.499-73.871,86.499c-35.189,0-59.452-36.218-73.84-86.499c-18.607,4.697-35.842,7.2-50.787,7.2l0,0
-	c-37.082,0-53.63-15.163-60.99-27.896c-17.593-30.482, 1.639-69.61, 37.938-107.161c-36.299-37.543-55.53-76.656-37.938-107.159
-	c 7.36-12.725, 23.908-27.896, 60.99-27.896c 14.945,0, 32.18,2.519, 50.787,7.191c 14.388-50.259, 38.65-86.461, 73.84-86.461
-	c 35.22,0, 59.485,36.202, 73.871,86.461c 18.576-4.673, 35.811-7.191, 50.788-7.191c 37.081,0, 53.63,15.171, 60.99,27.896
-	C 453.472,134.662, 456.87,165.704, 415.374,213.318z M 132.992,114.028c-19.359,0-33.321,5.003-39.371,15.433
-	c-10.043,17.389, 4.020,46.267, 34.302,77.48c 12.886-11.526, 27.143-22.711, 42.152-33.342c 1.669-18.278, 4.22-36.222, 7.784-53.098
-	C 161.051,116.284, 145.812,114.028, 132.992,114.028z M 168.082,206.009c-7.816,6.032-15.207,12.102-22.040,18.153
-	c 6.833,6.045, 14.224,12.132, 22.040,18.176c-0.164-6.062-0.263-12.131-0.263-18.164C 167.819,218.125, 167.918,212.057, 168.082,206.009z
-	 M 170.075,274.716c-15.010-10.599-29.267-21.795-42.152-33.321c-30.282,31.223-44.345,60.070-34.302,77.464
-	c 6.050,10.47, 20.012,15.439, 39.371,15.439c 12.82,0, 28.059-2.225, 44.867-6.441C 174.295,310.949, 171.744,292.995, 170.075,274.716z
-	 M 318.147,292.604c-5.131,3.171-10.332,6.292-15.628,9.336c-5.267,3.058-10.565,5.969-15.894,8.812
-	c 9.188,3.793, 18.149,7.162, 26.814,10.071C 315.273,311.862, 316.843,302.432, 318.147,292.604z M 257.619,413.566
-	c 20.112,0, 38.032-26.634, 49.936-68.459c-16.057-5.281-32.831-11.92-49.936-19.834c-17.070,7.914-33.846,14.553-49.936,19.834
-	C 219.619,386.933, 237.541,413.566, 257.619,413.566z M 201.829,320.824c 8.666-2.909, 17.628-6.278, 26.786-10.071
-	c-5.301-2.844-10.596-5.755-15.895-8.812c-5.232-3.011-10.432-6.132-15.602-9.336C 198.43,302.432, 199.998,311.862, 201.829,320.824z
-	 M 197.119,155.714c 5.17-3.207, 10.369-6.313, 15.602-9.325c 5.299-3.071, 10.594-5.979, 15.895-8.816
-	c-9.158-3.762-18.12-7.16-26.786-10.038C 199.998,136.46, 198.43,145.899, 197.119,155.714z M 257.619,34.761
-	c-20.078,0-38,26.648-49.936,68.476c 16.090,5.266, 32.865,11.902, 49.936,19.817c 17.104-7.915, 33.879-14.552, 49.936-19.817
-	C 295.651,61.409, 277.731,34.761, 257.619,34.761z M 313.44,127.534c-8.665,2.878-17.627,6.276-26.814,10.070
-	c 5.328,2.806, 10.627,5.713, 15.894,8.784c 5.296,3.046, 10.497,6.17, 15.628,9.325C 316.843,145.899, 315.273,136.46, 313.44,127.534z
-	 M 321.288,187.42c-9.907-6.659-20.337-13.166-31.226-19.444c-10.893-6.28-21.717-12.067-32.443-17.295
-	c-10.693,5.228-21.519,11.015-32.441,17.295c-10.889,6.278-21.289,12.785-31.195,19.421c-0.786,11.906-1.21,24.206-1.21,36.777
-	c0,12.577, 0.424,24.838, 1.21,36.744c 9.906,6.634, 20.307,13.145, 31.195,19.423c 10.923,6.311, 21.748,12.065, 32.441,17.317
-	c 10.727-5.252, 21.551-11.007, 32.443-17.317c 10.889-6.278, 21.318-12.789, 31.226-19.423c 0.787-11.906, 1.211-24.167, 1.211-36.744
-	C 322.499,211.603, 322.075,199.303, 321.288,187.42z M 382.278,334.298c 19.361,0, 33.354-4.97, 39.371-15.439
-	c 10.072-17.364-4.021-46.241-34.269-77.433c-12.658,11.317-26.85,22.532-42.22,33.32c-1.634,18.278-4.219,36.203-7.751,53.11
-	C 354.221,332.073, 369.458,334.298, 382.278,334.298z M 347.156,242.338c 7.849-6.044, 15.239-12.131, 22.074-18.176
-	c-6.835-6.052-14.226-12.121-22.074-18.153c 0.195,6.048, 0.294,12.116, 0.294,18.165C 347.45,230.207, 347.352,236.275, 347.156,242.338z
-	 M 421.649,129.461c-6.017-10.43-20.010-15.433-39.371-15.433c-12.82,0-28.058,2.256-44.868,6.474
-	c 3.532,16.876, 6.117,34.787, 7.751,53.098c 15.37,10.797, 29.562,22.010, 42.22,33.307C 417.628,175.698, 431.722,146.85, 421.649,129.461z
-	 M 257.619,254.865c-16.907,0-30.674-13.751-30.674-30.691c0-16.955, 13.767-30.69, 30.674-30.69c 16.972,0, 30.705,13.735, 30.705,30.69
-	C 288.324,241.114, 274.591,254.865, 257.619,254.865z"  />
-<glyph unicode="&#xe06d;" d="M 340.908,390.504L 171.841,390.504 c-13.343,0-24.167-10.826-24.167-24.167l0-308.703 l 142.417-0.032l 74.968,74.971L 365.059,366.337 
-	C 365.060,379.678, 354.234,390.504, 340.908,390.504z M 275.326,208.223l-39.767,0 l0,90.703 l 91.402,0 l0-39.782 l-51.635,0 L 275.326,208.223 z M 182.109,298.926
-	l 35.988,0 l0-39.782 l-35.988,0 L 182.109,298.926 z M 235.559,316.369l0,36.725 l 39.767,0 l0-36.725 L 235.559,316.369 z M 326.961,334.584l0-18.215 l-34.189,0 l0,36.725 l 15.664,0 
-	C 318.654,353.093, 326.961,344.801, 326.961,334.584z M 200.617,353.093l 17.48,0 l0-36.725 l-35.988,0 l0,18.215 
-	C 182.109,344.801, 190.397,353.093, 200.617,353.093z M 182.109,226.734l0,14.945 l 35.988,0 l0-33.457 l-17.48,0 
-	C 190.397,208.223, 182.109,216.531, 182.109,226.734z M 308.436,208.223l-15.664,0 l0,33.472 l 34.189,0 l0-14.96 
-	C 326.961,216.531, 318.654,208.223, 308.436,208.223z"  />
-<glyph unicode="&#xe06e;" d="M 279.385,107.855l0-0.031 c-0.197-26.161-23.824-51.765-57.719-60.267c-38.557-9.647-75.835,6.507-83.226,36.101
-	c-7.407,29.596, 17.854,61.415, 56.409,71.062c 17.364,4.346, 34.437,3.4, 48.661-1.605l-0.032,257.282l 27.664-0.084
-	c0,0-1.765-20.502, 23.152-45.422c 27.765-27.729, 86.446-42.872, 81.855-111.87c-2.39-35.545-32.084-90.88-32.084-90.88l-10.071,10.075
-	c0,0, 7.293,16.219, 13.933,64.324c 6.67,48.068-68.543,57.552-68.543,57.552L 279.384,107.855 z"  />
-<glyph unicode="&#xe06f;" d="M 429.595,169.514L 429.595,247.13L 270.554,247.13L 270.554,299.246L 302.813,299.246L 302.813,392.873L 209.185,392.873L 209.185,299.246L 241.444,299.246L 241.444,247.13L 82.403,247.13L 82.403,169.514L 50.142,169.514L 50.142,75.886L 143.771,75.886L 143.771,169.514L 111.511,169.514L 111.511,218.026L 241.444,218.026L 241.444,169.514L 209.185,169.514L 209.185,75.886L 302.813,75.886L 302.813,169.514L 270.554,169.514L 270.554,218.026L 400.491,218.026L 400.491,169.514L 368.229,169.514L 368.229,75.886L 461.858,75.886L 461.858,169.514 z"  />
-<glyph unicode="&#xe070;" d="M 329.983,80.498c-120.081,0-217.416,97.331-217.416,217.422c0,45.978, 14.272,88.622, 38.636,123.741
-	C 94.612,382.413, 57.545,316.983, 57.545,242.896c0-120.080, 97.336-217.412, 217.417-217.412c 74.086,0, 139.522,37.064, 178.765,93.656
-	C 418.604,94.773, 375.961,80.498, 329.983,80.498z"  />
-<glyph unicode="&#xe071;" d="M 262.87,408.308L 262.87,444.784 l-25.040,0 l0-36.476 L 35.939,408.308 l0-64.594 l 22.144,0 l0-243.906 l 154.286,0 l-93.862-76.862l 15.86-19.371l 117.519,96.233
-	l 0.833,0 l 117.521-96.233l 15.863,19.378l-93.868,76.855l 153.682,0 L 445.917,343.714 l 26.691,0 L 472.608,408.308 L 262.87,408.308 z M 420.877,124.847L 83.121,124.847 L 83.121,343.714 
-	l 337.756,0 L 420.877,124.847 z M 165.319,181.233l0,65.084 l 65.084,0 c0,35.942-29.138,65.082-65.084,65.082c-35.942,0-65.079-29.139-65.079-65.082
-	C 100.24,210.373, 129.377,181.233, 165.319,181.233z M 183.604,163.484c 35.942,0, 65.084,29.141, 65.084,65.087l-65.084,0 L 183.604,163.484 z
-	 M 382.661,297.111l-83.242,0 l0-25.039 l 83.242,0 L 382.661,297.111 z M 382.661,251.156l-83.242,0 l0-25.036 l 83.242,0 L 382.661,251.156 z M 382.661,205.204l-83.242,0 
-	l0-25.046 l 83.242,0 L 382.661,205.204 z"  />
-<glyph unicode="&#xe072;" d="M 255.636,441.898c-120.065,0-217.417-97.352-217.417-217.431c0-120.049, 97.352-217.433, 217.417-217.433
-	c 120.077,0, 217.416,97.384, 217.416,217.433C 473.052,344.547, 375.713,441.898, 255.636,441.898z M 255.636,31.982
-	c-106.136,0-192.482,86.367-192.482,192.485c0,106.147, 86.347,192.517, 192.482,192.517c 106.134,0, 192.499-86.369, 192.499-192.517
-	C 448.135,118.35, 361.77,31.982, 255.636,31.982z M 308.285,224.437c 13.080,0, 23.674,10.562, 23.674,23.642l0,49.183 
-	c0,13.081-10.594,23.676-23.674,23.676s-23.692-10.595-23.692-23.676l0-49.183 C 284.593,234.999, 295.205,224.437, 308.285,224.437z
-	 M 203.004,224.437c 13.062,0, 23.691,10.562, 23.691,23.642l0,49.183 c0,13.081-10.629,23.676-23.691,23.676
-	c-13.099,0-23.68-10.595-23.68-23.676l0-49.183 C 179.324,234.999, 189.905,224.437, 203.004,224.437z M 394.226,168.086l-25.539,25.545
-	c-4.875,4.838-12.771,4.838-17.642,0c-4.856-4.873-4.856-12.753,0-17.597l 4.412-4.414c-28.663-24.688-64.208-37.055-99.854-37.055
-	c-35.533,0-70.931,12.301-99.53,36.827l 4.139,4.116c 4.857,4.878, 4.857,12.756,0,17.664c-4.873,4.837-12.771,4.837-17.66,0
-	L 117.046,167.6c-4.871-4.842-4.871-12.751,0-17.629c 2.454-2.417, 5.624-3.666, 8.812-3.666c 3.189,0, 6.394,1.249, 8.829,3.666
-	l 4.447,4.48c 4.824-7.357, 11.938-16.81, 21.632-26.389c 20.063-19.815, 51.98-40.059, 96.341-40.027l 0.179,0 
-	c 44.312,0, 75.525,20.274, 94.854,40.223c 9.253,9.452, 15.94,18.868, 20.503,26.193l 3.958-3.988c 2.418-2.418, 5.605-3.633, 8.81-3.633
-	c 3.19,0, 6.397,1.215, 8.815,3.633C 399.082,155.334, 399.082,163.25, 394.226,168.086z"  />
-<glyph unicode="&#xe073;" d="M 256.393,441.604c-120.080,0-217.404-97.318-217.404-217.398c0-120.052, 97.324-217.438, 217.404-217.438
-			s 217.434,97.387, 217.434,217.438C 473.826,344.286, 376.473,441.604, 256.393,441.604z M 285.365,296.947
-			c0,13.096, 10.598,23.696, 23.676,23.696s 23.676-10.601, 23.676-23.696l0-49.135 c0-13.078-10.598-23.675-23.676-23.675
-			s-23.676,10.597-23.676,23.675L 285.365,296.947 z M 180.066,296.947c0,13.096, 10.596,23.696, 23.674,23.696
-			c 13.082,0, 23.709-10.601, 23.709-23.696l0-49.135 c0-13.078-10.627-23.675-23.709-23.675c-13.078,0-23.674,10.597-23.674,23.675
-			L 180.066,296.947 z M 394.981,150.201c-2.417-2.455-5.592-3.666-8.798-3.666c-3.205,0-6.408,1.211-8.83,3.666l-3.956,3.971
-			c-4.544-7.371-11.247-16.725-20.503-26.209c-19.297-19.93-50.525-40.227-94.801-40.227l-0.197,0 
-			c-44.377-0.030-76.293,20.243-96.372,40.062c-9.712,9.564-16.808,19.002-21.616,26.373l-4.48-4.463
-			c-2.419-2.454-5.623-3.664-8.796-3.664c-3.204,0-6.377,1.21-8.831,3.664c-4.839,4.838-4.839,12.754,0,17.624l 25.542,25.522
-			c 4.87,4.892, 12.753,4.892, 17.626,0c 4.871-4.852, 4.871-12.771,0-17.623l-4.121-4.103c 28.58-24.563, 63.998-36.84, 99.512-36.84
-			c 35.643,0, 71.189,12.378, 99.869,37.036l-4.414,4.414c-4.87,4.869-4.87,12.771,0,17.622c 4.873,4.861, 12.757,4.861, 17.627,0
-			l 25.54-25.522C 399.855,162.957, 399.855,155.056, 394.981,150.201z"  />
-<glyph unicode="&#xe074;" d="M 157.138,193.548l 198.237,0 c 35.547,0, 64.291,28.815, 64.291,64.314c0,28.793-18.901,53.122-44.932,61.33
-	c 1.602,6.247, 2.485,12.784, 2.485,19.539c0,42.575-34.501,77.077-77.077,77.077c-32.016,0-59.452-19.509-71.094-47.288
-	c-10.039,11.773-24.918,19.229-41.597,19.229c-30.12,0-54.516-24.424-54.516-54.541c0-5.187, 0.72-10.188, 2.060-14.945
-	c-24.623-9.011-42.151-32.654-42.151-60.401C 92.845,222.363, 121.592,193.548, 157.138,193.548z M 394.942,82.531l-2.679,0 l 1.896,1.896
-	c 4.187,4.202, 4.187,11.037,0,15.236c-4.218,4.202-11.054,4.202-15.24,0l-1.896-1.896l0,2.682 c0,5.951-4.843,10.796-10.791,10.796
-	c-5.952,0-10.794-4.845-10.794-10.796l0-2.682 l-1.897,1.896c-4.183,4.202-11.021,4.202-15.237,0c-4.188-4.199-4.188-11.034,0-15.236
-	l 1.896-1.912l-2.68,0 c-5.951,0-10.761-4.828-10.761-10.763c0-5.969, 4.81-10.788, 10.761-10.788l 2.68,0 l-1.896-1.897
-	c-4.188-4.204-4.188-11.038,0-15.24c 2.093-2.108, 4.872-3.155, 7.65-3.155c 2.748,0, 5.496,1.047, 7.587,3.155l 1.897,1.894l0-2.678 
-	c0-5.949, 4.842-10.777, 10.794-10.777c 5.948,0, 10.791,4.828, 10.791,10.777l0,2.678 l 1.896-1.894c 2.092-2.108, 4.84-3.155, 7.62-3.155
-	c 2.745,0, 5.495,1.047, 7.62,3.155c 4.187,4.202, 4.187,11.036,0,15.24l-1.896,1.912l 2.679,0 c 5.954,0, 10.761,4.805, 10.761,10.773
-	C 405.703,77.688, 400.896,82.531, 394.942,82.531z M 177.085,82.531l-2.649,0 l 1.896,1.896c 4.188,4.202, 4.188,11.037,0,15.236
-	c-4.218,4.218-11.054,4.218-15.27,0l-1.896-1.896l0,2.682 c0,5.951-4.809,10.796-10.76,10.796c-5.953,0-10.759-4.845-10.759-10.796
-	l0-2.682 l-1.93,1.896c-4.219,4.218-11.054,4.218-15.238,0c-4.218-4.199-4.218-11.034,0-15.236l 1.896-1.912l-2.683,0 
-	c-5.951,0-10.793-4.828-10.793-10.78c0-5.951, 4.842-10.756, 10.793-10.756l 2.683,0 l-1.896-1.912c-4.218-4.204-4.218-11.038,0-15.24
-	c 2.125-2.108, 4.872-3.155, 7.618-3.155c 2.779,0, 5.527,1.047, 7.62,3.155l 1.93,1.91l0-2.694 c0-5.949, 4.806-10.762, 10.759-10.762
-	c 5.951,0, 10.76,4.812, 10.76,10.762l0,2.694 l 1.896-1.91c 2.125-2.108, 4.872-3.155, 7.618-3.155c 2.78,0, 5.526,1.047, 7.651,3.155
-	c 4.188,4.202, 4.188,11.036,0,15.24l-1.929,1.912l 2.682,0 c 5.952,0, 10.793,4.805, 10.793,10.756
-	C 187.878,77.688, 183.037,82.531, 177.085,82.531z M 288.042,137.416l-2.681,0 l 1.896,1.902c 4.22,4.198, 4.22,11.016,0,15.236
-	c-4.217,4.219-11.020,4.219-15.238,0l-1.898-1.912l0,2.699 c0,5.951-4.838,10.772-10.793,10.772c-5.916,0-10.756-4.821-10.756-10.772
-	l0-2.683 l-1.93,1.896c-4.188,4.219-11.022,4.219-15.241,0c-4.185-4.221-4.185-11.038,0-15.236l 1.932-1.902l-2.683,0 
-	c-5.95,0-10.791-4.821-10.791-10.774c0-5.949, 4.841-10.786, 10.791-10.786l 2.683,0 l-1.932-1.896c-4.185-4.188-4.185-11.037,0-15.242
-	c 2.125-2.090, 4.874-3.157, 7.653-3.157c 2.746,0, 5.527,1.067, 7.588,3.157l 1.93,1.912l0-2.698 c0-5.967, 4.84-10.789, 10.756-10.789
-	c 5.955,0, 10.793,4.822, 10.793,10.789l0,2.698 l 1.898-1.912c 2.092-2.090, 4.87-3.157, 7.62-3.157c 2.777,0, 5.491,1.067, 7.618,3.157
-	c 4.22,4.205, 4.22,11.054,0,15.242l-1.896,1.896l 2.681,0 c 5.951,0, 10.794,4.837, 10.794,10.786
-	C 298.836,132.595, 293.993,137.416, 288.042,137.416z"  />
-<glyph unicode="&#xe075;" d="M 121.997,281.401l0-113.095 l 50.837,0 l 113.565-84.295L 286.399,365.693 l-113.563-84.292L 121.997,281.401 z M 346.109,328.41
-	c-6.672,6.67-17.485,6.67-24.156,0c-6.67-6.672-6.67-17.486, 0.010-24.157l-0.010,0 c 21.943-21.954, 32.868-50.562, 32.888-79.309
-	c-0.020-28.835-10.917-57.493-32.888-79.491c-6.67-6.673-6.67-17.488, 0.010-24.158c 3.33-3.332, 7.701-4.997, 12.069-5.001
-	c 4.375,0, 8.749,1.673, 12.085,5.009c 28.584,28.582, 42.906,66.205, 42.887,103.642C 389.023,262.35, 374.646,299.888, 346.109,328.41z"  />
-<glyph unicode="&#xe076;" d="M 83.474,280.401l0-113.095 l 50.839,0 l 113.563-84.295L 247.876,364.693 l-113.56-84.292L 83.474,280.401 z M 307.592,327.41
-	c-6.68,6.67-17.49,6.67-24.159,0c-6.674-6.674-6.674-17.484, 0.004-24.153l-0.004,0 c 21.94-21.956, 32.865-50.56, 32.885-79.316
-	c-0.020-28.835-10.917-57.489-32.885-79.487c-6.674-6.673-6.674-17.492, 0.004-24.158c 3.337-3.332, 7.709-5.001, 12.078-5.001
-	c 4.376,0, 8.748,1.669, 12.085,5.007c 28.576,28.588, 42.895,66.207, 42.883,103.64C 350.494,261.35, 336.122,298.886, 307.592,327.41z
-	 M 361.531,381.503c-6.678,6.67-17.492,6.67-24.161,0c-6.667-6.671-6.667-17.487, 0.006-24.154l-0.006,0 
-	c 36.837-36.851, 55.274-84.958, 55.288-133.22c-0.020-48.484-18.344-96.797-55.288-133.771c-6.667-6.666-6.667-17.486, 0.006-24.16
-	c 3.335-3.33, 7.702-4.998, 12.073-4.998c 4.373,0, 8.743,1.672, 12.082,5.004c 43.575,43.588, 65.312,100.864, 65.294,157.926
-	C 426.841,281.068, 404.941,338.105, 361.531,381.503z"  />
-<glyph unicode="&#xe077;" d="M 337.652,365.693L 224.088,281.401L 173.25,281.401L 173.25,168.307L 224.088,168.307L 337.652,84.012 z"  />
-<glyph unicode="&#xe078;" d="M 255.065,381.604l 183.224-196.959l-82.807,0 l0-117.392 L 154.645,67.253 L 154.645,184.646 L 71.842,184.646 L 255.065,381.604 M 255.065,344.84L 129.333,209.682
-		l 25.311,0 l 25.038,0 l0-25.036 l0-92.351 l 150.761,0 l0,92.351 l0,25.036 l 25.039,0 l 25.314,0 L 255.065,344.84L 255.065,344.84z"  />
-<glyph unicode="&#xe079;" d="M 100.985,380.893c 132.819,0, 153.603,52.337, 153.603,52.337s 20.28-52.337, 153.607-52.337l0-214.628 
-		c0-84.827-153.607-152.104-153.607-152.104s-153.603,67.276-153.603,152.104L 100.985,380.893 z"  />
-<glyph unicode="&#xe07a;" d="M 155.931,152.003c0,0, 17.069,72.583, 151.964,72.583l0-65.603 l 128.665,106.212L 307.896,371.382l0-63.573 
-	C 285.43,308.396, 167.196,304.048, 155.931,152.003z M 346.024,111.338L 111.129,111.338 L 111.129,275.696 l 66.876,0 
-	c 9.728,11.185, 20.864,20.865, 33.421,28.861c 3.417,2.191, 6.881,4.182, 10.332,6.031L 76.22,310.588 l0-234.14 l 304.714,0 L 380.934,188.97 l-34.91-28.809
-	L 346.024,111.338 z"  />
-<glyph unicode="&#xe07b;" d="M 329.047,148.26c-11.102,0-21.602-2.572-30.949-7.142l-54.123,54.129c 3.98,8.833, 6.216,18.63, 6.216,28.953
-	c0,10.324-2.235,20.119-6.218,28.96l 53.899,53.899c 9.399-4.638, 19.98-7.259, 31.175-7.259c 38.983,0, 70.581,31.603, 70.581,70.583
-	c0,38.98-31.598,70.579-70.581,70.579c-38.979,0-70.576-31.599-70.576-70.579c0-9.443, 1.865-18.448, 5.23-26.682l-55.138-55.136
-	c-8.839,3.98-18.632,6.214-28.952,6.214c-38.981,0-70.58-31.598-70.58-70.58s 31.599-70.579, 70.58-70.579
-	c 10.324,0, 20.117,2.23, 28.952,6.214L 263.8,104.6c-3.429-8.299-5.329-17.387-5.329-26.923c0-38.98, 31.597-70.579, 70.576-70.579
-	c 38.983,0, 70.581,31.599, 70.581,70.579C 399.628,116.658, 368.030,148.26, 329.047,148.26z"  />
-<glyph unicode="&#xe07c;" d="M 109.398,137.248c-34.338,0-62.168-27.829-62.168-62.13c0-34.387, 27.83-62.2, 62.168-62.2
-	c 34.367,0, 62.197,27.813, 62.197,62.2C 171.596,109.419, 143.766,137.248, 109.398,137.248z M 125.423,235.074l-11.642-46.287l0-1.344 
-	c 26.617,0.821, 53.498-8.829, 73.809-29.165c 20.34-20.311, 29.986-47.193, 29.198-73.809l 0.034,0 l 47.615,10.445
-	c-1.767,35.398-15.93,70.329-42.906,97.306C 194.814,218.922, 160.445,233.030, 125.423,235.074z M 175.684,435.143l-12.062-47.854
-	c 61.475-9.534, 120.601-37.655, 167.983-85.044c 48.858-48.837, 77.212-110.253, 85.808-173.826l 48.141,10.562
-	C 443.412,290.114, 325.782,409.869, 175.684,435.143z M 150.896,336.52l-12.59-50.116c 43.852-4.743, 86.462-23.661, 120.111-57.296
-	c 34.336-34.337, 53.5-78.027, 57.688-122.891l 50.362,11.033c-6.576,55.951-31.363,107.74-71.783,148.122
-	C 255.312,304.765, 205.15,329.175, 150.896,336.52z"  />
-<glyph unicode="&#xe07d;" d="M 386.075,222.607c-12.787,0-23.848-8.894-26.596-21.381c-7.811-35.521-32.711-62.957-64.156-75.589
-		c-0.19-0.075-0.374-0.154-0.564-0.229c-1.061-0.422-2.139-0.803-3.215-1.188c-0.689-0.245-1.375-0.499-2.070-0.729
-		c-0.582-0.196-1.174-0.372-1.762-0.557c-1.199-0.375-2.402-0.75-3.615-1.081c-0.084-0.022-0.166-0.043-0.252-0.067
-		c-32.787-8.884-69.278-1.925-96.928,21.836c-11.406,9.798-28.597,8.501-38.4-2.907c-9.801-11.405-8.501-28.599, 2.905-38.398
-		c 20.838-17.906, 44.988-29.506, 70.115-34.987l-0.006-0.028c 1.934-0.425, 3.865-0.76, 5.801-1.111c 0.318-0.057, 0.636-0.127, 0.959-0.182
-		c 2.193-0.387, 4.383-0.709, 6.57-0.999c 0.111-0.017, 0.221-0.032, 0.334-0.047c 6.975-0.917, 13.926-1.422, 20.816-1.422
-		c 17.027,0, 33.666,2.751, 49.402,7.878c 0.562,0.184, 1.117,0.381, 1.678,0.57c 1.615,0.545, 3.224,1.114, 4.818,1.71
-		c 1.155,0.427, 2.308,0.86, 3.455,1.315c 0.47,0.188, 0.937,0.391, 1.404,0.586c 21.033,8.574, 40.5,21.734, 56.832,39.363
-		c 0.732,0.788, 1.458,1.59, 2.176,2.394c 0.622,0.698, 1.27,1.359, 1.879,2.070c 0.159,0.182, 0.289,0.381, 0.439,0.566
-		c 11.969,14.006, 21.65,30.207, 28.303,48.152l 56.078,0 l0,54.462 L 386.075,222.607 zM 152.497,246.749c 3.776,17.169, 11.568,32.78, 22.643,45.804c 0.154,0.174, 0.326,0.324, 0.478,0.501
-		c 3.379,3.932, 7.004,7.572, 10.844,10.921c 3.883,3.36, 8.033,6.467, 12.437,9.283c 7.872,5.035, 16.243,8.931, 24.911,11.709
-		c 7.766,2.458, 15.859,4.056, 24.184,4.686c 5.172,0.39, 10.311,0.398, 15.393,0.054c 5.125-0.369, 15.373-2.187, 15.373-2.187
-		c 16.928-3.701, 32.781-11.554, 46.291-23.165c 11.409-9.805, 28.599-8.504, 38.4,2.905c 9.803,11.405, 8.504,28.598-2.904,38.399
-		c-26.555,22.819-59.068,36.067-93.387,38.389c-20.795,1.495-41.488-1.091-61.136-7.563c-18.676-6.082-36.007-15.574-51.286-28.059
-		c-0.73-0.592-1.456-1.189-2.176-1.793c-0.801-0.682-1.605-1.363-2.396-2.062c-20.090-17.555-35.359-39.683-44.604-64.743L 49.524,279.828 
-		l0-54.462 L 125.9,225.366 C 138.686,225.365, 149.752,234.262, 152.497,246.749zM 196.672,223.985c0-32.653, 26.557-59.13, 59.312-59.13c 32.76,0, 59.321,26.477, 59.321,59.13
-		c0,32.652-26.561,59.127-59.321,59.127C 223.229,283.112, 196.672,256.638, 196.672,223.985z"  />
-<glyph unicode="&#xe07e;" d="M 469.92,200.283l0,48.898 l-6.906,2.256l-52.35,17.091l-13.971,33.728l 26.852,56.814l-34.586,34.581l-6.477-3.288
-	l-49.1-24.937l-33.721,13.971l-21.198,59.171l-48.899,0 l-2.253-6.912l-17.091-52.352l-33.712-13.966l-56.833,26.849l-34.573-34.58
-	l 3.287-6.474l 24.933-49.116L 99.362,268.31l-59.182-21.189l0-48.909 l 6.914-2.253l 52.352-17.094l 13.966-33.718l-26.845-56.82
-	l 34.567-34.587l 6.484,3.294l 49.103,24.931l 33.719-13.968l 21.188-59.165l 48.902,0 l 2.26,6.908l 17.094,52.35l 33.721,13.967l 56.818-26.855
-	l 34.584,34.59l-3.286,6.48l-24.937,49.094l 13.969,33.726L 469.92,200.283z M 255.054,155.22c-37.819,0-68.478,30.657-68.478,68.479
-	c0,37.819, 30.659,68.481, 68.478,68.481c 37.819,0, 68.475-30.662, 68.475-68.481C 323.529,185.877, 292.873,155.22, 255.054,155.22z"  />
-<glyph unicode="&#xe07f;" d="M 284.859,179.345l 9.021,21.78l 38.209,13.684l0,31.579 l-4.461,1.46l-33.811,11.035l-9.020,21.784l 17.34,36.692l-22.334,22.331
-		l-4.182-2.125l-31.711-16.104l-21.775,9.021l-13.689,38.214l-31.582,0 l-1.451-4.463l-11.039-33.811l-21.773-9.020l-36.705,17.338
-		l-22.328-22.333l 2.129-4.179l 16.1-31.718l-9.016-21.766l-38.219-13.686l0-31.588 l 4.461-1.452l 33.811-11.040l 9.021-21.775
-		l-17.34-36.696l 22.326-22.336l 4.184,2.128l 31.711,16.1l 21.779-9.022l 13.68-38.21l 31.584,0 l 1.459,4.465l 11.041,33.808l 21.777,9.019
-		l 36.695-17.343l 22.334,22.339l-2.123,4.181L 284.859,179.345z M 193.328,185.708c-24.424,0-44.227,19.797-44.227,44.224
-		c0,24.427, 19.803,44.227, 44.227,44.227c 24.418,0, 44.219-19.8, 44.219-44.227C 237.547,205.504, 217.746,185.708, 193.328,185.708zM 436.119,162.276c-1.012,14.594-7.562,28.34-18.26,38.319l 2.096,25.743l-30.906,10.955l-14.584-21.315
-		c-14.594-1.016-28.342-7.569-38.318-18.266l-25.746,2.095l-10.949-30.904l 21.314-14.585c 1.014-14.593, 7.566-28.34, 18.262-38.318
-		l-2.094-25.744l 30.902-10.953l 14.588,21.315c 14.596,1.014, 28.34,7.568, 38.314,18.264l 25.746-2.094l 10.951,30.903L 436.119,162.276z
-		 M 401.703,150.050c-4.551-12.845-18.66-19.569-31.508-15.015c-12.85,4.555-19.572,18.659-15.016,31.506
-		c 4.555,12.852, 18.66,19.572, 31.508,15.022C 399.535,177.009, 406.26,162.902, 401.703,150.050z"  />
-<glyph unicode="&#xe080;" d="M 414.21,192.71l0,62.577 l-42.395,0 c-2.723,10.069-6.732,19.61-11.832,28.448l 30.012,30.011l-44.25,44.249l-30.010-30.010
-	c-8.838,5.099-18.377,9.105-28.447,11.83L 287.288,382.209 l-62.576,0 l0-42.394 c-10.068-2.725-19.607-6.731-28.445-11.83l-30.012,30.010
-	l-44.25-44.249l 30.010-30.011c-5.1-8.838-9.107-18.379-11.83-28.448L 97.79,255.287 l0-62.577 l 42.395,0 c 2.723-10.068, 6.73-19.604, 11.832-28.449
-	l-30.012-30.010l 44.25-44.249l 30.012,30.011c 8.838-5.098, 18.377-9.107, 28.445-11.828l0-42.395 l 62.576,0 l0,42.395 
-	c 10.070,2.721, 19.609,6.73, 28.447,11.828l 30.010-30.011l 44.25,44.249l-30.012,30.010c 5.1,8.845, 9.109,18.381, 11.832,28.449L 414.21,192.71 z
-	 M 256.001,166.598c-31.652,0-57.404,25.752-57.404,57.405c0,31.649, 25.752,57.399, 57.404,57.399s 57.404-25.75, 57.404-57.399
-	C 313.405,192.35, 287.653,166.598, 256.001,166.598z"  />
-<glyph unicode="&#xe081;" d="M 36.586,310.679l0-85.236 l 439.609,0 l0,85.236 L 36.586,310.679 z M 92.569,248.622L 67.62,248.622 l0,33.648 l 24.95,0 L 92.57,248.622 z M 153.525,248.622l-24.918,0 
-	l0,33.648 l 24.918,0 L 153.525,248.622 z M 214.516,248.622L 189.58,248.622 l0,33.648 l 24.936,0 L 214.516,248.622 z M 426.555,247.217c-10.859,0-19.654,8.791-19.654,19.649
-	c0,10.848, 8.795,19.64, 19.654,19.64c 10.855,0, 19.651-8.792, 19.651-19.64C 446.206,256.008, 437.41,247.217, 426.555,247.217z
-	 M 269.895,91.635L 244.96,91.635 l0-58.223 L 44.090,33.412 l0-24.938 l 426.676,0 l0,24.938 L 269.895,33.412 L 269.895,91.635 z M 362.408,438.676L 150.321,438.676 l-86.79-97.347l 385.717,0 
-	L 362.408,438.676z M 36.586,109.508l 439.609,0 l0,85.227 L 36.586,194.735 L 36.586,109.508 z M 426.555,170.562c 10.855,0, 19.651-8.788, 19.651-19.64
-	c0-10.854-8.796-19.647-19.651-19.647c-10.859,0-19.654,8.794-19.654,19.647C 406.9,161.773, 415.695,170.562, 426.555,170.562z
-	 M 189.58,166.314l 24.936,0 l0-33.645 L 189.58,132.669 L 189.58,166.314 z M 128.607,166.314l 24.918,0 l0-33.645 l-24.918,0 L 128.607,166.314 z M 67.62,166.314l 24.95,0 l0-33.645 
-	L 67.62,132.669 L 67.62,166.314 z"  />
-<glyph unicode="&#xe082;" d="M 256.399,105.527c-51.539,0-100.38,6.965-137.526,19.617c-19.656,6.689-34.142,14.323-44.721,22.303l0-73.543 
-			c0-19.282, 25.801-36.514, 66.316-47.894c 31.494-8.862, 71.897-14.177, 115.931-14.177c 100.656,0, 182.229,27.794, 182.229,62.070
-			l0,73.543 c-10.595-7.979-25.065-15.613-44.72-22.303C 356.776,112.492, 307.918,105.527, 256.399,105.527z M 438.628,190.45l0,75.572 
-			c-10.595-7.946-25.065-15.598-44.72-22.285c-37.132-12.638-85.99-19.604-137.509-19.604c-51.539,0-100.38,6.966-137.526,19.604
-			c-19.656,6.688-34.159,14.339-44.721,22.285l0-75.572 c 6.051-32.44, 85.529-58.112, 182.247-58.112
-			C 353.096,132.338, 432.595,158.010, 438.628,190.45z M 74.152,310.105c 4.449-32.928, 84.452-59.156, 182.247-59.156
-			c 97.776,0, 177.784,26.229, 182.229,59.156l0,64.343 c0,34.286-81.573,62.070-182.229,62.070c-100.673,0-182.247-27.784-182.247-62.070
-			L 74.152,310.105 z"  />
-<glyph unicode="&#xe083;" d="M 342.238,309.805l-36.834-36.836c 13.080-13.078, 20.283-30.467, 20.283-48.967s-7.205-35.889-20.284-48.971l 36.836-36.834
-		c 22.919,22.918, 35.542,53.393, 35.542,85.805C 377.781,256.416, 365.159,286.889, 342.238,309.805zM 401.012,370.377l-36.836-36.838c 60.4-60.4, 60.4-158.68,0-219.082l 36.836-36.834
-		C 481.722,158.334, 481.722,289.662, 401.012,370.377zM 206.598,272.969l-36.834,36.836c-22.921-22.916-35.543-53.389-35.543-85.803c0-32.412, 12.622-62.887, 35.542-85.807
-		l 36.836,36.838c-13.081,13.080-20.284,30.469-20.284,48.969C 186.314,242.5, 193.518,259.891, 206.598,272.969zM 147.824,333.539l-36.837,36.838c-80.709-80.713-80.709-212.043,0-292.754l 36.837,36.834
-		C 87.424,174.859, 87.424,273.141, 147.824,333.539zM 217.172,224A37.494,37.494 180 1 1 292.16,224A37.494,37.494 180 1 1 217.172,224z"  />
-<glyph unicode="&#xe084;" d="M 395.869,388.484L 73.502,234.677L 185.301,190.285L 433.854,308.873 	zM 402.256,183.976L 402.256,139.666L 345.109,139.666L 345.109,179.146L 374.211,193.028L 363.828,214.789L 428.916,245.84L 417.055,270.701L 219.549,176.466L 231.412,151.61L 278.832,174.237L 289.217,152.477L 308.869,161.854L 308.869,103.427L 402.256,103.427L 402.256,59.516L 438.496,59.516L 438.496,183.976 	z"  />
-<glyph unicode="&#xe085;" d="M 470.704,72.094l-2.691,2.689l 0.006,0.002L 360.505,182.308c 14.938,25.733, 23.616,55.565, 23.82,87.451
-	c 0.626,97.615-77.99,177.243-175.599,177.857c-0.394,0.001-0.775,0.002-1.168,0.002C 110.498,447.613, 31.491,369.226, 30.866,272.020
-	c-0.618-97.609, 77.999-177.236, 175.597-177.859c 0.389-0.002, 0.766-0.004, 1.155-0.004c 32.442,0, 62.846,8.79, 88.998,24.075
-	L 404.035,10.8l 0.010,0.010l 2.686-2.686c 8.125-8.124, 21.293-8.117, 29.414,0l 34.56,34.554
-	C 478.82,50.795, 478.826,63.971, 470.704,72.094z M 206.748,139.229c-72.589,0.466-131.271,59.907-130.812,132.502
-	C 76.4,343.86, 135.45,402.543, 207.561,402.547l 0.88-0.002c 35.167-0.22, 68.144-14.124, 92.851-39.148
-	c 24.705-25.025, 38.188-58.178, 37.962-93.352c-0.222-35.015-14.027-67.893-38.867-92.564c-24.834-24.67-57.78-38.252-92.768-38.252
-	L 206.748,139.229z"  />
-<glyph unicode="&#xe086;" d="M 402.109,184.898c 5.184,15.395, 25.376,46.526, 25.376,99.526c0,52.996-65.503,131.134-171.113,131.134
-	c-105.626,0-171.077-78.138-171.077-131.134c0-53, 20.16-84.131, 25.329-99.526c 10.511-31.41-2.062-46.77-2.062-46.77
-	s 3.763-32.367, 14.063-46.652c 10.316-14.275, 60.727,9.527, 60.727-44.393c0,0, 20.257-14.47, 73.496-14.47
-	c 53.207,0, 72.564,14.47, 72.564,14.47c0,53.92, 50.41,30.117, 60.728,44.393c 10.317,14.285, 14.062,46.652, 14.062,46.652
-	S 391.611,153.488, 402.109,184.898z M 204.736,144.188c-11.249-6.101-29.643-11.096-40.894-11.096
-	c-11.264,0-22.921,7.336-25.932,16.275c-3.023,8.947-3.843,25.28-1.864,36.308c 1.98,10.995, 15.648,23.986, 30.413,28.86
-	c 14.75,4.881, 33.83,3.84, 42.43-2.281c 8.568-6.146, 15.73-21.494, 15.94-34.083C 225.029,165.58, 215.985,150.275, 204.736,144.188z
-	 M 256.357,89.761c-18.477,0-22.779,6.829-22.779,6.829s 1.882,54.673, 22.779,54.673c 20.896,0, 22.81-54.673, 22.81-54.673
-	S 274.833,89.761, 256.357,89.761z M 374.837,149.367c-2.993-8.939-14.667-16.275-25.917-16.275c-11.266,0-29.66,4.995-40.911,11.096
-	c-11.248,6.088-20.29,21.393-20.079,33.983c 0.213,12.589, 7.376,27.937, 15.943,34.083c 8.584,6.121, 27.664,7.162, 42.413,2.281
-	c 14.766-4.874, 28.45-17.865, 30.431-28.86C 378.693,174.647, 377.86,158.314, 374.837,149.367z"  />
-<glyph unicode="&#xe087;" d="M 233.52,104.842l-12.11,12.105l-25.437-25.428c-7.037-7.037-10.521-16.193-10.529-25.438
-	c 0.008-9.223, 3.502-18.385, 10.535-25.429c 7.029-7.018, 16.179-10.518, 25.386-10.523c 9.248,0.006, 18.427,3.482, 25.47,10.523
-	c 7.033,7.044, 10.527,16.206, 10.535,25.438c-0.008,9.227-3.492,18.385-10.529,25.428L 233.52,104.842z M 208.781,252.81l 96.43,96.434
-	l 8.252,8.243c 7.033,7.047, 10.525,16.203, 10.533,25.434c-0.008,9.226-3.5,18.381-10.533,25.424
-	c-7.045,7.041-16.203,10.531-25.429,10.537c-9.229-0.006-18.394-3.498-25.423-10.527L 158.395,303.662
-	c 12.821-0.146, 25.661-5.146, 35.442-14.93C 203.742,278.832, 208.75,265.791, 208.781,252.81z M 377.391,222.062l-13.323,13.323
-	l-75.729,75.734l-94.496-94.5l-10.628,10.625c 7.038,7.047, 10.527,16.202, 10.535,25.43c-0.008,9.228-3.497,18.393-10.535,25.428
-	c-7.043,7.043-16.205,10.527-25.428,10.537c-9.232-0.010-18.391-3.494-25.432-10.537c-7.037-7.041-10.522-16.2-10.53-25.428
-	c 0.008-9.228, 3.493-18.383, 10.538-25.43l 111.785-111.786l 13.316-13.317c 9.939-9.938, 14.941-23.031, 14.934-36.049
-	c0-0.174-0.023-0.342-0.025-0.513l 105.018,105.016c 7.112,7.131, 10.648,16.396, 10.654,25.743
-	C 388.039,205.667, 384.511,214.938, 377.391,222.062z M 236.791,173.633l-17.713,17.708l 74.459,74.452l 17.707-17.709L 236.791,173.633z
-	 M 277.941,132.476l-17.707,17.71l 74.46,74.452l 17.706-17.705L 277.941,132.476z"  />
-<glyph unicode="&#xe088;" d="M 392.395,236.768l-13.322,13.321l-71.176,71.178l 20.873,20.876c 11.188,11.175, 16.84,25.951, 16.82,40.602
-	c 0.020,14.656-5.633,29.43-16.82,40.613c-11.178,11.193-25.963,16.832-40.604,16.82c-14.655,0.012-29.433-5.635-40.613-16.826
-	L 122.468,297.697c-1.792-1.41-3.517-2.943-5.165-4.59c-11.18-11.174-16.828-25.959-16.813-40.606
-	c-0.014-14.646, 5.633-29.425, 16.819-40.606l 84.497-84.494l-20.876-20.871c-11.193-11.176-16.833-25.959-16.819-40.613
-	c-0.014-14.65, 5.633-29.427, 16.827-40.611c 11.153-11.16, 25.909-16.826, 40.557-16.818l 0.054,0 c 14.63,0, 29.411,5.629, 40.597,16.822
-	l 0.005-0.004l 130.244,130.246c 11.187,11.182, 16.838,25.957, 16.816,40.61C 409.232,210.812, 403.581,225.598, 392.395,236.768z
-	 M 267.308,403.646c 5.782,5.766, 13.255,8.608, 20.857,8.622c 7.601-0.014, 15.068-2.847, 20.871-8.646
-	c 5.79-5.802, 8.63-13.276, 8.649-20.878c-0.020-7.596-2.859-15.066-8.649-20.869l-8.251-8.252l-87.153-87.154
-	c-2.444,9.771-7.497,19.041-15.112,26.645c-7.509,7.52-16.649,12.539-26.283,15.014L 267.308,403.646z M 242.413,45.045
-	c-5.796-5.799-13.282-8.628-20.918-8.652c-7.568,0.024-15.034,2.861-20.823,8.652c-5.795,5.793-8.637,13.274-8.65,20.871
-	c 0.013,7.607, 2.855,15.072, 8.644,20.869l 20.877,20.879l 7.554-7.557l 13.323-13.314c 5.79-5.805, 8.629-13.277, 8.644-20.877
-	C 251.049,58.319, 248.209,50.846, 242.413,45.045z M 372.659,175.281l-95.458-95.453c-2.439,9.779-7.424,19.085-15.047,26.701
-	l-13.322,13.314L 137.043,231.631c-5.788,5.805-8.63,13.275-8.642,20.87c 0.012,7.603, 2.854,15.077, 8.642,20.872
-	c 5.803,5.795, 13.27,8.634, 20.878,8.656c 7.594-0.022, 15.068-2.861, 20.871-8.648c 5.789-5.797, 8.63-13.271, 8.65-20.88
-	c-0.021-7.595-2.862-15.075-8.65-20.87l 19.736-19.736l 89.632,89.632l 71.184-71.171l 13.315-13.324
-	c 5.792-5.795, 8.633-13.272, 8.645-20.87C 381.292,188.562, 378.451,181.088, 372.659,175.281z M 281.532,276.888l-74.458-74.458
-	l 19.736-19.732l 74.456,74.447L 281.532,276.888z M 311.311,247.105l-74.453-74.46l 19.73-19.737l 74.461,74.459L 311.311,247.105z
-	 M 266.637,142.863l 19.738-19.734l 74.454,74.453l-19.731,19.734L 266.637,142.863z"  />
-<glyph unicode="&#xe089;" d="M 375.853,292.088L 375.853,415.041 L 36.746,415.041 l0-257.146 l 97.83,0 l0-122.947 l 339.101,0 L 473.677,292.088 L 375.853,292.088 z M 74.309,195.459l0,182.020 l 263.99,0 l0-85.391 
-	L 134.575,292.088 l0-96.629 L 74.309,195.459 z M 436.123,72.507L 172.14,72.507 l0,182.020 l 263.983,0 L 436.123,72.507 z"  />
-<glyph unicode="&#xe08a;" d="M 94.363,56.075L 417.334,56.075L 417.334,26.969L 94.363,26.969zM 131.404,110.172L 380.293,110.172L 380.293,81.066L 131.404,81.066zM 256.154,274.762c 20.357,0, 36.924,16.564, 36.924,36.925s-16.566,36.925-36.924,36.925
-		c-20.361,0-36.928-16.564-36.928-36.925S 235.793,274.762, 256.154,274.762z M 250.232,333.163l 11.838,0 l0-21.573 l 19.605,0 l0-11.839 l-31.443,0 
-		L 250.232,333.163 zM 204.598,137.264L 204.598,226.33 l 39.412,0 l0-88.974 l 23.68,0 L 267.69,226.33 l 39.412,0 l0-88.881 l 72.031,0.131l-0.402,221.535l-122.93,61.916
-		l-122.627-62.36l 0.402-221.537L 204.598,137.264z M 256.154,364.704c 29.279,0, 53.016-23.737, 53.016-53.018
-		s-23.736-53.018-53.016-53.018c-29.281,0-53.020,23.737-53.020,53.018S 226.873,364.704, 256.154,364.704zM 402.424,350.455L 402.799,144.697L 462.32,156.505L 462.32,204.577L 462.627,204.577L 462.627,333.857 	zM 109.51,350.298L 49.678,333.857L 49.678,249.838L 49.373,249.838L 49.373,156.505L 109.885,144.461 	z"  />
-<glyph unicode="&#xe08b;" d="M 404.57,374.408c-41.244,41.266-95.477,61.967-149.535,61.949c-54.064,0.018-108.296-20.684-149.54-61.949
-	c-41.745-41.73-61.961-96.664-61.935-151.076c-0.013-53.703, 21.164-107.231, 61.935-147.995
-	c 41.251-41.26, 95.476-61.964, 149.54-61.944l 0.080,0 c 54.031,0, 108.23,20.704, 149.455,61.944c 41.265,41.249, 61.967,95.476, 61.947,149.54
-	C 466.537,278.939, 445.835,333.172, 404.57,374.408z M 379.127,100.785c-34.32-34.303-79.121-51.387-124.091-51.408
-	c-44.976,0.021-89.777,17.1-124.090,51.408c-34.010,34.021-51.386,78.254-51.401,122.547c 0.028,45.648, 16.802,91.021, 51.401,125.633
-	c 34.313,34.303, 79.115,51.379, 124.090,51.404c 44.97-0.025, 89.777-17.102, 124.091-51.404c 34.301-34.305, 51.379-79.112, 51.399-124.088
-	C 430.506,179.904, 413.428,135.099, 379.127,100.785z M 389.98,265.383c-6.478,21.637-18.254,42.029-35.332,59.104
-	c-2.448,2.448-6.413,2.438-8.854,0c-2.441-2.452-2.441-6.417, 0.006-8.856c 15.322-15.316, 25.928-33.537, 31.881-52.89
-	c-8.026-4.086-13.535-12.401-13.535-22.026c0-11.668, 8.086-21.416, 18.95-24.018c-1.909-30.082-14.305-59.588-37.302-82.586
-	c-25.081-25.071-57.895-37.587-90.763-37.594c-32.869,0.007-65.678,12.522-90.756,37.594c-1.538,1.537-3.028,3.107-4.471,4.701
-	c 1.443,2.509, 2.28,5.408, 2.28,8.506c0,9.447-7.656,17.106-17.104,17.106c-1.044,0-2.062-0.11-3.057-0.289
-	c-7.814,14.515-12.616,30.198-14.414,46.167c 10.667,2.746, 18.558,12.393, 18.558,23.916c0,10.298-6.299,19.119-15.25,22.836
-	c 4.138,16.048, 11.409,31.428, 21.838,45.201l 22.059-22.062c-11.459-16.602-17.229-35.971-17.224-55.316
-	c-0.006-24.94, 9.535-49.938, 28.574-68.975c 8.709-8.711, 18.678-15.41, 29.312-20.139c-0.011-0.306-0.046-0.607-0.046-0.92
-	c0-13.654, 11.067-24.718, 24.721-24.718c 11.183,0, 20.62,7.421, 23.674,17.608c 21.986,1.958, 43.464,11.347, 60.28,28.168
-	c 19.034,19.036, 28.581,44.034, 28.573,68.975c 0.008,24.941-9.539,49.949-28.573,68.969c-2.444,2.442-6.41,2.442-8.854,0
-	c-2.444-2.445-2.444-6.409, 0.007-8.857c 16.609-16.605, 24.891-38.333, 24.898-60.111c-0.008-21.777-8.289-43.502-24.905-60.119
-	c-14.297-14.293-32.374-22.407-51.017-24.4c-2.508,10.996-12.327,19.21-24.084,19.21c-8.884,0-16.653-4.703-21.011-11.74
-	c-8.727,4.075-16.906,9.715-24.121,16.931c-16.618,16.623-24.899,38.342-24.905,60.119c 0.005,16.153, 4.576,32.272, 13.711,46.307
-	l 45.471-45.477c0-0.082-0.012-0.164-0.012-0.244c0-13.658, 11.069-24.723, 24.722-24.723c 13.655,0, 24.723,11.064, 24.723,24.723
-	c0,13.043-10.111,23.705-22.92,24.631l-90.243,90.246c-7.028,7.028-18.421,7.028-25.45,0c-7.021-7.031-7.021-18.42,0-25.445
-	l 3.719-3.721c-12.331-15.877-20.816-33.766-25.423-52.436c-12.22-1.496-21.687-11.893-21.687-24.52
-	c0-11.42, 7.751-21.002, 18.271-23.842c 1.864-18.291, 7.348-36.283, 16.387-52.854c-2.128-2.847-3.403-6.373-3.403-10.205
-	c0-9.441, 7.658-17.102, 17.102-17.102c 1.757,0, 3.45,0.268, 5.046,0.758c 1.739-1.938, 3.53-3.854, 5.395-5.719
-	c 27.486-27.49, 63.58-41.26, 99.611-41.26c 36.031,0, 72.122,13.77, 99.616,41.26c 25.48,25.483, 39.157,58.353, 41.020,91.71
-	c 10.345,2.954, 17.922,12.454, 17.922,23.749C 413.59,253.994, 403.114,264.798, 389.98,265.383z"  />
-<glyph unicode="&#xe08c;" d="M 251.886,443.033c 0.051,0, 0.101-0.003, 0.152-0.004c 0.048-0.002, 0.083-0.002, 0.133-0.002L 251.886,443.033z M 469.053,224.5
-	c-0.021,120.031-96.842,217.653-217.015,218.53c-0.657,0.008-1.201,0.009-1.572,0.009c-61.856,0.011-117.971-25.852-157.694-67.277
-	l-51.88,52.545l0-152.691 l 150.756,0 l-52.354,53.025c 27.891,29.734, 67.271,48.214, 111.172,48.224c 0.405,0, 0.626,0, 0.722-0.004l 0.278,0 
-	c 83.815-0.51, 151.432-68.677, 151.411-152.361c 0.004-0.1-0.004-0.507, 0.004-1.202c-0.625-83.712-68.756-151.222-152.361-151.202
-	c-0.271-0.006-0.712,0-1.311,0l 0.206-66.178c 0.195,0.006, 0.566,0.006, 1.105,0c 120.078,0.023, 217.738,96.924, 218.533,217.167l0,0.36 
-	l-0.004,0.435C 469.049,223.99, 469.053,224.197, 469.053,224.5z"  />
-<glyph unicode="&#xe08d;" d="M 355.731,430.721L 156.269,430.721 c-11.109,0-20.118-9.008-20.118-20.118l0-373.204 c0-11.11, 9.009-20.119, 20.118-20.119l 199.463,0 
-	c 11.109,0, 20.118,9.009, 20.118,20.119L 375.85,410.603 C 375.85,421.713, 366.841,430.721, 355.731,430.721z M 323.688,294.388
-	c 7.487,0, 13.556-6.069, 13.556-13.558s-6.069-13.558-13.556-13.558l-11.435,0 c 1.050,4.352, 1.62,8.889, 1.62,13.558
-	s-0.57,9.206-1.62,13.558L 323.688,294.388 z M 242.443,348.516c0,7.487, 6.070,13.558, 13.557,13.558s 13.558-6.070, 13.558-13.558l0-11.433 
-	c-4.352,1.049-8.889,1.62-13.558,1.62s-9.205-0.571-13.557-1.62L 242.443,348.516 z M 188.312,294.388l 11.434,0 
-	c-1.050-4.352-1.62-8.889-1.62-13.558s 0.57-9.206, 1.62-13.558l-11.434,0 c-7.487,0-13.557,6.069-13.557,13.558
-	S 180.825,294.388, 188.312,294.388z M 213.346,46.956l-43.788,0 l0,43.788 l 43.788,0 L 213.346,46.956 z M 213.346,111.34l-43.788,0 l0,43.787 l 43.788,0 
-	L 213.346,111.34 z M 279.166,46.956l-43.79,0 l0,43.788 l 43.79,0 L 279.166,46.956 z M 279.166,111.34l-43.79,0 l0,43.787 l 43.79,0 L 279.166,111.34 z M 242.443,213.144l0,11.432 
-	c 4.352-1.049, 8.888-1.62, 13.557-1.62s 9.206,0.571, 13.558,1.62l0-11.432 c0-7.487-6.070-13.558-13.558-13.558
-	S 242.443,205.656, 242.443,213.144z M 256,250.070c-16.985,0-30.759,13.771-30.759,30.76c0,16.987, 13.773,30.758, 30.759,30.758
-	c 16.987,0, 30.759-13.771, 30.759-30.758C 286.759,263.842, 272.987,250.070, 256,250.070z M 344.112,46.956l-43.788,0 l0,43.788 l 43.788,0 
-	L 344.112,46.956 z M 344.112,111.34l-43.788,0 l0,43.787 l 43.788,0 L 344.112,111.34 z"  />
-<glyph unicode="&#xe08e;" d="M 88.871,182.914L 88.871,266.014L 420.955,266.014L 420.955,182.914L 88.871,182.914 	z"  />
-<glyph unicode="&#xe08f;" d="M 109.469,289.205l 24.132,23.979l 173.582,0 l0-48.212 l 89.521,73.884l-89.521,73.891l0-48.208 L 112.416,364.539 l-54.306-53.973l0-66.409 l 51.359,0 
-	L 109.469,289.205 z M 365.685,220.242l-10.965-10.896c 6.208,1.264, 12.628,1.932, 19.202,1.932c 15.503,0, 30.146-3.719, 43.122-10.268l0,64.275 
-	l-51.359,0 L 365.685,220.242 z M 322.457,196.26L 168.384,196.26 l0,48.201 l-89.519-73.887l 89.519-73.885l0,48.201 l 114.213,0.004
-	C 289.559,166.281, 303.831,184.385, 322.457,196.26z M 373.922,193.752c-43.356,0-78.504-35.152-78.504-78.508
-	c0-43.352, 35.147-78.504, 78.504-78.504c 43.357,0, 78.503,35.152, 78.503,78.504C 452.425,158.6, 417.279,193.752, 373.922,193.752z
-	 M 386.439,62.629L 365.49,62.629 l0,71.744 l-24.465,0 l0,13.916 c 6.44,0.293, 10.949,0.721, 13.524,1.291c 4.104,0.912, 7.443,2.725, 10.019,5.455
-	c 1.767,1.866, 3.104,4.352, 4.008,7.464c 0.526,1.862, 0.789,3.25, 0.789,4.157l 17.074,0 L 386.439,62.629 z"  />
-<glyph unicode="&#xe090;" d="M 126.692,258.226l 24.129,23.978l 173.583,0 l0-48.204 l 89.521,73.886l-89.521,73.885l0-48.207 L 178.96,333.57l-49.319,0 L 75.331,279.59
-	l0-66.409 l 51.362,0 L 126.693,258.226 z M 382.9,234.308l0-45.043 l-24.129-23.981L 185.606,165.284 l0,48.203 l-89.521-73.885l 89.521-73.889L 185.606,113.92 l 194.346,0 
-	l 54.312,53.979l0,66.409 L 382.9,234.308 z"  />
-<glyph unicode="&#xe091;" d="M 473.996,218.611L 381.178,311.429L 381.178,251.695L 293.15,251.695L 293.15,390.72L 210.051,390.72L 210.051,251.695L 129.032,251.695L 129.032,311.429L 36.213,218.607L 129.032,125.789L 129.032,185.529L 210.051,185.523L 210.051,58.182L 293.15,58.182L 293.15,185.523L 381.178,185.523L 381.178,125.789 z"  />
-<glyph unicode="&#xe092;" d="M 251.11,337.368l 0.468,73.222L 102.65,287.455l 147.352-124.717l 0.444,69.943c 147.146-19.949, 83.59-108.396-0.264-192.248
-	C 540.662,229.948, 367.872,317.25, 251.11,337.368z"  />
-<glyph unicode="&#xe093;" d="M 298.174,189.808l0-43.226 c0-35.787-29.010-64.801-64.801-64.801c-35.787,0-64.799,29.014-64.799,64.801L 168.574,301.418 
-	c0,35.79, 29.012,64.8, 64.799,64.8c 35.791,0, 64.801-29.011, 64.801-64.8l0-12.808 l-44.766,0 l 69.871-84.656l 69.873,84.656L 347.9,288.61 l0,12.808 
-	c0,63.15-51.377,114.527-114.527,114.527c-63.148,0-114.525-51.377-114.525-114.527l0-154.836 
-	c0-63.149, 51.377-114.527, 114.525-114.527c 63.15,0, 114.527,51.378, 114.527,114.527L 347.9,189.22 l-24.621-29.831L 298.174,189.808z"  />
-<glyph unicode="&#xe094;" d="M 168.528,223.998L 74.059,392.004L 108.084,392.004L 261.141,223.998L 108.086,55.996L 74.057,55.996 	zM 250.858,392.004L 284.883,392.004L 437.942,223.998L 284.885,55.996L 250.858,55.996L 345.325,223.998 	z"  />
-<glyph unicode="&#xe095;" d="M 261.312,401.359l 0.949-23.021L 250.57,378.338 l 0.935,23.021l-82.771,0 l-81.18-354.471l 153.19,0 l0,32.264 l 31.328,0 l0-32.264 L 425.25,46.888 
-	L 344.082,401.359L 261.312,401.359 z M 249.297,346.584l 14.221,0 l 1.097-27.012l-16.431,0 L 249.297,346.584z M 246.91,287.839l 18.997,0 l 1.421-34.501
-	l-21.826,0 L 246.91,287.839z M 244.227,221.596l 24.361,0 l 1.508-36.998l-27.391,0 L 244.227,221.596z M 240.744,110.883L 240.744,135.33 l 0.688,17.528
-	l 29.939,0 l 0.701-17.396l0-24.58 L 240.744,110.882 z"  />
-<glyph unicode="&#xe096;" d="M 463.605,240.656L 272.661,431.621c-4.545,4.572-10.562,6.851-16.547,6.851c-5.983,0-12.032-2.279-16.577-6.851L 48.59,240.656
-	c-9.153-9.147-9.153-23.982,0-33.127l 190.947-190.963c 4.545-4.581, 10.562-6.867, 16.577-6.867c 5.985,0, 11.968,2.286, 16.547,6.877
-	l 190.944,190.953C 472.766,216.674, 472.766,231.509, 463.605,240.656z M 447.749,223.387L 256.803,32.443
-	c-0.1-0.1-0.292-0.283-0.688-0.283c-0.424,0-0.618,0.184-0.718,0.273L 64.451,223.387c-0.393,0.396-0.393,1.025,0,1.41
-	L 255.396,415.739c 0.1,0.090, 0.294,0.297, 0.718,0.297c 0.396,0, 0.589-0.198, 0.688-0.297l 190.946-190.942
-	c 0.096-0.083, 0.294-0.292, 0.294-0.712C 448.043,223.682, 447.845,223.494, 447.749,223.387z M 98.361,224.084l 157.753-157.747
-	l 157.722,157.747L 256.114,381.845L 98.361,224.084z"  />
-<glyph unicode="&#xe097;" d="M 368.744,399.335c 2.058-18.558, 8.239-33.472, 18.476-43.668c 10.202-10.272, 25.114-16.436, 43.724-18.479
-	C 458.117,392.125, 466.72,435.1, 466.72,435.1S 423.714,426.529, 368.744,399.335z M 340.162,384.014
-	c-29.628-17.182-60.988-39.601-89.996-68.604c-18.54-18.577-33.452-36.562-45.487-53.472l-73.479-13.585l-86.334-86.365l 76.98-2.401
-	l 54.186,54.184c-19.098-39.636-20.799-65.894-20.799-65.894l 24.234-24.234c0,0, 27.143,2.588, 67.039,21.91l-55.331-55.298
-	l 2.419-76.974l 86.332,86.329l 13.636,73.837c 17.070,11.957, 35.091,26.773, 53.436,45.134c 29.006,29.003, 51.439,60.361, 68.607,89.993
-	c-18.934,3.824-36.296,11.741-50.033,25.408C 351.902,347.719, 343.955,365.066, 340.162,384.014z"  />
-<glyph unicode="&#xe098;" d="M 95.143,124.949c 33.239,0, 60.186-26.948, 60.186-60.186c0-33.235-26.947-60.188-60.186-60.188
-	c-33.242,0-60.188,26.952-60.188,60.188C 34.955,98.001, 61.901,124.949, 95.143,124.949zM 325.852,4.576l-85.258,0 c0,113.572-92.071,205.637-205.638,205.637l0,0l0,85.263 
-	C 195.618,295.476, 325.852,165.24, 325.852,4.576zM 386.041,4.576c0,193.9-157.187,351.084-351.086,351.084L 34.955,443.433 c 242.372,0, 438.855-196.482, 438.855-438.857L 386.041,4.576 z"  />
-<glyph unicode="&#xe099;" d="M 37.465,384.556L 473.737,64.83L 37.465,64.83 L 37.465,384.556  M 104.846,251.619l0-119.424 l 162.952,0 L 104.846,251.619L 104.846,251.619z"  />
-<glyph unicode="&#xe09a;" d="M 379.978,442.682L 37.23,99.947l 94.393-94.389l 342.749,342.724L 379.978,442.682z M 117.315,51.514l-45.864,45.871l 8.551,8.52
-	l 45.848-45.855L 117.315,51.514z M 127.652,101.663l-25.934,25.956l 8.501,8.533l 25.966-25.943L 127.652,101.663z M 157.899,131.904
-	l-25.95,25.965l 8.52,8.524l 25.965-25.958L 157.899,131.904z M 188.146,162.154l-25.963,25.965l 8.535,8.523l 25.964-25.957
-	L 188.146,162.154z M 218.396,192.402l-25.966,25.945l 8.536,8.539l 25.967-25.948L 218.396,192.402z M 268.562,202.742l-45.879,45.855
-	l 8.533,8.535l 45.865-45.876L 268.562,202.742z M 278.863,252.893l-25.934,25.939l 8.536,8.562l 25.947-25.974L 278.863,252.893z
-	 M 309.13,283.115l-25.969,25.971l 8.52,8.531l 25.981-25.931L 309.13,283.115z M 339.36,313.381l-25.965,25.955l 8.552,8.531
-	l 25.949-25.958L 339.36,313.381z M 369.61,343.646l-25.967,25.93l 8.535,8.54l 25.967-25.956L 369.61,343.646z M 373.893,399.821
-	l 8.555,8.522l 45.863-45.842l-8.535-8.547L 373.893,399.821z"  />
-<glyph unicode="&#xe09b;" d="M 169.555,400.772c-60.875,0-110.402-49.526-110.402-110.405c0-8.036, 6.516-14.552, 14.555-14.552
-		c 8.037,0, 14.553,6.516, 14.553,14.552c0,44.829, 36.467,81.302, 81.295,81.302c 44.826,0, 81.295-36.473, 81.295-81.302
-		c0-8.036, 6.514-14.552, 14.553-14.552c 8.037,0, 14.553,6.516, 14.553,14.552C 279.955,351.246, 230.432,400.772, 169.555,400.772zM 268.174,253.549L 69.715,253.549 c-6.1,0-11.049-4.947-11.049-11.049l0-38.675 c0-6.101, 4.949-11.050, 11.049-11.050l 198.459,0 
-		c 6.104,0, 11.049,4.949, 11.049,11.050L 279.223,242.5 C 279.223,248.602, 274.277,253.549, 268.174,253.549zM 93.699,69.872c 1.248-8.816, 8.791-15.368, 17.695-15.368L 226.5,54.504 c 8.902,0, 16.447,6.552, 17.693,15.368l 13.16,93.114L 80.537,162.986 
-		L 93.699,69.872zM 444.398,325.535L 352.070,325.535 c-4.934,0-8.934-4.001-8.934-8.935l0-101.263 c0-4.936, 4-8.935, 8.934-8.935l 92.328,0 
-		c 4.936,0, 8.936,3.999, 8.936,8.935L 453.334,316.601 C 453.334,321.534, 449.334,325.535, 444.398,325.535zM 420.387,176.56l-44.303,0 l0-76.498 c-5.512-5.61-8.924-13.289-8.924-21.757c0-17.138, 13.938-31.077, 31.074-31.077
-		c 17.133,0, 31.076,13.939, 31.076,31.077c0,8.468-3.412,16.146-8.924,21.757L 420.386,176.56 z M 398.234,63.305
-		c-8.27,0-14.998,6.728-14.998,15c0,8.271, 6.729,15.001, 14.998,15.001c 8.271,0, 15-6.729, 15-15.001
-		C 413.234,70.032, 406.506,63.305, 398.234,63.305z"  />
-<glyph unicode="&#xe09c;" d="M 110.866,127.468l0-118.48 l 65.93,0.001l0,62.069 c-18.937,12.035-36.691,26.263-52.913,42.544
-	C 119.371,118.102, 115.054,122.727, 110.866,127.468z M 458.552,297.646c-0.391,81.529-66.613,147.484-148.334,147.484
-	c-11.055,0-20.014-8.972-20.014-20.041c0-11.054, 8.959-20.030, 20.014-20.030c 29.988,0, 56.933-12.068, 76.588-31.687
-	c 19.49-19.541, 31.522-46.256, 31.688-76c-0.035-0.687, 0.064-4.009, 0.85-6.294c 2.616-8.683, 10.562-14.291, 19.195-14.291
-	c 1.896,0, 3.861,0.258, 5.755,0.851C 453.255,280.312, 458.944,288.72, 458.552,297.646z M 293.179,371.521
-	c-11.051,0.017-20.047-8.961-20.047-20.014c0-11.085, 8.961-20.048, 20.016-20.048c 28.548-0.062, 51.7-23.216, 51.734-51.732
-	c0-11.054, 8.992-20.031, 20.047-20.031c 11.083,0, 20.012,8.978, 20.012,20.031C 384.94,330.43, 343.868,371.486, 293.179,371.521z
-	 M 295.85,286.322l-192.38,0l-44.566,44.679C 58.71,175.474, 184.643,49.213, 340.172,49.020l-44.322,44.435L 295.85,286.322 z M 128.535,261.193
-	l 124.417,0 l-62.287-62.288L 128.535,261.193z M 208.412,181.114l 62.309,62.309l 0.001-124.777L 208.412,181.114z"  />
-<glyph unicode="&#xe09d;" d="M 390.631,435.503c-12.884-0.081-24.87-3.306-36.398-8.011c-11.479-4.809-22.221-11.024-31.393-20.081l-63.932-63.901
-	c-0.883-0.914-1.685-1.832-2.501-2.729c-0.833,0.896-1.653,1.814-2.521,2.729l-63.932,63.901
-	c-9.14,9.057-19.914,15.272-31.392,20.081c-11.546,4.705-23.513,7.93-36.398,8.011L 60.279,435.503 l0-51.149 l 61.886,0 
-	c 3.154,0.101, 10.351-1.32, 16.825-4.119c 6.541-2.613, 12.641-6.67, 14.782-8.979l 63.948-63.948c 2.306-2.152, 6.362-8.271, 8.994-14.778
-	c 2.763-6.408, 4.169-13.508, 4.119-16.713c0-0.029-0.016-0.078-0.016-0.127l0-68.641 l-80.414,0 l 103.908-103.91l 103.877,103.875l-76.212,0 
-	l0,68.676 c-0.099,3.186, 1.325,10.365, 4.106,16.84c 2.613,6.508, 6.685,12.626, 8.975,14.778l 63.949,63.948
-	c 2.158,2.309, 8.242,6.365, 14.797,8.979c 6.459,2.799, 13.653,4.22, 16.826,4.119l 61.871,0 L 452.5,435.503 L 390.631,435.503 z M 353.301,299.023
-	c 26.767-26.817, 40.094-61.629, 40.126-96.601c-0.032-35.306-13.278-70.359-40.126-97.241c-26.815-26.797-61.74-40.092-96.894-40.124
-	c-35.156,0.032-70.079,13.327-96.913,40.124c-26.814,26.865-40.107,61.855-40.126,97.059c 0.019,35.073, 13.343,69.966, 40.111,96.783
-	l-36.167,36.148c-36.627-36.625-55.137-84.893-55.12-132.932c-0.017-48.085, 18.379-96.486, 55.151-133.229
-	c 36.658-36.672, 84.958-55.149, 133.064-55.116l 0.113,0 c 48.025,0, 96.292,18.476, 132.932,55.116
-	c 36.821,36.824, 55.152,85.287, 55.136,133.411c 0.017,48.019-18.54,96.19-55.136,132.749L 353.301,299.023z"  />
-<glyph unicode="&#xe09e;" d="M 388.177,235.1c-2.354,28.221-13.505,53.924-30.772,74.33l-28.286-28.285l-15.663,15.631l 28.286,28.27
-	c-20.371,17.264-46.076,28.45-74.299,30.789l0-39.994 l-22.105,0 l0,39.994 c-28.221-2.339-53.926-13.525-74.329-30.789l 28.284-28.29
-	l-15.631-15.611l-28.284,28.285c-17.268-20.406-28.42-46.109-30.775-74.33l 40.029,0 l0-22.108 l-40.029,0 
-	c 2.355-28.222, 13.507-53.894, 30.775-74.314l 28.284,28.285l 15.631-15.633l-28.284-28.269c 20.403-17.278, 46.108-28.45, 74.329-30.789
-	l0,39.993 l 22.105,0 l0-39.993 c 28.223,2.339, 53.928,13.511, 74.299,30.789l-28.286,28.269l 15.631,15.633l 28.318-28.285
-	c 17.268,20.421, 28.419,46.093, 30.772,74.331l-39.993,0 L 348.184,235.1 L 388.177,235.1 z M 256.392,182.844c-22.762,0-41.206,18.439-41.206,41.203
-	c0,22.761, 18.444,41.202, 41.206,41.202c 22.758,0, 41.202-18.441, 41.202-41.202C 297.594,201.283, 279.149,182.844, 256.392,182.844z
-	 M 256.392,440.907c-119.788,0-216.846-97.093-216.846-216.86c0-119.754, 97.059-216.845, 216.846-216.845
-	c 119.751,0, 216.844,97.091, 216.844,216.845C 473.235,343.813, 376.143,440.907, 256.392,440.907z M 256.392,37.84
-	c-102.686,0-186.206,83.536-186.206,186.207c0,89.798, 63.867,164.949, 148.597,182.392l 37.609-47.678l 37.606,47.678
-	c 84.695-17.443, 148.596-92.594, 148.596-182.392C 442.594,121.376, 359.039,37.84, 256.392,37.84z"  />
-<glyph unicode="&#xe09f;" d="M 63.090-1.656l 385.094,0 l0,41.563 L 63.090,39.907 L 63.090-1.656 z M 459.139,449.822L 52.168,449.822 c-12.199,0-22.074-9.876-22.074-22.057l0-341.679 
-	c0-12.201, 9.875-22.072, 22.074-22.072l 406.971,0 c 12.184,0, 22.075,9.871, 22.075,22.072L 481.214,427.765 
-	C 481.214,439.946, 471.322,449.822, 459.139,449.822z M 95.84,295.324l 25.949,0 l0-78.13 L 95.84,217.194 L 95.84,295.324 z M 415.467,317.903l0-201.292 L 95.84,116.611 L 95.84,176.1 
-	l 25.949,0 l0-33.519 l 267.693,0 l0,228.66 L 121.789,371.241 l0-34.804 L 95.84,336.437 L 95.84,397.254 l 319.627,0 L 415.467,317.903 L 415.467,317.903z M 250.535,304.498
-	c 7.537,5.566, 16.414,9.376, 26.098,10.854l0-16.008 l 17.82,0 l0,16.008 c 9.647-1.478, 18.543-5.288, 26.064-10.854l-11.281-11.257l 12.59-12.617
-	l 11.282,11.301c 5.558-7.557, 9.386-16.419, 10.823-26.089l-15.957,0 l0-17.825 l 15.957,0 c-1.438-9.669-5.266-18.546-10.823-26.103
-	l-11.282,11.307l-12.59-12.59l 11.281-11.307c-7.521-5.553-16.417-9.354-26.064-10.806l0,15.97 l-17.82,0 l0-15.97 
-	c-9.684,1.452-18.561,5.253-26.098,10.806l 11.283,11.307l-12.592,12.59l-11.281-11.307c-5.558,7.557-9.367,16.434-10.826,26.103
-	l 15.963,0 l0,17.825 l-15.976,0 c 1.472,9.669, 5.281,18.532, 10.839,26.089l 11.281-11.301l 12.592,12.617L 250.535,304.498z M 285.529,235.343
-	c 11.902,0, 21.582,9.675, 21.582,21.58c0,11.914-9.68,21.561-21.582,21.561c-11.906,0-21.568-9.647-21.568-21.561
-	C 263.961,245.018, 273.623,235.343, 285.529,235.343z"  />
-<glyph unicode="&#xe0a0;" d="M 293.803,229.98l-64.785-64.762L 463.1,142.803l-22.402,234.091l-63.539-63.547c-36.348,25.028-79.562,39.056-124.348,39.161
-	c-37.917,0.057-77.537-10.596-111.611-34.809c-10.58-7.456-20.488-16.197-29.562-26.066c 11.625,4.024, 23.954,6.052, 36.641,5.971
-	C 194.747,297.404, 245.468,272.785, 293.803,229.98z M 164.303,69.279l0,35.424 c0,43.781, 8.699,73.252, 19.409,92.192
-	c 10.875,18.97, 23.234,28.682, 37.492,34.859c 7.047,2.946, 14.684,4.844, 22.795,5.65c-34.208,23.274-67.579,35.41-95.72,35.262
-	c-29.038-0.238-52.666-11.643-71.159-38.472c-3.499-5.161-6.802-10.941-9.811-17.327c-0.818-2.299-1.618-4.586-2.371-6.924
-	c-10.137-30.984-15.303-66.023-15.303-105.242l0-35.424 L 164.303,69.277 z"  />
-<glyph unicode="&#xe0a1;" d="M 452.418,353.745l-67.577,0 L 384.841,427.381 L 125.674,427.381 l0-73.636 L 58.046,353.745 c-11.745,0-21.272-9.526-21.272-21.271L 36.774,151.85 l 88.9,0 l0-30.775 
-	l 98.66-98.659l 160.507,0 L 384.841,150.826 l 88.851,0 L 473.692,332.475 C 473.691,344.219, 464.164,353.745, 452.418,353.745z M 150.718,402.341l 209.087,0 l0-48.596 
-	L 150.718,353.745 L 150.718,402.341 z M 409.609,185.594l-24.769,0 l0,49.516 l-25.036,0 l0-187.654 L 257.098,47.456 c-37.202,0-19.275,88.18-19.275,88.18
-	s-86.003-20.9-87.108,18.533l0,80.941 l-25.040,0 l0-48.492 l-24.811,0 l0,84.357 l 308.746,0 L 409.61,185.594 z M 427.482,301.588
-	c-9.4,0-17.016,7.616-17.016,17.014c0,9.396, 7.615,17.014, 17.016,17.014c 9.394,0, 17.013-7.617, 17.013-17.014
-	C 444.495,309.204, 436.876,301.588, 427.482,301.588z M 330.146,231.656L 186.215,231.656 l0-25.047 l 143.932,0 L 330.147,231.656 z M 186.217,157.499l 143.928,0 
-	l0,25.036 L 186.217,182.535 L 186.217,157.499 z"  />
-<glyph unicode="&#xe0a2;" d="M 453.938,433.712c-22.468,0-69.558-26.553-125.968-70.982l-2.452-1.912l-2.814,1.341
-		c-20.569,9.876-43.557,15.093-66.479,15.093c-41.009,0-79.532-15.958-108.506-44.946c-46.076-46.015-58.045-116.353-29.857-175.021
-		l 1.342-2.814l-1.93-2.434c-61.905-78.599-78.777-124.581-68.051-135.308c 1.928-1.958, 5.067-2.925, 9.353-2.925
-		c 21.681,0, 66.156,24.643, 119.852,66.172c-4.971,2.668-9.746,5.592-14.392,8.767c-18.148-10.632-32.308-16.044-42.119-16.044
-		c-5.199,0-9.32,1.489-12.263,4.43c-8.894,8.899-4.543,27.604, 13.278,57.199l 3.89,6.506l 4.448-6.178
-		c 4.971-7.020, 10.532-13.557, 16.449-19.479c 5.169-5.147, 10.793-10.021, 16.774-14.5c 33.39,20.633, 75.938,55.954, 117.434,97.42
-		c 41.5,41.498, 76.785,84.073, 97.386,117.43c-4.448,5.967-9.322,11.592-14.487,16.792c-5.918,5.901-12.46,11.43-19.457,16.431
-		l-6.179,4.415l 6.506,3.924c 19.489,11.739, 34.598,17.691, 44.898,17.691c 5.2,0, 9.354-1.505, 12.265-4.416
-		c 8.633-8.613, 4.84-26.42-11.61-54.396c 3.176-4.63, 6.116-9.437, 8.797-14.373c 57.981,74.853, 73.712,118.738, 63.246,129.169
-		C 461.361,432.731, 458.22,433.712, 453.938,433.712L 453.938,433.712z M 397.984,282.858c-27.403-34.109-60.171-70.469-95.259-105.579
-		c-35.093-35.071-71.421-67.872-105.561-95.244c 18.606-7.714, 38.88-11.785, 59.157-11.785c 40.974,0, 79.531,15.958, 108.503,44.928
-		C 408.94,159.275, 421.793,225.759, 397.984,282.858L 397.984,282.858z"  />
-<glyph unicode="&#xe0a3;" d="M 380.295,384.908l-68.479,0 c 0.068,1.113, 0.097,2.209, 0.097,3.321c0,30.805-24.948,55.743-55.722,55.743
-	c-30.803,0-55.756-24.938-55.756-55.743c0-1.112, 0.065-2.208, 0.098-3.321l-68.446,0 l0-57.766 l 248.208,0 L 380.295,384.908 z M 256.191,363.148
-	c-13.865,0.033-25.049,11.232-25.079,25.081c 0.030,13.862, 11.214,25.081, 25.079,25.1c 13.834-0.019, 25.083-11.237, 25.083-25.1
-	C 281.274,374.381, 270.025,363.182, 256.191,363.148z M 405.244,349.361l0-48.676 L 107.172,300.685 l0,48.676 L 79.537,349.361 l0-345.078 l 353.307,0 L 432.844,349.361 
-	L 405.244,349.361 z"  />
-<glyph unicode="&#xe0a4;" d="M 83.642,428.045L 181.191,428.045L 261.016,291.254L 336.387,428.045L 429.505,428.045L 314.211,218.092L 429.505,20.084L 336.387,20.084L 261.016,149.373L 181.191,20.084L 83.642,20.084L 216.663,218.092 z"  />
-<glyph unicode="&#xe0a5;" d="M 148.584,224.484L 360.168,391.417L 360.166,57.555 z"  />
-<glyph unicode="&#xe0a6;" d="M 470.164,361.355L 42.296,361.355 l 212.806-182.021L 470.164,361.355z M 255.018,146.459L 36.735,333.166l0-245.924 l 436.665,0 L 473.4,331.296 
-	L 255.018,146.459z"  />
-<glyph unicode="&#xe0a7;" d="M 404.84,233.427l-22.084,0 l-0.002,73.603c0,36.675-13.921,70.311-36.917,94.892c-22.91,24.584-55.547,40.367-91.539,40.336
-	c-36.003,0.031-68.643-15.752-91.55-40.336c-23.001-24.582-36.918-58.217-36.925-94.892l0-73.603 l-22.082,0 
-	c-9.16,0-16.585-7.421-16.585-16.583l0-194.531 c0-9.158, 7.425-16.585, 16.585-16.585L 404.84,5.728 c 9.162,0, 16.586,7.427, 16.586,16.585
-	L 421.426,216.844 C 421.426,226.005, 414.002,233.427, 404.84,233.427z M 186.827,307.029c0,21.167, 8.012,39.893, 20.468,53.219
-	c 12.552,13.316, 28.896,20.982, 47.003,21.007c 18.095-0.025, 34.438-7.685, 46.987-21.007c 12.455-13.326, 20.467-32.052, 20.467-53.219
-	l0-73.603 L 186.827,233.426 L 186.827,307.029 z"  />
-<glyph unicode="&#xe0a8;" d="M 117.535,242.113L 82.61,242.113 L 82.61,84.070 l 225.118,0 l0,36.139 L 117.535,120.209 L 117.535,242.113 z M 179.864,303.197l-37.38,0 l0-61.084 l-0.031,0 l0-96.962 l 165.275,0 
-			l0,0.015 l 59.812,0 L 367.54,181.32 L 179.864,181.32 L 179.864,303.197 z M 204.817,364.282l0-61.085 l0,0l0-96.944 L 367.54,206.253 l0,0l 62.36,0 L 429.9,364.282 L 204.817,364.282 z"  />
-<glyph unicode="&#xe0a9;" d="M 421.553,223.994c0-91.873-74.479-166.354-166.354-166.354c-91.869,0-166.352,74.48-166.352,166.354
-	c0,91.873, 74.482,166.351, 166.352,166.351C 347.073,390.345, 421.553,315.867, 421.553,223.994z"  />
-<glyph unicode="&#xe0aa;" d="M 131.829,438.055L 377.26,438.055L 377.26,367.596L 131.829,367.596zM 451.73,342.204L 57.359,342.204 c-11.747,0-21.273-9.526-21.273-21.274l0-156.501 l 64.086,0 l0,95.006 l 308.749,0 l0-95.006 l 64.083,0 L 473.004,320.93 
-	C 473.004,332.678, 463.477,342.204, 451.73,342.204z M 426.791,290.045c-9.396,0-17.012,7.62-17.012,17.017s 7.616,17.014, 17.012,17.014
-	c 9.398,0, 17.016-7.617, 17.016-17.014S 436.189,290.045, 426.791,290.045zM 359.115,223.566l0-187.652 L 256.407,35.914 c-37.201,0-19.274,88.177-19.274,88.177s-86-20.897-87.106,18.534l0,80.941 l-25.039,0 l0-114.032 
-	l 7.333-7.336l 91.326-91.326l 160.506,0 L 384.153,223.566 L 359.115,223.566 z"  />
-<glyph unicode="&#xe0ab;" d="M 437.545,419.838c-12.654-4.859-26.52-10.547-37.246-19.087l-74.985-63.44L 95.29,385.938l-28.026-27.646l 177.113-100.969
-	L 155.56,149.9l-70.245,21.483l-29.921-27.927l 66.778-33.946l-5.952-7.177c-3.208-3.221-3.010-13.392, 0.032-17.053
-	c 3.629-3.072, 13.866-3.289, 17.102-0.036l 7.358,5.937l 34.14-67.148l 27.928,29.884l-21.485,70.080l 107.685,86.99l 98.664-173.076
-	l 27.63,28.058l-47.581,225.2l 64.686,77.31c 8.436,10.773, 14.159,24.643, 19.13,37.265C 456.479,418.348, 450.204,424.707, 437.545,419.838z
-	 M 116.546,84.938c-0.1,0.112-0.195,0.228-0.293,0.343c-0.1,0.080-0.195,0.18-0.327,0.26L 116.546,84.938z"  />
-<glyph unicode="&#xe0ac;" d="M 438.801,129.025c 1.684,6.474, 2.584,13.31, 2.584,20.338c0,44.345-35.955,80.33-80.315,80.33
-	c-33.356,0-61.935-20.354-74.103-49.294c-10.398,12.263-25.932,20.041-43.296,20.041c-31.393,0-56.837-25.438-56.837-56.849
-	c0-5.393, 0.769-10.611, 2.16-15.58c-25.638-9.39-43.92-34.009-43.92-62.936c0-36.972, 29.973-66.988, 66.991-66.988L 418.59-1.913 
-	c 37.053,0, 67.025,30.017, 67.025,66.988C 485.615,95.078, 465.943,120.439, 438.801,129.025z M 210.118,383.588
-	c 10.662,0, 19.295,8.635, 19.295,19.313L 229.413,430.695 c0,10.646-8.633,19.298-19.295,19.298c-10.628,0-19.261-8.651-19.261-19.298l0-27.794 
-	C 190.857,392.223, 199.49,383.588, 210.118,383.588z M 306.228,343.774c 4.937,0, 9.895,1.896, 13.64,5.655l 19.684,19.673
-	c 7.523,7.52, 7.523,19.734,0,27.254c-7.52,7.558-19.75,7.558-27.273,0l-19.685-19.649c-7.523-7.519-7.523-19.751,0-27.277
-	C 296.352,345.67, 301.305,343.774, 306.228,343.774z M 100.403,349.43c 3.76-3.76, 8.699-5.655, 13.636-5.655
-	c 4.941,0, 9.879,1.896, 13.64,5.655c 7.535,7.526, 7.535,19.759,0,27.277l-19.654,19.649c-7.523,7.558-19.754,7.558-27.306,0
-	c-7.488-7.52-7.488-19.734,0-27.254L 100.403,349.43z M 326.766,266.978c0-6.005, 2.715-11.365, 6.998-14.897
-	c 8.779,2.338, 17.937,3.579, 27.306,3.579c 8.798,0, 17.364-1.092, 25.538-3.137c 4.010,3.528, 6.542,8.684, 6.542,14.44
-	c0,10.655-8.647,19.291-19.295,19.291l-27.794,0 C 335.396,286.254, 326.766,277.618, 326.766,266.978z M 183.663,200.572
-	c-26.389,10.531-44.998,36.266-44.998,66.391c0,39.501, 31.982,71.515, 71.488,71.515c 39.47,0, 71.484-32.014, 71.484-71.515
-	c0-16.499-5.624-31.694-15.009-43.793c 4.575-1.309, 9.024-3.024, 13.292-5.102c 7.078,8.356, 15.388,15.532, 24.576,21.32
-	c 2.566,8.752, 3.989,18.019, 3.989,27.574c0,54.229-44.115,98.348-98.333,98.348c-54.222,0-98.336-44.118-98.336-98.348
-	c0-39.276, 23.155-73.224, 56.542-88.972C 172.2,186.352, 177.383,193.967, 183.663,200.572z M 100.403,184.503l-19.685-19.672
-	c-7.523-7.521-7.523-19.719,0-27.271c 3.76-3.76, 8.713-5.626, 13.634-5.626c 4.957,0, 9.893,1.866, 13.672,5.626l 19.654,19.688
-	c 7.535,7.52, 7.535,19.715,0,27.255C 120.156,192.039, 107.928,192.039, 100.403,184.503z M 93.52,266.963
-	c0,10.655-8.651,19.291-19.31,19.291L 46.414,286.254 c-10.646,0-19.296-8.636-19.296-19.276c0-10.647, 8.65-19.281, 19.296-19.281L 74.21,247.697 
-	C 84.869,247.697, 93.52,256.3, 93.52,266.963z"  />
-<glyph unicode="&#xe0ad;" d="M 180.938,313.21L 180.938,396.312L 449.199,396.312L 449.199,313.21L 180.938,313.21 	zM 180.935,182.209L 180.935,265.307L 449.199,265.307L 449.199,182.209L 180.935,182.209 	zM 180.938,51.204L 180.938,134.304L 449.199,134.304L 449.199,51.204L 180.938,51.204 	zM 65.94,372.326L 65.94,384.355 c 5.566,0.25, 9.463,0.621, 11.689,1.119c 3.544,0.782, 6.433,2.354, 8.659,4.713
-			c 1.524,1.609, 2.679,3.761, 3.463,6.448c 0.454,1.61, 0.68,2.809, 0.68,3.594l 14.758,0 l0-89.908 L 87.084,310.321 l0,62.005 L 65.94,372.326 zM 65.257,195.379c 2.521,5.994, 8.474,12.338, 17.858,19.038c 8.142,5.827, 13.413,10.002, 15.811,12.523
-			c 3.679,3.927, 5.519,8.226, 5.519,12.897c0,3.804-1.055,6.964-3.162,9.49c-2.109,2.518-5.126,3.778-9.054,3.778
-			c-5.375,0-9.032-2.005-10.975-6.013c-1.117-2.314-1.777-5.995-1.984-11.038L 62.094,236.054 c 0.29,7.648, 1.676,13.828, 4.16,18.541
-			c 4.717,8.97, 13.096,13.454, 25.138,13.454c 9.518,0, 17.090-2.633, 22.719-7.904c 5.626-5.271, 8.441-12.246, 8.441-20.925
-			c0-6.656-1.988-12.567-5.964-17.734c-2.609-3.433-6.895-7.256-12.86-11.474l-7.083-5.021c-4.431-3.144-7.464-5.417-9.097-6.823
-			c-1.634-1.406-3.007-3.037-4.124-4.897l 39.251,0 l0-15.564 L 61.102,177.707 C 61.268,184.156, 62.654,190.049, 65.257,195.379zM 77.846,77.902c0-3.598, 0.577-6.574, 1.731-8.93c 2.144-4.34, 6.042-6.512, 11.691-6.512c 3.464,0, 6.485,1.187, 9.062,3.565
-			c 2.578,2.377, 3.868,5.796, 3.868,10.263c0,5.91-2.391,9.859-7.171,11.844c-2.722,1.115-7.008,1.675-12.858,1.675l0,12.647 
-			c 5.726,0.084, 9.721,0.64, 11.988,1.674c 3.914,1.737, 5.869,5.251, 5.869,10.541c0,3.433-0.999,6.224-2.998,8.374
-			c-2.001,2.147-4.816,3.223-8.443,3.223c-4.164,0-7.226-1.325-9.184-3.968c-1.959-2.647-2.896-6.18-2.813-10.605L 62.094,111.693 
-			c 0.165,4.466, 0.929,8.703, 2.292,12.713c 1.445,3.514, 3.716,6.759, 6.814,9.734c 2.311,2.107, 5.058,3.72, 8.236,4.839
-			c 3.18,1.115, 7.083,1.672, 11.708,1.672c 8.589,0, 15.517-2.222, 20.782-6.665c 5.265-4.444, 7.896-10.408, 7.896-17.889
-			c0-5.293-1.57-9.759-4.711-13.395c-1.985-2.275-4.052-3.824-6.201-4.651c 1.613,0, 3.928-1.384, 6.944-4.153
-			c 4.505-4.175, 6.76-9.879, 6.76-17.115c0-7.605-2.633-14.292-7.897-20.058c-5.268-5.766-13.061-8.648-23.384-8.648
-			c-12.72,0-21.56,4.152-26.513,12.463c-2.603,4.421-4.048,10.208-4.337,17.362L 77.846,77.902 z"  />
-<glyph unicode="&#xe0ae;" d="M 111.708,55.486l 211.581,166.927L 111.708,389.346L 111.708,55.486 z M 330.935,392.689l0-332.544 l 66.173,0 L 397.108,392.689 L 330.935,392.689 z"  />
-<glyph unicode="&#xe0af;" d="M 49.523,353.17l0-258.34 l 412.953,0 L 462.476,353.17 L 49.523,353.17 z M 293.543,167.67L 148.277,167.67 l0,23.678 l 145.266,0 L 293.543,167.67 z M 293.543,223.645L 148.277,223.645 
-		l0,23.678 l 145.266,0 L 293.543,223.645 z M 424.5,264.824l-50.371,0 l0,50.371 L 424.5,315.195 L 424.5,264.824 z"  />
-<glyph unicode="&#xe0b0;" d="M 256.281,431.449c-59.443,0-107.625-48.182-107.625-107.62c0-59.44, 107.625-254.112, 107.625-254.112
-		S 363.9,264.388, 363.9,323.829C 363.9,383.267, 315.715,431.449, 256.281,431.449z M 256.281,291.125
-		c-18.062,0-32.705,14.641-32.705,32.704c0,18.057, 14.643,32.697, 32.705,32.697c 18.057,0, 32.697-14.641, 32.697-32.697
-		C 288.979,305.765, 274.338,291.125, 256.281,291.125zM 333.641,169.879c-0.865-1.815-1.701-3.591-2.592-5.451c-3.561-7.417-7.121-14.713-10.631-21.8
-		c 49.764-8.242, 84.123-25.717, 84.123-45.959c0-28.174-66.504-51.012-148.541-51.012c-82.035,0-148.541,22.838-148.541,51.012
-		c0,20.315, 34.594,37.843, 84.641,46.046c-3.496,7.062-7.045,14.328-10.586,21.713c-0.91,1.896-1.764,3.706-2.643,5.556
-		c-56.672-10.751-100.518-34.52-100.518-73.314c0-55.347, 89.225-80.118, 177.646-80.118c 88.426,0, 177.646,24.771, 177.646,80.118
-		C 433.646,135.349, 390.062,159.085, 333.641,169.879z"  />
-<glyph unicode="&#xe0b1;" d="M 437.375,144.18L 72.363,144.18 l-27.084-52.807l 419.179,0 L 437.375,144.18z M 209.173,104.047l 11.253,21.395l 69.995,0 l 10.146-21.395
-	L 209.173,104.047 z M 431.113,156.387c0,0.334-0.066,0.65-0.1,0.975c 0.033,0.33, 0.1,0.645, 0.1,0.973L 431.113,376.777 
-	c0,5.539-4.491,10.028-10.033,10.028L 88.653,386.805 c-5.539,0-10.029-4.489-10.029-10.028l0-218.443 c0-0.328, 0.067-0.643, 0.099-0.973
-	c-0.031-0.324-0.099-0.641-0.099-0.975l-0.085-0.162l 352.658,0 L 431.113,156.387z M 406.073,173.342l-302.41,0 L 103.663,361.77 l 302.41,0 L 406.073,173.342 z
-	 M 470.637,79.323L 39.101,79.323 l-1.046-2.036c0-5.542, 4.492-15.041, 10.030-15.041l 413.565,0 c 5.541,0, 10.033,9.499, 10.033,15.041
-	L 470.637,79.323z"  />
-<glyph unicode="&#xe0b2;" d="M 256.004,333.468c 26.324,0, 47.664,21.339, 47.664,47.66c0,26.323-21.34,47.664-47.664,47.664S 208.34,407.452, 208.34,381.128
-	C 208.34,354.807, 229.68,333.468, 256.004,333.468z M 49.525,208.118l0-98.662 l 41.977,0 l 16.445-90.249l 296.105,0 l 16.445,90.249l 41.977,0 
-	l0,98.662 L 49.525,208.118 z M 223.764,283.727c 0.16-0.515, 0.281-1.043, 0.299-1.59c0,0,0,0,0-4.771l0-0.014 l-0.004,0.012
-	c0-10.362-0.523-25.816-2.611-45.43l 69.102,0 c-2.086,19.613-2.611,35.067-2.611,45.43c0,4.796,0,4.796,0,4.796
-	c 0.008,0.262, 0.064,0.514, 0.111,0.767l 36.145-50.992l 40.629,0 l-54.791,77.304c-2.895,4.201-6.293,6.775-9.893,8.766
-	c-3.873,2.038-8.070,3.453-13.395,3.511c-0.629,0-1.135-0.024-1.551-0.051l-29.188-1.819l-30.045,1.87
-	c-0.537,0.041-1.143,0.049-1.529,0.049c-5.338-0.059-9.555-1.48-13.428-3.534c-3.607-2.015-7-4.612-9.881-8.844l-0.004,0.001
-	l-54.059-77.253l 40.455,0 L 223.764,283.727z"  />
-<glyph unicode="&#xe0b3;" d="M 444.769,320.467c-9.81,9.565-17.87,23.395-17.87,30.719c0,7.331-11.232,13.313-24.934,13.313L 111.1,364.499 
-	c-13.719,0-24.937-5.982-24.937-13.313c0-7.324-8.046-21.154-17.854-30.719c0,0-36.187-35.172-36.187-96.406
-	c0-61.234, 36.187-96.438, 36.187-96.438c 9.809-9.532, 17.854-23.363, 17.854-30.688c0-7.324, 11.218-13.329, 24.937-13.329l 290.865,0 
-	c 13.701,0, 24.934,6.005, 24.934,13.329c0,7.325, 8.061,21.156, 17.87,30.688c0,0, 36.171,35.203, 36.171,96.438
-	C 480.939,285.295, 444.769,320.467, 444.769,320.467z M 307.406,234.117l0-20.765 l-31.295,0 l-3.27-6.342l0-10.072 l 34.564,0 l0-20.802 l-34.564,0 
-	l0-30.165 l-33.257,0 l0,30.165 l-34.338,0 l0,20.802 l 34.338,0 L 239.584,207.010 l-3.059,6.342l-31.279,0 l0,20.765 l 20.782,0 l-33.469,68.020l 35.431,0 l 28.875-68.020
-	l 28.224,68.020l 35.414,0 l-33.879-68.020L 307.406,234.117 z"  />
-<glyph unicode="&#xe0b4;" d="M 255.851,325.777c 3.791,0, 4.708,1.416, 4.708,1.416s-0.395,11.29-4.708,11.29c-4.349,0-4.71-11.29-4.71-11.29
-			S 252.023,325.777, 255.851,325.777z M 236.721,334.741c 2.32,0, 6.114,1.029, 8.434,2.281c 2.356,1.278, 4.188,4.425, 4.154,7.029
-			c-0.034,2.603-1.505,5.755-3.303,7.035c-1.767,1.266-5.69,1.505-8.732,0.479c-3.074-1.002-5.886-3.68-6.311-5.978
-			c-0.394-2.261-0.23-5.644, 0.393-7.504C 231.979,336.25, 234.397,334.741, 236.721,334.741z M 266.512,337.021
-			c 2.354-1.252, 6.115-2.281, 8.436-2.281c 2.355,0, 4.743,1.509, 5.397,3.342c 0.589,1.86, 0.783,5.243, 0.358,7.504
-			c-0.424,2.298-3.204,4.976-6.278,5.978c-3.043,1.026-6.997,0.787-8.765-0.479c-1.768-1.28-3.237-4.432-3.304-7.035
-			C 262.326,341.447, 264.189,338.299, 266.512,337.021z M 162.226,289.603l 60.466,0 c 26.129-8.018, 60.302-15.623, 99.641-17.591
-			c-0.161,4.118, 0.361,11.025, 0.95,17.591l 29.233,0 c 23.318,0, 48.171,13.866, 55.235,30.819c 7.028,16.973-4.939,10.826-26.589,6.66
-			c-21.615-4.183-49.607,38.551-62.101,54.332c-12.558,15.768-40.909,43.843-63.113,43.843c-22.172,0-50.754-26.807-63.54-41.008
-			c-12.788-14.184-41.17-56.719-63.081-53.852c-21.912,2.878-33.030,7.737-24.658-9.491
-			C 113.009,303.691, 138.941,289.603, 162.226,289.603z M 255.851,393.104c 21.812,0, 35.349-16.139, 35.349-27.086
-			c0-10.973-4.149-17.39-5.231-20.584c-2.191-6.492, 0.426-9.656, 0.426-9.656s-0.784-6.689-2.909-9.647
-			c-2.126-2.967-12.559,1.97-12.559-9.175c0,0-3.99-2.993-14.977-2.993c-10.988,0-15.208,2.993-15.208,2.993
-			c0,11.145-10.432,6.208-12.558,9.175c-2.125,2.958-2.876,9.647-2.876,9.647s 2.583,3.164, 0.425,9.656
-			c-1.081,3.194-5.265,9.611-5.265,20.584C 220.468,376.965, 234.006,393.104, 255.851,393.104z M 440.387,78.418
-			c-6.148,17.812-26.489,20.363-43.494,27.529c-18.671,7.87-39.34,17.006-57.981,24.653c-5.296,1.436-10.629,2.892-15.925,4.341
-			c-6.343,4.373-12.559,18.869-15.956,26.094c-3.403,0.475-6.771,0.957-10.173,1.455c 0.555,11.135, 7.457,11.747, 10.173,20.274
-			c 2.386,7.517, 0.261,17.304, 4.054,24.251c 2.617,4.838, 8.566,4.887, 11.543,9.025c 2.681,3.762, 4.48,10.316, 5.332,14.936
-			c 1.24,6.833, 2.29,15.739, 0.523,23.315c-8.176,0.28-16.191,0.771-23.94,1.479l-5.297-17.977
-			c-2.028-6.776-9.418-11.618-16.447-10.751l-12.362,1.536c-6.999,0.872-12.853,7.368-12.982,14.448l-0.295,18.396
-			c0,0.474, 0.096,0.897, 0.131,1.357c-31.852,6.549-57.392,15.542-74.396,22.514c 0.554-4.454, 1.34-9.148, 2.387-14.118
-			c 1.864-8.723-4.775-12.617-4.348-17.379c 0.947-10.421, 1.143-35.473, 10.986-41.646c 0.916-0.577, 7.915-2.323, 7.847-1.85
-			c 0.982-10.139, 1.963-20.273, 2.91-30.418c 2.453-6.754, 8.374-7.488, 10.075-17.021l-7.556-1.827
-			c-3.401-7.225-9.613-21.721-15.924-26.094c-5.333-1.449-10.628-2.905-15.992-4.341c-18.607-7.647-39.275-16.783-57.948-24.653
-			c-17.005-7.166-37.345-9.718-43.46-27.529c0-12.105-1.176-40.676-0.851-56.53l 370.186,0 
-			C 441.529,37.742, 440.387,66.312, 440.387,78.418z"  />
-<glyph unicode="&#xe0b5;" d="M 189.307,312.375c 34.041,0, 61.675,27.586, 61.675,61.667c0,34.046-27.634,61.654-61.675,61.654
-	c-34.076,0-61.677-27.608-61.677-61.654C 127.629,339.961, 155.23,312.375, 189.307,312.375z M 371.813,165.123
-	c 24.494,0, 44.345,19.852, 44.345,44.344c0,24.489-19.851,44.334-44.345,44.334c-24.493,0-44.31-19.845-44.31-44.334
-	C 327.504,184.975, 347.32,165.123, 371.813,165.123z M 412.951,146.533c-6.475,6.441-14.127,10.305-41.825,10.305
-	c-27.666,0-33.355-7.295-41.27-10.305l-40.255-12.035c-0.229,7.424-4.547,137.281-17.17,149.939
-	c-13.047,13.028-28.514,20.855-84.502,20.855c-55.983,0-71.060-8.476-83.454-20.855c-12.361-12.364-8.174-144.273-8.174-144.273
-	l 27.372,65.048l 17.2-193.753l 49.641,99.142l 46.339-99.142l 16.383,193.753l 36.233-70.762l-0.458-0.149l 50.329-13.096l 8.534-109.746
-	L 372.4,60.52l 22.957-49.061l 8.078,95.873l 13.571-32.189C 417.007,75.143, 419.394,140.091, 412.951,146.533z"  />
-<glyph unicode="&#xe0b6;" d="M 460.993,96.058c-6.836,19.816-29.469,22.662-48.377,30.633c-20.76,8.755-43.783,18.92-64.498,27.416
-	c-5.908,1.611-11.824,3.226-17.736,4.84c-7.055,4.855-13.967,20.996-17.74,29.019c-3.758,0.538-7.52,1.076-11.287,1.61
-	c 0.582,12.418, 8.27,13.084, 11.287,22.571c 2.662,8.366, 0.279,19.242, 4.498,26.988c 2.926,5.379, 9.543,5.416, 12.85,10.026
-	c 3.002,4.187, 4.977,11.484, 5.912,16.608c 1.707,9.367, 3.195,22.185-1.254,31.477c-2.557,5.337-4.172,5.85-4.883,12.329
-	c-0.867,7.854, 2.316,33.466, 2.445,39.004c 0.322,14.369-0.023,15.532-3.502,29.527c0,0-4.223,12.681-10.838,16.5l-13.195,2.271
-	l-8.154,7.556c-32.855,20.216-68.082,6.037-86.947-1.609c-25.795-8.374-42.572-32.787-33.965-83.85
-	c 2.875-0.402, 5.098-2.847, 5.098-5.837l0-64.401 c 1.121-1.615, 2.396-2.962, 3.885-3.895c 1.018-0.639, 8.787-2.586, 8.736-2.054
-	c 0.787-8.232, 1.57-16.47, 2.352-24.706l 10.543-10.096l 25.736,0 c 1.273,5.899, 6.418,10.317, 12.58,10.317l 19.506,0 
-	c 7.117,0, 12.887-5.895, 12.887-13.163c0-7.27-5.77-13.161-12.887-13.161l-19.506,0 c-3.711,0-7.041,1.606-9.395,4.167l-33.676,0 
-	l-32.602,31.22l0,6.372 l-0.141,0.138l0,81.060 c0,5.231-4.242,9.472-9.473,9.472c-5.229,0-9.471-4.241-9.471-9.472l0-8.064 L 132.46,306.871 l0-61.386 
-	l 17.322,0 l0-19.577 l 44.338-43.401l 2.703,0 c-3.934-8.416-9.52-19.651-15.205-23.562c-5.912-1.614-11.828-3.229-17.736-4.84
-	c-20.715-8.495-43.736-18.66-64.498-27.416c-18.906-7.971-41.541-10.817-48.377-30.633c0-13.46-1.268-45.25-0.92-62.885l 411.826,0 
-	C 462.261,50.808, 460.993,82.598, 460.993,96.058z"  />
-<glyph unicode="&#xe0b7;" d="M 475.189,224.695L 385.672,298.584L 385.672,250.38L 124.052,250.38L 124.052,298.584L 34.533,224.699L 124.052,150.809L 124.052,199.018L 385.672,199.018L 385.672,150.809 z"  />
-<glyph unicode="&#xe0b8;" d="M 255.521,70.114L 37.191,255.897L 37.191,3.444L 473.856,3.444L 473.856,255.901 z"  />
-<glyph unicode="&#xe0b9;" d="M 404.368,124.68l-0.198,0.375l-0.227,0.373L 332.719,245.15c-9.127,16.909-17.106,48.19-17.106,67.237l0,55.3 l 15.029,0 L 330.642,397.608 
-	L 180.883,397.608 l0-29.921 l 17.547,0 l0-55.3 c0-19.001-7.932-50.157-17.054-67.106l-73.581-119.529l-0.31-0.54l-0.311-0.532
-	c-9.683-17.678-10.236-36.248-1.539-50.977c 8.734-14.689, 25.28-23.134, 45.423-23.134l 209.424,0 c 20.141,0, 36.689,8.444, 45.422,23.134
-	C 414.603,88.432, 414.047,107.002, 404.368,124.68z M 244.716,228.814l-74.133-120.442l0-0.012 l0,0l0,0.012 l-25.476,15.685l 73.745,119.79
-	c 9.595,17.229, 18.604,52.55, 18.342,72.054l0,41.336 l 29.922,0 L 267.116,315.9 c-0.242-26.976-9.466-62.975-22.202-86.788L 244.716,228.814z
-	 M 278.137,148.891c-10.512,0-19.030,8.505-19.030,19.029c0,10.516, 8.519,19.021, 19.030,19.021c 10.5,0, 19.035-8.506, 19.035-19.021
-	C 297.172,157.396, 288.637,148.891, 278.137,148.891z M 336.442,86.834c-16.708,0-30.265,13.546-30.265,30.256
-	c0,16.714, 13.557,30.264, 30.265,30.264c 16.712,0, 30.269-13.55, 30.269-30.264C 366.711,100.38, 353.154,86.834, 336.442,86.834z"  />
-<glyph unicode="&#xe0ba;" d="M 208.254,379.395A47.748,47.748 180 1 1 303.75,379.395A47.748,47.748 180 1 1 208.254,379.395zM 320.219,176.462l0-29.496 c 49.871-8.225, 84.32-25.722, 84.32-45.99c0-28.173-66.502-51.012-148.539-51.012
-		s-148.541,22.839-148.541,51.012c0,20.271, 34.453,37.769, 84.326,45.992l0,29.494 c-62.783-9.472-113.432-33.794-113.432-75.486
-		c0-55.347, 89.221-80.118, 177.646-80.118c 88.424,0, 177.646,24.771, 177.646,80.118C 433.646,142.668, 383,166.988, 320.219,176.462zM 324.104,304.349c0,10.661-8.643,19.303-19.303,19.303l-97.6,0 c-10.66,0-19.305-8.642-19.305-19.303l0-101.103 l 27.568,0 l0-104.638 
-		l 81.074,0 L 296.538,203.246 l 27.564,0 L 324.102,304.349 z"  />
-<glyph unicode="&#xe0bb;" d="M 107.566,440.81L 107.566,6.69 l 296.176,0 L 403.742,440.81 L 107.566,440.81 z M 373.070,37.332L 138.205,37.332 l0,372.8 L 373.070,410.132 L 373.070,37.332 z M 327.322,153.488L 185.198,153.488 
-	l0-24.932 l 142.124,0 L 327.322,153.488 z M 327.322,96.491L 185.198,96.491 l0-24.952 l 142.124,0 L 327.322,96.491 z M 203.739,294.418l0-20.779 l 31.296,0 l 3.042-6.349l0-10.070 
-	l-34.338,0 l0-20.78 l 34.338,0 l0-30.183 l 33.259,0 l0,30.183 l 34.53,0 l0,20.78 l-34.53,0 l0,10.070 l 3.268,6.349l 31.263,0 l0,20.779 l-20.761,0 l 33.907,68.021l-35.444,0 
-	l-28.226-68.021l-28.876,68.021l-35.418,0 l 33.455-68.021L 203.739,294.418 z"  />
-<glyph unicode="&#xe0bc;" d="M 444.366,321.111c-9.842,9.58-17.889,23.379-17.889,30.705c0,7.324-11.214,13.348-24.933,13.348L 110.68,365.164 
-	c-13.721,0-24.934-6.023-24.934-13.348c0-7.326-8.061-21.125-17.89-30.705c0,0-36.15-35.184-36.15-96.402
-	c0-61.252, 36.15-96.437, 36.15-96.437c 9.83-9.55, 17.89-23.384, 17.89-30.712c0-7.324, 11.213-13.341, 24.934-13.341l 290.865,0 
-	c 13.719,0, 24.933,6.017, 24.933,13.341c0,7.328, 8.047,21.162, 17.889,30.712c0,0, 36.151,35.185, 36.151,96.437
-	C 480.518,285.928, 444.366,321.111, 444.366,321.111z M 298.976,146.057c-5.967-2.026-11.741-3.072-17.265-3.072
-	c-5.545,0-10.139,0.359-13.785,1.146c-3.646,0.719-7.015,1.566-10.059,2.611c-3.218,1.178-6.407,2.164-9.63,3.043
-	c-3.222,0.85-7.227,1.34-12.033,1.34c-3.941,0-8.060-0.553-12.344-1.666c-4.316-1.11-8.584-3.236-12.818-6.475l-13.558,20.148
-	c 3.059,1.895, 6.1,4.117, 9.092,6.699c 2.976,2.519, 5.608,5.295, 7.866,8.408c 2.255,3.073, 4.119,6.373, 5.573,9.938
-	c 1.455,3.568, 2.193,7.325, 2.193,11.249c0,2.486-0.392,4.939-1.194,7.322c-0.817,2.422-1.798,4.877-2.942,7.359l-21.681,0 l0,18.576 
-	l 13.996,0 c-2.159,2.78-4.35,6.838-6.541,12.264c-2.208,5.399-3.303,11.346-3.303,17.92c0,5.818, 1.212,11.381, 3.63,16.644
-	c 2.403,5.233, 5.952,9.88, 10.597,13.899c 4.658,3.991, 10.496,7.132, 17.494,9.48c 6.999,2.324, 15.109,3.504, 24.283,3.504
-	c 16.774,0, 29.823-4.643, 39.158-13.996c 9.337-9.352, 13.997-22.894, 13.997-40.68l-29.529,0 c-0.162,2.187-0.439,4.902-0.884,8.206
-	c-0.426,3.237-1.405,6.475-2.942,9.485c-1.535,3.106-3.859,5.752-7.016,8.012c-3.121,2.223-7.453,3.4-12.999,3.4
-	c-6.573,0-11.771-1.832-15.628-5.497c-3.893-3.628-5.806-8.504-5.806-14.649c0-1.732, 0.081-3.434, 0.213-5.035
-	c 0.147-1.602, 0.457-3.466, 0.979-5.559c 0.524-2.127, 1.376-4.577, 2.633-7.324c 1.226-2.779, 2.96-6.116, 5.134-10.074l 29.089,0 l0-18.576 
-	l-22.958,0 c 0.721-2.226, 1.211-4.412, 1.406-6.602c 0.23-2.162, 0.343-4.514, 0.343-6.967c0-6.832-1.781-12.721-5.345-17.629
-	c-3.583-4.876-7.784-9.217-12.592-13.012l 0.425-0.395c 3.517,2.129, 6.361,3.533, 8.538,4.117c 2.191,0.592, 4.298,0.887, 6.342,0.887
-	c 2.93,0, 5.807-0.262, 8.634-0.784c 2.844-0.491, 5.758-1.017, 8.65-1.604c 2.91-0.783, 5.755-1.408, 8.519-1.896
-	c 2.777-0.486, 5.625-0.719, 8.55-0.719c 2.912,0, 5.854,0.49, 8.846,1.471c 2.976,1.048, 6.459,3.662, 10.4,7.914l 13.114-22.072
-	C 310.583,151.684, 304.959,148.117, 298.976,146.057z"  />
-<glyph unicode="&#xe0bd;" d="M 255.221,419.193c-64.034,0-115.941-51.908-115.941-115.945c0-64.029, 115.941-273.752, 115.941-273.752
-	s 115.943,209.723, 115.943,273.752C 371.164,367.285, 319.25,419.193, 255.221,419.193z M 255.221,268.021
-	c-19.455,0-35.229,15.773-35.229,35.227c0,19.457, 15.773,35.23, 35.229,35.23c 19.456,0, 35.228-15.773, 35.228-35.23
-	C 290.449,283.795, 274.677,268.021, 255.221,268.021z"  />
-<glyph unicode="&#xe0be;" d="M 422.32,279.428L 282.21,172.566l 33.779,81.264c-0.359,7.125-6.65,14.58-17.22,20.256l-41.781-100.512l-43.389,100.705
-		c-10.208-5.393-16.52-12.432-17.48-19.275l 36.426-84.539L 89.679,279.428c-9.877-3.020-17.729-7.391-22.963-12.266l 158.297-120.734
-		l 61.973,0 l 158.299,120.734C 440.050,272.037, 432.199,276.406, 422.32,279.428zM 183.5,122.75L 328.502,122.75L 328.502,23.818L 183.5,23.818zM 323.039,276.229c 11.408,27.387, 12.947,53.031, 4.48,76.395c-15.508,42.801-59.992,66.127-71.514,71.559
-		c-11.527-5.455-56.121-28.91-71.559-71.645c-8.43-23.338-6.881-48.955, 4.511-76.309c 12.946,14.42, 37.825,23.994, 67.043,23.994
-		S 310.097,290.645, 323.039,276.229zM 285.335,424.121c 19.421-12.965, 44.26-34.771, 55.783-66.568c 7.775-21.457, 8.337-44.346, 1.734-68.359
-		c 13.297,6.902, 30.602,11.029, 49.771,11.029c 25.079,0, 47.15-7.012, 61.081-18.262C 450.431,354.271, 378.358,413.666, 285.335,424.121zM 119.373,300.223c 19.172,0, 36.475-4.127, 49.775-11.031c-6.606,24.014-6.042,46.904, 1.732,68.361
-		c 11.523,31.797, 36.359,53.604, 55.783,66.568C 133.642,413.666, 61.57,354.273, 58.296,281.961
-		C 72.224,293.211, 94.294,300.223, 119.373,300.223z"  />
-<glyph unicode="&#xe0bf;" d="M 340.353,295.883l 0.189,0.084c 0.051-0.047, 0.084-0.084, 0.084-0.084l 0.002-50.66c0,0, 43.088-23.812, 75.094-23.812
-		c 13.041,0, 24.24,3.953, 29.938,15.080c 19.627,37.652-10.17,88.613-43.76,105.109c-52.705,25.131-101.455,33.961-143.811,33.961
-		c-0.699,0-1.393,0-2.090-0.004c-0.691,0.004-1.391,0.004-2.088,0.004c-42.355,0.004-91.102-8.824-143.811-33.961
-		c-33.588-16.496-63.387-67.457-43.762-105.109c 5.697-11.125, 16.902-15.080, 29.941-15.080c 32.006,0, 75.092,23.812, 75.092,23.812
-		l 0.004,50.66c0,0, 0.033,0.037, 0.082,0.084l 0.189-0.084c0,0, 15.127,16.508, 84.352,16.527
-		C 325.226,312.391, 340.353,295.883, 340.353,295.883zM 255.999,211.664c-23.844,0-43.178-19.328-43.178-43.178c0-23.848, 19.334-43.178, 43.178-43.178
-		c 23.848,0, 43.178,19.33, 43.178,43.178C 299.177,192.336, 279.847,211.664, 255.999,211.664zM 329.177,224.498l-12.227,6.756l0,13.967 l-0.002,32.959L 195.052,278.18 l0-32.959 l-0.002-13.967l-12.225-6.756
-		c-4.043-2.232-34.416-18.625-65.58-24.594l-21.973-67.748l0-59.717 l 314.486,0 l0,59.717 l-22.5,69.373
-		C 358.874,208.418, 332.892,222.441, 329.177,224.498z M 255.999,101.631c-36.863,0-66.854,29.99-66.854,66.855
-		c0,36.863, 29.99,66.857, 66.854,66.857c 36.865,0, 66.855-29.994, 66.855-66.857C 322.854,131.621, 292.864,101.631, 255.999,101.631z"  />
-<glyph unicode="&#xe0c0;" d="M 397.824,95.018L 297.037,195.802c-0.523,0.329-3.53,4.546-5.312,9.093c-1.915,4.346-2.748,9.323-2.667,10.105
-	c0,0.029,0,0.064,0,0.064L 289.058,286.52 l 57.244,0 L 256.357,400.516L 166.426,286.52l 56.738,0 l0-17.887 l0-53.568 c 0.116-0.59-0.718-5.722-2.682-10.202
-	c-1.766-4.515-4.788-8.731-5.297-9.061L 114.398,95.018l 46.583-46.601l 95.131,95.128l 95.112-95.128L 397.824,95.018z"  />
-<glyph unicode="&#xe0c1;" d="M 186.178,223.757l 211.583-166.934L 397.761,390.688 L 186.178,223.757z M 112.352,57.488l 66.179,0 L 178.531,390.025 l-66.179,0 L 112.352,57.488 z"  />
-<glyph unicode="&#xe0c2;" d="M 254.796,442.809C 134.138,442.791, 36.37,345.019, 36.35,224.366c 0.020-120.662, 97.788-218.43, 218.446-218.449
-	c 120.657,0.020, 218.423,97.787, 218.448,218.449C 473.219,345.019, 375.453,442.791, 254.796,442.809z M 277.334,73.76l0,60.701 l-45.073,0 
-	l0-60.701 c-33.049,4.889-62.511,20.342-85.141,42.934c-22.585,22.625-38.038,52.086-42.93,85.135l 60.707,0 l0,45.070 L 104.19,246.899 
-	c 4.892,33.049, 20.345,62.509, 42.93,85.137c 22.63,22.589, 52.092,38.043, 85.141,42.936l0-60.706 l 45.073,0 l0,60.703 
-	c 33.050-4.891, 62.506-20.343, 85.136-42.927c 22.585-22.633, 38.043-52.093, 42.932-85.142l-60.7,0 l0-45.070 l 60.7,0 
-	c-4.889-33.049-20.347-62.51-42.932-85.135C 339.84,94.102, 310.384,78.649, 277.334,73.76z"  />
-<glyph unicode="&#xe0c3;" d="M 255.652,441.331c-120.082,0-217.434-97.351-217.434-217.4c0-120.080, 97.352-217.438, 217.434-217.438
-	c 120.049,0, 217.399,97.357, 217.399,217.438C 473.052,343.98, 375.701,441.331, 255.652,441.331z M 255.652,57.64
-	c-91.694,0-166.289,74.596-166.289,166.291c0,91.663, 74.595,166.252, 166.289,166.252c 91.68,0, 166.255-74.589, 166.255-166.252
-	C 421.907,132.235, 347.332,57.64, 255.652,57.64z M 308.628,278.9c0,29.252-23.74,52.975-52.976,52.975
-	c-29.269,0-52.993-23.723-52.993-52.975c0-24.001, 15.976-44.261, 37.853-50.751l-29.677-112.201l 89.602,0 l-29.691,112.201
-	C 292.639,234.64, 308.628,254.884, 308.628,278.9z"  />
-<glyph unicode="&#xe0c4;" d="M 101.195,450.852l0-452.328 l 308.621,0 L 409.816,450.852 L 101.195,450.852 z M 377.885,30.445l-244.74,0 L 133.145,418.938 l 244.74,0 L 377.885,30.445 z M 330.205,151.47l-148.090,0 
-	l0-25.963 l 148.090,0 L 330.205,151.47 z M 330.205,92.084l-148.090,0 l0-25.966 l 148.090,0 L 330.205,92.084 z M 220.474,274.459c 0.802-2.52, 1.241-5.069, 1.241-7.621
-	c0-4.116-0.767-8.008-2.269-11.738c-1.539-3.723-3.468-7.191-5.84-10.398c-2.337-3.168-5.084-6.076-8.191-8.762
-	c-3.124-2.65-6.279-4.969-9.45-6.932l 14.126-20.961c 4.399,3.334, 8.83,5.556, 13.326,6.703c 4.463,1.143, 8.782,1.73, 12.868,1.73
-	c 5.021,0, 9.222-0.483, 12.557-1.373c 3.335-0.914, 6.672-1.99, 10.007-3.201c 3.205-1.053, 6.704-1.966, 10.497-2.714
-	c 3.794-0.756, 8.602-1.146, 14.339-1.146c 5.789,0, 11.789,1.074, 18.037,3.205c 6.212,2.092, 12.049,5.819, 17.527,11.148l-13.67,23.027
-	c-4.104-4.418-7.718-7.166-10.824-8.213c-3.107-1.080-6.18-1.602-9.238-1.602c-3.023,0-5.999,0.258-8.878,0.787
-	c-2.878,0.555-5.837,1.209-8.894,1.96c-3.045,0.591-6.019,1.144-8.996,1.702c-2.976,0.52-5.967,0.783-9.008,0.783
-	c-2.141,0-4.333-0.298-6.623-0.918c-2.255-0.587-5.231-2.029-8.877-4.314l-0.458,0.461c 5.019,3.955, 9.369,8.464, 13.129,13.566
-	c 3.696,5.1, 5.576,11.217, 5.576,18.312c0,2.582-0.146,5.039-0.343,7.328c-0.229,2.252-0.753,4.547-1.473,6.832l 23.938,0 l0,19.357 
-	l-30.346,0 c-2.258,4.092-4.056,7.621-5.332,10.504c-1.31,2.907-2.223,5.428-2.747,7.618c-0.54,2.19-0.883,4.153-1.013,5.82
-	c-0.165,1.667-0.263,3.432-0.263,5.264c0,6.343, 2.027,11.442, 6.051,15.272c 4.021,3.762, 9.45,5.654, 16.285,5.654
-	c 5.788,0, 10.317-1.145, 13.571-3.531c 3.271-2.355, 5.707-5.1, 7.293-8.305c 1.602-3.207, 2.648-6.477, 3.074-9.942
-	c 0.457-3.366, 0.769-6.246, 0.932-8.502l 30.756,0 c0,18.543-4.84,32.671-14.585,42.382c-9.712,9.711-23.316,14.584-40.796,14.584
-	c-9.565,0-18.003-1.207-25.293-3.664c-7.293-2.416-13.377-5.715-18.232-9.906c-4.856-4.188-8.552-8.99-11.053-14.453
-	c-2.504-5.494-3.778-11.251-3.778-17.332c0-6.834, 1.146-13.049, 3.402-18.674c 2.289-5.656, 4.578-9.877, 6.868-12.789l-14.584,0 l0-19.357 
-	l 22.547,0 C 218.593,279.531, 219.607,276.979, 220.474,274.459z"  />
-<glyph unicode="&#xe0c5;" d="M 443.736,320.539c-9.843,9.546-17.88,23.381-17.88,30.709c0,7.324-11.199,13.338-24.917,13.338L 110.056,364.586 
-	c-13.7,0-24.934-6.014-24.934-13.338c0-7.328-8.028-21.163-17.871-30.709c0,0-36.151-35.221-36.151-96.406
-	c0-61.252, 36.151-96.439, 36.151-96.439c 9.843-9.545, 17.871-23.377, 17.871-30.739c0-7.288, 11.233-13.276, 24.934-13.276l 290.884,0 
-	c 13.718,0, 24.917,5.988, 24.917,13.276c0,7.362, 8.037,21.194, 17.88,30.739c0,0, 36.168,35.188, 36.168,96.439
-	C 479.904,285.318, 443.736,320.539, 443.736,320.539z M 297.6,246.402l-6.786-15.695l-48.968,0 l-0.23-9.189l 46.584,0 l-6.786-15.765l-38.047,0 
-	c 4.675-23.087, 15.45-34.597, 32.356-34.597c 10.956,0, 22.188,4.611, 33.699,13.803l-0.213-33.031
-	c-9.793-5.661-21.010-8.531-33.699-8.531c-18.359,0-33.176,5.883-44.407,17.721c-10.203,10.656-16.841,25.539-19.899,44.636l-16.842,0 
-	l 6.786,15.765l 8.731,0 l0,5.656 c0,2.061, 0.099,3.238, 0.228,3.533l-15.958,0 l 6.787,15.695l 11.133,0 c 3.5,17.658, 10.729,31.559, 21.666,41.797
-	c 11.512,11.082, 25.967,16.609, 43.297,16.609c 12.28,0, 25.541-3.632, 39.814-10.958l-13.325-27.302
-	c-10.204,6.537-19.784,9.84-28.663,9.84c-15.305,0-25.507-9.973-30.609-29.986L 297.6,246.403 z"  />
-<glyph unicode="&#xe0c6;" d="M 461.357,215.671c-1.162,0.782-2.388,1.811-3.632,3.005c 2.028,1.934, 3.761,4.367, 4.841,6.965
-	c 1.422,3.355, 1.93,6.802, 1.93,10.124c0,3.301-0.49,6.553-1.31,10.024c-1.176,6.014-3.842,11.18-7.618,15.337
-	c-3.892,4.134-9.205,7.893-16.973,8.042c-1.373,0.016-2.797-0.197-4.218-0.522c-15.124,73.448-67.153,120.849-169.364,120.849
-	c-43.327,0-79.693-8.554-108.683-23.971l-24.165,13.949c-13.687,7.896-26.929,1.601-29.449-14.014l-10.333-64.552
-	c-5.102-10.092-9.19-20.912-12.165-32.362l-6.932,0 c-15.812,0-28.746-12.95-28.746-28.747l0-51.451 
-	c0-15.812, 12.934-28.732, 28.746-28.732l 11.69,0 c 9.975-22.006, 26.7-37.183, 49.918-47.332l0-52.16 c0-0.477, 0.050-0.93, 0.066-1.375l 89.194,0 
-	c 0.016,0.445, 0.047,0.898, 0.047,1.375l0,34.811 c 12.854-0.738, 26.439-1.045, 40.811-1.045c 11.414,0, 22.207,0.391, 32.375,1.178l0-34.943 
-	c0-0.477, 0.034-0.93, 0.067-1.375L 386.6,58.749 c 0.033,0.445, 0.099,0.898, 0.099,1.375l0,59.094 c 31.065,18.279, 47.286,45.847, 51.409,80.737
-	c 2.387-2.388, 4.953-4.579, 7.73-6.521c 5.547-3.843, 12.053-6.919, 19.739-7.342l 1.373,27.093
-	C 466.197,213.184, 464.072,213.77, 461.357,215.671z M 130.643,234.325c-10.086,0-18.262,8.189-18.262,18.282
-	c0,10.104, 8.176,18.277, 18.262,18.277c 10.090,0, 18.281-8.174, 18.281-18.277C 148.924,242.514, 140.733,234.325, 130.643,234.325z
-	 M 322.473,315.832c-16.61,4.891-35.761,7.636-57.719,7.636c-22.759,0-43.788-2.941-62.87-8.287l-8.338,29.807
-	c 21.928,6.13, 45.798,9.416, 71.208,9.416c 24.493,0, 46.635-3.058, 66.451-8.877L 322.473,315.832z"  />
-<glyph unicode="&#xe0c7;" d="M 410.011,402.799L 86.698,236.739l-32.807-16.85l 29.909-21.582l 68.36-49.327l 28.243-119.776l 48.254,64.576l 76.163-54.957
-	l 25.397-18.325l 9.39,29.879L 441.9,375.921l 16.208,51.582L 410.011,402.799z M 205.052,110.814l-13.361-26.305l-15.819,67.088
-	L 419.599,381.806L 205.052,110.814z"  />
-<glyph unicode="&#xe0c8;" d="M 474.274,209.343L 474.274,260.49 c0,0-67.202,0-135.679,0L 195.232,260.49 c-10.138,34.984-40.518,60.369-76.423,60.369
-	c-44.181,0-80.021-38.459-80.021-85.944c0-47.483, 35.841-85.94, 80.021-85.94c 35.905,0, 66.286,25.405, 76.423,60.368l 196.797,0 l0-30.118 
-	l-30.574,0 l0-51.148 l 112.313,0 l0,51.148 l-30.591,0 l0,30.118 C 462.241,209.343, 474.274,209.343, 474.274,209.343z M 118.809,186.876
-	c-23.218,0-42.103,21.554-42.103,48.039c0,26.519, 18.885,48.073, 42.103,48.073c 23.234,0, 42.12-21.555, 42.12-48.073
-	C 160.929,208.43, 142.043,186.876, 118.809,186.876z"  />
-<glyph unicode="&#xe0c9;" d="M 255.125,118.65L 88.193,330.235L 422.055,330.235 z"  />
-<glyph unicode="&#xe0ca;" d="M 217.078,92.366L 163.549,106.714L 163.549,153.79L 133.751,162.967L 133.751,95.286L 144.793,80.894L 222.86,59.966L 240.83,69.585L 259.322,124.292L 230.836,133.065 	zM 401.997,387.973c-0.233,0.021-0.467,0.036-0.702,0.039c-0.117,0.004-0.229,0.022-0.348,0.022
-		c-0.142,0-0.278-0.022-0.419-0.025c-0.234-0.006-0.468-0.019-0.701-0.038c-5.167-0.185-9.999-1.625-14.493-4.152l-308.597-95.050
-		c-17.54-2.201-24.863-14.503-24.863-40.912c0-26.41, 7.323-38.712, 24.863-40.914l 308.597-95.049
-		c 4.818-2.711, 10.015-4.213, 15.608-4.215c 0.002,0, 0.003,0, 0.004,0l0,0c 0.001,0, 0.001,0, 0.001,0
-		c 38.851,0, 59.179,70.519, 59.179,140.178C 460.126,316.878, 440.157,386.701, 401.997,387.973z M 400.947,133.262
-		c-11.402,0-33.597,40.447-33.597,114.595c0,74.146, 22.194,114.593, 33.597,114.593s 33.595-40.446, 33.595-114.593
-		C 434.542,173.709, 412.35,133.262, 400.947,133.262z"  />
-<glyph unicode="&#xe0cb;" d="M 326.723,307.516L 326.723,391.123 L 182.15,391.123 l0-83.605 c-25.638-20.956-42.013-52.819-42.015-88.522
-	c 0.002-35.704, 16.376-67.567, 42.015-88.526l0-75.004 l 144.572,0 l0,75.006 c 25.633,20.961, 42.004,52.82, 42.010,88.524
-	C 368.727,254.694, 352.355,286.557, 326.723,307.516z M 317.55,155.875c-16.194-16.173-38.429-26.136-63.113-26.142
-	c-24.691,0.006-46.929,9.969-63.119,26.142c-16.172,16.199-26.136,38.432-26.142,63.12c 0.006,24.686, 9.97,46.925, 26.142,63.113
-	c 16.189,16.173, 38.428,26.134, 63.119,26.142c 24.684-0.008, 46.918-9.969, 63.113-26.142c 16.173-16.188, 26.138-38.428, 26.142-63.113
-	C 343.688,194.307, 333.723,172.074, 317.55,155.875z M 266.264,231.513l0,46.856 l-25.036,0 l-0.006-71.898l 84.494,0 l0,25.042 L 266.264,231.513 z"  />
-<glyph unicode="&#xe0cc;" d="M 197.291,265.063c 5.141,8.909, 11.748,16.864, 19.494,23.541c-1.469,2.462-2.824,5.010-4.023,7.661
-		c-8.293,18.317-8.953,38.77-1.863,57.586c 7.088,18.815, 21.082,33.744, 39.4,42.035c 18.318,8.289, 38.768,8.952, 57.582,1.865l0,0.001 
-		c 0.004-0.001, 0.004-0.003, 0.008-0.004c 18.809-7.089, 33.736-21.080, 42.033-39.398c 8.289-18.322, 8.947-38.769, 1.857-57.583
-		c-11.059-29.348-39.145-48.76-70.363-48.76c-0.67,0-1.34,0.009-2.010,0.028c-0.127,0.002-0.252,0.004-0.373,0.004
-		c-7.91,0-14.453-6.314-14.652-14.281c-0.203-8.088, 6.182-14.812, 14.275-15.015c 0.9-0.016, 1.795-0.040, 2.699-0.040
-		c 43.375,0, 82.473,26.945, 97.84,67.723c 9.852,26.15, 8.941,54.557-2.578,80.004c-11.518,25.446-32.258,44.885-58.395,54.736
-		c-0.016,0.005-0.029,0.007-0.047,0.013c-26.125,9.835-54.523,8.912-79.961-2.602c-25.447-11.52-44.887-32.257-54.734-58.397
-		c-9.848-26.139-8.93-54.551, 2.586-79.997C 189.162,277.347, 192.941,270.962, 197.291,265.063zM 189.969,190.745l-63.941-63.929l0-41.679 l 41.463,0 l0,29.254 l 31.051,0 l 12.244,12.24l 11.434,11.435l0,8.65 
-		C 207.037,157.81, 195.877,173.196, 189.969,190.745zM 363.34,120.511l-14.805,44.826c-5.295-7.032-11.641-13.317-18.902-18.622l0-101.179 l0-2.949 l 32.66-16.439l 18.643,37.038
-		l-12.166,40.881L 363.34,120.511zM 342.434,228.356c-18.025-11.157-39.092-17.491-61.078-17.491c-0.805,0-1.604,0.016-2.4,0.032l-0.596,0.012
-		c-3.545,0.089-6.906,0.885-9.967,2.233c-10.451,3.217-18.039,12.943-18.039,24.45c0,12.604, 9.113,23.046, 21.107,25.158
-		c 2.406,0.729, 4.947,1.13, 7.57,1.13c 0.223,0, 0.443-0.002, 0.689-0.010c 0.564-0.013, 1.131-0.022, 1.693-0.022
-		c 12.328,0, 24.109,3.696, 34.117,10.128c-11.1,8.14-24.787,12.957-39.604,12.957c-37.041,0-67.062-30.027-67.062-67.066
-		c0-26.237, 15.082-48.939, 37.033-59.951l0-22.653 l 1.26-1.58l 22.574-22.578l-23.834-23.832l0-1.25 l 21.951-21.953l-20.691-20.691
-		l 29.32-29.318l 29.477,29.476L 305.954,159.915 c 21.957,11.012, 37.033,33.714, 37.033,59.951C 342.988,222.744, 342.787,225.572, 342.434,228.356z
-		"  />
-<glyph unicode="&#xe0cd;" d="M 108.292,441.203l0-434.143 l 296.197,0 L 404.489,441.203 L 108.292,441.203 z M 373.829,37.768L 138.933,37.768 L 138.933,410.564 l 234.896,0 L 373.829,37.768 z M 328.064,153.889
-	L 185.942,153.889 l0-24.918 l 142.123,0 L 328.065,153.889 z M 328.064,96.857L 185.942,96.857 l0-24.919 l 142.123,0 L 328.065,96.857 z M 207.591,286.92l0-5.657 l-8.749,0 l-6.785-15.763
-	l 16.856,0 c 3.059-19.098, 9.695-33.973, 19.9-44.605c 11.232-11.803, 26.015-17.723, 44.408-17.723c 12.673,0, 23.89,2.846, 33.668,8.533
-	l 0.213,33.026c-11.513-9.188-22.747-13.765-33.683-13.765c-16.923,0-27.7,11.512-32.36,34.533l 38.049,0 l 6.785,15.763l-46.583,0 
-	l 0.21,9.187l 48.988,0 l 6.787,15.732l-53.353,0 c 5.084,19.979, 15.289,29.957, 30.61,29.957c 8.894,0, 18.442-3.238, 28.646-9.814l 13.357,27.342
-	c-14.307,7.293-27.567,10.92-39.814,10.92c-17.363,0-31.783-5.562-43.312-16.611c-10.92-10.238-18.148-24.137-21.649-41.793l-11.15,0 
-	l-6.802-15.732l 15.99,0 C 207.673,290.156, 207.591,288.979, 207.591,286.92z"  />
-<glyph unicode="&#xe0ce;" d="M 280.146,203.242c-3.596,2.846-9.68,5.444-18.279,7.77l0-41.992 c 2.615,0.299, 5.365,0.917, 8.209,1.865
-	c 2.842,0.934, 5.395,2.289, 7.65,4.024c 2.259,1.765, 4.122,3.907, 5.559,6.477c 1.506,2.534, 2.192,5.556, 2.192,9.056
-	C 285.478,196.131, 283.711,200.417, 280.146,203.242z M 443.885,320.889c-9.842,9.547-17.855,23.362-17.855,30.688
-	c0,7.339-11.249,13.361-24.952,13.361L 110.195,364.938 c-13.701,0-24.916-6.022-24.916-13.361c0-7.326-8.045-21.142-17.889-30.688
-	c0,0-36.139-35.188-36.139-96.421c0-61.252, 36.139-96.423, 36.139-96.423c 9.844-9.547, 17.889-23.381, 17.889-30.726
-	c0-7.307, 11.215-13.306, 24.916-13.306l 290.882,0 c 13.703,0, 24.952,5.999, 24.952,13.306c0,7.345, 8.014,21.179, 17.855,30.726
-	c0,0, 36.168,35.171, 36.168,96.423C 480.053,285.701, 443.885,320.889, 443.885,320.889z M 314.154,177.001
-	c-1.6-4.891-4.477-9.664-8.631-14.323c-4.184-4.677-9.744-8.829-16.744-12.461c-6.998-3.661-15.955-5.837-26.912-6.569l0-18.595 
-	l-12.92,0 l0,18.595 c-16.318,1.177-29.070,6.177-38.26,15.070c-9.188,8.897-14.486,21.98-15.957,39.181l 30.838,0 
-	c-0.162-8.309, 2.027-14.881, 6.541-19.688c 4.545-4.807, 10.137-7.895, 16.838-9.191L 248.947,214.74 c-0.686,0.289-1.695,0.619-2.939,0.977
-	c-1.243,0.363-2.584,0.691-4.061,0.98c-5.391,1.46-10.689,3.177-15.92,5.134c-5.299,1.981-9.979,4.595-14.13,7.887
-	c-4.187,3.284-7.487,7.354-9.938,12.246c-2.523,4.888-3.727,10.97-3.727,18.261c0,7.426, 1.4,13.994, 4.25,19.688
-	c 2.875,5.687, 6.604,10.461, 11.282,14.308c 4.673,3.874, 10.038,6.879, 16.187,8.976c 6.115,2.122, 12.459,3.401, 18.996,3.841l0,16.841 
-	l 12.92,0 l0-16.841 c 6.572-0.733, 12.722-2.14, 18.477-4.268c 5.754-2.121, 10.824-5.016, 15.205-8.762c 4.416-3.695, 7.98-8.34, 10.728-13.884
-	c 2.779-5.54, 4.382-12.082, 4.808-19.686l-31.070,0 c-0.127,5.841-1.928,10.792-5.425,14.88c-3.532,4.074-7.753,6.13-12.722,6.13l0-38.72 
-	c 1.766-0.438, 3.533-0.881, 5.365-1.304c 1.83-0.442, 3.756-0.95, 5.785-1.534c 10.793-2.933, 19.1-6.547, 24.953-10.83
-	c 5.822-4.297, 10.105-8.797, 12.881-13.454c 2.783-4.664, 4.418-9.339, 4.907-13.996c 0.558-4.665, 0.784-8.814, 0.784-12.477
-	C 316.543,185.926, 315.759,181.871, 314.154,177.001z M 235.412,276.951c-1.896-1.516-3.402-3.42-4.515-5.674
-	c-1.079-2.271-1.601-4.937-1.601-7.977c0-4.821, 1.504-8.553, 4.575-11.148c 3.075-2.653, 8.075-4.762, 15.075-6.365l0,35.661 
-	c-2.449,0-4.869-0.357-7.191-1.112C 239.434,279.62, 237.309,278.473, 235.412,276.951z"  />
-<glyph unicode="&#xe0cf;" d="M 471.071,197.52c0-105.183-85.274-190.441-190.448-190.441L 280.623,197.52 L 471.071,197.52 zM 418.747,250.144c0,105.174-85.262,190.436-190.446,190.436c-105.171,0-190.429-85.262-190.429-190.436
-	c0-105.173, 85.258-190.437, 190.429-190.437L 228.301,250.144 L 418.747,250.144 z"  />
-<glyph unicode="&#xe0d0;" d="M 410.013,402.801L 86.699,236.74l-32.807-16.851l 29.908-21.581l 76.875-55.472l 26.316-111.602l 44.961,60.169l 72.869-52.58
-	l 25.396-18.325l 9.391,29.878L 441.9,375.921l 16.207,51.58L 410.013,402.801z M 318.047,57.151l-93.654,67.578L 420.339,382.697
-	L 186.654,151.963l-89.629,64.673L 420.339,382.697L 318.047,57.151z"  />
-<glyph unicode="&#xe0d1;" d="M 376.957,418.068l0-22.413 c 2.908-4.715, 4.618-10.252, 4.618-16.197
-	c0-17.088-13.852-30.935-30.935-30.935c-17.084,0-30.928,13.847-30.928,30.935c0,5.945, 1.705,11.479, 4.613,16.191L 324.325,418.068 l-41.725,0 
-	l0-22.413 c 2.91-4.715, 4.619-10.252, 4.619-16.197c0-17.088-13.852-30.935-30.935-30.935c-17.084,0-30.929,13.847-30.929,30.935
-	c0,5.945, 1.707,11.479, 4.613,16.191L 229.968,418.068 l-41.725,0 l0-22.413 c 2.909-4.715, 4.62-10.252, 4.62-16.197
-	c0-17.088-13.853-30.935-30.934-30.935c-17.086,0-30.931,13.847-30.931,30.935c0,5.945, 1.708,11.479, 4.614,16.191L 135.612,418.068 l-28.687,0 
-	l0-306.159 l 7.333-7.333l 91.326-91.328l 199.412,0 L 404.996,418.068 L 376.957,418.068 z M 379.959,38.287L 238.347,38.287 c-37.202,0-19.276,88.181-19.276,88.181
-	s-86-20.901-87.105,18.534l0,179.96 l 247.993,0 L 379.959,38.287 z M 358.155,246.157L 159.513,246.157 l0-30.774 l 198.642,0 L 358.155,246.157 z M 358.155,297.943L 159.513,297.943 
-	l0-30.777 l 198.642,0 L 358.155,297.943 z M 358.155,194.377L 159.513,194.377 l0-30.774 l 198.642,0 L 358.155,194.377 z M 350.645,361.431c 8.502,0, 15.396,6.897, 15.396,15.4
-	L 366.041,419.852 c0,8.503-6.895,15.396-15.396,15.396c-8.506,0-15.399-6.894-15.399-15.396l0-43.021 
-	C 335.245,368.328, 342.139,361.431, 350.645,361.431z M 161.933,361.431c 8.502,0, 15.397,6.897, 15.397,15.4L 177.33,419.852 
-	c0,8.503-6.895,15.396-15.397,15.396c-8.504,0-15.398-6.894-15.398-15.396l0-43.021 C 146.534,368.328, 153.429,361.431, 161.933,361.431z
-	 M 256.287,361.431c 8.504,0, 15.398,6.897, 15.398,15.4L 271.685,419.852 c0,8.503-6.895,15.396-15.398,15.396
-	c-8.502,0-15.396-6.894-15.396-15.396l0-43.021 C 240.891,368.328, 247.785,361.431, 256.287,361.431z"  />
-<glyph unicode="&#xe0d2;" d="M 419.598,366.997L 85.734,366.997 l 166.928-211.587L 419.598,366.997z M 90.395,147.766l0-66.172 l 332.542,0 l0,66.172 L 90.395,147.766 z"  />
-<glyph unicode="&#xe0d3;" d="M 255.607,336.721c 17.742,0, 32.18,14.437, 32.18,32.178c0,17.745-14.438,32.179-32.18,32.179
-		c-17.744,0-32.18-14.434-32.18-32.179C 223.428,351.157, 237.863,336.721, 255.607,336.721zM 408.256,231.299c 17.742,0, 32.18,14.437, 32.18,32.178c0,17.742-14.438,32.179-32.18,32.179
-		c-17.744,0-32.178-14.437-32.178-32.179C 376.078,245.735, 390.512,231.299, 408.256,231.299zM 103.742,231.299c 17.744,0, 32.18,14.437, 32.18,32.178c0,17.742-14.436,32.179-32.18,32.179s-32.178-14.437-32.178-32.179
-		C 71.564,245.735, 85.998,231.299, 103.742,231.299zM 312.168,297.801c0,8.763-7.104,15.864-15.865,15.864l-80.215,0 c-8.762,0-15.865-7.102-15.865-15.864l0-27.942 l 111.945,0 L 312.168,297.801 
-		zM 391.697,201.178c-0.961,0-1.871-0.194-2.736-0.479l 44.654-92.566l0,84.244 c0,4.855-3.949,8.802-8.803,8.802L 391.697,201.179 zM 78.381,192.376l0-81.568 l 44.439,89.961c-0.805,0.241-1.639,0.409-2.521,0.409L 87.186,201.178 
-		C 82.332,201.178, 78.381,197.231, 78.381,192.376zM 171.578,246.311L 73.090,46.923l 126.545,0 l0,42.038 c0,8.761, 7.104,15.867, 15.865,15.867l 80.215,0 
-		c 8.762,0, 15.865-7.106, 15.865-15.867l0-42.038 l 125.418,0 l-96.186,199.388L 171.578,246.311 z M 255.607,127.885
-		c-17.744,0-32.18,14.432-32.18,32.175c0,17.742, 14.436,32.177, 32.18,32.177c 17.742,0, 32.18-14.435, 32.18-32.177
-		C 287.787,142.316, 273.35,127.885, 255.607,127.885z"  />
-<glyph unicode="&#xe0d4;" d="M 37.521,375.729l0-303.855 l 436.853,0 L 474.374,375.729 L 37.521,375.729 z M 449.323,96.925L 62.573,96.925 L 62.573,350.678 l 386.75,0 L 449.323,96.925 z M 196.883,303.616
-	l-41.205,0 l0-41.178 l 41.205,0 L 196.883,303.616 z M 262.027,303.616L 220.84,303.616 l0-41.178 l 41.188,0 L 262.028,303.616 z M 327.199,303.616L 285.99,303.616 l0-41.178 l 41.209,0 L 327.199,303.616 z
-	 M 319.48,194.791l 40.073,0 l0,41.188 L 319.48,235.979 L 319.48,194.791 z M 129.212,304.432L 88.027,304.432 l0-41.183 l 41.185,0 L 129.212,304.432 z M 166.582,235.979L 88.868,235.979 l0-41.188 
-	l 77.714,0 L 166.582,235.979 z M 190.906,235.979l0-41.188 l 41.175,0 l0,41.188 L 190.906,235.979 z M 256.449,235.979l0-41.188 l 41.208,0 l0,41.188 L 256.449,235.979 z
-	 M 88.775,127.138l 41.187,0 l0,41.201 L 88.775,168.339 L 88.775,127.138 z M 154.65,127.138l 201.547,0 l0,41.201 L 154.65,168.339 L 154.65,127.138 z M 381.432,194.351l 41.188,0 L 422.62,303.713 
-	l-69.042,0 l0-41.179 l 27.854,0 L 381.432,194.351 z M 380.874,127.138l 41.208,0 l0,41.201 l-41.208,0 L 380.874,127.138 z"  />
-<glyph unicode="&#xe0d5;" d="M 87.871,70.546L 87.871,153.646L 421.611,153.646L 421.611,70.546L 87.871,70.546 	zM 256.482,212.691L 90.723,378.449L 422.235,378.449 	z"  />
-<glyph unicode="&#xe0d6;" d="M 108.023,441.112l0-434.118 l 296.179,0 L 404.202,441.112 L 108.023,441.112 z M 373.545,37.64L 138.664,37.64 L 138.664,410.451 l 234.881,0 L 373.545,37.64 z M 327.777,153.791L 185.655,153.791 
-	l0-24.932 l 142.122,0 L 327.777,153.791 z M 327.777,96.777L 185.655,96.777 l0-24.915 l 142.122,0 L 327.777,96.777 z M 230.672,237.623
-	c-4.515,4.828-6.705,11.381-6.557,19.705l-30.855,0 c 1.456-17.233, 6.802-30.283, 15.975-39.175c 9.206-8.895, 21.943-13.9, 38.277-15.078
-	l0-18.604 l 12.918,0 l0,18.604 c 10.922,0.739, 19.899,2.928, 26.895,6.544c 6.998,3.659, 12.576,7.814, 16.745,12.488
-	c 4.135,4.644, 7.028,9.438, 8.615,14.322c 1.604,4.876, 2.42,8.93, 2.42,12.137c0,3.642-0.263,7.794-0.75,12.458
-	c-0.541,4.673-2.177,9.353-4.956,13.995c-2.762,4.679-7.080,9.174-12.885,13.457c-5.854,4.303-14.161,7.914-24.932,10.826
-	c-2.046,0.602-3.977,1.092-5.789,1.537c-1.833,0.442-3.647,0.881-5.363,1.325l0,38.699 c 4.937,0, 9.171-2.043, 12.673-6.131
-	c 3.496-4.071, 5.327-9.041, 5.476-14.86l 31.050,0 c-0.425,7.568-2.029,14.142-4.824,19.688c-2.746,5.539-6.327,10.181-10.691,13.878
-	c-4.383,3.729-9.47,6.639-15.224,8.751c-5.757,2.108-11.902,3.543-18.459,4.267L 260.431,383.312 l-12.918,0 l0-16.857 
-	c-6.575-0.429-12.902-1.717-19.032-3.829c-6.117-2.108-11.51-5.102-16.188-8.977c-4.659-3.84-8.405-8.615-11.268-14.307
-	c-2.827-5.688-4.266-12.264-4.266-19.683c0-7.309, 1.243-13.394, 3.728-18.284c 2.485-4.874, 5.804-8.961, 9.942-12.246
-	c 4.169-3.268, 8.877-5.905, 14.109-7.864c 5.249-1.964, 10.579-3.697, 15.974-5.133c 1.454-0.296, 2.796-0.623, 4.056-0.981
-	c 1.226-0.375, 2.225-0.686, 2.944-0.983l0-45.734 C 240.806,229.744, 235.184,232.833, 230.672,237.623z M 260.43,270.423
-	c 8.6-2.323, 14.681-4.921, 18.246-7.768c 3.564-2.825, 5.348-7.094, 5.348-12.787c0-3.495-0.719-6.521-2.193-9.072
-	c-1.438-2.552-3.318-4.696-5.574-6.459c-2.258-1.75-4.808-3.088-7.618-4.040c-2.845-0.945-5.609-1.554-8.208-1.865L 260.431,270.423 z
-	 M 232.418,311.563c-3.057,2.615-4.595,6.343-4.595,11.154c0,3.057, 0.559,5.703, 1.654,7.974c 1.093,2.277, 2.566,4.172, 4.478,5.693
-	c 1.881,1.521, 4.007,2.667, 6.347,3.385c 2.319,0.719, 4.724,1.093, 7.21,1.093l0-35.642 C 240.512,306.82, 235.475,308.934, 232.418,311.563z"  />
-<glyph unicode="&#xe0d7;" d="M 110.924,224.368L 397.623,391.301L 397.623,57.434 z"  />
-<glyph unicode="&#xe0d8;" d="M 316.951,285.57c-45.108,0-81.675-36.565-81.675-81.674c0-45.107, 36.566-81.676, 81.675-81.676
-	c 45.107,0, 81.674,36.568, 81.674,81.676C 398.625,249.005, 362.059,285.57, 316.951,285.57z M 316.951,155.968
-	c-26.47,0-47.927,21.456-47.927,47.929c0,26.47, 21.457,47.927, 47.927,47.927c 26.468,0, 47.928-21.457, 47.928-47.927
-	C 364.879,177.424, 343.419,155.968, 316.951,155.968z M 190.319,354.33l-22.872,26.302l-67.124,0 L 77.452,354.33l-41.75,0 l0-286.494 l 438.306,0 
-	L 474.008,354.33 L 190.319,354.33 z M 173.418,297.117l-62.392,0 c-7.379,0-13.362,5.982-13.362,13.361c0,7.378, 5.982,13.362, 13.362,13.362l 62.392,0 
-	c 7.38,0, 13.363-5.984, 13.363-13.362C 186.782,303.1, 180.798,297.117, 173.418,297.117z M 316.951,97.183
-	c-58.842,0-106.714,47.871-106.714,106.714c0,58.841, 47.872,106.715, 106.714,106.715s 106.713-47.874, 106.713-106.715
-	C 423.664,145.054, 375.793,97.183, 316.951,97.183z M 451.184,306.564c0-3.917-3.174-7.087-7.086-7.087l-16.443,0 
-	c-3.912,0-7.084,3.17-7.084,7.087l0,16.441 c0,3.912, 3.172,7.085, 7.084,7.085l 16.443,0 c 3.912,0, 7.086-3.173, 7.086-7.085L 451.184,306.564 z"  />
-<glyph unicode="&#xe0d9;" d="M 115.059,421.036l0-300.769 l 6.934-6.935l 79.432-79.434l 6.934-6.936l 188.582,0 L 396.941,421.036 L 115.059,421.036 z M 239.34,50.644
-		c-35.182,0-18.229,83.392-18.229,83.392s-21.539-5.233-42.586-5.233c-19.859,0-39.279,4.656-39.789,22.76
-		c0,39.039,0,123.033,0,181.92L 373.26,333.483 l0-282.838 L 239.34,50.645 zM 241.199,97.005l 108.805,0 l0,23.679 L 243.236,120.684 C 242.047,112.687, 241.365,104.444, 241.199,97.005zM 162.84,182.909L 350.004,182.909L 350.004,159.23L 162.84,159.23zM 162.84,307.359L 350.004,307.359L 350.004,283.68L 162.84,283.68zM 162.84,245.134L 350.004,245.134L 350.004,221.454L 162.84,221.454z"  />
-<glyph unicode="&#xe0da;" d="M 202.539,390.963L 309.465,390.963L 309.465,337.289L 349.454,337.289L 349.454,394.832L 309.465,430.949L 202.539,430.949L 162.554,394.832L 162.554,337.289L 202.539,337.289 	zM 384.506,313.609L 106.333,313.609L 106.333,17.051L 405.667,17.051L 405.667,286.299L 405.667,313.609 	z"  />
-<glyph unicode="&#xe0db;" d="M 405.561,291.854l0-24.149 L 107.452,267.705 l0,24.149 L 38.566,291.854 l0-253.604 l 435.88,0 L 474.446,291.854 L 405.561,291.854 z M 211.802,100.844
-	c-3.171,3.893-9.025,4.922-14.077,7.062c-6.771,2.876-14.275,6.162-21.044,8.945c-1.93,0.522-3.827,1.046-5.737,1.568
-	c-2.324,1.601-4.581,6.866-5.807,9.454c-1.242,0.194-2.468,0.359-3.662,0.553c 0.163,4.020, 2.681,4.251, 3.662,7.357
-	c 0.852,2.699, 0.1,6.248, 1.439,8.766c 0.98,1.75, 3.106,1.766, 4.201,3.27c 0.966,1.373, 1.621,3.729, 1.915,5.412
-	c 0.604,3.059, 1.046,7.241-0.361,10.252c-0.849,1.732-1.387,1.896-1.619,4.025c-0.245,2.55, 0.77,10.888, 0.801,12.7
-	c 0.131,4.694,0,8.944-1.11,13.471c0,0-1.407,4.141-3.548,5.382l-4.301,0.75l-2.683,2.471c-10.693,6.575-22.187,1.965-28.287-0.539
-	c-8.86-2.876-14.518-15.371-10.593-33.945c 0.685-3.136-1.735-4.541-1.538-6.279c 0.327-3.791, 0.426-12.85, 3.957-15.071
-	c 0.328-0.233, 2.845-0.883, 2.845-0.688c 0.376-3.664, 0.687-7.361, 1.063-11.021c 0.866-2.457, 3.009-2.73, 3.663-6.18l-2.731-0.686
-	c-1.242-2.588-3.499-7.854-5.821-9.454c-1.914-0.522-3.859-1.046-5.789-1.568c-6.72-2.783-14.226-6.069-20.993-8.945
-	c-4.58-1.912-9.795-2.942-13.114-5.937L 82.533,222.245 l 129.269,0 L 211.802,100.844 z M 363.866,111.242L 246.663,111.242 l0,24.899 l 117.203,0 L 363.866,111.242 z
-	 M 432.212,173.928L 246.663,173.928 l0,24.906 l 185.549,0 L 432.212,173.928 z M 380.805,350.422l-67.986,0 c 0.081,1.226, 0.162,2.466, 0.162,3.712
-	c-0.033,30.788-24.951,55.721-55.755,55.721c-30.772,0-55.725-24.933-55.725-55.721c0-1.247, 0.051-2.487, 0.131-3.712l-69.066,0 l0-57.771 
-	l 248.239,0 L 380.805,350.422 z M 256.703,329.050c-13.866,0-25.083,11.216-25.101,25.084c 0.018,13.863, 11.235,25.080, 25.101,25.080
-	c 13.833,0, 25.049-11.217, 25.065-25.080C 281.752,340.266, 270.535,329.050, 256.703,329.050z"  />
-<glyph unicode="&#xe0dc;" d="M 364.93,259.475l-14.911,31.263c-2.551,5.43-9.846,21.996-17.464,39.473L 179.021,330.211 
-			c-7.62-17.477-14.913-34.043-17.463-39.473l-14.914-31.263c-6.181-12.981-11.248-35.385-11.248-49.785l0-181.332 
-			c0-13.358, 10.825-24.165, 24.167-24.165l 192.417,0 c 13.373,0, 24.167,10.807, 24.167,24.165L 376.147,209.689 
-			C 376.146,224.090, 371.111,246.493, 364.93,259.475z M 337.492,137.075l-55.233,0 l0-55.252 L 229.35,81.823 l0,55.252 l-55.27,0 l0,52.911 l 55.27,0 l0,55.25 
-			l 52.909,0 l0-55.25 l 55.233,0 L 337.492,137.075 z M 353.223,419.141c0,13.362-10.794,24.181-24.135,24.181L 182.486,443.322 
-			c-13.346,0-24.169-10.819-24.169-24.181l0-63.996 l 194.905,0 L 353.222,419.141 z"  />
-<glyph unicode="&#xe0dd;" d="M 120.619,313.218L 120.619,396.312L 388.874,396.312L 388.874,313.218L 120.619,313.218 	zM 120.619,182.209L 120.619,265.312L 388.874,265.312L 388.874,182.209L 120.619,182.209 	zM 120.619,51.211L 120.619,134.313L 388.874,134.313L 388.874,51.211L 120.619,51.211 	z"  />
-<glyph unicode="&#xe0de;" d="M 254.808,437.83c-58.417,0-105.779-47.362-105.779-105.782c0-41.388, 23.786-77.202, 58.419-94.581l0-35.723 l 1.985-2.498
-	l 35.609-35.609l-37.595-37.596l0-1.962 l 34.63-34.63l-32.645-32.642l 46.244-46.244l 46.493,46.492L 302.169,237.467 
-	c 34.636,17.378, 58.419,53.192, 58.419,94.581C 360.588,390.467, 313.227,437.83, 254.808,437.83z M 254.808,327.359
-	c-18.027,0-32.643,14.616-32.643,32.645c0,18.029, 14.616,32.643, 32.643,32.643c 18.029,0, 32.644-14.613, 32.644-32.643
-	C 287.451,341.975, 272.837,327.359, 254.808,327.359z"  />
-<glyph unicode="&#xe0df;" d="M 115.362,430.13L 115.362,17.87 l 281.275,0 L 396.637,430.13 L 115.362,430.13 z M 144.468,46.973L 144.468,249.591 l 29.342,0 l0,21.312 l-29.342,0 L 144.468,401.021 L 367.53,401.021 l0-130.118 
-		l-27.969,0 l0-21.312 l 27.969,0 l0-202.618 L 144.468,46.973 zM 206.96,270.903L 240.11,270.903L 240.11,249.591L 206.96,249.591zM 273.261,270.903L 306.411,270.903L 306.411,249.591L 273.261,249.591zM 189.399,354.331L 322.602,354.331L 322.602,323.546L 189.399,323.546zM 293.198,136.831c-1.869,3.144-4.766,6.164-8.695,9.061c-3.928,2.897-9.525,5.327-16.789,7.293
-		c-1.379,0.39-2.68,0.734-3.904,1.030c-1.23,0.292-2.428,0.589-3.609,0.883l0,26.072 c 3.338,0, 6.186-1.375, 8.541-4.126
-		c 2.357-2.748, 3.588-6.085, 3.684-10.014l 20.92,0 c-0.297,5.105-1.377,9.524-3.246,13.259c-1.865,3.729-4.268,6.851-7.213,9.352
-		c-2.947,2.505-6.359,4.468-10.238,5.893s-8.027,2.382-12.447,2.874L 260.202,209.75 l-8.691,0 l0-11.343 c-4.418-0.296-8.688-1.159-12.816-2.578
-		c-4.123-1.426-7.758-3.441-10.9-6.039c-3.143-2.605-5.67-5.82-7.59-9.651c-1.912-3.829-2.867-8.248-2.867-13.256
-		c0-4.91, 0.832-9.012, 2.502-12.302c 1.67-3.293, 3.906-6.039, 6.705-8.248c 2.797-2.209, 5.965-3.977, 9.5-5.303s 7.121-2.479, 10.752-3.461
-		c 0.984-0.198, 1.889-0.419, 2.725-0.663c 0.838-0.245, 1.496-0.467, 1.99-0.661l0-30.789 c-4.518,0.884-8.299,2.945-11.344,6.186
-		c-3.043,3.241-4.516,7.659-4.42,13.258l-20.77,0 c 0.982-11.589, 4.568-20.381, 10.754-26.365c 6.188-5.992, 14.777-9.38, 25.779-10.166
-		l0-12.519 l 8.691,0 l0,12.519 c 7.365,0.492, 13.406,1.966, 18.117,4.419c 4.713,2.454, 8.473,5.254, 11.271,8.397
-		c 2.793,3.141, 4.734,6.355, 5.816,9.647c 1.080,3.291, 1.621,6.017, 1.621,8.176c0,2.452-0.172,5.254-0.518,8.396
-		C 296.165,130.547, 295.062,133.69, 293.198,136.831z M 251.509,157.16c-4.715,1.080-8.098,2.504-10.166,4.273
-		c-2.061,1.768-3.094,4.269-3.094,7.512c0,2.062, 0.371,3.851, 1.107,5.378c 0.738,1.52, 1.742,2.799, 3.020,3.83
-		c 1.275,1.031, 2.701,1.791, 4.271,2.281c 1.57,0.491, 3.189,0.735, 4.861,0.735L 251.508,157.16 z M 274.636,113.78
-		c-0.982-1.722-2.236-3.169-3.758-4.348c-1.52-1.177-3.24-2.086-5.154-2.722c-1.914-0.644-3.758-1.060-5.523-1.254l0,28.283 
-		c 5.791-1.575, 9.891-3.315, 12.301-5.23c 2.402-1.914, 3.605-4.786, 3.605-8.618C 276.106,117.536, 275.618,115.496, 274.636,113.78z"  />
-<glyph unicode="&#xe0e0;" d="M 253.006,223.955L 466.789,348.432L 466.789,99.477 zM 42.486,223.955L 256.271,348.432L 256.271,99.477 z"  />
-<glyph unicode="&#xe0e1;" d="M 61.246,432.849L 61.246,111.5L 142.436,111.5L 142.436,196.174L 92.495,196.174L 92.495,402.16L 301.845,402.16L 301.845,367.189L 333.047,367.189L 333.047,432.849 zM 174.353,335.84l0-321.352 l 271.818,0 L 446.171,335.84 L 174.353,335.84 z M 414.971,99.161L 205.597,99.161 L 205.597,305.149 l 209.374,0 L 414.971,99.161 z"  />
-<glyph unicode="&#xe0e2;" d="M 356.050,392.945L 356.050,446.394L 157.618,446.394L 157.618,404.748L 137.079,1.846L 214.764,2.555L 228.205,180.414L 256.54,345.627L 284.875,180.414L 298.3,2.555L 375.983,1.846 z"  />
-<glyph unicode="&#xe0e3;" d="M 409.269,151.463l0,87.092 l-87.090,0 c-6.66,30.424-33.752,53.207-66.178,53.207c-32.428,0-59.52-22.783-66.18-53.207l-57.98,0 
-	l0,57.984 c 30.426,6.66, 53.207,33.75, 53.207,66.18c0,37.422-30.338,67.758-67.762,67.758s-67.764-30.336-67.764-67.758
-	c0-32.43, 22.783-59.52, 53.209-66.18l0-87.092 l 87.090,0 c 6.662-30.428, 33.752-53.209, 66.18-53.209c 32.426,0, 59.516,22.781, 66.178,53.209
-	l 57.98,0 l0-57.984 c-30.426-6.66-53.207-33.75-53.207-66.176c0-37.424, 30.338-67.764, 67.762-67.764s 67.764,30.34, 67.764,67.764
-	C 462.478,117.713, 439.694,144.803, 409.269,151.463z M 78.628,362.719c0,21.312, 17.342,38.652, 38.658,38.652
-	s 38.656-17.34, 38.656-38.652c0-21.316-17.34-38.66-38.656-38.66S 78.628,341.402, 78.628,362.719z M 256.001,185.344
-	c-21.316,0-38.656,17.344-38.656,38.658s 17.34,38.652, 38.656,38.652c 21.314,0, 38.654-17.338, 38.654-38.652
-	S 277.315,185.344, 256.001,185.344z M 394.714,46.631c-21.316,0-38.656,17.342-38.656,38.656s 17.34,38.652, 38.656,38.652
-	c 21.314,0, 38.658-17.338, 38.658-38.652S 416.028,46.631, 394.714,46.631z"  />
-<glyph unicode="&#xe0e4;" d="M 416.672,429.36L 187.203,392.14l 0.035-275.978c-12.004,4.206-26.398,4.981-41.040,1.319
-	c-32.527-8.135-53.833-34.966-47.59-59.924c 6.247-24.959, 37.676-38.595, 70.213-30.446c 28.581,7.15, 48.497,28.749, 48.663,50.819
-	l 0.031,0.005L 217.515,298.503 l 168.869,26.476l0-170.579 c-12.172,4.319-26.801,5.139-41.691,1.415c-32.869-8.226-54.406-35.34-48.094-60.556
-	c 6.314-25.227, 38.076-39.003, 70.951-30.779c 29.951,7.495, 50.473,30.668, 49.121,53.804L 416.671,429.36 z"  />
-<glyph unicode="&#xe0e5;" d="M 42.203,416.564l 405-404.999l 21.763,21.765l-405,404.996L 42.203,416.564z M 472.553,383.398l-58.761,58.754l-49.978-49.976
-	l 58.764-58.764L 472.553,383.398z M 313.428,224.27l 82.593,82.596l-26.54,26.534l-82.592-82.589L 313.428,224.27z M 178.553,142.471
-	l-15.927,15.938l 51.162,51.167l-16.288,16.28L 86.348,114.703l 0.188-0.185L 38.614,7.743l 106.313,48.384l 0.181-0.182l 0.484,0.484
-	l 110.666,110.672l-26.539,26.537L 178.553,142.471z M 139.294,83.422l-46.367-21.104l 20.896,46.573l 23.39,23.389l 3.366-22.303
-	l 22.1-3.165L 139.294,83.422z M 353.548,349.338l-16.285,16.28l-82.591-82.592l 16.285-16.279L 353.548,349.338z"  />
-<glyph unicode="&#xe0e6;" d="M 49.524,135.736A30.396,30.396 180 1 1 110.316,135.736A30.396,30.396 180 1 1 49.524,135.736zM 197.305,166.133c-16.787,0-30.394-13.61-30.394-30.396c0-16.786, 13.606-30.397, 30.394-30.397
-		c 16.789,0, 30.397,13.611, 30.397,30.397C 227.702,152.522, 214.094,166.133, 197.305,166.133zM 284.299,135.736A30.396,30.396 180 1 1 345.091,135.736A30.396,30.396 180 1 1 284.299,135.736zM 225.602,53.786A30.396,30.396 180 1 1 286.394,53.786A30.396,30.396 180 1 1 225.602,53.786zM 401.682,135.736A30.396,30.396 180 1 1 462.474,135.736A30.396,30.396 180 1 1 401.682,135.736zM 342.989,53.788A30.396,30.396 180 1 1 403.781,53.78800000000001A30.396,30.396 180 1 1 342.989,53.78800000000001zM 108.218,53.788A30.396,30.396 180 1 1 169.010,53.78800000000001A30.396,30.396 180 1 1 108.218,53.78800000000001zM 49.523,424.609l0-219.775 l 296.119,0 c 5.828,29.321, 6.857,51.505, 6.857,63.472l 0.002-0.008l0,0.008 c0,3.15,0,3.15,0,3.15
-		c-0.010,0.36-0.089,0.709-0.196,1.049c0,0-70.114-33.923-73.567-33.923c-2.169,0-4.355,0.641-6.264,1.976
-		c-4.953,3.464-6.154,10.291-2.689,15.243c0,0, 71.713,38.020, 74.098,39.35c 2.558,1.355, 5.339,2.296, 8.863,2.333
-		c 0.256,0, 0.656-0.005, 1.011-0.032l 19.833-1.236l 19.268,1.204c 0.275,0.016, 0.61,0.033, 1.025,0.033
-		c 3.513-0.038, 6.285-0.974, 8.84-2.318c 2.378-1.314, 5.852-2.875, 6.668-7.346l 6.287-72.056c 0.229-3.62, 1.166-7.601, 0.344-10.897
-		l 46.455,0 L 462.477,424.609 L 49.523,424.609 z M 122.154,253.171L 98.476,253.171 L 98.476,319.36 l 23.679,0 L 122.155,253.171 z M 177.066,253.171l-23.68,0 L 153.386,364.235 l 23.68,0 L 177.066,253.171 z
-		 M 231.979,253.171l-23.68,0 l0,36.62 l 23.68,0 L 231.979,253.171 z M 373.589,310.077c-17.379,0-31.465,14.087-31.465,31.464
-		c0,17.377, 14.086,31.466, 31.465,31.466s 31.465-14.088, 31.465-31.466C 405.054,324.164, 390.968,310.077, 373.589,310.077z"  />
-<glyph unicode="&#xe0e7;" d="M 426.043,285.452L 365.142,423.646L 36.266,278.763l 79.195-179.716l0-73.243 l 359.41,0 L 474.871,285.452 L 426.043,285.452 z M 115.461,258.647
-	l-11.13-4.718l 11.13-26.259l0-66.866 L 70.123,267.769L 352.691,387.585l 43.287-102.133l-28.342,0 l-28.787,67.919l-160.171-67.919l-63.217,0 
-	L 115.461,258.647 z M 448.527,51.847l-306.94,0 L 141.587,259.083 l 306.94,0 L 448.527,51.847 z M 422.432,232.987l-254.75,0 l0-155.045 l 254.75,0 L 422.432,232.987 z"  />
-<glyph unicode="&#xe0e8;" d="M 37.324,412.445l0-377.107 l 436.664,0 L 473.988,412.445 L 37.324,412.445 z M 437.951,69.271L 74.298,69.271 L 74.298,340.347 l 363.653,0 L 437.951,69.271 zM 254.617,120.348L 139.043,266.839L 370.189,266.836 z"  />
-<glyph unicode="&#xe0e9;" d="M 397.727,224.37L 111.027,57.438L 111.027,391.303 z"  />
-<glyph unicode="&#xe0ea;" d="M 342.261,293.508L 61.814,293.508 c-6.905,0-12.507-5.6-12.507-12.51l0-234.432 l 305.463,0 L 354.77,280.998 
-		C 354.771,287.908, 349.171,293.508, 342.261,293.508z M 328.724,72.613L 75.354,72.613 L 75.354,229.832 l 253.369,0 L 328.723,72.613 zM 450.182,401.434L 169.739,401.434 c-6.91,0-12.51-5.602-12.51-12.512l0-71.734 l 26.047,0 l0,20.566 l 253.369,0 l0-157.221 l-62.654,0 l0-26.045 l 88.701,0 
-		L 462.692,388.922 C 462.692,395.832, 457.093,401.434, 450.182,401.434z"  />
-<glyph unicode="&#xe0eb;" d="M 270.439,341.753c-5.265,4.087-4.053,10.467-15.959,8.798C 255.559,345.973, 258.273,341.425, 270.439,341.753z
-	 M 473.617,277.463L 411.318,385.264l-92.937-53.63L 318.381,438.979 L 193.819,438.979 l0-107.428 l-93.005,53.713l-62.23-107.801l 93.005-53.63l-93.005-53.731
-	l 62.23-107.881l 93.005,53.73l0-107.429 l 124.562,0 L 318.381,115.867 l 92.937-53.646l 62.299,107.881l-93.040,53.646L 473.617,277.463z M 265.796,387.604
-	l-0.522-24.562c-1.864,0.458-3.762,0.739-5.691,0.739c-0.621,0-1.273-0.038-1.896-0.101c-2.451-0.226-6.248-0.702-10.66-1.7
-	l-0.557,25.624L 265.796,387.604 z M 209.418,307.448c-1.209,14.602, 5.166,28.095, 16.25,37.184c 8.702,7.161, 21.618,10.89, 32.706,11.903
-	c 0.392,0.048, 0.815,0.063, 1.208,0.063c 9.615,0, 20.665-9.676, 26.063-16.873c 4.773-6.344, 6.571-12.887, 3.957-14.532
-	c-2.617-1.656-6.737-4.665-9.255-6.657c-1.471-1.208-3.14-1.651-4.938-1.651c-3.074,0-6.443,1.324-9.747,2.63
-	c-3.303,1.34-6.507,2.65-9.22,2.65c-0.13,0-0.263,0-0.426,0c-8.143-0.46-14.846-4.314-16.418-12.491
-	c-0.291-1.604, 0.296-3.634, 1.505-5.903l 0.884-39.719C 228.646,273.047, 214.455,282.922, 209.418,307.448z M 262.753,247.718
-	l-0.228-10.693c-1.896-0.914-4.087-1.844-5.822-2.599c-2.091-0.882-4.445-1.88-6.833-3.009l-0.718,32.672c0,0.033,0,0.080,0,0.127
-	L 248.3,303.92l-0.032,0.031l-0.163,7.652c 1.635,2.026, 4.35,3.205, 8.306,3.4c 1.309,0, 4.055-1.113, 6.279-2.027l 0.294-0.101
-	c 0.391-0.162, 0.784-0.307, 1.177-0.452l-0.751-35.743c0,0-0.035-0.022-0.035-0.037l-0.621-28.871
-	C 262.753,247.736, 262.753,247.718, 262.753,247.718z M 252.616,105.125c0,0.016,0,0.031,0,0.064l-0.197,8.438c0,0.016,0,0.047,0,0.062
-	l-0.161,7.23c 2.156,0.981, 5.199,1.997, 7.783,2.811l-0.491-22.271c0-0.030,0-0.030,0-0.064l-0.163-6.326c0-0.015, 0.030-0.046, 0.030-0.085
-	l-0.358-16.116c-0.523-0.527-1.080-1.082-1.732-1.686c-1.309-1.277-2.65-2.603-4.022-4.055L 252.616,105.125z M 258.309,44.249l-4.351,0 
-	l-0.396,17.593c 0.197-0.144, 0.362-0.308, 0.591-0.439l 1.767-1.061c 0.851-0.523, 1.799-0.771, 2.715-0.903L 258.309,44.249z
-	 M 259.646,66.456l-1.766,1.062c 6.441,7.146, 14.324,11.625, 12.396,20.571c-0.426,2.794-1.767,5.001-3.696,6.833l 0.164,6.31
-	c 3.989-3.025, 7.13-7.043, 7.588-12.753C 275.967,77.361, 264.848,71.441, 259.646,66.456z M 286.496,152.998
-	c-1.735-14.664-15.73-18.342-23.087-20.765c-8.308-2.583-17.758-4.886-20.146-9.907c-1.504-3.417-0.523-6.329, 2.028-8.847
-	l 0.165-8.456c-2.029,0.983-3.991,2.192-5.92,4.040c-4.122,4.136-5.986,10.431-3.859,16.22c 5.918,11.761, 16.809,12.773, 24.328,16.496
-	c 15.797,4.976, 18.675,14.868, 8.012,19.002l 0.299,14.158c 3.3-1.078, 6.701-2.481, 10.135-4.899
-	C 283.652,167.013, 287.641,159.113, 286.496,152.998z M 260.858,160.898l-0.229-11.266c-0.852-0.342-1.768-0.686-2.781-1.013
-	c-0.358-0.116-0.72-0.249-1.013-0.412c-1.439-0.704-3.237-1.357-5.1-2.061l-0.428,20.032c0,0.030,0,0.046,0,0.063l-0.426,19.392
-	c0,0.031-0.032,0.053-0.032,0.084l-0.162,7.146c 0.26,0.359, 0.489,0.704, 0.685,0.982c 0.098,0.094, 0.165,0.195, 0.198,0.289
-	c 1.272,1.964, 5.329,3.372, 10.104,4.938l-0.523-23.932c0-0.039,0-0.055,0-0.070l-0.293-14.127
-	C 260.858,160.915, 260.858,160.915, 260.858,160.898z M 291.957,225.105c-18.051-20.897-39.797-17.007-46.369-27.045
-	c-3.371-4.626-4.059-8.941-1.899-12.553l 0.458-19.43c-4.087,1.475-8.207,3.762-12.033,7.604c-9.452,9.682-8.146,25.752-1.080,35.306
-	c 16.090,19.081, 39.078,18.933, 42.416,28.402c 2.418,5.836, 2.386,5.081-1.375,8.645c-0.655,0.521-1.374,1.030-2.156,1.557l 0.619,28.889
-	c 5.298-3.17, 11.478-6.67, 17.853-12.506c 4.284-3.978, 9.354-10.905, 9.717-19.328C 298.3,236.26, 295.913,230.471, 291.957,225.105z"  />
-<glyph unicode="&#xe0ec;" d="M 291.739,265.789c-11.634,3.325-23.903,5.145-36.604,5.145c-12.7,0-24.967-1.819-36.598-5.142L 218.537,379.509 l-97.792,0 l0-56.525 
-	l 47.555-84.365c-28.239-24.384-46.137-60.419-46.137-100.657c0-73.438, 59.533-132.975, 132.972-132.975
-	c 73.439,0, 132.973,59.537, 132.973,132.975c0,43.467-20.863,82.059-53.115,106.321l 54.531,77.405l0,57.821 l-97.784,0 L 291.74,265.789 z
-	 M 340.534,137.961c0-47.090-38.312-85.399-85.399-85.399c-47.089,0-85.398,38.31-85.398,85.399c0,47.088, 38.31,85.398, 85.398,85.398
-	C 302.223,223.359, 340.534,185.049, 340.534,137.961z M 83.035,443.124l0-38.577 l 344.2,0 L 427.235,443.124 L 83.035,443.124 z M 252.262,217.601l-17.073-52.173
-	l-54.78,0 c-1.304,0-2.469-0.844-2.874-2.086c-0.405-1.236, 0.040-2.607, 1.094-3.37l 44.327-32.292l-17.078-52.456
-	c-0.405-1.239, 0.040-2.608, 1.093-3.378c 1.056-0.763, 2.494-0.763, 3.548,0l 44.613,32.387l 44.516-32.387
-	c 0.531-0.383, 1.156-0.578, 1.777-0.578s 1.243,0.195, 1.774,0.578c 1.061,0.775, 1.499,2.129, 1.096,3.378l-17.079,52.452l 44.422,32.296
-	c 1.054,0.763, 1.5,2.134, 1.096,3.37c-0.405,1.242-1.568,2.086-2.87,2.086l-54.874,0 l-16.986,52.166
-	c-0.404,1.24-1.567,2.084-2.867,2.084C 253.831,219.678, 252.666,218.838, 252.262,217.601z"  />
-<glyph unicode="&#xe0ed;" d="M 270.508,141.994c-27.316-0.030-54.696,10.671-75.323,31.318l0,0l-3.266,3.266l 46.784,46.799l 3.271-3.267
-		c 8.054-8.036, 18.233-11.915, 28.533-11.942l0,0c 10.79,0.043, 21.088,3.93, 29.123,11.942l0,0l 76.701,76.701
-		c 8.024,8.050, 11.909,18.306, 11.945,28.895l0,0c-0.036,10.495-3.915,20.722-11.936,28.769l0,0l-3.268,3.266
-		c-8.049,8.025-18.283,11.903-28.827,11.943l0,0c-10.55-0.040-20.785-3.918-28.835-11.943l0,0l-31.537-31.543
-		c-12.916-12.922-33.867-12.922-46.788,0l0,0c-12.924,12.919-12.924,33.867-0.005,46.789l0,0l 31.542,31.544
-		c 20.794,20.821, 48.361,31.36, 75.623,31.327l0,0c 27.256,0.034, 54.82-10.505, 75.618-31.327l0,0l 3.266-3.263
-		c 20.783-20.763, 31.357-48.292, 31.319-75.561l0,0c 0.038-27.25-10.474-54.848-31.325-75.684l0,0l-76.704-76.7
-		c-20.915-20.941-48.588-31.328-75.743-31.328l0,0C 270.619,141.994, 270.562,141.994, 270.508,141.994L 270.508,141.994zM 163.966,11.607c-27.308-0.027-54.694,10.67-75.322,31.324l0,0l-3.264,3.26c-20.875,20.854-31.364,48.479-31.326,75.725
-		l0,0c-0.033,27.27, 10.556,54.782, 31.326,75.518l0,0l 76.704,76.707c 20.794,20.821, 48.361,31.366, 75.623,31.327l0,0
-		c 21.372,0.031, 42.931-6.444, 61.267-19.273l0,0c 3.035-1.542, 5.882-3.579, 8.42-6.119l0,0l 5.931-5.93l 3.266-3.263l-0.001,0 l 0.001-0.003
-		l-46.781-46.798l-0.005,0.006l-3.266,3.266c-8.052,8.024-18.285,11.903-28.832,11.943l0,0c-10.545-0.040-20.781-3.918-28.832-11.943
-		l0,0l-76.711-76.712c-8.021-8.048-11.901-18.261-11.935-28.726l0,0c 0.038-10.627, 3.922-20.886, 11.938-28.932l0,0l 3.269-3.26
-		c 8.055-8.038, 18.235-11.913, 28.531-11.941l0,0c 10.794,0.043, 21.092,3.928, 29.13,11.941l0,0l 33.051,33.051
-		c 12.923,12.915, 33.872,12.915, 46.788-0.006l0,0c 12.921-12.917, 12.921-33.863,0-46.787l0,0l-33.053-33.051
-		c-20.914-20.938-48.592-31.324-75.745-31.324l0,0C 164.079,11.607, 164.023,11.607, 163.966,11.607L 163.966,11.607z"  />
-<glyph unicode="&#xe0ee;" d="M 438.643,106.854c-1.897,1.469-6.736,8.403-8.47,14.782l-1.962,7.177c-3.369,12.394-13.212,21.734-25.312,24.854
-	c-0.486-6.476-1.532-12.248-3.171-17.316c 5.494-1.848, 10.039-6.228, 11.644-12.133l 1.961-7.176
-	c 2.519-9.242, 9.338-20.194, 15.141-24.36c 5.82-4.173, 4.188-12.122-3.647-17.644l-53.714-38.066
-	c-7.813-5.531-21.975-11.117-31.457-12.395l-0.131-0.049c-0.85-0.101-1.683-0.148-2.553-0.148c-8.759,0-17.918,5.89-21.121,14.012
-	l-2.534,6.41c-3.551,8.895-3.601,23.481-0.116,32.41l 17.823,45.91c-5.854,7.541-9.452,16.535-9.518,25.344
-	c 0.031,8.455, 5.069,15.453, 11.626,20.099c 5.575,3.94, 12.443,6.491, 19.62,7.209c 0.443,2.599, 0.688,5.25, 0.706,7.933
-	c 0.080,19.57-13.523,51.421-13.523,51.421c 0.081,0.047, 0.146,0.078, 0.244,0.078c 3.206,0, 23.12-25.685, 23.25-51.5
-	c0-2.683-0.194-5.429-0.588-8.176c 3.483-0.544, 6.917-1.605, 10.171-3.32c 2.421-1.275, 3.368-4.302, 2.093-6.719
-	c-0.883-1.721-2.648-2.684-4.432-2.684c-0.784,0-1.554,0.195-2.306,0.555c-3.434,1.816-7.39,2.682-11.51,2.682l-0.065,0 
-	c-6.443,0-13.115-2.191-17.872-5.621c-4.856-3.457-7.456-7.74-7.44-11.957c-0.032-6.703, 3.468-15.090, 9.288-21.438
-	c 5.806-6.389, 13.571-10.672, 21.78-10.672l 0.029,0 c 7.066,0.031, 14.457,2.678, 20.294,9.384c 5.84,6.703, 10.317,17.824, 10.335,35.367
-	c0,4.548-0.346,9.534-0.998,14.929c-5.135,26.195-15.877,47.89-32.949,69.209c-17.315,21.669-23.822,36.091-33.911,54.843
-	c-9.497,17.677-7.488,59.271-11.46,86.954c-2.779,32.752-33.881,54.268-69.329,54.268c-32.047,0-58.766-20.422-58.766-65.861
-	l 0.034-11.753l-0.034,0.326c0,0, 0.034-2.604, 0.050-7.393l 0.179-55.626c-0.077-37.817-58.663-112.397-58.962-133.554
-	c-0.014-1.895, 0.116-3.71, 0.329-5.49c-7.292-2.667-13.377-8.486-16.809-16.529l-0.751-1.738c-1.326-3.057-6.786-7.355-10.072-7.908
-	l-1.832-0.314c-18.396-3.104-31.232-20.648-28.615-39.128l 1.017-7.097c 0.88-6.146-0.72-13.965-1.815-16.008
-	c-4.269-7.113-4.89-15.5-1.62-23.020c 3.76-8.682, 12.134-14.977, 22.958-17.27l 62.229-13.223c 6.116-1.311, 12.656-1.574, 17.040-1.574
-	c 5.136,0, 15.044,0.357, 23.938,2.848l 0.098,0.031c 11.362,3.158, 20.634,11.809, 25.277,22.465l 76.945,0 
-	c 0.493-1.797, 1.049-3.513, 1.703-5.148l 2.532-6.357c 5.854-14.768, 21.225-25.056, 37.36-25.056c 1.638,0, 3.271,0.101, 4.859,0.312l 0.014,0 
-	l 0.084,0.017l 0.063,0 c 12.248,1.671, 29.107,8.308, 39.212,15.469l 53.711,38.065c 9.192,6.49, 14.456,15.732, 14.488,25.313
-	C 449.436,94.358, 445.51,101.918, 438.643,106.854z M 269.74,383.507c 11.607,0, 21.025-10.983, 21.025-24.554
-	c0-8.159-3.432-15.386-8.681-19.854c-3.452,1.046-7.016,2.191-10.497,3.941c 3.252,2.013, 5.507,6.528, 5.507,11.761
-	c0,7.146-4.168,12.916-9.333,12.916c-5.15,0-9.338-5.77-9.338-12.916c0-1.396, 0.214-2.732, 0.508-3.994
-	c-3.416,1.67-6.803,2.817-9.875,3.613c-0.246,1.458-0.378,2.979-0.378,4.532C 248.679,372.524, 258.097,383.507, 269.74,383.507z
-	 M 212.773,380.894c 8.631,0, 15.632-9.892, 15.632-22.106c0-1.374-0.117-2.714-0.297-4.040c-3.105-0.962-6.177-2.388-9.121-4.135
-	c 0.13,0.981, 0.211,1.958, 0.211,2.994c0,6.833-2.993,12.373-6.688,12.373c-3.695,0-6.705-5.539-6.705-12.373
-	c0-4.174, 1.146-7.871, 2.862-10.107c-1.453-1.125-2.862-2.256-4.201-3.385c-4.385,3.907-7.31,10.81-7.31,18.673
-	C 197.157,371.002, 204.139,380.894, 212.773,380.894z M 198.581,322.929c 3.105,1.947, 6.344,4.624, 10.069,7.735
-	c 7.865,6.524, 18.641,15.454, 27.569,15.454l 0.163,0 l 0.112,0.015l 0.148,0 c 1.376,0, 13.622-0.231, 23.596-7.769
-	c 6.982-5.28, 14.536-7.504, 20.586-9.289c 8.929-2.629, 10.659-3.644, 11.576-6.803c 2.059-6.979-11.904-15.366-19.655-17.722
-	c-5.197-1.567-8.795-4.495-11.968-7.059c-4.938-4.010-9.615-7.802-23.203-7.802c-11.005,0-17.578,6.341-25.196,13.669
-	c-4.414,4.201-8.927,8.571-14.42,11.379c-1.178,0.623-1.424,2.192-1.473,3.072C 196.389,319.923, 197.288,322.127, 198.581,322.929z
-	 M 188.506,37.854l-0.129-0.049c-5.197-1.456-12.394-2.209-19.261-2.209c-4.907,0-9.646,0.394-13.406,1.194l-62.233,13.214
-	c-9.059,1.942-13.539,8.355-9.977,14.275c 3.565,5.914, 5.398,18.261, 4.104,27.418l-1.011,7.113
-	c-1.291,9.152, 5.101,17.904, 14.226,19.439l 1.815,0.328c 9.157,1.522, 19.586,9.743, 23.234,18.247l 0.749,1.732
-	c 2.109,4.954, 5.82,7.557, 9.83,7.557c 2.876,0, 5.887-1.325, 8.598-4.087l 46.667-47.389c 6.507-6.59, 12.034-19.539, 12.296-28.793
-	l 0.197-6.652C 204.467,49.936, 197.419,40.339, 188.506,37.854z M 248.613,65.535c-4.252,0-8.666,0.555-13.179,1.781
-	c-4.351,1.229-8.454,2.768-12.247,4.497c-0.963,0.782-1.849,1.765-2.763,3.074c-1.847,9.105-6.019,18.704-11.416,26.178
-	c 3.159,7.786, 2.161,16.794-7.273,24.347l-5.937,4.641c-22.662,13.853-34.697,26.867-41.005,37.443
-	c-6.673,11.007-6.901,19.64-6.868,22.224l 0.016,0 c-0.016,2.745, 2.206,4.984, 4.955,4.984c 1.699-4.118, 0.49-15.171, 11.87-29.266
-	c-0.212,3.089, 0.065,6.591, 0.752,10.419c 0.361,1.614, 0.702,3.268, 1.030,4.951c 8.191,33.304, 40.027,85.319, 35.841,100.674
-	c-2.239,8.256-3.008,14.814-2.731,20.011c 9.746-8.271, 19.213-21.748, 37.917-21.748c 25.622,0, 28.043,12.23, 38.066,15.256
-	c 4.235,1.295, 10.104,3.955, 15.253,7.669c-1.65-10.969-1.026-27.194, 10.237-48.45c 10.726-20.189, 15.37-41.304, 16.482-61.789
-	l-0.134-0.28l0-21.972 c-1.272-21.011-5.508-40.635-9.809-57.062C 303.027,95.277, 279.746,65.535, 248.613,65.535z M 238.573,299.956
-	c 22.448,0.1, 32.538,13.979, 45.863,17.482c 1.423,0.406, 2.241,1.878, 1.849,3.299c-0.393,1.442-1.879,2.275-3.302,1.863
-	c-15.812-4.703-24.493-17.395-44.41-17.278c-9.907,0-18.363,3.759-24.377,7.583c-2.994,1.917-5.381,3.829-7.001,5.267
-	c-1.583,1.424-2.37,2.308-2.402,2.308c-0.979,1.092-2.682,1.162-3.777,0.162c-1.095-0.998-1.16-2.682-0.177-3.776
-	C 201.048,316.665, 215.978,300.056, 238.573,299.956z M 227.048,336.649c 2.616,1.124, 4.398,2.777, 4.022,3.674
-	c-0.377,0.889-2.833,0.709-5.431-0.419c-2.602-1.132-4.396-2.778-4.005-3.683C 222.025,335.306, 224.445,335.52, 227.048,336.649z
-	 M 251.1,337.398c 2.843-0.36, 5.214,0.1, 5.362,1.083c 0.132,0.961-2.060,2.061-4.876,2.433c-2.811,0.394-5.197-0.101-5.344-1.060
-	C 246.112,338.871, 248.303,337.794, 251.1,337.398z"  />
-<glyph unicode="&#xe0ef;" d="M 452.403,316.597l 7.431,19.945l-19.189,22.075l-42.659,55.146l-24.822,12.181L 144.608,425.944 l-23.572-10.666l-56.893-64.735
-	l 0.065-0.145l-12.042-13.855l 4.167-85.021l 3.153-13.709l 18.386-37.854l-19.668-54.384l-1.871-10.675l0-34.133 l0-47.328 l 31.382-31.382
-	l 335.527,0 l 29.005,43.362l-14.491,35.087l 16.006,66.918l 0.258,13.424l-17.603,88.482L 452.403,316.597z M 199.934,127.882l0-33.792 L 180.040,94.090 
-	c-12.073,0-23.228,6.44-29.264,16.896c-6.036,10.457-6.036,23.337, 0.001,33.791l 23.977,41.529l-26.932,15.587l 71.148,26.462
-	l 12.488-74.876l-27.286,15.792l-23.879-41.252l-0.129,0.076l-0.124-0.213L 199.934,127.882 z M 249.716,248.563l-7.932-13.741l-29.245,16.93
-	l 7.913,13.706c 6.037,10.455, 17.191,16.896, 29.264,16.896c 12.072,0, 23.228-6.441, 29.264-16.896l 23.888-41.373l 26.561,15.271
-	l-12.499-73.597l-69.894,26.228l 26.536,15.258L 249.716,248.563z M 348.657,110.985c-6.036-10.455-17.191-16.896-29.264-16.896
-	l-42.768,0 l 0.026-30.421l-57.616,47.471l 57.535,47.568l 0.027-30.826l 42.795,0 l-6.953,12.042l 29.296,16.842l 6.921-11.989
-	C 354.693,134.322, 354.693,121.44, 348.657,110.985z M 87.715,329.823l 56.893,64.738l 228.554,0 l 50.080-64.738L 87.715,329.823 z"  />
-<glyph unicode="&#xe0f0;" d="M 49.035,419.566L 462.965,419.566L 462.965,385.974L 49.035,385.974zM 49.035,337.561L 135.613,337.561L 135.613,250.984L 49.035,250.984zM 212.712,337.561L 299.288,337.561L 299.288,250.984L 212.712,250.984zM 376.388,337.561L 462.964,337.561L 462.964,250.984L 376.388,250.984zM 49.035,197.016L 462.965,197.016L 462.965,163.423L 49.035,163.423zM 49.035,115.010L 135.613,115.010L 135.613,28.434L 49.035,28.434zM 212.712,115.010L 299.288,115.010L 299.288,28.434L 212.712,28.434zM 376.388,115.010L 462.964,115.010L 462.964,28.434L 376.388,28.434z"  />
-<glyph unicode="&#xe0f1;" d="M 334.191,414.405L 173.834,414.405 c-15.331,0-27.753-12.435-27.753-27.765l0-325.63 c0-15.33, 12.422-27.765, 27.753-27.765l 160.357,0 
-	c 15.354,0, 27.767,12.435, 27.767,27.765L 361.958,386.641 C 361.958,401.971, 349.545,414.405, 334.191,414.405z M 235.885,390.76l 36.274,0 l0-12.048 l-36.274,0 
-	L 235.885,390.76 z M 254.035,47.822c-9.773,0-17.718,7.916-17.718,17.694c0,9.765, 7.944,17.695, 17.718,17.695
-	c 9.768,0, 17.687-7.931, 17.687-17.695C 271.722,55.738, 263.803,47.822, 254.035,47.822z M 341.167,94.377L 166.881,94.377 L 166.881,353.275 l 174.286,0 
-	L 341.167,94.377 z"  />
-<glyph unicode="&#xe0f2;" d="M 282.137,175.564l-75.396,0 l-43.248-78.006l 45.127,9.479l-45.161-90.322l 147.667,137.529l-46.779-9.811L 282.137,175.564z
-	 M 372.752,331.8c 1.618,6.247, 2.486,12.785, 2.486,19.538c0,42.561-34.5,77.079-77.078,77.079c-32,0-59.454-19.511-71.095-47.287
-	c-10.024,11.754-24.919,19.228-41.562,19.228c-30.152,0-54.579-24.429-54.579-54.564c0-5.181, 0.752-10.188, 2.092-14.929
-	c-24.593-9.040-42.152-32.668-42.152-60.414c0-35.48, 28.776-64.292, 64.307-64.292l 198.206,0 c 35.547,0, 64.308,28.812, 64.308,64.292
-	C 417.685,299.248, 398.816,323.592, 372.752,331.8z"  />
-<glyph unicode="&#xe0f3;" d="M 196.542,61.515l 117.444-44.599L 313.986,387.599 L 196.542,432.197L 196.542,61.515 z M 41.22,12.042l 130.275,49.473L 171.495,432.197 L 41.22,382.728
-	L 41.22,12.042 z M 339.029,387.361L 339.029,16.68 l 130.596,49.59L 469.625,436.955 L 339.029,387.361z"  />
-<glyph unicode="&#xe0f4;" d="M 151.441,157.288L 203.879,157.288L 203.879,143.292L 151.441,143.292zM 213.904,157.288L 282.259,157.288L 282.259,143.292L 213.904,143.292zM 151.441,135.848L 292.273,135.848L 292.273,121.858L 151.441,121.858zM 448.506,313.522l-35.428,0 l0,41.951 c0,8.758-7.607,15.861-16.996,15.861L 63.494,371.334 c-9.387,0-16.996-7.104-16.996-15.861l0-205.15 
-		c0-8.754, 7.609-15.848, 16.996-15.848l 35.428,0 l0-41.963 c0-8.751, 7.607-15.846, 16.998-15.846l 332.586,0 
-		c 9.389,0, 16.996,7.095, 16.996,15.846L 465.502,297.661 C 465.502,306.423, 457.895,313.522, 448.506,313.522z M 98.922,297.661L 98.922,162.89 L 74.914,162.89 
-		L 74.914,342.918 l 309.75,0 l0-29.396 L 115.92,313.522 C 106.529,313.522, 98.922,306.423, 98.922,297.661z M 440.318,101.85L 124.107,101.85 l0,81.535 l 316.211,0 L 440.318,101.85 z
-		 M 440.318,250.502L 124.107,250.502 l0,37.836 l 316.211,0 L 440.318,250.502 z"  />
-<glyph unicode="&#xe0f5;" d="M 255.88,223.952L 42.096,99.475L 42.096,348.432 zM 466.399,223.952L 252.614,99.475L 252.614,348.432 z"  />
-<glyph unicode="&#xe0f6;" d="M 36.768,413.445l0-377.107 l 436.661,0 L 473.429,413.445 L 36.768,413.445 z M 437.395,70.271L 73.74,70.271 L 73.74,341.347 l 363.654,0 L 437.394,70.271 zM 254.055,285.813L 369.632,139.321L 138.48,139.323 z"  />
-<glyph unicode="&#xe0f7;" d="M 246.486,180.69l-85.604,91.047l-58.21-107.66l0-29.658 l 289.12,0 c-36.821,31.753-114.476,99.682-114.476,99.682L 246.486,180.69z
-	 M 347,249.214c 16.062,0, 29.073,13, 29.073,29.060c0,16.040-13.012,29.062-29.073,29.062c-16.019,0-29.038-13.021-29.038-29.062
-	C 317.962,262.214, 330.981,249.214, 347,249.214z M 37.74,377.301l0-306.569 l 434.688,0 L 472.428,377.301 L 37.74,377.301 z M 433.822,109.385L 77.635,109.385 
-	l-0.016,228.033l 354.928,0 l0-0.017 l 1.275,0 L 433.822,109.385 z"  />
-<glyph unicode="&#xe0f8;" d="M 254.621-1.605c-55.604-0.036-111.517,21.319-153.936,63.766l0,0c-42.451,42.425-63.807,98.339-63.77,153.944l0,0
-		c-0.037,55.605, 21.318,111.52, 63.773,153.942l0,0c 12.921,12.917, 33.87,12.917, 46.79-0.006l0,0
-		c 12.921-12.919, 12.914-33.87-0.005-46.789l0,0c-29.652-29.675-44.347-68.253-44.384-107.147l0,0
-		c 0.038-38.892, 14.732-77.478, 44.389-107.157l0,0c 29.661-29.645, 68.248-44.339, 107.142-44.376l0,0
-		c 38.894,0.037, 77.481,14.728, 107.154,44.376l0,0c 29.65,29.68, 44.346,68.266, 44.382,107.157l0,0
-		c-0.036,38.888-14.731,77.472-44.382,107.153l0,0l0-0.006 c-12.92,12.925-12.92,33.873,0,46.795l0,0
-		c 12.921,12.917, 33.867,12.917, 46.794,0l0,0c 42.445-42.426, 63.803-98.336, 63.758-153.942l0,0
-		c 0.045-55.605-21.316-111.52-63.764-153.944l0,0c-42.391-42.416-98.238-63.768-153.8-63.766l0,0
-		C 254.718-1.605, 254.664-1.605, 254.621-1.605L 254.621-1.605zM 221.537,216.099L 221.537,415.835 c0,18.269, 14.812,33.085, 33.088,33.085l0,0c 18.276,0, 33.086-14.816, 33.086-33.085l0,0l0-199.736 
-		c0-18.269-14.811-33.083-33.086-33.083l0,0C 236.349,183.016, 221.537,197.83, 221.537,216.099L 221.537,216.099z"  />
-<glyph unicode="&#xe0f9;" d="M 137.521,309.864l 139.212,0 l 42.217,51.146L 86.393,361.010 l0-185.291 L 38.385,175.719 l 73.549-89.145l 73.594,89.145l-48.007,0 L 137.521,309.864 z
-	 M 400.818,361.532l-73.58-89.145l 48.008,0 l0-134.112 L 236.053,138.275 l-42.221-51.162l 232.56,0.021L 426.392,272.388 l 48.022,0 L 400.818,361.532z"  />
-<glyph unicode="&#xe0fa;" d="M 479.66,275.917c-1.171,3.598-4.549,6.057-8.334,6.057L 311.987,281.974 L 262.668,433.448c-1.177,3.597-4.543,6.044-8.329,6.050
-	c-3.78,0.006-7.156-2.438-8.332-6.038l-49.596-151.486L 37.348,281.974 c-3.785,0-7.164-2.454-8.333-6.050c-1.168-3.603, 0.115-7.57, 3.171-9.801
-	l 128.717-93.759l-49.595-152.322c-1.175-3.598, 0.115-7.57, 3.177-9.803c 3.063-2.224, 7.237-2.224, 10.301,0l 129.542,94.046
-	l 129.276-94.046c 1.539-1.119, 3.343-1.68, 5.151-1.68c 1.805,0, 3.612,0.561, 5.153,1.68c 3.088,2.243, 4.357,6.184, 3.186,9.803
-	l-49.604,152.318l 128.987,93.756C 479.54,268.34, 480.828,272.315, 479.66,275.917z"  />
-<glyph unicode="&#xe0fb;" d="M 219.141,115.961c0-18.901, 15.304-34.207, 34.176-34.207c 18.897,0, 34.202,15.306, 34.202,34.207
-	c0,18.886-34.202,59.12-34.202,59.12S 219.141,134.847, 219.141,115.961z M 110.309,68.15c0-18.885, 15.305-34.19, 34.207-34.19
-	c 18.868,0, 34.172,15.306, 34.172,34.19c0,18.886-34.172,59.138-34.172,59.138S 110.309,87.036, 110.309,68.15z M 327.973,68.15
-	c0-18.885, 15.305-34.19, 34.172-34.19c 18.901,0, 34.207,15.306, 34.207,34.19c0,18.886-34.207,59.138-34.207,59.138
-	S 327.973,87.036, 327.973,68.15z M 374.081,317.517c 1.632,6.227, 2.52,12.786, 2.52,19.525c0,42.56-34.535,77.077-77.080,77.077
-	c-32.012,0-59.451-19.512-71.125-47.272c-10.007,11.755-24.887,19.211-41.532,19.211c-30.15,0-54.577-24.413-54.577-54.546
-	c0-5.181, 0.717-10.188, 2.091-14.945c-24.592-9.026-42.153-32.653-42.153-60.401c0-35.498, 28.747-64.291, 64.293-64.291l 198.205,0 
-	c 35.581,0, 64.323,28.793, 64.323,64.291C 419.045,284.96, 400.178,309.29, 374.081,317.517z"  />
-<glyph unicode="&#xe0fc;" d="M 255.091,257.098l-0.059,0 c-13.374-0.012-26.839,3.171-39.051,9.582L 114.008,2.031l 48.297,0 l 8.205,21.296l 83.722,33.747
-	l 84.673-33.521l 8.295-21.521l 48.296,0 L 293.537,266.639C 281.543,260.315, 268.316,257.098, 255.091,257.098z M 254.75,241.95
-	l 14.659-38.041l-29.314,0 L 254.75,241.95z M 230.444,178.871l 48.613,0 l 6.43-16.686l-29.924-17.277l-30.952,18.822L 230.444,178.871z
-	 M 215.463,139.986l 15.38-9.352l-24.414-14.094L 215.463,139.986z M 326.657,55.335l-67.855,26.86l-9.292-0.024l-66.684-26.883
-	l 9.272,24.065l 63.137,36.453l 62.845-38.213L 326.657,55.335z M 303.337,115.857l-23.383,14.219l 14.646,8.457L 303.337,115.857z
-	 M 142.009,274.042c 4.806,0, 9.611,1.831, 13.279,5.495c 7.335,7.336, 7.335,19.229, 0.004,26.56l-0.004,0 
-	c-9.501,9.514-14.174,21.809-14.195,34.281c 0.021,12.465, 4.693,24.76, 14.195,34.269c 7.335,7.332, 7.335,19.226, 0.004,26.556
-	c-7.336,7.335-19.224,7.338-26.56,0.002c-16.764-16.741-25.223-38.873-25.202-60.827c-0.021-21.958, 8.438-44.086, 25.202-60.841
-	C 132.398,275.873, 137.202,274.042, 142.009,274.042z M 354.627,401.205c-7.336-7.332-7.336-19.226,0-26.555
-	c 9.5-9.515, 14.174-21.804, 14.195-34.276c-0.021-12.464-4.695-24.761-14.195-34.273c-7.336-7.337-7.336-19.231,0-26.561
-	c 3.668-3.667, 8.476-5.498, 13.279-5.498c 4.807,0, 9.614,1.831, 13.279,5.498c 16.76,16.756, 25.219,38.878, 25.197,60.834
-	c 0.021,21.955-8.438,44.086-25.197,60.834C 373.85,408.541, 361.958,408.541, 354.627,401.205z M 95.168,268.625
-	c-19.85,19.865-29.698,45.725-29.718,71.753c 0.020,26.027, 9.875,51.887, 29.718,71.741c 7.333,7.336, 7.333,19.223,0,26.559
-	c-7.334,7.333-19.222,7.333-26.559,0c-27.11-27.093-40.739-62.787-40.719-98.3c-0.021-35.514, 13.609-71.207, 40.719-98.31
-	c 3.667-3.664, 8.476-5.497, 13.281-5.497c 4.807,0, 9.61,1.833, 13.278,5.497c 7.333,7.335, 7.333,19.224, 0.006,26.557L 95.168,268.625 z
-	 M 441.303,438.678c-7.332,7.333-19.228,7.333-26.557,0c-7.335-7.336-7.335-19.223,0-26.556c 19.845-19.86, 29.697-45.717, 29.718-71.748
-	c-0.021-26.026-9.873-51.881-29.724-71.746c-7.332-7.333-7.329-19.23, 0.006-26.562c 3.665-3.665, 8.469-5.497, 13.273-5.497
-	c 4.806,0, 9.615,1.832, 13.283,5.503c 27.106,27.1, 40.741,62.79, 40.717,98.303C 482.044,375.889, 468.414,411.581, 441.303,438.678z
-	 M 254.75,284.559c 30.827,0, 55.812,24.99, 55.812,55.812c0,30.827-24.985,55.815-55.812,55.815c-30.822,0-55.812-24.988-55.812-55.815
-	C 198.938,309.549, 223.928,284.559, 254.75,284.559z"  />
-<glyph unicode="&#xe0fd;" d="M 412.084,262.958l-45.748,0 L 157.24,364.76c-2.322,13.228-13.832,23.3-27.73,23.3c-15.564,0-28.191-12.606-28.191-28.174
-	c0-15.579, 12.627-28.207, 28.191-28.207c 5.853,0, 11.247,1.784, 15.73,4.828l 151.080-73.549L 100.73,262.958 c-6.834,0-12.363-5.524-12.363-12.327
-	L 88.367,72.11 c0-6.817, 5.529-12.342, 12.363-12.342l 311.354,0 c 6.836,0, 12.328,5.524, 12.328,12.342L 424.412,250.631 
-	C 424.412,257.434, 418.92,262.958, 412.084,262.958z M 197.43,95.279c-36.264,0-65.697,29.416-65.697,65.684
-	c0,36.281, 29.434,65.666, 65.697,65.666c 36.266,0, 65.667-29.384, 65.667-65.666C 263.097,124.695, 233.695,95.279, 197.43,95.279z
-	 M 346.746,108.969c-10.366,0-18.772,8.385-18.772,18.751c0,10.367, 8.406,18.773, 18.772,18.773c 10.367,0, 18.77-8.406, 18.77-18.773
-	C 365.516,117.354, 357.113,108.969, 346.746,108.969z M 346.746,174.127c-10.366,0-18.772,8.384-18.772,18.751
-	c0,10.366, 8.406,18.759, 18.772,18.759c 10.367,0, 18.77-8.393, 18.77-18.759C 365.516,182.511, 357.113,174.127, 346.746,174.127z"  />
-<glyph unicode="&#xe0fe;" d="M 214.738,337.929c-10.892-10.9-16.312-25.036-16.321-39.271l0,0c 0.021-14.382, 5.4-28.608, 16.33-39.547l0,0
-		c 10.911-10.904, 25.097-16.308, 39.406-16.322l0,0c 14.304,0.015, 28.486,5.418, 39.401,16.322l0,0
-		c 10.916,10.92, 16.316,25.106, 16.326,39.41l0,0c-0.010,14.309-5.41,28.489-16.326,39.407l0,0
-		c-10.92,10.912-25.098,16.312-39.401,16.328l0,0C 239.844,354.241, 225.658,348.841, 214.738,337.929L 214.738,337.929zM 129.695,238.908c-16.768,16.752-25.22,38.886-25.198,60.834l0,0c-0.022,21.954, 8.43,44.086, 25.198,60.834l0,0
-		c 7.336,7.336, 19.227,7.336, 26.561,0l0,0c 7.33-7.336, 7.33-19.228-0.005-26.562l0,0c-9.497-9.508-14.176-21.8-14.193-34.271l0,0
-		c 0.017-12.473, 4.692-24.762, 14.193-34.279l0,0l 0.005,0 c 7.33-7.334, 7.33-19.224-0.005-26.555l0,0c-3.668-3.667-8.473-5.5-13.282-5.5
-		l0,0C 138.165,233.408, 133.36,235.241, 129.695,238.908L 129.695,238.908zM 355.592,238.902c-7.335,7.337-7.34,19.223-0.005,26.559l0,0c 9.503,9.527, 14.181,21.818, 14.198,34.283l0,0
-		c-0.018,12.47-4.695,24.762-14.193,34.273l0,0l0-0.004 c-7.335,7.335-7.335,19.225,0,26.559l0,0c 7.332,7.336, 19.221,7.336, 26.556,0
-		l0,0c 16.765-16.744, 25.219-38.88, 25.199-60.828l0,0c 0.020-21.954-8.442-44.076-25.193-60.832l0,0
-		c-3.666-3.671-8.474-5.504-13.284-5.504l0,0C 364.064,233.408, 359.264,235.241, 355.592,238.902L 355.592,238.902zM 69.571,201.438c-27.111,27.101-40.733,62.79-40.717,98.304l0,0c-0.017,35.522, 13.605,71.215, 40.725,98.301l0,0
-		c 7.337,7.334, 19.223,7.334, 26.558,0l0,0c 7.331-7.336, 7.327-19.225-0.005-26.562l0,0c-19.845-19.843-29.692-45.7-29.717-71.739l0,0
-		c 0.025-26.027, 9.872-51.881, 29.717-71.754l0,0l 0.005,0 c 7.331-7.327, 7.331-19.221-0.005-26.558l0,0
-		c-3.668-3.663-8.473-5.496-13.279-5.496l0,0C 78.048,195.935, 73.239,197.77, 69.571,201.438L 69.571,201.438zM 415.711,201.431c-7.338,7.337-7.338,19.225-0.009,26.56l0,0c 19.854,19.863, 29.706,45.725, 29.722,71.746l0,0
-		c-0.016,26.034-9.867,51.895-29.713,71.757l0,0l0-0.012 c-7.338,7.337-7.338,19.226,0,26.562l0,0c 7.331,7.334, 19.221,7.334, 26.557,0
-		l0,0c 27.107-27.095, 40.742-62.792, 40.718-98.307l0,0c 0.024-35.514-13.61-71.201-40.71-98.306l0,0
-		c-3.668-3.667-8.477-5.502-13.282-5.502l0,0C 424.186,195.929, 419.378,197.764, 415.711,201.431L 415.711,201.431zM 254.217,216.469l-0.068,0 c-7.855-0.010-15.728,1.111-23.353,3.335l0-177.368 l 46.705,0 l0,177.37 
-	C 269.901,217.586, 262.053,216.469, 254.217,216.469z"  />
-<glyph unicode="&#xe0ff;" d="M 169.68,356.438c-16.466-9.026-30.677-20.406-42.498-34.143c-11.902-13.735-21.060-29.659-27.599-47.677
-	c-6.001-16.482-8.961-34.041-8.961-52.583c0-1.77, 0.017-3.535, 0.082-5.335l0-143.131 l 136.872,0 L 227.576,221.412 l-60.151,0 
-	c 0.456,20.405, 4.594,37.542, 12.293,51.553c 7.947,14.471, 22.793,25.655, 45.374,33.408l 2.484,0.849l0,67.040 l-4.136-0.545
-	C 204.131,371.235, 186.193,365.463, 169.68,356.438z M 419.406,306.374l 2.482,0.849l0,67.040 l-4.169-0.545
-	c-19.277-2.482-37.23-8.254-53.745-17.279c-16.479-9.026-30.673-20.406-42.511-34.143c-11.871-13.735-21.077-29.659-27.583-47.677
-	c-6.001-16.482-8.979-34.041-8.979-52.551c0-1.801, 0.032-3.566, 0.082-5.366l0-143.131 l 136.904,0 L 421.887,221.412 l-60.171,0 
-	c 0.44,20.405, 4.597,37.542, 12.297,51.553C 381.945,287.436, 396.823,298.621, 419.406,306.374z"  />
-<glyph unicode="&#xe100;" d="M 183.656,439.956L 40.519,439.956 l0-143.15 l 143.137,0 L 183.656,439.956 z M 164.428,316.020L 59.747,316.020 L 59.747,420.71 l 104.682,0 L 164.429,316.020 z M 245.593,439.956l-40.552,0 
-			L 205.041,399.34 l 21.389,0 l0-21.354 l 19.163,0 L 245.593,439.956 z M 307.595,439.956l-40.615,0 L 266.98,420.71 l 19.228,0 l0-42.724 l 21.388,0 L 307.596,439.956 z M 328.914,439.956l0-143.15 l 143.171,0 
-			L 472.085,439.956 L 328.914,439.956 z M 452.855,316.020l-104.68,0 L 348.175,420.71 l 104.68,0 L 452.855,316.020 z M 143.070,399.34L 81.104,399.34 l0-61.952 l 61.966,0 L 143.070,399.34 z M 431.469,399.34
-			l-61.939,0 l0-61.952 l 61.939,0 L 431.469,399.34 z M 226.43,377.986l-21.389,0 l0-19.227 l 21.389,0 L 226.43,377.986 z M 286.207,337.388l0,40.599 l-19.228,0 l0-19.227 l-40.55,0 
-			l0-21.372 L 286.207,337.388 z M 266.979,234.849l0,40.586 l 19.228,0 l0,21.371 l-19.228,0 L 266.979,316.020 l-21.387,0 l0-19.214 L 226.43,296.806 L 226.43,316.020 l-21.389,0 l0-40.585 l 21.389,0 
-			l0-21.356 l-21.389,0 l0,21.356 L 143.070,275.435 l0-21.356 l 40.585,0 l0-19.229 l 21.385,0 l0-21.351 l 21.389,0 l0,21.351 L 266.979,234.85 z M 307.595,316.020l-21.388,0 l0-19.214 
-			l 21.388,0 L 307.595,316.020 z M 40.519,275.435l0-40.586 l 19.228,0 l0,40.586 L 40.519,275.435 z M 81.104,275.435l0-21.356 l 40.613,0 l0,21.356 L 81.104,275.435 z M 307.595,254.078
-			l0,21.356 l-21.388,0 l0-21.356 L 307.595,254.078 z M 328.914,275.435l0-21.356 l 19.262,0 l0,21.356 L 328.914,275.435 z M 410.113,254.078l0,21.356 l-19.227,0 l0-21.356 
-			l-42.711,0 l0-59.808 l-19.262,0 l0-21.389 l 40.615,0 l0-21.353 l-40.615,0 l0-19.223 l 19.262,0 l0-42.739 l-19.262,0 l0-40.585 l-21.319,0 l0,61.934 l-21.388,0 l0-83.284 
-			l 42.707,0 l0-19.229 l 61.973,0 l0,19.229 l-21.357,0 l0,21.351 l-21.354,0 l0,21.356 l 21.354,0 l0,61.968 l 21.357,0 l0,61.964 l 19.227,0 l0,19.228 l-40.584,0 l0,21.351 
-			l 61.939,0 l0,19.229 L 410.113,254.078 z M 431.469,254.078l 21.387,0 l0-19.229 l-21.387,0 l0-40.578 l 21.387,0 l0,19.228 l 19.229,0 l0,61.937 l-40.616,0 L 431.469,254.078 z
-			 M 143.070,254.078l-21.353,0 l0-19.229 L 59.747,234.849 l0-21.351 l 21.357,0 l0-19.228 L 59.747,194.27 l0-21.389 l 42.743,0 l0,21.389 l 19.228,0 l0,19.228 l 61.938,0 l0,21.351 L 143.070,234.849 
-			L 143.070,254.078 z M 328.914,234.849l-21.319,0 l0-21.351 l 21.319,0 L 328.914,234.849 z M 40.519,213.498l0-19.228 l 19.228,0 l0,19.228 L 40.519,213.498 z M 226.43,213.498
-			l0-19.228 l 19.163,0 l0,19.228 L 226.43,213.498 z M 307.595,172.882l0,40.616 l-40.615,0 l0-19.228 l 19.228,0 l0-21.389 l-19.228,0 l0-40.575 l 19.228,0 l0,19.223 l 42.707,0 
-			l0,21.353 L 307.595,172.882 z M 164.428,172.882l 19.228,0 l0,21.389 l-19.228,0 L 164.428,172.882 z M 245.593,194.271l0-21.389 l 21.387,0 l0,21.389 L 245.593,194.271 z
-			 M 472.085,151.529l0,42.741 l-19.229,0 l0-42.741 L 472.085,151.529 z M 205.041,110.916l 21.389,0 l0,40.613 l 19.163,0 l0,21.353 l-40.552,0 L 205.041,110.916 z
-			 M 410.113,151.529l 21.355,0 l0,21.353 l-21.355,0 L 410.113,151.529 z M 40.519,8.402l 143.137,0 L 183.656,151.529 L 40.519,151.529 L 40.519,8.402 z M 59.747,132.307l 104.682,0 
-			l0-104.675 L 59.747,27.632 L 59.747,132.307 z M 328.914,132.307l-21.319,0 l0-21.391 l 21.319,0 L 328.914,132.307 z M 410.113,110.916l0-21.349 l 21.355,0 l0-19.229 l 21.387,0 l0,40.577 
-			l-21.387,0 l0,21.391 l-40.582,0 l0-21.391 L 410.113,110.915 z M 472.085,132.307l-19.229,0 l0-21.391 l 19.229,0 L 472.085,132.307 z M 81.104,48.982l 61.966,0 l0,61.934 
-			L 81.104,110.916 L 81.104,48.982 z M 245.593,89.567l-40.552,0 l0-40.585 l 21.389,0 l0,21.356 l 19.163,0 l0-21.356 l 21.387,0 l0,61.934 l-21.387,0 L 245.593,89.567 z
-			 M 390.887,70.339l 19.227,0 l0,19.229 l-19.227,0 L 390.887,70.339 z M 452.855,27.632l 19.229,0 l0,21.351 l-19.229,0 L 452.855,27.632 z M 205.041,8.402l 61.938,0 
-			l0,19.229 l-61.938,0 L 205.041,8.402 z M 410.113,8.402l 21.355,0 l0,19.229 l-21.355,0 L 410.113,8.402 z"  />
-<glyph unicode="&#xe101;" d="M 151.92,159.939L 72.639,40.403l 119.24,79.868c-7.361,6.017-14.605,12.553-21.63,19.576
-	C 163.74,146.359, 157.612,153.086, 151.92,159.939z M 389.684,357.271c-34.521,34.52-75.025,49.983-90.471,34.541
-	c-4.723-4.725-6.543-11.802-5.821-20.326c-0.318-6.984-1.187-13.398-2.536-19.283l-59.557-59.557
-	c-18.267-5.196-35.852-5.529-45.293-5.2c-19.958,6.244-36.812,5.263-46.569-4.493c-21.638-21.638-0.239-78.106, 47.784-126.133
-	c 48.026-48.026, 104.493-69.418, 126.129-47.781c 8.24,8.239, 10.223,21.534, 6.889,37.488l 0.19-0.189c0,0-3.414,27.452, 5.060,55.496
-	l 56.104,56.105c 6.793,1.702, 14.314,2.757, 22.654,3.016c 8.368-0.644, 15.32,1.188, 19.978,5.847
-	C 439.668,282.245, 424.207,322.748, 389.684,357.271z"  />
-<glyph unicode="&#xe102;" d="M 189.611,246.543L 170.529,195.596L 38.219,195.596L 38.219,246.738L 135.082,246.738L 200.043,420.275L 249.373,217.143L 295.156,360.725L 341.020,240.264L 343.865,246.738L 474.18,246.738L 474.18,195.596L 377.234,195.596L 337.588,105.533L 299.441,205.762L 242.734,27.832L 189.611,246.543 	z"  />
-<glyph unicode="&#xe103;" d="M 451.941,309.212c0,11.111-9.008,20.118-20.119,20.118l-54.1,0 L 134.27,329.33 L 80.176,329.33 c-11.107,0-20.117-9.007-20.117-20.118l0-136.168 
-		l 391.883,0 L 451.942,309.212 z M 202.531,215.794L 98.736,215.794 l0,23.678 l 103.795,0 L 202.531,215.794 z M 202.531,265.298L 98.736,265.298 l0,23.68 l 103.795,0 L 202.531,265.298 z
-		 M 296.557,190.052c-34.371,0-62.332,27.964-62.332,62.332c0,34.37, 27.961,62.335, 62.332,62.335s 62.334-27.965, 62.334-62.335
-		C 358.891,218.016, 330.928,190.052, 296.557,190.052z M 402.553,271.237c-9.877,0-17.889,8.011-17.889,17.89
-		c0,9.878, 8.012,17.888, 17.889,17.888c 9.879,0, 17.889-8.010, 17.889-17.888C 420.441,279.248, 412.432,271.237, 402.553,271.237zM 78.559,149.365L 141.135,149.365L 141.135,118.67L 78.559,118.67zM 370.859,149.365L 433.437,149.365L 433.437,118.67L 370.859,118.67zM 296.557,293.162c-22.518,0-40.775-18.256-40.775-40.778c0-22.52, 18.258-40.774, 40.775-40.774
-		c 22.523,0, 40.777,18.255, 40.777,40.774C 337.334,274.906, 319.080,293.162, 296.557,293.162z"  />
-<glyph unicode="&#xe104;" d="M 397.727,223.952L 111.027,57.020L 111.027,390.886 z"  />
-<glyph unicode="&#xe105;" d="M 230.656,371.41l 0.066,0 l 53.535-0.101c 0.031,0.032, 0.062,0.047, 0.082,0.064c-9.307-6.295-16.63-15.5-20.457-26.664
-	l-63.18-184.293c-0.292-0.835-0.538-1.654-0.785-2.483l 0.36,183.174C 200.311,357.869, 213.914,371.41, 230.656,371.41z
-	 M 71.891,224.004c-12.722,10.954-14.126,30.15-3.173,42.841l 29.891,34.648c 0.425-1.326, 0.865-2.651, 1.389-3.944L 161.2,146.929
-	L 71.891,224.004z M 177.778,341.129l-0.343-174.385l-56.592,139.277c-6.311,15.535, 1.146,33.258, 16.677,39.586l 45.653,18.558
-	C 179.774,357.197, 177.811,349.383, 177.778,341.129z M 448.223,281.527l-63.18-184.289c-4.317-12.621-16.123-20.57-28.746-20.57
-	c-3.27,0-6.57,0.54-9.844,1.669l-105.595,36.182c-15.859,5.429-24.33,22.73-18.866,38.604l 63.177,184.292
-	c 4.317,12.607, 16.123,20.541, 28.744,20.541c 3.242,0, 6.574-0.53, 9.844-1.655l 105.562-36.186
-	C 445.212,314.67, 453.65,297.406, 448.223,281.527z"  />
-<glyph unicode="&#xe106;" d="M 365.348,361.331c-24.918,24.931-23.123,45.422-23.123,45.422l-27.695,0.062l 0.065-257.229
-	c-14.259,4.984-31.329,5.92-48.694,1.567c-38.554-9.646-63.799-41.468-56.411-71.063c 7.392-29.595, 44.671-45.749, 83.263-36.1
-	c 33.875,8.503, 57.488,34.104, 57.684,60.266L 350.437,290.511 c0,0, 75.215-9.448, 68.54-57.537c-6.636-48.091-13.896-64.323-13.896-64.323
-	l 10.039-10.055c0,0, 29.689,55.327, 32.079,90.859C 451.809,318.459, 393.107,333.6, 365.348,361.331z M 256.088,414.631L 59.848,414.631 l0-51.146 
-	l 196.24,0 L 256.088,414.631 z M 256.088,323.396L 59.848,323.396 l0-51.147 l 196.24,0 L 256.088,323.396 z M 256.088,232.187L 59.848,232.187 l0-51.157 l 196.24,0 L 256.088,232.187 z M 59.848,89.804
-	l 101.373,0 l0,51.148 L 59.848,140.952 L 59.848,89.804 z"  />
-<glyph unicode="&#xe107;" d="M 437.433,262.556l-0.070,0 c-18.95,0-38.133-22.244-38.133-3.306l0,102 l-96.227,0 c-22.758,0, 3.977-23.061, 3.977-45.826l0-0.083 
-	c0-22.771-18.46-41.228-41.218-41.228c-22.766,0-41.223,18.457-41.223,41.228l-0.078,0.083c0,22.252, 28.295,45.826, 5.527,45.826
-	L 124.264,361.25 l0-97.288 c0-22.767-23.572,5.529-45.822,5.529l-0.086-0.081c-22.769,0-41.228-18.454-41.228-41.222
-	c0-22.756, 18.459-41.217, 41.228-41.217l 0.086,0 c 22.763,0, 45.822,26.734, 45.822,3.979l0-104.666 l 110.438,0 
-	c 18.937,0-3.306,19.18-3.306,38.128l0,0.074 c0,18.938, 15.353,34.293, 34.292,34.293c 18.947,0, 34.298-15.354, 34.298-34.293l 0.057-0.074
-	c0-18.519-23.533-38.128-4.591-38.128l 103.778,0 L 399.23,198.501 c0,18.938, 19.612-4.595, 38.133-4.595l 0.070,0.059
-	c 18.938,0, 34.294,15.352, 34.294,34.299C 471.727,247.203, 456.37,262.556, 437.433,262.556z"  />
-<glyph unicode="&#xe108;" d="M 314.992,174.608c 5.872-72.313-34.037-161.206-34.037-161.206s-10.117-4.848-25.144-4.848
-		c-14.985,0-25.378,4.848-25.378,4.848s-39.93,88.893-34.059,161.206c0,0, 9.413,30.408, 59.776,30.408
-		S 314.992,174.608, 314.992,174.608zM 256.071,342.373c 58.295-0.089, 105.458-47.262, 105.558-105.596c-0.061-31.896-12.681-60.379-29.485-84.446
-	c 25.291,13.313, 57.188,41.241, 57.21,84.446c-0.021,73.636-59.693,133.281-133.283,133.299l-0.397,0 
-	c-73.587-0.018-133.263-59.663-133.281-133.299c 0.019-43.205, 31.909-71.133, 57.209-84.446
-	c-16.802,24.067-29.432,52.55-29.485,84.446c 0.101,58.334, 47.264,105.507, 105.557,105.596L 256.071,342.373 z M 255.695,441.434
-	c-113.050,0-204.626-91.605-204.645-204.609c0-30.313, 6.61-59.114, 18.434-84.995c 23.731-51.872, 68.499-83.394, 123.404-97.714
-	l-3.725,7.703c-41.927,20.549-75.833,60.809-94.536,101.859c-10.158,22.283-15.813,47.053-15.861,73.146
-	c 0.158,97.713, 79.223,176.721, 176.929,176.92c 97.685-0.199, 176.729-79.207, 176.897-176.92
-	c-0.129-72.83-44.094-144.15-106.927-174.631l-3.191-8.383c 80.206,24.637, 137.833,93.402, 137.845,183.014
-	C 460.298,349.828, 368.703,441.434, 255.695,441.434zM 300.731,265.078c0-24.882-20.174-45.057-45.058-45.057c-24.862,0-45.036,20.175-45.036,45.057
-	c0,24.876, 20.174,45.051, 45.036,45.051C 280.558,310.129, 300.731,289.954, 300.731,265.078z"  />
-<glyph unicode="&#xe109;" d="M 256,430.244C 142.1,430.244, 49.758,337.902, 49.758,224S 142.1,17.756, 256,17.756c 113.902,0, 206.242,92.342, 206.242,206.244
-		S 369.902,430.244, 256,430.244z M 256,46.863c-97.674,0-177.137,79.463-177.137,177.137S 158.326,401.137, 256,401.137
-		S 433.135,321.674, 433.135,224S 353.674,46.863, 256,46.863zM 410.152,224.537c0,0.010,0,0.021,0,0.035c0,0.012,0,0.033,0,0.051c0,0,0,0.006,0,0.008c0,0.035,0,0.072,0,0.105
-		c0,0.008,0,0.016,0,0.021c0,0.035,0,0.070,0,0.105c0,0.002,0,0.008,0,0.010c0,0.021,0,0.035,0,0.055c0,0.008,0,0.018,0,0.027
-		c0,0.027-0.002,0.047-0.002,0.074c0,0.016,0,0.031,0,0.049c0,0.008-0.004,0.025-0.004,0.033c0,0.029,0,0.055,0,0.082
-		c0,0.004,0,0.010,0,0.014c0,0.129,0,0.26-0.002,0.391l-32.201-0.328c-0.143,14.137-2.676,27.701-7.24,40.295l 30.266,10.973
-		c-1.143,3.152-2.385,6.258-3.725,9.311c-0.002,0.004,0,0.002-0.004,0.006c-0.010,0.025-0.021,0.051-0.033,0.078l0,0.002 
-		c-0.012,0.025-0.023,0.049-0.033,0.076c-0.004,0.004-0.004,0.004-0.004,0.008c-0.023,0.053-0.045,0.104-0.068,0.156
-		c0,0.004-0.002,0.004-0.004,0.008c-0.023,0.051-0.045,0.104-0.066,0.152c-0.004,0.004-0.004,0.010-0.008,0.016
-		c-0.020,0.049-0.043,0.096-0.064,0.146c-0.004,0.008-0.004,0.008-0.004,0.018c-0.023,0.049-0.047,0.096-0.068,0.145
-		c-0.002,0.006-0.008,0.014-0.008,0.018c-0.008,0.023-0.023,0.047-0.031,0.072c0,0.004,0,0.002-0.006,0.004
-		c-0.008,0.025-0.018,0.045-0.027,0.066c0,0.004-0.008,0.016-0.010,0.021c-0.010,0.023-0.018,0.045-0.029,0.068
-		c-0.002,0.006-0.004,0.010-0.006,0.016c-0.010,0.018-0.020,0.037-0.027,0.057c0,0.004-0.006,0.016-0.010,0.020
-		c-0.010,0.025-0.020,0.045-0.029,0.066c-0.004,0.010-0.004,0.014-0.008,0.023c-0.010,0.018-0.016,0.033-0.023,0.051
-		c-0.006,0.008-0.010,0.016-0.014,0.025c-0.010,0.021-0.020,0.045-0.029,0.064c-0.004,0.008-0.004,0.010-0.010,0.020
-		c-0.008,0.020-0.014,0.035-0.023,0.055c-0.002,0.010-0.002,0.014-0.006,0.021c-0.010,0.021-0.021,0.045-0.033,0.064
-		c0,0.006-0.006,0.018-0.010,0.023c-0.004,0.018-0.014,0.037-0.023,0.051c-0.004,0.010-0.004,0.016-0.010,0.025
-		c-0.008,0.020-0.018,0.039-0.027,0.064c-0.004,0.004-0.012,0.020-0.014,0.025c-0.008,0.016-0.014,0.029-0.021,0.045
-		c-0.002,0.008-0.008,0.016-0.012,0.025c-0.010,0.021-0.020,0.043-0.025,0.062c-0.006,0.010-0.010,0.020-0.016,0.027
-		c-0.004,0.014-0.014,0.031-0.018,0.047c-0.006,0.008-0.010,0.020-0.014,0.029c-0.010,0.020-0.020,0.039-0.029,0.059
-		c-0.004,0.008-0.008,0.018-0.014,0.027c-0.004,0.016-0.014,0.031-0.018,0.047c-0.010,0.014-0.010,0.018-0.018,0.031
-		c-0.006,0.020-0.016,0.037-0.025,0.055c-0.004,0.010-0.010,0.021-0.014,0.029c-0.006,0.014-0.014,0.029-0.020,0.045
-		c-0.008,0.020-0.012,0.023-0.020,0.043c-0.006,0.014-0.012,0.031-0.020,0.045c-0.006,0.008-0.010,0.020-0.014,0.029
-		c-0.006,0.016-0.016,0.033-0.023,0.049c-0.006,0.014-0.010,0.023-0.016,0.037c-0.008,0.014-0.014,0.029-0.023,0.047
-		c-0.004,0.006-0.008,0.020-0.014,0.029c-0.004,0.014-0.014,0.029-0.018,0.041c-0.010,0.018-0.016,0.033-0.023,0.053
-		c-0.006,0.010-0.012,0.021-0.018,0.033c-0.004,0.014-0.010,0.023-0.014,0.033c-0.010,0.018-0.014,0.035-0.023,0.049
-		c-0.004,0.014-0.014,0.027-0.020,0.043c-0.004,0.012-0.014,0.025-0.018,0.037c-0.006,0.014-0.010,0.021-0.014,0.031
-		c-0.010,0.018-0.018,0.035-0.023,0.053c-0.010,0.018-0.016,0.025-0.020,0.039c-0.006,0.014-0.014,0.027-0.020,0.035
-		c-0.004,0.016-0.008,0.025-0.014,0.037c-0.010,0.020-0.016,0.037-0.025,0.057c-0.004,0.014-0.010,0.023-0.020,0.035
-		c-0.004,0.010-0.008,0.021-0.014,0.031c-0.004,0.014-0.010,0.023-0.016,0.037c-0.008,0.018-0.018,0.035-0.025,0.051
-		c-0.006,0.014-0.016,0.031-0.020,0.041c-0.004,0.014-0.010,0.023-0.014,0.033c-0.010,0.021-0.023,0.047-0.033,0.068
-		c-0.004,0.006-0.004,0.014-0.010,0.023s-0.014,0.027-0.018,0.039c-0.004,0.008-0.008,0.018-0.012,0.027
-		c-0.010,0.021-0.020,0.039-0.029,0.061c-0.004,0.010-0.010,0.023-0.014,0.031c-0.010,0.014-0.014,0.027-0.021,0.041
-		c-0.002,0.008-0.006,0.018-0.012,0.025c-0.010,0.021-0.023,0.047-0.033,0.068c-0.004,0.008-0.008,0.018-0.014,0.025
-		c-0.004,0.018-0.010,0.025-0.018,0.045c-0.006,0.002-0.006,0.010-0.010,0.018c-0.014,0.023-0.025,0.059-0.041,0.084
-		c0,0.002,0,0.004-0.004,0.010c-0.004,0.020-0.014,0.029-0.020,0.047c-0.004,0.004-0.004,0.012-0.008,0.014
-		c-0.012,0.027-0.029,0.061-0.043,0.086c0,0.006-0.002,0.010-0.004,0.014c-0.010,0.018-0.016,0.027-0.023,0.045
-		c0,0.008-0.006,0.016-0.010,0.021c-0.010,0.025-0.023,0.049-0.035,0.078c-0.002,0.004-0.008,0.010-0.008,0.014
-		c-0.008,0.020-0.014,0.031-0.021,0.047c0,0.004-0.004,0.008-0.004,0.014c-0.014,0.023-0.027,0.059-0.041,0.084
-		c-0.006,0.008-0.006,0.012-0.010,0.018c-0.023,0.051-0.045,0.094-0.070,0.145c0,0.004-0.002,0.006-0.004,0.010
-		c-0.023,0.051-0.045,0.1-0.068,0.146c-0.006,0.008-0.006,0.010-0.008,0.016c-0.025,0.051-0.043,0.094-0.072,0.148
-		c0,0.002,0,0.006-0.004,0.008c-0.023,0.049-0.047,0.098-0.070,0.145c0,0.006-0.006,0.014-0.008,0.018
-		c-0.023,0.049-0.047,0.098-0.070,0.146c0,0.002,0,0.002-0.004,0.006c-0.023,0.053-0.047,0.098-0.070,0.152
-		c-0.006,0.002-0.006,0.004-0.006,0.008c-0.027,0.051-0.049,0.098-0.072,0.152c-0.027,0.053-0.051,0.107-0.080,0.156
-		c-0.17,0.352-0.342,0.699-0.512,1.049c0,0,0,0.002-0.002,0.002c-4.193,8.438-9.133,16.432-14.738,23.904l-25.744-19.311
-		c-8.248,10.998-18.311,20.555-29.746,28.232l 17.947,26.719c-4.256,2.855-8.654,5.502-13.189,7.934
-		c-0.551,0.293-1.098,0.582-1.648,0.869c-0.004,0-0.006,0.002-0.008,0.006c-0.051,0.027-0.098,0.049-0.148,0.074
-		c-0.004,0.002-0.004,0.002-0.004,0.002c-0.051,0.029-0.104,0.053-0.154,0.080l-0.004,0.002c-0.051,0.027-0.098,0.051-0.148,0.078
-		c-0.004,0-0.004,0.004-0.010,0.004c-0.049,0.025-0.092,0.049-0.146,0.076c-0.004,0.002-0.006,0.004-0.010,0.004
-		c-0.033,0.016-0.066,0.035-0.096,0.051l0,0c-0.020,0.010-0.033,0.016-0.047,0.023c-0.006,0.002-0.010,0.006-0.014,0.006
-		c-0.033,0.018-0.062,0.031-0.094,0.047c0,0.002-0.006,0.002-0.006,0.004c-0.016,0.008-0.027,0.016-0.045,0.023
-		c-0.004,0.002-0.010,0.004-0.010,0.004c-0.031,0.018-0.064,0.033-0.092,0.051c-0.006,0-0.006,0.002-0.010,0.002
-		c-0.020,0.008-0.031,0.016-0.045,0.025c-0.006,0-0.006,0.002-0.010,0.004c-0.029,0.014-0.061,0.029-0.088,0.043
-		c-0.006,0.002-0.010,0.004-0.016,0.008c-0.018,0.010-0.027,0.014-0.043,0.023c-0.008,0.002-0.012,0.006-0.016,0.008
-		c-0.027,0.012-0.055,0.027-0.084,0.041c-0.004,0.002-0.010,0.006-0.014,0.008c-0.020,0.008-0.027,0.014-0.047,0.023
-		c-0.002,0-0.004,0.002-0.010,0.004c-0.025,0.016-0.053,0.029-0.082,0.043c-0.004,0.002-0.014,0.008-0.018,0.010
-		c-0.020,0.010-0.029,0.012-0.043,0.021c-0.006,0.004-0.014,0.006-0.020,0.008c-0.023,0.016-0.049,0.025-0.074,0.039
-		c-0.008,0.004-0.016,0.008-0.023,0.014c-0.012,0.006-0.031,0.012-0.039,0.020c-0.008,0.002-0.016,0.004-0.020,0.008
-		c-0.021,0.012-0.051,0.027-0.076,0.039c-0.006,0.004-0.014,0.006-0.020,0.010c-0.014,0.008-0.031,0.016-0.041,0.021
-		c-0.006,0.004-0.010,0.006-0.010,0.006c-0.027,0.012-0.061,0.029-0.090,0.043c-0.004,0.002-0.014,0.006-0.018,0.010
-		c-0.012,0.006-0.031,0.014-0.041,0.021c-0.004,0-0.004,0-0.004,0.002c-0.027,0.014-0.061,0.027-0.094,0.045
-		c-0.004,0.002-0.014,0.008-0.020,0.010c-0.043,0.020-0.096,0.049-0.137,0.068c-0.006,0.004-0.016,0.008-0.020,0.010
-		c-0.027,0.012-0.059,0.031-0.086,0.045c-0.004,0-0.006,0-0.010,0c-0.012,0.008-0.029,0.016-0.041,0.023
-		c-0.006,0.004-0.016,0.008-0.025,0.012c-0.018,0.010-0.027,0.016-0.047,0.021c-0.014,0.008-0.029,0.016-0.045,0.023
-		c-0.014,0.008-0.023,0.014-0.037,0.021c-0.010,0.006-0.021,0.008-0.033,0.014c-0.018,0.012-0.037,0.018-0.055,0.029
-		c-0.016,0.004-0.023,0.010-0.033,0.014c-0.012,0.008-0.025,0.016-0.041,0.021c-0.008,0.004-0.014,0.006-0.023,0.012
-		c-0.023,0.012-0.047,0.021-0.064,0.031c-0.010,0.006-0.020,0.010-0.029,0.016c-0.014,0.006-0.027,0.012-0.037,0.018
-		c-0.012,0.008-0.021,0.012-0.029,0.018c-0.020,0.010-0.045,0.020-0.062,0.029c-0.010,0.004-0.018,0.008-0.027,0.012
-		c-0.014,0.008-0.027,0.014-0.041,0.020c-0.010,0.008-0.020,0.014-0.031,0.018c-0.014,0.008-0.035,0.018-0.053,0.025
-		c-0.014,0.008-0.023,0.012-0.037,0.018c-0.010,0.004-0.027,0.014-0.037,0.020c-0.010,0.002-0.023,0.008-0.033,0.016
-		c-0.016,0.010-0.035,0.016-0.051,0.025c-0.012,0.004-0.025,0.012-0.037,0.018c-0.008,0.004-0.025,0.014-0.035,0.016
-		c-0.014,0.008-0.023,0.012-0.037,0.020c-0.018,0.008-0.037,0.018-0.055,0.025c-0.010,0.004-0.020,0.012-0.029,0.018
-		c-0.012,0.004-0.025,0.012-0.035,0.020c-0.014,0.002-0.029,0.010-0.041,0.014c-0.016,0.008-0.035,0.016-0.051,0.025
-		c-0.010,0.008-0.021,0.012-0.033,0.020c-0.014,0.006-0.023,0.008-0.035,0.016c-0.021,0.010-0.039,0.020-0.059,0.027
-		c-0.010,0.004-0.018,0.010-0.027,0.014c-0.014,0.008-0.027,0.014-0.041,0.018c-0.008,0.008-0.018,0.010-0.031,0.018
-		c-0.020,0.010-0.039,0.020-0.057,0.027c-0.010,0.006-0.021,0.010-0.029,0.016c-0.016,0.004-0.029,0.012-0.045,0.020
-		c-0.010,0.008-0.014,0.008-0.027,0.014c-0.018,0.010-0.041,0.020-0.061,0.029c-0.010,0.006-0.014,0.008-0.023,0.014
-		c-0.018,0.006-0.033,0.014-0.047,0.020c-0.010,0.004-0.018,0.010-0.027,0.014c-0.020,0.008-0.041,0.021-0.059,0.031
-		c-0.010,0.004-0.020,0.006-0.029,0.012c-0.014,0.006-0.031,0.016-0.047,0.021c-0.008,0.006-0.016,0.008-0.023,0.012
-		c-0.023,0.010-0.039,0.021-0.062,0.031c-0.010,0.004-0.020,0.008-0.025,0.010c-0.018,0.008-0.031,0.018-0.045,0.021
-		c-0.010,0.006-0.020,0.014-0.027,0.016c-0.020,0.010-0.043,0.020-0.061,0.027c-0.014,0.008-0.014,0.008-0.027,0.016
-		c-0.014,0.006-0.027,0.012-0.043,0.020c-0.008,0.004-0.021,0.010-0.031,0.014c-0.020,0.010-0.037,0.020-0.057,0.027
-		c-0.014,0.006-0.023,0.010-0.033,0.016c-0.012,0.008-0.025,0.012-0.035,0.018c-0.010,0.004-0.029,0.014-0.037,0.020
-		c-0.020,0.008-0.037,0.018-0.057,0.021c-0.010,0.006-0.023,0.014-0.029,0.018c-0.014,0.006-0.029,0.014-0.043,0.020
-		c-0.010,0.004-0.023,0.010-0.033,0.016c-0.016,0.010-0.037,0.018-0.057,0.027c-0.008,0.004-0.018,0.010-0.027,0.012
-		c-0.014,0.008-0.027,0.014-0.041,0.020c-0.014,0.008-0.027,0.014-0.039,0.020c-0.016,0.006-0.035,0.016-0.049,0.023
-		c-0.010,0.004-0.020,0.010-0.027,0.014c-0.020,0.008-0.033,0.016-0.051,0.023c-0.010,0.004-0.021,0.010-0.031,0.012
-		c-0.018,0.010-0.033,0.020-0.051,0.027c-0.010,0.006-0.020,0.010-0.029,0.014c-0.018,0.006-0.037,0.016-0.053,0.025
-		c-0.008,0.004-0.018,0.008-0.025,0.014c-0.018,0.008-0.037,0.014-0.055,0.023c-0.010,0.004-0.014,0.006-0.023,0.012
-		c-0.021,0.010-0.043,0.020-0.061,0.029c-0.006,0.002-0.020,0.008-0.023,0.010c-0.020,0.008-0.035,0.018-0.055,0.025
-		c-0.008,0.002-0.014,0.006-0.023,0.010c-0.020,0.012-0.041,0.021-0.062,0.029c-0.008,0.004-0.012,0.008-0.021,0.012
-		c-0.020,0.008-0.037,0.018-0.053,0.025c-0.004,0.002-0.016,0.008-0.020,0.010c-0.023,0.010-0.047,0.018-0.068,0.029
-		c-0.010,0.004-0.012,0.004-0.021,0.010c-0.016,0.008-0.033,0.018-0.051,0.021c-0.010,0.006-0.014,0.010-0.021,0.014
-		c-0.023,0.012-0.045,0.021-0.066,0.029c-0.008,0.004-0.014,0.008-0.023,0.012c-0.018,0.008-0.031,0.014-0.047,0.020
-		c-0.004,0.004-0.023,0.014-0.027,0.016c-0.018,0.010-0.041,0.018-0.062,0.027c-0.008,0.004-0.016,0.008-0.023,0.010
-		c-0.016,0.008-0.033,0.018-0.053,0.025c-0.006,0.004-0.014,0.006-0.020,0.012c-0.021,0.008-0.043,0.018-0.062,0.027
-		c-0.010,0.004-0.018,0.010-0.027,0.012c-0.014,0.010-0.033,0.016-0.049,0.023c-0.008,0.004-0.012,0.006-0.021,0.010
-		c-0.023,0.010-0.047,0.020-0.064,0.031c-0.004,0.002-0.018,0.008-0.023,0.010c-0.018,0.008-0.037,0.016-0.055,0.025
-		c-0.010,0.004-0.010,0.004-0.020,0.006c-0.021,0.012-0.043,0.021-0.066,0.033c-0.004,0.002-0.018,0.006-0.020,0.008
-		c-0.020,0.010-0.039,0.020-0.059,0.029c-0.006,0.002-0.008,0.002-0.012,0.006c-0.023,0.010-0.047,0.020-0.070,0.029
-		c-0.006,0.002-0.014,0.008-0.020,0.010c-0.023,0.010-0.039,0.020-0.061,0.029c-0.002,0.002-0.008,0.002-0.012,0.004
-		c-0.023,0.012-0.047,0.021-0.070,0.033c-0.004,0.002-0.018,0.006-0.023,0.008c-0.018,0.010-0.037,0.020-0.059,0.027
-		c-0.004,0.002-0.004,0.002-0.010,0.006c-0.021,0.010-0.045,0.021-0.068,0.031c-0.010,0.004-0.014,0.006-0.020,0.010
-		c-0.023,0.010-0.043,0.018-0.066,0.027c-0.002,0.002-0.002,0.002-0.006,0.006c-0.023,0.010-0.047,0.021-0.070,0.029
-		c-0.010,0.004-0.012,0.008-0.021,0.010c-0.021,0.012-0.045,0.021-0.062,0.031l-0.010,0.004c-0.021,0.010-0.045,0.020-0.068,0.029
-		c-0.010,0.004-0.010,0.004-0.018,0.008c-0.049,0.023-0.098,0.043-0.145,0.066c-0.004,0.002-0.014,0.004-0.018,0.008
-		c-0.023,0.012-0.047,0.020-0.070,0.031l-0.006,0.002c-0.023,0.010-0.047,0.021-0.068,0.029c-0.004,0.004-0.014,0.008-0.018,0.010
-		c-0.023,0.010-0.047,0.021-0.070,0.033c-0.006,0-0.006,0-0.010,0.002c-0.020,0.010-0.041,0.018-0.064,0.029
-		c-0.006,0.004-0.014,0.006-0.018,0.008c-0.023,0.012-0.047,0.020-0.070,0.033c-0.004,0.002-0.004,0.002-0.010,0.004
-		c-0.023,0.010-0.047,0.018-0.066,0.029c-0.006,0-0.008,0.004-0.012,0.006c-0.027,0.012-0.051,0.021-0.074,0.031l-0.010,0.006
-		c-0.023,0.008-0.043,0.018-0.066,0.029c-0.002,0.002-0.010,0.006-0.014,0.006c-0.027,0.012-0.049,0.021-0.074,0.033l-0.006,0.004
-		c-0.023,0.010-0.047,0.020-0.070,0.029c-0.006,0.002-0.008,0.004-0.012,0.004c-0.025,0.012-0.049,0.023-0.070,0.035
-		c-0.006,0-0.010,0.002-0.016,0.006c-0.018,0.010-0.041,0.018-0.062,0.027c-0.004,0.002-0.012,0.004-0.016,0.006
-		c-0.023,0.008-0.047,0.021-0.070,0.033c-0.004,0-0.006,0.002-0.012,0.004c-0.023,0.008-0.047,0.021-0.070,0.031l-0.004,0.002
-		c-0.029,0.012-0.053,0.021-0.080,0.035c-0.002,0.002-0.004,0.002-0.010,0.004c-0.021,0.008-0.045,0.018-0.066,0.029
-		c-0.004,0-0.006,0.004-0.010,0.006c-0.023,0.008-0.047,0.020-0.076,0.031c-0.004,0-0.004,0.004-0.008,0.006
-		c-0.023,0.008-0.051,0.020-0.074,0.031c-0.004,0, 0.002-0.002-0.002,0c-0.025,0.012-0.055,0.023-0.078,0.035
-		c-0.004,0.002-0.004,0.002-0.008,0.002c-0.023,0.012-0.053,0.023-0.074,0.033l-0.004,0 c-0.023,0.012-0.049,0.021-0.074,0.035
-		c-0.006,0.002-0.010,0.004-0.014,0.006c-0.053,0.021-0.1,0.041-0.148,0.064c-0.006,0.004-0.010,0.004-0.014,0.004
-		c-0.053,0.023-0.102,0.045-0.152,0.066l-0.010,0.006c-0.051,0.021-0.104,0.043-0.152,0.064c-0.006,0.004-0.006,0.006-0.012,0.006
-		c-0.025,0.012-0.049,0.021-0.074,0.031c-0.004,0.002-0.004,0.002-0.008,0.004c-0.023,0.010-0.047,0.020-0.068,0.029
-		c-0.004,0.002-0.010,0.004-0.014,0.008c-0.051,0.020-0.1,0.041-0.152,0.064c-0.006,0.002-0.006,0.002-0.010,0.004
-		c-0.023,0.010-0.051,0.020-0.074,0.033c-0.006,0.002-0.006,0-0.010,0.002c-0.023,0.012-0.047,0.020-0.070,0.029
-		c-0.004,0.002-0.004,0.004-0.010,0.004c-0.025,0.012-0.049,0.023-0.076,0.033l-0.006,0.006c-0.023,0.008-0.049,0.020-0.074,0.029
-		c-0.004,0.002,0,0.002-0.004,0.002c-0.027,0.010-0.049,0.023-0.078,0.033l-0.010,0.004c-0.023,0.008-0.045,0.020-0.068,0.029
-		l-0.010,0.006c-0.023,0.010-0.051,0.020-0.078,0.031l-0.004,0.002c-0.023,0.010-0.051,0.021-0.076,0.033l-0.004,0 
-		c-0.027,0.010-0.051,0.023-0.078,0.035l-0.004,0.002c-0.057,0.020-0.107,0.043-0.16,0.066c-0.004,0-0.004,0-0.008,0.004
-		c-0.051,0.021-0.102,0.041-0.152,0.064c-0.006,0.002-0.010,0.004-0.016,0.006c-0.021,0.008-0.043,0.018-0.070,0.027
-		c-0.004,0.004, 0.004,0-0.002,0.004c-0.027,0.012-0.051,0.021-0.080,0.031c-0.004,0.002-0.004,0.002-0.008,0.006
-		c-0.051,0.020-0.102,0.041-0.152,0.064c-0.006,0-0.010,0.002-0.016,0.004c-0.051,0.020-0.1,0.043-0.152,0.062
-		c-0.004,0.002-0.008,0.004-0.014,0.008c-0.047,0.020-0.096,0.041-0.146,0.061c-0.010,0.002-0.006,0.002-0.016,0.006
-		c-0.051,0.020-0.1,0.041-0.152,0.061c-0.004,0.004-0.008,0.006-0.014,0.008c-0.023,0.010-0.049,0.020-0.074,0.029
-		c-0.004,0.004,0,0-0.004,0.004c-0.023,0.010-0.045,0.020-0.068,0.027c-0.004,0.002-0.010,0.004-0.014,0.006
-		c-0.027,0.014-0.051,0.021-0.078,0.031c-0.004,0.002-0.002,0.002-0.006,0.002c-0.020,0.010-0.047,0.021-0.068,0.029
-		c-0.004,0-0.010,0.006-0.014,0.008c-0.023,0.010-0.053,0.020-0.076,0.031c-0.004,0-0.004,0-0.008,0.002
-		c-0.021,0.008-0.043,0.018-0.066,0.025c-0.002,0-0.012,0.006-0.016,0.008c-0.023,0.010-0.047,0.020-0.070,0.031l-0.016,0.002
-		c-0.021,0.010-0.045,0.020-0.064,0.029c-0.004,0-0.010,0.002-0.014,0.004c-0.021,0.010-0.051,0.020-0.074,0.033
-		c-0.004,0-0.008,0-0.014,0.002c-0.018,0.010-0.041,0.018-0.061,0.027c-0.004,0.002-0.014,0.004-0.018,0.008
-		c-0.021,0.008-0.045,0.018-0.068,0.027c-0.006,0-0.016,0.002-0.020,0.004c-0.020,0.010-0.041,0.018-0.061,0.027
-		c-0.010,0.006-0.010,0.002-0.020,0.008c-0.023,0.008-0.045,0.018-0.068,0.027c-0.004,0.002-0.010,0.004-0.016,0.008
-		c-0.021,0.008-0.039,0.014-0.061,0.023c-0.010,0.004-0.008,0.004-0.016,0.008c-0.023,0.008-0.047,0.018-0.070,0.027
-		c-0.006,0.002-0.016,0.006-0.020,0.008c-0.021,0.010-0.041,0.016-0.064,0.025c-0.004,0.002-0.008,0.004-0.014,0.004
-		c-0.023,0.010-0.047,0.020-0.070,0.029c-0.004,0.004-0.012,0.006-0.016,0.008c-0.023,0.010-0.043,0.016-0.066,0.025
-		c-0.004,0.002-0.006,0.002-0.008,0.004c-0.025,0.010-0.053,0.020-0.076,0.027c-0.010,0.006-0.010,0.006-0.018,0.010
-		c-0.021,0.010-0.041,0.016-0.061,0.025c-0.004,0-0.008,0.002-0.014,0.006c-0.023,0.010-0.047,0.020-0.070,0.027
-		c-0.008,0.002-0.014,0.004-0.023,0.010c-0.018,0.006-0.037,0.014-0.059,0.021c-0.008,0.002-0.014,0.006-0.023,0.010
-		c-0.018,0.008-0.037,0.018-0.059,0.021c-0.010,0.006-0.016,0.008-0.023,0.010c-0.020,0.010-0.041,0.018-0.059,0.027
-		c-0.010,0.002-0.016,0.006-0.023,0.008c-0.020,0.008-0.039,0.016-0.061,0.023c-0.008,0.002-0.016,0.004-0.025,0.010
-		c-0.018,0.006-0.041,0.016-0.062,0.025c-0.004,0.004-0.014,0.008-0.020,0.008c-0.018,0.008-0.037,0.016-0.055,0.023
-		c-0.010,0.002-0.020,0.006-0.029,0.010c-0.023,0.008-0.041,0.018-0.064,0.027c-0.006,0-0.012,0.004-0.018,0.004
-		c-0.018,0.008-0.037,0.016-0.059,0.023c-0.002,0.002-0.016,0.006-0.021,0.010c-0.021,0.010-0.045,0.018-0.068,0.027
-		c-0.010,0.002-0.016,0.004-0.021,0.008c-0.016,0.004-0.033,0.012-0.053,0.020c-0.010,0.004-0.014,0.006-0.023,0.012
-		c-0.023,0.008-0.047,0.016-0.064,0.025c-0.010,0.002-0.020,0.006-0.029,0.010c-0.016,0.006-0.029,0.012-0.045,0.018
-		c-0.014,0.004-0.014,0.006-0.027,0.012c-0.023,0.010-0.043,0.016-0.064,0.025c-0.010,0.002-0.023,0.006-0.033,0.012
-		c-0.014,0.004-0.025,0.010-0.037,0.018c-0.014,0.002-0.018,0.004-0.031,0.010c-0.023,0.008-0.043,0.016-0.066,0.021
-		c-0.014,0.008-0.018,0.010-0.031,0.016c-0.016,0.004-0.023,0.010-0.039,0.018c-0.012,0.002-0.016,0.004-0.029,0.010
-		c-0.023,0.008-0.043,0.018-0.061,0.023c-0.016,0.006-0.023,0.010-0.039,0.014c-0.014,0.004-0.023,0.010-0.037,0.014
-		c-0.010,0.006-0.021,0.008-0.031,0.014c-0.018,0.008-0.041,0.018-0.061,0.023c-0.014,0.006-0.020,0.008-0.031,0.014
-		c-0.016,0.004-0.029,0.010-0.043,0.014c-0.010,0.006-0.023,0.010-0.033,0.014c-0.018,0.008-0.039,0.014-0.059,0.023
-		c-0.014,0.006-0.020,0.008-0.035,0.014c-0.012,0.002-0.025,0.010-0.039,0.014c-0.010,0.004-0.029,0.010-0.037,0.016
-		c-0.020,0.008-0.035,0.014-0.055,0.020c-0.014,0.006-0.021,0.010-0.031,0.016c-0.014,0.002-0.029,0.008-0.043,0.012
-		c-0.014,0.008-0.037,0.016-0.051,0.021c-0.012,0.006-0.027,0.010-0.039,0.014c-0.014,0.008-0.025,0.012-0.039,0.018
-		c-0.010,0.004-0.023,0.010-0.035,0.014c-0.020,0.008-0.035,0.010-0.053,0.018c-0.014,0.006-0.029,0.012-0.039,0.016
-		c-0.010,0.002-0.027,0.012-0.037,0.014c-0.012,0.006-0.025,0.010-0.037,0.016c-0.020,0.008-0.035,0.014-0.055,0.020
-		c-0.014,0.006-0.027,0.010-0.039,0.014c-0.010,0.004-0.029,0.012-0.037,0.016c-0.010,0.002-0.020,0.008-0.031,0.012
-		c-0.020,0.008-0.049,0.020-0.068,0.023c-0.006,0.004-0.018,0.010-0.027,0.012c-0.014,0.006-0.027,0.012-0.041,0.018
-		c-0.008,0.002-0.018,0.008-0.027,0.010c-0.025,0.010-0.047,0.018-0.074,0.027c-0.006,0.002-0.014,0.006-0.020,0.008
-		c-0.018,0.008-0.033,0.012-0.051,0.020c0,0-0.004,0.002-0.008,0.002c-0.027,0.012-0.059,0.023-0.084,0.033
-		c-0.010,0.004-0.020,0.006-0.023,0.008c-0.014,0.004-0.033,0.012-0.047,0.020c-0.004,0-0.010,0.002-0.014,0.004
-		c-0.025,0.010-0.057,0.020-0.084,0.033c-0.008,0.002-0.018,0.004-0.021,0.006c-0.047,0.018-0.102,0.037-0.148,0.055
-		c-0.004,0.004-0.014,0.006-0.018,0.008c-0.016,0.006-0.033,0.012-0.047,0.018c-0.006,0.002-0.010,0.004-0.014,0.004
-		c-0.029,0.012-0.061,0.023-0.088,0.035c-0.004,0.002-0.010,0.004-0.020,0.006c-0.051,0.020-0.102,0.037-0.152,0.057
-		c0,0.002-0.004,0.002-0.008,0.004c-0.053,0.018-0.104,0.035-0.152,0.055c-0.004,0.004-0.010,0.006-0.014,0.008
-		c-0.051,0.018-0.107,0.037-0.158,0.055c0,0.002-0.004,0.002-0.008,0.006c-0.057,0.020-0.104,0.037-0.16,0.059c0,0-0.004,0-0.008,0
-		c-0.035,0.016-0.064,0.027-0.102,0.039c-0.020,0.008-0.037,0.014-0.057,0.020c0,0-0.004,0.004-0.008,0.004
-		c-0.051,0.020-0.102,0.039-0.158,0.059c0,0,0,0-0.004,0c-2.596,0.945-5.221,1.826-7.883,2.635l-9.365-30.809
-		c-11.242,3.42-23.166,5.275-35.525,5.275c-0.002,0-0.004,0-0.004,0l0,32.172 c-0.029,0-0.057,0-0.084,0c-0.010,0-0.010,0-0.020,0
-		c-0.023,0-0.051,0-0.072,0c-0.006,0-0.006,0-0.010,0c-0.029,0-0.053,0-0.080,0c-0.004,0-0.018,0-0.023,0c-0.023,0-0.047,0-0.066,0
-		c-0.006,0-0.012,0-0.016,0c-0.027,0-0.051,0-0.080,0c-0.004,0-0.014,0-0.018,0c-0.023,0-0.047,0-0.070,0c-0.008,0-0.004,0-0.018,0
-		c-0.025,0-0.051,0-0.078-0.002c-0.006,0-0.016,0-0.020,0c-0.023,0-0.043,0-0.064,0c-0.006,0-0.018,0-0.021,0
-		c-0.023,0-0.051,0-0.078,0c-0.010,0-0.010,0-0.020,0c-0.020,0-0.043,0-0.066,0c-0.002,0-0.012,0-0.016,0c-0.029,0-0.057,0-0.084,0
-		c-0.006,0-0.006,0-0.010,0c-0.023,0-0.047-0.004-0.070-0.004c-0.006,0-0.018,0-0.021,0c-0.029,0-0.057,0-0.080,0
-		c-0.004,0-0.008,0-0.014,0c-0.023,0-0.047,0-0.070,0c-0.008,0-0.012,0-0.021,0c-0.025,0-0.051,0-0.074-0.002l-0.010,0 
-		c-0.023,0-0.051,0-0.078,0c-0.010,0-0.010,0-0.023,0c-0.023,0-0.047,0-0.070,0c-0.004,0-0.004,0-0.008,0
-		c-0.029,0-0.057-0.002-0.080-0.002c-0.004,0-0.018,0-0.021,0c-0.023,0-0.047,0-0.070,0c-0.004,0-0.010,0-0.014,0
-		c-0.025,0-0.053,0-0.080-0.002c-0.002,0-0.016,0-0.021,0c-0.020,0-0.041,0-0.064,0c-0.006,0-0.012,0-0.020,0c-0.023,0-0.051,0-0.080,0
-		c-0.002-0.004-0.006-0.004-0.014-0.004c-0.023,0-0.049,0-0.070,0c-0.008,0-0.012,0-0.016,0c-0.029,0-0.057,0-0.082-0.002
-		c-0.010,0-0.006,0-0.016,0c-0.023,0-0.047,0-0.070,0c-0.004,0-0.014,0-0.018,0c-0.027,0-0.057-0.002-0.080-0.002
-		c-0.004,0-0.008,0-0.012,0c-0.023,0-0.047,0-0.072,0c-0.008,0-0.012,0-0.018,0c-0.027-0.002-0.055-0.002-0.082-0.002
-		c-0.004,0,0,0-0.006,0c-0.025,0-0.051,0-0.076-0.004c-0.010,0-0.010,0-0.020,0c-0.057,0-0.107,0-0.164-0.002c-0.006,0-0.016,0-0.021,0
-		c-0.023,0-0.047,0-0.068-0.002c-0.006,0-0.010,0-0.014,0c-0.025,0-0.053,0-0.078,0c-0.006,0-0.016,0-0.020-0.002
-		c-0.023,0-0.049,0-0.074,0c-0.006,0-0.006,0-0.008,0c-0.027,0-0.057-0.002-0.084-0.002c-0.006,0-0.010,0-0.018,0
-		c-0.020,0-0.049-0.002-0.070-0.002c-0.006,0-0.010,0-0.014,0c-0.027,0-0.057,0-0.084-0.002l-0.010,0 c-0.025,0-0.051,0-0.076,0
-		c-0.008,0-0.008,0-0.012-0.002c-0.027,0-0.055,0-0.082,0l-0.010,0 c-0.023-0.004-0.051-0.004-0.074-0.004c-0.006,0-0.016,0-0.018,0
-		c-0.027-0.002-0.057-0.002-0.084-0.002c-0.004,0, 0.002,0-0.004,0c-0.023,0-0.053-0.002-0.080-0.002c-0.006,0-0.010,0-0.014,0
-		c-0.061-0.002-0.111-0.002-0.172-0.006l-0.012,0 c-0.057-0.002-0.113-0.002-0.168-0.004c-0.006,0-0.010,0-0.014,0
-		c-0.027-0.002-0.055-0.002-0.082-0.002c-0.006,0, 0.004,0,0,0c-0.029-0.002-0.057-0.002-0.084-0.002c-0.006,0-0.014,0-0.018,0
-		c-0.025-0.002-0.051-0.002-0.080-0.002l-0.002,0 c-0.029-0.002-0.059-0.002-0.086-0.002c-0.004-0.002-0.008-0.002-0.014-0.002
-		c-0.021,0-0.049,0-0.074-0.004l-0.008,0 c-0.029,0-0.057,0-0.084-0.002l-0.016,0 c-0.021,0-0.049-0.002-0.072-0.002
-		c-0.004,0-0.010,0-0.014,0c-0.027,0-0.057-0.002-0.084-0.002l-0.010,0 c-0.021-0.004-0.049-0.004-0.072-0.004
-		c-0.008,0-0.010-0.002-0.014-0.002c-0.029,0-0.057,0-0.088-0.002c-0.006,0, 0.002,0-0.002,0c-0.025,0-0.055-0.002-0.080-0.002
-		c-0.006,0-0.008,0-0.016,0c-0.057-0.004-0.111-0.006-0.166-0.008l-0.016,0 c-0.055-0.002-0.109-0.002-0.166-0.006
-		c-0.004,0-0.010,0-0.014-0.002c-0.027,0-0.053,0-0.080-0.002c-0.004,0-0.002,0-0.010,0c-0.025,0-0.053,0-0.082,0
-		c-0.004,0-0.004,0-0.010,0c-0.027-0.004-0.055-0.004-0.078-0.006l-0.010,0 c-0.025,0-0.055-0.002-0.082-0.002c-0.004,0-0.004,0-0.010,0
-		c-0.027-0.002-0.057-0.002-0.084-0.006l-0.004,0 c-0.025,0-0.059-0.002-0.086-0.002l-0.006,0 c-0.027-0.002-0.055-0.002-0.084-0.004
-		c-0.004,0,0,0-0.008,0c-0.055-0.002-0.113-0.004-0.172-0.006c-0.006,0-0.004,0-0.010,0c-0.055-0.002-0.109-0.006-0.172-0.008
-		c-0.004,0-0.004,0-0.008,0c-0.059-0.002-0.115-0.004-0.172-0.008l-0.010,0 c-0.059-0.004-0.115-0.006-0.176-0.010l-0.004,0 
-		c-0.059-0.002-0.115-0.004-0.176-0.006c-0.004,0,0,0-0.004,0c-0.061-0.006-0.115-0.008-0.176-0.008l-0.006,0 
-		c-13.014-0.604-25.607-2.826-37.578-6.461l 9.354-30.811c-13.301-4.039-25.633-10.293-36.58-18.328l-19.057,25.953
-		c-5.342-3.924-10.43-8.188-15.219-12.754l0-0.002 c-0.168-0.156-0.334-0.314-0.5-0.477l0-0.002 c-0.029-0.027-0.055-0.051-0.084-0.078
-		c0,0,0,0,0-0.004c-0.041-0.037-0.078-0.074-0.121-0.113c-0.004,0-0.004-0.006-0.010-0.006c-0.035-0.035-0.072-0.076-0.113-0.113
-		c-0.002-0.002-0.006-0.006-0.010-0.012c-0.037-0.037-0.078-0.074-0.115-0.111c-0.006-0.002-0.006-0.008-0.010-0.010
-		c-0.041-0.037-0.074-0.070-0.117-0.111c-0.004-0.002-0.004-0.006-0.010-0.008c-0.025-0.025-0.045-0.049-0.074-0.074
-		c-0.002,0-0.002-0.002-0.002-0.002c-0.014-0.014-0.023-0.023-0.037-0.035c-0.006-0.004-0.010-0.010-0.012-0.012
-		c-0.021-0.020-0.049-0.045-0.066-0.064c-0.004-0.004-0.004-0.008-0.008-0.010c-0.016-0.016-0.021-0.023-0.037-0.033
-		c-0.006-0.008-0.010-0.012-0.016-0.020c-0.023-0.020-0.037-0.037-0.061-0.057c-0.004-0.006-0.010-0.010-0.014-0.016
-		c-0.014-0.014-0.023-0.020-0.037-0.033c-0.004-0.006-0.008-0.008-0.012-0.014c-0.020-0.020-0.043-0.039-0.062-0.061
-		c-0.004-0.006-0.008-0.008-0.014-0.014c-0.014-0.014-0.023-0.021-0.037-0.035c-0.002-0.002-0.004-0.006-0.010-0.010
-		c-0.018-0.020-0.041-0.039-0.059-0.059c-0.010-0.008-0.014-0.014-0.023-0.021c-0.010-0.010-0.023-0.020-0.033-0.033
-		c0,0,0-0.002-0.004-0.004c-0.023-0.023-0.047-0.045-0.070-0.070c-0.004-0.004-0.010-0.010-0.014-0.014
-		c-0.033-0.031-0.072-0.070-0.109-0.107c-0.006-0.004-0.010-0.012-0.020-0.018c-0.018-0.018-0.033-0.031-0.049-0.051
-		c-0.008-0.006-0.018-0.016-0.025-0.023c-0.010-0.010-0.018-0.020-0.029-0.029c-0.008-0.008-0.012-0.012-0.020-0.018
-		c-0.020-0.021-0.039-0.041-0.057-0.061c-0.006-0.002-0.010-0.006-0.016-0.012c-0.014-0.012-0.023-0.023-0.033-0.033
-		c-0.008-0.006-0.014-0.014-0.021-0.020c-0.016-0.018-0.031-0.035-0.051-0.053c-0.006-0.006-0.014-0.016-0.023-0.021
-		c-0.004-0.008-0.023-0.023-0.027-0.031c-0.010-0.006-0.020-0.014-0.027-0.021c-0.016-0.016-0.029-0.033-0.043-0.045
-		c-0.010-0.010-0.020-0.020-0.027-0.027c-0.008-0.010-0.018-0.018-0.027-0.027c-0.008-0.010-0.018-0.020-0.027-0.031
-		c-0.014-0.014-0.027-0.025-0.043-0.037c-0.008-0.010-0.018-0.020-0.027-0.029c-0.010-0.012-0.016-0.016-0.027-0.025
-		c-0.016-0.018-0.029-0.029-0.043-0.047c-0.008-0.006-0.016-0.016-0.025-0.021c-0.010-0.014-0.020-0.023-0.031-0.033
-		c-0.006-0.008-0.016-0.014-0.021-0.021c-0.018-0.016-0.031-0.029-0.047-0.045c-0.014-0.012-0.014-0.016-0.023-0.025
-		c-0.014-0.010-0.021-0.021-0.031-0.031c-0.008-0.008-0.018-0.016-0.021-0.023c-0.016-0.016-0.033-0.031-0.047-0.047
-		c-0.012-0.012-0.014-0.016-0.029-0.023c-0.008-0.010-0.018-0.021-0.027-0.031c-0.010-0.006-0.018-0.021-0.027-0.027
-		c-0.014-0.014-0.027-0.027-0.041-0.041c-0.004-0.008-0.018-0.020-0.021-0.023c-0.016-0.012-0.023-0.023-0.037-0.035
-		c-0.010-0.012-0.020-0.023-0.031-0.031c-0.012-0.012-0.021-0.023-0.035-0.037c-0.004-0.006-0.020-0.018-0.023-0.023
-		c-0.014-0.014-0.023-0.025-0.035-0.037c-0.010-0.010-0.020-0.018-0.029-0.027c-0.014-0.014-0.021-0.025-0.037-0.035
-		c-0.004-0.008-0.014-0.016-0.023-0.023c-0.014-0.016-0.031-0.035-0.047-0.051c-0.004-0.002-0.012-0.010-0.014-0.016
-		c-0.014-0.012-0.025-0.027-0.039-0.039c-0.006-0.002-0.018-0.018-0.020-0.020c-0.018-0.018-0.033-0.035-0.051-0.051
-		c-0.008-0.006-0.010-0.010-0.018-0.016c-0.012-0.016-0.025-0.027-0.039-0.039c-0.004-0.006-0.014-0.016-0.020-0.020
-		c-0.014-0.016-0.029-0.033-0.049-0.051c-0.004-0.008-0.010-0.012-0.016-0.020c-0.012-0.010-0.025-0.025-0.041-0.035
-		c-0.004-0.008-0.008-0.014-0.018-0.021c-0.018-0.016-0.033-0.033-0.053-0.053c0,0-0.008-0.010-0.014-0.014
-		c-0.012-0.014-0.025-0.027-0.039-0.045c-0.010-0.008-0.010-0.006-0.014-0.010c-0.020-0.020-0.039-0.037-0.053-0.055
-		c-0.004-0.006-0.014-0.014-0.018-0.016c-0.016-0.014-0.029-0.031-0.043-0.045c-0.004-0.004-0.014-0.012-0.014-0.014
-		c-0.018-0.018-0.033-0.037-0.049-0.053c-0.008-0.008-0.010-0.010-0.018-0.018c-0.016-0.018-0.035-0.033-0.053-0.051l-0.006-0.006
-		c-0.014-0.018-0.031-0.035-0.051-0.051c-0.004-0.006-0.010-0.012-0.014-0.016c-0.018-0.020-0.031-0.035-0.051-0.053
-		c-0.002-0.004-0.014-0.014-0.014-0.018c-0.014-0.014-0.027-0.027-0.041-0.041c-0.006-0.002-0.016-0.016-0.020-0.018
-		c-0.016-0.018-0.033-0.037-0.051-0.053c-0.006-0.006-0.006-0.006-0.012-0.014c-0.016-0.016-0.029-0.029-0.043-0.047
-		c-0.004-0.002-0.010-0.008-0.014-0.010c-0.020-0.018-0.035-0.037-0.053-0.057c-0.008-0.006-0.008-0.006-0.016-0.014
-		c-0.016-0.016-0.029-0.031-0.045-0.047c-0.004-0.002-0.008-0.008-0.012-0.010c-0.018-0.020-0.033-0.039-0.051-0.057
-		c-0.006-0.004-0.010-0.010-0.014-0.012c-0.016-0.018-0.033-0.035-0.049-0.051c-0.004-0.004-0.004-0.004-0.008-0.006
-		c-0.020-0.020-0.037-0.041-0.057-0.059c-0.002-0.002-0.008-0.010-0.008-0.012c-0.018-0.020-0.037-0.037-0.055-0.057
-		c-0.006-0.002,0,0,0,0c-0.020-0.020-0.039-0.039-0.059-0.059c-0.002-0.006-0.008-0.010-0.012-0.014
-		c-0.037-0.037-0.072-0.074-0.109-0.113c-0.006-0.006-0.010-0.010-0.010-0.012c-0.041-0.041-0.080-0.078-0.117-0.119
-		c-0.002-0.004-0.002-0.004-0.006-0.008c-0.020-0.021-0.039-0.039-0.057-0.061l0,0c-0.020-0.021-0.039-0.041-0.057-0.059
-		c-0.006-0.004-0.006-0.008-0.010-0.010c-0.020-0.020-0.037-0.039-0.057-0.059l-0.002-0.006c-0.020-0.018-0.041-0.039-0.061-0.059l0-0.002 
-		c-0.043-0.043-0.080-0.084-0.119-0.129l-0.004,0 c-0.020-0.020-0.039-0.041-0.059-0.062c-0.004-0.004,0,0-0.004-0.004
-		c-0.043-0.043-0.080-0.080-0.119-0.123l-0.006-0.006c-0.037-0.041-0.074-0.082-0.115-0.123l-0.006-0.006
-		c-0.039-0.041-0.078-0.082-0.115-0.125c-0.004-0.002-0.004-0.002-0.004-0.004c-0.043-0.041-0.082-0.082-0.119-0.127
-		c-0.043-0.041-0.084-0.086-0.123-0.125l-0.004-0.004c-0.020-0.021-0.037-0.041-0.057-0.061l-0.002-0.006
-		c-0.084-0.086-0.164-0.17-0.242-0.258c-3.799-4.066-7.385-8.338-10.734-12.799l 25.738-19.318
-		c-8.154-10.869-14.527-23.143-18.707-36.395l-30.705,9.684c0-0.004,0-0.004-0.004-0.010c-0.004-0.020-0.014-0.043-0.020-0.064
-		c-0.004-0.008-0.004-0.020-0.008-0.029c-0.006-0.014-0.010-0.027-0.016-0.043c-0.004-0.014-0.004-0.018-0.008-0.031
-		c-0.010-0.020-0.016-0.041-0.020-0.064c-0.004-0.010-0.010-0.018-0.010-0.027c-0.004-0.016-0.010-0.027-0.014-0.043
-		c-0.004-0.010-0.010-0.021-0.012-0.031c-0.008-0.021-0.012-0.041-0.018-0.059c-0.002-0.010-0.006-0.025-0.010-0.033
-		c-0.006-0.014-0.010-0.031-0.016-0.045c0-0.010-0.004-0.021-0.008-0.031c-0.006-0.020-0.010-0.037-0.020-0.057
-		c-0.002-0.014-0.004-0.018-0.010-0.035c-0.004-0.012-0.010-0.027-0.014-0.045c0-0.008-0.006-0.023-0.010-0.031
-		c-0.004-0.016-0.010-0.029-0.014-0.043c-0.004-0.020-0.010-0.031-0.014-0.049c-0.006-0.014-0.010-0.027-0.014-0.043
-		c-0.006-0.010-0.010-0.027-0.012-0.035c-0.004-0.012-0.008-0.023-0.012-0.035c-0.006-0.018-0.014-0.047-0.020-0.064
-		c-0.004-0.008-0.004-0.018-0.010-0.027c-0.004-0.018-0.006-0.027-0.012-0.043c0-0.010-0.004-0.021-0.010-0.031
-		c-0.004-0.023-0.014-0.047-0.020-0.070c-0.004-0.010-0.008-0.016-0.008-0.025c-0.004-0.014-0.010-0.029-0.014-0.043
-		c-0.006-0.010-0.006-0.018-0.010-0.025c-0.014-0.047-0.027-0.096-0.043-0.146c-0.004-0.006-0.004-0.014-0.008-0.021
-		c-0.016-0.047-0.029-0.1-0.043-0.145c-0.004-0.006-0.004-0.016-0.010-0.023c-0.004-0.016-0.008-0.033-0.012-0.045
-		c0-0.006,0-0.008-0.004-0.012c-0.008-0.029-0.020-0.062-0.025-0.092c-0.004-0.006-0.004-0.014-0.008-0.020
-		c-0.004-0.016-0.010-0.033-0.014-0.047c0-0.004-0.002-0.008-0.006-0.014c-0.008-0.029-0.018-0.061-0.027-0.088
-		c0-0.008-0.002-0.014-0.004-0.021c-0.006-0.020-0.010-0.029-0.016-0.047c0-0.004-0.004-0.010-0.004-0.014
-		c-0.010-0.029-0.018-0.066-0.027-0.094c0-0.006-0.002-0.008-0.006-0.012c-0.004-0.020-0.008-0.033-0.014-0.051
-		c0-0.004-0.004-0.008-0.004-0.012c-0.010-0.029-0.020-0.064-0.027-0.094c0-0.006,0-0.008-0.004-0.016
-		c-0.004-0.018-0.010-0.027-0.014-0.045c0-0.008-0.006-0.014-0.006-0.021c-0.008-0.027-0.018-0.061-0.027-0.090
-		c0-0.002,0-0.008-0.004-0.012c-0.006-0.018-0.010-0.029-0.016-0.049c0-0.004,0-0.012-0.004-0.014
-		c-0.014-0.055-0.029-0.105-0.045-0.158c0-0.004,0-0.008-0.004-0.010c-0.016-0.059-0.029-0.104-0.049-0.16
-		c0-0.006,0-0.008-0.002-0.012c-0.014-0.059-0.027-0.104-0.045-0.156c-0.002-0.006-0.002-0.008-0.002-0.014
-		c-0.020-0.057-0.033-0.104-0.047-0.16c-0.004-0.002-0.004-0.006-0.004-0.008c-0.018-0.059-0.033-0.105-0.047-0.166
-		c0-0.002-0.004-0.002-0.006-0.004c-0.021-0.078-0.039-0.148-0.062-0.227c0-0.002,0-0.002,0-0.004
-		c-0.020-0.057-0.033-0.111-0.051-0.166c0-0.002,0-0.002-0.002-0.002c-0.014-0.059-0.027-0.111-0.047-0.166c0-0.006,0-0.008,0-0.010
-		c-0.018-0.057-0.031-0.109-0.051-0.168c-0.012-0.053-0.029-0.109-0.045-0.164c0-0.004,0-0.010-0.004-0.012
-		c-0.014-0.061-0.029-0.107-0.047-0.166c-0.014-0.057-0.033-0.113-0.047-0.172c0,0,0,0,0-0.002
-		c-0.055-0.188-0.105-0.379-0.162-0.568c0-0.002,0-0.002,0-0.006c-0.25-0.895-0.49-1.795-0.721-2.699
-		c-0.047-0.174-0.088-0.344-0.135-0.518c0-0.002,0,0,0-0.002c-0.080-0.309-0.154-0.615-0.23-0.926l0,0
-		c-0.029-0.115-0.057-0.232-0.086-0.348c0,0-0.002,0-0.002-0.002c-0.102-0.424-0.203-0.848-0.307-1.275l0,0
-		c-0.027-0.119-0.055-0.23-0.080-0.346c0-0.002-0.002-0.006-0.002-0.006c-0.014-0.059-0.025-0.111-0.037-0.172
-		c0,0-0.002,0-0.002-0.004c-0.006-0.018-0.008-0.035-0.012-0.055c0-0.002-0.004-0.002-0.004-0.004
-		c-0.006-0.035-0.016-0.072-0.023-0.104c0-0.006,0-0.008,0-0.012c-0.006-0.020-0.010-0.033-0.016-0.053c0-0.004,0-0.008-0.002-0.014
-		c-0.012-0.051-0.025-0.105-0.037-0.16c-0.002-0.002-0.002-0.008-0.002-0.012c-0.014-0.053-0.027-0.109-0.035-0.164
-		c0-0.002-0.004-0.004-0.006-0.010c-0.014-0.057-0.023-0.104-0.037-0.16c0-0.006,0-0.010,0-0.016c-0.014-0.057-0.023-0.102-0.037-0.16
-		c-0.004-0.006-0.004-0.008-0.004-0.014c-0.014-0.051-0.023-0.104-0.039-0.16c0-0.002,0-0.010-0.002-0.018
-		c-0.002-0.018-0.006-0.029-0.012-0.047c0-0.002,0-0.004,0-0.008c-0.010-0.033-0.014-0.066-0.023-0.102
-		c0-0.004-0.004-0.010-0.004-0.014c-0.004-0.021-0.004-0.033-0.008-0.053c-0.002-0.002-0.004-0.008-0.004-0.010
-		c-0.006-0.031-0.016-0.068-0.021-0.098c-0.002-0.006-0.002-0.012-0.002-0.016c-0.006-0.020-0.010-0.031-0.016-0.049
-		c0-0.006,0-0.014,0-0.018c-0.008-0.031-0.014-0.062-0.021-0.092c0-0.006,0-0.010-0.002-0.016c-0.004-0.014-0.008-0.035-0.014-0.049
-		c0-0.006-0.002-0.014-0.004-0.020c-0.004-0.031-0.014-0.064-0.020-0.094c-0.002-0.004-0.004-0.008-0.004-0.014
-		c-0.002-0.014-0.004-0.031-0.010-0.047c-0.002-0.006-0.004-0.016-0.004-0.025c-0.008-0.025-0.014-0.053-0.020-0.076
-		c0-0.010-0.004-0.018-0.004-0.025c-0.006-0.016-0.008-0.031-0.010-0.043c-0.004-0.012-0.004-0.020-0.006-0.027
-		c-0.014-0.049-0.020-0.1-0.029-0.148c-0.006-0.010-0.006-0.018-0.010-0.027c0-0.016-0.004-0.027-0.010-0.045
-		c0-0.008-0.004-0.020-0.004-0.027c-0.004-0.021-0.010-0.049-0.016-0.074c-0.004-0.010-0.004-0.020-0.008-0.029
-		c-0.002-0.012-0.004-0.027-0.010-0.043c0-0.010-0.004-0.021-0.004-0.029c-0.006-0.023-0.010-0.047-0.016-0.072
-		c-0.004-0.010-0.004-0.020-0.008-0.029c-0.002-0.014-0.006-0.029-0.010-0.041c0-0.010-0.004-0.020-0.004-0.029
-		c-0.008-0.031-0.010-0.045-0.020-0.072c0-0.014-0.002-0.020-0.004-0.029c-0.006-0.016-0.006-0.031-0.010-0.045
-		c0-0.008-0.006-0.018-0.006-0.027c-0.004-0.025-0.008-0.047-0.016-0.070c-0.002-0.012-0.004-0.023-0.008-0.033
-		c0-0.010-0.004-0.029-0.008-0.037c0-0.016-0.006-0.027-0.006-0.041c-0.002-0.020-0.008-0.041-0.012-0.061
-		c-0.004-0.010-0.004-0.023-0.010-0.037c-0.004-0.014-0.004-0.025-0.008-0.039c0-0.012-0.006-0.023-0.006-0.035
-		c-0.004-0.016-0.004-0.023-0.010-0.037c-0.004-0.020-0.008-0.041-0.014-0.062c-0.002-0.012-0.004-0.025-0.006-0.039
-		c-0.004-0.012-0.008-0.023-0.008-0.035c-0.004-0.016-0.004-0.025-0.010-0.039c-0.004-0.020-0.010-0.041-0.014-0.062
-		c0-0.012-0.004-0.020-0.004-0.035c-0.006-0.014-0.010-0.027-0.010-0.041c-0.006-0.016-0.006-0.018-0.010-0.033
-		c-0.004-0.021-0.010-0.041-0.014-0.066c0-0.010-0.002-0.020-0.006-0.029c-0.004-0.018-0.004-0.029-0.008-0.045
-		c-0.006-0.016-0.006-0.020-0.008-0.035c-0.002-0.020-0.008-0.041-0.012-0.061c-0.004-0.010-0.004-0.023-0.010-0.033
-		c0-0.016-0.004-0.031-0.006-0.049c0-0.008-0.006-0.018-0.006-0.027c-0.004-0.020-0.010-0.045-0.014-0.066
-		c0-0.006-0.004-0.020-0.004-0.025c-0.006-0.018-0.010-0.035-0.010-0.051c-0.006-0.012-0.006-0.023-0.010-0.033
-		c-0.002-0.016-0.004-0.035-0.010-0.051c-0.004-0.014-0.004-0.027-0.010-0.043c-0.004-0.018-0.004-0.031-0.008-0.047
-		c0-0.010-0.006-0.023-0.008-0.033c-0.002-0.016-0.008-0.031-0.010-0.049c-0.002-0.016-0.004-0.021-0.006-0.035
-		c-0.006-0.021-0.010-0.041-0.016-0.061c0-0.010-0.002-0.020-0.004-0.027c-0.004-0.018-0.004-0.033-0.010-0.051
-		c-0.002-0.010-0.004-0.018-0.004-0.027c-0.006-0.021-0.010-0.047-0.014-0.066c-0.006-0.012-0.006-0.021-0.008-0.031
-		c-0.002-0.018-0.008-0.033-0.012-0.049c0-0.010,0-0.018-0.004-0.027c-0.006-0.023-0.010-0.047-0.014-0.068
-		c0-0.012-0.006-0.020-0.006-0.029c-0.002-0.018-0.002-0.031-0.008-0.049c-0.002-0.010-0.004-0.018-0.004-0.027
-		c-0.004-0.025-0.010-0.045-0.014-0.070c-0.006-0.010-0.006-0.020-0.008-0.029c-0.002-0.014-0.006-0.029-0.008-0.047
-		c-0.004-0.004-0.008-0.021-0.008-0.029c-0.006-0.025-0.010-0.047-0.014-0.070c0-0.010,0-0.012-0.006-0.021
-		c-0.002-0.018-0.004-0.035-0.010-0.053c0-0.012-0.004-0.020-0.004-0.029c-0.004-0.023-0.010-0.047-0.014-0.068
-		c0-0.006-0.006-0.018-0.006-0.023c-0.004-0.018-0.008-0.037-0.008-0.055c-0.006-0.012-0.006-0.020-0.010-0.027
-		c-0.002-0.023-0.006-0.047-0.010-0.066c-0.004-0.008-0.004-0.018-0.004-0.021c-0.004-0.018-0.010-0.039-0.014-0.057
-		c0-0.010-0.002-0.020-0.004-0.029c-0.006-0.020-0.008-0.041-0.010-0.062c-0.006-0.002-0.006-0.012-0.006-0.018
-		c-0.004-0.021-0.008-0.047-0.014-0.068c-0.002-0.010-0.004-0.016-0.004-0.023c-0.004-0.023-0.008-0.047-0.012-0.068
-		c0-0.006,0-0.006,0-0.008c-0.006-0.025-0.010-0.053-0.016-0.074c-0.002-0.008-0.004-0.020-0.004-0.023
-		c-0.004-0.021-0.010-0.043-0.014-0.066c0-0.004,0-0.010,0-0.014c-0.008-0.025-0.012-0.047-0.018-0.072
-		c-0.002-0.008-0.002-0.018-0.002-0.021c-0.004-0.021-0.008-0.043-0.014-0.062c0-0.010,0-0.008-0.004-0.020
-		c-0.006-0.023-0.010-0.047-0.014-0.070c0-0.012,0-0.014-0.004-0.023c-0.002-0.021-0.006-0.041-0.012-0.061
-		c0-0.004-0.002-0.014-0.004-0.020c-0.004-0.025-0.010-0.049-0.014-0.074c0-0.010,0-0.008-0.004-0.018
-		c-0.002-0.020-0.006-0.041-0.010-0.064c0-0.004-0.006-0.012-0.006-0.016c-0.004-0.025-0.010-0.051-0.014-0.076
-		c0-0.004,0-0.012-0.002-0.020c-0.002-0.021-0.008-0.041-0.012-0.061c0-0.006-0.006-0.016-0.006-0.020
-		c-0.002-0.025-0.006-0.053-0.012-0.078l0-0.002 c-0.004-0.027-0.010-0.053-0.014-0.076c0-0.006-0.004-0.014-0.004-0.018
-		c-0.006-0.025-0.010-0.047-0.016-0.074l0-0.010 c-0.004-0.025-0.008-0.051-0.014-0.072c-0.002-0.012,0-0.010-0.004-0.020
-		c-0.004-0.025-0.010-0.053-0.014-0.076l0-0.002 c-0.006-0.029-0.010-0.053-0.014-0.078c0-0.006,0-0.012-0.006-0.018
-		c-0.002-0.021-0.008-0.049-0.012-0.072c-0.002-0.004-0.002-0.004-0.002-0.006c-0.004-0.027-0.010-0.055-0.014-0.082
-		c0-0.006,0-0.006,0-0.010c-0.006-0.025-0.010-0.053-0.014-0.076l-0.006-0.006c-0.004-0.029-0.010-0.057-0.014-0.084
-		c0-0.006,0-0.002,0-0.008c-0.004-0.025-0.010-0.051-0.014-0.076l0-0.010 c-0.012-0.055-0.021-0.109-0.031-0.166c0-0.006,0-0.002,0-0.008
-		c-0.010-0.055-0.018-0.109-0.031-0.166c-0.002-0.008-0.002-0.002-0.002-0.008c-0.008-0.057-0.018-0.111-0.027-0.168l0-0.006 
-		c-0.012-0.055-0.023-0.111-0.033-0.166l0-0.010 c-0.010-0.055-0.018-0.111-0.027-0.166c-0.004-0.006-0.004-0.004-0.006-0.010
-		c-0.008-0.055-0.018-0.111-0.027-0.166c0-0.008,0,0.002,0-0.006c-0.010-0.055-0.018-0.113-0.025-0.17l-0.004-0.004
-		c-0.010-0.059-0.020-0.115-0.029-0.172l0-0.004 c-1.342-7.92-2.082-16.047-2.17-24.326l 32.201-0.336
-		c-0.006-0.436-0.035-0.863-0.035-1.301c0-13.701, 2.293-26.859, 6.461-39.154l-30.521-10.336c 1.117-3.295, 2.344-6.537, 3.668-9.727
-		c 0.047-0.109, 0.094-0.219, 0.141-0.33c 0.021-0.055, 0.045-0.109, 0.068-0.166l0,0c 0.023-0.055, 0.047-0.107, 0.070-0.162
-		c 0.047-0.109, 0.092-0.219, 0.139-0.33l0,0c 0.023-0.055, 0.047-0.107, 0.070-0.162c 0.035-0.084, 0.068-0.164, 0.105-0.246
-		c0-0.004,0,0,0-0.004c 0.023-0.055, 0.047-0.107, 0.070-0.16c 0.002-0.006,0,0.002,0-0.004c 0.023-0.055, 0.045-0.105, 0.068-0.16
-		l 0.004-0.006c 0.023-0.051, 0.047-0.105, 0.066-0.158l 0.004-0.002c 0.023-0.053, 0.047-0.109, 0.070-0.162l0-0.002 
-		c 0.021-0.055, 0.045-0.107, 0.068-0.158l 0.004-0.010c 0.023-0.049, 0.047-0.104, 0.070-0.158c0-0.002,0,0,0-0.002
-		c 0.023-0.053, 0.045-0.107, 0.068-0.16c 0.004-0.006,0,0.002,0-0.004c 0.014-0.027, 0.023-0.051, 0.037-0.078l0,0
-		c 0.014-0.029, 0.023-0.055, 0.037-0.080l0-0.004 c 0.012-0.025, 0.023-0.053, 0.035-0.080l 0.002-0.002c 0.010-0.025, 0.023-0.051, 0.033-0.078
-		l 0.002-0.002c 0.010-0.027, 0.021-0.055, 0.033-0.078l 0.002-0.008c 0.014-0.025, 0.021-0.053, 0.037-0.074l0-0.006 
-		c 0.010-0.023, 0.021-0.049, 0.033-0.078c 0.004-0.006, 0.004,0, 0.004-0.006c 0.010-0.023, 0.023-0.049, 0.031-0.074l 0.002-0.002
-		c 0.014-0.027, 0.023-0.051, 0.037-0.078c0-0.006,0-0.004, 0.004-0.008c 0.021-0.051, 0.045-0.104, 0.064-0.154
-		c 0.004-0.004, 0.004-0.004, 0.008-0.010c 0.010-0.027, 0.020-0.049, 0.033-0.074l0-0.002 c 0.010-0.025, 0.023-0.053, 0.031-0.074
-		c 0.004-0.006, 0.006-0.010, 0.008-0.014c 0.021-0.051, 0.045-0.104, 0.066-0.15l 0.004-0.012c 0.023-0.053, 0.047-0.1, 0.070-0.15
-		c0-0.006,0-0.008, 0.004-0.012c 0.023-0.051, 0.047-0.104, 0.070-0.152c0-0.006,0-0.006,0-0.010c 0.021-0.049, 0.049-0.102, 0.072-0.15
-		c 0.002-0.006, 0.002-0.006, 0.002-0.010c 0.023-0.053, 0.047-0.102, 0.070-0.156c 0.004-0.004, 0.004-0.002, 0.004-0.006
-		c 0.014-0.027, 0.023-0.051, 0.037-0.078l0-0.004 c 0.012-0.023, 0.021-0.047, 0.031-0.070c 0.004-0.006, 0.004-0.006, 0.004-0.010
-		c 0.014-0.027, 0.023-0.053, 0.037-0.078l0-0.004 c 0.010-0.023, 0.023-0.047, 0.033-0.072l 0.006-0.010c 0.012-0.025, 0.021-0.047, 0.031-0.072
-		c 0.006-0.004, 0.006-0.008, 0.006-0.010c 0.014-0.023, 0.023-0.047, 0.031-0.068l 0.006-0.010c 0.012-0.025, 0.021-0.049, 0.033-0.074
-		c 0.002-0.006, 0.002-0.006, 0.002-0.008c 0.014-0.027, 0.023-0.053, 0.037-0.076c 0.010-0.027, 0.023-0.053, 0.035-0.078
-		c 0.002-0.004, 0.002-0.006, 0.006-0.010c 0.010-0.023, 0.020-0.049, 0.031-0.070c 0.002-0.006, 0.002-0.004, 0.002-0.006
-		c 0.014-0.025, 0.023-0.053, 0.039-0.076c0-0.006,0-0.006, 0.002-0.010c 0.010-0.023, 0.021-0.047, 0.033-0.072l0-0.002 
-		c 0.014-0.025, 0.023-0.053, 0.037-0.074c0-0.006,0-0.010, 0.004-0.014c 0.023-0.049, 0.047-0.098, 0.070-0.148l 0.006-0.012
-		c 0.023-0.051, 0.045-0.1, 0.068-0.15c 0.002-0.006, 0.004-0.008, 0.004-0.012c 0.023-0.051, 0.047-0.102, 0.070-0.152
-		c 0.004-0.002, 0.004-0.002, 0.004-0.008c 0.014-0.023, 0.023-0.051, 0.037-0.076c0-0.004,0,0.002,0-0.002
-		c 0.016-0.025, 0.023-0.047, 0.033-0.072c 0.006-0.004, 0.006-0.008, 0.008-0.012c 0.010-0.025, 0.023-0.047, 0.033-0.072
-		c 0.002-0.006, 0.004-0.006, 0.004-0.010c 0.010-0.021, 0.023-0.045, 0.033-0.066c0-0.004, 0.002-0.008, 0.004-0.014
-		c 0.012-0.021, 0.023-0.047, 0.035-0.074l 0.002-0.006c 0.012-0.021, 0.023-0.047, 0.033-0.068c 0.006-0.002, 0.006-0.004, 0.006-0.010
-		c 0.014-0.027, 0.023-0.049, 0.035-0.074l 0.004-0.010c 0.010-0.021, 0.021-0.047, 0.033-0.068l 0.004-0.008
-		c 0.010-0.025, 0.023-0.051, 0.033-0.076l 0.004-0.008c 0.016-0.025, 0.023-0.049, 0.039-0.076c 0.010-0.023, 0.023-0.051, 0.037-0.074
-		c0-0.006,0-0.006, 0.004-0.010c 0.010-0.025, 0.021-0.049, 0.031-0.072l 0.002-0.002c 0.012-0.027, 0.025-0.051, 0.035-0.080
-		c 0.004-0.002, 0.004-0.002, 0.004-0.006c 0.023-0.051, 0.053-0.104, 0.076-0.152c0-0.006,0-0.002, 0.004-0.008
-		c 0.023-0.051, 0.047-0.102, 0.070-0.152l 0.002-0.008c 0.023-0.051, 0.051-0.1, 0.074-0.152l 0.006-0.010
-		c 0.023-0.049, 0.051-0.104, 0.074-0.152l0-0.002 c 0.025-0.055, 0.049-0.105, 0.076-0.156c 0.002-0.006, 0.002-0.002, 0.002-0.008
-		c 0.025-0.051, 0.051-0.102, 0.074-0.152c 0.004-0.006, 0.002-0.004, 0.004-0.008c 0.023-0.053, 0.051-0.1, 0.074-0.154
-		c 0.002-0.004,0,0, 0.004-0.004c 0.023-0.051, 0.051-0.105, 0.074-0.156l0-0.004 c 0.029-0.053, 0.055-0.104, 0.078-0.158
-		c 0.014-0.027, 0.029-0.051, 0.041-0.078l 0.002-0.004c 0.012-0.023, 0.023-0.051, 0.037-0.078l0-0.002 c 0.014-0.023, 0.027-0.049, 0.037-0.074
-		l 0.004-0.006c 0.010-0.023, 0.023-0.049, 0.039-0.074l0-0.004 c 0.012-0.025, 0.025-0.051, 0.035-0.076c 0.004-0.004, 0.002-0.004, 0.004-0.006
-		c 0.023-0.053, 0.051-0.104, 0.074-0.154c 0.006-0.004,0,0, 0.006-0.004c 0.023-0.055, 0.051-0.104, 0.072-0.156l 0.006-0.004
-		c 0.021-0.051, 0.051-0.104, 0.076-0.154l 0.002-0.002c 0.025-0.053, 0.053-0.104, 0.080-0.158l0-0.002 c 0.025-0.053, 0.049-0.105, 0.078-0.156
-		l0-0.004 c 0.027-0.051, 0.051-0.104, 0.078-0.154c 0.002-0.006,0,0,0-0.004c 0.029-0.051, 0.055-0.104, 0.078-0.156l 0.002-0.002
-		c 0.012-0.027, 0.025-0.051, 0.041-0.078l0-0.004 c 0.027-0.049, 0.055-0.104, 0.078-0.152l 0.002-0.004c 0.027-0.053, 0.053-0.104, 0.080-0.156
-		l0-0.004 c 0.025-0.049, 0.053-0.104, 0.080-0.154l0-0.002 c 0.027-0.053, 0.055-0.105, 0.078-0.154c 0.004-0.006,0-0.004, 0.004-0.006
-		c 0.029-0.053, 0.053-0.104, 0.080-0.154l0-0.002 c 0.027-0.055, 0.055-0.104, 0.076-0.158l 0.006,0 c 0.021-0.053, 0.051-0.104, 0.078-0.158l0-0.002 
-		c 0.029-0.049, 0.053-0.102, 0.080-0.15l 0.004-0.008c 0.027-0.053, 0.051-0.102, 0.078-0.152c0-0.002,0,0,0-0.004
-		c 0.027-0.053, 0.057-0.102, 0.084-0.154c0-0.004-0.002,0,0-0.004c 0.055-0.102, 0.105-0.209, 0.162-0.312l0-0.002 
-		c 2.41-4.619, 5.039-9.098, 7.891-13.428c0-0.004-0.004,0.004,0-0.002c 0.033-0.047, 0.061-0.094, 0.094-0.145l 0.002,0 
-		c 0.033-0.049, 0.062-0.098, 0.094-0.145l 0.004-0.004c 0.016-0.023, 0.031-0.049, 0.045-0.070l 0.002-0.004
-		c 0.018-0.021, 0.031-0.049, 0.047-0.070l 0.004-0.004c 0.014-0.021, 0.033-0.047, 0.045-0.070l 0.006-0.006
-		c 0.014-0.020, 0.027-0.043, 0.041-0.064l 0.006-0.008c 0.014-0.021, 0.029-0.045, 0.045-0.068c 0.004-0.004,0-0.002, 0.004-0.006
-		c 0.014-0.021, 0.033-0.047, 0.047-0.070c 0.016-0.023, 0.033-0.047, 0.047-0.072c 0.004-0.004,0,0, 0.004-0.002
-		c 0.014-0.025, 0.033-0.047, 0.047-0.072c 0.004-0.002,0,0.002,0-0.002c 0.018-0.020, 0.031-0.045, 0.045-0.066
-		c 0.004-0.004, 0.004-0.006, 0.008-0.008c 0.029-0.047, 0.062-0.094, 0.090-0.139c 0.006-0.006, 0.008-0.008, 0.010-0.014
-		c 0.014-0.020, 0.029-0.041, 0.041-0.064l 0.004,0 c 0.014-0.021, 0.027-0.047, 0.045-0.068l 0.006-0.010c 0.033-0.047, 0.062-0.092, 0.094-0.137
-		c0-0.004, 0.006-0.008, 0.006-0.012c 0.018-0.023, 0.029-0.045, 0.045-0.066c 0.004-0.004,0,0, 0.004-0.006
-		c 0.014-0.020, 0.027-0.039, 0.043-0.059c0-0.006, 0.004-0.012, 0.008-0.016c 0.016-0.021, 0.029-0.041, 0.045-0.066
-		c 0.002-0.004-0.002,0, 0.002-0.002c 0.016-0.020, 0.029-0.041, 0.043-0.062c 0.004-0.004, 0.010-0.012, 0.010-0.018
-		c 0.012-0.020, 0.025-0.041, 0.039-0.061c 0.008-0.006, 0.010-0.006, 0.014-0.016c 0.010-0.018, 0.023-0.033, 0.033-0.053
-		c 0.006-0.002, 0.010-0.010, 0.014-0.014c 0.016-0.023, 0.029-0.043, 0.043-0.064c 0.004-0.008, 0.004-0.008, 0.010-0.016
-		c 0.014-0.016, 0.023-0.031, 0.031-0.049c 0.004-0.006, 0.010-0.014, 0.014-0.018c 0.014-0.021, 0.027-0.039, 0.041-0.061
-		c 0.006-0.006, 0.010-0.014, 0.014-0.021c 0.010-0.014, 0.020-0.029, 0.029-0.043c 0.010-0.006, 0.014-0.014, 0.018-0.023
-		c 0.016-0.020, 0.023-0.037, 0.037-0.059c 0.006-0.006, 0.012-0.014, 0.020-0.021c 0.010-0.014, 0.018-0.029, 0.025-0.043
-		c 0.006-0.008, 0.010-0.012, 0.016-0.021c 0.014-0.018, 0.025-0.037, 0.037-0.055c 0.010-0.014, 0.010-0.014, 0.018-0.029
-		c 0.010-0.012, 0.020-0.025, 0.029-0.039c 0.008-0.008, 0.008-0.014, 0.018-0.021c 0.010-0.018, 0.023-0.037, 0.037-0.055
-		c 0.006-0.010, 0.016-0.021, 0.018-0.029c 0.010-0.010, 0.014-0.023, 0.023-0.035c 0.010-0.010, 0.020-0.027, 0.027-0.037
-		c 0.010-0.016, 0.020-0.029, 0.029-0.043c 0.010-0.012, 0.014-0.020, 0.023-0.031c 0.004-0.010, 0.014-0.021, 0.018-0.029
-		c 0.014-0.018, 0.023-0.035, 0.035-0.051c 0.008-0.010, 0.018-0.021, 0.021-0.031c 0.008-0.010, 0.018-0.027, 0.023-0.035
-		c 0.008-0.008, 0.012-0.018, 0.018-0.027c 0.014-0.018, 0.031-0.041, 0.045-0.061c 0.006-0.008, 0.008-0.012, 0.010-0.018
-		c 0.014-0.018, 0.020-0.025, 0.029-0.041c 0.004-0.006, 0.008-0.014, 0.016-0.020c 0.016-0.027, 0.025-0.041, 0.045-0.064
-		c 0.002-0.004, 0.008-0.014, 0.012-0.021c 0.010-0.012, 0.018-0.025, 0.027-0.037c 0.004-0.008, 0.010-0.016, 0.014-0.021
-		c 0.014-0.021, 0.033-0.043, 0.045-0.064c 0.004-0.008, 0.010-0.014, 0.014-0.018c 0.012-0.016, 0.016-0.025, 0.029-0.043
-		c 0.002-0.002, 0.006-0.008, 0.006-0.012c 0.020-0.021, 0.037-0.047, 0.049-0.072c 0.006-0.004, 0.010-0.012, 0.014-0.020
-		c 0.033-0.041, 0.062-0.086, 0.094-0.131c0,0, 0.006-0.006, 0.006-0.008c 0.031-0.047, 0.061-0.088, 0.096-0.137
-		c0-0.002,0-0.002, 0.002-0.004c 0.035-0.049, 0.064-0.094, 0.102-0.141c 0.031-0.047, 0.062-0.092, 0.096-0.143c0,0,0,0,0-0.002
-		c 0.314-0.445, 0.631-0.889, 0.949-1.33l 26.162,18.785c 8.023-11.176, 17.879-20.936, 29.145-28.846l-18.518-26.355
-		c 2.307-1.623, 4.664-3.182, 7.062-4.676c 0.004-0.002-0.004,0.002,0,0c 0.051-0.033, 0.098-0.064, 0.148-0.094l 0.002-0.002
-		c 0.047-0.031, 0.1-0.061, 0.146-0.090l 0.004-0.002c 0.051-0.031, 0.096-0.062, 0.146-0.090l 0.006-0.006
-		c 0.047-0.031, 0.096-0.059, 0.143-0.088l 0.008-0.006c 0.049-0.029, 0.096-0.059, 0.145-0.088c 0.006-0.004,0,0, 0.006-0.004
-		c 0.047-0.027, 0.098-0.059, 0.145-0.088c 0.004-0.002, 0.004-0.002, 0.008-0.004c 0.023-0.016, 0.047-0.031, 0.070-0.043
-		c 0.023-0.016, 0.047-0.031, 0.070-0.045c 0.004-0.002, 0.004-0.002, 0.008-0.006c 0.023-0.014, 0.047-0.029, 0.074-0.043l0-0.002 
-		c 0.023-0.014, 0.047-0.027, 0.070-0.039c 0.004-0.004, 0.004-0.004, 0.008-0.006c 0.023-0.016, 0.047-0.029, 0.070-0.045l 0.004-0.002
-		c 0.023-0.016, 0.047-0.027, 0.070-0.043l 0.004-0.004c 0.023-0.014, 0.047-0.027, 0.072-0.043l 0.008-0.004
-		c 0.023-0.014, 0.045-0.025, 0.068-0.041l 0.002-0.002c 0.025-0.016, 0.049-0.027, 0.072-0.045c 0.004-0.002, 0.004-0.002, 0.010-0.004
-		c 0.020-0.016, 0.041-0.025, 0.061-0.041c 0.002-0.002, 0.008-0.002, 0.012-0.002c 0.020-0.016, 0.043-0.029, 0.064-0.043
-		c 0.006-0.002, 0.010-0.004, 0.016-0.006c 0.018-0.014, 0.041-0.025, 0.061-0.037c 0.004-0.004, 0.006-0.006, 0.010-0.008
-		c 0.021-0.012, 0.045-0.025, 0.068-0.039c0-0.004, 0.008-0.008, 0.014-0.010c 0.018-0.012, 0.041-0.025, 0.059-0.035
-		c 0.006-0.004, 0.006-0.004, 0.010-0.006c 0.020-0.012, 0.043-0.027, 0.064-0.039c 0.008-0.006, 0.008-0.008, 0.018-0.012
-		c 0.020-0.014, 0.037-0.023, 0.061-0.035c 0.004-0.002, 0.006-0.006, 0.010-0.008c 0.021-0.010, 0.043-0.025, 0.061-0.037
-		c 0.010-0.004, 0.014-0.008, 0.021-0.012c 0.020-0.010, 0.037-0.023, 0.057-0.033c 0.010-0.004, 0.010-0.008, 0.020-0.012
-		c 0.018-0.010, 0.037-0.021, 0.055-0.033c 0.010-0.004, 0.014-0.010, 0.023-0.014c 0.020-0.010, 0.035-0.020, 0.051-0.033
-		c 0.014-0.006, 0.018-0.010, 0.027-0.014c 0.020-0.010, 0.033-0.020, 0.047-0.029c 0.010-0.006, 0.018-0.010, 0.027-0.014
-		c 0.018-0.012, 0.035-0.021, 0.053-0.031c 0.006-0.006, 0.021-0.014, 0.027-0.018c 0.018-0.010, 0.031-0.018, 0.045-0.027
-		c 0.010-0.004, 0.018-0.010, 0.023-0.014c 0.023-0.014, 0.041-0.023, 0.061-0.037c 0.010-0.004, 0.014-0.006, 0.023-0.012
-		c 0.012-0.010, 0.025-0.020, 0.041-0.025c 0.008-0.006, 0.018-0.012, 0.027-0.016c 0.018-0.012, 0.037-0.023, 0.061-0.035
-		c 0.006-0.004, 0.014-0.010, 0.023-0.018c 0.014-0.004, 0.027-0.014, 0.041-0.021c 0.008-0.008, 0.018-0.012, 0.027-0.018
-		c 0.020-0.010, 0.037-0.021, 0.057-0.033c 0.008-0.004, 0.018-0.010, 0.027-0.014c 0.014-0.010, 0.029-0.020, 0.047-0.029
-		c 0.004,0, 0.014-0.008, 0.020-0.010c 0.018-0.014, 0.039-0.027, 0.059-0.037c 0.008-0.006, 0.018-0.010, 0.027-0.016
-		c 0.014-0.008, 0.027-0.016, 0.043-0.025c 0.004-0.004, 0.018-0.012, 0.025-0.016c 0.021-0.012, 0.037-0.021, 0.057-0.031
-		c 0.010-0.008, 0.014-0.010, 0.027-0.020c 0.014-0.008, 0.027-0.014, 0.037-0.021c 0.010-0.004, 0.021-0.010, 0.029-0.016
-		c 0.018-0.012, 0.037-0.023, 0.055-0.035c 0.012-0.006, 0.018-0.010, 0.031-0.014c 0.014-0.008, 0.023-0.016, 0.037-0.025
-		c 0.014-0.008, 0.029-0.014, 0.037-0.021c 0.020-0.008, 0.033-0.018, 0.047-0.027c 0.016-0.006, 0.021-0.010, 0.033-0.018
-		s 0.021-0.016, 0.033-0.020c 0.012-0.008, 0.029-0.018, 0.043-0.027c 0.014-0.008, 0.029-0.016, 0.043-0.023
-		c 0.010-0.004, 0.023-0.012, 0.033-0.018c 0.012-0.010, 0.023-0.016, 0.037-0.023c 0.012-0.008, 0.025-0.016, 0.039-0.023
-		c 0.016-0.010, 0.029-0.016, 0.043-0.025c 0.010-0.004, 0.023-0.014, 0.033-0.018c 0.012-0.008, 0.023-0.016, 0.037-0.021
-		c 0.016-0.012, 0.027-0.016, 0.043-0.029c 0.012-0.006, 0.025-0.012, 0.035-0.020c 0.008-0.004, 0.027-0.012, 0.037-0.018
-		c 0.008-0.006, 0.023-0.014, 0.037-0.023c 0.016-0.010, 0.027-0.016, 0.047-0.025c 0.010-0.008, 0.021-0.014, 0.031-0.021
-		c 0.014-0.008, 0.021-0.010, 0.037-0.018c 0.012-0.010, 0.027-0.016, 0.037-0.025c 0.014-0.008, 0.033-0.018, 0.047-0.027
-		c 0.010-0.004, 0.023-0.010, 0.033-0.018c 0.014-0.006, 0.021-0.012, 0.035-0.020c 0.008-0.008, 0.023-0.012, 0.031-0.020
-		c 0.023-0.014, 0.033-0.018, 0.053-0.029c 0.012-0.008, 0.023-0.012, 0.033-0.020c 0.014-0.008, 0.023-0.014, 0.037-0.020
-		c 0.012-0.010, 0.025-0.016, 0.039-0.025c 0.020-0.010, 0.029-0.016, 0.043-0.025c 0.012-0.006, 0.023-0.010, 0.033-0.018
-		c 0.014-0.006, 0.023-0.012, 0.031-0.020c 0.016-0.008, 0.029-0.014, 0.043-0.021c 0.016-0.010, 0.031-0.020, 0.049-0.029
-		c 0.010-0.006, 0.016-0.010, 0.023-0.016c 0.043-0.021, 0.090-0.049, 0.129-0.074c 0.010-0.004, 0.014-0.008, 0.023-0.012
-		c 0.043-0.025, 0.090-0.051, 0.131-0.074c 0.010-0.006, 0.014-0.010, 0.021-0.014c 0.029-0.014, 0.057-0.031, 0.084-0.045
-		c0-0.002, 0.006-0.004, 0.006-0.004c 0.018-0.012, 0.027-0.018, 0.047-0.027c 0.004-0.002, 0.008-0.006, 0.014-0.008
-		c 0.025-0.018, 0.061-0.037, 0.092-0.051l0-0.004 c 0.018-0.008, 0.027-0.014, 0.045-0.023c 0.006-0.004, 0.010-0.006, 0.014-0.008
-		c 0.027-0.018, 0.055-0.033, 0.078-0.047c 0.004-0.002, 0.012-0.004, 0.018-0.008c 0.016-0.010, 0.025-0.016, 0.043-0.025
-		c 0.006-0.002, 0.010-0.006, 0.014-0.006c 0.029-0.016, 0.057-0.033, 0.084-0.047c0-0.004, 0.004-0.006, 0.008-0.008
-		c 0.020-0.008, 0.029-0.014, 0.047-0.023c 0.006-0.004, 0.010-0.006, 0.014-0.010c 0.031-0.016, 0.057-0.031, 0.086-0.049
-		c 0.004,0, 0.006-0.002, 0.008-0.004c 0.020-0.008, 0.029-0.016, 0.045-0.025c 0.006-0.002, 0.008-0.006, 0.010-0.006
-		c 0.027-0.014, 0.061-0.033, 0.090-0.049c 0.004,0, 0.006-0.002, 0.008-0.006c 0.020-0.010, 0.033-0.014, 0.047-0.023
-		c 0.004-0.004, 0.006-0.004, 0.006-0.004c 0.025-0.016, 0.059-0.033, 0.092-0.051c 0.004-0.002, 0.006-0.006, 0.012-0.008
-		c 0.016-0.012, 0.027-0.016, 0.043-0.025c 0.006-0.002, 0.006-0.004, 0.010-0.004c 0.023-0.014, 0.059-0.035, 0.082-0.049
-		c 0.006-0.004, 0.012-0.004, 0.020-0.008c 0.010-0.008, 0.027-0.018, 0.041-0.023c 0.006-0.002, 0.008-0.004, 0.010-0.004
-		c 0.027-0.018, 0.061-0.035, 0.088-0.051c 0.004-0.002, 0.006-0.004, 0.008-0.006c 0.053-0.027, 0.094-0.051, 0.145-0.082
-		c 0.004,0, 0.008-0.002, 0.008-0.004c 0.053-0.029, 0.094-0.051, 0.146-0.078c 0.004-0.002, 0.008-0.006, 0.014-0.008
-		c 0.049-0.027, 0.088-0.049, 0.141-0.078c 0.002-0.004, 0.006-0.006, 0.008-0.006c 0.051-0.029, 0.096-0.053, 0.146-0.080
-		c0-0.002, 0.004-0.002, 0.004-0.004c 0.053-0.029, 0.1-0.055, 0.15-0.082l 0.002,0 c 0.051-0.027, 0.102-0.057, 0.15-0.082
-		c 0.002-0.002, 0.002-0.002, 0.002-0.002c 0.135-0.074, 0.27-0.15, 0.408-0.223l0,0c 0.051-0.029, 0.102-0.057, 0.152-0.084c0,0,0,0,0-0.002
-		c 0.051-0.027, 0.098-0.051, 0.146-0.080c 0.006-0.002, 0.010-0.002, 0.010-0.002c 0.104-0.057, 0.199-0.109, 0.303-0.164
-		c 0.002-0.002, 0.004-0.004, 0.010-0.004c 0.1-0.055, 0.199-0.109, 0.299-0.164l 0.006,0 c 2.496-1.34, 5.035-2.613, 7.615-3.816l0-0.004 
-		c 0.516-0.236, 1.025-0.475, 1.541-0.707c0,0,0,0, 0.004-0.002c 0.051-0.025, 0.096-0.045, 0.152-0.070c 0.004,0, 0.004-0.002, 0.010-0.004
-		c 0.057-0.023, 0.104-0.045, 0.152-0.070l 0.004,0 c 0.055-0.023, 0.104-0.047, 0.158-0.070c0,0,0,0, 0.004-0.004
-		c 0.055-0.021, 0.104-0.043, 0.154-0.068c 0.004,0, 0.004-0.002, 0.008-0.002c 0.051-0.023, 0.098-0.045, 0.154-0.070
-		c 0.002,0, 0.004-0.002, 0.010-0.004c 0.049-0.021, 0.1-0.043, 0.152-0.068l 0.004-0.002c 0.037-0.016, 0.059-0.027, 0.096-0.045
-		c 0.006,0, 0.006-0.002, 0.010-0.002c 0.016-0.008, 0.033-0.012, 0.049-0.021c 0.004,0, 0.008-0.004, 0.008-0.004
-		c 0.037-0.014, 0.059-0.027, 0.096-0.041c0-0.002, 0.006-0.002, 0.010-0.006c 0.016-0.008, 0.033-0.012, 0.049-0.021
-		c 0.002,0, 0.002,0, 0.002,0c 0.033-0.016, 0.066-0.029, 0.098-0.043c 0.004-0.002, 0.008-0.002, 0.014-0.004
-		c 0.018-0.010, 0.027-0.016, 0.047-0.023c 0.004-0.002, 0.010-0.004, 0.014-0.006c 0.027-0.012, 0.061-0.025, 0.088-0.035
-		c 0.006-0.004, 0.008-0.006, 0.012-0.008c 0.047-0.021, 0.096-0.043, 0.145-0.066c 0.006-0.002, 0.016-0.006, 0.020-0.008
-		c 0.014-0.004, 0.031-0.012, 0.045-0.020c 0.002,0, 0.004-0.002, 0.008-0.002c 0.025-0.010, 0.062-0.027, 0.086-0.039
-		c 0.010-0.004, 0.018-0.008, 0.023-0.008c 0.045-0.020, 0.096-0.043, 0.143-0.064c 0.004-0.002, 0.014-0.004, 0.020-0.006
-		c 0.045-0.021, 0.1-0.045, 0.143-0.064c 0.004,0, 0.014-0.004, 0.016-0.004c 0.045-0.023, 0.102-0.045, 0.146-0.066
-		c 0.004-0.004, 0.014-0.006, 0.018-0.006c 0.033-0.016, 0.061-0.029, 0.094-0.039c0-0.004, 0.004-0.004, 0.004-0.006
-		c 0.014-0.004, 0.031-0.012, 0.045-0.020c 0.006-0.002, 0.016-0.008, 0.023-0.010c 0.023-0.010, 0.053-0.020, 0.076-0.029
-		c 0.008-0.006, 0.014-0.008, 0.023-0.010c 0.010-0.008, 0.025-0.014, 0.039-0.020c 0.006-0.004, 0.014-0.008, 0.023-0.012
-		c 0.023-0.010, 0.049-0.021, 0.070-0.031c 0.010-0.002, 0.020-0.008, 0.027-0.008c 0.016-0.008, 0.029-0.014, 0.041-0.020
-		c 0.010-0.004, 0.014-0.006, 0.023-0.010c 0.027-0.012, 0.047-0.020, 0.074-0.031c 0.010-0.006, 0.014-0.008, 0.023-0.012
-		c 0.014-0.004, 0.029-0.012, 0.043-0.016c 0.010-0.004, 0.018-0.008, 0.025-0.012c 0.023-0.010, 0.043-0.020, 0.066-0.029
-		c 0.008-0.002, 0.020-0.008, 0.029-0.012c 0.010-0.006, 0.031-0.012, 0.041-0.018c 0.008-0.004, 0.018-0.010, 0.027-0.014
-		c 0.021-0.008, 0.045-0.018, 0.068-0.027c 0.010-0.004, 0.018-0.006, 0.025-0.012c 0.012-0.004, 0.029-0.012, 0.041-0.016
-		c 0.008-0.006, 0.021-0.010, 0.025-0.014c 0.023-0.010, 0.045-0.018, 0.068-0.029c 0.010-0.002, 0.020-0.006, 0.029-0.010
-		c 0.014-0.006, 0.027-0.012, 0.039-0.018c 0.012-0.004, 0.025-0.010, 0.035-0.016c 0.018-0.006, 0.037-0.016, 0.055-0.023
-		c 0.014-0.006, 0.023-0.010, 0.037-0.016c 0.014-0.004, 0.023-0.008, 0.037-0.014c 0.014-0.008, 0.031-0.014, 0.047-0.021
-		c 0.014-0.004, 0.033-0.012, 0.045-0.020c 0.010-0.004, 0.023-0.008, 0.035-0.012c 0.012-0.008, 0.021-0.010, 0.035-0.014
-		c 0.018-0.010, 0.037-0.020, 0.055-0.025c 0.016-0.008, 0.023-0.010, 0.039-0.018c 0.014-0.004, 0.023-0.008, 0.035-0.012
-		c 0.014-0.008, 0.018-0.010, 0.033-0.016c 0.018-0.010, 0.041-0.018, 0.061-0.025c 0.014-0.006, 0.018-0.010, 0.031-0.014
-		c 0.016-0.006, 0.029-0.010, 0.039-0.016c 0.012-0.004, 0.016-0.008, 0.029-0.014c 0.023-0.008, 0.043-0.018, 0.061-0.023
-		c 0.016-0.008, 0.023-0.012, 0.039-0.018c 0.010-0.004, 0.023-0.010, 0.037-0.014c 0.012-0.008, 0.018-0.010, 0.031-0.016
-		c 0.018-0.008, 0.039-0.018, 0.061-0.021c 0.014-0.008, 0.018-0.010, 0.031-0.016c 0.016-0.008, 0.029-0.012, 0.043-0.020
-		c 0.010-0.002, 0.020-0.006, 0.027-0.010c 0.020-0.008, 0.041-0.018, 0.059-0.025c 0.016-0.004, 0.023-0.010, 0.039-0.014
-		c 0.008-0.006, 0.023-0.010, 0.033-0.016c 0.014-0.008, 0.037-0.012, 0.051-0.020s 0.025-0.012, 0.045-0.020
-		c 0.008-0.006, 0.023-0.012, 0.031-0.014c 0.016-0.004, 0.025-0.012, 0.039-0.016c 0.018-0.006, 0.031-0.014, 0.051-0.021
-		c 0.014-0.004, 0.027-0.012, 0.039-0.016c 0.010-0.006, 0.029-0.012, 0.035-0.016c 0.014-0.006, 0.029-0.010, 0.043-0.018
-		c 0.012-0.004, 0.031-0.012, 0.045-0.018c 0.014-0.008, 0.027-0.012, 0.047-0.020c 0.008-0.002, 0.021-0.008, 0.029-0.012
-		c 0.018-0.008, 0.033-0.016, 0.051-0.023c 0.010-0.002, 0.023-0.010, 0.033-0.012c 0.014-0.006, 0.033-0.012, 0.051-0.020
-		c 0.010-0.004, 0.020-0.008, 0.029-0.014c 0.020-0.006, 0.039-0.016, 0.059-0.023c 0.004-0.002, 0.018-0.008, 0.023-0.010
-		c 0.018-0.006, 0.037-0.014, 0.057-0.023c 0.008-0.002, 0.014-0.006, 0.023-0.010c 0.021-0.010, 0.045-0.018, 0.066-0.027
-		c 0.010-0.004, 0.010-0.004, 0.020-0.008c 0.020-0.006, 0.033-0.014, 0.051-0.021c 0.010-0.002, 0.020-0.008, 0.029-0.010
-		c 0.023-0.010, 0.039-0.018, 0.062-0.027c 0.010-0.004, 0.014-0.004, 0.023-0.010c 0.020-0.006, 0.033-0.012, 0.053-0.020
-		c 0.004-0.002, 0.021-0.008, 0.023-0.010c 0.023-0.010, 0.047-0.018, 0.066-0.027c 0.010-0.006, 0.010-0.006, 0.020-0.010
-		c 0.020-0.008, 0.037-0.016, 0.057-0.020c 0.010-0.004, 0.014-0.008, 0.023-0.010c 0.023-0.010, 0.047-0.018, 0.066-0.027
-		c 0.010-0.002, 0.012-0.006, 0.020-0.010c 0.020-0.008, 0.037-0.016, 0.057-0.020c 0.010-0.006, 0.014-0.006, 0.023-0.010
-		c 0.021-0.010, 0.043-0.020, 0.064-0.027c 0.006,0, 0.020-0.008, 0.023-0.008c 0.018-0.008, 0.037-0.018, 0.055-0.023
-		c 0.008-0.002, 0.010-0.004, 0.020-0.006c 0.023-0.010, 0.047-0.020, 0.070-0.029c 0.004-0.004, 0.014-0.006, 0.018-0.008
-		c 0.023-0.008, 0.041-0.018, 0.059-0.023c 0.006-0.002, 0.016-0.004, 0.020-0.008c 0.023-0.010, 0.047-0.020, 0.070-0.029
-		c 0.004-0.002, 0.014-0.004, 0.018-0.004c 0.021-0.010, 0.043-0.018, 0.061-0.027c 0.004-0.002, 0.008-0.006, 0.014-0.006
-		c 0.027-0.010, 0.051-0.020, 0.074-0.029c 0.004,0, 0.012-0.002, 0.016-0.006c 0.023-0.010, 0.045-0.016, 0.068-0.029
-		c 0.006,0, 0.004,0, 0.008-0.002c 0.023-0.008, 0.047-0.018, 0.074-0.027c 0.008-0.004, 0.010-0.004, 0.020-0.008
-		c 0.021-0.008, 0.041-0.018, 0.064-0.027c 0.004-0.002, 0.004,0, 0.010-0.002c 0.021-0.010, 0.047-0.020, 0.072-0.029
-		c 0.010-0.002, 0.004-0.002, 0.014-0.008c 0.053-0.018, 0.102-0.037, 0.152-0.059l 0.012-0.004c 0.025-0.012, 0.055-0.020, 0.078-0.031l 0.004,0 
-		c 0.023-0.010, 0.047-0.020, 0.072-0.029c 0.006,0, 0.010-0.004, 0.016-0.006c 0.023-0.010, 0.051-0.020, 0.074-0.029
-		c 0.004,0, 0.002,0, 0.008-0.002c 0.025-0.010, 0.049-0.020, 0.070-0.029c 0.004-0.002, 0.008-0.002, 0.014-0.004
-		c 0.023-0.010, 0.049-0.020, 0.074-0.029c 0.006-0.002, 0.006,0, 0.010-0.002c 0.023-0.010, 0.047-0.020, 0.068-0.029
-		c 0.004-0.002, 0.010-0.002, 0.012-0.004c 0.025-0.010, 0.053-0.021, 0.076-0.031l 0.010-0.002c 0.023-0.008, 0.047-0.018, 0.070-0.027
-		c 0.004-0.004, 0.004-0.004, 0.010-0.004c 0.025-0.010, 0.049-0.020, 0.078-0.031l 0.008-0.002c 0.023-0.012, 0.053-0.021, 0.076-0.031
-		l 0.004-0.002c 0.025-0.008, 0.049-0.018, 0.078-0.029l 0.006-0.002c 0.025-0.010, 0.051-0.018, 0.078-0.029l 0.004-0.004
-		c 0.029-0.010, 0.051-0.020, 0.078-0.029c 0.004,0, 0.004,0, 0.010-0.002c 0.023-0.010, 0.051-0.020, 0.076-0.029l 0.002,0 
-		c 0.029-0.014, 0.053-0.023, 0.078-0.033c 0.006,0, 0.002,0, 0.006,0c 0.055-0.021, 0.111-0.041, 0.16-0.062
-		c 0.006-0.002, 0.006-0.002, 0.010-0.002c 0.051-0.021, 0.107-0.041, 0.162-0.062l 0.004-0.002c 0.055-0.021, 0.107-0.041, 0.164-0.064l 0.004,0 
-		c 0.109-0.041, 0.221-0.086, 0.332-0.125c 2.123-0.803, 4.266-1.557, 6.434-2.264l 10.018,30.615c 11.951-3.912, 24.701-6.057, 37.961-6.057
-		c 0.859,0, 1.709,0.047, 2.566,0.064l 0.66-32.205c 0.105,0.002, 0.209,0.006, 0.311,0.008c 0.002,0, 0.002,0, 0.004,0
-		c 0.061,0.002, 0.117,0.002, 0.178,0.004c 0.004,0, 0.010,0, 0.012,0c 0.066,0.004, 0.113,0.004, 0.172,0.006c 0.006,0, 0.010,0, 0.020,0
-		c 0.051,0.002, 0.109,0.002, 0.16,0.004c 0.010,0, 0.020,0, 0.029,0c 0.014,0, 0.031,0.002, 0.047,0.002c 0.006,0, 0.014,0, 0.018,0
-		c 0.033,0, 0.059,0.002, 0.092,0.002c 0.010,0, 0.016,0, 0.023,0c 0.020,0.002, 0.037,0.002, 0.051,0.002c 0.010,0, 0.016,0, 0.023,0
-		c 0.033,0.002, 0.055,0.002, 0.084,0.002c 0.010,0, 0.020,0.004, 0.031,0.004c 0.014,0, 0.031,0, 0.047,0c 0.010,0, 0.016,0, 0.023,0.002
-		c 0.029,0, 0.053,0, 0.086,0.002c 0.008,0, 0.014,0, 0.023,0c 0.018,0, 0.033,0, 0.047,0.002c 0.014,0, 0.023,0, 0.037,0
-		c 0.020,0, 0.045,0.004, 0.064,0.004c 0.014,0, 0.027,0, 0.041,0c 0.010,0.002, 0.029,0.002, 0.041,0.002c 0.016,0, 0.029,0, 0.043,0.002
-		c 0.014,0, 0.027,0, 0.041,0c 0.020,0, 0.043,0.002, 0.061,0.002c 0.010,0, 0.027,0, 0.037,0c 0.014,0.004, 0.029,0.004, 0.047,0.004
-		c 0.010,0, 0.018,0, 0.031,0.002c 0.021,0, 0.047,0, 0.070,0.002c 0.010,0, 0.023,0, 0.033,0c 0.018,0, 0.031,0.002, 0.049,0.002
-		c 0.010,0, 0.020,0, 0.027,0c 0.023,0.004, 0.047,0.004, 0.072,0.004c 0.012,0, 0.021,0.002, 0.031,0.002c 0.020,0, 0.037,0, 0.053,0.002
-		c 0.012,0, 0.018,0, 0.029,0c 0.023,0, 0.047,0.002, 0.072,0.002c 0.012,0, 0.018,0, 0.025,0c 0.020,0.002, 0.043,0.002, 0.059,0.002
-		c 0.008,0, 0.020,0.002, 0.025,0.002c 0.023,0, 0.051,0.002, 0.074,0.002c 0.012,0, 0.014,0, 0.023,0c 0.020,0.002, 0.041,0.002, 0.061,0.002
-		c 0.004,0, 0.018,0.004, 0.023,0.004c 0.025,0, 0.055,0.002, 0.078,0.002c 0.006,0, 0.008,0, 0.014,0c 0.023,0.002, 0.047,0.002, 0.070,0.002
-		c 0.008,0, 0.008,0, 0.021,0.002c 0.023,0, 0.051,0.002, 0.078,0.002c 0.006,0, 0.008,0, 0.016,0c 0.023,0.002, 0.047,0.002, 0.070,0.002
-		c 0.006,0.002, 0.006,0.002, 0.016,0.002c 0.055,0.002, 0.111,0.006, 0.168,0.008c 0.002,0, 0.008,0, 0.012,0
-		c 0.027,0, 0.057,0.002, 0.084,0.002c 0.027,0.002, 0.057,0.002, 0.084,0.006c 0.006,0, 0.008,0, 0.012,0
-		c 0.057,0.002, 0.115,0.004, 0.174,0.006c 0.002,0, 0.002,0, 0.008,0.004c 0.027,0, 0.055,0.002, 0.084,0.002l 0.004,0 
-		c 0.029,0.002, 0.057,0.002, 0.090,0.004l0,0c 0.092,0.006, 0.18,0.008, 0.271,0.012c 0.119,0.006, 0.242,0.012, 0.361,0.020l0,0
-		c 9.67,0.467, 19.105,1.828, 28.225,4l0,0c 0.258,0.059, 0.514,0.121, 0.768,0.186c 0.059,0.012, 0.115,0.027, 0.172,0.039l0,0
-		c 0.055,0.016, 0.111,0.027, 0.172,0.043l0,0c 0.053,0.014, 0.111,0.029, 0.166,0.041l 0.006,0 c 0.055,0.014, 0.109,0.027, 0.164,0.043
-		c 0.006,0, 0.002,0, 0.008,0.002c 0.059,0.014, 0.107,0.025, 0.164,0.039l 0.004,0.004c 0.029,0.006, 0.057,0.012, 0.082,0.018l 0.002,0.002
-		c 0.055,0.012, 0.111,0.027, 0.168,0.041l 0.004,0 c 0.053,0.014, 0.109,0.027, 0.166,0.041c 0.004,0.002,0,0, 0.004,0.002
-		c 0.055,0.016, 0.111,0.029, 0.166,0.043c 0.006,0,0,0, 0.006,0.002c 0.051,0.014, 0.107,0.029, 0.16,0.041l 0.010,0 
-		c 0.055,0.016, 0.105,0.027, 0.162,0.043l 0.008,0.002c 0.053,0.016, 0.107,0.027, 0.164,0.043l 0.004,0.002
-		c 0.057,0.012, 0.111,0.027, 0.166,0.039c 0.006,0.004,0,0, 0.006,0.004c 0.055,0.014, 0.109,0.029, 0.166,0.043l0,0
-		c 0.057,0.016, 0.111,0.027, 0.168,0.045l 0.002,0 c 0.029,0.008, 0.057,0.016, 0.086,0.020c 0.027,0.010, 0.053,0.018, 0.082,0.025l 0.004,0 
-		c 0.025,0.008, 0.051,0.012, 0.080,0.020l 0.004,0.002c 0.055,0.014, 0.111,0.027, 0.166,0.045c 0.006,0-0.004-0.002, 0.002,0
-		c 0.057,0.012, 0.107,0.029, 0.164,0.043l 0.008,0.002c 0.053,0.014, 0.107,0.029, 0.164,0.041l 0.004,0.004
-		c 0.057,0.014, 0.111,0.031, 0.162,0.043l 0.010,0.004c 0.055,0.012, 0.109,0.027, 0.166,0.043c 0.139,0.037, 0.279,0.076, 0.422,0.115l0,0
-		c 0.055,0.014, 0.109,0.029, 0.166,0.045l 0.004,0 c 0.057,0.016, 0.105,0.029, 0.162,0.047c 0.006,0.002, 0.002,0, 0.008,0.002
-		c 0.053,0.012, 0.107,0.029, 0.164,0.043l 0.004,0.002c 0.057,0.014, 0.107,0.031, 0.16,0.045l 0.010,0.002
-		c 0.053,0.014, 0.107,0.029, 0.162,0.045l 0.004,0.002c 0.057,0.016, 0.113,0.029, 0.166,0.047c 0.004,0.002-0.004,0, 0.002,0
-		c 0.115,0.031, 0.223,0.062, 0.334,0.094l 0.002,0 c 0.141,0.039, 0.279,0.080, 0.42,0.119l 0.002,0 c 0.057,0.016, 0.109,0.031, 0.162,0.047
-		l 0.006,0.002c 0.055,0.016, 0.111,0.029, 0.166,0.047l 0.004,0 c 0.057,0.016, 0.109,0.033, 0.164,0.049l 0.002,0 
-		c 0.057,0.016, 0.113,0.031, 0.168,0.049c 0.305,0.088, 0.615,0.18, 0.92,0.27l0,0c 1.34,0.398, 2.674,0.814, 3.994,1.246l-10.012,30.617
-		c 13.201,4.316, 25.41,10.818, 36.197,19.090l 19.598-25.557c 5.67,4.35, 11.029,9.084, 16.037,14.166l0,0.002 
-		c 0.043,0.041, 0.086,0.082, 0.125,0.123c 0.066,0.064, 0.127,0.127, 0.189,0.191l0,0.002 c 0.041,0.039, 0.080,0.082, 0.123,0.123
-		c 0.004,0.004,0,0, 0.004,0.004c 0.041,0.041, 0.078,0.084, 0.119,0.125l 0.006,0.002c 0.037,0.041, 0.076,0.080, 0.113,0.119l 0.010,0.010
-		c 0.037,0.041, 0.078,0.078, 0.117,0.117c0,0.002, 0.006,0.008, 0.010,0.010c 0.016,0.021, 0.035,0.039, 0.055,0.061
-		c 0.004,0.002,0,0, 0.004,0.002c 0.020,0.020, 0.033,0.037, 0.051,0.055c 0.002,0.002, 0.010,0.010, 0.016,0.014
-		c 0.018,0.018, 0.033,0.035, 0.051,0.053c 0.008,0.008, 0.004,0.004, 0.012,0.012c 0.014,0.016, 0.029,0.033, 0.047,0.047
-		c 0.002,0.006, 0.006,0.010, 0.010,0.016c 0.018,0.018, 0.037,0.037, 0.057,0.055c 0.004,0.002, 0.006,0.008, 0.008,0.010
-		c 0.020,0.020, 0.033,0.033, 0.053,0.051l 0.006,0.010c 0.020,0.018, 0.033,0.035, 0.053,0.057c 0.004,0.004, 0.010,0.008, 0.014,0.012
-		c 0.014,0.016, 0.033,0.033, 0.047,0.049c 0.004,0.002, 0.010,0.008, 0.010,0.010c 0.018,0.018, 0.037,0.037, 0.055,0.055
-		c 0.006,0.004, 0.008,0.012, 0.014,0.014c 0.014,0.018, 0.031,0.035, 0.047,0.053c 0.004,0.002, 0.004,0.002, 0.008,0.006
-		c 0.018,0.020, 0.033,0.037, 0.053,0.055c 0.008,0.006, 0.006,0.006, 0.014,0.014c 0.018,0.020, 0.037,0.037, 0.053,0.059l0,0.004 
-		c 0.020,0.018, 0.037,0.035, 0.057,0.055c 0.002,0.002, 0.010,0.010, 0.012,0.014c 0.016,0.018, 0.035,0.035, 0.053,0.055
-		c 0.006,0.002, 0.006,0.006, 0.010,0.008c 0.014,0.018, 0.033,0.035, 0.047,0.051c 0.006,0.004, 0.008,0.008, 0.012,0.014
-		c 0.020,0.018, 0.037,0.037, 0.053,0.057c 0.004,0, 0.008,0.002, 0.008,0.008c 0.020,0.018, 0.033,0.031, 0.053,0.051
-		c0,0.004, 0.010,0.008, 0.010,0.012c 0.018,0.020, 0.037,0.035, 0.051,0.053c 0.008,0.008, 0.010,0.012, 0.016,0.018
-		c 0.016,0.016, 0.029,0.029, 0.043,0.043c 0.004,0.006, 0.004,0.006, 0.014,0.014c 0.014,0.018, 0.033,0.037, 0.053,0.053
-		c0,0.004, 0.008,0.014, 0.014,0.020c 0.014,0.014, 0.027,0.027, 0.041,0.043c 0.006,0.006, 0.008,0.006, 0.012,0.014
-		c 0.020,0.020, 0.033,0.035, 0.053,0.055c 0.004,0.008, 0.010,0.012, 0.018,0.018c 0.016,0.014, 0.023,0.027, 0.039,0.041
-		c 0.004,0.006, 0.014,0.016, 0.018,0.020c 0.014,0.016, 0.031,0.031, 0.047,0.049c 0.004,0.006, 0.010,0.012, 0.018,0.018
-		c 0.014,0.016, 0.027,0.031, 0.041,0.047c 0.010,0.006, 0.014,0.012, 0.020,0.020c 0.014,0.012, 0.027,0.029, 0.041,0.043
-		c 0.006,0.006, 0.016,0.014, 0.020,0.021c 0.018,0.018, 0.033,0.033, 0.049,0.051c 0.002,0.004, 0.010,0.010, 0.012,0.014
-		c 0.014,0.014, 0.025,0.027, 0.041,0.041c 0.004,0.006, 0.014,0.016, 0.018,0.023c 0.020,0.016, 0.033,0.031, 0.049,0.049
-		c 0.008,0.008, 0.012,0.014, 0.021,0.020c 0.010,0.012, 0.021,0.023, 0.033,0.035c 0.010,0.012, 0.012,0.014, 0.021,0.027
-		c 0.014,0.014, 0.027,0.029, 0.043,0.047c 0.008,0.008, 0.018,0.018, 0.021,0.023c 0.010,0.008, 0.023,0.021, 0.033,0.033
-		c 0.010,0.010, 0.012,0.012, 0.023,0.021c 0.014,0.016, 0.027,0.033, 0.043,0.049c 0.006,0.008, 0.014,0.014, 0.025,0.025
-		c 0.006,0.010, 0.014,0.018, 0.023,0.027c 0.014,0.016, 0.027,0.027, 0.041,0.043c 0.010,0.012, 0.020,0.021, 0.029,0.031
-		s 0.018,0.018, 0.027,0.027s 0.020,0.020, 0.029,0.029c 0.008,0.010, 0.016,0.023, 0.025,0.033c 0.014,0.012, 0.027,0.027, 0.037,0.039
-		c 0.010,0.008, 0.020,0.018, 0.023,0.025c 0.012,0.012, 0.023,0.023, 0.033,0.035c 0.014,0.014, 0.023,0.021, 0.035,0.035
-		c 0.012,0.012, 0.021,0.023, 0.029,0.035c 0.010,0.008, 0.018,0.018, 0.023,0.025c 0.014,0.012, 0.021,0.021, 0.033,0.035
-		c 0.012,0.012, 0.025,0.027, 0.035,0.037c 0.010,0.008, 0.018,0.018, 0.027,0.029c 0.010,0.010, 0.014,0.018, 0.027,0.027
-		c 0.008,0.010, 0.020,0.021, 0.029,0.031c 0.012,0.014, 0.021,0.027, 0.035,0.043c 0.010,0.010, 0.020,0.018, 0.027,0.027
-		c 0.010,0.010, 0.016,0.018, 0.023,0.029c 0.016,0.012, 0.029,0.027, 0.043,0.043c 0.010,0.010, 0.020,0.020, 0.027,0.031
-		c 0.010,0.008, 0.020,0.018, 0.027,0.027c 0.010,0.008, 0.016,0.016, 0.023,0.025c 0.014,0.016, 0.027,0.029, 0.041,0.045
-		c 0.010,0.014, 0.020,0.018, 0.029,0.027c 0.008,0.012, 0.018,0.021, 0.025,0.031c 0.006,0.006, 0.016,0.020, 0.025,0.023
-		c 0.014,0.018, 0.027,0.033, 0.041,0.051c 0.010,0.010, 0.016,0.016, 0.025,0.023c 0.006,0.010, 0.016,0.023, 0.025,0.033
-		c 0.014,0.012, 0.027,0.025, 0.041,0.041c 0.010,0.010, 0.016,0.018, 0.023,0.027c 0.010,0.010, 0.021,0.023, 0.033,0.031
-		c 0.004,0.010, 0.014,0.016, 0.020,0.025c 0.014,0.014, 0.031,0.035, 0.045,0.051c 0.008,0.008, 0.014,0.014, 0.023,0.023
-		c 0.004,0.006, 0.023,0.023, 0.027,0.031c 0.010,0.010, 0.018,0.020, 0.027,0.027c 0.014,0.016, 0.029,0.029, 0.041,0.043
-		c 0.006,0.010, 0.016,0.018, 0.025,0.027s 0.018,0.023, 0.025,0.031c 0.010,0.010, 0.014,0.018, 0.023,0.027
-		c 0.014,0.014, 0.029,0.031, 0.043,0.043c 0.008,0.014, 0.018,0.020, 0.025,0.029c 0.012,0.012, 0.016,0.021, 0.025,0.029
-		c 0.014,0.012, 0.023,0.025, 0.035,0.039c 0.012,0.012, 0.021,0.021, 0.033,0.035c 0.010,0.010, 0.014,0.020, 0.023,0.025
-		c 0.010,0.012, 0.018,0.021, 0.027,0.031c 0.014,0.016, 0.029,0.029, 0.039,0.041c 0.014,0.014, 0.021,0.025, 0.031,0.035
-		c 0.006,0.006, 0.014,0.014, 0.020,0.021c 0.018,0.020, 0.033,0.037, 0.049,0.053c 0.006,0.010, 0.014,0.014, 0.020,0.023
-		c 0.008,0.010, 0.020,0.023, 0.031,0.033c 0.006,0.008, 0.010,0.010, 0.016,0.018c 0.018,0.021, 0.037,0.041, 0.055,0.064
-		c 0.008,0.004, 0.010,0.010, 0.016,0.014c 0.008,0.010, 0.023,0.023, 0.031,0.033c 0.006,0.008, 0.010,0.014, 0.018,0.021
-		c 0.018,0.020, 0.035,0.039, 0.057,0.061c 0.004,0.004, 0.008,0.010, 0.014,0.014c 0.010,0.016, 0.018,0.023, 0.033,0.039
-		c 0.002,0.004, 0.004,0.006, 0.008,0.010c 0.020,0.020, 0.043,0.049, 0.064,0.070c0,0.002, 0.004,0.008, 0.010,0.010
-		c 0.010,0.016, 0.018,0.023, 0.031,0.039c 0.006,0.004, 0.008,0.008, 0.010,0.010c 0.020,0.021, 0.043,0.045, 0.061,0.066
-		c 0.006,0.004, 0.010,0.012, 0.016,0.020c 0.010,0.010, 0.023,0.023, 0.033,0.033c 0.004,0, 0.004,0.004, 0.004,0.004
-		c 0.020,0.025, 0.043,0.051, 0.066,0.076c 0.006,0.004, 0.010,0.010, 0.010,0.014c 0.033,0.035, 0.074,0.080, 0.107,0.117
-		c 0.004,0.004, 0.010,0.008, 0.010,0.012c 0.035,0.039, 0.072,0.082, 0.109,0.119c0,0.002, 0.006,0.006, 0.006,0.008
-		c 0.037,0.045, 0.070,0.078, 0.105,0.121c 0.004,0.004, 0.008,0.010, 0.014,0.014c 0.023,0.025, 0.041,0.049, 0.064,0.074
-		c0,0.004, 0.004,0.004, 0.006,0.004c 0.014,0.014, 0.023,0.025, 0.037,0.039c0,0.006, 0.004,0.008, 0.004,0.008
-		c 0.021,0.025, 0.045,0.055, 0.064,0.076c 0.004,0.002, 0.008,0.006, 0.010,0.008c 0.037,0.043, 0.074,0.082, 0.111,0.127
-		c 0.004,0.002,0,0.002, 0.006,0.002c 0.035,0.045, 0.072,0.084, 0.109,0.127c0,0.002,0,0.002, 0.004,0.004
-		c 0.039,0.045, 0.072,0.084, 0.111,0.127c0,0.002,0,0.004, 0.002,0.004c 0.039,0.045, 0.072,0.082, 0.115,0.127c0,0.002,0,0.002,0,0.002
-		c 0.039,0.045, 0.072,0.084, 0.109,0.127c 0.006,0.002, 0.006,0.002, 0.006,0.004c 0.102,0.117, 0.199,0.23, 0.299,0.344
-		c0,0.004,0,0, 0.002,0.004c 3.182,3.648, 6.191,7.449, 9.021,11.385l-26.16,18.795c 7.916,11.025, 14.033,23.416, 17.938,36.762
-		l 30.924-9.041c 2.834,9.691, 4.738,19.777, 5.615,30.158c 0.020,0.201, 0.037,0.402, 0.053,0.604l0,0.004 
-		c 0.004,0.057, 0.008,0.113, 0.014,0.168c 0.008,0.088, 0.014,0.176, 0.021,0.26l0,0.004 c 0.012,0.143, 0.020,0.283, 0.035,0.428l0,0.004 
-		c 0.004,0.055, 0.006,0.111, 0.008,0.168c 0.004,0.006,0,0.004, 0.004,0.008c 0.002,0.055, 0.006,0.113, 0.012,0.168
-		c 0.004,0.027, 0.004,0.055, 0.006,0.082c0,0.006,0,0.002, 0.002,0.008c0,0.055, 0.006,0.109, 0.010,0.166l0,0.010 
-		c 0.006,0.055, 0.010,0.109, 0.014,0.166l0,0.004 c0,0.027, 0.004,0.053, 0.004,0.082l0,0.004 c 0.004,0.055, 0.008,0.109, 0.014,0.166l0,0.008 
-		c 0.004,0.057, 0.004,0.111, 0.010,0.166c0,0.006,0,0.006,0,0.010c 0.004,0.029, 0.004,0.055, 0.006,0.082
-		c 0.002,0.055, 0.008,0.111, 0.012,0.168c0,0.006,0,0.004,0,0.008c 0.006,0.057, 0.010,0.111, 0.010,0.166
-		c 0.002,0.006, 0.002,0.006, 0.002,0.010c 0.002,0.057, 0.008,0.111, 0.012,0.168c0,0.029, 0.006,0.057, 0.006,0.082c0,0.008,0,0.002,0,0.010
-		c 0.004,0.053, 0.006,0.111, 0.008,0.164l0,0.010 c 0.006,0.055, 0.010,0.113, 0.016,0.168c0,0.004,0,0,0,0.004c0,0.027,0,0.055, 0.004,0.082
-		l0,0.002 c 0.002,0.059, 0.004,0.113, 0.010,0.17l0,0.006 c 0.004,0.059, 0.008,0.115, 0.010,0.168c0,0.006,0,0,0,0.008
-		c 0.004,0.055, 0.008,0.111, 0.008,0.168l0,0.004 c 0.006,0.027, 0.006,0.055, 0.006,0.080c0,0.004,0,0.002,0,0.006
-		c 0.004,0.057, 0.010,0.113, 0.010,0.168l 0.002,0.008c 0.002,0.057, 0.006,0.111, 0.010,0.168c0,0.004,0,0.004, 0.002,0.008
-		c0,0.027,0,0.053, 0.002,0.076c0,0.006,0,0.004,0,0.008c 0.002,0.059, 0.006,0.113, 0.010,0.168l0,0.008 
-		c 0.002,0.057, 0.006,0.111, 0.006,0.17c 0.004,0.004,0,0, 0.004,0.004c 0.002,0.027, 0.002,0.057, 0.002,0.080l0,0.006 
-		c 0.004,0.055, 0.006,0.109, 0.006,0.166c0,0.004,0,0.004,0,0.012c 0.006,0.053, 0.008,0.107, 0.010,0.164c0,0.004,0,0.004,0,0.010
-		c 0.006,0.055, 0.006,0.109, 0.010,0.166l0,0.008 c0,0.023, 0.002,0.051, 0.004,0.078c0,0.004,0,0.002,0,0.008
-		c0,0.055, 0.006,0.111, 0.008,0.162l 0.002,0.016c0,0.025,0,0.053,0,0.076c0,0.006,0-0.002,0,0.004
-		C 410,217.016, 410,217.041, 410,217.070c0,0.004,0,0.004,0,0.010c 0.002,0.023, 0.004,0.047, 0.004,0.072c0,0.004,0,0.006,0,0.012
-		c0,0.027, 0.004,0.055, 0.004,0.082l0,0.006 c0,0.023,0,0.051, 0.004,0.070c 0.002,0.008, 0.002,0.018, 0.002,0.021
-		c0,0.055, 0.004,0.105, 0.004,0.156c0,0.006,0,0.014,0,0.018c 0.004,0.025, 0.006,0.049, 0.006,0.074L 410.024,217.6 
-		c0,0.027, 0.002,0.053, 0.004,0.078l0,0.016 c0,0.023,0,0.047, 0.002,0.068c0,0.006,0,0.010, 0.002,0.016c0,0.027,0,0.053,0,0.080l0,0.002 
-		c 0.004,0.027, 0.006,0.051, 0.006,0.078c0,0.006,0,0.014,0,0.018c0,0.025, 0.002,0.049, 0.004,0.074c0,0.006,0,0,0,0.006
-		c0,0.027,0,0.055,0,0.078c 0.004,0.008, 0.004,0.010, 0.004,0.018c 0.002,0.020, 0.002,0.045, 0.002,0.064c0,0.006,0,0.016,0,0.020
-		c0,0.025, 0.004,0.053, 0.004,0.078c0,0.006,0,0.004,0,0.010c0,0.021,0,0.047,0,0.068c 0.002,0.010, 0.002,0.012, 0.004,0.025
-		c0,0.021,0,0.047,0,0.068l0,0.006 c0,0.025, 0.006,0.053, 0.006,0.078c0,0.008,0,0.016,0,0.020c0,0.023,0,0.045, 0.002,0.070l0,0.010 
-		c 0.002,0.029, 0.002,0.055, 0.002,0.082c0,0.004,0,0.006,0,0.012c0,0.021, 0.004,0.045, 0.006,0.068c0,0.004,0,0.012,0,0.016
-		c0,0.053, 0.004,0.109, 0.004,0.16c0,0.006,0,0.012,0,0.016c0,0.025,0,0.047, 0.002,0.070c 0.002,0.004, 0.002,0.010, 0.002,0.014
-		c0,0.027,0,0.053,0,0.078c0,0.004,0,0.010,0,0.014c0,0.025, 0.004,0.047, 0.006,0.070c0,0.004,0,0.010,0,0.016c0,0.025,0,0.055,0,0.080
-		l0,0.002 c 0.002,0.027, 0.004,0.053, 0.004,0.076c0,0.010,0,0.008,0,0.020c0,0.025,0,0.053, 0.004,0.076l0,0.002 
-		c 0.002,0.029, 0.002,0.055, 0.002,0.082c0,0.004,0,0.010,0,0.014c0,0.025,0,0.047, 0.002,0.070c0,0.004,0,0.008,0,0.012
-		c 0.002,0.029, 0.002,0.057, 0.002,0.082c0,0.004,0,0.008,0,0.012c0,0.023,0,0.047, 0.002,0.070c0,0.004,0,0.010,0,0.014
-		c 0.002,0.055, 0.002,0.109, 0.006,0.166c0,0.006,0,0.008,0,0.012c 0.002,0.023, 0.002,0.049, 0.002,0.072l0,0.010 c0,0.027,0,0.055,0,0.082
-		l 0.002,0.014c 0.002,0.021, 0.002,0.043, 0.002,0.068c0,0.004,0,0.012,0,0.018c0,0.053, 0.004,0.105, 0.004,0.158c0,0.010,0,0.010,0,0.020
-		c0,0.021,0,0.047,0,0.068c0,0.006,0,0.006,0,0.010c0,0.027,0,0.053, 0.004,0.080c 0.002,0.006, 0.002,0.012, 0.002,0.020
-		c0,0.021,0,0.043,0,0.062c0,0.004,0,0.014,0,0.020c0,0.025,0,0.049,0,0.076c0,0.006,0,0.010,0,0.016
-		c 0.002,0.021, 0.004,0.045, 0.004,0.064c0,0.010,0,0.014,0,0.023c0,0.023,0,0.043,0,0.068c0,0.004,0,0.004,0,0.010
-		c0,0.023,0,0.051,0,0.076c 0.004,0.004, 0.004,0.020, 0.004,0.023c 0.002,0.018, 0.002,0.037, 0.002,0.059c0,0.010,0,0.012,0,0.021
-		c0,0.027,0,0.053,0,0.076c0,0.010,0,0.008,0,0.020c0,0.018,0,0.041,0,0.061c0,0.004, 0.002,0.018, 0.002,0.021
-		c 0.002,0.055, 0.002,0.105, 0.002,0.158c0,0.004,0,0.014,0,0.021c0,0.021,0,0.043,0,0.066c0,0.004,0,0.008,0,0.012
-		c 0.004,0.025, 0.004,0.055, 0.004,0.078c0,0.006,0,0.012,0,0.020c0,0.021,0,0.041,0,0.066c0,0.002,0,0.012,0,0.018
-		c0,0.023,0,0.053,0,0.076c0,0.006,0,0.002,0,0.010c0,0.025,0,0.047,0,0.074c 0.004,0.008,0,0.004, 0.004,0.014
-		c0,0.025,0,0.051,0,0.072c0,0.008,0,0.006,0,0.012c0,0.025,0,0.051,0,0.078c0,0.004,0,0.014,0,0.020c0,0.020,0,0.041,0,0.062
-		c0,0.004,0,0.014,0,0.021c0,0.025,0,0.049,0,0.074c0,0.006,0,0.010,0,0.016c0,0.021, 0.002,0.043, 0.002,0.066c0,0.010,0,0.012,0,0.021
-		c 0.002,0.025, 0.002,0.051, 0.002,0.074l0,0.004 c0,0.023,0,0.051,0,0.076c0,0.004,0,0.021,0,0.025c0,0.021,0,0.039,0,0.059
-		c0,0.010,0,0.010,0,0.020c0,0.027,0,0.053,0,0.080c0,0.004,0,0.012,0,0.016c0,0.021,0,0.041,0,0.062c0,0.006,0,0.018,0,0.021
-		c0,0.027, 0.004,0.051, 0.004,0.078l0,0.006 c0,0.025,0,0.049, 0.002,0.074c0,0.012,0,0.008,0,0.021c0,0.021,0,0.043,0,0.064
-		c0,0.004,0,0.010,0,0.016c0,0.025,0,0.051,0,0.076c0,0.004,0,0.016,0,0.021c0,0.020,0,0.039,0,0.059c0,0.006,0,0.020,0,0.025
-		c0,0.025,0,0.049,0,0.074c0,0.006,0,0.010,0,0.016c0,0.021,0,0.043,0,0.066c0,0.010,0,0.010,0,0.021c0,0.023,0,0.045,0,0.068
-		c0,0.006,0,0.004,0,0.010c0,0.025,0,0.053,0,0.078c0,0.006,0,0.020,0,0.023c0,0.021,0,0.039,0,0.061c0,0.002,0,0.012,0,0.018
-		c0,0.025,0,0.055,0,0.078c0,0.006,0,0.014,0,0.016c0,0.021,0,0.045,0,0.064c0,0.006,0,0.018,0,0.021c0,0.027,0,0.055,0,0.080
-		c0,0.029,0,0.057,0,0.086c0,0.006,0,0.018,0,0.023c0,0.027,0,0.055,0,0.082c0,0.012,0,0.014,0,0.023c0,0.023,0,0.045,0,0.066
-		c0,0.010,0,0.016,0,0.027c0,0.025,0,0.049,0,0.072c0,0.012,0,0.033,0,0.043c0,0.016,0,0.029,0,0.045
-		C 410.152,224.49, 410.152,224.516, 410.152,224.537z M 271.34,151.566l-26.209,0 L 245.131,254.031 l-34.941,0 l0,16.256 
-		c 8.432,0.416, 14.287,1.010, 17.861,1.807c 6.199,1.371, 11.332,4.174, 15.258,8.324c 2.709,2.865, 4.783,6.703, 6.16,11.424
-		c 0.512,1.824, 0.859,3.344, 1.041,4.592l 20.83,0 L 271.34,151.566 z"  />
-<glyph unicode="&#xe10a;" d="M 57.904,430.145L 87.010,430.145L 87.010,17.856L 57.904,17.856zM 134.631,401.922L 337.415,401.922L 337.415,323.335L 134.631,323.335zM 134.631,264.052L 454.096,264.052L 454.096,185.464L 134.631,185.464zM 134.631,126.18L 396.799,126.18L 396.799,47.594L 134.631,47.594z"  />
-<glyph unicode="&#xe10b;" d="M 93.479,385.667l0-221.376 l 8.993-8.975l 83.633-83.632l 8.978-8.979l 222.928,0 L 418.011,385.667 L 93.479,385.667 z M 387.353,93.346L 230.074,93.346 
-	c-37.050,0-19.194,87.822-19.194,87.822s-85.646-20.832-86.742,18.441L 124.138,355.011 l 263.215,0 L 387.353,93.346 z"  />
-<glyph unicode="&#xe10c;" d="M 324.932,307.387l0-0.014 c-0.066,0.116-0.164,0.215-0.227,0.311c-4.219,5.836-8.373,11.443-12.461,16.778
-	c-5.43,9.025-8.273,19.992-1.635,35.837l0,0l 22.76,54.517l-35.775,16.303l 3.695,16.154l-89.862,0 l 4.708-20.585l-36.79-11.872
-	l 22.761-54.517l0,0c 11.283-26.943-4.84-39.813-14.321-52.926c-46.831-64.8-99.286-157.572-99.286-213.493
-	c0-92.726, 72.011-89.637, 167.858-89.637c 95.882,0, 167.923-3.089, 167.923,89.637C 424.279,149.816, 371.763,242.573, 324.932,307.387z
-	 M 233.794,352.91l 45.848,0 l0-28.939 l-45.848,0 L 233.794,352.91 z M 299.229,82.991c-5.983-2.062-11.739-3.075-17.267-3.075
-	c-5.558,0-10.137,0.359-13.769,1.077c-3.662,0.739-7.031,1.623-10.070,2.652c-3.205,1.146-6.411,2.176-9.648,3.041
-	c-3.204,0.882-7.193,1.305-12.002,1.305c-3.955,0-8.077-0.523-12.394-1.616c-4.283-1.092-8.534-3.252-12.787-6.459l-13.537,20.111
-	c 3.042,1.896, 6.082,4.14, 9.058,6.691c 2.975,2.55, 5.625,5.344, 7.882,8.402c 2.257,3.057, 4.119,6.395, 5.593,9.953
-	c 1.438,3.588, 2.191,7.332, 2.191,11.27c0,2.467-0.426,4.922-1.212,7.342c-0.815,2.402-1.799,4.82-2.941,7.309l-21.682,0 l0,18.59 l 13.995,0 
-	c-2.188,2.783-4.38,6.85-6.541,12.264c-2.19,5.381-3.301,11.365-3.301,17.938c0,5.821, 1.21,11.365, 3.629,16.61
-	c 2.387,5.25, 5.951,9.896, 10.597,13.898c 4.675,4.009, 10.531,7.179, 17.495,9.517c 6.998,2.324, 15.075,3.486, 24.296,3.486
-	c 16.743,0, 29.792-4.663, 39.146-13.999c 9.318-9.322, 13.994-22.89, 13.994-40.68l-29.529,0 c-0.131,2.19-0.424,4.937-0.884,8.189
-	c-0.426,3.306-1.405,6.459-2.941,9.532c-1.538,3.058-3.858,5.725-6.999,7.98c-3.139,2.275-7.488,3.4-13.014,3.4
-	c-6.575,0-11.775-1.833-15.666-5.478c-3.825-3.643-5.789-8.535-5.789-14.633c0-1.764, 0.098-3.449, 0.23-5.054
-	c 0.165-1.585, 0.49-3.448, 1.014-5.577c 0.491-2.106, 1.374-4.557, 2.618-7.325c 1.208-2.777, 2.941-6.115, 5.132-10.070l 29.073,0 l0-18.59 
-	l-22.958,0 c 0.718-2.176, 1.21-4.367, 1.439-6.559c 0.197-2.191, 0.293-4.511, 0.293-6.998c0-6.849-1.766-12.721-5.328-17.607
-	c-3.6-4.89-7.786-9.204-12.592-13.002l 0.427-0.438c 3.498,2.17, 6.342,3.581, 8.533,4.134c 2.192,0.588, 4.319,0.883, 6.346,0.883
-	c 2.941,0, 5.819-0.243, 8.663-0.749c 2.847-0.522, 5.69-1.067, 8.635-1.638c 2.91-0.749, 5.756-1.356, 8.502-1.864
-	c 2.812-0.522, 5.625-0.766, 8.568-0.766c 2.879,0, 5.854,0.507, 8.862,1.521c 2.944,1.029, 6.443,3.642, 10.366,7.862l 13.113-22.091
-	C 310.805,88.6, 305.213,85.018, 299.229,82.991z"  />
-<glyph unicode="&#xe10d;" d="M 234.979,341.445c-6.706,0-12.135-5.398-12.135-12.121l0-28.106 c0-6.701, 5.429-12.13, 12.135-12.13
-	c 6.672,0, 12.099,5.429, 12.099,12.13l0,28.106 C 247.078,336.047, 241.651,341.445, 234.979,341.445z M 276.543,158.741
-	c-6.672,0-12.1-5.431-12.1-12.136l0-28.12 c0-6.688, 5.428-12.1, 12.1-12.1c 6.705,0, 12.131,5.411, 12.131,12.1l0,28.12 
-	C 288.674,153.311, 283.248,158.741, 276.543,158.741z M 234.979,158.741c-6.706,0-12.135-5.431-12.135-12.136l0-28.12 
-	c0-6.688, 5.429-12.1, 12.135-12.1c 6.672,0, 12.099,5.411, 12.099,12.1l0,28.12 C 247.078,153.311, 241.651,158.741, 234.979,158.741z
-	 M 361.271,414.022L 150.25,414.022 c-13.375,0-24.201-10.805-24.201-24.167l0-331.873 c0-13.339, 10.826-24.181, 24.201-24.181l 211.022,0 
-	c 13.344,0, 24.167,10.842, 24.167,24.148L 385.439,389.856 C 385.438,403.218, 374.615,414.022, 361.271,414.022z M 255.744,68.974
-	c-35.122,0-63.57,28.465-63.57,63.575c0,35.119, 28.449,63.581, 63.57,63.581c 35.122,0, 63.573-28.462, 63.573-63.581
-	C 319.317,97.438, 290.866,68.974, 255.744,68.974z M 255.744,251.708c-35.122,0-63.57,28.45-63.57,63.573
-	c0,35.087, 28.449,63.574, 63.57,63.574c 35.122,0, 63.573-28.486, 63.573-63.574C 319.317,280.159, 290.866,251.708, 255.744,251.708z
-	 M 276.543,341.445c-6.672,0-12.1-5.398-12.1-12.121l0-28.106 c0-6.701, 5.428-12.097, 12.1-12.097c 6.705,0, 12.131,5.396, 12.131,12.097
-	l0,28.106 C 288.674,336.047, 283.248,341.445, 276.543,341.445z"  />
-<glyph unicode="&#xe10e;" d="M 428.009,400.502L 129.199,342.165L 428.009,342.165 	zM 54.943,318.486L 112.154,318.486L 112.154,47.498L 54.943,47.498zM 135.833,318.486l0-270.988 l 321.223,0 L 457.056,318.486 L 135.833,318.486 z M 375.289,132.698L 217.404,132.698 l0,100.59 l 157.885,0 L 375.289,132.698 z"  />
-<glyph unicode="&#xe10f;" d="M 44.928,287.701c 83.139-234.707, 280.482-282.143, 310.735-284.393c 72.542-7.683, 119.189,37.768, 128.298,106.547
-	c0,0-73.348,46.646-109.94,54.308l-57.845-57.846c0,0-31.13-1.358-99.292,66.801c-68.156,68.162-66.798,99.293-66.798,99.293
-	l 49.795,49.797c-8.322,50.463-37.53,130.254-94.654,111.818C 48.928,416.306, 28.128,336.929, 44.928,287.701z"  />
-<glyph unicode="&#xe110;" d="M 392.454,199.554c 3.385-0.003, 6.443,1.37, 8.658,3.585c 2.219,2.217, 3.588,5.278, 3.592,8.663
-		c-0.004,44.182-18.023,84.239-46.963,113.156c-28.855,28.872-68.869,46.687-112.879,46.681c-6.766,0-12.246-5.481-12.25-12.246
-		c 0.004-6.766, 5.484-12.246, 12.25-12.243l-0.004,0 c 37.354-0.010, 71.088-15.055, 95.566-39.513c 24.566-24.59, 39.773-58.373, 39.783-95.84
-		C 380.208,205.031, 385.692,199.551, 392.454,199.554zM 301.817,268.845c 14.602-14.629, 23.613-34.685, 23.619-56.966c 0.004-6.766, 5.49-12.249, 12.25-12.246
-		c 3.383,0, 6.447,1.374, 8.66,3.589c 2.219,2.215, 3.586,5.276, 3.586,8.657c0,28.984-11.811,55.317-30.799,74.283
-		c-18.955,18.975-45.273,30.714-74.191,30.709c-6.766,0.002-12.252-5.482-12.246-12.245c0-6.765, 5.475-12.248, 12.24-12.241l0-0.006 
-		C 267.19,292.374, 287.228,283.41, 301.817,268.845zM 398.063,365.262c-38.959,38.983-92.945,63.056-152.396,63.056c-6.766-0.003-12.25-5.484-12.242-12.249
-		c0-6.764, 5.477-12.244, 12.242-12.244c 52.781-0.009, 100.488-21.31, 135.076-55.881c 34.674-34.691, 56.127-82.441, 56.141-135.336
-		c-0.004-6.766, 5.48-12.245, 12.244-12.245c 3.379-0.002, 6.445,1.369, 8.66,3.588c 2.217,2.215, 3.588,5.276, 3.588,8.659
-		C 461.376,272.208, 437.116,326.233, 398.063,365.262zM 276.925,104.558c0,0-25.443-1.111-81.148,54.593c-55.699,55.702-54.59,81.146-54.59,81.146l 40.691,40.697
-		c-6.797,41.243-30.668,106.45-77.355,91.385c-46.010-14.48-63.008-79.353-49.277-119.585
-		c 67.943-191.817, 229.227-230.583, 253.951-232.422c 59.285-6.276, 97.408,30.865, 104.852,87.072c0,0-59.945,38.123-89.85,44.388
-		L 276.925,104.558z"  />
-<glyph unicode="&#xe111;" d="M 255.173,314.059c 34.204,0, 61.936,27.729, 61.936,61.932c0,34.207-27.731,61.939-61.936,61.939s-61.937-27.732-61.937-61.939
-	C 193.236,341.787, 220.969,314.059, 255.173,314.059z M 318.471,303.684L 191.873,303.684 c-13.829,0-25.040-11.207-25.040-25.038l0-131.141 l 35.758,0 
-	l0-135.729 l 105.163,0 L 307.754,147.505 l 35.755,0 L 343.509,278.646 C 343.509,292.477, 332.299,303.684, 318.471,303.684z"  />
-<glyph unicode="&#xe112;" d="M 197.43,366.933A58.571,58.571 180 1 1 314.572,366.933A58.571,58.571 180 1 1 197.43,366.933zM 354.153,104.655l-30.607,115.811l 4.156,54.407c0,13.077-10.602,23.68-23.68,23.68l-96.045,0 
-		c-13.078,0-23.68-10.603-23.68-23.68l 4.154-54.403l-30.605-115.814l 56.951,0 l 15.158-82.159l 52.090,0 l 15.156,82.159L 354.153,104.656 z"  />
-<glyph unicode="&#xe113;" d="M 255.968,313.846c 34.206,0, 61.936,27.727, 61.936,61.934c0,34.208-27.729,61.936-61.936,61.936s-61.936-27.728-61.936-61.936
-	C 194.032,341.572, 221.762,313.846, 255.968,313.846z M 339.435,285.812c-13.082,13.088-28.625,20.924-84.83,20.924
-	c-56.214,0-71.38-8.505-83.796-20.924c-12.422-12.416-8.23-144.883-8.23-144.883l 27.485,65.304l 17.28-194.554l 49.856,99.57
-	l 46.521-99.57l 16.456,194.554l 27.487-65.304C 347.664,140.93, 352.521,272.729, 339.435,285.812z"  />
-<glyph unicode="&#xe114;" d="M 380.285,217.816l-67.236,94.832c-3.039,4.427-6.604,7.14-10.397,9.242c-4.090,2.133-8.504,3.612-14.128,3.693
-	c-0.654,0-1.209-0.022-1.635-0.061l-30.708-1.926l-31.653,1.986c-0.558,0.041-1.212,0.052-1.604,0.052
-	c-5.625-0.069-10.073-1.557-14.126-3.723c-3.793-2.125-7.359-4.866-10.433-9.311l0,0l-66.351-94.855
-	c-5.56-7.909-3.631-18.782, 4.283-24.329c 3.041-2.123, 6.541-3.146, 9.973-3.146c 5.527,0, 10.924,2.607, 14.325,7.451l0,0l 61.643,88.057
-	c 0.13-0.551, 0.292-1.089, 0.292-1.663c0,0,0,0,0-5.019l0-0.031 l0,0.031 c0-35.709-5.722-128.409-56.607-246.123
-	c-3.826-8.839, 0.229-19.115, 9.090-22.949c 2.259-0.966, 4.615-1.42, 6.902-1.42c 6.769,0, 13.177,3.931, 16.024,10.538
-	c 23.708,54.768, 45.029,139.398, 45.029,139.398c 0.951,3.795, 4.904,6.86, 8.764,6.86l0,0.014 l0-0.014 l 8.829,0 
-	c 3.893,0, 7.883-3.065, 8.799-6.86c0,0, 21.32-84.631, 44.997-139.398c 2.843-6.607, 9.286-10.538, 16.056-10.538
-	c 2.322,0, 4.643,0.454, 6.9,1.42c 8.831,3.834, 12.917,14.11, 9.123,22.949c-50.916,117.714-56.639,210.413-56.639,246.123
-	c0,5.037,0,5.037,0,5.037c0,0.276, 0.066,0.538, 0.133,0.799l 61.869-87.295c 5.559-7.86, 16.45-9.712, 24.33-4.146
-	C 384.013,199.079, 385.842,209.947, 380.285,217.816z M 256.181,338.167c 27.731,0, 50.167,22.471, 50.167,50.185
-	c0,27.709-22.436,50.191-50.167,50.191c-27.729,0-50.195-22.482-50.195-50.191C 205.986,360.638, 228.452,338.167, 256.181,338.167z"  />
-<glyph unicode="&#xe115;" d="M 435.822,428.498L 76.626,428.498 c-6.804,0-12.362-5.513-12.362-12.332L 64.264,164.38 c0-6.8, 5.559-12.33, 12.362-12.33l 359.196,0 
-	c 6.801,0, 12.295,5.53, 12.295,12.33L 448.117,416.166 C 448.117,422.984, 442.623,428.498, 435.822,428.498z M 418.229,181.972L 94.188,181.972 L 94.188,398.574 l 324.041,0 
-	L 418.229,181.972 z M 65.146,19.332l 381.008,0 l0,97.24 L 65.146,116.572 L 65.146,19.332 z M 307.698,80.417l 109.386,0 l0-24.932 L 307.698,55.485 L 307.698,80.417 z M 114.594,82.366
-	c 8.6,0, 15.598-7.003, 15.598-15.601c0-8.604-6.998-15.6-15.598-15.6c-8.602,0-15.6,6.996-15.6,15.6
-	C 98.994,75.363, 105.992,82.366, 114.594,82.366z"  />
-<glyph unicode="&#xe116;" d="M 289.335,59.621L 289.335,389.2L 372.438,389.2L 372.438,59.621L 289.335,59.621 	zM 136.598,59.623L 136.598,389.196L 219.699,389.196L 219.699,59.623L 136.598,59.623 	z"  />
-<glyph unicode="&#xe117;" d="M 351.649,364.368l-73.578-89.16l 48.004,0 l0-105.905 c-0.028-19.002-15.401-34.385-34.401-34.434
-	c-19.031,0.049-34.398,15.432-34.467,34.434l0,95.259 c0,47.27-38.294,85.548-85.547,85.581
-	c-47.256-0.033-85.548-38.311-85.581-85.581l0-172.579 l 51.146,0 L 137.225,264.562 c 0.031,19.001, 15.437,34.4, 34.436,34.438
-	c 19-0.037, 34.369-15.436, 34.402-34.438l0-95.259 c 0.034-47.271, 38.328-85.549, 85.611-85.565c 47.225,0.017, 85.518,38.294, 85.547,85.565
-	L 377.221,275.208 l 48.009,0 L 351.649,364.368z"  />
-<glyph unicode="&#xe118;" d="M 435.783,94.643L 74.589,94.643 L 74.589,353.979 l 191.604,0 L 266.193,392.352 L 36.219,392.352 L 36.219,56.27 l 437.934,0 L 474.153,173.169 l-38.369,0 L 435.784,94.643 z M 342.891,392.352
-	l 42.629-42.63L 282.99,247.194l 46.789-46.787l 102.527,102.524l 41.846-41.848L 474.152,392.352 L 342.891,392.352 z"  />
-<glyph unicode="&#xe119;" d="M 387.156,422.209L 124.088,422.209 L 34.923,191.385l0-163.646 l 441.47,0 L 476.393,193.934 L 387.156,422.209z M 337.454,185.584l0-52.578 
-	c0-13.829-11.211-25.037-25.038-25.037L 198.905,107.969 c-13.828,0-25.039,11.208-25.039,25.037l0,52.578 L 83.677,185.584 l 73.030,189.043l 197.966,0 
-	l 73.906-189.043L 337.454,185.584 z M 227.014,164.004l 61.344,0 l0,72.879 l 57.564,0 L 257.68,343.795l-88.238-106.912l 57.572,0 L 227.014,164.004 z"  />
-<glyph unicode="&#xe11a;" d="M 206.663,313.155L 206.663,396.258L 474.928,396.258L 474.928,313.155L 206.663,313.155 	zM 206.663,182.154L 206.663,265.253L 474.928,265.253L 474.928,182.154L 206.663,182.154 	zM 206.663,51.147L 206.663,134.25L 474.928,134.25L 474.928,51.147L 206.663,51.147 	zM 34.462,223.705L 142.752,286.753L 142.752,160.65 	z"  />
-<glyph unicode="&#xe11b;" d="M 105.79,45.928L 105.79,412.557 l 141.612,0 c 37.199,0, 19.272-88.184, 19.272-88.184s 86.003,20.906, 87.108-18.527l0-119.035 
-	c 8.672-0.133, 17.062-1.42, 25.037-3.719L 378.819,338.936 l-91.322,91.326l-7.338,7.337L 80.75,437.599 l0-416.707 l 205.809,0 
-	c-7.672,7.214-14.164,15.663-19.142,25.036L 105.79,45.928 z M 351.506,169.318c-43.354,0-78.502-35.15-78.502-78.51
-	c0-43.354, 35.148-78.498, 78.502-78.498c 43.359,0, 78.505,35.145, 78.505,78.498C 430.011,134.168, 394.865,169.318, 351.506,169.318z
-	 M 365.619,76.697l0-42.301 l-28.231,0 l0,42.301 L 295.090,76.697 l0,28.238 l 42.298,0 l0,42.297 l 28.231,0 l0-42.297 l 42.307,0 l0-28.238 L 365.619,76.697 z"  />
-<glyph unicode="&#xe11c;" d="M 398.426,288.375L 305.51,288.375L 305.51,428.885L 206.493,428.885L 206.493,288.375L 113.575,288.375L 256.002,115.811 	
-		zM 85.043,81.692L 426.955,81.692L 426.955,19.115L 85.043,19.115z"  />
-<glyph unicode="&#xe11d;" d="M 105.396,45.928L 105.396,412.557 L 247.010,412.557 c 37.201,0, 19.274-88.184, 19.274-88.184s 85.998,20.906, 87.104-18.527l0-119.035 
-	c 8.675-0.133, 17.066-1.42, 25.039-3.719L 378.427,338.936 l-91.325,91.326l-7.337,7.337L 80.357,437.599 l0-416.707 l 205.809,0 
-	c-7.672,7.214-14.164,15.663-19.142,25.036L 105.396,45.928 z M 351.113,169.318c-43.354,0-78.502-35.15-78.502-78.51
-	c0-43.354, 35.148-78.498, 78.502-78.498c 43.357,0, 78.506,35.145, 78.506,78.498C 429.619,134.168, 394.471,169.318, 351.113,169.318z
-	 M 294.697,76.697l0,28.238 l 112.836,0 l0-28.238 L 294.697,76.697 z"  />
-<glyph unicode="&#xe11e;" d="M 105.982,45.928L 105.982,412.557 l 141.611,0 c 37.199,0, 19.274-88.184, 19.274-88.184s 86,20.906, 87.106-18.527l0-119.035 
-	c 8.673-0.133, 17.064-1.42, 25.039-3.719L 379.012,338.936 l-91.327,91.326l-7.335,7.337L 80.943,437.599 l0-416.707 L 286.75,20.892 
-	c-7.67,7.214-14.161,15.663-19.14,25.036L 105.982,45.928 z M 314.146,92.020c0-20.791, 16.912-37.703, 37.704-37.703
-	c 7.419,0, 14.326,2.186, 20.166,5.901l-51.97,51.971C 316.332,106.35, 314.146,99.443, 314.146,92.020z M 351.851,129.726
-	c-7.423,0-14.33-2.187-20.173-5.903l 51.974-51.967c 3.716,5.84, 5.901,12.748, 5.901,20.164
-	C 389.553,112.812, 372.638,129.726, 351.851,129.726z M 351.699,169.318c-43.354,0-78.498-35.15-78.498-78.51
-	c0-43.354, 35.145-78.498, 78.498-78.498c 43.359,0, 78.506,35.145, 78.506,78.498C 430.205,134.168, 395.059,169.318, 351.699,169.318z
-	 M 351.851,37.863c-29.909,0-54.156,24.246-54.156,54.156c0,29.913, 24.247,54.158, 54.156,54.158
-	c 29.907,0, 54.152-24.245, 54.152-54.158C 406.003,62.109, 381.758,37.863, 351.851,37.863z"  />
-<glyph unicode="&#xe11f;" d="M 206.491,115.816L 305.504,115.816L 305.504,256.324L 398.426,256.324L 255.997,428.889L 113.575,256.324L 206.491,256.324 	zM 85.043,81.689L 426.955,81.689L 426.955,19.111L 85.043,19.111z"  />
-<glyph unicode="&#xe120;" d="M 456.479,238.491L 276.031,418.929c-11.052,11.043-28.941,11.043-39.96,0l-5.788-5.758L 200.948,442.53l-76.031-76.001
-	L 225.671,211.23l-10.922-11.414l-17.627,17.631L 43.85,64.156l 58.502-58.514l 153.307,153.283l-19.229,19.213l 28.124,29.431
-	L 164.159,362.42l 36.789,36.746l 7.687-7.667l-9.909-9.891c-11.053-11.038-11.053-28.94,0-39.979l 180.417-180.438
-	c 11.051-11.046, 28.971-11.046, 39.991,0l 37.346,37.338C 467.503,209.556, 467.503,227.458, 456.479,238.491z"  />
-<glyph unicode="&#xe121;" d="M 373.073,240.439c-14.137,2.883-31.906-3.329-45.281,2.604c-23.164,10.264-23.168,47.011-25.080,67.755
-	c-2.34,25.318-13.271,39.891-32.422,50.529c-38.291,21.273-91.846,26.396-132.5-10.76c-52.771-48.225-55.17-143.19-5.35-212.118
-	c 28.314-39.176, 89.383-68.36, 134.994-68.36c 71.602,0, 137.303,43.64, 146.811,101.841C 420.050,207.471, 403.843,234.16, 373.073,240.439z
-	 M 150.083,313.842c 16.375,19.559, 44.195,21.785, 62.152,4.98c 17.938-16.806, 19.221-46.28, 2.848-65.845
-	c-16.363-19.553-44.186-21.777-62.133-4.979C 134.997,264.809, 133.72,294.277, 150.083,313.842z M 228.472,147.484
-	c-13.189-15.759-35.613-17.554-50.076-4.013c-14.469,13.547-15.5,37.297-2.311,53.062c 13.195,15.766, 35.617,17.56, 50.090,4.017
-	C 240.63,187.005, 241.667,163.251, 228.472,147.484z M 306.884,121.547c-9.498-11.348-25.648-12.641-36.066-2.889
-	c-10.42,9.756-11.16,26.861-1.662,38.217c 9.502,11.352, 25.65,12.644, 36.074,2.89C 315.64,150.013, 316.384,132.902, 306.884,121.547z
-	 M 362.548,175.488c-7.092-8.471-19.145-9.436-26.92-2.157c-7.777,7.28-8.33,20.048-1.238,28.521
-	c 7.092,8.473, 19.143,9.438, 26.922,2.158C 369.085,196.731, 369.64,183.961, 362.548,175.488z"  />
-<glyph unicode="&#xe122;" d="M 114.162,409.769l0-25.217 l 0.025,0 l0-74.837 l-0.025,0 l0-224.311 c0-9.199-7.486-16.685-16.688-16.685
-	c-9.199,0-16.684,7.486-16.684,16.685L 80.79,326.809 l 20.693,0 l0,30.487 L 50.307,357.296 l0-271.892 c0-26.010, 21.156-47.173, 47.168-47.173L 414.52,38.231 
-	c 26.012,0, 47.174,21.163, 47.174,47.173L 461.694,409.769 L 114.162,409.769 z M 219.5,172.952l-60.973,0 l0,60.973 L 219.5,233.925 L 219.5,172.952 z M 418.643,100.653L 256.049,100.653 
-	l0,25.404 l 162.594,0 L 418.643,100.653 z M 418.643,151.841L 256.049,151.841 l0,25.404 l 162.594,0 L 418.643,151.841 z M 418.643,207.249L 256.049,207.249 l0,25.403 l 162.594,0 L 418.643,207.249 z
-	 M 420.34,281.479L 160.223,281.479 l0,75.56 L 420.34,357.039 L 420.34,281.479 z"  />
-<glyph unicode="&#xe123;" d="M 174.228,232.176L 235.203,232.176L 235.203,171.201L 174.228,171.201zM 174.228,347.567L 402.607,347.567L 402.607,272.007L 174.228,272.007zM 274.995,232.651L 402.606,232.651L 402.606,207.248L 274.995,207.248zM 274.995,177.246L 402.606,177.246L 402.606,151.844L 274.995,151.844zM 274.995,126.057L 402.606,126.057L 402.606,100.653L 274.995,100.653zM 114.163,409.769l0-25.218 l0-27.256 L 50.306,357.295 l0-271.89 c0-26.013, 21.16-47.174, 47.168-47.174l 317.047,0 
-		c 26.012,0, 47.174,21.161, 47.174,47.174L 461.695,409.769 L 114.163,409.769 z M 114.163,85.405c0-9.201-7.486-16.686-16.689-16.686
-		c-9.197,0-16.682,7.484-16.682,16.686L 80.792,326.809 l 33.371,0 L 114.163,85.405 z M 431.206,85.405c0-9.201-7.484-16.686-16.686-16.686L 141.603,68.719 
-		c 1.969,5.188, 3.049,10.812, 3.049,16.686L 144.652,379.282 l 286.555,0 L 431.207,85.405 z"  />
-<glyph unicode="&#xe124;" d="M 474.1,331.959L 474.1,441.82 L 364.224,441.82 l0-38.95 l-6.702,0 c-17.723-0.078-35.416-6.147-50.984-15.499
-	c-15.565-9.447-29.139-22.271-37.475-37.934l-37.479-71.227c-4.74-9.22-14.551-19.031-26.16-25.976
-	c-11.576-7.052-24.785-11.17-35.156-11.070l-23.217,0 l0,39.566 L 37.205,280.73 l0-109.877 l 109.846,0 L 147.051,210.52 l 23.217,0 
-	c 10.371,0.053, 23.58-4.051, 35.156-11.087c 11.609-6.966, 21.42-16.771, 26.16-25.961l 37.479-71.251
-	c 8.336-15.663, 21.909-28.479, 37.475-37.934c 15.568-9.354, 33.262-15.399, 50.984-15.501l 6.702,0 l0-42.248 L 474.1,6.538 L 474.1,116.416 L 364.224,116.416 l0-36.956 
-	l-6.702,0 c-10.369-0.065-23.576,4.024-35.156,11.052c-11.609,6.964-21.418,16.778-26.16,26l-37.479,71.213
-	c-4.512,8.473-10.595,16.061-17.592,22.795l 123.089,0 l0-39.665 L 474.1,170.855 L 474.1,280.731 L 364.224,280.731 l0-39.566 L 241.135,241.165 
-	c 6.997,6.701, 13.111,14.31, 17.592,22.793l 37.479,71.189c 4.742,9.22, 14.551,19.031, 26.16,25.966
-	c 11.58,7.062, 24.787,11.181, 35.156,11.085l 6.702,0 l0-40.239 L 474.1,331.959 z"  />
-<glyph unicode="&#xe125;" d="M 256.303,107.755L 89.721,24.903L 256.303,423.175L 422.884,24.903 z"  />
-<glyph unicode="&#xe126;" d="M 475.296,224.695L 385.775,298.584L 385.775,250.38L 280.648,250.38L 280.648,355.51L 328.854,355.51L 254.97,445.027L 181.082,355.51L 229.284,355.51L 229.284,250.38L 124.156,250.38L 124.156,298.584L 34.638,224.699L 124.156,150.809L 124.156,199.018L 229.284,199.018L 229.284,93.885L 181.085,93.885L 254.97,4.366L 328.854,93.885L 280.648,93.885L 280.648,199.018L 385.775,199.018L 385.775,150.809 z"  />
-<glyph unicode="&#xe127;" d="M 281.194,355.51L 329.404,355.51L 255.52,445.027L 181.631,355.51L 229.836,355.51L 229.836,93.885L 181.635,93.885L 255.52,4.366L 329.404,93.885L 281.194,93.885 z"  />
-<glyph unicode="&#xe128;" d="M 255.104,330.164L 422.037,118.579L 88.168,118.579 z"  />
-<glyph unicode="&#xe129;" d="M 256.567,292.823L 89.633,81.238l 333.861,0 L 256.567,292.823z M 418.832,366.641L 86.29,366.641 l0-66.173 l 332.542,0 L 418.832,366.641 z"  />
-<glyph unicode="&#xe12a;" d="M 214.496,291.784l 83.486,0 l-3.89,46.45l 70.992,0 l-108.827,56.36l-108.866-56.36l 70.995,0 L 214.496,291.784z M 308.283,169.559
-	l-5.917,70.51L 210.18,240.069 l-5.954-70.51l-97.644,0 l 149.676-116.095l 149.676,116.095L 308.283,169.559 z"  />
-<glyph unicode="&#xe12b;" d="M 360.124,224.487L 148.535,57.558L 148.537,391.42 z"  />
-<glyph unicode="&#xe12c;" d="M 345.877,256.796L 282.779,193.698L 261.56,214.917L 324.658,278.015zM 337.756,50.146l0,27.881 l-40.945,0 l0,41.887 c 24.939,4.439, 47.91,16.326, 66.199,34.614l 18.123,18.124l-50.988,50.992
-		l-36.252-36.25l 11.518-11.516c-9.52-4.378-19.957-6.68-30.748-6.68c-19.68,0-38.182,7.662-52.098,21.579
-		c-28.639,28.641-28.717,75.187-0.246,103.935l 29.867-29.867l 36.248,36.25L 161.664,427.863l-36.248-36.25l 60.65-60.649
-		c-48.455-48.739-48.379-127.806, 0.248-176.437c 16.574-16.573, 36.99-27.889, 59.232-33.175l0-43.326 l-50.723,0 l0-27.881 l-48.828,0 l0-30.009 
-		l 240.586,0 l0,30.009 L 337.756,50.145 zM 46.553,237.376"  />
-<glyph unicode="&#xe12d;" d="M 449.337,117.665l-35.842,0 l0,0.555 c-0.065,15.959-5.492,31.639-13.781,45.459c-8.39,13.799-19.755,25.882-33.815,33.371
-	l-62.036,32.62c-7.602,3.941-15.957,12.211-21.845,22.086c-6.001,9.797-9.435,21.077-9.386,29.595l0,48.793 l 38.899,0 
-	c 15.598,0, 28.257,12.673, 28.257,28.274L 339.788,424.045 c0,15.6-12.659,28.274-28.257,28.274L 203.108,452.319 c-15.613,0-28.271-12.674-28.271-28.274
-	l0-65.627 c0-15.601, 12.658-28.274, 28.271-28.274l 38.884,0 l0-48.793 c 0.063-8.518-3.387-19.782-9.37-29.595
-	c-5.886-9.859-14.242-18.161-21.86-22.086l-62.035-32.62c-14.080-7.489-25.442-19.572-33.829-33.371
-	c-8.061-13.439-13.359-28.668-13.703-44.15L 62.246,119.529 c-15.632,0-28.271-12.654-28.271-28.252l0-65.635 
-	c0-15.615, 12.64-28.267, 28.271-28.267l 108.407,0 c 15.614,0, 28.286,12.651, 28.286,28.267l0,65.635 c0,15.598-12.672,28.252-28.286,28.252
-	l-38.835,0 c 0.265,8.387, 3.648,18.988, 9.32,28.301c 5.887,9.883, 14.24,18.184, 21.846,22.092l 62.067,32.638
-	c 13.228,7.033, 24.038,18.182, 32.262,30.968c 8.224-12.787, 19.014-23.935, 32.258-30.968l 62.053-32.638
-	c 7.618-3.924, 15.959-12.209, 21.845-22.092c 6.001-9.791, 9.468-21.056, 9.385-29.609l0-0.555 l-41.905,0 
-	c-15.615,0-28.272-12.654-28.272-28.269l0-65.634 c0-15.602, 12.657-28.253, 28.272-28.253l 108.389,0 c 15.63,0, 28.287,12.651, 28.287,28.253
-	l0,65.634 C 477.624,105.011, 464.967,117.665, 449.337,117.665z"  />
-<glyph unicode="&#xe12e;" d="M 429.72,340.309c-24.298,9.315-51.538-2.832-60.925-27.114l-33.846,1.161c-6.801,25.133-32.046,40.992-57.881,35.648
-	c-1.636-0.343-3.271-0.771-4.843-1.262l-15.333,19.048c 4.479,9.242, 5.395,20.162, 1.635,30.575
-	c-7.359,20.393-29.86,30.954-50.265,23.565c-20.405-7.378-30.936-29.874-23.576-50.266c 6.736-18.571, 25.997-28.939, 44.768-25.078
-	l 15.467-19.134c-6.409-10.414-9.091-23.153-6.409-36.071c 2.125-10.381, 7.39-19.289, 14.553-26.029l-17.855-29.562
-	c-7.164,2.65-14.913,4.087-22.991,4.087c-11.118,0-21.517-2.716-30.705-7.521l-19.196,20.797
-	c 8.763,15.358, 10.397,34.502, 2.746,51.935c-12.819,29.167-46.895,42.443-76.065,29.593c-29.169-12.821-42.444-46.862-29.626-76.030
-	c 12.852-29.205, 46.863-42.45, 76.063-29.631c 0.458,0.217, 0.95,0.427, 1.406,0.653l 19.164-20.764
-	c-6.508-10.268-10.269-22.436-10.269-35.479c0-12.574, 3.501-24.329, 9.549-34.353l-24.951-21.747
-	c-6.215,3.713-13.245,6.227-20.897,7.044c-28.253,3.045-53.597-17.41-56.64-45.649c-3.009-28.254, 17.398-53.596, 45.653-56.64
-	c 28.254-3.010, 53.599,17.412, 56.606,45.649c 0.882,7.996-0.198,15.718-2.746,22.81l 28.124,24.51c 9.45-5.166, 20.273-8.090, 31.784-8.090
-	c 19.687,0, 37.412,8.581, 49.579,22.217l 45.422-21.765c-0.949-12.667, 3.434-25.666, 13.209-35.298
-	c 17.594-17.348, 45.945-17.151, 63.278,0.46c 17.396,17.591, 17.168,45.961-0.425,63.31c-16.612,16.364-42.774,17.115-60.236,2.354
-	l-45.717,21.906c 0.85,4.288, 1.342,8.735, 1.342,13.281c0,16.039-5.69,30.736-15.142,42.233l 21.877,36.2
-	c 3.826-0.131, 7.785,0.126, 11.71,0.945c 15.693,3.238, 28.088,13.604, 34.597,26.999l 37.377-1.258
-	c 4.773-11.761, 14.125-21.585, 26.914-26.457c 24.362-9.323, 51.669,2.892, 60.956,27.255
-	C 466.278,303.732, 454.079,331.019, 429.72,340.309z"  />
-<glyph unicode="&#xe12f;" d="M 409.809,175.994c-16.38,0-31.393-6.084-42.807-16.084l-58.209,33.338c 0.23,2.123, 0.393,4.298, 0.393,6.491
-	c0,5.624-0.85,11.056-2.418,16.155l 34.891,20.225c 9.517-9.928, 22.893-16.169, 37.738-16.169c 28.844,0, 52.225,23.378, 52.225,52.239
-	c0,28.82-23.381,52.209-52.225,52.209c-28.875,0-52.224-23.389-52.224-52.209c0-5.154, 0.751-10.094, 2.156-14.797l-35.024-20.273
-	c-5.131,5.408-11.312,9.773-18.311,12.717l0,64.473 c 25.539,8.795, 43.916,33.011, 43.916,61.525c0,35.938-29.163,65.082-65.107,65.082
-	c-35.908,0-65.043-29.145-65.043-65.082c0-28.515, 18.346-52.73, 43.854-61.513l0-64.485 c-6.541-2.777-12.461-6.803-17.363-11.79
-	l-34.176,19.573c 1.309,4.625, 2.094,9.519, 2.094,14.57c0,28.82-23.412,52.209-52.227,52.209c-28.842,0-52.223-23.389-52.223-52.209
-	c0-28.861, 23.381-52.239, 52.223-52.239c 14.916,0, 28.355,6.31, 37.871,16.351l 33.453-19.168c-1.798-5.459-2.812-11.311-2.812-17.394
-	c0-2.292, 0.131-4.534, 0.424-6.741l-56.802-32.894c-11.413,9.906-26.292,15.89-42.579,15.89c-35.938,0-65.074-29.104-65.074-65.058
-	c0-35.959, 29.137-65.062, 65.074-65.062c 35.939,0, 65.078,29.103, 65.078,65.062c0,4.265-0.457,8.448-1.21,12.492l 56.737,32.88
-	c 6.378-4.807, 13.799-8.24, 21.912-9.877l0-36.162 c-22.861-5.533-39.896-26.086-39.896-50.691c0-28.846, 23.381-52.224, 52.223-52.224
-	c 28.845,0, 52.191,23.378, 52.191,52.224c0,24.605-17.004,45.158-39.895,50.691l0,36.884 c 6.996,1.829, 13.475,5.035, 19.098,9.317
-	l 58.175-33.322c-0.755-3.975-1.144-8.045-1.144-12.212c0-35.959, 29.136-65.062, 65.043-65.062c 35.939,0, 65.078,29.103, 65.078,65.062
-	C 474.887,146.891, 445.748,175.994, 409.809,175.994z"  />
-<glyph unicode="&#xe130;" d="M 349.24,397.982l-85.337-224.892L 378.1,50.355l 94.557,0 L 349.24,397.982z M 38.835,50.355l 305.202,0 L 141.225,268.354
-	L 38.835,50.355z"  />
-<glyph unicode="&#xe131;" d="M 266.384,185.221l 90.394-10.395L 161.812,417.363l-6.531-311.402l 8.748,8.464l 57.315,55.47l 44.009-122.979
-	c 3.482-9.718, 12.623-15.785, 22.396-15.779c 2.664,0, 5.376,0.452, 8.011,1.394c 9.714,3.492, 15.78,12.63, 15.772,22.396
-	c0,2.665-0.451,5.378-1.392,8.016L 266.384,185.221z"  />
-<glyph unicode="&#xe132;" d="M 264.299,352.594M 278.461,380.24c-6.994,35.505-38.273,62.273-75.833,62.279l-57.224,0 l0-25.040 l 57.224,0.004
-	c 23.524-0.045, 43.377-15.568, 49.95-36.934c-50.645-5.814-89.981-48.804-89.981-101.007l0-45.183 l 0.201,0.157
-	c 0.004,0.006, 0.043-0.052, 0.286-0.346c 0.242-0.286, 0.627-0.735, 1.155-1.333c 1.062-1.185, 2.69-2.932, 4.873-5.048
-	c 4.374-4.237, 10.963-9.963, 19.639-15.684c 17.383-11.446, 42.908-22.846, 76.217-22.854c 62.378-0.052, 97.146,35.215, 101.032,39.379
-	l0,50.91 C 366,330.902, 327.921,373.347, 278.461,380.24z M 281.803,284.039c0-9.67-7.836-17.507-17.504-17.507
-	c-9.668,0-17.504,7.837-17.504,17.507l0,29.213 c0,9.667, 7.835,17.505, 17.504,17.505c 9.668,0, 17.504-7.838, 17.504-17.505L 281.803,284.039 z
-	 M 179.103,197.474c-6.58,4.342-12.069,8.665-16.506,12.527l0-103.806 c0-56.172, 45.532-101.707, 101.703-101.707
-	c 56.168,0, 101.701,45.535, 101.701,101.707l0,99.008 c-17.406-13.537-51.398-33.427-101.032-33.481
-	C 227.566,171.722, 198.565,184.625, 179.103,197.474z"  />
-<glyph unicode="&#xe133;" d="M 64.747,315.662L 114.826,265.584L 64.747,215.504 	zM 138.676,265.689l-73.929-73.93l0-163.072 l 389.679,0 L 454.426,265.689 L 138.676,265.689 z M 372.615,106.18L 156.151,106.18 l0,25.039 l 216.464,0 L 372.615,106.18 z
-	 M 372.617,163.702L 156.156,163.702 l0,25.034 l 216.461,0 L 372.617,163.702 z M 448.713,336.638l-15.129,82.466l-0.002,0 L 56.346,349.889l 72.025-72.025
-	L 448.713,336.638z M 407.25,398.999l 21.574-37.223l 2.398-13.070l-46.038-8.449l-28.657,49.435L 407.25,398.999z M 303.598,379.979
-	l 28.655-49.435l-50.724-9.306l-28.656,49.433L 303.598,379.979z M 199.945,360.964l 28.656-49.437l-50.723-9.304l-28.655,49.433
-	L 199.945,360.964z"  />
-<glyph unicode="&#xe134;" d="M 325.002,323.484c0,38.109-30.895,69.002-69.002,69.002s-69.002-30.893-69.002-69.002c0-33.114, 23.332-60.767, 54.449-67.45
-	L 241.447,71.95 c-10.439-1.436-17.604-4.361-17.604-7.743c0-4.802, 14.396-8.693, 32.156-8.693c 17.762,0, 32.158,3.892, 32.158,8.693
-	c0,3.382-7.164,6.307-17.605,7.743L 270.552,256.034 C 301.67,262.717, 325.002,290.37, 325.002,323.484z M 231.035,327.446
-	c-10.697,0-19.369,8.669-19.369,19.367c0,10.694, 8.672,19.364, 19.369,19.364c 10.695,0, 19.365-8.669, 19.365-19.364
-	C 250.4,336.115, 241.73,327.446, 231.035,327.446z"  />
-<glyph unicode="&#xe135;" d="M 83.53,416.37l0-384.462 l 342.308,0 L 425.838,416.37 L 83.53,416.37 z M 137.649,56.632l-36.729,0 L 100.92,93.36 l 36.729,0 L 137.649,56.632 z M 137.649,131.199l-36.729,0 
-	l0,36.734 l 36.729,0 L 137.649,131.199 z M 137.649,208.878l-36.729,0 l0,36.731 l 36.729,0 L 137.649,208.878 z M 137.649,283.449l-36.729,0 l0,36.731 l 36.729,0 L 137.649,283.449 z
-	 M 137.649,354.919l-36.729,0 L 100.92,391.65 l 36.729,0 L 137.649,354.919 z M 349.717,73.97L 159.651,73.97 L 159.651,204.592 l 190.065,0 L 349.716,73.97 z M 349.717,243.687L 159.651,243.687 
-	L 159.651,374.309 l 190.065,0 L 349.716,243.687 z M 408.446,56.632l-36.729,0 L 371.717,93.36 l 36.729,0 L 408.446,56.632 z M 408.446,131.199l-36.729,0 l0,36.734 l 36.729,0 L 408.446,131.199 z
-	 M 408.446,208.878l-36.729,0 l0,36.731 l 36.729,0 L 408.446,208.878 z M 408.446,283.449l-36.729,0 l0,36.731 l 36.729,0 L 408.446,283.449 z M 408.446,354.919l-36.729,0 
-	L 371.717,391.65 l 36.729,0 L 408.446,354.919 z"  />
-<glyph unicode="&#xe136;" d="M 260.736,436.203c-60.557,0-109.646-49.088-109.646-109.646c0-60.557, 109.646-258.888, 109.646-258.888
-		s 109.645,198.331, 109.645,258.888C 370.381,387.115, 321.288,436.203, 260.736,436.203z M 260.736,293.241
-		c-18.4,0-33.317,14.915-33.317,33.316c0,18.398, 14.917,33.312, 33.317,33.312c 18.397,0, 33.312-14.914, 33.312-33.312
-		C 294.049,308.156, 279.134,293.241, 260.736,293.241zM 415.248,199.483l-61.913,0 c-4.068-9.047-8.549-18.738-13.472-29.104l 52.711,0 l 32.672-129.477L 86.754,40.902 l 32.672,129.477l 62.184,0 
-		c-4.924,10.366-9.404,20.058-13.473,29.104L 96.752,199.483 l-47.36-187.687l 413.217,0 L 415.248,199.483z"  />
-<glyph unicode="&#xe137;" d="M 457.298,22.385l-97.205,144.5c 6.467,11.76, 11.006,24.729, 13.206,38.477l 97.178,19.023l-97.178,19.018
-	c-8.12,50.775-48.209,90.859-98.98,98.98l-19.025,97.178l-19.023-97.178c-13.746-2.202-26.709-6.736-38.462-13.197L 53.289,426.383
-	l 97.197-144.513c-6.461-11.761-10.995-24.722-13.195-38.464l-97.184-19.021l 97.184-19.023c 8.119-50.773, 48.205-90.854, 98.98-98.978
-	l 19.021-97.179l 19.020,97.179c 13.746,2.2, 26.707,6.733, 38.467,13.194L 457.298,22.385z M 255.293,321.14
-	c 53.353,0, 96.76-43.404, 96.76-96.753c0-12.524-2.418-24.488-6.77-35.485l-40.984,60.923l-23.543,23.566l-60.934,40.982
-	C 230.815,318.723, 242.774,321.14, 255.293,321.14z M 274.053,224.375c0-10.356-8.4-18.758-18.766-18.758
-	c-10.361,0-18.762,8.401-18.762,18.758c0,10.37, 8.4,18.773, 18.762,18.773C 265.652,243.148, 274.053,234.745, 274.053,224.375z
-	 M 255.293,127.627c-53.354,0-96.755,43.408-96.755,96.76c0,12.516, 2.415,24.47, 6.761,35.457l 40.984-60.932l 23.535-23.541
-	l 60.938-40.981C 279.764,130.044, 267.811,127.627, 255.293,127.627z"  />
-<glyph unicode="&#xe138;" d="M 409.709,251.326l 17.004,144.215l-144.197-17.004L 329.049,332l-33.665-33.682c-22.646,15.321-48.988,23.056-75.198,23.021
-	c-34.303,0.035-68.853-13.177-95.015-39.355l0-0.018 l0,0c-26.193-26.16-39.404-60.695-39.374-95
-	c-0.030-34.316, 13.181-68.865, 39.374-95.043c 26.259-26.279, 60.905-39.393, 95.227-39.358l 0.148,0 c 34.224,0, 68.607,13.275, 94.689,39.358
-	c 26.175,26.178, 39.371,60.727, 39.354,95.043c 0.017,26.193-7.702,52.536-23.021,75.182l 33.665,33.65L 409.709,251.326z
-	 M 161.339,245.798c 16.317,16.319, 37.478,24.351, 58.847,24.399c 21.389-0.048, 42.561-8.080, 58.881-24.399
-	c 16.284-16.318, 24.326-37.474, 24.377-58.831c-0.051-21.398-8.093-42.561-24.395-58.895c-16.303-16.249-37.361-24.33-58.651-24.361
-	c-21.518,0.031-42.741,8.043-59.059,24.395c-16.316,16.301-24.346,37.447-24.396,58.861c 0.050,21.389, 8.079,42.513, 24.381,58.831"  />
-<glyph unicode="&#xe139;" d="M 466.371,113.102c-14.189,14.205-38.258,20.553-58.797,26.98c-27.11,8.479-37.442,28.627-40.518,48.59
-	c 2.978,3.402, 5.887,6.982, 8.701,10.727c 17.723-5.673, 39.012-7.324, 57.195,5.873c-25.051,25.078-4.938,55.821-23.058,111.266
-	c-15.402,47.107-78.516,44.766-86.659,28.223c-33.452,11.834-58.73-4.010-68.018-53.926c-10.696-57.31, 10.040-63.362-15.076-88.443
-	c 19.261-10.989, 36.92-8.308, 52.225-2.224c 3.008-4.086, 6.182-7.996, 9.418-11.676c-3.074-19.898-13.443-39.962-40.451-48.41
-	c-20.537-6.428-44.606-12.775-58.801-26.98c-11.214-11.201-3.759-38.020-3.759-38.020l 271.326,0 
-	C 470.101,75.082, 477.59,101.9, 466.371,113.102z M 189.75,118.412c 14.159,14.145, 36.299,20.945, 55.854,26.951
-	c 2.024,0.617, 4.022,1.24, 5.981,1.863c 8.243,2.567, 15.078,6.475, 20.536,11.72c-6.536,2.783-12.981,5.512-19.162,8.048
-	c-4.446,1.209-8.96,2.435-13.471,3.676c-5.362,3.682-10.597,15.942-13.475,22.043c-2.878,0.392-5.722,0.818-8.567,1.226
-	c 0.457,9.437, 6.277,9.944, 8.567,17.151c 2.029,6.343, 0.197,14.618, 3.434,20.505c 1.864,3.451, 5.757,4.038, 8.438,6.226
-	c-0.031,0.494-0.099,0.985-0.132,1.492c-0.816,10.367-1.863,24.198, 1.345,45.322c-0.034,0.163-0.034,0.311-0.069,0.476
-	c-0.652,5.982, 1.768,25.442, 1.866,29.642c 0.226,10.911-0.033,11.808-2.649,22.435c0,0-3.236,9.63-8.24,12.539l-10.038,1.734
-	l-6.183,5.74c-24.986,15.352-51.733,4.564-66.092-1.239c-20.634-6.691-33.683-26.912-24.557-70.131
-	c 1.538-7.39-4.088-10.689-3.697-14.714c 0.817-8.799, 0.983-29.97, 9.288-35.188c 0.783-0.477, 6.671-1.96, 6.638-1.568
-	c 0.819-8.57, 1.637-17.153, 2.453-25.72c 2.062-5.691, 7.064-6.331, 8.503-14.375l-6.343-1.551c-2.881-6.101-8.145-18.361-13.509-22.043
-	c-4.479-1.241-8.99-2.467-13.472-3.676c-15.764-6.475-25.77-14.197-41.53-20.836c-14.355-6.062-31.558-8.22-36.759-23.283
-	c0-10.234-0.945-34.385-0.686-47.793l 149.544,0 C 181.803,82.506, 177.454,106.088, 189.75,118.412z"  />
-<glyph unicode="&#xe13a;" d="M 386.65,422.209L 123.582,422.209 L 34.415,191.385l0-163.646 l 441.474,0 L 475.889,193.934 L 386.65,422.209z M 336.947,185.584l0-52.578 
-	c0-13.829-11.211-25.037-25.036-25.037L 198.399,107.969 c-13.828,0-25.041,11.208-25.041,25.037l0,52.578 L 83.17,185.584 l 73.031,189.043l 197.967,0 
-	l 73.906-189.043L 336.947,185.584 z"  />
-<glyph unicode="&#xe13b;" d="M 437.161,202.784l-67.757,67.774l-68.968-68.952l0-0.030 l-49.15-49.137c-9.517-9.438-21.289-13.899-33.748-13.979
-	c-12.394,0.080-24.2,4.541-33.684,13.979c-9.385,9.464-13.867,21.258-13.93,33.732c 0.062,12.396, 4.545,24.168, 13.964,33.651
-	l 49.15,49.163l0,0l 68.967,68.983l-67.725,67.762l-118.15-118.154c-28.026-28.026-42.055-64.831-42.025-101.487
-	c-0.029-36.692, 14.031-73.434, 42.025-101.427c 27.992-27.96, 64.748-42.022, 101.407-42.022l 0.033,0 
-	c 36.656,0, 73.447,14.032, 101.44,42.022L 437.161,202.784z M 234.281,370.463l 32.474-32.493l-33.716-33.746l-32.505,32.505
-	L 234.281,370.463z M 369.404,235.307l 32.505-32.522l-33.715-33.697l-32.505,32.52L 369.404,235.307z"  />
-<glyph unicode="&#xe13c;" d="M 418.985,247.637c-0.686,11.928-7.736,22.035-19.236,30.403c-2.030-19.021-14.865-42.121-59.935-55.007
-		c-22.95-6.561-52.717-10.175-83.817-10.175c-31.099,0-60.862,3.614-83.815,10.175c-45.066,12.886-57.901,35.983-59.933,55.002
-		c-11.502-8.373-18.553-18.485-19.231-30.42L 69.87,109.425l0-1.212 c0-46.882, 93.637-71.407, 186.132-71.407
-		c 92.493,0, 186.128,24.525, 186.128,71.407l0,1.212 L 418.985,247.637z M 256.002,65.91c-99.646,0-154.878,26.88-156.962,41.461
-		l 17.293,103.258c 30.578-19.513, 86.48-28.679, 139.669-28.679c 53.19,0, 109.091,9.166, 139.666,28.679l 17.294-103.258
-		C 410.874,92.79, 355.647,65.91, 256.002,65.91zM 138.956,284.539c 3.053-40.972, 105.234-42.173, 117.041-42.173c 11.812,0, 114.020,1.201, 117.046,42.192l 14.492,69.587
-		c 0.774,2.216, 1.212,4.518, 1.353,6.896c 0.030,0.322, 0.041,0.644, 0.055,0.965c 0.004,0.197, 0.033,0.389, 0.033,0.586
-		c0,0.053-0.007,0.101-0.007,0.152c0,0.126-0.009,0.252-0.013,0.376c-0.898,46.716-119.398,48.074-132.959,48.074
-		c-13.559,0-132.084-1.358-132.955-48.086c-0.004-0.118-0.012-0.235-0.016-0.354c0-0.053-0.006-0.105-0.006-0.159
-		c0-3.113, 0.531-6.021, 1.506-8.75L 138.956,284.539z M 255.997,381.258c 30.408,0, 55.061-6.019, 55.061-13.44
-		c0-7.421-24.652-13.438-55.061-13.438c-30.404,0-55.055,6.018-55.055,13.438C 200.942,375.239, 225.593,381.258, 255.997,381.258z"  />
-<glyph unicode="&#xe13d;" d="M 360.199,443.129L 149.281,443.129 c-11.748,0-21.271-9.523-21.271-21.272l0-394.638 c0-11.748, 9.523-21.275, 21.271-21.275l 210.918,0 
-	c 11.746,0, 21.276,9.527, 21.276,21.275L 381.475,421.856 C 381.476,433.606, 371.945,443.129, 360.199,443.129z M 209.638,37.326l-46.302,0 l0,46.301 
-	l 46.302,0 L 209.638,37.326 z M 209.638,105.405l-46.302,0 L 163.336,151.71 l 46.302,0 L 209.638,105.405 z M 279.237,37.326l-46.302,0 l0,46.301 l 46.302,0 L 279.237,37.326 z
-	 M 279.237,105.405l-46.302,0 L 232.935,151.71 l 46.302,0 L 279.237,105.405 z M 234.961,185.746c0,10.939, 8.869,19.809, 19.807,19.809
-	s 19.803-8.869, 19.803-19.809s-8.865-19.807-19.803-19.807S 234.961,174.807, 234.961,185.746z M 347.912,37.326L 301.61,37.326 l0,46.301 l 46.302,0 
-	L 347.912,37.326 z M 347.912,105.405L 301.61,105.405 L 301.61,151.71 l 46.302,0 L 347.912,105.405 z M 347.912,214.675L 163.336,214.675 L 163.336,409.085 l 184.576,0 L 347.912,214.675 z"  />
-<glyph unicode="&#xe13e;" d="M 168.047,66.212l 191.71,158.229L 168.047,382.663l0-103.227 L 70.844,279.436 l0-109.992 l 97.203,0 L 168.047,66.212 z M 118.912,443.015l0-45.068 l 275.021,0 
-	l0-348.378 L 118.912,49.569 l0-45.070 l 320.092,0 L 439.004,443.015 L 118.912,443.015 z"  />
-<glyph unicode="&#xe13f;" d="M 248.783,73.724l 181.299,149.634L 248.783,372.989l0-97.62 l-91.922,0 l0-104.020 l 91.922,0 L 248.783,73.724 z M 384.625,16.648l0,42.624 L 124.541,59.272 
-	L 124.541,388.729 l 260.084,0 L 384.625,431.351 L 81.918,431.351 l0-414.703 L 384.625,16.648 z"  />
-<glyph unicode="&#xe140;" d="M 194.227,231.729l-43.363,41.089L 70.254,272.818 l 102.62-97.286l 268.411,0 l-59.317,56.197L 194.227,231.729 z M 204.169,256.663L 472.55,256.663 
-			l-102.648,97.29L 101.518,353.953 L 204.169,256.663z M 162.93,150.613l-43.33,41.075L 38.99,191.688 l 102.651-97.283l 268.383,0 l-59.32,56.208L 162.93,150.613 z"  />
-<glyph unicode="&#xe141;" d="M 343.473,223.997L 437.94,392.005L 403.916,392.005L 250.857,223.997L 403.914,55.995L 437.941,55.995 	zM 261.141,392.005L 227.116,392.005L 74.059,223.997L 227.114,55.995L 261.141,55.995L 166.674,223.997 	z"  />
-<glyph unicode="&#xe142;" d="M 472.986,442.242l0-436.666 L 36.32,5.576 L 36.32,442.242 L 472.986,442.242  M 442.211,411.465L 67.098,411.465 l0-375.112 l 375.113,0 L 442.211,411.465 L 442.211,411.465zM 110.673,260.421L 184.004,260.421L 184.004,81.941L 110.673,81.941zM 228.143,258.979L 396.463,258.979L 396.463,83.174L 228.143,83.174zM 110.673,374.261L 396.463,374.261L 396.463,303.687L 110.673,303.687z"  />
-<glyph unicode="&#xe143;" d="M 174.359,188.473l-62.919,146.83l-63.065-146.83c0-34.828, 28.206-62.983, 62.999-62.983
-	C 146.168,125.489, 174.359,153.645, 174.359,188.473z M 75.647,188.473l 35.792,83.521l 35.792-83.521L 75.647,188.473 z M 401.505,335.303
-	l-63.083-146.83c0-34.828, 28.188-62.983, 62.982-62.983c 34.797,0, 63.001,28.155, 63.001,62.983L 401.505,335.303z M 365.697,188.473
-	l 35.808,83.521l 35.774-83.521L 365.697,188.473 z M 279.462,89.057L 279.462,338.051 l 156.183,0 l0,30.639 L 279.462,368.69 l0,0.758 
-	c 9.481,7.52, 15.581,19.127, 15.581,32.176c0,22.73-18.428,41.107-41.155,41.107c-22.71,0-41.139-18.377-41.139-41.107
-	c0-13.049, 6.116-24.656, 15.566-32.176l0-0.758 L 77.103,368.69 l0-30.639 l 151.212,0 l0-248.994 c0-28.545-23.151-51.732-51.768-51.732l-53.074,0 l0-30.67 
-	l 260.845,0 l0,30.67 l-53.090,0 C 302.646,37.324, 279.462,60.512, 279.462,89.057z"  />
-<glyph unicode="&#xe144;" d="M 256.39,441.58c-120.065,0-217.417-97.319-217.417-217.414c0-120.066, 97.353-217.4, 217.417-217.4
-			c 120.095,0, 217.418,97.334, 217.418,217.4C 473.809,344.261, 376.485,441.58, 256.39,441.58z M 256.39,57.912
-			c-91.679,0-166.272,74.592-166.272,166.254c0,91.696, 74.593,166.29, 166.272,166.29c 91.678,0, 166.27-74.594, 166.27-166.29
-			C 422.66,132.504, 348.068,57.912, 256.39,57.912z M 256.374,363.311c-76.832,0-139.113-62.293-139.113-139.127
-			c0-76.866, 62.281-139.146, 139.113-139.146c 76.864,0, 139.18,62.28, 139.18,139.146C 395.554,301.018, 333.238,363.311, 256.374,363.311
-			z M 255.622,122.448c-56.737,0.015-102.733,46.027-102.733,102.779c0,6.427, 0.604,12.704, 1.733,18.788
-			c-7.164,0.604-14.308,1.243-21.306,1.867c 3.289,12.735, 8.373,25.080, 15.223,36.672l 42.906-29.217
-			c-2.079-3.828-3.876-7.783-5.381-11.808c-4.612,0.328-9.253,0.687-13.964,1.062c-1.161-5.609-1.766-11.414-1.766-17.365
-			c0-23.588, 9.55-44.86, 24.984-60.332c 15.469-15.453, 36.725-24.984, 60.303-24.984c 18.574,0, 35.694,5.919, 49.673,15.959
-			c-7.454,2.761-12.785,9.893-12.785,18.293c0,10.775, 8.747,19.493, 19.523,19.493c 7.716,0, 14.389-4.482, 17.527-10.989
-			c 7.243,12.526, 11.38,27.030, 11.38,42.561c0,23.596-9.517,44.851-24.983,60.319c-15.469,15.436-36.726,24.985-60.335,24.985
-			c-2.092,0-4.187-0.101-6.245-0.266l-0.493-12.162c-15.304-3.876-29.79-11.769-41.811-23.788c-0.274-0.314-0.554-0.608-0.831-0.885
-			l-43.2,29.414c 2.373,2.749, 4.842,5.43, 7.44,8.047c 22.645,22.66, 51.030,36.1, 80.477,40.321l-0.933-23.381
-			c 1.883,0.097, 3.746,0.162, 5.595,0.162c 56.771-0.034, 102.78-46.015, 102.78-102.768
-			C 358.402,168.476, 312.393,122.463, 255.622,122.448z M 245.124,224.166c0,6.229, 5.069,11.268, 11.267,11.268
-			c 6.228,0, 11.25-5.039, 11.25-11.268c0-6.209-5.021-11.25-11.25-11.25C 250.192,212.916, 245.124,217.957, 245.124,224.166z"  />
-<glyph unicode="&#xe145;" d="M 435.107,274.498l0,19.731 l-70.248,0 l0-19.731 l 9.078,0 l0-122.542 l-9.078,0 l0-19.729 l 70.248,0 l0,19.729 l-9.078,0 L 426.029,274.498 L 435.107,274.498 z
-			 M 461.992,348.589l 0.002,0 L 255.518,412.626L 49.039,348.589l0-30.682 l 412.953,0 L 461.992,348.589 z M 255.516,343.813
-			c-10.811,0-19.574,8.764-19.574,19.576c0,10.81, 8.764,19.573, 19.574,19.573s 19.574-8.764, 19.574-19.573
-			C 275.090,352.578, 266.326,343.813, 255.516,343.813z M 339.271,274.498l0,19.731 l-70.246,0 l0-19.731 l 9.076,0 l0-122.542 l-9.076,0 l0-19.729 l 70.246,0 
-			l0,19.729 l-9.076,0 L 330.195,274.498 L 339.271,274.498 z M 439.279,105.022L 73.686,105.022 l-23.682-69.649l 412.957,0 L 439.279,105.022z M 243.441,274.498l0,19.731 
-			l-70.248,0 l0-19.731 l 9.076,0 l0-122.542 l-9.076,0 l0-19.729 l 70.248,0 l0,19.729 l-9.080,0 L 234.361,274.498 L 243.441,274.498 z M 147.605,274.498l0,19.731 L 77.357,294.229 l0-19.731 
-			l 9.076,0 l0-122.542 l-9.076,0 l0-19.729 l 70.248,0 l0,19.729 l-9.076,0 L 138.529,274.498 L 147.605,274.498 z"  />
-<glyph unicode="&#xe146;" d="M 254.989,293.537c 38.106,0, 68.999-30.891, 68.999-68.994c0-38.112-30.893-69.002-68.999-69.002
-		c-38.109,0-69.002,30.89-69.002,69.002C 185.987,262.646, 216.88,293.537, 254.989,293.537zM 237.459,348.021l0,25.271 c0,9.677, 7.849,17.524, 17.525,17.524l0,0c 9.678,0, 17.531-7.848, 17.531-17.524l0,0l0-25.271 
-			c0-9.678-7.854-17.529-17.531-17.529l0,0C 245.308,330.492, 237.459,338.344, 237.459,348.021L 237.459,348.021zM 237.459,75.791l0,25.27 c0,9.681, 7.846,17.524, 17.525,17.524l0,0c 9.68,0, 17.531-7.844, 17.531-17.524l0,0l0-25.27 
-			c0-9.676-7.852-17.528-17.531-17.528l0,0C 245.305,58.263, 237.459,66.115, 237.459,75.791L 237.459,75.791zM 329.906,299.462c-6.845,6.846-6.845,17.947,0,24.785l0,0l 17.871,17.872c 6.845,6.846, 17.941,6.846, 24.785,0l0,0
-			c 6.848-6.854, 6.848-17.945,0-24.785l0,0l-17.873-17.872c-3.421-3.425-7.906-5.135-12.391-5.135l0,0
-			C 337.813,294.327, 333.328,296.037, 329.906,299.462L 329.906,299.462zM 137.411,106.969c-6.846,6.846-6.846,17.937,0,24.783l0,0l 17.869,17.87c 6.848,6.843, 17.945,6.843, 24.786,0l0,0
-			c 6.848-6.847, 6.848-17.944,0-24.785l0,0l-17.869-17.868c-3.424-3.424-7.91-5.135-12.396-5.135l0,0
-			C 145.316,101.834, 140.832,103.545, 137.411,106.969L 137.411,106.969zM 378.464,207.016c-9.677,0-17.526,7.848-17.526,17.527l0,0c 0.008,9.68, 7.85,17.528, 17.526,17.528l0,0l 25.271,0 
-			c 9.681-0.008, 17.528-7.856, 17.528-17.536l0,0c0-9.678-7.848-17.52-17.528-17.52l0,0L 378.464,207.015 L 378.464,207.016zM 106.239,207.016c-9.682,0-17.53,7.848-17.53,17.527l0,0c0,9.68, 7.848,17.528, 17.53,17.528l0,0l 25.267,0 
-			c 9.681-0.008, 17.529-7.856, 17.529-17.536l0,0c0-9.678-7.849-17.52-17.529-17.52l0,0L 106.239,207.015 L 106.239,207.016zM 347.768,106.971l-17.861,17.87c-6.846,6.839-6.842,17.946, 0.007,24.781l0,0c 6.839,6.849, 17.938,6.845, 24.786-0.002l0,0
-			l 17.86-17.87c 6.848-6.839, 6.842-17.939-0.004-24.787l0,0c-3.422-3.422-7.901-5.131-12.386-5.129l0,0
-			C 355.684,101.834, 351.195,103.545, 347.768,106.971L 347.768,106.971zM 155.276,299.462l-17.864,17.872c-6.847,6.844-6.847,17.938,0,24.785l0,0c 6.846,6.846, 17.94,6.846, 24.786,0l0,0
-			l 17.871-17.872c 6.839-6.844, 6.839-17.939-0.005-24.785l0,0c-3.423-3.425-7.908-5.135-12.394-5.135l0,0
-			C 163.185,294.327, 158.7,296.037, 155.276,299.462L 155.276,299.462z"  />
-<glyph unicode="&#xe147;" d="M 254.787,293.455c 38.106,0, 68.997-30.894, 68.997-68.996c0-38.109-30.891-69-68.997-69c-38.109,0-69,30.891-69,69
-		C 185.787,262.562, 216.678,293.455, 254.787,293.455zM 237.262,347.939l0,75.35 c0,9.68, 7.846,17.525, 17.522,17.525l0,0c 9.681,0, 17.529-7.846, 17.529-17.525l0,0l0-75.35 
-			c0-9.676-7.849-17.527-17.529-17.527l0,0C 245.108,330.412, 237.262,338.264, 237.262,347.939L 237.262,347.939zM 237.26,25.635L 237.26,100.98 c0,9.68, 7.845,17.523, 17.527,17.523l0,0c 9.678,0, 17.524-7.844, 17.524-17.523l0,0l0-75.346 
-			c0-9.68-7.846-17.535-17.524-17.535l0,0C 245.105,8.1, 237.26,15.955, 237.26,25.635L 237.26,25.635zM 329.707,299.38c-6.845,6.846-6.845,17.945,0,24.791l0,0l 53.278,53.28c 6.847,6.843, 17.941,6.843, 24.785,0l0,0
-			c 6.845-6.846, 6.845-17.948,0-24.793l0,0l-53.278-53.278c-3.422-3.42-7.907-5.128-12.393-5.128l0,0
-			C 337.615,294.252, 333.13,295.96, 329.707,299.38L 329.707,299.38zM 101.799,71.477c-6.845,6.844-6.845,17.938,0,24.781l0,0l 53.279,53.28c 6.843,6.843, 17.94,6.843, 24.787,0l0,0
-			c 6.845-6.845, 6.845-17.944,0-24.784l0,0l-53.278-53.277c-3.422-3.423-7.908-5.135-12.395-5.135l0,0
-			C 109.708,66.342, 105.219,68.054, 101.799,71.477L 101.799,71.477zM 378.262,206.93c-9.679,0-17.527,7.854-17.527,17.529l0,0c0,9.68, 7.849,17.526, 17.527,17.526l0,0l 75.35,0 
-			c 9.678,0, 17.526-7.847, 17.526-17.526l0,0c0-9.675-7.849-17.529-17.526-17.529l0,0L 378.262,206.93 L 378.262,206.93zM 55.956,206.93c-9.68,0-17.526,7.854-17.526,17.529l0,0c0,9.68, 7.846,17.526, 17.526,17.526l0,0l 75.35,0 
-			c 9.679,0, 17.526-7.847, 17.526-17.526l0,0c0-9.675-7.848-17.529-17.526-17.529l0,0L 55.956,206.93 L 55.956,206.93zM 382.985,71.477l-53.279,53.277c-6.845,6.84-6.845,17.939,0,24.784l0,0c 6.843,6.843, 17.943,6.843, 24.786,0l0,0
-			l 53.282-53.28c 6.841-6.843, 6.841-17.938,0-24.781l0,0c-3.427-3.423-7.913-5.135-12.397-5.135l0,0
-			C 390.892,66.342, 386.406,68.054, 382.985,71.477L 382.985,71.477zM 155.073,299.38l-53.281,53.278c-6.838,6.845-6.838,17.947,0,24.793l0,0c 6.852,6.843, 17.947,6.843, 24.793,0l0,0
-			l 53.278-53.28c 6.847-6.846, 6.847-17.945,0-24.791l0,0c-3.422-3.42-7.909-5.128-12.396-5.128l0,0
-			C 162.981,294.252, 158.495,295.96, 155.073,299.38L 155.073,299.38z"  />
-<glyph unicode="&#xe148;" d="M 338.233,399.339c-13.934,13.933-31.228,24.218-50.015,29.774c-10.742,3.152-21.915,4.725-33.24,4.725
-	c-31.455,0-60.983-12.231-83.236-34.499c-22.25-22.208-34.46-51.76-34.46-83.198l 0.494-10.821
-	c 1.477-16.173, 6.198-31.601, 14.040-45.825c 0.082-0.789, 44.311-80.123, 44.311-129.688l 1.516-14.678
-	c 2.385-9.789, 7.382-14.767, 14.848-14.767l 84.977,0 c 7.468,0, 12.457,4.978, 14.85,14.767l 1.512,14.678
-	c0,49.564, 44.227,128.898, 44.685,129.688c 7.47,14.225, 12.191,29.652, 13.646,45.825l 0.516,10.821
-	C 372.675,347.579, 360.439,377.131, 338.233,399.339z M 342.255,307.406c-1.124-11.602-4.522-22.919-10.113-33.654
-	c-4.72-8.457-47.432-86.512-48.275-142.276l-0.116-1.142l-13.787,0 l0,54.678 l-29.979,0 l0-54.678 l-13.783,0 l-0.115,1.142
-	c-0.629,41.776-24.441,96.779-45.046,136.716l-0.050,0.461l-2.924,5.311c-5.731,10.394-9.223,21.656-10.383,33.469l-0.427,9.333
-	c 0.163,23.22, 9.259,44.987, 25.69,61.389c 16.57,16.581, 38.6,25.714, 62.031,25.714c 8.514,0, 16.855-1.184, 24.734-3.494
-	c 14.024-4.149, 26.932-11.836, 37.326-22.229c 16.391-16.394, 25.489-38.149, 25.658-61.327L 342.255,307.406z M 207.14,50.044l 95.676,0 
-	l0,29.972 L 207.14,80.016 L 207.14,50.044 z M 227.92,15.502l 54.096,0 l0,16.943 L 227.92,32.445 L 227.92,15.502 z"  />
-<glyph unicode="&#xe149;" d="M 374.638,306.759c-1.519-16.622-6.36-32.451-14.023-47.062c-0.472-0.818-45.887-82.276-45.887-133.174l-1.552-15.067
-		c-2.454-10.046-7.57-15.153-15.257-15.153l-87.257,0 c-7.651,0-12.783,5.107-15.247,15.153l-1.542,15.067
-		c0,50.897-45.428,132.355-45.515,133.174c-8.032,14.61-12.896,30.44-14.403,47.062l-0.514,11.114
-		c0,32.273, 12.555,62.621, 35.387,85.443c 22.84,22.846, 53.181,35.427, 85.477,35.427c 11.614,0, 23.084-1.646, 34.115-4.879
-		c 19.308-5.683, 37.055-16.248, 51.361-30.548c 22.812-22.822, 35.373-53.158, 35.373-85.443L 374.638,306.759zM 205.169,44.627L 205.169,75.404L 303.434,75.404L 303.434,44.627L 205.169,44.627 	zM 226.524,9.173L 226.524,26.567L 282.074,26.567L 282.074,9.173L 226.524,9.173 	z"  />
-<glyph unicode="&#xe14a;" d="M 407.693,442.796L 105.369,442.796 c-9.387,0-16.942-7.584-16.942-16.937l0-403.636 c0-9.354, 7.555-16.944, 16.942-16.944l 302.325,0 
-	c 9.353,0, 16.941,7.591, 16.941,16.944L 424.635,425.859 C 424.635,435.212, 417.046,442.796, 407.693,442.796z M 256.515,12.407
-	c-5.952,0-10.791,4.845-10.791,10.83c0,5.969, 4.839,10.79, 10.791,10.79c 5.984,0, 10.792-4.821, 10.792-10.79
-	C 267.307,17.252, 262.499,12.407, 256.515,12.407z M 393.99,43.412L 119.070,43.412 L 119.070,404.666 l 274.92,0 L 393.99,43.412 z"  />
-<glyph unicode="&#xe14b;" d="M 390.008,334.668l-79.432,79.434l-6.936,6.936L 115.059,421.038 l0-394.074 l 281.883,0 l0,300.77 L 390.008,334.668z M 373.26,50.645L 138.738,50.645 
-		L 138.738,397.358 l 133.92,0 c 35.182,0, 18.23-83.392, 18.23-83.392s 81.328,19.766, 82.371-17.527C 373.26,232.97, 373.26,50.645, 373.26,50.645zM 200.121,279.326c-3.041,3.239-4.516,7.659-4.418,13.256l-20.77,0 c 0.982-11.586, 4.566-20.378, 10.752-26.366
-		c 6.189-5.99, 14.779-9.378, 25.781-10.165l0-12.519 l 8.691,0 l0,12.519 c 7.365,0.493, 13.406,1.967, 18.117,4.421
-		c 4.713,2.452, 8.471,5.253, 11.27,8.395c 2.797,3.144, 4.736,6.356, 5.818,9.649c 1.080,3.291, 1.619,6.016, 1.619,8.176
-		c0,2.452-0.17,5.252-0.518,8.396c-0.344,3.144-1.445,6.285-3.309,9.429c-1.869,3.143-4.766,6.162-8.695,9.060
-		c-3.93,2.895-9.525,5.325-16.787,7.291c-1.383,0.391-2.682,0.734-3.908,1.031c-1.229,0.294-2.428,0.591-3.607,0.882l0,26.074 
-		c 3.336,0, 6.186-1.377, 8.541-4.125c 2.355-2.751, 3.586-6.086, 3.684-10.016l 20.918,0 c-0.297,5.104-1.375,9.524-3.244,13.26
-		c-1.865,3.729-4.268,6.848-7.215,9.351c-2.945,2.505-6.357,4.468-10.236,5.892c-3.881,1.425-8.027,2.383-12.447,2.874l0,11.343 
-		l-8.691,0 l0-11.343 c-4.422-0.296-8.689-1.158-12.816-2.578c-4.123-1.423-7.758-3.44-10.898-6.040c-3.146-2.604-5.674-5.816-7.59-9.649
-		c-1.914-3.827-2.869-8.248-2.869-13.256c0-4.909, 0.83-9.013, 2.5-12.3c 1.67-3.293, 3.908-6.041, 6.705-8.252
-		c 2.797-2.208, 5.967-3.975, 9.5-5.303c 3.537-1.325, 7.123-2.479, 10.752-3.459c 0.986-0.198, 1.893-0.421, 2.729-0.663
-		c 0.834-0.245, 1.494-0.468, 1.988-0.662l0-30.786 C 206.949,274.023, 203.168,276.083, 200.121,279.326z M 220.158,301.423
-		c 5.795-1.573, 9.891-3.315, 12.299-5.23c 2.4-1.914, 3.609-4.787, 3.609-8.618c0-2.356-0.49-4.396-1.473-6.111
-		c-0.984-1.72-2.236-3.168-3.758-4.349c-1.521-1.177-3.24-2.086-5.156-2.721c-1.914-0.642-3.756-1.058-5.521-1.253L 220.158,301.423 z
-		 M 201.301,329.117c-2.061,1.767-3.092,4.269-3.092,7.51c0,2.063, 0.369,3.854, 1.105,5.378c 0.738,1.521, 1.742,2.799, 3.020,3.829
-		c 1.275,1.031, 2.699,1.793, 4.271,2.282c 1.568,0.491, 3.189,0.737, 4.861,0.737l0-24.010 C 206.75,325.923, 203.365,327.348, 201.301,329.117z
-		M 172.818,221.663L 339.181,221.663L 339.181,197.985L 172.818,197.985zM 172.818,175.911l0-90.422 l 166.363,0 l0,90.422 l-72.896,0 L 172.818,175.911 z M 196.5,152.232l 29.992,0 l0-43.065 L 196.5,109.167 L 196.5,152.232 z M 315.502,109.167
-		l-65.328,0 l0,43.065 l 16.111,0 l 49.217,0 L 315.502,109.167 z"  />
-<glyph unicode="&#xe14c;" d="M 230.384,255.4c 4.293,11.035-1.231,16.553-6.143,16.553
-	c-22.688,0-52.154-53.374-63.173-53.374c-4.311,0-7.99,4.307-7.99,7.985c0,11.043, 26.991,36.805, 34.982,44.783
-	c 24.528,23.312, 56.44,41.104, 92.027,41.104c 26.368,0, 54.601-15.945, 32.515-75.471L 268.42,117.362
-	c-3.665-9.205-10.415-24.557-10.415-34.367c0-4.29, 2.438-8.595, 7.348-8.595c 18.396,0, 52.155,52.158, 60.748,52.158
-	c 3.061,0, 7.351-3.675, 7.351-9.196c0-17.793-71.771-93.876-133.744-93.876c-22.088,0-37.423,10.421-37.423,33.738
-	c0,29.441, 20.854,79.757, 25.169,90.194L 230.384,255.4z M 263.509,376.261c0,26.992, 23.309,49.073, 50.308,49.073
-	c 24.556,0, 42.336-16.554, 42.336-41.716c0-28.233-23.303-49.094-50.914-49.094C 280.088,334.524, 263.509,351.1, 263.509,376.261z"  />
-<glyph unicode="&#xe14d;" d="M 144.192,114.824c-30.411-0.028-58.092,12.29-77.808,32.163l0,0c-19.769,19.823-31.875,47.417-31.855,77.495l0,0
-		c 0.006,30.666, 13.191,58.16, 33.137,77.709l0,0c 19.949,19.572, 47.099,31.912, 76.526,31.964l0,0
-		c 21.957,0.063, 41.812-5.919, 58.365-15.51l0,0c 16.62-9.567, 30.071-22.332, 41.774-35.899l0,0c 4.18-4.885, 8.168-9.896, 12.011-14.953
-		l0,0c 2.728,3.65, 5.52,7.273, 8.397,10.841l0,0c 14.787,18.177, 32.267,35.504, 55.794,46.071l0,0c 13.375,5.997, 28.59,9.476, 44.9,9.444
-		l0,0c 59.838-0.165, 109.449-48.753, 109.666-109.667l0,0c-0.027-30.944-13.744-58.391-33.771-77.801l0,0
-		c-20.084-19.418-46.949-31.766-75.895-31.857l0,0c-0.131,0-0.264,0-0.395,0l0,0c-21.291,0-40.588,6.099-56.568,15.703l0,0
-		c-16.146,9.646-29.146,22.399-40.549,35.914l0,0c-4.016,4.809-7.868,9.729-11.59,14.703l0,0c-2.812-3.706-5.704-7.388-8.685-11.013
-		l0,0c-15.163-18.261-33.293-35.575-57.458-46.005l0,0C 176.453,118.198, 160.903,114.796, 144.192,114.824L 144.192,114.824
-		 M 144.192,164.902c 13.286,0.059, 23.464,3.195, 33.416,8.849l0,0c 9.887,5.654, 19.406,14.249, 28.803,25.169l0,0
-		c 6.63,7.616, 13.056,16.305, 19.557,25.554l0,0c-5.619,8.004-11.186,15.582-16.897,22.414l0,0
-		c-12.52,15.151-25.101,26.172-38.647,31.945l0,0c-7.807,3.329-16.090,5.213-26.23,5.236l0,0
-		c-15.042,0.046-30.208-6.55-41.445-17.607l0,0c-11.251-11.088-18.148-25.896-18.137-41.979l0,0
-		C 84.724,191.352, 110.63,164.99, 144.192,164.902L 144.192,164.902 M 303.596,201.884c 12.309-15.229, 24.549-26.246, 37.32-31.886l0,0
-		c 7.362-3.254, 15.051-5.062, 24.518-5.096l0,0c 14.094-0.092, 29.533,6.506, 41.008,17.709l0,0c 11.523,11.221, 18.6,26.081, 18.576,41.871
-		l0,0c-0.008,16.369-6.722,31.133-17.706,42.080l0,0c-11.005,10.909-25.895,17.519-41.878,17.507l0,0
-		c-12.384-0.069-21.808-3.066-31.295-8.636l0,0c-9.406-5.588-18.658-14.185-27.88-25.158l0,0
-		c-6.534-7.687-12.916-16.467-19.427-25.813l0,0C 292.444,216.402, 297.967,208.764, 303.596,201.884L 303.596,201.884z"  />
-<glyph unicode="&#xe14e;" d="M 204.67,313.215L 204.67,396.315L 472.935,396.315L 472.935,313.215L 204.67,313.215 	zM 204.67,182.213L 204.67,265.31L 472.935,265.31L 472.935,182.213L 204.67,182.213 	zM 204.67,51.207L 204.67,134.307L 472.935,134.307L 472.935,51.207L 204.67,51.207 	zM 143.805,223.758L 35.514,160.709L 35.514,286.813 	z"  />
-<glyph unicode="&#xe14f;" d="M 387.65,421.325L 124.582,421.325 L 35.415,190.502l0-163.646 l 441.474,0 L 476.889,193.050 L 387.65,421.325z M 337.947,184.703l0-52.58 
-	c0-13.828-11.211-25.039-25.036-25.039L 199.399,107.084 c-13.828,0-25.041,11.211-25.041,25.039l0,52.58 L 84.17,184.703 l 73.031,189.041l 197.967,0 
-	l 73.906-189.041L 337.947,184.703 z M 288.844,342.913l-61.342,0 l0-72.882 l-57.567,0 l 88.243-106.915l 88.24,106.915l-57.574,0 L 288.844,342.913 z"  />
-<glyph unicode="&#xe150;" d="M 179.723,343.883L 332.274,343.883L 332.274,314.532L 179.723,314.532zM 158.225,292.255L 353.776,292.255L 353.776,253.873L 158.225,253.873zM 136.696,200.959l 41.953,0 l 14.209,0 l0-14.208 l0-49.726 c0-5.223, 4.246-9.471, 9.471-9.471l 107.346,0 c 5.224,0, 9.473,4.248, 9.473,9.471
-		l0,49.726 l0,14.208 l 14.207,0 l 41.949,0 l0,27.63 L 136.696,228.589 L 136.696,200.959 zM 380.356,410.523l-248.78,0 L 47.252,192.235l0-154.759 l 417.494,0 L 464.746,194.642 L 380.356,410.523z M 333.354,186.751l0-49.726 
-		c0-13.078-10.604-23.679-23.68-23.679L 202.329,113.346 c-13.076,0-23.68,10.601-23.68,23.679l0,49.726 L 93.358,186.751 l 69.066,178.771l 187.215,0 
-		l 69.891-178.771L 333.354,186.751 z"  />
-<glyph unicode="&#xe151;" d="M 447.028,11.1L 42.031,416.098L 63.793,437.861L 468.793,32.859L 447.028,11.1 		z"  />
-<glyph unicode="&#xe152;" d="M 309.632,57.836c-0.884,3.977-1.507,7.9-1.998,11.611L 203.906,69.447 c-0.949-7.455-2.584-15.862-5.461-23.609
-	c-2.91-7.816-7.032-14.914-12.625-19.916c-5.623-4.974-12.588-8.111-22.333-8.145l0-9.287 l 184.6,0 l0,9.287 
-	c-9.745,0.033-16.742,3.171-22.365,8.16C 317.346,33.395, 312.28,45.738, 309.632,57.836z M 460.092,439.334L 51.448,439.334 
-	c-6.798,0-12.327-5.508-12.327-12.326l0-323.387 c0-6.801, 5.529-12.33, 12.327-12.33l 408.644,0 c 6.801,0, 12.325,5.529, 12.325,12.33L 472.417,427.008 
-	C 472.417,433.826, 466.893,439.334, 460.092,439.334z M 442.497,176.089L 69.077,176.089 L 69.077,409.41 l 373.42,0 L 442.497,176.089 z"  />
-<glyph unicode="&#xe153;" d="M 311.137,290.082c 1.081,1.242, 1.896,2.551, 2.388,3.4l0,18.949 L 198.806,312.431 l0-18.949 c 0.23-0.396, 0.523-0.92, 0.882-1.441
-	c 1.668-2.55, 4.905-5.627, 6.835-6.731l 29.661-18.69c 6.867-4.335, 13.243-10.094, 18.051-17.614c 0.654-1.046, 1.306-2.122, 1.929-3.268
-	c 0.622,1.146, 1.243,2.222, 1.928,3.268c 4.841,7.561, 11.217,13.309, 18.053,17.614l 29.659,18.69
-	C 307.244,286.158, 309.436,288.071, 311.137,290.082z M 330.17,244.229c 8.436,5.368, 15.402,12.396, 20.796,20.146
-	c 5.233,7.814, 9.288,16.060, 9.486,26.323l0,70.247 l 13.701,0 L 374.153,413.268 L 138.177,413.268 l0-52.322 l 13.702,0 l0-70.247 c 0.198-10.233, 4.285-18.509, 9.485-26.323
-	c 5.394-7.75, 12.328-14.777, 20.765-20.146l 28.713-18.049c 1.013-0.651, 1.6-1.177, 1.993-1.566c-0.394-0.43-0.98-0.983-1.993-1.607
-	l-28.713-18.065c-8.437-5.346-15.372-12.396-20.765-20.11c-5.2-7.832-9.287-16.108-9.485-26.374l0-71.341 l-13.702,0 l0-52.307 l 235.977,0 
-	l0,52.307 l-13.701,0 l0,71.341 c-0.198,10.266-4.253,18.542-9.486,26.374c-5.363,7.749-12.36,14.765-20.796,20.11l-28.713,18.065
-	c-0.98,0.624-1.604,1.178-1.994,1.607c 0.391,0.39, 1.014,0.915, 1.994,1.566L 330.17,244.229z M 285.137,197.075l 28.715-18.084
-	c 4.283-2.647, 8.83-7.124, 11.869-11.541c 3.14-4.351, 4.251-8.796, 4.055-8.993l0-71.341 l-16.251,0 l0,1.487 
-	c-0.196,0.43-0.524,0.937-0.882,1.476c-1.669,2.535-4.938,5.624-6.837,6.733l-29.659,18.674
-	c-6.836,4.314-13.212,10.070-18.053,17.629c-0.686,1.044-1.307,2.122-1.928,3.235c-0.623-1.113-1.275-2.224-1.929-3.254
-	c-4.841-7.54-11.185-13.296-18.051-17.61l-29.628-18.674c-1.472-0.883-3.695-2.777-5.33-4.777c-1.080-1.238-1.931-2.548-2.421-3.432
-	l0-1.487 l-16.253,0 l0,71.341 c-0.229,0.197, 0.917,4.643, 4.057,8.993c 3.007,4.417, 7.554,8.894, 11.837,11.541l 28.744,18.084
-	c 9.421,5.822, 16.679,15.801, 16.646,27.539c 0.033,11.707-7.225,21.694-16.646,27.495l-28.744,18.089
-	c-4.283,2.665-8.83,7.162-11.837,11.545c-3.14,4.332-4.286,8.795-4.057,8.955l0,70.247 l 147.223,0 l0-70.247 
-	c 0.196-0.16-0.915-4.623-4.055-8.955c-3.008-4.383-7.586-8.88-11.869-11.545l-28.715-18.089
-	c-9.449-5.801-16.677-15.788-16.677-27.495C 268.46,212.876, 275.688,202.897, 285.137,197.075z"  />
-<glyph unicode="&#xe154;" d="M 254.971,443.021L 25.167,213.25l 43.226-43.233l 186.586,186.539l 186.518-186.527l 43.223,43.215L 254.971,443.021z
-	 M 91.083,157.298l0-151.167 l 117.111,0 L 208.194,143.494 l 93.5,0 l0-137.363 l 117.112,0 L 418.806,157.307 L 254.971,321.151L 91.083,157.298z"  />
-<glyph unicode="&#xe155;" d="M 473.591,334.817l0,24.938 l-81.87,0 L 391.721,441.604 l-24.936,0 l0-81.849 l-98.168,0 L 268.617,441.604 l-24.936,0 l0-81.849 l-98.152,0 L 145.529,441.604 l-24.937,0 l0-81.849 L 38.74,359.755 
-	l0-24.938 l 81.852,0 l0-98.155 L 38.74,236.662 l0-24.938 l 81.852,0 l0-98.167 L 38.74,113.557 l0-24.932 l 81.852,0 l0-81.858 l 24.937,0 l0,81.858 l 98.152,0 l0-81.858 l 24.936,0 l0,81.858 l 98.168,0 
-	l0-81.858 l 24.936,0 l0,81.858 l 81.87,0 l0,24.932 l-81.87,0 l0,98.167 l 81.87,0 l0,24.938 l-81.87,0 l0,98.155 L 473.591,334.817 z M 145.529,334.817l 98.152,0 l0-98.155 
-	l-98.152,0 L 145.529,334.817 z M 145.529,113.558l0,98.167 l 98.152,0 l0-98.167 L 145.529,113.558 z M 366.785,113.558l-98.168,0 l0,98.167 l 98.168,0 L 366.785,113.558 z
-	 M 366.785,236.662l-98.168,0 l0,98.155 l 98.168,0 L 366.785,236.662 z"  />
-<glyph unicode="&#xe156;" d="M 101.354,81.064c-5.464-5.477-8.207-12.592-8.207-19.769c0-7.159, 2.743-14.288, 8.207-19.767
-	c 5.461-5.474, 12.591-8.193, 19.751-8.193c 7.096,0, 14.094,2.647, 19.588,7.982L 250.67,179.186l-24.036,27.176L 101.354,81.064z
-	 M 450.868,401.46l-14.551,14.585L 260.252,239.996l 55.036-48.645c 1.505,0.898, 2.91,1.961, 4.186,3.206l 131.395,173.971
-	c 5.231,5.214, 6.835,10.513, 6.835,16.463C 457.703,390.977, 455.447,396.914, 450.868,401.46z M 232.029,251.555l 14.129,14.127
-	c 7.521,7.523, 5.722,21.549-4.057,31.344l-115.73,115.73l-14.258-14.221l 102.288-102.277l-14.551-14.565L 97.562,383.965
-	l-14.945-14.916L 184.908,266.76l-14.588-14.555L 68.064,354.469L 53.837,340.24l 115.765-115.743
-	c 9.777-9.782, 23.808-11.599, 31.329-4.071l 14.126,14.127l 170.538-193.108c 5.463-5.36, 12.526-8.041, 19.623-8.041
-	c 7.195,0, 14.323,2.712, 19.784,8.19c 5.494,5.476, 8.175,12.59, 8.175,19.766c0,7.113-2.681,14.197-8.044,19.656L 232.029,251.555z"  />
-<glyph unicode="&#xe157;" d="M 408.908,393.642c-55.975,26.379-122.761,2.379-149.132-53.615
-	c-1.831-3.885-3.421-8.767-4.813-14.428c-1.391,5.661-2.984,10.543-4.814,14.428c-26.373,55.994-93.143,79.994-149.135,53.615
-	c-55.959-26.371-79.969-93.122-53.597-149.113c 26.369-55.989, 207.502-216.478, 207.502-216.478s 0.018,0.203, 0.042,0.515
-	c 0.026-0.312, 0.043-0.515, 0.043-0.515S 436.139,188.54, 462.506,244.529C 488.879,300.52, 464.903,367.271, 408.908,393.642z"  />
-<glyph unicode="&#xe158;" d="M 134.506,395.447l0-342.895 l 242.988,0 L 377.494,395.447 L 134.506,395.447 z M 349.078,80.967L 162.922,80.967 L 162.922,367.033 l 186.156,0 L 349.078,80.967 z M 296.834,355.193
-	L 174.76,355.193 l0-262.369 l 122.074,70.186L 296.834,355.193 z M 275.385,271.547l-19.459-11.191L 255.926,287.67 l 19.459,11.189L 275.385,271.547 z"  />
-<glyph unicode="&#xe159;" d="M 384.37,367.835c0,21.599-4.415,42.043-12.067,60.374l-3.223,7.667l-67.677,0 l0-24.948 l 50.805,0 
-	c 4.625-13.349, 7.242-27.862, 7.242-43.093c0-19.243-4.056-37.351-11.149-53.329c-7.865-0.174-15.535-4.056-20.213-11.095
-	c-17.232-25.712-43.099-41.002-71.55-41.017c-28.45,0.015-54.333,15.305-71.552,41.017c-4.709,7.062-12.392,10.938-20.274,11.095
-	c-7.080,15.978-11.152,34.085-11.152,53.329c 0.016,15.231, 2.617,29.745, 7.243,43.093l 44.425,0 L 205.228,435.876 l-61.314,0 l-3.172-7.667
-	c-7.686-18.331-12.1-38.775-12.1-60.374c0-23.532, 5.134-45.782, 14.225-65.453c-4.79-7.99-4.905-18.321, 0.605-26.597l0,0
-	c 19.44-29.368, 48.791-51.446, 83.143-59.724c0-1.076-0.033-2.153-0.033-3.241c-0.048-11.481, 0.916-24.432, 6.23-37.823
-	c 5.281-13.405, 13.9-26.045, 26.799-40.949c 4.938-5.684, 11.87-8.607, 18.836-8.607c 1.833,0, 3.646,0.227, 5.46,0.639
-	c 2.879-3.011, 5.921-6.127, 9.208-9.424c 15.974-15.903, 23.364-33.787, 23.281-47.486c-0.081-9.727-3.219-17.152-9.563-22.865
-	c-6.377-5.678-17.005-10.057-33.585-10.072c-14.421-0.068-26.456,7.98-35.381,17.2c-1.096,1.126-2.127,2.257-3.108,3.391
-	c 7.88,9.489, 12.623,21.69, 12.623,34.966c0,30.262-24.624,54.877-54.89,54.877c-30.265,0-54.857-24.615-54.857-54.877
-	c0-30.268, 24.593-54.869, 54.857-54.869c 7.979,0, 15.548,1.716, 22.4,4.787c 1.554-1.83, 3.222-3.709, 5.053-5.607
-	c 11.381-11.809, 29.268-24.756, 53.304-24.821l 0.132,0 c 20.846,0, 37.997,5.688, 50.032,16.384c 12.067,10.662, 18.003,25.939, 17.921,41.508
-	c-0.065,22.213-10.955,45.413-30.594,65.145c-3.023,3.015-5.869,5.892-8.518,8.654c 2.484,7.963, 0.947,16.979-4.939,23.76
-	c-10.985,12.637-15.824,20.779-18.033,26.462c-2.174,5.714-2.764,10.22-2.797,19.631c0,0.401,0,0.841,0,1.282
-	c 38.621,6.084, 71.848,29.505, 93.167,61.683c 5.495,8.282, 5.364,18.66, 0.557,26.645C 379.269,322.092, 384.37,344.313, 384.37,367.835z
-	 M 162.537,91.789c0,16.551, 13.424,29.939, 29.956,29.939c 16.529,0, 29.955-13.389, 29.955-29.939
-	c0-16.534-13.426-29.939-29.955-29.939C 175.961,61.85, 162.537,75.255, 162.537,91.789z"  />
-<glyph unicode="&#xe15a;" d="M 254.775,433.387c-115.387-0.014-208.906-93.533-208.918-208.92c 0.012-115.394, 93.531-208.91, 208.918-208.921
-	c 115.387,0.011, 208.902,93.527, 208.918,208.921C 463.678,339.854, 370.162,433.373, 254.775,433.387z M 379.488,99.752
-	c-31.972-31.938-75.957-51.645-124.709-51.65L 254.779,400.83 c 48.752-0.002, 92.737-19.713, 124.709-51.655
-	c 31.942-31.965, 51.646-75.951, 51.661-124.708C 431.134,175.714, 411.431,131.721, 379.488,99.752z"  />
-<glyph unicode="&#xe15b;" d="M 282.564,274.124c-1.862-1.504-3.337-3.367-4.414-5.624c-1.079-2.192-1.602-4.807-1.602-7.816
-	c0-4.709, 1.469-8.369, 4.511-10.92c 2.976-2.587, 7.915-4.646, 14.783-6.248l0,34.99 c-2.422,0-4.81-0.355-7.064-1.081
-	C 286.456,276.738, 284.396,275.562, 282.564,274.124z M 326.419,201.792c-3.502,2.778-9.484,5.297-17.924,7.612l0-41.2 
-	c 2.586,0.292, 5.266,0.879, 8.046,1.832c 2.812,0.945, 5.297,2.256, 7.521,3.987c 2.225,1.702, 4.025,3.826, 5.495,6.312
-	c 1.406,2.516, 2.126,5.496, 2.126,8.895C 331.684,194.824, 329.916,199.009, 326.419,201.792z M 302.021,398.325
-	c-44.671,0-85.417-16.905-116.221-44.637c-26.425-0.573-51.112-3.221-72.565-7.426c-24.56-4.801-44.865-11.705-58.076-19.126
-	c-8.83-4.945-14.192-10.076-16.123-13.478c-1.077-1.764-1.31-2.941-1.373-3.856c 0.063-1.012, 0.296-2.127, 1.373-3.96
-	c 1.113-1.896, 3.302-4.414, 6.639-7.13c 6.768-5.461, 18.182-11.412, 32.898-16.383c 15.37-5.295, 34.369-9.58, 55.657-12.456
-	c-2.647-9.78-4.446-19.883-5.364-30.219c-7.391,1.047-14.619,2.192-21.516,3.533c-26.816,5.298-49.674,12.723-67.171,22.496
-	c-0.849,0.491-1.665,1.016-2.517,1.476l0-27.179 c0-1.013, 0.228-2.188, 1.373-4.117c 1.113-1.929, 3.302-4.446, 6.639-7.163
-	c 6.768-5.457, 18.182-11.41, 32.898-16.385c 14.355-4.937, 31.785-8.959, 51.31-11.834c 1.503-11.055, 4.087-21.716, 7.553-31.986
-	c-10.464,1.273-20.537,2.85-30.085,4.678c-26.816,5.294-49.674,12.721-67.171,22.502c-1.209,0.715-2.354,1.375-3.53,2.090l0-23.542 
-	c0-1.216, 0.294-2.589, 1.507-4.614c 1.207-2.062, 3.462-4.707, 6.896-7.454c 6.866-5.559, 18.376-11.545, 33.16-16.55
-	c 20.536-7.029, 47.319-12.326, 77.472-14.947c 6.997-10.92, 15.171-20.99, 24.395-30.079c-26.096,0.852-50.654,3.56-72.531,7.879
-	c-26.718,5.267-49.479,12.652-66.844,22.366c-1.048,0.59-2.059,1.175-3.041,1.8l0-26.227 c0-1.081, 0.228-2.191, 1.373-4.157
-	c 1.113-1.894, 3.302-4.415, 6.639-7.158c 6.768-5.494, 18.182-11.413, 32.898-16.414c 29.463-10.041, 71.977-16.646, 118.901-16.613
-	c 13.308,0, 26.228,0.552, 38.589,1.567c 20.342-8.37, 42.609-13.012, 65.958-13.012c 96.013,0, 173.845,77.827, 173.845,173.842
-	C 475.865,320.43, 398.033,398.325, 302.021,398.325z M 302.021,75.559c-82.112,0-148.888,66.777-148.888,148.894
-	c0,82.114, 66.775,148.889, 148.888,148.889c 82.116,0, 148.893-66.774, 148.893-148.889
-	C 450.913,142.336, 384.137,75.559, 302.021,75.559z M 302.021,346.326c-67.3,0-121.845-54.54-121.845-121.874
-	c0-67.272, 54.545-121.883, 121.845-121.883c 67.302,0, 121.88,54.61, 121.88,121.883C 423.9,291.786, 369.322,346.326, 302.021,346.326z
-	 M 359.774,176.053c-1.569-4.777-4.384-9.48-8.472-14.062c-4.053-4.546-9.549-8.634-16.416-12.229
-	c-6.867-3.565-15.664-5.728-26.392-6.444l0-18.214 l-12.652,0 l0,18.214 c-16.024,1.179-28.55,6.116-37.543,14.782
-	c-9.025,8.761-14.227,21.547-15.664,38.423l 30.249,0 c-0.13-8.14, 1.995-14.554, 6.439-19.295c 4.452-4.706, 9.942-7.716, 16.519-9.024
-	l0,44.868 c-0.689,0.255-1.7,0.585-2.911,0.943c-1.21,0.365-2.521,0.692-3.957,0.984c-5.299,1.44-10.496,3.109-15.664,5.035
-	c-5.135,1.929-9.747,4.481-13.834,7.718c-4.055,3.237-7.326,7.228-9.776,12.034c-2.419,4.772-3.633,10.726-3.633,17.919
-	c0,7.258, 1.409,13.735, 4.22,19.297c 2.747,5.556, 6.445,10.267, 11.022,14.060c 4.576,3.729, 9.874,6.705, 15.86,8.764
-	c 6.014,2.061, 12.23,3.339, 18.673,3.793l0,16.514 l 12.652,0 l0-16.514 c 6.444-0.719, 12.494-2.121, 18.117-4.183
-	c 5.692-2.097, 10.628-4.973, 14.913-8.635c 4.316-3.628, 7.816-8.144, 10.532-13.572c 2.712-5.46, 4.281-11.903, 4.707-19.33l-30.445,0 
-	c-0.163,5.729-1.931,10.601-5.364,14.589c-3.432,4.023-7.586,6.018-12.46,6.018l0-38 c 1.735-0.389, 3.469-0.851, 5.266-1.243
-	c 1.768-0.456, 3.663-0.948, 5.659-1.504c 10.596-2.911, 18.771-6.439, 24.492-10.624c 5.691-4.25, 9.941-8.635, 12.655-13.247
-	c 2.718-4.545, 4.316-9.124, 4.808-13.702c 0.49-4.579, 0.783-8.668, 0.783-12.231C 362.158,184.815, 361.343,180.861, 359.774,176.053z"  />
-<glyph unicode="&#xe15c;" d="M 345.851,368.282c-13.887,11.019-29.273,19.98-45.732,26.639l-8.881-21.952c 14.36-5.808, 27.783-13.627, 39.896-23.238
-			L 345.851,368.282zM 129.104,348.508l-14.965,18.351c-13.728-11.191-25.768-24.316-35.789-39.006l 19.562-13.341
-			C 106.649,327.318, 117.144,338.755, 129.104,348.508zM 84.845,291.516L 63.372,301.5c-7.492-16.116-12.619-33.172-15.236-50.696l 23.42-3.498
-			C 73.837,262.584, 78.31,277.461, 84.845,291.516zM 179.363,376.23c 4.757,1.604, 9.634,3.006, 14.497,4.16l-5.479,23.037c-5.568-1.322-11.152-2.927-16.596-4.763
-			c-11.342-3.835-22.32-8.761-32.633-14.643l 11.736-20.567C 159.882,368.587, 169.462,372.885, 179.363,376.23zM 69.821,220.937l-23.676-0.406c 0.303-17.68, 3.168-35.262, 8.516-52.258l 22.586,7.105
-			C 72.585,190.205, 70.085,205.533, 69.821,220.937zM 265.997,380.852l 5.182,23.105c-17.291,3.88-35.195,5.247-52.809,4.034l 1.621-23.623
-			C 235.333,385.421, 250.931,384.229, 265.997,380.852zM 335.323,100.97l 15.355-18.022c 13.484,11.485, 25.242,24.863, 34.947,39.76l-19.841,12.926
-			C 357.323,122.644, 347.075,110.983, 335.323,100.97zM 282.431,71.058c-3.678-1.242-7.434-2.363-11.164-3.336l 5.961-22.915c 4.271,1.11, 8.572,2.396, 12.779,3.815
-			c 12.599,4.254, 24.721,9.852, 36.031,16.631l-12.174,20.309C 304.003,79.649, 293.428,74.77, 282.431,71.058zM 66.063,140.198c 8.002-15.858, 18.24-30.44, 30.424-43.345l 17.216,16.257c-10.612,11.238-19.528,23.942-26.503,37.756
-			L 66.063,140.198zM 398.018,280.087c-3.937-4.846-7.824-9.697-11.622-14.552c 3.168-11.715, 5.021-23.699, 5.488-35.756l 23.66,0.915
-			c-0.68,17.655-3.918,35.169-9.623,52.062L 398.018,280.087zM 378.366,158.896l 21.678-9.526c 7.152,16.271, 11.915,33.435, 14.157,51.011l-23.488,2.996
-			C 388.758,188.055, 384.603,173.090, 378.366,158.896zM 119.048,76.597c 14.123-10.724, 29.695-19.358, 46.285-25.668l 8.415,22.135c-14.474,5.505-28.060,13.038-40.38,22.392
-			L 119.048,76.597zM 199.149,65.719l-4.689-23.211c 11.975-2.418, 24.229-3.645, 36.416-3.645c 5.477,0, 11.019,0.249, 16.473,0.74l-2.128,23.584
-			C 229.894,61.807, 214.271,62.668, 199.149,65.719zM 456.454,409.137c-111.037-68.079-191.607-153.974-227.811-197.074l-88.654,69.46l-39.152-31.562L 254.030,94.161
-			c 26.365,67.535, 109.865,199.522, 211.824,293.302L 456.454,409.137z"  />
-<glyph unicode="&#xe15d;" d="M 37.992,416.356l0-383.329 l 436.402,0 L 474.394,416.356 L 37.992,416.356 z M 79.65,235.791c 146.979,16.055, 157.588,132.643, 157.588,132.643L 237.238,389.654 
-	l 37.937,0 l0-21.221 c0,0, 10.319-113.693, 152.114-132c-59.682-13.412-62.119-135.697-61.236-176.709l-227.57,0 
-	C 139.363,100.182, 136.979,219.636, 79.65,235.791z"  />
-<glyph unicode="&#xe15e;" d="M 38.744,118.837l 49.97,0 l0,32.422 l-49.97,0 L 38.744,118.837 z M 38.744,237.477l 49.97,0 l0,32.442 l-49.97,0 L 38.744,237.477 z M 38.744,178.154l 49.97,0 
-	l0,32.411 l-49.97,0 L 38.744,178.154 z M 38.744,296.83l 49.97,0 l0,32.397 l-49.97,0 L 38.744,296.83 z M 474.033,151.259l-69.112,0 l0,26.896 l 69.112,0 l0,32.411 l-69.112,0 
-	l0,26.943 l 69.112,0 l0,32.41 l-69.112,0 l0,26.897 l 69.098,0 l0,60.289 l-32.391,0 l-0.017-27.863l-36.69,0 l0,18.457 c0,14.062-11.38,25.459-25.442,25.459
-	L 132.14,373.158 c-14.062,0-25.458-11.396-25.458-25.459l0-247.34 c0-14.062, 11.396-25.442, 25.458-25.442l 247.339,0 
-	c 14.062,0, 25.442,11.38, 25.442,25.442l0,18.479 l 36.69,0 l0-24.266 l 32.422,0 L 474.033,151.259 z M 369.586,110.268L 142.034,110.268 L 142.034,337.822 l 227.552,0 L 369.586,110.268 z
-	 M 344.668,312.87L 166.967,312.87 l0-177.649 l 177.701,0 L 344.668,312.87 z"  />
-<glyph unicode="&#xe15f;" d="M 352.328,319.846L 160.451,319.846 l0-191.861 l 191.877,0 L 352.328,319.846 z M 436.191,440.723L 76.586,440.723 c-20.437,0-37.016-16.562-37.016-37.014l0-359.586 
-	c0-20.439, 16.579-37.021, 37.016-37.021l 359.605,0 c 20.455,0, 37.020,16.582, 37.020,37.021L 473.211,403.708 
-	C 473.211,424.161, 456.646,440.723, 436.191,440.723z M 329.158,409.169l 32.424,0 l0-42.824 l-32.424,0 L 329.158,409.169 z M 269.855,409.169l 32.406,0 l0-42.839 
-	l-32.406,0 L 269.855,409.169 z M 210.518,409.169l 32.407,0 l0-42.824 l-32.407,0 L 210.518,409.169 z M 151.179,409.169l 32.442,0 l0-42.824 l-32.442,0 L 151.179,409.169 z M 113.966,118.729
-	L 71.16,118.729 l0,32.406 l 42.806,0 L 113.966,118.729 z M 113.966,178.050L 71.16,178.050 l0,32.409 l 42.806,0 L 113.966,178.050 z M 113.966,237.37L 71.16,237.37 l0,32.421 l 42.806,0 L 113.966,237.37 z
-	 M 113.966,296.693L 71.16,296.693 l0,32.42 l 42.806,0 L 113.966,296.693 z M 183.621,38.675l-32.442,0 l0,42.805 l 32.442,0 L 183.621,38.675 z M 242.925,38.675l-32.407,0 
-	l0,42.805 l 32.407,0 L 242.925,38.675 z M 302.262,38.675l-32.406,0 l0,42.805 l 32.406,0 L 302.262,38.675 z M 361.582,38.675l-32.424,0 l0,42.805 l 32.424,0 L 361.582,38.675 z
-	 M 380.647,99.645L 132.115,99.645 L 132.115,348.162 l 248.532,0 L 380.647,99.645 z M 441.636,118.71L 398.83,118.71 l0,32.425 l 42.806,0 L 441.636,118.71 z M 441.636,178.050L 398.83,178.050 l0,32.409 
-	l 42.806,0 L 441.636,178.050 z M 441.636,237.37L 398.83,237.37 l0,32.406 l 42.806,0 L 441.636,237.37 z M 441.636,296.693L 398.83,296.693 l0,32.42 l 42.806,0 L 441.636,296.693 z"  />
-<glyph unicode="&#xe160;" d="M 357.312,51.342L 357.312,95.78 L 170.144,95.78 l0-44.438 L 143.56,51.342 l0-46.436 l 240.325,0 l0,46.436 L 357.312,51.342 z M 127.749,322.096
-	c-0.133-0.216, 0.047-0.18, 0.472,0.063C 128.107,322.47, 127.959,322.47, 127.749,322.096z M 178.892,271.768
-	c 13.23,11.429, 13.458,12.23, 25.916,18.377c 4.743,2.324, 18.935-3.845, 18.935-3.845s 21.42-4.463, 31.477-4.463
-	c 4.365,0, 8.223,1.897, 11.199,4.041c-15.532-15.241-55.494-56.379-68.231-87.902c-12.118-30.002-10.659-61.414-9.272-74.758l 156.282,0 
-	c-1.816,12.067-2.73,40.896, 15.697,88.166c 25.163,64.586, 23.479,125.801-17.612,179.481c-20.256,26.46-47.842,33.746-70.616,34.354
-	C 256.444,441.67, 223.89,443.176, 223.89,443.176l 7.227-27.834l 0.605-11.052l-28.501-11.738c0,0-10.071-2.521-10.071-11.757
-	c0-8.604-58.846-55.282-64.93-58.636c 0.767-2.34-1.324-22.022-1.324-29.415c0-8.404, 8.207-13.115, 8.207-13.115l 10.091-5.835
-	C 145.194,273.795, 166.303,260.895, 178.892,271.768z"  />
-<glyph unicode="&#xe161;" d="M 458.229,421.705c-117.414-71.987-202.611-162.818-240.894-208.393l-93.748,73.448L 82.19,253.388l 161.993-164.745
-		c 27.879,71.411, 116.173,210.977, 223.986,310.143L 458.229,421.705zM 351.719,213.689l0-137.147 c0-13.808-11.232-25.040-25.039-25.040L 92.917,51.502 c-13.807,0-25.040,11.232-25.040,25.040L 67.877,322.713 
-	c0,13.805, 11.233,25.039, 25.040,25.039l 210.66,0 c 9.376,8.131, 19.151,16.358, 29.306,24.617c-2.035,0.25-4.097,0.421-6.203,0.421L 92.917,372.79 
-	c-27.66,0-50.080-22.419-50.080-50.077l0-246.171 c0-27.659, 22.42-50.081, 50.080-50.081L 326.68,26.461 c 27.658,0, 50.080,22.422, 50.080,50.081
-	L 376.76,247.601 C 368.254,236.479, 359.896,225.164, 351.719,213.689z"  />
-<glyph unicode="&#xe162;" d="M 372.426,397.893c 27.657,0, 50.078-22.42, 50.078-50.076l0-246.175 c0-27.653-22.421-50.075-50.078-50.075L 138.66,51.567 
-		c-27.655,0-50.076,22.422-50.076,50.075L 88.584,347.816 c0,27.656, 22.421,50.076, 50.076,50.076L 372.426,397.892  M 372.426,372.854L 138.66,372.854 
-		c-13.806,0-25.039-11.231-25.039-25.038l0-246.175 c0-13.803, 11.233-25.038, 25.039-25.038l 233.766,0 c 13.806,0, 25.040,11.235, 25.040,25.038
-		L 397.466,347.816 C 397.466,361.623, 386.231,372.854, 372.426,372.854L 372.426,372.854z"  />
-<glyph unicode="&#xe163;" d="M 78.958,336.887c 0.006,35.215, 28.54,63.748, 63.751,63.754l0,0L 142.709,375.6 c-21.378-0.035-38.674-17.332-38.714-38.713l0,0l 0.007,0 
-			L 78.958,336.887 L 78.958,336.887zM 78.958,266.439L 78.958,317.671L 103.994,317.671L 103.994,266.439L 78.958,266.439 		zM 78.956,199.551L 78.956,250.783L 103.995,250.783L 103.995,199.551L 78.956,199.551 		zM 78.959,131.244L 78.959,182.475L 103.994,182.475L 103.994,131.244L 78.959,131.244 		zM 406.284,266.439L 406.284,317.671L 431.324,317.671L 431.324,266.439L 406.284,266.439 		zM 406.284,199.551L 406.284,250.783L 431.322,250.783L 431.322,199.551L 406.284,199.551 		zM 406.287,131.244L 406.287,182.475L 431.32,182.475L 431.32,131.244L 406.287,131.244 		zM 296.405,48.982L 296.405,74.027L 347.638,74.027L 347.638,48.982L 296.405,48.982 		zM 229.517,48.982L 229.517,74.027L 280.75,74.027L 280.75,48.982L 229.517,48.982 		zM 161.218,48.982L 161.218,74.027L 212.451,74.027L 212.451,48.982L 161.218,48.982 		zM 296.405,375.605L 296.405,400.643L 347.642,400.643L 347.642,375.605L 296.405,375.605 		zM 229.517,375.605L 229.517,400.643L 280.747,400.643L 280.747,375.605L 229.517,375.605 		zM 161.213,375.605L 161.213,400.643L 212.448,400.643L 212.448,375.605L 161.213,375.605 		zM 78.956,113.55l 25.042,0 c 0.036-21.369, 17.337-38.669, 38.71-38.705l0,0l0-0.006 l0-25.033 
-			C 107.494,49.81, 78.963,78.34, 78.956,113.55L 78.956,113.55zM 366.861,74.843c 21.373,0.034, 38.668,17.33, 38.71,38.705l0,0l 25.035,0 c-0.008-35.208-28.53-63.738-63.745-63.746l0,0
-			L 366.861,74.843 L 366.861,74.843zM 405.569,336.887c-0.040,21.371-17.339,38.678-38.708,38.713l0,0L 366.861,400.641 c 35.214-0.006, 63.737-28.539, 63.745-63.754l0,0
-			L 405.569,336.887 L 405.569,336.887z"  />
-<glyph unicode="&#xe164;" d="M 458.696,423.766c-117.413-71.99-202.609-162.818-240.893-208.393l-93.746,73.448l-41.401-33.374l 161.993-164.745
-			c 27.878,71.409, 116.176,210.979, 223.989,310.144L 458.696,423.766zM 66.423,89.285L 41.388,89.285 c 0.007-35.213, 28.536-63.739, 63.746-63.755l0,25.045 C 83.764,50.609, 66.46,67.913, 66.423,89.285z
-	 M 66.422,226.515L 41.384,226.515 l0-51.229 l 25.039,0 L 66.423,226.515 z M 41.384,312.615l 25.045,0 c 0.034,21.383, 17.334,38.686, 38.708,38.72l0,25.034 
-	C 69.922,376.365, 41.39,347.835, 41.384,312.615z M 66.422,158.207L 41.387,158.207 l0-51.232 l 25.036,0 L 66.423,158.207 z M 66.429,293.408L 41.384,293.408 l0-51.234 
-	l 25.045,0 L 66.429,293.408 z M 393.747,270.775c-7.499-9.377-14.909-18.913-22.208-28.602l 22.208,0 L 393.747,270.775 z M 310.065,354.996l0,21.375 l-51.227,0 
-	l0-25.036 l 46.974,0 C 307.223,352.553, 308.637,353.773, 310.065,354.996z M 123.644,24.721l 51.236,0 l0,25.041 l-51.236,0 L 123.644,24.721 z
-	 M 368.716,106.975l 25.033,0 l0,51.232 l-25.033,0 L 368.716,106.975 z M 329.289,50.579l0-25.049 c 35.217,0.012, 63.738,28.542, 63.744,63.755l-25.034,0 
-	C 367.955,67.903, 350.665,50.615, 329.289,50.579z M 368.712,226.515l0-51.229 l 25.037,0 l0,51.229 L 368.712,226.515 z M 123.645,351.335l 51.235,0 
-	l0,25.036 l-51.235,0 L 123.645,351.335 z M 191.945,351.335l 51.233,0 l0,25.036 l-51.233,0 L 191.945,351.335 z M 191.948,24.721l 51.226,0 l0,25.041 l-51.226,0 L 191.948,24.721 z
-	 M 258.833,24.721l 51.237,0 l0,25.041 l-51.237,0 L 258.833,24.721 z"  />
-<glyph unicode="&#xe165;" d="M 461.884,411.86c-132.601-81.297-228.817-183.87-272.048-235.345L 83.962,259.465l-46.751-37.691l 182.941-186.049
-	c 31.485,80.646, 131.198,238.264, 252.956,350.252L 461.884,411.86z"  />
-<glyph unicode="&#xe166;" d="M 257.047,410.846c-120.559,2.372-219.795-71.915-221.646-165.93
-	c-0.644-32.686, 10.574-63.443, 30.541-89.777l-0.004,0 c 34.338-44.117-3.14-119.956-3.14-119.956l 110.649,47.655
-	c 23.838-7.533, 49.743-11.921, 76.888-12.456c 120.56-2.376, 219.795,71.915, 221.647,165.929
-	C 473.835,330.328, 377.605,408.469, 257.047,410.846z"  />
-<glyph unicode="&#xe167;" d="M 258.809,410.838C 138.25,413.216, 39.013,338.924, 37.163,244.91
-	c-0.645-32.685, 10.575-63.449, 30.542-89.779l-0.006,0 c 34.338-44.114-3.139-119.951-3.139-119.951l 110.65,47.653
-	c 23.839-7.533, 49.743-11.921, 76.89-12.456c 120.557-2.375, 219.793,71.911, 221.644,165.929
-	C 475.598,330.321, 379.367,408.461, 258.809,410.838z M 162.125,213.572c-14.852,0-26.891,12.041-26.891,26.891
-	c0,14.851, 12.039,26.893, 26.891,26.893s 26.893-12.042, 26.893-26.893C 189.018,225.613, 176.977,213.572, 162.125,213.572z
-	 M 251.763,213.572c-14.853,0-26.891,12.041-26.891,26.891c0,14.851, 12.039,26.893, 26.891,26.893s 26.892-12.042, 26.892-26.893
-	C 278.654,225.613, 266.615,213.572, 251.763,213.572z M 341.4,213.572c-14.854,0-26.893,12.041-26.893,26.891
-	c0,14.851, 12.039,26.893, 26.893,26.893c 14.852,0, 26.891-12.042, 26.891-26.893C 368.291,225.613, 356.252,213.572, 341.4,213.572z"  />
-<glyph unicode="&#xe168;" d="M 176.104,286.456c 7.332,0, 14.13,2.278, 19.737,6.149l 56.162-33.617c-0.075-0.933-0.14-1.865-0.14-2.818
-	c0-19.226, 15.588-34.812, 34.814-34.812s 34.812,15.586, 34.812,34.812c0,4.352-0.837,8.494-2.289,12.336l 65.131,69.887l 38.255-33.073
-	l 23.125,123.154l-118.525-40.68l 33.846-29.259l-64.329-69.032c-3.176,0.955-6.541,1.48-10.025,1.48
-	c-6.961,0-13.431-2.065-18.872-5.584l-56.976,34.104c 0.029,0.59, 0.088,1.168, 0.088,1.765c0,19.226-15.585,34.812-34.814,34.812
-	c-19.225,0-34.811-15.585-34.811-34.812c0-3.328, 0.496-6.535, 1.366-9.582l-46.381-42.625l0-41.801 l 67.073,61.637
-	C 167.306,287.339, 171.596,286.456, 176.104,286.456z M 176.104,161.51c 9.608,0, 18.305,3.894, 24.605,10.186l 100.027-37.271
-	c 1.762-17.577, 16.597-31.301, 34.633-31.301c 19.229,0, 34.814,15.591, 34.814,34.817c0,4.702-0.943,9.183-2.634,13.273l 58.639,66.622
-	l 22.638-17.463l 10.931,83.692l-78.181-31.809l 20.195-15.584l-57.349-65.15c-2.893,0.778-5.915,1.23-9.054,1.23
-	c-9.242,0-17.619-3.625-23.852-9.502l-100.929,37.605c-2.225,17.083-16.794,30.282-34.485,30.282
-	c-19.225,0-34.811-15.585-34.811-34.812c0-0.961, 0.063-1.907, 0.144-2.847l-45.158-27.788l0-36.145 l 60.987,37.528
-	C 162.7,163.568, 169.156,161.51, 176.104,161.51z M 72.282,41.743l0,0.39 l-1.044,0 L 71.238,437.648 l-29.73,0 L 41.508,10.97 l 426.675,0 l0,30.773 L 72.282,41.743 z"  />
-<glyph unicode="&#xe169;" d="M 157.117,38.715l 51.141,0 L 208.258,220.346 l-51.141-51.176L 157.117,38.715 z M 86.806,98.851l0-60.136 l 51.146,0 L 137.952,150.010 l-35.319-35.33
-	L 86.806,98.851z M 227.422,38.748l 51.146,0 L 278.568,179.146 l-51.146,51.146L 227.422,38.748 z M 297.734,173.178l0-134.463 l 51.143,0 L 348.877,224.339 l-40.093-40.123
-	L 297.734,173.178z M 368.074,38.715l 51.111,0 L 419.185,294.647 L 368.074,243.5L 368.074,38.715 z M 347.73,398.637l 33.915-33.941l 0.197-0.198
-	l-90.683-90.714l-68.35,68.33L 48.807,168.090l 36.17-36.143l0,0l 137.834,137.846l 68.35-68.33L 418.008,328.33l 33.75-33.748
-	l 11.018,115.043L 347.73,398.637z"  />
-<glyph unicode="&#xe16a;" d="M 136.612,336.776L 385.538,336.776L 385.538,307.669L 136.612,307.669zM 181.702,284.156L 340.45,284.156L 340.45,255.050L 181.702,255.050zM 107.187,213.497L 282.037,213.497L 282.037,126.607L 107.187,126.607zM 321.834,170.051A45.704,45.704 180 1 1 413.242,170.051A45.704,45.704 180 1 1 321.834,170.051zM 49.522,397.013L 49.522,54.763L 319.649,54.763L 319.649,78.442L 73.202,78.442L 73.202,373.334L 438.798,373.334L 438.798,78.442L 415.429,78.442L 415.429,54.763L 462.478,54.763L 462.478,397.013 	zM 343.327,107.014l0-61.074 l 24.211,11.566l 24.211-11.566l0,61.074 c-7.521-2.898-15.68-4.505-24.211-4.505
-		S 350.847,104.116, 343.327,107.014z"  />
-<glyph unicode="&#xe16b;" d="M 424.213,225.090c-0.012,0.688-0.078,1.373-0.209,2.057c-0.025,0.129-0.059,0.256-0.090,0.385
-		c-0.059,0.25-0.102,0.5-0.174,0.746L 373.297,397.65c-1.492,5.018-6.107,8.457-11.346,8.457L 150.047,406.107 
-		c-5.238,0-9.852-3.439-11.346-8.457L 88.26,228.277c-0.074-0.246-0.117-0.496-0.176-0.746c-0.031-0.129-0.064-0.256-0.090-0.385
-		c-0.133-0.684-0.197-1.369-0.209-2.057c0-0.064-0.018-0.125-0.018-0.191L 87.767,53.73 c0-6.535, 5.299-11.838, 11.838-11.838l 312.787,0 
-		c 6.539,0, 11.838,5.303, 11.838,11.838L 424.23,224.898 C 424.231,224.965, 424.213,225.025, 424.213,225.090z M 158.875,382.43l 194.248,0 
-		l 43.389-145.689L 115.487,236.741 L 158.875,382.43zM 173.28,331.469L 338.719,331.469L 338.719,302.014L 173.28,302.014zM 185.309,370.588L 326.69,370.588L 326.69,351.649L 185.309,351.649zM 157.936,282.096L 354.063,282.096L 354.063,248.28L 157.936,248.28z"  />
-<glyph unicode="&#xe16c;" d="M 127.863,372.871L 210.942,372.871L 210.942,314.051L 127.863,314.051zM 414.447,244.216l-38.717,54.88L 375.73,395.157 L 234.543,395.157 l0-104.709 L 134.060,290.448 l-32.617-46.232l0-75.178 l 313.005,0 L 414.448,244.216 z M 264.56,364.475
-		l 80.488,0 l0-34.724 L 264.56,329.751 L 264.56,364.475 z M 155.713,195.505c-9.163,0-16.592,7.427-16.592,16.595c0,9.165, 7.429,16.592, 16.592,16.592
-		c 9.167,0, 16.597-7.427, 16.597-16.592C 172.31,202.932, 164.88,195.505, 155.713,195.505z M 190.854,236.35
-		c-9.163,0-16.592,7.429-16.592,16.594c0,9.164, 7.429,16.593, 16.592,16.593c 9.166,0, 16.594-7.429, 16.594-16.593
-		C 207.448,243.778, 200.021,236.35, 190.854,236.35z M 222.089,195.505c-9.163,0-16.59,7.427-16.59,16.595
-		c0,9.165, 7.427,16.592, 16.59,16.592c 9.166,0, 16.595-7.427, 16.595-16.592C 238.684,202.932, 231.255,195.505, 222.089,195.505z
-		 M 257.233,236.35c-9.168,0-16.597,7.429-16.597,16.594c0,9.164, 7.429,16.593, 16.597,16.593c 9.163,0, 16.592-7.429, 16.592-16.593
-		C 273.825,243.778, 266.396,236.35, 257.233,236.35z M 288.468,195.505c-9.166,0-16.596,7.427-16.596,16.595
-		c0,9.165, 7.43,16.592, 16.596,16.592c 9.163,0, 16.592-7.427, 16.592-16.592C 305.060,202.932, 297.631,195.505, 288.468,195.505z
-		 M 323.607,236.35c-9.161,0-16.595,7.429-16.595,16.594c0,9.164, 7.434,16.593, 16.595,16.593c 9.163,0, 16.596-7.429, 16.596-16.593
-		C 340.203,243.778, 332.771,236.35, 323.607,236.35z M 354.842,195.505c-9.163,0-16.595,7.427-16.595,16.595
-		c0,9.165, 7.432,16.592, 16.595,16.592c 9.165,0, 16.595-7.427, 16.595-16.592C 371.437,202.932, 364.007,195.505, 354.842,195.505zM 74.21,139.749L 437.788,139.749L 437.788,61.249L 74.21,61.249z"  />
-<glyph unicode="&#xe16d;" d="M 444.912,228.866c0,13.344-10.824,24.17-24.167,24.17l-11.251,0 l-31.559,100.262l-0.326,0.786
-	c-4.822,11.345-13.031,20.010-22.562,26.421c-9.583,6.312-20.715,10.562-33.062,10.663L 185.553,391.168 
-	c-12.329-0.101-23.479-4.352-33.061-10.663c-9.514-6.411-17.724-15.076-22.547-26.421l-0.344-0.803L 98.077,253.036l-7.621,0 
-	c-13.341,0-24.167-10.826-24.167-24.17l0-108.484 l 22.924,0 l0-31.085 c0-18.214, 14.749-32.949, 32.948-32.949
-	c 18.198,0, 32.944,14.735, 32.944,32.949l0,31.085 l 199.841,0 l0-31.085 c0-18.183, 14.747-32.949, 32.948-32.949
-	c 18.196,0, 32.946,14.767, 32.946,32.949l0,31.085 l 24.070,0 L 444.91,228.866 z M 387.896,217.258c 15.093,0, 27.323-12.215, 27.323-27.303
-	c0-15.078-12.23-27.309-27.323-27.309c-15.092,0-27.292,12.23-27.292,27.309C 360.604,205.043, 372.804,217.258, 387.896,217.258z
-	 M 164.757,340.35c 1.275,2.681, 4.447,6.411, 8.483,9.025c 4.333,2.972, 9.435,4.46, 12.313,4.381l 136.432,0 
-	c 2.894,0.079, 8.014-1.41, 12.327-4.381c 4.058-2.615, 7.214-6.345, 8.503-9.025l 27.455-87.313L 137.268,253.037 L 164.757,340.35z M 122.163,162.646
-	c-15.093,0-27.325,12.23-27.325,27.309c0,15.088, 12.231,27.303, 27.325,27.303c 15.076,0, 27.29-12.215, 27.29-27.303
-	C 149.452,174.877, 137.238,162.646, 122.163,162.646z"  />
-<glyph unicode="&#xe16e;" d="M 254.834,426.951l 183.224-196.96l-82.808,0 l0-79.194 L 154.412,150.797 l0,79.194 L 71.611,229.991 L 254.834,426.951 M 254.834,390.188L 129.101,255.031
-		l 25.311,0 l 25.038,0 l0-25.040 l0-54.157 l 150.763,0 l0,54.157 l0,25.040 l 25.038,0 l 25.317,0 L 254.834,390.188L 254.834,390.188zM 355.251,114.357l0-92.211 L 154.412,22.146 l0,92.211 L 355.251,114.357  M 330.213,89.318L 179.452,89.318 l0-42.133 l 150.761,0 L 330.213,89.318 L 330.213,89.318z"  />
-<glyph unicode="&#xe16f;" d="M 429.279,350.338c-6.606,3.19-6.379,31.803-11.872,37.311c-6.377,6.379-31.623-0.209-35.155,7.34
-			c-10.529,22.646, 0.164,50.117-45.88,4.074c-24.952-24.969-22.628-53.481-12.101-74.083c-13.997,7.801-30.020,11.673-46.762,11.673
-			c-31.885,0-66.222-13.996-93.265-41.025c-41.205-41.203-52.029-99.331-29.303-140.027c-20.6,10.562-49.151,12.887-74.133-12.084
-			c-46.044-46.062-18.574-35.366, 4.087-45.882c 7.556-3.516, 0.947-28.775, 7.358-35.154c 5.493-5.509, 34.107-5.281, 37.281-11.867
-			c 11.64-24.004-4.416-47.715, 43.755,0.453c 24.395,24.416, 22.726,52.225, 12.752,72.716c 14.389-8.456, 31.033-12.591, 48.399-12.591
-			c 31.916,0, 66.222,13.979, 93.264,41.008c 41.728,41.756, 52.354,100.885, 28.386,141.648c 20.503-9.976, 48.331-11.661, 72.728,12.77
-			C 476.988,354.786, 453.282,338.731, 429.279,350.338z M 297.229,289.48c-37.508-10.969-62.363-35.237-78.584-58.519
-			c-16.154-23.22-23.184-45.178-24.428-49.461c-0.161-0.556-0.161-0.718-0.161-0.718c-1.505-5.577-6.542-9.274-12.067-9.274
-			c-1.079,0-2.125,0.13-3.205,0.428c-6.641,1.764-10.596,8.58-8.864,15.24c 0.23,0.812, 6.64,24.916, 24.724,52.748
-			c 17.988,27.761, 48.201,59.628, 95.619,73.48c 6.607,1.943, 13.541-1.865, 15.435-8.472
-			C 307.661,298.327, 303.868,291.409, 297.229,289.48z"  />
-<glyph unicode="&#xe170;" d="M 255.981,39.266c-4.422,0-8.895,0.159-13.293,0.471l 1.682,23.62c 15.395-1.095, 31.076,0.014, 46.053,3.277l 5.039-23.137
-		C 282.566,40.69, 269.285,39.266, 255.981,39.266L 255.981,39.266z M 212.728,44.36c-17.25,4.14-33.795,10.753-49.174,19.657
-		l 11.864,20.49c 13.399-7.758, 27.812-13.518, 42.833-17.123L 212.728,44.36L 212.728,44.36z M 324.462,52.38l-8.781,21.991
-		c 14.336,5.722, 27.779,13.494, 39.949,23.097l 14.666-18.593C 356.333,67.862, 340.913,58.948, 324.462,52.38L 324.462,52.38z
-		 M 138.647,81.306c-13.703,11.28-25.697,24.439-35.652,39.114l 19.596,13.293c 8.686-12.803, 19.15-24.283, 31.105-34.125
-		L 138.647,81.306L 138.647,81.306z M 392.481,99.522l-17.492,15.96c 10.447,11.453, 19.172,24.303, 25.924,38.192l 21.297-10.353
-		C 414.464,127.39, 404.462,112.655, 392.481,99.522L 392.481,99.522z M 88.097,146.817c-7.424,16.118-12.462,33.205-14.977,50.791
-		l 23.438,3.355c 2.193-15.318, 6.582-30.205, 13.047-44.243L 88.097,146.817L 88.097,146.817z M 433.179,171.615l-22.711,6.705
-		c 4.355,14.761, 6.566,30.131, 6.566,45.679l 23.678,0 C 440.712,206.181, 438.179,188.555, 433.179,171.615L 433.179,171.615z M 94.96,227.366
-		l-23.672,0.483c 0.365,17.809, 3.266,35.378, 8.625,52.224l 22.566-7.181C 97.808,258.215, 95.276,242.896, 94.96,227.366L 94.96,227.366z
-		 M 415.841,243.712c-1.872,15.366-5.949,30.34-12.115,44.503l 21.713,9.45c 7.075-16.261, 11.758-33.45, 13.908-51.088L 415.841,243.712
-		L 415.841,243.712z M 112.546,297.33l-21.072,10.798c 8.075,15.768, 18.385,30.292, 30.633,43.168l 17.154-16.319
-		C 128.583,323.744, 119.591,311.078, 112.546,297.33L 112.546,297.33z M 391.226,311.485c-8.412,12.978-18.637,24.672-30.389,34.763
-		l 15.426,17.966c 13.467-11.563, 25.188-24.97, 34.832-39.846L 391.226,311.485L 391.226,311.485z M 158.987,352.586l-14.273,18.894
-		c 14.185,10.717, 29.789,19.31, 46.375,25.533l 8.322-22.169C 184.956,369.418, 171.356,361.932, 158.987,352.586L 158.987,352.586z
-		 M 339.431,361.776c-13.238,8.038-27.527,14.1-42.466,18.020l 6.009,22.903c 17.15-4.498, 33.553-11.457, 48.748-20.684L 339.431,361.776
-		L 339.431,361.776z M 224.825,382.044l-4.553,23.239c 11.684,2.289, 23.697,3.45, 35.705,3.45l 0.004,0 c 5.711,0, 11.473-0.266, 17.129-0.786
-		l-2.174-23.58C 255.63,385.781, 239.864,384.991, 224.825,382.044L 224.825,382.044z"  />
-<glyph unicode="&#xe171;" d="M 228.807,95.843c0,9.911-8.061,17.972-17.971,17.972s-17.971-8.061-17.971-17.972c0-9.906, 8.061-17.971, 17.971-17.971
-		S 228.807,85.937, 228.807,95.843zM 394.557,95.843c0,9.911-8.062,17.972-17.971,17.972c-9.91,0-17.971-8.061-17.971-17.972
-		c0-9.906, 8.061-17.971, 17.971-17.971C 386.494,77.872, 394.557,85.937, 394.557,95.843zM 334.186,297.909c0-9.906, 8.062-17.97, 17.973-17.97c 9.908,0, 17.971,8.063, 17.971,17.97c0,9.911-8.062,17.972-17.971,17.972
-		C 342.248,315.881, 334.186,307.82, 334.186,297.909zM 310.055,355.738l 30.404-30.406c 3.592,1.536, 7.545,2.389, 11.699,2.389c 13.062,0, 24.139-8.418, 28.166-20.113l 77.225,0 L 457.549,391.141 
-		c0,19.003-15.41,34.408-34.408,34.408L 310.055,425.549 L 310.055,355.738 zM 195.010,236.139c0,9.908-8.061,17.973-17.971,17.973c-9.908,0-17.971-8.064-17.971-17.973
-		c0-9.91, 8.062-17.971, 17.971-17.971C 186.949,218.168, 195.010,226.229, 195.010,236.139zM 297.695,236.139c0,9.908-8.062,17.973-17.971,17.973s-17.971-8.064-17.971-17.973c0-9.91, 8.062-17.971, 17.971-17.971
-		S 297.695,226.229, 297.695,236.139zM 276.865,146.972c0-9.907, 8.062-17.968, 17.971-17.968c 9.91,0, 17.973,8.061, 17.973,17.968
-		c0,9.91-8.062,17.971-17.973,17.971C 284.928,164.942, 276.865,156.882, 276.865,146.972zM 343.049,174.602l-19.543-19.541c 0.727-2.573, 1.141-5.28, 1.141-8.089c0-16.464-13.346-29.809-29.811-29.809
-		c-16.463,0-29.809,13.345-29.809,29.809s 13.346,29.81, 29.809,29.81c 2.809,0, 5.516-0.414, 8.090-1.141l 28.064,28.066l 126.559,0 l0,74.791 
-		l-82.797,0 c-5.465-6.355-13.551-10.397-22.594-10.397c-16.465,0-29.811,13.345-29.811,29.809c0,1.382, 0.127,2.733, 0.309,4.066
-		l-41.707,41.706L 280.949,425.549 l-56.422,0 l0-104.653 l 54.959-54.958c 0.080,0, 0.158,0.012, 0.238,0.012c 16.465,0, 29.811-13.347, 29.811-29.811
-		c0-16.466-13.346-29.811-29.811-29.811c-0.666,0-1.316,0.056-1.973,0.101l-61.637-61.638l-65.469,0 
-		c-5.104-9.1-14.826-15.257-26.002-15.257c-16.465,0-29.811,13.347-29.811,29.811c0,16.466, 13.346,29.811, 29.811,29.811
-		c 11.176,0, 20.898-6.157, 26.002-15.259l 53.412,0 l 48.992,48.992c-1.99,3.995-3.137,8.484-3.137,13.25c0,5.25, 1.369,10.175, 3.75,14.459
-		l-58.242,58.241L 195.42,425.549 l-49.047,0 l0-141.115 l 20.354-20.355c 3.217,1.19, 6.682,1.871, 10.311,1.871c 16.465,0, 29.812-13.347, 29.812-29.811
-		c0-16.466-13.348-29.811-29.812-29.811c-16.463,0-29.811,13.345-29.811,29.811c0,1.957, 0.201,3.863, 0.562,5.718l-30.523,30.521
-		L 117.266,425.549 L 88.859,425.549 c-19,0-34.41-15.405-34.41-34.408l0-334.276 c0-19.004, 15.41-34.413, 34.41-34.413l 107.422,0 l0,47.39 
-		c-9.1,5.101-15.256,14.828-15.256,26.002c0,16.463, 13.348,29.81, 29.811,29.81c 16.465,0, 29.811-13.347, 29.811-29.81
-		c0-11.174-6.158-20.901-15.258-26.004l0-47.388 l 136.646,0 l0,47.388 c-9.1,5.103-15.26,14.83-15.26,26.004
-		c0,16.463, 13.348,29.81, 29.811,29.81c 16.465,0, 29.811-13.347, 29.811-29.81c0-11.174-6.158-20.901-15.256-26.004l0-47.388 l 32,0 
-		c 18.998,0, 34.408,15.409, 34.408,34.413L 457.549,174.602 L 343.049,174.602 zM 106.672,159.345c0-9.91, 8.062-17.973, 17.973-17.973c 9.908,0, 17.969,8.062, 17.969,17.973
-		c0,9.908-8.061,17.971-17.969,17.971C 114.734,177.315, 106.672,169.253, 106.672,159.345z"  />
-<glyph unicode="&#xe172;" d="M 478.285,246.235L 255.523,441.559L 32.776,246.235l-0.016,0 l0-0.038 c 0.016-20.602, 16.709-37.278, 37.31-37.278
-	c 20.62,0, 37.299,16.677, 37.33,37.278c0-20.602, 16.711-37.278, 37.312-37.278c 17.513,0, 32.179,12.067, 36.168,28.354
-	c 4.023-16.286, 18.673-28.354, 36.201-28.354c 20.602,0, 37.314,16.677, 37.314,37.278c 0.015-20.602, 16.708-37.278, 37.309-37.278
-	c 20.621,0, 37.314,16.677, 37.314,37.278c 0.017-20.602, 16.742-37.278, 37.314-37.278c 20.616,0, 37.312,16.677, 37.312,37.278
-	c 0.033-20.602, 16.743-37.278, 37.331-37.278c 20.617,0, 37.326,16.677, 37.326,37.278l0,0.038 L 478.285,246.235 z M 403.646,196.429
-	c-10.399-7.815-23.317-12.463-37.312-12.463c-13.982,0-26.915,4.647-37.314,12.463c-10.398-7.815-23.315-12.463-37.314-12.463
-	c-13.977,0-26.908,4.647-37.309,12.463c-10.401-7.815-23.319-12.463-37.314-12.463c-13.374,0-25.917,4.251-36.201,11.581
-	c-10.267-7.33-22.794-11.581-36.168-11.581c-13.996,0-26.911,4.647-37.312,12.463c-10.415-7.815-23.348-12.463-37.33-12.463
-	c-2.452,0-4.888,0.163-7.258,0.46L 62.814,38.82 c0-15.742, 60.662-28.986, 142.972-32.863c 38.391,25.096, 49.739,162.546, 49.739,162.546
-	s 11.365-137.45, 49.738-162.546c 82.328,3.877, 142.988,17.121, 142.988,32.863L 448.251,184.426 c-2.387-0.297-4.805-0.46-7.273-0.46
-	C 426.995,183.966, 414.077,188.613, 403.646,196.429z"  />
-<glyph unicode="&#xe173;" d="M 471.908,83.583c-7.228,20.956-31.161,23.962-51.154,32.396c-21.954,9.257-46.297,20.002-68.201,28.99
-	c-6.25,1.701-12.505,3.407-18.754,5.115c-7.463,5.136-14.77,22.2-18.759,30.686c-3.978,0.567-7.952,1.138-11.938,1.703
-	c 0.616,13.129, 8.742,13.834, 11.938,23.866c 2.812,8.849, 0.292,20.349, 4.752,28.538c 3.096,5.687, 10.096,5.729, 13.59,10.604
-	c 3.175,4.426, 5.263,12.141, 6.251,17.561c 1.805,9.903, 3.379,23.461-1.325,33.283c-2.704,5.646-4.411,6.186-5.164,13.040
-	c-0.914,8.304, 2.449,35.386, 2.587,41.243c 0.344,15.193-0.024,16.424-3.701,31.223c0,0-4.466,13.41-11.465,17.447l-13.951,2.402
-	l-8.621,7.99c-34.745,21.378-71.992,6.381-91.941-1.703c-28.745-9.327-46.923-37.477-34.231-97.611
-	c 2.166-10.271-5.624-14.861-5.118-20.465c 1.116-12.259, 1.351-41.721, 12.933-48.98c 1.076-0.672, 9.291-2.729, 9.237-2.168
-	c 1.139-11.934, 2.274-23.877, 3.409-35.809c 2.892-7.932, 9.829-8.803, 11.844-20.006l-8.876-2.158
-	c-3.99-8.485-11.298-25.55-18.76-30.686c-6.249-1.708-12.505-3.414-18.752-5.115c-21.906-8.988-46.25-19.733-68.204-28.99
-	c-19.991-8.434-43.924-11.439-51.152-32.396c0-14.231-1.341-47.849-0.973-66.497l 191.138,0 l 14.034,95.841l-11.665,24.621l 26.93,12.913
-	l 22.684-12.646l-12.505-25.35l 22.112-95.379l 182.749,0 C 473.248,35.734, 471.908,69.352, 471.908,83.583z"  />
-<glyph unicode="&#xe174;" d="M 456.41,131.192L 283.254,242.178c-0.653,0.428-1.343,0.817-2.027,1.209l0,9.911 c 32.178,10.71, 55.363,41.041, 55.363,76.85
-	c0,44.716-36.201,80.934-80.938,80.949c-44.734-0.016-80.967-36.233-80.967-80.949l 51.145,0 c 0.033,16.446, 13.344,29.776, 29.822,29.823
-	c 16.449-0.047, 29.762-13.377, 29.825-29.823c-0.063-16.45-13.376-29.795-29.825-29.826c-6.736,0-13.339-2.73-18.081-7.489
-	c-4.776-4.758-7.491-11.348-7.491-18.082l0-31.364 c-0.686-0.392-1.371-0.782-2.028-1.209L 54.898,131.192
-	c-19.131-12.233-27.863-35.648-21.484-57.429c 6.408-21.778, 26.391-36.787, 49.084-36.787l 346.314,0 
-	c 22.691,0, 42.674,15.009, 49.051,36.787C 484.271,95.544, 475.506,118.959, 456.41,131.192z M 82.498,88.156l 173.154,110.971
-	l 173.16-110.971L 82.498,88.156 z"  />
-<glyph unicode="&#xe175;" d="M 73.304,177.047L 49.622,177.047 l0-23.679 l0-80.952 l0-23.681 l 23.682,0 L 438.7,48.735 l 23.678,0 l0,23.681 l0,80.952 l0,23.679 L 438.7,177.047 L 73.304,177.047 z M 438.7,72.416
-		L 73.304,72.416 l0,80.952 L 438.7,153.368 L 438.7,72.416 zM 392.235,94.119c 10.307,0, 18.664,8.356, 18.664,18.661c0,10.304-8.357,18.66-18.664,18.66
-		c-10.303,0-18.658-8.356-18.658-18.66C 373.577,102.476, 381.933,94.119, 392.235,94.119zM 214.55,127.404L 238.226,127.404L 238.226,95.436L 214.55,95.436zM 98.739,127.409L 122.421,127.409L 122.421,95.436L 98.739,95.436zM 156.638,127.404L 180.326,127.404L 180.326,95.442L 156.638,95.442zM 140.302,374.975L 148.011,374.975L 148.011,399.265L 123.72,399.265L 119.103,387.448L 115.306,378.212L 137.933,369.365 	
-		zM 447.462,245.125L 425.263,236.449L 416.586,258.65L 438.785,267.325zM 373.196,369.664L 395.394,378.341L 387.218,399.265L 363.382,399.265L 363.382,375.428L 370.942,375.428 	zM 430.109,289.546L 407.908,280.87L 399.231,303.074L 421.432,311.75zM 390.554,325.263l 22.199,8.682l-4.963,12.693c-0.002,0.006-0.006,0.010-0.008,0.019l-0.004,0.010
-		c-0.002,0.009-0.008,0.023-0.010,0.027l-0.002,0.005c-0.002,0.004-0.006,0.014-0.010,0.019l-0.004,0.020
-		c-0.016,0.036-0.031,0.073-0.047,0.114l-0.006,0.009c-0.016,0.043-0.029,0.084-0.047,0.126l-0.002,0 
-		c-0.006,0.019-0.016,0.041-0.021,0.064l-0.002,0 c-0.006,0.019-0.014,0.038-0.021,0.057l-0.004,0.013
-		c-1.869,4.776-3.527,9.022-3.527,9.022l-22.201-8.675L 390.554,325.263zM 462.36,206.867l-0.002,0.006c-0.006,0.009-0.010,0.027-0.016,0.040c-0.004,0.009-0.004,0.009-0.006,0.015l0,0.004 
-		c-0.004,0.009-0.008,0.024-0.014,0.037c-0.002,0.006-0.004,0.006-0.008,0.010c0,0.006-0.002,0.009-0.004,0.009l-0.002,0.006l0,0.004 
-		l-0.012,0.032l-0.002,0 l-0.625,1.6l-5.525,14.314l-22.623-8.847l 4.48-11.631l 0.088-0.228l0-2.956 l 24.287,0 l0,7.538 
-		C 462.378,206.82, 462.37,206.839, 462.36,206.867zM 73.218,267.348L 95.419,258.674L 86.745,236.474L 64.544,245.148zM 90.56,311.747L 112.76,303.065L 104.078,280.864L 81.877,289.546zM 130.126,347.467l-22.199,8.675c0,0-1.66-4.246-3.529-9.022l-0.004-0.013c-0.008-0.019-0.014-0.038-0.021-0.057
-		c-0.010-0.023-0.016-0.046-0.025-0.064c-0.018-0.042-0.033-0.083-0.049-0.126l-0.004-0.009c-0.014-0.041-0.029-0.078-0.043-0.114
-		l-0.008-0.020c-0.002-0.005-0.006-0.015-0.008-0.019l-0.002-0.005c-0.006-0.004-0.006-0.019-0.012-0.027l-0.004-0.010
-		c-0.004-0.009-0.006-0.013-0.008-0.019l-4.963-12.693l 22.203-8.682L 130.126,347.467zM 73.911,202.238l 0.088,0.228l 4.48,11.631l-22.625,8.847l-5.527-14.314l-0.623-1.6l-0.014-0.032l0-0.004 l-0.002-0.006
-		c-0.002,0-0.002-0.003-0.006-0.009c-0.002-0.004-0.002-0.004-0.004-0.010c-0.004-0.013-0.010-0.028-0.014-0.037l0-0.004 
-		c-0.002-0.006-0.006-0.006-0.006-0.015l-0.002,0 c-0.004-0.013-0.012-0.031-0.016-0.040l-0.002-0.006
-		c-0.012-0.028-0.018-0.047-0.018-0.047l0-7.538 l 24.289,0 L 73.909,202.238 zM 315.54,399.265L 339.376,399.265L 339.376,375.428L 315.54,375.428zM 267.696,399.265L 291.534,399.265L 291.534,375.428L 267.696,375.428zM 219.856,399.265L 243.694,399.265L 243.694,375.428L 219.856,375.428zM 172.015,399.265L 195.851,399.265L 195.851,375.428L 172.015,375.428z"  />
-<glyph unicode="&#xe176;" d="M 414.463,244.020c 2.185,8.368, 3.355,17.148, 3.355,26.203c0,57.107-46.295,103.4-103.402,103.4
-	c-42.938,0-79.759-26.176-95.389-63.438c-13.426,15.776-33.414,25.797-55.753,25.797c-40.424,0-73.195-32.768-73.195-73.193
-	c0-6.951, 0.99-13.667, 2.802-20.035c-33.012-12.104-56.539-43.797-56.539-81.025c0-47.611, 38.579-86.268, 86.244-86.268l 112.549,0 
-	l0,72.691 l-46.469,0 l 71.231,86.309l 71.23-86.309l-46.472,0 l0-72.691 l 103.829,0 c 47.689,0, 86.269,38.656, 86.269,86.268
-	C 474.753,200.342, 449.433,233.005, 414.463,244.020z"  />
-<glyph unicode="&#xe177;" d="M 413.692,243.579c 2.187,8.368, 3.359,17.146, 3.359,26.2c0,57.111-46.296,103.405-103.403,103.405
-	c-42.939,0-79.759-26.176-95.39-63.438c-13.423,15.778-33.413,25.799-55.753,25.799c-40.423,0-73.194-32.77-73.194-73.194
-	c0-6.952, 0.989-13.667, 2.8-20.039c-33.008-12.104-56.537-43.798-56.537-81.021c0-47.615, 38.58-86.271, 86.245-86.271l 265.897,0 
-	c 47.688,0, 86.269,38.656, 86.269,86.271C 473.984,199.904, 448.662,232.562, 413.692,243.579z"  />
-<glyph unicode="&#xe178;" d="M 316.896,147.764c 1.636,6.241, 2.484,12.784, 2.484,19.538c0,42.576-34.501,77.078-77.045,77.078
-	c-32.015,0-59.452-19.507-71.127-47.288c-10.007,11.756-24.919,19.229-41.562,19.229c-30.12,0-54.549-24.43-54.549-54.563
-	c0-5.165, 0.724-10.188, 2.096-14.931c-24.624-9.041-42.153-32.651-42.153-60.397c0-35.5, 28.778-64.309, 64.291-64.309l 198.206,0 
-	c 35.545,0, 64.292,28.809, 64.292,64.309C 361.828,115.204, 342.959,139.551, 316.896,147.764z M 434.39,328.406
-	c 1.343,4.742, 2.095,9.761, 2.095,14.946c0,30.134-24.461,54.542-54.581,54.542c-16.642,0-31.555-7.449-41.561-19.229
-	c-11.643,27.785-39.080,47.288-71.096,47.288c-42.575,0-77.077-34.501-77.077-77.077c0-6.733, 0.884-13.293, 2.486-19.524
-	c-26.064-8.207-44.934-32.552-44.934-61.33c0-11.723, 3.142-22.697, 8.635-32.161c 2.061-0.788, 4.086-1.654, 6.080-2.635
-	c 19.034,22.55, 47.289,36.084, 77.897,36.084c 43.43,0, 80.544-27.288, 95.261-65.612l 74.658,0 c 35.514,0, 64.291,28.825, 64.291,64.323
-	C 476.545,295.753, 458.984,319.383, 434.39,328.406z"  />
-<glyph unicode="&#xe179;" d="M 345.097,278.363c-1.966,0-3.911-0.085-5.846-0.211c 4.167,10.352, 6.481,21.65, 6.481,33.496
-	c0,49.606-40.219,89.814-89.813,89.814c-49.618,0-89.833-40.208-89.833-89.814c0-11.846, 2.315-23.139, 6.479-33.494
-	c-1.928,0.124-3.863,0.209-5.824,0.209c-49.621,0-89.83-40.206-89.83-89.812c0-49.611, 40.209-89.814, 89.83-89.814
-	c 36.611,0, 68.075,21.923, 82.054,53.356c-9.839-37.655-28.101-104.613-33.517-104.613l 81.262,0 c-5.411,0-23.659,66.909-33.501,104.57
-	c 13.986-31.408, 45.441-53.313, 82.056-53.313c 49.593,0, 89.812,40.203, 89.812,89.814C 434.908,238.157, 394.689,278.363, 345.097,278.363
-	z"  />
-<glyph unicode="&#xe17a;" d="M 269.961,105.229L 269.961,244.754 L 415.514,390.291L 95.791,390.291 l 145.557-145.536l0-139.526 c-52.389-1.594-92.774-11.77-92.774-24.076
-	c0-13.414, 47.938-24.298, 107.064-24.298c 59.19,0, 107.13,10.884, 107.13,24.298C 362.768,93.459, 322.314,103.635, 269.961,105.229z"  />
-<glyph unicode="&#xe17b;" d="M 38.299,224.605L 175.554,361.853L 222.336,315.064L 131.878,224.605L 222.336,134.145L 175.554,87.353L 38.299,224.605 
-			zM 286.766,134.145L 377.232,224.605L 305.204,296.631L 286.773,315.064L 333.561,361.855L 351.997,343.417L 470.81,224.605L 333.561,87.353L 286.766,134.145 	z"  />
-<glyph unicode="&#xe17c;" d="M 78.895,112.147c0-13.338, 10.791-24.168, 24.134-24.168l 263.575,0 c 13.342,0, 24.166,10.83, 24.166,24.168L 390.77,141.32 L 78.895,141.32 L 78.895,112.147 z
-	 M 373.373,360.093c-0.098,0-0.198,0-0.326,0l0,0L 96.62,360.093 l0-86.104 c0-56.083, 24.395-90.423, 63.571-107.771l 151.605,0 
-	c 29.562,13.442, 50.034,37.037, 57.782,73.044c 1.244-0.065, 2.521-0.116, 3.795-0.116c 33.422,0, 60.467,27.093, 60.467,60.483
-	S 406.795,360.093, 373.373,360.093z M 373.373,264.1c-0.198,0-0.393,0.015-0.588,0.015c 0.163,3.239, 0.262,6.491, 0.262,9.875l0,61.155 
-	c 0.128,0, 0.229,0.019, 0.326,0.019c 19.588,0, 35.514-15.942, 35.514-35.533C 408.887,280.007, 392.961,264.1, 373.373,264.1z"  />
-<glyph unicode="&#xe17d;" d="M 285.812,198.452c-4.381,3.501-11.838,6.671-22.401,9.55l0-51.507 c 3.207,0.358, 6.574,1.083, 10.073,2.292
-	c 3.501,1.14, 6.607,2.778, 9.384,4.971c 2.78,2.091, 5.068,4.738, 6.837,7.915c 1.795,3.106, 2.682,6.795, 2.682,11.116
-	C 292.386,189.786, 290.193,194.988, 285.812,198.452z M 230.971,288.877c-2.321-1.904-4.153-4.223-5.495-7.004
-	c-1.339-2.779-1.995-6.018-1.995-9.745c0-5.919, 1.834-10.498, 5.595-13.735c 3.76-3.168, 9.94-5.787, 18.509-7.779l0,43.754 
-	c-3.042,0-5.986-0.459-8.83-1.344C 235.876,292.114, 233.328,290.74, 230.971,288.877z M 255.756,445.727
-	c-122.172,0-221.225-99.038-221.225-221.244c0-122.201, 99.053-221.261, 221.225-221.261c 122.209,0, 221.297,99.060, 221.297,221.261
-	C 477.053,346.688, 377.965,445.727, 255.756,445.727z M 255.756,34.945c-104.479,0-189.504,85.059-189.504,189.537
-	c0,104.514, 85.024,189.538, 189.504,189.538c 104.518,0, 189.543-85.024, 189.543-189.538
-	C 445.299,120.004, 360.273,34.945, 255.756,34.945z M 255.791,379.604c-85.678,0-155.104-69.473-155.104-155.121
-	c0-85.646, 69.426-155.104, 155.104-155.104c 85.647,0, 155.070,69.457, 155.070,155.104C 410.861,310.131, 341.438,379.604, 255.791,379.604z
-	 M 327.54,166.273c-1.962-5.98-5.494-11.838-10.597-17.558c-5.102-5.728-11.936-10.827-20.536-15.302
-	c-8.568-4.454-19.588-7.131-32.997-8.020l0-22.825 l-15.826,0 l0,22.825 c-20.015,1.411-35.646,7.589-46.927,18.51
-	c-11.251,10.893-17.789,26.92-19.587,47.972l 37.834,0 c-0.195-10.163, 2.484-18.212, 8.043-24.134
-	c 5.529-5.914, 12.427-9.642, 20.637-11.247l0,56.020 c-0.883,0.391-2.092,0.812-3.596,1.21c-1.506,0.493-3.174,0.85-4.973,1.243
-	c-6.606,1.763-13.146,3.891-19.588,6.309c-6.41,2.421-12.197,5.657-17.3,9.647c-5.1,4.027-9.157,9.058-12.229,15.010
-	c-3.011,6.021-4.513,13.441-4.513,22.404c0,9.119, 1.731,17.168, 5.199,24.168c 3.498,6.963, 8.11,12.785, 13.832,17.523
-	c 5.724,4.744, 12.327,8.439, 19.85,11.021c 7.521,2.586, 15.272,4.152, 23.316,4.707l0,20.638 l 15.826,0 l0-20.638 
-	c 8.047-0.944, 15.599-2.646, 22.662-5.228c 7.065-2.621, 13.279-6.187, 18.675-10.762c 5.329-4.543, 9.744-10.235, 13.114-17.006
-	c 3.397-6.804, 5.361-14.878, 5.918-24.169l-38.098,0 c-0.165,7.164-2.388,13.247-6.704,18.284c-4.283,4.972-9.484,7.489-15.567,7.489
-	l0-47.482 c 2.159-0.521, 4.352-1.046, 6.574-1.605c 2.256-0.554, 4.608-1.176, 7.13-1.896c 13.211-3.565, 23.414-8.009, 30.575-13.276
-	c 7.127-5.267, 12.426-10.76, 15.795-16.484c 3.402-5.754, 5.429-11.441, 6.048-17.167c 0.624-5.755, 0.918-10.822, 0.918-15.272
-	C 330.45,177.229, 329.501,172.26, 327.54,166.273z"  />
-<glyph unicode="&#xe17e;" d="M 256.098,379.238c-85.644,0-155.070-69.457-155.070-155.105c0-85.68, 69.427-155.104, 155.070-155.104
-	c 85.68,0, 155.104,69.425, 155.104,155.104C 411.202,309.781, 341.777,379.238, 256.098,379.238z M 309.633,125.961
-	c-7.456-2.549-14.652-3.788-21.586-3.788c-6.9,0-12.621,0.42-17.199,1.339c-4.545,0.914-8.729,1.991-12.557,3.269
-	c-3.988,1.439-8.014,2.747-12.002,3.823c-4.022,1.117-9.027,1.637-15.013,1.637c-4.937,0-10.101-0.684-15.435-2.057
-	c-5.395-1.344-10.693-4.025-15.989-8.011l-16.94,25.077c 3.827,2.391, 7.619,5.171, 11.349,8.338c 3.728,3.208, 6.998,6.74, 9.843,10.531
-	c 2.811,3.83, 5.133,7.981, 6.964,12.426c 1.8,4.445, 2.716,9.125, 2.716,14.033c0,3.137-0.492,6.146-1.506,9.152
-	c-0.979,3.010-2.223,6.054-3.695,9.156l-27.010,0 l0,23.222 l 17.462,0 c-2.714,3.464-5.459,8.53-8.207,15.304
-	c-2.716,6.703-4.088,14.223-4.088,22.364c0,7.265, 1.504,14.229, 4.512,20.765c 3.010,6.545, 7.426,12.332, 13.244,17.363
-	c 5.821,5.008, 13.114,8.904, 21.845,11.876c 8.73,2.877, 18.838,4.351, 30.317,4.351c 20.927,0, 37.245-5.82, 48.888-17.467
-	c 11.643-11.669, 17.461-28.611, 17.461-50.782l-36.854,0 c-0.197,2.718-0.556,6.116-1.080,10.204c-0.554,4.086-1.798,8.076-3.695,11.904
-	c-1.929,3.791-4.84,7.123-8.729,9.938c-3.958,2.847-9.354,4.252-16.253,4.252c-8.175,0-14.717-2.285-19.557-6.834
-	c-4.807-4.547-7.193-10.662-7.193-18.314c0-2.158, 0.062-4.251, 0.26-6.278c 0.166-1.991, 0.59-4.313, 1.212-6.966
-	c 0.653-2.646, 1.732-5.656, 3.3-9.123c 1.506-3.467, 3.666-7.65, 6.378-12.556l 36.335,0 l0-23.222 L 248.48,210.887 c 0.883-2.743, 1.471-5.43, 1.765-8.173
-	c 0.263-2.747, 0.426-5.657, 0.426-8.733c0-8.603-2.257-15.893-6.737-22.004c-4.445-6.085-9.677-11.514-15.697-16.256l 0.59-0.521
-	c 4.352,2.743, 7.88,4.479, 10.629,5.164c 2.713,0.725, 5.365,1.115, 7.912,1.115c 3.629,0, 7.26-0.328, 10.793-0.984
-	c 3.564-0.621, 7.127-1.307, 10.789-2.025c 3.633-0.914, 7.196-1.732, 10.663-2.324c 3.434-0.619, 6.998-0.945, 10.628-0.945
-	c 3.662,0, 7.323,0.652, 11.053,1.893c 3.76,1.28, 8.078,4.578, 13.016,9.816l 16.351-27.568
-	C 324.119,132.959, 317.087,128.512, 309.633,125.961z M 256.098,445.395c-122.172,0-221.257-99.055-221.257-221.262
-	c0-122.202, 99.085-221.26, 221.257-221.26c 122.207,0, 221.261,99.058, 221.261,221.26C 477.358,346.34, 378.305,445.395, 256.098,445.395z
-	 M 256.098,34.594c-104.479,0-189.506,85.027-189.506,189.539c0,104.516, 85.027,189.505, 189.506,189.505
-	c 104.517,0, 189.541-84.989, 189.541-189.505C 445.639,119.621, 360.614,34.594, 256.098,34.594z"  />
-<glyph unicode="&#xe17f;" d="M 256.176,445.286c-122.174,0-221.229-99.051-221.229-221.255c0-122.177, 99.055-221.245, 221.229-221.245
-			c 122.205,0, 221.261,99.068, 221.261,221.245C 477.437,346.235, 378.381,445.286, 256.176,445.286z M 256.176,34.526
-			c-104.482,0-189.506,85.021-189.506,189.505c0,104.513, 85.023,189.538, 189.506,189.538c 104.518,0, 189.537-85.025, 189.537-189.538
-			C 445.713,119.547, 360.693,34.526, 256.176,34.526z M 256.209,379.137c-85.68,0-155.104-69.43-155.104-155.105
-			c0-85.647, 69.425-155.089, 155.104-155.089c 85.641,0, 155.070,69.441, 155.070,155.089C 411.279,309.707, 341.85,379.137, 256.209,379.137
-			z M 319.682,231.452l0-25.945 l-39.044,0 l-4.090-7.933l0-12.559 l 43.134,0 l0-25.929 l-43.134,0 l0-37.708 l-41.497,0 l0,37.708 l-42.906,0 l0,25.929 l 42.906,0 
-			l0,12.559 l-3.859,7.933l-39.047,0 l0,25.945 l 25.934,0 l-41.762,84.93l 44.247,0 l 36.036-84.93l 35.221,84.93l 44.244,0 l-42.314-84.93L 319.682,231.452 z"  />
-<glyph unicode="&#xe180;" d="M 256.392,379.241c-85.65,0-155.105-69.456-155.105-155.119c0-85.645, 69.455-155.105, 155.105-155.105
-	c 85.644,0, 155.103,69.46, 155.103,155.105C 411.494,309.785, 342.035,379.241, 256.392,379.241z M 287.293,126.622L 248.51,126.622 L 248.51,250.609 
-	l-48.041,0 l0,29.204 c 6.736-0.163, 13.211,0.328, 19.524,1.522c 6.278,1.193, 11.903,3.268, 16.939,6.277
-	c 5.003,3.006, 9.22,6.967, 12.687,11.883c 3.433,4.908, 5.757,10.991, 6.833,18.3l 30.839,0 L 287.291,126.622 z M 256.392,445.381
-	c-122.175,0-221.26-99.051-221.26-221.26c0-122.19, 99.085-221.26, 221.26-221.26c 122.204,0, 221.257,99.070, 221.257,221.26
-	C 477.648,346.33, 378.596,445.381, 256.392,445.381z M 256.392,34.6c-104.516,0-189.541,85.025-189.541,189.522
-	c0,104.517, 85.025,189.525, 189.541,189.525c 104.514,0, 189.538-85.008, 189.538-189.525C 445.93,119.625, 360.905,34.6, 256.392,34.6z"  />
-<glyph unicode="&#xe181;" d="M 302.271,345.986c-67.299,0-121.845-54.548-121.845-121.865c0-67.298, 54.546-121.846, 121.845-121.846
-	c 67.302,0, 121.849,54.548, 121.849,121.846C 424.119,291.438, 369.572,345.986, 302.271,345.986z M 328.498,143.612l-30.444,0 l0,97.402 
-	l-37.771,0 l0,22.957 c 5.266-0.149, 10.398,0.244, 15.336,1.173c 4.939,0.934, 9.354,2.588, 13.309,4.942c 3.926,2.35, 7.26,5.46, 9.977,9.315
-	c 2.715,3.862, 4.512,8.667, 5.362,14.392l 24.231,0 L 328.498,143.612 z M 302.271,397.962c-44.702,0-85.417-16.888-116.221-44.588
-	c-26.422-0.602-51.145-3.253-72.564-7.44c-24.56-4.792-44.835-11.704-58.047-19.145c-8.861-4.889-14.256-10.069-16.153-13.455
-	c-1.079-1.801-1.341-2.895-1.374-3.876c 0.032-0.997, 0.294-2.107, 1.374-3.924c 1.144-1.911, 3.302-4.445, 6.67-7.145
-	c 6.736-5.477, 18.151-11.414, 32.866-16.403c 15.37-5.261, 34.369-9.549, 55.624-12.476c-2.614-9.757-4.412-19.829-5.297-30.163
-	c-7.39,1.012-14.651,2.191-21.549,3.532c-26.784,5.28-49.642,12.717-67.17,22.482c-0.85,0.507-1.668,1.012-2.518,1.504l0-27.193 
-	c0-1.044, 0.23-2.206, 1.374-4.157c 1.144-1.894, 3.302-4.429, 6.67-7.127c 6.736-5.49, 18.151-11.428, 32.866-16.414
-	c 14.356-4.89, 31.785-8.944, 51.307-11.858c 1.539-11.002, 4.057-21.677, 7.557-31.91c-10.432,1.241-20.536,2.793-30.085,4.658
-	c-26.784,5.281-49.642,12.723-67.17,22.497c-1.178,0.687-2.355,1.388-3.533,2.112l0-23.564 c0-1.24, 0.295-2.584, 1.506-4.658
-	c 1.21-2.044, 3.466-4.646, 6.899-7.408c 6.9-5.594, 18.377-11.562, 33.193-16.576c 20.538-7.021, 47.288-12.316, 77.438-14.914
-	c 7.031-10.938, 15.174-21.014, 24.428-30.072c-26.128,0.834-50.653,3.564-72.564,7.848c-26.751,5.234-49.479,12.674-66.843,22.355
-	c-1.046,0.586-2.060,1.193-3.041,1.811l0-26.24 c0-1.046, 0.23-2.191, 1.374-4.121c 1.144-1.927, 3.302-4.446, 6.67-7.16
-	c 6.736-5.477, 18.151-11.413, 32.866-16.404c 29.496-10.085, 71.978-16.691, 118.871-16.661c 13.342,0, 26.228,0.577, 38.653,1.575
-	c 20.341-8.355, 42.577-13.004, 65.926-13.004c 95.979,0, 173.843,77.852, 173.843,173.844C 476.113,320.137, 398.25,397.962, 302.271,397.962z
-	 M 302.271,75.23c-82.114,0-148.922,66.779-148.922,148.891c0,82.099, 66.808,148.91, 148.922,148.91
-	c 82.114,0, 148.892-66.811, 148.892-148.91C 451.162,142.010, 384.385,75.23, 302.271,75.23z"  />
-<glyph unicode="&#xe182;" d="M 123.165,358.194l-36.463-36.427l 97.565-97.579l-97.565-97.551l 36.463-36.442l 134.009,133.993L 123.165,358.194z
-	 M 243.718,357.018l0-51.552 l 182.313,0 l0,51.552 L 243.718,357.018 z M 243.718,92.729l 182.313,0 l0,51.551 L 243.718,144.28 L 243.718,92.729 z M 306,199.089l 120.031,0 
-	l0,51.552 L 306,250.641 L 306,199.089 z"  />
-<glyph unicode="&#xe183;" d="M 44.96,104.857L 218.362,306.466L 311.562,233.697L 465.652,342.482L 311.562,141.985L 218.362,215.502 z"  />
-<glyph unicode="&#xe184;" d="M 388.721,62.555c-8.585,0-16.17-4.188-20.895-10.592l-52.207,0 l0,55.393 c 0.178,0.192, 0.389,0.358, 0.568,0.521
-	c 10.545,9.814, 17.758,24.368, 17.743,40.544l0,48.922 l-18.312,0 l0,26.492 l 39.010,0 l0,30.643 L 245.928,254.478 l0-30.643 l 39.029,0 l0-26.492 l-16.937,0 l0-32.947 
-	c0,0,0-1.437,0-6.428L 163.603,157.968 L 163.603,371.74 l 104.418,0 l0-23.917 l-22.093,0 l0-30.663 l 108.701,0 l0,30.663 l-20.698,0 L 333.931,379.75 
-	c-0.134,32.065-25.835,57.754-57.899,57.888l-120.44,0 c-32.048-0.134-57.751-25.822-57.885-57.888l0-229.808 
-	c 0.134-32.057, 25.836-57.761, 57.885-57.891l 120.44,0 c 3.043,0.033, 5.986,0.295, 8.926,0.754l0-40.843 L 232.75,51.962 
-	c-4.725,6.403-12.314,10.592-20.879,10.592c-14.325,0-25.933-11.607-25.933-25.936c0-14.324, 11.608-25.896, 25.933-25.896
-	c 8.565,0, 16.154,4.156, 20.863,10.593l 135.107,0 c 4.709-6.437, 12.294-10.593, 20.879-10.593c 14.291,0, 25.9,11.572, 25.9,25.896
-	C 414.621,50.947, 403.012,62.555, 388.721,62.555z"  />
-<glyph unicode="&#xe185;" d="M 157.333,25.506l 162.278,0 L 319.611,423.969 L 157.333,423.969 L 157.333,25.506 z M 295.647,81.443l-43.354,0 l0,43.353 l 43.354,0 L 295.647,81.443 z M 214.965,146.362
-	l0,43.353 l 43.353,0 l0-43.353 L 214.965,146.362 z M 295.647,211.287l-43.354,0 l0,43.347 l 43.354,0 L 295.647,211.287 z M 214.965,276.205l0,43.352 l 43.353,0 l0-43.352 L 214.965,276.205 
-	z M 252.294,384.477l 43.354,0 l0-43.35 l-43.354,0 L 252.294,384.477 z M 177.635,384.477l 43.351,0 l0-43.35 l-43.351,0 L 177.635,384.477 z M 177.635,254.634l 43.351,0 l0-43.347 
-	l-43.351,0 L 177.635,254.634 z M 177.635,124.796l 43.351,0 l0-43.353 l-43.351,0 L 177.635,124.796 z M 37.216,25.506l 97.289,0 L 134.505,297.989 L 37.216,297.989 L 37.216,25.506 z
-	 M 64.188,276.598l 43.348,0 l0-43.353 L 64.188,233.245 L 64.188,276.598 z M 64.188,199.525l 43.348,0 l0-43.351 L 64.188,156.174 L 64.188,199.525 z M 64.188,125.469l 43.348,0 l0-43.354 
-	L 64.188,82.115 L 64.188,125.469 z M 454.4,259.597l0,51.786 l-23.607,0 l0,50.529 l-16.941,0 L 413.852,408.911 l-14.238,0 l0-46.999 l-16.94,0 l0-50.529 l-23.604,0 l0-51.786 l-19.218,0 
-	l0-234.091 l 133.768,0 L 473.62,259.597 L 454.4,259.597 z M 405.342,55.275L 361.99,55.275 l0,43.349 l 43.352,0 L 405.342,55.275 z M 405.342,188.197L 361.99,188.197 l0,43.352 l 43.352,0 L 405.342,188.197 z
-	 M 456.23,122.283L 412.88,122.283 l0,43.352 l 43.351,0 L 456.231,122.283 z"  />
-<glyph unicode="&#xe186;" d="M 470.611,350.487c-0.115,11.964-2.458,23.38-7.008,34.089c-4.629,10.899-10.932,20.563-18.865,28.88
-	c-7.969,8.355-17.434,14.96-28.26,19.741c-10.871,4.81-22.553,7.225-34.85,7.238c-0.042,0-0.082,0.002-0.119,0l-0.017,0 
-	c-12.331,0.008-24.071-2.415-35.067-7.211c-10.941-4.774-20.531-11.357-28.618-19.705c-8.060-8.307-14.497-17.955-19.254-28.854
-	c-4.822-11.009-7.229-22.775-7.229-35.106l-0.011-37.219l-74.083,0.018l 0.012,38.406l-0.012,0.025
-	c-0.144,11.893-2.552,23.249-7.203,33.899c-4.751,10.898-11.176,20.557-19.237,28.871c-8.088,8.345-17.661,14.931-28.597,19.717
-	c-10.959,4.789-22.65,7.201-34.915,7.225c-0.079,0.004-0.151,0.006-0.22,0.006l0,0.004 c-12.336,0-24.083-2.412-35.086-7.213
-	c-10.942-4.772-20.526-11.363-28.617-19.711c-8.059-8.299-14.489-17.954-19.255-28.857c-4.79-10.954-7.203-22.659-7.227-34.936
-	c-0.001-0.068-0.001-0.104,0-0.13l0-0.038 l 0.004,0 c0-0.006,0-0.016-0.004-0.027c-0.005-12.327, 2.404-24.029, 7.222-34.92
-	c 4.759-10.803, 11.213-20.243, 19.31-28.213c 8.083-7.968, 17.656-14.298, 28.567-18.936c 11-4.694, 22.735-7.029, 35.061-7.029
-	l 39.004-0.014l-0.020-74.442l-38.822,0.012c-0.137,0.004-0.263,0-0.368,0c-12.254-0.012-23.931-2.356-34.879-7.015
-	c-10.917-4.637-20.489-10.955-28.58-18.924c-8.103-7.96-14.56-17.41-19.328-28.205c-4.81-10.862-7.219-22.533-7.234-34.822
-	c-0.001-0.108,0-0.146,0-0.154c-0.008-12.327, 2.395-24.076, 7.21-35.083c 4.751-10.901, 11.201-20.469, 19.292-28.554
-	c 8.079-8.095, 17.644-14.539, 28.548-19.311c 11.006-4.813, 22.767-7.228, 35.103-7.228l 3.1,0 l 0.028,0.056
-	c 11.201,0.365, 21.905,2.754, 31.982,7.154c 10.911,4.765, 20.472,11.202, 28.563,19.293c 8.091,8.085, 14.545,17.646, 19.31,28.55
-	c 4.813,11.011, 7.228,22.765, 7.228,35.11l 0.012,37.578l 74.084-0.026l-0.014-37.578l0-0.038 c-0.008-12.322, 2.402-24.066, 7.213-35.070
-	c 4.754-10.903, 11.202-20.479, 19.287-28.561c 8.085-8.094, 17.644-14.544, 28.557-19.309c 10.97-4.795, 22.69-7.207, 34.987-7.225l 0.064,0 
-	c 0.017,0, 0.035-0.002, 0.052-0.002l 8.103-0.004l-0.17,0.342c 9.44,0.812, 18.476,3.105, 27.016,6.873
-	c 10.794,4.771, 20.249,11.217, 28.216,19.312c 7.975,8.094, 14.292,17.659, 18.939,28.572c 4.688,10.997, 7.030,22.734, 7.030,35.059l0,0.823 
-	l-0.004,0.008c-0.103,11.798-2.444,23.086-7.019,33.718c-4.641,10.806-11.033,20.32-19.12,28.405
-	c-8.088,8.092-17.594,14.484-28.395,19.14c-10.88,4.691-22.451,7.042-34.549,7.042l-38.293,0.014l 0.019,74.442l 43.305-0.018l0,0.138 
-	c 10.285,0.554, 20.168,2.845, 29.543,6.887c 10.802,4.641, 20.316,11.031, 28.408,19.12c 8.084,8.085, 14.483,17.59, 19.137,28.395
-	c 4.685,10.88, 7.037,22.45, 7.037,34.548l0,0.963 L 470.611,350.487z M 166.001,96.938c-0.006-5.332-1.008-10.295-3.013-15.055
-	c-2.036-4.793-4.814-8.936-8.417-12.539c-3.621-3.621-7.725-6.4-12.405-8.425c-4.585-1.979-9.596-2.977-15.187-2.986
-	c-5.334,0.010-10.299,1.007-15.045,3.012c-4.783,2.022-8.751,4.765-12.083,8.306c-3.402,3.619-6.105,7.802-8.153,12.653
-	c-1.932,4.563-2.917,9.312-3,14.394l0,0.665 c0,5.061, 0.981,9.823, 2.988,14.471c 2.025,4.679, 4.746,8.637, 8.194,11.985
-	c 3.501,3.384, 7.556,6.079, 12.289,8.127c 4.411,1.905, 9.089,2.901, 14.172,2.981l 39.672-0.011L 166.001,96.938z M 166.055,312.376
-	l-39.008,0.008c-5.332,0.006-10.225,0.997-14.83,2.991c-4.734,2.048-8.783,4.742-12.274,8.13c-3.476,3.371-6.191,7.282-8.208,11.849
-	c-1.989,4.498-2.968,9.191-2.968,14.25l0,0.012 c 0.004,5.596, 1.011,10.603, 2.992,15.189c 2.041,4.738, 4.758,8.881, 8.176,12.516
-	c 3.333,3.529, 7.31,6.271, 12.083,8.299c 4.746,2.004, 9.702,2.999, 15.033,2.999l 0.020,0 c 5.593-0.013, 10.604-1.017, 15.188-2.999
-	c 4.677-2.022, 8.776-4.802, 12.398-8.429c 3.618-3.621, 6.4-7.719, 8.431-12.405c 1.97-4.583, 2.983-9.594, 2.983-15.195L 166.055,312.376z
-	 M 291.277,186.011l-74.084,0.021l 0.018,74.444l 74.088-0.025L 291.277,186.011z M 381.448,134.452c 5.062,0, 9.752-0.988, 14.264-2.972
-	c 4.589-2.041, 8.521-4.721, 11.898-8.091c 3.345-3.358, 6.021-7.335, 8.065-12.050c 1.994-4.642, 2.981-9.41, 2.981-14.479l 0.004,0 
-	c-0.006-5.335-1.007-10.219-2.997-14.828c-2.049-4.74-4.766-8.881-8.18-12.512c-3.387-3.596-7.312-6.424-11.885-8.549
-	c-4.492-2.084-9.142-3.102-14.17-3.108c-5.338,0.007-10.295,1.001-15.053,3.011c-4.784,2.019-8.75,4.766-12.070,8.305
-	c-3.408,3.615-6.118,7.799-8.159,12.656c-2.006,4.74-2.998,9.669-3.005,14.973l 0.013,37.657L 381.448,134.452z M 415.75,335.268
-	c-2.037-4.604-4.715-8.538-8.084-11.9c-3.383-3.376-7.312-6.051-11.912-8.081c-4.5-1.984-9.182-2.964-14.236-2.97l-0.020,0 
-	l-38.295,0.014l 0.012,37.218c0,5.593, 1.008,10.605, 2.992,15.181c 2.045,4.746, 4.76,8.882, 8.179,12.518
-	c 3.327,3.529, 7.302,6.275, 12.084,8.3c 4.55,1.925, 9.296,2.918, 14.386,3.001l 0.666,0 c 5.025-0.006, 9.679-1.039, 14.171-3.114
-	c 4.567-2.134, 8.492-4.968, 11.88-8.557c 3.412-3.645, 6.121-7.777, 8.171-12.522c 1.988-4.609, 2.979-9.504, 2.987-14.831
-	C 418.723,344.464, 417.737,339.758, 415.75,335.268z"  />
-<glyph unicode="&#xe187;" d="M 256.104,445.406c-122.207,0-221.261-99.115-221.261-221.289c0-122.206, 99.054-221.262, 221.261-221.262
-	c 122.206,0, 221.276,99.056, 221.276,221.262C 477.381,346.291, 378.311,445.406, 256.104,445.406z M 256.104,34.58
-	c-104.516,0-189.524,85.055-189.524,189.537c0,104.516, 85.009,189.536, 189.524,189.536c 104.515,0, 189.536-85.021, 189.536-189.536
-	C 445.641,119.635, 360.619,34.58, 256.104,34.58z M 256.104,379.219c-85.646,0-155.106-69.455-155.106-155.102
-	c0-85.684, 69.46-155.107, 155.106-155.107c 85.661,0, 155.104,69.424, 155.104,155.107C 411.208,309.764, 341.766,379.219, 256.104,379.219
-	z M 293.727,251.979l-8.469-19.657l-61.171,0 l-0.293-11.473l 58.177,0 l-8.456-19.658l-47.528,0 c 5.836-28.775, 19.292-43.131, 40.418-43.131
-	c 13.652,0, 27.666,5.719, 42.054,17.2l-0.261-41.271c-12.197-7.092-26.227-10.657-42.054-10.657c-22.941,0-41.433,7.359-55.431,22.139
-	c-12.752,13.279-21.042,31.85-24.851,55.721l-21.045,0 l 8.486,19.658l 10.925,0 l0,7.096 c0,2.551, 0.078,4.018, 0.262,4.377l-19.935,0 
-	l 8.456,19.657l 13.929,0 c 4.382,22.040, 13.393,39.407, 27.044,52.161c 14.373,13.831, 32.391,20.767, 54.056,20.767
-	c 15.305,0, 31.869-4.579, 49.708-13.677l-16.645-34.104c-12.754,8.144-24.693,12.264-35.778,12.264
-	c-19.114,0-31.883-12.496-38.245-37.411L 293.727,251.98 z"  />
-<glyph unicode="&#xe188;" d="M 255.79,173.908c-16.19-0.034-29.288-13.129-29.337-29.316c 0.049-16.17, 13.146-29.266, 29.337-29.304
-	c 16.151,0.038, 29.247,13.134, 29.298,29.304C 285.037,160.779, 271.941,173.874, 255.79,173.908z M 363.507,234.211L 363.507,330.37 
-	c0,30.757-11.677,58.963-30.97,79.579c-19.211,20.62-46.582,33.863-76.747,33.832c-30.188,0.031-57.575-13.212-76.787-33.832
-	c-19.294-20.616-30.968-48.822-30.968-79.579l0-96.159 c-20.227-24.296-32.39-55.529-32.39-89.619
-	c0-77.387, 62.721-140.125, 140.145-140.125c 77.368,0, 140.106,62.738, 140.106,140.125
-	C 395.896,178.682, 383.732,209.915, 363.507,234.211z M 187.555,132.129l-31.688,0 l0,24.938 l 31.688,0 L 187.555,132.129 z M 268.229,44.686l-24.933,0 
-	l0,31.707 l 24.933,0 L 268.229,44.686 z M 255.79,94.654c-27.604,0.017-49.938,22.371-49.938,49.938c0,27.599, 22.334,49.934, 49.938,49.934
-	c 27.564,0, 49.9-22.335, 49.9-49.934C 305.69,117.025, 283.354,94.671, 255.79,94.654z M 243.296,212.809l0,31.702 l 24.933,0 l0-31.702 L 243.296,212.809 
-	z M 312.362,272.795c-17.302,7.653-36.446,11.957-56.572,11.957c-20.181,0-39.293-4.304-56.595-11.957L 199.195,330.37 
-	c0,17.738, 6.704,33.47, 17.153,44.635c 10.528,11.186, 24.233,17.613, 39.441,17.628c 15.17-0.015, 28.874-6.442, 39.401-17.628
-	c 10.448-11.165, 17.171-26.897, 17.171-44.635L 312.361,272.795 z M 355.677,132.129l-31.706,0 l0,24.938 l 31.706,0 L 355.677,132.129 z"  />
-<glyph unicode="&#xe189;" d="M 321.582,284.751c-19.521,0-38.129-4.008-55.038-11.247L 266.544,330.37 c0,30.774-11.673,58.979-30.968,79.579
-	c-19.213,20.62-46.567,33.863-76.751,33.832c-30.183,0.031-57.569-13.212-76.784-33.832c-19.26-20.6-30.967-48.805-30.967-79.579
-	l0-126.032 l 51.146,0 l0,28.090 l-26.291,26.31l 26.291,0 L 102.22,330.37 c0,17.771, 6.734,33.47, 17.167,44.651c 10.528,11.169, 24.231,17.597, 39.438,17.612
-	c 15.175-0.015, 28.874-6.442, 39.409-17.612c 10.461-11.181, 17.166-26.88, 17.166-44.651l0-94.378 
-	c-21.158-24.525-33.945-56.458-33.945-91.4c0-77.387, 62.738-140.125, 140.127-140.125c 77.406,0, 140.143,62.738, 140.143,140.125
-	C 461.725,221.997, 398.988,284.751, 321.582,284.751z M 253.365,132.129L 221.68,132.129 l0,24.938 l 31.686,0 L 253.366,132.129 z M 309.107,244.511l 24.936,0 
-	l0-31.702 l-24.936,0 L 309.107,244.511 z M 334.043,44.686l-24.936,0 l0,31.707 l 24.936,0 L 334.043,44.686 z M 321.582,94.654
-	c-27.565,0.017-49.92,22.371-49.936,49.955c 0.016,27.581, 22.37,49.916, 49.936,49.916c 27.603,0, 49.936-22.335, 49.936-49.916
-	C 371.518,117.025, 349.185,94.671, 321.582,94.654z M 389.798,132.129l0,24.938 l 31.704,0 l0-24.938 L 389.798,132.129 z M 321.582,173.908
-	c-16.168-0.034-29.27-13.129-29.299-29.299c 0.029-16.188, 13.131-29.283, 29.299-29.321c 16.188,0.038, 29.268,13.134, 29.303,29.321
-	C 350.85,160.779, 337.77,173.874, 321.582,173.908z"  />
-<glyph unicode="&#xe18a;" d="M 115.348,100.7l 12.361,12.329l 46.73-46.698l 23.742,23.743l-46.73,46.733l 12.327,12.324l 46.731-46.732l 23.743,23.776
-	l-46.7,46.73l 12.328,12.328l 46.733-46.728l 23.774,23.77l-46.732,46.734l 12.329,12.314l 46.729-46.716l 23.743,23.76l-46.732,46.709
-	l 12.362,12.316l 46.731-46.7l 23.74,23.759l-46.73,46.726l 12.329,12.33l 46.73-46.696l 23.739,23.743l-46.73,46.715l 12.363,12.325
-	l 46.73-46.717l 23.742,23.76l-46.701,46.718l 12.33,12.326l 46.732-46.728l 20.665,20.698l-67.002,67.005
-	c-9.452,9.422-24.757,9.422-34.175,0L 119.664,179.757l-45.947-45.928c-9.448-9.448-9.448-24.722,0-34.175l 67.042-67.006l 21.32,21.34
-	L 115.348,100.7z"  />
-<glyph unicode="&#xe18b;" d="M 335.058,381.382L 413.644,381.382L 413.644,66.618L 335.058,66.618zM 216.708,381.382L 295.294,381.382L 295.294,66.618L 216.708,66.618zM 98.356,381.382L 176.946,381.382L 176.946,66.618L 98.356,66.618z"  />
-<glyph unicode="&#xe18c;" d="M 460.5,401.756l-26.472,26.473c-16.867,16.868-44.216,16.865-61.083-0.003l-61.466-61.468l-29.702,29.699l-58.764-58.763
-	l 24.501-24.499L 79.748,145.427c-10.987-10.984-17.148-25.399-17.981-40.237l-9.766-9.764c-20.867-20.881-20.863-54.838, 0.002-75.704
-	c 10.106-10.108, 23.548-15.679, 37.85-15.679c 14.297,0, 27.733,5.568, 37.847,15.67l 9.758,9.765c 15.211,0.821, 29.394,7.139, 40.248,17.99
-	l 167.771,167.767l 24.493-24.495l 58.765,58.764l-29.698,29.699l 61.465,61.466C 477.372,357.538, 477.372,384.887, 460.5,401.756z
-	 M 150.574,74.602c-4.571-4.568-10.546-6.846-16.532-6.846c-3.501,0-7.007,0.782-10.231,2.343c0-0.003,0-0.007,0-0.007
-	l-23.242-23.236c-2.956-2.961-6.836-4.439-10.716-4.439c-3.876,0-7.759,1.479-10.715,4.439c-5.919,5.922-5.919,15.516-0.002,21.436
-	l 23.233,23.238c 0.002,0, 0.004,0.002, 0.008,0.004c-4.226,8.725-2.741,19.518, 4.503,26.761l 167.769,167.768l 43.695-43.693
-	L 150.574,74.602z"  />
-<glyph unicode="&#xe18d;" d="M 263.608,36.068l 97.171,97.179c 0.004,0, 0.006,0, 0.006,0l 0.008,0.010l 40.993,40.992
-	c-12.618-39.775-30.882-99.987-30.882-115.401c0-23.549, 19.085-42.636, 42.634-42.636c 23.553,0, 42.638,19.087, 42.638,42.636
-	c0,19.162-28.23,107.58-38.746,139.858c 0.097,1.079, 0.164,2.147, 0.155,3.188c-0.062,8.075-2.366,16.081-5.998,24.826
-	c-11.003,25.951-35.305,58.996-67.98,91.781c-21.784,21.779-43.88,39.849-63.736,52.719c-9.939,6.442-19.321,11.587-28.039,15.255
-	c-3.646,1.51-7.161,2.777-10.608,3.763c-5.957,5.534-11.766,10.71-17.44,15.348c-9.193,7.5-18.103,13.755-27.222,18.315
-	c-9.096,4.533-18.565,7.404-28.409,7.41c-14.507,0.103-28.52-6.647-40.352-18.664c-11.294-11.103-17.338-24.931-17.22-38.914
-	c 0.033-12.827, 4.488-25.109, 11.233-37.139c 4.189-7.422, 9.314-14.825, 15.159-22.32l-75.786-75.783
-	c-5.417-5.398-7.216-12.666-7.167-19.019c 0.054-8.066, 2.363-16.071, 5.988-24.823c 10.999-25.953, 35.305-58.994, 67.971-91.768
-	c 21.797-21.787, 43.891-39.854, 63.745-52.731c 9.945-6.443, 19.32-11.586, 28.037-15.254c 8.752-3.625, 16.757-5.935, 24.822-5.987
-	c 0.089-0.003, 0.181-0.003, 0.274-0.003c 6.302,0, 13.42,1.83, 18.745,7.157 M 143.643,348.879c-5.51,9.749-8.050,18.114-8.022,24.856
-	c 0.129,7.312, 2.366,13.508, 9.885,21.207c 8.933,8.764, 15.613,11.239, 22.646,11.329c 4.88,0.009, 10.525-1.431, 17.24-4.777
-	c 6.91-3.36, 14.62-8.785, 23.087-15.769c-0.137-0.127-0.28-0.234-0.411-0.368c-0.021-0.018-0.049-0.034-0.070-0.055l-53.165-53.165
-	C 150.383,338.014, 146.589,343.623, 143.643,348.879z M 341.827,152.909c-0.263-0.065-0.804-0.157-1.655-0.151
-	c-2.729-0.059-8.286,1.119-15.129,4.032c-20.825,8.646-52.862,31.589-83.767,62.607c-20.669,20.663-37.754,41.638-49.412,59.646
-	c-5.829,8.983-10.294,17.233-13.174,24.109c-2.921,6.846-4.095,12.405-4.041,15.134c0,0.819, 0.086,1.356, 0.146,1.623l 28.408,28.407
-	c 0.619-1.718, 1.279-3.456, 2.018-5.228c 11-25.951, 35.301-58.986, 67.981-91.771c 21.795-21.784, 43.883-39.855, 63.745-52.733
-	c 9.942-6.435, 19.32-11.589, 28.033-15.254c 1.777-0.735, 3.515-1.402, 5.238-2.021L 341.827,152.909z M 323.407,239.272
-	c-10.121,8.331-20.571,17.768-30.905,28.136c-20.678,20.666-37.754,41.644-49.415,59.647c-5.829,8.992-10.297,17.24-13.179,24.11
-	c-2.913,6.846-4.093,12.4-4.033,15.124c-0.002,0.442, 0.021,0.803, 0.055,1.078c 0.277,0.035, 0.639,0.059, 1.077,0.059
-	c 2.735,0.055, 8.286-1.116, 15.136-4.039c 20.826-8.64, 52.867-31.587, 83.762-62.588c 20.679-20.673, 37.764-41.651, 49.416-59.663
-	c 0.409-0.627, 0.793-1.242, 1.191-1.864L 323.407,239.272 z"  />
-<glyph unicode="&#xe18e;" d="M 255.77,187.396c 54.876,0, 99.381,44.472, 99.381,99.362c0,54.877-44.505,99.365-99.381,99.365
-	c-54.871,0-99.346-44.488-99.346-99.365C 156.424,231.869, 200.898,187.396, 255.77,187.396z M 218.59,322.666
-	c 4.514-0.116, 8.828,0.211, 13.014,0.999c 4.219,0.786, 7.979,2.19, 11.314,4.203c 3.336,1.99, 6.18,4.643, 8.472,7.911
-	c 2.322,3.286, 3.857,7.357, 4.579,12.216l 20.601,0 l0-127.602 L 250.67,220.393 l0,82.766 l-32.080,0 L 218.59,322.666 z M 134.579,180.088
-	c-7.587-4.203-12.23-8.65-13.964-11.629c-0.95-1.6-1.178-2.646-1.211-3.596c 0.033-0.945, 0.261-1.991, 1.211-3.612
-	c 1.014-1.685, 2.91-3.894, 5.819-6.231c 5.789-4.707, 15.535-9.776, 28.125-14.026c 25.115-8.565, 61.282-14.189, 101.21-14.175
-	c 52.355-0.146, 98.5,9.891, 121.192,22.808c 7.588,4.184, 12.264,8.667, 13.968,11.625c 0.946,1.621, 1.205,2.667, 1.24,3.612
-	c-0.035,0.95-0.294,1.996-1.24,3.596c-1.018,1.7-2.914,3.907-5.824,6.232c-4.675,3.808-11.936,7.831-21.156,11.481
-	c 24.525,26.372, 39.569,61.718, 39.569,100.586c0,81.61-66.156,147.767-147.749,147.767c-81.59,0-147.745-66.156-147.745-147.767
-	c0-38.868, 15.042-74.214, 39.571-100.586C 142.688,184.239, 138.274,182.211, 134.579,180.088z M 255.77,138.996
-	c-0.325,0-0.651,0.032-0.981,0.032C 255.118,139.028, 255.444,138.996, 255.77,138.996c 0.329,0, 0.656,0.032, 0.981,0.032
-	C 256.426,139.028, 256.099,138.996, 255.77,138.996z M 128.854,286.759c0,69.964, 56.935,126.916, 126.916,126.916
-	c 69.982,0, 126.916-56.952, 126.916-126.916c0-69.978-56.934-126.929-126.916-126.929C 185.788,159.83, 128.854,216.781, 128.854,286.759
-	z M 255.77,101.881c-55.561,0.133-103.925,9.681-133.391,25.998c-1.014,0.587-1.994,1.179-2.975,1.764l0-19.847 
-	c0-1.013, 0.23-2.079, 1.211-3.795c 1.014-1.701, 2.91-3.893, 5.819-6.244c 5.789-4.709, 15.535-9.78, 28.125-14.029
-	c 25.115-8.567, 61.282-14.19, 101.21-14.176c 52.292-0.148, 98.434,9.892, 121.192,22.81c 7.588,4.197, 12.264,8.665, 13.933,11.64
-	c 1.014,1.73, 1.275,2.782, 1.275,3.795l0,19.847 c-7.752-4.704-16.84-8.729-27.109-12.263
-	C 336.316,107.637, 298.055,101.913, 255.77,101.881z M 255.77,46.613c-55.561,0.134-103.925,9.682-133.391,26
-	c-1.014,0.586-2.024,1.179-2.975,1.764l0-22.598 c0-0.993, 0.23-2.092, 1.211-3.791c 1.014-1.7, 2.91-3.892, 5.819-6.248
-	c 5.789-4.705, 15.535-9.745, 28.125-13.994c 25.115-8.6, 61.282-14.223, 101.21-14.191c 52.292-0.133, 98.434,9.877, 121.192,22.825
-	c 7.588,4.188, 12.264,8.634, 13.968,11.608c 0.979,1.731, 1.24,2.814, 1.24,3.791l0,22.634 c-7.785-4.71-16.84-8.735-27.142-12.268
-	C 336.251,52.371, 298.021,46.646, 255.77,46.613z"  />
-<glyph unicode="&#xe18f;" d="M 256.393,187.845c 54.906,0, 99.381,44.471, 99.381,99.347c0,54.888-44.475,99.363-99.381,99.363
-	c-54.877,0-99.381-44.476-99.381-99.363C 157.012,232.315, 201.516,187.845, 256.393,187.845z M 232.618,347.652l 24.034-56.701
-	l 23.514,56.701l 29.529,0 l-28.223-56.701l 17.299,0 l0-17.3 L 272.71,273.651 l-2.743-5.298l0-8.388 l 28.805,0 l0-17.315 l-28.805,0 l0-25.148 l-27.703,0 L 242.264,242.65 l-28.615,0 
-	l0,17.315 l 28.615,0 l0,8.388 l-2.548,5.298l-26.067,0 l0,17.3 l 17.336,0 l-27.898,56.701L 232.618,347.652 z M 256.393,102.328
-	c-55.56,0.131-103.895,9.678-133.393,25.996c-1.011,0.588-1.995,1.158-2.975,1.765l0-19.852 c0-1.015, 0.229-2.091, 1.245-3.792
-	c 1.011-1.697, 2.876-3.891, 5.786-6.246c 5.789-4.691, 15.533-9.778, 28.094-14.012c 25.178-8.588, 61.312-14.213, 101.242-14.197
-	c 52.287-0.125, 98.428,9.885, 121.191,22.833c 7.554,4.183, 12.229,8.65, 13.965,11.622c 1.016,1.701, 1.209,2.777, 1.241,3.792l0,19.852 
-	c-7.717-4.71-16.81-8.729-27.108-12.247C 336.936,108.082, 298.673,102.356, 256.393,102.328z M 256.393,47.062
-	c-55.56,0.132-103.895,9.678-133.393,25.997c-1.011,0.587-1.995,1.178-2.975,1.763l0-22.596 c0-1, 0.229-2.092, 1.245-3.791
-	c 1.011-1.702, 2.876-3.894, 5.786-6.233c 5.789-4.719, 15.533-9.773, 28.094-14.040c 25.178-8.589, 61.312-14.215, 101.242-14.18
-	c 52.287-0.128, 98.428,9.874, 121.191,22.845c 7.554,4.166, 12.229,8.627, 13.965,11.608c 1.016,1.729, 1.209,2.814, 1.241,3.791l0,22.632 
-	c-7.752-4.708-16.874-8.733-27.175-12.266C 336.906,52.818, 298.641,47.093, 256.393,47.062z M 135.166,180.533
-	c-7.553-4.201-12.197-8.65-13.896-11.631c-0.95-1.598-1.211-2.642-1.245-3.61c 0.034-0.929, 0.295-1.979, 1.245-3.595
-	c 1.011-1.686, 2.876-3.895, 5.786-6.235c 5.789-4.702, 15.533-9.774, 28.094-14.024c 25.178-8.571, 61.312-14.193, 101.242-14.193
-	c 52.39-0.129, 98.497,9.891, 121.225,22.846c 7.553,4.166, 12.195,8.628, 13.932,11.607c 0.914,1.615, 1.176,2.666, 1.241,3.595
-	c-0.065,0.969-0.327,2.013-1.241,3.61c-0.98,1.704-2.91,3.896-5.791,6.235c-4.674,3.808-11.969,7.831-21.187,11.458
-	c 24.524,26.39, 39.567,61.741, 39.567,100.596c0,81.602-66.156,147.757-147.746,147.757c-81.589,0-147.747-66.155-147.747-147.757
-	c0-38.854, 15.044-74.206, 39.567-100.596C 143.31,184.684, 138.926,182.658, 135.166,180.533z M 256.393,139.441
-	c-0.326,0-0.622,0.032-0.982,0.032C 255.771,139.474, 256.066,139.441, 256.393,139.441c 0.324,0, 0.686,0.032, 0.98,0.032
-	C 257.078,139.474, 256.717,139.441, 256.393,139.441z M 129.477,287.191c0,69.979, 56.934,126.93, 126.916,126.93
-	c 69.98,0, 126.913-56.95, 126.913-126.93c0-69.986-56.933-126.915-126.913-126.915C 186.41,160.276, 129.477,217.205, 129.477,287.191z"  />
-<glyph unicode="&#xe190;" d="M 302.174,345.903c-67.297,0-121.879-54.581-121.879-121.883c0-67.302, 54.582-121.843, 121.879-121.843
-	c 67.303,0, 121.846,54.541, 121.846,121.843C 424.020,291.323, 369.477,345.903, 302.174,345.903z M 351.193,225.331l0-20.405 L 320.52,204.926 
-	l-3.203-6.218l0-9.875 l 33.877,0 l0-20.374 l-33.877,0 l0-29.594 l-32.64,0 l0,29.594 l-33.648,0 l0,20.374 l 33.648,0 l0,9.875 l-2.974,6.218l-30.675,0 l0,20.405 
-	l 20.374,0 l-32.834,66.711l 34.764,0 l 28.318-66.711l 27.666,66.711l 34.762,0 l-33.256-66.711L 351.193,225.331 z M 302.174,397.863
-	c-44.703,0-85.449-16.873-116.221-44.572c-26.426-0.623-51.148-3.269-72.565-7.456c-24.561-4.775-44.866-11.709-58.077-19.145
-	c-8.83-4.89-14.228-10.076-16.158-13.44c-1.043-1.817-1.304-2.909-1.34-3.909c 0.036-0.981, 0.297-2.095, 1.34-3.892
-	c 1.145-1.932, 3.309-4.446, 6.706-7.161c 6.704-5.46, 18.118-11.411, 32.863-16.419c 15.372-5.233, 34.37-9.531, 55.63-12.456
-	c-2.652-9.745-4.418-19.838-5.332-30.183c-7.391,1.030-14.619,2.185-21.553,3.53c-26.781,5.294-49.641,12.735-67.137,22.517
-	c-0.881,0.47-1.697,0.998-2.518,1.484l0-27.209 c0-1.030, 0.197-2.171, 1.34-4.12c 1.145-1.911, 3.309-4.446, 6.706-7.144
-	c 6.704-5.479, 18.118-11.428, 32.863-16.398c 14.324-4.906, 31.788-8.962, 51.312-11.872c 1.504-10.99, 4.054-21.679, 7.555-31.917
-	c-10.465,1.245-20.539,2.782-30.121,4.661c-26.781,5.281-49.641,12.738-67.137,22.513c-1.209,0.671-2.389,1.374-3.564,2.093l0-23.561 
-	c 0.032-1.225, 0.297-2.565, 1.506-4.661c 1.242-2.023, 3.5-4.643, 6.934-7.42c 6.867-5.593, 18.375-11.546, 33.195-16.584
-	c 20.502-6.995, 47.28-12.294, 77.437-14.892c 6.995-10.943, 15.2-21.015, 24.394-30.071c-26.098,0.851-50.656,3.533-72.533,7.816
-	c-26.75,5.266-49.512,12.689-66.875,22.402c-1.016,0.588-2.027,1.177-3.010,1.78l0-26.226 c0-1.030, 0.197-2.191, 1.34-4.135
-	c 1.145-1.902, 3.309-4.454, 6.706-7.146c 6.704-5.481, 18.118-11.396, 32.863-16.404c 29.497-10.085, 71.946-16.676, 118.871-16.645
-	c 13.343,0, 26.228,0.56, 38.622,1.538c 20.34-8.34, 42.609-12.95, 65.959-12.95c 95.98,0, 173.842,77.801, 173.842,173.81
-	C 476.016,320.036, 398.154,397.863, 302.174,397.863z M 302.174,75.133c-82.115,0-148.922,66.772-148.922,148.888
-	c0,82.116, 66.807,148.91, 148.922,148.91c 82.082,0, 148.891-66.794, 148.891-148.91C 451.064,141.905, 384.256,75.133, 302.174,75.133z"  />
-<glyph unicode="&#xe191;" d="M 255.531,188.051c 54.873,0, 99.348,44.506, 99.348,99.381c0,54.899-44.475,99.348-99.348,99.348s-99.363-44.448-99.363-99.348
-	C 156.168,232.557, 200.658,188.051, 255.531,188.051z M 207.493,299.533l 11.673,0 c-1.83,2.283-3.663,5.684-5.461,10.199
-	c-1.83,4.479-2.745,9.48-2.745,14.945c0,4.841, 1.013,9.449, 3.007,13.862c 1.996,4.351, 4.938,8.21, 8.83,11.545
-	c 3.892,3.337, 8.748,5.983, 14.586,7.948c 5.853,1.93, 12.589,2.909, 20.243,2.909c 13.962,0, 24.837-3.892, 32.618-11.705
-	c 7.784-7.757, 11.658-19.032, 11.658-33.878l-24.592,0 c-0.129,1.824-0.395,4.116-0.736,6.863c-0.375,2.715-1.193,5.365-2.47,7.915
-	c-1.258,2.552-3.202,4.775-5.819,6.642c-2.617,1.895-6.229,2.839-10.84,2.839c-5.478,0-9.827-1.536-13.033-4.577
-	c-3.238-3.039-4.839-7.094-4.839-12.194c0-1.476, 0.065-2.878, 0.163-4.188c 0.133-1.34, 0.425-2.881, 0.851-4.644
-	c 0.424-1.767, 1.146-3.791, 2.191-6.114c 1.014-2.325, 2.452-5.102, 4.25-8.367l 24.264,0 l0-15.503 l-19.146,0 
-	c 0.604-1.835, 1.029-3.631, 1.192-5.467c 0.163-1.828, 0.263-3.791, 0.263-5.851c0-5.688-1.487-10.624-4.463-14.65
-	c-2.992-4.087-6.46-7.714-10.479-10.859l 0.374-0.389c 2.91,1.865, 5.281,3.003, 7.114,3.465c 1.798,0.521, 3.565,0.754, 5.266,0.754
-	c 2.451,0, 4.837-0.232, 7.208-0.654c 2.371-0.396, 4.761-0.882, 7.196-1.342c 2.438-0.59, 4.79-1.113, 7.113-1.568
-	c 2.287-0.428, 4.676-0.654, 7.11-0.654c 2.423,0, 4.892,0.453, 7.377,1.303c 2.5,0.854, 5.377,3.041, 8.665,6.578l 10.922-18.412
-	c-4.366-4.285-9.060-7.26-14.029-8.961c-4.969-1.67-9.777-2.521-14.389-2.521c-4.626,0-8.452,0.265-11.479,0.891
-	c-3.043,0.615-5.837,1.333-8.404,2.183c-2.665,0.953-5.328,1.834-8.012,2.549c-2.681,0.759-6.018,1.117-10.039,1.117
-	c-3.27,0-6.705-0.459-10.269-1.375c-3.596-0.918-7.163-2.711-10.676-5.364l-11.299,16.778c 2.552,1.568, 5.070,3.369, 7.555,5.523
-	c 2.5,2.129, 4.692,4.484, 6.571,7.003c 1.897,2.584, 3.435,5.329, 4.646,8.304c 1.21,2.977, 1.83,6.114, 1.83,9.422
-	c0,2.059-0.344,4.084-1.014,6.084c-0.671,1.988-1.487,4.016-2.454,6.114l-18.049,0 L 207.493,299.533 z M 255.531,47.304
-	c-55.559,0.132-103.925,9.678-133.408,25.997c-1.013,0.553-2.009,1.176-2.991,1.761l0-22.597 c 0.035-1.012, 0.229-2.090, 1.244-3.859
-	c 1.013-1.633, 2.894-3.824, 5.803-6.178c 5.805-4.711, 15.551-9.779, 28.109-14.027c 25.146-8.605, 61.315-14.229, 101.243-14.195
-	c 52.274-0.131, 98.43,9.906, 121.192,22.859c 7.556,4.183, 12.231,8.633, 13.948,11.576c 0.998,1.734, 1.225,2.842, 1.225,3.824l0,22.632 
-	c-7.731-4.744-16.807-8.763-27.142-12.293C 336.010,53.055, 297.747,47.334, 255.531,47.304z M 255.531,102.528
-	c-55.559,0.135-103.925,9.718-133.408,26.038c-1.013,0.584-2.009,1.174-2.991,1.762l0-19.85 c 0.035-1.047, 0.229-2.088, 1.244-3.822
-	c 1.013-1.668, 2.894-3.893, 5.803-6.219c 5.805-4.707, 15.551-9.805, 28.109-14.025c 25.146-8.602, 61.315-14.195, 101.243-14.164
-	c 52.274-0.162, 98.43,9.844, 121.192,22.795c 7.556,4.187, 12.231,8.633, 13.931,11.643c 1.016,1.705, 1.242,2.746, 1.242,3.793l0,19.85 
-	c-7.715-4.708-16.807-8.766-27.076-12.295C 336.076,108.289, 297.814,102.568, 255.531,102.528z M 134.324,180.754
-	c-7.57-4.183-12.231-8.633-13.948-11.642c-0.948-1.567-1.178-2.651-1.244-3.562c 0.066-0.952, 0.296-2.028, 1.244-3.631
-	c 1.013-1.696, 2.894-3.888, 5.803-6.246c 5.805-4.68, 15.551-9.778, 28.109-14.030c 25.146-8.596, 61.315-14.188, 101.243-14.16
-	c 52.356-0.129, 98.465,9.908, 121.192,22.796c 7.571,4.216, 12.231,8.663, 13.948,11.641c 0.932,1.603, 1.191,2.679, 1.225,3.631
-	c-0.033,0.911-0.293,1.995-1.225,3.562c-0.999,1.733-2.895,3.927-5.805,6.278c-4.676,3.763-11.971,7.789-21.158,11.416
-	c 24.524,26.42, 39.568,61.74, 39.568,100.625c0,81.588-66.173,147.742-147.746,147.742c-81.609,0-147.746-66.154-147.746-147.742
-	c0-38.885, 15.043-74.205, 39.568-100.625C 142.448,184.91, 138.032,182.881, 134.324,180.754z M 255.531,139.652
-	c-0.344,0-0.67,0.028-0.999,0.028C 254.861,139.681, 255.188,139.652, 255.531,139.652c 0.328,0, 0.654,0.028, 0.982,0.028
-	C 256.186,139.681, 255.859,139.652, 255.531,139.652z M 128.617,287.432c0,69.98, 56.933,126.943, 126.915,126.943
-	c 69.967,0, 126.9-56.963, 126.9-126.943c0-69.986-56.934-126.919-126.9-126.919C 185.549,160.513, 128.617,217.445, 128.617,287.432z"  />
-<glyph unicode="&#xe192;" d="M 302.066,346.57c-67.267,0-121.844-54.615-121.844-121.916c0-67.263, 54.578-121.812, 121.844-121.812
-	c 67.303,0, 121.88,54.549, 121.88,121.812C 423.946,291.955, 369.369,346.57, 302.066,346.57z M 345.335,151.569
-	c-5.857-1.995-11.513-3.041-16.943-3.041c-5.428,0-9.94,0.392-13.538,1.11c-3.564,0.724-6.867,1.533-9.846,2.586
-	c-3.137,1.109-6.307,2.155-9.448,3.007c-3.139,0.85-7.095,1.245-11.804,1.245c-3.86,0-7.914-0.524-12.102-1.573
-	c-4.216-1.11-8.404-3.169-12.557-6.375l-13.309,19.753c 3.009,1.863, 5.983,4.056, 8.893,6.537c 2.91,2.551, 5.527,5.264, 7.718,8.271
-	c 2.225,3.012, 4.055,6.25, 5.492,9.785c 1.406,3.492, 2.128,7.191, 2.128,11.013c0,2.456-0.392,4.845-1.177,7.169
-	c-0.785,2.387-1.734,4.775-2.878,7.225L 244.71,218.281 l0,18.211 l 13.733,0 c-2.158,2.751-4.286,6.775-6.441,12.039
-	c-2.16,5.297-3.205,11.148-3.205,17.592c0,5.725, 1.175,11.15, 3.531,16.317c 2.354,5.134, 5.855,9.682, 10.431,13.606
-	c 4.548,3.922, 10.269,7.064, 17.136,9.349c 6.867,2.258, 14.815,3.405, 23.839,3.405c 16.415,0, 29.236-4.551, 38.392-13.701
-	c 9.158-9.158, 13.734-22.466, 13.734-39.931L 326.89,255.168 c-0.132,2.16-0.427,4.874-0.852,8.044c-0.426,3.236-1.405,6.344-2.911,9.352
-	c-1.503,3.010-3.794,5.625-6.866,7.845c-3.075,2.194-7.294,3.309-12.752,3.309c-6.446,0-11.546-1.798-15.372-5.333
-	c-3.762-3.595-5.657-8.402-5.657-14.414c0-1.705, 0.065-3.342, 0.229-4.909c 0.129-1.605, 0.425-3.403, 0.947-5.464
-	c 0.491-2.093, 1.341-4.482, 2.584-7.195c 1.178-2.746, 2.879-6.016, 5.035-9.91l 28.552,0 l0-18.211 l-22.531,0 
-	c 0.683-2.162, 1.174-4.253, 1.372-6.41c 0.228-2.191, 0.327-4.451, 0.327-6.865c0-6.742-1.735-12.531-5.233-17.272
-	c-3.533-4.804-7.652-9.087-12.361-12.784l 0.424-0.42c 3.436,2.121, 6.215,3.465, 8.374,4.084c 2.158,0.557, 4.217,0.854, 6.211,0.854
-	c 2.882,0, 5.69-0.266, 8.47-0.755c 2.813-0.495, 5.659-1.048, 8.504-1.602c 2.844-0.751, 5.623-1.342, 8.338-1.834
-	c 2.747-0.489, 5.528-0.747, 8.371-0.747c 2.879,0, 5.756,0.49, 8.701,1.465c 2.94,1.053, 6.344,3.602, 10.202,7.754l 12.853-21.647
-	C 356.713,157.062, 351.185,153.527, 345.335,151.569z M 302.066,398.535c-44.666,0-85.416-16.871-116.222-44.574
-	c-26.39-0.624-51.079-3.236-72.532-7.455c-24.591-4.775-44.865-11.71-58.077-19.165c-8.83-4.872-14.226-10.042-16.123-13.438
-	c-1.078-1.801-1.34-2.945-1.373-3.895c 0.033-0.978, 0.295-2.092, 1.373-3.928c 1.112-1.893, 3.271-4.408, 6.638-7.127
-	c 6.737-5.492, 18.15-11.412, 32.866-16.413c 15.402-5.229, 34.401-9.548, 55.657-12.458c-2.648-9.747-4.413-19.853-5.329-30.186
-	c-7.392,1.016-14.652,2.191-21.549,3.531c-26.785,5.267-49.644,12.756-67.138,22.498c-0.884,0.492-1.701,1.016-2.552,1.538l0-27.239 
-	c 0.033-1.047, 0.23-2.193, 1.406-4.15c 1.112-1.904, 3.271-4.414, 6.638-7.133c 6.737-5.427, 18.15-11.412, 32.866-16.385
-	c 14.357-4.9, 31.786-8.994, 51.308-11.868c 1.539-10.987, 4.089-21.685, 7.588-31.916c-10.465,1.239-20.568,2.776-30.116,4.644
-	c-26.785,5.296-49.644,12.752-67.138,22.528c-1.21,0.687-2.39,1.373-3.566,2.095l0-23.543 c 0.034-1.248, 0.294-2.589, 1.537-4.678
-	c 1.211-2.031, 3.467-4.643, 6.902-7.428c 6.867-5.586, 18.377-11.51, 33.16-16.545c 20.536-7.062, 47.318-12.322, 77.469-14.944
-	c 7-10.92, 15.173-20.991, 24.397-30.048c-26.098,0.848-50.654,3.561-72.535,7.811c-26.749,5.299-49.509,12.689-66.874,22.398
-	c-1.015,0.592-2.028,1.178-3.042,1.771l0-26.23 c 0.033-1.016, 0.23-2.154, 1.406-4.121c 1.112-1.893, 3.271-4.447, 6.638-7.13
-	c 6.737-5.493, 18.15-11.445, 32.866-16.413c 29.497-10.108, 71.978-16.678, 118.935-16.645c 13.31,0, 26.195,0.551, 38.589,1.535
-	c 20.343-8.337, 42.577-12.978, 65.926-12.978c 96.014,0, 173.844,77.854, 173.844,173.802C 475.91,320.7, 398.080,398.535, 302.066,398.535z
-	 M 302.066,75.799c-82.112,0-148.889,66.811-148.889,148.855c0,82.115, 66.776,148.926, 148.889,148.926
-	c 82.115,0, 148.927-66.811, 148.927-148.926C 450.993,142.609, 384.182,75.799, 302.066,75.799z"  />
-<glyph unicode="&#xe193;" d="M 256.258,102.008c-55.562,0.099-103.895,9.68-133.391,25.966c-1.016,0.587-1.997,1.179-2.977,1.794l0-19.846 
-			c 0.033-1.011, 0.195-2.096, 1.242-3.827c 1.012-1.698, 2.877-3.854, 5.787-6.208c 5.823-4.713, 15.564-9.783, 28.092-14.066
-			c 25.148-8.531, 61.317-14.188, 101.246-14.157c 52.288-0.134, 98.462,9.874, 121.225,22.854c 7.554,4.188, 12.195,8.637, 13.93,11.608
-			c 1.014,1.7, 1.242,2.785, 1.242,3.796l0,19.846 c-7.749-4.703-16.809-8.727-27.109-12.258
-			C 336.803,107.766, 298.541,102.038, 256.258,102.008z M 385.592,174.834c-4.68,3.759-11.938,7.784-21.158,11.447
-			c 24.559,26.39, 39.569,61.705, 39.569,100.592c0,81.59-66.157,147.746-147.745,147.746c-81.592,0-147.748-66.156-147.748-147.746
-			c0-38.887, 15.043-74.202, 39.57-100.592c-4.875-1.928-9.29-3.963-13.017-6.051c-7.586-4.22-12.229-8.666-13.931-11.638
-			c-0.949-1.639-1.209-2.651-1.209-3.636c0-0.945, 0.26-1.991, 1.209-3.627c 1.012-1.669, 2.877-3.829, 5.787-6.178
-			c 5.823-4.713, 15.564-9.783, 28.092-14.066c 25.148-8.531, 61.317-14.188, 101.246-14.158c 52.354-0.131, 98.496,9.875, 121.225,22.825
-			c 7.584,4.188, 12.195,8.667, 13.93,11.577c 0.948,1.636, 1.178,2.682, 1.242,3.627c-0.064,0.984-0.294,1.997-1.242,3.636
-			C 390.397,170.256, 388.533,172.482, 385.592,174.834z M 256.258,159.926c-69.984,0-126.918,56.929-126.918,126.947
-			c0,69.945, 56.934,126.914, 126.918,126.914c 69.979,0, 126.912-56.969, 126.912-126.914
-			C 383.17,216.854, 326.236,159.926, 256.258,159.926z M 256.258,46.772c-55.562,0.101-103.895,9.649-133.391,25.966
-			c-1.016,0.594-1.997,1.179-2.977,1.773l0-22.599 c 0.033-0.983, 0.195-2.13, 1.242-3.8c 1.012-1.701, 2.877-3.922, 5.787-6.24
-			c 5.823-4.713, 15.564-9.812, 28.092-14.031c 25.148-8.566, 61.317-14.223, 101.246-14.191c 52.288-0.135, 98.462,9.873, 121.225,22.822
-			c 7.554,4.189, 12.195,8.639, 13.93,11.641c 1.014,1.738, 1.242,2.816, 1.242,3.8L 392.654,74.54 c-7.749-4.741-16.843-8.767-27.176-12.263
-			C 336.769,52.498, 298.506,46.772, 256.258,46.772z M 256.258,386.217c-54.875,0-99.352-44.473-99.352-99.344
-			c0-54.877, 44.477-99.381, 99.352-99.381c 54.87,0, 99.378,44.504, 99.378,99.381C 355.636,341.744, 311.128,386.217, 256.258,386.217z
-			 M 278.396,307.57l-5.658-13.111l-40.81,0 l-0.197-7.652l 38.851,0 l-5.691-13.148l-31.687,0 c 3.891-19.162, 12.883-28.776, 26.978-28.776
-			c 9.092,0, 18.444,3.861, 28.059,11.479l-0.197-27.499c-8.143-4.775-17.461-7.133-28.060-7.133c-15.303,0-27.633,4.907-36.983,14.752
-			c-8.537,8.891-14.060,21.254-16.58,37.178l-14.062,0 l 5.657,13.148l 7.293,0 l0,4.742 c0,1.701, 0.063,2.65, 0.193,2.91l-13.309,0 l 5.657,13.111
-			l 9.289,0 c 2.909,14.686, 8.926,26.33, 18.051,34.83c 9.581,9.254, 21.615,13.864, 36.068,13.864c 10.204,0, 21.258-3.042, 33.193-9.157
-			l-11.12-22.793c-8.532,5.492-16.481,8.241-23.904,8.241c-12.719,0-21.286-8.308-25.505-24.985L 278.396,307.571 z"  />
-<glyph unicode="&#xe194;" d="M 301.384,345.983c-67.3,0-121.849-54.546-121.849-121.817c0-67.331, 54.549-121.91, 121.849-121.91
-	c 67.297,0, 121.846,54.579, 121.846,121.91C 423.229,291.438, 368.681,345.983, 301.384,345.983z M 334.25,246.564l-6.672-15.465l-48.057,0 
-	l-0.211-8.996l 45.683,0 l-6.638-15.467l-37.344,0 c 4.576-22.6, 15.172-33.879, 31.766-33.879c 10.713,0, 21.733,4.516, 33.029,13.51
-	l-0.211-32.379c-9.582-5.592-20.603-8.372-33.047-8.372c-18.016,0-32.536,5.79-43.541,17.364
-	c-10.005,10.467-16.514,25.047-19.521,43.756l-16.514,0 l 6.637,15.467l 8.584,0 l0,5.594 c0,1.962, 0.083,3.104, 0.213,3.402l-15.664,0 
-	l 6.653,15.465l 10.94,0 c 3.449,17.27, 10.531,30.971, 21.256,40.944c 11.282,10.862, 25.443,16.352, 42.479,16.352
-	c 12.020,0, 25.017-3.595, 39.046-10.757l-13.079-26.817c-10.023,6.442-19.393,9.679-28.125,9.679c-15.011,0-25.015-9.781-30.019-29.4
-	L 334.25,246.565 z M 301.384,397.975c-44.705,0-85.417-16.906-116.222-44.605c-26.424-0.623-51.147-3.238-72.567-7.455
-	c-24.557-4.742-44.865-11.673-58.078-19.129c-8.828-4.875-14.226-10.075-16.137-13.44c-1.063-1.803-1.325-2.877-1.357-3.894
-	c 0.032-0.98, 0.294-2.127, 1.357-3.889c 1.128-1.928, 3.301-4.48, 6.67-7.191c 6.735-5.436, 18.133-11.385, 32.883-16.391
-	c 15.402-5.264, 34.369-9.516, 55.642-12.46c-2.633-9.741-4.433-19.811-5.333-30.179c-7.39,1.045-14.632,2.187-21.565,3.523
-	c-26.783,5.308-49.608,12.725-67.137,22.508c-0.85,0.49-1.685,0.979-2.517,1.5l0-27.203 c0-1.049, 0.226-2.162, 1.357-4.127
-	c 1.128-1.926, 3.301-4.476, 6.67-7.127c 6.735-5.492, 18.133-11.444, 32.883-16.413c 14.321-4.877, 31.784-8.964, 51.308-11.875
-	c 1.506-10.986, 4.071-21.679, 7.554-31.917c-10.463,1.215-20.537,2.814-30.118,4.677c-26.783,5.27-49.608,12.726-67.137,22.47
-	c-1.193,0.685-2.387,1.434-3.566,2.090l0-23.545 c 0.052-1.24, 0.297-2.549, 1.537-4.643c 1.213-2.025, 3.468-4.646, 6.904-7.424
-	c 6.881-5.592, 18.377-11.544, 33.191-16.582c 20.503-7, 47.304-12.295, 77.436-14.877c 7.016-10.92, 15.208-21.029, 24.396-30.117
-	c-26.096,0.881-50.652,3.565-72.532,7.846c-26.732,5.27-49.494,12.693-66.859,22.406c-1.029,0.582-2.044,1.178-3.023,1.762l0-26.227 
-	c0-1.045, 0.226-2.191, 1.357-4.116c 1.128-1.936, 3.301-4.45, 6.67-7.163c 6.735-5.461, 18.133-11.414, 32.883-16.389
-	c 29.497-10.067, 71.96-16.68, 118.886-16.645c 13.324,0, 26.242,0.527, 38.637,1.535c 20.323-8.338, 42.579-12.98, 65.927-12.98
-	c 96.010,0, 173.841,77.832, 173.841,173.877C 475.225,320.149, 397.394,397.975, 301.384,397.975z M 301.384,75.24
-	c-82.113,0-148.925,66.777-148.925,148.926c0,82.082, 66.812,148.859, 148.925,148.859c 82.097,0, 148.905-66.777, 148.905-148.859
-	C 450.289,142.018, 383.48,75.24, 301.384,75.24z"  />
-<glyph unicode="&#xe195;" d="M 249.555,334.391c-2.060,0-4.057-0.325-6.016-0.912c-1.966-0.592-3.698-1.538-5.27-2.814c-1.6-1.274-2.843-2.879-3.76-4.745
-	c-0.916-1.894-1.373-4.084-1.373-6.668c0-3.987, 1.309-7.13, 3.826-9.282c 2.58-2.192, 6.77-3.924, 12.592-5.266L 249.554,334.391 z
-	 M 273.521,245.638c 1.898,1.476, 3.439,3.237, 4.646,5.367c 1.208,2.122, 1.832,4.642, 1.832,7.589c0,4.736-1.507,8.304-4.482,10.655
-	c-2.977,2.355-8.045,4.516-15.205,6.476l0-35.022 c 2.189,0.263, 4.48,0.786, 6.834,1.536
-	C 269.504,243.027, 271.662,244.171, 273.521,245.638z M 256.191,187.82c 54.873,0, 99.381,44.509, 99.381,99.387
-	c0,54.854-44.508,99.348-99.381,99.348s-99.35-44.493-99.35-99.348C 156.842,232.329, 201.318,187.82, 256.191,187.82z M 247.1,279.62
-	c-1.046,0.324-2.158,0.589-3.367,0.848c-4.512,1.177-8.93,2.618-13.309,4.253c-4.383,1.666-8.309,3.828-11.775,6.571
-	c-3.465,2.716-6.211,6.116-8.271,10.206c-2.094,4.053-3.107,9.157-3.107,15.233c0,6.186, 1.178,11.646, 3.563,16.388
-	c 2.356,4.721, 5.464,8.713, 9.388,11.938c 3.89,3.203, 8.371,5.722, 13.472,7.486c 5.103,1.762, 10.399,2.83, 15.862,3.174l0,14.042 l 10.758,0 
-	l0-14.042 c 5.462-0.607, 10.594-1.801, 15.402-3.562c 4.807-1.738, 9.024-4.189, 12.654-7.263c 3.664-3.108, 6.641-6.968, 8.928-11.575
-	c 2.321-4.645, 3.662-10.108, 4.021-16.422L 275.42,316.895 c-0.096,4.877-1.633,8.996-4.514,12.396c-2.942,3.403-6.473,5.101-10.594,5.101
-	l0-32.276 c 1.439-0.358, 2.943-0.718, 4.48-1.075c 1.502-0.391, 3.107-0.789, 4.805-1.272c 8.996-2.427, 15.928-5.431, 20.801-9.026
-	c 4.84-3.601, 8.438-7.332, 10.726-11.219c 2.323-3.892, 3.661-7.752, 4.118-11.674c 0.426-3.861, 0.624-7.325, 0.624-10.368
-	c0-2.648-0.654-6.054-1.995-10.104c-1.342-4.089-3.729-8.079-7.194-11.972c-3.466-3.894-8.11-7.327-13.935-10.367
-	c-5.85-3.041-13.309-4.838-22.43-5.461l0-15.497 l-10.758,0 l0,15.497 c-13.639,0.951-24.265,5.171-31.918,12.561
-	c-7.619,7.386-12.066,18.275-13.278,32.637l 25.702,0 c-0.128-6.935, 1.704-12.395, 5.463-16.42c 3.76-3.988, 8.441-6.539, 14.031-7.651
-	l0,38.097 C 248.932,279.032, 248.148,279.322, 247.1,279.62z M 256.191,102.311c-55.525,0.129-103.891,9.644-133.389,26.032
-	c-1.016,0.554-1.997,1.14-2.977,1.731l0-19.883 c0-0.951, 0.227-2.029, 1.24-3.76c 1.014-1.671, 2.912-3.896, 5.789-6.25
-	c 5.82-4.674, 15.535-9.74, 28.092-13.994c 25.18-8.603, 61.35-14.225, 101.244-14.157c 52.291-0.165, 98.434,9.845, 121.192,22.793
-	c 7.587,4.183, 12.262,8.63, 13.966,11.608c 1.014,1.73, 1.24,2.809, 1.24,3.76l0,19.883 c-7.751-4.709-16.809-8.697-27.077-12.232
-	C 336.77,108.099, 298.508,102.342, 256.191,102.311z M 256.191,47.045c-55.525,0.131-103.891,9.711-133.389,25.998
-	c-1.016,0.585-1.997,1.178-2.977,1.765l0-22.565 c0-1.017, 0.227-2.091, 1.24-3.825c 1.014-1.701, 2.912-3.86, 5.789-6.216
-	c 5.82-4.705, 15.535-9.773, 28.092-14.026c 25.18-8.633, 61.35-14.229, 101.244-14.193c 52.291-0.097, 98.434,9.911, 121.192,22.79
-	c 7.587,4.221, 12.262,8.667, 13.997,11.678c 0.982,1.702, 1.209,2.776, 1.209,3.793L 392.588,74.84 c-7.751-4.707-16.841-8.729-27.176-12.264
-	C 336.703,52.833, 298.443,47.074, 256.191,47.045z M 134.999,180.499c-7.555-4.185-12.231-8.628-13.933-11.578
-	c-0.944-1.601-1.207-2.678-1.24-3.597c 0.033-0.982, 0.296-1.994, 1.24-3.627c 1.014-1.671, 2.912-3.895, 5.789-6.248
-	c 5.82-4.71, 15.535-9.742, 28.092-13.994c 25.18-8.603, 61.35-14.229, 101.244-14.157c 52.357-0.167, 98.496,9.837, 121.227,22.753
-	c 7.588,4.221, 12.228,8.637, 13.963,11.646c 0.916,1.633, 1.178,2.645, 1.209,3.627c-0.031,0.919-0.293,1.996-1.209,3.597
-	c-1.047,1.702-2.941,3.892-5.854,6.217c-4.645,3.79-11.936,7.814-21.16,11.475c 24.528,26.356, 39.57,61.709, 39.57,100.595
-	c0,81.607-66.154,147.741-147.746,147.741c-81.559,0-147.746-66.134-147.746-147.741c0-38.854, 15.043-74.238, 39.604-100.595
-	C 143.141,184.653, 138.727,182.658, 134.999,180.499z M 256.191,139.424c-0.325,0-0.653,0.035-0.948,0.035
-	C 255.538,139.459, 255.866,139.424, 256.191,139.424c 0.361,0, 0.654,0.035, 1.014,0.035
-	C 256.846,139.459, 256.553,139.424, 256.191,139.424z M 129.275,287.207c0,69.979, 56.967,126.928, 126.916,126.928
-	c 69.982,0, 126.918-56.949, 126.918-126.928c0-69.984-56.936-126.914-126.918-126.914
-	C 186.242,160.293, 129.275,217.223, 129.275,287.207z"  />
-<glyph unicode="&#xe196;" d="M 175.903,287.675c-74.167,1.456-135.204-44.246-136.348-102.081
-			c-0.392-20.108, 6.506-39.042, 18.769-55.234c 21.125-27.121-1.929-73.803-1.929-73.803l 68.084,29.331
-			c 14.651-4.642, 30.61-7.355, 47.306-7.683c 74.167-1.476, 135.235,44.262, 136.348,102.125
-			C 309.277,238.131, 250.087,286.221, 175.903,287.675z M 454.67,232.18L 454.67,232.18c 12.279,16.201, 19.197,35.123, 18.788,55.234
-			c-1.13,57.831-62.216,103.566-136.383,102.062c-62.149-1.212-113.803-35.205-128.207-80.203
-			c 29.023-5.476, 55.659-17.367, 77.126-34.793c 30.97-25.15, 47.68-58.683, 47.074-94.406c 2.699-0.057, 5.412-0.089, 8.127,0
-			c 16.727,0.256, 32.651,2.971, 47.335,7.65l 68.067-29.338C 456.598,158.387, 433.543,205.055, 454.67,232.18z"  />
-<glyph unicode="&#xe197;" d="M 163.495,192.844c-118.242,14.047-68.454,85.798-2.329,154.135c-230.392-155.777-90.703-223.496, 3.175-238.084l 0.592-58.709
-	l 117.78,100.689l-119.785,98.042L 163.495,192.844z M 345.271,340.477l-0.592,58.712L 226.9,298.497l 119.784-98.046l-0.564,56.078
-	c 118.242-14.051, 68.451-85.798, 2.328-154.141C 578.836,258.168, 439.15,325.887, 345.271,340.477z"  />
-<glyph unicode="&#xe198;" d="M 89.486,100.698L 89.486,348.287L 120.264,348.287L 120.264,100.698L 89.486,100.698 	zM 34.664,64.455L 34.664,384.527L 65.442,384.527L 65.442,64.455L 34.664,64.455 	zM 391.187,100.698L 391.187,348.289L 421.961,348.289L 421.961,100.698L 391.187,100.698 	zM 446.004,64.455L 446.004,384.527L 476.784,384.527L 476.784,64.455L 446.004,64.455 	zM 144.579,335.17L 365.936,335.17L 365.936,113.812L 144.579,113.812z"  />
-<glyph unicode="&#xe199;" d="M 454.811,356.248L 55.944,356.248 c-11.259,0-20.381-8.518-20.381-19.020l0-224.975 c0-10.5, 9.122-19.006, 20.381-19.006l 398.866,0 
-	c 11.258,0, 20.382,8.506, 20.382,19.006L 475.192,337.229 C 475.192,347.73, 466.068,356.248, 454.811,356.248z M 444.99,123.451L 65.763,123.451 l0,97.784 
-	L 444.99,221.235 L 444.99,123.451 z M 444.99,301.729L 65.763,301.729 l0,24.316 L 444.99,326.045 L 444.99,301.729 z M 161.433,189.937L 98.547,189.937 l0-16.782 l 62.886,0 L 161.433,189.937 z M 255.435,189.937
-	l-81.98,0 l0-16.782 l 81.98,0 L 255.435,189.937 z M 267.444,164.225L 98.547,164.225 l0-16.781 l 168.897,0 L 267.444,164.225 z"  />
-<glyph unicode="&#xe19a;" d="M 450.803,363.082L 58.286,363.082 c-11.082,0-20.063-8.98-20.063-20.061l0-237.386 
-		c0-11.071, 8.981-20.054, 20.063-20.054l 392.517,0 c 11.081,0, 20.062,8.982, 20.062,20.054L 470.865,343.021 
-		C 470.864,354.101, 461.884,363.082, 450.803,363.082z M 266.422,143.064L 100.193,143.064 l0,17.094 l 166.229,0 L 266.422,143.064 z M 100.19,170.191l0,17.101 
-		l 61.91,0 l0-17.101 L 100.19,170.191 z M 173.922,170.188l0,17.101 l 80.681,0 l0-17.101 L 173.922,170.188 z M 450.15,222.079L 59.783,222.079 l0,82.017 L 450.15,304.096 L 450.15,222.079 z"  />
-<glyph unicode="&#xe19b;" d="M 426.671,345.506l-41.972,0 l0,41.99 l-51.145,0 l0-41.99 L 153.042,345.506 l-49.74,49.775l-17.644-17.63l 49.542-49.54l0-180.939 L 93.229,147.172 l0-51.116 
-	l 41.972,0 l0-41.954 l 51.164,0 l0,41.954 l 198.335,0 L 384.7,294.39 l 41.972,0 L 426.672,345.506 z M 186.364,276.963l 129.761-129.791L 186.364,147.172 L 186.364,276.963 z M 333.555,165.027
-	L 204.185,294.39l 129.37,0 L 333.555,165.027 z"  />
-<glyph unicode="&#xe19c;" d="M 446.055,239.456c-7.388,92.958-81.505,167.077-174.478,174.466L 271.577,441.785 L 240.92,441.785 l0-27.863 
-	c-92.94-7.404-167.042-81.508-174.467-174.482l-27.86,0 l0-30.64 l 27.86,0 c 7.425-92.952, 81.526-167.071, 174.467-174.481l0-27.857 l 30.657,0 
-	l0,27.857 c 92.973,7.41, 167.090,81.529, 174.478,174.481l 27.861,0 l0,30.656 L 446.055,239.456 z M 382.551,208.8
-	c-6.965-57.943-53.044-103.989-110.974-110.97l0,36.428 L 240.92,134.258 l0-36.428 c-57.916,6.98-103.959,53.026-110.957,110.97l 36.428,0 l0,30.64 
-	l-36.428,0 c 6.998,57.934, 53.041,103.996, 110.957,110.978l0-36.431 l 30.657,0 l0,36.431 c 57.93-6.982, 103.976-53.028, 110.974-110.961l-36.43,0 
-	L 346.121,208.8 L 382.551,208.8 z M 256.258,256.826c-18.053,0-32.701-14.634-32.701-32.705c0-18.051, 14.648-32.704, 32.701-32.704
-	c 18.081,0, 32.7,14.652, 32.7,32.704C 288.958,242.192, 274.339,256.826, 256.258,256.826z"  />
-<glyph unicode="&#xe19d;" d="M 91.475,105.406L 420.525,105.406L 420.525,68.125L 91.475,68.125zM 403.115,249.961c-51.386,0-116.679,27.020-147.118,129.914c-32.316-102.711-97.309-129.744-148.18-129.744
-		c-24.557,0-45.825,6.299-58.534,13.43L 88.79,140.596l 332.189,0 l 41.738,122.965C 449.92,256.383, 428.176,249.961, 403.115,249.961z
-		 M 256.001,188.141c-16.771,0-30.367,13.596-30.367,30.367c0,16.77, 13.595,30.365, 30.367,30.365
-		c 16.771,0, 30.367-13.596, 30.367-30.365C 286.368,201.736, 272.771,188.141, 256.001,188.141z"  />
-<glyph unicode="&#xe19e;" d="M 420.978,134.43l 41.739,122.963c-12.798-7.178-34.541-13.598-59.603-13.598c-51.385,0-116.679,27.018-147.117,129.91
-		c-32.317-102.707-97.312-129.742-148.184-129.742c-24.555,0-45.824,6.299-58.531,13.43L 88.79,134.43
-		c 30.149,36.213, 98.121,54.316, 166.095,54.316S 390.833,170.639, 420.978,134.43zM 398.609,115.807c-5.313,6.383-12.768,12.25-21.913,17.482c-25.203-18.244-71.348-29.891-121.816-29.891
-		c-50.469,0-96.596,11.65-121.799,29.896c-9.149-5.236-16.607-11.105-21.922-17.488l-1.147-1.377
-		c 31.771-26.748, 88.296-40.135, 144.869-40.135c 56.562,0, 113.104,13.393, 144.873,40.137L 398.609,115.807z"  />
-<glyph unicode="&#xe19f;" d="M 162.516,219.8c-13.168-11.313-30.136-17.754-47.857-17.754c-2.214,0-4.401,0.115-6.565,0.308l 49.285-153.853l 46.846,0 
-		L 180.2,208.568C 173.82,211.449, 167.853,215.216, 162.516,219.8zM 353.947,219.8c-5.336-4.585-11.305-8.352-17.687-11.232L 312.24,48.502l 46.842,0 l 49.287,153.852
-		c-2.164-0.192-4.349-0.307-6.563-0.307C 384.084,202.046, 367.116,208.487, 353.947,219.8zM 258.232,219.798c-13.168-11.311-30.136-17.751-47.858-17.751c-0.154,0-0.308,0.009-0.463,0.009l 23.046-153.554l 50.549,0 
-		l 23.046,153.554c-0.154,0-0.308-0.009-0.462-0.009C 288.367,202.046, 271.398,208.487, 258.232,219.798zM 403.906,334.040c-0.502,0-0.997-0.022-1.496-0.034c-27.494,17.892-66.256,31.892-111.045,36.644
-		c-2.267,16.292-16.213,28.848-33.131,28.848S 227.366,386.942, 225.1,370.65c-44.993-4.774-83.91-18.877-111.427-36.888
-		c-1.833,0.183-3.696,0.278-5.579,0.278c-29.591,0-53.574-23.066-53.574-51.516c0-28.452, 26.084-51.372, 55.675-51.372l 0.213,0.212
-		c 1.399-0.133, 2.816-0.212, 4.251-0.212c 14.276,0, 27.738,6.92, 36.011,18.513l 11.845,16.6l 11.848-16.599
-		c 8.274-11.593, 21.737-18.513, 36.013-18.513c 14.279,0, 27.741,6.92, 36.012,18.511l 11.847,16.606l 11.847-16.606
-		c 8.27-11.591, 21.731-18.511, 36.011-18.511c 14.276,0, 27.739,6.92, 36.011,18.513l 11.847,16.602l 11.847-16.601
-		c 8.273-11.593, 21.735-18.513, 36.012-18.513c 29.591,0, 55.675,22.92, 55.675,51.372C 457.48,310.974, 433.497,334.040, 403.906,334.040z"  />
-<glyph unicode="&#xe1a0;" d="M 476.334,152.094c 4.729,13.933, 1.583,29.946-9.523,41.051c-11.105,11.107-27.117,14.252-41.050,9.524l-60.618,60.617
-	l 18.271,18.271l-69.113,69.111l-18.273-18.271L 238.73,389.693c 7.186,14.856, 4.652,33.233-7.676,45.562
-	c-15.583,15.58-40.84,15.583-56.42,0c-15.582-15.58-15.582-40.841,0-56.42c 11.086-11.087, 27.063-14.243, 40.979-9.549l 55.022-55.021
-	c-22.589,9.864-46.785,14.881-70.992,14.875c-37.879,0.013-75.873-11.897-107.688-35.803c-15.23,8.686-34.94,6.575-47.942-6.425
-	c-15.578-15.58-15.578-40.841,0-56.421c 15.58-15.581, 40.841-15.581, 56.422,0c 11.2,11.201, 14.304,27.393, 9.399,41.406
-	c 26.596,19.606, 58.148,29.319, 89.809,29.334c 18.627-0.009, 37.219-3.511, 54.791-10.429l-9.248-9.249l 69.109-69.112l 14.757,14.752
-	c 13.892-23.399, 20.892-49.71, 20.897-76.064c-0.012-25.169-6.142-50.251-18.448-72.851c-14.149,5.207-30.649,2.172-42.009-9.189
-	c-15.58-15.583-15.58-40.844,0-56.42c 15.578-15.581, 40.839-15.585, 56.424,0c 12.686,12.684, 15.037,31.786, 7.064,46.855
-	c 16.64,28.185, 24.892,59.956, 24.88,91.604c 0.008,24.133-5.012,48.245-14.846,70.754l 39.664-39.665
-	c-7.142-14.848-4.601-33.184, 7.71-45.494c 15.578-15.576, 40.84-15.58, 56.422,0c 4.317,4.316, 7.391,9.387, 9.316,14.776l 0.4,0.401
-	L 476.334,152.094z"  />
-<glyph unicode="&#xe1a1;" d="M 472.785,320.66l-4.563,9.12c-1.861,3.792-5.156,7.863-9.981,10.671c-4.807,2.838-10.817,4.321-17.711,4.31
-	c-10.153-0.050-22.687-3.341-38.204-11.038l-133.889-63.166l 57.259-32.088L 472.785,320.66z M 63.891,150.274l-0.184-0.089
-	c-8.903-4.719-15.864-9.744-20.75-16.609c-4.913-6.867-6.78-15.089-6.719-23.229c-0.036-15.059, 3.896-30.975, 15.806-42.961
-	c 11.913-11.986, 30.389-18.556, 55.65-18.519c 0.277,0, 0.552-0.001, 0.825-0.001c 25.365-0.002, 44.087,9.187, 55.192,23.832
-	c 11.225,14.671, 15.030,32.854, 16.747,50.711c 1.109,12.717, 1.812,22.076, 4.063,28.498c 2.301,6.344, 5.209,10.687, 13.945,16.396
-	l 26.585,14.879l-45.371,25.424L 63.891,150.274z M 131.59,91.678c-23.329-12.497-52.377-3.716-64.871,19.613l 84.477,45.258
-	C 163.7,133.224, 154.92,104.174, 131.59,91.678z M 198.407,280.062c-8.692,5.691-11.589,10.027-13.885,16.354
-	c-2.245,6.423-2.954,15.78-4.063,28.476c-1.717,17.881-5.522,36.065-16.747,50.736c-11.228,14.804-30.241,24.030-56.017,23.829
-	c-25.262,0.044-43.737-6.53-55.65-18.515c-11.91-11.986-15.841-27.904-15.806-42.964c-0.062-8.137, 1.806-16.361, 6.719-23.225
-	c 4.886-6.866, 11.847-11.891, 20.75-16.609l 0.142-0.075l 125.137-63.013l 7.399-3.709c 3.797-1.905, 5.341-6.53, 3.432-10.323
-	c-0.263-0.522-0.608-0.968-0.965-1.397c-0.041-0.051-0.066-0.107-0.106-0.156c-0.011-0.012-0.017-0.027-0.028-0.037l 119.661-67.057
-	l 83.948-38.963c 15.516-7.695, 28.049-10.986, 38.202-11.035c 6.894-0.011, 12.904,1.468, 17.711,4.314
-	c 4.825,2.809, 8.12,6.875, 9.981,10.666l 4.558,9.121L 238.515,257.629L 198.407,280.062z M 151.695,290.453l-84.14,45.895
-	c 12.674,23.236, 41.782,31.797, 65.015,19.125C 155.808,342.794, 164.368,313.688, 151.695,290.453z"  />
-<glyph unicode="&#xe1a2;" d="M 255.188,421.44c-108.788,0-196.976-88.191-196.976-196.976c0-108.789, 88.188-196.977, 196.976-196.977
-	c 108.786,0, 196.974,88.188, 196.974,196.977C 452.162,333.249, 363.975,421.44, 255.188,421.44z M 245.764,384.027l 25.039,0 l0-49.152 l-25.039,0 
-	L 245.764,384.027 z M 170.852,292.087l-34.753,34.762l 17.701,17.702l 34.761-34.753L 170.852,292.087z M 183.204,366.004l 22.694,10.58
-	l 20.768-44.545l-22.688-10.578L 183.204,366.004z M 258.646,80.896c-21.773,0-39.42,17.647-39.42,39.417
-	c0,17.004, 10.781,31.445, 25.863,36.979l0,112.43 l 25.037,0 l0-111.697 c 16.168-4.916, 27.937-19.934, 27.937-37.712
-	C 298.063,98.544, 280.415,80.896, 258.646,80.896z M 287.979,332.079l 20.776,44.552l 22.693-10.59L 310.674,321.5L 287.979,332.079z
-	 M 343.018,292.087l-17.708,17.711l 34.76,34.753l 17.701-17.702L 343.018,292.087z"  />
-<glyph unicode="&#xe1a3;" d="M 191.562,289.166L 249.863,289.166L 249.863,158.833L 191.562,158.833zM 191.562,146.559L 249.863,146.559L 249.863,88.257L 191.562,88.257zM 120.988,289.166L 179.287,289.166L 179.287,230.862L 120.988,230.862zM 262.139,289.301L 320.44,289.301L 320.44,88.257L 262.139,88.257zM 332.715,146.559L 391.016,146.559L 391.016,88.257L 332.715,88.257zM 191.562,359.742L 249.863,359.742L 249.863,301.44L 191.562,301.44zM 332.715,359.742L 391.016,359.742L 391.016,301.44L 332.715,301.44zM 120.986,430.32L 179.287,430.32L 179.287,372.017L 120.986,372.017zM 332.715,215.314L 391.016,215.314L 391.016,157.011L 332.715,157.011zM 179.287,219.654L 120.988,219.654L 120.988,17.68L 391.016,17.68L 391.016,75.982L 179.287,75.982 	z"  />
-<glyph unicode="&#xe1a4;" d="M 401.431,312.186L 342.674,370.946L 254.645,282.92L 166.617,370.946L 107.857,312.186L 195.883,224.159L 107.857,136.135L 166.617,77.367L 254.645,165.398L 342.674,77.367L 401.431,136.135L 313.404,224.159 z"  />
-<glyph unicode="&#xe1a5;" d="M 338.495,390.035L 70.735,390.035 c-15.6,0-28.255-12.673-28.255-28.271l0-274.608 c0-15.619, 12.655-28.26, 28.255-28.26l 267.76,0 
-	L 469.010,224.468L 338.495,390.035z M 323.651,89.527L 73.122,89.527 l0,269.85 l 250.529,0 l 106.345-134.909L 323.651,89.527z M 298.633,320.070
-	l-74.43-74.463l-74.428,74.463l-21.159-21.156l 74.431-74.446l-74.431-74.446l 21.159-21.125l 74.428,74.395l 74.43-74.395
-	l 21.157,21.125l-74.428,74.446l 74.428,74.446L 298.633,320.070z"  />
-<glyph unicode="&#xe1a6;" d="M 50.238,51.167l 199.477,0 l0,65.892 L 50.238,117.059 L 50.238,51.167 z M 446.744,355.455c-7.881,16.383-27.569,23.285-43.983,15.438
-	l-114.294-55.038l-125.735,65.17c-15.077,10.204-32.147,15.961-42.317,0.852c-10.204-15.070-3.109-26.485, 11.97-36.725l 82.441-64.782
-	l-43.755-21.055l-56.021,24.098l-26.029-60.533l 69.784-30.048c 8.765-3.763, 18.74-3.534, 27.341,0.587L 431.34,311.506l 29.695,14.254
-	L 446.744,355.455z"  />
-<glyph unicode="&#xe1a7;" d="M 459.543,325.576L 53.519,325.576L 53.519,273.219L 84.339,273.219L 84.339,122.498L 109.277,122.498L 109.277,273.219L 405.551,273.219L 405.551,122.498L 430.506,122.498L 430.506,273.219L 459.543,273.219 z"  />
-<glyph unicode="&#xe1a8;" d="M 374.787,148.709L 137.211,148.709L 113.531,111.611L 398.469,111.611 	zM 445.564,390.92L 66.436,390.92 c-9.34,0-16.91-7.572-16.91-16.912L 49.526,57.080 l 412.947,0 L 462.473,374.008 
-		C 462.473,383.348, 454.904,390.92, 445.564,390.92z M 433.367,86.188L 78.629,86.188 L 78.629,310.941 l 354.738,0 L 433.367,86.188 z"  />
-<glyph unicode="&#xe1a9;" d="M 236.555,181.018l-66.399,66.42l-14.111-14.127c-7.8-7.781-7.8-20.435,0-28.188l 40.614-40.635l0-21.271 l-0.801,0.427
-	l-65.175,65.175L 130.683,316.801 c0,14.449-11.706,26.154-26.158,26.154L 78.396,342.955 l0-178.452 l 0.017,0 l 68.542-68.542l0-83.958 l 89.621,0 l-0.020,31.899
-	c0,0.031, 0.020,0.068, 0.020,0.068L 236.555,181.018z M 408.239,342.955c-14.437,0-26.146-11.705-26.146-26.154l0-107.982 l-65.156-65.175
-	l-0.834-0.427l0,21.271 l 40.631,40.635c 7.799,7.753, 7.799,20.406,0,28.188l-14.11,14.127l-66.415-66.42l0-137.047 c0,0,0-0.037,0-0.068
-	l0-31.899 l 89.633,0 l0,83.958 l 68.51,68.542l 0.033,0 L 434.385,342.955 L 408.239,342.955 z M 323.199,280.106c0,21.062-17.071,38.099-38.113,38.099
-	c-21.043,0-38.098-17.036-38.098-38.099c0-21.062, 17.055-38.129, 38.098-38.129C 306.128,241.978, 323.199,259.045, 323.199,280.106z
-	 M 212.241,380.889c-21.057,0-38.097-16.998-38.097-38.059c0-21.029, 17.040-38.129, 38.097-38.129c 21.029,0, 38.099,17.1, 38.099,38.129
-	C 250.34,363.891, 233.27,380.889, 212.241,380.889z M 290.986,359.883c 21.030,0, 38.117,17.066, 38.117,38.114
-	c0,21.026-17.087,38.081-38.117,38.081c-21.057,0-38.097-17.055-38.097-38.081C 252.89,376.949, 269.93,359.883, 290.986,359.883z"  />
-<glyph unicode="&#xe1aa;" d="M 235.567,215.027c-1.914-1.523-3.401-3.427-4.498-5.698c-1.080-2.251-1.636-4.907-1.636-7.976
-	c0-4.806, 1.537-8.521, 4.595-11.158c 3.058-2.613, 8.094-4.742, 15.092-6.337l0,35.652 c-2.483,0-4.905-0.363-7.228-1.095
-	C 239.572,217.684, 237.445,216.562, 235.567,215.027z M 280.285,141.324c-3.581,2.836-9.647,5.42-18.249,7.748l0-41.975 
-	c 2.618,0.275, 5.364,0.902, 8.177,1.848c 2.861,0.952, 5.396,2.292, 7.686,4.051c 2.239,1.737, 4.087,3.898, 5.56,6.444
-	c 1.454,2.555, 2.189,5.582, 2.189,9.077C 285.647,134.199, 283.848,138.477, 280.285,141.324z M 324.335,307.228l 0.031-0.027
-	c-0.097,0.108-0.163,0.213-0.261,0.319c-4.188,5.829-8.373,11.433-12.46,16.761c-5.396,9.025-8.239,20.006-1.637,35.849l0,0.009 
-	l 22.78,54.505l-35.76,16.298l 3.662,16.156l-89.832,0 l 4.709-20.585L 178.78,414.644l 22.761-54.505l0-0.009 
-	c 11.265-26.945-4.858-39.813-14.326-52.928c-46.859-64.796-99.312-157.564-99.312-213.49c0-92.734, 72.025-89.646, 167.889-89.646
-	c 95.85,0, 167.891-3.088, 167.891,89.646C 423.682,149.646, 371.179,242.414, 324.335,307.228z M 233.229,352.732l 45.846,0 l0-28.931 l-45.846,0 
-	L 233.229,352.732 z M 314.295,115.078c-1.602-4.901-4.479-9.67-8.633-14.328c-4.154-4.678-9.744-8.83-16.745-12.479
-	c-6.998-3.644-15.958-5.826-26.881-6.554l0-18.602 L 249.12,63.115 l0,18.602 c-16.335,1.161-29.104,6.195-38.277,15.098
-	c-9.206,8.893-14.52,21.934-15.974,39.154l 30.839,0 c-0.134-8.334, 2.057-14.879, 6.57-19.697c 4.512-4.807, 10.14-7.869, 16.842-9.174
-	l0,45.697 c-0.734,0.303-1.715,0.627-2.959,0.99c-1.243,0.367-2.6,0.695-4.039,0.984c-5.395,1.457-10.725,3.18-15.958,5.135
-	c-5.265,1.965-9.973,4.604-14.125,7.873c-4.155,3.28-7.473,7.379-9.945,12.247c-2.482,4.89-3.727,10.974-3.727,18.267
-	c0,7.436, 1.424,14, 4.284,19.684c 2.843,5.693, 6.573,10.465, 11.25,14.333c 4.676,3.859, 10.072,6.842, 16.187,8.965
-	c 6.133,2.112, 12.459,3.385, 19.032,3.828l0,16.842 l 12.916,0 l0-16.842 c 6.543-0.731, 12.706-2.158, 18.479-4.266
-	c 5.737-2.127, 10.806-5.028, 15.204-8.75c 4.349-3.714, 7.946-8.356, 10.694-13.878c 2.779-5.572, 4.383-12.123, 4.807-19.689l-31.049,0 
-	c-0.149,5.82-1.98,10.791-5.463,14.861c-3.516,4.089-7.734,6.132-12.673,6.132l0-38.714 c 1.736-0.447, 3.52-0.884, 5.364-1.312
-	c 1.799-0.442, 3.745-0.938, 5.788-1.537c 10.791-2.908, 19.1-6.522, 24.919-10.824c 5.82-4.299, 10.138-8.779, 12.917-13.447
-	c 2.763-4.683, 4.398-9.347, 4.921-14.004c 0.507-4.67, 0.77-8.813, 0.77-12.475C 316.715,124.007, 315.897,119.951, 314.295,115.078z"  />
-<glyph unicode="&#xe1ab;" d="M 243.47,415.14l-7.335,7.333L 36.725,422.473 L 36.725,5.77 l 298.070,0 L 334.795,323.813 l-7.332,7.335L 243.47,415.14z M 309.757,30.811L 61.761,30.811 L 61.761,397.434 
-	l 141.615,0 c 37.203,0, 19.276-88.18, 19.276-88.18s 86,20.9, 87.104-18.53L 309.756,30.811 z M 466.808,361.677l-81.266,81.268L 258.938,442.945 l 25.043-25.038
-	l 71.481,0 c 0.063,0, 0.12-0.010, 0.185-0.010c-0.006-0.286-0.023-0.547-0.023-0.837c 11.174,0, 16.69-9.045, 19.118-20.95
-	c 4.358-22.959-2.312-55.826-2.312-55.826s 0.137,0.031, 0.341,0.082c-0.114-0.602-0.181-0.933-0.181-0.933
-	s 67.129,16.325, 75.793-10.732c 0.077-0.294, 0.161-0.585, 0.225-0.887c 0.083-0.302, 0.14-0.612, 0.207-0.921
-	c 0.154-0.928, 0.26-1.889, 0.287-2.904l0-228.807 l-87.998,0 l 0.002-25.037l 113.037,0 L 474.143,354.34 L 466.808,361.677z"  />
-<glyph unicode="&#xe1ac;" d="M 396.441,341.122l-83.997,83.993l-7.331,7.333L 105.702,432.448 l0-416.701 l 298.071,0 L 403.773,333.786 L 396.441,341.122z M 130.74,40.783L 130.74,407.409 
-	l 141.613,0 c 37.201,0, 19.274-88.18, 19.274-88.18s 86,20.901, 87.104-18.534c0-67.115,0-259.912,0-259.912L 130.74,40.783 z"  />
-<glyph unicode="&#xe1ad;" d="M 168.454,16.818l 46.027,0 l0,24.51 l-46.027,0 L 168.454,16.818 z M 107.973,387.363l 24.934,0 L 132.907,406.445 l 18.084,0 l0,24.9 l-43.018,0 L 107.973,387.363 z
-	 M 132.907,184.645l-24.934,0 l0-44.309 l 24.934,0 L 132.907,184.645 z M 132.907,61.148l-24.934,0 l0-44.33 l 43.018,0 l0,24.51 l-18.084,0 L 132.907,61.148 z M 132.907,122.889
-	l-24.934,0 l0-44.293 l 24.934,0 L 132.907,122.889 z M 132.907,369.914l-24.934,0 l0-44.292 l 24.934,0 L 132.907,369.914 z M 132.907,246.402l-24.934,0 l0-44.308 l 24.934,0 L 132.907,246.402 z
-	 M 132.907,308.159l-24.934,0 l0-44.31 l 24.934,0 L 132.907,308.159 z M 379.855,140.336l 24.949,0 l0,44.309 l-24.949,0 L 379.855,140.336 z M 379.855,202.094l 24.949,0 
-	l0,44.308 l-24.949,0 L 379.855,202.094 z M 379.855,78.596l 24.949,0 l0,44.293 l-24.949,0 L 379.855,78.596 z M 397.48,340.42l-83.618,83.635l-7.308,7.289l-74.608,0 
-	l0-24.9 l 41.989,0 c 37.049,0, 19.179-87.836, 19.179-87.836s 85.712,20.829, 86.741-18.478l0-36.281 l 24.949,0 l0,69.262 L 397.48,340.42z
-	 M 231.946,16.818l 46.043,0 l0,24.51 l-46.043,0 L 231.946,16.818 z M 379.855,41.328l-20.93,0 l0-24.51 l 45.879,0 l0,44.33 l-24.949,0 L 379.855,41.328 z M 168.454,406.445
-	l 46.027,0 l0,24.9 l-46.027,0 L 168.454,406.445 z M 295.436,16.818l 46.030,0 l0,24.51 l-46.030,0 L 295.436,16.818 z"  />
-<glyph unicode="&#xe1ae;" d="M 307.76,295.498L 199.091,295.498 c-11.674-0.031-21.192-9.516-21.192-21.224c0-11.708, 9.518-21.188, 21.192-21.227L 307.76,253.047 
-	c 11.706,0.038, 21.188,9.518, 21.222,21.227C 328.948,285.982, 319.466,295.467, 307.76,295.498z M 301.119,265.559l-95.357,0 l0,17.466 
-	l 95.357,0 L 301.119,265.559 z M 86.927,340.266l0-141.501 l 142.837,0 l0-192.136 l 51.146,0 L 280.91,198.765 l 144.771,0 L 425.681,340.266 L 86.927,340.266 z M 307.76,235.623L 199.091,235.623 
-	c-21.356,0-38.655,17.299-38.655,38.652c0,21.372, 17.298,38.658, 38.655,38.687l 108.668-0.029c 21.352,0, 38.684-17.286, 38.684-38.658
-	C 346.443,252.922, 329.111,235.623, 307.76,235.623z M 397.132,441.478L 115.506,441.478 l0-75.932 l 281.626,0 L 397.132,441.478 z"  />
-<glyph unicode="&#xe1af;" d="M 315.299,324.449c-14.356,13.309-30.084,23.151-45.422,32.309c-19.262,11.281-34.664,21.945-44.41,34.127
-	c-2.32,2.896-4.35,5.866-6.182,9.012l 14.422,2.075c 3.795,0.538, 9.29-0.997, 12.197-3.419c0,0, 3.957-3.306, 10.336-3.306
-	c 8.404,0, 14.159,7.2, 14.159,7.2c 2.355,3.004, 7.39,5.882, 11.183,6.421l 16.777,2.423c0-0.037-0.031-0.066-0.031-0.085
-	c-4.024-11.639-10.336-20.502-19.623-29.204c-1.015-0.912-2.025-1.794-3.073-2.712c 1.667-1.047, 3.435-2.091, 5.298-3.188l 0.032-0.014
-	l0,0c 12.82-7.621, 27.472-16.615, 41.531-28.386c 2.223,2.333, 4.383,4.79, 6.477,7.355c 8.532,10.562, 15.891,23.121, 20.798,37.506
-	c 4.61,13.379, 7.161,28.29, 7.488,44.479l-54.581,0 c-0.065-1.865-0.16-3.646-0.295-5.414l-23.644-3.385
-	c-3.758-0.521-9.252,0.982-12.196,3.47c0,0-3.924,3.201-10.3,3.235c-8.374-0.034-14.129-7.196-14.129-7.196
-	c-2.353-2.974-7.391-5.864-11.183-6.405l-18.868-2.717c-1.211,5.36-2.026,11.416-2.256,18.412L 155.26,437.042 
-	c 0.323-16.22, 2.842-31.068, 7.486-44.479c 7.358-21.647, 20.177-38.911, 34.434-52.076c 14.356-13.324, 30.085-23.184, 45.456-32.324
-	c 19.263-11.282, 34.663-21.973, 44.377-34.107c 1.177-1.426, 2.222-2.878, 3.236-4.335l-11.513-1.667
-	c-3.758-0.526-9.252,1.014-12.196,3.471c0,0-3.924,3.219-10.3,3.25c-8.374-0.031-14.129-7.177-14.129-7.177
-	c-2.353-2.992-7.391-5.904-11.183-6.426l-14.65-2.128c 4.056,9.093, 9.712,16.55, 17.528,23.875c 0.95,0.881, 1.931,1.797, 2.978,2.683
-	c-1.703,1.015-3.434,2.061-5.3,3.136l-0.196,0.135l-0.032,0 c-12.754,7.604-27.305,16.574-41.336,28.251
-	c-2.189-2.308-4.318-4.71-6.378-7.262c-8.566-10.53-15.891-23.083-20.827-37.489c-4.939-14.374-7.491-30.43-7.491-48.025l0,0l0-0.109 
-	l0-0.233 c0-17.575, 2.552-33.632, 7.522-48.007c 7.358-21.63, 20.177-38.864, 34.434-52.045c 14.356-13.34, 30.085-23.183, 45.456-32.307
-	c 19.229-11.314, 34.663-21.977, 44.377-34.177c 1.798-2.168, 3.37-4.447, 4.839-6.786l-13.115-1.912c-3.758-0.539-9.252,1-12.196,3.457
-	c0,0-3.924,3.251-10.3,3.251c-8.374,0-14.129-7.18-14.129-7.18c-2.353-2.989-7.391-5.868-11.183-6.423l-15.829-2.26
-	c 4.057,10.449, 10.107,18.655, 18.707,26.75c 0.95,0.9, 1.931,1.783, 2.978,2.68c-1.703,1.016-3.434,2.046-5.267,3.127l0,0l-0.098,0.078
-	c-12.82,7.591-27.436,16.583-41.5,28.355c-2.189-2.34-4.318-4.742-6.378-7.277c-8.566-10.564-15.891-23.121-20.827-37.506
-	c-4.613-13.393-7.132-28.275-7.455-44.478l 54.545,0 c 0.096,2.729, 0.262,5.333, 0.521,7.783l 23.381,3.387
-	c 3.795,0.536, 9.29-1.016, 12.197-3.436c0,0, 3.957-3.289, 10.336-3.289c 8.404,0, 14.159,7.184, 14.159,7.184
-	c 2.355,2.988, 7.39,5.884, 11.183,6.405l 18.282,2.652c 1.535-5.875, 2.583-12.657, 2.811-20.687l 54.581,0 
-	c-0.327,16.202-2.878,31.085-7.488,44.478c-7.359,21.63-20.21,38.877-34.469,52.047l0,0c-14.356,13.354-30.084,23.211-45.457,32.341
-	c-19.227,11.294-34.629,21.956-44.375,34.12c-2.485,3.123-4.674,6.295-6.572,9.717l 14.812,2.123c 3.795,0.569, 9.29-0.97, 12.197-3.419
-	c0,0, 3.957-3.3, 10.336-3.3c 8.404,0, 14.159,7.209, 14.159,7.209c 2.355,2.987, 7.39,5.867, 11.183,6.428l 17.038,2.435
-	c-0.096-0.281-0.193-0.573-0.292-0.883c-4.024-11.628-10.336-20.455-19.623-29.174c-1.015-0.914-2.025-1.826-3.073-2.744
-	c 1.667-1.016, 3.435-2.046, 5.298-3.155l 0.096-0.051l-0.129,0.083c 12.85-7.635, 27.502-16.677, 41.597-28.447
-	c 2.223,2.35, 4.383,4.805, 6.477,7.341c 8.532,10.577, 15.858,23.137, 20.798,37.536c 4.936,14.343, 7.521,30.431, 7.521,48.011
-	c0,0,0,0.048,0,0.228l0,0.079 c0,17.596-2.586,33.668-7.521,48.025c-7.359,21.629-20.21,38.864-34.438,52.045 M 302.741,220.522l-0.066,0 
-	c-0.065-1.6-0.13-3.136-0.228-4.64l-23.711-3.435c-3.758-0.526-9.252,0.994-12.196,3.466c0,0-3.924,3.221-10.3,3.252
-	c-8.374-0.031-14.129-7.178-14.129-7.178c-2.353-3.011-7.391-5.886-11.183-6.409l-19.030-2.763
-	c-1.344,6.117-2.126,13.098-2.16,21.372l0,3.692 l 0.066,0 c 0.13,3.796, 0.424,7.295, 0.852,10.598l 23.051,3.303
-	c 3.795,0.553, 9.29-0.983, 12.197-3.404c0,0, 3.957-3.299, 10.336-3.299c 8.404,0, 14.159,7.192, 14.159,7.192
-	c 2.355,2.989, 7.39,5.869, 11.183,6.412l 17.561,2.529c 2.19-7.326, 3.565-16.085, 3.599-27.023L 302.742,220.522 z"  />
-<glyph unicode="&#xe1b0;" d="M 307.748,84.049c-0.893,4-1.52,7.932-1.982,11.646L 201.583,95.695 c-0.933-7.47-2.595-15.908-5.507-23.7
-	c-2.911-7.846-7.047-14.971-12.662-19.989c-5.64-5.007-12.646-8.146-22.442-8.18l0-9.323 l 185.397,0 l0,9.323 
-	c-9.799,0.034-16.805,3.173-22.447,8.186C 315.488,59.508, 310.431,71.893, 307.748,84.049z M 458.844,412.067L 48.502,412.067 
-	c-6.839,0-12.382-5.546-12.382-12.384l0-269.639 c0-6.84, 5.543-12.388, 12.382-12.388l 410.342,0 c 6.842,0, 12.385,5.548, 12.385,12.388
-	L 471.229,399.684 C 471.229,406.521, 465.686,412.067, 458.844,412.067z M 441.182,147.704L 66.168,147.704 L 66.168,382.019 l 375.014,0 L 441.182,147.704 z"  />
-<glyph unicode="&#xe1b1;" d="M 130.681,112.636l 250.641,0 c 6.537,0, 11.84,5.301, 11.84,11.839c0,6.536-5.303,11.839-11.84,11.839L 130.681,136.314 
-		c-6.541,0-11.84-5.303-11.84-11.839C 118.841,117.937, 124.14,112.636, 130.681,112.636zM 385.989,385.974L 125.955,385.974 L 49.623,190.338l0-128.312 l 412.754,0 L 462.377,190.338 L 385.989,385.974z M 438.699,85.705L 73.3,85.705 L 73.3,166.66 l 365.398,0 
-		L 438.698,85.705 z"  />
-<glyph unicode="&#xe1b2;" d="M 255.209,442.412c 120.4,0, 217.998-97.602, 217.998-217.999c0-120.395-97.598-217.996-217.998-217.996
-			c-120.397,0-218,97.602-218,217.996C 37.21,344.81, 134.812,442.412, 255.209,442.412 M 255.209,327.234
-			c-56.695,0-102.821-46.125-102.821-102.821c0-56.692, 46.125-102.817, 102.821-102.817c 56.695,0, 102.818,46.125, 102.818,102.817
-			C 358.027,281.108, 311.904,327.234, 255.209,327.234L 255.209,327.234zM 255.209,296.583c-39.856,0-72.169-32.312-72.169-72.17c0-39.856, 32.313-72.169, 72.169-72.169s 72.167,32.312, 72.167,72.169
-	C 327.377,264.271, 295.065,296.583, 255.209,296.583z M 255.209,198.984c-14.043,0-25.43,11.388-25.43,25.429
-	c0,14.044, 11.387,25.43, 25.43,25.43c 14.044,0, 25.429-11.386, 25.429-25.43C 280.639,210.372, 269.254,198.984, 255.209,198.984z"  />
-<glyph unicode="&#xe1b3;" d="M 131.368,213.5L 90.59,177.891l-6.442-5.635l 6.442-5.632l 40.778-35.599l 2.111-1.853l 240.179,0 l0,86.187 L 133.479,215.359 L 131.368,213.5z
-	 M 420.681,335.529l-40.778,35.611l-2.109,1.857L 137.617,372.997 L 137.617,286.8 l 240.176,0 l 2.109,1.867l 40.778,35.597l 6.441,5.631L 420.681,335.529z
-	 M 282.010,425.018l-65.88,0 l0-34.582 l 65.88,0 L 282.010,425.018 z M 216.13,23.229l 65.88,0 l0,88.49 l-65.88,0 L 216.13,23.229 z M 216.13,269.348l0-36.549 l 65.88,0 l0,36.549 
-	L 216.13,269.348 z"  />
-<glyph unicode="&#xe1b4;" d="M 255.758,441.388l-73.579-89.128l 48.006,0 l0-345.804 l 51.178,0 L 281.363,352.26 l 47.974,0 L 255.758,441.388z M 472.439,229.856l-89.147,73.58
-	l0-47.989 L 307.49,255.447 l0-248.991 l 51.145,0 l0,197.83 l 24.657,0 l0-47.989 L 472.439,229.856z M 129.038,209.746l-89.144-73.582l 89.144-73.575l0,48.006 
-	l 26.358,0 l0-104.155 l 51.144,0 L 206.54,161.741 l-77.502,0 L 129.038,209.746 z"  />
-<glyph unicode="&#xe1b5;" d="M 76.37,212.498c 3.113,7.115, 6.701,21.167, 8.232,41.068l-17.080,0 C 68.485,233.967, 71.911,218.214, 76.37,212.498zM 67.247,347.554c-10.15,0-18.471-30.964-19.252-70.309l 38.49,0 C 85.7,316.59, 77.388,347.554, 67.247,347.554zM 311.241,193.921l-25.367-81.836l 29.611,10.555l 18.453-25.454l 25.008,80.678c-1.299-0.075-2.6-0.123-3.916-0.123
-		C 338.333,177.74, 323.040,183.845, 311.241,193.921zM 309.327,245.283A45.703,45.703 180 1 1 400.733,245.283A45.703,45.703 180 1 1 309.327,245.283zM 380.261,182.647l-14.791-47.71l 11.701-37.752l 18.455,25.454l 29.611-10.555l-25.588,82.553
-		C 393.954,189.614, 387.407,185.538, 380.261,182.647zM 445.138,350.814L 94.603,350.814 c 13.566-21.55, 14.453-65.991, 14.453-77.13c0-11.137-0.887-55.576-14.455-77.125l 197.627,0 
-		l 4.533,14.63c-5.883,10.015-9.273,21.662-9.273,34.094c0,37.243, 30.301,67.543, 67.543,67.543s 67.539-30.3, 67.539-67.543
-		c0-11.943-3.127-23.163-8.59-32.909l 4.902-15.814l 26.256,0 c 10.418,0.002, 18.869,34.53, 18.867,77.125
-		C 464.005,316.286, 455.558,350.814, 445.138,350.814z M 234.507,235.812l-67.502,0 l0,23.68 l 67.502,0 L 234.507,235.812 z M 258.335,281.516L 148.062,281.516 
-		l0,23.679 l 110.273,0 L 258.335,281.516 z"  />
-<glyph unicode="&#xe1b6;" d="M 173.896,370.193L 332.644,370.193L 332.644,320.466L 173.896,320.466zM 173.896,276.398L 332.644,276.398L 332.644,252.718L 173.896,252.718zM 173.896,229.447L 332.644,229.447L 332.644,205.767L 173.896,205.767zM 115.059,428.4l0-300.77 l 6.936-6.936l 79.43-79.432l 6.936-6.938l 47.656,0 l0,23.678 l-16.674,0 c-35.182,0-18.23,83.396-18.23,83.396
-		s-81.328-19.768-82.375,17.523c0,63.471,0,245.799,0,245.799l 234.525,0 l0-346.719 l-31.33,0 l0-23.678 l 55.010,0 L 396.943,428.4 L 115.059,428.4 zM 298.975,162.836c-22.643,0-41-18.355-41-40.998c0-22.639, 18.357-40.996, 41-40.996c 22.639,0, 40.996,18.357, 40.996,40.996
-		C 339.971,144.48, 321.613,162.836, 298.975,162.836zM 277.256,65.291L 277.256,19.6 l 21.717,10.379l 21.719-10.379l0,45.691 c-6.748-2.6-14.066-4.041-21.717-4.041
-		C 291.322,61.25, 284.002,62.691, 277.256,65.291z"  />
-<glyph unicode="&#xe1b7;" d="M 195.481,256.628c0,10.382, 8.401,18.771, 18.768,18.771c 3.319,0, 6.443-0.866, 9.143-2.372l 48.349,48.354L 271.741,388.316 
-	c0,9.338-7.553,16.89-16.906,16.89L 90.704,405.206 c-9.336,0-16.906-7.552-16.906-16.89l0-164.161 c0-9.321, 7.57-16.89, 16.906-16.89l 66.941,0 
-	c 0.065,0.048, 0.097,0.095, 0.145,0.165l 40.062,40.058C 196.363,250.201, 195.481,253.306, 195.481,256.628z M 131.272,237.859
-	c-10.367,0-18.788,8.387-18.788,18.769c0,10.382, 8.421,18.771, 18.788,18.771c 10.365,0, 18.787-8.388, 18.787-18.771
-	C 150.060,246.246, 141.638,237.859, 131.272,237.859z M 112.484,306.239c0,10.383, 8.421,18.785, 18.788,18.785
-	c 10.365,0, 18.787-8.402, 18.787-18.785c0-10.367-8.422-18.775-18.787-18.775C 120.905,287.464, 112.484,295.872, 112.484,306.239z
-	 M 131.272,337.074c-10.367,0.017-18.788,8.418-18.788,18.785c0,10.366, 8.421,18.774, 18.788,18.774
-	c 10.365,0, 18.787-8.408, 18.787-18.774C 150.060,345.478, 141.638,337.091, 131.272,337.074z M 214.249,374.634
-	c 10.367,0, 18.788-8.408, 18.788-18.774c0-10.367-8.421-18.785-18.788-18.785c-10.367,0.017-18.768,8.418-18.768,18.785
-	C 195.481,366.226, 203.882,374.634, 214.249,374.634z M 214.249,325.024c 10.402,0, 18.771-8.402, 18.788-18.785
-	c-0.017-10.367-8.386-18.775-18.788-18.775c-10.367,0-18.768,8.408-18.768,18.775C 195.481,316.622, 203.882,325.024, 214.249,325.024z
-	 M 431.474,189.802L 315.398,305.859c-6.606,6.605-17.301,6.605-23.889,0.015L 175.419,189.802c-6.591-6.606-6.591-17.301,0-23.908
-	L 291.51,49.821c 6.588-6.606, 17.282-6.606, 23.904,0l 116.060,116.072C 438.076,172.501, 438.076,183.195, 431.474,189.802z
-	 M 252.3,164.543c-3.646-3.665-8.487-5.498-13.245-5.498l-0.016,0 c-4.808,0-9.63,1.833-13.276,5.498
-	c-3.681,3.643-5.528,8.481-5.495,13.277c-0.034,4.773, 1.814,9.61, 5.495,13.26c 3.646,3.659, 8.469,5.507, 13.276,5.507
-	c 4.773,0, 9.599-1.831, 13.261-5.507l-3.518-3.518l 3.533,3.518c 3.632-3.649, 5.477-8.486, 5.477-13.26
-	C 257.792,173.024, 255.947,168.202, 252.3,164.543z M 316.721,100.135c-3.646-3.612-8.468-5.476-13.242-5.476l-0.018,0 
-	c-4.807,0-9.631,1.848-13.293,5.509c-3.662,3.664-5.512,8.469-5.477,13.275c-0.035,4.773, 1.814,9.633, 5.477,13.261
-	c 3.662,3.648, 8.486,5.508, 13.293,5.508c 4.773,0, 9.613-1.843, 13.26-5.508c 3.646-3.644, 5.511-8.487, 5.496-13.261
-	C 322.231,108.637, 320.367,103.832, 316.721,100.135z M 284.559,177.82c0,4.773, 1.835,9.626, 5.496,13.26
-	c 3.627,3.659, 8.483,5.507, 13.26,5.507c 4.79,0, 9.631-1.848, 13.293-5.507c 3.662-3.649, 5.493-8.486, 5.493-13.281
-	c0-4.774-1.831-9.613-5.493-13.256c-3.662-3.665-8.471-5.498-13.244-5.498l-0.049,0 c-4.793,0-9.633,1.833-13.26,5.498
-	C 286.394,168.186, 284.559,173.024, 284.559,177.82z M 316.721,228.993c-3.646-3.645-8.468-5.509-13.242-5.509l-0.018,0 
-	c-4.807,0-9.631,1.849-13.293,5.509c-3.662,3.664-5.512,8.486-5.512,13.282c0,4.789, 1.85,9.625, 5.512,13.275
-	c 3.662,3.645, 8.486,5.507, 13.293,5.493c 4.773,0.015, 9.613-1.816, 13.275-5.493c 3.663-3.665, 5.495-8.486, 5.48-13.275
-	C 322.231,237.479, 320.367,232.673, 316.721,228.993z M 381.129,164.543c-3.631-3.665-8.455-5.498-13.229-5.498l-0.032,0 
-	c-4.793-0.016-9.631,1.833-13.277,5.498c-3.664,3.643-5.51,8.481-5.51,13.256c0,4.795, 1.846,9.632, 5.51,13.281
-	c 3.646,3.676, 8.484,5.507, 13.277,5.507c 4.789,0, 9.614-1.848, 13.261-5.491l-3.5-3.533l 3.5,3.518c 3.662-3.649, 5.508-8.486, 5.508-13.26
-	C 386.637,173.045, 384.791,168.202, 381.129,164.543z"  />
-<glyph unicode="&#xe1b8;" d="M 256.368,41.068L 101.655,224.133L 256.368,407.195L 411.078,224.133 z"  />
-<glyph unicode="&#xe1b9;" d="M 382.256,409.168l-7.881,0 L 129.031,409.168 L 57.2,308.447l 198.436-269.51l 198.434,269.51L 382.256,409.168z M 223.701,323.916
-	l 31.967,42.512l 31.967-42.512L 223.701,323.916 z M 293.471,293.274l-37.803-157.248l-37.803,157.248L 293.471,293.274 z M 284.936,378.527l 60.662,0 
-	l-30.33-40.337L 284.936,378.527z M 196.088,338.19l-30.349,40.305l 60.662,0 L 196.088,338.19z M 168.453,323.916l-62.575,0 l 30.463,42.708
-	L 168.453,323.916z M 186.357,293.274l 38.733-161.134L 106.45,293.274L 186.357,293.274 z M 324.996,293.274l 79.824,0 L 286.292,132.266
-	L 324.996,293.274z M 342.882,323.916l 32.099,42.677l 30.43-42.677L 342.882,323.916 z"  />
-<glyph unicode="&#xe1ba;" d="M 326.307,119.358L 294.066,87.119L 403.334,76.664L 392.885,185.938L 360.652,153.702L 185.701,328.651L 217.934,360.881L 108.666,371.336L 119.121,262.068L 151.357,294.308 z"  />
-<glyph unicode="&#xe1bb;" d="M 360.643,294.308L 392.881,262.068L 403.334,371.336L 294.064,360.887L 326.297,328.651L 151.352,153.702L 119.121,185.934L 108.666,76.664L 217.934,87.119L 185.693,119.358 z"  />
-<glyph unicode="&#xe1bc;" d="M 134.935,83.914l 148.268-61.566l0,340.26 L 134.935,424.175L 134.935,83.914 z M 232.244,207.003l 19.953-8.285l0-25.639 l-19.953,8.284
-		L 232.244,207.003 zM 162.25,425.652L 230.677,397.237L 348.648,397.237L 348.648,111.171L 295.041,111.171L 295.041,82.757L 377.064,82.757L 377.064,425.652 	z"  />
-<glyph unicode="&#xe1bd;" d="M 348.842,211.992l0-30.672 l 59.451,0 l0-91.495 l-304.42,0 L 103.873,181.32 l 59.484,0 l0,30.672 L 73.23,211.992 l0-152.807 l 365.737,0 L 438.967,211.992 L 348.842,211.992 z
-	 M 374.185,290.871l-77.666,0 L 296.519,389.173 l-82.768,0 l0-98.302 l-77.632,0 l 119.033-144.245L 374.185,290.871z"  />
-<glyph unicode="&#xe1be;" d="M 374.438,345.422l-77.988,0 L 296.45,444.151 l-83.102,0 l0-98.729 l-77.988,0 l 119.542-144.834L 374.438,345.422z M 283.64,23.188
-	c-1.452,3.889-2.28,8.094-2.748,11.82l-51.995,0 c-0.465-3.729-1.293-7.938-2.747-11.827c-3.039-7.893-7.913-14.011-17.521-14.060l0-4.656 
-	l 92.537,0 l0,4.656 C 291.553,9.17, 286.68,15.291, 283.64,23.188z M 357.304,192.918L 152.492,192.918 c-3.414,0-6.18-2.765-6.18-6.182l0-134.58 
-	c0-3.416, 2.767-6.184, 6.18-6.184l 204.812,0 c 3.415,0, 6.183,2.768, 6.183,6.184l0,134.58 C 363.486,190.153, 360.719,192.918, 357.304,192.918
-	z M 333.438,76.017L 176.357,76.017 l0,86.855 l 157.081,0 L 333.438,76.017 z"  />
-<glyph unicode="&#xe1bf;" d="M 358.763,174.97c0,56.752-102.764,200.823-102.764,200.823S 153.237,231.722, 153.237,174.97
-	c0-56.756, 46.008-102.764, 102.762-102.764C 312.754,72.207, 358.763,118.214, 358.763,174.97z"  />
-<glyph unicode="&#xe1c0;" d="M 421.889,19.264c-0.459,83.039-22.836,142.711-55.193,183.683c-32.996,41.698-76.687,64.476-120.131,71.964
-	c-63.36,10.927-96.707,27.832-114.955,43.928c-9.958,10.050-14.437,38.093-14.437,38.093s 26.747-16.498, 37.509-22.444
-	c 13.506-9.217, 43.304-24.194, 96.411-33.294c 49.38-8.449, 99.282-34.595, 136.514-81.712c 6.736-8.502, 13.031-17.707, 18.836-27.572
-	c 43.894,96.138-51.242,170.037-158.588,184.229C 129.958,391.705, 73.417,428.014, 73.417,428.014
-	c-11.3-114.114, 30.167-238.013, 127.971-278.382c 70.372-29.072, 125.688-34.927, 164.52-8.751
-	c 15.96-34.277, 25.736-73.843, 25.77-120.113l0-1.631 L 421.889,19.264z"  />
-<glyph unicode="&#xe1c1;" d="M 254.837,222.918c-0.477-0.805-0.542-1.186-0.572-1.414c 0.030-0.21, 0.096-0.596, 0.572-1.387
-	c 0.573-0.975, 1.814-2.472, 3.908-4.137c 4.134-3.379, 11.478-7.246, 21.077-10.482c 19.209-6.592, 47.203-10.952, 78.105-10.916
-	c 40.485-0.137, 76.21,7.711, 93.199,17.439c 5.657,3.113, 8.895,6.368, 9.861,8.096c 0.456,0.791, 0.538,1.177, 0.572,1.387
-	c-0.034,0.229-0.116,0.609-0.572,1.414c-0.572,0.958-1.832,2.463-3.894,4.131c-4.137,3.388-11.51,7.24-21.106,10.478
-	c-19.196,6.585-47.19,10.942-78.061,10.929c-40.485,0.127-76.245-7.743-93.231-17.466
-	C 259.038,227.885, 255.785,224.61, 254.837,222.918z M 444.048,181.898c-22.826-7.744-52.895-12.242-86.12-12.266
-	c-42.676,0.137-79.826,7.199-103.663,19.725l0-25.055 c0-0.229,0-0.545, 0.572-1.555c 0.573-0.971, 1.814-2.477, 3.908-4.135
-	c 4.134-3.368, 11.478-7.246, 21.077-10.474c 19.209-6.58, 47.203-10.942, 78.105-10.921c 40.419-0.148, 76.196,7.732, 93.184,17.453
-	c 5.673,3.123, 8.91,6.387, 9.877,8.086c 0.572,1, 0.555,1.326, 0.572,1.545l0,25.029 C 456.312,186.549, 450.473,184.104, 444.048,181.898z
-	 M 357.928,112.272c-42.676,0.132-79.826,7.196-103.663,19.734l0-27.72 c0-0.227,0-0.555, 0.572-1.553
-	c 0.573-0.972, 1.814-2.458, 3.908-4.12c 4.134-3.386, 11.478-7.245, 21.077-10.483c 19.209-6.59, 47.203-10.951, 78.105-10.916
-	c 40.419-0.136, 76.196,7.723, 93.184,17.438c 5.673,3.116, 8.91,6.37, 9.877,8.097c 0.572,1, 0.555,1.324, 0.572,1.537l0,27.699 
-	c-5.265-2.805-11.118-5.245-17.562-7.446C 421.207,116.797, 391.119,112.314, 357.928,112.272z M 55.129,336.468
-	c 4.135-3.369, 11.492-7.236, 21.093-10.469c 19.209-6.567, 47.185-10.935, 78.075-10.92c 40.484-0.127, 76.227,7.727, 93.215,17.465
-	c 5.655,3.106, 8.91,6.357, 9.86,8.076c 0.472,0.801, 0.554,1.16, 0.587,1.409c-0.033,0.216-0.115,0.596-0.587,1.389
-	c-0.558,0.971-1.816,2.466-3.894,4.145c-4.153,3.37-11.513,7.236-21.092,10.474c-19.229,6.589-47.188,10.951-78.090,10.921
-	c-40.486,0.131-76.23-7.732-93.2-17.45c-5.66-3.122-8.929-6.363-9.876-8.090c-0.461-0.793-0.526-1.173-0.557-1.389
-	c 0.030-0.249, 0.096-0.608, 0.557-1.409C 51.809,339.657, 53.050,338.153, 55.129,336.468z M 229.329,104.287l0,18.735 
-	c-21.108-5.666-46.942-8.888-75.032-8.909c-42.646,0.111-79.811,7.178-103.633,19.721l0-28.369 c0-0.211,0-0.556, 0.557-1.553
-	c 0.588-0.967, 1.83-2.463, 3.908-4.13c 4.135-3.375, 11.492-7.251, 21.093-10.488c 19.209-6.574, 47.185-10.933, 78.075-10.923
-	c 31.506-0.099, 60.103,4.659, 79.268,11.361c-0.033,0.058-0.065,0.11-0.116,0.175C 230.948,94.041, 229.313,99.052, 229.329,104.287z
-	 M 55.129,160.434c 4.135-3.373, 11.492-7.245, 21.093-10.482c 19.209-6.568, 47.185-10.938, 78.075-10.911
-	c 29.266-0.089, 56.016,3.998, 75.032,9.952L 229.329,164.1 c0,0.062-0.016,0.127-0.016,0.203l 0.016,17.398
-	c-21.108-5.684-46.942-8.898-75.032-8.921c-42.646,0.14-79.811,7.179-103.633,19.727l0-26.39 c0-0.223,0-0.533, 0.557-1.537
-	C 51.809,163.609, 53.050,162.118, 55.129,160.434z M 257.372,280.516c 0.587,1.002, 0.554,1.341, 0.587,1.553l0,27.788 
-	c-5.264-2.805-11.102-5.255-17.529-7.46c-22.825-7.739-52.895-12.217-86.133-12.248c-42.646,0.128-79.811,7.194-103.633,19.734
-	l0-27.813 c0-0.228,0-0.551, 0.557-1.553c 0.588-0.966, 1.83-2.461, 3.908-4.12c 4.135-3.383, 11.492-7.25, 21.093-10.498
-	c 19.209-6.574, 47.185-10.937, 78.075-10.915c 40.418-0.126, 76.193,7.735, 93.196,17.458
-	C 253.151,275.577, 256.422,278.814, 257.372,280.516z M 50.664,249.785l0-24.995 c0-0.227,0-0.545, 0.557-1.544
-	c 0.588-0.98, 1.83-2.459, 3.908-4.134c 4.135-3.378, 11.492-7.229, 21.093-10.493c 19.209-6.57, 47.185-10.936, 78.075-10.911
-	c 29.266-0.090, 56.016,4.004, 75.032,9.95l0,14.438 l 0.016,0 c 0.133,4.969, 1.732,9.711, 4.104,13.667c 1.26,2.061, 2.698,3.933, 4.27,5.683
-	c-22.469-7.205-51.49-11.366-83.421-11.392C 111.668,230.181, 74.486,237.241, 50.664,249.785z"  />
-<glyph unicode="&#xe1c2;" d="M 412.656,441.523l-49.973-49.975l 58.761-58.76l 49.976,49.98L 412.656,441.523z M 177.421,141.845l-15.932,15.935
-	l 190.923,190.928l-16.286,16.283L 85.215,114.078l 0.186-0.185L 37.482,7.115l 106.309,48.383l 0.182-0.182l 0.482,0.482l 0.006,0.003
-	l 250.424,250.432l-26.537,26.537L 177.421,141.845z M 138.161,82.793l-46.369-21.102l 20.9,46.572l 23.388,23.387l 3.367-22.301
-	l 22.097-3.164L 138.161,82.793z"  />
-<glyph unicode="&#xe1c3;" d="M 88.143,75.683L 88.143,158.779L 421.881,158.779L 421.881,75.683L 88.143,75.683 	zM 254.197,371.633L 419.957,205.875L 88.441,205.875 	z"  />
-<glyph unicode="&#xe1c4;" d="M 471.66,84.516c-7.229,20.952-31.164,23.963-51.153,32.393c-21.954,9.256-46.3,20.008-68.202,28.99
-	c-6.251,1.703-12.506,3.409-18.755,5.115c-7.464,5.135-14.77,22.201-18.761,30.688c-3.976,0.568-7.951,1.137-11.938,1.701
-	c 0.618,13.129, 8.745,13.834, 11.938,23.868c 2.812,8.845, 0.294,20.349, 4.754,28.537c 3.096,5.688, 10.095,5.728, 13.59,10.604
-	c 3.175,4.424, 5.263,12.141, 6.25,17.559c 1.805,9.909, 3.379,23.461-1.323,33.287c-2.706,5.643-4.413,6.184-5.165,13.037
-	c-0.915,8.303, 2.449,35.389, 2.588,41.243c 0.342,15.194-0.025,16.423-3.704,31.222c0,0-4.462,13.41-11.462,17.447l-13.952,2.402
-	l-8.623,7.99c-34.742,21.379-71.992,6.387-91.939-1.703c-28.747-9.326-46.923-37.471-34.232-97.607
-	c 2.166-10.272-5.624-14.865-5.116-20.469c 1.116-12.255, 1.351-41.722, 12.93-48.977c 1.078-0.676, 9.292-2.733, 9.238-2.172
-	c 1.14-11.932, 2.274-23.877, 3.409-35.809c 2.891-7.93, 9.829-8.803, 11.845-20.007L 195,181.701c-3.991-8.486-11.298-25.553-18.76-30.688
-	c-6.251-1.706-12.506-3.412-18.756-5.115c-21.903-8.982-46.248-19.734-68.201-28.99c-19.992-8.43-43.925-11.44-51.152-32.393
-	c0-14.234-1.341-47.849-0.974-66.492l 435.475,0 C 473,36.667, 471.66,70.281, 471.66,84.516z M 380.221,36.892l-77.537,0 l0,34.106 l 77.537,0 
-	L 380.221,36.892 z"  />
-<glyph unicode="&#xe1c5;" d="M 160.181,355.905c 2.371,0, 4.789,0.328, 7.194,0.977l 97.026,27.046c 14.26,3.978, 22.563,18.726, 18.606,32.98
-	c-3.974,14.257-18.737,22.581-32.964,18.611l-97.058-27.061c-14.223-3.963-22.562-18.709-18.607-32.969
-	C 137.698,363.653, 148.458,355.905, 160.181,355.905z M 160.181,282.193c 2.371,0, 4.789,0.325, 7.194,0.997l 191.862,53.452
-	c 14.256,3.989, 22.579,18.756, 18.605,32.992c-3.954,14.244-18.735,22.583-32.979,18.611l-191.877-53.485
-	c-14.223-3.956-22.562-18.722-18.607-32.982C 137.682,289.961, 148.458,282.193, 160.181,282.193z M 344.863,314.536l-191.877-53.452
-	c-14.223-3.973-22.562-18.752-18.575-32.98c 3.271-11.852, 14.046-19.604, 25.77-19.604c 2.371,0, 4.789,0.327, 7.194,0.998
-	l 191.862,53.467c 14.256,3.978, 22.564,18.736, 18.605,32.965C 373.868,310.187, 359.107,318.511, 344.863,314.536z M 344.863,240.106
-	l-191.877-53.462c-14.223-3.962-22.562-18.745-18.575-32.968c 3.271-11.854, 14.046-19.586, 25.77-19.586
-	c 0.31,0, 0.622,0.031, 0.917,0.031c 0.097,0, 0.146-0.015, 0.228-0.015l0,0c 1.176-0.119, 12.476-2.062, 22.009-8.013
-	c 4.578-2.8, 8.616-6.366, 11.755-10.779l0-65.434 L 317.15,49.88 l0,65.465 c 5.068,7.245, 13.099,12.184, 20.567,15.11
-	c 3.825,1.537, 7.375,2.475, 9.843,3.024c 1.229,0.281, 2.192,0.446, 2.78,0.542c 0.264,0.043, 0.458,0.067, 0.555,0.084l0,0
-	c 6.64,0.733, 12.267,5.359, 14.327,11.725c 2.026,6.373, 0.128,13.371-4.81,17.853l-21.338,19.244l 20.162,5.624
-	c 14.256,3.958, 22.564,18.721, 18.605,32.964C 373.868,235.757, 359.107,244.078, 344.863,240.106z M 312.701,156.113
-	c-8.632-5.040-17.722-12.381-24.72-23.004c-2.78-4.205-5.169-8.965-7.032-14.146l-49.674,0 c-1.863,5.182-4.218,9.941-7.014,14.146
-	c-3.745,5.669-8.064,10.365-12.557,14.307l 88.506,24.67l 15.729-14.188C 314.861,157.337, 313.78,156.752, 312.701,156.113z
-	 M 221.612,7.895l 69.017,0 l0,20.602 l-69.017,0 L 221.612,7.895 z"  />
-<glyph unicode="&#xe1c6;" d="M 248.138,371.646L 248.138,320.282L 312.139,320.282L 312.139,177.733L 236.402,177.733L 236.402,225.932L 146.883,152.050L 236.402,78.163L 236.402,126.37L 363.502,126.37L 363.502,371.646 z"  />
-<glyph unicode="&#xe1c7;" d="M 158.297,307.735c0-12.833-10.405-23.238-23.239-23.238L 43.926,284.497 c-12.835,0-23.24,10.405-23.24,23.238l0,0
-		c0,12.836, 10.405,23.241, 23.24,23.241l 91.132,0 C 147.892,330.976, 158.297,320.572, 158.297,307.735L 158.297,307.735zM 325.161,145.446c0-12.836-10.404-23.239-23.237-23.239L 210.79,122.207 c-12.837,0-23.24,10.403-23.24,23.239l0,0
-		c0,12.833, 10.403,23.238, 23.24,23.238l 91.134,0 C 314.757,168.685, 325.161,158.279, 325.161,145.446L 325.161,145.446zM 490.936,274.925c0-12.833-10.405-23.236-23.239-23.236l-91.134,0 c-12.835,0-23.237,10.403-23.237,23.236l0,0
-		c0,12.837, 10.402,23.241, 23.237,23.241l 91.134,0 C 480.53,298.166, 490.936,287.762, 490.936,274.925L 490.936,274.925zM 57.498,356.554l 66.174,0 L 123.672,438.753 L 57.498,438.753 L 57.498,356.554 z M 390.046,438.753l0-115.007 l 66.17,0 L 456.216,438.753 L 390.046,438.753 z M 223.77,195.244l 66.179,0 
-	L 289.949,438.755 L 223.77,438.755 L 223.77,195.244 z M 390.046,8.824l 66.17,0 L 456.216,222.182 l-66.17,0 L 390.046,8.824 z M 57.498,8.824l 66.174,0 L 123.672,254.99 L 57.498,254.99 L 57.498,8.824 z
-	 M 223.77,8.824l 66.179,0 l0,84.858 L 223.77,93.682 L 223.77,8.824 z"  />
-<glyph unicode="&#xe1c8;" d="M 233.471,210.965l 36.168,36.165L 159.335,357.436l 55.364,55.375L 67.804,412.811 l0-146.945 l 55.364,55.4L 233.471,210.965z
-	 M 256.296,412.484l0-51.158 c 37.934,0, 72.042-15.306, 96.929-40.163c 24.82-24.853, 40.092-58.958, 40.125-96.892l0,0
-	c-0.033-37.9-15.305-72.012-40.125-96.896c-24.887-24.82-58.995-40.096-96.929-40.142c-0.031,0-0.13,0-0.164-0.017
-	c-37.867,0.101-71.878,15.369-96.73,40.158c-24.822,24.885-40.126,58.996-40.126,96.896L 68.097,224.27 
-	c 0.034-103.926, 84.272-188.147, 188.199-188.147l 25.573,1.717c 91.663,12.424, 162.332,90.876, 162.625,185.839
-	c0,0.197, 0.031,0.428, 0.031,0.592C 444.494,328.229, 360.254,412.484, 256.296,412.484z"  />
-<glyph unicode="&#xe1c9;" d="M 109.038,223.487l 96.157,96.149l-35.409,35.403L 38.225,223.487l 131.562-131.565l 35.413,35.406l-0.004,0.006L 109.038,223.487
-	z M 359.893,336.613l-18.438,18.433l-35.406-35.411l 18.431-18.438l 77.723-77.71l-96.153-96.153l 35.406-35.416l 131.566,131.569
-	L 359.893,336.613z M 160.074,221.562c0-12.386, 10.047-22.432, 22.436-22.432c 12.391,0, 22.436,10.046, 22.436,22.432
-	c0,12.392-10.045,22.438-22.436,22.438C 170.121,243.999, 160.074,233.953, 160.074,221.562z M 254.623,243.999
-	c-12.392,0-22.435-10.046-22.435-22.438c0-12.386, 10.043-22.432, 22.435-22.432c 12.39,0, 22.434,10.046, 22.434,22.432
-	C 277.057,233.953, 267.013,243.999, 254.623,243.999z M 326.732,199.13c 12.389,0, 22.437,10.046, 22.437,22.432
-	c0,12.392-10.048,22.438-22.437,22.438c-12.391,0-22.434-10.046-22.434-22.438C 304.299,209.176, 314.342,199.13, 326.732,199.13z"  />
-<glyph unicode="&#xe1ca;" d="M 324.658,307.228l 0.018-0.027c-0.081,0.108-0.148,0.213-0.246,0.319c-4.203,5.829-8.387,11.433-12.46,16.761
-	c-5.396,9.025-8.24,20.006-1.618,35.849l0,0.009 l 22.762,54.505l-35.777,16.298l 3.697,16.156l-89.85,0 l 4.708-20.585l-36.788-11.869
-	l 22.76-54.505l0-0.009 c 11.25-26.945-4.857-39.813-14.321-52.928c-46.848-64.796-99.316-157.564-99.316-213.49
-	c0-92.734, 72.040-89.646, 167.872-89.646c 95.866,0, 167.893-3.088, 167.893,89.646C 423.99,149.646, 371.488,242.414, 324.658,307.228z
-	 M 233.535,352.732l 45.849,0 l0-28.931 l-45.849,0 L 233.535,352.732 z M 298.219,184.738l-6.769-15.751l-49.004,0 l-0.229-9.19l 46.601,0 l-6.787-15.738
-	l-38.063,0 c 4.677-23.061, 15.467-34.562, 32.376-34.562c 10.921,0, 22.171,4.594, 33.681,13.781l-0.227-33.041
-	c-9.763-5.684-20.979-8.52-33.669-8.52c-18.376,0-33.191,5.895-44.424,17.707c-10.187,10.642-16.825,25.523-19.899,44.635L 194.98,144.059 
-	l 6.77,15.738l 8.747,0 l0,5.682 c0,2.043, 0.083,3.217, 0.229,3.509L 194.75,168.988 l 6.787,15.751l 11.151,0 c 3.514,17.641, 10.724,31.57, 21.665,41.773
-	c 11.528,11.077, 25.949,16.621, 43.3,16.621c 12.241,0, 25.505-3.639, 39.826-10.933l-13.357-27.34
-	c-10.22,6.562-19.751,9.844-28.664,9.844c-15.287,0-25.507-9.99-30.624-29.965L 298.219,184.739 z"  />
-<glyph unicode="&#xe1cb;" d="M 434.567,372.385l 34.897,34.901l-32.369,32.37l-34.895-34.903l-36.534,36.534l0-105.984 l 105.98,0 L 434.567,372.385z
-	 M 471.648,113.072L 365.663,113.072 l0-105.979 l 37.081,37.077l 34.897-34.9l 32.372,32.369l-34.898,34.9L 471.648,113.072z M 73.187,76.003
-	l-34.901-34.901l 32.372-32.371l 34.898,34.901l 36.537-36.539L 142.093,113.080 L 36.113,113.080 L 73.187,76.003z M 142.094,335.309L 142.094,441.287 l-37.078-37.079
-	L 70.111,439.111L 37.748,406.75l 34.901-34.906l-36.537-36.535L 142.094,335.309 z M 386.4,179.516l0,86.92 c0,35.999-29.179,65.172-65.171,65.172
-	L 185.522,331.608 c-35.992,0-65.171-29.173-65.171-65.172l0-86.92 c0-35.99, 29.179-65.164, 65.171-65.164l 135.707,0 
-	C 357.222,114.352, 386.4,143.525, 386.4,179.516z"  />
-<glyph unicode="&#xe1cc;" d="M 254.867,265.599c-22.305,0-40.45-18.143-40.45-40.439c0-22.316, 18.145-40.474, 40.45-40.474
-	c 22.319,0, 40.474,18.157, 40.474,40.474C 295.341,247.456, 277.186,265.599, 254.867,265.599z M 254.867,340.541
-	c-107.278,0-215.312-116.648-215.312-116.648s 108.034-116.646, 215.312-116.646c 107.294,0, 215.329,116.646, 215.329,116.646
-	S 362.161,340.541, 254.867,340.541z M 254.867,142.589c-45.586,0-82.546,36.925-82.546,82.57c0,45.587, 36.96,82.535, 82.546,82.535
-	c 45.612,0, 82.571-36.948, 82.571-82.535C 337.438,179.514, 300.479,142.589, 254.867,142.589z"  />
-<glyph unicode="&#xe1cd;" d="M 415.495,264.721l-22.299,13.428c-3.688,2.221-7.913,3.393-12.214,3.393L 345.86,281.542 l0,36.66 l 4.070,12.242
-	c 0.803,2.408, 1.213,4.936, 1.213,7.473l0,24.453 c0,13.078-10.602,23.678-23.68,23.678l-28.316,0 c-9.076,0-17.355-5.186-21.312-13.355
-	c-0.328-0.676-32.99-68.129-48.221-101.205c-7.062-15.334-30.904-22.451-41.861-24.57c-1.264,5.178-5.9,9.041-11.469,9.041L 96.88,255.959 
-	c-6.535,0-11.838-5.301-11.838-11.84l0-40.783 l 103.080,0 l0,19.65 c 8.408,1.26, 49.291,8.828, 63,38.602
-	c 15.311,33.248, 48.025,100.783, 48.025,100.783l 28.316,0 l0-24.453 l-5.283-15.877l0-64.178 l 58.802,0 l 22.296-13.424l0-133.973 l-30.277-24.834
-	L 271.415,85.632 l-31.234,23.648l-52.059,0 l0,70.375 L 85.042,179.655 l0-90.252 c0-6.537, 5.303-11.84, 11.838-11.84l 79.404,0 c 5.197,0, 9.568,3.375, 11.158,8.037
-	l 44.787,0 l 24.895-18.846c 4.113-3.115, 9.133-4.801, 14.291-4.801l 101.586,0 c 5.477,0, 10.782,1.898, 15.017,5.371l 30.278,24.832
-	c 5.484,4.5, 8.662,11.217, 8.662,18.309L 426.958,244.438 C 426.958,252.738, 422.608,260.438, 415.495,264.721z"  />
-<glyph unicode="&#xe1ce;" d="M 406.019,379.734l0-181.021 l-93.774,50.065l0-60.793 l-132.009,60.793l0-65.697 L 37.579,248.779l0-242.726 l 434.607,0 L 472.186,379.734 L 406.019,379.734 z
-	 M 383.131,417.742c 13.594,0.036, 25.369-5.842, 33.956-12.188c 4.265-3.146, 7.657-6.336, 9.901-8.674
-	c 1.124-1.161, 1.969-2.121, 2.497-2.744c 0.265-0.309, 0.45-0.541, 0.56-0.672c 0.031-0.037, 0.054-0.067, 0.073-0.088l-0.008-0.004
-	l 0.033-0.023l 2.574,2.022l 17.276,13.239l-0.008,0 c-0.48,0.607-6.737,8.736-18.031,17.094C 420.699,434, 404.022,442.752, 383.131,442.783
-	c-20.905,0.088-44.743-9.234-68.29-32.937l 17.716-17.707C 352.898,412.351, 369.564,417.662, 383.131,417.742z M 196.261,356.964
-	c 11.255-8.296, 27.935-17.049, 48.822-17.079l 0.282,0 c 20.842,0, 44.562,9.346, 68.007,32.934l-17.696,17.707
-	c-20.367-20.205-37.028-25.514-50.593-25.599c-13.587-0.035-25.364,5.846-33.958,12.187c-4.262,3.145-7.646,6.335-9.894,8.667
-	c-1.126,1.173-1.971,2.124-2.498,2.749c-0.271,0.306-0.452,0.535-0.56,0.669c-0.037,0.050-0.057,0.071-0.068,0.095l-19.871-15.242
-	C 178.713,373.441, 184.966,365.312, 196.261,356.964z M 198.077,389.322l-2.853-2.229l 2.881,2.199
-	C 198.096,389.297, 198.079,389.32, 198.077,389.322z M 113.016,417.742c 13.593,0.036, 25.367-5.846, 33.954-12.188
-	c 4.269-3.146, 7.657-6.336, 9.906-8.678c 1.124-1.161, 1.969-2.117, 2.495-2.74c 0.269-0.309, 0.453-0.541, 0.554-0.672
-	c 0.041-0.045, 0.059-0.069, 0.076-0.092l 19.871,15.23l0,0.010 c-0.483,0.609-6.732,8.732-18.034,17.086
-	c-11.251,8.295-27.937,17.061-48.822,17.084c-20.904,0.084-44.746-9.234-68.291-32.938L 62.438,392.14
-	C 82.789,412.353, 99.446,417.662, 113.016,417.742z M 162.876,395.575l-2.875-2.202l 0.024-0.031L 162.876,395.575z"  />
-<glyph unicode="&#xe1cf;" d="M 294.768,432.486l 98.208,0 l 58.981-415.973l-94.258,0 l-8.748,85.508L 195.713,102.021 l-46.846-85.508l-90.87,0 L 294.768,432.486z
-		 M 234.376,173.702l 105.545,0 L 322.707,337.38L 234.376,173.702z"  />
-<glyph unicode="&#xe1d0;" d="M 451.42,380.227L 280.5,380.223c-4.949,0.125-8.762,9.12-8.762,12.559L 271.738,394.25 c0,7.349-5.959,13.309-13.311,13.309l-84.32,0 
-			c-7.35,0-13.307-5.96-13.307-13.309l 0.002-1.469c0-3.44-3.82-12.445-8.777-12.562l-12.273,0 
-			c-6.123-1.194-10.752-6.583-10.752-13.061c0,0, 0.779-11.868, 1.742-27.377c 1.193,0.351, 2.451,0.547, 3.758,0.547l 84.318,0 
-			c 7.352,0, 13.309-5.959, 13.309-13.309l0-1.469 c0-3.438, 3.814-12.434, 8.766-12.559l 170.92,0.005
-			c 6.15-1.175, 10.799-6.574, 10.799-13.067c0,0-4.377-66.594-5.184-90.587c-0.271-8.174-0.705-21.039-1.154-34.445l 28.936,0 
-			c 7.352,0, 8.869,5.96, 8.869,13.31c0,0, 2.156,64.377, 2.961,88.366c 0.803,23.992, 5.18,90.585, 5.18,90.585
-			C 462.219,373.653, 457.572,379.052, 451.42,380.227zM 372.203,245.768l-170.922-0.004c-4.951,0.125-8.76,9.119-8.76,12.559l0,1.469 c0,7.35-5.961,13.31-13.312,13.31L 94.891,273.102 
-			c-7.35,0-13.311-5.96-13.311-13.31l 0.002-1.469c0-3.441-3.818-12.447-8.779-12.561L 60.535,245.762 
-			c-6.127-1.194-10.754-6.583-10.754-13.061c0,0, 4.379-66.593, 5.182-90.586c 0.807-23.989, 2.961-88.364, 2.961-88.364
-			c0-7.352, 1.52-13.31, 8.871-13.31L 365.99,40.441 c 7.35,0, 8.871,5.958, 8.871,13.31c0,0, 2.156,64.375, 2.959,88.364
-			c 0.805,23.993, 5.182,90.586, 5.182,90.586C 383.002,239.193, 378.354,244.594, 372.203,245.768z"  />
-<glyph unicode="&#xe1d1;" d="M 457.211,310.499l0,0.316 L 52.564,310.815 l0-0.328 c-7.956-1.548-13.959-8.547-13.959-16.955c0,0, 5.683-86.463, 6.726-117.611
-	c 1.045-31.147, 3.844-114.728, 3.844-114.728c0-9.544, 1.973-17.281, 11.514-17.281l 388.458,0 c 9.543,0, 11.514,7.737, 11.514,17.281
-	c0,0, 2.804,83.58, 3.845,114.728c 1.044,31.147, 6.727,117.611, 6.727,117.611C 471.231,301.965, 465.197,308.974, 457.211,310.499z
-	 M 457.211,352.812c0,8.98-7.277,16.256-16.258,16.256L 235.305,369.068 c-6.43,0.161-11.384,11.842-11.384,16.311l 0.003,1.902
-	c0,9.546-7.737,17.28-17.28,17.28L 97.168,404.561 c-9.544,0-17.281-7.734-17.281-17.28l 0.004-1.902c0-4.5-5.021-16.322-11.517-16.322l 0.155,0 
-	c-8.844-0.157-15.965-7.364-15.965-16.244l0-11.223 l 404.647,0 L 457.211,352.812 z"  />
-<glyph unicode="&#xe1d2;" d="M 450.962,310.167l0,10.047 l0,9.201 c0,23.398-19.035,42.436-42.434,42.436L 257.306,371.851 c-5.885,16.926-21.99,29.1-40.885,29.1
-	l-89.758,0 c-20.545,0-37.795-14.391-42.191-33.623c-13.891-7.016-23.486-21.45-23.486-37.912l0-9.201 l0-10.112 
-	c-7.148-7.774-11.443-18.122-11.443-29.287l0-0.956 l 0.062-0.953c 0.045-0.704, 4.639-70.713, 5.469-95.492l 3.137-93.62
-	c 0.033-6.024, 0.682-14.788, 5.271-23.301c 6.564-12.175, 19.002-19.442, 33.273-19.442l 318.49,0 c 14.273,0, 26.713,7.268, 33.275,19.445
-	c 4.588,8.512, 5.236,17.275, 5.271,23.298l 3.135,93.62c 0.832,24.782, 5.424,94.788, 5.471,95.492l 0.061,0.953l0,0.956 
-	C 462.458,292.019, 458.144,302.39, 450.962,310.167z M 90.093,329.415c0,7.281, 5.84,13.189, 13.090,13.318l-0.125,0 
-	c 5.324,0, 9.441,9.694, 9.441,13.382l-0.006,1.562c0,7.824, 6.344,14.168, 14.17,14.168l 89.758,0 c 7.826,0, 14.166-6.344, 14.166-14.168
-	l0-1.562 c0-3.663, 4.062-13.239, 9.332-13.37l 168.609,0 c 7.363,0, 13.328-5.969, 13.328-13.33l0-9.201 L 90.093,320.214 L 90.093,329.415 z M 427.837,184.387
-	c-0.854-25.538-3.15-94.062-3.15-94.062c0-7.825-1.617-14.171-9.441-14.171L 96.755,76.154 c-7.822,0-9.439,6.346-9.439,14.171
-	c0,0-2.297,68.524-3.152,94.062s-5.516,96.428-5.516,96.428c0,6.893, 4.926,12.631, 11.445,13.9l 331.764,0.009
-	c 6.547-1.251, 11.494-6.998, 11.494-13.909C 433.351,280.814, 428.694,209.925, 427.837,184.387z"  />
-<glyph unicode="&#xe1d3;" d="M 455.482,140.387c 1.043,31.146, 16.383,86.462, 16.383,86.462c0,8.433-6.035,15.438-14.018,16.967L 457.847,353.082 l-0.006,0 
-	c-0.027,8.96-7.293,16.211-16.256,16.211L 235.937,369.293 c-6.429,0.156-11.382,11.842-11.382,16.307l 0.001,1.906
-	c0,9.542-7.736,17.28-17.28,17.28L 97.799,404.786 c-9.543,0-17.279-7.738-17.279-17.28l 0.004-1.906c0-4.497-5.023-16.32-11.518-16.32l 0.154,0 
-	c-8.844-0.159-15.965-7.366-15.965-16.246L 53.2,243.807c-7.955-1.549-13.963-8.547-13.963-16.958c0,0, 14.659-55.928, 15.704-87.071
-	c 1.042-31.149-5.132-78.361-5.132-78.361c0-9.539, 1.973-17.277, 11.513-17.277l 388.458,0 c 9.544,0, 11.515,7.738, 11.515,17.277
-	C 461.294,61.416, 454.439,109.242, 455.482,140.387z M 73.23,244.131l0,88.924 l 364.584,0 l0-88.924 L 73.23,244.131 z"  />
-<glyph unicode="&#xe1d4;" d="M 260.094,306.691c 22.761,0, 41.236,18.463, 41.236,41.238c0,22.764-41.236,92.594-41.236,92.594s-41.236-69.83-41.236-92.594
-	C 218.857,325.154, 237.3,306.691, 260.094,306.691z M 231.906,261.596c 10.398,10.4, 10.398,27.257,0,37.674
-	c-10.399,10.383-61.122,23.465-61.122,23.465s 13.082-50.738, 23.481-61.139C 204.666,251.231, 221.506,251.231, 231.906,261.596z
-	 M 288.088,261.596c 10.398-10.364, 27.271-10.364, 37.672,0c 10.398,10.4, 23.446,61.139, 23.446,61.139s-50.72-13.082-61.118-23.465
-	C 277.687,288.853, 277.687,271.996, 288.088,261.596z M 271.996,197.664l0,95.984 l-24.918,0 l0-95.984 l-104.71,0 l0-62.442 L 369.12,135.222 l0,62.442 L 271.996,197.664 
-	z M 184.323,7.537l 142.875,0 l 24.917,106.312L 159.372,113.849 L 184.323,7.537z"  />
-<glyph unicode="&#xe1d5;" d="M 394.049,362.084c-23.246,23.244-51.133,37.123-74.594,37.123c-12.814,0-23.775-4.18-31.688-12.092
-	c-3.967-3.969-6.955-8.635-8.984-13.855l-38.723-86.393L 97.070,143.875c-21.754-21.752-21.754-57.018,0-78.768
-	c 10.875-10.877, 25.129-16.314, 39.385-16.314c 14.254,0, 28.51,5.438, 39.385,16.314l 142.99,142.99l 87.449,39.197
-	c 0.195,0.086, 0.402,0.191, 0.609,0.293c 4.578,2.004, 8.693,4.721, 12.188,8.215C 442.238,278.963, 431.477,324.656, 394.049,362.084z
-	 M 319.455,367.381c 11.201,0, 31.568-7.279, 52.088-27.803c 25.938-25.939, 32.242-54.055, 25.027-61.268
-	c-2.291-2.293-6.256-2.773-9.18-2.773l-0.002,0 c-11.201,0-31.564,7.281-52.086,27.805c-12.516,12.51-21.941,27.225-25.871,40.369
-	c-2.844,9.527-2.521,17.531, 0.844,20.895C 312.566,366.898, 316.533,367.381, 319.455,367.381z"  />
-<glyph unicode="&#xe1d6;" d="M 397.716,447.979L 113.524,193.402L 208.52,193.402L 113.524,0.225L 397.716,254.806L 302.72,254.806 z"  />
-<glyph unicode="&#xe1d7;" d="M 55.219,9.164L 55.219,418.284L 102.792,418.284L 102.792,9.164L 55.219,9.164 	zM 271.146,196.727c-89.417,82.084-142.544,5.493-142.544,5.493L 128.602,417.757 c0,0, 117.955,63.911, 171.184-34.136l 0.005,0.142
-		c 79.278-129.027, 153.979-61.767, 153.979-61.767S 360.562,114.64, 271.146,196.727z"  />
-<glyph unicode="&#xe1d8;" d="M 37.553,362.452l 156.364-378.050l 43.967,18.185L 81.514,380.646L 37.553,362.452z M 380.944,389.833
-	c0,0-62.443-85.464-154.828,6.919l0-0.168 c-65.885,67.603-123.106-9.303-123.106-9.303l 92.72-222.697
-	c0,0, 38.514,109.396, 154.827-6.918l0,0.171 c 65.883-67.598, 123.107,9.305, 123.107,9.305L 380.944,389.833z"  />
-<glyph unicode="&#xe1d9;" d="M 254.516,308.828c-40.747,0-73.777-32.919-73.777-73.533
-	c0-40.615, 33.030-73.536, 73.777-73.536c 40.749,0, 73.77,32.921, 73.77,73.536C 328.285,275.909, 295.265,308.828, 254.516,308.828z
-	 M 254.516,194.113c-22.816,0-41.315,18.441-41.315,41.182c0,22.737, 18.499,41.183, 41.315,41.183
-	c 22.812,0, 41.317-18.445, 41.317-41.183C 295.833,212.555, 277.328,194.113, 254.516,194.113z M 205.827,97.046l 97.378,0 l0,32.362 l-97.378,0 
-	L 205.827,97.046 z M 205.827,32.327l 97.378,0 l0,32.36 l-97.378,0 L 205.827,32.327 z M 190.869,367.362l-68.856-68.631l 22.948-22.885l 68.862,68.644
-	L 190.869,367.362z M 144.961,412.741l-68.854-68.636l 22.954-22.882l 68.86,69.024L 144.961,412.741z M 374.966,415.68l-75.585-75.346
-	l 60.131-59.566l 75.588,74.598L 374.966,415.68z"  />
-<glyph unicode="&#xe1da;" d="M 309.135,312.319L 368.044,312.319L 368.044,365.117L 226.546,365.117L 226.546,312.319L 285.455,312.319 	zM 202.866,288.638L 143.955,288.638L 143.955,235.839L 202.866,235.839L 226.546,235.839L 285.455,235.839L 285.455,288.638L 226.546,288.638 	zM 61.365,312.319L 120.273,312.319L 143.955,312.319L 202.866,312.319L 202.866,365.117L 61.365,365.117 	zM 143.955,159.362L 202.866,159.362L 202.866,212.161L 143.955,212.161L 120.273,212.161L 61.365,212.161L 61.365,159.362L 120.273,159.362 	zM 61.365,135.684L 120.273,135.684L 120.273,82.883L 61.365,82.883zM 61.365,288.638L 120.273,288.638L 120.273,235.839L 61.365,235.839zM 391.725,365.117L 450.635,365.117L 450.635,312.319L 391.725,312.319zM 391.725,212.161L 450.635,212.161L 450.635,159.362L 391.725,159.362zM 285.455,135.684L 226.546,135.684L 202.866,135.684L 143.955,135.684L 143.955,82.883L 285.455,82.883 	zM 450.635,288.638L 391.725,288.638L 368.044,288.638L 309.135,288.638L 309.135,235.839L 368.044,235.839L 391.725,235.839L 450.635,235.839 	zM 309.135,159.362L 368.044,159.362L 368.044,212.161L 309.135,212.161L 285.455,212.161L 226.546,212.161L 226.546,159.362L 285.455,159.362 	zM 450.635,135.684L 391.725,135.684L 368.044,135.684L 309.135,135.684L 309.135,82.883L 450.635,82.883 	z"  />
-<glyph unicode="&#xe1db;" d="M 288.311,414.656c0,0-155.821-58.332-155.821-221.025c0-111.828, 49.936-146.785, 90.839-157.717
-		c-10.693,5.025-20.893,16.164-20.893,40.924c0,45.586, 44.824,61.936, 44.824,61.936c-11.688-24.494-1.173-33.389, 9.825-43.461
-		c 14.635,18.652, 19.415,36.57, 3.575,79.654c0,0, 70.424-29.889, 55.853-99.934c-4.674-22.475-17.8-34.857-32.061-41.689
-		c 36.017,9.098, 95.059,44.814, 95.059,116.504C 379.511,278.959, 217.852,263.068, 288.311,414.656zM 315.269,354.176c 2.841-20.068, 1.008-33.783-3.618-43.971c 7.246-9.438, 16.863-18.477, 27.374-28.344
-		c 6.532-6.137, 13.408-12.594, 20.178-19.631C 358.314,321.432, 315.269,354.176, 315.269,354.176z"  />
-<glyph unicode="&#xe1dc;" d="M 207.504,383c 22.009,0, 52.552-2.224, 84.438-11.218c 30.674-8.603, 62.492-23.316, 89.684-47.941
-	c 14.275-12.949, 27.322-28.676, 38.377-47.856l 6.996,1.974c-0.359,11.186-1.521,22.145-3.484,32.77l-0.178,0.881l-0.539,0.724
-	c-8.094,10.494-16.842,19.878-26.047,28.2c-30.413,27.552-65.566,43.66-98.741,52.964c-27.913,7.817-54.451,10.857-76.032,11.708
-	l-1.194,0.063l-0.982-0.623c-7.062-4.542-14.028-9.579-20.862-15.040l-8.568-6.888l 10.987,0.217
-	C 203.319,382.968, 205.363,383, 207.504,383z M 118.949,220.111c 5.070,0, 10.234,0.396, 15.386,1.276l-0.636,3.661l 0.652-3.661
-	c 9.711,1.717, 19.556,5.43, 27.945,12.395c 8.451,6.968, 14.992,17.021, 18.588,29.924c 1.146,4.089, 2.028,8.503, 2.585,13.224
-	c 0.556,4.663, 1.422,8.846, 2.486,12.676c 3.744,13.174, 9.909,21.615, 17.235,27.793c 10.89,9.125, 25.307,12.854, 37.228,13.931
-	c 3.287,0.297, 6.361,0.396, 9.091,0.396c 2.176,0, 4.138-0.067, 5.772-0.162c 1.864-0.101, 3.333-0.265, 4.251-0.365
-	c 0.492-0.062, 0.852-0.094, 0.998-0.126c 0.098,0, 0.18-0.037, 0.246-0.037c 0.686-0.095, 1.241-0.128, 1.813-0.128
-	c 5.444,0, 10.202,3.924, 11.103,9.463c 0.098,0.625, 0.145,1.231, 0.145,1.803c0,5.445-3.938,10.218-9.465,11.099
-	c-0.229,0.033-6.279,0.982-14.845,0.982c-7.343,0-16.777-0.654-26.915-3.089c-11.119-2.667-23.153-7.573-33.847-16.465
-	c-10.694-8.862-19.703-21.748-24.493-39.012c-1.405-4.991-2.469-10.335-3.171-16.044c-0.425-3.675-1.111-6.95-1.93-9.891
-	c-2.598-9.12-6.508-14.618-11.266-18.621c-6.98-5.873-17.038-8.424-28.222-8.487l-0.704,0 c-5.576,0-11.316,0.618-16.742,1.537
-	l-3.206,0.554l-0.982-3.104c-1.6-4.923-3.008-9.844-4.314-14.718l-1.015-3.894l 3.958-0.749
-	C 103.579,221.029, 111.148,220.111, 118.949,220.111z M 109.089,255.954c 11.872,0.95, 21.763,6.016, 28.631,13.309
-	c 6.85,7.197, 10.824,16.027, 13.276,24.741c 3.007,10.773, 3.811,21.731, 3.811,30.984c0,1.928-0.050,3.759-0.081,5.492
-	c-0.050,1.426-0.133,2.745-0.199,3.993l-0.292,4.705l 6.326,2.292c 10.58,3.86, 22.059,7.13, 34.256,9.252
-	c 5.46,0.982, 9.32,5.725, 9.32,11.086c0,0.654-0.065,1.309-0.179,1.932l-3.681-0.623l 3.681,0.656
-	c-0.966,5.476-5.706,9.321-11.103,9.321c-0.621,0-1.276-0.053-1.994-0.18c-4.349-0.772-8.65-1.685-12.851-2.698l-1.048-0.232
-	l-0.719-0.751c-6.851-6.833-13.491-14.142-19.852-21.879l-2.45-2.973l-0.018,0.228l-1.978-2.615l-4.317-5.234l 0.506,0.164
-	l-0.328-0.423c-5.475-7.229-10.705-14.781-15.647-22.63l-0.456-0.723l-0.098-0.882c-0.475-4.182-1.209-8.338-2.289-12.161
-	c-2.388-8.603-6.312-15.015-11.577-18.347c-0.917-0.56-1.962-1.082-3.155-1.589l-1.341-0.556l-0.605-1.308
-	c-2.715-5.737-5.265-11.492-7.586-17.25l-2.242-5.591l 6.018,0.491C 108.827,255.954, 108.877,255.954, 109.089,255.954z
-	 M 289.603,417.729c 10.907-2.616, 21.779-6.117, 31.343-10.499l0,0c 1.507-0.72, 3.125-1.016, 4.712-1.016
-	c 4.251,0, 8.339,2.424, 10.218,6.544c 0.703,1.521, 1.046,3.136, 1.046,4.711c0,4.266-2.437,8.339-6.54,10.235
-	c-2.648,1.208-5.312,2.318-7.996,3.4l-0.357,0.132l-0.395,0.047c-5.705,0.982-11.51,1.453-17.396,1.453
-	c-10.367,0-20.944-1.468-31.607-4.214l 0.297-7.311C 278.387,420.248, 283.978,419.102, 289.603,417.729z M 113.504,96.371
-	c 47.399,0, 81.691,9.875, 106.296,25.001c 31.527,19.322, 46.11,46.858, 52.292,69.213c 4.037,14.485, 4.806,26.88, 4.806,34.368
-	c0,4.363-0.294,7.294-0.294,7.356l0,0.149 l0,0.046 c-0.621,5.789-5.494,10.071-11.216,10.071c-0.36,0-0.785-0.031-1.343-0.094
-	c-5.639-0.625-9.922-5.493-9.922-11.187c0-0.295, 0.015-0.622, 0.048-0.982l0-0.032 l 0.031-0.193c0-0.065, 0.182-1.997, 0.182-5.040
-	c0-5.898-0.639-16.414-3.989-28.386c-5.282-18.505-16.498-40.12-42.4-56.097c-20.273-12.51-50.228-21.698-94.522-21.698
-	c-5.854,0-11.954,0.163-18.315,0.491l-5.102,0.264l 1.295-4.942c 1.404-5.393, 3.072-10.595, 4.938-15.627l 0.881-2.324l 2.485-0.101
-	c 4.727-0.195, 9.321-0.258, 13.801-0.258L 113.504,96.369 z M 346.977,396.277L 346.977,396.277L 346.977,396.277c0,0, 0.035,0, 0.102-0.032
-	l 0.242-0.101c 0.065-0.015, 0.146-0.063, 0.213-0.095c 3.207-1.372, 18.938-8.353, 36.203-19.687c 3.299-2.191, 6.67-4.515, 10.039-6.966
-	l 5.363,5.002c-9.942,15.67-22.5,29.252-37.479,39.929l-0.293,0.197l-0.312,0.147c-3.287,1.537-5.38,2.403-5.38,2.403
-	c-1.488,0.624-2.959,0.919-4.382,0.919c-4.431,0-8.632-2.652-10.413-6.999c-0.59-1.376-0.869-2.846-0.869-4.287
-	C 340.012,402.292, 342.628,398.093, 346.977,396.277z M 365.881,166.777c-8.994,38.309-21.911,62.592-22.205,63.146l-3.303-1.717
-	l 3.303,1.749c-2.043,3.797-5.936,5.967-9.959,5.967c-1.783,0-3.612-0.423-5.314-1.356c-3.775-2.013-5.95-5.916-5.95-9.94
-	c0-1.769, 0.425-3.597, 1.325-5.266l 0.096-0.194l 0.050-0.068c 1.392-2.694, 13.033-25.945, 20.799-60.854
-	c 4.056-18.22, 7.031-39.57, 7.079-62.87l 0.016-10.124l 6.557,7.688c 5.102,5.984, 9.958,12.194, 14.633,18.637l 0.789,1.062l-0.082,1.358
-	C 372.484,133.454, 369.526,151.277, 365.881,166.777z M 375.577,247.584c-25.722,40.072-61.023,55.937-83.391,62.163
-	c-5.675,1.589-10.532,2.588-14.226,3.237c-1.88,0.327-3.417,0.561-4.595,0.686c-0.573,0.1-1.080,0.164-1.471,0.233
-	c-0.198,0.031-0.326,0.062-0.442,0.062c-0.1,0-0.1,0-0.1,0l0,0c-7.667,1.39-14.535,2.059-20.814,2.059
-	c-7.079,0-13.488-0.85-19.292-2.549c-9.679-2.81-17.464-8.143-23.201-14.745c-9.925-11.545-14.161-25.64-18.363-39.017
-	c-3.124-10.103-6.114-20.010-10.316-28.55c-3.157-6.475-6.917-12.129-11.839-16.936c-7.392-7.146-17.445-12.771-34.124-15.517
-	c-5.967-0.934-12.754-1.49-20.472-1.49c-6.491,0-13.604,0.392-21.421,1.179l-3.597,0.36l-0.489-3.565
-	c-0.688-5.102-1.226-10.171-1.601-15.174l-0.26-3.633l 3.627-0.374c 8.503-0.866, 16.384-1.294, 23.71-1.294
-	c 22.138,0, 39.341,3.86, 52.961,10.857c 17.493,9.010, 27.911,23.090, 34.5,37.232c 4.956,10.594, 8.094,21.339, 11.102,31.037
-	c 2.255,7.271, 4.448,13.948, 6.966,19.438c 1.912,4.119, 3.99,7.57, 6.327,10.303c 3.614,4.12, 7.374,6.803, 13.88,8.551
-	c 3.207,0.833, 7.131,1.357, 11.904,1.357c 4.743,0, 10.285-0.491, 16.779-1.685c 0.947-0.147, 1.763-0.278, 2.826-0.411
-	c 3.222-0.471, 8.765-1.337, 15.942-3.332c 19.067-5.398, 48.464-18.395, 70.54-52.669c 13.635-21.271, 24.703-51.194, 28.072-93.51
-	l 0.963-12.131l 6.020,10.577c 4.608,8.128, 8.747,16.351, 12.441,24.658l 0.443,0.998l-0.164,1.113
-	C 399.071,200.935, 388.639,227.24, 375.577,247.584z M 336.349,154.807c-0.063,0.605-0.13,1.114-0.163,1.441
-	c0,0.164-0.033,0.295-0.047,0.357l0,0.064 l-0.033,0.201c-0.77,5.655-5.592,9.76-11.152,9.76c-0.457,0-0.965-0.017-1.52-0.117l0,0.015 
-	c-5.658-0.765-9.762-5.607-9.762-11.163c 0.016-0.459, 0.016-0.981, 0.114-1.553c0,0,0-0.068, 0.015-0.232
-	c 0.246-1.848, 1.194-10.546, 1.194-23.088c0-15.711-1.487-37.625-7.716-59.729c-1.98-7.029-4.449-14.095-7.426-20.991l-5.051-11.646
-	l 10.546,7.034c 7.603,5.070, 15.009,10.657, 22.172,16.79l 0.868,0.738l 0.327,1.077c 0.063,0.279, 0.145,0.575, 0.226,0.881
-	c 6.951,24.853, 8.586,48.597, 8.586,65.767c0,7.916-0.329,14.454-0.688,19.032C 336.66,151.716, 336.48,153.532, 336.349,154.807z
-	 M 309.108,346.867L 309.108,346.867c-1.438,0.616-2.96,0.93-4.446,0.93c-4.367,0.015-8.537-2.55-10.366-6.818
-	c-0.62-1.42-0.916-2.942-0.916-4.446c0-4.353, 2.551-8.519, 6.817-10.368l 1.064-0.459c 39.895-17.443, 67.822-42.771, 88-72.497
-	c 9.354-13.817, 17.006-28.65, 23.219-44.019l 4.314-10.679l 2.779,11.171c 2.158,8.681, 3.827,17.333, 5.053,25.967l 0.182,1.155
-	l-0.523,1.036C 401.852,282.605, 365.65,322.585, 309.108,346.867z M 298.219,108.175c0,5.396-3.891,10.155-9.385,11.084l0,0
-	c-0.623,0.101-1.274,0.163-1.914,0.163c-5.394,0-10.152-3.893-11.067-9.383c-1.358-7.881-2.681-16.451-5.103-25.148
-	c-2.879-10.104-7.161-20.392-14.684-30.283c-8.862-11.509-22.333-22.775-44.408-32.044l 1.407-7.194c 0.651,0, 1.307,0, 1.961,0
-	c 12.852,0, 25.574,1.827, 38.030,5.297l 0.72,0.195l 0.588,0.461c 7.883,6.178, 14.373,12.785, 19.59,19.618
-	c 9.681,12.653, 15.106,25.868, 18.477,37.87c 2.879,10.33, 4.316,19.846, 5.623,27.436C 298.17,106.9, 298.219,107.555, 298.219,108.175z
-	 M 249.642,64.942c 1.686,2.060, 2.501,4.61, 2.501,7.083c0,3.252-1.455,6.554-4.187,8.762c-2.092,1.668-4.594,2.503-7.080,2.503
-	c-3.27,0-6.555-1.442-8.778-4.204c-6.265-7.717-12.804-13.588-22.076-18.544c-13.767-7.388-34.435-12.573-68.118-14.563
-	l-10.253-0.592l 8.26-6.146c 7.292-5.365, 15.271-9.893, 23.839-13.503l 0.916-0.38l 0.997,0.115c 3.189,0.375, 6.294,0.803, 9.271,1.278
-	c 18.853,2.94, 33.567,7.487, 45.687,13.911C 232.75,47.088, 242.006,55.441, 249.642,64.942z M 310.318,186.528l-3.597,1.015
-	l 3.597-0.998c 2.438,8.713, 4.055,17.77, 4.727,27.061c 0.246,3.464, 0.375,6.77, 0.375,9.991c0,14.144-2.435,25.818-7.13,35.266
-	c-5.753,11.646-15.302,19.524-26.111,22.468c-3.726,1.045-7.536,1.535-11.329,1.535c-10.318,0-20.472-3.595-29.27-9.547
-	c-12.067-8.174-22.040-21.11-26.587-37.28c-1.682-6.015-2.614-12.489-2.614-19.229c0-1.177, 0.033-2.386, 0.082-3.627
-	c 0.046-0.982, 0.082-1.997, 0.082-3.010c0-5.103-0.654-9.58-1.765-13.541c-1.865-6.655-5.005-11.904-9.404-16.577
-	c-7.586-8.097-19.438-14.096-33.402-17.925c-16.763-4.642-36.251-6.11-53.452-6.11c-4.252,0-8.39,0.095-12.279,0.229
-	c-4.546,0.194-8.797,0.438-12.657,0.748l-4.251,0.297l 0.231-4.235c 0.26-5.25, 0.718-10.414, 1.389-15.484l 0.374-3.041l 3.073-0.228
-	c 7.099-0.46, 15.304-0.818, 24.135-0.818c 7.488,0, 15.436,0.264, 23.53,0.912c 19.013,1.576, 38.964,5.234, 56.311,13.558
-	c 8.667,4.173, 16.694,9.563, 23.367,16.63c 6.705,7.045, 11.903,15.764, 14.747,25.967c 1.702,6.079, 2.585,12.654, 2.585,19.65
-	c0,1.342-0.034,2.716-0.1,4.088c-0.032,0.852-0.064,1.686-0.064,2.519c0,4.696, 0.637,9.059, 1.765,13.114
-	c 3.041,10.89, 9.811,19.524, 17.496,24.72c 5.675,3.861, 11.657,5.709, 16.759,5.694c 1.863,0, 3.58-0.232, 5.151-0.687
-	c 4.708-1.441, 8.534-4.118, 12.034-10.857c 2.748-5.43, 4.792-13.736, 4.792-25.281c0-2.583-0.116-5.329-0.312-8.239
-	c-0.589-7.815-1.931-15.336-3.989-22.645c-10.578-37.902-40.582-69.574-81.444-89.129c-27.795-13.312-60.482-20.834-94.752-20.834
-	c-0.835,0-1.666,0-2.518,0l-6.523,0.032l 3.252-5.624c 3.108-5.393, 6.542-10.563, 10.335-15.4l 1.144-1.489l 1.897,0.085
-	c 34.812,0.977, 67.987,9.089, 96.912,22.903C 262.279,104.873, 297.518,141.023, 310.318,186.528z"  />
-<glyph unicode="&#xe1dd;" d="M 90.674,391.081L 421.713,391.081L 421.713,347.117L 286.002,185.063L 286.002,116.91L 218.684,57.086L 218.684,185.063L 90.674,348.358 z"  />
-<glyph unicode="&#xe1de;" d="M 115.777,301.601L 193.627,363.022L 115.777,424.44L 115.777,387.312L 48.656,387.312L 48.656,338.738L 115.777,338.738 	zM 115.777,109.265L 48.656,109.265L 48.656,60.695L 115.777,60.695L 115.777,23.56L 193.627,84.981L 115.777,146.397 	
-		zM 463.344,224.002L 385.496,285.419L 385.496,248.286L 336.746,248.286L 336.746,199.719L 385.496,199.719L 385.496,162.579 	zM 51.875,248.286L 213.396,248.286L 213.396,199.719L 51.875,199.719zM 243.859,424.44L 306.439,424.44L 306.439,23.559L 243.859,23.559z"  />
-<glyph unicode="&#xe1df;" d="M 178.713,247.545L 333.289,247.545L 329.008,287.096L 182.996,287.096 	zM 190.645,357.734L 186.207,316.76L 325.795,316.76L 321.359,357.734 	zM 171.277,178.862L 340.725,178.862L 336.5,217.882L 175.5,217.882 	zM 95.404,145.36l 22.334-114.085l 276.525,0 l 22.332,114.085L 95.404,145.36 z M 304.135,79.599l-96.26,0 l0,36.255 l 96.26,0 L 304.135,79.599 zM 164.021,387.062l 183.961,0 l 22.543-208.201l 29.836,0 L 377.473,390.256c-1.629,15.058-14.344,26.469-29.49,26.469L 164.021,416.725 
-		c-15.146,0-27.859-11.411-29.488-26.469l-22.895-211.395l 29.836,0 L 164.021,387.062z"  />
-<glyph unicode="&#xe1e0;" d="M 97.856,430.476l0-412.951 l 316.287,0 L 414.143,430.476 L 97.856,430.476 z M 385.038,46.63L 126.962,46.63 L 126.962,401.369 l 258.076,0 L 385.038,46.63 zM 151.812,71.666l 208.375,0 l0,137.86 L 151.812,209.526 L 151.812,71.666 z M 201.141,164.801c0,6.538, 5.303,11.839, 11.842,11.839
-	c 6.537,0, 11.838-5.301, 11.838-11.839l0-7.104 l 69.33,0 l0,7.104 c0,6.538, 5.303,11.839, 11.842,11.839c 6.537,0, 11.838-5.301, 11.838-11.839
-	l0-18.942 c0-6.538-5.301-11.838-11.838-11.838l-93.010,0 c-6.539,0-11.842,5.301-11.842,11.838L 201.141,164.801 z M 151.812,376.334l0-140.762 l 208.375,0 
-	L 360.187,376.334 L 151.812,376.334 z M 317.83,313.189c0-6.54-5.301-11.84-11.838-11.84l-93.010,0 c-6.539,0-11.842,5.301-11.842,11.84L 201.14,332.13 
-	c0,6.539, 5.303,11.841, 11.842,11.841c 6.537,0, 11.838-5.302, 11.838-11.841l0-7.102 l 69.33,0 l0,7.102 c0,6.539, 5.303,11.841, 11.842,11.841
-	c 6.537,0, 11.838-5.302, 11.838-11.841L 317.83,313.189 z"  />
-<glyph unicode="&#xe1e1;" d="M 390.507,295.614c0,74.246-60.138,134.383-134.387,134.403c-74.232-0.021-134.372-60.157-134.401-134.403
-	c 0.029-65.472, 46.84-119.955, 108.828-131.921l0-34.327 L 170.67,129.366 l0-51.149 l 59.877,0 l0-59.876 l 51.128,0 l0,59.876 l 59.912,0 l0,51.149 l-59.912,0 l0,34.327 
-	C 343.678,175.644, 390.507,230.143, 390.507,295.614z M 172.878,295.614c 0.015,23.083, 9.271,43.736, 24.38,58.894
-	c 15.14,15.093, 35.792,24.362, 58.862,24.362c 23.070,0, 43.738-9.27, 58.847-24.362c 15.142-15.157, 24.38-35.811, 24.396-58.894
-	c-0.016-23.058-9.254-43.692-24.396-58.863c-15.109-15.109-35.777-24.351-58.847-24.368c-23.069,0.018-43.722,9.259-58.862,24.368
-	C 182.148,251.922, 172.893,272.557, 172.878,295.614z"  />
-<glyph unicode="&#xe1e2;" d="M 222.201,255.285l 75.529,57.061c 26.902,26.9, 50.41,92.838, 31.727,111.521c-18.684,18.682-83.99-5.454-110.891-32.354
-		l-57.057-75.533C 159.947,301.436, 207,253.658, 222.201,255.285zM 129.541,284.277l-20.896-20.899c-20.715-20.713-12.348-45.014, 2.037-59.4c 14.385-14.385, 38.203-22.268, 58.918-1.555
-		l 20.896,20.9C 199.756,232.578, 138.799,293.533, 129.541,284.277zM 409.072,251.585c-18.682,18.683-83.988-5.455-110.889-32.352l-57.059-75.536c-1.561-14.542, 45.492-62.321, 60.693-60.692
-		l 75.527,57.060C 404.248,166.966, 427.756,232.903, 409.072,251.585zM 209.158,111.997l-20.898-20.9c-20.713-20.711-12.348-45.012, 2.037-59.4c 14.387-14.388, 38.205-22.269, 58.918-1.553
-		l 20.898,20.897C 279.371,60.296, 218.416,121.253, 209.158,111.997z"  />
-<glyph unicode="&#xe1e3;" d="M 418.096,307.944c-8.127,8.122-11.791,18.993-11.074,29.616l-13.632,13.63
-	c0,0-83.13,95.442-180.261,40.045l 4.597-5.758l 36.221,5.624l-29.849-13.607l 5.591-7.002c 40.31,6.065, 112.967-22.953, 89.013-52.977
-	l-70.803-70.798l-0.152,0.153c-4.885-4.651-10.691-7.753-16.822-9.318L 40.066,63.213l 59.752-59.744L 273.775,193.91
-	c 1.581,6.657, 4.924,12.981, 10.119,18.172c 0.643,0.646, 1.328,1.226, 2.010,1.818l 75.918,75.915l 0.002-0.002
-	c 9.754-0.023, 20.184-3.071, 27.628-10.514c 7.776-7.773, 11.46-18.062, 11.136-28.248l 22.462-22.461l 46.472,46.467L 447.71,296.87
-	C 437.088,296.154, 426.217,299.82, 418.096,307.944z"  />
-<glyph unicode="&#xe1e4;" d="M 271.209,346.817c 8.49,0, 14.807-2.68, 15.562-11.761l 1.009-21.27c 1.929-7.745, 4.196-10.188, 6.28-10.188
-			c 3.555,0, 6.595,7.094, 6.595,7.094l 1.704,9.542c 1.418,8.013, 5.828,10.79, 12.541,10.79c 1.986,0, 4.174-0.244, 6.549-0.669
-			c 10.402-1.848, 20.418-6.429, 18.58-16.827l-1.322-7.415l0,0.008 c0,0-6.795-24.79-3.418-24.79c 0.811,0, 2.2,1.414, 4.404,4.928
-			c-0.002,0.020-0.002,0.020, 0.020,0.031l 5.217,5.824c 2.416,3.854, 5.283,5.344, 8.479,5.344c 4.227,0, 9.028-2.604, 14.131-5.797
-			c 8.947-5.607, 5.663-15.648, 0.381-36.201l-37.268-117.543l-0.479-36.15L 219.471,101.767 l-0.287,37.619c0,0-21.283,11.607-39.887,45.162
-			l-40.727,74.061c-2.699,10.217, 3.399,20.681, 13.608,23.377c 1.635,0.432, 3.279,0.635, 4.898,0.635c 8.471,0, 16.216-5.66, 18.474-14.24
-			l 11.649-26.216c 3.013-2.362, 5.016-3.677, 6.306-3.677c 4.491,0, 0.399,15.928, 0.399,59.352l-1.302,28.716
-			c-0.388,10.567, 7.867,19.427, 18.413,19.81c 0.232,0.008, 0.468,0.012, 0.699,0.012c 10.252,0, 18.739-8.119, 19.116-18.438
-			c0,0, 0.488-9.949, 0.488-11.242c0-8.029, 6.401-14.746, 11.595-14.746c 3.548,0, 6.534,3.131, 6.534,11.117l-0.805,18.822
-			c-0.873,10.52, 7.847,13.865, 18.382,14.743C 268.465,346.752, 269.862,346.817, 271.209,346.817 M 271.209,371.855
-			c-1.986,0-4.097-0.091-6.27-0.272c-11.598-0.962-20.337-4.271-26.722-8.931c-7.377,5.518-16.55,8.764-26.501,8.764
-			c-0.525,0-1.059-0.010-1.587-0.029c-11.802-0.43-22.718-5.416-30.753-14.053c-8.038-8.643-12.227-19.897-11.793-31.698l 0.003-0.104
-			l 0.004-0.109l 0.876-19.254c-3.654,0.978-7.477,1.496-11.39,1.496c-3.806,0-7.605-0.495-11.294-1.467
-			c-11.401-3.015-20.953-10.287-26.888-20.48c-5.936-10.196-7.547-22.094-4.535-33.498l 0.785-2.981l 1.484-2.694l 40.729-74.062
-			c 12.76-23.014, 26.89-37.546, 36.885-45.892l 0.19-25.012l 0.188-24.848l 24.849,0 l 110.703,0 l 24.707,0 l 0.328,24.707l 0.432,32.439
-			l 36.148,114.014l 0.211,0.666l 0.173,0.673l 0.937,3.622c 2.698,10.42, 4.831,18.651, 5.032,26.732
-			c 0.483,19.229-10.634,29.111-17.307,33.293c-4.897,3.066-10.115,5.984-15.861,7.789c-1.857,14.672-12.64,29.634-39.144,34.345
-			c-3.973,0.707-7.55,1.053-10.93,1.053c-3.225,0-6.307-0.328-9.217-0.966C 299.582,364.52, 288.606,371.855, 271.209,371.855
-			L 271.209,371.855z"  />
-<glyph unicode="&#xe1e5;" d="M 369.825,111.317L 369.825,243.3 l-51.145,0 l0-131.982 l-48.006,0 l 73.546-89.146l 73.611,89.146L 369.825,111.318 z M 193.956,146.24
-	c-0.13,2.028, 0.981,7.849, 3.206,13.019c 2.092,5.265, 5.46,10.135, 6.933,11.489l 140.619,140.605
-	c 8.205,8.352, 13.701,17.886, 17.986,28.090c 4.183,10.232, 7.029,20.863, 7.126,32.571L 369.826,426.199 l-51.145,0 l0-54.185 
-	c 0.064-1.995-1.013-7.833-3.237-13.017c-2.094-5.231-5.428-10.132-6.902-11.475L 167.926,206.904
-	c-8.208-8.337-13.704-17.885-18.018-28.059c-4.154-10.268-7.033-20.863-7.098-32.605l0-34.923 L 94.771,111.317 l 73.578-89.146l 73.58,89.146
-	l-47.974,0 L 193.955,146.24 z"  />
-<glyph unicode="&#xe1e6;" d="M 370.261,296.607c-5.674,3.548-12.311,7.326-19.448,7.326c-1.332,0-2.811-0.131-4.372-0.486l 0.853,4.781
-	c 0.954,5.402, 1.845,23.377-26.688,28.45c-3.098,0.552-5.814,0.821-8.303,0.821c-7.93,0-14.067-2.836-17.999-8.16l-0.126,2.648
-	l-0.006,0.176l-0.016,0.178c-0.521,6.301-4.059,20.947-25.545,20.947c-1.562,0-3.248-0.072-5.012-0.218
-	c-19.947-1.658-25.787-11.308-27.216-18.954c-4.157,10.988-14.78,18.732-27.263,18.732c-0.36,0-0.725-0.006-1.087-0.018
-	c-7.754-0.282-14.955-3.574-20.254-9.274c-5.306-5.697-8.067-13.126-7.781-20.913l 1.293-28.559
-	c 0.004-9.138, 0.184-17.010, 0.426-23.807c-4.244,11.217-15.044,18.816-27.238,18.816c-2.512,0-5.018-0.326-7.45-0.971
-	c-7.527-1.983-13.828-6.781-17.748-13.512c-3.917-6.727-4.979-14.576-2.99-22.104l 0.313-1.188l 0.595-1.080l 40.726-74.064
-	c 14.429-26.026, 30.604-39.923, 38.697-45.755l 0.238-26.561l 0.090-9.927l 130.488,0 l 0.149,9.859l 0.46,28.955l 36.825,116.144l 0.084,0.262
-	l 0.067,0.27l 0.946,3.659C 380.944,272.279, 384.876,287.449, 370.261,296.607z"  />
-<glyph unicode="&#xe1e7;" d="M 228.176,397.113c 10.252,0, 18.739-8.118, 19.119-18.44c0,0, 0.485-114.86, 0.485-116.151c0-5.692, 3.219-8.612, 6.942-8.612
-			c 5.115,0, 11.185,5.505, 11.185,16.896l-0.801,18.82c-0.875,10.523, 7.844,13.868, 18.379,14.742c 1.435,0.119, 2.833,0.186, 4.173,0.186
-			c 8.5,0, 14.82-2.674, 15.574-11.76l 1.007-21.27c 1.357-6.021, 3.57-7.874, 5.778-7.874c 3.554,0, 7.099,4.779, 7.099,4.779l 1.703,9.54
-			c 1.421,8.016, 5.826,10.791, 12.538,10.791c 1.988,0, 4.178-0.244, 6.553-0.668c 10.4-1.848, 20.418-6.434, 18.579-16.826l-1.322-7.417
-			l0,0.010 c0,0-7.258-21.058-1.859-21.058c 0.713,0, 1.646,0.365, 2.847,1.195c 0.016,0.010-0.004,0.014, 0.020,0.029l 5.215,5.824
-			c 2.417,3.854, 5.287,5.344, 8.484,5.344c 4.228,0, 9.029-2.602, 14.13-5.797c 8.944-5.606, 5.661-15.646, 0.38-36.199l-37.268-117.548
-			l-0.479-43.882L 235.929,51.767 l-0.284,45.354c0,0-21.283,11.605-39.889,45.161l-63.545,53.722c-8.069,6.823-9.077,18.894-2.261,26.958
-			c 3.785,4.474, 9.184,6.783, 14.621,6.783c 4.361,0, 8.742-1.482, 12.333-4.523l 36.351-28.556c 2.741-2.152, 5.078-3.298, 7.058-3.298
-			c 7.757,0, 10.052,17.663, 10.052,62.207l-1.299,121.713c-0.393,10.569, 7.865,19.432, 18.414,19.811
-			C 227.71,397.107, 227.942,397.113, 228.176,397.113 M 228.176,422.15c-0.529,0-1.062-0.008-1.591-0.027
-			c-11.801-0.428-22.714-5.418-30.75-14.055c-7.94-8.533-12.123-19.617-11.809-31.256l 1.299-121.373
-			c-0.003-8.119-0.091-14.881-0.238-20.518l-12.398,9.74c-7.901,6.533-17.866,10.123-28.118,10.123
-			c-13.031,0-25.331-5.709-33.742-15.658c-15.718-18.6-13.379-46.52, 5.217-62.24l 60.164-50.871
-			c 12.091-20.585, 25.1-33.85, 34.478-41.68l 0.206-32.723l 0.153-24.883l 24.882,0 l 110.706,0 l 24.767,0 l 0.268,24.763l 0.44,40.148
-			l 36.138,113.987l 0.213,0.664l 0.171,0.668l 0.937,3.623c 2.701,10.422, 4.831,18.653, 5.034,26.734
-			c 0.488,19.23-10.634,29.115-17.308,33.299c-4.894,3.063-10.11,5.984-15.859,7.785c-1.861,14.67-12.644,29.635-39.143,34.341
-			c-3.975,0.709-7.555,1.056-10.936,1.056c-3.222,0-6.3-0.331-9.21-0.967c-6.102,9.42-17.084,16.763-34.489,16.763
-			c-1.973,0-4.069-0.095-6.237-0.272c-3.146-0.262-6.101-0.68-8.875-1.264c-0.096,23.574-0.189,45.65-0.211,50.723l-0.004,0.401
-			l-0.014,0.404C 271.443,403.456, 252.054,422.15, 228.176,422.15L 228.176,422.15z"  />
-<glyph unicode="&#xe1e8;" d="M 383.389,248.485c-5.371,3.36-11.638,6.943-18.119,6.943c-2.245,0-4.986-0.43-7.754-1.925
-	c 0.097,0.371, 0.195,0.733, 0.296,1.092l 0.091,0.33l 0.062,0.327l 1.316,7.416c 1.095,6.178, 0.872,21.009-24.659,25.544
-	c-2.946,0.522-5.52,0.779-7.863,0.779c-10.914,0-17.994-6.030-19.939-16.99l-0.021-0.125l-0.664,13.991l-0.006,0.138l-0.012,0.127
-	c-0.576,6.97-4.34,18.654-23.051,18.654c-1.507,0-3.074-0.069-4.802-0.211c-23.315-1.939-25.854-14.997-25.257-22.709l 0.078-1.84
-	c-0.864-3.258-1.725-4.076-2.479-4.65c-0.131,32.344-0.384,92.605-0.401,96.048l0,0.123 l-0.006,0.122
-	c-0.525,14.398-12.222,25.673-26.621,25.673c-0.318,0-0.634-0.006-0.956-0.016c-7.123-0.255-13.701-3.265-18.55-8.474
-	c-4.812-5.175-7.337-11.898-7.122-18.952l 1.303-121.682c0-29.89-1.225-47.999-3.64-53.879c-0.363,0.24-0.804,0.556-1.321,0.958
-	l-36.238,28.467c-4.784,4.004-10.844,6.209-17.083,6.209c-7.86,0-15.28-3.438-20.354-9.439c-4.592-5.436-6.796-12.331-6.199-19.423
-	c 0.594-7.091, 3.912-13.525, 9.35-18.118l 62.503-52.843c 14.716-26.068, 31.001-39.37, 38.296-44.433l 0.252-27.834l 0.066-7.449l 125.543,0 
-	l 0.117,7.396l 0.462,29.319l 36.934,116.494l 0.065,0.197l 0.051,0.205l 0.948,3.666C 392.902,226.633, 396.445,240.299, 383.389,248.485z"  />
-<glyph unicode="&#xe1e9;" d="M 206.408,377.807l 4.218,0 c 11.25,0.034, 20.374,9.143, 20.405,20.407L 231.031,411.507 c-0.031,11.265-9.155,20.359-20.405,20.39l-4.218,0 
-	c-11.249-0.030-20.375-9.141-20.375-20.39l0-13.293 C 186.033,386.95, 195.159,377.841, 206.408,377.807z M 287.441,391.444L 287.441,391.444
-	l 4.185-0.459c 0.755-0.095, 1.474-0.128, 2.195-0.128c 10.3,0.033, 19.097,7.717, 20.306,18.184l 1.602,15.039
-	c 0.098,0.75, 0.131,1.46, 0.131,2.208c-0.016,10.303-7.719,19.112-18.164,20.274l-4.205,0.458c-0.718,0.097-1.521,0.117-2.221,0.117
-	c-10.271-0.021-19.098-7.736-20.26-18.166l-1.636-15.061c-0.079-0.751-0.129-1.506-0.129-2.208
-	C 269.259,401.42, 276.976,392.605, 287.441,391.444z M 353.598,358.84L 353.598,358.84l 4.17-0.735c 1.158-0.18, 2.338-0.296, 3.531-0.296
-	c 9.729,0.023, 18.298,6.936, 20.080,16.826l 3.155,17.793c 0.164,1.193, 0.278,2.354, 0.278,3.532c-0.020,9.728-6.951,18.31-16.843,20.078
-	l-4.15,0.733c-1.196,0.212-2.403,0.313-3.534,0.313c-9.746,0-18.314-6.95-20.096-16.841l-3.137-17.775
-	c-0.213-1.195-0.314-2.388-0.314-3.514C 336.756,369.207, 343.689,360.609, 353.598,358.84z M 430.969,348.589l-4.019,1.34
-	c-2.128,0.704-4.285,1.062-6.412,1.031c-8.569,0-16.512-5.397-19.36-13.933l-4.396-13.176c-0.736-2.128-1.065-4.283-1.065-6.426
-	c0-8.55, 5.396-16.514, 13.932-19.377l 3.992-1.342c 2.107-0.687, 4.234-1.030, 6.358-1.030c 0.047,0, 0.047,0, 0.083,0
-	c 8.55,0, 16.515,5.382, 19.374,13.948l 4.398,13.182c 0.688,2.123, 1.047,4.283, 1.047,6.422
-	C 444.9,337.784, 439.504,345.727, 430.969,348.589z M 210.887,321.645c 10.956,0.147, 18.722,9.695, 18.737,20.374l0,11.757 
-	c-0.016,10.692-7.781,20.241-18.737,20.403c-10.985-0.162-18.738-9.711-18.738-20.403l0-11.757 
-	C 192.148,331.34, 199.901,321.792, 210.887,321.645z M 285.888,335.149l 0.116-0.016c 0.262,0, 0.587-0.016, 0.946-0.016
-	c 10.483,0.148, 18.281,8.91, 18.902,19.228l 0.622,10.22c 0.032,0.489, 0.032,0.896, 0.032,1.372c 0.033,10.108-7.030,19.361-17.494,20.132
-	c-0.359,0.047-0.783,0.047-1.063,0.047c-10.481-0.148-18.265-8.929-18.886-19.262l-0.622-10.202
-	c-0.048-0.459-0.048-0.95-0.048-1.372C 268.344,345.171, 275.424,335.904, 285.888,335.149z M 274.249,279.899l 5.837-0.852
-	c 0.883-0.11, 1.732-0.179, 2.582-0.179c 8.778,0.015, 16.416,6.411, 17.725,15.321l 1.258,8.501c 0.115,0.888, 0.181,1.738, 0.181,2.568
-	c0,8.781-6.392,16.403-15.32,17.743l-5.838,0.85c-0.883,0.149-1.765,0.196-2.586,0.196c-8.776-0.015-16.398-6.428-17.72-15.336
-	l-1.261-8.487c-0.13-0.867-0.182-1.748-0.182-2.599C 258.925,288.861, 265.336,281.208, 274.249,279.899z M 191.004,284.219
-	c 0.033-9.438, 7.652-17.059, 17.069-17.073l 5.626,0 c 9.417,0.015, 17.036,7.636, 17.070,17.073l0,13.408 
-	c-0.034,9.416-7.653,17.053-17.070,17.068l-5.626,0 c-9.417-0.016-17.036-7.652-17.069-17.068L 191.004,284.219 z M 347.090,306.129l 0.082-0.021
-	c 0.604-0.079, 1.225-0.11, 1.914-0.11c 10.039,0.132, 17.789,8.239, 18.967,18.214l 0.668,5.625c 0.085,0.882, 0.148,1.717, 0.148,2.583
-	c0,9.617-6.441,18.574-16.417,19.852c-0.683,0.080-1.37,0.133-2.026,0.133c-10.038-0.133-17.788-8.245-18.937-18.221l-0.667-5.655
-	c-0.117-0.85-0.164-1.731-0.164-2.551C 330.642,316.365, 337.084,307.401, 347.090,306.129z M 329.56,259.349l 5.711-1.947
-	c 1.944-0.656, 3.937-0.983, 5.884-0.983c 7.638,0, 14.764,4.773, 17.381,12.395l 1.67,4.874c 0.653,1.928, 0.98,3.924, 0.98,5.883
-	c-0.018,7.652-4.809,14.75-12.394,17.369l-5.726,1.959c-1.963,0.672-3.957,0.982-5.902,0.982c-7.635,0-14.763-4.791-17.379-12.425
-	l-1.651-4.844c-0.671-1.928-0.979-3.924-0.979-5.883C 317.154,269.094, 321.924,261.98, 329.56,259.349z M 411.479,292.525
-	c-1.618,0.47-3.285,0.702-4.905,0.702c-8.766-0.084-16.27-6.31-18.821-15.029l-1.486-5.001c-0.622-2.060-0.883-4.15-0.883-6.163
-	c-0.033-8.19, 4.742-16.169, 13.162-18.69l0,0c 1.554-0.46, 3.157-0.687, 4.774-0.687l 0.083,0 c 8.779,0.080, 16.269,6.296, 18.835,15.010
-	l 1.472,5.021c 0.606,2.061, 0.883,4.136, 0.883,6.164C 424.66,282.026, 419.852,289.991, 411.479,292.525z M 398.66,237.307l-4.364,2.502
-	c-2.372,1.405-5.021,2.060-7.602,2.060c-5.268,0-10.401-2.748-13.23-7.621l-2.5-4.384c-1.374-2.387-2.062-5.017-2.062-7.583
-	c0-5.265, 2.748-10.42, 7.618-13.229l 4.35-2.536c 2.389-1.341, 5.037-2.028, 7.589-2.028c 5.262,0, 10.43,2.715, 13.244,7.623l 2.533,4.346
-	c 1.357,2.402, 2.026,5.039, 2.026,7.62C 406.263,229.327, 403.535,234.476, 398.66,237.307z M 382.606,169.105
-	c-0.935,4.907-4.090,9.486-8.341,12.101l-41.402,23.907c-2.81,1.631-7.535,4.805-10.071,6.801l-25.019,19.54
-	c-3.562,2.663-8.711,4.822-13.145,5.478l-52.403,6.802c-1.603,0.21-3.433,0.291-5.331,0.291c-2.926,0-5.936-0.196-8.387-0.619
-	l-19.865-3.633c-5.383-1.077-9.207-5.688-9.339-11.18l 0.017-31.692c 0.164-5.164, 2.926-10.038, 7.277-12.832l 39.733-23.659
-	c 3.89-2.224, 9.254-3.729, 13.7-3.86l 38.293-0.439c 2.305,0.064, 7.262-1.721, 8.994-3.258l 21.747-17.624
-	c 3.581-2.798, 8.731-4.922, 13.228-5.459l 46.305-4.696c 0.344-0.031, 0.705-0.047, 1.014-0.047l 0.066,0 c 2.257,0, 4.446,0.852, 6,2.389
-	c 1.604,1.568, 2.453,3.806, 2.453,6.047c0,0.521-0.067,0.997-0.096,1.489L 382.606,169.105z M 374.821,123.621l-71.307,2.872
-	c-0.048,0-0.211,0.022-0.424,0.022c-5.202-0.148-9.847-3.223-11.855-8.081l-10.334-26.569l 0.443,12.607
-	c 0.018,0.147, 0.018,0.279, 0.018,0.342c-0.103,5.366-3.813,9.877-9.094,10.99l-0.163,0.031l-7.668,0.656l 8.503,5.46
-	c 0.883,0.196, 1.731,0.454, 2.599,0.944c 1.030,0.576, 2.486,2.062, 2.486,4.188c-0.019,1.833-0.949,2.995-1.703,3.729
-	c-0.783,0.75-1.65,1.242-2.647,1.732l-30.118,14.258c-3.041,1.404-8.128,4.019-11.086,5.672l-29.922,16.662
-	c-1.488,0.818-3.139,1.241-4.773,1.241c-3.596,0.021-7.082-2.044-8.764-5.493l-11.035-22.545c-0.805-1.917-4.566-5.086-6.609-5.546
-	c0,0-11.756-3.399-23.562-7.261c-5.885-1.928-11.771-3.955-16.334-5.788c-2.271-0.882-4.202-1.732-5.69-2.566
-	c-0.768-0.422-1.454-0.817-2.104-1.372c-0.559-0.603-1.674-1.178-1.867-3.612c 0.063-1.421, 0.312-1.717, 0.59-2.551
-	c 1.928-5.351, 9.582-21.093, 16.904-36.007c 7.326-14.781, 14.228-28.386, 14.228-28.386c 1.963-3.808, 5.493-8.175, 8.812-10.874
-	l 42.202-33.908c 3.058-2.389, 6.965-3.449, 10.775-3.502c 1.227,0, 2.436,0.132, 3.613,0.428l 49.183,13.049
-	c 1.406,0.391, 2.748,0.656, 3.631,0.766c 0.751-0.538, 1.406-0.781, 2.354-1.226c 1.179-0.491, 2.65-1.060, 4.218-1.536l 20.342-6.443
-	c 2.044-0.639, 4.251-0.85, 6.541-0.881c 2.745,0.031, 5.493,0.357, 7.88,1.241l 27.404,10.123c 4.611,1.849, 8.503,5.772, 10.383,10.384
-	l 31.475,85.463c 0.395,1.082, 0.621,2.176, 0.621,3.268C 383.095,119.957, 379.171,123.583, 374.821,123.621z M 126.271,198.459
-	c0,0.766-0.031,1.484-0.099,2.17l-1.39,13.854c-0.392,3.743-1.372,9.368-2.287,13.027l-2.877,11.576
-	c-1.474,5.172-5.791,8.947-11.087,9.717l-17.249,1.976c-0.444,0.047-0.934,0.086-1.408,0.086c-4.628-0.101-9.206-2.062-12.279-5.626
-	l-8.143-9.829c-1.979-2.439-2.797-5.428-2.812-8.37c0-2.145, 0.44-4.304, 1.57-6.28l 33.831-59.041c 1.159-2.028, 3.090-3.992, 6.066-4.057
-	c 3.302,0.096, 5.296,2.552, 6.194,4.854l 9.861,24.119C 125.535,190.066, 126.24,194.551, 126.271,198.459z"  />
-<glyph unicode="&#xe1ea;" d="M 401.914,309.15c-0.828,0.060-20.471,1.699-37.729,18.96c-15.855,15.856-23.988,16.040-24.068,16.040L 236.242,344.15 l-59.924-52.295
-		c 5.25-3.096, 12.924-6.374, 21.871-6.374c 7.898,0, 15.754,2.566, 23.342,7.625c 18.061,12.038, 32.398,19.5, 48.047,19.5
-		c 16.365,0, 32.326-8.078, 53.367-27.016c 37.914-34.122, 79.26-74.921, 79.672-75.33l 2.465-2.434l0-46.345 l 57.67,0 L 462.752,309.127 L 401.914,309.15zM 181.244,152.638c-3.279,3.278-7.643,5.087-12.279,5.087c-4.639,0-9.002-1.807-12.285-5.087l-4.613-4.615l 24.561-24.565
-		l 4.619,4.62C 188.014,134.849, 188.012,145.867, 181.244,152.638zM 214.18,119.703c-3.283,3.279-7.645,5.085-12.285,5.085c-4.637,0-8.994-1.803-12.271-5.078c-0.002,0-0.002,0-0.002-0.002
-		L 185,115.083l 24.559-24.561l 4.621,4.621C 220.949,101.914, 220.949,112.931, 214.18,119.703zM 234.832,91.856c-4.637,0-9-1.806-12.283-5.085l-4.615-4.619l 24.557-24.561l 4.621,4.619c 6.771,6.77, 6.771,17.789,0,24.563
-		C 243.834,90.051, 239.473,91.856, 234.832,91.856zM 148.307,185.569c-3.277,3.28-7.639,5.088-12.277,5.088c-4.641,0-9.002-1.806-12.281-5.084l-4.619-4.618l 24.564-24.562
-		l 4.619,4.617C 155.078,167.783, 155.078,178.801, 148.307,185.569zM 311.541,273.57l-0.010-0.011c-17.324,15.532-30.279,22.474-41.953,22.474c-11.471,0-23.371-6.398-38.852-16.719
-		c-10.363-6.907-21.309-10.408-32.537-10.408c-23.775,0-40.209,15.802-40.896,16.475l-6.414,6.271l 79.148,69.073l 95.299,0 
-		c 12.508,11.172, 10.369,29.682, 10.369,29.682s-47.848,0-95.059,0c-47.205,0-48.615-7.788-81.656-40.827
-		c-29.121-29.118-57.42-29.985-57.42-29.985L 49.248,319.595 l0-140.352 l 51.428,0 l 14.701,14.702c 5.52,5.517, 12.854,8.553, 20.652,8.553
-		s 15.133-3.039, 20.65-8.557c 6.725-6.72, 9.443-15.928, 8.229-24.689c 1.334,0.184, 2.686,0.311, 4.057,0.311
-		c 7.801,0, 15.133-3.038, 20.652-8.555c 6.721-6.722, 9.439-15.93, 8.227-24.694c 1.332,0.187, 2.682,0.314, 4.051,0.314
-		c 7.803,0, 15.139-3.037, 20.654-8.554c 6.723-6.723, 9.445-15.931, 8.227-24.69c 1.338,0.184, 2.689,0.311, 4.057,0.311
-		c 7.801,0, 15.135-3.037, 20.652-8.551c 3.676-3.681, 6.148-8.108, 7.451-12.796c 5.877-4.513, 14.348-4.093, 19.727,1.285
-		c 5.846,5.846, 5.846,15.362-0.002,21.212l-69.92,69.922l 11.721,11.721l 69.922-69.923c 5.848-5.847, 15.363-5.848, 21.213,0.002
-		c 2.832,2.83, 4.393,6.598, 4.393,10.606c0,4.006-1.561,7.771-4.393,10.602l-69.924,69.922l 11.721,11.721l 69.922-69.921
-		c 5.85-5.844, 15.367-5.843, 21.215,0.003c 5.846,5.846, 5.846,15.362,0,21.21l-69.92,69.92l 11.721,11.722l 69.918-69.923
-		c 5.848-5.842, 15.363-5.841, 21.215,0.005c 5.846,5.846, 5.846,15.362,0,21.212L 311.541,273.57z"  />
-<glyph unicode="&#xe1eb;" d="M 403.066,320.066c-4.254,2.66-9.138,4.064-14.125,4.064c-9.244,0-17.693-4.669-22.599-12.497l-0.255-0.403l-0.201-0.433
-	l-27.938-60.443c-0.004,0.074-0.012,0.146-0.012,0.218l 17.843,100.286c 2.557,14.469-7.119,28.321-21.569,30.893
-	c-1.543,0.275-3.121,0.415-4.684,0.415c-12.928,0-23.951-9.245-26.213-21.975l-16.861-94.763l-9.824,118.296
-	c-1.135,13.7-12.788,24.425-26.528,24.425c-0.729,0-1.476-0.028-2.214-0.086c-14.653-1.218-25.572-14.114-24.356-28.746
-	l 10.108-121.72c 0.157-4.256, 0.076-7.391-0.109-9.678c-1.305,2.020-2.603,4.471-3.428,6.829c-0.389,1.116-0.793,2.116-1.227,3.015
-	l-30.078,97.994c-3.465,11.262-13.698,18.825-25.47,18.825c-2.644,0-5.281-0.393-7.822-1.179
-	c-6.802-2.087-12.382-6.699-15.715-12.984c-3.333-6.289-4.018-13.5-1.921-20.305l 30.548-99.507
-	c 12.183-39.772, 7.347-50.681, 5.573-53.074c-0.688-0.936-1.394-1.281-2.594-1.281c-2.298,0-5.47,1.366-8.275,3.566l-36.234,28.464
-	c-4.783,4.006-10.844,6.209-17.080,6.209c-7.864,0-15.281-3.438-20.36-9.443c-4.59-5.433-6.794-12.332-6.2-19.42
-	c 0.599-7.090, 3.915-13.524, 9.35-18.122l 62.506-52.844c 14.716-26.057, 30.997-39.361, 38.296-44.427l 0.251-32.019l 0.062-7.45l 125.564,0 
-	l 0.101,7.407l 0.442,31.909c 28.994,34.966, 29.196,81.080, 28.845,91.407l 53.084,112.253
-	C 419.21,296.152, 415.373,312.354, 403.066,320.066z"  />
-<glyph unicode="&#xe1ec;" d="M 387.675,383.567l-261.94,0 l-77-197.073l 415.984,0 L 387.675,383.567z M 36.933,155.854l0-85.258 l 439.625,0 l0,85.258 L 36.933,155.854 z
-	 M 92.901,93.754L 67.983,93.754 l0,33.662 l 24.918,0 L 92.901,93.754 z M 153.891,93.768l-24.955,0 l0,33.648 l 24.955,0 L 153.891,93.768 z M 214.863,93.768l-24.936,0 
-	l0,33.648 l 24.936,0 L 214.863,93.768 z M 426.899,92.375c-10.839,0-19.653,8.783-19.653,19.641s 8.814,19.649, 19.653,19.649
-	s 19.653-8.792, 19.653-19.649S 437.738,92.375, 426.899,92.375z"  />
-<glyph unicode="&#xe1ed;" d="M 451.419,224.024c 9.882,16.999, 15.255,36.734, 15.241,57.494c 0.021,35.186-15.329,73.104-48.443,106.155
-	c-33.029,33.091-70.943,48.446-106.128,48.421c-20.764,0.012-40.501-5.358-57.503-15.243c-17.006,9.885-36.747,15.255-57.506,15.247
-	c-35.186,0.019-73.1-15.336-106.129-48.427C 57.856,354.619, 42.5,316.692, 42.525,281.499c-0.016-20.75, 5.354-40.479, 15.238-57.473
-	c-9.888-16.997-15.254-36.733-15.238-57.489c-0.025-35.195, 15.343-73.119, 48.426-106.158c 33.029-33.102, 70.956-48.453, 106.15-48.434
-	l 0.068,0 c 20.734,0, 40.445,5.365, 57.426,15.236c 16.998-9.871, 36.726-15.236, 57.487-15.223l 0.060,0 
-	c 35.168-0.004, 73.062,15.342, 106.082,48.42c 33.104,33.039, 48.455,70.953, 48.439,106.143
-	C 466.676,187.283, 461.303,207.022, 451.419,224.024z M 312.089,411.055c 27.88-0.024, 59.294-11.999, 88.43-41.088
-	c 29.096-29.143, 41.076-60.568, 41.102-88.449c-0.010-12.669-2.502-24.637-7.11-35.452c-0.061,0.061-0.118,0.126-0.179,0.189
-	c-0.039,0.036-0.085,0.064-0.127,0.101c-10.102,82.050-75.083,147.188-157.3,157.304c-0.027,0.029-0.047,0.065-0.080,0.096
-	c-0.062,0.065-0.131,0.125-0.193,0.185C 287.45,408.551, 299.422,411.042, 312.089,411.055z M 362.978,110.92l-42.993,42.006l 0.496,0.487
-	c 38.047,38.038, 38.222,100.114, 0.421,138.397l 42.745,42.21C 424.832,272.086, 424.44,172.394, 362.978,110.92z M 108.658,369.963
-	c 29.127,29.086, 60.538,41.067, 88.422,41.088c 12.671-0.009, 24.639-2.5, 35.461-7.111c-0.064-0.061-0.131-0.12-0.196-0.185
-	c-0.029-0.028-0.050-0.065-0.079-0.096C 150.229,393.562, 85.084,328.576, 74.968,246.347c-0.033-0.035-0.072-0.056-0.107-0.090
-	c-0.065-0.062-0.125-0.131-0.188-0.195c-4.606,10.809-7.099,22.77-7.11,35.437C 67.588,309.389, 79.572,340.818, 108.658,369.963z
-	 M 189.001,294.217l-0.494-0.488c-38.025-38.035-38.208-100.111-0.411-138.393l-42.743-42.213
-	c-61.176,61.937-60.811,161.633, 0.67,223.104L 189.001,294.217z M 197.102,36.99c-27.892,0.016-59.316,12.008-88.436,41.091
-	c-29.094,29.137-41.078,60.569-41.104,88.456c 0.012,12.672, 2.504,24.64, 7.11,35.452c 0.062-0.062, 0.122-0.132, 0.188-0.194
-	c 0.035-0.035, 0.074-0.057, 0.107-0.090c 10.093-82.028, 75.050-147.154, 157.269-157.295c 0.043-0.044, 0.071-0.097, 0.112-0.141
-	c 0.065-0.062, 0.13-0.119, 0.192-0.182C 221.729,39.486, 209.767,36.999, 197.102,36.99z M 253.982,151.371
-	c-19.439,0.173-37.316,7.707-51.098,21.597c-13.598,13.847-20.892,31.636-20.946,51.038c0,0.062, 0.006,0.176, 0.006,0.353l0,0.146 
-	c 0.177,39.664, 32.954,72.25, 72.603,72.174l 0.688,0 c 19.377-0.173, 37.271-7.719, 51.063-21.622c 13.585-13.815, 20.903-31.592, 20.94-50.917
-	l0-0.586 c-0.147-39.658-32.958-72.258-72.611-72.181L 253.982,151.373 z M 400.522,78.088c-29.134-29.092-60.556-41.066-88.439-41.089
-	c-12.667,0.007-24.629,2.497-35.444,7.095c 0.062,0.062, 0.125,0.117, 0.186,0.176c 0.045,0.047, 0.072,0.1, 0.116,0.143
-	c 82.022,10.105, 147.152,75.061, 157.268,157.283c 0.038,0.041, 0.088,0.062, 0.125,0.103c 0.061,0.060, 0.118,0.123, 0.181,0.185
-	c 4.608-10.818, 7.101-22.789, 7.11-35.461C 441.597,138.633, 429.612,107.221, 400.522,78.088z"  />
-<glyph unicode="&#xe1ee;" d="M 263.292,191.672l-7.293-2.361l-7.291,2.361l-102.213,33.090l-7.133-97.459c0,0, 33.734-37.411, 117.809-37.411
-		c 84.070,0, 115.473,37.411, 115.473,37.411l-9.025,96.849L 263.292,191.672zM 116.081,226.431l0,4.565 l 130.646,67.268c 2.906,1.499, 6.477,0.354, 7.973-2.553c 1.498-2.906, 0.355-6.476-2.553-7.973
-		L 165.96,243.35l 90.039-29.15l 222.262,71.955l-222.262,71.954l-222.26-71.954l 84.566-27.377l-25.902-13.34l0-18.27 
-		c-3.94-4.772-6.447-11.938-6.447-19.955c0-5.694, 1.275-10.944, 3.422-15.228l-2.379-27.797l 11.443,4.519l 5.504-4.519l 7.281,5.702
-		l 9.668-5.702l-2.377,27.793c 2.146,4.284, 3.428,9.536, 3.428,15.231C 121.946,214.825, 119.685,221.673, 116.081,226.431z"  />
-<glyph unicode="&#xe1ef;" d="M 458.175,138.9c-1.179,1.178-51.538,51.547-78.026,78.018l-8.666,8.666l-12.232,0.091l-46.469,0.369l 24.724,20.956
-	l-58.471,58.46l-20.929-24.706l-0.361,46.437l-0.13,12.264l-8.665,8.666l-78.061,78.082l-21.189,21.149l-21.125-21.149
-	l-74.494-74.46l-21.16-21.192l 21.223-21.183c 1.211-1.194, 78.029-78.033, 78.029-78.033l 8.665-8.664l 12.261-0.106l 48.497-0.38
-	l 6.804-0.065l-12.461-14.69l 43.525-43.516l 14.717,12.457l 0.033-6.829l 0.394-48.479l 0.099-12.262l 8.664-8.672l 78.090-78.071
-	l 21.16-21.167l 21.158,21.167l 74.461,74.458l 21.225,21.202L 458.175,138.9z M 201.824,252.105l-48.495,0.395
-	c0,0-78.060,78.066-78.091,78.081l 74.461,74.453l 78.090-78.092l 0.393-48.481L 201.824,252.105z M 362.619,43.208l-78.090,78.091
-	l-0.361,48.494l 26.324,26.342l 48.496-0.372l 78.093-78.087L 362.619,43.208z M 205.16,121.404
-	c-28.548,0.035-51.702,23.193-51.732,51.713c0,11.057-8.963,20.030-20.016,20.030c-11.084,0-20.045-8.974-20.045-20.030
-	c 0.031-50.689, 41.072-91.744, 91.793-91.797c 11.054,0, 20.014,8.963, 20.014,20.031C 225.174,112.404, 216.245,121.387, 205.16,121.404z
-	 M 205.487,17.816c-0.033-0.018-0.033-0.031-0.033-0.049c-0.063-0.083-0.097-0.18-0.163-0.275
-	C 205.357,17.606, 205.422,17.729, 205.487,17.816z M 207.712,31.68c-0.13,0.722-0.327,1.414-0.525,2.084
-	c0-0.026, 0.034-0.039, 0.034-0.062c-0.034,0.096-0.064,0.184-0.096,0.285c-0.229,0.656-0.461,1.299-0.754,1.911
-	c 0.098-0.179, 0.163-0.349, 0.229-0.538c-0.065,0.189-0.164,0.359-0.229,0.538c-0.1,0.196-0.164,0.386-0.232,0.565
-	c 0.037-0.088, 0.068-0.206, 0.101-0.269c-0.622,1.357-1.403,2.657-2.319,3.851c-0.689,0.844-1.408,1.65-2.193,2.381
-	c-0.589,0.56-1.209,1.076-1.896,1.57c-0.324,0.241-0.721,0.489-1.080,0.727c-1.014,0.635-2.124,1.193-3.236,1.645l0,0
-	c-2.225,0.897-4.643,1.387-7.162,1.43c-0.098,0-0.195,0-0.262,0c-29.988,0.004-56.9,12.070-76.588,31.69
-	c-19.523,19.582-31.59,46.348-31.686,76.134c 0.195,8.332-4.907,16.244-13.18,19.229c-10.398,3.803-21.876-1.58-25.67-11.969
-	c-1.668-5.133-1.082-6.801-1.211-6.9c0-81.88, 66.382-148.236, 148.334-148.25c 0.066,0, 0.164,0, 0.262,0
-	c 1.342,0.014, 2.683,0.21, 3.989,0.486c 0.623,0.145, 1.245,0.279, 1.864,0.473c 0.034,0.025, 0.098,0.025, 0.131,0.053
-	c0,0, 0.031,0, 0.066,0.017c-0.035,0-0.035-0.017-0.066-0.017c 0.164,0.049, 0.329,0.139, 0.492,0.188
-	c-0.163-0.049-0.295-0.123-0.426-0.171c 0.621,0.21, 1.275,0.465, 2.092,0.808c 0.033,0.016, 0.033,0.033, 0.064,0.042
-	c-0.064-0.042-0.161-0.067-0.262-0.101c 0.395,0.165, 0.755,0.371, 1.111,0.572c-0.13-0.078-0.293-0.188-0.455-0.27
-	c 0.651,0.322, 1.342,0.695, 2.156,1.229c-0.16-0.131-0.359-0.206-0.557-0.338c 0.297,0.192, 0.623,0.391, 0.918,0.6
-	c-0.129-0.082-0.229-0.182-0.361-0.262c 0.689,0.424, 1.408,0.961, 2.16,1.618c-0.132-0.091-0.229-0.181-0.361-0.271
-	c 0.132,0.117, 0.295,0.227, 0.458,0.358c 0.067,0.087, 0.165,0.165, 0.263,0.267c 0.229,0.178, 0.424,0.372, 0.62,0.586
-	c 0.229,0.193, 0.393,0.407, 0.591,0.622c 0.52,0.543, 0.98,1.141, 1.437,1.758c 0.428,0.577, 0.819,1.183, 1.178,1.79
-	c 0.065,0.128, 0.099,0.246, 0.163,0.359c 0.295,0.538, 0.559,1.088, 0.818,1.644c 0.066,0.18, 0.164,0.368, 0.229,0.548
-	c0-0.035-0.031-0.066-0.064-0.109c 0.263,0.596, 0.458,1.193, 0.652,1.816c-0.031-0.137-0.065-0.281-0.127-0.422
-	c 0.096,0.268, 0.16,0.539, 0.26,0.779c 0.166,0.578, 0.262,1.16, 0.393,1.756c 0.195,1.101, 0.326,2.222, 0.359,3.363c0,0.1,0,0.179,0,0.253
-	s0,0.163,0,0.254C 208.104,29.271, 207.939,30.485, 207.712,31.68z M 201.366,12.745L 201.366,12.745
-	c-0.032-0.015-0.063-0.048-0.097-0.088C 201.303,12.697, 201.334,12.73, 201.366,12.745z M 204.375,16.1
-	c 0.034,0.049, 0.064,0.090, 0.099,0.137c-0.064-0.088-0.128-0.163-0.197-0.259c-0.063-0.057-0.098-0.132-0.128-0.2
-	C 204.213,15.887, 204.311,15.995, 204.375,16.1z M 207.875,24.65c-0.030-0.18-0.098-0.355-0.098-0.512
-	c-0.131-0.561-0.227-1.090-0.359-1.633C 207.613,23.215, 207.777,23.932, 207.875,24.65z M 207.385,22.383
-	c0,0.044,0,0.092, 0.033,0.123C 207.385,22.475, 207.385,22.427, 207.385,22.383L 207.385,22.383z M 205.487,17.82
-	c 0.294,0.508, 0.556,1.041, 0.818,1.595c-0.229-0.437-0.458-0.864-0.688-1.288C 205.586,18.043, 205.52,17.938, 205.487,17.82z
-	 M 206.436,19.797l0-0.026 c-0.031-0.118-0.097-0.228-0.13-0.355C 206.339,19.543, 206.404,19.666, 206.436,19.797z M 199.83,44.010
-	l0-0.014 c 0.034-0.057, 0.098-0.070, 0.131-0.102C 199.928,43.926, 199.864,43.969, 199.83,44.010z M 201.496,42.635
-	c 0.099-0.066, 0.133-0.145, 0.23-0.209c 0.035-0.036, 0.098-0.084, 0.131-0.127C 201.727,42.426, 201.629,42.531, 201.496,42.635z
-	 M 203.787,40.208c 0.033-0.048, 0.064-0.132, 0.133-0.163c0-0.060, 0.064-0.092, 0.096-0.139
-	C 203.92,40.002, 203.852,40.106, 203.787,40.208z M 206.797,34.896c-0.066,0.168-0.133,0.312-0.197,0.464
-	c 0.098-0.244, 0.197-0.464, 0.297-0.713C 206.862,34.719, 206.828,34.82, 206.797,34.896z M 207.125,33.961
-	c-0.067,0.236-0.166,0.471-0.229,0.686c 0.062-0.215, 0.161-0.438, 0.229-0.66C 207.125,33.986, 207.125,33.977, 207.125,33.961z
-	 M 207.712,31.764c0-0.031,0-0.058,0-0.084c0-0.049, 0.034-0.113, 0.065-0.166C 207.746,31.589, 207.712,31.662, 207.712,31.764z
-	 M 194.205,8.701l0-0.012 c-0.098-0.031-0.229-0.079-0.328-0.104C 193.977,8.61, 194.107,8.658, 194.205,8.701z M 191.623,8.035
-	c 0.588,0.112, 1.341,0.264, 2.254,0.551c-0.521-0.15-1.046-0.238-1.536-0.369C 192.112,8.168, 191.854,8.090, 191.623,8.035z
-	 M 195.514,46.367L 195.514,46.367l 0.033,0 L 195.514,46.367 z M 198.719,44.739c 0.031-0.017, 0.031-0.017, 0.031-0.017
-	c0-0.021, 0.033-0.025, 0.033-0.025C 198.75,44.701, 198.75,44.723, 198.719,44.739z"  />
-<glyph unicode="&#xe1f0;" d="M 255.854,441.906c 120.295,0, 217.811-97.519, 217.811-217.809c0-120.297-97.516-217.815-217.811-217.815
-		c-120.293,0-217.81,97.519-217.81,217.815C 38.044,344.388, 135.562,441.906, 255.854,441.906 M 255.854,404.349
-		c-99.391,0-180.253-80.86-180.253-180.251c0-99.395, 80.862-180.256, 180.253-180.256c 99.391,0, 180.251,80.861, 180.251,180.256
-		C 436.105,323.488, 355.245,404.349, 255.854,404.349L 255.854,404.349zM 198.757,346.209c 14.748,9.496, 32.873,14.247, 54.371,14.247c 28.244,0, 51.714-6.748, 70.399-20.25
-		c 18.686-13.497, 28.029-33.496, 28.029-59.995c0-16.246-4.051-29.933-12.153-41.058c-4.739-6.751-13.837-15.375-27.301-25.87
-		l-13.272-10.312c-7.232-5.628-12.032-12.188-14.398-19.69c-1.497-4.748-2.309-12.122-2.433-22.12l-50.806,0 
-		c 0.745,21.122, 2.741,35.716, 5.979,43.778c 3.24,8.062, 11.591,17.34, 25.048,27.84l 13.648,10.686c 4.484,3.373, 8.1,7.062, 10.843,11.062
-		c 4.982,6.876, 7.476,14.438, 7.476,22.688c0,9.499-2.774,18.154-8.324,25.966c-5.547,7.811-15.68,11.718-30.393,11.718
-		c-14.465,0-24.725-4.812-30.77-14.437c-6.048-9.627-9.069-19.622-9.069-29.999l-54.185,0 
-		C 162.947,306.083, 175.384,331.333, 198.757,346.209z M 229.88,135.478l 56.055,0 l0-54.184 L 229.88,81.294 L 229.88,135.478 z"  />
-<glyph unicode="&#xe1f1;" d="M 182.504,157.493l 73.58-89.11l 73.577,89.11l-47.973,0 L 281.688,286.997 l 47.973,0 l-73.577,89.144l-73.58-89.144l 48.039,0 l0-129.503 L 182.504,157.494 z
-	 M 160.955,441.971l0-51.164 l 190.291,0 L 351.246,441.971 L 160.955,441.971 z M 160.955,5.858l 190.291,0 l0,51.145 L 160.955,57.003 L 160.955,5.858 z"  />
-<glyph unicode="&#xe1f2;" d="M 250.104,260.972c 0.023,0.037, 0.057,0.069, 0.080,0.105c-0.090,0.429-0.163,0.807-0.196,1.075
-		C 250.028,261.76, 250.070,261.367, 250.104,260.972z M 333.96,169.408c 0.004,0, 0.004,0.004, 0.004,0.006
-		c-0.012,0.006-0.050,0.006-0.058,0.019C 333.918,169.42, 333.948,169.42, 333.96,169.408z M 336.107,169.14
-		c-0.52,0.083-1.686-0.069-2.147,0.269C 333.676,168.426, 334.105,168.055, 336.107,169.14z M 254.426,442.225
-		c-120.584,0-218.334-97.75-218.334-218.333c0-120.583, 97.75-218.334, 218.334-218.334c 120.582,0, 218.336,97.752, 218.336,218.334
-		C 472.762,344.474, 375.008,442.225, 254.426,442.225z M 393.886,356.933c-7.522-0.226-12.76-0.241-18.805-4.413
-		c-2.435-1.681-4.087-3.912-7.178-4.781c-2.771-0.778-5.763-0.096-8.512-1.028c-9.921-3.366-8.348-24.613-21.42-21.405
-		c-6.141,1.507-10.467,8.763-13.558,13.5c-2.722,4.168-7.68,7.617-4.33,12.833c-1.527-0.393-3.157,0.055-4.66-0.232
-		c 2.095,4.602, 9.116,4.197, 10.284,6.547c 2.91,5.89-8.010,6.505-11.103,7.321c 3.727,3.974, 5.614-1.335, 9.293-0.434
-		c 3.536,0.869-1.866,5.526-3.986,6.048c-0.762,0.188-13.212-3.44-6.006,3.009c-8.896,5.67-17.788,11.34-26.686,17.014
-		c-1.498-6.309, 11.84-9.894, 16.196-12.119c-0.676-2.604-4.729-6.399-7.832-5.287c-2.922,1.047-1.735,5.89-6.148,5.405
-		c-3.151-7.327, 6.662-5.186, 7.573-9.675c 1.037-5.115-3.709-2.949-5.534-2.858c-0.435,0.021-3.836,3.543-4.021,0.877
-		c-0.221-3.165, 5.427-1.932, 5.824-5.127c-6.576-0.266-9.936,2.109-15.289,5.665c-6.248,4.147-9.455,3.773-17.11,3.773
-		c 2.29,0.94, 5.443,1.638, 7.401,3.152c 1.069,0.828, 5.266,4.906, 5.542,5.818c 1.187,3.927-0.063,3.631-3.823,6.205
-		c-3.341,2.286-7.394,6.39-11.443,7.199c-14.671,2.929-4.525-13.247-15.662-15.478c 0.19-0.009, 0.397-0.019, 0.562-0.019l-0.638,0 
-		c 0.027,0.003, 0.051,0.013, 0.076,0.019c-2.576,0.093-7.403,0.72-9.064-0.64c-1.172-0.958-1.271-4.802-2.58-6.192
-		c-2.331-2.484-5.807-2.982-8.588-4.774c-2.716-1.749-8.702-6.241-10.297-9.288c-5.878-11.229, 13.242-14.715, 20.49-17.996
-		c 3.275-1.484, 12.846-3.514, 14.629-5.992c 2.391-3.329-2.061-6.449, 2.932-8.788c 1.594-0.745, 4.883-0.896, 6.256,0.648
-		c 2.231,2.513-0.907,3.082-1.441,5.986c-1.035,5.593, 0.67,3.371, 3.482,5.448c 5.732,4.232, 4.441,4.49, 2.38,11.235
-		c-0.959,3.14-4.57,11.9-1.394,14.217c 4.145,3.025, 12.981-1.638, 16.159-2.027c 3.698-0.454, 5.797-5.577, 7.812-7.672
-		c 1.339-1.391, 3.732-4.344, 6.071-4.023c 3.712,0.507, 2.158,3.751, 4.311,5.248c 5.775,4.007, 7.296-1.434, 9.598-6.876
-		c 2.165-5.11, 4.214-7.007, 8.067-10.286c 1.79-1.527, 9.634-6.975, 8.894-10.33c-0.502-2.262-9.462-5.692-11.857-6.452
-		c-8.759-2.772-25.188,4.542-26.952-9.347c 3.397,1.267, 13.062,9.162, 15.962,5.419c 1.322-1.699-1.048-4.171-0.49-5.858
-		c 1.653-5.056, 5.553-3.295, 9.641-2.477c-0.277-0.174-0.564-0.326-0.865-0.46c 5.586,2.871, 5.006,2.271, 7.568,6.929
-		c 0.837,1.52, 2.083,5.203, 3.262,6.291c 4.062,3.736, 4.687,1.164, 7.201-1.719c 0.659-0.759, 6.879-9.715, 4.665-9.269
-		c-7.234,1.452-14.181,1.257-20.181-2.698c-3.457-2.283-6.727-5.364-10.855-6.881c-0.989-0.361-8.317-1.056-7.451,0.195
-		c 1.264,1.82, 5.617,3.028, 7.334,4.993c-4.759,1.96-8.729-2.367-12.47-4.898c-3.969-1.878-4.892-5.376-8.271-8.444
-		c-1.476-1.338-4.265-1.564-5.713-3.326c-1.406-1.708-1.581-4.393-2.912-6.016c-0.934-1.134-3.328-0.448-4.303-2.16
-		c-1.271-2.237, 1.162-4.311, 0.629-5.923c-0.976-2.926-6.543-5.408-8.684-7.516c 0.286,0.275, 0.57,0.558, 0.85,0.844
-		c-2.146-2.25-4.86-3.906-6.535-6.511c 0.77-3.677, 3.193-12.446, 2.518-14.464c-2.23-6.64-6.564,3.61-8.322,6.257
-		c-6.039,9.101-18.108,3.010-26.354,2.256c-10.544-0.964-20.872-14.649-14.368-25.759c 3.122-5.328, 8.374-7.388, 14.399-6.155
-		c 5.361,1.097, 6.972,8.599, 12.021,8.734c 9.279,0.248, 0.205-9.093-0.598-12.52c-0.742-3.175, 1.157-3.47, 4.425-4.255
-		c 2.414-0.578, 5.832,1.031, 7.924-0.347c 1.318-0.87, 1.255-5.634, 3.068-4.131c-3.569-2.958-2.736-9.972, 0.923-12.509
-		c 4.058-2.812, 8.835-0.207, 13.082-1.288c 8.019-2.046, 4.19,0.61, 11.232,4.862c 4.753,2.865, 5.533-0.54, 8.781-0.552
-		c 2.211-0.009, 3.616,3.179, 7.312,2.249c 3.013-0.758, 4.204-3.084, 7.802-3.619c 1.475-0.217, 2.998,0.554, 4.404,0.399
-		c 6.654-0.738, 11.748-4.991, 16.992-8.835c 4.321-3.164, 7.184-2.523, 12.23-3.967c 3.688-1.051, 10.492-6.387, 10.144-11.072
-		c-0.062-0.837-3.285-5.053-3.836-6.949c 0.944-0.655, 7.507,0.812, 9.427,0.952c-0.631-0.735-5.101-3.876-5.101-2.209
-		c0-0.853, 3.163-2.608, 3.933-3.155c 2.331,7.569, 6.16,2.699, 10.768,0.824c 3.918-1.595, 8.74-1.681, 12.919-2.676
-		c 3.548-0.846, 11.37-3.24, 13.999-6.139c 3.164-3.489, 0.976-9.157-1.365-12.63c-3.062-4.551-7.68-6.3-9.59-11.653
-		c-1.51-4.244-0.376-8.531-1.239-13.236c-1.166-6.367-2.101-4.135-6.201-8.021c-3.451-3.271-0.058-2.702-4.756-4.787
-		c-4.72-2.099-8.874-1.474-12.142-6.65c 0.131,0.325, 0.237,0.652, 0.328,0.992c-1.378-1.929-2.068-5.881-2.721-7.176
-		c-1.647-3.308-3.919-5.395-6.523-8.15c-0.999-1.055-10.179-13.594-10.708-12.586c-0.683,1.31-7.919-1.316-8.265,0.553
-		c 0.288-1.57-0.068-1.044, 1.729-1.95c-1.665-10.305-6.023-11.841-16.144-11.946c 0.87-4.953-3.667-3.964-5.775-6.628
-		c-1.232-1.556-1.821-5.927-2.676-7.941c-0.533-1.264-4.484-6.331-4.484-7.338c-0.004-0.924, 1.328-2.278, 2.577-3.578
-		c-7.134-1.41-14.409-2.396-21.798-2.995c 1.383,1.742, 1.716,3.273-2.689,3.483c 1.179,3.203, 3.946,5.030, 5.12,8.133
-		c 0.557,1.464, 0.096,2.043, 0.566,3.492c 1.612,5.008, 0.913,3.12, 0.004,7.010c-2.128,9.113, 0.758,11.607, 3.242,19.952
-		c 2.551,8.579, 2.313,19.697, 3.947,28.936c 0.775,4.422, 2.047,13.618, 0.511,17.799c-1.729,4.706-9.34,8.412-12.825,11.578
-		c-4.935,4.494-7.558,9.354-11.221,14.91c-1.86,2.821-3.98,5.59-5.431,8.66c-3.104,6.561, 0.002,2.654, 0.523,6.527
-		c 0.5,3.742-0.445,7.085, 1.041,11.013c 1.643,4.343, 5.744,7.048, 7.092,11.427c 1.213,3.896, 0.29,8.795-3.714,10.096
-		c-2.231,0.727-4.692-0.949-6.935-0.582c-3.127,0.507-6.665,2.84-9.118,4.707c-3.425,2.608-4.709,6.85-8.356,9.322
-		c-3.053,2.063-5.225,0.828-8.49,1.793c-3.406,1.004-5.509,5.206-8.257,6.522c-4.124,1.972-6.447-0.859-10.8-0.288
-		c-3.702,0.485-9.348,4.589-12.807,6.138c-7.033,3.148-11.316,6.622-14.128,13.76c-2.409,6.122-5.92,8.977-10.055,14.076
-		c-4.188,5.166-5.501,9.566-11.958,10.944c-0.758,0.164, 1.58-5.425, 1.821-5.871c 2.308-4.273, 5.771-8.176, 8.559-12.153
-		c 4.101-5.859, 2.354-6.959-1.817-1.292c-4.77,6.48-10.305,12.926-14.442,19.79c-1.564,2.595-1.264,4.273-3.843,6.737
-		c-2.494,2.379-5.756,3.537-8.266,5.8c-9.031,8.123-10.674,18.966-9.644,30.545c 0.335,3.773, 1.698,6.792, 1.097,10.419
-		c-0.496,3.013-2.275,5.503-4.496,7.724c-0.717,1.138-2.514,3.947-2.618,4.126c-2.050,3.405-3.645,6.755-6.902,9.551
-		c-1.868,1.607-6.703,5.37-11.256,8.522c 20.454,25.508, 47.218,45.726, 77.921,58.278c 0.244-1.542, 0.906-3.084, 1.9-4.558
-		c 2.525-3.745, 4.931-3.448, 9.857-4.486c-0.527-5.717-7.213-5.763-11.738-5.142c-5.401,0.738-11.084,2.534-15.764-2.2
-		c 2.585-1.554, 9.678-7.605, 8.736-1.282c 5.174,0.259, 10.176,0.414, 15.238-0.204c 2.029-0.25, 8.824-2.53, 10.667-1.49
-		c 0.772,0.437, 1.597,4.25, 2.414,5.423c-1.443-0.008-2.991,0.72-4.428,0.582c 3.353,4.292, 6.692,0.927, 10.959-1.048
-		c-4.697-2.855-1.912-9.694, 2.681-4.137c 3.771,4.57-0.924,7.885-5.713,10.547c 4.829,6.040, 7.808,6.587, 12.352-0.233
-		c 0.75,4.207, 4.143,2.522, 7.69,2.213l0,1.050 c-1.562-0.036-3.229,0.862-4.774,0.699c 3.613,5.765, 1.307,7.083, 6.473,8.963
-		c 4.114,1.499, 15.85,0.104, 17.295,3.971c-8.213-1.597-18.135-1.978-25.545-5.713c-3.194-1.611-7-6.693-10.191-3.388
-		c-3.27,3.388, 2.339,8.838, 5.209,10.5l-0.687,0 c 12.995,2.763, 26.453,4.247, 40.261,4.247c 8.923,0, 17.69-0.659, 26.297-1.835
-		c-2.979-1.564-0.775-2.621-2.945-4.219c-4.143-3.047-11.497-5.589-16.427-7.515c 6.267,0.017, 21.437-5.876, 24.355,2.915
-		c-2.023,0.309-4.041,0.622-6.062,0.933c 3.776,2.504, 7.988,4.53, 12.411,6.016c 39.905-7.907, 75.4-28.147, 102.401-56.551
-		C 394.264,356.933, 394.072,356.939, 393.886,356.933z M 429.222,280.278c 0.359,0.767, 1.198,1.020, 1.546,1.654
-		c 0.729,1.332, 0.566,2.234, 1.465,3.377c 0.962,1.233, 2.259,1.537, 3.331,2.5c 0.433,0.389, 0.674,0.748, 0.873,1.115
-		c 3.22-8.989, 5.787-18.28, 7.654-27.822c-0.057-0.068-0.089-0.171-0.159-0.229c-0.469-0.371-3.529-0.826-4.157-0.847
-		c-2.217-0.086-3.862,1.384-5.453,2.769c-1.618,1.406-3.524,3.288-4.675,5.107c-1.229,1.944-0.47,3.94-0.382,6.162
-		C 429.338,275.934, 428.43,278.595, 429.222,280.278z M 431.72,180.17c-3.75,3.26-8.175,7.627-10.841,11.848
-		c-2.849,4.499-1.093,9.129-0.886,14.282c 0.174,4.335-1.943,10.503-0.101,14.405c 0.845,1.781, 2.784,2.371, 3.581,3.832
-		c 1.696,3.091, 1.319,5.18, 3.401,7.837c 2.232,2.855, 5.234,3.557, 7.721,5.794c 2.605,2.348, 2.533,4.198, 4.183,7.206
-		c 1.206,2.198, 4.043,5.865, 6.729,7.781c 1.456-9.545, 2.216-19.319, 2.216-29.263c0-17.206-2.289-33.881-6.529-49.771
-		C 437.579,175.054, 434.605,177.658, 431.72,180.17z"  />
-<glyph unicode="&#xe1f3;" d="M 343.37,385.024c-42.628,0-82.753-17.632-87.626-59.189c-4.857,41.558-44.981,59.189-87.64,59.189
-			c-45.962,0-78.255-49.901-78.255-96.14c0-105.434, 166.958-225.643, 166.958-225.643S 421.64,183.451, 421.64,288.885
-			C 421.64,335.123, 389.363,385.024, 343.37,385.024z"  />
-<glyph unicode="&#xe1f4;" d="M 414.422,214.658c-0.039-1.591-0.332-2.97-0.641-4.428c-0.305-1.427-0.619-2.902-0.682-4.617l-0.049-2.132l 0.459-0.368
-		c 0.293-0.231, 0.633-0.354, 0.984-0.354c 0.002,0, 0.002,0, 0.002,0c 0.68,0, 2.732,0.016, 2.904,10.206l 0.002,0.224l-0.689,1.854
-		L 414.422,214.658zM 157.553,356.294l 1.74,0.396l 0.252,0.33c 0.654,0.867, 0.826,1.626, 0.514,2.256c-0.324,0.647-1.064,0.936-1.9,0.677
-		c-0.74-0.228-2.387-1.259-2.066-2.473C 156.373,356.41, 157.209,356.294, 157.553,356.294zM 313.873,384.436c-1.217,0.756-4.303,0.307-4.76-0.452C 313.074,383.415, 315.215,383.595, 313.873,384.436zM 309.113,383.983c-0.199,0.027-0.379,0.048-0.588,0.082c0,0, 0.002,0, 0.562-0.267
-		C 309.090,383.861, 309.076,383.924, 309.113,383.983zM 177.518,347.904c 0.002,0, 0.012,0, 0.014,0.001C 177.654,347.978, 177.621,347.961, 177.518,347.904zM 162.264,347.645c 0.473,0.050, 1.602,0.269, 1.883,1.236c 0.041,0.148, 0.080,0.287, 0.141,0.554l 0.262,1.447l-1.477,0 
-		c-1.068,0-1.928-0.618-2.361-1.693l-0.842-2.096L 162.264,347.645zM 216.391,302.201l 0.354-0.194l 1.848,0.292l 0.869,0.042l 0.33,0.503c 0.494,0.742, 0.463,2.076, 0.338,2.971l 1.439,3.107
-		L 220,309.153c-0.107,0.015-0.35,0.027-0.697,0.027c-0.988,0-7.771-0.209-9.041-0.704l-0.705-0.456l-0.041-0.763
-		C 209.477,306.562, 209.447,306.013, 216.391,302.201zM 198.129,319.979c 0.205-0.696, 0.457-1.529, 0.895-2.175c-0.055-0.037-0.119-0.041-0.17-0.085l-0.223-0.166
-		c-0.887-0.652-1.521-1.177-1.586-1.937l 0.141-0.812l 0.375-0.387c0,0, 0.039-0.085, 0.051-0.196l-0.070-0.387
-		c-0.361-0.782-0.74-1.933-0.783-2.667l-0.008-0.592l 0.887-0.803l 0.512,0 c 1.232,0, 3.932,1.422, 5.775,3.038l 0.684,0.597l-2.182,4.452
-		l-0.326,0.053c 1.541,2.241, 1.107,4.158, 0.402,5.419l-0.67,1.201l-1.086-0.843c-0.658-0.508-1.393-0.854-2.186-1.028l-1.883-0.358
-		l 1.176-1.485C 197.918,320.699, 198.047,320.265, 198.129,319.979zM 322.666,382.667l 0.287-0.091l 2.279,0.454l 0.666,0.287l 0.543,1.145l-0.371,0.558c-0.158,0.233-0.371,0.556-3.588,1.959
-		l-0.369,0.16l-1.545-0.385l-0.416,0.169l-0.531-0.383c-0.451-0.328-0.668-0.843-0.58-1.379
-		C 319.098,384.808, 319.271,383.729, 322.666,382.667zM 155.781,344.37c 0.248,1.161, 0.451,2.344, 0.602,3.524l 0.059,0.244c-0.582,0.267-1.646,0.661-3.375,1.106l-0.002-0.005
-		l 0.033-0.031l-0.107-0.746c-0.084-0.387-0.234-1.102-3.055-2.123l-0.281-0.25c 0.209-0.275, 0.289-0.548, 0.318-0.713
-		c 0.068-0.357, 0.096-1.281-1.076-2.082c-0.264-0.216-0.646-1.14-0.795-1.751c 0.072,0.009, 0.152,0.022, 0.238,0.041
-		C 150.158,341.742, 154.176,343.285, 155.781,344.37zM 167.311,350.885c 0.543-0.098, 0.953-0.227, 1.242-0.635l 0.285-0.406l-0.082-0.524c-0.145-0.757-1.32-1.839-2.104-2.278
-		c-0.322-0.184-0.889-0.426-1.463-0.664c-0.27-0.111-0.648-0.27-0.939-0.401c0-0.004,0-0.006,0-0.006
-		c-0.162-0.678-0.793-1.922-1.812-2.462c 0.305-0.041, 0.648-0.087, 1.035-0.136c 0.779,0.274, 1.404,0.508, 1.822,0.68l 2.359,2.234
-		l-0.078-2.712l 0.096-0.182l-0.17-0.501c-0.16-0.459-0.533-0.686-0.881-0.846l-1.346-1.277l-1.543,0.186
-		c-1.117-0.39-2.471-0.839-3.953-1.316l 0.012-0.048c 5.143,0.578, 13.168,2.235, 17.389,4.22c-0.025,0.062-0.045,0.122-0.061,0.188
-		c-0.078,0.295-0.223,1.321, 1.1,2.044c 0.021,0.042, 0.123,0.352, 0.062,0.743c-0.006,0.057-0.020,0.112-0.033,0.166l-0.391-0.222
-		l-0.018,0.029l-0.578-0.081c-0.359,0-1.027,0.079-1.469,0.618l-0.355,0.435l 0.188,1.396l 0.154,0.064
-		c-0.029,0.042-0.062,0.083-0.096,0.127c-1.275,1.559-4.998,3.047-7.092,3.605L 167.311,350.885zM 161.375,354.675c 0.033,0.001, 0.062,0.003, 0.096,0.003c 0.83-0.124, 1.281-0.678, 1.496-0.995
-		c 0.367-0.544, 0.561-1.155, 0.566-1.771c 1.033,0.162, 2.049,0.403, 2.254,0.466l 2.209,0.692c-0.283,0.060-0.512,0.089-0.662,0.089
-		l-1.797,0 l 0.67,1.65c 0.367,0.854, 1.25,1.517, 2.178,2.214c 0.227,0.171, 0.488,0.365, 0.74,0.572c-1.469-0.2-3.002-0.376-3.533-0.376
-		l-0.6,0 l-0.812,0.962l 0.029,0.119c-0.609-0.064-1.389-0.182-2.303-0.384l-0.045-0.132c 0.045-0.078, 0.078-0.159, 0.105-0.244
-		l 0.176-0.562l-0.359-0.586c-0.061-0.085-0.131-0.162-0.205-0.229c-0.018-0.454-0.137-0.871-0.346-1.243
-		c 0.039-0.055, 0.074-0.113, 0.105-0.172C 161.35,354.722, 161.363,354.698, 161.375,354.675zM 165.387,336.084L 165.387,336.091L 165.385,336.091 	zM 322.893,128.924c-4.346-4.78-8.449-9.297-10.295-16.479c-0.127-2.151, 0.258-6.593, 1.969-8.419
-		c 0.498-0.535, 1.047-0.781, 1.727-0.781l 0.139,0.002c 8.408,0.935, 14.486,20.064, 15.215,28.021l 0.090,1.018l 0.795,0.044
-		c 0.352,0.889, 0.883,3.627, 1.066,7.979l-1.82,0.124C 329.133,135.788, 325.965,132.301, 322.893,128.924zM 256,430.477c-114.033,0-206.477-92.443-206.477-206.478c0-114.033, 92.443-206.476, 206.477-206.476
-		s 206.477,92.442, 206.477,206.476C 462.477,338.033, 370.033,430.477, 256,430.477z M 256,41.202
-		c-100.795,0-182.797,82.002-182.797,182.797c0,100.796, 82.002,182.798, 182.797,182.798c 26.637,0, 51.936-5.773, 74.783-16.062
-		c-0.66-0.068-1.289-0.271-1.701-0.647c-0.094-0.022-0.277-0.041-0.428-0.047c-0.803,0-1.471-0.523-1.664-1.307
-		c-0.211-0.85, 0.174-1.753, 0.912-2.146l 0.342-0.18c 0.316-0.166, 0.508-0.268, 0.643-0.33l0-0.002 c 4.695-2.011, 9.072-3.075, 14.143-4.308
-		l 0.973,2.11c-0.115,0.083-0.24,0.155-0.355,0.236l 0.004,0.010l-0.006-0.010c-0.020,0.015-0.041,0.026-0.059,0.041l 0.004,0.010
-		c-0.025,0.015-0.066,0.036-0.096,0.051c-0.555,0.388-1.113,0.771-1.689,1.128c 1.359-0.724, 2.693-1.484, 4.033-2.244l-0.67-0.044
-		l-0.715-1.075l 0.312-0.893l 0.258-0.21c 1.463-1.198, 3.117-1.842, 4.916-1.92l 2.174-0.089l-0.5,0.85
-		c 3.322-2.051, 6.561-4.226, 9.74-6.477c-5.875,1.929-13.133,3.851-16.619,4.385c-0.082,0.012-6.773,1.141-9.357,2.652
-		c-1.199-0.144-6.143-0.85-12.137-1.939c-0.002-0.004-3.643-0.822-10.664,2.499l-2.006,0.947c-0.047-0.256-0.125-0.498-0.236-0.72
-		c-0.328-0.657-0.916-1.074-1.611-1.145c-0.449-0.045-1.357-0.055-2.336-0.061c-0.992-0.006-2.064-0.009-2.756-0.069
-		c-1.9-0.155-3.35-0.354-4.092-0.507c-0.006-0.019-0.016-0.041-0.023-0.059c-0.502-1.080-2.211-1.579-3.572-1.426l-0.762,0.093
-		c-0.941,0.117-2.418,0.302-3.715,0.415c 0.049-0.19, 0.047-0.405-0.025-0.651c-0.287-0.963-1.35-0.963-1.752-0.963
-		c-1.953,0.019-7.025,2.223-7.758,3.848c-0.227,0.508-0.188,1.056, 0.102,1.507c 0.477,0.733, 1.459,1.048, 3.285,1.048
-		c 1.859,0, 4.559-0.35, 7.805-1.011c 0.076-0.015, 1.531-0.256, 4.047,0.976c-3.404,1.049-10.938,2.898-17.885,4.451
-		c-12.457,2.782-12.447,2.86-12.309,4.139l 0.012,0.095c-0.133,0.006-0.268,0.008-0.393,0.013c-1.762,0.046-2.879,0.097-3.564,0.387
-		c-0.762-0.003-1.854-0.292-2.506-0.466c-0.537-0.142-0.76-0.202-0.996-0.202l-0.912,0.107c-0.223-0.017-0.43-0.056-0.566-0.109
-		c-0.76-0.289-2.389-0.383-2.865-0.383l-1.076,0 l-0.211,0.763c-0.576,0.197-1.59,0.453-2.947,0.554
-		c-1.699,0.14-3.332-0.259-4.18-0.534c-0.357-0.724-1.312-0.764-1.859-0.79c-0.572-0.024-1.859-0.378-2.551-0.568
-		c-0.688-0.188-0.896-0.246-1.131-0.246l-0.635,0.117c-0.148-0.008-0.301-0.032-0.475-0.087c-0.789-0.245-2.758-0.548-3.256-0.548
-		l-0.539,0 l-0.141,0.144c-0.25,0.032-0.703,0.072-1.199,0.028c-0.652-0.049-1.707-0.251-2.229-0.376
-		c-0.514-0.366-1.363-0.423-2.195-0.478c-0.729-0.048-2.367-0.501-3.047-0.72c-0.535-0.366-1.496-0.566-2.906-0.79
-		c-0.697-0.109-1.662-0.491-2.441-0.869c 0.033-0.075, 0.055-0.153, 0.076-0.229c 0.393-1.525-1.412-3.395-5.357-5.564
-		c-3.543-1.944-8.723-4.089-11.816-5.369c-0.91-0.378-1.604-0.663-1.949-0.82c-0.744-0.579-2.736-1.338-7.936-2.691
-		c-0.805-0.21-1.328-0.55-1.594-1.038c-0.582-1.059-0.012-2.824, 0.33-3.88c 0.090-0.275, 0.18-0.551, 0.238-0.817
-		c 0.334,0.022, 0.602,0.107, 1.1-0.121c 0.566-0.053, 3.299-0.059, 5.572,0.136c 1.77,0.153, 3.891,0.535, 5.438,0.814
-		c 1.459,0.261, 2.18,0.389, 2.617,0.389l 0.422,0 l 0.475-0.291c 0.055-0.035, 0.191-0.11, 0.342-0.194c 0.781-0.443, 1.35-0.765, 1.412-1.499
-		l 0.010-0.114c 0.133-0.211, 0.406-0.572, 0.803-0.912c 0.035-0.028, 3.031-2.635, 3.012-4.158l 0.023-0.002
-		c-0.004-0.102, 0.029-0.461, 0.109-0.863c 0.182-0.028, 0.471-0.060, 0.91-0.060c 1.479,0, 3.439,0.312, 5.119,0.815
-		c 2.027,0.608, 3.602,1.821, 4.201,2.448l 0.027,0.78c-0.025,3.334, 2.867,4.021, 4.596,4.438c 1.232,0.291, 1.799,0.477, 1.893,0.791
-		c-1.166,1.109-1.709,2.458-1.535,3.859c 0.229,1.873, 1.723,3.556, 4.1,4.614c 2.932,1.307, 5.412,3.041, 6.18,3.688l 0.139,4.775
-		l 1.355-0.243c 3.943-0.709, 8.705-2.062, 9.004-4.47c 0.070-0.602-0.076-1.734-1.895-2.551c-0.826-0.37-1.727-0.756-2.607-1.132
-		c-1.48-0.634-3.447-1.476-4.143-1.902c-0.043-0.368-0.070-0.793-0.072-1.037c 0.127-0.16, 0.252-0.326, 0.354-0.502
-		c 1.299-0.191, 4.33-0.465, 8.193-0.465l 0.598,0.002c 4.209,0, 7.35-1.549, 7.584-3.684c 0.1-0.905-0.242-2.532-3.633-3.285
-		c-1.479-0.329-2.98-0.664-4.178-0.945c 0.027-0.093, 0.049-0.186, 0.061-0.281c 0.213-1.462-1.188-3.315-2.432-3.682
-		c-0.227-0.066-0.582-0.141-1.023-0.229c-1.488-0.297-4.26-0.853-5.199-2.231c-1.848-2.715-10.105-4.472-10.445-4.472l-0.227,0 
-		c-0.73-0.104-3.35-0.597-6.971-1.49c-1.055-0.261-2.193-0.393-3.383-0.393c-0.742,0-4.215,0.221-5.771,1.088
-		c-0.273-0.020-0.682-0.089-1.182-0.234c-0.982-0.285-2.877-0.306-3.432-0.306c-3.375,0-4.15,0.528-4.41,0.731
-		c-0.363-0.276-0.803-0.461-1.172-0.461l-0.531,0 l-0.734,0.802l 0.061,0.54c 0.059,0.496, 0.777,1.599, 1.242,2.271
-		c-0.002-0.022-0.020-0.032-0.020-0.053c-0.072-0.697, 0.492-1.373, 0.867-1.636c 0.064-0.046, 0.166-0.056, 0.236-0.093l-0.914-0.862
-		l 2.895,0.056l 0.010-0.028l 3.756,0.067l 0.285,0.768c 0.242,0.659, 0.779,2.282, 0.49,3.115c-0.332,0.967-1.463,0.967-1.889,0.967
-		c-0.381,0-1.676-0.043-2.326-0.57c-0.23-0.188-0.416-0.42-0.564-0.669c-0.273,0.089-0.557,0.158-0.83,0.158c0,0-0.002,0-0.004,0
-		c-0.463-0.021-0.969-0.113-1.363-0.339c 0.318,0.443, 0.613,0.878, 0.803,1.186c-0.027,0.040-0.059,0.076-0.086,0.108
-		c-0.217,0.209-1.758,1.127-2.949,0.833c-1.068-0.25-2.109-2.503-2.039-3.108c 0.191-0.247, 0.236-0.795, 0.055-1.445
-		c-0.494-1.77-3.021-5.185-7.080-7.24c-1.537-0.776-3.459-1.773-5.441-2.8c-3.818-1.978-7.764-4.021-9.789-4.948
-		c-1.375-0.632-3.496-1.383-5.549-2.113c-1.531-0.541-3.561-1.266-4.285-1.622c-0.062-0.124-0.148-0.254-0.264-0.385
-		c-0.785-0.887-2.738-1.503-4.752-1.503l-0.26,0.002l0,0c-0.652,0-1.314-0.206-1.902-0.481c 0.814-0.191, 1.801-0.411, 2.893-0.639
-		c 2.654-0.548, 4.559-3.521, 5.254-4.773c 0.982-1.771, 0.84-2.162, 0.721-2.477c-0.039-0.106-0.1-0.246-0.162-0.378l 0.152-0.812
-		l-2.311-0.451l-0.049,0.231c-1.352,0.017-4.277,0.042-8.113,0.042l-1.957-0.002c-5.477-0.013-12.734-9.991-13.104-11.635
-		c-0.416-1.857-0.816-5.688-0.818-6.653c 0.4-0.721, 1.055-2.314, 0.906-4.049l-0.109-1.075c 0.652-0.309, 1.703-0.776, 2.877-1.254
-		c 0.035-0.016, 0.381-0.146, 1.422-0.146c 2.412,0, 6.557,0.693, 9.043,1.808l 0.414,0.102l 2.986,0.178
-		c 0.629,0.677, 1.816,1.789, 4.002,3.845c 1.842,1.729, 2.889,2.877, 3.264,3.368c 0.189,1.653, 4.605,3.94, 4.65,3.963
-		c 1.979,1.018, 5.432,5.363, 5.777,6.099l 0.082-0.039c 0.754,1.48, 4.852,3.757, 12.227,6.785c 0.916,0.376, 1.93,0.564, 3.018,0.564
-		c 4.928,0, 10.77-3.861, 15.924-7.267c 2.109-1.392, 4.102-2.708, 5.773-3.583l-1.084-2.106c-0.223,0.112, 4.191-4.064, 5.291-5.108
-		c 0.354,0.13, 0.902,0.385, 1.199,0.653c 0.514,0.463, 1.422,2.036, 1.527,2.615c-0.129,0.345-0.195,0.883, 0.189,1.54
-		c 0.18,0.305, 0.461,0.626, 0.795,0.92c-0.961,0.529-2.354,1.236-4.229,2.069l-1.074,0.481l 0.717,1.628
-		c-0.889,0.414-2.58,1.091-4.898,1.87c-3.336,1.121-5.803,4.869-6.406,6.097c-0.186,0.378-0.369,0.821-0.205,1.312l-0.041,0.023
-		l 0.037,0.819c 0.084,0.98, 1.285,1.504, 1.799,1.686l 0.504,0.079c 1.674,0, 8.334-3.204, 13.758-7.462l 3.469-3.382
-		c 5.725-4.77, 9.705-7.804, 10.539-8.281c 0.461-0.095, 0.85-0.401, 1.057-0.853c 0.334-0.723, 0.156-1.649-0.469-2.535l-0.004-0.315
-		l 0.018-2.029c 0.332-0.031, 0.656-0.049, 0.969-0.049c 1.537,0, 2.279,0.374, 2.477,0.595c-0.25,2.545-0.25,2.545, 0.127,2.967
-		l 0.352,0.395l 0.531,0.004c 0.379,0, 0.676-0.137, 0.885-0.407c 0.131,0.046, 0.273,0.102, 0.416,0.165
-		c-0.854,0.794-1.475,1.85-1.633,2.32l-0.189,0.556l 0.088,0.169c-0.557,0.602-1.051,1.534-0.951,2.466
-		c 0.072,0.68, 0.459,1.235, 1.066,1.524c 0.738,0.348, 1.918,0.098, 2.902-0.166c 0.133-0.038, 0.258-0.071, 0.369-0.103
-		c 0.643,0.32, 1.834,0.576, 4.078,0.576c 0.951,0, 1.924-0.060, 2.895-0.179c 0.641-0.076, 1.375-0.011, 2.197,0.177
-		c 0.787,0.403, 1.631,0.703, 2.463,0.871c 0.758,0.37, 1.266,0.724, 1.561,0.98l-0.037,0.022l-0.133,0.691l-0.070,2.773l 0.303,0.434
-		c 3.359,3.743, 5.568,6.386, 6.074,7.091c 0.102,0.663, 0.434,1.66, 0.861,2.354c 0.396,0.64, 1.068,0.908, 4.207,0.908
-		c 8.010,0, 8.143-0.662, 8.293-1.434l 0.188-0.957l-0.271-0.113c 0.119-0.161, 0.293-0.354, 0.523-0.544
-		c 0.395-0.318, 2.002-0.779, 3.875-0.779c 0.492,0, 0.961,0.035, 1.365,0.115c 0.176,0.033, 0.338,0.075, 0.488,0.12
-		c-0.174,0.244-0.281,0.533-0.311,0.854c-0.127,1.335, 1.154,2.699, 3.047,3.247c 1.135,0.327, 2.791,0.54, 4.213,0.54
-		c 1.846,0, 2.881-0.324, 3.365-1.048c 0.289-0.437, 0.336-0.97, 0.125-1.468c-0.238-0.565-0.549-4.055, 3.711-7
-		c 2.324-1.604, 3.27-3.171, 2.807-4.647c-0.611-1.968-3.436-2.849-8.477-2.562l-13.854-2.103l-1.15-0.013
-		c-7.268,0-15.475,0.144-18.686,0.335l-0.324,0.009c-0.33,0-0.652-0.029-0.961-0.079c-0.74-0.337-1.527-0.616-2.299-0.818
-		c 0.283-0.249, 0.459-0.568, 0.457-1.005l 0.008-0.448l-0.086-2.526l-0.863-0.216c-0.133-0.036-0.207-0.075-0.236-0.097
-		c 0.049,0.010, 0.148-0.198, 0.479-0.502l 0.934-0.847c 2.117-1.911, 3.131-2.854, 3.615-3.418c 0.4-0.023, 1.201-0.039, 2.184,0.018
-		c 0.219,0.010, 0.502,0.018, 0.838,0.018c 2.674,0, 9.537-0.416, 12.283-1.067c 0.34-0.082, 0.766-0.173, 1.248-0.272
-		c 4.398-0.937, 8.439-1.964, 9.568-4.222c 0.389-0.779, 0.393-1.633, 0.006-2.464c-1.324-2.853-2.514-11.216-2.58-12.678
-		c 0.328-0.733, 0.469-1.145, 0.131-1.664l-0.35-0.543l-1.305-0.004l-0.123,0.2c-1.465,0.216-6.793,0.622-13.008,0.696l-0.312,0.045
-		l-11.551,3.31c-7.842,1.91-13.008,2.936-13.705,2.941c-0.084-0.026-0.67-0.055-1.504-0.089c-1.463-0.055-3.785-0.142-5.98-0.427
-		l-0.076-2.598c 0.014-0.489-0.002-1.375-0.018-2.108l 0.045-1.205l-0.674-0.344c-0.357-0.183-0.986-0.396-2.648-0.396
-		c-3.080,0-8.469,0.739-13.725,1.88c-3.008,0.651-18.021,4.212-17.977,10.216c 0.068,1.202, 0.598,2.040, 1.023,2.716
-		c 0.377,0.6, 0.607,0.99, 0.629,1.447l-0.004,0.269c-0.596,0.76-0.895,1.571-0.824,2.272c 0.045,0.418, 0.215,0.788, 0.492,1.066
-		c 0.045,0.219, 0.041,0.583-0.006,0.842c-1.766-0.201-9.346-1.904-15.385-4.201l-0.404-0.075l-20.977-0.297
-		c-6.656-1.268-15.354-7.484-18.795-13.56c-0.193-0.344-4.869-8.503-12.564-13.88c-16.727-10.921-16.754-28.274-16.752-28.446
-		c 0.078-8.151, 0.816-14.585, 1.314-15.609c 0.268-0.555, 1.213-3.982, 1.33-5.82c 0.445-0.792, 3.324-5.571, 6.828-11.18
-		c 0.088-0.137, 8.75-13.791, 18.656-13.791c 1.008,0, 2.010,0.145, 2.977,0.428c 4.127,1.211, 7.793,1.434, 11.338,1.654
-		c 3.715,0.229, 7.555,0.465, 12.062,1.835c 19.824,6.013, 19.824,6.013, 20.033,6.013L 196,206.551 l-0.967-1.755
-		c-2.793-5.072-3.080-8.238-2.607-9.043c 0.051-0.083, 0.094-0.155, 0.338-0.155l 0.584,0.044c 4.451,0, 13.908-12.593, 16.756-17.38
-		c 0.639-1.079, 15.566-26.642, 3.314-44.479c-10.979-15.982, 11.791-45.082, 12.021-45.375c 4.707-5.939, 11.164-9.931, 14.238-9.931l 0.074,0 
-		c 3.383,0.069, 18.213,3.017, 25.152,6.017l 0.641,4.975l 0.342,0.296c 5.396,4.649, 12.895,10.119, 17.176,12.553l 0.137,12.398
-		c 0.41,9.271, 8.262,12.714, 8.598,12.854c 7.256,3.081, 11.934,7.191, 12.094,8.782c 0.225,2.226-2.621,12.918-6.189,19.114
-		c-0.395,0.686-3.398,7.084, 12.391,20.396c 8.416,7.617, 28.025,25.359, 29.049,41.585c-1.785-0.429-5.709-1.85-11.166-4.437
-		c-0.186-0.088-4.604-2.15-9.777-2.152c-5.939,0-10.477,2.748-13.119,7.951c-0.623,1.226-0.754,2.516-0.879,3.765
-		c-0.1,0.988-0.193,1.92-0.525,2.762c-0.895,2.274-2.59,4.418-4.387,6.691c-1.582,2.001-3.217,4.067-4.355,6.332
-		c-1.488,2.957-2.543,6.091-3.561,9.123c-1.164,3.461-2.266,6.73-3.965,9.802c-4.131,7.469-5.535,11.254-5.594,11.413
-		c-3.545,9.66-3.193,10.161-2.822,10.692l 0.352,0.507l 0.656,0.021c 0.771,0, 1.176-0.669, 1.395-1.026
-		c 0.605-0.999, 2.502-1.813, 3.467-1.844c 1.004,2.46, 1.146,2.781, 2.008,2.781l 0.564,0 l 0.717-0.88l-0.135-0.72
-		c 0.023-0.531, 1.242-4.085, 3.133-7.295c 1.713-2.909, 7.287-10.687, 11.357-16.367l 1.469-2.049c 0.053-0.072, 1.322-1.86, 5.363-8.626
-		c 0.479-0.807, 2.225-5.634, 2.752-7.092c 2.51-6.987, 4.854-11.79, 5.645-12.714c 0.035-0.002, 0.076-0.002, 0.129-0.002
-		c 1.406,0, 5.119,0.871, 8.895,2.334c 4.338,1.673, 15.211,6.866, 16.055,7.452l 0.023-0.030c 1.656,1.505, 7.826,4.57, 11.668,6.406
-		c 5.178,2.473, 9.295,11.416, 10.072,13.711c-0.215,0.229-0.461,0.517-0.758,0.891c-0.531,0.326-1.51,1.012-3.561,2.451
-		c-1.658,1.163-4.25,4.396-5.15,6.241c-0.988-0.257-3.23-1.237-5.986-3.559c-1.061-0.896-2.205-1.351-3.4-1.351
-		c-2.527,0-4.373,2.047-5.049,2.924c-0.455,0.597-1.484,2.086-1.213,3.111c 0.059,0.216, 0.043,0.667,0,1.029
-		c-2.232,1.059-7.059,5.751-10.182,9.675c-0.275,0.345-2.646,3.438-1.498,5.814c 0.674,1.4, 2.299,2.111, 4.828,2.111l 0.27-0.003
-		c 4.279-0.16, 5.631-3.115, 6.719-5.486c 0.506-1.102, 0.982-2.142, 1.682-2.875l 4.996-4.897c 1.176,0.131, 2.443,0.197, 3.777,0.197
-		c 5.020,0, 10.123-0.926, 12.998-2.361c 3.191-1.587, 9.914-3.742, 11.377-4.1c 1.23,0.413, 3.369,0.544, 3.395,0.544l 0.002,0 
-		c 2.053,0, 7.543-2.75, 9.012-5.093c 0.533-0.854, 2.527-2.301, 3.984-3.358c 2.221-1.611, 2.93-2.159, 3.049-2.967l 0.070-0.496l-0.322-0.49
-		c-0.080-0.104-0.186-0.226-0.303-0.362c-0.484-0.552-0.938-1.124-0.744-1.488c 0.223-0.385, 1.848-1.048, 3.117-1.048
-		c 0.107,0, 0.186,0.007, 0.238,0.011c 0.262,0.263, 0.627,0.648, 0.986,1.025c 1.408,1.485, 1.525,1.604, 2.086,1.616
-		c 0.504-0.076, 1.6-0.002, 1.779-4.031c 0.070-1.561, 1.318-11.379, 2.779-18.437l 3.547-7.246c 1.814-5.675, 3.551-8.343, 4.33-9.028
-		c 1.027,1.944, 2.395,7.613, 2.387,12.411l 0.061,4.611c-0.109,4.636, 3.070,8.138, 3.207,8.284c 7.857,8.529, 9.686,9.854, 10.34,10.060
-		c 0.064,0.056, 0.131,0.124, 0.193,0.185c 0.336,0.317, 0.713,0.678, 1.281,0.678l 0.754,0 l 0.193-0.366c 0.322-0.093, 0.92-0.194, 1.344-0.194
-		l 0.297,0.013c 0.895,0, 3.188-0.718, 5.17-7.361c 0.529-1.772, 1.113-3.336, 1.654-4.602c 0.287-4.183, 0.486-8.39, 0.486-12.645
-		C 438.797,123.204, 356.795,41.202, 256,41.202z M 331.523,326.892c-0.020,0.353-0.148,3.485, 1.518,5.25
-		c 2.434,2.574, 6.943,0.842, 13.439-5.826l 1.182-1.215l-1.545-0.691c-0.652-0.291-7.721-0.648-10.873-0.756
-		c 0.625-0.625, 1.525-1.226, 2.457-1.848c 1.83-1.224, 3.863-2.582, 4.664-4.688c 1.895,0.312, 3.674-0.174, 4.475-1.116
-		c 0.734-0.865, 1.018-2.565, 0.586-3.495c-0.252-0.546-0.742-0.873-1.312-0.873l-1.902,0.178c-0.021-0.601, 0.164-1.007, 0.281-1.054
-		c 1.898-0.811, 2.646-5.986, 2.689-7.379l 0.516-2.881l-1.111-0.241c-0.844-0.186-1.785-0.277-2.797-0.277
-		c-6.043,0-14.861,3.521-15.703,10.128l-0.178,1.389l 1.814-0.071c 0.197,0.028, 0.361,0.164, 0.477,0.483
-		C 330.383,312.426, 331.951,319.456, 331.523,326.892z M 310.115,319.389l 0.088-0.157l 0.57-1.039l-0.266-0.146l-0.494-0.066l-0.373,0 
-		l-0.35,0.224l-3.094,2.156l 3.771,0 c-0.068,0-0.17,0-0.336-0.091L 310.115,319.389z M 289.629,281.819l 0.969-0.039l 0.119,0.116
-		l 0.826,0.808l 0.469-0.374l-0.043-1.208l-1.898-1.278l-0.412,1.634l 0.936,0.297L 289.629,281.819z"  />
-<glyph unicode="&#xe1f5;" d="M 255.998,430.503c-117.223-0.014-212.225-93.63-212.236-209.151l0-73.13 l 33.453,0 l0,73.13 
-		c 0.012,48.708, 19.986,92.648, 52.367,124.58c 32.404,31.911, 76.992,51.598, 126.416,51.604c 49.428-0.005, 94.018-19.692, 126.42-51.604
-		c 32.379-31.931, 52.355-75.872, 52.365-124.58l0-73.13 l 33.453,0 l0,73.13 C 468.227,336.873, 373.223,430.489, 255.998,430.503zM 388.91,254.012l-43.994,0 c-6.758,0-12.234-5.399-12.234-12.054l0-132.64 c0-6.661, 5.477-12.060, 12.234-12.060l 43.994,0 
-		c 6.756,0, 12.232,5.399, 12.232,12.060l0,132.64 C 401.143,248.613, 395.666,254.012, 388.91,254.012zM 167.088,97.254c 6.756,0, 12.232,5.399, 12.232,12.059L 179.32,241.953 c0,6.655-5.477,12.054-12.232,12.054l-43.994,0 
-		c-6.758,0-12.234-5.398-12.234-12.054l0-132.639 c0-6.66, 5.477-12.059, 12.234-12.059L 167.088,97.255 zM 272.998,86.26l-39.012,0 c-8.496,0-15.383-6.789-15.383-15.161l0-20.636 L 77.217,50.463 l0,39.025 L 43.762,89.488 l0-71.992 l 190.225,0 l 18.857,0 l 20.154,0 
-		c 8.494,0, 15.381,6.788, 15.381,15.16l0,38.442 C 288.379,79.471, 281.492,86.26, 272.998,86.26z"  />
-<glyph unicode="&#xe1f6;" d="M 242.904,201.493c-1.807-0.161-11.916-6.335-8.254-6.673c 1.338-0.057, 1.338-0.057, 1.338-0.057
-		c 0.861,2.479, 1.758,4.312, 1.992,4.072c 0.236-0.245, 0.768-0.436, 0.865-0.336c 0.096,0.099, 0.355,0.2, 0.469,0.058
-		c 0.117-0.146, 0.98-0.11, 1.006,0.084c 0.023,0.19, 0.367,0.572, 0.725,0.559c 0.361-0.013, 1.141-0.178, 1.217-0.398
-		s-0.221-2.18-0.756-4.036c0,0,0,0, 2.932-1.561c 0.273,0.024, 0.273,0.024, 0.273,0.024c 0.535,0.032, 1.029-0.134, 1.096-0.372
-		c 0.066-0.239, 0.709-0.254, 1.1-0.084c 0.393,0.172, 0.104,2.303-0.787,3.748c0,0,0,0, 1.721,1.021c 0.16-0.229, 0.16-0.229, 0.16-0.229
-		c 0.262-0.336, 0.48-0.601, 0.486-0.588c 0.006,0.015, 0.203-0.419, 0.455-1.021c 0.25-0.604, 2.334,2.125, 4.303,6.196c0,0,0,0-3.691,4.126
-		c-0.312,0.324-0.982,0.971-1.861,0.975C 246.838,205.285, 243.076,202.876, 242.904,201.493zM 230.014,223.143c 0.436,0.642, 1,0.88, 1.701,0.718c 0.068-0.905-0.273-1.644-1.025-2.212
-		c-0.037-0.385-0.037-0.385-0.037-0.385c 0.941-0.622, 2.012-0.985, 2.381-0.806c 0.367,0.18, 1.746-0.226, 2.174-0.836
-		c 0.428-0.611, 2.387-0.993, 2.219-0.657c-0.166,0.337, 2.051,0.394, 4.035-0.846c0,0,0,0, 0.969-1.856
-		c 0.537,0.35, 0.762,0.838, 0.678,1.473c-0.535,1.041-1.305,1.483-2.316,1.318c 0.057,0.387, 0.057,0.387, 0.057,0.387
-		c 0.465,0.476, 0.721,0.895, 0.568,0.929c-0.154,0.036-0.627-0.008-0.859-0.21c-0.23-0.206-0.965,0.176-1.188,0.825
-		s-2.211,1.187-2.602,1.043c-0.391-0.146-0.773-0.66-0.789-0.769c-0.014-0.111-0.633,0.392-1.355,1.276
-		c-0.725,0.887-0.475,5.782, 0.389,8.937c0,0,0,0-0.088,5.059c-0.369-0.176-0.369-0.176-0.369-0.176
-		c-0.756-0.471-1.518-0.434-1.689,0.083c-0.17,0.521-3.197-3.75-5.057-9.559c0,0,0,0-0.277-1.785
-		C 227.514,224.622, 229.648,223.133, 230.014,223.143zM 229.721,248.213c 2.982,0.271, 5.979,9.8, 2.641,10.106C 229.281,258.082, 224.854,248.33, 229.721,248.213zM 229.414,159.134c 1.707-0.114, 0.857,1.878, 0.873,3.034c 0.012,0.712-0.064,1.545, 0.338,2.184
-		c 0.199,0.319, 1.869,1.25, 1.854,1.155c-0.51-2.762-0.51-2.762-0.51-2.762c 1.043-2.154, 2.762-3.742, 3.818-3.529
-		c 1.061,0.213, 1.312,2.551, 0.457,3.355c0,0,0,0-0.025,0.513c-0.008,0.17-0.008,0.17-0.008,0.17c 0.229,0.257, 0.1,2.012-0.291,3.904
-		c0,0,0,0-0.275,1.809c-0.217,1.419-0.705,1.354-1.273,2.258c-0.885,1.397-1.068,3.058, 0.631,4.23
-		c 0.891,0.611, 2.236,0.426, 3.264,0.328c 0.65-0.060, 1.479-0.484, 2.242-0.694c 0.383-0.102, 0.748-0.151, 1.068-0.075
-		c 1.471,0.35, 1.471,0.35, 1.471,0.35c 1.377,2.267-0.152,4.212-3.4,4.323c0,0,0,0-3.291,0.622c-3.047,0.574-4.676-0.645-6.348-3.176
-		c-1.832-2.778-4.662-7.357-4.307-10.783C 225.871,164.72, 227.289,159.278, 229.414,159.134zM 245.271,208.449c0,0,0,0, 0.422-0.68c 0.26,0.056, 0.26,0.056, 0.26,0.056c 0.463-0.041, 0.838,0.779, 0.83,1.823
-		c0,0,0,0-0.744,0.858c 0.453,0.032, 0.453,0.032, 0.453,0.032c 0.77-0.036, 1.508,0.142, 1.637,0.394c 0.131,0.252, 0.234,1.127-0.004,1.39
-		c-0.236,0.263-0.371,0.754-0.299,1.092c 0.070,0.338-0.047,1.082-0.201,1.085c-0.152,0.004-0.438,0.187-0.408,0.417
-		c 0.027,0.228-0.293,0.752-0.754,0.885c-0.461,0.135-0.836,0.243-1.834,0.215c-0.264,0.015-0.264,0.015-0.264,0.015
-		c-0.5-0.229-0.297-0.774, 0.451-1.207c 0.748-0.435, 0.633-2.748-0.094-3.291c0,0,0,0-0.99,0.382
-		c-0.043-0.148-0.043-0.148-0.043-0.148c-0.020-0.269, 0.143-0.786, 0.359-1.156C 244.268,210.238, 245.311,209.237, 245.271,208.449zM 234.543,218.72c 0.143-0.176, 1.045-0.067, 1.24-0.018C 235.627,218.86, 234.746,218.767, 234.543,218.72zM 260.752,280.763c 0.113-0.167, 0.268-0.283, 0.395-0.428c-0.275-0.433-0.576-0.871-0.928-1.315c0,0,0,0, 3.414-0.251
-		c-0.004,0.038-0.002,0.047-0.004,0.082c 0.092-0.025, 0.174-0.060, 0.27-0.080c 0.031-0.102, 0.057-0.168, 0.094-0.295
-		c 0.822,0.038, 1.24,0.061, 1.451,0.070c 6.576-0.414, 17.014,4.687, 20.672,6.51c 4.863,2.416, 12.641,2.48, 15.438,7.515
-		c 3.273,5.893-0.68,11.59, 1.615,16.539c 0.551,1.187, 1.496,2.332, 2.955,3.426c 0.457,0.132, 0.912,0.268, 1.314,0.457
-		c0,0,0,0, 3.289,1.753c-0.332,0.12-0.332,0.12-0.332,0.12c-0.105,0.113-0.193,0.226-0.285,0.337c 2.465,1.612, 2.475,1.62, 2.475,1.62
-		c 4.463,5.446, 5.299,9.272, 1.859,8.497c0,0,0,0-3.221,0.287c-2.092,0.188-3.406,2.16-5.906,2.169
-		c-4.143,0.016-6.053-2.315-7.26-5.93c-0.57-1.711-0.742-3.521-0.744-5.38c-0.57-0.693-0.996-1.144-1.121-1.146
-		c-0.23-0.010-0.648,0.037-0.604-0.006c 0.047-0.039, 0.021-0.037-0.143,0.061c-0.164,0.101-0.67-0.688-0.881-1.906
-		c0,0,0,0-1.471-0.661c 0.76-0.834, 0.99-1.836, 0.693-3.008c 1.199-0.154, 2.287,0.253, 3.26,1.219c-2.412,2.436-1.73,2.001, 0.385,2.246
-		c 0.295-4.694, 0.855-9.469-1.754-13.424c-5.828-8.84-17.25-7.457-25.988-9.477c-1.936-0.446-5.396-2.057-7.57-4.135
-		c-1.072-0.19-1.936-0.706-2.062-1.874c-0.020-0.37-0.020-0.37-0.020-0.37c 0.115-0.067, 0.24-0.125, 0.359-0.187
-		C 260.031,282.808, 260.068,281.779, 260.752,280.763zM 106.168,199.697c-0.023-3.873, 6.387-0.714, 0.998,9.275C 107.195,205.424, 106.039,203.056, 106.168,199.697zM 249.613,288.726c 0.090,0.137, 0.16,0.598, 0.148,1.236C 249.582,289.049, 249.514,288.583, 249.613,288.726zM 291.814,149.445c0,0,0,0, 0.486-0.009c 3.975,0.098, 5.488-3.435, 10.248-2.719c 0.299,2.363, 1.996,5.071, 4.719,5.265
-		c 6.912,0.197, 11.346-12.1, 18.332-6.601c-3.107-0.361-10.178,5.524-10.277,8.582c 0.668,3.696, 3.463,1.435-1.057,3.242
-		c-3.584,1.736-14.512,7.274-17.287,9.156c 0.023,0.020, 0.023,0.020, 0.023,0.020c-0.010,0.054-0.197,0.152-0.416,0.219
-		c0,0-0.020,0.025-0.088,0.113c 0.068-0.087-3.68,0.321-8.365,0.908c0,0,0,0-0.375,2.141c-2.207-0.23-6.438-5.924-8.477-5.938
-		c-3.449,0.194-3.816,5.064-3.77,6.975c-0.877,0.188-10.977,4.192-11.184-0.829c 0.059-3.682, 8.188-3.297, 9.764-3.121
-		c-0.873-1.3-0.873-1.3-0.873-1.3c-2.695-0.356-3.689-1.415-2.207-2.354c0,0,0,0-0.178-1.919c 0.062-0.262, 0.062-0.262, 0.062-0.262
-		c 0.578-0.023, 1.369,0.195, 1.754,0.483c 0.385,0.29, 1.023,1.281, 1.027,1.085c 0.002-0.196, 5.182-3.671, 11.545-7.415
-		c0,0, 1.352-0.793, 4.24-3.556c-0.482-0.294-0.482-0.294-0.482-0.294C 287.703,150.28, 288.979,149.44, 291.814,149.445zM 296.445,166.779c 0.029-0.039, 0.035-0.043, 0.053-0.065l 0.006,0 C 296.504,166.713, 296.504,166.713, 296.445,166.779zM 307.787,131.572c-0.346,0.151-0.346,0.151-0.346,0.151c-1.67,0.35-3.717,3.568-4.543,7.157c0,0,0,0-1.262,3.125
-		c-6.541-3.413-0.182-18.849-8.664-19.665c-2.379-0.135-14.18,5.102-14.156,6.846c 0.023,3.204, 1.396,5.46, 4.117,6.778
-		c-0.014,0.635-0.014,0.635-0.014,0.635c-1.16,0.553-6.002,0.447-10.762-0.232c0,0,0,0-4.385,2.79
-		c 0.217-1.139, 0.217-1.139, 0.217-1.139c 0.955-0.574-1.117-2.405-4.605-4.073c0,0,0,0-4.227-5.777
-		c-0.145,0.124-0.145,0.124-0.145,0.124c-0.828,0.333-1.928,0.519-2.439,0.413c-0.514-0.107-1.812-0.115-2.148,0.825
-		c-0.338,0.938-3.338,1.431-4.139,0.922c-0.799-0.512-5.035-1.585-5.693-2.267c-0.656-0.682-1.604-3.853-2-3.766
-		c-0.395,0.085-1.615,0.052-1.619-0.595c-0.002-0.649-1.457-1.66-1.752-1.394c-0.293,0.272-1.908,0.304-2.85-0.994
-		c0,0,0,0, 0.285-1.502c-0.209-3.803-22.535-10.082-25.756-10.438c-0.047,0.269-0.047,0.269-0.047,0.269
-		c-0.057,0.333-0.355,0.54-0.664,0.461c-0.309-0.078, 0.221-5.52, 1.197-11.227c-0.299,0.158-0.305,0.16-0.305,0.16
-		c-0.387,0.512-0.789,0.77-0.896,0.571c-0.105-0.199, 1.613-6.372, 4.053-13.341c0,0, 1.248-3.565, 1.275-5.885
-		c 1.107-7.393, 27.428,2.174, 30.209,2.552c 7.148,0.973, 13.764,3.582, 21.027,2.626c 3.207-0.425, 7.572-6.722, 8.951-6.73
-		c 2.197,0.152, 2.197,0.152, 2.197,0.152c 2.59,2.893, 4.525,4.203, 4.297,2.911c-0.227-1.292-1.346-2.81, 0.676-2.622c0,0,0,0, 0.182,1.46
-		c 0.377-0.27, 0.377-0.27, 0.377-0.27c 0.26-0.576, 0.359-1.279, 0.221-1.561c-0.137-0.283, 0.373-0.946, 1.578-0.808c0,0,0,0, 1.025,0.486
-		c 2.158-7.792, 12.672-6.31, 18.674-5.63c 1.479,3.060, 1.479,3.060, 1.479,3.060c 4.805,1.602, 8.738,2.907, 8.738,2.901
-		c0-0.003, 3.729,4.749, 8.277,10.562c0,0, 2.68,3.427, 3.252,17.714c-0.885,0.743-7.762,6.41-7.725,6.285
-		C 318.916,113.803, 307.199,131.949, 307.787,131.572zM 211.070,147.573c 1.395,0.055, 1.395,0.055, 1.395,0.055c 0.547-0.466, 1.232-0.67, 1.523-0.447s-3.115,1.743-7.779,2.962
-		c0,0,0,0-1.809,1.547c 0.186-0.074, 0.186-0.074, 0.186-0.074c 2.195,0.397, 1.562,1.443-1.404,2.326c0,0,0,0-4.029,0.151
-		c-4.68-0.046-9.916,2.438-14.539,2.11c-0.504,0.087-0.504,0.087-0.504,0.087c-1.18-1.225, 3.736-3.612, 10.924-5.307
-		c0,0, 11.49-2.705, 16.064-4.47C 210.992,146.76, 210.807,147.591, 211.070,147.573zM 306.537,69.974c-0.814-0.276-1.48-0.501-2.65-0.68c-0.074-0.024-0.074-0.024-0.074-0.024
-		c-2.738-0.365-1.18-2.666, 3.467-5.11c0,0,0,0, 1.322,4.718c 0.182,0.935, 0.182,0.935, 0.182,0.935
-		C 308.361,70.174, 307.352,70.25, 306.537,69.974zM 342.604,157.058l 0.098-0.046c0,0,0,0, 0.002,0.002c 0.002,0.003-0.012,0.009-0.029,0.016
-		C 342.656,157.038, 342.639,157.045, 342.604,157.058zM 319.51,158.428c 0.143,0.013, 0.291,0.064, 0.438,0.085C 319.664,158.666, 319.475,158.689, 319.51,158.428zM 330.154,163.208c-2.135-0.162-6.33-4.092-10.207-4.695c 0.672-0.365, 1.941-1.557, 2.414-1.973
-		c 0.076,0.005, 0.076,0.005, 0.076,0.005c-0.135,0.095, 3.543,0.895, 8.17,1.78c0,0,0,0, 0.359,3.395
-		C 331.002,162.22, 330.67,163.206, 330.154,163.208zM 192.256,178.107c 0.262-2.734, 2.695-3.839, 3.299-5.439c-1.871-5.429, 3.416-5.827, 6.297-6.24c 0.1-0.331, 0.1-0.331, 0.1-0.331
-		c 0.086-0.729, 0.309-1.44, 0.494-1.578s 5.656-0.321, 11.852-0.328c0,0,0,0, 6.947,13.459c 1.326,0.161, 2.562,0.605, 3.713,1.335
-		c-2.102,0.135-2.102,0.135-2.102,0.135c-1.76,4.017-3.080,7.461-2.93,7.659c 0.152,0.194, 0.457,0.617, 0.357,0.829
-		c-0.1,0.213, 0.422,0.944, 1.299,1.316s 1.684,1.009, 1.559,1.12c-0.125,0.11, 0.33,0.469, 1.031,0.586
-		c 0.701,0.119-0.484,2.565-2.66,4.292c-2.174,1.729-7.406-0.724-13.084-5.442C 208.428,189.479, 192.26,176.049, 192.256,178.107zM 175.705,174.25c 0.15,0.447-0.195,1.367-0.768,2.045c0,0,0,0-0.865-0.172c 0.070,0.139, 0.070,0.139, 0.070,0.139
-		c 0.068,0.227-4.633,4.139-10.443,8.691c0,0-10.662,8.359-14.512,8.697c-0.184-2.271, 10.801-16.45, 12.893-17.62
-		c 0.174-0.246, 0.174-0.246, 0.174-0.246c 0.854-0.209, 4.33-5.743, 7.73-12.299c0,0, 3.084-5.951, 9.572-6.861
-		c 0.594-0.051, 2.879,0.157, 2.893,1.383c-0.494,5.531-6.787,12.417-6.875,15.965C 175.705,174.25, 175.705,174.25, 175.705,174.25zM 256,430.477c-96.727,0-177.902-66.514-200.324-156.296c-0.191-0.513-0.383-1.030-0.57-1.562
-		c-0.521-1.465-0.797-3.17-0.924-4.875c-3.043-14.1-4.658-28.731-4.658-43.743c0-114.034, 92.443-206.478, 206.477-206.478
-		S 462.477,109.966, 462.477,224C 462.477,338.034, 370.033,430.477, 256,430.477z M 256,41.203c-100.795,0-182.797,82.003-182.797,182.798
-		c0,10.145, 0.867,20.087, 2.463,29.785c 1.285-0.59, 2.594-1.421, 3.133-2.233c 1.047-1.577, 5.203-4.563, 4.818-5.123
-		c-0.387-0.561-1.342-2.918-0.34-5.311c0,0,0,0, 2.371,0.006c 2.688,0.097, 2.688,0.097, 2.688,0.097
-		c 0.713,2.012, 1.273,2.436, 1.246,0.938c-0.027-1.497-0.201-5.558-0.217-5.549c-0.016,0.008, 1.158-5.883, 2.602-13.123l 4.057-7.659
-		c 2.656-6.889, 5.564-11.027, 6.459-9.193c 0.895,1.832, 3.855,5.846, 3.838,8.533c-0.018,2.686, 4.062,13.237, 9.309,17.455
-		c 5.246,4.219, 13.801,13.307, 15.918,12.974c 2.115-0.334, 6.754-1.672, 10.057-8.277c0,0, 5.146-10.296, 6-10.318
-		c 2.998,0.045, 2.998,0.045, 2.998,0.045c 1.617,2.594, 3.182,4.239, 3.479,3.651c 0.293-0.587, 1.842-5.857, 1.828-11.51
-		c-0.016-5.648, 3.115-12.216, 3.012-12.214c-0.1,0-0.6-0.742-0.891-1.654c-0.287-0.914, 0.98-8.149, 2.717-13.977
-		c 1.738-5.828, 15.162-8.919, 13.52-5.736c0,0,0,0, 0.031,3.348c-0.154,5.21-0.154,5.21-0.154,5.21
-		c-6.086,4.151-11.021,7.557-10.969,7.57c 0.055,0.015-1.281,3.965-2.99,8.843c-1.707,4.881, 6.439,5.314, 10.25,0.779
-		c 3.812-4.535, 9.488-7.964, 10.232-7.272c 0.74,0.691, 1.33,2.25, 1.404,1.87c0,0,0,0, 0.17-0.004c 1.197,0.012, 1.197,0.012, 1.197,0.012
-		c 4.398,3.437, 4.9,11.433, 1.111,17.771c0,0-3.834,6.413-4.041,14.038c 0.096,5.1, 0.096,5.1, 0.096,5.1
-		c 4.201,2.479, 9.223,3.269, 11.156,1.752s 9.219,0.236, 15.6,3.946l 16.557,26.255c 3.588,6.455, 6.543,11.756, 6.562,11.784
-		c 0.023,0.027, 0.037,0.046-0.016,0.034c-0.053-0.009-0.164,0.345-0.186,0.744c-0.023,0.4-1.488,1.892-3.232,2.58c0,0,0,0-0.010,1.411
-		c 0.111,3.695, 0.111,3.695, 0.111,3.695c 5.842,1.174, 9.438,2.354, 7.99,2.62c-1.447,0.267-4.564,2.054-4.879,1.121
-		c-0.318-0.935-1.568-1.821-2.146-1.904c-0.574-0.084-2.537,1.311-3.176,2.495c-0.641,1.183-0.992,4.373, 2.18,6.060
-		c 3.172,1.686, 7.221,2.561, 8.439,1.929c0,0,0,0, 0.004-0.383c-0.043-1.287-0.043-1.287-0.043-1.287
-		c-1.207-1.142-0.473-1.584, 1.641-0.98c 2.109,0.604, 8.656,0.146, 8.641-0.568c-0.014-0.714-1.154-2.54-1.064-2.93
-		c 0.086-0.391, 1.832-0.672, 2.854-0.645c 1.021,0.024, 2.689-3.143, 2.439-3.528c-0.254-0.382-1.4-0.849-1.4-1.067
-		c-0.002-0.217, 0.373-2.059, 0.82-3.754c 0.223-0.844, 0.309-1.652, 0.316-2.287c 0.158,0.79, 0.402,1.911, 0.709,3.302
-		c 0.664,2.994, 4.754,14.655, 7.678,16.702c 2.922,2.046, 10.32,5.352, 10.521,4.131c0,0,0,0, 3.561-0.133
-		c 11.311,0.027, 16.768,15.699, 21.846,22.161c 8.594,11.513-0.814,11.86-0.814,11.86c-7.377,0.274-7.492,1.687-0.252,3.142
-		c0,0, 27.035,5.426, 33.963,4.211c 6.236-0.778, 14.252,0.528, 14.252,0.528c 7.289,1.187, 7.68-0.179, 0.873-3.039
-		c0,0, 7.709,0.495, 4.82-6.206c-2.885-6.698-2.381-10.567, 1.125-8.597c 3.504,1.971, 4.889,9.738, 4.156,9.755
-		c-0.729,0.016, 0.74,2.631, 2.516,4.448c0,0,0,0, 1.885,0.373c 6.361,1.039, 30.688-8.062, 25.346-0.574l 3.045-0.689
-		c 0.219,0.495, 0.414,0.979, 0.586,1.461C 418.449,319.732, 438.797,274.2, 438.797,224C 438.797,123.206, 356.795,41.203, 256,41.203z"  />
-<glyph unicode="&#xe1f7;" d="M 443.742,108.379L 443.742,186.14 c-0.012,51.788-20.942,98.514-54.871,132.463l0,0c-33.954,33.933-80.68,54.868-132.473,54.869l0,0
-		c-51.787-0.001-98.511-20.937-132.468-54.869l0,0c-33.925-33.949-54.859-80.675-54.869-132.463l0,0l0-77.761 l 0.006,0 l-35.060,0 L 34.007,186.14 
-		c 0.012,122.832, 99.562,222.376, 222.391,222.39l0,0c 122.838-0.014, 222.385-99.558, 222.398-222.39l0,0l0-77.761 L 443.742,108.379 
-		L 443.742,108.379zM 408.491,51.986c0-7.080-5.739-12.822-12.82-12.822l-46.099,0 c-7.080,0-12.818,5.742-12.818,12.822L 336.754,193.023 
-			c0,7.077, 5.738,12.818, 12.818,12.818l 46.099,0 c 7.081,0, 12.82-5.741, 12.82-12.818L 408.491,51.986 zM 176.052,51.982c0-7.079-5.737-12.82-12.819-12.82l-46.099,0 c-7.081,0-12.819,5.741-12.819,12.82L 104.315,193.021 
-			c0,7.075, 5.739,12.818, 12.819,12.818l 46.099,0 c 7.083,0, 12.819-5.743, 12.819-12.818L 176.052,51.982 z"  />
-<glyph unicode="&#xe1f8;" d="M 245.627,370.161c-0.154,0-0.352,0.011-0.533,0.017c-0.023-0.006-0.045-0.014-0.070-0.017L 245.627,370.161 zM 256,430.477C 141.967,430.477, 49.523,338.034, 49.523,224c0-114.034, 92.443-206.478, 206.477-206.478
-		S 462.477,109.966, 462.477,224C 462.477,338.034, 370.033,430.477, 256,430.477z M 285.582,396.721c-2.758-8.314-17.109-2.741-23.031-2.755
-		c 4.66,1.821, 11.615,4.223, 15.537,7.107c 2.047,1.509-0.033,2.51, 2.781,3.987c 3.605-0.492, 7.184-1.067, 10.719-1.766
-		c-4.186-1.408-8.166-3.324-11.74-5.692C 281.762,397.31, 283.67,397.013, 285.582,396.721z M 218.574,402.781
-		c-2.711-1.571-8.014-6.727-4.922-9.929c 3.016-3.126, 6.615,1.681, 9.635,3.202c 7.010,3.536, 16.391,3.895, 24.16,5.404
-		c-1.369-3.653-12.467-2.337-16.357-3.755c-4.885-1.778-2.705-3.024-6.121-8.477c 1.461,0.156, 3.041-0.694, 4.516-0.663l0-0.992 
-		c-3.357,0.291-6.564,1.886-7.273-2.091c-4.299,6.447-7.111,5.934-11.682,0.218c 4.529-2.518, 8.971-5.653, 5.402-9.973
-		c-4.342-5.255-6.975,1.212-2.535,3.913c-4.033,1.867-7.191,5.049-10.361,0.99c 1.357,0.131, 2.82-0.558, 4.188-0.552
-		c-0.773-1.108-1.555-4.717-2.285-5.129c-1.742-0.982-8.166,1.175-10.086,1.41c-4.789,0.585-9.521,0.441-14.412,0.194
-		c 0.891-5.979-5.814-0.259-8.262,1.213c 4.424,4.477, 9.799,2.78, 14.91,2.078c 4.275-0.585, 10.598-0.544, 11.098,4.862
-		c-4.656,0.983-6.932,0.702-9.32,4.244c-0.941,1.395-1.566,2.854-1.797,4.311c 9.889,4.043, 20.199,7.253, 30.857,9.52L 218.574,402.779 z
-		 M 73.203,224c0,43.159, 15.068,82.841, 40.172,114.148c 4.311-2.981, 8.879-6.541, 10.646-8.061c 3.082-2.643, 4.588-5.813, 6.527-9.032
-		c 0.102-0.17, 1.799-2.822, 2.477-3.898c 2.102-2.103, 3.781-4.458, 4.252-7.308c 0.57-3.431-0.717-6.287-1.035-9.855
-		c-0.977-10.948, 0.576-21.202, 9.119-28.888c 2.375-2.135, 5.457-3.23, 7.816-5.483c 2.439-2.326, 2.154-3.915, 3.635-6.369
-		c 3.914-6.491, 9.148-12.585, 13.658-18.717c 3.943-5.354, 5.596-4.313, 1.717,1.222c-2.635,3.762-5.91,7.456-8.094,11.494
-		c-0.227,0.423-2.439,5.709-1.719,5.554c 6.102-1.302, 7.346-5.462, 11.307-10.351c 3.908-4.819, 7.23-7.522, 9.508-13.311
-		c 2.658-6.75, 6.709-10.035, 13.359-13.012c 3.271-1.464, 8.611-5.345, 12.111-5.804c 4.117-0.542, 6.312,2.136, 10.211,0.271
-		c 2.604-1.245, 4.59-5.219, 7.812-6.171c 3.088-0.909, 5.141,0.26, 8.027-1.693c 3.451-2.336, 4.664-6.349, 7.902-8.814
-		c 2.32-1.768, 5.668-3.973, 8.623-4.454c 2.121-0.347, 4.447,1.239, 6.559,0.552c 3.785-1.231, 4.66-5.862, 3.514-9.55
-		c-1.275-4.139-5.156-6.698-6.709-10.804c-1.404-3.714-0.508-6.876-0.984-10.416c-0.49-3.661-3.428,0.035-0.494-6.172
-		c 1.373-2.901, 3.381-5.522, 5.137-8.188c 3.463-5.256, 5.945-9.855, 10.611-14.103c 3.295-2.994, 10.494-6.496, 12.129-10.947
-		c 1.451-3.956, 0.248-12.653-0.486-16.833c-1.541-8.739-1.316-19.253-3.729-27.366c-2.35-7.893-5.078-10.25-3.066-18.868
-		c 0.859-3.679, 1.521-1.893-0.004-6.629c-0.445-1.372-0.010-1.918-0.537-3.304c-1.107-2.933-3.727-4.661-4.84-7.69
-		c 4.164-0.198, 3.852-1.644, 2.541-3.293c-4.912-0.398-9.863-0.657-14.877-0.657C 155.205,41.202, 73.203,123.204, 73.203,224z
-		 M 291.49,44.689c-1.18,1.231-2.438,2.512-2.436,3.383c0,0.956, 3.734,5.747, 4.242,6.943c 0.805,1.905, 1.361,6.037, 2.527,7.509
-		c 1.994,2.52, 6.285,1.583, 5.461,6.268c 9.57,0.102, 13.693,1.551, 15.27,11.297c-1.701,0.857-1.363,0.361-1.637,1.846
-		c 0.326-1.767, 7.17,0.713, 7.816-0.523c 0.5-0.952, 9.18,10.906, 10.125,11.903c 2.463,2.604, 4.611,4.579, 6.172,7.707
-		c 0.613,1.227, 1.27,4.964, 2.572,6.786c-0.086-0.319-0.188-0.632-0.311-0.938c 3.090,4.895, 7.018,4.305, 11.482,6.288
-		c 4.438,1.974, 1.232,1.437, 4.494,4.528c 3.881,3.674, 4.764,1.567, 5.867,7.587c 0.816,4.447-0.258,8.503, 1.172,12.518
-		c 1.807,5.064, 6.172,6.715, 9.068,11.019c 2.213,3.285, 4.285,8.645, 1.293,11.943c-2.486,2.743-9.885,5.006-13.24,5.807
-		c-3.951,0.939-8.512,1.023-12.219,2.531c-4.355,1.772-7.977,6.38-10.18-0.778c-0.729,0.516-3.721,2.177-3.721,2.983
-		c0-1.575, 4.23,1.392, 4.824,2.087c-1.816-0.131-8.023-1.519-8.918-0.898c0,0,0-0.006-0.002-0.008
-		c 0.436-0.317, 1.537-0.174, 2.029-0.252c-1.891-1.025-2.295-0.678-2.029,0.252c-0.012,0.011-0.037,0.011-0.049,0.024
-		c 0.010-0.010, 0.041-0.010, 0.051-0.017c 0.521,1.793, 3.568,5.776, 3.631,6.57c 0.33,4.432-6.104,9.477-9.594,10.475
-		c-4.775,1.362-7.479,0.754-11.566,3.75c-4.961,3.633-9.777,7.652-16.066,8.353c-1.332,0.148-2.775-0.581-4.17-0.375
-		c-3.4,0.505-4.527,2.705-7.375,3.42c-3.496,0.881-4.824-2.136-6.914-2.127c-3.074,0.011-3.811,3.235-8.305,0.522
-		c-6.662-4.019-3.041-6.532-10.623-4.6c-4.018,1.021-8.533-1.438-12.373,1.222c-3.459,2.395-4.246,9.032-0.873,11.826
-		c-1.715-1.419-1.654,3.085-2.904,3.906c-1.975,1.306-5.209-0.217-7.49,0.329c-3.090,0.738-4.885,1.021-4.184,4.023
-		c 0.756,3.242, 9.34,12.075, 0.566,11.841c-4.777-0.126-6.301-7.224-11.369-8.261c-5.699-1.166-10.668,0.783-13.615,5.821
-		c-6.152,10.506, 3.613,23.448, 13.582,24.359c 7.801,0.713, 19.215,6.476, 24.928-2.134c 1.66-2.504, 5.76-12.195, 7.869-5.918
-		c 0.641,1.907-1.656,10.203-2.383,13.681c-0.023-0.037-0.053-0.064-0.074-0.1c-0.031,0.372-0.070,0.744-0.113,1.116
-		c 0.035-0.256, 0.104-0.613, 0.188-1.017c 1.588,2.46, 4.152,4.029, 6.178,6.156c-0.262-0.273-0.529-0.537-0.801-0.798
-		c 2.025,1.996, 7.291,4.341, 8.213,7.107c 0.506,1.527-1.797,3.485-0.596,5.601c 0.92,1.622, 3.186,0.972, 4.070,2.044
-		c 1.258,1.533, 1.424,4.072, 2.754,5.689c 1.367,1.664, 4.006,1.878, 5.4,3.144c 3.197,2.903, 4.070,6.209, 7.822,7.987
-		c 3.539,2.394, 7.293,6.484, 11.795,4.63c-1.623-1.857-5.74-2.998-6.938-4.723c-0.818-1.181, 6.111-0.525, 7.049-0.183
-		c 3.902,1.435, 6.992,4.348, 10.264,6.508c 5.674,3.74, 12.244,3.924, 19.084,2.55c 2.096-0.418-3.787,8.049-4.412,8.767
-		c-2.377,2.729-2.969,5.162-6.807,1.627c-1.117-1.029-2.295-4.513-3.086-5.95c-2.426-4.404-1.873-3.837-7.158-6.55
-		c 0.285,0.123, 0.557,0.27, 0.818,0.433c-3.867-0.774-7.555-2.44-9.117,2.343c-0.525,1.596, 1.713,3.931, 0.463,5.54
-		c-2.742,3.539-11.881-3.928-15.094-5.125c 1.67,13.134, 17.207,6.217, 25.488,8.839c 2.266,0.719, 10.736,3.962, 11.211,6.101
-		c 0.701,3.175-6.715,8.323-8.41,9.77c-3.643,3.101-5.578,4.894-7.625,9.728c-2.182,5.146-3.617,10.292-9.076,6.503
-		c-2.037-1.414-0.568-4.483-4.080-4.962c-2.213-0.306-4.475,2.491-5.74,3.804c-1.906,1.981-3.889,6.825-7.389,7.257
-		c-3.004,0.367-11.361,4.776-15.283,1.916c-3.004-2.191, 0.414-10.475, 1.32-13.443c 1.949-6.378, 3.172-6.622-2.254-10.626
-		c-2.656-1.964-4.27,0.137-3.291-5.151c 0.506-2.748, 3.475-3.287, 1.361-5.661c-1.297-1.461-4.406-1.32-5.914-0.614
-		c-4.723,2.211-0.512,5.165-2.771,8.311c-1.688,2.345-10.738,4.264-13.834,5.667c-6.857,3.104-24.939,6.4-19.379,17.019
-		c 1.508,2.882, 7.168,7.13, 9.736,8.785c 2.633,1.694, 5.918,2.165, 8.123,4.513c 1.238,1.317, 1.332,4.953, 2.439,5.859
-		c 1.568,1.283, 6.137,0.69, 8.57,0.602c 10.533,2.11, 0.941,17.409, 14.814,14.639c 3.83-0.765, 7.664-4.646, 10.822-6.81
-		c 3.553-2.432, 4.736-2.152, 3.613-5.869c-0.258-0.86-4.229-4.718-5.24-5.501c-1.85-1.431-4.834-2.091-6.998-2.979
-		c 7.238,0, 10.271,0.354, 16.18-3.57c 5.064-3.362, 8.24-5.607, 14.461-5.357c-0.379,3.024-5.719,1.856-5.51,4.849
-		c 0.176,2.522, 3.389-0.807, 3.803-0.827c 1.723-0.087, 6.215-2.136, 5.234,2.702c-0.863,4.246-10.145,2.22-7.166,9.146
-		c 4.176,0.46, 3.055-4.12, 5.816-5.109c 2.936-1.053, 6.768,2.536, 7.406,5c-4.119,2.104-16.732,5.495-15.316,11.46
-		c 8.416-5.362, 16.826-10.724, 25.238-16.090c-6.816-6.097, 4.957-2.666, 5.68-2.844c 2.002-0.495, 7.115-4.896, 3.77-5.719
-		c-3.479-0.854-5.264,4.166-8.789,0.409c 2.926-0.771, 13.252-1.354, 10.498-6.922c-1.104-2.226-7.742-1.842-9.725-6.193
-		c 1.422,0.272, 2.965-0.154, 4.408,0.22c-3.168-4.933, 1.521-8.195, 4.096-12.138c 2.922-4.479, 7.014-11.34, 12.822-12.768
-		c 12.361-3.034, 10.871,17.063, 20.256,20.243c 2.596,0.881, 5.428,0.238, 8.047,0.973c 2.922,0.824, 4.486,2.931, 6.789,4.521
-		c 5.717,3.948, 10.67,3.96, 17.783,4.174c 0.178,0.006, 0.357,0, 0.537-0.003c 31.178-32.8, 50.375-77.094, 50.375-125.813
-		C 438.799,135.348, 375.354,61.26, 291.49,44.689z"  />
-<glyph unicode="&#xe1f9;" d="M 170.977,259.018L 96.386,259.018 l0,87.949 L 33.43,346.967 l0-245.73 l 62.956,0 L 96.386,204.201 l 74.591,0 l0-102.965 l 62.961,0 l0,245.73 l-62.961,0 L 170.977,259.018 z
-	 M 470.984,269.53c-3.131,14.316-9.050,27.702-17.629,39.955c-10.861,15.422-25.482,26.33-43.125,32.092
-	c-10.525,3.458-23.12,5.163-37.949,5.386L 265.186,346.963 L 265.186,101.23 l 106.986,0 c 0.254,0, 0.518,0, 0.771,0c 36.557-0.003, 65.527,16.162, 83.098,46.78
-	c 13.136,22.679, 19.516,50.065, 19.5,81.719C 475.541,242.442, 474.012,255.708, 470.984,269.53z M 404.667,185.271
-	c-4.099-10.212-9.483-17.264-16.001-21.877c-6.539-4.595-14.473-7.002-24.646-7.030l-36.979,0 L 327.041,291.831 l 36.979,0 
-	c 10.261,0.006, 18.418-1.49, 24.473-4.101c 6.085-2.642, 10.121-6.187, 12.989-11.032c 6.354-10.76, 10.040-27.547, 10.017-50.252
-	C 411.504,210.161, 409.137,196.453, 404.667,185.271z"  />
-<glyph unicode="&#xe1fa;" d="M 343.79,299.979c 1.014,0, 1.954,0.093, 2.797,0.275l 1.111,0.242l-0.516,2.883c-0.045,1.393-0.789,6.567-2.695,7.379
-		c-0.115,0.051-0.295,0.457-0.275,1.055l 1.906-0.18c 0.566,0, 1.056,0.326, 1.311,0.873c 0.432,0.933, 0.144,2.631-0.586,3.494
-		c-0.794,0.946-2.57,1.431-4.476,1.118c-0.807,2.108-2.836,3.466-4.664,4.688c-0.932,0.622-1.834,1.224-2.459,1.848
-		c 3.16,0.108, 10.229,0.466, 10.879,0.758l 1.539,0.694l-1.18,1.212c-6.496,6.665-11.006,8.405-13.44,5.826
-		c-1.666-1.767-1.539-4.899-1.518-5.252c 0.428-7.448-1.14-14.466-1.324-14.981c-0.117-0.326-0.436-0.455-0.473-0.487l-1.821,0.075
-		l 0.178-1.39C 328.925,303.498, 337.748,299.979, 343.79,299.979zM 309.626,317.98L 310.015,317.98L 310.524,318.048L 310.798,318.207L 310.134,319.403L 310.015,319.621L 310.015,320.35L 309.988,319.67L 309.988,319.674L 310.011,320.36L 306.201,320.496L 309.267,318.226 	zM 291.753,280.658L 292.108,282.119L 289.017,285.425L 289.814,280.5 	zM 256.001,430.477C 141.966,430.477, 49.522,338.035, 49.522,224c0-114.033, 92.444-206.477, 206.479-206.477
-		c 114.031,0, 206.474,92.443, 206.474,206.477C 462.476,338.035, 370.033,430.477, 256.001,430.477z M 165.394,336.092l0-0.008 l-0.006,0.008
-		C 165.39,336.092, 165.39,336.092, 165.394,336.092z M 225.442,88.411c-0.232,0.292-23.003,29.392-12.027,45.374
-		c 12.257,17.84-2.672,43.402-3.314,44.482c-2.844,4.786-12.303,17.378-16.754,17.378l-0.58-0.044c-0.246,0-0.292,0.076-0.338,0.156
-		c-0.475,0.805-0.19,3.973, 2.604,9.045l 0.967,1.756l-2,0 c-0.208,0-0.208,0-20.037-6.019c-4.506-1.369-8.346-1.604-12.061-1.834
-		c-3.543-0.218-7.211-0.445-11.336-1.654c-0.971-0.284-1.971-0.428-2.979-0.428c-9.906,0-18.566,13.654-18.656,13.792
-		c-3.553,5.688-6.352,10.332-6.816,11.161c-0.106,1.836-1.068,5.271-1.342,5.839c-0.498,1.025-1.238,7.459-1.312,15.608
-		c-0.002,0.173, 0.068,17.556, 16.75,28.448c 7.695,5.375, 12.369,13.532, 12.566,13.877c 3.438,6.072, 12.137,12.292, 18.795,13.561
-		l 20.973,0.294l 0.404,0.077c 6.041,2.296, 13.619,4.002, 15.385,4.205c 0.047-0.26, 0.053-0.628, 0.006-0.846
-		c-0.275-0.276-0.448-0.646-0.488-1.063c-0.072-0.704, 0.224-1.514, 0.822-2.273l 0.002-0.269c-0.019-0.459-0.25-0.85-0.626-1.447
-		c-0.426-0.675-0.955-1.515-1.024-2.714c-0.046-6.004, 14.967-9.566, 17.979-10.219c 5.255-1.141, 10.645-1.877, 13.725-1.877
-		c 1.66,0, 2.291,0.211, 2.648,0.396l 0.67,0.345l-0.045,1.195c 0.014,0.734, 0.033,1.624, 0.020,2.115l 0.074,2.598
-		c 2.199,0.284, 4.523,0.373, 5.984,0.428c 0.832,0.032, 1.42,0.063, 1.502,0.086c 0.695-0.002, 5.861-1.029, 13.705-2.938l 11.553-3.309
-		l 0.309-0.047c 6.21-0.073, 11.542-0.48, 13.008-0.698l 0.127-0.198l 1.305,0.001l 0.35,0.544c 0.334,0.525, 0.195,0.935-0.133,1.664
-		c 0.066,1.469, 1.258,9.829, 2.582,12.679c 0.383,0.833, 0.383,1.685-0.008,2.464c-1.127,2.257-5.168,3.283-9.566,4.221
-		c-0.482,0.102-0.91,0.192-1.248,0.272c-2.754,0.653-9.616,1.069-12.29,1.069c-0.332,0-0.615-0.007-0.835-0.020
-		c-0.983-0.055-1.784-0.044-2.183-0.015c-0.484,0.562-1.5,1.51-3.631,3.431l-0.918,0.833c-0.324,0.296-0.388,0.546-0.476,0.5
-		c 0.027,0.021, 0.104,0.060, 0.236,0.093l 0.861,0.219l 0.084,2.53l-0.006,0.444c 0.002,0.436-0.173,0.756-0.457,1.006
-		c 0.773,0.2, 1.562,0.48, 2.303,0.818c 0.309,0.051, 0.627,0.079, 0.955,0.079l 0.327-0.009c 3.221-0.188, 11.396-0.335, 18.613-0.335
-		l 1.221,0.015l 13.857,2.1c 5.042-0.284, 7.865,0.594, 8.477,2.562c 0.461,1.478-0.486,3.042-2.807,4.646
-		c-4.26,2.945-3.951,6.436-3.713,7.002c 0.211,0.497, 0.164,1.032-0.125,1.469c-0.482,0.724-1.518,1.047-3.363,1.047
-		c-1.424,0-3.080-0.213-4.213-0.541c-1.895-0.548-3.176-1.914-3.047-3.248c 0.025-0.321, 0.135-0.609, 0.309-0.855
-		c-0.153-0.043-0.314-0.083-0.49-0.118c-0.402-0.081-0.875-0.114-1.367-0.114c-1.873,0-3.475,0.459-3.869,0.778
-		c-0.234,0.189-0.406,0.383-0.528,0.545l 0.276,0.115l-0.192,0.956c-0.15,0.771-0.283,1.436-8.291,1.436
-		c-3.139,0-3.811-0.269-4.205-0.91c-0.432-0.693-0.763-1.691-0.863-2.354c-0.506-0.705-2.715-3.347-6.075-7.092l-0.306-0.433
-		l 0.076-2.775l 0.131-0.691l 0.035-0.021c-0.292-0.258-0.801-0.61-1.553-0.979c-0.837-0.171-1.683-0.47-2.474-0.875
-		c-0.823-0.187-1.551-0.251-2.193-0.175c-0.973,0.119-1.946,0.18-2.901,0.18c-2.238,0-3.428-0.257-4.072-0.574
-		c-0.11,0.028-0.236,0.064-0.369,0.1c-0.98,0.263-2.162,0.517-2.902,0.166c-0.605-0.288-0.994-0.845-1.069-1.527
-		c-0.097-0.929, 0.398-1.863, 0.956-2.46l-0.090-0.167l 0.19-0.557c 0.158-0.472, 0.777-1.528, 1.633-2.324
-		c-0.141-0.063-0.285-0.118-0.418-0.162c-0.206,0.268-0.504,0.403-0.883,0.403l-0.531,0 l-0.352-0.396
-		c-0.375-0.422-0.375-0.422-0.092-2.918c-0.037-0.142-0.734-0.645-2.512-0.645c-0.312,0-0.635,0.016-0.969,0.049l-0.018,2.027
-		l 0.008,0.318c 0.623,0.886, 0.799,1.811, 0.465,2.533c-0.206,0.448-0.594,0.758-1.055,0.852c-0.835,0.478-4.818,3.512-10.539,8.281
-		l-3.469,3.381c-5.422,4.261-12.086,7.467-13.758,7.467l-0.505-0.082c-0.512-0.181-1.715-0.705-1.799-1.689l-0.035-0.812
-		l 0.039-0.021c-0.164-0.493, 0.020-0.938, 0.206-1.316c 0.602-1.225, 3.070-4.974, 6.408-6.098c 2.318-0.781, 4.010-1.457, 4.896-1.87
-		l-0.717-1.629l 1.078-0.479c 1.875-0.834, 3.263-1.54, 4.228-2.070c-0.337-0.293-0.617-0.614-0.792-0.92
-		c-0.387-0.656-0.32-1.196-0.19-1.538c-0.109-0.581-1.018-2.155-1.527-2.614c-0.301-0.27-0.852-0.524-1.206-0.654
-		c-1.097,1.044-3.671,3.373-5.98,5.451c 0.236-0.113, 0.471-0.229, 0.691-0.343l 1.084,2.106c-1.67,0.874-3.663,2.188-5.77,3.58
-		c-5.156,3.408-11,7.268-15.928,7.268c-1.087,0-2.103-0.189-3.018-0.564c-7.373-3.026-11.474-5.302-12.224-6.785l-0.084,0.039
-		c-0.346-0.735-3.801-5.080-5.777-6.097c-0.045-0.024-4.461-2.315-4.65-3.964c-0.375-0.49-1.422-1.642-3.266-3.371
-		c-2.186-2.052-3.371-3.166-4.002-3.842l-2.984-0.177l-0.414-0.103c-2.488-1.115-6.631-1.806-9.047-1.806
-		c-1.039,0-1.386,0.128-1.419,0.142c-1.178,0.481-2.227,0.946-2.875,1.255l 0.107,1.079c 0.148,1.727-0.506,3.323-0.904,4.044
-		c0,0.964, 0.4,4.798, 0.816,6.656c 0.369,1.642, 7.635,11.619, 13.105,11.633l 2.090,0.003c 4.457,0, 7.678-0.033, 8.568-0.051l 0.15-0.101
-		l 1.607,0.363l-0.139,0.774c 0.062,0.133, 0.121,0.272, 0.162,0.383c 0.117,0.314, 0.26,0.708-0.727,2.48
-		c-0.692,1.25-2.594,4.217-5.25,4.768c-1.070,0.223-2.064,0.445-2.895,0.639c 0.588,0.274, 1.25,0.481, 1.902,0.481
-		c 0.002,0, 0.002,0, 0.004,0l 0.266-0.003c 2.006,0, 3.957,0.617, 4.744,1.503c 0.115,0.131, 0.201,0.263, 0.262,0.387
-		c 0.724,0.357, 2.757,1.079, 4.29,1.622c 2.052,0.729, 4.175,1.482, 5.548,2.111c 2.016,0.925, 5.941,2.957, 9.742,4.924
-		c 1.998,1.036, 3.939,2.041, 5.49,2.824c 4.061,2.059, 6.584,5.476, 7.080,7.244c 0.18,0.648, 0.133,1.199-0.057,1.442
-		c-0.072,0.608, 0.971,2.86, 2.039,3.11c 1.186,0.271, 2.729-0.627, 2.953-0.839c 0.027-0.032, 0.056-0.067, 0.080-0.103
-		c-0.195-0.312-0.493-0.759-0.82-1.213c-0.299-0.178-0.533-0.439-0.6-0.84c-0.463-0.668-1.193-1.783-1.252-2.285l-0.062-0.539
-		l 0.734-0.804l 0.531,0 c 0.367,0, 0.81,0.185, 1.174,0.46c 0.26-0.204, 1.037-0.732, 4.412-0.732c 0.555,0, 2.447,0.021, 3.43,0.306
-		c 0.5,0.146, 0.91,0.215, 1.184,0.235c 1.557-0.867, 5.029-1.086, 5.773-1.086c 1.187,0, 2.324,0.132, 3.383,0.392
-		c 3.463,0.855, 6.215,1.384, 6.97,1.489l 0.217,0 c 0.346,0, 8.604,1.759, 10.45,4.471c 0.939,1.381, 3.713,1.935, 5.203,2.233
-		c 0.44,0.086, 0.797,0.161, 1.024,0.229c 1.244,0.367, 2.645,2.218, 2.432,3.682c-0.014,0.094-0.033,0.188-0.061,0.282
-		c 1.193,0.28, 2.697,0.615, 4.176,0.943c 3.391,0.755, 3.732,2.383, 3.631,3.286c-0.23,2.136-3.377,3.685-7.586,3.685l-0.582-0.002
-		c-3.869,0-6.904,0.275-8.205,0.464c-0.102,0.177-0.229,0.342-0.354,0.501c 0.004,0.246, 0.029,0.67, 0.074,1.039
-		c 0.692,0.425, 2.663,1.267, 4.143,1.9c 0.879,0.377, 1.779,0.764, 2.604,1.133c 1.822,0.816, 1.97,1.949, 1.898,2.552
-		c-0.299,2.408-5.061,3.759-9.006,4.469l-1.356,0.243l-0.138-4.775c-0.768-0.651-3.25-2.386-6.184-3.69
-		c-2.371-1.058-3.869-2.739-4.098-4.611c-0.17-1.402, 0.369-2.754, 1.537-3.86c-0.093-0.314-0.658-0.5-1.892-0.793
-		c-1.73-0.412-4.621-1.101-4.594-4.432l-0.030-0.784c-0.602-0.626-2.175-1.841-4.201-2.448c-1.677-0.502-3.635-0.813-5.115-0.813
-		c-0.439,0-0.732,0.028-0.914,0.059c-0.080,0.404-0.113,0.763-0.113,0.863l-0.020,0.003c 0.020,1.521-2.977,4.129-3.010,4.158
-		c-0.398,0.34-0.676,0.702-0.807,0.912l-0.010,0.115c-0.063,0.734-0.631,1.056-1.418,1.5c-0.148,0.083-0.287,0.157-0.338,0.189
-		l-0.471,0.291l-0.424,0 c-0.436,0-1.154-0.126-2.615-0.388c-1.549-0.278-3.666-0.659-5.438-0.813
-		c-2.276-0.196-5.004-0.186-5.568-0.135c-0.496,0.229-0.768,0.142-1.106,0.12c-0.060,0.267-0.148,0.543-0.236,0.817
-		c-0.341,1.055-0.912,2.82-0.332,3.883c 0.268,0.487, 0.79,0.826, 1.596,1.037c 5.193,1.353, 7.187,2.109, 7.936,2.688
-		c 0.342,0.157, 1.041,0.442, 1.955,0.822c 3.092,1.28, 8.268,3.424, 11.809,5.368c 3.949,2.168, 5.75,4.039, 5.359,5.564
-		c-0.020,0.076-0.047,0.153-0.078,0.229c 0.781,0.377, 1.742,0.758, 2.441,0.868c 1.413,0.224, 2.375,0.422, 2.909,0.79
-		c 0.684,0.22, 2.32,0.672, 3.049,0.721c 0.826,0.056, 1.68,0.111, 2.191,0.478c 0.524,0.126, 1.577,0.326, 2.231,0.375
-		c 0.5,0.035, 0.947,0.004, 1.199-0.029l 0.141-0.143l 0.539,0 c 0.498,0, 2.469,0.302, 3.254,0.549c 0.176,0.055, 0.328,0.078, 0.477,0.085
-		l 0.635-0.116c 0.226,0, 0.424,0.052, 1.137,0.248c 0.691,0.189, 1.975,0.541, 2.545,0.567c 0.547,0.024, 1.504,0.067, 1.861,0.791
-		c 0.846,0.275, 2.482,0.659, 4.176,0.531c 1.361-0.102, 2.373-0.354, 2.951-0.554l 0.209-0.765l 1.079,0 c 0.476,0, 2.099,0.096, 2.863,0.384
-		c 0.138,0.053, 0.346,0.092, 0.57,0.108l 0.908-0.103c 0.24,0, 0.482,0.064, 1.004,0.203c 0.652,0.172, 1.74,0.46, 2.496,0.462
-		c 0.686-0.29, 1.805-0.339, 3.562-0.387c 0.125-0.003, 0.263-0.007, 0.398-0.012l-0.011-0.097c-0.141-1.278-0.15-1.354, 12.309-4.136
-		c 6.947-1.552, 14.48-3.403, 17.881-4.454c-2.51-1.229-3.963-0.988-4.047-0.976c-3.247,0.661-5.943,1.011-7.803,1.011
-		c-1.829,0-2.809-0.314-3.283-1.048c-0.293-0.45-0.331-0.998-0.104-1.502c 0.73-1.627, 5.799-3.831, 7.762-3.851
-		c 0.402,0, 1.461,0, 1.746,0.962c 0.077,0.244, 0.077,0.46, 0.026,0.653c 1.291-0.113, 2.757-0.296, 3.695-0.412l 0.781-0.096
-		c 1.352-0.147, 3.071,0.342, 3.575,1.422c 0.010,0.021, 0.016,0.040, 0.025,0.060c 0.741,0.153, 2.19,0.351, 4.092,0.509
-		c 0.689,0.057, 1.764,0.062, 2.755,0.066c 0.981,0.008, 1.885,0.016, 2.338,0.062c 0.695,0.071, 1.283,0.488, 1.609,1.146
-		c 0.109,0.222, 0.187,0.465, 0.234,0.72l 2.006-0.949c 7.020-3.318, 10.662-2.497, 10.662-2.498c 5.983,1.088, 10.932,1.795, 12.139,1.942
-		c 2.584-1.514, 9.273-2.642, 9.355-2.655c 3.52-0.537, 10.846-2.48, 16.73-4.419c 25.562-18.122, 46.281-42.632, 59.82-71.191
-		c 5.715-14.427, 10.215-28.498, 13.507-39.947c 1.766-8.312, 2.965-16.829, 3.557-25.513c-0.551,1.279-1.148,2.875-1.693,4.689
-		c-1.981,6.642-4.273,7.359-5.167,7.359l-0.299-0.014c-0.423,0-1.023,0.104-1.348,0.195l-0.193,0.365l-0.75,0 
-		c-0.572,0-0.947-0.36-1.281-0.678c-0.062-0.062-0.129-0.129-0.194-0.186c-0.652-0.205-2.478-1.527-10.341-10.058
-		c-0.135-0.147-3.312-3.65-3.205-8.284l-0.062-4.611c 0.007-4.795-1.358-10.466-2.383-12.413c-0.781,0.688-2.518,3.357-4.33,9.029
-		l-3.549,7.247c-1.459,7.048-2.707,16.872-2.782,18.437c-0.18,4.030-1.318,4.002-1.791,4.030c-0.553-0.017-0.667-0.139-2.076-1.619
-		c-0.355-0.377-0.721-0.76-0.986-1.021c-0.049-0.007-0.125-0.013-0.234-0.013c-1.271,0-2.895,0.663-3.119,1.047
-		c-0.192,0.365, 0.259,0.936, 0.742,1.489c 0.122,0.139, 0.229,0.263, 0.303,0.362l 0.326,0.49l-0.070,0.495
-		c-0.121,0.809-0.827,1.356-3.049,2.97c-1.455,1.057-3.451,2.503-3.982,3.355c-1.471,2.344-6.963,5.095-9.014,5.095l-0.002,0 
-		c-0.028-0.001-2.164-0.132-3.395-0.544c-1.467,0.356-8.187,2.513-11.376,4.102c-2.875,1.434-7.975,2.358-12.996,2.358
-		c-1.334,0-2.604-0.065-3.78-0.197l-4.996,4.898c-0.702,0.732-1.178,1.772-1.682,2.874c-1.086,2.373-2.439,5.325-6.719,5.486
-		l-0.271,0.002c-2.528,0-4.153-0.71-4.829-2.111c-1.146-2.377, 1.223-5.468, 1.502-5.813c 3.119-3.925, 7.949-8.614, 10.177-9.674
-		c 0.045-0.363, 0.059-0.814,0-1.029c-0.273-1.024, 0.76-2.517, 1.213-3.11c 0.678-0.879, 2.52-2.926, 5.051-2.924
-		c 1.195,0, 2.34,0.453, 3.4,1.348c 2.753,2.324, 4.998,3.304, 5.982,3.561c 0.902-1.846, 3.498-5.077, 5.15-6.238
-		c 2.059-1.447, 3.037-2.134, 3.568-2.459c 0.297-0.375, 0.543-0.664, 0.751-0.887c-0.775-2.297-4.898-11.237-10.072-13.71
-		c-3.84-1.836-10.014-4.902-11.668-6.406l-0.023,0.030c-0.838-0.585-11.709-5.775-16.053-7.455c-3.771-1.46-7.484-2.332-8.896-2.332
-		c-0.053,0-0.096,0.003-0.129,0.004c-0.792,0.924-3.133,5.728-5.646,12.715c-0.521,1.46-2.271,6.285-2.75,7.088
-		c-4.039,6.768-5.311,8.555-5.36,8.627l-1.353,1.885c-4.114,5.74-9.749,13.598-11.473,16.533c-1.891,3.205-3.111,6.761-3.133,7.297
-		l 0.133,0.719l-0.719,0.876l-0.564,0 c-0.861,0-1.002-0.319-2.006-2.778c-0.967,0.027-2.863,0.842-3.469,1.842
-		c-0.217,0.358-0.621,1.025-1.392,1.025l-0.657-0.020l-0.352-0.506c-0.373-0.533-0.724-1.036, 2.823-10.695
-		c 0.058-0.157, 1.46-3.941, 5.593-11.412c 1.699-3.070, 2.801-6.34, 3.963-9.801c 1.019-3.031, 2.074-6.164, 3.562-9.125
-		c 1.139-2.263, 2.775-4.331, 4.355-6.332c 1.797-2.27, 3.492-4.416, 4.384-6.691c 0.336-0.842, 0.428-1.773, 0.53-2.762
-		c 0.125-1.246, 0.253-2.537, 0.879-3.762c 2.641-5.203, 7.177-7.952, 13.119-7.952c 5.172,0, 9.588,2.065, 9.773,2.153
-		c 5.461,2.585, 9.379,4.007, 11.17,4.438c-1.025-16.225-20.637-33.969-29.051-41.587c-15.787-13.314-12.787-19.712-12.388-20.397
-		c 3.566-6.197, 6.414-16.89, 6.187-19.112c-0.16-1.589-4.835-5.701-12.093-8.785c-0.334-0.14-8.192-3.583-8.598-12.853l-0.133-12.396
-		c-4.287-2.437-11.787-7.906-17.18-12.555l-0.344-0.296l-0.641-4.974c-6.941-3.004-21.768-5.949-25.152-6.018l-0.072-1.172l0,0
-		l0,1.171 C 236.605,78.479, 230.15,82.471, 225.442,88.411z"  />
-<glyph unicode="&#xe1fb;" d="M 439.457,168.923c-15.4-6.983-34.010-13.167-55.020-18.197l-1.096,180.839c-30.885,13.931-76.686,22.746-127.782,22.746
-	c-51.129,0-96.927-8.815-127.813-22.746l0-180.825 c-20.963,5.034-39.505,11.218-54.874,18.184l-17.529-38.917
-	c 50.459-22.645, 121.453-35.975, 200.804-36.068c 79.35,0.094, 150.413,13.424, 200.838,36.068L 439.457,168.923z"  />
-<glyph unicode="&#xe1fc;" d="M 256,430.477C 141.966,430.477, 49.523,338.034, 49.523,224c0-114.033, 92.442-206.477, 206.477-206.477
-	c 114.033,0, 206.477,92.443, 206.477,206.477C 462.477,338.034, 370.033,430.477, 256,430.477z M 381.396,347.79l-2.959,0.668
-	c 5.191-7.278-18.457,1.57-24.64,0.56c-1.833-0.362-1.833-0.362-1.833-0.362c-1.726-1.768-3.154-4.311-2.445-4.325
-	c 0.708-0.014-0.635-7.567-4.043-9.482c-3.406-1.915-3.896,1.846-1.092,8.358c 2.805,6.512-4.687,6.033-4.687,6.033
-	c 6.618,2.779, 6.237,4.107-0.849,2.954c0,0-7.793-1.271-13.853-0.515c-6.736,1.182-33.019-4.095-33.019-4.095
-	c-7.039-1.413-6.928-2.786, 0.246-3.052c0,0, 3.832-0.162, 4.25-3.327c 0.955,1.286, 1.779,2.192, 1.889,2.186
-	c 0.142-0.009, 1.945-7.366, 3.553-9.996c 1.607-2.629, 2.252-4.32, 1.432-3.76c0,0,0,0-0.751,0.077c-4.392,0.3-4.392,0.3-4.392,0.3
-	c 1.3-2.624, 2.502-6.093, 2.68-8.192c 0.18-2.1, 3.94-3.142, 8.357-2.313c0,0,0,0, 3.814,1.839c 4.27,2.059, 8.674,1.139, 8.285-1.839
-	c 0.178,0.271, 0.408,0.495, 0.623,0.484c 0.392-0.022, 0.318-0.737-0.165-1.587c0,0,0,0-0.676,0.033
-	c-0.011,0.068-0.018,0.109-0.024,0.154c-0.359-0.888-1.076-1.909-2.262-3.057c-2.572-2.49-8.127-3.148-12.407-4.794
-	c-0.421-0.224-0.427-0.227-0.427-0.227c-0.201-0.095-0.44-0.147-0.656-0.229c-1.75-0.8-3.197-1.824-3.969-3.325
-	c-2.284-4.439, 1.605-11.432-1.096-16.299c-2.717-4.894-10.279-4.955-15.008-7.309c-3.557-1.771-13.704-6.729-20.097-6.324
-	c-0.208-0.012-0.612-0.030-1.409-0.070c-0.037,0.123-0.062,0.191-0.094,0.287c-0.090,0.023-0.171,0.054-0.259,0.078
-	c 0.002-0.033,0-0.043, 0.003-0.080c-3.319,0.241-3.319,0.241-3.319,0.241c 0.345,0.434, 0.636,0.861, 0.905,1.28
-	c-0.127,0.143-0.277,0.255-0.386,0.418c-0.665,0.987-0.701,1.986-0.347,2.948c-0.117,0.059-0.234,0.114-0.352,0.184
-	c0,0,0,0, 0.021,0.359c 0.124,1.134, 0.964,1.634, 2.003,1.821c 0.643,0.615, 1.402,1.182, 2.201,1.693
-	c 0.356,3.067, 16.803,6.602, 18.139,6.715c 0.084,0.025, 1.566,2.184, 1.816,2.242c-0.742-0.636-0.729-1.126, 0.043-1.466
-	c 5.211-0.011, 5.211-0.011, 5.211-0.011c 1.775,5.174, 3.706,10.942, 4.371,11.526c 0.665,0.585, 1.658,0.965, 1.999,0.885
-	c 0.342-0.080, 0.491-0.083, 0.423-0.068s-0.351,0.366-0.625,0.784c0,0,0,0, 0.246,0.048c 0.576-0.016, 1.205-0.804, 1.76-1.775
-	c 0.393,1.849, 0.588,3.766, 0.646,5.725c-0.146,0.076-0.293,0.153-0.473,0.247c-3.111-0.814-4.631,0.414-1.799-2.447
-	c-0.946-0.939-2.003-1.334-3.172-1.183c 0.29,1.139, 0.066,2.112-0.672,2.922c 1.429,0.646, 1.429,0.646, 1.429,0.646
-	c 0.204,1.182, 0.696,1.948, 0.856,1.854c 0.156-0.096, 0.184-0.1, 0.139-0.060c-0.045,0.041, 0.362-0.008, 0.587,0.004
-	c 0.226,0.009, 1.471,1.503, 2.771,3.32c0,0,0,0-0.041,1.048c-0.779,0.613-0.783,1.266-0.012,1.953c 0.004-0.003, 0.006-0.004, 0.010-0.006
-	c-0.688,6.538-1.988,13.072-1.99,18.594c-0.545-1.304-1.412-2.833-2.795-4.684c-4.936-6.282-10.241-21.516-21.234-21.543
-	c-3.463,0.131-3.463,0.131-3.463,0.131c-0.197,1.186-7.388-2.030-10.229-4.018c-2.844-1.99-6.82-13.326-7.465-16.237
-	c-0.299-1.353-0.533-2.441-0.687-3.21c 0.011-0.621-0.058-1.068-0.146-1.201c-0.096-0.141-0.031,0.314, 0.146,1.201
-	c-0.009,0.616-0.095,1.404-0.31,2.226c-0.434,1.647-0.798,3.437-0.797,3.647c 0.002,0.213, 1.115,0.668, 1.361,1.040
-	c 0.244,0.372-1.377,3.453-2.371,3.427c-0.994-0.028-2.69,0.246-2.775,0.627c-0.088,0.379, 1.021,2.154, 1.037,2.849
-	c 0.014,0.696-6.35,1.14-8.401,0.553c-2.052-0.586-2.771-0.157-1.595,0.955c0,0,0,0, 0.039,1.25c-0.003,0.373-0.003,0.373-0.003,0.373
-	c-1.182,0.612-5.118-0.238-8.202-1.877c-3.084-1.64-2.741-4.739-2.12-5.892c 0.622-1.15, 2.528-2.506, 3.089-2.426
-	c 0.561,0.084, 1.777,0.943, 2.084,1.851c 0.306,0.909, 3.337-0.829, 4.744-1.088c 1.408-0.26-2.088-1.405-7.767-2.55c0,0,0,0-0.106-3.588
-	c 0.008-1.371, 0.008-1.371, 0.008-1.371c 1.693-0.671, 3.119-2.124, 3.141-2.51c 0.023-0.391, 0.129-0.733, 0.182-0.723
-	c 0.052,0.009, 0.037-0.011, 0.018-0.037c-0.023-0.025-2.895-5.18-6.382-11.453l-16.095-25.52c-6.205-3.609-13.287-5.314-15.165-3.84
-	c-1.88,1.477-6.761,0.708-10.849-1.705c0,0,0,0-0.090-4.955c 0.201-7.417, 3.928-13.648, 3.928-13.648
-	c 3.682-6.161, 3.196-13.937-1.080-17.277c0,0,0,0-1.164-0.010c-0.166,0.004-0.166,0.004-0.166,0.004
-	c-0.070,0.371-0.642-1.145-1.364-1.816c-0.723-0.674-6.242,2.66-9.948,7.068c-3.704,4.409-11.625,3.988-9.964-0.756
-	c 1.661-4.745, 2.96-8.585, 2.908-8.598c-0.052-0.014, 4.745-3.324, 10.663-7.359c0,0,0,0, 0.148-5.066
-	c-0.031-3.251-0.031-3.251-0.031-3.251c 1.598-3.097-11.453-0.091-13.141,5.574c-1.688,5.663-2.922,12.699-2.643,13.587
-	c 0.281,0.889, 0.77,1.609, 0.868,1.607c 0.097-0.004-2.945,6.383-2.932,11.879c 0.016,5.493-1.491,10.616-1.776,11.185
-	c-0.285,0.569-1.809-1.027-3.383-3.548c0,0,0,0-2.913-0.045c-0.829,0.022-5.833,10.031-5.833,10.031
-	c-3.209,6.42-7.72,7.721-9.776,8.046c-2.058,0.323-10.375-8.512-15.474-12.611c-5.101-4.098-9.066-14.358-9.051-16.97
-	c 0.018-2.613-2.86-6.514-3.73-8.295c-0.871-1.781-3.695,2.241-6.277,8.938l-3.947,7.445c-1.4,7.039-2.541,12.766-2.525,12.757
-	c 0.014-0.009, 0.183,3.938, 0.209,5.393c 0.027,1.455-0.518,1.046-1.211-0.911c0,0,0,0-2.613-0.092
-	c-2.306-0.006-2.306-0.006-2.306-0.006c-0.973,2.326-0.044,4.618, 0.331,5.162c 0.375,0.543-3.663,3.446-4.682,4.98
-	c-1.020,1.535-4.873,3.156-5.855,2.947c-0.979-0.211-2.16-0.694-2.232-0.824c-0.007-0.012-0.079-0.013-0.141-0.015
-	C 89.401,340.004, 165.035,406.798, 256,406.798c 49.26,0, 93.998-19.621, 126.902-51.414C 383.051,353.042, 382.611,350.525, 381.396,347.79z
-	 M 211.467,113.396c 0.3,0.076, 0.591-0.125, 0.645-0.449c0,0,0,0, 0.047-0.259c 3.131,0.342, 24.836,6.452, 25.038,10.144
-	c-0.276,1.463-0.276,1.463-0.276,1.463c 0.916,1.262, 2.484,1.233, 2.77,0.969c 0.285-0.264, 1.703,0.719, 1.705,1.351
-	c 0.002,0.631, 1.189,0.663, 1.574,0.579c 0.382-0.082, 1.305,3, 1.942,3.661c 0.64,0.663, 4.758,1.706, 5.535,2.202
-	c 0.778,0.497, 3.696,0.018, 4.022-0.896c 0.326-0.915, 1.589-0.905, 2.088-0.803c 0.498,0.104, 1.566-0.076, 2.371-0.397
-	c0,0,0,0, 0.142-0.123c 4.107,5.617, 4.107,5.617, 4.107,5.617c 3.394,1.622, 5.408,3.402, 4.479,3.957c0,0,0,0-0.212,1.107
-	c 4.262-2.711, 4.262-2.711, 4.262-2.711c 4.631,0.66, 9.337,0.764, 10.463,0.227c0,0,0,0, 0.014-0.617
-	c-2.645-1.279-3.979-3.477-4.002-6.59c-0.021-1.695, 11.45-6.785, 13.762-6.655c 8.244,0.794, 2.066,15.799, 8.424,19.118
-	c 1.227-3.038, 1.227-3.038, 1.227-3.038c 0.804-3.489, 2.79-6.621, 4.416-6.959c0,0,0,0, 0.336-0.146
-	c-0.571,0.367, 10.82-17.274, 10.854-17.478c-0.036,0.123, 6.647-5.383, 7.507-6.109c-0.555-13.888-3.162-17.221-3.162-17.221
-	c-4.421-5.653-8.045-10.268-8.045-10.265c0,0.005-3.824-1.267-8.496-2.821c0,0,0,0-1.436-2.976
-	c-5.838-0.659-16.056-2.099-18.153,5.477c-0.997-0.478-0.997-0.478-0.997-0.478c-1.172-0.133-1.668,0.512-1.535,0.785
-	c 0.135,0.275, 0.039,0.959-0.213,1.52c0,0,0,0-0.367,0.263c-0.178-1.422-0.178-1.422-0.178-1.422
-	c-1.966-0.183-0.876,1.295-0.656,2.551c 0.221,1.255-1.657-0.019-4.176-2.833c0,0,0,0-2.137-0.143
-	c-1.341,0.010-5.586,6.127-8.701,6.539c-7.062,0.932-13.494-1.607-20.443-2.553c-2.704-0.366-28.291-9.668-29.366-2.479
-	c-0.026,2.251-1.241,5.72-1.241,5.72c-2.371,6.773-4.041,12.776-3.938,12.97c 0.104,0.193, 0.495-0.056, 0.872-0.555
-	c0,0, 0.006-0.006, 0.295-0.155C 211.682,108.030, 211.166,113.321, 211.467,113.396z M 164.865,177.126c0,0,0,0-0.168,0.24
-	c-2.035,1.137-12.713,14.922-12.535,17.126c 3.744-0.324, 14.109-8.45, 14.109-8.45c 5.648-4.428, 10.217-8.23, 10.152-8.452
-	c0,0,0,0-0.068-0.134c 0.838,0.168, 0.838,0.168, 0.838,0.168c 0.559-0.659, 0.893-1.553, 0.746-1.988c0,0,0,0-0.125-0.273
-	c 0.084-3.445, 6.201-10.14, 6.682-15.518c-0.012-1.19-2.232-1.394-2.811-1.346c-6.308,0.886-9.307,6.672-9.307,6.672
-	C 169.075,171.542, 165.695,176.922, 164.865,177.126z M 165.389,170.758c-1.352,0.769-1.352,0.769-1.352,0.769
-	c-0.354,1.254-0.367,2.296-0.029,2.314c0,0,0,0, 0.211-0.076C 164.215,172.665, 164.605,171.664, 165.389,170.758z M 160.325,179.069
-	c-0.446,0.646-0.845,1.192-0.868,1.187c-0.021-0.004, 0.126,0.042, 0.329,0.106c0,0,0,0, 0.124,0.079
-	c 0.66-0.456, 0.862-0.942, 1.108-1.538C 161.266,178.307, 160.771,178.428, 160.325,179.069z M 183.544,170.298
-	c-0.466,0.104-0.116,0.776, 0.776,1.497c0,0,0,0, 0.592,0c 1.887-1.227, 2.877-2.826, 2.971-4.795c-1.762,0.059-2.229,0.718-2.994,2.233
-	C 184.392,170.111, 184.010,170.195, 183.544,170.298z M 186.111,158.177c0,0,0,0, 0.49-0.087c 4.494,0.319, 9.586-2.094, 14.133-2.050
-	c 3.917-0.147, 3.917-0.147, 3.917-0.147c 2.888-0.858, 3.501-1.874, 1.366-2.26c0,0,0,0-0.18,0.070c 1.758-1.503, 1.758-1.503, 1.758-1.503
-	c 4.533-1.186, 7.844-2.664, 7.562-2.88c-0.283-0.217-0.949-0.018-1.48,0.437c0,0,0,0-1.355-0.058
-	c-0.256,0.019-0.078-0.789, 0.027-1.028c-4.447,1.715-15.619,4.348-15.619,4.348C 189.744,154.665, 184.965,156.984, 186.111,158.177z
-	 M 199.426,236.794c-3.799,0.044-6.904,0.752-6.902,1.039c0,0.286, 1.91,1.132, 3.225,1.799c 1.315,0.666, 2.941,0.742, 3.615,0.169
-	c0,0,0,0-0.006-0.429C 199.426,236.794, 199.426,236.794, 199.426,236.794z M 220.932,187.813c-0.148-0.189, 1.135-3.538, 2.848-7.444
-	c0,0,0,0, 2.041-0.13c-1.117-0.71-2.32-1.143-3.608-1.298c-6.753-13.085-6.753-13.085-6.753-13.085
-	c-6.024,0.006-11.342,0.183-11.523,0.318c-0.18,0.136-0.395,0.825-0.479,1.532c0,0,0,0-0.1,0.323
-	c-2.799,0.402-7.938,0.789-6.118,6.066c-0.59,1.556-2.956,2.631-3.206,5.287c0-2, 15.719,11.057, 15.719,11.057
-	c 5.521,4.586, 10.605,6.973, 12.721,5.293c 2.113-1.682, 3.268-4.060, 2.586-4.174c-0.684-0.113-1.125-0.463-1.005-0.572
-	c 0.122-0.106-0.66-0.725-1.513-1.086c-0.854-0.361-1.36-1.073-1.265-1.279C 221.373,188.416, 221.078,188.003, 220.932,187.813z
-	 M 218.943,149.263c-0.619-1.258-0.619-1.258-0.619-1.258c-0.751,0.537-1.377,1.428-1.379,1.639c-0.002,0.21, 0.333,0.401, 0.746,0.429
-	c0,0,0,0, 0.241-0.069C 218.354,150.005, 218.621,149.456, 218.943,149.263z M 228.594,226.798c 1.807,5.647, 4.75,9.798, 4.916,9.294
-	c 0.168-0.503, 0.906-0.539, 1.644-0.083c0,0,0,0, 0.357,0.172c 0.084-4.916, 0.084-4.916, 0.084-4.916
-	c-0.839-3.068-1.081-7.827-0.376-8.688c 0.703-0.861, 1.303-1.35, 1.318-1.244c 0.016,0.109, 0.387,0.609, 0.766,0.75
-	c 0.379,0.139, 2.312-0.384, 2.525-1.015c 0.218-0.633, 0.933-1.001, 1.159-0.806c 0.226,0.2, 0.685,0.241, 0.834,0.206
-	c 0.149-0.033-0.099-0.438-0.553-0.901c0,0,0,0-0.054-0.375c 0.982,0.158, 1.732-0.27, 2.252-1.281c 0.080-0.616-0.138-1.094-0.658-1.433
-	c-0.941,1.804-0.941,1.804-0.941,1.804c-1.93,1.205-4.084,1.149-3.924,0.822c 0.16-0.326-1.742,0.045-2.158,0.641
-	c-0.417,0.594-1.754,0.984-2.113,0.811c-0.357-0.172-1.398,0.18-2.313,0.783c0,0,0,0, 0.037,0.377
-	c 0.729,0.551, 1.062,1.268, 0.995,2.149c-0.68,0.157-1.23-0.076-1.651-0.698c-0.356-0.009-2.433,1.437-2.417,1.896
-	C 228.594,226.798, 228.594,226.798, 228.594,226.798z M 233.021,257.362c 3.243-0.297, 0.331-9.559-2.567-9.824
-	C 225.721,247.649, 230.024,257.134, 233.021,257.362z M 245.128,215.077c-0.728,0.425-0.925,0.952-0.44,1.174c0,0,0,0, 0.259-0.012
-	c 0.969,0.025, 1.334-0.081, 1.78-0.21c 0.447-0.13, 0.762-0.642, 0.734-0.862c-0.029-0.223, 0.248-0.396, 0.396-0.402
-	c 0.15-0.004, 0.264-0.729, 0.195-1.055c-0.070-0.329, 0.062-0.807, 0.291-1.063c 0.232-0.255, 0.131-1.105, 0.004-1.35
-	c-0.129-0.243-0.844-0.418-1.592-0.386c0,0,0,0-0.438-0.029c 0.723-0.836, 0.723-0.836, 0.723-0.836
-	c 0.009-1.014-0.357-1.81-0.808-1.769c0,0,0,0-0.252-0.059c-0.411,0.665-0.411,0.665-0.411,0.665c 0.040,0.766-0.976,1.739-1.187,2.099
-	c-0.211,0.357-0.368,0.863-0.35,1.124c0,0,0,0, 0.040,0.144c 0.962-0.37, 0.962-0.37, 0.962-0.37
-	C 245.742,212.406, 245.855,214.654, 245.128,215.077z M 247.922,207.474c 0.855-0.002, 1.507-0.633, 1.811-0.949
-	c 3.588-4.010, 3.588-4.010, 3.588-4.010c-1.913-3.959-3.939-6.609-4.184-6.021c-0.244,0.583-0.436,1.006-0.441,0.991
-	c-0.005-0.012-0.219,0.244-0.474,0.569c0,0,0,0-0.156,0.226c-1.671-0.991-1.671-0.991-1.671-0.991
-	c 0.865-1.406, 1.145-3.479, 0.765-3.646s-1.003-0.149-1.069,0.081c-0.064,0.232-0.545,0.396-1.064,0.363c0,0,0,0-0.267-0.025
-	c-2.85,1.52-2.85,1.52-2.85,1.52c 0.521,1.803, 0.808,3.708, 0.735,3.922c-0.073,0.214-0.834,0.375-1.184,0.387
-	c-0.349,0.014-0.682-0.355-0.705-0.545c-0.023-0.188-0.865-0.222-0.977-0.080c-0.111,0.143-0.363,0.041-0.457-0.055
-	c-0.094-0.1-0.61,0.089-0.839,0.322c-0.229,0.236-1.103-1.543-1.938-3.957c0,0,0,0-1.302,0.058c-3.56,0.326, 6.269,6.331, 8.025,6.487
-	C 243.434,203.463, 247.094,205.808, 247.922,207.474z M 240.229,204.701c-0.21-0.097-1.438,0.805-2.73,2.001c0,0,0,0, 0.040,0.521
-	c 0.030,0.162, 4.751,5.838, 4.399,2.384c-1.758-1.409-1.758-1.409-1.758-1.409C 240.429,206.454, 240.436,204.797, 240.229,204.701z
-	 M 237.578,209.692c-1.094-0.385-1.988,1.078-1.991,3.254c0,0,0,0, 0.104,0.666c 0.434,0.619, 0.857,0.675, 1.268,0.165
-	c 0.936-0.385, 1.376-0.649, 1.914-0.972C 239.411,212.482, 238.67,210.080, 237.578,209.692z M 235.141,218.867
-	c 0.197,0.046, 1.055,0.136, 1.207-0.018C 236.155,218.802, 235.28,218.697, 235.141,218.867z M 230.73,178.438
-	c 1.625,2.461, 3.21,3.647, 6.174,3.090c 3.198-0.604, 3.198-0.604, 3.198-0.604c 3.155-0.108, 4.644-2.002, 3.306-4.205c0,0,0,0-1.432-0.34
-	c-0.312-0.074-0.666-0.025-1.037,0.076c-0.744,0.201-1.547,0.613-2.182,0.674c-0.996,0.094-2.307,0.275-3.171-0.32
-	c-1.652-1.14-1.474-2.754-0.613-4.113c 0.552-0.878, 1.026-0.812, 1.237-2.191c 0.269-1.759, 0.269-1.759, 0.269-1.759
-	c 0.378-1.84, 0.505-3.548, 0.282-3.797c0,0,0,0, 0.008-0.167c 0.024-0.498, 0.024-0.498, 0.024-0.498c 0.832-0.779, 0.585-3.056-0.442-3.263
-	c-1.029-0.207-2.7,1.339-3.713,3.433c0,0,0,0, 0.494,2.685c 0.018,0.092-1.609-0.815-1.803-1.126c-0.391-0.62-0.316-1.426-0.326-2.119
-	c-0.017-1.125, 0.811-3.062-0.849-2.951c-2.067,0.141-3.446,5.432-3.61,7.013C 226.198,171.289, 228.95,175.737, 230.73,178.438z
-	 M 295.317,168.375c 0.056-0.065, 0.056-0.065, 0.056-0.065l-0.002,0 c 0.064-0.085, 0.086-0.111, 0.086-0.111
-	c 0.211-0.063, 0.394-0.16, 0.402-0.212c0,0,0,0-0.023-0.017c 2.699-1.829, 13.322-7.214, 16.806-8.902
-	c 4.394-1.758, 1.677,0.439, 1.027-3.151c 0.099-2.977, 6.97-8.696, 9.99-8.345c-6.79-5.346-11.099,6.61-17.82,6.416
-	c-2.646-0.188-4.296-2.817-4.588-5.115c-4.628-0.699-6.099,2.734-9.962,2.642c-0.472,0.010-0.472,0.010-0.472,0.010
-	c-2.759-0.008-3.998,0.81-2.757,1.82c0,0,0,0, 0.469,0.285c-2.809,2.685-4.121,3.458-4.121,3.458
-	c-6.187,3.639-11.221,7.015-11.223,7.208c-0.003,0.191-0.625-0.772-1-1.053c-0.373-0.282-1.142-0.496-1.705-0.473
-	c0,0,0,0-0.061,0.252c 0.174,1.867, 0.174,1.867, 0.174,1.867c-1.44,0.913-0.477,1.942, 2.145,2.29c0,0,0,0, 0.85,1.262
-	c-1.533-0.169-9.434-0.545-9.494,3.037c 0.203,4.879, 10.021,0.986, 10.874,0.802c-0.046-1.857, 0.311-6.589, 3.663-6.778
-	c 1.984,0.014, 6.098,5.547, 8.24,5.771c 0.367-2.081, 0.367-2.081, 0.367-2.081c 4.557-0.571, 8.204-0.967, 8.133-0.882
-	C 295.351,168.33, 295.348,168.336, 295.317,168.375z M 307.312,74.105c0,0,0,0-0.178-0.907c-1.284-4.585-1.284-4.585-1.284-4.585
-	c-4.518,2.377-6.033,4.61-3.37,4.967c0,0,0,0, 0.072,0.023c 1.137,0.175, 1.785,0.394, 2.576,0.66S 306.902,74.459, 307.312,74.105z
-	 M 340.19,158.925c 0.034-0.015, 0.050-0.021, 0.067-0.028c 0.018-0.008, 0.031-0.015, 0.029-0.017c-0.001-0.002-0.002-0.004-0.002-0.004
-	L 340.19,158.925z M 110.342,200.373c-0.127,3.267, 0.998,5.567, 0.971,9.017C 116.551,199.68, 110.316,196.609, 110.342,200.373z"  />
-<glyph unicode="&#xe1fd;" d="M 255.585,441.459c-120.050,0-217.402-97.323-217.402-217.404c0-120.098, 97.353-217.434, 217.402-217.434
-	c 120.114,0, 217.433,97.336, 217.433,217.434C 473.018,344.136, 375.699,441.459, 255.585,441.459z M 240.28,320.201
-	c-21.485,1.342-41.89,5.491-60.596,11.966c 15.042,30.624, 36.134,55.493, 60.596,71.716L 240.28,320.201 z M 240.28,289.491l0-50.116 l-84.567,0 
-	c 1.341,22.79, 5.657,44.443, 12.297,64.391C 190.41,295.835, 214.74,290.932, 240.28,289.491z M 240.28,208.733l0-49.605 
-	c-25.671-1.456-50.099-6.426-72.598-14.438c-6.542,19.885-10.726,41.397-11.969,64.043L 240.28,208.733 z M 240.28,128.402l0-84.86 
-	c-24.755,16.404-46.011,41.616-61.088,72.662C 198.029,122.811, 218.599,127.028, 240.28,128.402z M 270.922,128.402
-	c 21.681-1.374, 42.25-5.592, 61.085-12.198c-15.074-31.046-36.361-56.298-61.085-72.694L 270.922,128.402 z M 270.922,159.128l0,49.605 l 84.566,0 
-	c-1.243-22.646-5.43-44.158-11.969-64.043C 321.052,152.702, 296.592,157.672, 270.922,159.128z M 270.922,239.375l0,50.116 
-	c 25.507,1.44, 49.869,6.344, 72.271,14.274c 6.638-19.947, 10.921-41.601, 12.262-64.391L 270.922,239.374 z M 270.922,320.201L 270.922,403.883 
-	c 24.494-16.223, 45.553-41.092, 60.596-71.682C 312.812,325.726, 292.408,321.543, 270.922,320.201z M 324.226,397.684
-	c 22.335-8.861, 42.576-21.895, 59.745-38.177c-7.489-5.53-15.598-10.632-24.232-15.172C 350.125,364.249, 338.158,382.215, 324.226,397.684
-	z M 151.43,344.335c-8.634,4.54-16.713,9.642-24.202,15.172c 17.168,16.282, 37.379,29.348, 59.714,38.177
-	C 173.044,382.215, 161.075,364.249, 151.43,344.335z M 139.788,315.934c-8.174-23.789-13.245-49.579-14.685-76.559L 69.514,239.375 
-	c 2.94,36.316, 16.349,69.773, 37.18,97.271C 116.861,328.915, 127.916,321.933, 139.788,315.934z M 125.040,208.733
-	c 1.373-26.828, 6.377-52.538, 14.39-76.21c-11.807-6.048-22.829-13.013-32.966-20.765c-20.733,27.471-34.010,60.757-36.95,96.975
-	L 125.040,208.733 z M 151.002,104.009c 9.484-19.818, 21.291-37.771, 35.026-53.274c-22.107,8.947-42.12,21.941-59.093,38.135
-	C 134.358,94.361, 142.37,99.479, 151.002,104.009z M 360.198,104.009c 8.601-4.529, 16.642-9.647, 24.034-15.157
-	c-16.938-16.176-36.953-29.17-59.059-38.080C 338.907,66.238, 350.713,84.19, 360.198,104.009z M 371.775,132.523
-	c 8.010,23.672, 12.979,49.348, 14.386,76.21l 55.528,0 c-2.944-36.218-16.221-69.504-36.953-96.975
-	C 394.599,119.511, 383.546,126.476, 371.775,132.523z M 386.096,239.375c-1.439,26.979-6.506,52.77-14.648,76.559
-	c 11.838,5.999, 22.889,12.981, 33.025,20.712c 20.867-27.497, 34.242-60.923, 37.217-97.271L 386.096,239.375 z"  />
-<glyph unicode="&#xe1fe;" d="M 393.414,107.522c 10.307,0, 18.666,8.355, 18.666,18.663c0,10.305-8.359,18.659-18.666,18.659
-		c-10.302,0-18.659-8.354-18.659-18.659C 374.755,115.878, 383.112,107.522, 393.414,107.522zM 157.819,140.81L 181.505,140.81L 181.505,108.844L 157.819,108.844zM 215.73,140.807L 239.403,140.807L 239.403,108.841L 215.73,108.841zM 99.918,140.81L 123.599,140.81L 123.599,108.841L 99.918,108.841zM 385.987,385.973L 125.952,385.973 l-76.33-195.634l0-128.312 l 412.756,0 L 462.378,190.339 L 385.987,385.973z M 438.699,85.706L 73.301,85.706 L 73.301,166.66 l 365.398,0 
-		L 438.699,85.706 z"  />
-<glyph unicode="&#xe1ff;" d="M 364.772,339.183c 1.98-0.418, 4.248-0.506, 5.795-0.506c 2.453,0, 4.842,0.214, 6.514,0.584c 0.91-0.097, 4.199-2.407, 6.568-7.287
-		l 19.465-40.127c 2.301-4.738, 2.242-13.021-0.125-17.729l-0.352-0.699c-1.812-3.605-2.695-8.272-2.678-12.918
-		c 2.738-0.134, 5.451-0.307, 8.107-0.495c 2.996-0.208, 5.99-0.418, 8.982-0.543c 7.518-0.314, 15.031-0.671, 22.547-1.057
-		c 3.707-0.191, 7.412-0.419, 11.117-0.626l-45.961,94.738c-3.617,7.446-12.418,12.652-19.996,11.622
-		c-6.664-0.9-15.461-5.179-20.027-9.738c-3.932-3.928-5.576-7.853-4.627-11.054C 360.747,341.189, 362.448,339.672, 364.772,339.183zM 101.126,259.643c 2.684,0.105, 5.357,0.276, 8.029,0.445c 0.965,0.060, 1.949,0.12, 2.926,0.179
-		c 0.055,4.722-0.822,9.483-2.664,13.15l-0.352,0.7c-2.369,4.708-2.428,12.991-0.127,17.729l 19.467,40.127
-		c 2.367,4.88, 5.654,7.19, 6.352,7.307c 1.887-0.39, 4.275-0.604, 6.727-0.604c 1.549,0, 3.816,0.088, 5.797,0.505
-		c 2.326,0.488, 4.027,2.007, 4.67,4.166c 0.947,3.201-0.695,7.126-4.627,11.054c-4.568,4.56-13.363,8.838-20.023,9.738
-		c-7.58,1.027-16.383-4.176-19.996-11.621L 61.287,257.67c 4.653,0.265, 9.304,0.552, 13.961,0.789
-		C 83.867,258.904, 92.497,259.302, 101.126,259.643zM 456.321,230.484c-7.488,0.473-14.98,0.88-22.475,1.267c-7.322,0.378-14.641,0.726-21.961,1.031
-		c-2.871,0.119-5.738,0.322-8.609,0.521c-4.83,0.338-9.822,0.687-14.943,0.687l-5.059,0c-14.086,0-26.822-0.133-40.037-1.777
-		c-13.588-1.688-27.084-4.241-40.135-6.708l-10.971-2.068c-11.445-2.171-23.281-4.416-34.547-4.706
-		c-10.785-0.294-22.229,1.851-33.35,3.911l-3.244,0.6c-3.891,0.713-7.783,1.447-11.676,2.182c-11.4,2.152-23.188,4.378-35.010,6.050
-		c-8.709,1.231-15.926,1.953-22.713,2.268c-2.105,0.099-4.34,0.146-7.025,0.146c-1.711,0-3.42-0.019-5.129-0.038
-		c-3.26-0.037-6.529-0.077-9.775,0.041c-5.996,0.219-11.916-0.148-17.543-0.504c-2.568-0.162-5.137-0.325-7.719-0.427
-		c-8.404-0.334-16.811-0.721-25.207-1.153c-8.322-0.424-16.645-0.888-24.963-1.41l-2.326-0.148l0-41.39 l 4.484-0.037
-		c 0.346-0.278, 0.991-0.996, 2.204-2.753c 1.992-2.897, 3.051-6.907, 4.277-11.548l 0.633-2.372c 0.66-2.434, 1.34-4.863, 2.021-7.289
-		c 1.084-3.875, 2.17-7.747, 3.17-11.646c 6.721-26.192, 20.705-46.105, 40.449-57.584c 13.395-7.783, 29.516-11.898, 46.625-11.898
-		c 10.193,0, 20.291,1.441, 30,4.283c 15.418,4.508, 28.953,12.502, 39.146,23.123c 8.197,8.544, 12.961,18.376, 17.043,28.209l 6.705,19.694
-		c 0.971,4.095, 3.062,8.012, 6.844,8.012c 3.779,0, 5.691-5.050, 6.84-8.012l 4.465-11.581c 0.42-1.011, 0.84-2.011, 1.26-3.042
-		c 1.678-4.093, 3.41-8.327, 5.459-12.521c 3.457-7.074, 6.926-12.604, 10.906-17.409c 4.787-5.778, 10.27-9.793, 15.934-13.731
-		c 12.059-8.382, 26.684-13.909, 42.301-15.98c 4.812-0.639, 9.693-0.962, 14.5-0.962l0,0c 21.838,0, 41.342,6.376, 56.395,18.437
-		c 17.936,14.372, 29.893,37.634, 33.725,65.568c 0.254,0.937, 0.51,1.915, 0.775,2.919c 3.174,12.149, 5.18,15.661, 8.936,15.661l 3.092,0 
-		l0,43.85 L 456.321,230.484z M 218.272,156.274c0-26.228-28.004-47.487-62.549-47.487s-54.381,18.521-62.549,47.487
-		c-18.089,64.142, 30.135,52.865, 62.549,50.55C 226.71,201.76, 218.272,182.502, 218.272,156.274z M 418.829,156.274
-		c-8.17-28.965-28.008-47.487-62.551-47.487c-34.547,0-62.553,21.259-62.553,47.487s-8.436,45.486, 62.553,50.55
-		C 388.692,209.139, 436.917,220.416, 418.829,156.274z"  />
-<glyph unicode="&#xe200;" d="M 75.032,6.397l 167.263,0 l0,186.060 L 75.032,192.457 L 75.032,6.397 z M 452.004,322.338l-98.111,0 c 6.963,3.576, 13.174,7.346, 18.679,11.301
-	c 21.239,15.16, 32.416,34.379, 32.378,53.484c 0.012,15.646-7.432,29.458-18.176,38.812c-10.775,9.414-25.022,14.967-40.336,14.99
-	c-16.318,0.009-31.459-5.64-44.43-14.297c-19.507-13.075-34.857-32.779-45.791-54.401c-0.525-1.050-1.031-2.107-1.536-3.163
-	c-4.003,8.333-8.658,16.398-13.919,23.972c-9.249,13.19-20.371,24.897-33.392,33.592c-12.974,8.661-28.115,14.303-44.429,14.297
-	c-16.226-0.057-31.074-6.869-42.202-17.332c-11.077-10.466-18.858-25.202-18.9-41.922c-0.030-9.776, 2.827-19.986, 8.691-29.263
-	c 7.371-11.668, 19.049-21.777, 35.218-30.070L 57.631,322.338 c-11.747,0-21.273-9.523-21.273-21.274l0-78.88 l 205.937,0 L 242.295,322.338 l 25.041,0 l0-100.154 
-	l 205.941,0 l0,78.88 C 473.277,312.815, 463.75,322.338, 452.004,322.338z M 152.892,353.618c-8.311,5.219-13.363,10.498-16.311,15.179
-	c-2.93,4.716-3.94,8.843-3.965,12.874c-0.044,6.749, 3.331,13.948, 9.257,19.547c 5.83,5.552, 13.754,8.934, 20.889,8.934l 0.18,0 
-	c 9.152-0.007, 18.271-3.103, 27.365-9.14c 13.593-8.983, 26.413-24.746, 35.363-42.625c 4.572-9.032, 8.145-18.585, 10.552-27.899
-	C 195.010,334.751, 168.3,343.866, 152.892,353.618z M 293.832,375.385c 7.439,10.654, 16.19,19.612, 25.238,25.626
-	c 9.096,6.037, 18.214,9.133, 27.367,9.14c 0.031,0, 0.063,0, 0.096,0c 7.671,0, 14.942-2.942, 19.958-7.364
-	c 5.059-4.501, 7.669-9.887, 7.683-15.664c-0.044-6.852-3.641-16.84-19.615-28.524c-15.213-11.040-41.457-22.377-81.949-30.297
-	C 276.491,344.385, 283.935,361.383, 293.832,375.385z M 267.336,6.397L 434.6,6.397 l0,186.060 L 267.336,192.457 L 267.336,6.397 z"  />
-<glyph unicode="&#xe201;" d="M 248.783,401.129c 9.851,0, 18.21-7.547, 19.038-17.531l 10.328-124.342c 1.933-7.75, 4.196-10.189, 6.282-10.189
-		c 3.555,0, 6.595,7.090, 6.595,7.090l 18.366,103.214c 1.642,9.254, 9.717,15.771, 18.814,15.771c 1.109,0, 2.236-0.097, 3.366-0.296
-		c 10.4-1.853, 17.329-11.783, 15.49-22.181L 329.078,251.58c0,0.004,0,0.008,0,0.008l0-0.010 l0,0.002 
-		c 0.012-0.398, 0.468-15.027, 5.367-15.027c 1.682,0, 3.884,1.722, 6.77,6.32c-0.003,0.020-0.003,0.020, 0.020,0.033l 30.148,65.229
-		c 3.634,5.794, 9.863,8.977, 16.235,8.977c 3.471,0, 6.979-0.941, 10.136-2.918c 8.947-5.609, 11.658-17.422, 6.055-26.377L 349.747,173.5
-		c0,0-6.678-49.663-28.724-90.12l-0.479-34.612L 209.841,48.768 l-0.286,36.086c0,0-21.284,11.604-39.886,45.158l-63.544,53.725
-		c-8.069,6.818-9.079,18.889-2.262,26.954c 3.785,4.476, 9.187,6.778, 14.622,6.778c 4.36,0.004, 8.742-1.48, 12.331-4.516l 36.351-28.557
-		c 3.816-2.991, 8.558-5.167, 12.906-5.167c 11.025,0, 19.547,13.972, 4.202,64.077l-30.55,99.506c-3.11,10.111, 2.57,20.803, 12.659,23.9
-		c 1.871,0.578, 3.763,0.85, 5.623,0.85c 8.184,0, 15.755-5.291, 18.287-13.52l 30.27-98.619c 0.332-0.611, 0.706-1.448, 1.127-2.672
-		c 2.243-6.395, 8.296-15.954, 12.815-15.954c 3.407,0, 5.939,5.429, 5.313,21.733L 229.692,380.428
-		c-0.873,10.521, 6.95,19.762, 17.484,20.635C 247.717,401.107, 248.251,401.129, 248.783,401.129 M 248.783,426.168
-		c-1.21,0-2.441-0.051-3.652-0.152c-24.299-2.015-42.406-23.397-40.388-47.659l 0.021-0.235c-8.166,9.043-19.907,14.48-32.756,14.48
-		c-4.39,0-8.757-0.659-12.972-1.949c-11.275-3.465-20.528-11.109-26.051-21.533c-5.53-10.426-6.663-22.384-3.189-33.664l 30.546-99.5
-		c 2.202-7.189, 3.755-13.189, 4.843-18.157l-18.601,14.61c-7.895,6.519-17.853,10.104-28.094,10.104c-0.004,0-0.007,0-0.012,0
-		c-13.022,0-25.321-5.709-33.734-15.65c-7.618-9.016-11.269-20.451-10.284-32.207c 0.984-11.756, 6.492-22.424, 15.5-30.039
-		l 60.161-50.863c 12.1-20.611, 25.118-33.879, 34.495-41.703l 0.188-23.477L 185,23.73l 24.841,0 l 110.704,0 l 24.694,0 l 0.343,24.691l 0.396,28.632
-		c 18.301,36.167, 25.896,76.288, 27.97,89.046l 51.994,109.955c 11.696,20.44, 5.236,46.742-14.894,59.355
-		c-7.044,4.413-15.146,6.739-23.431,6.739c-6.195,0-12.177-1.267-17.64-3.637l 1.737,9.768c 4.24,23.997-11.806,46.961-35.765,51.218
-		c-2.539,0.451-5.154,0.684-7.744,0.684c-14.23,0-27.067-6.75-35.188-17.46l-0.244,2.95
-		C 290.889,408.377, 271.564,426.168, 248.783,426.168L 248.783,426.168z"  />
-<glyph unicode="&#xe202;" d="M 473.329,84.402l-62.49,49.281l0-33.979 L 131.466,99.704 l-0.229,279.599l 33.977,0 l-49.312,62.493l-49.283-62.493l 33.946,0 l0-279.599 L 39.181,99.704 
-	l0-30.642 l 61.644,0 l0-61.466 l 30.642,0 l0,61.466 l 279.373,0 l0-33.978 L 473.329,84.402z M 343.603,311.63L 170.381,311.63 l0-173.207 l 173.222,0 L 343.603,311.63 z"  />
-<glyph unicode="&#xe203;" d="M 454.236,263.174c-15.591,63.937-37.193,130.498-114.285,119.559
-	c-29.741-4.225-52.243-21.667-85.431-21.748c-27.735-0.068-49.462,17.447-74.949,21.748c-77.019,13-95.274-23.888-117.649-92.658
-	c-12.649-38.879-53.044-172.948-7.13-205.048c 46.521-32.523, 97.305,56.955, 132.316,70.582
-	c 30.235,11.771, 95.289,10.754, 125.098,1.759c 40.438-12.205, 80.27-89.49, 125.837-79.315
-	C 500.438,91.982, 463.674,224.484, 454.236,263.174z M 163.003,206.729c-33.544,0.006-60.718,27.183-60.722,60.722
-	c 0.004,33.542, 27.178,60.717, 60.722,60.72c 33.541-0.003, 60.715-27.178, 60.719-60.72
-	C 223.718,233.911, 196.544,206.734, 163.003,206.729z M 352.23,317.917c 6.938,6.937, 18.184,6.937, 25.121,0
-	c 6.934-6.934, 6.933-18.182-0.002-25.116c-6.938-6.938-18.181-6.938-25.119-0.003C 345.294,299.735, 345.294,310.981, 352.23,317.917z
-	 M 318.42,258.986c-6.938,6.941-6.938,18.186,0,25.119c 6.937,6.938, 18.184,6.938, 25.12,0c 6.935-6.934, 6.933-18.178-0.002-25.115
-	C 336.602,252.056, 325.356,252.053, 318.42,258.986z M 376.157,226.371c-6.937-6.937-18.183-6.937-25.119,0
-	c-6.937,6.935-6.933,18.182, 0.002,25.116c 6.937,6.937, 18.184,6.94, 25.117,0.004C 383.094,244.553, 383.094,233.306, 376.157,226.371z
-	 M 409.969,260.179c-6.938-6.937-18.183-6.937-25.119,0c-6.937,6.938-6.934,18.183, 0.002,25.12c 6.937,6.937, 18.182,6.937, 25.117,0
-	C 416.906,278.364, 416.906,267.117, 409.969,260.179z M 163.003,303.138c-19.707-0.040-35.649-15.982-35.684-35.688
-	c 0.034-19.704, 15.977-35.649, 35.684-35.686c 19.702,0.037, 35.647,15.982, 35.684,35.686
-	C 198.65,287.155, 182.705,303.098, 163.003,303.138z"  />
-<glyph unicode="&#xe204;" d="M 368.432,369.235l 32.367-32.362l 34.896,34.898l 36.539-36.539L 472.234,441.217 L 366.256,441.217 l 37.075-37.077L 368.432,369.235z
-	 M 435.157,75.926l-34.901,34.899l-32.37-32.368l 34.9-34.899l-36.534-36.536l 105.986,0 L 472.238,113.004 L 435.157,75.926z M 140.501,79.007
-	l-32.37,32.365L 73.233,76.47L 36.7,113.007l0-105.985 l 105.979,0 l-37.079,37.080L 140.501,79.007z M 108.673,337.417l 32.373,32.365
-	l-34.903,34.899l 36.538,36.536L 36.698,441.217 l0-105.978 l 37.080,37.075L 108.673,337.417z M 386.987,179.448l0,86.92 
-	c0,35.993-29.179,65.169-65.17,65.169L 186.109,331.537 c-35.991,0-65.171-29.177-65.171-65.169l0-86.92 c0-35.993, 29.18-65.168, 65.171-65.168
-	l 135.708,0 C 357.809,114.28, 386.987,143.455, 386.987,179.448z"  />
-<glyph unicode="&#xe205;" d="M 182.367,199.131l-90.338-90.344l-56.066,56.068L 35.963,5.11 l 159.739,0 l-56.883,56.887l 90.341,90.351L 182.367,199.131z
-	 M 311.836,441.544l 56.877-56.882l-90.337-90.347l 46.792-46.785l 90.336,90.341l 56.068-56.073L 471.572,441.544 L 311.836,441.544 z"  />
-<glyph unicode="&#xe206;" d="M 429.714,93.034c-3.010,2.262-5.493,7.262-5.493,11.151L 424.221,341.652 c0,3.906, 2.483,8.942, 5.493,11.169
-	c0,0, 17.526,13.042, 17.526,26.894c0,18.723-17.265,33.896-38.586,33.896c-11.25,0-22.663-7.326-22.663-7.326
-	c-3.142-2.024-8.765-3.695-12.459-3.695l-34.796,0 c-3.694,0-9.287,1.671-12.461,3.695c0,0-15.73,10.040-29.822,10.040
-	c-2.943,0-2.943,0-2.943,0c-3.171-0.391-7.979,1.406-10.692,4.039c0,0-14.422,13.848-29.466,13.848
-	c-15.108,0-29.527-13.963-29.527-13.963c-2.75-2.616-7.817-4.413-11.284-3.924c0,0,0,0-3.335,0c-14.062,0-29.791-10.040-29.791-10.040
-	c-3.172-2.024-8.797-3.695-12.49-3.695l-28.29,0 c-3.663,0-9.286,1.671-12.427,3.695c0,0-11.411,7.326-22.661,7.326
-	c-21.322,0-38.59-15.173-38.59-33.896c0-13.852, 17.53-26.894, 17.53-26.894c 3.010-2.227, 5.461-7.263, 5.461-11.169l0-237.467 
-	c0-3.89-2.451-8.858-5.461-11.151c0,0-17.53-13.060-17.53-26.913c0-18.705, 17.268-33.878, 38.59-33.878
-	c 12.59,0, 25.278,9.436, 25.278,9.436c 3.041,2.241, 8.504,4.069, 12.199,4.069l 22.204,0 c 3.696,0, 9.188-1.864, 12.165-4.151
-	c0,0, 17.657-13.505, 33.812-13.505c 4.843,0, 7.357,0.495, 7.357,0.495c 3.632,0.73, 8.962-0.658, 11.871-3.061
-	c0,0, 13.604-11.366, 27.305-11.366c 13.181,0, 26.425,10.431, 26.425,10.431c 2.942,2.339, 8.011,3.926, 11.216,3.501c0,0,0,0, 3.074,0
-	c 16.156,0, 33.812,13.505, 33.812,13.505c 3.010,2.287, 8.471,4.151, 12.166,4.151l 28.712,0 c 3.693,0, 9.19-1.828, 12.198-4.069
-	c0,0, 12.719-9.436, 25.312-9.436c 21.321,0, 38.586,15.173, 38.586,33.878C 447.24,79.975, 429.714,93.034, 429.714,93.034z
-	 M 372.061,106.229L 136.148,106.229 L 136.148,342.142 l 235.912,0 L 372.060,106.229 z"  />
-<glyph unicode="&#xe207;" d="M 409.529,348.333l 51.144,51.165L 50.528,399.498 l 51.146-51.165L 409.529,348.333 z M 89.346,335.993l-51.146,51.14l0-325.935 l 51.146,51.162
-	L 89.346,335.993 z M 101.674,100.014L 50.528,48.85l 410.145,0 l-51.144,51.164L 101.674,100.014 z M 421.873,335.993L 421.873,112.36 l 51.129-51.162L 473.002,387.133 
-	L 421.873,335.993z"  />
-<glyph unicode="&#xe208;" d="M 39.439,96.766l 246.538,0 L 285.977,324.502 L 39.439,324.502 L 39.439,96.766 z M 39.439,43.495c0-13.377, 10.826-24.166, 24.166-24.166l 198.206,0 
-	c 13.342,0, 24.166,10.789, 24.166,24.166l0,22.6 L 39.439,66.095 L 39.439,43.495 z M 261.811,403.311l-50.066,0 L 211.745,429.605 l-98.073,0 l0-26.295 L 63.605,403.31 
-	c-13.34,0-24.166-10.787-24.166-24.165l0-24.020 l 246.538,0 l0,24.020 C 285.977,392.523, 275.152,403.311, 261.811,403.311z M 314.066,350.564
-	l0-283.95 l 159.274,0 l0,283.95 L 314.066,350.564 z M 375.006,86.666l-34.009,0 l0,33.971 l 34.009,0 L 375.006,86.666 z M 375.006,296.507l-34.009,0 l0,34.047 l 34.009,0 
-	L 375.006,296.507 z M 444.646,86.666l-34.010,0 l0,33.971 l 34.010,0 L 444.646,86.666 z M 444.646,296.507l-34.010,0 l0,34.047 l 34.010,0 L 444.646,296.507 z"  />
-<glyph unicode="&#xe209;" d="M 345.040,44.903L 254.38,135.564L 163.718,44.903L 163.718,402.986L 345.040,402.986 z"  />
-<glyph unicode="&#xe20a;" d="M 424.361,127.857L 424.361,318.3 l-117.5,0 c 19.752-21.968, 32.475-56.434, 32.475-95.218c0-38.783-12.723-73.244-32.475-95.224L 424.361,127.858 z
-			 M 38.773,368.328l0-289.502 l 434.836,0 L 473.609,368.328 L 38.773,368.328 z M 449.279,102.928L 63.138,102.928 L 63.138,343.242 l 386.142,0 L 449.28,102.928 z M 173.049,223.082
-			c0,38.785, 12.752,73.25, 32.471,95.218L 88.058,318.3 l0-190.442 L 205.52,127.858 C 185.801,149.838, 173.049,184.299, 173.049,223.082z M 251.367,158.479
-			l 24.103,0 L 275.47,277.423 l-19.196,0 c-0.652-4.531-2.094-8.316-4.25-11.379c-2.127-3.067-4.775-5.53-7.881-7.384
-			c-3.141-1.874-6.639-3.173-10.531-3.917c-3.923-0.744-7.98-1.051-12.162-0.924l0-18.199 l 29.918,0 L 251.368,158.479 z"  />
-<glyph unicode="&#xe20b;" d="M 174.229,198.206l 1.243,0 l 118.312,118.312l-64.293,0 L 229.491,420.185 l-55.263,0 c-61.315,0-110.989-49.675-110.989-110.976
-	C 63.24,247.912, 112.914,198.206, 174.229,198.206z M 413.64,391.309L 151.338,128.976l 22.923-22.925l 49.578,49.611l 49.608-49.611
-	l 22.923,22.943l-49.61,49.573l 19.654,19.639l 78.061,0 c 20.764,0, 37.574,16.827, 37.574,37.573l0,78.092 l 45.031,44.996l 21.222,0 L 448.302,391.309 
-	L 413.64,391.309 z M 328.777,107.852c-22.010,0-39.832-17.854-39.832-39.836c0-22.006, 17.822-39.828, 39.832-39.828s 39.832,17.822, 39.832,39.828
-	C 368.609,89.997, 350.787,107.852, 328.777,107.852z M 117.033,107.852c-22.008,0-39.83-17.854-39.83-39.836
-	c0-22.006, 17.822-39.828, 39.83-39.828c 22.010,0, 39.832,17.822, 39.832,39.828C 156.865,89.997, 139.043,107.852, 117.033,107.852z"  />
-<glyph unicode="&#xe20c;" d="M 275.241,212.272l0,91.858 c0,8.991-7.323,16.317-16.319,16.317c-8.99,0-16.314-7.326-16.314-16.317l0-105.059 l 50.557-52.192
-	c 3.238-3.3, 7.455-4.953, 11.74-4.953c 4.088,0, 8.176,1.505, 11.312,4.579c 6.475,6.247, 6.638,16.584, 0.394,23.072L 275.241,212.272z
-	 M 438.523,390.214c-41.467,41.517-108.209,42.319-150.758,2.57c-9.416,1.439-19.029,2.159-28.844,2.159
-	c-11.738,0-23.217-1.13-34.365-3.157C 182.074,432.533, 114.613,432.060, 72.752,390.214c-42.218-42.202-42.35-110.548-0.425-152.974
-	c-1.73-10.289-2.681-20.82-2.681-31.561c0-104.548, 84.73-189.291, 189.275-189.291c 104.514,0, 189.279,84.743, 189.279,189.291
-	c0,12.871-1.309,25.428-3.727,37.576C 480.773,285.883, 478.811,349.942, 438.523,390.214z M 258.922,73.844
-	c-72.693,0-131.82,59.127-131.82,131.836c0,72.679, 59.127,131.804, 131.82,131.804c 72.699,0, 131.822-59.125, 131.822-131.804
-	C 390.744,132.971, 331.621,73.844, 258.922,73.844z"  />
-<glyph unicode="&#xe20d;" d="M 40.901,409.56l0-371.828 c0-13.829, 11.212-25.040, 25.040-25.040L 96.87,12.692 L 96.87,434.597 L 65.941,434.597 C 52.114,434.597, 40.901,423.39, 40.901,409.56z
-	 M 126.916,434.597l0-421.905 l 283.415,0 L 410.331,434.597 L 126.916,434.597 z M 377.087,123.151L 160.119,123.151 c-0.183,9.291, 0.483,26.043, 0.483,33.134
-	c 3.603,10.439, 15.527,11.938, 25.488,16.141c 10.935,4.609, 23.067,9.966, 33.98,14.438c 3.116,0.849, 6.23,1.7, 9.342,2.553
-	c 3.72,2.556, 7.361,11.060, 9.349,15.288l 4.419,1.070c-1,5.588-4.456,6.025-5.897,9.971c-0.565,5.946-1.13,11.896-1.701,17.839
-	c 0.027-0.278-4.066,0.749-4.6,1.086c-5.772,3.612-5.886,18.297-6.443,24.402c-0.252,2.79, 3.628,5.079, 2.549,10.193
-	c-6.324,29.966, 2.734,43.986, 17.055,48.634c 9.938,4.030, 28.496,11.499, 45.805,0.851l 4.297-3.979l 6.95-1.2
-	c 3.489-2.011, 5.715-8.688, 5.715-8.688c 1.831-7.376, 2.014-7.989, 1.843-15.563c-0.068-2.915-1.744-16.408-1.289-20.545
-	c 0.374-3.416, 1.225-3.686, 2.574-6.496c 2.345-4.899, 1.558-11.647, 0.662-16.586c-0.495-2.7-1.533-6.544-3.116-8.746
-	c-1.74-2.428-5.227-2.449-6.771-5.286c-2.222-4.078-0.968-9.808-2.37-14.218c-1.589-4.998-5.641-5.35-5.946-11.889
-	c 1.986-0.283, 3.967-0.568, 5.946-0.85c 1.99-4.229, 5.63-12.732, 9.349-15.288c 3.112-0.853, 6.23-1.704, 9.345-2.553
-	c 10.911-4.473, 23.041-9.829, 33.981-14.438c 9.958-4.202, 21.884-5.701, 25.483-16.141C 376.602,149.194, 377.27,132.442, 377.087,123.151z
-	M 429.999,434.597L 468.297,434.597L 468.297,337.943L 429.999,337.943zM 429.999,312.534L 468.297,312.534L 468.297,215.879L 429.999,215.879zM 429.999,190.472L 468.297,190.472L 468.297,93.818L 429.999,93.818z"  />
-<glyph unicode="&#xe20e;" d="M 420.592,265.709L 296.104,265.709L 296.104,390.196L 213.002,390.196L 213.002,265.709L 88.518,265.709L 88.518,182.605L 213.002,182.605L 213.002,58.117L 296.104,58.117L 296.104,182.605L 420.592,182.605 z"  />
-<glyph unicode="&#xe20f;" d="M 354.562,51.379L 320.602,133.217L 286.641,51.379L 215.301,51.379L 175.683,198.948L 136.015,51.379L 39.35,51.379L 39.35,102.542L 96.807,102.542L 175.683,396.138L 253.726,105.515L 320.602,266.62L 388.736,102.542L 473.66,102.542L 473.66,51.379L 354.562,51.379 	z"  />
-<glyph unicode="&#xe210;" d="M 256.305,427.763L 91.877,332.837l 165.496-95.543l 164.426,94.921L 256.305,427.763z M 75.951,115.392l 164.967-95.241L 240.918,211.257 
-	L 75.951,306.5L 75.951,115.392 z M 271.688,210.021l0-189.873 l 164.969,95.244l0,189.87 L 271.688,210.021z" />
-<glyph unicode="&#xe211;" d="M 294.842,298.336c 2.749-2.751, 7.262-2.751, 10.008,0l 22.661,22.711c 2.782,2.729, 7.262,2.729, 10.039,0l 40.52-40.565
-	c 2.746-2.73, 2.746-7.246,0-9.992l-1.504-1.52c-2.749-2.748-2.749-7.247,0-9.993l 5.396-5.376l 66.351,0 L 337.55,364.377
-	c-2.777,2.744-7.257,2.744-10.039,0l-44.343-44.362c-2.746-2.744-2.746-7.245,0-10.007L 294.842,298.336z M 127.346,258.978
-	c 2.745,2.747, 2.745,7.246,0,9.993l-1.537,1.52c-2.749,2.746-2.749,7.261,0,9.992l 40.547,40.565c 2.749,2.729, 7.263,2.729, 10.008,0
-	l 22.695-22.711c 2.746-2.751, 7.229-2.751, 9.974,0l 11.708,11.672c 2.747,2.762, 2.747,7.263,0,10.007l-44.377,44.362
-	c-2.745,2.744-7.259,2.744-10.008,0L 55.597,253.601l 66.351,0 L 127.346,258.978z M 460.084,224.366L 51.083,224.366 
-	c-6.571,0-11.935-5.381-11.935-11.956l0-119.737 c0-6.571, 5.364-11.952, 11.935-11.952l 163.639,0 c 6.573,0, 13.966,4.97, 16.483,11.051
-	l 8.568,21c 2.485,6.062, 9.614,11.053, 15.828,11.053c 6.213,0, 13.342-4.99, 15.829-11.053l 8.568-21
-	c 2.482-6.081, 9.906-11.051, 16.479-11.051l 163.607,0 c 6.607,0, 11.969,5.381, 11.969,11.952L 472.053,212.41 
-	C 472.053,218.984, 466.691,224.366, 460.084,224.366z M 210.57,151.26c0-21.014-17.038-38.051-38.062-38.051l-60.63,0 
-	c-21.028,0-38.067,17.037-38.067,38.051l0,2.551 c0,21.021, 17.039,38.066, 38.067,38.066l 60.63,0 c 21.025,0, 38.062-17.045, 38.062-38.066
-	L 210.57,151.26 z M 437.389,151.26c0-21.014-17.037-38.051-38.062-38.051l-60.631,0 c-21.025,0-38.066,17.037-38.066,38.051l0,2.551 
-	c0,21.021, 17.041,38.066, 38.066,38.066l 60.631,0 c 21.025,0, 38.062-17.045, 38.062-38.066L 437.389,151.26 z"  />
-<glyph unicode="&#xe212;" d="M 418.877,291.916l0,11.695 c0,14.844-12.031,26.877-26.875,26.877L 164.285,330.488 c-14.844,0-26.877-12.033-26.877-26.877l0-159.369 
-	c0-14.842, 12.033-26.874, 26.877-26.874l 227.717,0 c 14.844,0, 26.875,12.032, 26.875,26.874L 418.877,255.379 l 52.98-34.211L 471.857,326.13 L 418.877,291.916z
-	 M 35.934,327.524l0-162.004 l 36.571,0 l 39.869,25.741l0,110.52 l-39.869,25.743L 35.934,327.524 z"  />
-<glyph unicode="&#xe213;" d="M 162.199,77.604l 35.836,0 L 198.035,255.558 l-29.206,0 c0-1.554-0.45-3.927-1.347-7.119
-	c-1.549-5.322-3.839-9.573-6.854-12.763c-4.408-4.663-10.124-7.775-17.142-9.328c-4.407-0.984-12.118-1.719-23.138-2.21l0-23.808 
-	l 41.85,0 L 162.198,77.604 z M 319.785,77.604l 34.241,0 l0,38.289 l 20.127,0 l0,27.371 l-20.127,0 L 354.026,254.452 l-39.274,0 l-65.414-108l0-30.56 l 70.447,0 L 319.785,77.604 z
-	 M 275.366,143.264l 44.419,76.647l0-76.647 L 275.366,143.264 z M 144.432,336.542c 10.271,0, 18.603,8.328, 18.603,18.602L 163.035,422.145 
-	c0,10.271-8.331,18.602-18.603,18.602c-10.275,0-18.602-8.331-18.602-18.602l0-67.001 C 125.83,344.87, 134.156,336.542, 144.432,336.542z
-	 M 368.486,336.542c 10.271,0, 18.602,8.328, 18.602,18.602L 387.088,422.145 c0,10.271-8.33,18.602-18.602,18.602
-	c-10.275,0-18.6-8.331-18.6-18.602l0-67.001 C 349.887,344.87, 358.211,336.542, 368.486,336.542z M 393.21,405.975l0-19.693 
-	c 7.742-6.844, 12.646-16.823, 12.646-27.964c0-20.642-16.734-37.372-37.371-37.372c-20.639,0-37.367,16.729-37.367,37.372
-	c0,11.142, 4.905,21.12, 12.642,27.964L 343.76,405.975 L 169.158,405.975 l0-19.693 c 7.738-6.844, 12.643-16.823, 12.643-27.964
-	c0-20.642-16.731-37.372-37.371-37.372c-20.638,0-37.365,16.729-37.365,37.372c0,11.142, 4.903,21.12, 12.639,27.964L 119.704,405.975 L 36.437,405.975 
-	L 36.437,8.33 l 436.669,0 L 473.106,405.975 L 393.21,405.975 z M 433.223,48.213L 76.315,48.213 L 76.315,296.637 l 356.907,0 L 433.222,48.213 z"  />
-<glyph unicode="&#xe214;" d="M 342.391,127.572l-44.879,0 l0-44.865 l 44.879,0 L 342.391,127.572 z M 279.157,247.643l-44.849,0 
-	l0-44.853 l 44.849,0 L 279.157,247.643 z M 342.391,187.609l-44.879,0 l0-44.859 l 44.879,0 L 342.391,187.609 z M 405.565,247.643l-44.854,0 l0-44.853 l 44.854,0 L 405.565,247.643 z
-	 M 279.157,187.609l-44.849,0 l0-44.859 l 44.849,0 L 279.157,187.609 z M 342.391,247.643l-44.879,0 l0-44.853 l 44.879,0 L 342.391,247.643 z M 405.565,187.609l-44.854,0 
-	l0-44.859 l 44.854,0 L 405.565,187.609 z M 152.762,127.572l-44.856,0 l0-44.865 l 44.856,0 L 152.762,127.572 z M 152.762,187.609l-44.856,0 l0-44.859 l 44.856,0 L 152.762,187.609 z
-	 M 394.024,405.792l0-19.691 c 7.737-6.847, 12.642-16.825, 12.642-27.969c0-20.634-16.732-37.367-37.369-37.367
-	c-20.642,0-37.367,16.733-37.367,37.367c0,11.147, 4.903,21.124, 12.643,27.969L 344.573,405.792 L 169.97,405.792 l0-19.691 
-	c 7.739-6.847, 12.643-16.825, 12.643-27.969c0-20.634-16.732-37.367-37.369-37.367c-20.64,0-37.367,16.733-37.367,37.367
-	c0,11.147, 4.904,21.124, 12.642,27.969L 120.519,405.792 l-83.27,0 l0-397.644 l 436.668,0 L 473.917,405.792 L 394.024,405.792 z M 434.035,48.033L 77.131,48.033 L 77.131,296.456 l 356.904,0 
-	L 434.035,48.033 z M 215.988,247.643l-44.881,0 l0-44.853 l 44.881,0 L 215.988,247.643 z M 215.988,127.572l-44.881,0 l0-44.865 l 44.881,0 L 215.988,127.572 z M 279.157,127.572
-	l-44.849,0 l0-44.865 l 44.849,0 L 279.157,127.572 z M 215.988,187.609l-44.881,0 l0-44.859 l 44.881,0 L 215.988,187.609 z M 145.245,336.36
-	c 10.273,0, 18.603,8.326, 18.603,18.599L 163.848,421.965 c0,10.267-8.329,18.6-18.603,18.6c-10.274,0-18.602-8.333-18.602-18.6l0-67.006 
-	C 126.643,344.687, 134.971,336.36, 145.245,336.36z M 369.299,336.36c 10.272,0, 18.601,8.326, 18.601,18.599L 387.9,421.965 
-	c0,10.267-8.328,18.6-18.601,18.6c-10.274,0-18.604-8.333-18.604-18.6l0-67.006 C 350.695,344.687, 359.024,336.36, 369.299,336.36z"  />
-<glyph unicode="&#xe215;" d="M 361.403,405.741L 151.361,405.741 c-11.706,0-21.191-9.484-21.191-21.187l0-321.278 c0-11.693, 9.485-21.192, 21.191-21.192l 210.042,0 
-	c 11.675,0, 21.16,9.499, 21.16,20.7L 382.563,384.079 C 382.563,396.257, 373.078,405.741, 361.403,405.741z M 211.436,73.346l-46.112,0 l0,46.094 l 46.112,0 
-	L 211.436,73.346 z M 211.436,141.139l-46.112,0 L 165.324,187.25 l 46.112,0 L 211.436,141.139 z M 280.763,73.346l-46.11,0 l0,46.094 l 46.11,0 L 280.763,73.346 z M 280.763,141.139
-	l-46.11,0 L 234.653,187.25 l 46.11,0 L 280.763,141.139 z M 349.143,73.346l-46.109,0 l0,46.094 l 46.109,0 L 349.143,73.346 z M 349.143,141.139l-46.109,0 L 303.034,187.25 l 46.109,0 L 349.143,141.139 z
-	 M 211.436,210.399l-46.112,0 l0,46.11 l 46.112,0 L 211.436,210.399 z M 280.763,210.399l-46.11,0 l0,46.11 l 46.11,0 L 280.763,210.399 z M 349.143,210.399l-46.109,0 l0,46.11 
-	l 46.109,0 L 349.143,210.399 z M 349.143,296.603L 165.324,296.603 l0,75.229 l 183.819,0 L 349.143,296.603 z"  />
-<glyph unicode="&#xe216;" d="M 445.692,208.555c0,12.643-0.933,33.277-2.044,45.868L 432.397,390.479c-1.109,12.575-12.261,24.242-24.787,25.944
-			c0,0-37.313,12.854-151.23,12.854c-113.915,0-151.228-12.854-151.228-12.854C 92.628,414.721, 81.477,403.054, 80.35,390.479
-			l-11.2-136.056c-1.146-12.591-2.060-33.226-2.060-45.868L 67.090,83.88 l 29.379,0 l0-31.257 c0-18.2, 14.766-32.949, 32.95-32.949
-			c 18.18,0, 32.962,14.749, 32.962,32.949L 162.381,83.88 l 188.019,0 l0-31.257 c0-18.185, 14.765-32.949, 32.947-32.949
-			c 18.215,0, 32.963,14.765, 32.963,32.949L 416.31,83.88 l 29.383,0 L 445.693,208.555 z M 208.752,411l 95.292,0 c 10.301,0, 18.69-8.393, 18.69-18.706
-			c0-10.333-8.39-18.706-18.69-18.706l-95.292,0 c-10.334,0-18.723,8.373-18.723,18.706C 190.029,402.607, 198.418,411, 208.752,411z
-			 M 129.419,110.714c-15.077,0-27.309,12.229-27.309,27.308c0,15.088, 12.231,27.287, 27.309,27.287
-			c 15.073,0, 27.307-12.199, 27.307-27.287C 156.726,122.942, 144.492,110.714, 129.419,110.714z M 108,203.454l0,10.42 
-			c0,9.908, 0.717,26.094, 1.603,35.937l 8.795,83.898c 0.866,9.857, 9.71,17.937, 19.621,17.937l 236.759,0 
-			c 9.894,0, 18.723-8.079, 19.605-17.937l 8.813-83.898c 0.882-9.843, 1.585-26.028, 1.585-35.937l0-10.42 L 108,203.454 z M 383.347,110.714
-			c-15.075,0-27.305,12.229-27.305,27.308c0,15.088, 12.229,27.287, 27.305,27.287c 15.106,0, 27.306-12.199, 27.306-27.287
-			C 410.652,122.942, 398.453,110.714, 383.347,110.714z"  />
-<glyph unicode="&#xe217;" d="M 255.536,433.607c-115.383-0.007-208.902-93.535-208.917-208.92c 0.015-115.39, 93.534-208.908, 208.917-208.922
-	c 115.39,0.014, 208.912,93.532, 208.925,208.922C 464.447,340.072, 370.926,433.601, 255.536,433.607z M 380.248,99.979
-	c-9.127-9.122-19.263-17.203-30.182-24.152l-92.489,147.381l-92.056-150.18c-12.659,7.533-24.316,16.584-34.69,26.951
-	c-31.632,31.65-51.235,75.108-51.62,123.305l 178.254,0 L 171.991,380.045c 24.858,13.398, 53.282,21.008, 83.544,21.012
-	c 31.783-0.004, 61.515-8.424, 87.238-23.104l-85.114-154.67l 174.208,0 C 431.483,175.087, 411.881,131.629, 380.248,99.979z"  />
-<glyph unicode="&#xe218;" d="M 190.111,313.207L 190.111,396.312L 458.369,396.312L 458.369,313.207L 190.111,313.207 	zM 190.111,182.209L 190.111,265.307L 458.37,265.307L 458.37,182.209L 190.111,182.209 	zM 190.111,51.204L 190.111,134.304L 458.372,134.304L 458.372,51.204L 190.111,51.204 	zM 138.747,354.053c0-24.033-19.48-43.508-43.509-43.508c-24.028,0-43.508,19.476-43.508,43.508
-		c0,24.029, 19.48,43.504, 43.508,43.504C 119.266,397.557, 138.747,378.082, 138.747,354.053zM 51.73,228.934A43.508,43.508 180 1 1 138.746,228.934A43.508,43.508 180 1 1 51.73,228.934zM 51.73,95.036A43.508,43.508 180 1 1 138.746,95.036A43.508,43.508 180 1 1 51.73,95.036z"  />
-<glyph unicode="&#xe219;" d="M 85.065,59.768c-6.507-6.509-6.507-17.054,0-23.56c 6.504-6.514, 17.056-6.514, 23.559-0.002l 33.049,33.042
-	c-5.737,10.21-10.526,21.23-14.25,32.877L 85.065,59.768z M 424.189,257.779c 6.51,6.501, 6.51,17.053,0,23.562
-	c-6.502,6.504-17.055,6.504-23.562,0l-29.451-29.452c 5.74-10.208, 10.526-21.231, 14.251-32.879L 424.189,257.779z M 118.407,160.566
-	c0,5.818, 0.263,11.562, 0.759,17.226l-46.137,0.002c-9.204-0.002-16.662-7.458-16.662-16.66c0-9.203, 7.458-16.664, 16.662-16.664
-	l 46.046,0 C 118.642,149.767, 118.407,155.135, 118.407,160.566z M 126.558,216.281c 3.566,11.782, 8.245,22.919, 13.86,33.274l-31.786,31.786
-	c-6.51,6.504-17.061,6.504-23.565,0c-6.509-6.51-6.509-17.062,0-23.562L 126.558,216.281z M 384.532,99.427
-	c-3.882-11.521-8.813-22.389-14.676-32.448l 30.776-30.772c 6.505-6.512, 17.056-6.512, 23.56,0.002c 6.507,6.506, 6.507,17.051,0,23.56
-	L 384.532,99.427z M 436.229,177.794l-42.545-0.002c 0.497-5.663, 0.758-11.407, 0.758-17.226c0-5.432-0.234-10.8-0.666-16.097l 42.453,0 
-	c 9.203,0, 16.662,7.461, 16.662,16.664C 452.891,170.336, 445.432,177.792, 436.229,177.794z M 162.407,409.611
-	c 27.314-0.198, 39.683-10.33, 46.938-21.625c 5.964-9.492, 7.656-20.515, 8.036-27.072c-15.226-10.442-26.149-26.689-29.561-45.572
-	l 138.623,0 c-3.413,18.886-14.338,35.135-29.564,45.577c 0.376,6.559, 2.071,17.583, 8.040,27.068
-	c 7.246,11.295, 19.614,21.425, 46.942,21.625c 3.993,0, 7.232,3.238, 7.232,7.231c0,3.997-3.239,7.235-7.232,7.235
-	c-31.162,0.202-49.95-13.171-59.234-28.45c-5.947-9.627-8.48-19.591-9.55-27.353c-8.027,3.19-16.772,4.965-25.938,4.981
-	c-9.174-0.016-17.927-1.792-25.96-4.986c-1.069,7.761-3.602,17.725-9.549,27.358c-9.287,15.281-28.068,28.652-59.223,28.45
-	c-4.006,0-7.238-3.238-7.238-7.233S 158.401,409.611, 162.407,409.611z M 144.154,161.423c0-71.594, 44.030-130.722, 100.454-138.429
-	L 244.608,286.121 l-37.77,0 C 169.72,263.265, 144.154,215.969, 144.154,161.423z M 158.968,156.443c0,10.557, 12.448,19.117, 27.805,19.117
-	c 15.354,0, 27.802-8.561, 27.802-19.117s-12.447-19.112-27.802-19.112C 171.416,137.331, 158.968,145.887, 158.968,156.443z
-	 M 213.231,73.814c-7.163,0-12.966,8.796-12.966,19.645c0,10.85, 5.803,19.648, 12.966,19.648c 7.158,0, 12.964-8.799, 12.964-19.648
-	C 226.196,82.61, 220.389,73.814, 213.231,73.814z M 222.756,206.145c-7.467-7.463-22.32-4.714-33.177,6.146
-	c-10.857,10.854-13.61,25.714-6.144,33.176c 7.465,7.464, 22.318,4.717, 33.176-6.141C 227.468,228.467, 230.222,213.611, 222.756,206.145
-	z M 307.42,286.121l-37.77,0 l0-263.127 c 56.423,7.707, 100.459,66.835, 100.459,138.429C 370.109,215.969, 344.543,263.265, 307.42,286.121z
-	 M 297.006,239.326c 10.859,10.857, 25.711,13.604, 33.176,6.141c 7.469-7.462, 4.716-22.322-6.141-33.176
-	c-10.861-10.86-25.713-13.609-33.18-6.146C 283.396,213.611, 286.148,228.467, 297.006,239.326z M 300.388,73.814
-	c-7.159,0-12.964,8.796-12.964,19.645c0,10.85, 5.805,19.648, 12.964,19.648c 7.16,0, 12.964-8.799, 12.964-19.648
-	C 313.352,82.61, 307.548,73.814, 300.388,73.814z M 326.848,137.331c-15.357,0-27.807,8.556-27.807,19.112
-	s 12.449,19.117, 27.807,19.117c 15.355,0, 27.804-8.561, 27.804-19.117S 342.203,137.331, 326.848,137.331z"  />
-<glyph unicode="&#xe21a;" d="M 461.555,413.464l-34.481,21.84L 391.36,457.936L 227.111,195.421c-22.888,2.958-46.657-6.347-59.807-39.046
-	C 137.859,70.127, 47.93,72.787, 47.93,72.787s 128.559-81.945, 220.726-0.224c 19.216,17.036, 26.892,42.307, 22.111,65.723
-	L 461.555,413.464z M 255.225,196.429l 21.2,33.465l 30.423-19.275l-21.2-33.469L 255.225,196.429z"  />
-<glyph unicode="&#xe21b;" d="M 62.115,174.489c-28.855-28.858, 11.318-75.654, 40.193-104.517c 28.859-28.84, 75.639-69.051, 104.498-40.189l 55.902,84.863
-	L 146.965,230.375L 62.115,174.489z M 478.641,399.723l-46.6,46.616L 317.436,331.72c-41.775-31.75-76.637,0.864-87.997-10.495
-	l-69.052-69.035l 124.135-124.12l 67.332,67.349c 11.383,11.38-16.871,50.654, 12.819,90.354L 478.641,399.723z"  />
-<glyph unicode="&#xe21c;" d="M 446.223,414.147c-12.852,12.917-33.717,12.917-46.567,0L 264.858,279.381l-65.732,65.731l-46.599-46.583l 178.062-178.078
-	l 46.567,46.568l-65.731,65.761l 134.798,134.783C 459.108,380.41, 459.108,401.29, 446.223,414.147z M 52.328,231.211l 210.959-210.975
-	l 50.065,81.788L 135.884,279.493L 52.328,231.211z"  />
-<glyph unicode="&#xe21d;" d="M 445.564,390.919L 66.437,390.919 c-9.34,0-16.913-7.572-16.913-16.911L 49.524,313 l0-255.919 l 412.951,0 L 462.475,313 l0,61.008 
-		C 462.476,383.347, 454.905,390.919, 445.564,390.919z M 143.066,359.35l 289.6,0 l0-31.982 l-289.6,0 L 143.066,359.35 z M 97.219,362.173
-		c 10.391,0, 18.814-8.427, 18.814-18.815c0-10.39-8.423-18.814-18.814-18.814c-10.395,0-18.816,8.424-18.816,18.814
-		C 78.403,353.746, 86.825,362.173, 97.219,362.173z M 433.37,86.186l-42.053,0 l0,51.838 L 232.138,138.024 l0-51.838 l-41.742,0 l0,53.202 l-69.349,0 l0-53.202 
-		L 78.631,86.186 L 78.631,283.893 L 433.37,283.893 L 433.37,86.186 zM 121.047,247.046L 391.317,247.046L 391.317,180.306L 121.047,180.306z"  />
-<glyph unicode="&#xe21e;" d="M 339.22,344.976c0,24.836-20.111,44.945-44.962,44.962l-84.142,0 c-24.824-0.017-44.965-20.126-44.965-44.962l0-15.907 L 129.57,329.069 
-	l0-271.493 l 256.937,0 L 386.507,329.068 L 339.22,329.068 L 339.22,344.976 z M 308.579,329.068L 195.824,329.068 l0,15.907 c0,7.9, 6.377,14.304, 14.292,14.304l 84.142,0 
-	c 7.912,0, 14.321-6.403, 14.321-14.304L 308.579,329.068 z M 37.579,304.896l0-223.154 c0-13.341, 10.824-24.166, 24.168-24.166l 42.872,0 L 104.619,329.068 L 61.747,329.068 
-	C 48.403,329.068, 37.579,318.257, 37.579,304.896z M 449.523,329.068l-38.098,0 l0-271.493 l 38.098,0 c 13.343,0, 24.167,10.825, 24.167,24.166
-	L 473.69,304.896 C 473.69,318.257, 462.866,329.068, 449.523,329.068z"  />
-<glyph unicode="&#xe21f;" d="M 75.907,141.632l 164.261-94.81L 240.168,185.736 L 75.907,280.581L 75.907,141.632 z M 383.288,327.542l0-14.597 
-	c0-10.812-20.701-19.574-46.274-19.574c-25.541,0-46.256,8.763-46.256,19.574l0,24.149 l 0.148,0 
-	c 1.552-10.202, 21.566-18.284, 46.107-18.284c 25.573,0, 46.274,8.77, 46.274,19.544c0,10.825-20.701,19.569-46.274,19.569
-	c-2.027,0-4.037-0.062-5.999-0.179l-29.776,17.186l0-18.362 c0-10.812-20.684-19.573-46.239-19.573
-	c-16.057,0-30.199,3.465-38.507,8.729c-1.177,1.208-2.632,2.387-4.382,3.486c-2.174,2.269-3.382,4.742-3.382,7.357l0,17.77 
-	l-28.779-16.61c-2.077,0.097-4.168,0.196-6.311,0.196c-25.541,0-46.257-8.744-46.257-19.569c0-10.774, 20.716-19.544, 46.257-19.544
-	c 24.542,0, 44.573,8.082, 46.125,18.284l 0.13,0 l0-24.149 c0-10.812-20.684-19.574-46.255-19.574c-25.541,0-46.257,8.763-46.257,19.574
-	l0,14.401 l-35.629-20.538l 164.817-95.126l 163.736,94.508L 383.288,327.542z M 301.614,267.050c0-10.812-20.716-19.559-46.256-19.559
-	c-25.557,0-46.273,8.746-46.273,19.559l0,24.149 l 0.147,0 c 1.554-10.204, 21.568-18.299, 46.126-18.299
-	c 24.543,0, 44.556,8.095, 46.125,18.299l 0.131,0 L 301.614,267.050 z M 270.811,184.504L 270.811,46.79 l 164.283,94.842l0,137.71 L 270.811,184.504z
-	 M 254.999,362.438c 25.556,0, 46.239,8.747, 46.239,19.553c0,10.795-20.684,19.555-46.239,19.555c-25.558,0-46.272-8.76-46.272-19.555
-	C 208.727,371.185, 229.441,362.438, 254.999,362.438z"  />
-<glyph unicode="&#xe220;" d="M 114.799,410.507c-13.651-18.396-20.571-43.054-20.571-73.284l0-35.185 c0-17.099-2.961-25.993-5.457-30.471
-		c-6.357-11.45-19.459-18.202-40.051-20.643l-13.271-1.572l0-51.721 l 13.429-1.45c 20.292-2.192, 33.312-9.107, 39.804-21.144
-		c 3.679-6.82, 5.546-16.926, 5.546-30.027l0-44.514 c0-33.411, 10.512-58.159, 31.249-73.556c 18.917-14.044, 42.837-22.612, 71.094-25.469
-		l 16.552-1.674l0,55.29 l-13.275,1.569c-10.512,1.244-20.014,5.533-29.038,13.114c-7.625,6.406-11.489,18.501-11.489,35.948l0,32.65 
-		c0,22.942-3.043,40.929-9.324,55.043c-4.47,9.927-11.896,21.096-24.196,29.903c 10.425,7.204, 18.493,16.933, 24.135,29.134
-		c 6.314,13.659, 9.385,31.972, 9.385,55.985l0,24.188 c0,15.659, 1.816,27.705, 5.394,35.77c 3.739,8.396, 11.402,19.785, 34.67,21.808
-		l 13.738,1.19l0,54.8 l-16.31-1.385C 156.196,441.371, 129.369,430.149, 114.799,410.507zM 437.327,250.943c-20.487,2.192-33.589,8.987-40.061,20.771c-3.592,6.539-5.49,17.021-5.49,30.311l0,35.179 
-		c0,29.231-5.083,50.976-15.468,66.372c-15.87,23.958-45.122,37.833-86.951,41.237l-16.262,1.322l0-54.748 l 13.748-1.186
-		c 23.558-2.035, 31.106-12.761, 34.716-20.612c 2.437-5.337, 5.342-16.078, 5.342-36.916l0-24.172 c0-24.158, 3.068-42.547, 9.396-56.233
-		c 4.441-9.561, 11.853-20.345, 24.191-28.875c-10.477-7.475-18.653-17.544-24.266-30.030c-6.273-13.932-9.321-31.938-9.321-55.051
-		l0-32.628 c0-15.813-3.694-27.555-10.975-34.889c-7.89-7.94-17.621-12.573-29.746-14.16l-13.086-1.715l0-55.227 l 16.646,1.786
-		c 28.008,3.007, 51.77,11.423, 70.616,25.013c 20.849,15.033, 31.419,39.932, 31.419,74.004l0,44.514 c0,12.857, 1.882,22.917, 5.551,29.824
-		c 6.614,12.285, 19.676,19.266, 39.929,21.337l 13.512,1.382l0,51.952 L 437.327,250.943z"  />
-<glyph unicode="&#xe221;" d="M 161.080,373.71l-70.073-40.452l 165.498-95.545l 70.076,40.453L 161.080,373.71z M 420.931,332.633L 255.435,428.185
-	l-63.578-36.709l 165.499-95.542L 420.931,332.633z M 270.821,210.443L 270.821,20.57 l 164.966,95.238L 435.787,305.68 L 270.821,210.443z M 75.082,115.809
-	l 164.959-95.234L 240.041,211.68 L 75.082,306.91L 75.082,115.809 z"  />
-<glyph unicode="&#xe222;" d="M 94.878,184.116l0-66.927 l 146.044-84.303L 240.922,224.258 l-78.138-82.084L 94.878,184.116z M 226.683,235.654l-121.568,70.175
-	l-65.962-65.955l 120.638-74.495L 226.683,235.654z M 286.641,235.421l 66.679-70.042l 120.636,74.495l-65.73,65.742L 286.641,235.421z
-	 M 271.58,224.913l0-192.026 l 146.047,84.303L 417.627,183.74 l-67.316-41.566L 271.58,224.913z M 476.537,349.879L 357.408,414.94l-81.576-22.565
-	l 131.871-74.674L 476.537,349.879z M 237.163,392.375L 155.588,414.94L 36.471,349.879l 68.804-32.178L 237.163,392.375z"  />
-<glyph unicode="&#xe223;" d="M 63.31,372.845l0-82.714 l 384.963,0 l0,82.714 L 63.31,372.845 z M 90.223,75.213L 421.36,75.213 L 421.36,266.387 L 90.223,266.387 L 90.223,75.213 z M 226.358,221.143l 58.863,0 
-	c 11.677,0, 21.159-9.499, 21.159-21.203c0-11.691-9.482-21.161-21.159-21.161l-58.863,0 c-11.705,0-21.188,9.47-21.188,21.161
-	C 205.17,211.644, 214.653,221.143, 226.358,221.143z"  />
-<glyph unicode="&#xe224;" d="M 127.147,67.188l 79.794,0 L 206.941,343.776 l-79.794,0 L 127.147,67.188 z M 138.267,311.535l 57.554,0 l0-33.26 l-57.554,0 L 138.267,311.535 z M 43.857,67.975l 61.952,0 
-	L 105.809,380.047 L 43.857,380.047 L 43.857,67.975 z M 55.157,345.010l 35.007,0 l0-21.146 L 55.157,323.864 L 55.157,345.010 z M 55.157,124.186l 35.007,0 l0-21.157 L 55.157,103.029 L 55.157,124.186 z
-	 M 230.617,69.316l 61.951,0 L 292.568,367.535 l-61.951,0 L 230.617,69.316 z M 279.588,103.028l-34.974,0 l0,21.157 l 34.974,0 L 279.588,103.028 z M 244.088,296.918l 34.993,0 
-	l0-33.19 l-34.993,0 L 244.088,296.918 z M 357.791,381.747l-58.011-21.729L 409.33,67.81l 58.016,21.778L 357.791,381.747z M 330.095,311.341
-	l-7.425,19.814l 32.771,12.293l 7.422-19.782L 330.095,311.341z M 407.63,104.6l-7.423,19.783l 32.75,12.267l 7.441-19.787L 407.63,104.6z"  />
-<glyph unicode="&#xe225;" d="M 153.537,150.157l0-62.41 l 23.68,0 l0,62.41 l 159.498,0 l0-62.41 l 23.68,0 l0,62.41 l 60.662,0 l 28.414,0 l0,28.414 L 449.471,390.072 L 449.471,418.487 l-28.414,0 L 88.773,418.487 
-		L 60.359,418.487 l0-28.415 l0-211.501 l0-28.414 l 28.414,0 L 153.537,150.157 z M 88.773,390.072l 332.283,0 l0-211.501 L 88.773,178.571 L 88.773,390.072 zM 117.189,361.657L 392.64,361.657L 392.64,206.986L 117.189,206.986zM 49.523,58.619L 462.476,58.619L 462.476,29.513L 49.523,29.513z"  />
-<glyph unicode="&#xe226;" d="M 188.488,141.078c-2.812,3.045-4.184,7.132-4.121,12.295l-19.194,0 c 0.881-10.727, 4.218-18.836, 9.939-24.43
-	c 5.724-5.524, 13.704-8.629, 23.873-9.385l0-11.607 l 8.044,0 l0,11.607 c 6.802,0.492, 12.396,1.832, 16.776,4.088
-	c 4.35,2.291, 7.849,4.875, 10.434,7.783c 2.583,2.912, 4.379,5.89, 5.396,8.926c 0.979,3.010, 1.504,5.594, 1.504,7.591
-	c0,2.253-0.165,4.872-0.524,7.783c-0.294,2.878-1.306,5.755-3.041,8.667c-1.732,2.908-4.413,5.719-8.044,8.402
-	c-3.632,2.68-8.828,4.938-15.531,6.77c-1.275,0.391-2.487,0.687-3.631,0.951c-1.146,0.258-2.26,0.557-3.338,0.849l0,24.097 
-	c 3.074,0, 5.722-1.272, 7.915-3.822c 2.192-2.521, 3.302-5.661, 3.402-9.258l 19.358,0 c-0.263,4.74-1.275,8.828-3.008,12.263
-	c-1.7,3.47-3.926,6.348-6.672,8.702c-2.716,2.257-5.888,4.087-9.482,5.394c-3.565,1.341-7.426,2.223-11.514,2.651l0,10.562 l-8.044,0 
-	l0-10.562 c-4.088-0.265-8.074-1.047-11.869-2.389c-3.794-1.276-7.196-3.141-10.072-5.562c-2.942-2.417-5.264-5.396-7.031-8.96
-	c-1.767-3.527-2.65-7.613-2.65-12.262c0-4.51, 0.754-8.303, 2.288-11.345c 1.571-3.040, 3.633-5.624, 6.215-7.653
-	c 2.586-2.059, 5.527-3.666, 8.795-4.906c 3.273-1.244, 6.608-2.29, 9.943-3.204c 0.915-0.166, 1.768-0.429, 2.55-0.624
-	c 0.753-0.229, 1.374-0.422, 1.832-0.619l0-28.484 C 194.799,136.203, 191.301,138.1, 188.488,141.078z M 207.029,161.549
-	c 5.364-1.435, 9.158-3.074, 11.383-4.838c 2.223-1.768, 3.335-4.451, 3.335-7.979c0-2.159-0.458-4.058-1.343-5.663
-	c-0.915-1.567-2.092-2.909-3.499-4.016c-1.403-1.086-3.010-1.934-4.773-2.521c-1.765-0.591-3.469-0.952-5.103-1.146L 207.029,161.549 z
-	 M 189.566,187.188c-1.896,1.669-2.843,3.956-2.843,6.963c0,1.931, 0.326,3.567, 1.013,4.971c 0.688,1.407, 1.604,2.616, 2.812,3.535
-	c 1.144,0.944, 2.484,1.664, 3.956,2.122c 1.439,0.46, 2.944,0.686, 4.48,0.686l0-22.236 C 194.604,184.211, 191.497,185.582, 189.566,187.188z
-	 M 143.852,371.234l0-25.898 l 303.11,0 l0-160.112 l 28.482,0 L 475.444,371.234 L 143.852,371.234 z M 36.752,77.7l 331.597,0 L 368.349,263.742 L 36.752,263.742 L 36.752,77.7 z M 202.551,245.623
-	c 32.015,0, 57.945-33.059, 57.945-73.871c0-40.781-25.931-73.838-57.945-73.838s-57.947,33.057-57.947,73.838
-	C 144.604,212.564, 170.536,245.623, 202.551,245.623z M 90.154,291.636l 303.113,0 l0-160.104 l 28.483,0 L 421.75,317.536 L 90.154,317.536 L 90.154,291.636 z"  />
-<glyph unicode="&#xe227;" d="M 167.359,167.937l-5.444,0 l-4.233-9.843l 10.496,0 c 1.912-11.905, 6.048-21.195, 12.411-27.795
-	c 7.012-7.395, 16.219-11.055, 27.681-11.055c 7.913,0, 14.913,1.764, 20.995,5.3l 0.147,20.599c-7.195-5.724-14.177-8.604-21.011-8.604
-	c-10.529,0-17.266,7.197-20.177,21.555l 23.727,0 l 4.231,9.843l-29.038,0 l 0.132,5.718l 30.543,0 l 4.217,9.813l-33.257,0 
-	c 3.173,12.458, 9.532,18.671, 19.082,18.671c 5.544,0, 11.496-2.057, 17.873-6.109l 8.304,17c-8.927,4.582-17.167,6.867-24.818,6.867
-	c-10.812,0-19.819-3.463-27.013-10.365c-6.803-6.376-11.315-15.072-13.491-26.063l-6.947,0 l-4.22-9.813l 9.942,0 
-	c-0.097-0.193-0.131-0.912-0.131-2.223L 167.36,167.937 z M 144.158,370.881l0-25.864 l 303.129,0 l0-160.144 l 28.449,0 L 475.736,370.881 L 144.158,370.881 z M 90.444,291.286
-	l 303.112,0 L 393.556,131.15 l 28.484,0 L 422.040,317.217 L 90.444,317.217 L 90.444,291.286 z M 37.043,77.381l 331.596,0 L 368.639,263.39 L 37.043,263.39 L 37.043,77.381 z M 202.842,245.309
-	c 31.999,0, 57.963-33.066, 57.963-73.877c0-40.775-25.964-73.869-57.963-73.869c-32.016,0-57.949,33.094-57.949,73.869
-	C 144.893,212.242, 170.826,245.309, 202.842,245.309z"  />
-<glyph unicode="&#xe228;" d="M 176.794,143.452c-1.389-1.917-3.042-3.666-4.888-5.249c-1.863-1.584-3.764-2.978-5.66-4.171l 8.438-12.538
-	c 2.633,2.006, 5.298,3.332, 7.979,4.019c 2.684,0.688, 5.25,1.030, 7.702,1.030c 2.993,0, 5.513-0.274, 7.506-0.82
-	c 1.992-0.539, 3.99-1.192, 6.002-1.894c 1.912-0.655, 4.005-1.193, 6.276-1.647c 2.272-0.461, 5.136-0.688, 8.584-0.688
-	c 3.467,0, 7.063,0.648, 10.776,1.912c 3.729,1.289, 7.245,3.494, 10.496,6.686l-8.189,13.768c-2.439-2.632-4.595-4.266-6.476-4.907
-	c-1.848-0.638-3.693-0.943-5.51-0.943c-1.814,0-3.581,0.146-5.314,0.452c-1.735,0.328-3.498,0.725-5.331,1.178
-	c-1.813,0.36-3.595,0.703-5.377,1.015c-1.781,0.326-3.58,0.492-5.378,0.492c-1.296,0-2.586-0.18-3.959-0.538
-	c-1.373-0.376-3.14-1.245-5.331-2.599l-0.262,0.257c 3.010,2.372, 5.593,5.070, 7.851,8.129c 2.223,3.042, 3.335,6.687, 3.335,10.969
-	c0,1.541-0.064,2.994-0.199,4.367c-0.145,1.371-0.456,2.729-0.881,4.086l 14.307,0 l0,11.593 l-18.133,0 
-	c-1.374,2.454-2.452,4.547-3.205,6.263c-0.785,1.731-1.34,3.254-1.634,4.579c-0.328,1.325-0.522,2.472-0.622,3.486
-	c-0.098,0.976-0.132,2.045-0.132,3.104c0,3.84, 1.193,6.883, 3.6,9.156c 2.419,2.272, 5.656,3.401, 9.759,3.401
-	c 3.452,0, 6.167-0.686, 8.096-2.097c 1.962-1.419, 3.433-3.072, 4.382-4.982c 0.948-1.913, 1.57-3.895, 1.831-5.938
-	c 0.279-2.043, 0.457-3.744, 0.555-5.118l 18.412,0 c0,11.086-2.913,19.557-8.732,25.359c-5.819,5.838-13.948,8.731-24.413,8.731
-	c-5.72,0-10.775-0.719-15.14-2.17c-4.364-1.459-7.995-3.44-10.905-5.938c-2.913-2.501-5.101-5.381-6.622-8.649
-	c-1.49-3.269-2.242-6.74-2.242-10.366c0-4.091, 0.69-7.833, 2.045-11.187c 1.356-3.368, 2.731-5.899, 4.090-7.637l-8.717,0 l0-11.593 l 13.506,0 
-	c 0.72-1.536, 1.325-3.057, 1.83-4.562c 0.49-1.501, 0.752-3.022, 0.752-4.555c0-2.475-0.457-4.814-1.373-7.039
-	C 179.378,147.426, 178.216,145.364, 176.794,143.452z M 143.879,370.665l0-25.889 L 446.99,344.776 l0-160.121 l 28.468,0 l0,186.010 L 143.879,370.665 z
-	 M 90.183,291.084l 303.113,0 l0-160.142 l 28.448,0 L 421.744,316.966 L 90.183,316.966 L 90.183,291.084 z M 36.767,77.164l 331.576,0 L 368.343,263.189 L 36.767,263.189 L 36.767,77.164 z
-	 M 202.547,245.085c 32.013,0, 57.965-33.074, 57.965-73.871c0-40.796-25.952-73.869-57.965-73.869
-	c-31.981,0-57.947,33.073-57.947,73.869C 144.6,212.011, 170.565,245.085, 202.547,245.085z"  />
-<glyph unicode="&#xe229;" d="M 169.763,171.299l0-12.949 l 19.523,0 l 1.93-3.961l0-6.273 l-21.453,0 l0-12.956 l 21.453,0 l0-18.815 l 20.734,0 l0,18.815 l 21.516,0 l0,12.956 L 211.95,148.116 
-	l0,6.273 l 2.027,3.961l 19.489,0 l0,12.949 l-12.952,0 l 21.127,42.412l-22.106,0 l-17.562-42.412l-18.017,42.412l-22.076,0 l 20.863-42.412L 169.763,171.299 z
-	 M 144.125,370.812l0-25.883 l 303.146,0 l0-160.126 l 28.483,0 L 475.754,370.812 L 144.125,370.812 z M 90.43,291.215l 303.111,0 l0-160.105 l 28.484,0 L 422.025,317.113 L 90.43,317.113 L 90.43,291.215 z
-	 M 37.028,77.295l 331.595,0 L 368.623,263.321 L 37.028,263.321 L 37.028,77.295 z M 202.823,245.217c 32.018,0, 57.95-33.057, 57.95-73.87
-	c0-40.796-25.933-73.856-57.95-73.856c-31.981,0-57.915,33.061-57.915,73.856C 144.908,212.16, 170.842,245.217, 202.823,245.217z"  />
-<glyph unicode="&#xe22a;" d="M 90.374,291.29l 303.112,0 l0-160.137 l 28.482,0 L 421.968,317.171 L 90.374,317.171 L 90.374,291.29 z M 144.069,370.871l0-25.883 l 303.113,0 l0-160.126 l 28.482,0 l0,186.010 
-	L 144.069,370.872 z M 36.94,77.375l 331.594,0 L 368.534,263.379 L 36.94,263.379 L 36.94,77.375 z M 202.77,245.281c 31.981,0, 57.948-33.064, 57.948-73.861
-	c0-40.807-25.967-73.871-57.948-73.871c-31.981,0-57.98,33.064-57.98,73.871C 144.79,212.217, 170.789,245.281, 202.77,245.281z
-	 M 198.876,120.734l 19.328,0 l0,95.46 l-15.37,0 c-0.556-3.649-1.702-6.692-3.433-9.143c-1.702-2.434-3.827-4.43-6.312-5.935
-	c-2.519-1.49-5.331-2.536-8.469-3.123c-3.14-0.59-6.378-0.85-9.744-0.754l0-14.603 l 24,0 L 198.876,120.734 z"  />
-<glyph unicode="&#xe22b;" d="M 300.945,317.857c-4.615,0-7.465-2.15-8.965-6.768c-1.684-5.166-2.539-13.337-2.539-24.298
-		c0-10.458, 0.859-18.522, 2.547-23.972c 1.508-4.882, 4.355-7.158, 8.957-7.158c 4.588,0, 7.402,2.269, 8.854,7.139
-		c 1.629,5.461, 2.457,13.533, 2.457,23.991c0,10.961-0.824,19.142-2.449,24.317C 308.365,315.712, 305.547,317.857, 300.945,317.857zM 300.945,192.143c-4.615,0-7.465-2.147-8.965-6.764c-1.684-5.166-2.539-13.342-2.539-24.299
-		c0-10.458, 0.859-18.521, 2.547-23.973c 1.508-4.885, 4.355-7.157, 8.957-7.157c 4.59,0, 7.402,2.267, 8.854,7.137
-		c 1.629,5.462, 2.457,13.533, 2.457,23.993c0,10.961-0.824,19.143-2.449,24.317C 308.365,189.999, 305.547,192.143, 300.945,192.143zM 211.057,192.143c-4.615,0-7.465-2.147-8.967-6.766c-1.684-5.172-2.537-13.345-2.537-24.297
-		c0-10.45, 0.857-18.517, 2.547-23.973c 1.512-4.885, 4.359-7.157, 8.957-7.157c 4.59,0, 7.4,2.267, 8.852,7.137
-		c 1.631,5.466, 2.457,13.535, 2.457,23.993c0,10.955-0.824,19.137-2.447,24.317C 218.475,189.999, 215.66,192.143, 211.057,192.143zM 121.168,317.857c-4.617,0-7.465-2.15-8.967-6.768c-1.684-5.162-2.535-13.337-2.535-24.298
-		c0-10.458, 0.855-18.522, 2.543-23.972c 1.512-4.882, 4.359-7.158, 8.959-7.158c 4.588,0, 7.4,2.269, 8.852,7.139
-		c 1.631,5.461, 2.455,13.533, 2.455,23.991c0,10.961-0.824,19.142-2.447,24.317C 128.584,315.712, 125.77,317.857, 121.168,317.857zM 390.836,317.857c-4.617,0-7.469-2.15-8.967-6.768c-1.684-5.166-2.539-13.337-2.539-24.298
-		c0-10.458, 0.857-18.522, 2.547-23.972c 1.51-4.882, 4.357-7.158, 8.959-7.158c 4.588,0, 7.4,2.269, 8.852,7.139
-		c 1.627,5.461, 2.455,13.533, 2.455,23.991c0,10.961-0.824,19.142-2.449,24.317C 398.252,315.712, 395.436,317.857, 390.836,317.857zM 423.141,378.188L 88.859,378.188 c-19,0-34.41-15.404-34.41-34.412l0-239.551 c0-19.003, 15.41-34.412, 34.41-34.412l 334.281,0 
-		c 19,0, 34.41,15.409, 34.41,34.412L 457.55,343.775 C 457.551,362.783, 442.141,378.188, 423.141,378.188z M 198.682,334.209l 24.746,0 l0-94.706 
-		l-24.746,0 L 198.682,334.209 z M 133.541,113.794l-24.748,0 l0,94.699 l 24.748,0 L 133.541,113.794 z M 147.738,250.371c-5.113-8.89-14.053-13.398-26.57-13.398
-		c-12.52,0-21.459,4.509-26.57,13.398c-4.914,8.546-7.404,20.801-7.404,36.421c0,15.619, 2.49,27.891, 7.402,36.48
-		c 5.109,8.935, 14.049,13.464, 26.572,13.464c 12.52,0, 21.461-4.529, 26.572-13.464c 4.91-8.594, 7.4-20.868, 7.4-36.48
-		C 155.141,271.178, 152.65,258.923, 147.738,250.371z M 237.625,124.66c-5.111-8.89-14.051-13.399-26.568-13.399
-		c-12.525,0-21.465,4.51-26.57,13.399c-4.914,8.55-7.406,20.803-7.406,36.42c0,15.613, 2.492,27.888, 7.402,36.479
-		c 5.111,8.938, 14.051,13.47, 26.574,13.47c 12.518,0, 21.457-4.532, 26.572-13.468c 4.91-8.593, 7.4-20.867, 7.4-36.48
-		C 245.029,145.463, 242.539,133.21, 237.625,124.66z M 327.512,124.66c-5.109-8.89-14.045-13.399-26.566-13.399
-		c-12.523,0-21.461,4.51-26.568,13.399c-4.914,8.55-7.406,20.803-7.406,36.42c0,15.613, 2.492,27.888, 7.402,36.479
-		c 5.109,8.938, 14.049,13.47, 26.572,13.47c 12.521,0, 21.461-4.532, 26.568-13.47c 4.916-8.591, 7.404-20.861, 7.404-36.479
-		S 332.428,133.206, 327.512,124.66z M 327.512,250.371c-5.109-8.89-14.049-13.398-26.566-13.398c-12.521,0-21.461,4.509-26.568,13.398
-		c-4.914,8.552-7.406,20.805-7.406,36.421c0,15.615, 2.492,27.887, 7.402,36.48c 5.109,8.935, 14.049,13.464, 26.572,13.464
-		c 12.521,0, 21.461-4.529, 26.568-13.464c 4.916-8.59, 7.404-20.863, 7.404-36.48C 334.918,271.174, 332.43,258.921, 327.512,250.371z
-		 M 417.402,124.66c-5.109-8.89-14.049-13.399-26.566-13.399c-12.523,0-21.463,4.51-26.57,13.399
-		c-4.914,8.546-7.406,20.801-7.406,36.42s 2.492,27.89, 7.404,36.479c 5.107,8.938, 14.047,13.47, 26.572,13.47
-		c 12.518,0, 21.457-4.532, 26.57-13.47c 4.912-8.591, 7.4-20.865, 7.4-36.479C 424.807,145.463, 422.316,133.206, 417.402,124.66z
-		 M 417.402,250.371c-5.111-8.891-14.051-13.398-26.566-13.398c-12.52,0-21.461,4.508-26.574,13.398
-		c-4.912,8.552-7.402,20.803-7.402,36.421c0,15.615, 2.49,27.889, 7.398,36.48c 5.113,8.935, 14.055,13.464, 26.578,13.464
-		c 12.518,0, 21.457-4.529, 26.568-13.464c 4.914-8.592, 7.402-20.863, 7.402-36.48C 424.807,271.174, 422.316,258.921, 417.402,250.371zM 390.836,192.143c-4.619,0-7.469-2.147-8.967-6.764c-1.682-5.162-2.537-13.338-2.537-24.299
-		c0-10.462, 0.857-18.527, 2.545-23.973c 1.51-4.885, 4.357-7.157, 8.959-7.157c 4.588,0, 7.4,2.267, 8.852,7.137
-		c 1.629,5.466, 2.459,13.541, 2.459,23.993c0,10.955-0.828,19.137-2.453,24.317C 398.252,189.999, 395.438,192.143, 390.836,192.143z"  />
-<glyph unicode="&#xe22c;" d="M 439.554,131.205c-0.326,3.312-0.926,6.543-1.768,9.686l 0.002,0 l-32.572,125.843c-3.986,33.326-31.947,58.288-65.629,58.288
-		c-2.18,0-4.387-0.109-6.566-0.324c-17.592-1.735-33.457-10.219-44.672-23.887c-1.514-1.849-2.881-3.784-4.178-5.756l-56.906,0 
-		c-1.135,1.668-2.322,3.31-3.617,4.889c-11.213,13.667-27.078,22.15-44.672,23.886c-2.176,0.215-4.387,0.323-6.562,0.323
-		c-33.684,0-61.645-24.961-65.631-58.287L 74.21,140.022l 0.002,0 c-0.842-3.142-1.441-6.374-1.768-9.685
-		c-1.848-18.721, 4.994-37.035, 19.271-51.566c 13.703-13.95, 32.75-22.768, 53.627-24.826c 3.070-0.303, 6.179-0.457, 9.24-0.457
-		c0,0,0,0, 0.002,0c 40.561,0.001, 73.736,26.281, 77.178,61.13c 0.020,0.203, 0.023,0.404, 0.043,0.606l 0.002,0 l 0.006,0.125
-		c 0.131,1.488, 0.195,2.973, 0.213,4.455l 1.072,22.303l 45.842,0 l 1.029-21.435c 0.019-1.482, 0.084-2.967, 0.213-4.455l 0.008-0.124l 0.002,0 
-		c 0.020-0.203, 0.023-0.404, 0.043-0.607c 3.439-34.85, 36.619-61.129, 77.178-61.13c 0.002,0, 0.002,0, 0.002,0
-		c 3.061,0, 6.17,0.154, 9.24,0.457c 20.881,2.060, 39.926,10.876, 53.627,24.825C 434.56,94.172, 441.402,112.486, 439.554,131.205z
-		 M 207.677,116.849c-2.299-22.344-25.086-39.177-53.094-39.179c-2.27,0-4.582,0.115-6.865,0.34
-		c-15.252,1.505-29.012,7.793-38.75,17.708c-9.166,9.33-13.588,20.781-12.459,32.245c 2.211,22.415, 25.045,39.318, 53.109,39.318
-		c 2.273,0, 4.586-0.113, 6.873-0.34c 15.248-1.504, 29.008-7.791, 38.748-17.705c 8.725-8.881, 13.092-19.687, 12.524-30.593
-		L 207.677,116.849z M 403.031,96.586c-9.738-9.914-23.5-16.203-38.748-17.707c-2.287-0.226-4.596-0.34-6.867-0.34
-		c-28.008,0.001-50.793,16.834-53.092,39.178l-0.086,1.796c-0.57,10.906, 3.797,21.712, 12.521,30.593
-		c 9.74,9.913, 23.498,16.2, 38.75,17.705c 2.285,0.225, 4.598,0.34, 6.871,0.34c 28.066,0, 50.898-16.904, 53.109-39.319
-		C 416.621,117.367, 412.197,105.916, 403.031,96.586zM 292.517,333.294c 10.822,10.956, 24.988,17.742, 40.504,19.273c 2.18,0.215, 4.385,0.324, 6.562,0.324
-		c 12.385,0, 23.986-3.386, 33.916-9.308l-3.914,16.414c-0.15,1.245-1.238,6.238-1.238,6.238
-		c-4.734,16.529-19.814,28.275-37.596,28.275c-1.287,0-2.594-0.064-3.883-0.191c-19.061-1.88-33.584-17.207-35.16-35.644
-		c0,0-0.115-5.005-0.025-6.209L 292.517,333.294zM 178.976,351.699c 15.518-1.532, 29.686-8.318, 40.508-19.273l 0.832,19.174c 0.092,1.204-0.025,6.209-0.025,6.209
-		c-1.576,18.436-16.1,33.764-35.162,35.644c-1.287,0.127-2.594,0.191-3.881,0.191c-17.779,0-32.861-11.746-37.598-28.275
-		c0,0-1.086-4.992-1.234-6.238l-3.918-16.414c 9.93,5.922, 21.533,9.308, 33.918,9.308C 174.593,352.023, 176.8,351.915, 178.976,351.699z
-		"  />
-<glyph unicode="&#xe22d;" d="M 263.41,93.491c 17.477,2.091, 40.142,6.242, 62.914,12.162c-30.231,4.022-59.352,9.399-81.375,14.323
-	c-14.129,3.204-25.182,6.129-32.441,8.78c-34.009,12.411-54.3,45.603-54.219,80.923c0,10.789, 1.863,21.889, 5.803,32.7
-	c 5.938,16.382, 16.336,28.894, 29.073,36.739c 2.518,1.553, 5.135,2.895, 7.785,4.104c-5.103,4.088-9.812,8.244-13.949,12.364
-	c0,0-17.789,28.629-26.161,92.382c-5.348,40.678-55.904,49.182-76.113,28.939c-33.241-33.259-30.102-46.959-30.102-46.959
-	s 26.748,6.312, 33.911,2.161c 12.443-7.162, 9.55-57.966-3.957-126.851c-9.826-50.299-0.065-97.88, 101.654-123.942
-	c 2.256-3.106, 4.757-5.983, 7.439-8.666c 7.604-11.133, 22.041-30.968, 34.992-41.039l-6.427-25.804l-58.715-11.148l 4.203-22.042
-	l 63.064,11.967l 45.896-13.963l 6.542,21.473l-38.377,11.654l 6.427,25.835C 256.705,75.044, 260.481,84.855, 263.41,93.491z
-	 M 455.645,145.061c-3.76,5.101-9.809,11.248-17.428,17.723c-15.323,12.98-36.89,27.256-59.633,40.632
-	c-45.391,26.766-96.274,50.407-112.82,56.376c-10.155,3.713-20.601,5.678-30.299,5.678c-11.119,0-21.11-2.521-29.138-7.526
-	c-8.027-5.032-14.486-12.457-18.804-24.129c-2.927-8.048-4.315-16.223-4.315-24.134c 0.082-26.1, 14.683-49.12, 37.852-57.527
-	c 5.166-1.896, 15.842-4.806, 29.365-7.847c 13.539-3.043, 30.136-6.312, 48.038-9.253c 35.776-5.969, 76.917-10.796, 109.42-10.757
-	c 12.134,0, 23.041,0.686, 31.771,2.075c 8.766,1.357, 15.273,3.645, 18.28,5.671c 1.995,1.342, 2.323,2.097, 2.422,2.292
-	c 0.031,0.196, 0.064,0.359, 0.097,0.719C 460.551,136.067, 459.504,139.942, 455.645,145.061z"  />
-<glyph unicode="&#xe22e;" d="M 75.638,80.693L 436.363,80.693L 436.363,39.986L 75.638,39.986zM 133.724,182.18c 18.557,0, 33.654,15.1, 33.654,33.654l 14.209,0 c0-18.555, 15.096-33.654, 33.652-33.654
-		c 18.561,0, 33.656,15.1, 33.656,33.654l 14.207,0 c0-18.555, 15.098-33.654, 33.656-33.654c 18.557,0, 33.654,15.1, 33.654,33.654l 14.207,0 
-		c0-18.555, 15.098-33.654, 33.654-33.654c 16.338,0, 29.98,11.705, 33.014,27.164L 411.287,221.48 c0,22.602-17.488,41.080-39.664,42.744l0,68.934 
-		c-4.98-2.539-10.596-4.002-16.559-4.002c-5.955,0-11.57,1.461-16.547,3.994l0-68.764 l-65.967,0 l0,68.77 c-4.979-2.539-10.592-4-16.553-4
-		c-5.959,0-11.574,1.461-16.551,4l0-68.77 l-65.965,0 l0,68.77 c-4.979-2.539-10.592-4-16.553-4s-11.574,1.461-16.553,4l0-68.932 
-		c-22.18-1.66-39.668-20.143-39.668-42.744l0-12.129 C 103.741,193.891, 117.384,182.18, 133.724,182.18zM 411.288,181.27c-8.596-8.215-20.213-13.297-33.014-13.297c-17.238,0-32.33,9.191-40.758,22.898
-		c-8.428-13.707-23.521-22.898-40.758-22.898c-17.238,0-32.332,9.191-40.76,22.898c-8.428-13.707-23.52-22.898-40.76-22.898
-		c-17.238,0-32.33,9.191-40.756,22.898c-8.43-13.707-23.523-22.898-40.76-22.898c-12.803,0-24.418,5.082-33.014,13.297l0-73.787 
-		l 310.578,0 L 411.286,181.27 zM 255.999,345.709c 11.078,0, 20.059,8.984, 20.059,20.061c0,11.078-20.059,42.244-20.059,42.244s-20.061-31.166-20.061-42.244
-		C 235.938,354.693, 244.921,345.709, 255.999,345.709zM 355.065,345.709c 11.080,0, 20.061,8.984, 20.061,20.061c0,11.078-20.061,42.244-20.061,42.244s-20.057-31.166-20.057-42.244
-		C 335.009,354.693, 343.989,345.709, 355.065,345.709zM 156.931,345.709c 11.080,0, 20.061,8.984, 20.061,20.061c0,11.078-20.061,42.244-20.061,42.244s-20.059-31.166-20.059-42.244
-		C 136.872,354.693, 145.854,345.709, 156.931,345.709z"  />
-<glyph unicode="&#xe22f;" d="M 334.622,153.918L 310.952,153.918L 310.952,130.24L 334.622,130.24L 334.622,116.455L 355.933,116.455L 355.933,165.983L 334.622,165.983 	zM 156.138,296.173L 169.060,296.173L 169.060,272.493L 192.738,272.493L 192.738,296.173L 205.662,296.173L 205.662,317.484L 156.138,317.484 	zM 169.060,248.814L 192.739,248.814L 192.739,225.135L 169.060,225.135zM 169.060,201.457L 192.739,201.457L 192.739,177.777L 169.060,177.777zM 169.060,130.24L 192.738,130.24L 192.738,142.079L 192.738,154.098L 169.060,154.098 	zM 263.595,153.918L 287.275,153.918L 287.275,130.24L 263.595,130.24zM 216.236,153.918L 239.916,153.918L 239.916,130.24L 216.236,130.24zM 390.006,334.667L 310.575,414.1l-6.937,6.936L 115.060,421.036 l0-394.070 L 396.94,26.966 L 396.94,327.732 L 390.006,334.667z M 373.262,50.641
-		l-234.524,0.002L 138.738,397.356 l 133.921,0 c 35.181,0, 18.229-83.393, 18.229-83.393s 81.329,19.766, 82.374-17.526
-		C 373.262,232.967, 373.262,50.641, 373.262,50.641zM 232.367,193.918L 355.933,193.918L 232.367,317.484 	z"  />
-<glyph unicode="&#xe230;" d="M 254.501,441.84c-120.308,0-217.838-97.53-217.838-217.838c0-120.31, 97.53-217.838, 217.838-217.838
-	c 120.31,0, 217.838,97.528, 217.838,217.838C 472.339,344.31, 374.811,441.84, 254.501,441.84z M 406.168,224.002
-	c0-29.861-8.711-57.708-23.671-81.209L 173.293,351.998c 23.499,14.961, 51.345,23.67, 81.208,23.67
-	C 338.13,375.667, 406.168,307.631, 406.168,224.002z M 102.836,224.002c0,29.859, 8.71,57.707, 23.67,81.204l 209.201-209.201
-	c-23.498-14.96-51.346-23.671-81.206-23.671C 170.869,72.334, 102.836,140.374, 102.836,224.002z"  />
-<glyph unicode="&#xe231;" d="M 367.078,307.926L 239.685,435.314l0-167.938 l-70.067,70.070l-25.483-25.485l 87.934-88.163l-87.934-88.169l 25.483-25.483
-	l 70.067,70.077l0-167.945 l 127.394,127.391l-84.128,84.13L 367.078,307.926z M 316.169,307.757l-40.645-40.648l-0.033,81.322
-	L 316.169,307.757z M 316.169,139.967l-40.678-40.675l 0.033,81.321L 316.169,139.967z"  />
-<glyph unicode="&#xe232;" d="M 443.984,217.396L 443.984,290.116L 411.96,290.116L 411.96,332.798L 382.854,332.798L 382.854,290.116L 345.314,290.116L 345.314,270.377L 365.226,250.468L 365.226,217.396L 169.923,217.396L 154.259,238.749L 49.196,238.749L 131.45,115.202L 462.804,115.202L 462.804,217.396 	zM 185.089,272.078L 236.983,272.078L 236.983,232.48L 185.089,232.48zM 268.841,272.078L 320.731,272.078L 320.731,232.48L 268.841,232.48z"  />
-<glyph unicode="&#xe233;" d="M 288,368.291c-2.184,2.181-5.139,3.405-8.225,3.405c-3.084,0-6.041-1.225-8.223-3.406l-17.182-17.186
-		c-54.131,19.107-116.814,7.023-160.113-36.271c-60.082-60.082-60.082-157.501,0-217.582c 60.082-60.080, 157.496-60.080, 217.578,0.003
-		c 43.301,43.298, 55.385,105.981, 36.275,160.112l 17.182,17.184c 4.543,4.541, 4.543,11.903,0,16.445L 288,368.291zM 396.459,395.354c-27.244-3.242-46.768-23.429-55.844-34.934l 19.766-19.767c 5.002,6.903, 19.822,24.942, 39.471,27.213
-		c 13.863,1.604, 28.449-5.151, 43.369-20.069l 19.582,19.584C 441.533,388.651, 419.201,398.063, 396.459,395.354z"  />
-<glyph unicode="&#xe234;" d="M 475.646,328.506c-0.583,0.969-10.253,17.847-29.679,35.168c-19.301,17.234-49.217,35.208-88.636,35.208
-	c-39.42,0.012-69.042-18.030-87.956-35.339c-5.853-5.346-10.781-10.649-14.817-15.455c-4.176,4.837-9.279,10.189-15.326,15.586
-	c-19.3,17.234-49.216,35.208-88.635,35.208c-39.419,0.012-69.048-18.030-87.957-35.339c-19.042-17.393-28.303-34.318-28.874-35.324
-	l-1.99-7.797l0-254.555 l 30.498-7.786l 0.052-0.032c 0.428,0.815, 8.618,14.93, 23.666,28.164c 15.168,13.297, 36.331,25.534, 64.604,25.555
-	c 29.174,0, 51.356-13.12, 66.994-26.967c 7.757-6.903, 13.685-13.877, 17.581-19.039c 1.948-2.572, 3.389-4.691, 4.309-6.107
-	c 0.393-0.598, 0.668-1.039, 0.872-1.367c 2.713-5.213, 8.152-8.777, 14.432-8.777c 6.397,0, 11.916,3.699, 14.576,9.062
-	c 1.596,2.721, 9.607,15.531, 23.375,27.641c 15.161,13.297, 36.323,25.534, 64.597,25.555c 29.173,0, 51.354-13.12, 67.003-26.967
-	c 7.748-6.903, 13.678-13.877, 17.572-19.039c 1.954-2.572, 3.395-4.691, 4.316-6.107c 0.455-0.701, 0.785-1.24, 0.984-1.562
-	c 0.1-0.163, 0.162-0.267, 0.193-0.326l 0.043,0.023l 30.357,8.077L 477.8,320.422 L 475.646,328.506z M 238.512,109.733
-	c-19.32,17.049-48.97,34.59-87.915,34.59l-0.046,0 c-38.249,0-67.271-16.998-86.226-33.819l0,205.35 
-	c 3.309,5.068, 10.651,15.227, 21.667,24.916c 15.168,13.309, 36.331,25.544, 64.604,25.556c 29.174,0, 51.356-13.112, 66.994-26.968
-	c 7.757-6.894, 13.685-13.877, 17.581-19.036c 1.371-1.812, 2.475-3.382, 3.34-4.653L 238.511,109.733 z M 445.244,109.753
-	c-19.319,17.042-48.98,34.57-87.913,34.57c-38.285,0.012-67.3-17.008-86.267-33.844L 271.064,315.852 c 3.307,5.062, 10.637,15.213, 21.67,24.918
-	c 15.161,13.309, 36.323,25.544, 64.597,25.556c 29.173,0, 51.354-13.112, 67.003-26.968c 7.748-6.894, 13.678-13.877, 17.572-19.036
-	c 1.363-1.796, 2.478-3.372, 3.338-4.64L 445.244,109.753 z M 83.806,300.245l 13.358-17.522l 1.741-2.447c 0.829,0.554, 18.427,12.986, 53.962,13.008
-	c 18.98,0, 33.073-3.563, 42.304-6.975c 4.616-1.705, 8.006-3.385, 10.144-4.559c 1.076-0.597, 1.832-1.063, 2.279-1.344
-	c 0.211-0.131, 0.349-0.227, 0.418-0.272c 0.005-0.008, 0.011-0.010, 0.017-0.014l 0.025-0.020l 4.009,5.694l 10.631,14.622
-	c-1.48,1.102-25.478,17.917-69.827,17.909C 108.519,318.35, 85.342,301.471, 83.806,300.245z M 98.907,226.133
-	c 0.823,0.553, 18.425,12.984, 53.958,13.006c 18.98-0.010, 33.079-3.569, 42.307-6.98c 4.61-1.698, 8-3.383, 10.142-4.562
-	c 1.079-0.587, 1.837-1.053, 2.276-1.331c 0.22-0.143, 0.363-0.24, 0.426-0.285c 0.020-0.014, 0.032-0.021, 0.035-0.021l 3.926,5.572
-	l 10.713,14.732l0,0.010 c-1.483,1.106-25.476,17.917-69.826,17.901c-44.349,0.031-67.52-16.854-69.059-18.072l 15.177-19.914
-	l-1.837,2.403L 98.907,226.133z M 83.805,191.96l 13.848-18.179l-0.497,0.645l 1.749-2.439l 0.078,0.049
-	c 1.509,1.021, 19.11,12.932, 53.886,12.953c 18.98,0, 33.073-3.559, 42.303-6.977c 4.612-1.705, 8.001-3.375, 10.147-4.559
-	c 1.073-0.588, 1.833-1.056, 2.274-1.334c 0.212-0.137, 0.351-0.234, 0.42-0.278c 0.005-0.006, 0.011-0.008, 0.017-0.010l 0.025-0.023
-	l 4.050,5.749l 10.59,14.567c-1.487,1.109-25.477,17.921-69.826,17.907C 108.513,210.053, 85.347,193.183, 83.805,191.96z
-	 M 416.166,280.101l 4.148,5.884l-4.23-5.818l-0.002-0.004C 416.131,280.126, 416.16,280.106, 416.166,280.101z M 305.269,282.729
-	l 1.755-2.449l 0.001-0.004c 0.821,0.554, 18.427,12.986, 53.963,13.008c 18.978,0, 33.073-3.563, 42.302-6.975
-	c 4.61-1.705, 8-3.385, 10.145-4.559c 1.070-0.597, 1.834-1.063, 2.273-1.344c 0.175-0.102, 0.299-0.189, 0.377-0.24l 14.723,20.251
-	c-1.48,1.102-25.471,17.917-69.819,17.909c-44.356,0.023-67.526-16.855-69.069-18.081l 15.178-19.911L 305.269,282.729z
-	 M 307.021,226.133c 0.828,0.553, 18.426,12.984, 53.966,13.006c 18.978-0.010, 33.073-3.569, 42.299-6.98
-	c 4.618-1.698, 8.009-3.383, 10.15-4.562c 1.070-0.587, 1.829-1.053, 2.27-1.331c 0.19-0.119, 0.32-0.211, 0.396-0.26
-	c 0.035-0.027, 0.059-0.047, 0.064-0.047l 3.984,5.646l 10.656,14.659l0,0.010 c-1.477,1.106-25.471,17.917-69.819,17.901
-	c-44.356,0.031-67.527-16.854-69.066-18.072l 15.177-19.914l-1.829,2.394L 307.021,226.133z M 291.921,191.96l 13.383-17.569
-	l 1.718-2.404c 0.016,0.013, 0.043,0.028, 0.074,0.049c 1.513,1.021, 19.111,12.932, 53.889,12.953c 18.98,0, 33.071-3.559, 42.302-6.977
-	c 4.612-1.705, 8.002-3.375, 10.147-4.559c 1.073-0.588, 1.834-1.056, 2.275-1.334c 0.21-0.137, 0.351-0.234, 0.416-0.278
-	c 0.007-0.006, 0.012-0.008, 0.018-0.010l 0.027-0.023l 4.049,5.749l 10.589,14.567c-1.478,1.109-25.475,17.921-69.823,17.907
-	C 316.628,210.053, 293.463,193.183, 291.921,191.96z"  />
-<glyph unicode="&#xe235;" d="M 79.498,258.115c 14.242-2.536, 25.9-4.627, 25.9-4.61c0,0, 10.972-4.563, 24.331-10.102l 23.788-9.896l 80.055,33.21
-			l-80.625,33.487c-13.378,5.57-32.181,18.965-41.812,29.791l-12.179,13.714c-9.63,10.825-20.244,8.16-23.579-5.936l-1.603-6.685
-			c-3.354-14.096-14.781-33.699-25.394-43.558l-2.271-2.124c-10.612-9.875-7.634-20.015, 6.621-22.548L 79.498,258.115z
-			 M 459.484,185.405l-26.751,4.741c-14.266,2.531-25.939,4.61-25.939,4.61s-10.938,4.542-24.299,10.089l-23.35,9.694l-80.068-33.192
-			l 80.166-33.321c 13.393-5.562, 32.212-18.953, 41.842-29.776l 12.183-13.703c 9.614-10.858, 20.218-8.178, 23.586,5.92l 1.604,6.707
-			c 3.334,14.074, 14.747,33.683, 25.344,43.537l 2.319,2.143C 476.719,172.715, 473.742,182.854, 459.484,185.405z M 433.355,251.803
-			l 18.312-1.046c 14.452-0.835, 20.077,8.55, 12.459,20.882l-3.629,5.85c-7.588,12.333-13.409,34.253-12.918,48.73l 0.097,3.154
-			c 0.523,14.469-8.765,19.507-20.625,11.2l-22.27-15.602c-11.839-8.307-21.549-15.108-21.549-15.108s-10.956-4.526-24.314-10.071
-			l-229.616-95.213c-13.358-5.522-36.15-9.397-50.606-8.563l-18.33,1.061c-14.438,0.818-20.047-8.58-12.441-20.896l 3.629-5.866
-			c 7.586-12.312, 13.407-34.239, 12.9-48.709l-0.114-3.175c-0.49-14.452, 8.796-19.492, 20.652-11.184l 22.252,15.584
-			c 11.856,8.308, 21.583,15.124, 21.583,15.124s 10.94,4.526, 24.331,10.072l 229.583,95.196
-			C 396.115,248.776, 418.892,252.623, 433.355,251.803z"  />
-<glyph unicode="&#xe236;" d="M 475.88,328.385c-0.583,0.961-10.257,17.833-29.675,35.154c-19.305,17.239-49.226,35.216-88.641,35.21
-	c-39.424,0.020-69.047-18.022-87.958-35.329c-5.853-5.35-10.779-10.653-14.814-15.459c-4.176,4.838-9.279,10.188-15.325,15.578
-	c-19.302,17.239-49.225,35.216-88.635,35.21c-39.428,0.020-69.049-18.022-87.962-35.329c-19.041-17.4-28.3-34.322-28.873-35.328
-	l-1.991-7.796l0-254.56 l 30.49-7.78l 0.066-0.039c 0.423,0.818, 8.621,14.927, 23.664,28.167c 15.169,13.298, 36.324,25.537, 64.605,25.557
-	c 29.166-0.006, 51.354-13.121, 66.996-26.975c 7.746-6.894, 13.684-13.88, 17.578-19.031c 1.951-2.583, 3.393-4.701, 4.313-6.109
-	c 0.462-0.707, 0.791-1.241, 0.985-1.562c 0.091-0.155, 0.157-0.263, 0.191-0.314l0,0l 0.008-0.006l 0.006,0.002
-	c 2.808-4.888, 8.066-8.192, 14.113-8.192c 6.155,0, 11.507,3.421, 14.271,8.464l 0.002,0 c0,0, 0.021,0.039, 0.025,0.049l 0.008,0.014
-	c 0.617,1.129, 8.778,15.029, 23.632,28.104c 15.169,13.298, 36.327,25.537, 64.603,25.557c 29.178-0.006, 51.36-13.121, 67.002-26.975
-	c 7.752-6.894, 13.677-13.88, 17.576-19.031c 1.949-2.583, 3.393-4.701, 4.312-6.109c 0.463-0.707, 0.792-1.241, 0.984-1.562
-	c 0.092-0.155, 0.163-0.263, 0.192-0.314l 0.004-0.006l 0.029,0.012l 30.37,8.081l0,254.56 L 475.88,328.385z M 150.832,144.194l-0.062,0 
-	c-38.245,0-67.258-16.996-86.213-33.819L 64.557,315.721 c 3.311,5.068, 10.654,15.229, 21.67,24.919c 15.169,13.31, 36.324,25.539, 64.605,25.559
-	c 29.166,0, 51.354-13.122, 66.996-26.974c 7.746-6.891, 13.684-13.875, 17.578-19.030c 1.371-1.815, 2.479-3.382, 3.338-4.655l0-205.933 
-	C 219.423,126.651, 189.768,144.194, 150.832,144.194z M 445.484,109.624c-19.324,17.040-48.99,34.57-87.92,34.57
-	c-38.292,0.018-67.307-17.006-86.275-33.849L 271.289,315.711 c 3.305,5.058, 10.639,15.217, 21.673,24.929
-	c 15.169,13.31, 36.327,25.539, 64.603,25.559c 29.178,0, 51.36-13.122, 67.002-26.974c 7.752-6.891, 13.677-13.875, 17.576-19.030
-	c 1.367-1.802, 2.479-3.382, 3.342-4.651L 445.485,109.624 z"  />
-<glyph unicode="&#xe237;" d="M 131.408,433.059c-13.312-0.072-25.541-3.347-35.395-9.519c-4.941-3.13-9.325-7.050-12.638-11.991
-	c-3.315-4.905-5.475-11.001-5.459-17.444l0-328.703 c-0.016-6.447, 2.144-12.545, 5.459-17.448c 5.006-7.398, 12.26-12.545, 20.489-16.090
-	c 8.101-3.446, 17.312-5.331, 27.122-5.414l 252.696-19.647l0,47.736 l 49.976,2.327L 433.658,441.487 L 131.408,433.059z M 280.905,184.628
-	l-104.428,8.117l 2.384,30.685l 104.428-8.122L 280.905,184.628z M 327.381,257.967l-180.943,14.494l 2.453,30.679l 180.944-14.491
-	L 327.381,257.967z M 406.338,82.938l-22.654-1.053L 383.684,362.899 L 132.196,382.462l-0.574,0 c-8.726-0.036-16.434,2.348-21.026,5.3
-	c-2.303,1.442-3.794,2.979-4.526,4.091c-0.739,1.148-0.82,1.712-0.838,2.252c 0.018,0.539, 0.099,1.099, 0.838,2.249
-	c 1.067,1.676, 3.977,4.256, 8.523,6.171c 4.516,1.935, 10.486,3.227, 17.029,3.221l 0.126,0 l 274.59,7.661L 406.338,82.938 z"  />
-<glyph unicode="&#xe238;" d="M 216.269,228.119l0-16.153 l 24.299,0 l 2.353-4.939l0-7.8 l-26.651,0 l0-16.154 l 26.651,0 l0-23.448 l 25.838,0 l0,23.448 l 26.844,0 l0,16.154 l-26.844,0 l0,7.8 
-	l 2.549,4.939l 24.295,0 l0,16.153 L 279.48,228.119 l 26.326,52.825l-27.536,0 l-21.911-52.825l-22.431,52.825l-27.535,0 l 25.996-52.825L 216.269,228.119 z
-	 M 424.221,128.312L 424.221,318.752 L 306.789,318.752 c 19.751-21.962, 32.437-56.428, 32.437-95.212c0-38.783-12.686-73.253-32.437-95.229L 424.221,128.311 z
-	 M 38.668,368.786l0-289.492 l 434.865,0 L 473.533,368.786 L 38.668,368.786 z M 449.168,103.376L 63.031,103.376 L 63.031,343.701 l 386.137,0 L 449.168,103.376 z M 172.971,223.54
-	c0,38.784, 12.69,73.25, 32.475,95.212L 87.947,318.752 l0-190.441 l 117.498,0 C 185.661,150.287, 172.971,184.757, 172.971,223.54z"  />
-<glyph unicode="&#xe239;" d="M 298.953,188.597c 0.789,0, 1.557-0.047, 2.285-0.153l 25.752-3.641c 0.518-0.073, 1.033-0.108, 1.543-0.108
-		c 5.371,0, 10.227,3.938, 11.176,9.347l 4.492,25.616c 1.039,5.925, 6.234,13.076, 11.549,15.897l 22.977,12.189
-		c 5.311,2.821, 7.498,9.548, 4.855,14.952l-11.422,23.364c-2.643,5.405-2.643,14.246,0,19.651l 11.422,23.363
-		c 2.643,5.405, 0.455,12.13-4.855,14.953l-22.977,12.188c-5.314,2.82-10.51,9.973-11.549,15.897l-4.492,25.615
-		c-0.949,5.409-5.807,9.348-11.18,9.348c-0.508,0-1.021-0.034-1.539-0.108l-25.752-3.646c-0.729-0.101-1.492-0.151-2.281-0.151
-		c-5.668,0-12.611,2.555-16.406,6.225l-18.691,18.085c-2.16,2.093-5.010,3.135-7.859,3.135c-2.848,0-5.697-1.042-7.859-3.135
-		l-18.695-18.085c-3.795-3.67-10.738-6.225-16.406-6.225c-0.789,0-1.553,0.051-2.281,0.151l-25.754,3.646
-		c-0.516,0.074-1.029,0.108-1.539,0.108c-5.373,0-10.229-3.938-11.178-9.348l-4.492-25.615c-1.039-5.925-6.236-13.079-11.549-15.897
-		l-22.971-12.188c-5.314-2.818-7.5-9.548-4.857-14.953l 11.42-23.363c 2.643-5.405, 2.643-14.246,0-19.651l-11.42-23.364
-		c-2.643-5.404-0.457-12.135, 4.857-14.952l 22.971-12.189c 5.312-2.819, 10.51-9.973, 11.549-15.897l 4.492-25.616
-		c 0.949-5.412, 5.803-9.347, 11.174-9.347c 0.51,0, 1.025,0.035, 1.543,0.108l 25.754,3.641c 0.73,0.106, 1.496,0.153, 2.287,0.153
-		c 5.666,0, 12.607-2.552, 16.4-6.223l 18.695-18.085c 2.162-2.091, 5.012-3.135, 7.859-3.135c 2.85,0, 5.699,1.044, 7.859,3.135
-		l 18.691,18.085C 286.344,186.045, 293.283,188.597, 298.953,188.597z M 256,240.001c-30.812,0-55.791,24.978-55.791,55.789
-		c0,30.814, 24.979,55.792, 55.791,55.792s 55.791-24.978, 55.791-55.792C 311.791,264.979, 286.812,240.001, 256,240.001zM 234.969,150.675l-18.502,17.899c-0.746,0.485-2.426,1.031-3.316,1.077l-25.488-3.605
-		c-1.387-0.196-2.801-0.296-4.201-0.296c-0.303,0-0.6,0.031-0.9,0.041l-24.676-148.409l 84.637,33.199l0,94.783 
-		C 239.775,146.727, 237.223,148.497, 234.969,150.675zM 328.533,165.75c-1.4,0-2.814,0.1-4.195,0.296l-25.494,3.605c-0.889-0.044-2.57-0.592-3.316-1.077l-18.498-17.902
-		c-1.945-1.88-4.119-3.449-6.441-4.725l0-95.41 l 84.635-32.75l-25.783,148.004C 329.137,165.784, 328.838,165.75, 328.533,165.75z"  />
-<glyph unicode="&#xe23a;" d="M 230.083,214.57c 0.637-1.898, 0.93-3.763, 0.93-5.687c0-3.077-0.556-5.985-1.702-8.737c-1.127-2.779-2.566-5.361-4.314-7.746
-	c-1.767-2.389-3.794-4.58-6.131-6.545c-2.306-1.96-4.677-3.689-7.048-5.166l 10.531-15.631c 3.301,2.454, 6.605,4.155, 9.94,5.009
-	c 3.337,0.847, 6.559,1.239, 9.617,1.239c 3.744,0, 6.849-0.297, 9.319-0.981c 2.518-0.686, 5.003-1.476, 7.489-2.391
-	c 2.387-0.817, 5.002-1.474, 7.831-2.025c 2.829-0.584, 6.392-0.851, 10.71-0.851c 4.301,0, 8.763,0.818, 13.426,2.355
-	c 4.626,1.6, 9.008,4.382, 13.062,8.338l-10.186,17.169c-3.059-3.308-5.757-5.329-8.078-6.114c-2.339-0.788-4.594-1.18-6.883-1.18
-	c-2.259,0-4.465,0.166-6.607,0.59c-2.156,0.426-4.381,0.886-6.638,1.437c-2.255,0.426-4.497,0.886-6.704,1.275
-	c-2.224,0.397-4.447,0.589-6.72,0.589c-1.601,0-3.222-0.263-4.939-0.652c-1.681-0.494-3.908-1.571-6.622-3.238l-0.325,0.295
-	c 3.727,2.977, 6.966,6.346, 9.744,10.137c 2.797,3.797, 4.186,8.338, 4.186,13.672c0,1.929-0.098,3.761-0.262,5.459
-	c-0.164,1.669-0.522,3.37-1.112,5.102l 17.856,0 l0,14.426 l-22.594,0 c-1.702,3.070-3.043,5.654-3.991,7.814
-	c-0.982,2.154-1.669,4.021-2.062,5.689c-0.391,1.635-0.652,3.104-0.751,4.312c-0.13,1.279-0.18,2.549-0.18,3.96
-	c0,4.746, 1.504,8.534, 4.496,11.345c 3.010,2.845, 7.062,4.253, 12.166,4.253c 4.301,0, 7.686-0.882, 10.104-2.647
-	c 2.422-1.732, 4.252-3.799, 5.445-6.182c 1.178-2.352, 1.947-4.841, 2.291-7.391c 0.342-2.549, 0.572-4.672, 0.67-6.374l 22.957,0 
-	c0,13.831-3.631,24.36-10.891,31.587c-7.227,7.262-17.398,10.893-30.414,10.893c-7.129,0-13.424-0.887-18.85-2.719
-	c-5.445-1.795-9.993-4.283-13.604-7.387c-3.631-3.145-6.377-6.707-8.241-10.795c-1.88-4.086-2.813-8.372-2.813-12.918
-	c0-5.102, 0.867-9.744, 2.567-13.924c 1.701-4.191, 3.4-7.364, 5.102-9.518l-10.89,0 l0-14.426 l 16.825,0 
-	C 228.693,218.329, 229.476,216.432, 230.083,214.57z M 423.889,128.99L 423.889,319.443 L 306.424,319.443 c 19.734-22.011, 32.457-56.443, 32.457-95.225
-	c0-38.787-12.723-73.288-32.457-95.229L 423.889,128.989 z M 172.608,224.219c0,38.781, 12.722,73.214, 32.457,95.225L 87.616,319.444 L 87.616,128.99 l 117.449,0 
-	C 185.33,150.931, 172.608,185.432, 172.608,224.219z M 38.32,369.412l0-289.443 l 434.852,0 L 473.172,369.412 L 38.32,369.412 z M 448.824,104.035L 62.698,104.035 L 62.698,344.36 
-	l 386.126,0 L 448.824,104.035 z"  />
-<glyph unicode="&#xe23b;" d="M 142.212,82.733l 106.052,48.024L 398.479,280.97l-26.405,26.442l-90.519-90.517l-15.843,15.891l 90.484,90.486
-	l-16.204,16.217L 189.746,189.246L 142.212,82.733z M 217.116,183.472l 23.285,23.283l 3.353-22.221l 22.008-3.124l-23.283-23.313
-	l-46.176-20.991L 217.116,183.472z M 474.716,357.182L 416.188,415.7l-49.755-49.785l 58.504-58.503L 474.716,357.182z M 357.357,179.773
-	l 82.826,0 l0-116.445 L 68.929,63.328 L 68.929,179.773 l 88.719,0 l0,30.648 L 38.288,210.421 l0-177.733 l 432.537,0 L 470.825,210.422 L 357.357,210.422 L 357.357,179.773 z"  />
-<glyph unicode="&#xe23c;" d="M 212.925,224.803c-0.101-0.229-0.164-1.144-0.164-2.746l0-4.385 l-6.802,0 l-5.267-12.229l 13.080,0 
-			c 2.389-14.846, 7.522-26.423, 15.466-34.662c 8.734-9.193, 20.244-13.766, 34.502-13.766c 9.843,0, 18.575,2.187, 26.159,6.6l 0.199,25.639
-			c-8.959-7.125-17.69-10.661-26.193-10.661c-13.146,0-21.518,8.929-25.15,26.851l 29.597,0 l 5.23,12.229l-36.168,0 l 0.165,7.131l 38.066,0 
-			l 5.262,12.229l-41.466,0 c 3.956,15.535, 11.904,23.287, 23.807,23.287c 6.901,0, 14.324-2.551, 22.236-7.652l 10.37,21.256
-			c-11.12,5.656-21.389,8.501-30.904,8.501c-13.506,0-24.724-4.351-33.649-12.914c-8.502-7.948-14.128-18.769-16.809-32.478l-8.701,0 
-			l-5.264-12.229L 212.925,224.804 z M 424.438,128.398L 424.438,318.822 L 306.972,318.822 c 19.753-21.913, 32.474-56.413, 32.474-95.195
-			c0-38.786-12.721-73.25-32.474-95.229L 424.438,128.398 z M 173.158,223.627c0,38.782, 12.721,73.282, 32.474,95.195L 88.167,318.822 l0-190.424 l 117.465,0 
-			C 185.878,150.377, 173.158,184.841, 173.158,223.627z M 38.885,368.887l0-289.506 l 434.834,0 L 473.719,368.887 L 38.885,368.887 z M 449.389,103.482L 63.215,103.482 
-			L 63.215,343.807 l 386.174,0 L 449.389,103.482 z"  />
-<glyph unicode="&#xe23d;" d="M 194.166,89.043L 78.85,89.043L 78.85,50.137L 49.789,50.137L 49.789,17.524L 226.42,17.524L 226.42,50.137L 194.166,50.137 	zM 453.047,139.776l-91.314,91.314c-8.502,8.501-20.674,11.069-31.412,7.743l-53.164,53.161l 32.635,32.633l-59.498,59.5
-		l-85.842-85.842l 59.498-59.497l 32.627,32.626l 53.164-53.161c-3.33-10.738-0.762-22.913, 7.742-31.414l 91.314-91.315
-		c 6.109-6.107, 14.117-9.163, 22.125-9.163s 16.016,3.056, 22.125,9.163C 465.266,107.745, 465.266,127.556, 453.047,139.776zM 141.285,288.8L 214.458,215.628L 191.27,192.44L 118.097,265.613zM 282.968,430.48L 356.14,357.308L 332.953,334.121L 259.781,407.294z"  />
-<glyph unicode="&#xe23e;" d="M 236.493,184.163c-3.531,3.76-5.233,8.83-5.103,15.305l-23.97,0 c 1.144-13.378, 5.263-23.511, 12.396-30.416
-	c 7.162-6.935, 17.036-10.825, 29.758-11.738l0-14.455 l 10.007,0 l0,14.455 c 8.503,0.555, 15.466,2.293, 20.927,5.102
-	c 5.396,2.847, 9.747,6.081, 12.982,9.712c 3.24,3.599, 5.464,7.295, 6.707,11.121c 1.238,3.796, 1.863,6.931, 1.863,9.416
-	c0,2.81-0.197,6.052-0.588,9.683c-0.393,3.657-1.67,7.258-3.826,10.888c-2.127,3.629-5.496,7.098-10.007,10.431
-	c-4.548,3.371-10.989,6.185-19.392,8.407c-1.604,0.486-3.108,0.85-4.482,1.21c-1.439,0.358-2.812,0.653-4.185,1.011l0,30.088 
-	c 3.859,0, 7.13-1.573, 9.843-4.775c 2.748-3.172, 4.151-7, 4.284-11.545l 24.101,0 c-0.327,5.887-1.568,10.987-3.729,15.27
-	c-2.158,4.354-4.938,7.916-8.306,10.828c-3.433,2.877-7.358,5.133-11.839,6.801c-4.479,1.636-9.254,2.714-14.354,3.303l0,13.045 
-	l-10.007,0 l0-13.045 c-5.101-0.324-10.041-1.307-14.815-3.006c-4.742-1.605-8.927-3.924-12.589-6.936
-	c-3.598-3.010-6.51-6.702-8.698-11.117c-2.226-4.414-3.335-9.546-3.335-15.305c0-5.66, 0.98-10.398, 2.911-14.196
-	c 1.895-3.79, 4.477-6.965, 7.717-9.516c 3.204-2.549, 6.868-4.61, 10.956-6.077c 4.055-1.574, 8.206-2.918, 12.391-4.053
-	c 1.146-0.234, 2.193-0.462, 3.175-0.76c 0.948-0.258, 1.701-0.522, 2.288-0.748l0-35.516 C 244.341,178.049, 239.958,180.402, 236.493,184.163z
-	 M 259.581,209.67c 6.672-1.834, 11.415-3.863, 14.191-6.053c 2.779-2.191, 4.153-5.523, 4.153-9.938c0-2.714-0.555-5.070-1.701-7.031
-	c-1.144-1.995-2.55-3.664-4.314-5.006c-1.768-1.373-3.762-2.418-5.953-3.175c-2.191-0.716-4.351-1.208-6.376-1.435L 259.581,209.67 z
-	 M 237.833,241.621c-2.353,2.027-3.563,4.904-3.563,8.667c0,2.356, 0.424,4.414, 1.275,6.179c 0.852,1.762, 1.992,3.236, 3.467,4.443
-	c 1.474,1.178, 3.14,2.061, 4.973,2.622c 1.795,0.586, 3.662,0.849, 5.59,0.849l0-27.699 C 244.111,237.924, 240.221,239.561, 237.833,241.621z
-	 M 423.906,128.732L 423.906,319.188 L 306.443,319.188 c 19.716-21.971, 32.471-56.443, 32.471-95.229c0-38.783-12.755-73.252-32.471-95.227L 423.906,128.732 z
-	 M 38.354,369.221l0-289.508 l 434.836,0 L 473.19,369.221 L 38.354,369.221 z M 448.824,103.814L 62.715,103.814 L 62.715,344.137 l 386.109,0 L 448.824,103.814 z M 172.627,223.959
-	c0,38.785, 12.719,73.258, 32.473,95.229L 87.635,319.188 l0-190.455 L 205.1,128.733 C 185.346,150.707, 172.627,185.176, 172.627,223.959z"  />
-<glyph unicode="&#xe23f;" d="M 127.286,30.184c-21.564-0.006-43.317,8.494-59.885,25.062l0,0c-16.578,16.575-25.083,38.336-25.079,59.897l0,0
-		c-0.029,20.296, 7.623,40.755, 23.034,56.14l0,0l 3.539,3.539l 212.559,212.57c 20.227,20.255, 47.082,30.304, 73.852,30.267l0,0
-		c 28.454,0.012, 57.219-11.208, 79.179-33.159l0,0c 21.937-21.949, 33.153-50.698, 33.147-79.151l0,0
-		c 0.028-26.779-10.016-53.627-30.268-73.865l0,0l-178.45-178.453l-13.28-13.277l-26.56,26.559l 191.738,191.733
-		c 12.842,12.871, 19.229,29.708, 19.259,47.303l0,0c-0.004,18.645-7.323,37.759-22.152,52.592l0,0
-		c-14.834,14.838-33.958,22.152-52.613,22.165l0,0c-17.588-0.034-34.423-6.418-47.284-19.266l0,0L 95.447,148.266l-3.536-3.537
-		c-8.011-8.031-11.994-18.482-12.029-29.585l0,0c 0.014-11.761, 4.614-23.877, 14.079-33.345l0,0
-		c 9.455-9.446, 21.562-14.043, 33.326-14.056l0,0c 11.102,0.034, 21.551,4.014, 29.587,12.026l0,0l 150.412,150.404l 12.596,12.595
-		c 3.018,3.040, 4.521,6.906, 4.549,11.331l0,0c0,4.666-1.817,9.57-5.722,13.476l0,0c-3.914,3.916-8.819,5.726-13.48,5.739l0,0
-		c-4.425-0.038-8.283-1.542-11.328-4.564l0,0L 155.27,130.118l-26.561,26.56L 267.33,295.297c 10.408,10.44, 24.289,15.604, 37.897,15.57
-		l0,0c 14.468,0.012, 29.010-5.704, 40.049-16.739l0,0c 11.007-11.025, 16.72-25.554, 16.72-40.029l0,0
-		c 0.029-13.599-5.129-27.479-15.559-37.89l0,0l-12.601-12.595l-150.41-150.41c-15.365-15.377-35.768-23.025-56.022-23.021l0,0
-		C 127.366,30.184, 127.323,30.184, 127.286,30.184L 127.286,30.184z"  />
-<glyph unicode="&#xe240;" d="M 434.135,120.874c-7.798,8.222-17.102,12.629-28.434,16.952c-0.626,0.228-1.301,0.441-1.939,0.666
-	c-45.436,39.315-24.12,70.818-24.12,111.011c0,39.834-39.698,100.547-93.214,117.835c 0.188,1.413, 0.32,2.84, 0.32,4.302
-	c0,17.728-14.367,32.1-32.095,32.1c-17.728,0-32.099-14.372-32.099-32.1c0-1.977, 0.206-3.909, 0.549-5.788
-	c-51.197-18.839-88.666-76.425-88.666-116.349c0-39.858, 18.944-71.3-22.197-108.788c-8.272-2.543-15.655-5.41-22.133-8.803
-	c-5.518-2.955-10.51-6.252-14.942-11.038c-4.339-4.645-8.394-11.813-8.377-20.345c-0.016-8.534, 4.038-15.703, 8.377-20.343
-	c 7.798-8.222, 17.106-12.63, 28.433-16.952c 16.952-6.213, 38.792-10.867, 64.519-14.197c 25.696-3.303, 55.153-5.167, 86.536-5.167
-	c 47.843,0.019, 91.098,4.276, 123.619,11.526c 16.316,3.686, 29.893,7.969, 40.918,13.753c 5.521,2.954, 10.513,6.245, 14.945,11.037
-	c 4.342,4.64, 8.4,11.809, 8.376,20.343C 442.535,109.061, 438.477,116.229, 434.135,120.874z M 393.014,98.736
-	c-12.606-4.721-32.439-9.204-56.32-12.271c-23.922-3.096-52.033-4.896-82.041-4.895c-45.5-0.021-86.746,4.187-115.397,10.62
-	c-11.531,2.553-21.040,5.562-27.474,8.347c 1.365,0.604, 2.87,1.209, 4.503,1.782c 12.607,4.719, 32.441,9.209, 56.327,12.271
-	c 15.938,2.059, 33.759,3.527, 52.739,4.295c 2.939-13.488, 14.934-23.592, 29.302-23.592c 14.371,0, 26.367,10.107, 29.3,23.602
-	c 33.715-1.363, 63.744-5.016, 86.092-10.031c 11.523-2.549, 21.039-5.562, 27.472-8.346C 396.151,99.918, 394.646,99.314, 393.014,98.736
-	z"  />
-<glyph unicode="&#xe241;" d="M 87.887,405.228l0-361.521 l 336.958,0 L 424.845,405.228 L 87.887,405.228 z M 394.205,74.349L 118.544,74.349 L 118.544,374.601 l 275.661,0 L 394.205,74.349 z M 262.693,342.503L 149.040,342.503 
-	l0-130.742 l 113.653,0 L 262.693,342.503 z M 367.635,341.982l-79.221,0 l0-24.951 l 79.221,0 L 367.635,341.982 z M 367.635,234.654l-79.221,0 l0-24.92 l 79.221,0 L 367.635,234.654 z
-	 M 367.635,288.315l-79.221,0 l0-24.948 l 79.221,0 L 367.635,288.315 z M 365.819,180.988L 147.57,180.988 l0-24.917 l 218.249,0 L 365.819,180.988 z M 365.819,127.326L 147.57,127.326 l0-24.887 
-	l 218.249,0 L 365.819,127.326 z"  />
-<glyph unicode="&#xe242;" d="M 63.774,437.769L 42.008,416.004l 404.999-404.999l 21.767,21.765L 63.774,437.769z M 442.429,94.521
-	c 0.514,2.089, 0.827,4.281, 0.821,6.595c 0.025,8.525-4.035,15.696-8.371,20.336c-7.801,8.226-17.102,12.633-28.434,16.957
-	c-0.626,0.231-1.305,0.442-1.941,0.667c-45.437,39.312-24.12,70.818-24.12,111.010c0,39.834-39.7,100.547-93.215,117.836
-	c 0.19,1.411, 0.321,2.838, 0.321,4.302c0,17.729-14.367,32.099-32.095,32.099s-32.101-14.369-32.101-32.099
-	c0-1.979, 0.205-3.909, 0.548-5.788c-12.216-4.496-23.641-11.217-33.969-19.354L 442.429,94.521z M 255.396,82.154
-	c-45.501-0.018-86.747,4.188-115.399,10.622c-11.53,2.547-21.039,5.562-27.473,8.348c 1.364,0.603, 2.871,1.204, 4.503,1.778
-	c 12.607,4.725, 32.442,9.211, 56.328,12.271c 15.937,2.059, 33.758,3.534, 52.738,4.295c 2.938-13.486, 14.934-23.591, 29.303-23.591
-	c 14.368,0, 26.364,10.106, 29.298,23.601c 6.656-0.269, 13.16-0.626, 19.494-1.070L 141.385,281.219
-	c-4.015-10.877-6.206-21.518-6.206-31.133c0-39.855, 18.94-71.3-22.197-108.786c-8.275-2.544-15.655-5.412-22.135-8.803
-	c-5.515-2.96-10.509-6.253-14.94-11.045c-4.341-4.64-8.396-11.811-8.376-20.336c-0.019-8.538, 4.036-15.708, 8.376-20.347
-	c 7.797-8.218, 17.107-12.631, 28.434-16.954c 16.95-6.212, 38.791-10.863, 64.52-14.194c 25.694-3.309, 55.153-5.166, 86.535-5.166
-	c 42.972,0.013, 82.218,3.46, 113.335,9.417l-32.98,32.977C 312.193,83.881, 284.714,82.15, 255.396,82.154z"  />
-<glyph unicode="&#xe243;" d="M 371.482,364.283L 140.518,364.283 l0-149.762 l 230.965,0 L 371.483,364.283 z M 270.553,430.627l-29.105,0 l0-54.502 l 29.105,0 L 270.553,430.627 z M 399.002,198.359
-	L 112.998,198.359 l0-37.012 l 56.242,0 l-38.639-143.975l 30.137,0 l 38.639,143.975l 113.246,0 l 38.639-143.975l 30.135,0 l-38.639,143.975l 56.244,0 L 399.002,198.359 z
-	 M 241.447,48.396l 29.105,0 l0,96.793 l-29.105,0 L 241.447,48.396 z"  />
-<glyph unicode="&#xe244;" d="M 396.615,336.397l-44.342,0 L 352.273,385.637 l-0.394,0 c 0.23,0.757, 0.394,1.501, 0.394,2.267c0,17.866-63.867,32.378-142.645,32.378
-	c-78.814,0-142.645-14.512-142.645-32.378c0-0.766, 0.131-1.51, 0.359-2.267l-0.359,0 L 66.983,59.19 l0,0
-	c 0.097-17.852, 63.896-32.321, 142.645-32.321c 78.744,0, 142.545,14.47, 142.645,32.321l0,0l0,49.24 l 44.342,0 
-	c 27.244,0.089, 49.119,21.99, 49.219,49.212l0,129.55 C 445.734,314.418, 423.859,336.308, 396.615,336.397z M 146.711,108.91
-	c0-8.485-6.869-15.346-15.305-15.346c-8.504,0-15.371,6.86-15.371,15.346L 116.035,335.917 c0,8.475, 6.867,15.347, 15.371,15.347
-	c 8.436,0, 15.305-6.872, 15.305-15.347L 146.711,108.91 z M 224.964,108.91c0-8.471-6.867-15.346-15.335-15.346
-	c-8.471,0-15.338,6.875-15.338,15.346L 194.291,335.917 c0,8.475, 6.867,15.347, 15.338,15.347c 8.468,0, 15.335-6.872, 15.335-15.347L 224.964,108.91 z
-	 M 303.188,108.884c0-8.459-6.867-15.319-15.338-15.319c-8.469,0-15.336,6.86-15.336,15.319L 272.514,335.917 
-	c0,8.475, 6.867,15.347, 15.336,15.347c 8.471,0, 15.338-6.872, 15.338-15.347L 303.188,108.884 z M 399.594,157.643
-	c0-0.805-0.296-1.456-0.885-2.083c-0.656-0.62-1.307-0.909-2.094-0.909l-44.342,0 L 352.273,290.177 l 44.342,0 c 0.787-0.026, 1.438-0.305, 2.094-0.906
-	c 0.589-0.629, 0.885-1.263, 0.885-2.078L 399.594,157.643 z"  />
-<glyph unicode="&#xe245;" d="M 317.953,22.824L 317.953,203.578L 437.488,203.578L 254.264,425.577L 71.040,203.578L 190.578,203.578L 190.578,22.824 
-	z"  />
-<glyph unicode="&#xe246;" d="M 430.593,156.133c 23.448,0, 42.458,19.012, 42.458,42.455l0,49.102 c0,23.446-19.010,42.456-42.458,42.456L 430.593,156.133 zM 38.198,347.583l0-247.886 l 357.537,0 L 395.735,347.583 L 38.198,347.583 z M 366.462,129.893L 67.467,129.893 L 67.467,317.388 l 298.995,0 L 366.462,129.893 z M 128.27,292.349L 92.507,292.349 
-	l0-137.418 l 35.763,0 L 128.27,292.349 z"  />
-<glyph unicode="&#xe247;" d="M 52.889,160.511L 233.643,160.511L 233.643,40.976L 455.641,224.2L 233.643,407.424L 233.643,287.886L 52.889,287.886 z"  />
-<glyph unicode="&#xe248;" d="M 430.566,156.133c 23.447,0, 42.457,19.012, 42.457,42.455l0,49.102 c0,23.446-19.010,42.456-42.457,42.456L 430.566,156.133 zM 38.171,347.583l0-247.886 l 357.537,0 L 395.708,347.583 L 38.171,347.583 z M 366.435,129.893L 67.441,129.893 L 67.441,317.388 l 298.994,0 L 366.435,129.893 z M 341.396,292.349
-	L 92.479,292.349 l0-137.418 l 248.917,0 L 341.396,292.349 z"  />
-<glyph unicode="&#xe249;" d="M 455.641,287.888L 274.887,287.888L 274.887,407.424L 52.889,224.2L 274.887,40.976L 274.887,160.514L 455.641,160.514 z"  />
-<glyph unicode="&#xe24a;" d="M 272.812,42.845L 272.812,286.797L 355.912,286.797L 355.912,42.845L 272.812,42.845 	zM 391.677,42.845L 391.677,405.665L 474.783,405.665L 474.783,42.845L 391.677,42.845 	zM 153.941,42.843L 153.941,167.93L 237.044,167.93L 237.044,42.843L 153.941,42.843 	zM 35.076,42.845L 35.076,70.33L 118.178,70.33L 118.178,42.845L 35.076,42.845 	z"  />
-<glyph unicode="&#xe24b;" d="M 190.574,425.577L 190.574,244.823L 71.039,244.823L 254.263,22.825L 437.487,244.823L 317.949,244.823L 317.949,425.577 
-	z"  />
-<glyph unicode="&#xe24c;" d="M 39.435,59.41l 43.935,0 L 83.37,388.42 L 39.435,388.42 L 39.435,59.41 z M 161.967,59.41l 42.298,0 L 204.265,388.42 l-42.298,0 L 161.967,59.41 z M 217.757,59.41l 50.001,0 L 267.758,388.42 
-	l-50.001,0 L 217.757,59.41 z M 345.194,59.41l 37.396,0 L 382.59,388.42 l-37.396,0 L 345.194,59.41 z M 306.803,59.41l 15.957,0 L 322.76,388.42 l-15.957,0 L 306.803,59.41 z M 126.405,59.41
-	l 15.972,0 L 142.377,388.42 l-15.972,0 L 126.405,59.41 z M 405.628,388.42l0-329.010 l 66.141,0 L 471.769,388.42 L 405.628,388.42 z"  />
-<glyph unicode="&#xe24d;" d="M 293.219,78.408l0-65.893 l 199.514,0 l0,65.893 L 293.219,78.408 z M 354.631,152.71l 10.891,31.131c 6.017,17.169-3.039,35.938-20.241,41.958
-	l-119.688,41.889l-42.84,135.025c-3.401,17.888-11.413,34.012-29.302,30.547c-17.854-3.439-20.929-16.553-17.496-34.438
-	l 12.493-104.090l-45.848,16.059l-22.53,56.642l-61.219-24.399l 28.091-70.602c 3.531-8.832, 10.727-15.729, 19.752-18.869l 256.838-89.965
-	L 354.631,152.71z"  />
-<glyph unicode="&#xe24e;" d="M 349.178,164.54l0-129.468 l 83.102,0 L 432.28,164.54 L 349.178,164.54 z M 213.967,35.072l 83.103,0 L 297.070,414.928 l-83.103,0 L 213.967,35.072 z M 78.753,35.076l 83.106,0 
-	L 161.859,289.733 L 78.753,289.733 L 78.753,35.076 z"  />
-<glyph unicode="&#xe24f;" d="M 445.563,390.918L 66.437,390.918 c-9.34,0-16.912-7.571-16.912-16.911l0-316.927 l 412.951,0 L 462.476,374.007 
-	C 462.476,383.347, 454.905,390.918, 445.563,390.918z M 93.41,362.542c 7.355,0, 13.317-5.964, 13.317-13.315
-	c0-7.354-5.962-13.316-13.317-13.316c-7.354,0-13.317,5.963-13.317,13.316C 80.093,356.578, 86.056,362.542, 93.41,362.542z
-	 M 146.706,86.187L 78.63,86.187 L 78.63,310.94 l 68.076,0 L 146.706,86.187 z M 141.066,335.91c-7.354,0-13.314,5.963-13.314,13.316
-	c0,7.352, 5.96,13.315, 13.314,13.315c 7.357,0, 13.317-5.964, 13.317-13.315C 154.384,341.873, 148.424,335.91, 141.066,335.91z
-	 M 188.725,362.542c 7.356,0, 13.315-5.964, 13.315-13.315c0-7.354-5.959-13.316-13.315-13.316c-7.354,0-13.315,5.963-13.315,13.316
-	C 175.409,356.578, 181.371,362.542, 188.725,362.542z M 433.37,86.187L 175.812,86.187 L 175.812,310.94 L 433.37,310.94 L 433.37,86.187 z"  />
-<glyph unicode="&#xe250;" d="M 454.212,334.558l-87.051,87.068c-9.419,9.421-24.723,9.421-34.173-0.031l-73.154-73.186l 121.193-121.194l 73.185,73.183
-	C 463.665,309.821, 463.665,325.126, 454.212,334.558z M 149.63,238.269L 270.888,117.040l 92.514,92.531l-121.192,121.21L 149.63,238.269z
-	 M 222.849,217.401c-4.872-4.868-12.822-4.868-17.724,0c-4.94,4.907-4.94,12.855,0,17.777c 4.902,4.907, 12.853,4.907, 17.724,0
-	C 227.754,230.257, 227.754,222.309, 222.849,217.401z M 290.182,230.42c 4.904,4.907, 12.852,4.907, 17.757,0
-	c 4.904-4.906, 4.904-12.854,0-17.754c-4.905-4.906-12.853-4.906-17.757,0C 285.31,217.566, 285.31,225.514, 290.182,230.42z
-	 M 267.779,172.511c-4.871-4.908-12.852-4.908-17.756,0c-4.904,4.883-4.904,12.846,0,17.754c 4.904,4.905, 12.885,4.905, 17.756,0
-	C 272.686,185.356, 272.686,177.394, 267.779,172.511z M 263.006,275.336c 4.938-4.906, 4.938-12.849, 0.035-17.755
-	c-4.908-4.89-12.886-4.89-17.759,0c-4.906,4.907-4.906,12.85,0,17.755C 250.155,280.241, 258.133,280.241, 263.006,275.336z
-	 M 58.816,147.439c-9.419-9.431-9.419-24.734, 0.034-34.157l 87.020-87.070c 9.45-9.415, 24.754-9.415, 34.204,0l 73.188,73.208
-	L 132.036,220.646L 58.816,147.439z"  />
-<glyph unicode="&#xe251;" d="M 445.564,390.92L 66.438,390.92 c-9.342,0-16.912-7.572-16.912-16.913l0-33.961 l0-19.269 L 49.526,57.080 l 412.949,0 L 462.475,320.777 l0,19.269 l0,33.961 
-	C 462.475,383.348, 454.906,390.92, 445.564,390.92z M 188.727,362.542c 7.355,0, 13.312-5.964, 13.312-13.315
-	c0-7.354-5.957-13.317-13.312-13.317s-13.316,5.964-13.316,13.317C 175.41,356.578, 181.371,362.542, 188.727,362.542z
-	 M 141.066,362.542c 7.357,0, 13.316-5.964, 13.316-13.315c0-7.354-5.959-13.317-13.316-13.317c-7.355,0-13.314,5.964-13.314,13.317
-	C 127.752,356.578, 133.711,362.542, 141.066,362.542z M 93.412,362.542c 7.354,0, 13.316-5.964, 13.316-13.315
-	c0-7.354-5.963-13.317-13.316-13.317c-7.355,0-13.318,5.964-13.318,13.317C 80.094,356.578, 86.057,362.542, 93.412,362.542z
-	 M 433.369,86.186L 78.631,86.186 L 78.631,310.94 l 354.738,0 L 433.369,86.186 z"  />
-<glyph unicode="&#xe252;" d="M 182.683,287.301c 20.618,20.639, 30.852,47.911, 30.87,76.491c0,6.671-0.59,13.41-1.733,20.079
-	c-59.485-16.646-105.464-65.633-117.661-126.852c 4.022-0.422, 8.011-0.619, 12-0.619C 134.725,256.434, 162.014,266.668, 182.683,287.301
-	z M 319.325,150.61c-20.634-20.636-30.853-47.908-30.853-76.459c-0.033-4.019, 0.162-8.009, 0.571-12.066
-	c 61.233,12.229, 110.254,58.207, 126.899,117.694c-6.721,1.146-13.456,1.732-20.144,1.732
-	C 367.249,181.479, 339.977,171.275, 319.325,150.61z M 256.521,390.051c-6.898,0-13.604-0.488-20.243-1.291
-	c 1.439-8.321, 2.208-16.66, 2.208-24.968c 0.018-34.532-12.575-68.54-38.179-94.146c-25.572-25.575-59.565-38.166-94.033-38.166l-0.115,0 
-	c-5.002,0-10.006,0.297-15.025,0.786c-0.116-2.581-0.198-5.17-0.198-7.814c0-91.469, 74.118-165.571, 165.585-165.571
-	c 2.6,0, 5.201,0.098, 7.782,0.201c-0.521,4.999-0.784,10.040-0.784,15.069c-0.032,34.504, 12.558,68.511, 38.162,94.122l0,0
-	c 25.609,25.6, 59.634,38.223, 94.118,38.16c 8.339,0, 16.71-0.759, 25.015-2.193c 0.783,6.607, 1.261,13.377, 1.261,20.212
-	C 422.075,315.922, 347.957,390.051, 256.521,390.051z"  />
-<glyph unicode="&#xe253;" d="M 49.525,57.081l 412.116,0 L 461.641,295.281 L 49.525,295.281 L 49.525,57.081 z M 184.041,218.91l 26.732,26.852l 42.262-42.446l 42.262,42.446l 26.734-26.852
-	l-42.262-42.445l 42.262-42.447l-26.734-26.851l-42.262,42.446l-42.262-42.446l-26.732,26.851l 42.26,42.447L 184.041,218.91z
-	 M 444.766,391.692L 66.403,391.692 c-9.321,0-16.878-7.59-16.878-16.951l0-55.727 l 412.116,0 l0,55.727 C 461.642,384.102, 454.088,391.692, 444.766,391.692z
-	 M 93.322,336.555c-7.342,0-13.291,5.976-13.291,13.347c0,7.369, 5.949,13.346, 13.291,13.346c 7.34,0, 13.291-5.977, 13.291-13.346
-	C 106.613,342.531, 100.662,336.555, 93.322,336.555z M 140.881,336.555c-7.338,0-13.285,5.976-13.285,13.347
-	c0,7.369, 5.947,13.346, 13.285,13.346c 7.344,0, 13.291-5.977, 13.291-13.346C 154.172,342.531, 148.225,336.555, 140.881,336.555z
-	 M 188.445,336.555c-7.34,0-13.291,5.976-13.291,13.347c0,7.369, 5.951,13.346, 13.291,13.346s 13.288-5.977, 13.288-13.346
-	C 201.733,342.531, 195.785,336.555, 188.445,336.555z"  />
-<glyph unicode="&#xe254;" d="M 255.519,263.283c-7.42,0-14.329-2.186-20.17-5.903l 51.974-51.966c 3.717,5.84, 5.901,12.744, 5.901,20.168
-	C 293.224,246.369, 276.309,263.283, 255.519,263.283z M 217.815,225.582c0-20.795, 16.914-37.708, 37.704-37.708
-	c 7.422,0, 14.329,2.182, 20.168,5.903l-51.971,51.971C 220.001,239.908, 217.815,233.002, 217.815,225.582z M 255.371,302.874
-	c-43.353,0-78.503-35.146-78.503-78.505c0-43.357, 35.15-78.501, 78.503-78.501c 43.358,0, 78.504,35.144, 78.504,78.501
-	C 333.875,267.729, 298.729,302.874, 255.371,302.874z M 255.519,171.424c-29.906,0-54.153,24.245-54.153,54.158
-	c0,29.906, 24.247,54.15, 54.153,54.15c 29.909,0, 54.157-24.244, 54.157-54.15C 309.676,195.669, 285.428,171.424, 255.519,171.424z"  />
-<glyph unicode="&#xe255;" d="M 376.869,233.816c 12.932-31.318, 21.738-53.584, 21.887-53.967l 0.084-0.21l 0.080-0.21l 12.471-33.662l 51.086,0 l0,88.049 L 376.869,233.816 zM 429.197,84.279c-3.709,18.309-15.205,25.447-27.418,26.105l-22.844,61.638c0,0-103.836,262.962-127.004,262.962
-		c-0.328,0-0.635-0.051-0.93-0.159c-20.156-7.284, 85.135-279.228, 85.135-279.228l 26.965-68.869
-		c-4.744-11.749-3.174-25.656, 5.203-36.383c 22.709-29.089, 49.438-35.416, 68.383-35.416c 14.576,0, 24.543,3.742, 24.543,3.742
-		S 436.252,36.487, 429.197,84.279z M 369.51,106.491l-7.83,19.487l 17.711,7.119l 7.832-19.484L 369.51,106.491zM 284.193,233.816L 231.010,233.816 l-49.086-88.049l 135.174,0 l-0.838,2.137C 316.070,148.392, 301.41,186.313, 284.193,233.816zM 119.82,233.816L 49.523,233.816L 49.523,145.767L 70.732,145.767 	zM 211.374,354.299L 258.967,327.766L 236.293,287.094L 188.7,313.626zM 176.564,291.837L 63.512,89.044l-10.939-76.029l 58.754,49.882l 0.004,0.002l 112.834,202.405L 176.564,291.837z
-		 M 102.518,78.799l-25.469-21.622l 4.836,33.124l 10.562,18.945l 6.123-13.465l 14.506,1.965L 102.518,78.799z"  />
-<glyph unicode="&#xe256;" d="M 254.87,303.521c-43.354,0-78.501-35.146-78.501-78.505c0-43.357, 35.148-78.502, 78.501-78.502
-	c 43.357,0, 78.505,35.145, 78.505,78.502C 333.375,268.375, 298.228,303.521, 254.87,303.521z M 198.454,210.9l0,28.24 L 311.29,239.14 l0-28.24 
-	L 198.454,210.9 z"  />
-<glyph unicode="&#xe257;" d="M 445.039,179.443l-4.51,4.116l-46.061,42.054l-1.598,1.46l-1.6-1.46l-46.061-42.054l-4.508-4.116l 6.105,0 l 19.918,0 
-	c-1.654-54.142-42.203-79.389-84.684-86.409L 282.040,297.407 c 19.469,9.63, 32.893,29.695, 32.893,52.847c0,32.498-26.439,58.937-58.938,58.937
-	c-32.494,0-58.936-26.438-58.936-58.937c0-23.149, 13.422-43.215, 32.889-52.847l0-204.373 c-42.479,7.021-83.025,32.268-84.686,86.409
-	l 19.922,0 l 6.105,0 l-4.508,4.116l-46.064,42.054l-1.596,1.46l-1.594-1.46L 71.467,183.56l-4.508-4.116l 6.104,0 l 20.102,0 
-	c 1.789-82.976, 68.213-140.634, 162.832-140.634c 94.621,0, 161.047,57.658, 162.836,140.634l 20.1,0 L 445.039,179.444 z M 255.998,380.331
-	c 16.584,0, 30.078-13.492, 30.078-30.077c0-16.584-13.494-30.075-30.078-30.075c-16.582,0-30.076,13.491-30.076,30.075
-	C 225.922,366.839, 239.416,380.331, 255.998,380.331z"  />
-<glyph unicode="&#xe258;" d="M 255.251,303.161c-43.353,0-78.501-35.146-78.501-78.503c0-43.354, 35.148-78.504, 78.501-78.504
-	c 43.358,0, 78.505,35.15, 78.505,78.504C 333.756,268.015, 298.609,303.161, 255.251,303.161z M 267.77,172.040l-20.948,0 l0,71.745 l-24.466,0 
-	l0,13.917 c 6.44,0.292, 10.95,0.72, 13.525,1.293c 4.104,0.907, 7.444,2.724, 10.021,5.453c 1.766,1.866, 3.102,4.35, 4.008,7.46
-	c 0.525,1.863, 0.786,3.252, 0.786,4.16l 17.075,0 L 267.771,172.040 z"  />
-<glyph unicode="&#xe259;" d="M 261.618,265.121M 238.956,278.422L 238.956,329.788L 438.506,329.788L 438.506,278.422L 238.956,278.422 	zM 232.785,110.734L 108.845,284.752L 69.943,284.752L 69.943,336.115L 135.32,336.115L 259.259,162.102L 438.504,162.102L 438.504,162.094L 438.504,110.734L 232.785,110.734 	z"  />
-<glyph unicode="&#xe25a;" d="M 255.205,303.521c-43.354,0-78.501-35.146-78.501-78.505c0-43.357, 35.147-78.502, 78.501-78.502
-	c 43.358,0, 78.506,35.145, 78.506,78.502C 333.711,268.375, 298.562,303.521, 255.205,303.521z M 269.318,210.9l0-42.299 l-28.233,0 L 241.085,210.9 
-	l-42.297,0 l0,28.24 l 42.297,0 l0,42.296 l 28.233,0 l0-42.296 l 42.307,0 l0-28.24 L 269.318,210.9 z"  />
-<glyph unicode="&#xe25b;" d="M 255.399,413.066L 36.38,35.107l 438.036,0 L 255.399,413.066z M 277.493,81.078l-46.29,0 l0,44.743 l 46.29,0 L 277.493,81.078 z M 266.035,144.244
-	l-23.068,0 l-12.849,106.419l0,57.846 l 48.458,0 l0-57.846 L 266.035,144.244z"  />
-<glyph unicode="&#xe25c;" d="M 440.632,389.611L 172.871,389.611 L 42.391,224.037l 130.48-165.566l 267.761,0 c 15.632,0, 28.286,12.639, 28.286,28.252L 468.918,361.34 
-	C 468.918,376.935, 456.264,389.611, 440.632,389.611z M 382.781,149.596l-21.156-21.16l-74.465,74.43l-74.459-74.43l-21.125,21.16
-	l 74.426,74.441l-74.426,74.447l 21.125,21.155l 74.459-74.458l 74.465,74.458l 21.156-21.155l-74.428-74.447L 382.781,149.596z"  />
-<glyph unicode="&#xe25d;" d="M 253.668,412.754L 34.652,34.795l 438.033,0 L 253.668,412.754z M 253.668,362.812l 175.57-302.978L 78.1,59.834 L 253.668,362.812z
-	 M 233.050,80.766l 41.237,0 l0,39.855 L 233.050,120.621 L 233.050,80.766 z M 232.084,283.354l0-51.527 l 11.447-94.795l 20.547,0 l 11.172,94.795l0,51.527 L 232.084,283.354 z"  />
-<glyph unicode="&#x20;" horiz-adv-x="256" />
-</font></defs></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/helveticons/helveticons.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/helveticons/helveticons.ttf
deleted file mode 100644
index 4cca131a36..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/helveticons/helveticons.ttf and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/helveticons/helveticons.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/helveticons/helveticons.woff
deleted file mode 100644
index 04d78a9881..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/helveticons/helveticons.woff and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Black.woff2 b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Black.woff2
deleted file mode 100644
index 4127b4d0b9..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Black.woff2 and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BlackItalic.woff2 b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BlackItalic.woff2
deleted file mode 100644
index e9862e6909..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BlackItalic.woff2 and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Bold.woff2 b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Bold.woff2
deleted file mode 100644
index 2615c853d5..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Bold.woff2 and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BoldItalic.woff2 b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BoldItalic.woff2
deleted file mode 100644
index f7bace1377..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BoldItalic.woff2 and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Italic.woff2 b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Italic.woff2
deleted file mode 100644
index aaa5a35c3d..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Italic.woff2 and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Light.woff2 b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Light.woff2
deleted file mode 100644
index b6d028836e..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Light.woff2 and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-LightItalic.woff2 b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-LightItalic.woff2
deleted file mode 100644
index fc21432635..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-LightItalic.woff2 and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Regular.woff2 b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Regular.woff2
deleted file mode 100644
index a4d084bfb7..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Regular.woff2 and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-activity.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-activity.svg
deleted file mode 100644
index 84c1202f04..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-activity.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M354.562 428.621l-33.96-81.838-33.961 81.838h-71.34l-39.618-147.569-39.668 147.569H39.35v-51.163h57.457l78.876-293.596 78.043 290.623 66.876-161.105 68.134 164.078h84.924v51.163H354.562z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-add.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-add.svg
deleted file mode 100644
index 9abe4f9085..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-add.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M420.592 214.291H296.104V89.804h-83.102v124.487H88.518v83.104h124.484v124.488h83.102V297.395h124.488z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-addressbook.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-addressbook.svg
deleted file mode 100644
index 1c6676a711..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-addressbook.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M40.901 70.44v371.828c0 13.829 11.212 25.04 25.04 25.04H96.87V45.403H65.941c-13.827 0-25.04 11.207-25.04 25.037zm86.015-25.037v421.905h283.415V45.403H126.916zm250.171 311.446H160.119c-.183-9.291.483-26.043.483-33.134 3.603-10.439 15.527-11.938 25.488-16.141 10.935-4.609 23.067-9.966 33.98-14.438 3.116-.849 6.23-1.7 9.342-2.553 3.72-2.556 7.361-11.06 9.349-15.288l4.419-1.07c-1-5.588-4.456-6.025-5.897-9.971-.565-5.946-1.13-11.896-1.701-17.839.027.278-4.066-.749-4.6-1.086-5.772-3.612-5.886-18.297-6.443-24.402-.252-2.79 3.628-5.079 2.549-10.193-6.324-29.966 2.734-43.986 17.055-48.634 9.938-4.03 28.496-11.499 45.805-.851l4.297 3.979 6.95 1.2c3.489 2.011 5.715 8.688 5.715 8.688 1.831 7.376 2.014 7.989 1.843 15.563-.068 2.915-1.744 16.408-1.289 20.545.374 3.416 1.225 3.686 2.574 6.496 2.345 4.899 1.558 11.647.662 16.586-.495 2.7-1.533 6.544-3.116 8.746-1.74 2.428-5.227 2.449-6.771 5.286-2.222 4.078-.968 9.808-2.37 14.218-1.589 4.998-5.641 5.35-5.946 11.889l5.946.85c1.99 4.229 5.63 12.732 9.349 15.288 3.112.853 6.23 1.704 9.345 2.553 10.911 4.473 23.041 9.829 33.981 14.438 9.958 4.202 21.884 5.701 25.483 16.141.001 7.091.669 23.843.486 33.134zm52.912-311.446h38.298v96.654h-38.298zm0 122.063h38.298v96.655h-38.298zm0 122.062h38.298v96.654h-38.298z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alarm-clock.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alarm-clock.svg
deleted file mode 100644
index 4aa9ce1485..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alarm-clock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M275.241 267.728V175.87c0-8.991-7.323-16.317-16.319-16.317-8.99 0-16.314 7.326-16.314 16.317v105.059l50.557 52.192c3.238 3.3 7.455 4.953 11.74 4.953 4.088 0 8.176-1.505 11.312-4.579 6.475-6.247 6.638-16.584.394-23.072l-41.37-42.695zM438.523 89.786c-41.467-41.517-108.209-42.319-150.758-2.57-9.416-1.439-19.029-2.159-28.844-2.159-11.738 0-23.217 1.13-34.365 3.157-42.482-40.747-109.943-40.274-151.804 1.572-42.218 42.202-42.35 110.548-.425 152.974-1.73 10.289-2.681 20.82-2.681 31.561 0 104.548 84.73 189.291 189.275 189.291 104.514 0 189.279-84.743 189.279-189.291 0-12.871-1.309-25.428-3.727-37.576 36.3-42.628 34.338-106.687-5.95-146.959zm-179.601 316.37c-72.693 0-131.82-59.127-131.82-131.836 0-72.679 59.127-131.804 131.82-131.804 72.699 0 131.822 59.125 131.822 131.804 0 72.709-59.123 131.836-131.822 131.836z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alert-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alert-alt.svg
deleted file mode 100644
index dbb78a2188..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alert-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M253.668 67.246L34.652 445.205h438.033L253.668 67.246zm0 49.942l175.57 302.978H78.1l175.568-302.978zM233.05 399.234h41.237v-39.855H233.05v39.855zm-.966-202.588v51.527l11.447 94.795h20.547l11.172-94.795v-51.527h-43.166z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alert.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alert.svg
deleted file mode 100644
index 3a75464feb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alert.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.399 66.934L36.38 444.893h438.036L255.399 66.934zm22.094 331.988h-46.29v-44.743h46.29v44.743zm-11.458-63.166h-23.068l-12.849-106.419v-57.846h48.458v57.846l-12.541 106.419z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alt.svg
deleted file mode 100644
index 1d4c0eb3e6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M238.956 201.578v-51.366h199.55v51.366h-199.55zm-6.171 167.688l-123.94-174.018H69.943v-51.363h65.377l123.939 174.013h179.245v51.368H232.785z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-anchor.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-anchor.svg
deleted file mode 100644
index 033467b283..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-anchor.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M445.039 300.557l-4.51-4.116-46.061-42.054-1.598-1.46-1.6 1.46-46.061 42.054-4.508 4.116h26.023c-1.654 54.142-42.203 79.389-84.684 86.409V182.593c19.469-9.63 32.893-29.695 32.893-52.847 0-32.498-26.439-58.937-58.938-58.937-32.494 0-58.936 26.438-58.936 58.937 0 23.149 13.422 43.215 32.889 52.847v204.373c-42.479-7.021-83.025-32.268-84.686-86.409h26.027l-4.508-4.116-46.064-42.054-1.596-1.46-1.594 1.46-46.06 42.053-4.508 4.116h26.206c1.789 82.976 68.213 140.634 162.832 140.634 94.621 0 161.047-57.658 162.836-140.634H445.039zM255.998 99.669c16.584 0 30.078 13.492 30.078 30.077 0 16.584-13.494 30.075-30.078 30.075-16.582 0-30.076-13.491-30.076-30.075 0-16.585 13.494-30.077 30.076-30.077z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-app.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-app.svg
deleted file mode 100644
index 02b19fe989..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-app.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M376.869 246.184c12.932 31.318 21.738 53.584 21.887 53.967l.084.21.08.21 12.471 33.662h51.086v-88.049h-85.608zm52.328 149.537c-3.709-18.309-15.205-25.447-27.418-26.105l-22.844-61.638S275.099 45.016 251.931 45.016a2.67 2.67 0 0 0-.93.159c-20.156 7.284 85.135 279.228 85.135 279.228l26.965 68.869c-4.744 11.749-3.174 25.656 5.203 36.383 22.709 29.089 49.438 35.416 68.383 35.416 14.576 0 24.543-3.742 24.543-3.742s-24.978-17.816-32.033-65.608zm-59.687-22.212l-7.83-19.487 17.711-7.119 7.832 19.484-17.713 7.122zm-85.317-127.325H231.01l-49.086 88.049h135.174l-.838-2.137c-.19-.488-14.85-38.409-32.067-85.912zm-164.373 0H49.523v88.049h21.209zm91.554-120.483l47.593 26.533-22.674 40.672-47.593-26.532zm-34.81 62.462L63.512 390.956l-10.939 76.029 58.754-49.882.004-.002 112.834-202.405-47.601-26.533zm-74.046 213.038l-25.469 21.622 4.836-33.124 10.562-18.945 6.123 13.465 14.506-1.965-10.558 18.947z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-error.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-error.svg
deleted file mode 100644
index cd57ff336f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-error.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M49.525 422.919h412.116v-238.2H49.525v238.2zM184.041 261.09l26.732-26.852 42.262 42.446 42.262-42.446 26.734 26.852-42.262 42.445 42.262 42.447-26.734 26.851-42.262-42.446-42.262 42.446-26.732-26.851 42.26-42.447-42.26-42.445zM444.766 88.308H66.403c-9.321 0-16.878 7.59-16.878 16.951v55.727h412.116v-55.727c.001-9.361-7.553-16.951-16.875-16.951zM93.322 143.445c-7.342 0-13.291-5.976-13.291-13.347 0-7.369 5.949-13.346 13.291-13.346 7.34 0 13.291 5.977 13.291 13.346 0 7.371-5.951 13.347-13.291 13.347zm47.559 0c-7.338 0-13.285-5.976-13.285-13.347 0-7.369 5.947-13.346 13.285-13.346 7.344 0 13.291 5.977 13.291 13.346 0 7.371-5.947 13.347-13.291 13.347zm47.564 0c-7.34 0-13.291-5.976-13.291-13.347 0-7.369 5.951-13.346 13.291-13.346s13.288 5.977 13.288 13.346c0 7.371-5.948 13.347-13.288 13.347z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-window-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-window-alt.svg
deleted file mode 100644
index e87dae6ec8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-window-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M445.564 89.08H66.438c-9.342 0-16.912 7.572-16.912 16.913V422.92h412.949V105.993c0-9.341-7.569-16.913-16.911-16.913zm-256.837 28.378c7.355 0 13.312 5.964 13.312 13.315 0 7.354-5.957 13.317-13.312 13.317s-13.316-5.964-13.316-13.317c-.001-7.351 5.96-13.315 13.316-13.315zm-47.661 0c7.357 0 13.316 5.964 13.316 13.315 0 7.354-5.959 13.317-13.316 13.317-7.355 0-13.314-5.964-13.314-13.317 0-7.351 5.959-13.315 13.314-13.315zm-47.654 0c7.354 0 13.316 5.964 13.316 13.315 0 7.354-5.963 13.317-13.316 13.317-7.355 0-13.318-5.964-13.318-13.317 0-7.351 5.963-13.315 13.318-13.315zm339.957 276.356H78.631V169.06h354.738v224.754z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-window.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-window.svg
deleted file mode 100644
index f99af0f195..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-application-window.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M445.563 89.082H66.437c-9.34 0-16.912 7.571-16.912 16.911V422.92h412.951V105.993c0-9.34-7.571-16.911-16.913-16.911zM93.41 117.458c7.355 0 13.317 5.964 13.317 13.315 0 7.354-5.962 13.316-13.317 13.316-7.354 0-13.317-5.963-13.317-13.316 0-7.351 5.963-13.315 13.317-13.315zm53.296 276.355H78.63V169.06h68.076v224.753zm-5.64-249.723c-7.354 0-13.314-5.963-13.314-13.316 0-7.352 5.96-13.315 13.314-13.315 7.357 0 13.317 5.964 13.317 13.315.001 7.353-5.959 13.316-13.317 13.316zm47.659-26.632c7.356 0 13.315 5.964 13.315 13.315 0 7.354-5.959 13.316-13.315 13.316-7.354 0-13.315-5.963-13.315-13.316-.001-7.351 5.961-13.315 13.315-13.315zM433.37 393.813H175.812V169.06H433.37v224.753z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrivals.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrivals.svg
deleted file mode 100644
index bfbe503d6b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrivals.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M293.219 401.592v65.893h199.514v-65.893H293.219zm61.412-74.302l10.891-31.131c6.017-17.169-3.039-35.938-20.241-41.958l-119.688-41.889-42.84-135.025c-3.401-17.888-11.413-34.012-29.302-30.547-17.854 3.439-20.929 16.553-17.496 34.438l12.493 104.09-45.848-16.059-22.53-56.642-61.219 24.399 28.091 70.602a32.925 32.925 0 0 0 19.752 18.869l256.838 89.965 31.099 10.888z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-down.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-down.svg
deleted file mode 100644
index fcdf4548ec..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M190.574 54.423v180.754H71.039l183.224 221.998 183.224-221.998H317.949V54.423z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-left.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-left.svg
deleted file mode 100644
index 2cf42ff7d6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-left.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M455.641 192.112H274.887V72.576L52.889 255.8l221.998 183.224V319.486h180.754z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-right.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-right.svg
deleted file mode 100644
index d1349b3b23..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-right.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M52.889 319.489h180.754v119.535L455.641 255.8 233.643 72.576v119.538H52.889z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-up.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-up.svg
deleted file mode 100644
index f7ca5f8249..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-arrow-up.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M317.953 457.176V276.422h119.535L254.264 54.423 71.04 276.422h119.538v180.754z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-art-easel.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-art-easel.svg
deleted file mode 100644
index c4df06598b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-art-easel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M371.482 115.717H140.518v149.762h230.965V115.717zM270.553 49.373h-29.105v54.502h29.105V49.373zm128.449 232.268H112.998v37.012h56.242l-38.639 143.975h30.137l38.639-143.975h113.246l38.639 143.975h30.135l-38.639-143.975h56.244v-37.012zM241.447 431.604h29.105v-96.793h-29.105v96.793z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-article.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-article.svg
deleted file mode 100644
index 28b2e35c71..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-article.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M87.887 74.772v361.521h336.958V74.772H87.887zm306.318 330.879H118.544V105.399h275.661v300.252zM262.693 137.497H149.04v130.742h113.653V137.497zm104.942.521h-79.221v24.951h79.221v-24.951zm0 107.328h-79.221v24.92h79.221v-24.92zm0-53.661h-79.221v24.948h79.221v-24.948zm-1.816 107.327H147.57v24.917h218.249v-24.917zm0 53.662H147.57v24.887h218.249v-24.887z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-attachment.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-attachment.svg
deleted file mode 100644
index a3c4f466c3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-attachment.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M127.286 449.816c-21.564.006-43.317-8.494-59.885-25.062-16.578-16.575-25.083-38.336-25.079-59.897-.029-20.296 7.623-40.755 23.034-56.14l3.539-3.539 212.559-212.57c20.227-20.255 47.082-30.304 73.852-30.267 28.454-.012 57.219 11.208 79.179 33.159 21.937 21.949 33.153 50.698 33.147 79.151.028 26.779-10.016 53.627-30.268 73.865l-178.45 178.453-13.28 13.277-26.56-26.559 191.738-191.733c12.842-12.871 19.229-29.708 19.259-47.303-.004-18.645-7.323-37.759-22.152-52.592-14.834-14.838-33.958-22.152-52.613-22.165-17.588.034-34.423 6.418-47.284 19.266L95.447 331.734l-3.536 3.537c-8.011 8.031-11.994 18.482-12.029 29.585.014 11.761 4.614 23.877 14.079 33.345 9.455 9.446 21.562 14.043 33.326 14.056 11.102-.034 21.551-4.014 29.587-12.026l150.412-150.404 12.596-12.595c3.018-3.04 4.521-6.906 4.549-11.331 0-4.666-1.817-9.57-5.722-13.476-3.914-3.916-8.819-5.726-13.48-5.739-4.425.038-8.283 1.542-11.328 4.564L155.27 349.882l-26.561-26.56L267.33 184.703c10.408-10.44 24.289-15.604 37.897-15.57 14.468-.012 29.01 5.704 40.049 16.739 11.007 11.025 16.72 25.554 16.72 40.029.029 13.599-5.129 27.479-15.559 37.89l-12.601 12.595-150.41 150.41c-15.365 15.377-35.768 23.025-56.022 23.021l-.118-.001z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-auction-hammer.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-auction-hammer.svg
deleted file mode 100644
index 50f8b8ef26..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-auction-hammer.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M194.166 390.957H78.85v38.906H49.789v32.613H226.42v-32.613h-32.254zm258.881-50.733l-91.314-91.314c-8.502-8.501-20.674-11.069-31.412-7.743l-53.164-53.161 32.635-32.633-59.498-59.5-85.842 85.842 59.498 59.497 32.627-32.626 53.164 53.161c-3.33 10.738-.762 22.913 7.742 31.414l91.314 91.315c6.109 6.107 14.117 9.163 22.125 9.163s16.016-3.056 22.125-9.163c12.219-12.221 12.219-32.032 0-44.252zM141.285 191.2l73.173 73.172-23.188 23.188-73.173-73.173zM282.968 49.52l73.172 73.172-23.187 23.187-73.172-73.173z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-autofill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-autofill.svg
deleted file mode 100644
index 15cbe9fc35..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-autofill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M142.212 397.267l106.052-48.024L398.479 199.03l-26.405-26.442-90.519 90.517-15.843-15.891 90.484-90.486-16.204-16.217-150.246 150.243-47.534 106.513zm74.904-100.739l23.285-23.283 3.353 22.221 22.008 3.124-23.283 23.313-46.176 20.991 20.813-46.366zm257.6-173.71L416.188 64.3l-49.755 49.785 58.504 58.503 49.779-49.77zM357.357 300.227h82.826v116.445H68.929V300.227h88.719v-30.648H38.288v177.733h432.537V269.578H357.357v30.649z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-award.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-award.svg
deleted file mode 100644
index 18a82455f8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-award.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M298.953 291.403c.789 0 1.557.047 2.285.153l25.752 3.641a11.05 11.05 0 0 0 1.543.108c5.371 0 10.227-3.938 11.176-9.347l4.492-25.616c1.039-5.925 6.234-13.076 11.549-15.897l22.977-12.189c5.311-2.821 7.498-9.548 4.855-14.952L372.16 193.94c-2.643-5.405-2.643-14.246 0-19.651l11.422-23.363c2.643-5.405.455-12.13-4.855-14.953l-22.977-12.188c-5.314-2.82-10.51-9.973-11.549-15.897l-4.492-25.615c-.949-5.409-5.807-9.348-11.18-9.348-.508 0-1.021.034-1.539.108l-25.752 3.646c-.729.101-1.492.151-2.281.151-5.668 0-12.611-2.555-16.406-6.225L263.86 52.52c-2.16-2.093-5.01-3.135-7.859-3.135-2.848 0-5.697 1.042-7.859 3.135l-18.695 18.085c-3.795 3.67-10.738 6.225-16.406 6.225-.789 0-1.553-.051-2.281-.151l-25.754-3.646a10.823 10.823 0 0 0-1.539-.108c-5.373 0-10.229 3.938-11.178 9.348l-4.492 25.615c-1.039 5.925-6.236 13.079-11.549 15.897l-22.971 12.188c-5.314 2.818-7.5 9.548-4.857 14.953l11.42 23.363c2.643 5.405 2.643 14.246 0 19.651l-11.42 23.364c-2.643 5.404-.457 12.135 4.857 14.952l22.971 12.189c5.312 2.819 10.51 9.973 11.549 15.897l4.492 25.616c.949 5.412 5.803 9.347 11.174 9.347.51 0 1.025-.035 1.543-.108l25.754-3.641a15.96 15.96 0 0 1 2.287-.153c5.666 0 12.607 2.552 16.4 6.223l18.695 18.085c2.162 2.091 5.012 3.135 7.859 3.135 2.85 0 5.699-1.044 7.859-3.135l18.691-18.085c3.793-3.671 10.732-6.223 16.402-6.223zM256 239.999c-30.812 0-55.791-24.978-55.791-55.789 0-30.814 24.979-55.792 55.791-55.792s55.791 24.978 55.791 55.792c0 30.811-24.979 55.789-55.791 55.789zm-21.031 89.326l-18.502-17.899c-.746-.485-2.426-1.031-3.316-1.077l-25.488 3.605a30.134 30.134 0 0 1-4.201.296c-.303 0-.6-.031-.9-.041l-24.676 148.409 84.637-33.199v-94.783a30.07 30.07 0 0 1-7.554-5.311zm93.564-15.075c-1.4 0-2.814-.1-4.195-.296l-25.494-3.605c-.889.044-2.57.592-3.316 1.077l-18.498 17.902a30.09 30.09 0 0 1-6.441 4.725v95.41l84.635 32.75-25.783-148.004c-.304.007-.603.041-.908.041z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation-2.svg
deleted file mode 100644
index d8ef136b72..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation-2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M314.439 321.301c-.186.035-.383.063-.572.101l-48.846-40.456-.078 45.663c-3.168.091-6.352.155-9.566.153-47.775.073-90.82-10.348-119.785-25.578-14.496-7.545-25.336-16.229-31.842-24.324-6.559-8.225-8.87-15.079-8.914-21.718.034-7.984 3.546-16.798 13.858-27.144 10.181-10.146 26.818-20.4 48.036-28.213 1.189-.44 2.406-.867 3.621-1.293l-44.539-36.889c-16.619 8.232-31.257 18.09-43.229 29.865-17.119 16.768-29.14 38.85-29.106 63.673-.046 20.229 8.065 38.979 20.353 54.034 18.569 22.71 46.073 39.182 78.877 50.871 32.865 11.58 71.375 18.061 112.67 18.078 3.18 0 6.334-.053 9.479-.131l-.088 50.725 89.646-73.732-39.975-33.109v-.576zm-68.482-238.19l-89.646 73.73 89.396 74.04.078-47.212c3.18-.092 6.368-.154 9.591-.152 47.769-.062 90.814 10.352 119.773 25.583 14.5 7.544 25.336 16.229 31.84 24.326 6.555 8.226 8.867 15.079 8.915 21.715-.024 4.641-1.142 9.16-3.951 14.378-4.159 7.764-12.634 16.785-25.487 25.085-9.574 6.226-21.463 12.005-35.111 16.857l44.471 36.833c13.242-6.638 25.173-14.355 35.52-23.203 10.465-9.006 19.322-19.266 25.735-31.03 6.397-11.718 10.208-25.077 10.19-38.92v-.168c0-20.162-8.104-38.849-20.361-53.859-18.572-22.716-46.064-39.181-78.877-50.872-32.856-11.582-71.361-18.062-112.656-18.08-3.193 0-6.343.1-9.502.177l.082-49.228z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation-3.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation-3.svg
deleted file mode 100644
index 77a56e9984..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation-3.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M190.071 318.519c-.035-.189-.064-.387-.102-.575l40.457-48.848-45.662-.078a325.44 325.44 0 0 1-.153-9.566c-.072-47.771 10.348-90.818 25.58-119.785 7.543-14.494 16.227-25.336 24.323-31.838 8.224-6.562 15.078-8.871 21.716-8.918 7.986.035 16.798 3.545 27.148 13.859 10.144 10.182 20.397 26.819 28.208 48.035.439 1.189.866 2.408 1.293 3.621l36.89-44.537c-8.234-16.621-18.093-31.258-29.868-43.23-16.765-17.115-38.849-29.141-63.671-29.104-20.229-.047-38.979 8.065-54.033 20.353-22.712 18.569-39.184 46.071-50.871 78.876-11.58 32.864-18.061 71.377-18.08 112.668 0 3.18.056 6.336.132 9.479l-50.725-.084 73.73 89.646 33.111-39.974h.577zm238.193-68.486l-73.735-89.644-74.039 89.394 47.216.078c.089 3.18.151 6.366.151 9.59.061 47.768-10.354 90.816-25.586 119.775-7.544 14.498-16.229 25.332-24.325 31.836-8.224 6.561-15.08 8.87-21.715 8.916-4.641-.021-9.16-1.14-14.378-3.949-7.76-4.158-16.786-12.632-25.084-25.487-6.225-9.573-12.009-21.462-16.858-35.11l-36.834 44.471c6.64 13.242 14.357 25.176 23.206 35.52 9.006 10.463 19.268 19.326 31.029 25.735 11.718 6.399 25.078 10.21 38.919 10.189h.168c20.164 0 38.849-8.104 53.86-20.358 22.715-18.574 39.18-46.066 50.873-78.881 11.58-32.855 18.06-71.36 18.08-112.656-.002-3.191-.103-6.34-.177-9.5l49.229.081z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation.svg
deleted file mode 100644
index 5f56a648d1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-axis-rotation.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M374.236 112.896l.002-.004c-34.665-28.842-76.951-42.994-118.78-42.969-48.281-.027-96.382 18.878-132.321 55.332l-36.11-30.122-.608 116.069 114.082-21.411-37.78-31.516c25.665-24.441 59.003-36.957 92.737-36.984 30.38.027 60.723 10.141 85.939 31.095 32.061 26.661 48.504 64.85 48.546 103.566a136.332 136.332 0 0 1-1.053 16.753l52.271-9.994c.081-2.255.14-4.508.14-6.759.038-53.253-22.882-106.332-67.065-143.056zm-25.501 239.875c-25.753 24.888-59.396 37.631-93.449 37.658-30.388-.018-60.733-10.15-85.939-31.084-32.057-26.664-48.517-64.861-48.552-103.569.006-6.409.486-12.812 1.397-19.17l-52.507 9.854c-.153 3.104-.255 6.21-.255 9.315-.031 53.254 22.898 106.347 67.08 143.068 34.652 28.817 76.939 42.97 118.775 42.952h.136c48.598 0 97.016-19.191 133.003-56.146l34.503 28.586.214-116.073-114.007 21.804 39.601 32.805z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-baby-stroller.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-baby-stroller.svg
deleted file mode 100644
index d8edc730c1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-baby-stroller.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M174.229 281.794h1.243l118.312-118.312h-64.293V59.815h-55.263c-61.315 0-110.989 49.675-110.989 110.976.001 61.297 49.675 111.003 110.99 111.003zM413.64 88.691L151.338 351.024l22.923 22.925 49.578-49.611 49.608 49.611 22.923-22.943-49.61-49.573 19.654-19.639h78.061c20.764 0 37.574-16.827 37.574-37.573v-78.092l45.031-44.996h21.222V88.691H413.64zm-84.863 283.457c-22.01 0-39.832 17.854-39.832 39.836 0 22.006 17.822 39.828 39.832 39.828s39.832-17.822 39.832-39.828c0-21.981-17.822-39.836-39.832-39.836zm-211.744 0c-22.008 0-39.83 17.854-39.83 39.836 0 22.006 17.822 39.828 39.83 39.828 22.01 0 39.832-17.822 39.832-39.828 0-21.981-17.822-39.836-39.832-39.836z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-backspace.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-backspace.svg
deleted file mode 100644
index 6c84aa5cbc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-backspace.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M440.632 90.389H172.871L42.391 255.963l130.48 165.566h267.761c15.632 0 28.286-12.639 28.286-28.252V118.66c0-15.595-12.654-28.271-28.286-28.271zm-57.851 240.015l-21.156 21.16-74.465-74.43-74.459 74.43-21.125-21.16 74.426-74.441-74.426-74.447 21.125-21.155 74.459 74.458 74.465-74.458 21.156 21.155-74.428 74.447 74.428 74.441z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-add.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-add.svg
deleted file mode 100644
index 0c6be8a34b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-add.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.205 176.479c-43.354 0-78.501 35.146-78.501 78.505 0 43.357 35.147 78.502 78.501 78.502 43.358 0 78.506-35.145 78.506-78.502 0-43.359-35.149-78.505-78.506-78.505zm14.113 92.621v42.299h-28.233V269.1h-42.297v-28.24h42.297v-42.296h28.233v42.296h42.307v28.24h-42.307z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-count.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-count.svg
deleted file mode 100644
index e309c884f9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-count.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.251 176.839c-43.353 0-78.501 35.146-78.501 78.503 0 43.354 35.148 78.504 78.501 78.504 43.358 0 78.505-35.15 78.505-78.504 0-43.357-35.147-78.503-78.505-78.503zM267.77 307.96h-20.948v-71.745h-24.466v-13.917c6.44-.292 10.95-.72 13.525-1.293 4.104-.907 7.444-2.724 10.021-5.453 1.766-1.866 3.102-4.35 4.008-7.46.525-1.863.786-3.252.786-4.16h17.075V307.96z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-remove.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-remove.svg
deleted file mode 100644
index a6317092b8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-remove.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.87 176.479c-43.354 0-78.501 35.146-78.501 78.505 0 43.357 35.148 78.502 78.501 78.502 43.357 0 78.505-35.145 78.505-78.502 0-43.359-35.147-78.505-78.505-78.505zM198.454 269.1v-28.24H311.29v28.24H198.454z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-restricted.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-restricted.svg
deleted file mode 100644
index c7ad647e22..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-badge-restricted.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.519 216.717c-7.42 0-14.329 2.186-20.17 5.903l51.974 51.966c3.717-5.84 5.901-12.744 5.901-20.168 0-20.787-16.915-37.701-37.705-37.701zm-37.704 37.701c0 20.795 16.914 37.708 37.704 37.708 7.422 0 14.329-2.182 20.168-5.903l-51.971-51.971c-3.715 5.84-5.901 12.746-5.901 20.166zm37.556-77.292c-43.353 0-78.503 35.146-78.503 78.505 0 43.357 35.15 78.501 78.503 78.501 43.358 0 78.504-35.144 78.504-78.501 0-43.36-35.146-78.505-78.504-78.505zm.148 131.45c-29.906 0-54.153-24.245-54.153-54.158 0-29.906 24.247-54.15 54.153-54.15 29.909 0 54.157 24.244 54.157 54.15 0 29.913-24.248 54.158-54.157 54.158z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ball.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ball.svg
deleted file mode 100644
index 5416815534..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ball.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M182.683 192.699c20.618-20.639 30.852-47.911 30.87-76.491 0-6.671-.59-13.41-1.733-20.079-59.485 16.646-105.464 65.633-117.661 126.852 4.022.422 8.011.619 12 .619 28.566-.034 55.855-10.268 76.524-30.901zM319.325 329.39c-20.634 20.636-30.853 47.908-30.853 76.459-.033 4.019.162 8.009.571 12.066 61.233-12.229 110.254-58.207 126.899-117.694-6.721-1.146-13.456-1.732-20.144-1.732-28.549.032-55.821 10.236-76.473 30.901zM256.521 89.949c-6.898 0-13.604.488-20.243 1.291 1.439 8.321 2.208 16.66 2.208 24.968.018 34.532-12.575 68.54-38.179 94.146-25.572 25.575-59.565 38.166-94.033 38.166h-.115c-5.002 0-10.006-.297-15.025-.786-.116 2.581-.198 5.17-.198 7.814 0 91.469 74.118 165.571 165.585 165.571 2.6 0 5.201-.098 7.782-.201a145.534 145.534 0 0 1-.784-15.069c-.032-34.504 12.558-68.511 38.162-94.122 25.609-25.6 59.634-38.223 94.118-38.16 8.339 0 16.71.759 25.015 2.193.783-6.607 1.261-13.377 1.261-20.212 0-91.47-74.118-165.599-165.554-165.599z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-band-aid.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-band-aid.svg
deleted file mode 100644
index 8232ea9b23..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-band-aid.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M454.212 145.442l-87.051-87.068c-9.419-9.421-24.723-9.421-34.173.031l-73.154 73.186 121.193 121.194 73.185-73.183c9.453-9.423 9.453-24.728 0-34.16zM149.63 241.731L270.888 362.96l92.514-92.531-121.192-121.21-92.58 92.512zm73.219 20.868c-4.872 4.868-12.822 4.868-17.724 0-4.94-4.907-4.94-12.855 0-17.777 4.902-4.907 12.853-4.907 17.724 0 4.905 4.921 4.905 12.869 0 17.777zm67.333-13.019c4.904-4.907 12.852-4.907 17.757 0 4.904 4.906 4.904 12.854 0 17.754-4.905 4.906-12.853 4.906-17.757 0-4.872-4.9-4.872-12.848 0-17.754zm-22.403 57.909c-4.871 4.908-12.852 4.908-17.756 0-4.904-4.883-4.904-12.846 0-17.754 4.904-4.905 12.885-4.905 17.756 0 4.907 4.909 4.907 12.871 0 17.754zm-4.773-102.825a12.523 12.523 0 0 1 .035 17.755c-4.908 4.89-12.886 4.89-17.759 0-4.906-4.907-4.906-12.85 0-17.755 4.873-4.905 12.851-4.905 17.724 0zM58.816 332.561c-9.419 9.431-9.419 24.734.034 34.157l87.02 87.07c9.45 9.415 24.754 9.415 34.204 0l73.188-73.208-121.226-121.226-73.22 73.207z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bar-chart.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bar-chart.svg
deleted file mode 100644
index c2fc1a2e2f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bar-chart.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M349.178 315.46v129.468h83.102V315.46h-83.102zM213.967 444.928h83.103V65.072h-83.103v379.856zm-135.214-.004h83.106V190.267H78.753v254.657z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-barcode.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-barcode.svg
deleted file mode 100644
index 7b7e4e151e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-barcode.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M39.435 420.59H83.37V91.58H39.435v329.01zm122.532 0h42.298V91.58h-42.298v329.01zm55.79 0h50.001V91.58h-50.001v329.01zm127.437 0h37.396V91.58h-37.396v329.01zm-38.391 0h15.957V91.58h-15.957v329.01zm-180.398 0h15.972V91.58h-15.972v329.01zM405.628 91.58v329.01h66.141V91.58h-66.141z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bars.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bars.svg
deleted file mode 100644
index 2199f4fb11..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bars.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M272.812 437.155V193.203h83.1v243.952h-83.1zm118.865 0V74.335h83.106v362.82h-83.106zm-237.736.002V312.07h83.103v125.087h-83.103zm-118.865-.002V409.67h83.102v27.485H35.076z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-battery-full.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-battery-full.svg
deleted file mode 100644
index 5aff9d10df..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-battery-full.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M430.566 323.867c23.447 0 42.457-19.012 42.457-42.455V232.31c0-23.446-19.01-42.456-42.457-42.456v134.013zM38.171 132.417v247.886h357.537V132.417H38.171zm328.264 217.69H67.441V162.612h298.994v187.495zm-25.039-162.456H92.479v137.418h248.917V187.651z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-battery-low.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-battery-low.svg
deleted file mode 100644
index 72909d1d84..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-battery-low.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M430.593 323.867c23.448 0 42.458-19.012 42.458-42.455V232.31c0-23.446-19.01-42.456-42.458-42.456v134.013zM38.198 132.417v247.886h357.537V132.417H38.198zm328.264 217.69H67.467V162.612h298.995v187.495zM128.27 187.651H92.507v137.418h35.763V187.651z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-beer-glass.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-beer-glass.svg
deleted file mode 100644
index dc9e44cff7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-beer-glass.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M396.615 143.603h-44.342v-49.24h-.394c.23-.757.394-1.501.394-2.267 0-17.866-63.867-32.378-142.645-32.378-78.814 0-142.645 14.512-142.645 32.378 0 .766.131 1.51.359 2.267h-.359V420.81c.097 17.852 63.896 32.321 142.645 32.321 78.744 0 142.545-14.47 142.645-32.321v-49.24h44.342c27.244-.089 49.119-21.99 49.219-49.212v-129.55c-.1-27.226-21.975-49.116-49.219-49.205zM146.711 371.09c0 8.485-6.869 15.346-15.305 15.346-8.504 0-15.371-6.86-15.371-15.346V144.083c0-8.475 6.867-15.347 15.371-15.347 8.436 0 15.305 6.872 15.305 15.347V371.09zm78.253 0c0 8.471-6.867 15.346-15.335 15.346-8.471 0-15.338-6.875-15.338-15.346V144.083c0-8.475 6.867-15.347 15.338-15.347 8.468 0 15.335 6.872 15.335 15.347V371.09zm78.224.026c0 8.459-6.867 15.319-15.338 15.319-8.469 0-15.336-6.86-15.336-15.319V144.083c0-8.475 6.867-15.347 15.336-15.347 8.471 0 15.338 6.872 15.338 15.347v227.033zm96.406-48.759c0 .805-.296 1.456-.885 2.083-.656.62-1.307.909-2.094.909h-44.342V189.823h44.342c.787.026 1.438.305 2.094.906.589.629.885 1.263.885 2.078v129.55z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bell-off.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bell-off.svg
deleted file mode 100644
index d7c9422857..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bell-off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M63.774 42.231L42.008 63.996l404.999 404.999 21.767-21.765-405-404.999zm378.655 343.248c.514-2.089.827-4.281.821-6.595.025-8.525-4.035-15.696-8.371-20.336-7.801-8.226-17.102-12.633-28.434-16.957-.626-.231-1.305-.442-1.941-.667-45.437-39.312-24.12-70.818-24.12-111.01 0-39.834-39.7-100.547-93.215-117.836.19-1.411.321-2.838.321-4.302 0-17.729-14.367-32.099-32.095-32.099s-32.101 14.369-32.101 32.099c0 1.979.205 3.909.548 5.788-12.216 4.496-23.641 11.217-33.969 19.354l252.556 252.561zm-187.033 12.367c-45.501.018-86.747-4.188-115.399-10.622-11.53-2.547-21.039-5.562-27.473-8.348a62.242 62.242 0 0 1 4.503-1.778c12.607-4.725 32.442-9.211 56.328-12.271 15.937-2.059 33.758-3.534 52.738-4.295 2.938 13.486 14.934 23.591 29.303 23.591 14.368 0 26.364-10.106 29.298-23.601 6.656.269 13.16.626 19.494 1.07L141.385 198.781c-4.015 10.877-6.206 21.518-6.206 31.133 0 39.855 18.94 71.3-22.197 108.786-8.275 2.544-15.655 5.412-22.135 8.803-5.515 2.96-10.509 6.253-14.94 11.045-4.341 4.64-8.396 11.811-8.376 20.336-.019 8.538 4.036 15.708 8.376 20.347 7.797 8.218 17.107 12.631 28.434 16.954 16.95 6.212 38.791 10.863 64.52 14.194 25.694 3.309 55.153 5.166 86.535 5.166 42.972-.013 82.218-3.46 113.335-9.417l-32.98-32.977c-23.558 2.968-51.037 4.699-80.355 4.695z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bell.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bell.svg
deleted file mode 100644
index 6843f8dbc7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bell.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M434.135 359.126c-7.798-8.222-17.102-12.629-28.434-16.952-.626-.228-1.301-.441-1.939-.666-45.436-39.315-24.12-70.818-24.12-111.011 0-39.834-39.698-100.547-93.214-117.835.188-1.413.32-2.84.32-4.302 0-17.728-14.367-32.1-32.095-32.1-17.728 0-32.099 14.372-32.099 32.1 0 1.977.206 3.909.549 5.788-51.197 18.839-88.666 76.425-88.666 116.349 0 39.858 18.944 71.3-22.197 108.788-8.272 2.543-15.655 5.41-22.133 8.803-5.518 2.955-10.51 6.252-14.942 11.038-4.339 4.645-8.394 11.813-8.377 20.345-.016 8.534 4.038 15.703 8.377 20.343 7.798 8.222 17.106 12.63 28.433 16.952 16.952 6.213 38.792 10.867 64.519 14.197 25.696 3.303 55.153 5.167 86.536 5.167 47.843-.019 91.098-4.276 123.619-11.526 16.316-3.686 29.893-7.969 40.918-13.753 5.521-2.954 10.513-6.245 14.945-11.037 4.342-4.64 8.4-11.809 8.376-20.343.024-8.532-4.034-15.7-8.376-20.345zm-41.121 22.138c-12.606 4.721-32.439 9.204-56.32 12.271-23.922 3.096-52.033 4.896-82.041 4.895-45.5.021-86.746-4.187-115.397-10.62-11.531-2.553-21.04-5.562-27.474-8.347a61.283 61.283 0 0 1 4.503-1.782c12.607-4.719 32.441-9.209 56.327-12.271 15.938-2.059 33.759-3.527 52.739-4.295 2.939 13.488 14.934 23.592 29.302 23.592 14.371 0 26.367-10.107 29.3-23.602 33.715 1.363 63.744 5.016 86.092 10.031 11.523 2.549 21.039 5.562 27.472 8.346a65.993 65.993 0 0 1-4.503 1.782z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-dollar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-dollar.svg
deleted file mode 100644
index 7ed749b1c8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-dollar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M236.493 295.837c-3.531-3.76-5.233-8.83-5.103-15.305h-23.97c1.144 13.378 5.263 23.511 12.396 30.416 7.162 6.935 17.036 10.825 29.758 11.738v14.455h10.007v-14.455c8.503-.555 15.466-2.293 20.927-5.102 5.396-2.847 9.747-6.081 12.982-9.712 3.24-3.599 5.464-7.295 6.707-11.121 1.238-3.796 1.863-6.931 1.863-9.416 0-2.81-.197-6.052-.588-9.683-.393-3.657-1.67-7.258-3.826-10.888-2.127-3.629-5.496-7.098-10.007-10.431-4.548-3.371-10.989-6.185-19.392-8.407-1.604-.486-3.108-.85-4.482-1.21-1.439-.358-2.812-.653-4.185-1.011v-30.088c3.859 0 7.13 1.573 9.843 4.775 2.748 3.172 4.151 7 4.284 11.545h24.101c-.327-5.887-1.568-10.987-3.729-15.27-2.158-4.354-4.938-7.916-8.306-10.828-3.433-2.877-7.358-5.133-11.839-6.801-4.479-1.636-9.254-2.714-14.354-3.303V182.69h-10.007v13.045c-5.101.324-10.041 1.307-14.815 3.006-4.742 1.605-8.927 3.924-12.589 6.936-3.598 3.01-6.51 6.702-8.698 11.117-2.226 4.414-3.335 9.546-3.335 15.305 0 5.66.98 10.398 2.911 14.196 1.895 3.79 4.477 6.965 7.717 9.516 3.204 2.549 6.868 4.61 10.956 6.077a123.877 123.877 0 0 0 12.391 4.053c1.146.234 2.193.462 3.175.76.948.258 1.701.522 2.288.748v35.516c-5.233-1.014-9.616-3.367-13.081-7.128zm23.088-25.507c6.672 1.834 11.415 3.863 14.191 6.053 2.779 2.191 4.153 5.523 4.153 9.938 0 2.714-.555 5.07-1.701 7.031-1.144 1.995-2.55 3.664-4.314 5.006-1.768 1.373-3.762 2.418-5.953 3.175-2.191.716-4.351 1.208-6.376 1.435V270.33zm-21.748-31.951c-2.353-2.027-3.563-4.904-3.563-8.667 0-2.356.424-4.414 1.275-6.179.852-1.762 1.992-3.236 3.467-4.443a14.905 14.905 0 0 1 4.973-2.622c1.795-.586 3.662-.849 5.59-.849v27.699c-5.464-1.242-9.354-2.879-11.742-4.939zm186.073 112.889V160.812H306.443c19.716 21.971 32.471 56.443 32.471 95.229 0 38.783-12.755 73.252-32.471 95.227h117.463zM38.354 110.779v289.508H473.19V110.779H38.354zm410.47 265.407H62.715V135.863h386.109v240.323zM172.627 256.041c0-38.785 12.719-73.258 32.473-95.229H87.635v190.455H205.1c-19.754-21.974-32.473-56.443-32.473-95.226z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-euro.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-euro.svg
deleted file mode 100644
index c526f106a0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-euro.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M212.925 255.197c-.101.229-.164 1.144-.164 2.746v4.385h-6.802l-5.267 12.229h13.08c2.389 14.846 7.522 26.423 15.466 34.662 8.734 9.193 20.244 13.766 34.502 13.766 9.843 0 18.575-2.187 26.159-6.6l.199-25.639c-8.959 7.125-17.69 10.661-26.193 10.661-13.146 0-21.518-8.929-25.15-26.851h29.597l5.23-12.229h-36.168l.165-7.131h38.066l5.262-12.229h-41.466c3.956-15.535 11.904-23.287 23.807-23.287 6.901 0 14.324 2.551 22.236 7.652l10.37-21.256c-11.12-5.656-21.389-8.501-30.904-8.501-13.506 0-24.724 4.351-33.649 12.914-8.502 7.948-14.128 18.769-16.809 32.478h-8.701l-5.264 12.229h12.398zm211.513 96.405V161.178H306.972c19.753 21.913 32.474 56.413 32.474 95.195 0 38.786-12.721 73.25-32.474 95.229h117.466zm-251.28-95.229c0-38.782 12.721-73.282 32.474-95.195H88.167v190.424h117.465c-19.754-21.979-32.474-56.443-32.474-95.229zM38.885 111.113v289.506h434.834V111.113H38.885zm410.504 265.405H63.215V136.193h386.174v240.325z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-pound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-pound.svg
deleted file mode 100644
index 339006dc08..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-pound.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M230.083 265.43c.637 1.898.93 3.763.93 5.687 0 3.077-.556 5.985-1.702 8.737a35.825 35.825 0 0 1-4.314 7.746 38.11 38.11 0 0 1-6.131 6.545 59.53 59.53 0 0 1-7.048 5.166l10.531 15.631c3.301-2.454 6.605-4.155 9.94-5.009 3.337-.847 6.559-1.239 9.617-1.239 3.744 0 6.849.297 9.319.981a90.441 90.441 0 0 1 7.489 2.391c2.387.817 5.002 1.474 7.831 2.025 2.829.584 6.392.851 10.71.851 4.301 0 8.763-.818 13.426-2.355 4.626-1.6 9.008-4.382 13.062-8.338l-10.186-17.169c-3.059 3.308-5.757 5.329-8.078 6.114-2.339.788-4.594 1.18-6.883 1.18-2.259 0-4.465-.166-6.607-.59-2.156-.426-4.381-.886-6.638-1.437-2.255-.426-4.497-.886-6.704-1.275a38.019 38.019 0 0 0-6.72-.589c-1.601 0-3.222.263-4.939.652-1.681.494-3.908 1.571-6.622 3.238l-.325-.295a53.027 53.027 0 0 0 9.744-10.137c2.797-3.797 4.186-8.338 4.186-13.672a56.91 56.91 0 0 0-.262-5.459 22.629 22.629 0 0 0-1.112-5.102h17.856v-14.426h-22.594c-1.702-3.07-3.043-5.654-3.991-7.814-.982-2.154-1.669-4.021-2.062-5.689-.391-1.635-.652-3.104-.751-4.312a38.558 38.558 0 0 1-.18-3.96c0-4.746 1.504-8.534 4.496-11.345 3.01-2.845 7.062-4.253 12.166-4.253 4.301 0 7.686.882 10.104 2.647 2.422 1.732 4.252 3.799 5.445 6.182a23.497 23.497 0 0 1 2.291 7.391c.342 2.549.572 4.672.67 6.374h22.957c0-13.831-3.631-24.36-10.891-31.587-7.227-7.262-17.398-10.893-30.414-10.893-7.129 0-13.424.887-18.85 2.719-5.445 1.795-9.993 4.283-13.604 7.387-3.631 3.145-6.377 6.707-8.241 10.795-1.88 4.086-2.813 8.372-2.813 12.918 0 5.102.867 9.744 2.567 13.924 1.701 4.191 3.4 7.364 5.102 9.518h-10.89v14.426h16.825c.898 1.961 1.681 3.858 2.288 5.72zm193.806 85.58V160.557H306.424c19.734 22.011 32.457 56.443 32.457 95.225 0 38.787-12.723 73.288-32.457 95.229h117.465zm-251.281-95.229c0-38.781 12.722-73.214 32.457-95.225H87.616V351.01h117.449c-19.735-21.941-32.457-56.442-32.457-95.229zM38.32 110.588v289.443h434.852V110.588H38.32zm410.504 265.377H62.698V135.64h386.126v240.325z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-yen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-yen.svg
deleted file mode 100644
index 76b9a1d318..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill-yen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M216.269 251.881v16.153h24.299l2.353 4.939v7.8H216.27v16.154h26.651v23.448h25.838v-23.448h26.844v-16.154h-26.844v-7.8l2.549-4.939h24.295v-16.153H279.48l26.326-52.825H278.27l-21.911 52.825-22.431-52.825h-27.535l25.996 52.825h-16.12zm207.952 99.807v-190.44H306.789c19.751 21.962 32.437 56.428 32.437 95.212 0 38.783-12.686 73.253-32.437 95.229h117.432zM38.668 111.214v289.492h434.865V111.214H38.668zm410.5 265.41H63.031V136.299h386.137v240.325zM172.971 256.46c0-38.784 12.69-73.25 32.475-95.212H87.947v190.441h117.498c-19.784-21.976-32.474-56.446-32.474-95.229z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill.svg
deleted file mode 100644
index ad75b69591..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M424.361 352.143V161.7h-117.5c19.752 21.968 32.475 56.434 32.475 95.218 0 38.783-12.723 73.244-32.475 95.224h117.5zM38.773 111.672v289.502h434.836V111.672H38.773zm410.506 265.4H63.138V136.758H449.28v240.314zm-276.23-120.154c0-38.785 12.752-73.25 32.471-95.218H88.058v190.442H205.52c-19.719-21.98-32.471-56.441-32.471-95.224zm78.318 64.603h24.103V202.577h-19.196c-.652 4.531-2.094 8.316-4.25 11.379-2.127 3.067-4.775 5.53-7.881 7.384-3.141 1.874-6.639 3.173-10.531 3.917-3.923.744-7.98 1.051-12.162.924v18.199h29.918v77.141z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-billboard.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-billboard.svg
deleted file mode 100644
index 468e0dc8bd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-billboard.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M153.537 329.843v62.41h23.68v-62.41h159.498v62.41h23.68v-62.41h89.076V61.513H60.359v268.33h93.178zM88.773 89.928h332.283v211.501H88.773V89.928zm28.416 28.415H392.64v154.671H117.189zM49.523 421.381h412.953v29.106H49.523z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-dollar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-dollar.svg
deleted file mode 100644
index dcd3a8f227..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-dollar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M188.488 338.922c-2.812-3.045-4.184-7.132-4.121-12.295h-19.194c.881 10.727 4.218 18.836 9.939 24.43 5.724 5.524 13.704 8.629 23.873 9.385v11.607h8.044v-11.607c6.802-.492 12.396-1.832 16.776-4.088 4.35-2.291 7.849-4.875 10.434-7.783 2.583-2.912 4.379-5.89 5.396-8.926.979-3.01 1.504-5.594 1.504-7.591 0-2.253-.165-4.872-.524-7.783-.294-2.878-1.306-5.755-3.041-8.667-1.732-2.908-4.413-5.719-8.044-8.402-3.632-2.68-8.828-4.938-15.531-6.77a52.339 52.339 0 0 0-3.631-.951 79.541 79.541 0 0 1-3.338-.849v-24.097c3.074 0 5.722 1.272 7.915 3.822 2.192 2.521 3.302 5.661 3.402 9.258h19.358c-.263-4.74-1.275-8.828-3.008-12.263-1.7-3.47-3.926-6.348-6.672-8.702-2.716-2.257-5.888-4.087-9.482-5.394-3.565-1.341-7.426-2.223-11.514-2.651v-10.562h-8.044v10.562c-4.088.265-8.074 1.047-11.869 2.389-3.794 1.276-7.196 3.141-10.072 5.562-2.942 2.417-5.264 5.396-7.031 8.96-1.767 3.527-2.65 7.613-2.65 12.262 0 4.51.754 8.303 2.288 11.345 1.571 3.04 3.633 5.624 6.215 7.653 2.586 2.059 5.527 3.666 8.795 4.906 3.273 1.244 6.608 2.29 9.943 3.204.915.166 1.768.429 2.55.624.753.229 1.374.422 1.832.619v28.484c-4.187-.816-7.685-2.713-10.498-5.691zm18.541-20.471c5.364 1.435 9.158 3.074 11.383 4.838 2.223 1.768 3.335 4.451 3.335 7.979 0 2.159-.458 4.058-1.343 5.663a14.175 14.175 0 0 1-3.499 4.016 16.05 16.05 0 0 1-4.773 2.521 25.466 25.466 0 0 1-5.103 1.146v-26.163zm-17.463-25.639c-1.896-1.669-2.843-3.956-2.843-6.963 0-1.931.326-3.567 1.013-4.971.688-1.407 1.604-2.616 2.812-3.535a11.624 11.624 0 0 1 3.956-2.122 14.675 14.675 0 0 1 4.48-.686v22.236c-4.38-.982-7.487-2.353-9.418-3.959zm-45.714-184.046v25.898h303.11v160.112h28.482v-186.01H143.852zM36.752 402.3h331.597V216.258H36.752V402.3zm165.799-167.923c32.015 0 57.945 33.059 57.945 73.871 0 40.781-25.931 73.838-57.945 73.838s-57.947-33.057-57.947-73.838c0-40.812 25.932-73.871 57.947-73.871zM90.154 188.364h303.113v160.104h28.483V162.464H90.154v25.9z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-euro.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-euro.svg
deleted file mode 100644
index 3f2fbc38ef..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-euro.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M167.359 312.063h-5.444l-4.233 9.843h10.496c1.912 11.905 6.048 21.195 12.411 27.795 7.012 7.395 16.219 11.055 27.681 11.055 7.913 0 14.913-1.764 20.995-5.3l.147-20.599c-7.195 5.724-14.177 8.604-21.011 8.604-10.529 0-17.266-7.197-20.177-21.555h23.727l4.231-9.843h-29.038l.132-5.718h30.543l4.217-9.813h-33.257c3.173-12.458 9.532-18.671 19.082-18.671 5.544 0 11.496 2.057 17.873 6.109l8.304-17c-8.927-4.582-17.167-6.867-24.818-6.867-10.812 0-19.819 3.463-27.013 10.365-6.803 6.376-11.315 15.072-13.491 26.063h-6.947l-4.22 9.813h9.942c-.097.193-.131.912-.131 2.223v3.496zm-23.201-202.944v25.864h303.129v160.144h28.449V109.119H144.158zm-53.714 79.595h303.112V348.85h28.484V162.783H90.444v25.931zM37.043 402.619h331.596V216.61H37.043v186.009zm165.799-167.928c31.999 0 57.963 33.066 57.963 73.877 0 40.775-25.964 73.869-57.963 73.869-32.016 0-57.949-33.094-57.949-73.869 0-40.81 25.933-73.877 57.949-73.877z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-pound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-pound.svg
deleted file mode 100644
index 32a30de1c6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-pound.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M176.794 336.548c-1.389 1.917-3.042 3.666-4.888 5.249a49.323 49.323 0 0 1-5.66 4.171l8.438 12.538c2.633-2.006 5.298-3.332 7.979-4.019 2.684-.688 5.25-1.03 7.702-1.03 2.993 0 5.513.274 7.506.82 1.992.539 3.99 1.192 6.002 1.894 1.912.655 4.005 1.193 6.276 1.647 2.272.461 5.136.688 8.584.688 3.467 0 7.063-.648 10.776-1.912 3.729-1.289 7.245-3.494 10.496-6.686l-8.189-13.768c-2.439 2.632-4.595 4.266-6.476 4.907a16.814 16.814 0 0 1-5.51.943c-1.814 0-3.581-.146-5.314-.452a98.452 98.452 0 0 1-5.331-1.178c-1.813-.36-3.595-.703-5.377-1.015a29.864 29.864 0 0 0-5.378-.492c-1.296 0-2.586.18-3.959.538-1.373.376-3.14 1.245-5.331 2.599l-.262-.257a42.004 42.004 0 0 0 7.851-8.129c2.223-3.042 3.335-6.687 3.335-10.969 0-1.541-.064-2.994-.199-4.367-.145-1.371-.456-2.729-.881-4.086h14.307v-11.593h-18.133c-1.374-2.454-2.452-4.547-3.205-6.263-.785-1.731-1.34-3.254-1.634-4.579a24.511 24.511 0 0 1-.622-3.486 31.726 31.726 0 0 1-.132-3.104c0-3.84 1.193-6.883 3.6-9.156 2.419-2.272 5.656-3.401 9.759-3.401 3.452 0 6.167.686 8.096 2.097 1.962 1.419 3.433 3.072 4.382 4.982.948 1.913 1.57 3.895 1.831 5.938.279 2.043.457 3.744.555 5.118H236.2c0-11.086-2.913-19.557-8.732-25.359-5.819-5.838-13.948-8.731-24.413-8.731-5.72 0-10.775.719-15.14 2.17-4.364 1.459-7.995 3.44-10.905 5.938-2.913 2.501-5.101 5.381-6.622 8.649a24.764 24.764 0 0 0-2.242 10.366c0 4.091.69 7.833 2.045 11.187 1.356 3.368 2.731 5.899 4.09 7.637h-8.717v11.593h13.506a42.861 42.861 0 0 1 1.83 4.562c.49 1.501.752 3.022.752 4.555 0 2.475-.457 4.814-1.373 7.039a27.739 27.739 0 0 1-3.485 6.207zm-32.915-227.213v25.889H446.99v160.121h28.468v-186.01H143.879zm-53.696 79.581h303.113v160.142h28.448V163.034H90.183v25.882zm-53.416 213.92h331.576V216.811H36.767v186.025zm165.78-167.921c32.013 0 57.965 33.074 57.965 73.871 0 40.796-25.952 73.869-57.965 73.869-31.981 0-57.947-33.073-57.947-73.869 0-40.797 25.965-73.871 57.947-73.871z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-yen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-yen.svg
deleted file mode 100644
index ea352b33d5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills-yen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M169.763 308.701v12.949h19.523l1.93 3.961v6.273h-21.453v12.956h21.453v18.815h20.734V344.84h21.516v-12.956H211.95v-6.273l2.027-3.961h19.489v-12.949h-12.952l21.127-42.412h-22.106l-17.562 42.412-18.017-42.412H161.88l20.863 42.412h-12.98zm-25.638-199.513v25.883h303.146v160.126h28.483V109.188H144.125zM90.43 188.785h303.111V348.89h28.484V162.887H90.43v25.898zm-53.402 213.92h331.595V216.679H37.028v186.026zm165.795-167.922c32.018 0 57.95 33.057 57.95 73.87 0 40.796-25.933 73.856-57.95 73.856-31.981 0-57.915-33.061-57.915-73.856 0-40.813 25.934-73.87 57.915-73.87z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills.svg
deleted file mode 100644
index a6d9b7a76e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bills.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M90.374 188.71h303.112v160.137h28.482V162.829H90.374v25.881zm53.695-79.581v25.883h303.113v160.126h28.482v-186.01H144.069zM36.94 402.625h331.594V216.621H36.94v186.004zm165.83-167.906c31.981 0 57.948 33.064 57.948 73.861 0 40.807-25.967 73.871-57.948 73.871s-57.98-33.064-57.98-73.871c0-40.797 25.999-73.861 57.98-73.861zm-3.894 124.547h19.328v-95.46h-15.37c-.556 3.649-1.702 6.692-3.433 9.143a20.852 20.852 0 0 1-6.312 5.935c-2.519 1.49-5.331 2.536-8.469 3.123-3.14.59-6.378.85-9.744.754v14.603h24v61.902z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-binarycode.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-binarycode.svg
deleted file mode 100644
index 5a7e9ee9d2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-binarycode.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M300.945 162.143c-4.615 0-7.465 2.15-8.965 6.768-1.684 5.166-2.539 13.337-2.539 24.298 0 10.458.859 18.522 2.547 23.972 1.508 4.882 4.355 7.158 8.957 7.158 4.588 0 7.402-2.269 8.854-7.139 1.629-5.461 2.457-13.533 2.457-23.991 0-10.961-.824-19.142-2.449-24.317-1.442-4.604-4.26-6.749-8.862-6.749zm0 125.714c-4.615 0-7.465 2.147-8.965 6.764-1.684 5.166-2.539 13.342-2.539 24.299 0 10.458.859 18.521 2.547 23.973 1.508 4.885 4.355 7.157 8.957 7.157 4.59 0 7.402-2.267 8.854-7.137 1.629-5.462 2.457-13.533 2.457-23.993 0-10.961-.824-19.143-2.449-24.317-1.442-4.602-4.26-6.746-8.862-6.746zm-89.888 0c-4.615 0-7.465 2.147-8.967 6.766-1.684 5.172-2.537 13.345-2.537 24.297 0 10.45.857 18.517 2.547 23.973 1.512 4.885 4.359 7.157 8.957 7.157 4.59 0 7.4-2.267 8.852-7.137 1.631-5.466 2.457-13.535 2.457-23.993 0-10.955-.824-19.137-2.447-24.317-1.444-4.602-4.259-6.746-8.862-6.746zm-89.889-125.714c-4.617 0-7.465 2.15-8.967 6.768-1.684 5.162-2.535 13.337-2.535 24.298 0 10.458.855 18.522 2.543 23.972 1.512 4.882 4.359 7.158 8.959 7.158 4.588 0 7.4-2.269 8.852-7.139 1.631-5.461 2.455-13.533 2.455-23.991 0-10.961-.824-19.142-2.447-24.317-1.444-4.604-4.258-6.749-8.86-6.749zm269.668 0c-4.617 0-7.469 2.15-8.967 6.768-1.684 5.166-2.539 13.337-2.539 24.298 0 10.458.857 18.522 2.547 23.972 1.51 4.882 4.357 7.158 8.959 7.158 4.588 0 7.4-2.269 8.852-7.139 1.627-5.461 2.455-13.533 2.455-23.991 0-10.961-.824-19.142-2.449-24.317-1.442-4.604-4.258-6.749-8.858-6.749zm32.305-60.331H88.859c-19 0-34.41 15.404-34.41 34.412v239.551c0 19.003 15.41 34.412 34.41 34.412H423.14c19 0 34.41-15.409 34.41-34.412v-239.55c.001-19.008-15.409-34.413-34.409-34.413zm-224.459 43.979h24.746v94.706h-24.746v-94.706zm-65.141 220.415h-24.748v-94.699h24.748v94.699zm14.197-136.577c-5.113 8.89-14.053 13.398-26.57 13.398-12.52 0-21.459-4.509-26.57-13.398-4.914-8.546-7.404-20.801-7.404-36.421 0-15.619 2.49-27.891 7.402-36.48 5.109-8.935 14.049-13.464 26.572-13.464 12.52 0 21.461 4.529 26.572 13.464 4.91 8.594 7.4 20.868 7.4 36.48.001 15.614-2.49 27.869-7.402 36.421zm89.887 125.711c-5.111 8.89-14.051 13.399-26.568 13.399-12.525 0-21.465-4.51-26.57-13.399-4.914-8.55-7.406-20.803-7.406-36.42 0-15.613 2.492-27.888 7.402-36.479 5.111-8.938 14.051-13.47 26.574-13.47 12.518 0 21.457 4.532 26.572 13.468 4.91 8.593 7.4 20.867 7.4 36.48 0 15.618-2.49 27.871-7.404 36.421zm89.887 0c-5.109 8.89-14.045 13.399-26.566 13.399-12.523 0-21.461-4.51-26.568-13.399-4.914-8.55-7.406-20.803-7.406-36.42 0-15.613 2.492-27.888 7.402-36.479 5.109-8.938 14.049-13.47 26.572-13.47 12.521 0 21.461 4.532 26.568 13.47 4.916 8.591 7.404 20.861 7.404 36.479s-2.49 27.874-7.406 36.42zm0-125.711c-5.109 8.89-14.049 13.398-26.566 13.398-12.521 0-21.461-4.509-26.568-13.398-4.914-8.552-7.406-20.805-7.406-36.421 0-15.615 2.492-27.887 7.402-36.48 5.109-8.935 14.049-13.464 26.572-13.464 12.521 0 21.461 4.529 26.568 13.464 4.916 8.59 7.404 20.863 7.404 36.48 0 15.618-2.488 27.871-7.406 36.421zm89.89 125.711c-5.109 8.89-14.049 13.399-26.566 13.399-12.523 0-21.463-4.51-26.57-13.399-4.914-8.546-7.406-20.801-7.406-36.42s2.492-27.89 7.404-36.479c5.107-8.938 14.047-13.47 26.572-13.47 12.518 0 21.457 4.532 26.57 13.47 4.912 8.591 7.4 20.865 7.4 36.479.001 15.617-2.49 27.874-7.404 36.42zm0-125.711c-5.111 8.891-14.051 13.398-26.566 13.398-12.52 0-21.461-4.508-26.574-13.398-4.912-8.552-7.402-20.803-7.402-36.421 0-15.615 2.49-27.889 7.398-36.48 5.113-8.935 14.055-13.464 26.578-13.464 12.518 0 21.457 4.529 26.568 13.464 4.914 8.592 7.402 20.863 7.402 36.48.001 15.618-2.49 27.871-7.404 36.421zm-26.566 58.228c-4.619 0-7.469 2.147-8.967 6.764-1.682 5.162-2.537 13.338-2.537 24.299 0 10.462.857 18.527 2.545 23.973 1.51 4.885 4.357 7.157 8.959 7.157 4.588 0 7.4-2.267 8.852-7.137 1.629-5.466 2.459-13.541 2.459-23.993 0-10.955-.828-19.137-2.453-24.317-1.442-4.602-4.256-6.746-8.858-6.746z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-binoculars.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-binoculars.svg
deleted file mode 100644
index 407a88c58d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-binoculars.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M439.554 348.795a60.168 60.168 0 0 0-1.768-9.686h.002l-32.572-125.843c-3.986-33.326-31.947-58.288-65.629-58.288-2.18 0-4.387.109-6.566.324-17.592 1.735-33.457 10.219-44.672 23.887-1.514 1.849-2.881 3.784-4.178 5.756h-56.906c-1.135-1.668-2.322-3.31-3.617-4.889-11.213-13.667-27.078-22.15-44.672-23.886a67.058 67.058 0 0 0-6.562-.323c-33.684 0-61.645 24.961-65.631 58.287L74.21 339.978h.002a60.266 60.266 0 0 0-1.768 9.685c-1.848 18.721 4.994 37.035 19.271 51.566 13.703 13.95 32.75 22.768 53.627 24.826 3.07.303 6.179.457 9.24.457h.002c40.561-.001 73.736-26.281 77.178-61.13.02-.203.023-.404.043-.606h.002l.006-.125c.131-1.488.195-2.973.213-4.455l1.072-22.303h45.842l1.029 21.435c.019 1.482.084 2.967.213 4.455l.008.124h.002c.02.203.023.404.043.607 3.439 34.85 36.619 61.129 77.178 61.13h.002c3.061 0 6.17-.154 9.24-.457 20.881-2.06 39.926-10.876 53.627-24.825 14.278-14.534 21.12-32.848 19.272-51.567zm-231.877 14.356c-2.299 22.344-25.086 39.177-53.094 39.179a70.32 70.32 0 0 1-6.865-.34c-15.252-1.505-29.012-7.793-38.75-17.708-9.166-9.33-13.588-20.781-12.459-32.245 2.211-22.415 25.045-39.318 53.109-39.318 2.273 0 4.586.113 6.873.34 15.248 1.504 29.008 7.791 38.748 17.705 8.725 8.881 13.092 19.687 12.524 30.593l-.086 1.794zm195.354 20.263c-9.738 9.914-23.5 16.203-38.748 17.707-2.287.226-4.596.34-6.867.34-28.008-.001-50.793-16.834-53.092-39.178l-.086-1.796c-.57-10.906 3.797-21.712 12.521-30.593 9.74-9.913 23.498-16.2 38.75-17.705a70.426 70.426 0 0 1 6.871-.34c28.066 0 50.898 16.904 53.109 39.319 1.132 11.465-3.292 22.916-12.458 32.246zM292.517 146.706c10.822-10.956 24.988-17.742 40.504-19.273a67.09 67.09 0 0 1 6.562-.324c12.385 0 23.986 3.386 33.916 9.308l-3.914-16.414c-.15-1.245-1.238-6.238-1.238-6.238a38.984 38.984 0 0 0-37.596-28.275c-1.287 0-2.594.064-3.883.191-19.061 1.88-33.584 17.207-35.16 35.644 0 0-.115 5.005-.025 6.209l.834 19.172zm-113.541-18.405c15.518 1.532 29.686 8.318 40.508 19.273l.832-19.174c.092-1.204-.025-6.209-.025-6.209-1.576-18.436-16.1-33.764-35.162-35.644a39.7 39.7 0 0 0-3.881-.191 38.991 38.991 0 0 0-37.598 28.275s-1.086 4.992-1.234 6.238l-3.918 16.414c9.93-5.922 21.533-9.308 33.918-9.308 2.177.002 4.384.11 6.56.326z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bird.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bird.svg
deleted file mode 100644
index 182a02be79..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bird.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M263.41 386.509c17.477-2.091 40.142-6.242 62.914-12.162-30.231-4.022-59.352-9.399-81.375-14.323-14.129-3.204-25.182-6.129-32.441-8.78-34.009-12.411-54.3-45.603-54.219-80.923 0-10.789 1.863-21.889 5.803-32.7 5.938-16.382 16.336-28.894 29.073-36.739 2.518-1.553 5.135-2.895 7.785-4.104-5.103-4.088-9.812-8.244-13.949-12.364 0 0-17.789-28.629-26.161-92.382-5.348-40.678-55.904-49.182-76.113-28.939-33.241 33.259-30.102 46.959-30.102 46.959s26.748-6.312 33.911-2.161c12.443 7.162 9.55 57.966-3.957 126.851-9.826 50.299-.065 97.88 101.654 123.942 2.256 3.106 4.757 5.983 7.439 8.666 7.604 11.133 22.041 30.968 34.992 41.039l-6.427 25.804-58.715 11.148 4.203 22.042 63.064-11.967 45.896 13.963 6.542-21.473-38.377-11.654 6.427-25.835c5.428-5.461 9.204-15.272 12.133-23.908zm192.235-51.57c-3.76-5.101-9.809-11.248-17.428-17.723-15.323-12.98-36.89-27.256-59.633-40.632-45.391-26.766-96.274-50.407-112.82-56.376-10.155-3.713-20.601-5.678-30.299-5.678-11.119 0-21.11 2.521-29.138 7.526-8.027 5.032-14.486 12.457-18.804 24.129-2.927 8.048-4.315 16.223-4.315 24.134.082 26.1 14.683 49.12 37.852 57.527 5.166 1.896 15.842 4.806 29.365 7.847 13.539 3.043 30.136 6.312 48.038 9.253 35.776 5.969 76.917 10.796 109.42 10.757 12.134 0 23.041-.686 31.771-2.075 8.766-1.357 15.273-3.645 18.28-5.671 1.995-1.342 2.323-2.097 2.422-2.292.031-.196.064-.359.097-.719.098-1.013-.949-4.888-4.808-10.007z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-birthday-cake.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-birthday-cake.svg
deleted file mode 100644
index 205a06715a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-birthday-cake.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M75.638 399.307h360.725v40.707H75.638zm58.086-101.487c18.557 0 33.654-15.1 33.654-33.654h14.209c0 18.555 15.096 33.654 33.652 33.654 18.561 0 33.656-15.1 33.656-33.654h14.207c0 18.555 15.098 33.654 33.656 33.654 18.557 0 33.654-15.1 33.654-33.654h14.207c0 18.555 15.098 33.654 33.654 33.654 16.338 0 29.98-11.705 33.014-27.164V258.52c0-22.602-17.488-41.08-39.664-42.744v-68.934c-4.98 2.539-10.596 4.002-16.559 4.002-5.955 0-11.57-1.461-16.547-3.994v68.764H272.55v-68.77c-4.979 2.539-10.592 4-16.553 4-5.959 0-11.574-1.461-16.551-4v68.77h-65.965v-68.77c-4.979 2.539-10.592 4-16.553 4s-11.574-1.461-16.553-4v68.932c-22.18 1.66-39.668 20.143-39.668 42.744v12.129c3.034 15.46 16.677 27.171 33.017 27.171zm277.564.91c-8.596 8.215-20.213 13.297-33.014 13.297-17.238 0-32.33-9.191-40.758-22.898-8.428 13.707-23.521 22.898-40.758 22.898-17.238 0-32.332-9.191-40.76-22.898-8.428 13.707-23.52 22.898-40.76 22.898-17.238 0-32.33-9.191-40.756-22.898-8.43 13.707-23.523 22.898-40.76 22.898-12.803 0-24.418-5.082-33.014-13.297v73.787h310.578V298.73zM255.999 134.291c11.078 0 20.059-8.984 20.059-20.061 0-11.078-20.059-42.244-20.059-42.244s-20.061 31.166-20.061 42.244c0 11.077 8.983 20.061 20.061 20.061zm99.066 0c11.08 0 20.061-8.984 20.061-20.061 0-11.078-20.061-42.244-20.061-42.244s-20.057 31.166-20.057 42.244c.001 11.077 8.981 20.061 20.057 20.061zm-198.134 0c11.08 0 20.061-8.984 20.061-20.061 0-11.078-20.061-42.244-20.061-42.244s-20.059 31.166-20.059 42.244c0 11.077 8.982 20.061 20.059 20.061z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-block.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-block.svg
deleted file mode 100644
index ed19756dd9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-block.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.501 38.16c-120.308 0-217.838 97.53-217.838 217.838 0 120.31 97.53 217.838 217.838 217.838 120.31 0 217.838-97.528 217.838-217.838 0-120.308-97.528-217.838-217.838-217.838zm151.667 217.838c0 29.861-8.711 57.708-23.671 81.209L173.293 128.002c23.499-14.961 51.345-23.67 81.208-23.67 83.629.001 151.667 68.037 151.667 151.666zm-303.332 0c0-29.859 8.71-57.707 23.67-81.204l209.201 209.201c-23.498 14.96-51.346 23.671-81.206 23.671-83.632 0-151.665-68.04-151.665-151.668z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-blueprint.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-blueprint.svg
deleted file mode 100644
index 4382644745..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-blueprint.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M334.622 326.082h-23.67v23.678h23.67v13.785h21.311v-49.528h-21.311zM156.138 183.827h12.922v23.68h23.678v-23.68h12.924v-21.311h-49.524zm12.922 47.359h23.679v23.679H169.06zm0 47.357h23.679v23.68H169.06zm0 71.217h23.678v-23.858H169.06zm94.535-23.678h23.68v23.678h-23.68zm-47.359 0h23.68v23.678h-23.68zm173.77-180.749L310.575 65.9l-6.937-6.936H115.06v394.07h281.88V152.268l-6.934-6.935zm-16.744 284.026l-234.524-.002V82.644h133.921c35.181 0 18.229 83.393 18.229 83.393s81.329-19.766 82.374 17.526v245.796zM232.367 286.082h123.566L232.367 162.516z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bluetooth.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bluetooth.svg
deleted file mode 100644
index 2c73fb77a7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bluetooth.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M367.078 172.074L239.685 44.686v167.938l-70.067-70.07-25.483 25.485 87.934 88.163-87.934 88.169 25.483 25.483 70.067-70.077v167.945l127.394-127.391-84.128-84.13 84.127-84.127zm-50.909.169l-40.645 40.648-.033-81.322 40.678 40.674zm0 167.79l-40.678 40.675.033-81.321 40.645 40.646z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-boat-shipping.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-boat-shipping.svg
deleted file mode 100644
index 15a8d6f9ff..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-boat-shipping.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M443.984 262.604v-72.72H411.96v-42.682h-29.106v42.682h-37.54v19.739l19.912 19.909v33.072H169.923l-15.664-21.353H49.196l82.254 123.547h331.354V262.604zm-258.895-54.682h51.894v39.598h-51.894zm83.752 0h51.89v39.598h-51.89z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bomb.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bomb.svg
deleted file mode 100644
index b39d18938c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bomb.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M288 111.709a11.635 11.635 0 0 0-16.448.001l-17.182 17.186c-54.131-19.107-116.814-7.023-160.113 36.271-60.082 60.082-60.082 157.501 0 217.582 60.082 60.08 157.496 60.08 217.578-.003 43.301-43.298 55.385-105.981 36.275-160.112l17.182-17.184c4.543-4.541 4.543-11.903 0-16.445L288 111.709zm108.459-27.063c-27.244 3.242-46.768 23.429-55.844 34.934l19.766 19.767c5.002-6.903 19.822-24.942 39.471-27.213 13.863-1.604 28.449 5.151 43.369 20.069l19.582-19.584c-21.27-21.27-43.602-30.682-66.344-27.973z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bones.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bones.svg
deleted file mode 100644
index f956d77bf3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bones.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M79.498 221.885c14.242 2.536 25.9 4.627 25.9 4.61 0 0 10.972 4.563 24.331 10.102l23.788 9.896 80.055-33.21-80.625-33.487c-13.378-5.57-32.181-18.965-41.812-29.791l-12.179-13.714c-9.63-10.825-20.244-8.16-23.579 5.936l-1.603 6.685c-3.354 14.096-14.781 33.699-25.394 43.558l-2.271 2.124c-10.612 9.875-7.634 20.015 6.621 22.548l26.768 4.743zm379.986 72.71l-26.751-4.741c-14.266-2.531-25.939-4.61-25.939-4.61l-24.299-10.089-23.35-9.694-80.068 33.192 80.166 33.321c13.393 5.562 32.212 18.953 41.842 29.776l12.183 13.703c9.614 10.858 20.218 8.178 23.586-5.92l1.604-6.707c3.334-14.074 14.747-33.683 25.344-43.537l2.319-2.143c10.598-9.861 7.621-20-6.637-22.551zm-26.129-66.398l18.312 1.046c14.452.835 20.077-8.55 12.459-20.882l-3.629-5.85c-7.588-12.333-13.409-34.253-12.918-48.73l.097-3.154c.523-14.469-8.765-19.507-20.625-11.2l-22.27 15.602c-11.839 8.307-21.549 15.108-21.549 15.108s-10.956 4.526-24.314 10.071l-229.616 95.213c-13.358 5.522-36.15 9.397-50.606 8.563l-18.33-1.061c-14.438-.818-20.047 8.58-12.441 20.896l3.629 5.866c7.586 12.312 13.407 34.239 12.9 48.709l-.114 3.175c-.49 14.452 8.796 19.492 20.652 11.184l22.252-15.584 21.583-15.124s10.94-4.526 24.331-10.072l229.583-95.196c13.374-5.553 36.151-9.4 50.614-8.58z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book-alt-2.svg
deleted file mode 100644
index 2003b3d233..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book-alt-2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M475.646 151.494c-.583-.969-10.253-17.847-29.679-35.168-19.301-17.234-49.217-35.208-88.636-35.208-39.42-.012-69.042 18.03-87.956 35.339a162.553 162.553 0 0 0-14.817 15.455 168.771 168.771 0 0 0-15.326-15.586c-19.3-17.234-49.216-35.208-88.635-35.208-39.419-.012-69.048 18.03-87.957 35.339-19.042 17.393-28.303 34.318-28.874 35.324l-1.99 7.797v254.555l30.498 7.786.052.032c.428-.815 8.618-14.93 23.666-28.164 15.168-13.297 36.331-25.534 64.604-25.555 29.174 0 51.356 13.12 66.994 26.967 7.757 6.903 13.685 13.877 17.581 19.039a104.804 104.804 0 0 1 4.309 6.107c.393.598.668 1.039.872 1.367 2.713 5.213 8.152 8.777 14.432 8.777 6.397 0 11.916-3.699 14.576-9.062 1.596-2.721 9.607-15.531 23.375-27.641 15.161-13.297 36.323-25.534 64.597-25.555 29.173 0 51.354 13.12 67.003 26.967 7.748 6.903 13.678 13.877 17.572 19.039a103.182 103.182 0 0 1 4.316 6.107c.455.701.785 1.24.984 1.562.1.163.162.267.193.326l.043-.023 30.357-8.077V159.578l-2.154-8.084zM238.512 370.267c-19.32-17.049-48.97-34.59-87.915-34.59h-.046c-38.249 0-67.271 16.998-86.226 33.819v-205.35c3.309-5.068 10.651-15.227 21.667-24.916 15.168-13.309 36.331-25.544 64.604-25.556 29.174 0 51.356 13.112 66.994 26.968a133.5 133.5 0 0 1 17.581 19.036 113.364 113.364 0 0 1 3.34 4.653v205.936zm206.732-.02c-19.319-17.042-48.98-34.57-87.913-34.57-38.285-.012-67.3 17.008-86.267 33.844V164.148c3.307-5.062 10.637-15.213 21.67-24.918 15.161-13.309 36.323-25.544 64.597-25.556 29.173 0 51.354 13.112 67.003 26.968a133.773 133.773 0 0 1 17.572 19.036 107.973 107.973 0 0 1 3.338 4.64v205.929zM83.806 179.755l13.358 17.522 1.741 2.447c.829-.554 18.427-12.986 53.962-13.008 18.98 0 33.073 3.563 42.304 6.975 4.616 1.705 8.006 3.385 10.144 4.559a47.36 47.36 0 0 1 2.279 1.344c.211.131.349.227.418.272.005.008.011.01.017.014l.025.02 4.009-5.694 10.631-14.622c-1.48-1.102-25.478-17.917-69.827-17.909-44.348-.025-67.525 16.854-69.061 18.08zm15.101 74.112c.823-.553 18.425-12.984 53.958-13.006 18.98.01 33.079 3.569 42.307 6.98 4.61 1.698 8 3.383 10.142 4.562a39.468 39.468 0 0 1 2.276 1.331c.22.143.363.24.426.285.02.014.032.021.035.021l3.926-5.572 10.713-14.732v-.01c-1.483-1.106-25.476-17.917-69.826-17.901-44.349-.031-67.52 16.854-69.059 18.072l15.177 19.914-1.837-2.403 1.762 2.459zM83.805 288.04l13.848 18.179-.497-.645 1.749 2.439.078-.049c1.509-1.021 19.11-12.932 53.886-12.953 18.98 0 33.073 3.559 42.303 6.977 4.612 1.705 8.001 3.375 10.147 4.559a42.462 42.462 0 0 1 2.274 1.334c.212.137.351.234.42.278.005.006.011.008.017.01l.025.023 4.05-5.749 10.59-14.567c-1.487-1.109-25.477-17.921-69.826-17.907-44.356-.022-67.522 16.848-69.064 18.071zm332.361-88.141l4.148-5.884-4.23 5.818-.002.004.084.062zm-110.897-2.628l1.755 2.449.001.004c.821-.554 18.427-12.986 53.963-13.008 18.978 0 33.073 3.563 42.302 6.975 4.61 1.705 8 3.385 10.145 4.559a45.406 45.406 0 0 1 2.273 1.344c.175.102.299.189.377.24l14.723-20.251c-1.48-1.102-25.471-17.917-69.819-17.909-44.356-.023-67.526 16.855-69.069 18.081l15.178 19.911-1.829-2.395zm1.752 56.596c.828-.553 18.426-12.984 53.966-13.006 18.978.01 33.073 3.569 42.299 6.98 4.618 1.698 8.009 3.383 10.15 4.562a42.971 42.971 0 0 1 2.27 1.331c.19.119.32.211.396.26.035.027.059.047.064.047l3.984-5.646 10.656-14.659v-.01c-1.477-1.106-25.471-17.917-69.819-17.901-44.356-.031-67.527 16.854-69.066 18.072l15.177 19.914-1.829-2.394 1.752 2.45zm-15.1 34.173l13.383 17.569 1.718 2.404c.016-.013.043-.028.074-.049 1.513-1.021 19.111-12.932 53.889-12.953 18.98 0 33.071 3.559 42.302 6.977 4.612 1.705 8.002 3.375 10.147 4.559a42.6 42.6 0 0 1 2.275 1.334c.21.137.351.234.416.278a.047.047 0 0 0 .018.01l.027.023 4.049-5.749 10.589-14.567c-1.478-1.109-25.475-17.921-69.823-17.907-44.357-.022-67.522 16.848-69.064 18.071z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book-alt.svg
deleted file mode 100644
index c959cdea3a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M475.88 151.615c-.583-.961-10.257-17.833-29.675-35.154-19.305-17.239-49.226-35.216-88.641-35.21-39.424-.02-69.047 18.022-87.958 35.329a162.852 162.852 0 0 0-14.814 15.459 167.873 167.873 0 0 0-15.325-15.578c-19.302-17.239-49.225-35.216-88.635-35.21-39.428-.02-69.049 18.022-87.962 35.329-19.041 17.4-28.3 34.322-28.873 35.328l-1.991 7.796v254.56l30.49 7.78.066.039c.423-.818 8.621-14.927 23.664-28.167 15.169-13.298 36.324-25.537 64.605-25.557 29.166.006 51.354 13.121 66.996 26.975a134.425 134.425 0 0 1 17.578 19.031 110.554 110.554 0 0 1 4.313 6.109 52.672 52.672 0 0 1 1.176 1.876l.008.006.006-.002c2.808 4.888 8.066 8.192 14.113 8.192 6.155 0 11.507-3.421 14.271-8.464h.002l.025-.049.008-.014c.617-1.129 8.778-15.029 23.632-28.104 15.169-13.298 36.327-25.537 64.603-25.557 29.178.006 51.36 13.121 67.002 26.975 7.752 6.894 13.677 13.88 17.576 19.031a110.974 110.974 0 0 1 4.312 6.109c.463.707.792 1.241.984 1.562.092.155.163.263.192.314l.004.006.029-.012 30.37-8.081v-254.56l-2.151-8.087zM150.832 335.806h-.062c-38.245 0-67.258 16.996-86.213 33.819V164.279c3.311-5.068 10.654-15.229 21.67-24.919 15.169-13.31 36.324-25.539 64.605-25.559 29.166 0 51.354 13.122 66.996 26.974a134.046 134.046 0 0 1 17.578 19.03 108.111 108.111 0 0 1 3.338 4.655v205.933c-19.321-17.044-48.976-34.587-87.912-34.587zm294.652 34.57c-19.324-17.04-48.99-34.57-87.92-34.57-38.292-.018-67.307 17.006-86.275 33.849V164.289c3.305-5.058 10.639-15.217 21.673-24.929 15.169-13.31 36.327-25.539 64.603-25.559 29.178 0 51.36 13.122 67.002 26.974 7.752 6.891 13.677 13.875 17.576 19.03a110.27 110.27 0 0 1 3.342 4.651v205.92z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book.svg
deleted file mode 100644
index 2516a55f83..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-book.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M131.408 46.941c-13.312.072-25.541 3.347-35.395 9.519-4.941 3.13-9.325 7.05-12.638 11.991-3.315 4.905-5.475 11.001-5.459 17.444v328.703c-.016 6.447 2.144 12.545 5.459 17.448 5.006 7.398 12.26 12.545 20.489 16.09 8.101 3.446 17.312 5.331 27.122 5.414l252.696 19.647v-47.736l49.976-2.327V38.513l-302.25 8.428zm149.497 248.431l-104.428-8.117 2.384-30.685 104.428 8.122-2.384 30.68zm46.476-73.339l-180.943-14.494 2.453-30.679 180.944 14.491-2.454 30.682zm78.957 175.029l-22.654 1.053V117.101L132.196 97.538h-.574c-8.726.036-16.434-2.348-21.026-5.3-2.303-1.442-3.794-2.979-4.526-4.091-.739-1.148-.82-1.712-.838-2.252.018-.539.099-1.099.838-2.249 1.067-1.676 3.977-4.256 8.523-6.171 4.516-1.935 10.486-3.227 17.029-3.221h.126l274.59-7.661v330.469z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bookmark.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bookmark.svg
deleted file mode 100644
index a3268596ac..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bookmark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M345.04 435.097l-90.66-90.661-90.662 90.661V77.014H345.04z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-books.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-books.svg
deleted file mode 100644
index ddb9162770..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-books.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M127.147 412.812h79.794V136.224h-79.794v276.588zm11.12-244.347h57.554v33.26h-57.554v-33.26zm-94.41 243.56h61.952V99.953H43.857v312.072zm11.3-277.035h35.007v21.146H55.157V134.99zm0 220.824h35.007v21.157H55.157v-21.157zm175.46 54.87h61.951V112.465h-61.951v298.219zm48.971-33.712h-34.974v-21.157h34.974v21.157zm-35.5-193.89h34.993v33.19h-34.993v-33.19zm113.703-84.829l-58.011 21.729L409.33 412.19l58.016-21.778L357.791 98.253zm-27.696 70.406l-7.425-19.814 32.771-12.293 7.422 19.782-32.768 12.325zM407.63 375.4l-7.423-19.783 32.75-12.267 7.441 19.787L407.63 375.4z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box-alt.svg
deleted file mode 100644
index 0189daab6d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M63.31 107.155v82.714h384.963v-82.714H63.31zm26.913 297.632H421.36V213.613H90.223v191.174zm136.135-145.93h58.863c11.677 0 21.159 9.499 21.159 21.203 0 11.691-9.482 21.161-21.159 21.161h-58.863c-11.705 0-21.188-9.47-21.188-21.161 0-11.704 9.483-21.203 21.188-21.203z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box-open.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box-open.svg
deleted file mode 100644
index b2ec5d8bd3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box-open.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M94.878 295.884v66.927l146.044 84.303V255.742l-78.138 82.084-67.906-41.942zm131.805-51.538l-121.568-70.175-65.962 65.955 120.638 74.495 66.892-70.275zm59.958.233l66.679 70.042 120.636-74.495-65.73-65.742-121.585 70.195zm-15.061 10.508v192.026l146.047-84.303v-66.55l-67.316 41.566-78.731-82.739zm204.957-124.966L357.408 65.06l-81.576 22.565 131.871 74.674 68.834-32.178zM237.163 87.625L155.588 65.06 36.471 130.121l68.804 32.178 131.888-74.674z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box.svg
deleted file mode 100644
index 84fa9ca794..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-box.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M161.08 106.29l-70.073 40.452 165.498 95.545 70.076-40.453L161.08 106.29zm259.851 41.077L255.435 51.815l-63.578 36.709 165.499 95.542 63.575-36.699zm-150.11 122.19V459.43l164.966-95.238V174.32l-164.966 95.237zM75.082 364.191l164.959 95.234V268.32L75.082 173.09v191.101z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brackets.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brackets.svg
deleted file mode 100644
index 142eb9f746..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brackets.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M114.799 69.493c-13.651 18.396-20.571 43.054-20.571 73.284v35.185c0 17.099-2.961 25.993-5.457 30.471-6.357 11.45-19.459 18.202-40.051 20.643l-13.271 1.572v51.721l13.429 1.45c20.292 2.192 33.312 9.107 39.804 21.144 3.679 6.82 5.546 16.926 5.546 30.027v44.514c0 33.411 10.512 58.159 31.249 73.556 18.917 14.044 42.837 22.612 71.094 25.469l16.552 1.674v-55.29l-13.275-1.569c-10.512-1.244-20.014-5.533-29.038-13.114-7.625-6.406-11.489-18.501-11.489-35.948v-32.65c0-22.942-3.043-40.929-9.324-55.043-4.47-9.927-11.896-21.096-24.196-29.903 10.425-7.204 18.493-16.933 24.135-29.134 6.314-13.659 9.385-31.972 9.385-55.985v-24.188c0-15.659 1.816-27.705 5.394-35.77 3.739-8.396 11.402-19.785 34.67-21.808l13.738-1.19v-54.8l-16.31 1.385c-40.617 3.433-67.444 14.655-82.014 34.297zm322.528 159.564c-20.487-2.192-33.589-8.987-40.061-20.771-3.592-6.539-5.49-17.021-5.49-30.311v-35.179c0-29.231-5.083-50.976-15.468-66.372-15.87-23.958-45.122-37.833-86.951-41.237l-16.262-1.322v54.748l13.748 1.186c23.558 2.035 31.106 12.761 34.716 20.612 2.437 5.337 5.342 16.078 5.342 36.916v24.172c0 24.158 3.068 42.547 9.396 56.233 4.441 9.561 11.853 20.345 24.191 28.875-10.477 7.475-18.653 17.544-24.266 30.03-6.273 13.932-9.321 31.938-9.321 55.051v32.628c0 15.813-3.694 27.555-10.975 34.889-7.89 7.94-17.621 12.573-29.746 14.16l-13.086 1.715v55.227l16.646-1.786c28.008-3.007 51.77-11.423 70.616-25.013 20.849-15.033 31.419-39.932 31.419-74.004V334.99c0-12.857 1.882-22.917 5.551-29.824 6.614-12.285 19.676-19.266 39.929-21.337l13.512-1.382v-51.952l-13.44-1.438z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brick.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brick.svg
deleted file mode 100644
index e06862f8aa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brick.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M75.907 338.368l164.261 94.81V294.264L75.907 199.419v138.949zm307.381-185.91v14.597c0 10.812-20.701 19.574-46.274 19.574-25.541 0-46.256-8.763-46.256-19.574v-24.149h.148c1.552 10.202 21.566 18.284 46.107 18.284 25.573 0 46.274-8.77 46.274-19.544 0-10.825-20.701-19.569-46.274-19.569-2.027 0-4.037.062-5.999.179l-29.776-17.186v18.362c0 10.812-20.684 19.573-46.239 19.573-16.057 0-30.199-3.465-38.507-8.729-1.177-1.208-2.632-2.387-4.382-3.486-2.174-2.269-3.382-4.742-3.382-7.357v-17.77l-28.779 16.61c-2.077-.097-4.168-.196-6.311-.196-25.541 0-46.257 8.744-46.257 19.569 0 10.774 20.716 19.544 46.257 19.544 24.542 0 44.573-8.082 46.125-18.284h.13v24.149c0 10.812-20.684 19.574-46.255 19.574-25.541 0-46.257-8.763-46.257-19.574v-14.401l-35.629 20.538 164.817 95.126 163.736-94.508-37.017-21.352zm-81.674 60.492c0 10.812-20.716 19.559-46.256 19.559-25.557 0-46.273-8.746-46.273-19.559v-24.149h.147c1.554 10.204 21.568 18.299 46.126 18.299 24.543 0 44.556-8.095 46.125-18.299h.131v24.149zm-30.803 82.546V433.21l164.283-94.842v-137.71l-164.283 94.838zm-15.812-177.934c25.556 0 46.239-8.747 46.239-19.553 0-10.795-20.684-19.555-46.239-19.555-25.558 0-46.272 8.76-46.272 19.555 0 10.806 20.714 19.553 46.272 19.553z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-briefcase.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-briefcase.svg
deleted file mode 100644
index e6e0705ecf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-briefcase.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M339.22 135.024c0-24.836-20.111-44.945-44.962-44.962h-84.142c-24.824.017-44.965 20.126-44.965 44.962v15.907H129.57v271.493h256.937V150.932H339.22v-15.908zm-30.641 15.908H195.824v-15.907c0-7.9 6.377-14.304 14.292-14.304h84.142c7.912 0 14.321 6.403 14.321 14.304v15.907zm-271 24.172v223.154c0 13.341 10.824 24.166 24.168 24.166h42.872V150.932H61.747c-13.344 0-24.168 10.811-24.168 24.172zm411.944-24.172h-38.098v271.493h38.098c13.343 0 24.167-10.825 24.167-24.166V175.104c0-13.361-10.824-24.172-24.167-24.172z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-browser-window.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-browser-window.svg
deleted file mode 100644
index 8279fb9198..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-browser-window.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M445.564 89.081H66.437c-9.34 0-16.913 7.572-16.913 16.911v316.927h412.951V105.992c.001-9.339-7.57-16.911-16.911-16.911zM143.066 120.65h289.6v31.982h-289.6V120.65zm-45.847-2.823c10.391 0 18.814 8.427 18.814 18.815 0 10.39-8.423 18.814-18.814 18.814-10.395 0-18.816-8.424-18.816-18.814 0-10.388 8.422-18.815 18.816-18.815zM433.37 393.814h-42.053v-51.838H232.138v51.838h-41.742v-53.202h-69.349v53.202H78.631V196.107H433.37v197.707zm-312.323-160.86h270.27v66.74h-270.27z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush-alt-2.svg
deleted file mode 100644
index 3599902e1f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush-alt-2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M446.223 65.853c-12.852-12.917-33.717-12.917-46.567 0L264.858 200.619l-65.732-65.731-46.599 46.583 178.062 178.078 46.567-46.568-65.731-65.761 134.798-134.783c12.885-12.847 12.885-33.727 0-46.584zM52.328 248.789l210.959 210.975 50.065-81.788-177.468-177.469-83.556 48.282z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush-alt.svg
deleted file mode 100644
index 65849ec18e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M62.115 305.511c-28.855 28.858 11.318 75.654 40.193 104.517 28.859 28.84 75.639 69.051 104.498 40.189l55.902-84.863-115.743-115.729-84.85 55.886zM478.641 80.277l-46.6-46.616L317.436 148.28c-41.775 31.75-76.637-.864-87.997 10.495l-69.052 69.035 124.135 124.12 67.332-67.349c11.383-11.38-16.871-50.654 12.819-90.354l113.968-113.95z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush.svg
deleted file mode 100644
index a5b889c60d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-brush.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M461.555 66.536l-34.481-21.84-35.714-22.632-164.249 262.515c-22.888-2.958-46.657 6.347-59.807 39.046-29.445 86.248-119.374 83.588-119.374 83.588s128.559 81.945 220.726.224c19.216-17.036 26.892-42.307 22.111-65.723L461.555 66.536zm-206.33 217.035l21.2-33.465 30.423 19.275-21.2 33.469-30.423-19.279z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bug.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bug.svg
deleted file mode 100644
index 9b5b667387..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bug.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M85.065 420.232c-6.507 6.509-6.507 17.054 0 23.56 6.504 6.514 17.056 6.514 23.559.002l33.049-33.042c-5.737-10.21-10.526-21.23-14.25-32.877l-42.358 42.357zm339.124-198.011c6.51-6.501 6.51-17.053 0-23.562-6.502-6.504-17.055-6.504-23.562 0l-29.451 29.452c5.74 10.208 10.526 21.231 14.251 32.879l38.762-38.769zm-305.782 97.213c0-5.818.263-11.562.759-17.226l-46.137-.002c-9.204.002-16.662 7.458-16.662 16.66 0 9.203 7.458 16.664 16.662 16.664h46.046a197.503 197.503 0 0 1-.668-16.096zm8.151-55.715a177.918 177.918 0 0 1 13.86-33.274l-31.786-31.786c-6.51-6.504-17.061-6.504-23.565 0-6.509 6.51-6.509 17.062 0 23.562l41.491 41.498zm257.974 116.854c-3.882 11.521-8.813 22.389-14.676 32.448l30.776 30.772c6.505 6.512 17.056 6.512 23.56-.002 6.507-6.506 6.507-17.051 0-23.56l-39.66-39.658zm51.697-78.367l-42.545.002c.497 5.663.758 11.407.758 17.226 0 5.432-.234 10.8-.666 16.097h42.453c9.203 0 16.662-7.461 16.662-16.664 0-9.203-7.459-16.659-16.662-16.661zM162.407 70.389c27.314.198 39.683 10.33 46.938 21.625 5.964 9.492 7.656 20.515 8.036 27.072-15.226 10.442-26.149 26.689-29.561 45.572h138.623c-3.413-18.886-14.338-35.135-29.564-45.577.376-6.559 2.071-17.583 8.04-27.068 7.246-11.295 19.614-21.425 46.942-21.625a7.233 7.233 0 0 0 0-14.466c-31.162-.202-49.95 13.171-59.234 28.45-5.947 9.627-8.48 19.591-9.55 27.353a70.4 70.4 0 0 0-25.938-4.981 70.43 70.43 0 0 0-25.96 4.986c-1.069-7.761-3.602-17.725-9.549-27.358-9.287-15.281-28.068-28.652-59.223-28.45-4.006 0-7.238 3.238-7.238 7.233s3.232 7.234 7.238 7.234zm-18.253 248.188c0 71.594 44.03 130.722 100.454 138.429V193.879h-37.77c-37.118 22.856-62.684 70.152-62.684 124.698zm14.814 4.98c0-10.557 12.448-19.117 27.805-19.117 15.354 0 27.802 8.561 27.802 19.117s-12.447 19.112-27.802 19.112c-15.357 0-27.805-8.556-27.805-19.112zm54.263 82.629c-7.163 0-12.966-8.796-12.966-19.645 0-10.85 5.803-19.648 12.966-19.648 7.158 0 12.964 8.799 12.964 19.648.001 10.849-5.806 19.645-12.964 19.645zm9.525-132.331c-7.467 7.463-22.32 4.714-33.177-6.146-10.857-10.854-13.61-25.714-6.144-33.176 7.465-7.464 22.318-4.717 33.176 6.141 10.857 10.859 13.611 25.715 6.145 33.181zm84.664-79.976h-37.77v263.127c56.423-7.707 100.459-66.835 100.459-138.429 0-54.546-25.566-101.842-62.689-124.698zm-10.414 46.795c10.859-10.857 25.711-13.604 33.176-6.141 7.469 7.462 4.716 22.322-6.141 33.176-10.861 10.86-25.713 13.609-33.18 6.146-7.465-7.466-4.713-22.322 6.145-33.181zm3.382 165.512c-7.159 0-12.964-8.796-12.964-19.645 0-10.85 5.805-19.648 12.964-19.648 7.16 0 12.964 8.799 12.964 19.648s-5.804 19.645-12.964 19.645zm26.46-63.517c-15.357 0-27.807-8.556-27.807-19.112s12.449-19.117 27.807-19.117c15.355 0 27.804 8.561 27.804 19.117s-12.449 19.112-27.804 19.112z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bulleted-list.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bulleted-list.svg
deleted file mode 100644
index 72bdf63388..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bulleted-list.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M190.111 166.793V83.688h268.258v83.105H190.111zm0 130.998v-83.098H458.37v83.098H190.111zm0 131.005v-83.1h268.261v83.1H190.111zm-51.364-302.849c0 24.033-19.48 43.508-43.509 43.508-24.028 0-43.508-19.476-43.508-43.508 0-24.029 19.48-43.504 43.508-43.504 24.028 0 43.509 19.475 43.509 43.504zM51.73 251.066a43.508 43.508 0 1 1 87.016 0 43.508 43.508 0 1 1-87.016 0zm0 133.898a43.508 43.508 0 1 1 87.016 0 43.508 43.508 0 1 1-87.016 0z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-burn.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-burn.svg
deleted file mode 100644
index 4f6ebe6865..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-burn.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.536 46.393c-115.383.007-208.902 93.535-208.917 208.92.015 115.39 93.534 208.908 208.917 208.922 115.39-.014 208.912-93.532 208.925-208.922-.014-115.385-93.535-208.914-208.925-208.92zm124.712 333.628c-9.127 9.122-19.263 17.203-30.182 24.152l-92.489-147.381-92.056 150.18a177.407 177.407 0 0 1-34.69-26.951c-31.632-31.65-51.235-75.108-51.62-123.305h178.254L171.991 99.955c24.858-13.398 53.282-21.008 83.544-21.012 31.783.004 61.515 8.424 87.238 23.104l-85.114 154.67h174.208c-.384 48.196-19.986 91.654-51.619 123.304z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bus.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bus.svg
deleted file mode 100644
index 95e728138e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-bus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M445.692 271.445c0-12.643-.933-33.277-2.044-45.868L432.397 89.521c-1.109-12.575-12.261-24.242-24.787-25.944 0 0-37.313-12.854-151.23-12.854-113.915 0-151.228 12.854-151.228 12.854-12.524 1.702-23.675 13.369-24.802 25.944l-11.2 136.056c-1.146 12.591-2.06 33.226-2.06 45.868V396.12h29.379v31.257c0 18.2 14.766 32.949 32.95 32.949 18.18 0 32.962-14.749 32.962-32.949V396.12H350.4v31.257c0 18.185 14.765 32.949 32.947 32.949 18.215 0 32.963-14.765 32.963-32.949V396.12h29.383V271.445zM208.752 69h95.292c10.301 0 18.69 8.393 18.69 18.706 0 10.333-8.39 18.706-18.69 18.706h-95.292c-10.334 0-18.723-8.373-18.723-18.706 0-10.313 8.389-18.706 18.723-18.706zm-79.333 300.286c-15.077 0-27.309-12.229-27.309-27.308 0-15.088 12.231-27.287 27.309-27.287 15.073 0 27.307 12.199 27.307 27.287 0 15.08-12.234 27.308-27.307 27.308zM108 276.546v-10.42c0-9.908.717-26.094 1.603-35.937l8.795-83.898c.866-9.857 9.71-17.937 19.621-17.937h236.759c9.894 0 18.723 8.079 19.605 17.937l8.813 83.898c.882 9.843 1.585 26.028 1.585 35.937v10.42H108zm275.347 92.74c-15.075 0-27.305-12.229-27.305-27.308 0-15.088 12.229-27.287 27.305-27.287 15.106 0 27.306 12.199 27.306 27.287-.001 15.08-12.2 27.308-27.306 27.308z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calculator.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calculator.svg
deleted file mode 100644
index 3dcce7ec35..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calculator.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M361.403 74.259H151.361c-11.706 0-21.191 9.484-21.191 21.187v321.278c0 11.693 9.485 21.192 21.191 21.192h210.042c11.675 0 21.16-9.499 21.16-20.7V95.921c0-12.178-9.485-21.662-21.16-21.662zM211.436 406.654h-46.112V360.56h46.112v46.094zm0-67.793h-46.112V292.75h46.112v46.111zm69.327 67.793h-46.11V360.56h46.11v46.094zm0-67.793h-46.11V292.75h46.11v46.111zm68.38 67.793h-46.109V360.56h46.109v46.094zm0-67.793h-46.109V292.75h46.109v46.111zm-137.707-69.26h-46.112v-46.11h46.112v46.11zm69.327 0h-46.11v-46.11h46.11v46.11zm68.38 0h-46.109v-46.11h46.109v46.11zm0-86.204H165.324v-75.229h183.819v75.229z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calendar-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calendar-alt.svg
deleted file mode 100644
index fb485f5a83..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calendar-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M342.391 352.428h-44.879v44.865h44.879v-44.865zm-63.234-120.071h-44.849v44.853h44.849v-44.853zm63.234 60.034h-44.879v44.859h44.879v-44.859zm63.174-60.034h-44.854v44.853h44.854v-44.853zm-126.408 60.034h-44.849v44.859h44.849v-44.859zm63.234-60.034h-44.879v44.853h44.879v-44.853zm63.174 60.034h-44.854v44.859h44.854v-44.859zm-252.803 60.037h-44.856v44.865h44.856v-44.865zm0-60.037h-44.856v44.859h44.856v-44.859zM394.024 74.208v19.691c7.737 6.847 12.642 16.825 12.642 27.969 0 20.634-16.732 37.367-37.369 37.367-20.642 0-37.367-16.733-37.367-37.367 0-11.147 4.903-21.124 12.643-27.969V74.208H169.97v19.691c7.739 6.847 12.643 16.825 12.643 27.969 0 20.634-16.732 37.367-37.369 37.367-20.64 0-37.367-16.733-37.367-37.367 0-11.147 4.904-21.124 12.642-27.969V74.208h-83.27v397.644h436.668V74.208h-79.893zm40.011 357.759H77.131V183.544h356.904v248.423zm-218.047-199.61h-44.881v44.853h44.881v-44.853zm0 120.071h-44.881v44.865h44.881v-44.865zm63.169 0h-44.849v44.865h44.849v-44.865zm-63.169-60.037h-44.881v44.859h44.881v-44.859zM145.245 143.64c10.273 0 18.603-8.326 18.603-18.599V58.035c0-10.267-8.329-18.6-18.603-18.6-10.274 0-18.602 8.333-18.602 18.6v67.006c0 10.272 8.328 18.599 18.602 18.599zm224.054 0c10.272 0 18.601-8.326 18.601-18.599V58.035c0-10.267-8.328-18.6-18.601-18.6-10.274 0-18.604 8.333-18.604 18.6v67.006c0 10.272 8.329 18.599 18.604 18.599z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calendar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calendar.svg
deleted file mode 100644
index b405db5525..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-calendar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M162.199 402.396h35.836V224.442h-29.206c0 1.554-.45 3.927-1.347 7.119-1.549 5.322-3.839 9.573-6.854 12.763-4.408 4.663-10.124 7.775-17.142 9.328-4.407.984-12.118 1.719-23.138 2.21v23.808h41.85v122.726zm157.586 0h34.241v-38.289h20.127v-27.371h-20.127V225.548h-39.274l-65.414 108v30.56h70.447v38.288zm-44.419-65.66l44.419-76.647v76.647h-44.419zM144.432 143.458c10.271 0 18.603-8.328 18.603-18.602V57.855c0-10.271-8.331-18.602-18.603-18.602-10.275 0-18.602 8.331-18.602 18.602v67.001c0 10.274 8.326 18.602 18.602 18.602zm224.054 0c10.271 0 18.602-8.328 18.602-18.602V57.855c0-10.271-8.33-18.602-18.602-18.602-10.275 0-18.6 8.331-18.6 18.602v67.001c.001 10.274 8.325 18.602 18.6 18.602zm24.724-69.433v19.693c7.742 6.844 12.646 16.823 12.646 27.964 0 20.642-16.734 37.372-37.371 37.372-20.639 0-37.367-16.729-37.367-37.372 0-11.142 4.905-21.12 12.642-27.964V74.025H169.158v19.693c7.738 6.844 12.643 16.823 12.643 27.964 0 20.642-16.731 37.372-37.371 37.372-20.638 0-37.365-16.729-37.365-37.372 0-11.142 4.903-21.12 12.639-27.964V74.025H36.437V471.67h436.669V74.025H393.21zm40.013 357.762H76.315V183.363h356.907v248.424z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-camcorder.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-camcorder.svg
deleted file mode 100644
index de0b071abb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-camcorder.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M418.877 188.084v-11.695c0-14.844-12.031-26.877-26.875-26.877H164.285c-14.844 0-26.877 12.033-26.877 26.877v159.369c0 14.842 12.033 26.874 26.877 26.874h227.717c14.844 0 26.875-12.032 26.875-26.874V224.621l52.98 34.211V153.87l-52.98 34.214zM35.934 152.476V314.48h36.571l39.869-25.741v-110.52l-39.869-25.743H35.934z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-camera-roll.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-camera-roll.svg
deleted file mode 100644
index 172e0d92b0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-camera-roll.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M39.439 383.234h246.538V155.498H39.439v227.736zm0 53.271c0 13.377 10.826 24.166 24.166 24.166h198.206c13.342 0 24.166-10.789 24.166-24.166v-22.6H39.439v22.6zM261.811 76.689h-50.066V50.395h-98.073V76.69H63.605c-13.34 0-24.166 10.787-24.166 24.165v24.02h246.538v-24.02c0-13.378-10.825-24.166-24.166-24.166zm52.255 52.747v283.95H473.34v-283.95H314.066zm60.94 263.898h-34.009v-33.971h34.009v33.971zm0-209.841h-34.009v-34.047h34.009v34.047zm69.64 209.841h-34.01v-33.971h34.01v33.971zm0-209.841h-34.01v-34.047h34.01v34.047z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-candy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-candy.svg
deleted file mode 100644
index 1da869963f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-candy.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M429.279 129.662c-6.606-3.19-6.379-31.803-11.872-37.311-6.377-6.379-31.623.209-35.155-7.34-10.529-22.646.164-50.117-45.88-4.074-24.952 24.969-22.628 53.481-12.101 74.083-13.997-7.801-30.02-11.673-46.762-11.673-31.885 0-66.222 13.996-93.265 41.025-41.205 41.203-52.029 99.331-29.303 140.027-20.6-10.562-49.151-12.887-74.133 12.084-46.044 46.062-18.574 35.366 4.087 45.882 7.556 3.516.947 28.775 7.358 35.154 5.493 5.509 34.107 5.281 37.281 11.867 11.64 24.004-4.416 47.715 43.755-.453 24.395-24.416 22.726-52.225 12.752-72.716 14.389 8.456 31.033 12.591 48.399 12.591 31.916 0 66.222-13.979 93.264-41.008 41.728-41.756 52.354-100.885 28.386-141.648 20.503 9.976 48.331 11.661 72.728-12.77 48.17-48.168 24.464-32.113.461-43.72zm-132.05 60.858c-37.508 10.969-62.363 35.237-78.584 58.519-16.154 23.22-23.184 45.178-24.428 49.461-.161.556-.161.718-.161.718a12.523 12.523 0 0 1-12.067 9.274c-1.079 0-2.125-.13-3.205-.428-6.641-1.764-10.596-8.58-8.864-15.24.23-.812 6.64-24.916 24.724-52.748 17.988-27.761 48.201-59.628 95.619-73.48 6.607-1.943 13.541 1.865 15.435 8.472 1.963 6.605-1.83 13.523-8.469 15.452z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-caps-lock.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-caps-lock.svg
deleted file mode 100644
index 1a466182c9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-caps-lock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.834 53.049l183.224 196.96H355.25v79.194H154.412v-79.194H71.611l183.223-196.96m0 36.763L129.101 224.969H179.45v79.197h150.763v-79.197H380.568L254.834 89.812zm100.417 275.831v92.211H154.412v-92.211h200.839m-25.038 25.039H179.452v42.133h150.761v-42.133z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-car.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-car.svg
deleted file mode 100644
index 9c72758d41..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-car.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M444.912 251.134c0-13.344-10.824-24.17-24.167-24.17h-11.251l-31.559-100.262-.326-.786c-4.822-11.345-13.031-20.01-22.562-26.421-9.583-6.312-20.715-10.562-33.062-10.663H185.553c-12.329.101-23.479 4.352-33.061 10.663-9.514 6.411-17.724 15.076-22.547 26.421l-.344.803-31.524 100.245h-7.621c-13.341 0-24.167 10.826-24.167 24.17v108.484h22.924v31.085c0 18.214 14.749 32.949 32.948 32.949 18.198 0 32.944-14.735 32.944-32.949v-31.085h199.841v31.085c0 18.183 14.747 32.949 32.948 32.949 18.196 0 32.946-14.767 32.946-32.949v-31.085h24.07V251.134zm-57.016 11.608c15.093 0 27.323 12.215 27.323 27.303 0 15.078-12.23 27.309-27.323 27.309-15.092 0-27.292-12.23-27.292-27.309 0-15.088 12.2-27.303 27.292-27.303zM164.757 139.65c1.275-2.681 4.447-6.411 8.483-9.025 4.333-2.972 9.435-4.46 12.313-4.381h136.432c2.894-.079 8.014 1.41 12.327 4.381 4.058 2.615 7.214 6.345 8.503 9.025l27.455 87.313H137.268l27.489-87.313zm-42.594 177.704c-15.093 0-27.325-12.23-27.325-27.309 0-15.088 12.231-27.303 27.325-27.303 15.076 0 27.29 12.215 27.29 27.303-.001 15.078-12.215 27.309-27.29 27.309z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cash-register.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cash-register.svg
deleted file mode 100644
index f4f1779b86..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cash-register.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M127.863 107.129h83.079v58.82h-83.079zm286.584 128.655l-38.717-54.88V84.843H234.543v104.709H134.06l-32.617 46.232v75.178h313.005v-75.178zM264.56 115.525h80.488v34.724H264.56v-34.724zm-108.847 168.97c-9.163 0-16.592-7.427-16.592-16.595 0-9.165 7.429-16.592 16.592-16.592 9.167 0 16.597 7.427 16.597 16.592 0 9.168-7.43 16.595-16.597 16.595zm35.141-40.845c-9.163 0-16.592-7.429-16.592-16.594 0-9.164 7.429-16.593 16.592-16.593 9.166 0 16.594 7.429 16.594 16.593 0 9.166-7.427 16.594-16.594 16.594zm31.235 40.845c-9.163 0-16.59-7.427-16.59-16.595 0-9.165 7.427-16.592 16.59-16.592 9.166 0 16.595 7.427 16.595 16.592 0 9.168-7.429 16.595-16.595 16.595zm35.144-40.845c-9.168 0-16.597-7.429-16.597-16.594 0-9.164 7.429-16.593 16.597-16.593 9.163 0 16.592 7.429 16.592 16.593 0 9.166-7.429 16.594-16.592 16.594zm31.235 40.845c-9.166 0-16.596-7.427-16.596-16.595 0-9.165 7.43-16.592 16.596-16.592 9.163 0 16.592 7.427 16.592 16.592 0 9.168-7.429 16.595-16.592 16.595zm35.139-40.845c-9.161 0-16.595-7.429-16.595-16.594 0-9.164 7.434-16.593 16.595-16.593 9.163 0 16.596 7.429 16.596 16.593 0 9.166-7.432 16.594-16.596 16.594zm31.235 40.845c-9.163 0-16.595-7.427-16.595-16.595 0-9.165 7.432-16.592 16.595-16.592 9.165 0 16.595 7.427 16.595 16.592 0 9.168-7.43 16.595-16.595 16.595zM74.21 340.251h363.578v78.5H74.21z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-categories.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-categories.svg
deleted file mode 100644
index 2bd633a8f1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-categories.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M424.213 254.91a12.017 12.017 0 0 0-.209-2.057c-.025-.129-.059-.256-.09-.385-.059-.25-.102-.5-.174-.746L373.297 82.35a11.833 11.833 0 0 0-11.346-8.457H150.047a11.836 11.836 0 0 0-11.346 8.457L88.26 251.723c-.074.246-.117.496-.176.746-.031.129-.064.256-.09.385a11.82 11.82 0 0 0-.209 2.057c0 .064-.018.125-.018.191V426.27c0 6.535 5.299 11.838 11.838 11.838h312.787c6.539 0 11.838-5.303 11.838-11.838V255.102c.001-.067-.017-.127-.017-.192zM158.875 97.57h194.248l43.389 145.689H115.487L158.875 97.57zm14.405 50.961h165.439v29.455H173.28zm12.029-39.119H326.69v18.939H185.309zm-27.373 88.492h196.127v33.816H157.936z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-certificate.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-certificate.svg
deleted file mode 100644
index e3e16b5054..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-certificate.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M136.612 143.224h248.926v29.107H136.612zm45.09 52.62H340.45v29.106H181.702zm-74.515 70.659h174.85v86.89h-174.85zm214.647 43.446a45.704 45.704 0 1 1 91.408 0 45.704 45.704 0 1 1-91.408 0zM49.522 82.987v342.25h270.127v-23.679H73.202V106.666h365.596v294.892h-23.369v23.679h47.049V82.987zm293.805 289.999v61.074l24.211-11.566 24.211 11.566v-61.074c-7.521 2.898-15.68 4.505-24.211 4.505s-16.691-1.607-24.211-4.505z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chart-curve.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chart-curve.svg
deleted file mode 100644
index 219d05a1f8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chart-curve.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M157.117 441.285h51.141V259.654l-51.141 51.176v130.455zm-70.311-60.136v60.136h51.146V329.99l-35.319 35.33-15.827 15.829zm140.616 60.103h51.146V300.854l-51.146-51.146v191.544zm70.312-134.43v134.463h51.143V255.661l-40.093 40.123-11.05 11.038zm70.34 134.463h51.111V185.353L368.074 236.5v204.785zM347.73 81.363l33.915 33.941.197.198-90.683 90.714-68.35-68.33L48.807 311.91l36.17 36.143 137.834-137.846 68.35 68.33L418.008 151.67l33.75 33.748 11.018-115.043L347.73 81.363z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chart.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chart.svg
deleted file mode 100644
index 72c6534c38..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chart.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M176.104 193.544c7.332 0 14.13-2.278 19.737-6.149l56.162 33.617c-.075.933-.14 1.865-.14 2.818 0 19.226 15.588 34.812 34.814 34.812s34.812-15.586 34.812-34.812c0-4.352-.837-8.494-2.289-12.336l65.131-69.887 38.255 33.073 23.125-123.154-118.525 40.68 33.846 29.259-64.329 69.032a34.766 34.766 0 0 0-10.025-1.48c-6.961 0-13.431 2.065-18.872 5.584l-56.976-34.104c.029-.59.088-1.168.088-1.765 0-19.226-15.585-34.812-34.814-34.812-19.225 0-34.811 15.585-34.811 34.812 0 3.328.496 6.535 1.366 9.582l-46.381 42.625v41.801l67.073-61.637a34.69 34.69 0 0 0 12.753 2.441zm0 124.946c9.608 0 18.305-3.894 24.605-10.186l100.027 37.271c1.762 17.577 16.597 31.301 34.633 31.301 19.229 0 34.814-15.591 34.814-34.817 0-4.702-.943-9.183-2.634-13.273l58.639-66.622 22.638 17.463 10.931-83.692-78.181 31.809 20.195 15.584-57.349 65.15c-2.893-.778-5.915-1.23-9.054-1.23-9.242 0-17.619 3.625-23.852 9.502l-100.929-37.605c-2.225-17.083-16.794-30.282-34.485-30.282-19.225 0-34.811 15.585-34.811 34.812 0 .961.063 1.907.144 2.847L96.277 314.31v36.145l60.987-37.528c5.436 3.505 11.892 5.563 18.84 5.563zM72.282 438.257v-.39h-1.044V42.352h-29.73V469.03h426.675v-30.773H72.282z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chat-active.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chat-active.svg
deleted file mode 100644
index b899dfc3fe..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chat-active.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M258.809 69.162C138.25 66.784 39.013 141.076 37.163 235.09c-.645 32.685 10.575 63.449 30.542 89.779h-.006c34.338 44.114-3.139 119.951-3.139 119.951l110.65-47.653c23.839 7.533 49.743 11.921 76.89 12.456 120.557 2.375 219.793-71.911 221.644-165.929 1.854-94.015-94.377-172.155-214.935-174.532zm-96.684 197.266c-14.852 0-26.891-12.041-26.891-26.891 0-14.851 12.039-26.893 26.891-26.893s26.893 12.042 26.893 26.893c0 14.85-12.041 26.891-26.893 26.891zm89.638 0c-14.853 0-26.891-12.041-26.891-26.891 0-14.851 12.039-26.893 26.891-26.893s26.892 12.042 26.892 26.893c-.001 14.85-12.04 26.891-26.892 26.891zm89.637 0c-14.854 0-26.893-12.041-26.893-26.891 0-14.851 12.039-26.893 26.893-26.893 14.852 0 26.891 12.042 26.891 26.893 0 14.85-12.039 26.891-26.891 26.891z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chat.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chat.svg
deleted file mode 100644
index 21abb255ef..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chat.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M257.047 69.154c-120.559-2.372-219.795 71.915-221.646 165.93-.644 32.686 10.574 63.443 30.541 89.777h-.004c34.338 44.117-3.14 119.956-3.14 119.956l110.649-47.655c23.838 7.533 49.743 11.921 76.888 12.456 120.56 2.376 219.795-71.915 221.647-165.929 1.853-94.017-94.377-172.158-214.935-174.535z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-check.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-check.svg
deleted file mode 100644
index 5bd7161118..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-check.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M461.884 68.14c-132.601 81.297-228.817 183.87-272.048 235.345l-105.874-82.95-46.751 37.691 182.941 186.049c31.485-80.646 131.198-238.264 252.956-350.252L461.884 68.14z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-dotted-active.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-dotted-active.svg
deleted file mode 100644
index f717f8063b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-dotted-active.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M458.696 56.234c-117.413 71.99-202.609 162.818-240.893 208.393l-93.746-73.448-41.401 33.374 161.993 164.745c27.878-71.409 116.176-210.979 223.989-310.144l-9.942-22.92zM66.423 390.715H41.388c.007 35.213 28.536 63.739 63.746 63.755v-25.045c-21.37-.034-38.674-17.338-38.711-38.71zm-.001-137.23H41.384v51.229h25.039v-51.229zm-25.038-86.1h25.045c.034-21.383 17.334-38.686 38.708-38.72v-25.034c-35.215.004-63.747 28.534-63.753 63.754zm25.038 154.408H41.387v51.232h25.036v-51.232zm.007-135.201H41.384v51.234h25.045v-51.234zm327.318 22.633a1251.325 1251.325 0 0 0-22.208 28.602h22.208v-28.602zm-83.682-84.221v-21.375h-51.227v25.036h46.974a1437.7 1437.7 0 0 1 4.253-3.661zM123.644 455.279h51.236v-25.041h-51.236v25.041zm245.072-82.254h25.033v-51.232h-25.033v51.232zm-39.427 56.396v25.049c35.217-.012 63.738-28.542 63.744-63.755h-25.034c-.044 21.382-17.334 38.67-38.71 38.706zm39.423-175.936v51.229h25.037v-51.229h-25.037zm-245.067-124.82h51.235v-25.036h-51.235v25.036zm68.3 0h51.233v-25.036h-51.233v25.036zm.003 326.614h51.226v-25.041h-51.226v25.041zm66.885 0h51.237v-25.041h-51.237v25.041z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-dotted.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-dotted.svg
deleted file mode 100644
index cf650c0085..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-dotted.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M78.958 143.113c.006-35.215 28.54-63.748 63.751-63.754V104.4c-21.378.035-38.674 17.332-38.714 38.713h.007-25.044zm0 70.448v-51.232h25.036v51.232H78.958zm-.002 66.888v-51.232h25.039v51.232H78.956zm.003 68.307v-51.231h25.035v51.231H78.959zm327.325-135.195v-51.232h25.04v51.232h-25.04zm0 66.888v-51.232h25.038v51.232h-25.038zm.003 68.307v-51.231h25.033v51.231h-25.033zm-109.882 82.262v-25.045h51.233v25.045h-51.233zm-66.888 0v-25.045h51.233v25.045h-51.233zm-68.299 0v-25.045h51.233v25.045h-51.233zm135.187-326.623V79.357h51.237v25.038h-51.237zm-66.888 0V79.357h51.23v25.038h-51.23zm-68.304 0V79.357h51.235v25.038h-51.235zM78.956 366.45h25.042c.036 21.369 17.337 38.669 38.71 38.705v25.039c-35.214-.004-63.745-28.534-63.752-63.744zm287.905 38.707c21.373-.034 38.668-17.33 38.71-38.705h25.035c-.008 35.208-28.53 63.738-63.745 63.746v-25.041zm38.708-262.044c-.04-21.371-17.339-38.678-38.708-38.713V79.359c35.214.006 63.737 28.539 63.745 63.754h-25.037z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-empty.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-empty.svg
deleted file mode 100644
index 9a3edf8a28..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox-empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M372.426 82.107c27.657 0 50.078 22.42 50.078 50.076v246.175c0 27.653-22.421 50.075-50.078 50.075H138.66c-27.655 0-50.076-22.422-50.076-50.075V132.184c0-27.656 22.421-50.076 50.076-50.076h233.766m0 25.038H138.66c-13.806 0-25.039 11.231-25.039 25.038v246.175c0 13.803 11.233 25.038 25.039 25.038h233.766c13.806 0 25.04-11.235 25.04-25.038V132.184c0-13.807-11.235-25.038-25.04-25.038z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox.svg
deleted file mode 100644
index 748b269cd2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-checkbox.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M458.229 58.295c-117.414 71.987-202.611 162.818-240.894 208.393l-93.748-73.448-41.397 33.372 161.993 164.745c27.879-71.411 116.173-210.977 223.986-310.143l-9.94-22.919zm-106.51 208.016v137.147c0 13.808-11.232 25.04-25.039 25.04H92.917c-13.807 0-25.04-11.232-25.04-25.04V157.287c0-13.805 11.233-25.039 25.04-25.039h210.66a1211.365 1211.365 0 0 1 29.306-24.617c-2.035-.25-4.097-.421-6.203-.421H92.917c-27.66 0-50.08 22.419-50.08 50.077v246.171c0 27.659 22.42 50.081 50.08 50.081H326.68c27.658 0 50.08-22.422 50.08-50.081V232.399a1248.858 1248.858 0 0 0-25.041 33.912z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chess.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chess.svg
deleted file mode 100644
index 8cb5685672..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chess.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M357.312 428.658V384.22H170.144v44.438H143.56v46.436h240.325v-46.436h-26.573zM127.749 157.904c-.133.216.047.18.472-.063-.114-.311-.262-.311-.472.063zm51.143 50.328c13.23-11.429 13.458-12.23 25.916-18.377 4.743-2.324 18.935 3.845 18.935 3.845s21.42 4.463 31.477 4.463c4.365 0 8.223-1.897 11.199-4.041-15.532 15.241-55.494 56.379-68.231 87.902-12.118 30.002-10.659 61.414-9.272 74.758h156.282c-1.816-12.067-2.73-40.896 15.697-88.166 25.163-64.586 23.479-125.801-17.612-179.481-20.256-26.46-47.842-33.746-70.616-34.354-16.223-16.451-48.777-17.957-48.777-17.957l7.227 27.834.605 11.052-28.501 11.738s-10.071 2.521-10.071 11.757c0 8.604-58.846 55.282-64.93 58.636.767 2.34-1.324 22.022-1.324 29.415 0 8.404 8.207 13.115 8.207 13.115l10.091 5.835c0-.001 21.109 12.899 33.698 2.026z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chip-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chip-alt.svg
deleted file mode 100644
index 5d459f13b1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chip-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M352.328 160.154H160.451v191.861h191.877V160.154zm83.863-120.877H76.586c-20.437 0-37.016 16.562-37.016 37.014v359.586c0 20.439 16.579 37.021 37.016 37.021h359.605c20.455 0 37.02-16.582 37.02-37.021V76.292c0-20.453-16.565-37.015-37.02-37.015zM329.158 70.831h32.424v42.824h-32.424V70.831zm-59.303 0h32.406v42.839h-32.406V70.831zm-59.337 0h32.407v42.824h-32.407V70.831zm-59.339 0h32.442v42.824h-32.442V70.831zm-37.213 290.44H71.16v-32.406h42.806v32.406zm0-59.321H71.16v-32.409h42.806v32.409zm0-59.32H71.16v-32.421h42.806v32.421zm0-59.323H71.16v-32.42h42.806v32.42zm69.655 258.018h-32.442V398.52h32.442v42.805zm59.304 0h-32.407V398.52h32.407v42.805zm59.337 0h-32.406V398.52h32.406v42.805zm59.32 0h-32.424V398.52h32.424v42.805zm19.065-60.97H132.115V131.838h248.532v248.517zm60.989-19.065H398.83v-32.425h42.806v32.425zm0-59.34H398.83v-32.409h42.806v32.409zm0-59.32H398.83v-32.406h42.806v32.406zm0-59.323H398.83v-32.42h42.806v32.42z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chip.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chip.svg
deleted file mode 100644
index 0d622b2506..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-chip.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M38.744 361.163h49.97v-32.422h-49.97v32.422zm0-118.64h49.97v-32.442h-49.97v32.442zm0 59.323h49.97v-32.411h-49.97v32.411zm0-118.676h49.97v-32.397h-49.97v32.397zm435.289 145.571h-69.112v-26.896h69.112v-32.411h-69.112v-26.943h69.112v-32.41h-69.112v-26.897h69.098v-60.289h-32.391l-.017 27.863h-36.69v-18.457c0-14.062-11.38-25.459-25.442-25.459H132.14c-14.062 0-25.458 11.396-25.458 25.459v247.34c0 14.062 11.396 25.442 25.458 25.442h247.339c14.062 0 25.442-11.38 25.442-25.442v-18.479h36.69v24.266h32.422v-56.687zm-104.447 40.991H142.034V142.178h227.552v227.554zM344.668 167.13H166.967v177.649h177.701V167.13z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cinema.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cinema.svg
deleted file mode 100644
index f3bc729bf1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cinema.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M37.992 63.644v383.329h436.402V63.644H37.992zM79.65 244.209c146.979-16.055 157.588-132.643 157.588-132.643v-21.22h37.937v21.221s10.319 113.693 152.114 132c-59.682 13.412-62.119 135.697-61.236 176.709h-227.57c.88-40.458-1.504-159.912-58.833-176.067z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circle-dotted-active.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circle-dotted-active.svg
deleted file mode 100644
index f9c60410cb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circle-dotted-active.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M345.851 111.718a185.398 185.398 0 0 0-45.732-26.639l-8.881 21.952a161.694 161.694 0 0 1 39.896 23.238l14.717-18.551zm-216.747 19.774l-14.965-18.351a184.22 184.22 0 0 0-35.789 39.006l19.562 13.341a160.683 160.683 0 0 1 31.192-33.996zm-44.259 56.992L63.372 178.5a185.043 185.043 0 0 0-15.236 50.696l23.42 3.498a161.33 161.33 0 0 1 13.289-44.21zm94.518-84.714a164.283 164.283 0 0 1 14.497-4.16l-5.479-23.037a188.208 188.208 0 0 0-16.596 4.763 186.74 186.74 0 0 0-32.633 14.643l11.736 20.567a162.505 162.505 0 0 1 28.475-12.776zM69.821 259.063l-23.676.406c.303 17.68 3.168 35.262 8.516 52.258l22.586-7.105c-4.662-14.827-7.162-30.155-7.426-45.559zM265.997 99.148l5.182-23.105a184.193 184.193 0 0 0-52.809-4.034l1.621 23.623a160.727 160.727 0 0 1 46.006 3.516zm69.326 279.882l15.355 18.022a184.426 184.426 0 0 0 34.947-39.76l-19.841-12.926a160.8 160.8 0 0 1-30.461 34.664zm-52.892 29.912a166.045 166.045 0 0 1-11.164 3.336l5.961 22.915a188.63 188.63 0 0 0 12.779-3.815 185.84 185.84 0 0 0 36.031-16.631l-12.174-20.309a161.899 161.899 0 0 1-31.433 14.504zm-216.368-69.14a183.557 183.557 0 0 0 30.424 43.345l17.216-16.257A159.987 159.987 0 0 1 87.2 329.134l-21.137 10.668zm331.955-139.889a1012.11 1012.11 0 0 0-11.622 14.552c3.168 11.715 5.021 23.699 5.488 35.756l23.66-.915c-.68-17.655-3.918-35.169-9.623-52.062l-7.903 2.669zm-19.652 121.191l21.678 9.526a184.84 184.84 0 0 0 14.157-51.011l-23.488-2.996a161.26 161.26 0 0 1-12.347 44.481zm-259.318 82.299a185.601 185.601 0 0 0 46.285 25.668l8.415-22.135a161.946 161.946 0 0 1-40.38-22.392l-14.32 18.859zm80.101 10.878l-4.689 23.211a184.408 184.408 0 0 0 36.416 3.645c5.477 0 11.019-.249 16.473-.74l-2.128-23.584a160.829 160.829 0 0 1-46.072-2.532zM456.454 70.863c-111.037 68.079-191.607 153.974-227.811 197.074l-88.654-69.46-39.152 31.562 153.193 155.8c26.365-67.535 109.865-199.522 211.824-293.302l-9.4-21.674z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circle-dotted.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circle-dotted.svg
deleted file mode 100644
index 9cd9fd9252..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circle-dotted.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.981 440.734c-4.422 0-8.895-.159-13.293-.471l1.682-23.62c15.395 1.095 31.076-.014 46.053-3.277l5.039 23.137a185.943 185.943 0 0 1-39.481 4.231zm-43.253-5.094a183.61 183.61 0 0 1-49.174-19.657l11.864-20.49a159.927 159.927 0 0 0 42.833 17.123l-5.523 23.024zm111.734-8.02l-8.781-21.991a160.553 160.553 0 0 0 39.949-23.097l14.666 18.593a184.376 184.376 0 0 1-45.834 26.495zm-185.815-28.926a185.575 185.575 0 0 1-35.652-39.114l19.596-13.293a161.956 161.956 0 0 0 31.105 34.125l-15.049 18.282zm253.834-18.216l-17.492-15.96a161.321 161.321 0 0 0 25.924-38.192l21.297 10.353a184.986 184.986 0 0 1-29.729 43.799zM88.097 333.183a183.381 183.381 0 0 1-14.977-50.791l23.438-3.355a159.869 159.869 0 0 0 13.047 44.243l-21.508 9.903zm345.082-24.798l-22.711-6.705c4.355-14.761 6.566-30.131 6.566-45.679h23.678c0 17.818-2.533 35.444-7.533 52.384zM94.96 252.634l-23.672-.483c.365-17.809 3.266-35.378 8.625-52.224l22.566 7.181c-4.671 14.677-7.203 29.996-7.519 45.526zm320.881-16.346a159.854 159.854 0 0 0-12.115-44.503l21.713-9.45a183.696 183.696 0 0 1 13.908 51.088l-23.506 2.865zM112.546 182.67l-21.072-10.798a184.915 184.915 0 0 1 30.633-43.168l17.154 16.319a161.599 161.599 0 0 0-26.715 37.647zm278.68-14.155a161.801 161.801 0 0 0-30.389-34.763l15.426-17.966a185.512 185.512 0 0 1 34.832 39.846l-19.869 12.883zm-232.239-41.101l-14.273-18.894a184.318 184.318 0 0 1 46.375-25.533l8.322 22.169a160.705 160.705 0 0 0-40.424 22.258zm180.444-9.19a160.053 160.053 0 0 0-42.466-18.02l6.009-22.903a183.633 183.633 0 0 1 48.748 20.684l-12.291 20.239zM224.825 97.956l-4.553-23.239a186.147 186.147 0 0 1 35.705-3.45h.004c5.711 0 11.473.266 17.129.786l-2.174 23.58c-15.306-1.414-31.072-.624-46.111 2.323z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circuits.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circuits.svg
deleted file mode 100644
index 4feb78fa69..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circuits.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M228.807 384.157c0-9.911-8.061-17.972-17.971-17.972s-17.971 8.061-17.971 17.972c0 9.906 8.061 17.971 17.971 17.971s17.971-8.065 17.971-17.971zm165.75 0c0-9.911-8.062-17.972-17.971-17.972-9.91 0-17.971 8.061-17.971 17.972 0 9.906 8.061 17.971 17.971 17.971 9.908 0 17.971-8.065 17.971-17.971zm-60.371-202.066c0 9.906 8.062 17.97 17.973 17.97 9.908 0 17.971-8.063 17.971-17.97 0-9.911-8.062-17.972-17.971-17.972-9.911 0-17.973 8.061-17.973 17.972zm-24.131-57.829l30.404 30.406a29.68 29.68 0 0 1 11.699-2.389c13.062 0 24.139 8.418 28.166 20.113h77.225V88.859c0-19.003-15.41-34.408-34.408-34.408H310.055v69.811zM195.01 243.861c0-9.908-8.061-17.973-17.971-17.973-9.908 0-17.971 8.064-17.971 17.973 0 9.91 8.062 17.971 17.971 17.971 9.91 0 17.971-8.061 17.971-17.971zm102.685 0c0-9.908-8.062-17.973-17.971-17.973s-17.971 8.064-17.971 17.973c0 9.91 8.062 17.971 17.971 17.971s17.971-8.061 17.971-17.971zm-20.83 89.167c0 9.907 8.062 17.968 17.971 17.968 9.91 0 17.973-8.061 17.973-17.968 0-9.91-8.062-17.971-17.973-17.971-9.908.001-17.971 8.061-17.971 17.971zm66.184-27.63l-19.543 19.541a29.685 29.685 0 0 1 1.141 8.089c0 16.464-13.346 29.809-29.811 29.809-16.463 0-29.809-13.345-29.809-29.809s13.346-29.81 29.809-29.81c2.809 0 5.516.414 8.09 1.141l28.064-28.066h126.559v-74.791h-82.797c-5.465 6.355-13.551 10.397-22.594 10.397-16.465 0-29.811-13.345-29.811-29.809 0-1.382.127-2.733.309-4.066l-41.707-41.706V54.451h-56.422v104.653l54.959 54.958c.08 0 .158-.012.238-.012 16.465 0 29.811 13.347 29.811 29.811 0 16.466-13.346 29.811-29.811 29.811-.666 0-1.316-.056-1.973-.101l-61.637 61.638h-65.469c-5.104 9.1-14.826 15.257-26.002 15.257-16.465 0-29.811-13.347-29.811-29.811 0-16.466 13.346-29.811 29.811-29.811 11.176 0 20.898 6.157 26.002 15.259h53.412l48.992-48.992a29.622 29.622 0 0 1-3.137-13.25c0-5.25 1.369-10.175 3.75-14.459l-58.242-58.241V54.451h-49.047v141.115l20.354 20.355c3.217-1.19 6.682-1.871 10.311-1.871 16.465 0 29.812 13.347 29.812 29.811 0 16.466-13.348 29.811-29.812 29.811-16.463 0-29.811-13.345-29.811-29.811 0-1.957.201-3.863.562-5.718l-30.523-30.521V54.451H88.859c-19 0-34.41 15.405-34.41 34.408v334.276c0 19.004 15.41 34.413 34.41 34.413h107.422v-47.39c-9.1-5.101-15.256-14.828-15.256-26.002 0-16.463 13.348-29.81 29.811-29.81 16.465 0 29.811 13.347 29.811 29.81 0 11.174-6.158 20.901-15.258 26.004v47.388h136.646V410.16c-9.1-5.103-15.26-14.83-15.26-26.004 0-16.463 13.348-29.81 29.811-29.81 16.465 0 29.811 13.347 29.811 29.81 0 11.174-6.158 20.901-15.256 26.004v47.388h32c18.998 0 34.408-15.409 34.408-34.413V305.398h-114.5zm-236.377 15.257c0 9.91 8.062 17.973 17.973 17.973 9.908 0 17.969-8.062 17.969-17.973 0-9.908-8.061-17.971-17.969-17.971-9.911.001-17.973 8.063-17.973 17.971z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circus.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circus.svg
deleted file mode 100644
index ff712b18ed..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-circus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M478.285 233.765L255.523 38.441 32.776 233.765h-.016v.038c.016 20.602 16.709 37.278 37.31 37.278 20.62 0 37.299-16.677 37.33-37.278 0 20.602 16.711 37.278 37.312 37.278 17.513 0 32.179-12.067 36.168-28.354 4.023 16.286 18.673 28.354 36.201 28.354 20.602 0 37.314-16.677 37.314-37.278.015 20.602 16.708 37.278 37.309 37.278 20.621 0 37.314-16.677 37.314-37.278.017 20.602 16.742 37.278 37.314 37.278 20.616 0 37.312-16.677 37.312-37.278.033 20.602 16.743 37.278 37.331 37.278 20.617 0 37.326-16.677 37.326-37.278v-.038h-.016zm-74.639 49.806c-10.399 7.815-23.317 12.463-37.312 12.463-13.982 0-26.915-4.647-37.314-12.463-10.398 7.815-23.315 12.463-37.314 12.463-13.977 0-26.908-4.647-37.309-12.463-10.401 7.815-23.319 12.463-37.314 12.463a62.252 62.252 0 0 1-36.201-11.581 62.111 62.111 0 0 1-36.168 11.581c-13.996 0-26.911-4.647-37.312-12.463-10.415 7.815-23.348 12.463-37.33 12.463a58.51 58.51 0 0 1-7.258-.46V441.18c0 15.742 60.662 28.986 142.972 32.863 38.391-25.096 49.739-162.546 49.739-162.546s11.365 137.45 49.738 162.546c82.328-3.877 142.988-17.121 142.988-32.863V295.574c-2.387.297-4.805.46-7.273.46-13.983 0-26.901-4.647-37.332-12.463z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-client.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-client.svg
deleted file mode 100644
index 23e23117e9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-client.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M471.908 396.417c-7.228-20.956-31.161-23.962-51.154-32.396-21.954-9.257-46.297-20.002-68.201-28.99-6.25-1.701-12.505-3.407-18.754-5.115-7.463-5.136-14.77-22.2-18.759-30.686-3.978-.567-7.952-1.138-11.938-1.703.616-13.129 8.742-13.834 11.938-23.866 2.812-8.849.292-20.349 4.752-28.538 3.096-5.687 10.096-5.729 13.59-10.604 3.175-4.426 5.263-12.141 6.251-17.561 1.805-9.903 3.379-23.461-1.325-33.283-2.704-5.646-4.411-6.186-5.164-13.04-.914-8.304 2.449-35.386 2.587-41.243.344-15.193-.024-16.424-3.701-31.223 0 0-4.466-13.41-11.465-17.447l-13.951-2.402-8.621-7.99c-34.745-21.378-71.992-6.381-91.941 1.703-28.745 9.327-46.923 37.477-34.231 97.611 2.166 10.271-5.624 14.861-5.118 20.465 1.116 12.259 1.351 41.721 12.933 48.98 1.076.672 9.291 2.729 9.237 2.168 1.139 11.934 2.274 23.877 3.409 35.809 2.892 7.932 9.829 8.803 11.844 20.006l-8.876 2.158c-3.99 8.485-11.298 25.55-18.76 30.686a20223.93 20223.93 0 0 1-18.752 5.115c-21.906 8.988-46.25 19.733-68.204 28.99-19.991 8.434-43.924 11.439-51.152 32.396 0 14.231-1.341 47.849-.973 66.497h191.138l14.034-95.841-11.665-24.621 26.93-12.913 22.684 12.646-12.505 25.35 22.112 95.379h182.749c.362-18.648-.978-52.266-.978-66.497z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-clothes-hanger.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-clothes-hanger.svg
deleted file mode 100644
index f17c449cb0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-clothes-hanger.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M456.41 348.808L283.254 237.822c-.653-.428-1.343-.817-2.027-1.209v-9.911c32.178-10.71 55.363-41.041 55.363-76.85 0-44.716-36.201-80.934-80.938-80.949-44.734.016-80.967 36.233-80.967 80.949h51.145c.033-16.446 13.344-29.776 29.822-29.823 16.449.047 29.762 13.377 29.825 29.823-.063 16.45-13.376 29.795-29.825 29.826-6.736 0-13.339 2.73-18.081 7.489-4.776 4.758-7.491 11.348-7.491 18.082v31.364c-.686.392-1.371.782-2.028 1.209L54.898 348.808c-19.131 12.233-27.863 35.648-21.484 57.429 6.408 21.778 26.391 36.787 49.084 36.787h346.314c22.691 0 42.674-15.009 49.051-36.787 6.408-21.781-2.357-45.196-21.453-57.429zM82.498 391.844l173.154-110.971 173.16 110.971H82.498z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud-drive.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud-drive.svg
deleted file mode 100644
index df5fcf03d7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud-drive.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M73.304 302.953H49.622v128.312H462.378V302.953H73.304zM438.7 407.584H73.304v-80.952H438.7v80.952zm-46.465-21.703c10.307 0 18.664-8.356 18.664-18.661 0-10.304-8.357-18.66-18.664-18.66-10.303 0-18.658 8.356-18.658 18.66s8.356 18.661 18.658 18.661zM214.55 352.596h23.676v31.968H214.55zm-115.811-.005h23.682v31.973H98.739zm57.899.005h23.688v31.962h-23.688zm-16.336-247.571h7.709v-24.29H123.72l-4.617 11.817-3.797 9.236 22.627 8.847zm307.16 129.85l-22.199 8.676-8.677-22.201 22.199-8.675zm-74.266-124.539l22.198-8.677-8.176-20.924h-23.836v23.837h7.56zm56.913 80.118l-22.201 8.676-8.677-22.204 22.201-8.676zm-39.555-35.717l22.199-8.682-4.963-12.693c-.002-.006-.006-.01-.008-.019l-.004-.01a.157.157 0 0 0-.01-.027l-.002-.005c-.002-.004-.006-.014-.01-.019l-.004-.02a2.658 2.658 0 0 1-.047-.114l-.006-.009c-.016-.043-.029-.084-.047-.126h-.002c-.006-.019-.016-.041-.021-.064h-.002l-.021-.057-.004-.013c-1.869-4.776-3.527-9.022-3.527-9.022l-22.201 8.675 8.68 22.205zm71.806 118.396l-.002-.006c-.006-.009-.01-.027-.016-.04l-.006-.015v-.004c-.004-.009-.008-.024-.014-.037-.002-.006-.004-.006-.008-.01 0-.006-.002-.009-.004-.009l-.002-.006v-.004l-.012-.032h-.002l-.625-1.6-5.525-14.314-22.623 8.847 4.48 11.631.088.228v2.956h24.287v-7.538c.002 0-.006-.019-.016-.047zM73.218 212.652l22.201 8.674-8.674 22.2-22.201-8.674zm17.342-44.399l22.2 8.682-8.682 22.201-22.201-8.682zm39.566-35.72l-22.199-8.675-3.529 9.022-.004.013-.021.057c-.01.023-.016.046-.025.064-.018.042-.033.083-.049.126l-.004.009c-.014.041-.029.078-.043.114l-.008.02a.365.365 0 0 1-.008.019l-.002.005c-.006.004-.006.019-.012.027l-.004.01-.008.019-4.963 12.693 22.203 8.682 8.676-22.205zM73.911 277.762l.088-.228 4.48-11.631-22.625-8.847-5.527 14.314-.623 1.6-.014.032v.004l-.002.006c-.002 0-.002.003-.006.009l-.004.01a.367.367 0 0 1-.014.037v.004c-.002.006-.006.006-.006.015h-.002c-.004.013-.012.031-.016.04l-.002.006c-.012.028-.018.047-.018.047v7.538h24.289v-2.956zM315.54 80.735h23.836v23.837H315.54zm-47.844 0h23.838v23.837h-23.838zm-47.84 0h23.838v23.837h-23.838zm-47.841 0h23.836v23.837h-23.836z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud-upload.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud-upload.svg
deleted file mode 100644
index 41e015fa89..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud-upload.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M414.463 235.98a103.586 103.586 0 0 0 3.355-26.203c0-57.107-46.295-103.4-103.402-103.4-42.938 0-79.759 26.176-95.389 63.438-13.426-15.776-33.414-25.797-55.753-25.797-40.424 0-73.195 32.768-73.195 73.193 0 6.951.99 13.667 2.802 20.035-33.012 12.104-56.539 43.797-56.539 81.025 0 47.611 38.579 86.268 86.244 86.268h112.549v-72.691h-46.469l71.231-86.309 71.23 86.309h-46.472v72.691h103.829c47.689 0 86.269-38.656 86.269-86.268 0-38.613-25.32-71.276-60.29-82.291z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud.svg
deleted file mode 100644
index 10a95d9562..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloud.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M413.692 236.421a103.48 103.48 0 0 0 3.359-26.2c0-57.111-46.296-103.405-103.403-103.405-42.939 0-79.759 26.176-95.39 63.438-13.423-15.778-33.413-25.799-55.753-25.799-40.423 0-73.194 32.77-73.194 73.194 0 6.952.989 13.667 2.8 20.039-33.008 12.104-56.537 43.798-56.537 81.021 0 47.615 38.58 86.271 86.245 86.271h265.897c47.688 0 86.269-38.656 86.269-86.271-.001-38.613-25.323-71.271-60.293-82.288z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloudy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloudy.svg
deleted file mode 100644
index 75aad3d4d2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cloudy.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M316.896 332.236c1.636-6.241 2.484-12.784 2.484-19.538 0-42.576-34.501-77.078-77.045-77.078-32.015 0-59.452 19.507-71.127 47.288-10.007-11.756-24.919-19.229-41.562-19.229-30.12 0-54.549 24.43-54.549 54.563 0 5.165.724 10.188 2.096 14.931-24.624 9.041-42.153 32.651-42.153 60.397 0 35.5 28.778 64.309 64.291 64.309h198.206c35.545 0 64.292-28.809 64.292-64.309-.001-28.774-18.87-53.121-44.933-61.334zM434.39 151.594a54.815 54.815 0 0 0 2.095-14.946c0-30.134-24.461-54.542-54.581-54.542-16.642 0-31.555 7.449-41.561 19.229-11.643-27.785-39.08-47.288-71.096-47.288-42.575 0-77.077 34.501-77.077 77.077 0 6.733.884 13.293 2.486 19.524-26.064 8.207-44.934 32.552-44.934 61.33 0 11.723 3.142 22.697 8.635 32.161a71.882 71.882 0 0 1 6.08 2.635c19.034-22.55 47.289-36.084 77.897-36.084 43.43 0 80.544 27.288 95.261 65.612h74.658c35.514 0 64.291-28.825 64.291-64.323.001-27.732-17.56-51.362-42.154-60.385z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-clubs.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-clubs.svg
deleted file mode 100644
index 68617041d5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-clubs.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M345.097 201.637c-1.966 0-3.911.085-5.846.211a89.487 89.487 0 0 0 6.481-33.496c0-49.606-40.219-89.814-89.813-89.814-49.618 0-89.833 40.208-89.833 89.814a89.546 89.546 0 0 0 6.479 33.494 90.514 90.514 0 0 0-5.824-.209c-49.621 0-89.83 40.206-89.83 89.812 0 49.611 40.209 89.814 89.83 89.814 36.611 0 68.075-21.923 82.054-53.356-9.839 37.655-28.101 104.613-33.517 104.613h81.262c-5.411 0-23.659-66.909-33.501-104.57 13.986 31.408 45.441 53.313 82.056 53.313 49.593 0 89.812-40.203 89.812-89.814.001-49.606-40.218-89.812-89.81-89.812z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cocktail.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cocktail.svg
deleted file mode 100644
index cc13e78a6f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cocktail.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M269.961 374.771V235.246L415.514 89.709H95.791l145.557 145.536v139.526c-52.389 1.594-92.774 11.77-92.774 24.076 0 13.414 47.938 24.298 107.064 24.298 59.19 0 107.13-10.884 107.13-24.298 0-12.306-40.454-22.482-92.807-24.076z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-code.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-code.svg
deleted file mode 100644
index 2615644cea..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-code.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M38.299 255.395l137.255-137.248 46.782 46.789-90.458 90.459 90.458 90.46-46.782 46.792L38.299 255.395zm248.467 90.46l90.466-90.46-72.028-72.026-18.431-18.433 46.788-46.791 18.436 18.438L470.81 255.395 333.561 392.647l-46.795-46.792z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coffee.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coffee.svg
deleted file mode 100644
index d9e23e1259..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coffee.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M78.895 367.853c0 13.338 10.791 24.168 24.134 24.168h263.575c13.342 0 24.166-10.83 24.166-24.168V338.68H78.895v29.173zm294.478-247.946H96.62v86.104c0 56.083 24.395 90.423 63.571 107.771h151.605c29.562-13.442 50.034-37.037 57.782-73.044 1.244.065 2.521.116 3.795.116 33.422 0 60.467-27.093 60.467-60.483s-27.045-60.464-60.467-60.464zm0 95.993c-.198 0-.393-.015-.588-.015.163-3.239.262-6.491.262-9.875v-61.155c.128 0 .229-.019.326-.019 19.588 0 35.514 15.942 35.514 35.533 0 19.624-15.926 35.531-35.514 35.531z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-dollar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-dollar.svg
deleted file mode 100644
index 6f3e0659da..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-dollar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M285.812 281.548c-4.381-3.501-11.838-6.671-22.401-9.55v51.507a46.589 46.589 0 0 0 10.073-2.292c3.501-1.14 6.607-2.778 9.384-4.971 2.78-2.091 5.068-4.738 6.837-7.915 1.795-3.106 2.682-6.795 2.682-11.116-.001-6.997-2.194-12.199-6.575-15.663zm-54.841-90.425c-2.321 1.904-4.153 4.223-5.495 7.004-1.339 2.779-1.995 6.018-1.995 9.745 0 5.919 1.834 10.498 5.595 13.735 3.76 3.168 9.94 5.787 18.509 7.779v-43.754c-3.042 0-5.986.459-8.83 1.344-2.879.91-5.427 2.284-7.784 4.147zm24.785-156.85c-122.172 0-221.225 99.038-221.225 221.244 0 122.201 99.053 221.261 221.225 221.261 122.209 0 221.297-99.06 221.297-221.261 0-122.205-99.088-221.244-221.297-221.244zm0 410.782c-104.479 0-189.504-85.059-189.504-189.537 0-104.514 85.024-189.538 189.504-189.538 104.518 0 189.543 85.024 189.543 189.538 0 104.478-85.026 189.537-189.543 189.537zm.035-344.659c-85.678 0-155.104 69.473-155.104 155.121 0 85.646 69.426 155.104 155.104 155.104 85.647 0 155.07-69.457 155.07-155.104 0-85.648-69.423-155.121-155.07-155.121zm71.749 213.331c-1.962 5.98-5.494 11.838-10.597 17.558-5.102 5.728-11.936 10.827-20.536 15.302-8.568 4.454-19.588 7.131-32.997 8.02v22.825h-15.826v-22.825c-20.015-1.411-35.646-7.589-46.927-18.51-11.251-10.893-17.789-26.92-19.587-47.972h37.834c-.195 10.163 2.484 18.212 8.043 24.134 5.529 5.914 12.427 9.642 20.637 11.247v-56.02c-.883-.391-2.092-.812-3.596-1.21-1.506-.493-3.174-.85-4.973-1.243-6.606-1.763-13.146-3.891-19.588-6.309-6.41-2.421-12.197-5.657-17.3-9.647-5.1-4.027-9.157-9.058-12.229-15.01-3.011-6.021-4.513-13.441-4.513-22.404 0-9.119 1.731-17.168 5.199-24.168 3.498-6.963 8.11-12.785 13.832-17.523 5.724-4.744 12.327-8.439 19.85-11.021 7.521-2.586 15.272-4.152 23.316-4.707v-20.638h15.826v20.638c8.047.944 15.599 2.646 22.662 5.228 7.065 2.621 13.279 6.187 18.675 10.762 5.329 4.543 9.744 10.235 13.114 17.006 3.397 6.804 5.361 14.878 5.918 24.169h-38.098c-.165-7.164-2.388-13.247-6.704-18.284-4.283-4.972-9.484-7.489-15.567-7.489v47.482c2.159.521 4.352 1.046 6.574 1.605a196.91 196.91 0 0 1 7.13 1.896c13.211 3.565 23.414 8.009 30.575 13.276 7.127 5.267 12.426 10.76 15.795 16.484 3.402 5.754 5.429 11.441 6.048 17.167.624 5.755.918 10.822.918 15.272.002 3.953-.947 8.922-2.908 14.909z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-euro.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-euro.svg
deleted file mode 100644
index 20527e3526..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-euro.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.104 34.594c-122.207 0-221.261 99.115-221.261 221.289 0 122.206 99.054 221.262 221.261 221.262 122.206 0 221.276-99.056 221.276-221.262.001-122.174-99.069-221.289-221.276-221.289zm0 410.826c-104.516 0-189.524-85.055-189.524-189.537 0-104.516 85.009-189.536 189.524-189.536S445.64 151.368 445.64 255.883c.001 104.482-85.021 189.537-189.536 189.537zm0-344.639c-85.646 0-155.106 69.455-155.106 155.102 0 85.684 69.46 155.107 155.106 155.107 85.661 0 155.104-69.424 155.104-155.107 0-85.647-69.442-155.102-155.104-155.102zm37.623 127.24l-8.469 19.657h-61.171l-.293 11.473h58.177l-8.456 19.658h-47.528c5.836 28.775 19.292 43.131 40.418 43.131 13.652 0 27.666-5.719 42.054-17.2l-.261 41.271c-12.197 7.092-26.227 10.657-42.054 10.657-22.941 0-41.433-7.359-55.431-22.139-12.752-13.279-21.042-31.85-24.851-55.721h-21.045l8.486-19.658h10.925v-7.096c0-2.551.078-4.018.262-4.377h-19.935l8.456-19.657h13.929c4.382-22.04 13.393-39.407 27.044-52.161 14.373-13.831 32.391-20.767 54.056-20.767 15.305 0 31.869 4.579 49.708 13.677l-16.645 34.104c-12.754-8.144-24.693-12.264-35.778-12.264-19.114 0-31.883 12.496-38.245 37.411h66.647z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-pound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-pound.svg
deleted file mode 100644
index 9ba0de073b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-pound.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.098 100.762c-85.644 0-155.07 69.457-155.07 155.105 0 85.68 69.427 155.104 155.07 155.104 85.68 0 155.104-69.425 155.104-155.104 0-85.648-69.425-155.105-155.104-155.105zm53.535 253.277c-7.456 2.549-14.652 3.788-21.586 3.788-6.9 0-12.621-.42-17.199-1.339-4.545-.914-8.729-1.991-12.557-3.269-3.988-1.439-8.014-2.747-12.002-3.823-4.022-1.117-9.027-1.637-15.013-1.637-4.937 0-10.101.684-15.435 2.057-5.395 1.344-10.693 4.025-15.989 8.011l-16.94-25.077c3.827-2.391 7.619-5.171 11.349-8.338a66.585 66.585 0 0 0 9.843-10.531 58.745 58.745 0 0 0 6.964-12.426c1.8-4.445 2.716-9.125 2.716-14.033 0-3.137-.492-6.146-1.506-9.152-.979-3.01-2.223-6.054-3.695-9.156h-27.01v-23.222h17.462c-2.714-3.464-5.459-8.53-8.207-15.304-2.716-6.703-4.088-14.223-4.088-22.364 0-7.265 1.504-14.229 4.512-20.765 3.01-6.545 7.426-12.332 13.244-17.363 5.821-5.008 13.114-8.904 21.845-11.876 8.73-2.877 18.838-4.351 30.317-4.351 20.927 0 37.245 5.82 48.888 17.467 11.643 11.669 17.461 28.611 17.461 50.782h-36.854c-.197-2.718-.556-6.116-1.08-10.204-.554-4.086-1.798-8.076-3.695-11.904-1.929-3.791-4.84-7.123-8.729-9.938-3.958-2.847-9.354-4.252-16.253-4.252-8.175 0-14.717 2.285-19.557 6.834-4.807 4.547-7.193 10.662-7.193 18.314 0 2.158.062 4.251.26 6.278.166 1.991.59 4.313 1.212 6.966.653 2.646 1.732 5.656 3.3 9.123 1.506 3.467 3.666 7.65 6.378 12.556h36.335v23.222H248.48c.883 2.743 1.471 5.43 1.765 8.173.263 2.747.426 5.657.426 8.733 0 8.603-2.257 15.893-6.737 22.004a82.78 82.78 0 0 1-15.697 16.256l.59.521c4.352-2.743 7.88-4.479 10.629-5.164 2.713-.725 5.365-1.115 7.912-1.115 3.629 0 7.26.328 10.793.984 3.564.621 7.127 1.307 10.789 2.025 3.633.914 7.196 1.732 10.663 2.324 3.434.619 6.998.945 10.628.945 3.662 0 7.323-.652 11.053-1.893 3.76-1.28 8.078-4.578 13.016-9.816l16.351 27.568c-6.542 6.383-13.574 10.83-21.028 13.381zM256.098 34.605c-122.172 0-221.257 99.055-221.257 221.262 0 122.202 99.085 221.26 221.257 221.26 122.207 0 221.261-99.058 221.261-221.26-.001-122.207-99.054-221.262-221.261-221.262zm0 410.801c-104.479 0-189.506-85.027-189.506-189.539 0-104.516 85.027-189.505 189.506-189.505 104.517 0 189.541 84.989 189.541 189.505 0 104.512-85.025 189.539-189.541 189.539z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-yen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-yen.svg
deleted file mode 100644
index 2d7f31caf1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin-yen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.176 34.714c-122.174 0-221.229 99.051-221.229 221.255 0 122.177 99.055 221.245 221.229 221.245 122.205 0 221.261-99.068 221.261-221.245 0-122.204-99.056-221.255-221.261-221.255zm0 410.76c-104.482 0-189.506-85.021-189.506-189.505 0-104.513 85.023-189.538 189.506-189.538 104.518 0 189.537 85.025 189.537 189.538 0 104.484-85.02 189.505-189.537 189.505zm.033-344.611c-85.68 0-155.104 69.43-155.104 155.105 0 85.647 69.425 155.089 155.104 155.089 85.641 0 155.07-69.441 155.07-155.089 0-85.675-69.429-155.105-155.07-155.105zm63.473 147.685v25.945h-39.044l-4.09 7.933v12.559h43.134v25.929h-43.134v37.708h-41.497v-37.708h-42.906v-25.929h42.906v-12.559l-3.859-7.933h-39.047v-25.945h25.934l-41.762-84.93h44.247l36.036 84.93 35.221-84.93h44.244l-42.314 84.93h25.931z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin.svg
deleted file mode 100644
index ec3b147525..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coin.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.392 100.759c-85.65 0-155.105 69.456-155.105 155.119 0 85.645 69.455 155.105 155.105 155.105 85.644 0 155.103-69.46 155.103-155.105-.001-85.663-69.46-155.119-155.103-155.119zm30.901 252.619H248.51V229.391h-48.041v-29.204c6.736.163 13.211-.328 19.524-1.522 6.278-1.193 11.903-3.268 16.939-6.277 5.003-3.006 9.22-6.967 12.687-11.883 3.433-4.908 5.757-10.991 6.833-18.3h30.839v191.173zM256.392 34.619c-122.175 0-221.26 99.051-221.26 221.26 0 122.19 99.085 221.26 221.26 221.26 122.204 0 221.257-99.07 221.257-221.26-.001-122.209-99.053-221.26-221.257-221.26zm0 410.781c-104.516 0-189.541-85.025-189.541-189.522 0-104.517 85.025-189.525 189.541-189.525 104.514 0 189.538 85.008 189.538 189.525 0 104.497-85.025 189.522-189.538 189.522z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-alt.svg
deleted file mode 100644
index a2349aaa12..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M302.271 134.014c-67.299 0-121.845 54.548-121.845 121.865 0 67.298 54.546 121.846 121.845 121.846 67.302 0 121.849-54.548 121.849-121.846-.001-67.317-54.548-121.865-121.849-121.865zm26.227 202.374h-30.444v-97.402h-37.771v-22.957c5.266.149 10.398-.244 15.336-1.173 4.939-.934 9.354-2.588 13.309-4.942 3.926-2.35 7.26-5.46 9.977-9.315 2.715-3.862 4.512-8.667 5.362-14.392h24.231v150.181zm-26.227-254.35c-44.702 0-85.417 16.888-116.221 44.588-26.422.602-51.145 3.253-72.564 7.44-24.56 4.792-44.835 11.704-58.047 19.145-8.861 4.889-14.256 10.069-16.153 13.455-1.079 1.801-1.341 2.895-1.374 3.876.032.997.294 2.107 1.374 3.924 1.144 1.911 3.302 4.445 6.67 7.145 6.736 5.477 18.151 11.414 32.866 16.403 15.37 5.261 34.369 9.549 55.624 12.476a173.745 173.745 0 0 0-5.297 30.163c-7.39-1.012-14.651-2.191-21.549-3.532-26.784-5.28-49.642-12.717-67.17-22.482-.85-.507-1.668-1.012-2.518-1.504v27.193c0 1.044.23 2.206 1.374 4.157 1.144 1.894 3.302 4.429 6.67 7.127 6.736 5.49 18.151 11.428 32.866 16.414 14.356 4.89 31.785 8.944 51.307 11.858 1.539 11.002 4.057 21.677 7.557 31.91-10.432-1.241-20.536-2.793-30.085-4.658-26.784-5.281-49.642-12.723-67.17-22.497a177.834 177.834 0 0 1-3.533-2.112v23.564c0 1.24.295 2.584 1.506 4.658 1.21 2.044 3.466 4.646 6.899 7.408 6.9 5.594 18.377 11.562 33.193 16.576 20.538 7.021 47.288 12.316 77.438 14.914 7.031 10.938 15.174 21.014 24.428 30.072-26.128-.834-50.653-3.564-72.564-7.848-26.751-5.234-49.479-12.674-66.843-22.355a68.741 68.741 0 0 1-3.041-1.811v26.24c0 1.046.23 2.191 1.374 4.121 1.144 1.927 3.302 4.446 6.67 7.16 6.736 5.477 18.151 11.413 32.866 16.404 29.496 10.085 71.978 16.691 118.871 16.661a482.26 482.26 0 0 0 38.653-1.575 173.05 173.05 0 0 0 65.926 13.004c95.979 0 173.843-77.852 173.843-173.844-.004-96.013-77.867-173.838-173.846-173.838zm0 322.732c-82.114 0-148.922-66.779-148.922-148.891 0-82.099 66.808-148.91 148.922-148.91 82.114 0 148.892 66.811 148.892 148.91-.001 82.111-66.778 148.891-148.892 148.891z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-dollar-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-dollar-alt.svg
deleted file mode 100644
index 8f283ea006..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-dollar-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M282.564 205.876c-1.862 1.504-3.337 3.367-4.414 5.624-1.079 2.192-1.602 4.807-1.602 7.816 0 4.709 1.469 8.369 4.511 10.92 2.976 2.587 7.915 4.646 14.783 6.248v-34.99c-2.422 0-4.81.355-7.064 1.081-2.322.687-4.382 1.863-6.214 3.301zm43.855 72.332c-3.502-2.778-9.484-5.297-17.924-7.612v41.2a37.818 37.818 0 0 0 8.046-1.832c2.812-.945 5.297-2.256 7.521-3.987 2.225-1.702 4.025-3.826 5.495-6.312 1.406-2.516 2.126-5.496 2.126-8.895.001-5.594-1.767-9.779-5.264-12.562zM302.021 81.675c-44.671 0-85.417 16.905-116.221 44.637-26.425.573-51.112 3.221-72.565 7.426-24.56 4.801-44.865 11.705-58.076 19.126-8.83 4.945-14.192 10.076-16.123 13.478-1.077 1.764-1.31 2.941-1.373 3.856.063 1.012.296 2.127 1.373 3.96 1.113 1.896 3.302 4.414 6.639 7.13 6.768 5.461 18.182 11.412 32.898 16.383 15.37 5.295 34.369 9.58 55.657 12.456a174.81 174.81 0 0 0-5.364 30.219c-7.391-1.047-14.619-2.192-21.516-3.533-26.816-5.298-49.674-12.723-67.171-22.496-.849-.491-1.665-1.016-2.517-1.476v27.179c0 1.013.228 2.188 1.373 4.117 1.113 1.929 3.302 4.446 6.639 7.163 6.768 5.457 18.182 11.41 32.898 16.385 14.355 4.937 31.785 8.959 51.31 11.834 1.503 11.055 4.087 21.716 7.553 31.986-10.464-1.273-20.537-2.85-30.085-4.678-26.816-5.294-49.674-12.721-67.171-22.502-1.209-.715-2.354-1.375-3.53-2.09v23.542c0 1.216.294 2.589 1.507 4.614 1.207 2.062 3.462 4.707 6.896 7.454 6.866 5.559 18.376 11.545 33.16 16.55 20.536 7.029 47.319 12.326 77.472 14.947a173.955 173.955 0 0 0 24.395 30.079c-26.096-.852-50.654-3.56-72.531-7.879-26.718-5.267-49.479-12.652-66.844-22.366a65.315 65.315 0 0 1-3.041-1.8v26.227c0 1.081.228 2.191 1.373 4.157 1.113 1.894 3.302 4.415 6.639 7.158 6.768 5.494 18.182 11.413 32.898 16.414 29.463 10.041 71.977 16.646 118.901 16.613a472.4 472.4 0 0 0 38.589-1.567c20.342 8.37 42.609 13.012 65.958 13.012 96.013 0 173.845-77.827 173.845-173.842-.001-95.978-77.833-173.873-173.845-173.873zm0 322.766c-82.112 0-148.888-66.777-148.888-148.894 0-82.114 66.775-148.889 148.888-148.889 82.116 0 148.893 66.774 148.893 148.889-.001 82.117-66.777 148.894-148.893 148.894zm0-270.767c-67.3 0-121.845 54.54-121.845 121.874 0 67.272 54.545 121.883 121.845 121.883 67.302 0 121.88-54.61 121.88-121.883-.001-67.334-54.579-121.874-121.88-121.874zm57.753 170.273c-1.569 4.777-4.384 9.48-8.472 14.062-4.053 4.546-9.549 8.634-16.416 12.229-6.867 3.565-15.664 5.728-26.392 6.444v18.214h-12.652v-18.214c-16.024-1.179-28.55-6.116-37.543-14.782-9.025-8.761-14.227-21.547-15.664-38.423h30.249c-.13 8.14 1.995 14.554 6.439 19.295 4.452 4.706 9.942 7.716 16.519 9.024v-44.868c-.689-.255-1.7-.585-2.911-.943a44.164 44.164 0 0 0-3.957-.984 179.573 179.573 0 0 1-15.664-5.035c-5.135-1.929-9.747-4.481-13.834-7.718-4.055-3.237-7.326-7.228-9.776-12.034-2.419-4.772-3.633-10.726-3.633-17.919 0-7.258 1.409-13.735 4.22-19.297 2.747-5.556 6.445-10.267 11.022-14.06 4.576-3.729 9.874-6.705 15.86-8.764a73.205 73.205 0 0 1 18.673-3.793v-16.514h12.652v16.514c6.444.719 12.494 2.121 18.117 4.183 5.692 2.097 10.628 4.973 14.913 8.635 4.316 3.628 7.816 8.144 10.532 13.572 2.712 5.46 4.281 11.903 4.707 19.33h-30.445c-.163-5.729-1.931-10.601-5.364-14.589-3.432-4.023-7.586-6.018-12.46-6.018v38c1.735.389 3.469.851 5.266 1.243 1.768.456 3.663.948 5.659 1.504 10.596 2.911 18.771 6.439 24.492 10.624 5.691 4.25 9.941 8.635 12.655 13.247 2.718 4.545 4.316 9.124 4.808 13.702.49 4.579.783 8.668.783 12.231.001 3.14-.814 7.094-2.383 11.902z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-dollar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-dollar.svg
deleted file mode 100644
index 0b2b7a2ea6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-dollar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M249.555 145.609c-2.06 0-4.057.325-6.016.912-1.966.592-3.698 1.538-5.27 2.814-1.6 1.274-2.843 2.879-3.76 4.745-.916 1.894-1.373 4.084-1.373 6.668 0 3.987 1.309 7.13 3.826 9.282 2.58 2.192 6.77 3.924 12.592 5.266v-29.687zm23.966 88.753a17.85 17.85 0 0 0 4.646-5.367c1.208-2.122 1.832-4.642 1.832-7.589 0-4.736-1.507-8.304-4.482-10.655-2.977-2.355-8.045-4.516-15.205-6.476v35.022c2.189-.263 4.48-.786 6.834-1.536 2.358-.788 4.516-1.932 6.375-3.399zm-17.33 57.818c54.873 0 99.381-44.509 99.381-99.387 0-54.854-44.508-99.348-99.381-99.348s-99.35 44.493-99.35 99.348c.001 54.878 44.477 99.387 99.35 99.387zm-9.091-91.8c-1.046-.324-2.158-.589-3.367-.848-4.512-1.177-8.93-2.618-13.309-4.253-4.383-1.666-8.309-3.828-11.775-6.571-3.465-2.716-6.211-6.116-8.271-10.206-2.094-4.053-3.107-9.157-3.107-15.233 0-6.186 1.178-11.646 3.563-16.388 2.356-4.721 5.464-8.713 9.388-11.938 3.89-3.203 8.371-5.722 13.472-7.486a59.973 59.973 0 0 1 15.862-3.174v-14.042h10.758v14.042c5.462.607 10.594 1.801 15.402 3.562 4.807 1.738 9.024 4.189 12.654 7.263 3.664 3.108 6.641 6.968 8.928 11.575 2.321 4.645 3.662 10.108 4.021 16.422H275.42c-.096-4.877-1.633-8.996-4.514-12.396-2.942-3.403-6.473-5.101-10.594-5.101v32.276c1.439.358 2.943.718 4.48 1.075 1.502.391 3.107.789 4.805 1.272 8.996 2.427 15.928 5.431 20.801 9.026 4.84 3.601 8.438 7.332 10.726 11.219 2.323 3.892 3.661 7.752 4.118 11.674.426 3.861.624 7.325.624 10.368 0 2.648-.654 6.054-1.995 10.104-1.342 4.089-3.729 8.079-7.194 11.972-3.466 3.894-8.11 7.327-13.935 10.367-5.85 3.041-13.309 4.838-22.43 5.461v15.497h-10.758v-15.497c-13.639-.951-24.265-5.171-31.918-12.561-7.619-7.386-12.066-18.275-13.278-32.637h25.702c-.128 6.935 1.704 12.395 5.463 16.42 3.76 3.988 8.441 6.539 14.031 7.651v-38.097c-.622-.23-1.406-.52-2.454-.818zm9.091 177.309c-55.525-.129-103.891-9.644-133.389-26.032a78.94 78.94 0 0 1-2.977-1.731v19.883c0 .951.227 2.029 1.24 3.76 1.014 1.671 2.912 3.896 5.789 6.25 5.82 4.674 15.535 9.74 28.092 13.994 25.18 8.603 61.35 14.225 101.244 14.157 52.291.165 98.434-9.845 121.192-22.793 7.587-4.183 12.262-8.63 13.966-11.608 1.014-1.73 1.24-2.809 1.24-3.76v-19.883c-7.751 4.709-16.809 8.697-27.077 12.232-28.741 9.743-67.003 15.5-109.32 15.531zm0 55.266c-55.525-.131-103.891-9.711-133.389-25.998-1.016-.585-1.997-1.178-2.977-1.765v22.565c0 1.017.227 2.091 1.24 3.825 1.014 1.701 2.912 3.86 5.789 6.216 5.82 4.705 15.535 9.773 28.092 14.026 25.18 8.633 61.35 14.229 101.244 14.193 52.291.097 98.434-9.911 121.192-22.79 7.587-4.221 12.262-8.667 13.997-11.678.982-1.702 1.209-2.776 1.209-3.793V405.16c-7.751 4.707-16.841 8.729-27.176 12.264-28.709 9.743-66.969 15.502-109.221 15.531zM134.999 299.501c-7.555 4.185-12.231 8.628-13.933 11.578-.944 1.601-1.207 2.678-1.24 3.597.033.982.296 1.994 1.24 3.627 1.014 1.671 2.912 3.895 5.789 6.248 5.82 4.71 15.535 9.742 28.092 13.994 25.18 8.603 61.35 14.229 101.244 14.157 52.357.167 98.496-9.837 121.227-22.753 7.588-4.221 12.228-8.637 13.963-11.646.916-1.633 1.178-2.645 1.209-3.627-.031-.919-.293-1.996-1.209-3.597-1.047-1.702-2.941-3.892-5.854-6.217-4.645-3.79-11.936-7.814-21.16-11.475 24.528-26.356 39.57-61.709 39.57-100.595 0-81.607-66.154-147.741-147.746-147.741-81.559 0-147.746 66.134-147.746 147.741 0 38.854 15.043 74.238 39.604 100.595-4.908 1.96-9.322 3.955-13.05 6.114zm121.192 41.075c-.325 0-.653-.035-.948-.035.295 0 .623.035.948.035.361 0 .654-.035 1.014-.035-.359 0-.652.035-1.014.035zM129.275 192.793c0-69.979 56.967-126.928 126.916-126.928 69.982 0 126.918 56.949 126.918 126.928 0 69.984-56.936 126.914-126.918 126.914-69.949 0-126.916-56.93-126.916-126.914z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-euro-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-euro-alt.svg
deleted file mode 100644
index c8bbff6628..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-euro-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M301.384 134.017c-67.3 0-121.849 54.546-121.849 121.817 0 67.331 54.549 121.91 121.849 121.91 67.297 0 121.846-54.579 121.846-121.91-.001-67.272-54.549-121.817-121.846-121.817zm32.866 99.419l-6.672 15.465h-48.057l-.211 8.996h45.683l-6.638 15.467h-37.344c4.576 22.6 15.172 33.879 31.766 33.879 10.713 0 21.733-4.516 33.029-13.51l-.211 32.379c-9.582 5.592-20.603 8.372-33.047 8.372-18.016 0-32.536-5.79-43.541-17.364-10.005-10.467-16.514-25.047-19.521-43.756h-16.514l6.637-15.467h8.584v-5.594c0-1.962.083-3.104.213-3.402h-15.664l6.653-15.465h10.94c3.449-17.27 10.531-30.971 21.256-40.944 11.282-10.862 25.443-16.352 42.479-16.352 12.02 0 25.017 3.595 39.046 10.757l-13.079 26.817c-10.023-6.442-19.393-9.679-28.125-9.679-15.011 0-25.015 9.781-30.019 29.4h52.357zM301.384 82.025c-44.705 0-85.417 16.906-116.222 44.605-26.424.623-51.147 3.238-72.567 7.455-24.557 4.742-44.865 11.673-58.078 19.129-8.828 4.875-14.226 10.075-16.137 13.44-1.063 1.803-1.325 2.877-1.357 3.894.032.98.294 2.127 1.357 3.889 1.128 1.928 3.301 4.48 6.67 7.191 6.735 5.436 18.133 11.385 32.883 16.391 15.402 5.264 34.369 9.516 55.642 12.46a172.758 172.758 0 0 0-5.333 30.179c-7.39-1.045-14.632-2.187-21.565-3.523-26.783-5.308-49.608-12.725-67.137-22.508-.85-.49-1.685-.979-2.517-1.5v27.203c0 1.049.226 2.162 1.357 4.127 1.128 1.926 3.301 4.476 6.67 7.127 6.735 5.492 18.133 11.444 32.883 16.413 14.321 4.877 31.784 8.964 51.308 11.875a171.457 171.457 0 0 0 7.554 31.917 399.213 399.213 0 0 1-30.118-4.677c-26.783-5.27-49.608-12.726-67.137-22.47-1.193-.685-2.387-1.434-3.566-2.09v23.545c.052 1.24.297 2.549 1.537 4.643 1.213 2.025 3.468 4.646 6.904 7.424 6.881 5.592 18.377 11.544 33.191 16.582 20.503 7 47.304 12.295 77.436 14.877a176.792 176.792 0 0 0 24.396 30.117c-26.096-.881-50.652-3.565-72.532-7.846-26.732-5.27-49.494-12.693-66.859-22.406a151.669 151.669 0 0 1-3.023-1.762v26.227c0 1.045.226 2.191 1.357 4.116 1.128 1.936 3.301 4.45 6.67 7.163 6.735 5.461 18.133 11.414 32.883 16.389 29.497 10.067 71.96 16.68 118.886 16.645 13.324 0 26.242-.527 38.637-1.535 20.323 8.338 42.579 12.98 65.927 12.98 96.01 0 173.841-77.832 173.841-173.877 0-95.983-77.831-173.809-173.841-173.809zm0 322.735c-82.113 0-148.925-66.777-148.925-148.926 0-82.082 66.812-148.859 148.925-148.859 82.097 0 148.905 66.777 148.905 148.859 0 82.148-66.809 148.926-148.905 148.926z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-euro.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-euro.svg
deleted file mode 100644
index e1b77f5941..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-euro.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.258 377.992c-55.562-.099-103.895-9.68-133.391-25.966a94.619 94.619 0 0 1-2.977-1.794v19.846c.033 1.011.195 2.096 1.242 3.827 1.012 1.698 2.877 3.854 5.787 6.208 5.823 4.713 15.564 9.783 28.092 14.066 25.148 8.531 61.317 14.188 101.246 14.157 52.288.134 98.462-9.874 121.225-22.854 7.554-4.188 12.195-8.637 13.93-11.608 1.014-1.7 1.242-2.785 1.242-3.796v-19.846c-7.749 4.703-16.809 8.727-27.109 12.258-28.742 9.744-67.004 15.472-109.287 15.502zm129.334-72.826c-4.68-3.759-11.938-7.784-21.158-11.447 24.559-26.39 39.569-61.705 39.569-100.592 0-81.59-66.157-147.746-147.745-147.746-81.592 0-147.748 66.156-147.748 147.746 0 38.887 15.043 74.202 39.57 100.592-4.875 1.928-9.29 3.963-13.017 6.051-7.586 4.22-12.229 8.666-13.931 11.638-.949 1.639-1.209 2.651-1.209 3.636 0 .945.26 1.991 1.209 3.627 1.012 1.669 2.877 3.829 5.787 6.178 5.823 4.713 15.564 9.783 28.092 14.066 25.148 8.531 61.317 14.188 101.246 14.158 52.354.131 98.496-9.875 121.225-22.825 7.584-4.188 12.195-8.667 13.93-11.577.948-1.636 1.178-2.682 1.242-3.627-.064-.984-.294-1.997-1.242-3.636-1.015-1.664-2.879-3.89-5.82-6.242zm-129.334 14.908c-69.984 0-126.918-56.929-126.918-126.947 0-69.945 56.934-126.914 126.918-126.914 69.979 0 126.912 56.969 126.912 126.914 0 70.019-56.934 126.947-126.912 126.947zm0 113.154c-55.562-.101-103.895-9.649-133.391-25.966a217.248 217.248 0 0 1-2.977-1.773v22.599c.033.983.195 2.13 1.242 3.8 1.012 1.701 2.877 3.922 5.787 6.24 5.823 4.713 15.564 9.812 28.092 14.031 25.148 8.566 61.317 14.223 101.246 14.191 52.288.135 98.462-9.873 121.225-22.822 7.554-4.189 12.195-8.639 13.93-11.641 1.014-1.738 1.242-2.816 1.242-3.8V405.46c-7.749 4.741-16.843 8.767-27.176 12.263-28.709 9.779-66.972 15.505-109.22 15.505zm0-339.445c-54.875 0-99.352 44.473-99.352 99.344 0 54.877 44.477 99.381 99.352 99.381 54.87 0 99.378-44.504 99.378-99.381 0-54.871-44.508-99.344-99.378-99.344zm22.138 78.647l-5.658 13.111h-40.81l-.197 7.652h38.851l-5.691 13.148h-31.687c3.891 19.162 12.883 28.776 26.978 28.776 9.092 0 18.444-3.861 28.059-11.479l-.197 27.499c-8.143 4.775-17.461 7.133-28.06 7.133-15.303 0-27.633-4.907-36.983-14.752-8.537-8.891-14.06-21.254-16.58-37.178h-14.062l5.657-13.148h7.293v-4.742c0-1.701.063-2.65.193-2.91h-13.309l5.657-13.111h9.289c2.909-14.686 8.926-26.33 18.051-34.83 9.581-9.254 21.615-13.864 36.068-13.864 10.204 0 21.258 3.042 33.193 9.157l-11.12 22.793c-8.532-5.492-16.481-8.241-23.904-8.241-12.719 0-21.286 8.308-25.505 24.985h44.474z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-pound-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-pound-alt.svg
deleted file mode 100644
index e91acce12c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-pound-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M302.066 133.43c-67.267 0-121.844 54.615-121.844 121.916 0 67.263 54.578 121.812 121.844 121.812 67.303 0 121.88-54.549 121.88-121.812 0-67.301-54.577-121.916-121.88-121.916zm43.269 195.001c-5.857 1.995-11.513 3.041-16.943 3.041-5.428 0-9.94-.392-13.538-1.11-3.564-.724-6.867-1.533-9.846-2.586-3.137-1.109-6.307-2.155-9.448-3.007-3.139-.85-7.095-1.245-11.804-1.245-3.86 0-7.914.524-12.102 1.573-4.216 1.11-8.404 3.169-12.557 6.375l-13.309-19.753c3.009-1.863 5.983-4.056 8.893-6.537 2.91-2.551 5.527-5.264 7.718-8.271a44.675 44.675 0 0 0 5.492-9.785 29.332 29.332 0 0 0 2.128-11.013c0-2.456-.392-4.845-1.177-7.169a65.03 65.03 0 0 0-2.878-7.225H244.71v-18.211h13.733c-2.158-2.751-4.286-6.775-6.441-12.039-2.16-5.297-3.205-11.148-3.205-17.592 0-5.725 1.175-11.15 3.531-16.317 2.354-5.134 5.855-9.682 10.431-13.606 4.548-3.922 10.269-7.064 17.136-9.349 6.867-2.258 14.815-3.405 23.839-3.405 16.415 0 29.236 4.551 38.392 13.701 9.158 9.158 13.734 22.466 13.734 39.931h-28.97c-.132-2.16-.427-4.874-.852-8.044-.426-3.236-1.405-6.344-2.911-9.352-1.503-3.01-3.794-5.625-6.866-7.845-3.075-2.194-7.294-3.309-12.752-3.309-6.446 0-11.546 1.798-15.372 5.333-3.762 3.595-5.657 8.402-5.657 14.414 0 1.705.065 3.342.229 4.909.129 1.605.425 3.403.947 5.464.491 2.093 1.341 4.482 2.584 7.195 1.178 2.746 2.879 6.016 5.035 9.91h28.552v18.211h-22.531c.683 2.162 1.174 4.253 1.372 6.41.228 2.191.327 4.451.327 6.865 0 6.742-1.735 12.531-5.233 17.272a65.574 65.574 0 0 1-12.361 12.784l.424.42c3.436-2.121 6.215-3.465 8.374-4.084 2.158-.557 4.217-.854 6.211-.854 2.882 0 5.69.266 8.47.755 2.813.495 5.659 1.048 8.504 1.602 2.844.751 5.623 1.342 8.338 1.834 2.747.489 5.528.747 8.371.747 2.879 0 5.756-.49 8.701-1.465 2.94-1.053 6.344-3.602 10.202-7.754l12.853 21.647c-5.136 5.041-10.664 8.576-16.514 10.534zM302.066 81.465c-44.666 0-85.416 16.871-116.222 44.574-26.39.624-51.079 3.236-72.532 7.455-24.591 4.775-44.865 11.71-58.077 19.165-8.83 4.872-14.226 10.042-16.123 13.438-1.078 1.801-1.34 2.945-1.373 3.895.033.978.295 2.092 1.373 3.928 1.112 1.893 3.271 4.408 6.638 7.127 6.737 5.492 18.15 11.412 32.866 16.413 15.402 5.229 34.401 9.548 55.657 12.458-2.648 9.747-4.413 19.853-5.329 30.186-7.392-1.016-14.652-2.191-21.549-3.531-26.785-5.267-49.644-12.756-67.138-22.498-.884-.492-1.701-1.016-2.552-1.538v27.239c.033 1.047.23 2.193 1.406 4.15 1.112 1.904 3.271 4.414 6.638 7.133 6.737 5.427 18.15 11.412 32.866 16.385 14.357 4.9 31.786 8.994 51.308 11.868 1.539 10.987 4.089 21.685 7.588 31.916-10.465-1.239-20.568-2.776-30.116-4.644-26.785-5.296-49.644-12.752-67.138-22.528a120.3 120.3 0 0 1-3.566-2.095v23.543c.034 1.248.294 2.589 1.537 4.678 1.211 2.031 3.467 4.643 6.902 7.428 6.867 5.586 18.377 11.51 33.16 16.545 20.536 7.062 47.318 12.322 77.469 14.944 7 10.92 15.173 20.991 24.397 30.048-26.098-.848-50.654-3.561-72.535-7.811-26.749-5.299-49.509-12.689-66.874-22.398-1.015-.592-2.028-1.178-3.042-1.771v26.23c.033 1.016.23 2.154 1.406 4.121 1.112 1.893 3.271 4.447 6.638 7.13 6.737 5.493 18.15 11.445 32.866 16.413 29.497 10.108 71.978 16.678 118.935 16.645 13.31 0 26.195-.551 38.589-1.535a173.384 173.384 0 0 0 65.926 12.978c96.014 0 173.844-77.854 173.844-173.802.001-96.047-77.829-173.882-173.843-173.882zm0 322.736c-82.112 0-148.889-66.811-148.889-148.855 0-82.115 66.776-148.926 148.889-148.926 82.115 0 148.927 66.811 148.927 148.926 0 82.045-66.811 148.855-148.927 148.855z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-pound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-pound.svg
deleted file mode 100644
index 6d1443a6c9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-pound.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.531 291.949c54.873 0 99.348-44.506 99.348-99.381 0-54.899-44.475-99.348-99.348-99.348s-99.363 44.448-99.363 99.348c0 54.875 44.49 99.381 99.363 99.381zm-48.038-111.482h11.673c-1.83-2.283-3.663-5.684-5.461-10.199-1.83-4.479-2.745-9.48-2.745-14.945 0-4.841 1.013-9.449 3.007-13.862 1.996-4.351 4.938-8.21 8.83-11.545 3.892-3.337 8.748-5.983 14.586-7.948 5.853-1.93 12.589-2.909 20.243-2.909 13.962 0 24.837 3.892 32.618 11.705 7.784 7.757 11.658 19.032 11.658 33.878H277.31c-.129-1.824-.395-4.116-.736-6.863a25.345 25.345 0 0 0-2.47-7.915c-1.258-2.552-3.202-4.775-5.819-6.642-2.617-1.895-6.229-2.839-10.84-2.839-5.478 0-9.827 1.536-13.033 4.577-3.238 3.039-4.839 7.094-4.839 12.194 0 1.476.065 2.878.163 4.188.133 1.34.425 2.881.851 4.644.424 1.767 1.146 3.791 2.191 6.114 1.014 2.325 2.452 5.102 4.25 8.367h24.264v15.503h-19.146c.604 1.835 1.029 3.631 1.192 5.467.163 1.828.263 3.791.263 5.851 0 5.688-1.487 10.624-4.463 14.65-2.992 4.087-6.46 7.714-10.479 10.859l.374.389c2.91-1.865 5.281-3.003 7.114-3.465a18.875 18.875 0 0 1 5.266-.754c2.451 0 4.837.232 7.208.654 2.371.396 4.761.882 7.196 1.342 2.438.59 4.79 1.113 7.113 1.568 2.287.428 4.676.654 7.11.654 2.423 0 4.892-.453 7.377-1.303 2.5-.854 5.377-3.041 8.665-6.578l10.922 18.412c-4.366 4.285-9.06 7.26-14.029 8.961-4.969 1.67-9.777 2.521-14.389 2.521-4.626 0-8.452-.265-11.479-.891-3.043-.615-5.837-1.333-8.404-2.183-2.665-.953-5.328-1.834-8.012-2.549-2.681-.759-6.018-1.117-10.039-1.117-3.27 0-6.705.459-10.269 1.375-3.596.918-7.163 2.711-10.676 5.364l-11.299-16.778a57.016 57.016 0 0 0 7.555-5.523 42.841 42.841 0 0 0 6.571-7.003 38.372 38.372 0 0 0 4.646-8.304 24.781 24.781 0 0 0 1.83-9.422c0-2.059-.344-4.084-1.014-6.084a61.908 61.908 0 0 0-2.454-6.114h-18.049v-15.502zm48.038 252.229c-55.559-.132-103.925-9.678-133.408-25.997-1.013-.553-2.009-1.176-2.991-1.761v22.597c.035 1.012.229 2.09 1.244 3.859 1.013 1.633 2.894 3.824 5.803 6.178 5.805 4.711 15.551 9.779 28.109 14.027 25.146 8.605 61.315 14.229 101.243 14.195 52.274.131 98.43-9.906 121.192-22.859 7.556-4.183 12.231-8.633 13.948-11.576.998-1.734 1.225-2.842 1.225-3.824v-22.632c-7.731 4.744-16.807 8.763-27.142 12.293-28.744 9.749-67.007 15.47-109.223 15.5zm0-55.224c-55.559-.135-103.925-9.718-133.408-26.038a209.416 209.416 0 0 1-2.991-1.762v19.85c.035 1.047.229 2.088 1.244 3.822 1.013 1.668 2.894 3.893 5.803 6.219 5.805 4.707 15.551 9.805 28.109 14.025 25.146 8.602 61.315 14.195 101.243 14.164 52.274.162 98.43-9.844 121.192-22.795 7.556-4.187 12.231-8.633 13.931-11.643 1.016-1.705 1.242-2.746 1.242-3.793v-19.85c-7.715 4.708-16.807 8.766-27.076 12.295-28.744 9.745-67.006 15.466-109.289 15.506zm-121.207-78.226c-7.57 4.183-12.231 8.633-13.948 11.642-.948 1.567-1.178 2.651-1.244 3.562.066.952.296 2.028 1.244 3.631 1.013 1.696 2.894 3.888 5.803 6.246 5.805 4.68 15.551 9.778 28.109 14.03 25.146 8.596 61.315 14.188 101.243 14.16 52.356.129 98.465-9.908 121.192-22.796 7.571-4.216 12.231-8.663 13.948-11.641.932-1.603 1.191-2.679 1.225-3.631-.033-.911-.293-1.995-1.225-3.562-.999-1.733-2.895-3.927-5.805-6.278-4.676-3.763-11.971-7.789-21.158-11.416 24.524-26.42 39.568-61.74 39.568-100.625 0-81.588-66.173-147.742-147.746-147.742-81.609 0-147.746 66.154-147.746 147.742 0 38.885 15.043 74.205 39.568 100.625-4.904 1.897-9.32 3.926-13.028 6.053zm121.207 41.102c-.344 0-.67-.028-.999-.028.329-.001.656.028.999.028.328 0 .654-.028.982-.028-.327-.001-.654.028-.982.028zm-126.914-147.78c0-69.98 56.933-126.943 126.915-126.943 69.967 0 126.9 56.963 126.9 126.943 0 69.986-56.934 126.919-126.9 126.919-69.983 0-126.915-56.932-126.915-126.919z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-yen-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-yen-alt.svg
deleted file mode 100644
index d477b86158..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-yen-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M302.174 134.097c-67.297 0-121.879 54.581-121.879 121.883 0 67.302 54.582 121.843 121.879 121.843 67.303 0 121.846-54.541 121.846-121.843 0-67.303-54.543-121.883-121.846-121.883zm49.019 120.572v20.405H320.52l-3.203 6.218v9.875h33.877v20.374h-33.877v29.594h-32.64v-29.594h-33.648v-20.374h33.648v-9.875l-2.974-6.218h-30.675v-20.405h20.374l-32.834-66.711h34.764l28.318 66.711 27.666-66.711h34.762l-33.256 66.711h20.371zM302.174 82.137c-44.703 0-85.449 16.873-116.221 44.572-26.426.623-51.148 3.269-72.565 7.456-24.561 4.775-44.866 11.709-58.077 19.145-8.83 4.89-14.228 10.076-16.158 13.44-1.043 1.817-1.304 2.909-1.34 3.909.036.981.297 2.095 1.34 3.892 1.145 1.932 3.309 4.446 6.706 7.161 6.704 5.46 18.118 11.411 32.863 16.419 15.372 5.233 34.37 9.531 55.63 12.456-2.652 9.745-4.418 19.838-5.332 30.183-7.391-1.03-14.619-2.185-21.553-3.53-26.781-5.294-49.641-12.735-67.137-22.517-.881-.47-1.697-.998-2.518-1.484v27.209c0 1.03.197 2.171 1.34 4.12 1.145 1.911 3.309 4.446 6.706 7.144 6.704 5.479 18.118 11.428 32.863 16.398 14.324 4.906 31.788 8.962 51.312 11.872a169.815 169.815 0 0 0 7.555 31.917c-10.465-1.245-20.539-2.782-30.121-4.661-26.781-5.281-49.641-12.738-67.137-22.513a97.17 97.17 0 0 1-3.564-2.093v23.561c.032 1.225.297 2.565 1.506 4.661 1.242 2.023 3.5 4.643 6.934 7.42 6.867 5.593 18.375 11.546 33.195 16.584 20.502 6.995 47.28 12.294 77.437 14.892 6.995 10.943 15.2 21.015 24.394 30.071-26.098-.851-50.656-3.533-72.533-7.816-26.75-5.266-49.512-12.689-66.875-22.402a137.206 137.206 0 0 1-3.01-1.78v26.226c0 1.03.197 2.191 1.34 4.135 1.145 1.902 3.309 4.454 6.706 7.146 6.704 5.481 18.118 11.396 32.863 16.404 29.497 10.085 71.946 16.676 118.871 16.645 13.343 0 26.228-.56 38.622-1.538 20.34 8.34 42.609 12.95 65.959 12.95 95.98 0 173.842-77.801 173.842-173.81-.001-96.017-77.863-173.844-173.843-173.844zm0 322.73c-82.115 0-148.922-66.772-148.922-148.888s66.807-148.91 148.922-148.91c82.082 0 148.891 66.794 148.891 148.91-.001 82.116-66.809 148.888-148.891 148.888z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-yen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-yen.svg
deleted file mode 100644
index 63aa1da6b2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins-yen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.393 292.155c54.906 0 99.381-44.471 99.381-99.347 0-54.888-44.475-99.363-99.381-99.363-54.877 0-99.381 44.476-99.381 99.363 0 54.877 44.504 99.347 99.381 99.347zm-23.775-159.807l24.034 56.701 23.514-56.701h29.529l-28.223 56.701h17.299v17.3H272.71l-2.743 5.298v8.388h28.805v17.315h-28.805v25.148h-27.703V237.35h-28.615v-17.315h28.615v-8.388l-2.548-5.298h-26.067v-17.3h17.336l-27.898-56.701h29.531zm23.775 245.324c-55.56-.131-103.895-9.678-133.393-25.996-1.011-.588-1.995-1.158-2.975-1.765v19.852c0 1.015.229 2.091 1.245 3.792 1.011 1.697 2.876 3.891 5.786 6.246 5.789 4.691 15.533 9.778 28.094 14.012 25.178 8.588 61.312 14.213 101.242 14.197 52.287.125 98.428-9.885 121.191-22.833 7.554-4.183 12.229-8.65 13.965-11.622 1.016-1.701 1.209-2.777 1.241-3.792v-19.852c-7.717 4.71-16.81 8.729-27.108 12.247-28.745 9.76-67.008 15.486-109.288 15.514zm0 55.266c-55.56-.132-103.895-9.678-133.393-25.997-1.011-.587-1.995-1.178-2.975-1.763v22.596c0 1 .229 2.092 1.245 3.791 1.011 1.702 2.876 3.894 5.786 6.233 5.789 4.719 15.533 9.773 28.094 14.04 25.178 8.589 61.312 14.215 101.242 14.18 52.287.128 98.428-9.874 121.191-22.845 7.554-4.166 12.229-8.627 13.965-11.608 1.016-1.729 1.209-2.814 1.241-3.791v-22.632c-7.752 4.708-16.874 8.733-27.175 12.266-28.708 9.774-66.973 15.499-109.221 15.53zM135.166 299.467c-7.553 4.201-12.197 8.65-13.896 11.631-.95 1.598-1.211 2.642-1.245 3.61.034.929.295 1.979 1.245 3.595 1.011 1.686 2.876 3.895 5.786 6.235 5.789 4.702 15.533 9.774 28.094 14.024 25.178 8.571 61.312 14.193 101.242 14.193 52.39.129 98.497-9.891 121.225-22.846 7.553-4.166 12.195-8.628 13.932-11.607.914-1.615 1.176-2.666 1.241-3.595-.065-.969-.327-2.013-1.241-3.61-.98-1.704-2.91-3.896-5.791-6.235-4.674-3.808-11.969-7.831-21.187-11.458 24.524-26.39 39.567-61.741 39.567-100.596 0-81.602-66.156-147.757-147.746-147.757-81.589 0-147.747 66.155-147.747 147.757 0 38.854 15.044 74.206 39.567 100.596-4.902 1.912-9.286 3.938-13.046 6.063zm121.227 41.092c-.326 0-.622-.032-.982-.032.36-.001.655.032.982.032.324 0 .686-.032.98-.032-.295-.001-.656.032-.98.032zm-126.916-147.75c0-69.979 56.934-126.93 126.916-126.93 69.98 0 126.913 56.95 126.913 126.93 0 69.986-56.933 126.915-126.913 126.915-69.983 0-126.916-56.929-126.916-126.915z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins.svg
deleted file mode 100644
index 6af11e0945..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coins.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.77 292.604c54.876 0 99.381-44.472 99.381-99.362 0-54.877-44.505-99.365-99.381-99.365-54.871 0-99.346 44.488-99.346 99.365 0 54.889 44.474 99.362 99.346 99.362zm-37.18-135.27c4.514.116 8.828-.211 13.014-.999 4.219-.786 7.979-2.19 11.314-4.203 3.336-1.99 6.18-4.643 8.472-7.911 2.322-3.286 3.857-7.357 4.579-12.216h20.601v127.602h-25.9v-82.766h-32.08v-19.507zm-84.011 142.578c-7.587 4.203-12.23 8.65-13.964 11.629-.95 1.6-1.178 2.646-1.211 3.596.033.945.261 1.991 1.211 3.612 1.014 1.685 2.91 3.894 5.819 6.231 5.789 4.707 15.535 9.776 28.125 14.026 25.115 8.565 61.282 14.189 101.21 14.175 52.355.146 98.5-9.891 121.192-22.808 7.588-4.184 12.264-8.667 13.968-11.625.946-1.621 1.205-2.667 1.24-3.612-.035-.95-.294-1.996-1.24-3.596-1.018-1.7-2.914-3.907-5.824-6.232-4.675-3.808-11.936-7.831-21.156-11.481 24.525-26.372 39.569-61.718 39.569-100.586 0-81.61-66.156-147.767-147.749-147.767-81.59 0-147.745 66.156-147.745 147.767 0 38.868 15.042 74.214 39.571 100.586-4.907 1.934-9.321 3.962-13.016 6.085zm121.191 41.092c-.325 0-.651-.032-.981-.032.329 0 .655.032.981.032.329 0 .656-.032.981-.032-.325 0-.652.032-.981.032zM128.854 193.241c0-69.964 56.935-126.916 126.916-126.916 69.982 0 126.916 56.952 126.916 126.916 0 69.978-56.934 126.929-126.916 126.929s-126.916-56.951-126.916-126.929zM255.77 378.119c-55.561-.133-103.925-9.681-133.391-25.998-1.014-.587-1.994-1.179-2.975-1.764v19.847c0 1.013.23 2.079 1.211 3.795 1.014 1.701 2.91 3.893 5.819 6.244 5.789 4.709 15.535 9.78 28.125 14.029 25.115 8.567 61.282 14.19 101.21 14.176 52.292.148 98.434-9.892 121.192-22.81 7.588-4.197 12.264-8.665 13.933-11.64 1.014-1.73 1.275-2.782 1.275-3.795v-19.847c-7.752 4.704-16.84 8.729-27.109 12.263-28.744 9.744-67.005 15.468-109.29 15.5zm0 55.268c-55.561-.134-103.925-9.682-133.391-26a127.499 127.499 0 0 1-2.975-1.764v22.598c0 .993.23 2.092 1.211 3.791 1.014 1.7 2.91 3.892 5.819 6.248 5.789 4.705 15.535 9.745 28.125 13.994 25.115 8.6 61.282 14.223 101.21 14.191 52.292.133 98.434-9.877 121.192-22.825 7.588-4.188 12.264-8.634 13.968-11.608.979-1.731 1.24-2.814 1.24-3.791v-22.634c-7.785 4.71-16.84 8.735-27.142 12.268-28.776 9.774-67.006 15.499-109.257 15.532z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-color-bucket.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-color-bucket.svg
deleted file mode 100644
index 08fcb021d9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-color-bucket.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M263.608 443.932l97.171-97.179h.006l.008-.01 40.993-40.992c-12.618 39.775-30.882 99.987-30.882 115.401 0 23.549 19.085 42.636 42.634 42.636 23.553 0 42.638-19.087 42.638-42.636 0-19.162-28.23-107.58-38.746-139.858.097-1.079.164-2.147.155-3.188-.062-8.075-2.366-16.081-5.998-24.826-11.003-25.951-35.305-58.996-67.98-91.781-21.784-21.779-43.88-39.849-63.736-52.719-9.939-6.442-19.321-11.587-28.039-15.255-3.646-1.51-7.161-2.777-10.608-3.763-5.957-5.534-11.766-10.71-17.44-15.348-9.193-7.5-18.103-13.755-27.222-18.315-9.096-4.533-18.565-7.404-28.409-7.41-14.507-.103-28.52 6.647-40.352 18.664-11.294 11.103-17.338 24.931-17.22 38.914.033 12.827 4.488 25.109 11.233 37.139 4.189 7.422 9.314 14.825 15.159 22.32l-75.786 75.783c-5.417 5.398-7.216 12.666-7.167 19.019.054 8.066 2.363 16.071 5.988 24.823 10.999 25.953 35.305 58.994 67.971 91.768 21.797 21.787 43.891 39.854 63.745 52.731 9.945 6.443 19.32 11.586 28.037 15.254 8.752 3.625 16.757 5.935 24.822 5.987.089.003.181.003.274.003 6.302 0 13.42-1.83 18.745-7.157M143.643 131.121c-5.51-9.749-8.05-18.114-8.022-24.856.129-7.312 2.366-13.508 9.885-21.207 8.933-8.764 15.613-11.239 22.646-11.329 4.88-.009 10.525 1.431 17.24 4.777 6.91 3.36 14.62 8.785 23.087 15.769-.137.127-.28.234-.411.368-.021.018-.049.034-.07.055l-53.165 53.165c-4.45-5.877-8.244-11.486-11.19-16.742zm198.184 195.97c-.263.065-.804.157-1.655.151-2.729.059-8.286-1.119-15.129-4.032-20.825-8.646-52.862-31.589-83.767-62.607-20.669-20.663-37.754-41.638-49.412-59.646-5.829-8.983-10.294-17.233-13.174-24.109-2.921-6.846-4.095-12.405-4.041-15.134 0-.819.086-1.356.146-1.623l28.408-28.407a113.163 113.163 0 0 0 2.018 5.228c11 25.951 35.301 58.986 67.981 91.771 21.795 21.784 43.883 39.855 63.745 52.733 9.942 6.435 19.32 11.589 28.033 15.254a118.34 118.34 0 0 0 5.238 2.021l-28.391 28.4zm-18.42-86.363c-10.121-8.331-20.571-17.768-30.905-28.136-20.678-20.666-37.754-41.644-49.415-59.647-5.829-8.992-10.297-17.24-13.179-24.11-2.913-6.846-4.093-12.4-4.033-15.124a8.629 8.629 0 0 1 .055-1.078 8.763 8.763 0 0 1 1.077-.059c2.735-.055 8.286 1.116 15.136 4.039 20.826 8.64 52.867 31.587 83.762 62.588 20.679 20.673 37.764 41.651 49.416 59.663.409.627.793 1.242 1.191 1.864h-53.105z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-colorpicker.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-colorpicker.svg
deleted file mode 100644
index 69d0362805..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-colorpicker.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M460.5 78.244l-26.472-26.473c-16.867-16.868-44.216-16.865-61.083.003l-61.466 61.468-29.702-29.699-58.764 58.763 24.501 24.499L79.748 334.573C68.761 345.557 62.6 359.972 61.767 374.81l-9.766 9.764c-20.867 20.881-20.863 54.838.002 75.704 10.106 10.108 23.548 15.679 37.85 15.679 14.297 0 27.733-5.568 37.847-15.67l9.758-9.765c15.211-.821 29.394-7.139 40.248-17.99l167.771-167.767 24.493 24.495 58.765-58.764-29.698-29.699 61.465-61.466c16.87-16.869 16.87-44.218-.002-61.087zM150.574 405.398a23.298 23.298 0 0 1-16.532 6.846c-3.501 0-7.007-.782-10.231-2.343v.007l-23.242 23.236a15.092 15.092 0 0 1-10.716 4.439 15.1 15.1 0 0 1-10.715-4.439c-5.919-5.922-5.919-15.516-.002-21.436l23.233-23.238.008-.004c-4.226-8.725-2.741-19.518 4.503-26.761l167.769-167.768 43.695 43.693-167.77 167.768z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-columns.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-columns.svg
deleted file mode 100644
index 913a681162..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-columns.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M335.058 98.618h78.586v314.764h-78.586zm-118.35 0h78.586v314.764h-78.586zm-118.352 0h78.59v314.764h-78.59z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-comb.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-comb.svg
deleted file mode 100644
index d15c099fbe..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-comb.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M115.348 379.3l12.361-12.329 46.73 46.698 23.742-23.743-46.73-46.733 12.327-12.324 46.731 46.732 23.743-23.776-46.7-46.73 12.328-12.328 46.733 46.728 23.774-23.77-46.732-46.734 12.329-12.314 46.729 46.716 23.743-23.76-46.732-46.709 12.362-12.316 46.731 46.7 23.74-23.759-46.73-46.726 12.329-12.33 46.73 46.696 23.739-23.743-46.73-46.715 12.363-12.325 46.73 46.717 23.742-23.76-46.701-46.718 12.33-12.326 46.732 46.728 20.665-20.698-67.002-67.005c-9.452-9.422-24.757-9.422-34.175 0L119.664 300.243l-45.947 45.928c-9.448 9.448-9.448 24.722 0 34.175l67.042 67.006 21.32-21.34-46.731-46.712z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-combination-lock-open.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-combination-lock-open.svg
deleted file mode 100644
index 3cdba5cf20..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-combination-lock-open.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M321.582 195.249c-19.521 0-38.129 4.008-55.038 11.247V149.63c0-30.774-11.673-58.979-30.968-79.579-19.213-20.62-46.567-33.863-76.751-33.832-30.183-.031-57.569 13.212-76.784 33.832-19.26 20.6-30.967 48.805-30.967 79.579v126.032h51.146v-28.09l-26.291-26.31h26.291V149.63c0-17.771 6.734-33.47 17.167-44.651 10.528-11.169 24.231-17.597 39.438-17.612 15.175.015 28.874 6.442 39.409 17.612 10.461 11.181 17.166 26.88 17.166 44.651v94.378c-21.158 24.525-33.945 56.458-33.945 91.4 0 77.387 62.738 140.125 140.127 140.125 77.406 0 140.143-62.738 140.143-140.125 0-77.405-62.737-140.159-140.143-140.159zm-68.217 152.622H221.68v-24.938h31.686v24.938zm55.742-112.382h24.936v31.702h-24.936v-31.702zm24.936 199.825h-24.936v-31.707h24.936v31.707zm-12.461-49.968c-27.565-.017-49.92-22.371-49.936-49.955.016-27.581 22.37-49.916 49.936-49.916 27.603 0 49.936 22.335 49.936 49.916 0 27.584-22.333 49.938-49.936 49.955zm68.216-37.475v-24.938h31.704v24.938h-31.704zm-68.216-41.779c-16.168.034-29.27 13.129-29.299 29.299.029 16.188 13.131 29.283 29.299 29.321 16.188-.038 29.268-13.134 29.303-29.321-.035-16.17-13.115-29.265-29.303-29.299z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-combination-lock.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-combination-lock.svg
deleted file mode 100644
index 10332f449f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-combination-lock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.79 306.092c-16.19.034-29.288 13.129-29.337 29.316.049 16.17 13.146 29.266 29.337 29.304 16.151-.038 29.247-13.134 29.298-29.304-.051-16.187-13.147-29.282-29.298-29.316zm107.717-60.303V149.63c0-30.757-11.677-58.963-30.97-79.579-19.211-20.62-46.582-33.863-76.747-33.832-30.188-.031-57.575 13.212-76.787 33.832-19.294 20.616-30.968 48.822-30.968 79.579v96.159c-20.227 24.296-32.39 55.529-32.39 89.619 0 77.387 62.721 140.125 140.145 140.125 77.368 0 140.106-62.738 140.106-140.125 0-34.09-12.164-65.323-32.389-89.619zM187.555 347.871h-31.688v-24.938h31.688v24.938zm80.674 87.443h-24.933v-31.707h24.933v31.707zm-12.439-49.968c-27.604-.017-49.938-22.371-49.938-49.938 0-27.599 22.334-49.934 49.938-49.934 27.564 0 49.9 22.335 49.9 49.934 0 27.567-22.336 49.921-49.9 49.938zm-12.494-118.155v-31.702h24.933v31.702h-24.933zm69.066-59.986a139.553 139.553 0 0 0-56.572-11.957 139.467 139.467 0 0 0-56.595 11.957V149.63c0-17.738 6.704-33.47 17.153-44.635 10.528-11.186 24.233-17.613 39.441-17.628 15.17.015 28.874 6.442 39.401 17.628 10.448 11.165 17.171 26.897 17.171 44.635v57.575zm43.315 140.666h-31.706v-24.938h31.706v24.938z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-command.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-command.svg
deleted file mode 100644
index 7a4b9094f9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-command.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M470.611 129.513c-.115-11.964-2.458-23.38-7.008-34.089-4.629-10.899-10.932-20.563-18.865-28.88-7.969-8.355-17.434-14.96-28.26-19.741-10.871-4.81-22.553-7.225-34.85-7.238-.042 0-.082-.002-.119 0h-.017c-12.331-.008-24.071 2.415-35.067 7.211-10.941 4.774-20.531 11.357-28.618 19.705-8.06 8.307-14.497 17.955-19.254 28.854-4.822 11.009-7.229 22.775-7.229 35.106l-.011 37.219-74.083-.018.012-38.406-.012-.025c-.144-11.893-2.552-23.249-7.203-33.899-4.751-10.898-11.176-20.557-19.237-28.871-8.088-8.345-17.661-14.931-28.597-19.717-10.959-4.789-22.65-7.201-34.915-7.225a4.329 4.329 0 0 0-.22-.006v-.004c-12.336 0-24.083 2.412-35.086 7.213-10.942 4.772-20.526 11.363-28.617 19.711C55.296 74.712 48.866 84.367 44.1 95.27c-4.79 10.954-7.203 22.659-7.227 34.936a2.652 2.652 0 0 0 0 .13v.038h.004c0 .006 0 .016-.004.027-.005 12.327 2.404 24.029 7.222 34.92 4.759 10.803 11.213 20.243 19.31 28.213 8.083 7.968 17.656 14.298 28.567 18.936 11 4.694 22.735 7.029 35.061 7.029l39.004.014-.02 74.442-38.822-.012c-.137-.004-.263 0-.368 0-12.254.012-23.931 2.356-34.879 7.015-10.917 4.637-20.489 10.955-28.58 18.924-8.103 7.96-14.56 17.41-19.328 28.205-4.81 10.862-7.219 22.533-7.234 34.822v.154c-.008 12.327 2.395 24.076 7.21 35.083 4.751 10.901 11.201 20.469 19.292 28.554 8.079 8.095 17.644 14.539 28.548 19.311 11.006 4.813 22.767 7.228 35.103 7.228h3.1l.028-.056c11.201-.365 21.905-2.754 31.982-7.154 10.911-4.765 20.472-11.202 28.563-19.293 8.091-8.085 14.545-17.646 19.31-28.55 4.813-11.011 7.228-22.765 7.228-35.11l.012-37.578 74.084.026-.014 37.578v.038c-.008 12.322 2.402 24.066 7.213 35.07 4.754 10.903 11.202 20.479 19.287 28.561 8.085 8.094 17.644 14.544 28.557 19.309 10.97 4.795 22.69 7.207 34.987 7.225h.064l.052.002 8.103.004-.17-.342c9.44-.812 18.476-3.105 27.016-6.873 10.794-4.771 20.249-11.217 28.216-19.312 7.975-8.094 14.292-17.659 18.939-28.572 4.688-10.997 7.03-22.734 7.03-35.059v-.823l-.004-.008c-.103-11.798-2.444-23.086-7.019-33.718-4.641-10.806-11.033-20.32-19.12-28.405-8.088-8.092-17.594-14.484-28.395-19.14-10.88-4.691-22.451-7.042-34.549-7.042l-38.293-.014.019-74.442 43.305.018v-.138c10.285-.554 20.168-2.845 29.543-6.887 10.802-4.641 20.316-11.031 28.408-19.12 8.084-8.085 14.483-17.59 19.137-28.395 4.685-10.88 7.037-22.45 7.037-34.548v-.963l-.004-.015zm-304.61 253.549c-.006 5.332-1.008 10.295-3.013 15.055-2.036 4.793-4.814 8.936-8.417 12.539a39.494 39.494 0 0 1-12.405 8.425c-4.585 1.979-9.596 2.977-15.187 2.986-5.334-.01-10.299-1.007-15.045-3.012-4.783-2.022-8.751-4.765-12.083-8.306-3.402-3.619-6.105-7.802-8.153-12.653-1.932-4.563-2.917-9.312-3-14.394v-.665c0-5.061.981-9.823 2.988-14.471 2.025-4.679 4.746-8.637 8.194-11.985 3.501-3.384 7.556-6.079 12.289-8.127 4.411-1.905 9.089-2.901 14.172-2.981l39.672.011-.012 37.578zm.054-215.438l-39.008-.008c-5.332-.006-10.225-.997-14.83-2.991-4.734-2.048-8.783-4.742-12.274-8.13-3.476-3.371-6.191-7.282-8.208-11.849-1.989-4.498-2.968-9.191-2.968-14.25v-.012c.004-5.596 1.011-10.603 2.992-15.189 2.041-4.738 4.758-8.881 8.176-12.516 3.333-3.529 7.31-6.271 12.083-8.299 4.746-2.004 9.702-2.999 15.033-2.999h.02c5.593.013 10.604 1.017 15.188 2.999a39.371 39.371 0 0 1 12.398 8.429 39.595 39.595 0 0 1 8.431 12.405c1.97 4.583 2.983 9.594 2.983 15.195l-.016 37.215zm125.222 126.365l-74.084-.021.018-74.444 74.088.025-.022 74.44zm90.171 51.559c5.062 0 9.752.988 14.264 2.972 4.589 2.041 8.521 4.721 11.898 8.091 3.345 3.358 6.021 7.335 8.065 12.05 1.994 4.642 2.981 9.41 2.981 14.479h.004c-.006 5.335-1.007 10.219-2.997 14.828-2.049 4.74-4.766 8.881-8.18 12.512-3.387 3.596-7.312 6.424-11.885 8.549-4.492 2.084-9.142 3.102-14.17 3.108-5.338-.007-10.295-1.001-15.053-3.011-4.784-2.019-8.75-4.766-12.07-8.305-3.408-3.615-6.118-7.799-8.159-12.656-2.006-4.74-2.998-9.669-3.005-14.973l.013-37.657 38.294.013zm34.302-200.816c-2.037 4.604-4.715 8.538-8.084 11.9-3.383 3.376-7.312 6.051-11.912 8.081-4.5 1.984-9.182 2.964-14.236 2.97h-.02l-38.295-.014.012-37.218c0-5.593 1.008-10.605 2.992-15.181 2.045-4.746 4.76-8.882 8.179-12.518 3.327-3.529 7.302-6.275 12.084-8.3 4.55-1.925 9.296-2.918 14.386-3.001h.666c5.025.006 9.679 1.039 14.171 3.114 4.567 2.134 8.492 4.968 11.88 8.557 3.412 3.645 6.121 7.777 8.171 12.522 1.988 4.609 2.979 9.504 2.987 14.831-.008 5.061-.994 9.767-2.981 14.257z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-company.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-company.svg
deleted file mode 100644
index b22bdb63ad..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-company.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M157.333 454.494h162.278V56.031H157.333v398.463zm138.314-55.937h-43.354v-43.353h43.354v43.353zm-80.682-64.919v-43.353h43.353v43.353h-43.353zm80.682-64.925h-43.354v-43.347h43.354v43.347zm-80.682-64.918v-43.352h43.353v43.352h-43.353zm37.329-108.272h43.354v43.35h-43.354v-43.35zm-74.659 0h43.351v43.35h-43.351v-43.35zm0 129.843h43.351v43.347h-43.351v-43.347zm0 129.838h43.351v43.353h-43.351v-43.353zm-140.419 99.29h97.289V182.011H37.216v272.483zm26.972-251.092h43.348v43.353H64.188v-43.353zm0 77.073h43.348v43.351H64.188v-43.351zm0 74.056h43.348v43.354H64.188v-43.354zM454.4 220.403v-51.786h-23.607v-50.529h-16.941V71.089h-14.238v46.999h-16.94v50.529H359.07v51.786h-19.218v234.091H473.62V220.403H454.4zm-49.058 204.322H361.99v-43.349h43.352v43.349zm0-132.922H361.99v-43.352h43.352v43.352zm50.888 65.914h-43.35v-43.352h43.351v43.352z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-compress.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-compress.svg
deleted file mode 100644
index 48664d5a36..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-compress.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M388.721 417.445c-8.585 0-16.17 4.188-20.895 10.592h-52.207v-55.393c.178-.192.389-.358.568-.521 10.545-9.814 17.758-24.368 17.743-40.544v-48.922h-18.312v-26.492h39.01v-30.643h-108.7v30.643h39.029v26.492H268.02v39.375H163.603V108.26h104.418v23.917h-22.093v30.663h108.701v-30.663h-20.698V100.25a57.949 57.949 0 0 0-57.899-57.888h-120.44a57.947 57.947 0 0 0-57.885 57.888v229.808a57.952 57.952 0 0 0 57.885 57.891h120.44a61.829 61.829 0 0 0 8.926-.754v40.843H232.75c-4.725-6.403-12.314-10.592-20.879-10.592-14.325 0-25.933 11.607-25.933 25.936 0 14.324 11.608 25.896 25.933 25.896 8.565 0 16.154-4.156 20.863-10.593h135.107c4.709 6.437 12.294 10.593 20.879 10.593 14.291 0 25.9-11.572 25.9-25.896.001-14.329-11.608-25.937-25.899-25.937z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-connection.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-connection.svg
deleted file mode 100644
index 0619278e2a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-connection.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M44.96 375.143l173.402-201.609 93.2 72.769 154.09-108.785-154.09 200.497-93.2-73.517z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-console.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-console.svg
deleted file mode 100644
index 8599aeb13a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-console.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M123.165 121.806l-36.463 36.427 97.565 97.579-97.565 97.551 36.463 36.442 134.009-133.993-134.009-134.006zm120.553 1.176v51.552h182.313v-51.552H243.718zm0 264.289h182.313V335.72H243.718v51.551zM306 280.911h120.031v-51.552H306v51.552z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-contrast.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-contrast.svg
deleted file mode 100644
index 8dbd2d9e74..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-contrast.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.775 46.613c-115.387.014-208.906 93.533-208.918 208.92.012 115.394 93.531 208.91 208.918 208.921 115.387-.011 208.902-93.527 208.918-208.921-.015-115.387-93.531-208.906-208.918-208.92zm124.713 333.635c-31.972 31.938-75.957 51.645-124.709 51.65V79.17c48.752.002 92.737 19.713 124.709 51.655 31.942 31.965 51.646 75.951 51.661 124.708-.015 48.753-19.718 92.746-51.661 124.715z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-conversation-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-conversation-alt.svg
deleted file mode 100644
index 111b651f89..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-conversation-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M175.903 192.325c-74.167-1.456-135.204 44.246-136.348 102.081-.392 20.108 6.506 39.042 18.769 55.234 21.125 27.121-1.929 73.803-1.929 73.803l68.084-29.331c14.651 4.642 30.61 7.355 47.306 7.683 74.167 1.476 135.235-44.262 136.348-102.125 1.144-57.801-58.046-105.891-132.23-107.345zM454.67 247.82c12.279-16.201 19.197-35.123 18.788-55.234-1.13-57.831-62.216-103.566-136.383-102.062-62.149 1.212-113.803 35.205-128.207 80.203 29.023 5.476 55.659 17.367 77.126 34.793 30.97 25.15 47.68 58.683 47.074 94.406 2.699.057 5.412.089 8.127 0 16.727-.256 32.651-2.971 47.335-7.65l68.067 29.338c.001-.001-23.054-46.669-1.927-73.794z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-conversation.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-conversation.svg
deleted file mode 100644
index d16115fdb0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-conversation.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M163.495 287.156c-118.242-14.047-68.454-85.798-2.329-154.135-230.392 155.777-90.703 223.496 3.175 238.084l.592 58.709 117.78-100.689-119.785-98.042.567 56.073zm181.776-147.633l-.592-58.712L226.9 181.503l119.784 98.046-.564-56.078c118.242 14.051 68.451 85.798 2.328 154.141 230.388-155.78 90.702-223.499-3.177-238.089z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coverflow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coverflow.svg
deleted file mode 100644
index 72a230d15d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-coverflow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M89.486 379.302V131.713h30.778v247.589H89.486zm-54.822 36.243V95.473h30.778v320.072H34.664zm356.523-36.243V131.711h30.774v247.591h-30.774zm54.817 36.243V95.473h30.78v320.072h-30.78zM144.579 144.83h221.357v221.358H144.579z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-credit-card-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-credit-card-alt.svg
deleted file mode 100644
index c113197cf5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-credit-card-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M454.811 123.752H55.944c-11.259 0-20.381 8.518-20.381 19.02v224.975c0 10.5 9.122 19.006 20.381 19.006H454.81c11.258 0 20.382-8.506 20.382-19.006V142.771c0-10.501-9.124-19.019-20.381-19.019zm-9.821 232.797H65.763v-97.784H444.99v97.784zm0-178.278H65.763v-24.316H444.99v24.316zM161.433 290.063H98.547v16.782h62.886v-16.782zm94.002 0h-81.98v16.782h81.98v-16.782zm12.009 25.712H98.547v16.781h168.897v-16.781z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-credit-card.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-credit-card.svg
deleted file mode 100644
index af896af5f9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-credit-card.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M450.803 116.918H58.286c-11.082 0-20.063 8.98-20.063 20.061v237.386c0 11.071 8.981 20.054 20.063 20.054h392.517c11.081 0 20.062-8.982 20.062-20.054V136.979c-.001-11.08-8.981-20.061-20.062-20.061zM266.422 336.936H100.193v-17.094h166.229v17.094zM100.19 309.809v-17.101h61.91v17.101h-61.91zm73.732.003v-17.101h80.681v17.101h-80.681zm276.228-51.891H59.783v-82.017H450.15v82.017z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crop.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crop.svg
deleted file mode 100644
index 570c261e8a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crop.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M426.671 134.494h-41.972v-41.99h-51.145v41.99H153.042l-49.74-49.775-17.644 17.63 49.542 49.54v180.939H93.229v51.116h41.972v41.954h51.164v-41.954H384.7V185.61h41.972v-51.116zm-240.307 68.543l129.761 129.791H186.364V203.037zm147.191 111.936L204.185 185.61h129.37v129.363z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crosshair.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crosshair.svg
deleted file mode 100644
index 802be32987..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crosshair.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M446.055 240.544c-7.388-92.958-81.505-167.077-174.478-174.466V38.215H240.92v27.863C147.98 73.482 73.878 147.586 66.453 240.56h-27.86v30.64h27.86c7.425 92.952 81.526 167.071 174.467 174.481v27.857h30.657v-27.857c92.973-7.41 167.09-81.529 174.478-174.481h27.861v-30.656h-27.861zM382.551 271.2c-6.965 57.943-53.044 103.989-110.974 110.97v-36.428H240.92v36.428c-57.916-6.98-103.959-53.026-110.957-110.97h36.428v-30.64h-36.428c6.998-57.934 53.041-103.996 110.957-110.978v36.431h30.657v-36.431c57.93 6.982 103.976 53.028 110.974 110.961h-36.43V271.2h36.43zm-126.293-48.026c-18.053 0-32.701 14.634-32.701 32.705 0 18.051 14.648 32.704 32.701 32.704 18.081 0 32.7-14.652 32.7-32.704 0-18.071-14.619-32.705-32.7-32.705z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crown-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crown-alt.svg
deleted file mode 100644
index 20bbacb2eb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crown-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M91.475 374.594h329.05v37.281H91.475zm311.64-144.555c-51.386 0-116.679-27.02-147.118-129.914-32.316 102.711-97.309 129.744-148.18 129.744-24.557 0-45.825-6.299-58.534-13.43L88.79 339.404h332.189l41.738-122.965c-12.797 7.178-34.541 13.6-59.602 13.6zm-147.114 61.82c-16.771 0-30.367-13.596-30.367-30.367 0-16.77 13.595-30.365 30.367-30.365 16.771 0 30.367 13.596 30.367 30.365 0 16.772-13.597 30.367-30.367 30.367z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crown.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crown.svg
deleted file mode 100644
index 8ad5f1464a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-crown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M420.978 345.57l41.739-122.963c-12.798 7.178-34.541 13.598-59.603 13.598-51.385 0-116.679-27.018-147.117-129.91-32.317 102.707-97.312 129.742-148.184 129.742-24.555 0-45.824-6.299-58.531-13.43L88.79 345.57c30.149-36.213 98.121-54.316 166.095-54.316s135.948 18.107 166.093 54.316zm-22.369 18.623c-5.313-6.383-12.768-12.25-21.913-17.482-25.203 18.244-71.348 29.891-121.816 29.891-50.469 0-96.596-11.65-121.799-29.896-9.149 5.236-16.607 11.105-21.922 17.488l-1.147 1.377c31.771 26.748 88.296 40.135 144.869 40.135 56.562 0 113.104-13.393 144.873-40.137l-1.145-1.376z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cupcake.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cupcake.svg
deleted file mode 100644
index de3a7c7c81..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cupcake.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M162.516 260.2c-13.168 11.313-30.136 17.754-47.857 17.754-2.214 0-4.401-.115-6.565-.308l49.285 153.853h46.846L180.2 271.432a73.64 73.64 0 0 1-17.684-11.232zm191.431 0a73.538 73.538 0 0 1-17.687 11.232l-24.02 160.066h46.842l49.287-153.852a74.157 74.157 0 0 1-6.563.307c-17.722.001-34.69-6.44-47.859-17.753zm-95.715.002c-13.168 11.311-30.136 17.751-47.858 17.751-.154 0-.308-.009-.463-.009l23.046 153.554h50.549l23.046-153.554c-.154 0-.308.009-.462.009-17.723.001-34.692-6.44-47.858-17.751zM403.906 145.96c-.502 0-.997.022-1.496.034-27.494-17.892-66.256-31.892-111.045-36.644-2.267-16.292-16.213-28.848-33.131-28.848S227.366 93.058 225.1 109.35c-44.993 4.774-83.91 18.877-111.427 36.888a56.174 56.174 0 0 0-5.579-.278c-29.591 0-53.574 23.066-53.574 51.516 0 28.452 26.084 51.372 55.675 51.372l.213-.212c1.399.133 2.816.212 4.251.212 14.276 0 27.738-6.92 36.011-18.513l11.845-16.6 11.848 16.599c8.274 11.593 21.737 18.513 36.013 18.513 14.279 0 27.741-6.92 36.012-18.511l11.847-16.606 11.847 16.606c8.27 11.591 21.731 18.511 36.011 18.511 14.276 0 27.739-6.92 36.011-18.513l11.847-16.602 11.847 16.601c8.273 11.593 21.735 18.513 36.012 18.513 29.591 0 55.675-22.92 55.675-51.372-.005-28.448-23.988-51.514-53.579-51.514z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-curve.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-curve.svg
deleted file mode 100644
index ac749474d3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-curve.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M476.334 327.906c4.729-13.933 1.583-29.946-9.523-41.051-11.105-11.107-27.117-14.252-41.05-9.524l-60.618-60.617 18.271-18.271-69.113-69.111-18.273 18.271-57.298-57.296c7.186-14.856 4.652-33.233-7.676-45.562-15.583-15.58-40.84-15.583-56.42 0-15.582 15.58-15.582 40.841 0 56.42 11.086 11.087 27.063 14.243 40.979 9.549l55.022 55.021c-22.589-9.864-46.785-14.881-70.992-14.875-37.879-.013-75.873 11.897-107.688 35.803-15.23-8.686-34.94-6.575-47.942 6.425-15.578 15.58-15.578 40.841 0 56.421 15.58 15.581 40.841 15.581 56.422 0 11.2-11.201 14.304-27.393 9.399-41.406 26.596-19.606 58.148-29.319 89.809-29.334a149.773 149.773 0 0 1 54.791 10.429l-9.248 9.249 69.109 69.112 14.757-14.752a148.986 148.986 0 0 1 20.897 76.064c-.012 25.169-6.142 50.251-18.448 72.851-14.149-5.207-30.649-2.172-42.009 9.189-15.58 15.583-15.58 40.844 0 56.42 15.578 15.581 40.839 15.585 56.424 0 12.686-12.684 15.037-31.786 7.064-46.855 16.64-28.185 24.892-59.956 24.88-91.604.008-24.133-5.012-48.245-14.846-70.754l39.664 39.665c-7.142 14.848-4.601 33.184 7.71 45.494 15.578 15.576 40.84 15.58 56.422 0 4.317-4.316 7.391-9.387 9.316-14.776l.4-.401-.192-.194z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cut.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cut.svg
deleted file mode 100644
index 63d892780c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-cut.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M472.785 159.34l-4.563-9.12c-1.861-3.792-5.156-7.863-9.981-10.671-4.807-2.838-10.817-4.321-17.711-4.31-10.153.05-22.687 3.341-38.204 11.038l-133.889 63.166 57.259 32.088 147.089-82.191zM63.891 329.726l-.184.089c-8.903 4.719-15.864 9.744-20.75 16.609-4.913 6.867-6.78 15.089-6.719 23.229-.036 15.059 3.896 30.975 15.806 42.961 11.913 11.986 30.389 18.556 55.65 18.519l.825.001c25.365.002 44.087-9.187 55.192-23.832 11.225-14.671 15.03-32.854 16.747-50.711 1.109-12.717 1.812-22.076 4.063-28.498 2.301-6.344 5.209-10.687 13.945-16.396l26.585-14.879-45.371-25.424-115.789 58.332zm67.699 58.596c-23.329 12.497-52.377 3.716-64.871-19.613l84.477-45.258c12.504 23.325 3.724 52.375-19.606 64.871zm66.817-188.384c-8.692-5.691-11.589-10.027-13.885-16.354-2.245-6.423-2.954-15.78-4.063-28.476-1.717-17.881-5.522-36.065-16.747-50.736-11.228-14.804-30.241-24.03-56.017-23.829-25.262-.044-43.737 6.53-55.65 18.515-11.91 11.986-15.841 27.904-15.806 42.964-.062 8.137 1.806 16.361 6.719 23.225 4.886 6.866 11.847 11.891 20.75 16.609l.142.075 125.137 63.013 7.399 3.709c3.797 1.905 5.341 6.53 3.432 10.323-.263.522-.608.968-.965 1.397-.041.051-.066.107-.106.156-.011.012-.017.027-.028.037l119.661 67.057 83.948 38.963c15.516 7.695 28.049 10.986 38.202 11.035 6.894.011 12.904-1.468 17.711-4.314 4.825-2.809 8.12-6.875 9.981-10.666l4.558-9.121-234.265-131.149-40.108-22.433zm-46.712-10.391l-84.14-45.895c12.674-23.236 41.782-31.797 65.015-19.125 23.238 12.679 31.798 41.785 19.125 65.02z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dashboard.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dashboard.svg
deleted file mode 100644
index 13cd3bfa96..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dashboard.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.188 58.56c-108.788 0-196.976 88.191-196.976 196.976 0 108.789 88.188 196.977 196.976 196.977 108.786 0 196.974-88.188 196.974-196.977 0-108.785-88.187-196.976-196.974-196.976zm-9.424 37.413h25.039v49.152h-25.039V95.973zm-74.912 91.94l-34.753-34.762 17.701-17.702 34.761 34.753-17.709 17.711zm12.352-73.917l22.694-10.58 20.768 44.545-22.688 10.578-20.774-44.543zm75.442 285.108c-21.773 0-39.42-17.647-39.42-39.417 0-17.004 10.781-31.445 25.863-36.979v-112.43h25.037v111.697c16.168 4.916 27.937 19.934 27.937 37.712 0 21.769-17.648 39.417-39.417 39.417zm29.333-251.183l20.776-44.552 22.693 10.59-20.774 44.541-22.695-10.579zm55.039 39.992l-17.708-17.711 34.76-34.753 17.701 17.702-34.753 34.762z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-defrag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-defrag.svg
deleted file mode 100644
index e26de351e9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-defrag.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M191.562 190.834h58.301v130.333h-58.301zm0 142.607h58.301v58.302h-58.301zm-70.574-142.607h58.299v58.304h-58.299zm141.151-.135h58.301v201.044h-58.301zm70.576 142.742h58.301v58.302h-58.301zM191.562 120.258h58.301v58.302h-58.301zm141.153 0h58.301v58.302h-58.301zM120.986 49.68h58.301v58.303h-58.301zm211.729 215.006h58.301v58.303h-58.301zm-153.428-4.34h-58.299V462.32h270.028v-58.302H179.287z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-delete-key.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-delete-key.svg
deleted file mode 100644
index c738e7c8cf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-delete-key.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M338.495 89.965H70.735c-15.6 0-28.255 12.673-28.255 28.271v274.608c0 15.619 12.655 28.26 28.255 28.26h267.76L469.01 255.532 338.495 89.965zm-14.844 300.508H73.122v-269.85h250.529l106.345 134.909-106.345 134.941zM298.633 159.93l-74.43 74.463-74.428-74.463-21.159 21.156 74.431 74.446-74.431 74.446 21.159 21.125 74.428-74.395 74.43 74.395 21.157-21.125-74.428-74.446 74.428-74.446-21.157-21.156z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-delete.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-delete.svg
deleted file mode 100644
index 1d931cc09b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-delete.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M401.431 167.814l-58.757-58.76-88.029 88.026-88.028-88.026-58.76 58.76 88.026 88.027-88.026 88.024 58.76 58.768 88.028-88.031 88.029 88.031 58.757-58.768-88.027-88.024z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-departure.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-departure.svg
deleted file mode 100644
index 243f789b80..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-departure.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M50.238 428.833h199.477v-65.892H50.238v65.892zm396.506-304.288c-7.881-16.383-27.569-23.285-43.983-15.438l-114.294 55.038-125.735-65.17c-15.077-10.204-32.147-15.961-42.317-.852-10.204 15.07-3.109 26.485 11.97 36.725l82.441 64.782-43.755 21.055-56.021-24.098-26.029 60.533 69.784 30.048c8.765 3.763 18.74 3.534 27.341-.587L431.34 168.494l29.695-14.254-14.291-29.695z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-desk.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-desk.svg
deleted file mode 100644
index 270e0f1dff..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-desk.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M459.543 154.424H53.519v52.357h30.82v150.721h24.938V206.781h296.274v150.721h24.955V206.781h29.037z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-desktop.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-desktop.svg
deleted file mode 100644
index de5366b44b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-desktop.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M374.787 331.291H137.211l-23.68 37.098h284.938zM445.564 89.08H66.436c-9.34 0-16.91 7.572-16.91 16.912V422.92h412.947V105.992c0-9.34-7.569-16.912-16.909-16.912zm-12.197 304.732H78.629V169.059h354.738v224.753z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagnostics.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagnostics.svg
deleted file mode 100644
index 66e2b4c653..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagnostics.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M384.37 112.165c0-21.599-4.415-42.043-12.067-60.374l-3.223-7.667h-67.677v24.948h50.805a131.485 131.485 0 0 1 7.242 43.093c0 19.243-4.056 37.351-11.149 53.329-7.865.174-15.535 4.056-20.213 11.095-17.232 25.712-43.099 41.002-71.55 41.017-28.45-.015-54.333-15.305-71.552-41.017-4.709-7.062-12.392-10.938-20.274-11.095-7.08-15.978-11.152-34.085-11.152-53.329.016-15.231 2.617-29.745 7.243-43.093h44.425V44.124h-61.314l-3.172 7.667c-7.686 18.331-12.1 38.775-12.1 60.374 0 23.532 5.134 45.782 14.225 65.453-4.79 7.99-4.905 18.321.605 26.597 19.44 29.368 48.791 51.446 83.143 59.724 0 1.076-.033 2.153-.033 3.241-.048 11.481.916 24.432 6.23 37.823 5.281 13.405 13.9 26.045 26.799 40.949a24.896 24.896 0 0 0 18.836 8.607c1.833 0 3.646-.227 5.46-.639a628.853 628.853 0 0 0 9.208 9.424c15.974 15.903 23.364 33.787 23.281 47.486-.081 9.727-3.219 17.152-9.563 22.865-6.377 5.678-17.005 10.057-33.585 10.072-14.421.068-26.456-7.98-35.381-17.2a78.212 78.212 0 0 1-3.108-3.391c7.88-9.489 12.623-21.69 12.623-34.966 0-30.262-24.624-54.877-54.89-54.877-30.265 0-54.857 24.615-54.857 54.877 0 30.268 24.593 54.869 54.857 54.869a54.596 54.596 0 0 0 22.4-4.787 118.472 118.472 0 0 0 5.053 5.607c11.381 11.809 29.268 24.756 53.304 24.821h.132c20.846 0 37.997-5.688 50.032-16.384 12.067-10.662 18.003-25.939 17.921-41.508-.065-22.213-10.955-45.413-30.594-65.145a551.42 551.42 0 0 1-8.518-8.654c2.484-7.963.947-16.979-4.939-23.76-10.985-12.637-15.824-20.779-18.033-26.462-2.174-5.714-2.764-10.22-2.797-19.631v-1.282c38.621-6.084 71.848-29.505 93.167-61.683 5.495-8.282 5.364-18.66.557-26.645 9.092-19.658 14.193-41.879 14.193-65.401zM162.537 388.211c0-16.551 13.424-29.939 29.956-29.939 16.529 0 29.955 13.389 29.955 29.939 0 16.534-13.426 29.939-29.955 29.939-16.532 0-29.956-13.405-29.956-29.939z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagonal-arrow-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagonal-arrow-alt.svg
deleted file mode 100644
index fb4970d319..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagonal-arrow-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M360.643 185.692l32.238 32.24 10.453-109.268-109.27 10.449 32.233 32.236-174.945 174.949-32.231-32.232-10.455 109.27 109.268-10.455-32.241-32.239z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagonal-arrow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagonal-arrow.svg
deleted file mode 100644
index c10853ffcc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diagonal-arrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M326.307 360.642l-32.241 32.239 109.268 10.455-10.449-109.274-32.233 32.236-174.951-174.949 32.233-32.23-109.268-10.455 10.455 109.268 32.236-32.24z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diamond.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diamond.svg
deleted file mode 100644
index e831ae1172..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diamond.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M382.256 70.832H129.031L57.2 171.553l198.436 269.51 198.434-269.51-71.814-100.721zm-158.555 85.252l31.967-42.512 31.967 42.512h-63.934zm69.77 30.642l-37.803 157.248-37.803-157.248h75.606zm-8.535-85.253h60.662l-30.33 40.337-30.332-40.337zm-88.848 40.337l-30.349-40.305h60.662l-30.313 40.305zm-27.635 14.274h-62.575l30.463-42.708 32.112 42.708zm17.904 30.642L225.09 347.86 106.45 186.726h79.907zm138.639 0h79.824L286.292 347.734l38.704-161.008zm17.886-30.642l32.099-42.677 30.43 42.677h-62.529z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diamonds.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diamonds.svg
deleted file mode 100644
index bf1cd0b8a4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diamonds.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.368 438.932L101.655 255.867 256.368 72.805l154.71 183.062z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dice.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dice.svg
deleted file mode 100644
index bbb86cf68d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dice.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M195.481 223.372c0-10.382 8.401-18.771 18.768-18.771 3.319 0 6.443.866 9.143 2.372l48.349-48.354V91.684c0-9.338-7.553-16.89-16.906-16.89H90.704c-9.336 0-16.906 7.552-16.906 16.89v164.161c0 9.321 7.57 16.89 16.906 16.89h66.941c.065-.048.097-.095.145-.165l40.062-40.058c-1.489-2.713-2.371-5.818-2.371-9.14zm-64.209 18.769c-10.367 0-18.788-8.387-18.788-18.769 0-10.382 8.421-18.771 18.788-18.771 10.365 0 18.787 8.388 18.787 18.771.001 10.382-8.421 18.769-18.787 18.769zm-18.788-68.38c0-10.383 8.421-18.785 18.788-18.785 10.365 0 18.787 8.402 18.787 18.785 0 10.367-8.422 18.775-18.787 18.775-10.367 0-18.788-8.408-18.788-18.775zm18.788-30.835c-10.367-.017-18.788-8.418-18.788-18.785 0-10.366 8.421-18.774 18.788-18.774 10.365 0 18.787 8.408 18.787 18.774.001 10.381-8.421 18.768-18.787 18.785zm82.977-37.56c10.367 0 18.788 8.408 18.788 18.774 0 10.367-8.421 18.785-18.788 18.785-10.367-.017-18.768-8.418-18.768-18.785 0-10.366 8.401-18.774 18.768-18.774zm0 49.61c10.402 0 18.771 8.402 18.788 18.785-.017 10.367-8.386 18.775-18.788 18.775-10.367 0-18.768-8.408-18.768-18.775 0-10.383 8.401-18.785 18.768-18.785zm217.225 135.222L315.398 174.141c-6.606-6.605-17.301-6.605-23.889-.015l-116.09 116.072c-6.591 6.606-6.591 17.301 0 23.908L291.51 430.179c6.588 6.606 17.282 6.606 23.904 0l116.06-116.072c6.602-6.608 6.602-17.302 0-23.909zM252.3 315.457a18.695 18.695 0 0 1-13.245 5.498h-.016c-4.808 0-9.63-1.833-13.276-5.498a18.493 18.493 0 0 1-5.495-13.277 18.5 18.5 0 0 1 5.495-13.26 18.717 18.717 0 0 1 13.276-5.507c4.773 0 9.599 1.831 13.261 5.507l-3.518 3.518 3.533-3.518a18.824 18.824 0 0 1 5.477 13.26c0 4.796-1.845 9.618-5.492 13.277zm64.421 64.408a18.862 18.862 0 0 1-13.242 5.476h-.018a18.776 18.776 0 0 1-13.293-5.509c-3.662-3.664-5.512-8.469-5.477-13.275a18.517 18.517 0 0 1 5.477-13.261 18.83 18.83 0 0 1 13.293-5.508c4.773 0 9.613 1.843 13.26 5.508a18.715 18.715 0 0 1 5.496 13.261c.014 4.806-1.85 9.611-5.496 13.308zm-32.162-77.685c0-4.773 1.835-9.626 5.496-13.26 3.627-3.659 8.483-5.507 13.26-5.507 4.79 0 9.631 1.848 13.293 5.507 3.662 3.649 5.493 8.486 5.493 13.281 0 4.774-1.831 9.613-5.493 13.256a18.694 18.694 0 0 1-13.244 5.498h-.049c-4.793 0-9.633-1.833-13.26-5.498-3.661-3.643-5.496-8.481-5.496-13.277zm32.162-51.173a18.757 18.757 0 0 1-13.242 5.509h-.018a18.78 18.78 0 0 1-13.293-5.509 18.772 18.772 0 0 1-5.512-13.282c0-4.789 1.85-9.625 5.512-13.275a18.768 18.768 0 0 1 13.293-5.493 18.647 18.647 0 0 1 13.275 5.493 18.67 18.67 0 0 1 5.48 13.275c.015 4.796-1.849 9.602-5.495 13.282zm64.408 64.45c-3.631 3.665-8.455 5.498-13.229 5.498h-.032a18.641 18.641 0 0 1-13.277-5.498 18.703 18.703 0 0 1-5.51-13.256c0-4.795 1.846-9.632 5.51-13.281 3.646-3.676 8.484-5.507 13.277-5.507 4.789 0 9.614 1.848 13.261 5.491l-3.5 3.533 3.5-3.518a18.73 18.73 0 0 1 5.508 13.26c0 4.776-1.846 9.619-5.508 13.278z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diploma-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diploma-alt.svg
deleted file mode 100644
index b4a5fcfeb9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diploma-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M173.896 109.807h158.748v49.727H173.896zm0 93.795h158.748v23.68H173.896zm0 46.951h158.748v23.68H173.896zM115.059 51.6v300.77l6.936 6.936 79.43 79.432 6.936 6.938h47.656v-23.678h-16.674c-35.182 0-18.23-83.396-18.23-83.396s-81.328 19.768-82.375-17.523V75.28h234.525v346.719h-31.33v23.678h55.01V51.6H115.059zm183.916 265.564c-22.643 0-41 18.355-41 40.998 0 22.639 18.357 40.996 41 40.996 22.639 0 40.996-18.357 40.996-40.996 0-22.642-18.358-40.998-40.996-40.998zm-21.719 97.545V460.4l21.717-10.379 21.719 10.379v-45.691a60.269 60.269 0 0 1-21.717 4.041 60.263 60.263 0 0 1-21.719-4.041z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diploma.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diploma.svg
deleted file mode 100644
index 31b542d112..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-diploma.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M76.37 267.502c3.113-7.115 6.701-21.167 8.232-41.068h-17.08c.963 19.599 4.389 35.352 8.848 41.068zm-9.123-135.056c-10.15 0-18.471 30.964-19.252 70.309h38.49c-.785-39.345-9.097-70.309-19.238-70.309zm243.994 153.633l-25.367 81.836 29.611-10.555 18.453 25.454 25.008-80.678c-1.299.075-2.6.123-3.916.123-16.697.001-31.99-6.104-43.789-16.18zm-1.914-51.362a45.703 45.703 0 1 1 91.406 0 45.703 45.703 0 1 1-91.406 0zm70.934 62.636l-14.791 47.71 11.701 37.752 18.455-25.454 29.611 10.555-25.588-82.553a67.713 67.713 0 0 1-19.388 11.99zm64.877-168.167H94.603c13.566 21.55 14.453 65.991 14.453 77.13 0 11.137-.887 55.576-14.455 77.125h197.627l4.533-14.63a67.102 67.102 0 0 1-9.273-34.094c0-37.243 30.301-67.543 67.543-67.543s67.539 30.3 67.539 67.543a67.096 67.096 0 0 1-8.59 32.909l4.902 15.814h26.256c10.418-.002 18.869-34.53 18.867-77.125 0-42.601-8.447-77.129-18.867-77.129zM234.507 244.188h-67.502v-23.68h67.502v23.68zm23.828-45.704H148.062v-23.679h110.273v23.679z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-directions-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-directions-alt.svg
deleted file mode 100644
index 4a07354199..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-directions-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.758 38.612l-73.579 89.128h48.006v345.804h51.178V127.74h47.974l-73.579-89.128zm216.681 211.532l-89.147-73.58v47.989H307.49v248.991h51.145v-197.83h24.657v47.989l89.147-73.559zm-343.401 20.11l-89.144 73.582 89.144 73.575v-48.006h26.358V473.56h51.144V318.259h-77.502v-48.005z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-directions.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-directions.svg
deleted file mode 100644
index a56100bb2a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-directions.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M131.368 266.5L90.59 302.109l-6.442 5.635 6.442 5.632 40.778 35.599 2.111 1.853h240.179v-86.187H133.479l-2.111 1.859zm289.313-122.029l-40.778-35.611-2.109-1.857H137.617V193.2h240.176l2.109-1.867 40.778-35.597 6.441-5.631-6.44-5.634zM282.01 54.982h-65.88v34.582h65.88V54.982zm-65.88 401.789h65.88v-88.49h-65.88v88.49zm0-246.119v36.549h65.88v-36.549h-65.88z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-disc.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-disc.svg
deleted file mode 100644
index 8f694bc43f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-disc.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.209 37.588c120.4 0 217.998 97.602 217.998 217.999 0 120.395-97.598 217.996-217.998 217.996-120.397 0-218-97.602-218-217.996.001-120.397 97.603-217.999 218-217.999m0 115.178c-56.695 0-102.821 46.125-102.821 102.821 0 56.692 46.125 102.817 102.821 102.817 56.695 0 102.818-46.125 102.818-102.817 0-56.695-46.123-102.821-102.818-102.821zm0 30.651c-39.856 0-72.169 32.312-72.169 72.17 0 39.856 32.313 72.169 72.169 72.169s72.167-32.312 72.167-72.169c.001-39.858-32.311-72.17-72.167-72.17zm0 97.599c-14.043 0-25.43-11.388-25.43-25.429 0-14.044 11.387-25.43 25.43-25.43 14.044 0 25.429 11.386 25.429 25.43.001 14.041-11.384 25.429-25.429 25.429z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-disk-image.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-disk-image.svg
deleted file mode 100644
index 80a69f30d0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-disk-image.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M130.681 367.364h250.641c6.537 0 11.84-5.301 11.84-11.839 0-6.536-5.303-11.839-11.84-11.839H130.681c-6.541 0-11.84 5.303-11.84 11.839 0 6.538 5.299 11.839 11.84 11.839zM385.989 94.026H125.955L49.623 289.662v128.312h412.754V289.662L385.989 94.026zm52.71 300.269H73.3V313.34h365.398v80.955z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-display.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-display.svg
deleted file mode 100644
index 22cf1ef0eb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-display.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M307.748 395.951c-.893-4-1.52-7.932-1.982-11.646H201.583c-.933 7.47-2.595 15.908-5.507 23.7-2.911 7.846-7.047 14.971-12.662 19.989-5.64 5.007-12.646 8.146-22.442 8.18v9.323h185.397v-9.323c-9.799-.034-16.805-3.173-22.447-8.186-8.434-7.496-13.491-19.881-16.174-32.037zM458.844 67.933H48.502c-6.839 0-12.382 5.546-12.382 12.384v269.639c0 6.84 5.543 12.388 12.382 12.388h410.342c6.842 0 12.385-5.548 12.385-12.388V80.316c0-6.837-5.543-12.383-12.385-12.383zm-17.662 264.363H66.168V97.981h375.014v234.315z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dna.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dna.svg
deleted file mode 100644
index a4cc100411..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dna.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M315.299 155.551c-14.356-13.309-30.084-23.151-45.422-32.309-19.262-11.281-34.664-21.945-44.41-34.127a73.304 73.304 0 0 1-6.182-9.012l14.422-2.075c3.795-.538 9.29.997 12.197 3.419 0 0 3.957 3.306 10.336 3.306 8.404 0 14.159-7.2 14.159-7.2 2.355-3.004 7.39-5.882 11.183-6.421l16.777-2.423c0 .037-.031.066-.031.085-4.024 11.639-10.336 20.502-19.623 29.204-1.015.912-2.025 1.794-3.073 2.712 1.667 1.047 3.435 2.091 5.298 3.188l.032.014c12.82 7.621 27.472 16.615 41.531 28.386a128.033 128.033 0 0 0 6.477-7.355c8.532-10.562 15.891-23.121 20.798-37.506 4.61-13.379 7.161-28.29 7.488-44.479h-54.581a130.35 130.35 0 0 1-.295 5.414l-23.644 3.385c-3.758.521-9.252-.982-12.196-3.47 0 0-3.924-3.201-10.3-3.235-8.374.034-14.129 7.196-14.129 7.196-2.353 2.974-7.391 5.864-11.183 6.405L212.06 61.37c-1.211-5.36-2.026-11.416-2.256-18.412H155.26c.323 16.22 2.842 31.068 7.486 44.479 7.358 21.647 20.177 38.911 34.434 52.076 14.356 13.324 30.085 23.184 45.456 32.324 19.263 11.282 34.663 21.973 44.377 34.107 1.177 1.426 2.222 2.878 3.236 4.335l-11.513 1.667c-3.758.526-9.252-1.014-12.196-3.471 0 0-3.924-3.219-10.3-3.25-8.374.031-14.129 7.177-14.129 7.177-2.353 2.992-7.391 5.904-11.183 6.426l-14.65 2.128c4.056-9.093 9.712-16.55 17.528-23.875.95-.881 1.931-1.797 2.978-2.683-1.703-1.015-3.434-2.061-5.3-3.136l-.196-.135h-.032c-12.754-7.604-27.305-16.574-41.336-28.251a120.762 120.762 0 0 0-6.378 7.262c-8.566 10.53-15.891 23.083-20.827 37.489-4.939 14.374-7.491 30.43-7.491 48.025v.342c0 17.575 2.552 33.632 7.522 48.007 7.358 21.63 20.177 38.864 34.434 52.045 14.356 13.34 30.085 23.183 45.456 32.307 19.229 11.314 34.663 21.977 44.377 34.177 1.798 2.168 3.37 4.447 4.839 6.786l-13.115 1.912c-3.758.539-9.252-1-12.196-3.457 0 0-3.924-3.251-10.3-3.251-8.374 0-14.129 7.18-14.129 7.18-2.353 2.989-7.391 5.868-11.183 6.423l-15.829 2.26c4.057-10.449 10.107-18.655 18.707-26.75.95-.9 1.931-1.783 2.978-2.68a1193.703 1193.703 0 0 0-5.267-3.127l-.098-.078c-12.82-7.591-27.436-16.583-41.5-28.355a138.422 138.422 0 0 0-6.378 7.277c-8.566 10.564-15.891 23.121-20.827 37.506-4.613 13.393-7.132 28.275-7.455 44.478h54.545c.096-2.729.262-5.333.521-7.783l23.381-3.387c3.795-.536 9.29 1.016 12.197 3.436 0 0 3.957 3.289 10.336 3.289 8.404 0 14.159-7.184 14.159-7.184 2.355-2.988 7.39-5.884 11.183-6.405l18.282-2.652c1.535 5.875 2.583 12.657 2.811 20.687h54.581c-.327-16.202-2.878-31.085-7.488-44.478-7.359-21.63-20.21-38.877-34.469-52.047-14.356-13.354-30.084-23.211-45.457-32.341-19.227-11.294-34.629-21.956-44.375-34.12-2.485-3.123-4.674-6.295-6.572-9.717l14.812-2.123c3.795-.569 9.29.97 12.197 3.419 0 0 3.957 3.3 10.336 3.3 8.404 0 14.159-7.209 14.159-7.209 2.355-2.987 7.39-5.867 11.183-6.428l17.038-2.435c-.096.281-.193.573-.292.883-4.024 11.628-10.336 20.455-19.623 29.174-1.015.914-2.025 1.826-3.073 2.744 1.667 1.016 3.435 2.046 5.298 3.155l.096.051-.129-.083c12.85 7.635 27.502 16.677 41.597 28.447a145.393 145.393 0 0 0 6.477-7.341c8.532-10.577 15.858-23.137 20.798-37.536 4.936-14.343 7.521-30.431 7.521-48.011v-.307c0-17.596-2.586-33.668-7.521-48.025-7.359-21.629-20.21-38.864-34.438-52.045m-12.59 103.896h-.066c-.065 1.6-.13 3.136-.228 4.64l-23.711 3.435c-3.758.526-9.252-.994-12.196-3.466 0 0-3.924-3.221-10.3-3.252-8.374.031-14.129 7.178-14.129 7.178-2.353 3.011-7.391 5.886-11.183 6.409l-19.03 2.763c-1.344-6.117-2.126-13.098-2.16-21.372v-3.692h.066c.13-3.796.424-7.295.852-10.598l23.051-3.303c3.795-.553 9.29.983 12.197 3.404 0 0 3.957 3.299 10.336 3.299 8.404 0 14.159-7.192 14.159-7.192 2.355-2.989 7.39-5.869 11.183-6.412l17.561-2.529c2.19 7.326 3.565 16.085 3.599 27.023v3.665z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dock-connector.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dock-connector.svg
deleted file mode 100644
index 82480deaa1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dock-connector.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M307.76 184.502H199.091c-11.674.031-21.192 9.516-21.192 21.224s9.518 21.188 21.192 21.227H307.76c11.706-.038 21.188-9.518 21.222-21.227-.034-11.708-9.516-21.193-21.222-21.224zm-6.641 29.939h-95.357v-17.466h95.357v17.466zM86.927 139.734v141.501h142.837v192.136h51.146V281.235h144.771V139.734H86.927zM307.76 244.377H199.091c-21.356 0-38.655-17.299-38.655-38.652 0-21.372 17.298-38.658 38.655-38.687l108.668.029c21.352 0 38.684 17.286 38.684 38.658 0 21.353-17.332 38.652-38.683 38.652zm89.372-205.855H115.506v75.932h281.626V38.522z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-document-dashed-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-document-dashed-line.svg
deleted file mode 100644
index 6117d4c7f4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-document-dashed-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M168.454 463.182h46.027v-24.51h-46.027v24.51zM107.973 92.637h24.934V73.555h18.084v-24.9h-43.018v43.982zm24.934 202.718h-24.934v44.309h24.934v-44.309zm0 123.497h-24.934v44.33h43.018v-24.51h-18.084v-19.82zm0-61.741h-24.934v44.293h24.934v-44.293zm0-247.025h-24.934v44.292h24.934v-44.292zm0 123.512h-24.934v44.308h24.934v-44.308zm0-61.757h-24.934v44.31h24.934v-44.31zm246.948 167.823h24.949v-44.309h-24.949v44.309zm0-61.758h24.949v-44.308h-24.949v44.308zm0 123.498h24.949v-44.293h-24.949v44.293zM397.48 139.58l-83.618-83.635-7.308-7.289h-74.608v24.9h41.989c37.049 0 19.179 87.836 19.179 87.836s85.712-20.829 86.741 18.478v36.281h24.949v-69.262l-7.324-7.309zM231.946 463.182h46.043v-24.51h-46.043v24.51zm147.909-24.51h-20.93v24.51h45.879v-44.33h-24.949v19.82zM168.454 73.555h46.027v-24.9h-46.027v24.9zm126.982 389.627h46.03v-24.51h-46.03v24.51z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-document.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-document.svg
deleted file mode 100644
index d2da15ad9e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-document.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M396.441 138.878l-83.997-83.993-7.331-7.333H105.702v416.701h298.071V146.214l-7.332-7.336zM130.74 439.217V72.591h141.613c37.201 0 19.274 88.18 19.274 88.18s86-20.901 87.104 18.534v259.912H130.74z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-documents.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-documents.svg
deleted file mode 100644
index 4e56ca7b49..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-documents.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M243.47 64.86l-7.335-7.333H36.725V474.23h298.07V156.187l-7.332-7.335L243.47 64.86zm66.287 384.329H61.761V82.566h141.615c37.203 0 19.276 88.18 19.276 88.18s86-20.9 87.104 18.53v259.913zm157.051-330.866l-81.266-81.268H258.938l25.043 25.038h71.481c.063 0 .12.01.185.01-.006.286-.023.547-.023.837 11.174 0 16.69 9.045 19.118 20.95 4.358 22.959-2.312 55.826-2.312 55.826s.137-.031.341-.082c-.114.602-.181.933-.181.933s67.129-16.325 75.793 10.732c.077.294.161.585.225.887.083.302.14.612.207.921.154.928.26 1.889.287 2.904v228.807h-87.998l.002 25.037h113.037V125.66l-7.335-7.337z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dollar-bag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dollar-bag.svg
deleted file mode 100644
index bc9dcb83cf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-dollar-bag.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M235.567 264.973c-1.914 1.523-3.401 3.427-4.498 5.698-1.08 2.251-1.636 4.907-1.636 7.976 0 4.806 1.537 8.521 4.595 11.158 3.058 2.613 8.094 4.742 15.092 6.337V260.49c-2.483 0-4.905.363-7.228 1.095-2.32.731-4.447 1.853-6.325 3.388zm44.718 73.703c-3.581-2.836-9.647-5.42-18.249-7.748v41.975c2.618-.275 5.364-.902 8.177-1.848 2.861-.952 5.396-2.292 7.686-4.051 2.239-1.737 4.087-3.898 5.56-6.444 1.454-2.555 2.189-5.582 2.189-9.077-.001-5.682-1.8-9.96-5.363-12.807zm44.05-165.904l.031.027c-.097-.108-.163-.213-.261-.319a667.29 667.29 0 0 0-12.46-16.761c-5.396-9.025-8.239-20.006-1.637-35.849v-.009l22.78-54.505-35.76-16.298 3.662-16.156h-89.832l4.709 20.585-36.787 11.869 22.761 54.505v.009c11.265 26.945-4.858 39.813-14.326 52.928-46.859 64.796-99.312 157.564-99.312 213.49 0 92.734 72.025 89.646 167.889 89.646 95.85 0 167.891 3.088 167.891-89.646-.001-55.934-52.504-148.702-99.348-213.516zm-91.106-45.504h45.846v28.931h-45.846v-28.931zm81.066 237.654c-1.602 4.901-4.479 9.67-8.633 14.328-4.154 4.678-9.744 8.83-16.745 12.479-6.998 3.644-15.958 5.826-26.881 6.554v18.602H249.12v-18.602c-16.335-1.161-29.104-6.195-38.277-15.098-9.206-8.893-14.52-21.934-15.974-39.154h30.839c-.134 8.334 2.057 14.879 6.57 19.697 4.512 4.807 10.14 7.869 16.842 9.174v-45.697c-.734-.303-1.715-.627-2.959-.99a47.127 47.127 0 0 0-4.039-.984 178.976 178.976 0 0 1-15.958-5.135c-5.265-1.965-9.973-4.604-14.125-7.873-4.155-3.28-7.473-7.379-9.945-12.247-2.482-4.89-3.727-10.974-3.727-18.267 0-7.436 1.424-14 4.284-19.684 2.843-5.693 6.573-10.465 11.25-14.333 4.676-3.859 10.072-6.842 16.187-8.965 6.133-2.112 12.459-3.385 19.032-3.828v-16.842h12.916v16.842c6.543.731 12.706 2.158 18.479 4.266 5.737 2.127 10.806 5.028 15.204 8.75 4.349 3.714 7.946 8.356 10.694 13.878 2.779 5.572 4.383 12.123 4.807 19.689h-31.049c-.149-5.82-1.98-10.791-5.463-14.861-3.516-4.089-7.734-6.132-12.673-6.132v38.714c1.736.447 3.52.884 5.364 1.312 1.799.442 3.745.938 5.788 1.537 10.791 2.908 19.1 6.522 24.919 10.824 5.82 4.299 10.138 8.779 12.917 13.447 2.763 4.683 4.398 9.347 4.921 14.004.507 4.67.77 8.813.77 12.475.001 3.191-.817 7.247-2.419 12.12z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-donate.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-donate.svg
deleted file mode 100644
index c2669c3a5c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-donate.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M236.555 298.982l-66.399-66.42-14.111 14.127c-7.8 7.781-7.8 20.435 0 28.188l40.614 40.635v21.271l-.801-.427-65.175-65.175V163.199c0-14.449-11.706-26.154-26.158-26.154H78.396v178.452h.017l68.542 68.542v83.958h89.621l-.02-31.899c0-.031.02-.068.02-.068l-.021-137.048zm171.684-161.937c-14.437 0-26.146 11.705-26.146 26.154v107.982l-65.156 65.175-.834.427v-21.271l40.631-40.635c7.799-7.753 7.799-20.406 0-28.188l-14.11-14.127-66.415 66.42v169.014h89.633v-83.958l68.51-68.542h.033V137.045h-26.146zm-85.04 62.849c0-21.062-17.071-38.099-38.113-38.099-21.043 0-38.098 17.036-38.098 38.099 0 21.062 17.055 38.129 38.098 38.129 21.042-.001 38.113-17.068 38.113-38.129zM212.241 99.111c-21.057 0-38.097 16.998-38.097 38.059 0 21.029 17.04 38.129 38.097 38.129 21.029 0 38.099-17.1 38.099-38.129 0-21.061-17.07-38.059-38.099-38.059zm78.745 21.006c21.03 0 38.117-17.066 38.117-38.114 0-21.026-17.087-38.081-38.117-38.081-21.057 0-38.097 17.055-38.097 38.081.001 21.048 17.041 38.114 38.097 38.114z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-door-open-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-door-open-alt.svg
deleted file mode 100644
index 57552cc455..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-door-open-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M134.506 84.553v342.895h242.988V84.553H134.506zm214.572 314.48H162.922V112.967h186.156v286.066zm-52.244-274.226H174.76v262.369l122.074-70.186V124.807zm-21.449 83.646l-19.459 11.191V192.33l19.459-11.189v27.312z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-door-open.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-door-open.svg
deleted file mode 100644
index 02339e4b8b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-door-open.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M134.935 396.086l148.268 61.566v-340.26L134.935 55.825v340.261zm97.309-123.089l19.953 8.285v25.639l-19.953-8.284v-25.64zM162.25 54.348l68.427 28.415h117.971v286.066h-53.607v28.414h82.023V54.348z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-download-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-download-alt.svg
deleted file mode 100644
index 3b788ff610..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-download-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M348.842 268.008v30.672h59.451v91.495h-304.42V298.68h59.484v-30.672H73.23v152.807h365.737V268.008h-90.125zm25.343-78.879h-77.666V90.827h-82.768v98.302h-77.632l119.033 144.245 119.033-144.245z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-download.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-download.svg
deleted file mode 100644
index a328fe65f7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-download.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M374.438 134.578H296.45V35.849h-83.102v98.729H135.36l119.542 144.834 119.536-144.834zM283.64 456.812c-1.452-3.889-2.28-8.094-2.748-11.82h-51.995c-.465 3.729-1.293 7.938-2.747 11.827-3.039 7.893-7.913 14.011-17.521 14.06v4.656h92.537v-4.656c-9.613-.049-14.486-6.17-17.526-14.067zm73.664-169.73H152.492a6.179 6.179 0 0 0-6.18 6.182v134.58a6.182 6.182 0 0 0 6.18 6.184h204.812a6.183 6.183 0 0 0 6.183-6.184v-134.58a6.181 6.181 0 0 0-6.183-6.182zm-23.866 116.901H176.357v-86.855h157.081v86.855z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-drop.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-drop.svg
deleted file mode 100644
index 7523004cad..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-drop.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M358.763 305.03c0-56.752-102.764-200.823-102.764-200.823S153.237 248.278 153.237 305.03c0 56.756 46.008 102.764 102.762 102.764 56.755-.001 102.764-46.008 102.764-102.764z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eco.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eco.svg
deleted file mode 100644
index dad4c564c0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eco.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M421.889 460.736c-.459-83.039-22.836-142.711-55.193-183.683-32.996-41.698-76.687-64.476-120.131-71.964-63.36-10.927-96.707-27.832-114.955-43.928-9.958-10.05-14.437-38.093-14.437-38.093s26.747 16.498 37.509 22.444c13.506 9.217 43.304 24.194 96.411 33.294 49.38 8.449 99.282 34.595 136.514 81.712 6.736 8.502 13.031 17.707 18.836 27.572 43.894-96.138-51.242-170.037-158.588-184.229C129.958 88.295 73.417 51.986 73.417 51.986c-11.3 114.114 30.167 238.013 127.971 278.382 70.372 29.072 125.688 34.927 164.52 8.751 15.96 34.277 25.736 73.843 25.77 120.113v1.631l30.211-.127z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-economy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-economy.svg
deleted file mode 100644
index 4e710b572a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-economy.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.837 257.082c-.477.805-.542 1.186-.572 1.414.03.21.096.596.572 1.387.573.975 1.814 2.472 3.908 4.137 4.134 3.379 11.478 7.246 21.077 10.482 19.209 6.592 47.203 10.952 78.105 10.916 40.485.137 76.21-7.711 93.199-17.439 5.657-3.113 8.895-6.368 9.861-8.096.456-.791.538-1.177.572-1.387-.034-.229-.116-.609-.572-1.414-.572-.958-1.832-2.463-3.894-4.131-4.137-3.388-11.51-7.24-21.106-10.478-19.196-6.585-47.19-10.942-78.061-10.929-40.485-.127-76.245 7.743-93.231 17.466-5.657 3.105-8.91 6.38-9.858 8.072zm189.211 41.02c-22.826 7.744-52.895 12.242-86.12 12.266-42.676-.137-79.826-7.199-103.663-19.725v25.055c0 .229 0 .545.572 1.555.573.971 1.814 2.477 3.908 4.135 4.134 3.368 11.478 7.246 21.077 10.474 19.209 6.58 47.203 10.942 78.105 10.921 40.419.148 76.196-7.732 93.184-17.453 5.673-3.123 8.91-6.387 9.877-8.086.572-1 .555-1.326.572-1.545V290.67c-5.248 2.781-11.087 5.226-17.512 7.432zm-86.12 69.626c-42.676-.132-79.826-7.196-103.663-19.734v27.72c0 .227 0 .555.572 1.553.573.972 1.814 2.458 3.908 4.12 4.134 3.386 11.478 7.245 21.077 10.483 19.209 6.59 47.203 10.951 78.105 10.916 40.419.136 76.196-7.723 93.184-17.438 5.673-3.116 8.91-6.37 9.877-8.097.572-1 .555-1.324.572-1.537v-27.699c-5.265 2.805-11.118 5.245-17.562 7.446-22.791 7.742-52.879 12.225-86.07 12.267zM55.129 143.532c4.135 3.369 11.492 7.236 21.093 10.469 19.209 6.567 47.185 10.935 78.075 10.92 40.484.127 76.227-7.727 93.215-17.465 5.655-3.106 8.91-6.357 9.86-8.076.472-.801.554-1.16.587-1.409-.033-.216-.115-.596-.587-1.389-.558-.971-1.816-2.466-3.894-4.145-4.153-3.37-11.513-7.236-21.092-10.474-19.229-6.589-47.188-10.951-78.09-10.921-40.486-.131-76.23 7.732-93.2 17.45-5.66 3.122-8.929 6.363-9.876 8.09-.461.793-.526 1.173-.557 1.389.03.249.096.608.557 1.409.589.963 1.83 2.467 3.909 4.152zm174.2 232.181v-18.735c-21.108 5.666-46.942 8.888-75.032 8.909-42.646-.111-79.811-7.178-103.633-19.721v28.369c0 .211 0 .556.557 1.553.588.967 1.83 2.463 3.908 4.13 4.135 3.375 11.492 7.251 21.093 10.488 19.209 6.574 47.185 10.933 78.075 10.923 31.506.099 60.103-4.659 79.268-11.361a1.317 1.317 0 0 0-.116-.175c-2.501-4.134-4.136-9.145-4.12-14.38zm-174.2-56.147c4.135 3.373 11.492 7.245 21.093 10.482 19.209 6.568 47.185 10.938 78.075 10.911 29.266.089 56.016-3.998 75.032-9.952V315.9c0-.062-.016-.127-.016-.203l.016-17.398c-21.108 5.684-46.942 8.898-75.032 8.921-42.646-.14-79.811-7.179-103.633-19.727v26.39c0 .223 0 .533.557 1.537.588.971 1.829 2.462 3.908 4.146zm202.243-120.082c.587-1.002.554-1.341.587-1.553v-27.788c-5.264 2.805-11.102 5.255-17.529 7.46-22.825 7.739-52.895 12.217-86.133 12.248-42.646-.128-79.811-7.194-103.633-19.734v27.813c0 .228 0 .551.557 1.553.588.966 1.83 2.461 3.908 4.12 4.135 3.383 11.492 7.25 21.093 10.498 19.209 6.574 47.185 10.937 78.075 10.915 40.418.126 76.193-7.735 93.196-17.458 5.658-3.135 8.929-6.372 9.879-8.074zM50.664 230.215v24.995c0 .227 0 .545.557 1.544.588.98 1.83 2.459 3.908 4.134 4.135 3.378 11.492 7.229 21.093 10.493 19.209 6.57 47.185 10.936 78.075 10.911 29.266.09 56.016-4.004 75.032-9.95v-14.438h.016c.133-4.969 1.732-9.711 4.104-13.667 1.26-2.061 2.698-3.933 4.27-5.683-22.469 7.205-51.49 11.366-83.421 11.392-42.63-.127-79.812-7.187-103.634-19.731z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-edit.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-edit.svg
deleted file mode 100644
index 2faeea0891..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-edit.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M412.656 38.477l-49.973 49.975 58.761 58.76 49.976-49.98-58.764-58.755zM177.421 338.155l-15.932-15.935 190.923-190.928-16.286-16.283L85.215 365.922l.186.185-47.919 106.778 106.309-48.383.182.182.482-.482.006-.003 250.424-250.432-26.537-26.537-190.927 190.925zm-39.26 59.052l-46.369 21.102 20.9-46.572 23.388-23.387 3.367 22.301 22.097 3.164-23.383 23.392z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eject.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eject.svg
deleted file mode 100644
index 5f74a4ccc1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eject.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M88.143 404.317v-83.096h333.738v83.096H88.143zm166.054-295.95l165.76 165.758H88.441z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-employee.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-employee.svg
deleted file mode 100644
index b1c4877b2b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-employee.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M471.66 395.484c-7.229-20.952-31.164-23.963-51.153-32.393-21.954-9.256-46.3-20.008-68.202-28.99-6.251-1.703-12.506-3.409-18.755-5.115-7.464-5.135-14.77-22.201-18.761-30.688-3.976-.568-7.951-1.137-11.938-1.701.618-13.129 8.745-13.834 11.938-23.868 2.812-8.845.294-20.349 4.754-28.537 3.096-5.688 10.095-5.728 13.59-10.604 3.175-4.424 5.263-12.141 6.25-17.559 1.805-9.909 3.379-23.461-1.323-33.287-2.706-5.643-4.413-6.184-5.165-13.037-.915-8.303 2.449-35.389 2.588-41.243.342-15.194-.025-16.423-3.704-31.222 0 0-4.462-13.41-11.462-17.447l-13.952-2.402-8.623-7.99C263 48.022 225.75 63.014 205.803 71.104c-28.747 9.326-46.923 37.471-34.232 97.607 2.166 10.272-5.624 14.865-5.116 20.469 1.116 12.255 1.351 41.722 12.93 48.977 1.078.676 9.292 2.733 9.238 2.172 1.14 11.932 2.274 23.877 3.409 35.809 2.891 7.93 9.829 8.803 11.845 20.007L195 298.299c-3.991 8.486-11.298 25.553-18.76 30.688-6.251 1.706-12.506 3.412-18.756 5.115-21.903 8.982-46.248 19.734-68.201 28.99-19.992 8.43-43.925 11.44-51.152 32.393 0 14.234-1.341 47.849-.974 66.492h435.475c.368-18.644-.972-52.258-.972-66.493zm-91.439 47.624h-77.537v-34.106h77.537v34.106z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-energy-saving-bulb.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-energy-saving-bulb.svg
deleted file mode 100644
index a45bbf5f4f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-energy-saving-bulb.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M160.181 124.095c2.371 0 4.789-.328 7.194-.977l97.026-27.046c14.26-3.978 22.563-18.726 18.606-32.98-3.974-14.257-18.737-22.581-32.964-18.611l-97.058 27.061c-14.223 3.963-22.562 18.709-18.607 32.969 3.32 11.836 14.08 19.584 25.803 19.584zm0 73.712a26.72 26.72 0 0 0 7.194-.997l191.862-53.452c14.256-3.989 22.579-18.756 18.605-32.992-3.954-14.244-18.735-22.583-32.979-18.611L152.986 145.24c-14.223 3.956-22.562 18.722-18.607 32.982 3.303 11.817 14.079 19.585 25.802 19.585zm184.682-32.343l-191.877 53.452c-14.223 3.973-22.562 18.752-18.575 32.98 3.271 11.852 14.046 19.604 25.77 19.604 2.371 0 4.789-.327 7.194-.998l191.862-53.467c14.256-3.978 22.564-18.736 18.605-32.965-3.974-14.257-18.735-22.581-32.979-18.606zm0 74.43l-191.877 53.462c-14.223 3.962-22.562 18.745-18.575 32.968 3.271 11.854 14.046 19.586 25.77 19.586.31 0 .622-.031.917-.031.097 0 .146.015.228.015 1.176.119 12.476 2.062 22.009 8.013 4.578 2.8 8.616 6.366 11.755 10.779v65.434h122.06v-65.465c5.068-7.245 13.099-12.184 20.567-15.11 3.825-1.537 7.375-2.475 9.843-3.024a43.992 43.992 0 0 1 2.78-.542c.264-.043.458-.067.555-.084 6.64-.733 12.267-5.359 14.327-11.725a17.145 17.145 0 0 0-4.81-17.853l-21.338-19.244 20.162-5.624c14.256-3.958 22.564-18.721 18.605-32.964-3.973-14.242-18.734-22.563-32.978-18.591zm-32.162 83.993c-8.632 5.04-17.722 12.381-24.72 23.004-2.78 4.205-5.169 8.965-7.032 14.146h-49.674c-1.863-5.182-4.218-9.941-7.014-14.146-3.745-5.669-8.064-10.365-12.557-14.307l88.506-24.67 15.729 14.188a67.195 67.195 0 0 0-3.238 1.785zm-91.089 148.218h69.017v-20.602h-69.017v20.602z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-enter.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-enter.svg
deleted file mode 100644
index 4dc8c5af3d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-enter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M248.138 108.354v51.364h64.001v142.549h-75.737v-48.199l-89.519 73.882 89.519 73.887V353.63h127.1V108.354z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-equalizer.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-equalizer.svg
deleted file mode 100644
index 64b43e8537..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-equalizer.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M158.297 172.265c0 12.833-10.405 23.238-23.239 23.238H43.926c-12.835 0-23.24-10.405-23.24-23.238 0-12.836 10.405-23.241 23.24-23.241h91.132c12.834 0 23.239 10.404 23.239 23.241zm166.864 162.289c0 12.836-10.404 23.239-23.237 23.239H210.79c-12.837 0-23.24-10.403-23.24-23.239 0-12.833 10.403-23.238 23.24-23.238h91.134c12.833-.001 23.237 10.405 23.237 23.238zm165.775-129.479c0 12.833-10.405 23.236-23.239 23.236h-91.134c-12.835 0-23.237-10.403-23.237-23.236 0-12.837 10.402-23.241 23.237-23.241h91.134c12.833 0 23.239 10.404 23.239 23.241zM57.498 123.446h66.174V41.247H57.498v82.199zm332.548-82.199v115.007h66.17V41.247h-66.17zM223.77 284.756h66.179V41.245H223.77v243.511zm166.276 186.42h66.17V257.818h-66.17v213.358zm-332.548 0h66.174V225.01H57.498v246.166zm166.272 0h66.179v-84.858H223.77v84.858z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-escape.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-escape.svg
deleted file mode 100644
index edb544f9d3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-escape.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M233.471 269.035l36.168-36.165-110.304-110.306 55.364-55.375H67.804v146.945l55.364-55.4 110.303 110.301zm22.825-201.519v51.158c37.934 0 72.042 15.306 96.929 40.163 24.82 24.853 40.092 58.958 40.125 96.892-.033 37.9-15.305 72.012-40.125 96.896-24.887 24.82-58.995 40.096-96.929 40.142-.031 0-.13 0-.164.017-37.867-.101-71.878-15.369-96.73-40.158-24.822-24.885-40.126-58.996-40.126-96.896H68.097c.034 103.926 84.272 188.147 188.199 188.147l25.573-1.717c91.663-12.424 162.332-90.876 162.625-185.839 0-.197.031-.428.031-.592-.031-103.958-84.271-188.213-188.229-188.213z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ethernet.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ethernet.svg
deleted file mode 100644
index 2b16efe994..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ethernet.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M109.038 256.513l96.157-96.149-35.409-35.403L38.225 256.513l131.562 131.565 35.413-35.406-.004-.006-96.158-96.153zm250.855-113.126l-18.438-18.433-35.406 35.411 18.431 18.438 77.723 77.71-96.153 96.153 35.406 35.416 131.566-131.569-113.129-113.126zM160.074 258.438c0 12.386 10.047 22.432 22.436 22.432 12.391 0 22.436-10.046 22.436-22.432 0-12.392-10.045-22.438-22.436-22.438-12.389.001-22.436 10.047-22.436 22.438zm94.549-22.437c-12.392 0-22.435 10.046-22.435 22.438 0 12.386 10.043 22.432 22.435 22.432 12.39 0 22.434-10.046 22.434-22.432 0-12.392-10.044-22.438-22.434-22.438zm72.109 44.869c12.389 0 22.437-10.046 22.437-22.432 0-12.392-10.048-22.438-22.437-22.438-12.391 0-22.434 10.046-22.434 22.438.001 12.386 10.044 22.432 22.434 22.432z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-euro-bag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-euro-bag.svg
deleted file mode 100644
index cb19eafeb9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-euro-bag.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M324.658 172.772l.018.027c-.081-.108-.148-.213-.246-.319a747.086 747.086 0 0 0-12.46-16.761c-5.396-9.025-8.24-20.006-1.618-35.849v-.009l22.762-54.505-35.777-16.298 3.697-16.156h-89.85l4.708 20.585-36.788 11.869 22.76 54.505v.009c11.25 26.945-4.857 39.813-14.321 52.928-46.848 64.796-99.316 157.564-99.316 213.49 0 92.734 72.04 89.646 167.872 89.646 95.866 0 167.893 3.088 167.893-89.646-.002-55.934-52.504-148.702-99.334-213.516zm-91.123-45.504h45.849v28.931h-45.849v-28.931zm64.684 167.994l-6.769 15.751h-49.004l-.229 9.19h46.601l-6.787 15.738h-38.063c4.677 23.061 15.467 34.562 32.376 34.562 10.921 0 22.171-4.594 33.681-13.781l-.227 33.041c-9.763 5.684-20.979 8.52-33.669 8.52-18.376 0-33.191-5.895-44.424-17.707-10.187-10.642-16.825-25.523-19.899-44.635H194.98l6.77-15.738h8.747v-5.682c0-2.043.083-3.217.229-3.509H194.75l6.787-15.751h11.151c3.514-17.641 10.724-31.57 21.665-41.773 11.528-11.077 25.949-16.621 43.3-16.621 12.241 0 25.505 3.639 39.826 10.933l-13.357 27.34c-10.22-6.562-19.751-9.844-28.664-9.844-15.287 0-25.507 9.99-30.624 29.965h53.385z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-exit-fullscreen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-exit-fullscreen.svg
deleted file mode 100644
index 820c79522d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-exit-fullscreen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M434.567 107.615l34.897-34.901-32.369-32.37L402.2 75.247l-36.534-36.534v105.984h105.98l-37.079-37.082zm37.081 259.313H365.663v105.979l37.081-37.077 34.897 34.9 32.372-32.369-34.898-34.9 36.533-36.533zM73.187 403.997l-34.901 34.901 32.372 32.371 34.898-34.901 36.537 36.539V366.92H36.113l37.074 37.077zm68.907-259.306V38.713l-37.078 37.079-34.905-34.903L37.748 73.25l34.901 34.906-36.537 36.535h105.982zM386.4 300.484v-86.92c0-35.999-29.179-65.172-65.171-65.172H185.522c-35.992 0-65.171 29.173-65.171 65.172v86.92c0 35.99 29.179 65.164 65.171 65.164h135.707c35.993 0 65.171-29.173 65.171-65.164z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eye.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eye.svg
deleted file mode 100644
index 8ea896a1f4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-eye.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.867 214.401c-22.305 0-40.45 18.143-40.45 40.439 0 22.316 18.145 40.474 40.45 40.474 22.319 0 40.474-18.157 40.474-40.474 0-22.296-18.155-40.439-40.474-40.439zm0-74.942c-107.278 0-215.312 116.648-215.312 116.648s108.034 116.646 215.312 116.646c107.294 0 215.329-116.646 215.329-116.646S362.161 139.459 254.867 139.459zm0 197.952c-45.586 0-82.546-36.925-82.546-82.57 0-45.587 36.96-82.535 82.546-82.535 45.612 0 82.571 36.948 82.571 82.535 0 45.645-36.959 82.57-82.571 82.57z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-circle-fill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-circle-fill.svg
deleted file mode 100644
index ce854391c9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-circle-fill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12.001 2C6.47813 2 2.00098 6.47715 2.00098 12C2.00098 16.9913 5.65783 21.1283 10.4385 21.8785V14.8906H7.89941V12H10.4385V9.79688C10.4385 7.29063 11.9314 5.90625 14.2156 5.90625C15.3097 5.90625 16.4541 6.10156 16.4541 6.10156V8.5625H15.1931C13.9509 8.5625 13.5635 9.33334 13.5635 10.1242V12H16.3369L15.8936 14.8906H13.5635V21.8785C18.3441 21.1283 22.001 16.9913 22.001 12C22.001 6.47715 17.5238 2 12.001 2Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-circle-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-circle-line.svg
deleted file mode 100644
index 6e2287fecc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-circle-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M13.001 19.9381C16.9473 19.446 20.001 16.0796 20.001 12C20.001 7.58172 16.4193 4 12.001 4C7.5827 4 4.00098 7.58172 4.00098 12C4.00098 16.0796 7.05467 19.446 11.001 19.9381V14H9.00098V12H11.001V10.3458C11.001 9.00855 11.1402 8.52362 11.4017 8.03473C11.6631 7.54584 12.0468 7.16216 12.5357 6.9007C12.9184 6.69604 13.3931 6.57252 14.2227 6.51954C14.5519 6.49851 14.9781 6.52533 15.501 6.6V8.5H15.001C14.0837 8.5 13.7052 8.54332 13.4789 8.66433C13.3386 8.73939 13.2404 8.83758 13.1653 8.97793C13.0443 9.20418 13.001 9.42853 13.001 10.3458V12H15.501L15.001 14H13.001V19.9381ZM12.001 22C6.47813 22 2.00098 17.5228 2.00098 12C2.00098 6.47715 6.47813 2 12.001 2C17.5238 2 22.001 6.47715 22.001 12C22.001 17.5228 17.5238 22 12.001 22Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-fill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-fill.svg
deleted file mode 100644
index 88a85ad087..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-fill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M14 13.5H16.5L17.5 9.5H14V7.5C14 6.47062 14 5.5 16 5.5H17.5V2.1401C17.1743 2.09685 15.943 2 14.6429 2C11.9284 2 10 3.65686 10 6.69971V9.5H7V13.5H10V22H14V13.5Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-like.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-like.svg
deleted file mode 100644
index 0f27d54a06..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-like.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M415.495 215.279l-22.299-13.428a23.68 23.68 0 0 0-12.214-3.393H345.86v-36.66l4.07-12.242a23.644 23.644 0 0 0 1.213-7.473V117.63c0-13.078-10.602-23.678-23.68-23.678h-28.316a23.68 23.68 0 0 0-21.312 13.355c-.328.676-32.99 68.129-48.221 101.205-7.062 15.334-30.904 22.451-41.861 24.57-1.264-5.178-5.9-9.041-11.469-9.041H96.88c-6.535 0-11.838 5.301-11.838 11.84v40.783h103.08v-19.65c8.408-1.26 49.291-8.828 63-38.602 15.311-33.248 48.025-100.783 48.025-100.783h28.316v24.453l-5.283 15.877v64.178h58.802l22.296 13.424v133.973l-30.277 24.834H271.415l-31.234-23.648h-52.059v-70.375H85.042v90.252c0 6.537 5.303 11.84 11.838 11.84h79.404c5.197 0 9.568-3.375 11.158-8.037h44.787l24.895 18.846a23.674 23.674 0 0 0 14.291 4.801h101.586a23.679 23.679 0 0 0 15.017-5.371l30.278-24.832a23.682 23.682 0 0 0 8.662-18.309V235.562c0-8.3-4.35-16-11.463-20.283z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-line.svg
deleted file mode 100644
index 8ae0d14163..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-facebook-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M13 9H17.5L17 11H13V20H11V11H7V9H11V7.12777C11 5.34473 11.1857 4.69816 11.5343 4.04631C11.8829 3.39446 12.3945 2.88288 13.0463 2.53427C13.6982 2.18565 14.3447 2 16.1278 2C16.6498 2 17.1072 2.05 17.5 2.15V4H16.1278C14.8041 4 14.401 4.07784 13.9895 4.29789C13.6862 4.46011 13.4601 4.68619 13.2979 4.98951C13.0778 5.40096 13 5.80407 13 7.12777V9Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-factory.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-factory.svg
deleted file mode 100644
index 855727aad5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-factory.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M406.019 100.266v181.021l-93.774-50.065v60.793l-132.009-60.793v65.697L37.579 231.221v242.726h434.607V100.266h-66.167zm-22.888-38.008c13.594-.036 25.369 5.842 33.956 12.188a78.822 78.822 0 0 1 9.901 8.674 56.783 56.783 0 0 1 2.497 2.744c.265.309.45.541.56.672.031.037.054.067.073.088l-.008.004.033.023 2.574-2.022 17.276-13.239h-.008c-.48-.607-6.737-8.736-18.031-17.094-11.255-8.296-27.932-17.048-48.823-17.079-20.905-.088-44.743 9.234-68.29 32.937l17.716 17.707c20.341-20.212 37.007-25.523 50.574-25.603zm-186.87 60.778c11.255 8.296 27.935 17.049 48.822 17.079h.282c20.842 0 44.562-9.346 68.007-32.934l-17.696-17.707c-20.367 20.205-37.028 25.514-50.593 25.599-13.587.035-25.364-5.846-33.958-12.187a79.633 79.633 0 0 1-9.894-8.667 59.88 59.88 0 0 1-2.498-2.749c-.271-.306-.452-.535-.56-.669-.037-.05-.057-.071-.068-.095l-19.871 15.242c.479.611 6.732 8.74 18.027 17.088zm1.816-32.358l-2.853 2.229 2.881-2.199c-.009-.005-.026-.028-.028-.03zm-85.061-28.42c13.593-.036 25.367 5.846 33.954 12.188a78.653 78.653 0 0 1 9.906 8.678 55.78 55.78 0 0 1 2.495 2.74c.269.309.453.541.554.672.041.045.059.069.076.092l19.871-15.23v-.01c-.483-.609-6.732-8.732-18.034-17.086-11.251-8.295-27.937-17.061-48.822-17.084-20.904-.084-44.746 9.234-68.291 32.938L62.438 87.86c20.351-20.213 37.008-25.522 50.578-25.602zm49.86 22.167l-2.875 2.202.024.031 2.851-2.233z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-favorite.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-favorite.svg
deleted file mode 100644
index 5fee2201b0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-favorite.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M408.908 86.358c-55.975-26.379-122.761-2.379-149.132 53.615-1.831 3.885-3.421 8.767-4.813 14.428-1.391-5.661-2.984-10.543-4.814-14.428-26.373-55.994-93.143-79.994-149.135-53.615-55.959 26.371-79.969 93.122-53.597 149.113 26.369 55.989 207.502 216.478 207.502 216.478s.018-.203.042-.515l.043.515S436.139 291.46 462.506 235.471c26.373-55.991 2.397-122.742-53.598-149.113z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-female-symbol.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-female-symbol.svg
deleted file mode 100644
index 9e003e51e5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-female-symbol.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M390.507 184.386c0-74.246-60.138-134.383-134.387-134.403-74.232.021-134.372 60.157-134.401 134.403.029 65.472 46.84 119.955 108.828 131.921v34.327H170.67v51.149h59.877v59.876h51.128v-59.876h59.912v-51.149h-59.912v-34.327c62.003-11.951 108.832-66.45 108.832-131.921zm-217.629 0c.015-23.083 9.271-43.736 24.38-58.894 15.14-15.093 35.792-24.362 58.862-24.362s43.738 9.27 58.847 24.362c15.142 15.157 24.38 35.811 24.396 58.894-.016 23.058-9.254 43.692-24.396 58.863-15.109 15.109-35.777 24.351-58.847 24.368-23.069-.018-43.722-9.259-58.862-24.368-15.11-15.171-24.365-35.806-24.38-58.863z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-file-cabinet.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-file-cabinet.svg
deleted file mode 100644
index 8d34dc684f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-file-cabinet.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M97.856 49.524v412.951h316.287V49.524H97.856zM385.038 433.37H126.962V78.631h258.076V433.37zm-233.226-25.036h208.375v-137.86H151.812v137.86zm49.329-93.135c0-6.538 5.303-11.839 11.842-11.839 6.537 0 11.838 5.301 11.838 11.839v7.104h69.33v-7.104c0-6.538 5.303-11.839 11.842-11.839 6.537 0 11.838 5.301 11.838 11.839v18.942c0 6.538-5.301 11.838-11.838 11.838h-93.01c-6.539 0-11.842-5.301-11.842-11.838v-18.942zm-49.329-211.533v140.762h208.375V103.666H151.812zm166.018 63.145c0 6.54-5.301 11.84-11.838 11.84h-93.01c-6.539 0-11.842-5.301-11.842-11.84V147.87c0-6.539 5.303-11.841 11.842-11.841 6.537 0 11.838 5.302 11.838 11.841v7.102h69.33v-7.102c0-6.539 5.303-11.841 11.842-11.841 6.537 0 11.838 5.302 11.838 11.841v18.941z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-files.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-files.svg
deleted file mode 100644
index 228b54980d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-files.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M178.713 232.455h154.576l-4.281-39.551H182.996zm11.932-110.189l-4.438 40.974h139.588l-4.436-40.974zm-19.368 178.872h169.448l-4.225-39.02h-161zM95.404 334.64l22.334 114.085h276.525l22.332-114.085H95.404zm208.731 65.761h-96.26v-36.255h96.26v36.255zM164.021 92.938h183.961l22.543 208.201h29.836L377.473 89.744c-1.629-15.058-14.344-26.469-29.49-26.469H164.021c-15.146 0-27.859 11.411-29.488 26.469l-22.895 211.395h29.836l22.547-208.201z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-filter-arrows.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-filter-arrows.svg
deleted file mode 100644
index 2f17186e0c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-filter-arrows.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M115.777 178.399l77.85-61.421-77.85-61.418v37.128H48.656v48.574h67.121zm0 192.336H48.656v48.57h67.121v37.135l77.85-61.421-77.85-61.416zm347.567-114.737l-77.848-61.417v37.133h-48.75v48.567h48.75v37.14zM51.875 231.714h161.521v48.567H51.875zM243.859 55.56h62.58v400.881h-62.58z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-filter.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-filter.svg
deleted file mode 100644
index 41a89b3eb0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-filter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M90.674 88.919h331.039v43.964L286.002 294.937v68.153l-67.318 59.824V294.937L90.674 131.642z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fingerprint.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fingerprint.svg
deleted file mode 100644
index b80eebd81c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fingerprint.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M207.504 97c22.009 0 52.552 2.224 84.438 11.218 30.674 8.603 62.492 23.316 89.684 47.941 14.275 12.949 27.322 28.676 38.377 47.856l6.996-1.974c-.359-11.186-1.521-22.145-3.484-32.77l-.178-.881-.539-.724a214.896 214.896 0 0 0-26.047-28.2c-30.413-27.552-65.566-43.66-98.741-52.964-27.913-7.817-54.451-10.857-76.032-11.708l-1.194-.063-.982.623c-7.062 4.542-14.028 9.579-20.862 15.04l-8.568 6.888 10.987-.217a360.4 360.4 0 0 1 6.145-.065zm-88.555 162.889c5.07 0 10.234-.396 15.386-1.276l-.636-3.661.652 3.661c9.711-1.717 19.556-5.43 27.945-12.395 8.451-6.968 14.992-17.021 18.588-29.924 1.146-4.089 2.028-8.503 2.585-13.224a84.401 84.401 0 0 1 2.486-12.676c3.744-13.174 9.909-21.615 17.235-27.793 10.89-9.125 25.307-12.854 37.228-13.931 3.287-.297 6.361-.396 9.091-.396 2.176 0 4.138.067 5.772.162 1.864.101 3.333.265 4.251.365.492.062.852.094.998.126.098 0 .18.037.246.037a12.68 12.68 0 0 0 1.813.128 11.247 11.247 0 0 0 11.103-9.463c.098-.625.145-1.231.145-1.803 0-5.445-3.938-10.218-9.465-11.099-.229-.033-6.279-.982-14.845-.982-7.343 0-16.777.654-26.915 3.089-11.119 2.667-23.153 7.573-33.847 16.465-10.694 8.862-19.703 21.748-24.493 39.012-1.405 4.991-2.469 10.335-3.171 16.044a64.153 64.153 0 0 1-1.93 9.891c-2.598 9.12-6.508 14.618-11.266 18.621-6.98 5.873-17.038 8.424-28.222 8.487h-.704c-5.576 0-11.316-.618-16.742-1.537l-3.206-.554-.982 3.104c-1.6 4.923-3.008 9.844-4.314 14.718l-1.015 3.894 3.958.749c6.901 1.243 14.47 2.161 22.271 2.161zm-9.86-35.843c11.872-.95 21.763-6.016 28.631-13.309 6.85-7.197 10.824-16.027 13.276-24.741 3.007-10.773 3.811-21.731 3.811-30.984 0-1.928-.05-3.759-.081-5.492-.05-1.426-.133-2.745-.199-3.993l-.292-4.705 6.326-2.292c10.58-3.86 22.059-7.13 34.256-9.252 5.46-.982 9.32-5.725 9.32-11.086 0-.654-.065-1.309-.179-1.932l-3.681.623 3.681-.656a11.267 11.267 0 0 0-13.097-9.141c-4.349.772-8.65 1.685-12.851 2.698l-1.048.232-.719.751a299.982 299.982 0 0 0-19.852 21.879l-2.45 2.973-.018-.228-1.978 2.615-4.317 5.234.506-.164-.328.423a319.114 319.114 0 0 0-15.647 22.63l-.456.723-.098.882c-.475 4.182-1.209 8.338-2.289 12.161-2.388 8.603-6.312 15.015-11.577 18.347-.917.56-1.962 1.082-3.155 1.589l-1.341.556-.605 1.308c-2.715 5.737-5.265 11.492-7.586 17.25l-2.242 5.591 6.018-.491a7.82 7.82 0 0 0 .261.001zM289.603 62.271c10.907 2.616 21.779 6.117 31.343 10.499 1.507.72 3.125 1.016 4.712 1.016 4.251 0 8.339-2.424 10.218-6.544a11.25 11.25 0 0 0 1.046-4.711c0-4.266-2.437-8.339-6.54-10.235-2.648-1.208-5.312-2.318-7.996-3.4l-.357-.132-.395-.047c-5.705-.982-11.51-1.453-17.396-1.453-10.367 0-20.944 1.468-31.607 4.214l.297 7.311c5.459.963 11.05 2.109 16.675 3.482zM113.504 383.629c47.399 0 81.691-9.875 106.296-25.001 31.527-19.322 46.11-46.858 52.292-69.213 4.037-14.485 4.806-26.88 4.806-34.368 0-4.363-.294-7.294-.294-7.356v-.195c-.621-5.789-5.494-10.071-11.216-10.071-.36 0-.785.031-1.343.094-5.639.625-9.922 5.493-9.922 11.187 0 .295.015.622.048.982v.032l.031.193c0 .065.182 1.997.182 5.04 0 5.898-.639 16.414-3.989 28.386-5.282 18.505-16.498 40.12-42.4 56.097-20.273 12.51-50.228 21.698-94.522 21.698-5.854 0-11.954-.163-18.315-.491l-5.102-.264 1.295 4.942a163.076 163.076 0 0 0 4.938 15.627l.881 2.324 2.485.101c4.727.195 9.321.258 13.801.258h.048zM346.977 83.723s.035 0 .102.032l.242.101c.065.015.146.063.213.095 3.207 1.372 18.938 8.353 36.203 19.687a286.5 286.5 0 0 1 10.039 6.966l5.363-5.002c-9.942-15.67-22.5-29.252-37.479-39.929l-.293-.197-.312-.147c-3.287-1.537-5.38-2.403-5.38-2.403-1.488-.624-2.959-.919-4.382-.919a11.269 11.269 0 0 0-10.413 6.999 10.899 10.899 0 0 0-.869 4.287 11.311 11.311 0 0 0 6.966 10.43zm18.904 229.5c-8.994-38.309-21.911-62.592-22.205-63.146l-3.303 1.717 3.303-1.749a11.31 11.31 0 0 0-9.959-5.967c-1.783 0-3.612.423-5.314 1.356-3.775 2.013-5.95 5.916-5.95 9.94 0 1.769.425 3.597 1.325 5.266l.096.194.05.068c1.392 2.694 13.033 25.945 20.799 60.854 4.056 18.22 7.031 39.57 7.079 62.87l.016 10.124 6.557-7.688c5.102-5.984 9.958-12.194 14.633-18.637l.789-1.062-.082-1.358a319.421 319.421 0 0 0-7.834-52.782zm9.696-80.807c-25.722-40.072-61.023-55.937-83.391-62.163a147.024 147.024 0 0 0-14.226-3.237c-1.88-.327-3.417-.561-4.595-.686-.573-.1-1.08-.164-1.471-.233-.198-.031-.326-.062-.442-.062h-.1c-7.667-1.39-14.535-2.059-20.814-2.059-7.079 0-13.488.85-19.292 2.549-9.679 2.81-17.464 8.143-23.201 14.745-9.925 11.545-14.161 25.64-18.363 39.017-3.124 10.103-6.114 20.01-10.316 28.55-3.157 6.475-6.917 12.129-11.839 16.936-7.392 7.146-17.445 12.771-34.124 15.517-5.967.934-12.754 1.49-20.472 1.49-6.491 0-13.604-.392-21.421-1.179l-3.597-.36-.489 3.565a257.967 257.967 0 0 0-1.601 15.174l-.26 3.633 3.627.374c8.503.866 16.384 1.294 23.71 1.294 22.138 0 39.341-3.86 52.961-10.857 17.493-9.01 27.911-23.09 34.5-37.232 4.956-10.594 8.094-21.339 11.102-31.037 2.255-7.271 4.448-13.948 6.966-19.438 1.912-4.119 3.99-7.57 6.327-10.303 3.614-4.12 7.374-6.803 13.88-8.551 3.207-.833 7.131-1.357 11.904-1.357 4.743 0 10.285.491 16.779 1.685.947.147 1.763.278 2.826.411 3.222.471 8.765 1.337 15.942 3.332 19.067 5.398 48.464 18.395 70.54 52.669 13.635 21.271 24.703 51.194 28.072 93.51l.963 12.131 6.02-10.577a283.727 283.727 0 0 0 12.441-24.658l.443-.998-.164-1.113c-5.331-33.833-15.763-60.138-28.825-80.482zm-39.228 92.777c-.063-.605-.13-1.114-.163-1.441 0-.164-.033-.295-.047-.357v-.064l-.033-.201a11.269 11.269 0 0 0-11.152-9.76c-.457 0-.965.017-1.52.117v-.015c-5.658.765-9.762 5.607-9.762 11.163.016.459.016.981.114 1.553 0 0 0 .068.015.232.246 1.848 1.194 10.546 1.194 23.088 0 15.711-1.487 37.625-7.716 59.729a168.073 168.073 0 0 1-7.426 20.991l-5.051 11.646 10.546-7.034a231.838 231.838 0 0 0 22.172-16.79l.868-.738.327-1.077c.063-.279.145-.575.226-.881 6.951-24.853 8.586-48.597 8.586-65.767 0-7.916-.329-14.454-.688-19.032a221.243 221.243 0 0 0-.49-5.362zm-27.241-192.06a11.336 11.336 0 0 0-4.446-.93 11.249 11.249 0 0 0-10.366 6.818 11.12 11.12 0 0 0-.916 4.446c0 4.353 2.551 8.519 6.817 10.368l1.064.459c39.895 17.443 67.822 42.771 88 72.497 9.354 13.817 17.006 28.65 23.219 44.019l4.314 10.679 2.779-11.171a257.674 257.674 0 0 0 5.053-25.967l.182-1.155-.523-1.036c-22.433-44.765-58.635-84.745-115.177-109.027zm-10.889 238.692c0-5.396-3.891-10.155-9.385-11.084a12.068 12.068 0 0 0-1.914-.163c-5.394 0-10.152 3.893-11.067 9.383-1.358 7.881-2.681 16.451-5.103 25.148-2.879 10.104-7.161 20.392-14.684 30.283-8.862 11.509-22.333 22.775-44.408 32.044l1.407 7.194h1.961c12.852 0 25.574-1.827 38.03-5.297l.72-.195.588-.461c7.883-6.178 14.373-12.785 19.59-19.618 9.681-12.653 15.106-25.868 18.477-37.87 2.879-10.33 4.316-19.846 5.623-27.436.116-.653.165-1.308.165-1.928zm-48.577 43.233c1.686-2.06 2.501-4.61 2.501-7.083 0-3.252-1.455-6.554-4.187-8.762a11.348 11.348 0 0 0-7.08-2.503c-3.27 0-6.555 1.442-8.778 4.204-6.265 7.717-12.804 13.588-22.076 18.544-13.767 7.388-34.435 12.573-68.118 14.563l-10.253.592 8.26 6.146c7.292 5.365 15.271 9.893 23.839 13.503l.916.38.997-.115c3.189-.375 6.294-.803 9.271-1.278 18.853-2.94 33.567-7.487 45.687-13.911 12.129-6.426 21.385-14.779 29.021-24.28zm60.676-121.586l-3.597-1.015 3.597.998a137.114 137.114 0 0 0 4.727-27.061c.246-3.464.375-6.77.375-9.991 0-14.144-2.435-25.818-7.13-35.266-5.753-11.646-15.302-19.524-26.111-22.468a41.905 41.905 0 0 0-11.329-1.535c-10.318 0-20.472 3.595-29.27 9.547-12.067 8.174-22.04 21.11-26.587 37.28a71.454 71.454 0 0 0-2.614 19.229c0 1.177.033 2.386.082 3.627.046.982.082 1.997.082 3.01 0 5.103-.654 9.58-1.765 13.541-1.865 6.655-5.005 11.904-9.404 16.577-7.586 8.097-19.438 14.096-33.402 17.925-16.763 4.642-36.251 6.11-53.452 6.11-4.252 0-8.39-.095-12.279-.229-4.546-.194-8.797-.438-12.657-.748l-4.251-.297.231 4.235c.26 5.25.718 10.414 1.389 15.484l.374 3.041 3.073.228c7.099.46 15.304.818 24.135.818 7.488 0 15.436-.264 23.53-.912 19.013-1.576 38.964-5.234 56.311-13.558 8.667-4.173 16.694-9.563 23.367-16.63 6.705-7.045 11.903-15.764 14.747-25.967 1.702-6.079 2.585-12.654 2.585-19.65 0-1.342-.034-2.716-.1-4.088-.032-.852-.064-1.686-.064-2.519 0-4.696.637-9.059 1.765-13.114 3.041-10.89 9.811-19.524 17.496-24.72 5.675-3.861 11.657-5.709 16.759-5.694 1.863 0 3.58.232 5.151.687 4.708 1.441 8.534 4.118 12.034 10.857 2.748 5.43 4.792 13.736 4.792 25.281 0 2.583-.116 5.329-.312 8.239a115.13 115.13 0 0 1-3.989 22.645c-10.578 37.902-40.582 69.574-81.444 89.129-27.795 13.312-60.482 20.834-94.752 20.834h-2.518l-6.523-.032 3.252 5.624c3.108 5.393 6.542 10.563 10.335 15.4l1.144 1.489 1.897-.085c34.812-.977 67.987-9.089 96.912-22.903 45.369-21.698 80.608-57.848 93.408-103.353z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fire.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fire.svg
deleted file mode 100644
index b0811f59f0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fire.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M288.311 65.344S132.49 123.676 132.49 286.369c0 111.828 49.936 146.785 90.839 157.717-10.693-5.025-20.893-16.164-20.893-40.924 0-45.586 44.824-61.936 44.824-61.936-11.688 24.494-1.173 33.389 9.825 43.461 14.635-18.652 19.415-36.57 3.575-79.654 0 0 70.424 29.889 55.853 99.934-4.674 22.475-17.8 34.857-32.061 41.689 36.017-9.098 95.059-44.814 95.059-116.504 0-129.111-161.659-113.22-91.2-264.808zm26.958 60.48c2.841 20.068 1.008 33.783-3.618 43.971 7.246 9.438 16.863 18.477 27.374 28.344 6.532 6.137 13.408 12.594 20.178 19.631-.889-59.202-43.934-91.946-43.934-91.946z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-firewall.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-firewall.svg
deleted file mode 100644
index b857e4349e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-firewall.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M309.135 167.681h58.909v-52.798H226.546v52.798h58.909zm-106.269 23.681h-58.911v52.799h141.5v-52.799h-58.909zM61.365 167.681h141.501v-52.798H61.365zm82.59 152.957h58.911v-52.799H61.365v52.799h58.908zm-82.59 23.678h58.908v52.801H61.365zm0-152.954h58.908v52.799H61.365zm330.36-76.479h58.91v52.798h-58.91zm0 152.956h58.91v52.799h-58.91zm-106.27 76.477h-141.5v52.801h141.5zm165.18-152.954h-141.5v52.799h141.5zm-141.5 129.276h58.909v-52.799H226.546v52.799h58.909zm141.5 23.678h-141.5v52.801h141.5z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-firewire.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-firewire.svg
deleted file mode 100644
index 64807e9110..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-firewire.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.516 171.172c-40.747 0-73.777 32.919-73.777 73.533 0 40.615 33.03 73.536 73.777 73.536 40.749 0 73.77-32.921 73.77-73.536-.001-40.614-33.021-73.533-73.77-73.533zm0 114.715c-22.816 0-41.315-18.441-41.315-41.182 0-22.737 18.499-41.183 41.315-41.183 22.812 0 41.317 18.445 41.317 41.183 0 22.74-18.505 41.182-41.317 41.182zm-48.689 97.067h97.378v-32.362h-97.378v32.362zm0 64.719h97.378v-32.36h-97.378v32.36zm-14.958-335.035l-68.856 68.631 22.948 22.885 68.862-68.644-22.954-22.872zm-45.908-45.379l-68.854 68.636 22.954 22.882 68.86-69.024-22.96-22.494zm230.005-2.939l-75.585 75.346 60.131 59.566 75.588-74.598-60.134-60.314z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flag-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flag-alt.svg
deleted file mode 100644
index 16d5b65bb6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flag-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M37.553 117.548l156.364 378.05 43.967-18.185L81.514 99.354l-43.961 18.194zm343.391-27.381s-62.443 85.464-154.828-6.919v.168c-65.885-67.603-123.106 9.303-123.106 9.303l92.72 222.697s38.514-109.396 154.827 6.918v-.171c65.883 67.598 123.107-9.305 123.107-9.305l-92.72-222.691z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flag.svg
deleted file mode 100644
index 3665770b99..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flag.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M55.219 470.836V61.716h47.573v409.12H55.219zm215.927-187.563c-89.417-82.084-142.544-5.493-142.544-5.493V62.243S246.557-1.668 299.786 96.379l.005-.142c79.278 129.027 153.979 61.767 153.979 61.767S360.562 365.36 271.146 283.273z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flash.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flash.svg
deleted file mode 100644
index f37a9e3483..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flash.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M397.716 32.021L113.524 286.598h94.996l-94.996 193.177 284.192-254.581H302.72z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flashlight.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flashlight.svg
deleted file mode 100644
index 4610c03a5b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flashlight.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M394.049 117.916c-23.246-23.244-51.133-37.123-74.594-37.123-12.814 0-23.775 4.18-31.688 12.092-3.967 3.969-6.955 8.635-8.984 13.855l-38.723 86.393L97.07 336.125c-21.754 21.752-21.754 57.018 0 78.768 10.875 10.877 25.129 16.314 39.385 16.314 14.254 0 28.51-5.438 39.385-16.314l142.99-142.99 87.449-39.197c.195-.086.402-.191.609-.293 4.578-2.004 8.693-4.721 12.188-8.215 23.162-23.161 12.401-68.854-25.027-106.282zm-74.594-5.297c11.201 0 31.568 7.279 52.088 27.803 25.938 25.939 32.242 54.055 25.027 61.268-2.291 2.293-6.256 2.773-9.18 2.773h-.002c-11.201 0-31.564-7.281-52.086-27.805-12.516-12.51-21.941-27.225-25.871-40.369-2.844-9.527-2.521-17.531.844-20.895 2.291-2.292 6.258-2.775 9.18-2.775z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flowerpot.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flowerpot.svg
deleted file mode 100644
index 0524daab90..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-flowerpot.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M260.094 173.309c22.761 0 41.236-18.463 41.236-41.238 0-22.764-41.236-92.594-41.236-92.594s-41.236 69.83-41.236 92.594c-.001 22.775 18.442 41.238 41.236 41.238zm-28.188 45.095c10.398-10.4 10.398-27.257 0-37.674-10.399-10.383-61.122-23.465-61.122-23.465s13.082 50.738 23.481 61.139c10.401 10.365 27.241 10.365 37.641 0zm56.182 0c10.398 10.364 27.271 10.364 37.672 0 10.398-10.4 23.446-61.139 23.446-61.139s-50.72 13.082-61.118 23.465c-10.401 10.417-10.401 27.274 0 37.674zm-16.092 63.932v-95.984h-24.918v95.984h-104.71v62.442H369.12v-62.442h-97.124zm-87.673 190.127h142.875l24.917-106.312H159.372l24.951 106.312z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder-open.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder-open.svg
deleted file mode 100644
index 44de932cfd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder-open.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M455.482 339.613c1.043-31.146 16.383-86.462 16.383-86.462 0-8.433-6.035-15.438-14.018-16.967V126.918h-.006c-.027-8.96-7.293-16.211-16.256-16.211H235.937c-6.429-.156-11.382-11.842-11.382-16.307l.001-1.906c0-9.542-7.736-17.28-17.28-17.28H97.799c-9.543 0-17.279 7.738-17.279 17.28l.004 1.906c0 4.497-5.023 16.32-11.518 16.32h.154c-8.844.159-15.965 7.366-15.965 16.246l.005 109.227c-7.955 1.549-13.963 8.547-13.963 16.958 0 0 14.659 55.928 15.704 87.071 1.042 31.149-5.132 78.361-5.132 78.361 0 9.539 1.973 17.277 11.513 17.277H449.78c9.544 0 11.515-7.738 11.515-17.277-.001.001-6.856-47.825-5.813-78.97zM73.23 235.869v-88.924h364.584v88.924H73.23z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder-outline.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder-outline.svg
deleted file mode 100644
index 77059225c7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder-outline.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M450.962 169.833v-19.248c0-23.398-19.035-42.436-42.434-42.436H257.306c-5.885-16.926-21.99-29.1-40.885-29.1h-89.758c-20.545 0-37.795 14.391-42.191 33.623-13.891 7.016-23.486 21.45-23.486 37.912V169.897c-7.148 7.774-11.443 18.122-11.443 29.287v.956l.062.953c.045.704 4.639 70.713 5.469 95.492l3.137 93.62c.033 6.024.682 14.788 5.271 23.301 6.564 12.175 19.002 19.442 33.273 19.442h318.49c14.273 0 26.713-7.268 33.275-19.445 4.588-8.512 5.236-17.275 5.271-23.298l3.135-93.62c.832-24.782 5.424-94.788 5.471-95.492l.061-.953v-.956c0-11.203-4.314-21.574-11.496-29.351zM90.093 150.585c0-7.281 5.84-13.189 13.09-13.318h-.125c5.324 0 9.441-9.694 9.441-13.382l-.006-1.562c0-7.824 6.344-14.168 14.17-14.168h89.758c7.826 0 14.166 6.344 14.166 14.168v1.562c0 3.663 4.062 13.239 9.332 13.37h168.609c7.363 0 13.328 5.969 13.328 13.33v9.201H90.093v-9.201zm337.744 145.028c-.854 25.538-3.15 94.062-3.15 94.062 0 7.825-1.617 14.171-9.441 14.171H96.755c-7.822 0-9.439-6.346-9.439-14.171l-3.152-94.062c-.855-25.538-5.516-96.428-5.516-96.428 0-6.893 4.926-12.631 11.445-13.9l331.764-.009c6.547 1.251 11.494 6.998 11.494 13.909 0 .001-4.657 70.89-5.514 96.428z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder.svg
deleted file mode 100644
index ce20ed705e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folder.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M457.211 169.501v-.316H52.564v.328c-7.956 1.548-13.959 8.547-13.959 16.955 0 0 5.683 86.463 6.726 117.611 1.045 31.147 3.844 114.728 3.844 114.728 0 9.544 1.973 17.281 11.514 17.281h388.458c9.543 0 11.514-7.737 11.514-17.281 0 0 2.804-83.58 3.845-114.728 1.044-31.147 6.727-117.611 6.727-117.611-.002-8.433-6.036-15.442-14.022-16.967zm0-42.313c0-8.98-7.277-16.256-16.258-16.256H235.305c-6.43-.161-11.384-11.842-11.384-16.311l.003-1.902c0-9.546-7.737-17.28-17.28-17.28H97.168c-9.544 0-17.281 7.734-17.281 17.28l.004 1.902c0 4.5-5.021 16.322-11.517 16.322h.155c-8.844.157-15.965 7.364-15.965 16.244v11.223h404.647v-11.222z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folders.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folders.svg
deleted file mode 100644
index 08875280e9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-folders.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M451.42 99.773l-170.92.004c-4.949-.125-8.762-9.12-8.762-12.559V85.75c0-7.349-5.959-13.309-13.311-13.309h-84.32c-7.35 0-13.307 5.96-13.307 13.309l.002 1.469c0 3.44-3.82 12.445-8.777 12.562h-12.273c-6.123 1.194-10.752 6.583-10.752 13.061 0 0 .779 11.868 1.742 27.377a13.282 13.282 0 0 1 3.758-.547h84.318c7.352 0 13.309 5.959 13.309 13.309v1.469c0 3.438 3.814 12.434 8.766 12.559l170.92-.005c6.15 1.175 10.799 6.574 10.799 13.067 0 0-4.377 66.594-5.184 90.587-.271 8.174-.705 21.039-1.154 34.445h28.936c7.352 0 8.869-5.96 8.869-13.31 0 0 2.156-64.377 2.961-88.366.803-23.992 5.18-90.585 5.18-90.585-.001-6.495-4.648-11.894-10.8-13.069zm-79.217 134.459l-170.922.004c-4.951-.125-8.76-9.119-8.76-12.559v-1.469c0-7.35-5.961-13.31-13.312-13.31H94.891c-7.35 0-13.311 5.96-13.311 13.31l.002 1.469c0 3.441-3.818 12.447-8.779 12.561H60.535c-6.127 1.194-10.754 6.583-10.754 13.061 0 0 4.379 66.593 5.182 90.586.807 23.989 2.961 88.364 2.961 88.364 0 7.352 1.52 13.31 8.871 13.31H365.99c7.35 0 8.871-5.958 8.871-13.31l2.959-88.364c.805-23.993 5.182-90.586 5.182-90.586 0-6.492-4.648-11.893-10.799-13.067z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-font.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-font.svg
deleted file mode 100644
index 91689c5b49..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-font.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M294.768 47.514h98.208l58.981 415.973h-94.258l-8.748-85.508H195.713l-46.846 85.508h-90.87L294.768 47.514zm-60.392 258.784h105.545L322.707 142.62l-88.331 163.678z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-food.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-food.svg
deleted file mode 100644
index d39b58346a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-food.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M101.354 398.936c-5.464 5.477-8.207 12.592-8.207 19.769 0 7.159 2.743 14.288 8.207 19.767 5.461 5.474 12.591 8.193 19.751 8.193 7.096 0 14.094-2.647 19.588-7.982L250.67 300.814l-24.036-27.176-125.28 125.298zM450.868 78.54l-14.551-14.585-176.065 176.049 55.036 48.645a22.422 22.422 0 0 0 4.186-3.206l131.395-173.971c5.231-5.214 6.835-10.513 6.835-16.463-.001-5.986-2.257-11.923-6.836-16.469zM232.029 228.445l14.129-14.127c7.521-7.523 5.722-21.549-4.057-31.344l-115.73-115.73-14.258 14.221 102.288 102.277-14.551 14.565L97.562 96.035l-14.945 14.916L184.908 213.24l-14.588 14.555L68.064 125.531 53.837 139.76l115.765 115.743c9.777 9.782 23.808 11.599 31.329 4.071l14.126-14.127 170.538 193.108c5.463 5.36 12.526 8.041 19.623 8.041 7.195 0 14.323-2.712 19.784-8.19 5.494-5.476 8.175-12.59 8.175-19.766a27.938 27.938 0 0 0-8.044-19.656L232.029 228.445z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-footprints.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-footprints.svg
deleted file mode 100644
index 118b8dc44f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-footprints.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M222.201 224.715l75.529-57.061c26.902-26.9 50.41-92.838 31.727-111.521-18.684-18.682-83.99 5.454-110.891 32.354l-57.057 75.533c-1.562 14.544 45.491 62.322 60.692 60.695zm-92.66-28.992l-20.896 20.899c-20.715 20.713-12.348 45.014 2.037 59.4 14.385 14.385 38.203 22.268 58.918 1.555l20.896-20.9c9.26-9.255-51.697-70.21-60.955-60.954zm279.531 32.692c-18.682-18.683-83.988 5.455-110.889 32.352l-57.059 75.536c-1.561 14.542 45.492 62.321 60.693 60.692l75.527-57.06c26.904-26.901 50.412-92.838 31.728-111.52zM209.158 368.003l-20.898 20.9c-20.713 20.711-12.348 45.012 2.037 59.4 14.387 14.388 38.205 22.269 58.918 1.553l20.898-20.897c9.258-9.255-51.697-70.212-60.955-60.956z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-forking.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-forking.svg
deleted file mode 100644
index 441dead254..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-forking.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M369.825 368.683V236.7H318.68v131.982h-48.006l73.546 89.146 73.611-89.146h-48.006zM193.956 333.76c-.13-2.028.981-7.849 3.206-13.019 2.092-5.265 5.46-10.135 6.933-11.489l140.619-140.605c8.205-8.352 13.701-17.886 17.986-28.09 4.183-10.232 7.029-20.863 7.126-32.571V53.801h-51.145v54.185c.064 1.995-1.013 7.833-3.237 13.017-2.094 5.231-5.428 10.132-6.902 11.475L167.926 273.096c-8.208 8.337-13.704 17.885-18.018 28.059-4.154 10.268-7.033 20.863-7.098 32.605v34.923H94.771l73.578 89.146 73.58-89.146h-47.974V333.76z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-frame-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-frame-alt.svg
deleted file mode 100644
index 24c8834c55..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-frame-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M409.529 131.667l51.144-51.165H50.528l51.146 51.165h307.855zm-320.183 12.34L38.2 92.867v325.935l51.146-51.162V144.007zm12.328 235.979L50.528 431.15h410.145l-51.144-51.164H101.674zm320.199-235.979V367.64l51.129 51.162V92.867l-51.129 51.14z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-frame.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-frame.svg
deleted file mode 100644
index 6d48f3165d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-frame.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M429.714 386.966c-3.01-2.262-5.493-7.262-5.493-11.151V138.348c0-3.906 2.483-8.942 5.493-11.169 0 0 17.526-13.042 17.526-26.894 0-18.723-17.265-33.896-38.586-33.896-11.25 0-22.663 7.326-22.663 7.326-3.142 2.024-8.765 3.695-12.459 3.695h-34.796c-3.694 0-9.287-1.671-12.461-3.695 0 0-15.73-10.04-29.822-10.04h-2.943c-3.171.391-7.979-1.406-10.692-4.039 0 0-14.422-13.848-29.466-13.848-15.108 0-29.527 13.963-29.527 13.963-2.75 2.616-7.817 4.413-11.284 3.924h-3.335c-14.062 0-29.791 10.04-29.791 10.04-3.172 2.024-8.797 3.695-12.49 3.695h-28.29c-3.663 0-9.286-1.671-12.427-3.695 0 0-11.411-7.326-22.661-7.326-21.322 0-38.59 15.173-38.59 33.896 0 13.852 17.53 26.894 17.53 26.894 3.01 2.227 5.461 7.263 5.461 11.169v237.467c0 3.89-2.451 8.858-5.461 11.151 0 0-17.53 13.06-17.53 26.913 0 18.705 17.268 33.878 38.59 33.878 12.59 0 25.278-9.436 25.278-9.436 3.041-2.241 8.504-4.069 12.199-4.069h22.204c3.696 0 9.188 1.864 12.165 4.151 0 0 17.657 13.505 33.812 13.505 4.843 0 7.357-.495 7.357-.495 3.632-.73 8.962.658 11.871 3.061 0 0 13.604 11.366 27.305 11.366 13.181 0 26.425-10.431 26.425-10.431 2.942-2.339 8.011-3.926 11.216-3.501h3.074c16.156 0 33.812-13.505 33.812-13.505 3.01-2.287 8.471-4.151 12.166-4.151h28.712c3.693 0 9.19 1.828 12.198 4.069 0 0 12.719 9.436 25.312 9.436 21.321 0 38.586-15.173 38.586-33.878.001-13.854-17.525-26.913-17.525-26.913zm-57.653-13.195H136.148V137.858H372.06v235.913z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fullscreen-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fullscreen-alt.svg
deleted file mode 100644
index c2145c8171..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fullscreen-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M182.367 280.869l-90.338 90.344-56.066-56.068V474.89h159.739l-56.883-56.887 90.341-90.351-46.793-46.783zM311.836 38.456l56.877 56.882-90.337 90.347 46.792 46.785 90.336-90.341 56.068 56.073V38.456H311.836z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fullscreen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fullscreen.svg
deleted file mode 100644
index a63101cfe0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-fullscreen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M368.432 110.765l32.367 32.362 34.896-34.898 36.539 36.539V38.783H366.256l37.075 37.077-34.899 34.905zm66.725 293.309l-34.901-34.899-32.37 32.368 34.9 34.899-36.534 36.536h105.986V366.996l-37.081 37.078zm-294.656-3.081l-32.37-32.365-34.898 34.902L36.7 366.993v105.985h105.979l-37.079-37.08 34.901-34.905zm-31.828-258.41l32.373-32.365-34.903-34.899 36.538-36.536H36.698v105.978l37.08-37.075 34.895 34.897zm278.314 157.969v-86.92c0-35.993-29.179-65.169-65.17-65.169H186.109c-35.991 0-65.171 29.177-65.171 65.169v86.92c0 35.993 29.18 65.168 65.171 65.168h135.708c35.992 0 65.17-29.175 65.17-65.168z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-game.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-game.svg
deleted file mode 100644
index 78797b5601..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-game.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M454.236 216.826c-15.591-63.937-37.193-130.498-114.285-119.559-29.741 4.225-52.243 21.667-85.431 21.748-27.735.068-49.462-17.447-74.949-21.748-77.019-13-95.274 23.888-117.649 92.658-12.649 38.879-53.044 172.948-7.13 205.048 46.521 32.523 97.305-56.955 132.316-70.582 30.235-11.771 95.289-10.754 125.098-1.759 40.438 12.205 80.27 89.49 125.837 79.315 62.395-13.929 25.631-146.431 16.193-185.121zm-291.233 56.445c-33.544-.006-60.718-27.183-60.722-60.722.004-33.542 27.178-60.717 60.722-60.72 33.541.003 60.715 27.178 60.719 60.72-.004 33.54-27.178 60.717-60.719 60.722zM352.23 162.083c6.938-6.937 18.184-6.937 25.121 0 6.934 6.934 6.933 18.182-.002 25.116-6.938 6.938-18.181 6.938-25.119.003-6.936-6.937-6.936-18.183 0-25.119zm-33.81 58.931c-6.938-6.941-6.938-18.186 0-25.119 6.937-6.938 18.184-6.938 25.12 0 6.935 6.934 6.933 18.178-.002 25.115-6.936 6.934-18.182 6.937-25.118.004zm57.737 32.615c-6.937 6.937-18.183 6.937-25.119 0-6.937-6.935-6.933-18.182.002-25.116 6.937-6.937 18.184-6.94 25.117-.004 6.937 6.938 6.937 18.185 0 25.12zm33.812-33.808c-6.938 6.937-18.183 6.937-25.119 0-6.937-6.938-6.934-18.183.002-25.12 6.937-6.937 18.182-6.937 25.117 0 6.937 6.935 6.937 18.182 0 25.12zm-246.966-42.959c-19.707.04-35.649 15.982-35.684 35.688.034 19.704 15.977 35.649 35.684 35.686 19.702-.037 35.647-15.982 35.684-35.686-.037-19.705-15.982-35.648-35.684-35.688z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-geometry.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-geometry.svg
deleted file mode 100644
index c7ed79e0a1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-geometry.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M473.329 395.598l-62.49-49.281v33.979H131.466l-.229-279.599h33.977l-49.312-62.493-49.283 62.493h33.946v279.599H39.181v30.642h61.644v61.466h30.642v-61.466H410.84v33.978l62.489-49.318zM343.603 168.37H170.381v173.207h173.222V168.37z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-gift.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-gift.svg
deleted file mode 100644
index 4e2030a6f1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-gift.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M75.032 473.603h167.263v-186.06H75.032v186.06zm376.972-315.941h-98.111c6.963-3.576 13.174-7.346 18.679-11.301 21.239-15.16 32.416-34.379 32.378-53.484.012-15.646-7.432-29.458-18.176-38.812-10.775-9.414-25.022-14.967-40.336-14.99-16.318-.009-31.459 5.64-44.43 14.297-19.507 13.075-34.857 32.779-45.791 54.401a199.951 199.951 0 0 0-1.536 3.163c-4.003-8.333-8.658-16.398-13.919-23.972-9.249-13.19-20.371-24.897-33.392-33.592-12.974-8.661-28.115-14.303-44.429-14.297-16.226.057-31.074 6.869-42.202 17.332-11.077 10.466-18.858 25.202-18.9 41.922-.03 9.776 2.827 19.986 8.691 29.263 7.371 11.668 19.049 21.777 35.218 30.07H57.631c-11.747 0-21.273 9.523-21.273 21.274v78.88h205.937V157.662h25.041v100.154h205.941v-78.88c0-11.751-9.527-21.274-21.273-21.274zm-299.112-31.28c-8.311-5.219-13.363-10.498-16.311-15.179-2.93-4.716-3.94-8.843-3.965-12.874-.044-6.749 3.331-13.948 9.257-19.547 5.83-5.552 13.754-8.934 20.889-8.934h.18c9.152.007 18.271 3.103 27.365 9.14 13.593 8.983 26.413 24.746 35.363 42.625 4.572 9.032 8.145 18.585 10.552 27.899-41.212-4.263-67.922-13.378-83.33-23.13zm140.94-21.767c7.439-10.654 16.19-19.612 25.238-25.626 9.096-6.037 18.214-9.133 27.367-9.14h.096c7.671 0 14.942 2.942 19.958 7.364 5.059 4.501 7.669 9.887 7.683 15.664-.044 6.852-3.641 16.84-19.615 28.524-15.213 11.04-41.457 22.377-81.949 30.297 3.881-16.083 11.325-33.081 21.222-47.083zm-26.496 368.988H434.6v-186.06H267.336v186.06z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-github-fill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-github-fill.svg
deleted file mode 100644
index 9ad1d73e18..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-github-fill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12.001 2C6.47598 2 2.00098 6.475 2.00098 12C2.00098 16.425 4.86348 20.1625 8.83848 21.4875C9.33848 21.575 9.52598 21.275 9.52598 21.0125C9.52598 20.775 9.51348 19.9875 9.51348 19.15C7.00098 19.6125 6.35098 18.5375 6.15098 17.975C6.03848 17.6875 5.55098 16.8 5.12598 16.5625C4.77598 16.375 4.27598 15.9125 5.11348 15.9C5.90098 15.8875 6.46348 16.625 6.65098 16.925C7.55098 18.4375 8.98848 18.0125 9.56348 17.75C9.65098 17.1 9.91348 16.6625 10.201 16.4125C7.97598 16.1625 5.65098 15.3 5.65098 11.475C5.65098 10.3875 6.03848 9.4875 6.67598 8.7875C6.57598 8.5375 6.22598 7.5125 6.77598 6.1375C6.77598 6.1375 7.61348 5.875 9.52598 7.1625C10.326 6.9375 11.176 6.825 12.026 6.825C12.876 6.825 13.726 6.9375 14.526 7.1625C16.4385 5.8625 17.276 6.1375 17.276 6.1375C17.826 7.5125 17.476 8.5375 17.376 8.7875C18.0135 9.4875 18.401 10.375 18.401 11.475C18.401 15.3125 16.0635 16.1625 13.8385 16.4125C14.201 16.725 14.5135 17.325 14.5135 18.2625C14.5135 19.6 14.501 20.675 14.501 21.0125C14.501 21.275 14.6885 21.5875 15.1885 21.4875C19.259 20.1133 21.9999 16.2963 22.001 12C22.001 6.475 17.526 2 12.001 2Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-github-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-github-line.svg
deleted file mode 100644
index 61809ed342..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-github-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5.88401 18.6531C5.58404 18.4523 5.32587 18.1972 5.0239 17.8366C4.91473 17.7062 4.47283 17.1521 4.55811 17.258C4.09533 16.6831 3.80296 16.4168 3.50156 16.3087C2.9817 16.1223 2.7114 15.5497 2.89784 15.0298C3.08428 14.51 3.65685 14.2397 4.17672 14.4261C4.92936 14.696 5.43847 15.1609 6.12425 16.0141C6.03025 15.8972 6.46364 16.4408 6.55731 16.5526C6.74784 16.7802 6.88732 16.918 6.99629 16.9909C7.20118 17.128 7.58451 17.1871 8.14709 17.1308C8.17065 16.7487 8.24136 16.378 8.34919 16.0355C5.38097 15.3101 3.70116 13.3949 3.70116 9.63947C3.70116 8.4006 4.0704 7.28368 4.75917 6.34756C4.5415 5.45368 4.57433 4.37259 5.06092 3.15611C5.1725 2.87715 5.40361 2.66314 5.69031 2.57328C5.77242 2.54949 5.81791 2.5389 5.89878 2.52648C6.70167 2.40319 7.83573 2.69681 9.31449 3.62311C10.181 3.41855 11.0885 3.31476 12.0012 3.31476C12.9129 3.31476 13.8196 3.41835 14.6854 3.62253C16.1619 2.68976 17.2986 2.39625 18.1072 2.52627C18.1919 2.53988 18.2645 2.55758 18.3249 2.57741C18.6059 2.66967 18.8316 2.88155 18.9414 3.15611C19.4279 4.37232 19.4608 5.45319 19.2433 6.34695C19.9342 7.28313 20.3012 8.39184 20.3012 9.63947C20.3012 13.3966 18.627 15.3046 15.6588 16.0318C15.7837 16.4467 15.8496 16.9103 15.8496 17.4118C15.8496 18.0763 15.8471 18.7108 15.8424 19.4223C15.8412 19.6124 15.8397 19.8156 15.8375 20.1279C16.2129 20.2107 16.5229 20.5074 16.6031 20.9086C16.7114 21.4502 16.3602 21.977 15.8186 22.0853C14.6794 22.3132 13.8353 21.5535 13.8353 20.5608C13.8353 20.4705 13.836 20.3414 13.8375 20.1142C13.8398 19.8012 13.8412 19.5987 13.8425 19.4092C13.8471 18.7017 13.8496 18.0714 13.8496 17.4118C13.8496 16.7145 13.6664 16.26 13.4237 16.0508C12.7627 15.481 13.0977 14.3971 13.965 14.2996C16.9314 13.9663 18.3012 12.8174 18.3012 9.63947C18.3012 8.68484 17.9893 7.89547 17.3881 7.23534C17.1301 6.95209 17.0567 6.54634 17.199 6.19062C17.3647 5.77639 17.4354 5.2336 17.2941 4.57678L17.2847 4.57944C16.7928 4.71861 16.1744 5.01956 15.4261 5.52826C15.182 5.69413 14.8772 5.74377 14.5932 5.66388C13.7729 5.43319 12.8913 5.31476 12.0012 5.31476C11.111 5.31476 10.2294 5.43319 9.40916 5.66388C9.12662 5.74335 8.82344 5.69468 8.57997 5.53077C7.8274 5.02414 7.2056 4.72355 6.71079 4.58352C6.56735 5.23672 6.63814 5.77758 6.80336 6.19062C6.94565 6.54634 6.87219 6.95209 6.61423 7.23534C6.01715 7.89096 5.70116 8.69352 5.70116 9.63947C5.70116 12.8114 7.07225 13.9681 10.023 14.2996C10.8883 14.3969 11.2246 15.4767 10.5675 16.048C10.3751 16.2153 10.1384 16.7799 10.1384 17.4118V20.5608C10.1384 21.5472 9.30356 22.2866 8.17878 22.0898C7.63476 21.9946 7.27093 21.4764 7.36613 20.9324C7.43827 20.5201 7.75331 20.2114 8.13841 20.1274V19.1379C7.22829 19.1991 6.47656 19.0496 5.88401 18.6531Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-glasses.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-glasses.svg
deleted file mode 100644
index 72b7c8b05b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-glasses.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M294.842 181.664c2.749 2.751 7.262 2.751 10.008 0l22.661-22.711c2.782-2.729 7.262-2.729 10.039 0l40.52 40.565c2.746 2.73 2.746 7.246 0 9.992l-1.504 1.52c-2.749 2.748-2.749 7.247 0 9.993l5.396 5.376h66.351L337.55 115.623c-2.777-2.744-7.257-2.744-10.039 0l-44.343 44.362c-2.746 2.744-2.746 7.245 0 10.007l11.674 11.672zm-167.496 39.358c2.745-2.747 2.745-7.246 0-9.993l-1.537-1.52c-2.749-2.746-2.749-7.261 0-9.992l40.547-40.565c2.749-2.729 7.263-2.729 10.008 0l22.695 22.711c2.746 2.751 7.229 2.751 9.974 0l11.708-11.672c2.747-2.762 2.747-7.263 0-10.007l-44.377-44.362c-2.745-2.744-7.259-2.744-10.008 0L55.597 226.399h66.351l5.398-5.377zm332.738 34.612H51.083c-6.571 0-11.935 5.381-11.935 11.956v119.737c0 6.571 5.364 11.952 11.935 11.952h163.639c6.573 0 13.966-4.97 16.483-11.051l8.568-21c2.485-6.062 9.614-11.053 15.828-11.053 6.213 0 13.342 4.99 15.829 11.053l8.568 21c2.482 6.081 9.906 11.051 16.479 11.051h163.607c6.607 0 11.969-5.381 11.969-11.952V267.59c0-6.574-5.362-11.956-11.969-11.956zM210.57 328.74c0 21.014-17.038 38.051-38.062 38.051h-60.63c-21.028 0-38.067-17.037-38.067-38.051v-2.551c0-21.021 17.039-38.066 38.067-38.066h60.63c21.025 0 38.062 17.045 38.062 38.066v2.551zm226.819 0c0 21.014-17.037 38.051-38.062 38.051h-60.631c-21.025 0-38.066-17.037-38.066-38.051v-2.551c0-21.021 17.041-38.066 38.066-38.066h60.631c21.025 0 38.062 17.045 38.062 38.066v2.551z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-alt.svg
deleted file mode 100644
index b02f41ad97..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.585 38.541c-120.05 0-217.402 97.323-217.402 217.404 0 120.098 97.353 217.434 217.402 217.434 120.114 0 217.433-97.336 217.433-217.434 0-120.081-97.319-217.404-217.433-217.404zM240.28 159.799c-21.485-1.342-41.89-5.491-60.596-11.966 15.042-30.624 36.134-55.493 60.596-71.716v83.682zm0 30.71v50.116h-84.567c1.341-22.79 5.657-44.443 12.297-64.391 22.4 7.931 46.73 12.834 72.27 14.275zm0 80.758v49.605c-25.671 1.456-50.099 6.426-72.598 14.438-6.542-19.885-10.726-41.397-11.969-64.043h84.567zm0 80.331v84.86c-24.755-16.404-46.011-41.616-61.088-72.662 18.837-6.607 39.407-10.824 61.088-12.198zm30.642 0c21.681 1.374 42.25 5.592 61.085 12.198-15.074 31.046-36.361 56.298-61.085 72.694v-84.892zm0-30.726v-49.605h84.566c-1.243 22.646-5.43 44.158-11.969 64.043-22.467-8.012-46.927-12.982-72.597-14.438zm0-80.247v-50.116c25.507-1.44 49.869-6.344 72.271-14.274 6.638 19.947 10.921 41.601 12.262 64.391h-84.533zm0-80.826V76.117c24.494 16.223 45.553 41.092 60.596 71.682-18.706 6.475-39.11 10.658-60.596 12zm53.304-77.483a187.154 187.154 0 0 1 59.745 38.177 188.574 188.574 0 0 1-24.232 15.172c-9.614-19.914-21.581-37.88-35.513-53.349zM151.43 135.665a188.208 188.208 0 0 1-24.202-15.172c17.168-16.282 37.379-29.348 59.714-38.177-13.898 15.469-25.867 33.435-35.512 53.349zm-11.642 28.401c-8.174 23.789-13.245 49.579-14.685 76.559H69.514c2.94-36.316 16.349-69.773 37.18-97.271a214.553 214.553 0 0 0 33.094 20.712zM125.04 271.267c1.373 26.828 6.377 52.538 14.39 76.21-11.807 6.048-22.829 13.013-32.966 20.765-20.733-27.471-34.01-60.757-36.95-96.975h55.526zm25.962 104.724c9.484 19.818 21.291 37.771 35.026 53.274a187.478 187.478 0 0 1-59.093-38.135c7.423-5.491 15.435-10.609 24.067-15.139zm209.196 0a182.74 182.74 0 0 1 24.034 15.157 186.463 186.463 0 0 1-59.059 38.08c13.734-15.466 25.54-33.418 35.025-53.237zm11.577-28.514c8.01-23.672 12.979-49.348 14.386-76.21h55.528c-2.944 36.218-16.221 69.504-36.953 96.975-10.137-7.753-21.19-14.718-32.961-20.765zm14.321-106.852c-1.439-26.979-6.506-52.77-14.648-76.559a214.011 214.011 0 0 0 33.025-20.712c20.867 27.497 34.242 60.923 37.217 97.271h-55.594z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-asia.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-asia.svg
deleted file mode 100644
index 6a7334d5e8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-asia.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256 49.523C141.966 49.523 49.523 141.966 49.523 256c0 114.033 92.442 206.477 206.477 206.477 114.033 0 206.477-92.443 206.477-206.477S370.033 49.523 256 49.523zm125.396 82.687l-2.959-.668c5.191 7.278-18.457-1.57-24.64-.56l-1.833.362c-1.726 1.768-3.154 4.311-2.445 4.325.708.014-.635 7.567-4.043 9.482-3.406 1.915-3.896-1.846-1.092-8.358 2.805-6.512-4.687-6.033-4.687-6.033 6.618-2.779 6.237-4.107-.849-2.954 0 0-7.793 1.271-13.853.515-6.736-1.182-33.019 4.095-33.019 4.095-7.039 1.413-6.928 2.786.246 3.052 0 0 3.832.162 4.25 3.327.955-1.286 1.779-2.192 1.889-2.186.142.009 1.945 7.366 3.553 9.996 1.607 2.629 2.252 4.32 1.432 3.76l-.751-.077-4.392-.3c1.3 2.624 2.502 6.093 2.68 8.192.18 2.1 3.94 3.142 8.357 2.313l3.814-1.839c4.27-2.059 8.674-1.139 8.285 1.839.178-.271.408-.495.623-.484.392.022.318.737-.165 1.587l-.676-.033c-.011-.068-.018-.109-.024-.154-.359.888-1.076 1.909-2.262 3.057-2.572 2.49-8.127 3.148-12.407 4.794l-.427.227c-.201.095-.44.147-.656.229-1.75.8-3.197 1.824-3.969 3.325-2.284 4.439 1.605 11.432-1.096 16.299-2.717 4.894-10.279 4.955-15.008 7.309-3.557 1.771-13.704 6.729-20.097 6.324-.208.012-.612.03-1.409.07-.037-.123-.062-.191-.094-.287-.09-.023-.171-.054-.259-.078.002.033 0 .043.003.08l-3.319-.241c.345-.434.636-.861.905-1.28-.127-.143-.277-.255-.386-.418-.665-.987-.701-1.986-.347-2.948-.117-.059-.234-.114-.352-.184l.021-.359c.124-1.134.964-1.634 2.003-1.821.643-.615 1.402-1.182 2.201-1.693.356-3.067 16.803-6.602 18.139-6.715.084-.025 1.566-2.184 1.816-2.242-.742.636-.729 1.126.043 1.466l5.211.011c1.775-5.174 3.706-10.942 4.371-11.526.665-.585 1.658-.965 1.999-.885.342.08.491.083.423.068s-.351-.366-.625-.784l.246-.048c.576.016 1.205.804 1.76 1.775.393-1.849.588-3.766.646-5.725l-.473-.247c-3.111.814-4.631-.414-1.799 2.447-.946.939-2.003 1.334-3.172 1.183.29-1.139.066-2.112-.672-2.922l1.429-.646c.204-1.182.696-1.948.856-1.854.156.096.184.1.139.06-.045-.041.362.008.587-.004.226-.009 1.471-1.503 2.771-3.32l-.041-1.048c-.779-.613-.783-1.266-.012-1.953l.01.006c-.688-6.538-1.988-13.072-1.99-18.594-.545 1.304-1.412 2.833-2.795 4.684-4.936 6.282-10.241 21.516-21.234 21.543l-3.463-.131c-.197-1.186-7.388 2.03-10.229 4.018-2.844 1.99-6.82 13.326-7.465 16.237a180.087 180.087 0 0 0-.687 3.21c.011.621-.058 1.068-.146 1.201-.096.141-.031-.314.146-1.201a9.563 9.563 0 0 0-.31-2.226c-.434-1.647-.798-3.437-.797-3.647.002-.213 1.115-.668 1.361-1.04.244-.372-1.377-3.453-2.371-3.427-.994.028-2.69-.246-2.775-.627-.088-.379 1.021-2.154 1.037-2.849.014-.696-6.35-1.14-8.401-.553-2.052.586-2.771.157-1.595-.955l.039-1.25-.003-.373c-1.182-.612-5.118.238-8.202 1.877-3.084 1.64-2.741 4.739-2.12 5.892.622 1.15 2.528 2.506 3.089 2.426.561-.084 1.777-.943 2.084-1.851.306-.909 3.337.829 4.744 1.088 1.408.26-2.088 1.405-7.767 2.55l-.106 3.588.008 1.371c1.693.671 3.119 2.124 3.141 2.51.023.391.129.733.182.723.052-.009.037.011.018.037-.023.025-2.895 5.18-6.382 11.453l-16.095 25.52c-6.205 3.609-13.287 5.314-15.165 3.84-1.88-1.477-6.761-.708-10.849 1.705l-.09 4.955c.201 7.417 3.928 13.648 3.928 13.648 3.682 6.161 3.196 13.937-1.08 17.277l-1.164.01-.166-.004c-.07-.371-.642 1.145-1.364 1.816-.723.674-6.242-2.66-9.948-7.068-3.704-4.409-11.625-3.988-9.964.756 1.661 4.745 2.96 8.585 2.908 8.598-.052.014 4.745 3.324 10.663 7.359l.148 5.066-.031 3.251c1.598 3.097-11.453.091-13.141-5.574-1.688-5.663-2.922-12.699-2.643-13.587.281-.889.77-1.609.868-1.607.097.004-2.945-6.383-2.932-11.879.016-5.493-1.491-10.616-1.776-11.185-.285-.569-1.809 1.027-3.383 3.548l-2.913.045c-.829-.022-5.833-10.031-5.833-10.031-3.209-6.42-7.72-7.721-9.776-8.046-2.058-.323-10.375 8.512-15.474 12.611-5.101 4.098-9.066 14.358-9.051 16.97.018 2.613-2.86 6.514-3.73 8.295-.871 1.781-3.695-2.241-6.277-8.938l-3.947-7.445c-1.4-7.039-2.541-12.766-2.525-12.757.014.009.183-3.938.209-5.393.027-1.455-.518-1.046-1.211.911l-2.613.092-2.306.006c-.973-2.326-.044-4.618.331-5.162.375-.543-3.663-3.446-4.682-4.98-1.02-1.535-4.873-3.156-5.855-2.947-.979.211-2.16.694-2.232.824-.007.012-.079.013-.141.015C89.401 139.996 165.035 73.202 256 73.202c49.26 0 93.998 19.621 126.902 51.414.149 2.342-.291 4.859-1.506 7.594zM211.467 366.604c.3-.076.591.125.645.449l.047.259c3.131-.342 24.836-6.452 25.038-10.144l-.276-1.463c.916-1.262 2.484-1.233 2.77-.969.285.264 1.703-.719 1.705-1.351.002-.631 1.189-.663 1.574-.579.382.082 1.305-3 1.942-3.661.64-.663 4.758-1.706 5.535-2.202.778-.497 3.696-.018 4.022.896.326.915 1.589.905 2.088.803.498-.104 1.566.076 2.371.397l.142.123 4.107-5.617c3.394-1.622 5.408-3.402 4.479-3.957l-.212-1.107 4.262 2.711c4.631-.66 9.337-.764 10.463-.227l.014.617c-2.645 1.279-3.979 3.477-4.002 6.59-.021 1.695 11.45 6.785 13.762 6.655 8.244-.794 2.066-15.799 8.424-19.118l1.227 3.038c.804 3.489 2.79 6.621 4.416 6.959l.336.146c-.571-.367 10.82 17.274 10.854 17.478-.036-.123 6.647 5.383 7.507 6.109-.555 13.888-3.162 17.221-3.162 17.221a5071.487 5071.487 0 0 1-8.045 10.265c0-.005-3.824 1.267-8.496 2.821l-1.436 2.976c-5.838.659-16.056 2.099-18.153-5.477l-.997.478c-1.172.133-1.668-.512-1.535-.785.135-.275.039-.959-.213-1.52l-.367-.263-.178 1.422c-1.966.183-.876-1.295-.656-2.551.221-1.255-1.657.019-4.176 2.833l-2.137.143c-1.341-.01-5.586-6.127-8.701-6.539-7.062-.932-13.494 1.607-20.443 2.553-2.704.366-28.291 9.668-29.366 2.479-.026-2.251-1.241-5.72-1.241-5.72-2.371-6.773-4.041-12.776-3.938-12.97.104-.193.495.056.872.555 0 0 .006.006.295.155-.952-5.545-1.468-10.836-1.167-10.911zm-46.602-63.73l-.168-.24c-2.035-1.137-12.713-14.922-12.535-17.126 3.744.324 14.109 8.45 14.109 8.45 5.648 4.428 10.217 8.23 10.152 8.452l-.068.134.838-.168c.559.659.893 1.553.746 1.988l-.125.273c.084 3.445 6.201 10.14 6.682 15.518-.012 1.19-2.232 1.394-2.811 1.346-6.308-.886-9.307-6.672-9.307-6.672-3.303-6.371-6.683-11.751-7.513-11.955zm.524 6.368l-1.352-.769c-.354-1.254-.367-2.296-.029-2.314l.211.076c-.004 1.1.386 2.101 1.17 3.007zm-5.064-8.311c-.446-.646-.845-1.192-.868-1.187-.021.004.126-.042.329-.106l.124-.079c.66.456.862.942 1.108 1.538.248.596-.247.475-.693-.166zm23.219 8.771c-.466-.104-.116-.776.776-1.497h.592c1.887 1.227 2.877 2.826 2.971 4.795-1.762-.059-2.229-.718-2.994-2.233-.497-.878-.879-.962-1.345-1.065zm2.567 12.121l.49.087c4.494-.319 9.586 2.094 14.133 2.05l3.917.147c2.888.858 3.501 1.874 1.366 2.26l-.18-.07 1.758 1.503c4.533 1.186 7.844 2.664 7.562 2.88-.283.217-.949.018-1.48-.437l-1.355.058c-.256-.019-.078.789.027 1.028-4.447-1.715-15.619-4.348-15.619-4.348-6.986-1.646-11.765-3.965-10.619-5.158zm13.315-78.617c-3.799-.044-6.904-.752-6.902-1.039 0-.286 1.91-1.132 3.225-1.799 1.315-.666 2.941-.742 3.615-.169l-.006.429.068 2.578zm21.506 48.981c-.148.189 1.135 3.538 2.848 7.444l2.041.13a8.556 8.556 0 0 1-3.608 1.298l-6.753 13.085c-6.024-.006-11.342-.183-11.523-.318-.18-.136-.395-.825-.479-1.532l-.1-.323c-2.799-.402-7.938-.789-6.118-6.066-.59-1.556-2.956-2.631-3.206-5.287 0 2 15.719-11.057 15.719-11.057 5.521-4.586 10.605-6.973 12.721-5.293 2.113 1.682 3.268 4.06 2.586 4.174-.684.113-1.125.463-1.005.572.122.106-.66.725-1.513 1.086-.854.361-1.36 1.073-1.265 1.279.096.205-.199.618-.345.808zm-1.989 38.55l-.619 1.258c-.751-.537-1.377-1.428-1.379-1.639-.002-.21.333-.401.746-.429l.241.069c.422-.001.689.548 1.011.741zm9.651-77.535c1.807-5.647 4.75-9.798 4.916-9.294.168.503.906.539 1.644.083l.357-.172.084 4.916c-.839 3.068-1.081 7.827-.376 8.688.703.861 1.303 1.35 1.318 1.244.016-.109.387-.609.766-.75.379-.139 2.312.384 2.525 1.015.218.633.933 1.001 1.159.806.226-.2.685-.241.834-.206.149.033-.099.438-.553.901l-.054.375c.982-.158 1.732.27 2.252 1.281.08.616-.138 1.094-.658 1.433l-.941-1.804c-1.93-1.205-4.084-1.149-3.924-.822.16.326-1.742-.045-2.158-.641-.417-.594-1.754-.984-2.113-.811-.357.172-1.398-.18-2.313-.783l.037-.377c.729-.551 1.062-1.268.995-2.149-.68-.157-1.23.076-1.651.698-.356.009-2.433-1.437-2.417-1.896l.271-1.735zm4.427-30.564c3.243.297.331 9.559-2.567 9.824-4.733-.111-.43-9.596 2.567-9.824zm12.107 42.285c-.728-.425-.925-.952-.44-1.174l.259.012c.969-.025 1.334.081 1.78.21.447.13.762.642.734.862-.029.223.248.396.396.402.15.004.264.729.195 1.055-.07.329.062.807.291 1.063.232.255.131 1.105.004 1.35-.129.243-.844.418-1.592.386l-.438.029.723.836c.009 1.014-.357 1.81-.808 1.769l-.252.059-.411-.665c.04-.766-.976-1.739-1.187-2.099-.211-.357-.368-.863-.35-1.124l.04-.144.962.37c.708-.526.821-2.774.094-3.197zm2.794 7.603c.855.002 1.507.633 1.811.949l3.588 4.01c-1.913 3.959-3.939 6.609-4.184 6.021-.244-.583-.436-1.006-.441-.991-.005.012-.219-.244-.474-.569l-.156-.226-1.671.991c.865 1.406 1.145 3.479.765 3.646s-1.003.149-1.069-.081c-.064-.232-.545-.396-1.064-.363l-.267.025-2.85-1.52c.521-1.803.808-3.708.735-3.922-.073-.214-.834-.375-1.184-.387-.349-.014-.682.355-.705.545-.023.188-.865.222-.977.08-.111-.143-.363-.041-.457.055-.094.1-.61-.089-.839-.322-.229-.236-1.103 1.543-1.938 3.957l-1.302-.058c-3.56-.326 6.269-6.331 8.025-6.487.166-1.342 3.826-3.687 4.654-5.353zm-7.693 2.773c-.21.097-1.438-.805-2.73-2.001l.04-.521c.03-.162 4.751-5.838 4.399-2.384l-1.758 1.409c.249 1.744.256 3.401.049 3.497zm-2.651-4.991c-1.094.385-1.988-1.078-1.991-3.254l.104-.666c.434-.619.857-.675 1.268-.165a12.1 12.1 0 0 1 1.914.972c.538.323-.203 2.725-1.295 3.113zm-2.437-9.175c.197-.046 1.055-.136 1.207.018-.193.047-1.068.152-1.207-.018zm-4.411 40.429c1.625-2.461 3.21-3.647 6.174-3.09l3.198.604c3.155.108 4.644 2.002 3.306 4.205l-1.432.34c-.312.074-.666.025-1.037-.076-.744-.201-1.547-.613-2.182-.674-.996-.094-2.307-.275-3.171.32-1.652 1.14-1.474 2.754-.613 4.113.552.878 1.026.812 1.237 2.191l.269 1.759c.378 1.84.505 3.548.282 3.797l.008.167.024.498c.832.779.585 3.056-.442 3.263-1.029.207-2.7-1.339-3.713-3.433l.494-2.685c.018-.092-1.609.815-1.803 1.126-.391.62-.316 1.426-.326 2.119-.017 1.125.811 3.062-.849 2.951-2.067-.141-3.446-5.432-3.61-7.013-.346-3.333 2.406-7.781 4.186-10.482zm64.587 10.063l.056.065h-.002c.064.085.086.111.086.111.211.063.394.16.402.212l-.023.017c2.699 1.829 13.322 7.214 16.806 8.902 4.394 1.758 1.677-.439 1.027 3.151.099 2.977 6.97 8.696 9.99 8.345-6.79 5.346-11.099-6.61-17.82-6.416-2.646.188-4.296 2.817-4.588 5.115-4.628.699-6.099-2.734-9.962-2.642l-.472-.01c-2.759.008-3.998-.81-2.757-1.82l.469-.285c-2.809-2.685-4.121-3.458-4.121-3.458-6.187-3.639-11.221-7.015-11.223-7.208-.003-.191-.625.772-1 1.053-.373.282-1.142.496-1.705.473l-.061-.252.174-1.867c-1.44-.913-.477-1.942 2.145-2.29l.85-1.262c-1.533.169-9.434.545-9.494-3.037.203-4.879 10.021-.986 10.874-.802-.046 1.857.311 6.589 3.663 6.778 1.984-.014 6.098-5.547 8.24-5.771l.367 2.081c4.557.571 8.204.967 8.133.882-.02-.02-.023-.026-.054-.065zm11.995 94.27l-.178.907-1.284 4.585c-4.518-2.377-6.033-4.61-3.37-4.967l.072-.023c1.137-.175 1.785-.394 2.576-.66s1.774-.196 2.184.158zm32.878-84.82l.067.028c.018.008.031.015.029.017l-.002.004-.094-.049zm-229.848-41.448c-.127-3.267.998-5.567.971-9.017 5.238 9.71-.997 12.781-.971 9.017z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-europe-africa.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-europe-africa.svg
deleted file mode 100644
index 4c9b6fac01..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-europe-africa.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M343.79 180.021c1.014 0 1.954-.093 2.797-.275l1.111-.242-.516-2.883c-.045-1.393-.789-6.567-2.695-7.379-.115-.051-.295-.457-.275-1.055l1.906.18c.566 0 1.056-.326 1.311-.873.432-.933.144-2.631-.586-3.494-.794-.946-2.57-1.431-4.476-1.118-.807-2.108-2.836-3.466-4.664-4.688-.932-.622-1.834-1.224-2.459-1.848 3.16-.108 10.229-.466 10.879-.758l1.539-.694-1.18-1.212c-6.496-6.665-11.006-8.405-13.44-5.826-1.666 1.767-1.539 4.899-1.518 5.252.428 7.448-1.14 14.466-1.324 14.981-.117.326-.436.455-.473.487l-1.821-.075.178 1.39c.841 6.611 9.664 10.13 15.706 10.13zm-34.164-18.001h.389l.509-.068.274-.159-.664-1.196-.119-.218v-.729l-.027.68v-.004l.023-.686-3.81-.136 3.066 2.27zm-17.873 37.322l.355-1.461-3.091-3.306.797 4.925zM256.001 49.523C141.966 49.523 49.522 141.965 49.522 256c0 114.033 92.444 206.477 206.479 206.477 114.031 0 206.474-92.443 206.474-206.477.001-114.035-92.442-206.477-206.474-206.477zm-90.607 94.385v.008l-.006-.008h.006zm60.048 247.681c-.232-.292-23.003-29.392-12.027-45.374 12.257-17.84-2.672-43.402-3.314-44.482-2.844-4.786-12.303-17.378-16.754-17.378l-.58.044c-.246 0-.292-.076-.338-.156-.475-.805-.19-3.973 2.604-9.045l.967-1.756h-2c-.208 0-.208 0-20.037 6.019-4.506 1.369-8.346 1.604-12.061 1.834-3.543.218-7.211.445-11.336 1.654-.971.284-1.971.428-2.979.428-9.906 0-18.566-13.654-18.656-13.792-3.553-5.688-6.352-10.332-6.816-11.161-.106-1.836-1.068-5.271-1.342-5.839-.498-1.025-1.238-7.459-1.312-15.608-.002-.173.068-17.556 16.75-28.448 7.695-5.375 12.369-13.532 12.566-13.877 3.438-6.072 12.137-12.292 18.795-13.561l20.973-.294.404-.077c6.041-2.296 13.619-4.002 15.385-4.205.047.26.053.628.006.846a1.725 1.725 0 0 0-.488 1.063c-.072.704.224 1.514.822 2.273l.002.269c-.019.459-.25.85-.626 1.447-.426.675-.955 1.515-1.024 2.714-.046 6.004 14.967 9.566 17.979 10.219 5.255 1.141 10.645 1.877 13.725 1.877 1.66 0 2.291-.211 2.648-.396l.67-.345-.045-1.195c.014-.734.033-1.624.02-2.115l.074-2.598c2.199-.284 4.523-.373 5.984-.428.832-.032 1.42-.063 1.502-.086.695.002 5.861 1.029 13.705 2.938l11.553 3.309.309.047c6.21.073 11.542.48 13.008.698l.127.198 1.305-.001.35-.544c.334-.525.195-.935-.133-1.664.066-1.469 1.258-9.829 2.582-12.679.383-.833.383-1.685-.008-2.464-1.127-2.257-5.168-3.283-9.566-4.221-.482-.102-.91-.192-1.248-.272-2.754-.653-9.616-1.069-12.29-1.069-.332 0-.615.007-.835.02-.983.055-1.784.044-2.183.015-.484-.562-1.5-1.51-3.631-3.431l-.918-.833c-.324-.296-.388-.546-.476-.5a.72.72 0 0 1 .236-.093l.861-.219.084-2.53-.006-.444a1.268 1.268 0 0 0-.457-1.006c.773-.2 1.562-.48 2.303-.818.309-.051.627-.079.955-.079l.327.009c3.221.188 11.396.335 18.613.335l1.221-.015 13.857-2.1c5.042.284 7.865-.594 8.477-2.562.461-1.478-.486-3.042-2.807-4.646-4.26-2.945-3.951-6.436-3.713-7.002a1.534 1.534 0 0 0-.125-1.469c-.482-.724-1.518-1.047-3.363-1.047-1.424 0-3.08.213-4.213.541-1.895.548-3.176 1.914-3.047 3.248.025.321.135.609.309.855a6.43 6.43 0 0 1-.49.118 7.113 7.113 0 0 1-1.367.114c-1.873 0-3.475-.459-3.869-.778a3.096 3.096 0 0 1-.528-.545l.276-.115-.192-.956c-.15-.771-.283-1.436-8.291-1.436-3.139 0-3.811.269-4.205.91-.432.693-.763 1.691-.863 2.354-.506.705-2.715 3.347-6.075 7.092l-.306.433.076 2.775.131.691.035.021c-.292.258-.801.61-1.553.979a9.772 9.772 0 0 0-2.474.875c-.823.187-1.551.251-2.193.175a23.956 23.956 0 0 0-2.901-.18c-2.238 0-3.428.257-4.072.574-.11-.028-.236-.064-.369-.1-.98-.263-2.162-.517-2.902-.166a1.878 1.878 0 0 0-1.069 1.527c-.097.929.398 1.863.956 2.46l-.09.167.19.557c.158.472.777 1.528 1.633 2.324a4.519 4.519 0 0 1-.418.162c-.206-.268-.504-.403-.883-.403h-.531l-.352.396c-.375.422-.375.422-.092 2.918-.037.142-.734.645-2.512.645-.312 0-.635-.016-.969-.049l-.018-2.027.008-.318c.623-.886.799-1.811.465-2.533a1.489 1.489 0 0 0-1.055-.852c-.835-.478-4.818-3.512-10.539-8.281l-3.469-3.381c-5.422-4.261-12.086-7.467-13.758-7.467l-.505.082c-.512.181-1.715.705-1.799 1.689l-.035.812.039.021c-.164.493.02.938.206 1.316.602 1.225 3.07 4.974 6.408 6.098 2.318.781 4.01 1.457 4.896 1.87l-.717 1.629 1.078.479a56.804 56.804 0 0 1 4.228 2.07c-.337.293-.617.614-.792.92-.387.656-.32 1.196-.19 1.538-.109.581-1.018 2.155-1.527 2.614-.301.27-.852.524-1.206.654-1.097-1.044-3.671-3.373-5.98-5.451.236.113.471.229.691.343l1.084-2.106c-1.67-.874-3.663-2.188-5.77-3.58-5.156-3.408-11-7.268-15.928-7.268-1.087 0-2.103.189-3.018.564-7.373 3.026-11.474 5.302-12.224 6.785l-.084-.039c-.346.735-3.801 5.08-5.777 6.097-.045.024-4.461 2.315-4.65 3.964-.375.49-1.422 1.642-3.266 3.371-2.186 2.052-3.371 3.166-4.002 3.842l-2.984.177-.414.103c-2.488 1.115-6.631 1.806-9.047 1.806-1.039 0-1.386-.128-1.419-.142a59.25 59.25 0 0 1-2.875-1.255l.107-1.079c.148-1.727-.506-3.323-.904-4.044 0-.964.4-4.798.816-6.656.369-1.642 7.635-11.619 13.105-11.633l2.09-.003c4.457 0 7.678.033 8.568.051l.15.101 1.607-.363-.139-.774a5.34 5.34 0 0 0 .162-.383c.117-.314.26-.708-.727-2.48-.692-1.25-2.594-4.217-5.25-4.768a125.85 125.85 0 0 1-2.895-.639c.588-.274 1.25-.481 1.902-.481h.004l.266.003c2.006 0 3.957-.617 4.744-1.503.115-.131.201-.263.262-.387.724-.357 2.757-1.079 4.29-1.622 2.052-.729 4.175-1.482 5.548-2.111 2.016-.925 5.941-2.957 9.742-4.924a616.96 616.96 0 0 1 5.49-2.824c4.061-2.059 6.584-5.476 7.08-7.244.18-.648.133-1.199-.057-1.442-.072-.608.971-2.86 2.039-3.11 1.186-.271 2.729.627 2.953.839.027.032.056.067.08.103a23.73 23.73 0 0 1-.82 1.213c-.299.178-.533.439-.6.84-.463.668-1.193 1.783-1.252 2.285l-.062.539.734.804h.531c.367 0 .81-.185 1.174-.46.26.204 1.037.732 4.412.732.555 0 2.447-.021 3.43-.306.5-.146.91-.215 1.184-.235 1.557.867 5.029 1.086 5.773 1.086 1.187 0 2.324-.132 3.383-.392 3.463-.855 6.215-1.384 6.97-1.489h.217c.346 0 8.604-1.759 10.45-4.471.939-1.381 3.713-1.935 5.203-2.233.44-.086.797-.161 1.024-.229 1.244-.367 2.645-2.218 2.432-3.682a2.03 2.03 0 0 0-.061-.282c1.193-.28 2.697-.615 4.176-.943 3.391-.755 3.732-2.383 3.631-3.286-.23-2.136-3.377-3.685-7.586-3.685l-.582.002c-3.869 0-6.904-.275-8.205-.464a4.306 4.306 0 0 0-.354-.501c.004-.246.029-.67.074-1.039.692-.425 2.663-1.267 4.143-1.9.879-.377 1.779-.764 2.604-1.133 1.822-.816 1.97-1.949 1.898-2.552-.299-2.408-5.061-3.759-9.006-4.469l-1.356-.243-.138 4.775c-.768.651-3.25 2.386-6.184 3.69-2.371 1.058-3.869 2.739-4.098 4.611-.17 1.402.369 2.754 1.537 3.86-.093.314-.658.5-1.892.793-1.73.412-4.621 1.101-4.594 4.432l-.03.784c-.602.626-2.175 1.841-4.201 2.448-1.677.502-3.635.813-5.115.813-.439 0-.732-.028-.914-.059a5.887 5.887 0 0 1-.113-.863l-.02-.003c.02-1.521-2.977-4.129-3.01-4.158a4.242 4.242 0 0 1-.807-.912l-.01-.115c-.063-.734-.631-1.056-1.418-1.5-.148-.083-.287-.157-.338-.189l-.471-.291h-.424c-.436 0-1.154.126-2.615.388-1.549.278-3.666.659-5.438.813-2.276.196-5.004.186-5.568.135-.496-.229-.768-.142-1.106-.12a9.662 9.662 0 0 0-.236-.817c-.341-1.055-.912-2.82-.332-3.883.268-.487.79-.826 1.596-1.037 5.193-1.353 7.187-2.109 7.936-2.688.342-.157 1.041-.442 1.955-.822 3.092-1.28 8.268-3.424 11.809-5.368 3.949-2.168 5.75-4.039 5.359-5.564a1.875 1.875 0 0 0-.078-.229c.781-.377 1.742-.758 2.441-.868 1.413-.224 2.375-.422 2.909-.79.684-.22 2.32-.672 3.049-.721.826-.056 1.68-.111 2.191-.478.524-.126 1.577-.326 2.231-.375.5-.035.947-.004 1.199.029l.141.143h.539c.498 0 2.469-.302 3.254-.549.176-.055.328-.078.477-.085l.635.116c.226 0 .424-.052 1.137-.248.691-.189 1.975-.541 2.545-.567.547-.024 1.504-.067 1.861-.791.846-.275 2.482-.659 4.176-.531 1.361.102 2.373.354 2.951.554l.209.765h1.079c.476 0 2.099-.096 2.863-.384.138-.053.346-.092.57-.108l.908.103c.24 0 .482-.064 1.004-.203.652-.172 1.74-.46 2.496-.462.686.29 1.805.339 3.562.387l.398.012-.011.097c-.141 1.278-.15 1.354 12.309 4.136 6.947 1.552 14.48 3.403 17.881 4.454-2.51 1.229-3.963.988-4.047.976-3.247-.661-5.943-1.011-7.803-1.011-1.829 0-2.809.314-3.283 1.048-.293.45-.331.998-.104 1.502.73 1.627 5.799 3.831 7.762 3.851.402 0 1.461 0 1.746-.962a1.15 1.15 0 0 0 .026-.653c1.291.113 2.757.296 3.695.412l.781.096c1.352.147 3.071-.342 3.575-1.422.01-.021.016-.04.025-.06.741-.153 2.19-.351 4.092-.509.689-.057 1.764-.062 2.755-.066.981-.008 1.885-.016 2.338-.062.695-.071 1.283-.488 1.609-1.146.109-.222.187-.465.234-.72l2.006.949c7.02 3.318 10.662 2.497 10.662 2.498 5.983-1.088 10.932-1.795 12.139-1.942 2.584 1.514 9.273 2.642 9.355 2.655 3.52.537 10.846 2.48 16.73 4.419 25.562 18.122 46.281 42.632 59.82 71.191 5.715 14.427 10.215 28.498 13.507 39.947a182.401 182.401 0 0 1 3.557 25.513 44.007 44.007 0 0 1-1.693-4.689c-1.981-6.642-4.273-7.359-5.167-7.359l-.299.014a5.948 5.948 0 0 1-1.348-.195l-.193-.365h-.75c-.572 0-.947.36-1.281.678-.062.062-.129.129-.194.186-.652.205-2.478 1.527-10.341 10.058-.135.147-3.312 3.65-3.205 8.284l-.062 4.611c.007 4.795-1.358 10.466-2.383 12.413-.781-.688-2.518-3.357-4.33-9.029l-3.549-7.247c-1.459-7.048-2.707-16.872-2.782-18.437-.18-4.03-1.318-4.002-1.791-4.03-.553.017-.667.139-2.076 1.619-.355.377-.721.76-.986 1.021a1.712 1.712 0 0 1-.234.013c-1.271 0-2.895-.663-3.119-1.047-.192-.365.259-.936.742-1.489a6.61 6.61 0 0 0 .303-.362l.326-.49-.07-.495c-.121-.809-.827-1.356-3.049-2.97-1.455-1.057-3.451-2.503-3.982-3.355-1.471-2.344-6.963-5.095-9.014-5.095h-.002c-.028.001-2.164.132-3.395.544-1.467-.356-8.187-2.513-11.376-4.102-2.875-1.434-7.975-2.358-12.996-2.358-1.334 0-2.604.065-3.78.197l-4.996-4.898c-.702-.732-1.178-1.772-1.682-2.874-1.086-2.373-2.439-5.325-6.719-5.486l-.271-.002c-2.528 0-4.153.71-4.829 2.111-1.146 2.377 1.223 5.468 1.502 5.813 3.119 3.925 7.949 8.614 10.177 9.674.045.363.059.814 0 1.029-.273 1.024.76 2.517 1.213 3.11.678.879 2.52 2.926 5.051 2.924 1.195 0 2.34-.453 3.4-1.348 2.753-2.324 4.998-3.304 5.982-3.561.902 1.846 3.498 5.077 5.15 6.238 2.059 1.447 3.037 2.134 3.568 2.459.297.375.543.664.751.887-.775 2.297-4.898 11.237-10.072 13.71-3.84 1.836-10.014 4.902-11.668 6.406l-.023-.03c-.838.585-11.709 5.775-16.053 7.455-3.771 1.46-7.484 2.332-8.896 2.332-.053 0-.096-.003-.129-.004-.792-.924-3.133-5.728-5.646-12.715-.521-1.46-2.271-6.285-2.75-7.088-4.039-6.768-5.311-8.555-5.36-8.627l-1.353-1.885c-4.114-5.74-9.749-13.598-11.473-16.533-1.891-3.205-3.111-6.761-3.133-7.297l.133-.719-.719-.876h-.564c-.861 0-1.002.319-2.006 2.778-.967-.027-2.863-.842-3.469-1.842-.217-.358-.621-1.025-1.392-1.025l-.657.02-.352.506c-.373.533-.724 1.036 2.823 10.695.058.157 1.46 3.941 5.593 11.412 1.699 3.07 2.801 6.34 3.963 9.801 1.019 3.031 2.074 6.164 3.562 9.125 1.139 2.263 2.775 4.331 4.355 6.332 1.797 2.27 3.492 4.416 4.384 6.691.336.842.428 1.773.53 2.762.125 1.246.253 2.537.879 3.762 2.641 5.203 7.177 7.952 13.119 7.952 5.172 0 9.588-2.065 9.773-2.153 5.461-2.585 9.379-4.007 11.17-4.438-1.025 16.225-20.637 33.969-29.051 41.587-15.787 13.314-12.787 19.712-12.388 20.397 3.566 6.197 6.414 16.89 6.187 19.112-.16 1.589-4.835 5.701-12.093 8.785-.334.14-8.192 3.583-8.598 12.853l-.133 12.396c-4.287 2.437-11.787 7.906-17.18 12.555l-.344.296-.641 4.974c-6.941 3.004-21.768 5.949-25.152 6.018l-.072 1.172v-1.171c-3.067-.006-9.522-3.998-14.23-9.938z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-america.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-america.svg
deleted file mode 100644
index a95c1a1975..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-america.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M245.627 109.839c-.154 0-.352-.011-.533-.017-.023.006-.045.014-.07.017h.603zM256 49.523C141.967 49.523 49.523 141.966 49.523 256S141.966 462.478 256 462.478 462.477 370.034 462.477 256 370.033 49.523 256 49.523zm29.582 33.756c-2.758 8.314-17.109 2.741-23.031 2.755 4.66-1.821 11.615-4.223 15.537-7.107 2.047-1.509-.033-2.51 2.781-3.987 3.605.492 7.184 1.067 10.719 1.766-4.186 1.408-8.166 3.324-11.74 5.692 1.914.292 3.822.589 5.734.881zm-67.008-6.06c-2.711 1.571-8.014 6.727-4.922 9.929 3.016 3.126 6.615-1.681 9.635-3.202 7.01-3.536 16.391-3.895 24.16-5.404-1.369 3.653-12.467 2.337-16.357 3.755-4.885 1.778-2.705 3.024-6.121 8.477 1.461-.156 3.041.694 4.516.663v.992c-3.357-.291-6.564-1.886-7.273 2.091-4.299-6.447-7.111-5.934-11.682-.218 4.529 2.518 8.971 5.653 5.402 9.973-4.342 5.255-6.975-1.212-2.535-3.913-4.033-1.867-7.191-5.049-10.361-.99 1.357-.131 2.82.558 4.188.552-.773 1.108-1.555 4.717-2.285 5.129-1.742.982-8.166-1.175-10.086-1.41-4.789-.585-9.521-.441-14.412-.194.891 5.979-5.814.259-8.262-1.213 4.424-4.477 9.799-2.78 14.91-2.078 4.275.585 10.598.544 11.098-4.862-4.656-.983-6.932-.702-9.32-4.244-.941-1.395-1.566-2.854-1.797-4.311a181.04 181.04 0 0 1 30.857-9.52h.647zM73.203 256c0-43.159 15.068-82.841 40.172-114.148 4.311 2.981 8.879 6.541 10.646 8.061 3.082 2.643 4.588 5.813 6.527 9.032.102.17 1.799 2.822 2.477 3.898 2.102 2.103 3.781 4.458 4.252 7.308.57 3.431-.717 6.287-1.035 9.855-.977 10.948.576 21.202 9.119 28.888 2.375 2.135 5.457 3.23 7.816 5.483 2.439 2.326 2.154 3.915 3.635 6.369 3.914 6.491 9.148 12.585 13.658 18.717 3.943 5.354 5.596 4.313 1.717-1.222-2.635-3.762-5.91-7.456-8.094-11.494-.227-.423-2.439-5.709-1.719-5.554 6.102 1.302 7.346 5.462 11.307 10.351 3.908 4.819 7.23 7.522 9.508 13.311 2.658 6.75 6.709 10.035 13.359 13.012 3.271 1.464 8.611 5.345 12.111 5.804 4.117.542 6.312-2.136 10.211-.271 2.604 1.245 4.59 5.219 7.812 6.171 3.088.909 5.141-.26 8.027 1.693 3.451 2.336 4.664 6.349 7.902 8.814 2.32 1.768 5.668 3.973 8.623 4.454 2.121.347 4.447-1.239 6.559-.552 3.785 1.231 4.66 5.862 3.514 9.55-1.275 4.139-5.156 6.698-6.709 10.804-1.404 3.714-.508 6.876-.984 10.416-.49 3.661-3.428-.035-.494 6.172 1.373 2.901 3.381 5.522 5.137 8.188 3.463 5.256 5.945 9.855 10.611 14.103 3.295 2.994 10.494 6.496 12.129 10.947 1.451 3.956.248 12.653-.486 16.833-1.541 8.739-1.316 19.253-3.729 27.366-2.35 7.893-5.078 10.25-3.066 18.868.859 3.679 1.521 1.893-.004 6.629-.445 1.372-.01 1.918-.537 3.304-1.107 2.933-3.727 4.661-4.84 7.69 4.164.198 3.852 1.644 2.541 3.293-4.912.398-9.863.657-14.877.657-100.794-.002-182.796-82.004-182.796-182.8zM291.49 435.311c-1.18-1.231-2.438-2.512-2.436-3.383 0-.956 3.734-5.747 4.242-6.943.805-1.905 1.361-6.037 2.527-7.509 1.994-2.52 6.285-1.583 5.461-6.268 9.57-.102 13.693-1.551 15.27-11.297-1.701-.857-1.363-.361-1.637-1.846.326 1.767 7.17-.713 7.816.523.5.952 9.18-10.906 10.125-11.903 2.463-2.604 4.611-4.579 6.172-7.707.613-1.227 1.27-4.964 2.572-6.786a8.31 8.31 0 0 1-.311.938c3.09-4.895 7.018-4.305 11.482-6.288 4.438-1.974 1.232-1.437 4.494-4.528 3.881-3.674 4.764-1.567 5.867-7.587.816-4.447-.258-8.503 1.172-12.518 1.807-5.064 6.172-6.715 9.068-11.019 2.213-3.285 4.285-8.645 1.293-11.943-2.486-2.743-9.885-5.006-13.24-5.807-3.951-.939-8.512-1.023-12.219-2.531-4.355-1.772-7.977-6.38-10.18.778-.729-.516-3.721-2.177-3.721-2.983 0 1.575 4.23-1.392 4.824-2.087-1.816.131-8.023 1.519-8.918.898 0 0 0 .006-.002.008.436.317 1.537.174 2.029.252-1.891 1.025-2.295.678-2.029-.252-.012-.011-.037-.011-.049-.024.01.01.041.01.051.017.521-1.793 3.568-5.776 3.631-6.57.33-4.432-6.104-9.477-9.594-10.475-4.775-1.362-7.479-.754-11.566-3.75-4.961-3.633-9.777-7.652-16.066-8.353-1.332-.148-2.775.581-4.17.375-3.4-.505-4.527-2.705-7.375-3.42-3.496-.881-4.824 2.136-6.914 2.127-3.074-.011-3.811-3.235-8.305-.522-6.662 4.019-3.041 6.532-10.623 4.6-4.018-1.021-8.533 1.438-12.373-1.222-3.459-2.395-4.246-9.032-.873-11.826-1.715 1.419-1.654-3.085-2.904-3.906-1.975-1.306-5.209.217-7.49-.329-3.09-.738-4.885-1.021-4.184-4.023.756-3.242 9.34-12.075.566-11.841-4.777.126-6.301 7.224-11.369 8.261-5.699 1.166-10.668-.783-13.615-5.821-6.152-10.506 3.613-23.448 13.582-24.359 7.801-.713 19.215-6.476 24.928 2.134 1.66 2.504 5.76 12.195 7.869 5.918.641-1.907-1.656-10.203-2.383-13.681-.023.037-.053.064-.074.1-.031-.372-.07-.744-.113-1.116.035.256.104.613.188 1.017 1.588-2.46 4.152-4.029 6.178-6.156-.262.273-.529.537-.801.798 2.025-1.996 7.291-4.341 8.213-7.107.506-1.527-1.797-3.485-.596-5.601.92-1.622 3.186-.972 4.07-2.044 1.258-1.533 1.424-4.072 2.754-5.689 1.367-1.664 4.006-1.878 5.4-3.144 3.197-2.903 4.07-6.209 7.822-7.987 3.539-2.394 7.293-6.484 11.795-4.63-1.623 1.857-5.74 2.998-6.938 4.723-.818 1.181 6.111.525 7.049.183 3.902-1.435 6.992-4.348 10.264-6.508 5.674-3.74 12.244-3.924 19.084-2.55 2.096.418-3.787-8.049-4.412-8.767-2.377-2.729-2.969-5.162-6.807-1.627-1.117 1.029-2.295 4.513-3.086 5.95-2.426 4.404-1.873 3.837-7.158 6.55.285-.123.557-.27.818-.433-3.867.774-7.555 2.44-9.117-2.343-.525-1.596 1.713-3.931.463-5.54-2.742-3.539-11.881 3.928-15.094 5.125 1.67-13.134 17.207-6.217 25.488-8.839 2.266-.719 10.736-3.962 11.211-6.101.701-3.175-6.715-8.323-8.41-9.77-3.643-3.101-5.578-4.894-7.625-9.728-2.182-5.146-3.617-10.292-9.076-6.503-2.037 1.414-.568 4.483-4.08 4.962-2.213.306-4.475-2.491-5.74-3.804-1.906-1.981-3.889-6.825-7.389-7.257-3.004-.367-11.361-4.776-15.283-1.916-3.004 2.191.414 10.475 1.32 13.443 1.949 6.378 3.172 6.622-2.254 10.626-2.656 1.964-4.27-.137-3.291 5.151.506 2.748 3.475 3.287 1.361 5.661-1.297 1.461-4.406 1.32-5.914.614-4.723-2.211-.512-5.165-2.771-8.311-1.688-2.345-10.738-4.264-13.834-5.667-6.857-3.104-24.939-6.4-19.379-17.019 1.508-2.882 7.168-7.13 9.736-8.785 2.633-1.694 5.918-2.165 8.123-4.513 1.238-1.317 1.332-4.953 2.439-5.859 1.568-1.283 6.137-.69 8.57-.602 10.533-2.11.941-17.409 14.814-14.639 3.83.765 7.664 4.646 10.822 6.81 3.553 2.432 4.736 2.152 3.613 5.869-.258.86-4.229 4.718-5.24 5.501-1.85 1.431-4.834 2.091-6.998 2.979 7.238 0 10.271-.354 16.18 3.57 5.064 3.362 8.24 5.607 14.461 5.357-.379-3.024-5.719-1.856-5.51-4.849.176-2.522 3.389.807 3.803.827 1.723.087 6.215 2.136 5.234-2.702-.863-4.246-10.145-2.22-7.166-9.146 4.176-.46 3.055 4.12 5.816 5.109 2.936 1.053 6.768-2.536 7.406-5-4.119-2.104-16.732-5.495-15.316-11.46 8.416 5.362 16.826 10.724 25.238 16.09-6.816 6.097 4.957 2.666 5.68 2.844 2.002.495 7.115 4.896 3.77 5.719-3.479.854-5.264-4.166-8.789-.409 2.926.771 13.252 1.354 10.498 6.922-1.104 2.226-7.742 1.842-9.725 6.193 1.422-.272 2.965.154 4.408-.22-3.168 4.933 1.521 8.195 4.096 12.138 2.922 4.479 7.014 11.34 12.822 12.768 12.361 3.034 10.871-17.063 20.256-20.243 2.596-.881 5.428-.238 8.047-.973 2.922-.824 4.486-2.931 6.789-4.521 5.717-3.948 10.67-3.96 17.783-4.174.178-.006.357 0 .537.003 31.178 32.8 50.375 77.094 50.375 125.813.006 88.656-63.439 162.744-147.303 179.315z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-asia.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-asia.svg
deleted file mode 100644
index c62b1e835a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-asia.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M242.904 278.507c-1.807.161-11.916 6.335-8.254 6.673l1.338.057c.861-2.479 1.758-4.312 1.992-4.072.236.245.768.436.865.336.096-.099.355-.2.469-.058.117.146.98.11 1.006-.084.023-.19.367-.572.725-.559.361.013 1.141.178 1.217.398s-.221 2.18-.756 4.036l2.932 1.561.273-.024c.535-.032 1.029.134 1.096.372.066.239.709.254 1.1.084.393-.172.104-2.303-.787-3.748l1.721-1.021.16.229c.262.336.48.601.486.588.006-.015.203.419.455 1.021.25.604 2.334-2.125 4.303-6.196l-3.691-4.126c-.312-.324-.982-.971-1.861-.975-.855 1.716-4.617 4.125-4.789 5.508zm-12.89-21.65c.436-.642 1-.88 1.701-.718.068.905-.273 1.644-1.025 2.212l-.037.385c.941.622 2.012.985 2.381.806.367-.18 1.746.226 2.174.836.428.611 2.387.993 2.219.657-.166-.337 2.051-.394 4.035.846l.969 1.856c.537-.35.762-.838.678-1.473-.535-1.041-1.305-1.483-2.316-1.318l.057-.387c.465-.476.721-.895.568-.929-.154-.036-.627.008-.859.21-.23.206-.965-.176-1.188-.825s-2.211-1.187-2.602-1.043c-.391.146-.773.66-.789.769-.014.111-.633-.392-1.355-1.276-.725-.887-.475-5.782.389-8.937l-.088-5.059-.369.176c-.756.471-1.518.434-1.689-.083-.17-.521-3.197 3.75-5.057 9.559l-.277 1.785c-.02.472 2.114 1.961 2.48 1.951zm-.293-25.07c2.982-.271 5.979-9.8 2.641-10.106-3.081.237-7.508 9.989-2.641 10.106zm-.307 89.079c1.707.114.857-1.878.873-3.034.012-.712-.064-1.545.338-2.184.199-.319 1.869-1.25 1.854-1.155l-.51 2.762c1.043 2.154 2.762 3.742 3.818 3.529 1.061-.213 1.312-2.551.457-3.355l-.025-.513-.008-.17c.229-.257.1-2.012-.291-3.904l-.275-1.809c-.217-1.419-.705-1.354-1.273-2.258-.885-1.397-1.068-3.058.631-4.23.891-.611 2.236-.426 3.264-.328.65.06 1.479.484 2.242.694.383.102.748.151 1.068.075l1.471-.35c1.377-2.267-.152-4.212-3.4-4.323l-3.291-.622c-3.047-.574-4.676.645-6.348 3.176-1.832 2.778-4.662 7.357-4.307 10.783.169 1.63 1.587 7.072 3.712 7.216zm15.857-49.315l.422.68.26-.056c.463.041.838-.779.83-1.823l-.744-.858.453-.032c.77.036 1.508-.142 1.637-.394.131-.252.234-1.127-.004-1.39-.236-.263-.371-.754-.299-1.092.07-.338-.047-1.082-.201-1.085-.152-.004-.438-.187-.408-.417.027-.228-.293-.752-.754-.885-.461-.135-.836-.243-1.834-.215l-.264-.015c-.5.229-.297.774.451 1.207.748.435.633 2.748-.094 3.291l-.99-.382-.043.148c-.02.269.143.786.359 1.156.22.373 1.263 1.374 1.223 2.162zm-10.728-10.271c.143.176 1.045.067 1.24.018-.156-.158-1.037-.065-1.24-.018zm26.209-62.043c.113.167.268.283.395.428-.275.433-.576.871-.928 1.315l3.414.251c-.004-.038-.002-.047-.004-.082.092.025.174.06.27.08.031.102.057.168.094.295.822-.038 1.24-.061 1.451-.07 6.576.414 17.014-4.687 20.672-6.51 4.863-2.416 12.641-2.48 15.438-7.515 3.273-5.893-.68-11.59 1.615-16.539.551-1.187 1.496-2.332 2.955-3.426.457-.132.912-.268 1.314-.457l3.289-1.753-.332-.12c-.105-.113-.193-.226-.285-.337 2.465-1.612 2.475-1.62 2.475-1.62 4.463-5.446 5.299-9.272 1.859-8.497l-3.221-.287c-2.092-.188-3.406-2.16-5.906-2.169-4.143-.016-6.053 2.315-7.26 5.93-.57 1.711-.742 3.521-.744 5.38-.57.693-.996 1.144-1.121 1.146-.23.01-.648-.037-.604.006.047.039.021.037-.143-.061-.164-.101-.67.688-.881 1.906l-1.471.661c.76.834.99 1.836.693 3.008 1.199.154 2.287-.253 3.26-1.219-2.412-2.436-1.73-2.001.385-2.246.295 4.694.855 9.469-1.754 13.424-5.828 8.84-17.25 7.457-25.988 9.477-1.936.446-5.396 2.057-7.57 4.135-1.072.19-1.936.706-2.062 1.874l-.02.37c.115.067.24.125.359.187-.365.99-.328 2.019.356 3.035zm-154.584 81.066c-.023 3.873 6.387.714.998-9.275.029 3.548-1.127 5.916-.998 9.275zm143.445-89.029c.09-.137.16-.598.148-1.236-.179.913-.247 1.379-.148 1.236zm42.201 139.281l.486.009c3.975-.098 5.488 3.435 10.248 2.719.299-2.363 1.996-5.071 4.719-5.265 6.912-.197 11.346 12.1 18.332 6.601-3.107.361-10.178-5.524-10.277-8.582.668-3.696 3.463-1.435-1.057-3.242-3.584-1.736-14.512-7.274-17.287-9.156l.023-.02c-.01-.054-.197-.152-.416-.219l-.088-.113c.068.087-3.68-.321-8.365-.908l-.375-2.141c-2.207.23-6.438 5.924-8.477 5.938-3.449-.194-3.816-5.064-3.77-6.975-.877-.188-10.977-4.192-11.184.829.059 3.682 8.188 3.297 9.764 3.121l-.873 1.3c-2.695.356-3.689 1.415-2.207 2.354l-.178 1.919.062.262c.578.023 1.369-.195 1.754-.483.385-.29 1.023-1.281 1.027-1.085.002.196 5.182 3.671 11.545 7.415 0 0 1.352.793 4.24 3.556l-.482.294c-1.275 1.037.001 1.877 2.836 1.872zm4.631-17.334c.029.039.035.043.053.065h.006l-.059-.065zm11.342 35.207l-.346-.151c-1.67-.35-3.717-3.568-4.543-7.157l-1.262-3.125c-6.541 3.413-.182 18.849-8.664 19.665-2.379.135-14.18-5.102-14.156-6.846.023-3.204 1.396-5.46 4.117-6.778l-.014-.635c-1.16-.553-6.002-.447-10.762.232l-4.385-2.79.217 1.139c.955.574-1.117 2.405-4.605 4.073l-4.227 5.777-.145-.124c-.828-.333-1.928-.519-2.439-.413-.514.107-1.812.115-2.148-.825-.338-.938-3.338-1.431-4.139-.922-.799.512-5.035 1.585-5.693 2.267-.656.682-1.604 3.853-2 3.766-.395-.085-1.615-.052-1.619.595-.002.649-1.457 1.66-1.752 1.394-.293-.272-1.908-.304-2.85.994l.285 1.502c-.209 3.803-22.535 10.082-25.756 10.438l-.047-.269c-.057-.333-.355-.54-.664-.461-.309.078.221 5.52 1.197 11.227a17.81 17.81 0 0 0-.305-.16c-.387-.512-.789-.77-.896-.571-.105.199 1.613 6.372 4.053 13.341 0 0 1.248 3.565 1.275 5.885 1.107 7.393 27.428-2.174 30.209-2.552 7.148-.973 13.764-3.582 21.027-2.626 3.207.425 7.572 6.722 8.951 6.73l2.197-.152c2.59-2.893 4.525-4.203 4.297-2.911-.227 1.292-1.346 2.81.676 2.622l.182-1.46.377.27c.26.576.359 1.279.221 1.561-.137.283.373.946 1.578.808l1.025-.486c2.158 7.792 12.672 6.31 18.674 5.63l1.479-3.06c4.805-1.602 8.738-2.907 8.738-2.901 0 .003 3.729-4.749 8.277-10.562 0 0 2.68-3.427 3.252-17.714-.885-.743-7.762-6.41-7.725-6.285-.033-.211-11.75-18.357-11.162-17.98zm-96.717-16.001l1.395-.055c.547.466 1.232.67 1.523.447s-3.115-1.743-7.779-2.962l-1.809-1.547.186.074c2.195-.397 1.562-1.443-1.404-2.326l-4.029-.151c-4.68.046-9.916-2.438-14.539-2.11l-.504-.087c-1.18 1.225 3.736 3.612 10.924 5.307 0 0 11.49 2.705 16.064 4.47-.106-.247-.291-1.078-.028-1.06zm95.467 77.599c-.814.276-1.48.501-2.65.68l-.074.024c-2.738.365-1.18 2.666 3.467 5.11l1.322-4.718.182-.935c-.423-.361-1.432-.437-2.247-.161zm36.067-87.084l.098.046.002-.002c.002-.003-.012-.009-.029-.016a1.55 1.55 0 0 0-.071-.028zm-23.094-1.37c.143-.013.291-.064.438-.085-.284-.153-.473-.176-.438.085zm10.644-4.78c-2.135.162-6.33 4.092-10.207 4.695.672.365 1.941 1.557 2.414 1.973l.076-.005c-.135-.095 3.543-.895 8.17-1.78l.359-3.395c.036-.5-.296-1.486-.812-1.488zm-137.898-14.899c.262 2.734 2.695 3.839 3.299 5.439-1.871 5.429 3.416 5.827 6.297 6.24l.1.331c.086.729.309 1.44.494 1.578s5.656.321 11.852.328l6.947-13.459a8.838 8.838 0 0 0 3.713-1.335l-2.102-.135c-1.76-4.017-3.08-7.461-2.93-7.659.152-.194.457-.617.357-.829-.1-.213.422-.944 1.299-1.316s1.684-1.009 1.559-1.12c-.125-.11.33-.469 1.031-.586.701-.119-.484-2.565-2.66-4.292-2.174-1.729-7.406.724-13.084 5.442 0 .001-16.168 13.431-16.172 11.373zm-16.551 3.857c.15-.447-.195-1.367-.768-2.045l-.865.172.07-.139c.068-.227-4.633-4.139-10.443-8.691 0 0-10.662-8.359-14.512-8.697-.184 2.271 10.801 16.45 12.893 17.62l.174.246c.854.209 4.33 5.743 7.73 12.299 0 0 3.084 5.951 9.572 6.861.594.051 2.879-.157 2.893-1.383-.494-5.531-6.787-12.417-6.875-15.965l.131-.278zM256 49.523c-96.727 0-177.902 66.514-200.324 156.296-.191.513-.383 1.03-.57 1.562-.521 1.465-.797 3.17-.924 4.875a207.149 207.149 0 0 0-4.658 43.743c0 114.034 92.443 206.478 206.477 206.478S462.477 370.034 462.477 256 370.033 49.523 256 49.523zm0 389.274c-100.795 0-182.797-82.003-182.797-182.798 0-10.145.867-20.087 2.463-29.785 1.285.59 2.594 1.421 3.133 2.233 1.047 1.577 5.203 4.563 4.818 5.123-.387.561-1.342 2.918-.34 5.311l2.371-.006 2.688-.097c.713-2.012 1.273-2.436 1.246-.938-.027 1.497-.201 5.558-.217 5.549-.016-.008 1.158 5.883 2.602 13.123l4.057 7.659c2.656 6.889 5.564 11.027 6.459 9.193.895-1.832 3.855-5.846 3.838-8.533-.018-2.686 4.062-13.237 9.309-17.455 5.246-4.219 13.801-13.307 15.918-12.974 2.115.334 6.754 1.672 10.057 8.277 0 0 5.146 10.296 6 10.318l2.998-.045c1.617-2.594 3.182-4.239 3.479-3.651.293.587 1.842 5.857 1.828 11.51-.016 5.648 3.115 12.216 3.012 12.214-.1 0-.6.742-.891 1.654-.287.914.98 8.149 2.717 13.977 1.738 5.828 15.162 8.919 13.52 5.736l.031-3.348-.154-5.21c-6.086-4.151-11.021-7.557-10.969-7.57.055-.015-1.281-3.965-2.99-8.843-1.707-4.881 6.439-5.314 10.25-.779 3.812 4.535 9.488 7.964 10.232 7.272.74-.691 1.33-2.25 1.404-1.87l.17.004 1.197-.012c4.398-3.437 4.9-11.433 1.111-17.771 0 0-3.834-6.413-4.041-14.038l.096-5.1c4.201-2.479 9.223-3.269 11.156-1.752s9.219-.236 15.6-3.946l16.557-26.255a5828.64 5828.64 0 0 1 6.562-11.784c.023-.027.037-.046-.016-.034-.053.009-.164-.345-.186-.744-.023-.4-1.488-1.892-3.232-2.58l-.01-1.411.111-3.695c5.842-1.174 9.438-2.354 7.99-2.62-1.447-.267-4.564-2.054-4.879-1.121-.318.935-1.568 1.821-2.146 1.904-.574.084-2.537-1.311-3.176-2.495-.641-1.183-.992-4.373 2.18-6.06 3.172-1.686 7.221-2.561 8.439-1.929l.004.383-.043 1.287c-1.207 1.142-.473 1.584 1.641.98 2.109-.604 8.656-.146 8.641.568-.014.714-1.154 2.54-1.064 2.93.086.391 1.832.672 2.854.645 1.021-.024 2.689 3.143 2.439 3.528-.254.382-1.4.849-1.4 1.067-.002.217.373 2.059.82 3.754.223.844.309 1.652.316 2.287.158-.79.402-1.911.709-3.302.664-2.994 4.754-14.655 7.678-16.702 2.922-2.046 10.32-5.352 10.521-4.131l3.561.133c11.311-.027 16.768-15.699 21.846-22.161 8.594-11.513-.814-11.86-.814-11.86-7.377-.274-7.492-1.687-.252-3.142 0 0 27.035-5.426 33.963-4.211 6.236.778 14.252-.528 14.252-.528 7.289-1.187 7.68.179.873 3.039 0 0 7.709-.495 4.82 6.206-2.885 6.698-2.381 10.567 1.125 8.597 3.504-1.971 4.889-9.738 4.156-9.755-.729-.016.74-2.631 2.516-4.448l1.885-.373c6.361-1.039 30.688 8.062 25.346.574l3.045.689a21.3 21.3 0 0 0 .586-1.461c32.87 33.07 53.218 78.602 53.218 128.802 0 100.794-82.002 182.797-182.797 182.797z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-europe-africa.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-europe-africa.svg
deleted file mode 100644
index af162e7949..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe-inverted-europe-africa.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M414.422 265.342c-.039 1.591-.332 2.97-.641 4.428-.305 1.427-.619 2.902-.682 4.617l-.049 2.132.459.368c.293.231.633.354.984.354h.002c.68 0 2.732-.016 2.904-10.206l.002-.224-.689-1.854-2.29.385zM157.553 123.706l1.74-.396.252-.33c.654-.867.826-1.626.514-2.256-.324-.647-1.064-.936-1.9-.677-.74.228-2.387 1.259-2.066 2.473.28 1.07 1.116 1.186 1.46 1.186zm156.32-28.142c-1.217-.756-4.303-.307-4.76.452 3.961.569 6.102.389 4.76-.452zm-4.76.453c-.199-.027-.379-.048-.588-.082l.562.267c.003-.063-.011-.126.026-.185zm-131.595 36.079l.014-.001c.122-.073.089-.056-.014.001zm-15.254.259c.473-.05 1.602-.269 1.883-1.236.041-.148.08-.287.141-.554l.262-1.447h-1.477c-1.068 0-1.928.618-2.361 1.693l-.842 2.096 2.394-.552zm54.127 45.444l.354.194 1.848-.292.869-.042.33-.503c.494-.742.463-2.076.338-2.971l1.439-3.107-1.569-.231a6.243 6.243 0 0 0-.697-.027c-.988 0-7.771.209-9.041.704l-.705.456-.041.763c-.039.695-.069 1.244 6.875 5.056zm-18.262-17.778c.205.696.457 1.529.895 2.175-.055.037-.119.041-.17.085l-.223.166c-.887.652-1.521 1.177-1.586 1.937l.141.812.375.387s.039.085.051.196l-.07.387c-.361.782-.74 1.933-.783 2.667l-.008.592.887.803h.512c1.232 0 3.932-1.422 5.775-3.038l.684-.597-2.182-4.452-.326-.053c1.541-2.241 1.107-4.158.402-5.419l-.67-1.201-1.086.843a5.475 5.475 0 0 1-2.186 1.028l-1.883.358 1.176 1.485c.064.119.193.553.275.839zm124.537-62.688l.287.091 2.279-.454.666-.287.543-1.145-.371-.558c-.158-.233-.371-.556-3.588-1.959l-.369-.16-1.545.385-.416-.169-.531.383a1.4 1.4 0 0 0-.58 1.379c.057.353.23 1.432 3.625 2.494zM155.781 135.63c.248-1.161.451-2.344.602-3.524l.059-.244c-.582-.267-1.646-.661-3.375-1.106l-.002.005.033.031-.107.746c-.084.387-.234 1.102-3.055 2.123l-.281.25c.209.275.289.548.318.713.068.357.096 1.281-1.076 2.082-.264.216-.646 1.14-.795 1.751.072-.009.152-.022.238-.041 1.818-.158 5.836-1.701 7.441-2.786zm11.53-6.515c.543.098.953.227 1.242.635l.285.406-.082.524c-.145.757-1.32 1.839-2.104 2.278-.322.184-.889.426-1.463.664-.27.111-.648.27-.939.401v.006c-.162.678-.793 1.922-1.812 2.462.305.041.648.087 1.035.136a40.263 40.263 0 0 0 1.822-.68l2.359-2.234-.078 2.712.096.182-.17.501c-.16.459-.533.686-.881.846l-1.346 1.277-1.543-.186c-1.117.39-2.471.839-3.953 1.316l.012.048c5.143-.578 13.168-2.235 17.389-4.22a1.331 1.331 0 0 1-.061-.188c-.078-.295-.223-1.321 1.1-2.044.021-.042.123-.352.062-.743-.006-.057-.02-.112-.033-.166l-.391.222-.018-.029-.578.081c-.359 0-1.027-.079-1.469-.618l-.355-.435.188-1.396.154-.064c-.029-.042-.062-.083-.096-.127-1.275-1.559-4.998-3.047-7.092-3.605l-1.28 2.038zm-5.936-3.79c.033-.001.062-.003.096-.003.83.124 1.281.678 1.496.995a3.21 3.21 0 0 1 .566 1.771c1.033-.162 2.049-.403 2.254-.466l2.209-.692a3.483 3.483 0 0 0-.662-.089h-1.797l.67-1.65c.367-.854 1.25-1.517 2.178-2.214.227-.171.488-.365.74-.572-1.469.2-3.002.376-3.533.376h-.6l-.812-.962.029-.119c-.609.064-1.389.182-2.303.384l-.045.132c.045.078.078.159.105.244l.176.562-.359.586a1.456 1.456 0 0 1-.205.229 2.732 2.732 0 0 1-.346 1.243c.039.055.074.113.105.172l.038.073zm4.012 18.591v-.007h-.002zm157.506 207.16c-4.346 4.78-8.449 9.297-10.295 16.479-.127 2.151.258 6.593 1.969 8.419.498.535 1.047.781 1.727.781l.139-.002c8.408-.935 14.486-20.064 15.215-28.021l.09-1.018.795-.044c.352-.889.883-3.627 1.066-7.979l-1.82-.124c-2.646 4.645-5.814 8.132-8.886 11.509zM256 49.523c-114.033 0-206.477 92.443-206.477 206.478 0 114.033 92.443 206.476 206.477 206.476s206.477-92.442 206.477-206.476S370.033 49.523 256 49.523zm0 389.275c-100.795 0-182.797-82.002-182.797-182.797 0-100.796 82.002-182.798 182.797-182.798 26.637 0 51.936 5.773 74.783 16.062-.66.068-1.289.271-1.701.647a2.772 2.772 0 0 1-.428.047c-.803 0-1.471.523-1.664 1.307-.211.85.174 1.753.912 2.146l.342.18c.316.166.508.268.643.33v.002c4.695 2.011 9.072 3.075 14.143 4.308l.973-2.11c-.115-.083-.24-.155-.355-.236l.004-.01-.006.01c-.02-.015-.041-.026-.059-.041l.004-.01a1.678 1.678 0 0 0-.096-.051 36.731 36.731 0 0 0-1.689-1.128c1.359.724 2.693 1.484 4.033 2.244l-.67.044-.715 1.075.312.893.258.21c1.463 1.198 3.117 1.842 4.916 1.92l2.174.089-.5-.85a185.647 185.647 0 0 1 9.74 6.477c-5.875-1.929-13.133-3.851-16.619-4.385-.082-.012-6.773-1.141-9.357-2.652-1.199.144-6.143.85-12.137 1.939-.002.004-3.643.822-10.664-2.499l-2.006-.947a2.693 2.693 0 0 1-.236.72c-.328.657-.916 1.074-1.611 1.145-.449.045-1.357.055-2.336.061-.992.006-2.064.009-2.756.069-1.9.155-3.35.354-4.092.507-.006.019-.016.041-.023.059-.502 1.08-2.211 1.579-3.572 1.426l-.762-.093c-.941-.117-2.418-.302-3.715-.415.049.19.047.405-.025.651-.287.963-1.35.963-1.752.963-1.953-.019-7.025-2.223-7.758-3.848a1.56 1.56 0 0 1 .102-1.507c.477-.733 1.459-1.048 3.285-1.048 1.859 0 4.559.35 7.805 1.011.076.015 1.531.256 4.047-.976-3.404-1.049-10.938-2.898-17.885-4.451-12.457-2.782-12.447-2.86-12.309-4.139l.012-.095c-.133-.006-.268-.008-.393-.013-1.762-.046-2.879-.097-3.564-.387-.762.003-1.854.292-2.506.466-.537.142-.76.202-.996.202l-.912-.107c-.223.017-.43.056-.566.109-.76.289-2.389.383-2.865.383h-1.076l-.211-.763c-.576-.197-1.59-.453-2.947-.554-1.699-.14-3.332.259-4.18.534-.357.724-1.312.764-1.859.79-.572.024-1.859.378-2.551.568-.688.188-.896.246-1.131.246l-.635-.117a1.874 1.874 0 0 0-.475.087c-.789.245-2.758.548-3.256.548h-.539l-.141-.144a5.746 5.746 0 0 0-1.199-.028c-.652.049-1.707.251-2.229.376-.514.366-1.363.423-2.195.478-.729.048-2.367.501-3.047.72-.535.366-1.496.566-2.906.79-.697.109-1.662.491-2.441.869.033.075.055.153.076.229.393 1.525-1.412 3.395-5.357 5.564-3.543 1.944-8.723 4.089-11.816 5.369-.91.378-1.604.663-1.949.82-.744.579-2.736 1.338-7.936 2.691-.805.21-1.328.55-1.594 1.038-.582 1.059-.012 2.824.33 3.88.09.275.18.551.238.817.334-.022.602-.107 1.1.121.566.053 3.299.059 5.572-.136 1.77-.153 3.891-.535 5.438-.814 1.459-.261 2.18-.389 2.617-.389h.422l.475.291c.055.035.191.11.342.194.781.443 1.35.765 1.412 1.499l.01.114c.133.211.406.572.803.912.035.028 3.031 2.635 3.012 4.158l.023.002c-.004.102.029.461.109.863.182.028.471.06.91.06 1.479 0 3.439-.312 5.119-.815 2.027-.608 3.602-1.821 4.201-2.448l.027-.78c-.025-3.334 2.867-4.021 4.596-4.438 1.232-.291 1.799-.477 1.893-.791-1.166-1.109-1.709-2.458-1.535-3.859.229-1.873 1.723-3.556 4.1-4.614 2.932-1.307 5.412-3.041 6.18-3.688l.139-4.775 1.355.243c3.943.709 8.705 2.062 9.004 4.47.07.602-.076 1.734-1.895 2.551-.826.37-1.727.756-2.607 1.132-1.48.634-3.447 1.476-4.143 1.902-.043.368-.07.793-.072 1.037.127.16.252.326.354.502 1.299.191 4.33.465 8.193.465l.598-.002c4.209 0 7.35 1.549 7.584 3.684.1.905-.242 2.532-3.633 3.285-1.479.329-2.98.664-4.178.945.027.093.049.186.061.281.213 1.462-1.188 3.315-2.432 3.682-.227.066-.582.141-1.023.229-1.488.297-4.26.853-5.199 2.231-1.848 2.715-10.105 4.472-10.445 4.472h-.227c-.73.104-3.35.597-6.971 1.49a14.112 14.112 0 0 1-3.383.393c-.742 0-4.215-.221-5.771-1.088-.273.02-.682.089-1.182.234-.982.285-2.877.306-3.432.306-3.375 0-4.15-.528-4.41-.731-.363.276-.803.461-1.172.461h-.531l-.734-.802.061-.54c.059-.496.777-1.599 1.242-2.271-.002.022-.02.032-.02.053-.072.697.492 1.373.867 1.636.064.046.166.056.236.093l-.914.862 2.895-.056.01.028 3.756-.067.285-.768c.242-.659.779-2.282.49-3.115-.332-.967-1.463-.967-1.889-.967-.381 0-1.676.043-2.326.57a2.52 2.52 0 0 0-.564.669 2.737 2.737 0 0 0-.83-.158h-.004c-.463.021-.969.113-1.363.339.318-.443.613-.878.803-1.186-.027-.04-.059-.076-.086-.108-.217-.209-1.758-1.127-2.949-.833-1.068.25-2.109 2.503-2.039 3.108.191.247.236.795.055 1.445-.494 1.77-3.021 5.185-7.08 7.24-1.537.776-3.459 1.773-5.441 2.8-3.818 1.978-7.764 4.021-9.789 4.948-1.375.632-3.496 1.383-5.549 2.113-1.531.541-3.561 1.266-4.285 1.622a1.792 1.792 0 0 1-.264.385c-.785.887-2.738 1.503-4.752 1.503l-.26-.002c-.652 0-1.314.206-1.902.481.814.191 1.801.411 2.893.639 2.654.548 4.559 3.521 5.254 4.773.982 1.771.84 2.162.721 2.477-.039.106-.1.246-.162.378l.152.812-2.311.451-.049-.231a696.08 696.08 0 0 0-8.113-.042l-1.957.002c-5.477.013-12.734 9.991-13.104 11.635-.416 1.857-.816 5.688-.818 6.653.4.721 1.055 2.314.906 4.049l-.109 1.075c.652.309 1.703.776 2.877 1.254.035.016.381.146 1.422.146 2.412 0 6.557-.693 9.043-1.808l.414-.102 2.986-.178c.629-.677 1.816-1.789 4.002-3.845 1.842-1.729 2.889-2.877 3.264-3.368.189-1.653 4.605-3.94 4.65-3.963 1.979-1.018 5.432-5.363 5.777-6.099l.082.039c.754-1.48 4.852-3.757 12.227-6.785.916-.376 1.93-.564 3.018-.564 4.928 0 10.77 3.861 15.924 7.267 2.109 1.392 4.102 2.708 5.773 3.583l-1.084 2.106c-.223-.112 4.191 4.064 5.291 5.108.354-.13.902-.385 1.199-.653.514-.463 1.422-2.036 1.527-2.615-.129-.345-.195-.883.189-1.54.18-.305.461-.626.795-.92-.961-.529-2.354-1.236-4.229-2.069l-1.074-.481.717-1.628c-.889-.414-2.58-1.091-4.898-1.87-3.336-1.121-5.803-4.869-6.406-6.097-.186-.378-.369-.821-.205-1.312l-.041-.023.037-.819c.084-.98 1.285-1.504 1.799-1.686l.504-.079c1.674 0 8.334 3.204 13.758 7.462l3.469 3.382c5.725 4.77 9.705 7.804 10.539 8.281.461.095.85.401 1.057.853.334.723.156 1.649-.469 2.535l-.004.315.018 2.029c.332.031.656.049.969.049 1.537 0 2.279-.374 2.477-.595-.25-2.545-.25-2.545.127-2.967l.352-.395.531-.004c.379 0 .676.137.885.407.131-.046.273-.102.416-.165-.854-.794-1.475-1.85-1.633-2.32l-.189-.556.088-.169c-.557-.602-1.051-1.534-.951-2.466a1.864 1.864 0 0 1 1.066-1.524c.738-.348 1.918-.098 2.902.166l.369.103c.643-.32 1.834-.576 4.078-.576.951 0 1.924.06 2.895.179.641.076 1.375.011 2.197-.177a9.66 9.66 0 0 1 2.463-.871c.758-.37 1.266-.724 1.561-.98l-.037-.022-.133-.691-.07-2.773.303-.434c3.359-3.743 5.568-6.386 6.074-7.091.102-.663.434-1.66.861-2.354.396-.64 1.068-.908 4.207-.908 8.01 0 8.143.662 8.293 1.434l.188.957-.271.113c.119.161.293.354.523.544.395.318 2.002.779 3.875.779.492 0 .961-.035 1.365-.115.176-.033.338-.075.488-.12a1.733 1.733 0 0 1-.311-.854c-.127-1.335 1.154-2.699 3.047-3.247 1.135-.327 2.791-.54 4.213-.54 1.846 0 2.881.324 3.365 1.048.289.437.336.97.125 1.468-.238.565-.549 4.055 3.711 7 2.324 1.604 3.27 3.171 2.807 4.647-.611 1.968-3.436 2.849-8.477 2.562l-13.854 2.103-1.15.013c-7.268 0-15.475-.144-18.686-.335l-.324-.009c-.33 0-.652.029-.961.079-.74.337-1.527.616-2.299.818.283.249.459.568.457 1.005l.008.448-.086 2.526-.863.216a.75.75 0 0 0-.236.097c.049-.01.148.198.479.502l.934.847c2.117 1.911 3.131 2.854 3.615 3.418.4.023 1.201.039 2.184-.018.219-.01.502-.018.838-.018 2.674 0 9.537.416 12.283 1.067.34.082.766.173 1.248.272 4.398.937 8.439 1.964 9.568 4.222.389.779.393 1.633.006 2.464-1.324 2.853-2.514 11.216-2.58 12.678.328.733.469 1.145.131 1.664l-.35.543-1.305.004-.123-.2c-1.465-.216-6.793-.622-13.008-.696l-.312-.045-11.551-3.31c-7.842-1.91-13.008-2.936-13.705-2.941-.084.026-.67.055-1.504.089-1.463.055-3.785.142-5.98.427l-.076 2.598a52.67 52.67 0 0 1-.018 2.108l.045 1.205-.674.344c-.357.183-.986.396-2.648.396-3.08 0-8.469-.739-13.725-1.88-3.008-.651-18.021-4.212-17.977-10.216.068-1.202.598-2.04 1.023-2.716.377-.6.607-.99.629-1.447l-.004-.269c-.596-.76-.895-1.571-.824-2.272.045-.418.215-.788.492-1.066a2.59 2.59 0 0 0-.006-.842c-1.766.201-9.346 1.904-15.385 4.201l-.404.075-20.977.297c-6.656 1.268-15.354 7.484-18.795 13.56-.193.344-4.869 8.503-12.564 13.88-16.727 10.921-16.754 28.274-16.752 28.446.078 8.151.816 14.585 1.314 15.609.268.555 1.213 3.982 1.33 5.82.445.792 3.324 5.571 6.828 11.18.088.137 8.75 13.791 18.656 13.791 1.008 0 2.01-.145 2.977-.428 4.127-1.211 7.793-1.434 11.338-1.654 3.715-.229 7.555-.465 12.062-1.835 19.824-6.013 19.824-6.013 20.033-6.013H196l-.967 1.755c-2.793 5.072-3.08 8.238-2.607 9.043.051.083.094.155.338.155l.584-.044c4.451 0 13.908 12.593 16.756 17.38.639 1.079 15.566 26.642 3.314 44.479-10.979 15.982 11.791 45.082 12.021 45.375 4.707 5.939 11.164 9.931 14.238 9.931h.074c3.383-.069 18.213-3.017 25.152-6.017l.641-4.975.342-.296c5.396-4.649 12.895-10.119 17.176-12.553l.137-12.398c.41-9.271 8.262-12.714 8.598-12.854 7.256-3.081 11.934-7.191 12.094-8.782.225-2.226-2.621-12.918-6.189-19.114-.395-.686-3.398-7.084 12.391-20.396 8.416-7.617 28.025-25.359 29.049-41.585-1.785.429-5.709 1.85-11.166 4.437-.186.088-4.604 2.15-9.777 2.152-5.939 0-10.477-2.748-13.119-7.951-.623-1.226-.754-2.516-.879-3.765-.1-.988-.193-1.92-.525-2.762-.895-2.274-2.59-4.418-4.387-6.691-1.582-2.001-3.217-4.067-4.355-6.332-1.488-2.957-2.543-6.091-3.561-9.123-1.164-3.461-2.266-6.73-3.965-9.802-4.131-7.469-5.535-11.254-5.594-11.413-3.545-9.66-3.193-10.161-2.822-10.692l.352-.507.656-.021c.771 0 1.176.669 1.395 1.026.605.999 2.502 1.813 3.467 1.844 1.004-2.46 1.146-2.781 2.008-2.781h.564l.717.88-.135.72c.023.531 1.242 4.085 3.133 7.295 1.713 2.909 7.287 10.687 11.357 16.367l1.469 2.049c.053.072 1.322 1.86 5.363 8.626.479.807 2.225 5.634 2.752 7.092 2.51 6.987 4.854 11.79 5.645 12.714.035.002.076.002.129.002 1.406 0 5.119-.871 8.895-2.334 4.338-1.673 15.211-6.866 16.055-7.452l.023.03c1.656-1.505 7.826-4.57 11.668-6.406 5.178-2.473 9.295-11.416 10.072-13.711a14.328 14.328 0 0 1-.758-.891c-.531-.326-1.51-1.012-3.561-2.451-1.658-1.163-4.25-4.396-5.15-6.241-.988.257-3.23 1.237-5.986 3.559-1.061.896-2.205 1.351-3.4 1.351-2.527 0-4.373-2.047-5.049-2.924-.455-.597-1.484-2.086-1.213-3.111.059-.216.043-.667 0-1.029-2.232-1.059-7.059-5.751-10.182-9.675-.275-.345-2.646-3.438-1.498-5.814.674-1.4 2.299-2.111 4.828-2.111l.27.003c4.279.16 5.631 3.115 6.719 5.486.506 1.102.982 2.142 1.682 2.875l4.996 4.897a34.286 34.286 0 0 1 3.777-.197c5.02 0 10.123.926 12.998 2.361 3.191 1.587 9.914 3.742 11.377 4.1 1.23-.413 3.369-.544 3.395-.544h.002c2.053 0 7.543 2.75 9.012 5.093.533.854 2.527 2.301 3.984 3.358 2.221 1.611 2.93 2.159 3.049 2.967l.07.496-.322.49c-.08.104-.186.226-.303.362-.484.552-.938 1.124-.744 1.488.223.385 1.848 1.048 3.117 1.048.107 0 .186-.007.238-.011.262-.263.627-.648.986-1.025 1.408-1.485 1.525-1.604 2.086-1.616.504.076 1.6.002 1.779 4.031.07 1.561 1.318 11.379 2.779 18.437l3.547 7.246c1.814 5.675 3.551 8.343 4.33 9.028 1.027-1.944 2.395-7.613 2.387-12.411l.061-4.611c-.109-4.636 3.07-8.138 3.207-8.284 7.857-8.529 9.686-9.854 10.34-10.06.064-.056.131-.124.193-.185.336-.317.713-.678 1.281-.678h.754l.193.366c.322.093.92.194 1.344.194l.297-.013c.895 0 3.188.718 5.17 7.361a43.5 43.5 0 0 0 1.654 4.602c.287 4.183.486 8.39.486 12.645-.002 100.79-82.004 182.792-182.799 182.792zm75.523-285.69c-.02-.353-.148-3.485 1.518-5.25 2.434-2.574 6.943-.842 13.439 5.826l1.182 1.215-1.545.691c-.652.291-7.721.648-10.873.756.625.625 1.525 1.226 2.457 1.848 1.83 1.224 3.863 2.582 4.664 4.688 1.895-.312 3.674.174 4.475 1.116.734.865 1.018 2.565.586 3.495-.252.546-.742.873-1.312.873l-1.902-.178c-.021.601.164 1.007.281 1.054 1.898.811 2.646 5.986 2.689 7.379l.516 2.881-1.111.241c-.844.186-1.785.277-2.797.277-6.043 0-14.861-3.521-15.703-10.128l-.178-1.389 1.814.071c.197-.028.361-.164.477-.483.183-.517 1.751-7.547 1.323-14.983zm-21.408 7.503l.088.157.57 1.039-.266.146-.494.066h-.373l-.35-.224-3.094-2.156h3.771c-.068 0-.17 0-.336.091l.484.881zm-20.486 37.57l.969.039.119-.116.826-.808.469.374-.043 1.208-1.898 1.278-.412-1.634.936-.297-.966-.044z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe.svg
deleted file mode 100644
index 28e4b649be..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-globe.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M250.104 219.028c.023-.037.057-.069.08-.105-.09-.429-.163-.807-.196-1.075.04.392.082.785.116 1.18zm83.856 91.564c.004 0 .004-.004.004-.006-.012-.006-.05-.006-.058-.019.012.013.042.013.054.025zm2.147.268c-.52-.083-1.686.069-2.147-.269-.284.983.145 1.354 2.147.269zM254.426 37.775c-120.584 0-218.334 97.75-218.334 218.333s97.75 218.334 218.334 218.334c120.582 0 218.336-97.752 218.336-218.334 0-120.582-97.754-218.333-218.336-218.333zm139.46 85.292c-7.522.226-12.76.241-18.805 4.413-2.435 1.681-4.087 3.912-7.178 4.781-2.771.778-5.763.096-8.512 1.028-9.921 3.366-8.348 24.613-21.42 21.405-6.141-1.507-10.467-8.763-13.558-13.5-2.722-4.168-7.68-7.617-4.33-12.833-1.527.393-3.157-.055-4.66.232 2.095-4.602 9.116-4.197 10.284-6.547 2.91-5.89-8.01-6.505-11.103-7.321 3.727-3.974 5.614 1.335 9.293.434 3.536-.869-1.866-5.526-3.986-6.048-.762-.188-13.212 3.44-6.006-3.009-8.896-5.67-17.788-11.34-26.686-17.014-1.498 6.309 11.84 9.894 16.196 12.119-.676 2.604-4.729 6.399-7.832 5.287-2.922-1.047-1.735-5.89-6.148-5.405-3.151 7.327 6.662 5.186 7.573 9.675 1.037 5.115-3.709 2.949-5.534 2.858-.435-.021-3.836-3.543-4.021-.877-.221 3.165 5.427 1.932 5.824 5.127-6.576.266-9.936-2.109-15.289-5.665-6.248-4.147-9.455-3.773-17.11-3.773 2.29-.94 5.443-1.638 7.401-3.152 1.069-.828 5.266-4.906 5.542-5.818 1.187-3.927-.063-3.631-3.823-6.205-3.341-2.286-7.394-6.39-11.443-7.199-14.671-2.929-4.525 13.247-15.662 15.478.19.009.397.019.562.019h-.638c.027-.003.051-.013.076-.019-2.576-.093-7.403-.72-9.064.64-1.172.958-1.271 4.802-2.58 6.192-2.331 2.484-5.807 2.982-8.588 4.774-2.716 1.749-8.702 6.241-10.297 9.288-5.878 11.229 13.242 14.715 20.49 17.996 3.275 1.484 12.846 3.514 14.629 5.992 2.391 3.329-2.061 6.449 2.932 8.788 1.594.745 4.883.896 6.256-.648 2.231-2.513-.907-3.082-1.441-5.986-1.035-5.593.67-3.371 3.482-5.448 5.732-4.232 4.441-4.49 2.38-11.235-.959-3.14-4.57-11.9-1.394-14.217 4.145-3.025 12.981 1.638 16.159 2.027 3.698.454 5.797 5.577 7.812 7.672 1.339 1.391 3.732 4.344 6.071 4.023 3.712-.507 2.158-3.751 4.311-5.248 5.775-4.007 7.296 1.434 9.598 6.876 2.165 5.11 4.214 7.007 8.067 10.286 1.79 1.527 9.634 6.975 8.894 10.33-.502 2.262-9.462 5.692-11.857 6.452-8.759 2.772-25.188-4.542-26.952 9.347 3.397-1.267 13.062-9.162 15.962-5.419 1.322 1.699-1.048 4.171-.49 5.858 1.653 5.056 5.553 3.295 9.641 2.477a6.877 6.877 0 0 1-.865.46c5.586-2.871 5.006-2.271 7.568-6.929.837-1.52 2.083-5.203 3.262-6.291 4.062-3.736 4.687-1.164 7.201 1.719.659.759 6.879 9.715 4.665 9.269-7.234-1.452-14.181-1.257-20.181 2.698-3.457 2.283-6.727 5.364-10.855 6.881-.989.361-8.317 1.056-7.451-.195 1.264-1.82 5.617-3.028 7.334-4.993-4.759-1.96-8.729 2.367-12.47 4.898-3.969 1.878-4.892 5.376-8.271 8.444-1.476 1.338-4.265 1.564-5.713 3.326-1.406 1.708-1.581 4.393-2.912 6.016-.934 1.134-3.328.448-4.303 2.16-1.271 2.237 1.162 4.311.629 5.923-.976 2.926-6.543 5.408-8.684 7.516.286-.275.57-.558.85-.844-2.146 2.25-4.86 3.906-6.535 6.511.77 3.677 3.193 12.446 2.518 14.464-2.23 6.64-6.564-3.61-8.322-6.257-6.039-9.101-18.108-3.01-26.354-2.256-10.544.964-20.872 14.649-14.368 25.759 3.122 5.328 8.374 7.388 14.399 6.155 5.361-1.097 6.972-8.599 12.021-8.734 9.279-.248.205 9.093-.598 12.52-.742 3.175 1.157 3.47 4.425 4.255 2.414.578 5.832-1.031 7.924.347 1.318.87 1.255 5.634 3.068 4.131-3.569 2.958-2.736 9.972.923 12.509 4.058 2.812 8.835.207 13.082 1.288 8.019 2.046 4.19-.61 11.232-4.862 4.753-2.865 5.533.54 8.781.552 2.211.009 3.616-3.179 7.312-2.249 3.013.758 4.204 3.084 7.802 3.619 1.475.217 2.998-.554 4.404-.399 6.654.738 11.748 4.991 16.992 8.835 4.321 3.164 7.184 2.523 12.23 3.967 3.688 1.051 10.492 6.387 10.144 11.072-.062.837-3.285 5.053-3.836 6.949.944.655 7.507-.812 9.427-.952-.631.735-5.101 3.876-5.101 2.209 0 .853 3.163 2.608 3.933 3.155 2.331-7.569 6.16-2.699 10.768-.824 3.918 1.595 8.74 1.681 12.919 2.676 3.548.846 11.37 3.24 13.999 6.139 3.164 3.489.976 9.157-1.365 12.63-3.062 4.551-7.68 6.3-9.59 11.653-1.51 4.244-.376 8.531-1.239 13.236-1.166 6.367-2.101 4.135-6.201 8.021-3.451 3.271-.058 2.702-4.756 4.787-4.72 2.099-8.874 1.474-12.142 6.65.131-.325.237-.652.328-.992-1.378 1.929-2.068 5.881-2.721 7.176-1.647 3.308-3.919 5.395-6.523 8.15-.999 1.055-10.179 13.594-10.708 12.586-.683-1.31-7.919 1.316-8.265-.553.288 1.57-.068 1.044 1.729 1.95-1.665 10.305-6.023 11.841-16.144 11.946.87 4.953-3.667 3.964-5.775 6.628-1.232 1.556-1.821 5.927-2.676 7.941-.533 1.264-4.484 6.331-4.484 7.338-.004.924 1.328 2.278 2.577 3.578-7.134 1.41-14.409 2.396-21.798 2.995 1.383-1.742 1.716-3.273-2.689-3.483 1.179-3.203 3.946-5.03 5.12-8.133.557-1.464.096-2.043.566-3.492 1.612-5.008.913-3.12.004-7.01-2.128-9.113.758-11.607 3.242-19.952 2.551-8.579 2.313-19.697 3.947-28.936.775-4.422 2.047-13.618.511-17.799-1.729-4.706-9.34-8.412-12.825-11.578-4.935-4.494-7.558-9.354-11.221-14.91-1.86-2.821-3.98-5.59-5.431-8.66-3.104-6.561.002-2.654.523-6.527.5-3.742-.445-7.085 1.041-11.013 1.643-4.343 5.744-7.048 7.092-11.427 1.213-3.896.29-8.795-3.714-10.096-2.231-.727-4.692.949-6.935.582-3.127-.507-6.665-2.84-9.118-4.707-3.425-2.608-4.709-6.85-8.356-9.322-3.053-2.063-5.225-.828-8.49-1.793-3.406-1.004-5.509-5.206-8.257-6.522-4.124-1.972-6.447.859-10.8.288-3.702-.485-9.348-4.589-12.807-6.138-7.033-3.148-11.316-6.622-14.128-13.76-2.409-6.122-5.92-8.977-10.055-14.076-4.188-5.166-5.501-9.566-11.958-10.944-.758-.164 1.58 5.425 1.821 5.871 2.308 4.273 5.771 8.176 8.559 12.153 4.101 5.859 2.354 6.959-1.817 1.292-4.77-6.48-10.305-12.926-14.442-19.79-1.564-2.595-1.264-4.273-3.843-6.737-2.494-2.379-5.756-3.537-8.266-5.8-9.031-8.123-10.674-18.966-9.644-30.545.335-3.773 1.698-6.792 1.097-10.419-.496-3.013-2.275-5.503-4.496-7.724-.717-1.138-2.514-3.947-2.618-4.126-2.05-3.405-3.645-6.755-6.902-9.551-1.868-1.607-6.703-5.37-11.256-8.522 20.454-25.508 47.218-45.726 77.921-58.278.244 1.542.906 3.084 1.9 4.558 2.525 3.745 4.931 3.448 9.857 4.486-.527 5.717-7.213 5.763-11.738 5.142-5.401-.738-11.084-2.534-15.764 2.2 2.585 1.554 9.678 7.605 8.736 1.282 5.174-.259 10.176-.414 15.238.204 2.029.25 8.824 2.53 10.667 1.49.772-.437 1.597-4.25 2.414-5.423-1.443.008-2.991-.72-4.428-.582 3.353-4.292 6.692-.927 10.959 1.048-4.697 2.855-1.912 9.694 2.681 4.137 3.771-4.57-.924-7.885-5.713-10.547 4.829-6.04 7.808-6.587 12.352.233.75-4.207 4.143-2.522 7.69-2.213v-1.05c-1.562.036-3.229-.862-4.774-.699 3.613-5.765 1.307-7.083 6.473-8.963 4.114-1.499 15.85-.104 17.295-3.971-8.213 1.597-18.135 1.978-25.545 5.713-3.194 1.611-7 6.693-10.191 3.388-3.27-3.388 2.339-8.838 5.209-10.5h-.687a193.355 193.355 0 0 1 40.261-4.247c8.923 0 17.69.659 26.297 1.835-2.979 1.564-.775 2.621-2.945 4.219-4.143 3.047-11.497 5.589-16.427 7.515 6.267-.017 21.437 5.876 24.355-2.915-2.023-.309-4.041-.622-6.062-.933 3.776-2.504 7.988-4.53 12.411-6.016 39.905 7.907 75.4 28.147 102.401 56.551-.188-.003-.38-.009-.566-.003zm35.336 76.655c.359-.767 1.198-1.02 1.546-1.654.729-1.332.566-2.234 1.465-3.377.962-1.233 2.259-1.537 3.331-2.5a3.92 3.92 0 0 0 .873-1.115 191.52 191.52 0 0 1 7.654 27.822c-.057.068-.089.171-.159.229-.469.371-3.529.826-4.157.847-2.217.086-3.862-1.384-5.453-2.769-1.618-1.406-3.524-3.288-4.675-5.107-1.229-1.944-.47-3.94-.382-6.162.073-1.87-.835-4.531-.043-6.214zm2.498 100.108c-3.75-3.26-8.175-7.627-10.841-11.848-2.849-4.499-1.093-9.129-.886-14.282.174-4.335-1.943-10.503-.101-14.405.845-1.781 2.784-2.371 3.581-3.832 1.696-3.091 1.319-5.18 3.401-7.837 2.232-2.855 5.234-3.557 7.721-5.794 2.605-2.348 2.533-4.198 4.183-7.206 1.206-2.198 4.043-5.865 6.729-7.781a193.98 193.98 0 0 1 2.216 29.263c0 17.206-2.289 33.881-6.529 49.771-3.615-.933-6.589-3.537-9.474-6.049z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-google-fill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-google-fill.svg
deleted file mode 100644
index aafa688500..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-google-fill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M3.06364 7.50914C4.70909 4.24092 8.09084 2 12 2C14.6954 2 16.959 2.99095 18.6909 4.60455L15.8227 7.47274C14.7864 6.48185 13.4681 5.97727 12 5.97727C9.39542 5.97727 7.19084 7.73637 6.40455 10.1C6.2045 10.7 6.09086 11.3409 6.09086 12C6.09086 12.6591 6.2045 13.3 6.40455 13.9C7.19084 16.2636 9.39542 18.0227 12 18.0227C13.3454 18.0227 14.4909 17.6682 15.3864 17.0682C16.4454 16.3591 17.15 15.3 17.3818 14.05H12V10.1818H21.4181C21.5364 10.8363 21.6 11.5182 21.6 12.2273C21.6 15.2727 20.5091 17.8363 18.6181 19.5773C16.9636 21.1046 14.7 22 12 22C8.09084 22 4.70909 19.7591 3.06364 16.4909C2.38638 15.1409 2 13.6136 2 12C2 10.3864 2.38638 8.85911 3.06364 7.50914Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-google-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-google-line.svg
deleted file mode 100644
index 94ed1a3561..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-google-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 11H20.5329C20.5769 11.3847 20.6 11.7792 20.6 12.1837C20.6 14.9184 19.6204 17.2204 17.9224 18.7837C16.4367 20.1551 14.404 20.9592 11.9796 20.9592C8.46933 20.9592 5.43266 18.947 3.9551 16.0123C3.34695 14.8 3 13.4286 3 11.9796C3 10.5306 3.34695 9.1592 3.9551 7.94698C5.43266 5.01226 8.46933 3 11.9796 3C14.4 3 16.4326 3.88983 17.9877 5.33878L16.5255 6.80101C15.3682 5.68153 13.8028 5 12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.5265 19 18.1443 16.3923 18.577 13H12V11Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-gps.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-gps.svg
deleted file mode 100644
index 90572f37f6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-gps.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M458.175 341.1c-1.179-1.178-51.538-51.547-78.026-78.018l-8.666-8.666-12.232-.091-46.469-.369L337.506 233l-58.471-58.46-20.929 24.706-.361-46.437-.13-12.264-8.665-8.666-78.061-78.082L149.7 32.648l-21.125 21.149-74.494 74.46-21.16 21.192 21.223 21.183c1.211 1.194 78.029 78.033 78.029 78.033l8.665 8.664 12.261.106 48.497.38 6.804.065-12.461 14.69 43.525 43.516 14.717-12.457.033 6.829.394 48.479.099 12.262 8.664 8.672 78.09 78.071 21.16 21.167 21.158-21.167 74.461-74.458 21.225-21.202-21.29-21.182zM201.824 227.895l-48.495-.395s-78.06-78.066-78.091-78.081l74.461-74.453 78.09 78.092.393 48.481-26.358 26.356zm160.795 208.897l-78.09-78.091-.361-48.494 26.324-26.342 48.496.372 78.093 78.087-74.462 74.468zM205.16 358.596c-28.548-.035-51.702-23.193-51.732-51.713 0-11.057-8.963-20.03-20.016-20.03-11.084 0-20.045 8.974-20.045 20.03.031 50.689 41.072 91.744 91.793 91.797 11.054 0 20.014-8.963 20.014-20.031 0-11.053-8.929-20.036-20.014-20.053zm.327 103.588c-.033.018-.033.031-.033.049-.063.083-.097.18-.163.275.066-.114.131-.237.196-.324zm2.225-13.864c-.13-.722-.327-1.414-.525-2.084 0 .026.034.039.034.062a8.634 8.634 0 0 1-.096-.285c-.229-.656-.461-1.299-.754-1.911.098.179.163.349.229.538-.065-.189-.164-.359-.229-.538-.1-.196-.164-.386-.232-.565.037.088.068.206.101.269a20.114 20.114 0 0 0-2.319-3.851c-.689-.844-1.408-1.65-2.193-2.381a17.842 17.842 0 0 0-1.896-1.57c-.324-.241-.721-.489-1.08-.727a21.204 21.204 0 0 0-3.236-1.645 20.03 20.03 0 0 0-7.162-1.43h-.262c-29.988-.004-56.9-12.07-76.588-31.69-19.523-19.582-31.59-46.348-31.686-76.134.195-8.332-4.907-16.244-13.18-19.229-10.398-3.803-21.876 1.58-25.67 11.969-1.668 5.133-1.082 6.801-1.211 6.9 0 81.88 66.382 148.236 148.334 148.25h.262c1.342-.014 2.683-.21 3.989-.486.623-.145 1.245-.279 1.864-.473.034-.025.098-.025.131-.053 0 0 .031 0 .066-.017-.035 0-.035.017-.066.017.164-.049.329-.139.492-.188-.163.049-.295.123-.426.171.621-.21 1.275-.465 2.092-.808.033-.016.033-.033.064-.042-.064.042-.161.067-.262.101.395-.165.755-.371 1.111-.572-.13.078-.293.188-.455.27a19.753 19.753 0 0 0 2.156-1.229c-.16.131-.359.206-.557.338.297-.192.623-.391.918-.6-.129.082-.229.182-.361.262a16.308 16.308 0 0 0 2.16-1.618c-.132.091-.229.181-.361.271.132-.117.295-.227.458-.358.067-.087.165-.165.263-.267.229-.178.424-.372.62-.586.229-.193.393-.407.591-.622.52-.543.98-1.141 1.437-1.758a20.66 20.66 0 0 0 1.178-1.79c.065-.128.099-.246.163-.359.295-.538.559-1.088.818-1.644.066-.18.164-.368.229-.548 0 .035-.031.066-.064.109.263-.596.458-1.193.652-1.816a2.273 2.273 0 0 1-.127.422c.096-.268.16-.539.26-.779.166-.578.262-1.16.393-1.756.195-1.101.326-2.222.359-3.363v-.253-.254c-.034-1.261-.199-2.475-.426-3.67zm-6.346 18.935zm3.009-3.355c.034-.049.064-.09.099-.137-.064.088-.128.163-.197.259a.563.563 0 0 0-.128.2c.064-.109.162-.217.226-.322zm3.5-8.55c-.03.18-.098.355-.098.512-.131.561-.227 1.09-.359 1.633.195-.71.359-1.427.457-2.145zm-.49 2.267c0-.044 0-.092.033-.123-.033.031-.033.079-.033.123zm-1.898 4.563a21.66 21.66 0 0 0 .818-1.595c-.229.437-.458.864-.688 1.288-.031.084-.097.189-.13.307zm.949-1.977v.026c-.031.118-.097.228-.13.355.033-.127.098-.25.13-.381zm-6.606-24.213v.014c.034.057.098.07.131.102-.033-.032-.097-.075-.131-.116zm1.666 1.375c.099.066.133.145.23.209.035.036.098.084.131.127-.13-.127-.228-.232-.361-.336zm2.291 2.427c.033.048.064.132.133.163 0 .06.064.092.096.139a1.694 1.694 0 0 1-.229-.302zm3.01 5.312c-.066-.168-.133-.312-.197-.464.098.244.197.464.297.713-.035-.072-.069-.173-.1-.249zm.328.935c-.067-.236-.166-.471-.229-.686.062.215.161.438.229.66v.026zm.587 2.197v.084a.39.39 0 0 0 .065.166c-.031-.075-.065-.148-.065-.25zm-13.507 23.063v.012c-.098.031-.229.079-.328.104.1-.025.23-.073.328-.116zm-2.582.666a19.096 19.096 0 0 0 2.254-.551c-.521.15-1.046.238-1.536.369-.229.049-.487.127-.718.182zm3.891-38.332h.033-.033zm3.205 1.628l.031.017c0 .021.033.025.033.025-.033-.004-.033-.026-.064-.042z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-graduate.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-graduate.svg
deleted file mode 100644
index 81067c4cdb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-graduate.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M263.292 288.328l-7.293 2.361-7.291-2.361-102.213-33.09-7.133 97.459s33.734 37.411 117.809 37.411c84.07 0 115.473-37.411 115.473-37.411l-9.025-96.849-100.327 32.48zm-147.211-34.759v-4.565l130.646-67.268a5.917 5.917 0 0 1 7.973 2.553 5.918 5.918 0 0 1-2.553 7.973L165.96 236.65l90.039 29.15 222.262-71.955-222.262-71.954-222.26 71.954 84.566 27.377-25.902 13.34v18.27c-3.94 4.772-6.447 11.938-6.447 19.955 0 5.694 1.275 10.944 3.422 15.228l-2.379 27.797 11.443-4.519 5.504 4.519 7.281-5.702 9.668 5.702-2.377-27.793c2.146-4.284 3.428-9.536 3.428-15.231 0-7.613-2.261-14.461-5.865-19.219z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-grid.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-grid.svg
deleted file mode 100644
index 2e363c0c47..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-grid.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M473.591 145.183v-24.938h-81.87V38.396h-24.936v81.849h-98.168V38.396h-24.936v81.849h-98.152V38.396h-24.937v81.849H38.74v24.938h81.852v98.155H38.74v24.938h81.852v98.167H38.74v24.932h81.852v81.858h24.937v-81.858h98.152v81.858h24.936v-81.858h98.168v81.858h24.936v-81.858h81.87v-24.932h-81.87v-98.167h81.87v-24.938h-81.87v-98.155h81.87zm-328.062 0h98.152v98.155h-98.152v-98.155zm0 221.259v-98.167h98.152v98.167h-98.152zm221.256 0h-98.168v-98.167h98.168v98.167zm0-123.104h-98.168v-98.155h98.168v98.155z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hammer.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hammer.svg
deleted file mode 100644
index dfafc27d3c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hammer.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M418.096 172.056c-8.127-8.122-11.791-18.993-11.074-29.616l-13.632-13.63s-83.13-95.442-180.261-40.045l4.597 5.758 36.221-5.624-29.849 13.607 5.591 7.002c40.31-6.065 112.967 22.953 89.013 52.977l-70.803 70.798-.152-.153a37.927 37.927 0 0 1-16.822 9.318L40.066 416.787l59.752 59.744L273.775 286.09c1.581-6.657 4.924-12.981 10.119-18.172.643-.646 1.328-1.226 2.01-1.818l75.918-75.915.002.002c9.754.023 20.184 3.071 27.628 10.514 7.776 7.773 11.46 18.062 11.136 28.248l22.462 22.461 46.472-46.467-21.812-21.813c-10.622.716-21.493-2.95-29.614-11.074z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-active-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-active-alt.svg
deleted file mode 100644
index 102ae217cf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-active-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M271.209 133.183c8.49 0 14.807 2.68 15.562 11.761l1.009 21.27c1.929 7.745 4.196 10.188 6.28 10.188 3.555 0 6.595-7.094 6.595-7.094l1.704-9.542c1.418-8.013 5.828-10.79 12.541-10.79 1.986 0 4.174.244 6.549.669 10.402 1.848 20.418 6.429 18.58 16.827l-1.322 7.415v-.008s-6.795 24.79-3.418 24.79c.811 0 2.2-1.414 4.404-4.928-.002-.02-.002-.02.02-.031l5.217-5.824c2.416-3.854 5.283-5.344 8.479-5.344 4.227 0 9.028 2.604 14.131 5.797 8.947 5.607 5.663 15.648.381 36.201l-37.268 117.543-.479 36.15H219.471l-.287-37.619s-21.283-11.607-39.887-45.162l-40.727-74.061c-2.699-10.217 3.399-20.681 13.608-23.377a19.15 19.15 0 0 1 4.898-.635c8.471 0 16.216 5.66 18.474 14.24l11.649 26.216c3.013 2.362 5.016 3.677 6.306 3.677 4.491 0 .399-15.928.399-59.352l-1.302-28.716c-.388-10.567 7.867-19.427 18.413-19.81.232-.008.468-.012.699-.012 10.252 0 18.739 8.119 19.116 18.438 0 0 .488 9.949.488 11.242 0 8.029 6.401 14.746 11.595 14.746 3.548 0 6.534-3.131 6.534-11.117l-.805-18.822c-.873-10.52 7.847-13.865 18.382-14.743a51.413 51.413 0 0 1 4.185-.183m0-25.038c-1.986 0-4.097.091-6.27.272-11.598.962-20.337 4.271-26.722 8.931-7.377-5.518-16.55-8.764-26.501-8.764-.525 0-1.059.01-1.587.029-11.802.43-22.718 5.416-30.753 14.053-8.038 8.643-12.227 19.897-11.793 31.698l.003.104.004.109.876 19.254a44.026 44.026 0 0 0-11.39-1.496c-3.806 0-7.605.495-11.294 1.467-11.401 3.015-20.953 10.287-26.888 20.48-5.936 10.196-7.547 22.094-4.535 33.498l.785 2.981 1.484 2.694 40.729 74.062c12.76 23.014 26.89 37.546 36.885 45.892l.19 25.012.188 24.848h160.259l.328-24.707.432-32.439 36.148-114.014.211-.666.173-.673.937-3.622c2.698-10.42 4.831-18.651 5.032-26.732.483-19.229-10.634-29.111-17.307-33.293-4.897-3.066-10.115-5.984-15.861-7.789-1.857-14.672-12.64-29.634-39.144-34.345-3.973-.707-7.55-1.053-10.93-1.053-3.225 0-6.307.328-9.217.966-6.099-9.422-17.075-16.757-34.472-16.757z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-active.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-active.svg
deleted file mode 100644
index 49612abea3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-active.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M370.261 183.393c-5.674-3.548-12.311-7.326-19.448-7.326-1.332 0-2.811.131-4.372.486l.853-4.781c.954-5.402 1.845-23.377-26.688-28.45-3.098-.552-5.814-.821-8.303-.821-7.93 0-14.067 2.836-17.999 8.16l-.126-2.648-.006-.176-.016-.178c-.521-6.301-4.059-20.947-25.545-20.947-1.562 0-3.248.072-5.012.218-19.947 1.658-25.787 11.308-27.216 18.954-4.157-10.988-14.78-18.732-27.263-18.732-.36 0-.725.006-1.087.018-7.754.282-14.955 3.574-20.254 9.274-5.306 5.697-8.067 13.126-7.781 20.913l1.293 28.559c.004 9.138.184 17.01.426 23.807-4.244-11.217-15.044-18.816-27.238-18.816-2.512 0-5.018.326-7.45.971-7.527 1.983-13.828 6.781-17.748 13.512-3.917 6.727-4.979 14.576-2.99 22.104l.313 1.188.595 1.08 40.726 74.064c14.429 26.026 30.604 39.923 38.697 45.755l.238 26.561.09 9.927h130.488l.149-9.859.46-28.955 36.825-116.144.084-.262.067-.27.946-3.659c4.975-19.199 8.907-34.369-5.708-43.527z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-pointer-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-pointer-alt.svg
deleted file mode 100644
index 3e1185fe73..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-pointer-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M228.176 82.887c10.252 0 18.739 8.118 19.119 18.44 0 0 .485 114.86.485 116.151 0 5.692 3.219 8.612 6.942 8.612 5.115 0 11.185-5.505 11.185-16.896l-.801-18.82c-.875-10.523 7.844-13.868 18.379-14.742a50.734 50.734 0 0 1 4.173-.186c8.5 0 14.82 2.674 15.574 11.76l1.007 21.27c1.357 6.021 3.57 7.874 5.778 7.874 3.554 0 7.099-4.779 7.099-4.779l1.703-9.54c1.421-8.016 5.826-10.791 12.538-10.791 1.988 0 4.178.244 6.553.668 10.4 1.848 20.418 6.434 18.579 16.826l-1.322 7.417v-.01s-7.258 21.058-1.859 21.058c.713 0 1.646-.365 2.847-1.195.016-.01-.004-.014.02-.029l5.215-5.824c2.417-3.854 5.287-5.344 8.484-5.344 4.228 0 9.029 2.602 14.13 5.797 8.944 5.606 5.661 15.646.38 36.199l-37.268 117.548-.479 43.882H235.929l-.284-45.354s-21.283-11.605-39.889-45.161l-63.545-53.722c-8.069-6.823-9.077-18.894-2.261-26.958a19.102 19.102 0 0 1 14.621-6.783c4.361 0 8.742 1.482 12.333 4.523l36.351 28.556c2.741 2.152 5.078 3.298 7.058 3.298 7.757 0 10.052-17.663 10.052-62.207l-1.299-121.713c-.393-10.569 7.865-19.432 18.414-19.811.23-.008.462-.014.696-.014m0-25.037c-.529 0-1.062.008-1.591.027-11.801.428-22.714 5.418-30.75 14.055-7.94 8.533-12.123 19.617-11.809 31.256l1.299 121.373c-.003 8.119-.091 14.881-.238 20.518l-12.398-9.74a44.179 44.179 0 0 0-28.118-10.123 44.104 44.104 0 0 0-33.742 15.658c-15.718 18.6-13.379 46.52 5.217 62.24l60.164 50.871c12.091 20.585 25.1 33.85 34.478 41.68l.206 32.723.153 24.883h160.355l.268-24.763.44-40.148 36.138-113.987.213-.664.171-.668.937-3.623c2.701-10.422 4.831-18.653 5.034-26.734.488-19.23-10.634-29.115-17.308-33.299-4.894-3.063-10.11-5.984-15.859-7.785-1.861-14.67-12.644-29.635-39.143-34.341-3.975-.709-7.555-1.056-10.936-1.056-3.222 0-6.3.331-9.21.967-6.102-9.42-17.084-16.763-34.489-16.763-1.973 0-4.069.095-6.237.272-3.146.262-6.101.68-8.875 1.264-.096-23.574-.189-45.65-.211-50.723l-.004-.401-.014-.404c-.874-23.871-20.263-42.565-44.141-42.565z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-pointer.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-pointer.svg
deleted file mode 100644
index a002ace0f3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hand-pointer.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M383.389 231.515c-5.371-3.36-11.638-6.943-18.119-6.943-2.245 0-4.986.43-7.754 1.925.097-.371.195-.733.296-1.092l.091-.33.062-.327 1.316-7.416c1.095-6.178.872-21.009-24.659-25.544-2.946-.522-5.52-.779-7.863-.779-10.914 0-17.994 6.03-19.939 16.99l-.021.125-.664-13.991-.006-.138-.012-.127c-.576-6.97-4.34-18.654-23.051-18.654-1.507 0-3.074.069-4.802.211-23.315 1.939-25.854 14.997-25.257 22.709l.078 1.84c-.864 3.258-1.725 4.076-2.479 4.65-.131-32.344-.384-92.605-.401-96.048v-.123l-.006-.122a26.551 26.551 0 0 0-26.621-25.673c-.318 0-.634.006-.956.016-7.123.255-13.701 3.265-18.55 8.474-4.812 5.175-7.337 11.898-7.122 18.952l1.303 121.682c0 29.89-1.225 47.999-3.64 53.879-.363-.24-.804-.556-1.321-.958l-36.238-28.467a26.65 26.65 0 0 0-17.083-6.209c-7.86 0-15.28 3.438-20.354 9.439-4.592 5.436-6.796 12.331-6.199 19.423.594 7.091 3.912 13.525 9.35 18.118l62.503 52.843c14.716 26.068 31.001 39.37 38.296 44.433l.252 27.834.066 7.449h125.543l.117-7.396.462-29.319 36.934-116.494.065-.197.051-.205.948-3.666c4.897-18.922 8.44-32.588-4.616-40.774z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handprint.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handprint.svg
deleted file mode 100644
index c9c254204b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handprint.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M206.408 102.193h4.218c11.25-.034 20.374-9.143 20.405-20.407V68.493c-.031-11.265-9.155-20.359-20.405-20.39h-4.218c-11.249.03-20.375 9.141-20.375 20.39v13.293c0 11.264 9.126 20.373 20.375 20.407zm81.033-13.637l4.185.459c.755.095 1.474.128 2.195.128a20.492 20.492 0 0 0 20.306-18.184l1.602-15.039c.098-.75.131-1.46.131-2.208-.016-10.303-7.719-19.112-18.164-20.274l-4.205-.458c-.718-.097-1.521-.117-2.221-.117-10.271.021-19.098 7.736-20.26 18.166l-1.636 15.061a21.46 21.46 0 0 0-.129 2.208c.014 10.282 7.731 19.097 18.196 20.258zm66.157 32.604l4.17.735c1.158.18 2.338.296 3.531.296 9.729-.023 18.298-6.936 20.08-16.826l3.155-17.793c.164-1.193.278-2.354.278-3.532-.02-9.728-6.951-18.31-16.843-20.078l-4.15-.733a20.455 20.455 0 0 0-3.534-.313 20.429 20.429 0 0 0-20.096 16.841l-3.137 17.775a20.17 20.17 0 0 0-.314 3.514c.018 9.747 6.951 18.345 16.86 20.114zm77.371 10.251l-4.019-1.34c-2.128-.704-4.285-1.062-6.412-1.031-8.569 0-16.512 5.397-19.36 13.933l-4.396 13.176a19.546 19.546 0 0 0-1.065 6.426c0 8.55 5.396 16.514 13.932 19.377l3.992 1.342a20.435 20.435 0 0 0 6.358 1.03h.083c8.55 0 16.515-5.382 19.374-13.948l4.398-13.182c.688-2.123 1.047-4.283 1.047-6.422-.001-8.556-5.397-16.499-13.932-19.361zm-220.082 26.944c10.956-.147 18.722-9.695 18.737-20.374v-11.757c-.016-10.692-7.781-20.241-18.737-20.403-10.985.162-18.738 9.711-18.738 20.403v11.757c-.001 10.679 7.752 20.227 18.738 20.374zm75.001-13.504l.116.016c.262 0 .587.016.946.016 10.483-.148 18.281-8.91 18.902-19.228l.622-10.22c.032-.489.032-.896.032-1.372.033-10.108-7.03-19.361-17.494-20.132-.359-.047-.783-.047-1.063-.047-10.481.148-18.265 8.929-18.886 19.262l-.622 10.202c-.048.459-.048.95-.048 1.372-.049 10.109 7.031 19.376 17.495 20.131zm-11.639 55.25l5.837.852c.883.11 1.732.179 2.582.179 8.778-.015 16.416-6.411 17.725-15.321l1.258-8.501a19.98 19.98 0 0 0 .181-2.568 17.941 17.941 0 0 0-15.32-17.743l-5.838-.85a15.601 15.601 0 0 0-2.586-.196c-8.776.015-16.398 6.428-17.72 15.336l-1.261 8.487c-.13.867-.182 1.748-.182 2.599 0 8.764 6.411 16.417 15.324 17.726zm-83.245-4.32c.033 9.438 7.652 17.059 17.069 17.073h5.626c9.417-.015 17.036-7.636 17.07-17.073v-13.408c-.034-9.416-7.653-17.053-17.07-17.068h-5.626c-9.417.016-17.036 7.652-17.069 17.068v13.408zm156.086-21.91l.082.021c.604.079 1.225.11 1.914.11 10.039-.132 17.789-8.239 18.967-18.214l.668-5.625c.085-.882.148-1.717.148-2.583 0-9.617-6.441-18.574-16.417-19.852-.683-.08-1.37-.133-2.026-.133-10.038.133-17.788 8.245-18.937 18.221l-.667 5.655c-.117.85-.164 1.731-.164 2.551-.016 9.613 6.426 18.577 16.432 19.849zm-17.53 46.78l5.711 1.947c1.944.656 3.937.983 5.884.983 7.638 0 14.764-4.773 17.381-12.395l1.67-4.874c.653-1.928.98-3.924.98-5.883-.018-7.652-4.809-14.75-12.394-17.369l-5.726-1.959a18.2 18.2 0 0 0-5.902-.982c-7.635 0-14.763 4.791-17.379 12.425l-1.651 4.844a17.899 17.899 0 0 0-.979 5.883c-.001 7.635 4.769 14.749 12.405 17.38zm81.919-33.176a17.665 17.665 0 0 0-4.905-.702c-8.766.084-16.27 6.31-18.821 15.029l-1.486 5.001c-.622 2.06-.883 4.15-.883 6.163-.033 8.19 4.742 16.169 13.162 18.69 1.554.46 3.157.687 4.774.687h.083c8.779-.08 16.269-6.296 18.835-15.01l1.472-5.021c.606-2.061.883-4.136.883-6.164.067-8.174-4.741-16.139-13.114-18.673zm-12.819 55.218l-4.364-2.502a14.918 14.918 0 0 0-7.602-2.06 15.3 15.3 0 0 0-13.23 7.621l-2.5 4.384c-1.374 2.387-2.062 5.017-2.062 7.583 0 5.265 2.748 10.42 7.618 13.229l4.35 2.536c2.389 1.341 5.037 2.028 7.589 2.028 5.262 0 10.43-2.715 13.244-7.623l2.533-4.346a15.517 15.517 0 0 0 2.026-7.62c.001-5.25-2.727-10.399-7.602-13.23zm-16.054 68.202c-.935-4.907-4.09-9.486-8.341-12.101l-41.402-23.907c-2.81-1.631-7.535-4.805-10.071-6.801l-25.019-19.54c-3.562-2.663-8.711-4.822-13.145-5.478l-52.403-6.802c-1.603-.21-3.433-.291-5.331-.291-2.926 0-5.936.196-8.387.619l-19.865 3.633c-5.383 1.077-9.207 5.688-9.339 11.18l.017 31.692c.164 5.164 2.926 10.038 7.277 12.832l39.733 23.659c3.89 2.224 9.254 3.729 13.7 3.86l38.293.439c2.305-.064 7.262 1.721 8.994 3.258l21.747 17.624c3.581 2.798 8.731 4.922 13.228 5.459l46.305 4.696c.344.031.705.047 1.014.047h.066c2.257 0 4.446-.852 6-2.389 1.604-1.568 2.453-3.806 2.453-6.047 0-.521-.067-.997-.096-1.489l-5.428-34.153zm-7.785 45.484l-71.307-2.872c-.048 0-.211-.022-.424-.022-5.202.148-9.847 3.223-11.855 8.081l-10.334 26.569.443-12.607c.018-.147.018-.279.018-.342-.103-5.366-3.813-9.877-9.094-10.99l-.163-.031-7.668-.656 8.503-5.46c.883-.196 1.731-.454 2.599-.944 1.03-.576 2.486-2.062 2.486-4.188-.019-1.833-.949-2.995-1.703-3.729-.783-.75-1.65-1.242-2.647-1.732l-30.118-14.258c-3.041-1.404-8.128-4.019-11.086-5.672l-29.922-16.662a9.94 9.94 0 0 0-4.773-1.241c-3.596-.021-7.082 2.044-8.764 5.493l-11.035 22.545c-.805 1.917-4.566 5.086-6.609 5.546 0 0-11.756 3.399-23.562 7.261-5.885 1.928-11.771 3.955-16.334 5.788-2.271.882-4.202 1.732-5.69 2.566-.768.422-1.454.817-2.104 1.372-.559.603-1.674 1.178-1.867 3.612.063 1.421.312 1.717.59 2.551 1.928 5.351 9.582 21.093 16.904 36.007a3854.258 3854.258 0 0 0 14.228 28.386c1.963 3.808 5.493 8.175 8.812 10.874l42.202 33.908c3.058 2.389 6.965 3.449 10.775 3.502 1.227 0 2.436-.132 3.613-.428l49.183-13.049c1.406-.391 2.748-.656 3.631-.766.751.538 1.406.781 2.354 1.226 1.179.491 2.65 1.06 4.218 1.536l20.342 6.443c2.044.639 4.251.85 6.541.881 2.745-.031 5.493-.357 7.88-1.241l27.404-10.123c4.611-1.849 8.503-5.772 10.383-10.384l31.475-85.463c.395-1.082.621-2.176.621-3.268.128-4.355-3.796-7.981-8.146-8.019zm-248.55-74.838c0-.766-.031-1.484-.099-2.17l-1.39-13.854c-.392-3.743-1.372-9.368-2.287-13.027l-2.877-11.576a13.52 13.52 0 0 0-11.087-9.717l-17.249-1.976a13.615 13.615 0 0 0-1.408-.086c-4.628.101-9.206 2.062-12.279 5.626l-8.143 9.829c-1.979 2.439-2.797 5.428-2.812 8.37 0 2.145.44 4.304 1.57 6.28l33.831 59.041c1.159 2.028 3.09 3.992 6.066 4.057 3.302-.096 5.296-2.552 6.194-4.854l9.861-24.119c1.373-3.431 2.078-7.916 2.109-11.824z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handshake.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handshake.svg
deleted file mode 100644
index b83e3bf315..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handshake.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M401.914 170.85c-.828-.06-20.471-1.699-37.729-18.96-15.855-15.856-23.988-16.04-24.068-16.04H236.242l-59.924 52.295c5.25 3.096 12.924 6.374 21.871 6.374 7.898 0 15.754-2.566 23.342-7.625 18.061-12.038 32.398-19.5 48.047-19.5 16.365 0 32.326 8.078 53.367 27.016 37.914 34.122 79.26 74.921 79.672 75.33l2.465 2.434v46.345h57.67V170.873l-60.838-.023zm-220.67 156.512a17.263 17.263 0 0 0-12.279-5.087 17.27 17.27 0 0 0-12.285 5.087l-4.613 4.615 24.561 24.565 4.619-4.62c6.767-6.771 6.765-17.789-.003-24.56zm32.936 32.935a17.27 17.27 0 0 0-12.285-5.085 17.243 17.243 0 0 0-12.271 5.078c-.002 0-.002 0-.002.002L185 364.917l24.559 24.561 4.621-4.621c6.769-6.771 6.769-17.788 0-24.56zm20.652 27.847c-4.637 0-9 1.806-12.283 5.085l-4.615 4.619 24.557 24.561 4.621-4.619c6.771-6.77 6.771-17.789 0-24.563a17.25 17.25 0 0 0-12.28-5.083zm-86.525-93.713a17.244 17.244 0 0 0-12.277-5.088 17.256 17.256 0 0 0-12.281 5.084l-4.619 4.618 24.564 24.562 4.619-4.617c6.765-6.773 6.765-17.791-.006-24.559zm163.234-88.001l-.01.011c-17.324-15.532-30.279-22.474-41.953-22.474-11.471 0-23.371 6.398-38.852 16.719-10.363 6.907-21.309 10.408-32.537 10.408-23.775 0-40.209-15.802-40.896-16.475l-6.414-6.271 79.148-69.073h95.299c12.508-11.172 10.369-29.682 10.369-29.682h-95.059c-47.205 0-48.615 7.788-81.656 40.827-29.121 29.118-57.42 29.985-57.42 29.985H49.248v140.352h51.428l14.701-14.702c5.52-5.517 12.854-8.553 20.652-8.553s15.133 3.039 20.65 8.557c6.725 6.72 9.443 15.928 8.229 24.689 1.334-.184 2.686-.311 4.057-.311 7.801 0 15.133 3.038 20.652 8.555 6.721 6.722 9.439 15.93 8.227 24.694 1.332-.187 2.682-.314 4.051-.314 7.803 0 15.139 3.037 20.654 8.554 6.723 6.723 9.445 15.931 8.227 24.69 1.338-.184 2.689-.311 4.057-.311 7.801 0 15.135 3.037 20.652 8.551a29.05 29.05 0 0 1 7.451 12.796c5.877 4.513 14.348 4.093 19.727-1.285 5.846-5.846 5.846-15.362-.002-21.212l-69.92-69.922 11.721-11.721 69.922 69.923c5.848 5.847 15.363 5.848 21.213-.002a14.897 14.897 0 0 0 4.393-10.606c0-4.006-1.561-7.771-4.393-10.602l-69.924-69.922 11.721-11.721 69.922 69.921c5.85 5.844 15.367 5.843 21.215-.003 5.846-5.846 5.846-15.362 0-21.21l-69.92-69.92 11.721-11.722 69.918 69.923c5.848 5.842 15.363 5.841 21.215-.005 5.846-5.846 5.846-15.362 0-21.212l-69.924-69.924z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handtool-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handtool-alt.svg
deleted file mode 100644
index 1464083b74..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handtool-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M248.783 78.871c9.851 0 18.21 7.547 19.038 17.531l10.328 124.342c1.933 7.75 4.196 10.189 6.282 10.189 3.555 0 6.595-7.09 6.595-7.09l18.366-103.214c1.642-9.254 9.717-15.771 18.814-15.771 1.109 0 2.236.097 3.366.296 10.4 1.853 17.329 11.783 15.49 22.181L329.078 228.42v-.008.01-.002c.012.398.468 15.027 5.367 15.027 1.682 0 3.884-1.722 6.77-6.32-.003-.02-.003-.02.02-.033l30.148-65.229c3.634-5.794 9.863-8.977 16.235-8.977 3.471 0 6.979.941 10.136 2.918 8.947 5.609 11.658 17.422 6.055 26.377L349.747 306.5s-6.678 49.663-28.724 90.12l-.479 34.612H209.841l-.286-36.086s-21.284-11.604-39.886-45.158l-63.544-53.725c-8.069-6.818-9.079-18.889-2.262-26.954 3.785-4.476 9.187-6.778 14.622-6.778a19.005 19.005 0 0 1 12.331 4.516l36.351 28.557c3.816 2.991 8.558 5.167 12.906 5.167 11.025 0 19.547-13.972 4.202-64.077l-30.55-99.506c-3.11-10.111 2.57-20.803 12.659-23.9a19.021 19.021 0 0 1 5.623-.85c8.184 0 15.755 5.291 18.287 13.52l30.27 98.619c.332.611.706 1.448 1.127 2.672 2.243 6.395 8.296 15.954 12.815 15.954 3.407 0 5.939-5.429 5.313-21.733L229.692 99.572c-.873-10.521 6.95-19.762 17.484-20.635a19.787 19.787 0 0 1 1.607-.066m0-25.039c-1.21 0-2.441.051-3.652.152-24.299 2.015-42.406 23.397-40.388 47.659l.021.235c-8.166-9.043-19.907-14.48-32.756-14.48-4.39 0-8.757.659-12.972 1.949-11.275 3.465-20.528 11.109-26.051 21.533-5.53 10.426-6.663 22.384-3.189 33.664l30.546 99.5c2.202 7.189 3.755 13.189 4.843 18.157l-18.601-14.61a44.184 44.184 0 0 0-28.094-10.104h-.012a44.123 44.123 0 0 0-33.734 15.65c-7.618 9.016-11.269 20.451-10.284 32.207.984 11.756 6.492 22.424 15.5 30.039l60.161 50.863c12.1 20.611 25.118 33.879 34.495 41.703l.188 23.477.196 24.844H345.239l.343-24.691.396-28.632c18.301-36.167 25.896-76.288 27.97-89.046l51.994-109.955c11.696-20.44 5.236-46.742-14.894-59.355a44.083 44.083 0 0 0-23.431-6.739 44.255 44.255 0 0 0-17.64 3.637l1.737-9.768c4.24-23.997-11.806-46.961-35.765-51.218a44.485 44.485 0 0 0-7.744-.684 44.087 44.087 0 0 0-35.188 17.46l-.244-2.95c-1.884-22.706-21.209-40.497-43.99-40.497z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handtool.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handtool.svg
deleted file mode 100644
index 2202ced6d6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-handtool.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M403.066 159.934a26.618 26.618 0 0 0-14.125-4.064c-9.244 0-17.693 4.669-22.599 12.497l-.255.403-.201.433-27.938 60.443c-.004-.074-.012-.146-.012-.218l17.843-100.286c2.557-14.469-7.119-28.321-21.569-30.893a26.787 26.787 0 0 0-4.684-.415 26.597 26.597 0 0 0-26.213 21.975l-16.861 94.763-9.824-118.296c-1.135-13.7-12.788-24.425-26.528-24.425-.729 0-1.476.028-2.214.086-14.653 1.218-25.572 14.114-24.356 28.746l10.108 121.72c.157 4.256.076 7.391-.109 9.678-1.305-2.02-2.603-4.471-3.428-6.829a28.575 28.575 0 0 0-1.227-3.015l-30.078-97.994c-3.465-11.262-13.698-18.825-25.47-18.825-2.644 0-5.281.393-7.822 1.179-6.802 2.087-12.382 6.699-15.715 12.984-3.333 6.289-4.018 13.5-1.921 20.305l30.548 99.507c12.183 39.772 7.347 50.681 5.573 53.074-.688.936-1.394 1.281-2.594 1.281-2.298 0-5.47-1.366-8.275-3.566l-36.234-28.464a26.634 26.634 0 0 0-17.08-6.209 26.606 26.606 0 0 0-20.36 9.443c-4.59 5.433-6.794 12.332-6.2 19.42.599 7.09 3.915 13.524 9.35 18.122l62.506 52.844c14.716 26.057 30.997 39.361 38.296 44.427l.251 32.019.062 7.45h125.564l.101-7.407.442-31.909c28.994-34.966 29.196-81.08 28.845-91.407l53.084-112.253c7.463-12.41 3.626-28.612-8.681-36.324z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hard-drive-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hard-drive-alt.svg
deleted file mode 100644
index 89ce2fea0e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hard-drive-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M393.414 372.478c10.307 0 18.666-8.355 18.666-18.663 0-10.305-8.359-18.659-18.666-18.659-10.302 0-18.659 8.354-18.659 18.659 0 10.307 8.357 18.663 18.659 18.663zM157.819 339.19h23.686v31.966h-23.686zm57.911.003h23.673v31.966H215.73zm-115.812-.003h23.681v31.969H99.918zM385.987 94.027H125.952l-76.33 195.634v128.312h412.756V289.661L385.987 94.027zm52.712 300.267H73.301V313.34h365.398v80.954z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hard-drive.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hard-drive.svg
deleted file mode 100644
index 98a2a993d4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hard-drive.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M387.675 96.433h-261.94l-77 197.073h415.984L387.675 96.433zM36.933 324.146v85.258h439.625v-85.258H36.933zm55.968 62.1H67.983v-33.662h24.918v33.662zm60.99-.014h-24.955v-33.648h24.955v33.648zm60.972 0h-24.936v-33.648h24.936v33.648zm212.036 1.393c-10.839 0-19.653-8.783-19.653-19.641s8.814-19.649 19.653-19.649 19.653 8.792 19.653 19.649-8.814 19.641-19.653 19.641z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hat.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hat.svg
deleted file mode 100644
index c8a1106446..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hat.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M439.457 311.077c-15.4 6.983-34.01 13.167-55.02 18.197l-1.096-180.839c-30.885-13.931-76.686-22.746-127.782-22.746-51.129 0-96.927 8.815-127.813 22.746V329.26c-20.963-5.034-39.505-11.218-54.874-18.184l-17.529 38.917c50.459 22.645 121.453 35.975 200.804 36.068 79.35-.094 150.413-13.424 200.838-36.068l-17.528-38.916z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hd.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hd.svg
deleted file mode 100644
index 77bf64d4fa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hd.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M170.977 220.982H96.386v-87.949H33.43v245.73h62.956V275.799h74.591v102.965h62.961v-245.73h-62.961v87.948zm300.007-10.512c-3.131-14.316-9.05-27.702-17.629-39.955-10.861-15.422-25.482-26.33-43.125-32.092-10.525-3.458-23.12-5.163-37.949-5.386H265.186V378.77h107.757c36.557.003 65.527-16.162 83.098-46.78 13.136-22.679 19.516-50.065 19.5-81.719 0-12.713-1.529-25.979-4.557-39.801zm-66.317 84.259c-4.099 10.212-9.483 17.264-16.001 21.877-6.539 4.595-14.473 7.002-24.646 7.03h-36.979V188.169h36.979c10.261-.006 18.418 1.49 24.473 4.101 6.085 2.642 10.121 6.187 12.989 11.032 6.354 10.76 10.04 27.547 10.017 50.252.005 16.285-2.362 29.993-6.832 41.175z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-headphones.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-headphones.svg
deleted file mode 100644
index 811c656c7e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-headphones.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M443.742 371.621V293.86c-.012-51.788-20.942-98.514-54.871-132.463-33.954-33.933-80.68-54.868-132.473-54.869-51.787.001-98.511 20.937-132.468 54.869-33.925 33.949-54.859 80.675-54.869 132.463v77.761h.006-35.06V293.86c.012-122.832 99.562-222.376 222.391-222.39 122.838.014 222.385 99.558 222.398 222.39v77.761h-35.054zm-35.251 56.393c0 7.08-5.739 12.822-12.82 12.822h-46.099c-7.08 0-12.818-5.742-12.818-12.822V286.977c0-7.077 5.738-12.818 12.818-12.818h46.099c7.081 0 12.82 5.741 12.82 12.818v141.037zm-232.439.004c0 7.079-5.737 12.82-12.819 12.82h-46.099c-7.081 0-12.819-5.741-12.819-12.82V286.979c0-7.075 5.739-12.818 12.819-12.818h46.099c7.083 0 12.819 5.743 12.819 12.818v141.039z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-headset.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-headset.svg
deleted file mode 100644
index 98db2e30db..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-headset.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.998 49.497c-117.223.014-212.225 93.63-212.236 209.151v73.13h33.453v-73.13c.012-48.708 19.986-92.648 52.367-124.58 32.404-31.911 76.992-51.598 126.416-51.604 49.428.005 94.018 19.692 126.42 51.604 32.379 31.931 52.355 75.872 52.365 124.58v73.13h33.453v-73.13c-.009-115.521-95.013-209.137-212.238-209.151zM388.91 225.988h-43.994c-6.758 0-12.234 5.399-12.234 12.054v132.64c0 6.661 5.477 12.06 12.234 12.06h43.994c6.756 0 12.232-5.399 12.232-12.06v-132.64c.001-6.655-5.476-12.054-12.232-12.054zM167.088 382.746c6.756 0 12.232-5.399 12.232-12.059v-132.64c0-6.655-5.477-12.054-12.232-12.054h-43.994c-6.758 0-12.234 5.398-12.234 12.054v132.639c0 6.66 5.477 12.059 12.234 12.059h43.994zm105.91 10.994h-39.012c-8.496 0-15.383 6.789-15.383 15.161v20.636H77.217v-39.025H43.762v71.992h229.236c8.494 0 15.381-6.788 15.381-15.16v-38.442c0-8.373-6.887-15.162-15.381-15.162z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hearts.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hearts.svg
deleted file mode 100644
index c2edaafe03..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hearts.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M343.37 94.976c-42.628 0-82.753 17.632-87.626 59.189-4.857-41.558-44.981-59.189-87.64-59.189-45.962 0-78.255 49.901-78.255 96.14 0 105.434 166.958 225.643 166.958 225.643S421.64 296.549 421.64 191.115c0-46.238-32.277-96.139-78.27-96.139z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-height.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-height.svg
deleted file mode 100644
index bf6a75975b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-height.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M182.504 322.507l73.58 89.11 73.577-89.11h-47.973V193.003h47.973l-73.577-89.144-73.58 89.144h48.039v129.503h-48.039zM160.955 38.029v51.164h190.291V38.029H160.955zm0 436.113h190.291v-51.145H160.955v51.145z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-help-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-help-alt.svg
deleted file mode 100644
index 101c65318d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-help-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.854 38.094c120.295 0 217.811 97.519 217.811 217.809 0 120.297-97.516 217.815-217.811 217.815-120.293 0-217.81-97.519-217.81-217.815 0-120.291 97.518-217.809 217.81-217.809m0 37.557c-99.391 0-180.253 80.86-180.253 180.251 0 99.395 80.862 180.256 180.253 180.256 99.391 0 180.251-80.861 180.251-180.256 0-99.39-80.86-180.251-180.251-180.251zm-57.097 58.14c14.748-9.496 32.873-14.247 54.371-14.247 28.244 0 51.714 6.748 70.399 20.25 18.686 13.497 28.029 33.496 28.029 59.995 0 16.246-4.051 29.933-12.153 41.058-4.739 6.751-13.837 15.375-27.301 25.87l-13.272 10.312c-7.232 5.628-12.032 12.188-14.398 19.69-1.497 4.748-2.309 12.122-2.433 22.12h-50.806c.745-21.122 2.741-35.716 5.979-43.778 3.24-8.062 11.591-17.34 25.048-27.84l13.648-10.686c4.484-3.373 8.1-7.062 10.843-11.062 4.982-6.876 7.476-14.438 7.476-22.688 0-9.499-2.774-18.154-8.324-25.966-5.547-7.811-15.68-11.718-30.393-11.718-14.465 0-24.725 4.812-30.77 14.437-6.048 9.627-9.069 19.622-9.069 29.999h-54.185c1.501-35.62 13.938-60.87 37.311-75.746zm31.123 210.731h56.055v54.184H229.88v-54.184z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-help.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-help.svg
deleted file mode 100644
index a1c5fdc7c1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-help.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M451.419 255.976c9.882-16.999 15.255-36.734 15.241-57.494.021-35.186-15.329-73.104-48.443-106.155-33.029-33.091-70.943-48.446-106.128-48.421-20.764-.012-40.501 5.358-57.503 15.243-17.006-9.885-36.747-15.255-57.506-15.247-35.186-.019-73.1 15.336-106.129 48.427-33.095 33.052-48.451 70.979-48.426 106.172-.016 20.75 5.354 40.479 15.238 57.473-9.888 16.997-15.254 36.733-15.238 57.489-.025 35.195 15.343 73.119 48.426 106.158 33.029 33.102 70.956 48.453 106.15 48.434h.068c20.734 0 40.445-5.365 57.426-15.236 16.998 9.871 36.726 15.236 57.487 15.223h.06c35.168.004 73.062-15.342 106.082-48.42 33.104-33.039 48.455-70.953 48.439-106.143.013-20.762-5.36-40.501-15.244-57.503zM312.089 68.945c27.88.024 59.294 11.999 88.43 41.088 29.096 29.143 41.076 60.568 41.102 88.449-.01 12.669-2.502 24.637-7.11 35.452-.061-.061-.118-.126-.179-.189-.039-.036-.085-.064-.127-.101-10.102-82.05-75.083-147.188-157.3-157.304-.027-.029-.047-.065-.08-.096-.062-.065-.131-.125-.193-.185 10.818-4.61 22.79-7.101 35.457-7.114zm50.889 300.135l-42.993-42.006.496-.487c38.047-38.038 38.222-100.114.421-138.397l42.745-42.21c61.185 61.934 60.793 161.626-.669 223.1zm-254.32-259.043c29.127-29.086 60.538-41.067 88.422-41.088 12.671.009 24.639 2.5 35.461 7.111-.064.061-.131.12-.196.185-.029.028-.05.065-.079.096-82.037 10.097-147.182 75.083-157.298 157.312-.033.035-.072.056-.107.09-.065.062-.125.131-.188.195-4.606-10.809-7.099-22.77-7.11-35.437.025-27.89 12.009-59.319 41.095-88.464zm80.343 75.746l-.494.488c-38.025 38.035-38.208 100.111-.411 138.393l-42.743 42.213c-61.176-61.937-60.811-161.633.67-223.104l42.978 42.01zm8.101 257.227c-27.892-.016-59.316-12.008-88.436-41.091-29.094-29.137-41.078-60.569-41.104-88.456.012-12.672 2.504-24.64 7.11-35.452.062.062.122.132.188.194.035.035.074.057.107.09 10.093 82.028 75.05 147.154 157.269 157.295.043.044.071.097.112.141.065.062.13.119.192.182-10.811 4.601-22.773 7.088-35.438 7.097zm56.88-114.381c-19.439-.173-37.316-7.707-51.098-21.597-13.598-13.847-20.892-31.636-20.946-51.038 0-.062.006-.176.006-.353v-.146c.177-39.664 32.954-72.25 72.603-72.174h.688c19.377.173 37.271 7.719 51.063 21.622 13.585 13.815 20.903 31.592 20.94 50.917v.586c-.147 39.658-32.958 72.258-72.611 72.181h-.645zm146.54 73.283c-29.134 29.092-60.556 41.066-88.439 41.089-12.667-.007-24.629-2.497-35.444-7.095.062-.062.125-.117.186-.176.045-.047.072-.1.116-.143 82.022-10.105 147.152-75.061 157.268-157.283.038-.041.088-.062.125-.103.061-.06.118-.123.181-.185 4.608 10.818 7.101 22.789 7.11 35.461-.028 27.89-12.013 59.302-41.103 88.435z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-home.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-home.svg
deleted file mode 100644
index ebb93f4056..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-home.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.971 36.979L25.167 266.75l43.226 43.233 186.586-186.539 186.518 186.527 43.223-43.215L254.971 36.979zM91.083 322.702v151.167h117.111V336.506h93.5v137.363h117.112V322.693L254.971 158.849 91.083 322.702z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hourglass.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hourglass.svg
deleted file mode 100644
index c918b5407b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-hourglass.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M311.137 189.918c1.081-1.242 1.896-2.551 2.388-3.4v-18.949H198.806v18.949c.23.396.523.92.882 1.441 1.668 2.55 4.905 5.627 6.835 6.731l29.661 18.69c6.867 4.335 13.243 10.094 18.051 17.614a61.92 61.92 0 0 1 1.929 3.268 45.687 45.687 0 0 1 1.928-3.268c4.841-7.561 11.217-13.309 18.053-17.614l29.659-18.69c1.44-.848 3.632-2.761 5.333-4.772zm19.033 45.853c8.436-5.368 15.402-12.396 20.796-20.146 5.233-7.814 9.288-16.06 9.486-26.323v-70.247h13.701V66.732H138.177v52.322h13.702v70.247c.198 10.233 4.285 18.509 9.485 26.323 5.394 7.75 12.328 14.777 20.765 20.146l28.713 18.049c1.013.651 1.6 1.177 1.993 1.566-.394.43-.98.983-1.993 1.607l-28.713 18.065c-8.437 5.346-15.372 12.396-20.765 20.11-5.2 7.832-9.287 16.108-9.485 26.374v71.341h-13.702v52.307h235.977v-52.307h-13.701v-71.341c-.198-10.266-4.253-18.542-9.486-26.374-5.363-7.749-12.36-14.765-20.796-20.11l-28.713-18.065c-.98-.624-1.604-1.178-1.994-1.607.391-.39 1.014-.915 1.994-1.566l28.712-18.048zm-45.033 47.154l28.715 18.084c4.283 2.647 8.83 7.124 11.869 11.541 3.14 4.351 4.251 8.796 4.055 8.993v71.341h-16.251v-1.487c-.196-.43-.524-.937-.882-1.476-1.669-2.535-4.938-5.624-6.837-6.733l-29.659-18.674c-6.836-4.314-13.212-10.07-18.053-17.629-.686-1.044-1.307-2.122-1.928-3.235a69.141 69.141 0 0 1-1.929 3.254c-4.841 7.54-11.185 13.296-18.051 17.61l-29.628 18.674c-1.472.883-3.695 2.777-5.33 4.777a20.933 20.933 0 0 0-2.421 3.432v1.487h-16.253v-71.341c-.229-.197.917-4.643 4.057-8.993 3.007-4.417 7.554-8.894 11.837-11.541l28.744-18.084c9.421-5.822 16.679-15.801 16.646-27.539.033-11.707-7.225-21.694-16.646-27.495l-28.744-18.089c-4.283-2.665-8.83-7.162-11.837-11.545-3.14-4.332-4.286-8.795-4.057-8.955v-70.247h147.223v70.247c.196.16-.915 4.623-4.055 8.955-3.008 4.383-7.586 8.88-11.869 11.545l-28.715 18.089c-9.449 5.801-16.677 15.788-16.677 27.495-.001 11.738 7.227 21.717 16.676 27.539z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-imac.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-imac.svg
deleted file mode 100644
index 76a01b97b8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-imac.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M309.632 422.164c-.884-3.977-1.507-7.9-1.998-11.611H203.906c-.949 7.455-2.584 15.862-5.461 23.609-2.91 7.816-7.032 14.914-12.625 19.916-5.623 4.974-12.588 8.111-22.333 8.145v9.287h184.6v-9.287c-9.745-.033-16.742-3.171-22.365-8.16-8.376-7.458-13.442-19.801-16.09-31.899zm150.46-381.498H51.448c-6.798 0-12.327 5.508-12.327 12.326v323.387c0 6.801 5.529 12.33 12.327 12.33h408.644c6.801 0 12.325-5.529 12.325-12.33V52.992c0-6.818-5.524-12.326-12.325-12.326zm-17.595 263.245H69.077V70.59h373.42v233.321z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inactive-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inactive-line.svg
deleted file mode 100644
index 60a16437c2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inactive-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M447.028 468.9L42.031 63.902l21.762-21.763 405 405.002-21.765 21.759z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inbox-full.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inbox-full.svg
deleted file mode 100644
index c0beabfa29..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inbox-full.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M179.723 136.117h152.551v29.351H179.723zm-21.498 51.628h195.551v38.382H158.225zm-21.529 91.296H192.858v63.934c0 5.223 4.246 9.471 9.471 9.471h107.346c5.224 0 9.473-4.248 9.473-9.471v-63.934h56.156v-27.63H136.696v27.63zm243.66-209.564h-248.78L47.252 287.765v154.759h417.494V285.358l-84.39-215.881zm-47.002 223.772v49.726c0 13.078-10.604 23.679-23.68 23.679H202.329c-13.076 0-23.68-10.601-23.68-23.679v-49.726H93.358l69.066-178.771h187.215l69.891 178.771h-86.176z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inbox.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inbox.svg
deleted file mode 100644
index 0fd7c71b22..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-inbox.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M387.65 58.675H124.582L35.415 289.498v163.646h441.474V286.95L387.65 58.675zm-49.703 236.622v52.58c0 13.828-11.211 25.039-25.036 25.039H199.399c-13.828 0-25.041-11.211-25.041-25.039v-52.58H84.17l73.031-189.041h197.967l73.906 189.041h-91.127zm-49.103-158.21h-61.342v72.882h-57.567l88.243 106.915 88.24-106.915h-57.574v-72.882z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-indent.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-indent.svg
deleted file mode 100644
index 329b0f413e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-indent.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M204.67 166.785v-83.1h268.265v83.1H204.67zm0 131.002V214.69h268.265v83.097H204.67zm0 131.006v-83.1h268.265v83.1H204.67zm-60.865-172.551L35.514 319.291V193.187z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-infinity.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-infinity.svg
deleted file mode 100644
index c42e3bd49e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-infinity.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M144.192 365.176c-30.411.028-58.092-12.29-77.808-32.163-19.769-19.823-31.875-47.417-31.855-77.495.006-30.666 13.191-58.16 33.137-77.709 19.949-19.572 47.099-31.912 76.526-31.964 21.957-.063 41.812 5.919 58.365 15.51 16.62 9.567 30.071 22.332 41.774 35.899 4.18 4.885 8.168 9.896 12.011 14.953 2.728-3.65 5.52-7.273 8.397-10.841 14.787-18.177 32.267-35.504 55.794-46.071 13.375-5.997 28.59-9.476 44.9-9.444 59.838.165 109.449 48.753 109.666 109.667-.027 30.944-13.744 58.391-33.771 77.801-20.084 19.418-46.949 31.766-75.895 31.857h-.395c-21.291 0-40.588-6.099-56.568-15.703-16.146-9.646-29.146-22.399-40.549-35.914-4.016-4.809-7.868-9.729-11.59-14.703a358.626 358.626 0 0 1-8.685 11.013c-15.163 18.261-33.293 35.575-57.458 46.005-13.735 5.928-29.285 9.33-45.996 9.302m0-50.078c13.286-.059 23.464-3.195 33.416-8.849 9.887-5.654 19.406-14.249 28.803-25.169 6.63-7.616 13.056-16.305 19.557-25.554-5.619-8.004-11.186-15.582-16.897-22.414-12.52-15.151-25.101-26.172-38.647-31.945-7.807-3.329-16.09-5.213-26.23-5.236-15.042-.046-30.208 6.55-41.445 17.607-11.251 11.088-18.148 25.896-18.137 41.979.112 33.131 26.018 59.493 59.58 59.581m159.404-36.982c12.309 15.229 24.549 26.246 37.32 31.886 7.362 3.254 15.051 5.062 24.518 5.096 14.094.092 29.533-6.506 41.008-17.709 11.523-11.221 18.6-26.081 18.576-41.871-.008-16.369-6.722-31.133-17.706-42.08-11.005-10.909-25.895-17.519-41.878-17.507-12.384.069-21.808 3.066-31.295 8.636-9.406 5.588-18.658 14.185-27.88 25.158-6.534 7.687-12.916 16.467-19.427 25.813 5.612 8.06 11.135 15.698 16.764 22.578z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-info.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-info.svg
deleted file mode 100644
index f07ac8e7d1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-info.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M230.384 224.6c4.293-11.035-1.231-16.553-6.143-16.553-22.688 0-52.154 53.374-63.173 53.374-4.311 0-7.99-4.307-7.99-7.985 0-11.043 26.991-36.805 34.982-44.783 24.528-23.312 56.44-41.104 92.027-41.104 26.368 0 54.601 15.945 32.515 75.471L268.42 362.638c-3.665 9.205-10.415 24.557-10.415 34.367 0 4.29 2.438 8.595 7.348 8.595 18.396 0 52.155-52.158 60.748-52.158 3.061 0 7.351 3.675 7.351 9.196 0 17.793-71.771 93.876-133.744 93.876-22.088 0-37.423-10.421-37.423-33.738 0-29.441 20.854-79.757 25.169-90.194l42.93-107.982zm33.125-120.861c0-26.992 23.309-49.073 50.308-49.073 24.556 0 42.336 16.554 42.336 41.716 0 28.233-23.303 49.094-50.914 49.094-25.151 0-41.73-16.576-41.73-41.737z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-invoice.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-invoice.svg
deleted file mode 100644
index dd8457a63a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-invoice.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M390.008 145.332l-79.432-79.434-6.936-6.936H115.059v394.074h281.883v-300.77l-6.934-6.934zM373.26 429.355H138.738V82.642h133.92c35.182 0 18.23 83.392 18.23 83.392s81.328-19.766 82.371 17.527l.001 245.794zM200.121 200.674c-3.041-3.239-4.516-7.659-4.418-13.256h-20.77c.982 11.586 4.566 20.378 10.752 26.366 6.189 5.99 14.779 9.378 25.781 10.165v12.519h8.691v-12.519c7.365-.493 13.406-1.967 18.117-4.421 4.713-2.452 8.471-5.253 11.27-8.395 2.797-3.144 4.736-6.356 5.818-9.649 1.08-3.291 1.619-6.016 1.619-8.176 0-2.452-.17-5.252-.518-8.396-.344-3.144-1.445-6.285-3.309-9.429-1.869-3.143-4.766-6.162-8.695-9.06-3.93-2.895-9.525-5.325-16.787-7.291a106.997 106.997 0 0 0-3.908-1.031c-1.229-.294-2.428-.591-3.607-.882v-26.074c3.336 0 6.186 1.377 8.541 4.125 2.355 2.751 3.586 6.086 3.684 10.016H253.3c-.297-5.104-1.375-9.524-3.244-13.26-1.865-3.729-4.268-6.848-7.215-9.351-2.945-2.505-6.357-4.468-10.236-5.892-3.881-1.425-8.027-2.383-12.447-2.874v-11.343h-8.691v11.343a49.32 49.32 0 0 0-12.816 2.578c-4.123 1.423-7.758 3.44-10.898 6.04-3.146 2.604-5.674 5.816-7.59 9.649-1.914 3.827-2.869 8.248-2.869 13.256 0 4.909.83 9.013 2.5 12.3 1.67 3.293 3.908 6.041 6.705 8.252 2.797 2.208 5.967 3.975 9.5 5.303a119.314 119.314 0 0 0 10.752 3.459c.986.198 1.893.421 2.729.663.834.245 1.494.468 1.988.662v30.786c-4.519-.88-8.3-2.94-11.347-6.183zm20.037-22.097c5.795 1.573 9.891 3.315 12.299 5.23 2.4 1.914 3.609 4.787 3.609 8.618 0 2.356-.49 4.396-1.473 6.111a14.641 14.641 0 0 1-3.758 4.349 17.192 17.192 0 0 1-5.156 2.721c-1.914.642-3.756 1.058-5.521 1.253v-28.282zm-18.857-27.694c-2.061-1.767-3.092-4.269-3.092-7.51 0-2.063.369-3.854 1.105-5.378.738-1.521 1.742-2.799 3.02-3.829a12.764 12.764 0 0 1 4.271-2.282 16.175 16.175 0 0 1 4.861-.737v24.01c-4.716-1.08-8.101-2.505-10.165-4.274zm-28.483 107.454h166.363v23.678H172.818zm0 45.752v90.422h166.363v-90.422H172.818zm23.682 23.679h29.992v43.065H196.5v-43.065zm119.002 43.065h-65.328v-43.065h65.328v43.065z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ipad.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ipad.svg
deleted file mode 100644
index e79195e670..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ipad.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M407.693 37.204H105.369c-9.387 0-16.942 7.584-16.942 16.937v403.636c0 9.354 7.555 16.944 16.942 16.944h302.325c9.353 0 16.941-7.591 16.941-16.944V54.141c0-9.353-7.589-16.937-16.942-16.937zM256.515 467.593c-5.952 0-10.791-4.845-10.791-10.83 0-5.969 4.839-10.79 10.791-10.79a10.77 10.77 0 0 1 10.792 10.79c0 5.985-4.808 10.83-10.792 10.83zm137.475-31.005H119.07V75.334h274.92v361.254z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-iphone.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-iphone.svg
deleted file mode 100644
index b235644b03..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-iphone.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M334.191 65.595H173.834c-15.331 0-27.753 12.435-27.753 27.765v325.63c0 15.33 12.422 27.765 27.753 27.765h160.357c15.354 0 27.767-12.435 27.767-27.765V93.359c0-15.33-12.413-27.764-27.767-27.764zM235.885 89.24h36.274v12.048h-36.274V89.24zm18.15 342.938c-9.773 0-17.718-7.916-17.718-17.694 0-9.765 7.944-17.695 17.718-17.695 9.768 0 17.687 7.931 17.687 17.695 0 9.778-7.919 17.694-17.687 17.694zm87.132-46.555H166.881V126.725h174.286v258.898z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-item-arrangement.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-item-arrangement.svg
deleted file mode 100644
index fd9939dba3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-item-arrangement.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M49.035 60.434h413.93v33.592H49.035zm0 82.005h86.578v86.577H49.035zm163.677 0h86.576v86.577h-86.576zm163.676 0h86.576v86.577h-86.576zM49.035 282.984h413.93v33.593H49.035zm0 82.006h86.578v86.576H49.035zm163.677 0h86.576v86.576h-86.576zm163.676 0h86.576v86.576h-86.576z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-junk.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-junk.svg
deleted file mode 100644
index a8f48754d4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-junk.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M452.403 163.403l7.431-19.945-19.189-22.075-42.659-55.146-24.822-12.181H144.608l-23.572 10.666-56.893 64.735.065.145-12.042 13.855 4.167 85.021 3.153 13.709 18.386 37.854-19.668 54.384-1.871 10.675V426.561l31.382 31.382h335.527l29.005-43.362-14.491-35.087 16.006-66.918.258-13.424-17.603-88.482 15.986-47.267zM199.934 352.118v33.792H180.04a33.79 33.79 0 1 1-29.263-50.687l23.977-41.529-26.932-15.587 71.148-26.462 12.488 74.876-27.286-15.792-23.879 41.252-.129-.076-.124.213h19.894zm49.782-120.681l-7.932 13.741-29.245-16.93 7.913-13.706a33.792 33.792 0 0 1 58.528 0l23.888 41.373 26.561-15.271-12.499 73.597-69.894-26.228 26.536-15.258-23.856-41.318zm98.941 137.578a33.79 33.79 0 0 1-29.264 16.896h-42.768l.026 30.421-57.616-47.471 57.535-47.568.027 30.826h42.795l-6.953-12.042 29.296-16.842 6.921 11.989a33.79 33.79 0 0 1 .001 33.791zM87.715 150.177l56.893-64.738h228.554l50.08 64.738H87.715z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-key.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-key.svg
deleted file mode 100644
index 4a32d0004e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-key.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.808 42.17c-58.417 0-105.779 47.362-105.779 105.782 0 41.388 23.786 77.202 58.419 94.581v35.723l1.985 2.498 35.609 35.609-37.595 37.596v1.962l34.63 34.63-32.645 32.642 46.244 46.244 46.493-46.492V242.533c34.636-17.378 58.419-53.192 58.419-94.581 0-58.419-47.361-105.782-105.78-105.782zm0 110.471c-18.027 0-32.643-14.616-32.643-32.645 0-18.029 14.616-32.643 32.643-32.643 18.029 0 32.644 14.613 32.644 32.643-.001 18.029-14.615 32.645-32.644 32.645z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keyboard.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keyboard.svg
deleted file mode 100644
index c08d8d9e93..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keyboard.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M37.521 104.271v303.855h436.853V104.271H37.521zm411.802 278.804H62.573V129.322h386.75v253.753zm-252.44-206.691h-41.205v41.178h41.205v-41.178zm65.144 0H220.84v41.178h41.188v-41.178zm65.172 0H285.99v41.178h41.209v-41.178zm-7.719 108.825h40.073v-41.188H319.48v41.188zM129.212 175.568H88.027v41.183h41.185v-41.183zm37.37 68.453H88.868v41.188h77.714v-41.188zm24.324 0v41.188h41.175v-41.188h-41.175zm65.543 0v41.188h41.208v-41.188h-41.208zM88.775 352.862h41.187v-41.201H88.775v41.201zm65.875 0h201.547v-41.201H154.65v41.201zm226.782-67.213h41.188V176.287h-69.042v41.179h27.854v68.183zm-.558 67.213h41.208v-41.201h-41.208v41.201z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keychain.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keychain.svg
deleted file mode 100644
index e206a9150e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keychain.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M197.291 214.937a91.431 91.431 0 0 1 19.494-23.541 76.406 76.406 0 0 1-4.023-7.661c-8.293-18.317-8.953-38.77-1.863-57.586 7.088-18.815 21.082-33.744 39.4-42.035 18.318-8.289 38.768-8.952 57.582-1.865v-.001l.008.004c18.809 7.089 33.736 21.08 42.033 39.398 8.289 18.322 8.947 38.769 1.857 57.583-11.059 29.348-39.145 48.76-70.363 48.76-.67 0-1.34-.009-2.01-.028-.127-.002-.252-.004-.373-.004-7.91 0-14.453 6.314-14.652 14.281-.203 8.088 6.182 14.812 14.275 15.015.9.016 1.795.04 2.699.04 43.375 0 82.473-26.945 97.84-67.723 9.852-26.15 8.941-54.557-2.578-80.004-11.518-25.446-32.258-44.885-58.395-54.736l-.047-.013c-26.125-9.835-54.523-8.912-79.961 2.602-25.447 11.52-44.887 32.257-54.734 58.397-9.848 26.139-8.93 54.551 2.586 79.997a105.61 105.61 0 0 0 11.225 19.12zm-7.322 74.318l-63.941 63.929v41.679h41.463v-29.254h31.051l12.244-12.24 11.434-11.435v-8.65a90.008 90.008 0 0 1-32.251-44.029zm173.371 70.234l-14.805-44.826a90.405 90.405 0 0 1-18.902 18.622v104.128l32.66 16.439 18.643-37.038-12.166-40.881-5.43-16.444zm-20.906-107.845c-18.025 11.157-39.092 17.491-61.078 17.491-.805 0-1.604-.016-2.4-.032l-.596-.012a26.307 26.307 0 0 1-9.967-2.233c-10.451-3.217-18.039-12.943-18.039-24.45 0-12.604 9.113-23.046 21.107-25.158a26.07 26.07 0 0 1 8.259-1.12c.564.013 1.131.022 1.693.022 12.328 0 24.109-3.696 34.117-10.128-11.1-8.14-24.787-12.957-39.604-12.957-37.041 0-67.062 30.027-67.062 67.066 0 26.237 15.082 48.939 37.033 59.951v22.653l1.26 1.58 22.574 22.578-23.834 23.832v1.25l21.951 21.953-20.691 20.691 29.32 29.318 29.477-29.476V320.085c21.957-11.012 37.033-33.714 37.033-59.951.001-2.878-.2-5.706-.553-8.49z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keyhole.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keyhole.svg
deleted file mode 100644
index b97b156002..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-keyhole.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.652 38.669c-120.082 0-217.434 97.351-217.434 217.4 0 120.08 97.352 217.438 217.434 217.438 120.049 0 217.399-97.357 217.399-217.438.001-120.049-97.35-217.4-217.399-217.4zm0 383.691c-91.694 0-166.289-74.596-166.289-166.291 0-91.663 74.595-166.252 166.289-166.252 91.68 0 166.255 74.589 166.255 166.252 0 91.696-74.575 166.291-166.255 166.291zm52.976-221.26c0-29.252-23.74-52.975-52.976-52.975-29.269 0-52.993 23.723-52.993 52.975 0 24.001 15.976 44.261 37.853 50.751l-29.677 112.201h89.602l-29.691-112.201c21.893-6.491 37.882-26.735 37.882-50.751z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lab.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lab.svg
deleted file mode 100644
index b750677812..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lab.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M404.368 355.32l-.198-.375-.227-.373-71.224-119.722c-9.127-16.909-17.106-48.19-17.106-67.237v-55.3h15.029V82.392H180.883v29.921h17.547v55.3c0 19.001-7.932 50.157-17.054 67.106l-73.581 119.529-.31.54-.311.532c-9.683 17.678-10.236 36.248-1.539 50.977 8.734 14.689 25.28 23.134 45.423 23.134h209.424c20.141 0 36.689-8.444 45.422-23.134 8.699-14.729 8.143-33.299-1.536-50.977zM244.716 251.186l-74.133 120.442v.012-.012l-25.476-15.685 73.745-119.79c9.595-17.229 18.604-52.55 18.342-72.054v-41.336h29.922V164.1c-.242 26.976-9.466 62.975-22.202 86.788l-.198.298zm33.421 79.923c-10.512 0-19.03-8.505-19.03-19.029 0-10.516 8.519-19.021 19.03-19.021 10.5 0 19.035 8.506 19.035 19.021 0 10.524-8.535 19.029-19.035 19.029zm58.305 62.057c-16.708 0-30.265-13.546-30.265-30.256 0-16.714 13.557-30.264 30.265-30.264 16.712 0 30.269 13.55 30.269 30.264 0 16.71-13.557 30.256-30.269 30.256z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-laptop.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-laptop.svg
deleted file mode 100644
index dc120cca29..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-laptop.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M437.375 335.82H72.363l-27.084 52.807h419.179l-27.083-52.807zm-228.202 40.133l11.253-21.395h69.995l10.146 21.395h-91.394zm221.94-52.34c0-.334-.066-.65-.1-.975.033-.33.1-.645.1-.973V103.223c0-5.539-4.491-10.028-10.033-10.028H88.653c-5.539 0-10.029 4.489-10.029 10.028v218.443c0 .328.067.643.099.973-.031.324-.099.641-.099.975l-.085.162h352.658l-.084-.163zm-25.04-16.955h-302.41V118.23h302.41v188.428zm64.564 94.019H39.101l-1.046 2.036c0 5.542 4.492 15.041 10.03 15.041H461.65c5.541 0 10.033-9.499 10.033-15.041l-1.046-2.036z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layers-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layers-alt.svg
deleted file mode 100644
index e02a1cadbf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layers-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M117.535 237.887H82.61V395.93h225.118v-36.139H117.535V237.887zm62.329-61.084h-37.38v61.084h-.031v96.962h165.275v-.015h59.812V298.68H179.864V176.803zm24.953-61.085v158.029H429.9V115.718H204.817z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layers.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layers.svg
deleted file mode 100644
index c6965e3e95..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layers.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M194.227 248.271l-43.363-41.089h-80.61l102.62 97.286h268.411l-59.317-56.197H194.227zm9.942-24.934H472.55l-102.648-97.29H101.518l102.651 97.29zm-41.239 106.05l-43.33-41.075H38.99l102.651 97.283h268.383l-59.32-56.208H162.93z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layout.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layout.svg
deleted file mode 100644
index 355f314f0f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-layout.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M472.986 37.758v436.666H36.32V37.758h436.666m-30.775 30.777H67.098v375.112h375.113V68.535zM110.673 219.579h73.331v178.48h-73.331zm117.47 1.442h168.32v175.805h-168.32zm-117.47-115.282h285.79v70.574h-285.79z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-left-double-arrow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-left-double-arrow.svg
deleted file mode 100644
index 0958c291da..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-left-double-arrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M343.473 256.003L437.94 87.995h-34.024L250.857 256.003l153.057 168.002h34.027zM261.141 87.995h-34.025L74.059 256.003l153.055 168.002h34.027l-94.467-168.002z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-legal.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-legal.svg
deleted file mode 100644
index e4ea59375e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-legal.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M174.359 291.527l-62.919-146.83-63.065 146.83c0 34.828 28.206 62.983 62.999 62.983 34.794.001 62.985-28.155 62.985-62.983zm-98.712 0l35.792-83.521 35.792 83.521H75.647zm325.858-146.83l-63.083 146.83c0 34.828 28.188 62.983 62.982 62.983 34.797 0 63.001-28.155 63.001-62.983l-62.9-146.83zm-35.808 146.83l35.808-83.521 35.774 83.521h-71.582zm-86.235 99.416V141.949h156.183V111.31H279.462v-.758c9.481-7.52 15.581-19.127 15.581-32.176 0-22.73-18.428-41.107-41.155-41.107-22.71 0-41.139 18.377-41.139 41.107 0 13.049 6.116 24.656 15.566 32.176v.758H77.103v30.639h151.212v248.994c0 28.545-23.151 51.732-51.768 51.732h-53.074v30.67h260.845v-30.67h-53.09c-28.582.001-51.766-23.187-51.766-51.732z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lense.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lense.svg
deleted file mode 100644
index 229a7749bd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lense.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.39 38.42c-120.065 0-217.417 97.319-217.417 217.414 0 120.066 97.353 217.4 217.417 217.4 120.095 0 217.418-97.334 217.418-217.4.001-120.095-97.323-217.414-217.418-217.414zm0 383.668c-91.679 0-166.272-74.592-166.272-166.254 0-91.696 74.593-166.29 166.272-166.29 91.678 0 166.27 74.594 166.27 166.29 0 91.662-74.592 166.254-166.27 166.254zm-.016-305.399c-76.832 0-139.113 62.293-139.113 139.127 0 76.866 62.281 139.146 139.113 139.146 76.864 0 139.18-62.28 139.18-139.146 0-76.834-62.316-139.127-139.18-139.127zm-.752 240.863c-56.737-.015-102.733-46.027-102.733-102.779 0-6.427.604-12.704 1.733-18.788-7.164-.604-14.308-1.243-21.306-1.867a141.695 141.695 0 0 1 15.223-36.672l42.906 29.217a93.037 93.037 0 0 0-5.381 11.808c-4.612-.328-9.253-.687-13.964-1.062a85.58 85.58 0 0 0-1.766 17.365c0 23.588 9.55 44.86 24.984 60.332 15.469 15.453 36.725 24.984 60.303 24.984 18.574 0 35.694-5.919 49.673-15.959-7.454-2.761-12.785-9.893-12.785-18.293 0-10.775 8.747-19.493 19.523-19.493a19.441 19.441 0 0 1 17.527 10.989c7.243-12.526 11.38-27.03 11.38-42.561 0-23.596-9.517-44.851-24.983-60.319-15.469-15.436-36.726-24.985-60.335-24.985-2.092 0-4.187.101-6.245.266l-.493 12.162c-15.304 3.876-29.79 11.769-41.811 23.788-.274.314-.554.608-.831.885l-43.2-29.414a157.16 157.16 0 0 1 7.44-8.047c22.645-22.66 51.03-36.1 80.477-40.321l-.933 23.381c1.883-.097 3.746-.162 5.595-.162 56.771.034 102.78 46.015 102.78 102.768.002 56.749-46.007 102.762-102.778 102.777zm-10.498-101.718c0-6.229 5.069-11.268 11.267-11.268 6.228 0 11.25 5.039 11.25 11.268 0 6.209-5.021 11.25-11.25 11.25-6.199 0-11.267-5.041-11.267-11.25z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-library.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-library.svg
deleted file mode 100644
index 1551dec3c9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-library.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M435.107 205.502v-19.731h-70.248v19.731h9.078v122.542h-9.078v19.729h70.248v-19.729h-9.078V205.502h9.078zm26.885-74.091h.002L255.518 67.374 49.039 131.411v30.682h412.953v-30.682zm-206.476 4.776c-10.811 0-19.574-8.764-19.574-19.576 0-10.81 8.764-19.573 19.574-19.573s19.574 8.764 19.574 19.573c0 10.811-8.764 19.576-19.574 19.576zm83.755 69.315v-19.731h-70.246v19.731h9.076v122.542h-9.076v19.729h70.246v-19.729h-9.076V205.502h9.076zm100.008 169.476H73.686l-23.682 69.649h412.957l-23.682-69.649zM243.441 205.502v-19.731h-70.248v19.731h9.076v122.542h-9.076v19.729h70.248v-19.729h-9.08V205.502h9.08zm-95.836 0v-19.731H77.357v19.731h9.076v122.542h-9.076v19.729h70.248v-19.729h-9.076V205.502h9.076z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-light-down.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-light-down.svg
deleted file mode 100644
index c214226f59..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-light-down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.989 186.463c38.106 0 68.999 30.891 68.999 68.994 0 38.112-30.893 69.002-68.999 69.002-38.109 0-69.002-30.89-69.002-69.002 0-38.103 30.893-68.994 69.002-68.994zm-17.53-54.484v-25.271c0-9.677 7.849-17.524 17.525-17.524 9.678 0 17.531 7.848 17.531 17.524v25.271c0 9.678-7.854 17.529-17.531 17.529-9.676 0-17.525-7.852-17.525-17.529zm0 272.23v-25.27c0-9.681 7.846-17.524 17.525-17.524 9.68 0 17.531 7.844 17.531 17.524v25.27c0 9.676-7.852 17.528-17.531 17.528-9.679 0-17.525-7.852-17.525-17.528zm92.447-223.671c-6.845-6.846-6.845-17.947 0-24.785l17.871-17.872c6.845-6.846 17.941-6.846 24.785 0 6.848 6.854 6.848 17.945 0 24.785l-17.873 17.872a17.456 17.456 0 0 1-12.391 5.135 17.46 17.46 0 0 1-12.392-5.135zM137.411 373.031c-6.846-6.846-6.846-17.937 0-24.783l17.869-17.87c6.848-6.843 17.945-6.843 24.786 0 6.848 6.847 6.848 17.944 0 24.785l-17.869 17.868a17.475 17.475 0 0 1-12.396 5.135 17.458 17.458 0 0 1-12.39-5.135zm241.053-100.047c-9.677 0-17.526-7.848-17.526-17.527.008-9.68 7.85-17.528 17.526-17.528h25.271c9.681.008 17.528 7.856 17.528 17.536 0 9.678-7.848 17.52-17.528 17.52h-25.271v-.001zm-272.225 0c-9.682 0-17.53-7.848-17.53-17.527 0-9.68 7.848-17.528 17.53-17.528h25.267c9.681.008 17.529 7.856 17.529 17.536 0 9.678-7.849 17.52-17.529 17.52h-25.267v-.001zm241.529 100.045l-17.861-17.87c-6.846-6.839-6.842-17.946.007-24.781 6.839-6.849 17.938-6.845 24.786.002l17.86 17.87c6.848 6.839 6.842 17.939-.004 24.787a17.444 17.444 0 0 1-12.386 5.129 17.487 17.487 0 0 1-12.402-5.137zM155.276 180.538l-17.864-17.872c-6.847-6.844-6.847-17.938 0-24.785 6.846-6.846 17.94-6.846 24.786 0l17.871 17.872c6.839 6.844 6.839 17.939-.005 24.785a17.464 17.464 0 0 1-12.394 5.135c-4.485 0-8.97-1.71-12.394-5.135z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-light-up.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-light-up.svg
deleted file mode 100644
index dbac39d507..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-light-up.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.787 186.545c38.106 0 68.997 30.894 68.997 68.996 0 38.109-30.891 69-68.997 69-38.109 0-69-30.891-69-69 0-38.103 30.891-68.996 69-68.996zm-17.525-54.484v-75.35c0-9.68 7.846-17.525 17.522-17.525 9.681 0 17.529 7.846 17.529 17.525v75.35c0 9.676-7.849 17.527-17.529 17.527-9.676 0-17.522-7.852-17.522-17.527zm-.002 322.304V379.02c0-9.68 7.845-17.523 17.527-17.523 9.678 0 17.524 7.844 17.524 17.523v75.346c0 9.68-7.846 17.535-17.524 17.535-9.682-.001-17.527-7.856-17.527-17.536zm92.447-273.745c-6.845-6.846-6.845-17.945 0-24.791l53.278-53.28c6.847-6.843 17.941-6.843 24.785 0 6.845 6.846 6.845 17.948 0 24.793l-53.278 53.278a17.474 17.474 0 0 1-12.393 5.128 17.477 17.477 0 0 1-12.392-5.128zM101.799 408.523c-6.845-6.844-6.845-17.938 0-24.781l53.279-53.28c6.843-6.843 17.94-6.843 24.787 0 6.845 6.845 6.845 17.944 0 24.784l-53.278 53.277a17.471 17.471 0 0 1-12.395 5.135 17.469 17.469 0 0 1-12.393-5.135zM378.262 273.07c-9.679 0-17.527-7.854-17.527-17.529 0-9.68 7.849-17.526 17.527-17.526h75.35c9.678 0 17.526 7.847 17.526 17.526 0 9.675-7.849 17.529-17.526 17.529h-75.35zm-322.306 0c-9.68 0-17.526-7.854-17.526-17.529 0-9.68 7.846-17.526 17.526-17.526h75.35c9.679 0 17.526 7.847 17.526 17.526 0 9.675-7.848 17.529-17.526 17.529h-75.35zm327.029 135.453l-53.279-53.277c-6.845-6.84-6.845-17.939 0-24.784 6.843-6.843 17.943-6.843 24.786 0l53.282 53.28c6.841 6.843 6.841 17.938 0 24.781a17.49 17.49 0 0 1-12.397 5.135 17.466 17.466 0 0 1-12.392-5.135zM155.073 180.62l-53.281-53.278c-6.838-6.845-6.838-17.947 0-24.793 6.852-6.843 17.947-6.843 24.793 0l53.278 53.28c6.847 6.846 6.847 17.945 0 24.791a17.479 17.479 0 0 1-12.396 5.128 17.476 17.476 0 0 1-12.394-5.128z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightbulb-active.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightbulb-active.svg
deleted file mode 100644
index 522460a54c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightbulb-active.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M338.233 80.661c-13.934-13.933-31.228-24.218-50.015-29.774-10.742-3.152-21.915-4.725-33.24-4.725-31.455 0-60.983 12.231-83.236 34.499-22.25 22.208-34.46 51.76-34.46 83.198l.494 10.821c1.477 16.173 6.198 31.601 14.04 45.825.082.789 44.311 80.123 44.311 129.688l1.516 14.678c2.385 9.789 7.382 14.767 14.848 14.767h84.977c7.468 0 12.457-4.978 14.85-14.767l1.512-14.678c0-49.564 44.227-128.898 44.685-129.688 7.47-14.225 12.191-29.652 13.646-45.825l.516-10.821c-.002-31.438-12.238-60.99-34.444-83.198zm4.022 91.933c-1.124 11.602-4.522 22.919-10.113 33.654-4.72 8.457-47.432 86.512-48.275 142.276l-.116 1.142h-13.787v-54.678h-29.979v54.678h-13.783l-.115-1.142c-.629-41.776-24.441-96.779-45.046-136.716l-.05-.461-2.924-5.311a86.42 86.42 0 0 1-10.383-33.469l-.427-9.333c.163-23.22 9.259-44.987 25.69-61.389 16.57-16.581 38.6-25.714 62.031-25.714 8.514 0 16.855 1.184 24.734 3.494 14.024 4.149 26.932 11.836 37.326 22.229 16.391 16.394 25.489 38.149 25.658 61.327l-.441 9.413zM207.14 429.956h95.676v-29.972H207.14v29.972zm20.78 34.542h54.096v-16.943H227.92v16.943z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightbulb.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightbulb.svg
deleted file mode 100644
index 2d67f238ee..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightbulb.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M374.638 173.241c-1.519 16.622-6.36 32.451-14.023 47.062-.472.818-45.887 82.276-45.887 133.174l-1.552 15.067c-2.454 10.046-7.57 15.153-15.257 15.153h-87.257c-7.651 0-12.783-5.107-15.247-15.153l-1.542-15.067c0-50.897-45.428-132.355-45.515-133.174-8.032-14.61-12.896-30.44-14.403-47.062l-.514-11.114c0-32.273 12.555-62.621 35.387-85.443 22.84-22.846 53.181-35.427 85.477-35.427a121.2 121.2 0 0 1 34.115 4.879c19.308 5.683 37.055 16.248 51.361 30.548 22.812 22.822 35.373 53.158 35.373 85.443l-.516 11.114zM205.169 435.373v-30.777h98.265v30.777h-98.265zm21.355 35.454v-17.394h55.55v17.394h-55.55z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightning.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightning.svg
deleted file mode 100644
index 4f8b5a1146..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lightning.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M282.137 304.436h-75.396l-43.248 78.006 45.127-9.479-45.161 90.322 147.667-137.529-46.779 9.811 17.79-31.131zM372.752 148.2a77.78 77.78 0 0 0 2.486-19.538c0-42.561-34.5-77.079-77.078-77.079-32 0-59.454 19.511-71.095 47.287-10.024-11.754-24.919-19.228-41.562-19.228-30.152 0-54.579 24.429-54.579 54.564 0 5.181.752 10.188 2.092 14.929-24.593 9.04-42.152 32.668-42.152 60.414 0 35.48 28.776 64.292 64.307 64.292h198.206c35.547 0 64.308-28.812 64.308-64.292 0-28.797-18.869-53.141-44.933-61.349z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-link.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-link.svg
deleted file mode 100644
index 2bb9b95c01..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-link.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M270.508 338.006c-27.316.03-54.696-10.671-75.323-31.318l-3.266-3.266 46.784-46.799 3.271 3.267c8.054 8.036 18.233 11.915 28.533 11.942 10.79-.043 21.088-3.93 29.123-11.942l76.701-76.701c8.024-8.05 11.909-18.306 11.945-28.895-.036-10.495-3.915-20.722-11.936-28.769l-3.268-3.266c-8.049-8.025-18.283-11.903-28.827-11.943-10.55.04-20.785 3.918-28.835 11.943l-31.537 31.543c-12.916 12.922-33.867 12.922-46.788 0-12.924-12.919-12.924-33.867-.005-46.789l31.542-31.544c20.794-20.821 48.361-31.36 75.623-31.327 27.256-.034 54.82 10.505 75.618 31.327l3.266 3.263a106.693 106.693 0 0 1 31.319 75.561c.038 27.25-10.474 54.848-31.325 75.684l-76.704 76.7c-20.915 20.941-48.588 31.328-75.743 31.328l-.168.001zM163.966 468.393c-27.308.027-54.694-10.67-75.322-31.324l-3.264-3.26c-20.875-20.854-31.364-48.479-31.326-75.725-.033-27.27 10.556-54.782 31.326-75.518l76.704-76.707c20.794-20.821 48.361-31.366 75.623-31.327a106.798 106.798 0 0 1 61.267 19.273 33.045 33.045 0 0 1 8.42 6.119l5.931 5.93 3.266 3.263h-.001l.001.003-46.781 46.798-.005-.006-3.266-3.266c-8.052-8.024-18.285-11.903-28.832-11.943-10.545.04-20.781 3.918-28.832 11.943l-76.711 76.712c-8.021 8.048-11.901 18.261-11.935 28.726.038 10.627 3.922 20.886 11.938 28.932l3.269 3.26c8.055 8.038 18.235 11.913 28.531 11.941 10.794-.043 21.092-3.928 29.13-11.941l33.051-33.051c12.923-12.915 33.872-12.915 46.788.006 12.921 12.917 12.921 33.863 0 46.787l-33.053 33.051c-20.914 20.938-48.592 31.324-75.745 31.324h-.172z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linkedin-box-fill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linkedin-box-fill.svg
deleted file mode 100644
index 5268ef9761..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linkedin-box-fill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.3362 18.339H15.6707V14.1622C15.6707 13.1662 15.6505 11.8845 14.2817 11.8845C12.892 11.8845 12.6797 12.9683 12.6797 14.0887V18.339H10.0142V9.75H12.5747V10.9207H12.6092C12.967 10.2457 13.837 9.53325 15.1367 9.53325C17.8375 9.53325 18.337 11.3108 18.337 13.6245V18.339H18.3362ZM7.00373 8.57475C6.14573 8.57475 5.45648 7.88025 5.45648 7.026C5.45648 6.1725 6.14648 5.47875 7.00373 5.47875C7.85873 5.47875 8.55173 6.1725 8.55173 7.026C8.55173 7.88025 7.85798 8.57475 7.00373 8.57475ZM8.34023 18.339H5.66723V9.75H8.34023V18.339ZM19.6697 3H4.32923C3.59498 3 3.00098 3.5805 3.00098 4.29675V19.7033C3.00098 20.4202 3.59498 21 4.32923 21H19.6675C20.401 21 21.001 20.4202 21.001 19.7033V4.29675C21.001 3.5805 20.401 3 19.6675 3H19.6697Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linkedin-box-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linkedin-box-line.svg
deleted file mode 100644
index 68ec684f94..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linkedin-box-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M4.00098 3H20.001C20.5533 3 21.001 3.44772 21.001 4V20C21.001 20.5523 20.5533 21 20.001 21H4.00098C3.44869 21 3.00098 20.5523 3.00098 20V4C3.00098 3.44772 3.44869 3 4.00098 3ZM5.00098 5V19H19.001V5H5.00098ZM7.50098 9C6.67255 9 6.00098 8.32843 6.00098 7.5C6.00098 6.67157 6.67255 6 7.50098 6C8.3294 6 9.00098 6.67157 9.00098 7.5C9.00098 8.32843 8.3294 9 7.50098 9ZM6.50098 10H8.50098V17.5H6.50098V10ZM12.001 10.4295C12.5854 9.86534 13.2665 9.5 14.001 9.5C16.072 9.5 17.501 11.1789 17.501 13.25V17.5H15.501V13.25C15.501 12.2835 14.7175 11.5 13.751 11.5C12.7845 11.5 12.001 12.2835 12.001 13.25V17.5H10.001V10H12.001V10.4295Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linkedin-fill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linkedin-fill.svg
deleted file mode 100644
index 8914b81b71..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linkedin-fill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M6.94048 4.99993C6.94011 5.81424 6.44608 6.54702 5.69134 6.85273C4.9366 7.15845 4.07187 6.97605 3.5049 6.39155C2.93793 5.80704 2.78195 4.93715 3.1105 4.19207C3.43906 3.44699 4.18654 2.9755 5.00048 2.99993C6.08155 3.03238 6.94097 3.91837 6.94048 4.99993ZM7.00048 8.47993H3.00048V20.9999H7.00048V8.47993ZM13.3205 8.47993H9.34048V20.9999H13.2805V14.4299C13.2805 10.7699 18.0505 10.4299 18.0505 14.4299V20.9999H22.0005V13.0699C22.0005 6.89993 14.9405 7.12993 13.2805 10.1599L13.3205 8.47993Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linkedin-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linkedin-line.svg
deleted file mode 100644
index 3e6f2976f8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linkedin-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12.001 9.55005C12.9181 8.61327 14.1121 8 15.501 8C18.5385 8 21.001 10.4624 21.001 13.5V21H19.001V13.5C19.001 11.567 17.434 10 15.501 10C13.568 10 12.001 11.567 12.001 13.5V21H10.001V8.5H12.001V9.55005ZM5.00098 6.5C4.17255 6.5 3.50098 5.82843 3.50098 5C3.50098 4.17157 4.17255 3.5 5.00098 3.5C5.8294 3.5 6.50098 4.17157 6.50098 5C6.50098 5.82843 5.8294 6.5 5.00098 6.5ZM4.00098 8.5H6.00098V21H4.00098V8.5Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linux-tux.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linux-tux.svg
deleted file mode 100644
index cd90e979cd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-linux-tux.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M438.643 373.146c-1.897-1.469-6.736-8.403-8.47-14.782l-1.962-7.177c-3.369-12.394-13.212-21.734-25.312-24.854-.486 6.476-1.532 12.248-3.171 17.316 5.494 1.848 10.039 6.228 11.644 12.133l1.961 7.176c2.519 9.242 9.338 20.194 15.141 24.36 5.82 4.173 4.188 12.122-3.647 17.644l-53.714 38.066c-7.813 5.531-21.975 11.117-31.457 12.395l-.131.049c-.85.101-1.683.148-2.553.148-8.759 0-17.918-5.89-21.121-14.012l-2.534-6.41c-3.551-8.895-3.601-23.481-.116-32.41l17.823-45.91c-5.854-7.541-9.452-16.535-9.518-25.344.031-8.455 5.069-15.453 11.626-20.099 5.575-3.94 12.443-6.491 19.62-7.209.443-2.599.688-5.25.706-7.933.08-19.57-13.523-51.421-13.523-51.421a.447.447 0 0 1 .244-.078c3.206 0 23.12 25.685 23.25 51.5 0 2.683-.194 5.429-.588 8.176 3.483.544 6.917 1.605 10.171 3.32 2.421 1.275 3.368 4.302 2.093 6.719-.883 1.721-2.648 2.684-4.432 2.684-.784 0-1.554-.195-2.306-.555-3.434-1.816-7.39-2.682-11.51-2.682h-.065c-6.443 0-13.115 2.191-17.872 5.621-4.856 3.457-7.456 7.74-7.44 11.957-.032 6.703 3.468 15.09 9.288 21.438 5.806 6.389 13.571 10.672 21.78 10.672h.029c7.066-.031 14.457-2.678 20.294-9.384 5.84-6.703 10.317-17.824 10.335-35.367 0-4.548-.346-9.534-.998-14.929-5.135-26.195-15.877-47.89-32.949-69.209-17.315-21.669-23.822-36.091-33.911-54.843-9.497-17.677-7.488-59.271-11.46-86.954-2.779-32.752-33.881-54.268-69.329-54.268-32.047 0-58.766 20.422-58.766 65.861l.034 11.753-.034-.326s.034 2.604.05 7.393l.179 55.626c-.077 37.817-58.663 112.397-58.962 133.554-.014 1.895.116 3.71.329 5.49-7.292 2.667-13.377 8.486-16.809 16.529l-.751 1.738c-1.326 3.057-6.786 7.355-10.072 7.908l-1.832.314c-18.396 3.104-31.232 20.648-28.615 39.128l1.017 7.097c.88 6.146-.72 13.965-1.815 16.008-4.269 7.113-4.89 15.5-1.62 23.02 3.76 8.682 12.134 14.977 22.958 17.27l62.229 13.223c6.116 1.311 12.656 1.574 17.04 1.574 5.136 0 15.044-.357 23.938-2.848l.098-.031c11.362-3.158 20.634-11.809 25.277-22.465h76.945a48.134 48.134 0 0 0 1.703 5.148l2.532 6.357c5.854 14.768 21.225 25.056 37.36 25.056 1.638 0 3.271-.101 4.859-.312h.014l.084-.017h.063c12.248-1.671 29.107-8.308 39.212-15.469l53.711-38.065c9.192-6.49 14.456-15.732 14.488-25.313.033-8.249-3.893-15.809-10.76-20.745zM269.74 96.493c11.607 0 21.025 10.983 21.025 24.554 0 8.159-3.432 15.386-8.681 19.854-3.452-1.046-7.016-2.191-10.497-3.941 3.252-2.013 5.507-6.528 5.507-11.761 0-7.146-4.168-12.916-9.333-12.916-5.15 0-9.338 5.77-9.338 12.916 0 1.396.214 2.732.508 3.994-3.416-1.67-6.803-2.817-9.875-3.613a27.287 27.287 0 0 1-.378-4.532c.001-13.572 9.419-24.555 21.062-24.555zm-56.967 2.613c8.631 0 15.632 9.892 15.632 22.106 0 1.374-.117 2.714-.297 4.04-3.105.962-6.177 2.388-9.121 4.135.13-.981.211-1.958.211-2.994 0-6.833-2.993-12.373-6.688-12.373s-6.705 5.539-6.705 12.373c0 4.174 1.146 7.871 2.862 10.107a129.98 129.98 0 0 0-4.201 3.385c-4.385-3.907-7.31-10.81-7.31-18.673.001-12.214 6.983-22.106 15.617-22.106zm-14.192 57.965c3.105-1.947 6.344-4.624 10.069-7.735 7.865-6.524 18.641-15.454 27.569-15.454h.163l.112-.015h.148c1.376 0 13.622.231 23.596 7.769 6.982 5.28 14.536 7.504 20.586 9.289 8.929 2.629 10.659 3.644 11.576 6.803 2.059 6.979-11.904 15.366-19.655 17.722-5.197 1.567-8.795 4.495-11.968 7.059-4.938 4.01-9.615 7.802-23.203 7.802-11.005 0-17.578-6.341-25.196-13.669-4.414-4.201-8.927-8.571-14.42-11.379-1.178-.623-1.424-2.192-1.473-3.072-.096-2.114.803-4.318 2.096-5.12zm-10.075 285.075l-.129.049c-5.197 1.456-12.394 2.209-19.261 2.209-4.907 0-9.646-.394-13.406-1.194l-62.233-13.214c-9.059-1.942-13.539-8.355-9.977-14.275 3.565-5.914 5.398-18.261 4.104-27.418l-1.011-7.113c-1.291-9.152 5.101-17.904 14.226-19.439l1.815-.328c9.157-1.522 19.586-9.743 23.234-18.247l.749-1.732c2.109-4.954 5.82-7.557 9.83-7.557 2.876 0 5.887 1.325 8.598 4.087l46.667 47.389c6.507 6.59 12.034 19.539 12.296 28.793l.197 6.652c.262 9.256-6.786 18.853-15.699 21.338zm60.107-27.681c-4.252 0-8.666-.555-13.179-1.781a85.835 85.835 0 0 1-12.247-4.497c-.963-.782-1.849-1.765-2.763-3.074-1.847-9.105-6.019-18.704-11.416-26.178 3.159-7.786 2.161-16.794-7.273-24.347l-5.937-4.641c-22.662-13.853-34.697-26.867-41.005-37.443-6.673-11.007-6.901-19.64-6.868-22.224h.016a4.956 4.956 0 0 1 4.955-4.984c1.699 4.118.49 15.171 11.87 29.266-.212-3.089.065-6.591.752-10.419a183.86 183.86 0 0 0 1.03-4.951c8.191-33.304 40.027-85.319 35.841-100.674-2.239-8.256-3.008-14.814-2.731-20.011 9.746 8.271 19.213 21.748 37.917 21.748 25.622 0 28.043-12.23 38.066-15.256 4.235-1.295 10.104-3.955 15.253-7.669-1.65 10.969-1.026 27.194 10.237 48.45 10.726 20.189 15.37 41.304 16.482 61.789l-.134.28v21.972c-1.272 21.011-5.508 40.635-9.809 57.062-4.643 17.84-27.924 47.582-59.057 47.582zm-10.04-234.421c22.448-.1 32.538-13.979 45.863-17.482a2.682 2.682 0 0 0 1.849-3.299 2.657 2.657 0 0 0-3.302-1.863c-15.812 4.703-24.493 17.395-44.41 17.278-9.907 0-18.363-3.759-24.377-7.583a56.994 56.994 0 0 1-7.001-5.267c-1.583-1.424-2.37-2.308-2.402-2.308-.979-1.092-2.682-1.162-3.777-.162a2.68 2.68 0 0 0-.177 3.776c.209.201 15.139 16.81 37.734 16.91zm-11.525-36.693c2.616-1.124 4.398-2.777 4.022-3.674-.377-.889-2.833-.709-5.431.419-2.602 1.132-4.396 2.778-4.005 3.683.391.915 2.811.701 5.414-.428zm24.052-.749c2.843.36 5.214-.1 5.362-1.083.132-.961-2.06-2.061-4.876-2.433-2.811-.394-5.197.101-5.344 1.06-.13.983 2.061 2.06 4.858 2.456z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-list.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-list.svg
deleted file mode 100644
index 78a748f1a1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-list.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M120.619 166.782V83.688h268.255v83.094H120.619zm0 131.009v-83.103h268.255v83.103H120.619zm0 130.998v-83.102h268.255v83.102H120.619z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-load.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-load.svg
deleted file mode 100644
index 6f4ac6197c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-load.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M87.871 409.454v-83.1h333.74v83.1H87.871zm168.611-142.145L90.723 101.551h331.512z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-loading.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-loading.svg
deleted file mode 100644
index 91372f4e34..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-loading.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M326.723 172.484V88.877H182.15v83.605c-25.638 20.956-42.013 52.819-42.015 88.522.002 35.704 16.376 67.567 42.015 88.526v75.004h144.572v-75.006c25.633-20.961 42.004-52.82 42.01-88.524-.005-35.698-16.377-67.561-42.009-88.52zm-9.173 151.641c-16.194 16.173-38.429 26.136-63.113 26.142-24.691-.006-46.929-9.969-63.119-26.142-16.172-16.199-26.136-38.432-26.142-63.12.006-24.686 9.97-46.925 26.142-63.113 16.189-16.173 38.428-26.134 63.119-26.142 24.684.008 46.918 9.969 63.113 26.142 16.173 16.188 26.138 38.428 26.142 63.113-.004 24.688-9.969 46.921-26.142 63.12zm-51.286-75.638v-46.856h-25.036l-.006 71.898h84.494v-25.042h-59.452z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-locate.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-locate.svg
deleted file mode 100644
index b6d715d2f0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-locate.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.796 37.191c-120.658.018-218.426 97.79-218.446 218.443.02 120.662 97.788 218.43 218.446 218.449 120.657-.02 218.423-97.787 218.448-218.449-.025-120.653-97.791-218.425-218.448-218.443zm22.538 369.049v-60.701h-45.073v60.701c-33.049-4.889-62.511-20.342-85.141-42.934-22.585-22.625-38.038-52.086-42.93-85.135h60.707v-45.07H104.19c4.892-33.049 20.345-62.509 42.93-85.137 22.63-22.589 52.092-38.043 85.141-42.936v60.706h45.073v-60.703c33.05 4.891 62.506 20.343 85.136 42.927 22.585 22.633 38.043 52.093 42.932 85.142h-60.7v45.07h60.7c-4.889 33.049-20.347 62.51-42.932 85.135-22.63 22.593-52.086 38.046-85.136 42.935z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-location-near-me.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-location-near-me.svg
deleted file mode 100644
index 69028bf985..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-location-near-me.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M208.254 100.605a47.748 47.748 0 1 1 95.496 0 47.748 47.748 0 1 1-95.496 0zm111.965 202.933v29.496c49.871 8.225 84.32 25.722 84.32 45.99 0 28.173-66.502 51.012-148.539 51.012s-148.541-22.839-148.541-51.012c0-20.271 34.453-37.769 84.326-45.992v-29.494c-62.783 9.472-113.432 33.794-113.432 75.486 0 55.347 89.221 80.118 177.646 80.118 88.424 0 177.646-24.771 177.646-80.118.001-41.692-50.645-66.012-113.426-75.486zm3.885-127.887c0-10.661-8.643-19.303-19.303-19.303h-97.6c-10.66 0-19.305 8.642-19.305 19.303v101.103h27.568v104.638h81.074V276.754h27.564V175.651z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-location-nearby.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-location-nearby.svg
deleted file mode 100644
index 884edb711b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-location-nearby.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.281 48.551c-59.443 0-107.625 48.182-107.625 107.62 0 59.44 107.625 254.112 107.625 254.112S363.9 215.612 363.9 156.171c0-59.438-48.185-107.62-107.619-107.62zm0 140.324c-18.062 0-32.705-14.641-32.705-32.704 0-18.057 14.643-32.697 32.705-32.697 18.057 0 32.697 14.641 32.697 32.697.001 18.064-14.64 32.704-32.697 32.704zm77.36 121.246c-.865 1.815-1.701 3.591-2.592 5.451a1984.393 1984.393 0 0 1-10.631 21.8c49.764 8.242 84.123 25.717 84.123 45.959 0 28.174-66.504 51.012-148.541 51.012-82.035 0-148.541-22.838-148.541-51.012 0-20.315 34.594-37.843 84.641-46.046a1923.73 1923.73 0 0 1-10.586-21.713c-.91-1.896-1.764-3.706-2.643-5.556-56.672 10.751-100.518 34.52-100.518 73.314 0 55.347 89.225 80.118 177.646 80.118 88.426 0 177.646-24.771 177.646-80.118.001-38.679-43.583-62.415-100.004-73.209z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lock.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lock.svg
deleted file mode 100644
index 8f94c7cb96..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-lock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M404.84 246.573h-22.084l-.002-73.603c0-36.675-13.921-70.311-36.917-94.892-22.91-24.584-55.547-40.367-91.539-40.336-36.003-.031-68.643 15.752-91.55 40.336-23.001 24.582-36.918 58.217-36.925 94.892v73.603h-22.082c-9.16 0-16.585 7.421-16.585 16.583v194.531c0 9.158 7.425 16.585 16.585 16.585H404.84c9.162 0 16.586-7.427 16.586-16.585V263.156c0-9.161-7.424-16.583-16.586-16.583zm-218.013-73.602c0-21.167 8.012-39.893 20.468-53.219 12.552-13.316 28.896-20.982 47.003-21.007 18.095.025 34.438 7.685 46.987 21.007 12.455 13.326 20.467 32.052 20.467 53.219v73.603H186.827v-73.603z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-log-out.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-log-out.svg
deleted file mode 100644
index 07c4ae9856..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-log-out.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M248.783 406.276l181.299-149.634-181.299-149.631v97.62h-91.922v104.02h91.922v97.625zm135.842 57.076v-42.624H124.541V91.271h260.084V48.649H81.918v414.703h302.707z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-logout.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-logout.svg
deleted file mode 100644
index e3eb856a9a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-logout.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M168.047 413.788l191.71-158.229-191.71-158.222v103.227H70.844v109.992h97.203v103.232zM118.912 36.985v45.068h275.021v348.378H118.912v45.07h320.092V36.985H118.912z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-loupe.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-loupe.svg
deleted file mode 100644
index ab5137dc24..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-loupe.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M418.985 232.363c-.686-11.928-7.736-22.035-19.236-30.403-2.03 19.021-14.865 42.121-59.935 55.007-22.95 6.561-52.717 10.175-83.817 10.175-31.099 0-60.862-3.614-83.815-10.175-45.066-12.886-57.901-35.983-59.933-55.002-11.502 8.373-18.553 18.485-19.231 30.42L69.87 370.575v1.212c0 46.882 93.637 71.407 186.132 71.407 92.493 0 186.128-24.525 186.128-71.407v-1.212l-23.145-138.212zM256.002 414.09c-99.646 0-154.878-26.88-156.962-41.461l17.293-103.258c30.578 19.513 86.48 28.679 139.669 28.679 53.19 0 109.091-9.166 139.666-28.679l17.294 103.258c-2.088 14.581-57.315 41.461-156.96 41.461zM138.956 195.461c3.053 40.972 105.234 42.173 117.041 42.173 11.812 0 114.02-1.201 117.046-42.192l14.492-69.587c.774-2.216 1.212-4.518 1.353-6.896.03-.322.041-.644.055-.965.004-.197.033-.389.033-.586 0-.053-.007-.101-.007-.152 0-.126-.009-.252-.013-.376-.898-46.716-119.398-48.074-132.959-48.074-13.559 0-132.084 1.358-132.955 48.086-.004.118-.012.235-.016.354 0 .053-.006.105-.006.159 0 3.113.531 6.021 1.506 8.75l14.43 69.306zm117.041-96.719c30.408 0 55.061 6.019 55.061 13.44 0 7.421-24.652 13.438-55.061 13.438-30.404 0-55.055-6.018-55.055-13.438 0-7.421 24.651-13.44 55.055-13.44z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-magnet.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-magnet.svg
deleted file mode 100644
index b7c9ed6ab1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-magnet.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M437.161 277.216l-67.757-67.774-68.968 68.952v.03l-49.15 49.137c-9.517 9.438-21.289 13.899-33.748 13.979-12.394-.08-24.2-4.541-33.684-13.979-9.385-9.464-13.867-21.258-13.93-33.732.062-12.396 4.545-24.168 13.964-33.651l49.15-49.163 68.967-68.983L234.28 74.27 116.13 192.424c-28.026 28.026-42.055 64.831-42.025 101.487-.029 36.692 14.031 73.434 42.025 101.427 27.992 27.96 64.748 42.022 101.407 42.022h.033c36.656 0 73.447-14.032 101.44-42.022l118.151-118.122zm-202.88-167.679l32.474 32.493-33.716 33.746-32.505-32.505 33.747-33.734zm135.123 135.156l32.505 32.522-33.715 33.697-32.505-32.52 33.715-33.699z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mailbox.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mailbox.svg
deleted file mode 100644
index e55cdc452c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mailbox.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M386.65 57.791H123.582L34.415 288.615v163.646h441.474V286.066L386.65 57.791zm-49.703 236.625v52.578c0 13.829-11.211 25.037-25.036 25.037H198.399c-13.828 0-25.041-11.208-25.041-25.037v-52.578H83.17l73.031-189.043h197.967l73.906 189.043h-91.127z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-male-and-female.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-male-and-female.svg
deleted file mode 100644
index 5ddf3b95e1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-male-and-female.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M466.371 366.898c-14.189-14.205-38.258-20.553-58.797-26.98-27.11-8.479-37.442-28.627-40.518-48.59a185.21 185.21 0 0 0 8.701-10.727c17.723 5.673 39.012 7.324 57.195-5.873-25.051-25.078-4.938-55.821-23.058-111.266-15.402-47.107-78.516-44.766-86.659-28.223-33.452-11.834-58.73 4.01-68.018 53.926-10.696 57.31 10.04 63.362-15.076 88.443 19.261 10.989 36.92 8.308 52.225 2.224a173.555 173.555 0 0 0 9.418 11.676c-3.074 19.898-13.443 39.962-40.451 48.41-20.537 6.428-44.606 12.775-58.801 26.98-11.214 11.201-3.759 38.02-3.759 38.02h271.326c.002 0 7.491-26.818-3.728-38.02zm-276.621-5.31c14.159-14.145 36.299-20.945 55.854-26.951 2.024-.617 4.022-1.24 5.981-1.863 8.243-2.567 15.078-6.475 20.536-11.72-6.536-2.783-12.981-5.512-19.162-8.048-4.446-1.209-8.96-2.435-13.471-3.676-5.362-3.682-10.597-15.942-13.475-22.043-2.878-.392-5.722-.818-8.567-1.226.457-9.437 6.277-9.944 8.567-17.151 2.029-6.343.197-14.618 3.434-20.505 1.864-3.451 5.757-4.038 8.438-6.226-.031-.494-.099-.985-.132-1.492-.816-10.367-1.863-24.198 1.345-45.322-.034-.163-.034-.311-.069-.476-.652-5.982 1.768-25.442 1.866-29.642.226-10.911-.033-11.808-2.649-22.435 0 0-3.236-9.63-8.24-12.539l-10.038-1.734-6.183-5.74c-24.986-15.352-51.733-4.564-66.092 1.239-20.634 6.691-33.683 26.912-24.557 70.131 1.538 7.39-4.088 10.689-3.697 14.714.817 8.799.983 29.97 9.288 35.188.783.477 6.671 1.96 6.638 1.568.819 8.57 1.637 17.153 2.453 25.72 2.062 5.691 7.064 6.331 8.503 14.375l-6.343 1.551c-2.881 6.101-8.145 18.361-13.509 22.043a2053.08 2053.08 0 0 1-13.472 3.676c-15.764 6.475-25.77 14.197-41.53 20.836-14.355 6.062-31.558 8.22-36.759 23.283 0 10.234-.945 34.385-.686 47.793h149.544c-1.763-7.422-6.112-31.004 6.184-43.328z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-male-symbol.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-male-symbol.svg
deleted file mode 100644
index eb91f509f5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-male-symbol.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M409.709 228.674l17.004-144.215-144.197 17.004L329.049 148l-33.665 33.682c-22.646-15.321-48.988-23.056-75.198-23.021-34.303-.035-68.853 13.177-95.015 39.355v.018c-26.193 26.16-39.404 60.695-39.374 95-.03 34.316 13.181 68.865 39.374 95.043 26.259 26.279 60.905 39.393 95.227 39.358h.148c34.224 0 68.607-13.275 94.689-39.358 26.175-26.178 39.371-60.727 39.354-95.043a134.169 134.169 0 0 0-23.021-75.182l33.665-33.65 44.476 44.472zm-248.37 5.528c16.317-16.319 37.478-24.351 58.847-24.399 21.389.048 42.561 8.08 58.881 24.399 16.284 16.318 24.326 37.474 24.377 58.831-.051 21.398-8.093 42.561-24.395 58.895-16.303 16.249-37.361 24.33-58.651 24.361-21.518-.031-42.741-8.043-59.059-24.395-16.316-16.301-24.346-37.447-24.396-58.861.05-21.389 8.079-42.513 24.381-58.831"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-alt.svg
deleted file mode 100644
index fcc39f5bb0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M457.298 457.615l-97.205-144.5a118.705 118.705 0 0 0 13.206-38.477l97.178-19.023-97.178-19.018c-8.12-50.775-48.209-90.859-98.98-98.98l-19.025-97.178-19.023 97.178a118.755 118.755 0 0 0-38.462 13.197L53.289 53.617l97.197 144.513a118.814 118.814 0 0 0-13.195 38.464l-97.184 19.021 97.184 19.023c8.119 50.773 48.205 90.854 98.98 98.978l19.021 97.179 19.02-97.179a118.788 118.788 0 0 0 38.467-13.194l144.519 97.193zM255.293 158.86c53.353 0 96.76 43.404 96.76 96.753a96.21 96.21 0 0 1-6.77 35.485l-40.984-60.923-23.543-23.566-60.934-40.982a96.18 96.18 0 0 1 35.471-6.767zm18.76 96.765c0 10.356-8.4 18.758-18.766 18.758-10.361 0-18.762-8.401-18.762-18.758 0-10.37 8.4-18.773 18.762-18.773 10.365 0 18.766 8.403 18.766 18.773zm-18.76 96.748c-53.354 0-96.755-43.408-96.755-96.76a96.172 96.172 0 0 1 6.761-35.457l40.984 60.932 23.535 23.541 60.938 40.981a96.216 96.216 0 0 1-35.463 6.763z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-location.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-location.svg
deleted file mode 100644
index ad9efb05ed..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-location.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M260.736 43.797c-60.557 0-109.646 49.088-109.646 109.646 0 60.557 109.646 258.888 109.646 258.888S370.381 214 370.381 153.443c0-60.558-49.093-109.646-109.645-109.646zm0 142.962c-18.4 0-33.317-14.915-33.317-33.316 0-18.398 14.917-33.312 33.317-33.312 18.397 0 33.312 14.914 33.312 33.312.001 18.401-14.914 33.316-33.312 33.316zm154.512 93.758h-61.913a1543.511 1543.511 0 0 1-13.472 29.104h52.711l32.672 129.477H86.754l32.672-129.477h62.184a1546.786 1546.786 0 0 1-13.473-29.104H96.752l-47.36 187.687h413.217l-47.361-187.687z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-marker.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-marker.svg
deleted file mode 100644
index a4f71dc084..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map-marker.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M325.002 156.516c0-38.109-30.895-69.002-69.002-69.002s-69.002 30.893-69.002 69.002c0 33.114 23.332 60.767 54.449 67.45V408.05c-10.439 1.436-17.604 4.361-17.604 7.743 0 4.802 14.396 8.693 32.156 8.693 17.762 0 32.158-3.892 32.158-8.693 0-3.382-7.164-6.307-17.605-7.743V223.966c31.118-6.683 54.45-34.336 54.45-67.45zm-93.967-3.962c-10.697 0-19.369-8.669-19.369-19.367 0-10.694 8.672-19.364 19.369-19.364 10.695 0 19.365 8.669 19.365 19.364 0 10.698-8.67 19.367-19.365 19.367z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map.svg
deleted file mode 100644
index 2c9ae42407..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-map.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M196.542 418.485l117.444 44.599V92.401L196.542 47.803v370.682zM41.22 467.958l130.275-49.473V47.803L41.22 97.272v370.686zM339.029 92.639V463.32l130.596-49.59V43.045L339.029 92.639z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mastodon-fill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mastodon-fill.svg
deleted file mode 100644
index ee9488b7a3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mastodon-fill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M21.2595 13.9898C20.9852 15.4006 18.8033 16.9446 16.2974 17.2439C14.9907 17.3998 13.7041 17.5431 12.3321 17.4802C10.0885 17.3774 8.31809 16.9446 8.31809 16.9446C8.31809 17.163 8.33156 17.371 8.3585 17.5655C8.65019 19.7797 10.5541 19.9124 12.3576 19.9742C14.1779 20.0365 15.7987 19.5254 15.7987 19.5254L15.8735 21.1711C15.8735 21.1711 14.6003 21.8548 12.3321 21.9805C11.0814 22.0493 9.52849 21.9491 7.71973 21.4703C3.79684 20.432 3.12219 16.2504 3.01896 12.0074C2.98749 10.7477 3.00689 9.55981 3.00689 8.56632C3.00689 4.22771 5.84955 2.95599 5.84955 2.95599C7.2829 2.29772 9.74238 2.0209 12.2993 2H12.3621C14.919 2.0209 17.3801 2.29772 18.8133 2.95599C18.8133 2.95599 21.6559 4.22771 21.6559 8.56632C21.6559 8.56632 21.6916 11.7674 21.2595 13.9898ZM18.3029 8.9029C18.3029 7.82924 18.0295 6.97604 17.4805 6.34482C16.9142 5.71359 16.1726 5.39001 15.2522 5.39001C14.187 5.39001 13.3805 5.79937 12.8473 6.61819L12.3288 7.48723L11.8104 6.61819C11.2771 5.79937 10.4706 5.39001 9.40554 5.39001C8.485 5.39001 7.74344 5.71359 7.17719 6.34482C6.62807 6.97604 6.3547 7.82924 6.3547 8.9029V14.1562H8.43597V9.05731C8.43597 7.98246 8.88822 7.4369 9.79281 7.4369C10.793 7.4369 11.2944 8.08408 11.2944 9.36376V12.1547H13.3634V9.36376C13.3634 8.08408 13.8646 7.4369 14.8648 7.4369C15.7694 7.4369 16.2216 7.98246 16.2216 9.05731V14.1562H18.3029V8.9029Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mastodon-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mastodon-line.svg
deleted file mode 100644
index f955e62781..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mastodon-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M3.019 12.0075C2.98744 10.7478 3.00692 9.5598 3.00692 8.56644C3.00692 4.22767 5.84954 2.95597 5.84954 2.95597C7.28286 2.29767 9.74238 2.0209 12.2993 2H12.3621C14.919 2.0209 17.3801 2.29767 18.8134 2.95597C18.8134 2.95597 21.656 4.22767 21.656 8.56644C21.656 8.56644 21.6916 11.7674 21.2596 13.9898C20.9852 15.4007 18.8034 16.9446 16.2974 17.2438C14.9906 17.3999 13.7042 17.5431 12.3322 17.4802C10.0885 17.3775 8.31815 16.9446 8.31815 16.9446C8.31815 17.1631 8.33166 17.3711 8.35853 17.5655C8.44182 18.1978 8.65659 18.6604 8.96296 19C9.72944 19.8497 11.0692 19.9301 12.3577 19.9743C14.178 20.0366 15.7986 19.5254 15.7986 19.5254L15.8735 21.1712C15.8735 21.1712 14.6003 21.8548 12.3322 21.9805C11.0815 22.0493 9.52858 21.9491 7.71969 21.4704C6.18802 21.065 5.15153 20.1804 4.45091 19C3.35714 17.1573 3.08191 14.5938 3.019 12.0075ZM6.31815 16.9446V14.3967L8.79316 15.0018C8.8405 15.0134 8.95098 15.0383 9.11692 15.0723C9.40521 15.1313 9.73416 15.1908 10.0959 15.2467C10.8485 15.3628 11.6341 15.4462 12.4237 15.4823C13.4425 15.529 14.3249 15.4652 16.0603 15.2579C17.7233 15.0594 19.208 14.0622 19.2963 13.6082C19.3783 13.1861 19.4472 12.6858 19.5021 12.1261C19.5714 11.4205 19.6155 10.6558 19.6388 9.88068C19.654 9.37026 19.6582 8.93648 19.6564 8.62452L19.656 8.56644C19.656 7.1368 19.2873 6.12756 18.6928 5.40793C18.5008 5.17553 18.3004 4.99408 18.1087 4.85958C18.0183 4.79617 17.9737 4.77136 17.9787 4.77345C16.9662 4.30844 14.8859 4.02069 12.3621 3.99993H12.3156C9.77596 4.02069 7.6969 4.30836 6.66627 4.78161C6.68919 4.77136 6.64459 4.79617 6.55423 4.85958C6.36257 4.99408 6.16214 5.17553 5.97016 5.40793C5.37568 6.12756 5.00692 7.1368 5.00692 8.56644C5.00692 8.7976 5.00628 8.96339 5.00392 9.44137C4.9981 10.6238 5.00004 11.2256 5.01841 11.9589C5.07185 14.156 5.2822 15.7941 5.71797 17C5.93023 17.5874 6.19005 18.0709 6.49741 18.4507C6.37791 18.0162 6.31815 17.5142 6.31815 16.9446ZM8.08576 6.37135C8.71735 6.37135 9.22924 6.88324 9.22924 7.51482C9.22924 8.14626 8.71735 8.6583 8.08576 8.6583C7.45432 8.6583 6.94229 8.14626 6.94229 7.51482C6.94229 6.88324 7.45432 6.37135 8.08576 6.37135Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medal.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medal.svg
deleted file mode 100644
index c97ccf0f32..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medal.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M291.739 214.211a132.978 132.978 0 0 0-36.604-5.145c-12.7 0-24.967 1.819-36.598 5.142V100.491h-97.792v56.525l47.555 84.365c-28.239 24.384-46.137 60.419-46.137 100.657 0 73.438 59.533 132.975 132.972 132.975 73.439 0 132.973-59.537 132.973-132.975 0-43.467-20.863-82.059-53.115-106.321l54.531-77.405v-57.821H291.74v113.72zm48.795 127.828c0 47.09-38.312 85.399-85.399 85.399-47.089 0-85.398-38.31-85.398-85.399 0-47.088 38.31-85.398 85.398-85.398 47.088 0 85.399 38.31 85.399 85.398zM83.035 36.876v38.577h344.2V36.876h-344.2zm169.227 225.523l-17.073 52.173h-54.78a3.016 3.016 0 1 0-1.78 5.456l44.327 32.292-17.078 52.456a3.03 3.03 0 0 0 1.093 3.378 3.036 3.036 0 0 0 3.548 0l44.613-32.387 44.516 32.387c.531.383 1.156.578 1.777.578s1.243-.195 1.774-.578a3.02 3.02 0 0 0 1.096-3.378l-17.079-52.452 44.422-32.296a3.018 3.018 0 0 0 1.096-3.37 3.026 3.026 0 0 0-2.87-2.086H274.99l-16.986-52.166a3.024 3.024 0 0 0-2.867-2.084c-1.306 0-2.471.84-2.875 2.077z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medical-emergency.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medical-emergency.svg
deleted file mode 100644
index 0265c28988..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medical-emergency.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M270.439 138.247c-5.265-4.087-4.053-10.467-15.959-8.798 1.079 4.578 3.793 9.126 15.959 8.798zm203.178 64.29L411.318 94.736l-92.937 53.63V41.021H193.819v107.428l-93.005-53.713-62.23 107.801 93.005 53.63-93.005 53.731 62.23 107.881 93.005-53.73v107.429h124.562V364.133l92.937 53.646 62.299-107.881-93.04-53.646 93.04-53.715zM265.796 92.396l-.522 24.562c-1.864-.458-3.762-.739-5.691-.739-.621 0-1.273.038-1.896.101a83.98 83.98 0 0 0-10.66 1.7l-.557-25.624h19.326zm-56.378 80.156c-1.209-14.602 5.166-28.095 16.25-37.184 8.702-7.161 21.618-10.89 32.706-11.903.392-.048.815-.063 1.208-.063 9.615 0 20.665 9.676 26.063 16.873 4.773 6.344 6.571 12.887 3.957 14.532-2.617 1.656-6.737 4.665-9.255 6.657-1.471 1.208-3.14 1.651-4.938 1.651-3.074 0-6.443-1.324-9.747-2.63-3.303-1.34-6.507-2.65-9.22-2.65h-.426c-8.143.46-14.846 4.314-16.418 12.491-.291 1.604.296 3.634 1.505 5.903l.884 39.719c-13.341-8.995-27.532-18.87-32.569-43.396zm53.335 59.73l-.228 10.693c-1.896.914-4.087 1.844-5.822 2.599-2.091.882-4.445 1.88-6.833 3.009l-.718-32.672v-.127l-.852-39.704-.032-.031-.163-7.652c1.635-2.026 4.35-3.205 8.306-3.4 1.309 0 4.055 1.113 6.279 2.027l.294.101c.391.162.784.307 1.177.452l-.751 35.743s-.035.022-.035.037l-.621 28.871-.001.054zm-10.137 142.593v-.064l-.197-8.438v-.062l-.161-7.23c2.156-.981 5.199-1.997 7.783-2.811l-.491 22.271v.064l-.163 6.326c0 .015.03.046.03.085l-.358 16.116a55.844 55.844 0 0 1-1.732 1.686 138.445 138.445 0 0 0-4.022 4.055l-.689-31.998zm5.693 60.876h-4.351l-.396-17.593c.197.144.362.308.591.439l1.767 1.061c.851.523 1.799.771 2.715.903l-.326 15.19zm1.337-22.207l-1.766-1.062c6.441-7.146 14.324-11.625 12.396-20.571-.426-2.794-1.767-5.001-3.696-6.833l.164-6.31c3.989 3.025 7.13 7.043 7.588 12.753 1.635 11.118-9.484 17.038-14.686 22.023zm26.85-86.542c-1.735 14.664-15.73 18.342-23.087 20.765-8.308 2.583-17.758 4.886-20.146 9.907-1.504 3.417-.523 6.329 2.028 8.847l.165 8.456c-2.029-.983-3.991-2.192-5.92-4.04-4.122-4.136-5.986-10.431-3.859-16.22 5.918-11.761 16.809-12.773 24.328-16.496 15.797-4.976 18.675-14.868 8.012-19.002l.299-14.158c3.3 1.078 6.701 2.481 10.135 4.899 5.201 3.027 9.19 10.927 8.045 17.042zm-25.638-7.9l-.229 11.266c-.852.342-1.768.686-2.781 1.013-.358.116-.72.249-1.013.412-1.439.704-3.237 1.357-5.1 2.061l-.428-20.032v-.063l-.426-19.392c0-.031-.032-.053-.032-.084l-.162-7.146c.26-.359.489-.704.685-.982a.768.768 0 0 0 .198-.289c1.272-1.964 5.329-3.372 10.104-4.938l-.523 23.932v.07l-.293 14.127v.045zm31.099-64.207c-18.051 20.897-39.797 17.007-46.369 27.045-3.371 4.626-4.059 8.941-1.899 12.553l.458 19.43c-4.087-1.475-8.207-3.762-12.033-7.604-9.452-9.682-8.146-25.752-1.08-35.306 16.09-19.081 39.078-18.933 42.416-28.402 2.418-5.836 2.386-5.081-1.375-8.645a33.909 33.909 0 0 0-2.156-1.557l.619-28.889c5.298 3.17 11.478 6.67 17.853 12.506 4.284 3.978 9.354 10.905 9.717 19.328.192 8.386-2.195 14.175-6.151 19.541z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medicine.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medicine.svg
deleted file mode 100644
index 1e2cb6aeef..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-medicine.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M364.93 220.525l-14.911-31.263c-2.551-5.43-9.846-21.996-17.464-39.473H179.021c-7.62 17.477-14.913 34.043-17.463 39.473l-14.914 31.263c-6.181 12.981-11.248 35.385-11.248 49.785v181.332c0 13.358 10.825 24.165 24.167 24.165H351.98c13.373 0 24.167-10.807 24.167-24.165V270.311c-.001-14.401-5.036-36.804-11.217-49.786zm-27.438 122.4h-55.233v55.252H229.35v-55.252h-55.27v-52.911h55.27v-55.25h52.909v55.25h55.233v52.911zm15.731-282.066c0-13.362-10.794-24.181-24.135-24.181H182.486c-13.346 0-24.169 10.819-24.169 24.181v63.996h194.905V60.859z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-meeting.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-meeting.svg
deleted file mode 100644
index 09af0d97c2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-meeting.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.607 143.279c17.742 0 32.18-14.437 32.18-32.178 0-17.745-14.438-32.179-32.18-32.179-17.744 0-32.18 14.434-32.18 32.179.001 17.742 14.436 32.178 32.18 32.178zm152.649 105.422c17.742 0 32.18-14.437 32.18-32.178 0-17.742-14.438-32.179-32.18-32.179-17.744 0-32.178 14.437-32.178 32.179 0 17.742 14.434 32.178 32.178 32.178zm-304.514 0c17.744 0 32.18-14.437 32.18-32.178 0-17.742-14.436-32.179-32.18-32.179s-32.178 14.437-32.178 32.179c0 17.742 14.434 32.178 32.178 32.178zm208.426-66.502c0-8.763-7.104-15.864-15.865-15.864h-80.215c-8.762 0-15.865 7.102-15.865 15.864v27.942h111.945v-27.942zm79.529 96.623c-.961 0-1.871.194-2.736.479l44.654 92.566v-84.244c0-4.855-3.949-8.802-8.803-8.802h-33.115zm-313.316 8.802v81.568l44.439-89.961c-.805-.241-1.639-.409-2.521-.409H87.186c-4.854 0-8.805 3.947-8.805 8.802zm93.197-53.935L73.09 433.077h126.545v-42.038c0-8.761 7.104-15.867 15.865-15.867h80.215c8.762 0 15.865 7.106 15.865 15.867v42.038h125.418l-96.186-199.388H171.578zm84.029 118.426c-17.744 0-32.18-14.432-32.18-32.175 0-17.742 14.436-32.177 32.18-32.177 17.742 0 32.18 14.435 32.18 32.177 0 17.744-14.437 32.175-32.18 32.175z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-megaphone.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-megaphone.svg
deleted file mode 100644
index 25387c9357..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-megaphone.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M217.078 387.634l-53.529-14.348V326.21l-29.798-9.177v67.681l11.042 14.392 78.067 20.928 17.97-9.619 18.492-54.707-28.486-8.773zM401.997 92.027a9.115 9.115 0 0 0-.702-.039c-.117-.004-.229-.022-.348-.022-.142 0-.278.022-.419.025-.234.006-.468.019-.701.038-5.167.185-9.999 1.625-14.493 4.152l-308.597 95.05c-17.54 2.201-24.863 14.503-24.863 40.912 0 26.41 7.323 38.712 24.863 40.914l308.597 95.049c4.818 2.711 10.015 4.213 15.608 4.215h.005c38.851 0 59.179-70.519 59.179-140.178 0-69.021-19.969-138.844-58.129-140.116zm-1.05 254.711c-11.402 0-33.597-40.447-33.597-114.595 0-74.146 22.194-114.593 33.597-114.593s33.595 40.446 33.595 114.593c0 74.148-22.192 114.595-33.595 114.595z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-merge.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-merge.svg
deleted file mode 100644
index 57ac52511a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-merge.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M397.824 384.982L297.037 284.198c-.523-.329-3.53-4.546-5.312-9.093-1.915-4.346-2.748-9.323-2.667-10.105v-71.52h57.244L256.357 79.484 166.426 193.48h56.738v71.455c.116.59-.718 5.722-2.682 10.202-1.766 4.515-4.788 8.731-5.297 9.061L114.398 384.982l46.583 46.601 95.131-95.128 95.112 95.128 46.6-46.601z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message-open.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message-open.svg
deleted file mode 100644
index 98aaeeeb64..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message-open.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.521 409.886L37.191 224.103v252.453h436.665V224.099z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message-unopened.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message-unopened.svg
deleted file mode 100644
index e29ecbf60d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message-unopened.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M49.523 126.83v258.34h412.953V126.83H49.523zm244.02 185.5H148.277v-23.678h145.266v23.678zm0-55.975H148.277v-23.678h145.266v23.678zM424.5 215.176h-50.371v-50.371H424.5v50.371z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message.svg
deleted file mode 100644
index 75785c1896..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-message.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M470.164 118.645H42.296l212.806 182.021 215.062-182.021zM255.018 333.541L36.735 146.834v245.924H473.4V148.704L255.018 333.541z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-microscope.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-microscope.svg
deleted file mode 100644
index 9985552be3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-microscope.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M345.877 223.204l-63.098 63.098-21.219-21.219 63.098-63.098zm-8.121 206.65v-27.881h-40.945v-41.887c24.939-4.439 47.91-16.326 66.199-34.614l18.123-18.124-50.988-50.992-36.252 36.25 11.518 11.516c-9.52 4.378-19.957 6.68-30.748 6.68-19.68 0-38.182-7.662-52.098-21.579-28.639-28.641-28.717-75.187-.246-103.935l29.867 29.867 36.248-36.25-126.77-126.768-36.248 36.25 60.65 60.649c-48.455 48.739-48.379 127.806.248 176.437 16.574 16.573 36.99 27.889 59.232 33.175v43.326h-50.723v27.881h-48.828v30.009h240.586v-30.009h-48.825zM46.553 242.624"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-microsoft-fill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-microsoft-fill.svg
deleted file mode 100644
index 1d58b3a594..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-microsoft-fill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11.501 3V11.5H3.00098V3H11.501ZM11.501 21H3.00098V12.5H11.501V21ZM12.501 3H21.001V11.5H12.501V3ZM21.001 12.5V21H12.501V12.5H21.001Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-microsoft-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-microsoft-line.svg
deleted file mode 100644
index a8751d63ba..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-microsoft-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11.001 5H5.00098V11H11.001V5ZM13.001 5V11H19.001V5H13.001ZM19.001 13H13.001V19H19.001V13ZM11.001 19V13H5.00098V19H11.001ZM3.00098 3H21.001V21H3.00098V3Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mindmap.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mindmap.svg
deleted file mode 100644
index 043927014b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mindmap.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M449.337 362.335h-35.842v-.555c-.065-15.959-5.492-31.639-13.781-45.459-8.39-13.799-19.755-25.882-33.815-33.371l-62.036-32.62c-7.602-3.941-15.957-12.211-21.845-22.086-6.001-9.797-9.435-21.077-9.386-29.595v-48.793h38.899c15.598 0 28.257-12.673 28.257-28.274V55.955c0-15.6-12.659-28.274-28.257-28.274H203.108c-15.613 0-28.271 12.674-28.271 28.274v65.627c0 15.601 12.658 28.274 28.271 28.274h38.884v48.793c.063 8.518-3.387 19.782-9.37 29.595-5.886 9.859-14.242 18.161-21.86 22.086l-62.035 32.62c-14.08 7.489-25.442 19.572-33.829 33.371-8.061 13.439-13.359 28.668-13.703 44.15H62.246c-15.632 0-28.271 12.654-28.271 28.252v65.635c0 15.615 12.64 28.267 28.271 28.267h108.407c15.614 0 28.286-12.651 28.286-28.267v-65.635c0-15.598-12.672-28.252-28.286-28.252h-38.835c.265-8.387 3.648-18.988 9.32-28.301 5.887-9.883 14.24-18.184 21.846-22.092l62.067-32.638c13.228-7.033 24.038-18.182 32.262-30.968 8.224 12.787 19.014 23.935 32.258 30.968l62.053 32.638c7.618 3.924 15.959 12.209 21.845 22.092 6.001 9.791 9.468 21.056 9.385 29.609v.555h-41.905c-15.615 0-28.272 12.654-28.272 28.269v65.634c0 15.602 12.657 28.253 28.272 28.253h108.389c15.63 0 28.287-12.651 28.287-28.253v-65.634c-.001-15.614-12.658-28.268-28.288-28.268z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mobile.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mobile.svg
deleted file mode 100644
index 92532b8005..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mobile.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M360.199 36.871H149.281c-11.748 0-21.271 9.523-21.271 21.272v394.638c0 11.748 9.523 21.275 21.271 21.275h210.918c11.746 0 21.276-9.527 21.276-21.275V58.144c.001-11.75-9.53-21.273-21.276-21.273zM209.638 442.674h-46.302v-46.301h46.302v46.301zm0-68.079h-46.302V328.29h46.302v46.305zm69.599 68.079h-46.302v-46.301h46.302v46.301zm0-68.079h-46.302V328.29h46.302v46.305zm-44.276-80.341c0-10.939 8.869-19.809 19.807-19.809s19.803 8.869 19.803 19.809-8.865 19.807-19.803 19.807-19.807-8.868-19.807-19.807zm112.951 148.42H301.61v-46.301h46.302v46.301zm0-68.079H301.61V328.29h46.302v46.305zm0-109.27H163.336V70.915h184.576v194.41z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-molecular-network.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-molecular-network.svg
deleted file mode 100644
index 20d87126aa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-molecular-network.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M429.72 139.691c-24.298-9.315-51.538 2.832-60.925 27.114l-33.846-1.161c-6.801-25.133-32.046-40.992-57.881-35.648a52.422 52.422 0 0 0-4.843 1.262l-15.333-19.048c4.479-9.242 5.395-20.162 1.635-30.575-7.359-20.393-29.86-30.954-50.265-23.565-20.405 7.378-30.936 29.874-23.576 50.266 6.736 18.571 25.997 28.939 44.768 25.078l15.467 19.134c-6.409 10.414-9.091 23.153-6.409 36.071 2.125 10.381 7.39 19.289 14.553 26.029L235.21 244.21c-7.164-2.65-14.913-4.087-22.991-4.087-11.118 0-21.517 2.716-30.705 7.521l-19.196-20.797c8.763-15.358 10.397-34.502 2.746-51.935-12.819-29.167-46.895-42.443-76.065-29.593-29.169 12.821-42.444 46.862-29.626 76.03 12.852 29.205 46.863 42.45 76.063 29.631.458-.217.95-.427 1.406-.653l19.164 20.764c-6.508 10.268-10.269 22.436-10.269 35.479a66.297 66.297 0 0 0 9.549 34.353l-24.951 21.747c-6.215-3.713-13.245-6.227-20.897-7.044-28.253-3.045-53.597 17.41-56.64 45.649-3.009 28.254 17.398 53.596 45.653 56.64 28.254 3.01 53.599-17.412 56.606-45.649.882-7.996-.198-15.718-2.746-22.81l28.124-24.51c9.45 5.166 20.273 8.09 31.784 8.09 19.687 0 37.412-8.581 49.579-22.217l45.422 21.765c-.949 12.667 3.434 25.666 13.209 35.298 17.594 17.348 45.945 17.151 63.278-.46 17.396-17.591 17.168-45.961-.425-63.31-16.612-16.364-42.774-17.115-60.236-2.354l-45.717-21.906c.85-4.288 1.342-8.735 1.342-13.281 0-16.039-5.69-30.736-15.142-42.233l21.877-36.2c3.826.131 7.785-.126 11.71-.945 15.693-3.238 28.088-13.604 34.597-26.999l37.377 1.258c4.773 11.761 14.125 21.585 26.914 26.457 24.362 9.323 51.669-2.892 60.956-27.255 9.318-24.386-2.881-51.673-27.24-60.963z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-molecular.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-molecular.svg
deleted file mode 100644
index 904e0976c3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-molecular.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M409.809 304.006a64.816 64.816 0 0 0-42.807 16.084l-58.209-33.338c.23-2.123.393-4.298.393-6.491 0-5.624-.85-11.056-2.418-16.155l34.891-20.225c9.517 9.928 22.893 16.169 37.738 16.169 28.844 0 52.225-23.378 52.225-52.239 0-28.82-23.381-52.209-52.225-52.209-28.875 0-52.224 23.389-52.224 52.209 0 5.154.751 10.094 2.156 14.797l-35.024 20.273c-5.131-5.408-11.312-9.773-18.311-12.717v-64.473c25.539-8.795 43.916-33.011 43.916-61.525 0-35.938-29.163-65.082-65.107-65.082-35.908 0-65.043 29.145-65.043 65.082 0 28.515 18.346 52.73 43.854 61.513v64.485c-6.541 2.777-12.461 6.803-17.363 11.79l-34.176-19.573c1.309-4.625 2.094-9.519 2.094-14.57 0-28.82-23.412-52.209-52.227-52.209-28.842 0-52.223 23.389-52.223 52.209 0 28.861 23.381 52.239 52.223 52.239 14.916 0 28.355-6.31 37.871-16.351l33.453 19.168a55.547 55.547 0 0 0-2.812 17.394c0 2.292.131 4.534.424 6.741l-56.802 32.894c-11.413-9.906-26.292-15.89-42.579-15.89-35.938 0-65.074 29.104-65.074 65.058 0 35.959 29.137 65.062 65.074 65.062 35.939 0 65.078-29.103 65.078-65.062 0-4.265-.457-8.448-1.21-12.492l56.737-32.88c6.378 4.807 13.799 8.24 21.912 9.877v36.162c-22.861 5.533-39.896 26.086-39.896 50.691 0 28.846 23.381 52.224 52.223 52.224 28.845 0 52.191-23.378 52.191-52.224 0-24.605-17.004-45.158-39.895-50.691v-36.884a54.152 54.152 0 0 0 19.098-9.317l58.175 33.322a65.3 65.3 0 0 0-1.144 12.212c0 35.959 29.136 65.062 65.043 65.062 35.939 0 65.078-29.103 65.078-65.062 0-35.955-29.139-65.058-65.078-65.058z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mountain.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mountain.svg
deleted file mode 100644
index a21324f819..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mountain.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M349.24 82.018L263.903 306.91 378.1 429.645h94.557L349.24 82.018zM38.835 429.645h305.202L141.225 211.646 38.835 429.645z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mouse-cursor.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mouse-cursor.svg
deleted file mode 100644
index b64dd7f88b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mouse-cursor.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M266.384 294.779l90.394 10.395L161.812 62.637l-6.531 311.402 8.748-8.464 57.315-55.47 44.009 122.979c3.482 9.718 12.623 15.785 22.396 15.779 2.664 0 5.376-.452 8.011-1.394 9.714-3.492 15.78-12.63 15.772-22.396 0-2.665-.451-5.378-1.392-8.016l-43.756-122.278z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mouse.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mouse.svg
deleted file mode 100644
index f063df5259..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-mouse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M278.46099999999996 99.76c-6.994-35.505-38.273-62.273-75.833-62.279h-57.224v25.04l57.224-.004c23.524.045 43.377 15.568 49.95 36.934-50.645 5.814-89.981 48.804-89.981 101.007v45.183l.201-.157c.004-.006.043.052.286.346.242.286.627.735 1.155 1.333a100.182 100.182 0 0 0 4.873 5.048c4.374 4.237 10.963 9.963 19.639 15.684 17.383 11.446 42.908 22.846 76.217 22.854 62.378.052 97.146-35.215 101.032-39.379v-50.91c0-51.362-38.079-93.807-87.539-100.7zm3.342 96.201c0 9.67-7.836 17.507-17.504 17.507-9.668 0-17.504-7.837-17.504-17.507v-29.213c0-9.667 7.835-17.505 17.504-17.505 9.668 0 17.504 7.838 17.504 17.505v29.213zm-102.7 86.565a156.085 156.085 0 0 1-16.506-12.527v103.806c0 56.172 45.532 101.707 101.703 101.707 56.168 0 101.701-45.535 101.701-101.707v-99.008c-17.406 13.537-51.398 33.427-101.032 33.481-37.403 0-66.404-12.903-85.866-25.752z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-movie-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-movie-alt.svg
deleted file mode 100644
index 1878dc9ec0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-movie-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M64.747 164.338l50.079 50.078-50.079 50.08zm73.929 49.973l-73.929 73.93v163.072h389.679V214.311h-315.75zM372.615 373.82H156.151v-25.039h216.464v25.039zm.002-57.522H156.156v-25.034h216.461v25.034zm76.096-172.936l-15.129-82.466h-.002L56.346 130.111l72.025 72.025 320.342-58.774zM407.25 81.001l21.574 37.223 2.398 13.07-46.038 8.449-28.657-49.435 50.723-9.307zm-103.652 19.02l28.655 49.435-50.724 9.306-28.656-49.433 50.725-9.308zm-103.653 19.015l28.656 49.437-50.723 9.304-28.655-49.433 50.722-9.308z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-movie.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-movie.svg
deleted file mode 100644
index d5b3481a83..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-movie.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M83.53 63.63v384.462h342.308V63.63H83.53zm54.119 359.738H100.92V386.64h36.729v36.728zm0-74.567H100.92v-36.734h36.729v36.734zm0-77.679H100.92v-36.731h36.729v36.731zm0-74.571H100.92V159.82h36.729v36.731zm0-71.47H100.92V88.35h36.729v36.731zM349.717 406.03H159.651V275.408h190.065V406.03zm0-169.717H159.651V105.691h190.065v130.622zm58.729 187.055h-36.729V386.64h36.729v36.728zm0-74.567h-36.729v-36.734h36.729v36.734zm0-77.679h-36.729v-36.731h36.729v36.731zm0-74.571h-36.729V159.82h36.729v36.731zm0-71.47h-36.729V88.35h36.729v36.731z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-multiple-credit-cards.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-multiple-credit-cards.svg
deleted file mode 100644
index 1330826784..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-multiple-credit-cards.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M151.441 322.712h52.438v13.996h-52.438zm62.463 0h68.355v13.996h-68.355zm-62.463 21.44h140.832v13.99H151.441zm297.065-177.674h-35.428v-41.951c0-8.758-7.607-15.861-16.996-15.861H63.494c-9.387 0-16.996 7.104-16.996 15.861v205.15c0 8.754 7.609 15.848 16.996 15.848h35.428v41.963c0 8.751 7.607 15.846 16.998 15.846h332.586c9.389 0 16.996-7.095 16.996-15.846V182.339c0-8.762-7.607-15.861-16.996-15.861zM98.922 182.339V317.11H74.914V137.082h309.75v29.396H115.92c-9.391 0-16.998 7.099-16.998 15.861zM440.318 378.15H124.107v-81.535h316.211v81.535zm0-148.652H124.107v-37.836h316.211v37.836z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-multiple-windows.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-multiple-windows.svg
deleted file mode 100644
index c8b3ac5669..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-multiple-windows.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M342.261 186.492H61.814c-6.905 0-12.507 5.6-12.507 12.51v234.432H354.77V199.002c.001-6.91-5.599-12.51-12.509-12.51zm-13.537 220.895H75.354V250.168h253.369v157.219zM450.182 78.566H169.739c-6.91 0-12.51 5.602-12.51 12.512v71.734h26.047v-20.566h253.369v157.221h-62.654v26.045h88.701V91.078c0-6.91-5.599-12.512-12.51-12.512z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-music.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-music.svg
deleted file mode 100644
index 87f4ba36a6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-music.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M416.672 50.64L187.203 87.86l.035 275.978c-12.004-4.206-26.398-4.981-41.04-1.319-32.527 8.135-53.833 34.966-47.59 59.924 6.247 24.959 37.676 38.595 70.213 30.446 28.581-7.15 48.497-28.749 48.663-50.819l.031-.005V181.497l168.869-26.476V325.6c-12.172-4.319-26.801-5.139-41.691-1.415-32.869 8.226-54.406 35.34-48.094 60.556 6.314 25.227 38.076 39.003 70.951 30.779 29.951-7.495 50.473-30.668 49.121-53.804V50.64z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-name-badge.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-name-badge.svg
deleted file mode 100644
index 22f66c9234..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-name-badge.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M405.561 188.146v24.149H107.452v-24.149H38.566V441.75h435.88V188.146h-68.885zm-193.759 191.01c-3.171-3.893-9.025-4.922-14.077-7.062-6.771-2.876-14.275-6.162-21.044-8.945-1.93-.522-3.827-1.046-5.737-1.568-2.324-1.601-4.581-6.866-5.807-9.454-1.242-.194-2.468-.359-3.662-.553.163-4.02 2.681-4.251 3.662-7.357.852-2.699.1-6.248 1.439-8.766.98-1.75 3.106-1.766 4.201-3.27.966-1.373 1.621-3.729 1.915-5.412.604-3.059 1.046-7.241-.361-10.252-.849-1.732-1.387-1.896-1.619-4.025-.245-2.55.77-10.888.801-12.7.131-4.694 0-8.944-1.11-13.471 0 0-1.407-4.141-3.548-5.382l-4.301-.75-2.683-2.471c-10.693-6.575-22.187-1.965-28.287.539-8.86 2.876-14.518 15.371-10.593 33.945.685 3.136-1.735 4.541-1.538 6.279.327 3.791.426 12.85 3.957 15.071.328.233 2.845.883 2.845.688.376 3.664.687 7.361 1.063 11.021.866 2.457 3.009 2.73 3.663 6.18l-2.731.686c-1.242 2.588-3.499 7.854-5.821 9.454-1.914.522-3.859 1.046-5.789 1.568-6.72 2.783-14.226 6.069-20.993 8.945-4.58 1.912-9.795 2.942-13.114 5.937V257.755h129.269v121.401zm152.064-10.398H246.663v-24.899h117.203v24.899zm68.346-62.686H246.663v-24.906h185.549v24.906zm-51.407-176.494h-67.986c.081-1.226.162-2.466.162-3.712-.033-30.788-24.951-55.721-55.755-55.721-30.772 0-55.725 24.933-55.725 55.721 0 1.247.051 2.487.131 3.712h-69.066v57.771h248.239v-57.771zM256.703 150.95c-13.866 0-25.083-11.216-25.101-25.084.018-13.863 11.235-25.08 25.101-25.08 13.833 0 25.049 11.217 25.065 25.08-.016 13.868-11.233 25.084-25.065 25.084z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-bottom.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-bottom.svg
deleted file mode 100644
index eeb3e79bdc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-bottom.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M419.598 113.003H85.734L252.662 324.59l166.936-211.587zM90.395 332.234v66.172h332.542v-66.172H90.395z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-down.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-down.svg
deleted file mode 100644
index 007e8dd8ff..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.125 361.35L88.193 149.765h333.862z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-first.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-first.svg
deleted file mode 100644
index 85d44722ee..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-first.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M186.178 256.243l211.583 166.934V89.312L186.178 256.243zm-73.826 166.269h66.179V89.975h-66.179v332.537z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-horizontal.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-horizontal.svg
deleted file mode 100644
index 4988e723eb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-horizontal.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M475.189 255.305l-89.517-73.889v48.204h-261.62v-48.204l-89.519 73.885 89.519 73.89v-48.209h261.62v48.209z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-last.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-last.svg
deleted file mode 100644
index 53f70d36fd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-last.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M111.708 424.514l211.581-166.927L111.708 90.654v333.86zM330.935 87.311v332.544h66.173V87.311h-66.173z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-left.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-left.svg
deleted file mode 100644
index 56cdecce10..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-left.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M148.584 255.516L360.168 88.583l-.002 333.862z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-right.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-right.svg
deleted file mode 100644
index 251b6934d3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-right.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M360.124 255.513L148.535 422.442l.002-333.862z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-road.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-road.svg
deleted file mode 100644
index f05567099f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-road.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M214.496 188.216h83.486l-3.89-46.45h70.992l-108.827-56.36-108.866 56.36h70.995l-3.89 46.45zm93.787 122.225l-5.917-70.51H210.18l-5.954 70.51h-97.644l149.676 116.095 149.676-116.095h-97.651z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-top.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-top.svg
deleted file mode 100644
index c932714737..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-top.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.567 187.177L89.633 398.762h333.861L256.567 187.177zm162.265-73.818H86.29v66.173h332.542v-66.173z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-up.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-up.svg
deleted file mode 100644
index 612ec9193e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-up.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.104 149.836l166.933 211.585H88.168z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-vertical.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-vertical.svg
deleted file mode 100644
index fbe3906472..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation-vertical.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M281.194 124.49h48.21L255.52 34.973l-73.889 89.517h48.205v261.625h-48.201l73.885 89.519 73.884-89.519h-48.21z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation.svg
deleted file mode 100644
index 67d9c2a0c2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigation.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M475.296 255.305l-89.521-73.889v48.204H280.648V124.49h48.206L254.97 34.973l-73.888 89.517h48.202v105.13H124.156v-48.204l-89.518 73.885 89.518 73.89v-48.209h105.128v105.133h-48.199l73.885 89.519 73.884-89.519h-48.206V280.982h105.127v48.209z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigational-arrow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigational-arrow.svg
deleted file mode 100644
index bf60bde293..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-navigational-arrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.303 372.245L89.721 455.097 256.303 56.825l166.581 398.272z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-network-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-network-alt.svg
deleted file mode 100644
index e6b2c25036..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-network-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M474.1 148.041V38.18H364.224v38.95h-6.702c-17.723.078-35.416 6.147-50.984 15.499-15.565 9.447-29.139 22.271-37.475 37.934l-37.479 71.227c-4.74 9.22-14.551 19.031-26.16 25.976-11.576 7.052-24.785 11.17-35.156 11.07h-23.217V199.27H37.205v109.877h109.846V269.48h23.217c10.371-.053 23.58 4.051 35.156 11.087 11.609 6.966 21.42 16.771 26.16 25.961l37.479 71.251c8.336 15.663 21.909 28.479 37.475 37.934 15.568 9.354 33.262 15.399 50.984 15.501h6.702v42.248H474.1V363.584H364.224v36.956h-6.702c-10.369.065-23.576-4.024-35.156-11.052-11.609-6.964-21.418-16.778-26.16-26l-37.479-71.213c-4.512-8.473-10.595-16.061-17.592-22.795h123.089v39.665H474.1V199.269H364.224v39.566H241.135c6.997-6.701 13.111-14.31 17.592-22.793l37.479-71.189c4.742-9.22 14.551-19.031 26.16-25.966 11.58-7.062 24.787-11.181 35.156-11.085h6.702v40.239H474.1z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-newspaper-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-newspaper-alt.svg
deleted file mode 100644
index 1bcf422c64..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-newspaper-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M174.228 247.824h60.975v60.975h-60.975zm0-115.391h228.379v75.56H174.228zm100.767 114.916h127.611v25.403H274.995zm0 55.405h127.611v25.402H274.995zm0 51.189h127.611v25.404H274.995zM114.163 70.231V122.705H50.306v271.89c0 26.013 21.16 47.174 47.168 47.174h317.047c26.012 0 47.174-21.161 47.174-47.174V70.231H114.163zm0 324.364c0 9.201-7.486 16.686-16.689 16.686-9.197 0-16.682-7.484-16.682-16.686V153.191h33.371v241.404zm317.043 0c0 9.201-7.484 16.686-16.686 16.686H141.603a46.928 46.928 0 0 0 3.049-16.686V100.718h286.555v293.877z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-newspaper.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-newspaper.svg
deleted file mode 100644
index d585513f28..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-newspaper.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M114.162 70.231v25.217h.025v74.837h-.025v224.311c0 9.199-7.486 16.685-16.688 16.685-9.199 0-16.684-7.486-16.684-16.685V153.191h20.693v-30.487H50.307v271.892c0 26.01 21.156 47.173 47.168 47.173H414.52c26.012 0 47.174-21.163 47.174-47.173V70.231H114.162zM219.5 307.048h-60.973v-60.973H219.5v60.973zm199.143 72.299H256.049v-25.404h162.594v25.404zm0-51.188H256.049v-25.404h162.594v25.404zm0-55.408H256.049v-25.403h162.594v25.403zm1.697-74.23H160.223v-75.56H420.34v75.56z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-next-media.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-next-media.svg
deleted file mode 100644
index 57d4c8e0e3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-next-media.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.88 256.048L42.096 380.525V131.568zm210.519 0L252.614 380.525V131.568z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-next.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-next.svg
deleted file mode 100644
index b00b37dd17..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-next.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M397.727 255.63l-286.7 166.932V88.697z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-nodes.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-nodes.svg
deleted file mode 100644
index e912e52d15..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-nodes.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M409.269 328.537v-87.092h-87.09c-6.66-30.424-33.752-53.207-66.178-53.207-32.428 0-59.52 22.783-66.18 53.207h-57.98v-57.984c30.426-6.66 53.207-33.75 53.207-66.18 0-37.422-30.338-67.758-67.762-67.758s-67.764 30.336-67.764 67.758c0 32.43 22.783 59.52 53.209 66.18v87.092h87.09c6.662 30.428 33.752 53.209 66.18 53.209 32.426 0 59.516-22.781 66.178-53.209h57.98v57.984c-30.426 6.66-53.207 33.75-53.207 66.176 0 37.424 30.338 67.764 67.762 67.764s67.764-30.34 67.764-67.764c0-32.426-22.784-59.516-53.209-66.176zM78.628 117.281c0-21.312 17.342-38.652 38.658-38.652s38.656 17.34 38.656 38.652c0 21.316-17.34 38.66-38.656 38.66s-38.658-17.343-38.658-38.66zm177.373 177.375c-21.316 0-38.656-17.344-38.656-38.658s17.34-38.652 38.656-38.652c21.314 0 38.654 17.338 38.654 38.652s-17.34 38.658-38.654 38.658zm138.713 138.713c-21.316 0-38.656-17.342-38.656-38.656s17.34-38.652 38.656-38.652c21.314 0 38.658 17.338 38.658 38.652s-17.344 38.656-38.658 38.656z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-notepad-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-notepad-alt.svg
deleted file mode 100644
index bca4d0c462..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-notepad-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M115.059 58.964v300.769l6.934 6.935 79.432 79.434 6.934 6.936h188.582V58.964H115.059zM239.34 429.356c-35.182 0-18.229-83.392-18.229-83.392s-21.539 5.233-42.586 5.233c-19.859 0-39.279-4.656-39.789-22.76v-181.92H373.26v282.838H239.34zm1.859-46.361h108.805v-23.679H243.236c-1.189 7.997-1.871 16.24-2.037 23.679zm-78.359-85.904h187.164v23.679H162.84zm0-124.45h187.164v23.679H162.84zm0 62.225h187.164v23.68H162.84z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-notepad.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-notepad.svg
deleted file mode 100644
index 5fc428082e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-notepad.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M376.957 61.932v22.413c2.908 4.715 4.618 10.252 4.618 16.197 0 17.088-13.852 30.935-30.935 30.935-17.084 0-30.928-13.847-30.928-30.935 0-5.945 1.705-11.479 4.613-16.191V61.932H282.6v22.413c2.91 4.715 4.619 10.252 4.619 16.197 0 17.088-13.852 30.935-30.935 30.935-17.084 0-30.929-13.847-30.929-30.935 0-5.945 1.707-11.479 4.613-16.191V61.932h-41.725v22.413c2.909 4.715 4.62 10.252 4.62 16.197 0 17.088-13.853 30.935-30.934 30.935-17.086 0-30.931-13.847-30.931-30.935 0-5.945 1.708-11.479 4.614-16.191V61.932h-28.687v306.159l7.333 7.333 91.326 91.328h199.412V61.932h-28.039zm3.002 379.781H238.347c-37.202 0-19.276-88.181-19.276-88.181s-86 20.901-87.105-18.534v-179.96h247.993v286.675zm-21.804-207.87H159.513v30.774h198.642v-30.774zm0-51.786H159.513v30.777h198.642v-30.777zm0 103.566H159.513v30.774h198.642v-30.774zm-7.51-167.054c8.502 0 15.396-6.897 15.396-15.4V60.148c0-8.503-6.895-15.396-15.396-15.396-8.506 0-15.399 6.894-15.399 15.396v43.021c-.001 8.503 6.893 15.4 15.399 15.4zm-188.712 0c8.502 0 15.397-6.897 15.397-15.4V60.148c0-8.503-6.895-15.396-15.397-15.396-8.504 0-15.398 6.894-15.398 15.396v43.021c-.001 8.503 6.894 15.4 15.398 15.4zm94.354 0c8.504 0 15.398-6.897 15.398-15.4V60.148c0-8.503-6.895-15.396-15.398-15.396-8.502 0-15.396 6.894-15.396 15.396v43.021c0 8.503 6.894 15.4 15.396 15.4z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-old-key.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-old-key.svg
deleted file mode 100644
index a4003027a4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-old-key.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M474.274 270.657V219.51H195.232c-10.138-34.984-40.518-60.369-76.423-60.369-44.181 0-80.021 38.459-80.021 85.944 0 47.483 35.841 85.94 80.021 85.94 35.905 0 66.286-25.405 76.423-60.368h196.797v30.118h-30.574v51.148h112.313v-51.148h-30.591v-30.118h31.097zm-355.465 22.467c-23.218 0-42.103-21.554-42.103-48.039 0-26.519 18.885-48.073 42.103-48.073 23.234 0 42.12 21.555 42.12 48.073 0 26.485-18.886 48.039-42.12 48.039z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-old-phone.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-old-phone.svg
deleted file mode 100644
index 8eb7804e74..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-old-phone.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M340.353 184.117l.189-.084c.051.047.084.084.084.084l.002 50.66s43.088 23.812 75.094 23.812c13.041 0 24.24-3.953 29.938-15.08 19.627-37.652-10.17-88.613-43.76-105.109-52.705-25.131-101.455-33.961-143.811-33.961-.699 0-1.393 0-2.09.004-.691-.004-1.391-.004-2.088-.004-42.355-.004-91.102 8.824-143.811 33.961-33.588 16.496-63.387 67.457-43.762 105.109 5.697 11.125 16.902 15.08 29.941 15.08 32.006 0 75.092-23.812 75.092-23.812l.004-50.66s.033-.037.082-.084l.189.084s15.127-16.508 84.352-16.527c69.228.019 84.355 16.527 84.355 16.527zm-84.354 84.219c-23.844 0-43.178 19.328-43.178 43.178 0 23.848 19.334 43.178 43.178 43.178 23.848 0 43.178-19.33 43.178-43.178 0-23.85-19.33-43.178-43.178-43.178zm73.178-12.834l-12.227-6.756v-13.967l-.002-32.959H195.052v32.959l-.002 13.967-12.225 6.756c-4.043 2.232-34.416 18.625-65.58 24.594l-21.973 67.748v59.717h314.486v-59.717l-22.5-69.373c-28.384-6.889-54.366-20.912-58.081-22.969zm-73.178 122.867c-36.863 0-66.854-29.99-66.854-66.855 0-36.863 29.99-66.857 66.854-66.857 36.865 0 66.855 29.994 66.855 66.857 0 36.865-29.99 66.855-66.855 66.855z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-operator.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-operator.svg
deleted file mode 100644
index ad78b8602f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-operator.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M460.993 383.942c-6.836-19.816-29.469-22.662-48.377-30.633-20.76-8.755-43.783-18.92-64.498-27.416-5.908-1.611-11.824-3.226-17.736-4.84-7.055-4.855-13.967-20.996-17.74-29.019a8283.48 8283.48 0 0 0-11.287-1.61c.582-12.418 8.27-13.084 11.287-22.571 2.662-8.366.279-19.242 4.498-26.988 2.926-5.379 9.543-5.416 12.85-10.026 3.002-4.187 4.977-11.484 5.912-16.608 1.707-9.367 3.195-22.185-1.254-31.477-2.557-5.337-4.172-5.85-4.883-12.329-.867-7.854 2.316-33.466 2.445-39.004.322-14.369-.023-15.532-3.502-29.527 0 0-4.223-12.681-10.838-16.5l-13.195-2.271-8.154-7.556c-32.855-20.216-68.082-6.037-86.947 1.609-25.795 8.374-42.572 32.787-33.965 83.85 2.875.402 5.098 2.847 5.098 5.837v64.401c1.121 1.615 2.396 2.962 3.885 3.895 1.018.639 8.787 2.586 8.736 2.054.787 8.232 1.57 16.47 2.352 24.706l10.543 10.096h25.736c1.273-5.899 6.418-10.317 12.58-10.317h19.506c7.117 0 12.887 5.895 12.887 13.163 0 7.27-5.77 13.161-12.887 13.161h-19.506c-3.711 0-7.041-1.606-9.395-4.167h-33.676l-32.602-31.22v-6.372l-.141-.138v-81.06c0-5.231-4.242-9.472-9.473-9.472-5.229 0-9.471 4.241-9.471 9.472v8.064H132.46v61.386h17.322v19.577l44.338 43.401h2.703c-3.934 8.416-9.52 19.651-15.205 23.562-5.912 1.614-11.828 3.229-17.736 4.84-20.715 8.495-43.736 18.66-64.498 27.416-18.906 7.971-41.541 10.817-48.377 30.633 0 13.46-1.268 45.25-.92 62.885h411.826c.348-17.637-.92-49.427-.92-62.887z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ordered-list.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ordered-list.svg
deleted file mode 100644
index de140283b8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ordered-list.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M180.938 166.79V83.688h268.261v83.102H180.938zm-.003 131.001v-83.098h268.264v83.098H180.935zm.003 131.005v-83.1h268.261v83.1H180.938zM65.94 107.674V95.645c5.566-.25 9.463-.621 11.689-1.119 3.544-.782 6.433-2.354 8.659-4.713 1.524-1.609 2.679-3.761 3.463-6.448.454-1.61.68-2.809.68-3.594h14.758v89.908H87.084v-62.005H65.94zm-.683 176.947c2.521-5.994 8.474-12.338 17.858-19.038 8.142-5.827 13.413-10.002 15.811-12.523 3.679-3.927 5.519-8.226 5.519-12.897 0-3.804-1.055-6.964-3.162-9.49-2.109-2.518-5.126-3.778-9.054-3.778-5.375 0-9.032 2.005-10.975 6.013-1.117 2.314-1.777 5.995-1.984 11.038H62.094c.29-7.648 1.676-13.828 4.16-18.541 4.717-8.97 13.096-13.454 25.138-13.454 9.518 0 17.09 2.633 22.719 7.904 5.626 5.271 8.441 12.246 8.441 20.925 0 6.656-1.988 12.567-5.964 17.734-2.609 3.433-6.895 7.256-12.86 11.474l-7.083 5.021c-4.431 3.144-7.464 5.417-9.097 6.823a19.99 19.99 0 0 0-4.124 4.897h39.251v15.564H61.102c.166-6.449 1.552-12.342 4.155-17.672zm12.589 117.477c0 3.598.577 6.574 1.731 8.93 2.144 4.34 6.042 6.512 11.691 6.512 3.464 0 6.485-1.187 9.062-3.565 2.578-2.377 3.868-5.796 3.868-10.263 0-5.91-2.391-9.859-7.171-11.844-2.722-1.115-7.008-1.675-12.858-1.675v-12.647c5.726-.084 9.721-.64 11.988-1.674 3.914-1.737 5.869-5.251 5.869-10.541 0-3.433-.999-6.224-2.998-8.374-2.001-2.147-4.816-3.223-8.443-3.223-4.164 0-7.226 1.325-9.184 3.968-1.959 2.647-2.896 6.18-2.813 10.605H62.094c.165-4.466.929-8.703 2.292-12.713 1.445-3.514 3.716-6.759 6.814-9.734 2.311-2.107 5.058-3.72 8.236-4.839 3.18-1.115 7.083-1.672 11.708-1.672 8.589 0 15.517 2.222 20.782 6.665 5.265 4.444 7.896 10.408 7.896 17.889 0 5.293-1.57 9.759-4.711 13.395-1.985 2.275-4.052 3.824-6.201 4.651 1.613 0 3.928 1.384 6.944 4.153 4.505 4.175 6.76 9.879 6.76 17.115 0 7.605-2.633 14.292-7.897 20.058-5.268 5.766-13.061 8.648-23.384 8.648-12.72 0-21.56-4.152-26.513-12.463-2.603-4.421-4.048-10.208-4.337-17.362h17.363z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-os-x.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-os-x.svg
deleted file mode 100644
index 170f3aad47..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-os-x.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M83.642 51.955h97.549l79.825 136.791 75.371-136.791h93.118L314.211 261.908l115.294 198.008h-93.118l-75.371-129.289-79.825 129.289H83.642l133.021-198.008z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-out.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-out.svg
deleted file mode 100644
index 73d2cfe147..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-out.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M435.783 385.357H74.589V126.021h191.604V87.648H36.219V423.73h437.934V306.831h-38.369v78.526zM342.891 87.648l42.629 42.63-102.53 102.528 46.789 46.787 102.527-102.524 41.846 41.848V87.648H342.891z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-outbox.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-outbox.svg
deleted file mode 100644
index 3b59c93933..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-outbox.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M387.156 57.791H124.088L34.923 288.615v163.646h441.47V286.066L387.156 57.791zm-49.702 236.625v52.578c0 13.829-11.211 25.037-25.038 25.037H198.905c-13.828 0-25.039-11.208-25.039-25.037v-52.578H83.677l73.03-189.043h197.966l73.906 189.043h-91.125zm-110.44 21.58h61.344v-72.879h57.564L257.68 136.205l-88.238 106.912h57.572v72.879z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-outdent.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-outdent.svg
deleted file mode 100644
index 85ff01f440..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-outdent.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M206.663 166.845V83.742h268.265v83.103H206.663zm0 131.001v-83.099h268.265v83.099H206.663zm0 131.007V345.75h268.265v83.103H206.663zM34.462 256.295l108.29-63.048V319.35z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-add.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-add.svg
deleted file mode 100644
index 538defed20..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-add.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M105.79 434.072V67.443h141.612c37.199 0 19.272 88.184 19.272 88.184s86.003-20.906 87.108 18.527v119.035a95.541 95.541 0 0 1 25.037 3.719V141.064l-91.322-91.326-7.338-7.337H80.75v416.707h205.809a96.569 96.569 0 0 1-19.142-25.036H105.79zm245.716-123.39c-43.354 0-78.502 35.15-78.502 78.51 0 43.354 35.148 78.498 78.502 78.498 43.359 0 78.505-35.145 78.505-78.498 0-43.36-35.146-78.51-78.505-78.51zm14.113 92.621v42.301h-28.231v-42.301H295.09v-28.238h42.298v-42.297h28.231v42.297h42.307v28.238h-42.307z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-down.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-down.svg
deleted file mode 100644
index 2fae28dfd9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M398.426 191.625H305.51V51.115h-99.017v140.51h-92.918l142.427 172.564zM85.043 398.308h341.912v62.577H85.043z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-remove.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-remove.svg
deleted file mode 100644
index c5009604d4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-remove.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M105.396 434.072V67.443H247.01c37.201 0 19.274 88.184 19.274 88.184s85.998-20.906 87.104 18.527v119.035a95.525 95.525 0 0 1 25.039 3.719V141.064l-91.325-91.326-7.337-7.337H80.357v416.707h205.809a96.569 96.569 0 0 1-19.142-25.036H105.396zm245.717-123.39c-43.354 0-78.502 35.15-78.502 78.51 0 43.354 35.148 78.498 78.502 78.498 43.357 0 78.506-35.145 78.506-78.498 0-43.36-35.148-78.51-78.506-78.51zm-56.416 92.621v-28.238h112.836v28.238H294.697z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-restricted.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-restricted.svg
deleted file mode 100644
index 4a7c8696e2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-restricted.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M105.982 434.072V67.443h141.611c37.199 0 19.274 88.184 19.274 88.184s86-20.906 87.106 18.527v119.035a95.55 95.55 0 0 1 25.039 3.719V141.064l-91.327-91.326-7.335-7.337H80.943v416.707H286.75a96.627 96.627 0 0 1-19.14-25.036H105.982zm208.164-46.092c0 20.791 16.912 37.703 37.704 37.703 7.419 0 14.326-2.186 20.166-5.901l-51.97-51.971c-3.714 5.839-5.9 12.746-5.9 20.169zm37.705-37.706c-7.423 0-14.33 2.187-20.173 5.903l51.974 51.967c3.716-5.84 5.901-12.748 5.901-20.164 0-20.792-16.915-37.706-37.702-37.706zm-.152-39.592c-43.354 0-78.498 35.15-78.498 78.51 0 43.354 35.145 78.498 78.498 78.498 43.359 0 78.506-35.145 78.506-78.498 0-43.36-35.146-78.51-78.506-78.51zm.152 131.455c-29.909 0-54.156-24.246-54.156-54.156 0-29.913 24.247-54.158 54.156-54.158 29.907 0 54.152 24.245 54.152 54.158 0 29.91-24.245 54.156-54.152 54.156z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-up.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-up.svg
deleted file mode 100644
index db6ad88927..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-page-up.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M206.491 364.184h99.013V223.676h92.922L255.997 51.111 113.575 223.676h92.916zM85.043 398.311h341.912v62.578H85.043z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paint-roller.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paint-roller.svg
deleted file mode 100644
index 59665d6232..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paint-roller.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M456.479 241.509L276.031 61.071c-11.052-11.043-28.941-11.043-39.96 0l-5.788 5.758-29.335-29.359-76.031 76.001L225.671 268.77l-10.922 11.414-17.627-17.631L43.85 415.844l58.502 58.514 153.307-153.283-19.229-19.213 28.124-29.431L164.159 117.58l36.789-36.746 7.687 7.667-9.909 9.891c-11.053 11.038-11.053 28.94 0 39.979l180.417 180.438c11.051 11.046 28.971 11.046 39.991 0l37.346-37.338c11.023-11.027 11.023-28.929-.001-39.962z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-palette.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-palette.svg
deleted file mode 100644
index 26c9f7f6b2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-palette.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M373.073 239.561c-14.137-2.883-31.906 3.329-45.281-2.604-23.164-10.264-23.168-47.011-25.08-67.755-2.34-25.318-13.271-39.891-32.422-50.529-38.291-21.273-91.846-26.396-132.5 10.76-52.771 48.225-55.17 143.19-5.35 212.118 28.314 39.176 89.383 68.36 134.994 68.36 71.602 0 137.303-43.64 146.811-101.841 5.805-35.541-10.402-62.23-41.172-68.509zm-222.99-73.403c16.375-19.559 44.195-21.785 62.152-4.98 17.938 16.806 19.221 46.28 2.848 65.845-16.363 19.553-44.186 21.777-62.133 4.979-17.953-16.811-19.23-46.279-2.867-65.844zm78.389 166.358c-13.189 15.759-35.613 17.554-50.076 4.013-14.469-13.547-15.5-37.297-2.311-53.062 13.195-15.766 35.617-17.56 50.09-4.017 14.455 13.545 15.492 37.299 2.297 53.066zm78.412 25.937c-9.498 11.348-25.648 12.641-36.066 2.889-10.42-9.756-11.16-26.861-1.662-38.217 9.502-11.352 25.65-12.644 36.074-2.89 10.41 9.752 11.154 26.863 1.654 38.218zm55.664-53.941c-7.092 8.471-19.145 9.436-26.92 2.157-7.777-7.28-8.33-20.048-1.238-28.521 7.092-8.473 19.143-9.438 26.922-2.158 7.773 7.279 8.328 20.049 1.236 28.522z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-panel-show.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-panel-show.svg
deleted file mode 100644
index 91c3e9f0ca..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-panel-show.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M36.768 66.555v377.107h436.661V66.555H36.768zm400.627 343.174H73.74V138.653h363.654v271.076zm-183.34-215.542l115.577 146.492-231.152-.002z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pannel-close.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pannel-close.svg
deleted file mode 100644
index 8006a60541..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pannel-close.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M37.324 67.555v377.107h436.664V67.555H37.324zm400.627 343.174H74.298V139.653h363.653v271.076zm-183.334-51.077L139.043 213.161l231.146.003z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pants.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pants.svg
deleted file mode 100644
index 9604660ce0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pants.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M356.05 87.055V33.606H157.618v41.646l-20.539 402.902 77.685-.709 13.441-177.859 28.335-165.213 28.335 165.213L298.3 477.445l77.683.709z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-bag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-bag.svg
deleted file mode 100644
index e7435caf75..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-bag.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M202.539 89.037h106.926v53.674h39.989V85.168l-39.989-36.117H202.539l-39.985 36.117v57.543h39.985zm181.967 77.354H106.333v296.558h299.334V166.391z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-plane-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-plane-alt.svg
deleted file mode 100644
index 2c4259e954..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-plane-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M410.013 77.199L86.699 243.26l-32.807 16.851L83.8 281.692l76.875 55.472 26.316 111.602 44.961-60.169 72.869 52.58 25.396 18.325 9.391-29.878L441.9 104.079l16.207-51.58-48.094 24.7zm-91.966 345.65l-93.654-67.578L420.339 97.303 186.654 328.037l-89.629-64.673L420.339 97.303 318.047 422.849z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-plane.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-plane.svg
deleted file mode 100644
index fe60af779b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paper-plane.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M410.011 77.201L86.698 243.261l-32.807 16.85L83.8 281.693l68.36 49.327 28.243 119.776 48.254-64.576 76.163 54.957 25.397 18.325 9.39-29.879L441.9 104.079l16.208-51.582-48.097 24.704zM205.052 369.186l-13.361 26.305-15.819-67.088L419.599 98.194 205.052 369.186z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-parachute-drop.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-parachute-drop.svg
deleted file mode 100644
index cdd4a501d7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-parachute-drop.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M422.32 200.572L282.21 307.434l33.779-81.264c-.359-7.125-6.65-14.58-17.22-20.256l-41.781 100.512-43.389-100.705c-10.208 5.393-16.52 12.432-17.48 19.275l36.426 84.539L89.679 200.572c-9.877 3.02-17.729 7.391-22.963 12.266l158.297 120.734h61.973l158.299-120.734c-5.235-4.875-13.086-9.244-22.965-12.266zM183.5 357.25h145.002v98.932H183.5zm139.539-153.479c11.408-27.387 12.947-53.031 4.48-76.395-15.508-42.801-59.992-66.127-71.514-71.559-11.527 5.455-56.121 28.91-71.559 71.645-8.43 23.338-6.881 48.955 4.511 76.309 12.946-14.42 37.825-23.994 67.043-23.994s54.097 9.578 67.039 23.994zM285.335 55.879c19.421 12.965 44.26 34.771 55.783 66.568 7.775 21.457 8.337 44.346 1.734 68.359 13.297-6.902 30.602-11.029 49.771-11.029 25.079 0 47.15 7.012 61.081 18.262-3.273-72.31-75.346-131.705-168.369-142.16zM119.373 179.777c19.172 0 36.475 4.127 49.775 11.031-6.606-24.014-6.042-46.904 1.732-68.361 11.523-31.797 36.359-53.604 55.783-66.568-93.021 10.455-165.093 69.848-168.367 142.16 13.928-11.25 35.998-18.262 61.077-18.262z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-parental-control.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-parental-control.svg
deleted file mode 100644
index 3a19170b80..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-parental-control.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M189.307 167.625c34.041 0 61.675-27.586 61.675-61.667 0-34.046-27.634-61.654-61.675-61.654-34.076 0-61.677 27.608-61.677 61.654-.001 34.081 27.6 61.667 61.677 61.667zm182.506 147.252c24.494 0 44.345-19.852 44.345-44.344 0-24.489-19.851-44.334-44.345-44.334-24.493 0-44.31 19.845-44.31 44.334.001 24.492 19.817 44.344 44.31 44.344zm41.138 18.59c-6.475-6.441-14.127-10.305-41.825-10.305-27.666 0-33.355 7.295-41.27 10.305l-40.255 12.035c-.229-7.424-4.547-137.281-17.17-149.939-13.047-13.028-28.514-20.855-84.502-20.855-55.983 0-71.06 8.476-83.454 20.855-12.361 12.364-8.174 144.273-8.174 144.273l27.372-65.048 17.2 193.753 49.641-99.142 46.339 99.142 16.383-193.753 36.233 70.762-.458.149 50.329 13.096 8.534 109.746L372.4 419.48l22.957 49.061 8.078-95.873 13.571 32.189c.001 0 2.388-64.948-4.055-71.39z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-partly-cloudy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-partly-cloudy.svg
deleted file mode 100644
index 57af81127e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-partly-cloudy.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M438.801 350.975a80.815 80.815 0 0 0 2.584-20.338c0-44.345-35.955-80.33-80.315-80.33-33.356 0-61.935 20.354-74.103 49.294-10.398-12.263-25.932-20.041-43.296-20.041-31.393 0-56.837 25.438-56.837 56.849a57.69 57.69 0 0 0 2.16 15.58c-25.638 9.39-43.92 34.009-43.92 62.936 0 36.972 29.973 66.988 66.991 66.988H418.59c37.053 0 67.025-30.017 67.025-66.988 0-30.003-19.672-55.364-46.814-63.95zM210.118 96.412c10.662 0 19.295-8.635 19.295-19.313V49.305c0-10.646-8.633-19.298-19.295-19.298-10.628 0-19.261 8.651-19.261 19.298v27.794c0 10.678 8.633 19.313 19.261 19.313zm96.11 39.814a19.23 19.23 0 0 0 13.64-5.655l19.684-19.673c7.523-7.52 7.523-19.734 0-27.254-7.52-7.558-19.75-7.558-27.273 0l-19.685 19.649c-7.523 7.519-7.523 19.751 0 27.277a19.259 19.259 0 0 0 13.634 5.656zm-205.825-5.656a19.242 19.242 0 0 0 13.636 5.655 19.25 19.25 0 0 0 13.64-5.655c7.535-7.526 7.535-19.759 0-27.277l-19.654-19.649c-7.523-7.558-19.754-7.558-27.306 0-7.488 7.52-7.488 19.734 0 27.254l19.684 19.672zm226.363 82.452a19.241 19.241 0 0 0 6.998 14.897 106.007 106.007 0 0 1 27.306-3.579c8.798 0 17.364 1.092 25.538 3.137 4.01-3.528 6.542-8.684 6.542-14.44 0-10.655-8.647-19.291-19.295-19.291h-27.794c-10.665 0-19.295 8.636-19.295 19.276zm-143.103 66.406c-26.389-10.531-44.998-36.266-44.998-66.391 0-39.501 31.982-71.515 71.488-71.515 39.47 0 71.484 32.014 71.484 71.515 0 16.499-5.624 31.694-15.009 43.793a81.766 81.766 0 0 1 13.292 5.102 106.82 106.82 0 0 1 24.576-21.32c2.566-8.752 3.989-18.019 3.989-27.574 0-54.229-44.115-98.348-98.333-98.348-54.222 0-98.336 44.118-98.336 98.348 0 39.276 23.155 73.224 56.542 88.972a83.143 83.143 0 0 1 15.305-22.582zm-83.26 16.069l-19.685 19.672c-7.523 7.521-7.523 19.719 0 27.271 3.76 3.76 8.713 5.626 13.634 5.626 4.957 0 9.893-1.866 13.672-5.626l19.654-19.688c7.535-7.52 7.535-19.715 0-27.255-7.522-7.536-19.75-7.536-27.275 0zm-6.883-82.46c0-10.655-8.651-19.291-19.31-19.291H46.414c-10.646 0-19.296 8.636-19.296 19.276 0 10.647 8.65 19.281 19.296 19.281H74.21c10.659 0 19.31-8.603 19.31-19.266z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paste-in.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paste-in.svg
deleted file mode 100644
index eae1a1bd12..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-paste-in.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M380.295 95.092h-68.479a54.17 54.17 0 0 0 .097-3.321c0-30.805-24.948-55.743-55.722-55.743-30.803 0-55.756 24.938-55.756 55.743 0 1.112.065 2.208.098 3.321h-68.446v57.766h248.208V95.092zm-124.104 21.76c-13.865-.033-25.049-11.232-25.079-25.081.03-13.862 11.214-25.081 25.079-25.1 13.834.019 25.083 11.237 25.083 25.1 0 13.848-11.249 25.047-25.083 25.081zm149.053 13.787v48.676H107.172v-48.676H79.537v345.078h353.307V130.639h-27.6z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-path.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-path.svg
deleted file mode 100644
index a8f5df6e4c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-path.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M351.649 115.632l-73.578 89.16h48.004v105.905c-.028 19.002-15.401 34.385-34.401 34.434-19.031-.049-34.398-15.432-34.467-34.434v-95.259c0-47.27-38.294-85.548-85.547-85.581-47.256.033-85.548 38.311-85.581 85.581v172.579h51.146V215.438c.031-19.001 15.437-34.4 34.436-34.438 19 .037 34.369 15.436 34.402 34.438v95.259c.034 47.271 38.328 85.549 85.611 85.565 47.225-.017 85.518-38.294 85.547-85.565V204.792h48.009l-73.581-89.16z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pause.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pause.svg
deleted file mode 100644
index 7d9dce3838..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pause.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M289.335 420.379V90.8h83.103v329.579h-83.103zm-152.737-.002V90.804h83.101v329.573h-83.101z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pc.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pc.svg
deleted file mode 100644
index a8c8196797..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pc.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M435.822 51.502H76.626c-6.804 0-12.362 5.513-12.362 12.332V315.62c0 6.8 5.559 12.33 12.362 12.33h359.196c6.801 0 12.295-5.53 12.295-12.33V63.834c0-6.818-5.494-12.332-12.295-12.332zm-17.593 246.526H94.188V81.426h324.041v216.602zM65.146 460.668h381.008v-97.24H65.146v97.24zm242.552-61.085h109.386v24.932H307.698v-24.932zm-193.104-1.949c8.6 0 15.598 7.003 15.598 15.601 0 8.604-6.998 15.6-15.598 15.6-8.602 0-15.6-6.996-15.6-15.6 0-8.598 6.998-15.601 15.6-15.601z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-alt-2.svg
deleted file mode 100644
index 4aa84eae75..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-alt-2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M380.285 262.184l-67.236-94.832c-3.039-4.427-6.604-7.14-10.397-9.242-4.09-2.133-8.504-3.612-14.128-3.693-.654 0-1.209.022-1.635.061l-30.708 1.926-31.653-1.986a23.975 23.975 0 0 0-1.604-.052c-5.625.069-10.073 1.557-14.126 3.723-3.793 2.125-7.359 4.866-10.433 9.311l-66.351 94.855c-5.56 7.909-3.631 18.782 4.283 24.329a17.45 17.45 0 0 0 24.298-4.305l61.643-88.057c.13.551.292 1.089.292 1.663v5.05-.031c0 35.709-5.722 128.409-56.607 246.123-3.826 8.839.229 19.115 9.09 22.949a17.562 17.562 0 0 0 6.902 1.42c6.769 0 13.177-3.931 16.024-10.538 23.708-54.768 45.029-139.398 45.029-139.398.951-3.795 4.904-6.86 8.764-6.86v-.014.014h8.829c3.893 0 7.883 3.065 8.799 6.86 0 0 21.32 84.631 44.997 139.398 2.843 6.607 9.286 10.538 16.056 10.538 2.322 0 4.643-.454 6.9-1.42 8.831-3.834 12.917-14.11 9.123-22.949-50.916-117.714-56.639-210.413-56.639-246.123v-5.037c0-.276.066-.538.133-.799l61.869 87.295c5.559 7.86 16.45 9.712 24.33 4.146 7.884-5.588 9.713-16.456 4.156-24.325zM256.181 141.833c27.731 0 50.167-22.471 50.167-50.185 0-27.709-22.436-50.191-50.167-50.191-27.729 0-50.195 22.482-50.195 50.191 0 27.714 22.466 50.185 50.195 50.185z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-alt.svg
deleted file mode 100644
index 7f129069c7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.968 166.154c34.206 0 61.936-27.727 61.936-61.934 0-34.208-27.729-61.936-61.936-61.936s-61.936 27.728-61.936 61.936 27.73 61.934 61.936 61.934zm83.467 28.034c-13.082-13.088-28.625-20.924-84.83-20.924-56.214 0-71.38 8.505-83.796 20.924-12.422 12.416-8.23 144.883-8.23 144.883l27.485-65.304 17.28 194.554 49.856-99.57 46.521 99.57 16.456-194.554 27.487 65.304c0-.001 4.857-131.8-8.229-144.883z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-female.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-female.svg
deleted file mode 100644
index 0cf6088418..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people-female.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M197.43 113.067a58.571 58.571 0 1 1 117.142 0 58.571 58.571 0 1 1-117.142 0zm156.723 262.278l-30.607-115.811 4.156-54.407c0-13.077-10.602-23.68-23.68-23.68h-96.045c-13.078 0-23.68 10.603-23.68 23.68l4.154 54.403-30.605 115.814h56.951l15.158 82.159h52.09l15.156-82.159h56.952z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people.svg
deleted file mode 100644
index ab861f8814..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-people.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.173 165.941c34.204 0 61.936-27.729 61.936-61.932 0-34.207-27.731-61.939-61.936-61.939s-61.937 27.732-61.937 61.939c0 34.204 27.733 61.932 61.937 61.932zm63.298 10.375H191.873c-13.829 0-25.04 11.207-25.04 25.038v131.141h35.758v135.729h105.163V332.495h35.755V201.354c0-13.831-11.21-25.038-25.038-25.038z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-phone-ring.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-phone-ring.svg
deleted file mode 100644
index 1797603bbc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-phone-ring.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M392.454 280.446a12.187 12.187 0 0 0 8.658-3.585 12.221 12.221 0 0 0 3.592-8.663c-.004-44.182-18.023-84.239-46.963-113.156-28.855-28.872-68.869-46.687-112.879-46.681-6.766 0-12.246 5.481-12.25 12.246.004 6.766 5.484 12.246 12.25 12.243h-.004c37.354.01 71.088 15.055 95.566 39.513 24.566 24.59 39.773 58.373 39.783 95.84.001 6.766 5.485 12.246 12.247 12.243zm-90.637-69.291c14.602 14.629 23.613 34.685 23.619 56.966.004 6.766 5.49 12.249 12.25 12.246 3.383 0 6.447-1.374 8.66-3.589a12.189 12.189 0 0 0 3.586-8.657c0-28.984-11.811-55.317-30.799-74.283-18.955-18.975-45.273-30.714-74.191-30.709-6.766-.002-12.252 5.482-12.246 12.245 0 6.765 5.475 12.248 12.24 12.241v.006c22.254.005 42.292 8.969 56.881 23.534zm96.246-96.417c-38.959-38.983-92.945-63.056-152.396-63.056-6.766.003-12.25 5.484-12.242 12.249 0 6.764 5.477 12.244 12.242 12.244 52.781.009 100.488 21.31 135.076 55.881 34.674 34.691 56.127 82.441 56.141 135.336-.004 6.766 5.48 12.245 12.244 12.245a12.193 12.193 0 0 0 8.66-3.588 12.2 12.2 0 0 0 3.588-8.659c0-59.598-24.26-113.623-63.313-152.652zM276.925 375.442s-25.443 1.111-81.148-54.593c-55.699-55.702-54.59-81.146-54.59-81.146l40.691-40.697c-6.797-41.243-30.668-106.45-77.355-91.385-46.01 14.48-63.008 79.353-49.277 119.585 67.943 191.817 229.227 230.583 253.951 232.422 59.285 6.276 97.408-30.865 104.852-87.072 0 0-59.945-38.123-89.85-44.388l-47.274 47.274z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-phone.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-phone.svg
deleted file mode 100644
index 085e41600e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-phone.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M44.928 192.299c83.139 234.707 280.482 282.143 310.735 284.393 72.542 7.683 119.189-37.768 128.298-106.547 0 0-73.348-46.646-109.94-54.308l-57.845 57.846s-31.13 1.358-99.292-66.801c-68.156-68.162-66.798-99.293-66.798-99.293l49.795-49.797c-8.322-50.463-37.53-130.254-94.654-111.818-56.299 17.72-77.099 97.097-60.299 146.325z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-photo-album.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-photo-album.svg
deleted file mode 100644
index 532615bf2a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-photo-album.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M428.009 79.498l-298.81 58.337h298.81zM54.943 161.514h57.211v270.988H54.943zm80.89 0v270.988h321.223V161.514H135.833zm239.456 185.788H217.404v-100.59h157.885v100.59z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-picture.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-picture.svg
deleted file mode 100644
index 9250074063..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-picture.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M246.486 299.31l-85.604-91.047-58.21 107.66v29.658h289.12c-36.821-31.753-114.476-99.682-114.476-99.682l-30.83 53.411zM347 230.786c16.062 0 29.073-13 29.073-29.06 0-16.04-13.012-29.062-29.073-29.062-16.019 0-29.038 13.021-29.038 29.062 0 16.06 13.019 29.06 29.038 29.06zM37.74 102.699v306.569h434.688V102.699H37.74zm396.082 267.916H77.635l-.016-228.033h354.928v.017h1.275v228.016z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures-alt-2.svg
deleted file mode 100644
index 4bc1120750..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures-alt-2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M426.043 194.548L365.142 56.354 36.266 201.237l79.195 179.716v73.243h359.41V194.548h-48.828zm-310.582 26.805l-11.13 4.718 11.13 26.259v66.866L70.123 212.231 352.691 92.415l43.287 102.133h-28.342l-28.787-67.919-160.171 67.919h-63.217v26.805zm333.066 206.8h-306.94V220.917h306.94v207.236zm-26.095-181.14h-254.75v155.045h254.75V247.013z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures-alt.svg
deleted file mode 100644
index eee91913ed..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M61.246 47.151V368.5h81.19v-84.674H92.495V77.84h209.35v34.971h31.202v-65.66zm113.107 97.009v321.352h271.818V144.16H174.353zm240.618 236.679H205.597V174.851h209.374v205.988z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures.svg
deleted file mode 100644
index 8844e068b2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pictures.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M316.951 194.43c-45.108 0-81.675 36.565-81.675 81.674 0 45.107 36.566 81.676 81.675 81.676 45.107 0 81.674-36.568 81.674-81.676 0-45.109-36.566-81.674-81.674-81.674zm0 129.602c-26.47 0-47.927-21.456-47.927-47.929 0-26.47 21.457-47.927 47.927-47.927 26.468 0 47.928 21.457 47.928 47.927 0 26.473-21.46 47.929-47.928 47.929zM190.319 125.67l-22.872-26.302h-67.124L77.452 125.67h-41.75v286.494h438.306V125.67H190.319zm-16.901 57.213h-62.392c-7.379 0-13.362-5.982-13.362-13.361 0-7.378 5.982-13.362 13.362-13.362h62.392c7.38 0 13.363 5.984 13.363 13.362.001 7.378-5.983 13.361-13.363 13.361zm143.533 199.934c-58.842 0-106.714-47.871-106.714-106.714 0-58.841 47.872-106.715 106.714-106.715s106.713 47.874 106.713 106.715c0 58.843-47.871 106.714-106.713 106.714zm134.233-209.381a7.086 7.086 0 0 1-7.086 7.087h-16.443a7.084 7.084 0 0 1-7.084-7.087v-16.441a7.085 7.085 0 0 1 7.084-7.085h16.443a7.087 7.087 0 0 1 7.086 7.085v16.441z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pie-chart.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pie-chart.svg
deleted file mode 100644
index 1db73f63d3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pie-chart.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M471.071 282.48c0 105.183-85.274 190.441-190.448 190.441V282.48h190.448zm-52.324-52.624c0-105.174-85.262-190.436-190.446-190.436-105.171 0-190.429 85.262-190.429 190.436 0 105.173 85.258 190.437 190.429 190.437V229.856h190.446z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-piggy-bank.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-piggy-bank.svg
deleted file mode 100644
index 45c74819f8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-piggy-bank.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M461.357 264.329c-1.162-.782-2.388-1.811-3.632-3.005 2.028-1.934 3.761-4.367 4.841-6.965 1.422-3.355 1.93-6.802 1.93-10.124 0-3.301-.49-6.553-1.31-10.024-1.176-6.014-3.842-11.18-7.618-15.337-3.892-4.134-9.205-7.893-16.973-8.042-1.373-.016-2.797.197-4.218.522-15.124-73.448-67.153-120.849-169.364-120.849-43.327 0-79.693 8.554-108.683 23.971l-24.165-13.949c-13.687-7.896-26.929-1.601-29.449 14.014l-10.333 64.552c-5.102 10.092-9.19 20.912-12.165 32.362h-6.932c-15.812 0-28.746 12.95-28.746 28.747v51.451c0 15.812 12.934 28.732 28.746 28.732h11.69c9.975 22.006 26.7 37.183 49.918 47.332v52.16c0 .477.05.93.066 1.375h89.194c.016-.445.047-.898.047-1.375v-34.811c12.854.738 26.439 1.045 40.811 1.045 11.414 0 22.207-.391 32.375-1.178v34.943c0 .477.034.93.067 1.375H386.6c.033-.445.099-.898.099-1.375v-59.094c31.065-18.279 47.286-45.847 51.409-80.737 2.387 2.388 4.953 4.579 7.73 6.521 5.547 3.843 12.053 6.919 19.739 7.342l1.373-27.093c-.753.001-2.878-.585-5.593-2.486zm-330.714-18.654c-10.086 0-18.262-8.189-18.262-18.282 0-10.104 8.176-18.277 18.262-18.277 10.09 0 18.281 8.174 18.281 18.277 0 10.093-8.191 18.282-18.281 18.282zm191.83-81.507c-16.61-4.891-35.761-7.636-57.719-7.636-22.759 0-43.788 2.941-62.87 8.287l-8.338-29.807c21.928-6.13 45.798-9.416 71.208-9.416 24.493 0 46.635 3.058 66.451 8.877l-8.732 29.695z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pin-location.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pin-location.svg
deleted file mode 100644
index 5907d6e541..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pin-location.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.221 60.807c-64.034 0-115.941 51.908-115.941 115.945 0 64.029 115.941 273.752 115.941 273.752s115.943-209.723 115.943-273.752c0-64.037-51.914-115.945-115.943-115.945zm0 151.172c-19.455 0-35.229-15.773-35.229-35.227 0-19.457 15.773-35.23 35.229-35.23s35.228 15.773 35.228 35.23c0 19.453-15.772 35.227-35.228 35.227z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-piracy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-piracy.svg
deleted file mode 100644
index 577d04e517..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-piracy.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.851 154.223c3.791 0 4.708-1.416 4.708-1.416s-.395-11.29-4.708-11.29c-4.349 0-4.71 11.29-4.71 11.29s.882 1.416 4.71 1.416zm-19.13-8.964c2.32 0 6.114-1.029 8.434-2.281 2.356-1.278 4.188-4.425 4.154-7.029-.034-2.603-1.505-5.755-3.303-7.035-1.767-1.266-5.69-1.505-8.732-.479-3.074 1.002-5.886 3.68-6.311 5.978-.394 2.261-.23 5.644.393 7.504.623 1.833 3.041 3.342 5.365 3.342zm29.791-2.28c2.354 1.252 6.115 2.281 8.436 2.281 2.355 0 4.743-1.509 5.397-3.342.589-1.86.783-5.243.358-7.504-.424-2.298-3.204-4.976-6.278-5.978-3.043-1.026-6.997-.787-8.765.479-1.768 1.28-3.237 4.432-3.304 7.035-.03 2.603 1.833 5.751 4.156 7.029zm-104.286 47.418h60.466c26.129 8.018 60.302 15.623 99.641 17.591-.161-4.118.361-11.025.95-17.591h29.233c23.318 0 48.171-13.866 55.235-30.819 7.028-16.973-4.939-10.826-26.589-6.66-21.615 4.183-49.607-38.551-62.101-54.332-12.558-15.768-40.909-43.843-63.113-43.843-22.172 0-50.754 26.807-63.54 41.008-12.788 14.184-41.17 56.719-63.081 53.852-21.912-2.878-33.03-7.737-24.658 9.491 8.34 17.215 34.272 31.303 57.557 31.303zm93.625-103.501c21.812 0 35.349 16.139 35.349 27.086 0 10.973-4.149 17.39-5.231 20.584-2.191 6.492.426 9.656.426 9.656s-.784 6.689-2.909 9.647c-2.126 2.967-12.559-1.97-12.559 9.175 0 0-3.99 2.993-14.977 2.993-10.988 0-15.208-2.993-15.208-2.993 0-11.145-10.432-6.208-12.558-9.175-2.125-2.958-2.876-9.647-2.876-9.647s2.583-3.164.425-9.656c-1.081-3.194-5.265-9.611-5.265-20.584 0-10.947 13.538-27.086 35.383-27.086zm184.536 314.686c-6.148-17.812-26.489-20.363-43.494-27.529-18.671-7.87-39.34-17.006-57.981-24.653a7240.792 7240.792 0 0 1-15.925-4.341c-6.343-4.373-12.559-18.869-15.956-26.094a1536.56 1536.56 0 0 1-10.173-1.455c.555-11.135 7.457-11.747 10.173-20.274 2.386-7.517.261-17.304 4.054-24.251 2.617-4.838 8.566-4.887 11.543-9.025 2.681-3.762 4.48-10.316 5.332-14.936 1.24-6.833 2.29-15.739.523-23.315a422.872 422.872 0 0 1-23.94-1.479l-5.297 17.977c-2.028 6.776-9.418 11.618-16.447 10.751l-12.362-1.536c-6.999-.872-12.853-7.368-12.982-14.448l-.295-18.396c0-.474.096-.897.131-1.357-31.852-6.549-57.392-15.542-74.396-22.514.554 4.454 1.34 9.148 2.387 14.118 1.864 8.723-4.775 12.617-4.348 17.379.947 10.421 1.143 35.473 10.986 41.646.916.577 7.915 2.323 7.847 1.85a8789.064 8789.064 0 0 1 2.91 30.418c2.453 6.754 8.374 7.488 10.075 17.021l-7.556 1.827c-3.401 7.225-9.613 21.721-15.924 26.094-5.333 1.449-10.628 2.905-15.992 4.341-18.607 7.647-39.275 16.783-57.948 24.653-17.005 7.166-37.345 9.718-43.46 27.529 0 12.105-1.176 40.676-.851 56.53h370.186c.322-15.855-.82-44.425-.82-56.531z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-plane.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-plane.svg
deleted file mode 100644
index c09d4522e2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-plane.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M437.545 60.162c-12.654 4.859-26.52 10.547-37.246 19.087l-74.985 63.44L95.29 94.062l-28.026 27.646 177.113 100.969L155.56 330.1l-70.245-21.483-29.921 27.927 66.778 33.946-5.952 7.177c-3.208 3.221-3.01 13.392.032 17.053 3.629 3.072 13.866 3.289 17.102.036l7.358-5.937 34.14 67.148 27.928-29.884-21.485-70.08 107.685-86.99 98.664 173.076 27.63-28.058-47.581-225.2 64.686-77.31c8.436-10.773 14.159-24.643 19.13-37.265 4.97-12.604-1.305-18.963-13.964-14.094zm-320.999 334.9c-.1-.112-.195-.228-.293-.343-.1-.08-.195-.18-.327-.26l.62.603z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-planet.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-planet.svg
deleted file mode 100644
index 455ce2da3a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-planet.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M453.938 46.288c-22.468 0-69.558 26.553-125.968 70.982l-2.452 1.912-2.814-1.341c-20.569-9.876-43.557-15.093-66.479-15.093-41.009 0-79.532 15.958-108.506 44.946-46.076 46.015-58.045 116.353-29.857 175.021l1.342 2.814-1.93 2.434c-61.905 78.599-78.777 124.581-68.051 135.308 1.928 1.958 5.067 2.925 9.353 2.925 21.681 0 66.156-24.643 119.852-66.172a157.344 157.344 0 0 1-14.392-8.767c-18.148 10.632-32.308 16.044-42.119 16.044-5.199 0-9.32-1.489-12.263-4.43-8.894-8.899-4.543-27.604 13.278-57.199l3.89-6.506 4.448 6.178a151.652 151.652 0 0 0 16.449 19.479 158.309 158.309 0 0 0 16.774 14.5c33.39-20.633 75.938-55.954 117.434-97.42 41.5-41.498 76.785-84.073 97.386-117.43a157.245 157.245 0 0 0-14.487-16.792c-5.918-5.901-12.46-11.43-19.457-16.431l-6.179-4.415 6.506-3.924c19.489-11.739 34.598-17.691 44.898-17.691 5.2 0 9.354 1.505 12.265 4.416 8.633 8.613 4.84 26.42-11.61 54.396a162.766 162.766 0 0 1 8.797 14.373c57.981-74.853 73.712-118.738 63.246-129.169-1.931-1.967-5.072-2.948-9.354-2.948zm-55.954 150.854c-27.403 34.109-60.171 70.469-95.259 105.579-35.093 35.071-71.421 67.872-105.561 95.244 18.606 7.714 38.88 11.785 59.157 11.785 40.974 0 79.531-15.958 108.503-44.928 44.116-44.097 56.969-110.581 33.16-167.68z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-play.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-play.svg
deleted file mode 100644
index 3a041b7e2b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-play.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M397.727 256.048l-286.7 166.932V89.114z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-playing-cards.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-playing-cards.svg
deleted file mode 100644
index 132d264d5b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-playing-cards.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M230.656 108.59h.066l53.535.101c.031-.032.062-.047.082-.064-9.307 6.295-16.63 15.5-20.457 26.664l-63.18 184.293a55.009 55.009 0 0 0-.785 2.483l.36-183.174c.034-16.762 13.637-30.303 30.379-30.303zM71.891 255.996c-12.722-10.954-14.126-30.15-3.173-42.841l29.891-34.648c.425 1.326.865 2.651 1.389 3.944l61.202 150.62-89.309-77.075zm105.887-117.125l-.343 174.385-56.592-139.277c-6.311-15.535 1.146-33.258 16.677-39.586l45.653-18.558c-3.399 6.968-5.362 14.782-5.395 23.036zm270.445 59.602l-63.18 184.289c-4.317 12.621-16.123 20.57-28.746 20.57-3.27 0-6.57-.54-9.844-1.669l-105.595-36.182c-15.859-5.429-24.33-22.73-18.866-38.604l63.177-184.292c4.317-12.607 16.123-20.541 28.744-20.541 3.242 0 6.574.53 9.844 1.655l105.562 36.186c15.893 5.445 24.331 22.709 18.904 38.588z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-playlist.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-playlist.svg
deleted file mode 100644
index 0492601307..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-playlist.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M365.348 118.669c-24.918-24.931-23.123-45.422-23.123-45.422l-27.695-.062.065 257.229c-14.259-4.984-31.329-5.92-48.694-1.567-38.554 9.646-63.799 41.468-56.411 71.063 7.392 29.595 44.671 45.749 83.263 36.1 33.875-8.503 57.488-34.104 57.684-60.266V189.489s75.215 9.448 68.54 57.537c-6.636 48.091-13.896 64.323-13.896 64.323l10.039 10.055s29.689-55.327 32.079-90.859c4.61-69.004-54.092-84.145-81.851-111.876zm-109.26-53.3H59.848v51.146h196.24V65.369zm0 91.235H59.848v51.147h196.24v-51.147zm0 91.209H59.848v51.157h196.24v-51.157zM59.848 390.196h101.373v-51.148H59.848v51.148z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-plugin.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-plugin.svg
deleted file mode 100644
index c88e396dfa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-plugin.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M437.433 217.444h-.07c-18.95 0-38.133 22.244-38.133 3.306v-102h-96.227c-22.758 0 3.977 23.061 3.977 45.826v.083c0 22.771-18.46 41.228-41.218 41.228-22.766 0-41.223-18.457-41.223-41.228l-.078-.083c0-22.252 28.295-45.826 5.527-45.826H124.264v97.288c0 22.767-23.572-5.529-45.822-5.529l-.086.081c-22.769 0-41.228 18.454-41.228 41.222 0 22.756 18.459 41.217 41.228 41.217h.086c22.763 0 45.822-26.734 45.822-3.979v104.666h110.438c18.937 0-3.306-19.18-3.306-38.128v-.074c0-18.938 15.353-34.293 34.292-34.293 18.947 0 34.298 15.354 34.298 34.293l.057.074c0 18.519-23.533 38.128-4.591 38.128H399.23V281.499c0-18.938 19.612 4.595 38.133 4.595l.07-.059c18.938 0 34.294-15.352 34.294-34.299 0-18.939-15.357-34.292-34.294-34.292z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-podcast.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-podcast.svg
deleted file mode 100644
index 796c263f0a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-podcast.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M314.992 305.392c5.872 72.313-34.037 161.206-34.037 161.206s-10.117 4.848-25.144 4.848c-14.985 0-25.378-4.848-25.378-4.848s-39.93-88.893-34.059-161.206c0 0 9.413-30.408 59.776-30.408s58.842 30.408 58.842 30.408zm-58.921-167.765c58.295.089 105.458 47.262 105.558 105.596-.061 31.896-12.681 60.379-29.485 84.446 25.291-13.313 57.188-41.241 57.21-84.446-.021-73.636-59.693-133.281-133.283-133.299h-.397c-73.587.018-133.263 59.663-133.281 133.299.019 43.205 31.909 71.133 57.209 84.446-16.802-24.067-29.432-52.55-29.485-84.446.101-58.334 47.264-105.507 105.557-105.596h.397zm-.376-99.061c-113.05 0-204.626 91.605-204.645 204.609 0 30.313 6.61 59.114 18.434 84.995 23.731 51.872 68.499 83.394 123.404 97.714l-3.725-7.703c-41.927-20.549-75.833-60.809-94.536-101.859-10.158-22.283-15.813-47.053-15.861-73.146.158-97.713 79.223-176.721 176.929-176.92 97.685.199 176.729 79.207 176.897 176.92-.129 72.83-44.094 144.15-106.927 174.631l-3.191 8.383c80.206-24.637 137.833-93.402 137.845-183.014-.021-113.004-91.616-204.61-204.624-204.61zm45.036 176.356c0 24.882-20.174 45.057-45.058 45.057-24.862 0-45.036-20.175-45.036-45.057 0-24.876 20.174-45.051 45.036-45.051 24.885 0 45.058 20.175 45.058 45.051z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-poker-chip.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-poker-chip.svg
deleted file mode 100644
index 6f3698bd66..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-poker-chip.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256 49.756C142.1 49.756 49.758 142.098 49.758 256S142.1 462.244 256 462.244c113.902 0 206.242-92.342 206.242-206.244S369.902 49.756 256 49.756zm0 383.381c-97.674 0-177.137-79.463-177.137-177.137S158.326 78.863 256 78.863 433.135 158.326 433.135 256 353.674 433.137 256 433.137zm154.152-177.674v-.035-.051-.008-.105-.021-.105-.01-.055-.027l-.002-.074v-.049l-.004-.033v-.082-.014c0-.129 0-.26-.002-.391l-32.201.328c-.143-14.137-2.676-27.701-7.24-40.295l30.266-10.973a152.643 152.643 0 0 0-3.725-9.311c-.002-.004 0-.002-.004-.006a2.249 2.249 0 0 0-.033-.078v-.002a.87.87 0 0 1-.033-.076c-.004-.004-.004-.004-.004-.008l-.068-.156c0-.004-.002-.004-.004-.008l-.066-.152c-.004-.004-.004-.01-.008-.016-.02-.049-.043-.096-.064-.146-.004-.008-.004-.008-.004-.018-.023-.049-.047-.096-.068-.145-.002-.006-.008-.014-.008-.018-.008-.023-.023-.047-.031-.072 0-.004 0-.002-.006-.004-.008-.025-.018-.045-.027-.066 0-.004-.008-.016-.01-.021-.01-.023-.018-.045-.029-.068l-.006-.016a.372.372 0 0 1-.027-.057.047.047 0 0 0-.01-.02l-.029-.066-.008-.023a.382.382 0 0 1-.023-.051.123.123 0 0 1-.014-.025l-.029-.064-.01-.02a1.284 1.284 0 0 0-.023-.055c-.002-.01-.002-.014-.006-.021-.01-.021-.021-.045-.033-.064a.052.052 0 0 0-.01-.023.17.17 0 0 0-.023-.051c-.004-.01-.004-.016-.01-.025-.008-.02-.018-.039-.027-.064a.907.907 0 0 1-.035-.07c-.002-.008-.008-.016-.012-.025a.383.383 0 0 1-.025-.062c-.006-.01-.01-.02-.016-.027-.004-.014-.014-.031-.018-.047-.006-.008-.01-.02-.014-.029l-.029-.059c-.004-.008-.008-.018-.014-.027-.004-.016-.014-.031-.018-.047-.01-.014-.01-.018-.018-.031-.006-.02-.016-.037-.025-.055l-.014-.029c-.006-.014-.014-.029-.02-.045-.008-.02-.012-.023-.02-.043-.006-.014-.012-.031-.02-.045-.006-.008-.01-.02-.014-.029-.006-.016-.016-.033-.023-.049l-.016-.037c-.008-.014-.014-.029-.023-.047-.004-.006-.008-.02-.014-.029-.004-.014-.014-.029-.018-.041a.314.314 0 0 1-.023-.053.491.491 0 0 1-.018-.033c-.004-.014-.01-.023-.014-.033-.01-.018-.014-.035-.023-.049-.004-.014-.014-.027-.02-.043-.004-.012-.014-.025-.018-.037l-.014-.031a.243.243 0 0 1-.023-.053c-.01-.018-.016-.025-.02-.039a.18.18 0 0 0-.02-.035.159.159 0 0 0-.014-.037c-.01-.02-.016-.037-.025-.057a.088.088 0 0 0-.02-.035c-.004-.01-.008-.021-.014-.031-.004-.014-.01-.023-.016-.037l-.025-.051-.02-.041c-.004-.014-.01-.023-.014-.033l-.033-.068c-.004-.006-.004-.014-.01-.023s-.014-.027-.018-.039l-.012-.027c-.01-.021-.02-.039-.029-.061a.468.468 0 0 0-.014-.031c-.01-.014-.014-.027-.021-.041a.064.064 0 0 0-.012-.025l-.033-.068c-.004-.008-.008-.018-.014-.025-.004-.018-.01-.025-.018-.045-.006-.002-.006-.01-.01-.018-.014-.023-.025-.059-.041-.084 0-.002 0-.004-.004-.01-.004-.02-.014-.029-.02-.047-.004-.004-.004-.012-.008-.014a1.149 1.149 0 0 0-.043-.086c0-.006-.002-.01-.004-.014-.01-.018-.016-.027-.023-.045 0-.008-.006-.016-.01-.021-.01-.025-.023-.049-.035-.078-.002-.004-.008-.01-.008-.014l-.021-.047c0-.004-.004-.008-.004-.014-.014-.023-.027-.059-.041-.084-.006-.008-.006-.012-.01-.018-.023-.051-.045-.094-.07-.145 0-.004-.002-.006-.004-.01-.023-.051-.045-.1-.068-.146-.006-.008-.006-.01-.008-.016-.025-.051-.043-.094-.072-.148 0-.002 0-.006-.004-.008l-.07-.145c0-.006-.006-.014-.008-.018l-.07-.146c0-.002 0-.002-.004-.006-.023-.053-.047-.098-.07-.152-.006-.002-.006-.004-.006-.008a1.926 1.926 0 0 1-.072-.152c-.027-.053-.051-.107-.08-.156-.17-.352-.342-.699-.512-1.049 0 0 0-.002-.002-.002a154.145 154.145 0 0 0-14.738-23.904l-25.744 19.311a122.665 122.665 0 0 0-29.746-28.232l17.947-26.719a156.065 156.065 0 0 0-14.837-8.803c-.004 0-.006-.002-.008-.006-.051-.027-.098-.049-.148-.074l-.004-.002c-.051-.029-.104-.053-.154-.08l-.004-.002-.148-.078c-.004 0-.004-.004-.01-.004l-.146-.076c-.004-.002-.006-.004-.01-.004-.033-.016-.066-.035-.096-.051l-.047-.023c-.006-.002-.01-.006-.014-.006-.033-.018-.062-.031-.094-.047 0-.002-.006-.002-.006-.004-.016-.008-.027-.016-.045-.023l-.01-.004c-.031-.018-.064-.033-.092-.051-.006 0-.006-.002-.01-.002-.02-.008-.031-.016-.045-.025-.006 0-.006-.002-.01-.004l-.088-.043a.06.06 0 0 1-.016-.008l-.043-.023c-.008-.002-.012-.006-.016-.008-.027-.012-.055-.027-.084-.041l-.014-.008c-.02-.008-.027-.014-.047-.023l-.01-.004c-.025-.016-.053-.029-.082-.043l-.018-.01c-.02-.01-.029-.012-.043-.021-.006-.004-.014-.006-.02-.008-.023-.016-.049-.025-.074-.039-.008-.004-.016-.008-.023-.014-.012-.006-.031-.012-.039-.02-.008-.002-.016-.004-.02-.008a1.33 1.33 0 0 0-.076-.039l-.02-.01-.041-.021-.01-.006-.09-.043c-.004-.002-.014-.006-.018-.01-.012-.006-.031-.014-.041-.021-.004 0-.004 0-.004-.002-.027-.014-.061-.027-.094-.045l-.02-.01c-.043-.02-.096-.049-.137-.068l-.02-.01c-.027-.012-.059-.031-.086-.045h-.01c-.012-.008-.029-.016-.041-.023-.006-.004-.016-.008-.025-.012-.018-.01-.027-.016-.047-.021a.473.473 0 0 0-.045-.023l-.037-.021c-.01-.006-.021-.008-.033-.014-.018-.012-.037-.018-.055-.029-.016-.004-.023-.01-.033-.014a.158.158 0 0 0-.041-.021c-.008-.004-.014-.006-.023-.012-.023-.012-.047-.021-.064-.031l-.029-.016a.321.321 0 0 1-.037-.018l-.029-.018-.062-.029-.027-.012a.386.386 0 0 0-.041-.02.438.438 0 0 0-.084-.043.314.314 0 0 0-.037-.018.335.335 0 0 1-.037-.02.084.084 0 0 1-.033-.016c-.016-.01-.035-.016-.051-.025-.012-.004-.025-.012-.037-.018-.008-.004-.025-.014-.035-.016l-.037-.02c-.018-.008-.037-.018-.055-.025-.01-.004-.02-.012-.029-.018a.122.122 0 0 1-.035-.02c-.014-.002-.029-.01-.041-.014-.016-.008-.035-.016-.051-.025-.01-.008-.021-.012-.033-.02-.014-.006-.023-.008-.035-.016-.021-.01-.039-.02-.059-.027-.01-.004-.018-.01-.027-.014a.183.183 0 0 0-.041-.018c-.008-.008-.018-.01-.031-.018-.02-.01-.039-.02-.057-.027-.01-.006-.021-.01-.029-.016-.016-.004-.029-.012-.045-.02-.01-.008-.014-.008-.027-.014-.018-.01-.041-.02-.061-.029l-.023-.014c-.018-.006-.033-.014-.047-.02-.01-.004-.018-.01-.027-.014-.02-.008-.041-.021-.059-.031-.01-.004-.02-.006-.029-.012-.014-.006-.031-.016-.047-.021-.008-.006-.016-.008-.023-.012-.023-.01-.039-.021-.062-.031l-.025-.01c-.018-.008-.031-.018-.045-.021-.01-.006-.02-.014-.027-.016a.767.767 0 0 0-.061-.027l-.027-.016a.772.772 0 0 1-.074-.034c-.02-.01-.037-.02-.057-.027a.256.256 0 0 1-.033-.016c-.012-.008-.025-.012-.035-.018a.218.218 0 0 1-.037-.02c-.02-.008-.037-.018-.057-.021a.938.938 0 0 1-.029-.018l-.043-.02a.25.25 0 0 1-.033-.016c-.016-.01-.037-.018-.057-.027-.008-.004-.018-.01-.027-.012a.386.386 0 0 0-.041-.02l-.039-.02c-.016-.006-.035-.016-.049-.023-.01-.004-.02-.01-.027-.014-.02-.008-.033-.016-.051-.023-.01-.004-.021-.01-.031-.012-.018-.01-.033-.02-.051-.027-.01-.006-.02-.01-.029-.014a.322.322 0 0 1-.053-.025c-.008-.004-.018-.008-.025-.014-.018-.008-.037-.014-.055-.023a.1.1 0 0 1-.023-.012l-.061-.029a.174.174 0 0 1-.023-.01c-.02-.008-.035-.018-.055-.025-.008-.002-.014-.006-.023-.01a.387.387 0 0 0-.062-.029l-.021-.012c-.02-.008-.037-.018-.053-.025l-.02-.01c-.023-.01-.047-.018-.068-.029-.01-.004-.012-.004-.021-.01-.016-.008-.033-.018-.051-.021l-.021-.014a.606.606 0 0 0-.066-.029l-.023-.012-.047-.02a.191.191 0 0 0-.027-.016c-.018-.01-.041-.018-.062-.027l-.023-.01c-.016-.008-.033-.018-.053-.025-.006-.004-.014-.006-.02-.012a.889.889 0 0 1-.062-.027c-.01-.004-.018-.01-.027-.012-.014-.01-.033-.016-.049-.023l-.021-.01c-.023-.01-.047-.02-.064-.031a.526.526 0 0 0-.023-.01l-.055-.025-.02-.006c-.021-.012-.043-.021-.066-.033-.004-.002-.018-.006-.02-.008l-.059-.029c-.006-.002-.008-.002-.012-.006a2.072 2.072 0 0 0-.07-.029l-.02-.01c-.023-.01-.039-.02-.061-.029-.002-.002-.008-.002-.012-.004-.023-.012-.047-.021-.07-.033l-.023-.008a.32.32 0 0 0-.059-.027l-.01-.006a2.243 2.243 0 0 0-.154-.068l-.006-.006c-.023-.01-.047-.021-.07-.029-.01-.004-.012-.008-.021-.01-.021-.012-.045-.021-.062-.031l-.01-.004a1.069 1.069 0 0 0-.068-.029l-.018-.008c-.049-.023-.098-.043-.145-.066-.004-.002-.014-.004-.018-.008-.023-.012-.047-.02-.07-.031l-.006-.002-.068-.029c-.004-.004-.014-.008-.018-.01a1.104 1.104 0 0 1-.07-.033c-.006 0-.006 0-.01-.002l-.064-.029c-.006-.004-.014-.006-.018-.008-.023-.012-.047-.02-.07-.033l-.01-.004c-.023-.01-.047-.018-.066-.029-.006 0-.008-.004-.012-.006l-.074-.031-.01-.006c-.023-.008-.043-.018-.066-.029a.03.03 0 0 0-.014-.006l-.074-.033-.006-.004a2.072 2.072 0 0 0-.07-.029c-.006-.002-.008-.004-.012-.004-.025-.012-.049-.023-.07-.035-.006 0-.01-.002-.016-.006-.018-.01-.041-.018-.062-.027l-.016-.006c-.023-.008-.047-.021-.07-.033-.004 0-.006-.002-.012-.004-.023-.008-.047-.021-.07-.031l-.004-.002c-.029-.012-.053-.021-.08-.035-.002-.002-.004-.002-.01-.004a.631.631 0 0 1-.066-.029c-.004 0-.006-.004-.01-.006-.023-.008-.047-.02-.076-.031-.004 0-.004-.004-.008-.006a.776.776 0 0 1-.074-.031c-.004 0 .002.002-.002 0-.025-.012-.055-.023-.078-.035l-.008-.002c-.023-.012-.053-.023-.074-.033h-.004c-.023-.012-.049-.021-.074-.035a2.269 2.269 0 0 1-.162-.07c-.006-.004-.01-.004-.014-.004l-.152-.066-.01-.006a7.787 7.787 0 0 1-.152-.064c-.006-.004-.006-.006-.012-.006-.025-.012-.049-.021-.074-.031l-.008-.004-.068-.029c-.004-.002-.01-.004-.014-.008-.051-.02-.1-.041-.152-.064l-.01-.004c-.023-.01-.051-.02-.074-.033-.006-.002-.006 0-.01-.002-.023-.012-.047-.02-.07-.029-.004-.002-.004-.004-.01-.004a.87.87 0 0 0-.076-.033l-.006-.006-.074-.029c-.004-.002 0-.002-.004-.002-.027-.01-.049-.023-.078-.033l-.01-.004c-.023-.008-.045-.02-.068-.029l-.01-.006-.078-.031-.004-.002c-.023-.01-.051-.021-.076-.033h-.004c-.027-.01-.051-.023-.078-.035l-.004-.002c-.057-.02-.107-.043-.16-.066-.004 0-.004 0-.008-.004-.051-.021-.102-.041-.152-.064l-.016-.006c-.021-.008-.043-.018-.07-.027-.004-.004.004 0-.002-.004a.949.949 0 0 0-.08-.031l-.008-.006a2.876 2.876 0 0 1-.152-.064c-.006 0-.01-.002-.016-.004-.051-.02-.1-.043-.152-.062l-.014-.008-.146-.061c-.01-.002-.006-.002-.016-.006l-.152-.061a1.268 1.268 0 0 0-.088-.037l-.004-.004c-.023-.01-.045-.02-.068-.027l-.014-.006c-.027-.014-.051-.021-.078-.031-.004-.002-.002-.002-.006-.002a.817.817 0 0 0-.068-.029c-.004 0-.01-.006-.014-.008-.023-.01-.053-.02-.076-.031l-.008-.002c-.021-.008-.043-.018-.066-.025l-.016-.008-.07-.031-.016-.002-.064-.029a.037.037 0 0 1-.014-.004c-.021-.01-.051-.02-.074-.033-.004 0-.008 0-.014-.002-.018-.01-.041-.018-.061-.027-.004-.002-.014-.004-.018-.008l-.068-.027a.06.06 0 0 1-.02-.004c-.02-.01-.041-.018-.061-.027-.01-.006-.01-.002-.02-.008-.023-.008-.045-.018-.068-.027l-.016-.008-.061-.023-.016-.008-.07-.027a.207.207 0 0 1-.02-.008c-.021-.01-.041-.016-.064-.025-.004-.002-.008-.004-.014-.004a2.072 2.072 0 0 0-.07-.029c-.004-.004-.012-.006-.016-.008-.023-.01-.043-.016-.066-.025l-.008-.004a1.005 1.005 0 0 0-.076-.027l-.018-.01c-.021-.01-.041-.016-.061-.025a.67.67 0 0 0-.084-.033.064.064 0 0 1-.023-.01l-.059-.021c-.008-.002-.014-.006-.023-.01-.018-.008-.037-.018-.059-.021a.084.084 0 0 0-.023-.01l-.059-.027c-.01-.002-.016-.006-.023-.008-.02-.008-.039-.016-.061-.023a.073.073 0 0 1-.025-.01c-.018-.006-.041-.016-.062-.025a1.284 1.284 0 0 0-.104-.041c-.023-.008-.041-.018-.064-.027-.006 0-.012-.004-.018-.004a.56.56 0 0 0-.059-.023c-.002-.002-.016-.006-.021-.01-.021-.01-.045-.018-.068-.027a.046.046 0 0 1-.021-.008c-.016-.004-.033-.012-.053-.02a.1.1 0 0 1-.023-.012c-.023-.008-.047-.016-.064-.025a.142.142 0 0 1-.029-.01l-.045-.018c-.014-.004-.014-.006-.027-.012l-.064-.025a.11.11 0 0 1-.033-.012.127.127 0 0 1-.037-.018c-.014-.002-.018-.004-.031-.01-.023-.008-.043-.016-.066-.021a.307.307 0 0 0-.031-.016c-.016-.004-.023-.01-.039-.018-.012-.002-.016-.004-.029-.01-.023-.008-.043-.018-.061-.023-.016-.006-.023-.01-.039-.014-.014-.004-.023-.01-.037-.014-.01-.006-.021-.008-.031-.014a.404.404 0 0 0-.061-.023l-.031-.014c-.016-.004-.029-.01-.043-.014-.01-.006-.023-.01-.033-.014-.018-.008-.039-.014-.059-.023l-.035-.014c-.012-.002-.025-.01-.039-.014-.01-.004-.029-.01-.037-.016-.02-.008-.035-.014-.055-.02a.22.22 0 0 1-.031-.016c-.014-.002-.029-.008-.043-.012-.014-.008-.037-.016-.051-.021-.012-.006-.027-.01-.039-.014-.014-.008-.025-.012-.039-.018l-.035-.014c-.02-.008-.035-.01-.053-.018a1.772 1.772 0 0 0-.039-.016c-.01-.002-.027-.012-.037-.014l-.037-.016c-.02-.008-.035-.014-.055-.02l-.039-.014a.682.682 0 0 1-.037-.016c-.01-.002-.02-.008-.031-.012-.02-.008-.049-.02-.068-.023a.096.096 0 0 0-.027-.012l-.041-.018c-.008-.002-.018-.008-.027-.01a1.273 1.273 0 0 0-.074-.027l-.02-.008-.051-.02-.008-.002c-.027-.012-.059-.023-.084-.033l-.023-.008a.237.237 0 0 1-.047-.02.037.037 0 0 1-.014-.004c-.025-.01-.057-.02-.084-.033-.008-.002-.018-.004-.021-.006l-.148-.055c-.004-.004-.014-.006-.018-.008l-.047-.018c-.006-.002-.01-.004-.014-.004-.029-.012-.061-.023-.088-.035a.081.081 0 0 0-.02-.006c-.051-.02-.102-.037-.152-.057 0-.002-.004-.002-.008-.004-.053-.018-.104-.035-.152-.055-.004-.004-.01-.006-.014-.008l-.158-.055c0-.002-.004-.002-.008-.006a4.362 4.362 0 0 1-.16-.059h-.008a.828.828 0 0 0-.102-.039.645.645 0 0 0-.057-.02s-.004-.004-.008-.004a5.419 5.419 0 0 0-.158-.059h-.004a153.644 153.644 0 0 0-7.883-2.635l-9.365 30.809a121.862 121.862 0 0 0-35.525-5.275h-.004v-32.172H255.445c-.025 0-.051 0-.078.002H254.988c-.023 0-.047.004-.07.004h-.206c-.025 0-.051 0-.074.002h-.189l-.08.002H254.264c-.025 0-.053 0-.08.002h-.185c-.002.004-.006.004-.014.004H253.899c-.029 0-.057 0-.082.002H253.713l-.08.002h-.102c-.027.002-.055.002-.082.002h-.006c-.025 0-.051 0-.076.004h-.02c-.057 0-.107 0-.164.002h-.021c-.023 0-.047 0-.068.002h-.092c-.006 0-.016 0-.02.002H252.9l-.084.002h-.018l-.07.002h-.014c-.027 0-.057 0-.084.002h-.086c-.008 0-.008 0-.012.002h-.092c-.023.004-.051.004-.074.004h-.018c-.027.002-.057.002-.084.002h-.004l-.08.002h-.014c-.061.002-.111.002-.172.006h-.012l-.168.004h-.014c-.027.002-.055.002-.082.002-.006 0 .004 0 0 0-.029.002-.057.002-.084.002h-.018c-.025.002-.051.002-.08.002h-.002c-.029.002-.059.002-.086.002-.004.002-.008.002-.014.002-.021 0-.049 0-.074.004h-.008c-.029 0-.057 0-.084.002h-.016l-.072.002h-.014l-.084.002h-.01c-.021.004-.049.004-.072.004-.008 0-.01.002-.014.002-.029 0-.057 0-.088.002h-.002l-.08.002h-.016a4.842 4.842 0 0 1-.166.008h-.016c-.055.002-.109.002-.166.006-.004 0-.01 0-.014.002-.027 0-.053 0-.08.002h-.102c-.027.004-.055.004-.078.006h-.01l-.082.002h-.01c-.027.002-.057.002-.084.006h-.004l-.086.002h-.006l-.084.004h-.008a70.78 70.78 0 0 1-.172.006h-.01l-.172.008h-.008a4.727 4.727 0 0 0-.172.008h-.01l-.176.01h-.004l-.176.006h-.004a1.727 1.727 0 0 1-.176.008h-.006a153.748 153.748 0 0 0-37.578 6.461l9.354 30.811a121.457 121.457 0 0 0-36.58 18.328l-19.057-25.953a155.28 155.28 0 0 0-15.219 12.754v.002c-.168.156-.334.314-.5.477v.002l-.084.078v.004l-.121.113c-.004 0-.004.006-.01.006-.035.035-.072.076-.113.113l-.01.012-.115.111c-.006.002-.006.008-.01.01-.041.037-.074.07-.117.111-.004.002-.004.006-.01.008-.025.025-.045.049-.074.074-.002 0-.002.002-.002.002l-.037.035c-.006.004-.01.01-.012.012-.021.02-.049.045-.066.064-.004.004-.004.008-.008.01-.016.016-.021.023-.037.033l-.016.02c-.023.02-.037.037-.061.057l-.014.016c-.014.014-.023.02-.037.033l-.012.014c-.02.02-.043.039-.062.061-.004.006-.008.008-.014.014l-.037.035c-.002.002-.004.006-.01.01-.018.02-.041.039-.059.059l-.023.021c-.01.01-.023.02-.033.033 0 0 0 .002-.004.004-.023.023-.047.045-.07.07l-.014.014-.109.107c-.006.004-.01.012-.02.018-.018.018-.033.031-.049.051-.008.006-.018.016-.025.023-.01.01-.018.02-.029.029l-.02.018-.057.061c-.006.002-.01.006-.016.012-.014.012-.023.023-.033.033-.008.006-.014.014-.021.02-.016.018-.031.035-.051.053-.006.006-.014.016-.023.021-.004.008-.023.023-.027.031a.148.148 0 0 0-.027.021c-.016.016-.029.033-.043.045l-.027.027c-.008.01-.018.018-.027.027l-.027.031a.38.38 0 0 1-.043.037.37.37 0 0 1-.027.029c-.01.012-.016.016-.027.025-.016.018-.029.029-.043.047-.008.006-.016.016-.025.021-.01.014-.02.023-.031.033-.006.008-.016.014-.021.021l-.047.045c-.014.012-.014.016-.023.025-.014.01-.021.021-.031.031-.008.008-.018.016-.021.023-.016.016-.033.031-.047.047-.012.012-.014.016-.029.023l-.027.031c-.01.006-.018.021-.027.027l-.041.041c-.004.008-.018.02-.021.023-.016.012-.023.023-.037.035a.182.182 0 0 1-.031.031l-.035.037c-.004.006-.02.018-.023.023l-.035.037-.029.027c-.014.014-.021.025-.037.035a.084.084 0 0 1-.023.023 1.09 1.09 0 0 1-.061.067c-.014.012-.025.027-.039.039-.006.002-.018.018-.02.02-.018.018-.033.035-.051.051l-.018.016c-.012.016-.025.027-.039.039a.095.095 0 0 1-.02.02.565.565 0 0 1-.049.051c-.004.008-.01.012-.016.02-.012.01-.025.025-.041.035a.05.05 0 0 1-.018.021c-.018.016-.033.033-.053.053 0 0-.008.01-.014.014-.012.014-.025.027-.039.045l-.014.01c-.02.02-.039.037-.053.055a.065.065 0 0 1-.018.016c-.016.014-.029.031-.043.045-.004.004-.014.012-.014.014l-.049.053-.018.018c-.016.018-.035.033-.053.051l-.006.006a.307.307 0 0 1-.051.051l-.014.016c-.018.02-.031.035-.051.053-.002.004-.014.014-.014.018l-.041.041c-.006.002-.016.016-.02.018a.638.638 0 0 1-.051.053l-.012.014a.48.48 0 0 0-.043.047l-.014.01c-.02.018-.035.037-.053.057l-.016.014-.045.047c-.004.002-.008.008-.012.01-.018.02-.033.039-.051.057-.006.004-.01.01-.014.012a1.203 1.203 0 0 1-.049.051l-.008.006c-.02.02-.037.041-.057.059a.042.042 0 0 0-.008.012l-.055.057c-.006.002 0 0 0 0l-.059.059c-.002.006-.008.01-.012.014l-.109.113c-.006.006-.01.01-.01.012-.041.041-.08.078-.117.119l-.006.008c-.02.021-.039.039-.057.061l-.057.059c-.006.004-.006.008-.01.01l-.057.059-.002.006-.061.059v.002a2.39 2.39 0 0 0-.119.129h-.004l-.059.062-.004.004c-.043.043-.08.08-.119.123l-.006.006c-.037.041-.074.082-.115.123l-.006.006a3.403 3.403 0 0 0-.115.125c-.004.002-.004.002-.004.004a1.42 1.42 0 0 0-.119.127c-.043.041-.084.086-.123.125l-.004.004-.057.061-.002.006a155.489 155.489 0 0 0-10.976 13.057l25.738 19.318a121.582 121.582 0 0 0-18.707 36.395l-30.705-9.684c0 .004 0 .004-.004.01-.004.02-.014.043-.02.064-.004.008-.004.02-.008.029l-.016.043-.008.031a.228.228 0 0 0-.02.064c-.004.01-.01.018-.01.027-.004.016-.01.027-.014.043-.004.01-.01.021-.012.031-.008.021-.012.041-.018.059a.16.16 0 0 1-.01.033l-.016.045c0 .01-.004.021-.008.031-.006.02-.01.037-.02.057-.002.014-.004.018-.01.035-.004.012-.01.027-.014.045a.094.094 0 0 1-.01.031c-.004.016-.01.029-.014.043-.004.02-.01.031-.014.049a.27.27 0 0 0-.014.043c-.006.01-.01.027-.012.035l-.012.035-.02.064c-.004.008-.004.018-.01.027a.27.27 0 0 1-.012.043c0 .01-.004.021-.01.031-.004.023-.014.047-.02.07-.004.01-.008.016-.008.025l-.014.043c-.006.01-.006.018-.01.025-.014.047-.027.096-.043.146-.004.006-.004.014-.008.021-.016.047-.029.1-.043.145-.004.006-.004.016-.01.023l-.012.045c0 .006 0 .008-.004.012-.008.029-.02.062-.025.092-.004.006-.004.014-.008.02l-.014.047c0 .004-.002.008-.006.014a1.83 1.83 0 0 1-.027.088c0 .008-.002.014-.004.021l-.016.047c0 .004-.004.01-.004.014-.01.029-.018.066-.027.094 0 .006-.002.008-.006.012a.38.38 0 0 1-.014.051c0 .004-.004.008-.004.012a1.01 1.01 0 0 0-.027.094c0 .006 0 .008-.004.016-.004.018-.01.027-.014.045 0 .008-.006.014-.006.021l-.027.09c0 .002 0 .008-.004.012l-.016.049c0 .004 0 .012-.004.014a3.64 3.64 0 0 1-.045.158c0 .004 0 .008-.004.01a1.985 1.985 0 0 1-.049.16c0 .006 0 .008-.002.012a1.52 1.52 0 0 1-.045.156c-.002.006-.002.008-.002.014-.02.057-.033.104-.047.16-.004.002-.004.006-.004.008-.018.059-.033.105-.047.166 0 .002-.004.002-.006.004-.021.078-.039.148-.062.227v.004c-.02.057-.033.111-.051.166 0 .002 0 .002-.002.002a1.447 1.447 0 0 1-.047.166v.01c-.018.057-.031.109-.051.168-.012.053-.029.109-.045.164 0 .004 0 .01-.004.012-.014.061-.029.107-.047.166-.014.057-.033.113-.047.172v.002c-.055.188-.105.379-.162.568v.006c-.25.895-.49 1.795-.721 2.699-.047.174-.088.344-.135.518v.002c-.08.309-.154.615-.23.926l-.086.348s-.002 0-.002.002c-.102.424-.203.848-.307 1.275-.027.119-.055.23-.08.346a4.343 4.343 0 0 0-.039.178s-.002 0-.002.004c-.006.018-.008.035-.012.055 0 .002-.004.002-.004.004-.006.035-.016.072-.023.104v.012l-.016.053c0 .004 0 .008-.002.014l-.037.16c-.002.002-.002.008-.002.012a1.493 1.493 0 0 0-.035.164c0 .002-.004.004-.006.01-.014.057-.023.104-.037.16v.016l-.037.16c-.004.006-.004.008-.004.014-.014.051-.023.104-.039.16 0 .002 0 .01-.002.018-.002.018-.006.029-.012.047v.008c-.01.033-.014.066-.023.102 0 .004-.004.01-.004.014l-.008.053a.021.021 0 0 0-.004.01c-.006.031-.016.068-.021.098-.002.006-.002.012-.002.016l-.016.049v.018l-.021.092c0 .006 0 .01-.002.016-.004.014-.008.035-.014.049a.071.071 0 0 1-.004.02c-.004.031-.014.064-.02.094-.002.004-.004.008-.004.014-.002.014-.004.031-.01.047a.087.087 0 0 0-.004.025c-.008.025-.014.053-.02.076 0 .01-.004.018-.004.025-.006.016-.008.031-.01.043-.004.012-.004.02-.006.027-.014.049-.02.1-.029.148-.006.01-.006.018-.01.027 0 .016-.004.027-.01.045 0 .008-.004.02-.004.027a1.72 1.72 0 0 1-.016.074c-.004.01-.004.02-.008.029-.002.012-.004.027-.01.043 0 .01-.004.021-.004.029l-.016.072c-.004.01-.004.02-.008.029a.246.246 0 0 1-.01.041c0 .01-.004.02-.004.029-.008.031-.01.045-.02.072 0 .014-.002.02-.004.029-.006.016-.006.031-.01.045 0 .008-.006.018-.006.027a.396.396 0 0 1-.016.07.16.16 0 0 1-.008.033c0 .01-.004.029-.008.037 0 .016-.006.027-.006.041-.002.02-.008.041-.012.061-.004.01-.004.023-.01.037-.004.014-.004.025-.008.039 0 .012-.006.023-.006.035-.004.016-.004.023-.01.037-.004.02-.008.041-.014.062a1.704 1.704 0 0 0-.006.039c-.004.012-.008.023-.008.035-.004.016-.004.025-.01.039l-.014.062c0 .012-.004.02-.004.035a.103.103 0 0 0-.01.041c-.006.016-.006.018-.01.033-.004.021-.01.041-.014.066 0 .01-.002.02-.006.029-.004.018-.004.029-.008.045-.006.016-.006.02-.008.035-.002.02-.008.041-.012.061-.004.01-.004.023-.01.033 0 .016-.004.031-.006.049 0 .008-.006.018-.006.027l-.014.066-.004.025a.164.164 0 0 0-.01.051c-.006.012-.006.023-.01.033-.002.016-.004.035-.01.051-.004.014-.004.027-.01.043-.004.018-.004.031-.008.047 0 .01-.006.023-.008.033-.002.016-.008.031-.01.049l-.006.035-.016.061c0 .01-.002.02-.004.027-.004.018-.004.033-.01.051-.002.01-.004.018-.004.027-.006.021-.01.047-.014.066-.006.012-.006.021-.008.031-.002.018-.008.033-.012.049 0 .01 0 .018-.004.027-.006.023-.01.047-.014.068 0 .012-.006.02-.006.029-.002.018-.002.031-.008.049-.002.01-.004.018-.004.027l-.014.07c-.006.01-.006.02-.008.029-.002.014-.006.029-.008.047a1.082 1.082 0 0 0-.022.099c0 .01 0 .012-.006.021a.247.247 0 0 1-.01.053c0 .012-.004.02-.004.029l-.014.068c0 .006-.006.018-.006.023a.26.26 0 0 0-.008.055c-.006.012-.006.02-.01.027a.576.576 0 0 1-.01.066c-.004.008-.004.018-.004.021l-.014.057c0 .01-.002.02-.004.029-.006.02-.008.041-.01.062-.006.002-.006.012-.006.018-.004.021-.008.047-.014.068-.002.01-.004.016-.004.023l-.012.068v.008c-.006.025-.01.053-.016.074a.159.159 0 0 0-.004.023l-.014.066v.014c-.008.025-.012.047-.018.072-.002.008-.002.018-.002.021-.004.021-.008.043-.014.062 0 .01 0 .008-.004.02-.006.023-.01.047-.014.07 0 .012 0 .014-.004.023a.314.314 0 0 1-.012.061.088.088 0 0 1-.004.02l-.014.074c0 .01 0 .008-.004.018-.002.02-.006.041-.01.064 0 .004-.006.012-.006.016l-.014.076c0 .004 0 .012-.002.02-.002.021-.008.041-.012.061 0 .006-.006.016-.006.02a.526.526 0 0 1-.012.078v.002l-.014.076c0 .006-.004.014-.004.018l-.016.074v.01c-.004.025-.008.051-.014.072-.002.012 0 .01-.004.02l-.014.076v.002l-.014.078c0 .006 0 .012-.006.018-.002.021-.008.049-.012.072l-.002.006-.014.082v.01c-.006.025-.01.053-.014.076l-.006.006-.014.084v.008l-.014.076v.01c-.012.055-.021.109-.031.166v.008c-.01.055-.018.109-.031.166-.002.008-.002.002-.002.008-.008.057-.018.111-.027.168v.006a4.868 4.868 0 0 0-.033.166v.01c-.01.055-.018.111-.027.166-.004.006-.004.004-.006.01l-.027.166v.006a3.02 3.02 0 0 0-.025.17l-.004.004-.029.172v.004a155.447 155.447 0 0 0-2.17 24.326l32.201.336c-.006.436-.035.863-.035 1.301 0 13.701 2.293 26.859 6.461 39.154l-30.521 10.336a156.165 156.165 0 0 0 3.668 9.727l.141.33c.021.055.045.109.068.166l.07.162c.047.109.092.219.139.33l.07.162c.035.084.068.164.105.246v.004l.07.16c.002.006 0-.002 0 .004l.068.16.004.006c.023.051.047.105.066.158l.004.002.07.162v.002c.021.055.045.107.068.158l.004.01c.023.049.047.104.07.158v.002l.068.16c.004.006 0-.002 0 .004.014.027.023.051.037.078.014.029.023.055.037.08v.004l.035.08.002.002c.01.025.023.051.033.078l.002.002c.01.027.021.055.033.078l.002.008c.014.025.021.053.037.074v.006l.033.078c.004.006.004 0 .004.006.01.023.023.049.031.074l.002.002c.014.027.023.051.037.078 0 .006 0 .004.004.008.021.051.045.104.064.154l.008.01c.01.027.02.049.033.074v.002l.031.074.008.014c.021.051.045.104.066.15l.004.012c.023.053.047.1.07.15a7.438 7.438 0 0 0 .074.164v.01c.021.049.049.102.072.15l.002.01c.023.053.047.102.07.156.004.004.004.002.004.006.014.027.023.051.037.078v.004c.012.023.021.047.031.07.004.006.004.006.004.01.014.027.023.053.037.078v.004c.01.023.023.047.033.072l.006.01c.012.025.021.047.031.072.006.004.006.008.006.01.014.023.023.047.031.068l.006.01.033.074.002.008c.014.027.023.053.037.076.01.027.023.053.035.078.002.004.002.006.006.01.01.023.02.049.031.07l.002.006c.014.025.023.053.039.076 0 .006 0 .006.002.01l.033.072v.002c.014.025.023.053.037.074 0 .006 0 .01.004.014l.07.148.006.012.068.15c.002.006.004.008.004.012l.07.152c.004.002.004.002.004.008.014.023.023.051.037.076v.002c.016.025.023.047.033.072.006.004.006.008.008.012.01.025.023.047.033.072.002.006.004.006.004.01l.033.066c0 .004.002.008.004.014.012.021.023.047.035.074l.002.006c.012.021.023.047.033.068.006.002.006.004.006.01.014.027.023.049.035.074l.004.01c.01.021.021.047.033.068l.004.008.033.076.004.008c.016.025.023.049.039.076.01.023.023.051.037.074 0 .006 0 .006.004.01l.031.072.002.002c.012.027.025.051.035.08.004.002.004.002.004.006.023.051.053.104.076.152 0 .006 0 .002.004.008l.07.152.002.008c.023.051.051.1.074.152l.006.01.074.152v.002c.025.055.049.105.076.156.002.006.002.002.002.008.025.051.051.102.074.152l.004.008c.023.053.051.1.074.154.002.004 0 0 .004.004.023.051.051.105.074.156v.004c.029.053.055.104.078.158.014.027.029.051.041.078l.002.004c.012.023.023.051.037.078v.002a.511.511 0 0 1 .037.074l.004.006c.01.023.023.049.039.074v.004c.012.025.025.051.035.076.004.004.002.004.004.006.023.053.051.104.074.154l.006.004c.023.055.051.104.072.156l.006.004c.021.051.051.104.076.154l.002.002c.025.053.053.104.08.158v.002c.025.053.049.105.078.156v.004c.027.051.051.104.078.154.002.006 0 0 0 .004.029.051.055.104.078.156l.002.002a.732.732 0 0 0 .041.078v.004c.027.049.055.104.078.152l.002.004.08.156v.004l.08.154v.002c.027.053.055.105.078.154.004.006 0 .004.004.006.029.053.053.104.08.154v.002c.027.055.055.104.076.158h.006c.021.053.051.104.078.158v.002c.029.049.053.102.08.15l.004.008c.027.053.051.102.078.152v.004c.027.053.057.102.084.154 0 .004-.002 0 0 .004.055.102.105.209.162.312v.002a153.39 153.39 0 0 0 7.891 13.428c0 .004-.004-.004 0 .002.033.047.061.094.094.145h.002c.033.049.062.098.094.145l.004.004c.016.023.031.049.045.07l.002.004c.018.021.031.049.047.07l.004.004c.014.021.033.047.045.07l.006.006.041.064.006.008.045.068c.004.004 0 .002.004.006.014.021.033.047.047.07.016.023.033.047.047.072.004.004 0 0 .004.002.014.025.033.047.047.072.004.002 0-.002 0 .002.018.02.031.045.045.066.004.004.004.006.008.008.029.047.062.094.09.139.006.006.008.008.01.014.014.02.029.041.041.064h.004c.014.021.027.047.045.068l.006.01.094.137c0 .004.006.008.006.012.018.023.029.045.045.066.004.004 0 0 .004.006.014.02.027.039.043.059 0 .006.004.012.008.016a.943.943 0 0 1 .045.066c.002.004-.002 0 .002.002.016.02.029.041.043.062a1.037 1.037 0 0 0 .049.079c.008.006.01.006.014.016.01.018.023.033.033.053.006.002.01.01.014.014l.043.064.01.016a.184.184 0 0 1 .031.049l.014.018.041.061c.006.006.01.014.014.021l.029.043c.01.006.014.014.018.023.016.02.023.037.037.059l.02.021c.01.014.018.029.025.043l.016.021c.014.018.025.037.037.055.01.014.01.014.018.029.01.012.02.025.029.039.008.008.008.014.018.021.01.018.023.037.037.055.006.01.016.021.018.029.01.01.014.023.023.035.01.01.02.027.027.037l.029.043.023.031c.004.01.014.021.018.029.014.018.023.035.035.051.008.01.018.021.021.031.008.01.018.027.023.035.008.008.012.018.018.027a1.613 1.613 0 0 1 .055.079c.014.018.02.025.029.041.004.006.008.014.016.02a.367.367 0 0 0 .045.064l.012.021c.01.012.018.025.027.037.004.008.01.016.014.021.014.021.033.043.045.064a.07.07 0 0 0 .014.018c.012.016.016.025.029.043.002.002.006.008.006.012.02.021.037.047.049.072.006.004.01.012.014.02.033.041.062.086.094.131 0 0 .006.006.006.008.031.047.061.088.096.137l.002.004c.035.049.064.094.102.141l.096.143v.002c.314.445.631.889.949 1.33l26.162-18.785a122.644 122.644 0 0 0 29.145 28.846l-18.518 26.355a151.566 151.566 0 0 0 7.062 4.676c.004.002-.004-.002 0 0 .051.033.098.064.148.094l.002.002c.047.031.1.061.146.09l.004.002c.051.031.096.062.146.09l.006.006c.047.031.096.059.143.088l.008.006.145.088.006.004c.047.027.098.059.145.088l.008.004a.66.66 0 0 0 .07.043c.023.016.047.031.07.045l.008.006c.023.014.047.029.074.043v.002c.023.014.047.027.07.039l.008.006c.023.016.047.029.07.045l.004.002c.023.016.047.027.07.043l.004.004.072.043.008.004c.023.014.045.025.068.041l.002.002c.025.016.049.027.072.045l.01.004c.02.016.041.025.061.041.002.002.008.002.012.002.02.016.043.029.064.043l.016.006c.018.014.041.025.061.037a.035.035 0 0 0 .01.008l.068.039a.912.912 0 0 0 .073.045l.01.006.064.039c.008.006.008.008.018.012.02.014.037.023.061.035l.01.008c.021.01.043.025.061.037.01.004.014.008.021.012.02.01.037.023.057.033.01.004.01.008.02.012a.8.8 0 0 1 .055.033c.01.004.014.01.023.014.02.01.035.02.051.033.014.006.018.01.027.014.02.01.033.02.047.029l.027.014c.018.012.035.021.053.031.006.006.021.014.027.018a.762.762 0 0 1 .068.041c.023.014.041.023.061.037a.1.1 0 0 1 .023.012c.012.01.025.02.041.025a.551.551 0 0 0 .088.051l.023.018c.014.004.027.014.041.021.008.008.018.012.027.018.02.01.037.021.057.033l.027.014c.014.01.029.02.047.029.004 0 .014.008.02.01a.364.364 0 0 0 .059.037c.008.006.018.01.027.016l.043.025a1.097 1.097 0 0 0 .082.047l.027.02c.014.008.027.014.037.021.01.004.021.01.029.016l.055.035c.012.006.018.01.031.014.014.008.023.016.037.025.014.008.029.014.037.021.02.008.033.018.047.027.016.006.021.01.033.018s.021.016.033.02l.043.027a.9.9 0 0 0 .043.023c.01.004.023.012.033.018.012.01.023.016.037.023a.364.364 0 0 0 .039.023l.043.025c.01.004.023.014.033.018.012.008.023.016.037.021.016.012.027.016.043.029.012.006.025.012.035.02.008.004.027.012.037.018l.037.023c.016.01.027.016.047.025.01.008.021.014.031.021.014.008.021.01.037.018.012.01.027.016.037.025l.047.027c.01.004.023.01.033.018.014.006.021.012.035.02.008.008.023.012.031.02.023.014.033.018.053.029.012.008.023.012.033.02.014.008.023.014.037.02.012.01.025.016.039.025.02.01.029.016.043.025.012.006.023.01.033.018a.092.092 0 0 1 .031.02l.043.021c.016.01.031.02.049.029l.023.016c.043.021.09.049.129.074.01.004.014.008.023.012l.131.074.021.014c.029.014.057.031.084.045 0 .002.006.004.006.004a.273.273 0 0 0 .047.027c.004.002.008.006.014.008a.577.577 0 0 0 .092.051v.004c.018.008.027.014.045.023l.014.008c.027.018.055.033.078.047.004.002.012.004.018.008.016.01.025.016.043.025.006.002.01.006.014.006l.084.047c0 .004.004.006.008.008.02.008.029.014.047.023l.014.01a1.198 1.198 0 0 1 .094.053c.02.008.029.016.045.025.006.002.008.006.01.006l.09.049c.004 0 .006.002.008.006.02.01.033.014.047.023.004.004.006.004.006.004.025.016.059.033.092.051.004.002.006.006.012.008.016.012.027.016.043.025.006.002.006.004.01.004l.082.049c.006.004.012.004.02.008.01.008.027.018.041.023l.01.004c.027.018.061.035.088.051a7.064 7.064 0 0 0 .307.17c.004.002.008.006.014.008l.141.078c.002.004.006.006.008.006l.146.08c0 .002.004.002.004.004l.15.082h.002c.051.027.102.057.15.082l.002.002c.135.074.27.15.408.223l.152.084v.002c.051.027.098.051.146.08l.01.002a22.496 22.496 0 0 0 .313.168l.299.164h.006a151.067 151.067 0 0 0 7.615 3.816v.004c.516.236 1.025.475 1.541.707l.004.002c.051.025.096.045.152.07.004 0 .004.002.01.004.057.023.104.045.152.07h.004c.055.023.104.047.158.07l.004.004c.055.021.104.043.154.068l.008.002.154.07.01.004c.049.021.1.043.152.068l.004.002c.037.016.059.027.096.045.006 0 .006.002.01.002.016.008.033.012.049.021.004 0 .008.004.008.004.037.014.059.027.096.041 0 .002.006.002.01.006.016.008.033.012.049.021h.002c.033.016.066.029.098.043l.014.004c.018.01.027.016.047.023l.014.006c.027.012.061.025.088.035l.012.008a8.53 8.53 0 0 1 .165.074.222.222 0 0 1 .045.02l.008.002c.025.01.062.027.086.039.01.004.018.008.023.008l.143.064.02.006.143.064.016.004c.045.023.102.045.146.066.004.004.014.006.018.006a.624.624 0 0 0 .094.039c0 .004.004.004.004.006a.222.222 0 0 1 .045.02l.023.01c.023.01.053.02.076.029a.052.052 0 0 0 .023.01c.01.008.025.014.039.02a.161.161 0 0 0 .023.012l.07.031c.01.002.02.008.027.008l.041.02.023.01.074.031a.17.17 0 0 0 .023.012c.014.004.029.012.043.016l.025.012c.023.01.043.02.066.029.008.002.02.008.029.012.01.006.031.012.041.018l.027.014.068.027c.01.004.018.006.025.012l.041.016c.008.006.021.01.025.014.023.01.045.018.068.029a.733.733 0 0 1 .103.044c.018.006.037.016.055.023l.037.016c.014.004.023.008.037.014.014.008.031.014.047.021a.182.182 0 0 1 .045.02l.035.012c.012.008.021.01.035.014.018.01.037.02.055.025l.039.018.035.012a.2.2 0 0 0 .033.016c.018.01.041.018.061.025.014.006.018.01.031.014.016.006.029.01.039.016.012.004.016.008.029.014.023.008.043.018.061.023.016.008.023.012.039.018.01.004.023.01.037.014.012.008.018.01.031.016.018.008.039.018.061.021l.031.016c.016.008.029.012.043.02.01.002.02.006.027.01l.059.025c.016.004.023.01.039.014.008.006.023.01.033.016.014.008.037.012.051.02s.025.012.045.02a.106.106 0 0 0 .031.014c.016.004.025.012.039.016.018.006.031.014.051.021.014.004.027.012.039.016.01.006.029.012.035.016.014.006.029.01.043.018a.702.702 0 0 1 .045.018c.014.008.027.012.047.02a.178.178 0 0 1 .029.012c.018.008.033.016.051.023.01.002.023.01.033.012l.051.02c.01.004.02.008.029.014.02.006.039.016.059.023a.619.619 0 0 1 .08.033c.008.002.014.006.023.01.021.01.045.018.066.027l.02.008c.02.006.033.014.051.021.01.002.02.008.029.01l.062.027c.01.004.014.004.023.01.02.006.033.012.053.02.004.002.021.008.023.01.023.01.047.018.066.027l.02.01c.02.008.037.016.057.02.01.004.014.008.023.01.023.01.047.018.066.027.01.002.012.006.02.01.02.008.037.016.057.02.01.006.014.006.023.01.021.01.043.02.064.027.006 0 .02.008.023.008.018.008.037.018.055.023l.02.006.07.029c.004.004.014.006.018.008.023.008.041.018.059.023.006.002.016.004.02.008l.07.029a.058.058 0 0 0 .018.004l.061.027c.004.002.008.006.014.006l.074.029c.004 0 .012.002.016.006.023.01.045.016.068.029.006 0 .004 0 .008.002l.074.027.02.008.064.027c.004.002.004 0 .01.002.021.01.047.02.072.029.01.002.004.002.014.008.053.018.102.037.152.059l.012.004c.025.012.055.02.078.031h.004l.072.029c.006 0 .01.004.016.006l.074.029.008.002.07.029.014.004.074.029c.006.002.006 0 .01.002l.068.029c.004.002.01.002.012.004l.076.031.01.002.07.027c.004.004.004.004.01.004l.078.031.008.002c.023.012.053.021.076.031l.004.002c.025.008.049.018.078.029l.006.002.078.029.004.004.078.029.01.002c.023.01.051.02.076.029h.002c.029.014.053.023.078.033h.006c.055.021.111.041.16.062l.01.002c.051.021.107.041.162.062l.004.002.164.064h.004c.109.041.221.086.332.125 2.123.803 4.266 1.557 6.434 2.264l10.018-30.615a121.786 121.786 0 0 0 37.961 6.057c.859 0 1.709-.047 2.566-.064l.66 32.205.311-.008h.004l.178-.004h.012c.066-.004.113-.004.172-.006h.02l.16-.004h.029l.047-.002h.018l.092-.002h.023c.02-.002.037-.002.051-.002h.023c.033-.002.055-.002.084-.002.01 0 .02-.004.031-.004h.047c.01 0 .016 0 .023-.002.029 0 .053 0 .086-.002h.023c.018 0 .033 0 .047-.002h.037c.02 0 .045-.004.064-.004h.041c.01-.002.029-.002.041-.002.016 0 .029 0 .043-.002h.041l.061-.002h.037c.014-.004.029-.004.047-.004.01 0 .018 0 .031-.002.021 0 .047 0 .07-.002h.033l.049-.002h.027c.023-.004.047-.004.072-.004l.031-.002c.02 0 .037 0 .053-.002h.029l.072-.002h.025c.02-.002.043-.002.059-.002l.025-.002.074-.002h.023c.02-.002.041-.002.061-.002l.023-.004.078-.002h.014c.023-.002.047-.002.07-.002l.021-.002.078-.002h.016c.023-.002.047-.002.07-.002.006-.002.006-.002.016-.002l.168-.008h.012l.084-.002c.027-.002.057-.002.084-.006h.012l.174-.006.008-.004.084-.002h.004l.09-.004c.092-.006.18-.008.271-.012.119-.006.242-.012.361-.02a153.77 153.77 0 0 0 28.225-4c.258-.059.514-.121.768-.186.059-.012.115-.027.172-.039.055-.016.111-.027.172-.043.053-.014.111-.029.166-.041h.006c.055-.014.109-.027.164-.043.006 0 .002 0 .008-.002l.164-.039.004-.004.082-.018.002-.002c.055-.012.111-.027.168-.041h.004l.166-.041.004-.002c.055-.016.111-.029.166-.043.006 0 0 0 .006-.002.051-.014.107-.029.16-.041h.01c.055-.016.105-.027.162-.043l.008-.002c.053-.016.107-.027.164-.043l.004-.002c.057-.012.111-.027.166-.039l.006-.004.166-.043c.057-.016.111-.027.168-.045h.002c.029-.008.057-.016.086-.02a.71.71 0 0 1 .082-.025h.004c.025-.008.051-.012.08-.02l.004-.002c.055-.014.111-.027.166-.045.006 0-.004.002.002 0 .057-.012.107-.029.164-.043l.008-.002c.053-.014.107-.029.164-.041l.004-.004c.057-.014.111-.031.162-.043l.01-.004c.055-.012.109-.027.166-.043l.422-.115.166-.045h.004c.057-.016.105-.029.162-.047l.008-.002c.053-.012.107-.029.164-.043l.004-.002c.057-.014.107-.031.16-.045l.01-.002a6.77 6.77 0 0 0 .162-.045l.004-.002c.057-.016.113-.029.166-.047.004-.002-.004 0 .002 0 .115-.031.223-.062.334-.094h.002l.42-.119h.002l.162-.047.006-.002c.055-.016.111-.029.166-.047h.004l.164-.049h.002c.057-.016.113-.031.168-.049.305-.088.615-.18.92-.27 1.34-.398 2.674-.814 3.994-1.246l-10.012-30.617a121.552 121.552 0 0 0 36.197-19.09l19.598 25.557a154.834 154.834 0 0 0 16.037-14.166v-.002c.043-.041.086-.082.125-.123.066-.064.127-.127.189-.191v-.002c.041-.039.08-.082.123-.123l.004-.004c.041-.041.078-.084.119-.125l.006-.002c.037-.041.076-.08.113-.119l.01-.01c.037-.041.078-.078.117-.117 0-.002.006-.008.01-.01.016-.021.035-.039.055-.061l.004-.002c.02-.02.033-.037.051-.055l.016-.014.051-.053.012-.012a.348.348 0 0 1 .047-.047c.002-.006.006-.01.01-.016l.057-.055c.004-.002.006-.008.008-.01l.053-.051.006-.01c.02-.018.033-.035.053-.057l.014-.012.047-.049c.004-.002.01-.008.01-.01l.055-.055c.006-.004.008-.012.014-.014.014-.018.031-.035.047-.053l.008-.006c.018-.02.033-.037.053-.055.008-.006.006-.006.014-.014.018-.02.037-.037.053-.059v-.004l.057-.055c.002-.002.01-.01.012-.014l.053-.055c.006-.002.006-.006.01-.008.014-.018.033-.035.047-.051.006-.004.008-.008.012-.014a.471.471 0 0 0 .053-.057c.004 0 .008-.002.008-.008l.053-.051c0-.004.01-.008.01-.012.018-.02.037-.035.051-.053l.016-.018.043-.043c.004-.006.004-.006.014-.014a.332.332 0 0 1 .053-.053c0-.004.008-.014.014-.02l.041-.043c.006-.006.008-.006.012-.014l.053-.055c.004-.008.01-.012.018-.018.016-.014.023-.027.039-.041.004-.006.014-.016.018-.02l.047-.049a.076.076 0 0 1 .018-.018l.041-.047c.01-.006.014-.012.02-.02.014-.012.027-.029.041-.043.006-.006.016-.014.02-.021l.049-.051c.002-.004.01-.01.012-.014.014-.014.025-.027.041-.041.004-.006.014-.016.018-.023.02-.016.033-.031.049-.049.008-.008.012-.014.021-.02l.033-.035.021-.027.043-.047a.19.19 0 0 0 .021-.023.257.257 0 0 0 .033-.033.23.23 0 0 1 .023-.021c.014-.016.027-.033.043-.049.006-.008.014-.014.025-.025.006-.01.014-.018.023-.027l.041-.043.029-.031.027-.027.029-.029c.008-.01.016-.023.025-.033a.332.332 0 0 0 .037-.039.086.086 0 0 0 .023-.025.53.53 0 0 0 .033-.035c.014-.014.023-.021.035-.035a.224.224 0 0 0 .029-.035.128.128 0 0 0 .023-.025c.014-.012.021-.021.033-.035l.035-.037c.01-.008.018-.018.027-.029.01-.01.014-.018.027-.027l.029-.031.035-.043c.01-.01.02-.018.027-.027a.154.154 0 0 0 .023-.029c.016-.012.029-.027.043-.043.01-.01.02-.02.027-.031a.172.172 0 0 0 .027-.027c.01-.008.016-.016.023-.025l.041-.045c.01-.014.02-.018.029-.027.008-.012.018-.021.025-.031.006-.006.016-.02.025-.023l.041-.051.025-.023a.24.24 0 0 1 .025-.033.396.396 0 0 0 .041-.041c.01-.01.016-.018.023-.027.01-.01.021-.023.033-.031.004-.01.014-.016.02-.025.014-.014.031-.035.045-.051l.023-.023c.004-.006.023-.023.027-.031.01-.01.018-.02.027-.027l.041-.043c.006-.01.016-.018.025-.027s.018-.023.025-.031c.01-.01.014-.018.023-.027.014-.014.029-.031.043-.043.008-.014.018-.02.025-.029.012-.012.016-.021.025-.029.014-.012.023-.025.035-.039a.562.562 0 0 0 .033-.035c.01-.01.014-.02.023-.025l.027-.031c.014-.016.029-.029.039-.041.014-.014.021-.025.031-.035a.406.406 0 0 0 .02-.021l.049-.053c.006-.01.014-.014.02-.023a.313.313 0 0 1 .031-.033l.016-.018c.018-.021.037-.041.055-.064.008-.004.01-.01.016-.014.008-.01.023-.023.031-.033.006-.008.01-.014.018-.021.018-.02.035-.039.057-.061.004-.004.008-.01.014-.014.01-.016.018-.023.033-.039a.035.035 0 0 1 .008-.01c.02-.02.043-.049.064-.07 0-.002.004-.008.01-.01.01-.016.018-.023.031-.039.006-.004.008-.008.01-.01.02-.021.043-.045.061-.066.006-.004.01-.012.016-.02l.033-.033c.004 0 .004-.004.004-.004a1.491 1.491 0 0 1 .076-.09l.107-.117c.004-.004.01-.008.01-.012.035-.039.072-.082.109-.119 0-.002.006-.006.006-.008.037-.045.07-.078.105-.121.004-.004.008-.01.014-.014.023-.025.041-.049.064-.074 0-.004.004-.004.006-.004l.037-.039c0-.006.004-.008.004-.008.021-.025.045-.055.064-.076a.044.044 0 0 0 .01-.008c.037-.043.074-.082.111-.127.004-.002 0-.002.006-.002.035-.045.072-.084.109-.127 0-.002 0-.002.004-.004.039-.045.072-.084.111-.127 0-.002 0-.004.002-.004a3.3 3.3 0 0 1 .115-.127v-.002l.109-.127c.006-.002.006-.002.006-.004l.299-.344c0-.004 0 0 .002-.004a154.747 154.747 0 0 0 9.021-11.385l-26.16-18.795a121.518 121.518 0 0 0 17.938-36.762l30.924 9.041a153.371 153.371 0 0 0 5.615-30.158c.02-.201.037-.402.053-.604v-.004c.004-.057.008-.113.014-.168l.021-.26v-.004c.012-.143.02-.283.035-.428v-.004c.004-.055.006-.111.008-.168.004-.006 0-.004.004-.008a2.37 2.37 0 0 1 .012-.168c.004-.027.004-.055.006-.082 0-.006 0-.002.002-.008 0-.055.006-.109.01-.166v-.01a4.28 4.28 0 0 0 .014-.166v-.004c0-.027.004-.053.004-.082v-.004a5.07 5.07 0 0 1 .014-.166v-.008c.004-.057.004-.111.01-.166v-.01c.004-.029.004-.055.006-.082.002-.055.008-.111.012-.168v-.008c.006-.057.01-.111.01-.166l.002-.01c.002-.057.008-.111.012-.168 0-.029.006-.057.006-.082v-.01c.004-.053.006-.111.008-.164v-.01l.016-.168v-.004c0-.027 0-.055.004-.082v-.002c.002-.059.004-.113.01-.17v-.006c.004-.059.008-.115.01-.168v-.008c.004-.055.008-.111.008-.168v-.004a.369.369 0 0 0 .006-.08v-.006c.004-.057.01-.113.01-.168l.002-.008c.002-.057.006-.111.01-.168l.002-.008c0-.027 0-.053.002-.076v-.008c.002-.059.006-.113.01-.168v-.008c.002-.057.006-.111.006-.17l.004-.004c.002-.027.002-.057.002-.08v-.006a2.26 2.26 0 0 0 .006-.166v-.012c.006-.053.008-.107.01-.164v-.01c.006-.055.006-.109.01-.166v-.008c0-.023.002-.051.004-.078v-.008c0-.055.006-.111.008-.162l.002-.016v-.076-.004c.053-.023.053-.048.053-.077v-.01a.822.822 0 0 0 .004-.072v-.012c0-.027.004-.055.004-.082v-.006c0-.023 0-.051.004-.07.002-.008.002-.018.002-.021 0-.055.004-.105.004-.156v-.018a.462.462 0 0 0 .006-.074v-.009c0-.027.002-.053.004-.078v-.016c0-.023 0-.047.002-.068 0-.006 0-.01.002-.016v-.082a.512.512 0 0 0 .006-.078v-.018c0-.025.002-.049.004-.074v-.006-.078c.004-.008.004-.01.004-.018a.695.695 0 0 0 .002-.064v-.02c0-.025.004-.053.004-.078v-.01-.068l.004-.025V261.529c0-.025.006-.053.006-.078v-.02c0-.023 0-.045.002-.07v-.01a1.15 1.15 0 0 0 .002-.082v-.012c0-.021.004-.045.006-.068v-.016c0-.053.004-.109.004-.16v-.016c0-.025 0-.047.002-.07.002-.004.002-.01.002-.014v-.078-.014c0-.025.004-.047.006-.07v-.016-.082c.002-.027.004-.053.004-.076v-.02c0-.025 0-.053.004-.076v-.002a1.15 1.15 0 0 0 .002-.082v-.014c0-.025 0-.047.002-.07v-.012c.002-.029.002-.057.002-.082v-.012c0-.023 0-.047.002-.07v-.014c.002-.055.002-.109.006-.166v-.012c.002-.023.002-.049.002-.072v-.01-.082l.002-.014c.002-.021.002-.043.002-.068v-.018c0-.053.004-.105.004-.158v-.02-.068-.01c0-.027 0-.053.004-.08.002-.006.002-.012.002-.02v-.062-.02-.076-.016a.732.732 0 0 0 .004-.064v-.023-.068-.01-.076c.004-.004.004-.02.004-.023.002-.018.002-.037.002-.059v-.021-.076-.02-.061l.002-.021c.002-.055.002-.105.002-.158v-.021-.066-.012c.004-.025.004-.055.004-.078v-.02-.066-.018-.076-.01-.074c.004-.008 0-.004.004-.014v-.072-.012-.078-.02-.062-.021-.074-.016l.002-.066v-.021c.002-.025.002-.051.002-.074v-.004-.076-.025-.059-.02-.08-.016-.062-.021c0-.027.004-.051.004-.078v-.006c0-.025 0-.049.002-.074v-.021-.064-.016-.076-.021-.059-.025-.074-.016-.066-.021-.068-.01-.078-.023-.061-.018-.078-.016-.064-.021-.08-.086-.023-.082-.023-.066-.027-.072-.043-.045c-.004-.026-.004-.052-.004-.073zM271.34 328.434h-26.209V225.969H210.19v-16.256c8.432-.416 14.287-1.01 17.861-1.807 6.199-1.371 11.332-4.174 15.258-8.324 2.709-2.865 4.783-6.703 6.16-11.424.512-1.824.859-3.344 1.041-4.592h20.83v144.868z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-poll.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-poll.svg
deleted file mode 100644
index 089fa647d1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-poll.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M57.904 49.855H87.01v412.289H57.904zm76.727 28.223h202.784v78.587H134.631zm0 137.87h319.465v78.588H134.631zm0 137.872h262.168v78.586H134.631z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-post-it.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-post-it.svg
deleted file mode 100644
index 61a2787df8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-post-it.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M93.479 94.333v221.376l8.993 8.975 83.633 83.632 8.978 8.979h222.928V94.333H93.479zm293.874 292.321H230.074c-37.05 0-19.194-87.822-19.194-87.822s-85.646 20.832-86.742-18.441V124.989h263.215v261.665z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pound-bag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pound-bag.svg
deleted file mode 100644
index dfb460d22a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pound-bag.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M324.932 172.613v.014c-.066-.116-.164-.215-.227-.311a752.036 752.036 0 0 0-12.461-16.778c-5.43-9.025-8.273-19.992-1.635-35.837l22.76-54.517-35.775-16.303 3.695-16.154h-89.862l4.708 20.585-36.79 11.872 22.761 54.517c11.283 26.943-4.84 39.813-14.321 52.926-46.831 64.8-99.286 157.572-99.286 213.493 0 92.726 72.011 89.637 167.858 89.637 95.882 0 167.923 3.089 167.923-89.637-.001-55.936-52.517-148.693-99.348-213.507zm-91.138-45.523h45.848v28.939h-45.848V127.09zm65.435 269.919c-5.983 2.062-11.739 3.075-17.267 3.075-5.558 0-10.137-.359-13.769-1.077-3.662-.739-7.031-1.623-10.07-2.652-3.205-1.146-6.411-2.176-9.648-3.041-3.204-.882-7.193-1.305-12.002-1.305-3.955 0-8.077.523-12.394 1.616-4.283 1.092-8.534 3.252-12.787 6.459l-13.537-20.111c3.042-1.896 6.082-4.14 9.058-6.691 2.975-2.55 5.625-5.344 7.882-8.402 2.257-3.057 4.119-6.395 5.593-9.953 1.438-3.588 2.191-7.332 2.191-11.27 0-2.467-.426-4.922-1.212-7.342-.815-2.402-1.799-4.82-2.941-7.309h-21.682v-18.59h13.995c-2.188-2.783-4.38-6.85-6.541-12.264-2.19-5.381-3.301-11.365-3.301-17.938 0-5.821 1.21-11.365 3.629-16.61 2.387-5.25 5.951-9.896 10.597-13.898 4.675-4.009 10.531-7.179 17.495-9.517 6.998-2.324 15.075-3.486 24.296-3.486 16.743 0 29.792 4.663 39.146 13.999 9.318 9.322 13.994 22.89 13.994 40.68h-29.529c-.131-2.19-.424-4.937-.884-8.189-.426-3.306-1.405-6.459-2.941-9.532-1.538-3.058-3.858-5.725-6.999-7.98-3.139-2.275-7.488-3.4-13.014-3.4-6.575 0-11.775 1.833-15.666 5.478-3.825 3.643-5.789 8.535-5.789 14.633 0 1.764.098 3.449.23 5.054.165 1.585.49 3.448 1.014 5.577.491 2.106 1.374 4.557 2.618 7.325 1.208 2.777 2.941 6.115 5.132 10.07h29.073v18.59h-22.958c.718 2.176 1.21 4.367 1.439 6.559.197 2.191.293 4.511.293 6.998 0 6.849-1.766 12.721-5.328 17.607-3.6 4.89-7.786 9.204-12.592 13.002l.427.438c3.498-2.17 6.342-3.581 8.533-4.134 2.192-.588 4.319-.883 6.346-.883 2.941 0 5.819.243 8.663.749 2.847.522 5.69 1.067 8.635 1.638 2.91.749 5.756 1.356 8.502 1.864 2.812.522 5.625.766 8.568.766 2.879 0 5.854-.507 8.862-1.521 2.944-1.029 6.443-3.642 10.366-7.862l13.113 22.091c-5.263 5.08-10.855 8.662-16.839 10.689z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-power-outlet.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-power-outlet.svg
deleted file mode 100644
index 41e3e51e20..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-power-outlet.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M234.979 138.555c-6.706 0-12.135 5.398-12.135 12.121v28.106c0 6.701 5.429 12.13 12.135 12.13 6.672 0 12.099-5.429 12.099-12.13v-28.106c0-6.723-5.427-12.121-12.099-12.121zm41.564 182.704c-6.672 0-12.1 5.431-12.1 12.136v28.12c0 6.688 5.428 12.1 12.1 12.1 6.705 0 12.131-5.411 12.131-12.1v-28.12c0-6.706-5.426-12.136-12.131-12.136zm-41.564 0c-6.706 0-12.135 5.431-12.135 12.136v28.12c0 6.688 5.429 12.1 12.135 12.1 6.672 0 12.099-5.411 12.099-12.1v-28.12c0-6.706-5.427-12.136-12.099-12.136zM361.271 65.978H150.25c-13.375 0-24.201 10.805-24.201 24.167v331.873c0 13.339 10.826 24.181 24.201 24.181h211.022c13.344 0 24.167-10.842 24.167-24.148V90.144c-.001-13.362-10.824-24.166-24.168-24.166zM255.744 411.026c-35.122 0-63.57-28.465-63.57-63.575 0-35.119 28.449-63.581 63.57-63.581 35.122 0 63.573 28.462 63.573 63.581 0 35.111-28.451 63.575-63.573 63.575zm0-182.734c-35.122 0-63.57-28.45-63.57-63.573 0-35.087 28.449-63.574 63.57-63.574 35.122 0 63.573 28.486 63.573 63.574 0 35.122-28.451 63.573-63.573 63.573zm20.799-89.737c-6.672 0-12.1 5.398-12.1 12.121v28.106c0 6.701 5.428 12.097 12.1 12.097 6.705 0 12.131-5.396 12.131-12.097v-28.106c0-6.723-5.426-12.121-12.131-12.121z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-power.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-power.svg
deleted file mode 100644
index 9c4fb4b087..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-power.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.621 481.605c-55.604.036-111.517-21.319-153.936-63.766-42.451-42.425-63.807-98.339-63.77-153.944-.037-55.605 21.318-111.52 63.773-153.942 12.921-12.917 33.87-12.917 46.79.006 12.921 12.919 12.914 33.87-.005 46.789-29.652 29.675-44.347 68.253-44.384 107.147.038 38.892 14.732 77.478 44.389 107.157 29.661 29.645 68.248 44.339 107.142 44.376 38.894-.037 77.481-14.728 107.154-44.376 29.65-29.68 44.346-68.266 44.382-107.157-.036-38.888-14.731-77.472-44.382-107.153v.006c-12.92-12.925-12.92-33.873 0-46.795 12.921-12.917 33.867-12.917 46.794 0 42.445 42.426 63.803 98.336 63.758 153.942.045 55.605-21.316 111.52-63.764 153.944-42.391 42.416-98.238 63.768-153.8 63.766h-.141zm-33.084-217.704V64.165c0-18.269 14.812-33.085 33.088-33.085 18.276 0 33.086 14.816 33.086 33.085v199.736c0 18.269-14.811 33.083-33.086 33.083-18.276 0-33.088-14.814-33.088-33.083z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-presentation.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-presentation.svg
deleted file mode 100644
index 59e720c81e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-presentation.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M49.524 344.264a30.396 30.396 0 1 1 60.792 0 30.396 30.396 0 1 1-60.792 0zm147.781-30.397c-16.787 0-30.394 13.61-30.394 30.396s13.606 30.397 30.394 30.397c16.789 0 30.397-13.611 30.397-30.397 0-16.785-13.608-30.396-30.397-30.396zm86.994 30.397a30.396 30.396 0 1 1 60.792 0 30.396 30.396 0 1 1-60.792 0zm-58.697 81.95a30.396 30.396 0 1 1 60.792 0 30.396 30.396 0 1 1-60.792 0zm176.08-81.95a30.396 30.396 0 1 1 60.792 0 30.396 30.396 0 1 1-60.792 0zm-58.693 81.948a30.396 30.396 0 1 1 60.792 0 30.396 30.396 0 1 1-60.792 0zm-234.771 0a30.396 30.396 0 1 1 60.792 0 30.396 30.396 0 1 1-60.792 0zM49.523 55.391v219.775h296.119c5.828-29.321 6.857-51.505 6.857-63.472l.002.008v-.008-3.15a3.852 3.852 0 0 0-.196-1.049s-70.114 33.923-73.567 33.923c-2.169 0-4.355-.641-6.264-1.976-4.953-3.464-6.154-10.291-2.689-15.243 0 0 71.713-38.02 74.098-39.35 2.558-1.355 5.339-2.296 8.863-2.333.256 0 .656.005 1.011.032l19.833 1.236 19.268-1.204c.275-.016.61-.033 1.025-.033 3.513.038 6.285.974 8.84 2.318 2.378 1.314 5.852 2.875 6.668 7.346l6.287 72.056c.229 3.62 1.166 7.601.344 10.897h46.455V55.391H49.523zm72.631 171.438H98.476V160.64h23.679v66.189zm54.912 0h-23.68V115.765h23.68v111.064zm54.913 0h-23.68v-36.62h23.68v36.62zm141.61-56.906c-17.379 0-31.465-14.087-31.465-31.464s14.086-31.466 31.465-31.466 31.465 14.088 31.465 31.466c0 17.377-14.086 31.464-31.465 31.464z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-previous-media.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-previous-media.svg
deleted file mode 100644
index 656c29d14c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-previous-media.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M253.006 256.045l213.783-124.477v248.955zm-210.52 0l213.785-124.477v248.955z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-previous.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-previous.svg
deleted file mode 100644
index f858829633..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-previous.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M110.924 255.632L397.623 88.699v333.867z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-dollar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-dollar.svg
deleted file mode 100644
index 72d42718a9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-dollar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M280.146 276.758c-3.596-2.846-9.68-5.444-18.279-7.77v41.992c2.615-.299 5.365-.917 8.209-1.865a25.537 25.537 0 0 0 7.65-4.024 21.367 21.367 0 0 0 5.559-6.477c1.506-2.534 2.192-5.556 2.192-9.056.001-5.689-1.766-9.975-5.331-12.8zm163.739-117.647c-9.842-9.547-17.855-23.362-17.855-30.688 0-7.339-11.249-13.361-24.952-13.361H110.195c-13.701 0-24.916 6.022-24.916 13.361 0 7.326-8.045 21.142-17.889 30.688 0 0-36.139 35.188-36.139 96.421 0 61.252 36.139 96.423 36.139 96.423 9.844 9.547 17.889 23.381 17.889 30.726 0 7.307 11.215 13.306 24.916 13.306h290.882c13.703 0 24.952-5.999 24.952-13.306 0-7.345 8.014-21.179 17.855-30.726 0 0 36.168-35.171 36.168-96.423.001-61.233-36.167-96.421-36.167-96.421zM314.154 302.999c-1.6 4.891-4.477 9.664-8.631 14.323-4.184 4.677-9.744 8.829-16.744 12.461-6.998 3.661-15.955 5.837-26.912 6.569v18.595h-12.92v-18.595c-16.318-1.177-29.07-6.177-38.26-15.07-9.188-8.897-14.486-21.98-15.957-39.181h30.838c-.162 8.309 2.027 14.881 6.541 19.688 4.545 4.807 10.137 7.895 16.838 9.191v-45.72c-.686-.289-1.695-.619-2.939-.977a45.827 45.827 0 0 0-4.061-.98 178.732 178.732 0 0 1-15.92-5.134c-5.299-1.981-9.979-4.595-14.13-7.887-4.187-3.284-7.487-7.354-9.938-12.246-2.523-4.888-3.727-10.97-3.727-18.261 0-7.426 1.4-13.994 4.25-19.688 2.875-5.687 6.604-10.461 11.282-14.308 4.673-3.874 10.038-6.879 16.187-8.976a72.6 72.6 0 0 1 18.996-3.841v-16.841h12.92v16.841c6.572.733 12.722 2.14 18.477 4.268 5.754 2.121 10.824 5.016 15.205 8.762 4.416 3.695 7.98 8.34 10.728 13.884 2.779 5.54 4.382 12.082 4.808 19.686h-31.07c-.127-5.841-1.928-10.792-5.425-14.88-3.532-4.074-7.753-6.13-12.722-6.13v38.72c1.766.438 3.533.881 5.365 1.304 1.83.442 3.756.95 5.785 1.534 10.793 2.933 19.1 6.547 24.953 10.83 5.822 4.297 10.105 8.797 12.881 13.454 2.783 4.664 4.418 9.339 4.907 13.996.558 4.665.784 8.814.784 12.477 0 3.207-.784 7.262-2.389 12.132zm-78.742-99.95c-1.896 1.516-3.402 3.42-4.515 5.674-1.079 2.271-1.601 4.937-1.601 7.977 0 4.821 1.504 8.553 4.575 11.148 3.075 2.653 8.075 4.762 15.075 6.365v-35.661c-2.449 0-4.869.357-7.191 1.112a19.09 19.09 0 0 0-6.343 3.385z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-euro.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-euro.svg
deleted file mode 100644
index 0c437bc769..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-euro.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M443.736 159.461c-9.843-9.546-17.88-23.381-17.88-30.709 0-7.324-11.199-13.338-24.917-13.338H110.056c-13.7 0-24.934 6.014-24.934 13.338 0 7.328-8.028 21.163-17.871 30.709 0 0-36.151 35.221-36.151 96.406 0 61.252 36.151 96.439 36.151 96.439 9.843 9.545 17.871 23.377 17.871 30.739 0 7.288 11.233 13.276 24.934 13.276H400.94c13.718 0 24.917-5.988 24.917-13.276 0-7.362 8.037-21.194 17.88-30.739 0 0 36.168-35.188 36.168-96.439-.001-61.185-36.169-96.406-36.169-96.406zM297.6 233.598l-6.786 15.695h-48.968l-.23 9.189H288.2l-6.786 15.765h-38.047c4.675 23.087 15.45 34.597 32.356 34.597 10.956 0 22.188-4.611 33.699-13.803l-.213 33.031c-9.793 5.661-21.01 8.531-33.699 8.531-18.359 0-33.176-5.883-44.407-17.721-10.203-10.656-16.841-25.539-19.899-44.636h-16.842l6.786-15.765h8.731v-5.656c0-2.061.099-3.238.228-3.533h-15.958l6.787-15.695h11.133c3.5-17.658 10.729-31.559 21.666-41.797 11.512-11.082 25.967-16.609 43.297-16.609 12.28 0 25.541 3.632 39.814 10.958l-13.325 27.302c-10.204-6.537-19.784-9.84-28.663-9.84-15.305 0-25.507 9.973-30.609 29.986H297.6z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-pound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-pound.svg
deleted file mode 100644
index 0858462da8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-pound.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M444.366 158.889c-9.842-9.58-17.889-23.379-17.889-30.705 0-7.324-11.214-13.348-24.933-13.348H110.68c-13.721 0-24.934 6.023-24.934 13.348 0 7.326-8.061 21.125-17.89 30.705 0 0-36.15 35.184-36.15 96.402 0 61.252 36.15 96.437 36.15 96.437 9.83 9.55 17.89 23.384 17.89 30.712 0 7.324 11.213 13.341 24.934 13.341h290.865c13.719 0 24.933-6.017 24.933-13.341 0-7.328 8.047-21.162 17.889-30.712 0 0 36.151-35.185 36.151-96.437 0-61.219-36.152-96.402-36.152-96.402zm-145.39 175.054c-5.967 2.026-11.741 3.072-17.265 3.072-5.545 0-10.139-.359-13.785-1.146-3.646-.719-7.015-1.566-10.059-2.611a118.673 118.673 0 0 0-9.63-3.043c-3.222-.85-7.227-1.34-12.033-1.34-3.941 0-8.06.553-12.344 1.666-4.316 1.11-8.584 3.236-12.818 6.475l-13.558-20.148a71.785 71.785 0 0 0 9.092-6.699c2.976-2.519 5.608-5.295 7.866-8.408a46.247 46.247 0 0 0 5.573-9.938 29.542 29.542 0 0 0 2.193-11.249c0-2.486-.392-4.939-1.194-7.322a74.444 74.444 0 0 0-2.942-7.359h-21.681v-18.576h13.996c-2.159-2.78-4.35-6.838-6.541-12.264-2.208-5.399-3.303-11.346-3.303-17.92 0-5.818 1.212-11.381 3.63-16.644 2.403-5.233 5.952-9.88 10.597-13.899 4.658-3.991 10.496-7.132 17.494-9.48 6.999-2.324 15.109-3.504 24.283-3.504 16.774 0 29.823 4.643 39.158 13.996 9.337 9.352 13.997 22.894 13.997 40.68h-29.529c-.162-2.187-.439-4.902-.884-8.206a29.343 29.343 0 0 0-2.942-9.485c-1.535-3.106-3.859-5.752-7.016-8.012-3.121-2.223-7.453-3.4-12.999-3.4-6.573 0-11.771 1.832-15.628 5.497-3.893 3.628-5.806 8.504-5.806 14.649 0 1.732.081 3.434.213 5.035.147 1.602.457 3.466.979 5.559.524 2.127 1.376 4.577 2.633 7.324 1.226 2.779 2.96 6.116 5.134 10.074h29.089v18.576h-22.958c.721 2.226 1.211 4.412 1.406 6.602.23 2.162.343 4.514.343 6.967 0 6.832-1.781 12.721-5.345 17.629a67.27 67.27 0 0 1-12.592 13.012l.425.395c3.517-2.129 6.361-3.533 8.538-4.117 2.191-.592 4.298-.887 6.342-.887 2.93 0 5.807.262 8.634.784 2.844.491 5.758 1.017 8.65 1.604a99.103 99.103 0 0 0 8.519 1.896c2.777.486 5.625.719 8.55.719 2.912 0 5.854-.49 8.846-1.471 2.976-1.048 6.459-3.662 10.4-7.914l13.114 22.072c-5.235 5.132-10.859 8.699-16.842 10.759z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-yen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-yen.svg
deleted file mode 100644
index 96c3917842..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-price-yen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M444.769 159.533c-9.81-9.565-17.87-23.395-17.87-30.719 0-7.331-11.232-13.313-24.934-13.313H111.1c-13.719 0-24.937 5.982-24.937 13.313 0 7.324-8.046 21.154-17.854 30.719 0 0-36.187 35.172-36.187 96.406 0 61.234 36.187 96.438 36.187 96.438 9.809 9.532 17.854 23.363 17.854 30.688 0 7.324 11.218 13.329 24.937 13.329h290.865c13.701 0 24.934-6.005 24.934-13.329 0-7.325 8.061-21.156 17.87-30.688 0 0 36.171-35.203 36.171-96.438-.001-61.234-36.171-96.406-36.171-96.406zm-137.363 86.35v20.765h-31.295l-3.27 6.342v10.072h34.564v20.802h-34.564v30.165h-33.257v-30.165h-34.338v-20.802h34.338V272.99l-3.059-6.342h-31.279v-20.765h20.782l-33.469-68.02h35.431l28.875 68.02 28.224-68.02h35.414l-33.879 68.02h20.782z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-print.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-print.svg
deleted file mode 100644
index 3bce86bedd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-print.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M131.829 41.945H377.26v70.459H131.829zm319.901 95.851H57.359c-11.747 0-21.273 9.526-21.273 21.274v156.501h64.086v-95.006h308.749v95.006h64.083V159.07c0-11.748-9.527-21.274-21.274-21.274zm-24.939 52.159c-9.396 0-17.012-7.62-17.012-17.017s7.616-17.014 17.012-17.014c9.398 0 17.016 7.617 17.016 17.014s-7.618 17.017-17.016 17.017zm-67.676 66.479v187.652H256.407c-37.201 0-19.274-88.177-19.274-88.177s-86 20.897-87.106-18.534v-80.941h-25.039v114.032l7.333 7.336 91.326 91.326h160.506V256.434h-25.038z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-printer-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-printer-alt.svg
deleted file mode 100644
index 050ec1d81c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-printer-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M452.418 126.255h-67.577V52.619H125.674v73.636H58.046c-11.745 0-21.272 9.526-21.272 21.271V328.15h88.9v30.775l98.66 98.659h160.507v-128.41h88.851V147.525c-.001-11.744-9.528-21.27-21.274-21.27zm-301.7-48.596h209.087v48.596H150.718V77.659zm258.891 216.747H384.84V244.89h-25.036v187.654H257.098c-37.202 0-19.275-88.18-19.275-88.18s-86.003 20.9-87.108-18.533V244.89h-25.04v48.492h-24.811v-84.357H409.61v85.381zm17.873-115.994c-9.4 0-17.016-7.616-17.016-17.014 0-9.396 7.615-17.014 17.016-17.014 9.394 0 17.013 7.617 17.013 17.014 0 9.398-7.619 17.014-17.013 17.014zm-97.336 69.932H186.215v25.047h143.932v-25.047zm-143.929 74.157h143.928v-25.036H186.217v25.036z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-projector.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-projector.svg
deleted file mode 100644
index afc95283c3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-projector.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M451.941 170.788c0-11.111-9.008-20.118-20.119-20.118H80.176c-11.107 0-20.117 9.007-20.117 20.118v136.168h391.883V170.788zm-249.41 93.418H98.736v-23.678h103.795v23.678zm0-49.504H98.736v-23.68h103.795v23.68zm94.026 75.246c-34.371 0-62.332-27.964-62.332-62.332 0-34.37 27.961-62.335 62.332-62.335s62.334 27.965 62.334 62.335c0 34.368-27.963 62.332-62.334 62.332zm105.996-81.185c-9.877 0-17.889-8.011-17.889-17.89 0-9.878 8.012-17.888 17.889-17.888 9.879 0 17.889 8.01 17.889 17.888-.001 9.879-8.01 17.89-17.889 17.89zM78.559 330.635h62.576v30.695H78.559zm292.3 0h62.578v30.695h-62.578zm-74.302-143.797c-22.518 0-40.775 18.256-40.775 40.778 0 22.52 18.258 40.774 40.775 40.774 22.523 0 40.777-18.255 40.777-40.774 0-22.522-18.254-40.778-40.777-40.778z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pulse.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pulse.svg
deleted file mode 100644
index 8a655631af..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pulse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M189.611 233.457l-19.082 50.947H38.219v-51.142h96.863l64.961-173.537 49.33 203.132 45.783-143.582 45.864 120.461 2.845-6.474H474.18v51.142h-96.946l-39.646 90.063-38.147-100.229-56.707 177.93-53.123-218.711z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pushpin.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pushpin.svg
deleted file mode 100644
index 586bf4fdc0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-pushpin.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M151.92 320.061L72.639 439.597l119.24-79.868a292.208 292.208 0 0 1-21.63-19.576 295.97 295.97 0 0 1-18.329-20.092zm237.764-197.332c-34.521-34.52-75.025-49.983-90.471-34.541-4.723 4.725-6.543 11.802-5.821 20.326-.318 6.984-1.187 13.398-2.536 19.283l-59.557 59.557c-18.267 5.196-35.852 5.529-45.293 5.2-19.958-6.244-36.812-5.263-46.569 4.493-21.638 21.638-.239 78.106 47.784 126.133 48.026 48.026 104.493 69.418 126.129 47.781 8.24-8.239 10.223-21.534 6.889-37.488l.19.189s-3.414-27.452 5.06-55.496l56.104-56.105c6.793-1.702 14.314-2.757 22.654-3.016 8.368.644 15.32-1.188 19.978-5.847 15.443-15.443-.018-55.946-34.541-90.469z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-qr-code.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-qr-code.svg
deleted file mode 100644
index 65a7f99781..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-qr-code.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 270 270"><path fill="#fff" d="M0 0h270v270H0z"/><path d="M10 10h10v10H10zm10 0h10v10H20zm10 0h10v10H30zm10 0h10v10H40zm10 0h10v10H50zm10 0h10v10H60zm10 0h10v10H70zm40 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm30 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zM10 20h10v10H10zm60 0h10v10H70zm20 0h10v10H90zm20 0h10v10h-10zm30 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zm60 0h10v10h-10zM10 30h10v10H10zm20 0h10v10H30zm10 0h10v10H40zm10 0h10v10H50zm20 0h10v10H70zm60 0h10v10h-10zm20 0h10v10h-10zm40 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zM10 40h10v10H10zm20 0h10v10H30zm10 0h10v10H40zm10 0h10v10H50zm20 0h10v10H70zm20 0h10v10H90zm10 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm30 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zM10 50h10v10H10zm20 0h10v10H30zm10 0h10v10H40zm10 0h10v10H50zm20 0h10v10H70zm30 0h10v10h-10zm40 0h10v10h-10zm30 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zM10 60h10v10H10zm60 0h10v10H70zm20 0h10v10H90zm10 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm30 0h10v10h-10zm60 0h10v10h-10zM10 70h10v10H10zm10 0h10v10H20zm10 0h10v10H30zm10 0h10v10H40zm10 0h10v10H50zm10 0h10v10H60zm10 0h10v10H70zm20 0h10v10H90zm20 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zM100 80h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm30 0h10v10h-10zm20 0h10v10h-10zM10 90h10v10H10zm10 0h10v10H20zm10 0h10v10H30zm10 0h10v10H40zm10 0h10v10H50zm20 0h10v10H70zm10 0h10v10H80zm10 0h10v10H90zm10 0h10v10h-10zm20 0h10v10h-10zm60 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zM10 100h10v10H10zm30 0h10v10H40zm10 0h10v10H50zm10 0h10v10H60zm30 0h10v10H90zm20 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm60 0h10v10h-10zm40 0h10v10h-10zM10 110h10v10H10zm10 0h10v10H20zm20 0h10v10H40zm10 0h10v10H50zm10 0h10v10H60zm10 0h10v10H70zm20 0h10v10H90zm20 0h10v10h-10zm30 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zM20 120h10v10H20zm20 0h10v10H40zm10 0h10v10H50zm30 0h10v10H80zm50 0h10v10h-10zm10 0h10v10h-10zm30 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm50 0h10v10h-10zM10 130h10v10H10zm10 0h10v10H20zm10 0h10v10H30zm10 0h10v10H40zm20 0h10v10H60zm10 0h10v10H70zm30 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zm30 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zM10 140h10v10H10zm10 0h10v10H20zm10 0h10v10H30zm20 0h10v10H50zm30 0h10v10H80zm10 0h10v10H90zm10 0h10v10h-10zm70 0h10v10h-10zm30 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zM10 150h10v10H10zm20 0h10v10H30zm20 0h10v10H50zm10 0h10v10H60zm10 0h10v10H70zm10 0h10v10H80zm10 0h10v10H90zm10 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm30 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zM10 160h10v10H10zm40 0h10v10H50zm10 0h10v10H60zm60 0h10v10h-10zm30 0h10v10h-10zm50 0h10v10h-10zm10 0h10v10h-10zm40 0h10v10h-10zM10 170h10v10H10zm60 0h10v10H70zm20 0h10v10H90zm30 0h10v10h-10zm40 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zM90 180h10v10H90zm40 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm40 0h10v10h-10zm10 0h10v10h-10zM10 190h10v10H10zm10 0h10v10H20zm10 0h10v10H30zm10 0h10v10H40zm10 0h10v10H50zm10 0h10v10H60zm10 0h10v10H70zm20 0h10v10H90zm20 0h10v10h-10zm30 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zM10 200h10v10H10zm60 0h10v10H70zm30 0h10v10h-10zm30 0h10v10h-10zm10 0h10v10h-10zm30 0h10v10h-10zm40 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zM10 210h10v10H10zm20 0h10v10H30zm10 0h10v10H40zm10 0h10v10H50zm20 0h10v10H70zm20 0h10v10H90zm20 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zm20 0h10v10h-10zM10 220h10v10H10zm20 0h10v10H30zm10 0h10v10H40zm10 0h10v10H50zm20 0h10v10H70zm20 0h10v10H90zm10 0h10v10h-10zm80 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zM10 230h10v10H10zm20 0h10v10H30zm10 0h10v10H40zm10 0h10v10H50zm20 0h10v10H70zm20 0h10v10H90zm20 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm30 0h10v10h-10zm20 0h10v10h-10zm40 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zM10 240h10v10H10zm60 0h10v10H70zm20 0h10v10H90zm20 0h10v10h-10zm10 0h10v10h-10zm30 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm20 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm30 0h10v10h-10zM10 250h10v10H10zm10 0h10v10H20zm10 0h10v10H30zm10 0h10v10H40zm10 0h10v10H50zm10 0h10v10H60zm10 0h10v10H70zm20 0h10v10H90zm30 0h10v10h-10zm80 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10zm10 0h10v10h-10z"/></svg>
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-quote.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-quote.svg
deleted file mode 100644
index 16746643b6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-quote.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M169.68 123.562c-16.466 9.026-30.677 20.406-42.498 34.143-11.902 13.735-21.06 29.659-27.599 47.677-6.001 16.482-8.961 34.041-8.961 52.583 0 1.77.017 3.535.082 5.335v143.131h136.872V258.588h-60.151c.456-20.405 4.594-37.542 12.293-51.553 7.947-14.471 22.793-25.655 45.374-33.408l2.484-.849v-67.04l-4.136.545c-19.309 2.482-37.247 8.254-53.76 17.279zm249.726 50.064l2.482-.849v-67.04l-4.169.545c-19.277 2.482-37.23 8.254-53.745 17.279-16.479 9.026-30.673 20.406-42.511 34.143-11.871 13.735-21.077 29.659-27.583 47.677-6.001 16.482-8.979 34.041-8.979 52.551 0 1.801.032 3.566.082 5.366v143.131h136.904V258.588h-60.171c.44-20.405 4.597-37.542 12.297-51.553 7.932-14.471 22.81-25.656 45.393-33.409z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio-alt.svg
deleted file mode 100644
index c7dcf65677..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M214.738 142.071c-10.892 10.9-16.312 25.036-16.321 39.271.021 14.382 5.4 28.608 16.33 39.547 10.911 10.904 25.097 16.308 39.406 16.322 14.304-.015 28.486-5.418 39.401-16.322 10.916-10.92 16.316-25.106 16.326-39.41-.01-14.309-5.41-28.489-16.326-39.407-10.92-10.912-25.098-16.312-39.401-16.328-14.309.015-28.495 5.415-39.415 16.327zm-85.043 99.021c-16.768-16.752-25.22-38.886-25.198-60.834-.022-21.954 8.43-44.086 25.198-60.834 7.336-7.336 19.227-7.336 26.561 0 7.33 7.336 7.33 19.228-.005 26.562-9.497 9.508-14.176 21.8-14.193 34.271.017 12.473 4.692 24.762 14.193 34.279h.005c7.33 7.334 7.33 19.224-.005 26.555a18.723 18.723 0 0 1-13.282 5.5 18.703 18.703 0 0 1-13.274-5.499zm225.897.006c-7.335-7.337-7.34-19.223-.005-26.559 9.503-9.527 14.181-21.818 14.198-34.283-.018-12.47-4.695-24.762-14.193-34.273v.004c-7.335-7.335-7.335-19.225 0-26.559 7.332-7.336 19.221-7.336 26.556 0 16.765 16.744 25.219 38.88 25.199 60.828a85.905 85.905 0 0 1-25.193 60.832 18.71 18.71 0 0 1-13.284 5.504 18.745 18.745 0 0 1-13.278-5.494zM69.571 278.562c-27.111-27.101-40.733-62.79-40.717-98.304-.017-35.522 13.605-71.215 40.725-98.301 7.337-7.334 19.223-7.334 26.558 0 7.331 7.336 7.327 19.225-.005 26.562-19.845 19.843-29.692 45.7-29.717 71.739.025 26.027 9.872 51.881 29.717 71.754h.005c7.331 7.327 7.331 19.221-.005 26.558a18.734 18.734 0 0 1-13.279 5.496 18.734 18.734 0 0 1-13.282-5.504zm346.14.007c-7.338-7.337-7.338-19.225-.009-26.56 19.854-19.863 29.706-45.725 29.722-71.746-.016-26.034-9.867-51.895-29.713-71.757v.012c-7.338-7.337-7.338-19.226 0-26.562 7.331-7.334 19.221-7.334 26.557 0 27.107 27.095 40.742 62.792 40.718 98.307.024 35.514-13.61 71.201-40.71 98.306a18.732 18.732 0 0 1-13.282 5.502 18.728 18.728 0 0 1-13.283-5.502zm-161.494-15.038h-.068a83.08 83.08 0 0 1-23.353-3.335v177.368h46.705v-177.37a83.082 83.082 0 0 1-23.284 3.337z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio-receiver.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio-receiver.svg
deleted file mode 100644
index a3bea41462..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio-receiver.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M412.084 217.042h-45.748L157.24 115.24c-2.322-13.228-13.832-23.3-27.73-23.3-15.564 0-28.191 12.606-28.191 28.174 0 15.579 12.627 28.207 28.191 28.207a27.86 27.86 0 0 0 15.73-4.828l151.08 73.549H100.73c-6.834 0-12.363 5.524-12.363 12.327V407.89c0 6.817 5.529 12.342 12.363 12.342h311.354c6.836 0 12.328-5.524 12.328-12.342V229.369c0-6.803-5.492-12.327-12.328-12.327zM197.43 384.721c-36.264 0-65.697-29.416-65.697-65.684 0-36.281 29.434-65.666 65.697-65.666 36.266 0 65.667 29.384 65.667 65.666 0 36.268-29.402 65.684-65.667 65.684zm149.316-13.69c-10.366 0-18.772-8.385-18.772-18.751 0-10.367 8.406-18.773 18.772-18.773 10.367 0 18.77 8.406 18.77 18.773 0 10.366-8.403 18.751-18.77 18.751zm0-65.158c-10.366 0-18.772-8.384-18.772-18.751 0-10.366 8.406-18.759 18.772-18.759 10.367 0 18.77 8.393 18.77 18.759 0 10.367-8.403 18.751-18.77 18.751z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio.svg
deleted file mode 100644
index 2cf8718a2e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-radio.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.091 222.902h-.059c-13.374.012-26.839-3.171-39.051-9.582L114.008 477.969h48.297l8.205-21.296 83.722-33.747 84.673 33.521 8.295 21.521h48.296L293.537 213.361c-11.994 6.324-25.221 9.541-38.446 9.541zm-.341 15.148l14.659 38.041h-29.314l14.655-38.041zm-24.306 63.079h48.613l6.43 16.686-29.924 17.277-30.952-18.822 5.833-15.141zm-14.981 38.885l15.38 9.352-24.414 14.094 9.034-23.446zm111.194 84.651l-67.855-26.86-9.292.024-66.684 26.883 9.272-24.065 63.137-36.453 62.845 38.213 8.577 22.258zm-23.32-60.522l-23.383-14.219 14.646-8.457 8.737 22.676zM142.009 205.958c4.806 0 9.611-1.831 13.279-5.495 7.335-7.336 7.335-19.229.004-26.56h-.004c-9.501-9.514-14.174-21.809-14.195-34.281.021-12.465 4.693-24.76 14.195-34.269 7.335-7.332 7.335-19.226.004-26.556-7.336-7.335-19.224-7.338-26.56-.002-16.764 16.741-25.223 38.873-25.202 60.827a85.868 85.868 0 0 0 25.202 60.841 18.72 18.72 0 0 0 13.277 5.495zM354.627 78.795c-7.336 7.332-7.336 19.226 0 26.555 9.5 9.515 14.174 21.804 14.195 34.276-.021 12.464-4.695 24.761-14.195 34.273-7.336 7.337-7.336 19.231 0 26.561a18.725 18.725 0 0 0 13.279 5.498c4.807 0 9.614-1.831 13.279-5.498a85.864 85.864 0 0 0 25.197-60.834 85.86 85.86 0 0 0-25.197-60.834c-7.335-7.333-19.227-7.333-26.558.003zM95.168 211.375C75.318 191.51 65.47 165.65 65.45 139.622c.02-26.027 9.875-51.887 29.718-71.741 7.333-7.336 7.333-19.223 0-26.559-7.334-7.333-19.222-7.333-26.559 0-27.11 27.093-40.739 62.787-40.719 98.3-.021 35.514 13.609 71.207 40.719 98.31a18.736 18.736 0 0 0 13.281 5.497c4.807 0 9.61-1.833 13.278-5.497 7.333-7.335 7.333-19.224.006-26.557h-.006zM441.303 41.322c-7.332-7.333-19.228-7.333-26.557 0-7.335 7.336-7.335 19.223 0 26.556 19.845 19.86 29.697 45.717 29.718 71.748-.021 26.026-9.873 51.881-29.724 71.746-7.332 7.333-7.329 19.23.006 26.562a18.712 18.712 0 0 0 13.273 5.497c4.806 0 9.615-1.832 13.283-5.503 27.106-27.1 40.741-62.79 40.717-98.303.025-35.514-13.605-71.206-40.716-98.303zM254.75 195.441c30.827 0 55.812-24.99 55.812-55.812 0-30.827-24.985-55.815-55.812-55.815-30.822 0-55.812 24.988-55.812 55.815 0 30.822 24.99 55.812 55.812 55.812z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rain.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rain.svg
deleted file mode 100644
index 0007d98d6c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rain.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M219.141 364.039c0 18.901 15.304 34.207 34.176 34.207 18.897 0 34.202-15.306 34.202-34.207 0-18.886-34.202-59.12-34.202-59.12s-34.176 40.234-34.176 59.12zM110.309 411.85c0 18.885 15.305 34.19 34.207 34.19 18.868 0 34.172-15.306 34.172-34.19 0-18.886-34.172-59.138-34.172-59.138s-34.207 40.252-34.207 59.138zm217.664 0c0 18.885 15.305 34.19 34.172 34.19 18.901 0 34.207-15.306 34.207-34.19 0-18.886-34.207-59.138-34.207-59.138s-34.172 40.252-34.172 59.138zm46.108-249.367a77.018 77.018 0 0 0 2.52-19.525c0-42.56-34.535-77.077-77.08-77.077-32.012 0-59.451 19.512-71.125 47.272-10.007-11.755-24.887-19.211-41.532-19.211-30.15 0-54.577 24.413-54.577 54.546 0 5.181.717 10.188 2.091 14.945-24.592 9.026-42.153 32.653-42.153 60.401 0 35.498 28.747 64.291 64.293 64.291h198.205c35.581 0 64.323-28.793 64.323-64.291-.001-28.794-18.868-53.124-44.965-61.351z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rate.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rate.svg
deleted file mode 100644
index aac2ba0481..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rate.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M479.66 204.083a8.79 8.79 0 0 0-8.334-6.057H311.987L262.668 46.552a8.79 8.79 0 0 0-8.329-6.05 8.769 8.769 0 0 0-8.332 6.038l-49.596 151.486H37.348a8.783 8.783 0 0 0-8.333 6.05 8.797 8.797 0 0 0 3.171 9.801l128.717 93.759-49.595 152.322a8.787 8.787 0 0 0 3.177 9.803 8.786 8.786 0 0 0 10.301 0l129.542-94.046 129.276 94.046a8.743 8.743 0 0 0 10.304 0 8.752 8.752 0 0 0 3.186-9.803L347.49 307.64l128.987-93.756a8.79 8.79 0 0 0 3.183-9.801z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-re-post.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-re-post.svg
deleted file mode 100644
index 80b7a9673d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-re-post.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M137.521 170.136h139.212l42.217-51.146H86.393v185.291H38.385l73.549 89.145 73.594-89.145h-48.007V170.136zm263.297-51.668l-73.58 89.145h48.008v134.112H236.053l-42.221 51.162 232.56-.021V207.612h48.022l-73.596-89.144z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-readonly.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-readonly.svg
deleted file mode 100644
index b0840b5171..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-readonly.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M42.203 63.436l405 404.999 21.763-21.765-405-404.996-21.763 21.762zm430.35 33.166l-58.761-58.754-49.978 49.976 58.764 58.764 49.975-49.986zM313.428 255.73l82.593-82.596-26.54-26.534-82.592 82.589 26.539 26.541zm-134.875 81.799l-15.927-15.938 51.162-51.167-16.288-16.28L86.348 365.297l.188.185-47.922 106.775 106.313-48.384.181.182.484-.484 110.666-110.672-26.539-26.537-51.166 51.167zm-39.259 59.049l-46.367 21.104 20.896-46.573 23.39-23.389 3.366 22.303 22.1 3.165-23.385 23.39zm214.254-265.916l-16.285-16.28-82.591 82.592 16.285 16.279 82.591-82.591z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-alt.svg
deleted file mode 100644
index d7b6f5e860..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M115.362 49.87v412.26h281.275V49.87H115.362zm29.106 383.157V230.409h29.342v-21.312h-29.342V78.979H367.53v130.118h-27.969v21.312h27.969v202.618H144.468zm62.492-223.93h33.15v21.312h-33.15zm66.301 0h33.15v21.312h-33.15zm-83.862-83.428h133.203v30.785H189.399zm103.799 217.5c-1.869-3.144-4.766-6.164-8.695-9.061-3.928-2.897-9.525-5.327-16.789-7.293-1.379-.39-2.68-.734-3.904-1.03-1.23-.292-2.428-.589-3.609-.883V298.83c3.338 0 6.186 1.375 8.541 4.126 2.357 2.748 3.588 6.085 3.684 10.014h20.92c-.297-5.105-1.377-9.524-3.246-13.259-1.865-3.729-4.268-6.851-7.213-9.352-2.947-2.505-6.359-4.468-10.238-5.893s-8.027-2.382-12.447-2.874V270.25h-8.691v11.343a49.404 49.404 0 0 0-12.816 2.578c-4.123 1.426-7.758 3.441-10.9 6.039-3.143 2.605-5.67 5.82-7.59 9.651-1.912 3.829-2.867 8.248-2.867 13.256 0 4.91.832 9.012 2.502 12.302 1.67 3.293 3.906 6.039 6.705 8.248 2.797 2.209 5.965 3.977 9.5 5.303s7.121 2.479 10.752 3.461c.984.198 1.889.419 2.725.663.838.245 1.496.467 1.99.661v30.789c-4.518-.884-8.299-2.945-11.344-6.186-3.043-3.241-4.516-7.659-4.42-13.258h-20.77c.982 11.589 4.568 20.381 10.754 26.365 6.188 5.992 14.777 9.38 25.779 10.166v12.519h8.691v-12.519c7.365-.492 13.406-1.966 18.117-4.419 4.713-2.454 8.473-5.254 11.271-8.397 2.793-3.141 4.734-6.355 5.816-9.647 1.08-3.291 1.621-6.017 1.621-8.176 0-2.452-.172-5.254-.518-8.396-.344-3.143-1.447-6.286-3.311-9.427zm-41.689-20.329c-4.715-1.08-8.098-2.504-10.166-4.273-2.061-1.768-3.094-4.269-3.094-7.512 0-2.062.371-3.851 1.107-5.378.738-1.52 1.742-2.799 3.02-3.83a12.798 12.798 0 0 1 4.271-2.281 16.183 16.183 0 0 1 4.861-.735v24.009zm23.127 43.38a14.56 14.56 0 0 1-3.758 4.348c-1.52 1.177-3.24 2.086-5.154 2.722-1.914.644-3.758 1.06-5.523 1.254v-28.283c5.791 1.575 9.891 3.315 12.301 5.23 2.402 1.914 3.605 4.786 3.605 8.618-.001 2.355-.489 4.395-1.471 6.111z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-dollar.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-dollar.svg
deleted file mode 100644
index 6784c6e8df..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-dollar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M108.023 38.888v434.118h296.179V38.888H108.023zM373.545 442.36H138.664V69.549h234.881V442.36zm-45.768-116.151H185.655v24.932h142.122v-24.932zm0 57.014H185.655v24.915h142.122v-24.915zm-97.105-140.846c-4.515-4.828-6.705-11.381-6.557-19.705H193.26c1.456 17.233 6.802 30.283 15.975 39.175 9.206 8.895 21.943 13.9 38.277 15.078v18.604h12.918v-18.604c10.922-.739 19.899-2.928 26.895-6.544 6.998-3.659 12.576-7.814 16.745-12.488 4.135-4.644 7.028-9.438 8.615-14.322 1.604-4.876 2.42-8.93 2.42-12.137 0-3.642-.263-7.794-.75-12.458-.541-4.673-2.177-9.353-4.956-13.995-2.762-4.679-7.08-9.174-12.885-13.457-5.854-4.303-14.161-7.914-24.932-10.826a130.285 130.285 0 0 0-5.789-1.537 338.96 338.96 0 0 1-5.363-1.325v-38.699c4.937 0 9.171 2.043 12.673 6.131 3.496 4.071 5.327 9.041 5.476 14.86h31.05c-.425-7.568-2.029-14.142-4.824-19.688-2.746-5.539-6.327-10.181-10.691-13.878-4.383-3.729-9.47-6.639-15.224-8.751-5.757-2.108-11.902-3.543-18.459-4.267V96.688h-12.918v16.857a72.619 72.619 0 0 0-19.032 3.829c-6.117 2.108-11.51 5.102-16.188 8.977-4.659 3.84-8.405 8.615-11.268 14.307-2.827 5.688-4.266 12.264-4.266 19.683 0 7.309 1.243 13.394 3.728 18.284 2.485 4.874 5.804 8.961 9.942 12.246 4.169 3.268 8.877 5.905 14.109 7.864 5.249 1.964 10.579 3.697 15.974 5.133 1.454.296 2.796.623 4.056.981 1.226.375 2.225.686 2.944.983v45.734c-6.706-1.31-12.328-4.399-16.84-9.189zm29.758-32.8c8.6 2.323 14.681 4.921 18.246 7.768 3.564 2.825 5.348 7.094 5.348 12.787 0 3.495-.719 6.521-2.193 9.072a21.593 21.593 0 0 1-5.574 6.459c-2.258 1.75-4.808 3.088-7.618 4.04-2.845.945-5.609 1.554-8.208 1.865v-41.991zm-28.012-41.14c-3.057-2.615-4.595-6.343-4.595-11.154 0-3.057.559-5.703 1.654-7.974 1.093-2.277 2.566-4.172 4.478-5.693a18.829 18.829 0 0 1 6.347-3.385 24.225 24.225 0 0 1 7.21-1.093v35.642c-7-1.6-12.037-3.714-15.094-6.343z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-euro.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-euro.svg
deleted file mode 100644
index 82e99b2eec..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-euro.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M108.292 38.797V472.94h296.197V38.797H108.292zm265.537 403.435H138.933V69.436h234.896v372.796zm-45.765-116.121H185.942v24.918h142.123v-24.918zm0 57.032H185.942v24.919h142.123v-24.919zM207.591 193.08v5.657h-8.749l-6.785 15.763h16.856c3.059 19.098 9.695 33.973 19.9 44.605 11.232 11.803 26.015 17.723 44.408 17.723 12.673 0 23.89-2.846 33.668-8.533l.213-33.026c-11.513 9.188-22.747 13.765-33.683 13.765-16.923 0-27.7-11.512-32.36-34.533h38.049l6.785-15.763H239.31l.21-9.187h48.988l6.787-15.732h-53.353c5.084-19.979 15.289-29.957 30.61-29.957 8.894 0 18.442 3.238 28.646 9.814l13.357-27.342c-14.307-7.293-27.567-10.92-39.814-10.92-17.363 0-31.783 5.562-43.312 16.611-10.92 10.238-18.148 24.137-21.649 41.793h-11.15l-6.802 15.732h15.99c-.145.294-.227 1.471-.227 3.53z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-pound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-pound.svg
deleted file mode 100644
index b28cf9e00d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-pound.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M101.195 29.148v452.328h308.621V29.148H101.195zm276.69 420.407h-244.74V61.062h244.74v388.493zm-47.68-121.025h-148.09v25.963h148.09V328.53zm0 59.386h-148.09v25.966h148.09v-25.966zM220.474 205.541c.802 2.52 1.241 5.069 1.241 7.621 0 4.116-.767 8.008-2.269 11.738-1.539 3.723-3.468 7.191-5.84 10.398-2.337 3.168-5.084 6.076-8.191 8.762-3.124 2.65-6.279 4.969-9.45 6.932l14.126 20.961c4.399-3.334 8.83-5.556 13.326-6.703 4.463-1.143 8.782-1.73 12.868-1.73 5.021 0 9.222.483 12.557 1.373 3.335.914 6.672 1.99 10.007 3.201 3.205 1.053 6.704 1.966 10.497 2.714 3.794.756 8.602 1.146 14.339 1.146 5.789 0 11.789-1.074 18.037-3.205 6.212-2.092 12.049-5.819 17.527-11.148l-13.67-23.027c-4.104 4.418-7.718 7.166-10.824 8.213-3.107 1.08-6.18 1.602-9.238 1.602-3.023 0-5.999-.258-8.878-.787a180.815 180.815 0 0 1-8.894-1.96c-3.045-.591-6.019-1.144-8.996-1.702a52.139 52.139 0 0 0-9.008-.783c-2.141 0-4.333.298-6.623.918-2.255.587-5.231 2.029-8.877 4.314l-.458-.461a70.105 70.105 0 0 0 13.129-13.566c3.696-5.1 5.576-11.217 5.576-18.312 0-2.582-.146-5.039-.343-7.328-.229-2.252-.753-4.547-1.473-6.832h23.938v-19.357h-30.346c-2.258-4.092-4.056-7.621-5.332-10.504-1.31-2.907-2.223-5.428-2.747-7.618-.54-2.19-.883-4.153-1.013-5.82a53.521 53.521 0 0 1-.263-5.264c0-6.343 2.027-11.442 6.051-15.272 4.021-3.762 9.45-5.654 16.285-5.654 5.788 0 10.317 1.145 13.571 3.531 3.271 2.355 5.707 5.1 7.293 8.305 1.602 3.207 2.648 6.477 3.074 9.942.457 3.366.769 6.246.932 8.502h30.756c0-18.543-4.84-32.671-14.585-42.382-9.712-9.711-23.316-14.584-40.796-14.584-9.565 0-18.003 1.207-25.293 3.664-7.293 2.416-13.377 5.715-18.232 9.906-4.856 4.188-8.552 8.99-11.053 14.453-2.504 5.494-3.778 11.251-3.778 17.332 0 6.834 1.146 13.049 3.402 18.674 2.289 5.656 4.578 9.877 6.868 12.789H194.82v19.357h22.547a73.26 73.26 0 0 1 3.107 7.651z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-yen.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-yen.svg
deleted file mode 100644
index 529fd87d4e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-receipt-yen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M107.566 39.19v434.12h296.176V39.19H107.566zM373.07 442.668H138.205v-372.8H373.07v372.8zm-45.748-116.156H185.198v24.932h142.124v-24.932zm0 56.997H185.198v24.952h142.124v-24.952zM203.739 185.582v20.779h31.296l3.042 6.349v10.07h-34.338v20.78h34.338v30.183h33.259V243.56h34.53v-20.78h-34.53v-10.07l3.268-6.349h31.263v-20.779h-20.761l33.907-68.021h-35.444l-28.226 68.021-28.876-68.021h-35.418l33.455 68.021h-20.765z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-reception.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-reception.svg
deleted file mode 100644
index 01a61f4ae9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-reception.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.004 146.532c26.324 0 47.664-21.339 47.664-47.66 0-26.323-21.34-47.664-47.664-47.664s-47.664 21.34-47.664 47.664c0 26.321 21.34 47.66 47.664 47.66zM49.525 271.882v98.662h41.977l16.445 90.249h296.105l16.445-90.249h41.977v-98.662H49.525zm174.239-75.609c.16.515.281 1.043.299 1.59v4.785l-.004-.012c0 10.362-.523 25.816-2.611 45.43h69.102c-2.086-19.613-2.611-35.067-2.611-45.43v-4.796c.008-.262.064-.514.111-.767l36.145 50.992h40.629l-54.791-77.304c-2.895-4.201-6.293-6.775-9.893-8.766-3.873-2.038-8.07-3.453-13.395-3.511-.629 0-1.135.024-1.551.051l-29.188 1.819-30.045-1.87a21.47 21.47 0 0 0-1.529-.049c-5.338.059-9.555 1.48-13.428 3.534-3.607 2.015-7 4.612-9.881 8.844l-.004-.001-54.059 77.253h40.455l36.249-51.792z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-record.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-record.svg
deleted file mode 100644
index 5a928928d3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-record.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M421.553 256.006c0 91.873-74.479 166.354-166.354 166.354-91.869 0-166.352-74.48-166.352-166.354 0-91.873 74.482-166.351 166.352-166.351 91.874 0 166.354 74.478 166.354 166.351z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-redo.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-redo.svg
deleted file mode 100644
index b1fcfc01d6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-redo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M293.803 250.02l-64.785 64.762L463.1 337.197l-22.402-234.091-63.539 63.547c-36.348-25.028-79.562-39.056-124.348-39.161-37.917-.057-77.537 10.596-111.611 34.809-10.58 7.456-20.488 16.197-29.562 26.066 11.625-4.024 23.954-6.052 36.641-5.971 46.468.2 97.189 24.819 145.524 67.624zm-129.5 160.701v-35.424c0-43.781 8.699-73.252 19.409-92.192 10.875-18.97 23.234-28.682 37.492-34.859 7.047-2.946 14.684-4.844 22.795-5.65-34.208-23.274-67.579-35.41-95.72-35.262-29.038.238-52.666 11.643-71.159 38.472-3.499 5.161-6.802 10.941-9.811 17.327a240.87 240.87 0 0 0-2.371 6.924c-10.137 30.984-15.303 66.023-15.303 105.242v35.424h114.668z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-refresh.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-refresh.svg
deleted file mode 100644
index b3c932583f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-refresh.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M251.886 36.967c.051 0 .101.003.152.004.048.002.083.002.133.002l-.285-.006zM469.053 255.5c-.021-120.031-96.842-217.653-217.015-218.53a127.06 127.06 0 0 0-1.572-.009c-61.856-.011-117.971 25.852-157.694 67.277l-51.88-52.545v152.691h150.756l-52.354-53.025c27.891-29.734 67.271-48.214 111.172-48.224.405 0 .626 0 .722.004h.278c83.815.51 151.432 68.677 151.411 152.361.004.1-.004.507.004 1.202-.625 83.712-68.756 151.222-152.361 151.202-.271.006-.712 0-1.311 0l.206 66.178a32.07 32.07 0 0 1 1.105 0c120.078-.023 217.738-96.924 218.533-217.167v-.36l-.004-.435c0-.11.004-.317.004-.62z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-remote.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-remote.svg
deleted file mode 100644
index ff3d1de672..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-remote.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M355.731 49.279H156.269c-11.109 0-20.118 9.008-20.118 20.118v373.204c0 11.11 9.009 20.119 20.118 20.119h199.463c11.109 0 20.118-9.009 20.118-20.119V69.397c0-11.11-9.009-20.118-20.119-20.118zm-32.043 136.333c7.487 0 13.556 6.069 13.556 13.558s-6.069 13.558-13.556 13.558h-11.435c1.05-4.352 1.62-8.889 1.62-13.558s-.57-9.206-1.62-13.558h11.435zm-81.245-54.128c0-7.487 6.07-13.558 13.557-13.558s13.558 6.07 13.558 13.558v11.433c-4.352-1.049-8.889-1.62-13.558-1.62s-9.205.571-13.557 1.62v-11.433zm-54.131 54.128h11.434c-1.05 4.352-1.62 8.889-1.62 13.558s.57 9.206 1.62 13.558h-11.434c-7.487 0-13.557-6.069-13.557-13.558s6.07-13.558 13.557-13.558zm25.034 247.432h-43.788v-43.788h43.788v43.788zm0-64.384h-43.788v-43.787h43.788v43.787zm65.82 64.384h-43.79v-43.788h43.79v43.788zm0-64.384h-43.79v-43.787h43.79v43.787zm-36.723-101.804v-11.432c4.352 1.049 8.888 1.62 13.557 1.62s9.206-.571 13.558-1.62v11.432c0 7.487-6.07 13.558-13.558 13.558s-13.557-6.07-13.557-13.558zM256 229.93c-16.985 0-30.759-13.771-30.759-30.76 0-16.987 13.773-30.758 30.759-30.758 16.987 0 30.759 13.771 30.759 30.758 0 16.988-13.772 30.76-30.759 30.76zm88.112 203.114h-43.788v-43.788h43.788v43.788zm0-64.384h-43.788v-43.787h43.788v43.787z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-remove.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-remove.svg
deleted file mode 100644
index 97bff0169f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-remove.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M88.871 297.086v-83.1h332.084v83.1H88.871z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-repeat-one.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-repeat-one.svg
deleted file mode 100644
index 054185177f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-repeat-one.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M109.469 190.795l24.132-23.979h173.582v48.212l89.521-73.884-89.521-73.891v48.208H112.416L58.11 169.434v66.409h51.359v-45.048zm256.216 68.963l-10.965 10.896a96.156 96.156 0 0 1 19.202-1.932 95.438 95.438 0 0 1 43.122 10.268v-64.275h-51.359v45.043zm-43.228 23.982H168.384v-48.201l-89.519 73.887 89.519 73.885V335.11l114.213-.004c6.962-21.387 21.234-39.491 39.86-51.366zm51.465 2.508c-43.356 0-78.504 35.152-78.504 78.508 0 43.352 35.147 78.504 78.504 78.504 43.357 0 78.503-35.152 78.503-78.504 0-43.356-35.146-78.508-78.503-78.508zm12.517 131.123H365.49v-71.744h-24.465v-13.916c6.44-.293 10.949-.721 13.524-1.291 4.104-.912 7.443-2.725 10.019-5.455 1.767-1.866 3.104-4.352 4.008-7.464.526-1.862.789-3.25.789-4.157h17.074v104.027z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-repeat.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-repeat.svg
deleted file mode 100644
index 68e7b30f8a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-repeat.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M126.692 221.774l24.129-23.978h173.583V246l89.521-73.886-89.521-73.885v48.207l-145.444-.006h-49.319l-54.31 53.98v66.409h51.362v-45.045zM382.9 245.692v45.043l-24.129 23.981H185.606v-48.203l-89.521 73.885 89.521 73.889V366.08h194.346l54.312-53.979v-66.409H382.9z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-reply-arrow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-reply-arrow.svg
deleted file mode 100644
index fd708c5173..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-reply-arrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M251.11 142.632l.468-73.222L102.65 192.545l147.352 124.717.444-69.943c147.146 19.949 83.59 108.396-.264 192.248 290.48-189.515 117.69-276.817.928-296.935z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-resize.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-resize.svg
deleted file mode 100644
index e26e9fb196..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-resize.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M473.996 261.389l-92.818-92.818v59.734H293.15V89.28h-83.099v139.025h-81.019v-59.734l-92.819 92.822 92.819 92.818v-59.74l81.019.006v127.341h83.099V294.477h88.028v59.734z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-return-to-top.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-return-to-top.svg
deleted file mode 100644
index 15e5d82289..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-return-to-top.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M298.174 290.192v43.226c0 35.787-29.01 64.801-64.801 64.801-35.787 0-64.799-29.014-64.799-64.801V178.582c0-35.79 29.012-64.8 64.799-64.8 35.791 0 64.801 29.011 64.801 64.8v12.808h-44.766l69.871 84.656 69.873-84.656H347.9v-12.808c0-63.15-51.377-114.527-114.527-114.527-63.148 0-114.525 51.377-114.525 114.527v154.836c0 63.149 51.377 114.527 114.525 114.527 63.15 0 114.527-51.378 114.527-114.527V290.78l-24.621 29.831-25.105-30.419z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-right-double-arrow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-right-double-arrow.svg
deleted file mode 100644
index a8f4a03cb7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-right-double-arrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M168.528 256.002L74.059 87.996h34.025l153.057 168.006-153.055 168.002H74.057zm82.33-168.006h34.025l153.059 168.006-153.057 168.002h-34.027l94.467-168.002z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-road.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-road.svg
deleted file mode 100644
index e9dedee5bd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-road.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M261.312 78.641l.949 23.021H250.57l.935-23.021h-82.771l-81.18 354.471h153.19v-32.264h31.328v32.264H425.25L344.082 78.641h-82.77zm-12.015 54.775h14.221l1.097 27.012h-16.431l1.113-27.012zm-2.387 58.745h18.997l1.421 34.501h-21.826l1.408-34.501zm-2.683 66.243h24.361l1.508 36.998h-27.391l1.522-36.998zm-3.483 110.713V344.67l.688-17.528h29.939l.701 17.396v24.58h-31.328z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-roadsign.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-roadsign.svg
deleted file mode 100644
index 4115c305c4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-roadsign.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M463.605 239.344L272.661 48.379c-4.545-4.572-10.562-6.851-16.547-6.851-5.983 0-12.032 2.279-16.577 6.851L48.59 239.344c-9.153 9.147-9.153 23.982 0 33.127l190.947 190.963c4.545 4.581 10.562 6.867 16.577 6.867a23.284 23.284 0 0 0 16.547-6.877l190.944-190.953c9.161-9.145 9.161-23.98 0-33.127zm-15.856 17.269L256.803 447.557c-.1.1-.292.283-.688.283-.424 0-.618-.184-.718-.273L64.451 256.613a.99.99 0 0 1 0-1.41L255.396 64.261c.1-.09.294-.297.718-.297.396 0 .589.198.688.297l190.946 190.942c.096.083.294.292.294.712.001.403-.197.591-.293.698zm-349.388-.697l157.753 157.747 157.722-157.747L256.114 98.155 98.361 255.916z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rocket.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rocket.svg
deleted file mode 100644
index 5fab3cf1ba..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rocket.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M368.744 80.665c2.058 18.558 8.239 33.472 18.476 43.668 10.202 10.272 25.114 16.436 43.724 18.479C458.117 87.875 466.72 44.9 466.72 44.9s-43.006 8.571-97.976 35.765zm-28.582 15.321c-29.628 17.182-60.988 39.601-89.996 68.604-18.54 18.577-33.452 36.562-45.487 53.472L131.2 231.647l-86.334 86.365 76.98 2.401 54.186-54.184c-19.098 39.636-20.799 65.894-20.799 65.894l24.234 24.234s27.143-2.588 67.039-21.91l-55.331 55.298 2.419 76.974 86.332-86.329 13.636-73.837c17.07-11.957 35.091-26.773 53.436-45.134 29.006-29.003 51.439-60.361 68.607-89.993-18.934-3.824-36.296-11.741-50.033-25.408-13.67-13.737-21.617-31.084-25.41-50.032z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rss.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rss.svg
deleted file mode 100644
index 96a210c20c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-rss.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M95.143 355.051c33.239 0 60.186 26.948 60.186 60.186 0 33.235-26.947 60.188-60.186 60.188-33.242 0-60.188-26.952-60.188-60.188 0-33.238 26.946-60.186 60.188-60.186zm230.709 120.373h-85.258c0-113.572-92.071-205.637-205.638-205.637v-85.263c160.662 0 290.896 130.236 290.896 290.9zm60.189 0c0-193.9-157.187-351.084-351.086-351.084V36.567c242.372 0 438.855 196.482 438.855 438.857h-87.769z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ruler-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ruler-alt.svg
deleted file mode 100644
index 695d110031..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ruler-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M37.465 95.444L473.737 415.17H37.465V95.444m67.381 132.937v119.424h162.952L104.846 228.381z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ruler.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ruler.svg
deleted file mode 100644
index 15eff181d8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ruler.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M379.978 37.318L37.23 380.053l94.393 94.389 342.749-342.724-94.394-94.4zM117.315 428.486l-45.864-45.871 8.551-8.52 45.848 45.855-8.535 8.536zm10.337-50.149l-25.934-25.956 8.501-8.533 25.966 25.943-8.533 8.546zm30.247-30.241l-25.95-25.965 8.52-8.524 25.965 25.958-8.535 8.531zm30.247-30.25l-25.963-25.965 8.535-8.523 25.964 25.957-8.536 8.531zm30.25-30.248l-25.966-25.945 8.536-8.539 25.967 25.948-8.537 8.536zm50.166-10.34l-45.879-45.855 8.533-8.535 45.865 45.876-8.519 8.514zm10.301-50.151l-25.934-25.939 8.536-8.562 25.947 25.974-8.549 8.527zm30.267-30.222l-25.969-25.971 8.52-8.531 25.981 25.931-8.532 8.571zm30.23-30.266l-25.965-25.955 8.552-8.531 25.949 25.958-8.536 8.528zm30.25-30.265l-25.967-25.93 8.535-8.54 25.967 25.956-8.535 8.514zm4.283-56.175l8.555-8.522 45.863 45.842-8.535 8.547-45.883-45.867z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-safe.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-safe.svg
deleted file mode 100644
index 9bdce49ca5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-safe.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M63.09 481.656h385.094v-41.563H63.09v41.563zM459.139 30.178H52.168c-12.199 0-22.074 9.876-22.074 22.057v341.679c0 12.201 9.875 22.072 22.074 22.072h406.971c12.184 0 22.075-9.871 22.075-22.072V52.235c0-12.181-9.892-22.057-22.075-22.057zM95.84 184.676h25.949v78.13H95.84v-78.13zm319.627-22.579v201.292H95.84V303.9h25.949v33.519h267.693v-228.66H121.789v34.804H95.84V82.746h319.627v79.351zm-164.932 13.405a58.76 58.76 0 0 1 26.098-10.854v16.008h17.82v-16.008a58.73 58.73 0 0 1 26.064 10.854l-11.281 11.257 12.59 12.617 11.282-11.301c5.558 7.557 9.386 16.419 10.823 26.089h-15.957v17.825h15.957c-1.438 9.669-5.266 18.546-10.823 26.103l-11.282-11.307-12.59 12.59 11.281 11.307a58.514 58.514 0 0 1-26.064 10.806v-15.97h-17.82v15.97c-9.684-1.452-18.561-5.253-26.098-10.806l11.283-11.307-12.592-12.59-11.281 11.307c-5.558-7.557-9.367-16.434-10.826-26.103h15.963v-17.825h-15.976c1.472-9.669 5.281-18.532 10.839-26.089l11.281 11.301 12.592-12.617-11.283-11.257zm34.994 69.155c11.902 0 21.582-9.675 21.582-21.58 0-11.914-9.68-21.561-21.582-21.561-11.906 0-21.568 9.647-21.568 21.561 0 11.905 9.662 21.58 21.568 21.58z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-safedial.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-safedial.svg
deleted file mode 100644
index da9a6a6275..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-safedial.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M388.177 244.9c-2.354-28.221-13.505-53.924-30.772-74.33l-28.286 28.285-15.663-15.631 28.286-28.27c-20.371-17.264-46.076-28.45-74.299-30.789v39.994h-22.105v-39.994c-28.221 2.339-53.926 13.525-74.329 30.789l28.284 28.29-15.631 15.611-28.284-28.285c-17.268 20.406-28.42 46.109-30.775 74.33h40.029v22.108h-40.029c2.355 28.222 13.507 53.894 30.775 74.314l28.284-28.285 15.631 15.633-28.284 28.269c20.403 17.278 46.108 28.45 74.329 30.789v-39.993h22.105v39.993a131.413 131.413 0 0 0 74.299-30.789l-28.286-28.269 15.631-15.633 28.318 28.285c17.268-20.421 28.419-46.093 30.772-74.331h-39.993V244.9h39.993zm-131.785 52.256c-22.762 0-41.206-18.439-41.206-41.203 0-22.761 18.444-41.202 41.206-41.202 22.758 0 41.202 18.441 41.202 41.202 0 22.764-18.445 41.203-41.202 41.203zm0-258.063c-119.788 0-216.846 97.093-216.846 216.86 0 119.754 97.059 216.845 216.846 216.845 119.751 0 216.844-97.091 216.844-216.845-.001-119.766-97.093-216.86-216.844-216.86zm0 403.067c-102.686 0-186.206-83.536-186.206-186.207 0-89.798 63.867-164.949 148.597-182.392l37.609 47.678 37.606-47.678c84.695 17.443 148.596 92.594 148.596 182.392 0 102.671-83.555 186.207-186.202 186.207z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sandbox-toys.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sandbox-toys.svg
deleted file mode 100644
index 727e62cc18..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sandbox-toys.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M169.555 79.228c-60.875 0-110.402 49.526-110.402 110.405 0 8.036 6.516 14.552 14.555 14.552 8.037 0 14.553-6.516 14.553-14.552 0-44.829 36.467-81.302 81.295-81.302 44.826 0 81.295 36.473 81.295 81.302 0 8.036 6.514 14.552 14.553 14.552 8.037 0 14.553-6.516 14.553-14.552-.002-60.879-49.525-110.405-110.402-110.405zm98.619 147.223H69.715c-6.1 0-11.049 4.947-11.049 11.049v38.675c0 6.101 4.949 11.05 11.049 11.05h198.459c6.104 0 11.049-4.949 11.049-11.05V237.5c0-6.102-4.946-11.049-11.049-11.049zM93.699 410.128c1.248 8.816 8.791 15.368 17.695 15.368H226.5c8.902 0 16.447-6.552 17.693-15.368l13.16-93.114H80.537l13.162 93.114zm350.699-255.663H352.07a8.935 8.935 0 0 0-8.934 8.935v101.263c0 4.936 4 8.935 8.934 8.935h92.328a8.934 8.934 0 0 0 8.936-8.935V163.399c0-4.933-4-8.934-8.936-8.934zM420.387 303.44h-44.303v76.498c-5.512 5.61-8.924 13.289-8.924 21.757 0 17.138 13.938 31.077 31.074 31.077 17.133 0 31.076-13.939 31.076-31.077 0-8.468-3.412-16.146-8.924-21.757V303.44zm-22.153 113.255c-8.27 0-14.998-6.728-14.998-15 0-8.271 6.729-15.001 14.998-15.001 8.271 0 15 6.729 15 15.001 0 8.273-6.728 15-15 15z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-satellite-dish.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-satellite-dish.svg
deleted file mode 100644
index 235d67c316..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-satellite-dish.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M110.866 352.532v118.48l65.93-.001v-62.069c-18.937-12.035-36.691-26.263-52.913-42.544a300.62 300.62 0 0 1-13.017-13.866zm347.686-170.178c-.391-81.529-66.613-147.484-148.334-147.484-11.055 0-20.014 8.972-20.014 20.041 0 11.054 8.959 20.03 20.014 20.03 29.988 0 56.933 12.068 76.588 31.687 19.49 19.541 31.522 46.256 31.688 76-.035.687.064 4.009.85 6.294 2.616 8.683 10.562 14.291 19.195 14.291 1.896 0 3.861-.258 5.755-.851 8.961-2.674 14.65-11.082 14.258-20.008zm-165.373-73.875c-11.051-.017-20.047 8.961-20.047 20.014 0 11.085 8.961 20.048 20.016 20.048 28.548.062 51.7 23.216 51.734 51.732 0 11.054 8.992 20.031 20.047 20.031 11.083 0 20.012-8.978 20.012-20.031-.001-50.703-41.073-91.759-91.762-91.794zm2.671 85.199H103.47l-44.566-44.679C58.71 304.526 184.643 430.787 340.172 430.98l-44.322-44.435V193.678zm-167.315 25.129h124.417l-62.287 62.288-62.13-62.288zm79.877 80.079l62.309-62.309.001 124.777-62.31-62.468z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-save.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-save.svg
deleted file mode 100644
index c4a56c7268..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-save.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M390.631 44.497c-12.884.081-24.87 3.306-36.398 8.011-11.479 4.809-22.221 11.024-31.393 20.081l-63.932 63.901c-.883.914-1.685 1.832-2.501 2.729-.833-.896-1.653-1.814-2.521-2.729l-63.932-63.901c-9.14-9.057-19.914-15.272-31.392-20.081-11.546-4.705-23.513-7.93-36.398-8.011H60.279v51.149h61.886c3.154-.101 10.351 1.32 16.825 4.119 6.541 2.613 12.641 6.67 14.782 8.979l63.948 63.948c2.306 2.152 6.362 8.271 8.994 14.778 2.763 6.408 4.169 13.508 4.119 16.713 0 .029-.016.078-.016.127v68.641h-80.414l103.908 103.91 103.877-103.875h-76.212V204.31c-.099-3.186 1.325-10.365 4.106-16.84 2.613-6.508 6.685-12.626 8.975-14.778l63.949-63.948c2.158-2.309 8.242-6.365 14.797-8.979 6.459-2.799 13.653-4.22 16.826-4.119H452.5V44.497h-61.869zm-37.33 136.48c26.767 26.817 40.094 61.629 40.126 96.601-.032 35.306-13.278 70.359-40.126 97.241-26.815 26.797-61.74 40.092-96.894 40.124-35.156-.032-70.079-13.327-96.913-40.124-26.814-26.865-40.107-61.855-40.126-97.059.019-35.073 13.343-69.966 40.111-96.783l-36.167-36.148c-36.627 36.625-55.137 84.893-55.12 132.932-.017 48.085 18.379 96.486 55.151 133.229 36.658 36.672 84.958 55.149 133.064 55.116h.113c48.025 0 96.292-18.476 132.932-55.116 36.821-36.824 55.152-85.287 55.136-133.411.017-48.019-18.54-96.19-55.136-132.749l-36.151 36.147z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-scan.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-scan.svg
deleted file mode 100644
index de0a84c4b6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-scan.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M404.57 105.592c-41.244-41.266-95.477-61.967-149.535-61.949-54.064-.018-108.296 20.684-149.54 61.949-41.745 41.73-61.961 96.664-61.935 151.076-.013 53.703 21.164 107.231 61.935 147.995 41.251 41.26 95.476 61.964 149.54 61.944h.08c54.031 0 108.23-20.704 149.455-61.944 41.265-41.249 61.967-95.476 61.947-149.54.02-54.062-20.682-108.295-61.947-149.531zm-25.443 273.623c-34.32 34.303-79.121 51.387-124.091 51.408-44.976-.021-89.777-17.1-124.09-51.408-34.01-34.021-51.386-78.254-51.401-122.547.028-45.648 16.802-91.021 51.401-125.633 34.313-34.303 79.115-51.379 124.09-51.404 44.97.025 89.777 17.102 124.091 51.404 34.301 34.305 51.379 79.112 51.399 124.088-.02 44.973-17.098 89.778-51.399 124.092zm10.853-164.598c-6.478-21.637-18.254-42.029-35.332-59.104a6.264 6.264 0 0 0-8.854 0c-2.441 2.452-2.441 6.417.006 8.856 15.322 15.316 25.928 33.537 31.881 52.89-8.026 4.086-13.535 12.401-13.535 22.026 0 11.668 8.086 21.416 18.95 24.018-1.909 30.082-14.305 59.588-37.302 82.586-25.081 25.071-57.895 37.587-90.763 37.594-32.869-.007-65.678-12.522-90.756-37.594a129.78 129.78 0 0 1-4.471-4.701 17.003 17.003 0 0 0 2.28-8.506c0-9.447-7.656-17.106-17.104-17.106-1.044 0-2.062.11-3.057.289a127.404 127.404 0 0 1-14.414-46.167c10.667-2.746 18.558-12.393 18.558-23.916 0-10.298-6.299-19.119-15.25-22.836a127.472 127.472 0 0 1 21.838-45.201l22.059 22.062a97.326 97.326 0 0 0-17.224 55.316c-.006 24.94 9.535 49.938 28.574 68.975a97.228 97.228 0 0 0 29.312 20.139c-.011.306-.046.607-.046.92 0 13.654 11.067 24.718 24.721 24.718 11.183 0 20.62-7.421 23.674-17.608 21.986-1.958 43.464-11.347 60.28-28.168 19.034-19.036 28.581-44.034 28.573-68.975.008-24.941-9.539-49.949-28.573-68.969a6.266 6.266 0 0 0-8.854 0 6.26 6.26 0 0 0 .007 8.857c16.609 16.605 24.891 38.333 24.898 60.111-.008 21.777-8.289 43.502-24.905 60.119-14.297 14.293-32.374 22.407-51.017 24.4-2.508-10.996-12.327-19.21-24.084-19.21-8.884 0-16.653 4.703-21.011 11.74-8.727-4.075-16.906-9.715-24.121-16.931-16.618-16.623-24.899-38.342-24.905-60.119.005-16.153 4.576-32.272 13.711-46.307l45.471 45.477c0 .082-.012.164-.012.244 0 13.658 11.069 24.723 24.722 24.723 13.655 0 24.723-11.064 24.723-24.723 0-13.043-10.111-23.705-22.92-24.631l-90.243-90.246c-7.028-7.028-18.421-7.028-25.45 0-7.021 7.031-7.021 18.42 0 25.445l3.719 3.721a140.088 140.088 0 0 0-25.423 52.436c-12.22 1.496-21.687 11.893-21.687 24.52 0 11.42 7.751 21.002 18.271 23.842a140.008 140.008 0 0 0 16.387 52.854 16.985 16.985 0 0 0-3.403 10.205c0 9.441 7.658 17.102 17.102 17.102 1.757 0 3.45-.268 5.046-.758a145.385 145.385 0 0 0 5.395 5.719c27.486 27.49 63.58 41.26 99.611 41.26 36.031 0 72.122-13.77 99.616-41.26 25.48-25.483 39.157-58.353 41.02-91.71 10.345-2.954 17.922-12.454 17.922-23.749-.001-13.28-10.477-24.084-23.611-24.669z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-school.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-school.svg
deleted file mode 100644
index 216a3ff764..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-school.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M94.363 423.925h322.971v29.106H94.363zm37.041-54.097h248.889v29.106H131.404zm124.75-164.59c20.357 0 36.924-16.564 36.924-36.925s-16.566-36.925-36.924-36.925c-20.361 0-36.928 16.564-36.928 36.925s16.567 36.925 36.928 36.925zm-5.922-58.401h11.838v21.573h19.605v11.839h-31.443v-33.412zm-45.634 195.899V253.67h39.412v88.974h23.68V253.67h39.412v88.881l72.031-.131-.402-221.535-122.93-61.916-122.627 62.36.402 221.537 71.022-.13zm51.556-227.44c29.279 0 53.016 23.737 53.016 53.018s-23.736 53.018-53.016 53.018c-29.281 0-53.02-23.737-53.02-53.018s23.739-53.018 53.02-53.018zm146.27 14.249l.375 205.758 59.521-11.808v-48.072h.307v-129.28zm-292.914.157l-59.832 16.441v84.019h-.305v93.333l60.512 12.044z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-screensharing.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-screensharing.svg
deleted file mode 100644
index 065d04c278..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-screensharing.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M375.853 187.912V64.959H36.746v257.146h97.83v122.947h339.101v-257.14h-97.824zM74.309 284.541v-182.02h263.99v85.391H134.575v96.629H74.309zm361.814 122.952H172.14v-182.02h263.983v182.02z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-script-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-script-alt.svg
deleted file mode 100644
index 4efc77d194..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-script-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M392.395 243.232l-13.322-13.321-71.176-71.178 20.873-20.876a57.271 57.271 0 0 0 16.82-40.602 57.305 57.305 0 0 0-16.82-40.613 57.31 57.31 0 0 0-40.604-16.82 57.325 57.325 0 0 0-40.613 16.826L122.468 182.303a58.387 58.387 0 0 0-5.165 4.59 57.332 57.332 0 0 0-16.813 40.606 57.331 57.331 0 0 0 16.819 40.606l84.497 84.494-20.876 20.871c-11.193 11.176-16.833 25.959-16.819 40.613a57.316 57.316 0 0 0 16.827 40.611 57.302 57.302 0 0 0 40.557 16.818h.054c14.63 0 29.411-5.629 40.597-16.822l.005.004 130.244-130.246a57.29 57.29 0 0 0 16.816-40.61 57.273 57.273 0 0 0-16.816-40.606zM267.308 76.354c5.782-5.766 13.255-8.608 20.857-8.622 7.601.014 15.068 2.847 20.871 8.646 5.79 5.802 8.63 13.276 8.649 20.878-.02 7.596-2.859 15.066-8.649 20.869l-8.251 8.252-87.153 87.154a57.213 57.213 0 0 0-15.112-26.645 57.2 57.2 0 0 0-26.283-15.014l95.071-95.518zm-24.895 358.601c-5.796 5.799-13.282 8.628-20.918 8.652-7.568-.024-15.034-2.861-20.823-8.652-5.795-5.793-8.637-13.274-8.65-20.871.013-7.607 2.855-15.072 8.644-20.869l20.877-20.879 7.554 7.557 13.323 13.314c5.79 5.805 8.629 13.277 8.644 20.877-.015 7.597-2.855 15.07-8.651 20.871zm130.246-130.236l-95.458 95.453c-2.439-9.779-7.424-19.085-15.047-26.701l-13.322-13.314-111.789-111.788c-5.788-5.805-8.63-13.275-8.642-20.87.012-7.603 2.854-15.077 8.642-20.872 5.803-5.795 13.27-8.634 20.878-8.656 7.594.022 15.068 2.861 20.871 8.648 5.789 5.797 8.63 13.271 8.65 20.88-.021 7.595-2.862 15.075-8.65 20.87l19.736 19.736 89.632-89.632 71.184 71.171 13.315 13.324c5.792 5.795 8.633 13.272 8.645 20.87-.012 7.6-2.853 15.074-8.645 20.881zm-91.127-101.607l-74.458 74.458 19.736 19.732 74.456-74.447-19.734-19.743zm29.779 29.783l-74.453 74.46 19.73 19.737 74.461-74.459-19.738-19.738zm-44.674 104.242l19.738 19.734 74.454-74.453-19.731-19.734-74.461 74.453z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-script.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-script.svg
deleted file mode 100644
index 224b12e0a4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-script.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M233.52 375.158l-12.11-12.105-25.437 25.428c-7.037 7.037-10.521 16.193-10.529 25.438.008 9.223 3.502 18.385 10.535 25.429 7.029 7.018 16.179 10.518 25.386 10.523 9.248-.006 18.427-3.482 25.47-10.523 7.033-7.044 10.527-16.206 10.535-25.438-.008-9.227-3.492-18.385-10.529-25.428l-13.321-13.324zM208.781 227.19l96.43-96.434 8.252-8.243c7.033-7.047 10.525-16.203 10.533-25.434-.008-9.226-3.5-18.381-10.533-25.424-7.045-7.041-16.203-10.531-25.429-10.537-9.229.006-18.394 3.498-25.423 10.527L158.395 176.338a50.868 50.868 0 0 1 35.442 14.93 50.904 50.904 0 0 1 14.944 35.922zm168.61 30.748l-13.323-13.323-75.729-75.734-94.496 94.5-10.628-10.625c7.038-7.047 10.527-16.202 10.535-25.43-.008-9.228-3.497-18.393-10.535-25.428-7.043-7.043-16.205-10.527-25.428-10.537-9.232.01-18.391 3.494-25.432 10.537-7.037 7.041-10.522 16.2-10.53 25.428.008 9.228 3.493 18.383 10.538 25.43l111.785 111.786 13.316 13.317a50.881 50.881 0 0 1 14.934 36.049c0 .174-.023.342-.025.513l105.018-105.016c7.112-7.131 10.648-16.396 10.654-25.743-.006-9.329-3.534-18.6-10.654-25.724zm-140.6 48.429l-17.713-17.708 74.459-74.452 17.707 17.709-74.453 74.451zm41.15 41.157l-17.707-17.71 74.46-74.452 17.706 17.705-74.459 74.457z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-scull.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-scull.svg
deleted file mode 100644
index fc2d5cc4b2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-scull.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M402.109 295.102c5.184-15.395 25.376-46.526 25.376-99.526 0-52.996-65.503-131.134-171.113-131.134-105.626 0-171.077 78.138-171.077 131.134 0 53 20.16 84.131 25.329 99.526 10.511 31.41-2.062 46.77-2.062 46.77s3.763 32.367 14.063 46.652c10.316 14.275 60.727-9.527 60.727 44.393 0 0 20.257 14.47 73.496 14.47 53.207 0 72.564-14.47 72.564-14.47 0-53.92 50.41-30.117 60.728-44.393 10.317-14.285 14.062-46.652 14.062-46.652s-12.591-15.36-2.093-46.77zm-197.373 40.71c-11.249 6.101-29.643 11.096-40.894 11.096-11.264 0-22.921-7.336-25.932-16.275-3.023-8.947-3.843-25.28-1.864-36.308 1.98-10.995 15.648-23.986 30.413-28.86 14.75-4.881 33.83-3.84 42.43 2.281 8.568 6.146 15.73 21.494 15.94 34.083.2 12.591-8.844 27.896-20.093 33.983zm51.621 54.427c-18.477 0-22.779-6.829-22.779-6.829s1.882-54.673 22.779-54.673c20.896 0 22.81 54.673 22.81 54.673s-4.334 6.829-22.81 6.829zm118.48-59.606c-2.993 8.939-14.667 16.275-25.917 16.275-11.266 0-29.66-4.995-40.911-11.096-11.248-6.088-20.29-21.393-20.079-33.983.213-12.589 7.376-27.937 15.943-34.083 8.584-6.121 27.664-7.162 42.413-2.281 14.766 4.874 28.45 17.865 30.431 28.86 1.976 11.028 1.143 27.361-1.88 36.308z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-search.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-search.svg
deleted file mode 100644
index 1e0715b800..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-search.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M470.704 407.906l-2.691-2.689.006-.002-107.514-107.523c14.938-25.733 23.616-55.565 23.82-87.451.626-97.615-77.99-177.243-175.599-177.857l-1.168-.002c-97.06.005-176.067 78.392-176.692 175.598-.618 97.609 77.999 177.236 175.597 177.859.389.002.766.004 1.155.004 32.442 0 62.846-8.79 88.998-24.075L404.035 469.2l.01-.01 2.686 2.686c8.125 8.124 21.293 8.117 29.414 0l34.56-34.554c8.115-8.117 8.121-21.293-.001-29.416zm-263.956-67.135c-72.589-.466-131.271-59.907-130.812-132.502C76.4 136.14 135.45 77.457 207.561 77.453l.88.002c35.167.22 68.144 14.124 92.851 39.148 24.705 25.025 38.188 58.178 37.962 93.352-.222 35.015-14.027 67.893-38.867 92.564-24.834 24.67-57.78 38.252-92.768 38.252h-.871z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-security-camera.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-security-camera.svg
deleted file mode 100644
index 09bb6613aa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-security-camera.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M395.869 91.516L73.502 245.323l111.799 44.392 248.553-118.588zm6.387 204.508v44.31h-57.147v-39.48l29.102-13.882-10.383-21.761 65.088-31.051-11.861-24.861-197.506 94.235 11.863 24.856 47.42-22.627 10.385 21.76 19.652-9.377v58.427h93.387v43.911h36.24v-124.46z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sensor.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sensor.svg
deleted file mode 100644
index a73de18bb1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sensor.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M342.238 170.195l-36.834 36.836c13.08 13.078 20.283 30.467 20.283 48.967s-7.205 35.889-20.284 48.971l36.836 36.834c22.919-22.918 35.542-53.393 35.542-85.805 0-32.414-12.622-62.887-35.543-85.803zm58.774-60.572l-36.836 36.838c60.4 60.4 60.4 158.68 0 219.082l36.836 36.834c80.71-80.711 80.71-212.039 0-292.754zm-194.414 97.408l-36.834-36.836c-22.921 22.916-35.543 53.389-35.543 85.803 0 32.412 12.622 62.887 35.542 85.807l36.836-36.838c-13.081-13.08-20.284-30.469-20.284-48.969-.001-18.498 7.203-35.889 20.283-48.967zm-58.774-60.57l-36.837-36.838c-80.709 80.713-80.709 212.043 0 292.754l36.837-36.834c-60.4-60.402-60.4-158.684 0-219.082zM217.172 256a37.494 37.494 0 1 1 74.988 0 37.494 37.494 0 1 1-74.988 0z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-server-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-server-alt.svg
deleted file mode 100644
index e1d6a449a5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-server-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.399 374.473c-51.539 0-100.38-6.965-137.526-19.617-19.656-6.689-34.142-14.323-44.721-22.303v73.543c0 19.282 25.801 36.514 66.316 47.894 31.494 8.862 71.897 14.177 115.931 14.177 100.656 0 182.229-27.794 182.229-62.07v-73.543c-10.595 7.979-25.065 15.613-44.72 22.303-37.132 12.651-85.99 19.616-137.509 19.616zm182.229-84.923v-75.572c-10.595 7.946-25.065 15.598-44.72 22.285-37.132 12.638-85.99 19.604-137.509 19.604-51.539 0-100.38-6.966-137.526-19.604-19.656-6.688-34.159-14.339-44.721-22.285v75.572c6.051 32.44 85.529 58.112 182.247 58.112 96.697 0 176.196-25.672 182.229-58.112zM74.152 169.895c4.449 32.928 84.452 59.156 182.247 59.156 97.776 0 177.784-26.229 182.229-59.156v-64.343c0-34.286-81.573-62.07-182.229-62.07-100.673 0-182.247 27.784-182.247 62.07v64.343z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-server.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-server.svg
deleted file mode 100644
index 04636e254a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-server.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M36.586 169.321v85.236h439.609v-85.236H36.586zm55.983 62.057H67.62V197.73h24.95v33.648zm60.956 0h-24.918V197.73h24.918v33.648zm60.991 0H189.58V197.73h24.936v33.648zm212.039 1.405c-10.859 0-19.654-8.791-19.654-19.649 0-10.848 8.795-19.64 19.654-19.64 10.855 0 19.651 8.792 19.651 19.64 0 10.858-8.796 19.649-19.651 19.649zm-156.66 155.582H244.96v58.223H44.09v24.938h426.676v-24.938H269.895v-58.223zm92.513-347.041H150.321l-86.79 97.347h385.717l-86.84-97.347zM36.586 370.492h439.609v-85.227H36.586v85.227zm389.969-61.054c10.855 0 19.651 8.788 19.651 19.64 0 10.854-8.796 19.647-19.651 19.647-10.859 0-19.654-8.794-19.654-19.647-.001-10.851 8.794-19.64 19.654-19.64zm-236.975 4.248h24.936v33.645H189.58v-33.645zm-60.973 0h24.918v33.645h-24.918v-33.645zm-60.987 0h24.95v33.645H67.62v-33.645z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings-alt-2.svg
deleted file mode 100644
index da84deb9e5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings-alt-2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M414.21 287.29v-62.577h-42.395a119.121 119.121 0 0 0-11.832-28.448l30.012-30.011-44.25-44.249-30.01 30.01a119.215 119.215 0 0 0-28.447-11.83V97.791h-62.576v42.394a119.234 119.234 0 0 0-28.445 11.83l-30.012-30.01-44.25 44.249 30.01 30.011a119.116 119.116 0 0 0-11.83 28.448H97.79v62.577h42.395a119.183 119.183 0 0 0 11.832 28.449l-30.012 30.01 44.25 44.249 30.012-30.011a119.106 119.106 0 0 0 28.445 11.828v42.395h62.576v-42.395a119.087 119.087 0 0 0 28.447-11.828l30.01 30.011 44.25-44.249-30.012-30.01a119.265 119.265 0 0 0 11.832-28.449h42.395zm-158.209 26.112c-31.652 0-57.404-25.752-57.404-57.405 0-31.649 25.752-57.399 57.404-57.399s57.404 25.75 57.404 57.399c0 31.653-25.752 57.405-57.404 57.405z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings-alt.svg
deleted file mode 100644
index ab9eb44951..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M284.859 300.655l9.021-21.78 38.209-13.684v-31.579l-4.461-1.46-33.811-11.035-9.02-21.784 17.34-36.692-22.334-22.331-4.182 2.125-31.711 16.104-21.775-9.021-13.689-38.214h-31.582l-1.451 4.463-11.039 33.811-21.773 9.02-36.705-17.338-22.328 22.333 2.129 4.179 16.1 31.718-9.016 21.766-38.219 13.686v31.588l4.461 1.452 33.811 11.04 9.021 21.775-17.34 36.696 22.326 22.336 4.184-2.128 31.711-16.1 21.779 9.022 13.68 38.21h31.584l1.459-4.465 11.041-33.808 21.777-9.019 36.695 17.343 22.334-22.339-2.123-4.181-16.103-31.709zm-91.531-6.363c-24.424 0-44.227-19.797-44.227-44.224 0-24.427 19.803-44.227 44.227-44.227 24.418 0 44.219 19.8 44.219 44.227 0 24.428-19.801 44.224-44.219 44.224zm242.791 23.432a57.989 57.989 0 0 0-18.26-38.319l2.096-25.743-30.906-10.955-14.584 21.315a58.01 58.01 0 0 0-38.318 18.266l-25.746-2.095-10.949 30.904 21.314 14.585A58.007 58.007 0 0 0 339.028 364l-2.094 25.744 30.902 10.953 14.588-21.315a57.984 57.984 0 0 0 38.314-18.264l25.746 2.094 10.951-30.903-21.316-14.585zm-34.416 12.226c-4.551 12.845-18.66 19.569-31.508 15.015-12.85-4.555-19.572-18.659-15.016-31.506 4.555-12.852 18.66-19.572 31.508-15.022 12.848 4.554 19.573 18.661 15.016 31.513z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings.svg
deleted file mode 100644
index 6311ad6122..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-settings.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M469.92 279.717v-48.898l-6.906-2.256-52.35-17.091-13.971-33.728 26.852-56.814-34.586-34.581-6.477 3.288-49.1 24.937-33.721-13.971-21.198-59.171h-48.899l-2.253 6.912-17.091 52.352-33.712 13.966-56.833-26.849-34.573 34.58 3.287 6.474 24.933 49.116-13.96 33.707-59.182 21.189v48.909l6.914 2.253 52.352 17.094 13.966 33.718-26.845 56.82 34.567 34.587 6.484-3.294 49.103-24.931 33.719 13.968 21.188 59.165h48.902l2.26-6.908 17.094-52.35 33.721-13.967 56.818 26.855 34.584-34.59-3.286-6.48-24.937-49.094 13.969-33.726 59.167-21.191zM255.054 324.78c-37.819 0-68.478-30.657-68.478-68.479 0-37.819 30.659-68.481 68.478-68.481 37.819 0 68.475 30.662 68.475 68.481 0 37.822-30.656 68.479-68.475 68.479z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share-alt-2.svg
deleted file mode 100644
index 6f220aaa6d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share-alt-2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M386.075 257.393c-12.787 0-23.848 8.894-26.596 21.381-7.811 35.521-32.711 62.957-64.156 75.589-.19.075-.374.154-.564.229-1.061.422-2.139.803-3.215 1.188-.689.245-1.375.499-2.07.729-.582.196-1.174.372-1.762.557-1.199.375-2.402.75-3.615 1.081-.084.022-.166.043-.252.067-32.787 8.884-69.278 1.925-96.928-21.836-11.406-9.798-28.597-8.501-38.4 2.907-9.801 11.405-8.501 28.599 2.905 38.398 20.838 17.906 44.988 29.506 70.115 34.987l-.006.028c1.934.425 3.865.76 5.801 1.111.318.057.636.127.959.182 2.193.387 4.383.709 6.57.999.111.017.221.032.334.047 6.975.917 13.926 1.422 20.816 1.422 17.027 0 33.666-2.751 49.402-7.878.562-.184 1.117-.381 1.678-.57a158.169 158.169 0 0 0 4.818-1.71 157.01 157.01 0 0 0 3.455-1.315c.47-.188.937-.391 1.404-.586 21.033-8.574 40.5-21.734 56.832-39.363.732-.788 1.458-1.59 2.176-2.394.622-.698 1.27-1.359 1.879-2.07.159-.182.289-.381.439-.566a159.283 159.283 0 0 0 28.303-48.152h56.078v-54.462h-76.4zm-233.578-24.142c3.776-17.169 11.568-32.78 22.643-45.804.154-.174.326-.324.478-.501a107.133 107.133 0 0 1 10.844-10.921 107.529 107.529 0 0 1 12.437-9.283 106.502 106.502 0 0 1 24.911-11.709 106.76 106.76 0 0 1 24.184-4.686c5.172-.39 10.311-.398 15.393-.054 5.125.369 15.373 2.187 15.373 2.187 16.928 3.701 32.781 11.554 46.291 23.165 11.409 9.805 28.599 8.504 38.4-2.905 9.803-11.405 8.504-28.598-2.904-38.399-26.555-22.819-59.068-36.067-93.387-38.389a158.691 158.691 0 0 0-61.136 7.563c-18.676 6.082-36.007 15.574-51.286 28.059a169.65 169.65 0 0 0-2.176 1.793c-.801.682-1.605 1.363-2.396 2.062-20.09 17.555-35.359 39.683-44.604 64.743H49.524v54.462H125.9c12.786.001 23.852-8.896 26.597-21.383zm44.175 22.764c0 32.653 26.557 59.13 59.312 59.13 32.76 0 59.321-26.477 59.321-59.13 0-32.652-26.561-59.127-59.321-59.127-32.755 0-59.312 26.474-59.312 59.127z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share-alt.svg
deleted file mode 100644
index 7cff7b3840..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M109.398 342.752c-34.338 0-62.168 27.829-62.168 62.13 0 34.387 27.83 62.2 62.168 62.2 34.367 0 62.197-27.813 62.197-62.2.001-34.301-27.829-62.13-62.197-62.13zm16.025-97.826l-11.642 46.287v1.344c26.617-.821 53.498 8.829 73.809 29.165 20.34 20.311 29.986 47.193 29.198 73.809h.034l47.615-10.445c-1.767-35.398-15.93-70.329-42.906-97.306-26.717-26.702-61.086-40.81-96.108-42.854zm50.261-200.069l-12.062 47.854c61.475 9.534 120.601 37.655 167.983 85.044 48.858 48.837 77.212 110.253 85.808 173.826l48.141-10.562C443.412 189.886 325.782 70.131 175.684 44.857zm-24.788 98.623l-12.59 50.116c43.852 4.743 86.462 23.661 120.111 57.296 34.336 34.337 53.5 78.027 57.688 122.891l50.362-11.033c-6.576-55.951-31.363-107.74-71.783-148.122-39.372-39.393-89.534-63.803-143.788-71.148z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share.svg
deleted file mode 100644
index 2e4584a775..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-share.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M329.047 331.74a70.262 70.262 0 0 0-30.949 7.142l-54.123-54.129a70.3 70.3 0 0 0 6.216-28.953 70.31 70.31 0 0 0-6.218-28.96l53.899-53.899a70.258 70.258 0 0 0 31.175 7.259c38.983 0 70.581-31.603 70.581-70.583s-31.598-70.579-70.581-70.579c-38.979 0-70.576 31.599-70.576 70.579a70.364 70.364 0 0 0 5.23 26.682l-55.138 55.136a70.325 70.325 0 0 0-28.952-6.214c-38.981 0-70.58 31.598-70.58 70.58s31.599 70.579 70.58 70.579a70.234 70.234 0 0 0 28.952-6.214L263.8 375.4a70.33 70.33 0 0 0-5.329 26.923c0 38.98 31.597 70.579 70.576 70.579 38.983 0 70.581-31.599 70.581-70.579 0-38.981-31.598-70.583-70.581-70.583z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sharing-iphone.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sharing-iphone.svg
deleted file mode 100644
index 04d34e0fe3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sharing-iphone.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M155.931 327.997S173 255.414 307.895 255.414v65.603L436.56 214.805 307.896 108.618v63.573c-22.466-.587-140.7 3.761-151.965 155.806zm190.093 40.665H111.129V204.304h66.876c9.728-11.185 20.864-20.865 33.421-28.861 3.417-2.191 6.881-4.182 10.332-6.031H76.22v234.14h304.714V291.03l-34.91 28.809v48.823z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shield.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shield.svg
deleted file mode 100644
index f34195c7d4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shield.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M100.985 99.107c132.819 0 153.603-52.337 153.603-52.337s20.28 52.337 153.607 52.337v214.628c0 84.827-153.607 152.104-153.607 152.104s-153.603-67.276-153.603-152.104V99.107z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shift.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shift.svg
deleted file mode 100644
index 3d6f9aea9d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shift.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.065 98.396l183.224 196.959h-82.807v117.392H154.645V295.354H71.842L255.065 98.396m0 36.764L129.333 270.318H179.682v117.387h150.761V270.318h50.353L255.065 135.16z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shipping-box.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shipping-box.svg
deleted file mode 100644
index 66e12cea40..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shipping-box.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M376.106 135.832H135.012v44.769h241.094v-44.769zM135.012 376.93h241.094v-44.762H135.012v44.762zm241.094-113.512H135.012v54.673h241.094v-54.673zm0-68.746H135.012v54.676h241.094v-54.676zm-253.639 207.11l-45.125 45.12h356.442l-45.118-45.12H122.467zM400.97 123.284v266.2l45.12 45.122V78.156l-45.12 45.128zm-12.305-12.305l45.118-45.121H77.344l45.121 45.121h266.2zm-278.505 12.3l-45.121-45.12v356.444l45.121-45.121V123.279z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shipping.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shipping.svg
deleted file mode 100644
index 102cb0be70..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shipping.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M316.074 329.032c.867 0 1.732.064 2.582.079L158.844 125.66c-10.726-13.637-26.849-20.797-42.839-20.767a54.147 54.147 0 0 0-33.585 11.608l-50.017 39.312L64.01 196.02l50-39.293c.622-.475 1.179-.654 1.995-.688 1.112.033 1.995.438 2.601 1.209l149.168 189.865c12.997-11.278 29.955-18.065 48.3-18.081zm131.136-85.744l-112.301 88.18c18.151 4.774 33.309 16.172 43.086 31.217l100.802-79.174-31.587-40.223zM321.96 354.346a44.398 44.398 0 0 0-5.886-.374c-24.363 0-45.421 18.228-48.397 43.014-3.206 26.751 15.874 51.05 42.641 54.287a51.47 51.47 0 0 0 5.886.361c24.365 0 45.426-18.214 48.434-43.006 3.206-26.787-15.894-51.076-42.678-54.282zm139.376-163.084L358.21 59.978 226.93 163.104l103.139 131.281 131.267-103.123zm-113.084-65.043l37.559 47.807-22.531 17.695-37.559-47.795 22.531-17.707z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shoe.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shoe.svg
deleted file mode 100644
index f784c832a6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shoe.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M384.793 242.506c-24.33 0-41.48-6.568-41.48-6.568l-143.608-82.246-48.171 38.409-90.158-7.669c-25.654 0-26.767 45.707-26.767 45.707v79.222h435.945c0-.001 6.884-66.855-85.761-66.855zM220.06 193.161c-1.422 5.73-7.244 9.237-12.999 7.8-5.738-1.437-9.239-7.26-7.799-13.017 1.423-5.736 7.244-9.236 13-7.792 5.738 1.432 9.236 7.246 7.798 13.009zm40.321 22.567c-1.439 5.755-7.276 9.252-13.014 7.816-5.739-1.447-9.239-7.252-7.783-13.018 1.406-5.729 7.242-9.238 12.998-7.79 5.756 1.431 9.236 7.25 7.799 12.992zm38.719 21.69c-1.439 5.746-7.262 9.246-13.016 7.805-5.738-1.438-9.256-7.252-7.797-12.997 1.437-5.757 7.257-9.247 12.997-7.815 5.757 1.445 9.255 7.25 7.816 13.007zM34.609 327.491v30.644h437.793v-30.644H34.609z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket-alt-2.svg
deleted file mode 100644
index 06beb2dc40..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket-alt-2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M199.17 220.037c0-11.993 3.6-23.389 10.303-33.012H43.381v65.881h166.025c-6.636-9.607-10.236-20.944-10.236-32.869zm173.093-33.012L306.4 252.906h162.952v-65.881h-97.089zM114.834 470.889h283.064l40.844-181.026H74.022l40.812 181.026zm142.352-217.983c8.468 0 16.938-3.225 23.412-9.669l142.777-142.773c12.949-12.935 12.918-33.888 0-46.821-12.918-12.919-33.881-12.919-46.83 0L233.77 196.424c-12.918 12.918-12.918 33.889 0 46.787 6.473 6.47 14.944 9.695 23.416 9.695z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket-alt.svg
deleted file mode 100644
index 5cdd20bf19..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M198.664 161.585l-.005-.006s-.006-.065-.03-.437a147.748 147.748 0 0 1-.216-8.293c-.066-11.91 1.413-33.954 8.334-50.872 3.407-8.498 7.999-15.48 13.565-20.059 5.634-4.538 12.123-7.381 22.623-7.475h25.036c10.6.104 17.123 3.033 22.855 7.782 8.52 7.062 14.715 20.391 18.013 34.776 3.379 14.284 4.059 29.022 4.043 37.48 0 2.375-.045 4.256-.092 5.516-.028.627-.046 1.106-.06 1.399-.018.301-.023.35-.018.35l30.712 2.042c.016-.284.238-3.735.238-9.307-.069-13.335-1.102-38.549-10.403-62.546-4.704-11.974-11.637-23.883-22.485-33.149-10.771-9.299-25.656-15.219-42.804-15.116h-25.036c-16.848-.099-31.511 5.544-42.241 14.533-16.178 13.552-23.803 32.524-28.089 49.949-4.221 17.538-4.954 34.179-4.97 44.695 0 6.62.316 10.785.339 11.105l30.691-2.367zm185.701 28.729H126.94l-20.033 277.87h297.489l-20.031-277.87z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket.svg
deleted file mode 100644
index 71cdd1de20..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shopping-basket.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M408.991 400.004c-17.772 0-32.183 14.405-32.183 32.18 0 17.777 14.41 32.187 32.183 32.187 17.774 0 32.185-14.409 32.185-32.187 0-17.775-14.41-32.18-32.185-32.18zm-253.141 0c-17.774 0-32.18 14.405-32.18 32.18 0 17.777 14.406 32.187 32.18 32.187 17.776 0 32.186-14.409 32.186-32.187 0-17.775-14.41-32.18-32.186-32.18zm230.866-128.459l73.421-73.417V97.693h-315.22l-18.358-50.098H73.497c-13.136 0-23.789 10.647-23.789 23.79 0 13.133 10.653 23.784 23.789 23.784h19.826l64.049 174.794-34.105 105.721h309.034c13.133 0 23.781-10.649 23.781-23.784 0-13.143-10.648-23.791-23.781-23.791H188.604l18.247-56.562h179.865z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shorts.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shorts.svg
deleted file mode 100644
index e3f8ab2625..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shorts.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M221.72 421.579l34.662-201.949 34.598 201.949h115.094l-21.826-274.453V90.181H129.254v47.286l-22.595 284.112z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shuffle.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shuffle.svg
deleted file mode 100644
index 546f0a2965..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-shuffle.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M346.724 197.79l35.438.007v48.204l89.522-73.886-89.522-73.885v48.205h-56.624l-46.73 46.446 36.209 36.433 31.707-31.524zm34.905 116.331h-39.592L168.019 140.105H33.328v51.362h113.413l174.02 174.02h60.868v48.204l89.521-73.887-89.521-73.886v48.203zm-224.401.002H33.331v51.36h145.176l43.485-43.485-36.314-36.321-28.45 28.446z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sience.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sience.svg
deleted file mode 100644
index e692a2ec0c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sience.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M415.374 266.682a273.835 273.835 0 0 0-10.042-10.844 303.337 303.337 0 0 0 10.042-10.849c41.496-47.631 38.098-78.668 27.895-96.312-7.36-12.733-23.909-27.896-60.99-27.896-14.978 0-32.212 2.503-50.788 7.2C317.105 77.7 292.84 41.482 257.62 41.482c-35.189 0-59.452 36.218-73.84 86.499-18.607-4.697-35.842-7.2-50.787-7.2-37.082 0-53.63 15.163-60.99 27.896-17.593 30.482 1.639 69.61 37.938 107.161-36.299 37.543-55.53 76.656-37.938 107.159 7.36 12.725 23.908 27.896 60.99 27.896 14.945 0 32.18-2.519 50.787-7.191 14.388 50.259 38.65 86.461 73.84 86.461 35.22 0 59.485-36.202 73.871-86.461 18.576 4.673 35.811 7.191 50.788 7.191 37.081 0 53.63-15.171 60.99-27.896 10.203-17.659 13.601-48.701-27.895-96.315zm-282.382 99.29c-19.359 0-33.321-5.003-39.371-15.433-10.043-17.389 4.02-46.267 34.302-77.48 12.886 11.526 27.143 22.711 42.152 33.342 1.669 18.278 4.22 36.222 7.784 53.098-16.808 4.217-32.047 6.473-44.867 6.473zm35.09-91.981c-7.816-6.032-15.207-12.102-22.04-18.153 6.833-6.045 14.224-12.132 22.04-18.176a672.554 672.554 0 0 0-.263 18.164c0 6.049.099 12.117.263 18.165zm1.993-68.707c-15.01 10.599-29.267 21.795-42.152 33.321-30.282-31.223-44.345-60.07-34.302-77.464 6.05-10.47 20.012-15.439 39.371-15.439 12.82 0 28.059 2.225 44.867 6.441-3.564 16.908-6.115 34.862-7.784 53.141zm148.072-17.888a570.477 570.477 0 0 0-15.628-9.336c-5.267-3.058-10.565-5.969-15.894-8.812 9.188-3.793 18.149-7.162 26.814-10.071 1.834 8.961 3.404 18.391 4.708 28.219zM257.619 66.434c20.112 0 38.032 26.634 49.936 68.459-16.057 5.281-32.831 11.92-49.936 19.834-17.07-7.914-33.846-14.553-49.936-19.834 11.936-41.826 29.858-68.459 49.936-68.459zm-55.79 92.742c8.666 2.909 17.628 6.278 26.786 10.071-5.301 2.844-10.596 5.755-15.895 8.812a558.124 558.124 0 0 0-15.602 9.336c1.312-9.827 2.88-19.257 4.711-28.219zm-4.71 165.11a551.484 551.484 0 0 0 15.602 9.325c5.299 3.071 10.594 5.979 15.895 8.816-9.158 3.762-18.12 7.16-26.786 10.038-1.832-8.925-3.4-18.364-4.711-28.179zm60.5 120.953c-20.078 0-38-26.648-49.936-68.476 16.09-5.266 32.865-11.902 49.936-19.817 17.104 7.915 33.879 14.552 49.936 19.817-11.904 41.828-29.824 68.476-49.936 68.476zm55.821-92.773c-8.665-2.878-17.627-6.276-26.814-10.07a420.505 420.505 0 0 0 15.894-8.784 619.711 619.711 0 0 0 15.628-9.325c-1.305 9.814-2.875 19.253-4.708 28.179zm7.848-59.886a535.436 535.436 0 0 1-31.226 19.444c-10.893 6.28-21.717 12.067-32.443 17.295-10.693-5.228-21.519-11.015-32.441-17.295a546.668 546.668 0 0 1-31.195-19.421 559.028 559.028 0 0 1 0-73.521 548.16 548.16 0 0 1 31.195-19.423 545.816 545.816 0 0 1 32.441-17.317 526.922 526.922 0 0 1 32.443 17.317 549.492 549.492 0 0 1 31.226 19.423 557.175 557.175 0 0 1 1.211 36.744c0 12.571-.424 24.871-1.211 36.754zm60.99-146.878c19.361 0 33.354 4.97 39.371 15.439 10.072 17.364-4.021 46.241-34.269 77.433-12.658-11.317-26.85-22.532-42.22-33.32-1.634-18.278-4.219-36.203-7.751-53.11 16.812-4.217 32.049-6.442 44.869-6.442zm-35.122 91.96c7.849 6.044 15.239 12.131 22.074 18.176-6.835 6.052-14.226 12.121-22.074 18.153a562.757 562.757 0 0 0 0-36.329zm74.493 112.877c-6.017 10.43-20.01 15.433-39.371 15.433-12.82 0-28.058-2.256-44.868-6.474 3.532-16.876 6.117-34.787 7.751-53.098 15.37-10.797 29.562-22.01 42.22-33.307 30.247 31.209 44.341 60.057 34.268 77.446zm-164.03-125.404c-16.907 0-30.674 13.751-30.674 30.691 0 16.955 13.767 30.69 30.674 30.69 16.972 0 30.705-13.735 30.705-30.69 0-16.94-13.733-30.691-30.705-30.691z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-simcard.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-simcard.svg
deleted file mode 100644
index a65fc9ffb5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-simcard.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M340.908 89.496H171.841c-13.343 0-24.167 10.826-24.167 24.167v308.703l142.417.032 74.968-74.971V113.663c.001-13.341-10.825-24.167-24.151-24.167zm-65.582 182.281h-39.767v-90.703h91.402v39.782h-51.635v50.921zm-93.217-90.703h35.988v39.782h-35.988v-39.782zm53.45-17.443v-36.725h39.767v36.725h-39.767zm91.402-18.215v18.215h-34.189v-36.725h15.664c10.218.001 18.525 8.293 18.525 18.51zm-126.344-18.509h17.48v36.725h-35.988v-18.215c0-10.218 8.288-18.51 18.508-18.51zm-18.508 126.359v-14.945h35.988v33.457h-17.48c-10.22-.001-18.508-8.309-18.508-18.512zm126.327 18.511h-15.664v-33.472h34.189v14.96c0 10.204-8.307 18.512-18.525 18.512z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-single-note.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-single-note.svg
deleted file mode 100644
index f98a14c285..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-single-note.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M279.385 372.145v.031c-.197 26.161-23.824 51.765-57.719 60.267-38.557 9.647-75.835-6.507-83.226-36.101-7.407-29.596 17.854-61.415 56.409-71.062 17.364-4.346 34.437-3.4 48.661 1.605l-.032-257.282 27.664.084s-1.765 20.502 23.152 45.422c27.765 27.729 86.446 42.872 81.855 111.87-2.39 35.545-32.084 90.88-32.084 90.88l-10.071-10.075s7.293-16.219 13.933-64.324c6.67-48.068-68.543-57.552-68.543-57.552v186.237z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sitemap.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sitemap.svg
deleted file mode 100644
index 0cbd6659a4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sitemap.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M429.595 310.486V232.87H270.554v-52.116h32.259V87.127h-93.628v93.627h32.259v52.116H82.403v77.616H50.142v93.628h93.629v-93.628h-32.26v-48.512h129.933v48.512h-32.259v93.628h93.628v-93.628h-32.259v-48.512h129.937v48.512h-32.262v93.628h93.629v-93.628z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sleep.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sleep.svg
deleted file mode 100644
index c85ac0dc8a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sleep.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M329.983 399.502c-120.081 0-217.416-97.331-217.416-217.422 0-45.978 14.272-88.622 38.636-123.741-56.591 39.248-93.658 104.678-93.658 178.765 0 120.08 97.336 217.412 217.417 217.412 74.086 0 139.522-37.064 178.765-93.656-35.123 24.367-77.766 38.642-123.744 38.642z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-slideshow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-slideshow.svg
deleted file mode 100644
index 484e86cd28..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-slideshow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M262.87 71.692V35.216h-25.04v36.476H35.939v64.594h22.144v243.906h154.286l-93.862 76.862 15.86 19.371 117.519-96.233h.833l117.521 96.233 15.863-19.378-93.868-76.855h153.682V136.286h26.691V71.692H262.87zm158.007 283.461H83.121V136.286h337.756v218.867zm-255.558-56.386v-65.084h65.084c0-35.942-29.138-65.082-65.084-65.082-35.942 0-65.079 29.139-65.079 65.082 0 35.944 29.137 65.084 65.079 65.084zm18.285 17.749c35.942 0 65.084-29.141 65.084-65.087h-65.084v65.087zm199.057-133.627h-83.242v25.039h83.242v-25.039zm0 45.955h-83.242v25.036h83.242v-25.036zm0 45.952h-83.242v25.046h83.242v-25.046z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-smiley-inverted.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-smiley-inverted.svg
deleted file mode 100644
index 8c2bc19928..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-smiley-inverted.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.636 38.102c-120.065 0-217.417 97.352-217.417 217.431 0 120.049 97.352 217.433 217.417 217.433 120.077 0 217.416-97.384 217.416-217.433 0-120.08-97.339-217.431-217.416-217.431zm0 409.916c-106.136 0-192.482-86.367-192.482-192.485 0-106.147 86.347-192.517 192.482-192.517 106.134 0 192.499 86.369 192.499 192.517 0 106.117-86.365 192.485-192.499 192.485zm52.649-192.455c13.08 0 23.674-10.562 23.674-23.642v-49.183c0-13.081-10.594-23.676-23.674-23.676s-23.692 10.595-23.692 23.676v49.183c0 13.08 10.612 23.642 23.692 23.642zm-105.281 0c13.062 0 23.691-10.562 23.691-23.642v-49.183c0-13.081-10.629-23.676-23.691-23.676-13.099 0-23.68 10.595-23.68 23.676v49.183c0 13.08 10.581 23.642 23.68 23.642zm191.222 56.351l-25.539-25.545c-4.875-4.838-12.771-4.838-17.642 0-4.856 4.873-4.856 12.753 0 17.597l4.412 4.414c-28.663 24.688-64.208 37.055-99.854 37.055-35.533 0-70.931-12.301-99.53-36.827l4.139-4.116c4.857-4.878 4.857-12.756 0-17.664-4.873-4.837-12.771-4.837-17.66 0L117.046 312.4c-4.871 4.842-4.871 12.751 0 17.629 2.454 2.417 5.624 3.666 8.812 3.666 3.189 0 6.394-1.249 8.829-3.666l4.447-4.48c4.824 7.357 11.938 16.81 21.632 26.389 20.063 19.815 51.98 40.059 96.341 40.027h.179c44.312 0 75.525-20.274 94.854-40.223 9.253-9.452 15.94-18.868 20.503-26.193l3.958 3.988c2.418 2.418 5.605 3.633 8.81 3.633a12.45 12.45 0 0 0 8.815-3.633c4.856-4.871 4.856-12.787 0-17.623z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-smiley.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-smiley.svg
deleted file mode 100644
index 5504a545cd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-smiley.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.393 38.396c-120.08 0-217.404 97.318-217.404 217.398 0 120.052 97.324 217.438 217.404 217.438s217.434-97.387 217.434-217.438c-.001-120.08-97.354-217.398-217.434-217.398zm28.972 144.657c0-13.096 10.598-23.696 23.676-23.696s23.676 10.601 23.676 23.696v49.135c0 13.078-10.598 23.675-23.676 23.675s-23.676-10.597-23.676-23.675v-49.135zm-105.299 0c0-13.096 10.596-23.696 23.674-23.696 13.082 0 23.709 10.601 23.709 23.696v49.135c0 13.078-10.627 23.675-23.709 23.675-13.078 0-23.674-10.597-23.674-23.675v-49.135zm214.915 146.746c-2.417 2.455-5.592 3.666-8.798 3.666-3.205 0-6.408-1.211-8.83-3.666l-3.956-3.971c-4.544 7.371-11.247 16.725-20.503 26.209-19.297 19.93-50.525 40.227-94.801 40.227h-.197c-44.377.03-76.293-20.243-96.372-40.062-9.712-9.564-16.808-19.002-21.616-26.373l-4.48 4.463a12.32 12.32 0 0 1-8.796 3.664c-3.204 0-6.377-1.21-8.831-3.664-4.839-4.838-4.839-12.754 0-17.624l25.542-25.522a12.419 12.419 0 0 1 17.626 0c4.871 4.852 4.871 12.771 0 17.623l-4.121 4.103c28.58 24.563 63.998 36.84 99.512 36.84 35.643 0 71.189-12.378 99.869-37.036l-4.414-4.414c-4.87-4.869-4.87-12.771 0-17.622 4.873-4.861 12.757-4.861 17.627 0l25.54 25.522c4.873 4.881 4.873 12.782-.001 17.637z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-snow.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-snow.svg
deleted file mode 100644
index 2ba7134a91..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-snow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M157.138 286.452h198.237c35.547 0 64.291-28.815 64.291-64.314 0-28.793-18.901-53.122-44.932-61.33a78.517 78.517 0 0 0 2.485-19.539c0-42.575-34.501-77.077-77.077-77.077-32.016 0-59.452 19.509-71.094 47.288-10.039-11.773-24.918-19.229-41.597-19.229-30.12 0-54.516 24.424-54.516 54.541 0 5.187.72 10.188 2.06 14.945-24.623 9.011-42.151 32.654-42.151 60.401.001 35.499 28.748 64.314 64.294 64.314zm237.804 111.017h-2.679l1.896-1.896c4.187-4.202 4.187-11.037 0-15.236-4.218-4.202-11.054-4.202-15.24 0l-1.896 1.896v-2.682c0-5.951-4.843-10.796-10.791-10.796-5.952 0-10.794 4.845-10.794 10.796v2.682l-1.897-1.896c-4.183-4.202-11.021-4.202-15.237 0-4.188 4.199-4.188 11.034 0 15.236l1.896 1.912h-2.68c-5.951 0-10.761 4.828-10.761 10.763 0 5.969 4.81 10.788 10.761 10.788h2.68l-1.896 1.897c-4.188 4.204-4.188 11.038 0 15.24 2.093 2.108 4.872 3.155 7.65 3.155 2.748 0 5.496-1.047 7.587-3.155l1.897-1.894v2.678c0 5.949 4.842 10.777 10.794 10.777 5.948 0 10.791-4.828 10.791-10.777v-2.678l1.896 1.894c2.092 2.108 4.84 3.155 7.62 3.155 2.745 0 5.495-1.047 7.62-3.155 4.187-4.202 4.187-11.036 0-15.24l-1.896-1.912h2.679a10.748 10.748 0 0 0 10.761-10.773c0-5.936-4.807-10.779-10.761-10.779zm-217.857 0h-2.649l1.896-1.896c4.188-4.202 4.188-11.037 0-15.236-4.218-4.218-11.054-4.218-15.27 0l-1.896 1.896v-2.682c0-5.951-4.809-10.796-10.76-10.796-5.953 0-10.759 4.845-10.759 10.796v2.682l-1.93-1.896c-4.219-4.218-11.054-4.218-15.238 0-4.218 4.199-4.218 11.034 0 15.236l1.896 1.912h-2.683c-5.951 0-10.793 4.828-10.793 10.78 0 5.951 4.842 10.756 10.793 10.756h2.683l-1.896 1.912c-4.218 4.204-4.218 11.038 0 15.24a10.776 10.776 0 0 0 7.618 3.155c2.779 0 5.527-1.047 7.62-3.155l1.93-1.91v2.694a10.75 10.75 0 0 0 10.759 10.762c5.951 0 10.76-4.812 10.76-10.762v-2.694l1.896 1.91a10.776 10.776 0 0 0 7.618 3.155c2.78 0 5.526-1.047 7.651-3.155 4.188-4.202 4.188-11.036 0-15.24l-1.929-1.912h2.682c5.952 0 10.793-4.805 10.793-10.756.001-5.953-4.84-10.796-10.792-10.796zm110.957-54.885h-2.681l1.896-1.902c4.22-4.198 4.22-11.016 0-15.236a10.755 10.755 0 0 0-15.238 0l-1.898 1.912v-2.699c0-5.951-4.838-10.772-10.793-10.772-5.916 0-10.756 4.821-10.756 10.772v2.683l-1.93-1.896c-4.188-4.219-11.022-4.219-15.241 0-4.185 4.221-4.185 11.038 0 15.236l1.932 1.902h-2.683c-5.95 0-10.791 4.821-10.791 10.774 0 5.949 4.841 10.786 10.791 10.786h2.683l-1.932 1.896c-4.185 4.188-4.185 11.037 0 15.242 2.125 2.09 4.874 3.157 7.653 3.157 2.746 0 5.527-1.067 7.588-3.157l1.93-1.912v2.698c0 5.967 4.84 10.789 10.756 10.789 5.955 0 10.793-4.822 10.793-10.789v-2.698l1.898 1.912a10.796 10.796 0 0 0 7.62 3.157c2.777 0 5.491-1.067 7.618-3.157 4.22-4.205 4.22-11.054 0-15.242l-1.896-1.896h2.681c5.951 0 10.794-4.837 10.794-10.786 0-5.953-4.843-10.774-10.794-10.774z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-low.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-low.svg
deleted file mode 100644
index 1a5abc0193..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-low.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M121.997 198.599v113.095h50.837l113.565 84.295V114.307l-113.563 84.292h-50.839zm224.112-47.009c-6.672-6.67-17.485-6.67-24.156 0-6.67 6.672-6.67 17.486.01 24.157h-.01c21.943 21.954 32.868 50.562 32.888 79.309-.02 28.835-10.917 57.493-32.888 79.491-6.67 6.673-6.67 17.488.01 24.158a17.032 17.032 0 0 0 12.069 5.001c4.375 0 8.749-1.673 12.085-5.009 28.584-28.582 42.906-66.205 42.887-103.642.019-37.405-14.358-74.943-42.895-103.465z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-medium.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-medium.svg
deleted file mode 100644
index d6497c7c88..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-medium.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M83.474 199.599v113.095h50.839l113.563 84.295V115.307l-113.56 84.292H83.474zm224.118-47.009c-6.68-6.67-17.49-6.67-24.159 0-6.674 6.674-6.674 17.484.004 24.153h-.004c21.94 21.956 32.865 50.56 32.885 79.316-.02 28.835-10.917 57.489-32.885 79.487-6.674 6.673-6.674 17.492.004 24.158a17.046 17.046 0 0 0 12.078 5.001c4.376 0 8.748-1.669 12.085-5.007 28.576-28.588 42.895-66.207 42.883-103.64.011-37.408-14.361-74.944-42.891-103.468zm53.939-54.093c-6.678-6.67-17.492-6.67-24.161 0-6.667 6.671-6.667 17.487.006 24.154h-.006c36.837 36.851 55.274 84.958 55.288 133.22-.02 48.484-18.344 96.797-55.288 133.771-6.667 6.666-6.667 17.486.006 24.16a17.033 17.033 0 0 0 12.073 4.998c4.373 0 8.743-1.672 12.082-5.004 43.575-43.588 65.312-100.864 65.294-157.926.016-56.938-21.884-113.975-65.294-157.373z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-off.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-off.svg
deleted file mode 100644
index 173ea47692..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M337.652 114.307l-113.564 84.292H173.25v113.094h50.838l113.564 84.295z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-waves.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-waves.svg
deleted file mode 100644
index cf21b5606b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound-waves.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M461.444 267.153c0-6.132-6.645-11.151-14.76-11.151-8.119 0-17.688-3.494-21.264-7.765-3.576-4.271-6.504-15.902-6.504-25.846 0-9.948-8.029-18.083-17.844-18.083s-17.846 8.135-17.846 18.083c0 9.943-4.926 18.084-10.947 18.084-6.02 0-10.945-8.539-10.945-18.973v-24.824c0-10.432-8.031-18.967-17.848-18.967-9.812 0-17.844 8.535-17.844 18.967v24.824c0 10.434-4.926 18.973-10.945 18.973s-10.945-8.539-10.945-18.973v-62.815c0-10.434-8.033-18.97-17.848-18.97-9.812 0-17.844 8.536-17.844 18.97v62.815c0 10.434-4.928 18.973-10.947 18.973-6.021 0-10.945-8.539-10.945-18.973v-24.824c0-10.432-8.031-18.967-17.846-18.967-9.816 0-17.846 8.535-17.846 18.967v24.824c0 10.434-4.928 18.973-10.947 18.973s-10.945-8.539-10.945-18.973V123.26c0-10.432-8.029-18.969-17.846-18.969-9.814 0-17.844 8.537-17.844 18.969v98.242c0 10.434-4.928 18.973-10.949 18.973-6.02 0-10.945-8.141-10.945-18.084 0-9.948-8.031-18.083-17.846-18.083-9.816 0-17.844 8.135-17.844 18.083 0 9.943-2.518 21.574-5.592 25.846-3.074 4.271-13.143 7.765-22.377 7.765s-16.787 5.02-16.787 11.151c0 6.136 7.553 11.155 16.787 11.155s19.303 3.493 22.377 7.764c3.074 4.271 5.592 15.902 5.592 25.846 0 9.947 8.027 18.084 17.844 18.084 9.814 0 17.846-8.137 17.846-18.084 0-9.943 4.926-18.083 10.945-18.083 6.021 0 10.949 8.537 10.949 18.971v75.933c0 10.432 8.029 18.97 17.844 18.97 9.816 0 17.846-8.538 17.846-18.97v-75.933c0-10.434 4.926-18.971 10.945-18.971s10.947 8.537 10.947 18.971v24.824c0 10.431 8.029 18.969 17.846 18.969 9.814 0 17.846-8.538 17.846-18.969v-24.824c0-10.434 4.924-18.971 10.945-18.971 6.02 0 10.947 8.537 10.947 18.971v62.816c0 10.432 8.031 18.968 17.844 18.968 9.814 0 17.848-8.536 17.848-18.968v-62.816c0-10.434 4.926-18.971 10.945-18.971s10.945 8.537 10.945 18.971v24.824c0 10.431 8.031 18.969 17.844 18.969 9.816 0 17.848-8.538 17.848-18.969v-24.824c0-10.434 4.926-18.971 10.945-18.971 6.021 0 10.947 8.14 10.947 18.083 0 9.947 8.031 18.084 17.846 18.084s17.844-8.137 17.844-18.084c0-9.943 2.928-21.574 6.504-25.846 3.576-4.271 13.145-7.764 21.264-7.764 8.116.001 14.76-5.019 14.76-11.155z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound.svg
deleted file mode 100644
index ff3ba17166..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sound.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M43.602 200.257v113.096h50.839l113.564 84.29v-281.68L94.441 200.257H43.602zm224.117-47.005c-6.67-6.671-17.488-6.671-24.158 0-6.671 6.671-6.671 17.48.005 24.152h-.005c21.941 21.955 32.863 50.555 32.886 79.312-.022 28.833-10.919 57.503-32.886 79.485-6.671 6.677-6.671 17.492.005 24.163a17.033 17.033 0 0 0 12.077 4.997c4.371 0 8.746-1.665 12.081-5.003 28.579-28.583 42.903-66.207 42.885-103.643.018-37.407-14.359-74.942-42.89-103.463zm53.939-54.097c-6.672-6.668-17.486-6.668-24.159 0-6.669 6.674-6.669 17.486.005 24.158l-.005-.006c36.835 36.852 55.274 84.963 55.291 133.223-.022 48.486-18.349 96.805-55.291 133.768-6.673 6.671-6.669 17.489.005 24.157a17.03 17.03 0 0 0 12.074 5.004c4.375 0 8.748-1.67 12.085-5.004 43.572-43.578 65.308-100.86 65.286-157.925.018-56.936-21.879-113.973-65.291-157.375zm56.7-55.102c-6.679-6.671-17.493-6.671-24.161 0-6.669 6.671-6.669 17.483 0 24.155 52.05 52.071 78.095 120.128 78.111 188.341-.017 68.417-25.954 136.67-78.111 188.851-6.674 6.671-6.669 17.487 0 24.155a17.022 17.022 0 0 0 12.079 5.006 17.04 17.04 0 0 0 12.082-5.006c58.782-58.781 88.136-135.992 88.114-213.006.022-76.874-29.48-153.862-88.114-212.496z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-spades.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-spades.svg
deleted file mode 100644
index f97a5457f8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-spades.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.485 87.896s-164.85 92.901-164.85 198.3c0 46.212 37.266 83.656 83.257 83.656 28.828 0 54.222-8.082 69.133-26.133-9.893 36.531-22.615 80.119-26.979 80.119h80.969c-4.364 0-17.07-43.588-26.979-80.08 14.928 18.012 40.306 26.094 69.148 26.094 45.961 0 83.242-37.444 83.242-83.656.002-105.399-166.941-198.3-166.941-198.3z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-speaker.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-speaker.svg
deleted file mode 100644
index dc922a00d3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-speaker.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.999 230.876c-45.492 0-82.502 37.008-82.502 82.501 0 45.491 37.01 82.502 82.502 82.502s82.503-37.011 82.503-82.502c0-45.493-37.011-82.501-82.503-82.501zm0 117.302c-19.217 0-34.8-15.581-34.8-34.801 0-19.222 15.583-34.802 34.8-34.802 19.22 0 34.802 15.58 34.802 34.802 0 19.22-15.582 34.801-34.802 34.801zm124.91-298.924H131.087c-11.105 0-20.115 9.007-20.115 20.117v393.375h290.057V69.371c-.001-11.11-9.011-20.117-20.12-20.117zm-124.91 58.252c15.651 0 28.342 12.688 28.342 28.339 0 15.653-12.69 28.341-28.342 28.341-15.65 0-28.338-12.688-28.338-28.341 0-15.652 12.688-28.339 28.338-28.339zm0 317.451c-61.525 0-111.582-50.056-111.582-111.58s50.057-111.582 111.582-111.582c61.527 0 111.58 50.058 111.58 111.582s-50.053 111.58-111.58 111.58z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-speed-gauge.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-speed-gauge.svg
deleted file mode 100644
index ce52283ddb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-speed-gauge.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.79 101.919c-120.28 0-217.73 97.483-217.765 217.759.065 17.729.852 32.161 4.711 45.164 2.844 9.683 8.012 18.707 15.729 25.494 11.706 10.184 26.684 14.467 45.258 16.855 18.676 2.371 41.894 2.809 72.207 2.809 22.5 0 48.825-.227 79.86-.227 31.031 0 57.356.227 79.856.227 26.911 0 48.266-.328 65.793-2.089 13.146-1.312 24.232-3.341 34.027-7.133 7.357-2.845 14.061-6.833 19.489-12.216 8.308-8.026 13.049-18.65 15.472-29.939 2.448-11.396 3.07-23.999 3.103-38.945-.032-120.276-97.5-217.759-217.74-217.759zm20.206 44.243a167.658 167.658 0 0 1 32.213 7l-7.099 21.982a144.75 144.75 0 0 0-27.86-6.056l2.746-22.926zM109.35 315.574H86.229c0-11.201 1.111-22.186 3.14-32.816l22.694 4.418c-1.797 9.187-2.713 18.672-2.713 28.398zm12.754-60.119l-21.127-9.384h.032a167.515 167.515 0 0 1 16.316-28.714l18.873 13.311c-5.463 7.781-10.203 16.052-14.094 24.787zm36.2-49.642l-15.468-17.168c8.175-7.325 17.039-13.933 26.554-19.591l11.871 19.816c-8.21 4.909-15.894 10.564-22.957 16.943zm46.14-52.651c10.336-3.332 21.092-5.721 32.212-7l2.713 22.927a145.746 145.746 0 0 0-27.86 6.056l-7.065-21.983zm80.118 208.149l-54.513 9.709-13.863-53.63L357.03 173.338l-72.468 187.973zm91.861-130.643l18.869-13.311a167.487 167.487 0 0 1 16.352 28.714l-21.092 9.384a148.031 148.031 0 0 0-14.129-24.787zm26.882 84.906c0-9.727-.949-19.211-2.748-28.398l22.695-4.418a172.56 172.56 0 0 1 3.141 32.816h-23.088zm-159.979 34.731c9.516 6.099 22.14 3.367 28.256-6.133 6.083-9.479 3.302-22.124-6.179-28.223-9.484-6.115-22.107-3.332-28.225 6.184-6.08 9.431-3.366 22.108 6.148 28.172z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-split-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-split-alt.svg
deleted file mode 100644
index a5ad049940..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-split-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M455.854 255.945l-81.985-64.687v39.098H216.115l87.116-85.074c1.408-1.505 6.379-4.858 11.711-6.934 5.229-2.224 11.148-3.333 13.177-3.238h45.749v39.128l81.985-64.669-81.985-64.663v39.056h-45.749c-11.643.133-22.236 2.934-32.472 7.034-10.204 4.221-19.754 9.613-28.157 17.691L153.296 220.22c-1.406 1.537-6.376 4.821-11.707 6.912-5.166 2.192-10.954 3.271-13.081 3.225H55.419v51.162h74.953c2.059-.099 7.945 1.014 13.209 3.22 5.299 2.074 10.271 5.413 11.678 6.951l114.227 111.508c8.404 8.082 17.954 13.44 28.156 17.692 10.235 4.125 20.831 6.918 32.473 6.997h43.754v39.135l81.985-64.689-81.985-64.668v39.113h-43.754c-2.062.063-7.946-1.047-13.179-3.238-5.33-2.06-10.302-5.431-11.706-6.935l-87.152-85.086h155.791v39.109l81.985-64.683z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-split.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-split.svg
deleted file mode 100644
index 1bdfd8a66b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-split.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M400.424 340.116v-41.529c-.131-13.113-3.236-24.411-7.686-35.385-4.609-10.921-10.431-21.124-19.618-30.461l-75.247-75.261c-.492-.326-3.534-4.578-5.299-9.108-1.964-4.432-2.815-9.551-2.681-10.175v-80.39h-65.896v80.39c.131.624-.718 5.743-2.648 10.175-1.766 4.53-4.807 8.782-5.331 9.108l-75.279 75.261c-9.154 9.337-14.944 19.557-19.587 30.461-4.447 10.974-7.554 22.271-7.685 35.385v41.529h-57l89.964 114.019 89.962-114.019h-57v-41.529c-.13-.604.688-5.76 2.649-10.169 1.799-4.545 4.806-8.749 5.332-9.092l69.586-69.588 69.592 69.588c.489.343 3.562 4.547 5.33 9.092 1.927 4.463 2.777 9.565 2.646 10.169v41.529h-58.667l89.966 114.019 89.926-114.019h-55.329z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sprout.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sprout.svg
deleted file mode 100644
index 1d139dd355..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sprout.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M252.555 361.822c-43.691 0-65.025 21.736-100.373 57.748-1.793 1.826-3.639 3.701-5.494 5.59h211.734c-1.904-1.938-3.797-3.859-5.637-5.73-35.264-35.924-56.549-57.608-100.23-57.608zM313.51 86.84c-34.564 0-62.586 28.021-62.586 62.592v.607c0-24.131-19.562-43.693-43.695-43.693h-36.162v34.262c0 24.131 19.561 43.693 43.689 43.693h18.855v155.086c5.941-.818 12.232-1.242 18.943-1.242 6.713 0 13.004.424 18.943 1.242V198.51h31.227c34.566 0 62.588-28.023 62.588-62.59V86.84H313.51z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-squiggly-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-squiggly-line.svg
deleted file mode 100644
index 2c88881018..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-squiggly-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M166.792 418.313c-28.153 0-51.056-22.903-51.056-51.055V144.741c0-4.648-3.783-8.432-8.432-8.432-4.65 0-8.434 3.783-8.434 8.432v126.3H56.249v-126.3c0-28.149 22.904-51.055 51.057-51.055 28.15 0 51.054 22.905 51.054 51.055v222.518c0 4.649 3.782 8.433 8.434 8.433 4.648 0 8.433-3.783 8.433-8.433V166.931c0-28.151 22.902-51.055 51.055-51.055 28.151 0 51.055 22.903 51.055 51.055v176.924c0 4.649 3.783 8.433 8.433 8.433s8.433-3.783 8.433-8.433v-154.32h-.045c0-28.15 22.903-51.056 51.055-51.056s51.055 22.905 51.055 51.056v133.761c0 4.651 3.783 8.432 8.433 8.432s8.433-3.78 8.433-8.432v-65.702h42.622v65.702c0 28.152-22.903 51.055-51.055 51.055s-51.056-22.902-51.056-51.055V189.534c0-4.649-3.781-8.434-8.432-8.434-4.354 0-7.947 3.319-8.388 7.559v155.195c0 28.15-22.903 51.055-51.055 51.055-27.745 0-50.392-22.247-51.04-49.839h-.015V166.93c0-4.651-3.782-8.435-8.433-8.435s-8.434 3.783-8.434 8.435v200.328c-.002 28.152-22.904 51.055-51.056 51.055z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ssd.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ssd.svg
deleted file mode 100644
index 483398df2d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ssd.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M391.744 112.546c-2.849-7.245-11.481-13.144-19.297-13.144H138.762c-7.752 0-16.449 5.898-19.26 13.144l-77.57 198.531h427.41l-77.598-198.531zM35.85 341.734v56.496c0 7.765 6.344 14.127 14.129 14.127H180.49v-24.055h24.95v24.055h20.079v-24.055h24.953v24.055h20.074v-24.055h24.92v24.055h20.082v-24.055H340.5v24.055h120.832c7.752 0 14.125-6.362 14.125-14.127v-56.496H35.85z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stacked-disks.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stacked-disks.svg
deleted file mode 100644
index 0c6fb6e8d1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stacked-disks.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M36.571 269.686v85.244h11.836l-.016.053h415.982l-.018-.053h11.854v-85.244H36.571zm55.968 62.086H67.637v-33.657h24.902v33.657zm60.988 0h-24.919v-33.661h24.919v33.661zm60.974 0h-24.919v-33.661h24.919v33.661zm212.036 1.392c-10.842 0-19.652-8.797-19.652-19.645 0-10.857 8.811-19.67 19.652-19.67 10.857 0 19.654 8.812 19.654 19.67 0 10.848-8.796 19.645-19.654 19.645zM387.328 41.963H125.372l-76.98 197.079h415.982L387.328 41.963zM36.571 470.887H476.21v-85.254H36.571v85.254zm389.966-61.076c10.857 0 19.654 8.793 19.654 19.635 0 10.868-8.797 19.662-19.654 19.662-10.842 0-19.652-8.794-19.652-19.662 0-10.842 8.81-19.635 19.652-19.635zm-236.955 4.24h24.919v33.684h-24.919v-33.684zm-60.974 0h24.919v33.684h-24.919v-33.684zm-60.971 0h24.902v33.684H67.637v-33.684z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stamp.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stamp.svg
deleted file mode 100644
index 2468ef2c74..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stamp.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M153.638 153.638h204.725v204.725H153.638zm231.916 282.011c0 2.915 3.021 5.379 6.602 5.379h41.705c3.58 0 6.604-3.024 6.604-6.604v-41.697c0-3.89-2.537-6.602-4.818-6.602-13.682 0-24.811-11.248-24.811-25.074 0-13.825 11.129-25.072 24.811-25.072 1.42 0 2.492-.963 3.002-1.537 1.152-1.291 1.812-3.137 1.812-5.065v-41.7c0-3.89-2.537-6.604-4.816-6.604-13.68 0-24.809-11.245-24.809-25.07 0-13.824 11.129-25.071 24.811-25.071 2.281 0 4.818-2.711 4.818-6.603v-41.701c0-3.892-2.537-6.603-4.818-6.603-13.682 0-24.811-11.248-24.811-25.072 0-13.825 11.129-25.072 24.811-25.072 2.281 0 4.818-2.712 4.818-6.604V77.574c0-3.579-3.023-6.603-6.604-6.603h-41.705c-3.58 0-6.602 2.547-6.602 5.562 0 14.094-11.162 25.561-24.883 25.561s-24.883-11.467-24.883-25.561c0-3.015-3.021-5.562-6.6-5.562h-41.705c-3.576 0-6.604 2.547-6.604 5.562 0 14.094-11.162 25.561-24.881 25.561-13.723 0-24.881-11.467-24.885-25.56 0-3.016-3.025-5.562-6.605-5.562h-41.697c-3.578 0-6.602 2.547-6.602 5.562 0 14.094-11.162 25.561-24.885 25.561-13.721 0-24.883-11.467-24.883-25.561 0-3.015-3.021-5.562-6.602-5.562H78.14c-3.58 0-6.604 3.023-6.604 6.603v41.702c0 3.58 2.547 6.604 5.561 6.604 14.092 0 25.557 11.247 25.557 25.072 0 13.824-11.465 25.072-25.557 25.072-3.014 0-5.561 3.023-5.561 6.603v41.699c0 3.58 2.547 6.604 5.561 6.604 14.094.002 25.557 11.249 25.557 25.071 0 13.825-11.465 25.07-25.557 25.07-3.014 0-5.561 3.025-5.561 6.604v41.698c0 3.58 2.547 6.604 5.561 6.604 14.092 0 25.557 11.247 25.557 25.072 0 13.826-11.465 25.074-25.557 25.074-3.014 0-5.561 3.022-5.561 6.602v41.697c0 3.58 3.023 6.604 6.604 6.604h41.701c3.58 0 6.602-2.464 6.602-5.379 0-13.991 11.162-25.374 24.883-25.374 13.723 0 24.885 11.383 24.885 25.374 0 2.915 3.023 5.379 6.602 5.379h41.701c3.58 0 6.604-2.464 6.604-5.379 0-13.991 11.16-25.374 24.883-25.374 13.719 0 24.881 11.383 24.881 25.374 0 2.915 3.027 5.379 6.604 5.379h41.705c3.578 0 6.6-2.464 6.6-5.379 0-13.991 11.162-25.374 24.883-25.374s24.88 11.384 24.88 25.375zm-255.596-53.608V129.957h252.084v252.084H129.958z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop-alt.svg
deleted file mode 100644
index ed61a5b6cc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M169.763 465.451L47.189 342.875V169.531L169.763 46.954h173.346l122.579 122.577v173.344L343.109 465.451z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop-hand.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop-hand.svg
deleted file mode 100644
index 3742256b80..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop-hand.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M388.45 236.752c-12.509-6.719-28.093-2.024-34.829 10.467l-36.202 66.758V100.663c0-11.295-9.123-20.453-20.452-20.453-11.299 0-20.457 9.157-20.457 20.453v151.362c0 4.267-3.465 7.736-7.75 7.736-4.281 0-7.749-3.469-7.749-7.736V60.084c0-11.318-9.158-20.475-20.474-20.475-11.28 0-20.469 9.157-20.469 20.475v195.652a7.73 7.73 0 0 1-7.734 7.735c-4.268 0-7.769-3.452-7.769-7.735V98.261c0-11.312-9.138-20.468-20.437-20.468-11.316 0-20.472 9.156-20.472 20.468v157.476a7.747 7.747 0 0 1-7.75 7.752 7.747 7.747 0 0 1-7.75-7.752V151.71c0-11.313-9.155-20.47-20.472-20.47-11.281 0-20.453 9.157-20.453 20.47v236.074c0 7.245 3.876 17.628 8.65 23.087l44.799 51.426c4.743 5.426 14.571 9.926 21.831 9.926h100.738c7.259 0 16.007-5.233 19.456-11.593l96.21-189.065c6.704-12.491 2.027-28.074-10.465-34.813z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop.svg
deleted file mode 100644
index 6b61d9904b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stop.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M87.412 87.559h334.271v336.147H87.412z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-store.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-store.svg
deleted file mode 100644
index 3a9618fef2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-store.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M60.328 426.793h391.343v29.109H60.328zm402.081-241.854c-.042-8.307-70.976-128.842-70.976-128.842H120.567s-71.042 120.58-71.042 128.992c0 16.285 13.205 29.492 29.493 29.492 16.288 0 29.493-13.207 29.493-29.492 0 16.285 13.204 29.492 29.492 29.492 16.286 0 29.492-13.207 29.492-29.492 0 16.285 13.204 29.492 29.491 29.492 16.289 0 29.493-13.207 29.493-29.492 0 16.285 13.203 29.492 29.492 29.492s29.493-13.207 29.493-29.492c0 16.285 13.204 29.492 29.492 29.492 16.287 0 29.493-13.207 29.493-29.492 0 16.285 13.204 29.492 29.492 29.492s29.492-13.207 29.492-29.492c0 16.285 13.204 29.492 29.493 29.492 16.288 0 29.492-13.207 29.492-29.492h.058l-.067-.15zm-29.52 210.235V238.258a52.872 52.872 0 0 1-29.457-8.943c-8.445 5.65-18.591 8.945-29.492 8.945s-21.047-3.295-29.492-8.945a52.866 52.866 0 0 1-29.493 8.945 52.865 52.865 0 0 1-29.492-8.945c-8.445 5.65-18.591 8.945-29.493 8.945s-21.047-3.295-29.492-8.945c-8.446 5.65-18.591 8.945-29.493 8.945s-21.046-3.295-29.491-8.945c-8.445 5.65-18.59 8.945-29.492 8.945s-21.047-3.295-29.492-8.945a52.861 52.861 0 0 1-29.4 8.943v156.916h213.294V270.643h94.716v124.531h45.769zM249.044 350.65H122.978v-80.508h126.066v80.508z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stream.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stream.svg
deleted file mode 100644
index 97ea6bed56..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-stream.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M146.435 195.141c6.213-17.369 13.604-31.495 23.118-42.387 9.32-10.756 22.012-18.604 36.234-18.572 14.225-.031 26.914 7.816 36.236 18.572 9.515 10.892 16.903 25.018 23.119 42.402L300 293.279c4.709 13.305 9.976 22.231 13.965 26.747 4.218 4.595 5.918 4.416 6.082 4.448.131-.032 1.83.146 6.017-4.448 4.022-4.516 9.288-13.442 13.998-26.747l34.859-98.139c9.842-27.504 26.49-51.902 46.858-71.945-38.845-48.642-98.593-79.855-165.695-79.855-117.039 0-211.939 94.898-211.939 211.969 0 37.902 10.006 73.447 27.438 104.254 16.316-17.41 31.13-41.124 39.992-66.283l34.86-98.139zm299.94-33.261c-14.456 15.173-25.901 32.802-32.146 50.591l-34.864 98.104c-6.211 17.36-13.599 31.489-23.085 42.38-9.317 10.748-22.009 18.609-36.232 18.579-14.257.03-26.946-7.817-36.267-18.579-9.518-10.891-16.908-25.02-23.119-42.38l-34.828-98.104c-4.742-13.342-10.007-22.268-13.998-26.784-4.186-4.577-5.885-4.416-6.049-4.444-.16.028-1.862-.133-6.049 4.444-4.023 4.493-9.287 13.442-13.998 26.784l-34.823 98.104c-11.938 33.485-30.938 63.278-52.915 85.876 38.818 43.443 95.264 70.832 158.082 70.832 117.07 0 211.97-94.915 211.97-211.975 0-33.519-7.813-65.22-21.679-93.428z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sunny.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sunny.svg
deleted file mode 100644
index 07391fec24..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sunny.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.175 143.656c-61.939 0-112.299 50.391-112.299 112.312 0 61.92 50.36 112.302 112.299 112.302 61.905 0 112.28-50.382 112.28-112.302 0-61.921-50.375-112.312-112.28-112.312zm0 193.969c-45.114 0-81.656-36.561-81.656-81.656s36.542-81.639 81.656-81.639c45.078 0 81.621 36.543 81.621 81.639s-36.543 81.656-81.621 81.656zm-.035 51.521c-12.166 0-22.009 9.86-22.009 22.028v31.769c0 12.162 9.844 22.023 22.009 22.023 12.199 0 22.042-9.861 22.042-22.023v-31.769c0-12.167-9.843-22.028-22.042-22.028zm0-266.356c12.165 0 22.042-9.875 22.042-22.038v-31.77c0-12.147-9.877-22.022-22.042-22.022-12.131 0-22.009 9.875-22.009 22.022v31.77c0 12.163 9.878 22.038 22.009 22.038zm109.764 45.46c5.623 0 11.282-2.144 15.581-6.442l22.467-22.466c8.599-8.603 8.599-22.55 0-31.169-8.633-8.597-22.563-8.597-31.164 0l-22.466 22.473c-8.6 8.582-8.6 22.543 0 31.163a22 22 0 0 0 15.582 6.441zM130.83 350.15l-22.467 22.451c-8.604 8.601-8.604 22.549 0 31.146a21.982 21.982 0 0 0 15.566 6.476 21.967 21.967 0 0 0 15.582-6.476l22.481-22.464c8.584-8.582 8.584-22.544 0-31.133-8.6-8.619-22.564-8.619-31.162 0zm312.297-116.219h-31.751c-12.164 0-22.042 9.875-22.042 22.038 0 12.167 9.878 22.026 22.042 22.026h31.751c12.166 0 22.043-9.859 22.043-22.012 0-12.177-9.877-22.037-22.043-22.052zM122.98 255.983c0-12.178-9.86-22.037-22.044-22.053H69.184c-12.164 0-22.023 9.875-22.023 22.038 0 12.167 9.859 22.026 22.023 22.026h31.752c12.184.001 22.044-9.858 22.044-22.011zm258.521 94.167c-8.614-8.635-22.562-8.635-31.163-.016-8.615 8.604-8.615 22.55-.016 31.148l22.466 22.464c4.317 4.301 9.942 6.476 15.597 6.476a21.917 21.917 0 0 0 15.551-6.458c8.615-8.614 8.615-22.562.017-31.163l-22.452-22.451zM130.83 161.808a21.95 21.95 0 0 0 15.564 6.442 22.011 22.011 0 0 0 15.599-6.442c8.584-8.62 8.584-22.566 0-31.163l-22.466-22.473c-8.602-8.597-22.531-8.597-31.147 0-8.62 8.619-8.62 22.566 0 31.169l22.45 22.467z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sweatshirt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sweatshirt.svg
deleted file mode 100644
index 3b33e88738..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sweatshirt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M368.49 95.604l-51.635-16.922c-3.596 9.144-9.45 16.99-16.58 23.022-11.903 10.022-27.371 15.646-43.885 15.663-16.515-.017-31.982-5.64-43.788-15.632-7.194-6.063-13.047-13.909-16.643-23.053l-51.64 16.922L42.293 337.161l40.648 41.498 64.487-149.598v204.007h217.957V229.062L429.84 378.66l40.648-41.498L368.49 95.604z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sync.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sync.svg
deleted file mode 100644
index b3e8e396bc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-sync.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M203.447 202.931l-54.568-54.566c27.503-27.173 65.183-43.913 106.927-43.913 42.13.014 79.972 16.983 107.622 44.577 27.594 27.648 44.561 65.492 44.578 107.629h66.177c-.024-120.624-97.761-218.361-218.376-218.386-59.897 0-114.277 24.203-153.724 63.295l-50.36-50.36.003 151.725h151.721zM363.991 363.67c-27.605 27.918-65.809 45.184-108.183 45.176-42.139-.008-79.978-16.981-107.623-44.574-27.601-27.645-44.565-65.482-44.582-107.614H37.436c.017 120.614 97.751 218.347 218.373 218.374 60.54-.008 115.433-24.73 154.979-64.562l48.997 49V311.423H311.742l52.249 52.247z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-t-shirt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-t-shirt.svg
deleted file mode 100644
index 860762bf35..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-t-shirt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M368.631 99.671l-43.018-14.093c-4.054 10.667-10.809 19.829-19.147 26.833-13.506 11.443-31.147 17.844-49.951 17.85-18.787-.005-36.413-6.417-49.886-17.814-8.372-7.022-15.126-16.201-19.195-26.869l-43.002 14.093-77.078 67.022 30.673 41.5h49.509v220.054h217.992V208.194l49.476-.011 30.705-41.489-77.078-67.023z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tab-key.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tab-key.svg
deleted file mode 100644
index dcd4d918c8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tab-key.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M252.263 230.963H92.58v51.146h159.683v48.007l89.16-73.576-89.16-73.582v48.005zm116.712-83.06V362.72h51.18V147.903h-51.18zM157.459 255.309"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tab.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tab.svg
deleted file mode 100644
index a03fd4e379..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tab.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M422.444 283.7v-95.826c0-13.828-11.21-25.039-25.038-25.039h-282.47c-13.828 0-25.038 11.211-25.038 25.039V283.7h-52.06v65.401h436.664V283.7h-52.058z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tactics.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tactics.svg
deleted file mode 100644
index ba1a383471..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tactics.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M137.991 82.309l-29.203 29.205-29.204-29.205-26.363 26.361 29.206 29.205-29.206 29.205 26.363 26.361 29.204-29.203 29.203 29.203 26.364-26.361-29.206-29.205 29.206-29.205zm0 236.113l-29.203 29.205-29.204-29.205-26.363 26.363 29.206 29.207-29.206 29.205 26.363 26.362 29.204-29.204 29.203 29.204 26.364-26.362-29.206-29.205 29.206-29.207zm320.788-98.93l-26.361-26.365-29.206 29.205-29.206-29.205-26.363 26.365 29.206 29.203-29.206 29.205 26.363 26.364 29.206-29.207 29.206 29.207 26.361-26.364-29.204-29.205zM323.469 334.48c-35.204 0-63.744 28.539-63.744 63.742 0 35.207 28.54 63.75 63.744 63.75 35.207 0 63.746-28.543 63.746-63.75 0-35.202-28.539-63.742-63.746-63.742zm0 90.206c-14.59 0-26.461-11.867-26.461-26.463 0-14.59 11.871-26.461 26.461-26.461 14.592 0 26.463 11.871 26.463 26.461 0 14.595-11.87 26.463-26.463 26.463zm-99.629-186.45l112.612-112.613 28.023 28.021 21.212-103.617-103.62 21.213 28.022 28.023-125.792 125.788c-7.28 7.285-7.28 19.086 0 26.367l71.525 71.521 26.361-26.359-58.343-58.344z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tag.svg
deleted file mode 100644
index ffeadcc433..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tag.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M396.022 84.033l-108.391.003L84.305 286.304 224.947 426.95l199.867-199.87V112.828l-28.792-28.795zm-7.9 77.728c-11.337 11.339-29.72 11.339-41.058 0-11.34-11.334-11.34-29.718 0-41.055 11.336-11.344 29.721-11.344 41.058-.004 11.337 11.341 11.338 29.724 0 41.059z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tags.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tags.svg
deleted file mode 100644
index 681f38712d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tags.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M411.412 126.379H303.02L99.692 328.647l140.645 140.649 199.869-199.87V155.171l-28.794-28.792zm-7.901 77.725c-11.336 11.338-29.72 11.338-41.058 0-11.34-11.337-11.34-29.72 0-41.054 11.338-11.344 29.722-11.344 41.058-.004 11.337 11.339 11.338 29.722 0 41.058zm-116.275-93.589l6.549-6.518h117.629V72.076L382.621 43.28l-108.392.006L70.903 245.554l40.187 40.189z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-takeaway-cup.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-takeaway-cup.svg
deleted file mode 100644
index 5360908485..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-takeaway-cup.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M368.255 130.577h-3.824l-17.005-40.696H165.178l-17.004 40.696h-3.86c-6.865 0-12.458 5.592-12.458 12.464 0 6.896 5.593 12.49 12.458 12.49h223.941c6.902 0 12.493-5.594 12.493-12.49 0-6.872-5.591-12.464-12.493-12.464zm-49.574-.88h-15.107a12.037 12.037 0 0 1-12.067-12.07c0-6.668 5.396-12.096 12.067-12.096h15.107c6.668 0 12.067 5.428 12.067 12.096a12.04 12.04 0 0 1-12.067 12.07zM175.513 421.168h161.578l23.969-242.023H151.542l23.971 242.023z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-target.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-target.svg
deleted file mode 100644
index f61b84adc6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-target.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M323.389 256.516c0 37.027-30.018 67.046-67.042 67.046-37.026 0-67.044-30.019-67.044-67.046 0-37.025 30.018-67.038 67.044-67.038 37.024 0 67.042 30.012 67.042 67.038zm-251.846 0C71.56 154.438 154.27 71.735 256.345 71.71c102.074.025 184.781 82.729 184.804 184.806-.022 102.073-82.729 184.779-184.804 184.8-102.075-.021-184.785-82.727-184.802-184.8zm96.186-88.61c-22.726 22.771-36.689 53.906-36.705 88.609.016 34.698 13.979 65.839 36.705 88.612 22.775 22.721 53.914 36.683 88.615 36.7 34.7-.018 65.839-13.979 88.616-36.7 22.725-22.773 36.688-53.914 36.705-88.612-.018-34.703-13.986-65.838-36.705-88.609-22.777-22.728-53.916-36.695-88.616-36.707-34.701.012-65.839 13.98-88.615 36.707z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-temperatrure-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-temperatrure-alt.svg
deleted file mode 100644
index 235b8a1eb9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-temperatrure-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.39 59.798c-108.323 0-196.144 87.821-196.144 196.165 0 108.324 87.821 196.157 196.144 196.157 108.338 0 196.145-87.833 196.145-196.157 0-108.344-87.806-196.165-196.145-196.165zm3.434 339.149c-21.666 0-39.243-17.593-39.243-39.275 0-16.937 10.726-31.296 25.753-36.82v-111.94h24.935v111.221c16.089 4.87 27.813 19.847 27.813 37.539 0 21.682-17.576 39.275-39.258 39.275zm99.381-148.12c-.492-27.78-11.871-52.768-30.119-71.075-18.754-18.674-44.393-30.186-72.942-30.186v-25.15c-.13 0-.276-.015-.405-.015-34.943.015-66.452 14.14-89.375 37.035-22.91 22.894-37.053 54.433-37.053 89.391h-22.727c.015-82.392 66.775-149.168 149.154-149.168 79.855 0 145.03 62.704 148.985 141.612.164 2.488.245 4.987.296 7.556h-45.814z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-temperature.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-temperature.svg
deleted file mode 100644
index fa6c7859fa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-temperature.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M326.578 259.653V123.007c0-38.717-31.493-70.213-70.21-70.213-38.703 0-70.179 31.496-70.179 70.213v136.646c-26.375 21.109-42.152 53.285-42.152 87.687 0 61.952 50.395 112.35 112.331 112.35 61.935 0 112.33-50.397 112.33-112.35-.001-34.402-15.764-66.577-42.12-87.687zm-70.21 169.374c-45.112 0-81.672-36.561-81.672-81.688 0-30.758 17.02-57.554 42.133-71.485V123.007c0-21.844 17.708-39.551 39.539-39.551 21.843 0 39.537 17.707 39.537 39.551v152.879c25.129 13.933 42.133 40.695 42.133 71.453-.001 45.128-36.542 81.688-81.67 81.688zm15.303-132.212V195.979c0-8.472-6.833-15.32-15.303-15.32-8.471 0-15.337 6.849-15.337 15.32v100.836c-21.68 6.576-37.478 26.702-37.478 50.524 0 29.173 23.643 52.816 52.815 52.816 29.169 0 52.796-23.644 52.796-52.816 0-23.821-15.78-43.947-37.493-50.524z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-terminal.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-terminal.svg
deleted file mode 100644
index edb6b159e0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-terminal.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M425.286 155.794H87.838v238.792h337.448V155.794zm-230.703 74.771l-72.7 30.599v-20.195l55.191-19.644-55.191-19.828v-19.645l72.7 30.848v17.865zm90.563 27.349h-68.578v-16.568h68.578v16.568zM37.761 67.555v377.107h436.664V67.555H37.761zm412.564 352.069H62.798V130.756h387.527v288.868z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-theater.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-theater.svg
deleted file mode 100644
index b3a293ab48..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-theater.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M272.366 99.513c-26.162-91.959-3.893-28.323-120.474 4.865-116.547 33.174-131.33-33.281-104.971 59.31 17.625 61.947 86.071 184.552 167.76 161.3 81.72-23.247 75.311-163.522 57.685-225.475zm-155.822 83.255c-14.587 1.882-26.098 9.75-28.845 18.855-1.046-1.717-1.732-3.566-1.962-5.535-1.47-11.381 11.677-22.434 29.368-24.704 17.693-2.267 33.192 5.128 34.63 16.48.293 1.976.099 3.939-.492 5.863-4.937-8.112-18.084-12.823-32.699-10.959zm87.345 97.601c-24.528 6.998-47.091 3.336-54.056-21.077l88.622-26.195c6.933 24.405-10.04 40.289-34.566 47.272zm20.732-128.351c-13.407 6.095-22.107 17.021-22.04 26.512-1.471-1.327-2.715-2.89-3.499-4.7-4.775-10.437 4.545-24.88 20.8-32.247 16.218-7.389 33.222-4.922 37.964 5.503.82 1.822 1.21 3.753 1.21 5.762-7.095-6.296-21.026-6.931-34.435-.83zm134.861 107.717c-24.297-8.43-42.25-17.882-55.753-26.701-4.614 30.377-13.345 53.044-24.104 69.974a50.065 50.065 0 0 0 9.778 1.886c14.685 1.293 27.603-3.94 32.244-12.21.653 1.858.917 3.834.72 5.809-1.013 11.425-16.221 19.408-34.01 17.814-5.625-.487-10.824-1.912-15.273-3.955-15.401 19.749-33.714 29.826-50.032 34.811-.916 55.902 13.245 112.614 61.25 129.292 80.282 27.831 155.529-90.703 176.62-151.556 31.363-90.343 13.082-25.44-101.44-65.164zm-8.794 171.894l-87.606-29.363c8.339-23.987 31.358-27.266 55.46-18.901 24.099 8.37 40.45 24.278 32.146 48.264zm68.932-76.734c-6.899 9.167-24.001 7.917-38.261-2.804-14.225-10.716-20.207-26.839-13.339-36.002a14.173 14.173 0 0 1 4.478-3.828c-2.156 9.264 3.99 21.795 15.729 30.651 11.807 8.851 25.54 11.259 33.814 6.653-.424 1.946-1.209 3.755-2.421 5.33z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-theif.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-theif.svg
deleted file mode 100644
index f3b3ec69ad..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-theif.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M471.68 400.535c-.098-3.891-2.715-8.992-5.821-11.364 0 0-25.409-19.57-45.324-27.973-21.843-9.22-61.413-26.1-61.413-26.1-3.564-1.536-9.321-3.526-12.721-4.462-1.83-.493-5.823-2.072-9.517-3.877-29.957 11.514-59.093 15.422-84.666 15.422-37.313-.029-67.104-8.188-81.624-13.112-3.89 1.094-15.041 4.562-18.474 6.029 0 0-39.54 16.88-61.415 26.1-19.882 8.402-45.325 27.973-45.325 27.973-3.071 2.372-5.723 7.474-5.821 11.364l-.622 52.096c-.096 3.89 3.043 7.047 6.935 7.047H465.4c3.856 0 6.964-3.157 6.934-7.047l-.654-52.096zM167.816 195.236s1.108 34.369 12.62 41.566c1.079.689 2.979 9.027 2.879 8.451 1.145 11.886 9.059 22.318 9.059 22.318.359 3.893-.948 9.779-2.877 13.178l-9.747 16.907a10.458 10.458 0 0 0-9.581 6.349c-2.353 5.328.099 11.537 5.428 13.894.852.312 33.488 14.507 79.433 14.538h.066c24.724 0 53.337-4.188 82.507-17.09 5.364-2.354 7.749-8.615 5.396-13.945-1.861-4.172-6.08-6.521-10.398-6.227-4.611-7.426-10.563-15.127-10.563-15.127-2.353-3.055-3.236-8.555-1.961-12.247l8.666-24.724c1.273-3.66 2.451-7.162 2.519-7.701.096-.57.882-1.616 1.697-2.305l.592-.814c3.138-4.418 5.231-12.117 6.213-17.516 1.47-7.947.981-20.061.981-20.061-.133-3.892.325-10.203 1.078-14.033l2.551-13.337c.751-3.793.884-10.075.325-13.9l-10.233-50.44c-.295-1.917-9.551-52.029-81.329-52.029-71.78 0-83.455 50.112-83.652 52.076l-7.52 65.93c-.326 3.855.783 9.774 2.484 13.143 1.699 3.355 3.2 9.269 3.367 13.146zm130.216-30.166c11.643 0 21.126 9.484 21.126 21.157 0 11.69-9.483 21.139-21.126 21.139-11.708 0-35.09-9.448-35.09-21.139 0-11.672 23.382-21.157 35.09-21.157zm-44.046 68.691c7.423 0 13.439 4.608 13.439 10.333 0 5.721-6.017 10.332-13.439 10.332-7.394 0-13.41-4.611-13.41-10.332 0-5.725 6.017-10.333 13.41-10.333zm-45.72-68.691c11.643 0 35.027 9.484 35.027 21.157 0 11.69-23.385 21.139-35.027 21.139-11.705 0-21.188-9.448-21.188-21.139 0-11.672 9.483-21.157 21.188-21.157z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thought-bubble.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thought-bubble.svg
deleted file mode 100644
index 59b9b71150..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thought-bubble.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M267.179 392.949c-1.756-15.215-17.393-25.909-34.934-23.89-17.537 2.023-30.33 16.001-28.578 31.213 1.756 15.217 17.396 25.912 34.936 23.886 17.537-2.018 30.33-15.995 28.576-31.209zm4.136 32.179c-8.928 3.498-13.697 12.612-10.664 20.351 3.037 7.747 12.73 11.186 21.654 7.685 8.924-3.498 13.697-12.612 10.664-20.352-3.038-7.743-12.732-11.183-21.654-7.684zm171.842-242.846c-9.924-26.373-30.6-47.198-56.51-57.506a68.536 68.536 0 0 0-3.555-13.429c-9.979-26.521-35.719-44.339-64.047-44.339a68.135 68.135 0 0 0-24.086 4.398 68.437 68.437 0 0 0-15.332 8.112c-14.807-14.041-34.523-22.049-55.537-22.052-9.715 0-19.287 1.747-28.447 5.194-22.584 8.498-39.711 26.091-47.625 48.301a99.658 99.658 0 0 0-20.945 5.386c-24.916 9.374-44.689 27.891-55.678 52.136-10.99 24.245-11.879 51.319-2.506 76.233 10.172 27.038 31.549 48.174 58.312 58.214a69.029 69.029 0 0 0 2.389 7.71c9.984 26.527 35.723 44.347 64.051 44.347a68.178 68.178 0 0 0 24.086-4.396 68.53 68.53 0 0 0 13.918-7.124c13.051 8.539 28.314 13.129 44.188 13.129 9.715 0 19.287-1.748 28.447-5.193 17.293-6.507 31.756-18.754 41.072-34.464 1.531.071 3.062.106 4.588.106 11.973 0 23.76-2.15 35.033-6.393 51.434-19.35 77.538-76.936 58.184-128.37z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumb-down.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumb-down.svg
deleted file mode 100644
index 933450deab..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumb-down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M401.858 207.052c0-18.415-3.433-33.365-21.861-33.365h-.138c13.774-2.35 16.537-15.661 16.537-31.804 0-17.775-3.312-32.195-21.104-32.195h-15.285c12.057-3.413 14.562-16.354 14.562-31.854 0-18.089-3.373-32.758-21.458-32.758H198.813c-50.815 0-92.016 41.194-92.016 92.017v98.203c0 36.04 19.936 64.626 51.273 76.835 24.394 16.037 73.521 54.229 83.988 107.306v40.044s68.626 7.453 68.626-57.061c0-75.979-47.833-88.326-9.752-90.177h56.8c20.065 0 23.791-16.267 23.791-36.337 0-17.426-2.824-31.959-16.699-35.49h15.173c18.429 0 21.861-14.934 21.861-33.364z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumb-up.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumb-up.svg
deleted file mode 100644
index 1068c845bd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumb-up.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M261.992 239.754c0 16.044 2.982 29.038 19.029 29.038h88.588c16.043 0 19.022-12.994 19.022-29.038 0-16.046-2.979-29.05-19.022-29.05h-88.588c-16.046 0-19.029 13.004-19.029 29.05zM245.909 308.6c0 16.035 2.988 29.05 19.017 29.05H383.48c16.047 0 19.035-13.015 19.035-29.05 0-16.043-2.988-29.047-19.035-29.047H264.926c-16.029 0-19.017 13.004-19.017 29.047zm15.864 69.9c0 16.033 2.988 29.036 19.014 29.036h93.52c16.043 0 19.034-13.003 19.034-29.036 0-16.054-2.991-29.05-19.034-29.05h-93.52c-16.025 0-19.014 12.996-19.014 29.05zm15.435 71.36c0 16.035 2.988 29.039 19.021 29.039H349.5c16.034 0 19.027-13.004 19.027-29.039 0-16.053-2.993-29.05-19.027-29.05h-53.271c-16.033.001-19.021 12.998-19.021 29.05zm-7.389 25.459c-3.258-6.221-4.71-14.074-4.71-25.459 0-11.392 1.452-19.251 4.71-25.47a27.12 27.12 0 0 1 4.749-6.54c-11.305-1.479-17.19-8.165-20.19-13.895-3.256-6.222-4.703-14.071-4.703-25.456 0-11.394 1.447-19.248 4.703-25.473a28.095 28.095 0 0 1 3.501-5.185c-10.767-1.689-16.441-8.195-19.365-13.781-3.257-6.222-4.709-14.076-4.709-25.462 0-11.388 1.452-19.243 4.709-25.466 2.874-5.486 8.411-11.852 18.818-13.677a28.043 28.043 0 0 1-2.732-4.238c-3.257-6.22-4.71-14.074-4.71-25.465 0-11.393 1.453-19.246 4.71-25.468 3.394-6.479 10.475-14.206 24.944-14.206h18.061c1.859-13.459 39.114-42.243 39.114-101.103 0-64.51-68.624-57.057-68.624-57.057v40.044c-12.038 44.633-91.93 113.537-114.558 132.355-26.783 13.676-43.424 40.396-43.424 73.333v98.201c0 50.822 41.199 92.019 92.015 92.019h69.2a27.721 27.721 0 0 1-1.509-2.551z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnail-list.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnail-list.svg
deleted file mode 100644
index c6ddb31ec2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnail-list.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M260.584 141.379V90.017h161.574v51.362H260.584zm0 78.326v-51.362h161.574v51.362H260.584zm0 122.799v-51.367h161.574v51.367H260.584zm0 78.32v-51.363h161.574v51.363H260.584zM87.979 91.28h128.868v128.87H87.979zm0 200.309h128.868v128.87H87.979z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnails-small.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnails-small.svg
deleted file mode 100644
index ced7db6e71..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnails-small.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M57.012 169.89h112.223V57.667H57.012V169.89zm141.888 0h112.223V57.667H198.9V169.89zM340.79 57.667V169.89h112.218V57.667H340.79zM57.012 311.136h112.223V198.91H57.012v112.226zm141.888 0h112.223V198.91H198.9v112.226zm141.89 0h112.218V198.91H340.79v112.226zM57.012 452.38h112.223V340.156H57.012V452.38zm141.888 0h112.223V340.156H198.9V452.38zm141.89 0h112.218V340.156H340.79V452.38z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnails.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnails.svg
deleted file mode 100644
index b8800a7000..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-thumbnails.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M87.898 91.28h128.868v128.87H87.898zm204.066 0h128.87v128.87h-128.87zM87.898 291.589h128.868v128.87H87.898zm204.066 0h128.87v128.87h-128.87z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ticket.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ticket.svg
deleted file mode 100644
index b69e61beec..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-ticket.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M473.307 190.176v-13.668c-21.581-2.176-36.07-19.555-37.802-41.239H76.078c-1.699 21.685-16.218 39.063-37.802 41.239v9.972c6.899 0 9.974 5.591 9.974 12.479 0 6.912-3.074 12.49-9.974 12.49v12.1c6.899 0 9.974 5.607 9.974 12.494 0 6.896-3.074 12.488-9.974 12.488v11.904c6.899 0 9.974 5.609 9.974 12.495 0 6.896-3.074 12.489-9.974 12.489v11.903c6.899 0 9.974 5.593 9.974 12.494 0 6.883-3.074 12.491-9.974 12.491v13.684c21.584 2.16 36.103 19.539 37.802 41.239h359.427c1.731-21.7 16.221-39.079 37.802-41.239v-9.987c-6.899 0-9.975-5.594-9.975-12.494 0-6.882 3.075-12.49 9.975-12.49v-12.083c-6.899 0-9.975-5.593-9.975-12.495 0-6.896 3.075-12.49 9.975-12.49V252.05c-6.899 0-9.975-5.592-9.975-12.494 0-6.898 3.075-12.491 9.975-12.491v-11.919c-6.899 0-9.975-5.593-9.975-12.49 0-6.887 3.075-12.48 9.975-12.48zm-356.743 135.68H91.482V186.61h25.082v139.246zm158.278-4.382h-28.025v-89.65h-34.762v-21.141c4.87.127 9.58-.233 14.126-1.083 4.513-.85 8.634-2.348 12.23-4.54a29.72 29.72 0 0 0 9.189-8.588c2.484-3.548 4.152-7.947 4.938-13.23h22.303v138.232zm145.26 4.382h-25.05V186.61h25.05v139.246z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-time.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-time.svg
deleted file mode 100644
index cd65d62e2e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-time.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.169 37.716c120.399 0 217.999 97.602 217.999 217.999 0 120.394-97.6 217.996-217.999 217.996-120.397 0-217.998-97.603-217.998-217.996 0-120.398 97.601-217.999 217.998-217.999m0 66.173c-83.716 0-151.826 68.108-151.826 151.826 0 83.715 68.11 151.826 151.826 151.826s151.826-68.111 151.826-151.826c0-83.718-68.11-151.826-151.826-151.826zm39.456 219.541l-58.234-60.113V142.313c0-10.371 8.405-18.775 18.779-18.775 10.371 0 18.78 8.405 18.78 18.775l-.005 105.793 47.654 49.194c7.217 7.447 7.03 19.334-.424 26.553a18.716 18.716 0 0 1-13.064 5.289 18.706 18.706 0 0 1-13.486-5.712z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-timer.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-timer.svg
deleted file mode 100644
index f93538095b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-timer.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M401.477 135.004c-28.908-28.903-64.812-46.452-102.289-52.749V41.514h-65.894v41.235c-19.261 3.515-38.063 10.038-55.659 19.587L144.15 68.885l11.38-11.38-21.685-21.687-96.401 96.408 21.681 21.685 13.537-13.571 32.08 32.077c-43.102 72.631-33.387 167.825 29.074 230.282 73.904 73.893 193.756 73.893 267.66 0 73.942-73.9 73.942-193.756.001-267.695zm-40.615 227.05c-51.407 51.41-135.026 51.41-186.431 0-51.377-51.376-51.377-134.992 0-186.435 51.404-51.373 135.023-51.373 186.431 0 51.374 51.443 51.374 135.059 0 186.435zm-26.915-108.437l-59.451-.951-64.941-64.946c-6.379-6.372-16.68-6.372-23.057 0-6.375 6.331-6.375 16.679 0 23.058l74.299 74.267 72.631 1.142c4.641.084 8.796-1.731 11.805-4.742 2.876-2.909 4.705-6.864 4.775-11.28.131-8.997-7.032-16.438-16.061-16.548z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tools.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tools.svg
deleted file mode 100644
index a8a1aec10f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tools.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M167.564 237.883c.098.098.18.207.279.307l41.582 41.581 14.504-14.504-15.655-15.652-7.078-7.085 36.284-36.283 4.785.532c1.221.14 2.468.208 3.709.208 2.506 0 4.96-.308 7.346-.841l-26.714-26.717c-.539-.541-1.122-1.017-1.685-1.524 8.233-29.596.738-62.65-22.536-85.922-23.101-23.104-55.84-30.654-85.27-22.712l49.864 49.861-13.092 48.849-48.85 13.095-49.864-49.866c-7.944 29.435-.386 62.177 22.715 85.276 24.258 24.261 59.153 31.378 89.676 21.397zm147.338 29.845a33.37 33.37 0 0 0-.612 11.079l.531 4.783-3.406 3.405-25.792 25.8-7.084 7.078-22.736-22.736-14.506 14.506 131.626 131.632c8.116 8.113 18.749 12.168 29.385 12.168 10.632 0 21.266-4.055 29.376-12.168 16.231-16.229 16.231-42.537 0-58.762L314.902 267.728zm101.629 161.907l-20.877 5.594-16.938-16.94 5.595-20.873 20.879-5.597 16.937 16.939-5.596 20.877zM255.954 283.126l22.742 22.741 25.797-25.797c-1.399-12.586 2.698-25.662 12.346-35.307 9.644-9.645 22.721-13.74 35.302-12.346l112.796-112.796-63.181-63.177L288.963 169.24c1.398 12.582-2.701 25.658-12.346 35.307-9.646 9.646-22.722 13.74-35.307 12.342l-25.794 25.799 22.731 22.733-111.455 111.456-4.077-4.078-21.396 17.233-35.987 56.832 9.187 9.189 56.838-35.985 17.228-21.396-4.092-4.088 111.461-111.458z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-top.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-top.svg
deleted file mode 100644
index 2bea18be1e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-top.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M368.928 438.927V227.135s-30.216-11.004-30.216-154.301h-24.068s5.982 100.604-54.774 100.604h-8.504c-60.758 0-54.774-100.604-54.774-100.604H172.49c0 143.296-30.218 154.301-30.218 154.301v211.792h226.656z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-traffic-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-traffic-alt.svg
deleted file mode 100644
index 9cb29dfaa0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-traffic-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M196.861 258.204l89.142-73.582-89.142-73.574v48.004H38.404v51.147h158.457v48.005zm118.904-4.515l-89.144 73.583 89.144 73.574V352.84h158.046v-51.146H315.765v-48.005z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trafic.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trafic.svg
deleted file mode 100644
index 420832c521..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trafic.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M324.727 245.551l89.521-73.883-89.521-73.885v48.2H140.551v51.362h184.175v48.206zm-138.8 20.517L96.406 339.95l89.521 73.887V365.63h183.761v-51.363H185.927v-48.199z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-train.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-train.svg
deleted file mode 100644
index b1de2d26e1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-train.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M377.747 348.745V109.892s-5.349-63.34-121.355-63.34c-116.027 0-121.358 63.31-121.358 63.31v238.884c0 13.346 10.072 24.15 22.484 24.15h48.709l-68.379 93.034h38.031l11.903-16.199h139.031l11.805 16.199h37.92l-67.791-93.034h46.501c12.425 0 22.499-10.805 22.499-24.151zm-167.433 70.327l12.195-16.582h69.869l12.098 16.582h-94.162zm29.56-355.109h32.997c10.334 0 18.705 8.387 18.705 18.722 0 10.318-8.371 18.688-18.705 18.688h-32.997c-10.316 0-18.687-8.37-18.687-18.688 0-10.334 8.371-18.722 18.687-18.722zm-71.518 70.602c0-6.49 6.508-11.755 14.536-11.755h147.01c8.013 0 14.521 5.265 14.521 11.755v82.216s-13.112 22.578-88.031 22.578c-74.921 0-88.035-22.6-88.035-22.6v-82.194zm-.456 182.526c0-15.072 12.23-27.305 27.305-27.305 15.076 0 27.305 12.232 27.305 27.305 0 15.077-12.229 27.307-27.305 27.307-15.075-.001-27.305-12.23-27.305-27.307zm151.735 27.306c-15.06 0-27.272-12.229-27.272-27.307 0-15.072 12.213-27.305 27.272-27.305 15.092 0 27.307 12.232 27.307 27.305-.001 15.078-12.215 27.307-27.307 27.307z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash-alt-2.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash-alt-2.svg
deleted file mode 100644
index 8bb390a394..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash-alt-2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M438.474 117.1c0-36.855-50.238-48.518-66.746-52.348-31.23-7.25-72.334-11.242-115.73-11.242-43.395 0-84.496 3.992-115.727 11.242-16.508 3.83-66.744 15.492-66.744 52.348 0 13.449 9.605 24.643 22.328 27.127l53.32 251.887c-3.867 4.383-6.23 10.121-6.23 16.426 0 19.967 15.898 33.471 47.252 40.139 17.645 3.75 41.014 5.812 65.801 5.812 24.789 0 48.158-2.062 65.803-5.812 31.354-6.668 47.252-20.172 47.252-40.139 0-6.305-2.365-12.043-6.232-16.426l53.326-251.887c12.719-2.485 22.327-13.678 22.327-27.127zm-312.676 12.556a27.06 27.06 0 0 0 1.182-2.6c3.309-1.84 8.799-3.941 16.309-6.047l76.107 35.805-79.559 39.162-14.039-66.32zm127.295 43.012l82.639 38.881L256 249.735l-80.828-38.709 77.921-38.358zm-30.787 93.201l-61.445 29.428-13.863-65.494 75.308 36.066zm33.693 16.137l69.279 33.178-69.279 33.18-69.277-33.18 69.277-33.178zM222.308 364.5l-42.49 20.348-9.586-45.291 52.076 24.943zm33.691 16.133l50.756 24.309c-12.172 2.127-29.57 3.824-50.758 3.824-21.186 0-38.582-1.697-50.754-3.824l50.756-24.309zm76.178 4.213L289.69 364.5l52.074-24.939-9.587 45.285zm18.959-89.551l-61.443-29.426L365 229.805l-13.864 65.49zm-64.633-139.072l75.223-37.025c11.164 2.689 19.035 5.492 23.293 7.859.344.893.75 1.752 1.182 2.6l-14.145 66.816-85.553-40.25zm25.293-44.891l-58.99 29.037-60.092-28.273c17.965-1.988 39.156-3.285 63.283-3.285 20.861 0 39.514.972 55.799 2.521z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash-alt.svg
deleted file mode 100644
index 5fba12abc3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M123.8 475.729h263.142l25.235-287.633H98.566L123.8 475.729zM425.02 90.446h-82.252v-9.367c-.011-24.943-20.209-45.144-45.146-45.146H213.12c-24.945.002-45.144 20.202-45.156 45.146v9.367h-82.24c-11.746 0-21.273 9.525-21.273 21.272v51.338h381.841v-51.338c0-11.746-9.526-21.272-21.272-21.272zm-113.028 0H198.746v-9.367c.009-7.93 6.441-14.355 14.373-14.376h84.502c7.928.021 14.354 6.446 14.371 14.376v9.367z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash.svg
deleted file mode 100644
index abae234837..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trash.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M122.844 475.519h263.145V195.703H122.844v279.816zm181.281-223.79c0-8.498 6.891-15.386 15.395-15.386 8.494 0 15.385 6.888 15.385 15.386v162.128c0 8.496-6.891 15.394-15.385 15.394-8.504 0-15.395-6.897-15.395-15.394V251.729zm-65.101.003c0-8.496 6.892-15.392 15.39-15.392 8.496 0 15.392 6.896 15.392 15.392v162.125c0 8.496-6.896 15.391-15.392 15.391-8.498 0-15.39-6.895-15.39-15.391V251.732zm-65.098 0c0-8.501 6.895-15.392 15.389-15.392 8.498 0 15.391 6.891 15.391 15.392v162.127c0 8.498-6.893 15.389-15.391 15.389-8.494 0-15.389-6.891-15.389-15.389V251.732zM399.02 90.23h-57.209v-9.36c-.004-24.942-20.209-45.145-45.148-45.152h-84.498c-24.941.007-45.145 20.209-45.153 45.152v9.36h-57.2c-11.744 0-21.273 9.526-21.273 21.275v56.348h331.756v-56.348c-.002-11.748-9.527-21.275-21.275-21.275zm-87.989 0H197.785l-.004-9.36c.023-7.938 6.445-14.359 14.383-14.372h84.498c7.929.013 14.359 6.433 14.369 14.372v9.36z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tree.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tree.svg
deleted file mode 100644
index 8da9048412..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tree.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M406.566 223.748c0-21.37-9.564-40.481-24.657-53.335a73.046 73.046 0 0 0 2.616-19.408c0-40.075-32.211-72.616-72.139-73.186-8.078-22.124-29.303-37.95-54.221-37.95-24.919 0-46.16 15.826-54.219 37.95-39.962.569-72.173 33.11-72.173 73.186 0 5.934.753 11.708 2.076 17.253-16.627 12.784-27.353 32.895-27.353 55.49 0 32.211 21.81 59.354 51.44 67.499.099 2.481.195 5.049.195 7.684 0 22.763 28.976 41.202 64.685 41.202.586 0 1.16 0 1.749-.015v131.643h65.894V340.118c.753.015 1.486.015 2.241.015 35.726 0 64.683-18.439 64.683-41.202 0-2.831-.033-5.593-.194-8.274 28.581-8.795 49.377-35.448 49.377-66.909z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trophy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trophy.svg
deleted file mode 100644
index 75229f89a8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-trophy.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M281.693 340.922v-41.975a116.332 116.332 0 0 1-25.297 2.763c-8.86 0-17.527-1.017-25.85-2.878v42.761c-.36 28.267-23.363 51.078-51.749 51.078h-3.237v30.656h161.12v-30.656h-3.204c-28.615 0-51.783-23.169-51.783-51.749zM423.601 118.81l-.589-12.264h-73.84V88.301h-185.55v18.276H89.817l-.623 12.184c0 .179-.064 1.453-.064 3.528.064 8.62.817 31.513 11.413 54.044 5.329 11.216 13.375 22.464 25.343 30.888 11.674 8.221 26.947 13.32 45.325 13.536 14.226 32.979 46.991 56.035 85.186 56.035 38.164 0 70.965-23.056 85.189-56.035 18.346-.216 33.65-5.315 45.325-13.536 18.019-12.705 26.946-31.381 31.588-47.63 4.645-16.352 5.151-30.843 5.151-37.315 0-2.062-.049-3.271-.049-3.466zm-282.932 67.365c-11.252-7.816-17.957-20.649-21.634-33.649-2.11-7.309-3.172-14.502-3.71-20.244h48.297v51.733c0 3.566.23 7.099.623 10.562-10.089-1.141-17.562-4.254-23.576-8.402zm248.336-20.898c-3.942 8.292-9.354 15.602-16.875 20.897-6.001 4.148-13.508 7.261-23.577 8.402.392-3.464.619-6.996.619-10.562v-51.733h48.285c-.865 9.112-3.074 21.848-8.452 32.996z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-truck.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-truck.svg
deleted file mode 100644
index 112c57941f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-truck.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M435.303 149.064h-98.088v157.718a64.095 64.095 0 0 1 20.782-3.465c30.004 0 55.184 20.733 61.983 48.691h50.23V233.729l-34.907-84.665zm-48.039 89.408l-23.691-64.454h55.039l26.566 64.454h-57.914zM286.919 105.699H65.512c-13.359 0-24.183 10.829-24.183 24.17v223.154h31.347c6.426-28.45 31.852-49.706 62.211-49.706 30.414 0 55.84 21.256 62.25 49.706h98.612a63.695 63.695 0 0 1 15.353-29.168V129.869c0-13.341-10.825-24.17-24.183-24.17zM134.887 328.266c-21.418 0-38.847 17.436-38.847 38.887s17.429 38.887 38.847 38.887c21.47 0 38.901-17.436 38.901-38.887s-17.432-38.887-38.901-38.887zm223.11 0c-21.452 0-38.901 17.436-38.901 38.887s17.449 38.887 38.901 38.887 38.882-17.436 38.882-38.887-17.43-38.887-38.882-38.887z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tv-old.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tv-old.svg
deleted file mode 100644
index 6bde7d04ac..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tv-old.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M462.346 74.159H50.471c-6.803 0-12.328 5.509-12.328 12.343V368.2c0 6.803 5.525 12.324 12.328 12.324h411.875a12.311 12.311 0 0 0 12.329-12.324V86.502a12.308 12.308 0 0 0-12.329-12.343zm-105.952 207.3c0 12.754-8.798 28.853-19.554 35.726 0 0-41.86 26.78-117.598 26.78-75.702 0-117.562-26.78-117.562-26.78-10.758-6.873-19.556-22.972-19.556-35.726V173.688c0-12.787 8.798-28.862 19.556-35.745 0 0 41.86-26.786 117.562-26.786 75.737 0 117.598 26.786 117.598 26.786 10.756 6.883 19.554 22.958 19.554 35.745v107.771zm63.672-43.317c-10.369 0-18.773-8.405-18.773-18.769 0-10.365 8.404-18.743 18.773-18.743 10.362 0 18.736 8.378 18.736 18.743.001 10.363-8.373 18.769-18.736 18.769zm0-65.172c-10.369 0-18.773-8.409-18.773-18.737 0-10.369 8.404-18.774 18.773-18.774 10.362 0 18.736 8.405 18.736 18.774.001 10.328-8.373 18.737-18.736 18.737zM106.684 437.494h287.58v-30.643h-287.58v30.643z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tv.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tv.svg
deleted file mode 100644
index d3fc2d2cd9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-tv.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.209 439.747c55.07 0 99.705-22.302 99.705-49.868H156.469c0 27.566 44.669 49.868 99.74 49.868zM460.528 71.894H51.887c-6.801 0-12.329 5.51-12.329 12.327v268.51c0 6.803 5.528 12.325 12.329 12.325h408.642c6.802 0 12.296-5.522 12.296-12.325V84.221c-.001-6.818-5.495-12.327-12.297-12.327zm-17.624 263.252H69.482V101.818h373.422v233.328z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-twitter-fill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-twitter-fill.svg
deleted file mode 100644
index 4cd7ab30cd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-twitter-fill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M22.2125 5.65605C21.4491 5.99375 20.6395 6.21555 19.8106 6.31411C20.6839 5.79132 21.3374 4.9689 21.6493 4.00005C20.8287 4.48761 19.9305 4.83077 18.9938 5.01461C18.2031 4.17106 17.098 3.69303 15.9418 3.69434C13.6326 3.69434 11.7597 5.56661 11.7597 7.87683C11.7597 8.20458 11.7973 8.52242 11.8676 8.82909C8.39047 8.65404 5.31007 6.99005 3.24678 4.45941C2.87529 5.09767 2.68005 5.82318 2.68104 6.56167C2.68104 8.01259 3.4196 9.29324 4.54149 10.043C3.87737 10.022 3.22788 9.84264 2.64718 9.51973C2.64654 9.5373 2.64654 9.55487 2.64654 9.57148C2.64654 11.5984 4.08819 13.2892 6.00199 13.6731C5.6428 13.7703 5.27232 13.8194 4.90022 13.8191C4.62997 13.8191 4.36771 13.7942 4.11279 13.7453C4.64531 15.4065 6.18886 16.6159 8.0196 16.6491C6.53813 17.8118 4.70869 18.4426 2.82543 18.4399C2.49212 18.4402 2.15909 18.4205 1.82812 18.3811C3.74004 19.6102 5.96552 20.2625 8.23842 20.2601C15.9316 20.2601 20.138 13.8875 20.138 8.36111C20.138 8.1803 20.1336 7.99886 20.1256 7.81997C20.9443 7.22845 21.651 6.49567 22.2125 5.65605Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-twitter-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-twitter-line.svg
deleted file mode 100644
index f6d7efc900..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-twitter-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M15.3499 5.5498C13.7681 5.5498 12.4786 6.81785 12.4504 8.39633L12.4223 9.97138C12.4164 10.3027 12.143 10.5665 11.8117 10.5606C11.7881 10.5602 11.7646 10.5584 11.7413 10.5552L10.1805 10.3423C8.12699 10.0623 6.15883 9.11711 4.27072 7.54387C3.67275 10.8535 4.84 13.147 7.65342 14.9157L9.40041 16.014C9.68095 16.1904 9.7654 16.5608 9.58903 16.8413C9.54861 16.9056 9.49636 16.9616 9.43504 17.0064L7.84338 18.1693C8.78973 18.2288 9.68938 18.1873 10.435 18.0385C15.1526 17.097 18.2897 13.5468 18.2897 7.69084C18.2897 7.21275 17.2774 5.5498 15.3499 5.5498ZM10.4507 8.36066C10.4983 5.69559 12.6735 3.5498 15.3499 3.5498C16.7132 3.5498 17.9465 4.10658 18.8348 5.00515C19.5462 4.9998 20.1514 5.17966 21.5035 4.35943C21.1693 5.9998 21.0034 6.71177 20.2897 7.69084C20.2897 15.3324 15.5926 19.0487 10.8264 19.9998C7.5587 20.6519 2.80646 19.5812 1.44531 18.1584C2.13874 18.1051 4.95928 17.8018 6.58895 16.6089C5.20994 15.6984 -0.278631 12.4679 3.32772 3.78617C5.02119 5.76283 6.73797 7.10831 8.47807 7.82262C9.63548 8.29774 9.91978 8.28825 10.4507 8.36066Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-twitter-x-fill.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-twitter-x-fill.svg
deleted file mode 100644
index f23e8f6d5f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-twitter-x-fill.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.2048 2.25H21.5128L14.2858 10.51L22.7878 21.75H16.1308L10.9168 14.933L4.95084 21.75H1.64084L9.37084 12.915L1.21484 2.25H8.04084L12.7538 8.481L18.2048 2.25ZM17.0438 19.77H18.8768L7.04484 4.126H5.07784L17.0438 19.77Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-twitter-x-line.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-twitter-x-line.svg
deleted file mode 100644
index 4555a842d0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-twitter-x-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M8 2H1L9.26086 13.0145L1.44995 21.9999H4.09998L10.4883 14.651L16 22H23L14.3917 10.5223L21.8001 2H19.1501L13.1643 8.88578L8 2ZM17 20L5 4H7L19 20H17Z"></path></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-content.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-content.svg
deleted file mode 100644
index 3ee9892c48..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-content.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M410.48 148.4l-93.312-93.312a39.972 39.972 0 0 0-28.288-11.712H129.808c-22.096 0-40 17.904-40 40v345.248c0 22.096 17.904 40 40 40h252.368c22.096 0 40-17.904 40-40V176.688A39.917 39.917 0 0 0 410.48 148.4zM129.808 428.624V83.376h151.088l.064.192c.08.304 8.64 31.28-6.128 88.064a8.084 8.084 0 0 0 2.544 8.16 8.065 8.065 0 0 0 8.448 1.296c62.528-26.784 94.704 3.36 96.336 4.976V428.64H129.808z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-contour.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-contour.svg
deleted file mode 100644
index 2590acf88d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-contour.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M444.72 215.28H67.28c-11.04 0-20-8.96-20-20V64.896c0-11.04 8.96-20 20-20h377.44c11.04 0 20 8.96 20 20V195.28c0 11.056-8.96 20-20 20zm-357.44-40h337.44V84.896H87.28v90.384zm185.504 215.696c0-6.848.704-13.504 1.936-20H87.28v-90.384h337.44v12.496a108.098 108.098 0 0 1 40 31.36v-63.856c0-11.04-8.96-20-20-20H67.28c-11.04 0-20 8.96-20 20v130.384c0 11.04 8.96 20 20 20h207.44c-1.232-6.496-1.936-13.152-1.936-20zm107.552-76.128c-41.968 0-76.112 34.16-76.112 76.128s34.144 76.128 76.112 76.128 76.128-34.16 76.128-76.128-34.144-76.128-76.128-76.128zm46.016 80.464a7.293 7.293 0 0 1-7.296 7.296h-27.072v27.088a7.293 7.293 0 0 1-7.296 7.296H376a7.293 7.293 0 0 1-7.296-7.296v-27.088h-27.072a7.293 7.293 0 0 1-7.296-7.296v-8.672a7.293 7.293 0 0 1 7.296-7.296h27.072v-27.088A7.293 7.293 0 0 1 376 344.96h8.688a7.293 7.293 0 0 1 7.296 7.296v27.088h27.072a7.293 7.293 0 0 1 7.296 7.296v8.672z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-deploy.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-deploy.svg
deleted file mode 100644
index 37c500ddd3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-deploy.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.016 49.296c-117.152 0-212.112 94.96-212.112 212.096 0 80.32 44.656 150.192 110.496 186.192v-47.616c-42.656-31.344-70.496-81.712-70.496-138.576 0-94.896 77.2-172.096 172.112-172.096 94.896 0 172.08 77.2 172.08 172.096 0 56.88-27.84 107.248-70.496 138.592v47.6c65.84-36 110.496-105.872 110.496-186.192 0-117.136-94.944-212.096-212.08-212.096zm5.92 130.768a8 8 0 0 0-5.904-2.608 8 8 0 0 0-5.904 2.608l-82.288 90.128a7.981 7.981 0 0 0-1.408 8.624 7.978 7.978 0 0 0 7.312 4.768h34.688v171.12c0 4.416 3.584 8 8 8h79.136c4.416 0 8-3.584 8-8V283.6h34.672a7.978 7.978 0 0 0 7.312-4.768 7.991 7.991 0 0 0-1.408-8.624l-82.208-90.144z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-developer.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-developer.svg
deleted file mode 100644
index f99365c4b4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-developer.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M451.936 215.264l-38.08-13.552A168.663 168.663 0 0 0 406 182.768l17.344-36.496a15.985 15.985 0 0 0-3.136-18.176L383.92 91.792a15.974 15.974 0 0 0-18.192-3.136l-36.496 17.36a164.773 164.773 0 0 0-18.96-7.856l-13.536-38.08a16.01 16.01 0 0 0-15.072-10.64h-51.328c-6.768 0-12.816 4.272-15.072 10.64l-13.536 38.08a165.963 165.963 0 0 0-18.96 7.856l-36.496-17.36a15.974 15.974 0 0 0-18.192 3.136l-36.288 36.304a15.985 15.985 0 0 0-3.136 18.176l17.36 36.496c-3.008 6.16-5.648 12.48-7.856 18.96l-38.08 13.536c-6.368 2.272-10.64 8.32-10.64 15.072v51.328c0 6.768 4.256 12.8 10.64 15.072l38.064 13.536a167.17 167.17 0 0 0 7.856 18.96l-17.36 36.512a15.985 15.985 0 0 0 3.136 18.176l36.288 36.288c4.768 4.784 12.064 6.016 18.176 3.136l36.496-17.36a167.272 167.272 0 0 0 18.96 7.872l13.536 38.064a15.995 15.995 0 0 0 15.072 10.64h51.328c6.768 0 12.8-4.256 15.072-10.64l13.552-38.064a165.824 165.824 0 0 0 18.944-7.872l36.496 17.36c6.112 2.896 13.408 1.648 18.176-3.136l36.288-36.288a15.985 15.985 0 0 0 3.136-18.176l-17.344-36.496a165.963 165.963 0 0 0 7.856-18.96l38.064-13.536a15.995 15.995 0 0 0 10.64-15.072v-51.328c.048-6.768-4.208-12.816-10.576-15.088zM256 330.512c-41.136 0-74.512-33.344-74.512-74.512s33.36-74.512 74.512-74.512 74.512 33.344 74.512 74.512-33.376 74.512-74.512 74.512z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-media.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-media.svg
deleted file mode 100644
index 9230e040bd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-media.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M451.056 72.576H60.944c-10.72 0-19.424 8.688-19.424 19.424v328c0 10.72 8.688 19.424 19.424 19.424h390.128c10.72 0 19.424-8.688 19.424-19.424V92c-.016-10.72-8.72-19.424-19.44-19.424zm-19.408 328H80.352V111.424h351.28v289.152zm-309.424-34.48h267.568c6.112 0 11.472-4.096 13.056-10a13.513 13.513 0 0 0-6.224-15.232l-111.488-65.36a13.514 13.514 0 0 0-15.68 1.424l-27.264 23.504-52.736-45.328c-2.944-2.528-6.816-3.616-10.656-3.152a13.58 13.58 0 0 0-9.424 5.888l-58.4 87.168a13.519 13.519 0 0 0-.688 13.92 13.518 13.518 0 0 0 11.936 7.168zm197.968-167.84a41.056 41.056 0 1 1 82.112 0 41.056 41.056 0 1 1-82.112 0z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-members.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-members.svg
deleted file mode 100644
index 9193b6baa6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-members.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M455.184 87.44H56.816c-11.04 0-20 8.96-20 20v297.12c0 11.04 8.96 20 20 20h398.368c11.04 0 20-8.96 20-20V107.44c0-11.056-8.944-20-20-20zm-20 297.12H76.816V127.44h54.128v38.992h64V127.44h122.128v38.992h64V127.44H435.2v257.12zm-282.88-117.408c7.584 13.952 17.2 16.864 23.92 16.864 6.704 0 16.32-2.912 23.968-16.816l.464-.848c3.792-6.88 6.528-11.856 6.528-23.104 0-9.952 0-36.384-30.944-36.384-30.784 0-30.784 25.504-30.784 36.384 0 11.28 2.704 16.256 6.464 23.152l.384.752zm82.592 34.464l-30.768-13.776c-1.312-.592-2.784-.624-4.096-.048l-15.632 6.576h-16.224l-15.632-6.528a5.059 5.059 0 0 0-4.064.048l-30.8 13.744a5.14 5.14 0 0 0-3.04 4.688v18.768a5.142 5.142 0 0 0 5.136 5.136h113.008a5.142 5.142 0 0 0 5.136-5.136v-18.8a5.086 5.086 0 0 0-3.024-4.672zm48.848-85.648h113.632v31.456H283.744zm0 72.512h113.632v31.456H283.744z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-settings.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-settings.svg
deleted file mode 100644
index 554ecdef32..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-settings.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M440.624 351.664c-.192-.176-189.248-167.392-189.248-167.392a101.607 101.607 0 0 0 4.72-30.64c0-27.056-10.528-52.496-29.664-71.632s-44.56-29.664-71.632-29.664c-12.72 0-25.056 2.416-36.56 6.88l54.848 54.864v57.856h-57.84l-54.816-54.832C46.464 153.36 54 196.08 83.184 225.264c19.12 19.12 44.56 29.664 71.632 29.664 9.312 0 18.4-1.328 27.12-3.744 0 0 166.72 189.008 167.472 189.76 12.064 12.064 28.096 18.704 45.152 18.704 17.088 0 33.12-6.656 45.184-18.72 24.576-24.56 24.784-64.272.88-89.264zm-45.808 69.952c-14.288 0-25.84-11.584-25.84-25.856s11.568-25.856 25.84-25.856c14.256 0 25.84 11.584 25.84 25.856s-11.6 25.856-25.84 25.856z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-users.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-users.svg
deleted file mode 100644
index f8ef77731c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umb-users.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M184.32 243.392c23.136 42.592 51.664 51.536 71.52 51.536 19.824 0 48.352-8.928 71.68-51.424l1.552-2.816c12.512-22.72 20.784-37.728 20.784-73.072 0-55.616-11.168-112.448-94.016-112.448-93.472 0-93.472 75.952-93.472 112.448 0 35.376 8.176 50.432 20.544 73.2l1.408 2.576zm268.016 126.8L348.144 323.52a12.122 12.122 0 0 0-9.568-.112l-53.936 22.688h-57.152l-53.952-22.528c-3.04-1.28-6.48-1.232-9.52.112L59.68 370.24a11.985 11.985 0 0 0-7.104 10.96v63.632c0 6.624 5.376 12 12 12h382.848c6.624 0 12-5.376 12-12v-63.696c0-4.72-2.784-9.008-7.088-10.944z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umbraco.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umbraco.svg
deleted file mode 100644
index 0e121eebf3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umbraco.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 315.89 315.89">
-  <path  d="M0,157.74A157.95,157.95,0,1,1,158,315.89,157.95,157.95,0,0,1,0,157.74Zm154.74,54.09a155.41,155.41,0,0,1-36.5-3.29,27.92,27.92,0,0,1-19.94-16q-5.35-12.34-5.21-38.1a243,243,0,0,1,1.69-26.84q1.55-13,3.09-21.46l1.07-5.59a2,2,0,0,0,0-.49,3.2,3.2,0,0,0-2.65-3.17L75.92,93.67h-.44a3.19,3.19,0,0,0-3.11,2.48c-.35,1.31-.56,2.27-1.17,5.38-1.16,6-2.24,11.85-3.43,20.38a264.17,264.17,0,0,0-2.3,27.94,145.24,145.24,0,0,0,0,19.57q.72,25.94,8.9,41.42t27.72,22.3q19.53,6.81,54.43,6.66h2.91q34.94.15,54.41-6.66t27.71-22.3q8.17-15.53,8.91-41.42a145.24,145.24,0,0,0,0-19.57,266.84,266.84,0,0,0-2.3-27.94c-1.2-8.44-2.27-14.26-3.44-20.38-.61-3.11-.81-4.07-1.16-5.38a3.21,3.21,0,0,0-3.12-2.48h-.52l-20.38,3.18a3.2,3.2,0,0,0-2.68,3.17,4,4,0,0,0,0,.49l1.08,5.59q1.55,8.48,3.12,21.46a245.68,245.68,0,0,1,1.65,26.84q.27,25.69-5.21,38.07a27.9,27.9,0,0,1-19.76,16.07,155.19,155.19,0,0,1-36.48,3.29Z"/>
-</svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umbrella.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umbrella.svg
deleted file mode 100644
index 620eac158a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-umbrella.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M267.709 71.077V42.055h-25.72v29.022C127.396 77.74 36.515 172.762 36.515 289.029h4.634c7.414-20.715 27.156-35.559 50.416-35.559 23.258 0 43.001 14.844 50.417 35.559h8.023c7.416-20.715 27.156-35.559 50.417-35.559 17.003 0 32.104 7.956 41.906 20.316v148.201c.006 25.669 20.802 46.455 46.465 46.461 25.657-.006 46.454-20.792 46.46-46.461 0-6.917-5.606-12.518-12.522-12.518-6.913 0-12.519 5.601-12.519 12.518-.023 11.826-9.598 21.403-21.419 21.419-11.828-.016-21.401-9.593-21.428-21.419V273.791c9.802-12.364 24.905-20.32 41.911-20.32 23.26 0 43.002 14.844 50.418 35.559h8.022c7.417-20.715 27.157-35.559 50.417-35.559 23.259 0 43.002 14.844 50.416 35.559h4.632c.002-116.268-90.877-211.292-205.472-217.953z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-undo.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-undo.svg
deleted file mode 100644
index ca5152f6da..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-undo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M364.26 182.396c12.688-.081 25.018 1.947 36.66 5.971-9.091-9.87-19.001-18.611-29.596-26.066-34.059-24.212-73.679-34.865-111.596-34.809-44.784.105-88.015 14.132-124.348 39.161l-63.555-63.547-22.383 234.091 234.077-22.416-64.746-64.762c48.284-42.804 99.018-67.423 145.487-67.623zm98.627 228.325v-35.424c0-39.219-5.164-74.258-15.27-105.242a244.473 244.473 0 0 0-2.404-6.924c-2.992-6.385-6.277-12.166-9.794-17.327-18.476-26.829-42.119-38.233-71.159-38.472-28.138-.147-61.527 11.988-95.717 35.262 8.092.806 15.762 2.704 22.793 5.65 14.259 6.177 26.619 15.89 37.494 34.859 10.709 18.94 19.391 48.411 19.406 92.192v35.424h114.651z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-universal.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-universal.svg
deleted file mode 100644
index 49118f2935..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-universal.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M255.176 33.044c-122.418 0-222.014 99.596-222.014 222.017 0 122.417 99.596 222.014 222.014 222.014 122.421 0 222.02-99.597 222.02-222.014-.001-122.421-99.599-222.017-222.02-222.017zm0 25.043c108.787 0 196.982 88.187 196.982 196.974 0 13.479-1.366 26.636-3.941 39.35-12.725 40.065-50.199 69.1-94.465 69.1-54.748 0-99.137-44.377-99.137-99.123 0-54.744-44.379-99.124-99.126-99.124-47.665 0-87.448 33.651-96.942 78.492C64.41 140.232 150.189 58.087 255.176 58.087z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-unlocked.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-unlocked.svg
deleted file mode 100644
index 2254dfc910..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-unlocked.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M457.915 242.222H269.053l-.004-78.416c0-33.277-12.63-63.824-33.538-86.175-20.82-22.357-50.579-36.756-83.391-36.731-32.814-.024-62.57 14.375-83.391 36.731-20.915 22.351-33.541 52.897-33.547 86.175v103.859H96.19v-13.476l-35.656-35.656H96.19v-54.728c0-17.765 6.717-33.406 17.084-44.502 10.463-11.09 23.927-17.37 38.845-17.394 14.916.024 28.375 6.304 38.837 17.394 10.375 11.096 17.092 26.738 17.087 44.502v78.416h-26.189c-9.159 0-16.582 7.426-16.582 16.585v194.53c0 9.158 7.423 16.583 16.582 16.583h276.06c9.164 0 16.587-7.425 16.587-16.583v-194.53c.001-9.159-7.422-16.584-16.586-16.584z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-untitled.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-untitled.svg
deleted file mode 100644
index 4e621d71c1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-untitled.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256.305 52.237L91.877 147.163l165.496 95.543 164.426-94.921-165.494-95.548zM75.951 364.608l164.967 95.241V268.743L75.951 173.5v191.108zm195.737-94.629v189.873l164.969-95.244v-189.87l-164.969 95.241z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-usb-connector.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-usb-connector.svg
deleted file mode 100644
index 0d97d4094d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-usb-connector.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M187.154 176.858v139.633c0 15.601 12.656 28.259 28.252 28.259h14.748v118.936H281.3V344.75h14.748c15.615 0 28.287-12.658 28.287-28.259V176.858H187.154zm102.291 61.448h-3.338c-.195 5.163-.784 9.417-2.321 13.309-2.028 5.133-5.772 8.993-10.792 12.325-4.381 2.979-7.129 5.466-8.861 8.486-1.7 2.948-2.746 6.855-2.828 13.229v8.783c5.084 2.139 8.666 7.146 8.666 12.98 0 7.768-6.295 14.08-14.078 14.08-7.767 0-14.062-6.312-14.062-14.08 0-6.083 3.858-11.263 9.271-13.229-.491-2.81-1.26-4.938-2.306-6.718-1.735-3.042-4.48-5.53-8.864-8.486-5.019-3.354-8.729-7.194-10.756-12.331-1.768-4.479-2.324-9.386-2.422-15.626a9.526 9.526 0 0 1-4.725-8.229 9.59 9.59 0 0 1 9.599-9.596c5.28 0 9.58 4.283 9.58 9.596 0 3.486-1.879 6.526-4.676 8.229.1 5.654.655 9.429 1.701 11.997 1.227 2.94 2.975 4.97 7.195 7.863 2.192 1.49 4.25 3.026 6.099 4.727v-55.493h-5.771l10.675-18.348 10.677 18.348h-5.787v40.517c1.896-1.716 3.956-3.271 6.215-4.774 4.184-2.91 5.934-4.938 7.16-7.896.916-2.191 1.455-5.265 1.635-9.663h-3.123v-16.319h16.238v16.319zm19.278-190.098H202.736v100.43h105.987V48.208zm-66.175 76.623h-17.446V98.686h17.446v26.145zm42.841 0h-17.461V98.686h17.461v26.145z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-usb.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-usb.svg
deleted file mode 100644
index 7478d50f9e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-usb.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M378.594 108.588h-51.951v52.247h12.021c-.586 19.484-2.632 33.068-6.7 43.055-4.973 12.141-12.647 20.826-28.882 31.934-11.669 7.908-22.107 16.011-30.842 25.602V92.1h18.431l-32.198-55.291L226.278 92.1H244.7v225.768c-8.656-9.415-18.973-17.395-30.481-25.187-16.23-11.107-23.908-19.794-28.882-31.934-4.532-11.117-6.543-26.706-6.831-49.912 10.486-5.126 17.726-15.868 17.726-28.325 0-17.42-14.119-31.541-31.542-31.541-17.417 0-31.542 14.121-31.542 31.541 0 12.494 7.285 23.263 17.823 28.368.313 24.652 2.197 43.483 8.81 60.126 7.242 18.289 20.47 32.06 38.997 44.481 16.771 11.354 27.846 21.156 35.008 33.614 4.676 8.122 8.046 17.935 9.838 31.074-20.537 5.646-35.647 24.395-35.647 46.722 0 26.792 21.719 48.502 48.507 48.502 26.777 0 48.496-21.71 48.496-48.502 0-21.261-13.703-39.279-32.738-45.827v-36.443c.299-24.722 4.374-40.381 11.277-52.387 7.169-12.445 18.232-22.251 35.012-33.609 18.519-12.419 31.749-26.188 38.995-44.479 5.988-15.08 8.095-31.947 8.677-53.315h12.393v-52.247z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-female.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-female.svg
deleted file mode 100644
index 61b554428b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-female.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M438.488 403.4c-19.689-19.678-53.045-28.459-81.495-37.354-37.508-11.723-51.833-39.521-56.115-67.105a238.99 238.99 0 0 0 12.003-14.813c24.59 7.862 54.055 10.161 79.3-8.134-34.762-34.764-6.866-77.386-31.95-154.179-21.352-65.292-108.83-62.08-120.112-39.138-46.402-16.392-81.396 5.549-94.277 74.71-14.814 79.438 13.896 87.825-20.866 122.575 26.684 15.252 51.146 11.523 72.368 3.094 4.187 5.634 8.536 11.052 13.019 16.139-4.32 27.492-18.706 55.161-56.054 66.852-28.48 8.895-61.804 17.676-81.493 37.354C57.286 418.96 67.62 456.1 67.62 456.1h376.034c-.002 0 10.366-37.141-5.166-52.7z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-females-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-females-alt.svg
deleted file mode 100644
index e4813ece0b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-females-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M257.006 338.165c-28.092-8.783-38.783-29.665-41.941-50.331a174.19 174.19 0 0 0 8.977-11.121c18.379 5.889 40.386 7.605 59.255-6.047-25.966-25.999-5.115-57.816-23.872-115.227-15.94-48.808-81.327-46.384-89.767-29.214-34.63-12.265-60.81 4.118-70.439 55.819-11.053 59.354 10.383 65.603-15.597 91.579 19.945 11.396 38.21 8.587 54.088 2.308a183.876 183.876 0 0 0 9.744 12.1c-3.188 20.601-13.897 41.366-41.923 50.134-21.255 6.637-46.173 13.207-60.873 27.926-11.611 11.606-3.876 39.369-3.876 39.369h280.974s7.75-27.763-3.877-39.369c-14.7-14.719-39.618-21.289-60.873-27.926zm103.338-13.019c-19.427-6.085-26.817-20.502-28.975-34.793 2.109-2.424 4.2-5.006 6.197-7.688 12.703 4.072 27.928 5.265 40.957-4.184-17.953-17.954-3.53-39.961-16.514-79.628-11.004-33.719-56.181-32.049-62.018-20.211-10.254-3.626-19.377-3.595-27.028.346 2.682 15.647 2.908 29.119 3.106 40.694.293 20.274.524 33.683 12.509 45.688l6.213 6.211-7.113 5.132a61.41 61.41 0 0 1-9.598 5.692c2.108 2.811 4.3 5.524 6.556 8.076-2.205 14.259-9.614 28.616-28.972 34.665-2.027.622-4.086 1.263-6.149 1.896a64.421 64.421 0 0 0 9.714 3.991c2.059.619 4.119 1.272 6.227 1.912 20.229 6.196 43.12 13.261 57.721 27.847 3.074 3.074 5.117 6.835 6.459 10.858h75.474s5.364-19.165-2.681-27.207c-10.17-10.172-27.388-14.703-42.085-19.297zm112.559-.914c-6.999-7.034-18.871-10.14-29.008-13.309-13.391-4.188-18.476-14.147-19.979-23.971 1.453-1.699 2.908-3.47 4.284-5.319 8.729 2.801 19.259 3.62 28.22-2.877-12.359-12.374-2.42-27.552-11.378-54.902-7.591-23.268-38.737-22.122-42.743-13.947-11.888-4.188-21.648-1.292-27.924 9.775 1.172 8.893 1.338 16.692 1.437 23.528.242 15.092.687 22.665 7.978 29.975l6.232 6.21-2.83 2.029a89.923 89.923 0 0 0 4.479 5.591c-1.505 9.829-6.605 19.72-19.947 23.908-4.757 1.484-9.878 2.975-14.716 4.838 1.734.849 3.563 1.637 5.576 2.238 1.406.459 2.828.883 4.283 1.343 14.227 4.367 30.348 9.304 40.861 19.799 1.143 1.177 2.091 2.485 2.911 3.843h64.11s3.714-13.228-1.846-18.752z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-females.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-females.svg
deleted file mode 100644
index b4f9776fa5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-females.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M338.739 338.203c-28.189-8.81-38.981-29.701-42.15-50.45a192.926 192.926 0 0 0 8.991-11.134c18.477 5.912 40.648 7.639 59.615-6.115-26.127-26.137-5.135-58.186-24.004-115.935-16.054-49.087-81.852-46.67-90.32-29.41-34.859-12.352-61.186 4.172-70.898 56.17-11.117 59.717 10.466 66.029-15.665 92.159 20.047 11.461 38.456 8.652 54.418 2.33a174.51 174.51 0 0 0 9.775 12.124c-3.268 20.677-14.061 41.483-42.151 50.261-21.388 6.695-46.436 13.295-61.25 28.096-11.706 11.699-3.924 39.622-3.924 39.622h282.738s7.749-27.923-3.927-39.622c-14.778-14.801-39.861-21.401-61.248-28.096zm131.822 11.865c-11.674-11.691-31.492-16.898-48.398-22.19-22.235-6.948-30.739-23.454-33.291-39.856a149.53 149.53 0 0 0 7.098-8.776c14.584 4.673 32.111 6.031 47.09-4.843-20.637-20.634-4.055-45.918-18.969-91.531-12.687-38.773-64.617-36.874-71.321-23.242a34.523 34.523 0 0 0-2.484-.809c6.996 24.33 7.325 44.175 7.586 60.385.327 20.422.524 33.907 12.624 46.003l6.21 6.195-7.094 5.143c-10.071 7.292-21.681 11.238-34.566 11.834-1.733 11.006-6.213 22.044-15.794 30.17 5.754 5.608 12.98 9.777 21.746 12.518 2.06.643 4.152 1.281 6.278 1.938 20.309 6.252 43.331 13.335 58.014 28 5.429 5.404 7.686 12.906 8.403 20.349h59.974c-.002-.002 6.114-22.051-3.106-31.288zm-292.713-17.062c2.093-.656 4.186-1.295 6.279-1.938 5.855-1.838 11.053-4.341 15.564-7.49-14.848-8.23-21.123-21.91-23.25-35.557.358-.359.687-.766 1.012-1.168-5.756-1.462-11.38-3.732-16.874-6.864l-8.502-4.862 6.932-6.92c12.493-12.517 12.067-18.15 10.892-33.207-.913-12.031-2.224-28.5 2.746-55.038 1.931-10.474 4.513-19.347 7.523-26.881-17.528-5.15-36.006-1.194-39.8 6.549-27.535-9.738-48.331 3.301-55.985 44.359-8.797 47.172 8.273 52.142-12.394 72.785 15.86 9.057 30.38 6.833 42.969 1.832a150.151 150.151 0 0 0 7.72 9.59c-2.553 16.324-11.086 32.734-33.258 39.683-16.907 5.292-36.693 10.499-48.366 22.19-9.254 9.236-3.106 31.286-3.106 31.286h73.447c.72-7.442 3.009-14.944 8.405-20.349 14.648-14.665 37.705-21.748 58.046-28z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-glasses.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-glasses.svg
deleted file mode 100644
index 3816df4ce6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user-glasses.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M178.432 161.715a817.81 817.81 0 0 1 9.405-.53 795.75 795.75 0 0 1 9.498-.435c.949-.04 1.895-.098 2.84-.159 2.191-.135 4.479-.275 6.834-.191.574.02 1.154.027 1.734.027l3.757-.027h.008c.932 0 1.85.013 2.766.056 2.615.121 5.396.398 8.752.874 4.492.636 8.928 1.472 13.219 2.282 1.551.292 2.982.564 4.416.824l1.219.226c3.82.709 7.766 1.441 11.383 1.441l.693-.008c4.002-.105 8.352-.929 12.559-1.728l4.178-.788c4.953-.935 10.031-1.894 15.18-2.532 5.1-.634 9.945-.686 15.303-.686l1.932.001c2.023 0 3.947.134 5.802.264 1.056.073 2.1.148 3.146.192 2.754.113 5.514.243 8.271.387 2.816.144 5.633.3 8.441.476.543-10.772 2.342-26.122 2.442-30.262.324-14.369-.021-15.532-3.5-29.527 0 0-4.223-12.683-10.842-16.501l-13.195-2.271-8.152-7.557c-32.857-20.215-68.08-6.035-86.947 1.61-25.94 8.42-42.758 33.062-33.818 84.708l2.676-.166zm282.559 222.227c-6.834-19.818-29.468-22.661-48.374-30.635-20.761-8.756-43.783-18.92-64.498-27.416-5.912-1.61-11.826-3.223-17.737-4.837-7.058-4.857-13.967-20.997-17.74-29.021-3.762-.537-7.52-1.076-11.291-1.609.584-12.418 8.27-13.084 11.291-22.573 2.658-8.367.277-19.241 4.494-26.987 2.927-5.38 9.546-5.416 12.854-10.027 3.002-4.186 4.976-11.484 5.91-16.608 1.692-9.293 3.164-21.98-1.158-31.252h-4.529c-.244.402-.68 1.444-1.377 4.118l-.256.964c-1.543 11.029-6.34 20.264-13.512 26.014-6.084 4.872-13.924 7.447-22.67 7.447-1.912 0-3.851-.128-5.761-.383-6.237-.827-12.092-3.042-16.934-6.407-2.272-1.58-4.472-3.197-6.459-5.595-1.619-1.953-3.018-4.182-4.398-7.009-.816-1.668-1.504-3.354-2.114-4.841l-2.171-5.544a15.472 15.472 0 0 0-.416-.993c-.07.183-.145.409-.211.688l-2.577 7.612c-1.64 3.955-3.567 7.966-6.944 11.481-4.112 4.288-9.559 7.51-15.752 9.32a42.488 42.488 0 0 1-11.932 1.703c-6.848 0-13.316-1.658-18.709-4.792-7.98-4.642-13.62-12.627-16.299-23.094-.375-1.458-.783-2.908-1.19-4.362l-.992-3.617c-.41-1.545-.758-2.863-1.274-3.613l-.016-.022-3.521-.033c-1.324 2.434-2.574 4.54-2.367 6.823 1.054 11.59 1.277 39.454 12.229 46.317 1.018.637 8.787 2.585 8.738 2.053 1.076 11.285 2.15 22.58 3.22 33.863 2.734 7.501 9.297 8.325 11.204 18.92l-8.395 2.04c-3.774 8.024-10.684 24.164-17.741 29.021a25694.65 25694.65 0 0 1-17.738 4.837c-20.711 8.496-43.736 18.66-64.497 27.416-18.906 7.974-41.539 10.817-48.375 30.635 0 13.458-1.268 45.249-.92 62.883h411.822c.35-17.636-.917-49.427-.917-62.885zm-267.68-192.015c3.068 10.883 10.52 17.841 23.498 17.841 12.982 0 23.502-7.987 23.502-17.841 0-9.852 3.17-17.089-23.502-18.992-12.18-.868-30.297-5.105-23.498 18.992zm98.85-18.991c-26.672 1.903-23.502 9.14-23.502 18.992 0 9.854 10.523 17.841 23.502 17.841 12.977 0 20.432-6.958 23.5-17.841 6.798-24.098-11.323-19.861-23.5-18.992z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user.svg
deleted file mode 100644
index 9f46a9853d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-user.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M331.135 98.375c3.677 14.798 4.045 16.031 3.702 31.225-.138 5.855-3.5 32.936-2.586 41.242.751 6.851 2.46 7.395 5.162 13.041 4.705 9.824 3.13 23.376 1.325 33.282-.988 5.42-3.076 13.136-6.248 17.561-3.497 4.876-10.498 4.913-13.592 10.602-4.459 8.195-1.941 19.692-4.752 28.54-3.193 10.033-11.325 10.738-11.938 23.867 3.986.562 7.962 1.134 11.938 1.703 3.99 8.484 11.297 25.552 18.759 30.688 6.25 1.705 12.505 3.411 18.752 5.113 21.907 8.982 46.251 19.732 68.204 28.987 19.991 8.434 43.927 11.439 51.151 32.396 0 14.229 1.343 47.849.976 66.497H36.514c-.367-18.648.974-52.268.974-66.497 7.226-20.957 31.16-23.963 51.151-32.396 21.953-9.255 46.297-20.005 68.201-28.987 6.25-1.702 12.506-3.408 18.754-5.113 7.461-5.136 14.77-22.203 18.76-30.688l8.877-2.158c-2.017-11.206-8.954-12.078-11.845-20.01a91882.59 91882.59 0 0 0-3.408-35.806c.055.563-8.163-1.497-9.238-2.171-11.58-7.256-11.816-36.723-12.931-48.978-.508-5.603 7.283-10.193 5.118-20.465-12.69-60.138 5.486-88.282 34.229-97.614 19.95-8.083 57.198-23.074 91.941-1.703l8.621 7.991 13.952 2.405c7 4.041 11.465 17.446 11.465 17.446z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-users-alt.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-users-alt.svg
deleted file mode 100644
index 6d87232e4d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-users-alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M306.818 335.551c-15.453-6.512-32.588-14.08-48.007-20.406-4.398-1.196-8.8-2.396-13.202-3.6-5.251-3.611-10.395-15.626-13.204-21.602l-8.402-1.193c.434-9.242 6.158-9.739 8.402-16.8 1.981-6.229.208-14.323 3.348-20.089 2.179-4.002 7.103-4.029 9.565-7.461 2.232-3.117 3.701-8.549 4.398-12.361 1.269-6.971 2.376-16.512-.935-23.43-1.903-3.97-3.104-4.353-3.632-9.176-.641-5.845 1.723-24.907 1.821-29.031.241-10.694-.017-20.369-2.606-30.789 0 0-3.145-9.436-8.07-12.281l-9.817-1.687-6.071-5.626c-24.454-15.049-50.673-4.493-64.712 1.197-20.235 6.568-33.03 35.189-24.098 77.518 1.525 7.227-3.959 10.463-3.6 14.407.785 8.628.947 29.365 9.103 34.472.756.479 6.538 1.925 6.504 1.528l2.395 25.204c2.038 5.586 6.919 6.197 8.338 14.083l-6.247 1.515c-2.811 5.976-7.953 17.99-13.208 21.602-4.397 1.203-8.8 2.403-13.198 3.6-15.418 6.326-32.555 13.895-48.005 20.406-14.069 5.94-30.916 8.053-36.006 22.802 0 10.021-.94 33.677-.687 46.804h306.521c.256-13.127-.686-36.783-.686-46.804-5.085-14.749-21.933-16.862-36.002-22.802zm86.719-1.363c-11.013-4.641-23.227-10.036-34.215-14.543-3.136-.85-6.275-1.708-9.41-2.564-3.744-2.576-7.408-11.139-9.41-15.396-1.996-.286-3.991-.572-5.989-.856.308-6.592 4.384-6.941 5.989-11.974 1.41-4.442.146-10.204 2.383-14.316 1.554-2.856 5.063-2.873 6.816-5.319 1.593-2.221 2.645-6.098 3.141-8.813.904-4.966 1.69-11.771-.668-16.697-1.356-2.833-2.212-3.106-2.589-6.54-.46-4.168 1.228-17.756 1.296-20.695.172-7.625-.009-14.521-1.855-21.944 0 0-2.24-6.729-5.754-8.754l-6.999-1.2-4.328-4.011c-17.429-10.729-36.12-3.208-46.122.849-14.424 4.684-23.545 25.086-17.178 55.255 1.088 5.151-2.823 7.456-2.562 10.265.557 6.154.671 20.936 6.484 24.576.536.34 4.66 1.373 4.636 1.088.567 5.984 1.14 11.979 1.708 17.965 1.451 3.979 4.932 4.418 5.939 10.038l-4.449 1.086c-1.428 3.032-3.702 8.226-6.245 11.904a3482.803 3482.803 0 0 1 16.646 7.12c6.428 2.764 12.804 5.506 18.918 8.08 2.908 1.232 5.965 2.289 9.198 3.41 12.079 4.186 25.772 8.925 30.888 23.758l.4 1.163v1.232c0 3.856.15 10.017.307 16.532.07 2.904.143 5.915.207 8.92h68.973c.186-9.353-.486-26.225-.486-33.363-3.629-10.512-15.638-12.023-25.67-16.256zm79.609 6.764c-2.528-7.335-10.91-8.388-17.911-11.343-7.685-3.24-16.209-7-23.882-10.151-2.184-.592-4.372-1.192-6.562-1.788-2.612-1.799-5.169-7.773-6.567-10.742-1.394-.202-2.787-.4-4.18-.602.215-4.594 3.059-4.844 4.18-8.354.982-3.1.102-7.124 1.665-9.988 1.083-1.996 3.53-2.01 4.757-3.72 1.111-1.548 1.846-4.247 2.189-6.146.631-3.472 1.181-8.216-.468-11.653-.944-1.977-1.542-2.168-1.805-4.564-.323-2.906.858-12.392.905-14.439.121-5.322-.008-10.135-1.297-15.321 0 0-1.564-4.689-4.014-6.101l-4.883-.842-3.021-2.799c-12.168-7.486-25.207-2.239-32.189.594-10.064 3.27-16.431 17.503-11.984 38.559.756 3.6-1.971 5.205-1.79 7.169.386 4.29.47 14.606 4.523 17.147.378.237 3.254.956 3.235.76.396 4.176.799 8.359 1.196 12.536 1.009 2.778 3.438 3.081 4.143 7.003l-3.106.762c-1.184 2.516-3.201 7.16-5.379 9.624 3.961 1.681 7.971 3.401 11.914 5.097 4.597 1.971 9.155 3.935 13.53 5.778 2.011.847 4.155 1.593 6.425 2.378 8.617 2.984 19.345 6.697 23.326 18.243l.4 1.165v1.229c0 2.719.104 7.074.215 11.688.019.691.035 1.4.053 2.105h46.723c.13-6.529-.341-18.298-.341-23.284z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-users.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-users.svg
deleted file mode 100644
index 65f0703bcc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-users.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M310.761 137.421c2.649 10.664 2.913 20.567 2.669 31.515-.099 4.223-2.521 23.736-1.865 29.717.541 4.936 1.774 5.328 3.72 9.395 3.39 7.08 2.255 16.842.956 23.979-.712 3.906-2.216 9.468-4.502 12.653-2.521 3.518-7.562 3.541-9.793 7.641-3.213 5.899-1.398 14.186-3.424 20.56-2.302 7.23-8.16 7.737-8.604 17.195 2.875.412 5.738.819 8.604 1.23 2.875 6.112 8.139 18.406 13.515 22.107 4.504 1.231 9.008 2.46 13.514 3.686 15.781 6.475 33.32 14.22 49.139 20.889 14.403 6.074 31.645 8.24 36.853 23.339 0 10.253.968 34.471.701 47.907H98.489c-.262-13.437.702-37.654.702-47.907 5.209-15.099 22.451-17.265 36.854-23.339 15.818-6.669 33.357-14.414 49.137-20.889a9943.03 9943.03 0 0 0 13.514-3.686c5.379-3.701 10.644-15.995 13.519-22.107l6.396-1.557c-1.451-8.072-6.451-8.697-8.536-14.415-.815-8.597-1.636-17.201-2.452-25.802.035.408-5.882-1.072-6.657-1.558-8.345-5.233-8.515-26.461-9.317-35.289-.366-4.038 5.244-7.349 3.686-14.745-9.142-43.33 3.954-72.625 24.665-79.349 14.371-5.826 41.207-16.63 66.239-1.228l6.216 5.76 10.05 1.729c5.037 2.909 8.256 12.569 8.256 12.569zM179.18 213.988c-.494-5.428 1.757-9.537 3.102-11.999.258-.477.599-1.097.766-1.472a157.541 157.541 0 0 1-2.49-15.715l-6.959-1.193-4.427-4.104c-17.843-10.977-36.974-3.276-47.214.87-14.765 4.797-24.1 25.678-17.58 56.56 1.108 5.274-2.892 7.633-2.628 10.513.571 6.292.688 21.426 6.64 25.153.551.346 4.77 1.404 4.746 1.116l1.747 18.385c1.485 4.076 5.052 4.521 6.082 10.272l-4.56 1.114c-2.048 4.357-5.799 13.122-9.631 15.76-3.209.874-6.424 1.751-9.631 2.627-11.249 4.611-23.751 10.134-35.028 14.888-10.264 4.329-22.555 5.875-26.268 16.633 0 7.308-.69 24.576-.498 34.15H86.15c.065-3.128.138-6.257.213-9.276.158-6.631.309-12.892.309-16.776v-2.097l.686-1.984c6.035-17.492 21.939-23.002 34.72-27.426 3.229-1.116 6.278-2.172 9.104-3.367 6.203-2.612 12.673-5.396 19.196-8.201 9.602-4.128 19.502-8.377 28.808-12.213-.465-1.008-.893-1.936-1.26-2.717l-6.131-.876c.316-6.743 4.492-7.106 6.131-12.258 1.445-4.548.15-10.449 2.442-14.653 1.588-2.922 5.183-2.943 6.978-5.445 1.627-2.273 2.704-6.24 3.21-9.021.272-1.495.526-3.158.697-4.877-9.748-8.984-10.966-26.442-11.777-38.37-.103-1.506-.195-2.86-.296-4.001zm295.474 139.408c-3.71-10.758-16.003-12.304-26.271-16.633-11.273-4.754-23.774-10.276-35.024-14.888-3.209-.876-6.422-1.753-9.631-2.627-3.834-2.638-7.582-11.402-9.636-15.76l-6.129-.876c.316-6.743 4.489-7.106 6.129-12.258 1.445-4.548.152-10.449 2.443-14.653 1.587-2.922 5.183-2.943 6.979-5.445 1.63-2.273 2.704-6.24 3.211-9.021.927-5.086 1.733-12.047-.684-17.093-1.386-2.898-2.264-3.177-2.649-6.691-.471-4.267 1.256-18.175 1.328-21.185.176-7.804-.014-14.862-1.9-22.463 0 0-2.296-6.887-5.888-8.963l-7.166-1.23-4.429-4.104c-17.843-10.977-36.974-3.276-47.214.87-5.7 1.85-10.574 6.125-14.056 12.418-.113 2.086-.152 3.793-.061 4.668.049.457.099.726.124.858.12.228.26.451.402.694.521.893 1.238 2.113 2.042 3.799 5.022 10.492 3.538 23.072 1.981 31.629-.77 4.221-2.655 12.138-6.646 17.706a19.816 19.816 0 0 1-3.354 3.603c.634 6.669 1.994 14.343 5.998 16.851.553.346 4.771 1.404 4.747 1.116l1.749 18.385c1.483 4.076 5.049 4.521 6.082 10.272l-4.56 1.114c-.357.76-.769 1.659-1.224 2.633 9.354 3.854 19.317 8.128 28.973 12.283a2926.156 2926.156 0 0 0 19.229 8.215c2.824 1.195 5.875 2.251 9.104 3.367 12.781 4.424 28.688 9.934 34.72 27.426l.686 1.984v2.097c0 3.885.151 10.146.312 16.776.07 3.02.146 6.148.214 9.276h50.566c.193-9.574-.497-26.843-.497-34.15z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-utilities.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-utilities.svg
deleted file mode 100644
index 5181d06074..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-utilities.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M305.692 268.619v58.607h-99.905v-58.607H37.408v173.058h436.666V268.619H305.692zm-99.905-65.598h99.905v39.939h168.356v-78.883c0-11.743-9.525-21.27-21.273-21.27h-78.438V115.44c-.01-24.944-20.207-45.143-45.151-45.154H182.01c-24.938.012-45.139 20.21-45.152 45.154v27.368H58.404c-11.747 0-21.273 9.526-21.273 21.27v78.883h168.656v-39.94zm-38.149-87.581c.014-7.931 6.44-14.36 14.373-14.374h147.175c7.937.014 14.358 6.443 14.378 14.374v27.368H167.638V115.44zm112.878 186.685v-74.13h-49.829v74.13h49.829z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-vcard.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-vcard.svg
deleted file mode 100644
index 485275849a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-vcard.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M36.742 120.063v272.518h93.897v-32.553h-27.543V334.99h70.108v25.038h-27.541v32.553h219.089v-32.553h-27.543V334.99h70.109v25.038h-27.543v32.553h95.192V120.063H36.742zm209.075 70.952h186.539v25.038H245.817v-25.038zm-49.985 81.036c-2.703-3.315-7.695-4.218-12.017-6.044-5.773-2.436-12.173-5.253-17.932-7.616-1.643-.449-3.285-.895-4.929-1.342-1.963-1.352-3.878-5.84-4.93-8.071-1.045-.148-2.086-.3-3.135-.443.161-3.449 2.295-3.642 3.135-6.278.742-2.326.078-5.345 1.251-7.496.814-1.496 2.65-1.506 3.567-2.789.834-1.162 1.389-3.193 1.644-4.614.479-2.605.891-6.17-.346-8.748-.714-1.483-1.158-1.629-1.356-3.427-.24-2.182.643-9.301.68-10.839.088-3.991-.004-7.612-.97-11.499 0 0-1.175-3.52-3.016-4.586l-3.668-.631-2.264-2.096c-9.135-5.622-18.921-1.683-24.165.444-7.559 2.45-12.334 13.137-8.997 28.942.567 2.7-1.481 3.91-1.344 5.382.291 3.218.354 10.962 3.396 12.873.285.175 2.443.72 2.43.57l.894 9.409c.765 2.088 2.586 2.312 3.112 5.258l-2.333.567c-1.045 2.231-2.967 6.72-4.927 8.071-1.646.447-3.29.893-4.931 1.342-5.757 2.363-12.158 5.181-17.922 7.616-3.906 1.643-8.364 2.515-11.189 5.099V168.482h110.261v103.569zm236.526-8.418H245.816v-25.044h186.542v25.044z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-video.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-video.svg
deleted file mode 100644
index 48cb996cae..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-video.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M344.551 204.658v101.827l124.494 80.393v-262.61l-124.494 80.39zm-45.487-64.712H60.246c-11.292 0-20.447 9.156-20.447 20.447v190.358c0 11.293 9.155 20.447 20.447 20.447h238.818c11.293 0 20.449-9.154 20.449-20.447V160.394c.001-11.292-9.156-20.448-20.449-20.448z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-voice.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-voice.svg
deleted file mode 100644
index 786dc7572c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-voice.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M254.529 321.226c38.885 0 70.41-31.521 70.41-70.41V117.083c0-38.886-31.525-70.41-70.41-70.41-38.888 0-70.409 31.524-70.409 70.41v133.733c.001 38.888 31.522 70.41 70.409 70.41zm95.801-117.199v46.968c-.012 26.512-10.698 50.349-28.057 67.743-17.395 17.363-41.233 28.051-67.744 28.061-26.512-.01-50.354-10.697-67.745-28.061-17.366-17.395-28.049-41.231-28.058-67.743v-46.968h-35.054l-.004 46.968c.014 66.331 49.349 121.077 113.332 129.651v48.715h-57.424v35.057h149.899v-35.057h-57.419v-48.715c63.977-8.574 113.318-63.32 113.33-129.651v-46.968H350.33z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wall-plug.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wall-plug.svg
deleted file mode 100644
index d7d6d12e26..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wall-plug.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M401.938 153.472H346.18V74.12c0-14.128-11.445-25.572-25.539-25.572-14.128 0-25.59 11.444-25.59 25.572v79.352h-88.393V74.12c0-14.128-11.428-25.572-25.571-25.572-14.112 0-25.557 11.444-25.557 25.572v79.352h-46.403v50.768l66.122 120.439h160.565l66.124-120.439v-50.768zM187.594 406.096h42.364v57.001h51.147v-57.001h42.38v-51.14H187.594v51.14z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wallet.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wallet.svg
deleted file mode 100644
index 36506ede4a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wallet.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M445.271 140.871c0-28.207-22.925-51.165-51.113-51.165H65.932v39.277h3.463c6.182 0 11.218 5 11.218 11.2 0 6.18-5.036 11.201-11.218 11.201h-3.463v211.153h3.463c6.182 0 11.218 5.006 11.218 11.201 0 6.164-5.036 11.201-11.218 11.201h-3.463v37.247h328.225c28.188 0 51.113-22.94 51.113-51.132v-60.549h-74.003c-16.221 0-29.432-13.174-29.432-29.446v-50.212c0-16.27 13.211-29.446 29.432-29.446h74.003v-60.53zm-82.05 221.666h19.752v-20.553c0-6.181 5.004-11.183 11.185-11.183 6.182 0 11.187 5.002 11.187 11.183v29.25c0 .654-.035 1.179-.165 1.605-.817 6.803-6.508 12.1-13.474 12.1h-28.484c-6.179 0-11.183-5.037-11.183-11.201-.001-6.195 5.003-11.201 11.182-11.201zm-230.022 22.402h-22.402c-6.182 0-11.183-5.037-11.183-11.201 0-6.195 5.001-11.201 11.183-11.201h22.402c6.181 0 11.215 5.006 11.215 11.201 0 6.164-5.034 11.201-11.215 11.201zm0-233.555h-22.402c-6.182 0-11.183-5.021-11.183-11.201 0-6.199 5.001-11.2 11.183-11.2h22.402c6.181 0 11.215 5 11.215 11.2 0 6.179-5.034 11.201-11.215 11.201zm63.114 233.555H173.91c-6.146 0-11.182-5.037-11.182-11.201 0-6.195 5.035-11.201 11.182-11.201h22.403c6.178 0 11.183 5.006 11.183 11.201 0 6.164-5.004 11.201-11.183 11.201zm0-233.555H173.91c-6.146 0-11.182-5.021-11.182-11.201 0-6.199 5.035-11.2 11.182-11.2h22.403c6.178 0 11.183 5 11.183 11.2 0 6.179-5.004 11.201-11.183 11.201zm63.081 233.555h-22.37c-6.177 0-11.216-5.037-11.216-11.201 0-6.195 5.039-11.201 11.216-11.201h22.37c6.213 0 11.216 5.006 11.216 11.201-.001 6.164-5.004 11.201-11.216 11.201zm0-233.555h-22.37c-6.177 0-11.216-5.021-11.216-11.201 0-6.199 5.039-11.2 11.216-11.2h22.37c6.213 0 11.216 5 11.216 11.2-.001 6.179-5.004 11.201-11.216 11.201zm63.114 233.555h-22.399c-6.183 0-11.185-5.037-11.185-11.201 0-6.195 5.002-11.201 11.185-11.201h22.399c6.18 0 11.217 5.006 11.217 11.201 0 6.164-5.037 11.201-11.217 11.201zm0-233.555h-22.399c-6.183 0-11.185-5.021-11.185-11.201 0-6.199 5.002-11.2 11.185-11.2h22.399c6.18 0 11.217 5 11.217 11.2 0 6.179-5.037 11.201-11.217 11.201zm82.836 20.533c0 6.185-5.005 11.216-11.187 11.216-6.181 0-11.185-5.032-11.185-11.216v-20.533H363.22c-6.179 0-11.183-5.021-11.183-11.201 0-6.199 5.004-11.2 11.183-11.2h28.484c6.966 0 12.656 5.281 13.474 12.065.13.445.165.967.165 1.602v29.267zm-36.663 84.027c0 14.062 11.417 25.459 25.509 25.459 14.029 0 25.444-11.397 25.444-25.459 0-14.042-11.415-25.455-25.444-25.455-14.092 0-25.509 11.412-25.509 25.455z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wand.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wand.svg
deleted file mode 100644
index beeffe5d4e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wand.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M306.997 124.391c8.992 0 16.277-7.286 16.277-16.276V57.184c.002-8.989-7.285-16.276-16.277-16.276-8.983 0-16.271 7.287-16.273 16.276v50.932c0 8.989 7.29 16.278 16.273 16.275zm80.752 23.244l36.015-36.017c6.356-6.357 6.353-16.662 0-23.015-6.357-6.356-16.662-6.356-23.019 0l-36.013 36.014c-6.356 6.356-6.358 16.661 0 23.018 6.354 6.356 16.661 6.353 23.017 0zm-161.066 2.552c6.354 6.353 16.663 6.353 23.018 0 6.353-6.356 6.353-16.662 0-23.018l-36.018-36.018c-6.355-6.353-16.661-6.353-23.015 0-6.359 6.356-6.359 16.662 0 23.018l36.015 36.018zm159.5 113.463c-6.356-6.357-16.663-6.357-23.02 0-6.354 6.355-6.354 16.661 0 23.018l36.015 36.014c6.356 6.356 16.663 6.356 23.018 0 6.358-6.356 6.358-16.658 0-23.015l-36.013-36.017zm-70.019-131.061L37.625 411.125l58.761 58.76 278.541-278.533-58.763-58.763zm-65.195 99.172l67.606-67.608 24.787 24.788-67.606 67.608-24.787-24.788zm205.2-41.684h-50.934c-8.99 0-16.275 7.289-16.275 16.275-.004 8.985 7.285 16.275 16.275 16.275h50.934c8.988 0 16.273-7.29 16.273-16.275 0-8.99-7.285-16.275-16.273-16.275z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-war.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-war.svg
deleted file mode 100644
index ae01d407d2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-war.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M453.475 328.994H57.719c-14.093 0-20.271 10.201-13.734 22.697l29.463 56.295c6.576 12.474 23.449 22.694 37.575 22.694h289.15c14.093 0 31-10.221 37.538-22.694l29.5-56.295c6.539-12.496.359-22.697-13.736-22.697zm-334.146 76.39c-14.095 0-25.539-11.445-25.539-25.539 0-14.112 11.444-25.539 25.539-25.539 14.129 0 25.54 11.427 25.54 25.539 0 14.093-11.411 25.539-25.54 25.539zm92.056 0c-14.094 0-25.509-11.445-25.509-25.539 0-14.112 11.415-25.539 25.509-25.539 14.127 0 25.539 11.427 25.539 25.539 0 14.093-11.412 25.539-25.539 25.539zm92.088-1.109c-13.506 0-24.428-10.959-24.428-24.431 0-13.504 10.922-24.44 24.428-24.44 13.505 0 24.43 10.937 24.43 24.44-.001 13.472-10.925 24.431-24.43 24.431zm92.056 0c-13.474 0-24.432-10.959-24.432-24.431 0-13.504 10.958-24.44 24.432-24.44 13.504 0 24.46 10.937 24.46 24.44 0 13.472-10.956 24.431-24.46 24.431zM117.826 164.26l60.367 35.057c0 .26-.032.523-.032.802v42.625h-49.447l-32.831 56.755h326.428l-32.865-56.755h-48.398v-42.625c0-13.523-10.987-24.476-24.495-24.476H202.656c-.493 0-.919.031-1.375.046l-67.367-39.11 7.719-13.277-71.487-41.499-31.591 54.352 71.487 41.5 7.784-13.395z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-webhook.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-webhook.svg
deleted file mode 100644
index a7c4a87680..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-webhook.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-  <rect width="24" height="24" fill="none"/>
-  <path d="M10.46,19a4.59,4.59,0,0,1-6.37,1.15,4.63,4.63,0,0,1,2.49-8.38l0,1.43a3.17,3.17,0,0,0-2.36,1.36A3.13,3.13,0,0,0,5,18.91a3.11,3.11,0,0,0,4.31-.84,3.33,3.33,0,0,0,.56-1.44v-1l5.58,0,.07-.11a1.88,1.88,0,1,1,.67,2.59,1.77,1.77,0,0,1-.83-1l-4.07,0A5,5,0,0,1,10.46,19m7.28-7.14a4.55,4.55,0,1,1-1.12,9,4.63,4.63,0,0,1-3.43-2.21L14.43,18a3.22,3.22,0,0,0,2.32,1.45,3.05,3.05,0,1,0,.75-6.06,3.39,3.39,0,0,0-1.53.18l-.85.44L12.54,9.2h-.22a1.88,1.88,0,1,1,.13-3.76A1.93,1.93,0,0,1,14.3,7.39a1.88,1.88,0,0,1-.46,1.15l1.9,3.51a4.75,4.75,0,0,1,2-.19M8.25,9.14A4.54,4.54,0,1,1,16.62,5.6a4.61,4.61,0,0,1-.2,4.07L15.18,9a3.17,3.17,0,0,0,.09-2.73A3.05,3.05,0,1,0,9.65,8.6,3.21,3.21,0,0,0,11,10.11l.39.21-3.07,5a1.09,1.09,0,0,1,.1.19,1.88,1.88,0,1,1-2.56-.83,1.77,1.77,0,0,1,1.23-.17l2.31-3.77A4.41,4.41,0,0,1,8.25,9.14Z"/>
-</svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-weight.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-weight.svg
deleted file mode 100644
index cd5f49fbb8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-weight.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M418.059 410.875l-38.232-206.578a15.354 15.354 0 0 0-15.094-12.557h-60.451c10.457-11.557 16.834-26.867 16.834-43.645 0-35.902-29.209-65.115-65.117-65.115-35.902 0-65.115 29.213-65.115 65.115 0 16.777 6.381 32.088 16.838 43.645h-60.457a15.352 15.352 0 0 0-15.092 12.557l-38.23 206.578a15.345 15.345 0 0 0 3.293 12.611 15.344 15.344 0 0 0 11.799 5.533h293.932a15.348 15.348 0 0 0 15.092-18.144zM255.998 111.842c20.025 0 36.258 16.232 36.258 36.254 0 20.027-16.232 36.26-36.258 36.26-20.023 0-36.254-16.232-36.254-36.26 0-20.022 16.231-36.254 36.254-36.254zm-32.58 263.57l-31.246-44.273-7.84 7.947v36.326h-26.199V266.254h26.199v39.406l36.953-39.406h34.926l-45.449 45.553 46.609 63.605h-33.953zm135.893 0h-18.82l-1.715-10.172c-3.086 3.236-5.92 5.621-8.594 7.234-6.1 3.732-13.664 5.627-22.473 5.627-14.461 0-26.492-5.092-35.746-15.135-9.574-10.008-14.439-23.846-14.439-41.109 0-17.428 4.902-31.637 14.574-42.23 9.725-10.66 22.732-16.064 38.656-16.064 13.779 0 25.051 3.582 33.504 10.646 8.494 7.102 13.434 16.092 14.682 26.723l.311 2.645h-26.008l-.426-1.832c-1.488-6.422-5.008-10.779-10.764-13.316-3.26-1.416-6.971-2.139-11.014-2.139-7.752 0-13.939 2.842-18.92 8.682-5.008 5.869-7.547 14.977-7.547 27.061 0 12.068 2.693 20.637 8.01 25.473 5.457 4.961 11.469 7.373 18.385 7.373 6.777 0 12.148-1.863 16.41-5.693 3.656-3.285 6.068-7.354 7.328-12.381h-23.629v-22.164h48.234v60.771z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-width.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-width.svg
deleted file mode 100644
index 77864d37b5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-width.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M322.193 230.358H192.709v-47.99l-89.144 73.576 89.144 73.565V281.52h129.484v47.989l89.143-73.565-89.143-73.576v47.99zM37.735 351.078h51.147V160.816H37.735v190.262zm384.964-190.262v190.262h51.146V160.816h-51.146z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wifi.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wifi.svg
deleted file mode 100644
index 0118ed13b1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wifi.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M162.073 334.729l29.878 29.873c16.092-17.093 38.877-27.82 64.209-27.82 25.336 0 48.119 10.728 64.221 27.82l29.873-29.873c-23.778-24.761-57.131-40.255-94.094-40.255-36.957 0-70.303 15.494-94.087 40.255zm94.087 48.055c-12.612 0-23.822 5.661-31.58 14.446l31.586 31.586 31.584-31.586c-7.764-8.785-18.973-14.446-31.59-14.446zm220.051-177.742c-121.531-121.532-318.568-121.524-440.1 0-.625.625-1.195 1.283-1.812 1.906l30.662 30.663c48.605-49.566 116.294-80.354 191.205-80.354 74.906 0 142.592 30.787 191.203 80.354l30.66-30.663c-.621-.623-1.191-1.281-1.818-1.906zm-220.045-1.785c-59.254 0-114.965 23.073-156.863 64.971-.622.623-1.197 1.279-1.818 1.909l31.976 31.973c32.094-33.061 76.987-53.637 126.7-53.637 49.72 0 94.608 20.576 126.711 53.637l31.967-31.969c-.617-.634-1.195-1.29-1.819-1.913-41.899-41.898-97.603-64.971-156.854-64.971z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-window-popin.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-window-popin.svg
deleted file mode 100644
index aec2173f09..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-window-popin.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M366.118 238.292l96.957-96.959-44.246-44.249-96.962 96.958-39.571-39.575v124.138h124.135zm60.672 140.334H85.21V133.372h181.197V97.084H48.925v317.832h414.15V304.363H426.79z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-window-sizes.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-window-sizes.svg
deleted file mode 100644
index 26af884833..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-window-sizes.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M49.525 292.792h169.383v113.943H49.525zm0-97.951v74.273h29.106V223.95H335.41v153.682h-92.824v29.103h121.93V194.841H78.631zm0-89.576v61.855h29.106v-32.748h354.738v243.26h-41.131v29.103h70.239v-301.47z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-windows.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-windows.svg
deleted file mode 100644
index 3e00719e9e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-windows.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M229.882 259.469c-18.919-11.596-37.02-21.375-59.731-23.158-27.751-2.188-55.429 6.158-80.847 16.53L52.779 380.639c48.963-18.699 94.119-20.855 139.427 7.877l37.692-129.039s-.008-.008-.016-.008m-48.833-49.548c23.059 2.835 41.371 12.591 56.304 21.974 12.356-42.651 24.59-85.335 37.052-127.946-17.793-11.319-35.975-21.131-57.284-23.254-28.043-3.347-57.26 5.064-82.912 15.557-12.502 42.748-24.746 85.578-37.11 128.367 26.479-10.388 55.292-18.215 83.95-14.698m149.499 90.261c-34.347 0-57.722-12.104-77.752-25.426-.097.113-.251.211-.364.293l-37.109 128.439c47.042 31.178 100.299 30.887 151.458 9.285l35.983-125.539-.323.082c-27.128 9.075-50.909 12.866-71.893 12.866m117.907-171.625c-.098-.065-.179-.146-.26-.227-51.67 20.977-102.577 23.173-150.544-8.703-2.195 7.568-4.214 13.289-5.492 17.728l-12.715 43.997c-6.497 22.525-13.004 45.05-19.51 67.566 46.889 30.312 100.105 31.932 150.933 9.092l37.668-129.381-.08-.072"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wine-glass.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wine-glass.svg
deleted file mode 100644
index abb0115e23..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wine-glass.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M271.017 409.8V274.197c64.194-7.588 114.194-62.334 114.194-128.535 0-18.39-4.25-55.384-15.729-76.408l-8.111-14.917H150.118l-8.142 14.917c-11.447 21.05-15.697 58.018-15.697 76.408 0 66.889 50.949 122.083 116.122 128.777V409.8c-52.388 1.594-92.806 11.767-92.806 24.07 0 13.414 47.973 24.288 107.131 24.288 59.124 0 107.066-10.874 107.066-24.288.001-12.304-40.421-22.476-92.775-24.07z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wrench.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wrench.svg
deleted file mode 100644
index 96040a486e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wrench.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M411.685 161.576l-48.849-13.089-13.093-48.851 49.864-49.864c-29.43-7.945-62.171-.389-85.272 22.712-23.24 23.237-30.747 56.229-22.568 85.794L157.22 292.826c-29.565-8.176-62.555-.668-85.797 22.569-23.1 23.101-30.655 55.843-22.71 85.274l49.866-49.861 48.85 13.088 13.09 48.851-49.864 49.864c29.43 7.941 62.172.386 85.271-22.715 24.258-24.254 31.373-59.141 21.405-89.658L349.183 218.39c30.52 9.972 65.401 2.853 89.653-21.404 23.103-23.101 30.657-55.843 22.713-85.273l-49.864 49.863z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wrong.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wrong.svg
deleted file mode 100644
index 09f0a7376d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-wrong.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M422.952 371.305L307.064 255.418l115.884-115.887-51.722-51.723L255.34 203.693 139.457 87.812l-51.726 51.719 115.885 115.885L87.731 371.305l51.726 51.721L255.344 307.14l115.884 115.882z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-yen-bag.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-yen-bag.svg
deleted file mode 100644
index 2680a40cca..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-yen-bag.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M324.816 172.772l.014.027c-.08-.108-.146-.213-.242-.319a810.557 810.557 0 0 0-12.461-16.761c-5.395-9.025-8.242-20.006-1.619-35.849v-.009l22.776-54.505-35.808-16.298 3.696-16.156h-89.834l4.708 20.585-36.804 11.869 22.761 54.505.018.009c11.247 26.945-4.856 39.813-14.325 52.928-46.861 64.796-99.313 157.564-99.313 213.49 0 92.734 72.008 89.646 167.857 89.646 95.881 0 167.889 3.088 167.889-89.646 0-55.934-52.467-148.702-99.313-213.516zm-91.138-45.504h45.879v28.931h-45.879v-28.931zm73.431 179.369v20.791h-31.283l-3.282 6.344v10.058h34.565v20.782h-34.565v30.181h-33.245v-30.181h-34.336V343.83h34.336v-10.058l-3.041-6.344h-31.295v-20.791h20.801l-33.489-68.015h35.449l28.859 68.015 28.221-68.015h35.435l-33.915 68.015h20.785z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zip.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zip.svg
deleted file mode 100644
index 2691f1c586..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zip.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M239.408 400.078h27.732v-38.637h-27.732v38.637zM398.535 38.141H289.933v12.911h-52.355V68.32h-21.519V38.14H113.047c-13.373 0-24.164 10.822-24.164 24.162v386.011c0 13.359 10.791 24.169 24.164 24.169h285.488c13.343 0 24.164-10.81 24.164-24.169V62.303c0-13.34-10.821-24.162-24.164-24.162zM252.621 66.428h36.296v30.771H267.4V79.933h-14.779V66.428zm0 57.027h36.296v30.771H267.4v-17.262h-14.779v-13.509zm0 55.986h36.296v30.771H267.4v-17.264h-14.779v-13.507zm0 58.471h36.296v13.524h-36.296v-13.524zM216.059 94.577h36.332v13.511h-14.813v17.266h-21.519V94.577zm0 55.989h36.332v13.507h-14.813v17.263h-21.519v-30.77zm0 58.471h36.332v13.521h-14.813v17.283h-21.519v-30.804zm59.549 207.754h-44.702c-13.899 0-23.513-11.214-21.454-24.951l7.522-49.15c2.062-13.707 15.142-24.919 29.007-24.919h14.552c13.866 0 26.913 11.212 29.005 24.919l7.491 49.15c2.124 13.737-7.522 24.951-21.421 24.951zm-8.895-115.7h-27.827l-33.324-32.326h94.475l-33.324 32.326z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zom-out.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zom-out.svg
deleted file mode 100644
index 8afc74de61..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zom-out.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M471.012 406.744l-2.691-2.688.006-.006-107.515-107.521c14.937-25.73 23.615-55.564 23.818-87.448.631-97.618-77.989-177.245-175.596-177.856-.393-.004-.774-.004-1.167-.004-97.062.004-176.067 78.391-176.693 175.598-.617 97.609 78 177.237 175.598 177.859h1.15c32.447 0 62.846-8.787 89-24.07l107.421 107.429.01-.01 2.688 2.687c8.123 8.123 21.292 8.117 29.414 0l34.556-34.552c8.118-8.119 8.123-21.293.001-29.418zM300.693 301.357c-24.835 24.668-57.778 38.252-92.77 38.252h-.862c-72.591-.465-131.276-59.906-130.816-132.504.464-72.127 59.511-130.809 131.628-130.816h.877c35.169.223 68.144 14.127 92.849 39.15 24.706 25.027 38.188 58.177 37.963 93.352-.222 35.02-14.025 67.895-38.869 92.566zm-178.876-67.341h177.254v-54.224H121.817v54.224z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zoom-in.svg b/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zoom-in.svg
deleted file mode 100644
index df7748938e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/icons/icon-zoom-in.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M471.823 407.401l-2.69-2.691.005-.006-107.515-107.518c14.938-25.734 23.617-55.566 23.822-87.453.627-97.611-77.992-177.241-175.599-177.854-.394-.002-.773-.002-1.167-.002-97.062.006-176.067 78.389-176.693 175.599-.617 97.608 78 177.231 175.598 177.857.385.005.762.005 1.149.005 32.445 0 62.846-8.792 89.003-24.078l107.42 107.435.01-.01 2.688 2.685c8.121 8.125 21.289 8.118 29.412 0l34.556-34.555c8.118-8.118 8.122-21.294.001-29.414zM301.504 302.017c-24.832 24.667-57.781 38.251-92.77 38.251l-.861-.004c-72.59-.464-131.275-59.904-130.816-132.499.226-35.015 14.03-67.888 38.875-92.563 24.833-24.667 57.773-38.252 92.751-38.252h.882c35.164.223 68.138 14.121 92.847 39.146 24.705 25.028 38.189 58.178 37.963 93.354-.223 35.013-14.027 67.889-38.871 92.567zM238.365 115.8h-54.219v61.519H122.63v54.222h61.516v61.519h54.219v-61.52h61.52v-54.222h-61.52V115.8z"/></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/.gitignore b/src/Umbraco.Web.UI.Client/src/assets/img/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png
deleted file mode 100644
index f134fd3006..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.svg
deleted file mode 100644
index 54cab15d6a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<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"
-	 viewBox="0 0 468 468" style="enable-background:new 0 0 468 468;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#283A97;}
-</style>
-<path class="st0" d="M5.5,233.7C5.7,107.5,108.1,5.3,234.3,5.5s228.4,102.6,228.2,228.8C462.3,360.4,360.1,462.5,234,462.5
-	C107.7,462.4,5.4,360,5.5,233.7L5.5,233.7z M229.4,312c-17.7,0.5-35.4-1.1-52.8-4.8c-12.8-2.6-23.6-11.2-28.9-23.1
-	c-5.2-11.9-7.7-30.3-7.5-55.1c0.1-13,0.9-25.9,2.4-38.8c1.5-12.6,2.9-22.9,4.4-31.1l1.6-8.1c0-0.2,0-0.5,0-0.7
-	c0-2.3-1.6-4.2-3.8-4.6l-29.5-4.6h-0.7c-2.2,0-4,1.5-4.5,3.6c-0.5,1.9-0.8,3.3-1.7,7.8c-1.7,8.7-3.2,17.1-5,29.5
-	c-1.8,13.4-2.9,26.9-3.3,40.4c-0.6,9.4-0.6,18.9,0,28.3c0.7,25,5,45,12.9,59.9s21.2,25.7,40.1,32.3c18.8,6.6,45.1,9.8,78.7,9.6h4.2
-	c33.7,0.1,59.9-3.1,78.7-9.6c18.8-6.6,32.2-17.3,40.1-32.3c7.9-15,12.2-34.9,12.9-59.9c0.6-9.4,0.6-18.9,0-28.3
-	c-0.4-13.5-1.5-27-3.3-40.4c-1.7-12.2-3.3-20.6-5-29.5c-0.9-4.5-1.2-5.9-1.7-7.8c-0.5-2.1-2.3-3.6-4.5-3.6h-0.8l-29.5,4.6
-	c-2.2,0.4-3.9,2.3-3.9,4.6c0,0.2,0,0.5,0,0.7l1.6,8.1c1.5,8.2,3,18.5,4.5,31c1.5,12.9,2.3,25.9,2.4,38.8c0.2,24.8-2.3,43.2-7.6,55.1
-	c-5.2,11.9-15.9,20.5-28.6,23.2c-17.3,3.7-35.1,5.3-52.8,4.8L229.4,312L229.4,312z"/>
-</svg>
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.svg
deleted file mode 100644
index 309899db48..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo_white.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_2_00000127045745957262868980000010863085425149044135_"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 468 468"
-	 style="enable-background:new 0 0 468 468;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<g id="Layer_1-2">
-	<path class="st0" d="M5.5,233.7C5.7,107.5,108.1,5.3,234.3,5.5s228.3,102.6,228.2,228.8C462.3,360.4,360.1,462.5,234,462.5
-		C107.7,462.4,5.4,360,5.5,233.7L5.5,233.7L5.5,233.7z M229.4,312c-17.7,0.5-35.4-1.1-52.8-4.8c-12.8-2.6-23.6-11.2-28.9-23.1
-		c-5.2-11.9-7.7-30.3-7.5-55.1c0.1-13,0.9-25.9,2.4-38.8c1.5-12.6,2.9-22.9,4.4-31.1l1.6-8.1c0-0.2,0-0.5,0-0.7
-		c0-2.3-1.6-4.2-3.8-4.6l-29.5-4.6h-0.7c-2.2,0-4,1.5-4.5,3.6c-0.5,1.9-0.8,3.3-1.7,7.8c-1.7,8.7-3.2,17.1-5,29.5
-		c-1.8,13.4-2.9,26.9-3.3,40.4c-0.6,9.4-0.6,18.9,0,28.3c0.7,25,5,45,12.9,59.9s21.2,25.7,40.1,32.3c18.8,6.6,45.1,9.8,78.7,9.6h4.2
-		c33.7,0.1,59.9-3.1,78.7-9.6c18.8-6.6,32.1-17.3,40.1-32.3c7.9-15,12.2-34.9,12.9-59.9c0.6-9.4,0.6-18.9,0-28.3
-		c-0.4-13.5-1.5-27-3.3-40.4c-1.7-12.2-3.3-20.6-5-29.5c-0.9-4.5-1.2-5.9-1.7-7.8c-0.5-2.1-2.4-3.6-4.5-3.6h-0.7l-29.5,4.6
-		c-2.2,0.4-3.9,2.3-3.9,4.6c0,0.2,0,0.5,0,0.7l1.6,8.1c1.5,8.2,3,18.5,4.5,31c1.5,12.9,2.3,25.9,2.4,38.8
-		c0.2,24.8-2.3,43.2-7.6,55.1c-5.2,11.9-15.9,20.5-28.6,23.2c-17.3,3.7-35.1,5.3-52.8,4.8H229.4L229.4,312z"/>
-</g>
-</svg>
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_blue.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_blue.svg
deleted file mode 100644
index 578bf592f6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_blue.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_2_00000159465072208785227250000008040336475015305350_"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1256.6 344.8"
-	 style="enable-background:new 0 0 1256.6 344.8;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#283A97;}
-</style>
-<g id="Layer_1-2">
-	<g>
-		<path class="st0" d="M5,172.2C5.1,79.7,80.2,4.9,172.6,5s167.3,75.2,167.2,167.6c-0.1,92.4-75,167.2-167.4,167.2
-			C79.9,339.7,5,264.7,5,172.2L5,172.2L5,172.2z M169,229.5c-13,0.4-26-0.8-38.7-3.5c-9.4-1.9-17.3-8.2-21.2-17
-			c-3.8-8.7-5.6-22.2-5.5-40.4c0.1-9.5,0.7-19,1.8-28.4c1.1-9.2,2.2-16.8,3.2-22.8l1.1-5.9c0-0.2,0-0.3,0-0.5c0-1.7-1.2-3.1-2.8-3.4
-			l-21.6-3.4H85c-1.6,0-2.9,1.1-3.3,2.6c-0.4,1.4-0.6,2.4-1.2,5.7c-1.2,6.4-2.4,12.6-3.6,21.6c-1.3,9.8-2.1,19.7-2.4,29.6
-			c-0.5,6.9-0.5,13.8,0,20.7c0.5,18.3,3.7,33,9.4,43.9s15.6,18.8,29.4,23.6c13.8,4.8,33,7.2,57.7,7.1h3.1
-			c24.7,0.1,43.9-2.2,57.7-7.1c13.8-4.8,23.6-12.7,29.4-23.6c5.8-11,8.9-25.6,9.4-43.9c0.5-6.9,0.5-13.8,0-20.7
-			c-0.3-9.9-1.1-19.8-2.4-29.6c-1.3-9-2.4-15.1-3.6-21.6c-0.6-3.3-0.9-4.3-1.2-5.7c-0.4-1.5-1.7-2.6-3.3-2.6h-0.6l-21.6,3.4
-			c-1.6,0.3-2.8,1.7-2.8,3.4c0,0.2,0,0.3,0,0.5l1.2,5.9c1.1,6,2.2,13.6,3.3,22.7c1.1,9.4,1.7,18.9,1.8,28.4
-			c0.2,18.2-1.7,31.6-5.5,40.4c-3.8,8.7-11.6,15-20.9,17c-12.7,2.7-25.7,3.9-38.7,3.5L169,229.5L169,229.5z"/>
-		<g>
-			<path class="st0" d="M1155.2,186.1c0-33.4,9.6-56.9,48.2-56.9s48.2,23.5,48.2,56.9s-9.6,56.9-48.2,56.9
-				S1155.2,219.5,1155.2,186.1z M1227.1,186.1c0-23.2-3-36.5-23.6-36.5s-23.6,13.3-23.6,36.5s3.1,36.5,23.6,36.5
-				S1227.1,209.2,1227.1,186.1z"/>
-			<path class="st0" d="M487.2,238.7c0.6,1,1.6,1.6,2.8,1.6h9c1.8,0,3.2-1.4,3.2-3.2l0,0V135c0-1.8-1.4-3.2-3.2-3.2h-18
-				c-1.8,0-3.2,1.4-3.2,3.2v81c-7.7,4.3-16.4,6.5-25.2,6.3c-11.5,0-17.2-5-17.2-16.1V135c0-1.8-1.4-3.2-3.2-3.2h-17.9
-				c-1.8,0-3.2,1.4-3.2,3.2v73.4c0,20.8,9.8,34.5,37.3,34.5c12.6-0.1,24.9-4.1,35.2-11.3l3.2,7.2L487.2,238.7L487.2,238.7z"/>
-			<path class="st0" d="M689.8,163.7c0-20.6-10.2-34.5-35.9-34.5c-12.4,0-24.5,3.8-34.8,10.7c-4.6-6.7-13.3-10.7-27.8-10.7
-				c-11.8,0.2-23.3,4.2-32.8,11.3l-3.2-7.2l0,0c-0.6-1-1.6-1.7-2.8-1.7h-9c-1.8,0-3.2,1.4-3.2,3.2v102.1c0,1.8,1.4,3.2,3.2,3.2h18
-				c1.8,0,3.2-1.4,3.2-3.2v-80.8c6.9-4.1,14.8-6.3,22.8-6.3c9.8,0,15.4,3.6,15.4,14v73.4c0,1.8,1.4,3.2,3.2,3.2h18
-				c1.8,0,3.2-1.4,3.2-3.2v-81.1c6.8-4.2,14.8-6.4,22.8-6.4c9.6,0,15.4,3.6,15.4,14v73.4c0,1.8,1.4,3.2,3.2,3.2h18
-				c1.8,0,3.2-1.4,3.2-3.2l0,0L689.8,163.7L689.8,163.7z"/>
-			<path class="st0" d="M745.4,231.7c10.2,7.5,22.5,11.5,35.2,11.3c31.7,0,43.4-21.3,43.4-56.9s-11.7-56.9-43.4-56.9
-				c-10.3,0.1-20.4,3-29.1,8.5v-32.8c0-1.8-1.4-3.2-3.2-3.2h-18c-1.8,0-3.2,1.4-3.2,3.2v132.3c0,1.8,1.4,3.2,3.2,3.2h9
-				c1.2,0,2.2-0.6,2.8-1.6l0,0L745.4,231.7L745.4,231.7z M774.9,222.3c-8.2,0-16.3-2.1-23.4-6.3v-59.9c7.1-4.1,15.2-6.3,23.4-6.3
-				c21.3,0,24.5,16.3,24.5,36.2S796.2,222.3,774.9,222.3L774.9,222.3L774.9,222.3z"/>
-			<path class="st0" d="M913.9,150.5c-2.8-0.4-5.6-0.6-8.5-0.5c-9.7-0.4-19.3,1.9-27.8,6.5v80.6c0,1.8-1.4,3.2-3.2,3.2h-18
-				c-1.8,0-3.2-1.4-3.2-3.2V135c0-1.8,1.4-3.2,3.2-3.2h9c1.2,0,2.2,0.6,2.8,1.6l0,0l3.2,7.2c9.9-7.5,22-11.5,34.4-11.3
-				c2.8,0,5.7,0.2,8.5,0.7l0,0c1.7,0,3,2.7,3,4.4v13c0,1.8-1.4,3.2-3.2,3.2h-0.2"/>
-			<path class="st0" d="M976.1,190.2c-10.7,1.3-17.2,5.4-17.2,16.7c0,8.3,3.6,16.1,16.7,16.1c8.3,0.1,16.4-2.4,23.2-7.2v-28.1
-				L976.1,190.2L976.1,190.2z M1004.8,231.7C995.5,239,984,243,972.1,243c-28,0-37.3-17.4-37.3-34.8c0-23.5,15.2-33.4,39.7-35.4
-				l24.4-1.9v-5.4c0-11.1-5.2-15.4-21.3-15.4c-10.1,0-20.1,1.7-29.6,4.9c-0.3,0.1-0.7,0.1-1,0c-1.8,0-3.2-1.4-3.2-3.2v-14.4
-				c0-1.4,0.8-2.6,2.1-3.1l0,0c10.8-3.6,22.1-5.4,33.5-5.4c35.6,0,43.8,15.6,43.8,38.7v69.3c0,1.8-1.4,3.2-3.2,3.2h-9
-				c-1.2,0-2.2-0.6-2.8-1.6l0,0L1004.8,231.7L1004.8,231.7z"/>
-			<path class="st0" d="M1128.6,218c0.3,0,0.7,0,1,0c1.8,0,3.2,1.4,3.2,3.2v14.4c0,1.3-0.8,2.5-2,3l0,0c-8.9,3.2-18.4,4.8-27.9,4.6
-				c-38.5,0-50.3-23-50.3-56.9s11.8-56.9,50.3-56.9c9.4-0.2,18.9,1.2,27.8,4.4l0,0c1.2,0.5,2,1.7,2,3v14.5c0,1.8-1.4,3.2-3.2,3.2
-				c-0.4,0.1-0.7,0.1-1.1,0l0,0c-7.8-2.5-16-3.7-24.2-3.6c-21.1,0-27.2,14.4-27.2,35.4s6.1,35.4,27.2,35.4
-				c8.2,0.1,16.4-1.1,24.2-3.6"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_blue.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_blue.svg
deleted file mode 100644
index 3fc811eaba..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_blue.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.6.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<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"
-	 viewBox="0 0 1025.1 908.1" style="enable-background:new 0 0 1025.1 908.1;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#283A97;}
-</style>
-<path class="st0" d="M167.4,354C167.6,163.2,322.5,8.7,513.2,9s345.2,155.1,345,345.9c-0.3,190.6-154.9,345-345.4,345
-	C321.9,699.7,167.3,544.9,167.4,354L167.4,354z M505.8,472.3c-26.8,0.7-53.6-1.7-79.8-7.3c-19.4-3.9-35.6-17-43.7-35
-	c-7.8-18-11.6-45.8-11.3-83.4c0.1-19.6,1.4-39.2,3.7-58.7c2.2-19,4.4-34.6,6.7-46.9l2.4-12.2c0-0.4,0-0.7,0-1.1
-	c0-3.4-2.4-6.3-5.8-6.9l-44.6-6.9h-1c-3.3,0-6.1,2.2-6.8,5.4c-0.8,2.9-1.2,5-2.5,11.8c-2.5,13.1-4.9,25.9-7.5,44.6
-	c-2.8,20.3-4.4,40.7-5,61.1c-1,14.2-1,28.5,0,42.8c1.1,37.8,7.6,68,19.5,90.6s32.1,38.8,60.6,48.8c28.5,9.9,68.1,14.8,119,14.6h6.4
-	c50.9,0.2,90.6-4.6,119-14.6c28.4-9.9,48.6-26.2,60.6-48.8c11.9-22.6,18.4-52.8,19.5-90.6c1-14.2,1-28.5,0-42.8
-	c-0.6-20.4-2.3-40.8-5-61.1c-2.6-18.5-5-31.2-7.5-44.6c-1.3-6.8-1.8-8.9-2.5-11.8c-0.7-3.2-3.6-5.4-6.8-5.4H692l-44.6,6.9
-	c-3.4,0.6-5.9,3.5-5.8,6.9c0,0.4,0,0.7,0,1.1L644,241c2.3,12.4,4.5,28,6.8,46.9c2.3,19.5,3.5,39.1,3.6,58.7
-	c0.4,37.5-3.4,65.3-11.4,83.3c-7.9,18-24,31-43.2,35.1c-26.2,5.6-53,8-79.8,7.2L505.8,472.3z"/>
-<path class="st0" d="M814,848.2c0-31.1,8.9-53,44.9-53s44.9,21.8,44.9,53s-8.9,53-44.9,53S814,879.3,814,848.2z M880.9,848.2
-	c0-21.7-2.8-34-22-34s-22,12.3-22,34s2.8,34,22,34S880.9,869.8,880.9,848.2z"/>
-<path class="st0" d="M192,897.2c0.5,0.9,1.5,1.5,2.6,1.5h8.4c1.7,0,3-1.3,3-3l0,0v-95.1c0-1.7-1.3-3-3-3h-16.8c-1.7,0-3,1.3-3,3
-	v75.5c-7.1,4-15.2,6.1-23.4,5.9c-10.7,0-16-4.7-16-15v-66.4c0-1.7-1.3-3-3-3h-16.7c-1.7,0-3,1.3-3,3V869c0,19.4,9.1,32.1,34.8,32.1
-	c11.7-0.1,23.1-3.8,32.8-10.5l3,6.7L192,897.2z"/>
-<path class="st0" d="M380.6,827.3c0-19.2-9.5-32.2-33.5-32.2c-11.5,0-22.8,3.5-32.4,10c-4.2-6.2-12.4-10-25.9-10
-	c-11,0.2-21.7,3.9-30.5,10.5l-2.9-6.7l0,0c-0.5-0.9-1.5-1.5-2.6-1.5h-8.4c-1.7,0-3,1.3-3,3v95.1c0,1.7,1.3,3,3,3h16.7
-	c1.7,0,3-1.3,3-3v-75.2c6.4-3.9,13.7-5.9,21.2-5.8c9.1,0,14.4,3.3,14.4,13v68.4c0,1.7,1.3,3,3,3h16.7c1.7,0,3-1.3,3-3v-75.5
-	c6.4-4,13.7-6,21.2-5.9c8.9,0,14.4,3.3,14.4,13v68.4c0,1.7,1.3,3,3,3l0,0h16.7c1.7,0,3-1.3,3-3l0,0L380.6,827.3z"/>
-<path class="st0" d="M432.4,890.7c9.5,7,21,10.7,32.8,10.5c29.5,0,40.4-19.8,40.4-53s-10.9-53-40.4-53c-9.6,0.1-19,2.8-27.1,7.9
-	v-30.6c0-1.7-1.3-3-3-3h-16.7c-1.7,0-3,1.3-3,3v123.2c0,1.7,1.3,3,3,3h8.4c1.1,0,2.1-0.6,2.6-1.5l0,0L432.4,890.7z M459.8,882
-	c-7.7,0-15.2-2-21.8-5.9v-55.8c6.6-3.9,14.2-5.9,21.8-5.8c19.8,0,22.9,15.2,22.9,33.8S479.7,882,459.8,882L459.8,882z"/>
-<path class="st0" d="M589.3,815.1c-2.6-0.4-5.2-0.5-7.9-0.5c-9-0.4-18,1.7-25.9,6.1v75.1c0,1.7-1.3,3-3,3h-16.7c-1.7,0-3-1.3-3-3
-	v-95.1c0-1.7,1.3-3,3-3h8.4c1.1,0,2.1,0.6,2.6,1.5l0,0l2.9,6.7c9.2-7,20.5-10.7,32-10.5c2.7,0,5.3,0.2,7.9,0.7l0,0
-	c1.5,0,2.8,2.5,2.8,4.1v12.1c0,1.7-1.3,3-3,3h-0.2"/>
-<path class="st0" d="M647.2,852c-10,1.2-16,5-16,15.6c0,7.7,3.3,15,15.6,15c7.7,0.1,15.3-2.3,21.7-6.7v-26.2L647.2,852z M674,890.7
-	c-8.7,6.8-19.4,10.6-30.5,10.5c-26.1,0-34.8-16.2-34.8-32.4c0-21.8,14.2-31.2,37-33l22.7-1.8v-5c0-10.3-4.8-14.3-19.8-14.3
-	c-9.4,0-18.7,1.5-27.6,4.6c-0.3,0-0.6,0-0.9,0c-1.7,0-3-1.3-3-3v-13.4c0-1.3,0.8-2.4,1.9-2.8l0,0c10.1-3.4,20.6-5.1,31.2-5
-	c33.2,0,40.8,14.6,40.8,36v64.5c0,1.7-1.3,3-3,3l0,0h-8.4c-1.1,0-2.1-0.6-2.6-1.5l0,0L674,890.7z"/>
-<path class="st0" d="M789.2,877.9c0.3,0,0.6,0,0.9,0c1.7,0,3,1.3,3,3v13.4c0,1.2-0.7,2.3-1.8,2.8l0,0c-8.3,3-17.1,4.4-26,4.2
-	c-35.8,0-46.8-21.5-46.8-53s10.9-53,46.8-53c8.8-0.2,17.6,1.2,25.9,4.1l0,0c1.1,0.5,1.9,1.6,1.9,2.8v13.5c0,1.7-1.3,3-3,3
-	c-0.3,0-0.7,0-1,0l0,0c-7.3-2.3-14.9-3.5-22.5-3.3c-19.6,0-25.3,13.4-25.3,33s5.7,33,25.3,33c7.6,0.1,15.3-1,22.5-3.3"/>
-</svg>
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_white.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_white.svg
deleted file mode 100644
index 7193f3ed0b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_white.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.6.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<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"
-	 viewBox="0 0 1025.1 908.1" style="enable-background:new 0 0 1025.1 908.1;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<path class="st0" d="M167.4,354C167.6,163.2,322.5,8.7,513.2,9s345.2,155.1,345,345.9c-0.3,190.6-154.9,345-345.4,345
-	C321.9,699.7,167.3,544.9,167.4,354L167.4,354z M505.8,472.3c-26.8,0.7-53.6-1.7-79.8-7.3c-19.4-3.9-35.6-17-43.7-35
-	c-7.8-18-11.6-45.8-11.3-83.4c0.1-19.6,1.4-39.2,3.7-58.7c2.2-19,4.4-34.6,6.7-46.9l2.4-12.2c0-0.4,0-0.7,0-1.1
-	c0-3.4-2.4-6.3-5.8-6.9l-44.6-6.9h-1c-3.3,0-6.1,2.2-6.8,5.4c-0.8,2.9-1.2,5-2.5,11.8c-2.5,13.1-4.9,25.9-7.5,44.6
-	c-2.8,20.3-4.4,40.7-5,61.1c-1,14.2-1,28.5,0,42.8c1.1,37.8,7.6,68,19.5,90.6s32.1,38.8,60.6,48.8c28.5,9.9,68.1,14.8,119,14.6h6.4
-	c50.9,0.2,90.6-4.6,119-14.6c28.4-9.9,48.6-26.2,60.6-48.8c11.9-22.6,18.4-52.8,19.5-90.6c1-14.2,1-28.5,0-42.8
-	c-0.6-20.4-2.3-40.8-5-61.1c-2.6-18.5-5-31.2-7.5-44.6c-1.3-6.8-1.8-8.9-2.5-11.8c-0.7-3.2-3.6-5.4-6.8-5.4H692l-44.6,6.9
-	c-3.4,0.6-5.9,3.5-5.8,6.9c0,0.4,0,0.7,0,1.1L644,241c2.3,12.4,4.5,28,6.8,46.9c2.3,19.5,3.5,39.1,3.6,58.7
-	c0.4,37.5-3.4,65.3-11.4,83.3c-7.9,18-24,31-43.2,35.1c-26.2,5.6-53,8-79.8,7.2L505.8,472.3z"/>
-<path class="st0" d="M814,848.2c0-31.1,8.9-53,44.9-53s44.9,21.8,44.9,53s-8.9,53-44.9,53S814,879.3,814,848.2z M880.9,848.2
-	c0-21.7-2.8-34-22-34s-22,12.3-22,34s2.8,34,22,34S880.9,869.8,880.9,848.2z"/>
-<path class="st0" d="M192,897.2c0.5,0.9,1.5,1.5,2.6,1.5h8.4c1.7,0,3-1.3,3-3l0,0v-95.1c0-1.7-1.3-3-3-3h-16.8c-1.7,0-3,1.3-3,3
-	v75.5c-7.1,4-15.2,6.1-23.4,5.9c-10.7,0-16-4.7-16-15v-66.4c0-1.7-1.3-3-3-3h-16.7c-1.7,0-3,1.3-3,3V869c0,19.4,9.1,32.1,34.8,32.1
-	c11.7-0.1,23.1-3.8,32.8-10.5l3,6.7L192,897.2z"/>
-<path class="st0" d="M380.6,827.3c0-19.2-9.5-32.2-33.5-32.2c-11.5,0-22.8,3.5-32.4,10c-4.2-6.2-12.4-10-25.9-10
-	c-11,0.2-21.7,3.9-30.5,10.5l-2.9-6.7l0,0c-0.5-0.9-1.5-1.5-2.6-1.5h-8.4c-1.7,0-3,1.3-3,3v95.1c0,1.7,1.3,3,3,3h16.7
-	c1.7,0,3-1.3,3-3v-75.2c6.4-3.9,13.7-5.9,21.2-5.8c9.1,0,14.4,3.3,14.4,13v68.4c0,1.7,1.3,3,3,3h16.7c1.7,0,3-1.3,3-3v-75.5
-	c6.4-4,13.7-6,21.2-5.9c8.9,0,14.4,3.3,14.4,13v68.4c0,1.7,1.3,3,3,3l0,0h16.7c1.7,0,3-1.3,3-3l0,0L380.6,827.3z"/>
-<path class="st0" d="M432.4,890.7c9.5,7,21,10.7,32.8,10.5c29.5,0,40.4-19.8,40.4-53s-10.9-53-40.4-53c-9.6,0.1-19,2.8-27.1,7.9
-	v-30.6c0-1.7-1.3-3-3-3h-16.7c-1.7,0-3,1.3-3,3v123.2c0,1.7,1.3,3,3,3h8.4c1.1,0,2.1-0.6,2.6-1.5l0,0L432.4,890.7z M459.8,882
-	c-7.7,0-15.2-2-21.8-5.9v-55.8c6.6-3.9,14.2-5.9,21.8-5.8c19.8,0,22.9,15.2,22.9,33.8S479.7,882,459.8,882L459.8,882z"/>
-<path class="st0" d="M589.3,815.1c-2.6-0.4-5.2-0.5-7.9-0.5c-9-0.4-18,1.7-25.9,6.1v75.1c0,1.7-1.3,3-3,3h-16.7c-1.7,0-3-1.3-3-3
-	v-95.1c0-1.7,1.3-3,3-3h8.4c1.1,0,2.1,0.6,2.6,1.5l0,0l2.9,6.7c9.2-7,20.5-10.7,32-10.5c2.7,0,5.3,0.2,7.9,0.7l0,0
-	c1.5,0,2.8,2.5,2.8,4.1v12.1c0,1.7-1.3,3-3,3h-0.2"/>
-<path class="st0" d="M647.2,852c-10,1.2-16,5-16,15.6c0,7.7,3.3,15,15.6,15c7.7,0.1,15.3-2.3,21.7-6.7v-26.2L647.2,852z M674,890.7
-	c-8.7,6.8-19.4,10.6-30.5,10.5c-26.1,0-34.8-16.2-34.8-32.4c0-21.8,14.2-31.2,37-33l22.7-1.8v-5c0-10.3-4.8-14.3-19.8-14.3
-	c-9.4,0-18.7,1.5-27.6,4.6c-0.3,0-0.6,0-0.9,0c-1.7,0-3-1.3-3-3v-13.4c0-1.3,0.8-2.4,1.9-2.8l0,0c10.1-3.4,20.6-5.1,31.2-5
-	c33.2,0,40.8,14.6,40.8,36v64.5c0,1.7-1.3,3-3,3l0,0h-8.4c-1.1,0-2.1-0.6-2.6-1.5l0,0L674,890.7z"/>
-<path class="st0" d="M789.2,877.9c0.3,0,0.6,0,0.9,0c1.7,0,3,1.3,3,3v13.4c0,1.2-0.7,2.3-1.8,2.8l0,0c-8.3,3-17.1,4.4-26,4.2
-	c-35.8,0-46.8-21.5-46.8-53s10.9-53,46.8-53c8.8-0.2,17.6,1.2,25.9,4.1l0,0c1.1,0.5,1.9,1.6,1.9,2.8v13.5c0,1.7-1.3,3-3,3
-	c-0.3,0-0.7,0-1,0l0,0c-7.3-2.3-14.9-3.5-22.5-3.3c-19.6,0-25.3,13.4-25.3,33s5.7,33,25.3,33c7.6,0.1,15.3-1,22.5-3.3"/>
-</svg>
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_white.svg b/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_white.svg
deleted file mode 100644
index 01f7260cd3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_white.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_2_00000109717856507224707600000004572449649498936508_"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1256.6 344.8"
-	 style="enable-background:new 0 0 1256.6 344.8;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<g id="Layer_1-2">
-	<g>
-		<path class="st0" d="M5,172.2C5.1,79.7,80.2,4.9,172.6,5s167.3,75.2,167.2,167.6c-0.1,92.4-75,167.2-167.4,167.2
-			C79.9,339.7,4.9,264.7,5,172.2L5,172.2L5,172.2z M169,229.5c-13,0.4-26-0.8-38.7-3.5c-9.4-1.9-17.3-8.2-21.2-17
-			c-3.8-8.7-5.6-22.2-5.5-40.4c0.1-9.5,0.7-19,1.8-28.4c1.1-9.2,2.2-16.8,3.2-22.8l1.1-5.9c0-0.2,0-0.3,0-0.5c0-1.7-1.2-3.1-2.8-3.4
-			l-21.6-3.4H85c-1.6,0-2.9,1.1-3.3,2.6c-0.4,1.4-0.6,2.4-1.2,5.7c-1.2,6.4-2.4,12.6-3.6,21.6c-1.3,9.8-2.1,19.7-2.4,29.6
-			c-0.5,6.9-0.5,13.8,0,20.7c0.5,18.3,3.7,33,9.4,43.9s15.6,18.8,29.4,23.6c13.8,4.8,33,7.2,57.7,7.1h3.1
-			c24.7,0.1,43.9-2.2,57.7-7.1c13.8-4.8,23.6-12.7,29.4-23.6c5.8-11,8.9-25.6,9.4-43.9c0.5-6.9,0.5-13.8,0-20.7
-			c-0.3-9.9-1.1-19.8-2.4-29.6c-1.3-8.9-2.4-15.1-3.6-21.6c-0.6-3.3-0.9-4.3-1.2-5.7c-0.4-1.5-1.7-2.6-3.3-2.6h-0.6l-21.6,3.4
-			c-1.6,0.3-2.8,1.7-2.8,3.4c0,0.2,0,0.3,0,0.5l1.2,5.9c1.1,6,2.2,13.6,3.3,22.7c1.1,9.4,1.7,18.9,1.8,28.4
-			c0.2,18.2-1.7,31.6-5.5,40.4c-3.8,8.7-11.6,15-20.9,17c-12.7,2.7-25.7,3.9-38.7,3.5L169,229.5L169,229.5z"/>
-		<g>
-			<path class="st0" d="M1155.2,186.1c0-33.4,9.6-56.9,48.2-56.9s48.2,23.5,48.2,56.9s-9.6,56.9-48.2,56.9
-				S1155.2,219.5,1155.2,186.1z M1227.1,186.1c0-23.2-3-36.5-23.6-36.5s-23.6,13.3-23.6,36.5s3.1,36.5,23.6,36.5
-				S1227.1,209.2,1227.1,186.1z"/>
-			<path class="st0" d="M487.2,238.7c0.6,1,1.6,1.6,2.8,1.6h9c1.8,0,3.2-1.4,3.2-3.2l0,0V135c0-1.8-1.4-3.2-3.2-3.2h-18
-				c-1.8,0-3.2,1.4-3.2,3.2v81c-7.7,4.3-16.4,6.5-25.2,6.3c-11.5,0-17.2-5-17.2-16.1V135c0-1.8-1.4-3.2-3.2-3.2h-17.9
-				c-1.8,0-3.2,1.4-3.2,3.2v73.4c0,20.8,9.8,34.5,37.3,34.5c12.6-0.1,24.9-4.1,35.2-11.3l3.2,7.2L487.2,238.7L487.2,238.7z"/>
-			<path class="st0" d="M689.8,163.7c0-20.6-10.2-34.5-35.9-34.5c-12.4,0-24.5,3.8-34.8,10.7c-4.6-6.7-13.3-10.7-27.8-10.7
-				c-11.8,0.2-23.3,4.2-32.8,11.3l-3.2-7.2l0,0c-0.6-1-1.6-1.7-2.8-1.7h-9c-1.8,0-3.2,1.4-3.2,3.2v102.1c0,1.8,1.4,3.2,3.2,3.2h18
-				c1.8,0,3.2-1.4,3.2-3.2v-80.8c6.9-4.1,14.8-6.3,22.8-6.3c9.8,0,15.4,3.6,15.4,14v73.4c0,1.8,1.4,3.2,3.2,3.2h18
-				c1.8,0,3.2-1.4,3.2-3.2v-81.1c6.8-4.2,14.8-6.4,22.8-6.4c9.6,0,15.4,3.6,15.4,14v73.4c0,1.8,1.4,3.2,3.2,3.2h18
-				c1.8,0,3.2-1.4,3.2-3.2l0,0L689.8,163.7L689.8,163.7z"/>
-			<path class="st0" d="M745.4,231.7c10.2,7.5,22.5,11.5,35.2,11.3c31.7,0,43.4-21.3,43.4-56.9s-11.7-56.9-43.4-56.9
-				c-10.3,0.1-20.4,3-29.1,8.5v-32.9c0-1.8-1.4-3.2-3.2-3.2h-18c-1.8,0-3.2,1.4-3.2,3.2v132.3c0,1.8,1.4,3.2,3.2,3.2h9
-				c1.2,0,2.2-0.6,2.8-1.6l0,0L745.4,231.7L745.4,231.7z M774.9,222.3c-8.2,0-16.3-2.1-23.4-6.3v-59.9c7.1-4.1,15.2-6.3,23.4-6.3
-				c21.3,0,24.5,16.3,24.5,36.2S796.2,222.3,774.9,222.3L774.9,222.3L774.9,222.3z"/>
-			<path class="st0" d="M913.9,150.5c-2.8-0.4-5.6-0.6-8.5-0.5c-9.7-0.4-19.3,1.9-27.8,6.5v80.6c0,1.8-1.4,3.2-3.2,3.2h-18
-				c-1.8,0-3.2-1.4-3.2-3.2V135c0-1.8,1.4-3.2,3.2-3.2h9c1.2,0,2.2,0.6,2.8,1.6l0,0l3.2,7.2c9.9-7.5,22-11.5,34.4-11.3
-				c2.8,0,5.7,0.2,8.5,0.7l0,0c1.7,0,3,2.7,3,4.4v13c0,1.8-1.4,3.2-3.2,3.2L913.9,150.5"/>
-			<path class="st0" d="M976.1,190.2c-10.7,1.3-17.2,5.4-17.2,16.7c0,8.3,3.6,16.1,16.7,16.1c8.3,0.1,16.4-2.4,23.2-7.2v-28.1
-				L976.1,190.2L976.1,190.2z M1004.8,231.7C995.5,239,984,243,972.1,243c-28,0-37.3-17.4-37.3-34.8c0-23.5,15.2-33.4,39.7-35.4
-				l24.4-1.9v-5.4c0-11.1-5.2-15.4-21.3-15.4c-10.1,0-20.1,1.7-29.6,4.9c-0.3,0.1-0.7,0.1-1,0c-1.8,0-3.2-1.4-3.2-3.2v-14.4
-				c0-1.4,0.8-2.6,2.1-3.1l0,0c10.8-3.6,22.1-5.4,33.5-5.4c35.6,0,43.8,15.6,43.8,38.7v69.3c0,1.8-1.4,3.2-3.2,3.2h-9
-				c-1.2,0-2.2-0.6-2.8-1.6l0,0L1004.8,231.7L1004.8,231.7z"/>
-			<path class="st0" d="M1128.6,218c0.3,0,0.7,0,1,0c1.8,0,3.2,1.4,3.2,3.2v14.4c0,1.3-0.8,2.5-2,3l0,0c-8.9,3.2-18.4,4.8-27.9,4.6
-				c-38.5,0-50.3-23-50.3-56.9s11.8-56.9,50.3-56.9c9.4-0.2,18.9,1.2,27.8,4.4l0,0c1.2,0.5,2,1.7,2,3v14.5c0,1.8-1.4,3.2-3.2,3.2
-				c-0.4,0.1-0.7,0.1-1.1,0l0,0c-7.8-2.5-16-3.7-24.2-3.6c-21.1,0-27.2,14.4-27.2,35.4s6.1,35.4,27.2,35.4
-				c8.2,0.1,16.4-1.1,24.2-3.6"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/forms/installer-background.png b/src/Umbraco.Web.UI.Client/src/assets/img/forms/installer-background.png
deleted file mode 100644
index 87c9ee8185..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/forms/installer-background.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/installer.svg b/src/Umbraco.Web.UI.Client/src/assets/img/installer.svg
deleted file mode 100644
index b8a6eaf6b5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/img/installer.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1574.03 893.25"><defs><style>.cls-1{fill:#1b264f;}.cls-2{fill:#293763;}.cls-3{fill:#3544b1;}.cls-4,.cls-6{fill:#b0bed6;}.cls-4{isolation:isolate;opacity:0.99;}.cls-5{fill:#f5c1bc;}.cls-7{fill:#f9f7f4;}.cls-11,.cls-8,.cls-9{fill:#fff;}.cls-11,.cls-9{stroke:#3544b1;stroke-miterlimit:10;}.cls-9{stroke-width:3px;}.cls-10{fill:#f2ebe6;}.cls-11{stroke-width:2px;}</style></defs><g id="Lag_2" data-name="Lag 2"><g id="Lag_1-2" data-name="Lag 1"><rect class="cls-1" width="1574.03" height="893.22"/><path class="cls-2" d="M1574,448.27l-1-1s-44.52-55.53-149.66,51.52-132.1,106-162.81,113.91-193.71,39-222.52,61.72-81.37,57.4-81.37,57.4l248.93,161.43H1574Z"/><path class="cls-2" d="M945.38,800.65s-24.33-71.31-70.39-109-89.39-42-136.4-93.15S677.45,537.76,643,497.69,566.26,433.55,533,414.87c-49.45-27.75-82.71,39.25-145,32.64-39.92-4.24-57.74-16.31-153.35-82.22-32.21-22.2-81.24-71.38-138.36-78.86-35.86-4.7-69.65,11.3-96.26,30.9V792.38l816.26,32.34Z"/><path class="cls-3" d="M379.81,676.14C250.6,599.94,102.57,484,0,440.68V893.25H1237.64C1097.26,778.38,921,649.3,828.77,641,660.67,625.94,560.93,782.94,379.81,676.14Z"/><g id="Layer_38" data-name="Layer 38"><path class="cls-1" d="M1398.8,686.77l-2.51,12-1.22-11.08s8.42-14.09,14.73-21c5.36-5.84,4.76-21.58,4.76-21.58s-16.19,8.73-17.7,10.59-14.32,28.81-14.32,28.81,4.76-25.69,3.64-29.81c-2.68-9.88-14-20.52-14-20.52s-5.65,29.35-5.13,36.64c.82,11.4,8.81,29.94,12.68,39.37.82,2,2.21,2.75,4.84,3l10.5,1.21c3.64.34,3.64.34,7.61-3.15l1.52-10.08c1.56-4,2.22-6.33,4.63-9.68,4.89-6.78,11.8-11.18,14.1-13.35,14.68-13.85,8-22.2,8-22.2C1402.51,676.16,1398.8,686.77,1398.8,686.77Z"/><path class="cls-1" d="M1365.88,688.22c-1.68-2.26-6.13-10.45-7.53-12.8s-5.92-11.93-5.92-11.93-1.13,9.3-.93,13.49,2.3,17.08,5,20,6.46,8.77,9.58,9.64,15.16,6.62,17.16,3.78l-9.4-11.43Z"/><path class="cls-1" d="M1396.54,713.7c8.26,1.56,14.92-6,18.26-7.2s14.67-18.84,14.67-18.84-10,2.43-15.83,4.2C1410.78,692.73,1396.54,713.7,1396.54,713.7Z"/></g><g id="Layer_38-2" data-name="Layer 38"><path class="cls-3" d="M1463.44,699.72c-1.51,5.59,4.94,40.43,4.94,40.43S1451,703.6,1449,701.08s-24-14.36-24-14.36-.82,21.34,6.44,29.27c8.56,9.34,20,28.45,20,28.45l-1.65,15-3.41-16.22s-5-14.38-43.55-41.85c0,0-9.09,11.33,10.83,30.11,3.11,2.93,12.48,8.9,19.1,18.09,3.28,4.55,4.17,7.63,6.28,13.12l2.07,13.68c5.38,4.72,5.38,4.72,10.32,4.27l14.23-1.64c3.57-.33,5.45-1.36,6.56-4.06,5.25-12.78,16.08-37.92,17.19-53.38.71-9.88-6.95-49.67-6.95-49.67S1467.08,686.33,1463.44,699.72Z"/><path class="cls-3" d="M1501.17,727.85c-1.9,3.18-7.93,14.29-10.21,17.36l-10.82,14.55-12.73,15.49c2.7,3.85,19-3.94,23.26-5.12s9.3-9.14,13-13.07,6.56-21.43,6.82-27.11-1.27-18.28-1.27-18.28S1503.06,724.67,1501.17,727.85Z"/><path class="cls-3" d="M1426.21,750.14c-7.93-2.41-21.47-5.71-21.47-5.71s15.37,23.88,19.9,25.56,13.55,11.87,24.75,9.76C1449.39,779.75,1430.09,751.32,1426.21,750.14Z"/></g><g id="Layer_38-3" data-name="Layer 38"><path class="cls-1" d="M1318.11,805.33l-2.91,13.82-1.4-12.8s9.72-16.27,17-24.24c6.19-6.75,5.49-24.93,5.49-24.93s-18.7,10.08-20.45,12.23-16.54,33.29-16.54,33.29,5.5-29.69,4.2-34.44c-3.09-11.41-16.15-23.7-16.15-23.7s-6.53,33.9-5.93,42.31c1,13.18,10.18,34.6,14.65,45.48,1,2.31,2.55,3.19,5.59,3.47l12.12,1.39c4.21.39,4.21.39,8.8-3.64l1.76-11.65c1.8-4.68,2.55-7.3,5.35-11.17,5.64-7.84,13.62-12.92,16.28-15.42,17-16,9.22-25.65,9.22-25.65C1322.39,793.08,1318.11,805.33,1318.11,805.33Z"/><path class="cls-1" d="M1280.08,807c-1.94-2.62-7.08-12.08-8.7-14.79s-6.84-13.78-6.84-13.78-1.3,10.74-1.08,15.57,2.66,19.74,5.81,23.09,7.46,10.14,11.06,11.14,17.51,7.65,19.82,4.37l-10.85-13.2S1282,809.62,1280.08,807Z"/><path class="cls-1" d="M1315.5,836.44c9.54,1.8,17.23-6.88,21.09-8.32s17-21.77,17-21.77-11.53,2.81-18.29,4.86C1332,812.21,1315.5,836.44,1315.5,836.44Z"/></g><path class="cls-4" d="M124.12,455.57c58.23-16,61.55-74.06,81.09-97.84,24.28-29.57,40.62-22.54,44.5-59.6,8.75-83.52-23.08-67.63-67-94.95-56.07-34.94-66,21.14-97.34-9C48.83,158.91,20.74,153.54,0,161.84V403.08c17.72.91,34.48,2,44.13,9.38C68.16,430.79,76.45,468.64,124.12,455.57Z"/><polygon class="cls-1" points="134.32 347.07 98.03 345.76 98.89 290.83 137.65 251.86 119.53 252.74 87.45 282.37 77.87 246.15 35.33 216.87 27.34 226.22 66.42 257.37 81.88 305.44 77.97 370.04 93.71 477.39 72.86 551.04 110.79 551.38 114.22 470.75 106.11 420.39 94.56 364.91 147.67 360.63 215.39 316.48 209.3 313.07 134.32 347.07"/><polygon class="cls-1" points="30.3 303.86 24.85 309.51 47.09 332.29 79.32 347.79 80.26 332.29 55.33 321.61 30.3 303.86"/><polygon class="cls-1" points="114.03 275.61 147.06 291.85 153.83 287.04 122.72 266.87 114.03 275.61"/><polygon class="cls-1" points="85.29 415.73 81.18 391.88 57.18 389.46 27.34 372.9 0 377.6 0 385.01 24.14 384.86 85.29 415.73"/><polygon class="cls-1" points="58.01 232.48 70.08 240.71 88.16 207.93 80.26 207.93 58.01 232.48"/><polygon class="cls-1" points="185.6 335.9 174.25 343.3 201.15 343.62 199.5 339.59 185.6 335.9"/><path class="cls-3" d="M17.94,310.71a12.48,12.48,0,0,1,6.91-1.19l1.25-2.34s-16.48-6.83-20.17-7.65c-1.23-.27-3.4-.6-5.93-.88v15.89l.53.07S14.29,312.46,17.94,310.71Z"/><path class="cls-2" d="M219.89,266.87a64.86,64.86,0,0,0-7.36,11.29c-2.39,5.22-5.41,10.24-5.41,10.24s.51,13.87,1.81,17.69a12.47,12.47,0,0,1,.38,7l2.7,1.52s8.24-15.49,9.52-19,1.95-12.3,1.14-17.37A95.42,95.42,0,0,0,219.89,266.87Z"/><path class="cls-2" d="M19.68,182.07a129.15,129.15,0,0,0-12.1-8s-1,8.23.7,13.69,7.18,15.94,7.18,15.94,9.69,10,13.22,11.95a12.45,12.45,0,0,1,4.94,5l1.69-3.74s-2.93-13.94-4.37-17.44S23.67,185.31,19.68,182.07Z"/><path class="cls-2" d="M57.87,284.78a129.81,129.81,0,0,0-13.74-4.62s1.14,8.21,4.22,13,11,13.56,11,13.56,11.94,7.16,15.86,8.15a11.32,11.32,0,0,1,6,4.12l.23-5.55s-6-11.81-8.27-14.82S62.56,286.88,57.87,284.78Z"/><path class="cls-3" d="M48.88,177.82s-5.3,3.66-7.59,7.48-5.55,12.37-5.55,12.37-.79,10.74-.11,13.79a9.59,9.59,0,0,1-.31,5.41l1.08.76S44.94,207,46.22,204.4s4.44-11.5,4.25-15.47A101.72,101.72,0,0,0,48.88,177.82Z"/><path class="cls-3" d="M62.12,359.83a105.73,105.73,0,0,0-8.23-7.65s-1.83,6.17-1.2,10.57,3.45,13.1,3.45,13.1,6.14,8.86,8.59,10.81a8.2,8.2,0,0,1,2.94,3.86l2.09.21s-.57-13.33-1.23-16.19S64.76,362.79,62.12,359.83Z"/><path class="cls-3" d="M127.75,290.21s-6.54-8.58-9.06-10.42a12.52,12.52,0,0,1-3.73-5.11l-.92,1s.59,13.57,1.38,16.39,4.27,11.56,7,14.41a106.85,106.85,0,0,0,8.54,7.3s1.55-6.24.76-10.62S127.75,290.21,127.75,290.21Z"/><path class="cls-3" d="M236.9,297.57l-24.91,17,3.26,1.82s7.43-7.2,15.7-9.44,32.41-4.83,43.82-8.06,24.3-13.55,30.06-21.61a150.7,150.7,0,0,1,11.36-14,122.23,122.23,0,0,0-29.44,5.25C270.85,273.46,236.9,297.57,236.9,297.57Z"/><path class="cls-3" d="M276.12,345.69S265,342.3,255.68,340.5s-38.35,1.23-38.35,1.23l-17.83-2.14,1.65,4c8.74,1.14,32.73,12.83,38.33,15s33.91,2.06,33.91,2.06,13.94-4.19,14.27-7S276.12,345.69,276.12,345.69Z"/><path class="cls-2" d="M276.12,345.69s-3.51,7.71-13.78,7.71c-27.91,0-53.55-7.71-53.55-7.71s27.55,13.65,39.45,14.19c0,0,21.87,1.73,23.94,1.65s15.4-4,15.47-7.87S276.12,345.69,276.12,345.69Z"/><path class="cls-3" d="M35.94,310.68l.34-3.1-24.6-22.86A85.93,85.93,0,0,0,0,275.48v18.21c2.45.26,4.52.5,5.88.75C12,295.54,25.84,298.51,35.94,310.68Z"/><path class="cls-2" d="M35.94,310.68l.34-3.1-24.6-22.86s-.86-.85-2.4-2.19c0,0-4.33,1-9.28,1.57v9.59c2.45.26,4.52.5,5.88.75C12,295.54,25.84,298.51,35.94,310.68Z"/><path class="cls-3" d="M158.07,203.09C145.34,212.18,137.31,226,137.31,226l-17.76,26.74,5-2c6.55-14.38,15.34-14.16,20.93-16.81S170,225,176.25,221.21,194,208.39,195.33,206.7s6.77-16.81,6.77-16.81C189,182.85,170.8,194,158.07,203.09Z"/><path class="cls-2" d="M185.59,205.17c-6.36,4.84-24,14.13-30.66,15.93A88.63,88.63,0,0,1,139,223.27c-1.14,1.69-1.75,2.73-1.75,2.73l-17.76,26.74,5.79-.26c6.56-14.38,14.52-15.94,20.11-18.59S170,225,176.25,221.21,194,208.39,195.33,206.7s6.77-16.81,6.77-16.81S192,200.34,185.59,205.17Z"/><path class="cls-5" d="M148,237.75c-5.13-1.13-15.88-2.71-19.62,4.66s-10.83,19.53,10.33,24.9c0,0,7.11-2,10.34-3.39s8.19-6.72,8.89-11.52S153.08,238.88,148,237.75Z"/><path class="cls-1" d="M136.75,218.76c-2.12-1.06-6.92-3.65-6.92-3.65s3.63,15,11.42,21.53l6.7,1.11s8.51-8.93,9.43-12.57A105.8,105.8,0,0,0,159,214.11L144.57,229C141.3,223.72,143.57,222.19,136.75,218.76Z"/><g id="Layer_65" data-name="Layer 65"><path class="cls-5" d="M35.2,219.47s.23-3-.81-4.65-5,1.7-5,1.7-2.41-.66-7,2S16.31,231.23,14,236s3.34,12,5,14.74,3.58,4.6,3.87,7,3.8,1,3.8,1l2.05-3.06s6.59-3.2,9.38-7.35,5.8-9.1,4.42-17A19.14,19.14,0,0,0,35.2,219.47Z"/><polygon class="cls-1" points="25.16 246.53 29.29 249.72 30.76 245.49 27.14 243.12 25.16 246.53"/></g><polygon class="cls-3" points="96.71 354.3 88.98 349.92 93.98 359.63 86.74 359.39 97.9 367.24 109.13 361.5 96.73 347.15 96.71 354.3"/><path class="cls-5" d="M125.56,369.38l-14.19-9-6.92,1.79s-9.12,5.15-10.13,8.3,2.52,17.81,2.52,17.81,9.23,13.4,14.34,16.23,10.25,1.61,14.84-.48,8.88-12.33,8.88-12.33c-.55-2.83-1-6.19-1.32-6.72Z"/><polygon class="cls-1" points="99.54 373.22 99.27 379.74 105.27 379.93 104.75 373.01 99.54 373.22"/><polygon class="cls-1" points="101.86 384.76 102.26 388.85 105.56 389.74 105.45 385.13 101.86 384.76"/><polygon class="cls-1" points="108.93 378.66 109.3 384.24 114.01 384.38 112.51 379.76 108.93 378.66"/><polygon class="cls-1" points="108.31 388.6 108.21 395.44 113.98 395.51 113.04 389.1 108.31 388.6"/><polygon class="cls-1" points="119.34 394.73 123.1 395.07 123.44 388.6 117.96 390.35 119.34 394.73"/><polygon class="cls-1" points="116.6 398.39 116.97 402.2 119.91 402.43 119.67 399 116.6 398.39"/><polygon class="cls-1" points="105.65 370.1 109.51 374.51 111.78 368.33 106.06 364.73 105.65 370.1"/><polygon class="cls-1" points="115.14 370.74 119.51 374.38 122.24 370.33 117.76 367.4 115.14 370.74"/><polygon class="cls-1" points="122.89 376.98 125.91 379.24 126.88 376.64 124.35 374.43 122.89 376.98"/><polygon class="cls-1" points="115.94 379.08 118.31 382.28 120.46 379.1 116.92 376.2 115.94 379.08"/><polygon class="cls-1" points="121.92 383.89 125.74 387.56 128.44 383.71 123.84 380.52 121.92 383.89"/><polygon class="cls-1" points="125.36 392.98 127.52 394.78 128.77 392.72 126.41 390.66 125.36 392.98"/><path class="cls-5" d="M231.53,304.76c.9-4.71-1.39-9.24-5.1-12.86S220.8,293,220.8,293s-.3,3.9-.68,6.07-4,6.61-10.54,12.41-6.61,9.78-6.69,14.4,6.67,10.58,16.66,12.5c14.46,2.77,14.58-15.08,14.07-18.88S230.64,309.47,231.53,304.76Z"/><polygon class="cls-1" points="226.9 283.77 224.84 282.71 221.26 288.62 223.03 296.42 227.14 296.24 224.85 289.81 226.9 283.77"/><path class="cls-2" d="M21.39,408.63a128.66,128.66,0,0,0-10.55,9.91s7.81,2.85,13.55,2.42,17.2-3.33,17.2-3.33,12-7.13,14.68-10.11a11.36,11.36,0,0,1,6.49-3.38L58,401.33s-13.27-.3-17,.31S25.46,405.49,21.39,408.63Z"/><g id="Layer_38-4" data-name="Layer 38"><path class="cls-1" d="M542.08,751.37l4.5,21.4L548.75,753s-15-25.19-26.34-37.51c-9.58-10.46-8.5-38.6-8.5-38.6s28.94,15.6,31.64,18.93,25.62,51.53,25.62,51.53-8.51-45.95-6.52-53.31c4.8-17.66,25-36.69,25-36.69s10.1,52.48,9.17,65.51c-1.47,20.39-15.75,53.54-22.68,70.39-1.46,3.58-3.94,4.93-8.64,5.37l-18.78,2.16c-6.51.59-6.51.59-13.61-5.64l-2.72-18c-2.79-7.24-4-11.31-8.28-17.3-8.74-12.12-21.09-20-25.2-23.87-26.27-24.77-14.29-39.7-14.29-39.7C535.46,732.41,542.08,751.37,542.08,751.37Z"/><path class="cls-1" d="M600.94,754c3-4,11-18.7,13.47-22.89S625,709.75,625,709.75s2,16.62,1.67,24.11-4.12,30.55-9,35.74-11.55,15.69-17.12,17.24-27.11,11.84-30.68,6.76l16.79-20.43Z"/><path class="cls-1" d="M546.12,799.52c-14.77,2.79-26.67-10.64-32.64-12.86S487.24,753,487.24,753s17.85,4.35,28.31,7.53C520.66,762,546.12,799.52,546.12,799.52Z"/></g><polygon class="cls-6" points="459.93 540.23 452.32 537.27 370.63 534.91 382.39 537.27 459.93 540.23"/><polygon class="cls-2" points="102.75 598.83 111.77 634.93 115.64 665.88 116.93 680.06 131.82 689.56 126.84 633.77 116.35 606.85 102.75 598.83"/><path class="cls-1" d="M244,781.28s6.15,8.39,15.88,8.39,30.54-8.39,30.54-8.39V517.59l-12.12,3A54.51,54.51,0,0,1,261,522.1l-11.36-.84Z"/><polygon class="cls-1" points="116.35 606.85 126.84 633.77 129.38 662.18 131.82 689.56 426.55 589.03 459.93 540.23 382.39 537.27 116.35 606.85"/><path class="cls-6" d="M249.68,521.26A14,14,0,0,1,253,515c2.58-2.58,19.34-3.87,23.21-3.87a30.75,30.75,0,0,1,11.6,2.58,4.58,4.58,0,0,1,2.58,3.87s-14.18,5.16-18.05,5.16-11.13,1.29-15.24,0A34.44,34.44,0,0,0,249.68,521.26Z"/><path class="cls-7" d="M149.22,638c-1-15.42,11.18-31.58,27.12-36.09S206,606.23,207,621.66s-11.16,31.55-27.08,36.07-29.67-4.29-30.66-19.71v0Zm28.89,1.54a30.27,30.27,0,0,1-6.71,1.31,3.94,3.94,0,0,1-3.83-1.79q-1.11-1.9-1.38-6.47a43.25,43.25,0,0,1,0-4.83c.09-1.59.2-2.9.32-4l.13-1a.21.21,0,0,0,0-.08.45.45,0,0,0-.52-.43l-3.76.49-.08,0a.78.78,0,0,0-.54.6c-.05.25-.08.43-.15,1-.15,1.12-.28,2.21-.4,3.78a47.77,47.77,0,0,0-.11,5.06,26.24,26.24,0,0,0,.22,3.46,14,14,0,0,0,2.1,6.86,6.57,6.57,0,0,0,5.31,2.51,32.65,32.65,0,0,0,10-1.65l.53-.15a37.56,37.56,0,0,0,9.87-4,11.93,11.93,0,0,0,4.81-5.38,18.51,18.51,0,0,0,1.16-7.78,23.21,23.21,0,0,0-.22-3.46,42.07,42.07,0,0,0-.73-4.82c-.32-1.43-.58-2.4-.86-3.43-.15-.51-.19-.67-.27-.89a.46.46,0,0,0-.6-.27l-.1,0-3.68,1.62a.75.75,0,0,0-.46.7.28.28,0,0,0,0,.09l.26.93q.38,1.43.81,3.63a39.56,39.56,0,0,1,.6,4.66,18.08,18.08,0,0,1-.52,7,7,7,0,0,1-3.43,3.87,33.7,33.7,0,0,1-6.63,2.47Z"/><path class="cls-8" d="M377.83,577.79c-.42-6.7,1.26-12,9.25-14.24s10.28,1.87,10.71,8.57-1.23,12-9.23,14.24S378.26,584.49,377.83,577.79Zm14.9-4.23c-.29-4.66-1.09-7.13-5.37-5.92s-4.73,4.05-4.44,8.7,1.09,7.14,5.38,5.92S393,578.2,392.73,573.56Z"/><path class="cls-8" d="M240.06,627.62a.52.52,0,0,0,.6.17l1.87-.54a.86.86,0,0,0,.63-.83h0L241.86,606a.52.52,0,0,0-.69-.49h0l-3.74,1.06a.88.88,0,0,0-.63.84l1,16.27a13.21,13.21,0,0,1-5.13,2.74c-2.39.68-3.62,0-3.76-2.21L228,609.88a.53.53,0,0,0-.7-.49h0l-3.74,1.06a.86.86,0,0,0-.58.85h0L223.9,626c.27,4.19,2.47,6.36,8.19,4.74a17,17,0,0,0,7.14-4.34l.75,1.25Z"/><path class="cls-8" d="M281.09,600.67c-.26-4.14-2.55-6.32-7.92-4.8a16.72,16.72,0,0,0-7.06,4.21c-1-1.08-2.89-1.39-5.91-.53a15.57,15.57,0,0,0-6.61,4.18l-.74-1.26h0a.59.59,0,0,0-.62-.15l-1.87.53a.88.88,0,0,0-.63.84h0L251,624.15a.51.51,0,0,0,.71.45h0l3.74-1.06a.86.86,0,0,0,.58-.82l-1-16.2a11.76,11.76,0,0,1,4.67-2.64c2-.57,3.24-.19,3.37,1.88l.94,14.72a.52.52,0,0,0,.71.46l3.74-1.06a.88.88,0,0,0,.63-.84l-1-16.21a11.36,11.36,0,0,1,4.63-2.63c2-.56,3.25-.19,3.38,1.88l.94,14.71a.52.52,0,0,0,.71.46l3.74-1.06a.86.86,0,0,0,.63-.83h0Z"/><path class="cls-8" d="M293.47,611a11.17,11.17,0,0,0,7.44.19c6.58-1.87,8.72-6.82,8.27-14s-3.15-10.72-9.73-8.85a15,15,0,0,0-5.92,3.41l-.42-6.58a.51.51,0,0,0-.69-.47h0l-3.74,1.06a.86.86,0,0,0-.58.82l1.69,26.54a.52.52,0,0,0,.71.46l1.87-.53a.82.82,0,0,0,.56-.5h0Zm6-3.62a9.15,9.15,0,0,1-4.94.12l-.76-12a12.39,12.39,0,0,1,4.77-2.67c4.44-1.26,5.27,1.85,5.53,5.86s-.16,7.44-4.59,8.7Z"/><path class="cls-8" d="M327.37,584.86a12.3,12.3,0,0,0-1.76.38,14.14,14.14,0,0,0-5.71,3l1,16.16a.86.86,0,0,1-.58.82l-3.74,1.06a.52.52,0,0,1-.72-.45h0l-1.3-20.47a.87.87,0,0,1,.6-.86h0l1.87-.53a.56.56,0,0,1,.61.16h0l.75,1.29a15.06,15.06,0,0,1,7-4.28,10.08,10.08,0,0,1,1.77-.35h0c.35-.1.66.36.68.71l.17,2.6a.87.87,0,0,1-.62.84h0l-.1,0"/><path class="cls-8" d="M340.78,589.14c-2.22.9-3.5,2.09-3.35,4.37.1,1.65.95,3,3.66,2.24a10.84,10.84,0,0,0,4.73-2.79l-.36-5.66Zm6.48,6.63a14.36,14.36,0,0,1-6.65,4.19c-5.8,1.65-8-1.28-8.2-4.76-.3-4.71,2.72-7.61,7.79-9.44l5-1.82-.07-1.09c-.14-2.21-1.28-2.78-4.61-1.84a23.61,23.61,0,0,0-6.08,2.74l-.21.06a.52.52,0,0,1-.69-.47l-.18-2.87a.86.86,0,0,1,.4-.73h0a26.4,26.4,0,0,1,6.87-3.06c7.39-2.09,9.29.55,9.58,5.17l.89,13.9a.88.88,0,0,1-.64.8l-1.87.53a.53.53,0,0,1-.6-.17h0Z"/><path class="cls-8" d="M372.73,585.75a.66.66,0,0,1,.2-.06.52.52,0,0,1,.71.45h0l.19,2.88a.84.84,0,0,1-.38.72h0a20.05,20.05,0,0,1-5.73,2.56c-8,2.26-10.72-1.66-11.15-8.44s1.71-12.1,9.7-14.36a16.33,16.33,0,0,1,5.81-.76h0a.48.48,0,0,1,.45.48l.19,2.88a.88.88,0,0,1-.62.84h0l-.22.06a16.36,16.36,0,0,0-5,.69c-4.37,1.24-5.43,4.48-5.16,8.7s1.7,6.73,6.06,5.5a19.23,19.23,0,0,0,4.95-2.14"/><polygon class="cls-6" points="116.35 606.85 102.75 598.83 370.63 534.91 382.39 537.27 116.35 606.85"/><g id="Layer_38-5" data-name="Layer 38"><path class="cls-2" d="M316.05,717.6c1.51,5.58-4.94,40.43-4.94,40.43s17.37-36.55,19.42-39.08,24-14.35,24-14.35.83,21.33-6.44,29.26c-8.56,9.35-20,28.45-20,28.45l1.65,15,3.41-16.22s5-14.38,43.56-41.84c0,0,9.08,11.32-10.83,30.1-3.12,2.94-12.49,8.91-19.11,18.1-3.28,4.55-4.17,7.63-6.28,13.12l-2.06,13.67c-5.39,4.73-5.39,4.73-10.33,4.27l-14.23-1.63c-3.57-.33-5.45-1.36-6.56-4.07-5.25-12.77-16.08-37.91-17.19-53.38-.71-9.88,6.95-49.67,6.95-49.67S312.41,704.21,316.05,717.6Z"/><path class="cls-2" d="M278.32,745.73c1.9,3.18,7.93,14.29,10.21,17.35s10.82,14.56,10.82,14.56l12.74,15.49c-2.71,3.85-19-4-23.27-5.12s-9.3-9.14-13-13.08-6.55-21.43-6.82-27.1,1.27-18.28,1.27-18.28S276.43,742.55,278.32,745.73Z"/><path class="cls-2" d="M353.28,768c7.93-2.41,21.47-5.71,21.47-5.71s-15.37,23.87-19.9,25.56-13.55,11.87-24.75,9.75C330.1,797.62,349.41,769.19,353.28,768Z"/></g><g id="Layer_38-6" data-name="Layer 38"><path class="cls-2" d="M680.43,777.76c1.19,4.37-3.86,31.63-3.86,31.63s13.59-28.6,15.2-30.57,18.77-11.24,18.77-11.24.64,16.7-5,22.9c-6.7,7.32-15.63,22.26-15.63,22.26l1.29,11.76,2.67-12.69s3.93-11.26,34.08-32.75c0,0,7.1,8.86-8.48,23.56-2.44,2.3-9.77,7-14.95,14.16-2.56,3.56-3.26,6-4.91,10.27L698,837.74c-4.21,3.7-4.21,3.7-8.07,3.35l-11.14-1.28c-2.8-.26-4.26-1.07-5.13-3.19-4.11-10-12.59-29.66-13.46-41.76-.55-7.73,5.45-38.87,5.45-38.87S677.59,767.28,680.43,777.76Z"/><path class="cls-2" d="M650.92,799.77c1.48,2.48,6.2,11.18,8,13.58l8.47,11.39,10,12.12c-2.11,3-14.9-3.09-18.2-4s-7.27-7.15-10.16-10.23-5.12-16.77-5.33-21.21,1-14.3,1-14.3S649.43,797.28,650.92,799.77Z"/><path class="cls-2" d="M709.57,817.21c6.21-1.89,16.8-4.47,16.8-4.47s-12,18.68-15.57,20-10.61,9.29-19.37,7.63C691.43,840.37,706.54,818.13,709.57,817.21Z"/></g><polygon class="cls-3" points="1228.59 277.61 1242.24 274.42 1265.59 274.42 1254.39 277.61 1228.59 277.61"/><line class="cls-9" x1="1254.39" y1="277.61" x2="1252.77" y2="236.44"/><line class="cls-9" x1="1231.37" y1="277.97" x2="1233.26" y2="236.35"/><line class="cls-9" x1="1260.41" y1="234.72" x2="1263.81" y2="276.02"/><path class="cls-2" d="M1213.15,95.51a43.44,43.44,0,0,0-6.86,2.84c-23.13,11.47-39.83,36.12-34.9,59,5.23,24.32,8.37,31.64,16,45.84,7.24,13.5,43.26,50.48,43.26,50.48h33.55s45.88-44.66,52.12-58.25,15-39.29,10.4-56.31-13.52-39.62-33.28-44.65C1255.19,84.76,1222.76,92.66,1213.15,95.51Z"/><polygon class="cls-2" points="1228.59 277.61 1228.59 298.04 1257.42 298.04 1254.39 277.61 1228.59 277.61"/><polygon class="cls-3" points="1257.42 298.04 1265.59 291.68 1265.59 274.42 1254.39 277.61 1257.42 298.04"/><path class="cls-2" d="M1316.13,195.38c6.26-13.59,15-39.29,10.44-56.31S1313,99.43,1293.16,94.4l-1.3-.32c-37.39-4.31-61.29,159.52-61.3,159.56h33.24S1309.86,209,1316.13,195.38Z"/><path class="cls-3" d="M1329.69,139.27c-4.15-16.79-16.24-39.84-36.08-44.87a13,13,0,0,0-3.12-.4,13,13,0,0,1,3.12.4c19.84,5,31.93,28.08,36.08,44.87,4.23,17.11-6.55,42.66-13.12,56.11-10.76,22.07-52.32,58.26-52.32,58.26h0s41.55-36.19,52.32-58.26C1323.14,181.93,1333.92,156.38,1329.69,139.27Z"/><path class="cls-3" d="M1316.57,195.38c6.57-13.45,17.35-39,13.12-56.11-4.15-16.79-16.24-39.84-36.08-44.87a13,13,0,0,0-3.12-.4c-36.61-.22-59.93,159.64-59.93,159.64h33.69S1305.81,217.45,1316.57,195.38Z"/><path class="cls-10" d="M1237.55,172a11.06,11.06,0,0,1-6.5-5.24A22.18,22.18,0,0,1,1229,157a35.3,35.3,0,0,1,0-4.6,65.66,65.66,0,0,1,.54-6.56c.28-2,.53-3.37.81-4.78.14-.73.19-1,.27-1.27a.75.75,0,0,1,.73-.58h.17l4.77.75a.74.74,0,0,1,.62.74v.11l-.26,1.31c-.24,1.32-.48,3-.71,5a57.23,57.23,0,0,0-.4,6.28c0,4,.38,7,1.22,8.92a6.52,6.52,0,0,0,4.67,3.75,36.17,36.17,0,0,0,7.25.79c4.69-17.06,10.2-33.7,16.44-46.76a37.05,37.05,0,0,0-51.42,34.09h0a37.07,37.07,0,0,0,29,36.21c1.29-5.58,2.69-11.28,4.17-17A33.47,33.47,0,0,1,1237.55,172Z"/><path class="cls-8" d="M1287.73,154.3a37.05,37.05,0,0,0-22.66-34.18c-6.24,13.06-11.75,29.7-16.44,46.76h2.81a36,36,0,0,0,8.54-.78,6.51,6.51,0,0,0,4.63-3.76c.86-1.93,1.26-4.9,1.22-8.91a57.55,57.55,0,0,0-.38-6.29c-.25-2-.49-3.7-.73-5l-.26-1.31v-.11a.74.74,0,0,1,.63-.74l4.77-.75h.18a.75.75,0,0,1,.73.58c.09.31.13.54.28,1.27.27,1.43.52,2.8.8,4.78a60.22,60.22,0,0,1,.54,6.56,32.1,32.1,0,0,1,0,4.6,22.25,22.25,0,0,1-2.09,9.72,11.15,11.15,0,0,1-6.51,5.24q-4.57,1.61-12.77,1.56h-.69c-1.21,0-2.36,0-3.46-.06-1.48,5.69-2.88,11.39-4.17,17a37,37,0,0,0,45-36.12Z"/><path class="cls-8" d="M1287.78,201.52c-3.86,0-4.81,2.34-4.81,5.68s1,5.68,4.81,5.68,4.81-2.34,4.81-5.68S1291.64,201.52,1287.78,201.52Zm0,9.33c-2,0-2.35-1.33-2.35-3.65s.3-3.65,2.35-3.65,2.36,1.33,2.36,3.65S1289.84,210.85,1287.78,210.85Z"/><path class="cls-10" d="M1216.33,212.48a.32.32,0,0,0,.28.17h.9a.32.32,0,0,0,.33-.32h0V202.14a.32.32,0,0,0-.33-.32h-1.93a.32.32,0,0,0-.32.32v8.09a4.8,4.8,0,0,1-2.48.63c-1.14,0-1.7-.49-1.7-1.6v-7.12a.32.32,0,0,0-.32-.32H1209a.32.32,0,0,0-.32.32v7.32c0,2.08,1,3.45,3.73,3.45a6.32,6.32,0,0,0,3.52-1.13l.32.72Z"/><path class="cls-10" d="M1234.13,205v7.31s.09.32.27.35h1.79a.32.32,0,0,0,.3-.35V205c0-2.06-1-3.44-3.58-3.44a6.15,6.15,0,0,0-3.47,1.07,3.09,3.09,0,0,0-2.77-1.07,5.62,5.62,0,0,0-3.28,1.12l-.31-.71a.82.82,0,0,0-.28-.22h-.89a.32.32,0,0,0-.32.32v10.19a.32.32,0,0,0,.32.32h1.78s.32-.09.26-.26v-8.07a4.72,4.72,0,0,1,2.33-.63c1,0,1.54.36,1.53,1.39v7.33c0,.18.33.35.33.35H1230a.32.32,0,0,0,.32-.32v-8.1a4.34,4.34,0,0,1,2.31-.63C1233.54,203.6,1234.13,204,1234.13,205Z"/><path class="cls-10" d="M1240.57,198.82a.32.32,0,0,0-.33.32v2.21c.19-.84.37-1.69.56-2.53Z"/><path class="cls-8" d="M1240.57,212.65h.91a.3.3,0,0,0,.28-.17l.34-.7a5.89,5.89,0,0,0,3.55,1.13c3.21,0,4.39-2.12,4.39-5.68s-1.19-5.67-4.39-5.67a5.65,5.65,0,0,0-2.94.85v-3.27a.32.32,0,0,0-.32-.32h-1.59c-.19.84-.37,1.69-.56,2.53v11A.32.32,0,0,0,1240.57,212.65Zm2-8.44a4.58,4.58,0,0,1,2.34-.62c2.13,0,2.45,1.62,2.45,3.62s-.32,3.62-2.44,3.62h0a4.69,4.69,0,0,1-2.34-.63Z"/><path class="cls-8" d="M1258.93,201.54a5,5,0,0,0-.86-.08,5.52,5.52,0,0,0-3.45,1.15l-.32-.73a.33.33,0,0,0-.28-.17h-.91a.32.32,0,0,0-.32.32v10.3a.32.32,0,0,0,.32.32h1.82a.32.32,0,0,0,.33-.32v-8.08a5.23,5.23,0,0,1,2.77-.65,6.06,6.06,0,0,1,.85.05h0a.32.32,0,0,0,.32-.32V202C1259.22,201.81,1259.09,201.54,1258.93,201.54Z"/><path class="cls-8" d="M1265.35,201.55a10.25,10.25,0,0,0-3.34.54.3.3,0,0,0-.21.3v1.44a.32.32,0,0,0,.32.32h.1a9.29,9.29,0,0,1,3-.49c1.63,0,2.15.43,2.15,1.54v.53l-2.46.2c-2.48.19-4,1.19-4,3.53,0,1.74.94,3.47,3.78,3.47a5.34,5.34,0,0,0,3.31-1.12l.33.67a.3.3,0,0,0,.28.17h.82a.32.32,0,0,0,.32-.32v-6.92C1269.73,203.11,1268.91,201.55,1265.35,201.55Zm2,8.62a4.08,4.08,0,0,1-2.32.72,1.47,1.47,0,0,1-1.67-1.61c0-1.14.65-1.54,1.72-1.67l2.27-.25Z"/><path class="cls-8" d="M1280.52,202a7.92,7.92,0,0,0-2.77-.44c-3.85,0-5,2.3-5,5.69s1.19,5.68,5,5.68a7.77,7.77,0,0,0,2.78-.46.46.46,0,0,0,.24-.29v-1.44a.38.38,0,0,0-.36-.32h-.12a7.57,7.57,0,0,1-2.41.36c-2.11,0-2.72-1.44-2.72-3.54s.61-3.54,2.72-3.54a7.3,7.3,0,0,1,2.41.36h.11a.41.41,0,0,0,.37-.32v-1.45A.5.5,0,0,0,1280.52,202Z"/><polygon class="cls-3" points="1360.97 351.59 1368.72 349.78 1381.98 349.78 1375.62 351.59 1360.97 351.59"/><line class="cls-11" x1="1375.62" y1="351.59" x2="1374.7" y2="328.22"/><line class="cls-11" x1="1362.55" y1="351.8" x2="1363.62" y2="328.17"/><line class="cls-11" x1="1379.04" y1="327.24" x2="1380.96" y2="350.69"/><path class="cls-2" d="M1352.21,248.22a24.66,24.66,0,0,0-3.9,1.62c-13.13,6.5-22.6,20.5-19.8,33.51,3,13.8,4.75,18,9.07,26,4.11,7.66,24.56,28.65,24.56,28.65h19s26-25.35,29.59-33.06,8.5-22.3,5.9-32-7.67-22.5-18.89-25.35A89.08,89.08,0,0,0,1352.21,248.22Z"/><polygon class="cls-2" points="1360.97 351.59 1360.97 363.19 1377.34 363.19 1375.62 351.59 1360.97 351.59"/><polygon class="cls-3" points="1377.34 363.19 1381.98 359.58 1381.98 349.78 1375.62 351.59 1377.34 363.19"/><path class="cls-2" d="M1410.67,304.92c3.55-7.72,8.53-22.31,5.92-32s-7.7-22.5-19-25.36l-.74-.18C1375.66,245,1362.1,338,1362.09,338H1381S1407.11,312.63,1410.67,304.92Z"/><path class="cls-3" d="M1418.36,273.06c-2.35-9.53-9.22-22.61-20.48-25.47a7.75,7.75,0,0,0-1.77-.23,7.75,7.75,0,0,1,1.77.23c11.26,2.86,18.13,15.94,20.48,25.47,2.4,9.72-3.72,24.22-7.44,31.86-6.11,12.52-29.71,33.07-29.71,33.07h0s23.6-20.55,29.71-33.07C1414.64,297.28,1420.76,282.78,1418.36,273.06Z"/><path class="cls-3" d="M1410.92,304.92c3.72-7.64,9.84-22.14,7.44-31.86-2.35-9.53-9.22-22.61-20.48-25.47a7.75,7.75,0,0,0-1.77-.23c-20.78-.12-34,90.63-34,90.63h19.12S1404.81,317.44,1410.92,304.92Z"/><path class="cls-10" d="M1366.06,291.61a6.25,6.25,0,0,1-3.69-3,12.66,12.66,0,0,1-1.19-5.52,18.94,18.94,0,0,1,0-2.61,35.65,35.65,0,0,1,.31-3.72c.15-1.14.3-1.92.45-2.72.08-.41.11-.54.16-.72a.42.42,0,0,1,.41-.33h.1l2.7.43a.42.42,0,0,1,.36.42v.06l-.15.75c-.13.75-.27,1.7-.4,2.85a32.58,32.58,0,0,0-.23,3.57,13.42,13.42,0,0,0,.69,5.06,3.72,3.72,0,0,0,2.65,2.13,21.21,21.21,0,0,0,4.12.45c2.66-9.69,5.79-19.14,9.33-26.55a21,21,0,0,0-29.18,19.36h0A21,21,0,0,0,1369,302.1c.74-3.17,1.53-6.4,2.37-9.64A18.83,18.83,0,0,1,1366.06,291.61Z"/><path class="cls-8" d="M1394.54,281.6a21,21,0,0,0-12.86-19.41c-3.54,7.41-6.67,16.86-9.33,26.55h1.6a20.86,20.86,0,0,0,4.85-.44,3.72,3.72,0,0,0,2.62-2.13,12.89,12.89,0,0,0,.7-5.07,35.25,35.25,0,0,0-.22-3.56q-.21-1.72-.42-2.85l-.14-.75a.06.06,0,0,1,0-.06.4.4,0,0,1,.35-.42l2.71-.43h.1a.44.44,0,0,1,.42.33c0,.18.07.31.16.72.15.82.29,1.59.45,2.72a35.65,35.65,0,0,1,.31,3.72,19,19,0,0,1,0,2.61,12.7,12.7,0,0,1-1.19,5.52,6.28,6.28,0,0,1-3.69,3,22.52,22.52,0,0,1-7.26.89h-.39c-.68,0-1.34,0-2,0-.84,3.24-1.63,6.47-2.37,9.64a21,21,0,0,0,25.56-20.5Z"/><path class="cls-8" d="M1394.57,308.4c-2.19,0-2.73,1.33-2.73,3.22s.55,3.23,2.73,3.23,2.74-1.33,2.74-3.23S1396.77,308.4,1394.57,308.4Zm0,5.29c-1.17,0-1.34-.75-1.34-2.07s.17-2.07,1.34-2.07,1.33.76,1.33,2.07S1395.74,313.69,1394.58,313.69Z"/><path class="cls-10" d="M1354,314.62a.18.18,0,0,0,.16.1h.51a.18.18,0,0,0,.18-.19h0v-5.78a.18.18,0,0,0-.18-.18h-1.1a.18.18,0,0,0-.18.18v4.59a2.7,2.7,0,0,1-1.41.36c-.65,0-1-.28-1-.91v-4a.18.18,0,0,0-.18-.18h-1a.18.18,0,0,0-.18.18v4.16c0,1.18.55,1.95,2.11,1.95a3.5,3.5,0,0,0,2-.64l.18.41Z"/><path class="cls-10" d="M1364.12,310.37v4.15s.05.18.15.2h1a.19.19,0,0,0,.17-.2v-4.17a1.77,1.77,0,0,0-2-2,3.45,3.45,0,0,0-2,.61,1.77,1.77,0,0,0-1.58-.61,3.15,3.15,0,0,0-1.86.64l-.18-.41a.42.42,0,0,0-.15-.12h-.51a.18.18,0,0,0-.18.18v5.78a.19.19,0,0,0,.18.19h1s.18-.05.15-.16v-4.58a2.75,2.75,0,0,1,1.32-.35c.56,0,.88.2.87.79v4.16c0,.1.19.2.19.2h1a.19.19,0,0,0,.18-.19v-4.59a2.42,2.42,0,0,1,1.31-.36C1363.78,309.58,1364.12,309.78,1364.12,310.37Z"/><path class="cls-10" d="M1367.77,306.87a.18.18,0,0,0-.18.18v1.25c.1-.48.21-.95.31-1.43Z"/><path class="cls-8" d="M1367.77,314.72h.52a.18.18,0,0,0,.16-.1l.19-.39a3.32,3.32,0,0,0,2,.63c1.82,0,2.49-1.2,2.49-3.22s-.67-3.22-2.49-3.22a3.19,3.19,0,0,0-1.67.49v-1.86a.18.18,0,0,0-.18-.18h-.91c-.1.48-.21.95-.31,1.43v6.23A.19.19,0,0,0,1367.77,314.72Zm1.16-4.79a2.58,2.58,0,0,1,1.33-.36c1.2,0,1.39.92,1.39,2.06s-.19,2.05-1.39,2.05h0a2.67,2.67,0,0,1-1.33-.35Z"/><path class="cls-8" d="M1378.19,308.41a2.59,2.59,0,0,0-.48,0,3,3,0,0,0-2,.65l-.18-.42a.19.19,0,0,0-.16-.09h-.52a.18.18,0,0,0-.18.18v5.84a.19.19,0,0,0,.18.19h1a.19.19,0,0,0,.18-.19V310a3,3,0,0,1,1.58-.37,3.87,3.87,0,0,1,.48,0h0a.18.18,0,0,0,.18-.18v-.76C1378.36,308.56,1378.29,308.41,1378.19,308.41Z"/><path class="cls-8" d="M1381.84,308.42a5.85,5.85,0,0,0-1.9.3.19.19,0,0,0-.12.17v.82a.19.19,0,0,0,.19.18h.06a5.41,5.41,0,0,1,1.7-.28c.92,0,1.22.25,1.22.88v.3l-1.4.11c-1.41.11-2.28.68-2.28,2a1.88,1.88,0,0,0,2.14,2,3,3,0,0,0,1.88-.64l.19.38a.18.18,0,0,0,.16.1h.46a.19.19,0,0,0,.19-.19v-3.92C1384.33,309.3,1383.86,308.42,1381.84,308.42Zm1.15,4.89a2.31,2.31,0,0,1-1.32.41.84.84,0,0,1-1-.92c0-.64.37-.87,1-.94l1.29-.15Z"/><path class="cls-8" d="M1390.45,308.66a4.2,4.2,0,0,0-1.57-.25c-2.19,0-2.85,1.3-2.85,3.22s.67,3.23,2.85,3.23a4.48,4.48,0,0,0,1.58-.26.3.3,0,0,0,.14-.17v-.82a.23.23,0,0,0-.21-.18h-.07a4.21,4.21,0,0,1-1.37.2c-1.19,0-1.54-.81-1.54-2s.35-2,1.54-2a4.51,4.51,0,0,1,1.37.21h.06a.24.24,0,0,0,.22-.18v-.82A.26.26,0,0,0,1390.45,308.66Z"/></g></g></svg>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/loader.gif b/src/Umbraco.Web.UI.Client/src/assets/img/loader.gif
deleted file mode 100644
index bf2875b84e..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/loader.gif and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/login.jpg b/src/Umbraco.Web.UI.Client/src/assets/img/login.jpg
deleted file mode 100644
index 3adc277159..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/login.jpg and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/nonodesbg.webp b/src/Umbraco.Web.UI.Client/src/assets/img/nonodesbg.webp
deleted file mode 100644
index 32ae6bb4e1..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/nonodesbg.webp and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/transparent.png b/src/Umbraco.Web.UI.Client/src/assets/img/transparent.png
deleted file mode 100644
index ec8b019cdb..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/transparent.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/uploader/upload-illustration.svg b/src/Umbraco.Web.UI.Client/src/assets/img/uploader/upload-illustration.svg
deleted file mode 100644
index 30bce45e8b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/img/uploader/upload-illustration.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<svg class="illustration" 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"
-viewBox="0 0 140 75" enable-background="new 0 0 140 75" xml:space="preserve">
-    <path fill="#FFFFFF" stroke="#D9D9D9" d="M132.4,68.6H43.1c-0.5,0-1-0.4-1-1V7.1c0-0.6,0.5-1,1-1h89.4c0.6,0,1,0.4,1,1v60.5
-C133.4,68.2,133,68.6,132.4,68.6z"/>
-    <line fill="none" stroke="#D9D9D9" x1="42.1" y1="16.4" x2="133.4" y2="16.4"/>
-    <circle fill="#df4949" cx="47" cy="11.6" r="1.5"/>
-    <circle fill="#F4DD33" cx="52.5" cy="11.6" r="1.5"/>
-    <circle fill="#49df5c" cx="58" cy="11.6" r="1.5"/>
-    <g>
-        <g>
-            <path fill="none" stroke="#D9D9D9" stroke-linecap="round" stroke-linejoin="round" d="M64.2,44.1c-12.7-11.9-32.7-11.7-45.1,0.8"
-                />
-            <g>
-                <polygon fill="#D9D9D9" points="64.4,38.9 63.4,39 63.9,43.9 58.9,44 59,45 65,44.9 			"/>
-            </g>
-        </g>
-    </g>
-    <rect x="4.8" y="23.9" fill="#FFFFFF" stroke="#D9D9D9" stroke-linecap="round" stroke-linejoin="round" width="30" height="25"/>
-    <path fill="#FFFFFF" stroke="#D9D9D9" stroke-linecap="round" stroke-linejoin="round" d="M4.8,48.9c0,0,0-12.5,15-12.5
-s15,12.5,15,12.5H4.8z"/>
-    <circle fill="#FFFFFF" stroke="#D9D9D9" stroke-linecap="round" stroke-linejoin="round" cx="28.7" cy="30.8" r="2.5"/>
-</svg>
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/_module.js b/src/Umbraco.Web.UI.Client/src/common/directives/_module.js
deleted file mode 100644
index 4b39210b2a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/_module.js
+++ /dev/null
@@ -1,4 +0,0 @@
-angular.module("umbraco.directives", ["umbraco.directives.editors", "umbraco.directives.html", "umbraco.directives.validation", "ui.sortable"]);
-angular.module("umbraco.directives.editors", []);
-angular.module("umbraco.directives.html", []);
-angular.module("umbraco.directives.validation", []);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/_readme.md b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/_readme.md
deleted file mode 100644
index 7ceb11d9a2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/_readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-#Application
-
-Directives used for the main application window. Navigation, sections etc.
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/navresize.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/navresize.directive.js
deleted file mode 100644
index ded0b1e41c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/navresize.directive.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:navResize
-* @restrict A
- *
- * @description
- * Handles how the navigation responds to window resizing and controls how the draggable resize panel works
-**/
-angular.module("umbraco.directives")
-    .directive('navResize', function (appState, eventsService, windowResizeListener) {
-        return {
-            restrict: 'A',
-            link: function (scope, element, attrs, ctrl) {
-
-                var minScreenSize = 1100;
-                var resizeEnabled = false;
-
-                function setTreeMode() {
-                    appState.setGlobalState("showNavigation", appState.getGlobalState("isTablet") === false);
-                }
-
-                function enableResize() {
-                    //only enable when the size is correct and it's not already enabled
-                    if (!resizeEnabled && appState.getGlobalState("isTablet") === false) {
-                        element.resizable(
-                        {
-                            containment: $("#mainwrapper"),
-                            autoHide: true,
-                            handles: "e",
-                            alsoResize: ".navigation-inner-container",
-                            resize: function(e, ui) {
-                                var wrapper = $("#mainwrapper");
-                                var contentPanel = $("#contentwrapper");
-                                var umbNotification = $("#umb-notifications-wrapper");
-                                var bottomBar = contentPanel.find(".umb-bottom-bar");
-                                var navOffeset = $("#navOffset");
-
-                                var leftPanelWidth = ui.element.width();
-
-                                contentPanel.css({ left: leftPanelWidth });
-                                bottomBar.css({ left: leftPanelWidth });
-                                umbNotification.css({ left: leftPanelWidth });
-
-                                navOffeset.css({ "margin-left": ui.element.outerWidth() });
-                            },
-                            stop: function (e, ui) {
-
-                            }
-                        });
-
-                        resizeEnabled = true;
-                    }
-                }
-
-                function resetResize() {
-                    if (resizeEnabled) {
-                        //kill the resize
-                        element.resizable("destroy");
-                        element.css("width", "");
-
-                        var navInnerContainer = element.find(".navigation-inner-container");
-
-                        navInnerContainer.css("width", "");
-                        $("#contentwrapper").css("left", "");
-                        $("#umb-notifications-wrapper").css("left", "");
-                        $("#navOffset").css("margin-left", "");
-
-                        resizeEnabled = false;
-                    }
-                }
-
-                var evts = [];
-
-                //Listen for global state changes
-                evts.push(eventsService.on("appState.globalState.changed", function (e, args) {
-                    if (args.key === "showNavigation") {
-                        if (args.value === false) {
-                            resetResize();
-                        }
-                        else {
-                            enableResize();
-                        }
-                    }
-                }));
-
-                var resizeCallback = function(size) {
-                    //set the global app state
-                    appState.setGlobalState("isTablet", (size.width <= minScreenSize));
-                    setTreeMode();
-                };
-
-                windowResizeListener.register(resizeCallback);
-
-                //ensure to unregister from all events and kill jquery plugins
-                scope.$on('$destroy', function () {
-                    windowResizeListener.unregister(resizeCallback);
-                    for (var e in evts) {
-                        eventsService.unsubscribe(evts[e]);
-                    }
-                    var navInnerContainer = element.find(".navigation-inner-container");
-                    navInnerContainer.resizable("destroy");
-                });
-
-                //init
-                //set the global app state
-                appState.setGlobalState("isTablet", ($(window).width() <= minScreenSize));
-                setTreeMode();
-            }
-        };
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js
deleted file mode 100644
index 49a7346c76..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js
+++ /dev/null
@@ -1,159 +0,0 @@
-(function () {
-    "use strict";
-
-    function AppHeaderDirective(eventsService, appState, userService, focusService, $timeout, editorService) {
-
-        function link(scope, element) {
-
-            var evts = [];
-
-            // the null is important because we do an explicit bool check on this in the view
-            // the avatar is by default the umbraco logo
-            scope.authenticated = null;
-            scope.user = null;
-            scope.avatar = [
-                { value: "assets/img/application/logo.svg" }
-            ];
-            scope.hideBackofficeLogo = Umbraco.Sys.ServerVariables.umbracoSettings.hideBackofficeLogo;
-
-            // when a user logs out or timesout
-            evts.push(eventsService.on("app.notAuthenticated", function () {
-                scope.authenticated = false;
-                scope.user = null;
-            }));
-
-            // when the application is ready and the user is authorized setup the data
-            evts.push(eventsService.on("app.ready", function (evt, data) {
-
-                scope.authenticated = true;
-                scope.user = data.user;
-
-                if (scope.user.avatars) {
-                    scope.avatar = [];
-                    if (Utilities.isArray(scope.user.avatars)) {
-                        for (var i = 0; i < scope.user.avatars.length; i++) {
-                            scope.avatar.push({ value: scope.user.avatars[i] });
-                        }
-                    }
-                }
-
-            }));
-
-            evts.push(eventsService.on("app.userRefresh", function (evt) {
-                userService.refreshCurrentUser().then(function (data) {
-                    scope.user = data;
-
-                    if (scope.user.avatars) {
-                        scope.avatar = [];
-                        if (Utilities.isArray(scope.user.avatars)) {
-                            for (var i = 0; i < scope.user.avatars.length; i++) {
-                                scope.avatar.push({ value: scope.user.avatars[i] });
-                            }
-                        }
-                    }
-                });
-            }));
-
-            scope.rememberFocus = focusService.rememberFocus;
-
-            scope.searchClick = function () {
-                var showSearch = appState.getSearchState("show");
-                appState.setSearchState("show", !showSearch);
-            };
-
-            // toggle the help dialog by raising the global app state to toggle the help drawer
-            scope.helpClick = function () {
-                var showDrawer = appState.getDrawerState("showDrawer");
-                var drawer = { view: "help", show: !showDrawer };
-                appState.setDrawerState("view", drawer.view);
-                appState.setDrawerState("showDrawer", drawer.show);
-            };
-
-            scope.avatarClick = function () {
-                const userEditor = {
-                  size: "small",
-                  view: "views/common/infiniteeditors/user/user.html",
-                  close: function() {
-                    editorService.close();
-                  }
-                };
-
-                editorService.open(userEditor);
-            };
-
-            scope.logoModal = {
-                show: false,
-                text: "",
-                timer: null
-            };
-            scope.showLogoModal = function() {
-                $timeout.cancel(scope.logoModal.timer);
-                scope.logoModal.show = true;
-                scope.logoModal.text = "version "+Umbraco.Sys.ServerVariables.application.version;
-                $timeout(function () {
-                    const anchorLink = element[0].querySelector('.umb-app-header__logo-modal');
-                    if(anchorLink) {
-                        anchorLink.focus();
-                    }
-                    const anchorButton = element[0].querySelector('#umbraco-logo-mark');
-                    anchorButton.classList.add("active");
-                });
-            };
-            scope.keepLogoModal = function() {
-                $timeout.cancel(scope.logoModal.timer);
-            };
-            scope.hideLogoModal = function() {
-                if(scope.logoModal.show === true) {
-                    $timeout.cancel(scope.logoModal.timer);
-                    scope.logoModal.timer = $timeout(function () {
-                        scope.logoModal.show = false;
-                    }, 100);
-                  const anchorButton = element[0].querySelector('#umbraco-logo-mark');
-                  anchorButton.classList.remove("active");
-                }
-            };
-            scope.stopClickEvent = function($event) {
-                $event.stopPropagation();
-            };
-
-            scope.toggleLogoModal = function() {
-                if(scope.logoModal.show) {
-                    $timeout.cancel(scope.logoModal.timer);
-                    scope.logoModal.show = false;
-                } else {
-                    scope.showLogoModal();
-                }
-            };
-
-            scope.skipToMenu = function() {
-                document.querySelector('#applications a').focus();
-            };
-
-            scope.skipToContent = function() {
-                var focusableElements = document.querySelectorAll('.umb-app-content a, .umb-app-content button');
-                for(var i=0; i < focusableElements.length; i++){
-                    if(focusableElements[i].offsetParent !== null) {
-                        focusableElements[i].focus();
-                        break;
-                    }
-                }
-            };
-
-        }
-
-        var directive = {
-            transclude: true,
-            restrict: "E",
-            replace: true,
-            templateUrl: "views/components/application/umb-app-header.html",
-            link: link,
-            scope: {}
-        };
-
-        return directive;
-
-    }
-
-    angular.module("umbraco.directives").directive("umbAppHeader", AppHeaderDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbbackdrop.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbbackdrop.directive.js
deleted file mode 100644
index 4b24075748..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbbackdrop.directive.js
+++ /dev/null
@@ -1,116 +0,0 @@
-(function () {
-    "use strict";
-
-    function BackdropDirective($timeout, $http) {
-
-        function link(scope, el, attr, ctrl) {
-
-            var events = [];
-
-            scope.clickBackdrop = function (event) {
-                if (scope.disableEventsOnClick === true) {
-                    event.preventDefault();
-                    event.stopPropagation();
-                }
-            };
-
-            function onInit() {
-
-                if (scope.highlightElement) {
-                    setHighlight();
-                }
-
-            }
-
-            function setHighlight() {
-
-                scope.loading = true;
-
-                $timeout(function () {
-
-                    // The element to highlight
-                    var highlightElement = $(scope.highlightElement);
-
-                    if (highlightElement && highlightElement.length > 0) {
-
-                        var offset = highlightElement.offset();
-                        var width = highlightElement.outerWidth();
-                        var height = highlightElement.outerHeight();
-
-                        // Rounding numbers
-                        var topDistance = offset.top.toFixed();
-                        var topAndHeight = (offset.top + height).toFixed();
-                        var leftDistance = offset.left.toFixed();
-                        var leftAndWidth = (offset.left + width).toFixed();
-
-                        // The four rectangles
-                        var rectTop = el.find(".umb-backdrop__rect--top");
-                        var rectRight = el.find(".umb-backdrop__rect--right");
-                        var rectBottom = el.find(".umb-backdrop__rect--bottom");
-                        var rectLeft = el.find(".umb-backdrop__rect--left");
-
-                        // Add the css
-                        scope.rectTopCss = { "height": topDistance, "left": leftDistance + "px", opacity: scope.backdropOpacity };
-                        scope.rectRightCss = { "left": leftAndWidth + "px", "top": topDistance + "px", "height": height, opacity: scope.backdropOpacity };
-                        scope.rectBottomCss = { "height": "100%", "top": topAndHeight + "px", "left": leftDistance + "px", opacity: scope.backdropOpacity };
-                        scope.rectLeftCss = { "width": leftDistance, opacity: scope.backdropOpacity };
-
-                        // Prevent interaction in the highlighted area
-                        if (scope.highlightPreventClick) {
-                            var preventClickElement = el.find(".umb-backdrop__highlight-prevent-click");
-                            preventClickElement.css({ "width": width, "height": height, "left": offset.left, "top": offset.top });
-                        }
-
-                    }
-
-                    scope.loading = false;
-
-                });
-
-            }
-
-            function resize() {
-                setHighlight();
-            }
-
-            events.push(scope.$watch("highlightElement", function (newValue, oldValue) {
-                if (!newValue) { return; }
-                if (newValue === oldValue) { return; }
-                setHighlight();
-            }));
-
-            $(window).on("resize.umbBackdrop", resize);
-
-            scope.$on("$destroy", function () {
-                // unbind watchers
-                for (var e in events) {
-                    events[e]();
-                }
-                $(window).off("resize.umbBackdrop");
-            });
-
-            onInit();
-
-        }
-
-        var directive = {
-            transclude: true,
-            restrict: "E",
-            replace: true,
-            templateUrl: "views/components/application/umb-backdrop.html",
-            link: link,
-            scope: {
-                backdropOpacity: "=?",
-                highlightElement: "=?",
-                highlightPreventClick: "=?",
-                disableEventsOnClick: "=?"
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module("umbraco.directives").directive("umbBackdrop", BackdropDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbcontextmenu.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbcontextmenu.directive.js
deleted file mode 100644
index 7749dacdcc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbcontextmenu.directive.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbContextMenu
-* @restrict A
- *
- * @description
- * Handles the click events on the context menu
-**/
-angular.module("umbraco.directives")
-.directive('umbContextMenu', function (navigationService, keyboardService) {
-    return {
-        scope: {
-            menuDialogTitle: "@",
-            currentSection: "@",
-            currentNode: "=",
-            menuActions: "="
-        },
-        restrict: 'E',
-        replace: true,
-        templateUrl: 'views/components/application/umb-contextmenu.html',
-        link: function (scope, element, attrs, ctrl) {
-
-            // Map action icons using legacy icon font or svg icons.
-            Utilities.forEach(scope.menuActions, action => {
-              action.icon = (action.useLegacyIcon ? 'icon-' : '') + action.icon;
-            });
-            
-            //adds a handler to the context menu item click, we need to handle this differently
-            //depending on what the menu item is supposed to do.
-            scope.executeMenuItem = action => {
-                navigationService.executeMenuAction(action, scope.currentNode, scope.currentSection);
-            };
-            
-            scope.outSideClick = () => {
-                navigationService.hideNavigation();
-            };
-            
-            keyboardService.bind("esc", () =>  {
-                navigationService.hideNavigation();
-            });
-            
-            //ensure to unregister from all events!
-            scope.$on('$destroy', () =>  {
-                keyboardService.unbind("esc");
-            });
-        }
-    };
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawer.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawer.directive.js
deleted file mode 100644
index 8fa1bf4a46..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawer.directive.js
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbDrawer
-@restrict E
-@scope
-
-@description
-The drawer component is a global component and is already added to the umbraco markup. It is registered in globalState and can be opened and configured by raising events.
-
-<h3>Markup example - how to open the drawer</h3>
-<pre>
-    <div ng-controller="My.DrawerController as vm">
-
-        <umb-button
-            type="button"
-            label="Toggle drawer"
-            action="vm.toggleDrawer()">
-        </umb-button>
-
-    </div>
-</pre>
-
-<h3>Controller example - how to open the drawer</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function DrawerController(appState) {
-
-            var vm = this;
-
-            vm.toggleDrawer = toggleDrawer;
-
-            function toggleDrawer() {
-
-                var showDrawer = appState.getDrawerState("showDrawer");            
-
-                var model = {
-                    firstName: "Super",
-                    lastName: "Man"
-                };
-
-                appState.setDrawerState("view", "/App_Plugins/path/to/drawer.html");
-                appState.setDrawerState("model", model);
-                appState.setDrawerState("showDrawer", !showDrawer);
-                
-            }
-
-        }
-
-        angular.module("umbraco").controller("My.DrawerController", DrawerController);
-
-    })();
-</pre>
-
-<h3>Use the following components in the custom drawer to render the content</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbDrawerView umbDrawerView}</li>
-    <li>{@link umbraco.directives.directive:umbDrawerHeader umbDrawerHeader}</li>
-    <li>{@link umbraco.directives.directive:umbDrawerContent umbDrawerContent}</li>
-    <li>{@link umbraco.directives.directive:umbDrawerFooter umbDrawerFooter}</li>
-</ul>
-
-@param {string} view (<code>binding</code>): Set the drawer view
-@param {string} model (<code>binding</code>): Pass in custom data to the drawer
-
-**/
-
-function Drawer($location, $routeParams, helpService, userService, localizationService, dashboardResource) {
-    
-        return {
-    
-            restrict: "E",    // restrict to an element
-            replace: true,   // replace the html element with the template
-            templateUrl: 'views/components/application/umbdrawer/umb-drawer.html',
-            transclude: true,
-            scope: {
-                view: "=?",
-                model: "=?"
-            },
-    
-            link: function (scope, element, attr, ctrl) {
-    
-                function onInit() {
-                    setView();
-                }
-    
-                function setView() {
-                    if (scope.view) {
-                        //we do this to avoid a hidden dialog to start loading unconfigured views before the first activation
-                        var configuredView = scope.view;
-                        if (scope.view.indexOf(".html") === -1) {
-                            var viewAlias = scope.view.toLowerCase();
-                            configuredView = "views/common/drawers/" + viewAlias + "/" + viewAlias + ".html";
-                        }
-                        if (configuredView !== scope.configuredView) {
-                            scope.configuredView = configuredView;
-                        }
-                    }
-                }
-    
-                onInit();
-               
-            }
-    
-        };
-    }
-    
-    angular.module('umbraco.directives').directive("umbDrawer", Drawer);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawercontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawercontent.directive.js
deleted file mode 100644
index d4aa76f70e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawercontent.directive.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbDrawerContent
-@restrict E
-@scope
-
-@description
-Use this directive to render drawer content
-
-<h3>Markup example</h3>
-<pre>
-	<umb-drawer-view>
-        
-        <umb-drawer-header
-            title="Drawer Title"
-            description="Drawer description">
-        </umb-drawer-header>
-
-        <umb-drawer-content>
-            <!-- Your content here -->
-            <pre>{{ model | json }}</pre>
-        </umb-drawer-content>
-
-        <umb-drawer-footer>
-            <!-- Your content here -->
-        </umb-drawer-footer>
-
-	</umb-drawer-view>
-</pre>
-
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbDrawerView umbDrawerView}</li>
-    <li>{@link umbraco.directives.directive:umbDrawerHeader umbDrawerHeader}</li>
-    <li>{@link umbraco.directives.directive:umbDrawerFooter umbDrawerFooter}</li>
-</ul>
-
-**/
-
-(function() {
-    'use strict';
-
-    function DrawerContentDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/application/umbdrawer/umb-drawer-content.html'
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbDrawerContent', DrawerContentDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawerfooter.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawerfooter.directive.js
deleted file mode 100644
index f76bca3a77..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawerfooter.directive.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbDrawerFooter
-@restrict E
-@scope
-
-@description
-Use this directive to render a drawer footer
-
-<h3>Markup example</h3>
-<pre>
-	<umb-drawer-view>
-        
-        <umb-drawer-header
-            title="Drawer Title"
-            description="Drawer description">
-        </umb-drawer-header>
-
-        <umb-drawer-content>
-            <!-- Your content here -->
-            <pre>{{ model | json }}</pre>
-        </umb-drawer-content>
-
-        <umb-drawer-footer>
-            <!-- Your content here -->
-        </umb-drawer-footer>
-
-	</umb-drawer-view>
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbDrawerView umbDrawerView}</li>
-    <li>{@link umbraco.directives.directive:umbDrawerHeader umbDrawerHeader}</li>
-    <li>{@link umbraco.directives.directive:umbDrawerContent umbDrawerContent}</li>
-</ul>
-
-**/
-
-(function() {
-    'use strict';
-
-    function DrawerFooterDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/application/umbdrawer/umb-drawer-footer.html'
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbDrawerFooter', DrawerFooterDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawerheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawerheader.directive.js
deleted file mode 100644
index 78237a539e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawerheader.directive.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbDrawerHeader
-@restrict E
-@scope
-
-@description
-Use this directive to render a drawer header
-
-<h3>Markup example</h3>
-<pre>
-	<umb-drawer-view>
-        
-        <umb-drawer-header
-            title="Drawer Title"
-            description="Drawer description">
-        </umb-drawer-header>
-
-        <umb-drawer-content>
-            <!-- Your content here -->
-            <pre>{{ model | json }}</pre>
-        </umb-drawer-content>
-
-        <umb-drawer-footer>
-            <!-- Your content here -->
-        </umb-drawer-footer>
-
-	</umb-drawer-view>
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbDrawerView umbDrawerView}</li>
-    <li>{@link umbraco.directives.directive:umbDrawerContent umbDrawerContent}</li>
-    <li>{@link umbraco.directives.directive:umbDrawerFooter umbDrawerFooter}</li>
-</ul>
-
-@param {string} title (<code>attribute</code>): Set a drawer title.
-@param {string} description (<code>attribute</code>): Set a drawer description.
-**/
-
-(function() {
-    'use strict';
-
-    function DrawerHeaderDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/application/umbdrawer/umb-drawer-header.html',
-            scope: {
-                "title": "@?",
-                "description": "@?"
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbDrawerHeader', DrawerHeaderDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawerview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawerview.directive.js
deleted file mode 100644
index 54cfea0857..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbdrawer/umbdrawerview.directive.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbDrawerView
-@restrict E
-@scope
-
-@description
-Use this directive to render drawer view
-
-<h3>Markup example</h3>
-<pre>
-	<umb-drawer-view>
-        
-        <umb-drawer-header
-            title="Drawer Title"
-            description="Drawer description">
-        </umb-drawer-header>
-
-        <umb-drawer-content>
-            <!-- Your content here -->
-            <pre>{{ model | json }}</pre>
-        </umb-drawer-content>
-
-        <umb-drawer-footer>
-            <!-- Your content here -->
-        </umb-drawer-footer>
-
-	</umb-drawer-view>
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbDrawerHeader umbDrawerHeader}</li>
-    <li>{@link umbraco.directives.directive:umbDrawerContent umbDrawerContent}</li>
-    <li>{@link umbraco.directives.directive:umbDrawerFooter umbDrawerFooter}</li>
-</ul>
-
-**/
-
-(function() {
-    'use strict';
-
-    function DrawerViewDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/application/umbdrawer/umb-drawer-view.html'
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbDrawerView', DrawerViewDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
deleted file mode 100644
index 836011c4f6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
+++ /dev/null
@@ -1,57 +0,0 @@
-(function () {
-    'use strict';
-
-    angular
-        .module('umbraco.directives')
-        .component('umbLogin', {
-            templateUrl: 'views/components/application/umb-login.html',
-            controller: UmbLoginController,
-            controllerAs: 'vm',
-            bindings: {
-                isTimedOut: "<",
-                onLogin: "&"
-            }
-        });
-
-    function UmbLoginController($location, externalLoginInfoService, userService) {
-
-        const vm = this;
-        vm.onLoginSuccess = loginSuccess;
-
-        vm.backgroundImage = Umbraco.Sys.ServerVariables.umbracoSettings.loginBackgroundImage;
-        vm.logoImage = Umbraco.Sys.ServerVariables.umbracoSettings.loginLogoImage;
-        vm.logoImageAlternative = Umbraco.Sys.ServerVariables.umbracoSettings.loginLogoImageAlternative;
-        vm.allowPasswordReset = Umbraco.Sys.ServerVariables.umbracoSettings.canSendRequiredEmail && Umbraco.Sys.ServerVariables.umbracoSettings.allowPasswordReset;
-        vm.usernameIsEmail = Umbraco.Sys.ServerVariables.umbracoSettings.usernameIsEmail;
-
-        const tempUrl = new URL(Umbraco.Sys.ServerVariables.umbracoUrls.externalLoginsUrl, window.location.origin);
-        tempUrl.searchParams.append("redirectUrl", decodeURIComponent($location.search().returnPath ?? ""))
-
-        vm.externalLoginFormAction = tempUrl.pathname + tempUrl.search;
-        vm.externalLoginProviders = externalLoginInfoService.getLoginProviders();
-        vm.externalLoginProviders.forEach(x => {
-            x.customView = externalLoginInfoService.getLoginProviderView(x);
-        });
-        vm.disableLocalLogin = externalLoginInfoService.hasDenyLocalLogin();
-
-        /**
-         * This is called when the user has successfully logged in
-         * by the login screen sending out the event "umb-login-success"
-         * @access private
-         */
-        function loginSuccess(evt) {
-            const user = evt?.originalEvent?.detail;
-
-            if (user) {
-                userService.setAuthenticationSuccessful(user);
-            } else {
-                console.error("No user was returned from the login event");
-            }
-
-            if (vm.onLogin) {
-                vm.onLogin();
-            }
-        }
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbnavigation.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbnavigation.directive.js
deleted file mode 100644
index 375ab34a64..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbnavigation.directive.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbNavigation
-* @restrict E
-**/
-function umbNavigationDirective() {
-    return {
-        restrict: "E",    // restrict to an element
-        replace: true,   // replace the html element with the template
-        templateUrl: 'views/components/application/umb-navigation.html'
-    };
-}
-
-angular.module('umbraco.directives').directive("umbNavigation", umbNavigationDirective);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbpasswordtip.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbpasswordtip.directive.js
deleted file mode 100644
index e088d84847..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbpasswordtip.directive.js
+++ /dev/null
@@ -1,77 +0,0 @@
-(function () {
-    'use strict';
-
-    angular
-        .module('umbraco.directives')
-        .component('umbPasswordTip', {
-            controller: UmbPasswordTipController,
-            controllerAs: 'vm',
-            template:
-                '<span class="help-inline" style="display: block;" ng-if="vm.passwordTip" ng-bind-html="vm.passwordTip"></span>',
-            bindings: {
-                passwordVal: "<",
-                minPwdLength: "<",
-                minPwdNonAlphaNum: "<"
-            }
-        });
-
-    function UmbPasswordTipController(localizationService) {
-
-        let defaultMinPwdLength = Umbraco.Sys.ServerVariables.umbracoSettings.minimumPasswordLength;
-        let defaultMinPwdNonAlphaNum = Umbraco.Sys.ServerVariables.umbracoSettings.minimumPasswordNonAlphaNum;
-
-        var vm = this;
-
-        vm.passwordNonAlphaTip = '';
-        vm.passwordTip = '';
-        vm.passwordLength = 0;
-
-        vm.$onInit = onInit;
-        vm.$onChanges = onChanges;
-
-        function onInit() {
-            if (vm.minPwdLength === undefined) {
-                vm.minPwdLength = defaultMinPwdLength;
-            }
-
-            if (vm.minPwdNonAlphaNum === undefined) {
-                vm.minPwdNonAlphaNum = defaultMinPwdNonAlphaNum;
-            }
-
-            if (vm.minPwdNonAlphaNum > 0) {
-                localizationService.localize('user_newPasswordFormatNonAlphaTip', [vm.minPwdNonAlphaNum]).then(data => {
-                    vm.passwordNonAlphaTip = data;
-                    updatePasswordTip(vm.passwordLength);
-                });
-            } else {
-                vm.passwordNonAlphaTip = '';
-                updatePasswordTip(vm.passwordLength);
-            }
-        }
-
-        function onChanges(simpleChanges) {
-
-            if (simpleChanges.passwordVal) {
-                vm.passwordLength = simpleChanges.passwordVal.currentValue ? simpleChanges.passwordVal.currentValue.length : 0;
-
-                updatePasswordTip(vm.passwordLength);
-            }
-        }
-
-        const updatePasswordTip = passwordLength => {
-
-            const remainingLength = vm.minPwdLength - passwordLength;
-            
-            if (remainingLength > 0) {
-                localizationService.localize('user_newPasswordFormatLengthTip', [remainingLength]).then(data => {
-                    vm.passwordTip = data;
-                    if (vm.passwordNonAlphaTip) {
-                        vm.passwordTip += `<br/>${vm.passwordNonAlphaTip}`;
-                    }
-                });
-            } else {
-                vm.passwordTip = vm.passwordNonAlphaTip;
-            }
-        }
-    }
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
deleted file mode 100644
index 42daf1dd75..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsearch.directive.js
+++ /dev/null
@@ -1,184 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * A component to render the pop up search field
-     */
-    var umbSearch = {
-        templateUrl: 'views/components/application/umb-search.html',
-        controllerAs: 'vm',
-        controller: umbSearchController,
-        bindings: {
-            onClose: "&"
-        }
-    };
-
-    function umbSearchController($timeout, backdropService, searchService, focusService) {
-
-        var vm = this;
-
-        vm.$onInit = onInit;
-        vm.$onDestroy = onDestroy;
-        vm.search = search;
-        vm.clickItem = clickItem;
-        vm.clearSearch = clearSearch;
-        vm.handleKeyDown = handleKeyDown;
-        vm.closeSearch = closeSearch;
-        vm.focusSearch = focusSearch;
-
-        //we need to capture the focus before this element is initialized.
-        vm.focusBeforeOpening = focusService.getLastKnownFocus();
-
-        vm.activeResult = null;
-        vm.activeResultGroup = null;
-
-        function onInit() {
-            vm.searchQuery = "";
-            vm.searchResults = [];
-            vm.hasResults = false;
-            focusSearch();
-            backdropService.open();
-        }
-
-        function onDestroy() {
-            backdropService.close();
-        }
-
-        /**
-         * Handles when a search result is clicked
-         */
-        function clickItem() {
-            closeSearch();
-        }
-
-        /**
-         * Clears the search query
-         */
-        function clearSearch() {
-            vm.searchQuery = "";
-            vm.searchResults = [];
-            vm.hasResults = false;
-            focusSearch();
-        }
-
-        /**
-         * Add focus to the search field
-         */
-        function focusSearch() {
-            vm.searchHasFocus = false;
-            $timeout(function () {
-                vm.searchHasFocus = true;
-            });
-        }
-
-        /**
-         * Handles all keyboard events
-         * @param {object} event
-         */
-        function handleKeyDown(event) {
-
-            // esc
-            if (event.keyCode === 27) {
-                event.stopPropagation();
-                event.preventDefault();
-
-                closeSearch();
-                return;
-            }
-
-            // up/down (navigate search results)
-            if (vm.hasResults && (event.keyCode === 38 || event.keyCode === 40)) {
-                event.stopPropagation();
-                event.preventDefault();
-
-                var allGroups = _.values(vm.searchResults);
-                var down = event.keyCode === 40;
-                if (vm.activeResultGroup === null) {
-                    // it's the first time navigating, pick the appropriate group and result 
-                    // - first group and first result when navigating down
-                    // - last group and last result when navigating up
-                    vm.activeResultGroup = down ? _.first(allGroups) : _.last(allGroups);
-                    vm.activeResult = down ? _.first(vm.activeResultGroup.results) : _.last(vm.activeResultGroup.results);
-                }
-                else if (down) {
-                    // handle navigation down through the groups and results
-                    if (vm.activeResult === _.last(vm.activeResultGroup.results)) {
-                        if (vm.activeResultGroup === _.last(allGroups)) {
-                            vm.activeResultGroup = _.first(allGroups);
-                        }
-                        else {
-                            vm.activeResultGroup = allGroups[allGroups.indexOf(vm.activeResultGroup) + 1];
-                        }
-                        vm.activeResult = _.first(vm.activeResultGroup.results);
-                    }
-                    else {
-                        vm.activeResult = vm.activeResultGroup.results[vm.activeResultGroup.results.indexOf(vm.activeResult) + 1];
-                    }
-                }
-                else {
-                    // handle navigation up through the groups and results
-                    if (vm.activeResult === _.first(vm.activeResultGroup.results)) {
-                        if (vm.activeResultGroup === _.first(allGroups)) {
-                            vm.activeResultGroup = _.last(allGroups);
-                        }
-                        else {
-                            vm.activeResultGroup = allGroups[allGroups.indexOf(vm.activeResultGroup) - 1];
-                        }
-                        vm.activeResult = _.last(vm.activeResultGroup.results);
-                    }
-                    else {
-                        vm.activeResult = vm.activeResultGroup.results[vm.activeResultGroup.results.indexOf(vm.activeResult) - 1];
-                    }
-                }
-
-                $timeout(function () {
-                    var resultElementLink = $(".umb-search-item[active-result='true'] .umb-search-result__link");
-                    resultElementLink[0].focus();
-                });
-            }
-        }
-
-        /**
-         * Used to proxy a callback
-         */
-        function closeSearch() {
-            if (vm.focusBeforeOpening) {
-                vm.focusBeforeOpening.focus();
-            }
-            if (vm.onClose) {
-                vm.onClose();
-            }
-        }
-
-        /**
-         * Used to search
-         * @param {string} searchQuery
-         */
-        function search(searchQuery) {
-            if (searchQuery.length > 0) {
-                var search = { "term": searchQuery };
-                searchService.searchAll(search).then(function (result) {
-                    //result is a dictionary of group Title and it's results
-                    var filtered = {};
-                    Object.keys(result).forEach(key => {
-                        let value = result[key];
-                        if (value.results.length > 0) {
-                            filtered[key] = value;
-                        }
-                    });
-                    // bind to view model
-                    vm.searchResults = filtered;
-                    // check if search has results
-                    vm.hasResults = Object.keys(vm.searchResults).length > 0;
-                });
-
-            } else {
-                clearSearch();
-            }
-        }
-
-    }
-
-    angular.module('umbraco.directives').component('umbSearch', umbSearch);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
deleted file mode 100644
index 190da7da0d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbSections
-* @restrict E
-**/
-function sectionsDirective($timeout, $window, navigationService, treeService, sectionService, appState, eventsService, $location, historyService) {
-    return {
-        restrict: "E",    // restrict to an element
-        replace: true,   // replace the html element with the template
-        templateUrl: 'views/components/application/umb-sections.html',
-        link: function (scope, element, attr, ctrl) {
-
-            var sectionItemsWidth = [];
-            var evts = [];
-
-            //setup scope vars
-            scope.sections = [];
-            scope.visibleSections = 0;
-            scope.currentSection = appState.getSectionState("currentSection");
-            scope.showTray = false;
-            scope.stickyNavigation = appState.getGlobalState("stickyNavigation");
-
-            function loadSections() {
-                sectionService.getSectionsForUser()
-                    .then(function (result) {
-                        scope.sections = result;
-                        scope.visibleSections = scope.sections.length;
-
-                        // store the width of each section so we can hide/show them based on browser width 
-                        // we store them because the sections get removed from the dom and then we 
-                        // can't tell when to show them gain
-                        $timeout(function () {
-                            $("#applications .sections li:not(:last)").each(function (index) {
-                                sectionItemsWidth.push($(this).outerWidth());
-                            });
-                        });
-                        calculateWidth();
-                    });
-            }
-
-            function calculateWidth() {
-                $timeout(function () {
-                    //total width minus room for avatar, search, and help icon
-                    var containerWidth = $(".umb-app-header").outerWidth() - $(".umb-app-header__actions").outerWidth();
-                    var trayToggleWidth = $("#applications .sections li.expand").outerWidth();
-                    var sectionsWidth = 0;
-                    
-                    // detect how many sections we can show on the screen
-                    for (var i = 0; i < sectionItemsWidth.length; i++) {
-                        var sectionItemWidth = sectionItemsWidth[i];
-                        sectionsWidth += sectionItemWidth;
-
-                        if (sectionsWidth + trayToggleWidth > containerWidth) {
-                            scope.visibleSections =  i;
-                            return;
-                        }
-                    }
-
-                    scope.visibleSections = scope.sections.length;
-                });
-            }
-
-            //Listen for global state changes
-            evts.push(eventsService.on("appState.globalState.changed", function (e, args) {
-                if (args.key === "showTray") {
-                    scope.showTray = args.value;
-                }
-                if (args.key === "stickyNavigation") {
-                    scope.stickyNavigation = args.value;
-                }
-            }));
-
-            evts.push(eventsService.on("appState.sectionState.changed", function (e, args) {
-                if (args.key === "currentSection") {
-                    scope.currentSection = args.value;
-                }
-            }));
-
-            evts.push(eventsService.on("app.reInitialize", function (e, args) {
-                //re-load the sections if we're re-initializing (i.e. package installed)
-                loadSections();
-            }));
-
-            //ensure to unregister from all events!
-            scope.$on('$destroy', function () {
-                for (var e in evts) {
-                    eventsService.unsubscribe(evts[e]);
-                }
-            });
-
-            //on page resize
-            window.onresize = calculateWidth;
-
-            scope.sectionClick = function (event, section) {
-
-                if (event.ctrlKey ||
-                    event.shiftKey ||
-                    event.metaKey || // apple
-                    (event.button && event.button === 1) // middle click, >IE9 + everyone else
-                ) {
-                    return;
-                }
-
-                navigationService.hideSearch();
-                navigationService.showTree(section.alias);
-
-                //in some cases the section will have a custom route path specified, if there is one we'll use it
-                if (section.routePath) {
-                    $location.path(section.routePath);
-                }
-                else {
-                    var lastAccessed = historyService.getLastAccessedItemForSection(section.alias);
-                    var path = lastAccessed != null ? lastAccessed.link : section.alias;
-                    $location.path(path);
-                }
-                navigationService.clearSearch();
-
-            };
-
-            scope.sectionDblClick = function (section) {
-                navigationService.reloadSection(section.alias);
-            };
-
-            scope.trayClick = function () {
-                if (appState.getGlobalState("showTray") === true) {
-                    navigationService.hideTray();
-                } else {
-                    navigationService.showTray();
-                }
-            };
-
-            scope.currentSectionInOverflow = function () {
-                var currentSection = scope.sections.filter(s => s.alias === scope.currentSection);
-
-                return currentSection.length > 0 && scope.sections.indexOf(currentSection[0]) > scope.visibleSections - 1;
-            };
-
-            loadSections();
-
-        }
-    };
-}
-
-angular.module('umbraco.directives').directive("umbSections", sectionsDirective);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
deleted file mode 100644
index b34a9eb8fd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
+++ /dev/null
@@ -1,607 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbTour
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco 7.8</b>. The tour component is a global component and is already added to the umbraco markup.
-In the Umbraco UI the tours live in the "Help drawer" which opens when you click the Help-icon in the bottom left corner of Umbraco.
-You can easily add you own tours to the Help-drawer or show and start tours from
-anywhere in the Umbraco backoffice. To see a real world example of a custom tour implementation, install <a href="https://our.umbraco.com/projects/starter-kits/the-starter-kit/">The Starter Kit</a> in Umbraco 7.8
-
-<h1><b>Extending the help drawer with custom tours</b></h1>
-The easiet way to add new tours to Umbraco is through the Help-drawer. All it requires is a my-tour.json file.
-Place the file in <i>App_Plugins/{MyPackage}/backoffice/tours/{my-tour}.json</i> and it will automatically be
-picked up by Umbraco and shown in the Help-drawer.
-
-<h3><b>The tour object</b></h3>
-The tour object consist of two parts - The overall tour configuration and a list of tour steps. We have split up the tour object for a better overview.
-<pre>
-// The tour config object
-{
-    "name": "My Custom Tour", // (required)
-    "alias": "myCustomTour", // A unique tour alias (required)
-    "group": "My Custom Group" // Used to group tours in the help drawer
-    "groupOrder": 200 // Control the order of tour groups
-    "allowDisable": // Adds a "Don't" show this tour again"-button to the intro step
-    "culture" : // From v7.11+. Specifies the culture of the tour (eg. en-US), if set the tour will only be shown to users with this culture set on their profile. If omitted or left empty the tour will be visible to all users
-    "requiredSections":["content", "media", "mySection"] // Sections that the tour will access while running, if the user does not have access to the required tour sections, the tour will not load.
-    "steps": [] // tour steps - see next example
-}
-</pre>
-<pre>
-// A tour step object
-{
-    "title": "Title",
-    "content": "<p>Step content</p>",
-    "type": "intro" // makes the step an introduction step,
-    "element": "[data-element='my-table-row']", // the highlighted element
-    "event": "click" // forces the user to click the UI to go to next step
-    "eventElement": "[data-element='my-table-row'] [data-element='my-tour-button']" // specify an element to click inside a highlighted element
-    "elementPreventClick": false // prevents user interaction in the highlighted element
-    "backdropOpacity": 0.4 // the backdrop opacity
-    "view": "" // add a custom view
-    "customProperties" : {} // add any custom properties needed for the custom view
-    "skipStepIfVisible": ".dashboard div [data-element='my-tour-button']" // if we can find this DOM element on the page then we will skip this step
-}
-</pre>
-
-<h1><b>Adding tours to other parts of the Umbraco backoffice</b></h1>
-It is also possible to add a list of custom tours to other parts of the Umbraco backoffice,
-as an example on a Dashboard in a Custom section. You can then use the {@link umbraco.services.tourService tourService} to start and stop tours but you don't have to register them as part of the tour service.
-
-<h1><b>Using the tour service</b></h1>
-<h3>Markup example - show custom tour</h3>
-<pre>
-    <div ng-controller="My.TourController as vm">
-
-        <div>{{vm.tour.name}}</div>
-        <button type="button" ng-click="vm.startTour()">Start tour</button>
-
-        <!-- This button will be clicked in the tour -->
-        <button data-element="my-tour-button" type="button">Click me</button>
-
-    </div>
-</pre>
-
-<h3>Controller example - show custom tour</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function TourController(tourService) {
-
-            var vm = this;
-
-            vm.tour = {
-                "name": "My Custom Tour",
-                "alias": "myCustomTour",
-                "steps": [
-                    {
-                        "title": "Welcome to My Custom Tour",
-                        "content": "",
-                        "type": "intro"
-                    },
-                    {
-                        "element": "[data-element='my-tour-button']",
-                        "title": "Click the button",
-                        "content": "Click the button",
-                        "event": "click",
-                        "skipStepIfVisible": "[data-element='my-other-tour-button']"
-                    }
-                ]
-            };
-
-            vm.startTour = startTour;
-
-            function startTour() {
-                tourService.startTour(vm.tour);
-            }
-
-        }
-
-        angular.module("umbraco").controller("My.TourController", TourController);
-
-    })();
-</pre>
-
-<h1><b>Custom step views</b></h1>
-In some cases you will need a custom view for one of your tour steps. 
-This could be for validation or for running any other custom logic for that step. 
-We have added a couple of helper components to make it easier to get the step scaffolding to look like a regular tour step. 
-In the following example you see how to run some custom logic before a step goes to the next step.
-
-<h3>Markup example - custom step view</h3>
-<pre>
-    <div ng-controller="My.TourStep as vm">
-
-        <umb-tour-step on-close="model.endTour()">
-                
-            <umb-tour-step-header
-                title="model.currentStep.title">
-            </umb-tour-step-header>
-            
-            <umb-tour-step-content
-                content="model.currentStep.content">
-
-                <!-- Add any custom content here  -->
-
-            </umb-tour-step-content>
-
-            <umb-tour-step-footer class="flex justify-between items-center">
-
-                <umb-tour-step-counter
-                    current-step="model.currentStepIndex + 1"
-                    total-steps="model.steps.length">
-                </umb-tour-step-counter>
-
-                <div>
-                    <umb-button 
-                        size="xs" 
-                        button-style="action" 
-                        type="button" 
-                        action="vm.initNextStep()" 
-                        label="Next">
-                    </umb-button>
-                </div>
-
-            </umb-tour-step-footer>
-
-        </umb-tour-step>
-
-    </div>
-</pre>
-
-<h3>Controller example - custom step view</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function StepController() {
-
-            var vm = this;
-            
-            vm.initNextStep = initNextStep;
-
-            function initNextStep() {
-                // run logic here before going to the next step
-                $scope.model.nextStep();
-            }
-
-        }
-
-        angular.module("umbraco").controller("My.TourStep", StepController);
-
-    })();
-</pre>
-
-
-<h3>Related services</h3>
-<ul>
-    <li>{@link umbraco.services.tourService tourService}</li>
-</ul>
-
-@param {string} model (<code>binding</code>): Tour object
-
-**/
-
-(function () {
-    'use strict';
-
-    function TourDirective($timeout, $http, $q, tourService, backdropService) {
-
-        function link(scope, el, attr, ctrl) {
-
-            var popover;
-            var pulseElement;
-            var pulseTimer;
-
-            scope.loadingStep = false;
-            scope.elementNotFound = false;
-
-            scope.model.nextStep = function () {
-                nextStep();
-            };
-
-            scope.model.endTour = function () {
-                unbindEvent();
-                tourService.endTour(scope.model);
-                backdropService.close();
-            };
-
-            scope.model.completeTour = function () {
-                unbindEvent();
-                tourService.completeTour(scope.model).then(function () {
-                    backdropService.close();
-                });
-            };
-
-            scope.model.disableTour = function () {
-                unbindEvent();
-                tourService.disableTour(scope.model).then(function () {
-                    backdropService.close();
-                });
-            }
-
-            function onInit() {
-                popover = el.find(".umb-tour__popover");
-                pulseElement = el.find(".umb-tour__pulse");
-                popover.hide();
-                scope.model.currentStepIndex = 0;
-                backdropService.open({ disableEventsOnClick: true });
-                startStep();
-            }
-
-            function setView() {
-                if (scope.model.currentStep.view && scope.model.alias) {
-                    //we do this to avoid a hidden dialog to start loading unconfigured views before the first activation
-                    var configuredView = scope.model.currentStep.view;
-                    if (scope.model.currentStep.view.indexOf(".html") === -1) {
-                        var viewAlias = scope.model.currentStep.view.toLowerCase();
-                        var tourAlias = scope.model.alias.toLowerCase();
-                        configuredView = "views/common/tours/" + tourAlias + "/" + viewAlias + "/" + viewAlias + ".html";
-                    }
-                    if (configuredView !== scope.configuredView) {
-                        scope.configuredView = configuredView;
-                    }
-                } else {
-                    scope.configuredView = null;
-                }
-            }
-
-            function nextStep() {
-
-                popover.hide();
-                pulseElement.hide();
-                $timeout.cancel(pulseTimer);
-                scope.model.currentStepIndex++;
-
-                // make sure we don't go too far
-                if (scope.model.currentStepIndex !== scope.model.steps.length) {
-
-                    var upcomingStep = scope.model.steps[scope.model.currentStepIndex];
-
-                    // If the currentStep JSON object has 'skipStepIfVisible'
-                    // It's a DOM selector - if we find it then we ship over this step
-                    if (upcomingStep.skipStepIfVisible) {
-                        let tryFindDomEl = document.querySelector(upcomingStep.skipStepIfVisible);
-                        if (tryFindDomEl) {
-                            // check if element is visible:
-                            if( tryFindDomEl.offsetWidth || tryFindDomEl.offsetHeight || tryFindDomEl.getClientRects().length ) {
-                                // if it was visible then we skip the step.
-                                nextStep();
-                                return;
-                            }
-                        }
-                    }
-
-                    startStep();
-                } else {
-                    // tour completed - final step
-                    scope.loadingStep = true;
-
-                    waitForPendingRerequests().then(function () {
-                        scope.loadingStep = false;
-                        // clear current step
-                        scope.model.currentStep = {};
-                        // set popover position to center
-                        setPopoverPosition(null);
-                        // remove backdrop hightlight and custom opacity
-                        backdropService.setHighlight(null);
-                        backdropService.setOpacity(null);
-                    });
-                }
-            }
-
-            function startStep() {
-                scope.loadingStep = true;
-                backdropService.setOpacity(scope.model.steps[scope.model.currentStepIndex].backdropOpacity);
-                backdropService.setHighlight(null);
-
-                waitForPendingRerequests().then(function () {
-
-                    scope.model.currentStep = scope.model.steps[scope.model.currentStepIndex];
-
-                    setView();
-
-                    // if highlight element is set - find it
-                    findHighlightElement();
-
-                    // if a custom event needs to be bound we do it now
-                    if (scope.model.currentStep.event) {
-                        bindEvent();
-                    }
-
-                    scope.loadingStep = false;
-
-                });
-            }
-
-            function findHighlightElement() {
-
-                scope.elementNotFound = false;
-
-                $timeout(function () {
-                    // clear element when step as marked as intro, so it always displays in the center
-                    if (scope.model.currentStep && scope.model.currentStep.type === "intro") {
-                        scope.model.currentStep.element = null;
-                        scope.model.currentStep.eventElement = null;
-                        scope.model.currentStep.event = null;
-                    }
-
-                    // if an element isn't set - show the popover in the center
-                    if (scope.model.currentStep && !scope.model.currentStep.element) {
-                        setPopoverPosition(null);
-                        return;
-                    }
-
-                    var element = $(scope.model.currentStep.element);
-
-                    // we couldn't find the element in the dom - abort and show error
-                    if (element.length === 0) {
-                        scope.elementNotFound = true;
-                        setPopoverPosition(null);
-                        return;
-                    }
-
-                    var scrollParent = element.scrollParent();
-                    var el = element;
-                    var offsetTop = 0;
-                    if (scrollParent[0] === document) {
-                        offsetTop = el[0].offsetTop;
-                    } else {
-                        while ($.contains(scrollParent[0], el[0])) {
-                            offsetTop += el[0].offsetTop;
-                            el = el.offsetParent();
-                        }
-                    }
-
-                    var scrollToCenterOfContainer = offsetTop - (scrollParent[0].clientHeight / 2);
-                    if (element[0].clientHeight < scrollParent[0].clientHeight) {
-                        scrollToCenterOfContainer += (element[0].clientHeight / 2);
-                    }
-
-                    // Detect if scroll is needed
-                    if (offsetTop > scrollParent[0].clientHeight - 200) {
-                        scrollParent.animate({
-                            scrollTop: scrollToCenterOfContainer
-                        }, function () {
-                            // Animation complete.
-                            setPopoverPosition(element);
-                            setPulsePosition();
-                            backdropService.setHighlight(scope.model.currentStep.element, scope.model.currentStep.elementPreventClick);
-                        });
-                    } else {
-                        setPopoverPosition(element);
-                        setPulsePosition();
-                        backdropService.setHighlight(scope.model.currentStep.element, scope.model.currentStep.elementPreventClick);
-                    }
-
-                });
-
-            }
-
-            function setPopoverPosition(element) {
-
-                $timeout(function () {
-
-                    var position = "center";
-                    var margin = 20;
-                    var css = {};
-
-                    var popoverWidth = popover.outerWidth();
-                    var popoverHeight = popover.outerHeight();
-                    var popoverOffset = popover.offset();
-                    var documentWidth = $(document).width();
-                    var documentHeight = $(document).height();
-
-                    if (element) {
-
-                        var offset = element.offset();
-                        var width = element.outerWidth();
-                        var height = element.outerHeight();
-
-                        // messure available space on each side of the target element
-                        var space = {
-                            "top": offset.top,
-                            "right": documentWidth - (offset.left + width),
-                            "bottom": documentHeight - (offset.top + height),
-                            "left": offset.left
-                        };
-
-                        // get the posistion with most available space
-                        position = findMax(space);
-
-                        if (position === "top") {
-                            if (offset.left < documentWidth / 2) {
-                                css.top = offset.top - popoverHeight - margin;
-                                css.left = offset.left;
-                            } else {
-                                css.top = offset.top - popoverHeight - margin;
-                                css.left = offset.left - popoverWidth + width;
-                            }
-                        }
-
-                        if (position === "right") {
-                            if (offset.top + popoverHeight < documentHeight) {
-                                css.top = offset.top;
-                                css.left = offset.left + width + margin;
-                            } else {
-                                css.top = offset.top + height - popoverHeight;
-                                css.left = offset.left + width + margin;
-                            }
-                        }
-
-                        if (position === "bottom") {
-                            if (offset.left < documentWidth / 2) {
-                                css.top = offset.top + height + margin;
-                                css.left = offset.left;
-                            } else {
-                                css.top = offset.top + height + margin;
-                                css.left = offset.left - popoverWidth + width;
-                            }
-                        }
-
-                        if (position === "left") {
-                            if (offset.top + popoverHeight < documentHeight) {
-                                css.top = offset.top;
-                                css.left = offset.left - popoverWidth - margin;
-                            } else {
-                                css.top = offset.top + height - popoverHeight;
-                                css.left = offset.left - popoverWidth - margin;
-                            }
-                        }
-
-                    } else {
-                        // if there is no dom element center the popover
-                        css.top = "calc(50% - " + popoverHeight / 2 + "px)";
-                        css.left = "calc(50% - " + popoverWidth / 2 + "px)";
-                    }
-
-                    popover.css(css).fadeIn("fast");
-
-                });
-
-
-            }
-
-            function setPulsePosition() {
-                if (scope.model.currentStep.event) {
-
-                    pulseTimer = $timeout(function () {
-
-                        var clickElementSelector = scope.model.currentStep.eventElement ? scope.model.currentStep.eventElement : scope.model.currentStep.element;
-                        var clickElement = $(clickElementSelector);
-
-                        var offset = clickElement.offset();
-                        var width = clickElement.outerWidth();
-                        var height = clickElement.outerHeight();
-
-                        pulseElement.css({ "width": width, "height": height, "left": offset.left, "top": offset.top });
-                        pulseElement.fadeIn();
-
-                    }, 1000);
-                }
-            }
-
-            function waitForPendingRerequests() {
-                var deferred = $q.defer();
-                var timer = window.setInterval(function () {
-
-                    var requestsReady = false;
-                    var animationsDone = false;
-
-                    // check for pending requests both in angular and on the document
-                    if ($http.pendingRequests.length === 0 && document.readyState === "complete") {
-                        requestsReady = true;
-                    }
-
-                    // check for animations. ng-enter and ng-leave are default angular animations. 
-                    // Also check for infinite editors animating
-                    if (document.querySelectorAll(".ng-enter, .ng-leave, .umb-editor--animating").length === 0) {
-                        animationsDone = true;
-                    }
-
-                    if (requestsReady && animationsDone) {
-                        $timeout(function () {
-                            deferred.resolve();
-                            clearInterval(timer);
-                        });
-                    }
-
-                }, 50);
-                return deferred.promise;
-            }
-
-            function findMax(obj) {
-                var keys = Object.keys(obj);
-                var max = keys[0];
-                for (var i = 1, n = keys.length; i < n; ++i) {
-                    var k = keys[i];
-                    if (obj[k] > obj[max]) {
-                        max = k;
-                    }
-                }
-                return max;
-            }
-
-            function bindEvent() {
-
-                var bindToElement = scope.model.currentStep.element;
-                var eventName = scope.model.currentStep.event + ".step-" + scope.model.currentStepIndex;
-                var removeEventName = "remove.step-" + scope.model.currentStepIndex;
-                var handled = false;
-
-                if (scope.model.currentStep.eventElement) {
-                    bindToElement = scope.model.currentStep.eventElement;
-                }
-
-                $(bindToElement).on(eventName, function () {
-                    if (!handled) {
-                        unbindEvent();
-                        nextStep();
-                        handled = true;
-                    }
-                });
-
-                // Hack: we do this to handle cases where ng-if is used and removes the element we need to click.
-                // for some reason it seems the elements gets removed before the event is raised. This is a temp solution which assumes:
-                // "if you ask me to click on an element, and it suddenly gets removed from the dom, let's go on to the next step".
-                $(bindToElement).on(removeEventName, function () {
-                    if (!handled) {
-                        unbindEvent();
-                        nextStep();
-                        handled = true;
-                    }
-                });
-
-            }
-
-            function unbindEvent() {
-                var eventName = scope.model.currentStep.event + ".step-" + scope.model.currentStepIndex;
-                var removeEventName = "remove.step-" + scope.model.currentStepIndex;
-
-                if (scope.model.currentStep.eventElement) {
-                    $(scope.model.currentStep.eventElement).off(eventName);
-                    $(scope.model.currentStep.eventElement).off(removeEventName);
-                } else {
-                    $(scope.model.currentStep.element).off(eventName);
-                    $(scope.model.currentStep.element).off(removeEventName);
-                }
-            }
-
-            function resize() {
-                findHighlightElement();
-            }
-
-            onInit();
-
-            $(window).on('resize.umbTour', resize);
-
-            scope.$on('$destroy', function () {
-                $(window).off('resize.umbTour');
-                unbindEvent();
-                $timeout.cancel(pulseTimer);
-            });
-
-        }
-
-        var directive = {
-            transclude: true,
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/application/umb-tour.html',
-            link: link,
-            scope: {
-                model: "="
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbTour', TourDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js
deleted file mode 100644
index 381ecc76c3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbTourStep
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco 7.8</b>. The tour step component is a component that can be used in custom views for tour steps.
-
-@param {callback} onClose The callback which should be performened when the close button of the tour step is clicked
-@param {boolean=} hideClose A boolean indicating if the close button needs to be shown
-
-**/
-(function () {
-    'use strict';
-
-    function TourStepDirective() {
-
-        function link(scope, element, attrs, ctrl) {
-
-            scope.close = function () {
-                if (scope.onClose) {
-                   scope.onClose();
-                }
-            }
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/application/umbtour/umb-tour-step.html',
-            scope: {
-                size: "@?",
-                onClose: "&?",
-                hideClose: "=?"
-            },
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbTourStep', TourStepDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcontent.directive.js
deleted file mode 100644
index 909f87eac5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcontent.directive.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbTourStepContent
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco 7.8</b>. The tour step content component is a component that can be used in custom views for tour steps.
-It's meant to be used in the umb-tour-step directive.
-All markup in the body of the directive will be shown after the content attribute
-
-@param {string} content The content that needs to be shown
-**/
-(function () {
-    'use strict';
-
-    function TourStepContentDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/application/umbtour/umb-tour-step-content.html',
-            scope: {
-                content: "="
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbTourStepContent', TourStepContentDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcounter.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcounter.directive.js
deleted file mode 100644
index 2477953580..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcounter.directive.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbTourStepCounter
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco 7.8</b>. The tour step counter component is a component that can be used in custom views for tour steps.
-It's meant to be used in the umb-tour-step-footer directive. It will show the progress you have made in a tour eg. step 2/12
-
-
-@param {int} currentStep The current step the tour is on
-@param {int} totalSteps The current step the tour is on
-**/
-(function () {
-    'use strict';
-
-    function TourStepCounterDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/application/umbtour/umb-tour-step-counter.html',
-            scope: {
-                currentStep: "=",
-                totalSteps: "="
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbTourStepCounter', TourStepCounterDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepfooter.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepfooter.directive.js
deleted file mode 100644
index 7cfb498394..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepfooter.directive.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbTourStepFooter
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco 7.8</b>. The tour step footer component is a component that can be used in custom views for tour steps. It's meant to be used in the umb-tour-step directive.
-All markup in the body of the directive will be shown as the footer of the tour step
-
-
-**/
-(function () {
-    'use strict';
-
-    function TourStepFooterDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/application/umbtour/umb-tour-step-footer.html'
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbTourStepFooter', TourStepFooterDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepheader.directive.js
deleted file mode 100644
index ec6768928f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepheader.directive.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbTourStepHeader
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco 7.8</b>. The tour step header component is a component that can be used in custom views for tour steps. It's meant to be used in the umb-tour-step directive.
-
-
-@param {string} title The title that needs to be shown
-**/
-(function () {
-    'use strict';
-
-    function TourStepHeaderDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/application/umbtour/umb-tour-step-header.html',
-            scope: {
-                title: "="
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbTourStepHeader', TourStepHeaderDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
deleted file mode 100644
index d1be694fde..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
+++ /dev/null
@@ -1,234 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbButton
-@restrict E
-@scope
-
-@description
-Use this directive to render an umbraco button. The directive can be used to generate all types of buttons, set type, style, translation, shortcut and much more.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-button
-            action="vm.clickButton()"
-            type="button"
-            button-style="action"
-            state="vm.buttonState"
-            shortcut="ctrl+c"
-            label="My button"
-            disabled="vm.buttonState === 'busy'">
-        </umb-button>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller(myService) {
-
-            var vm = this;
-            vm.buttonState = "init";
-
-            vm.clickButton = clickButton;
-
-            function clickButton() {
-
-                vm.buttonState = "busy";
-
-                myService.clickButton().then(function() {
-                    vm.buttonState = "success";
-                }, function() {
-                    vm.buttonState = "error";
-                });
-
-            }
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-
-    })();
-</pre>
-
-@param {callback} action The button action which should be performed when the button is clicked.
-@param {string=} href Url/Path to navigato to. (requires "type" to be set to "link")
-@param {string=} type Set the button type ("button", "link", "submit").
-@param {string=} buttonStyle Set the style of the button. The directive uses the default bootstrap styles ("primary", "info", "success", "warning", "danger", "inverse", "link", "block"). Pass in array to add multple styles [success,block].
-@param {string=} state Set a progress state on the button ("init", "busy", "success", "error").
-@param {string=} shortcut Set a keyboard shortcut for the button ("ctrl+c").
-@param {string=} label Set the button label.
-@param {string=} labelKey Set a localization key to make a multi-lingual button ("general_buttonText").
-@param {string=} icon Set a button icon.
-@param {string=} size Set a button size ("xs", "m", "l", "xl").
-@param {boolean=} disabled Set to <code>true</code> to disable the button.
-@param {boolean=} addEllipsis Adds an ellipsis character (…) to the button label which means the button will open a dialog or prompt the user for more information.
-@param {boolean=} showCaret Shows a caret on the right side of the button label
-@param {boolean=} autoFocus add autoFocus to the button
-@param {boolean=} hasPopup Used to expose to the accessibility API whether the button will trigger a popup or not
-@param {boolean=} isExpanded Used to add an aria-expanded attribute and expose whether the button controls collapsible content
-
-**/
-
-(function () {
-    'use strict';
-
-    angular
-        .module('umbraco.directives')
-        .component('umbButton', {
-            transclude: true,
-            templateUrl: 'views/components/buttons/umb-button.html',
-            controller: UmbButtonController,
-            controllerAs: 'vm',
-            bindings: {
-                action: "&?",
-                href: "@?",
-                hrefTarget: "@?",
-                type: "@",
-                buttonStyle: "@?",
-                state: "<?",
-                shortcut: "@?",
-                shortcutWhenHidden: "@",
-                label: "@?",
-                labelKey: "@?",
-                icon: "@?",
-                disabled: "<?",
-                size: "@?",
-                alias: "@?",
-                addEllipsis: "@?",
-                showCaret: "@?",
-                autoFocus: "<?",
-                hasPopup: "@?",
-                isExpanded: "<?"
-            }
-        });
-
-    // TODO: This doesn't seem necessary?
-    UmbButtonController.$inject = ['$timeout', 'localizationService'];
-
-    function UmbButtonController($timeout, localizationService) {
-
-        var vm = this;
-
-        vm.$onInit = onInit;
-        vm.$onChanges = onChanges;
-        vm.clickButton = clickButton;
-
-        function onInit() {
-
-            vm.blockElement = false;
-            vm.style = null;
-            vm.innerState = "init";
-            vm.generalActions = vm.labelKey === "general_actions";
-
-            if (!vm.type) {
-                vm.type = "button"; // set the default
-            }
-
-            vm.buttonLabel = vm.label;
-            // is this a primary button style (i.e. anything but an 'info' button)?
-            vm.isPrimaryButtonStyle = vm.buttonStyle && vm.buttonStyle !== 'info';
-
-            if (vm.buttonStyle) {
-
-                // make it possible to pass in multiple styles
-                if (vm.buttonStyle.startsWith("[") && vm.buttonStyle.endsWith("]")) {
-
-                    // when using an attr it will always be a string so we need to remove square brackets
-                    // and turn it into and array
-                    var withoutBrackets = vm.buttonStyle.replace(/[\[\]']+/g,'');
-                    // split array by , + make sure to catch whitespaces
-                    var array = withoutBrackets.split(/\s?,\s?/g);
-
-                    Utilities.forEach(array, item => {
-                        vm.style = vm.style + " " + "btn-" + item;
-                        if (item === "block") {
-                            vm.blockElement = true;
-                        }
-                    });
-
-                } else {
-                    vm.style = "btn-" + vm.buttonStyle;
-                    if (vm.buttonStyle === "block") {
-                        vm.blockElement = true;
-                    }
-                }
-
-            }
-
-            setButtonLabel();
-
-        }
-
-        function onChanges(changes) {
-
-            // watch for state changes
-            if (changes.state) {
-                if (changes.state.currentValue) {
-                    vm.innerState = changes.state.currentValue;
-                }
-                if (changes.state.currentValue === 'success' || changes.state.currentValue === 'error') {
-                    // set the state back to 'init' after a success or error
-                    $timeout(function () {
-                        vm.innerState = 'init';
-                    }, 2000);
-                }
-            }
-
-            // watch for disabled changes
-            if (changes.disabled) {
-                if (changes.disabled.currentValue) {
-                    vm.disabled = changes.disabled.currentValue;
-                }
-            }
-
-            // watch for label changes
-            if (changes.label && changes.label.currentValue) {
-                vm.buttonLabel = changes.label.currentValue;
-                setButtonLabel();
-            }
-
-            // watch for label key changes
-            if (changes.labelKey && changes.labelKey.currentValue) {
-                setButtonLabel();
-            }
-
-            // watch for type changes
-            if (changes.type) {
-                if (!vm.type) {
-                    vm.type = "button";// set the default
-                }
-            }
-
-        }
-
-        function clickButton(event) {
-            if (vm.action) {
-                vm.action({$event: event});
-            }
-        }
-
-        function setButtonLabel() {
-            // if the button opens a dialog add "..." to the label
-            if (vm.addEllipsis === "true") {
-                vm.buttonLabel = vm.buttonLabel + "...";
-            }
-
-            // look up localization key
-            if (vm.labelKey) {
-                localizationService.localize(vm.labelKey).then(value => {
-                    vm.buttonLabel = value;
-                    // if the button opens a dialog add "..." to the label
-                    if (vm.addEllipsis === "true") {
-                        vm.buttonLabel = vm.buttonLabel + "...";
-                    }
-                });
-            }
-        }
-
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttonellipsis.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttonellipsis.directive.js
deleted file mode 100644
index c24c6e82d2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttonellipsis.directive.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbButtonEllipsis
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco version 8.7.0</b> Use this directive to render an umbraco ellipsis.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-button-ellipsis
-            text="{{text}}"
-            labelKey="{{labelKey}}"
-            action="{{vm.open()}}"
-            >
-        </umb-button-ellipsis>
-
-    </div>
-</pre>
-
-@param {callback} action Callback when the value of the checkbox changes through interaction.
-@param {string} text Set the text for the checkbox label.
-@param {string=} labelKey Set a dictionary/localization string for the checkbox label
-@param {string=} cssClass Set a css class modifier
-@param {string=} color Set a hex code e.g. <code>#f5c1bc</code>. <code>#000000</code> by default
-@param {boolean=} showText Set to <code>true</code> to show the text. <code>false</code> by default
-@param {string=} element Highlights a DOM-element (HTML selector) e.g. "my-div-name"
-@param {string=} state Set the initial state of the component. To have it hidden use <code>hidden</code>
-@param {string=} mode Set the mode, which decides how to style the component. "small" and "tab" are currently supported
-**/
-
-(function () {
-    'use strict';
-
-    function UmbButtonEllipsis($timeout, localizationService) {
-
-        var vm = this;
-
-        vm.$onInit = onInit;
-        vm.clickButton = clickButton;
-
-        function onInit() {
-            setText();
-            setColor();
-        }
-
-        function clickButton(event) {
-            if(vm.action) {
-                vm.action({$event: event});
-            }
-        }
-
-        function setText() {
-            if (vm.labelKey) {
-                localizationService.localize(vm.labelKey).then(function (data) {
-                    // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
-                     if(data.indexOf('[') === -1){
-                       vm.text = data;
-                     }
-                });
-           }
-        }
-
-        function setColor() {
-            vm.color = vm.color ? vm.color : '#000000';
-        }
-    }
-
-    var component = {
-        templateUrl: 'views/components/buttons/umb-button-ellipsis.html',
-        controller: UmbButtonEllipsis,
-        controllerAs: 'vm',
-        transclude: true,
-        bindings: {
-            text: "@",
-            labelKey: "@?",
-            action: "&",
-            cssClass: "@?",
-            color: "@?",
-            showText: "<?",
-            element: "@?",
-            state: "@?",
-            mode: "@?"
-        }
-    };
-
-    angular.module('umbraco.directives').component('umbButtonEllipsis', component);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js
deleted file mode 100644
index d9c18fac01..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbButtonGroup
-@restrict E
-@scope
-
-@description
-Use this directive to render a button with a dropdown of alternative actions.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-button-group
-           ng-if="vm.buttonGroup"
-           default-button="vm.buttonGroup.defaultButton"
-           sub-buttons="vm.buttonGroup.subButtons"
-           direction="down"
-           float="right">
-        </umb-button-group>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-
-            vm.buttonGroup = {
-                defaultButton: {
-                    labelKey: "general_defaultButton",
-                    hotKey: "ctrl+d",
-                    hotKeyWhenHidden: true,
-                    handler: function() {
-                        // do magic here
-                    }
-                },
-                subButtons: [
-                    {
-                        labelKey: "general_subButton",
-                        hotKey: "ctrl+b",
-                        hotKeyWhenHidden: true,
-                        handler: function() {
-                            // do magic here
-                        }
-                    }
-                ]
-            };
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-
-    })();
-</pre>
-
-<h3>Button model description</h3>
-<ul>
-    <li>
-        <strong>labekKey</strong>
-        <small>(string)</small> -
-        Set a localization key to make a multi lingual button ("general_buttonText").
-    </li>
-    <li>
-        <strong>hotKey</strong>
-        <small>(array)</small> -
-        Set a keyboard shortcut for the button ("ctrl+c").
-    </li>
-    <li>
-        <strong>hotKeyWhenHidden</strong>
-        <small>(boolean)</small> -
-        As a default the hotkeys only works on elements visible in the UI. Set to <code>true</code> to set a hotkey on the hidden sub buttons.
-    </li>
-    <li>
-        <strong>handler</strong>
-        <small>(callback)</small> -
-        Set a callback to handle button click events.
-    </li>
-</ul>
-
-@param {object} defaultButton The model of the default button.
-@param {array} subButtons Array of sub buttons.
-@param {string=} state Set a progress state on the button ("init", "busy", "success", "error").
-@param {string=} direction Set the direction of the dropdown ("up", "down").
-@param {string=} float Set the float of the dropdown. ("left", "right").
-**/
-(function () {
-  'use strict';
-
-  function ButtonGroupDirective() {
-
-    function controller($scope) {
-      $scope.toggleStyle = null;
-      $scope.blockElement = false;
-
-      var buttonStyle = $scope.buttonStyle;
-      if (buttonStyle) {
-        // Make it possible to pass in multiple styles
-        if (buttonStyle.startsWith("[") && buttonStyle.endsWith("]")) {
-          // when using an attr it will always be a string so we need to remove square brackets and turn it into and array
-          var withoutBrackets = buttonStyle.replace(/[\[\]']+/g, '');
-          // split array by , + make sure to catch whitespaces
-          var array = withoutBrackets.split(/\s?,\s?/g);
-
-          Utilities.forEach(array, item => {
-            if (item === "block") {
-              $scope.blockElement = true;
-            } else {
-              $scope.toggleStyle = ($scope.toggleStyle ? $scope.toggleStyle + " " : "") + "btn-" + item;
-            }
-          });
-        } else {
-          if (buttonStyle === "block") {
-            $scope.blockElement = true;
-          } else {
-            $scope.toggleStyle = "btn-" + buttonStyle;
-          }
-        }
-      }
-    }
-
-    function link(scope) {
-      scope.dropdown = {
-        isOpen: false
-      };
-
-      scope.toggleDropdown = function () {
-        scope.dropdown.isOpen = !scope.dropdown.isOpen;
-      };
-
-      scope.closeDropdown = function () {
-        scope.dropdown.isOpen = false;
-      };
-
-      scope.executeMenuItem = function (subButton) {
-        subButton.handler();
-        scope.closeDropdown();
-      };
-    }
-
-    var directive = {
-      restrict: 'E',
-      replace: true,
-      templateUrl: 'views/components/buttons/umb-button-group.html',
-      controller: controller,
-      scope: {
-        defaultButton: "=",
-        subButtons: "=",
-        state: "=?",
-        direction: "@?",
-        float: "@?",
-        buttonStyle: "@?",
-        size: "@?",
-        icon: "@?",
-        label: "@?",
-        labelKey: "@?",
-        disabled: "<?"
-      },
-      link: link
-    };
-
-    return directive;
-  }
-
-  angular.module('umbraco.directives').directive('umbButtonGroup', ButtonGroupDirective);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
deleted file mode 100644
index 7a5eb9fc29..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbToggle
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco version 7.7.0</b> Use this directive to render an umbraco toggle.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-toggle
-            checked="vm.checked"
-            on-click="vm.toggle()">
-        </umb-toggle>
-
-        <umb-toggle
-            checked="vm.checked"
-            disabled="vm.disabled"
-            on-click="vm.toggle()"
-            show-labels="true"
-            label-on="Start"
-            label-off="Stop"
-            label-position="right"
-            hide-icons="true">
-        </umb-toggle>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-            vm.checked = false;
-            vm.disabled = false;
-
-            vm.toggle = toggle;
-
-            function toggle() {
-                vm.checked = !vm.checked;
-            }
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-
-    })();
-</pre>
-
-@param {boolean} checked Set to <code>true</code> or <code>false</code> to toggle the switch.
-@param {string} inputId Set the <code>id</code> of the toggle.
-@param {callback} onClick The function which should be called when the toggle is clicked.
-@param {string=} showLabels Set to <code>true</code> or <code>false</code> to show a "On" or "Off" label next to the switch.
-@param {string=} labelOn Set a custom label for when the switched is turned on. It will default to "On".
-@param {string=} labelOff Set a custom label for when the switched is turned off. It will default to "Off".
-@param {string=} labelPosition Sets the label position to the left or right of the switch. It will default to "left" ("left", "right").
-@param {string=} hideIcons Set to <code>true</code> or <code>false</code> to hide the icons on the switch.
-
-**/
-
-(function () {
-    'use strict';
-
-    function ToggleDirective(localizationService, eventsService, $timeout) {
-
-        function link(scope, el, attrs, ctrl) {
-
-            scope.displayLabelOn = "";
-            scope.displayLabelOff = "";
-
-            function onInit() {
-                scope.inputId = scope.inputId || "umb-toggle_" + String.CreateGuid();
-
-                setLabelText();
-
-                // Must wait until the current digest cycle is finished before we emit this event on init, 
-                // otherwise other property editors might not yet be ready to receive the event
-                $timeout(function () {
-                    eventsService.emit("toggleValue", { value: scope.checked, inputId: scope.inputId });
-                }, 100);
-            }
-
-            function setLabelText() {
-                
-                if (scope.labelOn) {
-                    scope.displayLabelOn = scope.labelOn;
-                }
-                
-                if (scope.labelOff) {
-                    scope.displayLabelOff = scope.labelOff;
-                }
-
-                if (scope.displayLabelOn.length === 0 && scope.displayLabelOff.length === 0)
-                {
-                    var labelKeys = [
-                        "general_on",
-                        "general_off"
-                    ];
-
-                    localizationService.localizeMany(labelKeys).then(function (data) {
-                        // Set default label for "On"
-                        scope.displayLabelOn = data[0];
-
-                        // Set default label for "Off"
-                        scope.displayLabelOff = data[1];
-                    });
-                }
-
-            }
-
-            scope.click = function($event) {
-                if (scope.readonly) {
-                    $event.preventDefault();
-                    $event.stopPropagation();
-                    return;
-                }
-
-                if (scope.onClick) {
-                    eventsService.emit("toggleValue", { value: !scope.checked, inputId: scope.inputId });
-                    scope.onClick();
-                }
-            };
-
-            attrs.$observe('readonly', (value) => {
-                scope.readonly = value !== undefined;
-            });
-
-            onInit();
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/buttons/umb-toggle.html',
-            scope: {
-                // TODO: This should have required ngModel so we can track and validate user input correctly
-                // https://docs.angularjs.org/api/ng/type/ngModel.NgModelController#custom-control-example
-                checked: "=",
-                disabled: "=",
-                inputId: "@",
-                onClick: "&",
-                labelOn: "@?",
-                labelOff: "@?",
-                labelPosition: "@?",
-                showLabels: "@?",
-                hideIcons: "@?"
-            },
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbToggle', ToggleDirective);
-
-})();
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtogglegroup.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtogglegroup.directive.js
deleted file mode 100644
index 7e9bbe942f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtogglegroup.directive.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbToggleGroup
-@restrict E
-@scope
-
-@description
-Use this directive to render a group of toggle buttons.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-toggle-group
-            items="vm.items"
-            on-click="vm.toggle(item)">
-        </umb-toggle-group>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-            vm.toggle = toggle;
-
-            function toggle(item) {
-                if(item.checked) {
-                    // do something if item is checked
-                }
-                else {
-                    // do something else if item is unchecked
-                }
-            }
-
-            function init() {
-                vm.items = [{
-                    name: "Item 1",
-                    description: "Item 1 description",
-                    checked: false,
-                    disabled: false
-                }, {
-                    name: "Item 2",
-                    description: "Item 2 description",
-                    checked: true,
-                    disabled: true
-                }];
-            }
-
-            init();
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-
-    })();
-</pre>
-
-@param {Array} items The items to list in the toggle group
-@param {callback} onClick The function which should be called when the toggle is clicked for one of the items.
-
-**/
-
-(function () {
-    'use strict';
-
-    function ToggleGroupDirective() {
-
-        function link(scope, el, attr, ctrl) {
-            for(let i = 0; i < scope.items.length; i++) {
-                scope.items[i].inputId = "umb-toggle-group-item_" + String.CreateGuid();
-                scope.items[i].labelId = "umb-toggle-group-item_" + String.CreateGuid();
-            }
-            scope.change = function(item) {
-                if (item.disabled) {
-                    return;
-                }
-
-                item.checked = !item.checked;
-                if(scope.onClick) {
-                    scope.onClick({'item': item});
-                }
-            };
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/buttons/umb-toggle-group.html',
-            scope: {
-                items: "=",
-                onClick: "&"
-            },
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbToggleGroup', ToggleGroupDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
deleted file mode 100644
index 1e455aea5f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ /dev/null
@@ -1,1165 +0,0 @@
-(function () {
-    'use strict';
-
-    function ContentEditController($rootScope, $scope, $routeParams, $q, $window,
-        appState, contentResource, entityResource, navigationService, notificationsService, contentAppHelper,
-        serverValidationManager, contentEditingHelper, localizationService, formHelper, umbRequestHelper,
-        editorState, $http, eventsService, overlayService, $location, localStorageService, treeService,
-        $exceptionHandler, uploadTracker) {        
-
-        var evts = [];
-        var infiniteMode = $scope.infiniteModel && $scope.infiniteModel.infiniteMode;
-        var watchingCulture = false;
-
-        //setup scope vars
-        $scope.defaultButton = null;
-        $scope.subButtons = [];
-
-        $scope.page = {};
-        $scope.page.loading = false;
-        $scope.page.menu = {};
-        $scope.page.menu.currentNode = null;
-        $scope.page.menu.currentSection = appState.getSectionState("currentSection");
-        $scope.page.listViewPath = null;
-        $scope.page.isNew = $scope.isNew ? true : false;
-
-        if (infiniteMode) {
-            $scope.page.allowInfinitePublishAndClose = $scope.infiniteModel.allowPublishAndClose;
-            $scope.page.allowInfiniteSaveAndClose = $scope.infiniteModel.allowSaveAndClose;
-        }
-
-        $scope.page.buttonGroupState = "init";
-        $scope.page.hideActionsMenu = infiniteMode ? true : false;
-        $scope.page.hideChangeVariant = false;
-        $scope.allowOpen = true;
-        $scope.activeApp = null;
-
-        //initializes any watches
-        var watchers = [];
-
-        function startWatches(content) {
-            clearWatchers();
-
-            watchers.push($scope.$watchGroup(['culture', 'segment'],
-            function (value, oldValue) {
-                createPreviewButton($scope.content, value[0], value[1]);
-            }));
-
-            //watch for changes to isNew, set the page.isNew accordingly and load the breadcrumb if we can
-            watchers.push($scope.$watch('isNew', function (newVal, oldVal) {
-
-                $scope.page.isNew = Object.toBoolean(newVal);
-
-                //We fetch all ancestors of the node to generate the footer breadcrumb navigation
-                if (content.parentId && content.parentId !== -1 && content.parentId !== -20) {
-                    loadBreadcrumb();
-                    if (!watchingCulture) {
-                        $scope.$watch('culture',
-                            function (value, oldValue) {
-                                if (value !== oldValue) {
-                                    loadBreadcrumb();
-                                }
-                            });
-                    }
-                }
-            }));
-        }
-
-        function clearWatchers () {
-            watchers.forEach(w => w());
-            watchers = [];
-        }
-
-        //this initializes the editor with the data which will be called more than once if the data is re-loaded
-        function init() {
-
-            var content = $scope.content;
-            if (content.id && content.isChildOfListView && content.trashed === false) {
-                $scope.page.listViewPath = "/content/content/edit/" + content.parentId
-                    + "?list=" + $routeParams.list
-                    + "&page=" + $routeParams.page
-                    + "&filter=" + $routeParams.filter
-                    + "&orderBy=" + $routeParams.orderBy
-                    + "&orderDirection=" + $routeParams.orderDirection;
-            }
-
-            // we need to check wether an app is present in the current data, if not we will present the default app.
-            var isAppPresent = false;
-
-            // on first init, we dont have any apps. but if we are re-initializing, we do, but ...
-            if ($scope.activeApp) {
-
-                _.forEach(content.apps, function (app) {
-                    if (app.alias === $scope.activeApp.alias) {
-                        isAppPresent = true;
-                        $scope.appChanged(app);
-                    }
-                });
-
-                if (isAppPresent === false) {
-                    // active app does not exist anymore.
-                    $scope.activeApp = null;
-                }
-            }
-
-            // if we still dont have a app, lets show the first one:
-            if ($scope.activeApp === null && content.apps.length) {
-                $scope.appChanged(content.apps[0]);
-            }
-            // otherwise make sure the save options are up to date with the current content state
-            else {
-                createButtons($scope.content);
-            }
-
-            editorState.set(content);
-
-            bindEvents();
-
-            resetVariantFlags();
-            startWatches($scope.content);
-        }
-
-        function loadBreadcrumb() {
-            // load the parent breadcrumb when creating new content
-            var id = $scope.page.isNew ? $scope.content.parentId : $scope.content.id;
-            if (!id) {
-                return;
-            }
-            entityResource.getAncestors(id, "document", $scope.culture)
-                .then(function (anc) {
-                    $scope.ancestors = anc;
-                });
-        }
-
-        /**
-         * This will reset isDirty flags if save is true.
-         * When working with multiple variants, this will set the save/publish flags of each one to false.
-         * When working with a single variant, this will set the publish flag to false and the save flag to true.
-         */
-        function resetVariantFlags() {
-            if ($scope.content.variants.length > 1) {
-                for (var i = 0; i < $scope.content.variants.length; i++) {
-                    var v = $scope.content.variants[i];
-                    if (v.save) {
-                        v.isDirty = false;
-                    }
-                    v.save = false;
-                    v.publish = false;
-                }
-            }
-            else {
-                if ($scope.content.variants[0].save) {
-                    $scope.content.variants[0].isDirty = false;
-                }
-                $scope.content.variants[0].save = true;
-                $scope.content.variants[0].publish = false;
-            }
-        }
-
-        /** Returns true if the content item varies by culture */
-        function hasVariants(content) {
-            return content.variants.length > 1;
-        }
-
-        function reload() {
-            $scope.page.loading = true;
-
-            if ($scope.page.isNew) {
-                loadScaffold().then(function () {
-                    $scope.page.loading = false;
-                });
-            } else {
-                loadContent().then(function () {
-                    $scope.page.loading = false;
-                });
-            }
-        }
-
-        function bindEvents() {
-            //bindEvents can be called more than once and we don't want to have multiple bound events
-            for (var e in evts) {
-                eventsService.unsubscribe(evts[e]);
-            }
-
-            evts.push(eventsService.on("editors.documentType.saved", function (name, args) {
-                // if this content item uses the updated doc type we need to reload the content item
-                if (args && args.documentType && $scope.content.documentType.id === args.documentType.id) {
-                    reload();
-                }
-            }));
-
-            evts.push(eventsService.on("editors.content.reload", function (name, args) {
-                if (args && args.node && $scope.content.id === args.node.id) {
-                    reload();
-                    loadBreadcrumb();
-                    syncTreeNode($scope.content, $scope.content.path);
-                }
-            }));
-
-            evts.push(eventsService.on("uploadTracker.uploadsInProgressChanged", function (name, args) {
-                $scope.page.uploadsInProgress = args.uploadsInProgress.filter(x => x.entityKey === $scope.content.key).length > 0;
-            }));
-
-            evts.push(eventsService.on("rte.file.uploading", function () {
-                $scope.page.saveButtonState = "busy";
-                $scope.page.buttonGroupState = "busy";
-
-            }));
-
-            evts.push(eventsService.on("rte.file.uploaded", function () {
-                $scope.page.saveButtonState = "success";
-                $scope.page.buttonGroupState = "success";
-            }));
-
-            evts.push(eventsService.on("rte.shortcut.save", function () {
-                if ($scope.page.showSaveButton) {
-                    $scope.save();
-                }
-            }));
-
-            evts.push(eventsService.on("rte.shortcut.saveAndPublish", function () {
-                $scope.saveAndPublish();
-            }));
-
-            evts.push(eventsService.on("content.saved", function () {
-                // Clear out localstorage keys that start with tinymce__
-                // When we save/perist a content node
-                // NOTE: clearAll supports a RegEx pattern of items to remove
-                localStorageService.clearAll(/^tinymce__/);
-            }));
-        }
-
-        function appendRuntimeData() {
-            $scope.content.variants.forEach((variant) => {
-                variant.compositeId = contentEditingHelper.buildCompositeVariantId(variant);
-                variant.htmlId = "_content_variant_" + variant.compositeId + "_";
-            });
-        }
-
-        /**
-         *  This does the content loading and initializes everything, called on first load
-         */
-        function loadContent() {
-
-            //we are editing so get the content item from the server
-            return $scope.getMethod()($scope.contentId)
-                .then(function (data) {
-
-                    $scope.content = data;
-
-                    appendRuntimeData();
-                    init();
-
-                    syncTreeNode($scope.content, $scope.content.path, true);
-
-                    resetLastListPageNumber($scope.content);
-
-                    eventsService.emit("content.loaded", { content: $scope.content });
-
-                    return $q.resolve($scope.content);
-                });
-        }
-
-        /**
-        *  This loads the content scaffold for when creating new content
-        */
-        function loadScaffold() {
-            //we are creating so get an empty content item
-            return $scope.getScaffoldMethod()()
-                .then(function (data) {
-
-                    $scope.content = data;
-
-                    appendRuntimeData();
-                    init();
-
-                    resetLastListPageNumber($scope.content);
-
-                    eventsService.emit("content.newReady", { content: $scope.content });
-
-                    return $q.resolve($scope.content);
-
-                });
-        }
-
-        /**
-         * Create the save/publish/preview buttons for the view
-         * @param {any} content the content node
-         * @param {any} app the active content app
-         */
-        function createButtons(content) {
-
-            var isBlueprint = content.isBlueprint;
-
-            if ($scope.page.isNew && $location.path().search(/contentBlueprints/i) !== -1) {
-               isBlueprint = true;
-            }
-
-            // for trashed and element type items, the save button is the primary action - otherwise it's a secondary action
-            $scope.page.saveButtonStyle = content.trashed || content.isElement || isBlueprint ? "primary" : "info";
-            // only create the save/publish/preview buttons if the
-            // content app is "Conent"
-
-            if ($scope.activeApp && !contentAppHelper.isContentBasedApp($scope.activeApp)) {
-                $scope.defaultButton = null;
-                $scope.subButtons = null;
-                $scope.page.showSaveButton = false;
-                $scope.page.showPreviewButton = false;
-                return;
-            }
-
-            // create the save button
-            if (_.contains($scope.content.allowedActions, "A")) {
-                $scope.page.showSaveButton = true;
-                // add ellipsis to the save button if it opens the variant overlay
-                $scope.page.saveButtonEllipsis = content.variants && content.variants.length > 1 ? "true" : "false";
-            } else {
-                $scope.page.showSaveButton = false;
-            }
-
-            // create the pubish combo button
-            $scope.page.buttonGroupState = "init";
-            var buttons = contentEditingHelper.configureContentEditorButtons({
-                create: $scope.page.isNew,
-                content: content,
-                methods: {
-                    saveAndPublish: $scope.saveAndPublish,
-                    sendToPublish: $scope.sendToPublish,
-                    unpublish: $scope.unpublish,
-                    schedulePublish: $scope.schedule,
-                    publishDescendants: $scope.publishDescendants
-                }
-            });
-
-            $scope.defaultButton = buttons.defaultButton;
-            $scope.subButtons = buttons.subButtons;
-        }
-
-        /**
-         * Create the preview buttons for the active variant
-         * @param {any} content the content node
-         * @param {string} culture the active culture
-         * @param {string} segment the active segment
-         */
-        function createPreviewButton (content, culture, segment) {
-
-            const compositeId = culture + '_' + segment;
-            const defaultPreviewUrl = `preview/?id=${content.id}${culture ? `&culture=${culture}` : ''}`;
-
-            $scope.previewDefaultButton = {
-                alias: 'preview',
-                handler: () => $scope.preview($scope.content, defaultPreviewUrl, 'umbpreview'),
-                labelKey: "buttons_saveAndPreview"
-            };
-
-            let activeVariant = content.variants?.find((variant) => content.documentType?.variations === "Nothing" || variant.compositeId === compositeId);
-            /* if we can't find the active variant and there is only one variant available, we will use that.
-            this happens if we have a node that can vary by culture but there is only one language available. */
-            activeVariant = !activeVariant && content.variants.length === 1 ? content.variants[0] : activeVariant;
-
-            $scope.previewSubButtons = activeVariant?.additionalPreviewUrls?.map((additionalPreviewUrl) => {
-                return {
-                    alias: 'preview_' + additionalPreviewUrl.name,
-                    label: additionalPreviewUrl.name,
-                    // We use target _blank here. If we open the window in the same tab with a 'umb_preview_name' target, we get a cors js error.
-                    handler: () => $scope.preview(content, additionalPreviewUrl.url, '_blank')
-                }
-            });
-
-            $scope.page.showPreviewButton = true;
-        }
-
-        /** Syncs the content item to it's tree node - this occurs on first load and after saving */
-        function syncTreeNode(content, path, initialLoad, reloadChildren) {
-
-            if (infiniteMode || !path) {
-                return;
-            }
-
-            if (!$scope.content.isChildOfListView) {
-                navigationService.syncTree({ tree: $scope.treeAlias, path: path.split(","), forceReload: initialLoad !== true })
-                    .then(function (syncArgs) {
-                        $scope.page.menu.currentNode = syncArgs.node;
-                        if (reloadChildren && syncArgs.node.expanded) {
-                            treeService.loadNodeChildren({ node: syncArgs.node });
-                        }
-                    }, function () {
-                        //handle the rejection
-                        console.log("A problem occurred syncing the tree! A path is probably incorrect.")
-                    });
-            }
-            else if (initialLoad === true) {
-
-                //it's a child item, just sync the ui node to the parent
-                navigationService.syncTree({ tree: $scope.treeAlias, path: path.substring(0, path.lastIndexOf(",")).split(","), forceReload: initialLoad !== true });
-
-                //if this is a child of a list view and it's the initial load of the editor, we need to get the tree node
-                // from the server so that we can load in the actions menu.
-                umbRequestHelper.resourcePromise(
-                    $http.get(content.treeNodeUrl),
-                    'Failed to retrieve data for child node ' + content.id).then(function (node) {
-                        $scope.page.menu.currentNode = node;
-                    });
-            }
-        }
-
-        function checkValidility() {
-            //Get all controls from the 'contentForm'
-            var allControls = $scope.contentForm.$getControls();
-
-            //An array to store items in when we find child form fields (no matter how many deep nested forms)
-            var childFieldsToMarkAsValid = [];
-
-            //Exclude known formControls 'contentHeaderForm' and 'tabbedContentForm'
-            //Check property - $name === "contentHeaderForm"
-            allControls = _.filter(allControls, function (obj) {
-                return obj.$name !== 'contentHeaderForm' && obj.$name !== 'tabbedContentForm' && obj.hasOwnProperty('$submitted');
-            });
-
-            for (var i = 0; i < allControls.length; i++) {
-                var nestedForm = allControls[i];
-
-                //Get Nested Controls of this form in the loop
-                var nestedFormControls = nestedForm.$getControls();
-
-                //Need to recurse through controls (could be more nested forms)
-                childFieldsToMarkAsValid = recurseFormControls(nestedFormControls, childFieldsToMarkAsValid);
-            }
-
-            return childFieldsToMarkAsValid;
-        }
-
-        //Controls is the
-        function recurseFormControls(controls, array) {
-
-            //Loop over the controls
-            for (var i = 0; i < controls.length; i++) {
-                var controlItem = controls[i];
-
-                //Check if the controlItem has a property ''
-                if (controlItem.hasOwnProperty('$submitted')) {
-                    //This item is a form - so lets get the child controls of it & recurse again
-                    var childFormControls = controlItem.$getControls();
-                    recurseFormControls(childFormControls, array);
-                }
-                else {
-                    //We can assume its a field on a form
-                    if (controlItem.hasOwnProperty('$error')) {
-                        //Set the validlity of the error/s to be valid
-                        //String of keys of error invalid messages
-                        var errorKeys = [];
-
-                        for (var key in controlItem.$error) {
-                            errorKeys.push(key);
-                            controlItem.$setValidity(key, true);
-                        }
-
-                        //Create a basic obj - storing the control item & the error keys
-                        var obj = { 'control': controlItem, 'errorKeys': errorKeys };
-
-                        //Push the updated control into the array - so we can set them back
-                        array.push(obj);
-                    }
-                }
-            }
-            return array;
-        }
-
-        function resetNestedFieldValiation(array) {
-            for (var i = 0; i < array.length; i++) {
-                var item = array[i];
-                //Item is an object containing two props
-                //'control' (obj) & 'errorKeys' (string array)
-                var fieldControl = item.control;
-                var fieldErrorKeys = item.errorKeys;
-
-                for (var j = 0; j < fieldErrorKeys.length; j++) {
-                    fieldControl.$setValidity(fieldErrorKeys[j], false);
-                }
-            }
-        }
-
-        function ensureDirtyIsSetIfAnyVariantIsDirty() {
-
-            $scope.contentForm.$dirty = false;
-
-            for (var i = 0; i < $scope.content.variants.length; i++) {
-                if ($scope.content.variants[i].isDirty) {
-                    $scope.contentForm.$dirty = true;
-                    return;
-                }
-            }
-        }
-
-        // This is a helper method to reduce the amount of code repitition for actions: Save, Publish, SendToPublish
-        function performSave(args) {
-            //Used to check validility of nested form - coming from Content Apps mostly
-            //Set them all to be invalid
-            var fieldsToRollback = checkValidility();
-            eventsService.emit("content.saving", { content: $scope.content, action: args.action });
-
-            return contentEditingHelper.contentEditorPerformSave({
-                saveMethod: args.saveMethod,
-                scope: $scope,
-                content: $scope.content,
-                create: $scope.page.isNew,
-                action: args.action,
-                showNotifications: args.showNotifications,
-                softRedirect: true,
-                skipValidation: args.skipValidation
-            }).then(function (data) {
-                //success
-                init();
-
-                //needs to be manually set for infinite editing mode
-                $scope.page.isNew = false;
-
-                syncTreeNode($scope.content, data.path, false, args.reloadChildren);
-
-                eventsService.emit("content.saved", { content: $scope.content, action: args.action, valid: true });
-
-                if($scope.contentForm.$invalid !== true) {
-                    resetNestedFieldValiation(fieldsToRollback);
-                }
-                ensureDirtyIsSetIfAnyVariantIsDirty();
-
-                return $q.when(data);
-            },
-                function (err) {
-                    syncTreeNode($scope.content, $scope.content.path);
-
-                    if($scope.contentForm.$invalid !== true) {
-                        resetNestedFieldValiation(fieldsToRollback);
-                    }
-                    if (err && err.status === 400 && err.data) {
-                        // content was saved but is invalid.
-                        eventsService.emit("content.saved", { content: $scope.content, action: args.action, valid: false });
-                    }
-
-                    return $q.reject(err);
-                });
-        }
-
-        function clearNotifications(content) {
-            if (content.notifications) {
-                content.notifications = [];
-            }
-            if (content.variants) {
-                for (var i = 0; i < content.variants.length; i++) {
-                    if (content.variants[i].notifications) {
-                        content.variants[i].notifications = [];
-                    }
-                }
-            }
-        }
-
-        function resetLastListPageNumber(content) {
-            // We're using rootScope to store the page number for list views, so if returning to the list
-            // we can restore the page.  If we've moved on to edit a piece of content that's not the list or it's children
-            // we should remove this so as not to confuse if navigating to a different list
-            if (!content.isChildOfListView && !content.isContainer) {
-                $rootScope.lastListViewPageViewed = null;
-            }
-        }
-
-        /**
-         * Used to clear the dirty state for successfully saved variants when not all variant saving was successful
-         * @param {any} variants
-         */
-        function clearDirtyState(variants) {
-            for (var i = 0; i < variants.length; i++) {
-                var v = variants[i];
-                if (v.notifications) {
-                    var isSuccess = _.find(v.notifications, function (n) {
-                        return n.type === 3; //this is a success notification
-                    });
-                    if (isSuccess) {
-                        v.isDirty = false;
-                    }
-                }
-            }
-        }
-
-        function handleHttpException(err) {
-            if (err && !err.status) {
-                $exceptionHandler(err);
-            }
-        }
-
-        /** Just shows a simple notification that there are client side validation issues to be fixed */
-        function showValidationNotification() {
-            //TODO: We need to make the validation UI much better, there's a lot of inconsistencies in v8 including colors, issues with the property groups and validation errors between variants
-
-            //need to show a notification else it's not clear there was an error.
-            localizationService.localizeMany([
-                "speechBubbles_validationFailedHeader",
-                "speechBubbles_validationFailedMessage"
-            ]
-            ).then(function (data) {
-                notificationsService.error(data[0], data[1]);
-            });
-        }
-
-        if ($scope.page.isNew) {
-
-            $scope.page.loading = true;
-
-            loadScaffold().then(function () {
-                $scope.page.loading = false;
-            });
-        }
-        else {
-
-            $scope.page.loading = true;
-
-            loadContent().then(function () {
-                $scope.page.loading = false;
-            });
-        }
-
-        $scope.unpublish = function () {
-            clearNotifications($scope.content);
-            if (formHelper.submitForm({ scope: $scope, action: "unpublish", skipValidation: true })) {
-                var dialog = {
-                    parentScope: $scope,
-                    view: "views/content/overlays/unpublish.html",
-                    variants: $scope.content.variants, //set a model property for the dialog
-                    skipFormValidation: true, //when submitting the overlay form, skip any client side validation
-                    includeUnpublished: false,
-                    submitButtonLabelKey: "content_unpublish",
-                    submitButtonStyle: "warning",
-                    submit: function (model) {
-
-                        model.submitButtonState = "busy";
-
-                        var selectedVariants = _.filter(model.variants, v => v.save && v.language); //ignore invariant
-                        var culturesForUnpublishing = _.map(selectedVariants, v => v.language.culture);
-
-                        contentResource.unpublish($scope.content.id, culturesForUnpublishing)
-                            .then(function (data) {
-                                formHelper.resetForm({ scope: $scope });
-                                contentEditingHelper.reBindChangedProperties($scope.content, data);
-                                init();
-                                syncTreeNode($scope.content, data.path);
-                                $scope.page.buttonGroupState = "success";
-                                eventsService.emit("content.unpublished", { content: $scope.content });
-                                overlayService.close();
-                            }, function (err) {
-                                formHelper.resetForm({ scope: $scope, hasErrors: true });
-                                $scope.page.buttonGroupState = 'error';
-                                handleHttpException(err);
-                            });
-                    },
-                    close: function () {
-                        overlayService.close();
-                    }
-                };
-
-                overlayService.open(dialog);
-            }
-        };
-
-        $scope.sendToPublish = function () {
-            clearNotifications($scope.content);
-            if (hasVariants($scope.content)) {
-                //before we launch the dialog we want to execute all client side validations first
-                if (formHelper.submitForm({ scope: $scope, action: "publish" })) {
-
-                    var dialog = {
-                        parentScope: $scope,
-                        view: "views/content/overlays/sendtopublish.html",
-                        variants: $scope.content.variants, //set a model property for the dialog
-                        skipFormValidation: true, //when submitting the overlay form, skip any client side validation
-                        submitButtonLabelKey: "buttons_saveToPublish",
-                        submit: function (model) {
-                            model.submitButtonState = "busy";
-                            clearNotifications($scope.content);
-                            //we need to return this promise so that the dialog can handle the result and wire up the validation response
-                            return performSave({
-                                saveMethod: contentResource.sendToPublish,
-                                action: "sendToPublish",
-                                showNotifications: false
-                            }).then(function (data) {
-                                //show all notifications manually here since we disabled showing them automatically in the save method
-                                formHelper.showNotifications(data);
-                                clearNotifications($scope.content);
-                                overlayService.close();
-                                return $q.when(data);
-                            },
-                            function (err) {
-                                clearDirtyState($scope.content.variants);
-                                model.submitButtonState = "error";
-                                //re-map the dialog model since we've re-bound the properties
-                                dialog.variants = $scope.content.variants;
-
-                                handleHttpException(err);
-                            });
-                        },
-                        close: function () {
-                            overlayService.close();
-                        }
-                    };
-
-                    overlayService.open(dialog);
-                }
-                else {
-                    showValidationNotification();
-                }
-            }
-            else {
-                $scope.page.buttonGroupState = "busy";
-                return performSave({
-                    saveMethod: contentResource.sendToPublish,
-                    action: "sendToPublish"
-                }).then(function () {
-                    $scope.page.buttonGroupState = "success";
-                }, function (err) {
-                    $scope.page.buttonGroupState = "error";
-                    handleHttpException(err);
-                });;
-            }
-        };
-
-        $scope.saveAndPublish = function (submitButtonLabelKey) {
-            var deferred = $q.defer();
-            clearNotifications($scope.content);
-            if (hasVariants($scope.content)) {
-                //before we launch the dialog we want to execute all client side validations first
-                if (formHelper.submitForm({ scope: $scope, action: "publish" })) {
-                    var dialog = {
-                        parentScope: $scope,
-                        view: "views/content/overlays/publish.html",
-                        variants: $scope.content.variants, //set a model property for the dialog
-                        skipFormValidation: true, //when submitting the overlay form, skip any client side validation
-                        submitButtonLabelKey: submitButtonLabelKey || "buttons_saveAndPublish",
-                        submit: function (model) {
-                            model.submitButtonState = "busy";
-                            clearNotifications($scope.content);
-                            //we need to return this promise so that the dialog can handle the result and wire up the validation response
-                            return performSave({
-                                saveMethod: contentResource.publish,
-                                action: "publish",
-                                showNotifications: false
-                            }).then(function (data) {
-                                //show all notifications manually here since we disabled showing them automatically in the save method
-                                formHelper.showNotifications(data);
-                                clearNotifications($scope.content);
-                                overlayService.close();
-                                deferred.resolve();
-                                return $q.when(data);
-                            }, function (err) {
-                                clearDirtyState($scope.content.variants);
-                                model.submitButtonState = "error";
-                                //re-map the dialog model since we've re-bound the properties
-                                dialog.variants = $scope.content.variants;
-
-                                //ensure error messages are displayed
-                                formHelper.showNotifications(err.data);
-                                clearNotifications($scope.content);
-                                
-                                handleHttpException(err);
-                                deferred.reject(err);
-                            });
-                        },
-                        close: function () {
-                            overlayService.close();
-                            deferred.reject();
-                        }
-                    };
-                    overlayService.open(dialog);
-                }
-                else {
-                    showValidationNotification();
-                    deferred.reject();
-                }
-            }
-            else {
-                //ensure the flags are set
-                $scope.content.variants[0].save = true;
-                $scope.content.variants[0].publish = true;
-                $scope.page.buttonGroupState = "busy";
-                return performSave({
-                    saveMethod: contentResource.publish,
-                    action: "publish"
-                }).then(function () {
-                    $scope.page.buttonGroupState = "success";
-                    deferred.resolve();
-                }, function (err) {
-                    $scope.page.buttonGroupState = "error";
-                    handleHttpException(err);
-                    deferred.reject(err);
-                });
-            }
-
-            return deferred.promise;
-        };
-
-        $scope.save = function (submitButtonLabelKey) {
-            var deferred = $q.defer();
-            clearNotifications($scope.content);
-            // TODO: Add "..." to save button label if there are more than one variant to publish - currently it just adds the elipses if there's more than 1 variant
-            if (hasVariants($scope.content)) {
-                var dialog = {
-                    parentScope: $scope,
-                    view: "views/content/overlays/save.html",
-                    variants: $scope.content.variants, //set a model property for the dialog
-                    skipFormValidation: true, //when submitting the overlay form, skip any client side validation
-                    submitButtonLabelKey: submitButtonLabelKey || "buttons_save",
-                    submit: function (model) {
-                        model.submitButtonState = "busy";
-                        clearNotifications($scope.content);
-                        //we need to return this promise so that the dialog can handle the result and wire up the validation response
-                        return performSave({
-                            saveMethod: $scope.saveMethod(),
-                            action: "save",
-                            showNotifications: false,
-                            skipValidation: true
-                        }).then(function (data) {
-                            //show all notifications manually here since we disabled showing them automatically in the save method
-                            formHelper.showNotifications(data);
-                            clearNotifications($scope.content);
-                            overlayService.close();
-                            deferred.resolve();
-                            return $q.when(data);
-                        }, function (err) {
-                            clearDirtyState($scope.content.variants);
-                            //model.submitButtonState = "error";
-                            // Because this is the "save"-action, then we actually save though there was a validation error, therefor we will show success and display the validation errors politely.
-                            if(err && err.data && err.data.ModelState && Object.keys(err.data.ModelState).length > 0) {
-                                model.submitButtonState = "success";
-                            } else {
-                                model.submitButtonState = "error";
-                                //re-map the dialog model since we've re-bound the properties
-                                dialog.variants = $scope.content.variants;
-
-                                //ensure error messages are displayed
-                                formHelper.showNotifications(err.data);
-                                clearNotifications($scope.content);
-
-                                handleHttpException(err);
-                            }
-                            deferred.reject();
-                        })
-                    },
-                    close: function (oldModel) {
-                        overlayService.close();
-                        deferred.reject();
-                    }
-                };
-
-                overlayService.open(dialog);
-            }
-            else {
-                //ensure the flags are set
-                $scope.content.variants[0].save = true;
-                $scope.page.saveButtonState = "busy";
-                return performSave({
-                    saveMethod: $scope.saveMethod(),
-                    action: "save",
-                    skipValidation: true
-                }).then(function () {
-                    $scope.page.saveButtonState = "success";
-                    deferred.resolve();
-                }, function (err) {
-                    // Because this is the "save"-action, then we actually save though there was a validation error, therefor we will show success and display the validation errors politely.
-                    if(err && err.data && err.data.ModelState && Object.keys(err.data.ModelState).length > 0) {
-                        $scope.page.saveButtonState = "success";
-                    } else {
-                        $scope.page.saveButtonState = "error";
-                    }
-                    handleHttpException(err);
-                    deferred.reject();
-                });
-            }
-
-            return deferred.promise;
-        };
-
-        $scope.schedule = function () {
-            clearNotifications($scope.content);
-            //before we launch the dialog we want to execute all client side validations first
-            if (formHelper.submitForm({ scope: $scope, action: "schedule" })) {
-                if (!hasVariants($scope.content)) {
-                    //ensure the flags are set
-                    $scope.content.variants[0].save = true;
-                }
-
-                var dialog = {
-                    parentScope: $scope,
-                    view: "views/content/overlays/schedule.html",
-                    variants: Utilities.copy($scope.content.variants), //set a model property for the dialog
-                    skipFormValidation: true, //when submitting the overlay form, skip any client side validation
-                    submitButtonLabelKey: "buttons_schedulePublish",
-                    submit: function (model) {
-                        for (let i = 0; i < $scope.content.variants.length; i++) {
-                            $scope.content.variants[i].releaseDate = model.variants[i].releaseDate;
-                            $scope.content.variants[i].expireDate = model.variants[i].expireDate;
-                            $scope.content.variants[i].releaseDateFormatted = model.variants[i].releaseDateFormatted;
-                            $scope.content.variants[i].expireDateFormatted = model.variants[i].expireDateFormatted;
-                            $scope.content.variants[i].save = model.variants[i].save;
-                        }
-
-                        model.submitButtonState = "busy";
-                        clearNotifications($scope.content);
-
-                        //we need to return this promise so that the dialog can handle the result and wire up the validation response
-                        return performSave({
-                            saveMethod: contentResource.saveSchedule,
-                            action: "schedule",
-                            showNotifications: false
-                        }).then(function (data) {
-                            //show all notifications manually here since we disabled showing them automatically in the save method
-                            formHelper.showNotifications(data);
-                            clearNotifications($scope.content);
-                            overlayService.close();
-                            return $q.when(data);
-                        }, function (err) {
-                            clearDirtyState($scope.content.variants);
-                            //if this is invariant, show the notification errors, else they'll be shown inline with the variant
-                            if (!hasVariants($scope.content)) {
-                                formHelper.showNotifications(err.data);
-                            }
-                            model.submitButtonState = "error";
-                            //re-map the dialog model since we've re-bound the properties
-                            dialog.variants = Utilities.copy($scope.content.variants);
-                            handleHttpException(err);
-                        });
-
-                    },
-                    close: function () {
-                        overlayService.close();
-                    }
-                };
-                overlayService.open(dialog);
-            }
-            else {
-                showValidationNotification();
-            }
-        };
-
-        $scope.publishDescendants = function () {
-            clearNotifications($scope.content);
-            //before we launch the dialog we want to execute all client side validations first
-            if (formHelper.submitForm({ scope: $scope, action: "publishDescendants" })) {
-
-                if (!hasVariants($scope.content)) {
-                    //ensure the flags are set
-                    $scope.content.variants[0].save = true;
-                    $scope.content.variants[0].publish = true;
-                }
-
-                var dialog = {
-                    parentScope: $scope,
-                    view: "views/content/overlays/publishdescendants.html",
-                    variants: $scope.content.variants, //set a model property for the dialog
-                    skipFormValidation: true, //when submitting the overlay form, skip any client side validation
-                    submitButtonLabelKey: "buttons_publishDescendants",
-                    submit: function (model) {
-                        model.submitButtonState = "busy";
-                        clearNotifications($scope.content);
-
-                        //we need to return this promise so that the dialog can handle the result and wire up the validation response
-                        return performSave({
-                            saveMethod: function (content, create, files, showNotifications) {
-                                return contentResource.publishWithDescendants(content, create, model.includeUnpublished, files, showNotifications);
-                            },
-                            action: "publishDescendants",
-                            showNotifications: false,
-                            reloadChildren: model.includeUnpublished
-                        }).then(function (data) {
-                            //show all notifications manually here since we disabled showing them automatically in the save method
-                            formHelper.showNotifications(data);
-                            clearNotifications($scope.content);
-                            overlayService.close();
-                            return $q.when(data);
-                        }, function (err) {
-                            clearDirtyState($scope.content.variants);
-                            //if this is invariant, show the notification errors, else they'll be shown inline with the variant
-                            if (!hasVariants($scope.content)) {
-                                formHelper.showNotifications(err.data);
-                            }
-                            model.submitButtonState = "error";
-                            //re-map the dialog model since we've re-bound the properties
-                            dialog.variants = $scope.content.variants;
-                            handleHttpException(err);
-                        });
-
-                    },
-                    close: function () {
-                        overlayService.close();
-                    }
-                };
-                overlayService.open(dialog);
-            }
-            else {
-                showValidationNotification();
-            }
-        };
-
-        $scope.preview = function (content, url, urlTarget) {
-
-            const openPreviewWindow = (url, target) => {
-                // Chromes popup blocker will kick in if a window is opened
-                // without the initial scoped request. This trick will fix that.
-              
-              const previewWindow = $window.open(url, target);
-
-              previewWindow.addEventListener('load', () => {
-                previewWindow.location.href = previewWindow.document.URL;
-              });
-
-            }
-
-            //The user cannot save if they don't have access to do that, in which case we just want to preview
-            //and that's it otherwise they'll get an unauthorized access message
-            if (!_.contains(content.allowedActions, "A")) {
-                openPreviewWindow(url, urlTarget);
-            }
-            else {
-                var selectedVariant = $scope.content.variants[0];
-                if ($scope.culture) {
-                    var found = _.find($scope.content.variants, function (v) {
-                        return (v.language && v.language.culture === $scope.culture);
-                    });
-
-                    if (found) {
-                        selectedVariant = found;
-                    }
-                }
-
-                //reset save flag for all variants
-                $scope.content.variants.forEach(variant => variant.save = false);
-                //ensure the save flag is set for the active variant
-                selectedVariant.save = true;
-                performSave({ saveMethod: $scope.saveMethod(), action: "save" }).then(function (data) {
-                    openPreviewWindow(url, urlTarget);
-                }, function (err) {
-                    //validation issues ....
-                });
-            }
-        };
-
-        /* publish method used in infinite editing */
-        $scope.publishAndClose = function (content) {
-            $scope.publishAndCloseButtonState = "busy";
-            $scope.saveAndPublish("buttons_publishAndClose").then(
-                function() {
-                    if ($scope.infiniteModel.submit) {
-                        $scope.infiniteModel.contentNode = content;
-                        $scope.infiniteModel.submit($scope.infiniteModel);
-                    }
-                    $scope.publishAndCloseButtonState = "success";
-                },
-                function() {
-                    $scope.publishAndCloseButtonState = "error";
-                }
-            );
-        };
-
-        /* save method used in infinite editing */
-        $scope.saveAndClose = function (content) {
-            $scope.saveAndCloseButtonState = "busy";
-            $scope.save("buttons_saveAndClose").then(
-                function() {
-                    if ($scope.infiniteModel.submit) {
-                        $scope.infiniteModel.contentNode = content;
-                        $scope.infiniteModel.submit($scope.infiniteModel);
-                    }
-                    $scope.saveAndCloseButtonState = "success";
-                },
-                function() {
-                    $scope.saveAndCloseButtonState = "error";
-                }
-            );
-        };
-
-        /**
-         * Call back when a content app changes
-         * @param {any} app
-         */
-        $scope.appChanged = function (activeApp) {
-
-            $scope.activeApp = activeApp;
-
-            _.forEach($scope.content.apps, function (app) {
-                app.active = false;
-                if (app.alias === $scope.activeApp.alias) {
-                    app.active = true;
-                }
-            });
-
-            $scope.$broadcast("editors.apps.appChanged", { app: activeApp });
-
-            createButtons($scope.content);
-
-        };
-
-        /**
-         * Call back when a content app changes
-         * @param {any} app
-         */
-        $scope.appAnchorChanged = function (app, anchor) {
-            //send an event downwards
-            $scope.$broadcast("editors.apps.appAnchorChanged", { app: app, anchor: anchor });
-        };
-
-        // methods for infinite editing
-        $scope.close = function () {
-            if ($scope.infiniteModel.close) {
-                $scope.infiniteModel.close($scope.infiniteModel);
-            }
-        };
-
-        /**
-         * Call back when user click the back-icon
-         */
-        $scope.onBack = function () {
-            if ($scope.infiniteModel && $scope.infiniteModel.close) {
-                $scope.infiniteModel.close($scope.infiniteModel);
-            } else {
-                // navigate backwards if content has a parent.
-                $location.path('/' + $routeParams.section + '/' + $routeParams.tree + '/' + $routeParams.method + '/' + $scope.content.parentId);
-            }
-        };
-
-        //ensure to unregister from all events!
-        $scope.$on('$destroy', function () {
-            for (var e in evts) {
-                eventsService.unsubscribe(evts[e]);
-            }
-            //since we are not notifying and clearing server validation messages when they are received due to how the variant
-            //switching works, we need to ensure they are cleared when this editor is destroyed
-            serverValidationManager.clear();
-        });
-
-    }
-
-    function createDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/content/edit.html',
-            controller: 'Umbraco.Editors.Content.EditorDirectiveController',
-            scope: {
-                contentId: "=",
-                isNew: "=?",
-                treeAlias: "@",
-                page: "=?",
-                saveMethod: "&",
-                getMethod: "&",
-                getScaffoldMethod: "&?",
-                culture: "=?",
-                segment: "=?",
-                infiniteModel: "=?"
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').controller('Umbraco.Editors.Content.EditorDirectiveController', ContentEditController);
-    angular.module('umbraco.directives').directive('contentEditor', createDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
deleted file mode 100644
index aba292523d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
+++ /dev/null
@@ -1,395 +0,0 @@
-(function () {
-    'use strict';
-
-    function ContentNodeInfoDirective($timeout, logResource, eventsService, userService, localizationService, dateHelper, editorService, redirectUrlsResource, overlayService, entityResource) {
-
-        function link(scope) {
-
-            var evts = [];
-            var isInfoTab = false;
-            var auditTrailLoaded = false;
-            var labels = {};
-
-            scope.publishStatus = [];
-            scope.currentVariant = null;
-            scope.currentUrls = [];
-            scope.loadingReferences = false;
-
-            scope.disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates;
-            scope.allowChangeDocumentType = false;
-            scope.allowChangeTemplate = false;
-            scope.allTemplates = [];
-
-            scope.historyLabelKey = scope.node.variants && scope.node.variants.length === 1 ? "general_history" : "auditTrails_historyIncludingVariants";
-
-            function onInit() {
-                entityResource.getAll("Template").then(templates => scope.allTemplates = templates);
-
-                // set currentVariant
-                scope.currentVariant = scope.node.variants.find(v => v.active);
-
-                updateCurrentUrls();
-
-                // if there are any infinite editors open we are in infinite editing
-                scope.isInfiniteMode = editorService.getNumberOfEditors() > 0 ? true : false;
-
-                userService.getCurrentUser().then(user => {
-                    // only allow change of media type if user has access to the settings sections
-                    const hasAccessToSettings = user.allowedSections.indexOf("settings") !== -1 ? true : false;
-                    scope.allowChangeDocumentType = hasAccessToSettings;
-                    scope.allowChangeTemplate = hasAccessToSettings;
-                });
-
-                var keys = [
-                    "general_deleted",
-                    "content_unpublished",
-                    "content_published",
-                    "content_publishedPendingChanges",
-                    "content_notCreated",
-                    "prompt_unsavedChanges",
-                    "prompt_doctypeChangeWarning",
-                    "content_itemNotPublished",
-                    "general_choose"
-                ];
-
-                localizationService.localizeMany(keys)
-                    .then(data => {
-                        [labels.deleted,
-                        labels.unpublished,
-                        labels.published,
-                        labels.publishedPendingChanges,
-                        labels.notCreated,
-                        labels.unsavedChanges,
-                        labels.doctypeChangeWarning,
-                        labels.notPublished,
-                        scope.chooseLabel] = data;
-
-                        setNodePublishStatus();
-
-                        if (scope.currentUrls && scope.currentUrls.length === 0) {
-                            if (scope.node.id > 0) {
-                                //it's created but not published
-                                scope.currentUrls.push({ text: labels.notPublished, isUrl: false });
-                            }
-                            else {
-                                //it's new
-                                scope.currentUrls.push({ text: labels.notCreated, isUrl: false })
-                            }
-                        }
-
-                    });
-
-                scope.auditTrailOptions = {
-                    id: scope.node.id
-                };
-
-                // make sure dates are formatted to the user's locale
-                formatDatesToLocal();
-
-                // get available templates
-                scope.availableTemplates = scope.node.allowedTemplates;
-
-                // get document type details
-                scope.documentType = scope.node.documentType;
-
-                //default setting for redirect url management
-                scope.urlTrackerDisabled = false;
-
-                // Declare a fallback URL for the <umb-node-preview/> directive
-                if (scope.documentType !== null) {
-                    scope.previewOpenUrl = '#/settings/documentTypes/edit/' + scope.documentType.id;
-                }
-
-                var activeApp = scope.node.apps.find(a => a.active);
-                if (activeApp.alias === "umbInfo") {
-                    loadRedirectUrls();
-                    loadAuditTrail();
-                    isInfoTab = true;
-                }
-
-                // never show templates for element types (if they happen to have been created in the content tree)
-                scope.disableTemplates = scope.disableTemplates || scope.node.isElement;
-            }
-
-            scope.auditTrailPageChange = function (pageNumber) {
-                scope.auditTrailOptions.pageNumber = pageNumber;
-                loadAuditTrail(true);
-            };
-
-            scope.openDocumentType = function (documentType) {
-
-                // add confirmation dialog before opening the doc type editor
-                if (scope.node.variants.some(variant => variant.isDirty)) {
-                    const confirm = {
-                        title: labels.unsavedChanges,
-                        view: "default",
-                        content: labels.doctypeChangeWarning,
-                        submitButtonLabelKey: "general_continue",
-                        submitButtonStyle: "warning",
-                        closeButtonLabelKey: "general_cancel",
-                        submit: function () {
-                            openDocTypeEditor(documentType);
-                            overlayService.close();
-                        },
-                        close: function () {
-                            overlayService.close();
-                        }
-                    };
-                    overlayService.open(confirm);
-                } else {
-                    openDocTypeEditor(documentType);
-                }
-
-            };
-
-            function openDocTypeEditor(documentType) {
-                const editor = {
-                    id: documentType.id,
-                    submit: function () {
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-                editorService.documentTypeEditor(editor);
-            }
-
-            scope.openTemplate = function () {
-                var template = scope.allTemplates.find(x => x.alias === scope.node.template);
-
-                if (!template) {
-                    return;
-                }
-                var templateEditor = {
-                    id: template.id,
-                    submit: function () {
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-                editorService.templateEditor(templateEditor);
-            }
-
-            scope.updateTemplate = function (templateAlias) {
-                // update template value
-                scope.node.template = templateAlias;
-            };
-
-            scope.openRollback = function () {
-
-                var rollback = {
-                    node: scope.node,
-                    submit: function () {
-                        const args = { node: scope.node };
-                        eventsService.emit("editors.content.reload", args);
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-                editorService.rollback(rollback);
-            };
-
-            function loadAuditTrail(forceReload) {
-
-                //don't load this if it's already done
-                if (auditTrailLoaded && !forceReload) {
-                    return;
-                }
-
-                scope.loadingAuditTrail = true;
-
-                logResource.getPagedEntityLog(scope.auditTrailOptions)
-                    .then(data => {
-
-                        // get current backoffice user and format dates
-                        userService.getCurrentUser().then(currentUser => {
-                            data.items.forEach(item => {
-                                item.timestampFormatted = dateHelper.getLocalDate(item.timestamp, currentUser.locale, 'LLL');
-                            });
-                        });
-
-                        scope.auditTrail = data.items;
-                        scope.auditTrailOptions.pageNumber = data.pageNumber;
-                        scope.auditTrailOptions.pageSize = data.pageSize;
-                        scope.auditTrailOptions.totalItems = data.totalItems;
-                        scope.auditTrailOptions.totalPages = data.totalPages;
-
-                        setAuditTrailLogTypeColor(scope.auditTrail);
-
-                        scope.loadingAuditTrail = false;
-
-                        auditTrailLoaded = true;
-                    });
-
-            }
-
-            function loadReferences(){
-              scope.loadingReferences = true;
-            }
-            function loadRedirectUrls() {
-                scope.loadingRedirectUrls = true;
-                //check if Redirect URL Management is enabled
-                redirectUrlsResource.getEnableState().then(response => {
-                    scope.urlTrackerDisabled = response.enabled !== true;
-                    if (scope.urlTrackerDisabled === false) {
-
-                        redirectUrlsResource.getRedirectsForContentItem(scope.node.udi)
-                            .then(data => {
-                                scope.redirectUrls = data.searchResults;
-                                scope.hasRedirects = (typeof data.searchResults !== 'undefined' && data.searchResults.length > 0);
-                                scope.loadingRedirectUrls = false;
-                            });
-                    }
-                    else {
-                        scope.loadingRedirectUrls = false;
-                    }
-                });
-            }
-
-            function setAuditTrailLogTypeColor(auditTrail) {
-                auditTrail.forEach(item => {
-
-                    switch (item.logType) {
-                        case "Save":
-                            item.logTypeColor = "primary";
-                            break;
-                        case "Publish":
-                        case "PublishVariant":
-                            item.logTypeColor = "success";
-                            break;
-                        case "Unpublish":
-                        case "UnpublishVariant":
-                            item.logTypeColor = "warning";
-                            break;
-                        case "Delete":
-                            item.logTypeColor = "danger";
-                            break;
-                        default:
-                            item.logTypeColor = "gray";
-                    }
-                });
-            }
-
-            function setNodePublishStatus() {
-
-                scope.status = {};
-
-                // deleted node
-                if (scope.node.trashed === true) {
-                    scope.status.color = "danger";
-                    return;
-                }
-
-                // variant status
-                if (scope.currentVariant.state === "NotCreated") {
-                    // not created
-                    scope.status.color = "gray";
-                }
-                else if (scope.currentVariant.state === "Draft") {
-                    // draft node
-                    scope.status.color = "gray";
-                }
-                else if (scope.currentVariant.state === "Published") {
-                    // published node
-                    scope.status.color = "success";
-                }
-                else if (scope.currentVariant.state === "PublishedPendingChanges") {
-                    // published node with pending changes
-                    scope.status.color = "success";
-                }
-            }
-
-            function formatDatesToLocal() {
-                // get current backoffice user and format dates
-                userService.getCurrentUser().then(currentUser => {
-                    scope.currentVariant.createDateFormatted = dateHelper.getLocalDate(scope.currentVariant.createDate, currentUser.locale, 'LLL');
-                    scope.currentVariant.releaseDateFormatted = dateHelper.getLocalDate(scope.currentVariant.releaseDate, currentUser.locale, 'LLL');
-                    scope.currentVariant.expireDateFormatted = dateHelper.getLocalDate(scope.currentVariant.expireDate, currentUser.locale, 'LLL');
-                });
-            }
-
-            function updateCurrentUrls() {
-                // never show URLs for element types (if they happen to have been created in the content tree)
-                if (scope.node.isElement || scope.node.urls === null) {
-                    scope.currentUrls = null;
-                    return;
-                }
-
-                // find the urls for the currently selected language
-                // when there is no selected language (allow vary by culture == false), show all urls of the node.
-                scope.currentUrls = scope.node.urls.filter(url => scope.currentVariant.language == null || scope.currentVariant.language.culture === url.culture);
-
-                // figure out if multiple cultures apply across the content URLs
-                // by getting an array of the url cultures, then checking that more than one culture exists in the array
-                scope.currentUrlsHaveMultipleCultures = scope.currentUrls
-                    .map(x => x.culture)
-                    .filter((v, i, arr) => arr.indexOf(v) === i)
-                    .length > 1;
-            }
-
-            // load audit trail and redirects when on the info tab
-            evts.push(eventsService.on("app.tabChange", function (event, args) {
-                $timeout(function () {
-                    if (args.alias === "umbInfo") {
-                        isInfoTab = true;
-                        loadAuditTrail();
-                        loadRedirectUrls();
-                        setNodePublishStatus();
-                        formatDatesToLocal();
-                        loadReferences();
-                    } else {
-                        isInfoTab = false;
-                    }
-                });
-            }));
-
-            // watch for content state updates
-            scope.$watch('node.updateDate', function (newValue, oldValue) {
-
-                if (!newValue) { return; }
-                if (newValue === oldValue) { return; }
-
-                if (isInfoTab) {
-                    loadAuditTrail(true);
-                    loadRedirectUrls();
-                    setNodePublishStatus();
-                    formatDatesToLocal();
-                    loadReferences();
-                }
-                updateCurrentUrls();
-            });
-
-            //ensure to unregister from all events!
-            scope.$on('$destroy', function () {
-                for (var e in evts) {
-                    eventsService.unsubscribe(evts[e]);
-                }
-            });
-
-            onInit();
-
-        }
-
-        var directive = {
-            require: '^^umbVariantContent',
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/content/umb-content-node-info.html',
-            scope: {
-                node: "="
-            },
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbContentNodeInfo', ContentNodeInfoDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
deleted file mode 100644
index 90f81bd827..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
+++ /dev/null
@@ -1,227 +0,0 @@
-(function () {
-    'use strict';
-
-    /** This directive is used to render out the current variant tabs and properties and exposes an API for other directives to consume  */
-    function tabbedContentDirective($timeout, $filter, contentEditingHelper, contentTypeHelper) {
-
-        function link($scope, $element) {
-
-            var appRootNode = $element[0];
-
-            // Directive for cached property groups.
-            var propertyGroupNodesDictionary = {};
-
-            var scrollableNode = appRootNode.closest(".umb-scrollable");
-
-            $scope.activeTabAlias = null;
-            $scope.tabs = [];
-            $scope.allowUpdate = $scope.content.allowedActions.includes('A');
-            $scope.allowEditInvariantFromNonDefault = Umbraco.Sys.ServerVariables.umbracoSettings.allowEditInvariantFromNonDefault;
-
-            $scope.$watchCollection('content.tabs', (newValue) => {
-
-                contentTypeHelper.defineParentAliasOnGroups(newValue);
-                contentTypeHelper.relocateDisorientedGroups(newValue);
-
-                // make a collection with only tabs and not all groups
-                $scope.tabs = $filter("filter")(newValue, (tab) => {
-                    return tab.type === contentTypeHelper.TYPE_TAB;
-                });
-
-                if ($scope.tabs.length > 0) {
-                    // if we have tabs and some groups that doesn't belong to a tab we need to render those on an "Other" tab.
-                    contentEditingHelper.registerGenericTab(newValue);
-
-                    $scope.setActiveTab($scope.tabs[0]);
-
-                    scrollableNode.removeEventListener("scroll", onScroll);
-                    scrollableNode.removeEventListener("mousewheel", cancelScrollTween);
-
-                // only trigger anchor scroll when there are no tabs
-                } else {
-                    scrollableNode.addEventListener("scroll", onScroll);
-                    scrollableNode.addEventListener("mousewheel", cancelScrollTween);
-                }
-            });
-
-            function onScroll(event) {
-
-                var viewFocusY = scrollableNode.scrollTop + scrollableNode.clientHeight * .5;
-
-                for(var i in $scope.content.tabs) {
-                    var group = $scope.content.tabs[i];
-                    var node = propertyGroupNodesDictionary[group.id];
-
-                    if (!node) {
-                        return;
-                    }
-
-                    if (viewFocusY >= node.offsetTop && viewFocusY <= node.offsetTop + node.clientHeight) {
-                        setActiveAnchor(group);
-                        return;
-                    }
-                }
-
-            }
-
-            function setActiveAnchor(tab) {
-                if (tab.active !== true) {
-                    var i = $scope.content.tabs.length;
-                    while(i--) {
-                        $scope.content.tabs[i].active = false;
-                    }
-                    tab.active = true;
-                }
-            }
-
-            function getActiveAnchor() {
-                var i = $scope.content.tabs.length;
-                while(i--) {
-                    if ($scope.content.tabs[i].active === true)
-                        return $scope.content.tabs[i];
-                }
-                return false;
-            }
-
-            function getScrollPositionFor(id) {
-                if (propertyGroupNodesDictionary[id]) {
-                    return propertyGroupNodesDictionary[id].offsetTop - 20;// currently only relative to closest relatively positioned parent
-                }
-                return null;
-            }
-
-            function scrollTo(id) {
-                var y = getScrollPositionFor(id);
-                if (getScrollPositionFor !== null) {
-
-                    var viewportHeight = scrollableNode.clientHeight;
-                    var from = scrollableNode.scrollTop;
-                    var to = Math.min(y, scrollableNode.scrollHeight - viewportHeight);
-
-                    var animeObject = {_y: from};
-                    $scope.scrollTween = anime({
-                        targets: animeObject,
-                        _y: to,
-                        easing: 'easeOutExpo',
-                        duration: 200 + Math.min(Math.abs(to-from)/viewportHeight*100, 400),
-                        update: () => {
-                            scrollableNode.scrollTo(0, animeObject._y);
-                        }
-                    });
-
-                }
-            }
-
-            function jumpTo(id) {
-                var y = getScrollPositionFor(id);
-                if (getScrollPositionFor !== null) {
-                    cancelScrollTween();
-                    scrollableNode.scrollTo(0, y);
-                }
-            }
-
-            function cancelScrollTween() {
-                if($scope.scrollTween) {
-                    $scope.scrollTween.pause();
-                }
-            }
-
-            $scope.registerPropertyGroup = function(element, appAnchor) {
-                propertyGroupNodesDictionary[appAnchor] = element;
-            };
-
-            $scope.setActiveTab = function(tab) {
-                $scope.activeTabAlias = tab.alias;
-                $scope.tabs.forEach(tab => tab.active = false);
-                tab.active = true;
-            };
-
-            $scope.$on("editors.apps.appChanged", function($event, $args) {
-                // if app changed to this app, then we want to scroll to the current anchor
-                if($args.app.alias === "umbContent" && $scope.tabs.length === 0) {
-                    var activeAnchor = getActiveAnchor();
-                    $timeout(jumpTo.bind(null, [activeAnchor.id]));
-                }
-            });
-
-            $scope.$on("editors.apps.appAnchorChanged", function($event, $args) {
-                if($args.app.alias === "umbContent") {
-                    setActiveAnchor($args.anchor);
-                    scrollTo($args.anchor.id);
-                }
-            });
-
-            //ensure to unregister from all dom-events
-            $scope.$on('$destroy', function () {
-                cancelScrollTween();
-                scrollableNode.removeEventListener("scroll", onScroll);
-                scrollableNode.removeEventListener("mousewheel", cancelScrollTween);
-            });
-
-        }
-
-        function controller($scope) {
-
-            //expose the property/methods for other directives to use
-            this.content = $scope.content;
-
-            if($scope.contentNodeModel) {
-                $scope.defaultVariant = _.find($scope.contentNodeModel.variants, variant => {
-                    // defaultVariant will never have segment. Wether it has a language or not depends on the setup.
-                    return !variant.segment && ((variant.language && variant.language.isDefault) || (!variant.language));
-                });
-            }
-
-            $scope.unlockInvariantValue = function(property) {
-                property.unlockInvariantValue = !property.unlockInvariantValue;
-            };
-
-            $scope.$watch("tabbedContentForm.$dirty",
-                function (newValue, oldValue) {
-                    if (newValue === true) {
-                        $scope.content.isDirty = true;
-                    }
-                }
-            );
-
-            $scope.propertyEditorDisabled = function (property) {
-                if (property.unlockInvariantValue) {
-                    return false;
-                }
-
-                var contentLanguage = $scope.content.language;
-                var variants = $scope.contentNodeModel && $scope.contentNodeModel.variants || [];
-                var otherCreatedVariants = variants.filter(x => x.compositeId !== $scope.content.compositeId && (x.state !== "NotCreated" || x.name !== null)).length === 0;
-
-                var canEditCulture = !contentLanguage ||
-                    // If the property culture equals the content culture it can be edited
-                    property.culture === contentLanguage.culture ||
-                    // A culture-invariant property can only be edited by the default language variant
-                    (otherCreatedVariants || $scope.allowEditInvariantFromNonDefault !== true && property.culture == null && contentLanguage.isDefault);
-
-                var canEditSegment = property.segment === $scope.content.segment;
-
-                return !canEditCulture || !canEditSegment;
-            }
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/content/umb-tabbed-content.html',
-            controller: controller,
-            link: link,
-            scope: {
-                content: "=", // in this context the content is the variant model.
-                contentNodeModel: "=?", //contentNodeModel is the content model for the node,
-                contentApp: "=?" // contentApp is the origin app model for this view
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbTabbedContent', tabbedContentDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
deleted file mode 100644
index 85d3233e22..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
+++ /dev/null
@@ -1,141 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * A component to encapsulate each variant editor which includes the name header and all content apps for a given variant
-     */
-    var umbVariantContent = {
-        templateUrl: 'views/components/content/umb-variant-content.html',
-        bindings: {
-            content: "<",
-            page: "<",
-            editor: "<",
-            editorIndex: "<",
-            editorCount: "<",
-            onCloseSplitView: "&",
-            onSelectVariant: "&",
-            onOpenSplitView: "&",
-            onSelectApp: "&",
-            onSelectAppAnchor: "&",
-            onBack: "&?",
-            showBack: "<?"
-        },
-        controllerAs: 'vm',
-        controller: umbVariantContentController
-    };
-
-    function umbVariantContentController($scope, contentAppHelper) {
-
-        var unsubscribe = [];
-
-        var vm = this;
-
-        vm.$onInit = onInit;
-        vm.$postLink = postLink;
-        vm.$onDestroy = onDestroy;
-
-        vm.selectVariant = selectVariant;
-        vm.openSplitView = openSplitView;
-        vm.selectApp = selectApp;
-        vm.selectAppAnchor = selectAppAnchor;
-        vm.showBackButton = showBackButton;
-
-        function onInit() {
-
-            // Make copy of apps, so we can have a variant specific model for the App. (needed for validation etc.)
-            vm.editor.variantApps = Utilities.copy(vm.content.apps);
-
-            var activeApp = vm.content.apps.find((app) => app.active);
-
-            onAppChanged(activeApp);
-        }
-
-        function showBackButton() {
-            return vm.page.listViewPath !== null && vm.showBack;
-        }
-
-        /** Called when the component has linked all elements, this is when the form controller is available */
-        function postLink() {
-            //set the content to dirty if the header changes
-            unsubscribe.push($scope.$watch("vm.editor.content.name",
-                function (newValue, oldValue) {
-                    if (newValue !== oldValue) {
-                        vm.editor.content.isDirty = true;
-                    }
-                }));
-        }
-
-        function onDestroy() {
-            for (var i = 0; i < unsubscribe.length; i++) {
-                unsubscribe[i]();
-            }
-        }
-
-        /**
-         * Used to proxy a callback
-         * @param {any} variant
-         */
-        function selectVariant(variant) {
-            if (vm.onSelectVariant) {
-                vm.onSelectVariant({ "variant": variant });
-            }
-        }
-
-        /**
-         * Used to proxy a callback
-         * @param {any} item
-         */
-        function selectApp(item) {
-            // call the callback if any is registered
-            if (vm.onSelectApp) {
-                vm.onSelectApp({ "app": item });
-            }
-        }
-
-        $scope.$on("editors.apps.appChanged", function ($event, $args) {
-            var activeApp = $args.app;
-
-            // sync varaintApps active with new active.
-            _.forEach(vm.editor.variantApps, function (app) {
-                app.active = (app.alias === activeApp.alias);
-            });
-
-            onAppChanged(activeApp);
-        });
-
-        $scope.$on("listView.itemsChanged", function ($event, $args) {
-            vm.disableActionsMenu = $args.items.length > 0;
-        });
-
-        function onAppChanged(activeApp) {
-            // set the name field to readonly if the user don't have update permissions or the active content app is not "Content" or "Info"
-            const allowUpdate = vm.editor.content.allowedActions.includes('A');
-            const isContentBasedApp = activeApp && contentAppHelper.isContentBasedApp(activeApp);
-            vm.nameReadonly = !allowUpdate || !isContentBasedApp;
-        }
-
-        /**
-         * Used to proxy a callback
-         * @param {any} item
-         */
-        function selectAppAnchor(item, anchor) {
-            // call the callback if any is registered
-            if (vm.onSelectAppAnchor) {
-                vm.onSelectAppAnchor({ "app": item, "anchor": anchor });
-            }
-        }
-
-        /**
-         * Used to proxy a callback
-         * @param {any} variant
-         */
-        function openSplitView(variant) {
-            if (vm.onOpenSplitView) {
-                vm.onOpenSplitView({ "variant": variant });
-            }
-        }
-    }
-
-    angular.module('umbraco.directives').component('umbVariantContent', umbVariantContent);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
deleted file mode 100644
index 7ed5e4120f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
+++ /dev/null
@@ -1,262 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * A component for split view content editing
-     */
-    var umbVariantContentEditors = {
-        templateUrl: 'views/components/content/umb-variant-content-editors.html',
-        bindings: {
-            page: "<",
-            content: "<",
-            culture: "<",
-            segment: "<",
-            onSelectApp: "&?",
-            onSelectAppAnchor: "&?",
-            onBack: "&?",
-            showBack: "<?"
-        },
-        controllerAs: 'vm',
-        controller: umbVariantContentEditorsController
-    };
-
-    function umbVariantContentEditorsController($scope, $location, eventsService) {
-
-        var prevContentDateUpdated = null;
-
-        var vm = this;
-
-        vm.$onInit = onInit;
-        vm.$onChanges = onChanges;
-        vm.$doCheck = doCheck;
-        vm.$postLink = postLink;
-
-        vm.openSplitView = openSplitView;
-        vm.closeSplitView = closeSplitView;
-        vm.selectVariant = selectVariant;
-        vm.selectApp = selectApp;
-        vm.selectAppAnchor = selectAppAnchor;
-        vm.requestSplitView = requestSplitView;
-
-        vm.getScope = getScope;// used by property editors to get a scope that is the root of split view, content apps etc.
-
-        //Used to track how many content views there are (for split view there will be 2, it could support more in theory)
-        vm.editors = [];
-
-        /** Called when the component initializes */
-        function onInit() {
-            prevContentDateUpdated = Utilities.copy(vm.content.updateDate);
-            setActiveVariant();
-        }
-
-        /** Called when the component has linked all elements, this is when the form controller is available */
-        function postLink() {
-
-        }
-
-        /**
-         * Watch for model changes
-         * @param {any} changes
-         */
-        function onChanges(changes) {
-
-            if (changes.culture && !changes.culture.isFirstChange() && changes.culture.currentValue !== changes.culture.previousValue) {
-                setActiveVariant();
-            } else if (changes.segment && !changes.segment.isFirstChange() && changes.segment.currentValue !== changes.segment.previousValue) {
-                setActiveVariant();
-            } else if (changes.content) {
-                setActiveVariant();
-            }
-        }
-
-        /** Allows us to deep watch whatever we want - executes on every digest cycle */
-        function doCheck() {
-            if (!Utilities.equals(vm.content.updateDate, prevContentDateUpdated)) {
-                setActiveVariant();
-                prevContentDateUpdated = Utilities.copy(vm.content.updateDate);
-            }
-        }
-
-        /** This is called when the split view changes based on the umb-variant-content */
-        function splitViewChanged() {
-            //send an event downwards
-            $scope.$broadcast("editors.content.splitViewChanged", { editors: vm.editors });
-        }
-
-        /**
-         * Set the active variant based on the current culture or segment (query string)
-         */
-        function setActiveVariant() {
-            // set the active variant
-            var activeVariant = null;
-            vm.content.variants.forEach(v => {
-                if ((vm.culture === "invariant" || v.language && v.language.culture === vm.culture) && v.segment === vm.segment) {
-                    activeVariant = v;
-                }
-            });
-
-            if (!activeVariant) {
-                // Set the first variant to active if we can't find it.
-                // If the content item is invariant, then only one item exists in the array.
-                activeVariant = vm.content.variants[0];
-            }
-
-            insertVariantEditor(0, activeVariant);
-
-            if (vm.editors.length > 1) {
-                //now re-sync any other editor content (i.e. if split view is open)
-                for (var s = 1; s < vm.editors.length; s++) {
-                    //get the variant from the scope model
-                    var variant = vm.content.variants.find(v =>
-                        (!v.language || v.language.culture === vm.editors[s].content.language.culture) && v.segment === vm.editors[s].content.segment);
-
-                    vm.editors[s].content = variant;
-                }
-            }
-            
-            if (vm.content.variants.length > 1) {
-                eventsService.emit('editors.content.cultureChanged', activeVariant.language);
-            }
-        }
-
-        /**
-         * Updates the editors collection for a given index for the specified variant
-         * @param {any} index
-         * @param {any} variant
-         */
-        function insertVariantEditor(index, variant) {
-
-            if (vm.editors[index]) {
-                if (vm.editors[index].content === variant) {
-                    // This variant is already the content of the editor in this index.
-                    return;
-                }
-                vm.editors[index].content.active = false;
-            }
-            variant.active = true;
-
-            var variantCulture = variant.language ? variant.language.culture : "invariant";
-            var variantSegment = variant.segment;
-
-            var currentCulture = index < vm.editors.length ? vm.editors[index].culture : null;
-            var currentSegment = index < vm.editors.length ? vm.editors[index].segment : null;
-            
-            // if index not already exists or if the culture or segment isnt identical then we do a replacement.
-            if (index >= vm.editors.length || currentCulture !== variantCulture || currentSegment !== variantSegment) {
-
-                //Not the current culture or segment which means we need to modify the array.
-                //NOTE: It is not good enough to just replace the `content` object at a given index in the array
-                // since that would mean that directives are not re-initialized.
-                vm.editors.splice(index, 1, {
-                    compositeId: variant.compositeId,
-                    content: variant,
-                    culture: variantCulture,
-                    segment: variantSegment
-                });
-            }
-            else {
-                //replace the content of the editor, since the culture and segment is the same.
-                vm.editors[index].content = variant;
-            }
-            
-        }
-        
-        /**
-         * Adds a new editor to the editors array to show content in a split view
-         * @param {any} selectedVariant
-         */
-        function openSplitView(selectedVariant) {
-            // enforce content contentApp in splitview.
-            var contentApp = vm.content.apps.find(app => app.alias === "umbContent");
-            if(contentApp) {
-                selectApp(contentApp);
-            }
-            
-            insertVariantEditor(vm.editors.length, selectedVariant);
-            
-            splitViewChanged();            
-        }
-        
-        function requestSplitView(args) {
-            var culture = args.culture;
-            var segment = args.segment;
-
-            var variant = vm.content.variants.find(v =>
-                (!v.language || v.language.culture === culture) && v.segment === segment);
-
-            if (variant != null) {
-                openSplitView(variant);
-            }
-        }
-
-        var unbindSplitViewRequest = eventsService.on("editors.content.splitViewRequest", (_, args) => requestSplitView(args));
-        /** Closes the split view */
-        function closeSplitView(editorIndex) {
-            // TODO: hacking animation states - these should hopefully be easier to do when we upgrade angular
-            var editor = vm.editors[editorIndex];
-            vm.editors.splice(editorIndex, 1);
-            editor.content.active = false;
-            
-            //update the current culture to reflect the last open variant (closing the split view corresponds to selecting the other variant)
-            const culture = vm.editors[0].content.language ? vm.editors[0].content.language.culture : null;
-
-            $location.search({"cculture": culture, "csegment": vm.editors[0].content.segment});
-            splitViewChanged();
-            unbindSplitViewRequest();
-        }
-        
-        // if split view was never closed, the listener is not disposed when changing nodes - this unbinds it
-        $scope.$on('$destroy', () => unbindSplitViewRequest());
-
-        /**
-         * Changes the currently selected variant
-         * @param {any} variant This is the model of the variant/language drop down item in the editor header
-         * @param {any} editorIndex The index of the editor being changed
-         */
-        function selectVariant(variant, editorIndex) {
-
-            var variantCulture = variant.language ? variant.language.culture : "invariant";
-            var variantSegment = variant.segment || null;
-            
-            // Check if we already have this editor open, if so, do nothing.
-            if (vm.editors.find((editor) => (!editor.content.language || editor.content.language.culture === variantCulture) && editor.content.segment === variantSegment)) {
-                return;
-            }
-            
-            //if the editor index is zero, then update the query string to track the lang selection, otherwise if it's part
-            //of a 2nd split view editor then update the model directly.
-            if (editorIndex === 0) {
-                //If we've made it this far, then update the query string.
-                //The editor will respond to this query string changing.
-                $location.search("cculture", variantCulture).search("csegment", variantSegment);
-            }
-            else {
-                //update the editors collection
-                insertVariantEditor(editorIndex, variant);                
-            }            
-        }
-
-        /**
-         * Stores the active app in a variable so we can remember it when changing language
-         * @param {any} app This is the model of the selected app
-         */
-        function selectApp(app) {
-            if(vm.onSelectApp) {
-                vm.onSelectApp({"app": app});
-            }
-        }
-        
-        function selectAppAnchor(app, anchor) {
-            if(vm.onSelectAppAnchor) {
-                vm.onSelectAppAnchor({"app": app, "anchor": anchor});
-            }
-        }
-        function getScope() {
-            return $scope;
-        }
-
-    }
-
-    angular.module('umbraco.directives').component('umbVariantContentEditors', umbVariantContentEditors);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantnotificationlist.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantnotificationlist.directive.js
deleted file mode 100644
index dca7cdbb18..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantnotificationlist.directive.js
+++ /dev/null
@@ -1,22 +0,0 @@
-(function () {
-    'use strict';
-
-    function umbNotificationList() {
-
-        var vm = this;
-        
-    }
-
-    var umbNotificationListComponent = {
-        templateUrl: 'views/components/content/umb-variant-notification-list.html',
-        bindings: {
-            notifications: "<"
-        },
-        controllerAs: 'vm',
-        controller: umbNotificationList
-    };
-
-    angular.module("umbraco.directives")
-        .component('umbVariantNotificationList', umbNotificationListComponent);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantstate.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantstate.directive.js
deleted file mode 100644
index 1dc2d60450..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantstate.directive.js
+++ /dev/null
@@ -1,22 +0,0 @@
-(function () {
-    'use strict';
-
-    function umbVariantStateController($scope, $element) {
-
-        var vm = this;
-        
-    }
-
-    var umbVariantStateComponent = {
-        templateUrl: 'views/components/content/umb-variant-state.html',
-        bindings: {
-            variant: "<"
-        },
-        controllerAs: 'vm',
-        controller: umbVariantStateController
-    };
-
-    angular.module("umbraco.directives")
-        .component('umbVariantState', umbVariantStateComponent);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroup.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroup.component.js
deleted file mode 100644
index 3445b4039c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroup.component.js
+++ /dev/null
@@ -1,77 +0,0 @@
-(function () {
-  'use strict';
-
-  /**
-   * A component to render the content type group
-   */
-
-  function umbContentTypeGroupController() {
-
-    const vm = this;
-
-    vm.updateName = updateName;
-    vm.removeGroup = removeGroup;
-    vm.whenNameFocus = whenNameFocus;
-    vm.whenFocus = whenFocus;
-    vm.changeSortOrderValue = changeSortOrderValue;
-    vm.clickComposition = clickComposition;
-
-    function updateName (group) {
-      if (vm.onUpdateName) {
-        vm.onUpdateName({ group });
-      }
-    }
-
-    function removeGroup () {
-      if (vm.onRemove) {
-        vm.onRemove({ group: vm.group });
-      }
-    }
-
-    function whenNameFocus () {
-      if (vm.onNameFocus) {
-        vm.onNameFocus();
-      }
-    }
-
-    function whenFocus () {
-      if (vm.onFocus) {
-        vm.onFocus();
-      }
-    }
-
-    function changeSortOrderValue () {
-      if (vm.onChangeSortOrderValue) {
-        vm.onChangeSortOrderValue( {group: vm.group});
-      }
-    }
-    function clickComposition (contentTypeId) {
-      if (vm.onClickComposition) {
-        vm.onClickComposition({contentTypeId: contentTypeId});
-      }
-    }
-  }
-
-  const umbContentTypeGroupComponent = {
-    templateUrl: 'views/components/contenttype/umb-content-type-group.html',
-    controllerAs: 'vm',
-    transclude: true,
-    bindings: {
-      group: '<',
-      allowName: '<',
-      onUpdateName: '&',
-      allowRemove: '<',
-      onRemove: '&',
-      sorting: '<',
-      onNameFocus: '&',
-      onFocus: '&',
-      onChangeSortOrderValue: '&',
-      valServerFieldName: '@',
-      valTabAlias: "@",
-      onClickComposition: '&?'
-    },
-    controller: umbContentTypeGroupController
-  };
-
-  angular.module('umbraco.directives').component('umbContentTypeGroup', umbContentTypeGroupComponent);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroups.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroups.component.js
deleted file mode 100644
index 90c83b1a39..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroups.component.js
+++ /dev/null
@@ -1,23 +0,0 @@
-(function () {
-  'use strict';
-
-  /**
-   * A component to render the content type groups
-   */
-  
-  function umbContentTypeGroupsController() {
-
-      const vm = this;
-
-  }
-
-  const umbContentTypeGroupsComponent = {
-      templateUrl: 'views/components/contenttype/umb-content-type-groups.html',
-      controllerAs: 'vm',
-      transclude: true,
-      controller: umbContentTypeGroupsController
-  };
-
-  angular.module('umbraco.directives').component('umbContentTypeGroups', umbContentTypeGroupsComponent);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypeproperty.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypeproperty.component.js
deleted file mode 100644
index c96944dbd5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypeproperty.component.js
+++ /dev/null
@@ -1,62 +0,0 @@
-(function () {
-  'use strict';
-
-  /**
-   * A component to render the content type property
-   */
-  
-  function umbContentTypePropertyController() {
-
-    const vm = this;
-
-    vm.edit = edit;
-    vm.remove = remove;
-    vm.changeSortOrderValue = changeSortOrderValue;
-    vm.clickComposition = clickComposition;
-
-    function edit () {
-      if (vm.onEdit) {
-        vm.onEdit();
-      }
-    }
-
-    function remove () {
-      if (vm.onRemove) {
-        vm.onRemove({ property: vm.property });
-      }
-    }
-
-    function changeSortOrderValue () {
-      if (vm.onChangeSortOrderValue) {
-        vm.onChangeSortOrderValue( {property: vm.property});
-      }
-    }
-
-    function clickComposition(contentTypeId) {
-      if (vm.onClickComposition) {
-        vm.onClickComposition({ contentTypeId: contentTypeId });
-      }
-    }
-
-  }
-
-  const umbContentTypePropertyComponent = {
-    templateUrl: 'views/components/contenttype/umb-content-type-property.html',
-    bindings: {
-      property: '<',
-      sortable: '<',
-      onEdit: '&',
-      onRemove: '&',
-      onChangeSortOrderValue: '&',
-      onClickComposition: '&?',
-      valServerFieldAlias: '@',
-      valServerFieldLabel: '@',
-      valTabAlias: '@'
-    },
-    controllerAs: 'vm',
-    controller: umbContentTypePropertyController
-  };
-
-  angular.module('umbraco.directives').component('umbContentTypeProperty', umbContentTypePropertyComponent);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypetab.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypetab.component.js
deleted file mode 100644
index 5fb8297847..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypetab.component.js
+++ /dev/null
@@ -1,108 +0,0 @@
-(function () {
-  'use strict';
-
-  /**
-   * A component to render the content type tab
-   */
-
-  function umbContentTypeTabController($timeout) {
-
-    const vm = this;
-
-    vm.compositionLabelIsVisible = false;
-
-    vm.click = click;
-    vm.removeTab = removeTab;
-    vm.whenFocusName = whenFocusName;
-    vm.whenFocus = whenFocus;
-    vm.changeSortOrderValue = changeSortOrderValue;
-    vm.changeName = changeName;
-    vm.clickComposition = clickComposition;
-    vm.mouseenter = mouseenter;
-    vm.mouseleave = mouseleave;
-    
-    let timeout = null;
-
-    function click () {
-      if (vm.onClick) {
-        vm.onClick({ tab: vm.tab });
-      }
-    }
-
-    function removeTab () {
-      if (vm.onRemove) {
-        vm.onRemove({ tab: vm.tab });
-      }
-    }
-
-    function whenFocusName () {
-      if (vm.onFocusName) {
-        vm.onFocusName();
-      }
-    }
-
-    function whenFocus () {
-      if (vm.onFocus) {
-        vm.onFocus();
-      }
-    }
-
-    function changeSortOrderValue () {
-      if (vm.onChangeSortOrderValue) {
-        vm.onChangeSortOrderValue( {tab: vm.tab});
-      }
-    }
-
-    function changeName () {
-      if (vm.onChangeName) {
-        vm.onChangeName({ key: vm.tab.key, name: vm.tab.name });
-      }
-    }
-
-    function clickComposition(contentTypeId) {
-      if (vm.onClickComposition) {
-        vm.onClickComposition({ contentTypeId: contentTypeId});
-      }
-    }
-
-    function mouseenter () {
-      if (vm.tab.inherited) {
-        vm.compositionLabelIsVisible = true;
-        $timeout.cancel(timeout);
-      }
-    }
-
-    function mouseleave () {
-      if (vm.tab.inherited) {
-        timeout = $timeout(() => {
-          vm.compositionLabelIsVisible = false;
-        }, 300);
-      }
-    }
-
-  }
-
-  const umbContentTypeTabComponent = {
-    templateUrl: 'views/components/contenttype/umb-content-type-tab.html',
-    controllerAs: 'vm',
-    transclude: true,
-    bindings: {
-      tab: '<',
-      onClick: '&?',
-      onClickComposition: '&?',
-      isOpen: '<?',
-      allowRemove: '<?',
-      onRemove: '&?',
-      sorting: '<?',
-      onFocusName: '&?',
-      onFocus: '&?',
-      onChangeSortOrderValue: '&?',
-      allowChangeName: '<?',
-      onChangeName: '&?',
-      valServerFieldName: '@'
-    },
-    controller: umbContentTypeTabController
-  };
-
-  angular.module('umbraco.directives').component('umbContentTypeTab', umbContentTypeTabComponent);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/_readme.md b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/_readme.md
deleted file mode 100644
index 0955f9ca71..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/_readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-#Editor
-
-Directives only used to construct the main editor window. Includes header, footer, menu and navigation.
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/subheader/umbeditorsubheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/subheader/umbeditorsubheader.directive.js
deleted file mode 100644
index 95a1416498..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/subheader/umbeditorsubheader.directive.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbEditorSubHeader
-@restrict E
-
-@description
-Use this directive to construct a sub header in the main editor window.
-The sub header is sticky and will follow along down the page when scrolling.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="MySection.Controller as vm">
-
-        <form name="mySectionForm" novalidate>
-
-            <umb-editor-view>
-
-                <umb-editor-container>
-
-                    <umb-editor-sub-header>
-                        // sub header content here
-                    </umb-editor-sub-header>
-
-                </umb-editor-container>
-
-            </umb-editor-view>
-
-        </form>
-
-    </div>
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbEditorSubHeaderContentLeft umbEditorSubHeaderContentLeft}</li>
-    <li>{@link umbraco.directives.directive:umbEditorSubHeaderContentRight umbEditorSubHeaderContentRight}</li>
-    <li>{@link umbraco.directives.directive:umbEditorSubHeaderSection umbEditorSubHeaderSection}</li>
-</ul>
-**/
-
-(function() {
-   'use strict';
-
-   function EditorSubHeaderDirective() {
-
-      var directive = {
-         transclude: true,
-         restrict: 'E',
-         replace: true,
-         scope: {
-             "appearance": "@?"
-         },
-         templateUrl: 'views/components/editor/subheader/umb-editor-sub-header.html'
-      };
-
-      return directive;
-   }
-
-   angular.module('umbraco.directives').directive('umbEditorSubHeader', EditorSubHeaderDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/subheader/umbeditorsubheadercontentleft.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/subheader/umbeditorsubheadercontentleft.directive.js
deleted file mode 100644
index 97d2605d6a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/subheader/umbeditorsubheadercontentleft.directive.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbEditorSubHeaderContentLeft
-@restrict E
-
-@description
-Use this directive to left align content in a sub header in the main editor window.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="MySection.Controller as vm">
-
-        <form name="mySectionForm" novalidate>
-
-            <umb-editor-view>
-
-                <umb-editor-container>
-
-                    <umb-editor-sub-header>
-
-                        <umb-editor-sub-header-content-left>
-                            // left content here
-                        </umb-editor-sub-header-content-left>
-
-                        <umb-editor-sub-header-content-right>
-                            // right content here
-                        </umb-editor-sub-header-content-right>
-
-                    </umb-editor-sub-header>
-
-                </umb-editor-container>
-
-            </umb-editor-view>
-
-        </form>
-
-    </div>
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbEditorSubHeader umbEditorSubHeader}</li>
-    <li>{@link umbraco.directives.directive:umbEditorSubHeaderContentRight umbEditorSubHeaderContentRight}</li>
-    <li>{@link umbraco.directives.directive:umbEditorSubHeaderSection umbEditorSubHeaderSection}</li>
-</ul>
-**/
-
-(function() {
-   'use strict';
-
-   function EditorSubHeaderContentLeftDirective() {
-
-      var directive = {
-         transclude: true,
-         restrict: 'E',
-         replace: true,
-         templateUrl: 'views/components/editor/subheader/umb-editor-sub-header-content-left.html'
-      };
-
-      return directive;
-   }
-
-   angular.module('umbraco.directives').directive('umbEditorSubHeaderContentLeft', EditorSubHeaderContentLeftDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/subheader/umbeditorsubheadercontentright.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/subheader/umbeditorsubheadercontentright.directive.js
deleted file mode 100644
index ce47db5d96..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/subheader/umbeditorsubheadercontentright.directive.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbEditorSubHeaderContentRight
-@restrict E
-
-@description
-Use this directive to rigt align content in a sub header in the main editor window.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="MySection.Controller as vm">
-
-        <form name="mySectionForm" novalidate>
-
-            <umb-editor-view>
-
-                <umb-editor-container>
-
-                    <umb-editor-sub-header>
-
-                        <umb-editor-sub-header-content-left>
-                            // left content here
-                        </umb-editor-sub-header-content-left>
-
-                        <umb-editor-sub-header-content-right>
-                            // right content here
-                        </umb-editor-sub-header-content-right>
-
-                    </umb-editor-sub-header>
-
-                </umb-editor-container>
-
-            </umb-editor-view>
-
-        </form>
-
-    </div>
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbEditorSubHeader umbEditorSubHeader}</li>
-    <li>{@link umbraco.directives.directive:umbEditorSubHeaderContentLeft umbEditorSubHeaderContentLeft}</li>
-    <li>{@link umbraco.directives.directive:umbEditorSubHeaderSection umbEditorSubHeaderSection}</li>
-</ul>
-**/
-
-(function() {
-   'use strict';
-
-   function EditorSubHeaderContentRightDirective() {
-
-      var directive = {
-         transclude: true,
-         restrict: 'E',
-         replace: true,
-         templateUrl: 'views/components/editor/subheader/umb-editor-sub-header-content-right.html'
-      };
-
-      return directive;
-   }
-
-   angular.module('umbraco.directives').directive('umbEditorSubHeaderContentRight', EditorSubHeaderContentRightDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/subheader/umbeditorsubheadersection.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/subheader/umbeditorsubheadersection.directive.js
deleted file mode 100644
index 7243abeea2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/subheader/umbeditorsubheadersection.directive.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbEditorSubHeaderSection
-@restrict E
-
-@description
-Use this directive to create sections, divided by borders, in a sub header in the main editor window.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="MySection.Controller as vm">
-
-        <form name="mySectionForm" novalidate>
-
-            <umb-editor-view>
-
-                <umb-editor-container>
-
-                    <umb-editor-sub-header>
-
-                        <umb-editor-sub-header-content-right>
-
-                            <umb-editor-sub-header-section>
-                                // section content here
-                            </umb-editor-sub-header-section>
-
-                            <umb-editor-sub-header-section>
-                                // section content here
-                            </umb-editor-sub-header-section>
-
-                            <umb-editor-sub-header-section>
-                                // section content here
-                            </umb-editor-sub-header-section>
-
-                        </umb-editor-sub-header-content-right>
-
-                    </umb-editor-sub-header>
-
-                </umb-editor-container>
-
-            </umb-editor-view>
-
-        </form>
-
-    </div>
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbEditorSubHeader umbEditorSubHeader}</li>
-    <li>{@link umbraco.directives.directive:umbEditorSubHeaderContentLeft umbEditorSubHeaderContentLeft}</li>
-    <li>{@link umbraco.directives.directive:umbEditorSubHeaderContentRight umbEditorSubHeaderContentRight}</li>
-</ul>
-**/
-
-(function() {
-   'use strict';
-
-   function EditorSubHeaderSectionDirective() {
-
-      var directive = {
-         transclude: true,
-         restrict: 'E',
-         replace: true,
-         templateUrl: 'views/components/editor/subheader/umb-editor-sub-header-section.html'
-      };
-
-      return directive;
-   }
-
-   angular.module('umbraco.directives').directive('umbEditorSubHeaderSection', EditorSubHeaderSectionDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbbreadcrumbs.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbbreadcrumbs.directive.js
deleted file mode 100644
index 1be2bb9739..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbbreadcrumbs.directive.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbBreadcrumbs
-@restrict E
-@scope
-
-@description
-Use this directive to generate a list of breadcrumbs.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-        <umb-breadcrumbs
-            ng-if="vm.ancestors && vm.ancestors.length > 0"
-            ancestors="vm.ancestors"
-            entity-type="content"
-            on-open="clickBreadcrumb(ancestor)">
-        </umb-breadcrumbs>
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller(myService) {
-
-            var vm = this;
-            vm.ancestors = [];
-
-            myService.getAncestors().then(function(ancestors){
-                vm.ancestors = ancestors;
-            });
-
-            $scope.clickBreadcrumb = function(ancestor) {
-                // manipulate breadcrumb display
-            }
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-
-@param {array} ancestors Array of ancestors
-@param {string} entityType The content entity type (member, media, content).
-@param {callback=} onOpen Function callback when an ancestor is clicked. This will override the default link behaviour.
-**/
-
-(function () {
-    'use strict';
-
-    function BreadcrumbsDirective($location, navigationService) {
-
-        function link(scope, el, attr, ctrl) {
-
-            scope.allowOnOpen = false;
-
-            scope.open = function(ancestor) {
-                if(scope.onOpen && scope.allowOnOpen) {
-                    scope.onOpen({'ancestor': ancestor});
-                }
-            };
-
-            scope.openPath = function (ancestor, event) {
-                // targeting a new tab/window?
-                if (event.ctrlKey || 
-                    event.shiftKey ||
-                    event.metaKey || // apple
-                    (event.button && event.button === 1) // middle click, >IE9 + everyone else
-                ) {
-                    // yes, let the link open itself
-                    return;
-                }
-                event.stopPropagation();
-                event.preventDefault();
-
-                var path = scope.pathTo(ancestor);
-                $location.path(path);
-                navigationService.clearSearch(["cculture", "csegment"]);
-            }
-
-            scope.pathTo = function (ancestor) {
-                return "/" + scope.entityType + "/" + scope.entityType + "/edit/" + ancestor.id;
-            }
-
-            function onInit() {
-                if ("onOpen" in attr) {
-                    scope.allowOnOpen = true;
-                }
-            }
-            
-            onInit();
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/editor/umb-breadcrumbs.html',
-            scope: {
-                ancestors: "=",
-                forNewEntity: "=",
-                entityType: "@",
-                onOpen: "&"
-            },
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbBreadcrumbs', BreadcrumbsDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditor.directive.js
deleted file mode 100644
index fc78869cf4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditor.directive.js
+++ /dev/null
@@ -1,21 +0,0 @@
-(function () {
-    'use strict';
-
-    function EditorDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/editor/umb-editor.html',
-            scope: {
-                model: "="
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbEditor', EditorDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontainer.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontainer.directive.js
deleted file mode 100644
index b7bcfa9eb4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontainer.directive.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbEditorContainer
-@restrict E
-
-@description
-Use this directive to construct a main content area inside the main editor window.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="Umbraco.Controller as vm">
-
-        <umb-editor-view>
-
-            <umb-editor-header
-                // header configuration>
-            </umb-editor-header>
-
-            <umb-editor-container>
-                // main content here
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                // footer content here
-            </umb-editor-footer>
-
-        </umb-editor-view>
-
-    </div>
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbEditorView umbEditorView}</li>
-    <li>{@link umbraco.directives.directive:umbEditorHeader umbEditorHeader}</li>
-    <li>{@link umbraco.directives.directive:umbEditorFooter umbEditorFooter}</li>
-</ul>
-**/
-
-(function () {
-    'use strict';
-
-    function EditorContainerDirective(overlayHelper) {
-
-        function link(scope, el, attr, ctrl) {
-
-            scope.numberOfOverlays = 0;
-
-            // TODO: this shouldn't be a watch, this should be based on an event handler
-            scope.$watch(function () {
-                return overlayHelper.getNumberOfOverlays();
-            }, function (newValue) {
-                scope.numberOfOverlays = newValue;
-            });
-
-        }
-
-        var directive = {
-            transclude: true,
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/editor/umb-editor-container.html',
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbEditorContainer', EditorContainerDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
deleted file mode 100644
index 61e3e0283f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
+++ /dev/null
@@ -1,267 +0,0 @@
-(function () {
-    'use strict';
-
-    function EditorContentHeader(serverValidationManager, localizationService, editorState, contentEditingHelper, contentTypeHelper) {
-        function link(scope) {
-
-            var unsubscribe = [];
-
-            if (!scope.serverValidationNameField) {
-                scope.serverValidationNameField = "Name";
-            }
-            if (!scope.serverValidationAliasField) {
-                scope.serverValidationAliasField = "Alias";
-            }
-
-            scope.isNew = scope.editor.content.state == "NotCreated";
-
-            localizationService.localizeMany(
-                [
-                    scope.isNew ? "placeholders_a11yCreateItem" : "placeholders_a11yEdit",
-                    "placeholders_a11yName",
-                    scope.isNew ? "general_new" : "general_edit"
-                ]
-            ).then(function (data) {
-                scope.a11yMessage = data[0];
-                scope.a11yName = data[1];
-                var title = data[2] + ": ";
-                if (!scope.isNew) {
-                    scope.a11yMessage += " " + scope.editor.content.name;
-                    title += scope.editor.content.name;
-                } else {
-                    var name = editorState.current.contentTypeName;
-                    scope.a11yMessage += " " + name;
-                    scope.a11yName = name + " " + scope.a11yName;
-                    title += name;
-                }
-
-                scope.$emit("$changeTitle", title);
-            });
-            scope.vm = {};
-            scope.vm.hasVariants = false;
-            scope.vm.hasSubVariants = false;
-            scope.vm.hasCulture = false;
-            scope.vm.hasSegments = false;
-            scope.vm.dropdownOpen = false;
-            scope.vm.variantsWithError = [];
-            scope.vm.defaultVariant = null;
-            scope.vm.errorsOnOtherVariants = false;// indicating wether to show that other variants, than the current, have errors.
-
-            function updateVaraintErrors() {
-                scope.content.variants.forEach(function (variant) {
-                    variant.hasError = scope.variantHasError(variant);
-
-                });
-                checkErrorsOnOtherVariants();
-            }
-
-            function checkErrorsOnOtherVariants() {
-                var check = false;
-                scope.content.variants.forEach(function (variant) {
-                    if (variant.active !== true && variant.hasError) {
-                        check = true;
-                    }
-                });
-                scope.vm.errorsOnOtherVariants = check;
-            }
-
-            function onVariantValidation(valid, errors, allErrors, culture, segment) {
-
-                // only want to react to property errors:
-                if (errors.findIndex(error => { return error.propertyAlias !== null; }) === -1) {
-                    // we dont have any errors for properties, meaning we will back out.
-                    return;
-                }
-
-                // If error coming back is invariant, we will assign the error to the default variant by picking the defaultVariant language.
-                if (culture === "invariant" && scope.vm.defaultVariant) {
-                    culture = scope.vm.defaultVariant.language.culture;
-                }
-
-                var index = scope.vm.variantsWithError.findIndex((item) => item.culture === culture && item.segment === segment)
-                if (valid === true) {
-                    if (index !== -1) {
-                        scope.vm.variantsWithError.splice(index, 1);
-                    }
-                } else {
-                    if (index === -1) {
-                        scope.vm.variantsWithError.push({ "culture": culture, "segment": segment });
-                    }
-                }
-                scope.$evalAsync(updateVaraintErrors);
-            }
-
-            function onInit() {
-                // find default + check if we have variants.
-                scope.content.variants.forEach(function (variant) {
-                    if (variant.language !== null && variant.language.isDefault) {
-                        scope.vm.defaultVariant = variant;
-                    }
-                    if (variant.language !== null) {
-                        scope.vm.hasCulture = true;
-                    }
-                    if (variant.segment !== null) {
-                        scope.vm.hasSegments = true;
-                    }
-                });
-
-                scope.vm.hasVariants = scope.content.variants.length > 1 && (scope.vm.hasCulture || scope.vm.hasSegments);
-                scope.vm.hasSubVariants = scope.content.variants.length > 1 &&(scope.vm.hasCulture && scope.vm.hasSegments);
-
-                updateVaraintErrors();
-
-                scope.vm.variantMenu = [];
-                if (scope.vm.hasCulture) {
-                    scope.content.variants.forEach((v) => {
-                        if (v.language !== null && v.segment === null) {
-                            const subVariants = scope.content.variants.filter((subVariant) => subVariant.language.culture === v.language.culture && subVariant.segment !== null).sort(contentEditingHelper.sortVariants);
-
-                            var variantMenuEntry = {
-                                key: String.CreateGuid(),
-                                open: v.language && v.language.culture === scope.editor.culture,
-                                variant: v,
-                                subVariants
-                            };
-                            scope.vm.variantMenu.push(variantMenuEntry);
-                        }
-                    });
-                } else {
-                    scope.content.variants.forEach((v) => {
-                        scope.vm.variantMenu.push({
-                            key: String.CreateGuid(),
-                            variant: v
-                        });
-                    });
-                }
-
-                scope.editor.variantApps.forEach((app) => {
-                    // only render quick links on the content app if there are no tabs
-                    if (app.alias === "umbContent") {
-                        const hasTabs = scope.editor.content.tabs && scope.editor.content.tabs.filter(group => group.type === contentTypeHelper.TYPE_TAB).length > 0;
-                        app.anchors = hasTabs ? [] : scope.editor.content.tabs;
-                    }
-                });
-
-                scope.content.variants.forEach(function (variant) {
-
-                    // if we are looking for the variant with default language then we also want to check for invariant variant.
-                    if (variant.language && scope.vm.defaultVariant && variant.language.culture === scope.vm.defaultVariant.language.culture && variant.segment === null) {
-                        unsubscribe.push(serverValidationManager.subscribe(null, "invariant", null, onVariantValidation, null));
-                    }
-                    unsubscribe.push(serverValidationManager.subscribe(null, variant.language !== null ? variant.language.culture : null, null, onVariantValidation, variant.segment));
-                });
-                
-                scope.vm.variantMenu.sort(sortVariantsMenu);
-            }
-
-            function sortVariantsMenu (a, b) {
-                return contentEditingHelper.sortVariants(a.variant, b.variant);
-            }
-
-            scope.goBack = function () {
-                if (scope.onBack) {
-                    scope.onBack();
-                }
-            };
-
-            scope.selectVariant = function (event, variant) {
-
-                if (scope.onSelectVariant) {
-                    scope.vm.dropdownOpen = false;
-                    scope.onSelectVariant({ "variant": variant });
-                }
-            };
-
-            scope.selectNavigationItem = function (item) {
-                if (scope.onSelectNavigationItem) {
-                    scope.onSelectNavigationItem({ "item": item });
-                }
-            }
-
-            scope.selectAnchorItem = function (item, anchor) {
-                if (scope.onSelectAnchorItem) {
-                    scope.onSelectAnchorItem({ "item": item, "anchor": anchor });
-                }
-            }
-
-            scope.closeSplitView = function () {
-                if (scope.onCloseSplitView) {
-                    scope.onCloseSplitView();
-                }
-            };
-
-            scope.openInSplitView = function (event, variant) {
-                if (scope.onOpenInSplitView) {
-                    scope.vm.dropdownOpen = false;
-                    scope.onOpenInSplitView({ "variant": variant });
-                }
-            };
-
-            /**
-             * Check whether a variant has a error, used to display errors in variant switcher.
-             * @param {any} culture
-             */
-            scope.variantHasError = function (variant) {
-                if (scope.vm.variantsWithError.find((item) => (!variant.language || item.culture === variant.language.culture) && item.segment === variant.segment) !== undefined) {
-                    return true;
-                }
-                return false;
-            }
-
-            scope.toggleDropdown = function () {
-                scope.vm.dropdownOpen = !scope.vm.dropdownOpen;
-                
-                if (scope.vm.dropdownOpen) {
-                    scope.vm.variantMenu.sort(sortVariantsMenu);
-                }
-            };
-
-            unsubscribe.push(scope.$watch('splitViewOpen', (newVal) => {
-                scope.vm.navigationItemLimit = newVal === true ? 0 : undefined;
-            }));
-
-            onInit();
-
-            scope.$on('$destroy', function () {
-                for (var u in unsubscribe) {
-                    unsubscribe[u]();
-                }
-            });
-        }
-
-
-        var directive = {
-            transclude: true,
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/editor/umb-editor-content-header.html',
-            scope: {
-                name: "=",
-                nameDisabled: "<?",
-                nameReadonly: "<?",
-                menu: "=",
-                hideActionsMenu: "<?",
-                disableActionsMenu: "<?",
-                content: "=",
-                editor: "=",
-                hideChangeVariant: "<?",
-                onSelectNavigationItem: "&?",
-                onSelectAnchorItem: "&?",
-                showBackButton: "<?",
-                onBack: "&?",
-                splitViewOpen: "=?",
-                onOpenInSplitView: "&?",
-                onCloseSplitView: "&?",
-                onSelectVariant: "&?",
-                serverValidationNameField: "@?",
-                serverValidationAliasField: "@?"
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbEditorContentHeader', EditorContentHeader);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorfooter.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorfooter.directive.js
deleted file mode 100644
index b642f0724a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorfooter.directive.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbEditorFooter
-@restrict E
-
-@description
-Use this directive to construct a footer inside the main editor window.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="MySection.Controller as vm">
-
-        <form name="mySectionForm" novalidate>
-
-            <umb-editor-view>
-
-                <umb-editor-header
-                    // header configuration>
-                </umb-editor-header>
-
-                <umb-editor-container>
-                    // main content here
-                </umb-editor-container>
-
-                <umb-editor-footer>
-                    // footer content here
-                </umb-editor-footer>
-
-            </umb-editor-view>
-
-        </form>
-
-    </div>
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbEditorView umbEditorView}</li>
-    <li>{@link umbraco.directives.directive:umbEditorHeader umbEditorHeader}</li>
-    <li>{@link umbraco.directives.directive:umbEditorContainer umbEditorContainer}</li>
-    <li>{@link umbraco.directives.directive:umbEditorFooterContentLeft umbEditorFooterContentLeft}</li>
-    <li>{@link umbraco.directives.directive:umbEditorFooterContentRight umbEditorFooterContentRight}</li>
-</ul>
-**/
-
-(function() {
-   'use strict';
-
-   function EditorFooterDirective() {
-
-      var directive = {
-         transclude: true,
-         restrict: 'E',
-         replace: true,
-         templateUrl: 'views/components/editor/umb-editor-footer.html'
-      };
-
-      return directive;
-   }
-
-   angular.module('umbraco.directives').directive('umbEditorFooter', EditorFooterDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorfootercontentleft.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorfootercontentleft.directive.js
deleted file mode 100644
index 630146184c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorfootercontentleft.directive.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbEditorFooterContentLeft
-@restrict E
-
-@description
-Use this directive to align content left inside the main editor footer.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="MySection.Controller as vm">
-
-        <form name="mySectionForm" novalidate>
-
-            <umb-editor-view>
-
-                <umb-editor-footer>
-
-                    <umb-editor-footer-content-left>
-                        // align content left
-                    </umb-editor-footer-content-left>
-
-                    <umb-editor-footer-content-right>
-                        // align content right
-                    </umb-editor-footer-content-right>
-
-                </umb-editor-footer>
-
-            </umb-editor-view>
-
-        </form>
-
-    </div>
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbEditorView umbEditorView}</li>
-    <li>{@link umbraco.directives.directive:umbEditorHeader umbEditorHeader}</li>
-    <li>{@link umbraco.directives.directive:umbEditorContainer umbEditorContainer}</li>
-    <li>{@link umbraco.directives.directive:umbEditorFooter umbEditorFooter}</li>
-    <li>{@link umbraco.directives.directive:umbEditorFooterContentRight umbEditorFooterContentRight}</li>
-</ul>
-**/
-
-(function() {
-   'use strict';
-
-   function EditorFooterContentLeftDirective() {
-
-      var directive = {
-         transclude: true,
-         restrict: 'E',
-         replace: true,
-         templateUrl: 'views/components/editor/umb-editor-footer-content-left.html'
-      };
-
-      return directive;
-   }
-
-   angular.module('umbraco.directives').directive('umbEditorFooterContentLeft', EditorFooterContentLeftDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorfootercontentright.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorfootercontentright.directive.js
deleted file mode 100644
index e966a871e9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorfootercontentright.directive.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbEditorFooterContentRight
-@restrict E
-
-@description
-Use this directive to align content right inside the main editor footer.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="MySection.Controller as vm">
-
-        <form name="mySectionForm" novalidate>
-
-            <umb-editor-view>
-
-                <umb-editor-footer>
-
-                    <umb-editor-footer-content-left>
-                        // align content left
-                    </umb-editor-footer-content-left>
-
-                    <umb-editor-footer-content-right>
-                        // align content right
-                    </umb-editor-footer-content-right>
-
-                </umb-editor-footer>
-
-            </umb-editor-view>
-
-        </form>
-
-    </div>
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbEditorView umbEditorView}</li>
-    <li>{@link umbraco.directives.directive:umbEditorHeader umbEditorHeader}</li>
-    <li>{@link umbraco.directives.directive:umbEditorContainer umbEditorContainer}</li>
-    <li>{@link umbraco.directives.directive:umbEditorFooter umbEditorFooter}</li>
-    <li>{@link umbraco.directives.directive:umbEditorFooterContentLeft umbEditorFooterContentLeft}</li>
-</ul>
-**/
-
-(function() {
-   'use strict';
-
-   function EditorFooterContentRightDirective() {
-
-      var directive = {
-         transclude: true,
-         restrict: 'E',
-         replace: true,
-         templateUrl: 'views/components/editor/umb-editor-footer-content-right.html'
-      };
-
-      return directive;
-   }
-
-   angular.module('umbraco.directives').directive('umbEditorFooterContentRight', EditorFooterContentRightDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
deleted file mode 100644
index 94d35cb04b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
+++ /dev/null
@@ -1,417 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbEditorHeader
-@restrict E
-@scope
-
-@description
-Use this directive to construct a header inside the main editor window.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="MySection.Controller as vm">
-
-        <form name="mySectionForm" novalidate>
-
-            <umb-editor-view>
-
-                <umb-editor-header
-                    name="vm.content.name"
-                    hide-alias="true"
-                    hide-description="true"
-                    hide-icon="true">
-                </umb-editor-header>
-
-                <umb-editor-container>
-                    // main content here
-                </umb-editor-container>
-
-                <umb-editor-footer>
-                    // footer content here
-                </umb-editor-footer>
-
-            </umb-editor-view>
-
-        </form>
-
-    </div>
-</pre>
-
-<h3>Markup example - with tabs</h3>
-<pre>
-    <div ng-controller="MySection.Controller as vm">
-
-        <form name="mySectionForm" val-form-manager novalidate>
-
-            <umb-editor-view umb-tabs>
-
-                <umb-editor-header
-                    name="vm.content.name"
-                    tabs="vm.content.tabs"
-                    hide-alias="true"
-                    hide-description="true"
-                    hide-icon="true">
-                </umb-editor-header>
-
-                <umb-editor-container>
-                    <umb-tabs-content class="form-horizontal" view="true">
-                        <umb-tab id="tab{{tab.id}}" ng-repeat="tab in vm.content.tabs" rel="{{tab.id}}">
-
-                            <div ng-show="tab.alias==='tab1'">
-                                // tab 1 content
-                            </div>
-
-                            <div ng-show="tab.alias==='tab2'">
-                                // tab 2 content
-                            </div>
-
-                        </umb-tab>
-                    </umb-tabs-content>
-                </umb-editor-container>
-
-                <umb-editor-footer>
-                    // footer content here
-                </umb-editor-footer>
-
-            </umb-editor-view>
-
-        </form>
-
-    </div>
-</pre>
-
-<h3>Controller example - with tabs</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-            vm.content = {
-                name: "",
-                tabs: [
-                    {
-                        id: 1,
-                        label: "Tab 1",
-                        alias: "tab1",
-                        active: true
-                    },
-                    {
-                        id: 2,
-                        label: "Tab 2",
-                        alias: "tab2",
-                        active: false
-                    }
-                ]
-            };
-
-        }
-
-        angular.module("umbraco").controller("MySection.Controller", Controller);
-    })();
-</pre>
-
-<h3>Markup example - with sub views</h3>
-<pre>
-    <div ng-controller="MySection.Controller as vm">
-
-        <form name="mySectionForm" val-form-manager novalidate>
-
-            <umb-editor-view>
-
-                <umb-editor-header
-                    name="vm.content.name"
-                    navigation="vm.content.navigation"
-                    hide-alias="true"
-                    hide-description="true"
-                    hide-icon="true">
-                </umb-editor-header>
-
-                <umb-editor-container>
-
-                    <umb-editor-sub-views
-                        sub-views="vm.content.navigation"
-                        model="vm.content">
-                    </umb-editor-sub-views>
-
-                </umb-editor-container>
-
-                <umb-editor-footer>
-                    // footer content here
-                </umb-editor-footer>
-
-            </umb-editor-view>
-
-        </form>
-
-    </div>
-</pre>
-
-<h3>Controller example - with sub views</h3>
-<pre>
-    (function () {
-
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-            vm.content = {
-                name: "",
-                navigation: [
-                    {
-                        "alias": "section1",
-                        "name": "Section 1",
-                        "icon": "icon-document-dashed-line",
-                        "view": "/App_Plugins/path/to/html.html",
-                        "active": true
-                    },
-                    {
-                        "alias": "section2",
-                        "name": "Section 2",
-                        "icon": "icon-list",
-                        "view": "/App_Plugins/path/to/html.html",
-                    }
-                ]
-            };
-
-        }
-
-        angular.module("umbraco").controller("MySection.Controller", Controller);
-    })();
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbEditorView umbEditorView}</li>
-    <li>{@link umbraco.directives.directive:umbEditorContainer umbEditorContainer}</li>
-    <li>{@link umbraco.directives.directive:umbEditorFooter umbEditorFooter}</li>
-</ul>
-
-@param {string} name The content name.
-@param {boolean=} nameRequired Require name to be defined. (True by default)
-@param {array=} tabs Array of tabs. See example above.
-@param {array=} navigation Array of sub views. See example above.
-@param {boolean=} nameLocked Set to <code>true</code> to lock the name.
-@param {number=} nameMaxLength Maximum length of the name.
-@param {object=} menu Add a context menu to the editor.
-@param {string=} icon Show and edit the content icon. Opens an overlay to change the icon.
-@param {boolean=} hideIcon Set to <code>true</code> to hide icon.
-@param {string=} alias show and edit the content alias.
-@param {boolean=} aliasLocked Set to <code>true</code> to lock the alias.
-@param {boolean=} hideAlias Set to <code>true</code> to hide alias.
-@param {string=} description Add a description to the content.
-@param {boolean=} descriptionLocked Set to <code>true</code> to lock the description.
-@param {boolean=} hideDescription Set to <code>true</code> to hide description.
-@param {boolean=} setpagetitle If true the page title will be set to reflect the type of data the header is working with
-@param {string=} editorfor The localization to use to aid accessibility on the edit and create screen
-@param {boolean=} loading Whether a loading indicator should be shown as part of the header.
-**/
-
-(function () {
-    'use strict';
-
-    function EditorHeaderDirective(editorService, localizationService, editorState, $rootScope) {
-
-        function link(scope) {
-
-            scope.vm = {};
-            scope.vm.dropdownOpen = false;
-            scope.vm.currentVariant = "";
-            scope.initializing = true;
-            scope.accessibility = {};
-            scope.accessibility.a11yMessage = "";
-            scope.accessibility.a11yName = "";
-            scope.accessibility.a11yMessageVisible = false;
-            scope.accessibility.a11yNameVisible = false;
-
-            // trim the name if required
-            scope.nameMaxLength = scope.nameMaxLength || 255;
-            if (scope.name && scope.name.length > scope.nameMaxLength) {
-                scope.name = scope.name.substring(0, scope.nameMaxLength - 1) + '…';
-            }
-
-            // need to call localizationService service outside of routine to set a11y due to promise requirements
-            if (editorState.current) {
-                //to do make work for user create/edit
-                // to do make it work for user group create/ edit
-                // to make it work for language edit/create
-                setAccessibilityForEditorState();
-                scope.initializing = false;
-            } else if (scope.name) {
-                setAccessibilityForName();
-                scope.initializing = false;
-            } else {
-                scope.initializing = false;
-            }
-            scope.goBack = function () {
-                if (scope.onBack) {
-                    scope.onBack();
-                }
-            };
-
-            scope.selectNavigationItem = function(item) {
-                if(scope.onSelectNavigationItem) {
-                    scope.onSelectNavigationItem({"item": item});
-                }
-            }
-
-            scope.openIconPicker = function () {
-                var iconPicker = {
-                    icon: scope.icon.split(' ')[0],
-                    color: scope.icon.split(' ')[1],
-                    size: "medium",
-                    submit: function (model) {
-                        if (model.icon) {
-                            if (model.color) {
-                                scope.icon = model.icon + " " + model.color;
-                            } else {
-                                scope.icon = model.icon;
-                            }
-                            // set the icon form to dirty
-                            scope.iconForm.$setDirty();
-                        }
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-                editorService.iconPicker(iconPicker);
-            };
-
-            function setAccessibilityForName() {
-                var setTitle = false;
-                if (scope.setpagetitle !== undefined) {
-                    setTitle = scope.setpagetitle;
-                }
-                if (setTitle) {
-                    setAccessibilityHeaderDirective(false, scope.editorfor, scope.nameLocked, scope.name, "", true);
-                }
-            }
-            function setAccessibilityForEditorState() {
-                var isNew = editorState.current.id === 0 ||
-                    editorState.current.id === "0" ||
-                    editorState.current.id === -1 ||
-                    editorState.current.id === 0 ||
-                    editorState.current.id === "-1";
-
-                var contentTypeName = "";
-                if (editorState.current.contentTypeName) {
-                    contentTypeName = editorState.current.contentTypeName;
-                }
-
-                var setTitle = false;
-                if (scope.setpagetitle !== undefined) {
-                    setTitle = scope.setpagetitle;
-                }
-                setAccessibilityHeaderDirective(isNew, scope.editorfor, scope.nameLocked, scope.name, contentTypeName, setTitle);
-            }
-
-            function setAccessibilityHeaderDirective(isNew, editorFor, nameLocked, entityName, contentTypeName, setTitle) {
-
-                var localizeVars = [
-                    isNew ? "visuallyHiddenTexts_createItem" : "visuallyHiddenTexts_edit",
-                    "visuallyHiddenTexts_name",
-                    isNew ? "general_new" : "general_edit"
-                ];
-
-                if (editorFor) {
-                    localizeVars.push(editorFor);
-                }
-                localizationService.localizeMany(localizeVars).then(function(data) {
-                    if (nameLocked) {
-                        scope.accessibility.a11yName = entityName;
-                        if (setTitle) {
-                            SetPageTitle(entityName);
-                        }
-                    } else {
-
-                        scope.accessibility.a11yMessage = data[0];
-                        scope.accessibility.a11yName = data[1];
-                        var title = data[2] + ":";
-                        if (!isNew) {
-                            scope.accessibility.a11yMessage += " " + entityName;
-                            title += " " + entityName;
-                        } else {
-                            var name = "";
-                            if (contentTypeName) {
-                                name = editorState.current.contentTypeName;
-                            } else if (editorFor) {
-                                name = data[3];
-                            }
-                            if (name !== "") {
-                                scope.accessibility.a11yMessage += " " + name;
-                                scope.accessibility.a11yName = name + " " + scope.accessibility.a11yName;
-                                title += " " + name;
-                            }
-                        }
-                        if (setTitle && title !== data[2] + ":") {
-                            SetPageTitle(title);
-                        }
-
-                    }
-
-                    scope.accessibility.a11yMessageVisible = !isNullOrWhitespace(scope.accessibility.a11yMessage);
-                    scope.accessibility.a11yNameVisible = !isNullOrWhitespace(scope.accessibility.a11yName);
-
-                });
-            }
-
-            function isNullOrWhitespace(str) {
-               return str === null || str === undefined || str.trim() === '';
-            }
-
-            function SetPageTitle(title) {
-                scope.$emit("$changeTitle", title);
-            }
-
-            var unbindEventHandler = $rootScope.$on('$setAccessibleHeader', function (event, isNew, editorFor, nameLocked, name, contentTypeName, setTitle) {
-                setAccessibilityHeaderDirective(isNew, editorFor, nameLocked, name, contentTypeName, setTitle);
-            });
-            scope.$on('$destroy', function () {
-                unbindEventHandler();
-            });
-        }
-
-
-
-        var directive = {
-            transclude: true,
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/editor/umb-editor-header.html',
-            scope: {
-                name: "=",
-                nameLocked: "=",
-                nameRequired: "=?",
-                nameMaxLength: "=?",
-                menu: "=",
-                hideActionsMenu: "<?",
-                icon: "=",
-                hideIcon: "@",
-                alias: "=",
-                aliasLocked: "<",
-                hideAlias: "=",
-                description: "=",
-                hideDescription: "@",
-                descriptionLocked: "@",
-                navigation: "=",
-                onSelectNavigationItem: "&?",
-                key: "=",
-                onBack: "&?",
-                showBackButton: "<?",
-                editorfor: "=",
-                setpagetitle: "=",
-                loading: "="
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbEditorHeader', EditorHeaderDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
deleted file mode 100644
index 37ce9096f6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditormenu.directive.js
+++ /dev/null
@@ -1,69 +0,0 @@
-(function () {
-    'use strict';
-
-    function EditorMenuDirective(treeService, navigationService, appState) {
-
-        function link(scope, el, attr, ctrl) {
-
-            scope.dropdown = {
-                isOpen: false
-            };
-
-            function onInit() {
-
-                getOptions();
-
-            }
-
-            //adds a handler to the context menu item click, we need to handle this differently
-            //depending on what the menu item is supposed to do.
-            scope.executeMenuItem = action => {
-                //the action is called as it would be by the tree. to ensure that the action targets the correct node, 
-                //we need to set the current node in appState before calling the action. otherwise we break all actions
-                //that use the current node (and that's pretty much all of them)
-                appState.setMenuState("currentNode", scope.currentNode);                
-                navigationService.executeMenuAction(action, scope.currentNode, scope.currentSection);
-                scope.dropdown.isOpen = false;
-            };
-
-            //callback method to go and get the options async
-            function getOptions() {
-
-                if (!scope.currentNode) {
-                    return;
-                }
-
-                if (!scope.actions) {
-                    treeService.getMenu({ treeNode: scope.currentNode }).then(data => {
-                        scope.actions = data.menuItems;
-
-                        // Map action icons using legacy icon font or svg icons.
-                        Utilities.forEach(scope.actions, action => {
-                          action.icon = (action.useLegacyIcon ? 'icon-' : '') + action.icon;
-                        });
-                    });
-                }
-            };
-
-            onInit();
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/editor/umb-editor-menu.html',
-            link: link,
-            scope: {
-                currentNode: "=",
-                currentSection: "@",
-                isDisabled: "<?"
-            }
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbEditorMenu', EditorMenuDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
deleted file mode 100644
index f80770c902..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js
+++ /dev/null
@@ -1,183 +0,0 @@
-(function () {
-    'use strict';
-
-    function EditorNavigationDirective($window, $timeout, eventsService, windowResizeListener) {
-
-        function link(scope) {
-
-            const unsubscribe = [];
-
-            scope.showNavigation = true;
-            scope.showMoreButton = false;
-            scope.showDropdown = false;
-            scope.overflowingItems = 0;
-            scope.itemsLimit = Number.isInteger(scope.limit) ? scope.limit : 6;
-
-            scope.moreButton = {
-                alias: "more",
-                active: false,
-                name: "More"
-            };
-
-            scope.openNavigationItem = item => {
-                
-                scope.showDropdown = false;
-                runItemAction(item);
-                setItemToActive(item);
-                if (scope.onSelect) {
-                    scope.onSelect({"item": item});
-                }
-                eventsService.emit("app.tabChange", item);
-            };
-
-            scope.openAnchorItem = (item, anchor) => {
-                if (scope.onAnchorSelect) {
-                    scope.onAnchorSelect({"item": item, "anchor": anchor});
-                }
-                if (item.active !== true) {
-                    scope.openNavigationItem(item);
-                }
-            };
-
-            scope.toggleDropdown = () => {
-                scope.showDropdown = !scope.showDropdown;
-            };
-
-            scope.hideDropdown = () => {
-                scope.showDropdown = false;
-            };
-
-            function onInit() {
-                var firstRun = true;
-                calculateVisibleItems($window.innerWidth);
-;
-                unsubscribe.push(scope.$watch("navigation", (newVal, oldVal) => {
-                    const newLength = newVal.length;
-                    const oldLength = oldVal.length;
-
-                    if (firstRun || newLength !== undefined && newLength !== oldLength) {
-                        firstRun = false;
-                        scope.showNavigation = newLength > 1;
-                        calculateVisibleItems($window.innerWidth);
-                    }
-
-                    setMoreButtonErrorState();
-                }, true));
-            }
-
-            function calculateVisibleItems(windowWidth) {
-                // if we don't get a windowWidth stick with the default item limit
-                if (!windowWidth) {
-                    return;
-                }
-
-                // if we haven't set a specific limit prop we base the amount of visible items on the window width
-                if (scope.limit === undefined) {
-                    scope.itemsLimit = 0;
-
-                    // set visible items based on browser width
-                    if (windowWidth > 1500) {
-                        scope.itemsLimit = 6;
-                    } 
-                    else if (windowWidth > 700) {
-                        scope.itemsLimit = 4;
-                    }
-                }
-
-                // toggle more button
-                if(scope.navigation.length > scope.itemsLimit) {
-                    scope.showMoreButton = true;
-                    scope.overflowingItems = scope.itemsLimit - scope.navigation.length;
-                } else {
-                    scope.showMoreButton = false;
-                    scope.overflowingItems = 0;
-                }
-
-                scope.moreButton.name = scope.itemsLimit === 0 ? "Menu" : "More";
-                setMoreButtonActiveState();
-                setMoreButtonErrorState();
-            }
-
-            function runItemAction(selectedItem) {
-                if (selectedItem.action) {
-                    selectedItem.action(selectedItem);
-                }
-            }
-
-            function setItemToActive(selectedItem) {
-                if (selectedItem.view) {
-                    
-                    // deselect all items
-                    Utilities.forEach(scope.navigation, item => {
-                        item.active = false;
-                    });
-                    
-                    // set clicked item to active
-                    selectedItem.active = true;
-                    setMoreButtonActiveState();
-                    setMoreButtonErrorState();
-                }
-            }
-
-            function setMoreButtonActiveState() {
-                // set active state on more button if any of the overflown items is active
-                scope.moreButton.active = scope.navigation.findIndex(item => item.active) + 1 > scope.itemsLimit;
-            };
-
-            function setMoreButtonErrorState() {
-                if (scope.overflowingItems === 0) {
-                    return;
-                }
-
-                const overflow = scope.navigation.slice(scope.itemsLimit, scope.navigation.length);
-                const active = scope.navigation.find(item => item.active)
-                // set error state on more button if any of the overflown items has an error. We use it show the error badge and color the item
-                scope.moreButton.hasError = overflow.filter(item => item.hasError).length > 0;
-                // set special active/error state on button if the current selected item is has an error
-                // we don't want to show the error badge in this case so we need a special state for that
-                scope.moreButton.activeHasError = active.hasError;
-            };
-
-            var resizeCallback = size => {
-                if (size && size.width) {
-                    calculateVisibleItems(size.width);
-                }
-            };
-
-            windowResizeListener.register(resizeCallback);
-
-            unsubscribe.push(scope.$watch('limit', (newVal) => {
-                scope.itemsLimit = newVal;
-                calculateVisibleItems($window.innerWidth);
-            }));
-
-            scope.$on('$destroy', function () {
-                windowResizeListener.unregister(resizeCallback);
-
-                for (var u in unsubscribe) {
-                    unsubscribe[u]();
-                }
-            });
-
-            onInit();
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/editor/umb-editor-navigation.html',
-            scope: {
-                navigation: "=",
-                onSelect: "&",
-                onAnchorSelect: "&",
-                limit: "<"
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives.html').directive('umbEditorNavigation', EditorNavigationDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
deleted file mode 100644
index 11ebd9dc3f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js
+++ /dev/null
@@ -1,54 +0,0 @@
-(function () {
-    'use strict';
-    
-    function UmbEditorNavigationItemController($scope, $element, $attrs) {
-        
-        var vm = this;
-
-        vm.close = function () {
-            vm.expanded = false;
-        };
-
-        vm.clicked = function () {
-            vm.expanded = vm.item.anchors && vm.item.anchors.length > 1 && !vm.expanded;
-            vm.onOpen({item:vm.item});
-        };
-        
-        vm.anchorClicked = function(anchor, $event) {
-            vm.onOpenAnchor({item:vm.item, anchor:anchor});
-            $event.stopPropagation();
-            $event.preventDefault();
-        };
-        
-        // needed to make sure that we update what anchors are active.
-        vm.mouseOver = function() {
-            $scope.$digest();
-        }
-        
-        var componentNode = $element[0];
-        
-        componentNode.classList.add('umb-sub-views-nav-item');
-        componentNode.addEventListener('mouseover', vm.mouseOver);
-
-        //ensure to unregister from all dom-events
-        $scope.$on('$destroy', function () {
-            componentNode.removeEventListener("mouseover", vm.mouseOver);
-        });
-        
-    }
-    
-    angular
-        .module('umbraco.directives.html')
-        .component('umbEditorNavigationItem', {
-            templateUrl: 'views/components/editor/umb-editor-navigation-item.html',
-            controller: UmbEditorNavigationItemController,
-            controllerAs: 'vm',
-            bindings: {
-                item: '=',
-                onOpen: '&',
-                onOpenAnchor: '&',
-                hotkey: '<'
-            }
-        });
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
deleted file mode 100644
index 1c9c85b075..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
+++ /dev/null
@@ -1,225 +0,0 @@
-(function () {
-    'use strict';
-
-    function EditorsDirective($timeout, eventsService, focusLockService) {
-
-        function link(scope, el, attr, ctrl) {
-
-            var evts = [];
-            var allowedNumberOfVisibleEditors = 3;
-            var aboveBackDropCssClass = 'above-backdrop';
-            var sectionId = '#leftcolumn';
-            var isLeftColumnAbove = false;
-            scope.editors = [];
-
-            /* we need to keep a count of open editors because the length of the editors array is first changed when animations are done
-             we do this because some infinite editors close more than one editor at the time and we get the wrong count from editors.length
-             because of the animation */
-            let editorCount = 0;
-
-            function addEditor(editor) {
-                editor.inFront = true;
-                editor.moveRight = true;
-                editor.level = 0;
-                editor.styleIndex = 0;
-
-                // push the new editor to the dom
-                scope.editors.push(editor);
-
-                if(scope.editors.length === 1){
-                    isLeftColumnAbove = $(sectionId).hasClass(aboveBackDropCssClass);
-
-                    if(isLeftColumnAbove){
-                        $(sectionId).removeClass(aboveBackDropCssClass);
-                    }
-
-                    // Inert content in the #mainwrapper
-                    focusLockService.addInertAttribute();
-                }
-                
-                $timeout(() => {
-                    editor.moveRight = false;
-                })
-
-                editor.animating = true;
-                setTimeout(revealEditorContent.bind(this, editor), 400);
-
-                updateEditors();
-
-            }
-
-            function removeEditor(editor) {
-                editor.moveRight = true;
-
-                editor.animating = true;
-                setTimeout(removeEditorFromDOM.bind(this, editor), 400);
-
-                updateEditors(-1);
-
-                if(scope.editors.length === 1) {
-                    if(isLeftColumnAbove){
-                        $('#leftcolumn').addClass(aboveBackDropCssClass);
-                    }
-
-                    isLeftColumnAbove = false;
-                }
-
-                // when the last editor is closed remove the focus lock
-                if (editorCount === 0) {
-                    // Remove the inert attribute from the #mainwrapper
-                    focusLockService.removeInertAttribute();
-                }
-            }
-
-            function revealEditorContent(editor) {
-
-                editor.animating = false;
-
-                scope.$digest();
-
-            }
-
-            function removeEditorFromDOM(editor) {
-
-                // push the new editor to the dom
-                var index = scope.editors.indexOf(editor);
-                if (index !== -1) {
-                    scope.editors.splice(index, 1);
-                }
- 
-                updateEditors();
-
-                scope.$digest();
-
-            }
-
-            /** update layer positions. With ability to offset positions, needed for when an item is moving out, then we dont want it to influence positions */
-            function updateEditors(offset) {
-
-                offset = offset || 0;// fallback value.
-
-                var len = scope.editors.length;
-                var calcLen = len + offset;
-                var ceiling = Math.min(calcLen, allowedNumberOfVisibleEditors);
-                var origin = Math.max(calcLen - 1, 0) - ceiling;
-                var i = 0;
-                while (i < len) {
-                    var iEditor = scope.editors[i];
-                    iEditor.styleIndex = Math.min(i + 1, allowedNumberOfVisibleEditors);
-                    iEditor.level = Math.max(i - origin, -1);
-                    iEditor.inFront = iEditor.level >= ceiling;
-                    i++;
-                }
-            }
-
-            evts.push(eventsService.on("appState.editors.open", function (name, args) {
-                editorCount = editorCount + 1;
-                addEditor(args.editor);
-            }));
-
-            evts.push(eventsService.on("appState.editors.close", function (name, args) {
-                // remove the closed editor
-                if (args && args.editor) {
-                    editorCount = editorCount - 1;
-                    removeEditor(args.editor);
-                }
-                // close all editors
-                if (args && !args.editor && args.editors.length === 0) {
-                    editorCount = 0;
-                    scope.editors = [];                    
-                    // Remove the inert attribute from the #mainwrapper
-                    focusLockService.removeInertAttribute();
-                }
-            }));
-
-            //ensure to unregister from all events!
-            scope.$on('$destroy', function () {
-                for (var e in evts) {
-                    eventsService.unsubscribe(evts[e]);
-                }
-            });
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/editor/umb-editors.html',
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    // This directive allows for us to run a custom $compile for the view within the repeater which allows
-    // us to maintain a $scope hierarchy with the rendered view based on the $scope that initiated the
-    // infinite editing. The retain the $scope hiearchy a special $parentScope property is passed in to the model.
-    function EditorRepeaterDirective($http, $templateCache, $compile, angularHelper) {
-        function link(scope, el) {
-
-            var editor = scope && scope.$parent ? scope.$parent.model : null;
-            if (!editor) {
-                return;
-            }
-
-            var unsubscribe = [];
-
-            //if a custom parent scope is defined then we need to manually compile the view
-            if (editor.$parentScope) {
-                var element = el.find(".scoped-view");
-                $http.get(editor.view, { cache: $templateCache })
-                    .then(function (response) {
-                        var templateScope = editor.$parentScope.$new();
-
-                        unsubscribe.push(function () {
-                            templateScope.$destroy();
-                        });
-
-                        // NOTE: the 'model' name here directly affects the naming convention used in infinite editors, this why you access the model
-                        // like $scope.model.If this is changed, everything breaks.This is because we are entirely reliant upon ng-include and inheriting $scopes.
-                        // by default without a $parentScope used for infinite editing the 'model' propety will be set because the view creates the scopes in 
-                        // ng-repeat by ng-repeat="model in editors"
-                        templateScope.model = editor;
-
-                        element.show();
-
-                        // if a parentForm is supplied then we can link them but to do that we need to inject a top level form
-                        if (editor.$parentForm) {
-                            element.html("<ng-form name='infiniteEditorForm'>" + response.data + "</ng-form>");
-                        }
-                        
-                        $compile(element)(templateScope);
-
-                        // if a parentForm is supplied then we can link them
-                        if (editor.$parentForm) {
-                            editor.$parentForm.$addControl(templateScope.infiniteEditorForm);
-                        }
-                    });
-            }
-
-            scope.$on('$destroy', function () {
-                for (var i = 0; i < unsubscribe.length; i++) {
-                    unsubscribe[i]();
-                }
-            });
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            scope: {
-                editors: "="
-            },
-            template: "<div ng-transclude></div>",            
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbEditors', EditorsDirective);
-    angular.module('umbraco.directives').directive('umbEditorRepeater', EditorRepeaterDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorsubview.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorsubview.js
deleted file mode 100644
index 614f421699..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorsubview.js
+++ /dev/null
@@ -1,34 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * A directive that renders a defined view with a view model and a the whole content model.
-     **/
-    function EditorSubViewDirective() {
-
-        function link(scope) {
-            //The model can contain: view, viewModel, name, alias, icon
-
-            if (!scope.model.view) {
-                throw "No view defined for the content app";
-            }
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/editor/umb-editor-sub-view.html',
-            scope: {
-                model: "=",
-                variantContent: "=?",
-                content: "="
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbEditorSubView', EditorSubViewDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorsubviews.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorsubviews.directive.js
deleted file mode 100644
index 7033a03943..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorsubviews.directive.js
+++ /dev/null
@@ -1,31 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * A directive that just repeats over a list of defined views which are all able to access the same common model.
-     * This is only used in simple cases, whereas media and content use umbEditorSubView (singular) which allows
-     * passing in a view model specific to the view and the entire content model for support if required.
-     **/
-    function EditorSubViewsDirective() {
-
-        function link(scope, el, attr, ctrl) {
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/editor/umb-editor-sub-views.html',
-            scope: {
-                subViews: "=",
-                model: "="
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbEditorSubViews', EditorSubViewsDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditortabbar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditortabbar.directive.js
deleted file mode 100644
index 17e0bbf43e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditortabbar.directive.js
+++ /dev/null
@@ -1,22 +0,0 @@
-(function () {
-  'use strict';
-
-  /**
-   * A component to render the editor tab bar
-   */
-  
-  function umbEditorTabBarController() {
-
-    const vm = this;
-
-  }
-
-  const umbEditorTabBarComponent = {
-    templateUrl: 'views/components/editor/umb-editor-tab-bar.html',
-    controllerAs: 'vm',
-    transclude: true,
-    controller: umbEditorTabBarController
-  };
-
-  angular.module('umbraco.directives').component('umbEditorTabBar', umbEditorTabBarComponent);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorview.directive.js
deleted file mode 100644
index 35981049af..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorview.directive.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbEditorView
-@restrict E
-@scope
-
-@description
-Use this directive to construct the main editor window.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="MySection.Controller as vm">
-
-        <form name="mySectionForm" novalidate>
-
-            <umb-editor-view>
-
-                <umb-editor-header
-                    name="vm.content.name"
-                    hide-alias="true"
-                    hide-description="true"
-                    hide-icon="true">
-                </umb-editor-header>
-
-                <umb-editor-container>
-                    // main content here
-                </umb-editor-container>
-
-                <umb-editor-footer>
-                    // footer content here
-                </umb-editor-footer>
-
-            </umb-editor-view>
-
-        </form>
-
-    </div>
-</pre>
-<h3>Controller example</h3>
-<pre>
-    (function () {
-
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-
-        }
-
-        angular.module("umbraco").controller("MySection.Controller", Controller);
-    })();
-</pre>
-
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbEditorHeader umbEditorHeader}</li>
-    <li>{@link umbraco.directives.directive:umbEditorContainer umbEditorContainer}</li>
-    <li>{@link umbraco.directives.directive:umbEditorFooter umbEditorFooter}</li>
-</ul>
-
-@param {boolean} footer Whether the directive should make place for a {@link umbraco.directives.directive:umbEditorFooter umbEditorFooter} at the bottom (`true` by default).
-**/
-
-(function() {
-   'use strict';
-
-   function EditorViewDirective() {
-
-       function link(scope, el, attr) {
-
-           if(attr.footer) {
-               scope.footer = attr.footer;
-           }
-
-       }
-
-      var directive = {
-         transclude: true,
-         restrict: 'E',
-         replace: true,
-         templateUrl: 'views/components/editor/umb-editor-view.html',
-         link: link
-      };
-
-      return directive;
-   }
-
-   angular.module('umbraco.directives').directive('umbEditorView', EditorViewDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/deepBlur.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/deepBlur.directive.js
deleted file mode 100644
index fdff6459c8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/deepBlur.directive.js
+++ /dev/null
@@ -1,45 +0,0 @@
-    // A slightly modified version of https://github.com/myplanet/angular-deep-blur/blob/master/angular-deep-blur.js - Kudos to Ufuk Kayserilioglu (paracycle)
-    (function () {
-        'use strict';
-
-        function DeepBlurDirective($timeout){
-
-            function controller($scope, $element, $attrs) {
-                var leaveExpr = $attrs.deepBlur,
-                    dom = $element[0];
-
-                function containsDom(parent, dom) {
-                    while (dom) {
-                        if (dom === parent) {
-                            return true;
-                        }
-                        dom = dom.parentNode;
-                    }
-                    return false;
-                }
-
-                function onBlur(e) {
-                    var targetElement = e.relatedTarget;
-
-                    if (!containsDom(dom, targetElement)) {
-                        $timeout(function () {
-                            $scope.$apply(leaveExpr);
-                        }, 10);
-                    }
-                }
-
-                dom.addEventListener('blur', onBlur, true);
-            }
-
-            var directive = {
-                restrict: 'A',
-                controller: controller
-            };
-
-            return directive;
-
-        }
-
-        angular.module('umbraco.directives').directive('deepBlur', DeepBlurDirective);
-
-    })();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDelayedMouseleave.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDelayedMouseleave.directive.js
deleted file mode 100644
index 8493e49d77..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDelayedMouseleave.directive.js
+++ /dev/null
@@ -1,49 +0,0 @@
-(function () {
-    'use strict';
-
-    function onDelayedMouseleaveDirective($timeout, $parse){
-
-        function link(scope, element, attrs, ctrl) {
-            var active = false;
-            var fn = $parse(attrs.onDelayedMouseleave);
-
-            var leave_f = function (event) {
-                var callback = function () {
-                    fn(scope, { $event: event });
-                };
-
-                active = false;
-                $timeout(function () {
-                    if (active === false) {
-                        scope.$apply(callback);
-                    }
-                }, 650);
-            };
-
-            var enter_f = function (event, args) {
-                active = true;
-            };
-
-
-            element.on("mouseleave", leave_f);
-            element.on("mouseenter", enter_f);
-
-            //unsub events
-            scope.$on("$destroy", function () {
-                element.off("mouseleave", leave_f);
-                element.off("mouseenter", enter_f);
-            });
-        }
-
-        var directive = {
-            restrict: 'A',
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('onDelayedMouseleave', onDelayedMouseleaveDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragEnd.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragEnd.directive.js
deleted file mode 100644
index 84501e10d6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragEnd.directive.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function () {
-    'use strict';
-
-    function onDragEndDirective(){
-
-        function link(scope, elm, attrs) {
-            var f = function () {
-                scope.$apply(attrs.onDragEnd);
-            };
-            elm.on("dragend", f);
-            scope.$on("$destroy", function () { elm.off("dragend", f); });
-        }
-
-        var directive = {
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('onDragEnd', onDragEndDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragEnter.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragEnter.directive.js
deleted file mode 100644
index 03ae9465d0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragEnter.directive.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function () {
-    'use strict';
-
-    function onDragEnterDirective(){
-
-        function link(scope, elm, attrs) {
-            var f = function () {
-                scope.$apply(attrs.onDragEnter);
-            };
-            elm.on("dragenter", f);
-            scope.$on("$destroy", function () { elm.off("dragenter", f); });
-        }
-
-        var directive = {
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('onDragEnter', onDragEnterDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragLeave.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragLeave.directive.js
deleted file mode 100644
index cd05ed9289..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragLeave.directive.js
+++ /dev/null
@@ -1,40 +0,0 @@
-(function () {
-    'use strict';
-
-    function onDragLeaveDirective($timeout){
-
-        return function (scope, elm, attrs) {
-            var f = function (event) {
-                var rect = this.getBoundingClientRect();
-                var getXY = function getCursorPosition(event) {
-                    var x, y;
-
-                    if (typeof event.clientX === 'undefined') {
-                        // try touch screen
-                        x = event.pageX + document.documentElement.scrollLeft;
-                        y = event.pageY + document.documentElement.scrollTop;
-                    } else {
-                        x = event.clientX + document.body.scrollLeft + document.documentElement.scrollLeft;
-                        y = event.clientY + document.body.scrollTop + document.documentElement.scrollTop;
-                    }
-
-                    return { x: x, y: y };
-                };
-
-                var e = getXY(event.originalEvent);
-
-                // Check the mouseEvent coordinates are outside of the rectangle
-                if (e.x > rect.left + rect.width - 1 || e.x < rect.left || e.y > rect.top + rect.height - 1 || e.y < rect.top) {
-                    scope.$apply(attrs.onDragLeave);
-                }
-            };
-
-            elm.on("dragleave", f);
-            scope.$on("$destroy", function () { elm.off("dragleave", f); });
-        };
-
-    }
-
-    angular.module('umbraco.directives').directive('onDragLeave', onDragLeaveDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragOver.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragOver.directive.js
deleted file mode 100644
index faf9050b8e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragOver.directive.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function () {
-    'use strict';
-
-    function onDragOverDirective(){
-
-        function link(scope, elm, attrs) {
-            var f = function () {
-                scope.$apply(attrs.onDragOver);
-            };
-            elm.on("dragover", f);
-            scope.$on("$destroy", function () { elm.off("dragover", f); });
-        }
-
-        var directive = {
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('onDragOver', onDragOverDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragStart.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragStart.directive.js
deleted file mode 100644
index 8da6211c08..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDragStart.directive.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function () {
-    'use strict';
-
-    function onDragStartDirective($timeout){
-
-        function link(scope, elm, attrs) {
-            var f = function () {
-                scope.$apply(attrs.onDragStart);
-            };
-            elm.on("dragstart", f);
-            scope.$on("$destroy", function () { elm.off("dragstart", f); });
-        }
-
-        var directive = {
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('onDragStart', onDragStartDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDrop.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDrop.directive.js
deleted file mode 100644
index 632549f21b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onDrop.directive.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function () {
-    'use strict';
-
-    function onDropDirective(){
-
-        function link(scope, elm, attrs) {
-            var f = function () {
-                scope.$apply(attrs.onDrop);
-            };
-            elm.on("drop", f);
-            scope.$on("$destroy", function () { elm.off("drop", f); });
-        }
-
-        var directive = {
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('onDrop', onDropDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onOutsideClick.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onOutsideClick.directive.js
deleted file mode 100644
index 07c8dc88fe..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onOutsideClick.directive.js
+++ /dev/null
@@ -1,86 +0,0 @@
-(function () {
-    'use strict';
-
-    function onOutsideClickDirective($timeout, angularHelper){
-
-        return function (scope, element, attrs) {
-
-            var eventBindings = [];
-
-            function oneTimeClick(event) {
-                var el = event.target.nodeName;
-
-                //ignore link and button clicks
-                var els = ["INPUT", "A", "BUTTON"];
-                if (els.indexOf(el) >= 0) { return; }
-
-                // ignore clicks on new overlay
-                var parents = $(event.target).parents("a,button,.umb-overlay,.umb-tour");
-                if (parents.length > 0) {
-                    return;
-                }
-
-                // ignore clicks on dialog from old dialog service
-                var oldDialog = $(event.target).parents("#old-dialog-service");
-                if (oldDialog.length === 1) {
-                    return;
-                }
-
-                // ignore clicks in tinyMCE dropdown(floatpanel)
-                var floatpanel = $(event.target).closest(".mce-floatpanel");
-                if (floatpanel.length === 1) {
-                    return;
-                }
-
-                // ignore clicks in flatpickr datepicker
-                var flatpickr = $(event.target).closest(".flatpickr-calendar");
-                if (flatpickr.length === 1) {
-                    return;
-                }
-
-                //ignore clicks inside this element
-                if ($(element).has($(event.target)).length > 0) {
-                    return;
-                }
-
-                // please to not use angularHelper.safeApply here, it won't work
-                scope.$evalAsync(attrs.onOutsideClick);
-            }
-
-
-            $timeout(function () {
-
-                if ("bindClickOn" in attrs) {
-
-                    eventBindings.push(scope.$watch(function () {
-                        return attrs.bindClickOn;
-                    }, function (newValue) {
-                        if (newValue === "true") {
-                            $(document).on("click", oneTimeClick);
-                        } else {
-                            $(document).off("click", oneTimeClick);
-                        }
-                    }));
-
-                } else {
-                    $(document).on("click", oneTimeClick);
-                }
-
-                scope.$on("$destroy", function () {
-                    $(document).off("click", oneTimeClick);
-
-                    // unbind watchers
-                    for (var e in eventBindings) {
-                        eventBindings[e]();
-                    }
-
-                });
-            }); // Temp removal of 1 sec timeout to prevent bug where overlay does not open. We need to find a better solution.
-
-        };
-
-    }
-
-    angular.module('umbraco.directives').directive('onOutsideClick', onOutsideClickDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onRightClick.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onRightClick.directive.js
deleted file mode 100644
index 6b818997d7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/onRightClick.directive.js
+++ /dev/null
@@ -1,30 +0,0 @@
-(function () {
-    'use strict';
-
-    function onRightClickDirective($parse){
-
-        document.oncontextmenu = function (e) {
-            if (e.target.hasAttribute('on-right-click')) {
-                e.preventDefault();
-                e.stopPropagation();
-                return false;
-            }
-        };
-
-        return function (scope, el, attrs) {
-            el.on('contextmenu', function (e) {
-                e.preventDefault();
-                e.stopPropagation();
-                var fn = $parse(attrs.onRightClick);
-                scope.$apply(function () {
-                    fn(scope, { $event: e });
-                });
-                return false;
-            });
-        };
-
-    }
-
-    angular.module('umbraco.directives').directive('onRightClick', onRightClickDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/_readme.md b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/_readme.md
deleted file mode 100644
index e82cf0c131..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/_readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-#Forms
-
-Directives used to enhance form elements.
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/checklistmodel.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/checklistmodel.directive.js
deleted file mode 100644
index 491dff3a41..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/checklistmodel.directive.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-  
-  https://vitalets.github.io/checklist-model/
-  <label ng-repeat="role in roles">
-    <input type="checkbox" checklist-model="user.roles" checklist-value="role.id"> {{role.text}}
-  </label>
-*/
-angular.module('umbraco.directives')
-.directive('checklistModel', ['$parse', '$compile', function($parse, $compile) {
-  // contains
-  function contains(arr, item) {
-    if (Utilities.isArray(arr)) {
-      for (var i = 0; i < arr.length; i++) {
-        if (Utilities.equals(arr[i], item)) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  // add
-  function add(arr, item) {
-    arr = Utilities.isArray(arr) ? arr : [];
-    for (var i = 0; i < arr.length; i++) {
-      if (Utilities.equals(arr[i], item)) {
-        return arr;
-      }
-    }
-    arr.push(item);
-    return arr;
-  }
-
-  // remove
-  function remove(arr, item) {
-    if (Utilities.isArray(arr)) {
-      for (var i = 0; i < arr.length; i++) {
-        if (Utilities.equals(arr[i], item)) {
-          arr.splice(i, 1);
-          break;
-        }
-      }
-    }
-    return arr;
-  }
-
-  // https://stackoverflow.com/a/19228302/1458162
-  function postLinkFn(scope, elem, attrs) {
-    // compile with `ng-model` pointing to `checked`
-    $compile(elem)(scope);
-
-    // getter / setter for original model
-    var getter = $parse(attrs.checklistModel);
-    var setter = getter.assign;
-
-    // value added to list
-    var value = $parse(attrs.checklistValue)(scope.$parent);
-
-    // watch UI checked change
-    scope.$watch('checked', function(newValue, oldValue) {
-      if (newValue === oldValue) { 
-        return;
-      } 
-      var current = getter(scope.$parent);
-      if (newValue === true) {
-        setter(scope.$parent, add(current, value));
-      } else {
-        setter(scope.$parent, remove(current, value));
-      }
-    });
-
-    // watch original model change
-    scope.$parent.$watch(attrs.checklistModel, function(newArr, oldArr) {
-      scope.checked = contains(newArr, value);
-    }, true);
-  }
-
-  return {
-    restrict: 'A',
-    priority: 1000,
-    terminal: true,
-    scope: true,
-    compile: function(tElement, tAttrs) {
-      if (tElement[0].tagName !== 'INPUT' || !tElement.attr('type', 'checkbox')) {
-        throw 'checklist-model should be applied to `input[type="checkbox"]`.';
-      }
-
-      if (!tAttrs.checklistValue) {
-        throw 'You should provide `checklist-value`.';
-      }
-
-      // exclude recursion
-      tElement.removeAttr('checklist-model');
-      
-      // local scope var storing individual checkbox model
-      tElement.attr('ng-model', 'checked');
-
-      return postLinkFn;
-    }
-  };
-}]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/contenteditable.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/contenteditable.directive.js
deleted file mode 100644
index 219d42a04e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/contenteditable.directive.js
+++ /dev/null
@@ -1,35 +0,0 @@
-angular.module("umbraco.directives")
-.directive("contenteditable", function() {
-  
-  return {
-    require: "ngModel",
-    link: function(scope, element, attrs, ngModel) {
-
-      function read() {
-        ngModel.$setViewValue(element.html());
-      }
-
-      ngModel.$render = function() {
-        element.html(ngModel.$viewValue || "");
-      };
-
-      
-      element.on("focus", function(){
-          
-          var range = document.createRange();
-          range.selectNodeContents(element[0]);
-
-          var sel = window.getSelection();
-          sel.removeAllRanges();
-          sel.addRange(range);
-
-      });
-
-      element.on("blur keyup change", function() {
-        scope.$apply(read);
-      });
-    }
-
-  }; 
-
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/fixnumber.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/fixnumber.directive.js
deleted file mode 100644
index 56f5323c73..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/fixnumber.directive.js
+++ /dev/null
@@ -1,58 +0,0 @@
-
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:fixNumber
-* @restrict A
-* @description Used in conjunction with type='number' input fields to ensure that the bound value is converted to a number when using ng-model
-*  because normally it thinks it's a string and also validation doesn't work correctly due to an angular bug.
-**/
-function fixNumber($parse) {
-    return {
-        restrict: "A",
-        require: "ngModel",
-
-        link: function (scope, elem, attrs, ctrl) {
-
-            //parse ngModel onload
-            var modelVal = scope.$eval(attrs.ngModel);
-            if (modelVal) {
-                var asNum = parseFloat(modelVal, 10);
-                if (!isNaN(asNum)) {
-                    $parse(attrs.ngModel).assign(scope, asNum);
-                }
-            }
-
-            //always return an int to the model
-            ctrl.$parsers.push(function (value) {
-                if (value === 0) {
-                    return 0;
-                }
-                return parseFloat(value || '', 10);
-            });
-
-            //always try to format the model value as an int
-            ctrl.$formatters.push(function (value) {
-                if (Utilities.isString(value)) {
-                    return parseFloat(value, 10);
-                }
-                return value;
-            });
-
-            //This fixes this angular issue: 
-            //https://github.com/angular/angular.js/issues/2144
-            // which doesn't actually validate the number input properly since the model only changes when a real number is entered
-            // but the input box still allows non-numbers to be entered which do not validate (only via html5)
-            if (typeof elem.prop('validity') === 'undefined') {
-                return;
-            }
-
-            elem.on('input', function (e) {
-                var validity = elem.prop('validity');
-                scope.$apply(function () {
-                    ctrl.$setValidity('number', !validity.badInput);
-                });
-            });
-        }
-    };
-}
-angular.module('umbraco.directives').directive("fixNumber", fixNumber);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/focuswhen.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/focuswhen.directive.js
deleted file mode 100644
index dda5c51175..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/focuswhen.directive.js
+++ /dev/null
@@ -1,21 +0,0 @@
-angular.module("umbraco.directives").directive('focusWhen', function ($timeout) {
-    return {
-        restrict: 'A',
-        link: function (scope, elm, attrs, ctrl) {
-
-            var delayTimer;
-
-            attrs.$observe("focusWhen", function (newValue) {
-                if (newValue === "true" && document.activeelement !== elm[0]) {
-                    delayTimer = $timeout(function () {
-                        elm[0].focus();
-                    });
-                }
-            });
-
-            scope.$on('$destroy', function() {
-                $timeout.cancel(delayTimer);
-            });
-        }
-    };
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hexbackgroundcolor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hexbackgroundcolor.directive.js
deleted file mode 100644
index eff05c94ff..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hexbackgroundcolor.directive.js
+++ /dev/null
@@ -1,53 +0,0 @@
-
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:hexBgColor
-* @restrict A
-* @description Used to set a hex background color on an element, this will detect valid hex and when it is valid it will set the color, otherwise
-* a color will not be set.
-**/
-function hexBgColor() {
-    return {
-        restrict: "A",
-        link: function (scope, element, attr, formCtrl) {
-
-            function setBackgroundColor(color) {
-                element[0].style.backgroundColor = "#" + color;
-            }
-
-            // Only add inline hex background color if defined and not "true".
-            if (attr.hexBgInline === undefined || (attr.hexBgInline !== undefined && attr.hexBgInline === "true")) {
-
-                var origColor = null;
-                if (attr.hexBgOrig) {
-                    // Set the orig based on the attribute if there is one.
-                    origColor = attr.hexBgOrig;
-                }
-
-                attr.$observe("hexBgColor", function (newVal) {
-                    if (newVal) {
-                        if (!origColor) {
-                            // Get the orig color before changing it.
-                            origColor = element.css("border-color");
-                        }
-                        // Is it a regular hex value - (#)AABBCC ?
-                        var match = newVal.match(/^#?([0-9a-f]{3}|[0-9a-f]{6})$/i);
-                        if (match && match.length) {
-                            setBackgroundColor(match[1]);
-                            return;
-                        }
-                        // Is it a hexa value - (#)AABBCCDD ?
-                        match = newVal.match(/^#?([0-9a-f]{4}|[0-9a-f]{8})$/i);
-                        if (match && match.length) {
-                            setBackgroundColor(match[1]);
-                            return;
-                        }
-                    }
-
-                    setBackgroundColor(origColor);
-                });
-            }
-        }
-    };
-}
-angular.module('umbraco.directives').directive("hexBgColor", hexBgColor);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js
deleted file mode 100644
index 8db301da55..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:hotkey
-**/
-
-angular.module("umbraco.directives")
-    .directive('hotkey', function($window, keyboardService, $log, focusService) {
-
-        return function(scope, el, attrs) {
-
-            var options = {};
-            var keyCombo = attrs.hotkey;
-
-            if (!keyCombo) {
-                //support data binding
-                keyCombo = scope.$eval(attrs["hotkey"]);
-            }
-
-            function activate() {
-
-                if (keyCombo) {
-
-                    // disable shortcuts in input fields if keycombo is 1 character
-                    if (keyCombo.length === 1) {
-                        options = {
-                            inputDisabled: true
-                        };
-                    }
-
-                    keyboardService.bind(keyCombo, function() {
-                        
-                        focusService.rememberFocus();
-                        
-                        var element = $(el);
-                        var activeElementType = document.activeElement.tagName;
-                        var clickableElements = ["A", "BUTTON"];
-
-                        if (element.is("a,div,button,input[type='button'],input[type='submit'],input[type='checkbox']") && !element.is(':disabled')) {
-
-                            if (element.is(':visible') || attrs.hotkeyWhenHidden) {
-
-                                if (attrs.hotkeyWhen && attrs.hotkeyWhen === "false") {
-                                    return;
-                                }
-
-                                // when keycombo is enter and a link or button has focus - click the link or button instead of using the hotkey
-                                if (keyCombo === "enter" && clickableElements.indexOf(activeElementType) === 0) {
-                                    document.activeElement.trigger( "click" );
-                                } else {
-                                    element.trigger("click");
-                                }
-
-                            }
-
-                        } else {
-                            element.trigger("focus");
-                        }
-
-                    }, options);
-
-                    el.on('$destroy', function() {
-                        keyboardService.unbind(keyCombo);
-                    });
-
-                }
-
-            }
-
-            activate();
-
-        };
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/preventdefault.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/preventdefault.directive.js
deleted file mode 100644
index 4391e39bef..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/preventdefault.directive.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:preventDefault
-
-@description
-Use this directive to prevent default action of an element. Effectively implementing <a href="https://api.jquery.com/event.preventdefault/">jQuery's preventdefault</a>
-
-<h3>Markup example</h3>
-
-<pre>
-    <a href="https://umbraco.com" prevent-default>Don't go to Umbraco.com</a>
-</pre>
-
-**/
-angular.module("umbraco.directives")
-    .directive('preventDefault', function() {
-        return function(scope, element, attrs) {
-
-            var enabled = true;
-            //check if there's a value for the attribute, if there is and it's false then we conditionally don't
-            //prevent default.
-            if (attrs.preventDefault) {
-                attrs.$observe("preventDefault", function (newVal) {
-                    enabled = (newVal === "false" || newVal === 0 || newVal === false) ? false : true;
-                });
-            }
-
-            $(element).on("click", function (event) {
-                if (event.metaKey || event.ctrlKey) {
-                    return;
-                }
-                else {
-                    if (enabled === true) {
-                        event.preventDefault();
-                    }
-                }
-            });
-        };
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/prevententersubmit.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/prevententersubmit.directive.js
deleted file mode 100644
index 62334387cb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/prevententersubmit.directive.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:preventEnterSubmit
-* @description prevents a form from submitting when the enter key is pressed on an input field
-**/
-angular.module("umbraco.directives")
-    .directive('preventEnterSubmit', function() {
-        return function(scope, element, attrs) {
-
-            var enabled = true;
-            //check if there's a value for the attribute, if there is and it's false then we conditionally don't 
-            //prevent default.
-            if (attrs.preventEnterSubmit) {
-                attrs.$observe("preventEnterSubmit", function (newVal) {
-                    enabled = (newVal === "false" || newVal === 0 || newVal === false) ? false : true;
-                });
-            }
-
-            $(element).on("keypress", function (event) {
-                if (event.which === 13 && enabled === true) {
-                    event.preventDefault();
-                }
-            });
-        };
-    });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/resizetocontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/resizetocontent.directive.js
deleted file mode 100644
index 39dd3e3985..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/resizetocontent.directive.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @ngdoc directive
- * @name umbraco.directives.directive:resizeToContent
- * @element div
- * @function
- *
- * @description
- * Resize iframe's automatically to fit to the content they contain
- *
- * @example
-   <example module="umbraco.directives">
-     <file name="index.html">
-         <iframe resize-to-content src="meh.html"></iframe>
-     </file>
-   </example>
- */
-angular.module("umbraco.directives")
-  .directive('resizeToContent', function ($window, $timeout) {
-    return function (scope, el, attrs) {
-       var iframe = el[0];
-       var iframeWin = iframe.contentWindow || iframe.contentDocument.parentWindow;
-       if (iframeWin.document.body) {
-
-          $timeout(function(){
-              var height = iframeWin.document.documentElement.scrollHeight || iframeWin.document.body.scrollHeight;
-              el.height(height);
-          }, 3000);
-       }
-    };
-  });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/selectonfocus.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/selectonfocus.directive.js
deleted file mode 100644
index cb30023b29..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/selectonfocus.directive.js
+++ /dev/null
@@ -1,19 +0,0 @@
-angular.module("umbraco.directives")
-  .directive('selectOnFocus', function () {
-    return function (scope, el, attrs) {
-        $(el).on("click", function () {
-            var editmode = $(el).data("editmode");
-            //If editmode is true a click is handled like a normal click
-            if (!editmode) {
-                //Initial click, select entire text
-                this.select();
-                //Set the edit mode so subsequent clicks work normally
-                $(el).data("editmode", true);
-            }
-        }).
-        on("blur", function () {
-            //Reset on focus lost
-            $(el).data("editmode", false);
-        });
-    };
-  });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautofocus.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautofocus.directive.js
deleted file mode 100644
index 98c4ef691e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautofocus.directive.js
+++ /dev/null
@@ -1,23 +0,0 @@
-angular.module("umbraco.directives")
-    .directive('umbAutoFocus', function($timeout) {
-
-        return function (scope, element, attrs) {
-            
-            var update = function() {
-                //if it uses its default naming
-                if (element.val() === "" || attrs.focusOnFilled) {
-                    element.trigger("focus");
-                }
-            };
-
-            attrs.$observe("umbAutoFocus", function (newVal) {
-                var enabled = (newVal === "false" || newVal === 0 || newVal === false) ? false : true;
-                if (enabled) {
-                    $timeout(function() {
-                        update();
-                    });
-                }
-            });
-
-        };
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautoresize.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautoresize.directive.js
deleted file mode 100644
index 58c9be1121..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautoresize.directive.js
+++ /dev/null
@@ -1,80 +0,0 @@
-angular.module("umbraco.directives")
-    .directive('umbAutoResize', function ($timeout) {
-        return {
-            require: ["^?umbTabs", "ngModel"],
-            link: function (scope, element, attr, controllersArr) {
-
-                var domEl = element[0];
-                var domElType = domEl.type;
-                var umbTabsController = controllersArr[0];
-                var ngModelController = controllersArr[1];
-
-                function resizeInput() {
-
-                    if (domEl.scrollWidth !== domEl.clientWidth) {
-                        if (ngModelController.$modelValue) {
-                            element.width(domEl.scrollWidth);
-                        }
-                    }
-
-                    // if the element is hidden the width will be 0 even though it has a value. 
-                    // This could happen if the element is hidden in a tab.
-                    if (ngModelController.$modelValue && domEl.clientWidth === 0) {
-                        element.width('auto');
-                    }
-
-                    if (!ngModelController.$modelValue && attr.placeholder) {
-                        attr.$set('size', attr.placeholder.length);
-                        element.width('auto');
-                    }
-
-                }
-
-                function resizeTextarea() {
-                    if (domEl.scrollHeight !== domEl.clientHeight) {
-                        element.height(domEl.scrollHeight);
-                    }
-                }
-
-                var update = function (force) {
-                    if (force === true) {
-                        if (domElType === "textarea") {
-                            element.height(0);
-                        } else if (domElType === "text") {
-                            element.width(0);
-                        }
-                    }
-
-                    if (domElType === "textarea") {
-                        resizeTextarea();
-                    } else if (domElType === "text") {
-                        resizeInput();
-                    }
-                };
-
-                //listen for tab changes
-                if (umbTabsController != null) {
-                    umbTabsController.onTabShown(function (args) {
-                        update();
-                    });
-                }
-
-                // listen for ng-model changes
-                var unbindModelWatcher = scope.$watch(function () {
-                    return ngModelController.$modelValue;
-                }, function (newValue) {
-                    $timeout(
-                        function () {
-                            update(true);
-                        }
-                    );
-                });
-
-                scope.$on('$destroy', function () {
-                    element.off('keyup keydown keypress change', update);
-                    element.off('blur', update(true));
-                    unbindModelWatcher();
-                });
-            }
-        };
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
deleted file mode 100644
index 85bccbfbae..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbCheckbox
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco version 7.14.0</b> Use this directive to render an umbraco checkbox.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-checkbox
-            name="checkboxlist"
-            value="{{key}}"
-            model="true"
-            text="{{text}}">
-        </umb-checkbox>
-
-    </div>
-</pre>
-
-@param {boolean} model Set to <code>true</code> or <code>false</code> to set the checkbox to checked or unchecked.
-@param {string} inputId Set the <code>id</code> of the checkbox.
-@param {string} value Set the value of the checkbox.
-@param {string} name Set the name of the checkbox.
-@param {string} text Set the text for the checkbox label.
-@param {string} labelKey Set a dictionary/localization string for the checkbox label
-@param {string} serverValidationField Set the <code>val-server-field</code> of the checkbox.
-@param {boolean} disabled Set the checkbox to be disabled.
-@param {boolean} required Set the checkbox to be required.
-@param {callback} onChange Callback when the value of the checkbox change by interaction.
-@param {string} cssClass Set a css class modifier.
-@deprecated @param {string} iconClass Set an icon next to checkbox. Use "icon" parameter instead.
-@param {string} icon Set an icon next to checkbox.
-@param {boolean} disableDirtyCheck Disable checking if the model is dirty.
-
-**/
-
-(function () {
-    'use strict';
-
-    function UmbCheckboxController($timeout, $attrs, localizationService) {
-
-        var vm = this;
-
-        vm.readonly = false;
-
-        vm.$onInit = onInit;
-        vm.change = change;
-        vm.click = click;
-
-        function onInit() {
-            vm.inputId = vm.inputId || "umb-check_" + String.CreateGuid();
-            vm.disableDirtyCheck =
-                $attrs.hasOwnProperty("disableDirtyCheck") &&
-                vm.disableDirtyCheck !== '0' &&
-                vm.disableDirtyCheck !== 0 &&
-                vm.disableDirtyCheck !== 'false' &&
-                vm.disableDirtyCheck !== false;
-            vm.icon = vm.icon || vm.iconClass || null;
-
-            // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
-            if (vm.labelKey) {
-                 localizationService.localize(vm.labelKey).then(function (data) {
-                      if(data.indexOf('[') === -1){
-                        vm.text = data;
-                      }
-                 });
-            }
-        }
-
-        function change() {
-            if (vm.onChange) {
-                $timeout(function () {
-                    vm.onChange({ model: vm.model, value: vm.value });
-                }, 0);
-            }
-        }
-
-        function click ($event) {
-            if (vm.readonly) {
-                $event.preventDefault();
-                $event.stopPropagation();
-            }
-        }
-
-        $attrs.$observe('readonly', (value) => {
-            vm.readonly = value !== undefined;
-        });
-    }
-
-    var component = {
-        templateUrl: 'views/components/forms/umb-checkbox.html',
-        controller: UmbCheckboxController,
-        controllerAs: 'vm',
-        transclude: true,
-        bindings: {
-            model: "=",
-            inputId: "@",
-            value: "@",
-            name: "@",
-            text: "@",
-            labelKey: "@?",
-            serverValidationField: "@",
-            disabled: "<",
-            required: "<",
-            onChange: "&?",
-            cssClass: "@?",
-            iconClass: "@?", // deprecated
-            icon: "@?",
-            disableDirtyCheck: "=?"
-        }
-    };
-
-    angular.module('umbraco.directives').component('umbCheckbox', component);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js
deleted file mode 100644
index 69c11a11cc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js
+++ /dev/null
@@ -1,247 +0,0 @@
-(function() {
-    'use strict';
-
-    function FocusLock($timeout, $rootScope, angularHelper) {
-
-        // If the umb-auto-focus directive is in use we respect that by leaving the default focus on it instead of choosing the first focusable element using this function
-        function getAutoFocusElement (elements) {
-            var elmentWithAutoFocus = null;
-
-            elements.forEach((element) => {
-                if(element.getAttribute('umb-auto-focus') === 'true') {
-                    elmentWithAutoFocus = element;
-                }
-            });
-
-            return elmentWithAutoFocus;
-        }
-
-        function link(scope, element) {
-            var target = element[0];
-            var focusableElements;
-            var firstFocusableElement;
-            var lastFocusableElement;
-            var infiniteEditorsWrapper;
-            var infiniteEditors;
-            var disconnectObserver = false;
-            var closingEditor = false;
-
-            if(!$rootScope.lastKnownFocusableElements){
-                $rootScope.lastKnownFocusableElements = [];
-            }
-
-            $rootScope.lastKnownFocusableElements.push(document.activeElement);
-
-            // List of elements that can be focusable within the focus lock
-            var focusableElementsSelector = '[role="button"], a[href]:not([disabled]):not(.ng-hide), button:not([disabled]):not(.ng-hide), textarea:not([disabled]):not(.ng-hide), input:not([disabled]):not(.ng-hide):not([type="hidden"]), select:not([disabled]):not(.ng-hide)';
-
-            function getDomNodes(){
-                infiniteEditorsWrapper = document.querySelector('.umb-editors');
-                if(infiniteEditorsWrapper) {
-                    infiniteEditors = Array.from(infiniteEditorsWrapper.querySelectorAll('.umb-editor') || []);
-                }
-            }
-
-            function getFocusableElements(targetElm) {
-                var elm = targetElm ? targetElm : target;
-
-                // Filter out elements that are children of parents with the .ng-hide class
-                focusableElements = [...elm.querySelectorAll(focusableElementsSelector)].filter(elm => !elm.closest('.ng-hide'));
-
-                // Set first and last focusable elements
-                firstFocusableElement = focusableElements[0];
-                lastFocusableElement = focusableElements[focusableElements.length - 1];
-            }
-
-            function handleKeydown(event) {
-                var isTabPressed = (event.key === 'Tab' || event.keyCode === 9);
-
-                if (!isTabPressed){
-                    return;
-                }
-
-                // If shift + tab key
-                if(event.shiftKey){
-                    // Set focus on the last focusable element if shift+tab are pressed meaning we go backwards
-                    if(document.activeElement === firstFocusableElement){
-                        lastFocusableElement.focus();
-                        event.preventDefault();
-                    }
-                }
-                // Else only the tab key is pressed
-                else{
-                    // Using only the tab key we set focus on the first focusable element mening we go forward
-                    if (document.activeElement === lastFocusableElement) {
-                        firstFocusableElement.focus();
-                        event.preventDefault();
-                    }
-                }
-            }
-
-            function clearLastKnownFocusedElements() {
-                $rootScope.lastKnownFocusableElements = [];
-            }
-
-            function setElementFocus() {
-                var defaultFocusedElement = getAutoFocusElement(focusableElements);
-                var lastKnownElement;
-
-                // If an infinite editor is being closed then we reset the focus to the element that triggered the the overlay
-                if(closingEditor){
-
-                    // If there is only one editor open, search for the "editor-info" inside it and set focus on it
-                    // This is relevant when a property editor has been selected and the editor where we selected it from
-                    // is closed taking us back to the first layer
-                    // Otherwise set it to the last element in the lastKnownFocusedElements array
-                    if(infiniteEditors && infiniteEditors.length === 1){
-                        var editorInfo = infiniteEditors[0].querySelector('.editor-info');
-                        if(infiniteEditors && infiniteEditors.length === 1 && editorInfo !== null) {
-                            lastKnownElement = editorInfo;
-
-                            // Clear the array
-                            clearLastKnownFocusedElements();
-                        }
-                    }
-                    else {
-                        var lastItemIndex = $rootScope.lastKnownFocusableElements.length - 1;
-                        lastKnownElement = $rootScope.lastKnownFocusableElements[lastItemIndex];
-
-                        // Remove the last item from the array so we always set the correct lastKnowFocus for each layer
-                        $rootScope.lastKnownFocusableElements.splice(lastItemIndex, 1);
-                    }
-
-                    // Update the lastknowelement variable here
-                    closingEditor = false;
-                }
-
-                // 1st - we check for any last known element - Usually the element the trigger the opening of a new layer
-                // If it exists it will receive fous
-                // 2nd - We check to see if a default focus has been set using the umb-auto-focus directive. If not we set focus on
-                // the first focusable element
-                // 3rd - Otherwise put the focus on the default focused element
-                if(lastKnownElement){
-                    lastKnownElement.focus();
-                }
-                else if(defaultFocusedElement === null ){
-                    // If the first focusable elements are either items from the umb-sub-views-nav menu or the umb-button-ellipsis we most likely want to start the focus on the second item
-                    // We don't want to focus the second button if it's in a tab otherwise the second tab is highlighted as well as the first tab
-                    var avoidStartElm = focusableElements.findIndex(elm => elm.classList.contains('umb-button-ellipsis') || elm.classList.contains('umb-sub-views-nav-item__action') || (elm.classList.contains('umb-tab-button') && !elm.parent.classList.contains('umb-tab')));
-
-                    if(avoidStartElm === 0) {
-                        focusableElements[1].focus();
-                    }
-                    else {
-                        firstFocusableElement.focus();
-                    }
-                }
-                else {
-                    defaultFocusedElement.focus();
-                }
-            }
-
-            function observeDomChanges() {
-                // Watch for DOM changes - so we can refresh the focusable elements if an element
-                // changes from being disabled to being enabled for instance
-                var observer = new MutationObserver(_.debounce(domChange, 200));
-
-                // Options for the observer (which mutations to observe)
-                var config = { attributes: true, childList: true, subtree: true};
-
-                // Whenever the DOM changes ensure the list of focused elements is updated
-                function domChange() {
-                    getFocusableElements();
-                }
-
-                // Start observing the target node for configured mutations
-                observer.observe(target, config);
-
-                // Disconnect observer
-                if(disconnectObserver){
-                    observer.disconnect();
-                }
-            }
-
-            function cleanupEventHandlers() {
-                //if we're in infinite editing mode
-                if(infiniteEditors.length > 0) {
-                    var activeEditor = infiniteEditors[infiniteEditors.length - 1];
-                    var inactiveEditors = infiniteEditors.filter(editor => editor !== activeEditor);
-
-                    if(inactiveEditors.length > 0) {
-                        for (var index = 0; index < inactiveEditors.length; index++) {
-                            var inactiveEditor = inactiveEditors[index];
-
-                            // Remove event handlers from inactive editors
-                            inactiveEditor.removeEventListener('keydown', handleKeydown);
-                        }
-                    }
-                    else {
-                        // Why is this one only begin called if there is no other infinite editors, wouldn't it make sense always to clean this up?
-                        // Remove event handlers from the active editor
-                        activeEditor.removeEventListener('keydown', handleKeydown);
-                    }
-                }
-            }
-
-            function onInit(targetElm) {
-                $timeout(() => {
-                        // Fetch the DOM nodes we need
-                        getDomNodes();
-
-                        cleanupEventHandlers();
-
-                        getFocusableElements(targetElm);
-
-                        if(focusableElements.length > 0) {
-
-                            observeDomChanges();
-
-                            setElementFocus();
-
-                            //  Handle keydown
-                            target.addEventListener('keydown', handleKeydown);
-                        }
-                }, 500);
-            }
-
-            onInit();
-
-            // If more than one editor is still open then re-initialize otherwise remove the event listener
-            scope.$on('$destroy', function () {
-                // Make sure to disconnect the observer so we potentially don't end up with having many active ones
-                disconnectObserver = true;
-
-                if(infiniteEditors && infiniteEditors.length > 1) {
-                    // Pass the correct editor in order to find the focusable elements
-                    var newTarget = infiniteEditors[infiniteEditors.length - 2];
-
-                    if(infiniteEditors.length > 1) {
-                        // Setting closing till true will let us re-apply the last known focus to then opened layer that then becomes
-                        // active
-                        closingEditor = true;
-
-                        onInit(newTarget);
-
-                        return;
-                    }
-                }
-
-                // Clear lastKnownFocusableElements
-                clearLastKnownFocusedElements();
-
-                // Cleanup event handler
-                target.removeEventListener('keydown', handleKeydown);
-            });
-        }
-
-        var directive = {
-            restrict: 'A',
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbFocusLock', FocusLock);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
deleted file mode 100644
index 086aae6f42..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbRadiobutton
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco version 7.14.0</b> Use this directive to render an umbraco radio button.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-radiobutton
-            name="radiobuttonlist"
-            value="{{key}}"
-            model="true"
-            text="{{text}}">
-        </umb-radiobutton>
-
-    </div>
-</pre>
-
-@param {boolean} model Set to <code>true</code> or <code>false</code> to set the radiobutton to checked or unchecked.
-@param {string} inputId Set the <code>id</code> of the radiobutton.
-@param {string} value Set the value of the radiobutton.
-@param {string} name Set the name of the radiobutton.
-@param {string} text Set the text for the radiobutton label.
-@param {string} labelKey Set a dictionary/localization string for the checkbox label.
-@param {string} serverValidationField Set the <code>val-server-field</code> of the radiobutton.
-@param {boolean} disabled Set the radiobutton to be disabled.
-@param {boolean} required Set the radiobutton to be required.
-@param {callback} onChange Callback when the value of the radiobutton change by interaction.
-@param {string} cssClass Set a css class modifier.
-@param {string} iconClass Set an icon next to radiobutton.
-@param {boolean} disableDirtyCheck Disable checking if the model is dirty.
-
-**/
-
-(function () {
-    'use strict';
-
-    function UmbRadiobuttonController($timeout, $attrs, localizationService) {
-
-        var vm = this;
-
-        vm.readonly = false;
-
-        vm.$onInit = onInit;
-        vm.change = change;
-        vm.click = click;
-
-        function onInit() {
-            vm.inputId = vm.inputId || "umb-radio_" + String.CreateGuid();
-            vm.disableDirtyCheck =
-                $attrs.hasOwnProperty("disableDirtyCheck") &&
-                vm.disableDirtyCheck !== '0' &&
-                vm.disableDirtyCheck !== 0 &&
-                vm.disableDirtyCheck !== 'false' &&
-                vm.disableDirtyCheck !== false;
-            vm.icon = vm.icon || vm.iconClass || null;
-
-            // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
-            if (vm.labelKey) {
-                 localizationService.localize(vm.labelKey).then(function (data) {
-                      if(data.indexOf('[') === -1){
-                        vm.text = data;
-                      }
-                 });
-            }
-        }
-
-        function change() {
-            if (vm.onChange) {
-                $timeout(function () {
-                    vm.onChange({ model: vm.model, value: vm.value });
-                }, 0);
-            }
-        }
-
-        function click($event) {
-            if (vm.readonly) {
-                $event.preventDefault();
-                $event.stopPropagation();
-            }
-        }
-
-        $attrs.$observe('readonly', (value) => {
-            vm.readonly = value !== undefined;
-        });
-    }
-
-    var component = {
-        templateUrl: 'views/components/forms/umb-radiobutton.html',
-        controller: UmbRadiobuttonController,
-        controllerAs: 'vm',
-        transclude: true,
-        bindings: {
-            model: "=",
-            inputId: "@",
-            value: "@",
-            name: "@",
-            text: "@",
-            labelKey: "@?",
-            serverValidationField: "@",
-            disabled: "<",
-            required: "<",
-            onChange: "&?",
-            cssClass: "@?",
-            iconClass: "@?", // deprecated
-            icon: "@?",
-            disableDirtyCheck: "=?"
-        }
-    };
-
-    angular.module('umbraco.directives').component('umbRadiobutton', component);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbrawmodel.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbrawmodel.directive.js
deleted file mode 100644
index 6098cb8a0d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbrawmodel.directive.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-example usage: <textarea json-edit="myObject" rows="8" class="form-control"></textarea>
-
-jsonEditing is a string which we edit in a textarea. we try parsing to JSON with each change. when it is valid, propagate model changes via ngModelCtrl
-
-use isolate scope to prevent model propagation when invalid - will update manually. cannot replace with template, or will override ngModelCtrl, and not hide behind facade
-
-will override element type to textarea and add own attribute ngModel tied to jsonEditing
- */
-
-angular.module("umbraco.directives")
-    .directive('umbRawModel', function () {
-        return {
-            restrict: 'A',
-            require: 'ngModel',
-            template: '<textarea ng-model="jsonEditing"></textarea>',
-            replace: true,
-            scope: {
-                model: '=umbRawModel',
-                validateOn: '='
-            },
-            link: function (scope, element, attrs, ngModelCtrl) {
-
-                function setEditing(value) {
-                    scope.jsonEditing = Utilities.copy(jsonToString(value));
-                }
-
-                function updateModel(value) {
-                    scope.model = stringToJson(value);
-                }
-
-                function setValid() {
-                    ngModelCtrl.$setValidity('json', true);
-                }
-
-                function setInvalid() {
-                    ngModelCtrl.$setValidity('json', false);
-                }
-
-                function stringToJson(text) {
-                    try {
-                        return Utilities.fromJson(text);
-                    } catch (err) {
-                        setInvalid();
-                        return text;
-                    }
-                }
-
-                function jsonToString(object) {
-                    // better than JSON.stringify(), because it formats + filters $$hashKey etc.
-                    // NOTE that this will remove all $-prefixed values
-                    return Utilities.toJson(object, true);
-                }
-
-                function isValidJson(model) {
-                    var flag = true;
-                    try {
-                        Utilities.fromJson(model)
-                    } catch (err) {
-                        flag = false;
-                    }
-                    return flag;
-                }
-
-                //init
-                setEditing(scope.model);
-
-                var onInputChange = function (newval, oldval) {
-                    if (newval !== oldval) {
-                        if (isValidJson(newval)) {
-                            setValid();
-                            updateModel(newval);
-                        } else {
-                            setInvalid();
-                        }
-                    }
-                };
-
-                if (scope.validateOn) {
-                    element.on(scope.validateOn, function () {
-                        scope.$apply(function () {
-                            onInputChange(scope.jsonEditing);
-                        });
-                    });
-                } else {
-                    //check for changes going out
-                    scope.$watch('jsonEditing', onInputChange, true);
-                }
-
-                //check for changes coming in
-                scope.$watch('model', function (newval, oldval) {
-                    if (newval !== oldval) {
-                        setEditing(newval);
-                    }
-                }, true);
-
-            }
-        };
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js
deleted file mode 100644
index 2d0d9eda95..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbSearchFilter
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco version 8.7.0</b> Use this directive to render an umbraco search filter.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-search-filter
-            name="checkboxlist"
-            value="{{key}}"
-            model="true"
-            text="{{text}}">
-        </umb-search-filter>
-
-    </div>
-</pre>
-
-@param {boolean} model Set to <code>true</code> or <code>false</code> to set the checkbox to checked or unchecked.
-@param {string} inputId Set the <code>id</code> of the checkbox.
-@param {string} text Set the text for the checkbox label.
-@param {string} labelKey Set a dictionary/localization string for the checkbox label
-@param {callback} onChange Callback when the value of the searchbox change.
-@param {callback} onBack Callback when clicking back button.
-@param {boolean} autoFocus Add autofocus to the input field
-@param {boolean} preventSubmitOnEnter Set the enter prevent directive or not
-@param {boolean} showBackButton Show back button on search
-
-**/
-
-(function () {
-    'use strict';
-
-    function UmbSearchFilterController($timeout, localizationService) {
-
-        var vm = this;
-
-        vm.$onInit = onInit;
-        vm.change = change;
-        vm.keyDown = keyDown;
-        vm.blur = blur;
-        vm.goBack = goBack;
-
-        function onInit() {
-            vm.inputId = vm.inputId || "umb-search-filter_" + String.CreateGuid();
-            vm.autoFocus = Object.toBoolean(vm.autoFocus) === true;
-            vm.preventSubmitOnEnter = Object.toBoolean(vm.preventSubmitOnEnter) === true;
-            vm.showBackButton = Object.toBoolean(vm.showBackButton) === true;
-
-            // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
-            if (vm.labelKey) {
-                 localizationService.localize(vm.labelKey).then(data => {
-                      if (data.indexOf('[') === -1){
-                         vm.text = data;
-                      }
-                 });
-            }
-        }
-
-        function goBack() {
-            if (vm.onBack) {
-                vm.onBack();
-            }
-        }
-
-        function change() {
-            if (vm.onChange) {
-                $timeout(function () {
-                    vm.onChange({ model: vm.model, value: vm.value });
-                }, 0);
-            }
-        }
-
-        function blur() {
-            if (vm.onBlur) {
-                vm.onBlur();
-            }
-        }
-
-        function keyDown(evt) {
-            //13: enter
-            switch (evt.keyCode) {
-                case 13:
-                    if (vm.onSearch) {
-                        vm.onSearch();
-                    }
-                    break;
-            }
-        }
-    }
-
-    var component = {
-        templateUrl: 'views/components/forms/umb-search-filter.html',
-        controller: UmbSearchFilterController,
-        controllerAs: 'vm',
-        transclude: true,
-        bindings: {
-            model: "=",
-            inputId: "@",
-            text: "@",
-            labelKey: "@?",
-            onChange: "&?",
-            onSearch: "&?",
-            onBlur: "&?",
-            onBack: "&?",
-            autoFocus: "<?",
-            preventSubmitOnEnter: "<?",
-            showBackButton: "<?",
-            cssClass: "@?"
-        }
-    };
-
-    angular.module('umbraco.directives').component('umbSearchFilter', component);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbselectwhen.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbselectwhen.directive.js
deleted file mode 100644
index b8986c02d3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbselectwhen.directive.js
+++ /dev/null
@@ -1,28 +0,0 @@
-(function() {
-    'use strict';
-
-    function SelectWhen($timeout) {
-
-        function link(scope, el, attr, ctrl) {
-
-            attr.$observe("umbSelectWhen", function(newValue) {
-                if (newValue === "true") {
-                    $timeout(function() {
-                        el.select();
-                    });
-                }
-            });
-
-        }
-
-        var directive = {
-            restrict: 'A',
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbSelectWhen', SelectWhen);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/validwhen.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/validwhen.directive.js
deleted file mode 100644
index 63681a380a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/validwhen.directive.js
+++ /dev/null
@@ -1,12 +0,0 @@
-angular.module("umbraco.directives").directive('validWhen', function () {
-    return {
-        require: 'ngModel',
-        restrict: 'A',
-        link: function (scope, element, attr, ngModel) {
-
-            attr.$observe("validWhen", function (newValue) {
-                ngModel.$setValidity("validWhen", newValue === "true");
-            });
-        }
-    };
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
deleted file mode 100644
index 7821c00e69..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
+++ /dev/null
@@ -1,147 +0,0 @@
-angular.module("umbraco.directives")
-    .directive('gridRte', function (tinyMceService, angularHelper, assetsService, $q, $timeout, eventsService, tinyMceAssets) {
-        return {
-            scope: {
-                uniqueId: '=',
-                value: '=',
-                configuration: "=", //this is the RTE configuration
-                datatypeKey: '@',
-                ignoreUserStartNodes: '@'
-            },
-            templateUrl: 'views/components/grid/grid-rte.html',
-            replace: true,
-            link: function (scope, element, attrs) {
-
-                scope.isLoading = true;
-
-                //To id the html textarea we need to use the datetime ticks because we can have multiple rte's per a single property alias
-                // because now we have to support having 2x (maybe more at some stage) content editors being displayed at once. This is because
-                // we have this mini content editor panel that can be launched with MNTP.
-                scope.textAreaHtmlId = scope.uniqueId + "_" + String.CreateGuid();
-
-                let editorConfig = scope.configuration ? scope.configuration : null;
-                if (!editorConfig || Utilities.isString(editorConfig)) {
-                    editorConfig = tinyMceService.defaultPrevalues();
-                    //for the grid by default, we don't want to include the macro or the block-picker toolbar
-                    editorConfig.toolbar = _.without(editorConfig.toolbar, "umbmacro", "umbblockpicker");
-                }
-
-                //ensure the grid's global config is being passed up to the RTE, these 2 properties need to be in this format
-                //since below we are just passing up `scope` as the actual model and for 2 way binding to work with `value` that
-                //is the way it needs to be unless we start adding watchers. We'll just go with this for now but it's super ugly.
-                scope.config = {
-                    ignoreUserStartNodes: scope.ignoreUserStartNodes === "true"
-                }
-                scope.dataTypeKey = scope.datatypeKey; //Yes - this casing is rediculous, but it's because the var starts with `data` so it can't be `data-type-id` :/
-
-                //stores a reference to the editor
-                let tinyMceEditor = null;
-
-                const assetPromises = [];
-
-                //queue file loading
-                tinyMceAssets.forEach(function (tinyJsAsset) {
-                  assetPromises.push(assetsService.loadJs(tinyJsAsset, scope));
-                });
-
-                //wait for assets to load before proceeding
-                $q.all(assetPromises)
-                  .then(function () {
-                    return tinyMceService.getTinyMceEditorConfig({
-                      htmlId: scope.textAreaHtmlId,
-                      stylesheets: editorConfig.stylesheets,
-                      toolbar: editorConfig.toolbar,
-                      mode: editorConfig.mode
-                    })
-                  })
-
-                  // Handle additional assets loading depending on the configuration before initializing the editor
-                  .then(function (tinyMceConfig) {
-                    // Load the plugins.min.js file from the TinyMCE Cloud if a Cloud Api Key is specified
-                    if (tinyMceConfig.cloudApiKey) {
-                      return assetsService.loadJs(`https://cdn.tiny.cloud/1/${tinyMceConfig.cloudApiKey}/tinymce/${tinymce.majorVersion}.${tinymce.minorVersion}/plugins.min.js`)
-                        .then(() => tinyMceConfig);
-                    }
-
-                    return tinyMceConfig;
-                  })
-
-                  //wait for config to be ready after assets have loaded
-                  .then(function (standardConfig) {
-
-                    //create a baseline Config to extend upon
-                    let baseLineConfigObj = {
-                        maxImageSize: editorConfig.maxImageSize
-                    };
-
-                    baseLineConfigObj.setup = function (editor) {
-
-                        //set the reference
-                        tinyMceEditor = editor;
-
-                        //custom initialization for this editor within the grid
-                        editor.on('init', function (e) {
-
-                            // Used this init event - as opposed to property init_instance_callback
-                            // to turn off the loader
-                            scope.isLoading = false;
-
-                            //force overflow to hidden to prevent no needed scroll
-                            editor.getBody().style.overflow = "hidden";
-
-                            $timeout(function () {
-                                if (scope.value === null) {
-                                    editor.focus();
-                                }
-                            }, 400);
-
-                        });
-
-                        //initialize the standard editor functionality for Umbraco
-                        tinyMceService.initializeEditor({
-                          editor: editor,
-                          toolbar: editorConfig.toolbar,
-                          model: scope,
-                          // Form is found in the scope of the grid controller above us, not in our isolated scope
-                          // https://github.com/umbraco/Umbraco-CMS/issues/7461
-                          currentForm: angularHelper.getCurrentForm(scope.$parent)
-                        });
-                    };
-
-                    Utilities.extend(baseLineConfigObj, standardConfig);
-
-                    //we need to add a timeout here, to force a redraw so TinyMCE can find
-                    //the elements needed
-                    $timeout(function () {
-                      tinymce.init(baseLineConfigObj);
-                    }, 150);
-                });
-
-                const tabShownListener = eventsService.on("app.tabChange", function (e, args) {
-
-                  const tabId = String(args.id);
-                  const myTabId = element.closest(".umb-tab-pane").attr("rel");
-
-                  if (tabId === myTabId) {
-                    //the tab has been shown, trigger the mceAutoResize (as it could have timed out before the tab was shown)
-                    if (tinyMceEditor !== undefined && tinyMceEditor != null) {
-                      tinyMceEditor.execCommand('mceAutoResize', false, null, null);
-                    }
-                  }
-                });
-
-                //when the element is disposed we need to unsubscribe!
-                // NOTE: this is very important otherwise if this is part of a modal, the listener still exists because the dom
-                // element might still be there even after the modal has been hidden.
-                scope.$on('$destroy', function () {
-                  eventsService.unsubscribe(tabShownListener);
-
-                  //ensure we unbind this in case the blur doesn't fire above
-                  if (tinyMceEditor) {
-                    tinyMceEditor.destroy();
-                    tinyMceEditor = null;
-                  }
-                });
-            }
-        };
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/readme.md b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/readme.md
deleted file mode 100644
index b7d8a1056f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-The html directives does nothing but display html, with simple one-way binding
-and is therefore simpler to use then alot of the strict property bound ones
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbbox/umbbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbbox/umbbox.directive.js
deleted file mode 100644
index 0702864f03..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbbox/umbbox.directive.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/** 
-@ngdoc directive
-@name umbraco.directives.directive:umbBox
-@restrict E
-
-@description
-Use this directive to render an already styled empty div tag.
-
-<h3>Markup example</h3>
-<pre>
-    <umb-box>
-        <umb-box-header title="this is a title"></umb-box-header>
-        <umb-box-content>
-            // Content here
-        </umb-box-content>
-    </umb-box>
-</pre>
-
-<h3>Use in combination with:</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbBoxHeader umbBoxHeader}</li>
-    <li>{@link umbraco.directives.directive:umbBoxContent umbBoxContent}</li>
-</ul>
-**/
-
-(function(){
-    'use strict';
-
-    function BoxDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/html/umb-box/umb-box.html'
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbBox', BoxDirective);
-
-})();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbbox/umbboxcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbbox/umbboxcontent.directive.js
deleted file mode 100644
index 256dcfac4e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbbox/umbboxcontent.directive.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbBoxContent
-@restrict E
-
-@description
-Use this directive to render an empty container. Recommended to use it inside an {@link umbraco.directives.directive:umbBox umbBox} directive. See documentation for {@link umbraco.directives.directive:umbBox umbBox}.
-
-<h3>Markup example</h3>
-<pre>
-    <umb-box>
-        <umb-box-header title="this is a title"></umb-box-header>
-        <umb-box-content>
-            // Content here
-        </umb-box-content>
-    </umb-box>
-</pre>
-
-<h3>Use in combination with:</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbBox umbBox}</li>
-    <li>{@link umbraco.directives.directive:umbBoxHeader umbBoxHeader}</li>
-</ul>
-**/
-
-(function(){
-    'use strict';
-
-    function BoxContentDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/html/umb-box/umb-box-content.html'
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbBoxContent', BoxContentDirective);
-
-})();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbbox/umbboxheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbbox/umbboxheader.directive.js
deleted file mode 100644
index 21f0c33de5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbbox/umbboxheader.directive.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbBoxHeader
-@restrict E
-@scope
-
-@description
-Use this directive to construct a title. Recommended to use it inside an {@link umbraco.directives.directive:umbBox umbBox} directive. See documentation for {@link umbraco.directives.directive:umbBox umbBox}.
-
-<h3>Markup example</h3>
-<pre>
-    <umb-box>
-        <umb-box-header title="This is a title" description="I can enter a description right here"></umb-box-header>
-        <umb-box-content>
-            // Content here
-        </umb-box-content>
-    </umb-box>
-</pre>
-
-<h3>Markup example with using titleKey</h3>
-<pre>
-    <umb-box>
-        // the title-key property needs an areaAlias_keyAlias from the language files
-        <umb-box-header title-key="areaAlias_keyAlias" description-key="areaAlias_keyAlias"></umb-box-header>
-        <umb-box-content>
-            // Content here
-        </umb-box-content>
-    </umb-box>
-</pre>
-{@link https://our.umbraco.com/documentation/extending/language-files/ Here you can see more about the language files}
-
-<h3>Use in combination with:</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbBox umbBox}</li>
-    <li>{@link umbraco.directives.directive:umbBoxContent umbBoxContent}</li>
-</ul>
-
-@param {string=} title (<code>attrbute</code>): Custom title text.
-@param {string=} titleKey (<code>attrbute</code>): The translation key from the language xml files.
-@param {string=} description (<code>attrbute</code>): Custom description text.
-@param {string=} descriptionKey (<code>attrbute</code>): The translation key from the language xml files.
-**/
-
-
-(function(){
-    'use strict';
-
-    function BoxHeaderDirective(localizationService) {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/html/umb-box/umb-box-header.html',
-            scope: {
-                titleKey: "@?",
-                title: "@?",
-                descriptionKey: "@?",
-                description: "@?"
-            },
-            link: function (scope) {
-
-                scope.titleLabel = scope.title;
-
-                if (scope.titleKey) {
-                    localizationService.localize(scope.titleKey, [], scope.title).then((data) => {
-                        scope.titleLabel = data;
-                    });
-
-                }
-
-                scope.descriptionLabel = scope.description;
-
-                if (scope.descriptionKey) {
-                    localizationService.localize(scope.descriptionKey, [], scope.description).then((data) => {
-                        scope.descriptionLabel = data;
-                    });
-
-                }
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbBoxHeader', BoxHeaderDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbcontrolgroup.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbcontrolgroup.directive.js
deleted file mode 100644
index a52189a0a8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbcontrolgroup.directive.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbControlGroup
-* @restrict E
-
-@param {string=} label The label for the control group field.
-@param {string=} description The description for the control group field.
-@param {boolean=} hideLabel Set to <code>true</code> to hide the label.
-@param {string=} alias The alias of the field within the control group.
-@param {string=} labelFor The alias of the field that the label is for, used for validation.
-@param {boolean=} required Set to <code>true</code> to mark the field as required.
-
-**/
-
-angular.module("umbraco.directives.html")
-  .directive('umbControlGroup', function (localizationService) {
-    return {
-      scope: {
-        label: "@label",
-        description: "@",
-        hideLabel: "@",
-        alias: "@",
-        labelFor: "@",
-        required: "@?"
-      },
-      require: '?^^form',
-      transclude: true,
-      restrict: 'E',
-      replace: true,
-      templateUrl: 'views/components/html/umb-control-group.html',
-      link: function (scope, element, attr, formCtrl) {
-
-        scope.formValid = function () {
-          if (formCtrl && scope.labelFor) {
-            //if a label-for has been set, use that for the validation
-            return formCtrl[scope.labelFor].$valid;
-          }
-          //there is no form.
-          return true;
-        };
-
-        if (scope.label && scope.label[0] === "@") {
-          localizationService.localize(scope.label.substring(1))
-            .then(function(data){
-              scope.labelstring = data;
-            });
-        }
-        else {
-          scope.labelstring = scope.label;
-        }
-
-        if (scope.description && scope.description[0] === "@") {
-          localizationService.localize(scope.description.substring(1))
-            .then(function(data){
-              scope.descriptionstring = data;
-            });
-        }
-        else {
-          scope.descriptionstring = scope.description;
-        }
-
-      }
-    };
-  });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbpane.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbpane.directive.js
deleted file mode 100644
index 8c01fb4d4e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbpane.directive.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbPane
-* @restrict E
-**/
-angular.module("umbraco.directives.html")
-    .directive('umbPane', function () {
-        return {
-            transclude: true,
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/html/umb-pane.html'
-        };
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbpanel.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbpanel.directive.js
deleted file mode 100644
index 569cf17ed8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbpanel.directive.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbPanel
-* @restrict E
-**/
-angular.module("umbraco.directives.html")
-	.directive('umbPanel', function($timeout, $log){
-		return {
-			restrict: 'E',
-			replace: true,
-			transclude: 'true',
-			templateUrl: 'views/components/html/umb-panel.html'
-		};
-	});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js
deleted file mode 100644
index cba21d2eb5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js
+++ /dev/null
@@ -1,390 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbImageCrop
-* @restrict E
-* @function
-**/
-angular.module("umbraco.directives")
-    .directive('umbImageCrop',
-        function ($timeout, cropperHelper, windowResizeListener) {
-
-            const MAX_SCALE = 4;
-
-            return {
-                restrict: 'E',
-                replace: true,
-                transclude: true,
-                templateUrl: 'views/components/imaging/umb-image-crop.html',
-                scope: {
-                    src: '=',
-                    width: '@',
-                    height: '@',
-                    crop: "=",
-                    center: "=",
-                    maxSize: '@?',
-                    alias: '@?',
-                    forceUpdate: '@?'
-                },
-
-                link: function (scope, element, attrs) {
-
-                    var unsubscribe = [];
-                    let sliderRef = null;
-
-                    scope.loaded = false;
-                    scope.width = 0;
-                    scope.height = 0;
-
-                    scope.dimensions = {
-                        element: {},
-                        image: {},
-                        cropper: {},
-                        viewport: {},
-                        margin: {},
-                        scale: {
-                            min: 1,
-                            max: MAX_SCALE,
-                            current: 1
-                        }
-                    };
-
-                    scope.sliderOptions = {
-                        "start": scope.dimensions.scale.current,
-                        "step": 0.01,
-                        "tooltips": [false],
-                        "range": {
-                            "min": 0,
-                            "max": 100
-                        }
-                    };
-
-                    scope.setup = function (slider) {
-                        sliderRef = slider;
-                        updateSlider();
-                    };
-
-                    function updateSlider() {
-                        if (sliderRef) {
-                            // Update slider range min/max
-                            sliderRef.noUiSlider.updateOptions({
-                                "range": {
-                                    "min": scope.dimensions.scale.min,
-                                    "max": scope.dimensions.scale.max
-                                }
-                            });
-
-                            // Set slider handle position
-                            sliderRef.noUiSlider.set(scope.dimensions.scale.current);
-                        }
-                    }
-
-                    scope.slide = function (values) {
-                        if (values) {
-                            scope.dimensions.scale.current = parseFloat(values);
-                        }
-                    };
-
-                    scope.change = function (values) {
-                        if (values) {
-                            scope.dimensions.scale.current = parseFloat(values);
-                        }
-                    };
-
-                    function onScroll(event) {
-                        // cross-browser wheel delta
-                        var delta = Math.max(-50, Math.min(50, (event.wheelDelta || -event.detail)));
-
-                        if (sliderRef) {
-                            var currentScale =sliderRef.noUiSlider.get();
-
-                            var newScale = Math.min(Math.max(currentScale + delta*.001*scope.dimensions.image.ratio, scope.dimensions.scale.min), scope.dimensions.scale.max);
-                            sliderRef.noUiSlider.set(newScale);
-                            scope.$evalAsync(() => {
-                                scope.dimensions.scale.current = newScale;
-                            });
-
-                            if(event.preventDefault)  {
-                                event.preventDefault();
-                            }
-                        }
-                    }
-
-
-                    //live rendering of viewport and image styles
-                    function updateStyles() {
-                        scope.maskStyle = {
-                            'height': (parseInt(scope.dimensions.cropper.height, 10)) + 'px',
-                            'width': (parseInt(scope.dimensions.cropper.width, 10)) + 'px',
-                            'top': (parseInt(scope.dimensions.margin.top, 10)) + 'px',
-                            'left': (parseInt(scope.dimensions.margin.left, 10)) + 'px'
-                        }
-                    };
-
-                    updateStyles();
-
-                    //elements
-                    var $viewport = element.find(".viewport");
-                    var $image = element.find("img");
-                    var $overlay = element.find(".overlay");
-
-                    $overlay.bind("focus", function () {
-                        $overlay.bind("DOMMouseScroll mousewheel onmousewheel", onScroll);
-                    });
-
-                    $overlay.bind("blur", function () {
-                        $overlay.unbind("DOMMouseScroll mousewheel onmousewheel", onScroll);
-                    });
-
-                    //default constraints for drag n drop
-                    var constraints = { left: { max: 0, min: 0 }, top: { max: 0, min: 0 } };
-                    scope.constraints = constraints;
-
-
-                    //set constaints for cropping drag and drop
-                    var setConstraints = function () {
-                        constraints.left.min = scope.dimensions.cropper.width - scope.dimensions.image.width;
-                        constraints.top.min = scope.dimensions.cropper.height - scope.dimensions.image.height;
-                    };
-
-                    var setDimensions = function () {
-
-                        scope.dimensions.image.width = scope.dimensions.image.originalWidth;
-                        scope.dimensions.image.height = scope.dimensions.image.originalHeight;
-
-                        //unscaled editor size
-                        var _cropW = parseInt(scope.width, 10);
-                        var _cropH = parseInt(scope.height, 10);
-
-                        var ratioCalculation = cropperHelper.scaleToMaxSize(
-                            _cropW,
-                            _cropH,
-                            scope.dimensions.viewport.width - 40,
-                            scope.dimensions.viewport.height - 40);
-
-                        //so if we have a max size, override the thumb sizes
-                        _cropW = ratioCalculation.width;
-                        _cropH = ratioCalculation.height;
-
-                        // set margins:
-                        scope.dimensions.margin.left = (scope.dimensions.viewport.width - _cropW) * 0.5;
-                        scope.dimensions.margin.top = (scope.dimensions.viewport.height - _cropH) * 0.5;
-
-                        scope.dimensions.cropper.width = _cropW;
-                        scope.dimensions.cropper.height = _cropH;
-                        updateStyles();
-                    };
-
-                    //resize to a given ratio
-                    var resizeImageToScale = function (ratio) {
-
-                        var prevWidth = scope.dimensions.image.width;
-                        var prevHeight = scope.dimensions.image.height;
-
-                        scope.dimensions.image.width = scope.dimensions.image.originalWidth * ratio;
-                        scope.dimensions.image.height = scope.dimensions.image.originalHeight * ratio;
-
-                        var difW = (scope.dimensions.image.width - prevWidth);
-                        var difH = (scope.dimensions.image.height - prevHeight);
-
-                        // normalized focus point:
-                        var focusNormX = (-scope.dimensions.image.left + scope.dimensions.cropper.width*.5) / prevWidth;
-                        var focusNormY = (-scope.dimensions.image.top + scope.dimensions.cropper.height*.5) / prevHeight;
-
-                        scope.dimensions.image.left = scope.dimensions.image.left - difW * focusNormX;
-                        scope.dimensions.image.top = scope.dimensions.image.top - difH * focusNormY;
-
-                        setConstraints();
-                        validatePosition(scope.dimensions.image.left, scope.dimensions.image.top);
-                    };
-
-                    //resize the image to a predefined crop coordinate
-                    var resizeImageToCrop = function () {
-                        scope.dimensions.image = cropperHelper.convertToStyle(
-                            runtimeCrop,
-                            { width: scope.dimensions.image.originalWidth, height: scope.dimensions.image.originalHeight },
-                            scope.dimensions.cropper,
-                            0);
-
-                        var ratioCalculation = cropperHelper.calculateAspectRatioFit(
-                            scope.dimensions.image.originalWidth,
-                            scope.dimensions.image.originalHeight,
-                            scope.dimensions.cropper.width,
-                            scope.dimensions.cropper.height,
-                            true);
-
-                        scope.dimensions.scale.current = scope.dimensions.image.ratio;
-
-                        // Update min and max based on original width/height
-                        // Here we update the slider to use the scala of the current setup, i dont know why its made in this way but this is how it is.
-                        scope.dimensions.scale.min = ratioCalculation.ratio;
-                        // TODO: Investigate wether we can limit users to not scale bigger than the amount of pixels in the source:
-                        //scope.dimensions.scale.max = ratioCalculation.ratio * Math.min(MAX_SCALE, scope.dimensions.image.originalWidth/scope.dimensions.cropper.width);
-                        scope.dimensions.scale.max = ratioCalculation.ratio * MAX_SCALE;
-
-                        updateSlider();
-                    };
-
-                    var validatePosition = function (left, top) {
-
-                        left = Math.min(Math.max(left, constraints.left.min), constraints.left.max);
-                        top = Math.min(Math.max(top, constraints.top.min), constraints.top.max);
-
-                        if (scope.dimensions.image.left !== left) {
-                            scope.dimensions.image.left = left;
-                        }
-
-                        if (scope.dimensions.image.top !== top) {
-                            scope.dimensions.image.top = top;
-                        }
-                    };
-
-
-                    //sets scope.crop to the recalculated % based crop
-                    function calculateCropBox() {
-                        runtimeCrop = cropperHelper.pixelsToCoordinates(scope.dimensions.image, scope.dimensions.cropper.width, scope.dimensions.cropper.height, 0);
-                    };
-                    function saveCropBox() {
-                        scope.crop = Utilities.copy(runtimeCrop);
-                    }
-
-
-                    //Drag and drop positioning, using jquery ui draggable
-                    //var onStartDragPosition, top, left;
-                    var dragStartPosition = {};
-                    $overlay.draggable({
-                        start: function (event, ui) {
-                            dragStartPosition.left = scope.dimensions.image.left;
-                            dragStartPosition.top = scope.dimensions.image.top;
-                        },
-                        drag: function (event, ui) {
-                            scope.$apply(function () {
-                                validatePosition(dragStartPosition.left + (ui.position.left - ui.originalPosition.left), dragStartPosition.top + (ui.position.top - ui.originalPosition.top));
-                            });
-                        },
-                        stop: function (event, ui) {
-                            scope.$apply(function () {
-                                //make sure that every validates one more time...
-                                validatePosition(dragStartPosition.left + (ui.position.left - ui.originalPosition.left), dragStartPosition.top + (ui.position.top - ui.originalPosition.top));
-
-                                calculateCropBox();
-                                saveCropBox();
-                            });
-                        }
-                    });
-
-                    var runtimeCrop;
-                    var init = function () {
-
-                        // store original size:
-                        scope.dimensions.image.originalWidth = $image.width();
-                        scope.dimensions.image.originalHeight = $image.height();
-
-                        // runtime Crop, should not be saved until we have interactions:
-                        runtimeCrop = Utilities.copy(scope.crop);
-
-                        onViewportSizeChanged();
-
-                        scope.loaded = true;
-                    };
-
-                    function setCrop() {
-                        //create a default crop if we haven't got one already
-                        var createDefaultCrop = !scope.crop;
-                        if (createDefaultCrop) {
-                            calculateCropBox();
-                        }
-
-                        resizeImageToCrop();
-
-                        //if we're creating a new crop, make sure to zoom out fully
-                        if (createDefaultCrop) {
-                            scope.dimensions.scale.current = scope.dimensions.scale.min;
-                            resizeImageToScale(scope.dimensions.scale.min);
-
-                            if (scope.center) {
-                                // Move image to focal point if set
-                                // Repeating a few calls here, but logic is too difficult to follow elsewhere
-                                var x1 = Math.min(
-                                    Math.max(
-                                        scope.center.left * scope.dimensions.image.width - scope.dimensions.cropper.width / 2,
-                                        0
-                                    ),
-                                    scope.dimensions.image.width - scope.dimensions.cropper.width
-                                );
-                                var y1 = Math.min(
-                                    Math.max(
-                                        scope.center.top * scope.dimensions.image.height - scope.dimensions.cropper.height / 2,
-                                        0
-                                    ),
-                                    scope.dimensions.image.height - scope.dimensions.cropper.height
-                                );
-                                scope.dimensions.image.left = x1;
-                                scope.dimensions.image.top = y1;
-                                calculateCropBox();
-                                resizeImageToCrop();
-                            }
-                        }
-                    }
-
-
-                    function onViewportSizeChanged() {
-                        scope.dimensions.viewport.width = $viewport.width();
-                        scope.dimensions.viewport.height = $viewport.height();
-
-                        setDimensions();
-                        setCrop();
-                        setConstraints();
-                    }
-
-
-                    // Watchers
-                    unsubscribe.push(scope.$watchCollection('[width, height, alias, forceUpdate]', function (newValues, oldValues) {
-                        // We have to reinit the whole thing if
-                        // one of the external params changes
-                        if (newValues !== oldValues) {
-                            runtimeCrop = Utilities.copy(scope.crop);
-                            setDimensions();
-                            setCrop();
-                            setConstraints();
-                        }
-                    }));
-
-                    var throttledScale = _.throttle(() => scope.$evalAsync(() => {
-                        resizeImageToScale(scope.dimensions.scale.current);
-                        calculateCropBox();
-                        saveCropBox();
-                    }), 16);
-
-                    // Happens when we change the scale
-                    unsubscribe.push(scope.$watch("dimensions.scale.current", function (newValue, oldValue) {
-                        if (scope.loaded) {
-                            throttledScale();
-                        }
-                    }));
-
-
-                    // Init
-
-                    //if we have a max-size we will use it, to keep this backwards compatible.
-                    // I dont see this max size begin usefull, as we should aim for responsive UI.
-                    if (scope.maxSize) {
-                        element.css("max-width", parseInt(scope.maxSize, 10) + "px");
-                        element.css("max-height", parseInt(scope.maxSize, 10) + "px");
-                    }
-
-                    $image.on("load", function () {
-                        $timeout(function () {
-                            init();
-                        });
-                    });
-
-                    windowResizeListener.register(onViewportSizeChanged);
-
-                    scope.$on('$destroy', function () {
-                        $image.prop("src", "");
-                        windowResizeListener.unregister(onViewportSizeChanged);
-                        unsubscribe.forEach(u => u());
-                    })
-                }
-            };
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
deleted file mode 100644
index 79a6e39fb4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
+++ /dev/null
@@ -1,230 +0,0 @@
-(function() {
-    'use strict';
-
-    function umbImageGravityController($scope, $element, $timeout) {
-
-        var vm = this;
-
-        //Internal values for keeping track of the dot and the size of the editor
-        vm.dimensions = {
-            width: 0,
-            height: 0,
-            left: 0,
-            top: 0
-        };
-
-        var imageElement = null; //DOM element reference
-        var focalPointElement = null; //DOM element reference
-        var draggable = null;
-
-        vm.loaded = false;
-        vm.$onInit = onInit;
-        vm.$onChanges = onChanges;
-        vm.$postLink = postLink;
-        vm.$onDestroy = onDestroy;
-        vm.style = {};
-        vm.overlayStyle = {};
-        vm.setFocalPoint = setFocalPoint;
-        vm.resetFocalPoint = resetFocalPoint;
-
-        /** Sets the css style for the Dot */
-        function updateStyle() {
-            vm.style = {
-                'top': vm.dimensions.top + 'px',
-                'left': vm.dimensions.left + 'px'
-            };
-            vm.overlayStyle = {
-                'width': vm.dimensions.width + 'px',
-                'height': vm.dimensions.height + 'px'
-            };
-
-        };
-
-        function resetFocalPoint() {
-            vm.onValueChanged({
-                left: 0.5,
-                top: 0.5
-            });
-        };
-
-        function setFocalPoint(event) {
-            $scope.$emit("imageFocalPointStart");
-
-            // We do this to get the right position, no matter the focalPoint was clicked.
-            var viewportPosition = imageElement[0].getBoundingClientRect();
-            var offsetX = event.clientX - viewportPosition.left;
-            var offsetY = event.clientY - viewportPosition.top;
-
-            calculateGravity(offsetX, offsetY);
-            $scope.$emit("imageFocalPointStop");
-        };
-
-        /** Initializes the component */
-        function onInit() {
-            if (!vm.center) {
-                vm.center = { left: 0.5, top: 0.5 };
-            }
-        }
-
-        /** Called when the component has linked everything and the DOM is available */
-        function postLink() {
-            //elements
-            imageElement = $element.find("img");
-            focalPointElement = $element.find(".focalPoint");
-
-            //Drag and drop positioning, using jquery ui draggable
-            draggable = focalPointElement.draggable({
-                containment: "parent",
-                start: function () {
-                    $scope.$emit("imageFocalPointStart");
-                },
-                stop: function (event, ui) {
-
-                    var offsetX = ui.position.left;
-                    var offsetY = ui.position.top;
-
-                    $scope.$evalAsync(calculateGravity(offsetX, offsetY));
-
-                    $scope.$emit("imageFocalPointStop");
-
-                }
-            });
-
-            window.addEventListener('resize.umbImageGravity', onResizeHandler);
-            window.addEventListener('resize', onResizeHandler);
-
-
-            //if any ancestor directive emits this event, we need to resize
-            $scope.$on("editors.content.splitViewChanged", function () {
-                $timeout(resized, 200);
-            });
-
-            //listen for the image DOM element loading
-            imageElement.on("load", function () {
-                $timeout(function () {
-
-                    vm.isCroppable = true;
-                    vm.hasDimensions = true;
-
-                    if (vm.src) {
-                        if (vm.src.endsWith(".svg")) {
-                            vm.isCroppable = false;
-                            vm.hasDimensions = false;
-                        }
-                        else {
-                            // From: https://stackoverflow.com/a/51789597/5018
-                            var type = vm.src.substring(vm.src.indexOf("/") + 1, vm.src.indexOf(";base64"));
-                            if (type.startsWith("svg")) {
-                                vm.isCroppable = false;
-                                vm.hasDimensions = false;
-                            }
-                        }
-                    }
-
-                    setDimensions();
-                    updateStyle();
-
-                    vm.loaded = true;
-                    if (vm.onImageLoaded) {
-                        vm.onImageLoaded({
-                            "isCroppable": vm.isCroppable,
-                            "hasDimensions": vm.hasDimensions
-                        });
-                    }
-                }, 100);
-            });
-        }
-
-        function onDestroy() {
-            window.removeEventListener('resize.umbImageGravity', onResizeHandler);
-            window.removeEventListener('resize', onResizeHandler);
-            /*
-            if (focalPointElement) {
-                // TODO: This should be destroyed but this will throw an exception:
-                // "cannot call methods on draggable prior to initialization; attempted to call method 'destroy'"
-                // I've tried lots of things and cannot get this to work, we weren't destroying before so hopefully
-                // there's no mem leaks?
-                focalPointElement.draggable("destroy");
-            }
-            */
-            if (imageElement) {
-                imageElement.off("load");
-            }
-        }
-
-        /** Called when we need to resize based on window or DOM dimensions to re-center the focal point */
-        function resized() {
-            $timeout(function () {
-                setDimensions();
-                updateStyle();
-            });
-            /*
-            // Make sure we can find the offset values for the overlay(dot) before calculating
-            // fixes issue with resize event when printing the page (ex. hitting ctrl+p inside the rte)
-            if (focalPointElement.is(':visible')) {
-                var offsetX = focalPointElement[0].offsetLeft;
-                var offsetY = focalPointElement[0].offsetTop;
-                calculateGravity(offsetX, offsetY);
-            }
-            */
-        }
-
-        function onResizeHandler() {
-            $scope.$evalAsync(resized);
-        }
-
-        /** Watches the one way binding changes */
-        function onChanges(changes) {
-            if (changes.center && !changes.center.isFirstChange()
-                && changes.center.currentValue
-                && !Utilities.equals(changes.center.currentValue, changes.center.previousValue)) {
-                //when center changes update the dimensions
-                setDimensions();
-                updateStyle();
-            }
-        }
-
-        /** Sets the width/height/left/top dimentions based on the image size and the "center" value */
-        function setDimensions() {
-
-            if (vm.isCroppable && imageElement && vm.center) {
-                vm.dimensions.width = imageElement.width();
-                vm.dimensions.height = imageElement.height();
-                vm.dimensions.left = vm.center.left * vm.dimensions.width;
-                vm.dimensions.top = vm.center.top * vm.dimensions.height;
-            }
-
-            return vm.dimensions.width;
-        };
-
-        /**
-         * based on the offset selected calculates the "center" value and calls the callback
-         * @param {any} offsetX
-         * @param {any} offsetY
-         */
-        function calculateGravity(offsetX, offsetY) {
-            vm.onValueChanged({
-                left: Math.min(Math.max(offsetX, 0), vm.dimensions.width) / vm.dimensions.width,
-                top: Math.min(Math.max(offsetY, 0), vm.dimensions.height) / vm.dimensions.height
-            });
-        };
-
-    }
-
-    var umbImageGravityComponent = {
-        templateUrl: 'views/components/imaging/umb-image-gravity.html',
-        bindings: {
-            src: "<",
-            center: "<",
-            onImageLoaded: "&?",
-            onValueChanged: "&",
-            disableFocalPoint: "<?"
-        },
-        controllerAs: 'vm',
-        controller: umbImageGravityController
-    };
-
-    angular.module("umbraco.directives")
-        .component('umbImageGravity', umbImageGravityComponent);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagethumbnail.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagethumbnail.directive.js
deleted file mode 100644
index 1ac5c5fdf3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagethumbnail.directive.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbImageThumbnail
-* @restrict E
-* @function
-* @description
-**/
-angular.module("umbraco.directives")
-	.directive('umbImageThumbnail',
-		function ($timeout, localizationService, cropperHelper, $log) {
-	    return {
-				restrict: 'E',
-				replace: true,
-				templateUrl: 'views/components/imaging/umb-image-thumbnail.html',
-
-				scope: {
-					src: '=',
-					width: '@',
-					height: '@',
-					center: "=",
-					crop: "=",
-					maxSize: '@'
-				},
-
-				link: function(scope, element, attrs) {
-					//// INIT /////
-					var $image = element.find("img");
-					scope.loaded = false;
-
-                    $image.on("load", function() {
-                        $timeout(function () {
-                            $image.width("auto");
-                            $image.height("auto");
-
-                            scope.image = {};
-                            scope.image.width = $image[0].width;
-                            scope.image.height = $image[0].height;
-
-                            //we force a lower thumbnail size to fit the max size
-                            //we do not compare to the image dimensions, but the thumbs
-                            if (scope.maxSize) {
-                                var ratioCalculation = cropperHelper.calculateAspectRatioFit(
-                                    scope.width,
-                                    scope.height,
-                                    scope.maxSize,
-                                    scope.maxSize,
-                                    false);
-
-                                //so if we have a max size, override the thumb sizes
-                                scope.width = ratioCalculation.width;
-                                scope.height = ratioCalculation.height;
-                            }
-
-                            setPreviewStyle();
-                            scope.loaded = true;
-                        });
-                    })
-
-					/// WATCHERS ////
-					scope.$watchCollection('[crop, center]', function(newValues, oldValues){
-							//we have to reinit the whole thing if
-							//one of the external params changes
-							setPreviewStyle();
-					});
-
-					scope.$watch("center", function(){
-						setPreviewStyle();
-					}, true);
-
-					function setPreviewStyle(){
-						if(scope.crop && scope.image){
-							scope.preview = cropperHelper.convertToStyle(
-												scope.crop,
-												scope.image,
-												{width: scope.width, height: scope.height},
-												0);
-						}else if(scope.image){
-
-							//returns size fitting the cropper
-							var p = cropperHelper.calculateAspectRatioFit(
-									scope.image.width,
-									scope.image.height,
-									scope.width,
-									scope.height,
-									true);
-
-
-							if(scope.center){
-								var xy = cropperHelper.alignToCoordinates(p, scope.center, {width: scope.width, height: scope.height});
-								p.top = xy.top;
-								p.left = xy.left;
-							}
-
-							p.position = "absolute";
-							scope.preview = p;
-						}
-					}
-				}
-			};
-		});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/localization/localize.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/localization/localize.directive.js
deleted file mode 100644
index 6fea8d8c84..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/localization/localize.directive.js
+++ /dev/null
@@ -1,101 +0,0 @@
-angular.module('umbraco.directives')
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:localize
-* @restrict EA
-* @function
-* @description
-* <div>
-*   Used to localize text in HTMl-elements or attributes using translation keys. Translations are stored in umbraco/config/lang/ or the /lang-folder of a package i App_Plugins.
-* </div>
-* <div>
-*   <strong>Component/Element</strong><br />
-    *   Localize a specific token to put into the HTML as an item
-* </div>
-* <div>
-*   <strong>Attribute</strong><br />
-    *   Add a HTML attribute to an element containing the HTML attribute name you wish to localise
-    *   Using the format of '@section_key' or 'section_key'
-* </div>
-* ##Basic Usage
-* <pre>
-* <!-- Component -->
-* <localize key="general_close">Close</localize>
-* <localize key="section_key">Fallback value</localize>
-*
-* <!-- Attribute -->
-* <input type="text" localize="placeholder" placeholder="@placeholders_entername" />
-* <input type="text" localize="placeholder,title" title="@section_key" placeholder="@placeholders_entername" />
-* <div localize="title" title="@section_key"></div>
-* </pre>
-* ##Use with tokens
-* Also supports tokens inside the translation key, example of a translation
-* <pre>
-*   <key alias="characters_left">You have %0% characters left of %1%</key>
-* </pre>
-* Can be used like this:
-* <pre>
-*   <localize key="general_characters_left" tokens="[5,100]" watch-tokens="true">You have %0% characters left of %1%</localize>
-*   <!-- Renders: You have 5 characters left of 100 -->
-* </pre>
-* Where the "tokens"-attribute is an array of tokens for the translations, "watch-tokens" will make the component watch the expression passed.
-**/
-.directive('localize', function ($log, localizationService) {
-    return {
-        restrict: 'E',
-        scope: {
-            key: '@',
-            tokens: '=',
-            watchTokens: '@'
-        },
-        replace: true,
-        link: function (scope, element, attrs) {
-            var key = scope.key;
-                scope.text = '';
-
-                // A render function to be able to update tokens as values update.
-            function render() {
-                element.html(localizationService.tokenReplace(scope.text, scope.tokens || null));
-            }
-
-            // As per component definition in ngdoc above, the initial inner html of the element is to be used as fallback value
-                var fallbackValue = element.html();
-                localizationService.localize(key, null, fallbackValue).then(function (value) {
-                scope.text = value;
-                render();
-            });
-
-            if (scope.watchTokens === 'true') {
-                scope.$watch("tokens", render, true);
-            }
-        }
-    };
-})
-.directive('localize', function ($log, localizationService) {
-    return {
-        restrict: 'A',
-        link: function (scope, element, attrs) {
-                //Support one or more attribute properties to update
-            var keys = attrs.localize.split(',');
-
-            Utilities.forEach(keys, (value, key) => {
-                var attr = element.attr(value);
-                if (attr) {
-                        // Localizing is done async, so make sure the key isn't visible
-                        element.removeAttr(value);
-
-                    if (attr[0] === '@') {
-                        //If the translation key starts with @ then remove it
-                        attr = attr.substring(1);
-                    }
-
-                    var t = localizationService.tokenize(attr, scope);
-
-                    localizationService.localize(t.key, t.tokens).then(function (val) {
-                        element.attr(value, val);
-                    });
-                }
-            });
-        }
-    };
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
deleted file mode 100644
index 30bb2b6f3f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
+++ /dev/null
@@ -1,203 +0,0 @@
-(function () {
-    'use strict';
-
-  function MediaNodeInfoDirective($timeout, logResource, $location, $q, eventsService, userService, dateHelper, editorService, mediaHelper, mediaResource) {
-
-        function link(scope, element, attrs, ctrl) {
-
-            var evts = [];
-            var isInfoTab = false;
-            var auditTrailLoaded = false;
-
-            scope.allowChangeMediaType = false;
-            scope.historyLabelKey = "general_history";
-            scope.auditTrailOptions = {
-              id: scope.node.id
-            };
-
-            scope.auditTrailPageChange = function (pageNumber) {
-              scope.auditTrailOptions.pageNumber = pageNumber;
-              loadAuditTrail(true);
-            };
-
-            function loadAuditTrail(forceReload) {
-
-              //don't load this if it's already done
-              if (auditTrailLoaded && !forceReload) {
-                return;
-              }
-
-              scope.loadingAuditTrail = true;
-
-              logResource.getPagedEntityLog(scope.auditTrailOptions)
-                .then(data => {
-
-                  // get current backoffice user and format dates
-                  userService.getCurrentUser().then(currentUser => {
-                    data.items.forEach(item => {
-                      item.timestampFormatted = dateHelper.getLocalDate(item.timestamp, currentUser.locale, 'LLL');
-                    });
-                  });
-
-                  scope.auditTrail = data.items;
-                  scope.auditTrailOptions.pageNumber = data.pageNumber;
-                  scope.auditTrailOptions.pageSize = data.pageSize;
-                  scope.auditTrailOptions.totalItems = data.totalItems;
-                  scope.auditTrailOptions.totalPages = data.totalPages;
-
-                  setAuditTrailLogTypeColor(scope.auditTrail);
-
-                  scope.loadingAuditTrail = false;
-
-                  auditTrailLoaded = true;
-                });
-
-            }
-
-            function setAuditTrailLogTypeColor(auditTrail) {
-              auditTrail.forEach(item => {
-
-                switch (item.logType) {
-                  case "Save":
-                    item.logTypeColor = "success";
-                    break;
-                  case "Delete":
-                    item.logTypeColor = "danger";
-                    break;
-                  default:
-                    item.logTypeColor = "gray";
-                }
-              });
-            }
-
-            function onInit() {
-
-                userService.getCurrentUser().then(user => {
-                    // only allow change of media type if user has access to the settings sections
-                    Utilities.forEach(user.sections, section => {
-                        if (section.alias === "settings") {
-                            scope.allowChangeMediaType = true;
-                        }
-                    });
-                });
-
-                // get media type details
-                scope.mediaType = scope.node.contentType;
-
-                // set the media link initially
-                setMediaLink();
-
-                // make sure dates are formatted to the user's locale
-                formatDatesToLocal();
-
-                // set media file extension initially
-                setMediaExtension();
-
-                var activeApp = scope.node.apps.find(a => a.active);
-                if (activeApp.alias === "umbInfo") {
-                  loadAuditTrail();
-                  isInfoTab = true;
-                }
-            }
-
-            function formatDatesToLocal() {
-                // get current backoffice user and format dates
-                userService.getCurrentUser().then(currentUser => {
-                    scope.node.createDateFormatted = dateHelper.getLocalDate(scope.node.createDate, currentUser.locale, 'LLL');
-                    scope.node.updateDateFormatted = dateHelper.getLocalDate(scope.node.updateDate, currentUser.locale, 'LLL');
-                });
-            }
-
-            function setMediaLink(){
-                scope.nodeUrl = scope.node.mediaLink;
-                // grab the file name from the URL and use it as the display name in the file link
-                var match = /.*\/(.*)/.exec(scope.nodeUrl);
-                if (match) {
-                    scope.nodeFileName = match[1];
-                } else {
-                    scope.nodeFileName = scope.nodeUrl;
-                }
-            }
-
-            function setMediaExtension() {
-                scope.node.extension = mediaHelper.getFileExtension(scope.nodeUrl);
-            }
-
-            scope.openMediaType = mediaType => {
-                var editor = {
-                    id: mediaType.id,
-                    submit: model => {
-                        editorService.close();
-                    },
-                    close: () => {
-                        editorService.close();
-                    }
-                };
-                editorService.mediaTypeEditor(editor);
-            };
-
-            scope.openSVG = () => {
-                var popup = window.open('', '_blank');
-                var html = '<!DOCTYPE html><body><img src="' + scope.nodeUrl + '"/>' +
-                    '<script>history.pushState(null, null,"' + $location.$$absUrl + '");</script></body>';
-                
-                popup.document.open();
-                popup.document.write(html);
-                popup.document.close();
-            }
-
-            // watch for content updates - reload content when node is saved, published etc.
-            scope.$watch('node.updateDate', function(newValue, oldValue){
-                if(!newValue) { return; }
-                if(newValue === oldValue) { return; }
-
-                // Update the media link
-                setMediaLink();
-
-                // Update the create and update dates
-                formatDatesToLocal();
-
-                //Update the media file format
-                setMediaExtension();
-
-                loadAuditTrail(true);
-            });
-
-            //ensure to unregister from all events!
-            scope.$on('$destroy', function () {
-                for (var e in evts) {
-                    eventsService.unsubscribe(evts[e]);
-                }
-            });
-
-            evts.push(eventsService.on("app.tabChange", function (event, args) {
-              $timeout(function () {
-                if (args.alias === "umbInfo") {
-                  isInfoTab = true;
-                  loadAuditTrail();
-                  formatDatesToLocal();
-                } else {
-                  isInfoTab = false;
-                }
-              });
-            }));
-
-            onInit();
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/media/umb-media-node-info.html',
-            scope: {
-                node: "="
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbMediaNodeInfo', MediaNodeInfoDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembergroupnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembergroupnodeinfo.directive.js
deleted file mode 100644
index 10e1291731..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembergroupnodeinfo.directive.js
+++ /dev/null
@@ -1,58 +0,0 @@
-(function () {
-    'use strict';
-
-    function MemberGroupNodeInfoDirective(eventsService, userService, dateHelper) {
-
-        function link(scope, element, attrs, ctrl) {
-
-            var evts = [];
-
-            function onInit() {
-
-                // make sure dates are formatted to the user's locale
-                formatDatesToLocal();
-            }
-
-            function formatDatesToLocal() {
-                // get current backoffice user and format dates
-                userService.getCurrentUser().then(function (currentUser) {
-                    scope.node.createDateFormatted = dateHelper.getLocalDate(scope.node.createDate, currentUser.locale, 'LLL');
-                    scope.node.updateDateFormatted = dateHelper.getLocalDate(scope.node.updateDate, currentUser.locale, 'LLL');
-                });
-            }
-
-            // watch for content updates - reload content when node is saved, published etc.
-            scope.$watch('node.updateDate', function(newValue, oldValue){
-                if(!newValue) { return; }
-                if(newValue === oldValue) { return; }
-
-                // Update the create and update dates
-                formatDatesToLocal();
-            });
-
-            //ensure to unregister from all events!
-            scope.$on('$destroy', function () {
-                for (var e in evts) {
-                    eventsService.unsubscribe(evts[e]);
-                }
-            });
-
-            onInit();
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/member/umb-membergroup-node-info.html',
-            scope: {
-                node: "="
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbMembergroupNodeInfo', MemberGroupNodeInfoDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembernodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembernodeinfo.directive.js
deleted file mode 100644
index 8dd6d56139..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembernodeinfo.directive.js
+++ /dev/null
@@ -1,86 +0,0 @@
-(function () {
-    'use strict';
-
-    function MemberNodeInfoDirective($timeout, $location, eventsService, userService, dateHelper, editorService) {
-
-        function link(scope, element, attrs, ctrl) {
-
-            var evts = [];
-
-            //TODO: Infinite editing is not working yet.
-            scope.allowChangeMemberType = false;
-
-            function onInit() {
-                
-                userService.getCurrentUser().then(function (user) {
-                    // only allow change of member type if user has access to the settings sections
-                    Utilities.forEach(user.sections, function (section) {
-                        if (section.alias === "settings") {
-                            scope.allowChangeMemberType = true;
-                        }
-                    });
-                });
-
-                // get member type details
-                scope.memberType = scope.node.contentType;
-
-                // make sure dates are formatted to the user's locale
-                formatDatesToLocal();
-            }
-
-            function formatDatesToLocal() {
-                // get current backoffice user and format dates
-                userService.getCurrentUser().then(function (currentUser) {
-                    scope.node.createDateFormatted = dateHelper.getLocalDate(scope.node.createDate, currentUser.locale, 'LLL');
-                    scope.node.updateDateFormatted = dateHelper.getLocalDate(scope.node.updateDate, currentUser.locale, 'LLL');
-                });
-            }
-
-            scope.openMemberType = function (memberType) {
-                var editor = {
-                    id: memberType.id,
-                    submit: function (model) {
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-                editorService.memberTypeEditor(editor);
-            };
-
-            // watch for content updates - reload content when node is saved, published etc.
-            scope.$watch('node.updateDate', function (newValue, oldValue) {
-                if (!newValue) { return; }
-                if (newValue === oldValue) { return; }
-
-                // Update the create and update dates
-                formatDatesToLocal();
-            });
-
-            //ensure to unregister from all events!
-            scope.$on('$destroy', function () {
-                for (var e in evts) {
-                    eventsService.unsubscribe(evts[e]);
-                }
-            });
-
-            onInit();
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/member/umb-member-node-info.html',
-            scope: {
-                node: "="
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbMemberNodeInfo', MemberNodeInfoDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/notifications/umbnotifications.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/notifications/umbnotifications.directive.js
deleted file mode 100644
index 3b74693d65..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/notifications/umbnotifications.directive.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @ngdoc directive
- * @name umbraco.directives.directive:umbNotifications
- */
-
-(function() {
-   'use strict';
-
-   function NotificationDirective(notificationsService) {
-
-      function link(scope, el, attr, ctrl) {
-
-         //subscribes to notifications in the notification service
-         scope.notifications = notificationsService.current;
-         scope.$watch('notificationsService.current', function (newVal, oldVal, scope) {
-             if (newVal) {
-                 scope.notifications = newVal;
-             }
-         });
-
-      }
-
-      var directive = {
-         restrict: "E",
-         replace: true,
-         templateUrl: 'views/components/notifications/umb-notifications.html',
-         link: link
-      };
-
-      return directive;
-
-   }
-
-   angular.module('umbraco.directives').directive('umbNotifications', NotificationDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
deleted file mode 100644
index f02178064a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
+++ /dev/null
@@ -1,553 +0,0 @@
-/**
-@name umbraco.directives.directive:umbOverlay*
-@deprecated
-@restrict E
-@scope
-
-@description
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <button type="button" ng-click="vm.openOverlay()"></button>
-
-        <umb-overlay
-            ng-if="vm.overlay.show"
-            model="vm.overlay"
-            view="vm.overlay.view"
-            position="right">
-        </umb-overlay>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-
-            vm.openOverlay = openOverlay;
-
-            function openOverlay() {
-
-                vm.overlay = {
-                    view: "mediapicker",
-                    show: true,
-                    submit: function(model) {
-
-                        vm.overlay.show = false;
-                        vm.overlay = null;
-                    },
-                    close: function(oldModel) {
-                        vm.overlay.show = false;
-                        vm.overlay = null;
-                    }
-                }
-
-            };
-
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-
-<h1>General Options</h1>
-<table>
-    <thead>
-        <tr>
-            <th>Param</th>
-            <th>Type</th>
-            <th>Details</th>
-        </tr>
-    </thead>
-    <tr>
-        <td>model.title</td>
-        <td>String</td>
-        <td>Set the title of the overlay.</td>
-    </tr>
-    <tr>
-        <td>model.subtitle</td>
-        <td>String</td>
-        <td>Set the subtitle of the overlay.</td>
-    </tr>
-    <tr>
-        <td>model.submitButtonLabel</td>
-        <td>String</td>
-        <td>Set an alternate submit button text</td>
-    </tr>
-    <tr>
-        <td>model.submitButtonLabelKey</td>
-        <td>String</td>
-        <td>Set an alternate submit button label key for localized texts</td>
-    </tr>
-    <tr>
-        <td>model.submitButtonState</td>
-        <td>String</td>
-        <td>Set the state for the submit button</td>
-    </tr>
-    <tr>
-        <td>model.hideSubmitButton</td>
-        <td>Boolean</td>
-        <td>Hides the submit button</td>
-    </tr>
-    <tr>
-        <td>model.closeButtonLabel</td>
-        <td>String</td>
-        <td>Set an alternate close button text</td>
-    </tr>
-    <tr>
-        <td>model.closeButtonLabelKey</td>
-        <td>String</td>
-        <td>Set an alternate close button label key for localized texts</td>
-    </tr>
-    <tr>
-        <td>model.show</td>
-        <td>Boolean</td>
-        <td>Show/hide the overlay</td>
-    </tr>
-    <tr>
-        <td>model.submit</td>
-        <td>Function</td>
-        <td>Callback function when the overlay submits. Returns the overlay model object</td>
-    </tr>
-    <tr>
-        <td>model.close</td>
-        <td>Function</td>
-        <td>Callback function when the overlay closes. Returns a copy of the overlay model object before being modified</td>
-    </tr>
-</table>
-
-<h1>Item Picker</h1>
-Opens an item picker.</br>
-<strong>view: </strong>itempicker
-<table>
-    <thead>
-        <tr>
-            <th>Param</th>
-            <th>Type</th>
-            <th>Details</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td>model.availableItems</td>
-            <td>Array</td>
-            <td>Array of available items</td>
-        </tr>
-        <tr>
-            <td>model.selectedItems</td>
-            <td>Array</td>
-            <td>Array of selected items. When passed in the selected items will be filtered from the available items.</td>
-        </tr>
-        <tr>
-            <td>model.filter</td>
-            <td>Boolean</td>
-            <td>Set to false to hide the filter</td>
-        </tr>
-    </tbody>
-</table>
-<table>
-    <thead>
-        <tr>
-            <th>Returns</th>
-            <th>Type</th>
-            <th>Details</th>
-        </tr>
-    </thead>
-    <tr>
-        <td>model.selectedItem</td>
-        <td>Object</td>
-        <td>The selected item</td>
-    </tr>
-</table>
-
-<h1>YSOD</h1>
-Opens an overlay to show a custom YSOD. </br>
-<strong>view: </strong>ysod
-<table>
-    <thead>
-        <tr>
-            <th>Param</th>
-            <th>Type</th>
-            <th>Details</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td>model.error</td>
-            <td>Object</td>
-            <td>Error object</td>
-        </tr>
-    </tbody>
-</table>
-
-@param {object} model Overlay options.
-@param {string} view Path to view or one of the default view names.
-@param {string} position The overlay position ("left", "right", "center": "target").
-**/
-
-(function () {
-    'use strict';
-
-    function OverlayDirective($timeout, formHelper, overlayHelper, localizationService, $q, $templateCache, $http, $compile) {
-
-        function link(scope, el, attr, ctrl) {
-
-            scope.directive = {
-                enableConfirmButton: false
-            };
-
-            var overlayNumber = 0;
-            var numberOfOverlays = 0;
-            var isRegistered = false;
-
-
-            var modelCopy = {};
-            var unsubscribe = [];
-
-            function activate() {
-                setView();
-
-                setButtonText();
-
-                modelCopy = makeModelCopy(scope.model);
-
-                $timeout(function () {
-
-                    if (!scope.name) {
-                        scope.name = 'overlay';
-                    }
-
-                    if (scope.position === "target" && scope.model.event) {
-                        setTargetPosition();
-
-                        // update the position of the overlay on content changes
-                        // as these affect the layout/size of the overlay
-                        if ('ResizeObserver' in window) {
-                            var resizeObserver = new ResizeObserver(setTargetPosition);
-                            var contentArea = document.getElementById("contentwrapper");
-                            resizeObserver.observe(el[0]);
-                            if (contentArea) {
-                                resizeObserver.observe(contentArea);
-                            }
-                            unsubscribe.push(function () {
-                                resizeObserver.disconnect();
-                            });
-                        }
-                    }
-
-                    // this has to be done inside a timeout to ensure the destroy
-                    // event on other overlays is run before registering a new one
-                    registerOverlay();
-
-                    setOverlayIndent();
-
-                    focusOnOverlayHeading()
-                });
-
-            }
-
-            // Ideally this would focus on the first natively focusable element in the overlay, but as the content can be dynamic, it is focusing on the heading.
-            function focusOnOverlayHeading() {
-                var heading = el.find(".umb-overlay__title");
-
-                if (heading) {
-                    heading.focus();
-                }
-            }
-
-            function setView() {
-
-                if (scope.view) {
-
-                    if (scope.view.indexOf(".html") === -1) {
-                        var viewAlias = scope.view.toLowerCase();
-                        scope.view = "views/common/overlays/" + viewAlias + "/" + viewAlias + ".html";
-                    }
-
-                    //if a custom parent scope is defined then we need to manually compile the view
-                    if (scope.parentScope) {
-                        var element = el.find(".scoped-view");
-                        $http.get(scope.view, { cache: $templateCache })
-                            .then(function (response) {
-                                var templateScope = scope.parentScope.$new();
-                                unsubscribe.push(function () {
-                                    templateScope.$destroy();
-                                });
-                                templateScope.model = scope.model;
-                                element.html(response.data);
-                                element.show();
-                                $compile(element)(templateScope);
-                            });
-                    }
-                }
-
-            }
-
-            function setButtonText() {
-
-                var labelKeys = [
-                    "general_close",
-                    "general_submit"
-                ];
-
-                localizationService.localizeMany(labelKeys).then(function (values) {
-                    if (!scope.model.closeButtonLabelKey && !scope.model.closeButtonLabel) {
-                        scope.model.closeButtonLabel = values[0];
-                    }
-                    if (!scope.model.submitButtonLabelKey && !scope.model.submitButtonLabel) {
-                        scope.model.submitButtonLabel = values[1];
-                    }
-                });
-            }
-
-            function registerOverlay() {
-
-                overlayNumber = overlayHelper.registerOverlay();
-
-                $(document).on("keydown.overlay-" + overlayNumber, function (event) {
-
-                    if (event.which === 27) {
-
-                        numberOfOverlays = overlayHelper.getNumberOfOverlays();
-
-                        if (numberOfOverlays === overlayNumber && !scope.model.disableEscKey) {
-                            scope.$apply(function () {
-                                scope.closeOverLay();
-                            });
-                        }
-
-                        event.stopPropagation();
-                        event.preventDefault();
-                    }
-
-                    if (event.which === 13) {
-
-                        numberOfOverlays = overlayHelper.getNumberOfOverlays();
-
-                        if (numberOfOverlays === overlayNumber) {
-
-                            var activeElementType = document.activeElement.tagName;
-                            var clickableElements = ["A", "BUTTON"];
-                            var submitOnEnter = document.activeElement.hasAttribute("overlay-submit-on-enter");
-                            var submitOnEnterValue = submitOnEnter ? document.activeElement.getAttribute("overlay-submit-on-enter") : "";
-
-                            if (clickableElements.indexOf(activeElementType) >= 0) {
-                                // don't do anything, let the browser Enter key handle this
-                            } else if (activeElementType === "TEXTAREA" && !submitOnEnter) {
-                              // don't do anything
-                            } else if (submitOnEnter && submitOnEnterValue === "false") {
-                                // don't do anything
-                            } else {
-                                scope.$apply(function () {
-                                    scope.submitForm(scope.model);
-                                });
-                                event.preventDefault();
-                            }
-
-                        }
-
-                    }
-
-                });
-
-                isRegistered = true;
-
-            }
-
-            function unregisterOverlay() {
-
-                if (isRegistered) {
-
-                    overlayHelper.unregisterOverlay();
-
-                    $(document).off("keydown.overlay-" + overlayNumber);
-
-                    isRegistered = false;
-                }
-
-            }
-
-            function makeModelCopy(object) {
-
-                var newObject = {};
-
-                for (var key in object) {
-                    if (key !== "event" && key !== "parentScope") {
-                        newObject[key] = Utilities.copy(object[key]);
-                    }
-                }
-
-                return newObject;
-
-            }
-
-            function setOverlayIndent() {
-
-                var overlayIndex = overlayNumber - 1;
-                var indentSize = overlayIndex * 20;
-                var overlayWidth = el[0].clientWidth;
-
-                el.css('width', overlayWidth - indentSize);
-
-                if (scope.position === "center" && overlayIndex > 0 || scope.position === "target" && overlayIndex > 0) {
-                    var overlayTopPosition = el[0].offsetTop;
-                    el.css('top', overlayTopPosition + indentSize);
-                }
-
-            }
-
-            function setTargetPosition() {
-
-                var overlay = $(scope.model.event.target).closest('.umb-overlay');
-                var container = overlay.length > 0 ? overlay : $("#contentwrapper");
-
-                let rect = container[0].getBoundingClientRect();
-
-                var containerLeft = rect.left;
-                var containerRight = containerLeft + rect.width;
-                var containerTop = rect.top;
-                var containerBottom = containerTop + rect.height;
-
-                var mousePositionClickX = null;
-                var mousePositionClickY = null;
-                var elementHeight = null;
-                var elementWidth = null;
-
-                var position = {
-                    right: "inherit",
-                    left: "inherit",
-                    top: "inherit",
-                    bottom: "inherit"
-                };
-
-                // click position
-                mousePositionClickX = scope.model.event.pageX;
-                mousePositionClickY = scope.model.event.pageY;
-
-                // element size
-                elementHeight = el[0].clientHeight;
-                elementWidth = el[0].clientWidth;
-
-                // move element to this position
-                // when using hotkey it fallback to center of container
-                position.left = mousePositionClickX ? mousePositionClickX - (elementWidth / 2) : (containerLeft + containerRight) / 2 - (elementWidth / 2);
-                position.top = mousePositionClickY ? mousePositionClickY - (elementHeight / 2) : (containerTop + containerBottom) / 2 - (elementHeight / 2);
-
-                // check to see if element is outside screen
-                // outside right
-                if (position.left + elementWidth > containerRight) {
-                    position.right = 10;
-                    position.left = "inherit";
-                }
-
-                // outside bottom
-                if (position.top + elementHeight > containerBottom) {
-                    position.bottom = 10;
-                    position.top = "inherit";
-                }
-
-                // outside left
-                if (position.left < containerLeft) {
-                    position.left = containerLeft + 10;
-                    position.right = "inherit";
-                }
-
-                // outside top
-                if (position.top < containerTop) {
-                    position.top = 10;
-                    position.bottom = "inherit";
-                }
-
-                el.css(position);
-                el.css("visibility", "visible");
-            }
-
-            scope.submitForm = function (model) {
-                if (scope.model.submit) {
-                    if (formHelper.submitForm({ scope: scope, skipValidation: scope.model.skipFormValidation, keepServerValidation: true })) {
-
-                        if (scope.model.confirmSubmit && scope.model.confirmSubmit.enable && !scope.directive.enableConfirmButton) {
-                            //wrap in a when since we don't know if this is a promise or not
-                            $q.when(scope.model.submit(model, modelCopy, scope.directive.enableConfirmButton)).then(
-                                function () {
-                                    formHelper.resetForm({ scope: scope });
-                                });
-                        } else {
-                            unregisterOverlay();
-                            //wrap in a when since we don't know if this is a promise or not
-                            $q.when(scope.model.submit(model, modelCopy, scope.directive.enableConfirmButton)).then(
-                                function () {
-                                    formHelper.resetForm({ scope: scope });
-                                });
-                        }
-
-                    }
-                }
-            };
-
-            scope.cancelConfirmSubmit = function () {
-                scope.model.confirmSubmit.show = false;
-            };
-
-            scope.closeOverLay = function () {
-
-                unregisterOverlay();
-
-                if (scope.model && scope.model.close) {
-                    scope.model = modelCopy;
-                    scope.model.close(scope.model);
-                } else {
-                    scope.model.show = false;
-                    scope.model = null;
-                }
-
-            };
-
-            scope.outSideClick = function () {
-                if (!scope.model.disableBackdropClick) {
-                    scope.closeOverLay();
-                }
-            };
-
-            unsubscribe.push(unregisterOverlay);
-            scope.$on('$destroy', function () {
-                for (var i = 0; i < unsubscribe.length; i++) {
-                    unsubscribe[i]();
-                }
-            });
-
-            activate();
-
-        }
-
-        var directive = {
-            transclude: true,
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/overlays/umb-overlay.html',
-            scope: {
-                ngShow: "=",
-                model: "=",
-                view: "=",
-                position: "@",
-                size: "=?",
-                name: "=?",
-                parentScope: "=?"
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbOverlay', OverlayDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlaybackdrop.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlaybackdrop.directive.js
deleted file mode 100644
index 6c5fb86134..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlaybackdrop.directive.js
+++ /dev/null
@@ -1,32 +0,0 @@
-(function () {
-    'use strict';
-
-    function OverlayBackdropDirective(overlayHelper) {
-
-        function link(scope, el, attr, ctrl) {
-
-            scope.numberOfOverlays = 0;
-
-            // TODO: this shouldn't be a watch, this should be based on an event handler
-            scope.$watch(function () {
-                return overlayHelper.getNumberOfOverlays();
-            }, function (newValue) {
-                scope.numberOfOverlays = newValue;
-            });
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/overlays/umb-overlay-backdrop.html',
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbOverlayBackdrop', OverlayBackdropDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
deleted file mode 100644
index 11efb4b811..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbProperty
-* @restrict E
-**/
-(function () {
-    'use strict';
-
-    angular
-        .module("umbraco.directives")
-        .component('umbProperty', {
-            templateUrl: 'views/components/property/umb-property.html',
-            controller: UmbPropertyController,
-            controllerAs: 'vm',
-            transclude: true,
-            require: {
-                parentUmbProperty: '?^^umbProperty',
-                parentForm: '?^^form'
-            },
-            bindings: {
-                property: "=",
-                node: "<",
-                elementKey: "@",
-                // optional, if set this will be used for the property alias validation path (hack required because NC changes the actual property.alias :/)
-                propertyAlias: "@",
-                showInherit: "<",
-                inheritsFrom: "<",
-                hideLabel: "<?"
-            }
-        });
-
-    
-
-    function UmbPropertyController($scope, userService, serverValidationManager, udiService, angularHelper) {
-
-        const vm = this;
-
-        vm.$onInit = onInit;
-
-        vm.setDirty = function () {
-            // NOTE: We need to use scope because we haven't changd it to vm.propertyForm in the html and that
-            // might mean a breaking change.
-            $scope.propertyForm.$setDirty();
-        }
-
-        vm.setPropertyError = function (errorMsg) {
-            vm.property.propertyErrorMessage = errorMsg;
-        };
-
-        vm.propertyActions = [];
-        vm.setPropertyActions = function (actions) {
-            vm.propertyActions = actions;
-        };
-
-        // returns the validation path for the property to be used as the validation key for server side validation logic
-        vm.getValidationPath = function () {
-
-            var parentValidationPath = vm.parentUmbProperty ? vm.parentUmbProperty.getValidationPath() : null;            
-            var propAlias = vm.propertyAlias ? vm.propertyAlias : vm.property.alias;
-            // the elementKey will be empty when this is not a nested property
-            var valPath = vm.elementKey ? vm.elementKey + "/" + propAlias : propAlias;
-            return serverValidationManager.createPropertyValidationKey(valPath, parentValidationPath);
-        }
-
-        function onInit() {
-            vm.controlLabelTitle = null;
-            vm.controlAriaLabel = null;
-            if (Umbraco.Sys.ServerVariables.isDebuggingEnabled) {
-                userService.getCurrentUser().then(function (u) {
-                    if (u.allowedSections.indexOf("settings") !== -1 ? true : false) {
-                        vm.controlLabelTitle = vm.property.alias;
-                        // capitalize first letter of the alias for screen readers
-                        vm.controlAriaLabel = vm.property.alias.charAt(0).toUpperCase() + vm.property.alias.slice(1);
-                    }
-                });
-            }
-
-            if (!vm.parentUmbProperty) {
-                // not found, then fallback to searching the scope chain, this may be needed when DOM inheritance isn't maintained but scope
-                // inheritance is (i.e.infinite editing)
-                var found = angularHelper.traverseScopeChain($scope, s => s && s.vm && s.vm.constructor.name === "UmbPropertyController");
-                vm.parentUmbProperty = found ? found.vm : null;
-          }
-
-          if (vm.property.description) {
-            // split by lines containing only '--'
-            var descriptionParts = vm.property.description.split(/^--$/gim);
-            if (descriptionParts.length > 1) {
-              // if more than one part, we have an extended description,
-              // combine to one extended description, and remove leading linebreak
-              vm.property.extendedDescription = descriptionParts.splice(1).join("--").substring(1);
-              vm.property.extendedDescriptionVisible = false;
-
-              // set propertydescription to first part, and remove trailing linebreak
-              vm.property.description = descriptionParts[0].slice(0, -1);
-            }
-          }
-        }
-
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyactions.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyactions.component.js
deleted file mode 100644
index e645ffe873..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyactions.component.js
+++ /dev/null
@@ -1,123 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * A component to render the property action toggle
-     */
-    
-    function umbPropertyActionsController(keyboardService, localizationService, $scope) {
-
-        var unsubscribe = [];
-
-        var vm = this;
-
-        vm.isOpen = false;
-        vm.labels = {
-            openText: "Open Property Actions",
-            closeText: "Close Property Actions"
-        };
-
-        vm.open = open;
-        vm.close = close;
-        vm.toggle = toggle;
-        vm.executeAction = executeAction;
-
-        vm.$onDestroy = onDestroy;
-        vm.$onInit = onInit;
-        vm.$onChanges = onChanges;
-
-        function initDropDown() {
-            keyboardService.bind("esc", vm.close);
-        }
-
-        function destroyDropDown() {
-            keyboardService.unbind("esc");
-        }
-
-        function toggle() {
-            if (vm.isOpen === true) {
-                vm.close();
-            } else {
-                vm.open();
-            }
-        }
-
-        function open() {
-            vm.isOpen = true;
-            initDropDown();
-        }
-
-        function close() {
-            vm.isOpen = false;
-            destroyDropDown();
-        }
-
-        function executeAction(action) {
-            action.method();
-            vm.close();
-        }
-
-        function onDestroy() {
-            for (var i = 0; i < unsubscribe.length; i++) {
-                unsubscribe[i]();
-            }
-            if (vm.isOpen === true) {
-                destroyDropDown();
-            }
-        }
-
-        function onInit() {
-            
-            var labelKeys = [
-                "propertyActions_tooltipForPropertyActionsMenu",
-                "propertyActions_tooltipForPropertyActionsMenuClose"
-            ]
-
-            localizationService.localizeMany(labelKeys).then(values => {
-                vm.labels.openText = values[0];
-                vm.labels.closeText = values[1];
-            });
-
-            unsubscribe.push($scope.$watchCollection("vm.actions",
-                function (newValue, oldValue) {
-                    if (newValue !== oldValue) {
-                        updateActions();
-                    }
-                }
-            ));
-        }
-
-        function onChanges(simpleChanges) {
-            if (simpleChanges.actions) {
-                updateActions();
-            }
-        }
-
-        function updateActions() {
-
-            Utilities.forEach(vm.actions || [], action => {
-
-              if (action.labelKey) {
-                  localizationService.localize(action.labelKey, (action.labelTokens || []), action.label).then(data => {
-                    action.label = data;
-                  });
-                  
-                  action.useLegacyIcon = action.useLegacyIcon === false ? false : true;
-                  action.icon = (action.useLegacyIcon && action.icon.indexOf('icon-') !== 0 ? 'icon-' : '') + action.icon;
-              }
-            });
-        }
-    }
-
-    var umbPropertyActionsComponent = {
-        templateUrl: 'views/components/property/umb-property-actions.html',
-        bindings: {
-            actions: "<"
-        },
-        controllerAs: 'vm',
-        controller: umbPropertyActionsController
-    };
-
-    angular.module('umbraco.directives').component('umbPropertyActions', umbPropertyActionsComponent);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyeditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyeditor.directive.js
deleted file mode 100644
index cbe10d4642..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyeditor.directive.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
-* @ngdoc directive
-* @function
-* @name umbraco.directives.directive:umbPropertyEditor 
-* @requires formController
-* @restrict E
-**/
-
-//share property editor directive function
-function umbPropEditor(umbPropEditorHelper, localizationService) {
-        return {
-            scope: {
-                model: "=",
-                preValues: "<",
-                node: "<",
-                isPreValue: "@",
-                preview: "<",
-                allowUnlock: "<?",
-                onUnlock: "&?"
-            },
-            
-            require: ["^^form", "?^umbProperty"],
-            restrict: 'E',
-            replace: true,      
-            templateUrl: 'views/components/property/umb-property-editor.html',
-            link: function (scope, element, attrs, ctrl) {
-
-                scope.readonly = false;
-                scope.labels = {};
-
-                //we need to copy the form controller val to our isolated scope so that
-                //it get's carried down to the child scopes of this!
-                //we'll also maintain the current form name.
-                scope[ctrl[0].$name] = ctrl[0];
-
-                // We will capture a reference to umbProperty in this Directive and pass it on to the Scope, so Property-Editor controllers can use it.
-                scope["umbProperty"] = ctrl[1];
-
-                if(!scope.model.alias){
-                   scope.model.alias = Math.random().toString(36).slice(2);
-                }
-
-                localizationService.localize('languages_invariantPropertyUnlockHelp',  [scope.model.label])
-                    .then(function(value) {
-                        scope.labels.invariantPropertyUnlockHelp = value;
-                    });
-
-                localizationService.localize('languages_invariantCulturePropertyUnlockHelp',  [scope.model.label])
-                    .then(function(value) {
-                        scope.labels.invariantCulturePropertyUnlockHelp = value;
-                    });
-                
-                localizationService.localize('languages_invariantSegmentPropertyUnlockHelp',  [scope.model.label])
-                    .then(function(value) {
-                        scope.labels.invariantSegmentPropertyUnlockHelp = value;
-                    });
-
-                var unbindWatcher = scope.$watch("model.view",
-                    function() {
-                        scope.propertyEditorView = umbPropEditorHelper.getViewPath(scope.model.view, scope.isPreValue);
-                    }
-                );
-
-                scope.unlock = function () {
-                    if (scope.onUnlock) {
-                        scope.onUnlock();
-                    }
-                };
-
-                attrs.$observe('readonly', (value) => {
-                    scope.readonly = value !== undefined;
-                });
-
-                scope.$on("$destroy", function () {
-                    unbindWatcher();
-                });
-            }
-        };
-    };
-
-angular.module("umbraco.directives").directive('umbPropertyEditor', umbPropEditor);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertygroup.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertygroup.directive.js
deleted file mode 100644
index fd2be97b42..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertygroup.directive.js
+++ /dev/null
@@ -1,9 +0,0 @@
-angular.module("umbraco.directives.html")
-    .directive('umbPropertyGroup', function () {
-        return {
-            transclude: true,
-            restrict: 'E',
-            replace: true,        
-            templateUrl: 'views/components/property/umb-property-group.html'
-        };
-    });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/references/umbtrackedreferences.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/references/umbtrackedreferences.component.js
deleted file mode 100644
index 15c1b4aedf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/references/umbtrackedreferences.component.js
+++ /dev/null
@@ -1,124 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * A component to render the tracked references of an item
-     */
-
-    function umbTrackedReferencesController($q, trackedReferencesResource, localizationService) {
-
-        var vm = this;
-
-        vm.changeReferencesPageNumber = changeReferencesPageNumber;
-        vm.changeDescendantsPageNumber = changeDescendantsPageNumber;
-
-        vm.$onInit = onInit;
-
-        function onInit() {
-
-            vm.referencesTitle = this.hideNoneDependencies ? "The following items depend on this" : "Referenced by the following items";
-            vm.referencedDescendantsTitle = this.hideNoneDependencies ? "The following descending items have dependencies" : "The following descendant items have dependencies";
-            localizationService.localize(this.hideNoneDependencies ? "references_labelDependsOnThis" : "references_labelUsedByItems").then(function (value) {
-                vm.referencesTitle = value;
-            });
-
-            localizationService.localize(this.hideNoneDependencies ? "references_labelDependentDescendants" : "references_labelUsedDescendants").then(function (value) {
-                vm.referencedDescendantsTitle = value;
-            });
-
-            vm.descendantsOptions = {};
-            vm.descendantsOptions.filterMustBeIsDependency = this.hideNoneDependencies;
-            vm.hasReferencesInDescendants = false;
-
-            vm.referencesOptions = {};
-            vm.referencesOptions.filterMustBeIsDependency = this.hideNoneDependencies;
-            vm.hasReferences = false;
-
-            this.loading = true;
-            this.hideNoResult = this.hideNoResult || false;
-
-            // when vm.id == 0 it means that this is a new item, so it has no references yet
-            if (vm.id === 0) {
-                vm.loading = false;
-                if(vm.onLoadingComplete) {
-                    vm.onLoadingComplete();
-                }
-                return;
-            }
-
-            // Make array of promises to load:
-            var promises = [loadReferencesRelations()];
-
-            // only load descendants if we want to show them.
-            if (vm.showDescendants) {
-                promises.push(loadDescendantsUsage());
-            }
-
-            $q.all(promises).then(function () {
-                vm.loading = false;
-                if(vm.onLoadingComplete) {
-                    vm.onLoadingComplete();
-                }
-            });
-        }
-
-        function changeReferencesPageNumber(pageNumber) {
-            vm.referencesOptions.pageNumber = pageNumber;
-            loadReferencesRelations();
-        }
-
-        function changeDescendantsPageNumber(pageNumber) {
-            vm.descendantsOptions.pageNumber = pageNumber;
-            loadDescendantsUsage();
-        }
-
-        function loadReferencesRelations() {
-            return trackedReferencesResource.getPagedReferences(vm.id, vm.referencesOptions)
-                .then(function (data) {
-                    vm.references = data;
-
-                    if (data.items.length > 0) {
-                        vm.hasReferences = data.items.length > 0;
-                        activateWarning();
-                    }
-                });
-        }
-
-        function loadDescendantsUsage() {
-            return trackedReferencesResource.getPagedDescendantsInReferences(vm.id, vm.descendantsOptions)
-                .then(function (data) {
-                    vm.referencedDescendants = data;
-
-                    if (data.items.length > 0) {
-                        vm.hasReferencesInDescendants = data.items.length > 0;
-                        activateWarning();
-                    }
-                });
-        }
-
-        function activateWarning() {
-            if (vm.onWarning) {
-                vm.onWarning();
-            }
-        }
-    }
-
-    var umbTrackedReferencesComponent = {
-        templateUrl: 'views/components/references/umb-tracked-references.html',
-        transclude: true,
-        bindings: {
-            id: "<",
-            hideNoResult: "<?",
-            onWarning: "&?",
-            onLoadingComplete: "&?",
-            compact: "<?",
-            showDescendants: "<?",
-            hideNoneDependencies: "<?"
-        },
-        controllerAs: 'vm',
-        controller: umbTrackedReferencesController
-    };
-
-    angular.module('umbraco.directives').component('umbTrackedReferences', umbTrackedReferencesComponent);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/references/umbtrackedreferencesbulkaction.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/references/umbtrackedreferencesbulkaction.component.js
deleted file mode 100644
index 4059a803de..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/references/umbtrackedreferencesbulkaction.component.js
+++ /dev/null
@@ -1,79 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * A component to render the items from a selection which are used in a relation
-     */
-
-    function umbTrackedReferencesBulkActionController($q, trackedReferencesResource, localizationService)
-    {
-        var vm = this;
-
-        vm.referencedItemsTitle = "These items are referenced";
-
-        localizationService.localize("references_labelUsedItems").then(function (value) {
-            vm.referencedItemsTitle = value;
-        });
-      
-        vm.changeReferencesPageNumber = changeReferencesPageNumber;
-        vm.referencesOptions = {};
-        vm.referencesOptions.filterMustBeIsDependency = true;
-        vm.hasReferences = false;
-
-        vm.$onInit = onInit;
-
-        function onInit() {
-
-            this.loading = true;
-            this.hideNoResult = this.hideNoResult || false;
-
-            loadContentBulkActionUsage().then(function () {
-                vm.loading = false;
-                if(vm.onLoadingComplete) {
-                    vm.onLoadingComplete();
-                }
-            });
-        }
-
-        function changeReferencesPageNumber(pageNumber) {
-            vm.referencesOptions.pageNumber = pageNumber;
-            loadContentBulkActionUsage();
-        }
-
-        function loadContentBulkActionUsage() {
-             var ids = vm.selection.map(s => s.id);
-
-             return trackedReferencesResource.getPagedReferencedItems(ids, vm.referencesOptions)
-                  .then(function (data) {
-                      vm.referencedItems = data;
-
-                      if (data.items.length > 0) {
-                          vm.hasReferences = data.items.length > 0;
-                          activateWarning();
-                      }
-                  });
-        }
-
-        function activateWarning() {
-            if (vm.onWarning) {
-                vm.onWarning();
-            }
-        }
-    }
-
-    var umbTrackedReferencesBulkActionComponent = {
-        templateUrl: 'views/components/references/umb-tracked-references-bulk-action.html',
-        transclude: true,
-        bindings: {
-            selection: "<",
-            hideNoResult: "<?",
-            onWarning: "&?",
-            onLoadingComplete: "&?"
-        },
-        controllerAs: 'vm',
-        controller: umbTrackedReferencesBulkActionController
-    };
-
-    angular.module('umbraco.directives').component('umbTrackedReferencesBulkAction', umbTrackedReferencesBulkActionComponent);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/references/umbtrackedreferencestable.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/references/umbtrackedreferencestable.component.js
deleted file mode 100644
index ecd4d07af9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/references/umbtrackedreferencestable.component.js
+++ /dev/null
@@ -1,107 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * A component to render a table for the tracked references of an item
-     */
-
-    function umbTrackedReferencesTableController(editorService, udiParser, navigationService, overlayService)
-    {
-        var vm = this;
-
-        vm.changePageNumber = changePageNumber;
-        vm.getUrl = getUrl;
-        vm.referenceAnchorClicked = referenceAnchorClicked;
-
-        function changePageNumber(pageNumber) {
-            vm.onPageChanged({ 'pageNumber' : pageNumber });
-        }
-
-        function getUrl(itemUdi, itemId) {
-            // extract the entity type from the udi
-            var udi = udiParser.parse(itemUdi);
-
-            if (udi) {
-                var entityType = udi.entityType;
-
-                if(udi.entityType === "document") {
-                    entityType = "content";
-                }
-                return "#/" + entityType + "/" + entityType + "/edit/" + itemId;
-            }
-	          return "#";
-	    }
-
-        function close() {
-            navigationService.hideMenu(); // close menu
-            overlayService.close(); // close overlay
-        }
-
-        function referenceAnchorClicked($event, reference) {
-
-
-            if ($event.shiftKey || $event.ctrlKey || $event.metaKey) {
-                // we will let the browser take over here.
-                return;
-            }
-
-            $event.preventDefault();
-            close();
-
-            var editorModel = {
-                id: reference.id,
-                submit: function (model) {
-                    editorService.close();
-                },
-                close: function () {
-                    editorService.close();
-                }
-            };
-
-            overlayService.close();
-
-            // extract the entity type from the udi
-            var udi = udiParser.parse(reference.udi);
-
-            if (udi && udi.entityType === "document")
-            {
-                editorService.contentEditor(editorModel);
-                return;
-            }
-
-            if (udi && udi.entityType === "media")
-            {
-                editorService.mediaEditor(editorModel);
-                return;
-            }
-
-            if (udi && udi.entityType === "member")
-            {
-                editorModel.id = reference.key;
-                editorService.memberEditor(editorModel);
-                return;
-            }
-        }
-    }
-
-    var umbTrackedReferencesTableComponent = {
-        templateUrl: 'views/components/references/umb-tracked-references-table.html',
-        transclude: true,
-        bindings: {
-            pageNumber: "<",
-            totalPages: "<",
-            headline: "<",
-            items: "<",
-            showPublished: "<?",
-            showType: "<?",
-            showTypeName: "<?",
-            showRelationTypeName: "<?",
-            onPageChanged: "&"
-        },
-        controllerAs: 'vm',
-        controller: umbTrackedReferencesTableController
-    };
-
-    angular.module('umbraco.directives').component('umbTrackedReferencesTable', umbTrackedReferencesTableComponent);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabcontent.directive.js
deleted file mode 100644
index 0b55bf5134..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabcontent.directive.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbTabContent
-@restrict E
-@scope
-
-@description
-Use this directive to render tab content. For an example see: {@link umbraco.directives.directive:umbTabContent umbTabContent}
-
-@param {string=} tab The tab.
-
-**/
-(function () {
-    'use strict';
-
-    angular
-        .module('umbraco.directives')
-        .component('umbTabContent', {
-            transclude: true,
-            templateUrl: 'views/components/tabs/umb-tab-content.html',
-            controllerAs: 'vm',
-            bindings: {
-                tab: '<'
-            }
-        });
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js
deleted file mode 100644
index 56808e6861..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js
+++ /dev/null
@@ -1,241 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbTabsNav
-@restrict E
-@scope
-
-@description
-Use this directive to render a tabs navigation.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <!-- The tabs navigation depends on a form and the validation manager. If the tabs are used inside a property editor or dashboard this is already added -->
-        <ng-form name="tabsForm" val-form-manager>
-
-            <umb-tabs-nav
-                tabs="vm.tabs"
-                on-tab-change="vm.changeTab(tab)">
-            </umb-tabs-nav>
-
-            <umb-tab-content
-                ng-repeat="tab in vm.tabs"
-                ng-show="tab.active"
-                tab="tab">
-                <div ng-if="tab.alias === 'tabOne'">
-                    <div>Content of tab 1</div>
-                </div>
-                <div ng-if="tab.alias === 'tabTwo'">
-                    <div>Content of tab 2</div>
-                </div>
-            </umb-tab-content>
-
-        </ng-form>
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller(eventsService) {
-
-            var vm = this;
-
-            vm.changeTab = changeTab;
-
-            vm.tabs = [
-                {
-                    "alias": "tabOne",
-                    "label": "Tab 1",
-                    "active": true
-                },
-                {
-                    "alias": "tabTwo",
-                    "label": "Tab 2"
-                }
-            ];
-
-            function changeTab(selectedTab) {
-                vm.tabs.forEach(function(tab) {
-                    tab.active = false;
-                });
-                selectedTab.active = true;
-            };
-
-            eventsService.on("app.tabChange", function(name, args){
-                console.log("args", args);
-            });
-
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-
-    })();
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbTabContent umbTabContent}</li>
-</ul>
-
-@param {string=} tabs A collection of tabs.
-@param {callback=} onTabChange Callback when a tab is called. It Returns the selected tab.
-
-
-**/
-
-(function() {
-    'use strict';
-
-    function TabsNavDirective($timeout, $window, eventsService) {
-
-        function link(scope, element, attrs, ctrl) {
-
-            var tabNavItemsWidths = [];
-            var tabItems = [];
-            var firstTab, lastTab;
-            // the parent is the component itself so we need to go one level higher
-            var container = element.parent().parent();
-
-            const ro = new ResizeObserver(function () {
-                calculateWidth();
-            });
-
-            ro.observe(container[0]);
-
-            $timeout(function(){
-                element.find("li:not(umb-tab--expand)").each(function() {
-                    tabNavItemsWidths.push($(this).outerWidth());
-                });
-
-                tabItems = Array.from(element.find(".umb-tab > button"));
-                firstTab = tabItems[0];
-                lastTab = tabItems[tabItems.length - 1];
-
-                tabItems.forEach(tab => {
-                    tab.addEventListener("keydown", event => {
-                        var currentTarget = event.currentTarget;
-                        switch (event.key) {
-                            case "ArrowLeft":
-                                moveFocusToPreviousTab(currentTarget);
-                                break;
-                            case "ArrowRight":
-                                moveFocusToNextTab(currentTarget);
-                                break;
-                            case "Home":
-                                firstTab.focus();
-                                break;
-                            case "End":
-                                lastTab.focus();
-                                break;
-                            default:
-                                break;
-                        }
-                    });
-                });
-            });
-
-            function calculateWidth(){
-                $timeout(function(){
-                    // 70 is the width of the expand menu (three dots) + 20 for the margin on umb-tabs-nav
-                    var containerWidth = container.width() - 90;
-                    var tabsWidth = 0;
-                    ctrl.overflowingSections = 0;
-                    ctrl.needTray = false;
-                    ctrl.maxTabs = tabNavItemsWidths.length;
-
-                    // detect how many tabs we can show on the screen
-                    for (var i = 0; i <= tabNavItemsWidths.length; i++) {
-
-                        var tabWidth = tabNavItemsWidths[i];
-                        tabsWidth += tabWidth;
-
-                        if(tabsWidth >= containerWidth) {
-                            ctrl.needTray = true;
-                            ctrl.maxTabs = i;
-                            ctrl.overflowingTabs = ctrl.maxTabs - ctrl.tabs.length;
-                            break;
-                        }
-                    }
-
-                });
-            }
-
-            function moveFocusToNextTab(currentTab) {
-                var index = tabItems.indexOf(currentTab);
-
-                if (currentTab === lastTab) {
-                    firstTab.focus();
-                }
-                else {
-                    tabItems[index + 1].focus();
-                }
-            }
-
-            function moveFocusToPreviousTab(currentTab) {
-                var index = tabItems.indexOf(currentTab);
-                if(currentTab === firstTab) {
-                    lastTab.focus();
-                }
-                else {
-                    tabItems[index - 1].focus();
-                }
-            }
-
-            scope.$on('$destroy', function() {
-                ro.unobserve(container[0]);
-            });
-        }
-
-        function UmbTabsNavController(eventsService) {
-
-            var vm = this;
-
-            vm.needTray = false;
-            vm.showTray = false;
-            vm.overflowingSections = 0;
-
-            vm.clickTab = clickTab;
-            vm.toggleTray = toggleTray;
-            vm.hideTray = hideTray;
-
-            function clickTab($event, tab) {
-                if (vm.onTabChange) {
-                    hideTray();
-                    var args = { "tab": tab, "tabs": vm.tabs };
-                    eventsService.emit("app.tabChange", args);
-                    vm.onTabChange({ "event": $event, "tab": tab });
-                }
-            }
-
-            function toggleTray() {
-                vm.showTray = !vm.showTray;
-            }
-
-            function hideTray() {
-                vm.showTray = false;
-            }
-        }
-
-        var directive = {
-            restrict: 'E',
-            transclude: true,
-            templateUrl: "views/components/tabs/umb-tabs-nav.html",
-            link: link,
-            bindToController: true,
-            controller: UmbTabsNavController,
-            controllerAs: 'vm',
-            scope: {
-                tabs: "<",
-                onTabChange: "&"
-            }
-        };
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbTabsNav', TabsNavDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
deleted file mode 100644
index f902944607..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tags/umbtagseditor.directive.js
+++ /dev/null
@@ -1,315 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbTagsEditor
-**/
-
-(function () {
-    'use strict';
-
-    angular
-        .module('umbraco.directives')
-        .component('umbTagsEditor', {
-            transclude: true,
-            templateUrl: 'views/components/tags/umb-tags-editor.html',
-            controller: umbTagsEditorController,
-            controllerAs: 'vm',
-            bindings: {
-                value: "<",
-                config: "<",
-                validation: "<",
-                culture: "<?",
-                inputId: "@?",
-                onValueChanged: "&"
-            }
-        });
-
-    function umbTagsEditorController($rootScope, assetsService, umbRequestHelper, angularHelper, $timeout, $element, $attrs) {
-
-        let vm = this;
-
-        let typeahead;
-        let tagsHound;
-
-        let initLoad = true;
-
-        vm.$onInit = onInit;
-        vm.$onChanges = onChanges;
-        vm.$onDestroy = onDestroy;
-
-        vm.validateMandatory = validateMandatory;
-        vm.addTagOnEnter = addTagOnEnter;
-        vm.addTag = addTag;
-        vm.removeTag = removeTag;
-        vm.showPrompt = showPrompt;
-        vm.hidePrompt = hidePrompt;
-        vm.onKeyUpOnTag = onKeyUpOnTag;
-
-        vm.isLoading = true;
-        vm.tagToAdd = "";
-        vm.promptIsVisible = "-1";
-        vm.viewModel = [];
-        vm.readonly = false;
-
-        $attrs.$observe('readonly', (value) => {
-            vm.readonly = value !== undefined;
-        });
-
-        function onInit() {
-            vm.inputId = vm.inputId || "t" + String.CreateGuid();
-
-            assetsService.loadJs("lib/typeahead.js/typeahead.bundle.min.js").then(function () {
-
-                vm.isLoading = false;
-
-                //ensure that the models are formatted correctly
-                configureViewModel(true);
-
-                // Set the visible prompt to -1 to ensure it will not be visible
-                vm.promptIsVisible = "-1";
-
-                tagsHound = new Bloodhound({
-                    initialize: false,
-                    identify: function (obj) { return obj.id; },
-                    datumTokenizer: Bloodhound.tokenizers.obj.whitespace('text'),
-                    queryTokenizer: Bloodhound.tokenizers.whitespace,
-                    //pre-fetch the tags for this category
-                    prefetch: {
-                        url: umbRequestHelper.getApiUrl("tagsDataBaseUrl", "GetTags", { tagGroup: vm.config.group, culture: vm.culture }),
-                        //TTL = 5 minutes
-                        ttl: 300000
-                    },
-                    //dynamically get the tags for this category (they may have changed on the server)
-                    remote: {
-                        url: umbRequestHelper.getApiUrl("tagsDataBaseUrl", "GetTags", { tagGroup: vm.config.group, culture: vm.culture, query: "%QUERY" }),
-                        wildcard: "%QUERY"
-                    }
-                });
-
-                tagsHound.initialize().then(function() {
-
-                    //configure the type ahead
-                    
-                    var sources = {
-                        //see: https://github.com/twitter/typeahead.js/blob/master/doc/jquery_typeahead.md#options
-                        // name = the data set name, we'll make this the tag group name + culture
-                        name: (vm.config.group + (vm.culture ? vm.culture : "")).replace(/\W/g, '-'),
-                        display: "text",
-                        //source: tagsHound
-                        source: function (query, syncCallback, asyncCallback) {
-                            tagsHound.search(query,
-                                function(suggestions) {
-                                    syncCallback(removeCurrentTagsFromSuggestions(suggestions));
-                                }, function(suggestions) {
-                                    asyncCallback(removeCurrentTagsFromSuggestions(suggestions));
-                                });
-                        }
-                    };
-
-                    var opts = {
-                        hint: true,
-                        highlight: true,
-                        cacheKey: new Date(),  // Force a cache refresh each time the control is initialized
-                        minLength: 1
-                    };
-
-                    typeahead = $element.find('.tags-' + vm.inputId).typeahead(opts, sources)
-                        .bind("typeahead:selected", function (obj, datum, name) {
-                            angularHelper.safeApply($rootScope, function () {
-                                addTagInternal(datum["text"]);
-                                vm.tagToAdd = "";
-                                // clear the typed text
-                                typeahead.typeahead('val', '');
-                            });
-                        }).bind("typeahead:autocompleted", function (obj, datum, name) {
-                            angularHelper.safeApply($rootScope, function () {
-                                addTagInternal(datum["text"]);
-                                vm.tagToAdd = "";
-                                // clear the typed text
-                                typeahead.typeahead('val', '');
-                            });
-
-                        }).bind("typeahead:opened", function (obj) {
-
-                        });
-
-                });
-                
-            });
-        }
-
-        /**
-         * Watch for value changes
-         * @param {any} changes
-         */
-        function onChanges(changes) {
-
-            //when the model 'value' changes, sync the viewModel object
-            if (changes.value) {
-                if (!changes.value.isFirstChange() && changes.value.currentValue !== changes.value.previousValue) {
-
-                    configureViewModel();
-                    reValidate();
-                }
-            }
-        }
-
-        function onDestroy() {
-            if (tagsHound) {
-                tagsHound.clearPrefetchCache();
-                tagsHound.clearRemoteCache();
-                tagsHound = null;
-            }
-            $element.find('.tags-' + vm.inputId).typeahead('destroy');
-        }
-
-        function configureViewModel(isInitLoad) {
-            if (vm.value) {
-                if (Utilities.isString(vm.value) && vm.value.length > 0) {
-
-                    if (vm.config.storageType === "Json" && vm.value.detectIsJson()) {
-                        try {
-                            //json storage
-                            vm.viewModel = JSON.parse(vm.value);
-                        }
-                        catch (e) {
-                            // Invaild JSON we'll just leave it
-                            console.error("Invalid JSON in tag editor value", vm.value);
-                        }
-                        
-                        //if this is the first load, we are just re-formatting the underlying model to be consistent
-                        //we don't want to notify the component parent of any changes, that will occur if the user actually
-                        //changes a value. If we notify at this point it will signal a form dirty change which we don't want.
-                        if (!isInitLoad) {
-                            updateModelValue(vm.viewModel);
-                        }
-                    }
-                    else {
-                        // csv storage
-                        
-                        // Or fallback if not valid json
-                        // This can happen if you switch a tag editor from csv to json, and the value is still returned as a csv string.
-                        // The value will be saved as a json string on the next save or publish.
-
-                        // split the csv string, and remove any duplicate values
-                        let tempArray = vm.value.split(',').map(function (v) {
-                            return v.trim();
-                        });
-
-                        vm.viewModel = tempArray.filter(function (v, i, self) {
-                            return self.indexOf(v) === i;
-                        });
-
-                        //if this is the first load, we are just re-formatting the underlying model to be consistent
-                        //we don't want to notify the component parent of any changes, that will occur if the user actually
-                        //changes a value. If we notify at this point it will signal a form dirty change which we don't want.
-                        if (!isInitLoad) {
-                            updateModelValue(vm.viewModel);
-                        }
-                    }
-                }
-                else if (Utilities.isArray(vm.value)) {
-                    vm.viewModel = vm.value;
-                }
-            }
-        }
-
-        function updateModelValue(val) {
-
-            val = val ? val : [];
-
-            vm.onValueChanged({ value: val });
-
-            reValidate();
-        }
-
-        /**
-         * Method required by the valPropertyValidator directive (returns true if the property editor has at least one tag selected)
-         */
-        function validateMandatory() {
-            return {
-                isValid: !vm.validation.mandatory || (vm.viewModel != null && vm.viewModel.length > 0)|| (vm.value != null && vm.value.length > 0),
-                errorMsg: "Value cannot be empty",
-                errorKey: "required"
-            };
-        }
-
-        function addTagInternal(tagToAdd) {
-            if (tagToAdd != null && tagToAdd.length > 0) {
-                if (vm.viewModel.indexOf(tagToAdd) < 0) {
-                    vm.viewModel.push(tagToAdd);
-                    updateModelValue(vm.viewModel);
-                }
-            }
-        }
-
-        function addTagOnEnter(e) {
-            var code = e.keyCode || e.which;
-            if (code == 13) { //Enter keycode
-                if ($element.find('.tags-' + vm.inputId).parent().find(".tt-menu .tt-cursor").length === 0) {
-                    //this is required, otherwise the html form will attempt to submit.
-                    e.preventDefault();
-                    addTag();
-                }
-            }
-        }
-        function addTag() {
-            //ensure that we're not pressing the enter key whilst selecting a typeahead value from the drop down
-            //we need to use jquery because typeahead duplicates the text box
-            addTagInternal(vm.tagToAdd);
-            vm.tagToAdd = "";
-            //this clears the value stored in typeahead so it doesn't try to add the text again
-            // https://issues.umbraco.org/issue/U4-4947
-            typeahead.typeahead('val', '');
-        }
-
-        function removeTag(tag) {
-            var i = vm.viewModel.indexOf(tag);
-
-            if (i >= 0) {
-                // Make sure to hide the prompt so it does not stay open because another item gets a new number in the array index
-                vm.promptIsVisible = "-1";
-
-                // Remove the tag from the index
-                vm.viewModel.splice(i, 1);
-
-                updateModelValue(vm.viewModel);
-            }
-        }
-
-        function showPrompt(idx, tag) {
-
-            var i = vm.viewModel.indexOf(tag);
-
-            // Make the prompt visible for the clicked tag only
-            if (i === idx) {
-                vm.promptIsVisible = i;
-            }
-        }
-
-        function hidePrompt() {
-            vm.promptIsVisible = "-1";
-        }
-        
-        function onKeyUpOnTag(tag, $event) {
-            if ($event.keyCode === 8 || $event.keyCode === 46) {
-                removeTag(tag);
-            }
-        }
-        
-        // helper method to remove current tags
-        function removeCurrentTagsFromSuggestions(suggestions) {
-            return $.grep(suggestions, function (suggestion) {
-                return ($.inArray(suggestion.text, vm.viewModel) === -1);
-            });
-        }
-
-        function reValidate() {
-            //this is required to re-validate for the mandatory validation
-            if (vm.tagEditorForm && vm.tagEditorForm.tagCount) {
-                vm.tagEditorForm.tagCount.$setViewValue(vm.viewModel.length);
-            }
-        }
-
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbcontextdialog/umbcontextdialog.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbcontextdialog/umbcontextdialog.directive.js
deleted file mode 100644
index 3b753a371c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbcontextdialog/umbcontextdialog.directive.js
+++ /dev/null
@@ -1,73 +0,0 @@
-(function() {
-    'use strict';
-
-    function UmbContextDialog(navigationService, keyboardService, localizationService, overlayService, backdropService) {
-
-        function link($scope) {
-
-            $scope.dialog = {
-                confirmDiscardChanges: false
-            };
-
-            $scope.outSideClick = function() {
-                hide();
-            };
-
-            keyboardService.bind("esc", function () {
-                hide();
-            });
-
-            //ensure to unregister from all events!
-            $scope.$on('$destroy', function () {
-                keyboardService.unbind("esc");
-            });
-
-            function hide() {
-
-                if ($scope.dialog.confirmDiscardChanges) {
-                    localizationService.localizeMany(["prompt_unsavedChanges", "prompt_unsavedChangesWarning", "prompt_discardChanges", "prompt_stay"]).then(
-                        function (values) {
-                            var overlay = {
-                                "view": "default",
-                                "title": values[0],
-                                "content": values[1],
-                                "disableBackdropClick": true,
-                                "disableEscKey": true,
-                                "submitButtonLabel": values[2],
-                                "closeButtonLabel": values[3],
-                                submit: function () {
-                                    overlayService.close();
-                                    navigationService.hideDialog();
-                                },
-                                close: function () {
-                                    overlayService.close();
-                                }
-                            };
-
-                            overlayService.open(overlay);
-                        }
-                    );
-                }
-                else {
-                    navigationService.hideDialog();
-                }
-            }
-        }
-
-        var directive = {
-            restrict: 'E',
-            transclude: true,
-            templateUrl: "views/components/tree/umbcontextdialog/umb-context-dialog.html",
-            scope: {
-                dialogTitle: "<",
-                currentNode: "<",
-                view: "<"
-            },
-            link: link
-        };
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbContextDialog', UmbContextDialog);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
deleted file mode 100644
index 54119f8df7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
+++ /dev/null
@@ -1,417 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbTree
-* @restrict E
-**/
-function umbTreeDirective($q, treeService, notificationsService, localizationService) {
-
-  return {
-    restrict: 'E',
-    replace: true,
-    terminal: false,
-    templateUrl: 'views/components/tree/umb-tree.html',
-    scope: {
-      section: '@',
-      treealias: '@',
-      hideoptions: '@',
-      hideheader: '@',
-      cachekey: '@',
-      isdialog: '@',
-      onlyInitialized: '@',
-      //Custom query string arguments to pass in to the tree as a string, example: "startnodeid=123&something=value"
-      customtreeparams: '@',
-      enablecheckboxes: '@',
-      enablelistviewsearch: '@',
-      enablelistviewexpand: '@',
-      api: '=?',
-      onInit: '&?'
-    },
-    controller: function ($scope, $element) {
-
-      var vm = this;
-
-      var registeredCallbacks = {
-        treeNodeExpanded: [],
-        treeNodeSelect: [],
-        treeLoaded: [],
-        treeSynced: [],
-        treeOptionsClick: [],
-        treeNodeAltSelect: []
-      };
-
-      //this is the API exposed by this directive, for either hosting controllers or for other directives
-      vm.callbacks = {
-        treeNodeExpanded: function (f) {
-          registeredCallbacks.treeNodeExpanded.push(f);
-        },
-        treeNodeSelect: function (f) {
-          registeredCallbacks.treeNodeSelect.push(f);
-        },
-        treeLoaded: function (f) {
-          registeredCallbacks.treeLoaded.push(f);
-        },
-        treeSynced: function (f) {
-          registeredCallbacks.treeSynced.push(f);
-        },
-        treeOptionsClick: function (f) {
-          registeredCallbacks.treeOptionsClick.push(f);
-        },
-        treeNodeAltSelect: function (f) {
-          registeredCallbacks.treeNodeAltSelect.push(f);
-        }
-      };
-      vm.emitEvent = emitEvent;
-      vm.load = load;
-      vm.reloadNode = reloadNode;
-      vm.syncTree = syncTree;
-      vm.loadChildren = loadChildren;
-      vm.hasTree = hasTree;
-
-      $scope.labels = {
-        openContextNode: "Open context node for"
-      };
-
-      //wire up the exposed api object for hosting controllers
-      if ($scope.api) {
-        $scope.api.callbacks = vm.callbacks;
-        $scope.api.load = vm.load;
-        $scope.api.reloadNode = vm.reloadNode;
-        $scope.api.syncTree = vm.syncTree;
-        $scope.api.hasTree = vm.hasTree;
-      }
-
-      //flag to track the last loaded section when the tree 'un-loads'. We use this to determine if we should
-      // re-load the tree again. For example, if we hover over 'content' the content tree is shown. Then we hover
-      // outside of the tree and the tree 'un-loads'. When we re-hover over 'content', we don't want to re-load the
-      // entire tree again since we already still have it in memory. Of course if the section is different we will
-      // reload it. This saves a lot on processing if someone is navigating in and out of the same section many times
-      // since it saves on data retreival and DOM processing.
-      // TODO: This isn't used!?
-      var lastSection = "";
-
-      /** Helper function to emit tree events */
-      function emitEvent(eventName, args) {
-        if (registeredCallbacks[eventName] && Utilities.isArray(registeredCallbacks[eventName])) {
-          // call it
-          registeredCallbacks[eventName].forEach(c => c(args));
-        }
-      }
-
-
-      /**
-       * Re-loads the tree with the updated parameters
-       * @param {any} args either a string representing the 'section' or an object containing: 'section', 'treeAlias', 'customTreeParams', 'cacheKey'
-       */
-      function load(args) {
-        if (Utilities.isString(args)) {
-          $scope.section = args;
-        }
-        else if (args) {
-          if (args.section) {
-            $scope.section = args.section;
-          }
-          if (args.customTreeParams) {
-            $scope.customtreeparams = args.customTreeParams;
-          }
-          if (args.treeAlias) {
-            $scope.treealias = args.treeAlias;
-          }
-          if (args.cacheKey) {
-            $scope.cachekey = args.cacheKey;
-          }
-        }
-
-        return loadTree();
-      }
-
-      function reloadNode(node) {
-
-        if (!node) {
-          node = $scope.currentNode;
-        }
-
-        if (node) {
-          return $scope.loadChildren(node, true);
-        }
-
-        return $q.reject();
-      }
-
-      /**
-       * Used to do the tree syncing
-       * @param {any} args
-       * @returns a promise with an object containing 'node' and 'activate'
-       */
-      function syncTree(args) {
-        if (!args) {
-          throw "args cannot be null";
-        }
-        if (!args.path) {
-          throw "args.path cannot be null";
-        }
-
-        if (Utilities.isString(args.path)) {
-          args.path = args.path.replace('"', '').split(',');
-        }
-
-        //Filter the path for root node ids (we don't want to pass in -1 or 'init')
-
-        args.path = _.filter(args.path, function (item) { return (item !== "init" && item !== "-1"); });
-
-        var treeNode = loadActiveTree(args.tree);
-
-        return treeService.syncTree({
-          node: treeNode,
-          path: args.path,
-          forceReload: args.forceReload
-        }).then(function (data) {
-
-          if (args.activate === undefined || args.activate === true) {
-            $scope.currentNode = data;
-          }
-
-          emitEvent("treeSynced", { node: data, activate: args.activate });
-
-          return $q.when({ node: data, activate: args.activate });
-        }, function (data) {
-          return $q.reject(data);
-        }, function (data) {
-          //on notification
-          if (data.type === "treeNodeExpanded") {
-            //raise the event
-            emitEvent("treeNodeExpanded", { tree: $scope.tree, node: data.node, children: data.children });
-          }
-        });
-
-      }
-
-      /** This will check the section tree loaded and return all actual root nodes based on a tree type (non group nodes, non section groups) */
-      function getTreeRootNodes() {
-        var roots;
-        if ($scope.tree.root.containsGroups) {
-          //all children in this case are group nodes, so we want the children of these children
-          roots = _.reduce(
-            //get the array of array of children
-            _.map($scope.tree.root.children, function (n) {
-              return n.children
-            }), function (m, p) {
-              //combine the arrays to one array
-              return m.concat(p)
-            });
-        }
-        else {
-          roots = [$scope.tree.root].concat($scope.tree.root.children);
-        }
-
-        return _.filter(roots, function (node) {
-          return node && node.metaData && node.metaData.treeAlias;
-        });
-      }
-
-      //given a tree alias, this will search the current section tree for the specified tree alias and set the current active tree to it's root node
-      function hasTree(treeAlias) {
-
-        if (!$scope.tree) {
-          throw "Err in umbtree.directive.loadActiveTree, $scope.tree is null";
-        }
-
-        if (!treeAlias) {
-          return false;
-        }
-
-        var treeRoots = getTreeRootNodes();
-        var foundTree = _.find(treeRoots, function (node) {
-          return node.metaData.treeAlias.toUpperCase() === treeAlias.toUpperCase();
-        });
-
-        return foundTree !== undefined;
-      }
-
-      //given a tree alias, this will search the current section tree for the specified tree alias and set the current active tree to it's root node
-      function loadActiveTree(treeAlias) {
-
-        if (!$scope.tree) {
-          throw "Err in umbtree.directive.loadActiveTree, $scope.tree is null";
-        }
-
-        //if its not specified, it should have been specified before
-        if (!treeAlias) {
-          if (!$scope.activeTree) {
-            throw "Err in umbtree.directive.loadActiveTree, $scope.activeTree is null";
-          }
-          return $scope.activeTree;
-        }
-
-        var treeRoots = getTreeRootNodes();
-        $scope.activeTree = _.find(treeRoots, function (node) {
-          return node.metaData.treeAlias.toUpperCase() === treeAlias.toUpperCase();
-        });
-
-        if (!$scope.activeTree) {
-          throw "Could not find the tree " + treeAlias;
-        }
-
-        emitEvent("activeTreeLoaded", { tree: $scope.activeTree });
-
-        return $scope.activeTree;
-      }
-
-      /** Method to load in the tree data */
-      function loadTree() {
-        if ($scope.section) {
-
-          //default args
-          var args = { section: $scope.section, tree: $scope.treealias, cacheKey: $scope.cachekey, isDialog: $scope.isdialog ? $scope.isdialog : false };
-
-          //add the extra query string params if specified
-          if ($scope.customtreeparams) {
-            args["queryString"] = $scope.customtreeparams;
-          }
-
-          return treeService.getTree(args)
-            .then(function (data) {
-              //Only use the tree data, if we are still on the correct section
-              if (data.alias !== $scope.section) {
-                return $q.reject();
-              }
-
-              //set the data once we have it
-              $scope.tree = data;
-
-              //set the root as the current active tree
-              $scope.activeTree = $scope.tree.root;
-
-              emitEvent("treeLoaded", { tree: $scope.tree });
-              emitEvent("treeNodeExpanded", { tree: $scope.tree, node: $scope.tree.root, children: $scope.tree.root.children });
-
-              return $q.when(data);
-            }, function (reason) {
-              notificationsService.error("Tree Error", reason);
-              return $q.reject(reason);
-            });
-        }
-        else {
-          return $q.reject();
-        }
-      }
-
-      function loadChildren(node, forceReload) {
-        //emit treeNodeExpanding event, if a callback object is set on the tree
-        emitEvent("treeNodeExpanding", { tree: $scope.tree, node: node });
-
-        //standardising
-        if (!node.children) {
-          node.children = [];
-        }
-
-        if (forceReload || (node.hasChildren && node.children.length === 0)) {
-          //get the children from the tree service
-          return treeService.loadNodeChildren({ node: node, section: $scope.section, isDialog: $scope.isdialog })
-            .then(function (data) {
-              //emit expanded event
-              emitEvent("treeNodeExpanded", { tree: $scope.tree, node: node, children: data });
-
-              return $q.when(data);
-            });
-        }
-        else {
-          emitEvent("treeNodeExpanded", { tree: $scope.tree, node: node, children: node.children });
-          node.expanded = true;
-
-          return $q.when(node.children);
-        }
-      }
-
-      /** Returns the css classses assigned to the node (div element) */
-      $scope.getNodeCssClass = function (node) {
-        if (!node) {
-          return '';
-        }
-
-        // TODO: This is called constantly because as a method in a template it's re-evaluated pretty much all the time
-        // it would be better if we could cache the processing. The problem is that some of these things are dynamic.
-
-        var css = [];
-        if (node.cssClasses) {
-          node.cssClasses.forEach(c => css.push(c));
-        }
-
-        return css.join(" ");
-      };
-
-      $scope.selectEnabledNodeClass = node =>
-        node && node.selected ? 'icon sprTree icon-check green temporary' : '-hidden';
-
-      /* helper to force reloading children of a tree node */
-      $scope.loadChildren = (node, forceReload) => loadChildren(node, forceReload);
-
-      /**
-        Method called when the options button next to the root node is called.
-        The tree doesnt know about this, so it raises an event to tell the parent controller
-        about it.
-      */
-      $scope.options = function (n, ev) {
-        emitEvent("treeOptionsClick", { element: $element, node: n, event: ev });
-      };
-
-      /**
-        Method called when an item is clicked in the tree, this passes the
-        DOM element, the tree node object and the original click
-        and emits it as a treeNodeSelect element if there is a callback object
-        defined on the tree
-      */
-      $scope.select = function (n, ev) {
-
-        if (n.metaData && n.metaData.noAccess === true) {
-          ev.preventDefault();
-          return;
-        }
-
-        //on tree select we need to remove the current node -
-        // whoever handles this will need to make sure the correct node is selected
-        //reset current node selection
-        $scope.currentNode = null;
-
-        emitEvent("treeNodeSelect", { element: $element, node: n, event: ev });
-      };
-
-      $scope.altSelect = function (n, ev) {
-        emitEvent("treeNodeAltSelect", { element: $element, tree: $scope.tree, node: n, event: ev });
-      };
-
-      //call the onInit method, if the result is a promise then load the tree after that resolves (if it's not a promise this will just resolve automatically).
-      //NOTE: The promise cannot be rejected, else the tree won't be loaded and we'll get exceptions if some API calls syncTree or similar.
-      $q.when($scope.onInit(), function (args) {
-
-        //the promise resolution can pass in parameters
-        if (args) {
-          if (args.section) {
-            $scope.section = args.section;
-          }
-          if (args.cacheKey) {
-            $scope.cachekey = args.cacheKey;
-          }
-          if (args.customTreeParams) {
-            $scope.customtreeparams = args.customTreeParams;
-          }
-        }
-
-        //load the tree
-        loadTree().then(function () {
-          //because angular doesn't return a promise for the resolve method, we need to resort to some hackery, else
-          //like normal JS promises we could do resolve(...).then()
-          if (args && args.onLoaded && Utilities.isFunction(args.onLoaded)) {
-            args.onLoaded();
-          }
-        });
-
-        localizationService.localize("visuallyHiddenTexts_openContextNode").then((value) => {
-          $scope.labels.openContextNode = value;
-        });
-
-      });
-    }
-  };
-}
-
-angular.module("umbraco.directives").directive('umbTree', umbTreeDirective);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
deleted file mode 100644
index a3d1ef541c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
+++ /dev/null
@@ -1,246 +0,0 @@
-/**
- * @ngdoc directive
- * @name umbraco.directives.directive:umbTreeItem
- * @element li
- * @function
- *
- * @description
- * Renders a list item, representing a single node in the tree.
- * Includes element to toggle children, and a menu toggling button
- *
- * **note:** This directive is only used internally in the umbTree directive
- *
- * @example
-   <example module="umbraco">
-    <file name="index.html">
-         <umb-tree-item ng-repeat="child in tree.children" node="child" callback="callback" section="content"></umb-tree-item>
-    </file>
-   </example>
- */
-angular.module("umbraco.directives")
-    .directive('umbTreeItem', function(treeService, $timeout, localizationService, eventsService, appState, navigationService) {
-    return {
-        restrict: 'E',
-        replace: true,
-        require: '^umbTree',
-        templateUrl: 'views/components/tree/umb-tree-item.html',
-        scope: {
-            section: '@',
-            currentNode: '=',
-            enablelistviewexpand: '@',
-            node: '=',
-            tree: '=',
-            isDialog: '='
-        },
-
-        link: function (scope, element, attrs, umbTreeCtrl) {
-            localizationService.localizeMany(["general_search", "visuallyHiddenTexts_openContextMenu"]).then(function (value) {
-                scope.searchAltText = value[0];
-                scope.optionsText = value[1];
-            });
-
-            // updates the node's DOM/styles
-            function setupNodeDom(node, tree) {
-
-                //get the first div element
-                element.children(":first")
-                    //set the padding
-                    .css("padding-left", (node.level * 20) + "px");
-
-                // add a unique data element to each tree item so it is easy to navigate with code
-                if(!node.metaData.treeAlias) {
-                    node.dataElement = node.name;
-                } else {
-                    node.dataElement = node.metaData.treeAlias;
-                }
-
-            }
-
-            /** Returns the css classses assigned to the node (div element) */
-            scope.getNodeCssClass = function (node) {
-                if (!node) {
-                    return '';
-                }
-
-                // TODO: This is called constantly because as a method in a template it's re-evaluated pretty much all the time
-                // it would be better if we could cache the processing. The problem is that some of these things are dynamic.
-
-                //is this the current action node (this is not the same as the current selected node!)
-                var actionNode = appState.getMenuState("currentNode");
-
-                var css = [];
-                if (node.cssClasses) {
-                    node.cssClasses.forEach(c => css.push(c));
-                }
-                if (node.selected) {
-                    css.push("umb-tree-node-checked");
-                }
-                if (node == scope.currentNode) {
-                    css.push("current");
-                    if (actionNode && actionNode.id !== node.id) {
-                        css.push("current-not-active");// when its the current node, but its not the active(current node for the given action)
-                    }
-                }
-                if (node.hasChildren) {
-                    css.push("has-children");
-                }
-                if (node.deleteAnimations) {
-                    css.push("umb-tree-item--deleted");
-                }
-
-                // checking the nodeType to ensure that this node and actionNode is from the same treeAlias
-                if (actionNode && actionNode.nodeType === node.nodeType) {
-
-                    if (actionNode.id === node.id && String(node.id) !== "-1") {
-                        css.push("active");
-                    }
-
-                    // special handling of root nodes with id -1
-                    // as there can be many nodes with id -1 in a tree we need to check the treeAlias instead
-                    if (String(node.id) === "-1" && actionNode.metaData.treeAlias === node.metaData.treeAlias) {
-                        css.push("active");
-                    }
-                }
-
-                return css.join(" ");
-            };
-
-            //add a method to the node which we can use to call to update the node data if we need to ,
-            // this is done by sync tree, we don't want to add a $watch for each node as that would be crazy insane slow
-            // so we have to do this
-            scope.node.updateNodeData = function (newNode) {
-                _.extend(scope.node, newNode);
-                //now update the styles
-                setupNodeDom(scope.node, scope.tree);
-            };
-
-            /**
-              Method called when the options button next to a node is called
-              In the main tree this opens the menu, but internally the tree doesnt
-              know about this, so it simply raises an event to tell the parent controller
-              about it.
-            */
-            scope.options = function (n, ev) {
-                umbTreeCtrl.emitEvent("treeOptionsClick", { element: element, tree: scope.tree, node: n, event: ev });
-            };
-
-            /**
-              Method called when an item is clicked in the tree, this passes the
-              DOM element, the tree node object and the original click
-              and emits it as a treeNodeSelect element if there is a callback object
-              defined on the tree
-            */
-            scope.select = function (n, ev) {
-                if (ev.ctrlKey ||
-                    ev.shiftKey ||
-                    ev.metaKey || // apple
-                    (ev.button && ev.button === 1) // middle click, >IE9 + everyone else
-                ) {
-                    return;
-                }
-
-                if (n.metaData && n.metaData.noAccess === true) {
-                    ev.preventDefault();
-                    return;
-                }
-
-                umbTreeCtrl.emitEvent("treeNodeSelect", { element: element, tree: scope.tree, node: n, event: ev });
-                ev.preventDefault();
-            };
-
-            /**
-              Method called when an item is right-clicked in the tree, this passes the
-              DOM element, the tree node object and the original click
-              and emits it as a treeNodeSelect element if there is a callback object
-              defined on the tree
-            */
-            scope.altSelect = function(n, ev) {
-                if(ev.altKey) return false;
-                umbTreeCtrl.emitEvent("treeNodeAltSelect", { element: element, tree: scope.tree, node: n, event: ev });
-            };
-
-            /**
-              Method called when a node in the tree is expanded, when clicking the arrow
-              takes the arrow DOM element and node data as parameters
-              emits treeNodeCollapsing event if already expanded and treeNodeExpanding if collapsed
-            */
-            scope.load = function (node, ev) {
-                if(ev){
-                          ev.stopPropagation();
-                }
-
-                if (node.expanded && !node.metaData.isContainer) {
-                    umbTreeCtrl.emitEvent("treeNodeCollapsing", { tree: scope.tree, node: node, element: element });
-                    node.expanded = false;
-                }
-                else {
-                    scope.loadChildren(node, false);
-                }
-            };
-
-            /* helper to force reloading children of a tree node */
-            scope.loadChildren = function(node, forceReload) {
-                return umbTreeCtrl.loadChildren(node, forceReload);
-            };
-
-            //if the current path contains the node id, we will auto-expand the tree item children
-            setupNodeDom(scope.node, scope.tree);
-
-            // load the children if the current user don't have access to the node
-            // it is used to auto expand the tree to the start nodes the user has access to
-            if(scope.node.hasChildren && scope.node.metaData.noAccess) {
-                scope.loadChildren(scope.node);
-            }
-
-            var evts = [];
-
-            // Listen for section changes
-            evts.push(eventsService.on("appState.sectionState.changed", function(e, args) {
-                if (args.key === "currentSection") {
-                    //when the section changes disable all delete animations
-                    scope.node.deleteAnimations = false;
-                }
-            }));
-
-            // Update tree icon if changed
-            evts.push(eventsService.on("editors.tree.icon.changed", function (e, args) {
-                if (args.icon !== scope.node.icon && args.id === scope.node.id) {
-                    scope.node.icon = args.icon;
-                }
-            }));
-
-            /** Depending on if any menu is shown and if the menu is shown for the current node, toggle delete animations */
-            function toggleDeleteAnimations() {
-                //if both are false then remove animations
-                var hide = !appState.getMenuState("showMenuDialog") && !appState.getMenuState("showMenu");
-                if (hide) {
-                    scope.node.deleteAnimations = false;
-                }
-                else {
-                    //enable animations for this node if it is the node currently showing a context menu
-                    var currentNode = appState.getMenuState("currentNode");
-                    if (currentNode && currentNode.id == scope.node.id) {
-                        scope.node.deleteAnimations = true;
-                    }
-                    else {
-                        scope.node.deleteAnimations = false;
-                    }
-                }
-            }
-
-            //listen for context menu and current node changes
-            evts.push(eventsService.on("appState.menuState.changed", function(e, args) {
-                if (args.key === "showMenuDialog" || args.key == "showMenu" || args.key == "currentNode") {
-                    toggleDeleteAnimations();
-                }
-            }));
-
-            //cleanup events
-            scope.$on('$destroy', function() {
-                for (var e in evts) {
-                    eventsService.unsubscribe(evts[e]);
-                }
-            });
-        }
-    };
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
deleted file mode 100644
index 1067a3e440..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbTreeSearchBox
-* @function
-* @element ANY
-* @restrict E
-**/
-function treeSearchBox($q, searchService) {
-    return {
-        scope: {
-            searchFromId: "@",
-            searchFromName: "@",
-            showSearch: "@",
-            section: "@",
-            datatypeKey: "@",
-            hideSearchCallback: "=",
-            searchCallback: "=",
-            inputId: "@",
-            autoFocus: "="
-        },
-        restrict: "E",    // restrict to an element
-        replace: true,   // replace the html element with the template
-        templateUrl: 'views/components/tree/umb-tree-search-box.html',
-        link: function (scope, element, attrs, ctrl) {
-
-            scope.term = "";
-
-            scope.hideSearch = function() {
-                scope.term = "";
-                scope.hideSearchCallback();
-            };
-
-            if (!scope.showSearch) {
-                scope.showSearch = "false";
-            }
-
-            //used to cancel any request in progress if another one needs to take it's place
-            var canceler = null;
-
-            function performSearch() {
-                if (scope.term) {
-                    scope.results = [];
-
-                    //a canceler exists, so perform the cancelation operation and reset
-                    if (canceler) {
-                        canceler.resolve();
-                        canceler = $q.defer();
-                    }
-                    else {
-                        canceler = $q.defer();
-                    }
-
-                    var searchArgs = {
-                        term: scope.term,
-                        canceler: canceler
-                    };
-
-                    //append a start node context if there is one
-                    if (scope.searchFromId) {
-                        searchArgs["searchFrom"] = scope.searchFromId;
-                    }
-
-                    //append dataTypeId value if there is one
-                    if (scope.datatypeKey) {
-                        searchArgs["dataTypeKey"] = scope.datatypeKey;
-                    }
-
-                    searcher(searchArgs).then(function (data) {
-                        scope.searchCallback(data);
-                        //set back to null so it can be re-created
-                        canceler = null;
-                    });
-                }
-                else {
-                    scope.hideSearch();
-                }
-            }
-
-            scope.$watch("term", _.debounce(function(newVal, oldVal) {
-                scope.$apply(function() {
-                    if (newVal !== null && newVal !== undefined && newVal !== oldVal) {
-                        performSearch();
-                    }
-                });
-            }, 200));
-
-            var searcher = searchService.searchContent;
-            //search
-            if (scope.section === "member") {
-                searcher = searchService.searchMembers;
-            }
-            else if (scope.section === "media") {
-                searcher = searchService.searchMedia;
-            }
-        }
-    };
-}
-angular.module('umbraco.directives').directive("umbTreeSearchBox", treeSearchBox);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchresults.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchresults.directive.js
deleted file mode 100644
index b006f75e6b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchresults.directive.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbTreeSearchResults
-* @function
-* @element ANY
-* @restrict E
-**/
-function treeSearchResults() {
-    return {
-        scope: {
-            results: "=",
-            selectResultCallback: "=",
-            emptySearchResultPosition: '@'
-        },
-        restrict: "E",    // restrict to an element
-        replace: true,   // replace the html element with the template
-        templateUrl: 'views/components/tree/umb-tree-search-results.html',
-        link: function (scope, element, attrs, ctrl) {
-            scope.emptySearchResultPosition = scope.emptySearchResultPosition || "center";
-        }
-    };
-}
-angular.module('umbraco.directives').directive("umbTreeSearchResults", treeSearchResults);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
deleted file mode 100644
index 2bc1c636b5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbGenerateAlias
-@restrict E
-@scope
-
-@description
-Use this directive to generate a camelCased umbraco alias.
-When the aliasFrom value is changed the directive will get a formatted alias from the server and update the alias model. If "enableLock" is set to <code>true</code>
-the directive will use {@link umbraco.directives.directive:umbLockedField umbLockedField} to lock and unlock the alias.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <input type="text" ng-model="vm.name" />
-
-        <umb-generate-alias
-            enable-lock="true"
-            alias-from="vm.name"
-            alias="vm.alias">
-        </umb-generate-alias>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-
-            vm.name = "";
-            vm.alias = "";
-
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-
-@param {string} alias (<code>binding</code>): The model where the alias is bound.
-@param {string} aliasFrom (<code>binding</code>): The model to generate the alias from.
-@param {string} validationPosition (<code>binding</code>): The position of the validation. Set to <code>'left'</code> or <code>'right'</code>.
-@param {boolean=} enableLock (<code>binding</code>): Set to <code>true</code> to add a lock next to the alias from where it can be unlocked and changed.
-**/
-
-angular.module("umbraco.directives")
-    .directive('umbGenerateAlias', function ($timeout, entityResource, localizationService) {
-        return {
-            restrict: 'E',
-            templateUrl: 'views/components/umb-generate-alias.html',
-            replace: true,
-            scope: {
-                alias: '=',
-                aliasFrom: '=',
-                enableLock: '=?',
-                validationPosition: '=?',
-                serverValidationField: '@'
-            },
-            link: function (scope, element, attrs, ctrl) {
-
-                var eventBindings = [];
-                var bindWatcher = true;
-                var generateAliasTimeout = "";
-                var updateAlias = false;
-
-                scope.locked = true;
-
-                scope.labels = {
-                    idle: "Enter alias...",
-                    busy: "Generating alias..."
-                };
-                
-                scope.placeholderText = scope.labels.idle;
-                
-                localizationService.localize('placeholders_enterAlias').then(function (value) {
-                    scope.labels.idle = scope.placeholderText = value;
-                });
-
-                localizationService.localize('placeholders_generatingAlias').then(function (value) {
-                    scope.labels.busy = value;
-                });
-
-                function generateAlias(value) {
-
-                  if (generateAliasTimeout) {
-                     $timeout.cancel(generateAliasTimeout);
-                  }
-
-                  if (value !== undefined && value !== "" && value !== null) {
-
-                    scope.alias = "";
-                    scope.placeholderText = scope.labels.busy;
-
-                    generateAliasTimeout = $timeout(function () {
-                       updateAlias = true;
-                        entityResource.getSafeAlias(value, true).then(function (safeAlias) {
-                            if (updateAlias) {
-                                scope.alias = safeAlias.alias;
-                            }
-                            scope.placeholderText = scope.labels.idle;
-                      });
-                    }, 500);
-
-                  } else {
-                    updateAlias = true;
-                    scope.alias = "";
-                    scope.placeholderText = scope.labels.idle;
-                  }
-                }
-
-                // if alias gets unlocked - stop watching alias
-                eventBindings.push(scope.$watch('locked', function(newValue, oldValue){
-                    if(newValue === false) {
-                       bindWatcher = false;
-                    }
-                }));
-
-                // validate custom entered alias
-                eventBindings.push(scope.$watch('alias', function (newValue, oldValue) {
-                    if (scope.alias === "" || scope.alias === null || scope.alias === undefined) {
-                        if (bindWatcher === true) {
-                            // add watcher
-                            eventBindings.push(scope.$watch('aliasFrom', function (newValue, oldValue) {
-                                if (bindWatcher) {
-                                    generateAlias(newValue);
-                                }
-                            }));
-                        }
-                    }
-               }));
-
-               // clean up
-               scope.$on('$destroy', function(){
-                 // unbind watchers
-                 for(var e in eventBindings) {
-                   eventBindings[e]();
-                  }
-               });
-
-            }
-        };
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
deleted file mode 100644
index f36fbc7ea8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
+++ /dev/null
@@ -1,345 +0,0 @@
-(function() {
-    'use strict';
-
-    function AceEditorDirective(umbAceEditorConfig, assetsService, angularHelper) {
-
-        /**
-         * Sets editor options such as the wrapping mode or the syntax checker.
-         *
-         * The supported options are:
-         *
-         *   <ul>
-         *     <li>showGutter</li>
-         *     <li>useWrapMode</li>
-         *     <li>onLoad</li>
-         *     <li>theme</li>
-         *     <li>mode</li>
-         *   </ul>
-         *
-         * @param acee
-         * @param session ACE editor session
-         * @param {object} opts Options to be set
-         */
-        var setOptions = function(acee, session, opts) {
-
-            // sets the ace worker path, if running from concatenated
-            // or minified source
-            if (Utilities.isDefined(opts.workerPath)) {
-                var config = window.ace.require('ace/config');
-                config.set('workerPath', opts.workerPath);
-            }
-
-            // ace requires loading
-            if (Utilities.isDefined(opts.require)) {
-                opts.require.forEach(function(n) {
-                    window.ace.require(n);
-                });
-            }
-
-            // Boolean options
-            if (Utilities.isDefined(opts.showGutter)) {
-                acee.renderer.setShowGutter(opts.showGutter);
-            }
-            if (Utilities.isDefined(opts.useWrapMode)) {
-                session.setUseWrapMode(opts.useWrapMode);
-            }
-            if (Utilities.isDefined(opts.showInvisibles)) {
-                acee.renderer.setShowInvisibles(opts.showInvisibles);
-            }
-            if (Utilities.isDefined(opts.showIndentGuides)) {
-                acee.renderer.setDisplayIndentGuides(opts.showIndentGuides);
-            }
-            if (Utilities.isDefined(opts.useSoftTabs)) {
-                session.setUseSoftTabs(opts.useSoftTabs);
-            }
-            if (Utilities.isDefined(opts.showPrintMargin)) {
-                acee.setShowPrintMargin(opts.showPrintMargin);
-            }
-
-            // commands
-            if (Utilities.isDefined(opts.disableSearch) && opts.disableSearch) {
-                acee.commands.addCommands([{
-                    name: 'unfind',
-                    bindKey: {
-                        win: 'Ctrl-F',
-                        mac: 'Command-F'
-                    },
-                    exec: function() {
-                        return false;
-                    },
-                    readOnly: true
-                }]);
-            }
-
-            // Basic options
-            if (Utilities.isString(opts.theme)) {
-                acee.setTheme('ace/theme/' + opts.theme);
-            }
-            if (Utilities.isString(opts.mode)) {
-                session.setMode('ace/mode/' + opts.mode);
-            }
-            // Advanced options
-            if (Utilities.isDefined(opts.firstLineNumber)) {
-                if (Utilities.isNumber(opts.firstLineNumber)) {
-                    session.setOption('firstLineNumber', opts.firstLineNumber);
-                } else if (Utilities.isFunction(opts.firstLineNumber)) {
-                    session.setOption('firstLineNumber', opts.firstLineNumber());
-                }
-            }
-
-            // advanced options
-            var key, obj;
-            if (Utilities.isDefined(opts.advanced)) {
-                for (key in opts.advanced) {
-                    // create a javascript object with the key and value
-                    obj = {
-                        name: key,
-                        value: opts.advanced[key]
-                    };
-                    // try to assign the option to the ace editor
-                    acee.setOption(obj.name, obj.value);
-                }
-            }
-
-            // advanced options for the renderer
-            if (Utilities.isDefined(opts.rendererOptions)) {
-                for (key in opts.rendererOptions) {
-                    // create a javascript object with the key and value
-                    obj = {
-                        name: key,
-                        value: opts.rendererOptions[key]
-                    };
-                    // try to assign the option to the ace editor
-                    acee.renderer.setOption(obj.name, obj.value);
-                }
-            }
-
-            // onLoad callbacks
-            Utilities.forEach(opts.callbacks, cb => {
-                if (Utilities.isFunction(cb)) {
-                    cb(acee);
-                }
-            });
-        };
-
-        function link(scope, el, attr, ngModel) {
-
-            // Load in ace library
-            assetsService.load(['lib/ace-builds/src-min-noconflict/ace.js', 'lib/ace-builds/src-min-noconflict/ext-language_tools.js'], scope).then(function () {
-                if (Utilities.isUndefined(window.ace)) {
-                    throw new Error('ui-ace need ace to work... (o rly?)');
-                } else {
-                    // init editor
-                    init();
-                }
-            });
-
-            function init() {
-
-                /**
-                 * Corresponds the umbAceEditorConfig ACE configuration.
-                 * @type object
-                 */
-                var options = umbAceEditorConfig.ace || {};
-
-                /**
-                 * umbAceEditorConfig merged with user options via json in attribute or data binding
-                 * @type object
-                 */
-                var opts = Utilities.extend({}, options, scope.umbAceEditor);
-
-                //load ace libraries here... 
-
-                /**
-                 * ACE editor
-                 * @type object
-                 */
-                var acee = window.ace.edit(el[0]);
-                acee.$blockScrolling = Infinity;
-
-                /**
-                 * ACE editor session.
-                 * @type object
-                 * @see [EditSession]{@link https://ace.c9.io/#nav=api&api=edit_session}
-                 */
-                var session = acee.getSession();
-
-                /**
-                 * Reference to a change listener created by the listener factory.
-                 * @function
-                 * @see listenerFactory.onChange
-                 */
-                var onChangeListener;
-
-                /**
-                 * Reference to a blur listener created by the listener factory.
-                 * @function
-                 * @see listenerFactory.onBlur
-                 */
-                var onBlurListener;
-
-                /**
-                 * Calls a callback by checking its existing. The argument list
-                 * is variable and thus this function is relying on the arguments
-                 * object.
-                 * @throws {Error} If the callback isn't a function
-                 */
-                var executeUserCallback = function() {
-
-                    /**
-                     * The callback function grabbed from the array-like arguments
-                     * object. The first argument should always be the callback.
-                     *
-                     * @see [arguments]{@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions_and_function_scope/arguments}
-                     * @type {*}
-                     */
-                    var callback = arguments[0];
-
-                    /**
-                     * Arguments to be passed to the callback. These are taken
-                     * from the array-like arguments object. The first argument
-                     * is stripped because that should be the callback function.
-                     *
-                     * @see [arguments]{@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions_and_function_scope/arguments}
-                     * @type {Array}
-                     */
-                    var args = Array.prototype.slice.call(arguments, 1);
-
-                    if (Utilities.isDefined(callback)) {
-                        scope.$evalAsync(function() {
-                            if (Utilities.isFunction(callback)) {
-                                callback(args);
-                            } else {
-                                throw new Error('ui-ace use a function as callback.');
-                            }
-                        });
-                    }
-                };
-
-
-
-                /**
-                 * Listener factory. Until now only change listeners can be created.
-                 * @type object
-                 */
-                var listenerFactory = {
-                    /**
-                     * Creates a change listener which propagates the change event
-                     * and the editor session to the callback from the user option
-                     * onChange. It might be exchanged during runtime, if this
-                     * happens the old listener will be unbound.
-                     *
-                     * @param callback callback function defined in the user options
-                     * @see onChangeListener
-                     */
-                    onChange: function(callback) {
-                        return function(e) {
-                            var newValue = session.getValue();
-                            angularHelper.safeApply(scope, function () {
-                                scope.model = newValue;
-                            });
-                            executeUserCallback(callback, e, acee);
-                        };
-                    },
-                    /**
-                     * Creates a blur listener which propagates the editor session
-                     * to the callback from the user option onBlur. It might be
-                     * exchanged during runtime, if this happens the old listener
-                     * will be unbound.
-                     *
-                     * @param callback callback function defined in the user options
-                     * @see onBlurListener
-                     */
-                    onBlur: function(callback) {
-                        return function() {
-                            executeUserCallback(callback, acee);
-                        };
-                    }
-                };
-
-                attr.$observe('readonly', function(value) {
-                    acee.setReadOnly(!!value || value === '');
-                });
-
-                // Value Blind
-                if(scope.model) {
-                    session.setValue(scope.model);
-                }
-
-                // Listen for option updates
-                var updateOptions = function(current, previous) {
-                    if (current === previous) {
-                        return;
-                    }
-
-                    opts = Utilities.extend({}, options, scope.umbAceEditor);
-
-                    opts.callbacks = [opts.onLoad];
-                    if (opts.onLoad !== options.onLoad) {
-                        // also call the global onLoad handler
-                        opts.callbacks.unshift(options.onLoad);
-                    }
-
-                    if (opts.autoFocus === true) {
-                        acee.focus();
-                    }
-
-                    // EVENTS
-
-                    // unbind old change listener
-                    session.removeListener('change', onChangeListener);
-
-                    // bind new change listener
-                    onChangeListener = listenerFactory.onChange(opts.onChange);
-                    session.on('change', onChangeListener);
-
-                    // unbind old blur listener
-                    //session.removeListener('blur', onBlurListener);
-                    acee.removeListener('blur', onBlurListener);
-
-                    // bind new blur listener
-                    onBlurListener = listenerFactory.onBlur(opts.onBlur);
-                    acee.on('blur', onBlurListener);
-
-                    setOptions(acee, session, opts);
-                };
-
-                scope.$watch(scope.umbAceEditor, updateOptions, /* deep watch */ true);
-
-                // set the options here, even if we try to watch later, if this
-                // line is missing things go wrong (and the tests will also fail)
-                updateOptions(options);
-
-                el.on('$destroy', function() {
-                    acee.session.$stopWorker();
-                    acee.destroy();
-                });
-
-                scope.$watch(function() {
-                    return [el[0].offsetWidth, el[0].offsetHeight];
-                }, function() {
-                    acee.resize();
-                    acee.renderer.updateFull();
-                }, true);
-
-            }
-
-        }
-
-        var directive = {
-            restrict: 'EA',
-            scope: {
-                "umbAceEditor": "=",
-                "model": "="
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives')
-        .constant('umbAceEditorConfig', {})
-        .directive('umbAceEditor', AceEditorDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js
deleted file mode 100644
index 5e97a281f9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbAvatar
-@restrict E
-@scope
-
-@description
-Use this directive to render an avatar.
-
-<h3>Markup example</h3>
-<pre>
-	<div ng-controller="My.Controller as vm">
-
-        <umb-avatar
-            size="xs"
-            img-src="{{vm.avatar[0].value}}"
-            img-srcset="{{vm.avatar[1].value}} 2x, {{vm.avatar[2].value}} 3x">
-        </umb-avatar>
-
-	</div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-	(function () {
-		"use strict";
-
-		function Controller() {
-
-            var vm = this;
-
-            vm.avatar = [
-                { value: "assets/img/application/logo.svg" }
-            ];
-
-        }
-
-		angular.module("umbraco").controller("My.Controller", Controller);
-
-	})();
-</pre>
-
-@param {string} size (<code>attribute</code>): The size of the avatar (xs, s, m, l, xl).
-@param {string} img-src (<code>attribute</code>): The image source to the avatar.
-@param {string} img-srcset (<code>atribute</code>): Reponsive support for the image source.
-@param {string=} name (<code>attribute</code>): Name initials will be used if no image source.
-@param {string=} color (<code>attribute</code>): Color will be used if no image source (primary, secondary, success, warning, danger).
-**/
-
-(function() {
-    'use strict';
-
-    function AvatarDirective(localizationService) {
-
-        function link(scope, element, attrs, ctrl) {
-
-            var eventBindings = [];
-            scope.initials = "";
-            scope.avatarAlt = "";
-
-            function onInit() {
-                if (!scope.unknownChar) {
-                    scope.unknownChar = "?";
-                }
-                scope.initials = getNameInitials(scope.name);
-                setAvatarAlt(scope.name);
-            }
-
-            function getNameInitials(name) {
-                if (name) {
-                    const notAllowedRegex = /[^\p{Letter}\p{Number} ]+/gu;
-                    var names = name.replace(notAllowedRegex, '').trim().split(' '),
-                        initials = names[0].substring(0, 1);
-
-                    if (names.length > 1) {
-                        initials += names[names.length - 1].substring(0, 1);
-                    }
-                    return initials.toUpperCase();
-                }
-                return null;
-            }
-
-            function setAvatarAlt(name) {
-                if (name) {
-                    localizationService
-                        .localize('general_avatar')
-                        .then(function(data) {
-                                scope.avatarAlt = data + ' ' + name;
-                            }
-                        );
-                }
-                scope.avatarAlt = null;
-            }
-
-            eventBindings.push(scope.$watch('name', function (newValue, oldValue) {
-                if (newValue === oldValue) { return; }
-                if (oldValue === undefined || newValue === undefined) { return; }
-                scope.initials = getNameInitials(newValue);
-                setAvatarAlt(newValue);
-            }));
-
-            onInit();
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/umb-avatar.html',
-            scope: {
-                size: "@",
-                name: "@",
-                color: "@",
-                imgSrc: "@",
-                imgSrcset: "@",
-                unknownChar: "@"
-            },
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbAvatar', AvatarDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbbadge.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbbadge.directive.js
deleted file mode 100644
index b12a1267b8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbbadge.directive.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbBadge
-@restrict E
-@scope
-
-@description
-Use this directive to render a badge.
-
-<h3>Markup example</h3>
-<pre>
-    <div>
-
-        <umb-badge
-            size="s"
-            color="secondary">
-        </umb-badge>
-
-	</div>
-</pre>
-
-@param {string} size (<code>attribute</code>): The size (xxs, xs, s, m, l, xl).
-@param {string} color (<code>attribute</code>): The color of the highlight (primary, secondary, success, warning, danger, gray).
-**/
-
-(function () {
-    'use strict';
-
-    function BadgeDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/umb-badge.html',
-            scope: {
-                size: "@?",
-                color: "@?"
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbBadge', BadgeDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcheckmark.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcheckmark.directive.js
deleted file mode 100644
index d1fefeae5a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcheckmark.directive.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function() {
-    'use strict';
-
-    function CheckmarkDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/umb-checkmark.html',
-            scope: {
-                size: "@?",
-                checked: "=",
-                readonly: "@?"
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbCheckmark', CheckmarkDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js
deleted file mode 100644
index 7870267995..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbChildSelector
-@restrict E
-@scope
-
-@description
-Use this directive to render a ui component for selecting child items to a parent node.
-
-<h3>Markup example</h3>
-<pre>
-	<div ng-controller="My.Controller as vm">
-
-        <umb-child-selector
-                selected-children="vm.selectedChildren"
-                available-children="vm.availableChildren"
-                parent-name="vm.name"
-                parent-icon="vm.icon"
-                parent-id="vm.id"
-                on-add="vm.addChild"
-                on-remove="vm.removeChild">
-        </umb-child-selector>
-
-	</div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-	(function () {
-		"use strict";
-
-		function Controller(overlayService) {
-
-            var vm = this;
-
-            vm.id = 1;
-            vm.name = "My Parent element";
-            vm.icon = "icon-document";
-            vm.selectedChildren = [];
-            vm.availableChildren = [
-                {
-                    id: 1,
-                    alias: "item1",
-                    name: "Item 1",
-                    icon: "icon-document"
-                },
-                {
-                    id: 2,
-                    alias: "item2",
-                    name: "Item 2",
-                    icon: "icon-document"
-                }
-            ];
-
-            vm.addChild = addChild;
-            vm.removeChild = removeChild;
-
-            function addChild($event) {
-                
-                const dialog = {
-                    view: "itempicker",
-                    title: "Choose child",
-                    availableItems: vm.availableChildren,
-                    selectedItems: vm.selectedChildren,
-                    event: $event,
-                    submit: function(model) {
-                        
-                        if (model.selectedItem) {
-                            // add selected child
-                            vm.selectedChildren.push(model.selectedItem);
-                        }
-
-                        // close overlay
-                        overlayService.close();
-                    },
-                    close: function() {
-                        overlayService.close();
-                    }
-                };
-
-                overlayService.open(dialog);
-            }
-
-            function removeChild($index) {
-                vm.selectedChildren.splice($index, 1);
-            }
-
-        }
-
-		angular.module("umbraco").controller("My.Controller", Controller);
-
-	})();
-</pre>
-
-@param {array} selectedChildren (<code>binding</code>): Array of selected children.
-@param {array} availableChildren (<code>binding</code>: Array of items available for selection.
-@param {string} parentName (<code>binding</code>): The parent name.
-@param {string} parentIcon (<code>binding</code>): The parent icon.
-@param {number} parentId (<code>binding</code>): The parent id.
-@param {callback} onRemove (<code>binding</code>): Callback when removing an item.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>child</code>: The selected item.</li>
-        <li><code>$index</code>: The selected item index.</li>
-    </ul>
-@param {callback} onAdd (<code>binding</code>): Callback when adding an item.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>$event</code>: The select event.</li>
-    </ul>
-@param {callback} onSort (<code>binding</code>): Callback when sorting an item.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>$event</code>: The select event.</li>
-    </ul>
-**/
-
-(function() {
-    'use strict';
-
-    function ChildSelectorDirective(overlayService, localizationService) {
-
-        function link(scope, el, attr, ctrl) {
-
-            var eventBindings = [];
-            scope.dialogModel = {};
-            scope.showDialog = false;
-
-            scope.removeChild = (selectedChild, $index, event) => {
-               const dialog = {
-                    view: "views/components/overlays/umb-template-remove-confirm.html",
-                    layout: selectedChild,
-                    submitButtonLabelKey: "defaultdialogs_yesRemove",
-                    submitButtonStyle: "danger",
-                    submit: function () {
-                        if(scope.onRemove) {
-                            scope.onRemove(selectedChild, $index);
-                            overlayService.close();
-                        }
-                    },
-                    close: function () {
-                        overlayService.close();
-                    }
-                };
-
-                localizationService.localize("general_delete").then(value => {
-                    dialog.title = value;
-                    overlayService.open(dialog);
-                });
-
-                event.preventDefault();
-                event.stopPropagation();
-            };
-
-            scope.addChild = $event => {
-               if (scope.onAdd) {
-                  scope.onAdd($event);
-               }
-            };
-
-            function syncParentName() {
-
-              // update name on available item
-              Utilities.forEach(scope.availableChildren, availableChild => {
-                if (availableChild.id === scope.parentId) {
-                   availableChild.name = scope.parentName;
-                }
-              });
-
-              // update name on selected child
-              Utilities.forEach(scope.selectedChildren, selectedChild => {
-                if (selectedChild.id === scope.parentId) {
-                   selectedChild.name = scope.parentName;
-                }
-              });
-
-            }
-
-            function syncParentIcon() {
-
-              // update icon on available item
-              Utilities.forEach(scope.availableChildren, availableChild => {
-                if (availableChild.id === scope.parentId) {
-                   availableChild.icon = scope.parentIcon;
-                }
-              });
-
-              // update icon on selected child
-              Utilities.forEach(scope.selectedChildren, selectedChild => {
-                if (selectedChild.id === scope.parentId) {
-                   selectedChild.icon = scope.parentIcon;
-                }
-              });
-
-            }
-
-            eventBindings.push(scope.$watch('parentName', function(newValue, oldValue){
-
-              if (newValue === oldValue) { return; }
-              if (oldValue === undefined || newValue === undefined) { return; }
-
-              syncParentName();
-            }));
-
-            eventBindings.push(scope.$watch('parentIcon', function(newValue, oldValue){
-
-              if (newValue === oldValue) { return; }
-              if (oldValue === undefined || newValue === undefined) { return; }
-
-              syncParentIcon();
-            }));
-
-            // sortable options for allowed child content types
-            scope.sortableOptions = {
-                axis: "y",
-                cancel: ".unsortable",
-                containment: "parent",
-                distance: 10,
-                opacity: 0.7,
-                tolerance: "pointer",
-                scroll: true,
-                zIndex: 6000,
-                update: function (e, ui) {
-                    if(scope.onSort) {
-                       scope.onSort();
-                    }
-                }
-            };
-
-            // clean up
-            scope.$on('$destroy', function(){
-              // unbind watchers
-              for(var e in eventBindings) {
-                eventBindings[e]();
-               }
-            });
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/umb-child-selector.html',
-            scope: {
-                selectedChildren: '=',
-                availableChildren: "=",
-                parentName: "=",
-                parentIcon: "=",
-                parentId: "=",
-                onRemove: "=",
-                onAdd: "=",
-                onSort: "="
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbChildSelector', ChildSelectorDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbclipboard.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbclipboard.directive.js
deleted file mode 100644
index 7c73e62301..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbclipboard.directive.js
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbClipboard
-@restrict E
-@scope
-
-@description
-<strong>Added in Umbraco v. 7.7:</strong> Use this directive to copy content to the clipboard
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.ClipBoardController as vm">
-        
-        <!-- Copy text from an element -->
-        <div id="copy-text">Copy me!</div>
-        
-        <umb-button
-            umb-clipboard
-            umb-clipboard-success="vm.copySuccess()"
-            umb-clipboard-error="vm.copyError()"
-            umb-clipboard-target="#copy-text"
-            state="vm.clipboardButtonState"
-            type="button"
-            label="Copy">
-        </umb-button>
-
-        <!-- Cut text from a textarea -->
-        <textarea id="cut-text" ng-model="vm.cutText"></textarea>
-
-        <umb-button
-            umb-clipboard
-            umb-clipboard-success="vm.copySuccess()"
-            umb-clipboard-error="vm.copyError()"
-            umb-clipboard-target="#cut-text"
-            umb-clipboard-action="cut"
-            state="vm.clipboardButtonState"
-            type="button"
-            label="Copy">
-        </umb-button>
-
-        <!-- Copy text without an element -->
-        <umb-button
-            ng-if="vm.copyText"
-            umb-clipboard
-            umb-clipboard-success="vm.copySuccess()"
-            umb-clipboard-error="vm.copyError()"
-            umb-clipboard-text="vm.copyText"
-            state="vm.clipboardButtonState"
-            type="button"
-            label="Copy">
-        </umb-button>
-    
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-
-            vm.copyText = "Copy text without element";
-            vm.cutText = "Text to cut";
-
-            vm.copySuccess = copySuccess;
-            vm.copyError = copyError;
-
-            function copySuccess() {
-                vm.clipboardButtonState = "success";
-            }
-            
-            function copyError() {
-                vm.clipboardButtonState = "error";
-            }
-
-        }
-
-        angular.module("umbraco").controller("My.ClipBoardController", Controller);
-
-    })();
-</pre>
-
-@param {callback} umbClipboardSuccess (<code>expression</code>): Callback function when the content is copied.
-@param {callback} umbClipboardError (<code>expression</code>): Callback function if the copy fails.
-@param {string} umbClipboardTarget (<code>attribute</code>): The target element to copy.
-@param {string} umbClipboardAction (<code>attribute</code>): Specify if you want to copy or cut content ("copy", "cut"). Cut only works on <code>input</code> and <code>textarea</code> elements.
-@param {string} umbClipboardText (<code>attribute</code>): Use this attribute if you don't have an element to copy from.
-
-**/
-
-(function () {
-    'use strict';
-
-    function umbClipboardDirective($timeout, assetsService, $parse) {
-
-        function link(scope, element, attrs, ctrl) {
-
-            var clipboard;
-            var target = element[0];
-
-            assetsService.loadJs("lib/clipboard/clipboard.min.js", scope)
-                .then(function () {
-
-
-                    if (attrs.umbClipboardTarget) {
-                        target.setAttribute("data-clipboard-target", attrs.umbClipboardTarget);
-                    }
-
-                    if (attrs.umbClipboardAction) {
-                        target.setAttribute("data-clipboard-action", attrs.umbClipboardAction);
-                    }
-
-                    if (attrs.umbClipboardText) {
-                        target.setAttribute("data-clipboard-text", attrs.umbClipboardText);
-                    }
-
-                    clipboard = new ClipboardJS(target);
-
-                    var expressionHandlerSuccess = $parse(attrs.umbClipboardSuccess);
-                    clipboard.on('success', function (e) {
-                        e.clearSelection();
-                        if (attrs.umbClipboardSuccess) {
-
-                            expressionHandlerSuccess(scope, { msg: "success" });
-                        }
-
-                    });
-
-                    var expressionHandlerError = $parse(attrs.umbClipboardError);
-                    clipboard.on('error', function (e) {
-                        if (attrs.umbClipboardError) {
-
-                            expressionHandlerError(scope, { msg: "error" });
-                        }
-                    });
-
-                });
-
-            // clean up
-            scope.$on('$destroy', function () {
-                clipboard.destroy();
-            });
-
-        }
-
-        ////////////
-
-        var directive = {
-            restrict: 'A',
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbClipboard', umbClipboardDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcodesnippet.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcodesnippet.directive.js
deleted file mode 100644
index e0ac1a10a5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcodesnippet.directive.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbCodeSnippet
-@restrict E
-@scope
-
-@description
-
-<h3>Markup example</h3>
-<pre>
-	<div ng-controller="My.Controller as vm">
-
-        <umb-code-snippet 
-            language="'csharp'">
-            {{code}}
-        </umb-code-snippet>
-
-	</div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-	(function () {
-		"use strict";
-
-		function Controller() {
-
-            var vm = this;
-
-        }
-
-		angular.module("umbraco").controller("My.Controller", Controller);
-
-	})();
-</pre>
-
-@param {string=} language Language of the code snippet, e.g csharp, html, css.
-**/
-
-
-(function () {
-    'use strict';
-
-    var umbCodeSnippet = {
-        templateUrl: 'views/components/umb-code-snippet.html',
-        controller: UmbCodeSnippetController,
-        controllerAs: 'vm',
-        transclude: true,
-        bindings: {
-            language: '<',
-            wrap: '<?'
-        }
-    };
-
-    function UmbCodeSnippetController($timeout) {
-
-        const vm = this;
-
-        vm.page = {};
-
-        vm.$onInit = onInit;
-        vm.copySuccess = copySuccess;
-        vm.copyError = copyError;
-
-        function onInit() {
-            vm.guid = String.CreateGuid();
-
-            if (vm.language)
-            {
-                switch (vm.language.toLowerCase()) {
-                    case "csharp":
-                    case "c#":
-                        vm.language = "C#";
-                        break;
-                    case "html":
-                        vm.language = "HTML";
-                        break;
-                    case "css":
-                        vm.language = "CSS";
-                        break;
-                    case "js":
-                    case "javascript":
-                        vm.language = "JavaScript";
-                        break;
-                    case "txt":
-                    case "text":
-                        vm.language = "Text/Plain";
-                        break;
-                }
-            }
-            
-        }
-
-        // copy to clip board success
-        function copySuccess() {
-            if (vm.page.copyCodeButtonState !== "success") {
-                $timeout(function () {
-                    vm.page.copyCodeButtonState = "success";
-                });
-                $timeout(function () {
-                    resetClipboardButtonState();
-                }, 1000);
-            }
-        }
-
-        // copy to clip board error
-        function copyError() {
-            if (vm.page.copyCodeButtonState !== "error") {
-                $timeout(function () {
-                    vm.page.copyCodeButtonState = "error";
-                });
-                $timeout(function () {
-                    resetClipboardButtonState();
-                }, 1000);
-            }
-        }
-
-        function resetClipboardButtonState() {
-            vm.page.copyCodeButtonState = "init";
-        }
-    }
-
-    angular.module('umbraco.directives').component('umbCodeSnippet', umbCodeSnippet);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorpicker.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorpicker.directive.js
deleted file mode 100644
index e5633bce00..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorpicker.directive.js
+++ /dev/null
@@ -1,315 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbColorPicker
-@restrict E
-@scope
-
-@description
-<strong>Added in Umbraco v. 8.10:</strong> Use this directive to render a color picker.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.ColorController as vm">
-        
-        <umb-color-picker
-            options="vm.options"
-            on-show="vm.show(color)"
-            on-hide="vm.hide(color)"
-            on-change="vm.change(color)">
-        </umb-color-picker>
-    
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-    
-        function Controller() {
-    
-            var vm = this;
-
-            vm.options = {
-                type: "color",
-                color: defaultColor,
-                showAlpha: false,
-                showPalette: true,
-                showPaletteOnly: false,
-                preferredFormat: "hex",
-            };
-            
-            vm.show = show;
-            vm.hide = hide;
-            vm.change = change;
-
-            function show(color) {
-                color.toHexString().trimStart("#");
-            }
-
-            function hide(color) {
-                color.toHexString().trimStart("#");
-            }
-
-            function change(color) {
-                color.toHexString().trimStart("#");
-            }
-        }
-    
-        angular.module("umbraco").controller("My.ColorController", Controller);
-    
-    })();
-</pre>
-
-@param {string} ngModel (<code>binding</code>): Value for the color picker.
-@param {object} options (<code>binding</code>): Config object for the color picker.
-@param {function} onBeforeShow (<code>expression</code>): You can prevent the color picker from showing up if you return false in the beforeShow event. This event is ignored on a flat color picker.
-@param {function} onChange (<code>expression</code>): Called as the original input changes. Only happens when the input is closed or the 'Choose' button is clicked.
-@param {function} onShow (<code>expression</code>): Called after the color picker is opened. This is ignored on a flat color picker. Note, when any color picker on the page is shown it will hide any that are already open.
-@param {function} onHide (<code>expression</code>): Called after the color picker is hidden. This happens when clicking outside of the picker while it is open. Note, when any color picker on the page is shown it will hide any that are already open. This event is ignored on a flat color picker.
-@param {function} onMove (<code>expression</code>): Called as the user moves around within the color picker.
-@param {function} onDragStart (<code>expression</code>): Called at the beginning of a drag event on either hue slider, alpha slider, or main color picker areas.
-@param {function} onDragStop (<code>expression</code>): Called at the end of a drag event on either hue slider, alpha slider, or main color picker areas.
-
-**/
-
-(function () {
-    'use strict';
-
-    function ColorPickerController($scope, $element, $timeout, assetsService, localizationService, $attrs) {
-
-        const ctrl = this;
-
-        let colorPickerInstance = null;
-        let labels = {};
-        let options = null;
-
-        ctrl.readonly = false;
-        ctrl.value = null;
-
-        ctrl.$onInit = function () {
-
-            // load the separate css for the editor to avoid it blocking our js loading
-            assetsService.loadCss("lib/spectrum/spectrum.min.css", $scope);
-
-            // load the js file for the color picker
-            assetsService.load([
-                //"lib/spectrum/tinycolor.js",
-                "lib/spectrum/spectrum.js"
-            ], $scope).then(function () {
-
-                // init color picker
-                grabElementAndRun();
-            });
-        }
-
-        ctrl.$onChanges = function (changes) {
-            if (colorPickerInstance && changes.ngModel) {
-                colorPickerInstance.spectrum("set", changes.ngModel.currentValue);
-            }
-        }
-
-        $attrs.$observe('readonly', (value) => {
-            ctrl.readonly = value !== undefined;
-
-            if (!colorPickerInstance) {
-                return;
-            }
-
-            if (ctrl.readonly) {
-                colorPickerInstance.spectrum('disable');
-            } else {
-                colorPickerInstance.spectrum('enable');
-            }
-        });
-
-        function grabElementAndRun() {
-
-            var labelKeys = [
-                "general_cancel",
-                "general_choose",
-                "general_clear"
-            ];
-
-            localizationService.localizeMany(labelKeys).then(values => {
-                labels.cancel = values[0];
-                labels.choose = values[1];
-                labels.clear = values[2];
-            });
-
-            $timeout(function () {
-                const element = $element.find('.umb-color-picker > input')[0];
-                setColorPicker(element, labels);
-            }, 0, true);
-
-        }
-
-        function setColorPicker(element, labels) {
-
-            // Spectrum options: https://seballot.github.io/spectrum/#options
-
-            const defaultOptions = {
-                type: "color",
-                color: null,
-                showAlpha: false,
-                showInitial: false,
-                showInput: true,
-                cancelText: labels.cancel,
-                clearText: labels.clear,
-                chooseText: labels.choose,
-                preferredFormat: "hex",
-                clickoutFiresChange: true
-            };
-
-            // If has ngModel set the color
-            if (ctrl.ngModel) {
-                defaultOptions.color = ctrl.ngModel;
-            }
-
-            //const options = ctrl.options ? ctrl.options : defaultOptions;
-            options = Utilities.extend(defaultOptions, ctrl.options);
-
-            var elem = angular.element(element);
-
-            // Create new color pickr instance
-            const colorPicker = elem.spectrum(options);
-
-            colorPickerInstance = colorPicker;
-
-            if (colorPickerInstance) {
-                
-                if (ctrl.readonly) {
-                    colorPickerInstance.spectrum('disable');
-                }
-
-                const tinyColor = colorPickerInstance.spectrum("get");
-                ctrl.value = getColorString(tinyColor, options.preferredFormat);
-
-                colorPickerInstance.on('change', (e, tinyColor) => {
-                    ctrl.value = getColorString(tinyColor, options.preferredFormat);
-                    $scope.$applyAsync();
-                });
-
-                // destroy the color picker instance when the dom element is removed
-                elem.on('$destroy', function () {
-                    colorPickerInstance.spectrum('destroy');
-                });
-            }
-
-            setUpCallbacks();
-
-            // Refresh the scope
-            $scope.$applyAsync();
-        }
-
-        // Spectrum events: https://seballot.github.io/spectrum/#events
-
-        function setUpCallbacks() {
-
-            if (colorPickerInstance) {
-
-                // bind hook for beforeShow
-                if (ctrl.onBeforeShow) {
-                    colorPickerInstance.on('beforeShow.spectrum', (e, tinycolor) => {
-                        $timeout(function () {
-                            ctrl.onBeforeShow({ color: tinycolor });
-                        });
-                    });
-                }
-
-                // bind hook for show
-                if (ctrl.onShow) {
-                    colorPickerInstance.on('show.spectrum', (e, tinycolor) => {
-                        $timeout(function () {
-                            ctrl.onShow({ color: tinycolor });
-                        });
-                    });
-                }
-
-                // bind hook for hide
-                if (ctrl.onHide) {
-                    colorPickerInstance.on('hide.spectrum', (e, tinycolor) => {
-                        $timeout(function () {
-                            ctrl.onHide({ color: tinycolor });
-                        });
-                    });
-                }
-
-                // bind hook for change
-                if (ctrl.onChange) {
-                    colorPickerInstance.on('change.spectrum', (e, tinycolor) => {
-                        $timeout(function () {
-                            ctrl.onChange({ color: tinycolor });
-                        });
-                    });
-                }
-
-                // bind hook for move
-                if (ctrl.onMove) {
-                    colorPickerInstance.on('move.spectrum', (e, tinycolor) => {
-                        $timeout(function () {
-                            ctrl.onMove({ color: tinycolor });
-                        });
-                    });
-                }
-
-                // bind hook for drag start
-                if (ctrl.onDragStart) {
-                    colorPickerInstance.on('dragstart.spectrum', (e, tinycolor) => {
-                        $timeout(function () {
-                            ctrl.onDragStart({ color: tinycolor });
-                        });
-                    });
-                }
-
-                // bind hook for drag stop
-                if (ctrl.onDragStop) {
-                    colorPickerInstance.on('dragstop.spectrum', (e, tinycolor) => {
-                        $timeout(function () {
-                            ctrl.onDragStop({ color: tinycolor });
-                        });
-                    });
-                }
-
-            }
-        }
-
-        function getColorString (tinyColor, format) {
-            if (!tinyColor) {
-                return;
-            }
-
-            switch(format) {
-                case 'rgb':
-                  return tinyColor.toRgbString();
-                case 'hsv':
-                  return tinyColor.toHsvString();
-                case 'hsl':
-                    return tinyColor.toHslString();
-                case 'name':
-                    return tinyColor.toName();
-                default:
-                    return tinyColor.toHexString();
-              }
-        }
-    }
-
-    angular
-        .module('umbraco.directives')
-        .component('umbColorPicker', {
-            template: '<div class="flex items-center"><div class="umb-color-picker"><input type="hidden" /></div><small ng-if="$ctrl.readonly">{{ $ctrl.value }}</small></div>',
-            controller: ColorPickerController,
-            bindings: {
-                ngModel: '<',
-                options: '<',
-                onBeforeShow: '&?',
-                onShow: '&?',
-                onHide: '&?',
-                onChange: '&?',
-                onMove: '&?',
-                onDragStart: '&?',
-                onDragStop: '&?'
-            }
-        });
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
deleted file mode 100644
index aa0d0b8714..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorswatches.directive.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbColorSwatches
-@restrict E
-@scope
-@description
-Use this directive to generate color swatches to pick from.
-<h3>Markup example</h3>
-<pre>
-    <umb-color-swatches
-        colors="colors"
-        selected-color="color"
-        size="s">
-    </umb-color-swatches>
-</pre>
-@param {array} colors (<code>attribute</code>): The array of colors.
-@param {string} selectedColor (<code>attribute</code>): The selected color.
-@param {string} size (<code>attribute</code>): The size (s, m).
-@param {string} useLabel (<code>attribute</code>): Specify if labels should be used.
-@param {string} useColorClass (<code>attribute</code>): Specify if color values are css classes.
-@param {string} colorClassNamePrefix (<code>attribute</code>): Specify the prefix used for the class for each color (defaults to "btn").
-@param {function} onSelect (<code>expression</code>): Callback function when the item is selected.
-**/
-
-(function () {
-    'use strict';
-
-    function ColorSwatchesDirective() {
-
-        function link(scope, el, attrs, ctrl) {
-
-            // Set default to true if not defined
-            if (Utilities.isUndefined(scope.useColorClass)) {
-                scope.useColorClass = false;
-            }
-
-            // Set default to "btn" if not defined
-            if (Utilities.isUndefined(scope.colorClassNamePrefix)) {
-                scope.colorClassNamePrefix = "btn";
-            }
-
-            scope.setColor = function (color, $index, $event) {
-                if (scope.readonly) {
-                    $event.preventDefault();
-                    $event.stopPropagation();
-                    return;
-                }
-
-                if (scope.onSelect) {
-                    // did the value change?
-                    if (scope.selectedColor != null && scope.selectedColor.value === color.value) {
-                        // User clicked the currently selected color
-                        // to remove the selection, they don't want
-                        // to select any color after all.
-                        // Unselect the color
-                        color = null;
-                    }
-
-                    scope.selectedColor = color;
-                    scope.onSelect({color: color, $index: $index, $event: $event});
-                    $event.stopPropagation();
-                }
-            };
-
-            scope.isSelectedColor = function (color) {
-                return scope.selectedColor && color.value === scope.selectedColor.value;
-            }
-
-            attrs.$observe('readonly', (value) => {
-                scope.readonly = value !== undefined;
-            });
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/umb-color-swatches.html',
-            scope: {
-                colors: '=?',
-                size: '@',
-                selectedColor: '=',
-                onSelect: '&',
-                useLabel: '=',
-                useColorClass: '=?',
-                colorClassNamePrefix: '@?'
-            },
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbColorSwatches', ColorSwatchesDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirm.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirm.directive.js
deleted file mode 100644
index 9114cfb1c1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirm.directive.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbConfirm
-@restrict E
-@scope
-
-@description
-A confirmation dialog
-
-
-<h3>Markup example</h3>
-<pre>
-	<div ng-controller="My.Controller as vm">
-
-       <umb-confirm caption="Title" on-confirm="vm.onConfirm()" on-cancel="vm.onCancel()"></umb-confirm>
-
-	</div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-	(function () {
-		"use strict";
-
-		function Controller() {
-
-            var vm = this;
-
-            vm.onConfirm = function() {
-                alert('Confirm clicked');
-            };
-
-            vm.onCancel = function() {
-                alert('Cancel clicked');
-            }
-
-
-        }
-
-		angular.module("umbraco").controller("My.Controller", Controller);
-
-	})();
-</pre>
-
-@param {string} caption (<code>attribute</code>): The caption shown above the buttons
-@param {callback} on-confirm (<code>attribute</code>): The call back when the "OK" button is clicked. If not set the button will not be shown
-@param {callback} on-cancel (<code>atribute</code>): The call back when the "Cancel" button is clicked. If not set the button will not be shown
-**/
-function confirmDirective() {
-    return {
-        restrict: "E",    // restrict to an element
-        replace: true,   // replace the html element with the template
-        templateUrl: 'views/components/umb-confirm.html',
-        scope: {
-            onConfirm: '=',
-            onCancel: '=',
-            caption: '@',
-            confirmButtonStyle: '@',
-            confirmDisabled: '<?',
-            confirmLabelKey: '@'
-        },
-        link: function (scope, element, attr, ctrl) {
-            scope.showCancel = false;
-            scope.showConfirm = false;
-            scope.confirmButtonState = "init";
-
-            if (scope.onConfirm) {
-                scope.showConfirm = true;
-            }
-
-            if (scope.onCancel) {
-                scope.showCancel = true;
-            }
-
-            scope.confirm = function () {
-                if (!scope.onConfirm) {
-                    return;
-                }
-
-                scope.confirmButtonState = "busy";
-                scope.onConfirm();
-            }
-        }
-    };
-}
-angular.module('umbraco.directives').directive("umbConfirm", confirmDirective);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
deleted file mode 100644
index 665b837946..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbConfirmAction
-@restrict E
-@scope
-
-@description
-<p>Use this directive to toggle a confirmation prompt for an action.
-The prompt consists of a checkmark and a cross to confirm or cancel the action.
-The prompt can be opened in four direction up, down, left or right.</p>
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <div class="my-action" style="position:relative;">
-            <umb-icon icon="icon-trash" ng-click="vm.showPrompt()"></umb-icon>
-            <umb-confirm-action
-                ng-if="vm.promptIsVisible"
-                direction="left"
-                on-confirm="vm.confirmAction()"
-                on-cancel="vm.hidePrompt()">
-            </umb-confirm-action>
-        </div>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-            vm.promptIsVisible = false;
-
-            vm.confirmAction = confirmAction;
-            vm.showPrompt = showPrompt;
-            vm.hidePrompt = hidePrompt;
-
-            function confirmAction() {
-                // confirm logic here
-            }
-
-            function showPrompt() {
-                vm.promptIsVisible = true;
-            }
-
-            function hidePrompt() {
-                vm.promptIsVisible = false;
-            }
-
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-
-@param {string} direction The direction the prompt opens ("up", "down", "left", "right").
-@param {callback} onConfirm Callback when the checkmark is clicked.
-@param {callback} onCancel Callback when the cross is clicked.
-**/
-
-(function() {
-  'use strict';
-
-  function ConfirmAction() {
-
-    function link(scope, el, attr, ctrl) {
-
-      scope.clickConfirm = function() {
-          if(scope.onConfirm) {
-              scope.onConfirm();
-          }
-      };
-
-      scope.clickCancel = function() {
-          if(scope.onCancel) {
-              scope.onCancel();
-          }
-      };
-
-    }
-
-    var directive = {
-      restrict: 'E',
-      replace: true,
-      templateUrl: 'views/components/umb-confirm-action.html',
-      scope: {
-        direction: "@",
-        onConfirm: "&",
-        onCancel: "&"
-      },
-      link: link
-    };
-
-    return directive;
-  }
-
-  angular.module('umbraco.directives').directive('umbConfirmAction', ConfirmAction);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcontentgrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcontentgrid.directive.js
deleted file mode 100644
index 8d4d3c0392..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbcontentgrid.directive.js
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbContentGrid
-@restrict E
-@scope
-
-@description
-Use this directive to generate a list of content items presented as a flexbox grid.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-content-grid
-            content="vm.contentItems"
-            content-properties="vm.includeProperties"
-            on-click="vm.selectItem"
-            on-click-name="vm.clickItem">
-        </umb-content-grid>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-            vm.contentItems = [
-                {
-                    "name": "Cape",
-                    "published": true,
-                    "icon": "icon-document",
-                    "updateDate": "15-02-2016",
-                    "owner": "Mr. Batman",
-                    "selected": false
-                },
-                {
-                    "name": "Utility Belt",
-                    "published": true,
-                    "icon": "icon-document",
-                    "updateDate": "15-02-2016",
-                    "owner": "Mr. Batman",
-                    "selected": false
-                },
-                {
-                    "name": "Cave",
-                    "published": true,
-                    "icon": "icon-document",
-                    "updateDate": "15-02-2016",
-                    "owner": "Mr. Batman",
-                    "selected": false
-                }
-            ];
-            vm.includeProperties = [
-                {
-                  "alias": "updateDate",
-                  "header": "Last edited"
-                },
-                {
-                  "alias": "owner",
-                  "header": "Created by"
-                }
-            ];
-
-            vm.clickItem = clickItem;
-            vm.selectItem = selectItem;
-
-
-            function clickItem(item, $event, $index){
-                // do magic here
-            }
-
-            function selectItem(item, $event, $index) {
-                // set item.selected = true; to select the item
-                // do magic here
-            }
-
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-
-@param {array} content (<code>binding</code>): Array of content items.
-@param {array=} contentProperties (<code>binding</code>): Array of content item properties to include in the item. If left empty the item will only show the item icon and name.
-@param {callback=} onClick (<code>binding</code>): Callback method to handle click events on the content item.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>item</code>: The clicked item</li>
-        <li><code>$event</code>: The select event</li>
-        <li><code>$index</code>: The item index</li>
-    </ul>
-@param {callback=} onClickName (<code>binding</code>): Callback method to handle click events on the checkmark icon.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>item</code>: The selected item</li>
-        <li><code>$event</code>: The select event</li>
-        <li><code>$index</code>: The item index</li>
-    </ul>
-**/
-
-(function() {
-   'use strict';
-
-   function ContentGridDirective() {
-
-      function link(scope, el, attr, ctrl) {
-
-         scope.clickItem = function(item, $event, $index) {
-            if(scope.allowClick !== false && scope.onClick) {
-               scope.onClick(item, $event, $index);
-            }
-         };
-
-         scope.clickItemName = function(item, $event, $index) {
-            if(scope.onClickName && !($event.metaKey || $event.ctrlKey)) {
-               scope.onClickName(item, $event, $index);
-               $event.preventDefault();
-            }
-            $event.stopPropagation();
-         };
-
-      }
-
-      var directive = {
-         restrict: 'E',
-         replace: true,
-         templateUrl: 'views/components/umb-content-grid.html',
-         scope: {
-            content: '=',
-            contentProperties: "=",
-            allowClick: "<?",
-            onClick: "=",
-            onClickName: "="
-         },
-         link: link
-      };
-
-      return directive;
-   }
-
-   angular.module('umbraco.directives').directive('umbContentGrid', ContentGridDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
deleted file mode 100644
index 0a9c01edc4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
+++ /dev/null
@@ -1,253 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbDateTimePicker
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco version 8.0</b>
-This directive is a wrapper of the flatpickr library. Use it to render a date time picker.
-For extra details about options and events take a look here: https://flatpickr.js.org
-
-Use this directive to render a date time picker
-
-<h3>Markup example</h3>
-<pre>
-	<div ng-controller="My.Controller as vm">
-
-		<umb-date-time-picker
-			ng-model="vm.date"
-            options="vm.config"
-            on-change="vm.datePickerChange(selectedDates, dateStr, instance)">
-        </umb-date-time-picker>
-
-	</div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-	(function () {
-		"use strict";
-
-		function Controller() {
-
-            var vm = this;
-
-            vm.date = "2018-10-10 10:00";
-
-            vm.config = {
-				enableTime: true,
-				dateFormat: "Y-m-d H:i",
-				time_24hr: true
-            };
-
-            vm.datePickerChange = datePickerChange;
-
-            function datePickerChange(selectedDates, dateStr, instance) {
-            	// handle change
-            }
-
-        }
-
-		angular.module("umbraco").controller("My.Controller", Controller);
-
-	})();
-</pre>
-
-@param {object} ngModel (<code>binding</code>): Config object for the date picker.
-@param {object} options (<code>binding</code>): Config object for the date picker.
-@param {callback} onSetup (<code>callback</code>): onSetup gets triggered when the date picker is initialized
-@param {callback} onChange (<code>callback</code>): onChange gets triggered when the user selects a date, or changes the time on a selected date.
-@param {callback} onOpen (<code>callback</code>): onOpen gets triggered when the calendar is opened.
-@param {callback} onClose (<code>callback</code>): onClose gets triggered when the calendar is closed.
-@param {callback} onMonthChange (<code>callback</code>): onMonthChange gets triggered when the month is changed, either by the user or programmatically.
-@param {callback} onYearChange (<code>callback</code>): onMonthChange gets triggered when the year is changed, either by the user or programmatically.
-@param {callback} onReady (<code>callback</code>): onReady gets triggered once the calendar is in a ready state.
-@param {callback} onValueUpdate (<code>callback</code>): onValueUpdate gets triggered when the input value is updated with a new date string.
-@param {callback} onDayCreate (<code>callback</code>): Take full control of every date cell with theonDayCreate()hook.
-**/
-
-(function () {
-    'use strict';
-
-    var umbDateTimePicker = {
-        template: '<ng-transclude>' +
-            '<input type="text" ng-if="!$ctrl.options.inline" ng-model="$ctrl.ngModel" placeholder="Select Date.." ng-attr-aria-labelledby="{{$ctrl.label}}"></input>' +
-            '<div ng-if="$ctrl.options.inline"></div>' +
-            '</ng-transclude>',
-        controller: umbDateTimePickerCtrl,
-        transclude: true,
-        bindings: {
-            ngModel: '<',
-            options: '<',
-            onSetup: '&?',
-            onChange: '&?',
-            onOpen: '&?',
-            onClose: '&?',
-            onMonthChange: '&?',
-            onYearChange: '&?',
-            onReady: '&?',
-            onValueUpdate: '&?',
-            onDayCreate: '&?',
-            label: '@'
-        }
-    };
-
-    function umbDateTimePickerCtrl($element, $timeout, $scope, assetsService, userService) {
-
-        var ctrl = this;
-        var userLocale = null;
-
-        ctrl.$onInit = function () {
-
-            // load css file for the date picker
-            assetsService.loadCss('lib/flatpickr/flatpickr.min.css', $scope).then(function () {
-                userService.getCurrentUser().then(function (user) {
-
-                    // init date picker
-                    userLocale = user.locale;
-                    if (userLocale.indexOf('-') > -1) {
-                        userLocale = userLocale.split('-')[0];
-                    }
-
-                    grabElementAndRunFlatpickr();
-                });
-            });
-
-        };
-
-        function grabElementAndRunFlatpickr() {
-            $timeout(function () {
-                var transcludeEl = $element.find('ng-transclude')[0];
-                var element = transcludeEl.children[0];
-
-                setDatepicker(element);
-            }, 0, true);
-        }
-
-        function setDatepicker(element) {
-            var fpLib = flatpickr ? flatpickr : FlatpickrInstance;
-
-            if (!fpLib) {
-                return console.warn('Unable to find any flatpickr installation');
-            }
-
-            var fpInstance;
-
-            setUpCallbacks();
-
-            if (!ctrl.options.locale) {
-                ctrl.options.locale = userLocale;
-            }
-
-            // handle special keydown events
-            ctrl.options.onKeyDown = function (selectedDates, dateStr, instance, event) {
-                var code = event.keyCode || event.which;
-                if (code === 13) {
-                    // close the datepicker on enter (this happens when entering time)
-                    fpInstance.close()
-                }
-            };
-
-            fpInstance = new fpLib(element, ctrl.options);
-
-            if (ctrl.onSetup) {
-                ctrl.onSetup({
-                    fpItem: fpInstance
-                });
-            }
-
-            // If has ngModel set the date
-            if (ctrl.ngModel) {
-                fpInstance.setDate(ctrl.ngModel);
-            }
-
-            // destroy the flatpickr instance when the dom element is removed
-            $(element).on('$destroy', function () {
-                fpInstance.destroy();
-            });
-
-            // Refresh the scope
-            $scope.$applyAsync();
-        }
-
-        function setUpCallbacks() {
-            // bind hook for onChange
-            if (ctrl.options && ctrl.onChange) {
-                ctrl.options.onChange = function (selectedDates, dateStr, instance) {
-                    $timeout(function () {
-                        ctrl.onChange({ selectedDates: selectedDates, dateStr: dateStr, instance: instance });
-                    });
-                };
-            }
-
-            // bind hook for onOpen
-            if (ctrl.options && ctrl.onOpen) {
-                ctrl.options.onOpen = function (selectedDates, dateStr, instance) {
-                    $timeout(function () {
-                        ctrl.onOpen({ selectedDates: selectedDates, dateStr: dateStr, instance: instance });
-                    });
-                };
-            }
-
-			// bind hook for onOpen
-            if (ctrl.options && ctrl.onClose) {
-                ctrl.options.onClose = function (selectedDates, dateStr, instance) {
-                    $timeout(function () {
-                        ctrl.onClose({ selectedDates: selectedDates, dateStr: dateStr, instance: instance });
-                    });
-                };
-            }
-
-            // bind hook for onMonthChange
-            if (ctrl.options && ctrl.onMonthChange) {
-                ctrl.options.onMonthChange = function (selectedDates, dateStr, instance) {
-                    $timeout(function () {
-                        ctrl.onMonthChange({ selectedDates: selectedDates, dateStr: dateStr, instance: instance });
-                    });
-                };
-            }
-
-            // bind hook for onYearChange
-            if (ctrl.options && ctrl.onYearChange) {
-                ctrl.options.onYearChange = function (selectedDates, dateStr, instance) {
-                    $timeout(function () {
-                        ctrl.onYearChange({ selectedDates: selectedDates, dateStr: dateStr, instance: instance });
-                    });
-                };
-            }
-
-            // bind hook for onReady
-            if (ctrl.options && ctrl.onReady) {
-                ctrl.options.onReady = function (selectedDates, dateStr, instance) {
-                    $timeout(function () {
-                        ctrl.onReady({ selectedDates: selectedDates, dateStr: dateStr, instance: instance });
-                    });
-                };
-            }
-
-            // bind hook for onValueUpdate
-            if (ctrl.onValueUpdate) {
-                ctrl.options.onValueUpdate = function (selectedDates, dateStr, instance) {
-                    $timeout(function () {
-                        ctrl.onValueUpdate({ selectedDates: selectedDates, dateStr: dateStr, instance: instance });
-                    });
-                };
-            }
-
-            // bind hook for onDayCreate
-            if (ctrl.onDayCreate) {
-                ctrl.options.onDayCreate = function (selectedDates, dateStr, instance) {
-                    $timeout(function () {
-                        ctrl.onDayCreate({ selectedDates: selectedDates, dateStr: dateStr, instance: instance });
-                    });
-                };
-            }
-
-        }
-    }
-
-    // umbFlatpickr (umb-flatpickr) is deprecated, but we keep it for backwards compatibility
-    angular.module('umbraco.directives').component('umbFlatpickr', umbDateTimePicker);
-    angular.module('umbraco.directives').component('umbDateTimePicker', umbDateTimePicker);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdisableformvalidation.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdisableformvalidation.directive.js
deleted file mode 100644
index c101504ea7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdisableformvalidation.directive.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function() {
-  'use strict';
-
-  function UmbDisableFormValidation() {
-
-      var directive = {
-          restrict: 'A',
-          require: '?form',
-          link: function (scope, elm, attrs, ctrl) {
-              //override the $setValidity function of the form to disable validation
-              ctrl.$setValidity = function () { };
-          }
-      };
-
-    return directive;
-  }
-
-  angular.module('umbraco.directives').directive('umbDisableFormValidation', UmbDisableFormValidation);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdown.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdown.directive.js
deleted file mode 100644
index cfba5be2ce..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdown.directive.js
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbDropdown
-@restrict E
-@scope
-
-@description
-<b>Added in versions 7.7.0</b>: Use this component to render a dropdown menu.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="MyDropdown.Controller as vm">
-
-        <div style="position: relative;">
-
-            <umb-button
-                type="button"
-                label="Toggle dropdown"
-                action="vm.toggle()">
-            </umb-button>
-
-            <umb-dropdown ng-if="vm.dropdownOpen" on-close="vm.close()" umb-keyboard-list>
-                <umb-dropdown-item
-                    ng-repeat="item in vm.items">
-                    <button type="button" class="btn-reset" ng-click="vm.select(item)">{{ item.name }}</button>
-                </umb-dropdown-item>
-            </umb-dropdown>
-
-        </div>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-
-            vm.dropdownOpen = false;
-            vm.items = [
-                { "name": "Item 1" },
-                { "name": "Item 2" },
-                { "name": "Item 3" }
-            ];
-
-            vm.toggle = toggle;
-            vm.close = close;
-            vm.select = select;
-
-            function toggle() {
-                vm.dropdownOpen = true;
-            }
-
-            function close() {
-                vm.dropdownOpen = false;
-            }
-
-            function select(item) {
-                // Do your magic here
-            }
-
-        }
-
-        angular.module("umbraco").controller("MyDropdown.Controller", Controller);
-    })();
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbDropdownItem umbDropdownItem}</li>
-    <li>{@link umbraco.directives.directive:umbKeyboardList umbKeyboardList}</li>
-</ul>
-
-@param {callback} onClose Callback when the dropdown menu closes. When you click outside or press esc.
-
-**/
-
-(function() {
-    'use strict';
-
-    function umbDropdown($document) {
-
-        function link(scope, element, attr, ctrl) {
-
-            scope.close = function() {
-                if (scope.onClose) {
-                    scope.onClose();
-                }
-            };
-
-            // Handle keydown events
-            function keydown(event) {
-                // press escape
-                if(event.keyCode === 27) {
-                    scope.onClose();
-                }
-            }
-
-            // Stop to listen typing.
-            function stopListening() {
-                $document.off('keydown', keydown);
-            }
-
-            // Start listening to key typing.
-            $document.on('keydown', keydown);
-
-            // Stop listening when scope is destroyed.
-            scope.$on('$destroy', stopListening);
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/umb-dropdown.html',
-            scope: {
-                onClose: "&"
-            },
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbDropdown', umbDropdown);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdownitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdownitem.directive.js
deleted file mode 100644
index 1c302ca90f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdropdownitem.directive.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbDropdownItem
-@restrict E
-
-@description
-<b>Added in versions 7.7.0</b>: Use this directive to construct a dropdown item. See documentation for {@link umbraco.directives.directive:umbDropdown umbDropdown}.
-
-**/
-
-(function() {
-    'use strict';
-
-    function umbDropdownItem() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            transclude: true,
-            templateUrl: 'views/components/umb-dropdown-item.html'
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbDropdownItem', umbDropdownItem);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbemptystate.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbemptystate.directive.js
deleted file mode 100644
index b37895637b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbemptystate.directive.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbEmptyState
-@restrict E
-@scope
-
-@description
-Use this directive to show an empty state message.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-empty-state
-            ng-if="!vm.items"
-            position="center">
-            // Empty state content
-        </umb-empty-state>
-
-    </div>
-</pre>
-
-@param {string=} size Set the size of the text ("small", "large").
-@param {string=} position Set the position of the text ("center").
-**/
-
-(function() {
-   'use strict';
-
-   function EmptyStateDirective() {
-
-      var directive = {
-         restrict: 'E',
-         replace: true,
-         transclude: true,
-         templateUrl: 'views/components/umb-empty-state.html',
-         scope: {
-            size: '@',
-            position: '@'
-         }
-      };
-
-      return directive;
-   }
-
-   angular.module('umbraco.directives').directive('umbEmptyState', EmptyStateDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbfileicon.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbfileicon.directive.js
deleted file mode 100644
index b9c88d1600..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbfileicon.directive.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbFileIcon
-@restrict E
-@scope
-
-@description
-Use this directive to render a file icon.
-
-<h3>Markup example</h3>
-<pre>
-    <div>
-
-        <umb-file-icon
-            extension="pdf"
-            size="s">
-        </umb-file-icon>
-
-	</div>
-</pre>
-
-@param {string} size (<code>attribute</code>): This parameter defines the size of the file icon (s, m).
-**/
-
-(function () {
-    'use strict';
-
-    function umbFileIconController() {
-
-        var vm = this;
-
-        if (!vm.icon) {
-            vm.icon = 'icon-document';
-        }
-    }
-
-    var component = {
-        templateUrl: 'views/components/umb-file-icon.html',
-        bindings: {
-            extension: "@?",
-            icon: "@?",
-            size: "@?",
-            text: "@?"
-        },
-        controllerAs: 'vm',
-        controller: umbFileIconController
-    };
-
-    angular.module('umbraco.directives').component('umbFileIcon', component);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbfoldergrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbfoldergrid.directive.js
deleted file mode 100644
index 37c38fe105..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbfoldergrid.directive.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbFolderGrid
-@restrict E
-@scope
-
-@description
-Use this directive to generate a list of folders presented as a flexbox grid.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-        <umb-folder-grid
-            ng-if="vm.folders.length > 0"
-            folders="vm.folders"
-            on-click="vm.clickFolder"
-            on-select="vm.selectFolder">
-        </umb-folder-grid>
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller(myService) {
-
-            var vm = this;
-            vm.folders = [
-                {
-                    "name": "Folder 1",
-                    "icon": "icon-folder",
-                    "selected": false
-                },
-                {
-                    "name": "Folder 2",
-                    "icon": "icon-folder",
-                    "selected": false
-                }
-
-            ];
-
-            vm.clickFolder = clickFolder;
-            vm.selectFolder = selectFolder;
-
-            myService.getFolders().then(function(folders){
-                vm.folders = folders;
-            });
-
-            function clickFolder(folder){
-                // Execute when clicking folder name/link
-            }
-
-            function selectFolder(folder, event, index) {
-                // Execute when clicking folder
-                // set folder.selected = true; to show checkmark icon
-            }
-
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-
-@param {array} folders (<code>binding</code>): Array of folders
-@param {callback=} onClick (<code>binding</code>): Callback method to handle click events on the folder.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>folder</code>: The selected folder</li>
-    </ul>
-@param {callback=} onSelect (<code>binding</code>): Callback method to handle click events on the checkmark icon.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>folder</code>: The selected folder</li>
-        <li><code>$event</code>: The select event</li>
-        <li><code>$index</code>: The folder index</li>
-    </ul>
-**/
-
-(function() {
-   'use strict';
-
-   function FolderGridDirective() {
-
-      function link(scope, el, attr, ctrl) {
-
-         scope.clickFolder = function(folder, $event, $index) {
-            if(scope.onClick) {
-                scope.onClick(folder, $event, $index);
-                $event.stopPropagation();
-            }
-         };
-
-         scope.clickFolderName = function(folder, $event, $index) {
-            if(scope.onClickName) {
-               scope.onClickName(folder, $event, $index);
-               $event.stopPropagation();
-            }
-         };
-
-      }
-
-      var directive = {
-         restrict: 'E',
-         replace: true,
-         templateUrl: 'views/components/umb-folder-grid.html',
-         scope: {
-            folders: '=',
-            onClick: "=",
-            onClickName: "="
-         },
-         link: link
-      };
-
-      return directive;
-   }
-
-   angular.module('umbraco.directives').directive('umbFolderGrid', FolderGridDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
deleted file mode 100644
index 4c628391cb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
+++ /dev/null
@@ -1,174 +0,0 @@
-(function () {
-    'use strict';
-
-    function GridSelector(overlayService, editorService) {
-
-        function link(scope) {
-
-            var eventBindings = [];
-            scope.dialogModel = {};
-            scope.showDialog = false;
-            scope.itemLabel = "";
-
-            // set default item name
-            if (!scope.itemName) {
-                scope.itemLabel = "item";
-            } else {
-                scope.itemLabel = scope.itemName;
-            }
-
-            scope.removeItem = function (selectedItem) {
-                var selectedItemIndex = scope.selectedItems.indexOf(selectedItem);
-                scope.selectedItems.splice(selectedItemIndex, 1);
-            };
-
-            scope.removeDefaultItem = function () {
-
-                // it will be the last item so we can clear the array
-                scope.selectedItems = [];
-
-                // remove as default item
-                scope.defaultItem = null;
-
-            };
-
-            scope.openItemPicker = function ($event) {
-                if (scope.itemPicker) {
-                    scope.itemPicker();
-                } else {
-                    var dialogModel = {
-                        view: "itempicker",
-                        title: "Choose " + scope.itemLabel,
-                        availableItems: scope.availableItems,
-                        selectedItems: scope.selectedItems,
-                        position: "target",
-                        event: $event,
-                        submit: function (model) {
-                            scope.selectedItems.push(model.selectedItem);
-                            // if no default item - set item as default
-                            if (scope.defaultItem === null) {
-                                scope.setAsDefaultItem(model.selectedItem);
-                            }
-                            overlayService.close();
-                        },
-                        close: function () {
-                            overlayService.close();
-                        }
-                    };
-                    overlayService.open(dialogModel);
-                }
-            };
-
-            scope.openTemplate = function (selectedItem) {
-                const editor = {
-                    id: selectedItem.id,
-                    submit: function () {
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-                editorService.templateEditor(editor);
-            }
-
-            scope.setAsDefaultItem = function (selectedItem) {
-
-                // clear default item
-                scope.defaultItem = {};
-
-                // set as default item
-                scope.defaultItem = selectedItem;
-            };
-
-            function updatePlaceholders() {
-
-                // update default item
-                if (scope.defaultItem !== null && scope.defaultItem.placeholder) {
-
-                    scope.defaultItem.name = scope.name;
-
-                    if (scope.alias !== null && scope.alias !== undefined) {
-                        scope.defaultItem.alias = scope.alias;
-                    }
-
-                }
-
-                // update selected items
-                Utilities.forEach(scope.selectedItems, selectedItem => {
-                    if (selectedItem.placeholder) {
-
-                        selectedItem.name = scope.name;
-
-                        if (scope.alias !== null && scope.alias !== undefined) {
-                            selectedItem.alias = scope.alias;
-                        }
-                    }
-                });
-
-                // update availableItems
-                Utilities.forEach(scope.availableItems, availableItem => {
-                    if (availableItem.placeholder) {
-
-                        availableItem.name = scope.name;
-
-                        if (scope.alias !== null && scope.alias !== undefined) {
-                            availableItem.alias = scope.alias;
-                        }
-                    }
-                });
-
-            }
-
-            function activate() {
-
-                // add watchers for updating placeholde name and alias
-                if (scope.updatePlaceholder) {
-                    eventBindings.push(scope.$watch('name', function (newValue, oldValue) {
-                        updatePlaceholders();
-                    }));
-
-                    eventBindings.push(scope.$watch('alias', function (newValue, oldValue) {
-                        updatePlaceholders();
-                    }));
-                }
-
-            }
-
-            activate();
-
-            // clean up
-            scope.$on('$destroy', function () {
-
-                // clear watchers
-                for (var e in eventBindings) {
-                    eventBindings[e]();
-                }
-
-            });
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/umb-grid-selector.html',
-            scope: {
-                name: "=",
-                alias: "=",
-                selectedItems: '=',
-                availableItems: "=",
-                defaultItem: "=",
-                itemName: "@",
-                updatePlaceholder: "=",
-                itemPicker: "="
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbGridSelector', GridSelector);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
deleted file mode 100644
index 227193128e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ /dev/null
@@ -1,1101 +0,0 @@
-(function () {
-    'use strict';
-
-  function GroupsBuilderDirective(contentTypeHelper, contentTypeResource, mediaTypeResource, memberTypeResource,
-        $filter, iconHelper, $q, $timeout, notificationsService,
-        localizationService, editorService, eventsService, overlayService) {
-
-        function link(scope, element) {
-
-            const TYPE_GROUP = contentTypeHelper.TYPE_GROUP;
-            const TYPE_TAB = contentTypeHelper.TYPE_TAB;
-
-            var eventBindings = [];
-            var validationTranslated = "";
-            var tabNoSortOrderTranslated = "";
-
-            scope.dataTypeHasChanged = false;
-            scope.sortingMode = false;
-            scope.toolbar = [];
-            scope.sortingButtonKey = "general_reorder";
-            scope.compositionsButtonState = "init";
-            scope.tabs = [];
-            scope.genericGroups = [];
-            scope.openTabAlias = null;
-            scope.hasGenericTab = false;
-            scope.genericTab = {
-                key: String.CreateGuid(),
-                type: TYPE_TAB,
-                name: "Generic",
-                alias: null,
-                parentAlias: null,
-                sortOrder: 0,
-                properties: []
-            };
-
-            let tabsInitialized = false;
-
-            eventBindings.push(scope.$watchCollection('model.groups', (newValue, oldValue) => {
-                // we only want to run this logic when new groups are added or removed
-                if (newValue.length === oldValue.length && tabsInitialized) {
-                    tabsInitialized = true;
-                    return;
-                }
-
-                contentTypeHelper.defineParentAliasOnGroups(newValue);
-                contentTypeHelper.relocateDisorientedGroups(newValue);
-
-                scope.tabs = $filter("filter")(newValue, group => {
-                    return group.type === TYPE_TAB && group.parentAlias == null;
-                });
-
-                // order tabs
-                scope.orderTabs();
-
-                // set server validation index
-                // the server filters out inherited groups if they don't have any local properties when returning the group index
-                const noInherited = newValue.filter(group => !group.inherited || (group.inherited && group.properties.filter(property => !property.inherited).length > 0));
-
-                noInherited.forEach((group, index) => {
-                    group.serverValidationIndex = !group.inherited ? index : undefined;
-                });
-
-                checkGenericTabVisibility();
-
-                if (!scope.openTabAlias && scope.hasGenericTab) {
-                    scope.openTabAlias = null;
-                } else if (!scope.openTabAlias && scope.tabs.length > 0) {
-                    scope.openTabAlias = scope.tabs[0].alias;
-                }
-
-                tabsInitialized = true;
-            }));
-
-            function activate() {
-                setSortingOptions();
-
-                // localize texts
-                localizationService.localizeMany([
-                    "validation_validation",
-                    "contentTypeEditor_tabHasNoSortOrder",
-                    "general_generic",
-                    "contentTypeEditor_tabDirectPropertiesDropZone"
-                ]).then(data => {
-                    validationTranslated = data[0];
-                    tabNoSortOrderTranslated = data[1];
-                    scope.genericTab.name = data[2];
-                    scope.tabDirectPropertiesDropZoneLabel = data[3];
-                });
-            }
-
-            function setSortingOptions() {
-
-                const defaultOptions = {
-                    axis: '',
-                    tolerance: "pointer",
-                    opacity: 0.7,
-                    scroll: true,
-                    cursor: "move",
-                    zIndex: 6000,
-                    forcePlaceholderSize: true,
-                    dropOnEmpty: true,
-                    helper: "clone",
-                    appendTo: "body"
-                };
-
-                scope.sortableOptionsTab = {
-                    ...defaultOptions,
-                    connectWith: ".umb-group-builder__tabs",
-                    placeholder: "umb-group-builder__tab-sortable-placeholder",
-                    handle: ".umb-group-builder__tab-handle",
-                    items: ".umb-group-builder__tab-sortable",
-                    stop: (event, ui) => {
-                        const tabKey = ui.item[0].dataset.tabKey ? ui.item[0].dataset.tabKey : false;
-                        const dropIndex = scope.tabs.findIndex(tab => tab.key === tabKey);
-                        updateSortOrder(scope.tabs, dropIndex);
-                    }
-                };
-
-                scope.sortableOptionsGroup = {
-                    ...defaultOptions,
-                    connectWith: ".umb-group-builder__groups",
-                    placeholder: "umb-group-builder__group-sortable-placeholder",
-                    handle: ".umb-group-builder__group-handle",
-                    items: ".umb-group-builder__group-sortable",
-                    stop: (e, ui) => {
-                        const groupKey = ui.item[0].dataset.groupKey ? ui.item[0].dataset.groupKey : false;
-                        const group = groupKey ? scope.model.groups.find(group => group.key === groupKey) : {};
-
-                        // the code also runs when you convert a group to a tab.
-                        // We want to make sure it only run when groups are reordered
-                        if (group && group.type === TYPE_GROUP) {
-
-                            // Update aliases
-                            const parentAlias = scope.openTabAlias;
-                            const oldAlias = group.alias || null; // null when group comes from root aka. 'generic'
-                            const newAlias = contentTypeHelper.updateParentAlias(oldAlias, parentAlias);
-
-                            group.alias = newAlias;
-                            group.parentAlias = parentAlias;
-                            contentTypeHelper.updateDescendingAliases(scope.model.groups, oldAlias, newAlias);
-
-                            const groupsInTab = scope.model.groups.filter(group => group.parentAlias === parentAlias);
-                            const dropIndex = groupsInTab.findIndex(group => group.key === groupKey);
-
-                            updateSortOrder(groupsInTab, dropIndex);
-
-                            // when a group is dropped we need to reset the requested tab hover alias
-                            scope.sortableRequestedTabAlias = undefined;
-                        }
-                    }
-                };
-
-                scope.sortableOptionsProperty = {
-                    ...defaultOptions,
-                    connectWith: ".umb-group-builder__properties",
-                    placeholder: "umb-group-builder__property_sortable-placeholder",
-                    handle: ".umb-group-builder__property-handle",
-                    items: ".umb-group-builder__property-sortable",
-                    stop: (e, ui) => {
-                        updatePropertiesSortOrder();
-
-                        // when a property is dropped we need to reset the requested tab hover alias
-                        scope.sortableRequestedTabAlias = undefined;
-                    }
-                };
-
-                scope.droppableOptionsConvert = {
-                    accept: '.umb-group-builder__group-sortable',
-                    tolerance : 'pointer',
-                    drop: (evt, ui) => {
-                        const groupKey = ui.draggable[0].dataset.groupKey ? ui.draggable[0].dataset.groupKey : false;
-                        const group = groupKey ? scope.model.groups.find(group => group.key === groupKey) : {};
-
-                        if (group) {
-                            contentTypeHelper.convertGroupToTab(scope.model.groups, group);
-
-                            scope.tabs.push(group);
-                            scope.$broadcast('umbOverflowChecker.checkOverflow');
-                            scope.$broadcast('umbOverflowChecker.scrollTo', { position: 'end' });
-                        }
-                    }
-                };
-
-                scope.sortableRequestedTabAlias = undefined;//set to undefined as null is the generic group.
-                scope.sortableRequestedTabTimeout = null;
-                scope.droppableOptionsTab = {
-                    accept: '.umb-group-builder__property-sortable, .umb-group-builder__group-sortable',
-                    tolerance : 'pointer',
-                    over: (evt, ui) => {
-                        const hoveredTabAlias = evt.target.dataset.tabAlias === "" ? null : evt.target.dataset.tabAlias;
-
-                        // if dragging a group
-                        if (ui.draggable[0].dataset.groupKey) {
-
-                            const groupKey = ui.draggable[0].dataset.groupKey ? ui.draggable[0].dataset.groupKey : false;
-                            const group = groupKey ? scope.model.groups.find(group => group.key === groupKey) : {};
-
-                            const newAlias = contentTypeHelper.updateParentAlias(group.alias || null, hoveredTabAlias);
-                            // Check alias is unique
-                            if (group.alias !== newAlias && contentTypeHelper.isAliasUnique(scope.model.groups, newAlias) === false) {
-                                localizationService.localize("contentTypeEditor_groupReorderSameAliasError",  [group.name, newAlias]).then((value) => {
-                                    notificationsService.error(value);
-                                });
-                                return;
-                            }
-                        }
-
-                        if(scope.sortableRequestedTabAlias !== hoveredTabAlias) {
-                            if(scope.sortableRequestedTabTimeout !== null) {
-                                $timeout.cancel(scope.sortableRequestedTabTimeout);
-                                scope.sortableRequestedTabTimeout = null;
-                                scope.sortableRequestedTabAlias = undefined;
-                            }
-                            scope.sortableRequestedTabAlias = hoveredTabAlias;
-                            scope.sortableRequestedTabTimeout = $timeout(() => {
-                                scope.openTabAlias = scope.sortableRequestedTabAlias;
-                                scope.sortableRequestedTabTimeout = null;
-                                /* hack to update sortable positions when switching from one tab to another.
-                                without this sorting direct properties doesn't work correctly */
-                                scope.$apply();
-                                $('.umb-group-builder__ungrouped-properties .umb-group-builder__properties').sortable('refresh');
-                                $('.umb-group-builder__groups').sortable('refresh');
-                            }, 400);
-                        }
-                    },
-                    out: (evt, ui) => {
-                        const hoveredTabAlias = evt.target.dataset.tabAlias === "" ? null : evt.target.dataset.tabAlias;
-                        if(scope.sortableRequestedTabTimeout !== null && (hoveredTabAlias === undefined || scope.sortableRequestedTabAlias === hoveredTabAlias)) {
-                            $timeout.cancel(scope.sortableRequestedTabTimeout);
-                            scope.sortableRequestedTabTimeout = null;
-                            scope.sortableRequestedTabAlias = null;
-                        }
-                    }
-                };
-            }
-
-            function updateSortOrder(items, movedIndex) {
-                if (items && items.length <= 1) {
-                    return;
-                }
-
-                // update the moved item sort order to fit into where it is dragged
-                const movedItem = items[movedIndex];
-
-                if (movedIndex === 0) {
-                    const nextItem =  items[movedIndex + 1];
-                    movedItem.sortOrder = nextItem.sortOrder - 1;
-                } else {
-                    const prevItem =  items[movedIndex - 1];
-                    movedItem.sortOrder = prevItem.sortOrder + 1;
-                }
-
-                /* After the above two items next to each other might have the same sort order
-                 to prevent this we run through the rest of the
-                 items and update the sort order if they are next to each other.
-                 This will make it possible to make gaps without the number being updated */
-                for (let i = movedIndex; i < items.length; i++) {
-                    const item = items[i];
-
-                    if (!item.inherited && i !== 0) {
-                        const prev = items[i - 1];
-
-                        if (item.sortOrder === prev.sortOrder) {
-                            item.sortOrder = item.sortOrder + 1;
-                        }
-                    }
-                }
-            }
-
-            function filterAvailableCompositions(selectedContentType, selecting) {
-
-                //selecting = true if the user has check the item, false if the user has unchecked the item
-
-                var selectedContentTypeAliases = selecting ?
-                    //the user has selected the item so add to the current list
-                    _.union(scope.compositionsDialogModel.compositeContentTypes, [selectedContentType.alias]) :
-                    //the user has unselected the item so remove from the current list
-                    _.reject(scope.compositionsDialogModel.compositeContentTypes, i => {
-                        return i === selectedContentType.alias;
-                    });
-
-                //get the currently assigned property type aliases - ensure we pass these to the server side filer
-                var propAliasesExisting = _.filter(_.flatten(_.map(scope.model.groups, g => {
-                    return _.map(g.properties, p => {
-                        return p.alias;
-                    });
-                })), f => {
-                    return f !== null && f !== undefined;
-                });
-
-                //use a different resource lookup depending on the content type type
-                var resourceLookup = mediaTypeResource.getAvailableCompositeContentTypes;
-                if (scope.contentType === "documentType") {
-                    resourceLookup = contentTypeResource.getAvailableCompositeContentTypes;
-                } else if (scope.contentType === "memberType") {
-                    resourceLookup = memberTypeResource.getAvailableCompositeContentTypes;
-                }
-
-                return resourceLookup(scope.model.id, selectedContentTypeAliases, propAliasesExisting).then(filteredAvailableCompositeTypes => {
-                    scope.compositionsDialogModel.availableCompositeContentTypes.forEach(current => {
-                        //reset first
-                        current.allowed = true;
-                        //see if this list item is found in the response (allowed) list
-                        var found = filteredAvailableCompositeTypes.find(f => current.contentType.alias === f.contentType.alias);
-
-                        //allow if the item was  found in the response (allowed) list -
-                        // and ensure its set to allowed if it is currently checked,
-                        // DO not allow if it's a locked content type.
-                        current.allowed = scope.model.lockedCompositeContentTypes.includes(current.contentType.alias) &&
-                            (selectedContentTypeAliases.includes(current.contentType.alias)) || (found ? found.allowed : false);
-
-                    });
-                });
-            }
-
-            function updatePropertiesSortOrder() {
-                scope.model.groups.forEach(group => group.properties = contentTypeHelper.updatePropertiesSortOrder(group.properties));
-            }
-
-            function setupAvailableContentTypesModel(result) {
-                scope.compositionsDialogModel.availableCompositeContentTypes = result;
-                //iterate each one and set it up
-                scope.compositionsDialogModel.availableCompositeContentTypes.forEach(c => {
-                    //enable it if it's part of the selected model
-                    if (scope.compositionsDialogModel.compositeContentTypes.includes(c.contentType.alias)) {
-                        c.allowed = true;
-                    }
-
-                    //set the inherited flags
-                    c.inherited = false;
-                    if (scope.model.lockedCompositeContentTypes.includes(c.contentType.alias)) {
-                        c.inherited = true;
-                    }
-                    // convert icons for composite content types
-                    iconHelper.formatContentTypeIcons([c.contentType]);
-                });
-            }
-
-            /* ---------- DELETE PROMT ---------- */
-
-            scope.togglePrompt = object => {
-                object.deletePrompt = !object.deletePrompt;
-            };
-
-            scope.hidePrompt = object => {
-                object.deletePrompt = false;
-            };
-
-            /* ---------- TOOLBAR ---------- */
-
-            scope.toggleSortingMode = () => {
-
-                if (scope.sortingMode === true) {
-
-                    var sortOrderMissing = false;
-
-                    for (var i = 0; i < scope.model.groups.length; i++) {
-                        var group = scope.model.groups[i];
-                        if (group.tabState !== "init" && group.sortOrder === undefined) {
-                            sortOrderMissing = true;
-                            group.showSortOrderMissing = true;
-                            notificationsService.error(validationTranslated + ": " + group.name + " " + tabNoSortOrderTranslated);
-                        }
-                    }
-
-                    if (!sortOrderMissing) {
-                        scope.sortingMode = false;
-                        scope.sortingButtonKey = "general_reorder";
-                    }
-
-                    // When exiting the reorder mode while the generic tab is empty, set the active tab to the first available one
-                    if (scope.tabs.length > 0 && !scope.openTabAlias) {
-                        scope.openTabAlias = scope.tabs[0].alias;
-                    }
-
-                } else {
-                    scope.sortingMode = true;
-                    scope.sortingButtonKey = "general_reorderDone";
-                }
-
-                checkGenericTabVisibility();
-                scope.$broadcast('umbOverflowChecker.checkOverflow');
-            };
-
-            scope.openCompositionsDialog = () => {
-
-                scope.compositionsDialogModel = {
-                    contentType: scope.model,
-                    compositeContentTypes: scope.model.compositeContentTypes,
-                    view: "views/common/infiniteeditors/compositions/compositions.html",
-                    size: "small",
-                    submit: () => {
-                        editorService.close();
-                    },
-                    close: oldModel => {
-                        // reset composition changes
-                        scope.model.groups = oldModel.contentType.groups;
-                        scope.model.compositeContentTypes = oldModel.contentType.compositeContentTypes;
-
-                        editorService.close();
-                    },
-                    selectCompositeContentType: selectedContentType => {
-
-                        var deferred = $q.defer();
-
-                        //first check if this is a new selection - we need to store this value here before any further digests/async
-                        // because after that the scope.model.compositeContentTypes will be populated with the selected value.
-                        var newSelection = scope.model.compositeContentTypes.indexOf(selectedContentType.alias) === -1;
-
-                        if (newSelection) {
-                            //merge composition with content type
-
-                            //use a different resource lookup depending on the content type type
-                            var resourceLookup = mediaTypeResource.getById;
-                            if (scope.contentType === "documentType") {
-                                resourceLookup = contentTypeResource.getById;
-                            } else if (scope.contentType === "memberType") {
-                                resourceLookup = memberTypeResource.getById;
-                            }
-
-                            resourceLookup(selectedContentType.id).then(composition => {
-                                //based on the above filtering we shouldn't be able to select an invalid one, but let's be safe and
-                                // double check here.
-                                var overlappingAliases = contentTypeHelper.validateAddingComposition(scope.model, composition);
-                                if (overlappingAliases.length > 0) {
-                                    //this will create an invalid composition, need to uncheck it
-                                    scope.compositionsDialogModel.compositeContentTypes.splice(
-                                        scope.compositionsDialogModel.compositeContentTypes.indexOf(composition.alias), 1);
-                                    //dissallow this until something else is unchecked
-                                    selectedContentType.allowed = false;
-                                }
-                                else {
-                                    contentTypeHelper.mergeCompositeContentType(scope.model, composition);
-                                }
-
-                                //based on the selection, we need to filter the available composite types list
-                                filterAvailableCompositions(selectedContentType, newSelection).then(() => {
-                                    deferred.resolve({ selectedContentType, newSelection });
-                                            // TODO: Here we could probably re-enable selection if we previously showed a throbber or something
-                                }, () => {
-                                   deferred.reject();
-                                });
-                            });
-                        }
-                        else {
-                            // split composition from content type
-                            contentTypeHelper.splitCompositeContentType(scope.model, selectedContentType);
-
-                            //based on the selection, we need to filter the available composite types list
-                            filterAvailableCompositions(selectedContentType, newSelection).then(() => {
-                                deferred.resolve({ selectedContentType, newSelection });
-                                // TODO: Here we could probably re-enable selection if we previously showed a throbber or something
-                            }, () => {
-                                deferred.reject();
-                            });
-                        }
-
-                        return deferred.promise;
-                    }
-                };
-
-                var availableContentTypeResource = mediaTypeResource.getAvailableCompositeContentTypes;
-                var whereUsedContentTypeResource = mediaTypeResource.getWhereCompositionIsUsedInContentTypes;
-                var countContentTypeResource = mediaTypeResource.getCount;
-
-                if (scope.contentType === "documentType") {
-                    availableContentTypeResource = contentTypeResource.getAvailableCompositeContentTypes;
-                    whereUsedContentTypeResource = contentTypeResource.getWhereCompositionIsUsedInContentTypes;
-                    countContentTypeResource = contentTypeResource.getCount;
-                } else if (scope.contentType === "memberType") {
-                    availableContentTypeResource = memberTypeResource.getAvailableCompositeContentTypes;
-                    whereUsedContentTypeResource = memberTypeResource.getWhereCompositionIsUsedInContentTypes;
-                    countContentTypeResource = memberTypeResource.getCount;
-                }
-
-                //get the currently assigned property type aliases - ensure we pass these to the server side filer
-                var propAliasesExisting = _.filter(_.flatten(_.map(scope.model.groups, g => {
-                    return _.map(g.properties, p => {
-                        return p.alias;
-                    });
-                })), f => {
-                    return f !== null && f !== undefined;
-                });
-                scope.compositionsButtonState = "busy";
-                $q.all([
-                    //get available composite types
-                    availableContentTypeResource(scope.model.id, [], propAliasesExisting, scope.model.isElement).then(result => {
-                        setupAvailableContentTypesModel(result);
-                    }),
-                    //get where used document types
-                    whereUsedContentTypeResource(scope.model.id).then(whereUsed => {
-                        //pass to the dialog model the content type eg documentType or mediaType
-                        scope.compositionsDialogModel.section = scope.contentType;
-                        //pass the list of 'where used' document types
-                        scope.compositionsDialogModel.whereCompositionUsed = whereUsed;
-                    }),
-                    //get content type count
-                    countContentTypeResource().then(result => {
-                        scope.compositionsDialogModel.totalContentTypes = parseInt(result, 10);
-                    })
-                ]).then(() => {
-                    //resolves when both other promises are done, now show it
-                    editorService.open(scope.compositionsDialogModel);
-                    scope.compositionsButtonState = "init";
-                });
-
-            };
-
-            scope.openContentType = (contentTypeId) => {
-                const editor = {
-                    id: contentTypeId,
-                    entityType: scope.contentType,
-                    submit: () => {
-                        const args = { node: scope.model };
-                        eventsService.emit("editors.documentType.reload", args);
-                        editorService.close();
-                    },
-                    close: () => {
-                        editorService.close();
-                    }
-                };
-
-                editorService.contentTypeEditor(editor);
-            };
-
-            /* ---------- TABS ---------- */
-            scope.changeTab = ({ alias }) => {
-                scope.openTabAlias = alias;
-            };
-
-            scope.addTab = () => {
-                const newTabIndex = scope.tabs.length;
-                const lastTab = scope.tabs[newTabIndex - 1];
-                const sortOrder = lastTab && lastTab.sortOrder !== undefined ? lastTab.sortOrder + 1 : 0;
-
-                const key = String.CreateGuid();
-                const tab = {
-                    key: key,
-                    type: TYPE_TAB,
-                    name: '',
-                    alias: key, // Temporarily set alias to key, because the name is empty
-                    parentAlias: null,
-                    sortOrder,
-                    properties: []
-                };
-
-                if (newTabIndex === 0 && scope.hasGenericTab === false) {
-                    scope.model.groups.forEach(group => {
-                        if (!group.inherited && group.parentAlias == null) {
-                            group.parentAlias = tab.alias;
-                            group.alias = contentTypeHelper.updateParentAlias(group.alias, group.parentAlias);
-                        }
-                    });
-                }
-
-                scope.model.groups = [...scope.model.groups, tab];
-
-                scope.openTabAlias = tab.alias;
-
-                notifyChanged();
-
-                scope.$broadcast('umbOverflowChecker.checkOverflow');
-                scope.$broadcast('umbOverflowChecker.scrollTo', { position: 'end' });
-            };
-
-            scope.removeTab = (tab, indexInTabs) => {
-                const tabName = tab.name || "";
-
-                const localizeMany = localizationService.localizeMany(['general_delete', 'contentTypeEditor_confirmDeleteTabNotice']);
-                const localize =  localizationService.localize('contentTypeEditor_confirmDeleteTabMessage',  [tabName]);
-
-                $q.all([localizeMany, localize]).then(values => {
-                    const translations = values[0];
-                    const message = values[1];
-
-                    overlayService.confirmDelete({
-                        title: `${translations[0]} ${tabName}`,
-                        content: message,
-                        confirmMessage: translations[1],
-                        submitButtonLabelKey: 'actions_delete',
-                        submit: () => {
-                            const indexInGroups = scope.model.groups.findIndex(group => group.alias === tab.alias);
-                            scope.model.groups.splice(indexInGroups, 1);
-
-                            // remove all child groups
-                            scope.model.groups = scope.model.groups.filter(group => group.parentAlias !== tab.alias);
-
-                            // we need a timeout because the filter hasn't updated the tabs collection
-                            $timeout(() => {
-                                if (scope.tabs.length > 0) {
-                                    scope.openTabAlias = indexInTabs > 0 ? scope.tabs[indexInTabs - 1].alias : scope.tabs[0].alias;
-                                } else {
-                                    scope.openTabAlias = null;
-                                }
-                            });
-
-                            scope.$broadcast('umbOverflowChecker.checkOverflow');
-
-                            notifyChanged();
-
-                            overlayService.close();
-                        }
-                    });
-                });
-            };
-
-            scope.canRemoveTab = (tab) => {
-                return scope.canRemoveGroup(tab) && _.every(scope.model.groups.filter(group => group.parentAlias === tab.alias), group => scope.canRemoveGroup(group));
-            };
-
-            scope.setTabOverflowState = (overflowLeft, overflowRight) => {
-                scope.overflow = { left: overflowLeft, right: overflowRight };
-            };
-
-            scope.moveTabsOverflowLeft = () => {
-                //TODO: optimize this...
-                const el = element[0].querySelector(".umb-group-builder__tabs-list");
-                el.scrollLeft -= el.clientWidth * 0.5;
-            }
-            scope.moveTabsOverflowRight = () => {
-                //TODO: optimize this...
-                const el = element[0].querySelector(".umb-group-builder__tabs-list");
-                el.scrollLeft += el.clientWidth * 0.5;
-            }
-
-            scope.orderTabs = () => {
-                scope.tabs = $filter('orderBy')(scope.tabs, 'sortOrder');
-            };
-
-            scope.onChangeTabName = tab => {
-                if (updateGroupAlias(tab)) {
-                    scope.openTabAlias = tab.alias;
-                    scope.$broadcast('umbOverflowChecker.checkOverflow');
-                }
-            };
-
-            /** Universal method for updating group alias (for tabs, field-sets etc.) */
-            function updateGroupAlias(group) {
-                const localAlias = contentTypeHelper.generateLocalAlias(group.name),
-                    oldAlias = group.alias;
-                let newAlias = contentTypeHelper.updateLocalAlias(oldAlias, localAlias);
-
-                // Ensure unique alias, otherwise we would be transforming groups of other parents, we do not want this.
-                if(contentTypeHelper.isAliasUnique(scope.model.groups, newAlias) === false) {
-                    newAlias = contentTypeHelper.createUniqueAlias(scope.model.groups, newAlias);
-                }
-
-                group.alias = newAlias;
-                group.parentAlias = contentTypeHelper.getParentAlias(newAlias);
-                contentTypeHelper.updateDescendingAliases(scope.model.groups, oldAlias, newAlias);
-                return true;
-            }
-
-            scope.isUngroupedPropertiesVisible = ({alias, properties}) => {
-                const isOpenTab = alias === scope.openTabAlias;
-
-                if (isOpenTab && properties.length > 0) {
-                    return true;
-                }
-
-                if (isOpenTab && scope.sortingMode) {
-                    return true;
-                }
-
-                const tabHasGroups = scope.model.groups.filter(group => group.parentAlias === alias).length > 0;
-
-                if (isOpenTab && !tabHasGroups) {
-                    return true;
-                }
-            };
-
-            function checkGenericTabVisibility () {
-                const hasRootGroups = scope.model.groups.filter(group => group.type === TYPE_GROUP && group.parentAlias === null).length > 0;
-                scope.hasGenericTab = (hasRootGroups && scope.tabs.length > 0) || scope.sortingMode;
-            }
-
-            /* Properties */
-
-            scope.addNewProperty = group => {
-                let newProperty = {
-                    label: null,
-                    alias: null,
-                    propertyState: "init",
-                    validation: {
-                        mandatory: false,
-                        mandatoryMessage: null,
-                        pattern: null,
-                        patternMessage: null
-                    },
-                    labelOnTop: false
-                };
-
-                const propertySettings = {
-                    title: "Property settings",
-                    property: newProperty,
-                    contentType: scope.contentType,
-                    contentTypeName: scope.model.name,
-                    contentTypeAllowCultureVariant: scope.model.allowCultureVariant,
-                    contentTypeAllowSegmentVariant: scope.model.allowSegmentVariant,
-                    view: "views/common/infiniteeditors/propertysettings/propertysettings.html",
-                    size: "small",
-                    submit: model => {
-                        newProperty = {...model.property};
-                        newProperty.propertyState = "active";
-
-                        group.properties.push(newProperty);
-
-                        editorService.close();
-                    },
-                    close: () => {
-                        editorService.close();
-                    }
-                };
-
-                editorService.open(propertySettings);
-            };
-
-            /* ---------- GROUPS ---------- */
-
-            scope.addGroup = tabAlias => {
-                scope.model.groups = scope.model.groups || [];
-
-                const groupsInTab = scope.model.groups.filter(group => group.parentAlias === tabAlias);
-                const lastGroupSortOrder = groupsInTab.length > 0 ? groupsInTab[groupsInTab.length - 1].sortOrder + 1 : 0;
-
-                const key = String.CreateGuid();
-                const group = {
-                    key: key,
-                    type: TYPE_GROUP,
-                    name: '',
-                    alias: contentTypeHelper.updateParentAlias(key, tabAlias), // Temporarily set alias to key, because the name is empty
-                    parentAlias: tabAlias || null,
-                    sortOrder: lastGroupSortOrder,
-                    properties: [],
-                    parentTabContentTypes: [],
-                    parentTabContentTypeNames: []
-                };
-
-                scope.model.groups = [...scope.model.groups, group];
-
-                scope.activateGroup(group);
-
-                notifyChanged();
-            };
-
-            scope.activateGroup = selectedGroup => {
-                if (!selectedGroup) {
-                    return;
-                }
-
-                // set all other groups that are inactive to active
-                scope.model.groups.forEach(group => {
-                    // skip init tab
-                    if (group.tabState !== "init") {
-                        group.tabState = "inActive";
-                    }
-                });
-
-                selectedGroup.tabState = "active";
-            };
-
-            scope.onChangeGroupName = group => {
-                updateGroupAlias(group);
-            }
-
-            scope.canRemoveGroup = group => {
-                return group.inherited !== true && _.find(group.properties, property => property.locked === true) == null;
-            };
-
-            scope.removeGroup = (selectedGroup) => {
-                const groupName = selectedGroup.name || "";
-
-                const localizeMany = localizationService.localizeMany(['general_delete', 'contentTypeEditor_confirmDeleteGroupNotice']);
-                const localize =  localizationService.localize('contentTypeEditor_confirmDeleteGroupMessage',  [groupName]);
-
-                $q.all([localizeMany, localize]).then(values => {
-                    const translations = values[0];
-                    const message = values[1];
-
-                    overlayService.confirmDelete({
-                        title: `${translations[0]} ${groupName}`,
-                        content: message,
-                        confirmMessage: translations[1],
-                        submitButtonLabelKey: 'actions_delete',
-                        submit: () => {
-                            const index = scope.model.groups.findIndex(group => group.alias === selectedGroup.alias);
-                            scope.model.groups.splice(index, 1);
-
-                            overlayService.close();
-                            notifyChanged();
-                        }
-                    });
-                });
-            };
-
-            scope.addGroupToActiveTab = () => {
-                scope.addGroup(scope.openTabAlias);
-            };
-
-            scope.changeSortOrderValue = group => {
-
-                if (group.sortOrder !== undefined) {
-                    group.showSortOrderMissing = false;
-                }
-
-                scope.model.groups = $filter('orderBy')(scope.model.groups, 'sortOrder');
-            };
-
-            scope.onChangeGroupSortOrderValue = sortedGroup => {
-                const groupsInTab = scope.model.groups.filter(group => group.parentAlias === sortedGroup.parentAlias);
-                const otherGroups = scope.model.groups.filter(group => group.parentAlias !== sortedGroup.parentAlias);
-                const sortedGroups = $filter('orderBy')(groupsInTab, 'sortOrder');
-                scope.model.groups = [...otherGroups, ...sortedGroups];
-            };
-
-            /* ---------- PROPERTIES ---------- */
-            scope.addPropertyToActiveGroup = () => {
-                let activeGroup = scope.model.groups.find(group => group.tabState === "active");
-
-                if (!activeGroup && scope.model.groups.length) {
-                    activeGroup = scope.model.groups[0];
-                }
-
-                scope.addNewProperty(activeGroup);
-            };
-
-            scope.addProperty = (property, group) => {
-
-                // set property sort order
-                var index = group.properties.indexOf(property);
-                var prevProperty = group.properties[index - 1];
-
-                if (index > 0) {
-                    // set index to 1 higher than the previous property sort order
-                    property.sortOrder = prevProperty.sortOrder + 1;
-
-                } else {
-                    // first property - sort order will be 0
-                    property.sortOrder = 0;
-                }
-
-                // open property settings dialog
-                scope.editPropertyTypeSettings(property, group);
-
-            };
-
-            scope.editPropertyTypeSettings = (property, group) => {
-
-                if (!property.inherited) {
-
-                    var oldPropertyModel = Utilities.copy(property);
-                    if (oldPropertyModel.allowCultureVariant === undefined) {
-                        // this is necessary for comparison when detecting changes to the property
-                        oldPropertyModel.allowCultureVariant = scope.model.allowCultureVariant;
-                        oldPropertyModel.alias = "";
-                    }
-                    var propertyModel = Utilities.copy(property);
-
-                    var propertySettings = {
-                        title: "Property settings",
-                        property: propertyModel,
-                        contentType: scope.contentType,
-                        contentTypeName: scope.model.name,
-                        contentTypeAllowCultureVariant: scope.model.allowCultureVariant,
-                        contentTypeAllowSegmentVariant: scope.model.allowSegmentVariant,
-                        view: "views/common/infiniteeditors/propertysettings/propertysettings.html",
-                        size: "small",
-                        submit: model => {
-
-                            property.inherited = false;
-                            property.dialogIsOpen = false;
-                            property.propertyState = "active";
-
-                            // apply all property changes
-                            property.label = propertyModel.label;
-                            property.alias = propertyModel.alias;
-                            property.description = propertyModel.description;
-                            property.config = propertyModel.config;
-                            property.editor = propertyModel.editor;
-                            property.view = propertyModel.view;
-                            property.dataTypeId = propertyModel.dataTypeId;
-                            property.dataTypeIcon = propertyModel.dataTypeIcon;
-                            property.dataTypeName = propertyModel.dataTypeName;
-                            property.validation.mandatory = propertyModel.validation.mandatory;
-                            property.validation.mandatoryMessage = propertyModel.validation.mandatoryMessage;
-                            property.validation.pattern = propertyModel.validation.pattern;
-                            property.validation.patternMessage = propertyModel.validation.patternMessage;
-                            property.showOnMemberProfile = propertyModel.showOnMemberProfile;
-                            property.memberCanEdit = propertyModel.memberCanEdit;
-                            property.isSensitiveData = propertyModel.isSensitiveData;
-                            property.isSensitiveValue = propertyModel.isSensitiveValue;
-                            property.allowCultureVariant = propertyModel.allowCultureVariant;
-                            property.allowSegmentVariant = propertyModel.allowSegmentVariant;
-                            property.labelOnTop = propertyModel.labelOnTop;
-
-                            // update existing data types
-                            if (model.updateSameDataTypes) {
-                                updateSameDataTypes(property);
-                            }
-
-                            // close the editor
-                            editorService.close();
-
-                            if (group) {
-                                // push new init property to group
-                                addInitProperty(group);
-
-                                // set focus on init property
-                                var numberOfProperties = group.properties.length;
-                                group.properties[numberOfProperties - 1].focus = true;
-                            }
-
-                            notifyChanged();
-                        },
-                        close: () => {
-                            if (_.isEqual(oldPropertyModel, propertyModel) === false) {
-                                localizationService.localizeMany([
-                                    "general_confirm",
-                                    "contentTypeEditor_propertyHasChanges",
-                                    "general_cancel",
-                                    "general_ok"
-                                ]).then(data => {
-                                    const overlay = {
-                                        title: data[0],
-                                        content: data[1],
-                                        closeButtonLabel: data[2],
-                                        submitButtonLabel: data[3],
-                                        submitButtonStyle: "danger",
-                                        close: () => {
-                                            overlayService.close();
-                                        },
-                                        submit: () => {
-                                            // close the confirmation
-                                            overlayService.close();
-                                            // close the editor
-                                            editorService.close();
-                                        }
-                                    };
-
-                                    overlayService.open(overlay);
-                                });
-                            }
-                            else {
-                                // remove the editor
-                                editorService.close();
-                            }
-                        }
-                    };
-
-                    // open property settings editor
-                    editorService.open(propertySettings);
-
-                    // set property states
-                    property.dialogIsOpen = true;
-
-                }
-            };
-
-            scope.deleteProperty = (properties, property) => {
-                const propertyName = property.label || "";
-
-                const localizeMany = localizationService.localizeMany(['general_delete']);
-                const localize = localizationService.localize('contentTypeEditor_confirmDeletePropertyMessage', [propertyName]);
-
-                $q.all([localizeMany, localize]).then(values => {
-                    const translations = values[0];
-                    const message = values[1];
-
-                    overlayService.confirmDelete({
-                        title: `${translations[0]} ${propertyName}`,
-                        content: message,
-                        submitButtonLabelKey: 'actions_delete',
-                        submit: () => {
-                            const index = properties.findIndex(p => property.id ? p.id === property.id : p === property);
-                            properties.splice(index, 1);
-                            notifyChanged();
-
-                            overlayService.close();
-                        }
-                    });
-                });
-            };
-
-            scope.onChangePropertySortOrderValue = group => {
-                group.properties = $filter('orderBy')(group.properties, 'sortOrder');
-            };
-
-            function notifyChanged() {
-                eventsService.emit("editors.groupsBuilder.changed");
-            }
-
-            function addInitProperty(group) {
-
-                var addInitPropertyBool = true;
-                var initProperty = {
-                    label: null,
-                    alias: null,
-                    propertyState: "init",
-                    validation: {
-                        mandatory: false,
-                        mandatoryMessage: null,
-                        pattern: null,
-                        patternMessage: null
-                    },
-                    labelOnTop: false
-                };
-
-                // check if there already is an init property
-                Utilities.forEach(group.properties, property => {
-                    if (property.propertyState === "init") {
-                        addInitPropertyBool = false;
-                    }
-                });
-
-                if (addInitPropertyBool) {
-                    group.properties.push(initProperty);
-                }
-
-                return group;
-            }
-
-            function updateSameDataTypes(newProperty) {
-
-                // find each property
-                Utilities.forEach(scope.model.groups, group => {
-                    Utilities.forEach(group.properties, property => {
-
-                        if (property.dataTypeId === newProperty.dataTypeId) {
-
-                            // update property data
-                            property.config = newProperty.config;
-                            property.editor = newProperty.editor;
-                            property.view = newProperty.view;
-                            property.dataTypeId = newProperty.dataTypeId;
-                            property.dataTypeIcon = newProperty.dataTypeIcon;
-                            property.dataTypeName = newProperty.dataTypeName;
-
-                        }
-
-                    });
-                });
-            }
-
-            function hasPropertyOfDataTypeId(dataTypeId) {
-
-                // look at each property
-                var result = _.filter(scope.model.groups, group => {
-                    return _.filter(group.properties, property => {
-                        return (property.dataTypeId === dataTypeId);
-                    });
-                });
-
-                return (result.length > 0);
-            }
-
-            eventBindings.push(scope.$watch('model', (newValue, oldValue) => {
-                if (newValue !== undefined && newValue.groups !== undefined) {
-                    activate();
-                }
-            }));
-
-            // clean up
-            eventBindings.push(eventsService.on("editors.dataTypeSettings.saved", (name, args) => {
-                if (hasPropertyOfDataTypeId(args.dataType.id)) {
-                    scope.dataTypeHasChanged = true;
-                }
-            }));
-
-            // clean up
-            eventBindings.push(scope.$on('$destroy', () => {
-                for (var e in eventBindings) {
-                    eventBindings[e]();
-                }
-                // if a dataType has changed, we want to notify which properties that are affected by this dataTypeSettings change
-                if (scope.dataTypeHasChanged === true) {
-                    var args = { documentType: scope.model };
-                    eventsService.emit("editors.documentType.saved", args);
-                }
-            }));
-
-        }
-
-        var directive = {
-            restrict: "E",
-            replace: true,
-            templateUrl: "views/components/umb-groups-builder.html",
-            scope: {
-                model: "=",
-                compositions: "=",
-                sorting: "=",
-                contentType: "@"
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbGroupsBuilder', GroupsBuilderDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
deleted file mode 100644
index 781b3e7df9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbIcon
-@restrict E
-@scope
-@description
-Use this directive to show an render an umbraco backoffice svg icon. All svg icons used by this directive should use the following naming convention to keep things consistent: icon-[name of icon]. For example <pre>icon-alert.svg</pre>
-
-<h3>Markup example</h3>
-
-Simple icon
-<pre>
-    <umb-icon icon="icon-alert"></umb-icon>
-</pre>
-
-Icon with additional attribute. It can be treated like any other dom element
-<pre>
-    <umb-icon icon="icon-alert" class="another-class"></umb-icon>
-</pre>
-@example
- **/
-
-(function () {
-    "use strict";
-
-    function UmbIconDirective(iconHelper) {
-
-        var directive = {
-            replace: true,
-            transclude: true,
-            templateUrl: "views/components/umb-icon.html",
-            scope: {
-                icon: "@",
-                svgString: "=?"
-            },
-            link: function (scope, element) {
-
-                if (scope.svgString === undefined && scope.svgString !== null && scope.icon !== undefined && scope.icon !== null) {
-                    const observer = new IntersectionObserver(_lazyRequestIcon, {rootMargin: "100px"});
-                    const iconEl = element[0];
-
-                    observer.observe(iconEl);
-
-                    // make sure to disconnect the observer when the scope is destroyed
-                    scope.$on('$destroy', function () {
-                        observer.disconnect();
-                    });
-                }
-
-                scope.$watch("icon", function (newValue, oldValue) {
-                    if (newValue && oldValue) {
-
-                        var newicon = newValue.split(" ")[0];
-                        var oldicon = oldValue.split(" ")[0];
-
-                        if (newicon !== oldicon) {
-                            _requestIcon(newicon);
-                        }
-                    }
-                });
-
-                function _lazyRequestIcon(entries, observer) {
-                    entries.forEach(entry => {
-                        if (entry.isIntersecting === true) {
-                            observer.disconnect();
-
-                            var icon = scope.icon.split(" ")[0]; // Ensure that only the first part of the icon is used as sometimes the color is added too, e.g. see umbeditorheader.directive scope.openIconPicker
-
-                            _requestIcon(icon);
-                        }
-                    });
-                }
-
-                function _requestIcon(icon) {
-                    // Reset svg string before requesting new icon.
-                    scope.svgString = null;
-
-                    iconHelper.getIcon(icon)
-                        .then(data => {
-                            if (data && data.svgString) {
-                                // Watch source SVG string
-                                scope.svgString = data.svgString;
-                            }
-                        });
-                }
-            }
-
-        };
-
-        return directive;
-    }
-
-    angular.module("umbraco.directives").directive("umbIcon", UmbIconDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbimagelazyload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbimagelazyload.directive.js
deleted file mode 100644
index 81c2cf2533..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbimagelazyload.directive.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbImageLazyLoad
-@restrict E
-@scope
-
-@description
-Use this directive to lazy-load an image only when it is scrolled into view.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-        <img umb-image-lazy-load="{{vm.imageUrl}}" />
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-            vm.imageUrl = "/media/TODO";
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-
-**/
-
-(function () {
-    'use strict';
-
-    function ImageLazyLoadDirective() {
-
-      const placeholder = "assets/img/transparent.png";
-
-      function link(scope, element, attrs) {
-
-            const observer = new IntersectionObserver(loadImg);
-            const img = element[0];
-            img.src = placeholder;
-            img.classList.add("lazy");
-            observer.observe(img);
-
-            function loadImg(entries) {
-                entries.forEach(entry => {
-                  if (entry.intersectionRatio > 0 && entry.target.src.indexOf(placeholder) > 0) {
-                      let lazyImage = entry.target;
-                      lazyImage.src = attrs.umbImageLazyLoad;
-                      lazyImage.classList.add("loaded");
-                      observer.unobserve(lazyImage);
-                    }
-                });
-            }
-
-            // make sure to disconnect the observer when the scope is destroyed
-            scope.$on('$destroy', function () {
-                observer.disconnect();
-            });
-        }
-
-        var directive = {
-            restrict: "A",
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbImageLazyLoad', ImageLazyLoadDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbkeyboardshortcutsoverview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbkeyboardshortcutsoverview.directive.js
deleted file mode 100644
index c499a8bfc6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbkeyboardshortcutsoverview.directive.js
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbkeyboardShortcutsOverview
-@restrict E
-@scope
-
-@description
-
-<p>Use this directive to show an overview of keyboard shortcuts in an editor.
-The directive will render an overview trigger wich shows how the overview is opened.
-When this combination is hit an overview is opened with shortcuts based on the model sent to the directive.</p>
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-keyboard-shortcuts-overview
-            model="vm.keyboardShortcutsOverview">
-        </umb-keyboard-shortcuts-overview>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-
-            vm.keyboardShortcutsOverview = [
-                {
-                    "name": "Sections",
-                    "shortcuts": [
-                        {
-                            "description": "Navigate sections",
-                            "keys": [
-                                {"key": "1"},
-                                {"key": "4"}
-                            ],
-                            "keyRange": true
-                        }
-                    ]
-                },
-                {
-                    "name": "Design",
-                    "shortcuts": [
-                        {
-                            "description": "Add group",
-                            "keys": [
-                                {"key": "alt"},
-                                {"key": "shift"},
-                                {"key": "g"}
-                            ]
-                        }
-                    ]
-                }
-            ];
-
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-
-<h3>Model description</h3>
-<ul>
-    <li>
-        <strong>name</strong>
-        <small>(string)</small> -
-        Sets the shortcut section name.
-    </li>
-    <li>
-        <strong>shortcuts</strong>
-        <small>(array)</small> -
-        Array of available shortcuts in the section.
-    </li>
-    <ul>
-        <li>
-            <strong>description</strong>
-            <small>(string)</small> -
-            Short description of the shortcut.
-        </li>
-        <li>
-            <strong>keys</strong>
-            <small>(array)</small> -
-            Array of keys in the shortcut.
-        </li>
-        <ul>
-            <li>
-                <strong>key</strong>
-                <small>(string)</small> -
-                The invidual key in the shortcut.
-            </li>
-        </ul>
-        <li>
-            <strong>keyRange</strong>
-            <small>(boolean)</small> -
-            Set to <code>true</code> to show a key range. It combines the shortcut keys with "-" instead of "+".
-        </li>
-    </ul>
-</ul>
-
-@param {object} model keyboard shortcut model. See description and example above.
-**/
-
-(function () {
-    'use strict';
-
-    function KeyboardShortcutsOverviewDirective(platformService, overlayService) {
-
-        function link(scope, el, attr, ctrl) {
-
-            var eventBindings = [];
-            var isMac = platformService.isMac();
-            var overlay = null;
-
-            scope.toggleShortcutsOverlay = function () {
-
-                if (overlay) {
-                    scope.close();
-                } else {
-                    scope.open();
-                }
-
-                if (scope.onToggle) {
-                    scope.onToggle();
-                }
-
-            };
-
-            scope.open = function () {
-                if (!overlay) {
-                    overlay = {
-                        title: "Keyboard shortcuts",
-                        view: "keyboardshortcuts",
-                        hideSubmitButton: true,
-                        shortcuts: scope.model,
-                        close: function () {
-                            scope.close();
-                        }
-                    };
-                    overlayService.open(overlay);
-                }
-            };
-
-            scope.close = function () {
-                if (overlay) {
-                    overlayService.close();
-                    overlay = null;
-                    if (scope.onClose) {
-                        scope.onClose();
-                    }
-                }
-            };
-
-            function onInit() {
-                Utilities.forEach(scope.model, shortcutGroup => {
-
-                    Utilities.forEach(shortcutGroup.shortcuts, shortcut => {
-                        shortcut.platformKeys = [];
-
-                        // get shortcut keys for mac
-                        if (isMac && shortcut.keys && shortcut.keys.mac) {
-                            shortcut.platformKeys = shortcut.keys.mac;
-                            // get shortcut keys for windows
-                        } else if (!isMac && shortcut.keys && shortcut.keys.win) {
-                            shortcut.platformKeys = shortcut.keys.win;
-                            // get default shortcut keys
-                        } else if (shortcut.keys && shortcut && shortcut.keys.length > 0) {
-                            shortcut.platformKeys = shortcut.keys;
-                        }
-                    })
-                });
-            }
-
-            onInit();
-
-            eventBindings.push(scope.$watch('model', function (newValue, oldValue) {
-                if (newValue !== oldValue) {
-                    onInit();
-                }
-            }));
-
-            eventBindings.push(scope.$watch('showOverlay', function (newValue, oldValue) {
-
-                if (newValue === oldValue) {
-                    return;
-                }
-
-                if (newValue === true) {
-                    scope.open();
-                }
-
-                if (newValue === false) {
-                    scope.close();
-                }
-
-            }));
-
-            // clean up
-            scope.$on('$destroy', function () {
-                // unbind watchers
-                for (var e in eventBindings) {
-                    eventBindings[e]();
-                }
-            });
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/umb-keyboard-shortcuts-overview.html',
-            link: link,
-            scope: {
-                model: "=",
-                onToggle: "&",
-                showOverlay: "=?",
-                onClose: "&"
-            }
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbKeyboardShortcutsOverview', KeyboardShortcutsOverviewDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
deleted file mode 100644
index 7453353018..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblayoutselector.directive.js
+++ /dev/null
@@ -1,97 +0,0 @@
-(function () {
-    'use strict';
-    
-    angular
-        .module('umbraco.directives')
-        .component('umbLayoutSelector', {
-            templateUrl: 'views/components/umb-layout-selector.html',
-            controller: LayoutSelectorController,
-            controllerAs: 'vm',
-            bindings: {
-                layouts: '<',
-                activeLayout: '<',
-                onLayoutSelect: '&'
-            }
-        });
-
-    function LayoutSelectorController($scope, $element) {
-
-        var vm = this;
-
-        vm.$onInit = onInit;
-
-        vm.layoutDropDownIsOpen = false;
-        vm.showLayoutSelector = true;
-        vm.pickLayout = pickLayout;
-        vm.toggleLayoutDropdown = toggleLayoutDropdown;
-        vm.leaveLayoutDropdown = leaveLayoutDropdown;
-        vm.closeLayoutDropdown = closeLayoutDropdown;
-
-        function onInit() {
-            activate();
-        }
-
-        function closeLayoutDropdown() {
-            vm.layoutDropDownIsOpen = false;
-        }
-
-        function toggleLayoutDropdown() {
-            vm.layoutDropDownIsOpen = !vm.layoutDropDownIsOpen;
-        }
-
-        function leaveLayoutDropdown() {
-            vm.layoutDropDownIsOpen = false;
-        }
-
-        function pickLayout(selectedLayout) {
-            if (vm.onLayoutSelect) {
-                vm.onLayoutSelect({ layout: selectedLayout });
-                vm.layoutDropDownIsOpen = false;
-            }
-        }
-
-        function activate() {
-            setVisibility();
-            setActiveLayout(vm.layouts);
-        }
-
-        function setVisibility() {
-
-            var numberOfAllowedLayouts = getNumberOfAllowedLayouts(vm.layouts);
-
-            if (numberOfAllowedLayouts === 1) {
-                vm.showLayoutSelector = false;
-            }
-
-        }
-
-        function getNumberOfAllowedLayouts(layouts) {
-
-            var allowedLayouts = 0;
-
-            for (var i = 0; layouts.length > i; i++) {
-
-                var layout = layouts[i];
-
-                if (layout.selected === true) {
-                    allowedLayouts++;
-                }
-
-            }
-
-            return allowedLayouts;
-        }
-
-        function setActiveLayout(layouts) {
-
-            for (var i = 0; layouts.length > i; i++) {
-                var layout = layouts[i];
-                if (layout.path === vm.activeLayout.path) {
-                    layout.active = true;
-                }
-            }
-
-        }
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblightbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblightbox.directive.js
deleted file mode 100644
index 5272abc46f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblightbox.directive.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbLightbox
-@restrict E
-@scope
-
-@description
-<p>Use this directive to open a gallery in a lightbox overlay.</p>
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <div class="my-gallery">
-            <button type="button" ng-repeat="image in images" ng-click="vm.openLightbox($index, images)">
-                <img ng-src="image.source" />
-            </button>
-        </div>
-
-        <umb-lightbox
-            ng-if="vm.lightbox.show"
-            items="vm.lightbox.items"
-            active-item-index="vm.lightbox.activeIndex"
-            on-close="vm.closeLightbox">
-        </umb-lightbox>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-
-            vm.images = [
-                {
-                    "source": "linkToImage"
-                },
-                {
-                    "source": "linkToImage"
-                }
-            ]
-
-            vm.openLightbox = openLightbox;
-            vm.closeLightbox = closeLightbox;
-
-            function openLightbox(itemIndex, items) {
-                vm.lightbox = {
-                    show: true,
-                    items: items,
-                    activeIndex: itemIndex
-                };
-            }
-
-            function closeLightbox() {
-                vm.lightbox.show = false;
-                vm.lightbox = null;
-            }
-
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-
-@param {array} items Array of gallery items.
-@param {callback} onClose Callback when the lightbox is closed.
-@param {number} activeItemIndex Index of active item.
-**/
-
-
-(function() {
-    'use strict';
-
-    function LightboxDirective(focusLockService) {
-
-        function link(scope, el, attr, ctrl) {
-
-
-            function activate() {
-
-                var eventBindings = [];
-
-                el.appendTo("body");
-
-                
-                focusLockService.addInertAttribute();
-
-                // clean up
-                scope.$on('$destroy', function() {
-                    // unbind watchers
-                    for (var e in eventBindings) {
-                        eventBindings[e]();
-                    }
-                    
-                    focusLockService.removeInertAttribute();
-
-                    document.getElementsByClassName("umb-lightbox__close")[0].blur();
-                    el.remove();
-                });
-            }
-
-            scope.next = function() {
-
-                var nextItemIndex = scope.activeItemIndex + 1;
-
-                if( nextItemIndex < scope.items.length) {
-                    scope.items[scope.activeItemIndex].active = false;
-                    scope.items[nextItemIndex].active = true;
-                    scope.activeItemIndex = nextItemIndex;
-                }
-            };
-
-            scope.prev = function() {
-
-                var prevItemIndex = scope.activeItemIndex - 1;
-
-                if( prevItemIndex >= 0) {
-                    scope.items[scope.activeItemIndex].active = false;
-                    scope.items[prevItemIndex].active = true;
-                    scope.activeItemIndex = prevItemIndex;
-                }
-
-            };
-
-            scope.close = function() {
-                if(scope.onClose) {
-                    scope.onClose();
-                    focusLockService.removeInertAttribute();
-                }
-            };
-
-            activate();
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/umb-lightbox.html',
-            scope: {
-                items: '=',
-                onClose: "=",
-                activeItemIndex: "="
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbLightbox', LightboxDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewlayout.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewlayout.directive.js
deleted file mode 100644
index 2c1cbea962..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewlayout.directive.js
+++ /dev/null
@@ -1,37 +0,0 @@
-(function () {
-    'use strict';
-
-    function ListViewLayoutDirective() {
-
-        function link(scope, el, attr, ctrl) {
-
-            scope.getContent = function (contentId) {
-                if (scope.onGetContent) {
-                    scope.onGetContent({ contentId: contentId});
-                }
-            };
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/umb-list-view-layout.html',
-            scope: {
-                contentId: '<',
-                folders: '<',
-                items: '<',
-                selection: '<',
-                options: '<',
-                entityType: '@',
-                onGetContent: '&'
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbListViewLayout', ListViewLayoutDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js
deleted file mode 100644
index d0fd8c7164..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js
+++ /dev/null
@@ -1,154 +0,0 @@
-(function () {
-    'use strict';
-
-    function ListViewSettingsDirective(dataTypeResource, dataTypeHelper, editorService, listViewPrevalueHelper) {
-
-        function link(scope) {
-
-            scope.dataType = {};
-            scope.customListViewCreated = false;
-
-            const listViewPrefix = "List View - ";
-            
-            const checkForCustomListView = () => invariantEquals(scope.dataType.name, listViewPrefix + scope.modelAlias);
-
-            // We also use "localeCompare" a few other places. Should probably be moved to a utility/helper function in future.
-            function invariantEquals(a, b) {
-                return typeof a === "string" && typeof b === "string"
-                    ? a.localeCompare(b, undefined, { sensitivity: "base" }) === 0
-                    : a === b;
-            }
-
-            /* ---------- INIT ---------- */ 
-
-            const setDataType = (dataType) => {
-                scope.dataType = dataType;
-                listViewPrevalueHelper.setPrevalues(dataType.preValues);
-            }
-
-            const activate = () => {
-
-                if (scope.enableListView) {
-
-                    dataTypeResource.getByName(scope.listViewName)
-                        .then(dataType => {
-                            setDataType(dataType);
-                            scope.customListViewCreated = checkForCustomListView();
-                        });
-
-                } else {
-                    scope.dataType = {};
-                } 
-            } 
-
-            /* ----------- LIST VIEW SETTINGS --------- */
-            const showSettingsOverlay = () => {
-                const overlay = {
-                    view: 'views/components/umb-list-view-settings-overlay.html',
-                    hideDescription: true,
-                    hideIcon: true,
-                    size: 'medium',
-                    dataType: scope.dataType,
-                    title: 'List view settings',
-                    submit: model => {
-                        const preValues = dataTypeHelper.createPreValueProps(model.dataType.preValues);
-
-                        // store data type   
-                        dataTypeResource.save(model.dataType, preValues, false)
-                            .then(dataType => scope.dataType = dataType);                      
-                        
-                        editorService.close();
-                    },
-                    close: () => editorService.close()
-                };
-
-                editorService.open(overlay);
-            };
-
-
-            /* ---------- CUSTOM LIST VIEW ---------- */
-
-            scope.createCustomListViewDataType = () => {
-
-                scope.loading = true;
-                
-                dataTypeResource.createCustomListView(scope.modelAlias).then(dataType => {
-
-                    // store data type
-                    setDataType(dataType);
-
-                    // set list view name on scope
-                    scope.listViewName = dataType.name;
-
-                    // change state to custom list view
-                    scope.customListViewCreated = true;
-
-                    // show settings overlay
-                    showSettingsOverlay();
-                    
-                    scope.loading = false;
-
-                }); 
-            }; 
-
-            scope.removeCustomListDataType = () => {
-                
-                scope.loading = true;
-
-                // delete custom list view data type
-                dataTypeResource.deleteById(scope.dataType.id).then(dataType => {
-
-                    // set list view name on scope
-                    scope.listViewName = `List View - ${scope.contentType === 'documentType' ? 'Content' : 'Media'}`;
-
-                    // get default data type 
-                    dataTypeResource.getByName(scope.listViewName)
-                        .then(defaultDataType => {
-
-                            // store data type
-                            setDataType(defaultDataType);
-
-                            // change state to default list view
-                            scope.customListViewCreated = false;
-                            
-                            scope.loading = false;
-                        });
-                });
-            };
-
-            scope.toggle = () => scope.enableListView = !scope.enableListView;           
-            scope.showSettingsOverlay = () => showSettingsOverlay();
-            
-            
-            /* ----------- SCOPE WATCHERS ----------- */
-            const unbindEnableListViewWatcher = scope.$watch('enableListView', newValue => {
-
-                if (newValue !== undefined) {
-                    activate();
-                }
-
-            });
-
-            // clean up
-            scope.$on('$destroy', () => unbindEnableListViewWatcher());
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/umb-list-view-settings.html',
-            scope: {
-                enableListView: "=",
-                listViewName: "=",
-                modelAlias: "=",
-                contentType: "@"
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbListViewSettings', ListViewSettingsDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloader.directive.js
deleted file mode 100644
index e70f7b3cac..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloader.directive.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbLoader
-@restrict E
-
-@description
-Use this directive to generate a loading indicator.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-loader
-            ng-if="vm.loading">
-        </umb-loader>
-
-        <div class="content" ng-if="!vm.loading">
-            <p>{{content}}</p>
-        </div>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller(myService) {
-
-            var vm = this;
-
-            vm.content = "";
-            vm.loading = true;
-
-            myService.getContent().then(function(content){
-                vm.content = content;
-                vm.loading = false;
-            });
-
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-
-@param {string=} position The loader position ("top", "bottom").
-
-**/
-
-(function() {
-  'use strict';
-
-  function UmbLoaderDirective() {
-
-    function link(scope, el, attr, ctrl) {
-        
-    }
-
-    var directive = {
-        restrict: 'E',
-        replace: true,
-        templateUrl: 'views/components/umb-loader.html',
-        scope: {
-            position: "@?"
-        },
-        link: link
-    };
-
-    return directive;
-  }
-  
-  angular.module('umbraco.directives').directive('umbLoader', UmbLoaderDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloadindicator.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloadindicator.directive.js
deleted file mode 100644
index c45b8f3f47..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbloadindicator.directive.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbLoadIndicator
-@restrict E
-
-@description
-Use this directive to generate a loading indicator.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-load-indicator
-            ng-if="vm.loading">
-        </umb-load-indicator>
-
-        <div class="content" ng-if="!vm.loading">
-            <p>{{content}}</p>
-        </div>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller(myService) {
-
-            var vm = this;
-
-            vm.content = "";
-            vm.loading = true;
-
-            myService.getContent().then(function(content){
-                vm.content = content;
-                vm.loading = false;
-            });
-
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-**/
-
-(function() {
-  'use strict';
-
-  function UmbLoadIndicatorDirective() {
-
-    var directive = {
-      restrict: 'E',
-      replace: true,
-      templateUrl: 'views/components/umb-load-indicator.html'
-    };
-
-    return directive;
-  }
-
-  angular.module('umbraco.directives').directive('umbLoadIndicator', UmbLoadIndicatorDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblockedfield.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblockedfield.directive.js
deleted file mode 100644
index f19e2c810b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblockedfield.directive.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbLockedField
-@restrict E
-@scope
-
-@description
-Use this directive to render a value with a lock next to it. When the lock is clicked the value gets unlocked and can be edited.
-
-<h3>Markup example</h3>
-<pre>
-	<div ng-controller="My.Controller as vm">
-
-		<umb-locked-field
-			ng-model="vm.value"
-			placeholder-text="'Click to unlock...'">
-		</umb-locked-field>
-
-	</div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-	(function () {
-		"use strict";
-
-		function Controller() {
-
-			var vm = this;
-			vm.value = "My locked text";
-
-        }
-
-		angular.module("umbraco").controller("My.Controller", Controller);
-
-	})();
-</pre>
-
-@param {string} ngModel (<code>binding</code>): The locked text.
-@param {boolean=} locked (<code>binding</code>): <Code>true</code> by default. Set to <code>false</code> to unlock the text.
-@param {string=} placeholderText (<code>binding</code>): If ngModel is empty this text will be shown.
-@param {string=} regexValidation (<code>binding</code>): Set a regex expression for validation of the field.
-@param {string} validationPosition (<code>binding</code>): The position of the validation. Set to <code>'left'</code> or <code>'right'</code>.
-@param {string=} serverValidationField (<code>attribute</code>): Set a server validation field.
-**/
-
-(function() {
-	'use strict';
-
-	function LockedFieldDirective($timeout, localizationService) {
-
-	    function link(scope, el, attr, ngModelCtrl) {
-
-			function activate() {
-
-				// if locked state is not defined as an attr set default state
-				if (scope.locked === undefined || scope.locked === null) {
-					scope.locked = true;
-				}
-
-			    // if regex validation is not defined as an attr set default state
-                // if this is set to an empty string then regex validation can be ignored.
-				if (scope.regexValidation === undefined || scope.regexValidation === null) {
-				    scope.regexValidation = "^[a-zA-Z]\\w.*$";
-				}
-
-				if (scope.serverValidationField === undefined || scope.serverValidationField === null) {
-				    scope.serverValidationField = "";
-				}
-
-				// if locked state is not defined as an attr set default state
-				if (scope.placeholderText === undefined || scope.placeholderText === null) {
-					scope.placeholderText = "Enter value...";
-                }
-
-                if (scope.validationPosition === undefined || scope.validationPosition === null) {
-                    scope.validationPosition = "left";
-                }
-
-			}
-
-			scope.lock = function() {
-				scope.locked = true;
-			};
-
-			scope.unlock = function() {
-				scope.locked = false;
-			};
-
-			activate();
-
-		}
-
-		var directive = {
-			require: "ngModel",
-			restrict: 'E',
-			replace: true,
-			templateUrl: 'views/components/umb-locked-field.html',
-			scope: {
-			    ngModel: "=",
-                locked: "=?",
-				placeholderText: "=?",
-                regexValidation: "=?",
-                validationPosition: "=?",
-				serverValidationField: "@"
-			},
-			link: link
-		};
-
-		return directive;
-
-	}
-
-	angular.module('umbraco.directives').directive('umbLockedField', LockedFieldDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
deleted file mode 100644
index 01de877b79..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
+++ /dev/null
@@ -1,395 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbMediaGrid
-@restrict E
-@scope
-
-@description
-Use this directive to generate a thumbnail grid of media items.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-media-grid
-           items="vm.mediaItems"
-           on-click="vm.clickItem"
-           on-click-name="vm.clickItemName">
-        </umb-media-grid>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-            vm.mediaItems = [];
-
-            vm.clickItem = clickItem;
-            vm.clickItemName = clickItemName;
-
-            myService.getMediaItems().then(function (mediaItems) {
-                vm.mediaItems = mediaItems;
-            });
-
-            function clickItem(item, $event, $index){
-                // do magic here
-            }
-
-            function clickItemName(item, $event, $index) {
-                // set item.selected = true; to select the item
-                // do magic here
-            }
-
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-
-@param {array} items (<code>binding</code>): Array of media items.
-@param {callback=} onDetailsHover (<code>binding</code>): Callback method when the details icon is hovered.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>item</code>: The hovered item</li>
-        <li><code>$event</code>: The hover event</li>
-        <li><code>hover</code>: Boolean to tell if the item is hovered or not</li>
-    </ul>
-@param {callback=} onClick (<code>binding</code>): Callback method to handle click events on the media item.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>item</code>: The clicked item</li>
-        <li><code>$event</code>: The click event</li>
-        <li><code>$index</code>: The item index</li>
-    </ul>
-@param {callback=} onClickName (<code>binding</code>): Callback method to handle click events on the media item name.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>item</code>: The clicked item</li>
-        <li><code>$event</code>: The click event</li>
-        <li><code>$index</code>: The item index</li>
-    </ul>
-@param {string=} filterBy (<code>binding</code>): String to filter media items by
-@param {string=} itemMaxWidth (<code>attribute</code>): Sets a max width on the media item thumbnails.
-@param {string=} itemMaxHeight (<code>attribute</code>): Sets a max height on the media item thumbnails.
-@param {string=} itemMinWidth (<code>attribute</code>): Sets a min width on the media item thumbnails.
-@param {string=} itemMinHeight (<code>attribute</code>): Sets a min height on the media item thumbnails.
-
-**/
-
-(function() {
-    'use strict';
-
-    function MediaGridDirective($filter, mediaHelper) {
-
-        function link(scope, el, attr, ctrl) {
-
-            var itemDefaultHeight = 200;
-            var itemDefaultWidth = 200;
-            var itemMaxWidth = 200;
-            var itemMaxHeight = 200;
-            var itemMinWidth = 125;
-            var itemMinHeight = 125;
-
-            function activate() {
-
-                if (scope.itemMaxWidth) {
-                    itemMaxWidth = scope.itemMaxWidth;
-                }
-
-                if (scope.itemMaxHeight) {
-                    itemMaxHeight = scope.itemMaxHeight;
-                }
-
-                if (scope.itemMinWidth) {
-                    itemMinWidth = scope.itemMinWidth;
-                }
-
-                if (scope.itemMinHeight) {
-                    itemMinHeight = scope.itemMinHeight;
-                }
-
-                for (var i = 0; scope.items.length > i; i++) {
-                    var item = scope.items[i];
-                    setItemData(item);
-                    setOriginalSize(item, itemMaxHeight);
-
-                    item.selectable = getSelectableState(item);
-
-                    // remove non images when onlyImages is set to true
-                    if (scope.onlyImages === "true" && !item.isFolder && !item.thumbnail){
-                        scope.items.splice(i, 1);
-                        i--;
-                    }
-
-                    // If subfolder search is not enabled remove the media items that's not needed
-                    // Make sure that includeSubFolder is not undefined since the directive is used
-                    // in contexts where it should not be used. Currently only used when we trigger
-                    // a media picker
-                    if (scope.includeSubFolders !== undefined) {
-                        if (scope.includeSubFolders !== 'true') {
-                            if (item.parentId !== parseInt(scope.currentFolderId)) {
-                                scope.items.splice(i, 1);
-                                i--;
-                            }
-                        }
-                    }
-
-                }
-
-                if (scope.items.length > 0) {
-                    setFlexValues(scope.items);
-                }
-            }
-
-            function setItemData(item) {
-
-                // check if item is a folder
-                if (item.image) {
-                    // if is has an image path, it is not a folder
-                    item.isFolder = false;
-                } else {
-                    item.isFolder = !mediaHelper.hasFilePropertyType(item);
-                }
-
-                // if it's not a folder, get the thumbnail, extension etc. if we haven't already
-                if (!item.isFolder && !item.thumbnail) {
-
-                    // handle entity
-                    if (item.image) {
-                        item.thumbnail = mediaHelper.resolveFileFromEntity(item, true);
-                        item.extension = mediaHelper.getFileExtension(item.image);
-                    // handle full media object
-                    } else {
-                        item.thumbnail = mediaHelper.resolveFile(item, true);
-                        item.image = mediaHelper.resolveFile(item, false);
-
-                        var fileProp = _.find(item.properties, function (v) {
-                            return (v.alias === "umbracoFile");
-                        });
-
-                        if (fileProp && fileProp.value) {
-                            item.file = fileProp.value;
-                        }
-
-                        var extensionProp = _.find(item.properties, function (v) {
-                            return (v.alias === "umbracoExtension");
-                        });
-
-                        if (extensionProp && extensionProp.value) {
-                            item.extension = extensionProp.value;
-                        }
-
-                    }
-                }
-            }
-
-            /**
-            * Returns wether a item should be selectable or not.
-            */
-            function getSelectableState(item) {
-                if (item.filtered) {
-                    return false;
-                }
-
-                // check if item is a folder or image
-                if (item.isFolder === true) {
-                    return scope.disableFolderSelect !== "true" && scope.onlyImages !== "true";
-                } else {
-                    return scope.onlyFolders !== "true";
-                }
-            }
-
-            function setOriginalSize(item) {
-
-                //set to a square by default
-                item.width = itemDefaultWidth;
-                item.height = itemDefaultHeight;
-                item.aspectRatio = 1;
-
-                var widthProp = _.find(item.properties, function(v) {
-                    return (v.alias === "umbracoWidth");
-                });
-
-                if (widthProp && widthProp.value) {
-                    item.width = parseInt(widthProp.value, 10);
-                    if (isNaN(item.width)) {
-                        item.width = itemDefaultWidth;
-                    }
-                }
-
-                var heightProp = _.find(item.properties, function(v) {
-                    return (v.alias === "umbracoHeight");
-                });
-
-                if (heightProp && heightProp.value) {
-                    item.height = parseInt(heightProp.value, 10);
-                    if (isNaN(item.height)) {
-                        item.height = itemDefaultWidth;
-                    }
-                }
-
-                item.aspectRatio = item.width / item.height;
-
-                // set max width and height
-                // landscape
-                if (item.aspectRatio >= 1) {
-                    if (item.width > itemMaxWidth) {
-                        item.width = itemMaxWidth;
-                        item.height = itemMaxWidth / item.aspectRatio;
-                    }
-                    // portrait
-                } else {
-                    if (item.height > itemMaxHeight) {
-                        item.height = itemMaxHeight;
-                        item.width = itemMaxHeight * item.aspectRatio;
-                    }
-                }
-
-            }
-
-            function setFlexValues(mediaItems) {
-
-                var flexSortArray = mediaItems;
-                var smallestImageWidth = null;
-                var widestImageAspectRatio = null;
-
-                // sort array after image width with the widest image first
-                flexSortArray = $filter('orderBy')(flexSortArray, 'width', true);
-
-                // find widest image aspect ratio
-                widestImageAspectRatio = flexSortArray[0].aspectRatio;
-
-                // find smallest image width
-                smallestImageWidth = flexSortArray[flexSortArray.length - 1].width;
-
-                for (var i = 0; flexSortArray.length > i; i++) {
-
-                    var mediaItem = flexSortArray[i];
-                    var flex = 1 / (widestImageAspectRatio / mediaItem.aspectRatio);
-
-                    if (flex === 0) {
-                        flex = 1;
-                    }
-
-                    var imageMinFlexWidth = smallestImageWidth * flex;
-
-                    var flexStyle = {
-                        "flex": flex + " 1 " + imageMinFlexWidth + "px",
-                        "max-width": mediaItem.width + "px",
-                        "max-height": itemMaxHeight + "px",
-                        "min-width": itemMinWidth + "px",
-                        "min-height": itemMinHeight + "px"
-                    };
-
-                    mediaItem.flexStyle = flexStyle;
-                }
-            }
-
-            scope.clickItem = function(item, $event, $index) {
-                if (item.isFolder === true && item.filtered) {
-                    scope.clickItemName(item, $event, $index);
-                }
-                if (scope.onClick) {
-                    scope.onClick(item, $event, $index);
-                    $event.stopPropagation();
-                }
-            };
-
-            scope.clickItemName = function(item, $event, $index) {
-                if (scope.onClickName) {
-                    scope.onClickName(item, $event, $index);
-                    $event.stopPropagation();
-                }
-            };
-
-            scope.hoverItemDetails = function(item, $event, hover) {
-                if (scope.onDetailsHover) {
-                    scope.onDetailsHover(item, $event, hover);
-                }
-            };
-
-            var unbindItemsWatcher = scope.$watch('items', function(newValue, oldValue) {
-                if (Utilities.isArray(newValue)) {
-                    activate();
-                }
-            });
-
-            scope.$on('$destroy', function() {
-                unbindItemsWatcher();
-            });
-            //determine if sort is current
-            scope.sortColumn = "name";
-            scope.sortReverse = false;
-            scope.sortDirection = "asc";
-            //check sort status
-            scope.isSortDirection = function (col, direction) {
-                return col === scope.sortColumn && direction === scope.sortDirection;
-            };
-            //change sort
-            scope.setSort = function (col) {
-                if (scope.sortColumn === col) {
-                    scope.sortReverse = !scope.sortReverse;
-                }
-                else {
-                    scope.sortColumn = col;
-                    if (col === "updateDate") {
-                        scope.sortReverse = true;
-                    }
-                    else {
-                        scope.sortReverse = false;
-                    }
-                }
-                scope.sortDirection = scope.sortReverse ? "desc" : "asc";
-
-            }
-            // sort function
-            scope.sortBy = function (item) {
-                if (scope.sortColumn === "updateDate") {
-                    return [-item['isFolder'],item['updateDate']];
-                }
-                else {
-                    return [-item['isFolder'],item['name']];
-                }
-            };
-
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/umb-media-grid.html',
-            scope: {
-                items: '=',
-                onDetailsHover: "=",
-                onClick: '=',
-                onClickName: "=",
-                allowOpenFolder: "=",
-                allowOpenFile: "=",
-                filterBy: "=",
-                itemMaxWidth: "@",
-                itemMaxHeight: "@",
-                itemMinWidth: "@",
-                itemMinHeight: "@",
-                disableFolderSelect: "@",
-                onlyImages: "@",
-                onlyFolders: "@",
-                includeSubFolders: "@",
-                currentFolderId: "@",
-                showMediaList: "="
-            },
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbMediaGrid', MediaGridDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
deleted file mode 100644
index b6ba1aaedb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js
+++ /dev/null
@@ -1,229 +0,0 @@
-(function () {
-    'use strict';
-
-    function MiniListViewDirective(entityResource, iconHelper) {
-
-        function link(scope, el, attr, ctrl) {
-
-            scope.search = "";
-            scope.miniListViews = [];
-            scope.breadcrumb = [];
-            scope.listViewAnimation = "";
-
-            var miniListViewsHistory = [];
-
-            function onInit() {
-                open(scope.node);
-            }
-
-            function open(node) {
-
-                // convert legacy icon for node
-                if(node && node.icon) {
-                    node.icon = iconHelper.convertFromLegacyIcon(node.icon);
-                }
-
-                var miniListView = {
-                    node: node,
-                    loading: true,
-                    pagination: {
-                        pageSize: 10,
-                        pageNumber: 1,
-                        filter: '',
-                        orderDirection: "Ascending",
-                        orderBy: "SortOrder",
-                        orderBySystemField: true
-                    }
-                };
-
-                // clear and push mini list view in dom so we only render 1 view
-                scope.miniListViews = [];
-                scope.listViewAnimation = "in";
-                scope.miniListViews.push(miniListView);
-
-                // store in history so we quickly can navigate back
-                miniListViewsHistory.push(miniListView);
-
-                // get children
-                getChildrenForMiniListView(miniListView);
-
-                makeBreadcrumb();
-
-            }
-
-            function getChildrenForMiniListView(miniListView) {
-
-                // start loading animation list view
-                miniListView.loading = true;
-                
-                entityResource.getPagedChildren(miniListView.node.id, scope.entityType, miniListView.pagination)
-                    .then(function (data) {
-                        if (!data.items) {
-                            data.items = [];
-                        }
-                        if (scope.onItemsLoaded) {
-                            scope.onItemsLoaded({items: data.items});
-                        }
-                        // update children
-                        miniListView.children = data.items;
-                        miniListView.children.forEach(c => {
-                            // child allowed by default
-                            c.allowed = true;
- 
-                            // convert legacy icon for node
-                            if(c.icon) {
-                                c.icon = iconHelper.convertFromLegacyIcon(c.icon);
-                            }
-                            // set published state for content
-                            if (c.metaData) {
-                                c.hasChildren = c.metaData.hasChildren;
-                                if(scope.entityType === "Document") {
-                                    c.published = c.metaData.IsPublished;
-                                }
-                            }
-                             
-                            // filter items if there is a filter and it's not advanced (advanced filtering is handled below)
-                            if (scope.entityTypeFilter && scope.entityTypeFilter.filter && !scope.entityTypeFilter.filterAdvanced) {
-                                var a = scope.entityTypeFilter.filter.toLowerCase().replace(/\s/g, '').split(',');
-                                var found = a.indexOf(c.metaData.ContentTypeAlias.toLowerCase()) >= 0;
-                                
-                                if (!scope.entityTypeFilter.filterExclude && !found || scope.entityTypeFilter.filterExclude && found) {
-                                    c.allowed = false;
-                                }
-                            }
-                        });
-
-                        // advanced item filtering is handled here
-                        if (scope.entityTypeFilter && scope.entityTypeFilter.filter && scope.entityTypeFilter.filterAdvanced) {
-                            var filtered = Utilities.isFunction(scope.entityTypeFilter.filter)
-                                ? _.filter(miniListView.children, scope.entityTypeFilter.filter)
-                                : _.where(miniListView.children, scope.entityTypeFilter.filter);
-                            
-                            filtered.forEach(node => node.allowed = false);
-                        }
-
-                        // update pagination
-                        miniListView.pagination.totalItems = data.totalItems;
-                        miniListView.pagination.totalPages = data.totalPages;
-                        // stop load indicator
-                        miniListView.loading = false;
-                    });
-            }
-
-            scope.openNode = function(event, node) {
-			    open(node);
-                event.stopPropagation();
-            };
-
-            scope.selectNode = function(node) {
-                if (scope.onSelect && node.allowed) {
-                    scope.onSelect({'node': node});
-                }
-            };
-
-            /* Pagination */
-            scope.goToPage = function(pageNumber, miniListView) {
-                // set new page number
-                miniListView.pagination.pageNumber = pageNumber;
-                // get children
-                getChildrenForMiniListView(miniListView);
-            };
-
-            /* Breadcrumb */
-            scope.clickBreadcrumb = function(ancestor) {
-
-                var found = false;
-                scope.listViewAnimation = "out";
-
-                Utilities.forEach(miniListViewsHistory, (historyItem, index) => {
-                    // We need to make sure we can compare the two id's. 
-                    // Some id's are integers and others are strings.
-                    // Members have string ids like "all-members".
-                    if (historyItem.node.id.toString() === ancestor.id.toString()) {
-                        // load the list view from history
-                        scope.miniListViews = [];
-                        scope.miniListViews.push(historyItem);
-                        // clean up history - remove all children after
-                        miniListViewsHistory.splice(index + 1, miniListViewsHistory.length);
-                        found = true;
-                    }
-                });
-
-                if (!found) {
-                    // if we can't find the view in the history - close the list view
-                    scope.exitMiniListView();
-                }
-
-                // update the breadcrumb
-                makeBreadcrumb();
-
-            };
-
-            scope.showBackButton = function() {
-                // don't show the back button if the start node is a list view
-                if (scope.node.metaData && scope.node.metaData.IsContainer || scope.node.isContainer) {
-                    return false;
-                } else {
-                    return true;
-                }
-            };
-
-            scope.exitMiniListView = function() {
-                miniListViewsHistory = [];
-                scope.miniListViews = [];
-                if(scope.onClose) {
-                    scope.onClose();
-                }
-            };
-
-            function makeBreadcrumb() {
-                scope.breadcrumb = [];
-                Utilities.forEach(miniListViewsHistory, historyItem => {
-                    scope.breadcrumb.push(historyItem.node);
-                });
-            }
-
-            /* Search */
-            scope.searchMiniListView = function(search, miniListView) {
-                // set search value
-                miniListView.pagination.filter = search;
-                // reset pagination
-                miniListView.pagination.pageNumber = 1;
-                // start loading animation list view
-                miniListView.loading = true;
-                searchMiniListView(miniListView);
-            };
-
-            var searchMiniListView = _.debounce(function (miniListView) {
-                scope.$apply(function () {
-                    getChildrenForMiniListView(miniListView);
-                });
-            }, 500);
-
-            onInit();
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/umb-mini-list-view.html',
-            scope: {
-                node: "=",
-                entityType: "@",
-                startNodeId: "=",
-                onSelect: "&",
-                onClose: "&",
-                onItemsLoaded: "&",
-                entityTypeFilter: "="
-            },
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbMiniListView', MiniListViewDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminisearch.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminisearch.component.js
deleted file mode 100644
index c22a56f0d0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminisearch.component.js
+++ /dev/null
@@ -1,71 +0,0 @@
-(function () {
-    'use strict';
-
-    angular
-        .module('umbraco')
-        .component('umbMiniSearch', {
-            templateUrl: 'views/components/umb-mini-search.html',
-            controller: UmbMiniSearchController,
-            controllerAs: 'vm',
-            bindings: {
-                model: "=",
-                onStartTyping: "&?",
-                onSearch: "&?",
-                onBlur: "&?",
-                labelKey: "@?",
-                inputId: "@?"
-            }
-        });
-
-    function UmbMiniSearchController($scope, localizationService) {
-
-        var vm = this;
-
-        vm.onKeyDown = onKeyDown;
-        vm.onChange = onChange;
-        vm.$onInit = onInit;
-
-        var searchDelay = _.debounce(function () {
-            $scope.$apply(function () {
-                if (vm.onSearch) {
-                    vm.onSearch();
-                }
-            });
-        }, 500);
-
-        function onKeyDown(evt) {
-            //13: enter
-            switch (evt.keyCode) {
-                case 13:
-                    if (vm.onSearch) {
-                        vm.onSearch();
-                    }
-                    break;
-            }
-        }
-
-        function onChange() {
-            if (vm.onStartTyping) {
-                vm.onStartTyping();
-            }
-            searchDelay();
-        }
-
-        function onInit() {
-            vm.inputId = vm.inputId || "search_" + String.CreateGuid();
-            setText();
-        }
-
-        function setText() {
-            var keyToLocalize = vm.labelKey || 'general_search';
-
-            localizationService.localize(keyToLocalize).then(function (data) {
-                // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
-                if(data.indexOf('[') === -1){
-                    vm.text = data;
-                }
-            });
-        }
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js
deleted file mode 100644
index ec97d8aef8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js
+++ /dev/null
@@ -1,103 +0,0 @@
-angular.module("umbraco.directives").directive('umbNestedContentEditor', [
-
-    function () {
-
-        var link = function ($scope, el, attrs) {
-
-            // Clone the model because some property editors
-            // do weird things like updating and config values
-            // so we want to ensure we start from a fresh every
-            // time, we'll just sync the value back when we need to
-            $scope.model = Utilities.copy($scope.ngModel);
-            $scope.nodeContext = $scope.model;
-
-            $scope.readonly = false;
-
-            attrs.$observe('readonly', (value) => {
-                $scope.readonly = value !== undefined;
-            });
-
-            // Find the selected tab
-            var selectedTab = $scope.model.variants[0].tabs[0];
-
-            if ($scope.tabAlias) {
-                Utilities.forEach($scope.model.variants[0].tabs, tab => {
-                    if (tab.alias.toLowerCase() === $scope.tabAlias.toLowerCase()) {
-                        selectedTab = tab;
-                        return;
-                    }
-                });
-            }
-
-            $scope.tab = selectedTab;
-
-            // Listen for sync request
-            var unsubscribe = $scope.$on("ncSyncVal", function (ev, args) {
-                if (args.key === $scope.model.key) {
-
-                    // Tell inner controls we are submitting
-                    $scope.$broadcast("formSubmitting", { scope: $scope });
-
-                    // Sync the values back
-                    Utilities.forEach($scope.ngModel.variants[0].tabs, tab => {
-                        if (tab.alias.toLowerCase() === selectedTab.alias.toLowerCase()) {
-
-                            var localPropsMap = selectedTab.properties.reduce((map, obj) => {
-                                map[obj.alias] = obj;
-                                return map;
-                            }, {});
-
-                            Utilities.forEach(tab.properties, prop => {
-                                if (localPropsMap.hasOwnProperty(prop.alias)) {
-                                    prop.value = localPropsMap[prop.alias].value;
-                                }
-                            });
-                        }
-                    });
-                    
-                }
-            });
-
-            $scope.$on('$destroy', function () {
-                unsubscribe();
-            });
-        };
-
-        return {
-            restrict: "E",
-            replace: true,
-            templateUrl: Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + "/views/propertyeditors/nestedcontent/nestedcontent.editor.html",
-            scope: {
-                ngModel: '=',
-                tabAlias: '='
-            },
-            link: link
-        };
-
-    }
-]);
-
-//angular.module("umbraco.directives").directive('nestedContentSubmitWatcher', function () {
-//    var link = function (scope) {
-//        // call the load callback on scope to obtain the ID of this submit watcher
-//        var id = scope.loadCallback();
-//        scope.$on("formSubmitting", function (ev, args) {
-//            // on the "formSubmitting" event, call the submit callback on scope to notify the nestedContent controller to do it's magic
-//            if (id === scope.activeSubmitWatcher) {
-//                scope.submitCallback();
-//            }
-//        });
-//    }
-
-//    return {
-//        restrict: "E",
-//        replace: true,
-//        template: "",
-//        scope: {
-//            loadCallback: '=',
-//            submitCallback: '=',
-//            activeSubmitWatcher: '='
-//        },
-//        link: link
-//    }
-//});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js
deleted file mode 100644
index d77306379a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbNodePreview
-@restrict E
-@scope
-
-@description
-<strong>Added in Umbraco v. 7.6:</strong> Use this directive to render a node preview.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.NodePreviewController as vm">
-        
-        <div ui-sortable ng-model="vm.nodes">
-            <umb-node-preview
-                ng-repeat="node in vm.nodes"
-                icon="node.icon"
-                name="node.name"
-                alias="node.alias"
-                published="node.published"
-                description="node.description"
-                sortable="vm.sortable"
-                allow-remove="vm.allowRemove"
-                allow-open="vm.allowOpen"
-                on-remove="vm.remove($index, vm.nodes)"
-                on-open="vm.open(node)">
-            </umb-node-preview>
-        </div>
-    
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-    
-        function Controller() {
-    
-            var vm = this;
-    
-            vm.allowRemove = true;
-            vm.allowOpen = true;
-            vm.sortable = true;
-    
-            vm.nodes = [
-                {
-                    "icon": "icon-document",
-                    "name": "My node 1",
-                    "published": true,
-                    "description": "A short description of my node"
-                },
-                {
-                    "icon": "icon-document",
-                    "name": "My node 2",
-                    "published": true,
-                    "description": "A short description of my node"
-                }
-            ];
-    
-            vm.remove = remove;
-            vm.open = open;
-    
-            function remove(index, nodes) {
-                alert("remove node");
-            }
-    
-            function open(node) {
-                alert("open node");
-            }
-    
-        }
-    
-        angular.module("umbraco").controller("My.NodePreviewController", Controller);
-    
-    })();
-</pre>
-
-@param {string} icon (<code>binding</code>): The node icon.
-@param {string} name (<code>binding</code>): The node name.
-@param {string} alias (<code>binding</code>): The node document type alias will be displayed on hover if in debug mode or logged in as admin
-@param {boolean} published (<code>binding</code>): The node published state.
-@param {string} description (<code>binding</code>): A short description.
-@param {boolean} sortable (<code>binding</code>): Will add a move cursor on the node preview. Can used in combination with ui-sortable.
-@param {boolean} allowRemove (<code>binding</code>): Show/Hide the remove button.
-@param {boolean} allowOpen (<code>binding</code>): Show/Hide the open button.
-@param {boolean} allowEdit (<code>binding</code>): Show/Hide the edit button (Added in version 7.7.0).
-@param {boolean} allowChange (<code>binding</code>): Show/Hide the change button (Added in version 10.1.0).
-@param {function} onRemove (<code>expression</code>): Callback function when the remove button is clicked.
-@param {function} onOpen (<code>expression</code>): Callback function when the open button is clicked.
-@param {function} onEdit (<code>expression</code>): Callback function when the edit button is clicked (Added in version 7.7.0).
-@param {function} onChange (<code>expression</code>): Callback function when the change button is clicked (Added in version 10.1.0).
-@param {string} openUrl (<code>binding</code>): Fallback URL for <code>onOpen</code> (Added in version 7.12.0).
-@param {string} editUrl (<code>binding</code>): Fallback URL for <code>onEdit</code> (Added in version 7.12.0).
-@param {string} removeUrl (<code>binding</code>): Fallback URL for <code>onRemove</code> (Added in version 7.12.0).
-**/
-
-(function () {
-    'use strict';
-
-    function NodePreviewDirective(userService) {
-
-        function link(scope, el, attr, ctrl) {
-            if (!scope.editLabelKey) {
-                scope.editLabelKey = "general_edit";
-            }
-
-            scope.nodeNameTitle = null;
-            if(Umbraco.Sys.ServerVariables.isDebuggingEnabled) {
-                userService.getCurrentUser().then(function (u) {
-                    if (u.allowedSections.indexOf("settings") !== -1 ? true : false) {
-                        scope.nodeNameTitle = scope.alias;
-                    }
-                });
-            }
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/umb-node-preview.html',
-            scope: {
-                icon: "=?",
-                name: "=",
-                alias: "=?",
-                description: "=?",
-                permissions: "=?",
-                published: "=?",
-                sortable: "=?",
-                allowOpen: "=?",
-                allowRemove: "=?",
-                allowEdit: "=?",
-                allowChange: "=?",
-                onOpen: "&?",
-                onRemove: "&?",
-                onEdit: "&?",
-                onChange: "&?",
-                openUrl: '=?',
-                editUrl: '=?',
-                removeUrl: '=?'
-            },
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbNodePreview', NodePreviewDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js
deleted file mode 100644
index f939eb5e46..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbPagination
-@restrict E
-@scope
-
-@description
-Use this directive to generate a pagination.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <umb-pagination
-            page-number="vm.pagination.pageNumber"
-            total-pages="vm.pagination.totalPages"
-            on-next="vm.nextPage"
-            on-prev="vm.prevPage"
-            on-change="vm.changePage"
-            on-go-to-page="vm.goToPage">
-        </umb-pagination>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-
-            vm.pagination = {
-                pageNumber: 1,
-                totalPages: 10
-            };
-
-            vm.nextPage = nextPage;
-            vm.prevPage = prevPage;
-            vm.changePage = changePage;
-            vm.goToPage = goToPage;
-
-            function nextPage(pageNumber) {
-                // do magic here
-                console.log(pageNumber);
-                alert("nextpage");
-            }
-
-            function prevPage(pageNumber) {
-                // do magic here
-                console.log(pageNumber);
-                alert("prevpage");
-            }
-            
-            function changePage(pageNumber) {
-                // do magic here
-                console.log(pageNumber);
-                alert("changepage");
-            }
-
-            function goToPage(pageNumber) {
-                // do magic here
-                console.log(pageNumber);
-                alert("go to");
-            }
-
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-
-@param {number} pageNumber (<code>binding</code>): Current page number.
-@param {number} totalPages (<code>binding</code>): The total number of pages.
-@param {callback} onNext (<code>binding</code>): Callback method to go to the next page.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>pageNumber</code>: The page number</li>
-    </ul>
-@param {callback=} onPrev (<code>binding</code>): Callback method to go to the previous page.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>pageNumber</code>: The page number</li>
-    </ul>
-@param {callback=} onGoToPage (<code>binding</code>): Callback method to go to a specific page.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>pageNumber</code>: The page number</li>
-    </ul>
-@param {callback=} onChange (<code>binding</code>): Callback method when changing page.
-    <h3>The callback returns:</h3>
-    <ul>
-        <li><code>pageNumber</code>: The page number</li>
-    </ul>
-**/
-
-(function() {
-   'use strict';
-
-   function PaginationDirective(localizationService) {
-
-      function link(scope, el, attr, ctrl) {
-
-         function activate() {
-            // page number is sometimes a string - let's make sure it's an int before we do anything with it
-            if (scope.pageNumber) {
-                scope.pageNumber = parseInt(scope.pageNumber);
-            }
-
-            let tempPagination = [];
-             
-            var i = 0;
-
-            if (scope.totalPages <= 10) {
-                for (i = 0; i < scope.totalPages; i++) {
-                    tempPagination.push({
-                        val: (i + 1),
-                        isActive: scope.pageNumber === (i + 1)
-                    });
-                }
-            }
-            else {
-                //if there is more than 10 pages, we need to do some fancy bits
-
-                //get the max index to start
-                var maxIndex = scope.totalPages - 10;
-                //set the start, but it can't be below zero
-                var start = Math.max(scope.pageNumber - 5, 0);
-                //ensure that it's not too far either
-                start = Math.min(maxIndex, start);
-
-                for (i = start; i < (10 + start) ; i++) {
-                    tempPagination.push({
-                        val: (i + 1),
-                        isActive: scope.pageNumber === (i + 1)
-                    });
-                }
-
-                //now, if the start is greater than 0 then '1' will not be displayed, so do the elipses thing
-                if (start > 0) {
-                    localizationService.localize("general_first").then(function(value){
-                        var firstLabel = value;
-                        tempPagination.unshift({ name: firstLabel, val: 1, isActive: false }, {val: "...",isActive: false});
-                    });
-                }
-
-                //same for the end
-                if (start < maxIndex) {
-                    localizationService.localize("general_last").then(function(value){
-                        var lastLabel = value;
-                        tempPagination.push({ val: "...", isActive: false }, { name: lastLabel, val: scope.totalPages, isActive: false });
-                    });
-                }
-            }
-
-            scope.pagination = tempPagination;
-         }
-
-         scope.next = function () {
-             if (scope.pageNumber < scope.totalPages) {
-                 scope.pageNumber++;
-                 if (scope.onNext) {
-                     scope.onNext(scope.pageNumber);
-                 }
-                 if (scope.onChange) {
-                     scope.onChange({ "pageNumber": scope.pageNumber });
-                 }
-             }
-         };
-
-         scope.prev = function (pageNumber) {
-             if (scope.pageNumber > 1) {
-                 scope.pageNumber--;
-                 if (scope.onPrev) {
-                     scope.onPrev(scope.pageNumber);
-                 }
-                 if (scope.onChange) {
-                     scope.onChange({ "pageNumber": scope.pageNumber });
-                 }
-             }
-         };
-
-         scope.goToPage = function (pageNumber) {
-             scope.pageNumber = pageNumber + 1;
-             if (scope.onGoToPage) {
-                 scope.onGoToPage(scope.pageNumber);
-             }
-             if (scope.onChange) {
-                 scope.onChange({ "pageNumber": scope.pageNumber });
-             }
-         };
-
-         var unbindPageNumberWatcher =  scope.$watchCollection('[pageNumber, totalPages]', function (newValues, oldValues) {
-            activate();
-         });
-
-         scope.$on('$destroy', function(){
-           unbindPageNumberWatcher();
-         });
-
-         activate();
-
-      }
-
-      var directive = {
-         restrict: 'E',
-         replace: true,
-         templateUrl: 'views/components/umb-pagination.html',
-         scope: {
-            pageNumber: "=",
-            totalPages: "=",
-            onNext: "=",
-            onPrev: "=",
-            onGoToPage: "=",
-            onChange: "&"
-         },
-         link: link
-      };
-
-      return directive;
-
-   }
-
-   angular.module('umbraco.directives').directive('umbPagination', PaginationDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbprogressbar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbprogressbar.directive.js
deleted file mode 100644
index a71dcc5ffe..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbprogressbar.directive.js
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbProgressBar
-@restrict E
-@scope
-
-@description
-Use this directive to generate a progress bar.
-
-<h3>Markup example</h3>
-<pre>
-    <umb-progress-bar
-        percentage="60">
-    </umb-progress-bar>
-</pre>
-
-@param {number} percentage (<code>attribute</code>): The progress in percentage.
-@param {string} size (<code>attribute</code>): The size (s, m).
-@param {string} color (<code>attribute</code>): The color of the progress (primary, secondary, success, warning, danger). Success by default.
-
-**/
-
-(function() {
-    'use strict';
-
-    function ProgressBarDirective() {
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/umb-progress-bar.html',
-            scope: {
-                percentage: "@",
-                size: "@?",
-                color: "@?"
-            }
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbProgressBar', ProgressBarDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbprogresscircle.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbprogresscircle.directive.js
deleted file mode 100644
index f197520eec..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbprogresscircle.directive.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbProgressCircle
-@restrict E
-@scope
-
-@description
-Use this directive to render a circular progressbar.
-
-<h3>Markup example</h3>
-<pre>
-    <div>
-    
-        <umb-progress-circle
-            percentage="80"
-            size="60"
-            color="secondary">
-        </umb-progress-circle>
-
-	</div>
-</pre>
-
-@param {string} percentage (<code>attribute</code>): Takes a number between 0 and 100 and applies it to the circle's highlight length.
-@param {string} size (<code>attribute</code>): This parameter defines the width and the height of the circle in pixels.
-@param {string} color (<code>attribute</code>): The color of the highlight (primary, secondary, success, warning, danger). Success by default. 
-**/
-
-(function (){
-    'use strict';
-
-    function ProgressCircleDirective($http, $timeout) {
-
-        function link(scope, element, $filter) {
-            
-            function onInit() {
-                            
-                // making sure we get the right numbers
-                var percent = scope.percentage;
-
-                if (percent > 100) {
-                    percent = 100;
-                }
-                else if (percent < 0) {
-                    percent = 0;
-                }
-
-                // calculating the circle's highlight
-                var circle = element.find(".umb-progress-circle__highlight");
-                var r = circle.attr('r');
-                var strokeDashArray = (r*Math.PI)*2;
-
-                // Full circle length
-                scope.strokeDashArray = strokeDashArray;
-
-                var strokeDashOffsetDifference = (percent/100)*strokeDashArray;
-                var strokeDashOffset = strokeDashArray - strokeDashOffsetDifference;
-
-                // Distance for the highlight dash's offset
-                scope.strokeDashOffset = strokeDashOffset;
-
-                // set font size
-                scope.percentageSize = (scope.size * 0.3) + "px";
-
-            }
-
-            onInit();
-        }
-
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/umb-progress-circle.html',
-            scope: {
-                percentage: "@",
-                size: "@?",
-                color: "@?"
-            },
-            link: link
-
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbProgressCircle', ProgressCircleDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js
deleted file mode 100644
index 405641a9ab..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js
+++ /dev/null
@@ -1,346 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbRangeSlider
-@restrict E
-@scope
-
-@description
-<b>Added in Umbraco version 8.0</b>
-This directive is a wrapper of the noUiSlider library. Use it to render a slider.
-For extra details about options and events take a look here: https://refreshless.com/nouislider/
-
-<h3>Markup example</h3>
-<pre>
-	<div ng-controller="My.Controller as vm">
-
-        <umb-range-slider
-            ng-model="vm.value"
-            on-end="vm.slideEnd(values)">
-        </umb-range-slider>
-
-	</div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-	(function () {
-		"use strict";
-
-		function Controller() {
-
-            var vm = this;
-
-            vm.value = [10];
-
-            vm.slideEnd = slideEnd;
-
-            function slideEnd(values) {
-            	// handle change
-            }
-
-        }
-
-		angular.module("umbraco").controller("My.Controller", Controller);
-
-	})();
-</pre>
-
-@param {object} ngModel (<code>binding</code>): Value for the slider.
-@param {object} options (<code>binding</code>): Config object for the slider.
-@param {callback} onSetup (<code>callback</code>): onSetup gets triggered when the slider is initialized
-@param {callback} onUpdate (<code>callback</code>): onUpdate fires every time the slider values are changed.
-@param {callback} onSlide (<code>callback</code>): onSlide gets triggered when the handle is being dragged.
-@param {callback} onSet (<code>callback</code>): onSet will trigger every time a slider stops changing.
-@param {callback} onChange (<code>callback</code>): onChange fires when a user stops sliding, or when a slider value is changed by 'tap'.
-@param {callback} onDrag (<code>callback</code>): onDrag fires when a connect element between handles is being dragged, while ignoring other updates to the slider values.
-@param {callback} onStart (<code>callback</code>): onStart fires when a handle is clicked (mousedown, or the equivalent touch events).
-@param {callback} onEnd (<code>callback</code>): onEnd fires when a handle is released (mouseup etc), or when a slide is canceled due to other reasons.
-**/
-
-
-(function () {
-    'use strict';
-
-    var umbRangeSlider = {
-        template: '<div class="umb-range-slider"></div>',
-        controller: UmbRangeSliderController,
-        bindings: {
-            ngModel: '<',
-            options: '<',
-            onSetup: '&?',
-            onUpdate: '&?',
-            onSlide: '&?',
-            onSet: '&?',
-            onChange: '&?',
-            onDrag: '&?',
-            onStart: '&?',
-            onEnd: '&?'
-        }
-    };
-
-    function UmbRangeSliderController($element, $timeout, $scope, assetsService, $attrs) {
-
-        const ctrl = this;
-        let sliderInstance = null;
-
-        ctrl.$onInit = function () {
-
-            // load css file for the date picker
-            assetsService.loadCss('lib/nouislider/nouislider.min.css', $scope);
-
-            // load the js file for the date picker
-            assetsService.loadJs('lib/nouislider/nouislider.min.js', $scope).then(function () {
-                // init date picker
-                grabElementAndRun();
-            });
-
-        };
-
-        $attrs.$observe('readonly', (value) => {
-            ctrl.readonly = value !== undefined;
-
-            if (!sliderInstance) {
-                return;
-            }
-
-            if (ctrl.readonly) {
-                sliderInstance.setAttribute('disabled', true);
-            } else {
-                sliderInstance.removeAttribute('disabled');
-            }
-        });
-
-        function grabElementAndRun() {
-            $timeout(function () {
-                const element = $element.find('.umb-range-slider')[0];
-                setSlider(element);
-            }, 0, true);
-        }
-
-        function setSlider(element) {
-
-            sliderInstance = element;
-
-            const defaultOptions = {
-                "start": [0],
-                "step": 1,
-                "range": {
-                    "min": [0],
-                    "max": [100]
-                }
-            };
-            const options = ctrl.options ? ctrl.options : defaultOptions;
-
-            // create new slider
-            noUiSlider.create(sliderInstance, options);
-
-            mergeTooltips(sliderInstance, 15, ' - ');
-
-            if (ctrl.onSetup) {
-                ctrl.onSetup({
-                    slider: sliderInstance
-                });
-            }
-
-            // If has ngModel set the date
-            if (ctrl.ngModel) {
-                sliderInstance.noUiSlider.set(ctrl.ngModel);
-            }
-
-            if (ctrl.readonly) {
-                sliderInstance.setAttribute('disabled', true);
-            } else {
-                sliderInstance.removeAttribute('disabled');
-            }
-
-            // destroy the slider instance when the dom element is removed
-            $(element).on('$destroy', function () {
-                sliderInstance.noUiSlider.off();
-            });
-
-            setUpCallbacks();
-            setUpActivePipsHandling();
-            addPipClickHandler();
-
-            // Refresh the scope
-            $scope.$applyAsync();
-        }
-
-        function setUpCallbacks() {
-            if (sliderInstance) {
-
-                // bind hook for update
-                if (ctrl.onUpdate) {
-                    sliderInstance.noUiSlider.on('update', function (values, handle, unencoded, tap, positions) {
-                        $timeout(function () {
-                            ctrl.onUpdate({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions });
-                        });
-                    });
-                }
-
-                // bind hook for slide
-                if (ctrl.onSlide) {
-                    sliderInstance.noUiSlider.on('slide', function (values, handle, unencoded, tap, positions) {
-                        $timeout(function () {
-                            ctrl.onSlide({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions });
-                        });
-                    });
-                }
-
-                // bind hook for set
-                if (ctrl.onSet) {
-                    sliderInstance.noUiSlider.on('set', function (values, handle, unencoded, tap, positions) {
-                        $timeout(function () {
-                            ctrl.onSet({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions });
-                        });
-                    });
-                }
-
-                // bind hook for change
-                if (ctrl.onChange) {
-                    sliderInstance.noUiSlider.on('change', function (values, handle, unencoded, tap, positions) {
-                        $timeout(function () {
-                            ctrl.onChange({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions });
-                        });
-                    });
-                }
-
-                // bind hook for drag
-                if (ctrl.onDrag) {
-                    sliderInstance.noUiSlider.on('drag', function (values, handle, unencoded, tap, positions) {
-                        $timeout(function () {
-                            ctrl.onDrag({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions });
-                        });
-                    });
-                }
-
-                // bind hook for start
-                if (ctrl.onStart) {
-                    sliderInstance.noUiSlider.on('start', function (values, handle, unencoded, tap, positions) {
-                        $timeout(function () {
-                            ctrl.onStart({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions });
-                        });
-                    });
-                }
-
-                // bind hook for end
-                if (ctrl.onEnd) {
-                    sliderInstance.noUiSlider.on('end', function (values, handle, unencoded, tap, positions) {
-                        $timeout(function () {
-                            ctrl.onEnd({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions });
-                        });
-                    });
-                }
-
-            }
-        }
-
-        // Merging overlapping tooltips: https://refreshless.com/nouislider/examples/#section-merging-tooltips
-
-        /**
-         * @param slider HtmlElement with an initialized slider
-         * @param threshold Minimum proximity (in percentages) to merge tooltips
-         * @param separator String joining tooltips
-         */
-        function mergeTooltips(slider, threshold, separator) {
-
-            var textIsRtl = getComputedStyle(slider).direction === 'rtl';
-            var isRtl = slider.noUiSlider.options.direction === 'rtl';
-            var isVertical = slider.noUiSlider.options.orientation === 'vertical';
-            var tooltips = slider.noUiSlider.getTooltips();
-            var origins = slider.noUiSlider.getOrigins();
-            
-            // Move tooltips into the origin element. The default stylesheet handles this.
-            if(tooltips && tooltips.length !== 0){
-              tooltips.forEach(function (tooltip, index) {
-                if (tooltip) {
-                  origins[index].appendChild(tooltip);
-                }
-              });
-            }
-
-            slider.noUiSlider.on('update', function (values, handle, unencoded, tap, positions) {
-
-                var pools = [[]];
-                var poolPositions = [[]];
-                var poolValues = [[]];
-                var atPool = 0;
-
-                // Assign the first tooltip to the first pool, if the tooltip is configured
-                if (tooltips[0]) {
-                    pools[0][0] = 0;
-                    poolPositions[0][0] = positions[0];
-                    poolValues[0][0] = values[0];
-                }
-
-                for (var i = 1; i < positions.length; i++) {
-                    if (!tooltips[i] || (positions[i] - positions[i - 1]) > threshold) {
-                        atPool++;
-                        pools[atPool] = [];
-                        poolValues[atPool] = [];
-                        poolPositions[atPool] = [];
-                    }
-
-                    if (tooltips[i]) {
-                        pools[atPool].push(i);
-                        poolValues[atPool].push(values[i]);
-                        poolPositions[atPool].push(positions[i]);
-                    }
-                }
-
-                pools.forEach(function (pool, poolIndex) {
-                    var handlesInPool = pool.length;
-
-                    for (var j = 0; j < handlesInPool; j++) {
-                        var handleNumber = pool[j];
-                        
-                        if (j === handlesInPool - 1) {
-                            var offset = 0;
-                            
-                            poolPositions[poolIndex].forEach(function (value) {
-                                offset += 1000 - value;
-                            });
-                            
-                            var direction = isVertical ? 'bottom' : 'right';
-                            var last = isRtl ? 0 : handlesInPool - 1;
-                            var lastOffset = 1000 - poolPositions[poolIndex][last];
-                            offset = (textIsRtl && !isVertical ? 100 : 0) + (offset / handlesInPool) - lastOffset;
-
-                            // Filter to unique values
-                            var tooltipValues = poolValues[poolIndex].filter((v, i, a) => a.indexOf(v) === i);
-
-                            // Center this tooltip over the affected handles
-                            tooltips[handleNumber].innerHTML = tooltipValues.join(separator);
-                            tooltips[handleNumber].style.display = 'block';
-                            tooltips[handleNumber].style[direction] = offset + '%';
-                        } else {
-                            // Hide this tooltip
-                            tooltips[handleNumber].style.display = 'none';
-                        }
-                    }
-                });
-            });
-        }
-      function setUpActivePipsHandling() {
-        sliderInstance.noUiSlider.on('update', function (values,handle) {
-          sliderInstance.querySelectorAll('.noUi-value').forEach(pip => {
-            pip.classList.remove("noUi-value-active");
-            if (Number(values[handle]) === Number(pip.getAttribute('data-value'))) {
-              pip.classList.add("noUi-value-active");
-            }
-          });
-        });
-      }
-      function addPipClickHandler(){
-          sliderInstance.querySelectorAll('.noUi-value').forEach(function(pip){
-            pip.addEventListener('click', function () {
-              const value = pip.getAttribute('data-value');
-              sliderInstance.noUiSlider.set(value);
-            });
-          });
-      }
-    }
-
-    angular.module('umbraco.directives').component('umbRangeSlider', umbRangeSlider);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
deleted file mode 100644
index 28b2647184..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbStickyBar
-@restrict A
-
-@description
-Use this directive make an element sticky and follow the page when scrolling. `umb-sticky-bar--active` class is applied when the element is stuck
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <div
-           class="my-sticky-bar"
-           umb-sticky-bar>
-        </div>
-
-    </div>
-</pre>
-
-**/
-
-(function () {
-    'use strict';
-
-    function StickyBarDirective() {
-
-        let headerObserver;
-
-        /**
-        Toggle `umb-sticky-bar--active` class on the sticky-bar element
-        **/
-        const setClass = (addClass, current) => current.classList.toggle('umb-sticky-bar--active', addClass);
-
-        /**
-        Inserts two elements in the umbStickyBar parent element
-        These are used by the IntersectionObserve to calculate scroll position
-        **/
-        const addSentinel = current => {
-          if (current.parentElement.querySelector(".umb-sticky-sentinel") === null) {
-            const sentinel = document.createElement("div");
-            sentinel.classList.add("umb-sticky-sentinel", "-top");
-            current.parentElement.prepend(sentinel);
-          }
-        };
-
-        /**
-        Calls into setClass when the header sentinel enters/exits the top of the container
-        Container is the parent element of the umbStickyBar element
-        **/
-        const observeHeader = (current, container) => {
-            headerObserver = new IntersectionObserver((records, observer) => {
-                let [target, rootBounds] = [records[0].boundingClientRect, records[0].rootBounds];
-
-                if (rootBounds && target) {
-                    if (target.bottom < rootBounds.top) {
-                        setClass(true, current);
-                    }
-
-                    if (target.bottom >= rootBounds.top && target.bottom < rootBounds.bottom) {
-                        setClass(false, current);
-                    }
-                }
-            }, {
-                threshold: [0],
-                root: container
-            });
-
-            headerObserver.observe(current.parentElement.querySelector('.umb-sticky-sentinel.-top'));
-        };
-
-        function link(scope, el, attr, ctrl) {
-
-            let current = el[0];
-            let container = current.closest('.umb-editor-container') || current.closest('.umb-dashboard');
-
-            if (container) {
-                addSentinel(current);
-                observeHeader(current, container);
-            }
-
-            scope.$on('$destroy', () => {
-                headerObserver.disconnect();
-            });
-        }
-
-        const directive = {
-            restrict: 'A',
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbStickyBar', StickyBarDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
deleted file mode 100644
index b4263ed9fe..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtable.directive.js
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbTable
-@restrict E
-@scope
-
-@description
-<strong>Added in Umbraco v. 7.4:</strong> Use this directive to render a data table.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.TableController as vm">
-        
-        <umb-table
-            ng-if="vm.items"
-            items="vm.items"
-            item-properties="vm.options.includeProperties"
-            allow-select-all="vm.allowSelectAll"
-            on-select="vm.selectItem"
-            on-click="vm.clickItem"
-            on-select-all="vm.selectAll"
-            on-selected-all="vm.isSelectedAll"
-            on-sorting-direction="vm.isSortDirection"
-            on-sort="vm.sort">
-        </umb-table>
-    
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-    
-        function Controller() {
-    
-            var vm = this;
-    
-            vm.items = [
-                {
-                    "icon": "icon-document",
-                    "name": "My node 1",
-                    "published": true,
-                    "description": "A short description of my node",
-                    "author": "Author 1"
-                },
-                {
-                    "icon": "icon-document",
-                    "name": "My node 2",
-                    "published": true,
-                    "description": "A short description of my node",
-                    "author": "Author 2"
-                }
-            ];
-
-            vm.options = {
-                includeProperties: [
-                    { alias: "description", header: "Description" },
-                    { alias: "author", header: "Author" }
-                ]
-            };
-    
-            vm.selectItem = selectItem;
-            vm.clickItem = clickItem;
-            vm.selectAll = selectAll;
-            vm.isSelectedAll = isSelectedAll;
-            vm.isSortDirection = isSortDirection;
-            vm.sort = sort;
-
-            function selectAll($event) {
-                alert("select all");
-            }
-
-            function isSelectedAll() {
-                
-            }
-    
-            function clickItem(item) {
-                alert("click node");
-            }
-
-            function selectItem(selectedItem, $index, $event) {
-                alert("select node");
-            }
-            
-            function isSortDirection(col, direction) {
-                
-            }
-            
-            function sort(field, allow, isSystem) {
-                
-            }
-    
-        }
-    
-        angular.module("umbraco").controller("My.TableController", Controller);
-    
-    })();
-</pre>
-
-@param {array} items (<code>binding</code>): The items for the table.
-@param {array} itemProperties (<code>binding</code>): The properties for the items to use in table.
-@param {boolean} allowSelectAll (<code>binding</code>): Specify whether to allow select all.
-@param {function} onSelect (<code>expression</code>): Callback function when the row is selected.
-@param {function} onClick (<code>expression</code>): Callback function when the "Name" column link is clicked.
-@param {function} onSelectAll (<code>expression</code>): Callback function when selecting all items.
-@param {function} onSelectedAll (<code>expression</code>): Callback function when all items are selected.
-@param {function} onSortingDirection (<code>expression</code>): Callback function when sorting direction is changed.
-@param {function} onSort (<code>expression</code>): Callback function when sorting items.
-**/
-
-(function () {
-    'use strict';
-
-    function TableController(iconHelper) {
-
-        var vm = this;
-
-        vm.clickItem = function (item, $event) {
-            if (vm.onClick && !($event.metaKey || $event.ctrlKey)) {
-                vm.onClick({ item: item});
-                $event.preventDefault();
-            }
-            $event.stopPropagation();
-        };
-
-        vm.selectItem = function (item, $index, $event) {
-            if (vm.allowSelect !== false && vm.onSelect) {
-                vm.onSelect({ item: item, $index: $index, $event: $event });
-                $event.stopPropagation();
-            }
-        };
-
-        vm.selectAll = function ($event) {
-            if (vm.onSelectAll) {
-                vm.onSelectAll({ $event: $event});
-            }
-        };
-
-        vm.isSelectedAll = function () {
-            if (vm.onSelectedAll && vm.items && vm.items.length > 0) {
-                return vm.onSelectedAll();
-            }
-        };
-
-        vm.isSortDirection = function (col, direction) {
-            if (vm.onSortingDirection) {
-                return vm.onSortingDirection({ col: col, direction: direction });
-            }
-        };
-
-        vm.sort = function (field, allow, isSystem) {
-            if (vm.onSort) {
-                vm.onSort({ field: field, allow: allow, isSystem: isSystem  });
-            }
-        };
-
-        vm.getIcon = function (entry) {
-            return iconHelper.convertFromLegacyIcon(entry.icon);
-        };
-    }
-
-    angular
-        .module('umbraco.directives')
-        .component('umbTable', {
-            templateUrl: 'views/components/umb-table.html',
-            controller: TableController,
-            controllerAs: 'vm',
-            bindings: {
-                items: '<',
-                itemProperties: '<',
-                allowSelect: '<',
-                allowSelectAll: '<',
-                onSelect: '&',
-                onClick: '&',
-                onSelectAll: '&',
-                onSelectedAll: '&',
-                onSortingDirection: '&',
-                onSort: '&'
-            }
-        });
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtextarea.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtextarea.directive.js
deleted file mode 100644
index 8b584b873c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtextarea.directive.js
+++ /dev/null
@@ -1,59 +0,0 @@
-(function () {
-    'use strict';
-
-    function umbTextarea($document) {
-
-        function autogrow(scope, element, attributes) {
-            if (!element.hasClass("autogrow")) {
-                // no autogrow for you today
-                return;
-            }
-
-            // get possible minimum height style
-            var minHeight = parseInt(window.getComputedStyle(element[0]).getPropertyValue("min-height")) || 0;
-
-            // prevent newlines in textbox
-            element.on("keydown", function (evt) {
-                if (evt.which === 13) {
-                    //evt.preventDefault();
-                }
-            });
-
-            element.on("input", function (evt) {
-                element.css({
-                    height: 'auto',
-                    minHeight: 0
-                });
-
-                var contentHeight = this.scrollHeight;
-                var borderHeight = 1;
-                var paddingHeight = 4;
-
-                element.css({
-                    minHeight: null, // remove property
-                    height: contentHeight + borderHeight + paddingHeight + "px" // because we're using border-box
-                });
-            });
-
-            // watch model changes from the outside to adjust height
-            scope.$watch(attributes.ngModel, trigger);
-
-            // set initial size
-            trigger();
-
-            function trigger() {
-                setTimeout(element.triggerHandler.bind(element, "input"), 1);
-            }
-        }
-
-        var directive = {
-            restrict: 'E',
-            link: autogrow
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('textarea', umbTextarea);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js
deleted file mode 100644
index ce1885a7cf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbTooltip
-@restrict E
-@scope
-
-@description
-Use this directive to render a tooltip.
-
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-
-        <div
-            ng-mouseover="vm.mouseOver($event)"
-            ng-mouseleave="vm.mouseLeave()">
-            Hover me
-        </div>
-
-        <umb-tooltip
-           ng-if="vm.tooltip.show"
-           event="vm.tooltip.event">
-           // tooltip content here
-        </umb-tooltip>
-
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller() {
-
-            var vm = this;
-            vm.tooltip = {
-                show: false,
-                event: null
-            };
-
-            vm.mouseOver = mouseOver;
-            vm.mouseLeave = mouseLeave;
-
-            function mouseOver($event) {
-                vm.tooltip = {
-                    show: true,
-                    event: $event
-                };
-            }
-
-            function mouseLeave() {
-                vm.tooltip = {
-                    show: false,
-                    event: null
-                };
-            }
-
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-
-    })();
-</pre>
-
-@param {string} event Set the $event from the target element to position the tooltip relative to the mouse cursor.
-**/
-
-(function() {
-   'use strict';
-
-   function TooltipDirective() {
-
-      function link(scope, el, attr, ctrl) {
-
-         scope.tooltipStyles = {};
-         scope.tooltipStyles.left = 0;
-         scope.tooltipStyles.top = 0;
-
-          function setTooltipPosition(event) {
-
-            var overlay = $(event.target).closest('.umb-overlay');
-            var container = overlay.length > 0 ? overlay : $("#contentwrapper");
-
-            let rect = container[0].getBoundingClientRect();
-
-            var containerLeft = rect.left;
-            var containerRight = containerLeft + rect.width;
-            var containerTop = rect.top;
-            var containerBottom = containerTop + rect.height;
-
-            var elementHeight = null;
-            var elementWidth = null;
-
-            var position = {
-               right: "inherit",
-               left: "inherit",
-               top: "inherit",
-               bottom: "inherit"
-            };
-
-            // element size
-            elementHeight = el[0].clientHeight;
-            elementWidth = el[0].clientWidth;
-
-            position.left = event.pageX - (elementWidth / 2);
-            position.top = event.pageY;
-
-            if (overlay.length > 0) {
-                position.left = event.pageX - rect.left - (elementWidth / 2);
-                position.top = event.pageY - rect.top;
-            }
-            else {
-                // check to see if element is outside screen
-                // outside right
-                if (position.left + elementWidth > containerRight) {
-                    position.right = 10;
-                    position.left = "inherit";
-                }
-
-                // outside bottom
-                if (position.top + elementHeight > containerBottom) {
-                    position.bottom = 10;
-                    position.top = "inherit";
-                }
-
-                // outside left
-                if (position.left < containerLeft) {
-                    position.left = containerLeft + 10;
-                    position.right = "inherit";
-                }
-
-                // outside top
-                if (position.top < containerTop) {
-                    position.top = 10;
-                    position.bottom = "inherit";
-                }
-            }
-
-            scope.tooltipStyles = position;
-
-            el.css(position);
-         }
-
-         setTooltipPosition(scope.event);
-      }
-
-      var directive = {
-         restrict: 'E',
-         transclude: true,
-         replace: true,
-         templateUrl: 'views/components/umb-tooltip.html',
-         scope: {
-            event: "="
-         },
-         link: link
-      };
-
-      return directive;
-   }
-
-   angular.module('umbraco.directives').directive('umbTooltip', TooltipDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
deleted file mode 100644
index 8c51763364..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
+++ /dev/null
@@ -1,313 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbFileDropzone
-* @restrict E
-* @function
-* @description Show a dropzone that allows the user to drag files and have them be uploaded to the media library
-**/
-angular.module("umbraco.directives")
-  .directive('umbFileDropzone',
-    function ($timeout, Upload, localizationService, umbRequestHelper, overlayService, mediaHelper, mediaTypeHelper) {
-      return {
-        restrict: 'E',
-        replace: true,
-        templateUrl: 'views/components/upload/umb-file-dropzone.html',
-        scope: {
-          parentId: '@',
-          contentTypeAlias: '@',
-          propertyAlias: '@',
-          accept: '@',
-          maxFileSize: '@',
-
-          compact: '@',
-          hideDropzone: '@',
-          acceptedMediatypes: '<',
-
-          filesQueued: '<',
-          filesUploaded: '<'
-        },
-        link: function (scope, element, attrs) {
-          scope.queue = [];
-          scope.totalQueued = 0;
-          scope.processing = [];
-          scope.processed = [];
-          scope.totalMessages = 0;
-          // TODO - Make configurable in appsettings
-          scope.batchSize = 10;
-          scope.processingCount = 0;
-
-          function _filterFile(file) {
-            var ignoreFileNames = ['Thumbs.db'];
-            var ignoreFileTypes = ['directory'];
-
-            // ignore files with names from the list
-            // ignore files with types from the list
-            // ignore files which starts with "."
-            if (ignoreFileNames.indexOf(file.name) === -1 &&
-              ignoreFileTypes.indexOf(file.type) === -1 &&
-              file.name.indexOf(".") !== 0) {
-              return true;
-            } else {
-              return false;
-            }
-          }
-
-          /**
-           * Initial entrypoint to handle the queued files. It will determine if the files are acceptable
-           * and determine if the user needs to pick a media type
-           * @param files
-           * @param event
-           * @returns void
-           * @private
-           */
-          function _filesQueued(files, event) {
-            //Push into the queue
-            Utilities.forEach(files, file => {
-              if (_filterFile(file) === true) {
-                file.messages = [];
-                scope.queue.push(file);
-              }
-            });
-
-            // Add all of the processing and processed files to account for uploading
-            // files in stages (dragging files X at a time into the dropzone).
-            scope.totalQueued = scope.queue.length + scope.processingCount + scope.processed.length;
-
-            // Upload not allowed
-            if (!scope.acceptedMediatypes || !scope.acceptedMediatypes.length) {
-              files.map(file => {
-                file.messages.push({ message: "File type is not allowed here", type: "Error" });
-              });
-            }
-
-            // If we have Accepted Media Types, we will ask to choose Media Type
-            if (scope.acceptedMediatypes) {
-
-              // If the media type dialog returns a positive answer, it is safe to assume that the
-              // contentTypeAlias has been chosen and we can return early because the dialog will start processing
-              // the queue automatically
-              if (_requestChooseMediaTypeDialog()) {
-                return;
-              }
-            }
-
-            // Start the processing of the queue here because the media type dialog was not shown and therefore
-            // did not do it earlier
-            _processQueueItems();
-          }
-
-          /**
-           * Run through the queue and start processing files
-           * @returns void
-           * @private
-           */
-          function _processQueueItems() {
-
-            if (scope.processingCount === scope.batchSize) {
-              return;
-            }
-
-            // if we have processed all files, either by successful
-            // upload, or attending to all messages, we deem the
-            // action complete, else continue processing files
-            scope.totalMessages = scope.processed.filter(e => e.messages.length > 0).length;
-
-            if (scope.totalQueued === scope.processed.length) {
-              if (scope.totalMessages === 0) {
-                if (scope.filesUploaded) {
-                  //queue is empty, trigger the done action
-                  scope.filesUploaded(scope.done);
-                }
-
-                //auto-clear the done queue after 3 secs
-                var currentLength = scope.processed.length;
-                $timeout(function () {
-                  scope.processed.splice(0, currentLength);
-                }, 3000);
-              }
-            } else if (scope.queue.length) {
-
-              var file = scope.queue.shift();
-              scope.processing.push(file);
-              _upload(file);
-
-              // If we still have items to process
-              // do so right away for parallel uploads
-              if (scope.queue.length > 0) {
-                _processQueueItems();
-              }
-            }
-          }
-
-          /**
-           * Upload a specific file and use the scope.contentTypeAlias for the type or fall back to letting
-           * the backend auto select a type.
-           * @param file
-           * @returns void
-           * @private
-           */
-          function _upload(file) {
-
-            if (!file) {
-              return;
-            }
-
-            if (file.$error) {
-                file.done = true;
-                scope.processed.push(file);
-                file.messages.push({type: "Error", header: "Error"});
-                return;
-            }
-
-            scope.propertyAlias = scope.propertyAlias ? scope.propertyAlias : "umbracoFile";
-            scope.contentTypeAlias = scope.contentTypeAlias ? scope.contentTypeAlias : "umbracoAutoSelect";
-
-            scope.processingCount++;
-
-            Upload.upload({
-              url: umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostAddFile"),
-              fields: {
-                'currentFolder': scope.parentId,
-                'contentTypeAlias': scope.contentTypeAlias,
-                'propertyAlias': scope.propertyAlias,
-                'path': file.path
-              },
-              file: file
-            })
-              .progress(function (evt) {
-                if (file.uploadStat !== "done" && file.uploadStat !== "error") {
-                  // calculate progress in percentage
-                  var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10);
-                  // set percentage property on file
-                  file.uploadProgress = progressPercentage;
-                }
-              })
-              .success(function (data, status, headers, config) {
-                // Set server messages
-                file.messages = data.notifications;
-                file.done = true;
-                scope.processed.push(file);
-                scope.processingCount--;
-                _processQueueItems();
-              })
-              .error(function (evt, status, headers, config) {
-                //if the service returns a detailed error
-                if (evt.InnerException) {
-                  file.messages.push({ message: evt.InnerException.ExceptionMessage, type: "Error" });
-                  //Check if its the common "too large file" exception
-                  if (evt.InnerException.StackTrace &&
-                    evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0) {
-                    file.messages.push({ message: "File too large to upload", type: "Error", header: "Error" });
-                  }
-                } else if (status === 413) {
-                  file.messages.push({ message: "File too large to upload", type: "Error", header: "Error" });
-                } else if (evt.Message) {
-                  file.messages.push({ message: evt.Message, type: "Error", header: "Error" });
-                } else if (evt && typeof evt === "string") {
-                  file.messages.push({ message: evt, type: "Error", header: "Error" });
-                } else if (status === 404) {
-                  // If file not found, server will return a 404 and display this message
-                  file.messages.push({ message: "File not found", type: "Error" });
-                } else if (status !== 200) {
-                  file.messages.push({ message: "An unknown error occurred", type: "Error", header: "Error" });
-                }
-
-                file.done = true;
-                scope.processed.push(file);
-                scope.processingCount--;
-                _processQueueItems();
-              });
-          }
-
-          /**
-           * Opens the media type dialog and lets the user choose a media type. If the queue is empty it will not show.
-           * @returns {boolean}
-           * @private
-           */
-          function _requestChooseMediaTypeDialog() {
-
-            if (scope.queue.length === 0) {
-              // if queue has no items so there is nothing to choose a type for
-              return false;
-            }
-
-            if (scope.acceptedMediatypes.length === 1) {
-              // if only one accepted type, then we wont ask to choose.
-              return false;
-            }
-
-            var uploadFileExtensions = scope.queue.map(file => mediaHelper.getFileExtension(file.name));
-
-            var filteredMediaTypes = mediaTypeHelper.getTypeAcceptingFileExtensions(scope.acceptedMediatypes, uploadFileExtensions);
-
-            var mediaTypesNotFile = filteredMediaTypes.filter(mediaType => mediaType.alias !== "File");
-
-            if (mediaTypesNotFile.length <= 1) {
-              // if only one  or less accepted types when we have filtered type 'file' out, then we wont ask to choose.
-              return false;
-            }
-
-            localizationService.localizeMany(["defaultdialogs_selectMediaType", "mediaType_autoPickMediaType"]).then(function (translations) {
-
-              filteredMediaTypes.push({
-                alias: "umbracoAutoSelect",
-                name: translations[1],
-                icon: "icon-wand"
-              });
-
-              const dialog = {
-                view: "itempicker",
-                filter: filteredMediaTypes.length > 8,
-                availableItems: filteredMediaTypes,
-                submit: function (model) {
-                  scope.contentTypeAlias = model.selectedItem.alias;
-                  _processQueueItems();
-
-                  overlayService.close();
-                },
-                close: function () {
-
-                  scope.queue.map(function (file) {
-                    file.messages.push({ message: "No files uploaded, no mediatype selected", type: "Error" });
-                  });
-                  scope.queue = [];
-
-                  overlayService.close();
-                }
-              };
-
-              dialog.title = translations[0];
-              overlayService.open(dialog);
-            });
-
-            return true; // yes, we did open the choose-media dialog, therefore we return true.
-          }
-
-          scope.dismissMessages = function (file) {
-            file.messages = [];
-            _processQueueItems();
-          }
-
-          scope.dismissAllMessages = function () {
-            Utilities.forEach(scope.processed, file => {
-              file.messages = [];
-            });
-            _processQueueItems();
-          }
-
-          scope.handleFiles = function (files, event, invalidFiles) {
-            const allFiles = [...files, ...invalidFiles];
-
-            // add unique key for each files to use in ng-repeats
-            Utilities.forEach(allFiles, file => {
-              file.key = String.CreateGuid();
-            });
-
-            if (scope.filesQueued) {
-              scope.filesQueued(allFiles, event);
-            }
-            _filesQueued(allFiles, event);
-          };
-        }
-      };
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js
deleted file mode 100644
index 60882a372f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbFileUpload
-* @function
-* @restrict A
-* @scope
-* @description
-*  Listens for file input control changes and emits events when files are selected for use in other controllers.
-**/
-function umbFileUpload() {
-    return {
-        restrict: "A",
-        scope: true,        //create a new scope
-        link: function (scope, el, attrs) {
-            el.on('change', function (event) {
-                var files = event.target.files;
-                //emit event upward
-                scope.$emit("filesSelected", { files: files });
-                //clear the element value - this allows us to pick the same file again and again
-                el.val('');
-            });
-
-            el.on('dragover dragenter', function () {
-                scope.$emit("isDragover", { value: true });
-            })
-            .on('dragleave dragend drop', function () {
-                scope.$emit("isDragover", { value: false });
-            });
-        }
-    };
-}
-
-angular.module('umbraco.directives').directive("umbFileUpload", umbFileUpload);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
deleted file mode 100644
index eebdb7c223..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js
+++ /dev/null
@@ -1,346 +0,0 @@
-(function() {
-    'use strict';
-
-    /**
-     * A component to manage file uploads for content properties
-     * @param {any} $scope
-     * @param {any} fileManager
-     * @param {any} mediaHelper
-     * @param {any} angularHelper
-     * @param {any} $attrs
-     * @param {any} notificationsService
-     */
-    function umbPropertyFileUploadController($scope, $q, fileManager, mediaHelper, angularHelper, $attrs, notificationsService) {
-
-        //NOTE: this component supports multiple files, though currently the uploader does not but perhaps sometime in the future
-        // we'd want it to, so i'll leave the multiple file support in place
-
-        var vm = this;
-
-        vm.$onInit = onInit;
-        vm.$onChanges = onChanges;
-        vm.$postLink = postLink;
-        vm.clear = clearFiles;
-
-        vm.readonly = false;
-
-        $attrs.$observe('readonly', (value) => {
-            vm.readonly = value !== undefined;
-        });
-
-        /** Clears the file collections when content is saving (if we need to clear) or after saved */
-        function clearFiles() {
-            //clear the files collection (we don't want to upload any!)
-            fileManager.setFiles({
-                propertyAlias: vm.propertyAlias,
-                culture: vm.culture,
-                segment: vm.segment,
-                files: []
-            });
-            //clear the current files
-            vm.files = [];
-
-            //notify the callback
-            notifyFilesSelected(null);
-            notifyFilesChanged(null);
-        }
-
-        function notifyFilesSelected(val, files) {
-
-            if (!val) {
-                val = null;
-            }
-            if (!files) {
-                files = null;
-            }
-
-            //notify the callback
-            vm.onFilesSelected({ value: val, files: files });
-
-            //need to explicity setDirty here to track changes
-            vm.fileUploadForm.$setDirty();
-        }
-
-        function notifyFilesChanged(files) {
-            if (!files) {
-                files = null;
-            }
-
-            //notify the callback
-            vm.onFilesChanged({ files: files });
-        }
-
-        function notifyInit(val, files) {
-            if (!val) {
-                val = null;
-            }
-            if (!files) {
-                files = null;
-            }
-
-            if (vm.onInit) {
-                vm.onInit({ value: val, files: files });
-            }
-        }
-
-        /** Called when the component initializes */
-        function onInit() {
-            $scope.$on("filesSelected", onFilesSelected);
-            $scope.$on("isDragover", isDragover);
-
-            initialize();
-        }
-
-        /** Called when the component has linked all elements, this is when the form controller is available */
-        function postLink() {
-
-        }
-
-        function initialize() {
-
-            //normalize culture to null if it's not there
-            if (!vm.culture) {
-                vm.culture = null;
-            }
-
-            //normalize segment to null if it's not there
-            if (!vm.segment) {
-                vm.segment = null;
-            }
-
-            // TODO: need to figure out what we can do for things like Nested Content
-
-            var existingClientFiles = checkPendingClientFiles();
-            //create the property to show the list of files currently saved
-            if (existingClientFiles.length > 0) {
-                updateModelFromSelectedFiles(existingClientFiles).then(function (newVal) {
-                    //notify the callback
-                    notifyInit(newVal, vm.files);
-                });
-            }
-            else if (vm.value) {
-
-                var files = vm.value.split(",");
-
-                vm.files = _.map(files, function (file) {
-                    var f = {
-                        fileName: file,
-                        fileSrc: file,
-                        isImage: mediaHelper.detectIfImageByExtension(file),
-                        extension: getExtension(file)
-                    };
-
-                    return f;
-                });
-
-                //notify the callback
-                notifyInit();
-            }
-            else {
-                vm.files = [];
-
-                //notify the callback
-                notifyInit();
-            }
-        }
-
-        function checkPendingClientFiles() {
-
-            //normalize culture to null if it's not there
-            if (!vm.culture) {
-                vm.culture = null;
-            }
-
-            //normalize segment to null if it's not there
-            if (!vm.segment) {
-                vm.segment = null;
-            }
-
-            //check the file manager to see if there's already local files pending for this editor
-            var existingClientFiles = _.map(
-                _.filter(fileManager.getFiles(),
-                    function (f) {
-                        return f.alias === vm.propertyAlias && f.culture === vm.culture && f.segment === vm.segment;
-                    }),
-                function (f) {
-                    return f.file;
-                });
-            return existingClientFiles;
-        }
-
-        /**
-         * Watch for model changes
-         * @param {any} changes
-         */
-        function onChanges(changes) {
-
-            if (changes.value && !changes.value.isFirstChange() && changes.value.currentValue !== changes.value.previousValue) {
-
-                if (!changes.value.currentValue && changes.value.previousValue) {
-                    //if the value has been cleared, clear the files (ignore if the previous value is also falsy)
-                    vm.files = [];
-                }
-                else if (changes.value.currentValue && !changes.value.previousValue && vm.files.length === 0) {
-                    //if a new value has been added after being cleared
-
-                    var existingClientFiles = checkPendingClientFiles();
-                    //create the property to show the list of files currently saved
-                    if (existingClientFiles.length > 0) {
-                        updateModelFromSelectedFiles(existingClientFiles).then(function () {
-                            //raise this event which means the files have changed but this wasn't the instance that
-                            //added the file
-                            notifyFilesChanged(vm.files);
-                        });
-                    }
-                }
-
-            }
-        }
-
-        function getExtension(fileName) {
-            var extension = fileName.substring(fileName.lastIndexOf(".") + 1, fileName.length);
-            return extension.toLowerCase();
-        }
-
-        /**
-         * Updates the vm.files model from the selected files and returns a promise containing the csv of all file names selected
-         * @param {any} files
-         */
-        function updateModelFromSelectedFiles(files) {
-
-            //we return a promise because the FileReader api is async
-            var promises = [];
-
-            //clear the current files
-            vm.files = [];
-            var newVal = "";
-
-            var reader = new FileReader();
-
-            //for each file load in the contents from the file reader and set it as an fileSrc
-            //property of the vm.files array item
-            var fileCount = files.length;
-            for (var i = 0; i < fileCount; i++) {
-                var index = i; //capture
-
-                var isImage = mediaHelper.detectIfImageByExtension(files[i].name);
-                var extension = getExtension(files[i].name);
-
-                var f = {
-                    isImage: isImage,
-                    extension: extension,
-                    fileName: files[i].name,
-                    isClientSide: true,
-                    fileData: files[i]
-                };
-
-                // Save the file object to the files collection
-                vm.files.push(f);
-
-                //special check for a comma in the name
-                newVal += files[i].name.split(',').join('-') + ",";
-
-                // TODO: I would love to remove this part. But I'm affright it would be breaking if removed. Its not used by File upload anymore as each preview handles the client-side data on their own.
-                if (isImage || extension === "svg") {
-
-                    var deferred = $q.defer();
-
-                    reader.onload = function(e) {
-                        vm.files[index].fileSrc = e.target.result;
-                        deferred.resolve(newVal);
-                    };
-                    promises.push(deferred.promise);
-                    reader.readAsDataURL(files[i]);
-                }
-                else {
-                    promises.push($q.when(newVal));
-                }
-            }
-
-            return $q.all(promises).then(function (p) {
-                //return the last value in the list of promises which will be the final value
-                return $q.when(p[p.length - 1]);
-            });
-        }
-
-        /**
-         * listen for when a file is selected
-         * @param {any} event
-         * @param {any} args
-         */
-        function onFilesSelected(event, args) {
-            if (vm.readonly) return;
-
-            if (args.files && args.files.length > 0) {
-
-                const filesAllowed = [];
-
-                for (let i = 0; i < args.files.length; i++) {
-                  if (fileManager.maxFileSize && args.files[i].size > fileManager.maxFileSize) {
-                    notificationsService.error(`File upload "${args.files[i].name}"`, `File size of ${args.files[i].size / 1000} KB exceeds the maximum allowed size of ${fileManager.maxFileSize / 1000} KB`);
-                  } else {
-                    filesAllowed.push(args.files[i]);
-                  }
-                }
-
-                //set the files collection
-                fileManager.setFiles({
-                    propertyAlias: vm.propertyAlias,
-                    files: filesAllowed,
-                    culture: vm.culture,
-                    segment: vm.segment
-                });
-
-                updateModelFromSelectedFiles(filesAllowed).then(function(newVal) {
-                    angularHelper.safeApply($scope,
-                        function() {
-                            //pass in the file names and the model files
-                            notifyFilesSelected(newVal, vm.files);
-                            notifyFilesChanged(vm.files);
-                        });
-                });
-            }
-            else {
-                angularHelper.safeApply($scope);
-            }
-        }
-
-        function isDragover(e, args) {
-            if (vm.readonly) return;
-
-            vm.dragover = args.value;
-            angularHelper.safeApply($scope);
-        }
-
-    };
-
-    var umbPropertyFileUploadComponent = {
-        templateUrl: 'views/components/upload/umb-property-file-upload.html',
-        bindings: {
-            culture: "@?",
-            segment: "@?",
-            propertyAlias: "@",
-            value: "<",
-            hideSelection: "<",
-            dragover: "<",
-            /**
-             * Called when a file is selected on this instance
-             */
-            onFilesSelected: "&",
-            /**
-             * Called when the file collection changes (i.e. a new file has been selected but maybe it wasn't this instance that caused the change)
-             */
-            onFilesChanged: "&",
-            onInit: "&",
-            required: "=",
-            acceptFileExt: "<?"
-        },
-        transclude: true,
-        controllerAs: 'vm',
-        controller: umbPropertyFileUploadController
-    };
-
-    angular.module("umbraco.directives")
-        .component('umbPropertyFileUpload', umbPropertyFileUploadComponent);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbsinglefileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbsinglefileupload.directive.js
deleted file mode 100644
index f1d21da877..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbsinglefileupload.directive.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:umbSingleFileUpload
-* @function
-* @restrict A
-* @scope
-* @description
-*  A single file upload field that will reset itself based on the object passed in for the rebuild parameter. This
-*  is required because the only way to reset an upload control is to replace it's html.
-**/
-function umbSingleFileUpload($compile) {
-
-    // cause we have the same template twice I choose to extract it to its own variable:
-    var innerTemplate = "<input type='file' umb-file-upload accept='{{acceptFileExt}}' ng-click='handleClick($event)' />";
-
-    return {
-        restrict: "E",
-        scope: {
-            rebuild: "=",
-            acceptFileExt: "<?"
-        },
-        replace: true,
-        template: "<div class='umb-single-file-upload'>"+innerTemplate+"</div>",
-        link: function (scope, el, attrs) {
-
-            scope.readonly = false;
-
-            scope.$watch("rebuild", function (newVal, oldVal) {
-                if (newVal && newVal !== oldVal) {
-                    //recompile it!
-                    el.html(innerTemplate);
-                    $compile(el.contents())(scope);
-                }
-            });
-
-            scope.handleClick = function ($event) {
-                if (scope.readonly) {
-                    $event.preventDefault();
-                    $event.stopPropagation();
-                }
-            };
-
-            attrs.$observe('readonly', (value) => {
-                scope.readonly = value !== undefined;
-            });
-
-        }
-    };
-}
-
-angular.module('umbraco.directives').directive("umbSingleFileUpload", umbSingleFileUpload);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
deleted file mode 100644
index 5429e70296..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
+++ /dev/null
@@ -1,152 +0,0 @@
-(function () {
-    'use strict';
-
-    function ChangePasswordController($scope) {
-
-        var vm = this;
-
-        vm.$onInit = onInit;
-        vm.$onDestroy = onDestroy;
-        vm.doChange = doChange;
-        vm.cancelChange = cancelChange;
-        vm.showOldPass = showOldPass;
-        vm.showCancelBtn = showCancelBtn;
-        vm.newPasswordKeyUp = newPasswordKeyUp;
-
-        var unsubscribe = [];
-
-        function resetModel(isNew) {
-            //the model config will contain an object, if it does not we'll create defaults
-            /*
-            {
-                hasPassword: true/false,
-                minPasswordLength: 10
-            }
-            */
-
-            //set defaults if they are not available
-            if (vm.config.disableToggle === undefined) {
-                vm.config.disableToggle = false;
-            }
-            if (vm.config.hasPassword === undefined) {
-                vm.config.hasPassword = false;
-            }
-            if (vm.config.minPasswordLength === undefined) {
-                vm.config.minPasswordLength = 0;
-            }
-
-            // Check non-alpha pwd settings for tooltip display
-            if (vm.config.minNonAlphaNumericChars === undefined) {
-                vm.config.minNonAlphaNumericChars = 0;
-            }
-
-            //set the model defaults
-            if (!Utilities.isObject(vm.passwordValues)) {
-                //if it's not an object then just create a new one
-                vm.passwordValues = {
-                    newPassword: null,
-                    oldPassword: null
-                };
-            }
-            else {
-                //just reset the values
-
-                if (!isNew) {
-                    //if it is new, then leave the generated pass displayed
-                    vm.passwordValues.newPassword = null;
-                    vm.passwordValues.oldPassword = null;
-                }
-            }
-
-            // set initial value for new password value
-            vm.passwordVal = vm.passwordValues.newPassword;
-
-            //the value to compare to match passwords
-            if (!isNew) {
-                vm.passwordValues.confirm = "";
-            }
-            else if (vm.passwordValues.newPassword && vm.passwordValues.newPassword.length > 0) {
-                //if it is new and a new password has been set, then set the confirm password too
-                vm.passwordValues.confirm = vm.passwordValues.newPassword;
-            }
-
-        }
-
-        //when the scope is destroyed we need to unsubscribe
-        function onDestroy() {
-            for (var u in unsubscribe) {
-                unsubscribe[u]();
-            }
-        }
-
-        function onInit() {
-            //listen for the saved event, when that occurs we'll
-            //change to changing = false;
-            unsubscribe.push($scope.$on("formSubmitted", function () {
-                if (vm.config.disableToggle === false) {
-                    vm.changing = false;
-                }
-            }));
-
-            unsubscribe.push($scope.$on("formSubmitting", function () {
-                if (!vm.changing) {
-                    //we are not changing, so the model needs to be null
-                    vm.passwordValues = null;
-                }
-            }));
-
-            resetModel(vm.isNew);
-
-            //if there is no password saved for this entity , it must be new so we do not allow toggling of the change password, it is always there
-            //with validators turned on.
-            vm.changing = vm.config.disableToggle === true || !vm.config.hasPassword;
-
-            //we're not currently changing so set the model to null
-            if (!vm.changing) {
-                vm.passwordValues = null;
-            }
-        }
-
-        function doChange() {
-            resetModel();
-            vm.changing = true;
-            vm.passwordValues.confirm = null;
-        };
-
-        function cancelChange() {
-            vm.changing = false;
-            //set model to null
-            vm.passwordValues = null;
-        };
-
-        function showOldPass() {
-            return vm.config.hasPassword &&
-                !vm.config.allowManuallyChangingPassword;
-        };
-
-        // TODO: I don't think we need this or the cancel button, this can be up to the editor rendering this component
-        function showCancelBtn() {
-            return vm.config.disableToggle !== true && vm.config.hasPassword;
-        };
-
-        function newPasswordKeyUp(event) {
-            vm.passwordVal = event.target.value;
-        }
-    }
-
-    var component = {
-        templateUrl: 'views/components/users/change-password.html',
-        controller: ChangePasswordController,
-        controllerAs: 'vm',
-        bindings: {
-            isNew: "<",
-            passwordValues: "=", //TODO: Do we need bi-directional vals?
-            config: "=" //TODO: Do we need bi-directional vals?
-            //TODO: Do we need callbacks?
-        }
-    };
-
-    angular.module('umbraco.directives').component('changePassword', component);
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/umbusergrouppreview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/umbusergrouppreview.directive.js
deleted file mode 100644
index fdbfd088ab..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/umbusergrouppreview.directive.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/** 
-@ngdoc directive
-@name umbraco.directives.directive:umbUserGroupPreview
-@restrict E
-@scope
-
-@description
-Use this directive to render a user group preview, where you can see the permissions the user or group has in the back office.
-
-<h3>Markup example</h3>
-<pre>
-    <div>
-        <umb-user-group-preview
-            ng-repeat="userGroup in vm.user.userGroups"
-            icon="userGroup.icon"
-            name="userGroup.name"
-            sections="userGroup.sections"
-            content-start-node="userGroup.contentStartNode"
-            media-start-node="userGroup.mediaStartNode"
-            allow-remove="!vm.user.isCurrentUser"
-            on-remove="vm.removeSelectedItem($index, vm.user.userGroups)">
-        </umb-user-group-preview>
-    </div>
-</pre>
-
-@param {string} icon (<code>binding</code>): The user group icon.
-@param {string} name (<code>binding</code>): The user group name.
-@param {array} sections (<code>binding</code>) Lists out the sections where the user has authority to edit.
-@param {string} contentStartNode (<code>binding</code>)
-<ul>
-    <li>The starting point in the tree of the content section.</li>
-    <li>So the user has no authority to work on other branches, only on this branch in the content section.</li>
-</ul>
-@param {boolean} hideContentStartNode (<code>binding</code>) Hides the contentStartNode.
-@param {string} mediaStartNode (<code>binding</code>)
-<ul>
-<li> The starting point in the tree of the media section.</li>
-<li> So the user has no authority to work on other branches, only on this branch in the media section.</li>
-</ul>
-@param {boolean} hideMediaStartNode (<code>binding</code>) Hides the mediaStartNode.
-@param {array} permissions (<code>binding<code>) A list of permissions, the user can have.
-@param {boolean} allowRemove (<code>binding</code>): Shows or Hides the remove button.
-@param {function} onRemove (<code>expression</code>): Callback function when the remove button is clicked.
-@param {boolean} allowEdit (<code>binding</code>): Shows or Hides the edit button.
-@param {function} onEdit (<code>expression</code>): Callback function when the edit button is clicked.
-**/
-
-
-(function () {
-    'use strict';
-
-    function UserGroupPreviewDirective() {
-
-        function link(scope, el, attr, ctrl) {
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/users/umb-user-group-preview.html',
-            scope: {
-                icon: "=?",
-                name: "=",
-                sections: "=?",
-                contentStartNode: "=?", 
-                hideContentStartNode: "@?",
-                mediaStartNode: "=?",
-                hideMediaStartNode: "@?",
-                permissions: "=?",
-                allowRemove: "=?",
-                allowEdit: "=?",
-                onRemove: "&?",
-                onEdit: "&?"
-            },
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbUserGroupPreview', UserGroupPreviewDirective);
-
-})();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/umbuserpreview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/umbuserpreview.directive.js
deleted file mode 100644
index 634decfa3d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/umbuserpreview.directive.js
+++ /dev/null
@@ -1,29 +0,0 @@
-(function () {
-    'use strict';
-
-    function UserPreviewDirective() {
-
-        function link(scope, el, attr, ctrl) {
-
-        }
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/components/users/umb-user-preview.html',
-            scope: {
-                avatars: "=?",
-                name: "=",
-                allowRemove: "=?",
-                onRemove: "&?"
-            },
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbUserPreview', UserPreviewDirective);
-
-})();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/autoscale.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/autoscale.directive.js
deleted file mode 100644
index 023692be86..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/util/autoscale.directive.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:autoScale
-* @element div
-* @function
-* @description
-* Resize div's automatically to fit to the bottom of the screen, as an optional parameter an y-axis offset can be set
-* So if you only want to scale the div to 70 pixels from the bottom you pass "70"
-
-* @example
-* <example module="umbraco.directives">
-*    <file name="index.html">
-*        <div auto-scale="70" class="input-block-level"></div>
-*    </file>
-* </example>
-**/
-
-angular.module("umbraco.directives")
-    .directive('autoScale', function ($window, $timeout, windowResizeListener) {
-        return function (scope, el, attrs) {
-
-            var totalOffset = 0;
-            var offsety = parseInt(attrs.autoScale, 10);
-            var window = $($window);
-            if (offsety !== undefined) {
-                totalOffset += offsety;
-            }
-
-            $timeout(function () {
-                setElementSize();
-            });
-
-            function setElementSize() {
-                el.height(window.height() - (el.offset().top + totalOffset));
-            }
-
-            var resizeCallback = function () {
-                setElementSize();
-            };
-
-            windowResizeListener.register(resizeCallback);
-
-            //ensure to unregister from all events and kill jquery plugins
-            scope.$on('$destroy', function () {
-                windowResizeListener.unregister(resizeCallback);
-            });
-
-        };
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/disabletabindex.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/disabletabindex.directive.js
deleted file mode 100644
index 03bccfdf74..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/util/disabletabindex.directive.js
+++ /dev/null
@@ -1,46 +0,0 @@
-angular.module("umbraco.directives")
-    .directive('disableTabindex', function (tabbableService) {
-
-        return {
-            restrict: 'A', //Can only be used as an attribute,
-            scope: {
-                "disableTabindex": "<"
-            },
-            link: function (scope, element, attrs) {
-
-                if (scope.disableTabindex) {
-                    //Select the node that will be observed for mutations (native DOM element not jQLite version)
-                    var targetNode = element[0];
-
-                    const domChange = function(mutationsList) {
-                        for (var mutation of mutationsList) {
-
-                            //DOM items have been added or removed
-                            if (mutation.type == 'childList') {
-
-                                //Check if any child items in mutation.target contain an input
-                                var childInputs = tabbableService.tabbable(mutation.target);
-
-                                //For each item in childInputs - override or set HTML attribute tabindex="-1"
-                                Utilities.forEach(childInputs, element => {
-                                    $(element).attr('tabindex', '-1');
-                                });
-                            }
-                        }
-                    }
-
-                    //Watch for DOM changes - so when the property editor subview loads in
-                    //We can be notified its updated the child elements inside the DIV we are watching
-                    var observer = new MutationObserver(domChange);
-
-                    // Options for the observer (which mutations to observe)
-                    var config = { attributes: true, childList: true, subtree: true };
-
-                    // Start observing the target node for configured mutations
-                    //GO GO GO
-                    observer.observe(targetNode, config);
-                }
-
-            }
-        };
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/getDomElement.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/getDomElement.directive.js
deleted file mode 100644
index 28a32665d7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/util/getDomElement.directive.js
+++ /dev/null
@@ -1,17 +0,0 @@
-angular.module("umbraco.directives").directive("retriveDomElement", function () {
-    var directiveDefinitionObject = {
-
-        restrict: "A",
-        selector: '[retriveDomElement]',
-        scope: {
-            "retriveDomElement": "&"
-        },
-        link: {
-            post: function (scope, iElement, iAttrs, controller) {
-                scope.retriveDomElement({ element: iElement, attributes: iAttrs });
-            }
-        }
-    };
-
-    return directiveDefinitionObject;
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/noPasswordManager.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/noPasswordManager.directive.js
deleted file mode 100644
index cbd02042bd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/util/noPasswordManager.directive.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:noPasswordManager
-* @attribte
-* @function
-* @description
-* Added attributes to tell password managers to ignore specific input fields and not inject elements via browser extensions.
-
-* @example
-* <example module="umbraco.directives">
-*    <file name="index.html">
-*        <input type="text" no-password-manager />
-*    </file>
-* </example>
-**/
-angular.module("umbraco.directives")
-    .directive('noPasswordManager', function () {
-        return {
-            restrict: 'A',            
-            link: function (scope, element, attrs) {                
-              element
-                .attr("data-lpignore", "true") // LastPass
-                .attr("data-1p-ignore", ""); // 1Password
-            }
-        }
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/retrieveDomElement.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/retrieveDomElement.directive.js
deleted file mode 100644
index 74b2639340..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/util/retrieveDomElement.directive.js
+++ /dev/null
@@ -1,17 +0,0 @@
-angular.module("umbraco.directives").directive("retrieveDomElement", function () {
-  var directiveDefinitionObject = {
-
-    restrict: "A",
-    selector: '[retrieveDomElement]',
-    scope: {
-        "retrieveDomElement": "&"
-    },
-    link: {
-        post: function(scope, iElement, iAttrs, controller) {
-            scope.retrieveDomElement({element:iElement, attributes: iAttrs});
-        }
-    }
-  };
-
-  return directiveDefinitionObject;
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/umbDroppable.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/umbDroppable.directive.js
deleted file mode 100644
index 5b4719edc0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/util/umbDroppable.directive.js
+++ /dev/null
@@ -1,12 +0,0 @@
-angular.module("umbraco.directives")
-    .directive('umbDroppable', function ($timeout) {
-        return {
-            restrict: 'A',
-            link: function (scope, element, attrs) {
-                $timeout(() => {
-                    const options = scope.$eval(attrs.umbDroppable)
-                    element.droppable(options);
-                });
-            }
-        }
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/umbisolateform.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/umbisolateform.directive.js
deleted file mode 100644
index f885a596e1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/util/umbisolateform.directive.js
+++ /dev/null
@@ -1,10 +0,0 @@
-angular.module("umbraco.directives")
-    .directive('umbIsolateForm', function () {
-        return {
-            restrict: 'A',
-            require: ['form', '^form'],
-            link: function (scope, element, attrs, forms) {
-                forms[1].$removeControl(forms[0]);
-            }
-        }
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js
deleted file mode 100644
index 7658b4e043..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
-@ngdoc directive
-@name umbraco.directives.directive:umbKeyboardList
-@restrict E
-
-@description
-<b>Added in versions 7.7.0</b>: Use this directive to add arrow up and down keyboard shortcuts to a list. Use this together with the {@link umbraco.directives.directive:umbDropdown umbDropdown} component to make easy accessible dropdown menus.
-
-<h3>Markup example</h3>
-<pre>
-    <div>
-        <ul umb-keyboard-list>
-            <li><button type="button" class="btn-reset">Item 1</button></li>
-            <li><button type="button" class="btn-reset">Item 2</button></li>
-            <li><button type="button" class="btn-reset">Item 3</button></li>
-            <li><button type="button" class="btn-reset">Item 4</button></li>
-            <li><button type="button" class="btn-reset">Item 5</button></li>
-            <li><button type="button" class="btn-reset">Item 6</button></li>
-        </ul>
-    </div>
-</pre>
-
-<h3>Use in combination with</h3>
-<ul>
-    <li>{@link umbraco.directives.directive:umbDropdown umbDropdown}</li>
-</ul>
-
-**/
-
-angular.module('umbraco.directives')
-    .directive('umbKeyboardList', ['$document', '$timeout', function ($document, $timeout) {
-
-        return {
-            restrict: 'A',
-            link: function (scope, element) {
-
-                var listItems = [];
-                var currentIndex = 0;
-                var focusSet = false;
-
-                $timeout(function() {
-                    // get list of all links in the list
-                    listItems = element.find("li :tabbable");
-                });
-
-                // Handle keydown events
-                function keydown(event) {
-                    $timeout(function() {
-                        checkFocus();
-                        // arrow down
-                        if (event.keyCode === 40) {
-                            arrowDown();
-                        }
-                        // arrow up
-                        if (event.keyCode === 38) {
-                            arrowUp();
-                        }
-                    });
-                }
-
-                function checkFocus() {
-                    var found = false;
-
-                    // check if any element has focus
-                    Utilities.forEach(listItems, (item, index) => {
-                        if ($(item).is(":focus")) {
-                            // if an element already has focus set the
-                            // currentIndex so we navigate from that element
-                            currentIndex = index;
-                            focusSet = true;
-                            found = true;
-                        }
-                    });
-
-                    // If we don't find an element with focus we reset the currentIndex and the focusSet flag
-                    // we do this because you can have navigated away from the list with tab and we want to reset it if you navigate back
-                    if (!found) {
-                        currentIndex = 0;
-                        focusSet = false;
-                    }
-                }
-
-                function arrowDown() {
-                    if (currentIndex < listItems.length - 1) {
-                        // only bump the current index if the focus is already
-                        // set else we just want to focus the first element
-                        if (focusSet) {
-                            currentIndex++;
-                        }
-                        listItems[currentIndex].trigger("focus");
-                        focusSet = true;
-                    }
-                }
-
-                function arrowUp() {
-                    if (currentIndex > 0) {
-                        currentIndex--;
-                        listItems[currentIndex].trigger("focus");
-                    }
-                }
-
-                // Stop to listen typing.
-                function stopListening() {
-                    $document.off('keydown', keydown);
-                }
-
-                // Start listening to key typing.
-                $document.on('keydown', keydown);
-
-                // Stop listening when scope is destroyed.
-                scope.$on('$destroy', stopListening);
-            }
-        };
-    }]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/umboverflowchecker.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/umboverflowchecker.directive.js
deleted file mode 100644
index 076ae4b311..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/util/umboverflowchecker.directive.js
+++ /dev/null
@@ -1,49 +0,0 @@
-angular.module("umbraco.directives")
-    .directive('umbOverflowChecker', function ($parse, $timeout, windowResizeListener) {
-        return {
-          restrict: 'A',
-          link: function (scope, element, attrs) {
-            const overflow = $parse(attrs.onOverflow);
-
-            const scrollElement = element[0];
-            const container = element[0].parentElement;
-
-            function checkOverflow () {
-              $timeout(() => {
-                const scrollElementScrollWidth = scrollElement.scrollWidth;
-                const containerScrollWidth = container.scrollWidth;
-
-                const overflowLeft = scrollElement.scrollLeft;
-                const overflowRight = containerScrollWidth - scrollElementScrollWidth + overflowLeft;
-
-                scope.$evalAsync(() => overflow(scope, {overflowLeft, overflowRight}));
-              }, 50);
-            }
-
-            function scrollTo (event, options) {
-              $timeout(() => {
-                if (options.position === 'end') {
-                  scrollElement.scrollLeft = scrollElement.scrollWidth - scrollElement.clientWidth;
-                }
-
-                if (options.position === 'start') {
-                  scrollElement.scrollLeft = 0;
-                }
-              }, 50);
-            }
-
-            scrollElement.addEventListener('scroll', checkOverflow);
-            windowResizeListener.register(checkOverflow);
-
-            scope.$on('$destroy', () => {
-              scrollElement.removeEventListener('scroll', checkOverflow);
-              windowResizeListener.unregister(checkOverflow);
-            });
-
-            scope.$on('umbOverflowChecker.checkOverflow', checkOverflow);
-            scope.$on('umbOverflowChecker.scrollTo', scrollTo);
-
-            checkOverflow();
-          }
-        }
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
deleted file mode 100644
index 31ef125511..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:noDirtyCheck
-* @restrict A
-* @description Can be attached to form inputs to prevent them from setting the form as dirty (https://stackoverflow.com/questions/17089090/prevent-input-from-setting-form-dirty-angularjs)
-**/
-function noDirtyCheck() {
-    return {
-        restrict: 'A',
-        require: 'ngModel',
-        link: function (scope, elm, attrs, ctrl) {
-
-            // if "no-dirty-check" attribute is explicitly falsy, then skip and use default behaviour. In all other cases we consider it truthy
-            var skipNoDirtyCheck = attrs.noDirtyCheck === '0' || attrs.noDirtyCheck === 0 || attrs.noDirtyCheck.toString().toLowerCase() === 'false';
-            if (skipNoDirtyCheck)
-                return;
-
-            var alwaysFalse = {
-                get: function () { return false; },
-                set: function () { }
-            };
-
-            Object.defineProperty(ctrl, '$pristine', alwaysFalse);
-            Object.defineProperty(ctrl, '$dirty', alwaysFalse);
-        }
-    };
-}
-angular.module('umbraco.directives.validation').directive("noDirtyCheck", noDirtyCheck);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/showvalidationonsubmit.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/showvalidationonsubmit.directive.js
deleted file mode 100644
index ad646748b7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/showvalidationonsubmit.directive.js
+++ /dev/null
@@ -1,48 +0,0 @@
-(function () {
-    "use strict";
-
-    function showValidationOnSubmit(serverValidationManager) {
-        return {
-            require: ["ngMessages", "^^?valFormManager"],
-            restrict: "A",
-            scope: {
-                form: "=?"
-            },
-            link: function (scope, element, attr, ctrl) {
-
-                var formMgr = ctrl.length > 1 ? ctrl[1] : null;
-                const hiddenClass = 'ng-hide';
-
-                //We can either get the form submitted status by the parent directive valFormManager
-                //or we can check upwards in the DOM for the css class... lets try both :)
-                //The initial hidden state can't always be hidden because when we switch variants in the content editor we cannot
-                //reset the status.
-                var submitted = element.closest(".show-validation").length > 0 || (formMgr && formMgr.showValidation);
-                if (!submitted) {
-                    element[0].classList.add(hiddenClass);
-                }
-
-                var unsubscribe = [];
-
-                unsubscribe.push(scope.$on("formSubmitting", function (ev, args) {
-                    element[0].classList.remove(hiddenClass);
-                }));
-
-                unsubscribe.push(scope.$on("formSubmitted", function (ev, args) {
-                    element[0].classList.add(hiddenClass);
-                }));
-
-                //no isolate scope to listen to element destroy
-                element.on('$destroy', function () {
-                    for (var u in unsubscribe) {
-                        unsubscribe[u]();
-                    }
-                });
-
-            }
-        };
-    }
-
-    angular.module('umbraco.directives.validation').directive("showValidationOnSubmit", showValidationOnSubmit);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/umbsetdirtyonchange.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/umbsetdirtyonchange.directive.js
deleted file mode 100644
index d4e77eda05..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/umbsetdirtyonchange.directive.js
+++ /dev/null
@@ -1,45 +0,0 @@
-(function() {
-    'use strict';
-
-    function SetDirtyOnChange() {
-
-        function link(scope, el, attr, ctrls) {
-
-            var formCtrl = ctrls[0];
-            
-            if (ctrls.length > 1 && ctrls[1]) {
-                //if an ngModel is supplied, assign a render function which is called when the model is changed
-                var modelCtrl = ctrls[1];
-                var oldRender = modelCtrl.$render;
-                modelCtrl.$render = function () {
-                    formCtrl.$setDirty();
-                    //call any previously set render method
-                    if (oldRender) {
-                        oldRender();
-                    }
-                }
-            }
-            else {
-                var initValue = attr.umbSetDirtyOnChange;
-                
-                attr.$observe("umbSetDirtyOnChange", function (newValue) {
-                    if(newValue !== initValue) {
-                        formCtrl.$setDirty();
-                    }
-                });
-            }
-
-        }
-
-        var directive = {
-            require: ["^^form", "?ngModel"],
-            restrict: 'A',
-            link: link
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('umbSetDirtyOnChange', SetDirtyOnChange);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valHighlight.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valHighlight.directive.js
deleted file mode 100644
index 9182441f8b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valHighlight.directive.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:valHighlight
-* @restrict A
-* @description Used on input fields when you want to signal that they are in error, this will highlight the item for 1 second
-**/
-function valHighlight($timeout) {
-    return {
-        restrict: "A",
-        link: function (scope, element, attrs, ctrl) {
-
-            attrs.$observe("valHighlight", function (newVal) {
-                if (newVal === "true") {
-                    element.addClass("highlight-error");
-                    $timeout(function () {
-                        //set the bound scope property to false
-                        scope[attrs.valHighlight] = false;
-                    }, 1000);
-                }
-                else {
-                    element.removeClass("highlight-error");
-                }
-            });
-
-        }
-    };
-}
-angular.module('umbraco.directives.validation').directive("valHighlight", valHighlight);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valcompare.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valcompare.directive.js
deleted file mode 100644
index 82a539c0ce..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valcompare.directive.js
+++ /dev/null
@@ -1,24 +0,0 @@
-angular.module('umbraco.directives.validation')
-	.directive('valCompare',function () {
-	return {
-	        require: ["ngModel", "^^form"], 
-	        link: function (scope, elem, attrs, ctrls) {
-
-                var ctrl = ctrls[0];
-                var formCtrl = ctrls[1];
-          
-                var otherInput = formCtrl[attrs.valCompare];
-
-                //normal validator on the original source
-                ctrl.$validators.valCompare = function(modelValue, viewValue) {
-                    return viewValue === otherInput.$viewValue;
-                };
-
-                //custom parser on the destination source with custom validation applied to the original source
-	            otherInput.$parsers.push(function(value) {
-	                ctrl.$setValidity("valCompare", value === ctrl.$viewValue);
-	                return value;
-	            });
-	        }
-	};
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valemail.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valemail.directive.js
deleted file mode 100644
index c70fd5c589..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valemail.directive.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
-    * @ngdoc directive
-    * @name umbraco.directives.directive:valEmail
-    * @restrict A
-    * @description A custom directive to validate an email address string, this is required because angular's default validator is incorrect.
-    **/
-function valEmail(valEmailExpression) {
-   
-    return {
-        require: 'ngModel',
-        restrict: "A",
-        link: function (scope, elm, attrs, ctrl) {
-
-            function patternValidator(viewValue) {
-                //NOTE: we don't validate on empty values, use required validator for that
-                if (!viewValue || valEmailExpression.EMAIL_REGEXP.test(viewValue)) {
-                    //assign a message to the validator
-                    ctrl.errorMsg = "";
-                    return true;
-                }
-                else {
-                    //assign a message to the validator
-                    ctrl.errorMsg = "Invalid email";
-                    return false;
-                }
-            };
-
-            //if there is an attribute: type="email" then we need to remove the built in validator
-            // this isn't totally required but it gives us the ability to completely control the validation syntax so we don't
-            // run into old problems like http://issues.umbraco.org/issue/U4-8445
-            if (attrs.type === "email") {
-                ctrl.$validators = {};
-            }
-
-            ctrl.$validators.valEmail = function(modelValue, viewValue) {
-                return patternValidator(viewValue);
-            };
-
-        }
-    };
-}
-
-angular.module('umbraco.directives.validation')
-    .directive("valEmail", valEmail)
-    .factory('valEmailExpression', function () {
-        var emailRegex = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
-        return {
-            EMAIL_REGEXP: emailRegex
-        };
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
deleted file mode 100644
index d8ad5f8243..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
+++ /dev/null
@@ -1,300 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:valFormManager
-* @restrict A
-* @require formController
-* @description Used to broadcast an event to all elements inside this one to notify that form validation has
-* changed. If we don't use this that means you have to put a watch for each directive on a form's validation
-* changing which would result in much higher processing. We need to actually watch the whole $error collection of a form
-* because just watching $valid or $invalid doesn't acurrately trigger form validation changing.
-* This also sets the show-validation (or a custom) css class on the element when the form is invalid - this lets
-* us css target elements to be displayed when the form is submitting/submitted.
-* Another thing this directive does is to ensure that any .control-group that contains form elements that are invalid will
-* be marked with the 'error' css class. This ensures that labels included in that control group are styled correctly.
-**/
-function valFormManager(serverValidationManager, $rootScope, $timeout, $location, overlayService, eventsService, $routeParams, navigationService, editorService, localizationService, angularHelper) {
-
-    var SHOW_VALIDATION_CLASS_NAME = "show-validation";
-    var SHOW_VALIDATION_Type_CLASS_NAME = "show-validation-type-";
-    var SAVING_EVENT_NAME = "formSubmitting";
-    var SAVED_EVENT_NAME = "formSubmitted";
-
-    function notify(scope) {
-        scope.$broadcast("valStatusChanged", { form: scope.formCtrl });
-    }
-
-    function ValFormManagerController($scope) {
-        //This exposes an API for direct use with this directive
-
-        // We need this as a way to reference this directive in the scope chain. Since this directive isn't a component and
-        // because it's an attribute instead of an element, we can't use controllerAs or anything like that. Plus since this is
-        // an attribute an isolated scope doesn't work so it's a bit weird. By doing this we are able to lookup the parent valFormManager
-        // in the scope hierarchy even if the DOM hierarchy doesn't match (i.e. in infinite editing)
-        $scope.valFormManager = this;
-
-        var unsubscribe = [];
-        var self = this;
-
-        //This is basically the same as a directive subscribing to an event but maybe a little
-        // nicer since the other directive can use this directive's API instead of a magical event
-        this.onValidationStatusChanged = function (cb) {
-            unsubscribe.push($scope.$on("valStatusChanged", function (evt, args) {
-                cb.apply(self, [evt, args]);
-            }));
-        };
-
-        this.isShowingValidation = () => $scope.showValidation === true;
-
-        this.getValidationMessageType = () => $scope.valMsgType;
-
-        this.notify = notify;
-
-        this.isValid = function () {
-            return !$scope.formCtrl.$invalid;
-        }
-
-        //Ensure to remove the event handlers when this instance is destroyted
-        $scope.$on('$destroy', function () {
-            for (var u in unsubscribe) {
-                unsubscribe[u]();
-            }
-        });
-    }
-
-    /**
-     * Find's the valFormManager in the scope/DOM hierarchy
-     * @param {any} scope
-     * @param {any} ctrls
-     * @param {any} index
-     */
-    function getAncestorValFormManager(scope, ctrls, index) {
-
-        // first check the normal directive inheritance which relies on DOM inheritance
-        var found = ctrls[index];
-        if (found) {
-            return found;
-        }
-
-        // not found, then fallback to searching the scope chain, this may be needed when DOM inheritance isn't maintained but scope
-        // inheritance is (i.e.infinite editing)
-        found = angularHelper.traverseScopeChain(scope, s => s && s.valFormManager && s.valFormManager.constructor.name === "ValFormManagerController");
-        return found ? found.valFormManager : null;
-    }
-
-    return {
-        require: ["form", "^^?valFormManager", "^^?valSubView"],
-        restrict: "A",
-        controller: ValFormManagerController,
-        link: function (scope, element, attr, ctrls) {
-
-            function notifySubView() {
-                if (subView) {
-                    subView.valStatusChanged({ form: formCtrl, showValidation: scope.showValidation });
-                }
-            }
-
-            var formCtrl = scope.formCtrl = ctrls[0];
-            var parentFormMgr = scope.parentFormMgr = getAncestorValFormManager(scope, ctrls, 1);
-            var subView = ctrls.length > 1 ? ctrls[2] : null;
-            var labels = {};
-            var valMsgType = 2;// error
-
-            var labelKeys = [
-                "prompt_unsavedChanges",
-                "prompt_unsavedChangesWarning",
-                "prompt_discardChanges",
-                "prompt_stay"
-            ];
-
-            localizationService.localizeMany(labelKeys).then(function (values) {
-                labels.unsavedChangesTitle = values[0];
-                labels.unsavedChangesContent = values[1];
-                labels.discardChangesButton = values[2];
-                labels.stayButton = values[3];
-            });
-
-            var lastValidationMessageType = null;
-            function setValidationMessageType(type) {
-
-                removeValidationMessageType();
-                scope.valMsgType = type;
-
-                // overall a copy of message types from notifications.service:
-                var postfix = "";
-                switch(type) {
-                    case 0:
-                        //save
-                        break;
-                    case 1:
-                        //info
-                        postfix = "info";
-                        break;
-                    case 2:
-                        //error
-                        postfix = "error";
-                        break;
-                    case 3:
-                        //success
-                        postfix = "success";
-                        break;
-                    case 4:
-                        //warning
-                        postfix = "warning";
-                        break;
-                }
-                var cssClass = SHOW_VALIDATION_Type_CLASS_NAME+postfix;
-                element.addClass(cssClass);
-                lastValidationMessageType = cssClass;
-            }
-            function removeValidationMessageType() {
-                if(lastValidationMessageType) {
-                    element.removeClass(lastValidationMessageType);
-                    lastValidationMessageType = null;
-                }
-            }
-
-            // watch the list of validation errors to notify the application of any validation changes
-            scope.$watch(() => formCtrl.$invalid,
-                function (e) {
-
-                    notify(scope);
-
-                    notifySubView();
-
-                    //find all invalid elements' .control-group's and apply the error class
-                    var inError = element.find(".control-group .ng-invalid").closest(".control-group");
-                    inError.addClass("error");
-
-                    //find all control group's that have no error and ensure the class is removed
-                    var noInError = element.find(".control-group .ng-valid").closest(".control-group").not(inError);
-                    noInError.removeClass("error");
-
-                });
-
-            //This tracks if the user is currently saving a new item, we use this to determine
-            // if we should display the warning dialog that they are leaving the page - if a new item
-            // is being saved we never want to display that dialog, this will also cause problems when there
-            // are server side validation issues.
-            var isSavingNewItem = false;
-
-            //we should show validation if there are any msgs in the server validation collection
-            if (serverValidationManager.items.length > 0 || (parentFormMgr && parentFormMgr.isShowingValidation())) {
-                element.addClass(SHOW_VALIDATION_CLASS_NAME);
-                scope.showValidation = true;
-                var parentValMsgType = parentFormMgr ? parentFormMgr.getValidationMessageType() : 2;
-                setValidationMessageType(parentValMsgType || 2);
-                notifySubView();
-            }
-
-            var unsubscribe = [];
-
-            //listen for the forms saving event
-            unsubscribe.push(scope.$on(SAVING_EVENT_NAME, function (ev, args) {
-
-                var messageType = 2;//error
-                switch (args.action) {
-                    case "save":
-                        messageType = 4;//warning
-                    break;
-                }
-                element.addClass(SHOW_VALIDATION_CLASS_NAME);
-                scope.showValidation = true;
-                setValidationMessageType(messageType);
-                notifySubView();
-                //set the flag so we can check to see if we should display the error.
-                isSavingNewItem = $routeParams.create;
-            }));
-
-            //listen for the forms saved event
-            unsubscribe.push(scope.$on(SAVED_EVENT_NAME, function (ev, args) {
-                //remove validation class
-                element.removeClass(SHOW_VALIDATION_CLASS_NAME);
-                removeValidationMessageType();
-                scope.showValidation = false;
-                notifySubView();
-            }));
-
-            var confirmed = false;
-
-            //This handles the 'unsaved changes' dialog which is triggered when a route is attempting to be changed but
-            // the form has pending changes
-            var locationEvent = $rootScope.$on('$locationChangeStart', function (event, nextLocation, currentLocation) {
-
-                var infiniteEditors = editorService.getEditors();
-
-                if (!formCtrl.$dirty && infiniteEditors.length === 0 || isSavingNewItem && infiniteEditors.length === 0) {
-                    return;
-                }
-
-                var nextPath = nextLocation.split("#")[1];
-
-                if (nextPath && !confirmed) {
-
-                    if (navigationService.isRouteChangingNavigation(currentLocation, nextLocation)) {
-
-                        if (nextPath.indexOf("%253") || nextPath.indexOf("%252")) {
-                            nextPath = decodeURIComponent(nextPath);
-                        }
-
-                        // Open discard changes overlay
-                        var overlay = {
-                            "view": "default",
-                            "title": labels.unsavedChangesTitle,
-                            "content": labels.unsavedChangesContent,
-                            "disableBackdropClick": true,
-                            "disableEscKey": true,
-                            "submitButtonLabel": labels.stayButton,
-                            "closeButtonLabel": labels.discardChangesButton,
-                            submit: function () {
-                                overlayService.close();
-                            },
-                            close: function () {
-                                // close all editors
-                                editorService.closeAll();
-                                // allow redirection
-                                navigationService.clearSearch();
-                                //we need to break the path up into path and query
-                                var parts = nextPath.split("?");
-                                var query = {};
-                                if (parts.length > 1) {
-                                    parts[1].split("&").forEach(q => {
-                                        var keyVal = q.split("=");
-                                        query[keyVal[0]] = keyVal[1];
-                                    });
-                                }
-                                $location.path(parts[0]).search(query);
-                                overlayService.close();
-                                confirmed = true;
-                            }
-                        };
-
-                        overlayService.open(overlay);
-
-                        //prevent the route!
-                        event.preventDefault();
-
-                        //raise an event
-                        eventsService.emit("valFormManager.pendingChanges", true);
-                    }
-                }
-
-            });
-            unsubscribe.push(locationEvent);
-
-            //Ensure to remove the event handler when this instance is destroyted
-            scope.$on('$destroy', function () {
-                for (var u in unsubscribe) {
-                    unsubscribe[u]();
-                }
-            });
-
-            // TODO: I'm unsure why this exists, i believe this may be a hack for something like tinymce which might automatically
-            // change a form value on load but we need it to be $pristine?
-            $timeout(function () {
-                formCtrl.$setPristine();
-            }, 1000);
-
-        }
-    };
-}
-angular.module('umbraco.directives.validation').directive("valFormManager", valFormManager);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valmulti.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valmulti.directive.js
deleted file mode 100644
index 1aca4c2528..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valmulti.directive.js
+++ /dev/null
@@ -1,27 +0,0 @@
-(function () {
-    /**
-    * @ngdoc directive
-    * @name umbraco.directives.directive:multi
-    * @restrict A
-    * @description Used on input fields when you want to validate multiple fields at once.
-    **/
-    function multi($parse, $rootScope) {
-        return {
-            restrict: 'A',
-            require: 'ngModel',
-            link: function (scope, elem, attrs, ngModelCtrl) {
-                var validate = $parse(attrs.multi)(scope);
-                ngModelCtrl.$viewChangeListeners.push(function () {
-                    // ngModelCtrl.$setValidity('multi', validate());
-                    $rootScope.$broadcast('multi:valueChanged');
-                });
-
-                var deregisterListener = scope.$on('multi:valueChanged', function (event) {
-                    ngModelCtrl.$setValidity('multi', validate());
-                });
-                scope.$on('$destroy', deregisterListener); // optional, only required for $rootScope.$on
-            }
-        };
-    }
-    angular.module('umbraco.directives.validation').directive('multi', ['$parse', '$rootScope', multi]);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
deleted file mode 100644
index 86afda1233..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
+++ /dev/null
@@ -1,357 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:valPropertyMsg
-* @restrict A
-* @element textarea
-* @requires formController
-* @description This directive is used to control the display of the property level validation message.
-* We will listen for server side validation changes
-* and when an error is detected for this property we'll show the error message.
-* In order for this directive to work, the valFormManager directive must be placed on the containing form.
-* We don't set the validity of this validator to false when client side validation fails, only when server side
-* validation fails however we do respond to the client side validation changes to display error and adjust UI state.
-**/
-function valPropertyMsg(serverValidationManager, localizationService, angularHelper) {
-
-    return {
-        require: ['^^form', '^^valFormManager', '^^umbProperty', '?^^umbVariantContent', '?^^valPropertyMsg'],
-        replace: true,
-        restrict: "E",
-        template: "<div ng-show=\"errorMsg != ''\" class='alert alert-error property-error' >{{errorMsg}}</div>",
-        scope: {},
-        link: function (scope, element, attrs, ctrl) {
-
-            var unsubscribe = [];
-            var watcher = null;
-            var hasError = false; // tracks if there is a child error or an explicit error
-
-            //create properties on our custom scope so we can use it in our template
-            scope.errorMsg = "";
-
-            //the property form controller api
-            var formCtrl = ctrl[0];
-            //the valFormManager controller api
-            var valFormManager = ctrl[1];
-            //the property controller api
-            var umbPropCtrl = ctrl[2];
-            //the variants controller api
-            var umbVariantCtrl = ctrl[3];
-
-            var currentProperty = umbPropCtrl.property;
-            scope.currentProperty = currentProperty;
-
-            var currentCulture = currentProperty.culture;
-            var currentSegment = currentProperty.segment;
-
-            // validation object won't exist when editor loads outside the content form (ie in settings section when modifying a content type)
-            var isMandatory = currentProperty.validation ? currentProperty.validation.mandatory : undefined;
-
-            var labels = {};
-            var showValidation = false;
-
-            if (umbVariantCtrl) {
-                //if we are inside of an umbVariantContent directive
-
-                var currentVariant = umbVariantCtrl.editor.content;
-
-                // Lets check if we have variants and we are on the default language then ...
-                if (umbVariantCtrl.content.variants.length > 1 && (!currentVariant.language || !currentVariant.language.isDefault) && !currentCulture && !currentSegment && !currentProperty.unlockInvariantValue) {
-                    //This property is locked cause its a invariant property shown on a non-default language.
-                    //Therefor do not validate this field.
-                    return;
-                }
-            }
-
-            // if we have reached this part, and there is no culture, then lets fallback to invariant. To get the validation feedback for invariant language.
-            currentCulture = currentCulture || "invariant";
-
-            // Gets the error message to display
-            function getErrorMsg() {
-                //this can be null if no property was assigned
-                if (scope.currentProperty) {
-                    //first try to get the error msg from the server collection
-                    var err = serverValidationManager.getPropertyError(umbPropCtrl.getValidationPath(), null, "", null);
-                    //if there's an error message use it
-                    if (err && err.errorMsg) {
-                        return err.errorMsg;
-                    }
-                    else {
-                        return scope.currentProperty.propertyErrorMessage ? scope.currentProperty.propertyErrorMessage : labels.propertyHasErrors;
-                    }
-
-                }
-                return labels.propertyHasErrors;
-            }
-
-            // check the current errors in the form (and recursive sub forms), if there is 1 or 2 errors
-            // we can check if those are valPropertyMsg or valServer and can clear our error in those cases.
-            function checkAndClearError() {
-
-                var errCount = angularHelper.countAllFormErrors(formCtrl);
-
-                if (errCount === 0) {
-                    return true;
-                }
-
-                if (errCount > 2) {
-                    return false;
-                }
-
-                var hasValServer = Utilities.isArray(formCtrl.$error.valServer);
-                if (errCount === 1 && hasValServer) {
-                    return true;
-                }
-
-                var hasOwnErr = hasExplicitError();
-                if ((errCount === 1 && hasOwnErr) || (errCount === 2 && hasOwnErr && hasValServer)) {
-
-                    var propertyValidationPath = umbPropCtrl.getValidationPath();
-                    // check if we can clear it based on child server errors, if we are the only explicit one remaining we can clear ourselves
-                    if (isLastServerError(propertyValidationPath)) {
-                        serverValidationManager.removePropertyError(propertyValidationPath, currentCulture, "", currentSegment);
-                        return true;
-                    }
-                    return false;
-                }
-
-                return false;
-            }
-
-            // returns true if there is an explicit valPropertyMsg validation error on the form
-            function hasExplicitError() {
-                return Utilities.isArray(formCtrl.$error.valPropertyMsg);
-            }
-
-            // returns true if there is only a single server validation error for this property validation key in it's validation path
-            function isLastServerError(propertyValidationPath) {
-                var nestedErrs = serverValidationManager.getPropertyErrorsByValidationPath(
-                    propertyValidationPath,
-                    currentCulture,
-                    currentSegment,
-                    { matchType: "prefix" });
-                if (nestedErrs.length === 0 || (nestedErrs.length === 1 && nestedErrs[0].propertyAlias === propertyValidationPath)) {
-
-                    return true;
-                }
-                return false;
-            }
-
-            // a custom $validator function called on when each child ngModelController changes a value.
-            function resetServerValidityValidator(fieldController) {
-                const storedFieldController = fieldController; // pin a reference to this
-                return (modelValue, viewValue) => {
-                    // if the ngModelController value has changed, then we can check and clear the error
-                    if (storedFieldController.$dirty) {
-                        if (checkAndClearError()) {
-                            resetError();
-                        }
-                    }
-                    return true; // this validator is always 'valid'
-                };
-            }
-
-            // collect all ng-model controllers recursively within the umbProperty form 
-            // until it reaches the next nested umbProperty form
-            function collectAllNgModelControllersRecursively(controls, ngModels) {
-                controls.forEach(ctrl => {
-                    if (angularHelper.isForm(ctrl)) {
-                        // if it's not another umbProperty form then recurse
-                        if (ctrl.$name !== formCtrl.$name) {
-                            collectAllNgModelControllersRecursively(ctrl.$getControls(), ngModels);
-                        }
-                    }
-                    else if (Object.prototype.hasOwnProperty.call(ctrl, '$modelValue') && Utilities.isObject(ctrl.$validators)) {
-                        ngModels.push(ctrl);
-                    }
-                });
-            }
-
-            // We start the watch when there's server validation errors detected.
-            // We watch on the current form's properties and on first watch or if they are dynamically changed
-            // we find all ngModel controls recursively on this form (but stop recursing before we get to the next)
-            // umbProperty form). Then for each ngModelController we assign a new $validator. This $validator 
-            // will execute whenever the value is changed which allows us to check and reset the server validator
-            function startWatch() {
-                if (!watcher) {
-
-                    watcher = scope.$watchCollection(
-                        () => formCtrl,
-                        function (updatedFormController) {
-                            let childControls = updatedFormController.$getControls();
-                            let ngModels = [];
-                            collectAllNgModelControllersRecursively(childControls, ngModels);
-                            ngModels.forEach(x => {
-                                if (!x.$validators.serverValidityResetter) {
-                                    x.$validators.serverValidityResetter = resetServerValidityValidator(x);
-                                }
-                            });
-                        });
-                }
-            }
-
-            //clear the watch when the property validator is valid again
-            function stopWatch() {
-                if (watcher) {
-                    watcher();
-                    watcher = null;
-                }
-            }
-
-            function resetError() {
-                stopWatch();
-                hasError = false;
-                formCtrl.$setValidity('valPropertyMsg', true);
-                scope.errorMsg = "";
-
-            }
-
-            // This deals with client side validation changes and is executed anytime validators change on the containing 
-            // valFormManager. This allows us to know when to display or clear the property error data for non-server side errors.
-            function checkValidationStatus() {
-                if (formCtrl.$invalid) {
-                    //first we need to check if the valPropertyMsg validity is invalid
-                    if (formCtrl.$error.valPropertyMsg && formCtrl.$error.valPropertyMsg.length > 0) {
-                        //since we already have an error we'll just return since this means we've already set the 
-                        //hasError and errorMsg properties which occurs below in the serverValidationManager.subscribe
-                        return;
-                    }
-                    //if there are any errors in the current property form that are not valPropertyMsg
-                    else if (_.without(_.keys(formCtrl.$error), "valPropertyMsg").length > 0) {
-
-                        // errors exist, but if the property is NOT mandatory and has no value, the errors should be cleared
-                        if (isMandatory !== undefined && isMandatory === false && !currentProperty.value) {
-
-                            resetError();
-
-                            // if there's no value, the controls can be reset, which clears the error state on formCtrl
-                            for (let control of formCtrl.$getControls()) {
-                                control.$setValidity();
-                            }
-
-                            return;
-                        }
-
-                        hasError = true;
-                        //update the validation message if we don't already have one assigned.
-                        if (showValidation && scope.errorMsg === "") {
-                            scope.errorMsg = getErrorMsg();
-                        }
-                    }
-                    else {
-                        resetError();
-                    }
-                }
-                else {
-                    resetError();
-                }
-            }
-
-            function onInit() {
-
-                localizationService.localize("errors_propertyHasErrors").then(function (data) {
-
-                    labels.propertyHasErrors = data;
-
-                    //if there's any remaining errors in the server validation service then we should show them.
-                    showValidation = serverValidationManager.items.length > 0;
-                    if (!showValidation) {
-                        //We can either get the form submitted status by the parent directive valFormManager (if we add a property to it)
-                        //or we can just check upwards in the DOM for the css class (easier for now).
-                        //The initial hidden state can't always be hidden because when we switch variants in the content editor we cannot
-                        //reset the status.
-                        showValidation = element.closest(".show-validation").length > 0;
-                    }
-
-                    //listen for form validation changes.
-                    //The alternative is to add a watch to formCtrl.$invalid but that would lead to many more watches then
-                    // subscribing to this single watch.
-                    // TODO: Really? Since valFormManager is watching a countof all errors which is more overhead than watching formCtrl.$invalid
-                    // and there's a TODO there that it should just watch formCtrl.$invalid
-                    valFormManager.onValidationStatusChanged(function () {
-                        checkValidationStatus();
-                    });
-
-                    //listen for the forms saving event
-                    unsubscribe.push(scope.$on("formSubmitting", function () {
-                        showValidation = true;
-                        if (hasError && scope.errorMsg === "") {
-                            scope.errorMsg = getErrorMsg();
-                            startWatch();
-                        }
-                        else if (!hasError) {
-                            resetError();
-                        }
-                    }));
-
-                    //listen for the forms saved event
-                    unsubscribe.push(scope.$on("formSubmitted", function () {
-                        showValidation = false;
-                        resetError();
-                    }));
-
-                    if (scope.currentProperty) { //this can be null if no property was assigned
-
-                        // listen for server validation changes for property validation path prefix.
-                        // We pass in "" in order to listen for all validation changes to the content property, not for
-                        // validation changes to fields in the property this is because some server side validators may not
-                        // return the field name for which the error belongs too, just the property for which it belongs.
-                        // It's important to note that we need to subscribe to server validation changes here because we always must
-                        // indicate that a content property is invalid at the property level since developers may not actually implement
-                        // the correct field validation in their property editors.
-
-                        const serverValidationManagerCallback = function(isValid, propertyErrors) {
-                            var hadError = hasError;
-                            hasError = !isValid;
-                            if (hasError) {
-                                //set the error message to the server message
-                                scope.errorMsg = propertyErrors.length > 1 ? labels.propertyHasErrors : propertyErrors[0].errorMsg || labels.propertyHasErrors;
-                                //flag that the current validator is invalid
-                                formCtrl.$setValidity('valPropertyMsg', false);
-                                startWatch();
-
-                                // This check is required in order to be able to reset ourselves and is typically for complex editor
-                                // scenarios where the umb-property itself doesn't contain any ng-model controls which means that the
-                                // above serverValidityResetter technique will not work to clear valPropertyMsg errors.
-                                // In order for this to work we rely on the current form controller's $pristine state. This means that anytime
-                                // the form is submitted whether there are validation errors or not the state must be reset... this is automatically
-                                // taken care of with the formHelper.resetForm method that should be used in all cases. $pristine is required because it's
-                                // a value that is cascaded to all form controls based on the hierarchy of child ng-model controls. This allows us to easily
-                                // know if a value has changed. The alternative is what we used to do which was to put a deep $watch on the entire complex value
-                                // which is hugely inefficient. 
-                                if (propertyErrors.length === 1 && hadError && !formCtrl.$pristine) {
-                                    var propertyValidationPath = umbPropCtrl.getValidationPath();
-                                    serverValidationManager.removePropertyError(propertyValidationPath, currentCulture, "", currentSegment);
-                                    resetError();
-                                }
-                            }
-                            else {
-                                resetError();
-                            }
-                        }
-
-                        unsubscribe.push(serverValidationManager.subscribe(
-                            umbPropCtrl.getValidationPath(),
-                            currentCulture,
-                            "",
-                            serverValidationManagerCallback,
-                            currentSegment,
-                            { matchType: "prefix" } // match property validation path prefix
-                        ));
-                    }
-
-                });
-            }
-
-            //when the scope is disposed we need to unsubscribe
-            scope.$on('$destroy', function () {
-                stopWatch();
-                unsubscribe.forEach(u => u());
-            });
-
-            onInit();
-        }
-
-
-    };
-}
-angular.module('umbraco.directives.validation').directive("valPropertyMsg", valPropertyMsg);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertyvalidator.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertyvalidator.directive.js
deleted file mode 100644
index d66e4bd2af..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertyvalidator.directive.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:valPropertyValidator
-* @restrict A
-* @description Performs any custom property value validation checks on the client side. This allows property editors to be highly flexible when it comes to validation
-                on the client side. Typically if a property editor stores a primitive value (i.e. string) then the client side validation can easily be taken care of 
-                with standard angular directives such as ng-required. However since some property editors store complex data such as JSON, a given property editor
-                might require custom validation. This directive can be used to validate an Umbraco property in any way that a developer would like by specifying a
-                callback method to perform the validation. The result of this method must return an object in the format of 
-                {isValid: true, errorKey: 'required', errorMsg: 'Something went wrong' }
-                The error message returned will also be displayed for the property level validation message.
-                This directive should only be used when dealing with complex models, if custom validation needs to be performed with primitive values, use the simpler 
-                angular validation directives instead since this will watch the entire model. 
-**/
-
-function valPropertyValidator(serverValidationManager) {
-    return {
-        scope: {
-            valPropertyValidator: "="
-        },
-
-        // The element must have ng-model attribute and be inside an umbProperty directive
-        require: ['ngModel', '?^umbProperty'],
-
-        restrict: "A",
-
-        link: function (scope, element, attrs, ctrls) {
-
-            var modelCtrl = ctrls[0];
-            var propCtrl = ctrls.length > 1 ? ctrls[1] : null;
-
-            // Check whether the scope has a valPropertyValidator method
-            if (!scope.valPropertyValidator || !Utilities.isFunction(scope.valPropertyValidator)) {
-                throw new Error('val-property-validator directive must specify a function to call');
-            }
-            
-            // Validation method
-            function validate (viewValue) {
-                // Calls the validation method
-                var result = scope.valPropertyValidator();
-                if (!result.errorKey || result.isValid === undefined || !result.errorMsg) {
-                    throw "The result object from valPropertyValidator does not contain required properties: isValid, errorKey, errorMsg";
-                }
-                if (result.isValid === true) {
-                    // Tell the controller that the value is valid
-                    modelCtrl.$setValidity(result.errorKey, true);
-                    if (propCtrl) {
-                        propCtrl.setPropertyError(null);
-                    }                    
-                }
-                else {
-                    // Tell the controller that the value is invalid
-                    modelCtrl.$setValidity(result.errorKey, false);
-                    if (propCtrl) {
-                        propCtrl.setPropertyError(result.errorMsg);
-                    }
-                }
-
-                // parsers are expected to return a value
-                return (result.isValid) ? viewValue : undefined;
-            };
-
-            // Parsers are called as soon as the value in the form input is modified
-            modelCtrl.$parsers.push(validate);
-
-            //call on init
-            validate();
-
-        }
-    };
-}
-angular.module('umbraco.directives.validation').directive("valPropertyValidator", valPropertyValidator);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js
deleted file mode 100644
index 123962c32c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
-    * @ngdoc directive
-    * @name umbraco.directives.directive:valRegex
-    * @restrict A
-    * @description A custom directive to allow for matching a value against a regex string.
-    *               NOTE: there's already an ng-pattern but this requires that a regex expression is set, not a regex string
-    **/
-function valRegex() {
-    
-    return {
-        require: 'ngModel',
-        restrict: "A",
-        link: function (scope, elm, attrs, ctrl) {
-
-            var flags = "";
-            var regex;
-            
-            attrs.$observe("valRegexFlags", function (newVal) {
-                if (newVal) {
-                    flags = newVal;
-                }
-            });
-
-            attrs.$observe("valRegex", function (newVal) {
-                if (newVal) {
-                    try {
-                        var resolved = newVal;
-                        if (resolved) {
-                            regex = new RegExp(resolved, flags);
-                        }
-                        else {
-                            regex = new RegExp(attrs.valRegex, flags);
-                        }
-                    }
-                    catch (e) {
-                        regex = new RegExp(attrs.valRegex, flags);
-                    }
-                }
-            });
-
-            //An ngModel is supplied, assign a render function which is called when the model is changed
-            var oldRender = ctrl.$render;
-            ctrl.$render = function () {
-                patternValidator(ctrl.$viewValue);
-                //call any previously set render method
-                if (oldRender) {
-                    oldRender();
-                }
-            };
-
-            var patternValidator = function (viewValue) {
-                if (regex) {
-                    //NOTE: we don't validate on empty values, use required validator for that
-                if (!viewValue || regex.test(viewValue.toString())) {
-                        // it is valid
-                        ctrl.$setValidity('valRegex', true);
-                        //assign a message to the validator
-                        ctrl.errorMsg = "";
-                        return viewValue;
-                    }
-                    else {
-                        // it is invalid, return undefined (no model update)
-                        ctrl.$setValidity('valRegex', false);
-                        //assign a message to the validator
-                        ctrl.errorMsg = "Value is invalid, it does not match the correct pattern";
-                        return undefined;
-                    }
-                }
-            };
-
-        }
-    };
-}
-angular.module('umbraco.directives.validation').directive("valRegex", valRegex);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valrequirecomponent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valrequirecomponent.directive.js
deleted file mode 100644
index 21e5ce5525..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valrequirecomponent.directive.js
+++ /dev/null
@@ -1,38 +0,0 @@
-(function() {
-  'use strict';
-
-  function valRequireComponentDirective() {
-
-    function link(scope, el, attr, ngModel) {
-
-      var unbindModelWatcher = scope.$watch(function () {
-        return ngModel.$modelValue;
-      }, function(newValue) {
-
-        if(newValue === undefined || newValue === null || newValue === "") {
-          ngModel.$setValidity("valRequiredComponent", false);
-        } else {
-          ngModel.$setValidity("valRequiredComponent", true);
-        }
-
-      });
-
-      // clean up
-      scope.$on('$destroy', function(){
-        unbindModelWatcher();
-      });
-
-    }
-
-    var directive = {
-      require: 'ngModel',
-      restrict: "A",
-      link: link
-    };
-
-    return directive;
-  }
-
-    angular.module('umbraco.directives').directive('valRequireComponent', valRequireComponentDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js
deleted file mode 100644
index 4180457792..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
-    * @ngdoc directive
-    * @name umbraco.directives.directive:valServer
-    * @restrict A
-    * @description This directive is used to associate a content property with a server-side validation response
-    *               so that the validators in angular are updated based on server-side feedback.
-    **/
-function valServer(serverValidationManager) {
-    return {
-        require: ['ngModel', '?^^umbProperty', '?^^umbVariantContent'],
-        restrict: "A",
-        scope: {},
-        link: function (scope, element, attr, ctrls) {
-
-            var modelCtrl = ctrls[0];
-            var umbPropCtrl = ctrls[1];
-            if (!umbPropCtrl) {
-                //we cannot proceed, this validator will be disabled
-                return;
-            }
-            
-            // optional reference to the varaint-content-controller, needed to avoid validation when the field is invariant on non-default languages.
-            var umbVariantCtrl = ctrls[2];
-
-            var currentProperty = umbPropCtrl.property;
-            var currentCulture = currentProperty.culture;
-            var currentSegment = currentProperty.segment;
-
-            if (umbVariantCtrl) {
-                //if we are inside of an umbVariantContent directive
-
-                var currentVariant = umbVariantCtrl.editor.content;
-
-                // Lets check if we have variants and we are on the default language then ...
-                if (umbVariantCtrl.content.variants.length > 1 && (!currentVariant.language || !currentVariant.language.isDefault) && !currentCulture && !currentSegment && !currentProperty.unlockInvariantValue) {
-                    //This property is locked cause its a invariant property shown on a non-default language.
-                    //Therefor do not validate this field.
-                    return;
-                }
-            }
-                       
-            // if we have reached this part, and there is no culture, then lets fallback to invariant. To get the validation feedback for invariant language.
-            currentCulture = currentCulture || "invariant";
-            
-            var watcher = null;
-            var unsubscribe = [];
-
-            //default to 'value' if nothing is set
-            var fieldName = "value";
-            if (attr.valServer) {
-                fieldName = scope.$eval(attr.valServer);
-                if (!fieldName) {
-                    //eval returned nothing so just use the string
-                    fieldName = attr.valServer;
-                }
-            }
-
-            // Get the property validation path if there is one, this is how wiring up any nested/virtual property validation works
-            var propertyValidationPath = umbPropCtrl ? umbPropCtrl.getValidationPath() : currentProperty.alias;
-
-            // Need to watch the value model for it to change, previously we had  subscribed to 
-            // modelCtrl.$viewChangeListeners but this is not good enough if you have an editor that
-            // doesn't specifically have a 2 way ng binding. This is required because when we
-            // have a server error we actually invalidate the form which means it cannot be 
-            // resubmitted. So once a field is changed that has a server error assigned to it
-            // we need to re-validate it for the server side validator so the user can resubmit
-            // the form. Of course normal client-side validators will continue to execute.
-            function startWatch() {
-                //if there's not already a watch
-                if (!watcher) {
-                    watcher = scope.$watch(function () {
-                        return modelCtrl.$modelValue;
-                    }, function (newValue, oldValue) {
-
-                        if (!newValue || Utilities.equals(newValue, oldValue)) {
-                            return;
-                        }
-
-                        if (modelCtrl.$invalid) {
-                            modelCtrl.$setValidity('valServer', true);
-                            
-                            //clear the server validation entry
-                            serverValidationManager.removePropertyError(propertyValidationPath, currentCulture, fieldName, currentSegment);
-
-                            stopWatch();
-                        }
-                    }, true);
-                }
-            }
-
-            function stopWatch() {
-                if (watcher) {
-                    watcher();
-                    watcher = null;
-                }
-            }
-            
-            //subscribe to the server validation changes
-            function serverValidationManagerCallback(isValid, propertyErrors, allErrors) {
-                if (!isValid) {
-                    modelCtrl.$setValidity('valServer', false);
-                    //assign an error msg property to the current validator
-                    modelCtrl.errorMsg = propertyErrors[0].errorMsg;
-                    startWatch();
-                }
-                else {
-                    modelCtrl.$setValidity('valServer', true);
-                    //reset the error message
-                    modelCtrl.errorMsg = "";
-                    stopWatch();
-                }
-            }
-
-            unsubscribe.push(serverValidationManager.subscribe(
-                propertyValidationPath,
-                currentCulture,
-                fieldName,
-                serverValidationManagerCallback,
-                currentSegment)
-            );
-
-            scope.$on('$destroy', function () {
-                stopWatch();
-                unsubscribe.forEach(u => u());
-            });
-        }
-    };
-}
-angular.module('umbraco.directives.validation').directive("valServer", valServer);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserverfield.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserverfield.directive.js
deleted file mode 100644
index 7f5427da8b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserverfield.directive.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
-    * @ngdoc directive
-    * @name umbraco.directives.directive:valServerField
-    * @restrict A
-    * @description This directive is used to associate a field with a server-side validation response
-    *               so that the validators in angular are updated based on server-side feedback.
-    *               (For validation of user defined content properties on content/media/members, the valServer directive is used)
-    **/
-function valServerField(serverValidationManager) {
-    return {
-        require: 'ngModel',
-        restrict: "A",
-        scope: {},
-        link: function (scope, element, attr, ngModel) {
-            
-            var fieldName = null;
-            var unsubscribe = [];
-
-            attr.$observe("valServerField", function (newVal) {
-                if (newVal && fieldName === null) {
-                    fieldName = newVal;
-
-                    //subscribe to the changed event of the view model. This is required because when we
-                    // have a server error we actually invalidate the form which means it cannot be 
-                    // resubmitted. So once a field is changed that has a server error assigned to it
-                    // we need to re-validate it for the server side validator so the user can resubmit
-                    // the form. Of course normal client-side validators will continue to execute.
-                    unsubscribe.push(scope.$watch(function() {
-                        return ngModel.$modelValue;
-                    }, function(newValue){
-                        if (ngModel.$invalid) {
-                            ngModel.$setValidity('valServerField', true);
-                        }
-                    }));
-
-                    //subscribe to the server validation changes
-                    unsubscribe.push(serverValidationManager.subscribe(null,
-                        null,
-                        fieldName,
-                        function(isValid, fieldErrors, allErrors) {
-                            if (!isValid) {
-                                ngModel.$setValidity('valServerField', false);
-                                //assign an error msg property to the current validator
-                                ngModel.errorMsg = fieldErrors[0].errorMsg;
-                            }
-                            else {
-                                ngModel.$setValidity('valServerField', true);
-                                //reset the error message
-                                ngModel.errorMsg = "";
-                            }
-                        }));
-                }
-            });
-
-            scope.$on('$destroy', function(){
-              // unbind watchers
-              for(var e in unsubscribe) {
-                unsubscribe[e]();
-               }
-            });
-
-        }
-    };
-}
-angular.module('umbraco.directives.validation').directive("valServerField", valServerField);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valservermatch.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valservermatch.directive.js
deleted file mode 100644
index 69d1996e9a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valservermatch.directive.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * @ngdoc directive
- * @name umbraco.directives.directive:valServerMatch
- * @restrict A
- * @description A custom validator applied to a form/ng-form within an umbProperty that validates server side validation data
- * contained within the serverValidationManager. The data can be matched on "exact", "prefix", "suffix" or "contains" matches against
- * a property validation key. The attribute value can be in multiple value types:
- * - STRING = The property validation key to have an exact match on. If matched, then the form will have a valServerMatch validator applied.
- * - OBJECT = A dictionary where the key is the match type: "contains", "prefix", "suffix" and the value is either:
- *     - ARRAY = A list of property validation keys to match on. If any are matched then the form will have a valServerMatch validator applied.
- *     - OBJECT = A dictionary where the key is the validator error name applied to the form and the value is the STRING of the property validation key to match on
-**/
-function valServerMatch(serverValidationManager) {
-
-    return {
-        require: ['form', '?^^umbProperty', '?^^umbVariantContent'],
-        restrict: "A",
-        scope: {
-            valServerMatch: "="
-        },
-        link: function (scope, element, attr, ctrls) {
-
-            var formCtrl = ctrls[0];
-            var umbPropCtrl = ctrls[1];
-            // You can skip the requirement of ^^umbProperty, by parsing the culture and segment as part of valServerMatch object.
-            if (!umbPropCtrl && scope.valServerMatch.culture === undefined) {
-              console.log("val server blocked.", scope.valServerMatch)
-                //we cannot proceed, this validator will be disabled
-                return;
-            }
-
-            // optional reference to the variant-content-controller, needed to avoid validation when the field is invariant on non-default languages.
-            var umbVariantCtrl = ctrls[2];
-
-            var currentProperty = umbPropCtrl ? umbPropCtrl.property : undefined;
-            var currentCulture = umbPropCtrl ? currentProperty.culture : scope.valServerMatch.culture;
-            var currentSegment = umbPropCtrl ? currentProperty.segment : scope.valServerMatch.segment;
-
-            if (umbVariantCtrl) {
-                //if we are inside of an umbVariantContent directive
-
-                var currentVariant = umbVariantCtrl.editor.content;
-
-                // Lets check if we have variants and we are on the default language then ...
-                if (umbVariantCtrl.content.variants.length > 1 && (!currentVariant.language || !currentVariant.language.isDefault) && !currentCulture && !currentSegment && !currentProperty.unlockInvariantValue) {
-                    //This property is locked cause its a invariant property shown on a non-default language.
-                    //Therefor do not validate this field.
-                    return;
-                }
-            }
-
-            // if we have reached this part, and there is no culture, then lets fallback to invariant. To get the validation feedback for invariant language.
-            currentCulture = currentCulture || "invariant";
-
-            var unsubscribe = [];
-
-            function bindCallback(validationKey, matchVal, matchType) {
-
-                if (!matchVal) return;
-
-                if (Utilities.isString(matchVal)) {
-                    matchVal = [matchVal]; // normalize to an array since the value can also natively be an array
-                }
-
-                // match for each string in the array
-                matchVal.forEach(m => {
-                    unsubscribe.push(serverValidationManager.subscribe(
-                        m,
-                        currentCulture,
-                        "",
-                        // the callback
-                        function (isValid, propertyErrors, allErrors) {
-                            if (!isValid) {
-                                formCtrl.$setValidity(validationKey, false);
-                            }
-                            else {
-                                formCtrl.$setValidity(validationKey, true);
-                            }
-                        },
-                        currentSegment,
-                        matchType ? { matchType: matchType } : null // specify the match type
-                    ));
-                });
-
-            }
-
-            if (Utilities.isObject(scope.valServerMatch)) {
-                var allowedKeys = ["contains", "prefix", "suffix"];
-                const objectKeys = Object.keys(scope.valServerMatch);
-                if(objectKeys.find(x => allowedKeys.x)) {
-                  throw "valServerMatch dictionary keys must be one of " + allowedKeys.join();
-                }
-                objectKeys.forEach(matchType => {
-                    if (allowedKeys.indexOf(matchType) === -1) {
-                      return;
-                    }
-
-                    var matchVal = scope.valServerMatch[matchType];
-
-                    if (Utilities.isObject(matchVal)) {
-
-                        // as an object, the key will be the validation error instead of the default "valServerMatch"
-                        Object.keys(matchVal).forEach(valKey => {
-
-                            // matchVal[valKey] can be an ARRAY or a STRING
-                            bindCallback(valKey, matchVal[valKey], matchType);
-                        });
-                    }
-                    else {
-
-                        // matchVal can be an ARRAY or a STRING
-                        bindCallback("valServerMatch", matchVal, matchType);
-                    }
-                });
-            }
-            else if (Utilities.isString(scope.valServerMatch)) {
-
-                // a STRING match which will be an exact match on the string supplied as the property validation key
-                bindCallback("valServerMatch", scope.valServerMatch, null);
-            }
-            else {
-                throw "valServerMatch value must be a string or a dictionary";
-            }
-
-            scope.$on('$destroy', function () {
-                unsubscribe.forEach(u => u());
-            });
-        }
-    };
-}
-angular.module('umbraco.directives.validation').directive("valServerMatch", valServerMatch);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
deleted file mode 100644
index 97d11879e9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * @ngdoc directive
- * @name umbraco.directives.directive:valSubView
- * @restrict A
- * @description Used to show validation warnings for a editor sub view (used in conjunction with:
- * umb-editor-sub-view or umb-editor-sub-views) to indicate that the section content has validation errors in its data.
- * In order for this directive to work, the valFormManager directive must be placed on the containing form.
- * When applied to 
-**/
-(function () {
-    'use strict';
-
-    // Since this is a directive applied as an attribute, the value of that attribtue is the 'model' object property 
-    // of the current inherited scope that the hasError/errorClass properties will apply to. 
-    // This directive cannot have it's own scope because it's an attribute applied to another scoped directive.
-    // Due to backwards compatibility we can't really change this, ideally this would have it's own scope/properties.
-
-    function valSubViewDirective() {
-
-        function controller($scope, $element, $attrs) {
-
-            var model = $scope.model; // this is the default and required for backwards compat
-            if ($attrs && $attrs.valSubView) {
-                // get the property to use
-                model = $scope[$attrs.valSubView];
-            }
-
-            //expose api
-            return {
-                valStatusChanged: function (args) {
-
-                    if (model) {
-                        if (!args.form.$valid) {
-                            var subViewContent = $element.find(".ng-invalid");
-
-                            if (subViewContent.length > 0) {
-                                model.hasError = true;
-                                model.errorClass = args.showValidation ? 'show-validation' : null;
-                            } else {
-                                model.hasError = false;
-                                model.errorClass = null;
-                            }
-                        }
-                        else {
-                            model.hasError = false;
-                            model.errorClass = null;
-                        }
-                    }
-                }
-            }
-        }
-
-        function link(scope, el, attr, ctrl) {
-
-            //if there are no containing form or valFormManager controllers, then we do nothing
-            if (!ctrl[1]) {
-                return;
-            }
-
-            var model = scope.model; // this is the default and required for backwards compat
-            if (attr && attr.valSubView) {
-                // get the property to use
-                model = scope[attr.valSubView];
-            }
-
-            var valFormManager = ctrl[1];
-            model.hasError = false;
-
-            //listen for form validation changes
-            valFormManager.onValidationStatusChanged(function (evt, args) {
-                if (!args.form.$valid) {
-
-                    var subViewContent = el.find(".ng-invalid");
-
-                    if (subViewContent.length > 0) {
-                        model.hasError = true;
-                    } else {
-                        model.hasError = false;
-                    }
-
-                }
-                else {
-                    model.hasError = false;
-                }
-            });
-
-        }
-
-        var directive = {
-            require: ['?^^form', '?^^valFormManager'],
-            restrict: "A",
-            link: link,
-            controller: controller
-        };
-
-        return directive;
-    }
-
-    angular.module('umbraco.directives').directive('valSubView', valSubViewDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js
deleted file mode 100644
index 53edd0b108..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js
+++ /dev/null
@@ -1,85 +0,0 @@
-
-/**
-* @ngdoc directive
-* @name umbraco.directives.directive:valTab
-* @restrict A
-* @description Used to show validation warnings for a tab to indicate that the tab content has validations errors in its data.
-* In order for this directive to work, the valFormManager directive must be placed on the containing form.
-**/
-function valTab($timeout) {
-    return {
-        require: ['^^form', '^^valFormManager'],
-        restrict: "A",
-        link: function (scope, element, attr, ctrs) {
-
-            var evts = [];
-            var form = ctrs[0];
-            var tab = scope.$eval(attr.valTab) || scope.tab;
-
-            if (!tab) {
-                return;
-            }
-
-            let closestEditor = element.closest(".blockelement-inlineblock-editor");
-            closestEditor = closestEditor.length === 0 ? element.closest(".umb-editor-sub-view") : closestEditor;
-            closestEditor = closestEditor.length === 0 ? element.closest(".umb-editor") : closestEditor;
-
-            setSuccess();
-
-            function setValidity (form) {
-                var tabAlias = tab.alias || '';
-
-                if (!form.$valid) {
-                    var tabContent = closestEditor.find("[data-element='tab-content-" + tabAlias + "']");
-
-                    //check if the validation messages are contained inside of this tabs
-                    if (tabContent.find(".ng-invalid").length > 0) {
-                        setError();
-                    } else {
-                        setSuccess();
-                    }
-                }
-                else {
-                    setSuccess();
-                }
-            }
-
-            function setError () {
-                scope.valTab_tabHasError = true;
-                tab.hasError = true;
-            }
-
-            function setSuccess () {
-                scope.valTab_tabHasError = false;
-                tab.hasError = false;
-            }
-
-            function subscribe () {
-                for (let control of form.$$controls) {
-                    var unbind = scope.$watch(() => control.$invalid, function () {
-                        setValidity(form);
-                    });
-
-                    evts.push(unbind);
-                }
-            }
-
-            function unsubscribe () {
-                evts.forEach(event => event());
-            }
-
-            // we need to watch validation state on individual controls so we can update specific tabs accordingly
-            $timeout(() => {
-                scope.$watchCollection(() => form.$$controls, function (newValue) {
-                    unsubscribe();
-                    subscribe();
-                });
-            });
-
-            scope.$on('$destroy', function () {
-                unsubscribe();
-            });
-        }
-    };
-}
-angular.module('umbraco.directives.validation').directive("valTab", valTab);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valtriggerchange.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valtriggerchange.directive.js
deleted file mode 100644
index 3408a8fbaa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valtriggerchange.directive.js
+++ /dev/null
@@ -1,11 +0,0 @@
-angular.module('umbraco.directives.validation')
-.directive('valTriggerChange', function($sniffer) {
-	return {
-		link : function(scope, elem, attrs) {
-			elem.on('click', function(){
-				$(attrs.valTriggerChange).trigger($sniffer.hasEvent('input') ? 'input' : 'change');
-			});
-		},
-		priority : 1	
-	};
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/_module.js b/src/Umbraco.Web.UI.Client/src/common/filters/_module.js
deleted file mode 100644
index 2d66442af3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/_module.js
+++ /dev/null
@@ -1 +0,0 @@
-angular.module('umbraco.filters', []);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/compareArrays.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/compareArrays.filter.js
deleted file mode 100644
index 0cbf3077e6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/compareArrays.filter.js
+++ /dev/null
@@ -1,30 +0,0 @@
-angular.module("umbraco.filters")
-    .filter('compareArrays', function() {
-        return function inArray(array, compareArray, compareProperty) {
-
-            if (!compareArray || !compareArray.length) {
-                return [...array];
-            }
-
-            var result = [];
-
-            array.forEach(function(arrayItem){
-
-                var exists = false;
-
-                compareArray.forEach(function(compareItem){
-                    if( arrayItem[compareProperty] === compareItem[compareProperty]) {
-                        exists = true;
-                    }
-                });
-
-                if(!exists) {
-                    result.push(arrayItem);
-                }
-
-            });
-
-            return result;
-
-        };
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/mediaItemResolver.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/mediaItemResolver.filter.js
deleted file mode 100644
index be0338093c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/mediaItemResolver.filter.js
+++ /dev/null
@@ -1,65 +0,0 @@
-(function () {
-  "use strict";
-
-  function mediaItemResolverFilterService(mediaResource, eventsService) {
-    
-    var mediaKeysRequest = [];
-    var mediaItemCache = [];
-
-    var service = {
-      
-      getByKey: function (key) {
-        // Is it cached, then get that:
-        const cachedMediaItem = mediaItemCache.find(cache => key === cache.key);
-        if(cachedMediaItem) {
-          return cachedMediaItem;
-        }
-
-        // check its not already being loaded, and then start loading:
-        if(mediaKeysRequest.indexOf(key) === -1) {
-          mediaKeysRequest.push(key);
-          mediaResource.getById(key).then(function (mediaItem) {
-            if(mediaItem) {
-              mediaItemCache.push(mediaItem);
-            }
-          });
-        }
-
-        return null;
-      }
-    };
-
-    eventsService.on("editors.media.saved", function (name, args) {
-      const index = mediaItemCache.findIndex(cache => cache.key === args.media.key);
-      if(index !== -1) {
-        mediaItemCache[index] = args.media;
-      }
-    });
-
-    return service;
-
-  }
-  
-  angular.module("umbraco.filters").factory("mediaItemResolverFilterService", mediaItemResolverFilterService);
-
-
-  // Filter loads Media Item Model from a Media Key.
-  // Usage: {{ myMediaProperty[0].mediaKey | mediaItemResolver }}
-  angular.module("umbraco.filters").filter("mediaItemResolver", function (mediaItemResolverFilterService) {
-
-    mediaItemResolverFilter.$stateful = true;
-    function mediaItemResolverFilter(input) {
-
-      // Check we have a value at all
-      if (typeof input === 'string' && input.length > 0) {
-        return mediaItemResolverFilterService.getByKey(input);
-      }
-
-      return null;
-    }
-
-    return mediaItemResolverFilter;
-
-  });
-
-})();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/nestedcontent.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/nestedcontent.filter.js
deleted file mode 100644
index 4fc10dbfa3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/nestedcontent.filter.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Filter to take a node id and grab it's name instead
-// Usage: {{ pickerAlias | ncNodeName }}
-
-// Cache for node names so we don't make a ton of requests
-var ncNodeNameCache = {
-  id: "",
-  keys: {}
-};
-
-angular.module("umbraco.filters").filter("ncNodeName", function (editorState, entityResource, udiParser) {
-
-  function formatLabel(firstNodeName, totalNodes) {
-    return totalNodes <= 1
-      ? firstNodeName
-      // If there is more than one item selected, append the additional number of items selected to hint that
-      : firstNodeName + " (+" + (totalNodes - 1) + ")";
-  }
-
-  nodeNameFilter.$stateful = true;
-  function nodeNameFilter(input) {
-
-    // Check we have a value at all
-    if (typeof input === 'undefined' || input === "" || input.toString() === "0" || input === null) {
-      return "";
-    }
-
-    var currentNode = editorState.getCurrent();
-
-    // Enable using keys with dashes:
-    input = input.split('-').join('');
-
-    // Ensure a unique cache per editor instance
-    var key = "ncNodeName_" + currentNode.key;
-    if (ncNodeNameCache.id !== key) {
-      ncNodeNameCache.id = key;
-      ncNodeNameCache.keys = {};
-    }
-
-    // MNTP values are comma separated IDs. We'll only fetch the first one for the NC header.
-    var ids = input.split(',');
-    var lookupId = ids[0];
-    var serviceInvoked = false;
-
-    // See if there is a value in the cache and use that
-    if (ncNodeNameCache.keys[lookupId]) {
-      return formatLabel(ncNodeNameCache.keys[lookupId], ids.length);
-    }
-
-    // No value, so go fetch one
-    // We'll put a temp value in the cache though so we don't
-    // make a load of requests while we wait for a response
-    ncNodeNameCache.keys[lookupId] = "Loading...";
-
-    // If the service has already been invoked, don't do it again
-    if (serviceInvoked) {
-      return formatLabel(ncNodeNameCache.keys[lookupId], ids.length);
-    }
-
-    serviceInvoked = true;
-
-    var udi = udiParser.parse(lookupId);
-
-    if (udi) {
-      entityResource.getById(udi.value, udi.entityType).then(function (ent) {
-        ncNodeNameCache.keys[lookupId] = ent.name;
-      }).catch(function () {
-        ncNodeNameCache.keys[lookupId] = "Error: Could not load";
-      });
-    } else {
-      ncNodeNameCache.keys[lookupId] = "Error: Not a UDI";
-    }
-
-    // Return the current value for now
-    return formatLabel(ncNodeNameCache.keys[lookupId], ids.length);
-  }
-
-  return nodeNameFilter;
-
-}).filter("ncRichText", function () {
-  return function (input) {
-    // Get markup from RTE object or assume HTML
-    var html = input && Object.hasOwn(input, 'markup') ? input.markup : input;
-
-    return $("<div/>").html(html).text();
-  };
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/preserveNewLineInHtml.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/preserveNewLineInHtml.filter.js
deleted file mode 100644
index 8105282020..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/preserveNewLineInHtml.filter.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
-* @ngdoc filter
-* @name umbraco.filters.preserveNewLineInHtml
-* @description 
-* Used when rendering a string as HTML (i.e. with ng-bind-html) to convert line-breaks to <br /> tags
-**/
-angular.module("umbraco.filters").filter('preserveNewLineInHtml', function () {
-  return function (text) {
-	if (!text) {
-		return '';
-	}
-    return text.replace(/\n/g, '<br />');
-  };
-});
-	
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/safehtml.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/safehtml.filter.js
deleted file mode 100644
index 50d8574306..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/safehtml.filter.js
+++ /dev/null
@@ -1,6 +0,0 @@
-angular.module('umbraco.filters')
-    .filter('safe_html', ['$sce', function($sce){
-        return function(text) {
-            return $sce.trustAsHtml(text);
-        };
-    }]);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js
deleted file mode 100644
index 58d5b0ed91..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
-* @ngdoc filter
-* @name umbraco.filters.simpleMarkdown
-* @description 
-* Used when rendering a string as Markdown as HTML (i.e. with ng-bind-html). Allows use of **bold**, *italics*, ![images](url) and [links](url)
-**/
-angular.module("umbraco.filters").filter('simpleMarkdown', function () {
-  return function (text) {
-	if (!text) {
-		return '';
-    }
-
-    return text
-      .replace(/\*\*(.*)\*\*/gim, '<b>$1</b>')
-      .replace(/\*(.*)\*/gim, '<i>$1</i>')
-      .replace(/!\[(.*?)\]\((.*?)\)/gim, "<img alt='$1' src='$2' />")
-      .replace(/\[(.*?)\]\((.*?)\)/gim, "<a href='$2' target='_blank' rel='noopener' class='underline'>$1</a>")
-      .replace(/\n/g, '<br />').trim();
-  };
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js.js b/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js.js
deleted file mode 100644
index d33b96916a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
-* @ngdoc filter
-* @name umbraco.filters.simpleMarkdown
-* @description 
-* Used when rendering a string as Markdown as HTML (i.e. with ng-bind-html). Allows use of **bold**, *italics*, ![images](url) and [links](url)
-**/
-angular.module("umbraco.filters").filter('simpleMarkdown', function () {
-  return function (text) {
-	if (!text) {
-		return '';
-    }
-
-    return text
-      .replace(/\*\*(.*)\*\*/gim, '<b>$1</b>')
-      .replace(/\*(.*)\*/gim, '<i>$1</i>')
-      .replace(/!\[(.*?)\]\((.*?)\)/gim, "<img alt='$1' src='$2' />")
-      .replace(/\[(.*?)\]\((.*?)\)/gim, "<a href='$2' target='_blank' class='underline'>$1</a>")
-      .replace(/\n/g, '<br />').trim();
-  };
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/timespan.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/timespan.filter.js
deleted file mode 100644
index f12aa4054a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/timespan.filter.js
+++ /dev/null
@@ -1,15 +0,0 @@
-angular.module("umbraco.filters").filter('timespan', function() {
-    return function(input) {
-      var sec_num = parseInt(input, 10);
-      var hours   = Math.floor(sec_num / 3600);
-      var minutes = Math.floor((sec_num - (hours * 3600)) / 60);
-      var seconds = sec_num - (hours * 3600) - (minutes * 60);
-
-      if (hours   < 10) {hours   = "0"+hours;}
-      if (minutes < 10) {minutes = "0"+minutes;}
-      if (seconds < 10) {seconds = "0"+seconds;}
-      var time    = hours+':'+minutes+':'+seconds;
-      return time;
-    };
-  });
-	
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
deleted file mode 100644
index 37c560b519..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/truncate.filter.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * @ngdoc filter
- * @name umbraco.filters.filter:truncate
- * @namespace truncateFilter
- * 
- * param {any} wordwise if true, the string will be cut after last fully displayed word.
- * param {any} max where to cut the string.
- * param {any} tail option tail, defaults to: '…'
- * 
- * Legacy version:
- * parameter noOfChars(wordwise) Where to cut the string.
- * parameter appendDots(max) If true dots will be appended in the end.
- * 
- * @description
- * Limits the length of a string, if a cut happens only the string will be appended with three dots to indicate that more is available.
- */
-angular.module("umbraco.filters").filter('truncate', 
-    function () {
-        return function (value, wordwise, max, tail) {
-            
-            if (!value) return '';
-            
-            /* 
-            Overload-fix to support Forms Legacy Version:
-
-            We are making this hack to support the old Forms version of the truncate filter.
-            The old version took different attributes, this code block checks if the first argument isnt a boolean, meaning its not the new version, meaning that the filter is begin used in the old way.
-            Therefor we use the second argument(max) to indicate wether we want a tail (…) and using the first argument(wordwise) as the second argument(max amount of characters)
-            */
-            if (typeof(wordwise) !== 'boolean') {
-                // switch arguments around to fit Forms version.
-                if (max !== true) {
-                    tail = '';
-                }
-                max = wordwise;
-                wordwise = false;
-            }
-            // !end of overload fix.
-            
-            max = parseInt(max, 10);
-            if (!max) return value;
-            if (value.length <= max) return value;
-            
-            tail = (!tail && tail !== '') ? '…' : tail;
-            
-            if (wordwise && value.substr(max, 1) === ' ') {
-                max++;
-            }
-            value = value.substr(0, max);
-            
-            if (wordwise) {
-                var lastspace = value.lastIndexOf(' ');
-                if (lastspace !== -1) {
-                    value = value.substr(0, lastspace+1);
-                }
-            }
-            
-            return value + tail;
-        };
-    }
-);
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsBlockCard.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsBlockCard.filter.js
deleted file mode 100644
index b461315fc7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsBlockCard.filter.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @ngdoc filter
- * @name umbraco.filters.filter:umbCmsBlockCard
- * @namespace umbCmsBlockCard
- * 
- * @description
- * Filter block cards based on specific properties.
- * 
- */
-angular.module("umbraco.filters").filter('umbCmsBlockCard', function () {
-  return function (array, searchTerm) {
-    // If no array is given, exit.
-    if (!array) {
-      return;
-    }
-    // If no search term exists, return the array unfiltered.
-    else if (!searchTerm) {
-      return array;
-    }
-    // Otherwise, continue.
-    else {
-      // Convert filter text to lower case.
-      const term = searchTerm.toLowerCase();
-
-      // Return the filtered array
-      return array.filter((block, i) => {
-        const props = ['id', 'key', 'udi', 'alias', 'name', 'description'];
-
-        let found = false;
-
-        for (let i = 0; i < props.length; i++) {
-
-          if (!block.elementTypeModel.hasOwnProperty(props[i])) {
-            continue;
-          }
-
-          if (block.elementTypeModel[props[i]] != null &&
-             block.elementTypeModel[props[i]] !== '' &&
-             block.elementTypeModel[props[i]].toString().toLowerCase().includes(term)) {
-             found = true;
-          }
-        }
-
-        return found;
-
-      })
-    }
-  }
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsJoinArray.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsJoinArray.filter.js
deleted file mode 100644
index 05f83f96aa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsJoinArray.filter.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @ngdoc filter
- * @name umbraco.filters.filter:umbCmsJoinArray
- * @namespace umbCmsJoinArray
- * 
- * param {array} array of string or objects, if an object use the third argument to specify which prop to list.
- * param {separator} string containing the separator to add between joined values.
- * param {prop} string used if joining an array of objects, set the name of properties to join.
- * 
- * @description
- * Join an array of string or an array of objects, with a custom separator.
- * If the array is null or empty, returns an empty string
- * If the array is not actually an array (ie a string or number), returns the value of the array
- */
-angular.module("umbraco.filters").filter('umbCmsJoinArray', function () {
-    return function join(array, separator, prop) {
-        if (typeof array !== 'object' || !array) {
-            return array || '';
-        }
-        separator = separator || '';
-        return (!Utilities.isUndefined(prop) ? array.map(item => item[prop]) : array).join(separator);
-    };
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsTitleCase.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsTitleCase.filter.js
deleted file mode 100644
index 8d2c233655..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsTitleCase.filter.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @ngdoc filter
- * @name umbraco.filters.filter:umbCmsTitleCase
- * @namespace umbCmsTitleCase
- * 
- * param {string} the text turned into title case.
- * 
- * @description
- * Transforms text to title case. Capitalizes the first letter of each word, and transforms the rest of the word to lower case.
- * 
- */
-angular.module("umbraco.filters").filter('umbCmsTitleCase', function() {
-    return function (str) {
-        return str.replace(
-            /\w\S*/g,
-            txt => txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase()
-        );
-    }
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/umbwordlimit.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/umbwordlimit.filter.js
deleted file mode 100644
index bd597b21d0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/filters/umbwordlimit.filter.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @ngdoc filter
- * @name umbraco.filters.filter:umbWordLimit
- * @namespace umbWordLimitFilter
- *
- * @description
- * Limits the number of words in a string to the passed in value
- */
-
-(function () {
-    'use strict';
-
-    function umbWordLimitFilter() {
-        return function (collection, property) {
-
-            if (!Utilities.isString(collection)) {
-                return collection;
-            }
-
-            if (Utilities.isUndefined(property)) {
-                return collection;
-            }
-
-            var newString = "";
-            var array = [];
-
-            array = collection.split(" ", property);
-            array.length = property;
-            newString = array.join(" ");
-            
-            return newString;
-
-        };
-    }
-
-    angular.module('umbraco.filters').filter('umbWordLimit', umbWordLimitFilter);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
deleted file mode 100644
index 0787ff78c5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
+++ /dev/null
@@ -1,13 +0,0 @@
-angular.module('umbraco.interceptors', [])
-    // We have to add the interceptor to the queue as a string because the interceptor depends upon service instances that are not available in the config block.
-    .config(['$httpProvider', function ($httpProvider) {
-        $httpProvider.defaults.xsrfHeaderName = 'X-UMB-XSRF-TOKEN';
-        $httpProvider.defaults.xsrfCookieName = 'UMB-XSRF-TOKEN';
-
-        $httpProvider.interceptors.push('securityInterceptor');
-
-        $httpProvider.interceptors.push('requiredHeadersInterceptor');
-        $httpProvider.interceptors.push('doNotPostDollarVariablesOnPostRequestInterceptor');
-        $httpProvider.interceptors.push('cultureRequestInterceptor');
-
-    }]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/culturerequest.interceptor.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/culturerequest.interceptor.js
deleted file mode 100644
index 283a2a7ae9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/culturerequest.interceptor.js
+++ /dev/null
@@ -1,37 +0,0 @@
-(function() {
-    'use strict';
-
-    /**
-     * Used to set the current client culture on all requests API requests
-     * @param {any} $routeParams
-     */
-    function cultureRequestInterceptor($injector) {
-        return {
-            //dealing with requests:
-            'request': function (config) {
-
-                if (!Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath) {
-                    // no settings available, we're probably on the login screen
-                    return config;
-                }
-
-                if (!config.url.match(RegExp(Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + "\/backoffice\/", "i"))) {
-                    // it's not an API request, no handling
-                    return config;
-                }
-
-                var $routeParams = $injector.get("$routeParams");
-                if ($routeParams) {
-                    // it's an API request, add the current client culture as a header value
-                    config.headers["X-UMB-CULTURE"] = $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture;
-                    config.headers["X-UMB-SEGMENT"] = $routeParams.csegment ? $routeParams.csegment : null;
-                }
-                
-                return config;
-            }
-        };
-    }
-
-    angular.module('umbraco.interceptors').factory('cultureRequestInterceptor', cultureRequestInterceptor);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
deleted file mode 100644
index f3dd60bdce..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
+++ /dev/null
@@ -1,40 +0,0 @@
-(function () {
-    'use strict';
-
-    function removeProperty(obj, propertyPrefix) {
-        for (var property in obj) {
-            if (obj.hasOwnProperty(property)) {
-
-                if (property.startsWith(propertyPrefix) && obj[property] !== undefined) {
-                    obj[property] = undefined;
-                }
-
-                if (typeof obj[property] === "object") {
-                    removeProperty(obj[property], propertyPrefix);
-                }
-            }
-        }
-
-    }
-
-    function transform(data) {
-        removeProperty(data, "$");
-    }
-
-    function doNotPostDollarVariablesRequestInterceptor($q, urlHelper) {
-        return {
-            //dealing with requests:
-            'request': function (config) {
-                if (config.method === "POST") {
-                    var clone = Utilities.copy(config);
-                    transform(clone.data);
-                    return clone;
-                }
-
-                return config;
-            }
-        };
-    }
-
-    angular.module('umbraco.interceptors').factory('doNotPostDollarVariablesOnPostRequestInterceptor', doNotPostDollarVariablesRequestInterceptor);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/requestinterceptorfilter.value.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/requestinterceptorfilter.value.js
deleted file mode 100644
index 1a7ba54327..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/requestinterceptorfilter.value.js
+++ /dev/null
@@ -1,11 +0,0 @@
-(function() {
-    'use strict';
-
-    /** Used to filter the request interceptor */
-    function requestInterceptorFilter() {
-        return ["www.gravatar.com"];
-    }
-
-    angular.module('umbraco.interceptors').value('requestInterceptorFilter', requestInterceptorFilter);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js
deleted file mode 100644
index 2ded2533c8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js
+++ /dev/null
@@ -1,31 +0,0 @@
-(function() {
-   'use strict';
-
-    /**
-     * Used to set required headers on all requests where necessary
-     * @param {any} $q
-     * @param {any} urlHelper
-     */
-    function requiredHeadersInterceptor($q, urlHelper) {
-        return {
-            //dealing with requests:
-            'request': function (config) {
-
-                // This is a standard header that should be sent for all ajax requests and is required for 
-                // how the server handles auth rejections, etc... see https://github.com/dotnet/aspnetcore/blob/a2568cbe1e8dd92d8a7976469100e564362f778e/src/Security/Authentication/Cookies/src/CookieAuthenticationEvents.cs#L106-L107
-                config.headers["X-Requested-With"] = "XMLHttpRequest";
-
-                // Set the debug header if in debug mode
-                var queryStrings = urlHelper.getQueryStringParams();
-                if (queryStrings.umbDebug === "true" || queryStrings.umbdebug === "true") {
-                    config.headers["X-UMB-DEBUG"] = "true";
-                }
-                return config;
-            }
-        };
-   }
-
-    angular.module('umbraco.interceptors').factory('requiredHeadersInterceptor', requiredHeadersInterceptor);
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/security.interceptor.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/security.interceptor.js
deleted file mode 100644
index bf748975a1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/security.interceptor.js
+++ /dev/null
@@ -1,122 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * This http interceptor listens for authentication successes and failures
-     * @param {any} $q
-     * @param {any} $injector
-     * @param {any} requestRetryQueue
-     * @param {any} notificationsService
-     * @param {any} eventsService
-     * @param {any} requestInterceptorFilter
-     */
-    function securityInterceptor($q, $injector, requestRetryQueue, notificationsService, eventsService, requestInterceptorFilter) {
-        return {
-
-            'response': function (response) {
-                // Intercept successful requests
-                //Here we'll check if our custom header is in the response which indicates how many seconds the user's session has before it
-                //expires. Then we'll update the user in the user service accordingly.
-                var headers = response.headers();
-
-                if (headers["x-umb-user-seconds"]) {
-                    // We must use $injector to get the $http service to prevent circular dependency
-                    var userService = $injector.get('userService');
-                    userService.setUserTimeout(headers["x-umb-user-seconds"]);
-                }
-
-                //this checks if the user's values have changed, in which case we need to update the user details throughout
-                //the back office similar to how we do when a user logs in
-                if (headers["x-umb-user-modified"]) {
-                    eventsService.emit("app.userRefresh");
-                }
-
-                return response;
-            },
-
-            'responseError': function (rejection) {
-
-                // Intercept failed requests
-                // Make sure we have the configuration of the request (don't we always?)
-                var config = rejection.config ? rejection.config : {};
-
-                // Make sure we have an object for the headers of the request
-                var headers = config.headers ? config.headers : {};
-
-                //Here we'll check if we should ignore the error (either based on the original header set or the request configuration)
-                if (headers["x-umb-ignore-error"] === "ignore" || config.umbIgnoreErrors === true || (Utilities.isArray(config.umbIgnoreStatus) && config.umbIgnoreStatus.indexOf(rejection.status) !== -1)) {
-                    //exit/ignore
-                    return $q.reject(rejection);
-                }
-
-                if (config.url) {
-                    var filtered = _.find(requestInterceptorFilter(), function (val) {
-                        return config.url.indexOf(val) > 0;
-                    });
-                    if (filtered) {
-                        return $q.reject(rejection);
-                    }
-                }
-
-                //A 401 means that the user is not logged in
-                if (rejection.status === 401) {
-                    //avoid an infinite loop
-                    var umbRequestHelper = $injector.get('umbRequestHelper');
-                    var getCurrentUserPath = umbRequestHelper.getApiUrl("authenticationApiBaseUrl", "GetCurrentUser");
-                    if (!rejection.config.url.endsWith(getCurrentUserPath)) {
-
-                        var userService = $injector.get('userService'); // see above
-
-                        //Associate the user name with the retry to ensure we retry for the right user
-                        return userService.getCurrentUser()
-                            .then(function(user) {
-                                var userName = user ? user.name : null;
-                                //The request bounced because it was not authorized - add a new request to the retry queue
-                                return requestRetryQueue.pushRetryFn('unauthorized-server',
-                                    userName,
-                                    function retryRequest() {
-                                        // We must use $injector to get the $http service to prevent circular dependency
-                                        return $injector.get('$http')(rejection.config);
-                                    });
-                            });
-                    }
-                }
-                else if (rejection.status === 404) {
-
-                    //a 404 indicates that the request was not found - this could be due to a non existing url, or it could
-                    //be due to accessing a url with a parameter that doesn't exist, either way we should notifiy the user about it
-
-                    var errMsg = "The URL returned a 404 (not found): <br/><i>" + rejection.config.url.split('?')[0] + "</i>";
-                    if (rejection.data && rejection.data.ExceptionMessage) {
-                        errMsg += "<br/> with error: <br/><i>" + rejection.data.ExceptionMessage + "</i>";
-                    }
-                    
-                    notificationsService.error(
-                        "Request error",
-                        errMsg);
-
-                }
-                else if (rejection.status === 403) {
-                    //if the status was a 403 it means the user didn't have permission to do what the request was trying to do.
-                    //How do we deal with this now, need to tell the user somehow that they don't have permission to do the thing that was
-                    //requested. We can either deal with this globally here, or we can deal with it globally for individual requests on the umbRequestHelper,
-                    // or completely custom for services calling resources.
-
-                    //http://issues.umbraco.org/issue/U4-2749
-
-                    //It was decided to just put these messages into the normal status messages.
-
-                    var msg = "Unauthorized access to URL: <br/><i>" + rejection.config.url.split('?')[0] + "</i><br/>Contact your administrator for information.";
-                    
-                    notificationsService.error("Authorization error", msg);
-                }
-
-                return $q.reject(rejection);
-            }
-        };
-    }
-
-    angular.module('umbraco.interceptors').factory('securityInterceptor', securityInterceptor);
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/editors/_module.js b/src/Umbraco.Web.UI.Client/src/common/mocks/editors/_module.js
deleted file mode 100644
index f39891ee64..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/editors/_module.js
+++ /dev/null
@@ -1,2 +0,0 @@
-angular.module("umbraco.mocks", ['ngCookies']);
-angular.module("umbraco.mocks.services", []);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js
deleted file mode 100644
index a77cea15fa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js
+++ /dev/null
@@ -1,81 +0,0 @@
-angular.module('umbraco.mocks').
-    factory('prevaluesMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
-        'use strict';
-
-        function getRichTextConfiguration(status, data, headers) {
-            if (!mocksUtils.checkAuth()) {
-                return [401, null, null];
-            }
-            else {
-                return [200, { "plugins": [{ "name": "code", "useOnFrontend": true }, { "name": "paste", "useOnFrontend": true }, { "name": "umbracolink", "useOnFrontend": true }], "commands": [{ "icon": "images/editor/code.gif", "command": "code", "alias": "code", "frontEndCommand": "code", "value": "", "priority": 1, "isStylePicker": false }, { "icon": "images/editor/removeformat.gif", "command": "removeformat", "alias": "removeformat", "frontEndCommand": "removeformat", "value": "", "priority": 2, "isStylePicker": false }, { "icon": "images/editor/undo.gif", "command": "undo", "alias": "undo", "frontEndCommand": "undo", "value": "", "priority": 11, "isStylePicker": false }, { "icon": "images/editor/redo.gif", "command": "redo", "alias": "redo", "frontEndCommand": "redo", "value": "", "priority": 12, "isStylePicker": false }, { "icon": "images/editor/cut.gif", "command": "cut", "alias": "cut", "frontEndCommand": "cut", "value": "", "priority": 13, "isStylePicker": false }, { "icon": "images/editor/copy.gif", "command": "copy", "alias": "copy", "frontEndCommand": "copy", "value": "", "priority": 14, "isStylePicker": false }, { "icon": "images/editor/showStyles.png", "command": "styleselect", "alias": "styleselect", "frontEndCommand": "styleselect", "value": "", "priority": 20, "isStylePicker": false }, { "icon": "images/editor/bold.gif", "command": "bold", "alias": "bold", "frontEndCommand": "bold", "value": "", "priority": 21, "isStylePicker": false }, { "icon": "images/editor/italic.gif", "command": "italic", "alias": "italic", "frontEndCommand": "italic", "value": "", "priority": 22, "isStylePicker": false }, { "icon": "images/editor/underline.gif", "command": "underline", "alias": "underline", "frontEndCommand": "underline", "value": "", "priority": 23, "isStylePicker": false }, { "icon": "images/editor/strikethrough.gif", "command": "strikethrough", "alias": "strikethrough", "frontEndCommand": "strikethrough", "value": "", "priority": 24, "isStylePicker": false }, { "icon": "images/editor/justifyleft.gif", "command": "justifyleft", "alias": "justifyleft", "frontEndCommand": "alignleft", "value": "", "priority": 31, "isStylePicker": false }, { "icon": "images/editor/justifycenter.gif", "command": "justifycenter", "alias": "justifycenter", "frontEndCommand": "aligncenter", "value": "", "priority": 32, "isStylePicker": false }, { "icon": "images/editor/justifyright.gif", "command": "justifyright", "alias": "justifyright", "frontEndCommand": "alignright", "value": "", "priority": 33, "isStylePicker": false }, { "icon": "images/editor/justifyfull.gif", "command": "justifyfull", "alias": "justifyfull", "frontEndCommand": "alignfull", "value": "", "priority": 34, "isStylePicker": false }, { "icon": "images/editor/bullist.gif", "command": "bullist", "alias": "bullist", "frontEndCommand": "bullist", "value": "", "priority": 41, "isStylePicker": false }, { "icon": "images/editor/numlist.gif", "command": "numlist", "alias": "numlist", "frontEndCommand": "numlist", "value": "", "priority": 42, "isStylePicker": false }, { "icon": "images/editor/outdent.gif", "command": "outdent", "alias": "outdent", "frontEndCommand": "outdent", "value": "", "priority": 43, "isStylePicker": false }, { "icon": "images/editor/indent.gif", "command": "indent", "alias": "indent", "frontEndCommand": "indent", "value": "", "priority": 44, "isStylePicker": false }, { "icon": "images/editor/link.gif", "command": "link", "alias": "mcelink", "frontEndCommand": "link", "value": "", "priority": 51, "isStylePicker": false }, { "icon": "images/editor/unLink.gif", "command": "unlink", "alias": "unlink", "frontEndCommand": "unlink", "value": "", "priority": 52, "isStylePicker": false }, { "icon": "images/editor/anchor.gif", "command": "anchor", "alias": "mceinsertanchor", "frontEndCommand": "anchor", "value": "", "priority": 53, "isStylePicker": false }, { "icon": "images/editor/image.gif", "command": "image", "alias": "mceimage", "frontEndCommand": "umbmediapicker", "value": "", "priority": 61, "isStylePicker": false }, { "icon": "images/editor/insMacro.gif", "command": "umbracomacro", "alias": "umbracomacro", "frontEndCommand": "umbmacro", "value": "", "priority": 62, "isStylePicker": false }, { "icon": "images/editor/table.gif", "command": "table", "alias": "mceinserttable", "frontEndCommand": "table", "value": "", "priority": 63, "isStylePicker": false }, { "icon": "images/editor/media.gif", "command": "umbracoembed", "alias": "umbracoembed", "frontEndCommand": "umbembeddialog", "value": "", "priority": 66, "isStylePicker": false }, { "icon": "images/editor/hr.gif", "command": "hr", "alias": "inserthorizontalrule", "frontEndCommand": "hr", "value": "", "priority": 71, "isStylePicker": false }, { "icon": "images/editor/sub.gif", "command": "sub", "alias": "subscript", "frontEndCommand": "sub", "value": "", "priority": 72, "isStylePicker": false }, { "icon": "images/editor/sup.gif", "command": "sup", "alias": "superscript", "frontEndCommand": "sup", "value": "", "priority": 73, "isStylePicker": false }, { "icon": "images/editor/charmap.gif", "command": "charmap", "alias": "mcecharmap", "frontEndCommand": "charmap", "value": "", "priority": 74, "isStylePicker": false }], "validElements": "+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel],-sub[style|class],-sup[style|class],-blockquote[dir|style|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align],-h2[id|dir|class|align],-h3[id|dir|class|align],-h4[id|dir|class|align],-h5[id|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*]", "inValidElements": "font", "customConfig": { "entity_encoding": "raw" } }, null];
-            }
-        }
-
-        function getCanvasEditorConfiguration(status, data, headers) {
-            if (!mocksUtils.checkAuth()) {
-                return [401, null, null];
-            }
-            else {
-                return [200,
-                    [
-                        {
-                            "name": "Rich text editor",
-                            "alias": "rte",
-                            "view": "rte",
-                            "icon": "icon-article"
-                        },
-                        {
-                            "name": "Image",
-                            "alias": "media",
-                            "view": "media",
-                            "icon": "icon-picture"
-                        },
-                        {
-                            "name": "Macro",
-                            "alias": "macro",
-                            "view": "macro",
-                            "icon": "icon-settings-alt"
-                        },
-                        {
-                            "name": "Embed",
-                            "alias": "embed",
-                            "view": "embed",
-                            "icon": "icon-movie-alt"
-                        },
-                        {
-                            "name": "Headline",
-                            "alias": "headline",
-                            "view": "textstring",
-                            "icon": "icon-coin",
-                            "config": {
-                                "style": "font-size: 36px; line-height: 45px; font-weight: bold",
-                                "markup": "<h1>#value#</h1>"
-                            }
-                        },
-                        {
-                            "name": "Quote",
-                            "alias": "quote",
-                            "view": "textstring",
-                            "icon": "icon-quote",
-                            "config": {
-                                "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-style: italic; font-size: 18px",
-                                "markup": "<blockquote>#value#</blockquote>"
-                            }
-                        }
-                    ], null];
-            }
-
-        }
-
-
-        return {
-            register: function () {
-                $httpBackend
-                    .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/RichTextPreValue/GetConfiguration'))
-                    .respond(getRichTextConfiguration);
-                $httpBackend
-                    .whenGET(mocksUtils.urlRegex('../config/canvas.editors.config.js'))
-                    .respond(getCanvasEditorConfiguration);
-            }
-        };
-    }]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
deleted file mode 100644
index a9b65f826a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
+++ /dev/null
@@ -1,535 +0,0 @@
-angular.module('umbraco.mocks').
-    factory('mocksUtils', ['$cookies', 'udiService', function ($cookies, udiService) {
-        'use strict';
-         
-        //by default we will perform authorization
-        var doAuth = true;
-
-        return {
-            
-            getMockDataType: function(id, selectedId) {
-                var dataType = {
-                    id: id,
-                    name: "Simple editor " + id,
-                    selectedEditor: selectedId,
-                    availableEditors: [
-                        { name: "Simple editor 1", editorId: String.CreateGuid() },
-                        { name: "Simple editor 2", editorId: String.CreateGuid() },
-                        { name: "Simple editor " + id, editorId: selectedId },
-                        { name: "Simple editor 4", editorId: String.CreateGuid() },
-                        { name: "Simple editor 5", editorId: String.CreateGuid() },
-                        { name: "Simple editor 6", editorId: String.CreateGuid() }
-                    ],
-                    preValues: [
-                          {
-                              label: "Custom pre value 1 for editor " + selectedId,
-                              description: "Enter a value for this pre-value",
-                              key: "myPreVal1",
-                              view: "requiredfield"                              
-                          },
-                            {
-                                label: "Custom pre value 2 for editor " + selectedId,
-                                description: "Enter a value for this pre-value",
-                                key: "myPreVal2",
-                                view: "requiredfield"                                
-                            }
-                    ]
-
-                };
-                return dataType;
-            },
-
-            /** Creats a mock content object */
-            getMockContent: function (id, key, udi) {
-                key = key || String.CreateGuid();
-                udi = udi || udiService.build("content", key);
-                var node = {
-                    name: "My content with id: " + id,
-                    updateDate: new Date().toIsoDateTimeString(),
-                    publishDate: new Date().toIsoDateTimeString(),
-                    createDate: new Date().toIsoDateTimeString(),
-                    id: id,
-                    key: key,
-                    udi: udi,
-                    parentId: 1234,
-                    icon: "icon-umb-content",
-                    owner: { name: "Administrator", id: 0 },
-                    updater: { name: "Per Ploug Krogslund", id: 1 },
-                    path: "-1,1234,2455",
-                    allowedActions: ["U", "H", "A"],
-                    tabs: [
-                    {
-                        label: "Grid",
-                        id: 1, 
-                        active: true,
-                        properties: [                            
-                            { alias: "grid", 
-                            label: "Grid", 
-                            view: "grid", 
-                            value: "", 
-                            hideLabel: true, 
-                            config: {
-                                items:{
-
-                                    styles:[
-                                        {
-                                            label: "Set a background image",
-                                            description: "Set a row background",
-                                            key: "background-image",
-                                            view: "imagepicker",
-                                            modifier: "url({0})"
-                                        }
-                                    ],
-                                    config:[
-                                        {
-                                            label: "Class",
-                                            description: "Set a css class",
-                                            key: "class",
-                                            view: "textstring"
-                                        }
-                                    ],
-                                    columns: 12,
-                                    templates:[
-                                        {
-                                            name: "1 column layout",
-                                            sections: [
-                                                {
-                                                    grid: 12
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            name: "2 column layout",
-                                            sections: [
-                                                {
-                                                    grid: 4
-                                                },
-                                                {
-                                                    grid: 8
-                                                }
-                                            ]
-                                        }
-                                    ],
-
-
-                                    layouts:[
-                                        {
-                                            name: "Headline",
-                                            areas: [
-                                                {
-                                                    grid: 12,
-                                                    editors: ["headline"]
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            name: "Article",
-                                            areas: [
-                                                {
-                                                    grid: 12
-                                                },
-                                                {
-                                                    grid: 4
-                                                },
-                                                {
-                                                    grid: 8
-                                                },
-                                                {
-                                                    grid: 12
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                    }
-
-                                }
-                            }
-                        ]
-                    },
-                    {
-                        label: "Content",
-                        id: 2,
-                        properties: [
-                            { alias: "valTest", label: "Validation test", view: "validationtest", value: "asdfasdf" },
-                            { alias: "bodyText", label: "Body Text", description: "Here you enter the primary article contents", view: "rte", value: "<p>askjdkasj lasjd</p>", config: {} },
-                            { alias: "textarea", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } },
-                            { alias: "media", label: "Media picker", view: "mediapicker", value: "1234,23242,23232,23231", config: {multiPicker: 1} }
-                        ]
-                    },
-                    {
-                        label: "Sample Editor",
-                        id: 3,
-                        properties: [
-                            { alias: "datepicker", label: "Datepicker", view: "datepicker", config: { pickTime: false, format: "yyyy-MM-dd" } },
-                            { alias: "tags", label: "Tags", view: "tags", value: "" }
-                        ]
-                    },
-                    {
-                        label: "This",
-                        id: 4,
-                        properties: [
-                            { alias: "valTest4", label: "Validation test", view: "validationtest", value: "asdfasdf" },
-                            { alias: "bodyText4", label: "Body Text", description: "Here you enter the primary article contents", view: "rte", value: "<p>askjdkasj lasjd</p>", config: {} },
-                            { alias: "textarea4", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } },
-                            { alias: "content4", label: "Content picker", view: "contentpicker", value: "1234,23242,23232,23231" }
-                        ]
-                    },
-                    {
-                        label: "Is",
-                        id: 5,
-                        properties: [
-                            { alias: "valTest5", label: "Validation test", view: "validationtest", value: "asdfasdf" },
-                            { alias: "bodyText5", label: "Body Text", description: "Here you enter the primary article contents", view: "rte", value: "<p>askjdkasj lasjd</p>", config: {} },
-                            { alias: "textarea5", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } },
-                            { alias: "content5", label: "Content picker", view: "contentpicker", value: "1234,23242,23232,23231" }
-                        ]
-                    },
-                    {
-                        label: "Overflown",
-                        id: 6,
-                        properties: [
-                            { alias: "valTest6", label: "Validation test", view: "validationtest", value: "asdfasdf" },
-                            { alias: "bodyText6", label: "Body Text", description: "Here you enter the primary article contents", view: "rte", value: "<p>askjdkasj lasjd</p>", config: {} },
-                            { alias: "textarea6", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } },
-                            { alias: "content6", label: "Content picker", view: "contentpicker", value: "1234,23242,23232,23231" }
-                        ]
-                    },
-                    {
-                        label: "Generic Properties",
-                        id: 0,
-                        properties: [
-                            {
-                                label: 'Id',
-                                value: 1234,
-                                view: "readonlyvalue",
-                                alias: "_umb_id"
-                            },
-                            {
-                                label: 'Created by',
-                                description: 'Original author',
-                                value: "Administrator",
-                                view: "readonlyvalue",
-                                alias: "_umb_createdby"
-                            },
-                            {
-                                label: 'Created',
-                                description: 'Date/time this document was created',
-                                value: new Date().toIsoDateTimeString(),
-                                view: "readonlyvalue",
-                                alias: "_umb_createdate"
-                            },
-                            {
-                                label: 'Updated',
-                                description: 'Date/time this document was created',
-                                value: new Date().toIsoDateTimeString(),
-                                view: "readonlyvalue",
-                                alias: "_umb_updatedate"
-                            },                            
-                            {
-                                label: 'Document Type',
-                                value: "Home page",
-                                view: "readonlyvalue",
-                                alias: "_umb_doctype" 
-                            },
-                            {
-                                label: 'Publish at',
-                                description: 'Date/time to publish this document',
-                                value: new Date().toIsoDateTimeString(),
-                                view: "datepicker",
-                                alias: "_umb_releasedate"
-                            },
-                            { 
-                                label: 'Unpublish at',
-                                description: 'Date/time to un-publish this document',
-                                value: new Date().toIsoDateTimeString(),
-                                view: "datepicker",
-                                alias: "_umb_expiredate"
-                            },
-                            {
-                                label: 'Template', 
-                                value: "myTemplate",
-                                view: "dropdown",
-                                alias: "_umb_template",
-                                config: {
-                                    items: {
-                                        "" : "-- Choose template --",
-                                        "myTemplate" : "My Templates",
-                                        "home" : "Home Page",
-                                        "news" : "News Page"
-                                    }
-                                }
-                            },
-                            {
-                                label: 'Link to document',
-                                value: ["/testing" + id, "http://localhost/testing" + id, "http://mydomain.com/testing" + id].join(),
-                                view: "urllist",
-                                alias: "_umb_urllist"
-                            },
-                            {
-                                alias: "test", label: "Stuff", view: "test", value: "",
-                                config: {
-                                    fields: [
-                                                { alias: "embedded", label: "Embbeded", view: "textstring", value: "" },
-                                                { alias: "embedded2", label: "Embbeded 2", view: "contentpicker", value: "" },
-                                                { alias: "embedded3", label: "Embbeded 3", view: "textarea", value: "" },
-                                                { alias: "embedded4", label: "Embbeded 4", view: "datepicker", value: "" }
-                                    ]
-                                }
-                            }
-                        ]
-                    }
-                    ]
-                };
-
-                return node;
-            },
-
-
-            /** Creats a mock variant content object */
-            getMockVariantContent: function(id, key, udi) {
-                key = key || String.CreateGuid();
-                udi = udi || udiService.build("content", key);
-                var node = {
-                    name: "My content with id: " + id,
-                    updateDate: new Date().toIsoDateTimeString(),
-                    publishDate: new Date().toIsoDateTimeString(),
-                    createDate: new Date().toIsoDateTimeString(),
-                    id: id,
-                    key: key,
-                    udi: udi,
-                    parentId: 1234,
-                    icon: "icon-umb-content",
-                    owner: { name: "Administrator", id: 0 },
-                    updater: { name: "Per Ploug Krogslund", id: 1 },
-                    path: "-1,1234,2455",
-                    allowedActions: ["U", "H", "A"],
-                    contentTypeAlias: "testAlias", 
-                    contentTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", 
-                    apps: [],
-                    variants: [
-                        {
-                            name: "",
-                            language: null,
-                            segment: null,
-                            state: "NotCreated",
-                            updateDate: "0001-01-01 00:00:00",
-                            createDate: "0001-01-01 00:00:00",
-                            publishDate: null,
-                            releaseDate: null,
-                            expireDate: null,
-                            notifications: [],
-                            tabs: [
-                                {
-                                    label: "Content",
-                                    id: 2,
-                                    properties: [
-                                        { alias: "testproperty", label: "Test property", view: "textbox", value: "asdfghjk" },
-                                        { alias: "valTest", label: "Validation test", view: "validationtest", value: "asdfasdf" },
-                                        { alias: "bodyText", label: "Body Text", description: "Here you enter the primary article contents", view: "rte", value: "<p>askjdkasj lasjd</p>", config: {} },
-                                        { alias: "textarea", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } },
-                                        { alias: "media", label: "Media picker", view: "mediapicker", value: "1234,23242,23232,23231", config: {multiPicker: 1} }
-                                    ]
-                                },
-                                {
-                                    label: "Sample Editor",
-                                    id: 3,
-                                    properties: [
-                                        { alias: "datepicker", label: "Datepicker", view: "datepicker", config: { pickTime: false, format: "yyyy-MM-dd" } },
-                                        { alias: "tags", label: "Tags", view: "tags", value: "" }
-                                    ]
-                                },
-                                {
-                                    label: "This",
-                                    id: 4,
-                                    properties: [
-                                        { alias: "valTest4", label: "Validation test", view: "validationtest", value: "asdfasdf" },
-                                        { alias: "bodyText4", label: "Body Text", description: "Here you enter the primary article contents", view: "rte", value: "<p>askjdkasj lasjd</p>", config: {} },
-                                        { alias: "textarea4", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } },
-                                        { alias: "content4", label: "Content picker", view: "contentpicker", value: "1234,23242,23232,23231" }
-                                    ]
-                                },
-                                {
-                                    label: "Is",
-                                    id: 5,
-                                    properties: [
-                                        { alias: "valTest5", label: "Validation test", view: "validationtest", value: "asdfasdf" },
-                                        { alias: "bodyText5", label: "Body Text", description: "Here you enter the primary article contents", view: "rte", value: "<p>askjdkasj lasjd</p>", config: {} },
-                                        { alias: "textarea5", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } },
-                                        { alias: "content5", label: "Content picker", view: "contentpicker", value: "1234,23242,23232,23231" }
-                                    ]
-                                },
-                                {
-                                    label: "Overflown",
-                                    id: 6,
-                                    properties: [
-                                        { alias: "valTest6", label: "Validation test", view: "validationtest", value: "asdfasdf" },
-                                        { alias: "bodyText6", label: "Body Text", description: "Here you enter the primary article contents", view: "rte", value: "<p>askjdkasj lasjd</p>", config: {} },
-                                        { alias: "textarea6", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } },
-                                        { alias: "content6", label: "Content picker", view: "contentpicker", value: "1234,23242,23232,23231" }
-                                    ]
-                                },
-                                {
-                                    label: "Generic Properties",
-                                    id: 0,
-                                    properties: [
-                                        {
-                                            label: 'Id',
-                                            value: 1234,
-                                            view: "readonlyvalue",
-                                            alias: "_umb_id"
-                                        },
-                                        {
-                                            label: 'Created by',
-                                            description: 'Original author',
-                                            value: "Administrator",
-                                            view: "readonlyvalue",
-                                            alias: "_umb_createdby"
-                                        },
-                                        {
-                                            label: 'Created',
-                                            description: 'Date/time this document was created',
-                                            value: new Date().toIsoDateTimeString(),
-                                            view: "readonlyvalue",
-                                            alias: "_umb_createdate"
-                                        },
-                                        {
-                                            label: 'Updated',
-                                            description: 'Date/time this document was created',
-                                            value: new Date().toIsoDateTimeString(),
-                                            view: "readonlyvalue",
-                                            alias: "_umb_updatedate"
-                                        },                            
-                                        {
-                                            label: 'Document Type',
-                                            value: "Home page",
-                                            view: "readonlyvalue",
-                                            alias: "_umb_doctype" 
-                                        },
-                                        {
-                                            label: 'Publish at',
-                                            description: 'Date/time to publish this document',
-                                            value: new Date().toIsoDateTimeString(),
-                                            view: "datepicker",
-                                            alias: "_umb_releasedate"
-                                        },
-                                        { 
-                                            label: 'Unpublish at',
-                                            description: 'Date/time to un-publish this document',
-                                            value: new Date().toIsoDateTimeString(),
-                                            view: "datepicker",
-                                            alias: "_umb_expiredate"
-                                        },
-                                        {
-                                            label: 'Template', 
-                                            value: "myTemplate",
-                                            view: "dropdown",
-                                            alias: "_umb_template",
-                                            config: {
-                                                items: {
-                                                    "" : "-- Choose template --",
-                                                    "myTemplate" : "My Templates",
-                                                    "home" : "Home Page",
-                                                    "news" : "News Page"
-                                                }
-                                            }
-                                        },
-                                        {
-                                            label: 'Link to document',
-                                            value: ["/testing" + id, "http://localhost/testing" + id, "http://mydomain.com/testing" + id].join(),
-                                            view: "urllist",
-                                            alias: "_umb_urllist"
-                                        },
-                                        {
-                                            alias: "test", label: "Stuff", view: "test", value: "",
-                                            config: {
-                                                fields: [
-                                                            { alias: "embedded", label: "Embbeded", view: "textstring", value: "" },
-                                                            { alias: "embedded2", label: "Embbeded 2", view: "contentpicker", value: "" },
-                                                            { alias: "embedded3", label: "Embbeded 3", view: "textarea", value: "" },
-                                                            { alias: "embedded4", label: "Embbeded 4", view: "datepicker", value: "" }
-                                                ]
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                };
-
-                return node;
-            },
-
-            getMockEntity : function(id){
-                return {name: "hello", id: id, icon: "icon-file"};
-            },
-
-            /** generally used for unit tests, calling this will disable the auth check and always return true */
-            disableAuth: function() {
-                doAuth = false;
-            },
-
-            /** generally used for unit tests, calling this will enabled the auth check */
-            enabledAuth: function() {
-                doAuth = true;
-            }, 
-
-            /** Checks for our mock auth cookie, if it's not there, returns false */
-            checkAuth: function () {
-                if (doAuth) {
-                    var mockAuthCookie = $cookies.get("mockAuthCookie");
-                    if (!mockAuthCookie) {
-                        return false;
-                    }
-                    return true;
-                }
-                else {
-                    return true;
-                }
-            },
-            
-            /** Creates/sets the auth cookie with a value indicating the user is now authenticated */
-            setAuth: function() {
-                //set the cookie for loging
-                $cookies.put("mockAuthCookie", "Logged in!");
-            },
-            
-            /** removes the auth cookie  */
-            clearAuth: function() {
-                $cookies.remove("mockAuthCookie");
-            },
-
-            urlRegex: function(url) {
-                url = url.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-                return new RegExp("^" + url);
-            },
-
-            getParameterByName: function(url, name) {
-                name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-
-                var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-                    results = regex.exec(url);
-
-                return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
-            },
-
-            getParametersByName: function(url, name) {
-                name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-
-                var regex = new RegExp(name + "=([^&#]*)", "mg"), results = [];
-                var match;
-
-                while ( ( match = regex.exec(url) ) !== null )
-                {
-                    results.push(decodeURIComponent(match[1].replace(/\+/g, " ")));
-                }
-                
-                return results;
-            },
-
-            getObjectPropertyFromJsonString: function(data, name) {
-                var obj = JSON.parse(data);
-                return obj[name];
-            }
-        };
-    }]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/auth.resource.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/auth.resource.js
deleted file mode 100644
index 2953347f55..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/auth.resource.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
-* @ngdoc service
-* @name umbraco.mocks.authMocks
-* @description
-* Mocks data retrival for the auth service
-**/
-function authMocks($httpBackend, mocksUtils) {
-
-    /** internal method to mock the current user to be returned */
-    function getCurrentUser() {
-
-        if (!mocksUtils.checkAuth()) {
-            return [401, null, null];
-        }
-
-        var currentUser = {
-            "email":"warren@umbraco.com",
-            "locale":"en-US",
-            "emailHash":"da0673cb2c930ee247e8ba5ebe4355bf",
-            "userGroups":[
-                "admin",
-                "sensitiveData"
-            ],
-            "remainingAuthSeconds":1178.2645038,
-            "startContentIds":[-1],
-            "startMediaIds":[-1],
-            "avatars":[
-                "https://www.gravatar.com/avatar/da0673cb2c930ee247e8ba5ebe4355bf?d=404&s=30",
-                "https://www.gravatar.com/avatar/da0673cb2c930ee247e8ba5ebe4355bf?d=404&s=60",
-                "https://www.gravatar.com/avatar/da0673cb2c930ee247e8ba5ebe4355bf?d=404&s=90",
-                "https://www.gravatar.com/avatar/da0673cb2c930ee247e8ba5ebe4355bf?d=404&s=150",
-                "https://www.gravatar.com/avatar/da0673cb2c930ee247e8ba5ebe4355bf?d=404&s=300"
-            ],
-            "allowedSections":[
-                "content",
-                "forms",
-                "media",
-                "member",
-                "packages",
-                "settings",
-                "users"
-            ],
-            "id":-1,
-            "name":"Warren Buckley"
-        };
-
-        return [200, currentUser, null];
-    }
-
-    return {
-        register: function () {
-            $httpBackend
-              .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Authentication/GetCurrentUser'))
-              .respond(getCurrentUser);
-        }
-    };
-}
-
-angular.module('umbraco.mocks').factory('authMocks', ['$httpBackend', 'mocksUtils', authMocks]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/content.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/content.mocks.js
deleted file mode 100644
index 19234ed063..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/content.mocks.js
+++ /dev/null
@@ -1,172 +0,0 @@
-angular.module('umbraco.mocks').
-  factory('contentMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
-      'use strict';
-      
-      function returnChildren(status, data, headers) {
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          var pageNumber = Number(mocksUtils.getParameterByName(data, "pageNumber"));
-          var filter = mocksUtils.getParameterByName(data, "filter");
-          var pageSize = Number(mocksUtils.getParameterByName(data, "pageSize"));
-          var parentId = Number(mocksUtils.getParameterByName(data, "id"));
-
-          if (pageNumber === 0) {
-              pageNumber = 1;
-          }
-          var collection = { pageSize: pageSize, totalItems: 68, totalPages: 7, pageNumber: pageNumber, filter: filter };
-          collection.totalItems = 56 - (filter.length);
-          if (pageSize > 0) {
-              collection.totalPages = Math.round(collection.totalItems / collection.pageSize);
-          }
-          else {
-              collection.totalPages = 1;
-          }
-          collection.items = [];
-
-          if (collection.totalItems < pageSize || pageSize < 1) {
-              collection.pageSize = collection.totalItems;
-          } else {
-              collection.pageSize = pageSize;
-          }
-          
-          var id = 0;
-          for (var i = 0; i < collection.pageSize; i++) {
-              id = (parentId + i) * pageNumber;
-              var cnt = mocksUtils.getMockContent(id);
-
-              //here we fake filtering
-              if (filter !== '') {
-                  cnt.name = filter + cnt.name;
-              }
-
-              //set a fake sortOrder
-              cnt.sortOrder = i + 1;
-
-              collection.items.push(cnt);
-          }
-
-          return [200, collection, null];
-      }
-
-      function returnDeletedNode(status, data, headers) {
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-          
-          return [200, null, null];
-      }
-
-      function returnEmptyNode(status, data, headers) {
-
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          var response = returnNodebyId(200, "", null);
-          var node = response[1];
-          var parentId = mocksUtils.getParameterByName(data, "parentId") || 1234;
-
-          node.name = "";
-          node.id = 0;
-          node.parentId = parentId;
-
-          $(node.tabs).each(function(i,tab){
-              $(tab.properties).each(function(i, property){
-                  property.value = "";
-              });
-          });
-
-          return response;
-      }
-
-      function returnNodebyId(status, data, headers) {
-
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          var id = mocksUtils.getParameterByName(data, "id") || "1234";
-          id = parseInt(id, 10);
-
-          var node = mocksUtils.getMockContent(id);
-
-          return [200, node, null];
-      }
-      
-      function returnNodebyIds(status, data, headers) {
-
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          var ids = mocksUtils.getParameterByName(data, "ids") || [1234,23324,2323,23424];
-          var nodes = [];
-
-          $(ids).each(function(i, id){
-            var _id = parseInt(id, 10);
-            nodes.push(mocksUtils.getMockContent(_id)); 
-          });
-          
-          return [200, nodes, null];
-      }
-
-      function returnSort(status, data, headers) {
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-          
-          return [200, null, null];
-      }
-      
-      function returnSave(status, data, headers) {
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          return [200, null, null];
-      }
-
-      return {
-          register: function () {
-
-              $httpBackend
-                  .whenPOST(mocksUtils.urlRegex('/umbraco/UmbracoApi/Content/PostSave'))
-                  .respond(returnSave);
-
-              $httpBackend
-                  .whenPOST(mocksUtils.urlRegex('/umbraco/UmbracoApi/Content/PostSort'))
-                  .respond(returnSort);
-
-              $httpBackend
-                  .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Content/GetChildren'))
-                  .respond(returnChildren);
-
-              $httpBackend
-                  .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Content/GetByIds'))
-                  .respond(returnNodebyIds);
-
-              $httpBackend
-                  .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Content/GetById?'))
-                  .respond(returnNodebyId);
-
-              $httpBackend
-                  .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Content/GetEmpty'))
-                  .respond(returnEmptyNode);
-
-              $httpBackend
-                  .whenDELETE(mocksUtils.urlRegex('/umbraco/UmbracoApi/Content/DeleteById'))
-                  .respond(returnDeletedNode);
-              
-              $httpBackend
-                  .whenDELETE(mocksUtils.urlRegex('/umbraco/UmbracoApi/Content/EmptyRecycleBin'))
-                  .respond(returnDeletedNode);
-          },
-
-          expectGetById: function() {
-              $httpBackend
-                  .expectGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Content/GetById'));
-          }
-      };
-  }]);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/contenttype.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/contenttype.mocks.js
deleted file mode 100644
index 6d0770b7e3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/contenttype.mocks.js
+++ /dev/null
@@ -1,31 +0,0 @@
-angular.module('umbraco.mocks').
-  factory('contentTypeMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
-      'use strict';
-      
-      function returnAllowedChildren(status, data, headers) {
-
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          var types = [
-                { name: "News Article", description: "Standard news article", alias: "newsArticle", id: 1234, icon: "icon-file", thumbnail: "icon-file" },
-                { name: "News Area", description: "Area to hold all news articles, there should be only one", alias: "newsArea", id: 1234, icon: "icon-suitcase", thumbnail: "icon-suitcase" },
-                { name: "Employee", description: "Employee profile information page", alias: "employee", id: 1234, icon: "icon-user", thumbnail: "icon-user" }
-          ];
-          return [200, types, null];
-      }
-
-      return {
-          register: function() {
-              $httpBackend
-                  .whenGET(mocksUtils.urlRegex('/umbraco/Api/ContentType/GetAllowedChildren'))
-                  .respond(returnAllowedChildren);
-                
-          },
-          expectAllowedChildren: function(){
-            console.log("expecting get");
-            $httpBackend.expectGET(mocksUtils.urlRegex('/umbraco/Api/ContentType/GetAllowedChildren'));
-          }
-      };
-  }]);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/dashboard.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/dashboard.mocks.js
deleted file mode 100644
index e19fabfe61..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/dashboard.mocks.js
+++ /dev/null
@@ -1,24 +0,0 @@
-angular.module('umbraco.mocks').
-  factory('dashboardMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
-      'use strict';
-      
-      function getDashboard(status, data, headers) {
-          //check for existence of a cookie so we can do login/logout in the belle app (ignore for tests).
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-          else {
-              // TODO: return real mocked data
-              return [200, [], null];
-          }
-      }
-
-      return {
-          register: function() {
-              
-              $httpBackend
-                  .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Dashboard/GetDashboard'))
-                  .respond(getDashboard);
-          }
-      };
-  }]);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/datatype.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/datatype.mocks.js
deleted file mode 100644
index e70f483bf4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/datatype.mocks.js
+++ /dev/null
@@ -1,113 +0,0 @@
-angular.module('umbraco.mocks').
-    factory('dataTypeMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
-        'use strict';
-
-        function returnById(status, data, headers) {
-
-            if (!mocksUtils.checkAuth()) {
-                return [401, null, null];
-            }
-
-            var id = mocksUtils.getParameterByName(data, "id") || 1234;
-
-            var selectedId = String.CreateGuid();
-
-            var dataType = mocksUtils.getMockDataType(id, selectedId);
-
-            return [200, dataType, null];
-        }
-
-        function returnEmpty(status, data, headers) {
-
-            if (!mocksUtils.checkAuth()) {
-                return [401, null, null];
-            }
-
-            var response = returnById(200, "", null);
-            var node = response[1];
-
-            node.name = "";
-            node.selectedEditor = "";
-            node.id = 0;
-            node.preValues = [];
-
-            return response;
-        }
-
-        function returnPreValues(status, data, headers) {
-
-            if (!mocksUtils.checkAuth()) {
-                return [401, null, null];
-            }
-
-            var editorId = mocksUtils.getParameterByName(data, "editorId") || "83E9AD36-51A7-4440-8C07-8A5623AC6979";
-
-            var preValues = [
-                {
-                    label: "Custom pre value 1 for editor " + editorId,
-                    description: "Enter a value for this pre-value",
-                    key: "myPreVal",
-                    view: "requiredfield",
-                    validation: [
-                        {
-                            type: "Required"
-                        }
-                    ]
-                },
-                {
-                    label: "Custom pre value 2 for editor " + editorId,
-                    description: "Enter a value for this pre-value",
-                    key: "myPreVal",
-                    view: "requiredfield",
-                    validation: [
-                        {
-                            type: "Required"
-                        }
-                    ]
-                }
-            ];
-            return [200, preValues, null];
-        }
-
-        function returnSave(status, data, headers) {
-            if (!mocksUtils.checkAuth()) {
-                return [401, null, null];
-            }
-
-            var postedData = JSON.parse(headers);
-
-            var dataType = mocksUtils.getMockDataType(postedData.id, postedData.selectedEditor);
-            dataType.notifications = [{
-                header: "Saved",
-                message: "Data type saved",
-                type: 0
-            }];
-
-            return [200, dataType, null];
-        }
-
-        return {
-            register: function () {
-
-                $httpBackend
-                    .whenPOST(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/PostSave'))
-                    .respond(returnSave);
-
-                $httpBackend
-                    .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/GetById'))
-                    .respond(returnById);
-
-                $httpBackend
-                    .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/GetEmpty'))
-                    .respond(returnEmpty);
-
-                $httpBackend
-                    .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/GetPreValues'))
-                    .respond(returnPreValues);
-            },
-            expectGetById: function () {
-                $httpBackend
-                    .expectGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/GetById'));
-            }
-        };
-    }]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/entity.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/entity.mocks.js
deleted file mode 100644
index 08c28fcbd1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/entity.mocks.js
+++ /dev/null
@@ -1,102 +0,0 @@
-angular.module('umbraco.mocks').
-  factory('entityMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
-      'use strict';
-
-      function returnEntitybyId(status, data, headers) {
-
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          var id = mocksUtils.getParameterByName(data, "id") || "1234";
-          id = parseInt(id, 10);
-
-          var node = mocksUtils.getMockEntity(id);
-
-          return [200, node, null];
-      }
-
-      function returnEntitybyIds(status, data, headers) {
-
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-          
-          var ids = mocksUtils.getParametersByName(data, "ids") || [1234, 23324, 2323, 23424];
-          
-          var nodes = [];
-
-          $(ids).each(function (i, id) {
-              var _id = parseInt(id, 10);
-              nodes.push(mocksUtils.getMockEntity(_id));
-          });
-
-          return [200, nodes, null];
-      }
-
-      function returnUrlsByIds(status, data, headers) {
-
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          return [200, {}, null];
-      }
-
-      function returnEntitybyIdsPost(method, url, data, headers) {
-
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          var ids = mocksUtils.getObjectPropertyFromJsonString(data, "ids") || [1234, 23324, 2323, 23424];
-          
-          var nodes = [];
-
-          $(ids).each(function (i, id) {
-              var _id = parseInt(id, 10);
-              nodes.push(mocksUtils.getMockEntity(_id));
-          });
-
-          return [200, nodes, null];
-      }
-
-      function returnEntityUrl() {
-
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          return [200, "url", null];
-
-      }
-
-      return {
-          register: function () {
-
-              $httpBackend
-                  .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Entity/GetByIds'))
-                  .respond(returnEntitybyIds);
-
-              $httpBackend
-                  .whenPOST(mocksUtils.urlRegex('/umbraco/UmbracoApi/Entity/GetByIds'))
-                  .respond(returnEntitybyIdsPost);
-
-              $httpBackend
-                  .whenPOST(mocksUtils.urlRegex('/umbraco/UmbracoApi/Entity/GetUrlsByIds'))
-                  .respond(returnUrlsByIds);
-
-              $httpBackend
-                  .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Entity/GetAncestors'))
-                  .respond(returnEntitybyIds);
-
-              $httpBackend
-                  .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Entity/GetById?'))
-                  .respond(returnEntitybyId);
-            
-            $httpBackend
-                  .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Entity/GetUrl?'))
-                    .respond(returnEntityUrl);
-          }
-      };
-  }]);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/macro.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/macro.mocks.js
deleted file mode 100644
index 435bdd3486..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/macro.mocks.js
+++ /dev/null
@@ -1,32 +0,0 @@
-angular.module('umbraco.mocks').
-  factory('macroMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
-      'use strict';
-      
-      function returnParameters(status, data, headers) {
-
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          var nodes = [{
-              alias: "parameter1",
-              name: "Parameter 1"              
-          }, {
-              alias: "parameter2",
-              name: "Parameter 2"
-          }];
-          
-          return [200, nodes, null];
-      }
-
-
-      return {
-          register: function () {
-
-              $httpBackend
-                  .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Macro/GetMacroParameters'))
-                  .respond(returnParameters);
-
-          }
-      };
-  }]);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js
deleted file mode 100644
index aeb6229360..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js
+++ /dev/null
@@ -1,93 +0,0 @@
-angular.module('umbraco.mocks').
-  factory('mediaMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
-      'use strict';
-      
-      function returnNodeCollection(status, data, headers){
-        var nodes = [{"properties":[{"id":348,"value":"/media/1045/windows95.jpg","alias":"umbracoFile"},{"id":349,"value":"640","alias":"umbracoWidth"},{"id":350,"value":"472","alias":"umbracoHeight"},{"id":351,"value":"53472","alias":"umbracoBytes"},{"id":352,"value":"jpg","alias":"umbracoExtension"}],"updateDate":"2013-08-27 15:50:08","createDate":"2013-08-27 15:50:08","owner":{"id":0,"name":"admin"},"updater":null,"contentTypeAlias":"Image","sortOrder":0,"name":"windows95.jpg","id":1128,"icon":"mediaPhoto.gif","parentId":1127},{"properties":[{"id":353,"value":"/media/1046/pete.png","alias":"umbracoFile"},{"id":354,"value":"240","alias":"umbracoWidth"},{"id":355,"value":"240","alias":"umbracoHeight"},{"id":356,"value":"87408","alias":"umbracoBytes"},{"id":357,"value":"png","alias":"umbracoExtension"}],"updateDate":"2013-08-27 15:50:08","createDate":"2013-08-27 15:50:08","owner":{"id":0,"name":"admin"},"updater":null,"contentTypeAlias":"Image","sortOrder":1,"name":"pete.png","id":1129,"icon":"mediaPhoto.gif","parentId":1127},{"properties":[{"id":358,"value":"/media/1047/unicorn.jpg","alias":"umbracoFile"},{"id":359,"value":"640","alias":"umbracoWidth"},{"id":360,"value":"640","alias":"umbracoHeight"},{"id":361,"value":"577380","alias":"umbracoBytes"},{"id":362,"value":"jpg","alias":"umbracoExtension"}],"updateDate":"2013-08-27 15:50:09","createDate":"2013-08-27 15:50:09","owner":{"id":0,"name":"admin"},"updater":null,"contentTypeAlias":"Image","sortOrder":2,"name":"unicorn.jpg","id":1130,"icon":"mediaPhoto.gif","parentId":1127},{"properties":[{"id":363,"value":"/media/1049/exploding-head.gif","alias":"umbracoFile"},{"id":364,"value":"500","alias":"umbracoWidth"},{"id":365,"value":"279","alias":"umbracoHeight"},{"id":366,"value":"451237","alias":"umbracoBytes"},{"id":367,"value":"gif","alias":"umbracoExtension"}],"updateDate":"2013-08-27 15:50:09","createDate":"2013-08-27 15:50:09","owner":{"id":0,"name":"admin"},"updater":null,"contentTypeAlias":"Image","sortOrder":3,"name":"exploding head.gif","id":1131,"icon":"mediaPhoto.gif","parentId":1127},{"properties":[{"id":368,"value":"/media/1048/bighead.jpg","alias":"umbracoFile"},{"id":369,"value":"1240","alias":"umbracoWidth"},{"id":370,"value":"1655","alias":"umbracoHeight"},{"id":371,"value":"836261","alias":"umbracoBytes"},{"id":372,"value":"jpg","alias":"umbracoExtension"}],"updateDate":"2013-08-27 15:50:09","createDate":"2013-08-27 15:50:09","owner":{"id":0,"name":"admin"},"updater":null,"contentTypeAlias":"Image","sortOrder":4,"name":"bighead.jpg","id":1132,"icon":"mediaPhoto.gif","parentId":1127},{"properties":[{"id":373,"value":"/media/1050/powerlines.jpg","alias":"umbracoFile"},{"id":374,"value":"636","alias":"umbracoWidth"},{"id":375,"value":"423","alias":"umbracoHeight"},{"id":376,"value":"79874","alias":"umbracoBytes"},{"id":377,"value":"jpg","alias":"umbracoExtension"}],"updateDate":"2013-08-27 15:50:09","createDate":"2013-08-27 15:50:09","owner":{"id":0,"name":"admin"},"updater":null,"contentTypeAlias":"Image","sortOrder":5,"name":"powerlines.jpg","id":1133,"icon":"mediaPhoto.gif","parentId":1127},{"properties":[{"id":430,"value":"","alias":"contents"}],"updateDate":"2013-08-30 08:53:22","createDate":"2013-08-30 08:53:22","owner":{"id":0,"name":"admin"},"updater":null,"contentTypeAlias":"Folder","sortOrder":6,"name":"new folder","id":1146,"icon":"folder.gif","parentId":1127}];
-        return [200, nodes, null];
-      }
-
-      function returnNodebyIds(status, data, headers) {
-        var ids = mocksUtils.getParameterByName(data, "ids") || ['1234','1234','4234'];
-        var items = [];
-        
-        for (var i = 0; i < ids.length; i += 1) {
-          items.push(_getNode(parseInt(ids[i], 10)));
-        }
-
-        return [200, items, null];
-      }
-
-      function returnNodebyId(status, data, headers) {
-
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          var id = mocksUtils.getParameterByName(data, "id") || 1234;
-          id = parseInt(id, 10);
-          
-          return [200, _getNode(id), null];
-      }
-      
-      function _getNode(id){
-        var node = {
-            name: "My media with id: " + id,
-            updateDate: new Date(),
-            publishDate: new Date(),
-            id: id,
-            parentId: 1234,
-            icon: "icon-file-alt",
-            owner: {name: "Administrator", id: 0},
-            updater: {name: "Per Ploug Krogslund", id: 1},
-            path: "-1,1234,2455", 
-            tabs: [
-            {
-                label: "Media",
-                alias: "tab0",
-                id: 0,
-                properties: [
-                    { alias: "umbracoFile", label: "File", description:"Some file", view: "rte", value: "/media/1234/random.jpg" }
-                ]
-            }
-            ],
-            apps: [
-                {
-                    alias: "content",
-                    name: "Content",
-                    icon: "icon-document",
-                    view: "views/media/apps/content/content.html"
-                },
-                {
-                    alias: "info",
-                    name: "Info",
-                    icon: "icon-info",
-                    view: "views/media/apps/info/info.html"
-                }
-            ]
-        };
-
-        return node;
-      }
-
-      return {
-          register: function() {
-            $httpBackend
-              .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Media/GetById?'))
-              .respond(returnNodebyId);
-
-            $httpBackend
-              .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Media/GetByIds?'))
-              .respond(returnNodebyIds);
-                            
-            $httpBackend
-              .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Media/GetChildren'))
-              .respond(returnNodeCollection);
-
-          },
-          expectGetById: function() {
-            $httpBackend
-              .expectGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Media/GetById'));
-          }
-      };
-  }]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/section.resource.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/section.resource.js
deleted file mode 100644
index 387e7b4e63..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/section.resource.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
-* @ngdoc service
-* @name umbraco.mocks.sectionMocks
-* @description 
-* Mocks data retrival for the sections
-**/
-function sectionMocks($httpBackend, mocksUtils) {
-
-    /** internal method to mock the sections to be returned */
-    function getSections() {
-        
-        if (!mocksUtils.checkAuth()) {
-            return [401, null, null];
-        }
-
-        var sections = [
-            { name: "Content", cssclass: "icon-umb-content", alias: "content" },
-            { name: "Media", cssclass: "icon-umb-media", alias: "media" },
-            { name: "Settings", cssclass: "icon-umb-settings", alias: "settings" },
-            { name: "Developer", cssclass: "icon-umb-developer", alias: "developer" },
-            { name: "Users", cssclass: "icon-umb-users", alias: "users" },
-            { name: "Developer", cssclass: "icon-umb-developer", alias: "developer" },
-            { name: "Users", cssclass: "icon-umb-users", alias: "users" }
-        ];
-        
-        return [200, sections, null];
-    }
-    
-    return {
-        register: function () {
-            $httpBackend
-              .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Section/GetSections'))
-              .respond(getSections);
-        }
-    };
-}
-
-angular.module('umbraco.mocks').factory('sectionMocks', ['$httpBackend', 'mocksUtils', sectionMocks]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/tree.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/tree.mocks.js
deleted file mode 100644
index 3d2c77f2b4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/tree.mocks.js
+++ /dev/null
@@ -1,242 +0,0 @@
-angular.module('umbraco.mocks').
-  factory('treeMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
-      'use strict';
-      
-      function getMenuItems() {
-
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          var menu = [
-              { name: "Create", cssclass: "plus", alias: "create", metaData: {} },
-
-              { separator: true, name: "Delete", cssclass: "remove", alias: "delete", metaData: {} },
-              { name: "Move", cssclass: "move", alias: "move", metaData: {} },
-              { name: "Copy", cssclass: "copy", alias: "copy", metaData: {} },
-              { name: "Sort", cssclass: "sort", alias: "sort", metaData: {} },
-
-              { separator: true, name: "Publish", cssclass: "globe", alias: "publish", metaData: {} },
-              { name: "Rollback", cssclass: "undo", alias: "rollback", metaData: {} },
-
-              { separator: true, name: "Permissions", cssclass: "lock", alias: "permissions", metaData: {} },
-              { name: "Audit Trail", cssclass: "time", alias: "audittrail", metaData: {} },
-              { name: "Notifications", cssclass: "envelope", alias: "notifications", metaData: {} },
-
-              { separator: true, name: "Hostnames", cssclass: "home", alias: "hostnames", metaData: {} },
-              { name: "Public Access", cssclass: "group", alias: "publicaccess", metaData: {} },
-
-              { separator: true, name: "Reload", cssclass: "refresh", alias: "users", metaData: {} },
-          
-                { separator: true, name: "Empty Recycle Bin", cssclass: "trash", alias: "emptyRecycleBin", metaData: {} }
-          ];
-
-          var result = {
-              menuItems: menu,
-              defaultAlias: "create"
-          };
-
-          return [200, result, null];
-      }
-
-      function returnChildren(status, data, headers) {
-          
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          var id = mocksUtils.getParameterByName(data, "id");
-          var section = mocksUtils.getParameterByName(data, "treeType");
-          var level = mocksUtils.getParameterByName(data, "level")+1;
-
-          var url = "/umbraco/UmbracoTrees/ApplicationTreeApi/GetChildren?treeType=" + section + "&id=1234&level=" + level;
-          var menuUrl = "/umbraco/UmbracoTrees/ApplicationTreeApi/GetMenu?treeType=" + section + "&id=1234&parentId=456";
-          
-          //hack to have create as default content action
-          var action;
-          if (section === "content") {
-              action = "create";
-          }
-
-          var children = [
-              { name: "child-of-" + section, childNodesUrl: url, id: level + "" + 1234, icon: "icon-document", children: [], expanded: false, hasChildren: true, level: level, menuUrl: menuUrl },
-              { name: "random-name-" + section, childNodesUrl: url, id: level + "" + 1235, icon: "icon-document", children: [], expanded: false, hasChildren: true, level: level, menuUrl: menuUrl },
-              { name: "random-name-" + section, childNodesUrl: url, id: level + "" + 1236, icon: "icon-document", children: [], expanded: false, hasChildren: true, level: level, menuUrl: menuUrl },
-              { name: "random-name-" + section, childNodesUrl: url, id: level + "" + 1237, icon: "icon-document", routePath: "common/legacy/1237?p=" + encodeURI("developer/contentType.aspx?idequal1234"), children: [], expanded: false, hasChildren: true, level: level, menuUrl: menuUrl }
-          ];
-
-          return [200, children, null];
-      }
-
-      function returnDataTypes(status, data, headers) {
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-          
-          var children = [
-              { name: "Textstring", childNodesUrl: null, id: 10, icon: "icon-document", children: [], expanded: false, hasChildren: false, level: 1,  menuUrl: null },
-              { name: "Multiple textstring", childNodesUrl: null, id: 11, icon: "icon-document", children: [], expanded: false, hasChildren: false, level: 1,  menuUrl: null },
-              { name: "Yes/No", childNodesUrl: null, id: 12, icon: "icon-document", children: [], expanded: false, hasChildren: false, level: 1,  menuUrl: null },
-              { name: "Rich Text Editor", childNodesUrl: null, id: 13, icon: "icon-document", children: [], expanded: false, hasChildren: false, level: 1,  menuUrl: null }
-          ];  
-          
-          return [200, children, null];
-      }
-      
-      function returnDataTypeMenu(status, data, headers) {
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          var menu = [
-              {
-                   name: "Create", cssclass: "plus", alias: "create", metaData: {
-                       jsAction: "umbracoMenuActions.CreateChildEntity"
-                   }
-              },              
-              { separator: true, name: "Reload", cssclass: "refresh", alias: "users", metaData: {} }
-          ];
-
-          return [200, menu, null];
-      }
-
-      function returnApplicationTrees(status, data, headers) {
-
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-
-          var section = mocksUtils.getParameterByName(data, "application");
-          var url = "/umbraco/UmbracoTrees/ApplicationTreeApi/GetChildren?treeType=" + section + "&id=1234&level=1";
-          var menuUrl = "/umbraco/UmbracoTrees/ApplicationTreeApi/GetMenu?treeType=" + section + "&id=1234&parentId=456";
-          var t;
-          switch (section) {
-
-              case "content":
-                  t = {
-                      name: "content",
-                      id: -1,
-                      children: [
-                          { name: "My website", id: 1234, childNodesUrl: url, icon: "icon-home", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
-                          { name: "Components", id: 1235, childNodesUrl: url, icon: "icon-document", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
-                          { name: "Archieve", id: 1236, childNodesUrl: url, icon: "icon-document", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
-                          { name: "Recycle Bin", id: -20, childNodesUrl: url, icon: "icon-trash", routePath: section + "/recyclebin", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl }
-                      ],
-                      expanded: true,
-                      hasChildren: true,
-                      level: 0,
-                      menuUrl: menuUrl,
-                      metaData: { treeAlias: "content" }
-                  };
-
-                  break;
-              case "media":
-                  t = {
-                      name: "media",
-                      id: -1,
-                      children: [
-                          { name: "random-name-" + section, childNodesUrl: url, id: 1234, icon: "icon-home", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
-                          { name: "random-name-" + section, childNodesUrl: url, id: 1235, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
-                          { name: "random-name-" + section, childNodesUrl: url, id: 1236, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
-                          { name: "random-name-" + section, childNodesUrl: url, id: 1237, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl }
-                      ],
-                      expanded: true,
-                      hasChildren: true,
-                      level: 0,
-                      menuUrl: menuUrl,
-                      metaData: { treeAlias: "media" }
-                  };
-
-                  break;
-              case "developer":                  
-
-                  var dataTypeChildrenUrl = "/umbraco/UmbracoTrees/DataTypeTree/GetNodes?id=-1&application=developer";
-                  var dataTypeMenuUrl = "/umbraco/UmbracoTrees/DataTypeTree/GetMenu?id=-1&application=developer";
-
-                  t = {
-                      name: "developer",
-                      id: -1,
-                      children: [
-                          { name: "Data types", childNodesUrl: dataTypeChildrenUrl, id: -1, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: dataTypeMenuUrl, metaData: { treeAlias: "dataTypes" } },
-                          { name: "Macros", childNodesUrl: url, id: -1, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl, metaData: { treeAlias: "macros" } },
-                          { name: "Packages", childNodesUrl: url, id: -1, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl, metaData: { treeAlias: "packager" } },
-                          { name: "Partial View Macros", childNodesUrl: url, id: -1, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl, metaData: { treeAlias: "partialViewMacros" } }
-                      ],
-                      expanded: true,
-                      hasChildren: true,
-                      level: 0,
-                      isContainer: true
-                  };
-
-                  break;
-              case "settings":
-                  t = {
-                      name: "settings",
-                      id: -1,
-                      children: [
-                          { name: "Stylesheets", childNodesUrl: url, id: -1, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl, metaData: { treeAlias: "stylesheets" } },
-                          { name: "Templates", childNodesUrl: url, id: -1, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl, metaData: { treeAlias: "templates" } },
-                          { name: "Dictionary", childNodesUrl: url, id: -1, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl, metaData: { treeAlias: "dictionary" } },
-                          { name: "Media types", childNodesUrl: url, id: -1, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl, metaData: { treeAlias: "mediaTypes" } },
-                          { name: "Document types", childNodesUrl: url, id: -1, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl, metaData: { treeAlias: "documentTypes" } }
-                      ],
-                      expanded: true,
-                      hasChildren: true,
-                      level: 0,
-                      isContainer: true
-                  };
-                  
-                  break;
-              default:
-                  
-                  t = {
-                      name: "randomTree",
-                      id: -1,
-                      children: [
-                          { name: "random-name-" + section, childNodesUrl: url, id: 1234, icon: "icon-home", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
-                          { name: "random-name-" + section, childNodesUrl: url, id: 1235, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
-                          { name: "random-name-" + section, childNodesUrl: url, id: 1236, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
-                          { name: "random-name-" + section, childNodesUrl: url, id: 1237, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl }
-                      ],
-                      expanded: true,
-                      hasChildren: true,
-                      level: 0,
-                      menuUrl: menuUrl,
-                      metaData: { treeAlias: "randomTree" }
-                  };
-
-                  break;
-          }
-
-      
-          return [200, t, null];
-      }
-
-
-      return {
-          register: function() {
-              
-              $httpBackend
-                 .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoTrees/ApplicationTreeApi/GetApplicationTrees'))
-                 .respond(returnApplicationTrees);
-
-              $httpBackend
-                 .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoTrees/ApplicationTreeApi/GetChildren'))
-                 .respond(returnChildren);
-              
-
-              $httpBackend
-                 .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoTrees/DataTypeTree/GetNodes'))
-                 .respond(returnDataTypes);
-              
-              $httpBackend
-                 .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoTrees/DataTypeTree/GetMenu'))
-                 .respond(returnDataTypeMenu);
-              
-              $httpBackend
-                 .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoTrees/ApplicationTreeApi/GetMenu'))
-                 .respond(getMenuItems);
-              
-          }
-      };
-  }]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/user.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/user.mocks.js
deleted file mode 100644
index d91001ae07..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/user.mocks.js
+++ /dev/null
@@ -1,88 +0,0 @@
-angular.module('umbraco.mocks').
-  factory('userMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
-      'use strict';
-
-      function generateMockedUser() {
-          // Ensure a new user object each call
-          return {
-              name: "Per Ploug",
-              email: "test@test.com",
-              emailHash: "f9879d71855b5ff21e4963273a886bfc",
-              id: 0,
-              locale: 'da-DK',
-              remainingAuthSeconds: 600,
-			  allowedSections: ["content", "media"]
-          };
-      }
-
-      function isAuthenticated() {
-          //check for existence of a cookie so we can do login/logout in the belle app (ignore for tests).
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-          else {
-              return [200, null, null];
-          }
-      }
-
-      function getCurrentUser(status, data, headers) {
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-          else {
-              return [200, generateMockedUser(), null];
-          }
-      }
-
-      function getRemainingTimeoutSeconds(status, data, headers) {
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-          else {
-              return [200, 600, null];
-          }
-      }
-
-      function returnUser(status, data, headers) {
-
-          //set the cookie for loging
-          mocksUtils.setAuth();
-
-          return [200, generateMockedUser(), null];
-      }
-      
-      function logout() {
-          
-          mocksUtils.clearAuth();
-
-          return [200, null, null];
-
-      }
-
-      return {
-          register: function() {
-              
-              $httpBackend
-                  .whenPOST(mocksUtils.urlRegex('/umbraco/UmbracoApi/Authentication/PostLogin'))
-                  .respond(returnUser);
-
-              $httpBackend
-                  .whenPOST(mocksUtils.urlRegex('/umbraco/UmbracoApi/Authentication/PostLogout'))
-                  .respond(logout);
-
-              $httpBackend
-                  .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Authentication/IsAuthenticated'))
-                  .respond(isAuthenticated);
-
-              $httpBackend
-                  .whenGET('/umbraco/UmbracoApi/Authentication/GetCurrentUser')
-                  .respond(getCurrentUser);
-
-              $httpBackend
-                  .whenGET('/umbraco/UmbracoApi/Authentication/GetRemainingTimeoutSeconds')
-                  .respond(getRemainingTimeoutSeconds);
-
-                
-          }
-      };
-  }]);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/variantcontent.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/variantcontent.mocks.js
deleted file mode 100644
index 3a434bdadc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/variantcontent.mocks.js
+++ /dev/null
@@ -1,56 +0,0 @@
-angular.module('umbraco.mocks').
-    factory('variantContentMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
-    'use strict';
-
-    function returnEmptyVariantNode(status, data, headers) {
-
-        if (!mocksUtils.checkAuth()) {
-            return [401, null, null];
-        }
-
-        var response = returnVariantNodebyId(200, "", null);
-        var node = response[1];
-        var parentId = mocksUtils.getParameterByName(data, "parentId") || 1234;
-
-        node.name = "";
-        node.id = 0;
-        node.parentId = parentId;
-
-        node.tabs.forEach(function(tab) {
-            tab.properties.forEach(function(property) {
-                property.value = "";
-            });
-        });
-
-        return response;
-    }
-
-    function returnVariantNodebyId(status, data, headers) {
-
-        if (!mocksUtils.checkAuth()) {
-            return [401, null, null];
-        }
-
-        var id = mocksUtils.getParameterByName(data, "id") || "1234";
-        id = parseInt(id, 10);
-
-        var node = mocksUtils.getMockVariantContent(id);
-
-        return [200, node, null];
-    }
-
-
-    return {
-        register: function () {
-
-            $httpBackend
-                .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Content/GetById?'))
-                .respond(returnVariantNodebyId);
-
-            $httpBackend
-                .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Content/GetEmpty'))
-                .respond(returnEmptyVariantNode);
-
-        }
-    };
-}]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/assetsService.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/assetsService.mocks.js
deleted file mode 100644
index 960acb01fb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/services/assetsService.mocks.js
+++ /dev/null
@@ -1,24 +0,0 @@
-angular.module('umbraco.mocks.services')
-.factory('assetsService', function ($q) {
-
-    return {
-        loadCss : function(path, scope, attributes, timeout){
-            var deferred = $q.defer();
-            deferred.resolve();
-            return deferred.promise;
-        },
-        loadJs : function(path, scope, attributes, timeout){
-            var deferred = $q.defer();
-            
-            if(path[0] !== "/"){
-                path = "/" + path;
-            }   
-
-            $.getScript( "base" + path, function( data, textStatus, jqxhr ) {
-                deferred.resolve();
-            });
-
-            return deferred.promise;
-        }
-    };
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/externalLoginInfo.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/externalLoginInfo.mocks.js
deleted file mode 100644
index f054c8493e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/services/externalLoginInfo.mocks.js
+++ /dev/null
@@ -1,8 +0,0 @@
-angular.module("umbraco.mocks").factory('externalLoginInfo',
-    function () {
-        return {
-            errors: [],
-            providers: []
-        };
-    }
-);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
deleted file mode 100644
index 76fb8be8c4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
+++ /dev/null
@@ -1,724 +0,0 @@
-angular.module('umbraco.mocks').
-  factory('localizationMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
-      'use strict';
-      
-      function getLanguageResource(status, data, headers) {
-          //check for existence of a cookie so we can do login/logout in the belle app (ignore for tests).
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-          else {
-              return [200, {
-                  "actions_assignDomain": "Culture and Hostnames",
-                  "actions_auditTrail": "Audit Trail",
-                  "actions_browse": "Browse Node",
-                  "actions_changeDocType": "Change Document Type",
-                  "actions_copy": "Copy",
-                  "actions_create": "Create",
-                  "actions_createPackage": "Create Package",
-                  "actions_delete": "Delete",
-                  "actions_disable": "Disable",
-                  "actions_emptyRecycleBin": "Empty recycle bin",
-                  "actions_exportDocumentType": "Export Document Type",
-                  "actions_importDocumentType": "Import Document Type",
-                  "actions_importPackage": "Import Package",
-                  "actions_liveEdit": "Edit in Canvas",
-                  "actions_logout": "Exit",
-                  "actions_move": "Move",
-                  "actions_notify": "Notifications",
-                  "actions_protect": "Public access",
-                  "actions_publish": "Publish",
-                  "actions_unpublish": "Unpublish",
-                  "actions_refreshNode": "Reload nodes",
-                  "actions_republish": "Republish entire site",
-                  "actions_rights": "Permissions",
-                  "actions_rollback": "Rollback",
-                  "actions_sendtopublish": "Send To Publish",
-                  "actions_sendToTranslate": "Send To Translation",
-                  "actions_sort": "Sort",
-                  "actions_translate": "Translate",
-                  "actions_update": "Update",
-                  "actions_exportContourForm": "Export form",
-                  "actions_importContourForm": "Import form",
-                  "actions_archiveContourForm": "Archive form",
-                  "actions_unarchiveContourForm": "Unarchive form",
-                  "actions_defaultValue": "Default value",
-                  "assignDomain_permissionDenied": "Permission denied.",
-                  "assignDomain_addNew": "Add new Domain",
-                  "assignDomain_remove": "remove",
-                  "assignDomain_invalidNode": "Invalid node.",
-                  "assignDomain_invalidDomain": "Invalid domain format.",
-                  "assignDomain_duplicateDomain": "Domain has already been assigned.",
-                  "assignDomain_domain": "Domain",
-                  "assignDomain_language": "Language",
-                  "assignDomain_domainCreated": "New domain '%0%' has been created",
-                  "assignDomain_domainDeleted": "Domain '%0%' is deleted",
-                  "assignDomain_domainExists": "Domain '%0%' has already been assigned",
-                  "assignDomain_domainHelp": "Valid domain names are: 'example.com', 'www.example.com', 'example.com:8080' or        'https://www.example.com/'.<br /><br />One-level paths in domains are supported, eg. 'example.com/en'. However, they        should be avoided. Better use the culture setting above.",
-                  "assignDomain_domainUpdated": "Domain '%0%' has been updated",
-                  "assignDomain_orEdit": "Edit Current Domains",
-                  "assignDomain_inherit": "Inherit",
-                  "assignDomain_setLanguage": "Culture",
-                  "assignDomain_setLanguageHelp": "Set the culture for nodes below the current node,<br /> or inherit culture from parent nodes. Will also apply<br />      to the current node, unless a domain below applies too.",
-                  "assignDomain_setDomains": "Domains",
-                  "auditTrails_atViewingFor": "Viewing for",
-                  "buttons_select": "Select",
-                  "buttons_somethingElse": "Do something else",
-                  "buttons_bold": "Bold",
-                  "buttons_deindent": "Cancel Paragraph Indent",
-                  "buttons_formFieldInsert": "Insert form field",
-                  "buttons_graphicHeadline": "Insert graphic headline",
-                  "buttons_htmlEdit": "Edit Html",
-                  "buttons_indent": "Indent Paragraph",
-                  "buttons_italic": "Italic",
-                  "buttons_justifyCenter": "Center",
-                  "buttons_justifyLeft": "Justify Left",
-                  "buttons_justifyRight": "Justify Right",
-                  "buttons_linkInsert": "Insert Link",
-                  "buttons_linkLocal": "Insert local link (anchor)",
-                  "buttons_listBullet": "Bullet List",
-                  "buttons_listNumeric": "Numeric List",
-                  "buttons_macroInsert": "Insert macro",
-                  "buttons_pictureInsert": "Insert picture",
-                  "buttons_relations": "Edit relations",
-                  "buttons_save": "Save",
-                  "buttons_saveAndPublish": "Save and publish",
-                  "buttons_saveToPublish": "Save and send for approval",
-                  "buttons_saveAndPreview": "Save and preview",
-                  "buttons_showPageDisabled": "Preview is disabled because there's no template assigned",
-                  "buttons_styleChoose": "Choose style",
-                  "buttons_styleShow": "Show styles",
-                  "buttons_tableInsert": "Insert table",
-                  "changeDocType_changeDocTypeInstruction": "To change the document type for the selected content, first select from the list of valid types for this location.",
-                  "changeDocType_changeDocTypeInstruction2": "Then confirm and/or amend the mapping of properties from the current type to the new, and click Save.",
-                  "changeDocType_contentRepublished": "The content has been re-published.",
-                  "changeDocType_currentProperty": "Current Property",
-                  "changeDocType_currentType": "Current type",
-                  "changeDocType_docTypeCannotBeChanged": "The document type cannot be changed, as there are no alternatives valid for this location.",
-                  "changeDocType_docTypeChanged": "Document Type Changed",
-                  "changeDocType_mapProperties": "Map Properties",
-                  "changeDocType_mapToProperty": "Map to Property",
-                  "changeDocType_newTemplate": "New Template",
-                  "changeDocType_newType": "New Type",
-                  "changeDocType_none": "none",
-                  "changeDocType_selectedContent": "Content",
-                  "changeDocType_selectNewDocType": "Select New Document Type",
-                  "changeDocType_successMessage": "The document type of the selected content has been successfully changed to [new type] and the following properties mapped:",
-                  "changeDocType_to": "to",
-                  "changeDocType_validationErrorPropertyWithMoreThanOneMapping": "Could not complete property mapping as one or more properties have more than one mapping defined.",
-                  "changeDocType_validDocTypesNote": "Only alternate types valid for the current location are displayed.",
-                  "content_about": "About this page",
-                  "content_alias": "Alias",
-                  "content_alternativeTextHelp": "(how would you describe the picture over the phone)",
-                  "content_alternativeUrls": "Alternative Links",
-                  "content_clickToEdit": "Click to edit this item",
-                  "content_createBy": "Created by",
-                  "content_createByDesc": "Original autho",
-                  "content_updatedBy": "Updated by",
-                  "content_createDate": "Created",
-                  "content_createDateDesc": "Date/time this document was created",
-                  "content_documentType": "Document Type",
-                  "content_editing": "Editing",
-                  "content_expireDate": "Remove at",
-                  "content_itemChanged": "This item has been changed after publication",
-                  "content_itemNotPublished": "This item is not published",
-                  "content_lastPublished": "Last published",
-                  "content_listViewNoItems": "There are no items show in the list.",
-                  "content_mediatype": "Media Type",
-                  "content_mediaLinks": "Link to media item(s)",
-                  "content_membergroup": "Member Group",
-                  "content_memberrole": "Role",
-                  "content_membertype": "Member Type",
-                  "content_noDate": "No date chosen",
-                  "content_nodeName": "Page Title",
-                  "defaultdialogs_nodeNameLinkPicker": "Link title",
-                  "content_otherElements": "Properties",
-                  "content_parentNotPublished": "This document is published but is not visible because the parent '%0%' is unpublished",
-                  "content_parentNotPublishedAnomaly": "This document is published but is not in the cache",
-                  "content_publish": "Publish",
-                  "content_publishStatus": "Publication Status",
-                  "content_releaseDate": "Publish at",
-                  "content_removeDate": "Clear Date",
-                  "content_resetFocalPoint": "Reset focal point",
-                  "content_sortDone": "Sortorder is updated",
-                  "content_sortHelp": "To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the 'shift' or 'control' key while selecting",
-                  "content_statistics": "Statistics",
-                  "content_titleOptional": "Title (optional)",
-                  "content_type": "Type",
-                  "content_unpublish": "Unpublish",
-                  "content_updateDate": "Last edited",
-                  "content_updateDateDesc": "Date/time this document was created",
-                  "content_uploadClear": "Remove file",
-                  "content_urls": "Link to document",
-                  "defaultdialogs_urlLinkPicker":"Link",
-                  "content_memberof": "Member of group(s)",
-                  "content_notmemberof": "Not a member of group(s)",
-                  "content_childItems": "Child items",
-                  "create_chooseNode": "Where do you want to create the new %0%",
-                  "create_createUnder": "Create a page under",
-                  "create_updateData": "Choose a type and a title",
-                  "create_noDocumentTypes": "There are no allowed document types available. You must enable these in the settings section under <strong>'document types'</strong>.",
-                  "create_noMediaTypes": "There are no allowed media types available. You must enable these in the settings section under <strong>'media types'</strong>.",
-                  "dashboard_browser": "Browse your website",
-                  "dashboard_dontShowAgain": "- Hide",
-                  "dashboard_nothinghappens": "If Umbraco isn't opening, you might need to allow popups from this site",
-                  "dashboard_openinnew": "has opened in a new window",
-                  "dashboard_restart": "Restart",
-                  "dashboard_visit": "Visit",
-                  "dashboard_welcome": "Welcome",
-                  "defaultdialogs_anchorInsert": "Name",
-                  "defaultdialogs_assignDomain": "Manage hostnames",
-                  "defaultdialogs_closeThisWindow": "Close this window",
-                  "defaultdialogs_confirmdelete": "Are you sure you want to delete",
-                  "defaultdialogs_confirmdisable": "Are you sure you want to disable",
-                  "defaultdialogs_confirmlogout": "Are you sure?",
-                  "defaultdialogs_confirmSure": "Are you sure?",
-                  "defaultdialogs_cut": "Cut",
-                  "defaultdialogs_editdictionary": "Edit Dictionary Item",
-                  "defaultdialogs_editlanguage": "Edit Language",
-                  "defaultdialogs_insertAnchor": "Insert local link",
-                  "defaultdialogs_insertCharacter": "Insert character",
-                  "defaultdialogs_insertgraphicheadline": "Insert graphic headline",
-                  "defaultdialogs_insertimage": "Insert picture",
-                  "defaultdialogs_insertlink": "Insert link",
-                  "defaultdialogs_insertMacro": "Click to add a Macro",
-                  "defaultdialogs_inserttable": "Insert table",
-                  "defaultdialogs_lastEdited": "Last Edited",
-                  "defaultdialogs_link": "Link",
-                  "defaultdialogs_linkinternal": "Internal link:",
-                  "defaultdialogs_linklocaltip": "When using local links, insert '#' infront of link",
-                  "defaultdialogs_linknewwindow": "Open in new window?",
-                  "defaultdialogs_macroDoesNotHaveProperties": "This macro does not contain any properties you can edit",
-                  "defaultdialogs_paste": "Paste",
-                  "defaultdialogs_permissionsEdit": "Edit Permissions for",
-                  "defaultdialogs_recycleBinDeleting": "The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place",
-                  "defaultdialogs_recycleBinIsEmpty": "The recycle bin is now empty",
-                  "defaultdialogs_recycleBinWarning": "When items are deleted from the recycle bin, they will be gone forever",
-                  "defaultdialogs_regexSearchError": "<a target='_blank' rel='noopener' href='http://regexlib.com'>regexlib.com</a>'s webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.",
-                  "defaultdialogs_regexSearchHelp": "Search for a regular expression to add validation to a form field. Exemple: 'email, 'zip-code' 'url'",
-                  "defaultdialogs_removeMacro": "Remove Macro",
-                  "defaultdialogs_requiredField": "Required Field",
-                  "defaultdialogs_sitereindexed": "Site is reindexed",
-                  "defaultdialogs_siterepublished": "The website cache has been refreshed. All publish content is now uptodate. While all unpublished content is still unpublished",
-                  "defaultdialogs_siterepublishHelp": "The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished.",
-                  "defaultdialogs_tableColumns": "Number of columns",
-                  "defaultdialogs_tableRows": "Number of rows",
-                  "defaultdialogs_templateContentPlaceHolderHelp": "<strong>Select a placeholder id</strong> from the list below. You can only      choose Id's from the current template's master.",
-                  "defaultdialogs_thumbnailimageclickfororiginal": "Click on the image to see full size",
-                  "defaultdialogs_treepicker": "Pick item",
-                  "defaultdialogs_viewCacheItem": "View Cache Item",
-                  "dictionaryItem_description": "Edit the different language versions for the dictionary item '<em>%0%</em>' below<br/>You can add additional languages under the 'languages' in the menu on the left   ",
-                  "dictionaryItem_displayName": "Culture Name",
-                  "placeholders_username": "Enter your username",
-                  "placeholders_password": "Enter your password",
-                  "placeholders_entername": "Enter a name...",
-                  "placeholders_nameentity": "Name the %0%...",
-                  "placeholders_search": "Type to search...",
-                  "placeholders_filter": "Type to filter...",
-                  "editdatatype_addPrevalue": "Add prevalue",
-                  "editdatatype_dataBaseDatatype": "Database datatype",
-                  "editdatatype_guid": "Property editor GUID",
-                  "editdatatype_renderControl": "Property editor",
-                  "editdatatype_rteButtons": "Buttons",
-                  "editdatatype_rteEnableAdvancedSettings": "Enable advanced settings for",
-                  "editdatatype_rteEnableContextMenu": "Enable context menu",
-                  "editdatatype_rteMaximumDefaultImgSize": "Maximum default size of inserted images",
-                  "editdatatype_rteRelatedStylesheets": "Related stylesheets",
-                  "editdatatype_rteShowLabel": "Show label",
-                  "editdatatype_rteWidthAndHeight": "Width and height",
-                  "errorHandling_errorButDataWasSaved": "Your data has been saved, but before you can publish this page there are some errors you need to fix first:",
-                  "errorHandling_errorChangingProviderPassword": "The current MemberShip Provider does not support changing password (EnablePasswordRetrieval need to be true)",
-                  "errorHandling_errorExistsWithoutTab": "%0% already exists",
-                  "errorHandling_errorHeader": "There were errors:",
-                  "errorHandling_errorHeaderWithoutTab": "There were errors:",
-                  "errorHandling_errorInPasswordFormat": "The password should be a minimum of %0% characters long and contain at least %1% non-alpha numeric character(s)",
-                  "errorHandling_errorIntegerWithoutTab": "%0% must be an integer",
-                  "errorHandling_errorMandatory": "The %0% field in the %1% tab is mandatory",
-                  "errorHandling_errorMandatoryWithoutTab": "%0% is a mandatory field",
-                  "errorHandling_errorRegExp": "%0% at %1% is not in a correct format",
-                  "errorHandling_errorRegExpWithoutTab": "%0% is not in a correct format",
-                  "errors_dissallowedMediaType": "The specified file type has been dissallowed by the administrator",
-                  "errors_codemirroriewarning": "NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough.",
-                  "errors_contentTypeAliasAndNameNotNull": "Please fill both alias and name on the new propertytype!",
-                  "errors_filePermissionsError": "There is a problem with read/write access to a specific file or folder",
-                  "errors_missingTitle": "Please enter a title",
-                  "errors_missingType": "Please choose a type",
-                  "errors_pictureResizeBiggerThanOrg": "You're about to make the picture larger than the original size. Are you sure that you want to proceed?",
-                  "errors_startNodeDoesNotExists": "Startnode deleted, please contact your administrator",
-                  "errors_stylesMustMarkBeforeSelect": "Please mark content before changing style",
-                  "errors_stylesNoStylesOnPage": "No active styles available",
-                  "errors_tableColMergeLeft": "Please place cursor at the left of the two cells you wish to merge",
-                  "errors_tableSplitNotSplittable": "You cannot split a cell that hasn't been merged.",
-                  "general_about": "About",
-                  "general_action": "Action",
-                  "general_add": "Add",
-                  "general_alias": "Alias",
-                  "general_areyousure": "Are you sure?",
-                  "general_border": "Border",
-                  "general_by": "or",
-                  "general_cancel": "Cancel",
-                  "general_cellMargin": "Cell margin",
-                  "general_choose": "Choose",
-                  "general_close": "Close",
-                  "general_closewindow": "Close Window",
-                  "general_comment": "Comment",
-                  "general_confirm": "Confirm",
-                  "general_constrainProportions": "Constrain proportions",
-                  "general_continue": "Continue",
-                  "general_copy": "Copy",
-                  "general_create": "Create",
-                  "general_database": "Database",
-                  "general_date": "Date",
-                  "general_default": "Default",
-                  "general_delete": "Delete",
-                  "general_deleted": "Deleted",
-                  "general_deleting": "Deleting...",
-                  "general_design": "Design",
-                  "general_dimensions": "Dimensions",
-                  "general_down": "Down",
-                  "general_download": "Download",
-                  "general_edit": "Edit",
-                  "general_edited": "Edited",
-                  "general_elements": "Elements",
-                  "general_email": "Email",
-                  "general_error": "Error",
-                  "general_findDocument": "Find",
-                  "general_height": "Height",
-                  "general_help": "Help",
-                  "general_icon": "Icon",
-                  "general_import": "Import",
-                  "general_innerMargin": "Inner margin",
-                  "general_insert": "Insert",
-                  "general_install": "Install",
-                  "general_justify": "Justify",
-                  "general_language": "Language",
-                  "general_layout": "Layout",
-                  "general_loading": "Loading",
-                  "general_locked": "Locked",
-                  "general_login": "Login",
-                  "general_logoff": "Log off",
-                  "general_logout": "Logout",
-                  "general_macro": "Macro",
-                  "general_move": "Move",
-                  "general_name": "Name",
-                  "general_new": "New",
-                  "general_next": "Next",
-                  "general_no": "No",
-                  "general_of": "of",
-                  "general_ok": "OK",
-                  "general_open": "Open",
-                  "general_or": "or",
-                  "general_password": "Password",
-                  "general_path": "Path",
-                  "general_placeHolderID": "Placeholder ID",
-                  "general_pleasewait": "One moment please...",
-                  "general_previous": "Previous",
-                  "general_properties": "Properties",
-                  "general_reciept": "Email to receive form data",
-                  "general_recycleBin": "Recycle Bin",
-                  "general_remaining": "Remaining",
-                  "general_rename": "Rename",
-                  "general_renew": "Renew",
-                  "general_required": "Required",
-                  "general_retry": "Retry",
-                  "general_rights": "Permissions",
-                  "general_search": "Search",
-                  "general_server": "Server",
-                  "general_show": "Show",
-                  "general_showPageOnSend": "Show page on Send",
-                  "general_size": "Size",
-                  "general_sort": "Sort",
-                  "general_type": "Type",
-                  "general_typeToSearch": "Type to search...",
-                  "general_up": "Up",
-                  "general_update": "Update",
-                  "general_upgrade": "Upgrade",
-                  "general_upload": "Upload",
-                  "general_url": "Url",
-                  "general_user": "User",
-                  "general_username": "Username",
-                  "general_value": "Value",
-                  "general_view": "View",
-                  "general_welcome": "Welcome...",
-                  "general_width": "Width",
-                  "general_yes": "Yes",
-                  "general_folder": "Folder",
-                  "general_searchResults": "Search results",
-                  "graphicheadline_backgroundcolor": "Background color",
-                  "graphicheadline_bold": "Bold",
-                  "graphicheadline_color": "Text color",
-                  "graphicheadline_font": "Font",
-                  "graphicheadline_text": "Text",
-                  "headers_page": "Page",
-                  "installer_databaseErrorCannotConnect": "The installer cannot connect to the database.",
-                  "installer_databaseErrorWebConfig": "Could not save the web.config file. Please modify the connection string manually.",
-                  "installer_databaseFound": "Your database has been found and is identified as",
-                  "installer_databaseHeader": "Database configuration",
-                  "installer_databaseInstall": "      Press the <strong>install</strong> button to install the Umbraco %0% database    ",
-                  "installer_databaseInstallDone": "Umbraco %0% has now been copied to your database. Press <strong>Next</strong> to proceed.",
-                  "installer_databaseNotFound": "<p>Database not found! Please check that the information in the 'connection string' of the \"web.config\" file is correct.</p>              <p>To proceed, please edit the 'web.config' file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named 'UmbracoDbDSN' and save the file. </p>              <p>              Click the <strong>retry</strong> button when               done.<br /><a href='https://our.umbraco.com/Documentation/Reference/Config/webconfig/' target='_blank' rel='noopener'>              More information on editing web.config here.</a></p>",
-                  "installer_databaseText": "To complete this step, you must know some information regarding your database server ('connection string').<br />        Please contact your ISP if necessary.        If you're installing on a local machine or server you might need information from your system administrator.",
-                  "installer_databaseUpgrade": "      <p>      Press the <strong>upgrade</strong> button to upgrade your database to Umbraco %0%</p>      <p>      Don't worry - no content will be deleted and everything will continue working afterwards!      </p>          ",
-                  "installer_databaseUpgradeDone": "Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to       proceed. ",
-                  "installer_databaseUpToDate": "Your current database is up-to-date!. Click <strong>next</strong> to continue the configuration wizard",
-                  "installer_defaultUserChangePass": "<strong>The Default users' password needs to be changed!</strong>",
-                  "installer_defaultUserDisabled": "<strong>The Default user has been disabled or has no access to Umbraco!</strong></p><p>No further actions needs to be taken. Click <b>Next</b> to proceed.",
-                  "installer_defaultUserPassChanged": "<strong>The Default user's password has been successfully changed since the installation!</strong></p><p>No further actions needs to be taken. Click <strong>Next</strong> to proceed.",
-                  "installer_defaultUserPasswordChanged": "The password is changed!",
-                  "installer_defaultUserText": "        <p>          Umbraco creates a default user with a login <strong>('admin')</strong> and password <strong>('default')</strong>. It's <strong>important</strong> that the password is           changed to something unique.        </p>        <p>          This step will check the default user's password and suggest if it needs to be changed.        </p>      ",
-                  "installer_greatStart": "Get a great start, watch our introduction videos",
-                  "installer_licenseText": "By clicking the next button (or modifying the UmbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI.",
-                  "installer_None": "Not installed yet.",
-                  "installer_permissionsAffectedFolders": "Affected files and folders",
-                  "installer_permissionsAffectedFoldersMoreInfo": "More information on setting up permissions for Umbraco here",
-                  "installer_permissionsAffectedFoldersText": "You need to grant ASP.NET modify permissions to the following files/folders",
-                  "installer_permissionsAlmostPerfect": "<strong>Your permission settings are almost perfect!</strong><br /><br />        You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.",
-                  "installer_permissionsHowtoResolve": "How to Resolve",
-                  "installer_permissionsHowtoResolveLink": "Click here to read the text version",
-                  "installer_permissionsHowtoResolveText": "Watch our <strong>video tutorial</strong> on setting up folder permissions for Umbraco or read the text version.",
-                  "installer_permissionsMaybeAnIssue": "<strong>Your permission settings might be an issue!</strong>      <br/><br />      You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.",
-                  "installer_permissionsNotReady": "<strong>Your permission settings are not ready for Umbraco!</strong>          <br /><br />          In order to run Umbraco, you'll need to update your permission settings.",
-                  "installer_permissionsPerfect": "<strong>Your permission settings are perfect!</strong><br /><br />              You are ready to run Umbraco and install packages!",
-                  "installer_permissionsResolveFolderIssues": "Resolving folder issue",
-                  "installer_permissionsResolveFolderIssuesLink": "Follow this link for more information on problems with ASP.NET and creating folders",
-                  "installer_permissionsSettingUpPermissions": "Setting up folder permissions",
-                  "installer_permissionsText": "      Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's.      It also stores temporary data (aka: cache) for enhancing the performance of your website.    ",
-                  "installer_runwayFromScratch": "I want to start from scratch",
-                  "installer_runwayFromScratchText": "        Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates.         (<a href='https://umbraco.tv/videos/umbraco-v7/implementor/fundamentals/document-types/what-is-a-document-type/'>learn how</a>)        You can still choose to install Runway later on. Please go to the Developer section and choose Packages.      ",
-                  "installer_runwayHeader": "You've just set up a clean Umbraco platform. What do you want to do next?",
-                  "installer_runwayInstalled": "Runway is installed",
-                  "installer_runwayInstalledText": "      You have the foundation in place. Select what modules you wish to install on top of it.<br />      This is our list of recommended modules, check off the ones you would like to install, or view the <a href='#' onclick='toggleModules(); return false;' id='toggleModuleList'>full list of modules</a>      ",
-                  "installer_runwayOnlyProUsers": "Only recommended for experienced users",
-                  "installer_runwaySimpleSite": "I want to start with a simple website",
-                  "installer_runwaySimpleSiteText": "      <p>      'Runway' is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,         but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,         Runway offers an easy foundation based on best practices to get you started faster than ever.        If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.        </p>        <small>        <em>Included with Runway:</em> Home page, Getting Started page, Installing Modules page.<br />        <em>Optional Modules:</em> Top Navigation, Sitemap, Contact, Gallery.        </small>      ",
-                  "installer_runwayWhatIsRunway": "What is Runway",
-                  "installer_step1": "Step 1/5 Accept license",
-                  "installer_step2": "Step 2/5: Database configuration",
-                  "installer_step3": "Step 3/5: Validating File Permissions",
-                  "installer_step4": "Step 4/5: Check Umbraco security",
-                  "installer_step5": "Step 5/5: Umbraco is ready to get you started",
-                  "installer_thankYou": "Thank you for choosing Umbraco",
-                  "installer_theEndBrowseSite": "<h3>Browse your new site</h3>You installed Runway, so why not see how your new website looks.",
-                  "installer_theEndFurtherHelp": "<h3>Further help and information</h3>Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology",
-                  "installer_theEndHeader": "Umbraco %0% is installed and ready for use",
-                  "installer_theEndInstallFailed": "To finish the installation, you'll need to         manually edit the <strong>/web.config file</strong> and update the AppSetting key <strong>UmbracoConfigurationStatus</strong> in the bottom to the value of <strong>'%0%'</strong>.",
-                  "installer_theEndInstallSuccess": "You can get <strong>started instantly</strong> by clicking the 'Launch Umbraco' button below. <br />If you are <strong>new to Umbraco</strong>, you can find plenty of resources on our getting started pages.",
-                  "installer_theEndOpenUmbraco": "<h3>Launch Umbraco</h3>To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality",
-                  "installer_Unavailable": "Connection to database failed.",
-                  "installer_Version3": "Umbraco Version 3",
-                  "installer_Version4": "Umbraco Version 4",
-                  "installer_watch": "Watch",
-                  "installer_welcomeIntro": "This wizard will guide you through the process of configuring <strong>Umbraco %0%</strong> for a fresh install or upgrading from version 3.0.                                <br /><br />                                Press <strong>'next'</strong> to start the wizard.",
-                  "language_cultureCode": "Culture Code",
-                  "language_displayName": "Culture Name",
-                  "lockout_lockoutWillOccur": "You've been idle and logout will automatically occur in",
-                  "lockout_renewSession": "Renew now to save your work",
-                  "login_greeting1": "Happy super Sunday",
-                  "login_greeting2": "Happy manic Monday ",
-                  "login_greeting3": "Happy tremendous Tuesday",
-                  "login_greeting4": "Happy wonderful Wednesday",
-                  "login_greeting5": "Happy thunderous Thursday",
-                  "login_greeting6": "Happy friendly Friday",
-                  "login_greeting7": "Happy shiny Saturday",
-                  "login_instruction": "Log in below:",
-                  "login_bottomText": "<p style='text-align:right;'>&copy; 2001 - %0% <br /><a href='https://Umbraco.com' style='text-decoration: none' target='_blank' rel='noopener'>Umbraco.org</a></p> ",
-                  "main_dashboard": "Dashboard",
-                  "main_sections": "Sections",
-                  "main_tree": "Content",
-                  "moveOrCopy_choose": "Choose page above...",
-                  "moveOrCopy_copyDone": "%0% has been copied to %1%",
-                  "moveOrCopy_copyTo": "Select where the document %0% should be copied to below",
-                  "moveOrCopy_moveDone": "%0% has been moved to %1%",
-                  "moveOrCopy_moveTo": "Select where the document %0% should be moved to below",
-                  "moveOrCopy_nodeSelected": "has been selected as the root of your new content, click 'ok' below.",
-                  "moveOrCopy_noNodeSelected": "No node selected yet, please select a node in the list above before clicking 'ok'",
-                  "moveOrCopy_notAllowedByContentType": "The current node is not allowed under the chosen node because of its type",
-                  "moveOrCopy_notAllowedByPath": "The current node cannot be moved to one of its subpages",
-                  "moveOrCopy_notAllowedAtRoot": "The current node cannot exist at the root",
-                  "moveOrCopy_notValid": "The action isn't allowed since you have insufficient permissions on 1 or more child documents.",
-                  "moveOrCopy_relateToOriginal": "Relate copied items to original",
-                  "notifications_editNotifications": "Edit your notification for %0%",
-                  "notifications_mailBody": "      Hi %0%      This is an automated mail to inform you that the task '%1%'      has been performed on the page '%2%'      by the user '%3%'      Go to http://%4%/actions/editContent.aspx?id=%5% to edit.      Have a nice day!      Cheers from the Umbraco robot    ",
-                  "notifications_mailBodyHtml": "<p>Hi %0%</p>  <p>This is an automated mail to inform you that the task <strong>'%1%'</strong>   has been performed on the page <a href='http://%4%/actions/preview.aspx?id=%5%'><strong>'%2%'</strong></a>  by the user <strong>'%3%'</strong>  </p>  <div style='margin: 8px 0; padding: 8px; display: block;'><br /><a style='color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;' href='http://%4%/actions/publish.aspx?id=%5%'>&nbsp;&nbsp;PUBLISH&nbsp;&nbsp;</a> &nbsp; <a style='color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;' href='http://%4%/actions/editContent.aspx?id=%5%'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <a style='color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;' href='http://%4%/actions/delete.aspx?id=%5%'>&nbsp;&nbsp;&nbsp;&nbsp;DELETE&nbsp;&nbsp;&nbsp;&nbsp;</a><br />  </div>  <p>  <h3>Update summary:</h3>  <table style='width: 100%;'>   %6%</table> </p>  <div style='margin: 8px 0; padding: 8px; display: block;'><br /><a style='color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;' href='http://%4%/actions/publish.aspx?id=%5%'>&nbsp;&nbsp;PUBLISH&nbsp;&nbsp;</a> &nbsp; <a style='color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;' href='http://%4%/actions/editContent.aspx?id=%5%'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <a style='color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;' href='http://%4%/actions/delete.aspx?id=%5%'>&nbsp;&nbsp;&nbsp;&nbsp;DELETE&nbsp;&nbsp;&nbsp;&nbsp;</a><br />  </div>  <p>Have a nice day!<br /><br />  Cheers from the Umbraco robot  </p>",
-                  "notifications_mailSubject": "[%0%] Notification about %1% performed on %2%",
-                  "notifications_notifications": "Notifications",
-                  "packager_chooseLocalPackageText": "      Choose Package from your machine, by clicking the Browse<br />         button and locating the package. Umbraco packages usually have a '.umb' or '.zip' extension.      ",
-                  "packager_packageAuthor": "Author",
-                  "packager_packageDocumentation": "Documentation",
-                  "packager_packageMetaData": "Package meta data",
-                  "packager_packageName": "Package name",
-                  "packager_packageNoItemsHeader": "Package doesn't contain any items",
-                  "packager_packageNoItemsText": "This package file doesn't contain any items to uninstall.<br/><br/>      You can safely remove this from the system by clicking 'uninstall package' below.",
-                  "packager_packageOptions": "Package options",
-                  "packager_packageReadme": "Package readme",
-                  "packager_packageRepository": "Package repository",
-                  "packager_packageUninstallConfirm": "Confirm uninstall",
-                  "packager_packageUninstalledHeader": "Package was uninstalled",
-                  "packager_packageUninstalledText": "The package was successfully uninstalled",
-                  "packager_packageUninstallHeader": "Uninstall package",
-                  "packager_packageUninstallText": "You can unselect items you do not wish to remove, at this time, below. When you click 'confirm uninstall' all checked-off items will be removed.<br />      <span style='color: Red; font-weight: bold;'>Notice:</span> any documents, media etc depending on the items you remove, will stop working, and could lead to system instability,      so uninstall with caution. If in doubt, contact the package author.",
-                  "packager_packageVersion": "Package version",
-                  "paste_doNothing": "Paste with full formatting (Not recommended)",
-                  "paste_errorMessage": "The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web.",
-                  "paste_removeAll": "Paste as raw text without any formatting at all",
-                  "paste_removeSpecialFormattering": "Paste, but remove formatting (Recommended)",
-                  "publicAccess_paAdvanced": "Role based protection",
-                  "publicAccess_paAdvancedHelp": "If you wish to control access to the page using role-based authentication,<br /> using Umbraco's member groups.",
-                  "publicAccess_paAdvancedNoGroups": "You need to create a membergroup before you can use <br />role-based authentication.",
-                  "publicAccess_paErrorPage": "Error Page",
-                  "publicAccess_paErrorPageHelp": "Used when people are logged on, but do not have access",
-                  "publicAccess_paHowWould": "Choose how to restict access to this page",
-                  "publicAccess_paIsProtected": "%0% is now protected",
-                  "publicAccess_paIsRemoved": "Protection removed from %0%",
-                  "publicAccess_paLoginPage": "Login Page",
-                  "publicAccess_paLoginPageHelp": "Choose the page that has the login formular",
-                  "publicAccess_paRemoveProtection": "Remove Protection",
-                  "publicAccess_paSelectPages": "Select the pages that contain login form and error messages",
-                  "publicAccess_paSelectRoles": "Pick the roles who have access to this page",
-                  "publicAccess_paSetLogin": "Set the login and password for this page",
-                  "publicAccess_paSimple": "Single user protection",
-                  "publicAccess_paSimpleHelp": "If you just want to setup simple protection using a single login and password",
-                  "publish_contentPublishedFailedInvalid": "      %0% could not be published because these properties:  %1%  did not pass validation rules.    ",
-                  "publish_contentPublishedFailedByEvent": "      %0% could not be published, due to a 3rd party extension cancelling the action.    ",
-                  "publish_contentPublishedFailedByParent": "      %0% can not be published, because a parent page is not published.    ",
-                  "publish_includeUnpublished": "Include unpublished child pages",
-                  "publish_inProgress": "Publishing in progress - please wait...",
-                  "publish_inProgressCounter": "%0% out of %1% pages have been published...",
-                  "publish_nodePublish": "%0% has been published",
-                  "publish_nodePublishAll": "%0% and subpages have been published",
-                  "publish_publishAll": "Publish %0% and all its subpages",
-                  "publish_publishHelp": "Click <em>ok</em> to publish <strong>%0%</strong> and thereby making it's content publicly available.<br/><br />      You can publish this page and all it's sub-pages by checking <em>publish all children</em> below.      ",
-                  "relatedlinks_addExternal": "Add external link",
-                  "relatedlinks_addInternal": "Add internal link",
-                  "relatedlinks_addlink": "Add",
-                  "relatedlinks_caption": "Caption",
-                  "relatedlinks_internalPage": "Internal page",
-                  "relatedlinks_linkurl": "URL",
-                  "relatedlinks_modeDown": "Move Down",
-                  "relatedlinks_modeUp": "Move Up",
-                  "relatedlinks_newWindow": "Open in new window",
-                  "relatedlinks_removeLink": "Remove link",
-                  "rollback_currentVersion": "Current version",
-                  "rollback_diffHelp": "This shows the differences between the current version and the selected version<br /><del>Red</del> text will not be shown in the selected version. , <ins>green means added</ins>",
-                  "rollback_documentRolledBack": "Document has been rolled back",
-                  "rollback_htmlHelp": "This displays the selected version as html, if you wish to see the difference between 2 versions at the same time, use the diff view",
-                  "rollback_rollbackTo": "Rollback to",
-                  "rollback_selectVersion": "Select version",
-                  "rollback_view": "View",
-                  "scripts_editscript": "Edit script file",
-                  "sections_concierge": "Concierge",
-                  "sections_content": "Content",
-                  "sections_courier": "Courier",
-                  "sections_developer": "Developer",
-                  "sections_installer": "Umbraco Configuration Wizard",
-                  "sections_media": "Media",
-                  "sections_member": "Members",
-                  "sections_newsletters": "Newsletters",
-                  "sections_settings": "Settings",
-                  "sections_statistics": "Statistics",
-                  "sections_translation": "Translation",
-                  "sections_users": "Users",
-                  "sections_contour": "Umbraco Contour",
-                  "sections_help": "Help",
-                  "settings_defaulttemplate": "Default template",
-                  "settings_importDocumentTypeHelp": "To import a document type, find the '.udt' file on your computer by clicking the 'Browse' button and click 'Import' (you'll be asked for confirmation on the next screen)",
-                  "settings_newtabname": "New Tab Title",
-                  "settings_nodetype": "Nodetype",
-                  "settings_objecttype": "Type",
-                  "settings_stylesheet": "Stylesheet",
-                  "settings_tab": "Tab",
-                  "settings_tabname": "Tab Title",
-                  "settings_tabs": "Tabs",
-                  "settings_contentTypeEnabled": "Master Content Type enabled",
-                  "settings_contentTypeUses": "This Content Type uses",
-                  "settings_asAContentMasterType": "as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself",
-                  "settings_noPropertiesDefinedOnTab": "No properties defined on this tab. Click on the 'add a new property' link at the top to create a new property.",
-                  "sort_sortDone": "Sorting complete.",
-                  "sort_sortHelp": "Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items",
-                  "sort_sortPleaseWait": " Please wait. Items are being sorted, this can take a while.<br/> <br/> Do not close this window during sorting",
-                  "speechBubbles_contentPublishedFailedByEvent": "Publishing was cancelled by a 3rd party add-in",
-                  "speechBubbles_contentTypeDublicatePropertyType": "Property type already exists",
-                  "speechBubbles_contentTypePropertyTypeCreated": "Property type created",
-                  "speechBubbles_contentTypePropertyTypeCreatedText": "Name: %0% <br /> DataType: %1%",
-                  "speechBubbles_contentTypePropertyTypeDeleted": "Propertytype deleted",
-                  "speechBubbles_contentTypeSavedHeader": "Document Type saved",
-                  "speechBubbles_contentTypeTabCreated": "Tab created",
-                  "speechBubbles_contentTypeTabDeleted": "Tab deleted",
-                  "speechBubbles_contentTypeTabDeletedText": "Tab with id: %0% deleted",
-                  "speechBubbles_cssErrorHeader": "Stylesheet not saved",
-                  "speechBubbles_cssSavedHeader": "Stylesheet saved",
-                  "speechBubbles_cssSavedText": "Stylesheet saved without any errors",
-                  "speechBubbles_dataTypeSaved": "Datatype saved",
-                  "speechBubbles_dictionaryItemSaved": "Dictionary item saved",
-                  "speechBubbles_editContentPublishedFailedByParent": "Publishing failed because the parent page isn't published",
-                  "speechBubbles_editContentPublishedHeader": "Content published",
-                  "speechBubbles_editContentPublishedText": "and visible at the website",
-                  "speechBubbles_editContentSavedHeader": "Content saved",
-                  "speechBubbles_editContentSavedText": "Remember to publish to make changes visible",
-                  "speechBubbles_editContentSendToPublish": "Sent For Approval",
-                  "speechBubbles_editContentSendToPublishText": "Changes have been sent for approval",
-                  "speechBubbles_editMediaSaved": "Media saved",
-                  "speechBubbles_editMediaSavedText": "Media saved without any errors",
-                  "speechBubbles_editMemberSaved": "Member saved",
-                  "speechBubbles_editStylesheetPropertySaved": "Stylesheet Property Saved",
-                  "speechBubbles_editStylesheetSaved": "Stylesheet saved",
-                  "speechBubbles_editTemplateSaved": "Template saved",
-                  "speechBubbles_editUserError": "Error saving user (check log)",
-                  "speechBubbles_editUserSaved": "User Saved",
-                  "speechBubbles_editUserTypeSaved": "User type saved",
-                  "speechBubbles_fileErrorHeader": "File not saved",
-                  "speechBubbles_fileErrorText": "file could not be saved. Please check file permissions",
-                  "speechBubbles_fileSavedHeader": "File saved",
-                  "speechBubbles_fileSavedText": "File saved without any errors",
-                  "speechBubbles_languageSaved": "Language saved",
-                  "speechBubbles_templateErrorHeader": "Template not saved",
-                  "speechBubbles_templateErrorText": "Please make sure that you do not have 2 templates with the same alias",
-                  "speechBubbles_templateSavedHeader": "Template saved",
-                  "speechBubbles_templateSavedText": "Template saved without any errors!",
-                  "speechBubbles_contentUnpublished": "Content unpublished",
-                  "speechBubbles_partialViewSavedHeader": "Partial view saved",
-                  "speechBubbles_partialViewSavedText": "Partial view saved without any errors!",
-                  "speechBubbles_partialViewErrorHeader": "Partial view not saved",
-                  "speechBubbles_partialViewErrorText": "An error occurred saving the file.",
-                  "stylesheet_aliasHelp": "Uses CSS syntax ex: h1, .redHeader, .blueTex",
-                  "stylesheet_editstylesheet": "Edit stylesheet",
-                  "stylesheet_editstylesheetproperty": "Edit stylesheet property",
-                  "stylesheet_nameHelp": "Name to identify the style property in the rich text editor  ",
-                  "stylesheet_preview": "Preview",
-                  "stylesheet_styles": "Styles",
-                  "template_edittemplate": "Edit template",
-                  "template_insertContentArea": "Insert content area",
-                  "template_insertContentAreaPlaceHolder": "Insert content area placeholder",
-                  "template_insertDictionaryItem": "Insert dictionary item",
-                  "template_insertMacro": "Insert Macro",
-                  "template_insertPageField": "Insert Umbraco page field",
-                  "template_mastertemplate": "Master template",
-                  "template_quickGuide": "Quick Guide to Umbraco template tags",
-                  "template_template": "Template",
-                  "templateEditor_alternativeField": "Alternative field",
-                  "templateEditor_alternativeText": "Alternative Text",
-                  "templateEditor_casing": "Casing",
-                  "templateEditor_encoding": "Encoding",
-                  "templateEditor_chooseField": "Choose field",
-                  "templateEditor_convertLineBreaks": "Convert Linebreaks",
-                  "templateEditor_convertLineBreaksHelp": "Replaces linebreaks with html-tag &lt;br&gt;",
-                  "templateEditor_customFields": "Custom Fields",
-                  "templateEditor_dateOnly": "Yes, Date only",
-                  "templateEditor_formatAsDate": "Format as date",
-                  "templateEditor_htmlEncode": "HTML encode",
-                  "templateEditor_htmlEncodeHelp": "Will replace special characters by their HTML equivalent.",
-                  "templateEditor_insertedAfter": "Will be inserted after the field value",
-                  "templateEditor_insertedBefore": "Will be inserted before the field value",
-                  "templateEditor_lowercase": "Lowercase",
-                  "templateEditor_none": "None",
-                  "templateEditor_postContent": "Insert after field",
-                  "templateEditor_preContent": "Insert before field",
-                  "templateEditor_recursive": "Recursive",
-                  "templateEditor_removeParagraph": "Remove Paragraph tags",
-                  "templateEditor_removeParagraphHelp": "Will remove any &lt;P&gt; in the beginning and end of the text",
-                  "templateEditor_standardFields": "Standard Fields",
-                  "templateEditor_uppercase": "Uppercase",
-                  "templateEditor_urlEncode": "URL encode",
-                  "templateEditor_urlEncodeHelp": "Will format special characters in URLs",
-                  "templateEditor_usedIfAllEmpty": "Will only be used when the field values above are empty",
-                  "templateEditor_usedIfEmpty": "This field will only be used if the primary field is empty",
-                  "templateEditor_withTime": "Yes, with time. Separator: ",
-                  "translation_details": "Translation details",
-                  "translation_DownloadXmlDTD": "Download xml DTD",
-                  "translation_fields": "Fields",
-                  "translation_includeSubpages": "Include subpages",
-                  "translation_mailBody": "      Hi %0%      This is an automated mail to inform you that the document '%1%'      has been requested for translation into '%5%' by %2%.      Go to http://%3%/translation/details.aspx?id=%4% to edit.      Or log into Umbraco to get an overview of your translation tasks      http://%3%      Have a nice day!      Cheers from the Umbraco robot    ",
-                  "translation_noTranslators": "No translator users found. Please create a translator user before you start sending content to translation",
-                 "translation_pageHasBeenSendToTranslation": "The page '%0%' has been send to translation",
-                  "translation_sendToTranslate": "Send the page '%0%' to translation",
-                  "translation_totalWords": "Total words",
-                  "translation_translateTo": "Translate to",
-                  "translation_translationDone": "Translation completed.",
-                  "translation_translationDoneHelp": "You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages.",
-                  "translation_translationFailed": "Translation failed, the xml file might be corrupt",
-                  "translation_translationOptions": "Translation options",
-                  "translation_translator": "Translator",
-                  "translation_uploadTranslationXml": "Upload translation xml",
-                  "treeHeaders_cacheBrowser": "Cache Browser",
-                  "treeHeaders_contentRecycleBin": "Recycle Bin",
-                  "treeHeaders_createdPackages": "Created packages",
-                  "treeHeaders_datatype": "Data Types",
-                  "treeHeaders_dictionary": "Dictionary",
-                  "treeHeaders_installedPackages": "Installed packages",
-                  "treeHeaders_installSkin": "Install skin",
-                  "treeHeaders_installStarterKit": "Install starter kit",
-                  "treeHeaders_languages": "Languages",
-                  "treeHeaders_localPackage": "Install local package",
-                  "treeHeaders_macros": "Macros",
-                  "treeHeaders_mediaTypes": "Media Types",
-                  "treeHeaders_member": "Members",
-                  "treeHeaders_memberGroup": "Member Groups",
-                  "treeHeaders_memberRoles": "Roles",
-                  "treeHeaders_memberType": "Member Types",
-                  "treeHeaders_nodeTypes": "Document Types",
-                  "treeHeaders_packager": "Packages",
-                  "treeHeaders_packages": "Packages",
-                  "treeHeaders_repositories": "Install from repository",
-                  "treeHeaders_runway": "Install Runway",
-                  "treeHeaders_runwayModules": "Runway modules",
-                  "treeHeaders_scripting": "Scripting Files",
-                  "treeHeaders_scripts": "Scripts",
-                  "treeHeaders_stylesheets": "Stylesheets",
-                  "treeHeaders_templates": "Templates",
-                  "update_updateAvailable": "New update ready",
-                  "update_updateDownloadText": "%0% is ready, click here for download",
-                  "update_updateNoServer": "No connection to server",
-                  "update_updateNoServerError": "Error checking for update. Please review trace-stack for further information",
-                  "user_administrators": "Administrator",
-                  "user_categoryField": "Category field",
-                  "user_changePassword": "Change Your Password",
-                  "user_newPassword": "New password",
-                  "user_confirmNewPassword": "Confirm new password",
-                  "user_changePasswordDescription": "You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button",
-                  "user_contentChannel": "Content Channel",
-                  "user_descriptionField": "Description field",
-                  "user_disabled": "Disable User",
-                  "user_documentType": "Document Type",
-                  "user_editors": "Editor",
-                  "user_excerptField": "Excerpt field",
-                  "user_language": "Language",
-                  "user_loginname": "Login",
-                  "user_mediastartnode": "Start Node in Media Library",
-                  "user_modules": "Sections",
-                  "user_noConsole": "Disable Umbraco Access",
-                  "user_oldPassword": "Old password",
-                  "user_password": "Password",
-                  "user_resetPassword": "Reset password",
-                  "user_passwordChanged": "Your password has been changed!",
-                  "user_passwordConfirm": "Please confirm the new password",
-                  "user_passwordEnterNew": "Enter your new password",
-                  "user_passwordIsBlank": "Your new password cannot be blank!",
-                  "user_passwordCurrent": "Current password",
-                  "user_passwordInvalid": "Invalid current password",
-                  "user_passwordIsDifferent": "There was a difference between the new password and the confirmed password. Please try again!",
-                  "user_passwordMismatch": "The confirmed password doesn't match the new password!",
-                  "user_permissionReplaceChildren": "Replace child node permssions",
-                  "user_permissionSelectedPages": "You are currently modifying permissions for the pages:",
-                  "user_permissionSelectPages": "Select pages to modify their permissions",
-                  "user_searchAllChildren": "Search all children",
-                  "user_startnode": "Start Node in Content",
-                  "user_username": "Username",
-                  "user_userPermissions": "User permissions",
-                  "user_usertype": "User type",
-                  "user_userTypes": "User types",
-                  "user_writer": "Writer",
-                  "user_yourProfile": "Your profile",
-                  "user_yourHistory": "Your recent history",
-                  "user_sessionExpires": "Session expires in"
-              }, null];
-          }
-      }
-
-      return {
-          register: function() {
-              $httpBackend
-                  .whenGET(mocksUtils.urlRegex('LocalizedText'))
-                  .respond(getLanguageResource);
-          }
-      };
-  }]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/mediahelperService.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/mediahelperService.mocks.js
deleted file mode 100644
index 78196212ac..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/services/mediahelperService.mocks.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
-* @ngdoc service
-* @name umbraco.mocks.mediaHelperService
-* @description A helper object used for dealing with media items
-**/
-function mediaHelper(umbRequestHelper) {
-    return {
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#getImagePropertyValue
-         * @methodOf umbraco.services.mediaHelper
-         * @function    
-         *
-         * @description
-         * Returns the file path associated with the media property if there is one
-         * 
-         * @param {object} options Options object
-         * @param {object} options.mediaModel The media object to retrieve the image path from
-         * @param {object} options.imageOnly Optional, if true then will only return a path if the media item is an image
-         */
-        getMediaPropertyValue: function (options) {
-            return "assets/img/mocks/big-image.jpg";
-        },
-        
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#getImagePropertyValue
-         * @methodOf umbraco.services.mediaHelper
-         * @function    
-         *
-         * @description
-         * Returns the actual image path associated with the image property if there is one
-         * 
-         * @param {object} options Options object
-         * @param {object} options.imageModel The media object to retrieve the image path from
-         */
-        getImagePropertyValue: function (options) {
-            return "assets/img/mocks/big-image.jpg";
-        },
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#getThumbnail
-         * @methodOf umbraco.services.mediaHelper
-         * @function    
-         *
-         * @description
-         * formats the display model used to display the content to the model used to save the content
-         * 
-         * @param {object} options Options object
-         * @param {object} options.imageModel The media object to retrieve the image path from
-         */
-        getThumbnail: function (options) {
-
-            if (!options || !options.imageModel) {
-                throw "The options objet does not contain the required parameters: imageModel";
-            }
-
-            var imagePropVal = this.getImagePropertyValue(options);
-            if (imagePropVal !== "") {
-                return this.getThumbnailFromPath(imagePropVal);
-            }
-            return "";
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#scaleToMaxSize
-         * @methodOf umbraco.services.mediaHelper
-         * @function    
-         *
-         * @description
-         * Finds the corrct max width and max height, given maximum dimensions and keeping aspect ratios
-         * 
-         * @param {number} maxSize Maximum width & height
-         * @param {number} width Current width
-         * @param {number} height Current height
-         */
-        scaleToMaxSize: function (maxSize, width, height) {
-            var retval = { width: width, height: height };
-
-            var maxWidth = maxSize; // Max width for the image
-            var maxHeight = maxSize;    // Max height for the image
-            var ratio = 0;  // Used for aspect ratio
-
-            // Check if the current width is larger than the max
-            if (width > maxWidth) {
-                ratio = maxWidth / width;   // get ratio for scaling image
-
-                retval.width = maxWidth;
-                retval.height = height * ratio;
-
-                height = height * ratio;    // Reset height to match scaled image
-                width = width * ratio;    // Reset width to match scaled image
-            }
-
-            // Check if current height is larger than max
-            if (height > maxHeight) {
-                ratio = maxHeight / height; // get ratio for scaling image
-
-                retval.height = maxHeight;
-                retval.width = width * ratio;
-                width = width * ratio;    // Reset width to match scaled image
-            }
-
-            return retval;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#getThumbnailFromPath
-         * @methodOf umbraco.services.mediaHelper
-         * @function    
-         *
-         * @description
-         * Returns the path to the thumbnail version of a given media library image path
-         * 
-         * @param {string} imagePath Image path, ex: /media/1234/my-image.jpg
-         */
-        getThumbnailFromPath: function (imagePath) {
-            return "assets/img/mocks/big-thumb.jpg";
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#detectIfImageByExtension
-         * @methodOf umbraco.services.mediaHelper
-         * @function    
-         *
-         * @description
-         * Returns true/false, indicating if the given path has an allowed image extension
-         * 
-         * @param {string} imagePath Image path, ex: /media/1234/my-image.jpg
-         */
-        detectIfImageByExtension: function (imagePath) {
-            var lowered = imagePath.toLowerCase();
-            var ext = lowered.substr(lowered.lastIndexOf(".") + 1);
-            return ("," + Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes + ",").indexOf("," + ext + ",") !== -1;
-        }
-    };
-}
-angular.module('umbraco.mocks').factory('mediaHelper', mediaHelper);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/util.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/util.mocks.js
deleted file mode 100644
index 42e5d55a5b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/services/util.mocks.js
+++ /dev/null
@@ -1,22 +0,0 @@
-angular.module('umbraco.mocks').
-  factory('utilMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
-      'use strict';
-      
-      function getUpdateCheck(status, data, headers) {
-          //check for existence of a cookie so we can do login/logout in the belle app (ignore for tests).
-          if (!mocksUtils.checkAuth()) {
-              return [401, null, null];
-          }
-          else {
-              return [200, null, null];
-          }
-      }
-
-      return {
-          register: function() {
-              $httpBackend
-                  .whenGET(mocksUtils.urlRegex('/umbraco/Api/UpdateCheck/GetCheck'))
-                  .respond(getUpdateCheck);
-          }
-      };
-  }]);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
deleted file mode 100644
index 21f2b020dd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var umbracoAppDev = angular.module('umbraco.httpbackend', ['umbraco', 'ngMockE2E', 'umbraco.mocks']);
-
-
-function initBackEnd($httpBackend, contentMocks, mediaMocks, treeMocks, userMocks, contentTypeMocks, sectionMocks, entityMocks, dataTypeMocks, dashboardMocks, macroMocks, utilMocks, localizationMocks, prevaluesMocks, authMocks) {
-
-	console.log("httpBackend inited");
-
-    //Register mocked http responses
-	contentMocks.register();
-    mediaMocks.register();
-    sectionMocks.register();
-    treeMocks.register();
-    dataTypeMocks.register();
-    dashboardMocks.register();
-    userMocks.register();
-    macroMocks.register();
-    contentTypeMocks.register();
-    utilMocks.register();
-    localizationMocks.register();
-    prevaluesMocks.register();
-    entityMocks.register();
-    authMocks.register();
-
-    $httpBackend.whenGET(/^..\/config\//).passThrough();
-	$httpBackend.whenGET(/^views\//).passThrough();
-	$httpBackend.whenGET(/^js\//).passThrough();
-	$httpBackend.whenGET(/^lib\//).passThrough();
-	$httpBackend.whenGET(/^assets\//).passThrough();
-}
-
-
-umbracoAppDev.run(initBackEnd);
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js
deleted file mode 100644
index 51029234f5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js
+++ /dev/null
@@ -1,43 +0,0 @@
-//create the namespace (NOTE: This loads before any dependencies so we don't have a namespace mgr so we just create it manually)
-// eslint-disable-next-line no-redeclare
-var Umbraco = Umbraco || {};
-Umbraco.Sys = {};
-//define a global static object
-Umbraco.Sys.ServerVariables = {
-    umbracoUrls: {
-        "contentApiBaseUrl": "/umbraco/UmbracoApi/Content/",
-        "mediaApiBaseUrl": "/umbraco/UmbracoApi/Media/",
-        "dataTypeApiBaseUrl": "/umbraco/UmbracoApi/DataType/",
-        "sectionApiBaseUrl": "/umbraco/UmbracoApi/Section/",
-        "treeApplicationApiBaseUrl": "/umbraco/UmbracoTrees/ApplicationTreeApi/",
-        "contentTypeApiBaseUrl": "/umbraco/Api/ContentType/",
-        "mediaTypeApiBaseUrl": "/umbraco/Api/MediaType/",
-        "macroApiBaseUrl": "/umbraco/Api/Macro/",
-        "authenticationApiBaseUrl": "/umbraco/UmbracoApi/Authentication/",
-        "serverVarsJs": "/belle/lib/lazyload/empty.js",
-        "imagesApiBaseUrl": "/umbraco/UmbracoApi/Images/",
-        "entityApiBaseUrl": "/umbraco/UmbracoApi/Entity/",
-        "dashboardApiBaseUrl": "/umbraco/UmbracoApi/Dashboard/",
-        "updateCheckApiBaseUrl": "/umbraco/Api/UpdateCheck/",
-        "relationApiBaseUrl": "/umbraco/UmbracoApi/Relation/",
-        "rteApiBaseUrl": "/umbraco/UmbracoApi/RichTextPreValue/",
-        "iconApiBaseUrl": "/umbraco/UmbracoApi/Icon/",
-        "analyticsApiBaseUrl": "/umbraco/UmbracoApi/Consent/"
-    },
-    umbracoSettings: {
-        "umbracoPath": "/umbraco",
-        "appPluginsPath" : "/App_Plugins",
-        "imageFileTypes": "jpeg,jpg,gif,bmp,png,tiff,tif",
-        "keepUserLoggedIn": true
-    },
-    umbracoPlugins: {
-        trees: [
-            { alias: "myTree", packageFolder: "MyPackage" }
-        ]
-    },
-    isDebuggingEnabled: true,
-    application: {
-        assemblyVersion: "1",
-        version: "7"
-    }
-};
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/_module.js b/src/Umbraco.Web.UI.Client/src/common/resources/_module.js
deleted file mode 100644
index 57c91f6817..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/_module.js
+++ /dev/null
@@ -1 +0,0 @@
-angular.module("umbraco.resources", []);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/analytic.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/analytic.resource.js
deleted file mode 100644
index fa3b203df2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/analytic.resource.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.consentResource
- * @function
- *
- * @description
- * Used by the health check dashboard to get checks and send requests to fix checks.
- */
-(function () {
-  'use strict';
-
-  function analyticResource($http, umbRequestHelper) {
-
-    function getConsentLevel () {
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "analyticsApiBaseUrl",
-            "GetConsentLevel")),
-        'Server call failed for getting current consent level');
-    }
-
-    function getAllConsentLevels () {
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "analyticsApiBaseUrl",
-            "GetAllLevels")),
-        'Server call failed for getting current consent level');
-    }
-
-    function saveConsentLevel (value) {
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "analyticsApiBaseUrl",
-            "SetConsentLevel"),
-          { telemetryLevel : value }
-        ),
-        'Server call failed for getting current consent level');
-    }
-
-    var resource = {
-      getConsentLevel: getConsentLevel,
-      getAllConsentLevels : getAllConsentLevels,
-      saveConsentLevel : saveConsentLevel
-    };
-
-    return resource;
-
-  }
-
-
-  angular.module('umbraco.resources').factory('analyticResource', analyticResource);
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
deleted file mode 100644
index 7b0a10cf31..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
+++ /dev/null
@@ -1,480 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.authResource
- * @description
- * This Resource perfomrs actions to common authentication tasks for the Umbraco backoffice user
- *
- * @requires $q
- * @requires $http
- * @requires umbRequestHelper
- * @requires angularHelper
- */
-function authResource($q, $http, umbRequestHelper, angularHelper) {
-
-  return {
-     /**
-     * @ngdoc method
-     * @name umbraco.resources.authResource#get2FAProviders
-     * @methodOf umbraco.resources.authResource
-     *
-     * @description
-     * Logs the Umbraco backoffice user in if the credentials are good
-     *
-     * ##usage
-     * <pre>
-     * authResource.get2FAProviders()
-     *    .then(function(data) {
-     *        //Do stuff ...
-     *    });
-     * </pre>
-     * @returns {Promise} resourcePromise object
-     *
-     */
-    get2FAProviders: function () {
-
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "authenticationApiBaseUrl",
-            "Get2FAProviders")),
-        'Could not retrieve two factor provider info');
-    },
-
-    /**
-    * @ngdoc method
-    * @name umbraco.resources.authResource#get2FAProviders
-    * @methodOf umbraco.resources.authResource
-    *
-    * @description
-    * Generate the two-factor authentication code for the provider and send it to the user
-    *
-    * ##usage
-    * <pre>
-    * authResource.send2FACode(provider)
-    *    .then(function(data) {
-    *        //Do stuff ...
-    *    });
-    * </pre>
-    * @param {string} provider Name of the provider
-    * @returns {Promise} resourcePromise object
-    *
-    */
-    send2FACode: function (provider) {
-
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "authenticationApiBaseUrl",
-            "PostSend2FACode"),
-          Utilities.toJson(provider)),
-        'Could not send code');
-    },
-
-    /**
-    * @ngdoc method
-    * @name umbraco.resources.authResource#get2FAProviders
-    * @methodOf umbraco.resources.authResource
-    *
-    * @description
-    * Verify the two-factor authentication code entered by the user against the provider
-    *
-    * ##usage
-    * <pre>
-    * authResource.verify2FACode(provider, code)
-    *    .then(function(data) {
-    *        //Do stuff ...
-    *    });
-    * </pre>
-    * @param {string} provider Name of the provider
-    * @param {string} code The two-factor authentication code
-    * @returns {Promise} resourcePromise object
-    *
-    */
-    verify2FACode: function (provider, code) {
-
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "authenticationApiBaseUrl",
-            "PostVerify2FACode"),
-          {
-            code: code,
-            provider: provider
-          }),
-        'Could not verify code');
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.authResource#performLogin
-     * @methodOf umbraco.resources.authResource
-     *
-     * @description
-     * Logs the Umbraco backoffice user in if the credentials are good
-     *
-     * ##usage
-     * <pre>
-     * authResource.performLogin(login, password)
-     *    .then(function(data) {
-     *        //Do stuff for login...
-     *    });
-     * </pre>
-     * @param {string} login Username of backoffice user
-     * @param {string} password Password of backoffice user
-     * @returns {Promise} resourcePromise object
-     *
-     */
-    performLogin: function (username, password) {
-
-      if (!username || !password) {
-        return $q.reject({
-          errorMsg: 'Username or password cannot be empty'
-        });
-      }
-
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "authenticationApiBaseUrl",
-            "PostLogin"), {
-            username: username,
-            password: password
-          }),
-        'Login failed for user ' + username);
-    },
-
-    /**
-     * There are not parameters for this since when the user has clicked on their invite email they will be partially
-     * logged in (but they will not be approved) so we need to use this method to verify the non approved logged in user's details.
-     * Using the getCurrentUser will not work since that only works for approved users
-     * @returns {}
-     */
-    getCurrentInvitedUser: function () {
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "authenticationApiBaseUrl",
-            "GetCurrentInvitedUser")),
-        'Failed to verify invite');
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.authResource#performRequestPasswordReset
-     * @methodOf umbraco.resources.authResource
-     *
-     * @description
-     * Checks to see if the provided email address is a valid user account and sends a link
-     * to allow them to reset their password
-     *
-     * ##usage
-     * <pre>
-     * authResource.performRequestPasswordReset(email)
-     *    .then(function(data) {
-     *        //Do stuff for password reset request...
-     *    });
-     * </pre>
-     * @param {string} email Email address of backoffice user
-     * @returns {Promise} resourcePromise object
-     *
-     */
-    performRequestPasswordReset: function (email) {
-
-      if (!email) {
-        return $q.reject({
-          errorMsg: 'Email address cannot be empty'
-        });
-      }
-
-      // TODO: This validation shouldn't really be done here, the validation on the login dialog
-      // is pretty hacky which is why this is here, ideally validation on the login dialog would
-      // be done properly.
-      var emailRegex = /\S+@\S+\.\S+/;
-      if (!emailRegex.test(email)) {
-        return $q.reject({
-          errorMsg: 'Email address is not valid'
-        });
-      }
-
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "authenticationApiBaseUrl",
-            "PostRequestPasswordReset"), {
-            email: email
-          }),
-        'An email with password reset instructions will be sent to the specified address if it matched our records');
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.authResource#performValidatePasswordResetCode
-     * @methodOf umbraco.resources.authResource
-     *
-     * @description
-     * Checks to see if the provided password reset code is valid
-     *
-     * ##usage
-     * <pre>
-     * authResource.performValidatePasswordResetCode(resetCode)
-     *    .then(function(data) {
-     *        //Allow reset of password
-     *    });
-     * </pre>
-     * @param {integer} userId User Id
-     * @param {string} resetCode Password reset code
-     * @returns {Promise} resourcePromise object
-     *
-     */
-    performValidatePasswordResetCode: function (userId, resetCode) {
-
-      if (!userId) {
-        return $q.reject({
-          errorMsg: 'User Id cannot be empty'
-        });
-      }
-
-      if (!resetCode) {
-        return $q.reject({
-          errorMsg: 'Reset code cannot be empty'
-        });
-      }
-
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "authenticationApiBaseUrl",
-            "PostValidatePasswordResetCode"),
-          {
-            userId: userId,
-            resetCode: resetCode
-          }),
-        'Password reset code validation failed for userId ' + userId + ', code' + resetCode);
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.currentUserResource#getPasswordConfig
-     * @methodOf umbraco.resources.currentUserResource
-     *
-     * @description
-     * Gets the configuration of the user membership provider which is used to configure the change password form
-     */
-      getPasswordConfig: function (userId) {
-          return umbRequestHelper.resourcePromise(
-            $http.get(
-              umbRequestHelper.getApiUrl(
-                "authenticationApiBaseUrl",
-                  "GetPasswordConfig", { userId: userId })),
-            'Failed to retrieve membership provider config');
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.authResource#performSetPassword
-     * @methodOf umbraco.resources.authResource
-     *
-     * @description
-     * Checks to see if the provided password reset code is valid and sets the user's password
-     *
-     * ##usage
-     * <pre>
-     * authResource.performSetPassword(userId, password, confirmPassword, resetCode)
-     *    .then(function(data) {
-     *        //Password set
-     *    });
-     * </pre>
-     * @param {integer} userId User Id
-     * @param {string} password New password
-     * @param {string} confirmPassword Confirmation of new password
-     * @param {string} resetCode Password reset code
-     * @returns {Promise} resourcePromise object
-     *
-     */
-    performSetPassword: function (userId, password, confirmPassword, resetCode) {
-
-      if (userId === undefined || userId === null) {
-        return $q.reject({
-          errorMsg: 'User Id cannot be empty'
-        });
-      }
-
-      if (!password) {
-        return $q.reject({
-          errorMsg: 'Password cannot be empty'
-        });
-      }
-
-      if (password !== confirmPassword) {
-        return $q.reject({
-          errorMsg: 'Password and confirmation do not match'
-        });
-      }
-
-      if (!resetCode) {
-        return $q.reject({
-          errorMsg: 'Reset code cannot be empty'
-        });
-      }
-
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "authenticationApiBaseUrl",
-            "PostSetPassword"),
-          {
-            userId: userId,
-            password: password,
-            resetCode: resetCode
-          }),
-        'Password reset code validation failed for userId ' + userId);
-    },
-
-    unlinkLogin: function (loginProvider, providerKey) {
-      if (!loginProvider || !providerKey) {
-        return $q.reject({
-          errorMsg: 'loginProvider or providerKey cannot be empty'
-        });
-      }
-
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "authenticationApiBaseUrl",
-            "PostUnLinkLogin"), {
-            loginProvider: loginProvider,
-            providerKey: providerKey
-          }),
-        'Unlinking login provider failed');
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.authResource#performLogout
-     * @methodOf umbraco.resources.authResource
-     *
-     * @description
-     * Logs out the Umbraco backoffice user
-     *
-     * ##usage
-     * <pre>
-     * authResource.performLogout()
-     *    .then(function(data) {
-     *        //Do stuff for logging out...
-     *    });
-     * </pre>
-     * @returns {Promise} resourcePromise object
-     *
-     */
-    performLogout: function () {
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "authenticationApiBaseUrl",
-            "PostLogout")));
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.authResource#getCurrentUser
-     * @methodOf umbraco.resources.authResource
-     *
-     * @description
-     * Sends a request to the server to get the current user details, will return a 401 if the user is not logged in
-     *
-     * ##usage
-     * <pre>
-     * authResource.getCurrentUser()
-     *    .then(function(data) {
-     *        //Do stuff for fetching the current logged in Umbraco backoffice user
-     *    });
-     * </pre>
-     * @returns {Promise} resourcePromise object
-     *
-     */
-    getCurrentUser: function () {
-
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "authenticationApiBaseUrl",
-            "GetCurrentUser")),
-        'Server call failed for getting current user');
-    },
-
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.authResource#isAuthenticated
-     * @methodOf umbraco.resources.authResource
-     *
-     * @description
-     * Checks if the user is logged in or not - does not return 401 or 403
-     *
-     * ##usage
-     * <pre>
-     * authResource.isAuthenticated()
-     *    .then(function(data) {
-     *        //Do stuff to check if user is authenticated
-     *    });
-     * </pre>
-     * @returns {Promise} resourcePromise object
-     *
-     */
-    isAuthenticated: function () {
-
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "authenticationApiBaseUrl",
-            "IsAuthenticated")),
-        {
-          success: function (data, status, headers, config) {
-            //if the response is false, they are not logged in so return a rejection
-            if (data === false || data === "false") {
-              return $q.reject('User is not logged in');
-            }
-            return data;
-          },
-          error: function (data, status, headers, config) {
-            return {
-              errorMsg: 'Server call failed for checking authentication',
-              data: data,
-              status: status
-            };
-          }
-        });
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.authResource#getRemainingTimeoutSeconds
-     * @methodOf umbraco.resources.authResource
-     *
-     * @description
-     * Gets the user's remaining seconds before their login times out
-     *
-     * ##usage
-     * <pre>
-     * authResource.getRemainingTimeoutSeconds()
-     *    .then(function(data) {
-     *        //Number of seconds is returned
-     *    });
-     * </pre>
-     * @returns {Promise} resourcePromise object
-     *
-     */
-    getRemainingTimeoutSeconds: function () {
-
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "authenticationApiBaseUrl",
-            "GetRemainingTimeoutSeconds")),
-        'Server call failed for checking remaining seconds');
-    }
-
-  };
-}
-
-angular.module('umbraco.resources').factory('authResource', authResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
deleted file mode 100644
index 1fe739154a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
+++ /dev/null
@@ -1,331 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.codefileResource
-    * @description Loads in data for files that contain code such as js scripts, partial views and partial view macros
-    **/
-function codefileResource($q, $http, umbDataFormatter, umbRequestHelper, localizationService) {
-
-    return {
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.codefileResource#getByPath
-         * @methodOf umbraco.resources.codefileResource
-         *
-         * @description
-         * Gets a codefile item with a given path
-         *
-         * ##usage
-         * <pre>
-         * codefileResource.getByPath('scripts', 'oooh-la-la.js')
-         *    .then(function(codefile) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         * 
-         * <pre>
-         * codefileResource.getByPath('partialView', 'Grid%2fEditors%2fBase.cshtml')
-         *    .then(function(codefile) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {type} the type of script (partialView, partialViewMacro, script)
-         * @param {virtualpath} the virtual path of the script
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getByPath: function (type, virtualpath) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "codeFileApiBaseUrl",
-                       "GetByPath",
-                       [{ type: type }, {virtualPath: virtualpath }])),
-               "Failed to retrieve data for " + type + " from virtual path " + virtualpath);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.codefileResource#getByAlias
-         * @methodOf umbraco.resources.codefileResource
-         *
-         * @description
-         * Gets a template item with a given alias
-         *
-         * ##usage
-         * <pre>
-         * codefileResource.getByAlias("upload")
-         *    .then(function(template) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {String} alias Alias of template to retrieve
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getByAlias: function (alias) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "templateApiBaseUrl",
-                       "GetByAlias",
-                       [{ alias: alias }])),
-               "Failed to retrieve data for template with alias: " + alias);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.codefileResource#deleteByPath
-         * @methodOf umbraco.resources.codefileResource
-         *
-         * @description
-         * Deletes a codefile with a given type & path
-         *
-         * ##usage
-         * <pre>
-         * codefileResource.deleteByPath('scripts', 'oooh-la-la.js')
-         *    .then(function() {
-         *        alert('its gone!');
-         *    });
-         * </pre>
-         * 
-         * <pre>
-         * codefileResource.deleteByPath('partialViews', 'Grid%2fEditors%2fBase.cshtml')
-         *    .then(function() {
-         *        alert('its gone!');
-         *    });
-         * </pre>
-         *
-         * @param {type} the type of script (partialViews, partialViewMacros, scripts)
-         * @param {virtualpath} the virtual path of the script
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        deleteByPath: function (type, virtualpath) {
-
-            var promise = localizationService.localize("codefile_deleteItemFailed", [virtualpath]);
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "codeFileApiBaseUrl",
-                        "Delete",
-                        [{ type: type }, { virtualPath: virtualpath}])),
-                promise);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.codefileResource#save
-         * @methodOf umbraco.resources.codefileResource
-         *
-         * @description
-         * Saves or update a codeFile
-         * 
-         * ##usage
-         * <pre>
-         * codefileResource.save(codeFile)
-         *    .then(function(codeFile) {
-         *        alert('its saved!');
-         *    });
-         * </pre>
-         *
-         * @param {Object} template object to save
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        save: function (codeFile) {
-            return umbRequestHelper.resourcePromise(
-                 $http.post(
-                     umbRequestHelper.getApiUrl(
-                         "codeFileApiBaseUrl",
-                         "PostSave"),
-                         codeFile),
-                "Failed to save data for code file " + codeFile.virtualPath);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.codefileResource#getSnippets
-         * @methodOf umbraco.resources.codefileResource
-         *
-         * @description
-         * Gets code snippets for a given file type
-         * 
-         * ##usage
-         * <pre>
-         * codefileResource.getSnippets("partialViews")
-         *    .then(function(snippets) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {string} file type: (partialViews, partialViewMacros)
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getSnippets: function (fileType) {
-            return umbRequestHelper.resourcePromise(
-                 $http.get(
-                     umbRequestHelper.getApiUrl(
-                         "codeFileApiBaseUrl",
-                         "GetSnippets?type=" + fileType )),
-                "Failed to get snippet for" + fileType);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.codefileResource#getScaffold
-         * @methodOf umbraco.resources.codefileResource
-         *
-         * @description
-         * Returns a scaffold of an empty codefile item.
-         * 
-         * The scaffold is used to build editors for code file editors that has not yet been populated with data.
-         * 
-         * ##usage
-         * <pre>
-         * codefileResource.getScaffold("partialViews", "Breadcrumb")
-         *    .then(function(data) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {string} File type: (scripts, partialViews, partialViewMacros).
-         * @param {string} Snippet name (Ex. Breadcrumb).
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-
-        getScaffold: function (type, id, snippetName) {
-
-            var queryString = "?type=" + type + "&id=" + id;
-            if (snippetName) {
-                queryString += "&snippetName=" + snippetName;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                 $http.get(
-                     umbRequestHelper.getApiUrl(
-                        "codeFileApiBaseUrl",
-                        "GetScaffold" + queryString)),
-                "Failed to get scaffold for" + type);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.codefileResource#createContainer
-         * @methodOf umbraco.resources.codefileResource
-         *
-         * @description
-         * Creates a container/folder
-         * 
-         * ##usage
-         * <pre>
-         * codefileResource.createContainer("partialViews", "folder%2ffolder", "folder")
-         *    .then(function(data) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {string} File type: (scripts, partialViews, partialViewMacros).
-         * @param {string} Parent Id: url encoded path
-         * @param {string} Container name
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-
-        createContainer: function (type, parentId, name) {
-
-            // Is the parent ID numeric?
-            var key = "codefile_createFolderFailedBy" + (isNaN(parseInt(parentId)) ? "Name" : "Id");
-
-            var promise = localizationService.localize(key, [parentId]);
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl(
-                    "codeFileApiBaseUrl", 
-                    "PostCreateContainer", 
-                    { type: type, parentId: parentId, name: encodeURIComponent(name) })),
-                promise);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.codefileResource#interpolateStylesheetRules
-         * @methodOf umbraco.resources.codefileResource
-         *
-         * @description
-         * Takes all rich text editor styling rules and turns them into css
-         * 
-         * ##usage
-         * <pre>
-         * codefileResource.interpolateStylesheetRules(".box{background:purple;}", "[{name: "heading", selector: "h1", styles: "color: red"}]")
-         *    .then(function(data) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {string} content The style sheet content.
-         * @param {string} rules The rich text editor rules
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        interpolateStylesheetRules: function (content, rules) {
-            var payload = {
-                content: content,
-                rules: rules
-            };
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "codeFileApiBaseUrl",
-                        "PostInterpolateStylesheetRules"),
-                    payload),
-                "Failed to interpolate sheet rules");
-        },
-        
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.codefileResource#extractStylesheetRules
-         * @methodOf umbraco.resources.codefileResource
-         *
-         * @description
-         * Find all rich text editor styles in the style sheets and turns them into "rules"
-         * 
-         * ##usage
-         * <pre>
-         * 
-         * var conntent
-         * codefileResource.extractStylesheetRules(".box{background:purple;}")
-         *    .then(function(data) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {string} content The style sheet content.
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        extractStylesheetRules: function(content) {
-            var payload = {
-                content: content,
-                rules: null
-            };
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "codeFileApiBaseUrl",
-                        "PostExtractStylesheetRules"),
-                    payload),
-                "Failed to extract style sheet rules");
-        }
-
-    };
-}
-
-angular.module("umbraco.resources").factory("codefileResource", codefileResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
deleted file mode 100644
index b3218b2c7f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
+++ /dev/null
@@ -1,1430 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.contentResource
- * @description Handles all transactions of content data
- * from the angular application to the Umbraco database, using the Content WebApi controller
- *
- * all methods returns a resource promise async, so all operations won't complete untill .then() is completed.
- *
- * @requires $q
- * @requires $http
- * @requires umbDataFormatter
- * @requires umbRequestHelper
- *
- * ##usage
- * To use, simply inject the contentResource into any controller or service that needs it, and make
- * sure the umbraco.resources module is accesible - which it should be by default.
- *
- * <pre>
- *    contentResource.getById(1234)
- *          .then(function(data) {
- *              $scope.content = data;
-  *          });
-  * </pre>
- **/
-
-function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
-
-    /** internal method process the saving of data and post processing the result */
-    function saveContentItem(content, action, files, restApiUrl, showNotifications) {
-
-        return umbRequestHelper.postSaveContent({
-            restApiUrl: restApiUrl,
-            content: content,
-            action: action,
-            files: files,
-            showNotifications: showNotifications,
-            dataFormatter: function (c, a) {
-                return umbDataFormatter.formatContentPostData(c, a);
-            }
-        });
-    }
-
-    return {
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentResource#allowsCultureVariation
-        * @methodOf umbraco.resources.contentResource
-        *
-        * @description
-        * Check whether any content types have culture variant enabled
-        *
-        * ##usage
-        * <pre>
-        * contentResource.allowsCultureVariation()
-        *    .then(function() {
-        *       Do stuff...
-        *    });
-        * </pre>
-        *
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        allowsCultureVariation: function () {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "AllowsCultureVariation")),
-                'Failed to retrieve variant content types');
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentResource#savePermissions
-        * @methodOf umbraco.resources.contentResource
-        *
-        * @description
-        * Save user group permissions for the content
-        *
-        * ##usage
-        * <pre>
-        * contentResource.savePermissions(saveModel)
-        *    .then(function() {
-        *       Do stuff...
-        *    });
-        * </pre>
-        *
-        * @param {object} The object which contains the user group permissions for the content
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        savePermissions: function (saveModel) {
-            if (!saveModel) {
-                throw "saveModel cannot be null";
-            }
-            if (!saveModel.contentId) {
-                throw "saveModel.contentId cannot be null";
-            }
-            if (!saveModel.permissions) {
-                throw "saveModel.permissions cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostSaveUserGroupPermissions"),
-                    saveModel),
-                'Failed to save permissions');
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentResource#getRecycleBin
-        * @methodOf umbraco.resources.contentResource
-        *
-        * @description
-        * Get the recycle bin
-        *
-        * ##usage
-        * <pre>
-        * contentResource.getRecycleBin()
-        *    .then(function() {
-        *       Do stuff...
-        *    });
-        * </pre>
-        *
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        getRecycleBin: function () {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetRecycleBin")),
-                'Failed to retrieve data for content recycle bin');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#sort
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Sorts all children below a given parent node id, based on a collection of node-ids
-         *
-         * ##usage
-         * <pre>
-         * var ids = [123,34533,2334,23434];
-         * contentResource.sort({ parentId: 1244, sortedIds: ids })
-         *    .then(function() {
-         *        $scope.complete = true;
-         *    });
-          * </pre>
-         * @param {Object} args arguments object
-         * @param {Int} args.parentId the ID of the parent node
-         * @param {Array} options.sortedIds array of node IDs as they should be sorted
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        sort: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.sortedIds) {
-                throw "args.sortedIds cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostSort"),
-                    {
-                        parentId: args.parentId,
-                        idSortOrder: args.sortedIds
-                    }),
-                'Failed to sort content');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#move
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Moves a node underneath a new parentId
-         *
-         * ##usage
-         * <pre>
-         * contentResource.move({ parentId: 1244, id: 123 })
-         *    .then(function() {
-         *        alert("node was moved");
-         *    }, function(err){
-          *      alert("node didnt move:" + err.data.Message);
-         *    });
-          * </pre>
-         * @param {Object} args arguments object
-         * @param {Int} args.idd the ID of the node to move
-         * @param {Int} args.parentId the ID of the parent node to move to
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        move: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.id) {
-                throw "args.id cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostMove"),
-                    {
-                        parentId: args.parentId,
-                        id: args.id
-                    }, { responseType: 'text' }),
-                'Failed to move content');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#copy
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Copies a node underneath a new parentId
-         *
-         * ##usage
-         * <pre>
-         * contentResource.copy({ parentId: 1244, id: 123 })
-         *    .then(function() {
-         *        alert("node was copied");
-         *    }, function(err){
-          *      alert("node wasnt copy:" + err.data.Message);
-         *    });
-          * </pre>
-         * @param {Object} args arguments object
-         * @param {Int} args.id the ID of the node to copy
-         * @param {Int} args.parentId the ID of the parent node to copy to
-         * @param {Boolean} args.relateToOriginal if true, relates the copy to the original through the relation api
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        copy: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.id) {
-                throw "args.id cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostCopy"),
-                    args, { responseType: 'text' }),
-                'Failed to copy content');
-        },
-
-        /**
-         * @ngdoc method
-          * @name umbraco.resources.contentResource#unpublish
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Unpublishes a content item with a given Id
-         *
-         * ##usage
-         * <pre>
-          * contentResource.unpublish(1234)
-         *    .then(function() {
-         *        alert("node was unpulished");
-         *    }, function(err){
-          *      alert("node wasnt unpublished:" + err.data.Message);
-         *    });
-          * </pre>
-         * @param {Int} id the ID of the node to unpublish.
-         * @param {array} cultures the cultures to unpublish.
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        unpublish: function (id, cultures) {
-            if (!id) {
-                throw "id cannot be null";
-            }
-
-            if (!cultures) {
-                cultures = [];
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "PostUnpublish"), { id: id, cultures: cultures }),
-                'Failed to publish content with id ' + id);
-        },
-        /**
-         * @ngdoc method
-          * @name umbraco.resources.contentResource#getCultureAndDomains
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Gets the culture and hostnames for a content item with the given Id
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getCultureAndDomains(1234)
-          *    .then(function(data) {
-          *        alert(data.Domains, data.Language);
-          *    });
-          * </pre>
-          * @param {Int} id the ID of the node to get the culture and domains for.
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        getCultureAndDomains: function (id) {
-            if (!id) {
-                throw "id cannot be null";
-            }
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetCultureAndDomains", { id: id })),
-                'Failed to retreive culture and hostnames for ' + id);
-        },
-        saveLanguageAndDomains: function (model) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "PostSaveLanguageAndDomains"),
-                        model));
-        },
-        /**
-          * @ngdoc method
-         * @name umbraco.resources.contentResource#emptyRecycleBin
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Empties the content recycle bin
-         *
-         * ##usage
-         * <pre>
-         * contentResource.emptyRecycleBin()
-         *    .then(function() {
-         *        alert('its empty!');
-         *    });
-          * </pre>
-          *
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        emptyRecycleBin: function () {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "EmptyRecycleBin")),
-                'Failed to empty the recycle bin');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#deleteById
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Deletes a content item with a given id
-         *
-         * ##usage
-         * <pre>
-         * contentResource.deleteById(1234)
-         *    .then(function() {
-         *        alert('its gone!');
-         *    });
-          * </pre>
-          *
-          * @param {Int} id id of content item to delete
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        deleteById: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "DeleteById",
-                        [{ id: id }])),
-                'Failed to delete item ' + id);
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentResource#deleteBlueprint
-        * @methodOf umbraco.resources.contentResource
-        *
-        * @description
-        * Deletes a content blueprint item with a given id
-        *
-        * ##usage
-        * <pre>
-        * contentResource.deleteBlueprint(1234)
-        *    .then(function() {
-        *        alert('its gone!');
-        *    });
-        * </pre>
-        *
-        * @param {Int} id id of content blueprint item to delete
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        deleteBlueprint: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "DeleteBlueprint",
-                        [{ id: id }])),
-                'Failed to delete blueprint ' + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#getById
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Gets a content item with a given id
-         *
-         * ##usage
-         * <pre>
-         * contentResource.getById(1234)
-         *    .then(function(content) {
-          *        var myDoc = content;
-         *        alert('its here!');
-         *    });
-          * </pre>
-          *
-          * @param {Int} id id of content item to return
-          * @param {Int} culture optional culture to retrieve the item in
-         * @returns {Promise} resourcePromise object containing the content item.
-         *
-         */
-        getById: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetById",
-                        { id: id })),
-                'Failed to retrieve data for content id ' + id)
-                .then(function (result) {
-                    return $q.when(umbDataFormatter.formatContentGetData(result));
-                });
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentResource#getBlueprintById
-        * @methodOf umbraco.resources.contentResource
-        *
-        * @description
-        * Gets a content blueprint item with a given id
-        *
-        * ##usage
-        * <pre>
-        * contentResource.getBlueprintById(1234)
-        *    .then(function() {
-        *       Do stuff...
-        *    });
-        * </pre>
-        *
-        * @param {Int} id id of content blueprint item to retrieve
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        getBlueprintById: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetBlueprintById",
-                        { id: id })),
-                'Failed to retrieve data for content id ' + id)
-                .then(function (result) {
-                    return $q.when(umbDataFormatter.formatContentGetData(result));
-                });
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentResource#getNotifySettingsById
-        * @methodOf umbraco.resources.contentResource
-        *
-        * @description
-        * Gets notification options for a content item with a given id for the current user
-        *
-        * ##usage
-        * <pre>
-        * contentResource.getNotifySettingsById(1234)
-        *    .then(function() {
-        *       Do stuff...
-        *    });
-        * </pre>
-        *
-        * @param {Int} id id of content item
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        getNotifySettingsById: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetNotificationOptions",
-                        { contentId: id })),
-                'Failed to retrieve data for content id ' + id);
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentResource#getNotifySettingsById
-        * @methodOf umbraco.resources.contentResource
-        *
-        * @description
-        * Sets notification settings for a content item with a given id for the current user
-        *
-        * ##usage
-        * <pre>
-        * contentResource.setNotifySettingsById(1234,["D", "F", "H"])
-        *    .then(function() {
-        *       Do stuff...
-        *    });
-        * </pre>
-        *
-        * @param {Int} id id of content item
-        * @param {Array} options the notification options to set for the content item
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        setNotifySettingsById: function (id, options) {
-            if (!id) {
-                throw "contentId cannot be null";
-            }
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "PostNotificationOptions",
-                        { contentId: id, notifyOptions: options })),
-                'Failed to set notify settings for content id ' + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#getByIds
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Gets an array of content items, given a collection of ids
-         *
-         * ##usage
-         * <pre>
-         * contentResource.getByIds( [1234,2526,28262])
-         *    .then(function(contentArray) {
-          *        var myDoc = contentArray;
-         *        alert('they are here!');
-         *    });
-          * </pre>
-          *
-          * @param {Array} ids ids of content items to return as an array
-         * @returns {Promise} resourcePromise object containing the content items array.
-         *
-         */
-        getByIds: function (ids) {
-
-            var idQuery = "";
-            ids.forEach(id => idQuery += `ids=${id}&`);
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetByIds",
-                        idQuery)),
-                'Failed to retrieve data for content with multiple ids')
-                .then(function (result) {
-                    //each item needs to be re-formatted
-                    result.forEach(r => umbDataFormatter.formatContentGetData(r));
-                    return $q.when(result);
-                });
-        },
-
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#getScaffold
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Returns a scaffold of an empty content item, given the id of the content item to place it underneath and the content type alias.
-          *
-         * - Parent Id must be provided so umbraco knows where to store the content
-          * - Content Type alias must be provided so umbraco knows which properties to put on the content scaffold
-          *
-         * The scaffold is used to build editors for content that has not yet been populated with data.
-          *
-         * ##usage
-         * <pre>
-         * contentResource.getScaffold(1234, 'homepage')
-         *    .then(function(scaffold) {
-         *        var myDoc = scaffold;
-          *        myDoc.name = "My new document";
-         *
-         *        contentResource.publish(myDoc, true)
-         *            .then(function(content){
-         *                alert("Retrieved, updated and published again");
-         *            });
-         *    });
-          * </pre>
-          *
-         * @param {Int} parentId id of content item to return
-          * @param {String} alias contenttype alias to base the scaffold on
-         * @returns {Promise} resourcePromise object containing the content scaffold.
-         *
-         */
-        getScaffold: function (parentId, alias) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetEmpty",
-                        { contentTypeAlias: alias, parentId: parentId })),
-                'Failed to retrieve data for empty content item type ' + alias)
-                .then(function (result) {
-                    return $q.when(umbDataFormatter.formatContentGetData(result));
-                });
-        },
-
-        getScaffolds: function(parentId, aliases){
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetEmptyByAliases"),
-                        { parentId: parentId, contentTypeAliases: aliases }
-                    ),
-                    'Failed to retrieve data for empty content item aliases ' + aliases.join(", ")
-                ).then(function(result) {
-                    Object.keys(result).map(function(key){
-                        result[key] = umbDataFormatter.formatContentGetData(result[key]);
-                    });
-
-                    return $q.when(result);
-                });
-        },
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#getScaffoldByKey
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Returns a scaffold of an empty content item, given the id of the content item to place it underneath and the content type alias.
-          *
-         * - Parent Id must be provided so umbraco knows where to store the content
-          * - Content Type Id must be provided so umbraco knows which properties to put on the content scaffold
-          *
-         * The scaffold is used to build editors for content that has not yet been populated with data.
-          *
-         * ##usage
-         * <pre>
-         * contentResource.getScaffoldByKey(1234, '...')
-         *    .then(function(scaffold) {
-         *        var myDoc = scaffold;
-          *        myDoc.name = "My new document";
-         *
-         *        contentResource.publish(myDoc, true)
-         *            .then(function(content){
-         *                alert("Retrieved, updated and published again");
-         *            });
-         *    });
-          * </pre>
-          *
-         * @param {Int} parentId id of content item to return
-          * @param {String} contentTypeGuid contenttype guid to base the scaffold on
-         * @returns {Promise} resourcePromise object containing the content scaffold.
-         *
-         */
-        getScaffoldByKey: function (parentId, contentTypeKey) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetEmptyByKey",
-                        { contentTypeKey: contentTypeKey, parentId: parentId })),
-                'Failed to retrieve data for empty content item id ' + contentTypeKey)
-                .then(function (result) {
-                    return $q.when(umbDataFormatter.formatContentGetData(result));
-                });
-        },
-
-        getScaffoldByKeys: function (parentId, scaffoldKeys) {
-
-            return umbRequestHelper.resourcePromise(
-                    $http.post(
-                        umbRequestHelper.getApiUrl(
-                            "contentApiBaseUrl",
-                            "GetEmptyByKeys"),
-                        { contentTypeKeys: scaffoldKeys, parentId: parentId }
-                    ),
-                    'Failed to retrieve data for empty content items ids' + scaffoldKeys.join(", "))
-                .then(function (result) {
-                    Object.keys(result).map(function(key) {
-                        result[key] = umbDataFormatter.formatContentGetData(result[key]);
-                    });
-
-                    return $q.when(result);
-                });
-        },
-
-        getBlueprintScaffold: function (parentId, blueprintId) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetEmptyBlueprint",
-                        { blueprintId: blueprintId, parentId: parentId })),
-                'Failed to retrieve blueprint for id ' + blueprintId)
-                .then(function (result) {
-                    return $q.when(umbDataFormatter.formatContentGetData(result));
-                });
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#getNiceUrl
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Returns a url, given a node ID
-         *
-         * ##usage
-         * <pre>
-         * contentResource.getNiceUrl(id)
-         *    .then(function(url) {
-         *        alert('its here!');
-         *    });
-          * </pre>
-          *
-         * @param {Int} id Id of node to return the public url to
-         * @returns {Promise} resourcePromise object containing the url.
-         *
-         */
-        getNiceUrl: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetNiceUrl", { id: id }),
-                    { responseType: 'text' }),
-                'Failed to retrieve url for id:' + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#getChildren
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Gets children of a content item with a given id
-         *
-         * ##usage
-         * <pre>
-         * contentResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
-         *    .then(function(contentArray) {
-          *        var children = contentArray;
-         *        alert('they are here!');
-         *    });
-          * </pre>
-          *
-         * @param {Int} parentid id of content item to return children of
-         * @param {Object} options optional options object
-         * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
-         * @param {Int} options.pageNumber if paging data, current page index, default = 0
-         * @param {String} options.filter if provided, query will only return those with names matching the filter
-         * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
-         * @param {String} options.orderBy property to order items by, default: `SortOrder`
-          * @param {String} options.cultureName if provided, the results will be for this specific culture/variant
-         * @returns {Promise} resourcePromise object containing an array of content items.
-         *
-         */
-        getChildren: function (parentId, options) {
-
-            var defaults = {
-                includeProperties: [],
-                pageSize: 0,
-                pageNumber: 0,
-                filter: "",
-                orderDirection: "Ascending",
-                orderBy: "SortOrder",
-                orderBySystemField: true,
-                cultureName: ""
-            };
-            if (options === undefined) {
-                options = {};
-            }
-            //overwrite the defaults if there are any specified
-            Utilities.extend(defaults, options);
-            //now copy back to the options we will use
-            options = defaults;
-            //change asc/desct
-            if (options.orderDirection === "asc") {
-                options.orderDirection = "Ascending";
-            }
-            else if (options.orderDirection === "desc") {
-                options.orderDirection = "Descending";
-            }
-
-            //converts the value to a js bool
-            function toBool(v) {
-                if (Utilities.isNumber(v)) {
-                    return v > 0;
-                }
-                if (Utilities.isString(v)) {
-                    return v === "true";
-                }
-                if (typeof v === "boolean") {
-                    return v;
-                }
-                return false;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetChildren",
-                        {
-                            id: parentId,
-                            includeProperties: _.pluck(options.includeProperties, 'alias').join(","),
-                            pageNumber: options.pageNumber,
-                            pageSize: options.pageSize,
-                            orderBy: options.orderBy,
-                            orderDirection: options.orderDirection,
-                            orderBySystemField: toBool(options.orderBySystemField),
-                            filter: options.filter,
-                            cultureName: options.cultureName
-                        })),
-                'Failed to retrieve children for content item ' + parentId);
-        },
-
-        getDetailedPermissions: function (contentId) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentApiBaseUrl",
-                        "GetDetailedPermissions", { contentId: contentId })),
-                'Failed to retrieve permissions for content item ' + contentId);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#save
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Saves changes made to a content item to its current version, if the content item is new, the isNew parameter must be passed to force creation
-          * if the content item needs to have files attached, they must be provided as the files param and passed separately
-          *
-          *
-         * ##usage
-         * <pre>
-         * contentResource.getById(1234)
-         *    .then(function(content) {
-         *          content.name = "I want a new name!";
-         *          contentResource.save(content, false)
-         *            .then(function(content){
-         *                alert("Retrieved, updated and saved again");
-         *            });
-         *    });
-          * </pre>
-          *
-         * @param {Object} content The content item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing
-          * @param {Array} files collection of files for the document
-          * @param {Bool} showNotifications an option to disable/show notifications (default is true)
-         * @returns {Promise} resourcePromise object containing the saved content item.
-         *
-         */
-        save: function (content, isNew, files, showNotifications) {
-            var endpoint = umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                "PostSave");
-            return saveContentItem(content, "save" + (isNew ? "New" : ""), files, endpoint, showNotifications);
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentResource#saveBlueprint
-        * @methodOf umbraco.resources.contentResource
-        *
-        * @description
-        * Saves changes made to a content blueprint item to its current version, if the content blueprint item is new, the isNew parameter must be passed to force creation
-        * if the content item needs to have files attached, they must be provided as the files param and passed separately
-        *
-        * ##usage
-        * <pre>
-        * contentResource.getById(1234)
-        *    .then(function(content) {
-        *          content.name = "I want a new name!";
-        *          contentResource.saveBlueprint(content, false)
-        *            .then(function(content){
-        *                alert("Retrieved, updated and saved again");
-        *            });
-        *    });
-        * </pre>
-        *
-        * @param {Object} content The content blueprint item object with changes applied
-        * @param {Bool} isNew set to true to create a new item or to update an existing
-        * @param {Array} files collection of files for the document
-        * @param {Bool} showNotifications an option to disable/show notifications (default is true)
-        * @returns {Promise} resourcePromise object containing the saved content item.
-        *
-        */
-        saveBlueprint: function (content, isNew, files, showNotifications) {
-            var endpoint = umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                "PostSaveBlueprint");
-            return saveContentItem(content, "save" + (isNew ? "New" : ""), files, endpoint, showNotifications);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#publish
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Saves and publishes changes made to a content item to a new version, if the content item is new, the isNew parameter must be passed to force creation
-          * if the content item needs to have files attached, they must be provided as the files param and passed separately
-          *
-          *
-         * ##usage
-         * <pre>
-         * contentResource.getById(1234)
-         *    .then(function(content) {
-         *          content.name = "I want a new name, and be published!";
-         *          contentResource.publish(content, false)
-         *            .then(function(content){
-         *                alert("Retrieved, updated and published again");
-         *            });
-         *    });
-          * </pre>
-          *
-         * @param {Object} content The content item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing
-          * @param {Array} files collection of files for the document
-          * @param {Bool} showNotifications an option to disable/show notifications (default is true)
-         * @returns {Promise} resourcePromise object containing the saved content item.
-         *
-         */
-        publish: function (content, isNew, files, showNotifications) {
-            var endpoint = umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                "PostSave");
-            return saveContentItem(content, "publish" + (isNew ? "New" : ""), files, endpoint, showNotifications);
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentResource#publish
-        * @methodOf umbraco.resources.contentResource
-        *
-        * @description
-        * Saves and publishes changes made to a content item and its descendants to a new version, if the content item is new, the isNew parameter must be passed to force creation
-        * if the content items needs to have files attached, they must be provided as the files param and passed separately
-        *
-        *
-        * ##usage
-        * <pre>
-        * contentResource.getById(1234)
-        *    .then(function(content) {
-        *          content.name = "I want a new name, and be published!";
-        *          contentResource.publishWithDescendants(content, false)
-        *            .then(function(content){
-        *                alert("Retrieved, updated and published again");
-        *            });
-        *    });
-        * </pre>
-        *
-        * @param {Object} content The content item object with changes applied
-        * @param {Bool} isNew set to true to create a new item or to update an existing
-        * @param {Array} files collection of files for the document
-        * @param {Bool} showNotifications an option to disable/show notifications (default is true)
-        * @returns {Promise} resourcePromise object containing the saved content item.
-        *
-        */
-        publishWithDescendants: function (content, isNew, force, files, showNotifications) {
-            var endpoint = umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                "PostSave");
-
-            var action = "publishWithDescendants";
-            if (force === true) {
-                action += "Force";
-            }
-
-            return saveContentItem(content, action + (isNew ? "New" : ""), files, endpoint, showNotifications);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#sendToPublish
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Saves changes made to a content item, and notifies any subscribers about a pending publication
-          *
-         * ##usage
-         * <pre>
-         * contentResource.getById(1234)
-         *    .then(function(content) {
-         *          content.name = "I want a new name, and be published!";
-         *          contentResource.sendToPublish(content, false)
-         *            .then(function(content){
-         *                alert("Retrieved, updated and notication send off");
-         *            });
-         *    });
-          * </pre>
-          *
-         * @param {Object} content The content item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing
-          * @param {Array} files collection of files for the document
-         * @returns {Promise} resourcePromise object containing the saved content item.
-         *
-         */
-        sendToPublish: function (content, isNew, files, showNotifications) {
-            var endpoint = umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                "PostSave");
-            return saveContentItem(content, "sendPublish" + (isNew ? "New" : ""), files, endpoint, showNotifications);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#saveSchedule
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Saves changes made to a content item, and saves the publishing schedule
-          *
-          * @param {Object} content The content item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing
-          * @param {Array} files collection of files for the document
-          * @returns {Promise} resourcePromise object containing the saved content item.
-          *
-          */
-        saveSchedule: function (content, isNew, files, showNotifications) {
-            var endpoint = umbRequestHelper.getApiUrl(
-                "contentApiBaseUrl",
-                "PostSave");
-            return saveContentItem(content, "schedule" + (isNew ? "New" : ""), files, endpoint, showNotifications);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#publishByid
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Publishes a content item with a given ID
-          *
-         * ##usage
-         * <pre>
-         * contentResource.publishById(1234)
-         *    .then(function(content) {
-         *        alert("published");
-         *    });
-          * </pre>
-          *
-         * @param {Int} id The ID of the conten to publish
-         * @param {array} cultures the cultures to publish.
-         * @returns {Promise} resourcePromise object containing the published content item.
-         *
-         */
-        publishById: function (id, cultures) {
-            if (!id) {
-                throw "id cannot be null";
-            }
-
-            if (!cultures) {
-                return umbRequestHelper.resourcePromise(
-                  $http.post(
-                    umbRequestHelper.getApiUrl(
-                      "contentApiBaseUrl",
-                      "PostPublishById"), { id: id }),
-                  'Failed to publish content with id ' + id);
-            }
-            else {
-                return umbRequestHelper.resourcePromise(
-                  $http.post(
-                    umbRequestHelper.getApiUrl(
-                      "contentApiBaseUrl",
-                      "PostPublishByIdAndCulture"), { id: id, cultures: cultures }),
-                  'Failed to publish content with id ' + id);
-            }
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentResource#createBlueprintFromContent
-        * @methodOf umbraco.resources.contentResource
-        *
-        * @description
-        * Creates a content blueprint with a given name from a given content id
-        *
-        * ##usage
-        * <pre>
-        * contentResource.createBlueprintFromContent(1234,"name")
-        *    .then(function(content) {
-        *        alert("created");
-        *    });
-            * </pre>
-            *
-        * @param {Int} id The ID of the content to create the content blueprint from
-        * @param {string} id The name of the content blueprint
-        * @returns {Promise} resourcePromise object
-        *
-        */
-        createBlueprintFromContent: function (contentId, name) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "CreateBlueprintFromContent", {
-                        contentId: contentId, name: name
-                    })
-                ),
-                "Failed to create blueprint from content with id " + contentId
-            );
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getRollbackVersions
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Returns an array of previous version id's, given a node id and a culture
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getRollbackVersions(id, culture)
-          *    .then(function(versions) {
-          *        alert('its here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} id Id of node
-          * @param {Int} culture if provided, the results will be for this specific culture/variant
-          * @returns {Promise} resourcePromise object containing the versions
-          *
-          */
-        getRollbackVersions: function (contentId, culture) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "GetRollbackVersions", {
-                        contentId: contentId,
-                        culture: culture
-                    })
-                ),
-                "Failed to get rollback versions for content item with id " + contentId
-            );
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getRollbackVersion
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Returns a previous version of a content item
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getRollbackVersion(versionId, culture)
-          *    .then(function(version) {
-          *        alert('its here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} versionId The version Id
-          * @param {Int} culture if provided, the results will be for this specific culture/variant
-          * @returns {Promise} resourcePromise object containing the version
-          *
-          */
-        getRollbackVersion: function (versionId, culture) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "GetRollbackVersion", {
-                        versionId: versionId,
-                        culture: culture
-                    })
-                ),
-                "Failed to get version for content item with id " + versionId
-            );
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#rollback
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Roll backs a content item to a previous version
-          *
-          * ##usage
-          * <pre>
-          * contentResource.rollback(contentId, versionId, culture)
-          *    .then(function() {
-          *        alert('its here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} id Id of node
-          * @param {Int} versionId The version Id
-          * @param {Int} culture if provided, the results will be for this specific culture/variant
-          * @returns {Promise} resourcePromise object
-          *
-          */
-        rollback: function (contentId, versionId, culture) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostRollbackContent", {
-                        contentId: contentId, versionId:versionId, culture:culture
-                    })
-                ),
-                "Failed to roll back content item with id " + contentId
-            );
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getPublicAccess
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Returns the public access protection for a content item
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getPublicAccess(contentId)
-          *    .then(function(publicAccess) {
-          *        // do your thing
-          *    });
-          * </pre>
-          *
-          * @param {Int} contentId The content Id
-          * @returns {Promise} resourcePromise object containing the public access protection
-          *
-          */
-        getPublicAccess: function (contentId) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl("publicAccessApiBaseUrl", "GetPublicAccess", {
-                        contentId: contentId
-                    })
-                ),
-                "Failed to get public access for content item with id " + contentId
-            );
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#updatePublicAccess
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Sets or updates the public access protection for a content item
-          *
-          * ##usage
-          * <pre>
-          * contentResource.updatePublicAccess(contentId, userName, password, roles, loginPageId, errorPageId)
-          *    .then(function() {
-          *        // do your thing
-          *    });
-          * </pre>
-          *
-          * @param {Int} contentId The content Id
-          * @param {Array} groups The names of the groups that should have access (if using group based protection)
-          * @param {Array} usernames The usernames of the members that should have access (if using member based protection)
-          * @param {Int} loginPageId The Id of the login page
-          * @param {Int} errorPageId The Id of the error page
-          * @returns {Promise} resourcePromise object containing the public access protection
-          *
-          */
-        updatePublicAccess: function (contentId, groups, usernames, loginPageId, errorPageId) {
-            var publicAccess = {
-                contentId: contentId,
-                loginPageId: loginPageId,
-                errorPageId: errorPageId
-            };
-            if (Utilities.isArray(groups) && groups.length) {
-                publicAccess.groups = groups;
-            }
-            else if (Utilities.isArray(usernames) && usernames.length) {
-                publicAccess.usernames = usernames;
-            }
-            else {
-                throw "must supply either userName/password or roles";
-            }
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl("publicAccessApiBaseUrl", "PostPublicAccess", publicAccess)
-                ),
-                "Failed to update public access for content item with id " + contentId
-            );
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#removePublicAccess
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Removes the public access protection for a content item
-          *
-          * ##usage
-          * <pre>
-          * contentResource.removePublicAccess(contentId)
-          *    .then(function() {
-          *        // do your thing
-          *    });
-          * </pre>
-          *
-          * @param {Int} contentId The content Id
-          * @returns {Promise} resourcePromise object that's resolved once the public access has been removed
-          *
-          */
-        removePublicAccess: function (contentId) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "RemovePublicAccess", {
-                        contentId: contentId
-                    })
-                ),
-                "Failed to remove public access for content item with id " + contentId
-            );
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#getPagedContentVersions
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Returns a paged array of previous version id's, given a node id, pageNumber, pageSize and a culture
-          *
-          * ##usage
-          * <pre>
-          * contentResource.getPagedContentVersions(id, pageNumber, pageSize, culture)
-          *    .then(function(versions) {
-          *        alert('its here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} id Id of node
-          * @param {Int} pageNumber page number
-          * @param {Int} pageSize page size
-          * @param {Int} culture if provided, the results will be for this specific culture/variant
-          * @returns {Promise} resourcePromise object containing the versions
-          *
-          */
-        getPagedContentVersions: function (contentId, pageNumber, pageSize, culture) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "GetPagedContentVersions", {
-                        contentId: contentId,
-                        pageNumber: pageNumber,
-                        pageSize: pageSize,
-                        culture: culture
-                    })
-                ),
-                "Failed to get versions for content item with id " + contentId
-            );
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.contentResource#contentVersionPreventCleanup
-          * @methodOf umbraco.resources.contentResource
-          *
-          * @description
-          * Enables or disabled clean up of a version
-          *
-          * ##usage
-          * <pre>
-          * contentResource.contentVersionPreventCleanup(contentId, versionId, preventCleanup)
-          *    .then(function() {
-          *        // do your thing
-          *    });
-          * </pre>
-          *
-          * @param {Int} contentId Id of node
-          * @param {Int} versionId Id of version
-          * @param {Int} preventCleanup Boolean to toggle clean up prevention
-          *
-          */
-        contentVersionPreventCleanup: function (contentId, versionId, preventCleanup) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostSetContentVersionPreventCleanup", {
-                        contentId: contentId,
-                        versionId: versionId,
-                        preventCleanup: preventCleanup
-                    })
-                ),
-                "Failed to toggle prevent cleanup of version with id " + versionId
-            );
-        }
-    };
-}
-
-angular.module('umbraco.resources').factory('contentResource', contentResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
deleted file mode 100644
index ccc80dee37..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
+++ /dev/null
@@ -1,687 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.contentTypeResource
-    * @description Loads in data for content types
-    **/
-function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, localizationService, notificationsService) {
-
-    return {
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#getCount
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Gets the count of content types
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.getCount()
-        *    .then(function(data) {
-        *        console.log(data);
-        *    });
-        * </pre>
-        * 
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        getCount: function () {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentTypeApiBaseUrl",
-                        "GetCount")),
-                'Failed to retrieve count');
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#getAvailableCompositeContentTypes
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Gets the compositions for a content type
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.getAvailableCompositeContentTypes()
-        *    .then(function(data) {
-        *        console.log(data);
-        *    });
-        * </pre>
-        *
-        * @param {Int} contentTypeId id of the content type to retrieve the list of the compositions
-        * @param {Array} filterContentTypes array of content types to filter out 
-        * @param {Array} filterPropertyTypes array of property aliases to filter out. If specified any content types with the property aliases will be filtered out
-        * @param {Boolean} isElement whether the composite content types should be applicable for an element type
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        getAvailableCompositeContentTypes: function (contentTypeId, filterContentTypes, filterPropertyTypes, isElement) {
-            if (!filterContentTypes) {
-                filterContentTypes = [];
-            }
-            if (!filterPropertyTypes) {
-                filterPropertyTypes = [];
-            }
-
-            var query = {
-                contentTypeId: contentTypeId,
-                filterContentTypes: filterContentTypes,
-                filterPropertyTypes: filterPropertyTypes,
-                isElement: isElement
-            };
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "contentTypeApiBaseUrl",
-                        "GetAvailableCompositeContentTypes"),
-                    query),
-                'Failed to retrieve data for content type id ' + contentTypeId);
-        },
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#getWhereCompositionIsUsedInContentTypes
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Returns a list of content types which use a specific composition with a given id
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.getWhereCompositionIsUsedInContentTypes(1234)
-        *    .then(function(contentTypeList) {
-        *        console.log(contentTypeList);
-        *    });
-        * </pre>
-        * @param {Int} contentTypeId id of the composition content type to retrieve the list of the content types where it has been used
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        getWhereCompositionIsUsedInContentTypes: function (contentTypeId) {
-            var query = {
-                contentTypeId: contentTypeId
-            };
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "contentTypeApiBaseUrl",
-                        "GetWhereCompositionIsUsedInContentTypes"),
-                    query),
-                'Failed to retrieve data for content type id ' + contentTypeId);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentTypeResource#getAllowedTypes
-         * @methodOf umbraco.resources.contentTypeResource
-         *
-         * @description
-         * Returns a list of allowed content types underneath a content item with a given ID
-         *
-         * ##usage
-         * <pre>
-         * contentTypeResource.getAllowedTypes(1234)
-         *    .then(function(array) {
-         *        $scope.type = type;
-         *    });
-         * </pre>
-         * 
-         * @param {Int} contentTypeId id of the content item to retrieve allowed child types for
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getAllowedTypes: function (contentTypeId) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentTypeApiBaseUrl",
-                        "GetAllowedChildren",
-                        [{ contentId: contentTypeId }])),
-                'Failed to retrieve data for content id ' + contentTypeId);
-        },
-
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentTypeResource#getAllPropertyTypeAliases
-         * @methodOf umbraco.resources.contentTypeResource
-         *
-         * @description
-         * Returns a list of defined property type aliases
-         *
-         * ##usage
-         * <pre>
-         * contentTypeResource.getAllPropertyTypeAliases()
-         *    .then(function(array) {
-         *       Do stuff...
-         *    });
-         * </pre>
-         *
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getAllPropertyTypeAliases: function () {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentTypeApiBaseUrl",
-                        "GetAllPropertyTypeAliases")),
-                'Failed to retrieve property type aliases');
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#getAllStandardFields
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Returns a list of standard property type aliases
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.getAllStandardFields()
-        *    .then(function(array) {
-        *       Do stuff...
-        *    });
-        * </pre>
-        *
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        getAllStandardFields: function () {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentTypeApiBaseUrl",
-                        "GetAllStandardFields")),
-                'Failed to retrieve standard fields');
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#getPropertyTypeScaffold
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Returns the property display for a given datatype id
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.getPropertyTypeScaffold(1234)
-        *    .then(function(array) {
-        *       Do stuff...
-        *    });
-        * </pre>
-        *
-        * @param {Int} id the id of the datatype
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        getPropertyTypeScaffold: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentTypeApiBaseUrl",
-                        "GetPropertyTypeScaffold",
-                        [{ id: id }])),
-                'Failed to retrieve property type scaffold');
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#getById
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Get the content type with a given id
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.getById("64058D0F-4911-4AB7-B3BA-000D89F00A26")
-        *    .then(function(array) {
-        *       Do stuff...
-        *    });
-        * </pre>
-        *
-        * @param {String} id the guid id of the content type
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        getById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentTypeApiBaseUrl",
-                        "GetById",
-                        [{ id: id }])),
-                'Failed to retrieve content type');
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#deleteById
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Delete the content type of a given id
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.deleteById(1234)
-        *    .then(function(array) {
-        *       Do stuff...
-        *    });
-        * </pre>
-        *
-        * @param {Int} id the id of the content type
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        deleteById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "contentTypeApiBaseUrl",
-                        "DeleteById",
-                        [{ id: id }])),
-                'Failed to delete content type');
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#deleteContainerById
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Delete the content type container of a given id
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.deleteContainerById(1234)
-        *    .then(function(array) {
-        *       Do stuff...
-        *    });
-        * </pre>
-        *
-        * @param {Int} id the id of the content type container
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        deleteContainerById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "contentTypeApiBaseUrl",
-                        "DeleteContainer",
-                        [{ id: id }])),
-                'Failed to delete content type container');
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#getAll
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Returns a list of all content types
-        *
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        getAll: function () {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentTypeApiBaseUrl",
-                        "GetAll")),
-                'Failed to retrieve all content types');
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#getScaffold
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Returns an empty content type for use as a scaffold when creating a new content type
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.getScaffold(1234)
-        *    .then(function(array) {
-        *       Do stuff...
-        *    });
-        * </pre>
-        *
-        * @param {Int} id the parent id
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        getScaffold: function (parentId) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentTypeApiBaseUrl",
-                        "GetEmpty", { parentId: parentId })),
-                'Failed to retrieve content type scaffold');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentTypeResource#save
-         * @methodOf umbraco.resources.contentTypeResource
-         *
-         * @description
-         * Saves or update a content type
-         *
-         * @param {Object} content data type object to create/update
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        save: function (contentType) {
-
-            var saveModel = umbDataFormatter.formatContentTypePostData(contentType);
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostSave"), saveModel),
-                'Failed to save data for content type id ' + contentType.id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentTypeResource#move
-         * @methodOf umbraco.resources.contentTypeResource
-         *
-         * @description
-         * Moves a node underneath a new parentId
-         *
-         * ##usage
-         * <pre>
-         * contentTypeResource.move({ parentId: 1244, id: 123 })
-         *    .then(function() {
-         *        alert("content type was moved");
-         *    }, function(err){
-         *      alert("content type didnt move:" + err.data.Message);
-         *    });
-         * </pre>
-         * @param {Object} args arguments object
-         * @param {Int} args.id the ID of the content type to move
-         * @param {Int} args.parentId the ID of the parent content type to move to
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        move: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.id) {
-                throw "args.id cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostMove"),
-                    {
-                        parentId: args.parentId,
-                        id: args.id
-                    }, { responseType: 'text' }),
-              'Failed to move content type');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentTypeResource#copy
-         * @methodOf umbraco.resources.contentTypeResource
-         *
-         * @description
-         * Copied a content type underneath a new parentId
-         *
-         * ##usage
-         * <pre>
-         * contentTypeResource.copy({ parentId: 1244, id: 123 })
-         *    .then(function() {
-         *        alert("content type was copied");
-         *    }, function(err){
-         *      alert("content type didnt copy:" + err.data.Message);
-         *    });
-         * </pre>
-         * @param {Object} args arguments object
-         * @param {Int} args.id the ID of the content type to copy
-         * @param {Int} args.parentId the ID of the parent content type to copy to
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        copy: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.id) {
-                throw "args.id cannot be null";
-            }
-
-            var promise = localizationService.localize("contentType_copyFailed");
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostCopy"),
-                    {
-                        parentId: args.parentId,
-                        id: args.id
-                    }, { responseType: 'text' }),
-                promise);
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#createContainer
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Create a new content type container of a given name underneath a given parent item
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.createContainer(1244,"testcontainer")
-        *    .then(function() {
-        *       Do stuff..
-        *    });
-        * </pre>
-        * 
-        * @param {Int} parentId the ID of the parent content type underneath which to create the container
-        * @param {String} name the name of the container
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        createContainer: function (parentId, name) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostCreateContainer", { parentId: parentId, name: encodeURIComponent(name) })),
-                'Failed to create a folder under parent id ' + parentId);
-
-
-        }, 
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#renameContainer
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Rename a container of a given id
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.renameContainer( 1244,"testcontainer")
-        *    .then(function() {
-        *       Do stuff..
-        *    });
-        * </pre>
-        *
-        * @param {Int} id the ID of the container to rename
-        * @param {String} name the new name of the container
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        renameContainer: function (id, name) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl",
-                    "PostRenameContainer",
-                    { id: id, name: name })),
-                "Failed to rename the folder with id " + id
-            );
-
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#export
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Export a content type of a given id.
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.export(1234){
-        *    .then(function() {
-        *       Do stuff..
-        *    });
-        * </pre>
-        *
-        * @param {Int} id the ID of the container to rename
-        * @param {String} name the new name of the container
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        export: function (id) {
-            if (!id) {
-                throw "id cannot be null";
-            }
-
-            var url = umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "Export", { id: id });
-
-            return umbRequestHelper.downloadFile(url).then(function () {
-                localizationService.localize("speechBubbles_documentTypeExportedSuccess").then(function(value) {
-                    notificationsService.success(value);
-                });
-            }, function (data) {
-                localizationService.localize("speechBubbles_documentTypeExportedError").then(function(value) {
-                    notificationsService.error(value);
-                });
-            });
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#import
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Import a content type from a file
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.import("path to file"){
-        *    .then(function() {
-        *       Do stuff..
-        *    });
-        * </pre>
-        *
-        * @param {String} file path of the file to import
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        import: function (file) {
-            if (!file) {
-                throw "file cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "Import", { file: file })),
-                "Failed to import document type " + file
-            );
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#createDefaultTemplate
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Create a default template for a content type with a given id
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.createDefaultTemplate(1234){
-        *    .then(function() {
-        *       Do stuff..
-        *    });
-        * </pre>
-        *
-        * @param {Int} id the id of the content type for which to create the default template
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        createDefaultTemplate: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostCreateDefaultTemplate", { id: id })),
-                'Failed to create default template for content type with id ' + id);
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.contentTypeResource#hasContentNodes
-        * @methodOf umbraco.resources.contentTypeResource
-        *
-        * @description
-        * Returns whether a content type has content nodes
-        *
-        * ##usage
-        * <pre>
-        * contentTypeResource.hasContentNodes(1234){
-        *    .then(function() {
-        *       Do stuff..
-        *    });
-        * </pre>
-        *
-        * @param {Int} id the id of the content type
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        hasContentNodes: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "contentTypeApiBaseUrl",
-                        "HasContentNodes",
-                        [{ id: id }])),
-                'Failed to retrieve indication for whether content type with id ' + id + ' has associated content nodes');
-        },
-
-        allowsCultureVariation: function () {
-          return umbRequestHelper.resourcePromise(
-            $http.get(
-              umbRequestHelper.getApiUrl(
-                "contentTypeApiBaseUrl",
-                "AllowsCultureVariation")),
-            'Failed to retrieve variant content types');
-        }
-    };
-}
-angular.module('umbraco.resources').factory('contentTypeResource', contentTypeResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js
deleted file mode 100644
index 23870d882f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.currentUserResource
-    * @description Used for read/updates for the currently logged in user
-    *
-    *
-    **/
-function currentUserResource($q, $http, umbRequestHelper, umbDataFormatter) {
-
-    //the factory object returned
-    return {
-
-        getPermissions: function (nodeIds) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "currentUserApiBaseUrl",
-                        "GetPermissions"),
-                    nodeIds),
-                'Failed to get permissions');
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.currentUserResource#hasPermission
-          * @methodOf umbraco.resources.currentUserResource
-          *
-          * @description
-          * Returns true/false given a permission char to check against a nodeID
-          * for the current user
-          *
-          * ##usage
-          * <pre>
-          * contentResource.hasPermission('p',1234)
-          *    .then(function() {
-          *        alert('You are allowed to publish this item');
-          *    });
-          * </pre>
-          *
-          * @param {String} permission char representing the permission to check
-          * @param {Int} id id of content item to delete
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        checkPermission: function (permission, id) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "currentUserApiBaseUrl",
-                        "HasPermission",
-                        [{ permissionToCheck: permission }, { nodeId: id }])),
-                'Failed to check permission for item ' + id);
-        },
-        getCurrentUserLinkedLogins: function () {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "currentUserApiBaseUrl",
-                        "GetCurrentUserLinkedLogins")),
-                'Server call failed for getting current users linked logins');
-        },
-        getUserData: function () {
-          return umbRequestHelper.resourcePromise(
-            $http.get(
-              umbRequestHelper.getApiUrl(
-                "currentUserApiBaseUrl",
-                "GetUserData")),
-            'Server call failed for getting current user data');
-        },
-
-        saveTourStatus: function (tourStatus) {
-
-            if (!tourStatus) {
-                return $q.reject({ errorMsg: 'tourStatus cannot be empty' });
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "currentUserApiBaseUrl",
-                        "PostSetUserTour"),
-                    tourStatus),
-                'Failed to save tour status');
-        },
-
-        getTours: function () {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "currentUserApiBaseUrl",
-                        "GetUserTours")), 'Failed to get tours');
-        },
-
-        performSetInvitedUserPassword: function (newPassword) {
-
-            if (!newPassword) {
-                return $q.reject({ errorMsg: 'newPassword cannot be empty' });
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "currentUserApiBaseUrl",
-                        "PostSetInvitedUserPassword"),
-                    Utilities.toJson(newPassword)),
-                'Failed to change password');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.currentUserResource#changePassword
-         * @methodOf umbraco.resources.currentUserResource
-         *
-         * @description
-         * Changes the current users password
-         *
-         * @returns {Promise} resourcePromise object containing the user array.
-         *
-         */
-        changePassword: function (changePasswordArgs) {
-
-            changePasswordArgs = umbDataFormatter.formatChangePasswordModel(changePasswordArgs);
-            if (!changePasswordArgs) {
-                throw 'No password data to change';
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "currentUserApiBaseUrl",
-                        "PostChangePassword"),
-                    changePasswordArgs),
-                'Failed to change password');
-        }
-
-    };
-}
-
-angular.module('umbraco.resources').factory('currentUserResource', currentUserResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/dashboard.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/dashboard.resource.js
deleted file mode 100644
index 1459822c96..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/dashboard.resource.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.dashboardResource
-    * @description Handles loading the dashboard manifest
-    **/
-function dashboardResource($q, $http, umbRequestHelper) {
-    //the factory object returned
-    return {
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.dashboardResource#getDashboard
-         * @methodOf umbraco.resources.dashboardResource
-         *
-         * @description
-         * Retrieves the dashboard configuration for a given section
-         *
-         * @param {string} section Alias of section to retrieve dashboard configuraton for
-         * @returns {Promise} resourcePromise object containing the user array.
-         *
-         */
-        getDashboard: function (section) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "dashboardApiBaseUrl",
-                        "GetDashboard",
-                        [{ section: section }])),
-                'Failed to get dashboard ' + section);
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.dashboardResource#getRemoteDashboardContent
-        * @methodOf umbraco.resources.dashboardResource
-        *
-        * @description
-        * Retrieves dashboard content from a remote source for a given section
-        *
-        * @param {string} section Alias of section to retrieve dashboard content for
-        * @returns {Promise} resourcePromise object containing the user array.
-        *
-        */
-        getRemoteDashboardContent: function (section, baseurl) {
-
-            //build request values with optional params
-            var values = [{ section: section }];
-            if (baseurl)
-            {
-                values.push({ baseurl: baseurl });
-            }
-
-            return  umbRequestHelper.resourcePromise(
-                    $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "dashboardApiBaseUrl",
-                        "GetRemoteDashboardContent",
-                        values)), "Failed to get dashboard content");
-        },
-
-        getRemoteDashboardCssUrl: function (section, baseurl) {
-
-            //build request values with optional params
-            var values = [{ section: section }];
-            if (baseurl) {
-                values.push({ baseurl: baseurl });
-            }
-
-            return umbRequestHelper.getApiUrl(
-                        "dashboardApiBaseUrl",
-                        "GetRemoteDashboardCss",
-                        values);
-        },
-
-        getRemoteXmlData: function (site, url) {
-            //build request values with optional params
-            var values = { site: site, url: url };
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                umbRequestHelper.getApiUrl(
-                    "dashboardApiBaseUrl",
-                    "GetRemoteXml",
-                    values)), "Failed to get remote xml");
-        }
-    };
-}
-
-angular.module('umbraco.resources').factory('dashboardResource', dashboardResource);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
deleted file mode 100644
index bc3ffb666a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
+++ /dev/null
@@ -1,472 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.dataTypeResource
-    * @description Loads in data for data types
-    **/
-function dataTypeResource($q, $http, umbDataFormatter, umbRequestHelper) {
-
-  return {
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.dataTypeResource#getPreValues
-         * @methodOf umbraco.resources.dataTypeResource
-         *
-         * @description
-         * Retrieves available prevalues for a given data type + editor
-         *
-         * ##usage
-         * <pre>
-         * dataTypeResource.getPreValues("Umbraco.MediaPicker", 1234)
-         *    .then(function(prevalues) {
-         *        alert('its gone!');
-         *    });
-         * </pre>
-         *
-         * @param {String} editorAlias string alias of editor type to retrieve prevalues configuration for
-         * @param {Int} id id of datatype to retrieve prevalues for
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getPreValues: function (editorAlias, dataTypeId) {
-
-      if (!dataTypeId) {
-        dataTypeId = -1;
-      }
-
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "GetPreValues",
-            [{ editorAlias: editorAlias }, { dataTypeId: dataTypeId }])),
-        "Failed to retrieve pre values for editor alias " + editorAlias);
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.dataTypeResource#getReferences
-     * @methodOf umbraco.resources.dataTypeResource
-     *
-     * @description
-     * Retrieves references of a given data type.
-     *
-     * @param {Int} id id of datatype to retrieve references for
-     * @returns {Promise} resourcePromise object.
-     *
-     */
-    getReferences: function (id) {
-
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "GetReferences",
-            { id: id })),
-        "Failed to retrieve usages for data type of id " + id);
-
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.dataTypeResource#getById
-     * @methodOf umbraco.resources.dataTypeResource
-     *
-     * @description
-     * Gets a data type item with a given id
-     *
-     * ##usage
-     * <pre>
-     * dataTypeResource.getById(1234)
-     *    .then(function(datatype) {
-     *        alert('its here!');
-     *    });
-     * </pre>
-     *
-     * @param {Int} id id of data type to retrieve
-     * @returns {Promise} resourcePromise object.
-     *
-     */
-    getById: function (id) {
-
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "GetById",
-            [{ id: id }])),
-        "Failed to retrieve data for data type id " + id);
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.dataTypeResource#getByName
-     * @methodOf umbraco.resources.dataTypeResource
-     *
-     * @description
-     * Gets a data type item with a given name
-     *
-     * ##usage
-     * <pre>
-     * dataTypeResource.getByName("upload")
-     *    .then(function(datatype) {
-     *        alert('its here!');
-     *    });
-     * </pre>
-     *
-     * @param {String} name Name of data type to retrieve
-     * @returns {Promise} resourcePromise object.
-     *
-     */
-    getByName: function (name) {
-
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "GetByName",
-            [{ name: name }])),
-        "Failed to retrieve data for data type with name: " + name);
-    },
-
-    getAll: function () {
-
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "GetAll")),
-        "Failed to retrieve data");
-    },
-
-    getGroupedDataTypes: function () {
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "GetGroupedDataTypes")),
-        "Failed to retrieve data");
-    },
-
-    getGroupedPropertyEditors: function () {
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "GetGroupedPropertyEditors")),
-        "Failed to retrieve data");
-    },
-
-    getAllPropertyEditors: function () {
-
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "GetAllPropertyEditors")),
-        "Failed to retrieve data");
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.contentResource#getScaffold
-     * @methodOf umbraco.resources.contentResource
-     *
-     * @description
-     * Returns a scaffold of an empty data type item
-     *
-     * The scaffold is used to build editors for data types that has not yet been populated with data.
-     *
-     * ##usage
-     * <pre>
-     * dataTypeResource.getScaffold()
-     *    .then(function(scaffold) {
-     *        var myType = scaffold;
-     *        myType.name = "My new data type";
-     *
-     *        dataTypeResource.save(myType, myType.preValues, true)
-     *            .then(function(type){
-     *                alert("Retrieved, updated and saved again");
-     *            });
-     *    });
-     * </pre>
-     *
-     * @returns {Promise} resourcePromise object containing the data type scaffold.
-     *
-     */
-    getScaffold: function (parentId) {
-
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "GetEmpty", { parentId: parentId })),
-        "Failed to retrieve data for empty datatype");
-    },
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.dataTypeResource#deleteById
-     * @methodOf umbraco.resources.dataTypeResource
-     *
-     * @description
-     * Deletes a data type with a given id
-     *
-     * ##usage
-     * <pre>
-     * dataTypeResource.deleteById(1234)
-     *    .then(function() {
-     *        alert('its gone!');
-     *    });
-     * </pre>
-     *
-     * @param {Int} id id of content item to delete
-     * @returns {Promise} resourcePromise object.
-     *
-     */
-    deleteById: function (id) {
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "DeleteById",
-            [{ id: id }])),
-        "Failed to delete item " + id);
-    },
-
-    deleteContainerById: function (id) {
-
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "DeleteContainer",
-            [{ id: id }])),
-        'Failed to delete content type contaier');
-    },
-
-
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.dataTypeResource#getCustomListView
-     * @methodOf umbraco.resources.dataTypeResource
-     *
-     * @description
-     * Returns a custom listview, given a content types alias
-     *
-     *
-     * ##usage
-     * <pre>
-     * dataTypeResource.getCustomListView("home")
-     *    .then(function(listview) {
-     *    });
-     * </pre>
-     *
-     * @returns {Promise} resourcePromise object containing the listview datatype.
-     *
-     */
-
-    getCustomListView: function (contentTypeAlias) {
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "GetCustomListView",
-            { contentTypeAlias: contentTypeAlias }
-          )),
-        "Failed to retrieve data for custom listview datatype");
-    },
-
-    /**
-    * @ngdoc method
-    * @name umbraco.resources.dataTypeResource#createCustomListView
-    * @methodOf umbraco.resources.dataTypeResource
-    *
-    * @description
-    * Creates and returns a custom listview, given a content types alias
-    *
-    * ##usage
-    * <pre>
-    * dataTypeResource.createCustomListView("home")
-    *    .then(function(listview) {
-    *    });
-    * </pre>
-    *
-    * @returns {Promise} resourcePromise object containing the listview datatype.
-    *
-    */
-    createCustomListView: function (contentTypeAlias) {
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "PostCreateCustomListView",
-            { contentTypeAlias: contentTypeAlias }
-          )),
-        "Failed to create a custom listview datatype");
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.dataTypeResource#save
-     * @methodOf umbraco.resources.dataTypeResource
-     *
-     * @description
-     * Saves or update a data type
-     *
-     * @param {Object} dataType data type object to create/update
-     * @param {Array} preValues collection of prevalues on the datatype
-     * @param {Bool} isNew set to true if type should be create instead of updated
-     * @returns {Promise} resourcePromise object.
-     *
-     */
-    save: function (dataType, preValues, isNew) {
-
-      var saveModel = umbDataFormatter.formatDataTypePostData(dataType, preValues, "save" + (isNew ? "New" : ""));
-
-      return umbRequestHelper.resourcePromise(
-        $http.post(umbRequestHelper.getApiUrl("dataTypeApiBaseUrl", "PostSave"), saveModel),
-        "Failed to save data for data type id " + dataType.id);
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.dataTypeResource#move
-     * @methodOf umbraco.resources.dataTypeResource
-     *
-     * @description
-     * Moves a node underneath a new parentId
-     *
-     * ##usage
-     * <pre>
-     * dataTypeResource.move({ parentId: 1244, id: 123 })
-     *    .then(function() {
-     *        alert("node was moved");
-     *    }, function(err){
-     *      alert("node didnt move:" + err.data.Message); 
-     *    });
-     * </pre> 
-     * @param {Object} args arguments object
-     * @param {Int} args.id the ID of the node to move
-     * @param {Int} args.parentId the ID of the parent node to move to
-     * @returns {Promise} resourcePromise object.
-     *
-     */
-    move: function (args) {
-      if (!args) {
-        throw "args cannot be null";
-      }
-      if (!args.parentId) {
-        throw "args.parentId cannot be null";
-      }
-      if (!args.id) {
-        throw "args.id cannot be null";
-      }
-
-      return umbRequestHelper.resourcePromise(
-        $http.post(umbRequestHelper.getApiUrl("dataTypeApiBaseUrl", "PostMove"),
-          {
-            parentId: args.parentId,
-            id: args.id
-          }, { responseType: 'text' }),
-        'Failed to move content');
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.dataTypeResource#copy
-     * @methodOf umbraco.resources.dataTypeResource
-     *
-     * @description
-     * Copies a node underneath a new parentId
-     *
-     * ##usage
-     * <pre>
-     * dataTypeResource.copy({ parentId: 1244, id: 123 })
-     *    .then(function() {
-     *        alert("node has been copied");
-     *    }, function(err){
-     *      alert("node didnt copy:" + err.data.Message);
-     *    });
-     * </pre>
-     * @param {Object} args arguments object
-     * @param {Int} args.idd the ID of the node to copy
-     * @param {Int} args.parentId the ID of the parent node to copy to
-     * @returns {Promise} resourcePromise object.
-     *
-     */
-    copy: function (args) {
-      if (!args) {
-        throw "args cannot be null";
-      }
-      if (!args.parentId) {
-        throw "args.parentId cannot be null";
-      }
-      if (!args.id) {
-        throw "args.id cannot be null";
-      }
-
-      return umbRequestHelper.resourcePromise(
-        $http.post(umbRequestHelper.getApiUrl("dataTypeApiBaseUrl", "PostCopy"),
-          {
-            parentId: args.parentId,
-            id: args.id
-          }, { responseType: 'text' }),
-        'Failed to copy content');
-    },
-
-    createContainer: function (parentId, name) {
-
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "dataTypeApiBaseUrl",
-            "PostCreateContainer",
-            { parentId: parentId, name: encodeURIComponent(name) })),
-        'Failed to create a folder under parent id ' + parentId);
-    },
-
-        renameContainer: function (id, name) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl(
-                        "dataTypeApiBaseUrl",
-                        "PostRenameContainer",
-                        { id: id, name: encodeURIComponent(name) })),
-                "Failed to rename the folder with id " + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.dataTypeResource#hasValues
-         * @methodOf umbraco.resources.dataTypeResource
-         *
-         * @description
-         * Checks for values stored for the data type
-         *
-         * ##usage
-         * <pre>
-         * dataTypeResource.hasValues(id)
-         *    .then(function(data) {
-         *        console.log(data.hasValues);
-         *    }, function(err) {
-         *      console.log("failed to check if data type has values", err);
-         *    });
-         * </pre> 
-         * 
-         * @param {Int} id id of data type
-         * @returns {Promise} resourcePromise object.
-         */
-        hasValues: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "dataTypeApiBaseUrl",
-                        "hasvalues",
-                        { id }
-                    )),
-                "Failed to check if the data type with " + id + " has values");
-        }
-    };
-}
-
-angular.module("umbraco.resources").factory("dataTypeResource", dataTypeResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/dictionary.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/dictionary.resource.js
deleted file mode 100644
index 0d7db8159b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/dictionary.resource.js
+++ /dev/null
@@ -1,278 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.dictionaryResource
-    * @description Loads in data for dictionary items
-**/
-function dictionaryResource($http, umbRequestHelper, umbDataFormatter, localizationService, notificationsService) {
-
-  /**
-         * @ngdoc method
-         * @name umbraco.resources.dictionaryResource#deleteById
-         * @methodOf umbraco.resources.dictionaryResource
-         *
-         * @description
-         * Deletes a dictionary item with a given id
-         *
-         * ##usage
-         * <pre>
-         * dictionaryResource.deleteById(1234)
-         *    .then(function() {
-         *        alert('its gone!');
-         *    });
-         * </pre>
-         *
-         * @param {Int} id id of dictionary item to delete
-         * @returns {Promise} resourcePromise object.
-         *
-  **/
-  function deleteById(id) {
-    return umbRequestHelper.resourcePromise(
-      $http.post(
-        umbRequestHelper.getApiUrl(
-          "dictionaryApiBaseUrl",
-          "DeleteById",
-          [{ id: id }])),
-      "Failed to delete item " + id);
-  }
-
-  /**
-         * @ngdoc method
-         * @name umbraco.resources.dictionaryResource#create
-         * @methodOf umbraco.resources.dictionaryResource
-         *
-         * @description
-         * Creates a dictionary item with the gieven key and parent id
-         *
-         * ##usage
-         * <pre>
-         * dictionaryResource.create(1234,"Item key")
-         *    .then(function() {
-         *        alert('its created!');
-         *    });
-         * </pre>
-         *
-         * @param {Int} parentid the parentid of the new dictionary item
-         * @param {String} key the key of the new dictionary item
-         * @returns {Promise} resourcePromise object.
-         *
-  **/
-  function create(parentid, key) {
-    return umbRequestHelper.resourcePromise(
-      $http.post(
-        umbRequestHelper.getApiUrl(
-          "dictionaryApiBaseUrl",
-          "Create",
-          { parentId: parentid, key : key })),
-      "Failed to create item ");
-  }
-
-    /**
-         * @ngdoc method
-         * @name umbraco.resources.dictionaryResource#deleteById
-         * @methodOf umbraco.resources.dictionaryResource
-         *
-         * @description
-         * Gets a dictionary item with a given id
-         *
-         * ##usage
-         * <pre>
-         * dictionaryResource.getById(1234)
-         *    .then(function() {
-         *        alert('Found it!');
-         *    });
-         * </pre>
-         *
-         * @param {Int} id id of dictionary item to get
-         * @returns {Promise} resourcePromise object.
-         *
-  **/
-    function getById(id) {
-        return umbRequestHelper.resourcePromise(
-            $http.get(
-                umbRequestHelper.getApiUrl(
-                    "dictionaryApiBaseUrl",
-                    "GetById",
-                    [{ id: id }])),
-            "Failed to get item " + id);
-    }
-
-  /**
-      * @ngdoc method
-      * @name umbraco.resources.dictionaryResource#move
-      * @methodOf umbraco.resources.dictionaryResource
-      *
-      * @description
-      * Moves a dictionary item underneath a new parentId
-      *
-      * ##usage
-      * <pre>
-      * dictionaryResource.move({ parentId: 1244, id: 123 })
-      *    .then(function() {
-      *        alert("node was moved");
-      *    }, function(err){
-      *      alert("node didnt move:" + err.data.Message);
-      *    });
-      * </pre>
-      * @param {Object} args arguments object
-      * @param {int} args.id the int of the dictionary item to move
-      * @param {int} args.parentId the int of the parent dictionary item to move to
-      * @returns {Promise} resourcePromise object.
-      *
-      */
-    function move (args) {
-        if (!args) {
-          throw "args cannot be null";
-        }
-        if (!args.parentId) {
-          throw "args.parentId cannot be null";
-        }
-        if (!args.id) {
-          throw "args.id cannot be null";
-        }
-
-        return umbRequestHelper.resourcePromise(
-          $http.post(umbRequestHelper.getApiUrl("dictionaryApiBaseUrl", "PostMove"),
-            {
-              parentId: args.parentId,
-              id: args.id
-            }, { responseType: 'text' }));
-    }
-
-    /**
-        * @ngdoc method
-        * @name umbraco.resources.dictionaryResource#save
-        * @methodOf umbraco.resources.dictionaryResource
-        *
-        * @description
-        * Updates a dictionary
-        *
-        * @param {Object} dictionary  dictionary object to update     
-        * @param {Bool} nameIsDirty set to true if the name has been changed
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-    function save(dictionary, nameIsDirty) {
-
-        var saveModel = umbDataFormatter.formatDictionaryPostData(dictionary, nameIsDirty);
-
-       return umbRequestHelper.resourcePromise(
-            $http.post(umbRequestHelper.getApiUrl("dictionaryApiBaseUrl", "PostSave"), saveModel),
-            "Failed to save data for dictionary id " + dictionary.id);
-    }
-
-    /**
-        * @ngdoc method
-        * @name umbraco.resources.dictionaryResource#export
-        * @methodOf umbraco.resources.dictionaryResource
-        *
-        * @description
-        * Export dictionary items of a given id.
-        *
-        * ##usage
-        * <pre>
-        * dictionaryResource.exportItem(1234){
-        *    .then(function() {
-        *       Do stuff..
-        *    });
-        * </pre>
-        *
-        * @param {Int} id the ID of the dictionary item so export
-        * @param {Bool?} includeChildren if children should also be exported
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-      function exportItem(id, includeChildren) {
-          if (!id) {
-              throw "id cannot be null";
-          }
-
-          var url = umbRequestHelper.getApiUrl("dictionaryApiBaseUrl", "ExportDictionary", { id: id, includeChildren: includeChildren });
-
-          return umbRequestHelper.downloadFile(url).then(function () {
-              localizationService.localize("speechBubbles_dictionaryItemExportedSuccess").then(function(value) {
-                  notificationsService.success(value);
-              });
-          }, function (data) {
-              localizationService.localize("speechBubbles_dictionaryItemExportedError").then(function(value) {
-                  notificationsService.error(value);
-              });
-          });
-      }
-
-    /**
-        * @ngdoc method
-        * @name umbraco.resources.dictionaryResource#import
-        * @methodOf umbraco.resources.dictionaryResource
-        *
-        * @description
-        * Import a dictionary item from a file
-        *
-        * ##usage
-        * <pre>
-        * dictionaryResource.importItem("path to file"){
-        *    .then(function() {
-        *       Do stuff..
-        *    });
-        * </pre>
-        *
-        * @param {String} file path of the file to import
-        * @param {Int?} parentId the int of the parent dictionary item to move incomming dictionary items to
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-    function importItem(file, parentId) {
-        if (!file) {
-            throw "file cannot be null";
-        }
-
-      return umbRequestHelper.resourcePromise(
-        $http.post(umbRequestHelper.getApiUrl("dictionaryApiBaseUrl", "ImportDictionary", { file: file, parentId: parentId })),
-            "Failed to import dictionary item " + file
-        );
-    }
-
-    /**
-         * @ngdoc method
-         * @name umbraco.resources.dictionaryResource#getList
-         * @methodOf umbraco.resources.dictionaryResource
-         *
-         * @description
-         * Gets a list of all dictionary items
-         *
-         * ##usage
-         * <pre>
-         * dictionaryResource.getList()
-         *    .then(function() {
-         *        alert('Found it!');
-         *    });
-         * </pre>
-         *         
-         * @returns {Promise} resourcePromise object.
-         *
-  **/
-    function getList() {
-        return umbRequestHelper.resourcePromise(
-            $http.get(
-                umbRequestHelper.getApiUrl(
-                    "dictionaryApiBaseUrl",
-                    "getList")),
-            "Failed to get list");
-    }
-    
-  var resource = {
-    deleteById: deleteById,
-    create: create,
-    getById: getById,
-    save: save,
-    move: move,
-    exportItem: exportItem,
-    importItem: importItem,
-    getList : getList
-  };
-
-  return resource;
-
-  
-}
-
-angular.module("umbraco.resources").factory("dictionaryResource", dictionaryResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/elementtype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/elementtype.resource.js
deleted file mode 100644
index b097a65447..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/elementtype.resource.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.elementTypeResource
-    * @description Loads in data for element types
-    **/
-function elementTypeResource($q, $http, umbRequestHelper) {
-
-    return {
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.elementTypeResource#getAll
-        * @methodOf umbraco.resources.elementTypeResource
-        *
-        * @description
-        * Gets a list of all element types
-        *
-        * ##usage
-        * <pre>
-        * elementTypeResource.getAll()
-        *    .then(function() {
-        *        alert('Found it!');
-        *    });
-        * </pre>
-        *
-        * @returns {Promise} resourcePromise object.
-        *
-        **/
-        getAll: function () {
-            
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "elementTypeApiBaseUrl",
-                        "GetAll")),
-                "Failed to retrieve element types");
-            
-        }
-
-    };
-}
-
-angular.module("umbraco.resources").factory("elementTypeResource", elementTypeResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/emailmarketing.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/emailmarketing.resource.js
deleted file mode 100644
index 4ac56ad13b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/emailmarketing.resource.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.emailMarketingResource
- * @description Used to add a backoffice user to Umbraco's email marketing system, if user opts in
- *
- *
- **/
-function emailMarketingResource($http, umbRequestHelper) {
-
-    // LOCAL
-    // http://localhost:7071/api/EmailProxy
-
-    // LIVE
-    // https://emailcollector.umbraco.io/api/EmailProxy
-
-    const emailApiUrl = 'https://emailcollector.umbraco.io/api/EmailProxy';
-
-    //the factory object returned
-    return {
-
-        postAddUserToEmailMarketing: (user) => {
-            return umbRequestHelper.resourcePromise(
-                $http.post(emailApiUrl,
-                {
-                    name: user.name,
-                    email: user.email,
-                    usergroup: user.userGroups // [ "admin", "sensitiveData" ]
-                }),
-                'Failed to add user to email marketing list');
-        }
-    };
-}
-
-angular.module('umbraco.resources').factory('emailMarketingResource', emailMarketingResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
deleted file mode 100644
index fdcc494632..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ /dev/null
@@ -1,726 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.entityResource
-    * @description Loads in basic data for all entities
-    *
-    * ##What is an entity?
-    * An entity is a basic **read-only** representation of an Umbraco node. It contains only the most
-    * basic properties used to display the item in trees, lists and navigation.
-    *
-    * ##What is the difference between entity and content/media/etc...?
-    * the entity only contains the basic node data, name, id and guid, whereas content
-    * nodes fetched through the content service also contains additional all of the content property data, etc..
-    * This is the same principal for all entity types. Any user that is logged in to the back office will have access
-    * to view the basic entity information for all entities since the basic entity information does not contain sensitive information.
-    *
-    * ##Entity object types?
-    * You need to specify the type of object you want returned.
-    *
-    * The core object types are:
-    *
-    * - Document
-    * - Media
-    * - Member
-    * - Template
-    * - DocumentType
-    * - MediaType
-    * - MemberType
-    * - Macro
-    * - User
-    * - Language
-    * - Domain
-    * - DataType
-    **/
-function entityResource($q, $http, umbRequestHelper) {
-
-    //the factory object returned
-    return {
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getSafeAlias
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Converts the given string to a safe alias
-         *
-         * ##usage
-         * <pre>
-         * entityResource.getSafeAlias(value, camelCase)
-         *    .then(function(safeAlias) {
-         *        Do stuff...
-         *    });
-         * </pre>
-         *
-         * @param {string} value the value to convert to a safe alias
-         * @param {boolean} camelCase if camel casing should be used
-         * @returns {Promise} resourcePromise object containing the safe alias.
-         *
-         */
-        getSafeAlias: function (value, camelCase) {
-
-            if (!value) {
-                return "";
-            }
-            value = value.replace("#", "");
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                        "GetSafeAlias", { value: encodeURIComponent(value), camelCase: camelCase })),
-               'Failed to retrieve content type scaffold');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getPath
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Returns a path, given a node ID and type
-         *
-         * ##usage
-         * <pre>
-         * entityResource.getPath(id, type)
-         *    .then(function(pathArray) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {Int} id Id of node to return the public url to
-         * @param {string} type Object type name
-         * @returns {Promise} resourcePromise object containing the url.
-         *
-         */
-        getPath: function (id, type) {
-
-            if (id === -1 || id === "-1") {
-                return "-1";
-            }
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetPath",
-                       [{ id: id }, {type: type }])),
-               'Failed to retrieve path for id:' + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getUrl
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Returns a url, given a node ID and type
-         *
-         * ##usage
-         * <pre>
-         * entityResource.getUrl(id, type)
-         *    .then(function(url) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {Int} id Id of node to return the public url to
-         * @param {string} type Object type name
-         * @param {string} culture Culture
-         * @returns {Promise} resourcePromise object containing the url.
-         *
-         */
-        getUrl: function (id, type, culture) {
-
-            if (id === -1 || id === "-1") {
-                return "";
-            }
-
-            if (!culture) {
-                culture = "";
-            }
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetUrl",
-                       [{ id: id }, {type: type }, {culture: culture }])),
-               'Failed to retrieve url for id:' + id);
-        },
-
-        getUrlsByIds: function(ids, type, culture) {
-          var query = `type=${type}&culture=${culture || ""}`;
-
-          return umbRequestHelper.resourcePromise(
-             $http.post(
-                 umbRequestHelper.getApiUrl(
-                     "entityApiBaseUrl",
-                     "GetUrlsByIds",
-                     query),
-                 {
-                     ids: ids
-                 }),
-             'Failed to retrieve url map for ids ' + ids);
-        },
-
-        /**
-         * @deprecated use getUrlsByIds instead.
-         */
-        getUrlsByUdis: function(udis, culture) {
-          var query = "culture=" + (culture || "");
-
-          return umbRequestHelper.resourcePromise(
-             $http.post(
-                 umbRequestHelper.getApiUrl(
-                     "entityApiBaseUrl",
-                     "GetUrlsByIds",
-                     query),
-                 {
-                     ids: udis
-                 }),
-             'Failed to retrieve url map for ids ' + udis);
-        },
-
-        getUrlByUdi: function (udi, culture) {
-
-            if (!udi) {
-                return "";
-            }
-
-            if (!culture) {
-                culture = "";
-            }
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetUrl",
-                       [{ id: udi }, {culture: culture }])),
-               'Failed to retrieve url for UDI:' + udi);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getById
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets an entity with a given id
-         *
-         * ##usage
-         * <pre>
-         * //get media by id
-         * entityResource.getById(0, "Media")
-         *    .then(function(ent) {
-         *        var myDoc = ent;
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {Int} id id of entity to return
-         * @param {string} type Object type name
-         * @returns {Promise} resourcePromise object containing the entity.
-         *
-         */
-        getById: function (id, type) {
-
-            if (id === -1 || id === "-1") {
-                return null;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "entityApiBaseUrl",
-                        "GetById",
-                        [{ id: id }, { type: type }])),
-                'Failed to retrieve entity data for id ' + id);
-        },
-
-
-        getUrlAndAnchors: function (id, culture) {
-
-            if (id === -1 || id === "-1") {
-                return null;
-            }
-
-            if (!culture) {
-                culture = "";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "entityApiBaseUrl",
-                        "GetUrlAndAnchors",
-                        [{ id: id }, {culture: culture }])),
-                'Failed to retrieve url and anchors data for id ' + id);
-        },
-
-        getAnchors: function (rteContent) {
-
-            if (!rteContent || rteContent.length === 0) {
-                return $q.when([]);
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "entityApiBaseUrl",
-                        'GetAnchors'),
-                    {
-                        rteContent: rteContent
-                    }),
-                'Failed to anchors data for rte content ' + rteContent);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getByIds
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets an array of entities, given a collection of ids
-         *
-         * ##usage
-         * <pre>
-         * //Get templates for ids
-         * entityResource.getByIds( [1234,2526,28262], "Template")
-         *    .then(function(templateArray) {
-         *        var myDoc = contentArray;
-         *        alert('they are here!');
-         *    });
-         * </pre>
-         *
-         * @param {Array} ids ids of entities to return as an array
-         * @param {string} type type name
-         * @returns {Promise} resourcePromise object containing the entity array.
-         *
-         */
-        getByIds: function (ids, type) {
-
-          if (!ids || ids.length === 0) {
-            return $q.when([]);
-          }
-
-            var query = "type=" + type;
-
-            return umbRequestHelper.resourcePromise(
-               $http.post(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetByIds",
-                       query),
-                   {
-                       ids: ids
-                   }),
-               'Failed to retrieve entity data for ids ' + ids);
-        },
-
-        /**
-         * @deprecated use getByXPath instead.
-         */
-        getByQuery: function (query, nodeContextId, type) {
-            return umbRequestHelper.resourcePromise(
-            $http.get(
-                umbRequestHelper.getApiUrl(
-                    "entityApiBaseUrl",
-                    "GetByQuery",
-                    [{ query: query }, { nodeContextId: nodeContextId }, { type: type }])),
-            'Failed to retrieve entity data for query ' + query);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getByXPath
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets an entity from a given xpath
-         *
-         * ##usage
-         * <pre>
-         * //get content by xpath
-         * entityResource.getByXPath("$current", -1, -1, "Document")
-         *    .then(function(ent) {
-         *        var myDoc = ent;
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {string} query xpath to use in query
-         * @param {Int} nodeContextId id id to start from
-         * @param {Int} parentId id id of the parent to the starting point
-         * @param {string} type Object type name
-         * @returns {Promise} resourcePromise object containing the entity.
-         *
-         */
-        getByXPath: function (query, nodeContextId, parentId, type) {
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetByXPath",
-                       [{ query: query }, { nodeContextId: nodeContextId }, { parentId: parentId }, { type: type }])),
-               'Failed to retrieve entity data for query ' + query);
-        },
-
-      getDynamicRoot: function (query, currentId, parentId, culture, segment) {
-        return umbRequestHelper.resourcePromise(
-          $http.post(
-            umbRequestHelper.getApiUrl(
-              "entityApiBaseUrl",
-              "getDynamicRoot"),
-            {
-              query: JSON.parse(query),
-              parentId: parentId,
-              currentId: currentId,
-              currentCulture: culture,
-              currentSegment: segment
-            }),
-          'Failed to retrieve entity data for query ' + query);
-      },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getAll
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets an entity with a given id
-         *
-         * ##usage
-         * <pre>
-         *
-         * //Only return media
-         * entityResource.getAll("Media")
-         *    .then(function(ent) {
-         *        var myDoc = ent;
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {string} type Object type name
-         * @param {string} postFilter optional filter expression which will execute a dynamic where clause on the server
-         * @returns {Promise} resourcePromise object containing the entity.
-         *
-         */
-        getAll: function (type, postFilter) {
-            //need to build the query string manually
-            var query = "type=" + type + "&postFilter=" + (postFilter ? encodeURIComponent(postFilter) : "");
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetAll",
-                       query)),
-               'Failed to retrieve entity data for type ' + type);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getAncestors
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets ancestor entities for a given item
-         *
-         *
-         * @param {string} type Object type name
-         * @param {string} culture Culture
-         * @returns {Promise} resourcePromise object containing the entity.
-         *
-         */
-        getAncestors: function (id, type, culture, options) {
-            if (!culture) {
-                culture = "";
-            }
-
-            var args = [
-                { id: id },
-                { type: type },
-                { culture: culture}
-            ];
-            if (options && options.dataTypeKey) {
-                args.push({ dataTypeKey: options.dataTypeKey });
-            }
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetAncestors",
-                       args)),
-                       'Failed to retrieve ancestor data for id ' + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#getChildren
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets children entities for a given item
-         *
-         * @param {Int} parentid id of content item to return children of
-         * @param {string} type Object type name
-         * @returns {Promise} resourcePromise object containing the entity.
-         *
-         */
-        getChildren: function (id, type, options) {
-
-            var args = [{ id: id }, { type: type }];
-            if (options && options.dataTypeKey) {
-                args.push({ dataTypeKey: options.dataTypeKey });
-            }
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "entityApiBaseUrl",
-                       "GetChildren",
-                       args)),
-               'Failed to retrieve child data for id ' + id);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.entityResource#getPagedChildren
-          * @methodOf umbraco.resources.entityResource
-          *
-          * @description
-          * Gets paged children of a content item with a given id
-          *
-          * ##usage
-          * <pre>
-          * entityResource.getPagedChildren(1234, "Content", {pageSize: 10, pageNumber: 2})
-          *    .then(function(contentArray) {
-          *        var children = contentArray;
-          *        alert('they are here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} parentid id of content item to return children of
-          * @param {string} type Object type name
-          * @param {Object} options optional options object
-          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 1
-          * @param {Int} options.pageNumber if paging data, current page index, default = 100
-          * @param {String} options.filter if provided, query will only return those with names matching the filter
-          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
-          * @param {String} options.orderBy property to order items by, default: `SortOrder`
-          * @returns {Promise} resourcePromise object containing an array of content items.
-          *
-          */
-        getPagedChildren: function (parentId, type, options) {
-
-            var defaults = {
-                pageSize: 1,
-                pageNumber: 100,
-                filter: '',
-                orderDirection: "Ascending",
-                orderBy: "SortOrder",
-                dataTypeKey: null
-            };
-            if (options === undefined) {
-                options = {};
-            }
-            //overwrite the defaults if there are any specified
-            Utilities.extend(defaults, options);
-            //now copy back to the options we will use
-            options = defaults;
-            //change asc/desct
-            if (options.orderDirection === "asc") {
-                options.orderDirection = "Ascending";
-            }
-            else if (options.orderDirection === "desc") {
-                options.orderDirection = "Descending";
-            }
-
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "entityApiBaseUrl",
-                        "GetPagedChildren",
-                        {
-                            id: parentId,
-                            type: type,
-                            pageNumber: options.pageNumber,
-                            pageSize: options.pageSize,
-                            orderBy: options.orderBy,
-                            orderDirection: options.orderDirection,
-                            filter: encodeURIComponent(options.filter),
-                            dataTypeKey: options.dataTypeKey
-                        }
-                    )),
-                'Failed to retrieve child data for id ' + parentId);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.entityResource#getPagedDescendants
-          * @methodOf umbraco.resources.entityResource
-          *
-          * @description
-          * Gets paged descendants of a content item with a given id
-          *
-          * ##usage
-          * <pre>
-          * entityResource.getPagedDescendants(1234, "Document", {pageSize: 10, pageNumber: 2})
-          *    .then(function(contentArray) {
-          *        var children = contentArray;
-          *        alert('they are here!');
-          *    });
-          * </pre>
-          *
-          * @param {Int} parentid id of content item to return descendants of
-          * @param {string} type Object type name
-          * @param {Object} options optional options object
-          * @param {Int} options.pageSize if paging data, number of nodes per page, default = 100
-          * @param {Int} options.pageNumber if paging data, current page index, default = 1
-          * @param {String} options.filter if provided, query will only return those with names matching the filter
-          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
-          * @param {String} options.orderBy property to order items by, default: `SortOrder`
-          * @returns {Promise} resourcePromise object containing an array of content items.
-          *
-          */
-        getPagedDescendants: function (parentId, type, options) {
-
-            var defaults = {
-                pageSize: 100,
-                pageNumber: 1,
-                filter: '',
-                orderDirection: "Ascending",
-                orderBy: "SortOrder",
-                dataTypeKey: null
-            };
-            if (options === undefined) {
-                options = {};
-            }
-            //overwrite the defaults if there are any specified
-            Utilities.extend(defaults, options);
-            //now copy back to the options we will use
-            options = defaults;
-            //change asc/desct
-            if (options.orderDirection === "asc") {
-                options.orderDirection = "Ascending";
-            }
-            else if (options.orderDirection === "desc") {
-                options.orderDirection = "Descending";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "entityApiBaseUrl",
-                        "GetPagedDescendants",
-                        {
-                            id: parentId,
-                            type: type,
-                            pageNumber: options.pageNumber,
-                            pageSize: options.pageSize,
-                            orderBy: options.orderBy,
-                            orderDirection: options.orderDirection,
-                            filter: encodeURIComponent(options.filter),
-                            dataTypeKey: options.dataTypeKey
-                        }
-                    )),
-                'Failed to retrieve child data for id ' + parentId);
-        },
-
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#search
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets an array of entities, given a lucene query and a type
-         *
-         * ##usage
-         * <pre>
-         * entityResource.search("news", "Media")
-         *    .then(function(mediaArray) {
-         *        var myDoc = mediaArray;
-         *        alert('they are here!');
-         *    });
-         * </pre>
-         *
-         * @param {String} Query search query
-         * @param {String} Type type of conten to search
-         * @returns {Promise} resourcePromise object containing the entity array.
-         *
-         */
-        search: function (query, type, searchFrom, canceler, dataTypeKey) {
-
-            var args = [{ query: query }, { type: type }];
-            if (searchFrom) {
-                args.push({ searchFrom: searchFrom });
-            }
-
-            if (dataTypeKey) {
-                args.push({ dataTypeKey: dataTypeKey });
-            }
-
-            var httpConfig = {};
-            if (canceler) {
-                httpConfig["timeout"] = canceler;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "entityApiBaseUrl",
-                        "Search",
-                        args),
-                    httpConfig),
-                'Failed to retrieve entity data for query ' + query);
-        },
-
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.entityResource#searchAll
-         * @methodOf umbraco.resources.entityResource
-         *
-         * @description
-         * Gets an array of entities from all available search indexes, given a lucene query
-         *
-         * ##usage
-         * <pre>
-         * entityResource.searchAll("bob")
-         *    .then(function(array) {
-         *        var myDoc = array;
-         *        alert('they are here!');
-         *    });
-         * </pre>
-         *
-         * @param {String} Query search query
-         * @returns {Promise} resourcePromise object containing the entity array.
-         *
-         */
-        searchAll: function (query, canceler) {
-
-            var httpConfig = {};
-            if (canceler) {
-                httpConfig["timeout"] = canceler;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "entityApiBaseUrl",
-                        "SearchAll",
-                        [{ query: query }]),
-                    httpConfig),
-                'Failed to retrieve entity data for query ' + query);
-        }
-
-
-
-    };
-}
-
-angular.module('umbraco.resources').factory('entityResource', entityResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/healthcheck.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/healthcheck.resource.js
deleted file mode 100644
index 17d2651a52..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/healthcheck.resource.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.healthCheckResource
- * @function
- *
- * @description
- * Used by the health check dashboard to get checks and send requests to fix checks.
- */
-(function () {
-    'use strict';
-
-    function healthCheckResource($http, umbRequestHelper) {
-
-        /**
-         * @ngdoc function
-         * @name umbraco.resources.healthCheckService#getAllChecks
-         * @methodOf umbraco.resources.healthCheckResource
-         * @function
-         *
-         * @description
-         * Called to get all available health checks
-         */
-        function getAllChecks() {
-            return umbRequestHelper.resourcePromise(
-                $http.get(Umbraco.Sys.ServerVariables.umbracoUrls.healthCheckBaseUrl + "GetAllHealthChecks"),
-                "Failed to retrieve health checks"
-            );
-        }
-
-        /**
-         * @ngdoc function
-         * @name umbraco.resources.healthCheckService#getStatus
-         * @methodOf umbraco.resources.healthCheckResource
-         * @function
-         *
-         * @description
-         * Called to get execute a health check and return the check status
-         */
-        function getStatus(id) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(Umbraco.Sys.ServerVariables.umbracoUrls.healthCheckBaseUrl + 'GetStatus?id=' + id),
-                'Failed to retrieve status for health check with ID ' + id
-            );
-        }
-
-        /**
-         * @ngdoc function
-         * @name umbraco.resources.healthCheckService#executeAction
-         * @methodOf umbraco.resources.healthCheckResource
-         * @function
-         *
-         * @description
-         * Called to execute a health check action (rectifying an issue)
-         */
-        function executeAction(action) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(Umbraco.Sys.ServerVariables.umbracoUrls.healthCheckBaseUrl + 'ExecuteAction', action),
-                'Failed to execute action with alias ' + action.alias + ' and healthCheckId + ' + action.healthCheckId
-            );
-        }
-
-        var resource = {
-            getAllChecks: getAllChecks,
-            getStatus: getStatus,
-            executeAction: executeAction
-        };
-
-        return resource;
-
-    }
-
-
-    angular.module('umbraco.resources').factory('healthCheckResource', healthCheckResource);
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/imageurlgenerator.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/imageurlgenerator.resource.js
deleted file mode 100644
index dd65f89526..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/imageurlgenerator.resource.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.imageUrlGeneratorResource
- * @function
- *
- * @description
- * Used by the various controllers to get an image URL formatted correctly for the current image URL generator
- */
-(function () {
-    'use strict';
-
-    function imageUrlGeneratorResource($http, umbRequestHelper) {
-
-        function getCropUrl(mediaPath, width, height, imageCropMode) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "imageUrlGeneratorApiBaseUrl",
-                        "GetCropUrl",
-                        { mediaPath, width, height, imageCropMode })),
-                'Failed to get crop URL');
-        }
-
-
-        var resource = {
-            getCropUrl: getCropUrl
-        };
-
-        return resource;
-
-    }
-
-    angular.module('umbraco.resources').factory('imageUrlGeneratorResource', imageUrlGeneratorResource);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/javascriptlibrary.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/javascriptlibrary.resource.js
deleted file mode 100644
index 15460a3356..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/javascriptlibrary.resource.js
+++ /dev/null
@@ -1,42 +0,0 @@
-(function () {
-    "use strict";
-
-    /**
-      * @ngdoc service
-      * @name umbraco.resources.javascriptLibraryResource
-      * @description Handles retrieving data for javascript libraries on the server
-      **/
-    function javascriptLibraryResource($q, $http, umbRequestHelper) {
-
-        var existingLocales = null;
-
-        function getSupportedLocales() {
-            var deferred = $q.defer();
-
-            if (existingLocales === null) {
-                umbRequestHelper.resourcePromise(
-                    $http.get(
-                        umbRequestHelper.getApiUrl(
-                            "backOfficeAssetsApiBaseUrl",
-                            "GetSupportedLocales")),
-                    "Failed to get cultures").then(function(locales) {
-                    existingLocales = locales;
-                    deferred.resolve(existingLocales);
-                });
-            } else {
-                deferred.resolve(existingLocales);
-            }
-
-            return deferred.promise;
-        }
-        
-        var service = {
-            getSupportedLocales: getSupportedLocales
-        };
-
-        return service;
-    }
-
-    angular.module("umbraco.resources").factory("javascriptLibraryResource", javascriptLibraryResource);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/language.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/language.resource.js
deleted file mode 100644
index e193d6a2bb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/language.resource.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
-  * @ngdoc service
-  * @name umbraco.resources.languageResource
-  * @description Handles retrieving and updating language data
-  **/
-function languageResource($http, umbRequestHelper) {
-    return {
-
-        getCultures: function() {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "languageApiBaseUrl",
-                        "GetAllCultures")),
-                "Failed to get cultures");
-        },
-
-        getAll: function () {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "languageApiBaseUrl",
-                        "GetAllLanguages")),
-                "Failed to get languages");
-        },
-
-        getById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "languageApiBaseUrl",
-                        "GetLanguage",
-                        { id: id })),
-                "Failed to get language with id " + id);
-        },
-
-        save: function (lang) {
-            if (!lang)
-                throw "'lang' parameter cannot be null";
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "languageApiBaseUrl",
-                        "SaveLanguage"), lang),
-                "Failed to save language " + lang.id);
-        },
-
-        deleteById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "languageApiBaseUrl",
-                        "DeleteLanguage",
-                        { id: id })),
-                "Failed to delete item " + id);
-        }
-    };
-}
-
-angular.module('umbraco.resources').factory('languageResource', languageResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js
deleted file mode 100644
index 4e98b1d8cc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.logResource
-    * @description Retrieves log history from umbraco
-    * 
-    *
-    **/
-function logResource($q, $http, umbRequestHelper) {
-
-    function isValidDate(input) {
-        if (input) {
-            if (Object.prototype.toString.call(input) === "[object Date]" && !isNaN(input.getTime())) {
-                return true;
-            }
-        }
-
-        return false;
-    };
-
-    function dateToValidIsoString(input) {
-        if (isValidDate(input)) {
-            return input.toISOString();
-        }
-
-        return '';
-    };
-
-    //the factory object returned
-    return {
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.logResource#getPagedEntityLog
-        * @methodOf umbraco.resources.logResource
-        *
-        * @description
-        * Gets a paginated log history for a entity
-        *
-        * ##usage
-        * <pre>
-        * var options = {
-        *      id : 1234
-        *      pageSize : 10,
-        *      pageNumber : 1,
-        *      orderDirection : "Descending",
-        *      sinceDate : new Date(2018,0,1)
-        * };
-        * logResource.getPagedEntityLog(options)
-        *    .then(function(log) {
-        *        alert('its here!');
-        *    });
-        * </pre> 
-        * 
-        * @param {Object} options options object
-        * @param {Int} options.id the id of the entity
-        * @param {Int} options.pageSize if paging data, number of nodes per page, default = 10
-        * @param {Int} options.pageNumber if paging data, current page index, default = 1
-        * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Descending`
-        * @param {Date} options.sinceDate if provided this will only get log entries going back to this date
-        * @returns {Promise} resourcePromise object containing the log.
-        *
-        */
-        getPagedEntityLog: function(options) {
-
-            var defaults = {
-                pageSize: 10,
-                pageNumber: 1,
-                orderDirection: "Descending"
-            };
-            if (options === undefined) {
-                options = {};
-            }
-            //overwrite the defaults if there are any specified
-            Utilities.extend(defaults, options);
-            //now copy back to the options we will use
-            options = defaults;
-
-            if (options.hasOwnProperty('sinceDate')) {
-                options.sinceDate = dateToValidIsoString(options.sinceDate);
-            }
-
-            //change asc/desct
-            if (options.orderDirection === "asc") {
-                options.orderDirection = "Ascending";
-            } else if (options.orderDirection === "desc") {
-                options.orderDirection = "Descending";
-            }
-
-            if (options.id === undefined || options.id === null) {
-                throw "options.id is required";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "logApiBaseUrl",
-                        "GetPagedEntityLog",
-                        options)),
-                'Failed to retrieve log data for id');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.logResource#getPagedUserLog
-         * @methodOf umbraco.resources.logResource
-         *
-         * @description
-         * Gets a paginated log history for the current user
-         *
-         * ##usage
-         * <pre>
-         * var options = {
-         *      pageSize : 10,
-         *      pageNumber : 1,
-         *      orderDirection : "Descending",
-         *      sinceDate : new Date(2018,0,1)
-         * };
-         * logResource.getPagedUserLog(options)
-         *    .then(function(log) {
-         *        alert('its here!');
-         *    });
-         * </pre> 
-         * 
-         * @param {Object} options options object
-         * @param {Int} options.pageSize if paging data, number of nodes per page, default = 10
-         * @param {Int} options.pageNumber if paging data, current page index, default = 1
-         * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Descending`
-         * @param {Date} options.sinceDate if provided this will only get log entries going back to this date
-         * @returns {Promise} resourcePromise object containing the log.
-         *
-         */
-        getPagedUserLog: function(options) {
-
-            var defaults = {
-                pageSize: 10,
-                pageNumber: 1,
-                orderDirection: "Descending"
-            };
-            if (options === undefined) {
-                options = {};
-            }
-            //overwrite the defaults if there are any specified
-            Utilities.extend(defaults, options);
-            //now copy back to the options we will use
-            options = defaults;
-
-            if (options.hasOwnProperty('sinceDate')) {
-                options.sinceDate = dateToValidIsoString(options.sinceDate);
-            }
-
-            //change asc/desct
-            if (options.orderDirection === "asc") {
-                options.orderDirection = "Ascending";
-            } else if (options.orderDirection === "desc") {
-                options.orderDirection = "Descending";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "logApiBaseUrl",
-                        "GetPagedCurrentUserLog",
-                        options)),
-                'Failed to retrieve log data for id');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.logResource#getLog
-         * @methodOf umbraco.resources.logResource
-         *
-         * @description
-         * Gets the log history for a given type of log entry
-         *
-         * ##usage
-         * <pre>
-         * logResource.getLog("save", new Date())
-         *    .then(function(log) {
-         *        alert('its here!');
-         *    });
-         * </pre> 
-         * 
-         * @param {String} type logtype to query for
-         * @param {DateTime} since query the log back to this date, by defalt 7 days ago
-         * @returns {Promise} resourcePromise object containing the log.
-         *
-         */
-        getLog: function(type, since) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "logApiBaseUrl",
-                        "GetLog",
-                        [{ logtype: type }, { sinceDate: dateToValidIsoString(since) }])),
-                'Failed to retrieve log data of type ' + type + ' since ' + since);
-        }      
-};
-}
-
-angular.module('umbraco.resources').factory('logResource', logResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/logviewer.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/logviewer.resource.js
deleted file mode 100644
index b71c272d35..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/logviewer.resource.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.logViewerResource
- * @description Retrieves Umbraco log items (by default from JSON files on disk)
- *
- *
- **/
-function logViewerResource($q, $http, umbRequestHelper) {
-
-    /**
-     * verb => 'get', 'post',
-     * method => API method to call
-     * params => additional data to send
-     * error => error message when things go wrong...
-     */
-    const request = (verb, method, params, error) =>
-        umbRequestHelper.resourcePromise(
-            (verb === 'GET' ?
-            $http.get(umbRequestHelper.getApiUrl("logViewerApiBaseUrl", method) + (params ? params : '')) : 
-            $http.post(umbRequestHelper.getApiUrl("logViewerApiBaseUrl", method), params)),
-        error); 
-
-    //the factory object returned
-    return {
-
-        getNumberOfErrors: (startDate, endDate) => 
-            request('GET', 'GetNumberOfErrors', '?startDate=' + startDate + '&endDate=' + endDate, 'Failed to retrieve number of errors in logs'),    
-      
-        getLogLevels: () =>
-            request('GET', 'GetLogLevels', null, 'Failed to retrieve log levels'),
-        
-        getLogLevel: () =>
-            request('GET', 'GetLogLevel', null, 'Failed to retrieve log level'),        
-
-        getLogLevelCounts: (startDate, endDate) =>
-            request('GET', 'GetLogLevelCounts', '?startDate=' + startDate + '&endDate=' + endDate, 'Failed to retrieve log level counts'),  
-
-        getMessageTemplates: (startDate, endDate) => 
-            request('GET', 'GetMessageTemplates', '?startDate=' + startDate + '&endDate=' + endDate, 'Failed to retrieve log templates'), 
-
-        getSavedSearches: () =>
-            request('GET', 'GetSavedSearches', null, 'Failed to retrieve saved searches'),      
-
-        postSavedSearch: (name, query) =>
-            request('POST', 'PostSavedSearch', { 'name': name, 'query': query }, 'Failed to add new saved search'),
-
-        deleteSavedSearch: (name, query) =>
-            request('POST', 'DeleteSavedSearch', { 'name': name, 'query': query }, 'Failed to delete saved search'),
-
-        getLogs: options => {
-
-            var defaults = {
-                pageSize: 100,
-                pageNumber: 1,
-                orderDirection: "Descending",
-                filterExpression: ''
-            };
-
-            if (options === undefined) {
-                options = {};
-            }
-
-            //overwrite the defaults if there are any specified
-            Utilities.extend(defaults, options);
-
-            //now copy back to the options we will use
-            options = defaults;
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "logViewerApiBaseUrl",
-                        "GetLogs",
-                        options)),
-                'Failed to retrieve common log messages');
-        },
-
-        canViewLogs: (startDate, endDate) => 
-            request('GET', 'GetCanViewLogs', '?startDate=' + startDate + '&endDate=' + endDate, 'Failed to retrieve state if logs can be viewed')    
-    };
-}
-
-angular.module('umbraco.resources').factory('logViewerResource', logViewerResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
deleted file mode 100644
index c9ce7866e5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.macroResource
-    * @description Deals with data for macros
-    *
-    **/
-function macroResource($q, $http, umbRequestHelper) {
-
-    //the factory object returned
-    return {
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.macroResource#getMacroParameters
-         * @methodOf umbraco.resources.macroResource
-         *
-         * @description
-         * Gets the editable macro parameters for the specified macro alias
-         *
-         * @param {int} macroId The macro id to get parameters for
-         *
-         */
-        getMacroParameters: function(macroId) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "macroRenderingApiBaseUrl",
-                        "GetMacroParameters",
-                        [{ macroId: macroId }])),
-                'Failed to retrieve macro parameters for macro with id  ' + macroId);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.macroResource#getMacroResult
-         * @methodOf umbraco.resources.macroResource
-         *
-         * @description
-         * Gets the result of a macro as html to display in the rich text editor or in the Grid
-         *
-         * @param {int} macroId The macro id to get parameters for
-         * @param {int} pageId The current page id
-         * @param {Array} macroParamDictionary A dictionary of macro parameters
-         *
-         */
-        getMacroResultAsHtmlForEditor: function(macroAlias, pageId, macroParamDictionary) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "macroRenderingApiBaseUrl",
-                        "GetMacroResultAsHtmlForEditor"),
-                    {
-                        macroAlias: macroAlias,
-                        pageId: pageId,
-                        macroParams: macroParamDictionary
-                    }),
-                'Failed to retrieve macro result for macro with alias  ' + macroAlias);
-        },
-
-        /**
-         *
-         * @param {} filename
-         * @returns {}
-         */
-        createPartialViewMacroWithFile: function(virtualPath, filename) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "macroRenderingApiBaseUrl",
-                        "CreatePartialViewMacroWithFile"),
-                    {
-                        virtualPath: virtualPath,
-                        filename: filename
-                    }
-                ),
-                'Failed to create macro "' + filename + '"'
-            );
-
-        },
-
-        createMacro: function(name) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "macroApiBaseUrl",
-                        "Create?name=" + name)
-                ),
-                'Failed to create macro "' + name + '"'
-            );
-        },
-
-        getPartialViews: function() {
-            return umbRequestHelper.resourcePromise(
-                $http.get(umbRequestHelper.getApiUrl("macroApiBaseUrl", "GetPartialViews"),
-                    "Failed to get partial views")
-            );
-        },
-
-        getParameterEditors: function() {
-            return umbRequestHelper.resourcePromise(
-                $http.get(umbRequestHelper.getApiUrl("macroApiBaseUrl", "GetParameterEditors"),
-                    "Failed to get parameter editors")
-            );
-        },
-
-        getGroupedParameterEditors: function () {
-            return umbRequestHelper.resourcePromise(
-                $http.get(umbRequestHelper.getApiUrl("macroApiBaseUrl", "GetGroupedParameterEditors"),
-                    "Failed to get parameter editors")
-            );
-        },
-
-        getParameterEditorByAlias: function(alias) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(umbRequestHelper.getApiUrl("macroApiBaseUrl", "GetParameterEditorByAlias", { "alias": alias }),
-                    "Failed to get parameter editor")
-            );
-        },
-
-        getById: function(id) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(umbRequestHelper.getApiUrl("macroApiBaseUrl", "GetById", { "id": id }), "Failed to get macro")
-            );
-        },
-
-        saveMacro: function(macro) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("macroApiBaseUrl", "Save"), macro)
-            );
-        },
-
-        deleteById: function(id) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("macroApiBaseUrl", "deleteById", { "id": id }))
-            );
-        }
-};
-}
-
-angular.module('umbraco.resources').factory('macroResource', macroResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
deleted file mode 100644
index d426dcd516..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
+++ /dev/null
@@ -1,593 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.mediaResource
- * @description Loads in data for media
- **/
-function mediaResource($q, $http, umbDataFormatter, umbRequestHelper, trackedReferencesResource) {
-
-    /** internal method process the saving of data and post processing the result */
-    function saveMediaItem(content, action, files) {
-        return umbRequestHelper.postSaveContent({
-            restApiUrl: umbRequestHelper.getApiUrl(
-                "mediaApiBaseUrl",
-                "PostSave"),
-            content: content,
-            action: action,
-            files: files,
-            dataFormatter: function (c, a) {
-                return umbDataFormatter.formatMediaPostData(c, a);
-            }
-        });
-    }
-
-    return {
-
-        getRecycleBin: function () {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "mediaApiBaseUrl",
-                        "GetRecycleBin")),
-                'Failed to retrieve data for media recycle bin');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaResource#sort
-         * @methodOf umbraco.resources.mediaResource
-         *
-         * @description
-         * Sorts all children below a given parent node id, based on a collection of node-ids
-         *
-         * ##usage
-         * <pre>
-         * var ids = [123,34533,2334,23434];
-         * mediaResource.sort({ sortedIds: ids })
-         *    .then(function() {
-         *        $scope.complete = true;
-         *    });
-         * </pre>
-         * @param {Object} args arguments object
-         * @param {Int} args.parentId the ID of the parent node
-         * @param {Array} options.sortedIds array of node IDs as they should be sorted
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        sort: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.sortedIds) {
-                throw "args.sortedIds cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostSort"),
-                    {
-                        parentId: args.parentId,
-                        idSortOrder: args.sortedIds
-                    }),
-                'Failed to sort media');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaResource#move
-         * @methodOf umbraco.resources.mediaResource
-         *
-         * @description
-         * Moves a node underneath a new parentId
-         *
-         * ##usage
-         * <pre>
-         * mediaResource.move({ parentId: 1244, id: 123 })
-         *    .then(function() {
-         *        alert("node was moved");
-         *    }, function(err){
-         *      alert("node didnt move:" + err.data.Message);
-         *    });
-         * </pre>
-         * @param {Object} args arguments object
-         * @param {Int} args.idd the ID of the node to move
-         * @param {Int} args.parentId the ID of the parent node to move to
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        move: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.id) {
-                throw "args.id cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostMove"),
-                    {
-                        parentId: args.parentId,
-                        id: args.id
-                         }, {responseType: 'text'}),
-                {
-                    error: function(data){
-                        var errorMsg = 'Failed to move media';
-                        if (data.id !== undefined && data.parentId !== undefined) {
-                            if (data.id === data.parentId) {
-                                errorMsg = 'Media can\'t be moved into itself';
-                            }
-                        }
-                        else if (data.notifications !== undefined) {
-                            if (data.notifications.length > 0) {
-                                if (data.notifications[0].header.length > 0) {
-                                    errorMsg = data.notifications[0].header;
-                                }
-                                if (data.notifications[0].message.length > 0) {
-                                    errorMsg = errorMsg + ": " + data.notifications[0].message;
-                                }
-                            }
-                        }
-
-                        return {
-                            errorMsg: errorMsg
-                        };
-                    }
-                });
-        },
-
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaResource#getById
-         * @methodOf umbraco.resources.mediaResource
-         *
-         * @description
-         * Gets a media item with a given id
-         *
-         * ##usage
-         * <pre>
-         * mediaResource.getById(1234)
-         *    .then(function(media) {
-         *        var myMedia = media;
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {Int} id id of media item to return
-         * @returns {Promise} resourcePromise object containing the media item.
-         *
-         */
-        getById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "mediaApiBaseUrl",
-                        "GetById",
-                        [{ id: id }])),
-                'Failed to retrieve data for media id ' + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaResource#deleteById
-         * @methodOf umbraco.resources.mediaResource
-         *
-         * @description
-         * Deletes a media item with a given id
-         *
-         * ##usage
-         * <pre>
-         * mediaResource.deleteById(1234)
-         *    .then(function() {
-         *        alert('its gone!');
-         *    });
-         * </pre>
-         *
-         * @param {Int} id id of media item to delete
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        deleteById: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "mediaApiBaseUrl",
-                        "DeleteById",
-                        [{ id: id }])),
-                'Failed to delete item ' + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaResource#getByIds
-         * @methodOf umbraco.resources.mediaResource
-         *
-         * @description
-         * Gets an array of media items, given a collection of ids
-         *
-         * ##usage
-         * <pre>
-         * mediaResource.getByIds( [1234,2526,28262])
-         *    .then(function(mediaArray) {
-         *        var myDoc = contentArray;
-         *        alert('they are here!');
-         *    });
-         * </pre>
-         *
-         * @param {Array} ids ids of media items to return as an array
-         * @returns {Promise} resourcePromise object containing the media items array.
-         *
-         */
-        getByIds: function (ids) {
-
-            var idQuery = "";
-            ids.forEach(id => idQuery += `ids=${id}&`);
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "mediaApiBaseUrl",
-                        "GetByIds",
-                        idQuery)),
-                'Failed to retrieve data for media ids ' + ids);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaResource#getScaffold
-         * @methodOf umbraco.resources.mediaResource
-         *
-         * @description
-         * Returns a scaffold of an empty media item, given the id of the media item to place it underneath and the media type alias.
-         *
-         * - Parent Id must be provided so umbraco knows where to store the media
-         * - Media Type alias must be provided so umbraco knows which properties to put on the media scaffold
-         *
-         * The scaffold is used to build editors for media that has not yet been populated with data.
-         *
-         * ##usage
-         * <pre>
-         * mediaResource.getScaffold(1234, 'folder')
-         *    .then(function(scaffold) {
-         *        var myDoc = scaffold;
-         *        myDoc.name = "My new media item";
-         *
-         *        mediaResource.save(myDoc, true)
-         *            .then(function(media){
-         *                alert("Retrieved, updated and saved again");
-         *            });
-         *    });
-         * </pre>
-         *
-         * @param {Int} parentId id of media item to return
-         * @param {String} alias mediatype alias to base the scaffold on
-         * @returns {Promise} resourcePromise object containing the media scaffold.
-         *
-         */
-        getScaffold: function (parentId, alias) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "mediaApiBaseUrl",
-                        "GetEmpty",
-                        [{ contentTypeAlias: alias }, { parentId: parentId }])),
-                'Failed to retrieve data for empty media item type ' + alias);
-
-        },
-
-        rootMedia: function () {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "mediaApiBaseUrl",
-                        "GetRootMedia")),
-                'Failed to retrieve data for root media');
-
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaResource#getChildren
-         * @methodOf umbraco.resources.mediaResource
-         *
-         * @description
-         * Gets children of a media item with a given id
-         *
-         * ##usage
-         * <pre>
-         * mediaResource.getChildren(1234, {pageSize: 10, pageNumber: 2})
-         *    .then(function(contentArray) {
-         *        var children = contentArray;
-         *        alert('they are here!');
-         *    });
-         * </pre>
-         *
-         * @param {Int} parentid id of content item to return children of
-         * @param {Object} options optional options object
-         * @param {Int} options.pageSize if paging data, number of nodes per page, default = 0
-         * @param {Int} options.pageNumber if paging data, current page index, default = 0
-         * @param {String} options.filter if provided, query will only return those with names matching the filter
-         * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
-         * @param {String} options.orderBy property to order items by, default: `SortOrder`
-         * @returns {Promise} resourcePromise object containing an array of content items.
-         *
-         */
-        getChildren: function (parentId, options) {
-
-            var defaults = {
-                pageSize: 0,
-                pageNumber: 0,
-                filter: '',
-                orderDirection: "Ascending",
-                orderBy: "SortOrder",
-                orderBySystemField: true
-            };
-            if (options === undefined) {
-                options = {};
-            }
-            //overwrite the defaults if there are any specified
-            Utilities.extend(defaults, options);
-            //now copy back to the options we will use
-            options = defaults;
-            //change asc/desct
-            if (options.orderDirection === "asc") {
-                options.orderDirection = "Ascending";
-            }
-            else if (options.orderDirection === "desc") {
-                options.orderDirection = "Descending";
-            }
-
-            //converts the value to a js bool
-            function toBool(v) {
-                if (Utilities.isNumber(v)) {
-                    return v > 0;
-                }
-                if (Utilities.isString(v)) {
-                    return v === "true";
-                }
-                if (typeof v === "boolean") {
-                    return v;
-                }
-                return false;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "mediaApiBaseUrl",
-                        "GetChildren",
-                        [
-                            { id: parentId },
-                            { pageNumber: options.pageNumber },
-                            { pageSize: options.pageSize },
-                            { orderBy: options.orderBy },
-                            { orderDirection: options.orderDirection },
-                            { orderBySystemField: toBool(options.orderBySystemField) },
-                            { filter: options.filter }
-                        ])),
-                'Failed to retrieve children for media item ' + parentId);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaResource#save
-         * @methodOf umbraco.resources.mediaResource
-         *
-         * @description
-         * Saves changes made to a media item, if the media item is new, the isNew paramater must be passed to force creation
-         * if the media item needs to have files attached, they must be provided as the files param and passed separately
-         *
-         *
-         * ##usage
-         * <pre>
-         * mediaResource.getById(1234)
-         *    .then(function(media) {
-         *          media.name = "I want a new name!";
-         *          mediaResource.save(media, false)
-         *            .then(function(media){
-         *                alert("Retrieved, updated and saved again");
-         *            });
-         *    });
-         * </pre>
-         *
-         * @param {Object} media The media item object with changes applied
-         * @param {Bool} isNew set to true to create a new item or to update an existing
-         * @param {Array} files collection of files for the media item
-         * @returns {Promise} resourcePromise object containing the saved media item.
-         *
-         */
-        save: function (media, isNew, files) {
-            return saveMediaItem(media, "save" + (isNew ? "New" : ""), files);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaResource#addFolder
-         * @methodOf umbraco.resources.mediaResource
-         *
-         * @description
-         * Shorthand for adding a media item of the type "Folder" under a given parent ID
-         *
-         * ##usage
-         * <pre>
-         * mediaResource.addFolder("My gallery", 1234)
-         *    .then(function(folder) {
-         *        alert('New folder');
-         *    });
-         * </pre>
-         *
-         * @param {string} name Name of the folder to create
-         * @param {int} parentId Id of the media item to create the folder underneath
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        addFolder: function (name, parentId) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper
-                        .getApiUrl("mediaApiBaseUrl", "PostAddFolder"),
-                    {
-                        name: name,
-                        parentId: parentId
-                    }),
-                'Failed to add folder');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaResource#getChildFolders
-         * @methodOf umbraco.resources.mediaResource
-         *
-         * @description
-         * Retrieves all media children with types used as folders.
-         * Uses the convention of looking for media items with mediaTypes ending in
-         * *Folder so will match "Folder", "bannerFolder", "secureFolder" etc,
-         *
-          * NOTE: This will return a page of max 500 folders, if more is required it needs to be paged
-          *       and then folders are in the .items property of the returned promise data
-         *
-         * ##usage
-         * <pre>
-         * mediaResource.getChildFolders(1234)
-          *    .then(function(page) {
-         *        alert('folders');
-         *    });
-         * </pre>
-         *
-         * @param {int} parentId Id of the media item to query for child folders
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getChildFolders: function (parentId) {
-            if (!parentId) {
-                parentId = -1;
-            }
-
-            //NOTE: This will return a max of 500 folders, if more is required it needs to be paged
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "mediaApiBaseUrl",
-                        "GetChildFolders",
-                        {
-                                id: parentId,
-                                pageNumber: 1,
-                                pageSize: 500
-                        })),
-                        'Failed to retrieve child folders for media item ' + parentId);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaResource#emptyRecycleBin
-         * @methodOf umbraco.resources.mediaResource
-         *
-         * @description
-         * Empties the media recycle bin
-         *
-         * ##usage
-         * <pre>
-         * mediaResource.emptyRecycleBin()
-         *    .then(function() {
-         *        alert('its empty!');
-         *    });
-         * </pre>
-         *
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        emptyRecycleBin: function () {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "mediaApiBaseUrl",
-                        "EmptyRecycleBin")),
-                'Failed to empty the recycle bin');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaResource#search
-         * @methodOf umbraco.resources.mediaResource
-         *
-         * @description
-         * Paginated search for media items starting on the supplied nodeId
-         *
-         * ##usage
-         * <pre>
-         * mediaResource.search("my search", 1, 100, -1)
-         *    .then(function(searchResult) {
-         *        alert('it's here!');
-         *    });
-         * </pre>
-         *
-         * @param {string} query The search query
-         * @param {int} pageNumber The page number
-         * @param {int} pageSize The number of media items on a page
-         * @param {int} searchFrom NodeId to search from (-1 for root)
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        search: function (query, pageNumber, pageSize, searchFrom) {
-
-            var args = [
-                { "query": query },
-                { "pageNumber": pageNumber },
-                { "pageSize": pageSize },
-                { "searchFrom": searchFrom }
-            ];
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "mediaApiBaseUrl",
-                        "Search",
-                        args)),
-                'Failed to retrieve media items for search: ' + query);
-        },
-
-         /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaResource#getPagedReferences
-         * @methodOf umbraco.resources.mediaResource
-         *
-         * @description
-         * Gets a page list of tracked references for the current item, so you can see where an item is being used
-         *
-         * @deprecated
-         * Use umbraco.resources.trackedReferencesResource#getPagedReferences instead
-         *
-         * ##usage
-         * <pre>
-         * var options = {
-         *      pageSize : 25,
-         *      pageNumber : 1,
-         *      entityType : 'DOCUMENT'
-         *  };
-         * trackedReferencesResource.getPagedReferences(1, options)
-         *    .then(function(data) {
-         *        console.log(data);
-         *    });
-         * </pre>
-         *
-         * @param {int} id Id of the item to query for tracked references
-         * @param {Object} args optional args object
-         * @param {Int} args.pageSize the pagesize of the returned list (default 25)
-         * @param {Int} args.pageNumber the current page index (default 1)
-         * @param {Int} args.entityType the type of tracked entity (default : DOCUMENT). Possible values DOCUMENT, MEDIA
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getPagedReferences: function (id, options) {
-            return trackedReferencesResource.getPagedReferences(id, options);
-        }
-    };
-}
-
-angular.module('umbraco.resources').factory('mediaResource', mediaResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
deleted file mode 100644
index a46ac9184e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
+++ /dev/null
@@ -1,286 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.mediaTypeResource
-    * @description Loads in data for media types
-    **/
-function mediaTypeResource($q, $http, umbRequestHelper, umbDataFormatter, localizationService) {
-
-    return {
-
-        getCount: function () {
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "mediaTypeApiBaseUrl",
-                       "GetCount")),
-               'Failed to retrieve count');
-        },
-
-        getAvailableCompositeContentTypes: function (contentTypeId, filterContentTypes, filterPropertyTypes) {
-            if (!filterContentTypes) {
-                filterContentTypes = [];
-            }
-            if (!filterPropertyTypes) {
-                filterPropertyTypes = [];
-            }
-
-            var query = {
-                contentTypeId: contentTypeId,
-                filterContentTypes: filterContentTypes,
-                filterPropertyTypes: filterPropertyTypes
-            };
-
-            return umbRequestHelper.resourcePromise(
-               $http.post(
-                   umbRequestHelper.getApiUrl(
-                       "mediaTypeApiBaseUrl",
-                       "GetAvailableCompositeMediaTypes"),
-                       query),
-               'Failed to retrieve data for content type id ' + contentTypeId);
-        },
-               /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaTypeResource#getWhereCompositionIsUsedInContentTypes
-         * @methodOf umbraco.resources.mediaTypeResource
-         *
-         * @description
-         * Returns a list of media types which use a specific composition with a given id
-         *
-         * ##usage
-         * <pre>
-         * mediaTypeResource.getWhereCompositionIsUsedInContentTypes(1234)
-         *    .then(function(mediaTypeList) {
-         *        console.log(mediaTypeList);
-         *    });
-         * </pre>
-         * @param {Int} contentTypeId id of the composition content type to retrieve the list of the media types where it has been used
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getWhereCompositionIsUsedInContentTypes: function (contentTypeId) {
-            var query = {
-                contentTypeId: contentTypeId
-            };
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "mediaTypeApiBaseUrl",
-                        "GetWhereCompositionIsUsedInContentTypes"),
-                    query),
-                'Failed to retrieve data for content type id ' + contentTypeId);
-        },
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaTypeResource#getAllowedTypes
-         * @methodOf umbraco.resources.mediaTypeResource
-         *
-         * @description
-         * Returns a list of allowed media types underneath a media item with a given ID
-         *
-         * ##usage
-         * <pre>
-         * mediaTypeResource.getAllowedTypes(1234)
-         *    .then(function(array) {
-         *        $scope.type = type;
-         *    });
-         * </pre>
-         * @param {Int} mediaId id of the media item to retrieve allowed child types for
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getAllowedTypes: function (mediaId) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "mediaTypeApiBaseUrl",
-                       "GetAllowedChildren",
-                       [{ contentId: mediaId }])),
-               'Failed to retrieve allowed types for media id ' + mediaId);
-        },
-
-        getById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "mediaTypeApiBaseUrl",
-                       "GetById",
-                       [{ id: id }])),
-               'Failed to retrieve content type');
-        },
-
-        getAll: function () {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "mediaTypeApiBaseUrl",
-                       "GetAll")),
-               'Failed to retrieve all content types');
-        },
-
-        getAllFiltered: function (aliases) {
-            var aliasesQuery = "";
-
-            if (aliases && aliases.length > 0) {
-                aliases.forEach(alias => aliasesQuery += `aliases=${alias}&`);
-            }
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "mediaTypeApiBaseUrl",
-                       "getAllFiltered",
-                       aliasesQuery)),
-               'Failed to retrieve media types');
-        },
-
-        getScaffold: function (parentId) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "mediaTypeApiBaseUrl",
-                       "GetEmpty", { parentId: parentId })),
-               'Failed to retrieve content type scaffold');
-        },
-
-        deleteById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.post(
-                   umbRequestHelper.getApiUrl(
-                       "mediaTypeApiBaseUrl",
-                       "DeleteById",
-                       [{ id: id }])),
-               'Failed to retrieve content type');
-        },
-
-        deleteContainerById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.post(
-                   umbRequestHelper.getApiUrl(
-                       "mediaTypeApiBaseUrl",
-                       "DeleteContainer",
-                       [{ id: id }])),
-               'Failed to delete content type container');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaTypeResource#save
-         * @methodOf umbraco.resources.mediaTypeResource
-         *
-         * @description
-         * Saves or update a media type
-         *
-         * @param {Object} content data type object to create/update
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        save: function (contentType) {
-
-            var saveModel = umbDataFormatter.formatContentTypePostData(contentType);
-
-            return umbRequestHelper.resourcePromise(
-                 $http.post(umbRequestHelper.getApiUrl("mediaTypeApiBaseUrl", "PostSave"), saveModel),
-                'Failed to save data for content type id ' + contentType.id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.mediaTypeResource#move
-         * @methodOf umbraco.resources.mediaTypeResource
-         *
-         * @description
-         * Moves a node underneath a new parentId
-         *
-         * ##usage
-         * <pre>
-         * mediaTypeResource.move({ parentId: 1244, id: 123 })
-         *    .then(function() {
-         *        alert("node was moved");
-         *    }, function(err){
-         *      alert("node didnt move:" + err.data.Message);
-         *    });
-         * </pre>
-         * @param {Object} args arguments object
-         * @param {Int} args.idd the ID of the node to move
-         * @param {Int} args.parentId the ID of the parent node to move to
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        move: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.id) {
-                throw "args.id cannot be null";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("mediaTypeApiBaseUrl", "PostMove"),
-                    {
-                        parentId: args.parentId,
-                        id: args.id
-                    }, { responseType: 'text' }),
-                'Failed to move media type');
-        },
-
-        copy: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.id) {
-                throw "args.id cannot be null";
-            }
-
-            var promise = localizationService.localize("mediaType_copyFailed");
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("mediaTypeApiBaseUrl", "PostCopy"),
-                    {
-                        parentId: args.parentId,
-                        id: args.id
-                    }, { responseType: 'text' }),
-                promise);
-        },
-
-        createContainer: function(parentId, name) {
-
-            var promise = localizationService.localize("media_createFolderFailed", [parentId]);
-
-            return umbRequestHelper.resourcePromise(
-                 $http.post(
-                    umbRequestHelper.getApiUrl(
-                       "mediaTypeApiBaseUrl",
-                       "PostCreateContainer",
-                        { parentId: parentId, name: encodeURIComponent(name) })),
-                promise);
-        },
-
-        renameContainer: function (id, name) {
-
-            var promise = localizationService.localize("media_renameFolderFailed", [id]);
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("mediaTypeApiBaseUrl",
-                    "PostRenameContainer",
-                    { id: id, name: name })),
-                promise
-            );
-
-        }
-
-    };
-}
-angular.module('umbraco.resources').factory('mediaTypeResource', mediaTypeResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js
deleted file mode 100644
index 05e746a69b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js
+++ /dev/null
@@ -1,248 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.memberResource
-    * @description Loads in data for members
-    **/
-function memberResource($q, $http, umbDataFormatter, umbRequestHelper) {
-
-    /** internal method process the saving of data and post processing the result */
-    function saveMember(content, action, files) {
-
-        return umbRequestHelper.postSaveContent({
-            restApiUrl: umbRequestHelper.getApiUrl(
-                "memberApiBaseUrl",
-                "PostSave"),
-            content: content,
-            action: action,
-            files: files,
-            dataFormatter: function (c, a) {
-                return umbDataFormatter.formatMemberPostData(c, a);
-            }
-        });
-    }
-
-    return {
-        getPagedResults: function(memberTypeAlias, options) {
-
-            if (memberTypeAlias === 'all-members') {
-                memberTypeAlias = null;
-            }
-
-            var defaults = {
-                pageSize: 25,
-                pageNumber: 1,
-                filter: '',
-                orderDirection: "Ascending",
-                orderBy: "LoginName",
-                orderBySystemField: true
-            };
-            if (options === undefined) {
-                options = {};
-            }
-            //overwrite the defaults if there are any specified
-            Utilities.extend(defaults, options);
-            //now copy back to the options we will use
-            options = defaults;
-            //change asc/desct
-            if (options.orderDirection === "asc") {
-                options.orderDirection = "Ascending";
-            }
-            else if (options.orderDirection === "desc") {
-                options.orderDirection = "Descending";
-            }
-
-            //converts the value to a js bool
-            function toBool(v) {
-                if (Utilities.isNumber(v)) {
-                    return v > 0;
-                }
-                if (Utilities.isString(v)) {
-                    return v === "true";
-                }
-                if (typeof v === "boolean") {
-                    return v;
-                }
-                return false;
-            }
-
-            var params = [
-                { pageNumber: options.pageNumber },
-                { pageSize: options.pageSize },
-                { orderBy: options.orderBy },
-                { orderDirection: options.orderDirection },
-                { orderBySystemField: toBool(options.orderBySystemField) },
-                { filter: options.filter }
-            ];
-            if (memberTypeAlias != null) {
-                params.push({ memberTypeAlias: memberTypeAlias });
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "memberApiBaseUrl",
-                        "GetPagedResults",
-                        params)),
-                'Failed to retrieve member paged result');
-        },
-
-        getListNode: function(listName) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "memberApiBaseUrl",
-                        "GetListNodeDisplay",
-                        [{ listName: listName }])),
-                'Failed to retrieve data for member list ' + listName);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.memberResource#getByKey
-          * @methodOf umbraco.resources.memberResource
-          *
-          * @description
-          * Gets a member item with a given key
-          *
-          * ##usage
-          * <pre>
-          * memberResource.getByKey("0000-0000-000-00000-000")
-          *    .then(function(member) {
-          *        var mymember = member; 
-          *        alert('its here!');
-          *    });
-          * </pre> 
-          * 
-          * @param {Guid} key key of member item to return        
-          * @returns {Promise} resourcePromise object containing the member item.
-          *
-          */
-        getByKey: function(key) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "memberApiBaseUrl",
-                        "GetByKey",
-                        [{ key: key }])),
-                'Failed to retrieve data for member id ' + key);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.memberResource#deleteByKey
-          * @methodOf umbraco.resources.memberResource
-          *
-          * @description
-          * Deletes a member item with a given key
-          *
-          * ##usage
-          * <pre>
-          * memberResource.deleteByKey("0000-0000-000-00000-000")
-          *    .then(function() {
-          *        alert('its gone!');
-          *    });
-          * </pre> 
-          * 
-          * @param {Guid} key id of member item to delete        
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        deleteByKey: function(key) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "memberApiBaseUrl",
-                        "DeleteByKey",
-                        [{ key: key }])),
-                'Failed to delete item ' + key);
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.memberResource#getScaffold
-          * @methodOf umbraco.resources.memberResource
-          *
-          * @description
-          * Returns a scaffold of an empty member item, given the id of the member item to place it underneath and the member type alias.
-          *         
-          * - Member Type alias must be provided so umbraco knows which properties to put on the member scaffold 
-          * 
-          * The scaffold is used to build editors for member that has not yet been populated with data.
-          * 
-          * ##usage
-          * <pre>
-          * memberResource.getScaffold('client')
-          *    .then(function(scaffold) {
-          *        var myDoc = scaffold;
-          *        myDoc.name = "My new member item"; 
-          *
-          *        memberResource.save(myDoc, true)
-          *            .then(function(member){
-          *                alert("Retrieved, updated and saved again");
-          *            });
-          *    });
-          * </pre> 
-          * 
-          * @param {String} alias membertype alias to base the scaffold on        
-          * @returns {Promise} resourcePromise object containing the member scaffold.
-          *
-          */
-        getScaffold: function(alias) {
-
-            if (alias) {
-                return umbRequestHelper.resourcePromise(
-                    $http.get(
-                        umbRequestHelper.getApiUrl(
-                            "memberApiBaseUrl",
-                            "GetEmpty",
-                            [{ contentTypeAlias: alias }])),
-                    'Failed to retrieve data for empty member item type ' + alias);
-            }
-            else {
-                return umbRequestHelper.resourcePromise(
-                    $http.get(
-                        umbRequestHelper.getApiUrl(
-                            "memberApiBaseUrl",
-                            "GetEmpty")),
-                    'Failed to retrieve data for empty member item type ' + alias);
-            }
-
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.memberResource#save
-          * @methodOf umbraco.resources.memberResource
-          *
-          * @description
-          * Saves changes made to a member, if the member is new, the isNew paramater must be passed to force creation
-          * if the member needs to have files attached, they must be provided as the files param and passed separately 
-          * 
-          * 
-          * ##usage
-          * <pre>
-          * memberResource.getBykey("23234-sd8djsd-3h8d3j-sdh8d")
-          *    .then(function(member) {
-          *          member.name = "Bob";
-          *          memberResource.save(member, false)
-          *            .then(function(member){
-          *                alert("Retrieved, updated and saved again");
-          *            });
-          *    });
-          * </pre> 
-          * 
-          * @param {Object} media The member item object with changes applied
-          * @param {Bool} isNew set to true to create a new item or to update an existing 
-          * @param {Array} files collection of files for the media item      
-          * @returns {Promise} resourcePromise object containing the saved media item.
-          *
-          */
-        save: function(member, isNew, files) {
-            return saveMember(member, "save" + (isNew ? "New" : ""), files);
-        }
-    };
-}
-
-angular.module('umbraco.resources').factory('memberResource', memberResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/membergroup.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/membergroup.resource.js
deleted file mode 100644
index f9b9da9944..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/membergroup.resource.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.memberGroupResource
-    * @description Loads in data for member groups
-    **/
-function memberGroupResource($q, $http, umbRequestHelper) {
-
-    return {
-
-        //return all member types
-        getGroups: function () {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "memberGroupApiBaseUrl",
-                       "GetAllGroups")),
-               "Failed to retrieve data for member groups");
-        },       
-
-        getById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "memberGroupApiBaseUrl",
-                       "GetById",
-                       [{ id: id }])),
-               "Failed to retrieve member group");
-        },
-
-        getByIds: function (ids) {
-
-            var idQuery = "";
-            ids.forEach(id => idQuery += `ids=${id}&`);
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "memberGroupApiBaseUrl",
-                        "GetByIds",
-                        idQuery)),
-                "Failed to retrieve member group");
-        },
-
-        deleteById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.post(
-                   umbRequestHelper.getApiUrl(
-                       "memberGroupApiBaseUrl",
-                       "DeleteById",
-                       [{ id: id }])),
-               "Failed to delete member group");
-        },
-
-        getScaffold: function() {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "memberGroupApiBaseUrl",
-                        "GetEmpty")),
-                "Failed to retrieve data for member group");
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.memberGroupResource#save
-         * @methodOf umbraco.resources.memberGroupResource
-         *
-         * @description
-         * Saves or update a member group
-         *
-         * @param {Object} member group object to create/update
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        save: function (memberGroup) {
-            return umbRequestHelper.resourcePromise(
-                 $http.post(umbRequestHelper.getApiUrl("memberGroupApiBaseUrl", "PostSave"), memberGroup),
-                "Failed to save data for member group, id: " + memberGroup.id);
-        }
-
-    };
-}
-angular.module('umbraco.resources').factory('memberGroupResource', memberGroupResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js
deleted file mode 100644
index f96ba02ecb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.memberTypeResource
-    * @description Loads in data for member types
-    **/
-function memberTypeResource($q, $http, umbRequestHelper, umbDataFormatter, localizationService) {
-
-    return {
-        getCount: function () {
-          return umbRequestHelper.resourcePromise(
-            $http.get(
-              umbRequestHelper.getApiUrl(
-                "memberTypeApiBaseUrl",
-                "GetCount")),
-            'Failed to retrieve count');
-        },
-        getAvailableCompositeContentTypes: function (contentTypeId, filterContentTypes, filterPropertyTypes) {
-            if (!filterContentTypes) {
-                filterContentTypes = [];
-            }
-            if (!filterPropertyTypes) {
-                filterPropertyTypes = [];
-            }
-
-            var query = "";
-            filterContentTypes.forEach(fct => query += `filterContentTypes=${fct}&`);
-
-            // if filterContentTypes array is empty we need a empty variable in the querystring otherwise the service returns a error
-            if (filterContentTypes.length === 0) {
-                query += "filterContentTypes=&";
-            }
-
-            filterPropertyTypes.forEach(fpt => query += `filterPropertyTypes=${fpt}&`);
-
-            // if filterPropertyTypes array is empty we need a empty variable in the querystring otherwise the service returns a error
-            if (filterPropertyTypes.length === 0) {
-                query += "filterPropertyTypes=&";
-            }
-            query += "contentTypeId=" + contentTypeId;
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "memberTypeApiBaseUrl",
-                       "GetAvailableCompositeMemberTypes",
-                       query)),
-               'Failed to retrieve data for content type id ' + contentTypeId);
-        },
-        getWhereCompositionIsUsedInContentTypes: function (contentTypeId) {
-            var query = "contentTypeId=" + contentTypeId;
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "memberTypeApiBaseUrl",
-                        "GetWhereCompositionIsUsedInMemberTypes",
-                        query)),
-                "Failed to retrieve data for content type id " + contentTypeId);
-        },
-        //return all member types
-        getTypes: function () {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "memberTypeQueryApiBaseUrl",
-                       "GetAllTypes")),
-               'Failed to retrieve data for member types id');
-        },
-
-        getById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "memberTypeApiBaseUrl",
-                       "GetById",
-                       [{ id: id }])),
-               'Failed to retrieve content type');
-        },
-
-        deleteById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.post(
-                   umbRequestHelper.getApiUrl(
-                       "memberTypeApiBaseUrl",
-                       "DeleteById",
-                       [{ id: id }])),
-               'Failed to delete member type');
-        },
-
-        getScaffold: function () {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "memberTypeApiBaseUrl",
-                       "GetEmpty")),
-               'Failed to retrieve content type scaffold');
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.memberTypeResource#save
-         * @methodOf umbraco.resources.memberTypeResource
-         *
-         * @description
-         * Saves or update a member type
-         *
-         * @param {Object} content data type object to create/update
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        save: function (contentType) {
-
-            var saveModel = umbDataFormatter.formatContentTypePostData(contentType);
-
-            return umbRequestHelper.resourcePromise(
-                 $http.post(umbRequestHelper.getApiUrl("memberTypeApiBaseUrl", "PostSave"), saveModel),
-                'Failed to save data for member type id ' + contentType.id);
-        },
-
-        copy: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.parentId) {
-                throw "args.parentId cannot be null";
-            }
-            if (!args.id) {
-                throw "args.id cannot be null";
-            }
-
-            var promise = localizationService.localize("memberType_copyFailed");
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("memberTypeApiBaseUrl", "PostCopy"),
-                    {
-                        parentId: args.parentId,
-                        id: args.id
-                    }, { responseType: 'text' }),
-                promise);
-        }
-    };
-}
-angular.module('umbraco.resources').factory('memberTypeResource', memberTypeResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/modelsbuildermanagement.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/modelsbuildermanagement.resource.js
deleted file mode 100644
index 8352ca07e6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/modelsbuildermanagement.resource.js
+++ /dev/null
@@ -1,87 +0,0 @@
-
-/**
-* @ngdoc service
-* @name umbraco.resources.modelsBuilderManagementResource
-* @description Resources to get information on modelsbuilder status and build models
-**/
-function modelsBuilderManagementResource($q, $http, umbRequestHelper) {
-
-    return {
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.modelsBuilderManagementResource#getModelsOutOfDateStatus
-        * @methodOf umbraco.resources.modelsBuilderManagementResource
-        *
-        * @description
-        * Gets the status of modelsbuilder 
-        *
-        * ##usage
-        * <pre>
-        * modelsBuilderManagementResource.getModelsOutOfDateStatus()
-        *  .then(function() {
-        *        Do stuff...*
-        * });
-        * </pre>
-        * 
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        getModelsOutOfDateStatus: function () {
-            return umbRequestHelper.resourcePromise(
-                $http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetModelsOutOfDateStatus")),
-                "Failed to get models out-of-date status");
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.modelsBuilderManagementResource#buildModels
-        * @methodOf umbraco.resources.modelsBuilderManagementResource
-        *
-        * @description
-        * Builds the models
-        *
-        * ##usage
-        * <pre>
-        * modelsBuilderManagementResource.buildModels()
-        *  .then(function() {
-        *        Do stuff...*
-        * });
-        * </pre>
-        *
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        buildModels: function () {
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")),
-                "Failed to build models");
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.resources.modelsBuilderManagementResource#getDashboard
-        * @methodOf umbraco.resources.modelsBuilderManagementResource
-        *
-        * @description
-        * Gets the modelsbuilder dashboard
-        *
-        * ##usage
-        * <pre>
-        * modelsBuilderManagementResource.getDashboard()
-        *  .then(function() {
-        *        Do stuff...*
-        * });
-        * </pre>
-        *
-        * @returns {Promise} resourcePromise object.
-        *
-        */
-        getDashboard: function () {
-            return umbRequestHelper.resourcePromise(
-                $http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetDashboard")),
-                "Failed to get dashboard");
-        }
-    };
-}
-angular.module("umbraco.resources").factory("modelsBuilderManagementResource", modelsBuilderManagementResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/nestedcontent.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/nestedcontent.resource.js
deleted file mode 100644
index 4f71c1d1b4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/nestedcontent.resource.js
+++ /dev/null
@@ -1,12 +0,0 @@
-angular.module('umbraco.resources').factory('Umbraco.PropertyEditors.NestedContent.Resources',
-    function ($q, $http, umbRequestHelper) {
-        return {
-            getContentTypes: function () {
-                var url = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + "/backoffice/UmbracoApi/NestedContent/GetContentTypes";
-                return umbRequestHelper.resourcePromise(
-                    $http.get(url),
-                    'Failed to retrieve content types'
-                );
-            }
-        };
-    });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/ourpackagerrepository.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/ourpackagerrepository.resource.js
deleted file mode 100644
index 60ceebb207..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/ourpackagerrepository.resource.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.ourPackageRepositoryResource
-    * @description handles data for package installations
-    * @deprecated This resource is deprecated and will be removed in future versions. Umbraco no longer supports the Our Umbraco repository.
-    **/
-function ourPackageRepositoryResource($http, umbRequestHelper) {
-
-    var baseurl = Umbraco.Sys.ServerVariables.umbracoUrls.packagesRestApiBaseUrl;
-
-    return {
-        
-        getDetails: function (packageId) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(baseurl + "/" + packageId + "?version=" + Umbraco.Sys.ServerVariables.application.version),
-               'Failed to get package details');
-        },
-
-        getCategories: function () {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(baseurl),
-               'Failed to query packages');
-        },
-
-        getPopular: function (maxResults, category) {
-
-            if (maxResults === undefined) {
-                maxResults = 10;
-            }
-            if (category === undefined) {
-                category = "";
-            }
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(baseurl + "?pageIndex=0&pageSize=" + maxResults + "&category=" + category + "&order=Popular&version=" + Umbraco.Sys.ServerVariables.application.version),
-               'Failed to query packages');
-        },
-
-        getPromoted: function (maxResults, category) {
-
-            if (maxResults === undefined) {
-                maxResults = 20;
-            }
-            if (category === undefined) {
-                category = "";
-            }
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(baseurl + "?pageIndex=0&pageSize=" + maxResults + "&category=" + category + "&order=Popular&version=" + Umbraco.Sys.ServerVariables.application.version + "&onlyPromoted=true"),
-               'Failed to query packages');
-        },
-
-        search: function (pageIndex, pageSize, orderBy, category, query, canceler) {
-
-            var httpConfig = {};
-            if (canceler) {
-                httpConfig["timeout"] = canceler;
-            }
-
-            if (category === undefined) {
-                category = "";
-            }
-            if (query === undefined) {
-                query = "";
-            }
-
-            //order by score if there is nothing set
-            var order = !orderBy ? "&order=Default" : ("&order=" + orderBy);
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                baseurl + "?pageIndex=" + pageIndex + "&pageSize=" + pageSize + "&category=" + category + "&query=" + query + order + "&version=" + Umbraco.Sys.ServerVariables.application.version,
-                httpConfig
-               ),
-               'Failed to query packages');
-        }
-        
-       
-    };
-}
-
-angular.module('umbraco.resources').factory('ourPackageRepositoryResource', ourPackageRepositoryResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js
deleted file mode 100644
index e3998a03f6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/package.resource.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.packageInstallResource
-    * @description handles data for package installations
-    **/
-function packageResource($q, $http, umbDataFormatter, umbRequestHelper) {
-
-  return {
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.packageInstallResource#getInstalled
-     * @methodOf umbraco.resources.packageInstallResource
-     *
-     * @description
-     * Gets a list of installed packages
-     */
-    getInstalled: function () {
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "packageApiBaseUrl",
-            "GetInstalled")),
-        'Failed to get installed packages');
-    },
-
-    runMigrations: function (packageName) {
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "packageApiBaseUrl",
-            "RunMigrations",
-            { packageName: packageName })),
-        'Failed to run migrations for package');
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.packageInstallResource#getCreated
-     * @methodOf umbraco.resources.packageInstallResource
-     *
-     * @description
-     * Gets a list of created packages
-     */
-    getAllCreated: function () {
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "packageApiBaseUrl",
-            "GetCreatedPackages")),
-        'Failed to get created packages');
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.packageInstallResource#getCreatedById
-     * @methodOf umbraco.resources.packageInstallResource
-     *
-     * @description
-     * Gets a created package by id
-     */
-    getCreatedById: function (id) {
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "packageApiBaseUrl",
-            "GetCreatedPackageById",
-            { id: id })),
-        'Failed to get package');
-    },
-
-    getInstalledByName: function (packageName) {
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "packageApiBaseUrl",
-            "GetInstalledPackageByName",
-            { packageName: packageName })),
-        'Failed to get package');
-    },
-
-    getEmpty: function () {
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "packageApiBaseUrl",
-            "getEmpty")),
-        'Failed to get scaffold');
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.packageInstallResource#savePackage
-     * @methodOf umbraco.resources.packageInstallResource
-     *
-     * @description
-     * Creates or updates a package
-     */
-    savePackage: function (umbPackage) {
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "packageApiBaseUrl",
-            "PostSavePackage"), umbPackage),
-        'Failed to create package');
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.resources.packageInstallResource#deleteCreatedPackage
-     * @methodOf umbraco.resources.packageInstallResource
-     *
-     * @description
-     * Detes a created package
-     */
-    deleteCreatedPackage: function (packageId) {
-      return umbRequestHelper.resourcePromise(
-        $http.post(
-          umbRequestHelper.getApiUrl(
-            "packageApiBaseUrl",
-            "DeleteCreatedPackage", { packageId: packageId })),
-        'Failed to delete package ' + packageId);
-    }
-  };
-}
-
-angular.module('umbraco.resources').factory('packageResource', packageResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/propertytype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/propertytype.resource.js
deleted file mode 100644
index 63991cb998..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/propertytype.resource.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.propertyTypeResource
-    * @description Loads in data for property types
-    **/
- function propertyTypeResource($http, umbRequestHelper) {
-
-    return {
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.propertyTypeResource#hasValues
-         * @methodOf umbraco.resources.propertyTypeResource
-         *
-         * @description
-         * Checks for values stored for the property type
-         *
-         * ##usage
-         * <pre>
-         * propertyTypeResource.hasValues(alias)
-         *    .then(function(data) {
-         *        console.log(data.hasValues);
-         *    }, function(err) {
-         *      console.log("failed to check if property type has values", err);
-         *    });
-         * </pre> 
-         * 
-         * @param {Int} alias alias of data type
-         * @returns {Promise} resourcePromise object.
-         */
-        hasValues: function (alias) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "propertyTypeApiBaseUrl",
-                        "hasvalues",
-                        { alias }
-                    )),
-                "Failed to check if the data type with " + alias + " has values");
-        }
-    };
-}
-
-angular.module("umbraco.resources").factory("propertyTypeResource", propertyTypeResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/publicaccess.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/publicaccess.resource.js
deleted file mode 100644
index d91924a2eb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/publicaccess.resource.js
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.publicAccessResource
- * @description Handles all transactions of public access data
- *
- * @requires $q
- * @requires $http
- * @requires umbDataFormatter
- * @requires umbRequestHelper
- *
- **/
-
-function publicAccessResource($http, umbRequestHelper) {
-
-    return {    
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.publicAccessResource#getPublicAccess
-          * @methodOf umbraco.resources.publicAccessResource
-          *
-          * @description
-          * Returns the public access protection for a content item
-          *
-          * ##usage
-          * <pre>
-          * publicAccessResource.getPublicAccess(contentId)
-          *    .then(function(publicAccess) {
-          *        // do your thing
-          *    });
-          * </pre>
-          *
-          * @param {Int} contentId The content Id
-          * @returns {Promise} resourcePromise object containing the public access protection
-          *
-          */
-        getPublicAccess: function (contentId) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl("publicAccessApiBaseUrl", "GetPublicAccess", {
-                        contentId: contentId
-                    })
-                ),
-                "Failed to get public access for content item with id " + contentId
-            );
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.publicAccessResource#updatePublicAccess
-          * @methodOf umbraco.resources.publicAccessResource
-          *
-          * @description
-          * Sets or updates the public access protection for a content item
-          *
-          * ##usage
-          * <pre>
-          * publicAccessResource.updatePublicAccess(contentId, userName, password, roles, loginPageId, errorPageId)
-          *    .then(function() {
-          *        // do your thing
-          *    });
-          * </pre>
-          *
-          * @param {Int} contentId The content Id
-          * @param {Array} groups The names of the groups that should have access (if using group based protection)
-          * @param {Array} usernames The usernames of the members that should have access (if using member based protection)
-          * @param {Int} loginPageId The Id of the login page
-          * @param {Int} errorPageId The Id of the error page
-          * @returns {Promise} resourcePromise object containing the public access protection
-          *
-          */
-        updatePublicAccess: function (contentId, groups, usernames, loginPageId, errorPageId) {
-            var publicAccess = {
-                contentId: contentId,
-                loginPageId: loginPageId,
-                errorPageId: errorPageId
-            };
-            if (Utilities.isArray(groups) && groups.length) {
-                publicAccess.groups = groups;
-            }
-            else if (Utilities.isArray(usernames) && usernames.length) {
-                publicAccess.usernames = usernames;
-            }
-            else {
-                throw "must supply either userName/password or roles";
-            }
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl("publicAccessApiBaseUrl", "PostPublicAccess", publicAccess)
-                ),
-                "Failed to update public access for content item with id " + contentId
-            );
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.publicAccessResource#removePublicAccess
-          * @methodOf umbraco.resources.publicAccessResource
-          *
-          * @description
-          * Removes the public access protection for a content item
-          *
-          * ##usage
-          * <pre>
-          * publicAccessResource.removePublicAccess(contentId)
-          *    .then(function() {
-          *        // do your thing
-          *    });
-          * </pre>
-          *
-          * @param {Int} contentId The content Id
-          * @returns {Promise} resourcePromise object that's resolved once the public access has been removed
-          *
-          */
-        removePublicAccess: function (contentId) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl("publicAccessApiBaseUrl", "RemovePublicAccess", {
-                        contentId: contentId
-                    })
-                ),
-                "Failed to remove public access for content item with id " + contentId
-            );
-        }
-    };
-}
-
-angular.module('umbraco.resources').factory('publicAccessResource', publicAccessResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/redirecturls.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/redirecturls.resource.js
deleted file mode 100644
index c91903eb0f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/redirecturls.resource.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.redirectUrlResource
- * @function
- *
- * @description
- * Used by the redirect url dashboard to get urls and send requests to remove redirects.
- */
-(function() {
-    'use strict';
-
-    function redirectUrlsResource($http, umbRequestHelper) {
-
-        /**
-         * @ngdoc function
-         * @name umbraco.resources.redirectUrlResource#searchRedirectUrls
-         * @methodOf umbraco.resources.redirectUrlResource
-         * @function
-         *
-         * @description
-         * Called to search redirects
-         * ##usage
-         * <pre>
-         * redirectUrlsResource.searchRedirectUrls("", 0, 20)
-         *    .then(function(response) {
-         *
-         *    });
-         * </pre>
-         * @param {String} searchTerm Searh term
-         * @param {Int} pageIndex index of the page to retrieve items from
-         * @param {Int} pageSize The number of items on a page
-         */
-        function searchRedirectUrls(searchTerm, pageIndex, pageSize) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "redirectUrlManagementApiBaseUrl",
-                        "SearchRedirectUrls",
-                        { searchTerm: searchTerm, page: pageIndex, pageSize: pageSize })),
-                'Failed to retrieve data for searching redirect urls');
-        }
-        /**
-   * @ngdoc function
-   * @name umbraco.resources.redirectUrlResource#getRedirectsForContentItem
-   * @methodOf umbraco.resources.redirectUrlResource
-   * @function
-   *
-   * @description
-   * Used to retrieve RedirectUrls for a specific item of content for Information tab
-   * ##usage
-   * <pre>
-   * redirectUrlsResource.getRedirectsForContentItem("udi:123456")
-   *    .then(function(response) {
-   *
-   *    });
-   * </pre>
-   * @param {String} contentUdi identifier for the content item to retrieve redirects for
-   */
-        function getRedirectsForContentItem(contentUdi) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "redirectUrlManagementApiBaseUrl",
-                        "RedirectUrlsForContentItem",
-                        { contentUdi: contentUdi })),
-                'Failed to retrieve redirects for content: ' + contentUdi);
-        }
-
-        function getEnableState() {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "redirectUrlManagementApiBaseUrl",
-                        "GetEnableState")),
-                'Failed to retrieve data to check if the 301 redirect is enabled');
-        }
-     
-        /**
-         * @ngdoc function
-         * @name umbraco.resources.redirectUrlResource#deleteRedirectUrl
-         * @methodOf umbraco.resources.redirectUrlResource
-         * @function
-         *
-         * @description
-         * Called to delete a redirect
-         * ##usage
-         * <pre>
-         * redirectUrlsResource.deleteRedirectUrl(1234)
-         *    .then(function() {
-         *
-         *    });
-         * </pre>
-         * @param {Int} id Id of the redirect
-         */
-        function deleteRedirectUrl(id) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "redirectUrlManagementApiBaseUrl",
-                        "DeleteRedirectUrl", { id: id })),
-                'Failed to remove redirect');
-        }
-
-        /**
-         * @ngdoc function
-         * @name umbraco.resources.redirectUrlResource#toggleUrlTracker
-         * @methodOf umbraco.resources.redirectUrlResource
-         * @function
-         *
-         * @description
-         * Called to enable or disable redirect url tracker
-         * ##usage
-         * <pre>
-         * redirectUrlsResource.toggleUrlTracker(true)
-         *    .then(function() {
-         *
-         *    });
-         * </pre>
-         * @param {Bool} disable true/false to disable/enable the url tracker
-         */
-        function toggleUrlTracker(disable) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "redirectUrlManagementApiBaseUrl",
-                        "ToggleUrlTracker", { disable: disable })),
-                'Failed to toggle redirect url tracker');
-        }
-
-        var resource = {
-            searchRedirectUrls: searchRedirectUrls,
-            deleteRedirectUrl: deleteRedirectUrl,
-            toggleUrlTracker: toggleUrlTracker,
-            getEnableState: getEnableState,
-            getRedirectsForContentItem: getRedirectsForContentItem
-        };
-
-        return resource;
-
-    }
-
-    angular.module('umbraco.resources').factory('redirectUrlsResource', redirectUrlsResource);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/relation.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/relation.resource.js
deleted file mode 100644
index c791197e20..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/relation.resource.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
-  * @ngdoc service
-  * @name umbraco.resources.relationResource
-  * @description Handles loading of relation data
-  **/
-function relationResource($q, $http, umbRequestHelper) {
-    return {
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.relationResource#getByChildId
-         * @methodOf umbraco.resources.relationResource
-         *
-         * @description
-         * Retrieves the relation data for a given child ID
-         * 
-         * @param {int} id of the child item
-         * @param {string} alias of the relation type
-         * @returns {Promise} resourcePromise object containing the relations array.
-         *
-         */
-        getByChildId: function (id, alias) {
-          
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "relationApiBaseUrl",
-                        "GetByChildId",
-                        { childId: id, relationTypeAlias: alias })),
-                "Failed to get relation by child ID " + id + " and type of " + alias);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.relationResource#deleteById
-         * @methodOf umbraco.resources.relationResource
-         *
-         * @description
-         * Deletes a relation item with a given id
-         *
-         * ##usage
-         * <pre>
-         * relationResource.deleteById(1234)
-         *    .then(function() {
-         *        alert('its gone!');
-         *    });
-         * </pre> 
-         * 
-         * @param {Int} id id of relation item to delete
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        deleteById: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "relationApiBaseUrl",
-                        "DeleteById",
-                        [{ id: id }])),
-                'Failed to delete item ' + id);
-        }
-    };
-}
-
-angular.module('umbraco.resources').factory('relationResource', relationResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/relationtype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/relationtype.resource.js
deleted file mode 100644
index 96c7882b5a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/relationtype.resource.js
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.relationTypeResource
- * @description Loads in data for relation types.
- */
-function relationTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
-    return {
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.relationTypeResource#getById
-         * @methodOf umbraco.resources.relationTypeResource
-         *
-         * @description
-         * Gets a relation type with a given ID.
-         *
-         * ##usage
-         * <pre>
-         * relationTypeResource.getById(1234)
-         *    .then(function() {
-         *        alert('Found it!');
-         *    });
-         * </pre>
-         *
-         * @param {Int} id of the relation type to get.
-         * @returns {Promise} resourcePromise containing relation type data.
-         */
-        getById: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(umbRequestHelper.getApiUrl("relationTypeApiBaseUrl", "GetById", [{ id: id }])),
-                "Failed to get item " + id
-            );
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.relationTypeResource#getRelationObjectTypes
-         * @methodOf umbraco.resources.relationTypeResource
-         *
-         * @description
-         * Gets a list of Umbraco object types which can be associated with a relation.
-         *
-         * @returns {Object} A collection of Umbraco object types.
-         */
-        getRelationObjectTypes: function() {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl("relationTypeApiBaseUrl", "GetRelationObjectTypes")
-                ),
-                "Failed to get object types"
-            );
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.relationTypeResource#save
-         * @methodOf umbraco.resources.relationTypeResource
-         *
-         * @description
-         * Updates a relation type.
-         *
-         * @param {Object} relationType The relation type object to update.
-         * @returns {Promise} A resourcePromise object.
-         */
-        save: function (relationType) {
-            var saveModel = umbDataFormatter.formatRelationTypePostData(relationType);
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("relationTypeApiBaseUrl", "PostSave"), saveModel),
-                "Failed to save data for relation type ID" + relationType.id
-            );
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.relationTypeResource#create
-         * @methodOf umbraco.resources.relationTypeResource
-         *
-         * @description
-         * Creates a new relation type.
-         *
-         * @param {Object} relationType The relation type object to create.
-         * @returns {Promise} A resourcePromise object.
-         */
-        create: function (relationType) {
-            var createModel = umbDataFormatter.formatRelationTypePostData(relationType);
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("relationTypeApiBaseUrl", "PostCreate"), createModel),
-                "Failed to create new realtion"
-            );
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.relationTypeResource#deleteById
-         * @methodOf umbraco.resources.relationTypeResource
-         *
-         * @description
-         * Deletes a relation type with a given ID.
-         *
-         * * ## Usage
-         * <pre>
-         * relationTypeResource.deleteById(1234).then(function() {
-         *    alert('Deleted it!');
-         * });
-         * </pre>
-         *
-         * @param {Int} id The ID of the relation type to delete.
-         * @returns {Promose} resourcePromise object.
-         */
-        deleteById: function (id) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("relationTypeApiBaseUrl", "DeleteById", [{ id: id }])),
-                "Failed to delete item " + id
-            );
-        },
-
-        getPagedResults: function (id, options) {
-
-            var defaults = {
-                pageSize: 25,
-                pageNumber: 1
-            };
-            if (options === undefined) {
-                options = {};
-            }
-            //overwrite the defaults if there are any specified
-            Utilities.extend(defaults, options);
-            //now copy back to the options we will use
-            options = defaults;
-            
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "relationTypeApiBaseUrl",
-                        "GetPagedResults",
-                        {
-                            id: id,
-                            pageNumber: options.pageNumber,
-                            pageSize: options.pageSize
-                        }
-                    )),
-                'Failed to get paged relations for id ' + id);
-        }
-
-    };
-}
-
-angular.module("umbraco.resources").factory("relationTypeResource", relationTypeResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/section.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/section.resource.js
deleted file mode 100644
index bcd922112e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/section.resource.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.sectionResource
-    * @description Loads in data for section
-    **/
-function sectionResource($q, $http, umbRequestHelper) {
-
-    /** internal method to get the tree app url */
-    function getSectionsUrl(section) {
-        return Umbraco.Sys.ServerVariables.sectionApiBaseUrl + "GetSections";
-    }
-   
-    //the factory object returned
-    return {
-        /** Loads in the data to display the section list */
-        getSections: function () {
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "sectionApiBaseUrl",
-                       "GetSections")),
-               'Failed to retrieve data for sections');
-		},
-        
-        /** Loads in all available sections */
-        getAllSections: function () {
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "sectionApiBaseUrl",
-                       "GetAllSections")),
-               'Failed to retrieve data for sections');
-		}
-    };
-}
-
-angular.module('umbraco.resources').factory('sectionResource', sectionResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/stylesheet.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/stylesheet.resource.js
deleted file mode 100644
index 36f2b4c591..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/stylesheet.resource.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.stylesheetResource
-    * @description service to retrieve available stylesheets
-    * 
-    *
-    **/
-function stylesheetResource($q, $http, umbRequestHelper) {
-
-    //the factory object returned
-    return {
-        
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.stylesheetResource#getAll
-         * @methodOf umbraco.resources.stylesheetResource
-         *
-         * @description
-         * Gets all registered stylesheets
-         *
-         * ##usage
-         * <pre>
-         * stylesheetResource.getAll()
-         *    .then(function(stylesheets) {
-         *        alert('its here!');
-         *    });
-         * </pre> 
-         * 
-         * @returns {Promise} resourcePromise object containing the stylesheets.
-         *
-         */
-        getAll: function () {            
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "stylesheetApiBaseUrl",
-                       "GetAll")),
-               'Failed to retrieve stylesheets ');
-        },       
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.stylesheetResource#getRulesByName
-         * @methodOf umbraco.resources.stylesheetResource
-         *
-         * @description
-         * Returns all defined child rules for a stylesheet with a given name
-         *
-         * ##usage
-         * <pre>
-         * stylesheetResource.getRulesByName("ie7stylesheet")
-         *    .then(function(rules) {
-         *        alert('its here!');
-         *    });
-         * </pre> 
-         * 
-         * @returns {Promise} resourcePromise object containing the rules.
-         *
-         */
-        getRulesByName: function (name) {            
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "stylesheetApiBaseUrl",
-                       "GetRulesByName",
-                       [{ name: name }])),
-               'Failed to retrieve stylesheets ');
-        }
-    };
-}
-
-angular.module('umbraco.resources').factory('stylesheetResource', stylesheetResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/template.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/template.resource.js
deleted file mode 100644
index 377bb415fc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/template.resource.js
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.templateResource
-    * @description Loads in data for templates
-    **/
-function templateResource($q, $http, umbDataFormatter, umbRequestHelper, localizationService) {
-
-    return {
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.templateResource#getById
-         * @methodOf umbraco.resources.templateResource
-         *
-         * @description
-         * Gets a template item with a given id
-         *
-         * ##usage
-         * <pre>
-         * templateResource.getById(1234)
-         *    .then(function(template) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {Int} id id of template to retrieve
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getById: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "templateApiBaseUrl",
-                       "GetById",
-                       [{ id: id }])),
-               "Failed to retrieve data for template id " + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.templateResource#getByAlias
-         * @methodOf umbraco.resources.templateResource
-         *
-         * @description
-         * Gets a template item with a given alias
-         *
-         * ##usage
-         * <pre>
-         * templateResource.getByAlias("upload")
-         *    .then(function(template) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @param {String} alias Alias of template to retrieve
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getByAlias: function (alias) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "templateApiBaseUrl",
-                       "GetByAlias",
-                       [{ alias: alias }])),
-               "Failed to retrieve data for template with alias: " + alias);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.templateResource#getAll
-         * @methodOf umbraco.resources.templateResource
-         *
-         * @description
-         * Gets all templates
-         *
-         * ##usage
-         * <pre>
-         * templateResource.getAll()
-         *    .then(function(templates) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getAll: function () {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "templateApiBaseUrl",
-                       "GetAll")),
-               "Failed to retrieve data");
-        },
-
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.templateResource#getScaffold
-         * @methodOf umbraco.resources.templateResource
-         *
-         * @description
-         * Returns a scaffold of an empty template item
-         *
-         * The scaffold is used to build editors for templates that has not yet been populated with data.
-         *
-         * ##usage
-         * <pre>
-         * templateResource.getScaffold()
-         *    .then(function(template) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @returns {Promise} resourcePromise object containing the template scaffold.
-         *
-         */
-        getScaffold: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "templateApiBaseUrl",
-                       "GetScaffold",
-                        [{ id: id }] )),
-               "Failed to retrieve data for empty template");
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.templateResource#deleteById
-         * @methodOf umbraco.resources.templateResource
-         *
-         * @description
-         * Deletes a template with a given id
-         *
-         * ##usage
-         * <pre>
-         * templateResource.deleteById(1234)
-         *    .then(function() {
-         *        alert('its gone!');
-         *    });
-         * </pre>
-         *
-         * @param {Int} id id of template to delete
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        deleteById: function(id) {
-
-            var promise = localizationService.localize("template_deleteByIdFailed", [id]);
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "templateApiBaseUrl",
-                        "DeleteById",
-                        [{ id: id }])),
-                promise);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.templateResource#save
-         * @methodOf umbraco.resources.templateResource
-         *
-         * @description
-         * Saves or update a template
-         * 
-         * ##usage
-         * <pre>
-         * templateResource.save(template)
-         *    .then(function(template) {
-         *        alert('its saved!');
-         *    });
-         * </pre>
-         *
-         * @param {Object} template object to save
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        save: function (template) {
-            return umbRequestHelper.resourcePromise(
-                 $http.post(
-                     umbRequestHelper.getApiUrl(
-                         "templateApiBaseUrl", 
-                         "PostSave"), 
-                         template),
-                "Failed to save data for template id " + template.id);
-        }
-    };
-}
-
-angular.module("umbraco.resources").factory("templateResource", templateResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/templatequery.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/templatequery.resource.js
deleted file mode 100644
index 04569fccff..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/templatequery.resource.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.templateQueryResource
- * @function
- *
- * @description
- * Used by the query builder
- */
-(function () {
-    'use strict';
-
-    function templateQueryResource($http, umbRequestHelper) {
-
-        /**
-         * @ngdoc function
-         * @name umbraco.resources.templateQueryResource#getAllowedProperties
-         * @methodOf umbraco.resources.templateQueryResource
-         * @function
-         *
-         * @description
-         * Called to get allowed properties
-         * ##usage
-         * <pre>
-         * templateQueryResource.getAllowedProperties()
-         *    .then(function(response) {
-         *
-         *    });
-         * </pre>
-         */
-        function getAllowedProperties() {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "templateQueryApiBaseUrl",
-                        "GetAllowedProperties")),
-                'Failed to retrieve properties');
-        }
-
-        /**
-         * @ngdoc function
-         * @name umbraco.resources.templateQueryResource#getContentTypes
-         * @methodOf umbraco.resources.templateQueryResource
-         * @function
-         *
-         * @description
-         * Called to get content types
-         * ##usage
-         * <pre>
-         * templateQueryResource.getContentTypes()
-         *    .then(function(response) {
-         *
-         *    });
-         * </pre>
-         */
-        function getContentTypes() {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "templateQueryApiBaseUrl",
-                        "GetContentTypes")),
-                'Failed to retrieve content types');
-        }
-
-        /**
-         * @ngdoc function
-         * @name umbraco.resources.templateQueryResource#getFilterConditions
-         * @methodOf umbraco.resources.templateQueryResource
-         * @function
-         *
-         * @description
-         * Called to the filter conditions
-         * ##usage
-         * <pre>
-         * templateQueryResource.getFilterConditions()
-         *    .then(function(response) {
-         *
-         *    });
-         * </pre>
-         */
-        function getFilterConditions() {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "templateQueryApiBaseUrl",
-                        "GetFilterConditions")),
-                'Failed to retrieve filter conditions');
-        }
-
-        /**
-         * @ngdoc function
-         * @name umbraco.resources.templateQueryResource#postTemplateQuery
-         * @methodOf umbraco.resources.templateQueryResource
-         * @function
-         *
-         * @description
-         * Called to get content types
-         * ##usage
-         * <pre>
-         * var query = {
-         *     contentType: {
-         *         name: "Everything"
-         *      },
-         *      source: {
-         *          name: "My website"
-         *      },
-         *      filters: [
-         *          {
-         *              property: undefined,
-         *              operator: undefined
-         *          }
-         *      ],
-         *      sort: {
-         *          property: {
-         *              alias: "",
-         *              name: "",
-         *          },
-         *          direction: "ascending"
-         *      }
-         *  };
-         * 
-         * templateQueryResource.postTemplateQuery(query)
-         *    .then(function(response) {
-         *
-         *    });
-         * </pre>
-         * @param {object} query Query to build result
-         */
-        function postTemplateQuery(query) {
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "templateQueryApiBaseUrl",
-                        "PostTemplateQuery"),
-                        query),
-                'Failed to retrieve query');
-        }
-
-        var resource = {
-            getAllowedProperties: getAllowedProperties,
-            getContentTypes: getContentTypes,
-            getFilterConditions: getFilterConditions,
-            postTemplateQuery: postTemplateQuery
-        };
-
-        return resource;
-
-    }
-
-    angular.module('umbraco.resources').factory('templateQueryResource', templateQueryResource);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/tour.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/tour.resource.js
deleted file mode 100644
index 485b0d299a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/tour.resource.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.usersResource
- * @function
- *
- * @description
- * Used by the users section to get users and send requests to create, invite, delete, etc. users.
- */
-(function () {
-    'use strict';
-
-    function tourResource($http, umbRequestHelper, $q, umbDataFormatter) {
-
-        function getTours() {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "tourApiBaseUrl",
-                        "GetTours")),
-                'Failed to get tours');
-        }
-
-        function getToursForDoctype(doctypeAlias) {
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "tourApiBaseUrl",
-                        "GetToursForDoctype",
-                        [{ doctypeAlias: doctypeAlias }])),
-                'Failed to get tours');
-        }
-        
-
-        var resource = {
-            getTours: getTours,
-            getToursForDoctype: getToursForDoctype
-        };
-
-        return resource;
-
-    }
-
-    angular.module('umbraco.resources').factory('tourResource', tourResource);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/trackedreferences.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/trackedreferences.resource.js
deleted file mode 100644
index d64951a6d0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/trackedreferences.resource.js
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.trackedReferencesResource
- * @description Loads in data for tracked references
- **/
-function trackedReferencesResource($q, $http, umbRequestHelper) {
-
-    return {
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.trackedReferencesResource#getPagedReferences
-         * @methodOf umbraco.resources.trackedReferencesResource
-         *
-         * @description
-         * Gets a page list of tracked references for the current item, so you can see where an item is being used
-         *
-         * ##usage
-         * <pre>
-         * var options = {
-         *      pageSize : 25,
-         *      pageNumber : 1,
-         *      entityType : 'DOCUMENT'
-         *  };
-         * trackedReferencesResource.getPagedReferences(1, options)
-         *    .then(function(data) {
-         *        console.log(data);
-         *    });
-         * </pre>
-         *
-         * @param {int} id Id of the item to query for tracked references
-         * @param {Object} args optional args object
-         * @param {Int} args.pageSize the pagesize of the returned list (default 25)
-         * @param {Int} args.pageNumber the current page index (default 1)
-         * @param {String} args.entityType the type of tracked entity (default : DOCUMENT). Possible values DOCUMENT, MEDIA
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getPagedReferences: function (id, args) {
-
-            var defaults = {
-                pageSize: 10,
-                pageNumber: 1,
-                entityType: "DOCUMENT"
-            };
-            if (args === undefined) {
-                args = {};
-            }
-
-            //overwrite the defaults if there are any specified
-            var options = Utilities.extend(defaults, args);
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "trackedReferencesApiBaseUrl",
-                        "GetPagedReferences",
-                        {
-                            id: id,
-                            entityType: options.entityType,
-                            pageNumber: options.pageNumber,
-                            pageSize: options.pageSize,
-                            filterMustBeIsDependency: options.filterMustBeIsDependency
-                        }
-                    )),
-                "Failed to retrieve usages for entity of id " + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.trackedReferencesResource#getPagedDescendantsInReferences
-         * @methodOf umbraco.resources.trackedReferencesResource
-         *
-         * @description
-         * Gets a page list of the child nodes of the current item used in any kind of relation
-         *
-         * ##usage
-         * <pre>
-         * var options = {
-         *      pageSize : 25,
-         *      pageNumber : 1,
-         *      entityType : 'DOCUMENT'
-         *  };
-         * trackedReferencesResource.getPagedDescendantsInReferences(1, options)
-         *    .then(function(data) {
-         *        console.log(data);
-         *    });
-         * </pre>
-         *
-         * @param {int} id Id of the item to query for child nodes used in relation
-         * @param {Object} args optional args object
-         * @param {Int} args.pageSize the pagesize of the returned list (default 25)
-         * @param {Int} args.pageNumber the current page index (default 1)
-         * @param {String} args.entityType the type of tracked entity (default : DOCUMENT). Possible values DOCUMENT, MEDIA
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getPagedDescendantsInReferences: function (id, args) {
-
-            var defaults = {
-                pageSize: 10,
-                pageNumber: 1,
-                entityType: "DOCUMENT"
-            };
-            if (args === undefined) {
-                args = {};
-            }
-
-            //overwrite the defaults if there are any specified
-            var options = Utilities.extend(defaults, args);
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "trackedReferencesApiBaseUrl",
-                        "GetPagedDescendantsInReferences",
-                        {
-                            parentId: id,
-                            entityType: options.entityType,
-                            pageNumber: options.pageNumber,
-                            pageSize: options.pageSize
-                        }
-                    )),
-                "Failed to retrieve usages for descendants of parent with id " + id);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.trackedReferencesResource#getPagedReferencedItems
-         * @methodOf umbraco.resources.trackedReferencesResource
-         *
-         * @description
-         * Checks if any of the items are used in a relation and returns a page list, so you can see which items are being used
-         *
-         * ##usage
-         * <pre>
-         * var ids = [123,3453,2334,2343];
-         * var options = {
-         *      pageSize : 25,
-         *      pageNumber : 1,
-         *      entityType : 'DOCUMENT'
-         *  };
-         *
-         * trackedReferencesResource.getPagedReferencedItems(ids, options)
-         *    .then(function(data) {
-         *        console.log(data);
-         *    });
-         * </pre>
-         *
-         * @param {Array} ids array of the selected items ids to query for references
-         * @param {Object} options optional options object
-         * @param {Int} options.pageSize the pagesize of the returned list (default 25)
-         * @param {Int} options.pageNumber the current page index (default 1)
-         * @param {String} options.entityType the type of tracked entity (default : DOCUMENT). Possible values DOCUMENT, MEDIA
-         * @returns {Promise} resourcePromise object.
-         *
-         */
-        getPagedReferencedItems: function (ids, options) {
-            var query = `entityType=${options.entityType}&pageNumber=${options.pageNumber}&pageSize=${options.pageSize}`;
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "trackedReferencesApiBaseUrl",
-                        "GetPagedReferencedItems",
-                        query),
-                        {
-                            ids: ids,
-                            entityType: options.entityType,
-                            pageNumber: options.pageNumber,
-                            pageSize: options.pageSize
-                        }),
-                "Failed to check for references of nodes with ids " + ids);
-        }
-    }
-}
-
-angular.module('umbraco.resources').factory('trackedReferencesResource', trackedReferencesResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js
deleted file mode 100644
index 73db2c9777..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
-    * @ngdoc service
-    * @name umbraco.resources.treeResource
-    * @description Loads in data for trees
-    **/
-function treeResource($q, $http, umbRequestHelper) {
-
-    /** internal method to get the tree node's children url */
-    function getTreeNodesUrl(node) {
-        if (!node.childNodesUrl) {
-            throw "No childNodesUrl property found on the tree node, cannot load child nodes";
-        }
-        return node.childNodesUrl;
-    }
-
-    /** internal method to get the tree menu url */
-    function getTreeMenuUrl(node) {
-        if (!node.menuUrl) {
-            return null;
-        }
-        return node.menuUrl;
-    }
-
-    //the factory object returned
-    return {
-
-        /** Loads in the data to display the nodes menu */
-        loadMenu: function (node) {
-            var treeMenuUrl = getTreeMenuUrl(node);
-            if (treeMenuUrl !== undefined && treeMenuUrl !== null && treeMenuUrl.length > 0) {
-                return umbRequestHelper.resourcePromise(
-                    $http.get(getTreeMenuUrl(node)),
-                    "Failed to retrieve data for a node's menu " + node.id);
-            } else {
-                return $q.reject({
-                    errorMsg: "No tree menu url defined for node " + node.id
-                });
-            }
-        },
-
-        /** Loads in the data to display the nodes for an application */
-        loadApplication: function (options) {
-
-            if (!options || !options.section) {
-                throw "The object specified for does not contain a 'section' property";
-            }
-
-            if(!options.tree){
-                options.tree = "";
-            }
-            if (!options.isDialog) {
-                options.isDialog = false;
-            }
-
-            //create the query string for the tree request, these are the mandatory options:
-            var query = "application=" + options.section
-                        + "&tree=" + options.tree
-                        + "&use=" + (options.isDialog ? "dialog" : "main");
-
-            //the options can contain extra query string parameters
-            if (options.queryString) {
-                query += "&" + options.queryString;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "treeApplicationApiBaseUrl",
-                        "GetApplicationTrees",
-                            query)),
-                'Failed to retrieve data for application tree ' + options.section);
-        },
-
-        /** Loads in the data to display the child nodes for a given node */
-        loadNodes: function (options) {
-
-            if (!options || !options.node) {
-                throw "The options parameter object does not contain the required properties: 'node'";
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(getTreeNodesUrl(options.node)),
-                'Failed to retrieve data for child nodes ' + options.node.nodeId);
-        }
-    };
-}
-
-angular.module('umbraco.resources').factory('treeResource', treeResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/twofactorlogin.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/twofactorlogin.resource.js
deleted file mode 100644
index 8ed308812e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/twofactorlogin.resource.js
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.twoFactorLoginResource
- * @function
- *
- * @description
- * Used by the users section to get users 2FA information
- */
-(function () {
-    'use strict';
-
-    function twoFactorLoginResource($http, umbRequestHelper) {
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.twoFactorLoginResource#viewPathForProviderName
-         * @methodOf umbraco.resources.twoFactorLoginResource
-         *
-         * @description
-         * Gets the view path for the specified two factor provider
-         *
-         * ##usage
-         * <pre>
-         * twoFactorLoginResource.viewPathForProviderName(providerName)
-         *    .then(function(viewPath) {
-         *        alert("It's here");
-         *    });
-         * </pre>
-         *
-         * @returns {Promise} resourcePromise object containing the view path.
-         *
-         */
-        function viewPathForProviderName(providerName) {
-
-          return umbRequestHelper.resourcePromise(
-            $http.get(
-              umbRequestHelper.getApiUrl(
-                "twoFactorLoginApiBaseUrl",
-                "ViewPathForProviderName",
-                {providerName : providerName  })),
-            "Failed to retrieve data");
-        }
-
-      /**
-       * @ngdoc method
-       * @name umbraco.resources.twoFactorLoginResource#get2FAProvidersForUser
-       * @methodOf umbraco.resources.twoFactorLoginResource
-       *
-       * @description
-       * Gets the 2fa provider names that is available
-       *
-       * ##usage
-       * <pre>
-       * twoFactorLoginResource.get2FAProvidersForUser(userKey)
-       *    .then(function(providers) {
-       *        alert("It's here");
-       *    });
-       * </pre>
-       *
-       * @returns {Promise} resourcePromise object containing the an array of { providerName, isEnabledOnUser} .
-       *
-       */
-        function get2FAProvidersForUser(userId) {
-          return umbRequestHelper.resourcePromise(
-            $http.get(
-              umbRequestHelper.getApiUrl(
-                "twoFactorLoginApiBaseUrl",
-                "get2FAProvidersForUser",
-                { userId: userId  })),
-            "Failed to retrieve data");
-        }
-
-        function setupInfo(providerName) {
-          return umbRequestHelper.resourcePromise(
-            $http.get(
-              umbRequestHelper.getApiUrl(
-                "twoFactorLoginApiBaseUrl",
-                "setupInfo",
-                { providerName: providerName  })),
-            "Failed to retrieve data");
-        }
-
-        function validateAndSave(providerName, secret, code) {
-          return umbRequestHelper.resourcePromise(
-            $http.post(
-              umbRequestHelper.getApiUrl(
-                "twoFactorLoginApiBaseUrl",
-                "validateAndSave",
-                {
-                  providerName: providerName,
-                  secret: secret,
-                  code: code
-                })),
-            "Failed to retrieve data");
-        }
-        function disable(providerName, userKey) {
-          return umbRequestHelper.resourcePromise(
-            $http.post(
-              umbRequestHelper.getApiUrl(
-                "twoFactorLoginApiBaseUrl",
-                "disable",
-                {
-                  providerName: providerName,
-                  userKey: userKey
-                })),
-            "Failed to retrieve data");
-        }
-        function disableWithCode(providerName, code) {
-          return umbRequestHelper.resourcePromise(
-            $http.post(
-              umbRequestHelper.getApiUrl(
-                "twoFactorLoginApiBaseUrl",
-                "disableWithCode",
-                {
-                  providerName: providerName,
-                  code: code
-                })),
-            "Failed to retrieve data");
-        }
-
-        var resource = {
-          viewPathForProviderName: viewPathForProviderName,
-          get2FAProvidersForUser:get2FAProvidersForUser,
-          setupInfo:setupInfo,
-          validateAndSave:validateAndSave,
-          disable: disable,
-          disableWithCode: disableWithCode
-        };
-
-        return resource;
-
-    }
-
-    angular.module('umbraco.resources').factory('twoFactorLoginResource', twoFactorLoginResource);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/usergroups.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/usergroups.resource.js
deleted file mode 100644
index a0901ce0db..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/usergroups.resource.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.usersResource
- * @function
- *
- * @description
- * Used by the users section to get users and send requests to create, invite, delete, etc. users.
- */
-(function () {
-    'use strict';
-
-    function userGroupsResource($http, umbRequestHelper, $q, umbDataFormatter) {
-
-        function getUserGroupScaffold() {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "userGroupsApiBaseUrl",
-                        "GetEmptyUserGroup")),
-                'Failed to get the user group scaffold');
-        }
-
-        function saveUserGroup(userGroup, isNew) {
-            if (!userGroup) {
-                throw "userGroup not specified";
-            }
-
-            //need to convert the user data into the correctly formatted save data - it is *not* the same and we don't want to over-post
-            var formattedSaveData = umbDataFormatter.formatUserGroupPostData(userGroup, "save" + (isNew ? "New" : ""));
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "userGroupsApiBaseUrl",
-                        "PostSaveUserGroup"),
-                    formattedSaveData),
-                "Failed to save user group");
-        }
-
-        function getUserGroup(id) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "userGroupsApiBaseUrl",
-                        "GetUserGroup",
-                        { id: id })),
-                "Failed to retrieve data for user group " + id);
-
-        }
-
-        function getUserGroups(args) {
-
-            if (!args) {
-                args = { onlyCurrentUserGroups: true };
-            }
-            if (args.onlyCurrentUserGroups === undefined || args.onlyCurrentUserGroups === null) {
-                args.onlyCurrentUserGroups = true;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "userGroupsApiBaseUrl",
-                        "GetUserGroups",
-                        args)),
-                "Failed to retrieve user groups");
-        }
-
-        function deleteUserGroups(userGroupIds) {
-            var query = "userGroupIds=" + userGroupIds.join("&userGroupIds=");
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "userGroupsApiBaseUrl",
-                        "PostDeleteUserGroups",
-                        query)),
-                'Failed to delete user groups');
-        }
-
-        var resource = {
-            saveUserGroup: saveUserGroup,
-            getUserGroup: getUserGroup,
-            getUserGroups: getUserGroups,
-            getUserGroupScaffold: getUserGroupScaffold,
-            deleteUserGroups: deleteUserGroups
-        };
-
-        return resource;
-
-    }
-
-    angular.module('umbraco.resources').factory('userGroupsResource', userGroupsResource);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js
deleted file mode 100644
index 0b69bec3f5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js
+++ /dev/null
@@ -1,531 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.resources.usersResource
- * @function
- *
- * @description
- * Used by the users section to get users and send requests to create, invite, disable, etc. users.
- */
-(function () {
-    'use strict';
-
-    function usersResource($http, umbRequestHelper, $q, umbDataFormatter) {
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.usersResource#clearAvatar
-          * @methodOf umbraco.resources.usersResource
-          *
-          * @description
-          * Deletes the user avatar
-          *
-          * ##usage
-          * <pre>
-          * usersResource.clearAvatar(1)
-          *    .then(function() {
-          *        alert("avatar is gone");
-          *    });
-          * </pre>
-          * 
-          * @param {Array} id id of user.
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        function clearAvatar(userId) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "userApiBaseUrl",
-                        "PostClearAvatar",
-                        { id: userId })),
-                'Failed to clear the user avatar ' + userId);
-        }
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.usersResource#disableUsers
-          * @methodOf umbraco.resources.usersResource
-          *
-          * @description
-          * Disables a collection of users
-          *
-          * ##usage
-          * <pre>
-          * usersResource.disableUsers([1, 2, 3, 4, 5])
-          *    .then(function() {
-          *        alert("users were disabled");
-          *    });
-          * </pre>
-          * 
-          * @param {Array} ids ids of users to disable.
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        function disableUsers(userIds) {
-            if (!userIds) {
-                throw "userIds not specified";
-            }
-
-            //we need to create a custom query string for the usergroup array, so create it now and we can append the user groups if needed
-            var qry = "userIds=" + userIds.join("&userIds=");
-
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "userApiBaseUrl",
-                        "PostDisableUsers", qry)),
-                'Failed to disable the users ' + userIds.join(","));
-        }
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.usersResource#enableUsers
-          * @methodOf umbraco.resources.usersResource
-          *
-          * @description
-          * Enables a collection of users
-          *
-          * ##usage
-          * <pre>
-          * usersResource.enableUsers([1, 2, 3, 4, 5])
-          *    .then(function() {
-          *        alert("users were enabled");
-          *    });
-          * </pre>
-          * 
-          * @param {Array} ids ids of users to enable.
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        function enableUsers(userIds) {
-            if (!userIds) {
-                throw "userIds not specified";
-            }
-
-            //we need to create a custom query string for the usergroup array, so create it now and we can append the user groups if needed
-            var qry = "userIds=" + userIds.join("&userIds=");
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "userApiBaseUrl",
-                        "PostEnableUsers", qry)),
-                'Failed to enable the users ' + userIds.join(","));
-        }
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.usersResource#unlockUsers
-          * @methodOf umbraco.resources.usersResource
-          *
-          * @description
-          * Unlocks a collection of users
-          *
-          * ##usage
-          * <pre>
-          * usersResource.unlockUsers([1, 2, 3, 4, 5])
-          *    .then(function() {
-          *        alert("users were unlocked");
-          *    });
-          * </pre>
-          * 
-          * @param {Array} ids ids of users to unlock.
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        function unlockUsers(userIds) {
-            if (!userIds) {
-                throw "userIds not specified";
-            }
-
-            //we need to create a custom query string for the usergroup array, so create it now and we can append the user groups if needed
-            var qry = "userIds=" + userIds.join("&userIds=");
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "userApiBaseUrl",
-                        "PostUnlockUsers", qry)),
-                'Failed to enable the users ' + userIds.join(","));
-        }
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.usersResource#setUserGroupsOnUsers
-          * @methodOf umbraco.resources.usersResource
-          *
-          * @description
-          * Overwrites the existing user groups on a collection of users
-          *
-          * ##usage
-          * <pre>
-          * usersResource.setUserGroupsOnUsers(['admin', 'editor'], [1, 2, 3, 4, 5])
-          *    .then(function() {
-          *        alert("users were updated");
-          *    });
-          * </pre>
-          * 
-          * @param {Array} userGroupAliases aliases of user groups.
-          * @param {Array} ids ids of users to update.
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        function setUserGroupsOnUsers(userGroups, userIds) {
-            var userGroupAliases = userGroups.map(function(o) { return o.alias; });
-            var query = "userGroupAliases=" + userGroupAliases.join("&userGroupAliases=") + "&userIds=" + userIds.join("&userIds=");
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "userApiBaseUrl",
-                        "PostSetUserGroupsOnUsers",
-                        query)),
-                'Failed to set user groups ' + userGroupAliases.join(",") + ' on the users ' + userIds.join(","));
-        }
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.usersResource#getPagedResults
-          * @methodOf umbraco.resources.usersResource
-          *
-          * @description
-          * Get users
-          *
-          * ##usage
-          * <pre>
-          * usersResource.getPagedResults({pageSize: 10, pageNumber: 2})
-          *    .then(function(data) {
-          *        var users = data.items;
-          *        alert('they are here!');
-          *    });
-          * </pre>
-          * 
-          * @param {Object} options optional options object
-          * @param {Int} options.pageSize if paging data, number of users per page, default = 25
-          * @param {Int} options.pageNumber if paging data, current page index, default = 1
-          * @param {String} options.filter if provided, query will only return those with names matching the filter
-          * @param {String} options.orderDirection can be `Ascending` or `Descending` - Default: `Ascending`
-          * @param {String} options.orderBy property to order users by, default: `Username`
-          * @param {Array} options.userGroups property to filter users by user group
-          * @param {Array} options.userStates property to filter users by user state
-          * @returns {Promise} resourcePromise object containing an array of content items.
-          *
-          */
-        function getPagedResults(options) {
-            var defaults = {
-                pageSize: 25,
-                pageNumber: 1,
-                filter: '',
-                orderDirection: "Ascending",
-                orderBy: "Username",
-                userGroups: [],
-                userStates: []
-            };
-            if (options === undefined) {
-                options = {};
-            }
-            //overwrite the defaults if there are any specified
-            Utilities.extend(defaults, options);
-            //now copy back to the options we will use
-            options = defaults;
-            //change asc/desct
-            if (options.orderDirection === "asc") {
-                options.orderDirection = "Ascending";
-            }
-            else if (options.orderDirection === "desc") {
-                options.orderDirection = "Descending";
-            }
-
-            var params = {
-                pageNumber: options.pageNumber,
-                pageSize: options.pageSize,
-                orderBy: options.orderBy,
-                orderDirection: options.orderDirection,
-                filter: options.filter
-            };
-            //we need to create a custom query string for the usergroup array, so create it now and we can append the user groups if needed
-            var qry = umbRequestHelper.dictionaryToQueryString(params);
-            if (options.userGroups.length > 0) {
-                //we need to create a custom query string for an array
-                qry += "&userGroups=" + options.userGroups.join("&userGroups=");
-            }
-            if (options.userStates.length > 0) {
-                //we need to create a custom query string for an array
-                qry += "&userStates=" + options.userStates.join("&userStates=");
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "userApiBaseUrl",
-                        "GetPagedUsers",
-                        qry)),
-                'Failed to retrieve users paged result');
-        }
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.usersResource#getUser
-          * @methodOf umbraco.resources.usersResource
-          *
-          * @description
-          * Gets a user
-          *
-          * ##usage
-          * <pre>
-          * usersResource.getUser(1)
-          *    .then(function(user) {
-          *        alert("It's here");
-          *    });
-          * </pre>
-          * 
-          * @param {Int} userId user id.
-          * @returns {Promise} resourcePromise object containing the user.
-          *
-          */
-        function getUser(userId) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "userApiBaseUrl",
-                        "GetById",
-                        { id: userId })),
-                "Failed to retrieve data for user " + userId);
-        }
-
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.usersResource#getUsers
-          * @methodOf umbraco.resources.usersResource
-          *
-          * @description
-          * Gets users from ids
-          *
-          * ##usage
-          * <pre>
-          * usersResource.getUsers([1,2,3])
-          *    .then(function(data) {
-          *        alert("It's here");
-          *    });
-          * </pre>
-          * 
-          * @param {Array} userIds user ids.
-          * @returns {Promise} resourcePromise object containing the users array.
-          *
-          */
-        function getUsers(userIds) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "userApiBaseUrl",
-                        "GetByIds",
-                        { ids: userIds })),
-                "Failed to retrieve data for users " + userIds);
-        }
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.usersResource#createUser
-          * @methodOf umbraco.resources.usersResource
-          *
-          * @description
-          * Creates a new user
-          *
-          * ##usage
-          * <pre>
-          * usersResource.createUser(user)
-          *    .then(function(newUser) {
-          *        alert("It's here");
-          *    });
-          * </pre>
-          * 
-          * @param {Object} user user to create
-          * @returns {Promise} resourcePromise object containing the new user.
-          *
-          */
-        function createUser(user) {
-            if (!user) {
-                throw "user not specified";
-            }
-
-            //need to convert the user data into the correctly formatted save data - it is *not* the same and we don't want to over-post
-            var formattedSaveData = umbDataFormatter.formatUserPostData(user);
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "userApiBaseUrl",
-                        "PostCreateUser"),
-                    formattedSaveData),
-                "Failed to save user");
-        }
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.usersResource#inviteUser
-          * @methodOf umbraco.resources.usersResource
-          *
-          * @description
-          * Creates and sends an email invitation to a new user
-          *
-          * ##usage
-          * <pre>
-          * usersResource.inviteUser(user)
-          *    .then(function(newUser) {
-          *        alert("It's here");
-          *    });
-          * </pre>
-          * 
-          * @param {Object} user user to invite
-          * @returns {Promise} resourcePromise object containing the new user.
-          *
-          */
-        function inviteUser(user) {
-            if (!user) {
-                throw "user not specified";
-            }
-
-            //need to convert the user data into the correctly formatted save data - it is *not* the same and we don't want to over-post
-            var formattedSaveData = umbDataFormatter.formatUserPostData(user);
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "userApiBaseUrl",
-                        "PostInviteUser"),
-                    formattedSaveData),
-                "Failed to invite user");
-        }
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.usersResource#saveUser
-          * @methodOf umbraco.resources.usersResource
-          *
-          * @description
-          * Saves a user
-          *
-          * ##usage
-          * <pre>
-          * usersResource.saveUser(user)
-          *    .then(function(updatedUser) {
-          *        alert("It's here");
-          *    });
-          * </pre>
-          * 
-          * @param {Object} user object to save
-          * @returns {Promise} resourcePromise object containing the updated user.
-          *
-          */
-        function saveUser(user) {
-            if (!user) {
-                throw "user not specified";
-            }
-
-            //need to convert the user data into the correctly formatted save data - it is *not* the same and we don't want to over-post
-            var formattedSaveData = umbDataFormatter.formatUserPostData(user);
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "userApiBaseUrl",
-                        "PostSaveUser"),
-                    formattedSaveData),
-                "Failed to save user");
-        }
-        
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.usersResource#changePassword
-          * @methodOf umbraco.resources.usersResource
-          *
-          * @description
-          * Changes a user's password
-          *
-          * ##usage
-          * <pre>
-          * usersResource.changePassword(changePasswordModel)
-          *    .then(function() {
-          *        // password changed
-          *    });
-          * </pre>
-          * 
-          * @param {Object} model object to save
-          * @returns {Promise} resourcePromise object containing the updated user.
-          *
-          */        
-        function changePassword(changePasswordModel) {
-            if (!changePasswordModel) {
-                throw "password model not specified";
-            }
-
-            //need to convert the password data into the correctly formatted save data - it is *not* the same and we don't want to over-post
-            var formattedPasswordData = umbDataFormatter.formatChangePasswordModel(changePasswordModel);
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "userApiBaseUrl",
-                        "PostChangePassword"),
-                    formattedPasswordData),
-                "Failed to save user");
-        }        
-
-        /**
-          * @ngdoc method
-          * @name umbraco.resources.usersResource#deleteNonLoggedInUser
-          * @methodOf umbraco.resources.usersResource
-          *
-          * @description
-          * Deletes a user that hasn't already logged in (and hence we know has made no content updates that would create related records)
-          *
-          * ##usage
-          * <pre>
-          * usersResource.deleteNonLoggedInUser(1)
-          *    .then(function() {
-          *        alert("user was deleted");
-          *    });
-          * </pre>
-          * 
-          * @param {Int} userId user id.
-          * @returns {Promise} resourcePromise object.
-          *
-          */
-        function deleteNonLoggedInUser(userId) {
-
-            return umbRequestHelper.resourcePromise(
-                $http.post(
-                    umbRequestHelper.getApiUrl(
-                        "userApiBaseUrl",
-                        "PostDeleteNonLoggedInUser", { id: userId })),
-                'Failed to delete the user ' + userId);
-        }
-
-
-        var resource = {
-            disableUsers: disableUsers,
-            enableUsers: enableUsers,
-            unlockUsers: unlockUsers,
-            setUserGroupsOnUsers: setUserGroupsOnUsers,
-            getPagedResults: getPagedResults,
-            getUser: getUser,
-            getUsers: getUsers,
-            createUser: createUser,
-            inviteUser: inviteUser,
-            saveUser: saveUser,
-            changePassword: changePassword,
-            deleteNonLoggedInUser: deleteNonLoggedInUser,
-            clearAvatar: clearAvatar
-        };
-
-        return resource;
-
-    }
-
-    angular.module('umbraco.resources').factory('usersResource', usersResource);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/webhooks.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/webhooks.resource.js
deleted file mode 100644
index 3611e67de9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/resources/webhooks.resource.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function webhooksResource($q, $http, umbRequestHelper) {
-  return {
-    getByKey(key) {
-      return umbRequestHelper.resourcePromise(
-        $http.get(umbRequestHelper.getApiUrl('webhooksApiBaseUrl', 'GetByKey', {key})),
-        'Failed to get webhooks'
-      );
-    },
-    getAll(pageNumber, pageSize) {
-      return umbRequestHelper.resourcePromise(
-        $http.get(umbRequestHelper.getApiUrl('webhooksApiBaseUrl', 'GetAll', {pageNumber, pageSize})),
-        'Failed to get webhooks'
-      );
-    },
-    create(webhook) {
-      return umbRequestHelper.resourcePromise(
-        $http.post(umbRequestHelper.getApiUrl('webhooksApiBaseUrl', 'Create'), webhook),
-        `Failed to save webhook id ${webhook.id}`
-      );
-    },
-    update(webhook) {
-      return umbRequestHelper.resourcePromise(
-        $http.put(umbRequestHelper.getApiUrl('webhooksApiBaseUrl', 'Update'), webhook),
-        `Failed to save webhook id ${webhook.id}`
-      );
-    },
-    delete(key) {
-      return umbRequestHelper.resourcePromise(
-        $http.delete(umbRequestHelper.getApiUrl('webhooksApiBaseUrl', 'Delete', {key})),
-        `Failed to delete webhook id ${key}`
-      );
-    },
-    getAllEvents() {
-      return umbRequestHelper.resourcePromise(
-        $http.get(umbRequestHelper.getApiUrl('webhooksApiBaseUrl', 'GetEvents')),
-        'Failed to get events'
-      );
-    },
-    getLogs(skip, take) {
-      return umbRequestHelper.resourcePromise(
-        $http.get(umbRequestHelper.getApiUrl('webhooksApiBaseUrl', 'GetLogs', {skip, take})),
-        'Failed to get logs'
-      );
-    }
-  };
-}
-angular.module('umbraco.resources').factory('webhooksResource', webhooksResource);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/_module.js b/src/Umbraco.Web.UI.Client/src/common/services/_module.js
deleted file mode 100644
index 120f267c59..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/_module.js
+++ /dev/null
@@ -1 +0,0 @@
-angular.module("umbraco.services", ["umbraco.interceptors", "umbraco.resources"]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
deleted file mode 100644
index c4fd431a12..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
+++ /dev/null
@@ -1,258 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.angularHelper
- * @function
- *
- * @description
- * Some angular helper/extension methods
- */
-function angularHelper($q) {
-
-    var requiredFormProps = ["$error", "$name", "$dirty", "$pristine", "$valid", "$submitted", "$pending"];
-
-    function collectAllFormErrorsRecursively(formCtrl, allErrors) {
-        // skip if the control is already added to the array
-        if (allErrors.indexOf(formCtrl) !== -1) {
-            return;
-        }
-
-        // loop over the error dictionary (see https://docs.angularjs.org/api/ng/type/form.FormController#$error)
-        var keys = Object.keys(formCtrl.$error);
-        if (keys.length === 0) {
-            return;
-        }
-        keys.forEach(validationKey => {
-            var ctrls = formCtrl.$error[validationKey];
-            ctrls.forEach(ctrl => {
-                if (!ctrl) {
-                    // this happens when $setValidity('err', true) is called on a form controller without specifying the 3rd parameter for the control/form
-                    // which just means that this is an error on the formCtrl itself
-                    allErrors.push(formCtrl); // add the error
-                }
-                else if (isForm(ctrl)) {
-                    // sometimes the control in error is the same form so we cannot recurse else we'll cause an infinite loop
-                    // and in this case it means the error is assigned directly to the form, not a control
-                    if (ctrl === formCtrl) {
-                        allErrors.push(ctrl); // add the error
-                        return;
-                    }
-
-                    // recurse with the sub form
-                    collectAllFormErrorsRecursively(ctrl, allErrors);
-                }
-                else {
-                    // it's a normal control
-                    allErrors.push(ctrl); // add the error
-                }
-            });
-        });
-    }
-
-    function isForm(obj) {
-
-        // a method to check that the collection of object prop names contains the property name expected
-        function allPropertiesExist(objectPropNames) {
-            //ensure that every required property name exists on the current object
-            return _.every(requiredFormProps, function (item) {
-                return _.contains(objectPropNames, item);
-            });
-        }
-
-        //get the keys of the property names for the current object
-        var props = _.keys(obj);
-        //if the length isn't correct, try the next prop
-        if (props.length < requiredFormProps.length) {
-            return false;
-        }
-
-        //ensure that every required property name exists on the current scope property
-        return allPropertiesExist(props);
-    }
-
-    return {
-
-        countAllFormErrors: function (formCtrl) {
-            var allErrors = [];
-            collectAllFormErrorsRecursively(formCtrl, allErrors);
-            return allErrors.length;
-        },
-
-        /**
-         * Will traverse up the $scope chain to all ancestors until the predicate matches for the current scope or until it's at the root.
-         * @param {any} scope
-         * @param {any} predicate
-         */
-        traverseScopeChain: function (scope, predicate) {
-            var s = scope.$parent;
-            while (s) {
-                var result = predicate(s);
-                if (result === true) {
-                    return s;
-                }
-                s = s.$parent;
-            }
-            return null;
-        },
-
-        /**
-         * Method used to re-run the $parsers for a given ngModel
-         * @param {} scope
-         * @param {} ngModel
-         * @returns {}
-         */
-        revalidateNgModel: function (scope, ngModel) {
-            this.safeApply(scope, function() {
-                ngModel.$parsers.forEach(function (parser) {
-                    parser(ngModel.$viewValue);
-                });
-            });
-        },
-
-        /**
-         * Execute a list of promises sequentially. Unlike $q.all which executes all promises at once, this will execute them in sequence.
-         * @param {} promises
-         * @returns {}
-         */
-        executeSequentialPromises: function (promises) {
-
-            //this is sequential promise chaining, it's not pretty but we need to do it this way.
-            //$q.all doesn't execute promises in sequence but that's what we want to do here.
-
-            if (!Utilities.isArray(promises)) {
-                throw "promises must be an array";
-            }
-
-            //now execute them in sequence... sorry there's no other good way to do it with angular promises
-            var j = 0;
-            function pExec(promise) {
-                j++;
-                return promise.then(function (data) {
-                    if (j === promises.length) {
-                        return $q.when(data); //exit
-                    }
-                    else {
-                        return pExec(promises[j]); //recurse
-                    }
-                });
-            }
-            if (promises.length > 0) {
-                return pExec(promises[0]); //start the promise chain
-            }
-            else {
-                return $q.when(true); // just exit, no promises to execute
-            }
-        },
-
-        /**
-         * @ngdoc function
-         * @name safeApply
-         * @methodOf umbraco.services.angularHelper
-         * @function
-         *
-         * @description
-         * This checks if a digest/apply is already occuring, if not it will force an apply call
-         */
-        safeApply: function (scope, fn) {
-            if (scope.$$phase || (scope.$root && scope.$root.$$phase)) {
-                if (Utilities.isFunction(fn)) {
-                    fn();
-                }
-            }
-            else {
-                if (Utilities.isFunction(fn)) {
-                    scope.$apply(fn);
-                }
-                else {
-                    scope.$apply();
-                }
-            }
-        },
-
-
-        isForm: isForm,
-
-        /**
-         * @ngdoc function
-         * @name getCurrentForm
-         * @methodOf umbraco.services.angularHelper
-         * @function
-         *
-         * @description
-         * Returns the current form object applied to the scope or null if one is not found
-         */
-        getCurrentForm: function (scope) {
-
-            //NOTE: There isn't a way in angular to get a reference to the current form object since the form object
-            // is just defined as a property of the scope when it is named but you'll always need to know the name which
-            // isn't very convenient. If we want to watch for validation changes we need to get a form reference.
-            // The way that we detect the form object is a bit hackerific in that we detect all of the required properties
-            // that exist on a form object.
-            //
-            //The other way to do it in a directive is to require "^form", but in a controller the only other way to do it
-            // is to inject the $element object and use: $element.inheritedData('$formController');
-
-            var form = null;
-
-            for (var p in scope) {
-                if (_.isObject(scope[p]) && p !== "this" && p.substr(0, 1) !== "$") {
-                    if (this.isForm(scope[p])) {
-                        form = scope[p];
-                        break;
-                    }
-                }
-            }
-
-            return form;
-        },
-
-        /**
-         * @ngdoc function
-         * @name validateHasForm
-         * @methodOf umbraco.services.angularHelper
-         * @function
-         *
-         * @description
-         * This will validate that the current scope has an assigned form object, if it doesn't an exception is thrown, if
-         * it does we return the form object.
-         */
-        getRequiredCurrentForm: function (scope) {
-            var currentForm = this.getCurrentForm(scope);
-            if (!currentForm || !currentForm.$name) {
-                throw "The current scope requires a current form object (or ng-form) with a name assigned to it";
-            }
-            return currentForm;
-        },
-
-        /**
-         * @ngdoc function
-         * @name getNullForm
-         * @methodOf umbraco.services.angularHelper
-         * @function
-         *
-         * @description
-         * Returns a null angular FormController, mostly for use in unit tests
-         *      NOTE: This is actually the same construct as angular uses internally for creating a null form but they don't expose
-         *          any of this publicly to us, so we need to create our own.
-         *      NOTE: The properties has been added to the null form because we use them to get a form on a scope.
-         *
-         * @param {string} formName The form name to assign
-         */
-        getNullForm: function (formName) {
-            return {
-                $error: {},
-                $dirty: false,
-                $pristine: true,
-                $valid: true,
-                $submitted: false,
-                $pending: undefined,
-                $addControl: Utilities.noop,
-                $removeControl: Utilities.noop,
-                $setValidity: Utilities.noop,
-                $setDirty: Utilities.noop,
-                $setPristine: Utilities.noop,
-                $name: formName
-            };
-        }
-    };
-}
-angular.module('umbraco.services').factory('angularHelper', angularHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js b/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js
deleted file mode 100644
index 47ed1f7749..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js
+++ /dev/null
@@ -1,293 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.appState
- * @function
- *
- * @description
- * Tracks the various application state variables when working in the back office, raises events when state changes.
- *
- * ##Samples
- *
- * ####Subscribe to global state changes:
- * 
- * <pre>
-  *    scope.showTree = appState.getGlobalState("showNavigation");
-  *
-  *    eventsService.on("appState.globalState.changed", function (e, args) {
-  *               if (args.key === "showNavigation") {
-  *                   scope.showTree = args.value;
-  *               }
-  *           });  
-  * </pre>
- *
- * ####Subscribe to section-state changes
- *
- * <pre>
- *    scope.currentSection = appState.getSectionState("currentSection");
- *
- *    eventsService.on("appState.sectionState.changed", function (e, args) {
- *               if (args.key === "currentSection") {
- *                   scope.currentSection = args.value;
- *               }
- *           });  
- * </pre>
- */
-function appState(eventsService) {
-    
-    //Define all variables here - we are never returning this objects so they cannot be publicly mutable
-    // changed, we only expose methods to interact with the values.
-
-    var globalState = {
-        showNavigation: null,
-        touchDevice: null,
-        showTray: null,
-        stickyNavigation: null,
-        navMode: null,
-        isReady: null,
-        isTablet: null
-    };
-    
-    var sectionState = {
-        //The currently active section
-        currentSection: null,
-        showSearchResults: null
-    };
-
-    var treeState = {
-        //The currently selected node
-        selectedNode: null,
-        //The currently loaded root node reference - depending on the section loaded this could be a section root or a normal root.
-        //We keep this reference so we can lookup nodes to interact with in the UI via the tree service
-        currentRootNode: null
-    };
-    
-    var menuState = {
-        //this list of menu items to display
-        menuActions: null,
-        //the title to display in the context menu dialog
-        dialogTitle: null,
-        //The tree node that the ctx menu is launched for
-        currentNode: null,
-        //Whether the menu's dialog is being shown or not
-        showMenuDialog: null,
-        //Whether the menu's dialog can be hidden or not
-        allowHideMenuDialog: true,
-        // The dialogs template
-        dialogTemplateUrl: null,
-        //Whether the context menu is being shown or not
-        showMenu: null
-    };
-
-    var searchState = {
-        //Whether the search is being shown or not
-        show: null
-    };
-
-    var drawerState = {
-        //this view to show
-        view: null,
-        // bind custom values to the drawer
-        model: null,
-        //Whether the drawer is being shown or not
-        showDrawer: null
-    };
-
-    /** function to validate and set the state on a state object */
-    function setState(stateObj, key, value, stateObjName) {
-        if (!_.has(stateObj, key)) {
-            throw "The variable " + key + " does not exist in " + stateObjName;
-        }
-        var changed = stateObj[key] !== value;
-        stateObj[key] = value;
-        if (changed) {
-            eventsService.emit("appState." + stateObjName + ".changed", { key: key, value: value });
-        }
-    }
-    
-    /** function to validate and set the state on a state object */
-    function getState(stateObj, key, stateObjName) {
-        if (!_.has(stateObj, key)) {
-            throw "The variable " + key + " does not exist in " + stateObjName;
-        }
-        return stateObj[key];
-    }
-
-    return {
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#getGlobalState
-         * @methodOf umbraco.services.appState
-         * @function
-         *
-         * @description
-         * Returns the current global state value by key - we do not return an object reference here - we do NOT want this
-         * to be publicly mutable and allow setting arbitrary values
-         *
-         */
-        getGlobalState: function (key) {
-            return getState(globalState, key, "globalState");
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#setGlobalState
-         * @methodOf umbraco.services.appState
-         * @function
-         *
-         * @description
-         * Sets a global state value by key
-         *
-         */
-        setGlobalState: function (key, value) {
-            setState(globalState, key, value, "globalState");
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#getSectionState
-         * @methodOf umbraco.services.appState
-         * @function
-         *
-         * @description
-         * Returns the current section state value by key - we do not return an object here - we do NOT want this
-         * to be publicly mutable and allow setting arbitrary values
-         *
-         */
-        getSectionState: function (key) {
-            return getState(sectionState, key, "sectionState");            
-        },
-        
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#setSectionState
-         * @methodOf umbraco.services.appState
-         * @function
-         *
-         * @description
-         * Sets a section state value by key
-         *
-         */
-        setSectionState: function(key, value) {
-            setState(sectionState, key, value, "sectionState");
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#getTreeState
-         * @methodOf umbraco.services.appState
-         * @function
-         *
-         * @description
-         * Returns the current tree state value by key - we do not return an object here - we do NOT want this
-         * to be publicly mutable and allow setting arbitrary values
-         *
-         */
-        getTreeState: function (key) {
-            return getState(treeState, key, "treeState");
-        },
-        
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#setTreeState
-         * @methodOf umbraco.services.appState
-         * @function
-         *
-         * @description
-         * Sets a section state value by key
-         *
-         */
-        setTreeState: function (key, value) {
-            setState(treeState, key, value, "treeState");
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#getMenuState
-         * @methodOf umbraco.services.appState
-         * @function
-         *
-         * @description
-         * Returns the current menu state value by key - we do not return an object here - we do NOT want this
-         * to be publicly mutable and allow setting arbitrary values
-         *
-         */
-        getMenuState: function (key) {
-            return getState(menuState, key, "menuState");
-        },
-        
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#setMenuState
-         * @methodOf umbraco.services.appState
-         * @function
-         *
-         * @description
-         * Sets a section state value by key
-         *
-         */
-        setMenuState: function (key, value) {
-            setState(menuState, key, value, "menuState");
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#getSearchState
-         * @methodOf umbraco.services.appState
-         * @function
-         *
-         * @description
-         * Returns the current search state value by key - we do not return an object here - we do NOT want this
-         * to be publicly mutable and allow setting arbitrary values
-         *
-         */
-        getSearchState: function (key) {
-            return getState(searchState, key, "searchState");
-        },
-        
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#setSearchState
-         * @methodOf umbraco.services.appState
-         * @function
-         *
-         * @description
-         * Sets a section state value by key
-         *
-         */
-        setSearchState: function (key, value) {
-            setState(searchState, key, value, "searchState");
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#getDrawerState
-         * @methodOf umbraco.services.appState
-         * @function
-         *
-         * @description
-         * Returns the current drawer state value by key - we do not return an object here - we do NOT want this
-         * to be publicly mutable and allow setting arbitrary values
-         *
-         */
-        getDrawerState: function (key) {
-            return getState(drawerState, key, "drawerState");
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#setDrawerState
-         * @methodOf umbraco.services.appState
-         * @function
-         *
-         * @description
-         * Sets a drawer state value by key
-         *
-         */
-        setDrawerState: function (key, value) {
-            setState(drawerState, key, value, "drawerState");
-        }
-
-    };
-}
-angular.module('umbraco.services').factory('appState', appState);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
deleted file mode 100644
index 8149e45ee8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
+++ /dev/null
@@ -1,346 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.assetsService
- *
- * @requires $q
- * @requires angularHelper
- *
- * @description
- * Promise-based utillity service to lazy-load client-side dependencies inside angular controllers.
- *
- * ##usage
- * To use, simply inject the assetsService into any controller that needs it, and make
- * sure the umbraco.services module is accesible - which it should be by default.
- *
- * <pre>
- *      angular.module("umbraco").controller("my.controller". function(assetsService){
- *          assetsService.load(["script.js", "styles.css"], $scope).then(function(){
- *                 //this code executes when the dependencies are done loading
- *          });
- *      });
- * </pre>
- *
- * You can also load individual files, which gives you greater control over what attibutes are passed to the file, as well as timeout
- *
- * <pre>
- *      angular.module("umbraco").controller("my.controller". function(assetsService){
- *          assetsService.loadJs("script.js", $scope, {charset: 'utf-8'}, 10000 }).then(function(){
- *                 //this code executes when the script is done loading
- *          });
- *      });
- * </pre>
- *
- * For these cases, there are 2 individual methods, one for javascript, and one for stylesheets:
- *
- * <pre>
- *      angular.module("umbraco").controller("my.controller". function(assetsService){
- *          assetsService.loadCss("stye.css", $scope, {media: 'print'}, 10000 }).then(function(){
- *                 //loadcss cannot determine when the css is done loading, so this will trigger instantly
- *          });
- *      });
- * </pre>
- */
-angular.module('umbraco.services')
-    .factory('assetsService', function ($q, $log, angularHelper, umbRequestHelper, $rootScope, $http, userService, javascriptLibraryResource) {
-
-        var initAssetsLoaded = false;
-
-        function appendRnd(url) {
-            //if we don't have a global umbraco obj yet, the app is bootstrapping
-            if (!Umbraco.Sys.ServerVariables.application) {
-                return url;
-            }
-
-            var rnd = Umbraco.Sys.ServerVariables.application.cacheBuster;
-            var _op = (url.indexOf("?") > 0) ? "&" : "?";
-            url = url + _op + "umb__rnd=" + rnd;
-            return url;
-        };
-
-        function convertVirtualPath(path) {
-            //make this work for virtual paths
-            if (path.startsWith("~/")) {
-                path = umbRequestHelper.convertVirtualToAbsolutePath(path);
-            }
-            return path;
-        }
-
-        function getMomentLocales(locales, supportedLocales) {
-            return getLocales(locales, supportedLocales, 'lib/moment/');
-        }
-
-        function getFlatpickrLocales(locales, supportedLocales) {
-            return getLocales(locales, supportedLocales, 'lib/flatpickr/l10n/');
-        }
-        
-        function getLocales(locales, supportedLocales, path) {
-            var localeUrls = [];
-            locales = locales.split(',');
-            for (var i = 0; i < locales.length; i++) {
-                var locale = locales[i].toString().toLowerCase();
-                if (locale !== 'en-us') {
-                    if (supportedLocales.indexOf(locale + '.js') > -1) {
-                        localeUrls.push(path + locale + '.js');
-                    }
-                    if (locale.indexOf('-') > -1) {
-                        var majorLocale = locale.split('-')[0] + '.js';
-                        if (supportedLocales.indexOf(majorLocale) > -1) {
-                            localeUrls.push(path + majorLocale);
-                        }
-                    }
-                }
-            }
-
-            return localeUrls;
-        }
-
-        /**
-         * Loads specific Moment.js and Flatpickr Locales.
-         * @param {any} locales
-         * @param {any} supportedLocales
-         */
-        function loadLocales(locales, supportedLocales) {
-            var localeUrls = getMomentLocales(locales, supportedLocales.moment);
-            localeUrls = localeUrls.concat(getFlatpickrLocales(locales, supportedLocales.flatpickr));
-            if (localeUrls.length >= 1) {
-                return service.load(localeUrls, $rootScope);
-            }
-            else {
-                $q.when(true);
-            }
-        }
-
-        /**
-         * Loads in locale requirements during the _loadInitAssets call
-         */
-        function loadLocaleForCurrentUser() {
-
-            userService.getCurrentUser().then(function (currentUser) {
-                return javascriptLibraryResource.getSupportedLocales().then(function (supportedLocales) {
-                    return loadLocales(currentUser.locale, supportedLocales);
-                });
-            });
-
-        }
-
-        var service = {
-            loadedAssets: {},
-
-            _getAssetPromise: function (path) {
-
-                if (this.loadedAssets[path]) {
-                    return this.loadedAssets[path];
-                } else {
-                    var deferred = $q.defer();
-                    this.loadedAssets[path] = { deferred: deferred, state: "new", path: path };
-                    return this.loadedAssets[path];
-                }
-            },
-
-            /**
-                Internal method. This is called when the application is loading and the user is already authenticated, or once the user is authenticated.
-                There's a few assets the need to be loaded for the application to function but these assets require authentication to load.
-            */
-            _loadInitAssets: function () {
-
-                //here we need to ensure the required application assets are loaded
-                if (initAssetsLoaded === false) {
-                    var self = this;
-                    return self.loadJs(umbRequestHelper.getApiUrl("serverVarsJs", "", ""), $rootScope).then(function () {
-                        initAssetsLoaded = true;
-                        return loadLocaleForCurrentUser();
-                    });
-                }
-                else {
-                    return $q.when(true);
-                }
-            },
-
-            loadLocales: loadLocales,
-
-            /**
-             * @ngdoc method
-             * @name umbraco.services.assetsService#loadCss
-             * @methodOf umbraco.services.assetsService
-             *
-             * @description
-             * Injects a file as a stylesheet into the document head
-             *
-             * @param {String} path path to the css file to load
-             * @param {Scope} scope optional scope to pass into the loader
-             * @param {Object} keyvalue collection of attributes to pass to the stylesheet element
-             * @param {Number} timeout in milliseconds
-             * @returns {Promise} Promise object which resolves when the file has loaded
-             */
-            loadCss: function (path, scope, attributes, timeout) {
-
-                path = convertVirtualPath(path);
-
-                var asset = this._getAssetPromise(path); // $q.defer();
-                var t = timeout || 5000;
-                var a = attributes || undefined;
-
-                if (asset.state === "new") {
-                    asset.state = "loading";
-                    LazyLoad.css(appendRnd(path), function () {
-                        if (!scope) {
-                            scope = $rootScope;
-                        }
-                        asset.state = "loaded";
-                        angularHelper.safeApply(scope, function () {
-                            asset.deferred.resolve(true);
-                        });
-                    });
-                } else if (asset.state === "loaded") {
-                    asset.deferred.resolve(true);
-                }
-                return asset.deferred.promise;
-            },
-
-            /**
-             * @ngdoc method
-             * @name umbraco.services.assetsService#loadJs
-             * @methodOf umbraco.services.assetsService
-             *
-             * @description
-             * Injects a file as a javascript into the document
-             *
-             * @param {String} path path to the js file to load
-             * @param {Scope} scope optional scope to pass into the loader
-             * @param {Object} keyvalue collection of attributes to pass to the script element
-             * @param {Number} timeout in milliseconds
-             * @returns {Promise} Promise object which resolves when the file has loaded
-             */
-            loadJs: function (path, scope, attributes, timeout) {
-
-                path = convertVirtualPath(path);
-
-                var asset = this._getAssetPromise(path); // $q.defer();
-                var t = timeout || 5000;
-                var a = attributes || undefined;
-
-                if (asset.state === "new") {
-                    asset.state = "loading";
-
-                    LazyLoad.js(appendRnd(path), function () {
-                        if (!scope) {
-                            scope = $rootScope;
-                        }
-                        asset.state = "loaded";
-                        angularHelper.safeApply(scope, function () {
-                            asset.deferred.resolve(true);
-                        });
-                    });
-
-                } else if (asset.state === "loaded") {
-                    asset.deferred.resolve(true);
-                }
-
-                return asset.deferred.promise;
-            },
-
-            /**
-             * @ngdoc method
-             * @name umbraco.services.assetsService#load
-             * @methodOf umbraco.services.assetsService
-             *
-             * @description
-             * Injects a collection of css and js files
-             *
-             *
-             * @param {Array} pathArray string array of paths to the files to load
-             * @param {Scope} scope optional scope to pass into the loader
-             * @param {string} defaultAssetType optional default asset type used to load assets with no extension 
-             * @returns {Promise} Promise object which resolves when all the files has loaded
-             */
-            load: function (pathArray, scope, defaultAssetType) {
-                var promise;
-
-                if (!Utilities.isArray(pathArray)) {
-                    throw "pathArray must be an array";
-                }
-
-                // Check to see if there's anything to load, resolve promise if not
-                var nonEmpty = _.reject(pathArray, function (item) {
-                    return item === undefined || item === "";
-                });
-
-                if (nonEmpty.length === 0) {
-                    var deferred = $q.defer();
-                    promise = deferred.promise;
-                    deferred.resolve(true);
-                    return promise;
-                }
-
-                //compile a list of promises
-                //blocking
-                var promises = [];
-                var assets = [];
-                nonEmpty.forEach(path => {
-                    path = convertVirtualPath(path);
-                    var asset = service._getAssetPromise(path);
-                    //if not previously loaded, add to list of promises
-                    if (asset.state !== "loaded") {
-                        if (asset.state === "new") {
-                            asset.state = "loading";
-                            assets.push(asset);
-                        }
-
-                        //we need to always push to the promises collection to monitor correct execution
-                        promises.push(asset.deferred.promise);
-                    }
-                });
-
-                //gives a central monitoring of all assets to load
-                promise = $q.all(promises);
-
-                // Split into css and js asset arrays, and use LazyLoad on each array
-                var cssAssets = [];
-                var jsAssets = [];
-
-                for (var i = 0; i < assets.length; i++) {
-                    var asset = assets[i];
-                    if (asset.path.match(/(\.css$|\.css\?)/ig)) {
-                        cssAssets.push(asset);
-                    } else if (asset.path.match(/(\.js$|\.js\?)/ig)) {
-                        jsAssets.push(asset);
-                    } else {
-                        // Handle unknown assets
-                        switch (defaultAssetType) {
-                            case "css":
-                                cssAssets.push(asset);
-                                break;
-                            case "js":
-                                jsAssets.push(asset);
-                                break;
-                            default:
-                                throw "Found unknown asset without a valid defaultAssetType specified";
-                        }
-                    }
-                }
-
-                function assetLoaded(asset) {
-                    asset.state = "loaded";
-                    if (!scope) {
-                        scope = $rootScope;
-                    }
-                    angularHelper.safeApply(scope,
-                        () => asset.deferred.resolve(true));
-                }
-
-                if (cssAssets.length > 0) {
-                    var cssPaths = cssAssets.map(css => appendRnd(css.path));
-                    LazyLoad.css(cssPaths, () => cssAssets.forEach(assetLoaded));
-                }
-
-                if (jsAssets.length > 0) {
-                    var jsPaths = jsAssets.map(js => appendRnd(js.path));
-                    LazyLoad.js(jsPaths, () => jsAssets.forEach(assetLoaded));
-                }
-
-                return promise;
-            }
-        };
-
-        return service;
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/backdrop.service.js b/src/Umbraco.Web.UI.Client/src/common/services/backdrop.service.js
deleted file mode 100644
index e628e48306..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/backdrop.service.js
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- @ngdoc service
- * @name umbraco.services.backdropService
- *
- * @description
- * <b>Added in Umbraco 7.8</b>. Application-wide service for handling backdrops.
- * 
- */
-
-(function () {
-    "use strict";
-
-    function backdropService(eventsService) {
-
-        var args = {
-            opacity: null,
-            element: null,
-            elementPreventClick: false,
-            disableEventsOnClick: false,
-            show: false
-        };
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.backdropService#open
-         * @methodOf umbraco.services.backdropService
-         *
-         * @description
-         * Raises an event to open a backdrop
-		 * @param {Object} options The backdrop options
-         * @param {Number} options.opacity Sets the opacity on the backdrop (default 0.4)
-         * @param {DomElement} options.element Highlights a DOM-element (HTML-selector)
-         * @param {Boolean} options.elementPreventClick Adds blocking element on top of highligted area to prevent all clicks
-         * @param {Boolean} options.disableEventsOnClick Disables all raised events when the backdrop is clicked
-		 */
-        function open(options) {
-
-            if (options && options.element) {
-                args.element = options.element;
-            }
-
-            if (options && options.disableEventsOnClick) {
-                args.disableEventsOnClick = options.disableEventsOnClick;
-            }
-
-            args.show = true;
-
-            eventsService.emit("appState.backdrop", args);
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.backdropService#close
-         * @methodOf umbraco.services.backdropService
-         *
-         * @description
-         * Raises an event to close the backdrop
-         * 
-		 */
-        function close() {
-            args.opacity = null;
-            args.element = null;
-            args.elementPreventClick = false;
-            args.disableEventsOnClick = false;
-            args.show = false;
-            eventsService.emit("appState.backdrop", args);
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.backdropService#setOpacity
-         * @methodOf umbraco.services.backdropService
-         *
-         * @description
-         * Raises an event which updates the opacity option on the backdrop
-		 */
-        function setOpacity(opacity) {
-            args.opacity = opacity;
-            eventsService.emit("appState.backdrop", args);
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.backdropService#setHighlight
-         * @methodOf umbraco.services.backdropService
-         *
-         * @description
-         * Raises an event which updates the element option on the backdrop
-		 */
-        function setHighlight(element, preventClick) {
-            args.element = element;
-            args.elementPreventClick = preventClick;
-            eventsService.emit("appState.backdrop", args);
-        }
-
-        var service = {
-            open: open,
-            close: close,
-            setOpacity: setOpacity,
-            setHighlight: setHighlight
-        };
-
-        return service;
-
-    }
-
-    angular.module("umbraco.services").factory("backdropService", backdropService);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
deleted file mode 100644
index 122d430165..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditor.service.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.blockEditorService
- *
- * @description
- * <b>Added in Umbraco 8.7</b>. Service for dealing with Block Editors.
- *
- * Block Editor Service provides the basic features for a block editor.
- * The main feature is the ability to create a Model Object which takes care of your data for your Block Editor.
- *
- *
- * ##Samples
- *
- * ####Instantiate a Model Object for your property editor:
- *
- * <pre>
- *     modelObject = blockEditorService.createModelObject(vm.model.value, vm.model.editor, vm.model.config.blocks, $scope);
- *     modelObject.load().then(onLoaded);
- * </pre>
- *
- *
- * See {@link umbraco.services.blockEditorModelObject BlockEditorModelObject} for more samples.
- *
- */
-(function () {
-    'use strict';
-
-
-
-    /**
-     * When performing a runtime copy of Block Editors entries, we copy the ElementType Data Model and inner IDs are kept identical, to ensure new IDs are changed on paste we need to provide a resolver for the ClipboardService.
-     */
-    angular.module('umbraco').run(['clipboardService', 'udiService', function (clipboardService, udiService) {
-
-        function replaceUdi(obj, key, dataObject) {
-            var udi = obj[key];
-            var newUdi = udiService.create("element");
-            obj[key] = newUdi;
-            dataObject.forEach((data) => {
-                if (data.udi === udi) {
-                    data.udi = newUdi;
-                }
-            });
-        }
-        function replaceUdisOfObject(obj, propValue) {
-            for (var k in obj) {
-                if(k === "contentUdi") {
-                    replaceUdi(obj, k, propValue.contentData);
-                } else if(k === "settingsUdi") {
-                    replaceUdi(obj, k, propValue.settingsData);
-                } else {
-                    // lets crawl through all properties of layout to make sure get captured all `contentUdi` and `settingsUdi` properties.
-                    var propType = typeof obj[k];
-                    if(propType != null && (propType === "object" || propType === "array")) {
-                        replaceUdisOfObject(obj[k], propValue)
-                    }
-                }
-            }
-        }
-        function removeBlockReferences(obj) {
-            for (var k in obj) {
-                if(k === "contentUdi") {
-                    delete obj[k];
-                } else if(k === "settingsUdi") {
-                    delete obj[k];
-                } else {
-                    // lets crawl through all properties of layout to make sure get captured all `contentUdi` and `settingsUdi` properties.
-                    var propType = typeof obj[k];
-                    if(propType != null && (propType === "object" || propType === "array")) {
-                        removeBlockReferences(obj[k])
-                    }
-                }
-            }
-        }
-
-
-        function elementTypeBlockResolver(obj, propPasteResolverMethod) {
-            // we could filter for specific Property Editor Aliases, but as the Block Editor structure can be used by many Property Editor we do not in this code know a good way to detect that this is a Block Editor and will therefor leave it to the value structure to determin this.
-            rawBlockResolver(obj.value, propPasteResolverMethod);
-        }
-
-        clipboardService.registerPastePropertyResolver(elementTypeBlockResolver, clipboardService.TYPES.ELEMENT_TYPE);
-
-
-        function rawBlockResolver(value, propPasteResolverMethod) {
-            if (value != null && typeof value === "object") {
-
-                // we got an object, and it has these three props then we are most likely dealing with a Block Editor.
-                if ((value.layout !== undefined && value.contentData !== undefined && value.settingsData !== undefined)) {
-
-                    replaceUdisOfObject(value.layout, value);
-
-                    // run resolvers for inner properties of this Blocks content data.
-                    if(value.contentData.length > 0) {
-                        value.contentData.forEach((item) => {
-                            for (var k in item) {
-                                propPasteResolverMethod(item[k], clipboardService.TYPES.RAW);
-                            }
-                        });
-                    }
-                    // run resolvers for inner properties of this Blocks settings data.
-                    if(value.settingsData.length > 0) {
-                        value.settingsData.forEach((item) => {
-                            for (var k in item) {
-                                propPasteResolverMethod(item[k], clipboardService.TYPES.RAW);
-                            }
-                        });
-                    }
-
-                }
-            }
-        }
-
-        clipboardService.registerPastePropertyResolver(rawBlockResolver, clipboardService.TYPES.RAW);
-
-
-        function provideNewUdisForBlockResolver(block, propPasteResolverMethod) {
-
-            if(block.layout) {
-                // We do not support layout child blocks currently, these should be stripped out as we only will be copying a single entry.
-                removeBlockReferences(block.layout);
-            }
-
-            if(block.data) {
-                // Make new UDI for content-element
-                block.data.udi = block.layout.contentUdi = udiService.create("element");
-            }
-
-            if(block.settingsData) {
-                // Make new UDI for settings-element
-                block.settingsData.udi = block.layout.settingsUdi = udiService.create("element");
-            }
-
-        }
-
-        clipboardService.registerPastePropertyResolver(provideNewUdisForBlockResolver, clipboardService.TYPES.BLOCK);
-
-    }]);
-
-
-
-
-    function blockEditorService(blockEditorModelObject) {
-
-        /**
-         * @ngdocs function
-         * @name createModelObject
-         * @methodOf umbraco.services.blockEditorService
-         *
-         * @description
-         * Create a new Block Editor Model Object.
-         * See {@link umbraco.services.blockEditorModelObject blockEditorModelObject}
-         *
-         * @see umbraco.services.blockEditorModelObject
-         * @param {object} propertyModelValue data object of the property editor, usually model.value.
-         * @param {string} propertyEditorAlias alias of the property.
-         * @param {object} blockConfigurations block configurations.
-         * @param {angular-scope} scopeOfExistance A local angularJS scope that exists as long as the data exists.
-         * @param {angular-scope} propertyEditorScope A local angularJS scope that represents the property editors scope.
-         * @return {blockEditorModelObject} A instance of the BlockEditorModelObject class.
-         */
-        function createModelObject(propertyModelValue, propertyEditorAlias, blockConfigurations, scopeOfExistance, propertyEditorScope) {
-            return new blockEditorModelObject(propertyModelValue, propertyEditorAlias, blockConfigurations, scopeOfExistance, propertyEditorScope);
-        }
-
-        return {
-            createModelObject: createModelObject
-        }
-    }
-
-    angular.module('umbraco.services').service('blockEditorService', blockEditorService);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
deleted file mode 100644
index ab6c176c85..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
+++ /dev/null
@@ -1,982 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.blockEditorModelObject
- *
- * @description
- * <b>Added in Umbraco 8.7</b>. Model Object for dealing with data of Block Editors.
- *
- * Block Editor Model Object provides the basic features for editing data of a block editor.<br/>
- * Use the Block Editor Service to instantiate the Model Object.<br/>
- * See {@link umbraco.services.blockEditorService blockEditorService}
- *
- */
-(function () {
-    'use strict';
-
-    function blockEditorModelObjectFactory($interpolate, $q, udiService, contentResource, localizationService, umbRequestHelper, clipboardService, notificationsService, $compile, editorState) {
-
-        /**
-         * Simple mapping from property model content entry to editing model,
-         * needs to stay simple to avoid deep watching.
-         */
-        function mapToElementModel(elementModel, dataModel) {
-
-            if (!elementModel || !elementModel.variants || !elementModel.variants.length) { return; }
-
-            var variant = elementModel.variants[0];
-
-            for (var t = 0; t < variant.tabs.length; t++) {
-                var tab = variant.tabs[t];
-
-                for (var p = 0; p < tab.properties.length; p++) {
-                    var prop = tab.properties[p];
-
-                    if (typeof (dataModel[prop.alias]) !== 'undefined')
-                        prop.value = dataModel[prop.alias];
-                }
-            }
-
-        }
-
-        /**
-         * Simple mapping from elementModel to property model content entry,
-         * needs to stay simple to avoid deep watching.
-         */
-        function mapToPropertyModel(elementModel, dataModel) {
-
-            if (!elementModel || !elementModel.variants || !elementModel.variants.length) { return; }
-
-            var variant = elementModel.variants[0];
-
-            for (var t = 0; t < variant.tabs.length; t++) {
-                var tab = variant.tabs[t];
-
-                for (var p = 0; p < tab.properties.length; p++) {
-                    var prop = tab.properties[p];
-
-                    dataModel[prop.alias] = prop.value;
-                }
-            }
-
-        }
-
-        /**
-         * Map property values from an ElementModel to another ElementModel.
-         * Used to tricker watchers for synchronization.
-         * @param {Object} fromModel ElementModel to receive property values from.
-         * @param {Object} toModel ElementModel to receive property values from.
-         */
-        function mapElementValues(fromModel, toModel) {
-            if (!fromModel || !fromModel.variants) {
-                toModel.variants = null;
-                return;
-            }
-            if (!fromModel.variants.length) {
-                toModel.variants = [];
-                return;
-            }
-
-            var fromVariant = fromModel.variants[0];
-            if (!fromVariant) {
-                toModel.variants = [null];
-                return;
-            }
-
-            var toVariant = toModel.variants[0];
-
-            for (var t = 0; t < fromVariant.tabs.length; t++) {
-                var fromTab = fromVariant.tabs[t];
-                var toTab = toVariant.tabs.find(tab => tab.alias === fromTab.alias);
-
-                if (fromTab && fromTab.properties && fromTab.properties.length > 0 && toTab && toTab.properties && toTab.properties.length > 0) {
-                    for (var p = 0; p < fromTab.properties.length; p++) {
-                        var fromProp = fromTab.properties[p];
-                        var toProp = toTab.properties[p];
-                        toProp.value = fromProp.value;
-                    }
-                }
-            }
-        }
-
-        /**
-         * Used to add watchers on all properties in a content or settings model
-         */
-        function addWatchers(blockObject, isolatedScope, forSettings) {
-            var model = forSettings ? blockObject.settings : blockObject.content;
-            if (!model || !model.variants || !model.variants.length) { return; }
-
-            // Start watching each property value.
-            var variant = model.variants[0];
-            var field = forSettings ? "settings" : "content";
-            var watcherCreator = forSettings ? createSettingsModelPropWatcher : createContentModelPropWatcher;
-            for (var t = 0; t < variant.tabs.length; t++) {
-                var tab = variant.tabs[t];
-                for (var p = 0; p < tab.properties.length; p++) {
-                    var prop = tab.properties[p];
-
-                    // Watch value of property since this is the only value we want to keep synced.
-                    // Do notice that it is not performing a deep watch, meaning that we are only watching primitive and changes directly to the object of property-value.
-                    // But we like to sync non-primitive values as well! Yes, and this does happen, just not through this code, but through the nature of JavaScript.
-                    // Non-primitive values act as references to the same data and are therefor synced.
-                    blockObject.__watchers.push(isolatedScope.$watch("blockObjects._" + blockObject.key + "." + field + ".variants[0].tabs[" + t + "].properties[" + p + "].value", watcherCreator(blockObject, prop)));
-
-                    // We also like to watch our data model to be able to capture changes coming from other places.
-                    if (forSettings === true) {
-                        blockObject.__watchers.push(isolatedScope.$watch("blockObjects._" + blockObject.key + "." + "settingsData" + "." + prop.alias, createLayoutSettingsModelWatcher(blockObject, prop)));
-                    } else {
-                        blockObject.__watchers.push(isolatedScope.$watch("blockObjects._" + blockObject.key + "." + "data" + "." + prop.alias, createDataModelWatcher(blockObject, prop)));
-                    }
-                }
-            }
-        }
-
-        /**
-         * Used to create a prop watcher for the data in the property editor data model.
-         */
-        function createDataModelWatcher(blockObject, prop) {
-            return function () {
-                if (prop.value !== blockObject.data[prop.alias]) {
-
-                    // sync data:
-                    prop.value = blockObject.data[prop.alias];
-                }
-            }
-        }
-
-        /**
-         * Used to create a prop watcher for the settings in the property editor data model.
-         */
-        function createLayoutSettingsModelWatcher(blockObject, prop) {
-            return function () {
-                if (prop.value !== blockObject.settingsData[prop.alias]) {
-                    // sync data:
-                    prop.value = blockObject.settingsData[prop.alias];
-                }
-            }
-        }
-
-        /**
-         * Used to create a scoped watcher for a content property on a blockObject.
-         */
-        function createContentModelPropWatcher(blockObject, prop) {
-            return function () {
-                if (blockObject.data[prop.alias] !== prop.value) {
-                    // sync data:
-                    blockObject.data[prop.alias] = prop.value;
-                }
-            }
-        }
-
-        /**
-         * Used to create a scoped watcher for a settings property on a blockObject.
-         */
-        function createSettingsModelPropWatcher(blockObject, prop) {
-            return function () {
-                if (blockObject.settingsData[prop.alias] !== prop.value) {
-                    // sync data:
-                    blockObject.settingsData[prop.alias] = prop.value;
-                }
-            }
-        }
-
-        function createDataEntry(elementTypeKey, dataItems) {
-            var data = {
-                contentTypeKey: elementTypeKey,
-                udi: udiService.create("element")
-            };
-            dataItems.push(data);
-            return data.udi;
-        }
-
-        function getDataByUdi(udi, dataItems) {
-            return dataItems.find(entry => entry.udi === udi) || null;
-        }
-
-        /**
-         * Set the udi and key property for the content item
-         * @param {any} contentData
-         * @param {any} udi
-         */
-        function ensureUdiAndKey(contentData, udi) {
-            contentData.udi = udi;
-            // Change the content.key to the GUID part of the udi, else it's just random which we don't want, it must be consistent
-            contentData.key = udiService.getKey(udi);
-        }
-
-        /**
-         * Used to highlight unsupported properties for the user, changes unsupported properties into a unsupported-property.
-         */
-        var notSupportedProperties = [
-            "Umbraco.UploadField",
-            "Umbraco.ImageCropper",
-            "Umbraco.NestedContent"
-        ];
-
-
-        /**
-         * Formats the content apps and ensures unsupported property's have the notsupported view
-         * @param {any} scaffold
-         */
-        function formatScaffoldData(scaffold) {
-
-            // deal with not supported props
-            scaffold.variants.forEach((variant) => {
-                variant.tabs.forEach((tab) => {
-                    tab.properties.forEach((property) => {
-                        if (notSupportedProperties.indexOf(property.editor) !== -1) {
-                            property.view = "notsupported";
-                        }
-                    });
-                });
-            });
-
-            // could be empty in tests
-            if (!scaffold.apps) {
-                console.warn("No content apps found in scaffold");
-                return scaffold;
-            }
-
-            // replace view of content app
-
-            var contentApp = scaffold.apps.find(entry => entry.alias === "umbContent");
-            if (contentApp) {
-                contentApp.view = "views/common/infiniteeditors/blockeditor/blockeditor.content.html";
-            }
-
-            // remove info app
-            var infoAppIndex = scaffold.apps.findIndex(entry => entry.alias === "umbInfo");
-            if (infoAppIndex >= 0) {
-                scaffold.apps.splice(infoAppIndex, 1);
-            }
-
-            return scaffold;
-        }
-
-        /**
-         * Creates a settings content app, we only want to do this if settings is present on the specific block.
-         * @param {any} contentModel
-         */
-        function appendSettingsContentApp(contentModel, settingsName) {
-            if (!contentModel.apps) {
-                return
-            }
-
-            // add the settings app
-            var settingsTab = {
-                "name": settingsName,
-                "alias": "settings",
-                "icon": "icon-settings",
-                "view": "views/common/infiniteeditors/blockeditor/blockeditor.settings.html",
-                "hasError": false
-            };
-            contentModel.apps.push(settingsTab);
-        }
-
-        /**
-         * @ngdoc method
-         * @name constructor
-         * @methodOf umbraco.services.blockEditorModelObject
-         * @description Constructor of the model object used to handle Block Editor data.
-         * @param {object} propertyModelValue data object of the property editor, usually model.value.
-         * @param {string} propertyEditorAlias alias of the property.
-         * @param {object} blockConfigurations block configurations.
-         * @param {angular-scope} scopeOfExistence A local angularJS scope that exists as long as the data exists.
-         * @param {angular-scope} propertyEditorScope A local angularJS scope that represents the property editors scope.
-         * @returns {BlockEditorModelObject} A instance of BlockEditorModelObject.
-         */
-        function BlockEditorModelObject(propertyModelValue, propertyEditorAlias, blockConfigurations, scopeOfExistence, propertyEditorScope) {
-
-            if (!propertyModelValue) {
-                throw new Error("propertyModelValue cannot be undefined, to ensure we keep the binding to the angular model we need minimum an empty object.");
-            }
-
-            this.__watchers = [];
-
-            this.__labels = {};
-
-            // ensure basic part of data-structure is in place:
-            this.value = propertyModelValue;
-            this.value.layout = this.value.layout || {};
-            this.value.contentData = this.value.contentData || [];
-            this.value.settingsData = this.value.settingsData || [];
-
-            this.propertyEditorAlias = propertyEditorAlias;
-            this.blockConfigurations = blockConfigurations ?? [];
-
-            this.blockConfigurations.forEach(blockConfiguration => {
-                if (blockConfiguration.view != null && blockConfiguration.view !== "") {
-                    blockConfiguration.view = umbRequestHelper.convertVirtualToAbsolutePath(blockConfiguration.view);
-                }
-                if (blockConfiguration.stylesheet != null && blockConfiguration.stylesheet !== "") {
-                    blockConfiguration.stylesheet = umbRequestHelper.convertVirtualToAbsolutePath(blockConfiguration.stylesheet);
-                }
-                if (blockConfiguration.thumbnail != null && blockConfiguration.thumbnail !== "") {
-                    blockConfiguration.thumbnail = umbRequestHelper.convertVirtualToAbsolutePath(blockConfiguration.thumbnail);
-                }
-            });
-
-            this.scaffolds = [];
-            this.__scopeOfExistence = scopeOfExistence;
-            this.isolatedScope = scopeOfExistence.$new(true);
-            this.isolatedScope.blockObjects = {};
-
-            this.__watchers.push(this.isolatedScope.$on("$destroy", this.destroy.bind(this)));
-            this.__watchers.push(propertyEditorScope.$on("formSubmittingFinalPhase", this.sync.bind(this)));
-
-        };
-
-        BlockEditorModelObject.prototype = {
-
-            update: function (propertyModelValue, propertyEditorScope) {
-                // clear watchers
-                this.__watchers.forEach(w => { w(); });
-                delete this.__watchers;
-
-                // clear block objects
-                for (const key in this.isolatedScope.blockObjects) {
-                    this.destroyBlockObject(this.isolatedScope.blockObjects[key]);
-                }
-                this.isolatedScope.blockObjects = {};
-
-                // update our values
-                this.value = propertyModelValue;
-                this.value.layout = this.value.layout || {};
-                this.value.contentData = this.value.contentData || [];
-                this.value.settingsData = this.value.settingsData || [];
-
-                // re-create the watchers
-                this.__watchers = [];
-                this.__watchers.push(this.isolatedScope.$on("$destroy", this.destroy.bind(this)));
-                this.__watchers.push(propertyEditorScope.$on("formSubmittingFinalPhase", this.sync.bind(this)));
-            },
-
-            /**
-             * @ngdoc method
-             * @name getBlockConfiguration
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Get block configuration object for a given contentElementTypeKey.
-             * @param {string} key contentElementTypeKey to receive the configuration model for.
-             * @returns {Object | null} Configuration model for the that specific block. Or ´null´ if the contentElementTypeKey isnt available in the current block configurations.
-             */
-            getBlockConfiguration: function (key) {
-                return this.blockConfigurations.find(bc => bc.contentElementTypeKey === key) || null;
-            },
-
-            /**
-             * @ngdoc method
-             * @name load
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Load the scaffolding models for the given configuration, these are needed to provide useful models for each block.
-             * @returns {Promise} A Promise object which resolves when all scaffold models are loaded.
-             */
-            load: function () {
-
-                var self = this;
-
-                var tasks = [];
-
-                tasks.push(localizationService.localize("blockEditor_tabBlockSettings").then(
-                    function (settingsName) {
-                        // self.__labels might not exists anymore, this happens if this instance has been destroyed before the load is complete.
-                        if(self.__labels) {
-                            self.__labels.settingsName = settingsName;
-                        }
-                    }
-                ));
-
-                var scaffoldKeys = [];
-
-                this.blockConfigurations.forEach(blockConfiguration => {
-                    scaffoldKeys.push(blockConfiguration.contentElementTypeKey);
-                    if (blockConfiguration.settingsElementTypeKey != null) {
-                        scaffoldKeys.push(blockConfiguration.settingsElementTypeKey);
-                    }
-                });
-
-                // removing duplicates.
-                scaffoldKeys = scaffoldKeys.filter((value, index, self) => self.indexOf(value) === index);
-
-                if(scaffoldKeys.length > 0) {
-                  // We need to know if we are in the document type editor or content editor.
-                  // If we are in the document type editor, we need to use -20 as the current page id.
-                  // If we are in the content editor, we need to use the current page id or parent id if the current page is new.
-                  // We can recognize a content editor context by checking if the current editor state has a contentTypeKey.
-                  const currentEditorState = editorState.getCurrent();
-                  const currentPageId = currentEditorState.contentTypeKey ? currentEditorState.id || currentEditorState.parentId || -20 : -20;
-
-                  // Load all scaffolds for the block types.
-                  // The currentPageId is used to determine the access level for the current user.
-                  tasks.push(contentResource.getScaffoldByKeys(currentPageId, scaffoldKeys).then(scaffolds => {
-                      Object.values(scaffolds).forEach(scaffold => {
-                          // self.scaffolds might not exists anymore, this happens if this instance has been destroyed before the load is complete.
-                          if (self.scaffolds) {
-                              self.scaffolds.push(formatScaffoldData(scaffold));
-                          }
-                      });
-                  }).catch(
-                      () => {
-                          // Do nothing if we get an error.
-                      }
-                  ));
-                }
-
-                return $q.all(tasks);
-            },
-
-            /**
-             * @ngdoc method
-             * @name getAvailableAliasesForBlockContent
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Retrieve a list of aliases that are available for content of blocks in this property editor, does not contain aliases of block settings.
-             * @return {Array} array of strings representing alias.
-             */
-            getAvailableAliasesForBlockContent: function () {
-                return this.blockConfigurations.map(
-                    (blockConfiguration) => {
-                        var scaffold = this.getScaffoldFromKey(blockConfiguration.contentElementTypeKey);
-                        if (scaffold) {
-                            return scaffold.contentTypeAlias;
-                        }
-                    }
-                );
-            },
-
-            /**
-             * @ngdoc method
-             * @name getAvailableAliasesOfElementTypeKeys
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Retrieve a list of aliases that are available for content of blocks in this property editor, does not contain aliases of block settings.
-             * @return {Array} array of strings representing alias.
-             */
-             getAvailableAliasesOfElementTypeKeys: function (elementTypeKeys) {
-                return elementTypeKeys.map(
-                    (key) => {
-                        var scaffold = this.getScaffoldFromKey(key);
-                        if (scaffold) {
-                            return scaffold.contentTypeAlias;
-                        }
-                    }
-                );
-            },
-
-            /**
-             * @ngdoc method
-             * @name getAvailableBlocksForBlockPicker
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Retrieve a list of available blocks, the list containing object with the configuration model(blockConfigModel) and the element type model(elementTypeModel).
-             * The purpose of this data is to provide it for the Block Picker.
-             * @return {Array} array of objects representing available blocks, each object containing properties blockConfigModel and elementTypeModel.
-             */
-            getAvailableBlocksForBlockPicker: function () {
-
-                var blocks = [];
-
-                this.blockConfigurations.forEach(blockConfiguration => {
-                    var scaffold = this.getScaffoldFromKey(blockConfiguration.contentElementTypeKey);
-                    if (scaffold) {
-                        blocks.push({
-                            blockConfigModel: blockConfiguration,
-                            elementTypeModel: scaffold.documentType
-                        });
-                    }
-                });
-
-                return blocks;
-            },
-
-            /**
-             * @ngdoc method
-             * @name getScaffoldFromKey
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Get scaffold model for a given contentTypeKey.
-             * @param {string} key contentTypeKey to receive the scaffold model for.
-             * @returns {Object | null} Scaffold model for the that content type. Or null if the scaffolding model dosnt exist in this context.
-             */
-            getScaffoldFromKey: function (contentTypeKey) {
-                return this.scaffolds.find(o => o.contentTypeKey === contentTypeKey) || null;
-            },
-
-            /**
-             * @ngdoc method
-             * @name getScaffoldFromAlias
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Get scaffold model for a given contentTypeAlias, used by clipboardService.
-             * @param {string} alias contentTypeAlias to receive the scaffold model for.
-             * @returns {Object | null} Scaffold model for the that content type. Or null if the scaffolding model dosnt exist in this context.
-             */
-            getScaffoldFromAlias: function (contentTypeAlias) {
-                return this.scaffolds.find(o => o.contentTypeAlias === contentTypeAlias) || null;
-            },
-
-            /**
-             * @ngdoc method
-             * @name getBlockObject
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Retrieve a Block Object for the given layout entry.
-             * The Block Object offers the necessary data to display and edit a block.
-             * The Block Object setups live synchronization of content and settings models back to the data of your Property Editor model.
-             * The returned object, named ´BlockObject´, contains several useful models to make editing of this block happen.
-             * The ´BlockObject´ contains the following properties:
-             * - key {string}: runtime generated key, useful for tracking of this object
-             * - content {Object}: Content model, the content data in a ElementType model.
-             * - settings {Object}: Settings model, the settings data in a ElementType model.
-             * - config {Object}: A local deep copy of the block configuration model.
-             * - label {string}: The compiled label for this block.
-             * - data {Object}: A reference to the content data object from your property editor model.
-             * - settingsData {Object}: A reference to the settings data object from your property editor model.
-             * - layout {Object}: A reference to the layout entry from your property editor model.
-             * @param {Object} layoutEntry the layout entry object to build the block model from.
-             * @return {Object | null} The BlockObject for the given layout entry. Or null if data or configuration wasn't found for this block.
-             */
-            getBlockObject: function (layoutEntry) {
-                var contentUdi = layoutEntry.contentUdi;
-                if(!contentUdi) {
-                    console.error("layoutEntry skipped cause it did not have contentUdi:", layoutEntry);
-                    return null;
-                }
-
-                var dataModel = getDataByUdi(contentUdi, this.value.contentData);
-                var blockConfiguration = null;
-                var contentScaffold = null;
-
-                if (dataModel === null) {
-                  console.error("Couldn't find content data of UDI:", contentUdi, "layoutEntry:", layoutEntry)
-                  //return null;
-                } else {
-                  blockConfiguration = this.getBlockConfiguration(dataModel.contentTypeKey);
-                }
-
-                if (blockConfiguration === null) {
-                  if(dataModel) {
-                    console.warn("The block of " + contentUdi + " is not being initialized because its contentTypeKey('" + dataModel.contentTypeKey + "') is not allowed for this PropertyEditor");
-                  }
-                } else {
-                    contentScaffold = this.getScaffoldFromKey(blockConfiguration.contentElementTypeKey);
-                    if (contentScaffold === null) {
-                        console.error("The block of " + contentUdi + " is not begin initialized cause its Element Type was not loaded.");
-                    }
-                }
-
-                if (blockConfiguration === null || contentScaffold === null) {
-
-                    blockConfiguration = {
-                        label: "Unsupported",
-                        labelInterpolator: "Unsupported",
-                        unsupported: true
-                    };
-                }
-
-                var blockObject = {};
-                // Set an angularJS cloneNode method, to avoid this object begin cloned.
-                blockObject.cloneNode = function () {
-                    return null;// angularJS accept this as a cloned value as long as the
-                }
-                blockObject.key = String.CreateGuid().replace(/-/g, "");
-                blockObject.config = Utilities.copy(blockConfiguration);
-                if (blockObject.config.label && blockObject.config.label !== "") {
-                  /**
-                   * @deprecated use blockObject.label instead
-                   */
-                  blockObject.labelInterpolator = $interpolate(blockObject.config.label);
-                }
-                blockObject.__scope = this.isolatedScope;
-
-                // make basics from scaffold
-                if(contentScaffold !== null) {// We might not have contentScaffold
-                    blockObject.content = Utilities.copy(contentScaffold);
-                    ensureUdiAndKey(blockObject.content, contentUdi);
-
-                    mapToElementModel(blockObject.content, dataModel);
-                } else {
-                    blockObject.content = null;
-                }
-
-                blockObject.data = dataModel;
-                blockObject.layout = layoutEntry;
-                blockObject.__watchers = [];
-
-                if (blockConfiguration.settingsElementTypeKey) {
-                    var settingsScaffold = this.getScaffoldFromKey(blockConfiguration.settingsElementTypeKey);
-                    if (settingsScaffold !== null) {
-
-                        if (!layoutEntry.settingsUdi) {
-                            // if this block does not have settings data, then create it. This could happen because settings model has been added later than this content was created.
-                            layoutEntry.settingsUdi = createDataEntry(blockConfiguration.settingsElementTypeKey, this.value.settingsData);
-                        }
-
-                        var settingsUdi = layoutEntry.settingsUdi;
-
-                        var settingsData = getDataByUdi(settingsUdi, this.value.settingsData);
-                        if (settingsData === null) {
-                            console.error("Couldnt find settings data of " + settingsUdi)
-                            return null;
-                        }
-
-                        // the Settings model has been changed to a new Element Type.
-                        // we need to update the settingsData with the new Content Type key
-                        if (settingsData.contentTypeKey !== settingsScaffold.contentTypeKey) {
-                            settingsData.contentTypeKey = settingsScaffold.contentTypeKey;
-                        }
-
-                        blockObject.settingsData = settingsData;
-
-                        // make basics from scaffold
-                        if (settingsScaffold !== null) {// We might not have settingsScaffold
-                            blockObject.settings = Utilities.copy(settingsScaffold);
-                            ensureUdiAndKey(blockObject.settings, settingsUdi);
-
-                            mapToElementModel(blockObject.settings, settingsData);
-                        } else {
-                            blockObject.settings = null;
-                        }
-
-                        // add settings content-app
-                        appendSettingsContentApp(blockObject.content, this.__labels.settingsName);
-                    }
-                }
-
-                blockObject.retrieveValuesFrom = function (content, settings) {
-                    if (this.content !== null) {
-                        mapElementValues(content, this.content);
-                    }
-                    if (this.config.settingsElementTypeKey !== null) {
-                        mapElementValues(settings, this.settings);
-                    }
-
-                };
-
-                blockObject.sync = function () {
-                    if (this.content !== null) {
-                        mapToPropertyModel(this.content, this.data);
-                    }
-                    if (this.config.settingsElementTypeKey !== null) {
-                        mapToPropertyModel(this.settings, this.settingsData);
-                    }
-                };
-                // first time instant update of label.
-              blockObject.label = blockObject.content?.contentTypeName || "";
-                blockObject.index = 0;
-
-                if (blockObject.config.label && blockObject.config.label !== "" && blockObject.config.unsupported !== true) {
-
-                    // If the label does not contain any AngularJS template, then the MutationObserver wont give us any updates. To ensure labels without angular JS template code, we will just set the label directly for ones without '{{':
-                    if(blockObject.config.label.indexOf("{{") === -1) {
-                        blockObject.label = blockObject.config.label;
-                    }
-
-                    var labelElement = $('<div></div>', { text: blockObject.config.label});
-
-                    var observer = new MutationObserver(function(mutations) {
-                        mutations.forEach(function(mutation) {
-                            blockObject.label = mutation.target.textContent;
-                            blockObject.__scope.$evalAsync();
-                        });
-                    });
-
-                    observer.observe(labelElement[0], {characterData: true, subtree:true});
-
-                    blockObject.__watchers.push(() => {
-                        observer.disconnect();
-                    })
-
-                    blockObject.__labelScope = this.__scopeOfExistence.$new(true);
-                    blockObject.__renderLabel = function() {
-
-                        var labelVars = {
-                            $contentTypeName: this.content?.contentTypeName || "",
-                            $settings: this.settingsData || {},
-                            $layout: this.layout || {},
-                            $index: this.index + 1,
-                            ... this.data
-                        };
-
-                        this.__labelScope = Object.assign(this.__labelScope, labelVars);
-
-                        $compile(labelElement.contents())(this.__labelScope);
-
-                    }.bind(blockObject)
-                } else {
-                    blockObject.__renderLabel = function() {};
-                }
-
-                blockObject.updateLabel = _.debounce(blockObject.__renderLabel, 10);
-
-
-                // label rendering watchers:
-                blockObject.__watchers.push(blockObject.__scope.$watchCollection(function () {
-                return blockObject.data;
-                }, blockObject.__renderLabel));
-                blockObject.__watchers.push(blockObject.__scope.$watchCollection(function () {
-                return blockObject.settingsData;
-                }, blockObject.__renderLabel));
-                blockObject.__watchers.push(blockObject.__scope.$watchCollection(function () {
-                return blockObject.layout;
-                }, blockObject.__renderLabel));
-                blockObject.__watchers.push(blockObject.__scope.$watch(function () {
-                return blockObject.index;
-                }, blockObject.__renderLabel));
-
-
-                // Add blockObject to our isolated scope to enable watching its values:
-                this.isolatedScope.blockObjects["_" + blockObject.key] = blockObject;
-                addWatchers(blockObject, this.isolatedScope);
-                addWatchers(blockObject, this.isolatedScope, true);
-
-                blockObject.destroy = function () {
-                    // remove property value watchers:
-                    this.__watchers.forEach(w => { w(); });
-                    delete this.__watchers;
-
-                    // help garbage collector:
-                    delete this.config;
-                    delete this.layout;
-                    delete this.data;
-                    delete this.settingsData;
-                    delete this.content;
-                    delete this.settings;
-
-                    // remove model from isolatedScope.
-                    delete this.__scope.blockObjects["_" + this.key];
-                    // NOTE: It seems like we should call this.__scope.$destroy(); since that is the only way to remove a scope from it's parent,
-                    // however that is not the case since __scope is actually this.isolatedScope which gets cleaned up when the outer scope is
-                    // destroyed. If we do that here it breaks the scope chain and validation.
-                    delete this.__scope;
-
-                    if(this.__labelScope) {
-                        this.__labelScope.$destroy();
-                        delete this.__labelScope;
-                    }
-
-                    // removes this method, making it impossible to destroy again.
-                    delete this.destroy;
-
-                    // lets remove the key to make things blow up if this is still referenced:
-                    delete this.key;
-                }
-
-                return blockObject;
-            },
-
-            /**
-             * @ngdoc method
-             * @name removeDataAndDestroyModel
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Removes the data and destroys the Block Model.
-             * Notice this method does not remove the block from your layout, this will need to be handlede by the Property Editor since this services donst know about your layout structure.
-             * @param {Object} blockObject The BlockObject to be removed and destroyed.
-             */
-            removeDataAndDestroyModel: function (blockObject) {
-                var udi = blockObject.layout.contentUdi;
-                var settingsUdi = blockObject.layout.settingsUdi || null;
-                this.destroyBlockObject(blockObject);
-                this.removeDataByUdi(udi);
-                if (settingsUdi) {
-                    this.removeSettingsByUdi(settingsUdi);
-                }
-            },
-
-            /**
-             * @ngdoc method
-             * @name destroyBlockObject
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Destroys the Block Model, but all data is kept.
-             * @param {Object} blockObject The BlockObject to be destroyed.
-             */
-            destroyBlockObject: function (blockObject) {
-                blockObject.destroy();
-            },
-
-            /**
-             * @ngdoc method
-             * @name getLayout
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Retrieve the layout object from this specific property editor model.
-             * @param {object} defaultStructure if no data exist the layout of your poerty editor will be set to this object.
-             * @return {Object} Layout object, structure depends on the model of your property editor.
-             */
-            getLayout: function (defaultStructure) {
-                if (!this.value.layout[this.propertyEditorAlias]) {
-                    this.value.layout[this.propertyEditorAlias] = defaultStructure;
-                }
-                return this.value.layout[this.propertyEditorAlias];
-            },
-
-            /**
-             * @ngdoc method
-             * @name create
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Create a empty layout entry, notice the layout entry is not added to the property editors model layout object, since the layout sturcture depends on the property editor.
-             * @param {string} contentElementTypeKey the contentElementTypeKey of the block you wish to create, if contentElementTypeKey is not avaiable in the block configuration then ´null´ will be returned.
-             * @return {Object | null} Layout entry object, to be inserted at a decired location in the layout object. Or null if contentElementTypeKey is unavaiaible.
-             */
-            create: function (contentElementTypeKey) {
-
-                var blockConfiguration = this.getBlockConfiguration(contentElementTypeKey);
-                if (blockConfiguration === null) {
-                    return null;
-                }
-
-                var entry = {
-                    contentUdi: createDataEntry(contentElementTypeKey, this.value.contentData)
-                }
-
-                if (blockConfiguration.settingsElementTypeKey != null) {
-                    entry.settingsUdi = createDataEntry(blockConfiguration.settingsElementTypeKey, this.value.settingsData)
-                }
-
-                return entry;
-            },
-
-            /**
-             * @ngdoc method
-             * @name createFromElementType
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Insert data from ElementType Model
-             * @return {Object | null} Layout entry object, to be inserted at a decired location in the layout object. Or ´null´ if the given ElementType isnt supported by the block configuration.
-             */
-            createFromElementType: function (elementTypeDataModel) {
-
-                elementTypeDataModel = clipboardService.parseContentForPaste(elementTypeDataModel, clipboardService.TYPES.ELEMENT_TYPE);
-
-                var contentElementTypeKey = elementTypeDataModel.contentTypeKey;
-
-                var layoutEntry = this.create(contentElementTypeKey);
-                if (layoutEntry === null) {
-                    return null;
-                }
-
-                var dataModel = getDataByUdi(layoutEntry.contentUdi, this.value.contentData);
-                if (dataModel === null) {
-                    return null;
-                }
-
-                mapToPropertyModel(elementTypeDataModel, dataModel);
-
-                return layoutEntry;
-
-            },
-            /**
-             * @ngdoc method
-             * @name createFromBlockData
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Insert data from raw models
-             * @return {Object | null} Layout entry object, to be inserted at a decired location in the layout object. Or ´null´ if the given ElementType isnt supported by the block configuration.
-             */
-            createFromBlockData: function (blockData) {
-
-                blockData = clipboardService.parseContentForPaste(blockData, clipboardService.TYPES.BLOCK);
-
-                // As the blockData is a cloned object we can use its layout part for our layout entry.
-                var layoutEntry = blockData.layout;
-                if (layoutEntry === null) {
-                    return null;
-                }
-
-                var blockConfiguration;
-
-                if (blockData.data) {
-                    // Ensure that we support the alias:
-                    blockConfiguration = this.getBlockConfiguration(blockData.data.contentTypeKey);
-                    if(blockConfiguration === null) {
-                        return null;
-                    }
-
-                    this.value.contentData.push(blockData.data);
-                } else {
-                    // We do not have data, this cannot be succesful paste.
-                    return null;
-                }
-
-                if (blockData.settingsData) {
-                    // Ensure that we support the alias:
-                    if(blockConfiguration.settingsElementTypeKey) {
-                        // If we have settings for this Block Configuration, we need to check that they align, if we dont we do not want to fail.
-                        if(blockConfiguration.settingsElementTypeKey === blockData.settingsData.contentTypeKey) {
-                            this.value.settingsData.push(blockData.settingsData);
-                        } else {
-                            notificationsService.error("Clipboard", "Couldn't paste because settings-data is not compatible.");
-                            return null;
-                        }
-                    } else {
-                        // We do not have settings currently, so lets get rid of the settings part and move on with the paste.
-                        delete layoutEntry.settingUdi;
-                    }
-                }
-
-                return layoutEntry;
-
-            },
-
-            /**
-             * @ngdoc method
-             * @name sync
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Force immidiate update of the blockobject models to the property model.
-             */
-            sync: function () {
-                for (const key in this.isolatedScope.blockObjects) {
-                    this.isolatedScope.blockObjects[key].sync();
-                }
-            },
-
-            /**
-             * @ngdoc method
-             * @name removeDataByUdi
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Removes the content data of a given UDI.
-             * Notice this method does not remove the block from your layout, this will need to be handled by the Property Editor since this services don't know about your layout structure.
-             * @param {string} udi The UDI of the content data to be removed.
-             */
-            removeDataByUdi: function (udi) {
-                const index = this.value.contentData.findIndex(o => o.udi === udi);
-                if (index !== -1) {
-                    this.value.contentData.splice(index, 1);
-                }
-            },
-
-            /**
-             * @ngdoc method
-             * @name removeSettingsByUdi
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Removes the settings data of a given UDI.
-             * Notice this method does not remove the settingsUdi from your layout, this will need to be handled by the Property Editor since this services don't know about your layout structure.
-             * @param {string} udi The UDI of the settings data to be removed.
-             */
-            removeSettingsByUdi: function (udi) {
-                const index = this.value.settingsData.findIndex(o => o.udi === udi);
-                if (index !== -1) {
-                    this.value.settingsData.splice(index, 1);
-                }
-            },
-
-            /**
-             * @ngdoc method
-             * @name destroy
-             * @methodOf umbraco.services.blockEditorModelObject
-             * @description Notice you should not need to destroy the BlockEditorModelObject since it will automaticly be destroyed when the scope of existance gets destroyed.
-             */
-            destroy: function () {
-
-                this.__watchers.forEach(w => { w(); });
-                for (const key in this.isolatedScope.blockObjects) {
-                    this.destroyBlockObject(this.isolatedScope.blockObjects[key]);
-                }
-
-                delete this.__watchers;
-                delete this.value;
-                delete this.propertyEditorAlias;
-                delete this.blockConfigurations;
-                delete this.scaffolds;
-                this.isolatedScope.$destroy();
-                delete this.isolatedScope;
-                delete this.__scopeOfExistence;
-                delete this.destroy;
-            }
-        }
-
-        return BlockEditorModelObject;
-    }
-
-    angular.module('umbraco.services').service('blockEditorModelObject', blockEditorModelObjectFactory);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
deleted file mode 100644
index 238d9a8ee6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
+++ /dev/null
@@ -1,501 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.clipboardService
- *
- * @requires notificationsService
- * @requires eventsService
- *
- * @description
- * Service to handle clipboard in general across the application. Responsible for handling the data both storing and retrieve.
- * The service has a set way for defining a data-set by a entryType and alias, which later will be used to retrieve the posible entries for a paste scenario.
- *
- */
-function clipboardService($window, notificationsService, eventsService, localStorageService, iconHelper) {
-
-
-    const TYPES = {};
-    TYPES.ELEMENT_TYPE = "elementType";
-    TYPES.BLOCK = "block";
-    TYPES.RAW = "raw";
-    TYPES.MEDIA = "media";
-
-    var clearPropertyResolvers = {};
-    var pastePropertyResolvers = {};
-    var clipboardTypeResolvers = {};
-
-    clipboardTypeResolvers[TYPES.ELEMENT_TYPE] = function(element, propMethod) {
-        for (var t = 0; t < element.variants[0].tabs.length; t++) {
-            var tab = element.variants[0].tabs[t];
-            for (var p = 0; p < tab.properties.length; p++) {
-                var prop = tab.properties[p];
-                propMethod(prop, TYPES.ELEMENT_TYPE);
-            }
-        }
-    }
-    clipboardTypeResolvers[TYPES.BLOCK] = function (block, propMethod) {
-
-        propMethod(block, TYPES.BLOCK);
-
-        if(block.data) {
-            Object.keys(block.data).forEach( key => {
-                if(key === 'udi' || key === 'contentTypeKey') {
-                    return;
-                }
-                propMethod(block.data[key], TYPES.RAW);
-            });
-        }
-
-        if(block.settingsData) {
-            Object.keys(block.settingsData).forEach( key => {
-                if(key === 'udi' || key === 'contentTypeKey') {
-                    return;
-                }
-                propMethod(block.settingsData[key], TYPES.RAW);
-            });
-        }
-
-        /*
-        // Concept for supporting Block that contains other Blocks.
-        // Missing clarifications:
-        // How do we ensure that the inner blocks of a block is supported in the new scenario. Not that likely but still relevant, so considerations should be made.
-        if(block.references) {
-            // A Block clipboard entry can contain other Block Clipboard Entries, here we will make sure to resolve those identical to the main entry.
-            for (var r = 0; r < block.references.length; r++) {
-                clipboardTypeResolvers[TYPES.BLOCK](block.references[r], propMethod);
-            }
-        }
-        */
-    }
-    clipboardTypeResolvers[TYPES.RAW] = function(data, propMethod) {
-        for (var p = 0; p < data.length; p++) {
-            propMethod(data[p], TYPES.RAW);
-        }
-    }
-    clipboardTypeResolvers[TYPES.MEDIA] = function(data, propMethod) {
-        // no resolving needed for this type currently.
-    }
-
-    var STORAGE_KEY = "umbClipboardService";
-
-    var retrieveStorage = function() {
-        if (localStorageService.isSupported === false) {
-            return null;
-        }
-        var dataJSON;
-        var dataString = localStorageService.get(STORAGE_KEY);
-        if (dataString != null) {
-            dataJSON = JSON.parse(dataString);
-        }
-
-        if(dataJSON == null) {
-            dataJSON = new Object();
-        }
-
-        if(dataJSON.entries === undefined) {
-            dataJSON.entries = [];
-        }
-
-        return dataJSON;
-    }
-
-    var saveStorage = function(storage) {
-        var storageString = JSON.stringify(storage);
-
-        try {
-            // Check that we can parse the JSON:
-            var _ = JSON.parse(storageString);
-
-            // Store the string:
-            localStorageService.set(STORAGE_KEY, storageString);
-
-            eventsService.emit("clipboardService.storageUpdate");
-
-            return true;
-        } catch(e) {
-            return false;
-        }
-    }
-
-    function resolvePropertyForStorage(prop, type) {
-
-        type = type || "raw";
-        var resolvers = clearPropertyResolvers[type];
-        if (resolvers) {
-            for (var i=0; i<resolvers.length; i++) {
-                resolvers[i](prop, resolvePropertyForStorage);
-            }
-        }
-    }
-
-    var prepareEntryForStorage = function(type, entryData, firstLevelClearupMethod) {
-
-        var cloneData = Utilities.copy(entryData);
-        if (firstLevelClearupMethod != undefined) {
-            firstLevelClearupMethod(cloneData);
-        }
-
-        var typeResolver = clipboardTypeResolvers[type];
-        if(typeResolver) {
-            typeResolver(cloneData, resolvePropertyForStorage);
-        } else {
-            console.warn("Umbraco.service.clipboardService has no type resolver for '" + type + "'.");
-        }
-
-        return cloneData;
-    }
-
-    var isEntryCompatible = function(entry, type, allowedAliases) {
-        return entry.type === type
-        &&
-        (
-            allowedAliases === null
-            ||
-            (entry.alias && allowedAliases.filter(allowedAlias => allowedAlias === entry.alias).length > 0)
-            ||
-            (entry.aliases && entry.aliases.filter(entryAlias => allowedAliases.filter(allowedAlias => allowedAlias === entryAlias).length > 0).length === entry.aliases.length)
-        );
-    }
-
-    function resolvePropertyForPaste(prop, type) {
-
-        type = type || "raw";
-        var resolvers = pastePropertyResolvers[type];
-        if (resolvers) {
-            for (var i=0; i<resolvers.length; i++) {
-                resolvers[i](prop, resolvePropertyForPaste);
-            }
-        }
-    }
-
-    var service = {};
-
-    /**
-     * Default types to store in clipboard.
-     */
-    service.TYPES = TYPES;
-
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.clipboardService#parseContentForPaste
-    * @methodOf umbraco.services.clipboardService
-    *
-    * @param {object} function The content entry to be cloned and resolved.
-    *
-    * @description
-    * Executed registered property resolvers for inner properties, to be done on pasting a clipbaord content entry.
-    *
-    */
-    service.parseContentForPaste = function(pasteEntryData, type) {
-        var cloneData = Utilities.copy(pasteEntryData);
-
-        var typeResolver = clipboardTypeResolvers[type];
-        if (typeResolver) {
-            typeResolver(cloneData, resolvePropertyForPaste);
-        } else {
-            console.warn("Umbraco.service.clipboardService has no type resolver for '" + type + "'.");
-        }
-
-        return cloneData;
-    }
-
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.clipboardService#registrerClearPropertyResolver
-    * @methodOf umbraco.services.clipboardService
-    *
-    * @param {string} function A method executed for every property and inner properties copied.
-    * @param {string} string A string representing the property type format for this resolver to execute for.
-    *
-    * @description
-    * Executed for all properties of given type when performing a copy action.
-    *
-    * @deprecated Incorrect spelling please use 'registerClearPropertyResolver'
-    */
-    service.registrerClearPropertyResolver = function(resolver, type) {
-        this.registerClearPropertyResolver(resolver, type);
-    };
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.clipboardService#registerClearPropertyResolver
-    * @methodOf umbraco.services.clipboardService
-    *
-    * @param {method} function A method executed for every property and inner properties copied. Notice the method both needs to deal with retriving a property object {alias:..editor:..value:... ,...} and the raw property value as if the property is an inner property of a nested property.
-    * @param {string} string A string representing the property type format for this resolver to execute for.
-    *
-    * @description
-    * Executed for all properties of given type when performing a copy action.
-    */
-    service.registerClearPropertyResolver = function(resolver, type) {
-        type = type || "raw";
-        if(!clearPropertyResolvers[type]) {
-            clearPropertyResolvers[type] = [];
-        }
-        clearPropertyResolvers[type].push(resolver);
-    };
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.clipboardService#registerPastePropertyResolver
-    * @methodOf umbraco.services.clipboardService
-    *
-    * @param {method} function A method executed for every property and inner properties copied. Notice the method both needs to deal with retriving a property object {alias:..editor:..value:... ,...} and the raw property value as if the property is an inner property of a nested property.
-    * @param {string} string A string representing the property type format for this resolver to execute for.
-    *
-    * @description
-    * Executed for all properties of given type when performing a paste action.
-    */
-    service.registerPastePropertyResolver = function(resolver, type) {
-        type = type || "raw";
-        if(!pastePropertyResolvers[type]) {
-            pastePropertyResolvers[type] = [];
-        }
-        pastePropertyResolvers[type].push(resolver);
-    };
-
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.clipboardService#registrerTypeResolvers
-    * @methodOf umbraco.services.clipboardService
-    *
-    * @param {method} function A method for to execute resolvers for each properties of the specific type.
-    * @param {string} string A string representing the content type format for this resolver to execute for.
-    *
-    * @description
-    * Executed for all properties including inner properties when performing a paste action.
-    */
-    service.registrerTypeResolvers = function(resolver, type) {
-        if(!clipboardTypeResolvers[type]) {
-            clipboardTypeResolvers[type] = [];
-        }
-        clipboardTypeResolvers[type].push(resolver);
-    };
-
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.clipboardService#copy
-    * @methodOf umbraco.services.clipboardService
-    *
-    * @param {string} type A string defining the type of data to storing, example: 'elementType', 'contentNode'
-    * @param {string} alias A string defining the alias of the data to store, example: 'product'
-    * @param {object} entry A object containing the properties to be saved, this could be the object of a ElementType, ContentNode, ...
-    * @param {string} displayLabel (optional) A string swetting the label to display when showing paste entries.
-    * @param {string} displayIcon (optional) A string setting the icon to display when showing paste entries.
-    * @param {string} uniqueKey (optional) A string prodiving an identifier for this entry, existing entries with this key will be removed to ensure that you only have the latest copy of this data.
-    *
-    * @description
-    * Saves a single JS-object with a type and alias to the clipboard.
-    */
-    service.copy = function(type, alias, data, displayLabel, displayIcon, uniqueKey, firstLevelClearupMethod) {
-
-        var storage = retrieveStorage();
-
-        displayLabel = displayLabel || data.name;
-        displayIcon = displayIcon || iconHelper.convertFromLegacyIcon(data.icon);
-        uniqueKey = uniqueKey || data.key || console.error("missing unique key for this content");
-
-        // remove previous copies of this entry:
-        storage.entries = storage.entries.filter(
-            (entry) => {
-                return entry.unique !== uniqueKey;
-            }
-        );
-
-        var entry = {unique:uniqueKey, type:type, alias:alias, data:prepareEntryForStorage(type, data, firstLevelClearupMethod), label:displayLabel, icon:displayIcon, date:Date.now()};
-        storage.entries.push(entry);
-
-        if (saveStorage(storage) === true) {
-            notificationsService.success("Clipboard", "Copied to clipboard.");
-        } else {
-            notificationsService.error("Clipboard", "Couldnt copy this data to clipboard.");
-        }
-
-    };
-
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.clipboardService#copyArray
-    * @methodOf umbraco.services.clipboardService
-    *
-    * @param {string} type A string defining the type of data to storing, example: 'elementTypeArray', 'contentNodeArray'
-    * @param {string} aliases An array of strings defining the alias of the data to store, example: ['banana', 'apple']
-    * @param {object} datas An array of objects containing the properties to be saved, example: [ElementType, ElementType, ...]
-    * @param {string} displayLabel A string setting the label to display when showing paste entries.
-    * @param {string} displayIcon A string setting the icon to display when showing paste entries.
-    * @param {string} uniqueKey A string prodiving an identifier for this entry, existing entries with this key will be removed to ensure that you only have the latest copy of this data.
-    * @param {string} firstLevelClearupMethod A string prodiving an identifier for this entry, existing entries with this key will be removed to ensure that you only have the latest copy of this data.
-    *
-    * @description
-    * Saves a single JS-object with a type and alias to the clipboard.
-    */
-    service.copyArray = function(type, aliases, datas, displayLabel, displayIcon, uniqueKey, firstLevelClearupMethod) {
-
-        if (type === "elementTypeArray") {
-            type = "elementType";
-        }
-
-        var storage = retrieveStorage();
-
-        // Clean up each entry
-        var copiedDatas = datas.map(data => prepareEntryForStorage(type, data, firstLevelClearupMethod));
-
-        // remove previous copies of this entry (Make sure to not remove copies from unsaved content):
-        storage.entries = storage.entries.filter(
-            (entry) => {
-                if (entry.unique === 0) {
-                    return displayLabel !== entry.label;
-                } else {
-                    return entry.unique !== uniqueKey;
-                }
-            }
-        );
-
-        var entry = {unique:uniqueKey, type:type, aliases:aliases, data:copiedDatas, label:displayLabel, icon:displayIcon, date:Date.now()};
-        storage.entries.push(entry);
-
-        if (saveStorage(storage) === true) {
-            notificationsService.success("Clipboard", "Copied to clipboard.");
-        } else {
-            notificationsService.error("Clipboard", "Couldnt copy this data to clipboard.");
-        }
-
-    };
-
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.supportsCopy#supported
-    * @methodOf umbraco.services.clipboardService
-    *
-    * @description
-    * Determins wether the current browser is able to performe its actions.
-    */
-    service.isSupported = function() {
-        return localStorageService.isSupported;
-    };
-
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.supportsCopy#hasEntriesOfType
-    * @methodOf umbraco.services.clipboardService
-    *
-    * @param {string} type A string defining the type of data test for.
-    * @param {string} aliases A array of strings providing the alias of the data you want to test for.
-    *
-    * @description
-    * Determines whether the current clipboard has entries that match a given type and one of the aliases.
-    */
-    service.hasEntriesOfType = function(type, aliases) {
-
-        if(service.retrieveEntriesOfType(type, aliases).length > 0) {
-            return true;
-        }
-
-        return false;
-    };
-
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.supportsCopy#retrieveEntriesOfType
-    * @methodOf umbraco.services.clipboardService
-    *
-    * @param {string} type A string defining the type of data to recive.
-    * @param {string} aliases A array of strings providing the alias of the data you want to recive.
-    *
-    * @description
-    * Returns an array of entries matching the given type and one of the provided aliases.
-    */
-    service.retrieveEntriesOfType = function(type, allowedAliases) {
-
-        var storage = retrieveStorage();
-
-        // Find entries that are fulfilling the criteria for this nodeType and nodeTypesAliases.
-        var filteretEntries = storage.entries.filter(
-            (entry) => {
-                return isEntryCompatible(entry, type, allowedAliases);
-            }
-        );
-
-        return filteretEntries;
-    };
-
-
-    /**
-    * @obsolete Use the typo-free version instead.
-    */
-    service.retriveEntriesOfType = (type, allowedAliases) => {
-        console.warn('clipboardService.retriveEntriesOfType is obsolete, use clipboardService.retrieveEntriesOfType instead');
-        return service.retrieveEntriesOfType(type, allowedAliases);
-    }
-
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.supportsCopy#retrieveDataOfType
-    * @methodOf umbraco.services.clipboardService
-    *
-    * @param {string} type A string defining the type of data to recive.
-    * @param {string} aliases A array of strings providing the alias of the data you want to recive.
-    *
-    * @description
-    * Returns an array of data of entries matching the given type and one of the provided aliases.
-    */
-    service.retrieveDataOfType = function(type, aliases) {
-        return service.retrieveEntriesOfType(type, aliases).map((x) => x.data);
-    };
-
-
-    /**
-    * @obsolete Use the typo-free version instead.
-    */
-     service.retriveDataOfType = (type, aliases) => {
-        console.warn('clipboardService.retriveDataOfType is obsolete, use clipboardService.retrieveDataOfType instead');
-        return service.retrieveDataOfType(type, aliases);
-    }
-
-    
-    /**
-    * @ngdoc method
-    * @name umbraco.services.supportsCopy#clearEntriesOfType
-    * @methodOf umbraco.services.clipboardService
-    *
-    * @param {string} type A string defining the type of data to remove.
-    * @param {string} aliases A array of strings providing the alias of the data you want to remove.
-    *
-    * @description
-    * Removes entries matching the given type and one of the provided aliases.
-    */
-    service.clearEntriesOfType = function(type, allowedAliases) {
-
-        var storage = retrieveStorage();
-
-        // Find entries that are NOT fulfilling the criteria for this nodeType and nodeTypesAliases.
-        var filteretEntries = storage.entries.filter(
-            (entry) => {
-                return !isEntryCompatible(entry, type, allowedAliases);
-            }
-        );
-
-        storage.entries = filteretEntries;
-
-        saveStorage(storage);
-    };
-
-    var emitClipboardStorageUpdate = _.debounce(function(e) {
-        eventsService.emit("clipboardService.storageUpdate");
-    }, 1000);
-
-    // Fires if LocalStorage was changed from another tab than this one.
-    $window.addEventListener("storage", emitClipboardStorageUpdate);
-
-    return service;
-}
-
-angular.module("umbraco.services").factory("clipboardService", clipboardService);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contentapphelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contentapphelper.service.js
deleted file mode 100644
index 0b3dc2c6e0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/contentapphelper.service.js
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/**
-* @ngdoc service
-* @name umbraco.services.contentAppHelper
-* @description A helper service for content app related functions.
-**/
-function contentAppHelper() {
-
-    var service = {};
-
-    /**
-     * Default known content based apps.
-     */
-    service.CONTENT_BASED_APPS = [ "umbContent", "umbInfo", "umbListView" ];
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.contentAppHelper#isContentBasedApp
-    * @methodOf umbraco.services.contentAppHelper
-    *
-    * @param {object} app A content app to check
-    *
-    * @description
-    * Determines whether the supplied content app is a known content based app
-    *
-    */
-    service.isContentBasedApp = function (app) {
-        return service.CONTENT_BASED_APPS.indexOf(app.alias) !== -1;
-    }
-
-    return service;
-
-}
-
-angular.module('umbraco.services').factory('contentAppHelper', contentAppHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
deleted file mode 100644
index 30afe39884..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
+++ /dev/null
@@ -1,902 +0,0 @@
-
-/**
-* @ngdoc service
-* @name umbraco.services.contentEditingHelper
-* @description A helper service for most editors, some methods are specific to content/media/member model types but most are used by
-* all editors to share logic and reduce the amount of replicated code among editors.
-**/
-function contentEditingHelper(fileManager, $q, $location, $routeParams, editorState, notificationsService, navigationService, localizationService, serverValidationManager, formHelper, contentTypeHelper) {
-
-    function isValidIdentifier(id) {
-
-        //empty id <= 0
-        if (Utilities.isNumber(id)) {
-            if (id === 0) {
-                return false;
-            }
-            if (id > 0) {
-                return true;
-            }
-        }
-
-        //empty guid
-        if (id === "00000000-0000-0000-0000-000000000000") {
-            return false;
-        }
-
-        //empty string / alias
-        if (id === "") {
-            return false;
-        }
-
-        return true;
-    }
-
-    function showNotificationsForModelsState(ms, messageType) {
-        messageType = messageType || 2;
-        for (const [key, value] of Object.entries(ms)) {
-
-            var errorMsg = value[0];
-            // if the error message is json it's a complex editor validation response that we need to parse
-            if ((Utilities.isString(errorMsg) && errorMsg.startsWith("[")) || Utilities.isArray(errorMsg)) {
-                // flatten the json structure, create validation paths for each property and add each as a property error
-                var idsToErrors = serverValidationManager.parseComplexEditorError(errorMsg, "");
-                idsToErrors.forEach(x => {
-                    if (x.modelState) {
-                        showNotificationsForModelsState(x.modelState, messageType);
-                    }
-                });
-            }
-            else if (value[0]) {
-                notificationsService.showNotification({type:messageType, header:"Validation", message:value[0]})
-            }
-        }
-    }
-
-    return {
-
-        //TODO: We need to move some of this to formHelper for saving, too many editors use this method for saving when this entire
-        //service should only be used for content/media/members
-
-        /** Used by the content editor and mini content editor to perform saving operations */
-        contentEditorPerformSave: function (args) {
-            if (!Utilities.isObject(args)) {
-                throw "args must be an object";
-            }
-            if (!args.scope) {
-                throw "args.scope is not defined";
-            }
-            if (!args.content) {
-                throw "args.content is not defined";
-            }
-            if (!args.saveMethod) {
-                throw "args.saveMethod is not defined";
-            }
-            if (args.showNotifications === undefined) {
-                args.showNotifications = true;
-            }
-            // needed for infinite editing to create new items
-            if (args.create === undefined) {
-                if ($routeParams.create) {
-                    args.create = true;
-                }
-            }
-            if (args.softRedirect === undefined) {
-                //when true, the url will change but it won't actually re-route
-                //this is merely here for compatibility, if only the content/media/members used this service we'd prob be ok but tons of editors
-                //use this service unfortunately and probably packages too.
-                args.softRedirect = false;
-            }
-
-
-            var self = this;
-
-            //we will use the default one for content if not specified
-            var rebindCallback = args.rebindCallback === undefined ? self.reBindChangedProperties : args.rebindCallback;
-
-            var formSubmitOptions = { scope: args.scope, action: args.action };
-            if(args.skipValidation === true) {
-                formSubmitOptions.skipValidation = true;
-                formSubmitOptions.keepServerValidation = true;
-            }
-            if (formHelper.submitForm(formSubmitOptions)) {
-
-                return args.saveMethod(args.content, args.create, fileManager.getFiles(), args.showNotifications)
-                    .then(function (data) {
-
-                        formHelper.resetForm({ scope: args.scope });
-
-                        if (!args.infiniteMode) {
-                            self.handleSuccessfulSave({
-                                scope: args.scope,
-                                savedContent: data,
-                                softRedirect: args.softRedirect,
-                                rebindCallback: function () {
-                                    rebindCallback.apply(self, [args.content, data]);
-                                }
-                            });
-
-                            //update editor state to what is current
-                            editorState.set(args.content);
-                        }
-
-                        return $q.resolve(data);
-
-                    }, function (err) {
-
-                        formHelper.resetForm({ scope: args.scope, hasErrors: true });
-
-                        self.handleSaveError({
-                            showNotifications: args.showNotifications,
-                            softRedirect: args.softRedirect,
-                            err: err,
-                            action: args.action,
-                            rebindCallback: function () {
-                                // if the error contains data, we want to map that back as we want to continue editing this save. Especially important when the content is new as the returned data will contain ID etc.
-                                if(err.data) {
-                                    rebindCallback.apply(self, [args.content, err.data]);
-                                }
-                            }
-                        });
-
-                        //update editor state to what is current
-                        editorState.set(args.content);
-
-                        //needs to be manually set for infinite editing mode
-                        args.scope.isNew = args.content.id === 0 && args.scope.isNew;
-
-                        return $q.reject(err);
-                    });
-            }
-            else {
-                return $q.reject();
-            }
-
-        },
-
-        /** Used by the content editor and media editor to add an info tab to the tabs array (normally known as the properties tab) */
-        addInfoTab: function (tabs) {
-
-            var infoTab = {
-                "alias": "_umb_infoTab",
-                "id": -1,
-                "label": "Info",
-                "properties": []
-            };
-
-            // first check if tab is already added
-            var foundInfoTab = false;
-
-            tabs.forEach(function (tab) {
-                if (tab.id === infoTab.id && tab.alias === infoTab.alias) {
-                    foundInfoTab = true;
-                }
-            });
-
-            // add info tab if is is not found
-            if (!foundInfoTab) {
-                localizationService.localize("general_info").then(function (value) {
-                    infoTab.label = value;
-                    tabs.push(infoTab);
-                });
-            }
-
-        },
-
-        registerGenericTab: function (groups) {
-            if (!groups) {
-                return;
-            }
-
-            const hasGenericTab = groups.find(group => group.isGenericTab);
-            if (hasGenericTab) {
-                return;
-            }
-
-            const isRootGroup = (group) => group.type === contentTypeHelper.TYPE_GROUP && group.parentAlias === null;
-            const hasRootGroups = groups.filter(group => isRootGroup(group)).length > 0;
-            if (!hasRootGroups) {
-                return;
-            }
-
-            const genericTab = {
-                isGenericTab: true,
-                type: contentTypeHelper.TYPE_TAB,
-                label: 'Generic',
-                key: String.CreateGuid(),
-                alias: null,
-                parentAlias: null,
-                properties: []
-            };
-
-            localizationService.localize("general_generic").then(function (value) {
-                genericTab.label = value;
-                groups.unshift(genericTab);
-            });
-        },
-
-        /** Returns the action button definitions based on what permissions the user has.
-        The content.allowedActions parameter contains a list of chars, each represents a button by permission so
-        here we'll build the buttons according to the chars of the user. */
-        configureContentEditorButtons: function (args) {
-
-            if (!Utilities.isObject(args)) {
-                throw "args must be an object";
-            }
-            if (!args.content) {
-                throw "args.content is not defined";
-            }
-            if (!args.methods) {
-                throw "args.methods is not defined";
-            }
-            if (!args.methods.saveAndPublish || !args.methods.sendToPublish || !args.methods.unpublish || !args.methods.schedulePublish || !args.methods.publishDescendants) {
-                throw "args.methods does not contain all required defined methods";
-            }
-
-            var buttons = {
-                defaultButton: null,
-                subButtons: []
-            };
-
-            function createButtonDefinition(ch) {
-                switch (ch) {
-                    case "U":
-                        //publish action
-                        return {
-                            letter: ch,
-                            labelKey: "buttons_saveAndPublish",
-                            handler: args.methods.saveAndPublish,
-                            hotKey: "ctrl+p",
-                            hotKeyWhenHidden: true,
-                            alias: "saveAndPublish",
-                            addEllipsis: args.content.variants && args.content.variants.length > 1 ? "true" : "false"
-                        };
-                    case "H":
-                        //send to publish
-                        return {
-                            letter: ch,
-                            labelKey: "buttons_saveToPublish",
-                            handler: args.methods.sendToPublish,
-                            hotKey: "ctrl+p",
-                            hotKeyWhenHidden: true,
-                            alias: "sendToPublish",
-                            addEllipsis: args.content.variants && args.content.variants.length > 1 ? "true" : "false"
-                        };
-                    case "Z":
-                        //unpublish
-                        return {
-                            letter: ch,
-                            labelKey: "content_unpublish",
-                            handler: args.methods.unpublish,
-                            hotKey: "ctrl+u",
-                            hotKeyWhenHidden: true,
-                            alias: "unpublish",
-                            addEllipsis: "true"
-                        };
-                    case "SCHEDULE":
-                        //schedule publish - schedule doesn't have a permission letter so
-                        // the button letter is made unique so it doesn't collide with anything else
-                        return {
-                            letter: ch,
-                            labelKey: "buttons_schedulePublish",
-                            handler: args.methods.schedulePublish,
-                            hotKey: "alt+shift+s",
-                            hotKeyWhenHidden: true,
-                            alias: "schedulePublish",
-                            addEllipsis: "true"
-                        };
-                    case "PUBLISH_DESCENDANTS":
-                        // Publish descendants - it doesn't have a permission letter so
-                        // the button letter is made unique so it doesn't collide with anything else
-                        return {
-                            letter: ch,
-                            labelKey: "buttons_publishDescendants",
-                            handler: args.methods.publishDescendants,
-                            hotKey: "alt+shift+p",
-                            hotKeyWhenHidden: true,
-                            alias: "publishDescendant",
-                            addEllipsis: "true"
-                        };
-                    default:
-                        return null;
-                }
-            }
-
-            //reset
-            buttons.subButtons = [];
-
-            //This is the ideal button order but depends on circumstance, we'll use this array to create the button list
-            // Publish, SendToPublish
-            var buttonOrder = ["U", "H", "SCHEDULE", "PUBLISH_DESCENDANTS"];
-
-            //Create the first button (primary button)
-            //We cannot have the Save or SaveAndPublish buttons if they don't have create permissions when we are creating a new item.
-            //Another tricky rule is if they only have Create + Browse permissions but not Save but if it's being created then they will
-            // require the Save button in order to create.
-            //So this code is going to create the primary button (either Publish, SendToPublish, Save) if we are not in create mode
-            // or if the user has access to create.
-            if (!args.create || _.contains(args.content.allowedActions, "C")) {
-                for (var b in buttonOrder) {
-                    if (_.contains(args.content.allowedActions, buttonOrder[b])) {
-                        buttons.defaultButton = createButtonDefinition(buttonOrder[b]);
-                        break;
-                    }
-                }
-
-                //Here's the special check, if the button still isn't set and we are creating and they have create access
-                //we need to add the Save button
-                if (!buttons.defaultButton && args.create && _.contains(args.content.allowedActions, "C")) {
-                    buttons.defaultButton = createButtonDefinition("A");
-                }
-            }
-
-            //Now we need to make the drop down button list, this is also slightly tricky because:
-            //We cannot have any buttons if there's no default button above.
-            //We cannot have the unpublish button (Z) when there's no publish permission.
-            //We cannot have the unpublish button (Z) when the item is not published.
-            if (buttons.defaultButton) {
-
-                //get the last index of the button order
-                var lastIndex = _.indexOf(buttonOrder, buttons.defaultButton.letter);
-                //add the remaining
-                for (var i = lastIndex + 1; i < buttonOrder.length; i++) {
-                    if (_.contains(args.content.allowedActions, buttonOrder[i])) {
-                        buttons.subButtons.push(createButtonDefinition(buttonOrder[i]));
-                    }
-                }
-
-                // if publishing is allowed also allow schedule publish
-                // we add this manually becuase it doesn't have a permission so it wont
-                // get picked up by the loop through permissions
-                if (_.contains(args.content.allowedActions, "U")) {
-                    buttons.subButtons.push(createButtonDefinition("SCHEDULE"));
-                    buttons.subButtons.push(createButtonDefinition("PUBLISH_DESCENDANTS"));
-                }
-
-                // if we are not creating, then we should add unpublish too,
-                // so long as it's already published and if the user has access to publish
-                // and the user has access to unpublish (may have been removed via Event)
-                if (!args.create) {
-                    var hasPublishedVariant = args.content.variants.filter(function (variant) { return (variant.state === "Published" || variant.state === "PublishedPendingChanges"); }).length > 0;
-                    if (hasPublishedVariant && _.contains(args.content.allowedActions, "U") && _.contains(args.content.allowedActions, "Z")) {
-                        buttons.subButtons.push(createButtonDefinition("Z"));
-                    }
-                }
-            }
-
-            return buttons;
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.contentEditingHelper#getAllProps
-         * @methodOf umbraco.services.contentEditingHelper
-         * @function
-         *
-         * @description
-         * Returns all propertes contained for the tabbed content item
-         */
-        getAllProps: function (content) {
-            var allProps = [];
-
-            for (var i = 0; i < content.tabs.length; i++) {
-                for (var p = 0; p < content.tabs[i].properties.length; p++) {
-                    allProps.push(content.tabs[i].properties[p]);
-                }
-            }
-
-            return allProps;
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.contentEditingHelper#buildCompositeVariantId
-         * @methodOf umbraco.services.contentEditingHelper
-         * @function
-         *
-         * @description
-         * Returns a id for the variant that is unique between all variants on the content
-         * Note "invariant" is used for the invariant culture,
-         * "null" is used for the NULL segment
-         */
-        buildCompositeVariantId: function (variant) {
-            return (variant.language ? variant.language.culture : "invariant") + "_" + (variant.segment ? variant.segment : "null");
-        },
-
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.contentEditingHelper#configureButtons
-         * @methodOf umbraco.services.contentEditingHelper
-         * @function
-         *
-         * @description
-         * Returns a letter array for buttons, with the primary one first based on content model, permissions and editor state
-         */
-        getAllowedActions: function (content, creating) {
-
-            //This is the ideal button order but depends on circumstance, we'll use this array to create the button list
-            // Publish, SendToPublish, Save
-            var actionOrder = ["U", "H", "A"];
-            var defaultAction = null; 
-            var actions = [];
-
-            //Create the first button (primary button)
-            //We cannot have the Save or SaveAndPublish buttons if they don't have create permissions when we are creating a new item.
-            if (!creating || _.contains(content.allowedActions, "C")) {
-                for (var b in actionOrder) {
-                    if (_.contains(content.allowedActions, actionOrder[b])) {
-                        defaultAction = actionOrder[b];
-                        break;
-                    }
-                }
-            }
-
-            actions.push(defaultAction);
-
-            //Now we need to make the drop down button list, this is also slightly tricky because:
-            //We cannot have any buttons if there's no default button above.
-            //We cannot have the unpublish button (Z) when there's no publish permission.
-            //We cannot have the unpublish button (Z) when the item is not published.
-            if (defaultAction) {
-                //get the last index of the button order
-                var lastIndex = _.indexOf(actionOrder, defaultAction);
-
-                //add the remaining
-                for (var i = lastIndex + 1; i < actionOrder.length; i++) {
-                    if (_.contains(content.allowedActions, actionOrder[i])) {
-                        actions.push(actionOrder[i]);
-                    }
-                }
-
-                //if we are not creating, then we should add unpublish too,
-                // so long as it's already published and if the user has access to publish
-                if (!creating) {
-                    if (content.publishDate && _.contains(content.allowedActions, "U")) {
-                        actions.push("Z");
-                    }
-                }
-            }
-
-            return actions;
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.contentEditingHelper#getButtonFromAction
-         * @methodOf umbraco.services.contentEditingHelper
-         * @function
-         *
-         * @description
-         * Returns a button object to render a button for the tabbed editor
-         * currently only returns built in system buttons for content and media actions
-         * returns label, alias, action char and hot-key
-         */
-        getButtonFromAction: function (ch) {
-            switch (ch) {
-                case "U":
-                    return {
-                        letter: ch,
-                        labelKey: "buttons_saveAndPublish",
-                        handler: "saveAndPublish",
-                        hotKey: "ctrl+p"
-                    };
-                case "H":
-                    //send to publish
-                    return {
-                        letter: ch,
-                        labelKey: "buttons_saveToPublish",
-                        handler: "sendToPublish",
-                        hotKey: "ctrl+p"
-                    };
-                case "A":
-                    return {
-                        letter: ch,
-                        labelKey: "buttons_save",
-                        handler: "save",
-                        hotKey: "ctrl+s"
-                    };
-                case "Z":
-                    return {
-                        letter: ch,
-                        labelKey: "content_unpublish",
-                        handler: "unpublish"
-                    };
-
-                default:
-                    return null;
-            }
-
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.contentEditingHelper#getPermissionsForContent
-         * @methodOf umbraco.services.contentEditingHelper
-         * @function
-         *
-         * @description
-         * Returns a object with permissions for user.
-         */
-        getPermissionsForContent: function () {
-
-            // Just ensure we do have an editorState
-            if (!editorState.current) return null;
-            
-            // Fetch current node allowed actions for the current user
-            // This is the current node & not each individual child node in the list
-            const currentUserPermissions = editorState.current.allowedActions || [];
-
-            // Create a nicer model rather than the funky & hard to remember permissions strings
-            const currentNodePermissions = {
-                canCopy: currentUserPermissions.includes('O'), //Magic Char = O
-                canCreate: currentUserPermissions.includes('C'), //Magic Char = C
-                canDelete: currentUserPermissions.includes('D'), //Magic Char = D
-                canMove: currentUserPermissions.includes('M'), //Magic Char = M
-                canPublish: currentUserPermissions.includes('U'), //Magic Char = U
-                canUnpublish: currentUserPermissions.includes('Z') //Magic Char = Z
-            };
-            
-            return currentNodePermissions;
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.contentEditingHelper#reBindChangedProperties
-         * @methodOf umbraco.services.contentEditingHelper
-         * @function
-         *
-         * @description
-         * Re-binds all changed property values to the origContent object from the savedContent object and returns an array of changed properties.
-         * This re-binds both normal object property values along with content property values and works for content, media and members.
-         * For variant content, this detects if the object contains the 'variants' property (i.e. for content) and re-binds all variant content properties.
-         * This returns the list of changed content properties (does not include standard object property changes).
-         */
-        reBindChangedProperties: function (origContent, savedContent) {
-
-            // TODO: We should probably split out this logic to deal with media/members separately to content
-
-            //a method to ignore built-in prop changes
-            var shouldIgnore = function (propName) {
-                return _.some([
-                    "variants",
-
-                    "tabs",
-                    "properties",
-                    "apps",
-                    "createDateFormatted",
-                    "releaseDateFormatted",
-                    "expireDateFormatted",
-                    "releaseDate",
-                    "expireDate"
-                ], function (i) {
-                    return i === propName;
-                });
-            };
-
-            //check for changed built-in properties of the content based on the server response object
-            for (var o in savedContent) {
-
-                //ignore the ones listed in the array
-                if (shouldIgnore(o)) {
-                    continue;
-                }
-
-                if (!_.isEqual(origContent[o], savedContent[o])) {
-                    origContent[o] = savedContent[o];
-                }
-            }
-
-            //Now re-bind content properties. Since content has variants and media/members doesn't,
-            //we'll detect the variants property for content to distinguish if it's content vs media/members.
-
-            var isContent = false;
-
-            var origVariants = [];
-            var savedVariants = [];
-            if (origContent.variants) {
-                isContent = true;
-                //it's content so assign the variants as they exist
-                origVariants = origContent.variants;
-                savedVariants = savedContent.variants;
-            }
-            else {
-                //it's media/member, so just add the object as-is to the variants collection
-                origVariants.push(origContent);
-                savedVariants.push(savedContent);
-            }
-
-            var changed = [];
-
-            function getNewProp(alias, allNewProps) {
-                return _.find(allNewProps, function (item) {
-                    return item.alias === alias;
-                });
-            }
-
-            //loop through each variant (i.e. tabbed content)
-            for (var j = 0; j < origVariants.length; j++) {
-
-                var origVariant = origVariants[j];
-                var savedVariant = savedVariants[j];
-
-                //special case for content, don't sync this variant if it wasn't tagged
-                //for saving in the first place
-                if (isContent && !origVariant.save) {
-                    continue;
-                }
-
-                //if it's content (not media/members), then we need to sync the variant specific data
-                if (origContent.variants) {
-
-                    //the variant property names we need to sync
-                    var variantPropertiesSync = ["state"];
-
-                    //loop through the properties returned on the server object
-                    for (var b in savedVariant) {
-
-                        var shouldCompare = _.some(variantPropertiesSync, function (e) {
-                            return e === b;
-                        });
-
-                        //only compare the explicit ones or ones we don't ignore
-                        if (shouldCompare || !shouldIgnore(b)) {
-                            if (!_.isEqual(origVariant[b], savedVariant[b])) {
-                                origVariant[b] = savedVariant[b];
-                            }
-                        }
-                    }
-                }
-
-                //get a list of properties since they are contained in tabs
-                var allOrigProps = this.getAllProps(origVariant);
-                var allNewProps = this.getAllProps(savedVariant);
-
-                //check for changed properties of the content
-                for (var k = 0; k < allOrigProps.length; k++) {
-
-                    var origProp = allOrigProps[k];
-                    var alias = origProp.alias;
-                    var newProp = getNewProp(alias, allNewProps);
-                    if (newProp) {
-                        // Always update readonly state
-                        origProp.readonly = newProp.readonly;
-
-                        // Check whether the value has changed and update accordingly
-                        if (!_.isEqual(origProp.value, newProp.value)) {
-
-                            //they have changed so set the origContent prop to the new one
-                            var origVal = origProp.value;
-
-                            origProp.value = newProp.value;
-
-                            //instead of having a property editor $watch their expression to check if it has
-                            // been updated, instead we'll check for the existence of a special method on their model
-                            // and just call it.
-                            if (Utilities.isFunction(origProp.onValueChanged)) {
-                                //send the newVal + oldVal
-                                origProp.onValueChanged(origProp.value, origVal);
-                            }
-
-                            changed.push(origProp);
-                        }
-                    }
-                }
-            }
-
-            return changed;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.contentEditingHelper#handleSaveError
-         * @methodOf umbraco.services.contentEditingHelper
-         * @function
-         *
-         * @description
-         * A function to handle what happens when we have validation issues from the server side
-         *
-         */
-
-        //TODO: Too many editors use this method for saving when this entire service should only be used for content/media/members,
-        // there is formHelper.handleError for other editors which should be used!
-
-        handleSaveError: function (args) {
-
-            if (!args.err) {
-                throw "args.err cannot be null";
-            }
-
-            //When the status is a 400 status with a custom header: X-Status-Reason: Validation failed, we have validation errors.
-            //Otherwise the error is probably due to invalid data (i.e. someone mucking around with the ids or something).
-            //Or, some strange server error
-            if (args.err.status === 400) {
-                //now we need to look through all the validation errors
-                if (args.err.data && (args.err.data.ModelState)) {
-
-                    //wire up the server validation errs
-                    formHelper.handleServerValidation(args.err.data.ModelState);
-
-                    var messageType = 2;//error
-                    if (args.action === "save") {
-                        messageType = 4;//warning
-                    }
-
-                    //add model state errors to notifications
-                    if (args.showNotifications) {
-                        showNotificationsForModelsState(args.err.data.ModelState, messageType);
-                    }
-
-                    if (!this.redirectToCreatedContent(args.err.data.id, args.softRedirect) || args.softRedirect) {
-                        // If we are not redirecting it's because this is not newly created content, else in some cases we are
-                        // soft-redirecting which means the URL will change but the route wont (i.e. creating content).
-
-                        // In this case we need to detect what properties have changed and re-bind them with the server data.
-                        if (args.rebindCallback && Utilities.isFunction(args.rebindCallback)) {
-                            args.rebindCallback();
-                        }
-
-                        // In this case notify all validators (don't clear the server validations though since we need to maintain their state because of
-                        // how the variant switcher works in content). server validation state is always cleared when an editor first loads
-                        // and in theory when an editor is destroyed.
-                        serverValidationManager.notify();
-                    }
-
-                    //indicates we've handled the server result
-                    return true;
-                }
-            }
-            return false;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.contentEditingHelper#handleSuccessfulSave
-         * @methodOf umbraco.services.contentEditingHelper
-         * @function
-         *
-         * @description
-         * A function to handle when saving a content item is successful. This will rebind the values of the model that have changed
-         * ensure the notifications are displayed and that the appropriate events are fired. This will also check if we need to redirect
-         * when we're creating new content.
-         */
-
-        //TODO: We need to move some of this to formHelper for saving, too many editors use this method for saving when this entire
-        //service should only be used for content/media/members
-
-        handleSuccessfulSave: function (args) {
-
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.savedContent) {
-                throw "args.savedContent cannot be null";
-            }
-
-            if (!this.redirectToCreatedContent(args.redirectId ? args.redirectId : args.savedContent.id, args.softRedirect) || args.softRedirect) {
-
-                // If we are not redirecting it's because this is not newly created content, else in some cases we are
-                // soft-redirecting which means the URL will change but the route wont (i.e. creating content).
-
-                // In this case we need to detect what properties have changed and re-bind them with the server data.
-                if (args.rebindCallback && Utilities.isFunction(args.rebindCallback)) {
-                    args.rebindCallback();
-                }
-            }
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.contentEditingHelper#redirectToCreatedContent
-         * @methodOf umbraco.services.contentEditingHelper
-         * @function
-         *
-         * @description
-         * Changes the location to be editing the newly created content after create was successful.
-         * We need to decide if we need to redirect to edito mode or if we will remain in create mode.
-         * We will only need to maintain create mode if we have not fulfilled the basic requirements for creating an entity which is at least having a name and ID
-         */
-        redirectToCreatedContent: function (id, softRedirect) {
-
-            //only continue if we are currently in create mode and not in infinite mode and if the resulting ID is valid
-            if ($routeParams.create && (isValidIdentifier(id))) {
-
-                //need to change the location to not be in 'create' mode. Currently the route will be something like:
-                // /belle/#/content/edit/1234?doctype=newsArticle&create=true
-                // but we need to remove everything after the query so that it is just:
-                // /belle/#/content/edit/9876 (where 9876 is the new id)
-
-                //clear the query strings
-                navigationService.clearSearch(["cculture", "csegment"]);
-                if (softRedirect) {
-                    navigationService.setSoftRedirect();
-                }
-                //change to new path
-                $location.path("/" + $routeParams.section + "/" + $routeParams.tree + "/" + $routeParams.method + "/" + id);
-                //don't add a browser history for this
-                $location.replace();
-                return true;
-            }
-            return false;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.contentEditingHelper#redirectToRenamedContent
-         * @methodOf umbraco.services.contentEditingHelper
-         * @function
-         *
-         * @description
-         * For some editors like scripts or entites that have names as ids, these names can change and we need to redirect
-         * to their new paths, this is helper method to do that.
-         */
-
-        //TODO: We need to move some of this to formHelper for saving, too many editors use this method for saving when this entire
-        //service should only be used for content/media/members
-
-        redirectToRenamedContent: function (id) {
-            //clear the query strings
-            navigationService.clearSearch();
-            //change to new path
-            $location.path("/" + $routeParams.section + "/" + $routeParams.tree + "/" + $routeParams.method + "/" + id);
-            //don't add a browser history for this
-            $location.replace();
-            return true;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.contentEditingHelper#sortVariants
-         * @methodOf umbraco.services.contentEditingHelper
-         * @function
-         *
-         * @description
-         * Sorts the variants so default language is shown first. Mandatory languages are shown next and all other underneath. Both Mandatory and non mandatory languages are
-         * sorted in the following groups 'Published', 'Draft', 'Not Created'. Within each of those groups the variants are
-         * sorted by the language display name.
-         *
-         */
-        sortVariants: function (a, b) {
-            const statesOrder = {'PublishedPendingChanges':1, 'Published': 1, 'Draft': 2, 'NotCreated': 3};
-            const compareDefault = (a,b) => (a.language && a.language.isDefault ? -1 : 1) - (b.language && b.language.isDefault ? -1 : 1);
-
-            // Make sure mandatory variants goes on top, unless they are published, cause then they already goes to the top and then we want to mix them with other published variants.
-            const compareMandatory = (a,b) => (a.state === 'PublishedPendingChanges' || a.state === 'Published') ? 0 : (a.language && a.language.isMandatory ? -1 : 1) - (b.language && b.language.isMandatory ? -1 : 1);
-            const compareState = (a, b) => (statesOrder[a.state] || 99) - (statesOrder[b.state] || 99);
-            const compareName = (a, b) => a.displayName.localeCompare(b.displayName);
-
-            return compareDefault(a, b) || compareMandatory(a, b) || compareState(a, b) || compareName(a, b);
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.contentEditingHelper#getSortedVariantsAndSegments
-         * @methodOf umbraco.services.contentEditingHelper
-         * @function
-         *
-         * @description
-         * Returns an array of variants and segments sorted by the rules in the sortVariants method.
-         * A variant language is followed by its segments in the array. If a segment doesn't have a parent variant it is
-         * added to the end of the array.
-         *
-         */
-        getSortedVariantsAndSegments: function (variantsAndSegments) {
-            const sortedVariants = variantsAndSegments.filter(variant => !variant.segment).sort(this.sortVariants);
-            let variantsWithSegments = variantsAndSegments.filter(variant => variant.segment);
-            let sortedAvailableVariants = [];
-
-            sortedVariants.forEach((variant) => {
-                const sortedMatchedSegments = variantsWithSegments.filter(segment => segment.language && variant.language && segment.language.culture === variant.language.culture).sort(this.sortVariants);
-                // remove variants for this culture
-                variantsWithSegments = variantsWithSegments.filter(segment => !segment.language || segment.language && variant.language && segment.language.culture !== variant.language.culture);
-                sortedAvailableVariants = [...sortedAvailableVariants, ...[variant], ...sortedMatchedSegments];
-            })
-
-            // if we have segments without a parent language variant we need to add the remaining variantsWithSegments to the array
-            sortedAvailableVariants = [...sortedAvailableVariants, ...variantsWithSegments.sort(this.sortVariants)];
-
-            return sortedAvailableVariants;
-        }
-    };
-}
-angular.module('umbraco.services').factory('contentEditingHelper', contentEditingHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
deleted file mode 100644
index bff0746339..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
+++ /dev/null
@@ -1,493 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.contentTypeHelper
- * @description A helper service for the content type editor
- **/
-function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $injector, $q) {
-
-    var contentTypeHelperService = {
-
-        TYPE_GROUP: 'Group',
-        TYPE_TAB: 'Tab',
-
-        isAliasUnique(groups, alias) {
-            return groups.find(group => group.alias === alias) ? false : true;
-        },
-
-        createUniqueAlias(groups, alias) {
-            let i = 1;
-            while(this.isAliasUnique(groups, alias + i.toString()) === false) {
-                i++;
-            }
-            return alias + i.toString();
-        },
-
-        generateLocalAlias: function(name) {
-            return name ? name.toUmbracoAlias() : String.CreateGuid();
-        },
-
-        getLocalAlias: function (alias) {
-            const lastIndex = alias.lastIndexOf('/');
-
-            return (lastIndex === -1) ? alias : alias.substring(lastIndex + 1);
-        },
-
-        updateLocalAlias: function (alias, localAlias) {
-            const parentAlias = this.getParentAlias(alias);
-
-            return (parentAlias == null || parentAlias === '') ? localAlias : parentAlias + '/' + localAlias;
-        },
-
-        getParentAlias: function (alias) {
-            if(alias) {
-                const lastIndex = alias.lastIndexOf('/');
-
-                return (lastIndex === -1) ? null : alias.substring(0, lastIndex);
-            }
-            return null;
-        },
-
-        updateParentAlias: function (alias, parentAlias) {
-            const localAlias = this.getLocalAlias(alias);
-
-            return (parentAlias == null || parentAlias === '') ? localAlias : parentAlias + '/' + localAlias;
-        },
-
-        updateDescendingAliases: function (groups, oldParentAlias, newParentAlias) {
-            groups.forEach(group => {
-                const parentAlias = this.getParentAlias(group.alias);
-
-                if (parentAlias === oldParentAlias) {
-                    const oldAlias = group.alias,
-                        newAlias = this.updateParentAlias(oldAlias, newParentAlias);
-
-                    group.alias = newAlias;
-                    group.parentAlias = newParentAlias;
-                    this.updateDescendingAliases(groups, oldAlias, newAlias);
-
-                }
-            });
-        },
-
-        defineParentAliasOnGroups: function (groups) {
-            groups.forEach(group => {
-                group.parentAlias = this.getParentAlias(group.alias);
-            });
-        },
-
-        relocateDisorientedGroups: function (groups) {
-            const existingAliases = groups.map(group => group.alias);
-            existingAliases.push(null);
-            const disorientedGroups = groups.filter(group => existingAliases.indexOf(group.parentAlias) === -1);
-            disorientedGroups.forEach(group => {
-                const oldAlias = group.alias,
-                        newAlias = this.updateParentAlias(oldAlias, null);
-
-                group.alias = newAlias;
-                group.parentAlias = null;
-                this.updateDescendingAliases(groups, oldAlias, newAlias);
-            });
-        },
-
-        convertGroupToTab: function (groups, group) {
-            const tabs = groups.filter(group => group.type === this.TYPE_TAB).sort((a, b) => a.sortOrder - b.sortOrder);
-            const nextSortOrder = tabs && tabs.length > 0 ? tabs[tabs.length - 1].sortOrder + 1 : 0;
-
-            group.convertingToTab = true;
-
-            group.type = this.TYPE_TAB;
-
-            const newAlias = this.generateLocalAlias(group.name);
-            // when checking for alias uniqueness we need to exclude the current group or the alias would get a + 1
-            const otherGroups = [...groups].filter(groupCopy => !groupCopy.convertingToTab);
-
-            group.alias = this.isAliasUnique(otherGroups, newAlias) ? newAlias : this.createUniqueAlias(otherGroups, newAlias);
-            group.parentAlias = null;
-            group.sortOrder = nextSortOrder;
-            group.convertingToTab = false;
-        },
-
-        createIdArray: function (array) {
-
-            var newArray = [];
-
-            array.forEach(function (arrayItem) {
-
-                if (Utilities.isObject(arrayItem)) {
-                    newArray.push(arrayItem.id);
-                } else {
-                    newArray.push(arrayItem);
-                }
-
-            });
-
-            return newArray;
-
-        },
-
-        generateModels: function () {
-            var deferred = $q.defer();
-            var modelsResource = $injector.has("modelsBuilderManagementResource") ? $injector.get("modelsBuilderManagementResource") : null;
-            var modelsBuilderEnabled = Umbraco.Sys.ServerVariables.umbracoPlugins.modelsBuilder.mode !== "Nothing";
-            if (modelsBuilderEnabled && modelsResource) {
-                modelsResource.buildModels().then(function (result) {
-                    deferred.resolve(result);
-
-                    //just calling this to get the servar back to life
-                    modelsResource.getModelsOutOfDateStatus();
-
-                }, function (e) {
-                    deferred.reject(e);
-                });
-            }
-            else {
-                deferred.resolve(false);
-            }
-            return deferred.promise;
-        },
-
-        checkModelsBuilderStatus: function () {
-            var deferred = $q.defer();
-            var modelsResource = $injector.has("modelsBuilderManagementResource") ? $injector.get("modelsBuilderManagementResource") : null;
-            var modelsBuilderEnabled = (Umbraco && Umbraco.Sys && Umbraco.Sys.ServerVariables && Umbraco.Sys.ServerVariables.umbracoPlugins && Umbraco.Sys.ServerVariables.umbracoPlugins.modelsBuilder && Umbraco.Sys.ServerVariables.umbracoPlugins.modelsBuilder.mode !== "Nothing");
-
-            if (modelsBuilderEnabled && modelsResource) {
-                modelsResource.getModelsOutOfDateStatus().then(function (result) {
-                    //Generate models buttons should be enabled if it is 0
-                    deferred.resolve(result.status === 0);
-                });
-            }
-            else {
-                deferred.resolve(false);
-            }
-            return deferred.promise;
-        },
-
-        makeObjectArrayFromId: function (idArray, objectArray) {
-            var newArray = [];
-
-            for (var idIndex = 0; idArray.length > idIndex; idIndex++) {
-                var id = idArray[idIndex];
-
-                for (var objectIndex = 0; objectArray.length > objectIndex; objectIndex++) {
-                    var object = objectArray[objectIndex];
-                    if (id === object.id) {
-                        newArray.push(object);
-                    }
-                }
-
-            }
-
-            return newArray;
-        },
-
-        validateAddingComposition: function (contentType, compositeContentType) {
-
-            //Validate that by adding this group that we are not adding duplicate property type aliases
-
-            var propertiesAdding = _.flatten(_.map(compositeContentType.groups, function (g) {
-                return _.map(g.properties, function (p) {
-                    return p.alias;
-                });
-            }));
-            var propAliasesExisting = _.filter(_.flatten(_.map(contentType.groups, function (g) {
-                return _.map(g.properties, function (p) {
-                    return p.alias;
-                });
-            })), function (f) {
-                return f !== null && f !== undefined;
-            });
-
-            var intersec = _.intersection(propertiesAdding, propAliasesExisting);
-            if (intersec.length > 0) {
-                //return the overlapping property aliases
-                return intersec;
-            }
-
-            //no overlapping property aliases
-            return [];
-        },
-
-        mergeCompositeContentType: function (contentType, compositeContentType) {
-
-            //Validate that there are no overlapping aliases
-            var overlappingAliases = this.validateAddingComposition(contentType, compositeContentType);
-            if (overlappingAliases.length > 0) {
-                throw new Error("Cannot add this composition, these properties already exist on the content type: " + overlappingAliases.join());
-            }
-
-            compositeContentType.groups.forEach(function (compositionGroup) {
-                // order composition groups based on sort order
-                compositionGroup.properties = $filter('orderBy')(compositionGroup.properties, 'sortOrder');
-
-                // get data type details
-                compositionGroup.properties.forEach(function (property) {
-                    dataTypeResource.getById(property.dataTypeId)
-                        .then(function (dataType) {
-                            property.dataTypeIcon = dataType.icon;
-                            property.dataTypeName = dataType.name;
-                        });
-                });
-
-                // set inherited state on tab
-                compositionGroup.inherited = true;
-
-                // set inherited state on properties
-                compositionGroup.properties.forEach(function (compositionProperty) {
-                    compositionProperty.inherited = true;
-                });
-
-                // set tab state
-                compositionGroup.tabState = "inActive";
-
-                // if groups are named the same - merge the groups
-                contentType.groups.forEach(function (contentTypeGroup) {
-
-                    if (contentTypeGroup.name === compositionGroup.name && contentTypeGroup.type === compositionGroup.type) {
-
-                        // set flag to show if properties has been merged into a tab
-                        compositionGroup.groupIsMerged = true;
-
-                        // make group inherited
-                        contentTypeGroup.inherited = true;
-
-                        // add properties to the top of the array
-                        contentTypeGroup.properties = compositionGroup.properties.concat(contentTypeGroup.properties);
-
-                        // update sort order on all properties in merged group
-                        contentTypeGroup.properties = contentTypeHelperService.updatePropertiesSortOrder(contentTypeGroup.properties);
-
-                        // make parentTabContentTypeNames to an array so we can push values
-                        if (contentTypeGroup.parentTabContentTypeNames === null || contentTypeGroup.parentTabContentTypeNames === undefined) {
-                            contentTypeGroup.parentTabContentTypeNames = [];
-                        }
-
-                        // push name to array of merged composite content types
-                        contentTypeGroup.parentTabContentTypeNames.push(compositeContentType.name);
-
-                        // make parentTabContentTypes to an array so we can push values
-                        if (contentTypeGroup.parentTabContentTypes === null || contentTypeGroup.parentTabContentTypes === undefined) {
-                            contentTypeGroup.parentTabContentTypes = [];
-                        }
-
-                        // push id to array of merged composite content types
-                        contentTypeGroup.parentTabContentTypes.push(compositeContentType.id);
-
-                        // get sort order from composition
-                        contentTypeGroup.sortOrder = compositionGroup.sortOrder;
-
-                        // splice group to the top of the array
-                        var contentTypeGroupCopy = Utilities.copy(contentTypeGroup);
-                        var index = contentType.groups.indexOf(contentTypeGroup);
-                        contentType.groups.splice(index, 1);
-                        contentType.groups.unshift(contentTypeGroupCopy);
-
-                    }
-
-                });
-
-                // if group is not merged - push it to the end of the array - before init tab
-                if (compositionGroup.groupIsMerged === false || compositionGroup.groupIsMerged === undefined) {
-
-                    // make parentTabContentTypeNames to an array so we can push values
-                    if (compositionGroup.parentTabContentTypeNames === null || compositionGroup.parentTabContentTypeNames === undefined) {
-                        compositionGroup.parentTabContentTypeNames = [];
-                    }
-
-                    // push name to array of merged composite content types
-                    compositionGroup.parentTabContentTypeNames.push(compositeContentType.name);
-
-                    // make parentTabContentTypes to an array so we can push values
-                    if (compositionGroup.parentTabContentTypes === null || compositionGroup.parentTabContentTypes === undefined) {
-                        compositionGroup.parentTabContentTypes = [];
-                    }
-
-                    // push id to array of merged composite content types
-                    compositionGroup.parentTabContentTypes.push(compositeContentType.id);
-
-                    // push group before placeholder tab
-                    contentType.groups.unshift(compositionGroup);
-
-                }
-
-            });
-
-            // sort all groups by sortOrder property
-            contentType.groups = $filter('orderBy')(contentType.groups, 'sortOrder');
-
-            return contentType;
-
-        },
-
-        splitCompositeContentType: function (contentType, compositeContentType) {
-
-            var groups = [];
-
-            contentType.groups.forEach(function (contentTypeGroup) {
-
-                if (contentTypeGroup.tabState !== "init") {
-
-                    var idIndex = contentTypeGroup.parentTabContentTypes.indexOf(compositeContentType.id);
-                    var nameIndex = contentTypeGroup.parentTabContentTypeNames.indexOf(compositeContentType.name);
-                    var groupIndex = contentType.groups.indexOf(contentTypeGroup);
-
-
-                    if (idIndex !== -1) {
-
-                        var properties = [];
-
-                        // remove all properties from composite content type
-                        contentTypeGroup.properties.forEach(function (property) {
-                            if (property.contentTypeId !== compositeContentType.id) {
-                                properties.push(property);
-                            }
-                        });
-
-                        // set new properties array to properties
-                        contentTypeGroup.properties = properties;
-
-                        // remove composite content type name and id from inherited arrays
-                        contentTypeGroup.parentTabContentTypes.splice(idIndex, 1);
-                        contentTypeGroup.parentTabContentTypeNames.splice(nameIndex, 1);
-
-                        // remove inherited state if there are no inherited properties
-                        if (contentTypeGroup.parentTabContentTypes.length === 0) {
-                            contentTypeGroup.inherited = false;
-                        }
-
-                        // remove group if there are no properties left
-                        if (contentTypeGroup.properties.length > 0) {
-                            groups.push(contentTypeGroup);
-                        }
-
-                    } else {
-                        groups.push(contentTypeGroup);
-                    }
-
-                } else {
-                    groups.push(contentTypeGroup);
-                }
-
-                // update sort order on properties
-                contentTypeGroup.properties = contentTypeHelperService.updatePropertiesSortOrder(contentTypeGroup.properties);
-
-            });
-
-            contentType.groups = groups;
-
-        },
-
-        updatePropertiesSortOrder: function (properties) {
-
-            var sortOrder = 0;
-
-            properties.forEach(function (property) {
-                if (!property.inherited && property.propertyState !== "init") {
-                    property.sortOrder = sortOrder;
-                }
-                sortOrder++;
-            });
-
-            return properties;
-
-        },
-
-        getTemplatePlaceholder: function () {
-
-            var templatePlaceholder = {
-                "name": "",
-                "icon": "icon-layout",
-                "alias": "templatePlaceholder",
-                "placeholder": true
-            };
-
-            return templatePlaceholder;
-
-        },
-
-        insertDefaultTemplatePlaceholder: function (defaultTemplate) {
-
-            // get template placeholder
-            var templatePlaceholder = contentTypeHelperService.getTemplatePlaceholder();
-
-            // add as default template
-            defaultTemplate = templatePlaceholder;
-
-            return defaultTemplate;
-
-        },
-
-        insertTemplatePlaceholder: function (array) {
-
-            // get template placeholder
-            var templatePlaceholder = contentTypeHelperService.getTemplatePlaceholder();
-
-            // add as selected item
-            array.push(templatePlaceholder);
-
-            return array;
-
-        },
-
-        insertChildNodePlaceholder: function (array, name, icon, id) {
-
-            var placeholder = {
-                "name": name,
-                "icon": icon,
-                "id": id
-            };
-
-            array.push(placeholder);
-
-        },
-
-        rebindSavedContentType: function (contentType, savedContentType) {
-            // The saved content type might have updated values (eg. new IDs/keys), so make sure the view model is updated
-            contentType.ModelState = savedContentType.ModelState;
-            contentType.id = savedContentType.id;
-
-            // Prevent rebinding if there was an error: https://github.com/umbraco/Umbraco-CMS/pull/11257
-            if (savedContentType.ModelState) {
-              return;
-            }
-
-            contentType.groups.forEach(function (group) {
-                if (!group.alias) return;
-
-                var k = 0;
-                while (k < savedContentType.groups.length && savedContentType.groups[k].alias != group.alias)
-                    k++;
-
-                if (k == savedContentType.groups.length) {
-                    group.id = 0;
-                    return;
-                }
-
-                var savedGroup = savedContentType.groups[k];
-                group.id = savedGroup.id;
-                group.key = savedGroup.key;
-                group.contentTypeId = savedGroup.contentTypeId;
-
-                group.properties.forEach(function (property) {
-                    if (property.id || !property.alias) return;
-
-                    k = 0;
-                    while (k < savedGroup.properties.length && savedGroup.properties[k].alias != property.alias)
-                        k++;
-
-                    if (k == savedGroup.properties.length) {
-                        property.id = 0;
-                        return;
-                    }
-
-                    var savedProperty = savedGroup.properties[k];
-                    property.id = savedProperty.id;
-                });
-            });
-        }
-
-    };
-
-    return contentTypeHelperService;
-}
-angular.module('umbraco.services').factory('contentTypeHelper', contentTypeHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/cropperhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/cropperhelper.service.js
deleted file mode 100644
index 636134f289..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/cropperhelper.service.js
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
-* @ngdoc service
-* @name umbraco.services.cropperHelper
-* @description A helper object used for dealing with image cropper data
-**/
-function cropperHelper(umbRequestHelper, $http) {
-	var service = {
-
-		/**
-		* @ngdoc method
-		* @name umbraco.services.cropperHelper#configuration
-		* @methodOf umbraco.services.cropperHelper
-		*
-		* @description
-		* Returns a collection of plugins available to the tinyMCE editor
-		*
-		*/
-		configuration: function (mediaTypeAlias) {
-			return umbRequestHelper.resourcePromise(
-				$http.get(
-					umbRequestHelper.getApiUrl(
-						"imageCropperApiBaseUrl",
-						"GetConfiguration",
-						[{ mediaTypeAlias: mediaTypeAlias}])),
-				'Failed to retrieve tinymce configuration');
-		},
-
-
-		//utill for getting either min/max aspect ratio to scale image after
-		calculateAspectRatioFit : function(srcWidth, srcHeight, maxWidth, maxHeight, maximize) {
-			var ratio = [maxWidth / srcWidth, maxHeight / srcHeight ];
-
-			if(maximize){
-				ratio = Math.max(ratio[0], ratio[1]);
-			}else{
-				ratio = Math.min(ratio[0], ratio[1]);
-			}
-
-			return { width:srcWidth*ratio, height:srcHeight*ratio, ratio: ratio};
-		},
-
-		//utill for scaling width / height given a ratio
-		calculateSizeToRatio : function(srcWidth, srcHeight, ratio) {
-			return { width:srcWidth*ratio, height:srcHeight*ratio, ratio: ratio};
-		},
-
-		scaleToMaxSize : function(srcWidth, srcHeight, maxWidth, maxHeight) {
-
-            // fallback to maxHeight:
-            maxHeight = maxHeight || maxWidth;
-
-            // get smallest ratio, if ratio exceeds 1 we will not scale(hence we parse 1 as the maximum allowed ratio)
-            var ratio = Math.min(maxWidth / srcWidth, maxHeight / srcHeight, 1);
-
-			return {
-                width: srcWidth * ratio,
-                height:srcHeight * ratio
-            };
-		},
-
-		//returns a ng-style object with top,left,width,height pixel measurements
-		//expects {left,right,top,bottom} - {width,height}, {width,height}, int
-		//offset is just to push the image position a number of pixels from top,left
-		convertToStyle : function(coordinates, originalSize, viewPort, offset){
-
-			var coordinates_px = service.coordinatesToPixels(coordinates, originalSize, offset);
-			var _offset = offset || 0;
-
-			var x = 1 - (coordinates.x1 + Math.abs(coordinates.x2));
-			var left_of_x =  originalSize.width * x;
-			var ratio = viewPort.width / left_of_x;
-
-			var style = {
-				position: "absolute",
-				top:  -(coordinates_px.y1*ratio)+ _offset,
-				left:  -(coordinates_px.x1* ratio)+ _offset,
-				width: Math.floor(originalSize.width * ratio),
-				height: Math.floor(originalSize.height * ratio),
-				originalWidth: originalSize.width,
-				originalHeight: originalSize.height,
-				ratio: ratio
-			};
-
-			return style;
-		},
-
-
-		coordinatesToPixels : function(coordinates, originalSize, offset){
-
-			var coordinates_px = {
-				x1: Math.floor(coordinates.x1 * originalSize.width),
-				y1: Math.floor(coordinates.y1 * originalSize.height),
-				x2: Math.floor(coordinates.x2 * originalSize.width),
-				y2: Math.floor(coordinates.y2 * originalSize.height)
-			};
-
-			return coordinates_px;
-		},
-
-		pixelsToCoordinates : function(image, width, height, offset){
-			var x1_px = Math.abs((image.left || 0)-offset);
-			var y1_px = Math.abs((image.top || 0)-offset);
-
-			var x2_px = image.width - (x1_px + width);
-			var y2_px = image.height - (y1_px + height);
-
-			//crop coordinates in %
-			var crop = {};
-			crop.x1 = Math.max(x1_px / image.width, 0);
-			crop.y1 = Math.max(y1_px / image.height, 0);
-			crop.x2 = Math.max(x2_px / image.width, 0);
-			crop.y2 = Math.max(y2_px / image.height, 0);
-
-			return crop;
-		},
-
-		alignToCoordinates : function(image, center, viewport){
-
-			var min_left = (image.width) - (viewport.width);
-			var min_top =  (image.height) - (viewport.height);
-
-			var c_top = -(center.top * image.height) + (viewport.height / 2);
-			var c_left = -(center.left * image.width) + (viewport.width / 2);
-
-			if(c_top < -min_top){
-				c_top = -min_top;
-			}
-			if(c_top > 0){
-				c_top = 0;
-			}
-			if(c_left < -min_left){
-				c_left = -min_left;
-			}
-			if(c_left > 0){
-				c_left = 0;
-			}
-			return {left: c_left, top: c_top};
-		},
-
-
-		syncElements : function(source, target){
-				target.height(source.height());
-				target.width(source.width());
-
-				target.css({
-					"top": source[0].offsetTop,
-					"left": source[0].offsetLeft
-				});
-		}
-	};
-
-	return service;
-}
-
-angular.module('umbraco.services').factory('cropperHelper', cropperHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/datatypehelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/datatypehelper.service.js
deleted file mode 100644
index 7aff3faaaf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/datatypehelper.service.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.dataTypeHelper
- * @description A helper service for data types
- **/
-function dataTypeHelper() {
-
-    var dataTypeHelperService = {
-
-        createPreValueProps: function(preVals) {
-
-            var preValues = [];
-
-            for (var i = 0; i < preVals.length; i++) {
-                preValues.push({
-                    hideLabel: preVals[i].hideLabel,
-                    alias: preVals[i].key != undefined ? preVals[i].key : preVals[i].alias,
-                    description: preVals[i].description,
-                    label: preVals[i].label,
-                    view: preVals[i].view,
-                    value: preVals[i].value,
-                    config: preVals[i].config
-                });
-            }
-
-            return preValues;
-
-        },
-
-        rebindChangedProperties: function (origContent, savedContent) {
-
-            //a method to ignore built-in prop changes
-            var shouldIgnore = function (propName) {
-                return _.some(["notifications", "ModelState"], function (i) {
-                    return i === propName;
-                });
-            };
-            //check for changed built-in properties of the content
-            for (var o in origContent) {
-
-                //ignore the ones listed in the array
-                if (shouldIgnore(o)) {
-                    continue;
-                }
-
-                if (!_.isEqual(origContent[o], savedContent[o])) {
-                    origContent[o] = savedContent[o];
-                }
-            }
-        }
-
-    };
-
-    return dataTypeHelperService;
-}
-angular.module('umbraco.services').factory('dataTypeHelper', dataTypeHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
deleted file mode 100644
index f582be59ef..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ /dev/null
@@ -1,1264 +0,0 @@
-/**
- @ngdoc service
- * @name umbraco.services.editorService
- *
- * @description
- * Added in Umbraco 8.0. Application-wide service for handling infinite editing.
- *
- *
- *
- *
-<h2><strong>Open a build-in infinite editor (media picker)</strong></h2>
-<h3>Markup example</h3>
-<pre>
-    <div ng-controller="My.MediaPickerController as vm">
-        <button type="button" ng-click="vm.openMediaPicker()">Open</button>
-    </div>
-</pre>
-
-<h3>Controller example</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function MediaPickerController(editorService) {
-
-            var vm = this;
-
-            vm.openMediaPicker = openMediaPicker;
-
-            function openMediaPicker() {
-                var mediaPickerOptions = {
-                    multiPicker: true,
-                    submit: function(model) {
-                        editorService.close();
-                    },
-                    close: function() {
-                        editorService.close();
-                    }
-                };
-                editorService.mediaPicker(mediaPickerOptions);
-            };
-        }
-
-        angular.module("umbraco").controller("My.MediaPickerController", MediaPickerController);
-    })();
-</pre>
-
-<h2><strong>Building a custom infinite editor</strong></h2>
-<h3>Open the custom infinite editor (Markup)</h3>
-<pre>
-    <div ng-controller="My.Controller as vm">
-        <button type="button" ng-click="vm.open()">Open</button>
-    </div>
-</pre>
-
-<h3>Open the custom infinite editor (Controller)</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function Controller(editorService) {
-
-            var vm = this;
-
-            vm.open = open;
-
-            function open() {
-                var options = {
-                    title: "My custom infinite editor",
-                    view: "path/to/view.html",
-                    submit: function(model) {
-                        editorService.close();
-                    },
-                    close: function() {
-                        editorService.close();
-                    }
-                };
-                editorService.open(options);
-            };
-        }
-
-        angular.module("umbraco").controller("My.Controller", Controller);
-    })();
-</pre>
-
-<h3><strong>The custom infinite editor view</strong></h3>
-When building a custom infinite editor view you can use the same components as a normal editor ({@link umbraco.directives.directive:umbEditorView umbEditorView}).
-<pre>
-    <div ng-controller="My.InfiniteEditorController as vm">
-
-        <umb-editor-view>
-
-            <umb-editor-header
-                name="model.title"
-                name-locked="true"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container>
-                <umb-box>
-                    <umb-box-content>
-                        {{model | json}}
-                    </umb-box-content>
-                </umb-box>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                <umb-editor-footer-content-right>
-                    <umb-button
-                        type="button"
-                        button-style="link"
-                        label-key="general_close"
-                        shortcut="esc"
-                        action="vm.close()">
-                    </umb-button>
-                    <umb-button
-                        type="button"
-                        button-style="action"
-                        label-key="general_submit"
-                        action="vm.submit(model)">
-                    </umb-button>
-                </umb-editor-footer-content-right>
-            </umb-editor-footer>
-
-        </umb-editor-view>
-
-    </div>
-</pre>
-
-<h3>The custom infinite editor controller</h3>
-<pre>
-    (function () {
-        "use strict";
-
-        function InfiniteEditorController($scope) {
-
-            var vm = this;
-
-            vm.submit = submit;
-            vm.close = close;
-
-            function submit() {
-                if($scope.model.submit) {
-                    $scope.model.submit($scope.model);
-                }
-            }
-
-            function close() {
-                if($scope.model.close) {
-                    $scope.model.close();
-                }
-            }
-
-        }
-
-        angular.module("umbraco").controller("My.InfiniteEditorController", InfiniteEditorController);
-    })();
-</pre>
- */
-
-(function () {
-  "use strict";
-
-  function editorService(eventsService, keyboardService, $timeout) {
-
-    let editorsKeyboardShorcuts = [];
-    var editors = [];
-    var isEnabled = true;
-    var lastElementInFocus = null;
-
-    // events for backdrop
-    eventsService.on("appState.backdrop", function (name, args) {
-      if (args.show === true) {
-        blur();
-      } else {
-        focus();
-      }
-    });
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#getEditors
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Method to return all open editors.
-     */
-    function getEditors() {
-      return editors;
-    };
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#getNumberOfEditors
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Method to return the number of open editors.
-     */
-    function getNumberOfEditors() {
-      return editors.length;
-    };
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#blur
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Method to tell editors that they are begin blurred.
-     */
-    function blur() {
-      if (isEnabled === true) {
-        /* keyboard shortcuts will be overwritten by the new infinite editor
-        so we need to store the shortcuts for the current editor so they can be rebound
-        when the infinite editor closes
-    */
-        unbindKeyboardShortcuts();
-        isEnabled = false;
-      }
-    }
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#focus
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Method to tell editors that they are gaining focus again.
-     */
-    function focus() {
-      if (isEnabled === false) {
-        /* keyboard shortcuts will be overwritten by the new infinite editor
-            so we need to store the shortcuts for the current editor so they can be rebound
-            when the infinite editor closes
-        */
-        rebindKeyboardShortcuts();
-        isEnabled = true;
-      }
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#open
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Method to open a new editor in infinite editing.
-     *
-     * @param {object} editor rendering options.
-     * @param {string} editor.view URL to view.
-     * @param {string} editor.size Sets the size of the editor (`small` or `medium`). If nothing is set it will use full width.
-     */
-    function open(editor) {
-
-      /* keyboard shortcuts will be overwritten by the new infinite editor
-          so we need to store the shortcuts for the current editor so they can be rebound
-          when the infinite editor closes
-      */
-      unbindKeyboardShortcuts();
-
-      // if this is the first editor layer, save the currently focused element
-      // so we can re-apply focus to it once all the editor layers are closed
-      if (editors.length === 0) {
-        lastElementInFocus = document.activeElement;
-      }
-
-      // set flag so we know when the editor is open in "infinite mode"
-      editor.infiniteMode = true;
-
-      editors.push(editor);
-
-      var args = {
-        editors: editors,
-        editor: editor
-      };
-
-      eventsService.emit("appState.editors.open", args);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#close
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Method to close the latest opened editor.
-     */
-    function close() {
-
-      // close last opened editor
-      const closedEditor = editors[editors.length - 1];
-      editors.splice(-1, 1);
-
-      var args = {
-        editors: editors,
-        editor: closedEditor
-      };
-
-      // emit event to let components know an editor has been removed
-      eventsService.emit("appState.editors.close", args);
-
-      // delay required to map the properties to the correct editor due
-      // to another delay in the closing animation of the editor
-      $timeout(function () {
-        // rebind keyboard shortcuts for the new editor in focus
-        rebindKeyboardShortcuts();
-
-        if (editors.length === 0 && lastElementInFocus) {
-          lastElementInFocus.focus();
-        }
-      }, 0);
-
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#closeAll
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Method to close all open editors.
-     */
-    function closeAll() {
-
-      editors = [];
-
-      var args = {
-        editors: editors,
-        editor: null
-      };
-
-      eventsService.emit("appState.editors.close", args);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#contentEditor
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a content editor in infinite editing, the submit callback returns the updated content item.
-     *
-     * @param {object} editor rendering options.
-     * @param {string} editor.id The id of the content item.
-     * @param {boolean} editor.create Create new content item.
-     * @param {function} editor.submit Callback function when the publish and close button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @param {string} editor.parentId If editor.create is true, provide parentId for the creation of the content item.
-     * @param {string} editor.documentTypeAlias If editor.create is true, provide document type alias for the creation of the content item.
-     * @param {boolean} editor.allowSaveAndClose If editor is being used in infinite editing allows the editor to close when the save action is performed.
-     * @param {boolean} editor.allowPublishAndClose If editor is being used in infinite editing allows the editor to close when the publish action is performed.
-     * @returns {object} editor object
-     */
-    function contentEditor(editor) {
-      editor.view = "views/content/edit.html";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#contentPicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a content picker in infinite editing, the submit callback returns an array of selected items.
-     *
-     * @param {object} editor rendering options.
-     * @param {boolean} editor.multiPicker Pick one or multiple items.
-     * @param {number} editor.startNodeId Set the startnode of the picker (optional).
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     *
-     * @returns {object} editor object.
-     */
-    function contentPicker(editor) {
-      editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
-      if (!editor.size) editor.size = "small";
-      editor.section = "content";
-      editor.treeAlias = "content";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#contentTypePicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a content type picker in infinite editing, the submit callback returns an array of selected items
-     *
-     * @param {object} editor rendering options.
-     * @param {string} editor.entityType Entity type to open - default is document type.
-     * @param {boolean} editor.multiPicker Pick one or multiple items.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object
-     */
-    function contentTypePicker(editor) {
-
-      if (!editor.entityType) editor.entityType = "documentType";
-
-      switch (editor.entityType) {
-        case "documentType":
-          documentTypePicker(editor);
-          break;
-        case "mediaType":
-          mediaTypePicker(editor);
-          break;
-        case "memberType":
-          memberTypePicker(editor);
-          break;
-      }
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#documentTypePicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a document type picker in infinite editing, the submit callback returns an array of selected items
-     *
-     * @param {object} editor rendering options.
-     * @param {boolean} editor.multiPicker Pick one or multiple items.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object
-     */
-    function documentTypePicker(editor) {
-      editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
-      if (!editor.size) editor.size = "small";
-      editor.section = "settings";
-      editor.treeAlias = "documentTypes";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#mediaTypePicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a media type picker in infinite editing, the submit callback returns an array of selected items.
-     *
-     * @param {object} editor rendering options.
-     * @param {boolean} editor.multiPicker Pick one or multiple items.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function mediaTypePicker(editor) {
-      editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
-      if (!editor.size) editor.size = "small";
-      editor.section = "settings";
-      editor.treeAlias = "mediaTypes";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#memberTypePicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a member type picker in infinite editing, the submit callback returns an array of selected items.
-     *
-     * @param {object} editor rendering options.
-     * @param {boolean} editor.multiPicker Pick one or multiple items.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     *
-     * @returns {object} editor object.
-     */
-    function memberTypePicker(editor) {
-      editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
-      if (!editor.size) editor.size = "small";
-      editor.section = "settings";
-      editor.treeAlias = "memberTypes";
-      open(editor);
-    }
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#copy
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a copy editor in infinite editing, the submit callback returns an array of selected items.
-     *
-     * @param {object} editor rendering options.
-     * @param {string} editor.section The node entity type.
-     * @param {string} editor.currentNode The current node id.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function copy(editor) {
-      editor.view = "views/common/infiniteeditors/copy/copy.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#move
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a move editor in infinite editing.
-     *
-     * @param {object} editor rendering options.
-     * @param {string} editor.section The node entity type.
-     * @param {string} editor.currentNode The current node id.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function move(editor) {
-      editor.view = "views/common/infiniteeditors/move/move.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#embed
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens an embed editor in infinite editing.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function embed(editor) {
-      editor.view = "views/common/infiniteeditors/embed/embed.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#rollback
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a rollback editor in infinite editing.
-     *
-     * @param {object} editor rendering options.
-     * @param {string} editor.node The node to rollback.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function rollback(editor) {
-      editor.view = "views/common/infiniteeditors/rollback/rollback.html";
-      if (!editor.size) editor.size = "";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#linkPicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens an embed editor in infinite editing.
-     *
-     * @param {object} editor rendering options.
-     * @param {string} editor.icon The icon class.
-     * @param {string} editor.color The color class.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function linkPicker(editor) {
-      editor.view = "views/common/infiniteeditors/linkpicker/linkpicker.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#mediaEditor
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a media editor in infinite editing, the submit callback returns the updated media item.
-     *
-     * @param {object} editor rendering options.
-     * @param {string} editor.id The id of the media item.
-     * @param {boolean} editor.create Create new media item.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function mediaEditor(editor) {
-      editor.view = "views/media/edit.html";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#mediaPicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a media picker in infinite editing, the submit callback returns an array of selected media items.
-     *
-     * @param {object} editor rendering options.
-     * @param {number} editor.startNodeId Set the startnode of the picker (optional).
-     * @param {boolean} editor.multiPicker Pick one or multiple items.
-     * @param {boolean} editor.onlyImages Only display files that have an image file-extension.
-     * @param {boolean} editor.disableFolderSelect Disable folder selection.
-     * @param {boolean} editor.disableFocalPoint Disable focal point editor for selected media.
-     * @param {array} editor.updatedMediaNodes A list of ids for media items that have been updated through the media picker.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function mediaPicker(editor) {
-      editor.view = "views/common/infiniteeditors/mediapicker/mediapicker.html";
-      if (!editor.size) editor.size = "medium";
-      editor.updatedMediaNodes = [];
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#mediaCropDetails
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the media crop details editor in infinite editing, the submit callback returns the updated media object.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function mediaCropDetails(editor) {
-      editor.view = "views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#iconPicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens an icon picker in infinite editing, the submit callback returns the selected icon.
-     *
-     * @param {object} editor rendering options.
-     * @param {string} editor.icon The CSS class representing the icon - eg. `icon-autofill.
-     * @param {string} editor.color The CSS class representing the color - eg. color-red.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function iconPicker(editor) {
-      editor.view = "views/common/infiniteeditors/iconpicker/iconpicker.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#contentTypeEditor
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the content type editor in infinite editing, the submit callback returns the alias of the saved content type.
-     *
-     * @param {object} editor rendering options.
-     * @param {string} editor.entityType Entity type to open - default document type.
-     * @param {number} editor.id Indicates the ID of the content type to be edited. Alternatively the ID may be set to `-1` in combination with `create` being set to `true` to open the content type editor for creating a new content type.
-     * @param {boolean} editor.create Set to `true` to open the content type editor for creating a new content type.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function contentTypeEditor(editor) {
-
-      if (!editor.entityType) editor.entityType = "documentType";
-
-      switch (editor.entityType) {
-        case "documentType":
-          documentTypeEditor(editor);
-          break;
-        case "mediaType":
-          mediaTypeEditor(editor);
-          break;
-        case "memberType":
-          memberTypeEditor(editor);
-          break;
-      }
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#documentTypeEditor
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the document type editor in infinite editing, the submit callback returns the alias of the saved document type.
-     *
-     * @param {object} editor rendering options.
-     * @param {number} editor.id Indicates the ID of the document type to be edited. Alternatively the ID may be set to `-1` in combination with `create` being set to `true` to open the document type editor for creating a new document type.
-     * @param {boolean} editor.create Set to `true` to open the document type editor for creating a new document type.
-     * @param {boolean} editor.noTemplate If `true` and in combination with `create` being set to `true`, the document type editor will not create a corresponding template by default. This is similar to selecting the "Document Type without a template" in the Create dialog.
-     * @param {boolean} editor.isElement If `true` and in combination with `create` being set to `true`, the "Is an Element type" option will be selected by default in the document type editor.
-     * @param {boolean} editor.allowVaryByCulture If `true` and in combination with `create`, the "Allow varying by culture" option will be selected by default in the document type editor.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function documentTypeEditor(editor) {
-      editor.view = "views/documentTypes/edit.html";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#mediaTypeEditor
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the media type editor in infinite editing, the submit callback returns the saved media type.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function mediaTypeEditor(editor) {
-      editor.view = "views/mediaTypes/edit.html";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#memberTypeEditor
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the member type editor in infinite editing, the submit callback returns the saved member type.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function memberTypeEditor(editor) {
-      editor.view = "views/memberTypes/edit.html";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#queryBuilder
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the query builder in infinite editing, the submit callback returns the generated query.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function queryBuilder(editor) {
-      editor.view = "views/common/infiniteeditors/querybuilder/querybuilder.html";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#treePicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the query builder in infinite editing, the submit callback returns the generted query.
-     *
-     * @param {object} editor rendering options.
-     * @param {string} options.section tree section to display.
-     * @param {string} options.treeAlias specific tree to display.
-     * @param {boolean} options.multiPicker should the tree pick one or multiple items before returning.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function treePicker(editor) {
-      editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#nodePermissions
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the an editor to set node permissions.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function nodePermissions(editor) {
-      editor.view = "views/common/infiniteeditors/nodepermissions/nodepermissions.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#insertCodeSnippet
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Open an editor to insert code snippets into the code editor.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function insertCodeSnippet(editor) {
-      editor.view = "views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#userGroupPicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the user group picker in infinite editing, the submit callback returns an array of the selected user groups.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Submits the editor.
-     * @param {function} editor.close Closes the editor.
-     * @returns {object} editor object.
-     */
-    function userGroupPicker(editor) {
-      editor.view = "views/common/infiniteeditors/usergrouppicker/usergrouppicker.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#userGroupEditor
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the user group picker in infinite editing, the submit callback returns the saved user group.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function userGroupEditor(editor) {
-      editor.view = "views/users/group.html";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#templateEditor
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the template editor in infinite editing, the submit callback returns the saved template.
-     *
-     * @param {object} editor rendering options.
-     * @param {string} editor.id The template id.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function templateEditor(editor) {
-      editor.view = "views/templates/edit.html";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#languagePicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the language picker in infinite editing, the submit callback returns an array of the selected sections.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function languagePicker(editor) {
-      editor.view = "views/common/infiniteeditors/languagepicker/languagepicker.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    function eventPicker(editor) {
-      editor.view = "views/common/infiniteeditors/eventpicker/eventpicker.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#sectionPicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the section picker in infinite editing, the submit callback returns an array of the selected sections.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function sectionPicker(editor) {
-      editor.view = "views/common/infiniteeditors/sectionpicker/sectionpicker.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#insertField
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the insert field editor in infinite editing, the submit callback returns the code snippet.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function insertField(editor) {
-      editor.view = "views/common/infiniteeditors/insertfield/insertfield.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#templateSections
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the template sections editor in infinite editing, the submit callback returns the type to insert.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function templateSections(editor) {
-      editor.view = "views/common/infiniteeditors/templatesections/templatesections.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#userPicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the section picker in infinite editing, the submit callback returns an array of the selected users.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function userPicker(editor) {
-      editor.view = "views/common/infiniteeditors/userpicker/userpicker.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.editorService#filePicker
-    * @methodOf umbraco.services.editorService
-    *
-    * @description
-    * Opens a file picker in infinite editing, the submit callback returns an array of selected items.
-    *
-    * @param {object} editor rendering options.
-    * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-    * @param {function} editor.close Callback function when the close button is clicked.
-    * @returns {object} editor object.
-    */
-    function filePicker(editor) {
-      editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
-      if (!editor.size) editor.size = "small";
-      editor.section = "settings";
-      editor.treeAlias = "files";
-      editor.entityType = "file";
-      open(editor);
-    }
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.editorService#staticFilePicker
-    * @methodOf umbraco.services.editorService
-    *
-    * @description
-    * Opens a static file picker in infinite editing, the submit callback returns an array of selected items.
-    *
-    * @param {object} editor rendering options.
-    * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-    * @param {function} editor.close Callback function when the close button is clicked.
-    * @returns {object} editor object.
-    */
-    function staticFilePicker(editor) {
-      editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
-      if (!editor.size) editor.size = "small";
-      editor.section = "settings";
-      editor.treeAlias = "staticFiles";
-      editor.entityType = "file";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#itemPicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens the section picker in infinite editing, the submit callback returns an array of the selected items.
-     *
-     * @param {object} editor rendering options.
-     * @param {array} editor.availableItems Array of available items.
-     * @param {array} editor.selectedItems Array of selected items. When passed in the selected items will be filtered from the available items.
-     * @param {boolean} editor.filter Set to false to hide the filter.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function itemPicker(editor) {
-      editor.view = "views/common/infiniteeditors/itempicker/itempicker.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.editorService#templatePicker
-    * @methodOf umbraco.services.editorService
-    *
-    * @description
-    * Opens a template picker in infinite editing, the submit callback returns an array of selected items.
-    *
-    * @param {object} editor rendering options.
-    * @param {boolean} editor.multiPicker Pick one or multiple items.
-    * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-    * @param {function} editor.close Callback function when the close button is clicked.
-    * @returns {object} editor object.
-    */
-    function templatePicker(editor) {
-      editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
-      if (!editor.size) editor.size = "small";
-      editor.section = "settings";
-      editor.treeAlias = "templates";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#macroPicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a macro picker in infinite editing, the submit callback returns an array of the selected items.
-     *
-     * @param {object} editor rendering options.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function macroPicker(editor) {
-      editor.view = "views/common/infiniteeditors/macropicker/macropicker.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#memberGroupPicker
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a member group picker in infinite editing.
-     *
-     * @param {object} editor rendering options.
-     * @param {object} editor.multiPicker Pick one or multiple items.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @returns {object} editor object.
-     */
-    function memberGroupPicker(editor) {
-      editor.view = "views/common/infiniteeditors/membergrouppicker/membergrouppicker.html";
-      if (!editor.size) editor.size = "small";
-      open(editor);
-    }
-
-    /**
-    * @ngdoc method
-    * @name umbraco.services.editorService#memberPicker
-    * @methodOf umbraco.services.editorService
-    *
-    * @description
-    * Opens a member picker in infinite editing, the submit callback returns an array of selected items.
-    *
-    * @param {object} editor rendering options.
-    * @param {boolean} editor.multiPicker Pick one or multiple items.
-    * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-    * @param {function} editor.close Callback function when the close button is clicked.
-    * @returns {object} editor object.
-    */
-    function memberPicker(editor) {
-      editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
-      if (!editor.size) editor.size = "small";
-      editor.section = "member";
-      editor.treeAlias = "member";
-      open(editor);
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#memberEditor
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Opens a member editor in infinite editing, the submit callback returns the updated member.
-     *
-     * @param {object} editor rendering options.
-     * @param {string} editor.id The id (GUID) of the member.
-     * @param {boolean} editor.create Create new member.
-     * @param {function} editor.submit Callback function when the submit button is clicked. Returns the editor model object.
-     * @param {function} editor.close Callback function when the close button is clicked.
-     * @param {string} editor.doctype If `editor.create` is `true`, provide member type for the creation of the member.
-     * @returns {object} editor object.
-     */
-    function memberEditor(editor) {
-      editor.view = "views/member/edit.html";
-      open(editor);
-    }
-
-    ///////////////////////
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#storeKeyboardShortcuts
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Internal method to keep track of keyboard shortcuts registered
-     * to each editor so they can be rebound when an editor closes.
-     */
-    function unbindKeyboardShortcuts() {
-      const shortcuts = Utilities.copy(keyboardService.keyboardEvent);
-      editorsKeyboardShorcuts.push(shortcuts);
-
-      // unbind the current shortcuts because we only want to
-      // shortcuts from the newly opened editor working
-      for (let [key, value] of Object.entries(shortcuts)) {
-        keyboardService.unbind(key);
-      }
-    }
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.editorService#rebindKeyboardShortcuts
-     * @methodOf umbraco.services.editorService
-     *
-     * @description
-     * Internal method to rebind keyboard shortcuts for the editor in focus.
-     */
-    function rebindKeyboardShortcuts() {
-      // find the shortcuts from the previous editor
-      const lastSetOfShortcutsIndex = editorsKeyboardShorcuts.length - 1;
-      var lastSetOfShortcuts = editorsKeyboardShorcuts[lastSetOfShortcutsIndex];
-
-      // rebind shortcuts
-      for (let [key, value] of Object.entries(lastSetOfShortcuts)) {
-        keyboardService.bind(key, value.callback, value.opt);
-      }
-
-      // remove the shortcuts from the collection
-      editorsKeyboardShorcuts.splice(lastSetOfShortcutsIndex, 1);
-    }
-
-    var service = {
-      getEditors: getEditors,
-      getNumberOfEditors: getNumberOfEditors,
-      open: open,
-      close: close,
-      closeAll: closeAll,
-      contentEditor: contentEditor,
-      mediaEditor: mediaEditor,
-      memberEditor: memberEditor,
-      contentPicker: contentPicker,
-      contentTypePicker: contentTypePicker,
-      documentTypePicker: documentTypePicker,
-      mediaTypePicker: mediaTypePicker,
-      memberTypePicker: memberTypePicker,
-      copy: copy,
-      move: move,
-      embed: embed,
-      rollback: rollback,
-      filePicker: filePicker,
-      staticFilePicker: staticFilePicker,
-      linkPicker: linkPicker,
-      mediaPicker: mediaPicker,
-      iconPicker: iconPicker,
-      contentTypeEditor: contentTypeEditor,
-      documentTypeEditor: documentTypeEditor,
-      mediaTypeEditor: mediaTypeEditor,
-      memberTypeEditor: memberTypeEditor,
-      queryBuilder: queryBuilder,
-      treePicker: treePicker,
-      nodePermissions: nodePermissions,
-      insertCodeSnippet: insertCodeSnippet,
-      userGroupPicker: userGroupPicker,
-      userGroupEditor: userGroupEditor,
-      templateEditor: templateEditor,
-      languagePicker: languagePicker,
-      sectionPicker: sectionPicker,
-      insertField: insertField,
-      templateSections: templateSections,
-      userPicker: userPicker,
-      itemPicker: itemPicker,
-      templatePicker: templatePicker,
-      macroPicker: macroPicker,
-      memberGroupPicker: memberGroupPicker,
-      memberPicker: memberPicker,
-      mediaCropDetails,
-      eventPicker : eventPicker
-    };
-
-    return service;
-
-  }
-
-  angular.module("umbraco.services").factory("editorService", editorService);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editorstate.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editorstate.service.js
deleted file mode 100644
index 28daa3f245..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/editorstate.service.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.editorState
- * @function
- *
- * @description
- * Tracks the parent object for complex editors by exposing it as 
- * an object reference via editorState.current.getCurrent(). 
- * The state is cleared on each successful route.
- *
- * it is possible to modify this object, so should be used with care
- */
-angular.module('umbraco.services').factory("editorState", function ($rootScope, eventsService) {
-
-    var current = null;
-
-    var state = {
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#set
-         * @methodOf umbraco.services.editorState
-         * @function
-         *
-         * @description
-         * Sets the current entity object for the currently active editor
-         * This is only used when implementing an editor with a complex model
-         * like the content editor, where the model is modified by several
-         * child controllers. 
-         */
-        set: function (entity) {
-            current = entity;
-            eventsService.emit("editorState.changed", { entity: entity });
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#reset
-         * @methodOf umbraco.services.editorState
-         * @function
-         *
-         * @description
-         * Since the editorstate entity is read-only, you cannot set it to null
-         * only through the reset() method
-         */
-        reset: function () {
-            current = null;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.angularHelper#getCurrent
-         * @methodOf umbraco.services.editorState
-         * @function
-         *
-         * @description
-         * Returns an object reference to the current editor entity.
-         * the entity is the root object of the editor.
-         * EditorState is used by property/parameter editors that need
-         * access to the entire entity being edited, not just the property/parameter 
-         *
-         * editorState.current can not be overwritten, you should only read values from it
-         * since modifying individual properties should be handled by the property editors
-         */
-        getCurrent: function () {
-            return current;
-        }
-
-    };
-
-    // TODO: This shouldn't be removed! use getCurrent() method instead of a hacked readonly property which is confusing.
-
-    //create a get/set property but don't allow setting
-    Object.defineProperty(state, "current", {
-        get: function () {
-            return current;
-        },
-        set: function (value) {
-            throw "Use editorState.set to set the value of the current entity";
-        }
-    });
-
-    //execute on each successful route (this is only bound once per application since a service is a singleton)
-    $rootScope.$on('$routeChangeSuccess', function (event, current, previous) {
-
-        //reset the editorState on each successful route chage
-        state.reset();
-
-    });
-
-    return state;
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/entityhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/entityhelper.service.js
deleted file mode 100644
index cb87787654..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/entityhelper.service.js
+++ /dev/null
@@ -1,29 +0,0 @@
-(function() {
-   'use strict';
-
-   function entityHelper() {
-
-        function getEntityTypeFromSection(section) {
-            if (section === "member") {
-                return "Member";
-            }
-            else if (section === "media") {
-                return "Media";
-            } else {
-                return "Document";
-            }
-        }
-
-        ////////////
-
-        var service = {
-            getEntityTypeFromSection: getEntityTypeFromSection
-        };
-
-        return service;
-
-   }
-
-   angular.module('umbraco.services').factory('entityHelper', entityHelper);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/events.service.js b/src/Umbraco.Web.UI.Client/src/common/services/events.service.js
deleted file mode 100644
index c7ef5bd28f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/events.service.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/** Used to broadcast and listen for global events and allow the ability to add async listeners to the callbacks */
-
-/*
-    Core app events:
-
-    app.ready
-    app.authenticated
-    app.notAuthenticated
-    app.reInitialize
-    app.userRefresh
-    app.navigationReady
-*/
-
-function eventsService($q, $rootScope) {
-
-    return {
-
-        /** raise an event with a given name */
-        emit: function (name, args) {
-
-            //there are no listeners
-            if (!$rootScope.$$listeners[name]) {
-                return;
-            }
-
-            //send the event
-            $rootScope.$emit(name, args);
-        },
-
-        /** subscribe to a method, or use scope.$on = same thing */
-		on: function(name, callback) {
-		    return $rootScope.$on(name, callback);
-		},
-		
-        /** pass in the result of 'on' to this method, or just call the method returned from 'on' to unsubscribe */
-		unsubscribe: function(handle) {
-		    if (Utilities.isFunction(handle)) {
-		        handle();
-		    }		    
-		}
-	};
-}
-
-angular.module('umbraco.services').factory('eventsService', eventsService);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js b/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js
deleted file mode 100644
index 0cb314c08d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/externallogininfo.service.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.externalLoginInfoService
- * @description A service for working with external login providers
- **/
-function externalLoginInfoService(externalLoginInfo, umbRequestHelper) {
-
-  function getLoginProvider(provider) {
-    if (provider) {
-      var found = _.find(externalLoginInfo.providers, x => x.authType == provider);
-      return found;
-    }
-    return null;
-  }
-
-  function getLoginProviderView(provider) {
-    if (provider && provider.options && provider.options.customBackOfficeView) {
-      return umbRequestHelper.convertVirtualToAbsolutePath(provider.options.customBackOfficeView);
-    }
-    return null;
-  }
-
-  /**
-   * Returns true if any provider denies local login if `provider` is null, else whether the passed
-   * @param {any} provider
-   */
-  function hasDenyLocalLogin(provider) {
-    if (!provider) {
-      return _.some(externalLoginInfo.providers, x => x.options.denyLocalLogin === true);
-    }
-    else {
-      return provider && provider.options.denyLocalLogin === true;
-    }
-  }
-
-  /**
-   * Returns all login providers
-   */
-  function getLoginProviders() {
-    return externalLoginInfo.providers;
-  }
-
-  /** Returns all logins providers that have options that the user can interact with */
-  function getLoginProvidersWithOptions() {
-    // only include providers that allow manual linking or ones that provide a custom view
-    var providers = _.filter(externalLoginInfo.providers, x => {
-      // transform the data and also include the custom view as a nicer property
-      x.customView = getLoginProviderView(x);
-      if (x.customView) {
-        return true;
-      }
-
-      return x.options.allowManualLinking;
-    });
-    return providers;
-  }
-
-  return {
-    hasDenyLocalLogin: hasDenyLocalLogin,
-    getLoginProvider: getLoginProvider,
-    getLoginProviders: getLoginProviders,
-    getLoginProvidersWithOptions: getLoginProvidersWithOptions,
-    getLoginProviderView: getLoginProviderView
-  };
-}
-angular.module('umbraco.services').factory('externalLoginInfoService', externalLoginInfoService);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/filemanager.service.js b/src/Umbraco.Web.UI.Client/src/common/services/filemanager.service.js
deleted file mode 100644
index 6b2bd3c295..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/filemanager.service.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.fileManager
- * @function
- *
- * @description
- * Used by editors to manage any files that require uploading with the posted data, normally called by property editors
- * that need to attach files.
- * When a route changes successfully, we ensure that the collection is cleared.
- */
-function fileManager($rootScope) {
-
-    var fileCollection = [];
-
-
-    var mgr = {
-        /**
-         * @ngdoc property
-         * @name umbraco.services.fileManager#maxFileSize
-         * @propertyOf umbraco.services.fileManager
-         * @type {Number}
-         * @default 0
-         * @description
-         * The max file size allowed to be uploaded to the server in bytes
-         */
-        maxFileSize: parseInt(Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize ?? '0', 10) * 1000,
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.fileManager#setFiles
-         * @methodOf umbraco.services.fileManager
-         * @function
-         *
-         * @description
-         *  Attaches files to the current manager for the current editor for a particular property, if an empty array is set
-         *   for the files collection that effectively clears the files for the specified editor.
-         */
-        setFiles: function (args) {
-
-            //propertyAlias, files
-            if (!Utilities.isString(args.propertyAlias)) {
-                throw "args.propertyAlias must be a non empty string";
-            }
-            if (!Utilities.isObject(args.files)) {
-                throw "args.files must be an object";
-            }
-
-            //normalize to null
-            if (!args.culture) {
-                args.culture = null;
-            }
-
-            if (!args.segment) {
-                args.segment = null;
-            }
-
-            var metaData = [];
-            if (Utilities.isArray(args.metaData)) {
-                metaData = args.metaData;
-            }
-
-            //this will clear the files for the current property/culture/segment and then add the new ones for the current property
-            fileCollection = _.reject(fileCollection, function (item) {
-                return item.alias === args.propertyAlias && (!args.culture || args.culture === item.culture) && (!args.segment || args.segment === item.segment);
-            });
-            for (var i = 0; i < args.files.length; i++) {
-                //save the file object to the files collection
-                fileCollection.push({ alias: args.propertyAlias, file: args.files[i], culture: args.culture, segment: args.segment, metaData: metaData });
-            }
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.fileManager#getFiles
-         * @methodOf umbraco.services.fileManager
-         * @function
-         *
-         * @description
-         *  Returns all of the files attached to the file manager
-         */
-        getFiles: function () {
-            return fileCollection;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.fileManager#clearFiles
-         * @methodOf umbraco.services.fileManager
-         * @function
-         *
-         * @description
-         *  Removes all files from the manager
-         */
-        clearFiles: function () {
-            fileCollection = [];
-        }
-    };
-
-    //execute on each successful route (this is only bound once per application since a service is a singleton)
-    $rootScope.$on('$routeChangeSuccess', function (event, current, previous) {
-        //reset the file manager on each route change, the file collection is only relavent
-        // when working in an editor and submitting data to the server.
-        //This ensures that memory remains clear of any files and that the editors don't have to manually clear the files.
-        mgr.clearFiles();
-    });
-
-    return mgr;
-}
-
-angular.module('umbraco.services').factory('fileManager', fileManager);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js b/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js
deleted file mode 100644
index 3979f194b8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/focus.service.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- @ngdoc service
- * @name umbraco.services.focusService
- *
- * @description
- * <b>Added in Umbraco 8.1</b>. Application-wide service for focus related stuff.
- * 
- */
-
-(function () {
-    "use strict";
-
-    function focusService() {
-        
-        
-        var currentFocus = null;
-        var lastKnownFocus = null;
-        
-        
-        function focusInApp(e) {
-            currentFocus = e.target;
-        }
-        document.addEventListener('focusin', focusInApp);
-        
-        
-        var service = {
-            
-            /**
-            * @ngdoc function
-            * @name umbraco.services.focusService#getLastKnownFocus
-            * @methodOf umbraco.services.focusService
-            * @function
-             *
-             * @description
-             * Gives the element that was set to be remembered, the directive using this should store the value of this to make sure that its not changed white using that directive.
-             * This variable is avaiable for directives that are not able to figure out the focused element on init, and there this service will help remembering it untill the directive is initialized.
-             * 
-             */
-            getLastKnownFocus: function() {
-                return lastKnownFocus;
-            },
-            
-            /**
-             * @ngdoc function
-             * @name umbraco.services.focusService#rememberFocus
-             * @methodOf umbraco.services.focusService
-             * @function
-             *
-             * @description
-             * Call this before a new focus is begin set, to be able to return to the focus before a given scenario.
-             * 
-             */
-            rememberFocus: function() {
-                lastKnownFocus = currentFocus;
-            },
-            
-            /**
-             * @ngdoc function
-             * @name umbraco.services.focusService#setLastKnownFocus
-             * @methodOf umbraco.services.focusService
-             * @function
-             *
-             * @description
-             * Overwrite the element remembered as the last known element in focus.
-             * 
-             */
-            setLastKnownFocus: function(element) {
-                lastKnownFocus = element;
-            }
-        };
-
-        return service;
-
-    }
-    
-    angular.module("umbraco.services").factory("focusService", focusService);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/focuslock.service.js b/src/Umbraco.Web.UI.Client/src/common/services/focuslock.service.js
deleted file mode 100644
index 54acaf6426..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/focuslock.service.js
+++ /dev/null
@@ -1,30 +0,0 @@
-(function () {
-    "use strict";
-
-    function focusLockService($document) {
-        var elementToInert = $document[0].querySelector('#mainwrapper');
-
-        function addInertAttribute() {
-            if (elementToInert) {
-                elementToInert.setAttribute('inert', true);
-            }
-        }
-
-        function removeInertAttribute() {
-            if (elementToInert) {
-                elementToInert.removeAttribute('inert');
-            }
-        }
-
-        var service = {
-            addInertAttribute: addInertAttribute,
-            removeInertAttribute: removeInertAttribute
-        }
-
-        return service;
-
-    }
-
-    angular.module("umbraco.services").factory("focusLockService", focusLockService);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
deleted file mode 100644
index 773aa85f6f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.formHelper
- * @function
- *
- * @description
- * A utility class used to streamline how forms are developed, to ensure that validation is check and displayed consistently and to ensure that the correct events
- * fire when they need to.
- */
-function formHelper(angularHelper, serverValidationManager, notificationsService, overlayService) {
-    return {
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.formHelper#submitForm
-         * @methodOf umbraco.services.formHelper
-         * @function
-         *
-         * @description
-         * Called by controllers when submitting a form - this ensures that all client validation is checked,
-         * server validation is cleared, that the correct events execute and status messages are displayed.
-         * This returns true if the form is valid, otherwise false if form submission cannot continue.
-         *
-         * @param {object} args An object containing arguments for form submission
-         */
-        submitForm: function (args) {
-
-            var currentForm;
-
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.scope) {
-                throw "args.scope cannot be null";
-            }
-
-            if (!args.formCtrl) {
-                //try to get the closest form controller
-                currentForm = angularHelper.getRequiredCurrentForm(args.scope);
-            }
-            else {
-                currentForm = args.formCtrl;
-            }
-
-            //the first thing any form must do is broadcast the formSubmitting event
-            args.scope.$broadcast("formSubmitting", { scope: args.scope, action: args.action });
-
-            this.focusOnFirstError(currentForm);
-
-            // Some property editors need to perform an action after all property editors have reacted to the formSubmitting.
-            args.scope.$broadcast("formSubmittingFinalPhase", { scope: args.scope, action: args.action });
-
-            // Set the form state to submitted
-            currentForm.$setSubmitted();
-
-            //then check if the form is valid
-            if (!args.skipValidation) {
-                if (currentForm.$invalid) {
-
-                    return false;
-                }
-            }
-
-            //reset the server validations if required (default is true), otherwise notify existing ones of changes
-            if (!args.keepServerValidation) {
-                serverValidationManager.reset();
-            }
-            else {
-                serverValidationManager.notify();
-            }
-
-            return true;
-        },
-
-         /**
-         * @ngdoc function
-         * @name umbraco.services.formHelper#focusOnFirstError
-         * @methodOf umbraco.services.formHelper
-         * @function
-         *
-         * @description
-         * Called by submitForm when a form has been submitted, it will fire a focus on the first found invalid umb-property it finds in the form..
-         *
-         * @param {object} form Pass in a form object.
-         */
-        focusOnFirstError: function(form) {
-            var invalidNgForms = form.$$element.find(`.umb-property ng-form.ng-invalid, .umb-property-editor ng-form.ng-invalid-required`);
-            var firstInvalidNgForm = invalidNgForms.first();
-
-            if(firstInvalidNgForm.length !== 0) {
-                var focusableFields = [...firstInvalidNgForm.find("umb-range-slider .noUi-handle,input,textarea,select,button")];
-                if(focusableFields.length !== 0) {
-                    var firstErrorEl = focusableFields.find(el => el.type !== "hidden" && el.hasAttribute("readonly") === false);
-                    if(firstErrorEl !== undefined) {
-                        firstErrorEl.focus();
-                    }
-                }
-            }
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.formHelper#submitForm
-         * @methodOf umbraco.services.formHelper
-         * @function
-         *
-         * @description
-         * Called by controllers when a form has been successfully submitted, this ensures the correct events are raised.
-         *
-         * @param {object} args An object containing arguments for form submission
-         */
-        resetForm: function (args) {
-
-            var currentForm;
-
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.scope) {
-                throw "args.scope cannot be null";
-            }
-            if (!args.formCtrl) {
-                //try to get the closest form controller
-                currentForm = angularHelper.getRequiredCurrentForm(args.scope);
-            }
-            else {
-                currentForm = args.formCtrl;
-            }
-
-            // Set the form state to pristine
-            currentForm.$setPristine();
-            currentForm.$setUntouched();
-
-            args.scope.$broadcast(args.hasErrors ? "formSubmittedValidationFailed" : "formSubmitted", { scope: args.scope });
-        },
-
-        showNotifications: function (args) {
-            if (!args || !args.notifications) {
-                return false;
-            }
-            if (Utilities.isArray(args.notifications)) {
-                for (var i = 0; i < args.notifications.length; i++) {
-                    notificationsService.showNotification(args.notifications[i]);
-                }
-                return true;
-            }
-            return false;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.formHelper#handleError
-         * @methodOf umbraco.services.formHelper
-         * @function
-         *
-         * @description
-         * Needs to be called when a form submission fails, this will wire up all server validation errors in ModelState and
-         * add the correct messages to the notifications. If a server error has occurred this will show a ysod.
-         *
-         * @param {object} err The error object returned from the http promise
-         */
-        handleError: function (err) {
-
-            //TODO: Potentially add in the logic to showNotifications like the contentEditingHelper.handleSaveError does so that
-            // non content editors can just use this method instead of contentEditingHelper.handleSaveError which they should not use
-            // and they won't need to manually do it.
-
-            //When the status is a 400 status with a custom header: X-Status-Reason: Validation failed, we have validation errors.
-            //Otherwise the error is probably due to invalid data (i.e. someone mucking around with the ids or something).
-            //Or, some strange server error
-            if (err.status === 400) {
-                //now we need to look through all the validation errors
-                if (err.data && err.data.ModelState) {
-
-                    //wire up the server validation errs
-                    this.handleServerValidation(err.data.ModelState);
-
-                    //execute all server validation events and subscribers
-                    serverValidationManager.notifyAndClearAllSubscriptions();
-                }
-            }
-            else {
-
-                // TODO: All YSOD handling should be done with an interceptor
-                overlayService.ysod(err);
-            }
-
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.formHelper#handleServerValidation
-         * @methodOf umbraco.services.formHelper
-         * @function
-         *
-         * @description
-         * This wires up all of the server validation model state so that valServer and valServerField directives work
-         *
-         * @param {object} err The error object returned from the http promise
-         */
-        handleServerValidation: function (modelState) {
-            serverValidationManager.addErrorsForModelState(modelState);
-        }
-    };
-}
-angular.module('umbraco.services').factory('formHelper', formHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/grid.service.js b/src/Umbraco.Web.UI.Client/src/common/services/grid.service.js
deleted file mode 100644
index 898d1293fe..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/grid.service.js
+++ /dev/null
@@ -1,13 +0,0 @@
-angular.module('umbraco.services')
-	.factory('gridService', function ($http, $q){
-
-	    var configPath = Umbraco.Sys.ServerVariables.umbracoUrls.gridConfig;
-        var service = {
-			getGridEditors: function () {
-				return $http.get(configPath);
-			}
-		};
-
-		return service;
-
-	});
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/help.service.js b/src/Umbraco.Web.UI.Client/src/common/services/help.service.js
deleted file mode 100644
index 1d541b8028..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/help.service.js
+++ /dev/null
@@ -1,91 +0,0 @@
-angular.module('umbraco.services')
-	.factory('helpService', function ($http, $q, umbRequestHelper, dashboardResource) {
-		var helpTopics = {};
-
-		var defaultUrl = "rss/help";
-		var tvUrl = "feeds/help";
-
-		function getCachedHelp(url){
-			if(helpTopics[url]){
-				return helpTopics[url];
-			}else{
-				return null;
-			}
-		}
-
-		function setCachedHelp(url, data){
-			helpTopics[url] = data;
-		}
-
-		function fetchUrl(site, url){
-			var deferred = $q.defer();
-			var found = getCachedHelp(url);
-
-			if(found){
-				deferred.resolve(found);
-			}else{
-				dashboardResource.getRemoteXmlData(site, url).then(function (data) {
-					var feed = $(data.data);
-					var topics = [];
-
-					$('item', feed).each(function (i, item) {
-						var topic = {};
-						topic.thumbnail = $(item).find('thumbnail').attr('url');
-						topic.title = $("title", item).text();
-						topic.link = $("guid", item).text();
-						topic.description = $("description", item).text();
-						topics.push(topic);
-					});
-
-					setCachedHelp(topics);
-					deferred.resolve(topics);
-
-				},
-				function (exception) {
-					console.error('ex from remote data', exception);
-				});
-
-			}
-
-			return deferred.promise;
-		}
-
-		var service = {
-			findHelp: function (args) {
-				var url = service.getUrl(defaultUrl, args);
-				return fetchUrl('OUR', url);
-			},
-
-			findVideos: function (args) {
-				var url = service.getUrl(tvUrl, args);
-				return fetchUrl('TV', url);
-			},
-
-			getContextHelpForPage: function (section, tree, baseurl) {
-
-			    var qs = "?section=" + section + "&tree=" + tree;
-
-			    if (tree) {
-			        qs += "&tree=" + tree;
-			    }
-
-			    if (baseurl) {
-			        qs += "&baseurl=" + encodeURIComponent(baseurl);
-			    }
-
-			    var url = umbRequestHelper.getApiUrl(
-                        "helpApiBaseUrl",
-                        "GetContextHelpForPage" + qs);
-
-			    return umbRequestHelper.resourcePromise(
-                        $http.get(url), "Failed to get lessons content");
-			},
-
-			getUrl: function(url, args){
-				return url + "?" + $.param(args);
-			}
-		};
-
-		return service;
-
-	});
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/history.service.js b/src/Umbraco.Web.UI.Client/src/common/services/history.service.js
deleted file mode 100644
index d94ff52183..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/history.service.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.historyService
- *
- * @requires $rootScope 
- * @requires $timeout
- * @requires angularHelper
- *	
- * @description
- * Service to handle the main application navigation history. Responsible for keeping track
- * of where a user navigates to, stores an icon, url and name in a collection, to make it easy
- * for the user to go back to a previous editor / action
- *
- * **Note:** only works with new angular-based editors, not legacy ones
- *
- * ##usage
- * To use, simply inject the historyService into any controller that needs it, and make
- * sure the umbraco.services module is accesible - which it should be by default.
- *
- * <pre>
- *      angular.module("umbraco").controller("my.controller". function(historyService){
- *         historyService.add({
- *								icon: "icon-class",
- *								name: "Editing 'articles',
- *								link: "/content/edit/1234"}
- *							);
- *      }); 
- * </pre> 
- */
-angular.module('umbraco.services')
-.factory('historyService', function ($rootScope, $timeout, angularHelper, eventsService) {
-
-	var nArray = [];
-
-	function add(item) {
-
-	    if (!item) {
-	        return null;
-	    }
-
-	    var listWithoutThisItem = _.reject(nArray, function(i) {
-	        return i.link === item.link;
-	    });
-
-        //put it at the top and reassign
-	    listWithoutThisItem.splice(0, 0, item);
-	    nArray = listWithoutThisItem;
-	    return nArray[0];
-
-	}
-
-	return {
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.historyService#add
-		 * @methodOf umbraco.services.historyService
-		 *
-		 * @description
-		 * Adds a given history item to the users history collection.
-		 *
-		 * @param {Object} item the history item
-		 * @param {String} item.icon icon css class for the list, ex: "icon-image", "icon-doc"
-		 * @param {String} item.link route to the editor, ex: "/content/edit/1234"
-		 * @param {String} item.name friendly name for the history listing
-		 * @returns {Object} history item object
-		 */
-		add: function (item) {
-			var icon = item.icon || "icon-file";
-			angularHelper.safeApply($rootScope, function () {
-			    var result = add({ name: item.name, icon: icon, link: item.link, time: new Date() });
-			    eventsService.emit("historyService.add", {added: result, all: nArray});
-			    return result;
-			});
-		},
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.historyService#remove
-		 * @methodOf umbraco.services.historyService
-		 *
-		 * @description
-		 * Removes a history item from the users history collection, given an index to remove from.
-		 *
-		 * @param {Int} index index to remove item from
-		 */
-		remove: function (index) {
-			angularHelper.safeApply($rootScope, function() {
-			    var result = nArray.splice(index, 1);
-			    eventsService.emit("historyService.remove", { removed: result, all: nArray });
-			});
-		},
-
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.historyService#removeAll
-		 * @methodOf umbraco.services.historyService
-		 *
-		 * @description
-		 * Removes all history items from the users history collection
-		 */
-		removeAll: function () {
-			angularHelper.safeApply($rootScope, function() {
-			    nArray = [];
-			    eventsService.emit("historyService.removeAll");
-			});
-		},
-
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.historyService#getCurrent
-		 * @methodOf umbraco.services.historyService
-		 *
-		 * @description
-		 * Method to return the current history collection.
-		 *
-		 */
-		getCurrent: function(){
-			return nArray;
-        },
-
-        /**
-		 * @ngdoc method
-		 * @name umbraco.services.historyService#getLastAccessedItemForSection
-		 * @methodOf umbraco.services.historyService
-		 *
-		 * @description
-		 * Method to return the item that was last accessed in the given section
-		 *
-         * @param {string} sectionAlias Alias of the section to return the last accessed item for.
-		 */
-        getLastAccessedItemForSection: function (sectionAlias) {
-            for (var i = 0, len = nArray.length; i < len; i++) {
-                var item = nArray[i];
-                if (item.link === sectionAlias || item.link.indexOf(sectionAlias + "/") === 0) {
-                    return item;
-                }
-            }
-
-            return null;
-        }
-	};
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
deleted file mode 100644
index cccba67c3c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
+++ /dev/null
@@ -1,310 +0,0 @@
-/**
-* @ngdoc service
-* @name umbraco.services.iconHelper
-* @description A helper service for dealing with icons, mostly dealing with legacy tree icons
-**/
-function iconHelper($http, $q, $sce, $timeout) {
-
-    const converter = [
-        { oldIcon: ".sprNew", newIcon: "add" },
-        { oldIcon: ".sprDelete", newIcon: "remove" },
-        { oldIcon: ".sprMove", newIcon: "enter" },
-        { oldIcon: ".sprCopy", newIcon: "documents" },
-        { oldIcon: ".sprSort", newIcon: "navigation-vertical" },
-        { oldIcon: ".sprPublish", newIcon: "globe" },
-        { oldIcon: ".sprRollback", newIcon: "undo" },
-        { oldIcon: ".sprProtect", newIcon: "lock" },
-        { oldIcon: ".sprAudit", newIcon: "time" },
-        { oldIcon: ".sprNotify", newIcon: "envelope" },
-        { oldIcon: ".sprDomain", newIcon: "home" },
-        { oldIcon: ".sprPermission", newIcon: "lock" },
-        { oldIcon: ".sprRefresh", newIcon: "refresh" },
-        { oldIcon: ".sprBinEmpty", newIcon: "trash" },
-        { oldIcon: ".sprExportDocumentType", newIcon: "download-alt" },
-        { oldIcon: ".sprImportDocumentType", newIcon: "page-up" },
-        { oldIcon: ".sprLiveEdit", newIcon: "edit" },
-        { oldIcon: ".sprCreateFolder", newIcon: "add" },
-        { oldIcon: ".sprPackage2", newIcon: "box" },
-        { oldIcon: ".sprLogout", newIcon: "logout" },
-        { oldIcon: ".sprSave", newIcon: "save" },
-        { oldIcon: ".sprSendToTranslate", newIcon: "envelope-alt" },
-        { oldIcon: ".sprToPublish", newIcon: "mail-forward" },
-        { oldIcon: ".sprTranslate", newIcon: "comments" },
-        { oldIcon: ".sprUpdate", newIcon: "save" },
-
-        { oldIcon: ".sprTreeSettingDomain", newIcon: "icon-home" },
-        { oldIcon: ".sprTreeDoc", newIcon: "icon-document" },
-        { oldIcon: ".sprTreeDoc2", newIcon: "icon-diploma-alt" },
-        { oldIcon: ".sprTreeDoc3", newIcon: "icon-notepad" },
-        { oldIcon: ".sprTreeDoc4", newIcon: "icon-newspaper-alt" },
-        { oldIcon: ".sprTreeDoc5", newIcon: "icon-notepad-alt" },
-
-        { oldIcon: ".sprTreeDocPic", newIcon: "icon-picture" },
-        { oldIcon: ".sprTreeFolder", newIcon: "icon-folder" },
-        { oldIcon: ".sprTreeFolder_o", newIcon: "icon-folder" },
-        { oldIcon: ".sprTreeMediaFile", newIcon: "icon-music" },
-        { oldIcon: ".sprTreeMediaMovie", newIcon: "icon-movie" },
-        { oldIcon: ".sprTreeMediaPhoto", newIcon: "icon-picture" },
-
-        { oldIcon: ".sprTreeMember", newIcon: "icon-user" },
-        { oldIcon: ".sprTreeMemberGroup", newIcon: "icon-users" },
-        { oldIcon: ".sprTreeMemberType", newIcon: "icon-users" },
-
-        { oldIcon: ".sprTreeNewsletter", newIcon: "icon-file-text-alt" },
-        { oldIcon: ".sprTreePackage", newIcon: "icon-box" },
-        { oldIcon: ".sprTreeRepository", newIcon: "icon-server-alt" },
-
-        { oldIcon: ".sprTreeSettingDataType", newIcon: "icon-autofill" },
-
-        // TODO: Something needs to be done with the old tree icons that are commented out.
-        /*
-        { oldIcon: ".sprTreeSettingAgent", newIcon: "" },
-        { oldIcon: ".sprTreeSettingCss", newIcon: "" },
-        { oldIcon: ".sprTreeSettingCssItem", newIcon: "" },
-
-        { oldIcon: ".sprTreeSettingDataTypeChild", newIcon: "" },
-        { oldIcon: ".sprTreeSettingDomain", newIcon: "" },
-        { oldIcon: ".sprTreeSettingLanguage", newIcon: "" },
-        { oldIcon: ".sprTreeSettingScript", newIcon: "" },
-        { oldIcon: ".sprTreeSettingTemplate", newIcon: "" },
-        { oldIcon: ".sprTreeSettingXml", newIcon: "" },
-        { oldIcon: ".sprTreeStatistik", newIcon: "" },
-        { oldIcon: ".sprTreeUser", newIcon: "" },
-        { oldIcon: ".sprTreeUserGroup", newIcon: "" },
-        { oldIcon: ".sprTreeUserType", newIcon: "" },
-        */
-
-        { oldIcon: "folder.png", newIcon: "icon-folder" },
-        { oldIcon: "mediaphoto.gif", newIcon: "icon-picture" },
-        { oldIcon: "mediafile.gif", newIcon: "icon-document" },
-
-        { oldIcon: ".sprTreeDeveloperCacheItem", newIcon: "icon-box" },
-        { oldIcon: ".sprTreeDeveloperCacheTypes", newIcon: "icon-box" },
-        { oldIcon: ".sprTreeDeveloperMacro", newIcon: "icon-cogs" },
-        { oldIcon: ".sprTreeDeveloperRegistry", newIcon: "icon-windows" },
-        { oldIcon: ".sprTreeDeveloperPython", newIcon: "icon-linux" }
-    ];
-
-    let collectedIcons;
-
-    let imageConverter = [
-        {oldImage: "contour.png", newIcon: "icon-umb-contour"}
-    ];
-
-    const iconCache = [];
-    const promiseQueue = [];
-    let resourceLoadStatus = "none";
-
-    /**
-     * This is the same approach as use for loading the localized text json
-     * We don't want multiple requests for the icon collection, so need to track
-     * the current request state, and resolve the queued requests once the icons arrive
-     * Subsequent requests are returned immediately as the icons are cached into
-     */
-    function init() {
-        const deferred = $q.defer();
-
-        if (resourceLoadStatus === "loaded") {
-            deferred.resolve(iconCache);
-            return deferred.promise;
-        }
-
-        if (resourceLoadStatus === "loading") {
-            promiseQueue.push(deferred);
-            return deferred.promise;
-        }
-
-        resourceLoadStatus = "loading";
-
-        $http({ method: "GET", url: Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl + 'GetIcons' })
-            .then(function (response) {
-                resourceLoadStatus = "loaded";
-
-                for (const [key, value] of Object.entries(response.data)) {
-                    iconCache.push({name: key, svgString: $sce.trustAsHtml(value)})
-                }
-
-                deferred.resolve(iconCache);
-
-                //ensure all other queued promises are resolved
-                for (let p in promiseQueue) {
-                    promiseQueue[p].resolve(iconCache);
-                }
-            }, function (err) {
-                deferred.reject("Something broke");
-                //ensure all other queued promises are resolved
-                for (let p in promiseQueue) {
-                    promiseQueue[p].reject("Something broke");
-                }
-            });
-
-        return deferred.promise;
-    }
-
-    return {
-
-        /** Used by the create dialogs for content/media types to format the data so that the thumbnails are styled properly */
-        formatContentTypeThumbnails: function (contentTypes) {
-            for (var i = 0; i < contentTypes.length; i++) {
-
-                if (contentTypes[i].thumbnailIsClass === undefined || contentTypes[i].thumbnailIsClass) {
-                    contentTypes[i].cssClass = this.convertFromLegacyIcon(contentTypes[i].thumbnail);
-                }else {
-                    contentTypes[i].style = "background-image: url('" + contentTypes[i].thumbnailFilePath + "');height:36px; background-position:4px 0px; background-repeat: no-repeat;background-size: 35px 35px;";
-                    //we need an 'icon-' class in there for certain styles to work so if it is image based we'll add this
-                    contentTypes[i].cssClass = "custom-file";
-                }
-            }
-            return contentTypes;
-        },
-        formatContentTypeIcons: function (contentTypes) {
-            for (var i = 0; i < contentTypes.length; i++) {
-                if (!contentTypes[i].icon) {
-                    //just to be safe (e.g. when focus was on close link and hitting save)
-                    contentTypes[i].icon = "icon-document"; // default icon
-                } else {
-                    contentTypes[i].icon = this.convertFromLegacyIcon(contentTypes[i].icon);
-                }
-
-                //couldnt find replacement
-                if(contentTypes[i].icon.indexOf(".") > 0){
-                     contentTypes[i].icon = "icon-document-dashed-line";
-                }
-            }
-            return contentTypes;
-        },
-        /** If the icon is file based (i.e. it has a file path) */
-        isFileBasedIcon: function (icon) {
-            //if it doesn't start with a '.' but contains one then we'll assume it's file based
-            if (icon.startsWith('..') || (!icon.startsWith('.') && icon.indexOf('.') > 1)) {
-                return true;
-            }
-            return false;
-        },
-        /** If the icon is legacy */
-        isLegacyIcon: function (icon) {
-            if(!icon) {
-                return false;
-            }
-
-            if(icon.startsWith('..')){
-                return false;
-            }
-
-            if (icon.startsWith('.')) {
-                return true;
-            }
-            return false;
-        },
-        /** If the tree node has a legacy icon */
-        isLegacyTreeNodeIcon: function(treeNode){
-            if (treeNode.iconIsClass) {
-                return this.isLegacyIcon(treeNode.icon);
-            }
-            return false;
-        },
-
-        /** Converts the icon from legacy to a new one if an old one is detected */
-        convertFromLegacyIcon: function (icon) {
-            if (this.isLegacyIcon(icon)) {
-                //its legacy so convert it if we can
-                var found = _.find(converter, function (item) {
-                    return item.oldIcon.toLowerCase() === icon.toLowerCase();
-                });
-                return (found ? found.newIcon : icon);
-            }
-            return icon;
-        },
-
-        convertFromLegacyImage: function (icon) {
-                var found = _.find(imageConverter, function (item) {
-                    return item.oldImage.toLowerCase() === icon.toLowerCase();
-                });
-                return (found ? found.newIcon : undefined);
-        },
-
-        /** If we detect that the tree node has legacy icons that can be converted, this will convert them */
-        convertFromLegacyTreeNodeIcon: function (treeNode) {
-            if (this.isLegacyTreeNodeIcon(treeNode)) {
-                return this.convertFromLegacyIcon(treeNode.icon);
-            }
-            return treeNode.icon;
-        },
-
-        /** Gets a single IconModel */
-        getIcon: function(iconName) {
-            return init().then(icons => icons.find(i => i.name === iconName));
-        },
-
-        /** Gets all the available icons in the backoffice icon folder and returns them as an array of IconModels */
-         getAllIcons: function() {
-            return init().then(icons => icons);
-        },
-
-        /** LEGACY - Return a list of icons from icon fonts, optionally filter them */
-        /** It fetches them directly from the active stylesheets in the browser */
-        getIcons: function(){
-            var deferred = $q.defer();
-            $timeout(function(){
-                if(collectedIcons){
-                    deferred.resolve(collectedIcons);
-                }else{
-                    collectedIcons = [];
-                    var c = ".icon-";
-
-                    for (var i = document.styleSheets.length - 1; i >= 0; i--) {
-                        var classes = null;
-                        try {
-                            classes = document.styleSheets[i].rules || document.styleSheets[i].cssRules;
-                        } catch (e) {
-                            console.warn("Can't read the css rules of: " + document.styleSheets[i].href, e);
-                            continue;
-                        }
-
-                        if (classes !== null) {
-                            for(var x=0;x<classes.length;x++) {
-                                var cur = classes[x];
-                                if(cur.selectorText && cur.selectorText.indexOf(c) === 0) {
-                                    var s = cur.selectorText.substring(1);
-                                    var hasSpace = s.indexOf(" ");
-                                    if(hasSpace>0){
-                                        s = s.substring(0, hasSpace);
-                                    }
-                                    var hasPseudo = s.indexOf(":");
-                                    if(hasPseudo>0){
-                                        s = s.substring(0, hasPseudo);
-                                    }
-
-                                    if(collectedIcons.indexOf(s) < 0){
-                                        collectedIcons.push(s);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    deferred.resolve(collectedIcons);
-                }
-            }, 100);
-
-            return deferred.promise;
-        },
-
-        /** Creates a icon object, and caches it in a runtime cache */
-        defineIcon: function(name, svg) {
-            var icon = iconCache.find(x => x.name === name);
-            if(icon === undefined) {
-                icon = {
-                    name: name,
-                    svgString: $sce.trustAsHtml(svg)
-                };
-                iconCache.push(icon);
-            }
-            return icon;
-        },
-
-         /** Returns the cached icon or undefined */
-        _getIconFromCache: iconName => iconCache.find(icon => icon.name === iconName)
-
-    };
-}
-angular.module('umbraco.services').factory('iconHelper', iconHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/imagehelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/imagehelper.service.js
deleted file mode 100644
index 123b14c23f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/imagehelper.service.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
-* @ngdoc service
-* @name umbraco.services.imageHelper
-* @deprecated
-**/
-function imageHelper(umbRequestHelper, mediaHelper) {
-    return {
-        /**
-         * @ngdoc function
-         * @name umbraco.services.imageHelper#getImagePropertyValue
-         * @methodOf umbraco.services.imageHelper
-         * @function    
-         *
-         * @deprecated
-         */
-        getImagePropertyValue: function (options) {
-            return mediaHelper.getImagePropertyValue(options);
-        },
-        /**
-         * @ngdoc function
-         * @name umbraco.services.imageHelper#getThumbnail
-         * @methodOf umbraco.services.imageHelper
-         * @function    
-         *
-         * @deprecated
-         */
-        getThumbnail: function (options) {
-            return mediaHelper.getThumbnail(options);
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.imageHelper#scaleToMaxSize
-         * @methodOf umbraco.services.imageHelper
-         * @function    
-         *
-         * @deprecated
-         */
-        scaleToMaxSize: function (maxSize, width, height) {
-            return mediaHelper.scaleToMaxSize(maxSize, width, height);
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.imageHelper#getThumbnailFromPath
-         * @methodOf umbraco.services.imageHelper
-         * @function    
-         *
-         * @deprecated
-         */
-        getThumbnailFromPath: function (imagePath) {
-            return mediaHelper.getThumbnailFromPath(imagePath);
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.imageHelper#detectIfImageByExtension
-         * @methodOf umbraco.services.imageHelper
-         * @function    
-         *
-         * @deprecated
-         */
-        detectIfImageByExtension: function (imagePath) {
-            return mediaHelper.detectIfImageByExtension(imagePath);
-        }
-    };
-}
-angular.module('umbraco.services').factory('imageHelper', imageHelper);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/keyboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/keyboard.service.js
deleted file mode 100644
index 3102a92449..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/keyboard.service.js
+++ /dev/null
@@ -1,330 +0,0 @@
-// This service was based on OpenJS library available in BSD License
-// http://www.openjs.com/scripts/events/keyboard_shortcuts/index.php
-
-function keyboardService($window, $timeout) {
-
-  var keyboardManagerService = {};
-
-  var defaultOpt = {
-    'type': 'keydown',
-    'propagate': false,
-    'inputDisabled': false,
-    'target': $window.document,
-    'keyCode': false
-  };
-
-  // Work around for stupid Shift key bug created by using lowercase - as a result the shift+num combination was broken
-  var shift_nums = {
-    "`": "~",
-    "1": "!",
-    "2": "@",
-    "3": "#",
-    "4": "$",
-    "5": "%",
-    "6": "^",
-    "7": "&",
-    "8": "*",
-    "9": "(",
-    "0": ")",
-    "-": "_",
-    "=": "+",
-    ";": ":",
-    "'": "\"",
-    ",": "<",
-    ".": ">",
-    "/": "?",
-    "\\": "|"
-  };
-
-  // Special Keys - and their codes
-  var special_keys = {
-    'esc': 27,
-    'escape': 27,
-    'tab': 9,
-    'space': 32,
-    'return': 13,
-    'enter': 13,
-    'backspace': 8,
-
-    'scrolllock': 145,
-    'scroll_lock': 145,
-    'scroll': 145,
-    'capslock': 20,
-    'caps_lock': 20,
-    'caps': 20,
-    'numlock': 144,
-    'num_lock': 144,
-    'num': 144,
-
-    'pause': 19,
-    'break': 19,
-
-    'insert': 45,
-    'home': 36,
-    'delete': 46,
-    'end': 35,
-
-    'pageup': 33,
-    'page_up': 33,
-    'pu': 33,
-
-    'pagedown': 34,
-    'page_down': 34,
-    'pd': 34,
-
-    'left': 37,
-    'up': 38,
-    'right': 39,
-    'down': 40,
-
-    'f1': 112,
-    'f2': 113,
-    'f3': 114,
-    'f4': 115,
-    'f5': 116,
-    'f6': 117,
-    'f7': 118,
-    'f8': 119,
-    'f9': 120,
-    'f10': 121,
-    'f11': 122,
-    'f12': 123
-  };
-
-  var isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
-
-  // The event handler for bound element events
-  function eventHandler(e) {
-    e = e || $window.event;
-
-    var code, k;
-
-    // Find out which key is pressed
-    if (e.keyCode) {
-      code = e.keyCode;
-    } else if (e.which) {
-      code = e.which;
-    }
-
-    var character = String.fromCharCode(code).toLowerCase();
-
-    if (code === 188) {
-      character = ",";
-    } // If the user presses , when the type is onkeydown
-    if (code === 190) {
-      character = ".";
-    } // If the user presses , when the type is onkeydown
-
-    var propagate = true;
-
-    //Now we need to determine which shortcut this event is for, we'll do this by iterating over each
-    //registered shortcut to find the match. We use Find here so that the loop exits as soon
-    //as we've found the one we're looking for
-    _.find(_.keys(keyboardManagerService.keyboardEvent), function (key) {
-
-      var shortcutLabel = key;
-      var shortcutVal = keyboardManagerService.keyboardEvent[key];
-
-      // Key Pressed - counts the number of valid keypresses - if it is same as the number of keys, the shortcut function is invoked
-      var kp = 0;
-
-      // Some modifiers key
-      var modifiers = {
-        shift: {
-          wanted: false,
-          pressed: e.shiftKey ? true : false
-        },
-        ctrl: {
-          wanted: false,
-          pressed: e.ctrlKey ? true : false
-        },
-        alt: {
-          wanted: false,
-          pressed: e.altKey ? true : false
-        },
-        meta: { //Meta is Mac specific
-          wanted: false,
-          pressed: e.metaKey ? true : false
-        }
-      };
-
-      var keys = shortcutLabel.split("+");
-      var opt = shortcutVal.opt;
-      var callback = shortcutVal.callback;
-
-      // Foreach keys in label (split on +)
-      var l = keys.length;
-      for (var i = 0; i < l; i++) {
-
-        var k = keys[i];
-        switch (k) {
-          case 'ctrl':
-          case 'control':
-            kp++;
-            modifiers.ctrl.wanted = true;
-            break;
-          case 'shift':
-          case 'alt':
-          case 'meta':
-            kp++;
-            modifiers[k].wanted = true;
-            break;
-        }
-
-        if (k.length > 1) { // If it is a special key
-          if (special_keys[k] === code) {
-            kp++;
-          }
-        } else if (opt['keyCode']) { // If a specific key is set into the config
-          if (opt['keyCode'] === code) {
-            kp++;
-          }
-        } else { // The special keys did not match
-          if (character === k) {
-            kp++;
-          } else {
-            if (shift_nums[character] && e.shiftKey) { // Stupid Shift key bug created by using lowercase
-              character = shift_nums[character];
-              if (character === k) {
-                kp++;
-              }
-            }
-          }
-        }
-
-      } //for end
-
-      if (kp === keys.length &&
-        modifiers.ctrl.pressed === modifiers.ctrl.wanted &&
-        modifiers.shift.pressed === modifiers.shift.wanted &&
-        modifiers.alt.pressed === modifiers.alt.wanted &&
-        modifiers.meta.pressed === modifiers.meta.wanted) {
-
-        //found the right callback!
-
-        // Disable event handler when focus input and textarea
-        if (opt['inputDisabled']) {
-          var elt;
-          if (e.composedPath()) {
-            elt = e.composedPath()[0];
-          } else if (e.target) {
-            elt = e.target;
-          } else if (e.srcElement) {
-            elt = e.srcElement;
-          }
-
-          if (elt.nodeType === 3) {
-            elt = elt.parentNode;
-          }
-          if (elt.tagName === 'INPUT' || elt.tagName === 'TEXTAREA' || elt.hasAttribute('disable-hotkeys')) {
-            //This exits the Find loop
-            return true;
-          }
-        }
-
-        $timeout(function () {
-          callback(e);
-        }, 1);
-
-        if (!opt['propagate']) { // Stop the event
-          propagate = false;
-        }
-
-        //This exits the Find loop
-        return true;
-      }
-
-      //we haven't found one so continue looking
-      return false;
-
-    });
-
-    // Stop the event if required
-    if (!propagate) {
-      // e.cancelBubble is supported by IE - this will kill the bubbling process.
-      e.cancelBubble = true;
-      e.returnValue = false;
-
-      // e.stopPropagation works in Firefox.
-      if (e.stopPropagation) {
-        e.stopPropagation();
-        e.preventDefault();
-      }
-      return false;
-    }
-  }
-
-  // Store all keyboard combination shortcuts
-  keyboardManagerService.keyboardEvent = {};
-
-  // Add a new keyboard combination shortcut
-  keyboardManagerService.bind = function (label, callback, opt) {
-
-    //replace ctrl key with meta key
-    if (isMac && label !== "ctrl+space") {
-      label = label.replace("ctrl", "meta");
-    }
-
-    var elt;
-    // Initialize opt object
-    opt = Utilities.extend({}, defaultOpt, opt);
-    label = label.toLowerCase();
-    elt = opt.target;
-    if (typeof opt.target === 'string') {
-      elt = document.getElementById(opt.target);
-    }
-
-    //Ensure we aren't double binding to the same element + type otherwise we'll end up multi-binding
-    // and raising events for now reason. So here we'll check if the event is already registered for the element
-    var boundValues = _.values(keyboardManagerService.keyboardEvent);
-    var found = _.find(boundValues, function (i) {
-      return i.target === elt && i.event === opt['type'];
-    });
-
-    // Store shortcut
-    keyboardManagerService.keyboardEvent[label] = {
-      'callback': callback,
-      'target': elt,
-      'opt': opt
-    };
-
-    if (!found) {
-      //Attach the function with the event
-      if (elt.addEventListener) {
-        elt.addEventListener(opt['type'], eventHandler, false);
-      } else if (elt.attachEvent) {
-        elt.attachEvent('on' + opt['type'], eventHandler);
-      } else {
-        elt['on' + opt['type']] = eventHandler;
-      }
-    }
-
-  };
-  // Remove the shortcut - just specify the shortcut and I will remove the binding
-  keyboardManagerService.unbind = function (label) {
-    label = label.toLowerCase();
-    var binding = keyboardManagerService.keyboardEvent[label];
-    delete (keyboardManagerService.keyboardEvent[label]);
-
-    if (!binding) {
-      return;
-    }
-
-    var type = binding['event'],
-      elt = binding['target'],
-      callback = binding['callback'];
-
-    if (elt.detachEvent) {
-      elt.detachEvent('on' + type, callback);
-    } else if (elt.removeEventListener) {
-      elt.removeEventListener(type, callback, false);
-    } else {
-      elt['on' + type] = false;
-    }
-  };
-  //
-
-  return keyboardManagerService;
-}
-
-angular.module('umbraco.services').factory('keyboardService', ['$window', '$timeout', keyboardService]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
deleted file mode 100644
index f9ebba00ea..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
+++ /dev/null
@@ -1,662 +0,0 @@
-/**
- @ngdoc service
- * @name umbraco.services.listViewHelper
- *
- *
- * @description
- * Service for performing operations against items in the list view UI. Used by the built-in internal listviews
- * as well as custom listview.
- *
- * A custom listview is always used inside a wrapper listview, so there are a number of inherited values on its
- * scope by default:
- *
- * **$scope.selection**: Array containing all items currently selected in the listview
- *
- * **$scope.items**: Array containing all items currently displayed in the listview
- *
- * **$scope.folders**: Array containing all folders in the current listview (only for media)
- *
- * **$scope.options**: configuration object containing information such as pagesize, permissions, order direction etc.
- *
- * **$scope.model.config.layouts**: array of available layouts to apply to the listview (grid, list or custom layout)
- *
- * ##Usage##
- * To use, inject listViewHelper into custom listview controller, listviewhelper expects you
- * to pass in the full collection of items in the listview in several of its methods
- * this collection is inherited from the parent controller and is available on $scope.selection
- *
- * <pre>
- *      angular.module("umbraco").controller("my.listVieweditor". function($scope, listViewHelper){
- *
- *          //current items in the listview
- *          var items = $scope.items;
- *
- *          //current selection
- *          var selection = $scope.selection;
- *
- *          //deselect an item , $scope.selection is inherited, item is picked from inherited $scope.items
- *          listViewHelper.deselectItem(item, $scope.selection);
- *
- *          //test if all items are selected, $scope.items + $scope.selection are inherited
- *          listViewhelper.isSelectedAll($scope.items, $scope.selection);
- *      });
- * </pre>
- */
-(function () {
-    'use strict';
-
-    function listViewHelper($location, $rootScope, localStorageService, urlHelper, editorService) {
-        var firstSelectedIndex = 0;
-        var localStorageKey = "umblistViewLayout";
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#getLayout
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * Method for internal use, based on the collection of layouts passed, the method selects either
-        * any previous layout from local storage, or picks the first allowed layout
-        *
-        * @param {Any} id The identifier of the current node or application displayed in the content editor
-        * @param {Array} availableLayouts Array of all allowed layouts, available from $scope.model.config.layouts
-        */
-
-        function getLayout(id, availableLayouts) {
-
-            var storedLayouts = [];
-
-            if (localStorageService.get(localStorageKey)) {
-                storedLayouts = localStorageService.get(localStorageKey);
-            }
-
-            if (storedLayouts && storedLayouts.length > 0) {
-                for (var i = 0; storedLayouts.length > i; i++) {
-                    var layout = storedLayouts[i];
-                    if (isMatchingLayout(id, layout)) {
-                        return setLayout(id, layout, availableLayouts);
-                    }
-                }
-
-            }
-
-            return getFirstAllowedLayout(availableLayouts);
-
-        }
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#setLayout
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * Changes the current layout used by the listview to the layout passed in. Stores selection in localstorage
-        *
-        * @param {Any} id The identifier of the current node or application displayed in the content editor
-        * @param {Object} selectedLayout Layout selected as the layout to set as the current layout
-        * @param {Array} availableLayouts Array of all allowed layouts, available from $scope.model.config.layouts
-        */
-
-        function setLayout(id, selectedLayout, availableLayouts) {
-
-            var activeLayout = {};
-            var layoutFound = false;
-
-            for (var i = 0; availableLayouts.length > i; i++) {
-                var layout = availableLayouts[i];
-                if (layout.path === selectedLayout.path) {
-                    activeLayout = layout;
-                    layout.active = true;
-                    layoutFound = true;
-                } else {
-                    layout.active = false;
-                }
-            }
-
-            if (!layoutFound) {
-                activeLayout = getFirstAllowedLayout(availableLayouts);
-            }
-
-            saveLayoutInLocalStorage(id, activeLayout);
-
-            return activeLayout;
-
-        }
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#saveLayoutInLocalStorage
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * Stores a given layout as the current default selection in local storage
-        *
-        * @param {Any} id The identifier of the current node or application displayed in the content editor
-        * @param {Object} selectedLayout Layout selected as the layout to set as the current layout
-        */
-
-        function saveLayoutInLocalStorage(id, selectedLayout) {
-            var layoutFound = false;
-            var storedLayouts = [];
-
-            if (localStorageService.get(localStorageKey)) {
-                storedLayouts = localStorageService.get(localStorageKey);
-            }
-
-            if (storedLayouts.length > 0) {
-                for (var i = 0; storedLayouts.length > i; i++) {
-                    var layout = storedLayouts[i];
-                    if (isMatchingLayout(id, layout)) {
-                        layout.path = selectedLayout.path;
-                        layoutFound = true;
-                    }
-                }
-            }
-
-            if (!layoutFound) {
-                var storageObject = {
-                    "id": id,
-                    "path": selectedLayout.path
-                };
-                storedLayouts.push(storageObject);
-            }
-
-            localStorageService.set(localStorageKey, storedLayouts);
-
-        }
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#getFirstAllowedLayout
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * Returns currently selected layout, or alternatively the first layout in the available layouts collection
-        *
-        * @param {Array} layouts Array of all allowed layouts, available from $scope.model.config.layouts
-        */
-
-        function getFirstAllowedLayout(layouts) {
-
-            var firstAllowedLayout = {};
-
-            if (layouts != null) {
-                for (var i = 0; layouts.length > i; i++) {
-                    var layout = layouts[i];
-                    if (layout.selected === true) {
-                        firstAllowedLayout = layout;
-                        break;
-                    }
-                }
-            }
-
-            return firstAllowedLayout;
-        }
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#selectHandler
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * Helper method for working with item selection via a checkbox, internally it uses selectItem and deselectItem.
-        * Working with this method, requires its triggered via a checkbox which can then pass in its triggered $event
-        * When the checkbox is clicked, this method will toggle selection of the associated item so it matches the state of the checkbox
-        *
-        * @param {Object} selectedItem Item being selected or deselected by the checkbox
-        * @param {Number} selectedIndex Index of item being selected/deselected, usually passed as $index
-        * @param {Array} items All items in the current listview, available as $scope.items
-        * @param {Array} selection All selected items in the current listview, available as $scope.selection
-        * @param {Event} $event Event triggered by the checkbox being checked to select / deselect an item
-        */
-
-        function selectHandler(selectedItem, selectedIndex, items, selection, $event) {
-
-            var start = 0;
-            var end = 0;
-            var item = null;
-
-            if ($event.shiftKey === true) {
-
-                if (selectedIndex > firstSelectedIndex) {
-
-                    start = firstSelectedIndex;
-                    end = selectedIndex;
-
-                    for (; end >= start; start++) {
-                        item = items[start];
-                        selectItem(item, selection);
-                    }
-
-                } else {
-
-                    start = firstSelectedIndex;
-                    end = selectedIndex;
-
-                    for (; end <= start; start--) {
-                        item = items[start];
-                        selectItem(item, selection);
-                    }
-
-                }
-
-            } else {
-
-                if (selectedItem.selected) {
-                    deselectItem(selectedItem, selection);
-                } else {
-                    selectItem(selectedItem, selection);
-                }
-
-                firstSelectedIndex = selectedIndex;
-
-            }
-
-        }
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#selectItem
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * Selects a given item to the listview selection array, requires you pass in the inherited $scope.selection collection
-        *
-        * @param {Object} item Item to select
-        * @param {Array} selection Listview selection, available as $scope.selection
-        */
-
-        function selectItem(item, selection) {
-            var isSelected = false;
-            for (var i = 0; selection.length > i; i++) {
-                var selectedItem = selection[i];
-                // if item.id is 2147483647 (int.MaxValue) use item.key
-                if ((item.id !== 2147483647 && item.id === selectedItem.id) || (item.key && item.key === selectedItem.key)) {
-                    isSelected = true;
-                }
-            }
-            if (!isSelected) {
-                var obj = {
-                    id: item.id
-                };
-                if (item.key) {
-                    obj.key = item.key;
-                }
-
-                selection.push(obj);
-                item.selected = true;
-                $rootScope.$broadcast("listView.itemsChanged", { items: selection });
-            }
-        }
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#deselectItem
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * Deselects a given item from the listviews selection array, requires you pass in the inherited $scope.selection collection
-        *
-        * @param {Object} item Item to deselect
-        * @param {Array} selection Listview selection, available as $scope.selection
-        */
-
-        function deselectItem(item, selection) {
-            for (var i = 0; selection.length > i; i++) {
-                var selectedItem = selection[i];
-                // if item.id is 2147483647 (int.MaxValue) use item.key
-                if ((item.id !== 2147483647 && item.id === selectedItem.id) || (item.key && item.key === selectedItem.key)) {
-                    selection.splice(i, 1);
-                    item.selected = false;
-                    $rootScope.$broadcast("listView.itemsChanged", { items: selection });
-                }
-            }
-        }
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#clearSelection
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * Removes a given number of items and folders from the listviews selection array
-        * Folders can only be passed in if the listview is used in the media section which has a concept of folders.
-        *
-        * @param {Array} items Items to remove, can be null
-        * @param {Array} folders Folders to remove, can be null
-        * @param {Array} selection Listview selection, available as $scope.selection
-        */
-
-        function clearSelection(items, folders, selection) {
-
-            var i = 0;
-
-            selection.length = 0;
-
-            if (Utilities.isArray(items)) {
-                for (i = 0; items.length > i; i++) {
-                    var item = items[i];
-                    item.selected = false;
-                }
-            }
-
-            if (Utilities.isArray(folders)) {
-                for (i = 0; folders.length > i; i++) {
-                    var folder = folders[i];
-                    folder.selected = false;
-                }
-            }
-            $rootScope.$broadcast("listView.itemsChanged", { items: selection });
-        }
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#selectAllItems
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * Helper method for toggling the select state on all items in the active listview
-        * Can only be used from a checkbox as a checkbox $event is required to pass in.
-        *
-        * @param {Array} items Items to toggle selection on, should be $scope.items
-        * @param {Array} selection Listview selection, available as $scope.selection
-        * @param {$event} $event Event passed from the checkbox being toggled
-        */
-
-        function selectAllItems(items, selection, $event) {
-
-            var checkbox = $event.target;
-            var clearSelection = false;
-
-            if (!Utilities.isArray(items)) {
-                return;
-            }
-
-            selection.length = 0;
-
-            for (var i = 0; i < items.length; i++) {
-
-                var item = items[i];
-                var obj = {
-                    id: item.id
-                };
-                if (item.key) {
-                    obj.key = item.key
-                }
-
-                if (checkbox.checked) {
-                    selection.push(obj);
-                } else {
-                    clearSelection = true;
-                }
-
-                item.selected = checkbox.checked;
-
-            }
-
-            if (clearSelection) {
-                selection.length = 0;
-            }
-            $rootScope.$broadcast("listView.itemsChanged", { items: selection });
-
-        }
-
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#selectAllItemsToggle
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * Helper method for toggling the select state on all items.
-        *
-        * @param {Array} items Items to toggle selection on, should be $scope.items
-        * @param {Array} selection Listview selection, available as $scope.selection
-        */
-
-        function selectAllItemsToggle(items, selection) {
-
-            if (!Utilities.isArray(items)) {
-                return;
-            }
-
-            if (isSelectedAll(items, selection)) {
-                // unselect all items
-                items.forEach(function (item) {
-                    item.selected = false;
-                });
-
-                // reset selection without loosing reference.
-                selection.length = 0;
-
-            } else {
-
-                // reset selection without loosing reference.
-                selection.length = 0;
-
-                // select all items
-                items.forEach(function (item) {
-                    var obj = {
-                        id: item.id
-                    };
-                    if (item.key) {
-                        obj.key = item.key;
-                    }
-                    item.selected = true;
-                    selection.push(obj);
-                });
-            }
-            $rootScope.$broadcast("listView.itemsChanged", { items: selection });
-
-        }
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#isSelectedAll
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * Method to determine if all items on the current page in the list has been selected
-        * Given the current items in the view, and the current selection, it will return true/false
-        *
-        * @param {Array} items Items to test if all are selected, should be $scope.items
-        * @param {Array} selection Listview selection, available as $scope.selection
-        * @returns {Boolean} boolean indicate if all items in the listview have been selected
-        */
-
-        function isSelectedAll(items, selection) {
-
-            var numberOfSelectedItem = 0;
-
-            for (var itemIndex = 0; items.length > itemIndex; itemIndex++) {
-                var item = items[itemIndex];
-
-                for (var selectedIndex = 0; selection.length > selectedIndex; selectedIndex++) {
-                    var selectedItem = selection[selectedIndex];
-
-                    // if item.id is 2147483647 (int.MaxValue) use item.key
-                    if ((item.id !== 2147483647 && item.id === selectedItem.id) || (item.key && item.key === selectedItem.key)) {
-                        numberOfSelectedItem++;
-                    }
-                }
-
-            }
-
-            if (numberOfSelectedItem === items.length) {
-                return true;
-            }
-
-        }
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#setSortingDirection
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * *Internal* method for changing sort order icon
-        * @param {String} col Column alias to order after
-        * @param {String} direction Order direction `asc` or `desc`
-        * @param {Object} options object passed from the parent listview available as $scope.options
-        */
-
-        function setSortingDirection(col, direction, options) {
-            return options.orderBy.toUpperCase() === col.toUpperCase() && options.orderDirection === direction;
-        }
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#setSorting
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * Method for setting the field on which the listview will order its items after.
-        *
-        * @param {String} field Field alias to order after
-        * @param {Boolean} allow Determines if the user is allowed to set this field, normally true
-        * @param {Object} options Options object passed from the parent listview available as $scope.options
-        */
-
-        function setSorting(field, allow, options) {
-            if (allow) {
-                if (options.orderBy === field && options.orderDirection === 'asc') {
-                    options.orderDirection = "desc";
-                } else {
-                    options.orderDirection = "asc";
-                }
-                options.orderBy = field;
-            }
-        }
-
-        //This takes in a dictionary of Ids with Permissions and determines
-        // the intersect of all permissions to return an object representing the
-        // listview button permissions
-        function getButtonPermissions(unmergedPermissions, currentIdsWithPermissions) {
-
-            if (currentIdsWithPermissions == null) {
-                currentIdsWithPermissions = {};
-            }
-
-            //merge the newly retrieved permissions to the main dictionary
-            _.each(unmergedPermissions, function (value, key, list) {
-                currentIdsWithPermissions[key] = value;
-            });
-
-            //get the intersect permissions
-            var arr = [];
-            _.each(currentIdsWithPermissions, function (value, key, list) {
-                arr.push(value);
-            });
-
-            //we need to use 'apply' to call intersection with an array of arrays,
-            //see: https://stackoverflow.com/a/16229480/694494
-            var intersectPermissions = _.intersection.apply(_, arr);
-
-            return {
-                canCopy: _.contains(intersectPermissions, 'O'), //Magic Char = O
-                canCreate: _.contains(intersectPermissions, 'C'), //Magic Char = C
-                canDelete: _.contains(intersectPermissions, 'D'), //Magic Char = D
-                canMove: _.contains(intersectPermissions, 'M'), //Magic Char = M
-                canPublish: _.contains(intersectPermissions, 'U'), //Magic Char = U
-                canUnpublish: _.contains(intersectPermissions, 'U') //Magic Char = Z (however UI says it can't be set, so if we can publish 'U' we can unpublish)
-            };
-        }
-
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewHelper#editItem
-        * @methodOf umbraco.services.listViewHelper
-        *
-        * @description
-        * Method for opening an item in a list view for editing.
-        *
-        * @param {Object} item The item to edit
-        * @param {Object} scope The scope with options
-        */
-        function editItem(item, scope) {
-
-            if (!item.editPath) {
-                return;
-            }
-
-            if (scope && scope.options && scope.options.useInfiniteEditor)
-            {
-                var editorModel = {
-                    id: item.id,
-                    submit: function(model) {
-                        editorService.close();
-                        scope.getContent(scope.contentId);
-                    },
-                    close: function() {
-                        editorService.close();
-                        scope.getContent(scope.contentId);
-                    }
-                };
-
-                if (item.editPath.indexOf("/content/") == 0)
-                {
-                    editorService.contentEditor(editorModel);
-                    return;
-                }
-
-                if (item.editPath.indexOf("/media/") == 0)
-                {
-                    editorService.mediaEditor(editorModel);
-                    return;
-                }
-
-                if (item.editPath.indexOf("/member/") == 0)
-                {
-                    editorModel.id = item.key;
-                    editorService.memberEditor(editorModel);
-                    return;
-                }
-            }
-            
-            var parts = item.editPath.split("?");
-            var path = parts[0];
-            var params = parts[1]
-            ? urlHelper.getQueryStringParams("?" + parts[1])
-            : {};
-            
-            $location.path(path);
-            for (var p in params) {
-                $location.search(p, params[p]);
-            }
-        }
-
-        function isMatchingLayout(id, layout) {
-            // legacy format uses "nodeId", be sure to look for both
-            return layout.id === id || layout.nodeId === id;
-        }
-
-        var service = {
-
-            getLayout: getLayout,
-            getFirstAllowedLayout: getFirstAllowedLayout,
-            setLayout: setLayout,
-            saveLayoutInLocalStorage: saveLayoutInLocalStorage,
-            selectHandler: selectHandler,
-            selectItem: selectItem,
-            deselectItem: deselectItem,
-            clearSelection: clearSelection,
-            selectAllItems: selectAllItems,
-            selectAllItemsToggle: selectAllItemsToggle,
-            isSelectedAll: isSelectedAll,
-            setSortingDirection: setSortingDirection,
-            setSorting: setSorting,
-            getButtonPermissions: getButtonPermissions,
-            editItem: editItem
-
-        };
-
-        return service;
-
-    }
-
-
-    angular.module('umbraco.services').factory('listViewHelper', listViewHelper);
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/listviewprevaluehelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/listviewprevaluehelper.service.js
deleted file mode 100644
index 70bba2d26a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/listviewprevaluehelper.service.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- @ngdoc service
- * @name umbraco.services.listViewPrevalueHelper
- *
- *
- * @description
- * Service for accessing the prevalues of a list view being edited in the inline list view editor in the doctype editor
- */
-(function () {
-    'use strict';
-
-    function listViewPrevalueHelper() {
-
-        var prevalues = [];
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewPrevalueHelper#getPrevalues
-        * @methodOf umbraco.services.listViewPrevalueHelper
-        *
-        * @description
-        * Set the collection of prevalues
-        */
-
-        function getPrevalues() {
-            return prevalues;
-        }
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.listViewPrevalueHelper#setPrevalues
-        * @methodOf umbraco.services.listViewPrevalueHelper
-        *
-        * @description
-        * Changes the current layout used by the listview to the layout passed in. Stores selection in localstorage
-        *
-        * @param {Array} values Array of prevalues
-        */
-
-        function setPrevalues(values) {
-            prevalues = values;
-        }
-
-        
-
-        var service = {
-
-            getPrevalues: getPrevalues,
-            setPrevalues: setPrevalues
-
-        };
-
-        return service;
-
-    }
-
-
-    angular.module('umbraco.services').factory('listViewPrevalueHelper', listViewPrevalueHelper);
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
deleted file mode 100644
index 6911651af9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
+++ /dev/null
@@ -1,341 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.localizationService
- *
- * @requires $http
- * @requires $q
- * @requires $window
- * @requires $filter
- *
- * @description
- * Application-wide service for handling localization
- *
- * ##usage
- * To use, simply inject the localizationService into any controller that needs it, and make
- * sure the umbraco.services module is accesible - which it should be by default.
- *
- * <pre>
- *    localizationService.localize("area_key").then(function(value){
- *        element.html(value);
- *    });
- * </pre>
- */
-
-angular.module('umbraco.services')
-.factory('localizationService', function ($http, $q, eventsService) {
-
-    // TODO: This should be injected as server vars
-    var url = "LocalizedText";
-    var resourceFileLoadStatus = "none";
-    var resourceLoadingPromise = [];
-
-    // array to hold the localized resource string entries
-    var innerDictionary = [];
-
-    function _lookup(alias, tokens, dictionary, fallbackValue) {
-
-        //strip the key identifier if its there
-        if (alias && alias[0] === "@") {
-            alias = alias.substring(1);
-        }
-
-        var underscoreIndex = alias.indexOf("_");
-        //if no area specified, add general_
-        if (alias && underscoreIndex < 0) {
-            alias = "general_" + alias;
-            underscoreIndex = alias.indexOf("_");
-        }
-
-        var areaAlias = alias.substring(0, underscoreIndex);
-        var valueAlias = alias.substring(underscoreIndex + 1);
-
-        var areaEntry = dictionary[areaAlias];
-        if (areaEntry) {
-            var valueEntry = areaEntry[valueAlias];
-            if (valueEntry) {
-                return service.tokenReplace(valueEntry, tokens);
-            }
-        }
-
-        if (fallbackValue) return fallbackValue;
-
-        return "[" + alias + "]";
-    }
-
-    var service = {
-
-
-        // loads the language resource file from the server
-        initLocalizedResources: function () {
-
-            // TODO: This promise handling is super ugly, we should just be returnning the promise from $http and returning inner values.
-
-            var deferred = $q.defer();
-
-            if (resourceFileLoadStatus === "loaded") {
-                deferred.resolve(innerDictionary);
-                return deferred.promise;
-            }
-
-            //if the resource is already loading, we don't want to force it to load another one in tandem, we'd rather
-            // wait for that initial http promise to finish and then return this one with the dictionary loaded
-            if (resourceFileLoadStatus === "loading") {
-                //add to the list of promises waiting
-                resourceLoadingPromise.push(deferred);
-
-                //exit now it's already loading
-                return deferred.promise;
-            }
-
-            resourceFileLoadStatus = "loading";
-
-            // build the url to retrieve the localized resource file
-            $http({ method: "GET", url: url, cache: false })
-                .then(function (response) {
-                    resourceFileLoadStatus = "loaded";
-                    innerDictionary = response.data;
-
-                    eventsService.emit("localizationService.updated", response.data);
-
-                    deferred.resolve(response.data);
-                    //ensure all other queued promises are resolved
-                    for (var p in resourceLoadingPromise) {
-                        resourceLoadingPromise[p].resolve(response.data);
-                    }
-                }, function (err) {
-                    deferred.reject("Something broke");
-                    //ensure all other queued promises are resolved
-                    for (var p in resourceLoadingPromise) {
-                        resourceLoadingPromise[p].reject("Something broke");
-                    }
-                });
-            return deferred.promise;
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.localizationService#tokenize
-         * @methodOf umbraco.services.localizationService
-         *
-         * @description
-         * Helper to tokenize and compile a localization string
-         * @param {String} value the value to tokenize
-         * @param {Object} scope the $scope object
-         * @returns {String} tokenized resource string
-         */
-        tokenize: function (value, scope) {
-            if (value) {
-                var localizer = value.split(':');
-                var retval = { tokens: undefined, key: localizer[0].substring(0) };
-                if (localizer.length > 1) {
-                    retval.tokens = localizer[1].split(',');
-                    for (var x = 0; x < retval.tokens.length; x++) {
-                        retval.tokens[x] = scope.$eval(retval.tokens[x]);
-                    }
-                }
-
-                return retval;
-            }
-            return value;
-        },
-
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.localizationService#tokenReplace
-         * @methodOf umbraco.services.localizationService
-         *
-         * @description
-         * Helper to replace tokens
-         * @param {String} value the text-string to manipulate
-         * @param {Array} tekens An array of tokens values
-         * @returns {String} Replaced test-string
-         */
-        tokenReplace: function (text, tokens) {
-            if (tokens) {
-                for (var i = 0; i < tokens.length; i++) {
-                    text = text.replace("%" + i + "%", _.escape(tokens[i]));
-                }
-            }
-            return text;
-        },
-
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.localizationService#localize
-         * @methodOf umbraco.services.localizationService
-         *
-         * @description
-         * Checks the dictionary for a localized resource string
-         * @param {String} value the area/key to localize in the format of 'section_key'
-         * alternatively if no section is set such as 'key' then we assume the key is to be looked in
-         * the 'general' section
-         *
-         * @param {Array} tokens if specified this array will be sent as parameter values
-         * This replaces %0% and %1% etc in the dictionary key value with the passed in strings
-         *
-         * @param {String} fallbackValue if specified this string will be returned if no matching
-         * entry was found in the dictionary
-         *
-         * @returns {String} localized resource string
-         */
-        localize: function (value, tokens, fallbackValue) {
-            return service.initLocalizedResources().then(function (dic) {
-                    return _lookup(value, tokens, dic, fallbackValue);
-            });
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.localizationService#localizeMany
-         * @methodOf umbraco.services.localizationService
-         *
-         * @description
-         * Checks the dictionary for multipe localized resource strings at once, preventing the need for nested promises
-         * with localizationService.localize
-         *
-         * ##Usage
-         * <pre>
-         * localizationService.localizeMany(["speechBubbles_templateErrorHeader", "speechBubbles_templateErrorText"]).then(function(data){
-         *      var header = data[0];
-         *      var message = data[1];
-         *
-         *
-         *
-         *
-         *      notificationService.error(header, message);
-         * });
-         * </pre>
-         *
-         * @param {Array} keys is an array of strings of the area/key to localize in the format of 'section_key'
-         * alternatively if no section is set such as 'key' then we assume the key is to be looked in
-         * the 'general' section
-         *
-         * @returns {Array} An array of localized resource string in the same order
-         */
-        localizeMany: function(keys) {
-            if(keys){
-
-                //The LocalizationService.localize promises we want to resolve
-                var promises = [];
-
-                for(var i = 0; i < keys.length; i++){
-                    promises.push(service.localize(keys[i], undefined));
-                }
-
-                return $q.all(promises).then(function(localizedValues){
-                    return localizedValues;
-                });
-            }
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.localizationService#concat
-         * @methodOf umbraco.services.localizationService
-         *
-         * @description
-         * Checks the dictionary for multipe localized resource strings at once & concats them to a single string
-         * Which was not possible with localizationSerivce.localize() due to returning a promise
-         *
-         * ##Usage
-         * <pre>
-         * localizationService.concat(["speechBubbles_templateErrorHeader", "speechBubbles_templateErrorText"]).then(function(data){
-         *      var combinedText = data;
-         * });
-         * </pre>
-         *
-         * @param {Array} keys is an array of strings of the area/key to localize in the format of 'section_key'
-         * alternatively if no section is set such as 'key' then we assume the key is to be looked in
-         * the 'general' section
-         *
-         * @returns {String} An concatenated string of localized resource string passed into the function in the same order
-         */
-        concat: function(keys) {
-            if(keys){
-
-                //The LocalizationService.localize promises we want to resolve
-                var promises = [];
-
-                for(var i = 0; i < keys.length; i++){
-                    promises.push(service.localize(keys[i], undefined));
-                }
-
-                return $q.all(promises).then(function(localizedValues){
-
-                    //Build a concat string by looping over the array of resolved promises/translations
-                    var returnValue = "";
-
-                    for(var j = 0; j < localizedValues.length; j++){
-                        returnValue += localizedValues[j];
-                    }
-
-                    return returnValue;
-                });
-            }
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.localizationService#format
-         * @methodOf umbraco.services.localizationService
-         *
-         * @description
-         * Checks the dictionary for multipe localized resource strings at once & formats a tokenized message
-         * Which was not possible with localizationSerivce.localize() due to returning a promise
-         *
-         * ##Usage
-         * <pre>
-         * localizationService.format(["template_insert", "template_insertSections"], "%0% %1%").then(function(data){
-         *      //Will return 'Insert Sections'
-         *      var formattedResult = data;
-         * });
-         * </pre>
-         *
-         * @param {Array} keys is an array of strings of the area/key to localize in the format of 'section_key'
-         * alternatively if no section is set such as 'key' then we assume the key is to be looked in
-         * the 'general' section
-         *
-         * @param {String} message is the string you wish to replace containing tokens in the format of %0% and %1%
-         * with the localized resource strings
-         *
-         * @returns {String} An concatenated string of localized resource string passed into the function in the same order
-         */
-        format: function(keys, message){
-            if(keys){
-
-                //The LocalizationService.localize promises we want to resolve
-                var promises = [];
-
-                for(var i = 0; i < keys.length; i++){
-                    promises.push(service.localize(keys[i], undefined));
-                }
-
-                return $q.all(promises).then(function(localizedValues){
-
-                    //Replace {0} and {1} etc in message with the localized values
-                    for(var j = 0; j < localizedValues.length; j++){
-                        var token = "%" + j + "%";
-                        var regex = new RegExp(token, "g");
-
-                        message = message.replace(regex, localizedValues[j]);
-                    }
-
-                    return message;
-                });
-            }
-        }
-
-    };
-
-    //This happens after login / auth and assets loading
-    eventsService.on("app.authenticated", function () {
-        resourceFileLoadStatus = "none";
-        resourceLoadingPromise = [];
-    });
-
-
-    // return the local instance when called
-    return service;
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js b/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
deleted file mode 100644
index e0cb92beb3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.macroService
- *
- *
- * @description
- * A service to return macro information such as generating syntax to insert a macro into an editor
- */
-function macroService() {
-
-    return {
-
-        /** parses the special macro syntax like <?UMBRACO_MACRO macroAlias="Map" /> and returns an object with the macro alias and it's parameters */
-        parseMacroSyntax: function (syntax) {
-
-            //This regex will match an alias of anything except characters that are quotes or new lines (for legacy reasons, when new macros are created
-            // their aliases are cleaned an invalid chars are stripped)
-            var expression = /(<\?UMBRACO_MACRO (?:.+?)?macroAlias=["']([^\"\'\n\r]+?)["'][\s\S]+?)(\/>|>.*?<\/\?UMBRACO_MACRO>)/i;
-            var match = expression.exec(syntax);
-            if (!match || match.length < 3) {
-                return null;
-            }
-            var alias = match[2];
-
-            //this will leave us with just the parameters
-            var paramsChunk = match[1].trim().replace(new RegExp("UMBRACO_MACRO macroAlias=[\"']" + alias + "[\"']"), "").trim();
-
-            var paramExpression = /(\w+?)=['\"]([\s\S]*?)['\"]/g;
-
-            var paramMatch;
-            var returnVal = {
-                macroAlias: alias,
-                macroParamsDictionary: {}
-            };
-            while ((paramMatch = paramExpression.exec(paramsChunk))) {
-                returnVal.macroParamsDictionary[paramMatch[1]] = paramMatch[2];
-            }
-            return returnVal;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.macroService#generateMacroSyntax
-         * @methodOf umbraco.services.macroService
-         * @function
-         *
-         * @description
-         * generates the syntax for inserting a macro into a rich text editor - this is the very old umbraco style syntax
-         *
-         * @param {object} args an object containing the macro alias and it's parameter values
-         */
-        generateMacroSyntax: function (args) {
-
-            // <?UMBRACO_MACRO macroAlias="BlogListPosts" />
-
-            var macroString = '<?UMBRACO_MACRO macroAlias=\"' + args.macroAlias + "\" ";
-
-            if (args.macroParamsDictionary) {
-
-                _.each(args.macroParamsDictionary, function (val, key) {
-                    //check for null
-                    val = val ? val : "";
-                    //need to detect if the val is a string or an object
-                    var keyVal;
-                    if (Utilities.isString(val)) {
-                        keyVal = key + "=\"" + (val ? val : "") + "\" ";
-                    }
-                    else {
-                        //if it's not a string we'll send it through the json serializer
-                        var json = Utilities.toJson(val);
-                        //then we need to url encode it so that it's safe
-                        var encoded = encodeURIComponent(json);
-                        keyVal = key + "=\"" + encoded + "\" ";
-                    }
-
-                    macroString += keyVal;
-                });
-
-            }
-
-            macroString += "/>";
-
-            return macroString;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.macroService#generateMvcSyntax
-         * @methodOf umbraco.services.macroService
-         * @function
-         *
-         * @description
-         * generates the syntax for inserting a macro into an mvc template
-         *
-         * @param {object} args an object containing the macro alias and it's parameter values
-         */
-        generateMvcSyntax: function (args) {
-
-            var macroString = "@await Umbraco.RenderMacroAsync(\"" + args.macroAlias + "\"";
-
-            var hasParams = false;
-            var paramString;
-            if (args.macroParamsDictionary) {
-
-                paramString = ", new {";
-
-                _.each(args.macroParamsDictionary, function(val, key) {
-
-                    hasParams = true;
-
-                    var keyVal = key + "=\"" + (val ? val : "") + "\", ";
-
-                    paramString += keyVal;
-                });
-
-                //remove the last ,
-                paramString = paramString.trimEnd(", ");
-
-                paramString += "}";
-            }
-            if (hasParams) {
-                macroString += paramString;
-            }
-
-            macroString += ")";
-            return macroString;
-        },
-
-        collectValueData: function(macro, macroParams, renderingEngine) {
-
-            var paramDictionary = {};
-            var macroAlias = macro.alias;
-            if (!macroAlias) {
-                throw "The macro object does not contain an alias";
-            }
-
-            var syntax;
-
-            _.each(macroParams, function (item) {
-
-                var val = item.value;
-
-                if (item.value !== null && item.value !== undefined && !_.isString(item.value)) {
-                    try {
-                        val = Utilities.toJson(val);
-                    }
-                    catch (e) {
-                        // not json
-                    }
-                }
-
-                //each value needs to be xml escaped!! since the value get's stored as an xml attribute
-                paramDictionary[item.alias] = _.escape(val);
-
-            });
-
-            //get the syntax based on the rendering engine
-            if (renderingEngine && renderingEngine === "Mvc") {
-                syntax = this.generateMvcSyntax({ macroAlias: macroAlias, macroParamsDictionary: paramDictionary });
-            }
-            else {
-                syntax = this.generateMacroSyntax({ macroAlias: macroAlias, macroParamsDictionary: paramDictionary });
-            }
-
-            var macroObject = {
-                "macroParamsDictionary": paramDictionary,
-                "macroAlias": macroAlias,
-                "syntax": syntax
-            };
-
-            return macroObject;
-
-        }
-
-    };
-
-}
-
-angular.module('umbraco.services').factory('macroService', macroService);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
deleted file mode 100644
index 14de3bb1c4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ /dev/null
@@ -1,455 +0,0 @@
-/**
-* @ngdoc service
-* @name umbraco.services.mediaHelper
-* @description A helper object used for dealing with media items
-**/
-function mediaHelper(umbRequestHelper, $http, $log) {
-
-    //container of fileresolvers
-    var _mediaFileResolvers = {};
-
-    return {
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#getImagePropertyValue
-         * @methodOf umbraco.services.mediaHelper
-         * @function
-         *
-         * @description
-         * Returns the file path associated with the media property if there is one
-         *
-         * @param {object} options Options object
-         * @param {object} options.mediaModel The media object to retrieve the image path from
-         * @param {object} options.imageOnly Optional, if true then will only return a path if the media item is an image
-         */
-        getMediaPropertyValue: function (options) {
-            if (!options || !options.mediaModel) {
-                throw "The options objet does not contain the required parameters: mediaModel";
-            }
-
-            //combine all props, TODO: we really need a better way then this
-            var props = [];
-            if (options.mediaModel.properties) {
-                props = options.mediaModel.properties;
-            } else {
-                $(options.mediaModel.tabs).each(function (i, tab) {
-                    props = props.concat(tab.properties);
-                });
-            }
-
-            var mediaRoot = Umbraco.Sys.ServerVariables.umbracoSettings.mediaPath;
-            var imageProp = _.find(props, function (item) {
-                if (item.alias === "umbracoFile") {
-                    return true;
-                }
-
-                //this performs a simple check to see if we have a media file as value
-                //it doesnt catch everything, but better then nothing
-                if (Utilities.isString(item.value) && item.value.indexOf(mediaRoot) === 0) {
-                    return true;
-                }
-
-                return false;
-            });
-
-            if (!imageProp) {
-                return "";
-            }
-
-            var mediaVal;
-
-            //our default images might store one or many images (as csv)
-            var split = imageProp.value.split(',');
-            var self = this;
-            mediaVal = _.map(split, function (item) {
-                return { file: item, isImage: self.detectIfImageByExtension(item) };
-            });
-
-            //for now we'll just return the first image in the collection.
-            // TODO: we should enable returning many to be displayed in the picker if the uploader supports many.
-            if (mediaVal.length && mediaVal.length > 0) {
-                if (!options.imageOnly || (options.imageOnly === true && mediaVal[0].isImage)) {
-                    return mediaVal[0].file;
-                }
-            }
-
-            return "";
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#getImagePropertyValue
-         * @methodOf umbraco.services.mediaHelper
-         * @function
-         *
-         * @description
-         * Returns the actual image path associated with the image property if there is one
-         *
-         * @param {object} options Options object
-         * @param {object} options.imageModel The media object to retrieve the image path from
-         */
-        getImagePropertyValue: function (options) {
-            if (!options || (!options.imageModel && !options.mediaModel)) {
-                throw "The options objet does not contain the required parameters: imageModel";
-            }
-
-            //required to support backwards compatibility.
-            options.mediaModel = options.imageModel ? options.imageModel : options.mediaModel;
-
-            options.imageOnly = true;
-
-            return this.getMediaPropertyValue(options);
-        },
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#getThumbnail
-         * @methodOf umbraco.services.mediaHelper
-         * @function
-         *
-         * @description
-         * formats the display model used to display the content to the model used to save the content
-         *
-         * @param {object} options Options object
-         * @param {object} options.imageModel The media object to retrieve the image path from
-         */
-        getThumbnail: function (options) {
-
-            if (!options || !options.imageModel) {
-                throw "The options objet does not contain the required parameters: imageModel";
-            }
-
-            var imagePropVal = this.getImagePropertyValue(options);
-            if (imagePropVal !== "") {
-                return this.getThumbnailFromPath(imagePropVal);
-            }
-            return "";
-        },
-
-        registerFileResolver: function (propertyEditorAlias, func) {
-            _mediaFileResolvers[propertyEditorAlias] = func;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#resolveFileFromEntity
-         * @methodOf umbraco.services.mediaHelper
-         * @function
-         *
-         * @description
-         * Gets the media file url for a media entity returned with the entityResource
-         *
-         * @param {object} mediaEntity A media Entity returned from the entityResource
-         * @param {boolean} thumbnail Whether to return the thumbnail url or normal url
-         */
-        resolveFileFromEntity: function (mediaEntity, thumbnail) {
-
-            var mediaPath = Utilities.isObject(mediaEntity.metaData) ? mediaEntity.metaData.MediaPath : null;
-
-            if (!mediaPath) {
-                //don't throw since this image legitimately might not contain a media path, but output a warning
-                $log.warn("Cannot resolve the file url from the mediaEntity, it does not contain the required metaData");
-                return null;
-            }
-
-            if (thumbnail) {
-                if (this.detectIfImageByExtension(mediaPath)) {
-                    return this.getThumbnailFromPath(mediaPath);
-                }
-                else if (this.getFileExtension(mediaPath) === "svg") {
-                    return this.getThumbnailFromPath(mediaPath);
-                }
-                else {
-                    return null;
-                }
-            }
-            else {
-                return mediaPath;
-            }
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#resolveFile
-         * @methodOf umbraco.services.mediaHelper
-         * @function
-         *
-         * @description
-         * Gets the media file url for a media object returned with the mediaResource
-         *
-         * @param {object} mediaEntity A media Entity returned from the entityResource
-         * @param {boolean} thumbnail Whether to return the thumbnail url or normal url
-         */
-        /*jshint loopfunc: true */
-        resolveFile: function (mediaItem, thumbnail) {
-
-            function iterateProps(props) {
-                var res = null;
-                for (var resolver in _mediaFileResolvers) {
-                    var property = _.find(props, function (prop) { return prop.editor === resolver; });
-                    if (property) {
-                        res = _mediaFileResolvers[resolver](property, mediaItem, thumbnail);
-                        break;
-                    }
-                }
-
-                return res;
-            }
-
-            //we either have properties raw on the object, or spread out on tabs
-            var result = "";
-            if (mediaItem.properties) {
-                result = iterateProps(mediaItem.properties);
-            } else if (mediaItem.tabs) {
-                for (var tab in mediaItem.tabs) {
-                    if (mediaItem.tabs[tab].properties) {
-                        result = iterateProps(mediaItem.tabs[tab].properties);
-                        if (result) {
-                            break;
-                        }
-                    }
-                }
-            }
-            return result;
-        },
-
-        /*jshint loopfunc: true */
-        hasFilePropertyType: function (mediaItem) {
-            function iterateProps(props) {
-                var res = false;
-                for (var resolver in _mediaFileResolvers) {
-                    var property = _.find(props, function (prop) { return prop.editor === resolver; });
-                    if (property) {
-                        res = true;
-                        break;
-                    }
-                }
-                return res;
-            }
-
-            //we either have properties raw on the object, or spread out on tabs
-            var result = false;
-            if (mediaItem.properties) {
-                result = iterateProps(mediaItem.properties);
-            } else if (mediaItem.tabs) {
-                for (var tab in mediaItem.tabs) {
-                    if (mediaItem.tabs[tab].properties) {
-                        result = iterateProps(mediaItem.tabs[tab].properties);
-                        if (result) {
-                            break;
-                        }
-                    }
-                }
-            }
-            return result;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#scaleToMaxSize
-         * @methodOf umbraco.services.mediaHelper
-         * @function
-         *
-         * @description
-         * Finds the corrct max width and max height, given maximum dimensions and keeping aspect ratios
-         *
-         * @param {number} maxSize Maximum width & height
-         * @param {number} width Current width
-         * @param {number} height Current height
-         */
-        scaleToMaxSize: function (maxSize, width, height) {
-            var retval = { width: width, height: height };
-
-            var maxWidth = maxSize; // Max width for the image
-            var maxHeight = maxSize;    // Max height for the image
-            var ratio = 0;  // Used for aspect ratio
-
-            // Check if the current width is larger than the max
-            if (width > maxWidth) {
-                ratio = maxWidth / width;   // get ratio for scaling image
-
-                retval.width = maxWidth;
-                retval.height = height * ratio;
-
-                height = height * ratio;    // Reset height to match scaled image
-                width = width * ratio;    // Reset width to match scaled image
-            }
-
-            // Check if current height is larger than max
-            if (height > maxHeight) {
-                ratio = maxHeight / height; // get ratio for scaling image
-
-                retval.height = maxHeight;
-                retval.width = width * ratio;
-                width = width * ratio;    // Reset width to match scaled image
-            }
-
-            return retval;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#getThumbnailFromPath
-         * @methodOf umbraco.services.mediaHelper
-         * @function
-         *
-         * @description
-         * Returns the path to the thumbnail version of a given media library image path
-         *
-         * @param {string} imagePath Image path, ex: /media/1234/my-image.jpg
-         */
-        getThumbnailFromPath: function (imagePath) {
-
-            // Check if file is a svg
-            if (this.getFileExtension(imagePath) === "svg") {
-                return imagePath;
-            }
-
-            // If the path is not an image we cannot get a thumb
-            if (!this.detectIfImageByExtension(imagePath)) {
-                return null;
-            }
-
-            //get the proxy url for big thumbnails (this ensures one is always generated)
-            var thumbnailUrl = umbRequestHelper.getApiUrl(
-                "imagesApiBaseUrl",
-                "GetBigThumbnail",
-                [{ originalImagePath: imagePath }]);
-
-            return thumbnailUrl;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#detectIfImageByExtension
-         * @methodOf umbraco.services.mediaHelper
-         * @function
-         *
-         * @description
-         * Returns true/false, indicating if the given path has an allowed image extension
-         *
-         * @param {string} imagePath Image path, ex: /media/1234/my-image.jpg
-         */
-        detectIfImageByExtension: function (imagePath) {
-
-            if (!imagePath) {
-                return false;
-            }
-
-            var lowered = imagePath.toLowerCase();
-            var ext = lowered.substr(lowered.lastIndexOf(".") + 1);
-            return ("," + Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes + ",").indexOf("," + ext + ",") !== -1;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#formatFileTypes
-         * @methodOf umbraco.services.mediaHelper
-         * @function
-         *
-         * @description
-         * Returns a string with correctly formated file types for ng-file-upload
-         *
-         * @param {string} file types, ex: jpg,png,tiff
-         */
-        formatFileTypes: function (fileTypes) {
-
-            var fileTypesArray = fileTypes.split(',');
-            var newFileTypesArray = [];
-
-            for (var i = 0; i < fileTypesArray.length; i++) {
-                var fileType = fileTypesArray[i].trim();
-
-                if (!fileType) {
-                    continue;
-                }
-
-                if (fileType.indexOf(".") !== 0) {
-                    fileType = ".".concat(fileType);
-                }
-
-                newFileTypesArray.push(fileType);
-            }
-
-            return newFileTypesArray.join(",");
-
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#getFileExtension
-         * @methodOf umbraco.services.mediaHelper
-         * @function
-         *
-         * @description
-         * Returns file extension
-         *
-         * @param {string} filePath File path, ex /media/1234/my-image.jpg
-         */
-        getFileExtension: function (filePath) {
-
-            if (!filePath) {
-                return null;
-            }
-
-            var lowered = filePath.toLowerCase();
-            var ext = lowered.substr(lowered.lastIndexOf(".") + 1);
-            return ext;
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.mediaHelper#getProcessedImageUrl
-         * @methodOf umbraco.services.mediaHelper
-         * @function
-         *
-         * @description
-         * Returns image URL with configured crop and other processing parameters.
-         *
-         * @param {string} imagePath Raw image path
-         * @param {object} options Object describing image generation parameters:
-         *  {
-         *      width: <int>
-         *      height: <int>
-         *      focalPoint: {
-         *          left: <int>
-         *          top: <int>
-         *      },
-         *      mode: <string>
-         *      cacheBusterValue: <string>
-         *      crop: {
-         *          x1: <int>
-         *          x2: <int>
-         *          y1: <int>
-         *          y2: <int>
-         *      },
-         *  }
-         */
-        getProcessedImageUrl: function (imagePath, options) {
-
-            if (!options) {
-                return imagePath;
-            }
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "imagesApiBaseUrl",
-                        "GetProcessedImageUrl",
-                        {
-                            imagePath,
-                            width: options.width,
-                            height: options.height,
-                            focalPointLeft: options.focalPoint ? options.focalPoint.left : null,
-                            focalPointTop:  options.focalPoint ? options.focalPoint.top : null,
-                            mode: options.mode,
-                            cacheBusterValue: options.cacheBusterValue,
-                            cropX1: options.crop ? options.crop.x1 : null,
-                            cropX2: options.crop ? options.crop.x2 : null,
-                            cropY1: options.crop ? options.crop.y1 : null,
-                            cropY2: options.crop ? options.crop.y2 : null
-                        })),
-                "Failed to retrieve processed image URL for image: " + imagePath);
-        }
-
-    };
-} angular.module('umbraco.services').factory('mediaHelper', mediaHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediapreview.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediapreview.service.js
deleted file mode 100644
index 5e5aeed872..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediapreview.service.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
-* @ngdoc service
-* @name umbraco.services.mediaPreview
-* @description A service providing views used for dealing with previewing files.
-*
-* ##usage
-* The service allows for registering and retrieving the view for one or more file extensions.
-*
-* You can register your own custom view in this way:
-*
-* <pre>
-*    angular.module('umbraco').run(['mediaPreview', function (mediaPreview) {
-*        mediaPreview.registerPreview(['docx'], "app_plugins/My_PACKAGE/preview.html");
-*    }]);
-* </pre>
-*
-* Here is a example of a preview template. (base on the audio-preview).
-*
-* <pre>
-*   <audio ng-if="vm.clientSide" name="{{vm.name}}" controls>
-*     <source ng-init="previewUrl = URL.createObjectURL(vm.clientSideData)" ng-src="{{previewUrl}}"/>
-*    </audio>
-*    <audio ng-if="!vm.clientSide" name="{{vm.name}}" controls>
-*      <source ng-src="{{vm.source}}" />
-*    </audio>
-* </pre>
-*
-* Notice that there often is a need to differentiate based on the file-data origin. In the state of the file still begin located locally its often needed to create an Object-URL for the data to be useable in HTML. As well you might want to provide links for the uploaded file when it is uploaded to the server. See 'vm.clientSide' and 'vm.clientSideData'.
-*
-**/
-function mediaPreview() {
-
-    const DEFAULT_FILE_PREVIEW = "views/components/media/umbfilepreview/umb-file-preview.html";
-
-    var _mediaPreviews = [];
-
-    function init(service) {
-        service.registerPreview(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes.split(","), "views/components/media/umbimagepreview/umb-image-preview.html");
-        service.registerPreview(["svg"], "views/components/media/umbimagepreview/umb-image-preview.html");
-        service.registerPreview(["mp4", "mov", "webm", "ogv"], "views/components/media/umbvideopreview/umb-video-preview.html");
-        service.registerPreview(["mp3", "weba", "oga", "opus"], "views/components/media/umbaudiopreview/umb-audio-preview.html");
-    }
-
-    var service = {
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.mediaPreview#getMediaPreview
-        * @methodOf umbraco.services.mediaPreview
-        *
-        * @param {string} fileExtension A string with the file extension, example: "pdf"
-        *
-        * @description
-        * The registered view matching this file extensions will be returned.
-        *
-        */
-        getMediaPreview: function (fileExtension) {
-
-            if (fileExtension)
-            {
-              fileExtension = fileExtension.toLowerCase();
-
-              var previewObject = _mediaPreviews.find(preview => preview.fileExtensions.indexOf(fileExtension) !== -1);
-
-              if (previewObject !== undefined) {
-                return previewObject.view;
-              }
-            }
-
-            return DEFAULT_FILE_PREVIEW;
-        },
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.mediaPreview#registerPreview
-        * @methodOf umbraco.services.mediaPreview
-        *
-        * @param {array} fileExtensions An array of file extensions, example: ["pdf", "jpg"]
-        * @param {array} view A URL to the view to be used for these file extensions.
-        *
-        * @description
-        * The registered view will be used when file extensions match the given file.
-        *
-        */
-        registerPreview: function (fileExtensions, view) {
-            _mediaPreviews.push({
-                fileExtensions: fileExtensions.map(e => e.toLowerCase()),
-                view: view
-            })
-        }
-
-    };
-
-    init(service);
-
-    return service;
-} angular.module('umbraco.services').factory('mediaPreview', mediaPreview);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediatypehelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediatypehelper.service.js
deleted file mode 100644
index f6ac16a9bc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediatypehelper.service.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.mediaTypeHelper
- * @description A helper service for the media types
- **/
-function mediaTypeHelper(mediaTypeResource, $q) {
-
-    var mediaTypeHelperService = {
-
-        isFolderType: function(mediaEntity) {
-            if (!mediaEntity) {
-                throw "mediaEntity is null";
-            }
-            if (!mediaEntity.contentTypeAlias) {
-                throw "mediaEntity.contentTypeAlias is null";
-            }
-
-            //if you create a media type, which has an alias that ends with ...Folder then its a folder: ex: "secureFolder", "bannerFolder", "Folder"
-            //this is the exact same logic that is performed in MediaController.GetChildFolders
-            return mediaEntity.contentTypeAlias.endsWith("Folder");
-        },
-
-        getAllowedImagetypes: function (mediaId){
-
-            // TODO: This is horribly inneficient - why make one request per type!?
-            //This should make a call to c# to get exactly what it's looking for instead of returning every single media type and doing
-            //some filtering on the client side.
-            //This is also called multiple times when it's not needed! Example, when launching the media picker, this will be called twice
-            //which means we'll be making at least 6 REST calls to fetch each media type
-
-            // Get All allowedTypes
-            return mediaTypeResource.getAllowedTypes(mediaId)
-                .then(function(types){
-
-                    var allowedQ = types.map(function(type){
-                        return mediaTypeResource.getById(type.id);
-                    });
-
-                    // Get full list
-                    return $q.all(allowedQ).then(function(fullTypes){
-
-                        // Find all the media types with an Image Cropper or Upload Field property editor
-                        return mediaTypeHelperService.getTypeWithEditor(fullTypes, ['Umbraco.ImageCropper', 'Umbraco.UploadField']);
-
-                    });
-            });
-		},
-
-        getTypeWithEditor: function (types, editors) {
-
-            return types.filter(function (mediatype) {
-                for (var i = 0; i < mediatype.groups.length; i++) {
-                    var group = mediatype.groups[i];
-                    for (var j = 0; j < group.properties.length; j++) {
-                        var property = group.properties[j];
-                        if( editors.indexOf(property.editor) !== -1 ) {
-                            return mediatype;
-                        }
-                    }
-                }
-            });
-
-        },
-
-        getTypeAcceptingFileExtensions: function (mediaTypes, fileExtensions) {
-            return mediaTypes.filter(mediaType => {
-                var uploadProperty;
-                mediaType.groups.forEach(group => {
-                    var foundProperty = group.properties.find(property => property.alias === "umbracoFile");
-                    if(foundProperty) {
-                        uploadProperty = foundProperty;
-                    }
-                });
-                if(uploadProperty) {
-                    var acceptedFileExtensions;
-                    if(uploadProperty.editor === "Umbraco.ImageCropper") {
-                        acceptedFileExtensions = Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes;
-                    } else if(uploadProperty.editor === "Umbraco.UploadField") {
-                        acceptedFileExtensions = (uploadProperty.config.fileExtensions && uploadProperty.config.fileExtensions.length > 0) ? uploadProperty.config.fileExtensions.map(x => x.value) : null;
-                    }
-                    if(acceptedFileExtensions && acceptedFileExtensions.length > 0) {
-                        return fileExtensions.length === fileExtensions.filter(fileExt => acceptedFileExtensions.includes(fileExt)).length;
-                    }
-                    return true;
-                }
-                return false;
-            });
-        }
-
-    };
-
-    return mediaTypeHelperService;
-}
-angular.module('umbraco.services').factory('mediaTypeHelper', mediaTypeHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/menuactions.service.js b/src/Umbraco.Web.UI.Client/src/common/services/menuactions.service.js
deleted file mode 100644
index 86956da6da..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/menuactions.service.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.umbracoMenuActions
- *
- * @requires q
- * @requires treeService
- *	
- * @description
- * Defines the methods that are called when menu items declare only an action to execute
- */
-function umbracoMenuActions(treeService, $location, navigationService, appState, localizationService, usersResource, umbRequestHelper, notificationsService) {
-    
-    return {
-
-        "ExportMember": function(args) {
-            var url = umbRequestHelper.getApiUrl(
-                "memberApiBaseUrl",
-                "ExportMemberData",
-                [{ key: args.entity.id }]);
-
-            umbRequestHelper.downloadFile(url).then(function() {
-                localizationService.localize("speechBubbles_memberExportedSuccess").then(function (value) {
-                    notificationsService.success(value);
-                })    
-            }, function(data) {
-                localizationService.localize("speechBubbles_memberExportedError").then(function (value) {
-                    notificationsService.error(value);
-                })    
-            });
-            
-        },
-        
-        "DisableUser": function(args) {
-            localizationService.localize("defaultdialogs_confirmdisable").then(function (txtConfirmDisable) {
-                if (confirm(txtConfirmDisable + ' "' + args.entity.name + '"?\n\n')) {
-                    usersResource.disableUser(args.entity.id).then(function () {
-                        navigationService.syncTree({ tree: args.treeAlias, path: [args.entity.parentId, args.entity.id], forceReload: true });
-                    });
-                }
-            });
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.umbracoMenuActions#RefreshNode
-         * @methodOf umbraco.services.umbracoMenuActions
-         * @function
-         *
-         * @description
-         * Clears all node children and then gets it's up-to-date children from the server and re-assigns them
-         * @param {object} args An arguments object
-         * @param {object} args.entity The basic entity being acted upon
-         * @param {object} args.treeAlias The tree alias associated with this entity
-         * @param {object} args.section The current section
-         */
-        "RefreshNode": function (args) {
-            
-            ////just in case clear any tree cache for this node/section
-            //treeService.clearCache({
-            //    cacheKey: "__" + args.section, //each item in the tree cache is cached by the section name
-            //    childrenOf: args.entity.parentId //clear the children of the parent
-            //});
-
-            //since we're dealing with an entity, we need to attempt to find it's tree node, in the main tree
-            // this action is purely a UI thing so if for whatever reason there is no loaded tree node in the UI
-            // we can safely ignore this process.
-            
-            //to find a visible tree node, we'll go get the currently loaded root node from appState
-            var treeRoot = appState.getTreeState("currentRootNode");
-            if (treeRoot && treeRoot.root) {
-                var treeNode = treeService.getDescendantNode(treeRoot.root, args.entity.id, args.treeAlias);
-                if (treeNode) {
-                    treeService.loadNodeChildren({ node: treeNode, section: args.section }).then(function () {
-                        navigationService.hideMenu();
-                    });
-                }                
-            }
-
-            
-        },
-        
-        /**
-         * @ngdoc method
-         * @name umbraco.services.umbracoMenuActions#CreateChildEntity
-         * @methodOf umbraco.services.umbracoMenuActions
-         * @function
-         *
-         * @description
-         * This will re-route to a route for creating a new entity as a child of the current node
-         * @param {object} args An arguments object
-         * @param {object} args.entity The basic entity being acted upon
-         * @param {object} args.treeAlias The tree alias associated with this entity
-         * @param {object} args.section The current section
-         */
-        "CreateChildEntity": function (args) {
-
-            navigationService.hideNavigation();
-
-            var route = "/" + args.section + "/" + args.treeAlias + "/edit/" + args.entity.id;
-            //change to new path
-            $location.path(route).search({ create: true });
-            
-        }
-    };
-} 
-
-angular.module('umbraco.services').factory('umbracoMenuActions', umbracoMenuActions);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
deleted file mode 100644
index 2354b76c92..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ /dev/null
@@ -1,743 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.navigationService
- *
- * @requires $rootScope
- * @requires $routeParams
- * @requires $location
- * @requires treeService
- * @requires sectionResource
- *
- * @description
- * Service to handle the main application navigation. Responsible for invoking the tree
- * Section navigation and search, and maintain their state for the entire application lifetime
- *
- */
-function navigationService($routeParams, $location, $q, $injector, eventsService, umbModelMapper, treeService, appState, backdropService) {
-    //the promise that will be resolved when the navigation is ready
-    var activeElement = undefined;
-    var navReadyPromise = $q.defer();
-
-    //the main tree's API reference, this is acquired when the tree has initialized
-    var mainTreeApi = null;
-
-    eventsService.on("app.navigationReady", function (e, args) {
-        mainTreeApi = args.treeApi;
-        navReadyPromise.resolve(mainTreeApi);
-    });
-
-    eventsService.on('appState.backdrop', function(e, args){
-        var element = $(args.element);
-        element.addClass('above-backdrop');
-    });
-
-
-    //A list of query strings defined that when changed will not cause a reload of the route
-    var nonRoutingQueryStrings = ["mculture", "cculture", "csegment", "lq", "sr"];
-    var retainedQueryStrings = ["mculture"];
-
-    function setMode(mode) {
-        switch (mode) {
-            case 'tree':
-                appState.setGlobalState("navMode", "tree");
-                appState.setGlobalState("showNavigation", true);
-                appState.setMenuState("showMenu", false);
-                appState.setMenuState("showMenuDialog", false);
-                appState.setGlobalState("stickyNavigation", false);
-                appState.setGlobalState("showTray", false);
-                break;
-            case 'menu':
-                appState.setGlobalState("navMode", "menu");
-                appState.setGlobalState("showNavigation", true);
-                appState.setMenuState("showMenu", true);
-                appState.setMenuState("showMenuDialog", false);
-                appState.setGlobalState("stickyNavigation", true);
-                break;
-            case 'dialog':
-                appState.setGlobalState("navMode", "dialog");
-                appState.setGlobalState("stickyNavigation", true);
-                appState.setGlobalState("showNavigation", true);
-                appState.setMenuState("showMenu", false);
-                appState.setMenuState("showMenuDialog", true);
-                appState.setMenuState("allowHideMenuDialog", true);
-                break;
-            case 'search':
-                appState.setGlobalState("navMode", "search");
-                appState.setGlobalState("stickyNavigation", false);
-                appState.setGlobalState("showNavigation", true);
-                appState.setMenuState("showMenu", false);
-                appState.setSectionState("showSearchResults", true);
-                appState.setMenuState("showMenuDialog", false);
-                break;
-            default:
-                appState.setGlobalState("navMode", "default");
-                appState.setMenuState("showMenu", false);
-                appState.setMenuState("showMenuDialog", false);
-                appState.setMenuState("allowHideMenuDialog", true);
-                appState.setSectionState("showSearchResults", false);
-                appState.setGlobalState("stickyNavigation", false);
-                appState.setGlobalState("showTray", false);
-                appState.setMenuState("currentNode", null);
-
-                if (appState.getGlobalState("isTablet") === true) {
-                    appState.setGlobalState("showNavigation", false);
-                }
-                break;
-        }
-    }
-
-    /**
-     * Converts a string request path to a dictionary of route params
-     * @param {any} requestPath
-     */
-    function pathToRouteParts(requestPath) {
-        if (!Utilities.isString(requestPath)) {
-            throw "The value for requestPath is not a string";
-        }
-        var pathAndQuery = requestPath.split("#")[1];
-        if (pathAndQuery) {
-            if (pathAndQuery.indexOf("%253") || pathAndQuery.indexOf("%252")) {
-                pathAndQuery = decodeURIComponent(pathAndQuery);
-            }
-            var pathParts = pathAndQuery.split("?");
-            var path = pathParts[0];
-            var qry = pathParts.length === 1 ? "" : pathParts[1];
-            var qryParts = qry.split("&");
-            var result = {
-                path: path
-            };
-            for (var i = 0; i < qryParts.length; i++) {
-                var keyVal = qryParts[i].split("=");
-                if (keyVal.length == 2) {
-                    result[keyVal[0]] = keyVal[1];
-                }
-            }
-            return result;
-        }
-    }
-
-    function closeBackdrop() {
-
-        var tourIsOpen = document.body.classList.contains("umb-tour-is-visible");
-        if (tourIsOpen) {
-            return;
-        }
-
-        var aboveClass = "above-backdrop";
-        var leftColumn = document.getElementById("leftcolumn");
-
-        if (leftColumn) {
-            var isLeftColumnOnTop = leftColumn.classList.contains(aboveClass);
-
-            if (isLeftColumnOnTop) {
-                backdropService.close();
-                leftColumn.classList.remove(aboveClass);
-            }
-
-            returnFocusToTriggerElement();
-        }
-    }
-
-    function returnFocusToTriggerElement() {
-        if(!activeElement) return;
-
-        const elementToFocus = activeElement.querySelector(".umb-tree-item__inner .umb-button-ellipsis");
-        document.body.classList.add("tabbing-active");
-        elementToFocus.style.backgroundColor = "hsla(0,0%,100%,.8)";
-        elementToFocus.focus();
-    }
-
-    function showBackdrop() {
-        var backDropOptions = {
-            'element': document.getElementById('leftcolumn')
-        };
-        backdropService.open(backDropOptions);
-    }
-
-    var service = {
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#isRouteChangingNavigation
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * Detects if the route param differences will cause a navigation/route change or if the route param differences are
-         * only tracking state changes.
-         * This is used for routing operations where "reloadOnSearch: false" or "reloadOnUrl: false", when detecting form dirty changes when navigating to a different page,
-         * and when we are creating new entities and moving from a route with the ?create=true parameter to an ID based parameter once it's created.
-         * @param {object} currUrlParams Either a string path or a dictionary of route parameters
-         * @param {object} nextUrlParams Either a string path or a dictionary of route parameters
-         */
-        isRouteChangingNavigation: function (currUrlParams, nextUrlParams) {
-
-            if (Utilities.isString(currUrlParams)) {
-                currUrlParams = pathToRouteParts(currUrlParams);
-            }
-
-            if (Utilities.isString(nextUrlParams)) {
-                nextUrlParams = pathToRouteParts(nextUrlParams);
-            }
-
-            //check if there is a query string to indicate that a "soft redirect" is taking place, if so we are not changing navigation
-            if (nextUrlParams.sr === true) {
-                return false;
-            }
-
-            var allowRoute = true;
-
-            //The only time that we want to not route is if only any of the nonRoutingQueryStrings have changed/added.
-            //If any of the other parts have changed we do not cancel
-            var currRoutingKeys = _.difference(_.keys(currUrlParams), nonRoutingQueryStrings);
-            var nextRoutingKeys = _.difference(_.keys(nextUrlParams), nonRoutingQueryStrings);
-            var diff1 = _.difference(currRoutingKeys, nextRoutingKeys);
-            var diff2 = _.difference(nextRoutingKeys, currRoutingKeys);
-
-            //if the routing parameter keys are the same, we'll compare their values to see if any have changed and if so then the routing will be allowed.
-            if (diff1.length === 0 && diff2.length === 0) {
-                var partsChanged = 0;
-                currRoutingKeys.forEach(k => {
-                    if (currUrlParams[k] != nextUrlParams[k]) {
-                        partsChanged++;
-                    }
-                });
-                if (partsChanged === 0) {
-                    allowRoute = false; //nothing except our query strings changed, so don't continue routing
-                }
-            }
-
-            return allowRoute;
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#waitForNavReady
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * returns a promise that will resolve when the navigation is ready
-         */
-        waitForNavReady: function () {
-            return navReadyPromise.promise;
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#clearSearch
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * utility to clear the querystring/search params while maintaining a known list of parameters that should be maintained throughout the app
-         */
-        clearSearch: function (toRetain) {
-            toRetain = _.union(retainedQueryStrings, toRetain);
-            var currentSearch = $location.search();
-            $location.search('');
-
-            toRetain.forEach(k => {
-                if (currentSearch[k]) {
-                    $location.search(k, currentSearch[k]);
-                }
-            });
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#setSoftRedirect
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * utility to set a special query string to indicate that the pending navigation change is a soft redirect
-         */
-        setSoftRedirect: function () {
-            $location.search("sr", true);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#retainQueryStrings
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * Will check the next route parameters to see if any of the query strings that should be retained from the previous route are missing,
-         * if they are they will be merged and an object containing all route parameters is returned. If nothing should be changed, then null is returned.
-         * @param {Object} currRouteParams The current route parameters
-         * @param {Object} nextRouteParams The next route parameters
-         */
-        retainQueryStrings: function (currRouteParams, nextRouteParams) {
-            var toRetain = Utilities.copy(nextRouteParams);
-            var updated = false;
-
-            retainedQueryStrings.forEach(r => {
-                // testing explicitly for undefined in nextRouteParams here, as it must be possible to "unset" e.g. mculture by specifying a null value
-                if (currRouteParams[r] && nextRouteParams[r] === undefined) {
-                    toRetain[r] = currRouteParams[r];
-                    updated = true;
-                }
-            });
-            return updated ? toRetain : null;
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#load
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * Shows the legacy iframe and loads in the content based on the source url
-         * @param {String} source The URL to load into the iframe
-         */
-        loadLegacyIFrame: function (source) {
-            $location.path("/" + appState.getSectionState("currentSection") + "/framed/" + encodeURIComponent(source));
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#changeSection
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * Changes the active section to a given section alias
-         * If the navigation is 'sticky' this will load the associated tree
-         * and load the dashboard related to the section
-         * @param {string} sectionAlias The alias of the section
-         */
-        changeSection: function (sectionAlias, force) {
-            setMode("default-opensection");
-
-            if (force && appState.getSectionState("currentSection") === sectionAlias) {
-                appState.setSectionState("currentSection", "");
-            }
-
-            appState.setSectionState("currentSection", sectionAlias);
-            this.showTree(sectionAlias);
-
-            $location.path(sectionAlias);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#showTree
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * Displays the tree for a given section alias but turning on the containing dom element
-         * only changes if the section is different from the current one
-		 * @param {string} sectionAlias The alias of the section to load
-         * @param {Object} syncArgs Optional object of arguments for syncing the tree for the section being shown
-		 */
-        showTree: function (sectionAlias, syncArgs) {
-            if (sectionAlias !== appState.getSectionState("currentSection")) {
-                appState.setSectionState("currentSection", sectionAlias);
-
-                if (syncArgs) {
-                    return this.syncTree(syncArgs);
-                }
-            }
-            setMode("tree");
-
-            return $q.when(true);
-        },
-
-        showTray: function () {
-            appState.setGlobalState("showTray", true);
-        },
-
-        hideTray: function () {
-            appState.setGlobalState("showTray", false);
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#syncTree
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * Syncs a tree with a given path, returns a promise
-         * The path format is: ["itemId","itemId"], and so on
-         * so to sync to a specific document type node do:
-         * <pre>
-         * navigationService.syncTree({tree: 'content', path: ["-1","123d"], forceReload: true});
-         * </pre>
-         * @param {Object} args arguments passed to the function
-         * @param {String} args.tree the tree alias to sync to
-         * @param {Array} args.path the path to sync the tree to
-         * @param {Boolean} args.forceReload optional, specifies whether to force reload the node data from the server even if it already exists in the tree currently
-         */
-        syncTree: function (args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.path) {
-                throw "args.path cannot be null";
-            }
-            if (!args.tree) {
-                throw "args.tree cannot be null";
-            }
-
-            return navReadyPromise.promise.then(function () {
-                return mainTreeApi.syncTree(args);
-            });
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#hasTree
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * Checks if a tree with the given alias exists.
-         *
-         * @param {String} treeAlias the tree alias to check
-         */
-        hasTree: function (treeAlias) {
-            return navReadyPromise.promise.then(function () {
-                return mainTreeApi.hasTree(treeAlias);
-            });
-        },
-
-        /**
-            Internal method that should ONLY be used by the legacy API wrapper, the legacy API used to
-            have to set an active tree and then sync, the new API does this in one method by using syncTree
-
-            TODO: Delete this if not required
-        */
-        _syncPath: function (path, forceReload) {
-            return navReadyPromise.promise.then(function () {
-                return mainTreeApi.syncTree({ path: path, forceReload: forceReload });
-            });
-        },
-
-        reloadNode: function (node) {
-            return navReadyPromise.promise.then(function () {
-                return mainTreeApi.reloadNode(node);
-            });
-        },
-
-        reloadSection: function (sectionAlias) {
-            return navReadyPromise.promise.then(function () {
-                treeService.clearCache({ section: sectionAlias });
-                return mainTreeApi.load(sectionAlias);
-            });
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#hideTree
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * Hides the tree by hiding the containing dom element
-         */
-        hideTree: function () {
-
-            if (appState.getGlobalState("isTablet") === true && !appState.getGlobalState("stickyNavigation")) {
-                //reset it to whatever is in the url
-                appState.setSectionState("currentSection", $routeParams.section);
-
-                setMode("default-hidesectiontree");
-            }
-
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#showMenu
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * Hides the tree by hiding the containing dom element.
-         * This always returns a promise!
-         *
-         * @param {Event} event the click event triggering the method, passed from the DOM element
-         */
-        showMenu: function (args) {
-            var self = this;
-
-            return treeService.getMenu({ treeNode: args.node })
-                .then(function (data) {
-                    showBackdrop();
-                    //check for a default
-                    //NOTE: event will be undefined when a call to hideDialog is made so it won't re-load the default again.
-                    // but perhaps there's a better way to deal with with an additional parameter in the args ? it works though.
-                    if (data.defaultAlias && !args.skipDefault) {
-
-                        var found = _.find(data.menuItems, function (item) {
-                            return item.alias = data.defaultAlias;
-                        });
-
-                        if (found) {
-
-                            //NOTE: This is assigning the current action node - this is not the same as the currently selected node!
-                            appState.setMenuState("currentNode", args.node);
-
-                            self.showDialog({
-                                node: args.node,
-                                action: found,
-                                section: appState.getSectionState("currentSection")
-                            });
-
-                            return $q.resolve();
-                        }
-                    }
-
-                    //there is no default or we couldn't find one so just continue showing the menu
-
-                    setMode("menu");
-
-                    appState.setMenuState("currentNode", args.node);
-                    appState.setMenuState("menuActions", data.menuItems);
-                    appState.setMenuState("dialogTitle", args.node.name);
-
-                    return $q.resolve();
-                });
-
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#hideMenu
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * Hides the menu by hiding the containing dom element
-         */
-        hideMenu: function () {
-            //SD: Would we ever want to access the last action'd node instead of clearing it here?
-            appState.setMenuState("currentNode", null);
-            appState.setMenuState("menuActions", []);
-            setMode("tree");
-            closeBackdrop();
-        },
-
-        /** Executes a given menu action */
-        executeMenuAction: function (action, node, section) {
-
-            if (!action) {
-                throw "action cannot be null";
-            }
-            if (!node) {
-                throw "node cannot be null";
-            }
-            if (!section) {
-                throw "section cannot be null";
-            }
-
-            appState.setMenuState("currentNode", node);
-
-            if (action.metaData && action.metaData["actionRoute"] && Utilities.isString(action.metaData["actionRoute"])) {
-                //first check if the menu item simply navigates to a route
-                var parts = action.metaData["actionRoute"].split("?");
-                $location.path(parts[0]).search(parts.length > 1 ? parts[1] : "");
-                this.hideNavigation();
-                return;
-            }
-            else if (action.metaData && action.metaData["jsAction"] && Utilities.isString(action.metaData["jsAction"])) {
-
-                //we'll try to get the jsAction from the injector
-                var menuAction = action.metaData["jsAction"].split('.');
-                if (menuAction.length !== 2) {
-
-                    //if it is not two parts long then this most likely means that it's a legacy action
-                    var js = action.metaData["jsAction"].replace("javascript:", "");
-                    //there's not really a different way to achieve this except for eval
-                    eval(js);
-                }
-                else {
-                    var menuActionService = $injector.get(menuAction[0]);
-                    if (!menuActionService) {
-                        throw "The angular service " + menuAction[0] + " could not be found";
-                    }
-
-                    var method = menuActionService[menuAction[1]];
-
-                    if (!method) {
-                        throw "The method " + menuAction[1] + " on the angular service " + menuAction[0] + " could not be found";
-                    }
-
-                    method.apply(this, [{
-                        //map our content object to a basic entity to pass in to the menu handlers,
-                        //this is required for consistency since a menu item needs to be decoupled from a tree node since the menu can
-                        //exist standalone in the editor for which it can only pass in an entity (not tree node).
-                        entity: umbModelMapper.convertToEntityBasic(node),
-                        action: action,
-                        section: section,
-                        treeAlias: treeService.getTreeAlias(node)
-                    }]);
-                }
-            }
-            else {
-                showBackdrop();
-                service.showDialog({
-                    node: node,
-                    action: action,
-                    section: section
-                });
-            }
-        },
-
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.navigationService#showDialog
-         * @methodOf umbraco.services.navigationService
-         *
-         * @description
-         * Opens a dialog, for a given action on a given tree node
-         * the path to the dialog view is determined by:
-         * "views/" + current tree + "/" + action alias + ".html"
-         * The dialog controller will get passed a scope object that is created here with the properties:
-         * scope.currentNode = the selected tree node
-         * scope.title = the title of the menu item
-         * scope.view = the path to the view html file
-         * so that the dialog controllers can use these properties
-         *
-         * @param {Object} args arguments passed to the function
-         * @param {Scope} args.scope current scope passed to the dialog
-         * @param {Object} args.action the clicked action containing `name` and `alias`
-         */
-        showDialog: function (args) {
-
-            if (!args) {
-                throw "showDialog is missing the args parameter";
-            }
-            if (!args.action) {
-                throw "The args parameter must have an 'action' property as the clicked menu action object";
-            }
-            if (!args.node) {
-                throw "The args parameter must have a 'node' as the active tree node";
-            }
-
-            //the title might be in the meta data, check there first
-            if (args.action.metaData["dialogTitle"]) {
-                appState.setMenuState("dialogTitle", args.action.metaData["dialogTitle"]);
-            }
-            else {
-                appState.setMenuState("dialogTitle", args.action.name);
-            }
-
-            var templateUrl;
-
-            if (args.action.metaData["actionView"]) {
-                templateUrl = args.action.metaData["actionView"];
-            }
-            else {
-                var treeAlias = treeService.getTreeAlias(args.node);
-                if (!treeAlias) {
-                    throw "Could not get tree alias for node " + args.node.id;
-                }
-                templateUrl = this.getTreeTemplateUrl(treeAlias, args.action.alias);
-            }
-
-            setMode("dialog");
-
-            if (templateUrl) {
-                appState.setMenuState("dialogTemplateUrl", templateUrl);
-            }
-
-        },
-        /**
-          * @ngdoc method
-          * @name umbraco.services.navigationService#getTreeTemplateUrl
-          * @methodOf umbraco.services.navigationService
-          *
-          * @param {string} treeAlias the alias of the tree to look up
-          * @param {string} action the view file name
-          * @description
-          * creates the templateUrl based on treeAlias and action
-          * by convention we will look into the /views/{treetype}/{action}.html
-          * for example: /views/content/create.html
-          * we will also check for a 'packageName' for the current tree, if it exists then the convention will be:
-          * for example: /App_Plugins/{mypackage}/backoffice/{treetype}/create.html
-          */
-        getTreeTemplateUrl: function (treeAlias, action) {
-            var packageTreeFolder = treeService.getTreePackageFolder(treeAlias);
-            if (packageTreeFolder) {
-                return (Umbraco.Sys.ServerVariables.umbracoSettings.appPluginsPath +
-                    "/" + packageTreeFolder +
-                    "/backoffice/" + treeAlias + "/" + action + ".html");
-            }
-            else {
-                return "views/" + treeAlias + "/" + action + ".html";
-            }
-        },
-
-        /**
-          * @ngdoc method
-          * @name umbraco.services.navigationService#allowHideDialog
-          * @methodOf umbraco.services.navigationService
-          *
-          * @param {boolean} allow false if the navigation service should disregard instructions to hide the current dialog, true otherwise
-          * @description
-          * instructs the navigation service whether it's allowed to hide the current dialog
-          */
-        allowHideDialog: function (allow) {
-            if (appState.getGlobalState("navMode") !== "dialog") {
-                return;
-            }
-            appState.setMenuState("allowHideMenuDialog", allow);
-        },
-
-        /**
-	     * @ngdoc method
-	     * @name umbraco.services.navigationService#hideDialog
-	     * @methodOf umbraco.services.navigationService
-	     *
-	     * @description
-	     * hides the currently open dialog
-	     */
-        hideDialog: function (showMenu) {
-            if (appState.getMenuState("allowHideMenuDialog") === false) {
-                return;
-            }
-
-            if (showMenu) {
-                this.showMenu({ skipDefault: true, node: appState.getMenuState("currentNode") });
-            } else {
-                activeElement = document.querySelector("#tree .active");
-
-                closeBackdrop();
-                setMode("default");
-            }
-        },
-        /**
-          * @ngdoc method
-          * @name umbraco.services.navigationService#showSearch
-          * @methodOf umbraco.services.navigationService
-          *
-          * @description
-          * shows the search pane
-          */
-        showSearch: function () {
-            setMode("search");
-        },
-        /**
-          * @ngdoc method
-          * @name umbraco.services.navigationService#hideSearch
-          * @methodOf umbraco.services.navigationService
-          *
-          * @description
-          * hides the search pane
-        */
-        hideSearch: function () {
-            setMode("default-hidesearch");
-        },
-        /**
-          * @ngdoc method
-          * @name umbraco.services.navigationService#hideNavigation
-          * @methodOf umbraco.services.navigationService
-          *
-          * @description
-          * hides any open navigation panes and resets the tree, actions and the currently selected node
-          */
-        hideNavigation: function () {
-            appState.setMenuState("menuActions", []);
-            closeBackdrop();
-            setMode("default");
-        }
-    };
-
-    return service;
-}
-
-angular.module('umbraco.services').factory('navigationService', navigationService);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js b/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js
deleted file mode 100644
index c9db8cf00e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js
+++ /dev/null
@@ -1,306 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.notificationsService
- *
- * @requires $rootScope
- * @requires $timeout
- * @requires angularHelper
- *
- * @description
- * Application-wide service for handling notifications, the umbraco application
- * maintains a single collection of notications, which the UI watches for changes.
- * By default when a notication is added, it is automaticly removed 7 seconds after
- * This can be changed on add()
- *
- * ##usage
- * To use, simply inject the notificationsService into any controller that needs it, and make
- * sure the umbraco.services module is accesible - which it should be by default.
- *
- * <pre>
- *		notificationsService.success("Document Published", "hooraaaay for you!");
- *      notificationsService.error("Document Failed", "booooh");
- * </pre>
- */
-angular.module('umbraco.services')
-.factory('notificationsService', function ($rootScope, $timeout, angularHelper) {
-
-	var nArray = [];
-	function setViewPath(view){
-		if(view.indexOf('/') < 0)
-		{
-			view = "views/common/notifications/" + view;
-		}
-
-		if(view.indexOf('.html') < 0)
-		{
-			view = view + ".html";
-		}
-		return view;
-	}
-
-	var service = {
-
-		/**
-		* @ngdoc method
-		* @name umbraco.services.notificationsService#add
-		* @methodOf umbraco.services.notificationsService
-		*
-		* @description
-		* Lower level api for adding notifcations, support more advanced options
-		* @param {Object} item The notification item
-		* @param {String} item.headline Short headline
-		* @param {String} item.message longer text for the notication, trimmed after 200 characters, which can then be exanded
-		* @param {String} item.type Notification type, can be: "success","warning","error" or "info"
-		* @param {String} item.url url to open when notification is clicked
-		* @param {String} item.target the target used together with `url`. Empty if not specified.
-		* @param {String} item.view path to custom view to load into the notification box
-		* @param {Array} item.actions Collection of button actions to append (label, func, cssClass)
-		* @param {Boolean} item.sticky if set to true, the notification will not auto-close
-		* @returns {Object} args notification object
-		*/
-
-		add: function(item) {
-			angularHelper.safeApply($rootScope, function () {
-
-				if(item.view){
-					item.view = setViewPath(item.view);
-					item.sticky = true;
-					item.type = "form";
-					item.headline = null;
-				}
-
-
-				//add a colon after the headline if there is a message as well
-				if (item.message) {
-					item.headline += ": ";
-					if(item.message.length > 200) {
-						item.sticky = true;
-					}
-				}
-
-				//we need to ID the item, going by index isn't good enough because people can remove at different indexes
-				// whenever they want. Plus once we remove one, then the next index will be different. The only way to
-				// effectively remove an item is by an Id.
-				item.id = String.CreateGuid();
-
-				nArray.push(item);
-
-				if(!item.sticky) {
-					$timeout(
-                        function() {
-    						var found = _.find(nArray, function(i) {
-        						return i.id === item.id;
-        					});
-        					if (found) {
-        						var index = nArray.indexOf(found);
-        						nArray.splice(index, 1);
-        					}
-    					}
-                    , 10000);
-				}
-
-				return item;
-			});
-
-		},
-
-		hasView : function(view){
-			if(!view){
-				return _.find(nArray, function(notification){ return notification.view;});
-			}else{
-				view = setViewPath(view).toLowerCase();
-				return _.find(nArray, function(notification){ return notification.view.toLowerCase() === view;});
-			}
-		},
-		addView: function(view, args){
-			var item = {
-				args: args,
-				view: view
-			};
-
-			service.add(item);
-		},
-
-	    /**
-		 * @ngdoc method
-		 * @name umbraco.services.notificationsService#showNotification
-		 * @methodOf umbraco.services.notificationsService
-		 *
-		 * @description
-		 * Shows a notification based on the object passed in, normally used to render notifications sent back from the server
-		 *
-		 * @returns {Object} args notification object
-		 */
-        showNotification: function(args) {
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (args.type === undefined || args.type === null) {
-                throw "args.type cannot be null";
-            }
-            if (!args.header) {
-                throw "args.header cannot be null";
-            }
-
-            switch(args.type) {
-                case 0:
-                case 'Save':
-                    //save
-                    this.success(args.header, args.message);
-                    break;
-                case 1:
-                case 'Info':
-                    //info
-                    this.info(args.header, args.message);
-                    break;
-                case 2:
-                case 'Error':
-                    //error
-                    this.error(args.header, args.message);
-                    break;
-                case 3:
-                case 'Success':
-                    //success
-                    this.success(args.header, args.message);
-                    break;
-                case 4:
-                case 'Warning':
-                    //warning
-                    this.warning(args.header, args.message);
-                    break;
-            }
-        },
-
-	    /**
-		 * @ngdoc method
-		 * @name umbraco.services.notificationsService#success
-		 * @methodOf umbraco.services.notificationsService
-		 *
-		 * @description
-		 * Adds a green success notication to the notications collection
-		 * This should be used when an operations *completes* without errors
-		 *
-		 * @param {String} headline Headline of the notification
-		 * @param {String} message longer text for the notication, trimmed after 200 characters, which can then be exanded
-		 * @returns {Object} notification object
-		 */
-	    success: function (headline, message) {
-	        return service.add({ headline: headline, message: message, type: 'success', time: new Date() });
-	    },
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.notificationsService#error
-		 * @methodOf umbraco.services.notificationsService
-		 *
-		 * @description
-		 * Adds a red error notication to the notications collection
-		 * This should be used when an operations *fails* and could not complete
-		 *
-		 * @param {String} headline Headline of the notification
-		 * @param {String} message longer text for the notication, trimmed after 200 characters, which can then be exanded
-		 * @returns {Object} notification object
-		 */
-	    error: function (headline, message) {
-	        return service.add({ headline: headline, message: message, type: 'error', time: new Date() });
-		},
-
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.notificationsService#warning
-		 * @methodOf umbraco.services.notificationsService
-		 *
-		 * @description
-		 * Adds a yellow warning notication to the notications collection
-		 * This should be used when an operations *completes* but something was not as expected
-		 *
-		 *
-		 * @param {String} headline Headline of the notification
-		 * @param {String} message longer text for the notication, trimmed after 200 characters, which can then be exanded
-		 * @returns {Object} notification object
-		 */
-	    warning: function (headline, message) {
-	        return service.add({ headline: headline, message: message, type: 'warning', time: new Date() });
-		},
-
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.notificationsService#warning
-		 * @methodOf umbraco.services.notificationsService
-		 *
-		 * @description
-		 * Adds a yellow warning notication to the notications collection
-		 * This should be used when an operations *completes* but something was not as expected
-		 *
-		 *
-		 * @param {String} headline Headline of the notification
-		 * @param {String} message longer text for the notication, trimmed after 200 characters, which can then be exanded
-		 * @returns {Object} notification object
-		 */
-	    info: function (headline, message) {
-	        return service.add({ headline: headline, message: message, type: 'info', time: new Date() });
-		},
-
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.notificationsService#remove
-		 * @methodOf umbraco.services.notificationsService
-		 *
-		 * @description
-		 * Removes a notification from the notifcations collection at a given index
-		 *
-		 * @param {Int} index index where the notication should be removed from
-		 */
-		remove: function (index) {
-            if (Utilities.isObject(index)){
-				var i = nArray.indexOf(index);
-				angularHelper.safeApply($rootScope, function() {
-				    nArray.splice(i, 1);
-				});
-			}else{
-				angularHelper.safeApply($rootScope, function() {
-				    nArray.splice(index, 1);
-				});
-			}
-		},
-
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.notificationsService#removeAll
-		 * @methodOf umbraco.services.notificationsService
-		 *
-		 * @description
-		 * Removes all notifications from the notifcations collection
-		 */
-	    removeAll: function () {
-	        angularHelper.safeApply($rootScope, function() {
-	            nArray.length = 0;
-	        });
-		},
-
-		/**
-		 * @ngdoc property
-		 * @name umbraco.services.notificationsService#current
-		 * @propertyOf umbraco.services.notificationsService
-		 *
-		 * @description
-		 * Returns an array of current notifications to display
-		 *
-		 * @returns {string} returns an array
-		 */
-		current: nArray,
-
-		/**
-		 * @ngdoc method
-		 * @name umbraco.services.notificationsService#getCurrent
-		 * @methodOf umbraco.services.notificationsService
-		 *
-		 * @description
-		 * Method to return all notifications from the notifcations collection
-		 */
-		getCurrent: function(){
-			return nArray;
-		}
-	};
-
-	return service;
-});
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js b/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js
deleted file mode 100644
index 6e05712ad2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- @ngdoc service
- * @name umbraco.services.overlayService
- *
- * @description
- * <b>Added in Umbraco 8.0</b>. Application-wide service for handling overlays.
- */
-(function () {
-    "use strict";
-
-    function overlayService(eventsService, backdropService, focusLockService) {
-
-        let currentOverlay = null;
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.overlayService#open
-         * @methodOf umbraco.services.overlayService
-         *
-         * @description
-         * Opens a new overlay.
-         *
-         * @param {object} overlay The rendering options for the overlay.
-         * @param {string=} overlay.view The URL to the view. Defaults to `views/common/overlays/default/default.html` if nothing is specified.
-         * @param {string=} overlay.position The alias of the position of the overlay. Defaults to `center`.
-         * 
-         * Custom positions can be added by adding a CSS rule for the the underlying CSS rule. Eg. for the position `center`, the corresponding `umb-overlay-center` CSS rule is defined as:
-         * 
-         * <pre>
-         * .umb-overlay.umb-overlay-center {
-         *     position: absolute;
-         *     width: 600px;
-         *     height: auto;
-         *     top: 50%;
-         *     left: 50%;
-         *     transform: translate(-50%,-50%);
-         *     border-radius: 3px;
-         * }
-         * </pre>
-         * @param {string=} overlay.size Sets an alias for the size of the overlay to be opened. If set to `small` (default), an `umb-overlay--small` class name will be appended the the class list of the main overlay element in the DOM.
-         * 
-         * Umbraco does not support any more sizes by default, but if you wish to introduce a `medium` size, you could do so by adding a CSS rule simlar to:
-         * 
-         * <pre>
-         * .umb-overlay-center.umb-overlay--medium {
-         *     width: 800px;
-         * }
-         * </pre>
-         * @param {booean=} overlay.disableBackdropClick A boolean value indicating whether the click event on the backdrop should be disabled.
-         * @param {string=} overlay.title The overall title of the overlay. The title will be omitted if not specified.
-         * @param {string=} overlay.subtitle The sub title of the overlay. The sub title will be omitted if not specified.
-         * @param {object=} overlay.itemDetails An item that will replace the header of the overlay.
-         * @param {string=} overlay.itemDetails.icon The icon of the item - eg. `icon-book`.
-         * @param {string=} overlay.itemDetails.title The title of the item.
-         * @param {string=} overlay.itemDetails.description Sets the description of the item.         * 
-         * @param {string=} overlay.submitButtonLabel The label of the submit button. To support localized values, it's recommended to use the `submitButtonLabelKey` instead.
-         * @param {string=} overlay.submitButtonLabelKey The key to be used for the submit button label. Defaults to `general_submit` if not specified.
-         * @param {string=} overlay.submitButtonState The state of the submit button. Possible values are inherited from the [umbButton directive](#/api/umbraco.directives.directive:umbButton) and are `init`, `busy", `success`, `error`.
-         * @param {string=} overlay.submitButtonStyle The styling of the submit button. Possible values are inherited from the [umbButton directive](#/api/umbraco.directives.directive:umbButton) and are `primary`, `info`, `success`, `warning`, `danger`, `inverse`, `link` and `block`. Defaults to `success` if not specified specified.
-         * @param {string=} overlay.hideSubmitButton A boolean value indicating whether the submit button should be hidden. Default is `false`.
-         * @param {string=} overlay.disableSubmitButton A boolean value indicating whether the submit button should be disabled, preventing the user from submitting the overlay. Default is `false`.
-         * @param {string=} overlay.closeButtonLabel The label of the close button. To support localized values, it's recommended to use the `closeButtonLabelKey` instead.
-         * @param {string=} overlay.closeButtonLabelKey The key to be used for the close button label. Defaults to `general_close` if not specified.
-         * @param {string=} overlay.submit A callback function that is invoked when the user submits the overlay.
-         * @param {string=} overlay.close A callback function that is invoked when the user closes the overlay.
-         */
-        function open(newOverlay) {
-
-            // prevent two open overlays at the same time
-            if (currentOverlay) {
-                close();
-            }
-
-            var backdropOptions = {};
-            var overlay = newOverlay;
-
-            // set the default overlay position to center
-            if (!overlay.position) {
-                overlay.position = "center";
-            }
-
-            // set the default overlay size to small
-            if (!overlay.size) {
-                overlay.size = "small";
-            }
-
-            // use a default empty view if nothing is set
-            if (!overlay.view) {
-                overlay.view = "views/common/overlays/default/default.html";
-            }
-
-            // option to disable backdrop clicks
-            if (overlay.disableBackdropClick) {
-                backdropOptions.disableEventsOnClick = true;
-            }
-
-            overlay.show = true;
-            focusLockService.addInertAttribute();
-            backdropService.open(backdropOptions);
-            currentOverlay = overlay;
-            eventsService.emit("appState.overlay", overlay);
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.overlayService#close
-         * @methodOf umbraco.services.overlayService
-         *
-         * @description
-         * Closes the current overlay.
-         */
-        function close() {
-            focusLockService.removeInertAttribute();
-
-            var tourIsOpen = document.body.classList.contains("umb-tour-is-visible");
-            if (!tourIsOpen) {
-                backdropService.close();
-            }
-            
-            currentOverlay = null;
-            eventsService.emit("appState.overlay", null);
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.overlayService#ysod
-         * @methodOf umbraco.services.overlayService
-         *
-         * @description
-         * Opens a new overlay with an error message.
-         *
-         * @param {object} error The error to be shown.
-         */
-        function ysod(error) {
-            const overlay = {
-                view: "views/common/overlays/ysod/ysod.html",
-                error: error,
-                close: function() {
-                    close();
-                }
-            };
-            open(overlay);
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.overlayService#confirm
-         * @methodOf umbraco.services.overlayService
-         *
-         * @description
-         * Opens a new overlay prompting the user to confirm the overlay.
-         *
-         * @param {object} overlay The options for the overlay.
-         * @param {string=} overlay.confirmType The type of the confirm dialog, which helps define standard styling and labels of the overlay. Supported values are `delete` and `remove`.
-         * @param {string=} overlay.closeButtonLabelKey The key to be used for the cancel button label. Defaults to `general_cancel` if not specified.
-         * @param {string=} overlay.view The URL to the view. Defaults to `views/common/overlays/confirm/confirm.html` if nothing is specified.
-         * @param {string=} overlay.confirmMessageStyle The styling of the confirm message. If `overlay.confirmType` is `delete`, the fallback value is `danger` - otherwise a message style isn't explicitly specified.
-         * @param {string=} overlay.submitButtonStyle The styling of the confirm button. Possible values are inherited from the [umbButton directive](#/api/umbraco.directives.directive:umbButton) and are `primary`, `info`, `success`, `warning`, `danger`, `inverse`, `link` and `block`.
-         * 
-         * If not specified, the fallback value depends on the value specified for the `overlay.confirmType` parameter:
-         * 
-         * - `delete`: fallback key is `danger`
-         * - `remove`: fallback key is `primary`
-         * - anything else: no fallback AKA default button style
-         * @param {string=} overlay.submitButtonLabelKey The key to be used for the confirm button label. 
-         * 
-         * If not specified, the fallback value depends on the value specified for the `overlay.confirmType` parameter:
-         * 
-         * - `delete`: fallback key is `actions_delete`
-         * - `remove`: fallback key is `actions_remove`
-         * - anything else: fallback is `general_confirm`
-         * @param {function=} overlay.close A callback function that is invoked when the user closes the overlay.
-         * @param {function=} overlay.submit A callback function that is invoked when the user confirms the overlay.
-         */
-        function confirm(overlay) {
-
-            if (!overlay.closeButtonLabelKey) overlay.closeButtonLabelKey = "general_cancel";
-            if (!overlay.view) overlay.view = "views/common/overlays/confirm/confirm.html";
-            if (!overlay.close) overlay.close = function () { close(); };
-
-            switch (overlay.confirmType) {
-
-                case "delete":
-                    if (!overlay.confirmMessageStyle) overlay.confirmMessageStyle = "danger";
-                    if (!overlay.submitButtonStyle) overlay.submitButtonStyle = "danger";
-                    if (!overlay.submitButtonLabelKey) overlay.submitButtonLabelKey = "actions_delete";
-                    break;
-
-                case "remove":
-                    if (!overlay.submitButtonStyle) overlay.submitButtonStyle = "primary";
-                    if (!overlay.submitButtonLabelKey) overlay.submitButtonLabelKey = "actions_remove";
-                    break;
-                
-                default:
-                    if (!overlay.submitButtonLabelKey) overlay.submitButtonLabelKey = "general_confirm";
-
-            }
-
-            open(overlay);
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.overlayService#confirmDelete
-         * @methodOf umbraco.services.overlayService
-         *
-         * @description
-         * Opens a new overlay prompting the user to confirm the overlay. The overlay will have styling and labels useful for when the user needs to confirm a delete action.
-         *
-         * @param {object} overlay The options for the overlay.
-         * @param {string=} overlay.closeButtonLabelKey The key to be used for the cancel button label. Defaults to `general_cancel` if not specified.
-         * @param {string=} overlay.view The URL to the view. Defaults to `views/common/overlays/confirm/confirm.html` if nothing is specified.
-         * @param {string=} overlay.confirmMessageStyle The styling of the confirm message. Defaults to `delete` if not specified specified.
-         * @param {string=} overlay.submitButtonStyle The styling of the confirm button. Possible values are inherited from the [umbButton directive](#/api/umbraco.directives.directive:umbButton) and are `primary`, `info`, `success`, `warning`, `danger`, `inverse`, `link` and `block`. Defaults to `danger` if not specified specified.
-         * @param {string=} overlay.submitButtonLabelKey The key to be used for the confirm button label. Defaults to `actions_delete` if not specified.
-         * @param {function=} overlay.close A callback function that is invoked when the user closes the overlay.
-         * @param {function=} overlay.submit A callback function that is invoked when the user confirms the overlay.
-         */
-        function confirmDelete(overlay) {
-            overlay.confirmType = "delete";
-            confirm(overlay);
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.overlayService#confirmRemove
-         * @methodOf umbraco.services.overlayService
-         *
-         * @description
-         * Opens a new overlay prompting the user to confirm the overlay. The overlay will have styling and labels useful for when the user needs to confirm a remove action.
-         *
-         * @param {object} overlay The options for the overlay.
-         * @param {string=} overlay.closeButtonLabelKey The key to be used for the cancel button label. Defaults to `general_cancel` if not specified.
-         * @param {string=} overlay.view The URL to the view. Defaults to `views/common/overlays/confirm/confirm.html` if nothing is specified.
-         * @param {string=} overlay.confirmMessageStyle The styling of the confirm message - eg. `danger`.
-         * @param {string=} overlay.submitButtonStyle The styling of the confirm button. Possible values are inherited from the [umbButton directive](#/api/umbraco.directives.directive:umbButton) and are `primary`, `info`, `success`, `warning`, `danger`, `inverse`, `link` and `block`. Defaults to `primary` if not specified specified.
-         * @param {string=} overlay.submitButtonLabelKey The key to be used for the confirm button label. Defaults to `actions_remove` if not specified.
-         * @param {function=} overlay.close A callback function that is invoked when the user closes the overlay.
-         * @param {function=} overlay.submit A callback function that is invoked when the user confirms the overlay.
-         */
-        function confirmRemove(overlay) {
-            overlay.confirmType = "remove";
-            confirm(overlay);
-        }
-
-        var service = {
-            open: open,
-            close: close,
-            ysod: ysod,
-            confirm: confirm,
-            confirmDelete: confirmDelete,
-            confirmRemove: confirmRemove
-        };
-
-        return service;
-
-    }
-
-    angular.module("umbraco.services").factory("overlayService", overlayService);
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/overlayhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/overlayhelper.service.js
deleted file mode 100644
index 6dd3de6cb8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/overlayhelper.service.js
+++ /dev/null
@@ -1,37 +0,0 @@
-(function() {
-   'use strict';
-
-   function overlayHelper() {
-
-      var numberOfOverlays = 0;
-
-      function registerOverlay() {
-         numberOfOverlays++;
-         return numberOfOverlays;
-      }
-
-      function unregisterOverlay() {
-         numberOfOverlays--;
-         return numberOfOverlays;
-      }
-
-      function getNumberOfOverlays() {
-         return numberOfOverlays;
-      }
-
-      var service = {
-         numberOfOverlays: numberOfOverlays,
-         registerOverlay: registerOverlay,
-         unregisterOverlay: unregisterOverlay,
-         getNumberOfOverlays: getNumberOfOverlays
-      };
-
-      return service;
-
-   }
-
-
-   angular.module('umbraco.services').factory('overlayHelper', overlayHelper);
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/platform.service.js b/src/Umbraco.Web.UI.Client/src/common/services/platform.service.js
deleted file mode 100644
index acd9533151..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/platform.service.js
+++ /dev/null
@@ -1,84 +0,0 @@
-(function () {
-  'use strict';
-
-  function platformService() {
-    const userAgentRules = [
-      ['Aol', /AOLShield\/([0-9\._]+)/],
-      ['Edge', /Edge\/([0-9\._]+)/],
-      ['Edge-ios', /EdgiOS\/([0-9\._]+)/],
-      ['Yandexbrowser', /YaBrowser\/([0-9\._]+)/],
-      ['Kakaotalk', /KAKAOTALK\s([0-9\.]+)/],
-      ['Samsung', /SamsungBrowser\/([0-9\.]+)/],
-      ['Silk', /\bSilk\/([0-9._-]+)\b/],
-      ['MiUI', /MiuiBrowser\/([0-9\.]+)$/],
-      ['Beaker', /BeakerBrowser\/([0-9\.]+)/],
-      ['Edge-chromium', /EdgA?\/([0-9\.]+)/],
-      ['chromium-webview', /(?!Chrom.*OPR)wv\).*Chrom(?:e|ium)\/([0-9\.]+)(:?\s|$)/],
-      ['Chrome', /(?!Chrom.*OPR)Chrom(?:e|ium)\/([0-9\.]+)(:?\s|$)/],
-      ['PhantomJS', /PhantomJS\/([0-9\.]+)(:?\s|$)/],
-      ['Crios', /CriOS\/([0-9\.]+)(:?\s|$)/],
-      ['Firefox', /Firefox\/([0-9\.]+)(?:\s|$)/],
-      ['FxiOS', /FxiOS\/([0-9\.]+)/],
-      ['Opera-mini', /Opera Mini.*Version\/([0-9\.]+)/],
-      ['Opera', /Opera\/([0-9\.]+)(?:\s|$)/],
-      ['Opera', /OPR\/([0-9\.]+)(:?\s|$)/],
-      ['IE', /Trident\/7\.0.*rv\:([0-9\.]+).*\).*Gecko$/],
-      ['IE', /MSIE\s([0-9\.]+);.*Trident\/[4-7].0/],
-      ['IE', /MSIE\s(7\.0)/],
-      ['BB10', /BB10;\sTouch.*Version\/([0-9\.]+)/],
-      ['Android', /Android\s([0-9\.]+)/],
-      ['iOS', /Version\/([0-9\._]+).*Mobile.*Safari.*/],
-      ['Safari', /Version\/([0-9\._]+).*Safari/],
-      ['Facebook', /FB[AS]V\/([0-9\.]+)/],
-      ['Instagram', /Instagram\s([0-9\.]+)/],
-      ['iOS-webview', /AppleWebKit\/([0-9\.]+).*Mobile/],
-      ['iOS-webview', /AppleWebKit\/([0-9\.]+).*Gecko\)$/],
-      ['Curl', /^curl\/([0-9\.]+)$/]
-    ];
-
-    function isMac() {
-      return navigator.platform.toUpperCase().indexOf('MAC') >= 0;
-    }
-
-    function getBrowserInfo(){
-      let data = matchUserAgent(navigator.userAgent);
-      console.log(data);
-      if(data){
-        const test = data[1];
-        return {
-          name : data[0],
-          version : test[1]
-        };
-      }
-      return null;
-    }
-
-    function matchUserAgent(ua) {
-      return (ua !== '' && userAgentRules.reduce (
-          (matched, [browser, regex]) => {
-            if (matched) {
-              return matched;
-            }
-            const uaMatch = regex.exec(ua);
-            return !!uaMatch && [browser, uaMatch];
-          },
-          false
-        )
-      );
-    }
-
-    ////////////
-
-    var service = {
-      isMac: isMac,
-      getBrowserInfo : getBrowserInfo
-    };
-
-    return service;
-
-  }
-
-  angular.module('umbraco.services').factory('platformService', platformService);
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/retryqueue.service.js b/src/Umbraco.Web.UI.Client/src/common/services/retryqueue.service.js
deleted file mode 100644
index c6aceeb9e0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/retryqueue.service.js
+++ /dev/null
@@ -1,97 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * A service normally used to recover from session expiry
-     * @param {any} $q
-     * @param {any} $log
-     */
-    function requestRetryQueue($q, $log) {
-
-        var retryQueue = [];
-        var retryUser = null;
-
-        var service = {
-            // The security service puts its own handler in here!
-            onItemAddedCallbacks: [],
-
-            hasMore: function () {
-                return retryQueue.length > 0;
-            },
-            push: function (retryItem) {
-                retryQueue.push(retryItem);
-                // Call all the onItemAdded callbacks
-                Utilities.forEach(service.onItemAddedCallbacks, cb => {
-                    try {
-                        cb(retryItem);
-                    } catch (e) {
-                        $log.error('requestRetryQueue.push(retryItem): callback threw an error' + e);
-                    }
-                });
-            },
-            pushRetryFn: function (reason, userName, retryFn) {
-                // The reason parameter is optional
-                if (arguments.length === 2) {
-                    retryFn = userName;
-                    userName = reason;
-                    reason = undefined;
-                }
-
-                if ((retryUser && retryUser !== userName) || userName === null) {
-                    throw new Error('invalid user');
-                }
-
-                retryUser = userName;
-
-                // The deferred object that will be resolved or rejected by calling retry or cancel
-                var deferred = $q.defer();
-                var retryItem = {
-                    reason: reason,
-                    retry: function () {
-                        // Wrap the result of the retryFn into a promise if it is not already
-                        $q.when(retryFn()).then(function (value) {
-                            // If it was successful then resolve our deferred
-                            deferred.resolve(value);
-                        }, function (value) {
-                            // Othewise reject it
-                            deferred.reject(value);
-                        });
-                    },
-                    cancel: function () {
-                        // Give up on retrying and reject our deferred
-                        deferred.reject();
-                    }
-                };
-                service.push(retryItem);
-                return deferred.promise;
-            },
-            retryReason: function () {
-                return service.hasMore() && retryQueue[0].reason;
-            },
-            cancelAll: function () {
-                while (service.hasMore()) {
-                    retryQueue.shift().cancel();
-                }
-                retryUser = null;
-            },
-            retryAll: function (userName) {
-
-                if (retryUser == null) {
-                    return;
-                }
-
-                if (retryUser !== userName) {
-                    service.cancelAll();
-                    return;
-                }
-
-                while (service.hasMore()) {
-                    retryQueue.shift().retry();
-                }
-            }
-        };
-        return service;
-
-    }
-    angular.module('umbraco.services').factory('requestRetryQueue', requestRetryQueue);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
deleted file mode 100644
index eda36a5fce..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.searchService
- *
- *
- * @description
- * Service for handling the main application search, can currently search content, media and members
- *
- * ##usage
- * To use, simply inject the searchService into any controller that needs it, and make
- * sure the umbraco.services module is accesible - which it should be by default.
- *
- * <pre>
- *      searchService.searchMembers({term: 'bob'}).then(function(results){
- *          results.forEach(function(result){
- *                  //returns:
- *                  {name: "name", id: 1234, menuUrl: "url", editorPath: "url", metaData: {}, subtitle: "/path/etc" }
- *           })
- *           var result =
- *       })
- * </pre>
- */
-angular.module('umbraco.services')
-    .factory('searchService', function (entityResource, $injector, searchResultFormatter) {
-        
-        return {
-
-            /**
-            * @ngdoc method
-            * @name umbraco.services.searchService#searchMembers
-            * @methodOf umbraco.services.searchService
-            *
-            * @description
-            * Searches the default member search index
-            * @param {Object} args argument object
-            * @param {String} args.term seach term
-            * @returns {Promise} returns promise containing all matching members
-            */
-            searchMembers: function (args) {
-
-                if (!args.term) {
-                    throw "args.term is required";
-                }
-
-                return entityResource.search(args.term, "Member", args.searchFrom)
-                    .then(data => {
-                        data.forEach(item => searchResultFormatter.configureMemberResult(item));
-                        return data;
-                    });
-            },
-
-            /**
-            * @ngdoc method
-            * @name umbraco.services.searchService#searchContent
-            * @methodOf umbraco.services.searchService
-            *
-            * @description
-            * Searches the default internal content search index
-            * @param {Object} args argument object
-            * @param {String} args.term seach term
-            * @returns {Promise} returns promise containing all matching content items
-            */
-            searchContent: function (args) {
-
-                if (!args.term) {
-                    throw "args.term is required";
-                }
-
-                return entityResource.search(args.term, "Document", args.searchFrom, args.canceler, args.dataTypeKey)
-                    .then(data => {
-                        data.forEach(item => searchResultFormatter.configureContentResult(item));
-                        return data;
-                    });
-                
-            },
-
-            /**
-            * @ngdoc method
-            * @name umbraco.services.searchService#searchMedia
-            * @methodOf umbraco.services.searchService
-            *
-            * @description
-            * Searches the default media search index
-            * @param {Object} args argument object
-            * @param {String} args.term seach term
-            * @returns {Promise} returns promise containing all matching media items
-            */
-            searchMedia: function (args) {
-
-                if (!args.term) {
-                    throw "args.term is required";
-                }
-
-                return entityResource.search(args.term, "Media", args.searchFrom, args.canceler, args.dataTypeKey)
-                    .then(data => {
-                        data.forEach(item => searchResultFormatter.configureMediaResult(item));
-                        return data;
-                    });
-            },
-
-            /**
-            * @ngdoc method
-            * @name umbraco.services.searchService#searchAll
-            * @methodOf umbraco.services.searchService
-            *
-            * @description
-            * Searches all available indexes and returns all results in one collection
-            * @param {Object} args argument object
-            * @param {String} args.term seach term
-            * @returns {Promise} returns promise containing all matching items
-            */
-            searchAll: function (args) {
-
-                if (!args.term) {
-                    throw "args.term is required";
-                }
-
-                return entityResource.searchAll(args.term, args.canceler).then(data => {
-                    Object.values(data).forEach(resultByType => {
-                        //we need to format the search result data to include things like the subtitle, urls, etc...
-                        // this is done with registered angular services as part of the SearchableTreeAttribute, if that
-                        // is not found, than we format with the default formatter
-                        var formatterMethod = searchResultFormatter.configureDefaultResult;
-                        //check if a custom formatter is specified...
-                        if (resultByType.jsSvc) {
-                            var searchFormatterService = $injector.get(resultByType.jsSvc);
-                            if (searchFormatterService) {
-                                if (!resultByType.jsMethod) {
-                                    resultByType.jsMethod = "format";
-                                }
-                                formatterMethod = searchFormatterService[resultByType.jsMethod];
-
-                                if (!formatterMethod) {
-                                    throw "The method " + resultByType.jsMethod + " on the angular service " + resultByType.jsSvc + " could not be found";
-                                }
-                            }
-                        }
-                        //now apply the formatter for each result
-                        resultByType.results.forEach(item => {
-                            formatterMethod.apply(this, [item, resultByType.treeAlias, resultByType.appAlias]);
-                        });
-
-                    });
-
-                    return data;
-                });
-            },
-
-            // TODO: This doesn't do anything!
-            setCurrent: function (sectionAlias) {
-                var currentSection = sectionAlias;
-            }
-        };
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/searchresultformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/searchresultformatter.service.js
deleted file mode 100644
index ca8fdc7fa7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/searchresultformatter.service.js
+++ /dev/null
@@ -1,37 +0,0 @@
-
-function searchResultFormatter(umbRequestHelper) {
-
-    function configureDefaultResult(content, treeAlias, appAlias) {
-        content.editorPath = appAlias + "/" + treeAlias + "/edit/" + content.id;
-        Utilities.extend(content.metaData, { treeAlias: treeAlias });
-    }
-
-    function configureContentResult(content, treeAlias, appAlias) {
-        content.menuUrl = umbRequestHelper.getApiUrl("contentTreeBaseUrl", "GetMenu", [{ id: content.id }, { application: appAlias }]);
-        content.editorPath = appAlias + "/" + treeAlias + "/edit/" + content.id;
-        Utilities.extend(content.metaData, { treeAlias: treeAlias });
-        content.subTitle = content.metaData.Url;
-    }
-
-    function configureMemberResult(member, treeAlias, appAlias) {
-        member.menuUrl = umbRequestHelper.getApiUrl("memberTreeBaseUrl", "GetMenu", [{ id: member.id }, { application: appAlias }]);
-        member.editorPath = appAlias + "/" + treeAlias + "/edit/" + (member.key ? member.key : member.id);
-        Utilities.extend(member.metaData, { treeAlias: treeAlias });
-        member.subTitle = member.metaData.Email;
-    }
-
-    function configureMediaResult(media, treeAlias, appAlias) {
-        media.menuUrl = umbRequestHelper.getApiUrl("mediaTreeBaseUrl", "GetMenu", [{ id: media.id }, { application: appAlias }]);
-        media.editorPath = appAlias + "/" + treeAlias + "/edit/" + media.id;
-        Utilities.extend(media.metaData, { treeAlias: treeAlias });
-    }
-
-    return {
-        configureContentResult: configureContentResult,
-        configureMemberResult: configureMemberResult,
-        configureMediaResult: configureMediaResult,
-        configureDefaultResult: configureDefaultResult
-    };
-}
-
-angular.module('umbraco.services').factory('searchResultFormatter', searchResultFormatter);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/section.service.js b/src/Umbraco.Web.UI.Client/src/common/services/section.service.js
deleted file mode 100644
index e563a83722..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/section.service.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.sectionService
- *
- *  
- * @description
- * A service to return the sections (applications) to be listed in the navigation which are contextual to the current user
- */
-(function () {
-    'use strict';
-
-    function sectionService(userService, $q, sectionResource) {
-
-        function getSectionsForUser() {
-            var deferred = $q.defer();
-            userService.getCurrentUser().then(function (u) {
-                //if they've already loaded, return them
-                if (u.sections) {
-                    deferred.resolve(u.sections);
-                }
-                else {
-                    sectionResource.getSections().then(function (sections) {
-                        //set these to the user (cached), then the user changes, these will be wiped
-                        u.sections = sections;
-                        deferred.resolve(u.sections);
-                    });   
-                }                
-            });
-            return deferred.promise;
-        }
-        
-        var service = {
-            getSectionsForUser: getSectionsForUser
-        };
-
-        return service;
-
-    }
-
-    angular.module('umbraco.services').factory('sectionService', sectionService);
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js b/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
deleted file mode 100644
index 8df5a9ce8c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
+++ /dev/null
@@ -1,888 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.serverValidationManager
- * @function
- *
- * @description
- * Used to handle server side validation and wires up the UI with the messages. There are 2 types of validation messages, one
- * is for user defined properties (called Properties) and the other is for field properties which are attached to the native 
- * model objects (not user defined). The methods below are named according to these rules: Properties vs Fields.
- * 
- * For a more indepth explanation of how server side validation works with the angular app, see this GitHub PR: 
- * https://github.com/umbraco/Umbraco-CMS/pull/8339
- * 
- */
-function serverValidationManager($timeout) {
-
-    // The array of callback objects, each object is:
-    // - propertyAlias (this is the property's 'path' if it's a nested error)
-    // - culture
-    // - fieldName
-    // - segment
-    // - callback (function)
-    // - id (unique identifier, auto-generated, used internally for unsubscribing the callback)
-    // - options (used for complex properties, can contain options.matchType which can be either "suffix" or "prefix" or "contains")
-    var callbacks = [];
-
-    // The array of error message objects, each object 'key' is:    
-    // - propertyAlias (this is the property's 'path' if it's a nested error)
-    // - culture
-    // - fieldName
-    // - segment
-    // The object also contains:
-    // - errorMsg
-    var errorMsgItems = [];
-
-    var defaultMatchOptions = {
-        matchType: null
-    }
-
-    /** calls the callback specified with the errors specified, used internally */
-    function executeCallback(errorsForCallback, callback, culture, segment, isValid) {
-
-        callback.apply(instance, [
-                isValid,               // pass in a value indicating it is invalid
-                errorsForCallback,     // pass in the errors for this item
-                errorMsgItems,         // pass in all errors in total
-                culture,               // pass the culture that we are listing for.
-                segment                // pass the segment that we are listing for.
-            ]
-        );
-    }
-
-    /**
-     * @ngdoc function
-     * @name notify
-     * @methodOf umbraco.services.serverValidationManager
-     * @function
-     *
-     * @description
-     * Notifies all subscriptions again. Called when there are changes to subscriptions or errors. 
-     */
-    function notify() {
-
-        $timeout(function () {
-            for (var i = 0; i < errorMsgItems.length; i++) {
-                var item = errorMsgItems[i];
-            }
-            notifyCallbacks();
-        });
-    }
-
-    function getFieldErrors(fieldName) {
-        if (!Utilities.isString(fieldName)) {
-            throw "fieldName must be a string";
-        }
-
-        //find errors for this field name
-        return _.filter(errorMsgItems, function (item) {
-            return (item.propertyAlias === null && item.culture === "invariant" && item.fieldName === fieldName);
-        });
-    }
-    
-    function getPropertyErrors(propertyAlias, culture, segment, fieldName, options) {
-        if (!Utilities.isString(propertyAlias)) {
-            throw "propertyAlias must be a string";
-        }
-        if (fieldName && !Utilities.isString(fieldName)) {
-            throw "fieldName must be a string";
-        }
-        
-        if (!culture) {
-            culture = "invariant";
-        }
-        if (!segment) {
-            segment = null;
-        }
-
-        if (!options) {
-            options = defaultMatchOptions;
-        }
-
-        //find all errors for this property
-        return _.filter(errorMsgItems, function (errMsgItem) {
-
-            if (!errMsgItem.propertyAlias) {
-                return false;
-            }
-
-            var matchProp = matchErrMsgItemProperty(errMsgItem, propertyAlias, options);
-
-            return matchProp
-                && errMsgItem.culture === culture
-                && errMsgItem.segment === segment
-                // ignore field matching if match options are used
-                && (options.matchType || (errMsgItem.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
-        });
-    }
-
-    /**
-     * Returns true if the error message item's data matches the property validation key with a match type provided by the options
-     * @param {any} errMsgItem The error message item
-     * @param {any} propertyValidationKey The property validation key) 
-     * @param {any} options The match type options
-     */
-    function matchErrMsgItemProperty(errMsgItem, propertyValidationKey, options) {
-        if (errMsgItem.propertyAlias === propertyValidationKey) {
-            return true;
-        }
-        if (options.matchType === "prefix" && errMsgItem.propertyAlias.startsWith(propertyValidationKey + '/')) {
-            return true;
-        }
-        if (options.matchType === "suffix" && errMsgItem.propertyAlias.endsWith('/' + propertyValidationKey)) {
-            return true;
-        }
-        if (options.matchType === "contains" && errMsgItem.propertyAlias.includes('/' + propertyValidationKey + '/')) {
-            return true;
-        }
-        return false;
-    }
-
-    function getVariantErrors(culture, segment) {
-        
-        if (!culture) {
-            culture = "invariant";
-        }
-        if (!segment) {
-            segment = null;
-        }
-        
-        //find all errors for this property
-        return _.filter(errorMsgItems, function (item) {
-            return (item.culture === culture && item.segment === segment);
-        });
-    }
-
-    function notifyCallback(cb) {
-        if (cb.propertyAlias === null && cb.fieldName !== null) {
-            //its a field error callback
-            const fieldErrors = getFieldErrors(cb.fieldName);
-            const valid = fieldErrors.length === 0;
-            executeCallback(fieldErrors, cb.callback, cb.culture, cb.segment, valid);
-        }
-        else if (cb.propertyAlias != null) {
-            //its a property error
-            const propErrors = getPropertyErrors(cb.propertyAlias, cb.culture, cb.segment, cb.fieldName, cb.options);
-            const valid = propErrors.length === 0;
-            executeCallback(propErrors, cb.callback, cb.culture, cb.segment, valid);
-        }
-        else {
-            //its a variant error
-            const variantErrors = getVariantErrors(cb.culture, cb.segment);
-            const valid = variantErrors.length === 0;
-            executeCallback(variantErrors, cb.callback, cb.culture, cb.segment, valid);
-        }
-    }
-
-    /** Call all registered callbacks indicating if the data they are subscribed to is valid or invalid */
-    function notifyCallbacks() {
-
-        // nothing to call
-        if (errorMsgItems.length === 0) {
-            return;
-        }
-
-        callbacks.forEach(cb => notifyCallback(cb));
-    }
-
-    /**
-     * Flattens the complex errror result json into an array of the block's id/parent id and it's corresponding validation ModelState
-     * @param {any} errorMsg
-     * @param {any} parentPropertyAlias The parent property alias for the json error 
-     */
-    function parseComplexEditorError(errorMsg, parentPropertyAlias) {
-
-        var json = Utilities.isArray(errorMsg) ? errorMsg : JSON.parse(errorMsg);
-
-        var result = [];
-
-        function extractModelState(validation, parentPath) {
-            if (validation.$id && validation.ModelState) {
-                var ms = {
-                    validationPath: `${parentPath}/${validation.$id}`,
-                    modelState: validation.ModelState
-                };
-                result.push(ms);
-                return ms;
-            }
-            return null;
-        }
-
-        function iterateErrorBlocks(blocks, parentPath) {
-            for (var i = 0; i < blocks.length; i++) {
-                var validation = blocks[i];
-                var ms = extractModelState(validation, parentPath);
-                if (!ms) {
-                    continue;
-                }
-                var nested = _.omit(validation, "$id", "$elementTypeAlias", "ModelState");                
-                for (const [key, value] of Object.entries(nested)) {
-                    if (Array.isArray(value)) {
-                        iterateErrorBlocks(value, `${ms.validationPath}/${key}`); // recurse
-                    }
-                }
-            }
-        }
-
-        iterateErrorBlocks(json, parentPropertyAlias);
-
-        return result;
-    }
-
-    /**
-     * @ngdoc function
-     * @name getPropertyCallbacks
-     * @methodOf umbraco.services.serverValidationManager
-     * @function
-     *
-     * @description
-     * Gets all callbacks that has been registered using the subscribe method for the propertyAlias + fieldName combo.
-     * This will always return any callbacks registered for just the property (i.e. field name is empty) and for ones with an
-     * explicit field name set.
-     */
-    function getPropertyCallbacks(propertyAlias, culture, fieldName, segment) {
-
-        //normalize culture to "invariant"
-        if (!culture) {
-            culture = "invariant";
-        }
-        //normalize segment to null
-        if (!segment) {
-            segment = null;
-        }
-
-        var found = _.filter(callbacks, function (cb) {
-
-            if (!cb.options) {
-                cb.options = defaultMatchOptions;
-            }
-
-            var matchProp = matchCallbackItemProperty(cb, propertyAlias);
-
-            //returns any callback that have been registered directly against the field and for only the property
-            return matchProp
-                && cb.culture === culture
-                && cb.segment === segment
-                // ignore field matching if match options are used
-                && (cb.options.matchType || (cb.fieldName === fieldName || (cb.fieldName === undefined || cb.fieldName === "")));
-        });
-        return found;
-    }
-
-    /**
-     * Returns true if the callback item's data and match options matches the property validation key 
-     * @param {any} cb
-     * @param {any} propertyValidationKey
-     */
-    function matchCallbackItemProperty(cb, propertyValidationKey) {
-        if (cb.propertyAlias === propertyValidationKey) {
-            return true;
-        }
-        if (cb.options.matchType === "prefix" && propertyValidationKey.startsWith(cb.propertyAlias + '/')) {
-            return true;
-        }
-        if (cb.options.matchType === "suffix" && propertyValidationKey.endsWith('/' + cb.propertyAlias)) {
-            return true;
-        }
-        if (cb.options.matchType === "contains" && propertyValidationKey.includes('/' + cb.propertyAlias + '/')) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @ngdoc function
-     * @name getFieldCallbacks
-     * @methodOf umbraco.services.serverValidationManager
-     * @function
-     *
-     * @description
-     * Gets all callbacks that has been registered using the subscribe method for the field.
-     */
-    function getFieldCallbacks(fieldName) {
-        var found = _.filter(callbacks, function (item) {
-            //returns any callback that have been registered directly against the field
-            return (item.propertyAlias === null && item.culture === "invariant" && item.segment === null && item.fieldName === fieldName);
-        });
-        return found;
-    }
-
-    /**
-     * @ngdoc function
-     * @name getVariantCallbacks
-     * @methodOf umbraco.services.serverValidationManager
-     * @function
-     *
-     * @description
-     * Gets all callbacks that has been registered using the subscribe method for the culture and segment.
-     */
-    function getVariantCallbacks(culture, segment) {
-        var found = _.filter(callbacks, function (item) {
-            //returns any callback that have been registered directly against the given culture and given segment.
-            return (item.culture === culture && item.segment === segment && item.propertyAlias === null && item.fieldName === null);
-        });
-        return found;
-    }
-
-    /**
-     * @ngdoc function
-     * @name addFieldError
-     * @methodOf umbraco.services.serverValidationManager
-     * @function
-     *
-     * @description
-     * Adds an error message for a native content item field (not a user defined property, for Example, 'Name')
-     */
-    function addFieldError(fieldName, errorMsg) {
-        if (!fieldName) {
-            return;
-        }
-
-        //only add the item if it doesn't exist                
-        if (!hasFieldError(fieldName)) {
-            errorMsgItems.push({
-                propertyAlias: null,
-                culture: "invariant",
-                segment: null,
-                fieldName: fieldName,
-                errorMsg: errorMsg
-            });
-        }
-
-        //find all errors for this item
-        var errorsForCallback = getFieldErrors(fieldName);
-        //we should now call all of the call backs registered for this error
-        var cbs = getFieldCallbacks(fieldName);
-        //call each callback for this error
-        for (var cb in cbs) {
-            executeCallback(errorsForCallback, cbs[cb].callback, null, null, false);
-        }
-    }
-
-    /**
-     * @ngdoc function
-     * @name addPropertyError
-     * @methodOf umbraco.services.serverValidationManager
-     * @function
-     *
-     * @description
-     * Adds an error message for the content property
-     */
-    function addPropertyError(propertyAlias, culture, fieldName, errorMsg, segment) {
-
-        if (!propertyAlias) {
-            return;
-        }
-
-        //normalize culture to "invariant"
-        if (!culture) {
-            culture = "invariant";
-        }
-        //normalize segment to null
-        if (!segment) {
-            segment = null;
-        }
-        //normalize errorMsg to empty
-        if (!errorMsg) {
-            errorMsg = "";
-        }
-
-        // remove all non printable chars and whitespace from the string
-        // (this can be a json string for complex errors and in some test cases contains odd whitespace)
-        if (Utilities.isString(errorMsg)) {
-            errorMsg = errorMsg.trimStartSpecial().trim();
-        }
-
-        // if the error message is json it's a complex editor validation response that we need to parse
-        if ((Utilities.isString(errorMsg) && errorMsg.startsWith("[")) || Utilities.isArray(errorMsg)) {
-
-            // flatten the json structure, create validation paths for each property and add each as a property error
-            var idsToErrors = parseComplexEditorError(errorMsg, propertyAlias);
-            idsToErrors.forEach(x => addErrorsForModelState(x.modelState, x.validationPath));
-
-            // We need to clear the error message else it will show up as a giant json block against the property
-             errorMsg = "";
-        }
-
-        //only add the item if it doesn't exist                
-        if (!hasPropertyError(propertyAlias, culture, fieldName, segment)) {
-            errorMsgItems.push({
-                propertyAlias: propertyAlias,
-                culture: culture,
-                segment: segment,
-                fieldName: fieldName,
-                errorMsg: errorMsg
-            });
-        }        
-    }
-
-    /**
-     * @ngdoc function
-     * @name hasPropertyError
-     * @methodOf umbraco.services.serverValidationManager
-     * @function
-     *
-     * @description
-     * Checks if the content property + culture + field name combo has an error
-     */
-    function hasPropertyError(propertyAlias, culture, fieldName, segment) {
-
-        //normalize culture to null
-        if (!culture) {
-            culture = "invariant";
-        }
-        //normalize segment to null
-        if (!segment) {
-            segment = null;
-        }
-
-        var err = _.find(errorMsgItems, function (item) {
-            //return true if the property alias matches and if an empty field name is specified or the field name matches
-            return (item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
-        });
-        return err ? true : false;
-    }
-
-    /**
-     * @ngdoc function
-     * @name hasFieldError
-     * @methodOf umbraco.services.serverValidationManager
-     * @function
-     *
-     * @description
-     * Checks if a content field has an error
-     */
-    function hasFieldError(fieldName) {
-        var err = _.find(errorMsgItems, function (item) {
-            //return true if the property alias matches and if an empty field name is specified or the field name matches
-            return (item.propertyAlias === null && item.culture === "invariant" && item.segment === null && item.fieldName === fieldName);
-        });
-        return err ? true : false;
-    }
-
-    /**
-     * @ngdoc function
-     * @name addErrorsForModelState
-     * @methodOf umbraco.services.serverValidationManager
-     * @param {any} modelState the modelState object
-     * @param {any} parentValidationPath optional parameter specifying a nested element's UDI for which this property belongs (for complex editors)
-     * @description
-     * This wires up all of the server validation model state so that valServer and valServerField directives work
-     */    
-    function addErrorsForModelState(modelState, parentValidationPath) {
-
-        if (!Utilities.isObject(modelState)) {
-            throw "modelState is not an object";
-        }
-
-        for (const [key, value] of Object.entries(modelState)) {
-
-            //This is where things get interesting....
-            // We need to support validation for all editor types such as both the content and content type editors.
-            // The Content editor ModelState is quite specific with the way that Properties are validated especially considering
-            // that each property is a User Developer property editor.
-            // The way that Content Type Editor ModelState is created is simply based on the ASP.Net validation data-annotations 
-            // system. 
-            // So, to do this there's some special ModelState syntax we need to know about.
-            // For Content Properties, which are user defined, we know that they will exist with a prefixed
-            // ModelState of "_Properties.", so if we detect this, then we know it's for a content Property.
-
-            //the alias in model state can be in dot notation which indicates
-            // * the first part is the content property alias
-            // * the second part is the field to which the valiation msg is associated with
-            //There will always be at least 4 parts for content properties since all model errors for properties are prefixed with "_Properties"
-            //If it is not prefixed with "_Properties" that means the error is for a field of the object directly.
-
-            // Example: "_Properties.headerImage.en-US.mySegment.myField"
-            // * it's for a property since it has a _Properties prefix
-            // * it's for the headerImage property type
-            // * it's for the en-US culture
-            // * it's for the mySegment segment
-            // * it's for the myField html field (optional)
-
-            var parts = key.split(".");
-
-            //Check if this is for content properties - specific to content/media/member editors because those are special 
-            // user defined properties with custom controls.
-            if (parts.length > 1 && parts[0] === "_Properties") {
-
-                // create the validation key, might just be the prop alias but if it's nested will be validation path
-                // like "myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/7170A4DD-2441-4B1B-A8D3-437D75C4CBC9/city"
-                var propertyValidationKey = createPropertyValidationKey(parts[1], parentValidationPath);
-
-                var culture = null;
-                if (parts.length > 2) {
-                    culture = parts[2];
-                    //special check in case the string is formatted this way
-                    if (culture === "null") {
-                        culture = null;
-                    }
-                }
-
-                var segment = null;
-                if (parts.length > 3) {
-                    segment = parts[3];
-                    //special check in case the string is formatted this way
-                    if (segment === "null") {
-                        segment = null;
-                    }
-                }
-
-                var htmlFieldReference = "";
-                if (parts.length > 4) {
-                    htmlFieldReference = parts[4] || "";
-                }
-
-                // add a generic error for the property
-                addPropertyError(propertyValidationKey, culture, htmlFieldReference, value && Array.isArray(value) && value.length > 0 ? value[0] : null, segment);
-            }
-            else {
-
-                //Everthing else is just a 'Field'... the field name could contain any level of 'parts' though, for example:
-                // Groups[0].Properties[2].Alias
-                addFieldError(key, value[0]);
-            }
-        }
-
-        if (hasPropertyError) {
-            // ensure all callbacks are called after property errors are added
-            notifyCallbacks(); 
-        }
-    }
-
-    function createPropertyValidationKey(propertyAlias, parentValidationPath) {
-        return parentValidationPath ? (parentValidationPath + "/" + propertyAlias) : propertyAlias;
-    }
-
-    /**
-     * @ngdoc function
-     * @name reset
-     * @methodOf umbraco.services.serverValidationManager
-     * @function
-     *
-     * @description
-     * Clears all errors and notifies all callbacks that all server errros are now valid - used when submitting a form
-     */
-    function reset() {
-        clear();
-        for (var cb in callbacks) {
-            callbacks[cb].callback.apply(instance, [
-                true,       //pass in a value indicating it is VALID
-                [],         //pass in empty collection
-                [],
-                null,
-                null]
-            );
-        }
-    }
-
-    /**
-     * @ngdoc function
-     * @name clear
-     * @methodOf umbraco.services.serverValidationManager
-     * @function
-     *
-     * @description
-     * Clears all errors
-     */
-    function clear() {
-        errorMsgItems = [];
-    }
-
-    var instance = {
-
-        addErrorsForModelState: addErrorsForModelState,
-        parseComplexEditorError: parseComplexEditorError,
-        createPropertyValidationKey: createPropertyValidationKey,
-
-        /**
-         * @ngdoc function
-         * @name notifyAndClearAllSubscriptions
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         *  This method can be called once all field and property errors are wired up. 
-         * 
-         *  In some scenarios where the error collection needs to be persisted over a route change 
-         *   (i.e. when a content item (or any item) is created and the route redirects to the editor) 
-         *   the controller should call this method once the data is bound to the scope
-         *   so that any persisted validation errors are re-bound to their controls. Once they are re-binded this then clears the validation
-         *   colleciton so that if another route change occurs, the previously persisted validation errors are not re-bound to the new item.
-         *   
-         *  In the case of content with complex editors, variants and different views, those editors don't call this method and instead 
-         *  manage the server validation manually by calling notify when necessary and clear/reset when necessary.
-         */
-        notifyAndClearAllSubscriptions: function() {
-
-            $timeout(function () {
-                notifyCallbacks();
-                //now that they are all executed, we're gonna clear all of the errors we have
-                clear();
-            });
-        },
-
-        notify: notify,
-
-        /**
-         * @ngdoc function
-         * @name subscribe
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         * @description
-         *  Adds a callback method that is executed whenever validation changes for the field name + property specified.
-         *  This is generally used for server side validation in order to match up a server side validation error with 
-         *  a particular field, otherwise we can only pinpoint that there is an error for a content property, not the 
-         *  property's specific field. This is used with the val-server directive in which the directive specifies the 
-         *  field alias to listen for.
-         *  If propertyAlias is null, then this subscription is for a field property (not a user defined property).
-         */
-        subscribe: function (propertyAlias, culture, fieldName, callback, segment, options) {
-            if (!callback) {
-                return;
-            }
-
-            var id = String.CreateGuid();
-
-            //normalize culture to "invariant"
-            if (!culture) {
-                culture = "invariant";
-            }
-            //normalize segment to null
-            if (!segment) {
-                segment = null;
-            }
-
-            let cb = null;
-
-            if (propertyAlias === null) {
-                cb = {
-                    propertyAlias: null,
-                    culture: culture,
-                    segment: segment,
-                    fieldName: fieldName,
-                    callback: callback,
-                    id: id
-                };
-            }
-            else if (propertyAlias !== undefined) {
-                                
-                cb = {
-                    propertyAlias: propertyAlias,
-                    culture: culture,
-                    segment: segment,
-                    fieldName: fieldName,
-                    callback: callback,
-                    id: id,
-                    options: options
-                };
-            }
-
-            callbacks.push(cb);
-
-            function unsubscribeId() {
-                //remove all callbacks for the content field
-                callbacks = _.reject(callbacks, function (item) {
-                    return item.id === id;
-                });
-            }
-
-            // Notify the new callback            
-            notifyCallback(cb);
-
-            //return a function to unsubscribe this subscription by uniqueId
-            return unsubscribeId;
-        },
-
-        /**
-         * Removes all callbacks registered for the propertyALias, culture and fieldName combination
-         * @param {} propertyAlias 
-         * @param {} culture 
-         * @param {} fieldName 
-         * @returns {} 
-         */
-        unsubscribe: function (propertyAlias, culture, fieldName, segment) {
-            
-            //normalize culture to "invariant"
-            if (!culture) {
-                culture = "invariant";
-            }
-            //normalize segment to null
-            if (!segment) {
-                segment = null;
-            }
-            
-            if (propertyAlias === null) {
-
-                //remove all callbacks for the content field
-                callbacks = _.reject(callbacks, function (item) {
-                    return item.propertyAlias === null && item.culture === culture && item.segment === segment && item.fieldName === fieldName;
-                });
-
-            }
-            else if (propertyAlias !== undefined) {
-                //remove all callbacks for the content property
-                callbacks = _.reject(callbacks, function (item) {
-                    return item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment &&
-                    (item.fieldName === fieldName ||
-                        ((item.fieldName === undefined || item.fieldName === "") && (fieldName === undefined || fieldName === "")));
-                });
-            }
-        },
-        
-        getPropertyCallbacks: getPropertyCallbacks,        
-        getFieldCallbacks: getFieldCallbacks,
-        
-        /**
-         * @ngdoc function
-         * @name getCultureCallbacks
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Gets all callbacks that has been registered using the subscribe method for the culture. Not including segments.
-         */
-        getCultureCallbacks: function (culture) {
-            var found = _.filter(callbacks, function (item) {
-                //returns any callback that have been registered directly/ONLY against the culture
-                return (item.culture === culture && item.segment === null && item.propertyAlias === null && item.fieldName === null);
-            });
-            return found;
-        },
-
-        getVariantCallbacks: getVariantCallbacks,
-        addFieldError: addFieldError,        
-
-        addPropertyError: function (propertyAlias, culture, fieldName, errorMsg, segment) {
-            addPropertyError(propertyAlias, culture, fieldName, errorMsg, segment);
-            notifyCallbacks(); // ensure all callbacks are called
-        },      
-        
-        /**
-         * @ngdoc function
-         * @name removePropertyError
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Removes an error message for the content property
-         */
-        removePropertyError: function (propertyAlias, culture, fieldName, segment, options) {
-
-            var errors = getPropertyErrors(propertyAlias, culture, segment, fieldName, options);
-            errorMsgItems = errorMsgItems.filter(v => errors.indexOf(v) === -1);
-
-            if (errors.length > 0) {
-                // removal was successful, re-notify all subscribers
-                notifyCallbacks();
-            }
-        },
-        
-        reset: reset,
-        clear: clear,
-        
-        /**
-         * @ngdoc function
-         * @name getPropertyError
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Gets the error message for the content property
-         */
-        getPropertyError: function (propertyAlias, culture, fieldName, segment) {
-            var errors = getPropertyErrors(propertyAlias, culture, segment, fieldName);
-            if (errors.length > 0) { // should only ever contain one
-                return errors[0];
-            }
-            return undefined;
-        },
-
-        getPropertyErrorsByValidationPath: function (propertyValidationPath, culture, segment, options) {
-            return getPropertyErrors(propertyValidationPath, culture, segment, "", options);
-        },
-
-        /**
-         * @ngdoc function
-         * @name getFieldError
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Gets the error message for a content field
-         */
-        getFieldError: function (fieldName) {
-            var err = _.find(errorMsgItems, function (item) {
-                //return true if the property alias matches and if an empty field name is specified or the field name matches
-                return (item.propertyAlias === null && item.culture === "invariant" && item.segment === null && item.fieldName === fieldName);
-            });
-            return err;
-        },
-        
-        hasPropertyError: hasPropertyError,        
-        hasFieldError: hasFieldError,
-        
-        /**
-         * @ngdoc function
-         * @name hasCultureError
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Checks if the given culture has an error
-         */
-        hasCultureError: function (culture) {
-
-            //normalize culture to "invariant"
-            if (!culture) {
-                culture = "invariant";
-            }
-
-            var err = _.find(errorMsgItems, function (item) {
-                return (item.culture === culture && item.segment === null);
-            });
-            return err ? true : false;
-        },
-        
-        /**
-         * @ngdoc function
-         * @name hasVariantError
-         * @methodOf umbraco.services.serverValidationManager
-         * @function
-         *
-         * @description
-         * Checks if the given culture has an error
-         */
-        hasVariantError: function (culture, segment) {
-            
-            //normalize culture to "invariant"
-            if (!culture) {
-                culture = "invariant";
-            }
-            //normalize segment to null
-            if (!segment) {
-                segment = null;
-            }
-            
-            var err = _.find(errorMsgItems, function (item) {
-                return (item.culture === culture && item.segment === segment);
-            });
-            return err ? true : false;
-        }
-
-    };
-
-    // Used to return the 'items' array as a reference/getter
-    Object.defineProperty(instance, "items", {
-        get: function () {
-            return errorMsgItems;
-        },
-        set: function (value) {
-            throw "Cannot set the items array";
-        }
-    });
-
-    return instance;
-}
-
-angular.module('umbraco.services').factory('serverValidationManager', serverValidationManager);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tabbable.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tabbable.service.js
deleted file mode 100644
index 35f0d8a34a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/tabbable.service.js
+++ /dev/null
@@ -1,230 +0,0 @@
-//tabbable JS Lib (Wrapped in angular service)
-//https://github.com/davidtheclark/tabbable
-
-(function() {
-    'use strict';
-
-    function tabbableService() {
-
-         var candidateSelectors = [
-            'input',
-            'select',
-            'textarea',
-            'a[href]',
-            'button',
-            '[tabindex]',
-            'audio[controls]',
-            'video[controls]',
-            '[contenteditable]:not([contenteditable="false"])',
-            'iframe[data-mce-style]'
-          ];
-          var candidateSelector = candidateSelectors.join(',');
-
-          var matches = typeof Element === 'undefined'
-            ? function () {}
-            : Element.prototype.matches || Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector;
-
-          function tabbable(el, options) {
-            options = options || {};
-
-            var elementDocument = el.ownerDocument || el;
-            var regularTabbables = [];
-            var orderedTabbables = [];
-
-            var untouchabilityChecker = new UntouchabilityChecker(elementDocument);
-            var candidates = el.querySelectorAll(candidateSelector);
-
-            if (options.includeContainer) {
-              if (matches.call(el, candidateSelector)) {
-                candidates = Array.prototype.slice.apply(candidates);
-                candidates.unshift(el);
-              }
-            }
-
-            var i, candidate, candidateTabindex;
-            for (i = 0; i < candidates.length; i++) {
-              candidate = candidates[i];
-
-              if (!isNodeMatchingSelectorTabbable(candidate, untouchabilityChecker)) continue;
-
-              candidateTabindex = getTabindex(candidate);
-              if (candidateTabindex === 0) {
-                regularTabbables.push(candidate);
-              } else {
-                orderedTabbables.push({
-                  documentOrder: i,
-                  tabIndex: candidateTabindex,
-                  node: candidate
-                });
-              }
-            }
-
-            var tabbableNodes = orderedTabbables
-              .sort(sortOrderedTabbables)
-              .map(function(a) { return a.node })
-              .concat(regularTabbables);
-
-            return tabbableNodes;
-          }
-
-          tabbable.isTabbable = isTabbable;
-          tabbable.isFocusable = isFocusable;
-
-          function isNodeMatchingSelectorTabbable(node, untouchabilityChecker) {
-            if (
-              !isNodeMatchingSelectorFocusable(node, untouchabilityChecker)
-              || isNonTabbableRadio(node)
-              || getTabindex(node) < 0
-            ) {
-              return false;
-            }
-            return true;
-          }
-
-          function isTabbable(node, untouchabilityChecker) {
-            if (!node) throw new Error('No node provided');
-            if (matches.call(node, candidateSelector) === false) return false;
-            return isNodeMatchingSelectorTabbable(node, untouchabilityChecker);
-          }
-
-          function isNodeMatchingSelectorFocusable(node, untouchabilityChecker) {
-            untouchabilityChecker = untouchabilityChecker || new UntouchabilityChecker(node.ownerDocument || node);
-            if (
-              node.disabled
-              || isHiddenInput(node)
-              || untouchabilityChecker.isUntouchable(node)
-            ) {
-              return false;
-            }
-            return true;
-          }
-
-          var focusableCandidateSelector = candidateSelectors.concat('iframe').join(',');
-          function isFocusable(node, untouchabilityChecker) {
-            if (!node) throw new Error('No node provided');
-            if (matches.call(node, focusableCandidateSelector) === false) return false;
-            return isNodeMatchingSelectorFocusable(node, untouchabilityChecker);
-          }
-
-          function getTabindex(node) {
-            var tabindexAttr = parseInt(node.getAttribute('tabindex'), 10);
-            if (!isNaN(tabindexAttr)) return tabindexAttr;
-            // Browsers do not return `tabIndex` correctly for contentEditable nodes;
-            // so if they don't have a tabindex attribute specifically set, assume it's 0.
-            if (isContentEditable(node)) return 0;
-            return node.tabIndex;
-          }
-
-          function sortOrderedTabbables(a, b) {
-            return a.tabIndex === b.tabIndex ? a.documentOrder - b.documentOrder : a.tabIndex - b.tabIndex;
-          }
-
-          // Array.prototype.find not available in IE.
-          function find(list, predicate) {
-            for (var i = 0, length = list.length; i < length; i++) {
-              if (predicate(list[i])) return list[i];
-            }
-          }
-
-          function isContentEditable(node) {
-            return node.contentEditable === 'true';
-          }
-
-          function isInput(node) {
-            return node.tagName === 'INPUT';
-          }
-
-          function isHiddenInput(node) {
-            return isInput(node) && node.type === 'hidden';
-          }
-
-          function isRadio(node) {
-            return isInput(node) && node.type === 'radio';
-          }
-
-          function isNonTabbableRadio(node) {
-            return isRadio(node) && !isTabbableRadio(node);
-          }
-
-          function getCheckedRadio(nodes) {
-            for (var i = 0; i < nodes.length; i++) {
-              if (nodes[i].checked) {
-                return nodes[i];
-              }
-            }
-          }
-
-          function isTabbableRadio(node) {
-            if (!node.name) return true;
-            // This won't account for the edge case where you have radio groups with the same
-            // in separate forms on the same page.
-            var radioSet = node.ownerDocument.querySelectorAll('input[type="radio"][name="' + node.name + '"]');
-            var checked = getCheckedRadio(radioSet);
-            return !checked || checked === node;
-          }
-
-          // An element is "untouchable" if *it or one of its ancestors* has
-          // `visibility: hidden` or `display: none`.
-          function UntouchabilityChecker(elementDocument) {
-            this.doc = elementDocument;
-            // Node cache must be refreshed on every check, in case
-            // the content of the element has changed. The cache contains tuples
-            // mapping nodes to their boolean result.
-            this.cache = [];
-          }
-
-          // getComputedStyle accurately reflects `visibility: hidden` of ancestors
-          // but not `display: none`, so we need to recursively check parents.
-          UntouchabilityChecker.prototype.hasDisplayNone = function hasDisplayNone(node, nodeComputedStyle) {
-            if (node === this.doc.documentElement) return false;
-
-              // Search for a cached result.
-              var cached = find(this.cache, function(item) {
-                return item === node;
-              });
-              if (cached) return cached[1];
-
-              if (!nodeComputedStyle) {
-                if (node instanceof DocumentFragment) {
-                  return true;// though DocumentFragment doesn't directly have display 'none', we know that it will never be visible, and therefore we return true. (and do not cache this, cause it will change if appended to the DOM)
-                } else {
-                  nodeComputedStyle = this.doc.defaultView.getComputedStyle(node);
-                }
-              }
-
-              var result = false;
-
-              if (nodeComputedStyle.display === 'none') {
-                result = true;
-              } else if (node.parentNode) {
-                result = this.hasDisplayNone(node.parentNode);
-              }
-
-              this.cache.push([node, result]);
-
-              return result;
-          }
-
-          UntouchabilityChecker.prototype.isUntouchable = function isUntouchable(node) {
-            if (node === this.doc.documentElement) return false;
-            var computedStyle = this.doc.defaultView.getComputedStyle(node);
-            if (this.hasDisplayNone(node, computedStyle)) return true;
-            return computedStyle.visibility === 'hidden';
-          }
-
-          //module.exports = tabbable;
-
-         ////////////
-
-         var service = {
-            tabbable: tabbable,
-            isTabbable: isTabbable,
-            isFocusable: isFocusable
-         };
-
-         return service;
-    }
-
-    angular.module('umbraco.services').factory('tabbableService', tabbableService);
-
- })();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/templatehelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/templatehelper.service.js
deleted file mode 100644
index aa10d5bf2f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/templatehelper.service.js
+++ /dev/null
@@ -1,270 +0,0 @@
-(function() {
-   'use strict';
-
-   function templateHelperService(localizationService) {
-
-        //crappy hack due to dictionary items not in umbracoNode table
-        function getInsertDictionarySnippet(nodeName) {
-            return "@Umbraco.GetDictionaryValue(\"" + nodeName + "\")";
-        }
-
-        function getInsertPartialSnippet(parentId, nodeName) {
-
-            var partialViewName = nodeName.replace(".cshtml", "");
-
-            if(parentId) {
-                partialViewName = parentId + "/" + partialViewName;
-            }
-
-            return "@await Html.PartialAsync(\"" + partialViewName + "\")";
-        }
-
-        function getQuerySnippet(queryExpression) {
-            var code = "\n@{\n" + "\tvar selection = " + queryExpression + ";\n}\n";
-                code += "<ul>\n" +
-                            "\t@foreach (var item in selection)\n" +
-                            "\t{\n" +
-                                "\t\t<li>\n" +
-                                    "\t\t\t<a href=\"@item.Url()\">@item.Name()</a>\n" +
-                                "\t\t</li>\n" +
-                            "\t}\n" +
-                        "</ul>\n\n";
-            return code;
-        }
-
-        function getRenderBodySnippet() {
-            return "@RenderBody()";
-        }
-
-        function getRenderSectionSnippet(sectionName, mandatory) {
-            return "@RenderSection(\"" + sectionName + "\", " + mandatory + ")";
-        }
-
-        function getAddSectionSnippet(sectionName) {
-            return "@section " + sectionName + "\r\n{\r\n\r\n\t{0}\r\n\r\n}\r\n";
-        }
-
-        function getGeneralShortcuts(){
-            var keys = [
-                "shortcuts_generalHeader",
-                "buttons_undo",
-                "buttons_redo",
-                "buttons_save"
-            ];
-
-            return localizationService.localizeMany(keys).then(function(data){
-
-                var labels = {};
-                labels.header = data[0];
-                labels.undo = data[1];
-                labels.redo = data[2];
-                labels.save = data[3];
-
-                return {
-			        "name": labels.header,
-			        "shortcuts": [
-                        {
-                            "description": labels.undo,
-                            "keys": [{ "key": "ctrl" }, { "key": "z" }]
-                        },
-                        {
-                            "description": labels.redo,
-                            "keys": [{ "key": "ctrl" }, { "key": "y" }]
-                        },
-                        {
-                            "description": labels.save,
-                            "keys": [{ "key": "ctrl" }, { "key": "s" }]
-                        }
-			        ]
-			    };
-            });
-        }
-
-        function getEditorShortcuts(){
-
-            var keys = [
-                "shortcuts_editorHeader",
-                "shortcuts_commentLine",
-                "shortcuts_removeLine",
-                "shortcuts_copyLineUp",
-                "shortcuts_copyLineDown",
-                "shortcuts_moveLineUp",
-                "shortcuts_moveLineDown"
-            ];
-
-            return localizationService.localizeMany(keys).then(function(data){
-
-                var labels = {};
-                labels.header = data[0];
-                labels.commentline = data[1];
-                labels.removeline = data[2];
-                labels.copylineup = data[3];
-                labels.copylinedown = data[4];
-                labels.movelineup = data[5];
-                labels.movelinedown = data[6];
-
-                return {
-			        "name": labels.header,
-			        "shortcuts": [
-                        {
-                            "description":labels.commentline,
-                            "keys": [{ "key": "ctrl" }, { "key": "/" }]
-                        },
-                        {
-                            "description": labels.removeline,
-                            "keys": [{ "key": "ctrl" }, { "key": "d" }]
-                        },
-                        {
-                            "description": labels.copylineup,
-                            "keys": {
-                                "win": [{ "key": "alt" }, { "key": "shift" }, { "key": "up" }],
-                                "mac": [{ "key": "cmd" }, { "key": "alt" }, { "key": "up" }]
-                            }
-                        },
-                        {
-                            "description": labels.copylinedown,
-                            "keys": {
-                                "win": [{ "key": "alt" }, { "key": "shift" }, { "key": "down" }],
-                                "mac": [{ "key": "cmd" }, { "key": "alt" }, { "key": "down" }]
-                            }
-                        },
-                        {
-                            "description": labels.movelineup,
-                            "keys": [{ "key": "alt" }, { "key": "up" }]
-                        },
-                        {
-                            "description": labels.movelinedown,
-                            "keys": [{ "key": "alt" }, { "key": "down" }]
-                        }
-                    ]
-			    };
-            });
-        }
-
-        function getTemplateEditorShortcuts(){
-            var keys = [
-                "template_insert",
-                "template_insertPageField",
-                "template_insertPartialView",
-                "template_insertDictionaryItem",
-                "template_insertMacro",
-                "template_queryBuilder",
-                "template_insertSections",
-                "template_mastertemplate"
-            ];
-
-            return localizationService.localizeMany(keys).then(function(data){
-
-                var labels = {};
-                labels.insert = data[0];
-                labels.pagefield = data[1];
-                labels.partialview = data[2];
-                labels.dictionary = data[3];
-                labels.macro = data[4];
-                labels.querybuilder = data[5];
-                labels.sections = data[6];
-                labels.mastertemplate = data[7];
-
-                return {
-			        "name": "Umbraco", //No need to localise Umbraco is the same in all languages :)
-			        "shortcuts": [
-                        {
-                            "description": labels.insert.concat(' ', labels.pagefield),
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "v" }]
-                        },
-                        {
-                            "description": labels.insert.concat(' ', labels.partialview),
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }]
-                        },
-                        {
-                            "description": labels.insert.concat(' ', labels.dictionary),
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
-                        },
-                        {
-                            "description": labels.insert.concat(' ', labels.macro),
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "m" }]
-                        },
-                        {
-                            "description": labels.querybuilder,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "q" }]
-                        },
-                        {
-                            "description":  labels.insert.concat(' ', labels.sections),
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "s" }]
-                        },
-                        {
-                            "description": labels.mastertemplate,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
-                        }
-                    ]
-			    };
-            });
-        }
-
-        function getPartialViewEditorShortcuts(){
-            var keys = [
-                "template_insert",
-                "template_insertPageField",
-                "template_insertDictionaryItem",
-                "template_insertMacro",
-                "template_queryBuilder"
-            ];
-
-            return localizationService.localizeMany(keys).then(function(data){
-
-                var labels = {};
-                labels.insert = data[0];
-                labels.pagefield = data[1];
-                labels.dictionary = data[2];
-                labels.macro = data[3];
-                labels.querybuilder = data[4];
-
-                return {
-			        "name": "Umbraco", //No need to localise Umbraco is the same in all languages :)
-			        "shortcuts": [
-                        {
-                            "description": labels.insert.concat(' ', labels.pagefield),
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "v" }]
-                        },
-                        {
-                            "description": labels.insert.concat(' ', labels.dictionary),
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
-                        },
-                        {
-                            "description": labels.insert.concat(' ', labels.macro),
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "m" }]
-                        },
-                        {
-                            "description": labels.querybuilder,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "q" }]
-                        }
-                    ]
-			    };
-            });
-
-
-        }
-
-        ////////////
-
-        var service = {
-            getInsertDictionarySnippet: getInsertDictionarySnippet,
-            getInsertPartialSnippet: getInsertPartialSnippet,
-            getQuerySnippet: getQuerySnippet,
-            getRenderBodySnippet: getRenderBodySnippet,
-            getRenderSectionSnippet: getRenderSectionSnippet,
-            getAddSectionSnippet: getAddSectionSnippet,
-            getGeneralShortcuts: getGeneralShortcuts,
-            getEditorShortcuts: getEditorShortcuts,
-            getTemplateEditorShortcuts: getTemplateEditorShortcuts,
-            getPartialViewEditorShortcuts: getPartialViewEditorShortcuts
-        };
-
-        return service;
-
-   }
-
-   angular.module('umbraco.services').factory('templateHelper', templateHelperService);
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
deleted file mode 100644
index ebf759c20c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ /dev/null
@@ -1,1875 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.tinyMceService
- *
- *
- * @description
- * A service containing all logic for all of the Umbraco TinyMCE v6 plugins
- *
- * @doc https://www.tiny.cloud/docs/tinymce/6/
- */
-function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, stylesheetResource, macroResource, macroService,
-  $routeParams, umbRequestHelper, angularHelper, userService, editorService, entityResource, eventsService, localStorageService, mediaHelper, fileManager, $compile) {
-
-  //These are absolutely required in order for the macros to render inline
-  //we put these as extended elements because they get merged on top of the normal allowed elements by tiny mce
-  var extendedValidElements = "@[id|class|style],umb-rte-block[!data-content-udi],-umb-rte-block-inline[!data-content-udi],-div[id|dir|class|align|style],ins[datetime|cite],-ul[class|style],-li[class|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align],span[id|class|style|lang],figure,figcaption";
-  var fallbackStyles = [
-    {
-      title: 'Headers', items: [
-        { title: "Page header", block: "h2" },
-        { title: "Section header", block: "h3" },
-        { title: "Paragraph header", block: "h4" }
-      ]
-    },
-    {
-      title: 'Blocks', items: [
-        { title: "Normal", block: "p" }
-      ]
-    },
-    {
-      title: 'Containers', items: [
-        { title: "Quote", block: "blockquote" },
-        { title: "Code", block: "code" }
-      ]
-    }];
-  // these languages are available for localization
-  var availableLanguages = [
-    'ar',
-    'ar_SA',
-    'hy',
-    'az',
-    'eu',
-    'be',
-    'bn_BD',
-    'bs',
-    'bg_BG',
-    'ca',
-    'zh_CN',
-    'zh_TW',
-    'hr',
-    'cs',
-    'da',
-    'dv',
-    'nl',
-    'en_CA',
-    'en_GB',
-    'et',
-    'fo',
-    'fi',
-    'fr_FR',
-    'gd',
-    'gl',
-    'ka_GE',
-    'de',
-    'de_AT',
-    'el',
-    'he_IL',
-    'hi_IN',
-    'hu_HU',
-    'is_IS',
-    'id',
-    'it',
-    'ja',
-    'kab',
-    'kk',
-    'km_KH',
-    'ko_KR',
-    'ku',
-    'ku_IQ',
-    'lv',
-    'lt',
-    'lb',
-    'ml',
-    'ml_IN',
-    'mn_MN',
-    'nb_NO',
-    'fa',
-    'fa_IR',
-    'pl',
-    'pt_BR',
-    'pt_PT',
-    'ro',
-    'ru',
-    'sr',
-    'si_LK',
-    'sk',
-    'sl_SI',
-    'es',
-    'es_MX',
-    'sv_SE',
-    'tg',
-    'ta',
-    'ta_IN',
-    'tt',
-    'th_TH',
-    'tr',
-    'tr_TR',
-    'ug',
-    'uk',
-    'uk_UA',
-    'vi',
-    'vi_VN',
-    'cy'
-  ];
-  //define fallback language
-  var defaultLanguage = 'en_US';
-
-  /**
-   * Returns a promise of an object containing the stylesheets and styleFormats collections
-   * @param {any} configuredStylesheets
-   */
-  function getStyles(configuredStylesheets) {
-
-    var stylesheets = [];
-    var styleFormats = [];
-    var promises = [$q.when(true)]; //a collection of promises, the first one is an empty promise
-
-    //queue rules loading
-    if (configuredStylesheets?.length) {
-      configuredStylesheets.forEach(function (val, key) {
-
-        if (val.indexOf(Umbraco.Sys.ServerVariables.umbracoSettings.cssPath + "/") === 0) {
-          // current format (full path to stylesheet)
-          stylesheets.push(val);
-        }
-        else {
-          // legacy format (stylesheet name only) - must prefix with stylesheet folder and postfix with ".css"
-          stylesheets.push(Umbraco.Sys.ServerVariables.umbracoSettings.cssPath + "/" + val + ".css");
-        }
-
-        promises.push(stylesheetResource.getRulesByName(val).then(function (rules) {
-          var split;
-          rules.forEach(function (rule) {
-            var r = {};
-            r.title = rule.name;
-            if (rule.selector[0] == ".") {
-              r.inline = "span";
-              r.classes = rule.selector.substring(1);
-            }
-            else if (rule.selector[0] === "#") {
-              r.inline = "span";
-              r.attributes = { id: rule.selector.substring(1) };
-            }
-            else if (rule.selector[0] !== "." && rule.selector.indexOf(".") > -1) {
-              split = rule.selector.split(".");
-              r.block = split[0];
-              r.classes = rule.selector.substring(rule.selector.indexOf(".") + 1).replace(/\./g, " ");
-            }
-            else if (rule.selector[0] != "#" && rule.selector.indexOf("#") > -1) {
-              split = rule.selector.split("#");
-              r.block = split[0];
-              r.classes = rule.selector.substring(rule.selector.indexOf("#") + 1);
-            }
-            else {
-              r.block = rule.selector;
-            }
-
-            styleFormats.push(r);
-          });
-        }));
-      });
-    }
-
-    return $q.all(promises).then(function () {
-      // Always push our Umbraco RTE stylesheet
-      // So we can style macros, embed items etc...
-      stylesheets.push(`${Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath}/assets/css/rte-content.css`);
-
-      return $q.when({ stylesheets: stylesheets, styleFormats: styleFormats });
-    });
-  }
-
-  /** Returns the language to use for TinyMCE */
-  function getLanguage() {
-    var language = defaultLanguage;
-    //get locale from angular and match tinymce format. Angular localization is always in the format of ru-ru, de-de, en-gb, etc.
-    //wheras tinymce is in the format of ru, de, en, en_us, etc.
-    var localeId = $locale.id.replace('-', '_');
-    //try matching the language using full locale format
-    var languageMatch = _.find(availableLanguages, function (o) { return o.toLowerCase() === localeId; });
-    //if no matches, try matching using only the language
-    if (languageMatch === undefined) {
-      var localeParts = localeId.split('_');
-      languageMatch = _.find(availableLanguages, function (o) { return o === localeParts[0]; });
-    }
-    //if a match was found - set the language
-    if (languageMatch !== undefined) {
-      language = languageMatch;
-    }
-    return language;
-  }
-
-  function uploadImageHandler(blobInfo, progress) {
-    return new Promise(function (resolve, reject) {
-      const blob = blobInfo.blob();
-
-      // if the file size is greater than the max file size, reject it
-      if (fileManager.maxFileSize > 0 && blob.size > fileManager.maxFileSize) {
-        reject({
-          message: `The file size (${blob.size / 1000} KB) exceeded the maximum allowed size of ${fileManager.maxFileSize / 1000} KB.`,
-          remove: true
-        });
-        return;
-      }
-
-      const xhr = new XMLHttpRequest();
-      xhr.open('POST', Umbraco.Sys.ServerVariables.umbracoUrls.tinyMceApiBaseUrl + 'UploadImage');
-
-      xhr.onloadstart = function () {
-        angularHelper.safeApply($rootScope, function () {
-          eventsService.emit("rte.file.uploading");
-        });
-      };
-
-      xhr.onloadend = function (e) {
-        angularHelper.safeApply($rootScope, function () {
-          eventsService.emit("rte.file.uploaded");
-        });
-      };
-
-      xhr.upload.onprogress = function (e) {
-        progress(e.loaded / e.total * 100);
-      };
-
-      xhr.onerror = function () {
-        reject({
-          message: 'Image upload failed due to a XHR Transport error. Code: ' + xhr.status,
-          remove: true
-        });
-      };
-
-      xhr.onload = function () {
-        if (xhr.status < 200 || xhr.status >= 300) {
-          reject({
-            message: 'HTTP Error: ' + xhr.status,
-            remove: true
-          });
-          return;
-        }
-
-        let data = xhr.responseText;
-
-        // The response is fitted as an AngularJS resource response and needs to be cleaned of the AngularJS metadata
-        data = data.split("\n");
-
-        if (!data.length > 1) {
-          reject({
-            message: 'Unrecognized text string: ' + data,
-            remove: true
-          });
-          return;
-        }
-
-        let json = {};
-
-        try {
-          json = JSON.parse(data[1]);
-        } catch (e) {
-          reject({
-            message: 'Invalid JSON: ' + data + ' - ' + e.message,
-            remove: true
-          });
-          return;
-        }
-
-        if (!json || typeof json.tmpLocation !== 'string') {
-          reject({
-            message: 'Invalid JSON: ' + data,
-            remove: true
-          });
-          return;
-        }
-
-        // Put temp location into localstorage (used to update the img with data-tmpimg later on)
-        localStorageService.set(`tinymce__${blobInfo.blobUri()}`, json.tmpLocation);
-
-        // We set the img src url to be the same as we started
-        // The Blob URI is stored in TinyMce's cache
-        // so the img still shows in the editor
-        resolve(blobInfo.blobUri());
-      };
-
-      const formData = new FormData();
-      formData.append('file', blob, blob.name);
-
-      xhr.send(formData);
-    });
-  }
-
-  function cleanupPasteData(_editor, args) {
-    // Remove spans
-    args.content = args.content.replace(/<\s*span[^>]*>(.*?)<\s*\/\s*span>/g, "$1");
-
-    // Convert b to strong.
-    args.content = args.content.replace(/<\s*b([^>]*)>(.*?)<\s*\/\s*b([^>]*)>/g, "<strong$1>$2</strong$3>");
-
-    // convert i to em
-    args.content = args.content.replace(/<\s*i([^>]*)>(.*?)<\s*\/\s*i([^>]*)>/g, "<em$1>$2</em$3>");
-
-
-  }
-
-  function sizeImageInEditor(editor, imageDomElement, imgUrl) {
-    var size = editor.dom.getSize(imageDomElement);
-    var maxImageSize = editor.options.get('maxImageSize');
-
-    if (maxImageSize && maxImageSize > 0) {
-      var newSize = imageHelper.scaleToMaxSize(maxImageSize, size.w, size.h);
-
-      editor.dom.setAttribs(imageDomElement, { 'width': Math.round(newSize.width), 'height': Math.round(newSize.height) });
-
-      // Images inserted via Media Picker will have a URL we can use for ImageResizer QueryStrings
-      // Images pasted/dragged in are not persisted to media until saved & thus will need to be added
-      if (imgUrl) {
-        mediaHelper.getProcessedImageUrl(imgUrl,
-          {
-            width: newSize.width,
-            height: newSize.height
-          })
-          .then(function (resizedImgUrl) {
-            editor.dom.setAttrib(imageDomElement, 'data-mce-src', resizedImgUrl);
-          });
-      }
-
-      editor.execCommand("mceAutoResize", false, null, null);
-    }
-  }
-
-  function isMediaPickerEnabled(toolbarItemArray) {
-    return toolbarItemArray.includes('umbmediapicker');
-  }
-
-  return {
-
-    /**
-     * Returns a promise of the configuration object to initialize the TinyMCE editor
-     * @param {} args
-     * @returns {}
-     */
-    getTinyMceEditorConfig: function (args) {
-
-      //global defaults, called before/during init
-      tinymce.DOM.events.domLoaded = true;
-      tinymce.baseURL = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + "/lib/tinymce/"; // trailing slash important
-
-      var promises = [
-        this.configuration(),
-        getStyles(args.stylesheets)
-      ];
-
-      return $q.all(promises).then(function (result) {
-
-        var tinyMceConfig = result[0];
-        var styles = result[1];
-
-        var plugins = _.map(tinyMceConfig.plugins, function (plugin) {
-          return plugin.name;
-        });
-
-        // Plugins that must always be active
-        plugins.push("autoresize");
-
-        var modeInline = false;
-        var toolbarActions = args.toolbar.join(" ");
-        var toolbar = toolbarActions;
-        var quickbar = toolbarActions;
-
-        // Based on mode set
-        // classic = Theme: modern, inline: false
-        // inline = Theme: modern, inline: true,
-        // distraction-free = Same as inline - kept for legacy reasons due to older versions of Umbraco having this as a mode
-        if (args.mode === "inline" || args.mode === 'distraction-free') {
-          modeInline = true;
-          toolbar = false;
-          plugins.push('quickbars');
-        }
-
-        //create a baseline Config to extend upon
-        var config = {
-          cloudApiKey: tinyMceConfig.cloudApiKey,
-          promotion: false,
-          inline: modeInline,
-          plugins: [...new Set(plugins)],
-          custom_elements: 'umb-rte-block,~umb-rte-block-inline',
-          valid_elements: tinyMceConfig.validElements,
-          invalid_elements: tinyMceConfig.inValidElements,
-          extended_valid_elements: extendedValidElements,
-          menubar: false,
-          statusbar: false,
-          relative_urls: false,
-          autoresize_bottom_margin: 10,
-          content_css: styles.stylesheets,
-          style_formats: styles.styleFormats,
-          language: getLanguage(),
-
-          //this would be for a theme other than inlite
-          toolbar: toolbar,
-          quickbars_insert_toolbar: quickbar,
-          quickbars_selection_toolbar: quickbar,
-
-          body_class: "umb-rte",
-
-          //see https://www.tiny.cloud/docs/tinymce/6/editor-important-options/#cache_suffix
-          cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster
-        };
-
-        // Need to check if we are allowed to UPLOAD images
-        // This is done by checking if the insert image toolbar button is available
-        if (isMediaPickerEnabled(args.toolbar)) {
-          // Update the TinyMCE Config object to allow pasting
-          config.images_upload_handler = uploadImageHandler;
-          config.automatic_uploads = false;
-          config.images_replace_blob_uris = false;
-
-          // This allows images to be pasted in & stored as Base64 until they get uploaded to server
-          config.paste_data_images = true;
-        }
-
-
-        if (args.htmlId) {
-          config.selector = `[id="${args.htmlId}"]`;
-        } else if (args.target) {
-          config.target = args.target;
-        }
-
-        /**
-         The default paste config can be overwritten by defining these properties in the customConfig.
-         */
-        var pasteConfig = {
-          paste_remove_styles_if_webkit: true,
-          paste_preprocess: cleanupPasteData
-        };
-
-        Utilities.extend(config, pasteConfig);
-
-        if (tinyMceConfig.customConfig) {
-
-          //if there is some custom config, we need to see if the string value of each item might actually be json and if so, we need to
-          // convert it to json instead of having it as a string since this is what tinymce requires
-          for (var i in tinyMceConfig.customConfig) {
-            var val = tinyMceConfig.customConfig[i];
-            if (val) {
-              val = val.toString().trim();
-              if (val.detectIsJson()) {
-                try {
-                  tinyMceConfig.customConfig[i] = JSON.parse(val);
-                  //now we need to check if this custom config key is defined in our baseline, if it is we don't want to
-                  //overwrite the baseline config item if it is an array, we want to concat the items in the array, otherwise
-                  //if it's an object it will overwrite the baseline
-                  if (Utilities.isArray(config[i]) && Utilities.isArray(tinyMceConfig.customConfig[i])) {
-                    //concat it and below this concat'd array will overwrite the baseline in Utilities.extend
-                    tinyMceConfig.customConfig[i] = config[i].concat(tinyMceConfig.customConfig[i]);
-                  }
-                }
-                catch (e) {
-                  //cannot parse, we'll just leave it
-                }
-              }
-              if (val === "true") {
-                tinyMceConfig.customConfig[i] = true;
-              }
-              if (val === "false") {
-                tinyMceConfig.customConfig[i] = false;
-              }
-            }
-          }
-
-          // if we have style_formats at this point they originate from the RTE CSS config. we don't want any custom
-          // style_formats to interfere with the RTE CSS config, so let's explicitly remove the custom style_formats.
-          if(tinyMceConfig.customConfig.style_formats && config.style_formats && config.style_formats.length){
-            delete tinyMceConfig.customConfig.style_formats;
-          }
-
-          Utilities.extend(config, tinyMceConfig.customConfig);
-        }
-
-        if(!config.style_formats || !config.style_formats.length) {
-          // if we have no style_formats at this point we'll revert to using the default ones (fallbackStyles)
-          config.style_formats = fallbackStyles;
-        }
-
-        return config;
-
-      });
-
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.tinyMceService#configuration
-     * @methodOf umbraco.services.tinyMceService
-     *
-     * @description
-     * Returns a collection of plugins available to the tinyMCE editor
-     *
-     */
-    configuration: function () {
-      return umbRequestHelper.resourcePromise(
-        $http.get(
-          umbRequestHelper.getApiUrl(
-            "rteApiBaseUrl",
-            "GetConfiguration"), {
-          cache: true
-        }),
-        'Failed to retrieve tinymce configuration');
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.tinyMceService#defaultPrevalues
-     * @methodOf umbraco.services.tinyMceService
-     *
-     * @description
-     * Returns a default configration to fallback on in case none is provided
-     *
-     */
-    defaultPrevalues: function () {
-      var cfg = {};
-      cfg.toolbar = ["ace", "styles", "bold", "italic", "alignleft", "aligncenter", "alignright", "bullist", "numlist", "outdent", "indent", "link", "umbmediapicker", "umbmacro", "umbembeddialog"];
-      cfg.stylesheets = [];
-      cfg.maxImageSize = 500;
-      return cfg;
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.tinyMceService#createInsertEmbeddedMedia
-     * @methodOf umbraco.services.tinyMceService
-     *
-     * @description
-     * Creates the umbraco insert embedded media tinymce plugin
-     *
-     * @param {Object} editor the TinyMCE editor instance
-     */
-    createInsertEmbeddedMedia: function (editor, callback) {
-      editor.ui.registry.addToggleButton('umbembeddialog', {
-        icon: 'embed',
-        tooltip: 'Embed',
-        onSetup: function (api) {
-          const changed = editor.selection.selectorChangedWithUnbind('div[data-embed-url]', (state) =>
-            api.setActive(state)
-          );
-          return () => changed.unbind();
-        },
-        onAction: function () {
-
-          // Get the selected element
-          // Check nodename is a DIV and the claslist contains 'embeditem'
-          var selectedElm = editor.selection.getNode();
-          var nodeName = selectedElm.nodeName;
-          var modify = null;
-
-          // If we have an iframe, we need to get the parent element
-          if (nodeName.toUpperCase() === "IFRAME") {
-            selectedElm = selectedElm.parentElement;
-            nodeName = selectedElm.nodeName;
-          }
-
-          if (nodeName.toUpperCase() === "DIV" && selectedElm.classList.contains("embeditem")) {
-            // See if we can go and get the attributes
-            var embedUrl = editor.dom.getAttrib(selectedElm, "data-embed-url");
-            var embedWidth = editor.dom.getAttrib(selectedElm, "data-embed-width");
-            var embedHeight = editor.dom.getAttrib(selectedElm, "data-embed-height");
-            var embedConstrain = editor.dom.getAttrib(selectedElm, "data-embed-constrain");
-
-            modify = {
-              url: embedUrl,
-              width: parseInt(embedWidth) || 0,
-              height: parseInt(embedHeight) || 0,
-              constrain: embedConstrain
-            };
-          }
-
-          if (callback) {
-            angularHelper.safeApply($rootScope, function () {
-              // pass the active element along so we can retrieve it later
-              callback(selectedElm, modify);
-            });
-          }
-        }
-      });
-    },
-
-    insertEmbeddedMediaInEditor: function (editor, embed, activeElement) {
-      // Wrap HTML preview content here in a DIV with non-editable class of .mceNonEditable
-      // This turns it into a selectable/cutable block to move about
-      var wrapper = tinymce.activeEditor.dom.create('div',
-        {
-          'class': 'mceNonEditable embeditem',
-          'data-embed-url': embed.url,
-          'data-embed-height': embed.height,
-          'data-embed-width': embed.width,
-          'data-embed-constrain': embed.constrain,
-          'contenteditable': false
-        },
-        embed.preview);
-
-      // Only replace if activeElement is an Embed element.
-      if (activeElement && activeElement.nodeName.toUpperCase() === "DIV" && activeElement.classList.contains("embeditem")) {
-        activeElement.replaceWith(wrapper); // directly replaces the html node
-      } else {
-        editor.selection.setNode(wrapper);
-      }
-    },
-
-
-    createAceCodeEditor: function (editor, callback) {
-
-      editor.ui.registry.addButton("ace", {
-        icon: "sourcecode",
-        tooltip: "View Source Code",
-        onAction: function () {
-          if (callback) {
-            angularHelper.safeApply($rootScope, function () {
-              callback();
-            });
-          }
-        }
-      });
-
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.tinyMceService#createMediaPicker
-     * @methodOf umbraco.services.tinyMceService
-     *
-     * @description
-     * Creates the umbraco insert media tinymce plugin
-     *
-     * @param {Object} editor the TinyMCE editor instance
-     */
-    createMediaPicker: function (editor, callback) {
-      editor.ui.registry.addToggleButton('umbmediapicker', {
-        icon: 'image',
-        tooltip: 'Image Picker',
-        onSetup: function (api) {
-          const changed = editor.selection.selectorChangedWithUnbind('img[data-udi]', (state) =>
-            api.setActive(state)
-          );
-          return () => changed.unbind();
-        },
-        onAction: function () {
-
-          var selectedElm = editor.selection.getNode(),
-            currentTarget;
-
-          if (selectedElm.nodeName === 'IMG') {
-            var img = $(selectedElm);
-
-            var hasUdi = img.attr("data-udi") ? true : false;
-            var hasDataTmpImg = img.attr("data-tmpimg") ? true : false;
-
-            currentTarget = {
-              altText: img.attr("alt"),
-              url: img.attr("src"),
-              caption: img.attr('data-caption')
-            };
-
-            if (hasUdi) {
-              currentTarget["udi"] = img.attr("data-udi");
-            } else {
-              currentTarget["id"] = img.attr("rel");
-            }
-
-            if (hasDataTmpImg) {
-              currentTarget["tmpimg"] = img.attr("data-tmpimg");
-            }
-          }
-
-          userService.getCurrentUser().then(function (userData) {
-            if (callback) {
-              angularHelper.safeApply($rootScope, function () {
-                callback(currentTarget, userData);
-              });
-            }
-          });
-        }
-      });
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.tinyMceService#insetMediaInEditor
-     * @methodOf umbraco.services.tinyMceService
-     *
-     * @description
-     * Inserts the image element in tinymce plugin
-     *
-     * @param {Object} editor the TinyMCE editor instance
-     */
-    insertMediaInEditor: function (editor, img) {
-      if (img) {
-        // We need to create a NEW DOM <img> element to insert
-        // setting an attribute of ID to __mcenew, so we can gather a reference to the node, to be able to update its size accordingly to the size of the image.
-        var data = {
-          alt: img.altText || "",
-          src: (img.url) ? img.url : "nothing.jpg",
-          id: "__mcenew",
-          "data-udi": img.udi,
-          "data-caption": img.caption
-        };
-        var newImage = editor.dom.createHTML('img', data);
-        var parentElement = editor.selection.getNode().parentElement;
-
-        if (img.caption) {
-          var figCaption = editor.dom.createHTML('figcaption', {}, img.caption);
-          var combined = newImage + figCaption;
-
-          if (parentElement.nodeName !== 'FIGURE') {
-            var fragment = editor.dom.createHTML('figure', {}, combined);
-            editor.selection.setContent(fragment);
-          }
-          else {
-            parentElement.innerHTML = combined;
-          }
-        }
-        else {
-          //if caption is removed, remove the figure element
-          if (parentElement.nodeName === 'FIGURE') {
-            parentElement.parentElement.innerHTML = newImage;
-          }
-          else {
-            editor.selection.setContent(newImage);
-          }
-        }
-
-        // Using settimeout to wait for a DoM-render, so we can find the new element by ID.
-        $timeout(function () {
-
-          var imgElm = editor.dom.get("__mcenew");
-          editor.dom.setAttrib(imgElm, "id", null);
-
-          // When image is loaded we are ready to call sizeImageInEditor.
-          var onImageLoaded = function () {
-            sizeImageInEditor(editor, imgElm, img.url);
-            editor.dispatch("Change");
-          }
-
-          // Check if image already is loaded.
-          if (imgElm.complete === true) {
-            onImageLoaded();
-          } else {
-            imgElm.onload = onImageLoaded;
-          }
-
-        });
-
-      }
-    },
-
-
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.tinyMceService#createBlockPicker
-     * @methodOf umbraco.services.tinyMceService
-     *
-     * @description
-     * Creates the umbraco insert block tinymce plugin
-     *
-     * @param {Object} editor the TinyMCE editor instance
-     */
-    createBlockPicker: function (editor, blockEditorApi, callback) {
-
-      editor.on('preInit', function (args) {
-        editor.serializer.addRules('umb-rte-block');
-
-        /** This checks if the div is a block element*/
-        editor.serializer.addNodeFilter('umb-rte-block', function (nodes, name) {
-          for (var i = 0; i < nodes.length; i++) {
-
-            const blockEl = nodes[i];
-            /*
-            const block = blockEditorApi.getBlockByContentUdi(blockEl.attr("data-content-udi"));
-            if(block) {
-              const displayAsBlock = block.config.displayInline !== true;
-              */
-
-              /* if the block is set to display inline, checks if its wrapped in a p tag and then unwraps it (removes p tag) */
-              if (blockEl.parent && blockEl.parent.name.toUpperCase() === "P") {
-                blockEl.parent.unwrap();
-              }
-            //}
-
-          }
-        });
-      });
-
-      // Do not add any further controls if the block editor is not available
-      if (!blockEditorApi) {
-        return;
-      }
-
-      editor.ui.registry.addToggleButton('umbblockpicker', {
-        icon: 'visualblocks',
-        tooltip: 'Insert Block',
-        onSetup: function (api) {
-          const changed = editor.selection.selectorChangedWithUnbind('umb-rte-block[data-content-udi], umb-rte-block-inline[data-content-udi]', (state) =>
-            api.setActive(state)
-          );
-          return () => changed.unbind();
-        },
-        onAction: function () {
-
-          var blockEl = editor.selection.getNode();
-          var blockUdi;
-
-          if (blockEl.nodeName === 'UMB-RTE-BLOCK' || blockEl.nodeName === 'UMB-RTE-BLOCK-INLINE') {
-            blockUdi = blockEl.getAttribute("data-content-udi") ?? undefined;
-          }
-
-          if (callback) {
-            angularHelper.safeApply($rootScope, function () {
-              callback(blockUdi);
-            });
-          }
-        }
-      });
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.tinyMceService#insetBlockInEditor
-     * @methodOf umbraco.services.tinyMceService
-     *
-     * @description
-     * Inserts the block element in tinymce plugin
-     *
-     * @param {Object} blockUdi UDI of Block to insert
-     */
-    insertBlockInEditor: function (editor, blockContentUdi, displayInline) {
-      if (blockContentUdi) {
-        if(displayInline) {
-          editor.selection.setContent('<umb-rte-block-inline data-content-udi="'+blockContentUdi+'"><!--Umbraco-Block--></umb-rte-block-inline>');
-        } else {
-          editor.selection.setContent('<umb-rte-block data-content-udi="'+blockContentUdi+'"><!--Umbraco-Block--></umb-rte-block>');
-        }
-
-        angularHelper.safeApply($rootScope, function () {
-          editor.dispatch("Change");
-        });
-
-      }
-    },
-
-    /**
-     * @ngdoc method
-     * @name umbraco.services.tinyMceService#createUmbracoMacro
-     * @methodOf umbraco.services.tinyMceService
-     *
-     * @description
-     * Creates the insert umbraco macro tinymce plugin
-     *
-     * @param {Object} editor the TinyMCE editor instance
-     */
-    createInsertMacro: function (editor, callback) {
-
-      let self = this;
-
-      /** Adds custom rules for the macro plugin and custom serialization */
-      editor.on('preInit', function (args) {
-        //this is requires so that we tell the serializer that a 'div' is actually allowed in the root, otherwise the cleanup will strip it out
-        editor.serializer.addRules('div');
-
-        /** This checks if the div is a macro container, if so, checks if its wrapped in a p tag and then unwraps it (removes p tag) */
-        editor.serializer.addNodeFilter('div', function (nodes, name) {
-          for (var i = 0; i < nodes.length; i++) {
-            if (nodes[i].attr("class") === "umb-macro-holder" && nodes[i].parent && nodes[i].parent.name.toUpperCase() === "P") {
-              nodes[i].parent.unwrap();
-            }
-          }
-        });
-
-      });
-
-      /** when the contents load we need to find any macros declared and load in their content */
-      editor.on("SetContent", function () {
-
-        //get all macro divs and load their content
-        $(editor.dom.select(".umb-macro-holder.mceNonEditable")).each(function () {
-          self.loadMacroContent($(this), null, editor);
-        });
-
-      });
-
-      /**
-       * Because the macro got wrapped in a P tag because of the way 'enter' works in older versions of Umbraco, this
-       * method will return the macro element if not wrapped in a p, or the p if the macro
-       * element is the only one inside of it even if we are deep inside an element inside the macro
-       */
-      function getRealMacroElem() {
-        // Ask the editor for the currently selected element
-        const element = editor.selection.getNode();
-        if (!element) {
-          return null;
-        }
-
-        var e = $(element).closest(".umb-macro-holder");
-
-        if (e.length > 0) {
-          var macroHolder = e.get(0);
-          // In case of Inline Macro we don't need the be backward compliant
-          if(macroHolder.tagName === 'SPAN'){
-            return macroHolder;
-          }
-          if (macroHolder.parentNode.nodeName === "P") {
-            //now check if we're the only element
-            if (element.parentNode.childNodes.length === 1) {
-              return macroHolder.parentNode;
-            }
-          }
-          return macroHolder;
-        }
-        return null;
-      }
-
-      /** Adds the button instance */
-      editor.ui.registry.addToggleButton('umbmacro', {
-        icon: 'preferences',
-        tooltip: 'Insert macro',
-        onSetup: function (api) {
-          const changed = editor.selection.selectorChangedWithUnbind('div.umb-macro-holder', (state) =>
-            api.setActive(state)
-          );
-          return () => changed.unbind();
-        },
-
-        /** The insert macro button click event handler */
-        onAction: function () {
-          var dialogData = {
-            //flag for use in rte so we only show macros flagged for the editor
-            richTextEditor: true
-          };
-
-          //when we click we could have a macro already selected and in that case we'll want to edit the current parameters
-          //so we'll need to extract them and submit them to the dialog.
-          const activeMacroElement = getRealMacroElem();
-          if (activeMacroElement) {
-            //we have a macro selected so we'll need to parse it's alias and parameters
-            var contents = $(activeMacroElement).contents();
-            var comment = _.find(contents, function (item) {
-              return item.nodeType === 8;
-            });
-            if (!comment) {
-              throw "Cannot parse the current macro, the syntax in the editor is invalid";
-            }
-            var syntax = comment.textContent.trim();
-            var parsed = macroService.parseMacroSyntax(syntax);
-            dialogData = {
-              macroData: parsed,
-              activeMacroElement //pass the active element along so we can retrieve it later
-            };
-          }
-
-          if (callback) {
-            angularHelper.safeApply($rootScope, function () {
-              callback(dialogData);
-            });
-          }
-        }
-      });
-    },
-
-    insertMacroInEditor: function (editor, macroObject, activeMacroElement) {
-
-      //Important note: the TinyMce plugin "noneditable" is used here so that the macro cannot be edited,
-      // for this to work the mceNonEditable class needs to come last and we also need to use the attribute contenteditable = false
-      // (even though all the docs and examples say that is not necessary)
-
-      //put the macro syntax in comments, we will parse this out on the server side to be used
-      //for persisting.
-      var macroSyntaxComment = "<!-- " + macroObject.syntax + " -->";
-      //create an id class for this element so we can re-select it after inserting
-      var uniqueId = "umb-macro-" + editor.dom.uniqueId();
-      var isInlined = macroObject.macroParamsDictionary["enableInlineMacro"] === "1";
-      var macroElementType = isInlined ? 'span' : 'div';
-      var macroElement = editor.dom.create(macroElementType,
-        {
-          'class': 'umb-macro-holder ' + macroObject.macroAlias + " " + uniqueId + ' mceNonEditable' + (isInlined ? ' inlined-macro' : ''),
-          'contenteditable': 'false'
-        },
-        macroSyntaxComment + '<ins>Macro alias: <strong>' + macroObject.macroAlias + '</strong></ins>');
-
-      //if there's an activeMacroElement then replace it, otherwise set the contents of the selected node
-      if (activeMacroElement) {
-        activeMacroElement.replaceWith(macroElement); //directly replaces the html node
-      }
-      else {
-        editor.selection.setNode(macroElement);
-      }
-
-      var $macroElement = $(editor.dom.select(".umb-macro-holder." + uniqueId));
-      editor.setDirty(true);
-
-      //async load the macro content
-      this.loadMacroContent($macroElement, macroObject, editor);
-
-    },
-
-    /** loads in the macro content async from the server */
-    loadMacroContent: function ($macroElement, macroData, editor) {
-
-      //if we don't have the macroData, then we'll need to parse it from the macro div
-      if (!macroData) {
-        var contents = $macroElement.contents();
-        var comment = _.find(contents, function (item) {
-          return item.nodeType === 8;
-        });
-        if (!comment) {
-          throw "Cannot parse the current macro, the syntax in the editor is invalid";
-        }
-        var syntax = comment.textContent.trim();
-        var parsed = macroService.parseMacroSyntax(syntax);
-        macroData = parsed;
-      }
-
-      var $ins = $macroElement.find("ins");
-
-      //show the throbber
-      $macroElement.addClass("loading");
-
-      // Add the contenteditable="false" attribute
-      // As just the CSS class of .mceNonEditable is not working by itself?!
-      // TODO: At later date - use TinyMCE editor DOM manipulation as opposed to jQuery
-      $macroElement.attr("contenteditable", "false");
-
-      var contentId = $routeParams.id;
-
-      //need to wrap in safe apply since this might be occuring outside of angular
-      angularHelper.safeApply($rootScope, function () {
-        macroResource.getMacroResultAsHtmlForEditor(macroData.macroAlias, contentId, macroData.macroParamsDictionary)
-          .then(function (htmlResult) {
-
-            $macroElement.removeClass("loading");
-            htmlResult = htmlResult.trim();
-            if (htmlResult !== "") {
-              var wasDirty = editor.isDirty();
-              $ins.html(htmlResult);
-              if (!wasDirty) {
-                editor.undoManager.clear();
-              }
-            }
-          });
-      });
-
-    },
-
-    createLinkPicker: function (editor, onClick) {
-
-      function createLinkList(callback) {
-        return function () {
-          var linkList = editor.options.get('link_list');
-
-          if (linkList && typeof linkList === "string") {
-            fetch(linkList).then(function (response) {
-              callback(response.json());
-            }).catch(function (error) {
-              console.log(error);
-            });
-          } else {
-            callback(linkList);
-          }
-        };
-      }
-
-      function showDialog(linkList) {
-        var data = {},
-          selection = editor.selection,
-          dom = editor.dom,
-          selectedElm, anchorElm, initialText;
-        var win, linkListCtrl, relListCtrl, targetListCtrl;
-
-        function linkListChangeHandler(e) {
-          var textCtrl = win.find('#text');
-
-          if (!textCtrl.value() || (e.lastControl && textCtrl.value() === e.lastControl.text())) {
-            textCtrl.value(e.control.text());
-          }
-
-          win.find('#href').value(e.control.value());
-        }
-
-        function buildLinkList() {
-          var linkListItems = [{
-            text: 'None',
-            value: ''
-          }];
-
-          tinymce.each(linkList, function (link) {
-            linkListItems.push({
-              text: link.text || link.title,
-              value: link.value || link.url,
-              menu: link.menu
-            });
-          });
-
-          return linkListItems;
-        }
-
-        function buildRelList(relValue) {
-          var relListItems = [{
-            text: 'None',
-            value: ''
-          }];
-
-          var linkRelList = editor.options.get('link_rel_list');
-          if (linkRelList) {
-            tinymce.each(linkRelList, function (rel) {
-              relListItems.push({
-                text: rel.text || rel.title,
-                value: rel.value,
-                selected: relValue === rel.value
-              });
-            });
-          }
-
-          return relListItems;
-        }
-
-        function buildTargetList(targetValue) {
-          var targetListItems = [{
-            text: 'None',
-            value: ''
-          }];
-
-          var linkList = editor.options.get('link_list');
-          if (linkList) {
-            tinymce.each(linkList, function (target) {
-              targetListItems.push({
-                text: target.text || target.title,
-                value: target.value,
-                selected: targetValue === target.value
-              });
-            });
-          } else {
-            targetListItems.push({
-              text: 'New window',
-              value: '_blank'
-            });
-          }
-
-          return targetListItems;
-        }
-
-        selectedElm = selection.getNode();
-        anchorElm = dom.getParent(selectedElm, 'a[href]');
-
-        data.text = initialText = anchorElm ? (anchorElm.innerText || anchorElm.textContent) : selection.getContent({
-          format: 'text'
-        });
-        data.href = anchorElm ? dom.getAttrib(anchorElm, 'href') : '';
-        data.target = anchorElm ? dom.getAttrib(anchorElm, 'target') : '';
-        data.rel = anchorElm ? dom.getAttrib(anchorElm, 'rel') : '';
-
-        if (selectedElm.nodeName === "IMG") {
-          data.text = initialText = " ";
-        }
-
-        if (linkList) {
-          linkListCtrl = {
-            type: 'listbox',
-            label: 'Link list',
-            values: buildLinkList(),
-            onselect: linkListChangeHandler
-          };
-        }
-
-        var optionsLinkList = editor.options.get('link_list');
-        if (optionsLinkList !== false) {
-          targetListCtrl = {
-            name: 'target',
-            type: 'listbox',
-            label: 'Target',
-            values: buildTargetList(data.target)
-          };
-        }
-
-        var linkRelList = editor.options.get('link_rel_list');
-        if (linkRelList) {
-          relListCtrl = {
-            name: 'rel',
-            type: 'listbox',
-            label: 'Rel',
-            values: buildRelList(data.rel)
-          };
-        }
-
-        var currentTarget = null;
-
-        //if we already have a link selected, we want to pass that data over to the dialog
-        if (anchorElm) {
-          var anchor = $(anchorElm);
-          currentTarget = {
-            name: anchor.attr("title"),
-            url: anchor.attr("href"),
-            target: anchor.attr("target")
-          };
-
-          // drop the lead char from the anchor text, if it has a value
-          var anchorVal = anchor[0].dataset.anchor;
-          if (anchorVal) {
-            currentTarget.anchor = anchorVal.substring(1);
-          }
-
-          //locallink detection, we do this here, to avoid poluting the editorService
-          //so the editor service can just expect to get a node-like structure
-          if (currentTarget.url.indexOf("localLink:") > 0) {
-            // if the current link has an anchor, it needs to be considered when getting the udi/id
-            // if an anchor exists, reduce the substring max by its length plus two to offset the removed prefix and trailing curly brace
-            var linkId = currentTarget.url.substring(currentTarget.url.indexOf(":") + 1, currentTarget.url.indexOf("}"));
-
-            //we need to check if this is an INT or a UDI
-            var parsedIntId = parseInt(linkId, 10);
-            if (isNaN(parsedIntId)) {
-              //it's a UDI
-              currentTarget.udi = linkId;
-            } else {
-              currentTarget.id = linkId;
-            }
-          }
-        }
-
-        angularHelper.safeApply($rootScope,
-          function () {
-            if (onClick) {
-              onClick(currentTarget, anchorElm);
-            }
-          });
-      }
-
-      editor.ui.registry.addToggleButton('link', {
-        icon: 'link',
-        tooltip: 'Insert/edit link',
-        shortcut: 'Ctrl+K',
-        onAction: createLinkList(showDialog),
-        onSetup: function (api) {
-          const changed = editor.selection.selectorChangedWithUnbind('a[href]', (state) =>
-            api.setActive(state)
-          );
-          return () => changed.unbind();
-        }
-      });
-
-      editor.ui.registry.addToggleButton('unlink', {
-        icon: 'unlink',
-        tooltip: 'Remove link',
-        onAction: () => {
-          editor.execCommand('unlink');
-        },
-        onSetup: function (api) {
-          const changed = editor.selection.selectorChangedWithUnbind('a[href]', (state) =>
-            api.setActive(state)
-          );
-          return () => changed.unbind();
-        }
-      });
-
-      editor.addShortcut('Ctrl+K', '', createLinkList(showDialog));
-      this.showDialog = showDialog;
-
-      editor.ui.registry.addToggleMenuItem('link', {
-        icon: 'link',
-        text: 'Insert link',
-        shortcut: 'Ctrl+K',
-        onAction: createLinkList(showDialog),
-        onSetup: function (api) {
-          const changed = editor.selection.selectorChangedWithUnbind('a[href]', (state) =>
-            api.setActive(state)
-          );
-          return () => changed.unbind();
-        },
-        context: 'insert',
-        prependToContext: true
-      });
-
-      // the editor frame catches Ctrl+S and handles it with the system save dialog
-      // - we want to handle it in the content controller, so we'll emit an event instead
-      editor.addShortcut('Ctrl+S', '', function () {
-        angularHelper.safeApply($rootScope, function () {
-          eventsService.emit("rte.shortcut.save");
-        });
-      });
-
-      editor.addShortcut('Ctrl+P', '', function () {
-        angularHelper.safeApply($rootScope, function () {
-          eventsService.emit("rte.shortcut.saveAndPublish");
-        });
-      });
-
-    },
-
-    insertLinkInEditor: function (editor, target, anchorElm) {
-
-      var href = target.url;
-      // We want to use the Udi. If it is set, we use it, else fallback to id, and finally to null
-      var hasUdi = target.udi ? true : false;
-      var id = hasUdi ? target.udi : (target.id ? target.id : null);
-
-      // if an anchor exists, check that it is appropriately prefixed
-      if (target.anchor && target.anchor[0] !== '?' && target.anchor[0] !== '#') {
-        target.anchor = (target.anchor.indexOf('=') === -1 ? '#' : '?') + target.anchor;
-      }
-
-      // the href might be an external url, so check the value for an anchor/qs
-      // href has the anchor re-appended later, hence the reset here to avoid duplicating the anchor
-      if (!target.anchor && href) {
-        var urlParts = href.split(/(#|\?)/);
-        if (urlParts.length === 3) {
-          href = urlParts[0];
-          target.anchor = urlParts[1] + urlParts[2];
-        }
-      }
-
-      //Create a json obj used to create the attributes for the tag
-      function createElemAttributes() {
-        var a = {
-          href: href,
-          title: target.name,
-          target: target.target ? target.target : null,
-          rel: target.rel ? target.rel : null
-        };
-
-        if (target.anchor) {
-          a["data-anchor"] = target.anchor;
-          a.href = a.href + target.anchor;
-        } else {
-          a["data-anchor"] = null;
-        }
-
-        return a;
-      }
-
-      function insertLink() {
-        if (anchorElm) {
-          editor.dom.setAttribs(anchorElm, createElemAttributes());
-          editor.selection.select(anchorElm);
-          editor.execCommand('mceEndTyping');
-        } else {
-          var selectedContent = editor.selection.getContent();
-          // If there is no selected content, we can't insert a link
-          // as TinyMCE needs selected content for this, so instead we
-          // create a new dom element and insert it, using the chosen
-          // link name as the content.
-          if (selectedContent !== "") {
-            editor.execCommand('mceInsertLink', false, createElemAttributes());
-          } else {
-            // Using the target url as a fallback, as href might be confusing with a local link
-            var linkContent = typeof target.name !== "undefined" && target.name !== "" ? target.name : target.url
-            var domElement = editor.dom.createHTML("a", createElemAttributes(), linkContent);
-            editor.execCommand('mceInsertContent', false, domElement);
-          }
-        }
-      }
-
-      if (!href && !target.anchor) {
-        editor.execCommand('unlink');
-        return;
-      }
-
-      //if we have an id, it must be a locallink:id
-      if (id) {
-
-        href = "/{localLink:" + id + "}";
-
-        insertLink();
-        return;
-      }
-
-      if (!href) {
-        href = "";
-      }
-
-      // Is email and not //user@domain.com and protocol (e.g. mailto:, sip:) is not specified
-      if (href.indexOf('@') > 0 && href.indexOf('//') === -1 && href.indexOf(':') === -1) {
-        // assume it's a mailto link
-        href = 'mailto:' + href;
-        insertLink();
-        return;
-      }
-
-      // Is www. prefixed
-      if (/^\s*www\./i.test(href)) {
-        href = 'http://' + href;
-        insertLink();
-        return;
-      }
-
-      insertLink();
-
-    },
-
-    /** Helper method to initialize the tinymce editor within Umbraco */
-    initializeEditor: function (args) {
-
-      if (!args.editor) {
-        throw "args.editor is required";
-      }
-      if (!args.scope) {
-        args.scope = $rootScope;
-      }
-      if (args.getValue && !args.setValue) {
-         throw "args.setValue is required when getValue is set";
-      }
-      if (args.setValue && !args.getValue) {
-        throw "args.getValue is required when setValue is set";
-     }
-
-      // force TinyMCE to load plugins/themes from minified files (see http://archive.tinymce.com/wiki.php/api4:property.tinymce.suffix.static)
-      args.editor.suffix = ".min";
-
-      // Register custom option maxImageSize
-      args.editor.options.register('maxImageSize', { processor: 'number', default: 500 });
-
-      var unwatch = null;
-
-      const getPropertyValue = args.getValue ? args.getValue : function () {
-        return args.model.value
-      }
-      const setPropertyValue = args.setValue ? args.setValue : function (newVal) {
-        args.model.value = newVal;
-      }
-
-      //Starts a watch on the model value so that we can update TinyMCE if the model changes behind the scenes or from the server
-      function startWatch() {
-
-        unwatch = args.scope.$watch(() => getPropertyValue(), function (newVal, oldVal) {
-          if (newVal !== oldVal) {
-            //update the display val again if it has changed from the server;
-            //uses an empty string in the editor when the value is null
-            args.editor.setContent(newVal || "", { format: 'raw' });
-            initBlocks();
-
-            // we need to manually dispatch this event since it is only ever dispatched based on loading from the DOM, this
-            // is required for our plugins listening to this event to execute
-            args.editor.dispatch('LoadContent', null);
-          }
-        });
-      }
-
-      //Stops the watch on model.value which is done anytime we are manually updating the model.value
-      function stopWatch() {
-        if (unwatch) {
-          unwatch();
-        }
-      }
-
-      function syncContent() {
-
-        const content = args.editor.getContent()
-
-        if (getPropertyValue() === content) {
-          return;
-        }
-
-        //stop watching before we update the value
-        stopWatch();
-        angularHelper.safeApply($rootScope, function () {
-
-          setPropertyValue(content);
-
-          //make the form dirty manually so that the track changes works, setting our model doesn't trigger
-          // the angular bits because tinymce replaces the textarea.
-          if (args.currentForm) {
-            args.currentForm.$setDirty();
-          }
-          // With complex validation we need to set a input field to dirty, not the form. but we will keep the old code for backwards compatibility.
-          if (args.currentFormInput) {
-            args.currentFormInput.$setDirty();
-          }
-        });
-
-        //re-watch the value
-        startWatch();
-      }
-
-      function initBlocks() {
-
-        if(!args.blockEditorApi) {
-          return;
-        }
-
-        const blockEls = args.editor.contentDocument.querySelectorAll('umb-rte-block, umb-rte-block-inline');
-        for (var blockEl of blockEls) {
-          if(!blockEl._isInitializedUmbBlock) {
-            const blockContentUdi = blockEl.getAttribute('data-content-udi');
-            if(blockContentUdi && !blockEl.$block) {
-              const block = args.blockEditorApi.getBlockByContentUdi(blockContentUdi);
-              if(block) {
-                blockEl.removeAttribute('contenteditable');
-
-                if(block.config.displayInline && blockEl.nodeName.toLowerCase() === 'umb-rte-block') {
-                  // Change element name:
-                  const oldBlockEl = blockEl;
-                  blockEl = document.createElement('umb-rte-block-inline');
-                  blockEl.appendChild(document.createComment("Umbraco-Block"));
-                  blockEl.setAttribute('data-content-udi', blockContentUdi);
-                  oldBlockEl.parentNode.replaceChild(blockEl, oldBlockEl);
-                } else if(!block.config.displayInline && blockEl.nodeName.toLowerCase() === 'umb-rte-block-inline') {
-                  // Change element name:
-                  const oldBlockEl = blockEl;
-                  blockEl = document.createElement('umb-rte-block');
-                  blockEl.appendChild(document.createComment("Umbraco-Block"));
-                  blockEl.setAttribute('data-content-udi', blockContentUdi);
-                  oldBlockEl.parentNode.replaceChild(blockEl, oldBlockEl);
-                }
-
-                blockEl.$index = block.index;
-                blockEl.$block = block;
-                blockEl.$api = args.blockEditorApi;
-                blockEl.$culture = args.culture;
-                blockEl.$segment = args.segment;
-                blockEl.$parentForm = args.parentForm;
-                blockEl.$valFormManager = args.valFormManager;
-                $compile(blockEl)(args.scope);
-                blockEl.setAttribute('contenteditable', 'false');
-                //blockEl.setAttribute('draggable', 'true');
-
-              } else {
-                blockEl.removeAttribute('data-content-udi');
-                args.editor.dom.remove(blockEl);
-              }
-            } else {
-              args.editor.dom.remove(blockEl);
-            }
-          }
-        }
-      }
-
-      // If we can not find the insert image/media toolbar button
-      // Then we need to add an event listener to the editor
-      // That will update native browser drag & drop events
-      // To update the icon to show you can NOT drop something into the editor
-      if (args.toolbar && isMediaPickerEnabled(args.toolbar) === false) {
-        // Wire up the event listener
-        args.editor.on('dragstart dragend dragover draggesture dragdrop drop drag', function (e) {
-          e.preventDefault();
-          e.dataTransfer.effectAllowed = "none";
-          e.dataTransfer.dropEffect = "none";
-          e.stopPropagation();
-        });
-      }
-
-      args.editor.on('SetContent', function (e) {
-        var content = e.content;
-
-        // Upload BLOB images (dragged/pasted ones)
-        // find src attribute where value starts with `blob:`
-        // search is case-insensitive and allows single or double quotes
-        if (content.search(/src=["']blob:.*?["']/gi) !== -1) {
-          args.editor.uploadImages().then(function (data) {
-            // Once all images have been uploaded
-            data.forEach(function (item) {
-              // Skip items that failed upload
-              if (item.status === false) {
-                return;
-              }
-
-              // Select img element
-              var img = item.element;
-
-              // Get img src
-              var imgSrc = img.getAttribute("src");
-              var tmpLocation = localStorageService.get(`tinymce__${imgSrc}`)
-
-              // Select the img & add new attr which we can search for
-              // When its being persisted in RTE property editor
-              // To create a media item & delete this tmp one etc
-              args.editor.dom.setAttrib(img, "data-tmpimg", tmpLocation);
-
-              // Resize the image to the max size configured
-              // NOTE: no imagesrc passed into func as the src is blob://...
-              // We will append ImageResizing Querystrings on perist to DB with node save
-              sizeImageInEditor(args.editor, img);
-            });
-
-            // Get all img where src starts with blob: AND does NOT have a data=tmpimg attribute
-            // This is most likely seen as a duplicate image that has already been uploaded
-            // editor.uploadImages() does not give us any indiciation that the image been uploaded already
-            var blobImageWithNoTmpImgAttribute = args.editor.dom.select("img[src^='blob:']:not([data-tmpimg])");
-
-            //For each of these selected items
-            blobImageWithNoTmpImgAttribute.forEach(imageElement => {
-              var blobSrcUri = args.editor.dom.getAttrib(imageElement, "src");
-
-              // Find the same image uploaded (Should be in LocalStorage)
-              // May already exist in the editor as duplicate image
-              // OR added to the RTE, deleted & re-added again
-              // So lets fetch the tempurl out of localstorage for that blob URI item
-              var tmpLocation = localStorageService.get(`tinymce__${blobSrcUri}`)
-
-              if (tmpLocation) {
-                sizeImageInEditor(args.editor, imageElement);
-                args.editor.dom.setAttrib(imageElement, "data-tmpimg", tmpLocation);
-              }
-            });
-          });
-
-        }
-
-        if (Umbraco.Sys.ServerVariables.umbracoSettings.sanitizeTinyMce === true) {
-          /** prevent injecting arbitrary JavaScript execution in on-attributes. */
-          const allNodes = Array.prototype.slice.call(args.editor.dom.doc.getElementsByTagName("*"));
-          allNodes.forEach(node => {
-            for (var i = 0; i < node.attributes.length; i++) {
-              if (node.attributes[i].name.indexOf("on") === 0) {
-                node.removeAttribute(node.attributes[i].name)
-              }
-            }
-          });
-        }
-
-        initBlocks();
-
-      });
-
-      args.editor.on('init', function () {
-
-        const currentValue = getPropertyValue();
-        if (currentValue) {
-          args.editor.setContent(currentValue);
-        }
-
-        //enable browser based spell checking
-        args.editor.getBody().setAttribute('spellcheck', true);
-
-        /** Setup sanitization for preventing injecting arbitrary JavaScript execution in attributes:
-         * https://github.com/advisories/GHSA-w7jx-j77m-wp65
-         * https://github.com/advisories/GHSA-5vm8-hhgr-jcjp
-         */
-        const uriAttributesToSanitize = ['src', 'href', 'data', 'background', 'action', 'formaction', 'poster', 'xlink:href'];
-        const parseUri = function () {
-          // Encapsulated JS logic.
-          const safeSvgDataUrlElements = ['img', 'video'];
-          const scriptUriRegExp = /((java|vb)script|mhtml):/i;
-          const trimRegExp = /[\s\u0000-\u001F]+/g;
-          const isInvalidUri = (uri, tagName) => {
-            if (/^data:image\//i.test(uri)) {
-              return safeSvgDataUrlElements.indexOf(tagName) !== -1 && /^data:image\/svg\+xml/i.test(uri);
-            } else {
-              return /^data:/i.test(uri);
-            }
-          };
-
-          return function parseUri(uri, tagName) {
-            uri = uri.replace(trimRegExp, '');
-            try {
-              // Might throw malformed URI sequence
-              uri = decodeURIComponent(uri);
-            } catch (ex) {
-              // Fallback to non UTF-8 decoder
-              uri = unescape(uri);
-            }
-
-            if (scriptUriRegExp.test(uri)) {
-              return;
-            }
-
-            if (isInvalidUri(uri, tagName)) {
-              return;
-            }
-
-            return uri;
-          }
-        }();
-
-        if (Umbraco.Sys.ServerVariables.umbracoSettings.sanitizeTinyMce === true) {
-          args.editor.serializer.addAttributeFilter(uriAttributesToSanitize, function (nodes) {
-            nodes.forEach(function (node) {
-              node.attributes.forEach(function (attr) {
-                const attrName = attr.name.toLowerCase();
-                if (uriAttributesToSanitize.indexOf(attrName) !== -1) {
-                  attr.value = parseUri(attr.value, node.name);
-                }
-              });
-            });
-          });
-        }
-
-        //start watching the value
-        startWatch();
-      });
-
-      args.editor.on('Change', function (e) {
-        syncContent();
-      });
-      args.editor.on('Keyup', function (e) {
-        syncContent();
-      });
-
-      //when we leave the editor (maybe)
-      args.editor.on('blur', function (e) {
-        syncContent();
-      });
-
-      // When the element is removed from the DOM, we need to terminate
-      // any active watchers to ensure scopes are disposed and do not leak.
-      // No need to sync content as that has already happened.
-      args.editor.on('remove', () => stopWatch());
-
-      args.editor.on('ObjectResized', function (e) {
-        var srcAttr = $(e.target).attr("src");
-
-        if (!srcAttr) {
-          return;
-        }
-
-        var path = srcAttr.split("?")[0];
-        mediaHelper.getProcessedImageUrl(path, {
-          width: e.width,
-          height: e.height,
-          mode: "max"
-        }).then(function (resizedPath) {
-          $(e.target).attr("data-mce-src", resizedPath);
-        });
-
-        syncContent();
-      });
-
-      args.editor.on('Dirty', function (e) {
-        syncContent(); // Set model.value to the RTE's content
-      });
-
-      let self = this;
-
-      //create link picker
-      self.createLinkPicker(args.editor, function (currentTarget, anchorElement) {
-
-        entityResource.getAnchors(getPropertyValue()).then(anchorValues => {
-
-          const linkPicker = {
-            currentTarget: currentTarget,
-            dataTypeKey: args.model.dataTypeKey,
-            ignoreUserStartNodes: args.model.config.ignoreUserStartNodes,
-            anchors: anchorValues,
-            size: args.model.config.overlaySize,
-            submit: model => {
-              self.insertLinkInEditor(args.editor, model.target, anchorElement);
-              editorService.close();
-            },
-            close: () => {
-              editorService.close();
-            }
-          };
-
-          editorService.linkPicker(linkPicker);
-        });
-
-      });
-
-      //Create the insert media plugin
-      self.createMediaPicker(args.editor, function (currentTarget, userData) {
-
-        var startNodeId, startNodeIsVirtual;
-        if (!args.model.config.startNodeId) {
-          if (args.model.config.ignoreUserStartNodes === true) {
-            startNodeId = -1;
-            startNodeIsVirtual = true;
-          }
-          else {
-            startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-            startNodeIsVirtual = userData.startMediaIds.length !== 1;
-          }
-        }
-
-        var mediaPicker = {
-          currentTarget: currentTarget,
-          onlyImages: true,
-          showDetails: true,
-          disableFolderSelect: true,
-          disableFocalPoint: true,
-          startNodeId: startNodeId,
-          startNodeIsVirtual: startNodeIsVirtual,
-          dataTypeKey: args.model.dataTypeKey,
-          submit: function (model) {
-            self.insertMediaInEditor(args.editor, model.selection[0]);
-            editorService.close();
-          },
-          close: function () {
-            editorService.close();
-          }
-        };
-        editorService.mediaPicker(mediaPicker);
-      });
-
-
-      if(args.blockEditorApi) {
-        //Create the insert block plugin
-        self.createBlockPicker(args.editor, args.blockEditorApi, function (currentTarget, userData, imgDomElement) {
-          args.blockEditorApi.showCreateDialog(0, false, (newBlock) => {
-            // TODO: Handle if its an array:
-            if(Utilities.isArray(newBlock)) {
-              newBlock.forEach(block => {
-                self.insertBlockInEditor(args.editor, block.layout.contentUdi, block.config.displayInline);
-              });
-            } else {
-              self.insertBlockInEditor(args.editor, newBlock.layout.contentUdi, newBlock.config.displayInline);
-            }
-          });
-        });
-      }
-
-      //Create the embedded plugin
-      self.createInsertEmbeddedMedia(args.editor, function (activeElement, modify) {
-        var embed = {
-          modify: modify,
-          submit: function (model) {
-            self.insertEmbeddedMediaInEditor(args.editor, model.embed, activeElement);
-            editorService.close();
-          },
-          close: function () {
-            editorService.close();
-          }
-        };
-        editorService.embed(embed);
-      });
-
-      //Create the insert macro plugin
-      self.createInsertMacro(args.editor, function (dialogData) {
-        var macroPicker = {
-          dialogData: dialogData,
-          submit: function (model) {
-            var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, dialogData.renderingEngine);
-            self.insertMacroInEditor(args.editor, macroObject, dialogData.activeMacroElement);
-            editorService.close();
-          },
-          close: function () {
-            editorService.close();
-          }
-        };
-        editorService.macroPicker(macroPicker);
-      });
-
-      self.createAceCodeEditor(args.editor, function () {
-
-        // TODO: CHECK TO SEE WHAT WE NEED TO DO WIT MACROS (See code block?)
-        /*
-        var html = editor.getContent({source_view: true});
-        html = html.replace(/<span\s+class="CmCaReT"([^>]*)>([^<]*)<\/span>/gm, String.fromCharCode(chr));
-        editor.dom.remove(editor.dom.select('.CmCaReT'));
-        html = html.replace(/(<div class=".*?umb-macro-holder.*?mceNonEditable.*?"><!-- <\?UMBRACO_MACRO macroAlias="(.*?)".*?\/> --> *<ins>)[\s\S]*?(<\/ins> *<\/div>)/ig, "$1Macro alias: <strong>$2</strong>$3");
-        */
-
-        var aceEditor = {
-          content: args.editor.getContent(),
-          view: 'views/propertyeditors/rte/codeeditor.html',
-          submit: function (model) {
-            args.editor.setContent(model.content);
-            args.editor.dispatch('Change');
-            editorService.close();
-          },
-          close: function () {
-            editorService.close();
-          }
-        };
-
-        editorService.open(aceEditor);
-      });
-
-    }
-
-  };
-}
-
-angular.module('umbraco.services').factory('tinyMceService', tinyMceService);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
deleted file mode 100644
index 4166725c39..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
+++ /dev/null
@@ -1,311 +0,0 @@
-/**
- @ngdoc service
- * @name umbraco.services.tourService
- *
- * @description
- * <b>Added in Umbraco 7.8</b>. Application-wide service for handling tours.
- */
-(function () {
-    'use strict';
-
-    function tourService(eventsService, currentUserResource, $q, tourResource) {
-
-        var tours = [];
-        var currentTour = null;
-
-        /**
-         * Registers all tours from the server and returns a promise
-         */
-        function registerAllTours() {
-            tours = [];
-            return tourResource.getTours().then(function (tourFiles) {
-                Utilities.forEach(tourFiles, tourFile => {
-
-                    Utilities.forEach(tourFile.tours, newTour => {
-                        validateTour(newTour);
-                        validateTourRegistration(newTour);
-                        tours.push(newTour);
-                    });
-                });
-
-                eventsService.emit("appState.tour.updatedTours", tours);
-            });
-        }
-
-        /**
-         * Method to return all of the tours as a new instance
-         */
-        function getTours() {
-            return tours;
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.tourService#startTour
-         * @methodOf umbraco.services.tourService
-         *
-         * @description
-         * Raises an event to start a tour
-         * @param {Object} tour The tour which should be started
-         */
-        function startTour(tour) {
-            validateTour(tour);
-            eventsService.emit("appState.tour.start", tour);
-            currentTour = tour;
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.tourService#endTour
-         * @methodOf umbraco.services.tourService
-         *
-         * @description
-         * Raises an event to end the current tour
-         */
-        function endTour(tour) {
-            eventsService.emit("appState.tour.end", tour);
-            currentTour = null;
-        }
-
-        /**
-         * Disables a tour for the user, raises an event and returns a promise
-         * @param {any} tour
-         */
-        function disableTour(tour) {
-            var deferred = $q.defer();
-            tour.disabled = true;
-            currentUserResource
-                .saveTourStatus({ alias: tour.alias, disabled: tour.disabled, completed: tour.completed }).then(
-                    function () {
-                        eventsService.emit("appState.tour.end", tour);
-                        currentTour = null;
-                        deferred.resolve(tour);
-                    });
-            return deferred.promise;
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.tourService#completeTour
-         * @methodOf umbraco.services.tourService
-         *
-         * @description
-         * Completes a tour for the user, raises an event and returns a promise
-         * @param {Object} tour The tour which should be completed
-         */
-        function completeTour(tour) {
-            var deferred = $q.defer();
-            tour.completed = true;
-            currentUserResource
-                .saveTourStatus({ alias: tour.alias, disabled: tour.disabled, completed: tour.completed }).then(
-                    function () {
-                        eventsService.emit("appState.tour.complete", tour);
-                        currentTour = null;
-                        deferred.resolve(tour);
-                    });
-            return deferred.promise;
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.tourService#getCurrentTour
-         * @methodOf umbraco.services.tourService
-         *
-         * @description
-         * Returns the current tour
-         * @returns {Object} Returns the current tour
-         */
-        function getCurrentTour() {
-            // TODO: This should be reset if a new user logs in
-            return currentTour;
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.tourService#getGroupedTours
-         * @methodOf umbraco.services.tourService
-         *
-         * @description
-         * Returns a promise of grouped tours with the current user statuses
-         * @returns {Array} All registered tours grouped by tour group
-         */
-        function getGroupedTours() {
-            var deferred = $q.defer();
-            var tours = getTours();
-            setTourStatuses(tours).then(function () {
-                var groupedTours = [];
-                tours.forEach(function (item) {
-
-                    if (item.contentType === null || item.contentType === '') {
-                        var groupExists = false;
-                        var newGroup = {
-                            "group": "",
-                            "tours": []
-                        };
-
-                        groupedTours.forEach(function (group) {
-                            // extend existing group if it is already added
-                            if (group.group === item.group) {
-                                if (item.groupOrder) {
-                                    group.groupOrder = item.groupOrder;
-                                }
-                                groupExists = true;
-
-                                if (item.hidden === false) {
-                                    group.tours.push(item);
-                                }
-                            }
-                        });
-
-                        // push new group to array if it doesn't exist
-                        if (!groupExists) {
-                            newGroup.group = item.group;
-                            if (item.groupOrder) {
-                                newGroup.groupOrder = item.groupOrder;
-                            }
-
-                            if (item.hidden === false) {
-                                newGroup.tours.push(item);
-                                groupedTours.push(newGroup);
-                            }
-                        }
-                    }
-
-                });
-
-                deferred.resolve(groupedTours);
-            });
-            return deferred.promise;
-        }
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.tourService#getTourByAlias
-         * @methodOf umbraco.services.tourService
-         *
-         * @description
-         * Returns a promise of the tour found by alias with the current user statuses
-         * @param {Object} tourAlias The tour alias of the tour which should be returned
-         * @returns {Object} Tour object
-         */
-        function getTourByAlias(tourAlias) {
-            var deferred = $q.defer();
-            var tours = getTours();
-            setTourStatuses(tours).then(function () {
-                var tour = _.findWhere(tours, { alias: tourAlias });
-                deferred.resolve(tour);
-            });
-            return deferred.promise;
-        }
-
-        /**
-        * @ngdoc method
-        * @name umbraco.services.tourService#getToursForDoctype
-        * @methodOf umbraco.services.tourService
-        *
-        * @description
-        * Returns a promise of the tours found by documenttype alias.
-        * @param {Object} doctypeAlias The doctype alias for which  the tours which should be returned
-        * @returns {Array} An array of tour objects for the doctype
-        */
-        function getToursForDoctype(doctypeAlias) {
-            var deferred = $q.defer();
-            tourResource.getToursForDoctype(doctypeAlias).then(function (tours) {
-                deferred.resolve(tours);
-            });
-            return deferred.promise;
-        }
-
-        ///////////
-
-        /**
-         * Validates a tour object and makes sure it consists of the correct properties needed to start a tour
-         * @param {any} tour
-         */
-        function validateTour(tour) {
-
-            if (!tour) {
-                throw "A tour is not specified";
-            }
-
-            if (!tour.alias) {
-                throw "A tour alias is required";
-            }
-
-            if (!tour.steps) {
-                throw "Tour " + tour.alias + " is missing tour steps";
-            }
-
-            if (tour.steps && tour.steps.length === 0) {
-                throw "Tour " + tour.alias + " is missing tour steps";
-            }
-
-            if (tour.requiredSections.length === 0) {
-                throw "Tour " + tour.alias + " is missing the required sections";
-            }
-        }
-
-        /**
-         * Validates a tour before it gets registered in the service
-         * @param {any} tour
-         */
-        function validateTourRegistration(tour) {
-            // check for existing tours with the same alias
-            Utilities.forEach(tours, existingTour => {
-                if (existingTour.alias === tour.alias) {
-                    throw "A tour with the alias " + tour.alias + " is already registered";
-                }
-            });
-        }
-
-        /**
-         * Based on the tours given, this will set each of the tour statuses (disabled/completed) based on what is stored against the current user
-         * @param {any} tours
-         */
-        function setTourStatuses(tours) {
-
-            var deferred = $q.defer();
-            currentUserResource.getTours().then(function (storedTours) {
-
-                Utilities.forEach(storedTours, storedTour => {
-
-                    if (storedTour.completed === true) {
-                        Utilities.forEach(tours, tour => {
-                            if (storedTour.alias === tour.alias) {
-                                tour.completed = true;
-                            }
-                        });
-                    }
-                    if (storedTour.disabled === true) {
-                        Utilities.forEach(tours, tour => {
-                            if (storedTour.alias === tour.alias) {
-                                tour.disabled = true;
-                            }
-                        });
-                    }
-                });
-
-                deferred.resolve(tours);
-            });
-            return deferred.promise;
-        }
-
-        var service = {
-            registerAllTours: registerAllTours,
-            startTour: startTour,
-            endTour: endTour,
-            disableTour: disableTour,
-            completeTour: completeTour,
-            getCurrentTour: getCurrentTour,
-            getGroupedTours: getGroupedTours,
-            getTourByAlias: getTourByAlias,
-            getToursForDoctype: getToursForDoctype
-        };
-
-        return service;
-
-    }
-
-    angular.module("umbraco.services").factory("tourService", tourService);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
deleted file mode 100644
index ba9ebc1b00..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
+++ /dev/null
@@ -1,884 +0,0 @@
-
-/**
- * @ngdoc service
- * @name umbraco.services.treeService
- * @function
- *
- * @description
- * The tree service factory, used internally by the umbTree and umbTreeItem directives
- */
-function treeService($q, treeResource, iconHelper, notificationsService, eventsService) {
-
-    //SD: Have looked at putting this in sessionStorage (not localStorage since that means you wouldn't be able to work
-    // in multiple tabs) - however our tree structure is cyclical, meaning a node has a reference to it's parent and it's children
-    // which you cannot serialize to sessionStorage. There's really no benefit of session storage except that you could refresh
-    // a tab and have the trees where they used to be - supposed that is kind of nice but would mean we'd have to store the parent
-    // as a nodeid reference instead of a variable with a getParent() method.
-    var treeCache = {};
-
-    var standardCssClass = 'icon umb-tree-icon sprTree';
-
-    function getCacheKey(args) {
-        //if there is no cache key they return null - it won't be cached.
-        if (!args || !args.cacheKey) {
-            return null;
-        }
-
-        var cacheKey = args.cacheKey;
-        cacheKey += "_" + args.section;
-        return cacheKey;
-    }
-
-    // Adapted from: https://stackoverflow.com/a/2140723
-    // Please note, we can NOT test this functionality correctly in Phantom because it implements
-    // the localeCompare method incorrectly: https://github.com/ariya/phantomjs/issues/11063
-    function invariantEquals(a, b) {
-        return typeof a === "string" && typeof b === "string"
-            ? a.localeCompare(b, undefined, { sensitivity: "base" }) === 0
-            : a === b;
-    }
-
-    return {
-
-        /** Internal method to return the tree cache */
-        _getTreeCache: function () {
-            return treeCache;
-        },
-
-        /** Internal method to track expanded paths on a tree */
-        _trackExpandedPaths: function (node, expandedPaths) {
-            if (!node.children || !Utilities.isArray(node.children) || node.children.length == 0) {
-                return;
-            }
-
-            //take the last child
-            var childPath = this.getPath(node.children[node.children.length - 1]).join(",");
-            //check if this already exists, if so exit
-            if (expandedPaths.includes(childPath)) {
-                return;
-            }
-
-            if (expandedPaths.length === 0) {
-                expandedPaths.push(childPath); //track it
-                return;
-            }
-
-            var clonedPaths = expandedPaths.slice(0); //make a copy to iterate over so we can modify the original in the iteration
-
-            clonedPaths.forEach(p => {
-                if (childPath.startsWith(p + ",")) {
-                    //this means that the node's path supercedes this path stored so we can remove the current 'p' and replace it with node.path
-                    expandedPaths.splice(expandedPaths.indexOf(p), 1); //remove it
-                    if (expandedPaths.includes(childPath) === false) {
-                        expandedPaths.push(childPath); //replace it
-                    }
-                }
-                else if (p.startsWith(childPath + ",")) {
-                    //this means we've already tracked a deeper node so we shouldn't track this one
-                }
-                else if (expandedPaths.includes(childPath) === false) {
-                    expandedPaths.push(childPath); //track it
-                }
-            });
-        },
-
-        /** Internal method that ensures there's a routePath, parent and level property on each tree node and adds some icon specific properties so that the nodes display properly */
-        _formatNodeDataForUseInUI: function (parentNode, treeNodes, section, level) {
-            //if no level is set, then we make it 1
-            var childLevel = (level ? level : 1);
-            //set the section if it's not already set
-            if (!parentNode.section) {
-                parentNode.section = section;
-            }
-
-            if (parentNode.metaData && parentNode.metaData.noAccess === true) {
-                if (!parentNode.cssClasses) {
-                    parentNode.cssClasses = [];
-                }
-                parentNode.cssClasses.push("no-access");
-            }
-
-            //create a method outside of the loop to return the parent - otherwise jshint blows up
-            var funcParent = function () {
-                return parentNode;
-            };
-
-            for (var i = 0; i < treeNodes.length; i++) {
-
-                var treeNode = treeNodes[i];
-
-                treeNode.level = childLevel;
-
-                //create a function to get the parent node, we could assign the parent node but
-                // then we cannot serialize this entity because we have a cyclical reference.
-                // Instead we just make a function to return the parentNode.
-                treeNode.parent = funcParent;
-
-                //set the section for each tree node - this allows us to reference this easily when accessing tree nodes
-                treeNode.section = section;
-
-                //if there is not route path specified, then set it automatically,
-                //if this is a tree root node then we want to route to the section's dashboard
-                if (!treeNode.routePath) {
-
-                    if (treeNode.metaData && treeNode.metaData["treeAlias"]) {
-                        //this is a root node
-                        treeNode.routePath = section;
-                    }
-                    else {
-                        var treeAlias = this.getTreeAlias(treeNode);
-                        treeNode.routePath = section + "/" + treeAlias + "/edit/" + treeNode.id;
-                    }
-                }
-
-                //now, format the icon data
-                if (treeNode.iconIsClass === undefined || treeNode.iconIsClass) {
-                    var converted = iconHelper.convertFromLegacyTreeNodeIcon(treeNode);
-                    treeNode.cssClass = standardCssClass + " " + converted;
-                    if (converted && converted.startsWith('.')) {
-                        //its legacy so add some width/height
-                        treeNode.style = "height:16px;width:16px;";
-                    }
-                    else {
-                        treeNode.style = "";
-                    }
-                }
-                else {
-                    treeNode.style = "background-image: url('" + treeNode.iconFilePath + "');";
-                    //we need an 'icon-' class in there for certain styles to work so if it is image based we'll add this
-                    treeNode.cssClass = standardCssClass + " legacy-custom-file";
-                }
-
-                if (treeNode.metaData && treeNode.metaData.noAccess === true) {
-                    if (!treeNode.cssClasses) {
-                        treeNode.cssClasses = [];
-                    }
-                    treeNode.cssClasses.push("no-access");
-                }
-            }
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#getTreePackageFolder
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * Determines if the current tree is a plugin tree and if so returns the package folder it has declared
-         * so we know where to find it's views, otherwise it will just return undefined.
-         *
-         * @param {String} treeAlias The tree alias to check
-         */
-        getTreePackageFolder: function (treeAlias) {
-            //we determine this based on the server variables
-            if (Umbraco.Sys.ServerVariables.umbracoPlugins &&
-                Umbraco.Sys.ServerVariables.umbracoPlugins.trees &&
-                Utilities.isArray(Umbraco.Sys.ServerVariables.umbracoPlugins.trees)) {
-
-                var found = _.find(Umbraco.Sys.ServerVariables.umbracoPlugins.trees, function (item) {
-                    return invariantEquals(item.alias, treeAlias);
-                });
-
-                return found ? found.packageFolder : undefined;
-            }
-            return undefined;
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#clearCache
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * Clears the tree cache - with optional cacheKey, optional section or optional filter.
-         *
-         * @param {Object} args arguments
-         * @param {String} args.cacheKey optional cachekey - this is used to clear specific trees in dialogs
-         * @param {String} args.section optional section alias - clear tree for a given section
-         * @param {String} args.childrenOf optional parent ID - only clear the cache below a specific node
-         */
-        clearCache: function (args) {
-            //clear all if not specified
-            if (!args) {
-                treeCache = {};
-            }
-            else {
-                //if section and cache key specified just clear that cache
-                if (args.section && args.cacheKey) {
-                    var cacheKey = getCacheKey(args);
-                    if (cacheKey && treeCache && treeCache[cacheKey] != null) {
-                        treeCache = _.omit(treeCache, cacheKey);
-                    }
-                }
-                else if (args.childrenOf) {
-                    //if childrenOf is supplied a cacheKey must be supplied as well
-                    if (!args.cacheKey) {
-                        throw "args.cacheKey is required if args.childrenOf is supplied";
-                    }
-                    //this will clear out all children for the parentId passed in to this parameter, we'll
-                    // do this by recursing and specifying a filter
-                    var self = this;
-                    this.clearCache({
-                        cacheKey: args.cacheKey,
-                        filter: function (cc) {
-                            //get the new parent node from the tree cache
-                            var parent = self.getDescendantNode(cc.root, args.childrenOf);
-                            if (parent) {
-                                //clear it's children and set to not expanded
-                                parent.children = null;
-                                parent.expanded = false;
-                            }
-                            //return the cache to be saved
-                            return cc;
-                        }
-                    });
-                }
-                else if (args.filter && Utilities.isFunction(args.filter)) {
-                    //if a filter is supplied a cacheKey must be supplied as well
-                    if (!args.cacheKey) {
-                        throw "args.cacheKey is required if args.filter is supplied";
-                    }
-
-                    //if a filter is supplied the function needs to return the data to keep
-                    var byKey = treeCache[args.cacheKey];
-                    if (byKey) {
-                        var result = args.filter(byKey);
-
-                        if (result) {
-                            //set the result to the filtered data
-                            treeCache[args.cacheKey] = result;
-                        }
-                        else {
-                            //remove the cache
-                            treeCache = _.omit(treeCache, args.cacheKey);
-                        }
-
-                    }
-
-                }
-                else if (args.cacheKey) {
-                    //if only the cache key is specified, then clear all cache starting with that key
-                    var allKeys1 = _.keys(treeCache);
-                    var toRemove1 = _.filter(allKeys1, function (k) {
-                        return k.startsWith(args.cacheKey + "_");
-                    });
-                    treeCache = _.omit(treeCache, toRemove1);
-                }
-                else if (args.section) {
-                    //if only the section is specified then clear all cache regardless of cache key by that section
-                    var allKeys2 = _.keys(treeCache);
-                    var toRemove2 = _.filter(allKeys2, function (k) {
-                        return k.endsWith("_" + args.section);
-                    });
-                    treeCache = _.omit(treeCache, toRemove2);
-                }
-            }
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#loadNodeChildren
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * Clears all node children, gets it's up-to-date children from the server and re-assigns them and then
-         * returns them in a promise.
-         * @param {object} args An arguments object
-         * @param {object} args.node The tree node
-         * @param {object} args.section The current section
-         */
-        loadNodeChildren: function (args) {
-            if (!args) {
-                throw "No args object defined for loadNodeChildren";
-            }
-            if (!args.node) {
-                throw "No node defined on args object for loadNodeChildren";
-            }
-
-            // don't remove the children for container nodes in dialogs, as it'll remove the right arrow indicator
-            if (!args.isDialog || !args.node.metaData.isContainer) {
-                this.removeChildNodes(args.node);
-            }
-            args.node.loading = true;
-
-            return this.getChildren(args)
-                .then(function (data) {
-
-                    //set state to done and expand (only if there actually are children!)
-                    args.node.loading = false;
-                    args.node.children = data;
-                    if (args.node.children && args.node.children.length > 0) {
-                        args.node.expanded = true;
-                        args.node.hasChildren = true;
-
-                        //Since we've removed the children &  reloaded them, we need to refresh the UI now because the tree node UI doesn't operate on normal angular $watch since that will be pretty slow
-                        if (Utilities.isFunction(args.node.updateNodeData)) {
-                            args.node.updateNodeData(args.node);
-                        }
-                    }
-
-                    return $q.when(data);
-
-                }, function (reason) {
-
-                    //in case of error, emit event
-                    eventsService.emit("treeService.treeNodeLoadError", { error: reason });
-
-                    //stop show the loading indicator
-                    args.node.loading = false;
-
-                    //tell notications about the error
-                    notificationsService.error(reason);
-
-                    return $q.reject(reason);
-                });
-
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#removeNode
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * Removes a given node from the tree
-         * @param {object} treeNode the node to remove
-         */
-        removeNode: function (treeNode) {
-            if (!Utilities.isFunction(treeNode.parent)) {
-                return;
-            }
-
-            if (treeNode.parent() == null) {
-                throw "Cannot remove a node that doesn't have a parent";
-            }
-            //remove the current item from it's siblings
-            var parent = treeNode.parent();
-            parent.children.splice(parent.children.indexOf(treeNode), 1);
-
-            parent.hasChildren = parent.children.length !== 0;
-
-            //Notify that the node has been removed
-            eventsService.emit("treeService.removeNode", { node: treeNode });
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#removeChildNodes
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * Removes all child nodes from a given tree node
-         * @param {object} treeNode the node to remove children from
-         */
-        removeChildNodes: function (treeNode) {
-            treeNode.expanded = false;
-            treeNode.children = [];
-            treeNode.hasChildren = false;
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#getChildNode
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * Gets a child node with a given ID, from a specific treeNode
-         * @param {object} treeNode to retrieve child node from
-         * @param {int} id id of child node
-         */
-        getChildNode: function (treeNode, id) {
-            if (!treeNode.children) {
-                return null;
-            }
-            var found = _.find(treeNode.children, function (child) {
-                return String(child.id).toLowerCase() === String(id).toLowerCase();
-            });
-            return found === undefined ? null : found;
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#getDescendantNode
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * Gets a descendant node by id
-         * @param {object} treeNode to retrieve descendant node from
-         * @param {int} id id of descendant node
-         * @param {string} treeAlias - optional tree alias, if fetching descendant node from a child of a listview document
-         */
-        getDescendantNode: function (treeNode, id, treeAlias) {
-
-            //validate if it is a section container since we'll need a treeAlias if it is one
-            if (treeNode.isContainer === true && !treeAlias) {
-                throw "Cannot get a descendant node from a section container node without a treeAlias specified";
-            }
-
-            //the treeNode passed in could be a section container, or it could be a section group
-            //in either case we need to go through the children until we can find the actual tree root with the treeAlias
-            var self = this;
-            function getTreeRoot(tn) {
-                //if it is a section container, we need to find the tree to be searched
-                if (tn.isContainer) {
-                    for (var c = 0; c < tn.children.length; c++) {
-                        if (tn.children[c].isContainer) {
-                            //recurse
-                            var root = getTreeRoot(tn.children[c]);
-
-                            //only return if we found the root in this child, otherwise continue.
-                            if (root) {
-                                return root;
-                            }
-                        }
-                        else if (self.getTreeAlias(tn.children[c]) === treeAlias) {
-                            return tn.children[c];
-                        }
-                    }
-                    return null;
-                }
-                else {
-                    return tn;
-                }
-            }
-
-            var foundRoot = getTreeRoot(treeNode);
-            if (!foundRoot) {
-                throw "Could not find a tree in the current section with alias " + treeAlias;
-            }
-            treeNode = foundRoot;
-
-            //check this node
-            if (treeNode.id === id) {
-                return treeNode;
-            }
-
-            //check the first level
-            var found = this.getChildNode(treeNode, id);
-            if (found) {
-                return found;
-            }
-
-            //check each child of this node
-            if (!treeNode.children) {
-                return null;
-            }
-
-            for (var i = 0; i < treeNode.children.length; i++) {
-                var child = treeNode.children[i];
-                if (child.children && Utilities.isArray(child.children) && child.children.length > 0) {
-                    //recurse
-                    found = this.getDescendantNode(child, id);
-                    if (found) {
-                        return found;
-                    }
-                }
-            }
-
-            //not found
-            return found === undefined ? null : found;
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#getTreeRoot
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * Gets the root node of the current tree type for a given tree node
-         * @param {object} treeNode to retrieve tree root node from
-         */
-        getTreeRoot: function (treeNode) {
-            if (!treeNode) {
-                throw "treeNode cannot be null";
-            }
-
-            //all root nodes have metadata key 'treeAlias'
-            var root = null;
-            var current = treeNode;
-            while (root === null && current) {
-
-                if (current.metaData && current.metaData["treeAlias"]) {
-                    root = current;
-                }
-                else if (Utilities.isFunction(current.parent)) {
-                    //we can only continue if there is a parent() method which means this
-                    // tree node was loaded in as part of a real tree, not just as a single tree
-                    // node from the server.
-                    current = current.parent();
-                }
-                else {
-                    current = null;
-                }
-            }
-            return root;
-        },
-
-        /** Gets the node's tree alias, this is done by looking up the meta-data of the current node's root node */
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#getTreeAlias
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * Gets the node's tree alias, this is done by looking up the meta-data of the current node's root node
-         * @param {object} treeNode to retrieve tree alias from
-         */
-        getTreeAlias: function (treeNode) {
-            var root = this.getTreeRoot(treeNode);
-            if (root) {
-                return root.metaData["treeAlias"];
-            }
-            return "";
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#getTree
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * gets the tree, returns a promise
-         * @param {object} args Arguments
-         * @param {string} args.section Section alias
-         * @param {string} args.cacheKey Optional cachekey
-         */
-        getTree: function (args) {
-
-            //set defaults
-            if (!args) {
-                args = { section: 'content', cacheKey: null };
-            }
-            else if (!args.section) {
-                args.section = 'content';
-            }
-
-            var cacheKey = getCacheKey(args);
-
-            //return the cache if it exists
-            if (cacheKey && treeCache[cacheKey] !== undefined) {
-                return $q.when(treeCache[cacheKey]);
-            }
-
-            var self = this;
-            return treeResource.loadApplication(args)
-                .then(function (data) {
-                    //this will be called once the tree app data has loaded
-                    var result = {
-                        name: data.name,
-                        alias: args.section,
-                        root: data
-                    };
-
-                    //format the root
-                    self._formatNodeDataForUseInUI(result.root, result.root.children, args.section);
-
-                    //if this is a root that contains group nodes, we need to format those manually too
-                    if (result.root.containsGroups) {
-                        for (var i = 0; i < result.root.children.length; i++) {
-                            var group = result.root.children[i];
-
-                            //we need to format/modify some of the node data to be used in our app.
-                            self._formatNodeDataForUseInUI(group, group.children, args.section);
-                        }
-                    }
-
-                    //cache this result if a cache key is specified - generally a cache key should ONLY
-                    // be specified for application trees, dialog trees should not be cached.
-                    if (cacheKey) {
-                        treeCache[cacheKey] = result;
-                        return $q.when(treeCache[cacheKey]);
-                    }
-
-                    //return un-cached
-                    return $q.when(result);
-                });
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#getMenu
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * Returns available menu actions for a given tree node
-         * @param {object} args Arguments
-         * @param {string} args.treeNode tree node object to retrieve the menu for
-         */
-        getMenu: function (args) {
-
-            if (!args) {
-                throw "args cannot be null";
-            }
-            if (!args.treeNode) {
-                throw "args.treeNode cannot be null";
-            }
-
-            return treeResource.loadMenu(args.treeNode)
-                .then(function (data) {
-                    //need to convert the icons to new ones
-                    for (var i = 0; i < data.length; i++) {
-                        data[i].cssclass = iconHelper.convertFromLegacyIcon(data[i].cssclass);
-                    }
-                    return data;
-                });
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#getChildren
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * Gets the children from the server for a given node
-         * @param {object} args Arguments
-         * @param {object} args.node tree node object to retrieve the children for
-         * @param {string} args.section current section alias
-         */
-        getChildren: function (args) {
-
-            if (!args) {
-                throw "No args object defined for getChildren";
-            }
-            if (!args.node) {
-                throw "No node defined on args object for getChildren";
-            }
-
-            var section = args.section || 'content';
-            var treeItem = args.node;
-
-            var self = this;
-
-            return treeResource.loadNodes({ node: treeItem })
-                .then(function (data) {
-                    //now that we have the data, we need to add the level property to each item and the view
-                    self._formatNodeDataForUseInUI(treeItem, data, section, treeItem.level + 1);
-                    return $q.when(data);
-                });
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#reloadNode
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * Re-loads the single node from the server
-         * @param {object} node Tree node to reload
-         */
-        reloadNode: function (node) {
-            if (!node) {
-                throw "node cannot be null";
-            }
-            if (!node.parent()) {
-                throw "cannot reload a single node without a parent";
-            }
-            if (!node.section) {
-                throw "cannot reload a single node without an assigned node.section";
-            }
-
-            //set the node to loading
-            node.loading = true;
-
-            return this.getChildren({ node: node.parent(), section: node.section }).then(function (data) {
-
-                //ok, now that we have the children, find the node we're reloading
-                var found = _.find(data, function (item) {
-                    return item.id === node.id;
-                });
-                if (found) {
-                    //now we need to find the node in the parent.children collection to replace
-                    var index = _.indexOf(node.parent().children, node);
-                    //the trick here is to not actually replace the node - this would cause the delete animations
-                    //to fire, instead we're just going to replace all the properties of this node.
-
-                    //there should always be a method assigned but we'll check anyways
-                    if (Utilities.isFunction(node.parent().children[index].updateNodeData)) {
-                        node.parent().children[index].updateNodeData(found);
-                    }
-                    else {
-                        //just update as per normal - this means styles, etc.. won't be applied
-                        _.extend(node.parent().children[index], found);
-                    }
-
-                    //set the node loading
-                    node.parent().children[index].loading = false;
-                    //return
-                    return $q.when(node.parent().children[index]);
-                }
-                else {
-                    return $q.reject();
-                }
-            }, function () {
-                return $q.reject();
-            });
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.treeService#getPath
-         * @methodOf umbraco.services.treeService
-         * @function
-         *
-         * @description
-         * This will return the current node's path by walking up the tree
-         * @param {object} node Tree node to retrieve path for
-         */
-        getPath: function (node) {
-            if (!node) {
-                throw "node cannot be null";
-            }
-            if (!Utilities.isFunction(node.parent)) {
-                throw "node.parent is not a function, the path cannot be resolved";
-            }
-
-            var reversePath = [];
-            var current = node;
-            while (current != null) {
-                reversePath.push(current.id);
-
-                //all tree root nodes (non group, not section root) have a treeAlias so exit if that is the case
-                //or exit if we cannot traverse further up
-                if ((current.metaData && current.metaData["treeAlias"]) || !current.parent) {
-                    current = null;
-                }
-                else {
-                    current = current.parent();
-                }
-            }
-            return reversePath.reverse();
-        },
-
-        syncTree: function (args) {
-
-            if (!args) {
-                throw "No args object defined for syncTree";
-            }
-            if (!args.node) {
-                throw "No node defined on args object for syncTree";
-            }
-            if (!args.path) {
-                throw "No path defined on args object for syncTree";
-            }
-            if (!Utilities.isArray(args.path)) {
-                throw "Path must be an array";
-            }
-            if (args.path.length < 1) {
-                //if there is no path, make -1 the path, and that should sync the tree root
-                args.path.push("-1");
-            }
-
-            //get the rootNode for the current node, we'll sync based on that
-            var root = this.getTreeRoot(args.node);
-            if (!root) {
-                throw "Could not get the root tree node based on the node passed in";
-            }
-
-            //now we want to loop through the ids in the path, first we'll check if the first part
-            //of the path is the root node, otherwise we'll search it's children.
-            var currPathIndex = 0;
-            //if the first id is the root node and there's only one... then consider it synced
-            if (String(args.path[currPathIndex]).toLowerCase() === String(args.node.id).toLowerCase()) {
-                if (args.path.length === 1) {
-                    //return the root
-                    return $q.when(root);
-                }
-                else {
-                    //move to the next path part and continue
-                    currPathIndex = 1;
-                }
-            }
-
-            var deferred = $q.defer();
-
-            //now that we have the first id to lookup, we can start the process
-
-            var self = this;
-            var node = args.node;
-
-            var doSync = function () {
-                //check if it exists in the already loaded children
-                var child = self.getChildNode(node, args.path[currPathIndex]);
-                if (child) {
-                    if (args.path.length === (currPathIndex + 1)) {
-                        //woot! synced the node
-                        if (!args.forceReload) {
-                            return $q.when(child);
-                        }
-                        else {
-                            //even though we've found the node if forceReload is specified
-                            //we want to go update this single node from the server
-                            return self.reloadNode(child);
-                        }
-                    }
-                    else {
-                        //now we need to recurse with the updated node/currPathIndex
-                        currPathIndex++;
-                        node = child;
-                        //recurse
-                        return doSync();
-                    }
-                }
-                else {
-                    //couldn't find it in the
-                    return self.loadNodeChildren({ node: node, section: node.section }).then(function (children) {
-
-                        //send back some progress to allow the caller to deal with expanded nodes
-                        deferred.notify({ type: "treeNodeExpanded", node: node, children: children })
-
-                        //ok, got the children, let's find it
-                        var found = self.getChildNode(node, args.path[currPathIndex]);
-                        if (found) {
-                            if (args.path.length === (currPathIndex + 1)) {
-                                //woot! synced the node
-                                return $q.when(found);
-                            }
-                            else {
-                                //now we need to recurse with the updated node/currPathIndex
-                                currPathIndex++;
-                                node = found;
-                                //recurse
-                                return doSync();
-                            }
-                        }
-                        else {
-                            //fail!
-                            return $q.reject();
-                        }
-                    }, function () {
-                        //fail!
-                        return $q.reject();
-                    });
-                }
-            };
-
-            //start
-            var wrappedPromise = doSync();
-
-            //then wrap it 
-            wrappedPromise.then(function (args) {
-                deferred.resolve(args);
-            }, function (args) {
-                deferred.reject(args);
-            });
-
-            return deferred.promise;
-        }
-
-    };
-}
-
-angular.module('umbraco.services').factory('treeService', treeService);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/udi.service.js b/src/Umbraco.Web.UI.Client/src/common/services/udi.service.js
deleted file mode 100644
index 7b08c68e4e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/udi.service.js
+++ /dev/null
@@ -1,51 +0,0 @@
-(function () {
-    "use strict";
-
-    /**
-    * @ngdoc service
-    * @name umbraco.services.udiService
-    * @description A service for UDIs
-    **/
-    function udiService() {
-        return {
-
-            /**
-             * @ngdoc method
-             * @name umbraco.services.udiService#create
-             * @methodOf umbraco.services.udiService
-             * @function
-             *
-             * @description
-             * Generates a Udi string with a new ID
-             *
-             * @param {string} entityType The entityType as a string.
-             * @returns {string} The generated UDI
-             */
-            create: function(entityType) {
-                return this.build(entityType, String.CreateGuid());
-            },
-
-            build: function (entityType, guid) {
-                return "umb://" + entityType + "/" + (guid.replace(/-/g, ""));
-            },
-
-            getKey: function (udi) {
-                if (!Utilities.isString(udi)) {
-                    throw "udi is not a string";
-                }
-                if (!udi.startsWith("umb://")) {
-                    throw "udi does not start with umb://";
-                }
-                var withoutScheme = udi.substr("umb://".length);
-                var withoutHost = withoutScheme.substr(withoutScheme.indexOf("/") + 1).trim();
-                if (withoutHost.length !== 32) {
-                    throw "udi is not 32 chars";
-                }
-                return `${withoutHost.substr(0, 8)}-${withoutHost.substr(8, 4)}-${withoutHost.substr(12, 4)}-${withoutHost.substr(16, 4)}-${withoutHost.substr(20)}`;
-            }
-        }
-    }
-
-    angular.module("umbraco.services").factory("udiService", udiService);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/udiParser.service.js b/src/Umbraco.Web.UI.Client/src/common/services/udiParser.service.js
deleted file mode 100644
index 1bc384841d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/udiParser.service.js
+++ /dev/null
@@ -1,47 +0,0 @@
-(function () {
-    "use strict";
-
-    /**
-    * @ngdoc service
-    * @name umbraco.services.udiParser
-    * @description A object used to parse UDIs
-    **/
-    function udiParser() {
-        return {
-
-            /**
-             * @ngdoc method
-             * @name umbraco.services.udiParser#parse
-             * @methodOf umbraco.services.udiParser
-             * @function
-             *
-             * @description
-             * Converts the string representation of an entity identifier into the equivalent Udi instance.
-             *
-             * @param {string} input The string to parse
-             * @returns {Object} The parsed UDI or null if input isn't a valid UDI
-             */
-            parse: function(input) {
-                if (!input || typeof input !== "string" || !input.startsWith("umb://"))
-                    return null;
-
-                var lastIndexOfSlash = input.substring("umb://".length).lastIndexOf("/");
-
-                var entityType = lastIndexOfSlash === -1 ? input.substring("umb://".length) : input.substr("umb://".length, lastIndexOfSlash);
-                var value = lastIndexOfSlash === -1 ? null : input.substring("umb://".length + lastIndexOfSlash + 1);
-
-                return {
-                    entityType,
-                    value,
-
-                    toString: function() {
-                        return "umb://" + entityType + (value === null ? "" :  "/" + value);
-                    }
-                }
-            }
-        }
-    }
-
-    angular.module("umbraco.services").factory("udiParser", udiParser);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
deleted file mode 100644
index 5cf975bf8e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
+++ /dev/null
@@ -1,489 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-    * @ngdoc service
-    * @name umbraco.services.umbDataFormatter
-    * @description A helper object used to format/transform JSON Umbraco data, mostly used for persisting data to the server
-    **/
-    function umbDataFormatter() {
-
-        /**
-         * maps the display properties to a property collection for persisting/POSTing
-         * @param {any} tabs
-         */
-        function getContentProperties(tabs) {
-
-            var properties = [];
-
-            _.each(tabs, function (tab) {
-
-                _.each(tab.properties, function (prop) {
-
-                    //don't include the custom generic tab properties
-                    //don't include a property that is marked readonly
-                    if (!prop.alias.startsWith("_umb_") && !prop.readonly) {
-                        properties.push({
-                            id: prop.id,
-                            alias: prop.alias,
-                            value: prop.value
-                        });
-                    }
-                });
-            });
-
-            return properties;
-        }
-
-        return {
-
-            formatChangePasswordModel: function (model) {
-                if (!model) {
-                    return null;
-                }
-                var trimmed = _.omit(model, ["confirm"]);
-
-                //ensure that the pass value is null if all child properties are null
-                var allNull = true;
-                var vals = _.values(trimmed);
-                for (var k = 0; k < vals.length; k++) {
-                    if (vals[k] !== null && vals[k] !== undefined) {
-                        allNull = false;
-                    }
-                }
-                if (allNull) {
-                    return null;
-                }
-
-                return trimmed;
-            },
-
-            formatContentTypePostData: function (displayModel, action) {
-                // Create the save model from the display model
-                var saveModel = _.pick(displayModel,
-                    'compositeContentTypes', 'isContainer', 'allowAsRoot', 'allowedTemplates', 'allowedContentTypes',
-                    'alias', 'description', 'thumbnail', 'name', 'id', 'icon', 'trashed',
-                    'key', 'parentId', 'alias', 'path', 'allowCultureVariant', 'allowSegmentVariant', 'isElement', 'historyCleanup');
-
-                saveModel.allowedTemplates = _.map(displayModel.allowedTemplates, function (t) { return t.alias; });
-                saveModel.defaultTemplate = displayModel.defaultTemplate ? displayModel.defaultTemplate.alias : null;
-                var realGroups = _.reject(displayModel.groups, function (g) {
-                    // Do not include groups with init state
-                    return g.tabState === "init";
-                });
-                saveModel.groups = _.map(realGroups, function (g) {
-                    var saveGroup = _.pick(g, 'id', 'sortOrder', 'name', 'key', 'alias', 'type');
-
-                    var realProperties = _.reject(g.properties, function (p) {
-                        // Do not include properties with init state or inherited from a composition
-                        return p.propertyState === "init" || p.inherited === true;
-                    });
-
-                    var saveProperties = _.map(realProperties, function (p) {
-                        var saveProperty = _.pick(p, 'id', 'alias', 'description', 'validation', 'label', 'sortOrder', 'dataTypeId', 'groupId', 'memberCanEdit', 'showOnMemberProfile', 'isSensitiveData', 'allowCultureVariant', 'allowSegmentVariant', 'labelOnTop');
-                        return saveProperty;
-                    });
-
-                    saveGroup.properties = saveProperties;
-
-                    if (g.inherited === true) {
-                        if (saveProperties.length === 0) {
-                            // All properties are inherited from the compositions, no need to save this group
-                            return null;
-                        } else if (g.contentTypeId != saveModel.id) {
-                            // We have local properties, but the group id is not local, ensure a new id/key is generated on save
-                            saveGroup = _.omit(saveGroup, 'id', 'key');
-                        }
-                    }
-
-                    return saveGroup;
-                });
-
-                saveModel.groups = _.reject(saveModel.groups, function (g) {
-                    // Do not include empty/null groups
-                    return !g;
-                });
-
-                return saveModel;
-            },
-
-            /** formats the display model used to display the data type to the model used to save the data type */
-            formatDataTypePostData: function (displayModel, preValues, action) {
-                var saveModel = {
-                    parentId: displayModel.parentId,
-                    id: displayModel.id,
-                    name: displayModel.name,
-                    selectedEditor: displayModel.selectedEditor,
-                    //set the action on the save model
-                    action: action,
-                    preValues: []
-                };
-                for (var i = 0; i < preValues.length; i++) {
-
-                    saveModel.preValues.push({
-                        key: preValues[i].alias,
-                        value: preValues[i].value
-                    });
-                }
-                return saveModel;
-            },
-
-            /** formats the display model used to display the dictionary to the model used to save the dictionary */
-            formatDictionaryPostData: function (dictionary, nameIsDirty) {
-                var saveModel = {
-                    parentId: dictionary.parentId,
-                    id: dictionary.id,
-                    name: dictionary.name,
-                    nameIsDirty: nameIsDirty,
-                    translations: [],
-                    key: dictionary.key
-                };
-
-                for (var i = 0; i < dictionary.translations.length; i++) {
-                    saveModel.translations.push({
-                        isoCode: dictionary.translations[i].isoCode,
-                        languageId: dictionary.translations[i].languageId,
-                        translation: dictionary.translations[i].translation
-                    });
-                }
-
-                return saveModel;
-            },
-
-            /** formats the display model used to display the user to the model used to save the user */
-            formatUserPostData: function (displayModel) {
-
-                //create the save model from the display model
-                var saveModel = _.pick(displayModel, 'id', 'parentId', 'name', 'username', 'culture', 'email', 'startContentIds', 'startMediaIds', 'userGroups', 'message', 'key');
-
-                //make sure the userGroups are just a string array
-                var currGroups = saveModel.userGroups;
-                var formattedGroups = [];
-                for (var i = 0; i < currGroups.length; i++) {
-                    if (!Utilities.isString(currGroups[i])) {
-                        formattedGroups.push(currGroups[i].alias);
-                    }
-                    else {
-                        formattedGroups.push(currGroups[i]);
-                    }
-                }
-                saveModel.userGroups = formattedGroups;
-
-                //make sure the startnodes are just a string array
-                var props = ["startContentIds", "startMediaIds"];
-                for (var m = 0; m < props.length; m++) {
-                    var startIds = saveModel[props[m]];
-                    if (!startIds) {
-                        continue;
-                    }
-                    var formattedIds = [];
-                    for (var j = 0; j < startIds.length; j++) {
-                        formattedIds.push(Number(startIds[j].id));
-                    }
-                    saveModel[props[m]] = formattedIds;
-                }
-
-                return saveModel;
-            },
-
-            /** formats the display model used to display the user group to the model used to save the user group*/
-            formatUserGroupPostData: function (displayModel, action) {
-                //create the save model from the display model
-                var saveModel = _.pick(displayModel, 'id', 'alias', 'name', 'icon', 'sections', 'users', 'defaultPermissions', 'assignedPermissions', 'languages', 'hasAccessToAllLanguages');
-
-                // the start nodes cannot be picked as the property name needs to change - assign manually
-                saveModel.startContentId = displayModel['contentStartNode'];
-                saveModel.startMediaId = displayModel['mediaStartNode'];
-
-                //set the action on the save model
-                saveModel.action = action;
-                if (!saveModel.id) {
-                    saveModel.id = 0;
-                }
-
-                //the permissions need to just be the array of permission letters, currently it will be a dictionary of an array
-                var currDefaultPermissions = saveModel.defaultPermissions;
-                var saveDefaultPermissions = [];
-                _.each(currDefaultPermissions, function (value, key, list) {
-                    _.each(value, function (element, index, list) {
-                        if (element.checked) {
-                            saveDefaultPermissions.push(element.permissionCode);
-                        }
-                    });
-                });
-                saveModel.defaultPermissions = saveDefaultPermissions;
-
-                //now format that assigned/content permissions
-                var currAssignedPermissions = saveModel.assignedPermissions;
-                var saveAssignedPermissions = {};
-                _.each(currAssignedPermissions, function (nodePermissions, index) {
-                    saveAssignedPermissions[nodePermissions.id] = [];
-                    _.each(nodePermissions.allowedPermissions, function (permission, index) {
-                        if (permission.checked) {
-                            saveAssignedPermissions[nodePermissions.id].push(permission.permissionCode);
-                        }
-                    });
-                });
-                saveModel.assignedPermissions = saveAssignedPermissions;
-
-
-                //make sure the sections are just a string array
-                var currSections = saveModel.sections;
-                var formattedSections = [];
-                for (var i = 0; i < currSections.length; i++) {
-                    if (!Utilities.isString(currSections[i])) {
-                        formattedSections.push(currSections[i].alias);
-                    }
-                    else {
-                        formattedSections.push(currSections[i]);
-                    }
-                }
-                saveModel.sections = formattedSections;
-
-                //make sure the user are just an int array
-                var currUsers = saveModel.users;
-                var formattedUsers = [];
-                for (var j = 0; j < currUsers.length; j++) {
-                    if (!Utilities.isNumber(currUsers[j])) {
-                        formattedUsers.push(currUsers[j].id);
-                    }
-                    else {
-                        formattedUsers.push(currUsers[j]);
-                    }
-                }
-                saveModel.users = formattedUsers;
-
-                //make sure the startnodes are just an int if one is set
-                var props = ["startContentId", "startMediaId"];
-                for (var m = 0; m < props.length; m++) {
-                    var startId = saveModel[props[m]];
-                    if (!startId) {
-                        continue;
-                    }
-                    saveModel[props[m]] = startId.id;
-                }
-
-                // make sure the allowed languages are just an array of id's
-                saveModel.allowedLanguages = saveModel.languages && saveModel.languages.length > 0 ? saveModel.languages.map(language => language.id) : [];
-
-                saveModel.parentId = -1;
-                return saveModel;
-            },
-
-            /** formats the display model used to display the member to the model used to save the member */
-            formatMemberPostData: function (displayModel, action) {
-                //this is basically the same as for media but we need to explicitly add the username, email, password to the save model
-
-                var saveModel = this.formatMediaPostData(displayModel, action);
-
-                saveModel.key = displayModel.key;
-
-                // Map membership properties
-                _.each(displayModel.membershipProperties, prop => {
-                  if(prop.readonly === false){
-                    switch (prop.alias) {
-                        case '_umb_login':
-                            saveModel.username = prop.value.trim();
-                            break;
-                        case '_umb_email':
-                            saveModel.email = prop.value.trim();
-                            break;
-                        case '_umb_password':
-                            saveModel.password = this.formatChangePasswordModel(prop.value);
-                            break;
-                        case '_umb_membergroup':
-                            saveModel.memberGroups = _.keys(_.pick(prop.value, value => value === true));
-                            break;
-                        case '_umb_approved':
-                            saveModel.isApproved = prop.value == true;
-                            break;
-                        case '_umb_lockedOut':
-                            saveModel.isLockedOut = prop.value == true;
-                            break;
-                        case '_umb_twoFactorEnabled':
-                            saveModel.isTwoFactorEnabled = prop.value == true;
-                            break;
-                    }
-                  }
-                });
-
-                // saveModel.password = this.formatChangePasswordModel(propPass.value);
-                //
-                // var selectedGroups = [];
-                // for (var n in propGroups.value) {
-                //     if (propGroups.value[n] === true) {
-                //         selectedGroups.push(n);
-                //     }
-                // }
-                // saveModel.memberGroups = selectedGroups;
-
-                // Map custom member provider properties
-                var memberProviderPropAliases = _.pairs(displayModel.fieldConfig);
-                _.each(displayModel.tabs, tab => {
-                    _.each(tab.properties, prop => {
-                        var foundAlias = _.find(memberProviderPropAliases, item => prop.alias === item[1]);
-                        if (foundAlias) {
-                            // we know the current property matches an alias, now we need to determine which membership provider property it was for
-                            // by looking at the key
-                            switch (foundAlias[0]) {
-                                case "umbracoMemberLockedOut":
-                                    saveModel.isLockedOut = Object.toBoolean(prop.value);
-                                    break;
-                                case "umbracoMemberApproved":
-                                    saveModel.isApproved = Object.toBoolean(prop.value);
-                                    break;
-                                case "umbracoMemberComments":
-                                    saveModel.comments = prop.value;
-                                    break;
-                            }
-                        }
-                    });
-                });
-
-                return saveModel;
-            },
-
-            /** formats the display model used to display the media to the model used to save the media */
-            formatMediaPostData: function (displayModel, action) {
-                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but
-                // we don't want to post all of the data as it is unecessary.
-                var saveModel = {
-                    id: displayModel.id,
-                    properties: getContentProperties(displayModel.tabs),
-                    name: displayModel.name,
-                    contentTypeAlias: displayModel.contentTypeAlias,
-                    parentId: displayModel.parentId,
-                    //set the action on the save model
-                    action: action
-                };
-
-                return saveModel;
-            },
-
-            /** formats the display model used to display the content to the model used to save the content  */
-            formatContentPostData: function (displayModel, action) {
-
-                //NOTE: the display model inherits from the save model so we can in theory just post up the display model but
-                // we don't want to post all of the data as it is unecessary.
-                var saveModel = {
-                    id: displayModel.id,
-                    name: displayModel.name,
-                    contentTypeAlias: displayModel.contentTypeAlias,
-                    parentId: displayModel.parentId,
-                    //set the action on the save model
-                    action: action,
-                    variants: _.map(displayModel.variants, function (v) {
-                        return {
-                            name: v.name || "", //if its null/empty,we must pass up an empty string else we get json converter errors
-                            properties: getContentProperties(v.tabs),
-                            culture: v.language ? v.language.culture : null,
-                            segment: v.segment,
-                            publish: v.publish,
-                            save: v.save,
-                            releaseDate: v.releaseDate,
-                            expireDate: v.expireDate
-                        };
-                    })
-                };
-
-                var propExpireDate = displayModel.removeDate;
-                var propReleaseDate = displayModel.releaseDate;
-                var propTemplate = displayModel.template;
-
-                saveModel.expireDate = propExpireDate ? propExpireDate : null;
-                saveModel.releaseDate = propReleaseDate ? propReleaseDate : null;
-                saveModel.templateAlias = propTemplate ? propTemplate : null;
-
-                return saveModel;
-            },
-
-            /**
-             * This formats the server GET response for a content display item
-             * @param {} displayModel
-             * @returns {}
-             */
-            formatContentGetData: function (displayModel) {
-
-                // We need to check for invariant properties among the variant variants,
-                // as the value of an invariant property is shared between different variants.
-                // A property can be culture invariant, segment invariant, or both.
-                // When we detect this, we want to make sure that the property object instance is the
-                // same reference object between all variants instead of a copy (which it will be when
-                // return from the JSON structure).
-
-                if (displayModel.variants && displayModel.variants.length > 1) {
-                    // Collect all invariant properties from the variants that are either the
-                    // default language variant or the default segment variant.
-                    var defaultVariants = _.filter(displayModel.variants, function (variant) {
-                        var isDefaultLanguage = variant.language && variant.language.isDefault;
-                        var isDefaultSegment = variant.segment == null;
-
-                        return isDefaultLanguage || isDefaultSegment;
-                    });
-
-                    if (defaultVariants.length > 0) {
-                        _.each(defaultVariants, function (defaultVariant) {
-                            var invariantProps = [];
-
-                            _.each(defaultVariant.tabs, function (tab, tabIndex) {
-                                _.each(tab.properties, function (property, propIndex) {
-                                    // culture == null -> property is culture invariant
-                                    // segment == null -> property is *possibly* segment invariant
-                                    if (!property.culture || !property.segment) {
-                                        invariantProps.push({
-                                            tabIndex: tabIndex,
-                                            propIndex: propIndex,
-                                            property: property
-                                        });
-                                    }
-                                });
-                            });
-
-                            var otherVariants = _.filter(displayModel.variants, function (variant) {
-                                return variant !== defaultVariant;
-                            });
-
-                            // now assign this same invariant property instance to the same index of the other variants property array
-                            _.each(otherVariants, function (variant) {
-                                _.each(invariantProps, function (invProp) {
-                                    var tab = variant.tabs[invProp.tabIndex];
-                                    var prop = tab.properties[invProp.propIndex];
-
-                                    var inheritsCulture = prop.culture === invProp.property.culture && prop.segment == null && invProp.property.segment == null;
-                                    var inheritsSegment = prop.segment === invProp.property.segment && !prop.culture;
-
-                                    if (inheritsCulture || inheritsSegment) {
-                                        tab.properties[invProp.propIndex] = invProp.property;
-                                    }
-                                });
-                            });
-                        });
-                    }
-                }
-
-                return displayModel;
-            },
-
-            /**
-             * Formats the display model used to display the relation type to a model used to save the relation type.
-             * @param {Object} relationType
-             */
-            formatRelationTypePostData: function (relationType) {
-                var saveModel = {
-                    id: relationType.id,
-                    name: relationType.name,
-                    alias: relationType.alias,
-                    key: relationType.key,
-                    isBidirectional: relationType.isBidirectional,
-                    isDependency: relationType.isDependency,
-                    parentObjectType: relationType.parentObjectType,
-                    childObjectType: relationType.childObjectType
-                };
-
-                return saveModel;
-            }
-        };
-    }
-    angular.module('umbraco.services').factory('umbDataFormatter', umbDataFormatter);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
deleted file mode 100644
index 1141a0f1a1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
+++ /dev/null
@@ -1,490 +0,0 @@
-/**
-* @ngdoc service
-* @name umbraco.services.umbRequestHelper
-* @description A helper object used for sending requests to the server
-**/
-function umbRequestHelper($http, $q, notificationsService, eventsService, formHelper, overlayService) {
-
-    return {
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.umbRequestHelper#convertVirtualToAbsolutePath
-         * @methodOf umbraco.services.umbRequestHelper
-         * @function
-         *
-         * @description
-         * This will convert a virtual path (i.e. ~/App_Plugins/Blah/Test.html ) to an absolute path
-         *
-         * @param {string} a virtual path, if this is already an absolute path it will just be returned, if this is a relative path an exception will be thrown
-         */
-        convertVirtualToAbsolutePath: function (virtualPath) {
-            if (virtualPath.startsWith("/")) {
-                return virtualPath;
-            }
-            if (!virtualPath.startsWith("~/")) {
-                throw "The path " + virtualPath + " is not a virtual path";
-            }
-            if (!Umbraco.Sys.ServerVariables.application.applicationPath) {
-                throw "No applicationPath defined in Umbraco.ServerVariables.application.applicationPath";
-            }
-            return Umbraco.Sys.ServerVariables.application.applicationPath + virtualPath.trimStart("~/");
-        },
-
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.umbRequestHelper#dictionaryToQueryString
-         * @methodOf umbraco.services.umbRequestHelper
-         * @function
-         *
-         * @description
-         * This will turn an array of key/value pairs or a standard dictionary into a query string
-         *
-         * @param {Array} queryStrings An array of key/value pairs
-         */
-        dictionaryToQueryString: function (queryStrings) {
-
-            if (Utilities.isArray(queryStrings)) {
-                return _.map(queryStrings, function (item) {
-                    var key = null;
-                    var val = null;
-                    for (var k in item) {
-                        key = k;
-                        val = item[k];
-                        break;
-                    }
-                    if (key === null || val === null) {
-                        throw "The object in the array was not formatted as a key/value pair";
-                    }
-                    return encodeURIComponent(key) + "=" + encodeURIComponent(val);
-                }).join("&");
-            }
-            else if (Utilities.isObject(queryStrings)) {
-
-                //this allows for a normal object to be passed in (ie. a dictionary)
-                return decodeURIComponent($.param(queryStrings));
-            }
-
-            throw "The queryString parameter is not an array or object of key value pairs";
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.services.umbRequestHelper#getApiUrl
-         * @methodOf umbraco.services.umbRequestHelper
-         * @function
-         *
-         * @description
-         * This will return the webapi Url for the requested key based on the servervariables collection
-         *
-         * @param {string} apiName The webapi name that is found in the servervariables["umbracoUrls"] dictionary
-         * @param {string} actionName The webapi action name
-         * @param {object} queryStrings Can be either a string or an array containing key/value pairs
-         */
-        getApiUrl: function (apiName, actionName, queryStrings) {
-            if (!Umbraco || !Umbraco.Sys || !Umbraco.Sys.ServerVariables || !Umbraco.Sys.ServerVariables["umbracoUrls"]) {
-                throw "No server variables defined!";
-            }
-
-            if (!Umbraco.Sys.ServerVariables["umbracoUrls"][apiName]) {
-                throw "No url found for api name " + apiName;
-            }
-
-            return Umbraco.Sys.ServerVariables["umbracoUrls"][apiName] + actionName +
-                (!queryStrings ? "" : "?" + (Utilities.isString(queryStrings) ? queryStrings : this.dictionaryToQueryString(queryStrings)));
-
-        },
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.umbRequestHelper#resourcePromise
-         * @methodOf umbraco.services.umbRequestHelper
-         * @function
-         *
-         * @description
-         * This returns a promise with an underlying http call, it is a helper method to reduce
-         *  the amount of duplicate code needed to query http resources and automatically handle any
-         *  Http errors. See /docs/source/using-promises-resources.md
-         *
-         * @param {object} opts A mixed object which can either be a string representing the error message to be
-         *   returned OR an object containing either:
-         *     { success: successCallback, errorMsg: errorMessage }
-         *          OR
-         *     { success: successCallback, error: errorCallback }
-         *   In both of the above, the successCallback must accept these parameters: data, status, headers, config
-         *   If using the errorCallback it must accept these parameters: data, status, headers, config
-         *   The success callback must return the data which will be resolved by the deferred object.
-         *   The error callback must return an object containing: {errorMsg: errorMessage, data: originalData, status: status }
-         */
-        resourcePromise: function (httpPromise, opts) {
-
-            /** The default success callback used if one is not supplied in the opts */
-            function defaultSuccess(data, status, headers, config) {
-                //when it's successful, just return the data
-                return data;
-            }
-
-            /** The default error callback used if one is not supplied in the opts */
-            function defaultError(data, status, headers, config) {
-
-                var err = {
-                    //NOTE: the default error message here should never be used based on the above docs!
-                    errorMsg: (Utilities.isString(opts) ? opts : 'An error occurred!'),
-                    data: data,
-                    status: status
-                };
-
-                // if "opts" is a promise, we set "err.errorMsg" to be that promise
-                if (typeof (opts) == "object" && typeof (opts.then) == "function") {
-                    err.errorMsg = opts;
-                }
-
-                return err;
-
-            }
-
-            //create the callbacs based on whats been passed in.
-            var callbacks = {
-                success: (!opts || !opts.success) ? defaultSuccess : opts.success,
-                error: (!opts || !opts.error ? defaultError : opts.error)
-            };
-
-            return httpPromise.then(function (response) {
-
-                //invoke the callback
-                var result = callbacks.success.apply(this, [response.data, response.status, response.headers, response.config]);
-
-                formHelper.showNotifications(response.data);
-
-                //when it's successful, just return the data
-                return $q.resolve(result);
-
-            }, function (response) {
-
-                if (!response) {
-                    return; //sometimes oddly this happens, nothing we can do
-                }
-
-                if (!response.status) {
-                    //this is a JS/angular error
-                    return $q.reject(response);
-                }
-
-                //invoke the callback
-                var result = callbacks.error.apply(this, [response.data, response.status, response.headers, response.config]);
-
-                //when there's a 500 (unhandled) error show a YSOD overlay if debugging is enabled.
-                if (response.status >= 500 && response.status < 600) {
-
-                    //show a ysod dialog
-                    if (Umbraco.Sys.ServerVariables["isDebuggingEnabled"] === true) {
-                        const error = { errorMsg: 'An error occurred', data: response.data };
-                        // TODO: All YSOD handling should be done with an interceptor
-                        overlayService.ysod(error);
-                    }
-                    else {
-                        //show a simple error notification
-                        notificationsService.error("Server error", "Contact administrator, see log for full details.<br/><i>" + result.errorMsg + "</i>");
-                    }
-
-                }
-                else {
-                    formHelper.showNotifications(result.data);
-                }
-
-                //return an error object including the error message for UI
-                return $q.reject({
-                    errorMsg: result.errorMsg,
-                    data: result.data,
-                    status: result.status,
-                    xhrStatus: response.xhrStatus
-                });
-            });
-
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#postSaveContent
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Used for saving content/media/members specifically
-         *
-         * @param {Object} args arguments object
-         * @returns {Promise} http promise object.
-         */
-        postSaveContent: function (args) {
-
-            if (!args.restApiUrl) {
-                throw "args.restApiUrl is a required argument";
-            }
-            if (!args.content) {
-                throw "args.content is a required argument";
-            }
-            if (!args.action) {
-                throw "args.action is a required argument";
-            }
-            if (!args.files) {
-                throw "args.files is a required argument";
-            }
-            if (!args.dataFormatter) {
-                throw "args.dataFormatter is a required argument";
-            }
-            if (args.showNotifications === null || args.showNotifications === undefined) {
-                args.showNotifications = true;
-            }
-
-            //save the active tab id so we can set it when the data is returned.
-            var activeTab = _.find(args.content.tabs, function (item) {
-                return item.active;
-            });
-            var activeTabIndex = (activeTab === undefined ? 0 : _.indexOf(args.content.tabs, activeTab));
-
-            //save the data
-            return this.postMultiPartRequest(
-                args.restApiUrl,
-                { key: "contentItem", value: args.dataFormatter(args.content, args.action) },
-                //data transform callback:
-                function (data, formData) {
-                    //now add all of the assigned files
-                    for (var f in args.files) {
-                        //each item has a property alias and the file object, we'll ensure that the alias is suffixed to the key
-                        // so we know which property it belongs to on the server side
-                        var file = args.files[f];
-                        var fileKey = "file_" + (file.alias || '').replace(/_/g, '\\_') + "_" + (file.culture ? file.culture.replace(/_/g, '\\_') : "") + "_" + (file.segment ? file.segment.replace(/_/g, '\\_') : "");
-
-                        if (Utilities.isArray(file.metaData) && file.metaData.length > 0) {
-                            fileKey += ("_" + _.map(file.metaData, x => ('' + x).replace(/_/g, '\\_')).join("_"));
-                        }
-                        formData.append(fileKey, file.file);
-                    }
-                }).then(function (response) {
-                    //success callback
-
-                    //reset the tabs and set the active one
-                    if (response.data.tabs && response.data.tabs.length > 0) {
-                        response.data.tabs.forEach(item => item.active = false);
-                        response.data.tabs[activeTabIndex].active = true;
-                    }
-
-                    if (args.showNotifications) {
-                        formHelper.showNotifications(response.data);
-                    }
-
-                    // TODO: Do we need to pass the result through umbDataFormatter.formatContentGetData? Right now things work so not sure but we should check
-
-                    //the data returned is the up-to-date data so the UI will refresh
-                    return $q.resolve(response.data);
-                }, function (response) {
-
-                    if (!response.status) {
-                        //this is a JS/angular error
-                        return $q.reject(response);
-                    }
-
-                    //when there's a 500 (unhandled) error show a YSOD overlay if debugging is enabled.
-                    if (response.status >= 500 && response.status < 600) {
-
-                        //This is a bit of a hack to check if the error is due to a file being uploaded that is too large,
-                        // we have to just check for the existence of a string value but currently that is the best way to
-                        // do this since it's very hacky/difficult to catch this on the server
-                        if (typeof response.data !== "undefined" && typeof response.data.indexOf === "function" && response.data.indexOf("Maximum request length exceeded") >= 0) {
-                            notificationsService.error("Server error", "The uploaded file was too large, check with your site administrator to adjust the maximum size allowed");
-                        }
-                        else if (Umbraco.Sys.ServerVariables["isDebuggingEnabled"] === true) {
-                            //show a ysod dialog
-                            const error = { errorMsg: 'An error occurred', data: response.data };
-                            // TODO: All YSOD handling should be done with an interceptor
-                            overlayService.ysod(error);
-                        }
-                        else {
-                            //show a simple error notification
-                            notificationsService.error("Server error", "Contact administrator, see log for full details.<br/><i>" + response.data.ExceptionMessage + "</i>");
-                        }
-
-                    }
-                    else if (args.showNotifications) {
-                        formHelper.showNotifications(response.data);
-                    }
-
-                    //return an error object including the error message for UI
-                    return $q.reject({
-                        errorMsg: 'An error occurred',
-                        data: response.data,
-                        status: response.status
-                    });
-
-                });
-        },
-
-        /** Posts a multi-part mime request to the server */
-        postMultiPartRequest: function (url, jsonData, transformCallback) {
-
-            //validate input, jsonData can be an array of key/value pairs or just one key/value pair.
-            if (!jsonData) { throw "jsonData cannot be null"; }
-
-            if (Utilities.isArray(jsonData)) {
-                jsonData.forEach(item => {
-                    if (!item.key || !item.value) { throw "jsonData array item must have both a key and a value property"; }
-                });
-            }
-            else if (!jsonData.key || !jsonData.value) { throw "jsonData object must have both a key and a value property"; }
-
-            return $http({
-                method: 'POST',
-                url: url,
-                //IMPORTANT!!! You might think this should be set to 'multipart/form-data' but this is not true because when we are sending up files
-                // the request needs to include a 'boundary' parameter which identifies the boundary name between parts in this multi-part request
-                // and setting the Content-type manually will not set this boundary parameter. For whatever reason, setting the Content-type to 'undefined'
-                // will force the request to automatically populate the headers properly including the boundary parameter.
-                headers: { 'Content-Type': undefined },
-                transformRequest: function (data) {
-                    var formData = new FormData();
-                    //add the json data
-                    if (Utilities.isArray(data)) {
-                        data.forEach(item => {
-                            formData.append(item.key, !Utilities.isString(item.value) ? Utilities.toJson(item.value) : item.value);
-                        });
-                    }
-                    else {
-                        formData.append(data.key, !Utilities.isString(data.value) ? Utilities.toJson(data.value) : data.value);
-                    }
-
-                    //call the callback
-                    if (transformCallback) {
-                        transformCallback.apply(this, [data, formData]);
-                    }
-
-                    return formData;
-                },
-                data: jsonData
-            }).then(function (response) {
-                return $q.resolve(response);
-            }, function (response) {
-                return $q.reject(response);
-            });
-        },
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.contentResource#downloadFile
-         * @methodOf umbraco.resources.contentResource
-         *
-         * @description
-         * Downloads a file to the client using AJAX/XHR
-         *
-         * @param {string} httpPath the path (url) to the resource being downloaded
-         * @returns {Promise} http promise object.
-         */
-        downloadFile: function (httpPath) {
-
-            /**
-             * Based on an implementation here: web.student.tuwien.ac.at/~e0427417/jsdownload.html
-             * See https://stackoverflow.com/a/24129082/694494
-             */
-
-            // Use an arraybuffer
-            return $http.get(httpPath, { responseType: 'arraybuffer' })
-                .then(function (response) {
-
-                    var octetStreamMime = 'application/octet-stream';
-                    var success = false;
-                    var blob, url;
-
-                    // Get the headers
-                    var headers = response.headers();
-
-                    // Get the filename from the x-filename header or default to "download.bin"
-                    var filename = headers['x-filename'] || 'download.bin';
-
-                    filename = decodeURIComponent(filename);
-
-                    // Determine the content type from the header or default to "application/octet-stream"
-                    var contentType = headers['content-type'] || octetStreamMime;
-
-                    try {
-                        // Try using msSaveBlob if supported
-                        blob = new Blob([response.data], { type: contentType });
-                        if (navigator.msSaveBlob)
-                            navigator.msSaveBlob(blob, filename);
-                        else {
-                            // Try using other saveBlob implementations, if available
-                            var saveBlob = navigator.webkitSaveBlob || navigator.mozSaveBlob || navigator.saveBlob;
-                            if (saveBlob === undefined) throw "Not supported";
-                            saveBlob(blob, filename);
-                        }
-                        success = true;
-                    } catch (ex) {
-                        console.log("saveBlob method failed with the following exception:");
-                        console.log(ex);
-                    }
-
-                    if (!success) {
-                        // Get the blob url creator
-                        var urlCreator = window.URL || window.webkitURL || window.mozURL || window.msURL;
-                        if (urlCreator) {
-                            // Try to use a download link
-                            var link = document.createElement('a');
-                            if ('download' in link) {
-                                // Try to simulate a click
-                                try {
-                                    // Prepare a blob URL
-                                    blob = new Blob([response.data], { type: contentType });
-                                    url = urlCreator.createObjectURL(blob);
-                                    link.setAttribute('href', url);
-
-                                    // Set the download attribute (Supported in Chrome 14+ / Firefox 20+)
-                                    link.setAttribute("download", filename);
-
-                                    // Simulate clicking the download link
-                                    var event = document.createEvent('MouseEvents');
-                                    event.initMouseEvent('click', true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, null);
-                                    link.dispatchEvent(event);
-                                    success = true;
-
-                                } catch (ex) {
-                                    console.log("Download link method with simulated click failed with the following exception:");
-                                    console.log(ex);
-                                }
-                            }
-
-                            if (!success) {
-                                // Fallback to window.location method
-                                try {
-                                    // Prepare a blob URL
-                                    // Use application/octet-stream when using window.location to force download
-                                    blob = new Blob([response.data], { type: octetStreamMime });
-                                    url = urlCreator.createObjectURL(blob);
-                                    window.location = url;
-                                    success = true;
-                                } catch (ex) {
-                                    console.log("Download link method with window.location failed with the following exception:");
-                                    console.log(ex);
-                                }
-                            }
-
-                        }
-                    }
-
-                    if (!success) {
-                        // Fallback to window.open method
-                        window.open(httpPath, '_blank', '');
-                    }
-
-                    return $q.resolve(response);
-
-                }, function (response) {
-
-                    return $q.reject({
-                        errorMsg: "An error occurred downloading the file",
-                        data: response.data,
-                        status: response.status
-                    });
-                });
-        }
-    };
-}
-
-angular.module('umbraco.services').factory('umbRequestHelper', umbRequestHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/uploadtracker.service.js b/src/Umbraco.Web.UI.Client/src/common/services/uploadtracker.service.js
deleted file mode 100644
index 46d5543afa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/uploadtracker.service.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
-* @ngdoc service
-* @name umbraco.services.uploadTracker
-* @description a helper to keep track of uploads in progress
-**/
-function uploadTracker(eventsService) {
-
-  const uploadsInProgress = [];
-  const events = {};
-
-  /**
-   * @ngdoc function
-   * @name umbraco.services.uploadTracker#uploadStarted
-   * @methodOf umbraco.services.uploadTracker
-   * @function
-   *
-   * @description
-   * Called when an upload is started to inform listeners that an upload is in progress. This will raise the uploadTracker.uploadsInProgressChanged event.
-   *
-   * @param {string} entityKey The key of the entity where the upload is taking place
-   */
-  function uploadStarted (entityKey) {
-    const uploadDetails = {
-      entityKey
-    };
-
-    uploadsInProgress.push(uploadDetails);
-    eventsService.emit('uploadTracker.uploadsInProgressChanged', { uploadsInProgress });
-  }
-
-  /**
-   * @ngdoc function
-   * @name umbraco.services.uploadTracker#uploadEnded
-   * @methodOf umbraco.services.uploadTracker
-   * @function
-   *
-   * @description
-   * Called when an upload is ended to inform listeners that an upload has stopped. This will raise the uploadTracker.uploadsInProgressChanged event.
-   *
-   * @param {string} entityKey The key of the entity where the upload has stopped.
-   */
-  function uploadEnded (entityKey) {
-    const index = uploadsInProgress.findIndex(upload => upload.entityKey === entityKey);
-    uploadsInProgress.splice(index, 1);
-    eventsService.emit('uploadTracker.uploadsInProgressChanged', { uploadsInProgress });
-  }
-
-  return {
-    uploadStarted,
-    uploadEnded
-  };
-}
-
-angular.module('umbraco.services').factory('uploadTracker', uploadTracker);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/urlhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/urlhelper.service.js
deleted file mode 100644
index 7bac830bd1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/urlhelper.service.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
-* @ngdoc service
-* @name umbraco.services.urlHelper
-* @description A helper used to work with URLs
-**/
-
-(function () {
-    "use strict";
-
-    function urlHelper($window) {
-
-        var pl = /\+/g;  // Regex for replacing addition symbol with a space
-        var search = /([^&=]+)=?([^&]*)/g;
-        var decode = function (s) { return decodeURIComponent(s.replace(pl, " ")); };
-
-        //Used for browsers that don't support $window.URL
-        function polyFillUrl(url) {
-            var parser = document.createElement('a');
-            // Let the browser do the work
-            parser.href = url;
-
-            return {
-                protocol: parser.protocol,
-                host: parser.host,
-                hostname: parser.hostname,
-                port: parser.port,
-                pathname: parser.pathname,
-                search: parser.search,
-                hash: parser.hash
-            };
-        }
-
-        return {
-
-            /**
-             * @ngdoc function
-             * @name parseUrl
-             * @methodOf umbraco.services.urlHelper
-             * @function
-             *
-             * @description
-             * Returns an object representing each part of the url
-             * 
-             * @param {string} url the url string to parse
-             */
-            parseUrl: function (url) {
-
-                //create a URL object based on either the native URL method or the polyfill method
-                var urlObj = $window.URL ? new $window.URL(url) : polyFillUrl(url);
-                //append the searchObject
-                urlObj.searchObject = this.getQueryStringParams(urlObj.search);
-                return urlObj;
-            },
-
-            /**
-             * @ngdoc function
-             * @name parseHashIntoUrl
-             * @methodOf umbraco.services.urlHelper
-             * @function
-             *
-             * @description
-             * If the hash of a URL contains a path + query strings, this will parse the hash into a url object
-             * 
-             * @param {string} url the url string to parse
-             */
-            parseHashIntoUrl: function (url) {
-                var urlObj = this.parseUrl(url);
-                if (!urlObj.hash) {
-                    throw new "No hash found in url: " + url;
-                }
-                if (!urlObj.hash.startsWith("#/")) {
-                    throw new "The hash in url does not contain a path to parse: " + url;
-                }
-                //now create a fake full URL with the hash
-                var fakeUrl = "http://fakeurl.com" + urlObj.hash.trimStart("#");
-                var fakeUrlObj = this.parseUrl(fakeUrl);
-                return fakeUrlObj;
-            },
-
-            /**
-             * @ngdoc function
-             * @name getQueryStringParams
-             * @methodOf umbraco.services.urlHelper
-             * @function
-             *
-             * @description
-             * Returns a dictionary of query string key/vals
-             * 
-             * @param {string} location optional URL to parse, the default will use $window.location
-             */
-            getQueryStringParams: function (location) {
-                var match;
-
-                //use the current location if none specified
-                var query = location ? location.substring(1) : $window.location.search.substring(1);
-
-                var urlParams = {};
-                while ((match = search.exec(query))) {
-                    urlParams[decode(match[1])] = decode(match[2]);
-                }
-
-                return urlParams;
-            }
-        };
-    }
-    angular.module('umbraco.services').factory('urlHelper', urlHelper);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
deleted file mode 100644
index 71141106bf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
+++ /dev/null
@@ -1,303 +0,0 @@
-angular.module('umbraco.services')
-    .factory('userService', function ($rootScope, eventsService, $q, $location, $window, requestRetryQueue, authResource, emailMarketingResource, $timeout, angularHelper) {
-
-        var currentUser = null;
-        var lastUserId = null;
-
-        //this tracks the last date/time that the user's remainingAuthSeconds was updated from the server
-        // this is used so that we know when to go and get the user's remaining seconds directly.
-        var lastServerTimeoutSet = null;
-
-        eventsService.on("editors.languages.languageSaved", () => {
-            service.refreshCurrentUser();
-        });
-
-        eventsService.on("editors.userGroups.userGroupSaved", () => {
-            service.refreshCurrentUser();
-        });
-
-        function openLoginDialog(isTimedOut) {
-            //broadcast a global event that the user is no longer logged in
-            const args = { isTimedOut: isTimedOut };
-            eventsService.emit("app.notAuthenticated", args);
-        }
-
-        function retryRequestQueue(success) {
-            if (success) {
-                requestRetryQueue.retryAll(currentUser.name);
-            }
-            else {
-                requestRetryQueue.cancelAll();
-                $location.path('/');
-            }
-        }
-
-        /**
-        This methods will set the current user when it is resolved and
-        will then start the counter to count in-memory how many seconds they have
-        remaining on the auth session
-        */
-        function setCurrentUser(usr) {
-            if (!usr.remainingAuthSeconds) {
-                throw "The user object is invalid, the remainingAuthSeconds is required.";
-            }
-            currentUser = usr;
-            lastServerTimeoutSet = new Date();
-            //start the timer
-            countdownUserTimeout();
-        }
-
-        /**
-        Method to count down the current user's timeout seconds,
-        this will continually count down their current remaining seconds every 5 seconds until
-        there are no more seconds remaining.
-        */
-        function countdownUserTimeout() {
-
-            $timeout(function () {
-
-                if (currentUser) {
-                    //countdown by 5 seconds since that is how long our timer is for.
-                    currentUser.remainingAuthSeconds -= 5;
-
-                    //if there are more than 30 remaining seconds, recurse!
-                    if (currentUser.remainingAuthSeconds > 30) {
-
-                        //we need to check when the last time the timeout was set from the server, if
-                        // it has been more than 30 seconds then we'll manually go and retrieve it from the
-                        // server - this helps to keep our local countdown in check with the true timeout.
-                        if (lastServerTimeoutSet != null) {
-                            var now = new Date();
-                            var seconds = (now.getTime() - lastServerTimeoutSet.getTime()) / 1000;
-
-                            if (seconds > 30) {
-
-                                //first we'll set the lastServerTimeoutSet to null - this is so we don't get back in to this loop while we
-                                // wait for a response from the server otherwise we'll be making double/triple/etc... calls while we wait.
-                                lastServerTimeoutSet = null;
-
-                                //now go get it from the server
-                                //NOTE: the safeApply because our timeout is set to not run digests (performance reasons)
-                                angularHelper.safeApply($rootScope, function () {
-                                    authResource.getRemainingTimeoutSeconds().then(function (result) {
-                                        setUserTimeoutInternal(result);
-                                    });
-                                });
-                            }
-                        }
-
-                        //recurse the countdown!
-                        countdownUserTimeout();
-                    }
-                    else {
-
-                        //we are either timed out or very close to timing out so we need to show the login dialog.
-                        if (Umbraco.Sys.ServerVariables.umbracoSettings.keepUserLoggedIn !== true) {
-                            //NOTE: the safeApply because our timeout is set to not run digests (performance reasons)
-                            angularHelper.safeApply($rootScope, function () {
-                                try {
-                                    //NOTE: We are calling this again so that the server can create a log that the timeout has expired, we
-                                    // don't actually care about this result.
-                                    authResource.getRemainingTimeoutSeconds();
-                                }
-                                finally {
-                                    userAuthExpired();
-                                }
-                            });
-                        }
-                        else {
-                            //we've got less than 30 seconds remaining so let's check the server
-
-                            if (lastServerTimeoutSet != null) {
-                                //first we'll set the lastServerTimeoutSet to null - this is so we don't get back in to this loop while we
-                                // wait for a response from the server otherwise we'll be making double/triple/etc... calls while we wait.
-                                lastServerTimeoutSet = null;
-
-                                //now go get it from the server
-                                //NOTE: the safeApply because our timeout is set to not run digests (performance reasons)
-                                angularHelper.safeApply($rootScope, function () {
-                                    authResource.getRemainingTimeoutSeconds().then(function (result) {
-                                        setUserTimeoutInternal(result);
-                                    });
-                                });
-                            }
-
-                            //recurse the countdown!
-                            countdownUserTimeout();
-
-                        }
-                    }
-                }
-            }, 5000, //every 5 seconds
-                false); //false = do NOT execute a digest for every iteration
-        }
-
-        /** Called to update the current user's timeout */
-        function setUserTimeoutInternal(newTimeout) {
-
-            var asNumber = parseFloat(newTimeout);
-            if (!isNaN(asNumber) && currentUser && Utilities.isNumber(asNumber)) {
-                currentUser.remainingAuthSeconds = newTimeout;
-                lastServerTimeoutSet = new Date();
-            }
-        }
-
-        /** resets all user data, broadcasts the notAuthenticated event and shows the login dialog */
-        function userAuthExpired(isLogout) {
-            //store the last user id and clear the user
-            if (currentUser && currentUser.id !== undefined) {
-                lastUserId = currentUser.id;
-            }
-
-            if (currentUser) {
-                currentUser.remainingAuthSeconds = 0;
-            }
-
-            lastServerTimeoutSet = null;
-            currentUser = null;
-
-            if (!isLogout) {
-              openLoginDialog(true);
-            }
-        }
-
-        // Register a handler for when an item is added to the retry queue
-        requestRetryQueue.onItemAddedCallbacks.push(function (retryItem) {
-            if (requestRetryQueue.hasMore()) {
-                userAuthExpired();
-            }
-        });
-
-        const service = {
-
-            /** Internal method to display the login dialog */
-            _showLoginDialog: function () {
-                openLoginDialog();
-            },
-
-            /** Internal method to retry all request after sucessfull login */
-            _retryRequestQueue: function (success) {
-                retryRequestQueue(success)
-            },
-
-            /** Returns a promise, sends a request to the server to check if the current cookie is authorized  */
-            isAuthenticated: function () {
-                //if we've got a current user then just return true
-                if (currentUser) {
-                    var deferred = $q.defer();
-                    deferred.resolve(true);
-                    return deferred.promise;
-                }
-                return authResource.isAuthenticated();
-            },
-
-            /** Returns a promise, sends a request to the server to validate the credentials  */
-            authenticate: function (login, password) {
-
-                return authResource.performLogin(login, password)
-                    .then(function (data) {
-
-                        // Check if user has a start node set.
-                        if (data.startContentIds.length === 0 && data.startMediaIds.length === 0) {
-                            var errorMsg = "User has no start-nodes";
-                            var result = { errorMsg: errorMsg, user: data, authenticated: false, lastUserId: lastUserId, loginType: "credentials" };
-                            eventsService.emit("app.notAuthenticated", result);
-                            // TODO: How does this make sense? How can you throw from a promise? Does this get caught by the rejection?
-                            // If so then return $q.reject should be used.
-                            throw result;
-                        }
-
-                        return data;
-
-                    }, function (err) {
-                        return $q.reject(err);
-                    }).then(this.setAuthenticationSuccessful);
-            },
-            setAuthenticationSuccessful: function (data) {
-
-                //when it's successful, return the user data
-                setCurrentUser(data);
-
-                this._retryRequestQueue(true);
-
-                var result = { user: data, authenticated: true, lastUserId: lastUserId, loginType: "credentials" };
-
-                //broadcast a global event
-                eventsService.emit("app.authenticated", result);
-                return result;
-            },
-
-            /** Logs the user out
-             */
-            logout: function () {
-
-                return authResource.performLogout()
-                    .then(function (data) {
-                        userAuthExpired(true);
-
-                        const signOutRedirectUrl = data && data.signOutRedirectUrl ? data.signOutRedirectUrl : 'login?logout=true';
-
-                        $window.location.replace(signOutRedirectUrl);
-                    });
-            },
-
-            /** Refreshes the current user data with the data stored for the user on the server and returns it */
-            refreshCurrentUser: function () {
-                var deferred = $q.defer();
-
-                authResource.getCurrentUser()
-                    .then(function (data) {
-
-                        setCurrentUser(data);
-
-                        deferred.resolve(currentUser);
-                    }, function (err) {
-                        //it failed, so they are not logged in
-                        deferred.reject(err);
-                    });
-
-                return deferred.promise;
-            },
-
-            /** Returns the current user object in a promise  */
-            getCurrentUser: function (args) {
-
-                if (!currentUser) {
-                    return authResource.getCurrentUser()
-                        .then(function (data) {
-
-                            var result = { user: data, authenticated: true, lastUserId: lastUserId, loginType: "implicit" };
-
-                            if (args && args.broadcastEvent) {
-                                //broadcast a global event, will inform listening controllers to load in the user specific data
-                                eventsService.emit("app.authenticated", result);
-                            }
-
-                            setCurrentUser(data);
-
-                            return $q.when(currentUser);
-                        }, function (err) {
-                            //it failed, so they are not logged in
-                            return $q.reject(err);
-                        });
-
-                }
-                else {
-                    return $q.when(currentUser);
-                }
-            },
-
-            /** Called whenever a server request is made that contains a x-umb-user-seconds response header for which we can update the user's remaining timeout seconds */
-            setUserTimeout: function (newTimeout) {
-                setUserTimeoutInternal(newTimeout);
-            },
-
-            /** Calls out to a Remote Azure Function to deal with email marketing service */
-            addUserToEmailMarketing: (user) => {
-                return emailMarketingResource.postAddUserToEmailMarketing(user);
-            }
-        };
-
-        return service;
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
deleted file mode 100644
index 65296d6d84..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
+++ /dev/null
@@ -1,63 +0,0 @@
-(function () {
-    'use strict';
-
-    function usersHelperService(localizationService) {
-
-        var userStates = [
-            { "name": "All", "key": "All"} ,
-            { "value": 0, "name": "Active", "key": "Active", "color": "success" },
-            { "value": 1, "name": "Disabled", "key": "Disabled", "color": "danger" },
-            { "value": 2, "name": "Locked out", "key": "LockedOut", "color": "danger" },
-            { "value": 3, "name": "Invited", "key": "Invited", "color": "primary" },
-            { "value": 4, "name": "Inactive", "key": "Inactive", "color": "warning" }
-        ];
-
-        localizationService.localizeMany(userStates.map(userState => "user_state" + userState.key))
-            .then(data => {
-                var reg = /^\[[\S\s]*]$/g;
-                data.forEach((value, index) => {
-                    if (!reg.test(value)) {
-                        // Only translate if key exists
-                        userStates[index].name = value;
-                    }
-                });
-            });
-
-        function getUserStateFromValue(value) {        
-            return userStates.find(userState => userState.value === value);
-        }
-
-        function getUserStateByKey(key) {
-            return userStates.find(userState => userState.key === key);           
-        }
-
-        function getUserStatesFilter(userStatesObject) {
-
-            var userStatesFilter = [];
-
-            for (var key in userStatesObject) {
-                if (hasOwnProperty.call(userStatesObject, key)) {
-                    var userState = getUserStateByKey(key);
-                    if(userState) {
-                        userState.count = userStatesObject[key];
-                        userStatesFilter.push(userState);
-                    }
-                }
-            }
-
-            return userStatesFilter;
-        }
-
-        ////////////
-
-        var service = {
-            getUserStateFromValue: getUserStateFromValue,
-            getUserStateByKey: getUserStateByKey,
-            getUserStatesFilter: getUserStatesFilter
-        };
-
-        return service;
-    }
-
-    angular.module('umbraco.services').factory('usersHelper', usersHelperService);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
deleted file mode 100644
index 91318f5cf4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
+++ /dev/null
@@ -1,298 +0,0 @@
-/*Contains multiple services for various helper tasks */
-function versionHelper() {
-
-    return {
-
-        //see: https://gist.github.com/TheDistantSea/8021359
-        versionCompare: function (v1, v2, options) {
-            var lexicographical = options && options.lexicographical,
-                zeroExtend = options && options.zeroExtend,
-                v1parts = v1.split('.'),
-                v2parts = v2.split('.');
-
-            function isValidPart(x) {
-                return (lexicographical ? /^\d+[A-Za-z]*$/ : /^\d+$/).test(x);
-            }
-
-            if (!v1parts.every(isValidPart) || !v2parts.every(isValidPart)) {
-                return NaN;
-            }
-
-            if (zeroExtend) {
-                while (v1parts.length < v2parts.length) {
-                    v1parts.push("0");
-                }
-                while (v2parts.length < v1parts.length) {
-                    v2parts.push("0");
-                }
-            }
-
-            if (!lexicographical) {
-                v1parts = v1parts.map(Number);
-                v2parts = v2parts.map(Number);
-            }
-
-            for (var i = 0; i < v1parts.length; ++i) {
-                if (v2parts.length === i) {
-                    return 1;
-                }
-
-                if (v1parts[i] === v2parts[i]) {
-                    continue;
-                }
-                else if (v1parts[i] > v2parts[i]) {
-                    return 1;
-                }
-                else {
-                    return -1;
-                }
-            }
-
-            if (v1parts.length !== v2parts.length) {
-                return -1;
-            }
-
-            return 0;
-        }
-    };
-}
-angular.module('umbraco.services').factory('versionHelper', versionHelper);
-
-function dateHelper() {
-
-    return {
-
-        convertToServerStringTime: function (momentLocal, serverOffsetMinutes, format = "YYYY-MM-DD HH:mm:ss") {
-
-            //get the formatted offset time in HH:mm (server time offset is in minutes)
-            const formattedOffset = (serverOffsetMinutes > 0 ? "+" : "-") +
-                moment()
-                    .startOf('day')
-                    .minutes(Math.abs(serverOffsetMinutes))
-                    .format('HH:mm');
-
-            const server = moment.utc(momentLocal).utcOffset(formattedOffset);
-            return server.format(format);
-        },
-
-        convertToLocalMomentTime: function (strVal, serverOffsetMinutes, format = "YYYY-MM-DDTHH:mm:ss") {
-
-            //get the formatted offset time in HH:mm (server time offset is in minutes)
-            const formattedOffset = (serverOffsetMinutes > 0 ? "+" : "-") +
-                moment()
-                    .startOf('day')
-                    .minutes(Math.abs(serverOffsetMinutes))
-                    .format('HH:mm');
-
-            //if the string format already denotes that it's in "Roundtrip UTC" format (i.e. "2018-02-07T00:20:38.173Z")
-            //otherwise known as https://en.wikipedia.org/wiki/ISO_8601. This is the default format returned from the server
-            //since that is the default formatter for newtonsoft.json. When it is in this format, we need to tell moment
-            //to load the date as UTC so it's not changed, otherwise load it normally
-            let isoFormat;
-            if (strVal.indexOf("T") > -1 && strVal.endsWith("Z")) {
-                isoFormat = moment.utc(strVal).format(format) + formattedOffset;
-            }
-            else {
-                isoFormat = moment(strVal).format(format) + formattedOffset;
-            }
-
-            //create a moment with the iso format which will include the offset with the correct time
-            // then convert it to local time
-            return moment.parseZone(isoFormat).local();
-        },
-
-        getLocalDate: function (date, culture, format, parsingFormat = "YYYY-MM-DD HH:mm:ss") {
-            if (date) {
-                let dateVal;
-                const serverOffset = Umbraco.Sys.ServerVariables.application.serverTimeOffset;
-                const localOffset = new Date().getTimezoneOffset();
-                const serverTimeNeedsOffsetting = -serverOffset !== localOffset;
-                if (serverTimeNeedsOffsetting) {
-                    dateVal = this.convertToLocalMomentTime(date, serverOffset);
-                } else {
-                    dateVal = moment(date, parsingFormat);
-                }
-                return dateVal.locale(culture).format(format);
-            }
-        }
-
-    };
-}
-angular.module('umbraco.services').factory('dateHelper', dateHelper);
-
-function packageHelper(assetsService, treeService, eventsService, $templateCache) {
-
-    return {
-
-        /** Called when a package is installed, this resets a bunch of data and ensures the new package assets are loaded in */
-        packageInstalled: function () {
-
-            //clears the tree
-            treeService.clearCache();
-
-            //clears the template cache
-            $templateCache.removeAll();
-
-            //emit event to notify anything else
-            eventsService.emit("app.reInitialize");
-        }
-
-    };
-}
-angular.module('umbraco.services').factory('packageHelper', packageHelper);
-
-/**
- * @ngdoc function
- * @name umbraco.services.umbModelMapper
- * @function
- *
- * @description
- * Utility class to map/convert models
- */
-function umbModelMapper() {
-
-    return {
-
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.umbModelMapper#convertToEntityBasic
-         * @methodOf umbraco.services.umbModelMapper
-         * @function
-         *
-         * @description
-         * Converts the source model to a basic entity model, it will throw an exception if there isn't enough data to create the model.
-         * @param {Object} source The source model
-         * @param {Number} source.id The node id of the model
-         * @param {String} source.name The node name
-         * @param {String} source.icon The models icon as a css class (.icon-doc)
-         * @param {Number} source.parentId The parentID, if no parent, set to -1
-         * @param {path} source.path comma-separated string of ancestor IDs (-1,1234,1782,1234)
-         */
-
-        /** This converts the source model to a basic entity model, it will throw an exception if there isn't enough data to create the model */
-        convertToEntityBasic: function (source) {
-            var required = ["id", "name", "icon", "parentId", "path"];
-            required.forEach(k => {
-                if (!hasOwnProperty.call(source, k)) {
-                    throw `The source object does not contain the property ${k}`;
-                }
-            });
-            var optional = ["metaData", "key", "alias"];
-            //now get the basic object
-            var result = _.pick(source, required.concat(optional));
-            return result;
-        }
-
-    };
-}
-angular.module('umbraco.services').factory('umbModelMapper', umbModelMapper);
-
-/**
- * @ngdoc function
- * @name umbraco.services.umbSessionStorage
- * @function
- *
- * @description
- * Used to get/set things in browser sessionStorage but always prefixes keys with "umb_" and converts json vals so there is no overlap 
- * with any sessionStorage created by a developer.
- */
-function umbSessionStorage($window) {
-
-    //gets the sessionStorage object if available, otherwise just uses a normal object
-    // - required for unit tests.
-    var storage = $window['sessionStorage'] ? $window['sessionStorage'] : {};
-
-    return {
-
-        get: function (key) {
-            return Utilities.fromJson(storage["umb_" + key]);
-        },
-
-        set: function (key, value) {
-            storage["umb_" + key] = Utilities.toJson(value);
-        }
-
-    };
-}
-angular.module('umbraco.services').factory('umbSessionStorage', umbSessionStorage);
-
-/**
- * @ngdoc function
- * @name umbraco.services.updateChecker
- * @function
- *
- * @description
- * used to check for updates and display a notifcation
- */
-function updateChecker($http, umbRequestHelper) {
-    return {
-
-        /**
-         * @ngdoc function
-         * @name umbraco.services.updateChecker#check
-         * @methodOf umbraco.services.updateChecker
-         * @function
-         *
-         * @description
-         * Called to load in the legacy tree js which is required on startup if a user is logged in or 
-         * after login, but cannot be called until they are authenticated which is why it needs to be lazy loaded. 
-         */
-        check: function () {
-
-            return umbRequestHelper.resourcePromise(
-                $http.get(
-                    umbRequestHelper.getApiUrl(
-                        "updateCheckApiBaseUrl",
-                        "GetCheck")),
-                'Failed to retrieve update status');
-        }
-    };
-}
-angular.module('umbraco.services').factory('updateChecker', updateChecker);
-
-/**
-* @ngdoc service
-* @name umbraco.services.umbPropertyEditorHelper
-* @description A helper object used for property editors
-**/
-function umbPropEditorHelper() {
-    return {
-        /**
-         * @ngdoc function
-         * @name getImagePropertyValue
-         * @methodOf umbraco.services.umbPropertyEditorHelper
-         * @function    
-         *
-         * @description
-         * Returns the correct view path for a property editor, it will detect if it is a full virtual path but if not then default to the internal umbraco one
-         * 
-         * @param {string} input the view path currently stored for the property editor
-         */
-        getViewPath: function (input, isPreValue) {
-            var path = String(input);
-
-            if (path.startsWith('/')) {
-
-                //This is an absolute path, so just leave it
-                return path;
-            } else {
-
-                if (path.indexOf("/") >= 0) {
-                    //This is a relative path, so just leave it
-                    return path;
-                } else {
-                    if (!isPreValue) {
-                        //i.e. views/propertyeditors/fileupload/fileupload.html
-                        return "views/propertyeditors/" + path + "/" + path + ".html";
-                    } else {
-                        //i.e. views/prevalueeditors/requiredfield.html
-                        return "views/prevalueeditors/" + path + ".html";
-                    }
-                }
-
-            }
-        }
-    };
-}
-angular.module('umbraco.services').factory('umbPropEditorHelper', umbPropEditorHelper);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/validationmessage.service.js b/src/Umbraco.Web.UI.Client/src/common/services/validationmessage.service.js
deleted file mode 100644
index 5e0d8b876b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/validationmessage.service.js
+++ /dev/null
@@ -1,34 +0,0 @@
-(function () {
-    'use strict';
-
-    function validationMessageService($q, localizationService) {
-
-        // Gets the message to use for when a mandatory field isn't completed.
-        // Will either use the one provided on the property type's validation object
-        // or a localised default.
-        function getMandatoryMessage(validation) {
-            if (!validation) {
-                return $q.when("");
-            }
-
-            if (validation.mandatoryMessage) {
-                return $q.when(validation.mandatoryMessage);
-            } else {
-                return localizationService.localize("general_required").then(function (value) {
-                    return $q.when(value);
-                });
-            }
-        }
-
-        var service = {
-            getMandatoryMessage: getMandatoryMessage
-        };
-
-        return service;
-
-    }
-
-    angular.module('umbraco.services').factory('validationMessageService', validationMessageService);
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/windowresizelistener.service.js b/src/Umbraco.Web.UI.Client/src/common/services/windowresizelistener.service.js
deleted file mode 100644
index 3c13228a9b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/windowresizelistener.service.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.windowResizeListener
- * @function
- *
- * @description
- * A single window resize listener... we don't want to have more than one in theory to ensure that
- * there aren't too many events raised. This will debounce the event with 100 ms intervals and force
- * a $rootScope.$apply when changed and notify all listeners
- *
- */
-function windowResizeListener($rootScope) {
-
-    var WinResizer = (function () {
-        var registered = [];
-        var inited = false;        
-        var resize = _.debounce(function(ev) {
-            notify();
-        }, 100);
-        var notify = function () {
-            var h = $(window).height();
-            var w = $(window).width();
-            //execute all registrations inside of a digest
-            $rootScope.$apply(function() {
-                for (var i = 0, cnt = registered.length; i < cnt; i++) {
-                    registered[i].apply($(window), [{ width: w, height: h }]);
-                }
-            });
-        };
-        return {
-            register: function (fn) {
-                registered.push(fn);
-                if (inited === false) {
-                    $(window).on('resize', resize);
-                    inited = true;
-                }
-            },
-            unregister: function (fn) {
-                var index = registered.indexOf(fn);
-                if (index > -1) {
-                    registered.splice(index, 1);
-                }
-            }
-        };
-    }());
-
-    return {
-
-        /**
-         * Register a callback for resizing
-         * @param {Function} cb 
-         */
-        register: function (cb) {
-            WinResizer.register(cb);
-        },
-
-        /**
-         * Removes a registered callback
-         * @param {Function} cb 
-         */
-        unregister: function(cb) {
-            WinResizer.unregister(cb);
-        }
-
-    };
-}
-angular.module('umbraco.services').factory('windowResizeListener', windowResizeListener);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/xmlhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/xmlhelper.service.js
deleted file mode 100644
index a8562c833e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/services/xmlhelper.service.js
+++ /dev/null
@@ -1,378 +0,0 @@
-/**
- * @ngdoc service
- * @name umbraco.services.xmlhelper
- * @function
- *
- * @description
- * Used to convert legacy xml data to json and back again
- */
-function xmlhelper($http) {
-    /*
-     Copyright 2011 Abdulla Abdurakhmanov
-     Original sources are available at https://code.google.com/p/x2js/
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-     */
-
-    function X2JS() {
-        var VERSION = "1.0.11";
-        var escapeMode = false;
-
-        var DOMNodeTypes = {
-            ELEMENT_NODE: 1,
-            TEXT_NODE: 3,
-            CDATA_SECTION_NODE: 4,
-            DOCUMENT_NODE: 9
-        };
-
-        function getNodeLocalName(node) {
-            var nodeLocalName = node.localName;
-            if (nodeLocalName == null) {
-                nodeLocalName = node.baseName;
-            } // Yeah, this is IE!! 
-
-            if (nodeLocalName === null || nodeLocalName === "") {
-                nodeLocalName = node.nodeName;
-            } // =="" is IE too
-
-            return nodeLocalName;
-        }
-
-        function getNodePrefix(node) {
-            return node.prefix;
-        }
-
-        function escapeXmlChars(str) {
-            if (typeof (str) === "string") {
-                return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#x27;').replace(/\//g, '&#x2F;');
-            } else {
-                return str;
-            }
-        }
-
-        function unescapeXmlChars(str) {
-            return str.replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#x27;/g, "'").replace(/&#x2F;/g, '\/');
-        }
-
-        function parseDOMChildren(node) {
-            var result, child, childName;
-
-            if (node.nodeType === DOMNodeTypes.DOCUMENT_NODE) {
-                result = {};
-                child = node.firstChild;
-                childName = getNodeLocalName(child);
-                result[childName] = parseDOMChildren(child);
-                return result;
-            }
-            else {
-
-                if (node.nodeType === DOMNodeTypes.ELEMENT_NODE) {
-                    result = {};
-                    result.__cnt = 0;
-                    var nodeChildren = node.childNodes;
-
-                    // Children nodes
-                    for (var cidx = 0; cidx < nodeChildren.length; cidx++) {
-                        child = nodeChildren.item(cidx); // nodeChildren[cidx];
-                        childName = getNodeLocalName(child);
-
-                        result.__cnt++;
-                        if (result[childName] === null) {
-                            result[childName] = parseDOMChildren(child);
-                            result[childName + "_asArray"] = new Array(1);
-                            result[childName + "_asArray"][0] = result[childName];
-                        }
-                        else {
-                            if (result[childName] !== null) {
-                                if (!(result[childName] instanceof Array)) {
-                                    var tmpObj = result[childName];
-                                    result[childName] = [];
-                                    result[childName][0] = tmpObj;
-
-                                    result[childName + "_asArray"] = result[childName];
-                                }
-                            }
-                            var aridx = 0;
-                            while (result[childName][aridx] !== null) {
-                                aridx++;
-                            }
-
-                            (result[childName])[aridx] = parseDOMChildren(child);
-                        }
-                    }
-
-                    // Attributes
-                    for (var aidx = 0; aidx < node.attributes.length; aidx++) {
-                        var attr = node.attributes.item(aidx); // [aidx];
-                        result.__cnt++;
-                        result["_" + attr.name] = attr.value;
-                    }
-
-                    // Node namespace prefix
-                    var nodePrefix = getNodePrefix(node);
-                    if (nodePrefix !== null && nodePrefix !== "") {
-                        result.__cnt++;
-                        result.__prefix = nodePrefix;
-                    }
-
-                    if (result.__cnt === 1 && result["#text"] !== null) {
-                        result = result["#text"];
-                    }
-
-                    if (result["#text"] !== null) {
-                        result.__text = result["#text"];
-                        if (escapeMode) {
-                            result.__text = unescapeXmlChars(result.__text);
-                        }
-
-                        delete result["#text"];
-                        delete result["#text_asArray"];
-                    }
-                    if (result["#cdata-section"] != null) {
-                        result.__cdata = result["#cdata-section"];
-                        delete result["#cdata-section"];
-                        delete result["#cdata-section_asArray"];
-                    }
-
-                    if (result.__text != null || result.__cdata != null) {
-                        result.toString = function () {
-                            return (this.__text != null ? this.__text : '') + (this.__cdata != null ? this.__cdata : '');
-                        };
-                    }
-                    return result;
-                }
-                else {
-                    if (node.nodeType === DOMNodeTypes.TEXT_NODE || node.nodeType === DOMNodeTypes.CDATA_SECTION_NODE) {
-                        return node.nodeValue;
-                    }
-                }
-            }
-        }
-
-        function startTag(jsonObj, element, attrList, closed) {
-            var resultStr = "<" + ((jsonObj != null && jsonObj.__prefix != null) ? (jsonObj.__prefix + ":") : "") + element;
-            if (attrList != null) {
-                for (var aidx = 0; aidx < attrList.length; aidx++) {
-                    var attrName = attrList[aidx];
-                    var attrVal = jsonObj[attrName];
-                    resultStr += " " + attrName.substr(1) + "='" + attrVal + "'";
-                }
-            }
-            if (!closed) {
-                resultStr += ">";
-            } else {
-                resultStr += "/>";
-            }
-
-            return resultStr;
-        }
-
-        function endTag(jsonObj, elementName) {
-            return "</" + (jsonObj.__prefix !== null ? (jsonObj.__prefix + ":") : "") + elementName + ">";
-        }
-
-        function endsWith(str, suffix) {
-            return str.indexOf(suffix, str.length - suffix.length) !== -1;
-        }
-
-        function jsonXmlSpecialElem(jsonObj, jsonObjField) {
-            if (endsWith(jsonObjField.toString(), ("_asArray")) || jsonObjField.toString().indexOf("_") === 0 || (jsonObj[jsonObjField] instanceof Function)) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-
-        function jsonXmlElemCount(jsonObj) {
-            var elementsCnt = 0;
-            if (jsonObj instanceof Object) {
-                for (var it in jsonObj) {
-                    if (jsonXmlSpecialElem(jsonObj, it)) {
-                        continue;
-                    }
-                    elementsCnt++;
-                }
-            }
-            return elementsCnt;
-        }
-
-        function parseJSONAttributes(jsonObj) {
-            var attrList = [];
-            if (jsonObj instanceof Object) {
-                for (var ait in jsonObj) {
-                    if (ait.toString().indexOf("__") === -1 && ait.toString().indexOf("_") === 0) {
-                        attrList.push(ait);
-                    }
-                }
-            }
-
-            return attrList;
-        }
-
-        function parseJSONTextAttrs(jsonTxtObj) {
-            var result = "";
-
-            if (jsonTxtObj.__cdata != null) {
-                result += "<![CDATA[" + jsonTxtObj.__cdata + "]]>";
-            }
-
-            if (jsonTxtObj.__text != null) {
-                if (escapeMode) {
-                    result += escapeXmlChars(jsonTxtObj.__text);
-                } else {
-                    result += jsonTxtObj.__text;
-                }
-            }
-            return result;
-        }
-
-        function parseJSONTextObject(jsonTxtObj) {
-            var result = "";
-
-            if (jsonTxtObj instanceof Object) {
-                result += parseJSONTextAttrs(jsonTxtObj);
-            }
-            else {
-                if (jsonTxtObj != null) {
-                    if (escapeMode) {
-                        result += escapeXmlChars(jsonTxtObj);
-                    } else {
-                        result += jsonTxtObj;
-                    }
-                }
-            }
-
-
-            return result;
-        }
-
-        function parseJSONArray(jsonArrRoot, jsonArrObj, attrList) {
-            var result = "";
-            if (jsonArrRoot.length === 0) {
-                result += startTag(jsonArrRoot, jsonArrObj, attrList, true);
-            }
-            else {
-                for (var arIdx = 0; arIdx < jsonArrRoot.length; arIdx++) {
-                    result += startTag(jsonArrRoot[arIdx], jsonArrObj, parseJSONAttributes(jsonArrRoot[arIdx]), false);
-                    result += parseJSONObject(jsonArrRoot[arIdx]);
-                    result += endTag(jsonArrRoot[arIdx], jsonArrObj);
-                }
-            }
-            return result;
-        }
-
-        function parseJSONObject(jsonObj) {
-            var result = "";
-
-            var elementsCnt = jsonXmlElemCount(jsonObj);
-
-            if (elementsCnt > 0) {
-                for (var it in jsonObj) {
-                    if (jsonXmlSpecialElem(jsonObj, it)) {
-                        continue;
-                    }
-
-                    var subObj = jsonObj[it];
-                    var attrList = parseJSONAttributes(subObj);
-
-                    if (subObj === null || subObj === undefined) {
-                        result += startTag(subObj, it, attrList, true);
-                    } else {
-                        if (subObj instanceof Object) {
-
-                            if (subObj instanceof Array) {
-                                result += parseJSONArray(subObj, it, attrList);
-                            } else {
-                                var subObjElementsCnt = jsonXmlElemCount(subObj);
-                                if (subObjElementsCnt > 0 || subObj.__text !== null || subObj.__cdata !== null) {
-                                    result += startTag(subObj, it, attrList, false);
-                                    result += parseJSONObject(subObj);
-                                    result += endTag(subObj, it);
-                                } else {
-                                    result += startTag(subObj, it, attrList, true);
-                                }
-                            }
-
-                        } else {
-                            result += startTag(subObj, it, attrList, false);
-                            result += parseJSONTextObject(subObj);
-                            result += endTag(subObj, it);
-                        }
-                    }
-                }
-            }
-            result += parseJSONTextObject(jsonObj);
-
-            return result;
-        }
-
-        this.parseXmlString = function (xmlDocStr) {
-            var xmlDoc;
-            if (window.DOMParser) {
-                var parser = new window.DOMParser();
-                xmlDoc = parser.parseFromString(xmlDocStr, "text/xml");
-            }
-            else {
-                // IE :(
-                if (xmlDocStr.indexOf("<?") === 0) {
-                    xmlDocStr = xmlDocStr.substr(xmlDocStr.indexOf("?>") + 2);
-                }
-                xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
-                xmlDoc.async = "false";
-                xmlDoc.loadXML(xmlDocStr);
-            }
-            return xmlDoc;
-        };
-
-        this.xml2json = function (xmlDoc) {
-            return parseDOMChildren(xmlDoc);
-        };
-
-        this.xml_str2json = function (xmlDocStr) {
-            var xmlDoc = this.parseXmlString(xmlDocStr);
-            return this.xml2json(xmlDoc);
-        };
-
-        this.json2xml_str = function (jsonObj) {
-            return parseJSONObject(jsonObj);
-        };
-
-        this.json2xml = function (jsonObj) {
-            var xmlDocStr = this.json2xml_str(jsonObj);
-            return this.parseXmlString(xmlDocStr);
-        };
-
-        this.getVersion = function () {
-            return VERSION;
-        };
-
-        this.escapeMode = function (enabled) {
-            escapeMode = enabled;
-        };
-    }
-
-    var x2js = new X2JS();
-    return {
-        /** Called to load in the legacy tree js which is required on startup if a user is logged in or 
-         after login, but cannot be called until they are authenticated which is why it needs to be lazy loaded. */
-        toJson: function (xml) {
-            var json = x2js.xml_str2json(xml);
-            return json;
-        },
-        fromJson: function (json) {
-            var xml = x2js.json2xml_str(json);
-            return xml;
-        }
-    };
-}
-angular.module('umbraco.services').factory('xmlhelper', xmlhelper);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/config/grid.editors.config.js b/src/Umbraco.Web.UI.Client/src/config/grid.editors.config.js
deleted file mode 100644
index 8301f15a14..0000000000
--- a/src/Umbraco.Web.UI.Client/src/config/grid.editors.config.js
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-	{
-	    "name": "Rich text editor",
-	    "alias": "rte",
-	    "view": "rte",
-	    "icon": "icon-article"
-	},
-	{
-	    "name": "Image",
-	    "alias": "media",
-	    "view": "media",
-	    "icon": "icon-picture"
-	},
-	{
-	    "name": "Macro",
-	    "alias": "macro",
-	    "view": "macro",
-	    "icon": "icon-settings-alt"
-	},
-	{
-	    "name": "Embed",
-	    "alias": "embed",
-	    "view": "embed",
-	    "icon": "icon-movie-alt"
-	},
-    {
-        "name": "Headline",
-        "alias": "headline",
-        "view": "textstring",
-        "icon": "icon-coin",
-        "config": {
-            "style": "font-size: 36px; line-height: 45px; font-weight: bold",
-            "markup": "<h1>#value#</h1>"
-        }
-    },
-	{
-	    "name": "Quote",
-	    "alias": "quote",
-	    "view": "textstring",
-	    "icon": "icon-quote",
-	    "config": {
-	        "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-style: italic; font-size: 18px",
-	        "markup": "<blockquote>#value#</blockquote>"
-	    }
-	}
-]
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/index.html b/src/Umbraco.Web.UI.Client/src/index.html
deleted file mode 100644
index a468de3b9b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-    <base href="/belle/" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <title ng-bind="locationTitle">Umbraco</title>
-    <link rel="stylesheet" href="assets/css/umbraco.min.css" />
-</head>
-
-<body ng-class="{touch:touchDevice,emptySection:emptySection}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">
-    <div ng-hide="!authenticated" ng-cloak id="mainwrapper" class="clearfix" ng-click="closeDialogs($event)">
-        <umb-navigation></umb-navigation>
-
-        <section id="contentwrapper">
-            <main role="main" id="contentcolumn" ng-view>
-            </main>
-        </section>
-    </div>
-
-    <umb-notifications></umb-notifications>
-
-    <script src="lib/lazyload-js/LazyLoad.min.js"></script>
-    <script src="js/loader.dev.js"></script>
-</body>
-</html>
diff --git a/src/Umbraco.Web.UI.Client/src/init.js b/src/Umbraco.Web.UI.Client/src/init.js
deleted file mode 100644
index 765be4f4b9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/init.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/** Executed when the application starts, binds to events and set global state */
-window.app.run(['$rootScope', '$route', '$location', '$cookies', 'urlHelper', 'appState', 'assetsService', 'eventsService', 'tourService', 'localStorageService', 'navigationService', 'localizationService',
-    function ($rootScope, $route, $location, $cookies, urlHelper, appState, assetsService, eventsService, tourService, localStorageService, navigationService, localizationService) {
-
-        //This sets the default jquery ajax headers to include our csrf token, we
-        // need to user the beforeSend method because our token changes per user/login so
-        // it cannot be static
-        $.ajaxSetup({
-            beforeSend: function (xhr) {
-                xhr.setRequestHeader("X-UMB-XSRF-TOKEN", $cookies["UMB-XSRF-TOKEN"]);
-                // This is a standard header that should be sent for all ajax requests and is required for
-                // how the server handles auth rejections, etc... see https://github.com/dotnet/aspnetcore/blob/a2568cbe1e8dd92d8a7976469100e564362f778e/src/Security/Authentication/Cookies/src/CookieAuthenticationEvents.cs#L106-L107
-                xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-                var queryStrings = urlHelper.getQueryStringParams();
-                if (queryStrings.umbDebug === "true" || queryStrings.umbdebug === "true") {
-                    xhr.setRequestHeader("X-UMB-DEBUG", "true");
-                }
-            }
-        });
-
-        /** Listens for authentication and checks if our required assets are loaded, if/once they are we'll broadcast a ready event */
-        eventsService.on("app.authenticated", function (evt, data) {
-
-            assetsService._loadInitAssets().then(function () {
-
-                appReady(data);
-
-                tourService.registerAllTours().then(function () {
-
-                    // Start intro tour
-                    tourService.getTourByAlias("umbIntroIntroduction").then(function (introTour) {
-                        // start intro tour if it hasn't been completed or disabled
-                        if (introTour && introTour.disabled !== true && introTour.completed !== true) {
-                            tourService.startTour(introTour);
-                            localStorageService.set("introTourShown", true);
-                        } else {
-                            const introTourShown = localStorageService.get("introTourShown");
-                            if (!introTourShown) {
-                                // Go & show email marketing tour (ONLY when intro tour is completed or been dismissed)
-                                tourService.getTourByAlias("umbEmailMarketing").then(function (emailMarketingTour) {
-                                    // Only show the email marketing tour one time - dismissing it or saying no will make sure it never appears again
-                                    // Unless invoked from tourService JS Client code explicitly.
-                                    // Accepted mails = Completed and Declicned mails = Disabled
-                                    if (emailMarketingTour && emailMarketingTour.disabled !== true && emailMarketingTour.completed !== true) {
-                                        // Only show the email tour once per logged in session
-                                        // The localstorage key is removed on logout or user session timeout
-                                        const emailMarketingTourShown = localStorageService.get("emailMarketingTourShown");
-                                        if (!emailMarketingTourShown) {
-                                            tourService.startTour(emailMarketingTour);
-                                            localStorageService.set("emailMarketingTourShown", true);
-                                        }
-                                    }
-                                });
-                            }
-                        }
-                    });
-                });
-            });
-
-        });
-
-        function appReady(data) {
-            appState.setGlobalState("isReady", true);
-            //send the ready event with the included returnToPath,returnToSearch data
-            eventsService.emit("app.ready", data);
-        }
-
-        var currentRouteParams = null;
-
-        $rootScope.$on('$changeTitle', function (event, titlePrefix) {
-            if (titlePrefix) {
-                $rootScope.locationTitle = titlePrefix + " - " + $rootScope.locationTitle;
-            }
-        });
-
-        /** execute code on each successful route */
-        $rootScope.$on('$routeChangeSuccess', function (event, current, previous) {
-            var toRetain = currentRouteParams ? navigationService.retainQueryStrings(currentRouteParams, current.params) : null;
-
-            //if toRetain is not null it means that there are missing query strings and we need to update the current params
-            if (toRetain) {
-                $route.updateParams(toRetain);
-                currentRouteParams = toRetain;
-            } else {
-                currentRouteParams = Utilities.copy(current.params);
-            }
-
-            var deployConfig = Umbraco.Sys.ServerVariables.deploy;
-            var deployEnv, deployEnvTitle;
-            if (deployConfig) {
-                deployEnv = Umbraco.Sys.ServerVariables.deploy.CurrentWorkspace;
-                deployEnvTitle = "(" + deployEnv + ") ";
-            }
-
-            if (current.params.section) {
-                localizationService.localize("sections_" + current.params.section)
-                    .then(function (currentSection) {
-                        var baseTitle = currentSection + " - " + $location.$$host;
-                        //Check deploy for Global Umbraco.Sys obj workspace
-                        if (deployEnv) {
-                            $rootScope.locationTitle = deployEnvTitle + baseTitle;
-                        } else {
-                            $rootScope.locationTitle = baseTitle;
-                        }
-                    });
-            } else {
-                if (deployEnv) {
-                    $rootScope.locationTitle = deployEnvTitle + "Umbraco - " + $location.$$host;
-                }
-                $rootScope.locationTitle = "Umbraco - " + $location.$$host;
-            }
-        });
-
-        /** When the route change is rejected - based on checkAuth - we'll prevent the rejected route from executing including
-            wiring up it's controller, etc... and then redirect to the rejected URL.   */
-        $rootScope.$on('$routeChangeError', function (event, current, previous, rejection) {
-            if (rejection.path) {
-                event.preventDefault();
-                var returnPath = null;
-                if (rejection.path == "/login" || rejection.path.startsWith("/login/")) {
-                  // Check if a ReturnUrl is present on the querystring and redirect to it if set
-                  var queryStrings = urlHelper.getQueryStringParams();
-                  if (typeof queryStrings.ReturnUrl !== 'undefined' && queryStrings.ReturnUrl.length > 0) {
-                    returnPath = queryStrings.ReturnUrl;
-                  }
-                  else {
-                    //Set the current path before redirecting so we know where to redirect back to
-                    returnPath = encodeURIComponent(window.location.href.replace(window.location.origin, ''));                    
-                  }
-                }
-                $location.path(rejection.path)
-                if (returnPath) {
-                    $location.search("returnPath", returnPath);
-                }
-            }
-        });
-
-        //Bind to $routeUpdate which will execute anytime a location changes but the route is not triggered.
-        //This is the case when a route uses "reloadOnSearch: false" or "reloadOnUrl: false" which is the case for many or our routes so that we are able to maintain
-        //global state query strings without force re-loading views.
-        //We can then detect if it's a location change that should force a route or not programatically.
-        $rootScope.$on('$routeUpdate', function (event, next) {
-            if (!currentRouteParams) {
-                //if there is no current route then always route which is done with reload
-                $route.reload();
-            } else {
-                var toRetain = navigationService.retainQueryStrings(currentRouteParams, next.params);
-                //if toRetain is not null it means that there are missing query strings and we need to update the current params.
-                if (toRetain) {
-                    $route.updateParams(toRetain);
-                }
-                //check if the location being changed is only due to global/state query strings which means the location change
-                //isn't actually going to cause a route change.
-                if (navigationService.isRouteChangingNavigation(currentRouteParams, next.params)) {
-                    //The location change will cause a route change, continue the route if the query strings haven't been updated.
-                    $route.reload();
-                } else {
-                    //navigation is not changing but we should update the currentRouteParams to include all current parameters
-                    if (toRetain) {
-                        currentRouteParams = toRetain;
-                    } else {
-                        currentRouteParams = Utilities.copy(next.params);
-                    }
-                    //always clear the 'sr' query string (soft redirect) if it exists
-                    if (currentRouteParams.sr) {
-                        currentRouteParams.sr = null;
-                        $route.updateParams(currentRouteParams);
-                    }
-                }
-            }
-        });
-
-        //check for touch device, add to global appState
-        //var touchDevice = ("ontouchstart" in window || window.touch || window.navigator.msMaxTouchPoints === 5 || window.DocumentTouch && document instanceof DocumentTouch);
-        var touchDevice = /android|webos|iphone|ipad|ipod|blackberry|iemobile|touch/i.test(navigator.userAgent.toLowerCase());
-
-        appState.setGlobalState("touchDevice", touchDevice);
-
-    }]);
diff --git a/src/Umbraco.Web.UI.Client/src/install.loader.js b/src/Umbraco.Web.UI.Client/src/install.loader.js
deleted file mode 100644
index cd4c2d6452..0000000000
--- a/src/Umbraco.Web.UI.Client/src/install.loader.js
+++ /dev/null
@@ -1,25 +0,0 @@
-LazyLoad.js([
-  'lib/jquery/jquery.min.js',
-
-  'lib/angular/angular.min.js',
-  'lib/angular-cookies/angular-cookies.min.js',
-  'lib/angular-touch/angular-touch.min.js',
-  'lib/angular-sanitize/angular-sanitize.min.js',
-  'lib/angular-messages/angular-messages.min.js',
-  'lib/angular-aria/angular-aria.min.js',
-  'lib/underscore/underscore-min.js',
-  'lib/angular-ui-sortable/sortable.min.js',
-  'lib/nouislider/nouislider.min.js',
-
-  'js/utilities.min.js',
-
-  'js/installer.app.min.js',
-  'js/umbraco.directives.min.js',
-  'js/umbraco.installer.min.js'
-
-], function () {
-  jQuery(document).ready(function () {
-    angular.bootstrap(document, ['umbraco']);
-  });
-}
-);
diff --git a/src/Umbraco.Web.UI.Client/src/installer.app.js b/src/Umbraco.Web.UI.Client/src/installer.app.js
deleted file mode 100644
index b7a2cfa989..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer.app.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var app = angular.module('umbraco', [    
-    'umbraco.directives',
-    'umbraco.install',
-    'ngCookies',
-    'ngSanitize',
-    'ngTouch'
-]);
diff --git a/src/Umbraco.Web.UI.Client/src/installer/_module.js b/src/Umbraco.Web.UI.Client/src/installer/_module.js
deleted file mode 100644
index 76393089ce..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/_module.js
+++ /dev/null
@@ -1 +0,0 @@
-angular.module("umbraco.install", ["umbraco.directives"]);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js b/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js
deleted file mode 100644
index 3dbc4e119b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js
+++ /dev/null
@@ -1,43 +0,0 @@
-angular.module("umbraco.install").controller("Umbraco.InstallerController",
-	function ($scope, installerService) {
-
-	    // TODO: Decouple the service from the controller - the controller should be responsible
-	    // for the model (state) and the service should be responsible for helping the controller,
-	    // the controller should be passing the model into it's methods for manipulation and not hold
-	    // state. We should not be assigning properties from a service to a controller's scope.
-	    // see: https://github.com/umbraco/Umbraco-CMS/commit/b86ef0d7ac83f699aee35d807f7f7ebb6dd0ed2c#commitcomment-5721204
-
-	    $scope.stepIndex = 0;
-	    //comment this out if you just want to see tips
-	    installerService.init();
-
-	    //uncomment this to see tips
-	    //installerService.switchToFeedback();
-
-	    $scope.installer = installerService.status;
-
-	    $scope.forward = function () {
-	        installerService.forward();
-	    };
-
-	    $scope.backward = function () {
-	        installerService.backward();
-	    };
-
-	    $scope.install = function () {
-	        installerService.install();
-	    };
-
-	    $scope.gotoStep = function (step) {
-	        installerService.gotoNamedStep(step);
-	    };
-
-	    $scope.restart = function () {
-	        installerService.gotoStep(0);
-	    };
-	});
-
-//this ensure that we start with a clean slate on every install and upgrade
-angular.module("umbraco.install").run(function ($templateCache) {
-    $templateCache.removeAll();
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
deleted file mode 100644
index c2596633c4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
+++ /dev/null
@@ -1,357 +0,0 @@
-angular.module("umbraco.install").factory('installerService', function ($rootScope, $q, $timeout, $http, $templateRequest){
-
-	var _status = {
-		index: 0,
-		current: null,
-		steps: null,
-		loading: true,
-		progress: "100%"
-	};
-
-	var factTimer;
-	var _installerModel = {
-		installId: null,
-		instructions: {}
-	};
-
-	//add to umbraco installer facts here
-	var facts = ["Umbraco helped millions of people watch a man jump from the edge of space",
-					"Over 500 000 websites are currently powered by Umbraco",
-					"At least 2 people have named their cat 'Umbraco'",
-					"On an average day more than 1000 people download Umbraco",
-					"<a target='_blank' rel='noopener' href='https://www.youtube.com/channel/UCbGfwSAPflebnadyhEPw-wA?ref=tvFromInstaller'>Umbraco Learning Base</a> is the premier source of Umbraco video tutorials to get you started",
-					"You can find the world's friendliest CMS community at <a target='_blank' rel='noopener' href='https://our.umbraco.com/'>our.umbraco.com</a>",
-					"You can become a certified Umbraco developer by attending one of the official courses",
-					"Umbraco works really well on tablets",
-					"You have 100% control over your markup and design when crafting a website in Umbraco",
-					"Umbraco is the best of both worlds: 100% free and open source, and backed by a professional and profitable company",
-					"There's a pretty big chance you've visited a website powered by Umbraco today",
-					"'Umbraco-spotting' is the game of spotting big brands running Umbraco",
-					"At least 4 people have the Umbraco logo tattooed on them",
-					"'Umbraco' is the Danish name for an allen key",
-					"Umbraco has been around since 2005, that's a looong time in IT",
-          "Every year around 1500 Umbraco enthusiasts from around the world join the biggest hybrid Umbraco conference <a target='_blank' rel='noopener' href='https://codegarden.umbraco.com/'>Codegarden</a>",
-					"While you are installing Umbraco someone else on the other side of the planet is probably doing it too",
-					"You can extend Umbraco without modifying the source code using either JavaScript or C#",
-					"Umbraco has been installed in more than 198 countries"
-					 ];
-
-    /**
-        Returns the description for the step at a given index based on the order of the serverOrder of steps
-        Since they don't execute on the server in the order that they are displayed in the UI.
-    */
-	function getDescriptionForStepAtIndex(steps, index) {
-	    var sorted = _.sortBy(steps, "serverOrder");
-	    if (sorted[index]) {
-	        return sorted[index].description;
-	    }
-	    return null;
-	}
-    /* Returns the description for the given step name */
-	function getDescriptionForStepName(steps, name) {
-	    var found = _.find(steps, function(i) {
-	        return i.name == name;
-	    });
-	    return (found) ? found.description : null;
-	}
-
-	//calculates the offset of the progressbar on the installer
-	function calculateProgress(steps, next) {
-		var sorted = _.sortBy(steps, "serverOrder");
-
-		var pct = "100%";
-		for (var i = sorted.length - 1; i >= 0; i--) {
-			if(sorted[i].name == next){
-				pct = Math.floor((i+1) / steps.length  * 100) + "%";
-				break;
-			}
-		}
-	    return  pct;
-	}
-
-	//helpful defaults for the view loading
-	function resolveView(view){
-
-		if(view.indexOf(".html") < 0){
-			view = view + ".html";
-		}
-		if(view.indexOf("/") < 0){
-			view = "views/install/" + view;
-		}
-
-		return view;
-	}
-
-    /** Have put this here because we are not referencing our other modules */
-	function safeApply (scope, fn) {
-	    if (scope.$$phase || scope.$root.$$phase) {
-	        if (Utilities.isFunction(fn)) {
-	            fn();
-	        }
-	    }
-	    else {
-	        if (Utilities.isFunction(fn)) {
-	            scope.$apply(fn);
-	        }
-	        else {
-	            scope.$apply();
-	        }
-	    }
-	}
-
-	var service = {
-
-		status : _status,
-		//loads the needed steps and sets the intial state
-		init : function(){
-			service.status.loading = true;
-            if (!_status.all) {
-                //pre-load the error page, if an error occurs, the page might not be able to load
-                // so we want to make sure it's available in the templatecache first
-                $templateRequest("views/install/error.html").then(x => {
-                    service.getSteps().then(response => {
-                        service.status.steps = response.data.steps;
-                        service.status.index = 0;
-                        _installerModel.installId = response.data.installId;
-                        service.findNextStep();
-
-                        $timeout(function() {
-                                service.status.loading = false;
-                                service.status.configuring = true;
-                            },
-                            2000);
-                    });
-                });
-
-
-            }
-		},
-
-		//loads available packages from our.umbraco.com
-		getPackages : function(){
-			return $http.get(Umbraco.Sys.ServerVariables.installApiBaseUrl + "GetPackages");
-		},
-
-		getSteps : function(){
-			return $http.get(Umbraco.Sys.ServerVariables.installApiBaseUrl + "GetSetup");
-		},
-
-		gotoStep : function(index){
-			var step = service.status.steps[index];
-			step.view = resolveView(step.view);
-
-			if(!step.model){
-				step.model = {};
-			}
-
-			service.status.index = index;
-			service.status.current = step;
-			service.retrieveCurrentStep();
-		},
-
-		gotoNamedStep : function(stepName){
-			var step = _.find(service.status.steps, function(s, index){
-				if (s.view && s.name === stepName) {
-					service.status.index = index;
-					return true;
-				}
-				return false;
-			});
-
-			step.view = resolveView(step.view);
-			if(!step.model){
-				step.model = {};
-			}
-			service.retrieveCurrentStep();
-			service.status.current = step;
-		},
-
-	    /**
-            Finds the next step containing a view. If one is found it stores it as the current step
-            and retreives the step information and returns it, otherwise returns null .
-        */
-		findNextStep : function(){
-			var step = _.find(service.status.steps, function(s, index){
-				if(s.view && index >= service.status.index){
-					service.status.index = index;
-					return true;
-				}
-			    return false;
-			});
-
-            if (step) {
-                if (step.view.indexOf(".html") < 0) {
-                    step.view = step.view + ".html";
-                }
-
-                if (step.view.indexOf("/") < 0) {
-                    step.view = "views/install/" + step.view;
-                }
-
-                if (!step.model) {
-                    step.model = {};
-                }
-
-                service.status.current = step;
-                service.retrieveCurrentStep();
-
-                //returns the next found step
-                return step;
-            }
-            else {
-                //there are no more steps found containing a view so return null
-                return null;
-            }
-		},
-
-		storeCurrentStep : function(){
-			_installerModel.instructions[service.status.current.name] = service.status.current.model;
-		},
-
-		retrieveCurrentStep : function(){
-			if(_installerModel.instructions[service.status.current.name]){
-				service.status.current.model = _installerModel.instructions[service.status.current.name];
-			}
-		},
-
-        /** Moves the installer forward to the next view, if there are not more views than the installation will commence */
-		forward : function(){
-			service.storeCurrentStep();
-			service.status.index++;
-			var found = service.findNextStep();
-            if (!found) {
-                //no more steps were found so start the installation process
-                service.install();
-            }
-		},
-
-		backwards : function(){
-			service.storeCurrentStep();
-			service.gotoStep(service.status.index--);
-		},
-
-		install : function(){
-			service.storeCurrentStep();
-			service.switchToFeedback();
-
-			service.status.feedback = getDescriptionForStepAtIndex(service.status.steps, 0);
-			service.status.progress = 0;
-
-			function processInstallStep() {
-
-                $http.post(Umbraco.Sys.ServerVariables.installApiBaseUrl + "PostPerformInstall", _installerModel)
-                    .then(function (response) {
-                        var data = response.data;
-                        if (!data.complete) {
-
-                            //progress feedback
-                            service.status.progress = calculateProgress(service.status.steps, data.nextStep);
-
-                            if (data.view) {
-                                //set the current view and model to whatever the process returns, the view is responsible for retriggering install();
-                                var v = resolveView(data.view);
-                                service.status.current = { view: v, model: data.model };
-
-                                //turn off loading bar and feedback
-                                service.switchToConfiguration();
-                            }
-                            else {
-                                var desc = getDescriptionForStepName(service.status.steps, data.nextStep);
-                                if (desc) {
-                                    service.status.feedback = desc;
-                                }
-                                processInstallStep();
-                            }
-                        }
-                        else {
-                            service.complete();
-                        }
-                    }, handleErrorResponse);
-			}
-			processInstallStep();
-		},
-
-		randomFact: function () {
-		    safeApply($rootScope, function() {
-		        service.status.fact = facts[_.random(facts.length - 1)];
-		    });
-		},
-
-		switchToFeedback : function(){
-			service.status.current = null;
-			service.status.loading = true;
-			service.status.configuring = false;
-
-			//initial fact
-			service.randomFact();
-
-			//timed facts
-			factTimer = window.setInterval(function(){
-				service.randomFact();
-			},6000);
-		},
-
-		switchToConfiguration : function(){
-			service.status.loading = false;
-			service.status.configuring = true;
-			service.status.feedback = null;
-			service.status.fact = null;
-
-			if (factTimer) {
-			    clearInterval(factTimer);
-			}
-		},
-
-		complete : function(){
-
-            $http.post(Umbraco.Sys.ServerVariables.installApiBaseUrl + "CompleteInstall", _installerModel)
-                .then(function () {
-                    service.status.progress = "100%";
-                    service.status.done = true;
-                    service.status.feedback = "Restarting and redirecting you to Umbraco, please wait";
-                    service.status.loading = false;
-
-                    if (factTimer) {
-                        clearInterval(factTimer);
-                    }
-
-                    window.location.href = Umbraco.Sys.ServerVariables.umbracoBaseUrl;
-                }, handleErrorResponse);
-
-
-		}
-	};
-
-	var handleErrorResponse = function (response) {
-
-        var data = response.data;
-        var status = response.status;
-        //need to handle 500's separately, this will happen if something goes wrong outside
-        // of the installer (like app startup events or something) and these will get returned as text/html
-        // not as json. If this happens we can't actually load in external views since they will YSOD as well!
-        // so we need to display this in our own internal way
-
-        if (status >= 500 && status < 600) {
-            service.status.current = { view: "ysod", model: null };
-            var ysod = data;
-            //we need to manually write the html to the iframe
-            // TODO: In dotnetcore the resulting YSOD isn't HTML, the error is just a string so it looks ugly
-            // So we shouldn't be using an iframe and will need to change this so that we have an unhandled exception filter for the installer (and eventually
-            // the rest of the back office) to handle errors and chuck the data into a json format for us to use.
-            // It might turn out that our new Api Convention `UmbracoApiBehaviorApplicationModelProvider` might handle this for us with it's custom error handling.
-            $timeout(function () {
-                document.getElementById('ysod').contentDocument.write(ysod);
-            }, 500);
-        }
-        else {
-            //this is where we handle installer error
-            var v = data.view ? resolveView(data.view) : resolveView("error");
-            var model = data.model ? data.model : data;
-            service.status.current = { view: v, model: model };
-        }
-
-        service.switchToConfiguration();
-    }
-
-	return service;
-});
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/continueinstall.html b/src/Umbraco.Web.UI.Client/src/installer/steps/continueinstall.html
deleted file mode 100644
index 28fa1d3fff..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/continueinstall.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-    <h1>Continue Umbraco Installation</h1>
-    <p>
-        You see this screen because your Umbraco installation did not complete correctly.
-    </p>
-    <p>
-        Simply click <strong>continue</strong> below to be guided through the rest of the installation process.
-    </p>
-
-    <p>
-        <button class="btn btn-success" ng-click="install()">Continue</button>
-   </p>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js b/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
deleted file mode 100644
index af25608ef7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
+++ /dev/null
@@ -1,57 +0,0 @@
-angular.module("umbraco.install").controller("Umbraco.Installer.DataBaseController", function($scope, $http, installerService){
-
-    $scope.checking = false;
-    $scope.invalidDbDns = false;
-
-    $scope.dbs = $scope.installer.current.model.databases;
-    window.dbs = $scope.dbs;
-
-    $scope.providerNames = _.chain(window.dbs)
-        .map('providerName')
-        .filter(x => x)
-        .uniq()
-        .value();
-
-    if (!$scope.selectedDbMeta) {
-        $scope.selectedDbMeta = $scope.dbs[0];
-    }
-
-    $scope.$watch('selectedDbMeta', function(newValue) {
-      $scope.installer.current.model.integratedAuth = false;
-      $scope.installer.current.model.databaseProviderMetadataId = newValue.id;
-      $scope.installer.current.model.providerName = newValue.providerName;
-      $scope.installer.current.model.databaseName = newValue.defaultDatabaseName;
-    });
-
-    $scope.isCustom = function() {
-        return $scope.selectedDbMeta.displayName === 'Custom';
-    }
-
-
-    $scope.validateAndForward = function() {
-        if (!$scope.checking && this.installerForm.$valid)
-        {
-            $scope.checking = true;
-            $scope.invalidDbDns = false;
-
-            var model = installerService.status.current.model;
-
-            $http.post(
-                Umbraco.Sys.ServerVariables.installApiBaseUrl + "PostValidateDatabaseConnection",
-                model).then(function(response) {
-
-                    if (response.data === true) {
-                        installerService.forward();
-                    }
-                    else {
-                        $scope.invalidDbDns = true;
-                    }
-
-                    $scope.checking = false;
-            }, function(){
-                $scope.invalidDbDns = true;
-                $scope.checking = false;
-            });
-        }
-    };
-});
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/database.html b/src/Umbraco.Web.UI.Client/src/installer/steps/database.html
deleted file mode 100644
index f1617277e8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/database.html
+++ /dev/null
@@ -1,199 +0,0 @@
-<div ng-controller="Umbraco.Installer.DataBaseController">
-  <h1>Configure your database</h1>
-  <p>
-    Enter connection and authentication details for the database you want to
-    install Umbraco on
-  </p>
-
-  <form
-    name="installerForm"
-    class="form-horizontal -no-margin-bottom"
-    novalidate
-    ng-submit="validateAndForward();"
-  >
-    <div class="control-group">
-      <legend>What type of database do you use?</legend>
-      <label class="control-label" for="dbType">Database type</label>
-      <div class="controls">
-        <select
-          id="dbType"
-          ng-options="db as db.displayName for db in dbs"
-          required
-          ng-model="selectedDbMeta"
-        ></select>
-      </div>
-    </div>
-
-    <div ng-if="isCustom()">
-      <legend>What is the exact connection string we should use?</legend>
-      <div class="control-group">
-        <label class="control-label" for="Custom_connectionString"
-          >Connection string</label
-        >
-        <div class="controls">
-          <textarea
-            id="Custom_connectionString"
-            class="input-block-level"
-            required
-            ng-model="installer.current.model.connectionString"
-            rows="5"
-          ></textarea>
-          <small class="inline-help"
-            >Enter a valid database connection string.</small
-          >
-        </div>
-      </div>
-
-      <div class="control-group">
-        <label class="control-label" for="Custom_providerName"
-          >Provider Name</label
-        >
-        <div class="controls">
-          <select
-            id="dbType"
-            ng-options="providerName for providerName in providerNames"
-            required
-            ng-model="installer.current.model.providerName"
-          ></select>
-        </div>
-      </div>
-    </div>
-
-    <div ng-if="!isCustom()">
-      <div class="row">
-        <legend>Where do we find your database?</legend>
-
-        <div ng-if="selectedDbMeta.requiresServer">
-          <div class="span6">
-            <div class="control-group">
-              <label class="control-label" for="Sql_Server">Server</label>
-              <div class="controls">
-                <input
-                  type="text"
-                  id="Sql_Server"
-                  placeholder="{{selectedDbMeta.serverPlaceholder}}"
-                  required
-                  ng-model="installer.current.model.server"
-                />
-                <small class="inline-help">Enter server domain or IP</small>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div class="span6">
-          <div class="control-group">
-            <label class="control-label" for="Sql_databaseName"
-              >Database name</label
-            >
-            <div class="controls">
-              <input
-                type="text"
-                id="Sql_databaseName"
-                placeholder="umbraco-cms"
-                required
-                ng-model="installer.current.model.databaseName"
-              />
-              <small class="inline-help">Enter the name of the database</small>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div ng-if="selectedDbMeta.requiresCredentials">
-        <div class="row">
-          <legend>What credentials are used to access the database?</legend>
-          <div class="span6">
-            <div
-              class="control-group"
-              ng-if="!installer.current.model.integratedAuth"
-            >
-              <label class="control-label" for="Sql_login">Login</label>
-              <div class="controls">
-                <input
-                  type="text"
-                  id="Sql_login"
-                  placeholder="umbraco-db-user"
-                  required
-                  ng-model="installer.current.model.login"
-                />
-                <small class="inline-help">Enter the database user name</small>
-              </div>
-            </div>
-          </div>
-
-          <div class="span6">
-            <div
-              class="control-group"
-              ng-if="!installer.current.model.integratedAuth"
-            >
-              <label class="control-label" for="Sql_password">Password</label>
-              <div class="controls">
-                <input
-                  type="password"
-                  id="Sql_password"
-                  placeholder="umbraco-db-password"
-                  required
-                  ng-model="installer.current.model.password"
-                  spellcheck="false"
-                />
-                <small class="inline-help">Enter the database password</small>
-              </div>
-            </div>
-          </div>
-
-          <div
-            class="span12 control-group"
-            ng-if="selectedDbMeta.supportsIntegratedAuthentication"
-          >
-            <div class="controls">
-              <label class="checkbox">
-                <input
-                  type="checkbox"
-                  ng-model="installer.current.model.integratedAuth"
-                />
-                Use integrated authentication
-              </label>
-            </div>
-
-            <div class="controls">
-              <label class="checkbox">
-                <input
-                  type="checkbox"
-                  ng-model="installer.current.model.trustServerCertificate"
-                />
-                Trust the database certificate
-              </label>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="control-actions controls-space-between">
-        <button class="btn btn-info" ng-click="restart()">Go back</button>
-        <button
-          class="btn btn-success"
-          ng-disabled="installerForm.$invalid || checking"
-          ng-class="{disabled:installerForm.$invalid}"
-        >
-          Install
-        </button>
-      </div>
-      <div>
-        <span ng-if="checking" class="inline-help" ng-animate="'fade'">
-          Validating your database connection...
-        </span>
-
-        <span
-          ng-if="invalidDbDns"
-          class="inline-help error"
-          ng-animate="'fade'"
-        >
-          Could not connect to database
-        </span>
-      </div>
-    </div>
-  </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/error.html b/src/Umbraco.Web.UI.Client/src/installer/steps/error.html
deleted file mode 100644
index aab5b18e9f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/error.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="error">
-    <h1>Error during installation</h1>
-
-    <p class="message">{{installer.current.model.message}}</p>
-
-    <p><small>See the log for full details (logs can typically be found in the umbraco\Logs folder).</small></p>
-
-    <button class="btn btn-success" ng-click="restart()">Go back</button>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html b/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html
deleted file mode 100644
index ae3d4ed49a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div>
-    <h1>Your permission settings are not ready for Umbraco</h1>
-    <p>
-        In order to run Umbraco, you'll need to update your permission settings.
-        Detailed information about the correct file and folder permissions for Umbraco can be found
-        <a href="https://docs.umbraco.com/umbraco-cms/v/10.latest-lts/fundamentals/setup/server-setup/permissions"><strong>here</strong></a>.
-    </p>
-    <p>
-        The following report list the permissions that are currently failing. Once the permissions are fixed press the 'Go back' button to restart the installation.
-    </p>
-
-    <ul class="permissions-report">
-        <li ng-repeat="(category, items) in installer.current.model.errors">
-            <h4>{{category}}</h4>
-            <ul>
-
-                <li ng-repeat="item in items">
-                    {{item}}
-                </li>
-            </ul>
-        </li>
-    </ul>
-
-    <p>
-        <button class="btn btn-success" ng-click="restart()">Go back</button>
-   </p>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.controller.js b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.controller.js
deleted file mode 100644
index 81958ddd55..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.controller.js
+++ /dev/null
@@ -1,12 +0,0 @@
-angular.module("umbraco.install").controller("Umbraco.Installer.PackagesController", function ($scope, installerService) {
-
-    installerService.getPackages().then(function (response) {
-        $scope.packages = response.data;
-    });
-
-    $scope.setPackageAndContinue = function (pckId) {
-        installerService.status.current.model = pckId;
-        installerService.forward();
-    };
-
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
deleted file mode 100644
index d7c21dc4a9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<div ng-controller="Umbraco.Installer.PackagesController" id="starterKits">
-    <h1>Install a starter website</h1>
-
-    <p>
-        Installing a starter website helps you learn how Umbraco works, and
-        gives you a solid and simple foundation to build on top of.
-    </p>
-
-    <small ng-if="!packages || packages.length == 0">Loading...</small>
-
-    <ul class="thumbnails">
-        <li class="span3" ng-repeat="pck in packages">
-            <button type="button" ng-click="setPackageAndContinue(pck.id)" class="btn-reset thumbnail">
-                <img ng-src="https://our.umbraco.com{{
-                        pck.thumbnail
-                    }}?width=170"
-                     alt="{{ pck.name }}" />
-                <small>Install starter website</small>
-            </button>
-        </li>
-    </ul>
-
-    <button type="button"
-            class="btn btn-link btn-link-reverse"
-            ng-click="setPackageAndContinue('00000000-0000-0000-0000-000000000000')">
-        No thanks, I do not want to install a starter website
-    </button>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/upgrade.html b/src/Umbraco.Web.UI.Client/src/installer/steps/upgrade.html
deleted file mode 100644
index 8ea69b3ee4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/upgrade.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div>
-    <h1>Upgrading Umbraco</h1>
-    <p>
-        Welcome to the Umbraco installer. You see this screen because your Umbraco installation needs a quick upgrade
-        of its database and files, which will ensure your website is kept as fast, secure and up to date as possible.
-    </p>
-    <p>
-        Detected current version <strong>{{installer.current.model.currentVersion}}</strong> ({{installer.current.model.currentState}}),
-        which needs to be upgraded to <strong>{{installer.current.model.newVersion}}</strong> ({{installer.current.model.newState}}).
-        To compare versions and read a report of changes between versions, use the <em>View Report</em> button below.
-    </p>
-    <p>
-        <a ng-href="{{installer.current.model.reportUrl}}" target="_blank" rel="noopener" class="btn btn-info">View Report</a>
-    </p>
-    <p>
-        Simply click <strong>continue</strong> below to be guided through the rest of the upgrade.
-    </p>
-    <p>
-        <button class="btn btn-success" ng-click="install()">Continue</button>
-   </p>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/user.controller.js b/src/Umbraco.Web.UI.Client/src/installer/steps/user.controller.js
deleted file mode 100644
index c7f0bdb1c3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/user.controller.js
+++ /dev/null
@@ -1,110 +0,0 @@
-angular.module("umbraco.install").controller("Umbraco.Install.UserController", function ($scope, $sce, installerService) {
-
-  $scope.majorVersion = Umbraco.Sys.ServerVariables.application.version;
-  $scope.passwordPattern = /.*/;
-  $scope.installer.current.model.subscribeToNewsLetter = $scope.installer.current.model.subscribeToNewsLetter || false;
-  setTelemetryLevelAndDescription($scope.installer.current.model.telemetryIndex ?? 2);
-
-  if ($scope.installer.current.model.minNonAlphaNumericLength > 0) {
-    var exp = "";
-    for (var i = 0; i < $scope.installer.current.model.minNonAlphaNumericLength; i++) {
-      exp += ".*[\\W].*";
-    }
-    //replace duplicates
-    exp = exp.replace(".*.*", ".*");
-    $scope.passwordPattern = new RegExp(exp);
-  }
-
-  if ('noUiSlider' in window) {
-    let consentSliderStartLevel = 2;
-    const initialConsentLevel = $scope.installer.current.model.consentLevels.findIndex(x => x.level === $scope.installer.current.model.telemetryLevel);
-    if (initialConsentLevel !== -1) {
-      consentSliderStartLevel = initialConsentLevel + 1;
-    }
-
-    const sliderOptions =
-    {
-      "start": consentSliderStartLevel,
-      "step": 1,
-      "tooltips": [false],
-      "range": {
-        "min": 1,
-        "max": 3
-      },
-      behaviour: 'smooth-steps-tap',
-      pips: {
-        mode: 'values',
-        density: 50,
-        values: [1, 2, 3],
-        "format": {
-          to: function (value) {
-            return $scope.installer.current.model.consentLevels[value - 1].level;
-          },
-          from: function (value) {
-            return Number(value);
-          }
-        }
-      }
-    };
-
-    const consentSlider = document.getElementById("consentSlider");
-    if (consentSlider) {
-      window.noUiSlider.create(consentSlider, sliderOptions);
-      consentSlider.noUiSlider.on('change', onChangeConsent);
-
-      const pips = consentSlider.querySelectorAll('.noUi-value');
-
-      consentSlider.noUiSlider.on('update', function (values,handle) {
-        consentSlider.querySelectorAll('.noUi-value').forEach(pip => {
-          pip.classList.remove("noUi-value-active");
-          if (Number(values[handle]) === Number(pip.getAttribute('data-value'))) {
-            pip.classList.add("noUi-value-active");
-          }
-        });
-      });
-
-      $(consentSlider).on('$destroy', function () {
-        consentSlider.noUiSlider.off();
-      });
-
-      pips.forEach(function (pip) {
-        pip.addEventListener('click', function () {
-          const value = pip.getAttribute('data-value');
-          consentSlider.noUiSlider.set(value);
-        });
-      });
-    }
-  }
-
-  $scope.validateAndInstall = function () {
-    installerService.install();
-  };
-
-  $scope.validateAndForward = function () {
-    if (this.installerForm.$valid) {
-      installerService.forward();
-    }
-  };
-
-  $scope.togglePassword = function () {
-    var elem = $("form[name='installerForm'] input[name='installer.current.model.password']");
-    elem.attr("type", (elem.attr("type") === "text" ? "password" : "text"));
-    elem.focus();
-    $(".password-text.show, .password-text.hide").toggle();
-  }
-
-  function onChangeConsent(values) {
-    const result = Math.round(Number(values[0]) - 1);
-
-    $scope.$apply(() => {
-      setTelemetryLevelAndDescription(result);
-    });
-  };
-
-  function setTelemetryLevelAndDescription(idx) {
-    $scope.telemetryDescription = $sce.trustAsHtml($scope.installer.current.model.consentLevels[idx].description);
-    $scope.installer.current.model.telemetryIndex = idx;
-    $scope.installer.current.model.telemetryLevel = $scope.installer.current.model.consentLevels[idx].level;
-  }
-
-});
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/user.html b/src/Umbraco.Web.UI.Client/src/installer/steps/user.html
deleted file mode 100644
index d1acf0691b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/user.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<div ng-controller="Umbraco.Install.UserController">
-  <h1>Install Umbraco</h1>
-
-  <p>
-    Enter credentials for the default administrator user and choose the level of
-    consent for telemetry data of your Umbraco installation.
-  </p>
-
-  <form
-    class="-no-margin-bottom"
-    name="installerForm"
-    novalidate
-    ng-submit="validateAndInstall();"
-  >
-    <div class="installer-cols">
-      <div class="installer-col user-col">
-        <div class="control-group">
-          <label class="control-label" for="name">Name</label>
-          <div class="controls">
-            <input
-              type="text"
-              id="name"
-              name="name"
-              placeholder="Full name"
-              required
-              ng-model="installer.current.model.name"
-            />
-          </div>
-        </div>
-
-        <div class="control-group">
-          <label class="control-label" for="email">Email</label>
-          <div class="controls">
-            <input
-              type="email"
-              id="email"
-              name="email"
-              placeholder="you@example.com"
-              val-email
-              required
-              ng-model="installer.current.model.email"
-            />
-            <small class="inline-help"
-              >Your email will be used as your login</small
-            >
-          </div>
-        </div>
-
-        <div class="control-group">
-          <label class="control-label" for="password">Password</label>
-          <div class="controls">
-
-            <input
-              type="password"
-              name="installer.current.model.password"
-              ng-minlength="{{installer.current.model.minCharLength}}"
-              ng-pattern="passwordPattern"
-              autocorrect="off"
-              autocapitalize="off"
-              autocomplete="off"
-              required
-              ng-model="installer.current.model.password"
-              id="password"
-              spellcheck="false"
-            />
-
-            <div class="password-toggle">
-              <button type="button" class="btn-reset" ng-click="togglePassword()">
-                <small class="password-text show">Show password</small>
-                <small class="password-text hide">Hide password</small>
-              </button>
-            </div>
-
-            <small class="inline-help"
-              >At least {{installer.current.model.minCharLength}} characters
-              long</small
-            >
-
-            <small
-              ng-if="installer.current.model.minNonAlphaNumericLength > 0"
-              class="inline-help"
-            >
-              At least {{installer.current.model.minNonAlphaNumericLength}}
-              symbol{{installer.current.model.minNonAlphaNumericLength > 1 ? 's'
-              : ''}}
-            </small>
-          </div>
-        </div>
-
-        <div class="control-group">
-          <div class="controls">
-            <label>
-              <input
-                type="checkbox"
-                id="subscribeToNewsLetter"
-                name="subscribeToNewsLetter"
-                ng-model="installer.current.model.subscribeToNewsLetter"
-              />
-              Keep me updated on Umbraco Versions, Security Bulletins and
-              Community News
-            </label>
-          </div>
-        </div>
-
-        <div
-          ng-if="installer.current.model.quickInstallSettings"
-          style="margin-top: auto"
-        >
-          <div class="control-group">
-            <label class="control-label" for="dbType">Database</label>
-            <div class="controls -with-border">
-              <div class="input-readonly-text" ng-if="installer.current.model.customInstallAvailable">
-                <strong>Provider:</strong>
-                {{installer.current.model.quickInstallSettings.displayName}}
-                <br /><strong>Name:</strong>
-                {{installer.current.model.quickInstallSettings.defaultDatabaseName}}
-              </div>
-              <div class="input-readonly-text" ng-if="!installer.current.model.customInstallAvailable">
-                A database has been pre-configured for your installation.
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="installer-col telemetry-col">
-        <div class="control-group">
-          <label class="control-label">
-            Consent for telemetry data
-            <br /><small>
-              This can be changed later in the Settings panel.
-            </small>
-          </label>
-          <div class="controls">
-            <div id="consentSliderWrapper">
-              <div id="consentSlider" class="umb-range-slider"></div>
-            </div>
-          </div>
-          <p>
-            <small>
-              In order to improve Umbraco and add new functionality based on as
-              relevant information as possible, we would like to collect system-
-              and usage information from your installation.
-            </small>
-          </p>
-          <p><small ng-bind-html="telemetryDescription"></small></p>
-        </div>
-      </div>
-    </div>
-
-    <div class="control-actions" ng-class="{disabled:installerForm.$invalid}">
-      <div
-        class="controls-space-between"
-        ng-if="installer.current.model.quickInstallSettings"
-      >
-        <button
-          ng-if="installer.current.model.quickInstallSettings && installer.current.model.customInstallAvailable"
-          class="btn btn-info control-customize"
-          ng-disabled="installerForm.$invalid"
-          ng-click="validateAndForward()"
-        >
-          Change Database
-        </button>
-
-        <button ng-disabled="installerForm.$invalid" class="btn btn-success">
-          Install
-        </button>
-      </div>
-
-      <button
-        ng-if="!installer.current.model.quickInstallSettings"
-        class="btn btn-primary control-customize"
-        ng-disabled="installerForm.$invalid"
-        ng-click="validateAndForward()"
-      >
-        Next
-      </button>
-    </div>
-  </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/version7upgradereport.html b/src/Umbraco.Web.UI.Client/src/installer/steps/version7upgradereport.html
deleted file mode 100644
index f30788e858..0000000000
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/version7upgradereport.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div>
-    <h1>Major version upgrade from {{installer.current.model.currentVersion}} to {{installer.current.model.newVersion}}</h1>
-    <h2>There were {{installer.current.model.errors.length}} issues detected</h2>
-    <p>
-        The following compatibility issues were found. If you continue, all non-compatible property editors will be converted to a Readonly/Label.                             
-        You will be able to change the property editor to a compatible type manually by editing the data type after installation.
-    </p>
-    <p>
-        Otherwise, if you choose not to proceed, you will need to fix the errors listed below. 
-        Refer to v{{installer.current.model.newVersion}} upgrade instructions for full details.
-    </p>
-    
-    <ul class="upgrade-report">
-        <li ng-repeat="item in installer.current.model.errors">
-            {{item}}
-        </li>
-    </ul>
-    
-    <p>
-        <button class="btn btn-success" ng-click="forward()">Continue</button>
-   </p>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/less/accessibility/sr-only.less b/src/Umbraco.Web.UI.Client/src/less/accessibility/sr-only.less
deleted file mode 100644
index 21ca5e6718..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/accessibility/sr-only.less
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// sr-only - based on the boot strap naming conventions used to remove an element from the view, whilst retaining accessibily for screen readers. More info available at https://getbootstrap.com/docs/4.0/utilities/screenreaders/
-// --------------------------------------------------
-.sr-only {
-    position: absolute;
-    width: 1px;
-    height: 1px;
-    padding: 0;
-    margin: -1px;
-    overflow: hidden;
-    clip: rect(0,0,0,0);
-    border: 0;
-
-    &--focusable:active,
-    &--focusable:focus,
-    &--hoverable:hover {
-        position: static;
-        width: auto;
-        height: auto;
-        margin: 0;
-        overflow: visible;
-        clip: auto;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/alerts.less b/src/Umbraco.Web.UI.Client/src/less/alerts.less
deleted file mode 100644
index 94dcef6f25..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/alerts.less
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Alerts
-// --------------------------------------------------
-
-
-// Base styles
-// -------------------------
-
-.alert {
-  position: relative;
-  padding: 8px 35px 8px 14px;
-  margin-bottom: @baseLineHeight;
-  background-color: @warningBackground;
-  border: 1px solid @warningBorder;
-  .border-radius(@alertBorderRadius);
-}
-.alert,
-.alert h4,
-.alert a {
-  // Specified for the h4 to prevent conflicts of changing @headingsColor
-  color: @warningText;
-}
-.alert h4 {
-  margin: 0;
-}
-
-// Adjust close link position
-.alert .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: @baseLineHeight;
-}
-
-.close.-align-right {
-   right: 0;
-}
-
-
-// Alternate styles
-// -------------------------
-
-.alert-success {
-  background-color: @successBackground;
-  border-color: @successBorder;
-  color: @successText;
-}
-.alert-success h4 {
-  color: @successText;
-}
-.alert-danger,
-.alert-error {
-  background-color: @errorBackground;
-  border-color: @errorBorder;
-  color: @errorText;
-}
-
-.alert-warning() {
-    background-color: @warningBackground;
-    border-color: @warningBorder;
-    color: @warningText;
-}
-.alert-warning {
-    .alert-warning()
-}
-.alert-danger h4,
-.alert-error h4 {
-  color: @errorText;
-}
-.alert-info {
-  background-color: @infoBackground;
-  border-color: @infoBorder;
-  color: @infoText;
-}
-.alert-info h4 {
-  color: @infoText;
-}
-
-.alert-form {
-  background-color: @white;
-  border: 1px solid @gray-3 !important;
-  color: @gray-3;
-  box-shadow: 0 -1px 6px 0 rgba(0,0,0,0.16);
-}
-
-.alert-form.-no-border {
-   border: none !important;
-}
-
-.alert-form h4 {
-  color: @black;
-  font-weight: bold;
-  margin-bottom: 5px;
-}
-
-
-// Block alerts
-// -------------------------
-
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
-}
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-.alert-block p + p {
-  margin-top: 5px;
-}
-
-
-// Property error alerts
-// -------------------------
-.alert.property-error {
-
-    display: inline-block;
-    font-size: 14px;
-    padding: 6px 16px 6px 12px;
-    margin-bottom: 6px;
-
-    .show-validation-type-warning & {
-        .alert-warning();
-        font-weight: bold;
-        &.alert-error::after {
-            border-top-color: @warningBackground;
-        }
-    }
-
-    &::after {
-        content:'';
-        position: absolute;
-        bottom:-6px;
-        left: 6px;
-        width: 0;
-        height: 0;
-        border-left: 6px solid transparent;
-        border-right: 6px solid transparent;
-        border-top: 6px solid;
-    }
-    &.alert-error::after {
-        border-top-color: @errorBackground;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/application/animations.less b/src/Umbraco.Web.UI.Client/src/less/application/animations.less
deleted file mode 100644
index e081c4919a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/application/animations.less
+++ /dev/null
@@ -1,98 +0,0 @@
-// Animations
-// -------------------------
-
-//Animate.css - https://daneden.github.io/animate.css/
-//Licensed under the MIT license - https://opensource.org/licenses/MIT
-//Copyright (c) 2013 Daniel Eden
-.animated{animation-duration:1s;animation-fill-mode:both}.animated.infinite{animation-iteration-count:infinite}.animated.hinge{animation-duration:2s}.bounceIn,.bounceOut,.flipOutX,.flipOutY{animation-duration:.75s}@keyframes bounce{0%,100%,20%,53%,80%{transition-timing-function:cubic-bezier(.215,.61,.355,1);transform:translate3d(0,0,0)}40%,43%{transition-timing-function:cubic-bezier(.755,.050,.855,.060);transform:translate3d(0,-30px,0)}70%{transition-timing-function:cubic-bezier(.755,.050,.855,.060);transform:translate3d(0,-15px,0)}90%{transform:translate3d(0,-4px,0)}}.bounce{animation-name:bounce;transform-origin:center bottom}@keyframes flash{0%,100%,50%{opacity:1}25%,75%{opacity:0}}.flash{animation-name:flash}@keyframes pulse{0%,100%{transform:scale3d(1,1,1)}50%{transform:scale3d(1.05,1.05,1.05)}}.pulse{animation-name:pulse}@keyframes rubberBand{0%,100%{transform:scale3d(1,1,1)}30%{transform:scale3d(1.25,.75,1)}40%{transform:scale3d(.75,1.25,1)}50%{transform:scale3d(1.15,.85,1)}65%{transform:scale3d(.95,1.05,1)}75%{transform:scale3d(1.05,.95,1)}}.rubberBand{animation-name:rubberBand}@keyframes shake{0%,100%{transform:translate3d(0,0,0)}10%,30%,50%,70%,90%{transform:translate3d(-10px,0,0)}20%,40%,60%,80%{transform:translate3d(10px,0,0)}}.shake{animation-name:shake}@keyframes swing{20%{transform:rotate3d(0,0,1,15deg)}40%{transform:rotate3d(0,0,1,-10deg)}60%{transform:rotate3d(0,0,1,5deg)}80%{transform:rotate3d(0,0,1,-5deg)}100%{transform:rotate3d(0,0,1,0deg)}}.swing{transform-origin:top center;animation-name:swing}@keyframes tada{0%,100%{transform:scale3d(1,1,1)}10%,20%{transform:scale3d(.9,.9,.9) rotate3d(0,0,1,-3deg)}30%,50%,70%,90%{transform:scale3d(1.1,1.1,1.1) rotate3d(0,0,1,3deg)}40%,60%,80%{transform:scale3d(1.1,1.1,1.1) rotate3d(0,0,1,-3deg)}}.tada{animation-name:tada}@keyframes wobble{0%,100%{transform:none}15%{transform:translate3d(-25%,0,0) rotate3d(0,0,1,-5deg)}30%{transform:translate3d(20%,0,0) rotate3d(0,0,1,3deg)}45%{transform:translate3d(-15%,0,0) rotate3d(0,0,1,-3deg)}60%{transform:translate3d(10%,0,0) rotate3d(0,0,1,2deg)}75%{transform:translate3d(-5%,0,0) rotate3d(0,0,1,-1deg)}}.wobble{animation-name:wobble}@keyframes bounceIn{0%,100%,20%,40%,60%,80%{transition-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;transform:scale3d(.3,.3,.3)}20%{transform:scale3d(1.1,1.1,1.1)}40%{transform:scale3d(.9,.9,.9)}60%{opacity:1;transform:scale3d(1.03,1.03,1.03)}80%{transform:scale3d(.97,.97,.97)}100%{opacity:1;transform:scale3d(1,1,1)}}.bounceIn{animation-name:bounceIn}@keyframes bounceInDown{0%,100%,60%,75%,90%{transition-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;transform:translate3d(0,-3000px,0)}60%{opacity:1;transform:translate3d(0,25px,0)}75%{transform:translate3d(0,-10px,0)}90%{transform:translate3d(0,5px,0)}100%{transform:none}}.bounceInDown{animation-name:bounceInDown}@keyframes bounceInLeft{0%,100%,60%,75%,90%{transition-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;transform:translate3d(-3000px,0,0)}60%{opacity:1;transform:translate3d(25px,0,0)}75%{transform:translate3d(-10px,0,0)}90%{transform:translate3d(5px,0,0)}100%{transform:none}}.bounceInLeft{animation-name:bounceInLeft}@keyframes bounceInRight{0%,100%,60%,75%,90%{transition-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;transform:translate3d(3000px,0,0)}60%{opacity:1;transform:translate3d(-25px,0,0)}75%{transform:translate3d(10px,0,0)}90%{transform:translate3d(-5px,0,0)}100%{transform:none}}.bounceInRight{animation-name:bounceInRight}@keyframes bounceInUp{0%,100%,60%,75%,90%{transition-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;transform:translate3d(0,3000px,0)}60%{opacity:1;transform:translate3d(0,-20px,0)}75%{transform:translate3d(0,10px,0)}90%{transform:translate3d(0,-5px,0)}100%{transform:translate3d(0,0,0)}}.bounceInUp{animation-name:bounceInUp}@keyframes bounceOut{20%{transform:scale3d(.9,.9,.9)}50%,55%{opacity:1;transform:scale3d(1.1,1.1,1.1)}100%{opacity:0;transform:scale3d(.3,.3,.3)}}.bounceOut{animation-name:bounceOut}@keyframes bounceOutDown{20%{transform:translate3d(0,10px,0)}40%,45%{opacity:1;transform:translate3d(0,-20px,0)}100%{opacity:0;transform:translate3d(0,2000px,0)}}.bounceOutDown{animation-name:bounceOutDown}@keyframes bounceOutLeft{20%{opacity:1;transform:translate3d(20px,0,0)}100%{opacity:0;transform:translate3d(-2000px,0,0)}}.bounceOutLeft{animation-name:bounceOutLeft}@keyframes bounceOutRight{20%{opacity:1;transform:translate3d(-20px,0,0)}100%{opacity:0;transform:translate3d(2000px,0,0)}}.bounceOutRight{animation-name:bounceOutRight}@keyframes bounceOutUp{20%{transform:translate3d(0,-10px,0)}40%,45%{opacity:1;transform:translate3d(0,20px,0)}100%{opacity:0;transform:translate3d(0,-2000px,0)}}.bounceOutUp{animation-name:bounceOutUp}@keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.fadeIn{animation-name:fadeIn}@keyframes fadeInDown{0%{opacity:0;transform:translate3d(0,-100%,0)}100%{opacity:1;transform:none}}.fadeInDown{animation-name:fadeInDown}@keyframes fadeInDownBig{0%{opacity:0;transform:translate3d(0,-2000px,0)}100%{opacity:1;transform:none}}.fadeInDownBig{animation-name:fadeInDownBig}@keyframes fadeInLeft{0%{opacity:0;transform:translate3d(-100%,0,0)}100%{opacity:1;transform:none}}.fadeInLeft{animation-name:fadeInLeft}@keyframes fadeInLeftBig{0%{opacity:0;transform:translate3d(-2000px,0,0)}100%{opacity:1;transform:none}}.fadeInLeftBig{animation-name:fadeInLeftBig}@keyframes fadeInRight{0%{opacity:0;transform:translate3d(100%,0,0)}100%{opacity:1;transform:none}}.fadeInRight{animation-name:fadeInRight}@keyframes fadeInRightBig{0%{opacity:0;transform:translate3d(2000px,0,0)}100%{opacity:1;transform:none}}.fadeInRightBig{animation-name:fadeInRightBig}@keyframes fadeInUp{0%{opacity:0;transform:translate3d(0,100%,0)}100%{opacity:1;transform:none}}.fadeInUp{animation-name:fadeInUp}@keyframes fadeInUpBig{0%{opacity:0;transform:translate3d(0,2000px,0)}100%{opacity:1;transform:none}}.fadeInUpBig{animation-name:fadeInUpBig}@keyframes fadeOut{0%{opacity:1}100%{opacity:0}}.fadeOut{animation-name:fadeOut}@keyframes fadeOutDown{0%{opacity:1}100%{opacity:0;transform:translate3d(0,100%,0)}}.fadeOutDown{animation-name:fadeOutDown}@keyframes fadeOutDownBig{0%{opacity:1}100%{opacity:0;transform:translate3d(0,2000px,0)}}.fadeOutDownBig{animation-name:fadeOutDownBig}@keyframes fadeOutLeft{0%{opacity:1}100%{opacity:0;transform:translate3d(-100%,0,0)}}.fadeOutLeft{animation-name:fadeOutLeft}@keyframes fadeOutLeftBig{0%{opacity:1}100%{opacity:0;transform:translate3d(-2000px,0,0)}}.fadeOutLeftBig{animation-name:fadeOutLeftBig}@keyframes fadeOutRight{0%{opacity:1}100%{opacity:0;transform:translate3d(100%,0,0)}}.fadeOutRight{animation-name:fadeOutRight}@keyframes fadeOutRightBig{0%{opacity:1}100%{opacity:0;transform:translate3d(2000px,0,0)}}.fadeOutRightBig{animation-name:fadeOutRightBig}@keyframes fadeOutUp{0%{opacity:1}100%{opacity:0;transform:translate3d(0,-100%,0)}}.fadeOutUp{animation-name:fadeOutUp}@keyframes fadeOutUpBig{0%{opacity:1}100%{opacity:0;transform:translate3d(0,-2000px,0)}}.fadeOutUpBig{animation-name:fadeOutUpBig}@keyframes flip{0%{transform:perspective(400px) rotate3d(0,1,0,-360deg);animation-timing-function:ease-out}40%{transform:perspective(400px) translate3d(0,0,150px) rotate3d(0,1,0,-190deg);animation-timing-function:ease-out}50%{transform:perspective(400px) translate3d(0,0,150px) rotate3d(0,1,0,-170deg);animation-timing-function:ease-in}80%{transform:perspective(400px) scale3d(.95,.95,.95);animation-timing-function:ease-in}100%{transform:perspective(400px);animation-timing-function:ease-in}}.animated.flip{-webkit-backface-visibility:visible;-ms-backface-visibility:visible;backface-visibility:visible;animation-name:flip}@keyframes flipInX{0%{transform:perspective(400px) rotate3d(1,0,0,90deg);transition-timing-function:ease-in;opacity:0}40%{transform:perspective(400px) rotate3d(1,0,0,-20deg);transition-timing-function:ease-in}60%{transform:perspective(400px) rotate3d(1,0,0,10deg);opacity:1}80%{transform:perspective(400px) rotate3d(1,0,0,-5deg)}100%{transform:perspective(400px)}}.flipInX{-webkit-backface-visibility:visible!important;-ms-backface-visibility:visible!important;backface-visibility:visible!important;animation-name:flipInX}.flipInY,.flipOutX{-webkit-backface-visibility:visible!important;-ms-backface-visibility:visible!important}@keyframes flipInY{0%{transform:perspective(400px) rotate3d(0,1,0,90deg);transition-timing-function:ease-in;opacity:0}40%{transform:perspective(400px) rotate3d(0,1,0,-20deg);transition-timing-function:ease-in}60%{transform:perspective(400px) rotate3d(0,1,0,10deg);opacity:1}80%{transform:perspective(400px) rotate3d(0,1,0,-5deg)}100%{transform:perspective(400px)}}.flipInY{backface-visibility:visible!important;animation-name:flipInY}@keyframes flipOutX{0%{transform:perspective(400px)}30%{transform:perspective(400px) rotate3d(1,0,0,-20deg);opacity:1}100%{transform:perspective(400px) rotate3d(1,0,0,90deg);opacity:0}}.flipOutX{animation-name:flipOutX;backface-visibility:visible!important}@keyframes flipOutY{0%{transform:perspective(400px)}30%{transform:perspective(400px) rotate3d(0,1,0,-15deg);opacity:1}100%{transform:perspective(400px) rotate3d(0,1,0,90deg);opacity:0}}.flipOutY{-webkit-backface-visibility:visible!important;-ms-backface-visibility:visible!important;backface-visibility:visible!important;animation-name:flipOutY}@keyframes lightSpeedIn{0%{transform:translate3d(100%,0,0) skewX(-30deg);opacity:0}60%{transform:skewX(20deg);opacity:1}80%{transform:skewX(-5deg);opacity:1}100%{transform:none;opacity:1}}.lightSpeedIn{animation-name:lightSpeedIn;animation-timing-function:ease-out}@keyframes lightSpeedOut{0%{opacity:1}100%{transform:translate3d(100%,0,0) skewX(30deg);opacity:0}}.lightSpeedOut{animation-name:lightSpeedOut;animation-timing-function:ease-in}@keyframes rotateIn{0%{transform-origin:center;transform:rotate3d(0,0,1,-200deg);opacity:0}100%{transform-origin:center;transform:none;opacity:1}}.rotateIn{animation-name:rotateIn}@keyframes rotateInDownLeft{0%{transform-origin:left bottom;transform:rotate3d(0,0,1,-45deg);opacity:0}100%{transform-origin:left bottom;transform:none;opacity:1}}.rotateInDownLeft{animation-name:rotateInDownLeft}@keyframes rotateInDownRight{0%{transform-origin:right bottom;transform:rotate3d(0,0,1,45deg);opacity:0}100%{transform-origin:right bottom;transform:none;opacity:1}}.rotateInDownRight{animation-name:rotateInDownRight}@keyframes rotateInUpLeft{0%{transform-origin:left bottom;transform:rotate3d(0,0,1,45deg);opacity:0}100%{transform-origin:left bottom;transform:none;opacity:1}}.rotateInUpLeft{animation-name:rotateInUpLeft}@keyframes rotateInUpRight{0%{transform-origin:right bottom;transform:rotate3d(0,0,1,-90deg);opacity:0}100%{transform-origin:right bottom;transform:none;opacity:1}}.rotateInUpRight{animation-name:rotateInUpRight}@keyframes rotateOut{0%{transform-origin:center;opacity:1}100%{transform-origin:center;transform:rotate3d(0,0,1,200deg);opacity:0}}.rotateOut{animation-name:rotateOut}@keyframes rotateOutDownLeft{0%{transform-origin:left bottom;opacity:1}100%{transform-origin:left bottom;transform:rotate(0,0,1,45deg);opacity:0}}.rotateOutDownLeft{animation-name:rotateOutDownLeft}@keyframes rotateOutDownRight{0%{transform-origin:right bottom;opacity:1}100%{transform-origin:right bottom;transform:rotate3d(0,0,1,-45deg);opacity:0}}.rotateOutDownRight{animation-name:rotateOutDownRight}@keyframes rotateOutUpLeft{0%{transform-origin:left bottom;opacity:1}100%{transform-origin:left bottom;transform:rotate3d(0,0,1,-45deg);opacity:0}}.rotateOutUpLeft{animation-name:rotateOutUpLeft}@keyframes rotateOutUpRight{0%{transform-origin:right bottom;opacity:1}100%{transform-origin:right bottom;transform:rotate3d(0,0,1,90deg);opacity:0}}.rotateOutUpRight{animation-name:rotateOutUpRight}@keyframes hinge{0%{transform-origin:top left;animation-timing-function:ease-in-out}20%,60%{transform:rotate3d(0,0,1,80deg);transform-origin:top left;animation-timing-function:ease-in-out}40%,80%{transform:rotate3d(0,0,1,60deg);transform-origin:top left;animation-timing-function:ease-in-out;opacity:1}100%{transform:translate3d(0,700px,0);opacity:0}}.hinge{animation-name:hinge}@keyframes rollIn{0%{opacity:0;transform:translate3d(-100%,0,0) rotate3d(0,0,1,-120deg)}100%{opacity:1;transform:none}}.rollIn{animation-name:rollIn}@keyframes rollOut{0%{opacity:1}100%{opacity:0;transform:translate3d(100%,0,0) rotate3d(0,0,1,120deg)}}.rollOut{animation-name:rollOut}@keyframes zoomIn{0%{opacity:0;transform:scale3d(.3,.3,.3)}50%{opacity:1}}.zoomIn{animation-name:zoomIn}@keyframes zoomInDown{0%{opacity:0;transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;transform:scale3d(.475,.475,.475) translate3d(0,60px,0);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomInDown{animation-name:zoomInDown}@keyframes zoomInLeft{0%{opacity:0;transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;transform:scale3d(.475,.475,.475) translate3d(10px,0,0);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomInLeft{animation-name:zoomInLeft}@keyframes zoomInRight{0%{opacity:0;transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomInRight{animation-name:zoomInRight}@keyframes zoomInUp{0%{opacity:0;transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomInUp{animation-name:zoomInUp}@keyframes zoomOut{0%{opacity:1}50%{opacity:0;transform:scale3d(.3,.3,.3)}100%{opacity:0}}.zoomOut{animation-name:zoomOut}@keyframes zoomOutDown{40%{opacity:1;transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}100%{opacity:0;transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);transform-origin:center bottom;animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomOutDown{animation-name:zoomOutDown}@keyframes zoomOutLeft{40%{opacity:1;transform:scale3d(.475,.475,.475) translate3d(42px,0,0)}100%{opacity:0;transform:scale(.1) translate3d(-2000px,0,0);transform-origin:left center}}.zoomOutLeft{animation-name:zoomOutLeft}@keyframes zoomOutRight{40%{opacity:1;transform:scale3d(.475,.475,.475) translate3d(-42px,0,0)}100%{opacity:0;transform:scale(.1) translate3d(2000px,0,0);transform-origin:right center}}.zoomOutRight{animation-name:zoomOutRight}@keyframes zoomOutUp{40%{opacity:1;transform:scale3d(.475,.475,.475) translate3d(0,60px,0);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}100%{opacity:0;transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);transform-origin:center bottom;animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomOutUp{animation-name:zoomOutUp}
-
-.animated.-half-second {
-   animation-duration: 0.5s;
-}
-
-.slide-in-left.ng-hide-remove {
-    animation: fadeInLeft 0.6s;
-}
- 
-.slide-in-left.ng-hide-add {
-    animation: fadeOutLeft 0.6s;
-    display: block !important;
-}
-
-.slide-in-right.ng-hide-remove {
-    animation: fadeInRight 0.6s;
-}
- 
-.slide-in-right.ng-hide-add {
-    animation: fadeOutRight 0.6s;
-    display: block !important;
-}
-
-.slide-in-up.ng-hide-remove {
-    animation: fadeInUp 0.6s;
-}
- 
-.slide-in-up.ng-hide-add {
-    animation: fadeOutDown 0.6s;
-    display: block !important;
-}
-
-
-// TREE ANIMATION
-
-.umb-tree-item--deleted.ng-leave {
-    animation: leave 600ms cubic-bezier(0.445, 0.050, 0.550, 0.950);
-    display: block;
-    position: relative;
-}
-
-.umb-tree-item--deleted.ng-leave * { 
-    color: @red !important;
-}
-
-@keyframes leave {
-    to {
-        opacity: 0;
-        height: 0;
-        bottom: -70px;
-    }
-    25% {
-        bottom: 15px;
-    }
-    from {
-        opacity: 1;
-        height: 30px;
-        bottom: 0;
-    }
-}
-
-.tree-node-slide-up
-{ 
-    opacity:1;
-    top: 0;
-    transition: 700ms cubic-bezier(0.000, 0.000, 0.580, 1.000) all;    
-} 
-.tree-node-slide-up * {    
-    font-size:100%;
-    transition:font-size 700ms;    
-}
-.tree-node-slide-up.tree-node-slide-up-hide-active {
-    opacity: 0;
-    top: -100px;
-}
-.tree-node-slide-up.tree-node-slide-up-hide-active * {
-    font-size:120%;
-}
-
-.tree-fade-out-hide ,
-.tree-fade-out-show,
-.tree-fade-out-hide div:not(.tree-node-slide-up-hide-active),
-.tree-fade-out-show div:not(.tree-node-slide-up-hide-active) {    
-    transition: 700ms cubic-bezier(0.075, 0.820, 0.165, 1.000) all;
-}
-.tree-fade-out-show.tree-fade-out-show-active div:not(.tree-node-slide-up-hide-active){
-    opacity: 1;
-}
-.tree-fade-out-hide.tree-fade-out-hide-active div:not(.tree-node-slide-up-hide-active){
-    opacity: 0;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/application/grid.less b/src/Umbraco.Web.UI.Client/src/less/application/grid.less
deleted file mode 100644
index ec1c4968d7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/application/grid.less
+++ /dev/null
@@ -1,194 +0,0 @@
-// Grid
-// -------------------------
-
-/* CONTAINS BASIC APPLICATION LAYOUT, POSITIONING AND AREA DIMENSIONS */
-
-html, body {
-  height: 100%;
-  overflow: hidden;
-}
-
-body {
-  margin: 0;
-  padding: 0;
-  height: 100%;
-  width: 100%;
-
-  font-family: @baseFontFamily;
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  color: @textColor;
-  background-color: @bodyBackground;
-
-  // better font rendering
-  -webkit-font-smoothing: antialiased;
-  font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-
-.padded {
-  padding: 20px
-}
-
-
-#layout {
-  position: relative;
-  height: 100%;
-  padding: 0;
-  z-index: 1;
-}
-
-#mainwrapper {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  margin: 0;
-}
-
-body.umb-drawer-is-visible #mainwrapper{
-    right: @drawerWidth;
-}
-
-#contentwrapper, #contentcolumn {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  right: 0px;
-  left: 0px;
-  z-index: 10;
-  margin: 0;
-}
-
-#contentcolumn {
-  left: 0px;
-}
-
-#contentcolumn iframe#right {
-  display: block;
-  position: relative;
-  height: 100%;
-  width: 100%;
-  border: none;
-}
-
-#leftcolumn {
-  height: 100%;
-  z-index: 1100;
-  float: left;
-  position: absolute;
-  top: 0;
-
-  &.above-backdrop{
-      z-index: 7501;
-  }
-
-  // force behind TinyMCE when it's in fullscreen mode
-  .tox-fullscreen & {
-    z-index: 0;
-  }
-
-}
-
-#navigation {
-  left: 0;
-  top: 0;
-  bottom: 0;
-  position: absolute;
-  z-index: 100;
-  background: @white;
-  height: 100%;
-}
-
-.navigation-inner-container {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-  border-right: 1px solid @gray-9;
-  z-index: 100;
-  display: flex;
-  flex-direction: column;
-}
-
-#dialog {
-  min-width: 500px;
-  left: 100%;
-  top: 0;
-  position: absolute;
-  z-index: 50;
-  display: inline-block;
-}
-
-#tree {
-  padding: 0px;
-  z-index: 100 !important;
-  overflow: auto;
-  height: 100%;
-}
-
-#search-results {
-  z-index: 200;
-}
-
-#contextMenu {
-  z-index: 50;
-  position: absolute;
-  top: 0px;
-  left: 100%;
-  min-width: 260px;
-}
-
-#speechbubble {
-  z-index: 1060;
-  position: absolute;
-  bottom: 100px;
-  left: 0;
-  right: 0;
-  border-bottom: none;
-  margin: auto;
-  padding: 0px;
-  border: none;
-  background: none;
-  border-radius: 0;
-}
-
-.ui-resizable-e {
-    cursor: col-resize;
-    width: 10px;
-    right: -5px;
-    top: 0;
-    bottom: 0;
-    position:absolute;
-    z-index:9999 !important;
-
-    &:hover::after {
-        content: '';
-        position: absolute;
-        background-color: @gray-8;
-        top: 0;
-        bottom: 0;
-        width: 1px;
-        right: 5px;
-    }
-}
-
-@media (min-width: 1101px) {
-  #contentwrapper, #speechbubble { left: 360px; } 
-  .emptySection #contentwrapper { left: 0 !important; }
-}
-
-//empty section modification
-.emptySection #speechbubble { left: 0; }
-.emptySection #navigation { display: none }
-
-.login-only #speechbubble {
-    z-index: 10000;
-    left: 0 !important;
-}
-.login-only #speechbubble ul {
-    padding-left:20px
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/application/shadows.less b/src/Umbraco.Web.UI.Client/src/less/application/shadows.less
deleted file mode 100644
index 3df8ca5758..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/application/shadows.less
+++ /dev/null
@@ -1,15 +0,0 @@
-.shadow-depth-1{
-	box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
-}
-.shadow-depth-2{
-	box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
-}
-.shadow-depth-3{
-	box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
-}
-.shadow-depth-4{
-	box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22);
-}
-.shadow-depth-5{
-	box-shadow: 0 19px 38px rgba(0,0,0,0.30), 0 15px 12px rgba(0,0,0,0.22);
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/application/umb-outline.less b/src/Umbraco.Web.UI.Client/src/less/application/umb-outline.less
deleted file mode 100644
index 1f1c2c0e72..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/application/umb-outline.less
+++ /dev/null
@@ -1,42 +0,0 @@
-*:focus {
-    outline-color: @ui-outline;
-}
-
-.umb-outline {
-    &:focus {
-        outline:none;
-        .tabbing-active &::after {
-            content: '';
-            position: absolute;
-            z-index: 10000;
-            top: 0;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            border-radius: 3px;
-            box-shadow: 0 0 2px 0px @ui-outline, inset 0 0 2px 2px @ui-outline;
-            pointer-events: none;
-        }
-    }
-
-    &.umb-outline--surrounding {
-        &:focus {
-            .tabbing-active &::after {
-                top: -6px;
-                bottom: -6px;
-                left: -6px;
-                right: -6px;
-                border-radius: 9px;
-            }
-        }
-    }
-
-    &.umb-outline--thin {
-        &:focus {
-            .tabbing-active &::after {
-                box-shadow: 0 0 2px @ui-outline, inset 0 0 2px 1px @ui-outline;
-            }
-        }
-    }
-    
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
deleted file mode 100644
index 95a207b01a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ /dev/null
@@ -1,281 +0,0 @@
-
-// Core variables and mixins
-@import "fonts.less"; // Loading fonts
-@import "variables.less"; // Modify this for custom colors, font-sizes, etc
-@import "colors.less"; // Colors from variables but as specific CSS classes
-@import "mixins.less";
-
-// CSS Reset
-@import "../../lib/bootstrap/less/reset.less";
-
-// Grid system and page structure
-@import "../../lib/bootstrap/less/scaffolding.less";
-@import "../../lib/bootstrap/less/grid.less";
-@import "../../lib/bootstrap/less/layouts.less";
-
-// Base CSS
-@import "../../lib/bootstrap/less/type.less";
-@import "../../lib/bootstrap/less/code.less";
-@import "tables.less";
-
-
-// Components: common
-@import "../../lib/bootstrap/less/dropdowns.less";
-@import "../../lib/bootstrap/less/wells.less";
-@import "../../lib/bootstrap/less/component-animations.less";
-@import "../../lib/bootstrap/less/close.less";
-
-// Components: Buttons & Alerts
-@import "button-groups.less";
-@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
-
-// Components: Nav
-@import "navs.less";
-@import "../../lib/bootstrap/less/navbar.less";
-@import "../../lib/bootstrap/less/breadcrumbs.less";
-@import "../../lib/bootstrap/less/pagination.less";
-@import "../../lib/bootstrap/less/pager.less";
-
-// Components: Popovers
-@import "../../lib/bootstrap/less/modals.less";
-@import "../../lib/bootstrap/less/tooltip.less";
-@import "../../lib/bootstrap/less/popovers.less";
-@import "tipmenu.less";
-
-// Components: Misc
-@import "../../lib/bootstrap/less/thumbnails.less";
-@import "../../lib/bootstrap/less/media.less";
-@import "../../lib/bootstrap/less/labels-badges.less";
-@import "../../lib/bootstrap/less/progress-bars.less";
-@import "../../lib/bootstrap/less/accordion.less";
-@import "../../lib/bootstrap/less/carousel.less";
-@import "../../lib/bootstrap/less/hero-unit.less";
-
-
-// Utility classes
-@import "../../lib/bootstrap/less/utilities.less"; // Has to be last to override when necessary
-
-
-// Application wide styles (refactor is WIP)
-@import "application/grid.less";
-@import "rte.less";
-@import "application/shadows.less";
-@import "application/umb-outline.less";
-@import "application/animations.less";
-
-// Utilities
-@import "utilities/_font-weight.less";
-
-// Belle styles
-@import "buttons.less";
-@import "forms.less";
-@import "legacydialog.less";
-@import "modals.less";
-@import "panel.less";
-@import "sections.less";
-@import "icons.less";
-@import "main.less";
-@import "listview.less";
-@import "gridview.less";
-
-@import "forms/umb-validation-label.less";
-
-// Umbraco Accessibility
-@import "accessibility/sr-only.less";
-
-// Umbraco Components
-@import "components/application/umb-app-header.less";
-@import "components/application/umb-app-content.less";
-@import "components/application/umb-tour.less";
-@import "components/application/umb-backdrop.less";
-@import "components/application/umb-search.less";
-@import "components/application/umb-drawer.less";
-@import "components/application/umb-language-picker.less";
-@import "components/application/umb-dashboard.less";
-
-@import "components/html/umb-expansion-panel.less";
-@import "components/html/umb-group-panel.less";
-@import "components/html/umb-alert.less";
-
-@import "components/tree/umb-tree.less";
-@import "components/tree/umb-tree-root.less";
-@import "components/tree/umb-actions.less";
-@import "components/tree/umb-tree-item.less";
-
-@import "components/editor.less";
-@import "components/overlays.less";
-@import "components/card.less";
-@import "components/editor/umb-editor.less";
-@import "components/editor/umb-variant-switcher.less";
-@import "components/umb-sub-views.less";
-@import "components/umb-editor-navigation.less";
-@import "components/umb-editor-navigation-item.less";
-@import "components/umb-editor-sub-views.less";
-@import "components/editor/subheader/umb-editor-sub-header.less";
-@import "components/umb-date-time-picker.less";
-@import "components/umb-grid-selector.less";
-@import "components/umb-child-selector.less";
-@import "components/umb-group-builder.less";
-@import "components/umb-list-view-settings.less";
-@import "components/umb-table.less";
-@import "components/umb-confirm-action.less";
-@import "components/umb-keyboard-shortcuts-overview.less";
-@import "components/umb-checkbox-list.less";
-@import "components/umb-form-check.less";
-@import "components/umb-locked-field.less";
-@import "components/umb-tabs.less";
-@import "components/umb-loader.less";
-@import "components/umb-load-indicator.less";
-@import "components/umb-breadcrumbs.less";
-@import "components/umb-media-grid.less";
-@import "components/umb-folder-grid.less";
-@import "components/umb-content-grid.less";
-@import "components/umb-contextmenu.less";
-@import "components/umb-layout-selector.less";
-@import "components/umb-mini-search.less";
-@import "components/tooltip/umb-tooltip.less";
-@import "components/tooltip/umb-tooltip-list.less";
-@import "components/overlays/umb-overlay-backdrop.less";
-@import "components/overlays/umb-itempicker.less";
-@import "components/overlays/umb-variant-selector-overlay";
-@import "components/umb-grid.less";
-@import "components/umb-empty-state.less";
-
-@import "components/umb-property.less";
-@import "components/umb-property-editor.less";
-@import "components/umb-property-actions.less";
-
-@import "components/umb-code-snippet.less";
-@import "components/umb-color-picker.less";
-@import "components/umb-color-swatches.less";
-@import "components/check-circle.less";
-@import "components/umb-file-icon.less";
-@import "components/umb-iconpicker.less";
-@import "components/umb-insert-code-box.less";
-@import "components/umb-packages.less";
-@import "components/umb-logviewer.less";
-@import "components/umb-package-local-install.less";
-@import "components/umb-panel-group.less";
-@import "components/umb-lightbox.less";
-@import "components/umb-avatar.less";
-@import "components/umb-readonlyvalue.less";
-@import "components/umb-progress-bar.less";
-@import "components/umb-querybuilder.less";
-@import "components/umb-pagination.less";
-@import "components/umb-mini-list-view.less";
-@import "components/umb-multiple-textbox.less";
-@import "components/umb-badge.less";
-@import "components/umb-nested-content.less";
-@import "components/umb-checkmark.less";
-@import "components/umb-list.less";
-@import "components/umb-box.less";
-@import "components/umb-number-badge.less";
-@import "components/umb-progress-circle.less";
-@import "components/umb-stylesheet.less";
-@import "components/umb-textstring.less";
-@import "components/umb-textarea.less";
-@import "components/umb-dropdown.less";
-@import "components/umb-filter.less";
-@import "components/umb-range-slider.less";
-@import "components/umb-number.less";
-@import "components/umb-tags-editor.less";
-@import "components/umb-search-filter.less";
-
-@import "components/buttons/umb-button.less";
-@import "components/buttons/umb-button-group.less";
-@import "components/buttons/umb-toggle.less";
-@import "components/buttons/umb-toggle-group.less";
-@import "components/buttons/umb-button-ellipsis.less";
-
-@import "components/notifications/umb-notifications.less";
-@import "components/umb-file-dropzone.less";
-@import "components/umb-node-preview.less";
-@import "components/umb-mini-editor.less";
-@import "components/umb-property-file-upload.less";
-
-@import "components/users/umb-user-cards.less";
-@import "components/users/umb-user-table.less";
-@import "components/users/umb-user-details.less";
-@import "components/users/umb-user-group-picker-list.less";
-@import "components/users/umb-user-group-preview.less";
-@import "components/users/umb-user-preview.less";
-@import "components/users/umb-user-picker-list.less";
-
-@import "components/contextdialogs/umb-dialog-datatype-delete.less";
-
-@import "components/umbemailmarketing.less";
-@import "../views/components/media/umbmediapreview/umb-media-preview.less";
-@import "../views/components/media/umbaudiopreview/umb-audio-preview.less";
-@import "../views/components/media/umbfilepreview/umb-file-preview.less";
-@import "../views/components/media/umbimagepreview/umb-image-preview.less";
-@import "../views/components/media/umbvideopreview/umb-video-preview.less";
-
-// Editors
-@import "../views/common/infiniteeditors/rollback/rollback.less";
-
-// Property Editors
-@import "../views/propertyeditors/notsupported/notsupported.less";
-
-@import "../views/components/blockcard/umb-block-card-group.less";
-@import "../views/components/blockcard/umb-block-card-grid.less";
-@import "../views/components/blockcard/umb-block-card.less";
-@import "../views/components/umb-property-info-button/umb-property-info-button.less";
-
-@import "../views/propertyeditors/blockgrid/umb-block-grid-property-editor.less";
-@import "../views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.less";
-@import "../views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.less";
-@import "../views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-editor.less";
-@import "../views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-allowance-editor.less";
-@import "../views/propertyeditors/blockgrid/prevalue/umb-block-grid-column-editor.less";
-
-@import "../views/propertyeditors/blocklist/umb-block-list-property-editor.less";
-@import "../views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less";
-@import "../views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.less";
-@import "../views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.less";
-@import "../views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less";
-@import "../views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less";
-
-@import "../views/components/mediacard/umb-media-card-grid.less";
-@import "../views/components/mediacard/umb-media-card.less";
-@import "../views/propertyeditors/mediapicker3/prevalue/mediapicker3.crops.less";
-@import "../views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.less";
-@import "../views/common/infiniteeditors/mediaentryeditor/mediaentryeditor.less";
-
-
-// Utilities
-@import "utilities/layout/_display.less";
-@import "utilities/theme/_opacity.less";
-@import "utilities/typography/_text-decoration.less";
-@import "utilities/typography/_white-space.less";
-@import "utilities/typography/_word-break.less";
-@import "utilities/_flexbox.less";
-@import "utilities/_spacing.less";
-@import "utilities/_text-align.less";
-@import "utilities/_width.less";
-@import "utilities/_cursor.less";
-
-//page specific styles
-@import "pages/login.less";
-@import "pages/welcome-dashboard.less";
-
-
-// Used for property editors
-@import "property-editors.less";
-
-// Used for prevalue editors
-@import "components/prevalues/multivalues.less";
-@import "../views/prevalueeditors/numberrange.less";
-
-// Dashboards
-@import "dashboards/getstarted.less";
-@import "dashboards/umbraco-forms.less";
-@import "dashboards/examine-management.less";
-@import "dashboards/healthcheck.less";
-@import "dashboards/content-templates.less";
-@import "dashboards/nucache.less";
-
-@import "typeahead.less";
-@import "hacks.less";
-
-// cleanup properties.less when it is done
-@import "properties.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/button-groups.less b/src/Umbraco.Web.UI.Client/src/less/button-groups.less
deleted file mode 100644
index a093c84641..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/button-groups.less
+++ /dev/null
@@ -1,216 +0,0 @@
-//
-// Button groups
-// --------------------------------------------------
-
-
-// Make the div behave like a button
-.btn-group {
-  position: relative;
-  display: inline-block;
-  font-size: 0; // remove as part 1 of font-size inline-block hack
-  vertical-align: middle; // match .btn alignment given font-size hack above
-  white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
-}
-
-// Space out series of button groups
-.btn-group + .btn-group {
-  margin-left: 5px;
-}
-
-// Optional: Group multiple button groups together for a toolbar
-.btn-toolbar {
-  font-size: 0; // Hack to remove whitespace that results from using inline-block
-  margin-top: (@baseLineHeight / 2);
-  margin-bottom: (@baseLineHeight / 2);
-  > .btn + .btn,
-  > .btn-group + .btn,
-  > .btn + .btn-group {
-    margin-left: 5px;
-  }
-}
-
-// Float them, remove border radius, then re-add to first and last elements
-.btn-group > .btn {
-  position: relative;
-  .border-radius(0);
-}
-.btn-group > .btn + .btn {
-  margin-left: -1px;
-}
-.btn-group > .btn,
-.btn-group > .dropdown-menu,
-.btn-group > .popover {
-  font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
-}
-
-// Reset fonts for other sizes
-.btn-group > .btn-mini {
-  font-size: @fontSizeMini;
-}
-.btn-group > .btn-small {
-  font-size: @fontSizeSmall;
-}
-.btn-group > .btn-large {
-  font-size: @fontSizeLarge;
-}
-
-// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
-.btn-group > .btn:first-child {
-  margin-left: 0;
-  .border-top-left-radius(@baseBorderRadius);
-  .border-bottom-left-radius(@baseBorderRadius);
-}
-// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-  .border-top-right-radius(@baseBorderRadius);
-  .border-bottom-right-radius(@baseBorderRadius);
-}
-// Reset corners for large buttons
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-  .border-top-left-radius(@borderRadiusLarge);
-  .border-bottom-left-radius(@borderRadiusLarge);
-}
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-  .border-top-right-radius(@borderRadiusLarge);
-  .border-bottom-right-radius(@borderRadiusLarge);
-}
-
-// On hover/focus/active, bring the proper btn to front
-.btn-group > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group > .btn:active,
-.btn-group > .btn.active {
-  z-index: 2;
-}
-
-// On active and open, don't show outline
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
-}
-
-
-
-// Split button dropdowns
-// ----------------------
-
-// Give the line between buttons some depth
-.btn-group > .btn + .dropdown-toggle {
-  padding-left: 8px;
-  padding-right: 8px;
-  .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
-}
-.btn-group > .btn-mini + .dropdown-toggle {
-  padding-left: 5px;
-  padding-right: 5px;
-}
-.btn-group > .btn-large + .dropdown-toggle {
-  padding-left: 12px;
-  padding-right: 12px;
-}
-
-.btn-group.open {
-
-  // The clickable button for toggling the menu
-  // Remove the gradient and set the same inset shadow as the :active state
-  .dropdown-toggle {
-    background-image: none;
-    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
-  }
-
-  // Keep the hover's background when dropdown is open
-  .btn.dropdown-toggle {
-    background-color: @btnBackgroundHighlight;
-  }
-  .btn-primary.dropdown-toggle {
-    background-color: @btnPrimaryBackgroundHighlight;
-  }
-  .btn-warning.dropdown-toggle {
-    background-color: @btnWarningBackgroundHighlight;
-  }
-  .btn-danger.dropdown-toggle {
-    background-color: @btnDangerBackgroundHighlight;
-  }
-  .btn-success.dropdown-toggle {
-    background-color: @btnSuccessBackgroundHighlight;
-  }
-  .btn-info.dropdown-toggle {
-    background-color: @btnInfoBackgroundHighlight;
-  }
-  .btn-inverse.dropdown-toggle {
-    background-color: @btnInverseBackgroundHighlight;
-  }
-}
-
-
-// Reposition the caret
-.btn .caret {
-  margin-top: 8px;
-  margin-left: 0;
-}
-// Carets in other button sizes
-.btn-large .caret {
-  margin-top: 6px;
-}
-.btn-large .caret {
-  border-left-width:  5px;
-  border-right-width: 5px;
-  border-top-width:   5px;
-}
-.btn-mini .caret,
-.btn-small .caret {
-  margin-top: 8px;
-}
-// Upside down carets for .dropup
-.dropup .btn-large .caret {
-  border-bottom-width: 5px;
-}
-
-
-// Vertical button groups
-// ----------------------
-
-.btn-group-vertical {
-  display: inline-block; // makes buttons only take up the width they need
-}
-.btn-group-vertical > .btn {
-  display: block;
-  float: none;
-  max-width: 100%;
-  .border-radius(0);
-}
-.btn-group-vertical > .btn + .btn {
-  margin-left: 0;
-  margin-top: -1px;
-}
-.btn-group-vertical > .btn:first-child {
-  .border-radius(@baseBorderRadius @baseBorderRadius 0 0);
-}
-.btn-group-vertical > .btn:last-child {
-  .border-radius(0 0 @baseBorderRadius @baseBorderRadius);
-}
-.btn-group-vertical > .btn-large:first-child {
-  .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0);
-}
-.btn-group-vertical > .btn-large:last-child {
-  .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge);
-}
-
-.btn-group-justified {
-  display: flex;
-
-  .umb-button {
-    margin-left: 0;
-  }
-
-  > * {
-    flex-grow: 1;
-  }
-
-  > .dropdown-toggle {
-    flex-grow: 0;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
deleted file mode 100644
index 3133c09805..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ /dev/null
@@ -1,378 +0,0 @@
-//
-// Buttons
-// --------------------------------------------------
-
-
-// Base styles
-// --------------------------------------------------
-
-// Core
-.btn {
-  display: inline-block;
-  padding: 6px 14px;
-  margin-bottom: 0; // For input.btn
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  text-align: center;
-  vertical-align: middle;
-  cursor: pointer;
-  background: @btnBackground;
-  color: @black;
-  border: none;
-  box-shadow: none;
-  border-radius: 3px;
-
-    // Hover/focus state
-    &:hover {
-        background: @btnBackgroundHighlight;
-        color: @gray-4;
-        background-position: 0 -15px;
-        text-decoration: none;
-
-        // transition is only when going to hover/focus, otherwise the background
-        // behind the gradient (there for IE<=9 fallback) gets mismatched
-        .transition(background-position .1s linear);
-    }
-
-    // Active state
-    &.active,
-    &:active {
-        background-image: none;
-        outline: 0;
-        .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
-    }
-
-    // Disabled state
-    &.disabled,
-    &[disabled],
-    &:disabled:hover {
-        cursor: default;
-        border-color: @btnBorder;
-        .opacity(80);
-        .box-shadow(none);
-    }
-
-}
-
-.btn-group>.btn+.dropdown-toggle {
-    box-shadow: none;
-    border-left-width: 1px;
-    border-left-style: solid;
-    border-color: rgba(0,0,0,0.09);
-}
-
-// Button Reset - remove the default browser styles from the button element
-// --------------------------------------------------
-
-.btn-reset {
-    padding: 0;
-    margin: 0;
-    border: none;
-    background: none;
-    color: currentColor;
-    font-family: @baseFontFamily;
-    font-size: @baseFontSize;
-    line-height: @baseLineHeight;
-    cursor: pointer;
-
-    // Disabled state
-    &.disabled,
-    &[disabled],
-    &:disabled:hover {
-        cursor: default;
-    }
-}
-    
-// Button Sizes
-// --------------------------------------------------
-
-// Large
-.btn-large {
-  padding: @paddingLarge;
-  font-size: @fontSizeLarge;
-}
-.btn-large [class^="icon-"],
-.btn-large [class*=" icon-"] {
-  margin-top: 4px;
-  .border-radius(@borderRadiusLarge);
-}
-
-// Small
-.btn-small {
-  padding: @paddingSmall;
-  font-size: @fontSizeSmall;
-  .border-radius(@borderRadiusSmall);
-}
-
-.btn-small [class^="icon-"],
-.btn-small [class*=" icon-"] {
-  margin-top: 0;
-}
-.btn-mini [class^="icon-"],
-.btn-mini [class*=" icon-"] {
-  margin-top: -1px;
-}
-
-// Mini
-.btn-mini {
-  padding: @paddingMini;
-  font-size: @fontSizeMini;
-  .border-radius(@borderRadiusSmall);
-}
-
-
-// Block button
-// -------------------------
-
-.btn-block {
-  display: block;
-  width: 100%;
-  padding-left: 0;
-  padding-right: 0;
-  .box-sizing(border-box);
-}
-
-// Vertically space out multiple block buttons
-.btn-block + .btn-block {
-  margin-top: 5px;
-}
-
-// Specificity overrides
-input[type="submit"],
-input[type="reset"],
-input[type="button"] {
-  &.btn-block {
-    width: 100%;
-  }
-}
-
-// Round button
-.btn-round{
-  font-size: 24px;
-  color: @gray-3;
-  background: @white;
-
-  line-height: 32px;
-  text-align: center;
-  border-radius: 15px;
-  height: 32px;
-  width: 32px;
-  overflow: hidden;
-  display: inline-block;
-  z-index: 6666;
-}
-
-
-// Alternate buttons
-// --------------------------------------------------
-
-// Provide *some* extra contrast for those who can get it
-.btn-primary.active,
-.btn-warning.active,
-.btn-danger.active,
-.btn-success.active,
-.btn-info.active,
-.btn-inverse.active,
-.btn-neutral.active {
-  color: rgba(255,255,255,.75);
-}
-
-.btn-primary, 
-.btn-warning,
-.btn-danger,
-.btn-success,
-.btn-info,
-.btn-inverse,
-.btn-neutral {
-  font-weight: bold;
-}
-
-// Set the backgrounds
-// -------------------------
-.btn-primary {
-  .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
-}
-
-// Warning appears are orange
-.btn-warning {
-  .buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight);
-}
-// Danger and error appear as red
-.btn-danger {
-  .buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight);
-}
-// Success appears as green
-.btn-success {
-  .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight, @btnSuccessType);
-}
-// Info appears as a sand color
-.btn-info {
-  .buttonBackground(@sand-5, @sand-6, @blueExtraDark, @blueMid);
-}
-// Made for Umbraco, 2019
-.btn-action {
-  .buttonBackground(@blueExtraDark, @blueDark, @white, @u-white);
-}
-// Made for Umbraco, 2019
-.btn-selection {
-    @btnSelectionBackgroundHover: darken(@pinkLight, 10%);
-  .buttonBackground(@pinkLight, @btnSelectionBackgroundHover, @blueExtraDark, @blueDark);
-}
-// Made for Umbraco, 2019, used for buttons that has to stand back.
-.btn-white {
-  .buttonBackground(@btnWhiteBackground, @btnWhiteBackgroundHighlight, @btnWhiteType, @btnWhiteTypeHover, @gray-10, @gray-7);
-}
-// Inverse appears as dark gray
-.btn-inverse {
-  .buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight);
-}
-// Neutral appears as lighter gray
-.btn-neutral {
-  .buttonBackground(@btnNeutralBackground, @btnNeutralBackgroundHighlight);
-  color: @gray-5;
-  // Hover/focus state
-  &:hover {
-    color: @gray-5;
-  }
-
-  &.disabled,
-  &[disabled] {
-    color: @gray-5;
-    .opacity(65);
-  }
-
-}
-
-.btn-install {
-    margin: 40px auto;
-    display: block;
-    padding: 15px 50px;
-    font-size: 16px;
-    border: none;
-    background: @ui-btn-positive;
-    color: @white;
-    font-weight: bold;
-    &:hover {
-        background: @ui-btn-positive-hover;
-    }
-}
-
-// outlined
-.btn-outline {
-  border: 1px solid;
-  border-color: @gray-7;
-  background: transparent;
-  color: @blueExtraDark;
-  padding: 5px 13px;
-  transition: border-color .12s linear, color .12s linear;
-  font-weight: 600;
-}
-
-.btn-outline:hover {
-  border-color: @ui-light-type-hover;
-  color: @ui-light-type-hover;
-  background: transparent;
-  transition: border-color .12s linear, color .12s linear;
-}
-
-// Cross-browser Jank
-// --------------------------------------------------
-
-button.btn,
-input[type="submit"].btn {
-
-  // Firefox 3.6 only I believe
-  &::-moz-focus-inner {
-    padding: 0;
-    border: 0;
-  }
-
-  // Safari defaults to 1px for input. Ref U4-7721.
-  margin: 0px;
-}
-
-
-// Link buttons
-// --------------------------------------------------
-
-// Make a button look and behave like a link
-.btn-link,
-.btn-link:active,
-.btn-link[disabled] {
-  background-color: transparent;
-  background-image: none;
-  .box-shadow(none);
-}
-.btn-link {
-  border-color: transparent;
-  cursor: pointer;
-  color: @linkColor;
-  .border-radius(0);
-}
-.btn-link:hover {
-  color: @linkColorHover;
-  text-decoration: underline;
-  background-color: transparent;
-}
-.btn-link[disabled]:hover {
-  color: @gray-4;
-  text-decoration: none;
-}
-
-// Make a reverse type of a button link
-.btn-link-reverse{
-    text-decoration:underline;
-  &:hover {
-    text-decoration:none;
-  }
-}
-
-.btn-link.-underline {
-    display: inline-block;
-    text-decoration: underline;
-
-    &:hover {
-        text-decoration: none;
-    }
-}
-
-// Placeholder buttons
-// ------------------------------
-
-.btn-placeholder {
-  background-color: transparent;
-  color: @ui-action-type;
-  font-weight: bold;
-  border: 1px dashed @gray-7;
-
-  &:hover {
-    color:@ui-action-type-hover;
-    text-decoration: none;
-    border-color: @ui-active-type-hover;
- }
-}
-
-// Icon buttons
-// ------------------------------
-
-// 31 July 19, Nathan Woulfe says: Reset styles for cases where button shows an icon only (eg edit/remove property on document type)
-// This is lifted from umb-group-builder.less
-
-.btn-icon {
-    border: none;      
-    font-size: 18px;
-    position: relative;
-    cursor: pointer;
-    color: @ui-icon;
-    margin: 0;
-    padding: 3px 5px;
-    width: auto;
-    overflow: visible;
-    background: transparent;
-    line-height: normal;
-    -webkit-appearance: none;
-
-    &:hover {
-        color: @ui-icon-hover;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
deleted file mode 100644
index 85d189d5a0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
+++ /dev/null
@@ -1,258 +0,0 @@
-
-@import "helveticons.less";
-@import "variables.less";
-@import "application/umb-outline.less";
-
-/******* font-face *******/
-
-@font-face {
-  src: url('assets/fonts/helveticons/helveticons.eot') !important;
-  src: url('assets/fonts/helveticons/helveticons.eot?#iefix') format('embedded-opentype'), url('assets/fonts/helveticons/helveticons.ttf') format('truetype'), url('assets/fonts/helveticons/helveticons.svg#icomoon') format('svg') !important;
-}
-
-/****************************/
-/* General style */
-/****************************/
-
-body {
-    position: absolute;
-    overflow: hidden;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    height: calc(~"100% - 40px");
-    width: 100%;
-    padding: 0;
-    margin: 0;
-    padding-bottom:40px;
-    background-color: @brownGrayExtraLight;
-}
-
-/****************************/
-/* General class */
-/****************************/
-
-.menu-bar {
-    position: absolute;
-    bottom:0;
-    left: 0;
-    right: 0;
-    background-color: @blueExtraDark;
-    color:@white;
-
-    font-family: "Lato", Helvetica, Arial, sans-serif;
-    font-size: 12px;
-    line-height: 16px;
-
-    animation: menu-bar-animation 1.2s;
-    animation-timing-function: cubic-bezier(0.23, 1, 0.32, 1);
-
-}
-
-@keyframes menu-bar-animation {
-    0% {
-        bottom: -50px;
-    }
-    40% {
-        bottom: -50px;
-    }
-    80% {
-        bottom: 0px;
-    }
-  }
-
-.menu-bar__right-part {
-    float: right;
-    display: flex;
-    flex: row;
-
-    > div, > button {
-        border-left: 1px solid rgba(255, 255, 255, .25);
-    }
-}
-
-.menu-bar__title {
-    display: inline-block;
-    padding: 11px 15px;
-    font-weight: bold;
-    font-size: 13px;
-}
-
-.menu-bar__button {
-    display: inline-block;
-    padding: 11px 15px;
-    height: 40px;
-    border:none;
-    background-color: @blueExtraDark;
-
-    text-align: left;
-    font: inherit;
-    color: inherit;
-    cursor: pointer;
-
-    transition: color 120ms linear, background-color 120ms linear;
-
-    .icon {
-        margin-right: 10px;
-        font-size: 18px;
-        vertical-align: middle;
-    }
-
-    span {
-        vertical-align: middle;
-    }
-
-    > svg {
-        display: inline-block;
-        width: 14px;
-        height: 14px;
-        fill: #fff;
-        margin-right: 10px;
-        vertical-align: middle;
-        transition: fill 120ms linear;
-    }
-
-    &:hover {
-        background-color: lighten(@blueExtraDark, 4%);
-    }
-    &.--active {
-        color: @pinkLight;
-        > svg {
-            fill: @pinkLight;
-        }
-    }
-}
-
-.preview-menu-option {
-
-    position: relative;
-    display: inline-block;
-
-    > .menu-bar__button {
-        position: relative;
-    }
-
-    .dropdown-menu {
-        display:none;
-
-        position: absolute;
-        right: 0;
-        bottom: 100%;
-        min-width: 200px;
-
-        border-radius: 3px 3px 0 3px;
-        overflow: hidden;
-
-        background-color: @blueExtraDark;
-
-        > button {
-            position: relative;
-            display: list-item;
-            text-align: left;
-            width: 100%;
-
-            &.--active {
-                &::before {
-                    content: '';
-                    position: absolute;
-                    left:0;
-                    width: 3px;
-                    top: 0;
-                    bottom: 0;
-                    border-top-right-radius: 3px;
-                    border-bottom-right-radius: 3px;
-                    background-color: @pinkLight;
-                }
-            }
-        }
-    }
-
-    &.--open {
-        z-index:1;
-        box-shadow: 0 5px 10px 0 rgba(0,0,0,.26);
-        > .menu-bar__button {
-            z-index: (@zindexDropdown + 1);
-        }
-        .dropdown-menu {
-            display:block;
-            z-index: @zindexDropdown;
-            box-shadow: 0 5px 10px 0 rgba(0,0,0,.26);
-        }
-    }
-
-}
-
-
-
-
-/*************************************************/
-/* IFrame size */
-/*************************************************/
-
-#demo-iframe-wrapper {
-    transition: all 240ms cubic-bezier(0.165, 0.84, 0.44, 1);
-    flex-shrink:0;
-}
-
-.fullsize {
-    width: 100%;
-    height: 100%;
-    margin: 0 auto;
-    overflow: hidden;
-}
-
-.desktop {
-    width: 1920px;
-    height: 1080px;
-}
-
-.laptop {
-    width: 1366px;
-    height: 768px;
-}
-
-.iPad-portrait {
-    width: 769px;
-    height: 929px;
-}
-
-.iPad-landscape {
-    width: 1024px;
-    height: 675px;
-}
-
-.smartphone-portrait {
-    width: 360px;
-    height: 640px;
-}
-
-.smartphone-landscape {
-    width: 640px;
-    height: 360px;
-}
-
-.shadow {
-    margin: 10px auto;
-    background-color: @white;
-    border-radius: 3px;
-    overflow: hidden;
-    opacity: 1.0;
-    box-shadow: 0 5px 20px 0 rgba(0,0,0,.26);
-}
-
-iframe {
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    overflow-x: hidden;
-    overflow-y: hidden;
-}
-
-.flip:before {
-    transform: rotate(90deg);
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/colors.less b/src/Umbraco.Web.UI.Client/src/less/colors.less
deleted file mode 100644
index ba4909c997..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/colors.less
+++ /dev/null
@@ -1,81 +0,0 @@
-.red{color: @red;}
-.blue{color: @blue;}
-.black{color: @black;}
-.turquoise{color: @turquoise;}
-.turquoise-d1{color: @turquoise-d1;}
-
-.text-warning {
-    color: @orange;
-}
-.text-error {
-    color: @red;
-}
-.text-success {
-    color: @green;
-}
-
-
-//icon colors for tree icons
-.color-red, .color-red i{color: @red-d1 !important;}
-.color-blue, .color-blue i{color: @turquoise-d1 !important;}
-.color-orange, .color-orange i{color: @orange !important;}
-.color-green, .color-green i{color: @green-d1 !important;}
-.color-yellow, .color-yellow i{color: @yellowIcon !important;}
-
-/* Colors based on https://zavoloklom.github.io/material-design-color-palette/colors.html */
-.btn-color-black {background-color: @black;}
-.color-black, .color-black i { color: @black !important;}
-
-.btn-color-blue-grey {background-color: @blueGrey;}
-.color-blue-grey, .color-blue-grey i { color: @blueGrey !important;}
-
-.btn-color-grey{background-color: @grayIcon;}
-.color-grey, .color-grey i { color: @grayIcon !important; }
-
-.btn-color-brown{background-color: @brownIcon;}
-.color-brown, .color-brown i { color: @brownIcon !important; }
-
-.btn-color-blue{background-color: @blueIcon;}
-.color-blue, .color-blue i { color: @blueIcon !important; }
-
-.btn-color-light-blue{background-color: @lightBlueIcon;}
-.color-light-blue, .color-light-blue i {color: @lightBlueIcon !important;}
-
-.btn-color-cyan{background-color: @cyanIcon;}
-.color-cyan, .color-cyan i { color: @cyanIcon !important; }
-
-.btn-color-green{background-color: @greenIcon;}
-.color-green, .color-green i { color: @greenIcon !important; }
-
-.btn-color-light-green{background-color: @lightGreenIcon;}
-.color-light-green, .color-light-green i {color: @lightGreenIcon !important; }
-
-.btn-color-lime{background-color: @limeIcon;}
-.color-lime, .color-lime i { color: @limeIcon !important; }
-
-.btn-color-yellow{background-color: @yellowIcon;}
-.color-yellow, .color-yellow i { color: @yellowIcon !important; }
-
-.btn-color-amber{background-color: @amberIcon;}
-.color-amber, .color-amber i { color: @amberIcon !important; }
-
-.btn-color-orange{background-color: @orangeIcon;}
-.color-orange, .color-orange i { color: @orangeIcon !important; }
-
-.btn-color-deep-orange{background-color: @deepOrangeIcon;}
-.color-deep-orange, .color-deep-orange i { color: @deepOrangeIcon !important; }
-
-.btn-color-red{background-color: @redIcon;}
-.color-red, .color-red i { color: @redIcon !important; }
-
-.btn-color-pink{background-color: @pinkIcon;}
-.color-pink, .color-pink i { color: @pinkIcon !important; }
-
-.btn-color-purple{background-color: @purpleIcon;}
-.color-purple, .color-purple i { color: @purpleIcon !important; }
-
-.btn-color-deep-purple{background-color: @deepPurpleIcon;}
-.color-deep-purple, .color-deep-purple i { color: @deepPurpleIcon !important; }
-
-.btn-color-indigo{background-color: @indigoIcon;}
-.color-indigo, .color-indigo i { color: @indigoIcon !important; }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-content.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-content.less
deleted file mode 100644
index b3e0015d9a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-content.less
+++ /dev/null
@@ -1,7 +0,0 @@
-.umb-app-content {
-    position: absolute;
-    top: @appHeaderHeight;
-    right: 0;
-    bottom: 0;
-    left: 0;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
deleted file mode 100644
index bc02705187..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
+++ /dev/null
@@ -1,136 +0,0 @@
-.umb-app-header {
-    background: @blueExtraDark;
-    display: flex;
-    align-items: center;
-    max-width: 100%;
-    height: @appHeaderHeight;
-    padding: 0 20px;
-
-    &__logo {
-      margin-right: 30px;
-      flex-shrink: 0;
-    }
-}
-
-@media (max-width: 1279px) {
-    .umb-app-header__logo {
-        display: none;
-    }
-}
-
-.umb-app-header__logo-modal {
-    position: absolute;
-    z-index: @zindexUmbOverlay;
-    top: 50px;
-    left: 17px;
-    font-size: 13px;
-    border-radius: 6px;
-    width: 160px;
-    padding: 20px 20px;
-    background-color:@white;
-    color: @blueExtraDark;
-    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, .14), 0 1px 6px 1px rgba(0, 0, 0, .14);
-    text-decoration: none;
-    text-align: center;
-
-    &::before {
-        content:'';
-        position: absolute;
-        transform: rotate(45deg);
-        background-color:@white;
-        top: -4px;
-        left: 14px;
-        width: 8px;
-        height: 8px;
-    }
-
-    img {
-        display: block;
-        height: auto;
-        margin-left: auto;
-        margin-right: auto;
-        margin-bottom: 3px;
-    }
-}
-
-.umb-app-header__right {
-    display: flex;
-    align-items: center;
-    margin-left: auto;
-}
-
-.umb-app-header__actions {
-    display: flex;
-    list-style: none;
-    align-items: center;
-    margin: 0;
-    margin-right: -10px;
-}
-
-.umb-app-header__button {
-    padding-left: 10px;
-    padding-right: 10px;
-    text-decoration: none;
-    display: flex;
-    align-items: center;
-    height: @appHeaderHeight;
-    outline: none;
-
-    .umb-icon {
-      display: block;
-    }
-    
-    &:focus {
-        .tabbing-active & {
-            .umb-app-header__action-icon::after {
-                content: '';
-                position: absolute;
-                z-index:10000;
-                top: 50%;
-                left: 50%;
-                width: 36px;
-                height: 35px;
-                transform: translate(-50%, -50%);
-                border-radius: 3px;
-                box-shadow: 0 0 2px @pinkLight, inset 0 0 2px 1px @pinkLight;
-            }
-        }
-    }
-}
-
-.umb-app-header__action-icon {
-    position: relative;
-    opacity: 0.8;
-    color: @white;
-    font-size: 22px;
-    flex-shrink: 0;
-}
-
-.umb-app-header__button:hover .umb-app-header__action-icon,
-.umb-app-header__button:focus .umb-app-header__action-icon {
-    opacity: 1;
-}
-
-.umb-app-header__skip-button {
-    position: absolute;
-    top: 7.5px;
-    left: 5px;
-    background-color: #FFF;
-    border: 1px solid #000;
-    display: block;
-    height: 1px;
-    width: 1px;
-    overflow: hidden;
-    clip: rect(1px,1px,1px,1px);
-    border-radius: 3px;
-    z-index: 1;
-}
-
-.umb-app-header__skip-button:focus {
-    height: auto;
-    width: auto;
-    clip: auto;
-    padding: 10px;
-    line-height: normal;
-    text-decoration: none;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-backdrop.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-backdrop.less
deleted file mode 100644
index 18e331756e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-backdrop.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.umb-backdrop {
-    height: 100%;
-    width: 100%;
-    position: fixed;
-    z-index: @zindexUmbOverlay;
-    top: 0;
-    left: 0;
-    pointer-events: none;
-}
-
-.umb-backdrop__backdrop {
-    height: 100%;
-    width: 100%;
-}
-
-.umb-backdrop__rect {
-    position: absolute;
-    pointer-events: all;
-    margin: 0;
-    width: 100%;
-    height: 100%;
-    background: @black;
-    opacity: 0.4;
-    transition: 200ms opacity ease-in-out;
-}
-
-.umb-backdrop__highlight-prevent-click {
-    position: absolute;
-    pointer-events: all;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
deleted file mode 100644
index 1bc54c13a0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-dashboard.less
+++ /dev/null
@@ -1,37 +0,0 @@
-.umb-dashboard {
-    position: absolute;
-    height: 100%;
-    width: 100%;
-    top: 0;
-    display: flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
-}
-
-.umb-dashboard__header {
-    flex: 0 0 @editorHeaderHeight;
-    background: @white;
-    border-bottom: 1px solid @gray-9;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: flex-end;
-    flex-direction: column;
-}
-
-.umb-dashboard__content {
-    flex: 1;
-    padding: 20px;
-    overflow: auto;
-}
-
-// we need to do some special styling for tabs inside the dashboard header
-.umb-dashboard__header .umb-tabs-nav {
-    margin-bottom: 0;
-    margin-left: 10px;
-    margin-right: 10px;
-    border: none;
-}
-
-.umb-dashboard__header .umb-tabs-nav .umb-tab > .umb-tab-button {
-    padding-bottom: 25px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
deleted file mode 100644
index 7660e930a5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
+++ /dev/null
@@ -1,239 +0,0 @@
-.umb-drawer {
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    left: auto;
-    right: 0;
-    z-index: 10;
-    width: @drawerWidth;
-    background: @brownGrayLight;
-    box-shadow: inset 5px 0 20px rgba(0,0,0,.3);
-}
-
-.umb-drawer-view {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    overflow: hidden;
-}
-
-/* Header */
-
-.umb-drawer-header {
-    flex: 0 0 100px;
-    padding: 20px 30px;
-    box-sizing: border-box;
-}
-
-.umb-drawer-header__title {
-    font-size: @fontSizeLarge;
-    font-weight: bold;
-    margin-top: 7px;
-    margin-bottom: 7px;
-}
-
-.umb-drawer-header__subtitle {
-    font-size: @fontSizeSmall;
-}
-
-/* Content */
-
-.umb-drawer-content {
-    flex: 1 1 auto;
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding: 0 30px 20px 30px;
-}
-
-/* Footer */
-.umb-drawer-footer {
-    flex-grow: 0;
-    flex-shrink: 0;
-    flex-basis: 31px;
-    padding: 15px 30px;
-}
-
-/* Our badge - should be moved */
-
-.umb-help-badge {
-    padding: 10px 20px 10px 55px;
-    background: @white;
-    position: relative;
-    overflow: hidden;
-    border-radius: 3px;
-    display: block;
-    margin-bottom:5px;
-    box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
-}
-
-.umb-help-badge:hover,
-.umb-help-badge:active,
-.umb-help-badge:focus {
-    text-decoration: none;
-
-    .umb-help-badge__title  {
-        text-decoration: underline !important;
-    }
-}
-
-.umb-help-badge__icon {
-    font-size: 36px;
-    transform: translate(0,-50%);
-    position: absolute;
-    left: 10px;
-    top: 50%;
-    color: @red-l3;
-}
-
-.umb-help-badge__title {
-    display: block;
-    font-size: 15px;
-    font-weight: bold;
-    color: @black;
-}
-
-/* Help article */
-
-.umb-help-article {
-    background: @white;
-    padding: 20px;
-    line-height: 1.4em;
-}
-
-/* Make sure typography looks good */
-.umb-help-article h1,
-.umb-help-article h2,
-.umb-help-article h3,
-.umb-help-article h4 {
-    line-height: 1.3em;
-    font-weight: bold;
-}
-
-.umb-help-article h1 { font-size: 20px; }
-.umb-help-article h2 { font-size: 16px; margin-top: 20px; }
-.umb-help-article h3 { font-size: 15px; }
-.umb-help-article h4 { font-size: 14px; }
-
-.umb-help-article ol li,
-.umb-help-article ul li {
-    line-height: 1.4em;
-    margin-bottom: 8px;
-}
-
-.umb-help-article code {
-    white-space: pre-wrap;
-    word-break: break-word;
-}
-
-.umb-help-article-navigation {
-    margin-top: 25px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
-/* the outer container for each help type - tours, video etc */
-.umb-help-section + .umb-help-section {
-    margin-top:20px;
-}
-
-.umb-help-section__title {
-    margin:0 0 10px;
-}
-
-/* Help list */
-
-.umb-help-list {
-    list-style: none;
-    margin-left: 0;
-    margin-bottom: 0;
-    background: @white;
-    border-radius: 3px;
-    box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
-
-    [data-element*="help-tours"] & {
-        margin-bottom:5px;
-    }
-}
-
-.umb-help-list-item {
-    margin-bottom: 1px;
-    border-radius: 0;
-    border-bottom: 1px solid @gray-9;
-    padding: 10px;
-    background: transparent;
-    width:100%;
-    border: 0 none;
-}
-
-
-.umb-help-list-item:last-child {
-    border-bottom: none;
-}
-.umb-help-list-item__title-wrapper {
-  display:flex;
-  justify-content: space-between;
-  align-items: center;
-
-  .umb-help-list-item {
-    flex: 1 0 auto;
-    width: auto;
-  }
-}
-
-.umb-help-list-item__group-title i {
-    margin-right:2px;
-    text-decoration: none;
-}
-
-.umb-help-list-item__content {
-    display: flex;
-    align-items: center;
-    padding: 10px 20px 10px 10px;
-    text-decoration: none;
-}
-
-.umb-help-list-item:hover,
-.umb-help-list-item:focus,
-.umb-help-list-item:active,
-.umb-help-list-item > a:hover,
-.umb-help-list-item > a:focus,
-.umb-help-list-item > a:active {
-    text-decoration: none;
-
-    .umb-help-list-item__title {
-        text-decoration: underline;
-    }
-}
-
-.umb-help-list-item__title {
-    font-size: 14px;
-    display: block;
-}
-
-.umb-help-list-item__description {
-    margin-top: 5px;
-    display: block;
-    font-size: 14px;
-}
-
-.umb-help-list-item__icon {
-    margin-right: 8px;
-    color: @gray-4;
-    font-size: 18px;
-    float: left;
-}
-
-.umb-help-list-item__open-icon {
-    font-size: 14px;
-    color: @gray-6;
-    margin-left: auto;
-}
-
-.umb-help-list-item:hover .umb-help-list-item__group-title {
-    text-decoration: underline;
-}
-
-[data-element*="tour-"].umb-help-list-item:hover .umb-help-list-item__title {
-    text-decoration:none;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
deleted file mode 100644
index 34a339b4c9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
+++ /dev/null
@@ -1,71 +0,0 @@
-.umb-language-picker {
-    position: relative;
-    z-index: @zindexDropdown;
-    // When the language dropdown is present adjust height on the tree root
-    ~ #tree .umb-tree-root-link {
-        height: 50px;
-    }
-}
-
-.umb-language-picker__toggle {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 0 20px;
-    background: transparent;
-    border: 0 none;
-    border-bottom: 1px solid @gray-9;
-    height: @editorHeaderHeight;
-    box-sizing: border-box;
-    color: @ui-option-type;
-    width: 100%;
-    outline-offset: -3px;
-}
-
-.umb-language-picker__expand {
-    font-size: 14px;
-    pointer-events: none;
-}
-
-.umb-language-picker__toggle:hover {
-    background: @ui-option-hover;
-    color:@ui-option-type-hover;
-    .umb-language-picker__expand {
-        color: @ui-option-type-hover;
-    }
-}
-
-
-.umb-language-picker__dropdown {
-    width: 100%;
-    background: @white;
-    box-shadow: 0 3px 6px rgba(0,0,0,.16);
-    box-sizing: border-box;
-    position: absolute;
-    border-radius: 0 0 3px 3px;
-    max-height: 200px;
-    overflow: auto;
-}
-
-.umb-language-picker__dropdown-item {
-    background: transparent;
-    border: 0 none;
-    padding: 8px 20px;
-    display: block;
-    font-size: 14px;
-    width: 100%;
-    text-align: left;
-    outline-offset: -3px;
-}
-
-.umb-language-picker__dropdown-item:hover {
-    background: @ui-option-hover;
-    text-decoration: none;
-    color:@ui-option-type-hover;
-}
-
-.umb-language-picker__dropdown .umb-language-picker__dropdown-item.umb-language-picker__dropdown-item--current {
-    padding-left: 16px;
-    border-left: 4px solid @ui-light-active-border;
-    color:@ui-light-active-type;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-search.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-search.less
deleted file mode 100644
index f0423e5d2e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-search.less
+++ /dev/null
@@ -1,114 +0,0 @@
-
-/*
-    Search wrapper
-*/
-.umb-search {
-    position: fixed;
-    z-index: @zindexSearchBox;
-    width: 660px;
-    max-width: 90%;
-    transform: translate(-50%, 0);
-    left: 50%;
-    top: 20%;
-    border-radius: @baseBorderRadius;
-    background: @white;
-    position: fixed;
-    box-shadow: 0 10px 20px rgba(0,0,0,.12),0 6px 6px rgba(0,0,0,.14);
-}
-
-.umb-search__label {
-    margin: 0;
-}
-
-/*
-    Search field
-*/
-
-.umb-search-input-icon {
-    font-size: 22px;
-    color: @gray-7;
-    padding-left: 20px;
-    display: flex;
-    align-items: center;
-    height: 70px;
-}
-
-input.umb-search-input {
-    width: 100%;
-    height: 70px;
-    border: none;
-    padding: 20px 20px 20px 15px;
-    border-radius: @baseBorderRadius;
-    font-size: 22px;
-    margin-bottom: 0;
-}
-
-.umb-search-input-clear {
-    background: none;
-    border: none;
-    font-size: 12px;
-    margin-right: 20px;
-    color: @gray-3;
-}
-
-.umb-search-input-clear.ng-enter {
-    opacity: 0;
-    transition: opacity 100ms ease-in-out;
-}
-
-.umb-search-input-clear.ng-enter.ng-enter-active {
-    opacity: 1;
-}
-
-/*
-    Search results
-*/
-.umb-search-results {
-    max-height: 50vh;
-    overflow-y: auto;
-}
-
-.umb-search-group__title {
-    background: @gray-10;
-    padding: 3px 20px;
-}
-
-.umb-search-items {
-    list-style: none;
-    margin: 0;
-    padding-top: 4px;
-    padding-bottom: 4px;
-}
-
-.umb-search-item > a {
-    padding: 6px 20px;
-    display: flex;
-}
-
-.umb-search-item > a:hover,
-.umb-search-item > a:focus {
-    background-color: @gray-10;
-    text-decoration: none;
-    outline: none;
-}
-
-.umb-search-item > a:focus {
-    padding-left: 25px;
-    transition: padding 60ms ease-in-out;
-}
-
-.umb-search-result__icon {
-    font-size: 18px;
-    margin-right: 8px;
-    color: @gray-1;
-}
-
-.umb-search-result__meta {
-    display: flex;
-    flex-direction: column;
-}
-
-.umb-search-result__description {
-    color: @gray-5;
-    font-size: 13px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-tour.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-tour.less
deleted file mode 100644
index ba61975479..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-tour.less
+++ /dev/null
@@ -1,135 +0,0 @@
-.umb-loader-wrapper.umb-tour__loader {
-    margin: 0;
-    position: fixed;
-    z-index: @zindexTourModal;
-
-    .umb-loader {
-        background-color: @white;
-        height: 5px;
-    }
-}
-
-.umb-tour__pulse {
-    position: fixed;
-    z-index: @zindexTourModal;
-    display: none;
-    background: transparent;
-    box-shadow: 0 0 0 @green inset;
-    animation: pulse 2s infinite;
-    pointer-events: none;
-}
-  
-@keyframes pulse {
-    0% {
-        box-shadow: 0 0 0 0 @green inset;
-    }
-    70% {
-        box-shadow: 0 0 0 5px fade(@green, 80%) inset;
-    }
-    100% {
-        box-shadow: 0 0 0 0 @green inset;
-    }
-}
-
-.umb-tour__popover {
-    position: fixed;
-    background: @white;
-    border-radius: @baseBorderRadius;
-    z-index: @zindexTourModal;
-    width: 320px;
-    max-width: 100%;
-    box-sizing: border-box;
-    padding: 15px;
-
-    h1, h2, h3, h4, h5 {
-        font-weight: bold;
-        color: @black;
-    }
-}
-
-.umb-tour__popover--l {
-    padding: 30px;
-    width: 500px;
-
-    .umb-tour-step__header {
-        margin-bottom: 30px;
-        margin-top: 10px;
-    }
-
-    .umb-tour-step__title {
-        font-size: 20px;
-    }
-
-    .umb-tour-step__content {
-        margin-bottom: 25px;
-        font-size: 15px;
-    }
-}
-
-.umb-tour-step__counter {
-    font-size: 13px;
-    color: @gray-5;
-}
-
-.umb-tour-step__close {
-    position: absolute;
-    top: 15px;
-    right: 15px;
-    font-size: 19px;
-    color: @gray-7;
-    cursor: pointer;
-    background: transparent;
-    padding: 0;
-    border: none;
-}
-
-.umb-tour-step__close:hover,
-.umb-tour-step__close:active {
-    color: @gray-4;
-    text-decoration: none;
-}
-
-.umb-tour-step__header {
-    margin-bottom: 10px;
-    margin-top: 10px;
-}
-
-.umb-tour-step__title {
-    font-weight: bold;
-    color: @black;
-    font-size: 15px;
-    line-height: 1.3em;
-    width: calc(~"100% - 35px");
-}
-
-.umb-tour-step__content {
-    margin-bottom: 15px;
-    font-size: 14px;
-    line-height: 1.6em;
-}
-
-// we need to make sure the tour is on top of everything else
-.umb-tour-is-visible .umb-backdrop {
-    z-index: @zindexTourBackdrop;
-}
-
-.umb-tour__popover .underline{
-    font-size: 13px;
-    background: transparent;
-    border: none;
-    padding: 0;
-}
-
-.umb-tour__popover--promotion {
-    width: 800px;
-    min-height: 400px;
-    padding: 40px;
-    border-radius: (@baseBorderRadius * 2);
-    .umb-tour-step__close {
-        top: 40px;
-        right: 40px;
-    }
-    a {
-        text-decoration: underline;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-ellipsis.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-ellipsis.less
deleted file mode 100644
index b6acb2f6cf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-ellipsis.less
+++ /dev/null
@@ -1,81 +0,0 @@
-.umb-button-ellipsis {
-    padding: 0 5px;
-    text-align: center;
-    margin: 0 auto;
-    cursor: pointer;
-    border-radius: @baseBorderRadius;
-    color: @ui-action-discreet-type;
-    position: relative;
-    opacity: 0.8;
-    transition: opacity 120ms, color 120ms;
-
-    &--absolute {
-        position: absolute;
-    }
-
-    &--small {
-        height: 15px;
-    }
-
-    &.show-text {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: center;
-    }
-
-    &:hover {
-        color: @ui-action-discreet-type-hover;
-    }
-
-    .umb-button-ellipsis--tab,
-    .umb-tour-is-visible .umb-tree .umb-tree-item.above-backdrop &,
-    &:hover,
-    &:focus {
-        opacity: 1;
-    }
-
-    &--hidden {
-        opacity: 0;
-
-        &:hover,
-        &:focus {
-            opacity: 1;
-        }
-    }
-
-    &__content {
-        display: flex;
-        flex-wrap: wrap;
-    }
-
-    &__icon {
-        color: inherit;
-        flex-basis: 100%;
-        font-size: 12px;
-
-        .umb-button-ellipsis--tab & {
-            margin: 0 0 7px;
-        }
-
-        .umb-button-ellipsis--small & {
-            font-size: 8px;
-            position: relative;
-            top: -2px;
-        }
-    }
-
-    &__text {
-        color: inherit;
-        font-size: 12px;
-        line-height: 1em;
-        flex-basis: 100%;
-
-        .umb-button-ellipsis--tab & {
-            position: absolute;
-            right: 0;
-            left: 0;
-            bottom: 13px;
-            margin: 0 auto;
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less
deleted file mode 100644
index 24800c1142..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less
+++ /dev/null
@@ -1,33 +0,0 @@
-.umb-button-group__toggle {
-   padding-left: 8px;
-   padding-right: 8px;
-   float: none;
-}
-
-.umb-button-group__sub-buttons.-align-right {
-   right: 0;
-   left: auto;
-}
-
-.umb-button-group__sub-buttons>li>button,
-.umb-button-group__sub-buttons>li>a {
-    display: flex;
-}
-
-.umb-button-group.-with-button-group-toggle {
-
-    .umb-button__button {
-        border-radius: @baseBorderRadius 0 0 @baseBorderRadius;
-
-        &:hover {
-            z-index: 2;
-        }
-    }
-
-    .umb-button-group__toggle {
-        border-radius: 0 @baseBorderRadius @baseBorderRadius 0;
-        margin-left: -1px;
-        padding-left: 10px;
-        padding-right: 10px;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
deleted file mode 100644
index 88e172db0c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
+++ /dev/null
@@ -1,152 +0,0 @@
-.umb-button {
-   position: relative;
-   display: inline-block;
-   margin-left: 5px;
-}
-
-.umb-button__button {
-    position: relative;
-}
-
-.umb-button__content {
-   opacity: 1;
-   transition: opacity 0.25s ease;
-   display: flex;
-   flex-wrap: wrap;
-   align-items: center;
-   justify-content: center;
-}
-
-.umb-button__icon {
-    margin-right: 5px;
-    line-height: 1em;
-}
-
-.umb-button__content.-hidden {
-   opacity: 0;
-}
-
-.umb-button .umb-button__caret {
-   margin-top: 0;
-   margin-left: 5px;
-}
-
-.umb-button__button[disabled] .umb-button__caret {
-    border-top-color: @gray-7;
-    border-bottom-color: @gray-7;
-}
-
-.umb-button__progress {
-   position: absolute;
-   left: 50%;
-   top: 50%;
-   width: 14px;
-   height: 14px;
-   margin-left: -9px;
-   margin-top: -9px;
-   z-index: 100;
-   border-radius: 40px;
-   border: 2px solid @btnBorder;
-   border-left-color: @green;
-   opacity: 1;
-   animation: rotating 0.4s linear infinite;
-   transition: opacity 0.25s ease;
-}
-
-.umb-button__progress.-hidden {
-   opacity: 0;
-   z-index: 0;
-}
-
-.umb-button__progress.-white {
-   border-color: rgba(255, 255, 255, 0.4);
-   border-left-color: @white;
-}
-
-.umb-button__progress.-black {
-   border-color: rgba(255, 255, 255, 0.4);
-   border-left-color: @black;
-}
-
-.umb-button__success,
-.umb-button__error {
-   position: absolute;
-   top: 50%;
-   left: 50%;
-   z-index: 10;
-   transform: translate(-50%, -50%);
-   opacity: 1;
-   font-size: 20px;
-   transition: opacity 0.25s ease;
-}
-
-.umb-button__success.-hidden,
-.umb-button__error.-hidden {
-   opacity: 0;
-   z-index: 0;
-}
-
-.umb-button__success.-white,
-.umb-button__error.-white {
-   color: @white;
-}
-
-.umb-button__success.-black,
-.umb-button__error.-black {
-   color: @black;
-}
-
-.umb-button__overlay {
-   position: absolute;
-   width: 100%;
-   height: 100%;
-   z-index: 10;
-   background: @white;
-   opacity: 0;
-}
-
-@keyframes rotating {
-   from {
-      transform: rotate(0deg);
-   }
-   to {
-      transform: rotate(360deg);
-   }
-}
-
-/* Sizes */
-.umb-button--xxs {
-    padding: 2px 10px;
-    font-size: 13px;
-}
-
-.umb-button--xs {
-    padding: 5px 13px;
-    font-size: 14px;
-}
-
-.umb-button--s {
-    padding: 6px 16px;
-    font-size: 15px;
-}
-
-.umb-button--m {
-    padding: 10px 24px;
-    font-size: 15px;
-}
-
-.umb-button--l {
-    padding: 14px 40px;
-    font-size: 16px;
-}
-
-.umb-button--xl {
-    padding: 18px 52px;
-    font-size: 16px;
-}
-
-/* types */
-.umb-button--block {
-    display: block;
-    width: 100%;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle-group.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle-group.less
deleted file mode 100644
index 83dcc258a4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle-group.less
+++ /dev/null
@@ -1,41 +0,0 @@
-.umb-toggle-group {
-    .umb-toggle-group-item {
-        display: flex;
-        border-bottom: 1px solid @gray-9;
-        padding: 7px 0;
-    }
-
-    .umb-toggle-group-item:last-of-type {
-        border-bottom: none;
-    }
-
-    .umb-toggle-group-item__toggle {
-        padding-right: 20px;
-        cursor: pointer;
-    }
-
-    .umb-toggle-group-item__content {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        flex: 1 1 auto;
-        cursor: pointer;
-
-        label {
-          padding: unset;
-          margin: unset;
-          pointer-events: none;
-        }
-    }
-
-    .umb-toggle-group-item--disabled .umb-toggle-group-item__toggle,
-    .umb-toggle-group-item--disabled .umb-toggle-group-item__content {
-        cursor: not-allowed;
-        opacity: 0.8;
-    }
-
-    .umb-toggle-group-item__description {
-        font-size: 13px;
-        color: @gray-4;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
deleted file mode 100644
index 48398445ba..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
+++ /dev/null
@@ -1,156 +0,0 @@
-.umb-toggle {
-    display: flex;
-    align-items: center;
-    background: none;
-    border: none;
-    padding: 0;
-
-    &:focus {
-        outline: 0;
-    }
-}
-
-.umb-toggle__toggle {
-    cursor: pointer;
-    align-items: center;
-    display: flex;
-    width: 38px;
-    height: 18px;
-    border-radius: 10px;
-    border: 1px solid @inputBorder;
-    background-color: @inputBorder;
-    position: relative;
-    transition: background-color 120ms;
-
-    .umb-toggle:hover &,
-    .umb-toggle:focus & {
-        border-color: @inputBorderFocus;
-    }
-
-    .umb-toggle.umb-toggle--checked & {
-        border-color: @ui-btn;
-        background-color: @ui-btn;
-
-        &:hover {
-            background-color: @ui-btn-hover;
-        }
-    }
-
-    .tabbing-active .umb-toggle:focus & {
-        box-shadow: 0 0 0 2px highlight;
-    }
-}
-
-.umb-toggle__handler {
-    position: absolute;
-    top: 1px;
-    left: 1px;
-    display: block;
-    width: 16px;
-    height: 16px;
-    background-color: @white;
-    border-radius: 8px;
-    transition: transform 120ms ease-in-out, background-color 120ms;
-
-    .umb-toggle.umb-toggle--checked & {
-        transform: translateX(20px);
-        background-color: @white;
-    }
-}
-
-/* Icons */
-
-.umb-toggle__icon {
-    position: absolute;
-    font-size: 12px;
-    line-height: 1em;
-    text-decoration: none;
-    transition: all 0.2s ease;
-}
-
-.umb-toggle__icon--left {
-    left: 5px;
-    color:@white;
-    transition: opacity 120ms;
-    opacity: 0;
-
-    .umb-toggle--checked & {
-        opacity: 1;
-    }
-    .umb-toggle.umb-toggle--checked:hover & {
-        color:@white;
-    }
-}
-
-.umb-toggle__icon--right {
-    right: 5px;
-    color: @ui-btn;
-    transition: opacity 120ms;
-
-    .umb-toggle--checked & {
-        opacity: 0;
-    }
-    .umb-toggle:hover & {
-        color: @ui-btn-hover;
-    }
-}
-
-.umb-toggle.umb-toggle--disabled {
-    .umb-toggle__toggle {
-        cursor: not-allowed;
-    }
-
-    &, &.umb-toggle--checked {
-
-        .umb-toggle__toggle {
-            .umb-toggle__handler {
-                background-color: @gray-10;
-            }
-        }
-    }
-
-    &:not(.umb-toggle--checked) {
-        .umb-toggle__toggle {
-            background-color: @gray-8;
-            border-color: @gray-8;
-        }
-
-        .umb-toggle__icon--left,
-        .umb-toggle__icon--right {
-            color: @gray-6;
-        }
-    }
-
-    &.umb-toggle--checked {
-        .umb-toggle__toggle {
-            background-color: lighten(@ui-btn, 50%);
-            border-color: lighten(@ui-btn, 50%);
-        }
-        .umb-toggle__icon--left,
-        .umb-toggle__icon--right {
-            color: @gray-9;
-        }
-    }
-}
-
-
-/* Labels */
-
-.umb-toggle__label {
-    color: @gray-2;
-}
-
-.umb-toggle__label--left {
-    margin-right: 8px;
-}
-
-.umb-toggle__label--right {
-    margin-left: 8px;
-}
-
-/* Readonly */
-.umb-toggle[readonly] {
-    .umb-toggle__toggle {
-        cursor: not-allowed;
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/card.less b/src/Umbraco.Web.UI.Client/src/less/components/card.less
deleted file mode 100644
index 3e24abdaa9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/card.less
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
-	Library of card related compoents, like the right-hand icon list on the grid "cards"
-*/
-
-.umb-card {
-	position: relative;
-	padding: 5px 10px 5px 10px;
-    background: @white;
-    width: 100%;
-
-    .title {
-        padding: 12px;
-        color: @gray-3;
-        border-bottom: 1px solid @gray-8;
-        font-weight: 400;
-        font-size: 16px;
-        text-transform: none;
-        margin: 0 -10px 10px -10px;
-    }
-
-}
-
-.umb-card-thumb {
-    text-align: center;
-
-    i {
-        text-align: center;
-        font-size: 20px;
-        line-height: 40px;
-        color: @blue;
-        display: block;
-        padding-top: 5px
-    }
-}
-
-.umb-card-content {
-    .item-title {
-        color: @blackLight;
-        font-weight: 400;
-        border: none;
-        font-size: 16px;
-        text-transform: none;
-        margin-bottom: 3px;
-    }
-    p {
-        color: @gray-3;
-        margin-bottom: 1px;
-    }
-}
-
-.umb-card-actions {
-    padding-top: 10px;
-    border-top: @gray-10 1px solid;
-    clear: both;
-}
-
-.umb-card-icons {
-	text-align: center;
-	vertical-align: middle;
-	display: block;
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-
-.umb-card-icons.vertical {
-	position: absolute;
-	top: 7px;
-	right: 7px;
-	text-align: right;
-	width: 1px;
-}
-
-.umb-card-icons li {
-	display: inline-block;
-	margin: 0 2px 0 2px;
-}
-
-.umb-card-icons.vertical li {
-	float: right;
-	display: block;
-	margin-bottom: 3px;
-}
-
-//card iocn list
-.umb-card-list {
-     display: block;
-     padding: 0;
-     margin: 0;
- }
-
-.umb-card-list li {
-    border-bottom: @gray-10 1px solid;
-    padding-bottom: 3px;
-    display: block;
-}
-
-
-//Card icon grid for picking items off a card
-.umb-card-grid {
-	padding: 0;
-	margin: 0 auto;
-	list-style: none;
-    width: 100%;
-	display: flex;
-	flex-flow: row wrap;
-	justify-content: flex-start;
-}
-
-.umb-card-grid li {
-	font-size: 12px;
-	text-align: center;
-	box-sizing: border-box;
-	position: relative;
-    width: 100px;
-    margin-bottom: 5px;
-}
-
-.umb-card-grid.-six-in-row li {
-    flex: 0 0 25%;
-    max-width: 117px;
-}
-
-.umb-card-grid.-four-in-row li {
-    flex: 0 0 25%;
-    max-width: 25%;
-}
-
-.umb-card-grid.-three-in-row li {
-    flex: 0 0 33.333%;
-    max-width: 33.333%;
-
-    span > i, // legacy icon
-    .umb-icon {
-        font-size: 36px;
-        line-height: 1;
-    }
-}
-
-.umb-card-grid {
-    .umb-card-grid-item {
-        position: relative;
-        display: block;
-        width: 100%;
-        height: 100%;
-        padding: 10px 5px;
-        border-radius: (@baseBorderRadius * 2);
-        transition: background-color 120ms;
-        font-size: 13px;
-        line-height: 1.3em;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: flex-start;
-
-        &__loading {
-            position: absolute;
-            background-color: rgba(255,255,255,0.8);
-            top: 0;
-            right: 0;
-            bottom: 0;
-            left: 0;
-        }
-
-        a {
-            color: @ui-option-type;
-            text-decoration: none;
-        }
-
-        > span {
-            position: relative;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            flex-direction: column;
-            background-color: transparent;
-            word-break: break-word;
-        }
-
-        &:hover {
-            background-color: @ui-option-hover;
-            color: @ui-option-type-hover;
-        }
-
-        &:focus {
-            color: @ui-option-type-hover;
-        }
-    }
-
-    span > i, // legacy icon
-    .umb-icon {
-        font-size: 30px;
-        line-height: 1;
-        margin-top: 6px;
-        margin-bottom: 10px;
-        display: block;
-    }
-}
-
-.umb-card-grid .umb-card-grid-item.--creator {
-    > span {
-        border: 2px dashed @ui-action-discreet-border;
-        border-radius: @baseBorderRadius;
-        &:hover {
-            border-color: @ui-action-discreet-border-hover;
-        }
-    }
-}
-
-.umb-card-grid .umb-card-grid-item-slot {
-    position: relative;
-	display: block;
-	width: 100%;
-    padding-top: 100%;
-    border-radius: (@baseBorderRadius * 2);
-    box-sizing: border-box;
-    transition: background-color 120ms;
-    
-    &:hover, &:focus {
-	    background-color: @ui-option-hover;
-        > span {
-            color:@ui-action-discreet-type-hover;
-            border-color:@ui-action-discreet-border-hover;
-        }
-    }
-    
-    > span {
-        position: absolute;
-        top: 10px;
-        bottom: 10px;
-        left: 10px;
-        right: 10px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        flex-direction: column;
-        background-color: transparent;
-        border:1.5px dashed @ui-action-discreet-border;
-        border-radius: (@baseBorderRadius * 2);
-    }
-}
-
-//Round icon-like button - this should be somewhere else
-.umb-btn-round {
-	padding: 4px 6px 4px 6px;
-    display: inline-block;
-    cursor: pointer;
-    border-radius: 200px;
-    background: @gray-10;
-    border:1px solid @gray-6;
-    margin: 2px;
-}
-
-.umb-btn-round:hover, 
-.umb-btn-round:hover * {
-  background: @blueDark !important;
-  color: @white !important;
-  border-color: @blueDark !important;
-  text-decoration:none;
- }
-
- .umb-btn-round a:hover {
-     text-decoration:none;
-     color: @white !important;
- }
-
- .umb-btn-round i {
-     font-size:16px !important;
-     color: @gray-8;
-     display:block;
- }
-
- .umb-btn-round.alert:hover, .umb-btn-round.alert:hover *{
- 	background: @red !important;
-  	color: @white !important;
-  	border-color: @red !important;
-  	text-decoration:none;
- }
-
-.umb-btn-round.no-border{
-    border: none !important;
-    background: none !important;
-}
-
-.umb-training-videos {
-	display: grid;
-	grid-gap: 10px;
-	grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
-}
-
-.umb-training-video {
-	background: @white;
-	box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
-	border-radius: @baseBorderRadius;
-	transition: box-shadow 0.1s ease-in-out, border 0.1s ease-in-out;
-	box-sizing: border-box;
-	padding: 20px;
-}
-
-.umb-training-video:hover {
-	box-shadow: 0 3px 6px 0 rgba(0,0,0,0.16);
-	text-decoration: none;
-}
-
-.umb-training-video__label {
-    font-weight: bold;
-	margin-top: 20px;
-	display: block;
-	text-align: center;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/check-circle.less b/src/Umbraco.Web.UI.Client/src/less/components/check-circle.less
deleted file mode 100644
index a167644ea8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/check-circle.less
+++ /dev/null
@@ -1,17 +0,0 @@
-.check_circle {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 20px;
-    height: 20px;
-
-    .icon {
-        background-color: rgba(0,0,0,.15);
-        border-radius: 50%;
-        padding: 3px;
-        color: @white;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/contextdialogs/umb-dialog-datatype-delete.less b/src/Umbraco.Web.UI.Client/src/less/components/contextdialogs/umb-dialog-datatype-delete.less
deleted file mode 100644
index 0e0b8f22bd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/contextdialogs/umb-dialog-datatype-delete.less
+++ /dev/null
@@ -1,33 +0,0 @@
-.umb-dialog-datatype-delete {
-    
-
-    .umb-dialog-datatype-delete__table-head-column-name {
-        width: 140px;
-    }
-
-    .umb-table-body__icon {
-        margin-right: 5px;
-        vertical-align: top;
-        display: inline-block;
-    }
-
-    .table tbody td {
-        vertical-align: top;
-    }
-    .table tbody td > span {
-        margin: 5px 0;
-        vertical-align: middle;
-    }
-    .table tbody p {
-        line-height: 12px;
-        margin: 5px 0;
-        vertical-align: middle;
-    }
-
-    .table tbody .icon {
-        vertical-align: top;
-        margin-right: 5px;
-        display: inline-block;
-    }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
deleted file mode 100644
index 211e4d4f34..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
-	contains styling for all main editor directives
-*/
-
-.umb-editor-wrapper {
-	background: @gray-10;
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-    > form {
-        height: 100%;
-    }
-}
-
-.umb-split-views {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	display: flex;
-}
-
-.umb-split-view {
-	flex-grow: 1;
-	flex-shrink: 1;
-	flex-basis: auto;
-	position: relative;
-	background: transparent;
-	// transition: flex-grow 0.4s ease-in-out;
-}
-
-.umb-split-view--collapsed {
-	flex-grow: 0.00001;
-}
-
-.umb-split-view + .umb-split-view {
-	border-left: 2px solid @gray-9;
-}
-
-.umb-split-view__content {
-	//animation: fadein 0.5s ease-in-out;
-}
-
-@keyframes fadein {
-	from { opacity: 0; }
-    to   { opacity: 1; }
-}
-
-.umb-split-view--left {
-	left: 0;
-	right: auto;
-	border-right: 1px solid @gray-10;
-}
-
-.umb-split-view--right {
-	left: auto;
-	right: 0;
-}
-
-// header
-
-.umb-editor-header {
-    background: @white;
-    position: absolute;
-    padding-left: 20px;
-    z-index: @zIndexEditor;
-    border-bottom: 1px solid @gray-9;
-    width: 100%;
-    box-sizing: border-box;
-    height: @editorHeaderHeight;
-}
-
-.umb-editor-header .umb-button__button[disabled] {
-    // do not dim down the background color of disabled buttons in the header
-    background-color: unset;
-}
-
-.umb-editor-header__back {
-    background: transparent;
-    border: 0;
-    color: @gray-6;
-    margin: 0 0 1px 0;
-    padding: 0;
-	transition: color 0.1s ease-in-out;
-}
-
-.umb-editor-header__name-wrapper {
-	position: relative;
-	display: flex;
-	border: 1px solid @inputBorder;
-    &:focus-within {
-        border-color: @inputBorderFocus;
-    }
-}
-
-.umb-editor-header__name-and-description {
-    margin-right: 20px;
-    .umb-panel-header-description {
-    	padding: 0 10px;
-    }
-}
-
-.-split-view-active .umb-editor-header__name-and-description {
-	margin-right: 0;
-}
-
-.umb-editor-header__name-wrapper ng-form {
-	flex: 1 1 auto;
-}
-
-input.umb-editor-header__name-input {
-	border-color: transparent;
-	background-color: @white;
-	font-size: 15px;
-	color: @black;
-	margin-bottom: 0;
-	font-weight: bold;
-	box-sizing: border-box;
-	height: 32px;
-	line-height: 32px;
-	width: 100%;
-	padding: 0 10px;
-	background: @white;
-    &:focus {
-        border-color: transparent;
-    }
-}
-
-input.umb-editor-header__name-input:disabled {
-	background-color: @gray-10;
-	&:hover{
-		border-color: @gray-8;
-	}
-}
-
-.umb-editor-header__actions-menu {
-	margin-left: auto;
-}
-
-.umb-editor-header__close-split-view {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    position: relative;
-    height: 69px;
-    width: 69px;
-    font-size: 20px;
-    color: @gray-6;
-
-    &:hover {
-        color: @black;
-    }
-}
-
-.umb-editor-header {
-	.btn-white {
-        height:69px;
-        border-radius: 0;
-        padding-left: 30px;
-        padding-right: 30px;
-    }
-}
-
-// Tab bar
-.umb-editor-tab-bar {
-	position: sticky;
-	top: 0;
-	left: 0;
-	right: 0;
-	z-index: 90;
-	margin: -20px -20px 20px -20px;
-	padding: 0 20px;
-	background: @white;
-	box-shadow: 1px 1px 0 @gray-9;
-
-	.umb-tabs-nav {
-		border-bottom: none;
-	}
-
-	.umb-tab {
-		button {
-			padding: 15px 20px;
-		}
-	}
-}
-
-// container
-.umb-editor-container {
-	position: absolute;
-	top: @editorHeaderHeight;
-	right: 0;
-	bottom: @editorFooterHeight;
-	left: 0;
-	overflow: auto;
-	background: @brownGrayLight;
-}
-
-.umb-editor-wrapper.-no-footer .umb-editor-container {
-	bottom: 0;
-}
-
-.umb-editor-actions {
-	list-style: none;
-	margin: 0; padding: 0;
-
-    li {
-        display: inline-block;
-    }
-}
-
-// editor footer
-
-.umb-editor-footer {
-	position: absolute;
-	width: 100%;
-	box-sizing: border-box;
-	margin: 0;
-	height: @editorFooterHeight;
-	padding: 10px 20px;
-	background: @white;
-	border-top: 1px solid @gray-9;
-	z-index: 30;
-	bottom: 0;
-	display: flex;
-	align-items: center;
-}
-
-.umb-editor-footer-content {
-	display: flex;
-	align-items: center;
-	flex: 1 1 auto;
-}
-  
-.umb-editor-footer-content__right-side {
-	margin-left: auto;
-	flex: 0 0 auto;
-	padding-left: 10px;
-}
-  
-.umb-editor-footer-content__left-side {
-	margin-right: auto;
-	padding-right: 10px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
deleted file mode 100644
index 4eaf00724c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
+++ /dev/null
@@ -1,101 +0,0 @@
-.umb-editor-sub-header {
-   padding: 10px 0;
-   background: @brownGrayLight;
-   border-left: 5px solid @brownGrayLight;
-   border-right: 5px solid @brownGrayLight;
-   display: flex;
-   justify-content: space-between;
-   margin: -10px -1px 10px;
-   position: relative;
-   top: 0;
-   box-sizing: border-box;
-
-    &.nested {
-        margin-top: 0;
-        margin-bottom: 0;
-        background: @brownGrayLight;
-    }
-}
-.umb-editor-sub-header--white {
-    background-color: @white;
-    border-color: @white;
-}
-.umb-editor-sub-header--blue {
-    background-color: @ui-selected-border;
-    border-color: @ui-selected-border;
-    color: @white;
-    border-radius: 3px;
-}
-
-.umb-editor-sub-header.--state-selection {
-    padding-left: 10px;
-    padding-right: 10px;
-    background-color: @ui-selected-border;
-    border-color: @ui-selected-border;
-    color: @white;
-    border-radius: 3px;
-}
-
-[umb-sticky-bar] {
-    transition: box-shadow 240ms;
-    position:sticky;
-    z-index: 30;
-    width: calc(100% + 2px);
-
-    &.umb-sticky-bar--active {
-        box-shadow: 0 6px 3px -3px rgba(0,0,0,.16);
-    }
-
-    .umb-dashboard__content & {
-        top:-20px; // umb-dashboard__content has 20px padding - offset here prevents sticky position from firing when page loads
-    }
-}
-
-.umb-sticky-sentinel {
-    pointer-events: none;
-    z-index: 5050;
-
-    &.-top {
-        height:1px;
-    }
-}
-
-.umb-group-builder__property-preview .umb-editor-sub-header {
-    display: none;
-}
-
-.umb-editor-sub-header__content-left {
-   margin-right: auto;
-}
-
-.umb-editor-sub-header__content-right {
-   margin-left: auto;
-}
-
-.umb-editor-sub-header__content-left,
-.umb-editor-sub-header__content-right {
-   display: flex;
-   align-items: stretch;
-}
-
-.umb-editor-sub-header__section {
-   display: flex;
-   align-items: center;
-   padding-left: 10px;
-   padding-right: 10px;
-}
-
-.umb-editor-sub-header__content-left .umb-editor-sub-header__section {
-   padding-left: 0;
-}
-
-.umb-editor-sub-header__content-left .umb-editor-sub-header__section:first-child {
-   padding-left: 0;
-}
-
-.umb-editor-sub-header__content-right .umb-editor-sub-header__section {
-   padding-right: 0;
-}
-.umb-editor-sub-header__content-right .umb-editor-sub-header__section:last-child {
-   padding-right: 0;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
deleted file mode 100644
index 6f2f6cef14..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor.less
+++ /dev/null
@@ -1,127 +0,0 @@
-.umb-editors {
-    .absolute();
-    overflow: hidden;
-    z-index: 7500;
-
-    .umb-editor {
-        box-shadow: 0px 0 30px 0 rgba(0,0,0,.3);
-        position: fixed;
-    }
-}
-
-.umb-editor {
-    .absolute();
-    background: @brownGrayLight;
-    z-index: @zIndexEditor;
-    max-width: 100%;
-
-    &--infiniteMode {
-        transform: none;
-        will-change: transform;
-        transition: transform 400ms ease-in-out;
-
-        &.umb-editor--moveRight {
-            transform: translateX(110%);
-        }
-    }
-
-    &--outOfRange {
-        transform: none;
-        display: none;
-        will-change: auto;
-        transition: display 0s 320ms;
-    }
-
-    &--level0 {
-        transform: none;
-    }
-
-    &--small .umb-property {
-        .control-header {
-            float: none;
-            width: 100%;
-        }
-
-        .controls {
-            margin-left: 0;
-        }
-    }
-}
-
-// use a loop to build the editor levels
-@iterations: 3;
-@step: 60px;
-
-.level-loop (@i) when (@i > 0) {
-    @x: (@i * @step);
-    .umb-editor--level@{i} {
-        transform: translateX(@x);
-    }
-
-    .umb-editor--n@{i} {
-        right:@x;
-    }
-
-    .level-loop((@i - 1));
-}
-
-.level-loop(@iterations);
-
-// and also use a loop to build editor sizes - easily extended with new sizes by adding to the map
-@editorSizes:
-    small 500px,
-    medium 800px,
-    large 1600px;
-
-.create-editor-sizes(@iterator:1) when(@iterator <= length(@editorSizes)) {
-    .umb-editor {
-        @size: extract(extract(@editorSizes, @iterator), 1);
-        @value: extract(extract(@editorSizes, @iterator), 2);
-
-        &--@{size} {
-            width: @value;
-            will-change: transform;
-            left: auto;
-
-            .umb-editor--container {
-                max-width: @value;
-            }
-        }
-    }
-
-    .create-editor-sizes((@iterator + 1));
-}
-
-.create-editor-sizes();
-
-.umb-editor--large {
-    max-width: 1600px;
-    width: calc(100% - 50px);
-}
-
-.umb-editor__overlay {
-    .absolute();
-    background: rgba(0,0,0,0.4);
-    z-index: @zIndexEditor;
-    visibility: hidden;
-    opacity: 0;
-    transition: opacity 320ms 20ms, visibility 0s 400ms;
-}
-
-#contentcolumn > .umb-editor__overlay,
-.umb-editor--notInFront .umb-editor__overlay {
-    visibility: visible;
-    opacity: 1;
-    transition: opacity 320ms 20ms, visibility 0s;
-}
-
-.umb-editor--trashed-message {
-    background:@errorBackground;
-    color:@errorText;
-    padding:10px;
-    margin-bottom:20px;
-
-    i {
-        margin-right:5px;
-     }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
deleted file mode 100644
index e56669bfc2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
+++ /dev/null
@@ -1,391 +0,0 @@
-/* variant switcher */
-.umb-variant-switcher__toggle {
-    position: relative;
-	display: flex;
-	align-items: center;
-	padding: 0 10px; 
-    margin: 1px 1px;
-    right: 0;
-    height: 30px;
-	text-decoration: none !important;
-	font-size: 13px;
-    color: @ui-action-discreet-type;
-    background: transparent;
-    border: none;
-    
-    max-width: 50%;
-    white-space: nowrap;
-    
-    user-select: none;
-    
-    span {
-        text-overflow: ellipsis;
-        overflow: hidden;
-    }
-}
-
-button.umb-variant-switcher__toggle {
-	transition: color 0.2s ease-in-out;
-	&:hover {
-		//background-color: @gray-10;
-        color: @ui-action-discreet-type-hover;
-        .umb-variant-switcher__expand {
-            color: @ui-action-discreet-type-hover;
-        }
-	}
-    
-    &.--error {
-        &::before {
-            content: '!';
-            position: absolute;
-            top: -8px;
-            right: -10px;
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
-            width: 20px;
-            height: 20px;
-            border-radius: 10px;
-            text-align: center;
-            font-weight: bold;
-            background-color: @errorBackground;
-            color: @errorText;
-            .show-validation-type-warning & {
-                background-color: @warningBackground;
-                color: @warningText;
-            }
-
-            animation-duration: 1.4s;
-            animation-iteration-count: infinite;
-            animation-name: umb-variant-switcher__toggle--badge-bounce;
-            animation-timing-function: ease;
-            @keyframes umb-variant-switcher__toggle--badge-bounce {
-                0%   { transform: translateY(0); }
-                20%  { transform: translateY(-6px); }
-                40%  { transform: translateY(0); }
-                55%  { transform: translateY(-3px); }
-                70%  { transform: translateY(0); }
-                100% { transform: translateY(0); }
-            }
-        }
-    }
-}
-
-.umb-variant-switcher__expand {
-    color: @ui-action-discreet-type;
-	margin-left: 5px;
-	margin-right: -5px;
-    transition: color 0.2s ease-in-out;
-}
-
-
-.umb-variant-switcher {
-    min-width: 100%;
-    max-height: 80vh;
-    overflow-y: auto;
-    margin-top: 5px;
-    user-select: none;
-}
-
-.umb-variant-switcher__item {
-	display: flex;
-    justify-content: space-between;
-	align-items: center;
-	border-bottom: 1px solid @gray-9;
-    position: relative;
-
-    .umb-variant-switcher__name-wrapper:hover {
-        .umb-variant-switcher__name {
-            color: @blueMid;
-        }
-        .umb-variant-switcher__state {
-            color: @blueMid;
-        }
-    }
-}
-
-.umb-variant-switcher__item.--not-allowed:not(.--current) .umb-variant-switcher__name-wrapper:hover {
-    cursor: default;
-}
-
-.umb-variant-switcher__name-wrapper {
-    display: flex;
-    align-items: center;
-
-    .umb-variant-switcher__name-content {
-        display: flex;
-        flex-direction: column;
-    }
-}
-
-.umb-variant-switcher__item.--state-notCreated:not(.--active) {
-    .umb-variant-switcher__name-wrapper::before {
-        content: "+";
-        display: block;
-        float: left;
-        font-size: 15px;
-        font-weight: 900;
-        padding: 8px 12px 8px 0;
-        color: @gray-5;
-    }
-
-    .umb-variant-switcher__item-expand-button + .umb-variant-switcher__name-wrapper::before {
-        padding: 8px 16px 8px 20px;
-    }
-
-    .umb-variant-switcher__name {
-        color: @gray-5;
-    }
-
-    .umb-variant-switcher__state {
-        color: @gray-6;
-    }
-
-    .umb-variant-switcher__name-wrapper::after {
-        content: "";
-        position: absolute;
-        z-index: 1;
-        border: 2px dashed @gray-9;
-        margin: 2px;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        pointer-events: none;
-    }
-
-    .umb-variant-switcher__name-wrapper:hover {
-        &::before {
-            color: @blueMid;
-        }
-
-        .umb-variant-switcher__name {
-            color: @blueMid;
-        }
-
-        .umb-variant-switcher__state {
-            color: @blueMid;
-        }
-    }
-}
-/*
-.umb-variant-switcher__item.--state-draft {
-    .umb-variant-switcher__name {
-        color: @gray-5;
-    }
-    &:hover {
-        .umb-variant-switcher__name {
-            color: @blueMid;
-        }
-    }
-}
-*/
-
-.umb-variant-switcher.--has-sub-variants {
-    .umb-variant-switcher__item {
-        
-    }
-}
-
-.umb-variant-switcher__item-expand-button {
-    text-decoration: none;
-    display: inline-block;
-    flex: 0;
-    align-self: stretch;
-
-    padding-left: 22px !important;
-    padding-right: 14px !important;
-
-    font-size: 12px;
-
-    * {
-        pointer-events: none;
-    }
-}
-
-.umb-variant-switcher__item:last-child {
-	border-bottom: none;
-}
-
-.umb-variant-switcher__item.--current {
-    color: @ui-light-active-type;
-    .umb-variant-switcher__name {
-        //color: @ui-light-active-type;
-        font-weight: 700;
-    }
-    &::before {
-        content: '';
-        position: absolute;
-        border-radius: 0 4px 4px 0;
-        background-color: @ui-active-border;
-        width: 4px;
-        top:8px;
-        bottom: 8px;
-        left:0;
-        z-index:1;
-        pointer-events: none;
-    }
-}
-
-.umb-variant-switcher__item:hover {
-	outline: none;
-}
-
-.umb-variant-switcher__item.--active:not(.--current) .umb-variant-switcher__name-wrapper:hover {
-	//background-color: @white !important;
-	cursor: default;
-}
-
-.umb-variant-switcher__item:focus .umb-variant-switcher__split-view,
-.umb-variant-switcher__item:focus-within .umb-variant-switcher__split-view,
-.umb-variant-switcher__item:hover .umb-variant-switcher__split-view,
-.umb-variant-switcher__split-view:focus {
-	display: flex;
-	cursor: pointer;
-}
-
-.umb-variant-switcher__item.--error {
-    .umb-variant-switcher__name {
-        color: @formErrorText;
-        .show-validation-type-warning & {
-            color: @formWarningText;
-        }
-        &::after {
-            content: '!';
-            position: relative;
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
-            margin-left: 5px;
-            top: -3px;
-            width: 14px;
-            height: 14px;
-            border-radius: 7px;
-            font-size: 8px;
-            text-align: center;
-            font-weight: bold;
-            background-color: @errorBackground;
-            color: @errorText;
-            .show-validation-type-warning & {
-                background-color: @warningBackground;
-                color: @warningText;
-            }
-            
-            animation-duration: 1.4s;
-            animation-iteration-count: infinite;
-            animation-name: umb-variant-switcher__name--badge-bounce;
-            animation-timing-function: ease;
-            @keyframes umb-variant-switcher__name--badge-bounce {
-                0%   { transform: translateY(0); }
-                20%  { transform: translateY(-6px); }
-                40%  { transform: translateY(0); }
-                55%  { transform: translateY(-3px); }
-                70%  { transform: translateY(0); }
-                100% { transform: translateY(0); }
-            }
-        }
-    }
-}
-
-.umb-variant-switcher__name-wrapper {
-    font-size: 14px;
-    text-align: left;
-    flex: 1;
-	cursor: pointer;
-    background-color: transparent;
-    border: none;
-	padding-top: 6px !important;
-    padding-bottom: 6px !important;
-}
-
-.dropdown-menu>li {
-    > .umb-variant-switcher__name-wrapper {
-        padding-top: 10px;
-        padding-bottom: 10px;
-    }
-
-    > .umb-variant-switcher__item-expand-button + .umb-variant-switcher__name-wrapper {
-        padding-left: 5px;
-    }
-}
-
-
-.umb-variant-switcher__name {
-    display: block;
-    font-weight: 600;
-    margin-bottom: -2px;
-}
-
-.umb-variant-switcher__state {
-	font-size: 12px;
-	color: @gray-4;
-}
-
-.umb-variant-switcher__split-view {
-    font-size: 12px;
-    display: none;
-    padding: 16px 20px;
-    position: absolute;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    background-color: @white;
-
-    &:hover {
-        background-color: @ui-option-hover;
-        color: @ui-option-type-hover;
-    }
-}
-
-.umb-variant-switcher__sub-variants {
-
-    position: relative;
-    border-bottom: 1px solid @gray-9;
-    background-color: @gray-13;
-    /*
-    &::before {
-        content: "";
-        position: absolute;
-        z-index: 1;
-        top: 0px;
-        left: 20px;
-        width: 4px;
-        bottom: 14px;
-        border-bottom-left-radius: 2px;
-        border-bottom-right-radius: 2px;
-        background-color: @gray-8;
-    }
-    */
-    .umb-variant-switcher__item {
-        border-bottom-color: @gray-10;
-    }
-
-    .umb-variant-switcher__item.--state-notCreated:not(.--active) {
-        .umb-variant-switcher__name-wrapper::after {
-            left: 55px;// overwrite left to achieve same indentation on the dashed border as language.
-        }
-    }
-
-    .umb-variant-switcher__name-wrapper {
-
-        margin-left: 48px;
-        padding-left: 20px;
-        
-        padding-top: 10px;
-        padding-bottom: 10px;
-
-        &:hover {
-            color: @ui-option-type-hover;
-            background-color: @ui-option-hover;
-        }
-
-        .umb-variant-switcher__name {
-            //margin-right: 20px;
-        }
-        .umb-variant-switcher__state {
-            //flex: 0 0 200px;
-        }
-
-        
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less
deleted file mode 100644
index b743ebc4f1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-alert.less
+++ /dev/null
@@ -1,23 +0,0 @@
-.umb-alert {
-    padding: 15px;
-    box-sizing: border-box;
-    background-color: @blueLight;
-    border: 1px solid @blueMid; 
-    border-radius: 3px;
-}
-
-.umb-alert--info {
-    background-color: @sand-5;
-    border: 1px solid @sand-1;
-    color: @gray-2;
-}
-
-.umb-alert--warning {
-    background-color: @pinkLight;
-    border: 1px solid @pink;
-}
-
-.umb-alert--danger {
-    background-color: @pinkLight;
-    border: 1px solid @pink;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
deleted file mode 100644
index a686935c67..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-expansion-panel.less
+++ /dev/null
@@ -1,31 +0,0 @@
-.umb-expansion-panel {
-    background: @white;
-    border-radius: 3px;
-    margin-bottom: 20px;
-    box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.16);
-}
-
-.umb-expansion-panel__header {
-    box-sizing: border-box;
-    padding: 10px 20px;
-    font-weight: bold;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    color: @black;
-    width: 100%;
-
-    &:hover .umb-expansion-panel__expand,
-    &:focus .umb-expansion-panel__expand {
-        color: @gray-6;
-    }
-}
-
-.umb-expansion-panel__expand {
-    color: @gray-8;
-}
-
-.umb-expansion-panel__content {
-    padding: 20px;
-    border-top: 1px solid @gray-9;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-group-panel.less b/src/Umbraco.Web.UI.Client/src/less/components/html/umb-group-panel.less
deleted file mode 100644
index 32be2f2245..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/html/umb-group-panel.less
+++ /dev/null
@@ -1,26 +0,0 @@
-.umb-group-panel {
-    background: @white;
-    border-radius: 3px;
-    box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.16);
-    margin-bottom: 20px;
-}
-
-.umb-group-panel__header {
-  padding: 12px 20px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  color: @grayDarker;
-  border-bottom: 1px solid @gray-9;
-}
-
-.umb-group-panel__header h2 {
-  font-size: @fontSizeMedium;
-  font-weight: bold;
-  line-height: 1.3;
-  margin: 0;
-}
-
-.umb-group-panel__content {
-  padding: 20px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less b/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
deleted file mode 100644
index b3c384b89d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less
+++ /dev/null
@@ -1,52 +0,0 @@
-.umb-notifications {
-    z-index: @zindexNotification;
-    position: absolute;
-    bottom: @editorFooterHeight;
-    left: 0;
-    right: 0;
-
-    @media (min-width: 1101px) {
-        left: 360px;
-    }
-}
-
-.umb-notifications__notifications {
-    list-style: none;
-    margin: 0;
-    position: relative;
-}
-
-.umb-notifications__notification {
-    padding: 5px 20px;
-    text-shadow: none;
-    font-size: 14px;
-    border: none;
-    position: relative;
-    border-radius: 3px;
-    margin: 10px;
-
-    .close {
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        right: 0;
-        opacity: 1;
-        margin: auto 0;
-        width: 30px;
-        text-shadow: none;
-        color: #fff;
-        &:hover {
-            opacity: 0.75;
-        }
-    }
-}
-
-.umb-notifications__notification.-extra-padding {
-    padding-top: 20px;
-    padding-bottom: 20px;
-}
-
-
-.emptySection .umb-notifications{
-    left:0;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
deleted file mode 100644
index 6b8c0a8622..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ /dev/null
@@ -1,289 +0,0 @@
-.umb-overlay {
-    position: fixed;
-    overflow: hidden;
-    background: @white;
-    z-index: 7501;
-    animation: fadeIn 0.2s;
-    box-shadow: 0 10px 50px rgba(0,0,0,0.1), 0 6px 20px rgba(0,0,0,0.16);
-    text-align: left;
-
-    .scoped-view{
-        display: none;
-    }
-
-    .abstract {
-        margin-bottom : 20px;
-    }
-}
-
-.umb-overlay__form {
-    display: flex;
-    flex-wrap: nowrap;
-    flex-direction: column;
-    height: 100%;
-}
-
-.umb-overlay .umb-overlay-header {
-    border-bottom: 1px solid @gray-9;
-    margin-top: 0;
-    flex-grow: 0;
-    flex-shrink: 0;
-    padding: 30px 30px 0;
-}
-
-.umb-overlay__section-header {
-    width: 100%;
-    margin-top:30px;
-    margin-bottom: 20px;
-
-    h5 {
-        display: inline;
-        font-size: 16px;
-        line-height: 16px;
-        font-weight: bold;
-    }
-
-    button {
-        display: inline;
-        float: right;
-        background-color: transparent;
-        border:none;
-        &:hover {
-            color: @ui-option-type-hover;
-        }
-    }
-}
-
-.umb-overlay__title {
-    font-size: 20px;
-    color: @black;
-    line-height: 16px;
-    font-weight: bold;
-    margin: 5px 0;
-}
-
-.umb-overlay__subtitle {
-    font-size: @fontSizeSmall;
-    color: @gray-3;
-    margin: 0;
-}
-
-.umb-overlay-container {
-    flex-grow: 1;
-    flex-shrink: 1;
-    flex-basis: auto;
-    position: relative;
-    padding: 20px 30px;
-    background: @white;
-    max-height: calc(100vh - 170px);
-    overflow-y: auto;
-}
-
-.umb-overlay-drawer {
-    flex-grow: 0;
-    flex-shrink: 0;
-    flex-basis: 33px;
-    padding: 8px 20px;
-    margin: 0;
-    background: @white;
-    border-top: 1px solid @gray-9;
-}
-
-.umb-overlay-drawer.-auto-height {
-    flex-basis: auto;
-}
-
-.umb-overlay-drawer .umb-overlay-drawer__align-right {
-    display: flex;
-    justify-content: flex-end;
-}
-
-.umb-overlay-drawer .umb-overlay-drawer-content .dropdown-menu {
-    right: 0;
-    left: auto;
-}
-
-/* ---------- OVERLAY CENTER ---------- */
-.umb-overlay.umb-overlay-center {
-    position: absolute;
-    width: 600px;
-    height: auto;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    border-radius: @baseBorderRadius;
-}
-
-.umb-overlay.umb-overlay-center .umb-overlay-header {
-    border: none;
-    background: transparent;
-    padding: 30px 30px 0;
-}
-
-.umb-overlay.umb-overlay-center .umb-overlay-drawer {
-    border: none;
-    background: transparent;
-    padding: 0 30px 20px;
-}
-
-/* ---------- OVERLAY TARGET ---------- */
-.umb-overlay.umb-overlay-target {
-    width: 400px;
-    max-height: 100vh;
-    box-sizing: border-box;
-    visibility: hidden;
-    border-radius: @baseBorderRadius;
-}
-
-.umb-overlay.umb-overlay-target .umb-overlay-header {
-    border: none;
-    background: transparent;
-}
-
-.umb-overlay.umb-overlay-target .umb-overlay-drawer {
-    border: none;
-    background: transparent;
-}
-
-/* ---------- OVERLAY RIGHT ---------- */
-.umb-overlay.umb-overlay-right {
-    width: 500px;
-    top: @appHeaderHeight;
-    right: 0;
-    bottom: 0;
-    border: none;
-    box-shadow: 0 0 20px rgba(0,0,0,0.19), 0 0 6px rgba(0,0,0,0.23);
-    
-    .umb-drawer-is-visible & {
-        right:400px;
-    }
-}
-
-.umb-overlay.umb-overlay-right .umb-overlay-header {
-    flex-basis: 70px;
-    box-sizing: border-box;
-}
-
-// reset the top position to 0 because we are in a asbolute container and want to 
-// overlay to go all the way to the top
-.umb-editors .umb-overlay.umb-overlay-right {
-    top: 0;
-}
-
-/* ---------- OVERLAY LEFT ---------- */
-.umb-overlay.umb-overlay-left {
-    width: 500px;
-    top: @appHeaderHeight;
-    left: 0;
-    bottom: 0;
-    border: none;
-    box-shadow: 0 0 20px rgba(0,0,0,0.19), 0 0 6px rgba(0,0,0,0.23);
-    margin-left: 81px;
-}
-
-// push left overlay when drawer is open
-.umb-drawer-is-visible .umb-overlay.umb-overlay-left {
-    left: @drawerWidth;
-}
-
-.umb-overlay.umb-overlay-left .umb-overlay-header {
-    flex-basis: 100px;
-    padding: 30px 30px 0;
-    box-sizing: border-box;
-}
-
-@media (max-width: 767px) {
-    .umb-overlay.umb-overlay-left {
-        margin-left: 61px;
-    }
-}
-
-@media (max-width: 500px) {
-    .umb-overlay.umb-overlay-left {
-        margin-left: 41px;
-        width: calc(100% - 41px);
-    }
-}
-
-/* ---------- OVERLAY ITEM DETAILS ---------- */
-.umb-overlay__item-details {
-    position: absolute;
-    left: 0;
-    bottom: 51px;
-    width: 100%;
-    padding: 20px;
-    box-sizing: border-box;
-    background: @gray-10;
-    border-bottom: 1px solid @purple-l3;
-    pointer-events: none;
-}
-
-.umb-overlay__item-details-title-wrapper {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-}
-
-.umb-overlay__item-details-icon {
-    font-size: 16px;
-    margin-right: 10px;
-    vertical-align: middle;
-    color: @gray-6;
-}
-
-.umb-overlay__item-details-title {
-    margin: 0;
-    font-size: 15px;
-}
-
-.umb-overlay__item-details-description {
-    margin: 10px 0 0;
-    font-size: 12px;
-}
-
-.umb-overlay.umb-overlay-target,
-.umb-overlay.umb-overlay-left,
-.umb-overlay.umb-overlay-right {
-
-    &.umb-overlay--small {
-      width: 500px;
-    }
-
-    &.umb-overlay--medium {
-      width: 800px;
-    }
-
-    &.umb-overlay--large {
-      max-width: 1600px;
-      width: calc(100% - 50px);
-    }
-}
-
-/*ensures dialogs doesnt have side-by-side labels*/
-.umb-overlay .control-label,
-.umb-overlay .form-horizontal .control-label,
-.form-horizontal .umb-overlay .control-label
- {
-    width: 100%;
-    display: block;
-    box-sizing: border-box;
-    margin-bottom: 10px;
-    float: none;
-}
-
-.umb-overlay .controls-row,
-.umb-overlay .form-horizontal .controls,
-.form-horizontal .umb-overlay .controls {
-    margin-left: 0 !important;
-}
-
-.umb-overlay .text-error {
-    color: @formErrorText;
-}
-.umb-overlay .text-warning {
-    color: @formWarningText;
-}
-
-.umb-overlay .text-success {
-    color: @formSuccessText;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-itempicker.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-itempicker.less
deleted file mode 100644
index 010ff4636d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-itempicker.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.umb-itempicker .form-search {
-    margin-top:10px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-overlay-backdrop.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-overlay-backdrop.less
deleted file mode 100644
index 5907c5bfab..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-overlay-backdrop.less
+++ /dev/null
@@ -1,21 +0,0 @@
-.umb-overlay-backdrop {
-   position: fixed;
-   width: 100%;
-   height: 100%;
-   background-color: rgba(255, 255, 255, 0.5);
-   z-index: @zindexOverlayBackdrop;
-   top: @appHeaderHeight;
-   left: 0;
-}
-
-.umb-overlay-backdrop.ng-enter {
-    animation: fadeIn 0.3s;
-}
-  
-.umb-overlay-backdrop.ng-leave {
-    animation: fadeOut 0.3s;
-}
-
-.umb-drawer-is-visible .umb-overlay-backdrop {
-    left: @drawerWidth;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-variant-selector-overlay.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-variant-selector-overlay.less
deleted file mode 100644
index b50a622f98..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-variant-selector-overlay.less
+++ /dev/null
@@ -1,26 +0,0 @@
-.umb-variant-selector-overlay {
-
-
-    .umb-variant-selector-entry {
-        .umb-form-check {
-            .umb-form-check__symbol {
-                margin-top: 2px;
-            }
-        }
-    }
-    .umb-variant-selector-entry__title {
-        font-weight: 600;
-        font-size: 14px;
-        .__secondarytitle {
-            font-weight: normal;
-            color: @gray-5;
-        }
-    }
-    .umb-variant-selector-entry__description {
-        display: block;
-        font-size: 12px;
-        color: @gray-4;
-    }
-
-
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less b/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less
deleted file mode 100644
index 48d581b313..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less
+++ /dev/null
@@ -1,67 +0,0 @@
-.umb-prevalues-multivalues {
-    width: 425px;
-    max-width: 100%;
-
-    .umb-overlay & {
-        width: 500px;
-    }
-
-    p {
-        margin: 7px 0;
-    }
-}
-
-.umb-prevalues-multivalues__left {
-    display: flex;
-    flex: 1 1 auto;
-    overflow: hidden;
-}
-
-.umb-prevalues-multivalues__right {
-    display: flex;
-    flex: 0 0 auto;
-    align-items: center;
-}
-
-.umb-prevalues-multivalues__add {
-    display: flex;
-
-    input {
-        display: flex;
-        width: 320px;
-    }
-
-    button {
-        margin: 0 6px 0 0;
-        margin-left: auto;
-    }
-}
-
-.umb-prevalues-multivalues__listitem {
-    display: flex;
-    padding: 6px;
-    margin: 10px 0px !important;
-    background: @gray-10;
-
-    &.ui-sortable-handle,
-    .ui-sortable-handle,
-    .handle {
-        cursor: move;
-    }
-
-    .umb-icon,
-    i.icon {
-        display: flex;
-        align-self: center;
-        margin-right: 5px;
-    }
-
-    a {
-        cursor: pointer;
-        margin-left: auto;
-    }
-
-    input {
-        width: 295px;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip-list.less b/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip-list.less
deleted file mode 100644
index 4f704be511..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip-list.less
+++ /dev/null
@@ -1,19 +0,0 @@
-.umb-tooltip-list {
-   list-style: none;
-   margin-left: 0;
-   margin-bottom: 0;
-   padding: 10px;
-}
-
-.umb-tooltip-list__item {
-   margin-bottom: 5px;
-}
-
-.umb-tooltip-list__item:last-child {
-   margin-bottom: 0;
-}
-
-.umb-tooltip-list__item-label {
-   font-weight: bold;
-   margin-bottom: -3px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip.less b/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip.less
deleted file mode 100644
index 5158d32304..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/tooltip/umb-tooltip.less
+++ /dev/null
@@ -1,15 +0,0 @@
-.umb-tooltip {
-   position: fixed;
-   display: flex;
-   background: @white;
-   padding: 10px;
-   z-index: 1000;
-   max-width: 200px;
-   font-size: 12px;
-   animation-duration: 0.1s;
-   animation-timing-function: ease-in;
-   animation: fadeIn;
-   margin-top: 15px;
-   pointer-events: none;
-   border-radius: 3px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less
deleted file mode 100644
index 887f5d1838..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-actions.less
+++ /dev/null
@@ -1,109 +0,0 @@
-// Tree context menu
-// -------------------------
-.umb-actions {
-    margin: 0;
-    list-style: none;
-    user-select: none;
-
-    .sep {
-        display: block;
-        border-top: 1px solid @gray-9;
-
-        &:first-child {
-            border-top: none;
-        }
-    }
-
-    .menu-label {
-        display: inline-block;
-        vertical-align: middle;
-        padding-left: 15px;
-    }
-
-    .icon {
-        font-size: 18px;
-        vertical-align: middle;
-    }
-}
-
-.umb-action-link {
-    position: relative;
-    font-size: 15px;
-    color: @black;
-    padding: 9px 25px 9px 20px;
-    text-decoration: none;
-    cursor: pointer;
-    display: flex;
-    width: 100%;
-    align-items: center;
-    text-align: left;
-
-    body.touch & {
-        padding: 7px 25px 7px 20px;
-        font-size: 110%;
-    }
-}
-
-.umb-action-link:hover,
-.umb-action-link:focus,
-.umb-action.selected {
-    color: @black !important;
-    background: @gray-10 !important;
-    text-decoration: none;
-}
-
-.umb-action {
-    &.-opens-dialog {
-        .menu-label:after {
-            // adds an ellipsis (...) after the menu label for actions that open a dialog
-            content: '\2026';
-        }
-    }
-}
-
-.umb-actions-child {
-
-    .umb-action {
-        display: block;
-
-        &.add {
-            margin-top: 20px;
-            border-top: 1px solid @gray-8;
-            padding-top: 20px;
-
-            i {
-                opacity: 0.4;
-            }
-        }
-    }
-
-    .umb-action-link {
-        clear: both;
-        padding-left: 10px;
-    }
-
-    .icon {
-        font-size: 30px;
-        min-width: 30px;
-        text-align: center;
-        line-height: 24px;
-        /* set line-height to ensure all icons use same line-height */
-    }
-
-    .menu-label {
-        font-size: 14px;
-        color: @black;
-        margin-left: 10px;
-        text-align: left;
-    }
-
-    small {
-        font-size: 12px;
-        display: block;
-        clear: right;
-        line-height: 14px;
-        color: @gray-6;
-        white-space: normal;
-        margin-top: 2px;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
deleted file mode 100644
index 97caf66497..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
+++ /dev/null
@@ -1,106 +0,0 @@
-.umb-tree-item {
-    display: block;
-    min-width: 100%;
-    width: auto;
-    margin-top:1px;
-
-    &:hover .umb-tree-item__arrow {
-        visibility: visible;
-        cursor: pointer
-    }
-}
-
-.umb-tree-item__label {
-    user-select: none;
-}
-
-.umb-tree-item__arrow {
-    position: relative;
-    margin-left: -16px;
-    margin-right: 4px;
-    width: 12px;
-    height: 12px;
-    visibility: hidden;
-    text-decoration: none;
-    font-size: 12px;
-    line-height: 12px;
-    transition: color 120ms;
-
-    &:hover {
-        color: @ui-option-type-hover;
-    }
-}
-
-.umb-tree-item > .umb-tree-item__inner {
-
-    &:hover .umb-tree-item__label {
-        overflow: hidden;
-        margin-right: 6px;
-    }
-
-    // Loading Animation
-    // ------------------------
-    .umb-tree-item__loader {
-        width: 100%;
-        position: absolute;
-        margin: 0;
-    }
-
-    .umb-tree-item__label {
-        padding: 7px 0 5px;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        flex: 1 1 auto;
-    }
-}
-
-// active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog.
-.umb-tree-item.active > .umb-tree-item__inner {
-    border-color: @ui-selected-border;
-    box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
-    color: @ui-selected-type;
-
-    a {
-        color: @ui-selected-type;
-    }
-
-    &::before {
-        content: "";
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        border: 2px solid fade(@white, 80%);
-    }
-
-    &:hover {
-        color: @ui-selected-type-hover;
-
-        a {
-            color: @ui-selected-type-hover;
-        }
-    }
-}
-
-.umb-tree-item.current > .umb-tree-item__inner {
-    background: @ui-active;
-    color:@ui-active-type;
-
-    // override small icon color. TODO => check usage
-    &:before {
-        color: @blue;
-    }
-
-    a,
-    .umb-tree-icon,
-    .umb-tree-item__arrow {
-        color: @ui-active-type !important;
-    }
-}
-
-.umb-tree-item.current-not-active > .umb-tree-item__inner {
-    background: @ui-active-blur;
-    color:@ui-active-type;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-root.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-root.less
deleted file mode 100644
index b0a230b4fb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-root.less
+++ /dev/null
@@ -1,28 +0,0 @@
-.umb-tree-root {
-  border: 2px solid transparent;
-
-  &-link {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    padding-left: 20px;
-    color: @gray-2;
-    height: @editorHeaderHeight;
-  }
-
-  h1, h5 {
-    margin: 0;
-    flex: 1;
-  }
-
-  h1 {
-    font-size: @baseFontSize;
-    font-weight: 700;
-    width: 100%;
-    display: flex;
-  }
-
-  .umb-options {
-    align-self: center;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
deleted file mode 100644
index 4dd0a56b3f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ /dev/null
@@ -1,375 +0,0 @@
-// Tree
-// -------------------------
-.umb-tree {
-    margin: 0;
-    min-width: 100%;
-    width: auto;
-    padding: 0 0 20px;
-    list-style-type: none;
-    
-    * {
-        white-space: nowrap;
-    }
-
-    a, a:hover {
-        text-decoration: none;
-    }
-
-    .umb-tree-item__arrow {
-        visibility: hidden;
-        text-decoration: none;
-        font-size: 12px;
-        transition: color 120ms;
-
-        &:hover {
-            color: @ui-option-type-hover;
-        }
-    }
-    i.noSpr {
-        display: inline-block;
-        margin-top: 1px;
-        width: 16px;
-        height: 16px;
-        line-height: 16px;
-    }
-
-    ul {
-        padding: 0;
-        margin: 0;
-        min-width: 100%;
-        width: 100%;
-
-        &.collapsed {
-            display: none;
-        }
-    }
-
-    .search-subtitle {
-        color: @gray-7;
-        display: block;
-        padding-left: 35px;
-        white-space: initial;
-        text-align: left;
-    }
-}
-
-body.touch .umb-tree {
-    .umb-tree-item__arrow {
-        font-size: 14px;
-        visibility: visible;
-        padding: 7px;
-    }
-
-    .umb-tree-item > .umb-tree-item__inner {
-        padding-top: 8px;
-        padding-bottom: 8px;
-        font-size: 110%;
-    } 
-    
-    // change height of this if touch devices should have a different height of preloader.
-    .umb-tree-item .l div {
-        padding: 0;
-    }
-}
-
-.umb-tree-root, .umb-tree-item__inner {
-    padding: 0;
-    position: relative;
-    overflow: hidden;
-    display: flex;
-    flex-wrap: nowrap;
-    align-items: center;  
-    
-    color: @ui-option-type;
-    a {
-        color: @ui-option-type;
-    }
-    
-    &:hover {
-        background: @ui-option-hover;
-        color: @ui-option-type-hover;
-
-        a {
-            color: @ui-option-type-hover;
-        }
-        
-        > .umb-options {
-            position: relative;
-            width: auto;
-            height: auto;
-            overflow: visible;
-            clip: auto;
-        }
-
-        .umb-button-ellipsis--hidden {
-            opacity: 1;
-        }
-         
-        .umb-tree-icon {
-            color: @ui-option-type-hover;
-        }
-    }
-}
-
-.umb-tree-item__inner {
-    border: 2px solid transparent;
-    overflow: visible;
-}
-
-.umb-tree-header {
-    display: flex;
-    padding: 20px 0 20px 20px;
-    box-sizing: border-box;
-    color: @gray-2;
-    font-weight: bold;
-    font-size: 15px;
-}
-
-.umb-tree-icon,
-.umb-tree-node-search {
-    cursor: pointer;
-}
-
-.umb-tree .umb-search-group {
-    position: inherit;
-    display: inherit;
-    list-style: none;
-
-    h6 {
-        padding: 10px 0 10px 20px;
-        font-weight: inherit;
-        background: @gray-10;
-        font-size: 14px;
-    }
-
-    &:hover {
-        background: inherit;
-    }
-
-    &-item {
-        padding: 4px 0;
-
-        &:hover {
-            background-color: @gray-10;
-        }
-
-        &-link {
-            display: block;
-            width: 100%;
-            text-align: left;
-        }
-
-        &-name {
-            display: flex;
-
-            &__text { 
-                margin: 1px 0 0;
-                overflow:hidden;
-                text-overflow: ellipsis;
-            }
-        }
-    }
-
-    &-link {
-        display: flex;
-        flex-wrap: wrap;
-        flex-direction: column;
-        font-weight: normal !important;
-    }
-}
-
-.umb-tree .umb-tree-node-checked > .umb-tree-item__inner > i[class^="icon-"],
-.umb-tree .umb-tree-node-checked > .umb-tree-item__inner > i[class*=" icon-"],
-.umb-tree .umb-tree-node-checked .umb-search-group-item-name > i[class^="icon-"],
-.umb-tree .umb-tree-node-checked .umb-search-group-item-name > i[class*=" icon-"], 
-.umb-tree .umb-tree-node-checked > i[class^="icon-"],
-.umb-tree .umb-tree-node-checked > i[class*="icon-"] {
-    font-family: 'icomoon' !important;
-    color: @green !important;
-
-    &::before {
-        content: "\e165" !important;
-        font-family: inherit;
-    }
-}
-
-.umb-options {
-    position: relative;
-    display: flex;
-    flex: 0 0 auto;
-    justify-content: flex-end;
-    text-align: center;
-    margin: 0 10px 0 auto;
-    cursor: pointer;
-    border-radius: @baseBorderRadius;
-    transition: background-color 120ms;
-
-    .umb-button-ellipsis {
-        padding: 3px 5px;
-    }
-
-    i {
-        height: 5px !important;
-        width: 5px !important;
-        border-radius: 20px;
-        display: inline-block;
-        margin: 0 2px 0 0;
-        background: @ui-active-type;
-
-        &:last-child {
-            margin: 0;
-        }
-    }
-
-    &:hover {
-        background-color: rgba(255, 255, 255, .8);
-
-        i {
-            background: @ui-active-type-hover;
-        }
-    }
-
-    // NOTE - We're having to repeat ourselves here due to an .sr-only class appearing in umbraco/lib/font-awesome/css/font-awesome.min.css
-    &.sr-only--hoverable:hover,
-    &.sr-only--focusable:focus {
-        position: relative;
-        display: flex;
-        flex: 0 0 auto;
-        justify-content: flex-end;
-        padding: 7px 5px;
-        text-align: center;
-        margin: 0 auto;
-        cursor: pointer;
-        border-radius: 3px;
-    }
-
-    .hide-options & {
-        display: none !important;
-    }
-}
-
-
-// Tree item states
-// -------------------------
-.not-published {
-    > .umb-tree-item__inner > .umb-icon,
-    > .umb-tree-item__inner > i.icon,
-    > .umb-tree-item__inner > a {
-        opacity: 0.6;
-    }
-    &.umb-search-group-item {
-        opacity: 0.6;
-    }
-}
-
-.not-allowed {
-    > .umb-tree-item__inner > .umb-icon,
-    > .umb-tree-item__inner > i.icon,
-    > .umb-tree-item__inner > a {
-        cursor: not-allowed;
-        opacity: 0.4;
-    }
-}
-
-.has-unpublished-version, .is-container, .protected {
-    > .umb-tree-item__inner {
-        > .umb-tree-item__annotation {
-            background-color: @white;
-            border-radius: 50%;
-            width: 12px;
-            height: 12px;
-            position: absolute;
-            margin-left: 12px;
-            top: 17px;
-
-            &::before {
-                font-family: 'icomoon';
-                position: absolute;
-                top: -4px;
-            }
-        }
-
-        &:hover > .umb-tree-item__annotation {
-            background-color: @ui-option-hover;
-        }
-    }
-
-    &.current > .umb-tree-item__inner > .umb-tree-item__annotation {
-        background-color: @ui-active;
-    }
-}
-
-.is-container > .umb-tree-item__inner > .umb-tree-item__annotation::before {
-    content: "\e04e";
-    color: @blue;
-    font-size: 9px;
-    margin-left: 2px;
-    left: 0px;
-}
-
-.has-unpublished-version > .umb-tree-item__inner > .umb-tree-item__annotation::before {
-    content: "\e25a";
-    color: @green;
-    font-size: 23px;
-    margin-left: 16px;
-    left: -21px;
-}
-
-.protected > .umb-tree-item__inner > .umb-tree-item__annotation::before {
-    content: "\e256";
-    color: @red;
-    font-size: 23px;
-    margin-left: -3px;
-    left: -2px;
-}
-
-.locked > .umb-tree-item__inner > .umb-tree-item__annotation::before {
-    content: "\e0a7";
-    color: @red;
-    font-size: 9px;
-    margin-left: 2px;
-    left: 0px;
-}
-
-.no-access {
-    > .umb-tree-item__inner .umb-tree-icon,
-    > .umb-tree-item__inner .umb-tree-item__label {
-        color: @gray-7;
-        cursor: not-allowed;
-    }
-}
-
-
-// Tree icons
-// -------------------------
-.umb-tree-icon { 
-    vertical-align: middle;
-    margin: 0 13px 0 0;
-    color: @ui-option-type;
-    font-size: 20px;
-
-    &.-hidden {
-        display: none;
-        visibility: hidden;
-    }
-    
-    &.blue {
-        color: @blue;
-    }
-
-    &.green {
-        color: @green;
-    }
-
-    &.purple {
-        color: @purple;
-    }
-
-    &.orange {
-        color: @orange;
-    }
-
-    &.red {
-        color: @red;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-avatar.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-avatar.less
deleted file mode 100644
index 3f32386846..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-avatar.less
+++ /dev/null
@@ -1,119 +0,0 @@
-.umb-avatar {
-    border-radius: 50%;
-    width: 50px;
-    height: 50px;
-    background-color: transparent;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin: 0 auto;
-    color: @black;
-    font-weight: bold;
-    font-size: 16px;
-    box-sizing: border-box;
-    object-fit: cover;
-    object-position: center;
-}
-
-/* Sizes */
-
-.umb-avatar--xxs {
-    width: 26px;
-    height: 26px;
-    font-size: 12px;
-}
-
-.umb-avatar--xs {
-    width: 30px;
-    height: 30px;
-    font-size: 12px;
-}
-
-.umb-avatar--s {
-    width: 40px;
-    height: 40px;
-    font-size: 14px;
-}
-
-.umb-avatar--m {
-    width: 50px;
-    height: 50px;
-    font-size: 16px;
-}
-
-.umb-avatar--l {
-    width: 70px;
-    height: 70px;
-    font-size: 18px;
-}
-
-.umb-avatar--xl {
-    width: 100px;
-    height: 100px;
-    font-size: 20px;
-}
-
-.umb-avatar--xxl {
-    width: 150px;
-    height: 150px;
-    font-size: 36px;
-}
-
-/* Colors */
-
-.umb-avatar--white {
-    background-color: @white;
-    color: @black;
-}
-
-.umb-avatar--gray {
-    background-color: @gray-10;
-    color: @black;
-}
-
-.umb-avatar--primary {
-    background-color: @pinkLight;
-    color: @blueExtraDark;
-}
-
-.umb-avatar--secondary {
-    background-color: @pinkLight;
-    color: @blueExtraDark;
-}
-
-.umb-avatar--success {
-    background-color: @green-l1;
-    color: @white;
-}
-
-.umb-avatar--warning {
-    background-color: @yellow-l1;
-    color: @white;
-}
-
-.umb-avatar--danger {
-    background-color: @red-l1;
-    color: @white;
-}
-
-/*with button*/
-
-a.umb-avatar-btn {
-    cursor: pointer;
-}
-a.umb-avatar-btn:hover {
-    text-decoration: none;
-}
-a.umb-avatar-btn .umb-avatar {
-    border: 2px dashed @gray-6;
-}
-a.umb-avatar-btn .umb-avatar span {
-    font-size: 50px;
-    color: @gray-6;
-}
-a.umb-avatar-btn .umb-avatar span {
-    color: @gray-6;
-    font-size: 50px;
-}
-
-/*border-radius: 50%; width: 100px; height: 100px; font-size: 50px; text-align: center; display: flex; align-items: center; justify-content: center; background-color: @gray-10; border: 2px dashed @gray-6; color: @gray-6;*/
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less
deleted file mode 100644
index 18294f9e59..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less
+++ /dev/null
@@ -1,125 +0,0 @@
-.umb-badge {
-    padding: 6px 8px;
-    color: @gray-4;
-    background-color: @gray-8;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 100px;
-}
-
-.umb-badge__count {
-    display: flex;
-    width: 1rem;
-    height: 1rem;
-    line-height: 1;
-    justify-content: center;
-    align-items: center;
-    border-radius: 50%;
-    font-size: 12px;
-}
-
-// Colors
-.umb-badge--primary {
-    background-color: @blueDark;
-    color: @white;
-
-    .umb-badge__count {
-        background-color: darken(@blueDark, 5%);
-    }
-}
-
-.umb-badge--secondary {
-    background-color: @blueExtraDark;
-    color: @white;
-
-    .umb-badge__count {
-        background-color: darken(@blueExtraDark, 8%);
-    }
-}
-
-.umb-badge--gray {
-    background-color: @sand-2;
-    color: @blueDark;
-
-    .umb-badge__count {
-        background-color: darken(@sand-2, 8%);
-    }
-}
-
-.umb-badge--danger {
-    background-color: @red;
-    color: @white;
-
-    .umb-badge__count {
-        background-color: darken(@red, 8%);
-    }
-}
-
-.umb-badge--info {
-    background-color: @blue;
-    color: @white;
-
-    .umb-badge__count {
-        background-color: darken(@blue, 8%);
-    }
-}
-
-.umb-badge--warning {
-    background-color: @orange;
-    color: @white;
-
-    .umb-badge__count {
-        background-color: darken(@orange, 8%);
-    }
-}
-
-.umb-badge--success {
-    background-color: @green;
-    color: @white;
-
-    .umb-badge__count {
-        background-color: darken(@green, 8%);
-    }
-}
-
-.umb-badge--dark {
-    background-color: @grayDark;
-    color: @white;
-
-    .umb-badge__count {
-        background-color: darken(@grayDark, 8%);
-    }
-}
-
-// Size
-.umb-badge--xxs {
-    font-size: 11px;
-    padding: 0 7px;
-}
-
-.umb-badge--xs {
-    font-size: 12px;
-    font-weight: 600;
-    padding: 1px 10px;
-}
-
-.umb-badge--s {
-    font-size: 14px;
-    padding: 3px 10px;
-}
-
-.umb-badge--m {
-    font-size: 16px;
-    padding: 6px 12px;
-}
-
-.umb-badge--l {
-    font-size: 18px;
-    padding: 6px 8px;
-}
-
-.umb-badge--xl {
-    font-size: 20px;
-    padding: 6px 8px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less
deleted file mode 100644
index 5038b94fe8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less
+++ /dev/null
@@ -1,47 +0,0 @@
-@boxUnit: 10px;
-
-.umb-box {
-    background: @white;
-    border-radius: 3px;
-    margin-bottom: (@boxUnit * 2);
-    box-shadow: 0 1px 1px 0 rgba(0,0,0,.16);
-}
-
-.umb-box-header {
-    padding: @boxUnit (@boxUnit * 2);
-    border-bottom: 1px solid @gray-9;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.umb-box-header-title {
-    font-size: 15px;
-    color: @black;
-    font-weight: bold;
-}
-
-.umb-box-header-description {
-    font-size: 13px;
-    color: @gray-3;
-    line-height: 1.6em;
-    margin-top: 1px;
-}
-
-.umb-box-content {
-    padding: (@boxUnit * 2);
-}
-
-// allow side-by-side boxes
-.umb-box-row {
-    margin-left: (@boxUnit * -1);
-    margin-right: (@boxUnit * -1);
-    display: flex;
-    justify-content: space-around;
-    
-    .umb-box {
-        margin-left: @boxUnit;
-        margin-right: @boxUnit;
-        flex: 1;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-breadcrumbs.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-breadcrumbs.less
deleted file mode 100644
index de678f9798..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-breadcrumbs.less
+++ /dev/null
@@ -1,66 +0,0 @@
-.umb-breadcrumbs {
-   list-style: none;
-   margin-bottom: 0;
-   margin-left: 0;
-   display: flex;
-   flex-wrap: wrap;
-   user-select: none;
-}
-
-.umb-breadcrumbs__ancestor {
-   display: flex;
-   align-items: center;
-}
-
-.umb-breadcrumbs__action {
-    position: relative;
-    background: transparent;
-    border: 0 none;
-    border-radius: 3px;
-    padding: 0 4px;
-    color: @ui-option-type;
-
-    &.--current {
-        font-weight: bold;
-        pointer-events: none;
-    }
-
-    &:hover {
-        color: @ui-option-type-hover;
-        background-color: @white;
-    }
-
-}
-
-.umb-breadcrumbs__ancestor-link,
-.umb-breadcrumbs__ancestor-text {
-    font-size: 13px;
-    color: @gray-3;
-    max-width: 150px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    padding: 0 4px;
-}
-
-.umb-breadcrumbs__ancestor-link {
-   text-decoration: underline;
-}
-
-.umb-breadcrumbs__ancestor-link:hover {
-   color: @black;
-}
-
-.umb-breadcrumbs__separator {
-   position: relative;
-   top: 1px;
-   margin: 0 1px;
-   margin-top: -3px;
-   color: @gray-7;
-}
-
-input.umb-breadcrumbs__add-ancestor {
-    height: 24px;
-    margin: -2px 0 -2px 3px;
-    width: 100px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-checkbox-list.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-checkbox-list.less
deleted file mode 100644
index 10dbafc74f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-checkbox-list.less
+++ /dev/null
@@ -1,92 +0,0 @@
-@checkboxWidth: 15px;
-@checkboxHeight: 15px;
-
-.umb-checkbox-list {
-  list-style: none;
-  margin-left: 0;
-  margin-top: 6px;
-}
-
-.umb-checkbox-list__item {
-  display: flex;
-  align-items: center;
-  margin-bottom: 2px;
-}
-
-.umb-checkbox-list li:first-child {
-    font-weight: bold;
-}
-
-.umb-checkbox-list__item:last-child {
-    border-bottom: none;
-}
-
-.umb-checkbox-list__item:hover {
-    background-color: @gray-10;
-}
-
-.umb-checkbox-list__item.-selected,
-.umb-checkbox-list__item.-disabled {
-    background-color: @gray-10;
-    font-weight: bold;
-}
-
-.umb-checkbox-list__item.-hidden {
-  display: none;
-}
-
-.umb-checkbox-list__item-checkbox {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex: 0 0 30px;
-  margin-right: 5px;
-  position: relative;
-}
-
-.umb-checkbox-list__item-icon {
-  margin-right: 5px;
-  font-size: 16px;
-}
-
-.umb-checkbox-list__item-icon-wrapper {
-  position: relative;
-  display: flex;
-
-  .umb-button__progress {
-    width: 10px;
-    height: 10px;
-    margin-left: -10px;
-    margin-top: -8px;
-  }
-}
-
-.umb-checkbox-list__item-text {
-  font-size: 14px;
-  margin-bottom: 0;
-  flex: 1 1 auto;
-  display: flex;
-  align-items: center;
-  padding: 5px 0;
-}
-
-.umb-checkbox-list__item-text.-faded {
-    opacity: 0.5;
-}
-
-.umb-checkbox-list__item.-disabled .umb-checkbox-list__item-text  {
-    cursor: not-allowed;
-}
-
-.umb-checkbox-list__item-caption {
-    font-size: 12px;
-    margin-left: 2px;
-}
-
-.umb-checkbox-list__no-data {
-  text-align: center;
-  padding-top: 50px;
-  color: @gray-7;
-  font-size: 16px;
-  line-height: 1.8em;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-checkmark.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-checkmark.less
deleted file mode 100644
index 6ab6169eec..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-checkmark.less
+++ /dev/null
@@ -1,79 +0,0 @@
-.umb-checkmark {
-    border: 2px solid @white;
-    width: 25px;
-    height: 25px;
-    border: 1px solid @ui-action-discreet-border;
-    border-radius: 3px;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: @ui-selected-type;
-    cursor: pointer;
-    font-size: 15px;
-    &:hover {
-        border-color:@ui-action-discreet-border-hover;
-        color: @ui-selected-type-hover;
-    }
-}
-
-.umb-checkmark__action {
-    &:hover,
-    &:focus {
-        .umb-checkmark {
-            border-color:@ui-action-discreet-border-hover;
-            color: @ui-selected-type-hover;
-        }
-    }
-}
-
-.umb-checkmark--checked {
-    background: @ui-selected-border;
-    border-color: @ui-selected-border;
-    color: @white;
-
-    &:hover {
-        background: @ui-selected-border-hover;
-        border-color: @ui-selected-border-hover;
-        color: @white;
-    }
-}
-
-.umb-checkmark__action {
-    &:hover,
-    &:focus {
-        .umb-checkmark--checked {
-            background: @ui-selected-border-hover;
-            border-color: @ui-selected-border-hover;
-            color: @white;
-        }
-    }
-}
-
-.umb-checkmark--xs {
-    width: 20px;
-    height: 20px;
-    font-size: 13px;
-}
-
-.umb-checkmark--s {
-    width: 25px;
-    height: 25px;
-}
-
-.umb-checkmark--m {
-    width: 30px;
-    height: 30px;
-}
-
-.umb-checkmark--l {
-    width: 40px;
-    height: 40px;
-    font-size: 18px;
-}
-
-.umb-checkmark--xl {
-    width: 50px;
-    height: 50px;
-    font-size: 20px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
deleted file mode 100644
index 937f746c56..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
+++ /dev/null
@@ -1,71 +0,0 @@
-.umb-child-selector__child {
-  background: @gray-10;
-  padding: 5px 15px;
-  margin-bottom: 5px;
-  min-width: 300px;
-  display: flex;
-  animation: fadeIn 0.5s;
-}
-
-.umb-child-selector__child.-parent {
-  background: @gray-9;
-  padding-top: 10px;
-  padding-bottom: 10px;
-}
-
-.umb-child-selector__child.-placeholder {
-  border: 1px dashed @gray-8;
-  background: none;
-  text-align: center;
-  justify-content: center;
-  width: 100%;
-  color: @ui-action-type;
-
-  &:hover {
-      color: @ui-action-type-hover;
-      border-color: @ui-action-type-hover;
-      text-decoration: none;
-  }
-}
-
-.umb-child-selector__children-container {
-    margin-left: 30px;
-
-    .umb-child-selector__child.ui-sortable-handle {
-        cursor: move;
-    }
-}
-
-.umb-child-selector__child-description {
-  flex: 1;
-}
-
-.umb-child-selector__child-icon-holder {
-  margin-right: 5px;
-  width: 20px;
-  text-align: center;
-  display: inline-block;
-}
-
-.umb-child-selector__child-icon {
-  font-size: 16px;
-  vertical-align: middle;
-}
-
-.umb-child-selector__child-name {
-  font-size: 14px;
-}
-/*
-.umb-child-selector__child-name.-blue {
-  color: @turquoise-d1;
-}
-*/
-.umb-child-selector__child-actions {
-  flex: 0 0 50px;
-  text-align: right;
-}
-
-.umb-child-selector__child-remove {
-  background: none;
-  border: none;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-code-snippet.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-code-snippet.less
deleted file mode 100644
index 8f58845780..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-code-snippet.less
+++ /dev/null
@@ -1,55 +0,0 @@
-.umb-code-snippet {
-
-    .umb-code-snippet__header {
-        box-sizing: content-box;
-        background-color: @gray-10;
-        display: flex;
-        flex-direction: row;
-        font-size: .8rem;
-        border: 1px solid @gray-8;
-        border-radius: 3px 3px 0 0;
-        border-bottom: 0;
-        margin-top: 16px;
-        min-height: 30px;
-
-        .language {
-            display: flex;
-            align-items: center;
-            justify-content: flex-start;
-            flex-grow: 1;
-            padding: 2px 10px;
-            text-transform: uppercase;
-        }
-
-        button {
-            background-color: transparent;
-            border: none;
-            border-left: 1px solid @gray-8;
-            border-radius: 0;
-            color: #000;
-
-            &:hover {
-                background-color: @grayLighter;
-            }
-        }
-    }
-
-    .umb-code-snippet__content {
-        pre {
-            border-radius: 0 0 3px 3px;
-            overflow: auto;
-            white-space: nowrap;
-        }
-    }
-
-    &--wrap {
-        pre {
-            word-wrap: break-word;
-
-            code {
-                white-space: pre-wrap;
-                word-wrap: break-word;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-picker.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-picker.less
deleted file mode 100644
index 4634f33dbd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-picker.less
+++ /dev/null
@@ -1,23 +0,0 @@
-.umb-color-picker {
-
-    .sp-replacer {
-        display: inline-flex;
-        margin-right: 12px;
-        height: 32px;
-        padding: 5px;
-
-        &.sp-light {
-            background-color: @white; 
-        }
-
-        .sp-dd {
-            line-height: 2rem;
-        }
-    }
-}
-
-.umb-color-picker[readonly] {
-    .sp-replacer {
-        cursor: not-allowed;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
deleted file mode 100644
index cd3bf3c4dc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
+++ /dev/null
@@ -1,106 +0,0 @@
-.umb-color-swatches {
-    display: flex;
-    flex-flow: row wrap;
-
-    .umb-color-box {
-        border: 1px solid rgba(0,0,0,0.15);
-        color: @white;
-        cursor: pointer;
-        padding: 1px;
-        text-align: center;
-        text-decoration: none;
-        margin: 5px;
-        border-radius: 3px;
-        width: 30px;
-        height: 30px;
-        transition: box-shadow .3s;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-
-        &:hover, &:focus {
-            box-shadow: 0 1px 3px fade(@black, 12%), 0 1px 2px fade(@black, 24%);
-        }
-
-        &.umb-color-box--xs {
-            width: 27px;
-            height: 27px;
-        }
-
-        &.umb-color-box--s {
-            width: 30px;
-            height: 30px;
-        }
-
-        &.umb-color-box--m {
-            width: 40px;
-            height: 40px;
-
-            .check_circle {
-                width: 25px;
-                height: 25px;
-            }
-        }
-    }
-
-    &.with-labels {
-
-        .umb-color-box {
-            width: 130px;
-            height: auto;
-            display: flex;
-            flex-flow: row wrap;
-            border: 1px solid @gray-8;
-
-            .umb-color-box-inner {
-                display: flex;
-                flex-flow: column wrap;
-                flex: 0 0 100%;
-                max-width: 100%;
-                min-height: 80px;
-                padding: 0;
-
-                .check_circle {
-                    margin: 15px auto;
-                }
-
-                .umb-color-box__label {
-                    background: @white;
-                    font-size: 14px;
-                    padding: 1px 5px;
-                    min-height: 45px;
-                    max-width: calc(100% - 8px);
-                    margin-top: auto;
-                    margin-bottom: -3px;
-                    margin-left: -1px;
-                    margin-right: -1px;
-                    text-indent: 0;
-                    text-align: left;
-                    border-top: 1px solid @gray-8;
-                    border-bottom: 1px solid @gray-8;
-                    border-bottom-left-radius: 3px;
-                    border-bottom-right-radius: 3px;
-                    overflow: hidden;
-
-                    .umb-color-box__name {
-                        color: @black;
-                        font-weight: bold;
-                        margin-top: 3px;
-                    }
-
-                    .umb-color-box__description {
-                        font-size: 12px;
-                        line-height: 1.5em;
-                        color: @gray-3;
-                    }
-                }
-            }
-        }
-    }
-}
-
-.umb-color-swatches[readonly] {
-    .umb-color-box {
-        cursor: not-allowed;
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
deleted file mode 100644
index 112194f012..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
+++ /dev/null
@@ -1,98 +0,0 @@
-// OVERLAY
-.umb_confirm-action__overlay {
-    position: absolute;
-    z-index: 999999;
-    display: flex;
-}
-
-// positions
-.umb_confirm-action__overlay.-top {
-    top: -50px;
-    right: auto;
-    bottom: auto;
-    left: 0;
-    animation: fadeInUp 0.2s;
-    flex-direction: column;
-}
-
-.umb_confirm-action__overlay.-right {
-    top: 0;
-    right: -50px;
-    bottom: auto;
-    left: auto;
-    animation: fadeInLeft 0.2s;
-    flex-direction: row;
-}
-
-.umb_confirm-action__overlay.-bottom {
-    top: auto;
-    right: auto;
-    bottom: -50px;
-    left: 0;
-    animation: fadeInDown 0.2s;
-    flex-direction: column;
-}
-
-.umb_confirm-action__overlay.-left {
-    top: 0;
-    right: auto;
-    bottom: auto;
-    left: -50px;
-    animation: fadeInRight 0.2s;
-    flex-direction: row;
-}
-
-.umb_confirm-action__overlay {
-
-    .umb_confirm-action__overlay-action {
-        margin-right: 5px;
-
-        &.-confirm {
-            order: 1;
-        }
-
-        &.-cancel {
-            order: 2;
-        }
-    }
-
-    // BUTTONS
-    .umb_confirm-action__overlay-action {
-        width: 20px;
-        height: 20px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        color: @white;
-        border-radius: 40px;
-        box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26);
-        font-size: 18px;
-        cursor: pointer;
-        user-select: none;
-
-        &:hover {
-            text-decoration: none;
-            color: @white;
-        }
-
-        // confirm button
-        &.-confirm {
-            background: @white;
-            color: @green !important;
-
-            &:hover {
-                color: @green !important;
-            }
-        }
-
-        // cancel button
-        &.-cancel {
-            background: @white;
-            color: @red !important;
-
-            &:hover {
-                color: @red !important;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
deleted file mode 100644
index a55a720878..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
+++ /dev/null
@@ -1,145 +0,0 @@
-.umb-content-grid {
-   display: grid;
-   grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
-   grid-template-rows: auto;
-   grid-gap: 15px;
-}
-
-.umb-content-grid__item {
-   background: @white;
-   flex: 0 1 200px;
-   position: relative;
-   user-select: none;
-   box-shadow: 0 1px 2px 0 rgba(0,0,0,0.16);
-   border-radius: 3px;
-}
-
-.umb-content-grid__item.-clickable {
-   cursor: pointer;
-}
-
-.umb-content-grid__item.-selected,
-.umb-content-grid__item.-clickable:hover {
-   &::before {
-      content: "";
-      position: absolute;
-      z-index: 2;
-      top: -2px;
-      left: -2px;
-      right: -2px;
-      bottom: -2px;
-      border: 2px solid @ui-selected-border;
-      border-radius: 5px;
-      box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
-      pointer-events: none;
-      transition: opacity 100ms;
-   }
-}
-
-.umb-content-grid__item:hover {    
-    &::before {
-        opacity: .2;
-    }
-}
-.umb-content-grid__item.-selected:hover {    
-    &::before {
-        opacity: .75;
-    }
-}
-
-
-.umb-content-grid__icon-container {
-   height: 75px;
-   display: flex;
-   align-items: center;
-   justify-content: center;
-}
-
-.umb-content-grid__icon,
-.umb-content-grid__icon[class^="icon-"],
-.umb-content-grid__icon[class*=" icon-"] {
-   font-size: 20px;
-   margin-right: 5px;
-}
-
-.umb-content-grid__content {
-   box-sizing: border-box;
-   padding: 15px;
-}
-
-.umb-content-grid__item-name {
-    position: relative;
-    padding: 5px;
-    margin: -5px -5px 15px -5px;
-   font-weight: bold;
-   line-height: 1.4em;
-   display: inline-flex;
-   
-   color: @ui-option-type;
-   &:hover, &:focus {
-       text-decoration: none;
-       color:@ui-option-type-hover;
-   }
-}
-
-.umb-content-grid__item-name:hover span {
-    text-decoration: underline;
-}
-
-.umb-content-grid__item-name.-light {
-   color: @gray-5;
-}
-
-.umb-content-grid__details-list {
-   list-style: none;
-   margin-bottom: 0;
-   margin-left: 0;
-   font-size: 12px;
-}
-
-.umb-content-grid__details-list.-light {
-   color: @gray-5;
-}
-
-.umb-content-grid__details-label {
-   font-weight: bold;
-   display: inline;
-}
-
-.umb-content-grid__details-value {
-   display: inline;
-   word-break: break-word;
-   margin-left: 3px;
-}
-
-.umb-content-grid__checkmark {
-   position: absolute;
-   top: 10px;
-   right: 10px;
-   border: 2px solid @white;
-   width: 26px;
-   height: 26px;
-   background: @green;
-   border-radius: 50px;
-   box-sizing: border-box;
-   display: flex;
-   justify-content: center;
-   align-items: center;
-   color: @white;
-   cursor: pointer;
-}
-
-.umb-content-grid__item:hover .umb-content-grid__action:not(.-selected) {
-   opacity: 1;
-   animation: fadeIn;
-   animation-duration: 0.2s;
-   animation-timing-function: ease-in-out;
-}
-
-.umb-content-grid__no-items {
-   font-size: 16px;
-   font-weight: bold;
-   color: @gray-8;
-   padding-top: 50px;
-   padding-bottom: 50px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-contextmenu.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-contextmenu.less
deleted file mode 100644
index 8512e2020d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-contextmenu.less
+++ /dev/null
@@ -1,75 +0,0 @@
-.umb-contextmenu {
-    margin: 0;
-    list-style: none;
-    user-select: none;
-    
-    overflow: hidden;
-    border-radius: 3px;
-    border: 1px solid @dropdownBorder;
-    .box-shadow(0 5px 20px rgba(0,0,0,.3));
-    border-bottom: 1px solid rgba(0,0,0,.2);
-
-    .sep {
-        display: block;
-        border-top: 1px solid @gray-9;
-
-        &:first-child {
-            border-top: none;
-        }
-    }
-
-}
-
-.umb-contextmenu-item {
-    
-    .icon {
-        font-size: 18px;
-        vertical-align: middle;
-    }
-
-    .menu-label {
-        display: inline-block;
-        vertical-align: middle;
-        margin-left: 5px;
-    }
-
-    button {
-        
-        position: relative;
-
-        display: block;
-        font-weight: normal;
-        line-height: @baseLineHeight;
-        white-space: nowrap;
-
-        background-color: @ui-option;
-        border: 0;
-        padding: 7px 12px;
-        color: @ui-option-type;
-        width: 100%;
-
-        font-size: 14px;
-        text-align: left;
-        
-        &:hover {
-            text-decoration: none;
-            color: @ui-option-type-hover;
-            background-color: @ui-option-hover;
-        }
-    }
-
-    &.-opens-dialog {
-        .menu-label:after {
-            // adds an ellipsis (...) after the menu label for actions that open a dialog
-            content: '\2026';
-        }
-    }
-    button:disabled {
-        cursor: not-allowed;
-        color: @ui-option-disabled-type;
-        &:hover {
-            color: @ui-option-disabled-type-hover;
-            background-color: @ui-option;
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-date-time-picker.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-date-time-picker.less
deleted file mode 100644
index bee757a90d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-date-time-picker.less
+++ /dev/null
@@ -1,38 +0,0 @@
-umb-date-time-picker {
-  &.--disabled {
-    cursor: not-allowed;
-    pointer-events: none;
-    user-select: none;
-  }
-}
-
-.flatpickr-calendar {
-    border-radius: @baseBorderRadius;
-    box-shadow: 0 5px 10px 0 rgba(0,0,0,0.16);
-}
-
-.flatpickr-day {
-    border-radius: @baseBorderRadius;
-    border: none;
-
-    &.today:not(.active) {
-        border: 1px solid;
-    }
-
-    &:hover {
-        background-color: @gray-10;
-    }
-
-    &.selected, &.startRange, &.endRange {
-        background-color: @ui-selected-type !important;
-        border-color: @ui-selected-type !important;
-
-        &:hover {
-            background-color: @ui-selected-type-hover !important;
-        }
-
-        &.startRange + .endRange:not(:nth-child(7n+1)) {
-            box-shadow: -10px 0 0 @ui-selected-type !important;
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-dropdown.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-dropdown.less
deleted file mode 100644
index 3361329015..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-dropdown.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.umb-dropdown {
-    .umb-property-editor--limit-width();
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
deleted file mode 100644
index dcb5130968..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
+++ /dev/null
@@ -1,255 +0,0 @@
-.umb-sub-views-nav-item {
-    position: relative;
-    display: block;
-
-    &__action,
-    > a {
-        position: relative;
-        background: transparent;
-        text-align: center;
-        cursor: pointer;
-        display: block;
-        padding: 4px 10px 0 10px;
-        min-width: 70px;
-        border: 0 none;
-        border-right: 1px solid @gray-9;
-        box-sizing: border-box;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        height: calc(~'@{editorHeaderHeight}'- ~'1px'); // need to offset the 1px border-bottom on .umb-editor-header - avoids overflowing top of the container
-        color: @ui-active-type;
-        user-select: none;
-
-        &:hover {
-            color: @ui-active-type-hover  !important;
-            text-decoration: none;
-        }
-
-        &:disabled {
-            pointer-events: none;
-            color: @gray-6;
-        }
-
-        &::before {
-            content: "";
-            position: absolute;
-            height: 0px;
-            left: 8px;
-            right: 8px;
-            background-color: @ui-light-active-border;
-            bottom: 0;
-            border-radius: 3px 3px 0 0;
-            opacity: 0;
-            transition: all .2s linear;
-        }
-
-        &.is-active {
-            color: @ui-light-active-type !important;
-
-            &::before {
-                opacity: 1;
-                height: 4px;
-            }
-        }
-
-        // Validation
-        .show-validation &.-has-error {
-            color: @red;
-
-            &:hover {
-                color: @red !important;
-            }
-
-            &::before {
-                background-color: @red;
-            }
-
-            &:not(.is-active) {
-                .badge {
-                    animation-duration: 1.4s;
-                    animation-iteration-count: infinite;
-                    animation-name: umb-sub-views-nav-item--badge-bounce;
-                    animation-timing-function: ease;
-                }
-                .badge.--error-badge {
-                    display: block;
-                }
-            }
-        }
-
-        .show-validation.show-validation-type-warning &.-has-error {
-            color: @yellow-d2;
-            &:hover {
-                color: @yellow-d2 !important;
-            }
-            &::before {
-                background-color: @yellow-d2;
-            }
-        }
-    }
-
-    &__action:active,
-    & > a:active {
-        .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
-    }
-
-    & > &__anchor_dropdown.is-expanded,
-    &:hover > &__anchor_dropdown {
-        visibility: visible;
-        opacity: 1;
-        transition: opacity 20ms 0;
-    }
-
-    .icon {
-        font-size: 24px;
-        display: block;
-        text-align: center;
-        margin-bottom: 7px;
-    }
-
-    .badge {
-        position: absolute;
-        top: 6px;
-        right: 6px;
-        min-width: 16px;
-        color: @white;
-        background-color: @ui-active-type;
-        border: 2px solid @white;
-        border-radius: 50%;
-        font-size: 10px;
-        font-weight: bold;
-        padding: 2px;
-        line-height: 16px;
-        display: block;
-
-        &:empty {
-            height: 12px;
-            min-width: 12px;
-        }
-        &.--error-badge {
-            display: none;
-            font-weight: 900;
-            background-color: @red;
-
-            .show-validation-type-warning & {
-                background-color: @yellow-d2;
-            }
-        }
-    }
-
-    &-text {
-        font-size: 12px;
-        line-height: 1em;
-    }
-
-    &__anchor_dropdown {
-        // inherits from .dropdown-menu
-        margin: 0;
-
-        // center align horizontal
-        left: 50%;
-        transform: translateX(-50%);
-        opacity: 0;
-        transition: opacity 250ms 250ms;
-        visibility: hidden;
-
-        li {
-            &.is-active a {
-                border-left-color: @ui-active-border;
-            }
-            
-            a {
-                border-left: 4px solid transparent;
-            }
-        }
-    }
-
-    // Currently Edge 18 does unfortunately not support :focus-within so for now we will use the "old" behavior - Support is coming with the upcoming release of Edge 76
-    // See https://caniuse.com/#search=focus-within
-    @supports (-ms-ime-align:auto) {
-        &:hover &__anchor_dropdown {
-            transition: visibility 0 0, opacity 20ms 0;
-        }
-
-        &__anchor_dropdown {
-            visibility: hidden;
-            transition: visibility 0 500ms, opacity 250ms 250ms;
-        }
-    }
-    
-    // --------------------------------
-    // item__more, appears when there is not enough room for the visible items.
-    // --------------------------------
-
-    &-more__icon {
-        margin-bottom: 10px;
-
-        i {
-            height: 5px;
-            width: 5px;
-            border-radius: 50%;
-            background: @ui-active-type; // fallback if browser doesnt support currentColor
-            background: currentColor;
-            display: inline-block;
-            margin: 0 5px 0 0;
-        }
-
-        i:last-of-type {
-            margin-right: 0;
-        }
-    }
-
-    &-more__dropdown {
-        left: auto;
-        right: 0;
-        display: grid;
-        grid-template-columns: 1fr 1fr 1fr;
-        min-width: auto;
-        margin-top: 10px;
-
-        > li {
-            display: flex;
-        }
-
-        .umb-sub-views-nav-item:first {
-            border-left: none;
-        }
-    }
-}
-
-.umb-sub-views-nav-item-more {
-    .umb-sub-views-nav-item__action {
-        &.-has-error {
-            &.is-active {
-                color: @red !important;
-
-                .badge {
-                    display: block;
-                    animation-duration: 1.4s;
-                    animation-iteration-count: infinite;
-                    animation-name: umb-sub-views-nav-item--badge-bounce;
-                    animation-timing-function: ease;
-                }
-
-                &.-active-has-error {
-                    color: @ui-light-active-type !important;
-
-                    .badge {
-                        display: none;
-                    }
-                }
-            }
-        }
-    }
-}
-
-@keyframes umb-sub-views-nav-item--badge-bounce {
-    0%   { transform: translateY(0); }
-    20%  { transform: translateY(-6px); }
-    40%  { transform: translateY(0); }
-    55%  { transform: translateY(-3px); }
-    70%  { transform: translateY(0); }
-    100% { transform: translateY(0); }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
deleted file mode 100644
index 985765e53a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
+++ /dev/null
@@ -1,6 +0,0 @@
-.umb-sub-views-nav {
-  list-style: none;
-  display: flex;
-  margin: 0;
-  border-left: 1px solid @gray-9;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-sub-views.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-sub-views.less
deleted file mode 100644
index ac034cf33b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-sub-views.less
+++ /dev/null
@@ -1,23 +0,0 @@
-/* --------- COLUMNS --------- */
-
-.sub-view-columns {
-  display: flex;
-  margin-bottom: 40px;
-}
-
-.sub-view-columns h5 {
-  margin-top: 0;
-}
-
-.sub-view-column-left {
-  flex: 0 0 250px;
-  margin-right: 70px;
-}
-
-.sub-view-column-right {
-  flex: 1;
-}
-
-.sub-view-column-section {
-  margin-bottom: 20px;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-empty-state.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-empty-state.less
deleted file mode 100644
index 9173344112..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-empty-state.less
+++ /dev/null
@@ -1,23 +0,0 @@
-.umb-empty-state {
-	font-size: @fontSizeMedium;
-	line-height: 1.8em;
-	color: @gray-4;
-	text-align: center;
-}
-
-.umb-empty-state.-small {
-	font-size: 14px;
-}
-
-.umb-empty-state.-large {
-	font-size: @fontSizeLarge;
-}
-
-.umb-empty-state.-center {
-	position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%,-50%);
-    width: 80%;
-    max-width: 400px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less
deleted file mode 100644
index 284a7a8007..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less
+++ /dev/null
@@ -1,121 +0,0 @@
-
-.umb-file-dropzone {
-  // drop zone
-  // tall and small version - animate height
-  .dropzone {
-    height: 400px;
-    width: auto;
-    padding: 50px 0;
-    border: 1px dashed @gray-8;
-    background-color: @white;
-    text-align: center;
-    color: @gray-3;
-    margin: 0 0 20px 0;
-    position: relative;
-    transition: height 0.8s;
-
-    .illustration {
-      width: 300px;
-    }
-
-    &.is-small {
-      height: 100px;
-
-      .illustration {
-        width: 200px;
-      }
-    }
-
-    &.drag-over {
-      border: 1px dashed @gray-1;
-    }
-  }
-  // center the content of the drop zone
-  .content {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%,-50%);
-    display: flex;
-    flex-direction: column;
-  }
-  // file select link
-  .file-select {
-    background: transparent;
-    border: 0;
-    padding: 0;
-    font-size: 15px;
-    color: @ui-action-discreet-type;
-    cursor: pointer;
-    margin-top: 10px;
-
-    &:hover {
-      color: @ui-action-discreet-type-hover;
-      text-decoration: none;
-    }
-  }
-  // uploading / uploaded file list
-  .file-list {
-    list-style: none;
-    margin: 0 0 30px 0;
-    background: @gray-10;
-    padding: 10px 20px;
-
-    .file {
-      padding: 5px 0;
-      position: relative;
-      border-top: 1px solid @gray-8;
-
-      &:first-child {
-        border-top: none;
-      }
-
-      &.ng-enter {
-        animation: fadeIn 0.5s;
-      }
-
-      &.ng-leave {
-        animation: fadeOut 2s;
-      }
-
-      .file-description {
-        color: @gray-3;
-        font-size: 12px;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        width: 100%;
-      }
-
-      .file-messages, .file-messages span {
-        display: block;
-      }
-
-      .file-upload-progress {
-        display: block;
-        width: 100%;
-      }
-
-      .ok-all {
-          margin-left: auto;
-      }
-    }
-  }
-  // progress bars
-  // could be moved to its own less file
-  .file-progress {
-    height: 4px;
-    position: relative;
-    padding: 2px;
-
-    .file-progress-indicator {
-      display: block;
-      height: 100%;
-      border-radius: 20px;
-      background-color: @green;
-      position: relative;
-      overflow: hidden;
-      width: 0;
-    }
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-icon.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-file-icon.less
deleted file mode 100644
index c795f380c9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-icon.less
+++ /dev/null
@@ -1,52 +0,0 @@
-.umb-file-icon {
-    text-align: center;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    &__inner {
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        position: relative;
-
-        > .icon {
-            font-size: 50px;
-            line-height: 100%;
-            color: @gray-4;
-            display: block;
-            text-align: center;
-        }
-    }
-
-    &__extension {
-        position: absolute;
-        color: @ui-active-type;
-        background: @ui-active;
-        padding: 1px 3px;
-        font-size: 10px;
-        line-height: 130%;
-        display: block;
-        margin-bottom: 0.75rem;
-        min-width: 1.2rem;
-        bottom: 0;
-    }
-
-    &__text {
-        display: block;
-        margin-top: 0.25rem;
-    }
-}
-
-.umb-file-icon--m {
-    .umb-file-icon__inner {
-        > .icon {
-            font-size: 70px;
-        }
-    }
-    .umb-file-icon__extension {
-        font-size: 14px;
-        margin-bottom: 0.95rem;
-        min-width: 1.5rem;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-filter.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-filter.less
deleted file mode 100644
index 7432555472..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-filter.less
+++ /dev/null
@@ -1,13 +0,0 @@
-.umb-filter {
-    position: relative;
-}
-
-.umb-filter .umb-filter__toggle {
-    display: flex;
-}
-
-.umb-filter .umb-filter__label {
-    margin-left: 5px;
-    margin-right: 3px;
-    max-width: 150px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
deleted file mode 100644
index 6a93a10e9f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-folder-grid.less
+++ /dev/null
@@ -1,90 +0,0 @@
-.umb-folder-grid {
-   display: flex;
-   flex-direction: row;
-   flex-wrap: wrap;
-   width: 100%;
-   margin-bottom: 30px;
-}
-
-.umb-folder-grid__folder {
-   background: @white;
-   margin: 5px;
-   display: flex;
-   align-items: center;
-   padding: 10px 20px;
-   box-sizing: border-box;
-   flex: 1 1 200px;
-   transition: border 0.2s;
-   position: relative;
-   justify-content: space-between;
-   cursor: pointer;
-   user-select: none;
-   box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
-   border-radius: 3px;
-   
-   transition: box-shadow 150ms ease-in-out;
-}
-
-.umb-folder-grid__folder.-selected {
-    color:@ui-selected-type;
-    &:hover {
-        color:@ui-selected-type-hover;
-    }
-}
-
-.umb-folder-grid__folder.-selected, .umb-folder-grid__folder:hover {
-    &::before {
-        content: "";
-        position: absolute;
-        z-index:2;
-        top: -2px;
-        left: -2px;
-        right: -2px;
-        bottom: -2px;
-        border: 2px solid @ui-selected-border;
-        border-radius: 5px;
-        box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
-        pointer-events: none;
-    }
-}
-.umb-folder-grid__folder:hover {
-    &::before {
-        opacity: .33;
-    }
-}
-.umb-folder-grid__folder.-selected:hover {
-    &::before {
-        opacity: .75;
-    }
-}
-
-
-.umb-folder-grid__folder:focus,
-.umb-folder-grid__folder:active {
-   text-decoration: none;
-}
-
-.umb-folder-grid__folder:hover {
-   text-decoration: none;
-}
-
-.umb-folder-grid__folder-description {
-   display: flex;
-   align-items: center;
-}
-
-.umb-folder-grid__folder-icon,
-.umb-folder-grid__folder-icon[class^="icon-"],
-.umb-folder-grid__folder-icon[class*=" icon-"] {
-   font-size: 20px;
-   margin-right: 15px;
-}
-
-.umb-folder-grid__folder-name {
-   font-size: 13px;
-   font-weight: bold;
-}
-
-.umb-folder-grid__folder-name:hover {
-   text-decoration: underline;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
deleted file mode 100644
index 26e11c7c87..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
+++ /dev/null
@@ -1,190 +0,0 @@
-@checkboxWidth: 18px;
-@checkboxHeight: 18px;
-
-.umb-form-check {
-    display: flex;
-    align-items: center;
-    position: relative;
-    padding-left: 0;
-    margin: 5px 0;
-    min-height: 20px;
-    cursor: pointer !important;
-
-    .umb-form-check__info {
-        margin-left: 30px;
-        position: relative;
-    }
-
-    &.-small-text {
-        font-size: 13px;
-    }
-
-    &.-bold {
-        font-weight: 700;
-    }
-
-    &__text {
-        position: relative;
-        user-select: none;
-    }
-
-    &__input {
-        position: absolute;
-        top: 0;
-        left: 0;
-        opacity: 0;
-
-        &:hover ~ .umb-form-check__state .umb-form-check__check {
-            border-color: @inputBorderFocus;
-        }
-
-        &:checked ~ .umb-form-check__state .umb-form-check__check {
-            border-color: @ui-option-type;
-        }
-
-        &[type='checkbox']:checked ~ .umb-form-check__state .umb-form-check__check {
-            background-color: @ui-option-type;
-        }
-
-        &:checked:hover ~ .umb-form-check__state .umb-form-check__check {
-            &::before {
-                background: @ui-option-type-hover;
-            }
-        }
-
-        &:checked ~ .umb-form-check__state {
-            .umb-form-check__check {
-                // This only happens if the state has a radiobutton modifier
-                .umb-form-check--radiobutton & {
-                    &:before {
-                        opacity: 1;
-                        transform: scale(1);
-                    }
-                }
-                // This only happens if state has the checkbox modifier
-                .umb-form-check--checkbox & {
-                    &:before {
-                        width: @checkboxWidth;
-                        height: @checkboxHeight;
-                    }
-                }
-            }
-            // This only happens if state has the checkbox modifier
-            .umb-form-check--checkbox & {
-                .umb-form-check__icon {
-                    opacity: 1;
-                }
-            }
-        }
-    }
-
-    .tabbing-active &.umb-form-check--radiobutton &__input:focus ~ .umb-form-check__state .umb-form-check__check {
-        border: 2px solid @inputBorderTabFocus;
-        margin: -1px;
-    }
-
-    .tabbing-active &.umb-form-check--checkbox &__input:focus ~ .umb-form-check__state .umb-form-check__check {
-        outline: 2px solid @inputBorderTabFocus;
-    }
-
-    .tabbing-active &.umb-form-check--checkbox &__input:checked:focus ~ .umb-form-check__state .umb-form-check__check {
-        border-color: @white;
-    }
-    // add spacing between when flexed/inline, equal to the width of the input
-    .flex & + & {
-        margin-left: @checkboxWidth;
-    }
-
-    .icon,
-    .umb-icon {
-        font-size: 0.9rem;
-        line-height: 1;
-    }
-
-    &__state {
-        display: flex;
-        height: 20px;
-        width: 20px;
-        position: absolute;
-        top: 0;
-    }
-
-    &__check {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        position: relative;
-        background: @white;
-        border: 1px solid @inputBorder;
-        border-radius: @baseBorderRadius;
-        width: @checkboxWidth;
-        height: @checkboxHeight;
-
-        &:before {
-            content: "";
-            background: @ui-option-type;
-            position: absolute;
-            left: 0;
-            right: 0;
-            top: 0;
-            bottom: 0;
-            margin: auto;
-        }
-        // This only happens if state has the radiobutton modifier
-        .umb-form-check--radiobutton & {
-            border-radius: 100%;
-
-            &:before {
-                width: 10px;
-                height: 10px;
-                border-radius: 100%;
-                opacity: 0;
-                transform: scale(0);
-                transition: .15s ease-out;
-            }
-        }
-        // This only happens if state has the checkbox modifier
-        .umb-form-check--checkbox & {
-            &:before {
-                width: 0;
-                height: 0;
-                transition: .05s ease-out;
-            }
-        }
-    }
-
-    &__icon {
-        color: @white;
-        text-align: center;
-        font-size: 12px;
-        opacity: 0;
-        transition: .2s ease-out;
-        position: relative;
-        z-index: 1;
-
-        &:before {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            position: absolute;
-            top: 0;
-            right: 0;
-            left: 0;
-            bottom: 0;
-            margin: auto;
-        }
-    }
-
-    &.umb-form-check--disabled {
-        cursor: not-allowed !important;
-        opacity: 0.5;
-        pointer-events: none;
-    }
-}
-
-umb-checkbox[readonly],
-umb-radiobutton[readonly] {
-    .umb-form-check {
-        cursor: not-allowed !important;
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less
deleted file mode 100644
index 1ae476d584..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less
+++ /dev/null
@@ -1,94 +0,0 @@
-.umb-grid-selector__items {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-}
-
-.umb-grid-selector__item {
-  width: 125px;
-  height: 150px;
-  padding: 20px;
-  background: @gray-10;
-  border: 1px solid @gray-8;
-  text-align: center;
-  margin: 0 20px 20px 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  animation: fadeIn 0.5s;
-  position: relative;
-  border-radius: 3px;
-}
-
-.umb-grid-selector__item.-default {
-  border-width: 2px;
-}
-
-.umb-grid-selector__item.-placeholder {
-  border: 1px dashed @gray-8;
-  background: none;
-  cursor: pointer;
-  
-  color: @ui-option-type;
-  &:hover {
-      color: @ui-option-type-hover;
-      border-color: @ui-option-type-hover;
-      text-decoration: none;
-  }
-}
-
-.umb-grid-selector__item-content {
-  margin-top: 10px;
-}
-
-button.umb-grid-selector__item {
-    width: 169px;
-    height: 194px;
-}
-
-.umb-grid-selector__item-icon {
-    font-size: 50px;
-    color: @gray-8;
-    display: block;
-    line-height: 50px;
-    margin-bottom: 15px;
-}
-
-.umb-grid-selector__item-label {
-  font-size: 13px;
-  font-weight: bold;
-}
-
-.umb-grid-selector__item-label.-blue {
-  color: @ui-option-type;
-}
-
-.umb-grid-selector__item-remove {
-  position: absolute;
-  top: 5px;
-  right: 5px;
-  cursor: pointer;
-  color: @ui-option-type;
-  &:hover {
-      color: @ui-option-type-hover;
-  }
-}
-
-.umb-grid-selector__item-default-label {
-  font-size: 13px;
-  color: @gray-3;
-}
-
-.umb-grid-selector__item-default-label.-blue {
-  color: @ui-option-type;
-  &:hover {
-      color: @ui-option-type-hover;
-  }
-}
-
-.umb-grid-selector__item-add {
-  color: @ui-option-type;
-  &:hover {
-      color: @ui-option-type-hover;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
deleted file mode 100644
index c13a898eef..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ /dev/null
@@ -1,1127 +0,0 @@
-// TODO: General cleanup in !important (Round 2)
-
-// Gridview
-// -------------------------
-.umb-grid IFRAME {
-    overflow: hidden;
-    width: 100%;
-}
-
-
-
-// Sortable
-// -------------------------
-
-// sortable-helper
-.umb-grid .ui-sortable-helper {
-    position: absolute !important;
-    background-color: @blueMid !important;
-    height: 42px !important;
-    width: 42px !important;
-    overflow: hidden;
-    padding: 5px;
-    border-radius: 2px;
-    text-align: center;
-    font-family: "icomoon";
-    box-shadow: 3px 3px 12px 0 rgba(50, 50, 50, 0.45);
-
-    &:after {
-        line-height: 42px;
-        font-size: 22px;
-        content: "\e126";
-        color: @white;
-    }
-
-    * {
-        display: none;
-    }
-}
-
-.umb-grid .ui-sortable-helper .umb-row-title-bar,
-.umb-grid .ui-sortable-helper .cell-tools-add {
-    display: none !important;
-}
-
-// sortable-placeholder
-.umb-grid .ui-sortable-placeholder {
-    position: absolute;
-    left: 0;
-    right: 0;
-    background-color: @blueMid;
-    height: 2px;
-    margin-bottom: 20px;
-
-    &:before, &:after {
-        position: absolute;
-        top: -9px;
-        font-family: "icomoon";
-        font-size: 18px;
-        color: @blueMid;
-    }
-
-    &:before {
-        left: -5px;
-        content: "\e0e9";
-    }
-
-    &:after {
-        right: -5px;
-        content: "\e0d7";
-    }
-}
-
-.umb-grid .umb-cell .ui-sortable-placeholder {
-    left: 10px;
-    right: 10px;
-}
-
-
-
-
-// utils
-// -------------------------
-.umb-grid-width {
-    margin: 20px auto;
-    width: 100%;
-}
-
-.umb-grid .right {
-    float: right;
-}
-
-
-
-// general layout components
-// -------------------------
-.umb-grid .tb {
-    width: 100%;
-}
-
-.umb-grid .td {
-    width: 100%;
-    display: inline-block;
-    vertical-align: top;
-    box-sizing: border-box;
-}
-
-.umb-grid .middle {
-    text-align: center;
-}
-
-.umb-grid .mainTd {
-    position: relative;
-}
-
-
-
-// COLUMN
-// -------------------------
-.umb-grid .umb-column {
-    position: relative;
-}
-
-
-
-// ROW
-// -------------------------
-.umb-grid .umb-row {
-    position: relative;
-    margin-bottom: 40px;
-    padding-top: 10px;
-    border: 1px solid @grayLighter;
-
-    &:hover {
-        border-color: @grayLight;
-    }
-
-    &[ng-click],
-    &[data-ng-click],
-    &[x-ng-click] {
-        cursor: pointer;
-    }
-}
-
-.umb-grid .row-tools a {
-    text-decoration: none;
-}
-
-
-
-// CELL
-// -------------------------
-.umb-grid .umb-cell {
-    position: relative;
-}
-
-.umb-grid .umb-cell-content {
-    position: relative;
-    display: block;
-    box-sizing: border-box;
-    margin: 10px;
-    border: 1px solid transparent;
-}
-
-.umb-grid .umb-row .umb-cell-placeholder {
-    display: block;
-    width: 100%;
-    min-height: 88px;
-    border-width: 1px;
-    border-style: dashed;
-    border-color: @ui-action-discreet-border;
-    color: @ui-action-discreet-type;
-    transition: border-color 100ms linear;
-
-    &:hover {
-        border-color: @ui-action-discreet-border-hover;
-        color: @ui-action-discreet-type-hover;
-        cursor: pointer;
-    }
-
-    &:disabled {
-        cursor: not-allowed;
-        &:hover {
-            border-color: @ui-action-discreet-border;
-            color: @ui-action-discreet-type;
-        }
-    }
-}
-
-.umb-grid .umb-cell-content.-has-editors {
-    padding-top: 38px;
-    background-color: @white;
-    border-width: 1px;
-    border-style: solid;
-    border-color: @gray-8;
-
-    &:hover {
-        cursor: auto;
-    }
-}
-
-.umb-grid .umb-cell-content.-has-editors.-collapsed {
-    padding-top: 10px;
-}
-
-.umb-grid .cell-tools {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    color: @gray-3;
-    font-size: 16px;
-}
-
-.umb-grid .cell-tool {
-    cursor: pointer;
-    float: right;
-    &:hover {
-        color: @ui-action-type-hover;
-    }
-}
-
-.umb-grid .cell-tools-add {
-    color: @ui-action-discreet-type;
-    &:focus, &:hover {
-        color: @ui-action-discreet-type-hover;
-        text-decoration: none;
-    }
-
-    &:disabled {
-        cursor: not-allowed;
-        &:hover {
-            color: @ui-action-discreet-type;
-        }
-    }
-}
-
-.umb-grid .cell-tools-add.-center {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    color: @ui-action-discreet-type;
-}
-
-.umb-grid .cell-tools-add.-bar {
-    display: block;
-    width: calc(100% - 20px);
-    text-align: center;
-    padding: 5px;
-    border: 1px dashed @ui-action-discreet-border;
-    margin: 10px;
-    &:focus, &:hover {
-        border-color: @ui-action-discreet-border-hover;
-    }
-}
-
-
-.umb-grid .cell-tools-remove {
-    display: inline-block;
-    position: relative;
-}
-
-.umb-grid .cell-tools-remove .iconBox:hover,
-.umb-grid .cell-tools-remove .iconBox:hover * {
-    background: @red !important;
-    border-color: @red !important;
-}
-
-.umb-grid .cell-tools-move {
-    display: inline-block;
-}
-
-.umb-grid .cell-tools-edit {
-    display: inline-block;
-}
-
-.umb-grid .drop-overlay {
-    position: absolute;
-    z-index: 10;
-    top: 0;
-    left: 0;
-    background: @white;
-    opacity: 0.9;
-    width: 100%;
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-size: 14px;
-    box-sizing: border-box;
-    text-align: center;
-    line-height: 1.3em;
-    font-weight: bold;
-    flex-direction: column;
-}
-
-.drop-overlay.-disable {
-    color: @red;
-}
-
-.drop-overlay.-allow {
-    color: @green;
-}
-
-.umb-grid .drop-overlay .drop-icon {
-    font-size: 40px;
-    margin-bottom: 20px;
-}
-
-
-
-// CONTROL
-// -------------------------
-.umb-grid .umb-control {
-    position: relative;
-    display: block;
-    margin-left: 10px;
-    margin-right: 10px;
-    margin-bottom: 10px;
-}
-
-.umb-control-collapsed {
-    background-color: @gray-10;
-    padding: 5px 10px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: transparent;
-    cursor: move;
-}
-
-.umb-control-collapsed:hover {
-    border-color: @ui-action-border-hover
-}
-
-.umb-grid .umb-control-click-overlay {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    z-index: 5;
-    top: 0;
-    left: 0;
-    opacity: 0;
-
-    &.-clickable {
-        cursor: pointer;
-
-        &:hover {
-            background-color: @ui-action-type-hover;
-            opacity: 0.1;
-            transition: opacity 0.1s;
-        }
-    }
-}
-
-.umb-grid .umb-row-title-bar {
-    display: flex;
-    padding-left: 10px;
-    padding-right: 10px;
-}
-
-.umb-grid .umb-row-title {
-    display: inline-block;
-    cursor: pointer;
-    font-size: 15px;
-    font-weight: bold;
-    color: @black;
-    margin-right: 6px;
-}
-
-.umb-grid .row-tools {
-    display: inline-block;
-    margin-left: 10px;
-    font-size: 18px;
-    color: @gray-3;
-}
-
-.umb-grid .row-tool {
-    cursor: pointer;
-}
-
-.umb-grid .umb-add-row {
-    text-align: center;
-}
-
-
-
-// CONTROL PLACEHOLDER
-// -------------------------
-.umb-grid .umb-control-placeholder {
-    min-height: 20px;
-    position: relative;
-    text-align: center;
-    text-align: -moz-center;
-    cursor: text;
-}
-
-.umb-grid .umb-control-placeholder .placeholder {
-    font-size: 14px;
-    opacity: 0.7;
-    text-align: left;
-    padding: 5px;
-    border: 1px solid @gray-9;
-    height: 20px;
-}
-
-.umb-grid .umb-control-placeholder:hover .placeholder {
-    border: 1px solid @gray-7;
-}
-
-
-
-// EDITOR PLACEHOLDER
-// -------------------------
-.umb-grid .umb-editor-placeholder {
-    min-height: 110px;
-    padding: 20px;
-    padding-bottom: 30px;
-    position: relative;
-    background-color: @white;
-    border: 4px dashed @gray-8;
-    text-align: center;
-    text-align: -moz-center;
-    width: 100%;
-    box-sizing: border-box;
-}
-
-.umb-grid .umb-editor-placeholder .icon {
-    color: @gray-8;
-    font-size: 85px;
-    line-height: 1;
-    display: block;
-    margin: 10px auto;
-}
-
-.umb-grid .umb-editor-preview {
-    position: relative;
-    width: 100%;
-
-    .umb-editor-preview-overlay {
-        cursor: pointer;
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        z-index: 1;
-    }
-}
-
-// Active states
-// -------------------------
-
-// Row states
-.umb-grid .umb-row.-active {
-    border-color: @ui-action-type;
-
-    .umb-row-title-bar {
-        cursor: move;
-    }
-}
-
-
-.umb-grid .umb-row.-active-child {
-    background-color: @gray-10;
-
-    .umb-row-title-bar {
-        cursor: inherit;
-    }
-
-    .umb-row-title {
-        color: @gray-3;
-    }
-
-}
-
-
-// Cell states
-
-.umb-grid .umb-row .umb-cell.-active {
-    border-color: @gray-8;
-
-    .umb-cell-content.-has-editors {
-        box-shadow: 3px 3px 6px rgba(0, 0, 0, .07);
-        border-color: @ui-action-border;
-    }
-}
-
-.umb-grid .umb-row .umb-cell.-active-child {
-
-    .cell-tool {
-        color: fade(@black, 23);
-    }
-
-    .umb-cell-content.-has-editors {
-            border-color: rgba(113, 136, 160, .44);
-    }
-}
-
-// Control states 
-.umb-grid-media--controls {
-    display:none;
-    position: absolute;
-    top:0.5rem;
-    right:0.5rem;    
-}
-
-.umb-grid .umb-row .umb-control.-active {
-    .umb-grid-media--controls {
-        display:flex;
-    }
-}
-
-// Title bar and tools
-.umb-grid .umb-row-title-bar {
-    display: flex;
-}
-
-.umb-grid .umb-grid-right {
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-}
-
-.umb-grid .umb-tools {
-    margin-left: auto;
-}
-
-
-// Add more content button
-.umb-grid-add-more-content {
-    text-align: center;
-}
-
-.umb-grid .newbtn {
-    width: auto;
-    padding: 6px 15px;
-    border-style: solid;
-    font-size: 12px;
-    font-weight: bold;
-    display: inline-block;
-    margin: 10px auto 20px;
-    border-color: @gray-9;
-
-    &:hover {
-        cursor: pointer;
-        opacity: .77;
-    }
-
-    &:disabled {
-        cursor: not-allowed;
-    }
-}
-
-
-
-
-// Form elements
-// -------------------------
-.umb-grid textarea.textstring {
-    display: block;
-    overflow: hidden;
-    background: @white;
-    outline: none;
-    resize: none;
-    color: @gray-3;
-    min-width: 100%;
-}
-
-.umb-grid .umb-cell-media .caption {
-    display: block;
-    overflow: hidden;
-    border: none;
-    background: @white;
-    outline: none;
-    width: 98%;
-    resize: none;
-    font-style: italic;
-}
-
-.umb-grid .cellPanelRte {
-    min-height: 60px;
-}
-
-.umb-grid .umb-cell-embed iframe {
-    width: 100%;
-}
-
-
-// ICONS
-// -------------------------
-.umb-grid .iconBox {
-    padding: 6px;
-    display: flex;
-    border-radius: 200px;
-    border: 1px solid @ui-action-discreet-border;
-    margin: 0 auto;
-
-    &:hover, &:hover * {
-        background: @ui-action-discreet-type-hover !important;
-        color: @white !important;
-        border-color: @ui-action-discreet-border-hover !important;
-        text-decoration: none;
-    }
-}
-
-.umb-grid .iconBox span.prompt {
-    display: block;
-    white-space: nowrap;
-    text-align: center;
-}
-
-.umb-grid .iconBox span.prompt > a {
-    text-decoration: underline;
-}
-
-.umb-grid .iconBox a:hover {
-    text-decoration: none;
-    color: @white !important;
-}
-
-.umb-grid .iconBox.selected {
-    -webkit-appearance: none;
-    background-image: linear-gradient(to bottom,@gray-9,@gray-7);
-    background-repeat: repeat-x;
-    border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
-    box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
-    border-radius: 3px;
-    background: transparent;
-}
-
-.umb-grid .iconBox i {
-    color: @gray-3;
-    display: block;
-    font-size: 16px;
-    line-height: inherit;
-}
-
-.umb-grid .help-text {
-    color: @black;
-    font-size: 14px;
-    font-weight: bold;
-    display: inline-block;
-    clear: both;
-}
-
-// TINYMCE EDITOR
-// -------------------------
-
-.umb-grid .mce-panel {
-    background: transparent !important;
-    border: none !important;
-    clear: both;
-}
-
-.umb-grid .mce-btn {
-    button {
-        padding-top: 8px;
-        padding-bottom: 8px;
-        padding-left: 6px;
-        line-height: inherit;
-
-        .mce-caret {
-            margin-top: 6px;
-        }
-    }
-
-    &:not(.mce-menubtn) {
-        button {
-            padding-right: 6px;
-        }
-    }
-}
-
-.umb-grid .mce-toolbar {
-    border-bottom: 1px solid @gray-7;
-    background-color: @white;
-    display: none;
-
-    left: 0;
-    right: 0;
-}
-
-.umb-grid .umb-control.-active .mce-toolbar {
-    display: block;
-}
-
-.umb-grid .mce-flow-layout-item {
-    margin: 0;
-}
-
-.umb-grid .mceContentBody {
-    overflow-y: hidden!important;
-}
-
-// had to overwrite defaults from TinyMCE, needed for buttons panel to float to new line in narrow space.
-.umb-grid .mce-container > div {
-    white-space: normal;
-    left:0;
-    right:0;
-}
-
-
-// MEDIA EDITOR
-// -------------------------
-.umb-grid .fullSizeImage {
-    width: 100%;
-}
-
-
-
-// Width
-// -------------------------
-.umb-grid .boxWidth {
-    text-align: right;
-    margin-bottom: 10px;
-}
-
-.umb-grid .boxWidth input {
-    text-align: center;
-    width: 40px;
-}
-
-.umb-grid .boxWidth label {
-    font-size: 10px;
-    padding: 0;
-    margin: 5px 5px 0 0;
-    color: @gray-5;
-}
-
-
-
-// Margin Control
-// -------------------------
-.umb-grid .umb-control {
-    border-width: 1px;
-    border-style: solid;
-    border-color: transparent;
-}
-
-.umb-grid .umb-control.-active {
-    border-color: @ui-action-border;
-}
-
-.umb-grid .umb-templates-columns {
-    margin-top: 30px;
-}
-
-.umb-grid .umb-control-inner {
-    position: relative;
-}
-
-.umb-grid .umb-control-bar {
-    opacity: 0;
-    background: @ui-action-type;
-    padding: 2px 5px;
-    color: @white;
-    font-size: 12px;
-    height: 0;
-    display: flex;
-    transition: height 80ms linear, opacity 80ms linear;
-    align-items: center;
-}
-
-.umb-grid .umb-control-title {
-    display: flex;
-    align-items: center;
-    font-weight: bold;
-}
-
-.umb-grid .umb-control.-active .umb-control-bar {
-    opacity: 1;
-    height: 25px;
-    cursor: move;
-}
-
-.umb-grid .umb-control-tools {
-    display: inline-block;
-    margin-left: 10px;
-}
-
-.umb-grid .umb-control-tool {
-    font-size: 16px;
-    margin-right: 5px;
-    position: relative;
-    cursor: pointer;
-    display: inline-block;
-}
-
-.umb-grid .cell-tools,
-.umb-grid .umb-control-tool {
-    .btn-icon {
-        padding: 0;
-    }
-}
-
-.umb-grid .umb-control-tool .btn-icon {
-    color: @white;
-}
-
-
-// Template
-// -------------------------
-.umb-grid .umb-templates {
-    text-align: center;
-    overflow: hidden;
-    width: 100%;
-}
-
-.umb-grid .umb-templates-template {
-    display: inline-block;
-    width: 100px;
-    padding-right: 30px;
-    margin: 20px;
-}
-
-.umb-grid .umb-templates-template a.tb:hover {
-    border: 5px solid @blueMid;
-}
-
-.umb-grid .umb-templates-template .tb {
-    width: 100%;
-    height: 150px;
-    padding: 10px;
-    background-color: @gray-10;
-    border: 5px solid @gray-8;
-    cursor: pointer;
-    position: relative;
-}
-
-.umb-grid .umb-templates-template .tr {
-    height: 100%;
-    position: relative;
-}
-
-.umb-grid .umb-templates-template .tb .umb-templates-column {
-    height: 100%;
-    border: 1px dashed @gray-8;
-    border-right: none;
-}
-
-.umb-grid .umb-templates-template .tb .umb-templates-column.last {
-    border-right: 1px dashed @gray-8 !important;
-}
-
-.umb-grid a.umb-templates-column:hover,
-.umb-grid a.umb-templates-column.selected {
-    background-color: @blueMid;
-}
-
-
-
-// Template Column
-// -------------------------
-/* New template preview */
-.umb-grid {
-    .templates-preview {
-        display: inline-block;
-        width: 100%;
-        text-align: center;
-
-        small {
-            position: absolute;
-            width: 100%;
-            left: 0;
-            padding-top: 15px;
-            top: 15px;
-        }
-
-        .help-text {
-            margin: 35px 35px 0 0;
-        }
-    }
-
-    .preview-rows {
-        display: inline-block;
-        position: relative;
-        box-sizing: border-box;
-        width: 125px;
-        margin: 15px;
-        border: 3px solid @gray-8;
-        transition: border 100ms linear;
-
-        &.prevalues-rows {
-            margin: 0 20px 20px 0;
-            width: 80px;
-            float: left;
-        }
-
-        &.prevalues-templates {
-            margin: 0 20px 20px 0;
-            float: left;
-        }
-
-        &:hover {
-            border-color: @blueMid;
-            cursor: pointer;
-        }
-
-        .preview-row {
-            display: inline-block;
-            width: 100%;
-            vertical-align: bottom;
-        }
-    }
-
-    .preview-rows.layout {
-        padding: 2px;
-
-        .preview-row {
-            height: 100%;
-        }
-
-        .preview-col {
-            height: 180px;
-        }
-
-        .preview-cell {
-            background-color: @gray-10;
-        }
-
-        .preview-overlay {
-            display: none;
-        }
-    }
-
-    .preview-rows.columns {
-        min-height: 16px;
-        line-height: 11px;
-        padding: 1px;
-
-        &.prevalues-rows {
-            min-height: 30px;
-        }
-    }
-
-    .preview-rows {
-        .preview-col {
-            display: block;
-            float: left;
-            box-sizing: border-box;
-            width: 33.3%;
-
-            /* temp value */
-            height: 10px;
-            margin: 0;
-            border: 1px solid @white;
-
-            .preview-cell {
-                display: block;
-                width: 100%;
-                height: 100%;
-                background-color: @gray-8;
-                margin: 0 1px 1px 0;
-            }
-        }
-
-        &.prevalues-templates {
-            .preview-col {
-                height: 80px;
-            }
-        }
-    }
-
-    .preview-overlay {
-        display: block;
-        width: 100%;
-        position: absolute;
-        height: 100%;
-        top: 0;
-        box-sizing: border-box;
-        left: 0;
-        border: 3px solid @white;
-    }
-}
-
-// Has Config
-// -------------------------
-
-.umb-grid .umb-grid-has-config {
-    display: inline;
-    font-size: 13px;
-    color: @gray-5;
-}
-
-.umb-grid .umb-cell {
-    .umb-grid-has-config {
-        position: absolute;
-        top: 10px;
-        left: 10px;
-    }
-}
-
-
-// Overlay
-// -------------------------
-.umb-grid .cell-tools-menu {
-    position: absolute;
-    width: 360px;
-    height: 380px;
-    overflow: auto;
-    border: 1px solid @gray-8;
-    margin-top: -270px;
-    margin-left: -150px;
-    background: @white;
-    padding: 7px;
-    top: 0;
-    left: 50%;
-    z-index: 6660;
-    box-shadow: 3px 3px 12px 0 rgba(50, 50, 50, 0.45);
-}
-
-.umb-grid .cell-tools-menu h5 {
-    border-bottom: 1px solid @gray-8;
-    color: @gray-5;
-    padding: 10px;
-    margin-top: 0;
-}
-
-.umb-grid .elements {
-    display: block;
-    padding: 0;
-    margin: 0;
-}
-
-.umb-grid .elements li {
-    display: inline-block;
-    width: 90px;
-    height: 80px;
-    margin: 5px;
-    padding: 5px;
-    overflow: hidden;
-    font-size: 12px;
-
-    &:hover, &:hover * {
-        background: @blueMid;
-        color: @white;
-    }
-}
-
-.umb-grid .elements a {
-    color: @gray-1;
-    text-decoration: none;
-}
-
-.umb-grid .elements i {
-    font-size: 30px;
-    line-height: 50px;
-    color: @gray-6;
-    display: block;
-}
-
-// Configuration specific styles
-// -------------------------
-.umb-grid-configuration .umb-templates {
-    text-align: left;
-}
-
-.umb-grid-configuration ul {
-    display: block;
-}
-
-.umb-grid-configuration ul li {
-    display: block;
-    width: auto;
-    text-align: left;
-}
-
-.umb-grid-configuration .umb-templates .umb-templates-template .tb {
-    max-height: 50px;
-    border-width: 2px !important;
-    padding: 0;
-    border-spacing: 2px;
-    overflow: hidden;
-}
-
-.umb-grid-configuration .umb-templates .umb-templates-template span {
-    background: @gray-8;
-    display: inline-block;
-}
-
-.umb-grid-configuration .umb-templates .umb-templates-template .tb:hover {
-    border-width: 2px !important;
-}
-
-.umb-grid-configuration .umb-templates-column {
-    display: block;
-    float: left;
-    margin-left: -1px;
-    border: 1px @white solid !important;
-    background: @gray-8;
-}
-
-.umb-grid-configuration .umb-templates-column.last {
-    margin-right: -1px;
-}
-
-.umb-grid-configuration .umb-templates-column.add {
-    text-align: center;
-    font-size: 20px;
-    line-height: 70px;
-    color: @gray-8;
-    text-decoration: none;
-    background: @white;
-}
-
-.umb-grid-configuration .mainTdpt {
-    height: initial;
-    border: none;
-}
-
-.umb-grid-configuration .umb-templates-rows .umb-templates-row {
-    margin: 0 50px 20px 0;
-    width: 60px;
-}
-
-.umb-grid-configuration .umb-templates-rows .umb-templates-row .tb {
-    border-width: 2px !important;
-    padding: 0;
-    border-spacing: 2px;
-}
-
-.umb-grid-configuration .umb-templates-rows .mainTdpt {
-    height: 10px !important;
-}
-
-.umb-grid-configuration a.umb-templates-column {
-    height: 70px !important;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
deleted file mode 100644
index 1d4a6e201f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ /dev/null
@@ -1,995 +0,0 @@
-@umbGroupBuilderToolbarHeight: 60px;
-
-/* ---------- TOOLBAR --------- */
-.umb-group-builder__toolbar {
-  display: flex;
-  align-items: center;
-  padding: 0;
-  border-right-width: 21px;
-  margin-left: -20px;
-  width: calc(100% + 40px);
-  margin-top: -20px;
-  height: @umbGroupBuilderToolbarHeight;
-
-  .left {
-    flex: 1 1 auto;
-    width: 50%;
-    display: block;
-    margin-right: 40px;
-  }
-
-  .right {
-    flex: 0 0 auto;
-  }
-}
-
-/* ---------- TABS ----------  */
-
-.umb-group-builder__tabs {
-  height: @umbGroupBuilderToolbarHeight;
-  position: relative;
-}
-
-.umb-group-builder__tabs-list {
-  height: 100%;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  display: flex;
-  align-items: center;
-  overflow-x: auto;
-  overflow-y: visible;
-  scroll-behavior: smooth;
-  -ms-overflow-style: none;
-  scrollbar-width: none;
-  margin-bottom: -100px; // allow validation messages to overflow container
-  padding-bottom: 100px; // allow validation messages to overflow container
-  pointer-events: none; // allow validation messages to overflow container
-
-  li {
-    pointer-events: auto;
-    height: 100%;
-
-    &:only-of-type {
-      .umb-group-builder__tab {
-        margin-left: 0;
-      }
-    }
-  }
-}
-
-.umb-group-builder__tabs-list::-webkit-scrollbar {
-  display: none;
-}
-
-.umb-group-builder__tabs-overflow {
-  height: 100%;
-  width: 30px;
-  position: absolute;
-  top: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 1;
-  background: white;
-}
-
-.umb-group-builder__tabs-overflow--left {
-  left: 0;
-  box-shadow: 4px 0 5px rgba(0,0,0,0.08);
-
-  .caret {
-    transform: rotate(90deg) translate(0, 2px);
-  }
-}
-
-.umb-group-builder__tabs-overflow--right {
-  right: 0;
-  box-shadow: -4px 0 5px rgba(0,0,0,0.08);
-
-  .caret {
-    transform: rotate(270deg) translate(0, -2px);
-  }
-}
-
-.umb-group-builder__tabs-list__add-tab {
-    display: contents;
-
-    > umb-button {
-        white-space: nowrap;
-
-        .umb-button {
-          margin-left: 0;
-        }
-        
-        .umb-button__content {
-            flex-wrap: nowrap;
-        }
-    }
-
-   > umb-button,
-   .umb-button,
-   .umb-button__button {
-        height: 100%;
-    }
-}
-
-.umb-group-builder__tab {
-  background-color: @white;
-  position: relative;
-  padding: 0 15px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-  border-right: 1px solid @gray-9;
-  &:first-of-type {
-    border-bottom-left-radius: 3px;
-  }
-  &:last-of-type {
-    border-bottom-right-radius: 3px;
-  }
-
-  &:hover {
-    cursor: pointer;
-
-    .umb-group-builder__tab-remove {
-      display: block;
-    }
-  }
-
-  .ui-droppable-hover & {
-      
-    animation: umb-group-builder-tab--droppable-active 800ms ease-in-out alternate infinite;
-
-    @keyframes umb-group-builder-tab--droppable-active {
-        0%  { background-color: white }
-        50%   { background-color: @gray-12 }
-    }
-  }
-
-  .badge {
-    background-color: @red;
-    animation-duration: 1.4s;
-    animation-iteration-count: infinite;
-    animation-name: umb-group-builder-tab--badge-bounce;
-    animation-timing-function: ease;
-    display: none;
-
-    @keyframes umb-group-builder-tab--badge-bounce {
-        0%   { transform: translateY(0); }
-        20%  { transform: translateY(-6px); }
-        40%  { transform: translateY(0); }
-        55%  { transform: translateY(-3px); }
-        70%  { transform: translateY(0); }
-        100% { transform: translateY(0); }
-    }
-  }
-
-  &::before {
-    content: "";
-    position: absolute;
-    height: 0px;
-    left: 15px;
-    right: 15px;
-    background-color: @ui-light-active-border;
-    bottom: 0;
-    border-radius: @baseBorderRadius @baseBorderRadius 0 0;
-    opacity: 0;
-    transition: all .2s linear;
-  }
-
-  &.is-active {
-    color: @ui-light-active-type !important;
-
-    .umb-group-builder__tab-remove {
-      display: block;
-    }
-
-    &::before {
-      opacity: 1;
-      height: 4px;
-    }
-  }
-
-  &.is-deletable {
-    padding-right: 45px;
-  }
-
-  &.is-inherited {
-    padding-right: 22px;
-
-    .umb-group-builder__group-title-input {
-      padding: 0;
-    }
-  }
-
-  .umb-group-builder__group-title-input {
-    &:disabled {
-      cursor: pointer;
-    }
-  }
-}
-
-.show-validation {
-  .umb-group-builder__tab {
-    .badge {
-      display: block;
-    }
-
-    &.has-error {
-      &::before {
-        background-color: @red;
-      }
-    }
-  }
-}
-
-.umb-group-builder__tab-sortable {
-  list-style: none;
-}
-
-.umb-group-builder__tab-sortable-placeholder {
-  background: transparent;
-  border: 1px dashed @gray-8;
-  border-top: none;
-  border-bottom: none;
-}
-
-.umb-group-builder__tab-remove {
-  position: absolute;
-  right: 20px;
-  display: none;
-}
-
-.umb-group-builder__tab-title-wrapper {
-  display: flex;
-  align-items: center;
-}
-
-.umb-group-builder__tab-title-icon {
-  margin-right: 5px;
-}
-
-.umb-group-builder__tab-name {
-  white-space: nowrap;
-}
-
-.umb-group-builder__tab-val-message {
-  position: absolute;
-  top: calc(100% + 5px);
-  left: 20px;
-}
-
-.umb-group-builder__tab--placeholder {
-  border: 1px dashed @ui-action-discreet-border;
-  color: @ui-action-discreet-type;
-  padding-right: 10px;
-  min-width: 100px;
-  background: transparent;
-  border-radius: @baseBorderRadius;
-  margin-left: 5px;
-  transition: color, border-color, 80ms;
-  &:hover {
-    color: @ui-action-discreet-type-hover;
-    border-color: @ui-action-discreet-border-hover;
-  }
-}
-
-.umb-group-builder__tab-inherited-label {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: 1;
-  display: block;
-  white-space: nowrap;
-  padding: 0 4px;
-  color: @black;
-  font-size: 12px;
-  background-color: @gray-8;
-  border-radius: @baseBorderRadius;
-  margin-top: 5px;
-
-  &:after {
-    bottom: 100%;
-    left: 10px;
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-    border-color: rgba(255, 255, 255, 0);
-    border-bottom-color: @gray-8;
-    border-width: 4px;
-    margin-left: -4px;
-  }
-
-  button {
-    font-size: 12px;
-    color: @black;
-    text-decoration: underline;
-  }
-}
-
-.umb-group-builder__tab.-sortable {
-  cursor: move;
-  padding-right: 20px;
-}
-
-.umb-group-builder__tab-sort-order {
-  margin-left: 10px;
-}
-
-.umb-group-builder__ungrouped-properties {
-    margin-top: 20px;
-    position: relative;
-}
-
-/* ---------- GROUPS ----------  */
-
-.umb-group-builder__groups {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.umb-group-builder__group {
-  min-height: 86px;
-  border: 1px solid transparent;
-  border-radius: @baseBorderRadius;
-  box-sizing: border-box;
-  background-color: @white;
-  position: relative;
-  box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
-  margin-top: 20px;
-  margin-bottom: 20px;
-}
-
-.umb-group-builder__group.-inherited {
-  border-color: @gray-9;
-  box-shadow: none;
-}
-
-.umb-group-builder__group.-placeholder {
-  width:100%;
-  min-height: 86px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  cursor: pointer;
-  border: 1px dashed @gray-7;
-  background-color: transparent;
-  color: @ui-action-type;
-  font-weight: bold;
-  position: relative;
-  box-shadow: none;
-  &:hover {
-      color:@ui-action-type-hover;
-      text-decoration: none;
-      border-color: @ui-active-type-hover;
-  }
-}
-
-.umb-group-builder__group.-sortable {
-  min-height: initial;
-  cursor: move;
-}
-
-.umb-group-builder__group-actions {
-  position: absolute;
-  top: 5px;
-  right: 5px;
-  visibility: hidden;
-  opacity: 0;
-  z-index: 10;
-}
-
-.umb-group-builder__group-action {
-  display: inline-block;
-}
-
-.umb-group-builder__group-remove {
-  position: relative;
-  margin-left: auto;
-  font-size: 18px;
-  color: @ui-icon;
-}
-
-.umb-group-builder__group-remove:hover {
-  cursor: pointer;
-  color: @ui-icon-hover;
-}
-
-.umb-group-builder__group-title-wrapper {
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid @gray-9;
-  padding: 10px 15px 10px 10px;
-}
-
-.umb-group-builder__group-title {
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  color: @black;
-}
-
-.umb-group-builder__group-title-icon {
-  margin-left: 5px;
-}
-
-.umb-group-builder__group-title.-active {
-  border-color: @blueMid;
-}
-
-.umb-group-builder__group-title.-placeholder {
-  border: 1px dashed @gray-8;
-  border-bottom: none;
-  width: 70px;
-}
-
-.umb-group-builder__group-title.-inherited {
-  border-color: @gray-9;
-}
-
-input.umb-group-builder__group-title-input {
-  border-color: transparent;
-  background: transparent;
-  margin-bottom: 0;
-}
-
-input.umb-group-builder__group-title-input:disabled:hover {
-    border-color: transparent;
-}
-
-.umb-group-builder__group-title-input:hover {
-  border-color: @inputBorder;
-}
-
-.umb-group-builder__group-title-input.-placeholder {
-  border: 1px dashed @gray-6;
-}
-
-.umb-group-builder__group-title-right {
-  display: flex;
-  align-items: center;
-  margin-left: auto;
-}
-
-.umb-group-builder__group-inherited-label {
-  font-size: 0.9rem;
-  display: inline-flex;
-  align-items: center;
-  margin-right: 10px;
-}
-
-.umb-group-builder__group-title-val-message {
-  display: flex;
-  align-items: center;
-}
-
-.umb-group-builder__group-sort-order {
-    margin-right: 20px;
-}
-
-.umb-group-builder__group-add-property {
-    width: 100%;
-    min-height: 46px;
-    border-radius: @baseBorderRadius;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    cursor: pointer;
-    border: 1px dashed @gray-7;
-    background-color: transparent;
-    color: @ui-action-type;
-    font-weight: bold;
-    position: relative;
-    &:hover {
-        color:@ui-action-type-hover;
-        text-decoration: none;
-        border-color: @ui-active-type-hover;
-    }
-}
-
-.umb-group-builder__group-content {
-  padding: 10px 20px 20px 20px;
-}
-
-/* ---------- PROPERTIES ---------- */
-
-.umb-group-builder__properties {
-  list-style: none;
-  margin: 0;
-  padding-right: 5px;
-  min-height: 35px; // the height of a sortable property
-}
-
-.umb-group-builder__property {
-  position: relative;
-  display: flex;
-  flex-flow: row;
-  box-sizing: border-box;
-  border-bottom: 1px solid @gray-10; 
-  padding: 10px 0;
-}
-
-.umb-group-builder__property-sortable {
-  list-style: none;
-}
-
-.umb-group-builder__property.-locked {
-  border: transparent;
-}
-
-.umb-group-builder__property.-locked:hover {
-  border: transparent;
-}
-
-.umb-group-builder__property.-sortable,
-.umb-group-builder__property.-sortable-locked {
-    min-height: 35px;
-    border-radius: @baseBorderRadius;
-    border: none;
-    animation: none;
-    align-items: center;
-    padding: 5px 10px;
-    margin-bottom: 5px;
-}
-
-.umb-group-builder__property.-sortable {
-  background: @gray-10;
-  color: @gray-1;
-  cursor: move;
-}
-
-.umb-group-builder__property.-sortable-locked {
-  background: @gray-10;
-  padding-left: 30px;
-}
-
-
-.umb-group-builder__property-meta {
-  flex: 0 0 160px;
-  margin-right: 20px;
-}
-
-.umb-group-builder__property-meta.-full-width {
-  flex: 1;
-  margin-right: 0;
-}
-
-.umb-group-builder__property-meta-alias {
-  font-size: 12px;
-  color: @gray-3;
-  word-break: break-word;
-  line-height: 1.5;
-  margin-bottom: 5px;
-}
-
-.umb-group-builder__property-meta-label textarea {
-  font-size: 14px;
-  font-weight: bold;
-  margin-bottom: 0;
-  color: @gray-1;
-  width: 100%;
-  padding: 0;
-  min-height: 25px;
-  box-sizing: border-box;
-  resize: none;
-  overflow: hidden;
-  border-color: transparent;
-  background: transparent;
-    &:focus {
-        border-color: @inputBorderFocus;
-    }
-}
-
-.umb-group-builder__property-meta-label textarea.ng-invalid {
-   border: none;
-}
-
-.umb-group-builder__property-meta-description textarea {
-  font-size: 12px;
-  line-height: 1.5;
-  color: @gray-3;
-  margin-bottom: 0;
-  padding: 0;
-  width: 100%;
-  min-height: 25px;
-  box-sizing: border-box;
-  resize: none;
-  overflow: hidden;
-  border-color: transparent;
-  background: transparent;
-    &:focus {
-        border-color: @inputBorderFocus;
-    }
-}
-
-.umb-group-builder__property-preview {
-    flex: 1;
-    height: 30px;
-    overflow: hidden;
-    position: relative;
-    padding: 35px 10px 25px 10px;
-    border-radius: 3px;
-    cursor: pointer;
-
-    &::after {
-        content: "";
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        background: rgba(225,225,225,.5);
-        transition: opacity 120ms;
-    }
-}
-
-.umb-group-builder__property-preview:not(.-not-clickable):hover {
-    &::after {
-        opacity: .66;
-    }
-}
-
-.umb-group-builder__property-preview.-not-clickable {
-    cursor: auto;
-}
-
-.umb-group-builder__property-preview .help-inline {
-    display:none !important;
-}
-
-.umb-group-builder__property-preview-label {
-  font-size: 0.75rem;
-  position: absolute;
-  top: 0;
-  left: 0;
-  text-transform: uppercase;
-  z-index: 15;
-  background: @gray-10;
-  padding: 3px;
-  line-height: 12px;
-  opacity: 0.8
-}
-
-
-.umb-group-builder__open-settings {
-    position: absolute;
-    z-index:1;
-    top: 0;
-    bottom:0;
-    left: 0;
-    width: 100%;
-    background-color: transparent;
-    border: none;
-    &:focus {
-        outline:0;
-        border: 1px solid @inputBorderFocus;
-    }
-}
-
-.umb-group-builder__property-actions {
-    flex: 0 0 44px;
-    display: flex;
-    align-items: flex-start;
-    justify-content: flex-end;
-    margin-right: -20px;
-}
-
-.umb-group-builder__property-action {
-    position: relative;
-    margin: 5px 0;
-    
-    button.btn-icon {
-        border: none;
-        font-size: 18px;
-        position: relative;
-        cursor: pointer;
-        color: @ui-icon;
-        margin: 0;
-        padding: 5px 10px;
-        width: auto;
-        overflow: visible;
-        background: transparent;
-        line-height: normal;
-        -webkit-appearance: none;
-        
-        &:hover, &:focus  {
-            color: @ui-icon-hover;
-        }
-    }
-}
-
-.umb-group-builder__property-tags {
-    position: absolute;
-    z-index: 20;
-    top: 4px;
-    left: 4px;
-    display: flex;
-    flex-direction: row;
-}
-
-.umb-group-builder__property-tags.-right {
-    right: 4px;
-    left: auto;
-}
-
-.umb-group-builder__property-tag {
-    font-size: 12px;
-    background-color: @gray-8;
-    margin-left: 4px;
-    padding: 0 4px;
-    display: flex;
-    border-radius: 3px;
-    align-items: center;
-
-    &:first-child {
-        margin-left: 0;
-    }
-
-    &.-white {
-        background-color: @white;
-    }
-}
-
-.umb-group-builder__property-tag-icon {
-    margin-right: 3px;
-    display: flex;
-    align-items: center;
-    line-height: 1;
-}
-
-/* ---------- SORTABLE ---------- */
-
-.umb-group-builder__group-sortable-placeholder {
-  background: transparent;
-  border: 1px dashed @gray-8;
-  margin: 0 0 70px 0;
-  border-radius: 10px;
-  border-radius: 5px;
-}
-
-.umb-group-builder__property_sortable-placeholder {
-  background: transparent;
-  border: 1px dashed @gray-8;
-  margin-bottom: 5px;
-  border-radius: 5px;
-}
-
-.umb-group-builder__no-data-text {
-  padding-top: 50px;
-  font-size: 16px;
-  line-height: 1.8em;
-  color: @gray-7;
-  text-align: center;
-}
-
-input.umb-group-builder__group-sort-value {
-  margin-bottom: 0;
-  margin-left: auto;
-}
-
-
-/* ---------- DIALOGS ---------- */
-
-.show-validation .edit-property-settings .ng-invalid-val-required-component .editor-placeholder {
-   border-color: @red;
-   color: @red;
-}
-
-.content-type-editor-dialog.edit-property-settings {
-
-    .validation-wrapper {
-        position: relative;
-    }
-
-    .validation-label {
-        position: absolute;
-        top: 50%;
-        right: 0;
-        font-size: 12px;
-        color: @red;
-        transform: translate(0, -50%);
-    }
-
-    input.editor-label,  
-    textarea.editor-label {
-        border-color: transparent;
-        box-shadow: none;
-        width: 100%;
-        box-sizing: border-box;
-        margin-bottom: 0;
-        font-size: 16px;
-        font-weight: bold;
-        resize: none;
-        line-height: 1.5em;
-        padding: 0;
-        border: none;
-
-        &:focus {
-            outline: none;
-            box-shadow: none !important;
-        }
-    }
-
-    .editor-placeholder-button {
-      .umb-button__button {
-        height: 80px;
-      }
-    }
-
-    .editor-placeholder {
-        border: 1px dashed @ui-action-border;
-        width: 100%;
-        height: 80px;
-        line-height: 80px;
-        text-align: center;
-        display: block;
-        border-radius: 5px;
-        font-weight: bold;
-        font-size: 14px;
-        color: @ui-action-type;
-
-        &:hover {
-            text-decoration: none;
-            color: @ui-action-type-hover;
-            border-color: @ui-action-border-hover;
-            background-color: @ui-action-discreet-hover;
-        }
-    }
-
-    .editor-wrapper {
-        margin-bottom: 10px;
-    }
-
-    .editor {
-        display: flex;
-        align-items: center;
-        align-content: stretch;
-        min-height: 80px;
-        border: 1px solid @gray-9;
-        color: @ui-action-discreet-type;
-        border-radius: @baseBorderRadius;
-    }
-
-    .editor-info {
-        flex: 1 1 auto;
-        text-align: left;
-        display: flex;
-        align-items: center;
-        min-height: 80px;
-        color: @ui-action-discreet-type;
-    }
-
-    button.editor-info {
-      &:hover {
-        color: @ui-action-discreet-type-hover;
-        background-color: @ui-action-discreet-hover;
-      }
-    }
-
-    .editor-icon-wrapper {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        width: 60px;
-        height: 60px;
-        text-align: center;
-        line-height: 60px;
-        flex: 0 0 60px;
-        padding-left: 10px;
-
-        .icon {
-            font-size: 32px;
-            line-height: 1;
-        }
-    }
-
-    .editor-details {
-        flex: 1 1 auto;
-        margin-top: 10px;
-        margin-bottom: 10px;
-
-        .editor-name {
-            display: block;
-            font-weight: bold;
-        }
-
-        .editor-editor {
-            display: block;
-            font-size: 12px;
-        }
-    }
-
-    .editor-remove-icon {
-        flex: 0 0 48px;
-        width: 48px;
-        height: 48px;
-        font-size: 18px;
-        min-height: 80px;
-        color: @ui-action-discreet-type;
-
-        &:hover {
-          color: @ui-action-discreet-type-hover;
-          background-color: @ui-action-discreet-hover;
-        }
-
-        &:disabled {
-          cursor: not-allowed;
-          background: @sand-5;
-          opacity: 0.6;
-          color: @black;
-
-          &:hover {
-            background: @sand-5;
-            color: @black;
-          }
-        }
-    }
-
-    .checkbox {
-        margin-bottom: 20px;
-    }
-
-    .editor-description {
-        margin-top: 20px;
-        padding: 0;
-    }
-
-    .editor-description,
-    .editor-validation-pattern {
-        min-width: 100%;
-        min-height: 25px;
-        resize: none;
-        box-sizing: border-box;
-        border: none;
-        overflow: hidden;
-    }
-
-    .editor-validation-message {
-        min-width: 100%;
-        min-height: 25px;
-        margin-top: 4px;
-    }
-
-    .editor-validation-pattern {
-        border: 1px solid @gray-7;
-        margin: 10px 0 0;
-        padding: 6px;
-        max-height: 32px;
-    }
-
-    .umb-dropdown {
-        width: 100%;
-    }
-
-    label.checkbox.no-indent {
-        width: 100%;
-    }
-}
-
-// Convert to tab dropzone
-.umb-group-builder__convert-dropzone {
-    display: inline-flex;
-  border: 1px dashed @gray-7;
-  align-items: center;
-  justify-content: center;
-  padding: 2px 15px;
-  border-radius: @baseBorderRadius;
-  // Hack for hiding as a droppable element:
-  visibility: hidden;
-  position: absolute;
-
-  &.ui-droppable-hover {
-    border-color: @black;
-  }
-
-  &.ui-droppable-active {
-    visibility: visible;
-    position: relative;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less
deleted file mode 100644
index e89ed96e79..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less
+++ /dev/null
@@ -1,50 +0,0 @@
-.umb-icon {
-    display: inline-block;
-    width: 1em;
-    height: 1em;
-    flex-shrink: 0;
-
-    svg {
-        width: 100%;
-        height: 100%;
-        fill: currentColor;
-        animation: inherit;
-    }
-
-    &.large {
-        width: 32px;
-        height: 32px;
-    }
-
-    &.medium {
-        width: 24px;
-        height: 24px;
-    }
-
-    &.small {
-        width: 14px;
-        height: 14px;
-    }
-
-    &::before,
-    &::after {
-        content: none !important;
-    }
-
-    &__inner {
-        // Clear pseudo classes
-        &::before,
-        &::after {
-            content: none !important;
-        }
-
-        ng-transclude {
-            animation: inherit;
-            font-family: inherit;
-
-            > span {
-                animation: inherit;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less
deleted file mode 100644
index 79aee5056e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less
+++ /dev/null
@@ -1,85 +0,0 @@
-.umb-iconpicker {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(60px, 1fr));
-    gap: 0.25rem;
-    margin: 0;
-}
-
-.umb-iconpicker-item {
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    margin-bottom: 0;
-    overflow: hidden;
-    border: 1px solid transparent;
-}
-
-.umb-iconpicker-item button {
-    background: transparent;
-    border: 0 none;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 100%;
-    height: 100%;
-    padding: 15px 0;
-    text-decoration: none;
-    border-radius: 3px;
-    background: none;
-    background: none;
-	border: none;
-    cursor: pointer;
-    color: currentColor;
-}
-
-.umb-iconpicker-item button:hover,
-.umb-iconpicker-item button:focus {
-    background: @gray-10;
-    outline: none;
-}
-
-.umb-iconpicker-item.-selected {
-    background: @gray-10;
-    border-color: @ui-active;
-    border-radius: @baseBorderRadius;
-    box-sizing: border-box;
-}
-
-.umb-iconpicker-svg svg {
-    display: block;
-    width: 30px;
-    height: 30px;
-    fill: currentColor;
-}
-
-.umb-iconpicker-item button:active {
-    background: @gray-10;
-}
-
-.umb-iconpicker-item i {
-    font-size: 30px;
-}
-
-// Color swatch
- .button {
-    border: none;
-    color: @white;
-    padding: 5px;
-    text-align: center;
-    text-decoration: none;
-    display: inline-block;
-    margin: 5px;
-    border-radius: 3px;
-}
-
-// Circle behind the checkmark
-i.small.active{
-    font-size: 14px;
-    display: inline-block;
-    width: 20px;
-    height: 20px;
-    border-radius: 50%;
-    background-color: rgba(0,0,0,.15);
-    float: right;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-insert-code-box.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-insert-code-box.less
deleted file mode 100644
index 006dae09dc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-insert-code-box.less
+++ /dev/null
@@ -1,49 +0,0 @@
-.umb-insert-code-boxes {
-    display: flex;
-    flex-direction: column;
-}
-
-.umb-insert-code-box {
-    border: 1px solid @gray-10;
-    padding: 15px 20px;
-    margin-bottom: 10px;
-    border-radius: 3px;
-    text-align: left;
-}
-
-.umb-insert-code-box:hover,
-.umb-insert-code-box.-selected {
-    background-color: @ui-option-hover;
-    color: @ui-action-type-hover;
-}
-
-.umb-insert-code-box__title {
-    font-size: 15px;
-    margin-bottom: 5px;
-    font-weight: bold;
-    line-height: 1;
-}
-
-.umb-insert-code-box__description {
-    font-size: 13px;
-    line-height: 1.6em;
-}
-
-.umb-insert-code-box__check {
-    width: 18px;
-    height: 18px;
-    background: @gray-10;
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 12px;
-    float: left;
-    margin-right: 5px;
-    margin-top: 1px;
-}
-
-.umb-insert-code-box__check--checked {
-    background: @green;
-    color: @white;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-keyboard-shortcuts-overview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-keyboard-shortcuts-overview.less
deleted file mode 100644
index 5337fd0e19..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-keyboard-shortcuts-overview.less
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/* ---------- OVERLAY ---------- */
-
-.umb-keyboard-shortcuts-overview__keyboard-shortcuts-group {
-    margin-bottom: 20px;
-}
-
-.umb-keyboard-shortcuts-overview__keyboard-shortcuts-group-name {
-  margin-bottom: 0;
-}
-
-.umb-keyboard-shortcuts-overview__keyboard-shortcut {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 7px 0;
-  border-bottom: 1px solid @gray-9;
-}
-
-.umb-keyboard-shortcuts-overview__description {
-  font-size: 13px;
-  margin-right: 10px;
-}
-
-/* ---------- KEYBOARD KEYS ---------- */
-
-.umb-keyboard-keys {
-  list-style: none;
-  display: flex;
-  font-size: 12px;
-  align-items: center;
-}
-
-.umb-keyboard-key-wrapper {
-  display: flex;
-  margin-right: 5px;
-  align-items: center;
-}
-
-.umb-keyboard-key {
-  background: @white;
-  border: 1px solid @gray-8;
-  color: @gray-3;
-  border-radius: 5px;
-  margin-right: 5px;
-  padding: 1px 7px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
deleted file mode 100644
index c0ac89622d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-layout-selector.less
+++ /dev/null
@@ -1,65 +0,0 @@
-.umb-layout-selector {
-   display: inline-block;
-   position: relative;
-}
-
-.umb-layout-selector__active-layout {
-   background: transparent;
-   box-sizing: border-box;
-   border: 1px solid @ui-action-discreet-border;
-   color: @ui-action-discreet-type;
-   cursor: pointer;
-   height: 30px;
-   width: 30px;
-   font-size: 20px;
-   display: flex;
-   justify-content: center;
-   align-items: center;
-}
-
-.umb-layout-selector__active-layout:hover {
-   border-color: @ui-action-discreet-border-hover;
-   color: @ui-action-discreet-type-hover;
-}
-
-.umb-layout-selector__dropdown {
-   position: absolute;
-   padding: 5px;
-   background: @grayDark;
-   z-index: 999;
-   display: flex;
-   background: @white;
-   flex-wrap: wrap;
-   flex-direction: column;
-   transform: translate(-50%,0);
-   left: 50%;
-   border-radius: 3px;
-}
-
-.umb-layout-selector__dropdown-item {
-   background: transparent;
-   padding: 5px;
-   margin: 3px 5px;
-   display: flex;
-   align-content: center;
-   justify-content: center;
-   border: 1px solid transparent;
-   flex-direction: column;
-   cursor: pointer;
-}
-
-.umb-layout-selector__dropdown-item:hover {
-   border: 1px solid @ui-action-discreet-border;
-}
-
-.umb-layout-selector__dropdown-item.-active {
-   border: 1px solid @ui-action-discreet-border-hover;
-}
-
-.umb-layout-selector__dropdown-item-icon,
-.umb-layout-selector__dropdown-item-icon[class^="icon-"],
-.umb-layout-selector__dropdown-item-icon[class*=" icon-"] {
-   font-size: 20px;
-   color: @gray;
-   text-align: center;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less
deleted file mode 100644
index 3977da188a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less
+++ /dev/null
@@ -1,102 +0,0 @@
-.umb-lightbox {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: 5000;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-direction: column;
-
-    &__backdrop {
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
-        background: rgba(21, 21, 23, 0.7);
-        width: 100%;
-        height: 100%;
-    }
-
-    &__close {
-        position: absolute;
-        top: 20px;
-        right: 20px;
-        height: 40px;
-        width: 40px;
-
-        .umb-icon {
-            font-size: 20px;
-            height: inherit;
-            width: inherit;
-            position: absolute;
-            top: 0;
-            left: 0;
-        }
-    }
-
-    &__images {
-        position: relative;
-        z-index: 1000;
-        max-width: calc(~'100%' - 200px); // subtract the width of the two arrow buttons
-    }
-
-    &__image {
-        background: @white;
-        border-radius: 3px;
-        padding: 10px;
-    }
-
-    &__control {
-        background-color: @white;
-        width: 50px;
-        height: 50px;
-        border-radius: 50%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        cursor: pointer;
-        position: absolute;
-
-        &:hover {
-            .umb-lightbox__control-icon, &::before {
-                color: @ui-active-type-hover;
-            }
-        }
-    }
-
-    &__control-icon {
-        color: @ui-active-type;
-        font-size: 20px;
-    }
-}
-
-.umb-drawer-is-visible .umb-lightbox {
-    width: calc(~'100%' - ~'@{drawerWidth}');
-    left: @drawerWidth;
-}
-
-.umb-lightbox__control.-next {
-    right: 20px;
-    top: 50%;
-    transform: translate(0, -50%);
-
-    .umb-lightbox__control-icon {
-        margin-right: -4px;
-    }
-}
-
-.umb-lightbox__control.-prev {
-    left: 20px;
-    top: 50%;
-    transform: translate(0, -50%);
-
-    .umb-lightbox__control-icon {
-        margin-left: -4px;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less
deleted file mode 100644
index 9eb00d4437..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less
+++ /dev/null
@@ -1,73 +0,0 @@
-.umb-list-view-settings__box {
-    background: @gray-10;
-    display: flex;
-    flex: 1;
-    padding: 15px;
-    position: relative;
-    border-radius: @baseBorderRadius;
-
-    .btn-link {
-        font-size: 13px;
-        padding: 0;
-    }
-}
-
-.umb-list-view-settings__trigger {
-    margin-bottom: 20px;
-}
-
-.umb-list-view-settings__list-view-icon {
-    font-size: 20px;
-    color: @gray-7;
-    margin-right: 10px;
-}
-
-.umb-list-view-settings__name {
-    font-size: 14px;
-    font-weight: bold;
-}
-
-.umb-list-view-settings__create-new {
-    color: @ui-action-type;
-}
-
-.umb-list-view-settings__remove-new {
-    color: @red;
-}
-
-// display `columns displayed` table as a list-view layout
-.umb-list-view-settings__overlay {
-
-    .btn {
-        vertical-align: top;
-    }
-
-    .btn-icon {
-        padding: 0;
-    }
-
-    table {
-        width: 100%;
-    }
-
-    tbody tr {
-        background: @gray-10;
-        border-bottom: 1px solid @white;
-    }
-
-    th {
-        text-align: left;
-    }
-
-    td {
-        padding: 10px 15px 10px 0;
-
-        &:first-child {
-            padding-left: 15px;
-        }
-
-        input[type="text"] {
-            margin-bottom: 0;
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less
deleted file mode 100644
index c281f7f5ea..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less
+++ /dev/null
@@ -1,56 +0,0 @@
-.umb-list--condensed {
-    .umb-list-item {
-        padding-top: 7px;
-        padding-bottom: 7px;
-    }
-}
-
-.umb-list-item {
-    border-bottom: 1px solid @gray-11;
-    padding-top: 15px;
-    padding-bottom: 15px;
-    display: flex;
-    &:last-of-type {
-        border-bottom: none;
-    }
-}
-
-a.umb-list-item:hover,
-a.umb-list-item:focus {
-    text-decoration: none;
-}
-
-.umb-list-item--disabled {
-    cursor: not-allowed;
-    opacity: 0.6;
-}
-
-.umb-list-item--error {
-    color: @formErrorText;
-}
-.umb-list-item--warning {
-    color: @formWarningText;
-}
-
-.umb-list-item:hover .umb-list-checkbox,
-.umb-list-item--selected .umb-list-checkbox {
-    opacity: 1;
-}
-
-.umb-list-item__description {
-    font-size: 13px;
-    color: @gray-4;
-}
-
-.umb-list-item__description--checkbox{
-    margin: 0 0 0 30px;
-}
-
-.umb-list-checkbox {
-    position: absolute;
-    opacity: 0;
-}
-
-.umb-list-checkbox--visible {
-    opacity: 1;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-load-indicator.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-load-indicator.less
deleted file mode 100644
index 7960ff8603..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-load-indicator.less
+++ /dev/null
@@ -1,57 +0,0 @@
-.umb-load-indicator {
-   list-style: none;
-   margin: 0;
-   padding: 0;
-   position: absolute;
-   top: 50%;
-   left: 50%;
-   transform: translate(-50%, -50%);
-   font-size: 0;
-   margin-left: -6px; // hack to center it
-   margin-top: -6px; // hack to center it
-}
-
-.umb-load-indicator__bubble {
-   height: 0;
-   position: absolute;
-   top: 50%;
-   left: 0;
-   width: 0;
-   margin: 0;
-   height: 6px;
-   width: 6px;
-   border: 2px solid @blueMid;
-   border-radius: 100%;
-   transform: transformZ(0);
-   animation: umbLoadIndicatorAnimation 1.4s infinite;
-}
-
-.umb-load-indicator__bubble:nth-child(1n) {
-   left: -16px;
-   animation-delay: 0s;
-}
-
-.umb-load-indicator__bubble:nth-child(2n) {
-   left: 0;
-   animation-delay: 0.15s;
-}
-
-.umb-load-indicator__bubble:nth-child(3n) {
-   left: 16px;
-   animation-delay: 0.30s;
-}
-
-@keyframes umbLoadIndicatorAnimation {
-  0%   {
-    transform: scale(0.5);
-    background: @blueMid;
-  }
-  50%   {
-    transform: scale(1);
-    background: transparent;
-  }
-  100% {
-    transform: scale(0.5);
-    background: @blueMid;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-loader.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-loader.less
deleted file mode 100644
index 260710ce72..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-loader.less
+++ /dev/null
@@ -1,42 +0,0 @@
-// Loading Animation
-// ------------------------
-
-.umb-loader {
-    background-color: @blue;
-    margin-top: 0;
-    margin-left: -100%;
-    animation-name: bounce_loadingProgressG;
-    animation-duration: 1s;
-    animation-iteration-count: infinite;
-    animation-timing-function: linear;
-    width: 100%;
-    height: 2px;
-}
-
-@keyframes bounce_loadingProgressG {
-    0% {
-        margin-left: -100%;
-    }
-
-    100% {
-        margin-left: 100%;
-    }
-}
-
-.umb-loader-wrapper {
-    position: absolute;
-    right: 0;
-    left: 0;
-    margin: 10px 0;
-    overflow: hidden;
-}
-
-.umb-loader-wrapper.-top {
-    top: 0;
-    bottom: auto;
-}
-
-.umb-loader-wrapper.-bottom {
-    top: auto;
-    bottom: 0;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
deleted file mode 100644
index 2b49348190..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
+++ /dev/null
@@ -1,64 +0,0 @@
-.umb-locked-field {
-  font-size: 13px;
-  color: @gray-7;
-  position: relative;
-  display: block;
-}
-
-.umb-locked-field__wrapper {
-  display: flex;
-  align-items: center;
-  margin-bottom: 5px;
-}
-
-.umb-locked-field__toggle {
-  margin-right: 3px;
-  padding: 0;
-  background: none;
-  border: 0;
-  font-size: inherit;
-  line-height: inherit;
-
-  &:focus {
-    outline: none;
-
-    .tabbing-active & {
-      outline: 2px solid @inputBorderTabFocus;
-    }
-  }
-}
-
-.umb-locked-field__toggle:hover,
-.umb-locked-field__toggle:focus {
-  text-decoration: none;
-}
-
-.umb-locked-field__lock-icon {
-  color: @gray-7;
-  transition: color 0.25s;
-}
-
-.umb-locked-field__lock-icon.-unlocked {
-   color: @gray-3;
-}
-
-input.umb-locked-field__input,
-.umb-locked-field__text {
-  background: rgba(255, 255, 255, 0); // if using transparent it will hide the text in safari
-  border-color: transparent !important;
-  font-size: 13px;
-  margin-bottom: 0;
-  color: @gray-6;
-  transition: color 0.25s;
-  padding: 0;
-  height: auto;
-  max-width: 300px;
-}
-
-input.umb-locked-field__input:focus {
-  box-shadow: none !important;
-}
-
-input.umb-locked-field__input.-unlocked {
-   color: @gray-3;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less
deleted file mode 100644
index 77bd216317..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-logviewer.less
+++ /dev/null
@@ -1,170 +0,0 @@
-.umb-logviewer {
-    display: flex;
-    flex-flow: row wrap;
-}
-
-@sidebarwidth: 350px; // Width of sidebar. Ugly hack because of old version of Less
-
-.umb-logviewer__main-content {
-    flex: 1 1 auto;
-    margin-right: 20px;
-    width: calc(~'100%' - ~'@{sidebarwidth}' - ~'20px'); // Make sure that the main content area doesn't gets affected by inline styling
-    min-width: 500px;
-
-    .btn-link {
-        text-align: left;
-    }
-}
-
-.umb-logviewer__sidebar {
-    flex: 0 0 @sidebarwidth;
-
-    .flatpickr-input {
-        background-color: @white;
-        border: 0;
-        width: 100%;
-        text-align: center;
-        font-size: larger;
-        padding-top: 20px;
-    }
-}
-
-@media (max-width: 768px) {
-
-    .umb-logviewer {
-        flex-direction: column;
-    }
-
-    .umb-logviewer__main-content {
-        flex: 1 1 auto;
-        width: 100%;
-        margin-bottom: 30px;
-        margin-right: 0;
-    }
-
-    .umb-logviewer__sidebar {
-        flex: 1 1 auto;
-        width: 100%;
-    }
-}
-
-.umb-logviewer-search {
-    .filter-name {
-        margin-left: 5px;
-        margin-right: 3px;
-        max-width: 150px;
-    }
-
-    .dropdown-item {
-        padding: 8px 20px 8px 16px;
-    }
-
-    .filter {
-        position: relative;
-
-        a.btn-link {
-            padding-left: 0px;
-        }
-    }
-
-    .search-box {
-        width: 100%;
-
-        .flex-auto {
-            position: relative;
-
-            .search-input {
-                width: 100%;
-                padding-right: 160px;
-            }
-
-            .save-search,
-            .filter-search {
-                position: absolute;
-                top: 0;
-                display: flex;
-                align-items: center;;
-                height: 32px;
-            }
-
-            .save-search {
-                right: 140px;
-                color: @yellow-d1;
-                cursor: pointer;
-            }
-
-            .filter-search {
-                right: 120px;
-                color: @gray-7;
-                cursor: pointer;
-            }
-
-            .umb-variant-switcher__toggle {
-                top: 1px;
-                right: 0;
-                position: absolute;
-
-                .icon-navigation-down {
-                    margin-top: 0;
-                }
-            }
-
-            .saved-searches {
-                width: 100%;
-                max-height: 250px;
-                overflow-y: scroll;
-                margin-top: -10px;
-
-                > li {
-
-                    > button {
-                        white-space: normal;
-                        flex-wrap: wrap;
-                        column-gap: 5px;
-                    }
-
-                }
-            }
-        }
-    }
-
-    .log-items {
-        .table {
-            table-layout: fixed;
-
-            table {
-                display: table;
-                width: 100%;
-            }
-
-            thead th:first-child, thead th:nth-child(3) {
-                width: 20%;
-            }
-
-            thead th:nth-child(2) {
-                width: 15%;
-            }
-
-
-            tr td:nth-child(3) {
-                word-break: break-word;
-            }
-
-            button {
-                white-space: normal;
-                word-break: break-word;
-                text-align-last: left;
-            }
-        }
-
-        .exception {
-            border-left: 4px solid @red;
-            padding: 0 10px 10px 10px;
-            box-shadow: rgba(0,0,0,0.07) 2px 2px 10px;
-
-            .exception-message {
-                white-space: pre-wrap;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
deleted file mode 100644
index d25fe62c08..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
+++ /dev/null
@@ -1,252 +0,0 @@
-.umb-media-grid {
-   display: flex;
-   flex-wrap: wrap;
-   flex-direction: row;
-   flex-wrap: wrap;
-   align-items: center;
-   width: 100%;
-   margin-bottom: 30px;
-}
-
-.umb-media-grid__item {
-    display: flex;
-    flex-direction: column;
-    flex-wrap: wrap;
-
-    justify-content: center;
-
-    align-content: center;
-    align-items: center;
-    align-self: stretch;
-
-    border-radius: @baseBorderRadius;
-
-    margin: 10px;
-    position: relative;
-    user-select: none;
-    box-shadow: 0 1px 1px 0 rgba(0,0,0,.2);
-    transition: box-shadow 150ms ease-in-out;
-
-    > div {
-        overflow: hidden;
-        border-radius: @baseBorderRadius;
-    }
-
-}
-
-.umb-media-grid__item.-selectable, 
-.umb-media-grid__item.-folder {// If folders isnt selectable, they opens if clicked, therefor...
-    cursor: pointer;
-}
-
-.umb-media-grid__item.-file {
-    background-color: @white;
-}
-
-.umb-media-grid__item.-folder {
-    &.-selectable {
-        .media-grid-item-edit:hover .umb-media-grid__item-name,
-        .media-grid-item-edit:focus .umb-media-grid__item-name {
-            text-decoration: underline;
-        }
-    }
-}
-
-
-.umb-media-grid__item.-selected {
-    color:@ui-selected-type;
-    .umb-media-grid__item-overlay {
-        color: @ui-selected-type;
-    }
-}
-.umb-media-grid__item.-selected, 
-.umb-media-grid__item.-selectable:hover {
-    .umb-media-grid__item-select {
-        position: absolute;
-        z-index:2;
-        top: -2px;
-        left: -2px;
-        right: -2px;
-        bottom: -2px;
-        border: 2px solid @ui-selected-border;
-        border-radius: 5px;
-        box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
-        pointer-events: none;
-    }
-}
-.umb-media-grid__item.-selectable:hover {
-    .umb-media-grid__item-select {
-        opacity: .33;
-    }
-}
-.umb-media-grid__item.-selected:hover {
-    .umb-media-grid__item-select {
-        opacity: .75;
-    }
-}
-.umb-media-grid__item.-filtered:not(.-folder) {
-    cursor:not-allowed;
-    * {
-        pointer-events: none;
-    }
-}
-
-.umb-media-grid__item-file-icon {
-    transform: translate(-50%,-50%);
-    position: absolute;
-    top: 45%;
-    left: 50%;
-}
-
-.umb-media-grid__item:hover {
-   text-decoration: none;
-}
-
-.umb-media-grid__item-image {
-   position: relative;
-   object-fit: contain;
-   height: 100%;
-}
-
-.umb-media-grid__item-image-placeholder {
-    width: 100%;
-    position: relative;
-    object-fit: contain;
-    height: 100%;
-}
-
-.umb-media-grid__image-background {
-    content: "";
-    opacity: 0.5;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    position: absolute;
-    .checkeredBackground();
-}
-
-.umb-media-grid__item-overlay {
-   display: flex;
-   align-items: center;
-   width: 100%;
-   opacity: 0;
-   position: absolute;
-   right: 0;
-   bottom: 0;
-   left: 0;
-   z-index: 1;
-   padding: 5px 10px;
-   box-sizing: border-box;
-   font-size: 12px;
-   overflow: hidden;
-   color: @black;
-   white-space: nowrap;
-   border-top:1px solid fade(@black, 4%);
-   background: fade(@white, 92%);
-   transition: opacity 150ms;
-
-   &.-can-open:hover {
-       text-decoration: underline;
-   }
-   
-   .tabbing-active &:focus {
-       opacity: 1;
-   }
-}
-
-.umb-media-grid__info {
-    margin-right: 5px;
-}
-
-.umb-media-grid__item-overlay.-locked {
-    opacity: 1;
-}
-
-.umb-media-grid__item:hover .umb-media-grid__item-overlay {
-   opacity: 1;
-   i {
-       text-decoration: none;
-   }
-}
-
-.umb-media-grid__item-overlay {
-    cursor: pointer;
-
-    &:hover .umb-media-grid__item-name{
-        text-decoration: underline;
-    }
-}
-
-.umb-media-grid__item-overlay:not(.-selected) {
-    &:hover + .umb-media-grid__item-select {
-        display: none;
-    }
-}
-
-.umb-media-grid__item-name {
-   white-space: nowrap;
-   overflow: hidden;
-   text-overflow: ellipsis;
-
-}
-
-
-.umb-media-grid__edit {
-    position: absolute;
-    opacity: 0;
-    z-index: 2;
-    top: 10px;
-    right: 10px;
-    width: 26px;
-    height: 26px;
-    background: @white;
-    border-radius: 50px;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: @black;
-    transition: opacity 150ms;
-    
-    &:hover {
-        color: @ui-action-discreet-type-hover;
-    }
-}
-
-.umb-media-grid__item:hover .umb-media-grid__edit {
-    opacity: 1;
-    text-decoration: none;
-    box-shadow: 0 1px 2px rgba(0,0,0,.2);
-}
-
-/*for the listview*/
-
-.umb-media-grid__list-item.selected, .umb-media-grid__list-item.selected:hover, .umb-media-grid__list-item.selected:focus {
-    border: 2px solid #f5c1bc !important;
-}
-.umb-media-grid__list-item-name:hover {
-    text-decoration:underline;
-} 
-.umb-media-grid__list-item.-filtered:not(.-folder) {
-  cursor: not-allowed;
-
-  * {
-    pointer-events: none;
-  }
-}
-
-
-.umb-media-grid__list-view .umb-table-cell.umb-table__name {
-    flex: 1 1 25%;
-    max-width: none;
-    white-space: normal;
-}
-
-.umb-media-grid__list-view .umb-table-cell.umb-table__name .item-name {
-    white-space:normal;
-}
-.umb-media-grid__list-view .umb-table-cell.umb-table__name ins {
-    text-decoration: none;
-    margin-top: 3px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-editor.less
deleted file mode 100644
index 68266e9483..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-editor.less
+++ /dev/null
@@ -1,38 +0,0 @@
-.umb-modal .umb-mini-editor {
-   
-    .umb-panel-header {
-        padding: 20px;
-        background: @gray-10;
-        border-bottom: 1px solid @purple-l3;
-        height: 59px;
-
-        .umb-headline {
-            margin-left: 0;
-            margin-right: 0;
-            margin-bottom: 0;
-            margin-top: 3px;
-        }
-    }
-
-    .umb-panel-body {
-        padding-left: 0;
-        padding-right: 0;
-    }
-
-    .umb-panel-body.with-footer {
-        bottom: 52px;
-    }
-
-    .umb-panel-footer {
-        background: @gray-10;
-        border-top: 1px solid @purple-l3;
-        height: 52px;
-        padding: 0 20px;
-    }
-
-    // Hacks to fix editors inside the mini editors
-    .umb-editor-sub-header {
-        margin-top: 0;
-    }
-
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less
deleted file mode 100644
index ecb1ad1904..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-list-view.less
+++ /dev/null
@@ -1,95 +0,0 @@
-.umb-mini-list-view__title {
-    display: flex;
-    align-items: center;
-}
-
-.umb-mini-list-view__title-text {
-    font-size: 16px;
-    font-weight: bold;
-}
-
-.umb-mini-list-view__title-icon {
-    font-size: 20px; 
-    margin-right: 5px;
-}
-
-.umb-mini-list-view__breadcrumb {
-    .flex;
-    margin-bottom: 10px;
-    min-height: 25px;
-}
-
-.umb-mini-list-view__back {
-    font-size: 13px;
-    margin-right: 5px;
-    color: @gray-4;
-    display: flex;
-    align-items: center;
-}
-
-.umb-mini-list-view__back-icon {
-    margin-right: 4px;
-    height: 11px;
-    line-height: 11px;
-}
-
-.umb-mini-list-view__back-text {
-    text-decoration: underline;
-    margin-right: 5px;
-}
-
-.umb-mini-list-view__back:hover {
-    opacity: 1;
-    text-decoration: none;
-    color: @black;
-}
-
-.umb-minilistview {
-    overflow: hidden;
-}
-
-/* Animations */
-.umb-mini-list-view.ng-animate {
-    transition: 120ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all;
-    position: relative;
-    display: block;
-}
-
-/* Forward */ 
-.umb-mini-list-view--forward.ng-enter {
-    left: 100%;
-    opacity: 0;
-}
-
-.umb-mini-list-view--forward.ng-enter.ng-enter-active {
-    left: 0;
-    opacity: 1;
-}
-
-.umb-mini-list-view--forward.ng-leave {
-    left: 0;
-}
-
-.umb-mini-list-view--forward.ng-leave.ng-leave-active {
-    left: -100%;
-    opacity: 0;
-}
-
-/* Backwards */
-.umb-mini-list-view--backwards.ng-enter {
-    right: 100%;
-}
-
-.umb-mini-list-view--backwards.ng-enter.ng-enter-active {
-    right: 0;
-    opacity: 1;
-}
-
-.umb-mini-list-view--backwards.ng-leave {
-    left: 0;
-}
-
-.umb-mini-list-view--backwards.ng-leave.ng-leave-active {
-    right: -100%;
-    opacity: 0;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less
deleted file mode 100644
index bdcc0055dd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less
+++ /dev/null
@@ -1,49 +0,0 @@
-.umb-mini-search {
-    position: relative;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    .icon {
-        position: absolute;
-        left: 9px;
-        width: 1em;
-        height: 1em;
-        pointer-events: none;
-        color: @ui-action-discreet-type;
-        transition: color .1s linear;
-    }
-
-    input {
-        width: 0;
-        padding-left: 24px;
-        margin-bottom: 0;
-        background-color: transparent;
-        border-color: @ui-action-discreet-border;
-        transition: background-color .1s linear, border-color .1s linear, color .1s linear, width .1s ease-in-out, padding-left .1s ease-in-out;
-        cursor: pointer;
-    }
-
-    &:focus-within, &:hover {
-        .icon {
-            color: @ui-action-discreet-type-hover;
-        }
-
-        input {
-            color: @ui-action-discreet-border-hover;
-            border-color: @ui-action-discreet-border-hover;
-        }
-    }
-
-    input:focus, &:focus-within input {
-        background-color: white;
-        color: @ui-action-discreet-border-hover;
-        border-color: @ui-action-discreet-border-hover;
-        cursor: unset;
-    }
-    
-    input:focus, &:focus-within input, &.--has-value input {
-        width: 190px;
-        padding-left:30px;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-multiple-textbox.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-multiple-textbox.less
deleted file mode 100644
index 70e442b3eb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-multiple-textbox.less
+++ /dev/null
@@ -1,58 +0,0 @@
-.umb-multiple-textbox {
-    .umb-property-editor--limit-width();
-
-    &__confirm {
-        position: relative;
-        display: inline-block;
-
-        &-action {
-            margin: -2px 0 0 0;
-            padding: 2px;
-            background: transparent;
-            border: 0 none;
-        }
-    }
-}
-
-.umb-multiple-textbox .textbox-wrapper {
-    align-items: center;
-    margin-bottom: 15px;
-}
-
-.umb-multiple-textbox .textbox-wrapper .umb-editor {
-    margin-bottom: 0;
-}
-
-.umb-multiple-textbox .textbox-wrapper i:not(.icon-delete, .icon-check) {
-    margin-right: 5px;
-}
-
-.umb-multiple-textbox .textbox-wrapper i.handle {
-    margin-left: 10px;
-    cursor: move;
-}
-
-.umb-multiple-textbox .add-link {
-    &:extend(.umb-node-preview-add);
-}
-
-.umb-multiple-textbox .add-link:hover {
-    &:extend(.umb-node-preview-add:hover);
-}
-
-.umb-editor-wrapper .umb-multiple-textbox .add-link {
-    &:extend(.umb-editor-wrapper .umb-node-preview);
-}
-
-.umb-multiple-textbox .add-link:disabled {
-    &:extend(.umb-node-preview-add:disabled);
-}
-
-.umb-multiple-textbox .add-link:disabled:hover {
-    &:extend(.umb-node-preview-add:disabled:hover);
-}
-
-.umb-modal .umb-multiple-textbox .textbox-wrapper .umb-editor {
-    flex: 1 1 auto;
-    width: auto;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
deleted file mode 100644
index fd681f397f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
+++ /dev/null
@@ -1,290 +0,0 @@
-.umb-nested-content {
-    position: relative;
-}
-
-.umb-nested-content-property-container {
-    position: relative;
-
-    &:not(:last-child){
-        margin-bottom: 12px;
-    }
-}
-
-.umb-nested-content--not-supported {
-    opacity: 0.3;
-    pointer-events: none;
-}
-
-.umb-nested-content-overlay {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: 1000;
-}
-
-.umb-nested-content__item {
-    position: relative;
-    text-align: left;
-    background: @white;
-    border: 1px solid @gray-9;
-    border-radius: @baseBorderRadius;
-    transition: border-color 120ms;
-    margin-bottom: 4px;
-    margin-top: 4px;
-
-    &.--error {
-        border-color: @formErrorBorder !important;
-    }
-    
-    .show-validation-type-warning &.--error {
-        border-color: @formWarningBorder !important;
-    }
-}
-
-.umb-nested-content__item.ui-sortable-placeholder {
-    margin-top: 1px;
-    visibility: visible !important;
-}
-
-.umb-nested-content__item--single {
-    border: 0;
-
-    > .umb-nested-content__content {
-        > .umb-pane {
-            margin: 0;
-        }
-    }
-}
-
-.umb-nested-content__header-bar {
-    cursor: pointer;
-    background-color: @white;
-    -moz-user-select: none;
-    -khtml-user-select: none;
-    -webkit-user-select: none;
-    -o-user-select: none;
-    user-select: none;
-
-    &:hover {
-        .umb-nested-content__heading .umb-nested-content__item-name {
-            padding-right: 60px;
-        }
-    }
-}
-
-.umb-nested-content__heading {
-    display: flex;
-    padding: 15px;
-    line-height: 20px;
-    color: @ui-option-type;
-
-    &:hover {
-        color: @ui-option-type-hover;
-    }
-
-    .umb-nested-content__item-icon {
-        margin-top: -3px;
-        font-size: 22px;
-    }
-
-    .umb-nested-content__item-name {
-        display: block;
-        max-height: 20px;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        padding-left: 5px;
-
-        &.--has-icon {
-            padding-left: 10px;
-        }
-    }
-}
-
-.umb-nested-content__icons {
-    opacity: 0;
-    transition: opacity 120ms ease-in-out;
-    position: absolute;
-    right: 0;
-    top: 5px;
-    padding: 5px;
-    background-color: @white;
-}
-
-.umb-nested-content__item--active > .umb-nested-content__header-bar {
-    .umb-nested-content__heading {
-        background-color: @ui-active;
-
-        &:hover {
-            color: @ui-option-type;
-        }
-
-        .umb-nested-content__item-name {
-            padding-right: 60px;
-        }
-    }
-
-    .umb-nested-content__icons {
-        background-color: @ui-active;
-        &:before {
-            background: linear-gradient(90deg, rgba(255,255,255,0), @ui-active);
-        }
-    }
-}
-
-.umb-nested-content__header-bar:hover .umb-nested-content__icons,
-.umb-nested-content__header-bar:focus .umb-nested-content__icons,
-.umb-nested-content__header-bar:focus-within .umb-nested-content__icons,
-.umb-nested-content__item--active > .umb-nested-content__header-bar .umb-nested-content__icons {
-    opacity: 1;
-}
-
-.umb-nested-content__icon {
-    background: transparent;
-    border: 0 none;
-    display: inline-block;
-    padding: 4px;
-    margin: 2px;
-    cursor: pointer;
-    color: @ui-option-type;
-}
-
-.umb-nested-content__icon:hover {
-    color: @ui-option-type-hover;
-    text-decoration: none;
-}
-
-.umb-nested-content__icon .icon {
-    display: block;
-    font-size: 18px !important;
-}
-
-.umb-nested-content__icon--disabled {
-    opacity: 0.3;
-    cursor: default !important;
-
-    &:hover {
-        color: @ui-option-type;
-    }
-}
-
-.umb-nested-content__footer-bar {
-    margin-top: 20px;
-}
-
-.umb-nested-content__add-content {
-    display: flex;
-    width: 100%;
-    align-items: center;
-    justify-content: center;
-    border: 1px dashed @ui-action-discreet-border;
-    color: @ui-action-discreet-type;
-    font-weight: bold;
-    padding: 5px 15px;
-    box-sizing: border-box;
-}
-
-.umb-nested-content__add-content:hover {
-    color: @ui-action-discreet-type-hover;
-    border-color: @ui-action-discreet-border-hover;
-    text-decoration: none;
-}
-
-.umb-nested-content__add-content.--disabled,
-.umb-nested-content__add-content.--disabled:hover,
-.umb-nested-content__add-content[disabled],
-.umb-nested-content__add-content[disabled]:hover {
-    color: @gray-7;
-    border-color: @gray-7;
-    cursor: not-allowed;
-}
-
-.umb-nested-content__content {
-    border-top: 1px solid transparent;
-    border-bottom: 1px solid transparent;
-    border-left: 1px solid transparent;
-    border-right: 1px solid transparent;
-    border-radius: 0 0 3px 3px;
-}
-
-.umb-nested-content__item--active:not(.umb-nested-content__item--single) .umb-nested-content__content {
-    background: @brownGrayExtraLight;
-}
-
-.umb-nested-content__content .umb-control-group {
-    padding-bottom: 0;
-}
-
-.umb-nested-content__item.ui-sortable-helper .umb-nested-content__content {
-    display: none !important;
-}
-
-.umb-nested-content__doctypepicker table input,
-.umb-nested-content__doctypepicker table select {
-    width: 100%;
-    padding-right: 0;
-}
-
-.umb-nested-content__doctypepicker table td.icon-navigation,
-.umb-nested-content__doctypepicker .umb-nested-content__help-icon {
-    vertical-align: middle;
-    color: @gray-7;
-}
-
-.umb-nested-content__doctypepicker table td.icon-navigation:hover,
-.umb-nested-content__doctypepicker .umb-nested-content__help-icon:hover {
-    color: @gray-2;
-}
-
-.umb-nested-content__doctypepicker .umb-nested-content__help-action {
-    margin-left: 10px;
-}
-
-.umb-nested-content__placeholder {
-    padding: 4px 6px;
-    border: 1px dashed @gray-8;
-    background: 0 0;
-    cursor: pointer;
-    color: @blueExtraDark;
-    -webkit-animation: fadeIn .5s;
-    animation: fadeIn .5s;
-    text-align: center;
-
-    &--selected {
-        border: none;
-        text-align: left;
-        padding: 0;
-    }
-}
-
-.umb-nested-content__placeholder:hover {
-    color: @blueMid;
-    border-color: @blueMid;
-    text-decoration: none;
-}
-
-.form-horizontal .umb-nested-content--narrow .controls-row {
-    margin-left: 40% !important;
-}
-
-.form-horizontal .umb-nested-content--narrow .controls-row .umb-textstring,
-.form-horizontal .umb-nested-content--narrow .controls-row .umb-textarea
-{
-    width: 95%;
-}
-
-.form-horizontal .umb-nested-content--narrow .controls-row .umb-dropdown {
-    width: 99%;
-}
-
-// this resolves the layout issue introduced in nested content in 7.12 with the addition of the input for link anchors
-// the attribute selector ensures the change only applies to the linkpicker overlay
-.form-horizontal .umb-nested-content--narrow [ng-controller*="Umbraco.Overlays.LinkPickerController"] .controls-row {
-    margin-left:0!important;
-
-    .umb-textarea, .umb-textstring {
-        width:100%;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
deleted file mode 100644
index 0173592de6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
+++ /dev/null
@@ -1,144 +0,0 @@
-.umb-node-preview {
-    padding: 5px 0;
-    display: flex;
-    box-sizing: border-box;
-    border-bottom: 1px solid @gray-9;
-    flex-wrap: wrap;
-}
-
-.umb-editor-wrapper .umb-node-preview {
-  word-break: break-word;
-  .umb-property-editor--limit-width();
-}
-
-.umb-node-preview:last-of-type {
-    border-bottom: none;
-}
-
-.umb-node-preview--sortable {
-    cursor: move;
-}
-
-.umb-node-preview--unpublished {
-    .umb-node-preview__icon,
-    .umb-node-preview__name,
-    .umb-node-preview__description {
-        opacity: 0.6;
-    }
-}
-
-.umb-node-preview__icon {
-    display: flex;
-    height: 100%;
-    justify-content: center;
-    align-items: center;
-    font-size: 20px;
-    margin-right: 10px;
-    flex: 0 0 auto;
-}
-
-.umb-node-preview__content {
-    flex: 1 1 auto;
-    overflow: hidden;
-}
-
-.umb-node-preview__name {
-    color: @black;
-    margin-top: 3px;
-}
-
-.umb-node-preview__description {
-    font-size: 12px;
-    line-height: 1.5em;
-    color: @gray-3;
-}
-
-.umb-node-preview__name,
-.umb-node-preview__description {
-    /*text-overflow: ellipsis;
-    overflow: hidden;*/
-    word-wrap: break-word;
-}
-
-.umb-node-preview__actions {
-    flex: 0 0 auto;
-    display: flex;
-    align-items: center;
-    margin-left: auto;
-}
-
-.umb-node-preview__action {
-    background: transparent;
-    padding: 0;
-    border: 0 none;
-    margin-left: 5px;
-    margin-right: 5px;
-    font-size: 13px;
-    font-weight: bold;
-    color: @ui-action-type;
-    cursor: pointer;
-}
-
-.umb-node-preview__action:hover {
-    color: @ui-action-type-hover;
-    text-decoration: none;
-    opacity: 1;
-}
-
-.umb-node-preview__action--red:hover {
-    color: @red;
-}
-
-.umb-node-preview-add {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background: transparent;
-    border: 1px dashed @ui-action-discreet-border;
-    color: @ui-action-discreet-type;
-    font-weight: bold;
-    padding: 5px 15px;
-    box-sizing: border-box;
-    width: 100%;
-}
-
-.umb-node-preview-add + .umb-node-preview-add {
-  margin-left: -1px;
-}
-
-.umb-node-preview-add:hover {
-    color: @ui-action-discreet-type-hover;
-    border-color: @ui-action-discreet-border-hover;
-    text-decoration: none;
-    z-index:1;
-}
-
-.umb-node-preview-add:disabled {
-    cursor: not-allowed;
-
-    &:hover {
-        border-color: @ui-action-discreet-border;
-        color: @ui-action-discreet-type;
-    }
-}
-
-.umb-editor-wrapper .umb-node-preview-add {
-    .umb-property-editor--limit-width();
-}
-
-.umb-overlay, 
-.umb-modal {
-    .umb-node-preview {
-        max-width: none;
-    }
-    .umb-node-preview-add {
-        max-width: none;
-    }
-}
-
-//  Single
-.umb-node-preview[single] {
-    border: 1px solid @gray-9;
-    padding: 12px 15px;
-    border-radius: @baseBorderRadius;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-number-badge.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-number-badge.less
deleted file mode 100644
index 3c2dbbdf20..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-number-badge.less
+++ /dev/null
@@ -1,39 +0,0 @@
-.umb-number-badge {
-    border: 1px solid @gray-6;
-    width: 25px;
-    height: 25px;
-    border-radius: 50%;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: center;
-    color: @black;
-    font-size: 15px;
-}
-
-.umb-number-badge--xs {
-    width: 20px;
-    height: 20px;
-    font-size: 13px;
-}
-
-.umb-number-badge--s {
-    width: 25px;
-    height: 25px;
-}
-
-.umb-number-badge--m {
-    width: 30px;
-    height: 30px;
-}
-
-.umb-number-badge--l {
-    width: 40px;
-    height: 40px;
-    font-size: 18px;
-}
-
-.umb-number-badge--xl {
-    width: 50px;
-    height: 50px;
-    font-size: 20px;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-number.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-number.less
deleted file mode 100644
index c0e3dee8e5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-number.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.umb-number {
-    .umb-property-editor--limit-width();
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less
deleted file mode 100644
index 43f3c5e353..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-
-    Install local package
-
-*/
-
-// Helpers
-.faded {
-    color: @gray-5;
-}
-
-.umb-upload-local {
-
-    &__dropzone {
-        position: relative;
-        width: 500px;
-        height: 300px;
-        border: 2px dashed @ui-action-border;
-        border-radius: 3px;
-        background: @white;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        margin-bottom: 30px;
-        transition: 100ms box-shadow ease, 100ms border ease;
-
-        &.drag-over {
-            border-color: @ui-action-border-hover;
-            border-style: solid;
-            box-shadow: 0 3px 8px rgba(0,0,0, .1);
-            transition: 100ms box-shadow ease, 100ms border ease;
-        }
-
-        .umb-icon {
-            display: block;
-            color: @ui-action-type;
-            font-size: 6.75rem;
-            line-height: 1;
-            margin: 0 auto;
-        }
-
-        .umb-info-local-item {
-            margin: 20px;
-        }
-    }
-
-    &__select-file {
-        font-weight: bold;
-        color: @ui-action-type;
-        cursor: pointer;
-
-        &:hover {
-            text-decoration: underline;
-            color: @ui-action-type-hover;
-        }
-    }
-}
-
-// Accept terms
-.umb-accept-terms {
-    display: flex;
-    align-items: center;
-    font-size: 13px;
-}
-
-.umb-package-installer-label .label-text {
-    margin-left: 5px;
-}
-
-.umb-package-installer-label input[type="radio"],
-.umb-package-installer-label input[type="checkbox"] {
-    margin-top: 0px;
-}
-
-.umb-package-installer-label {
-    display: inline-flex;
-    align-items: center;
-    font-size: 13px;
-    user-select: none;
-}
-
-// Info state
-.umb-info-local-items {
-    border-radius: 3px;
-    background: @gray-10;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    margin: 0 20px;
-    width: 100%;
-    max-width: 540px;
-    background: @white;
-    box-shadow: 0 1px 1px 0 rgba(0,0,0,.16);
-}
-
-.umb-info-local-items a {
-    text-decoration: underline;
-
-    &:hover {
-        text-decoration: none;
-    }
-}
-
-
-.umb-info-local-items .umb-package-icon {
-    width: 100%;
-    box-sizing: border-box;
-    min-height: 150px;
-    font-size: 60px;
-}
-
-.umb-info-local-items .umb-package-icon img {
-    max-width: 100px;
-}
-
-.umb-info-local-items .umb-package-info {
-    width: 100%;
-    box-sizing: border-box;
-    padding: 20px 40px;
-}
-
-.umb-info-local-item {
-    margin-bottom: 20px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
deleted file mode 100644
index d4415ce0f6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
+++ /dev/null
@@ -1,573 +0,0 @@
-[data-element="editor-packages"] {
-  .umb-pane {
-    height: 100%;
-    margin: 0;
-
-    .umb-pane-content,
-    .umb-editor-sub-views {
-      height: 100%;
-
-      .umb-editor-sub-view {
-        padding: 20px;
-      }
-
-      .sub-view-Marketplace {
-        height: 100%;
-        margin: 0;
-        padding: 0;
-
-        .umb-editor-sub-view__content {
-          height: 100%;
-        }
-      }
-    }
-  }
-}
-
-.umb-marketplace-view-wrapper {
-  height: 100%;
-  display: flex;
-  align-items: stretch;
-}
-
-.umb-marketplace-view {
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
-
-.umb-packages-view-title {
-    font-size: 20px;
-    font-weight: bold;
-    color: @black;
-    margin-bottom: 30px;
-}
-
-.umb-packages-view-wrapper {
-    padding: 20px 60px;
-}
-
-@media (max-width: 768px) {
-
-    .umb-packages-view-wrapper {
-        padding: 0;
-    }
-
-}
-
-.umb-packages-section {
-    margin-bottom: 40px;
-}
-
-.umb-packages-search {
-    width: 100%;
-    border-radius: 3px;
-    box-sizing: border-box;
-}
-
-.umb-packages-search input {
-    border-width: 2px;
-    border-radius: 3px;
-    min-height: 44px;
-    padding: 4px 10px;
-    font-size: 16px;
-    margin-bottom: 0;
-    border-color: @gray-8;
-
-    &:hover, &:focus {
-        border-color: @gray-8;
-    }
-}
-
-.umb-packages__pagination {
-    display: flex;
-    justify-content: center;
-}
-
-.umb-packages {
-    display: grid;
-    grid-gap: 20px;
-    grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
-}
-
-// Cards
-.umb-package {
-    box-sizing: border-box;
-}
-
-.umb-package-link {
-    display: block;
-    position: relative;
-    box-sizing: border-box;
-    height: 100%;
-    width: 100%;
-    border-radius: 3px;
-    border: 1px solid transparent;
-    text-decoration: none !important;
-    transition: border-color 100ms ease;
-    background-color: @white;
-    box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
-
-    &:hover {
-        border-color: @blueMid;
-    }
-}
-
-// Icon
-.umb-package-icon {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding-top: 10px;
-    padding-right: 10px;
-    padding-left: 10px;
-    padding-bottom: 10px;
-    text-align: center;
-    background-color: @white;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
-    min-height: 60px;
-
-    img {
-        max-width: 70px;
-        width: 70px;
-        height: auto;
-    }
-}
-
-// Info
-.umb-package-info {
-    padding: 15px;
-    text-align: center;
-}
-
-// Name
-.umb-package-name {
-    font-size: 14px;
-    max-width: 250px;
-    margin-bottom: 5px;
-    font-weight: bold;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    line-height: normal;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-.umb-package-description {
-    font-size: 12px;
-    color: @gray-4;
-    word-wrap: break-word;
-    line-height: 1.1rem;
-    white-space: nowrap;
-    max-width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-// Numbers
-.umb-package-numbers {
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: row;
-    justify-content: center;
-    opacity: .6;
-    margin-top: 10px;
-
-    small {
-        padding: 0 5px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-    }
-
-    .umb-icon {
-        font-size: 0.9rem;
-    }
-}
-
-.umb-package-link {
-    &:hover {
-        .umb-package-numbers {
-            opacity: 1;
-
-            .icon-hearts {
-                color: @red !important;
-            }
-        }
-    }
-
-    .umb-package-cloud {
-        margin-top: 0.5rem;
-        font-size: 0.75rem;
-        min-height: 1rem; // ensures vertical space is taken up even if "works on cloud" isn't visible
-
-        .umb-icon {
-            color: @turquoise !important;
-            font-size: 0.9rem;
-        }
-    }
-}
-
-// Version
-.umb-package-version {
-    display: inline-flex;
-    font-size: 12px;
-    font-weight: bold;
-    padding: 1px 5px;
-    background: @gray-8;
-    border-radius: 3px;
-    color: @black;
-}
-
-/* CATEGORIES */
-
-.umb-packages-categories {
-    display: flex;
-    user-select: none;
-    flex-wrap: wrap;
-}
-
-.umb-packages-category {
-    display: flex;
-    align-items: center;
-    flex: 1 0 auto;
-    justify-content: center;
-    max-width: 25%;
-    font-size: 14px;
-    font-weight: bold;
-    color: @black;
-    box-sizing: border-box;
-    justify-content: center;
-    border: 1px solid @gray-8;
-    border-left: 0;
-    padding: 10px 0;
-    background: @white;
-}
-
-
-@media (max-width: 768px) {
-    .umb-packages-category {
-        width: 100%;
-        margin-top: 0;
-        margin-bottom: 15px !important;
-        margin-left: 0 !important;
-        margin-right: 0 !important;
-    }
-}
-
-@media (max-width: 992px) {
-    .umb-packages-category {
-        border: 1px solid @gray-8;
-        margin: 5px;
-        flex: 0 0 auto;
-        text-align: center;
-        padding: 10px;
-        max-width: 100%;
-        border-radius: 3px;
-    }
-}
-
-@media (min-width: 1100px) and (max-width: 1300px) {
-    .umb-packages-category {
-        border: 1px solid @gray-8;
-        margin: 5px;
-        flex: 0 0 auto;
-        text-align: center;
-        padding: 10px;
-        max-width: 100%;
-        border-radius: 3px;
-    }
-}
-
-
-.umb-packages-category:hover {
-    color: @ui-active-type-hover;
-    text-decoration: none;
-}
-.umb-packages-category.-active {
-    color: @ui-active-type;
-    background-color: @ui-active;
-}
-
-.umb-packages-category.-first {
-    border-left: 1px solid @gray-8;
-    border-top-left-radius: 3px;
-    border-bottom-left-radius: 3px;
-}
-
-.umb-packages-category.-last {
-    border-right: 1px solid @gray-8;
-    border-top-right-radius: 3px;
-    border-bottom-right-radius: 3px;
-}
-
-/* PACKAGE DETAILS */
-
-.umb-package-details {
-    display: flex;
-    flex-flow: row wrap;
-}
-
-.umb-package-details__back-action {
-    font-weight: bold;
-    color: @black;
-    padding: 0;
-    border: 0;
-    background-color: transparent;
-}
-
-.umb-package-details__back-action:focus,
-.umb-package-details__back-action:hover {
-    color: @gray-4;
-    text-decoration: none;
-}
-
-
-@sidebarwidth: 350px; // Width of sidebar. Ugly hack because of old version of Less
-
-.umb-package-details__main-content {
-    flex: 1 1 auto;
-    margin-right: 20px;
-    width: calc(~'100%' - ~'@{sidebarwidth}' - ~'20px'); // Make sure that the main content area doesn't gets affected by inline styling
-    min-width: 480px;
-}
-
-.umb-package-details__sidebar {
-    flex: 0 0 @sidebarwidth;
-}
-
-@media (max-width: 768px) {
-
-    .umb-package-details {
-        flex-direction: column;
-    }
-
-    .umb-package-details__main-content {
-        flex: 1 1 auto;
-        width: 100%;
-        margin-bottom: 30px;
-        margin-right: 0;
-        min-width: 300px;
-    }
-
-    .umb-package-details__sidebar {
-        flex: 1 1 auto;
-        width: 100%;
-    }
-}
-
-@media (max-width: 480px) {
-    .umb-package-details__main-content {
-        min-width: 0px;
-    }
-}
-
-.umb-package-details__section {
-    background: @gray-10;
-    padding: 20px;
-    margin-bottom: 20px;
-    border-radius: 3px;
-    border: 1px solid @gray-8;
-}
-
-.umb-package-details__section-title {
-    font-size: 17px;
-    font-weight: bold;
-    color: @black;
-    margin-top: 0;
-    margin-bottom: 15px;
-}
-
-.umb-package-details__section-description {
-    font-size: 12px;
-    line-height: 1.6em;
-    margin-bottom: 15px;
-}
-
-.umb-package-details__information-item {
-    margin-bottom: 10px;
-    font-size: 13px;
-}
-
-.umb-package-details__information-item-label {
-    color: @black;
-    font-weight: bold;
-}
-
-.umb-package-details__information-item-content {
-    word-break: break-word;
-}
-
-.umb-package-details__information-item-label-2 {
-    font-size: 12px;
-    color: @gray-4;
-}
-
-.umb-package-details__compatability {
-    margin-bottom: 15px;
-}
-
-.umb-package-details__compatability-label {
-    margin-bottom: 3px;
-}
-
-.umb-package-details__description {
-    margin-bottom: 20px;
-    line-height: 1.6em;
-    word-wrap: break-word;
-}
-
-.umb-package-details__description p {
-    margin-bottom: 20px;
-}
-
-.umb-package-details__description a {
-    text-decoration: underline;
-}
-
-.umb-package-details__description a:hover,
-.umb-package-details__description a:focus {
-    text-decoration: none;
-}
-
-/* Links */
-
-.umb-package-details__link {
-  font-weight: bold;
-  color: @black;
-}
-
-.umb-package-details__link:hover {
-    text-decoration: underline;
-}
-/* Install instructions */
-.umb-package-details__install-instructions {
-  background: #444;
-  color: #fff;
-  font-family: Monaco,Menlo,Consolas,'Courier New',monospace;
-  padding: 20px 20px;
-  border-radius: 5px;
-  margin: 20px 0 10px 0;
-  word-wrap: break-word;
-}
-
-/* Install instructions */
-.umb-package-details__install-instructions span {
-  color: @blueMidLight;
-}
-
-/* Owner profile */
-
-.umb-package-details__owner-profile {
-    display: flex;
-    align-items: center;
-}
-.umb-package-details__owner-profile-avatar {
-    margin-right: 15px;
-    flex: 0 0 auto;
-}
-
-.umb-package-details__owner-profile-name {
-    font-size: 15px;
-    color: @black;
-    font-weight: bold;
-}
-
-.umb-package-details__owner-profile-karma {
-    font-size: 12px;
-    color: @gray-4;
-}
-
-/* gallery */
-
-.umb-gallery__thumbnails {
-    display: flex;
-    flex-wrap: wrap;
-}
-
-.umb-gallery__thumbnail {
-    background: transparent;
-    flex: 0 1 100px;
-    border: 1px solid @ui-action-discreet-border;
-    border-radius: 3px;
-    margin: 5px;
-    padding: 10px;
-    box-sizing: border-box;
-    max-width: 100px;
-}
-
-.umb-gallery__thumbnail:hover {
-    cursor: pointer;
-    border-color: @ui-action-discreet-border-hover;
-}
-
-.umb-gallery__thumbnail:focus-visible,
-.umb-gallery__thumbnail:focus {
-  cursor: pointer;
-  border: 2px solid @ui-outline;
-}
-
-/* PACKAGE LIST */
-
-.umb-package-list {
-    display: flex;
-    flex-direction: column;
-}
-
-.umb-package-list__item {
-    display: flex;
-    flex-direction: row;
-    background: @gray-10;
-    margin-bottom: 5px;
-    border-radius: 3px;
-    padding: 15px 20px;
-    align-items: center;
-}
-
-.umb-package-list__item-icon {
-    flex: 0 0 35px;
-    margin-right: 20px;
-    font-size: 30px;
-    text-align: center;
-    justify-content: center;
-    align-items: center;
-}
-
-.umb-package-list__item-content {
-    flex: 1 1 auto;
-    margin-right: 20px;
-}
-
-.umb-package-list__item-name {
-    font-size: 16px;
-    color: @black;
-    font-weight: bold;
-}
-
-.umb-package-list__item-id {
-  font-size: 12px;
-  color: @gray-6;
-}
-
-.umb-package-list__item-description {
-    font-size: 14px;
-    color: @gray-4;
-}
-
-.umb-package-list__item-actions {
-    flex: 1 1 auto;
-    display: flex;
-    justify-content: flex-end;
-}
-
-.umb-package-list__item-action {
-    font-weight: bold;
-    color: @gray-3;
-}
-
-.umb-package-list__item-action:hover {
-    text-decoration: none;
-    color: @red;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-pagination.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-pagination.less
deleted file mode 100644
index f44aa645c4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-pagination.less
+++ /dev/null
@@ -1,5 +0,0 @@
-.umb-pagination {
-    ul {
-        box-shadow: none;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-panel-group.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-panel-group.less
deleted file mode 100644
index 27d09aaa1c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-panel-group.less
+++ /dev/null
@@ -1,111 +0,0 @@
-.umb-panel-group__details {
-    border-radius: 3px;
-    margin-bottom: 40px;
-}
-
-.umb-panel-group__details-group {
-    background: @white;
-    box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
-    border-radius: @baseBorderRadius;
-}
-
-.umb-panel-group__details-group-title {
-    background-color: @blueExtraDark;
-    padding: 10px 20px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    border-radius: 3px 3px 0 0;
-}
-
-.umb-panel-group__details-group-name {
-    font-size: 16px;
-    color: @white;
-    font-weight: bold;
-}
-
-.umb-panel-group__details-checks {
-    border-top: none;
-    border-radius: 0 0 3px 3px;
-    background: @white;
-}
-
-.umb-panel-group__details-check {
-    position: relative;
-}
-
-.umb-panel-group__details-check-title {
-    padding: 15px 20px;
-}
-
-.umb-panel-group__details-check-name {
-    font-size: 15px;
-    color: @black;
-    font-weight: bold;
-    margin-bottom: 3px;
-}
-
-.umb-panel-group__details-check-description {
-    font-size: 13px;
-    color: @gray-3;
-    line-height: 1.6em;
-}
-
-.umb-panel-group__details-status {
-    padding: 15px 0;
-    display: flex;
-    border-top: 2px solid @gray-10;
-}
-
-.umb-panel-group__details-status-overlay {
-    background: @white;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    opacity: 0.9;
-}
-
-.umb-panel-group__details-status:last-child {
-    border-bottom: none;
-}
-
-.umb-panel-group__details-status-icon-container {
-    flex: 0 0 50px;
-    display: flex;
-    justify-content: center;
-    padding: 0.25rem 20px;
-}
-
-.umb-panel-group__details-status-content {
-    padding: 0 20px;
-    flex: 1 1 auto;
-}
-
-.umb-panel-group__details-status-text {
-    line-height: 1.6em;
-}
-
-.umb-panel-group__details-status-actions {
-    display: flex;
-    flex-direction: column;
-    margin-top: 10px;
-}
-
-.umb-panel-group__details-status-action {
-    background-color: @gray-10;
-    padding: 10px;
-    margin-bottom: 10px;
-    border-radius: 3px;
-}
-
-.umb-panel-group__details-status-action:last-child {
-    margin-bottom: 0;
-}
-
-.umb-panel-group__details-status-action-description {
-    margin-top: 5px;
-    font-size: 12px;
-    padding-left:165px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-progress-bar.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-progress-bar.less
deleted file mode 100644
index c8fb742f5e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-progress-bar.less
+++ /dev/null
@@ -1,50 +0,0 @@
-.umb-progress-bar {
-    background: @gray-8;
-    width: 100%;
-    display: block;
-    height: 10px;
-    border-radius: 10px;
-    box-sizing: border-box;
-    position: relative;
-    overflow: hidden;
-}
-
-.umb-progress-bar__progress {
-    background: @green;
-    position: absolute;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    width: 100%;
-    border-radius: 10px;
-
-    &--primary {
-        background: @blue;
-    }
-
-    &--secondary {
-        background: @purple;
-    }
-
-    &--success {
-        background: @green;
-    }
-
-    &--warning {
-        background: @yellow;
-    }
-
-    &--danger {
-        background: @red;
-    }
-}
-
-.umb-progress-bar--s {
-    height: 5px;
-    border-radius: 5px;
-}
-
-.umb-progress-bar--m {
-    height: 10px;
-    border-radius: 10px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-progress-circle.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-progress-circle.less
deleted file mode 100644
index b1e8ed1ecd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-progress-circle.less
+++ /dev/null
@@ -1,46 +0,0 @@
-.umb-progress-circle {
-    position: relative;
-}
-
-.umb-progress-circle__view-box {
-    position: absolute;
-    transform: rotate(-90deg);
-    right: 0;
-}
-
-// circle highlight on progressbar
-.umb-progress-circle__highlight {
-    stroke: @green;
-
-    &--primary {
-        stroke: @blue;
-    }
-
-    &--secondary {
-        stroke: @purple;
-    }
-
-    &--success {
-        stroke: @green;
-    }
-
-    &--warning {
-        stroke: @yellow;
-    }
-
-    &--danger {
-        stroke: @red;
-    }
-}
-
-// circle progressbar bg
-.umb-progress-circle__bg {
-    stroke: @gray-8;
-}
-
-// the text in the center
-.umb-progress-circle__percentage {
-    font-size: 16px;
-    font-weight: bold;
-    text-align: center;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
deleted file mode 100644
index 6b7d22d0b7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
+++ /dev/null
@@ -1,74 +0,0 @@
-.umb-property-actions__toggle {
-    position: relative;
-    display: flex;
-    flex: 0 0 auto;
-    padding: 6px 6px;
-    text-align: center;
-    cursor: pointer;
-    border-radius: 3px;
-    background-color: @ui-action-hover;
-
-    i {
-        height: 3px !important;
-        width: 3px !important;
-        border-radius: 3px;
-        background: @ui-action-type;
-        display: inline-block;
-        margin: 0 2px 0 0;
-
-        &:last-child {
-            margin: 0;
-        }
-    }
-    &:hover {
-        i {
-            background: @ui-action-type-hover;
-        }
-    }
-}
-
-.umb-property-actions {
-    display: inline;
-
-    &.-open {
-        .umb-property-actions__toggle {
-            background-color: @white;
-            border-radius: 3px 3px 0 0;
-            border: 1px solid @dropdownBorder;
-            border-bottom: 1px solid @gray-9;
-            .box-shadow(0 5px 20px rgba(0,0,0,.3));
-        }
-    }
-}
-.umb-property .umb-property-actions {
-    float: left;
-}
-.umb-property .umb-property-actions__toggle {
-    margin-top: 2px;
-    opacity: 0;
-    transition: opacity 120ms;
-}
-.umb-property:focus-within .umb-property-actions__toggle,
-.umb-property:hover .umb-property-actions__toggle,
-.umb-property .umb-property-actions__toggle:focus {
-    opacity: 1;
-}
-
-// Revert-style-hack that ensures that we only show property-actions on properties that are directly begin hovered.
-.umb-property:hover .umb-property:not(:hover) .umb-property-actions__toggle {
-    opacity: 0;
-}
-
-.umb-property-actions__menu {
-    position: absolute;
-    z-index: 1000;
-    display: block;
-    float: left;
-    min-width: 160px;
-    list-style: none;
-
-    .umb-contextmenu {
-        border-top-left-radius: 0;
-        margin-top: 0;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less
deleted file mode 100644
index c34ada479e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less
+++ /dev/null
@@ -1,70 +0,0 @@
-.umb-property-editor {
-  position: relative;
-  contain: style;
-  
-  &.is-preview {
-    contain: layout;
-  }
-}
-
-.umb-property-editor--preview {
-  pointer-events: none;
-  user-select: none;
-  opacity: 0.4;
-  cursor: not-allowed;
-}
-
-.umb-property-editor__preview-overlay {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  z-index: 999999999;
-}
-
-.umb-property:focus-within .umb-property-editor__lock-overlay-container,
-.umb-property:hover .umb-property-editor__lock-overlay-container {
-  opacity: 1;
-}
-
-.umb-property:hover .umb-property:not(:hover) .umb-property-editor__lock-overlay-container {
-  opacity: 0;
-}
-
-.umb-property-editor__lock-overlay-container {
-    opacity: 0;
-    position: absolute;
-    height: 100%;
-    width: 100%;
-    box-sizing: border-box;
-    cursor: not-allowed;
-    z-index: 9999999999;
-}
-
-.umb-property-editor__lock-overlay {
-    position: sticky;
-    box-sizing: border-box;
-    top: 56px;
-    bottom: 6px;
-    left: 50%;
-    width: 25%;
-    transform: translate(-50%, 0);
-    max-width: 800px;
-    min-width: 300px;
-    padding: 9px 15px;
-    background: rgba(242,246,255,.8);
-    border: 1px solid @blueMid;
-    color: @blueMid;
-    z-index: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-    font-size: 14px;
-    box-shadow: 0 0 4px 2px rgb(@blueDark, 12%);
-    border-radius: 6px;
-
-    > span {
-      margin-left: auto;
-      margin-right: auto;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less
deleted file mode 100644
index bc4014ed9d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less
+++ /dev/null
@@ -1,51 +0,0 @@
-.umb-property-file-upload {
-    .umb-property-editor--limit-width();
-
-    .umb-upload-button-big {
-        display: block;
-        padding: 20px;
-        opacity: 1;
-        border: 1px dashed @gray-8;
-        background: none;
-        text-align: center;
-        font-size: 14px;
-
-        &, &:hover {
-            color: @gray-8;
-        }
-
-        &:focus-within {
-            .tabbing-active & {
-                box-shadow: 0 0 2px @ui-outline, inset 0 0 2px 1px @ui-outline;
-            }
-        }
-
-        .icon {
-            font-size: 55px;
-            line-height: 70px
-        }
-
-        input {
-            left: 0;
-            bottom: 0;
-            height: 100%;
-            width: 100%;
-        }
-    }
-
-    .drag-over {
-        .umb-upload-button-big {
-            border-color: @gray-1;
-        }
-    }
-
-    .umb-property-file-upload--actions {
-        margin-top: 10px;
-    }
-}
-
-.umb-single-file-upload[readonly] {
-    input {
-        cursor: not-allowed;
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-property.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-property.less
deleted file mode 100644
index 34d65f0c5d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-property.less
+++ /dev/null
@@ -1,26 +0,0 @@
-.umb-property:focus-within .umb-property-variant-label-container,
-.umb-property:hover .umb-property-variant-label-container {
-  opacity: 1;
-}
-
-.umb-property:hover .umb-property:not(:hover) .umb-property-variant-label-container {
-  opacity: 0;
-}
-
-.umb-property-variant-label-container {
-  float: left;
-  clear: both;
-  opacity: 0;
-}
-
-.umb-property-variant-label {
-  font-size: 11px;
-  padding: 0 7px;
-  background: @gray-10;
-  border-radius: 3px;
-  display: inline-block;
-}
-
-.umb-property-variant-label + .umb-property-variant-label {
-  margin-right: 3px;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-querybuilder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-querybuilder.less
deleted file mode 100644
index 4d6054009f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-querybuilder.less
+++ /dev/null
@@ -1,46 +0,0 @@
-.umb-querybuilder .row {
-    font-size: 14px;
-    line-height: 14px
-}
-
-.umb-querybuilder .row a.btn {
-    padding: 5px 8px;
-    margin: 0 5px;
-    font-weight: bold;
-    background-color: @ui-action;
-    border: 1px solid @ui-action-border;
-    border-radius: 3px;
-    text-align: center;
-    display: inline-block;
-
-}
-
-.umb-querybuilder .row a.btn:hover {
-    background-color: @ui-action-hover;
-    border: 1px solid @ui-action-border-hover;
-    text-decoration: none;
-}
-
-.umb-querybuilder .row > div {
-    padding: 20px 0;
-    border-bottom: 1px solid @gray-10;
-}
-
-.umb-querybuilder .datepicker input {
-    width: 90px;
-}
-
-.umb-querybuilder .query-items {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-}
-
-.umb-querybuilder .query-items > *  {
-    flex: 0 1 auto;
-    margin: 5px;
-}
-
-.umb-querybuilder .query-items .btn {
-    min-height: 2rem;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-range-slider.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-range-slider.less
deleted file mode 100644
index 44d69d3856..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-range-slider.less
+++ /dev/null
@@ -1,63 +0,0 @@
-.umb-range-slider {
-
-    &.noUi-target {
-        background: linear-gradient(to bottom, @grayLighter 0%, @grayLighter 100%);
-        box-shadow: none;
-        border-radius: 20px;
-        height: 8px;
-        border: 1px solid @inputBorder;
-
-        &:focus, &:focus-within {
-            border-color: @inputBorderFocus;
-        }
-    }
-
-    .noUi-connects {
-        cursor: pointer;
-        height: 20px;
-        top: -6px;
-    }
-
-    .noUi-connect {
-        background-color: @purple-washed;
-        border: 1px solid @purple-l3;
-    }
-
-    .noUi-tooltip {
-        padding: 2px 6px;
-    }
-
-    .noUi-handle {
-        cursor: grab;
-        border-radius: 100px;
-        border: none;
-        box-shadow: none;
-        width: 20px !important;
-        height: 20px !important;
-        right: -10px !important; // half the handle width
-        background-color: @blueExtraDark;
-
-        &::before, &::after {
-            display: none;
-        }
-    }
-
-    .noUi-horizontal .noUi-handle {
-        top: -7px;
-    }
-
-    .noUi-marker-large.noUi-marker-horizontal {
-        height: 10px;
-    }
-
-    .noUi-marker.noUi-marker-horizontal {
-        width: 1px;
-    }
-}
-
-.noUi-value {
-  cursor: pointer;
-  &-active{
-    color: @black;
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-readonlyvalue.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-readonlyvalue.less
deleted file mode 100644
index f0a910b278..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-readonlyvalue.less
+++ /dev/null
@@ -1,5 +0,0 @@
-.umb-readonlyvalue {
-  position: relative;
-  word-break: break-word;
-  .umb-property-editor--limit-width();
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less
deleted file mode 100644
index a703636f30..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less
+++ /dev/null
@@ -1,32 +0,0 @@
-html .umb-search-filter {
-    position: relative;
-    height: 30px;
-    width: 190px;
-
-    &.w-100 {
-        width: 100%;
-    }
-
-    &.mb-15 {
-        margin-bottom: 15px;
-    }
-
-    &__input {
-        padding-left: 30px;
-        padding-right: 6px;
-        width: inherit;
-        margin: 0;
-    }
-
-    // "icon-search" class it kept for backward compatibility
-    .umb-icon, 
-    i.icon-search {
-        color: @gray-8;
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 8px;
-        margin: auto 0;
-        pointer-events: none;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-stylesheet.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-stylesheet.less
deleted file mode 100644
index 36d9913d66..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-stylesheet.less
+++ /dev/null
@@ -1,49 +0,0 @@
-.umb-stylesheet-rules {
-    max-width: 600px;
-}
-
-.umb-stylesheet-rules__listitem {
-    display: flex;
-    padding: 6px;
-    margin: 10px 0 !important;
-    background: @gray-10;
-    border-radius: @baseBorderRadius;
-}
-
-.umb-stylesheet-rules__listitem i {
-    display: flex;
-    align-items: center;
-    margin-right: 5px;
-    cursor: move;
-}
-
-.umb-stylesheet-rules__listitem a {
-    margin-left: auto;
-}
-
-.umb-stylesheet-rules__listitem input {
-    width: 295px;
-}
-
-.umb-stylesheet-rules__left {
-    display: flex;
-    flex: 1 1 auto;
-    overflow: hidden;
-}
-
-.umb-stylesheet-rules__right {
-    display: flex;
-    flex: 0 0 auto;
-    align-items: center;
-}
-
-textarea.umb-stylesheet-rule-styles {
-    width: 300px;
-    height: 100px;
-    resize: none;
-    font-family: @monoFontFamily;
-}
-
-.umb-stylesheet-rule-preview {
-    line-height: normal;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-sub-views.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-sub-views.less
deleted file mode 100644
index cc6be8fa37..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-sub-views.less
+++ /dev/null
@@ -1,38 +0,0 @@
-.umb-sub-views {
-
-  .umb-sub-views-action-bar {
-    margin-bottom: 40px;
-  }
-
-  .umb-sub-views-action-bar .btn-link {
-    padding-left: 0;
-    padding-right: 0;
-    &:focus {
-      text-decoration: none;
-    }
-  }
-
-  .umb-sub-views-nav {
-    float: right;
-    margin: 0;
-    .umb-sub-views-nav-item {
-      display: inline-block;
-      margin-left: 15px;
-      &.is-active {
-        .btn-link {
-          color: @blueMid !important;
-        }
-      }
-    }
-  }
-
-  .umb-sub-views-tools {
-    float: left;
-    margin: 0;
-    .umb-sub-views-tool {
-      display: inline-block;
-      margin-right: 15px;
-    }
-  }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
deleted file mode 100644
index 73ef47133c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
+++ /dev/null
@@ -1,349 +0,0 @@
-// Table Styles
-.umb-table {
-    display: flex;
-    flex-direction: column;
-    position: relative;
-    background: @white;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    min-width: auto;
-    box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
-    border-radius: 3px;
-}
-
-.umb-table.umb-table-inactive {
-
-    &:before {
-        content: "";
-        background: rgba(255, 255, 255, 0.75);
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        z-index: 10;
-        outline: 1px solid rgba(255, 255, 255, 0.75);
-    }
-
-}
-
-.umb-table__action,
-.umb-table a {
-    background: transparent;
-    border: 0 none;
-    text-decoration: none;
-    padding: 0;
-    margin-left: 1px;
-    body:not(.tabbing-active) & {
-        outline: 0;
-    }
-}
-
-
-input.umb-table__input {
-    margin: 0 auto;
-}
-
-
-
-
-// Table Head Styles
-.umb-table-head {
-    font-size: 14px;
-    font-weight: bold;
-
-    color: @ui-disabled-type;
-}
-
-.umb-table-head__icon {
-    position: relative;
-    top: 2px;
-}
-
-.umb-table-head__link {
-    background: transparent;
-    border: 0 none;
-    position: relative;
-    text-decoration: none;
-    color: @gray-3;
-    font-size: inherit;
-    font-weight: inherit;
-    padding: 0 1px;
-
-    &:hover {
-        text-decoration: none;
-        cursor: default;
-        color: @gray-3;
-    }
-}
-
-.umb-table-head__link.sortable {
-    cursor: pointer;
-    color: @ui-action-discreet-type;
-    &:hover {
-        color: @ui-action-discreet-type-hover;
-    }
-
-    outline-offset: 1px;
-}
-
-.umb-table-thead__icon {
-    position: absolute;
-    padding-top: 1px;
-    padding-left: 3px;
-    font-size: 13px;
-    cursor: default;
-}
-
-.umb-table-thead .sortable:hover {
-    cursor: pointer;
-    text-decoration: none;
-}
-
-
-// Table Body Styles
-.umb-table-body {
-    position: relative;
-}
-
-.umb-table-body .umb-table-row {
-    color: @gray-5;
-    border-top: 1px solid @gray-9;
-    font-size: 14px;
-    position: relative;
-    min-height: 52px;
-}
-.umb-table-body .umb-table-row.-selectable {
-    cursor: pointer;
-}
-.umb-table-row.-selected,
-.umb-table-body .umb-table-row.-selectable:hover {
-    &::before {
-        content: "";
-        position: absolute;
-        z-index:1;
-        top: 1px;
-        left: 1px;
-        right: 1px;
-        bottom: 1px;
-        border: 2px solid @ui-selected-border;
-        pointer-events: none;
-    }
-}
-.umb-table-body .umb-table-row.-selectable {
-    &:hover {
-        &::before {
-            opacity:.33;
-        }
-    }
-}
-.umb-table-body .umb-table-row.-selected.-selectable {
-    &:hover {
-        &::before {
-            opacity:.66;
-        }
-        .umb-table-body__checkicon {
-            color: @ui-selected-border;
-        }
-    }
-}
-
-.umb-table-body .umb-table-row.-solid {
-    cursor: default;
-
-    &:hover {
-        background-color: @white;
-    }
-}
-
-.umb-table-body__link {
-    position: relative;
-    color: @ui-option-type;
-    font-size: 14px;
-    font-weight: bold;
-    text-decoration: none;
-    cursor: pointer;
-
-    &:hover {
-        color: @ui-option-type-hover;
-        text-decoration: underline;
-    }
-}
-
-.umb-table-body .umb-table-body__icon {
-    margin: 0 auto;
-    font-size: 20px;
-    line-height: 20px;
-    color: @ui-option-type;
-    vertical-align: bottom;
-    text-decoration: none;
-}
-
-.umb-table-body .umb-table-body__icon.umb-table-body__checkicon {
-    display: none;
-    font-size: 18px;
-    line-height: 20px;
-    color: @ui-selected-border;
-}
-
-.umb-table-body .umb-table__name {
-    color: @ui-option-type;
-    font-size: 14px;
-    font-weight: bold;
-    a {
-        color: @ui-option-type;
-        outline-offset: 1px;
-        &:hover {
-            color: @ui-option-type-hover;
-            text-decoration: underline;
-        }
-    }
-}
-.umb-table-body .umb-table-row.-light {
-    .umb-table-body__icon {
-        color: @ui-option-disabled-type;
-    }
-    .umb-table__name {
-        color: @ui-option-disabled-type;
-        a {
-            color: @ui-option-disabled-type;
-            &:hover, &:focus {
-                color: @ui-option-disabled-type-hover;
-            }
-        }
-    }
-}
-
-// Styles of no items in the listview
-.umb-table-body__empty {
-    font-size: 16px;
-    text-align: center;
-    color: @gray-3;
-    padding: 20px 0;
-    height: 100%;
-}
-
-// Show checkmark when checked, hide file icon
-.umb-table-body .umb-table-row.-selected {
-    .umb-table-body__icon {
-        &.umb-table-body__fileicon {
-            display: none;
-        }
-        &.umb-table-body__checkicon {
-            display: inline-block;
-        }
-    }
-}
-
-// Table Row Styles
-.umb-table-row {
-    display: flex;
-    flex-flow: row nowrap;
-    align-items: center;
-    user-select: none;
-}
-
-.umb-table-body .umb-table-row--empty {
-    flex: 1 1 auto;
-    display: flex;
-    justify-content: center;
-    padding: 5px 0;
-    cursor: auto;
-    user-select: auto;
-}
-
-.umb-table-body .umb-table-row--empty:hover {
-    background-color: transparent;
-    cursor: auto;
-}
-
-// Table Cell Styles
-.umb-table-cell {
-    display: flex;
-    flex-flow: row nowrap;
-    flex: 1 1 5%;
-    position: relative;
-    margin: auto 0;
-    padding: 6px 16px;
-    text-align: left;
-    overflow:hidden;
-}
-
-.umb-table-cell > * {
-    overflow: hidden;
-    white-space: nowrap; //NOTE Disable/Enable this to keep textstring on one line
-    text-overflow: ellipsis;
-}
-.umb-table-cell.--noOverflow > * {
-    overflow: visible;
-    white-space: normal;
-    text-overflow: unset;
-}
-
-.umb-table-cell:first-of-type:not(.not-fixed) {
-    flex: 0 0 25px;
-    margin: 0;
-    padding: 15px 0 15px 15px;
-}
-
-.umb-table-cell--auto-width {
-    flex: 0 0 auto !important;
-}
-
-.umb-table-cell--nano {
-    flex: 0 0 50px;
-}
-.umb-table-cell--small {
-    flex: .5 .5 1%;
-    max-width: 12.5%;
-}
-.umb-table-cell--large {
-    flex: 1 1 25%;
-    max-width: 25%;
-}
-
-.umb-table-cell--faded {
-    opacity: 0.4;
-}
-
-
-// Increases the space for the name cell
-.umb-table__name {
-    flex: 1 1 20%;
-    max-width: 300px;
-}
-
-.umb-table__loading-overlay {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(255, 255, 255, 0.7);
-    z-index: 1;
-}
-
-.umb-table__row-expand {
-    font-size: 12px;
-    text-decoration: none;
-    color: @gray-4;
-
-    &:hover {
-        color: @black;
-    }
-}
-
-.umb-table__row-expand--hidden {
-    visibility: hidden;
-}
-
-.umb-table--condensed {
-
-    .umb-table-cell:first-of-type:not(.not-fixed) {
-        padding-top: 10px;
-        padding-bottom: 10px;
-    }
-
-    .umb-table-body__icon {
-        font-size: 20px;
-    }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
deleted file mode 100644
index c6adae65fc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
+++ /dev/null
@@ -1,148 +0,0 @@
-.umb-tabs-nav {
-    margin-left: 0;
-    margin-bottom: 0;
-    list-style: none;
-    border-bottom: 1px solid @gray-9;
-    display: block;
-    margin-bottom: 20px;
-}
-
-.umb-tabs-nav .badge {
-    background-color: @red;
-    animation-duration: 1.4s;
-    animation-iteration-count: infinite;
-    animation-name: umb-tab--badge-bounce;
-    animation-timing-function: ease;
-    display: none;
-    margin-left: 5px;
-
-    @keyframes umb-tab--badge-bounce {
-        0%   { transform: translateY(0); }
-        20%  { transform: translateY(-6px); }
-        40%  { transform: translateY(0); }
-        55%  { transform: translateY(-3px); }
-        70%  { transform: translateY(0); }
-        100% { transform: translateY(0); }
-    }
-}
-
-.umb-tab {
-    display: inline-flex;
-    position: relative;
-    top: 1px;
-}
-
-.umb-tab-button {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    position: relative;
-
-    cursor: pointer;
-    //border-bottom: 4px solid transparent;
-    color: @ui-light-type;
-    padding: 5px 20px 15px 20px;
-    transition: color 150ms ease-in-out;
-
-    &:focus {
-        color: @ui-light-type-hover;
-
-        body:not(.tabbing-active) &{
-            outline: none;
-        }
-    }
-
-    &:hover {
-        color: @ui-light-type-hover;
-        text-decoration: none;
-    }
-
-    &:disabled {
-        color: @ui-option-disabled-type;
-        text-decoration: none;
-    }
-
-    &::after {
-        content: "";
-        height: 0px;
-        left: 14px;
-        right: 14px;
-        background-color: @ui-light-active-border;
-        position: absolute;
-        bottom: 0;
-        border-radius: 3px 3px 0 0;
-        opacity: 0;
-        transition: all 0.2s linear;
-    }
-
-    &--expand > i {
-        height: 5px;
-        width: 5px;
-        border-radius: 50%;
-        background: @black;
-        display: inline-block;
-        margin: 0 5px 0 0;
-        opacity: 0.6;
-    }
-}
-
-.umb-tab--active > .umb-tab-button {
-    color: @ui-light-active-type;
-    //border-bottom-color: @ui-active;
-    /*
-    &:focus {
-        border-bottom-color: @ui-active;
-    }
-    &:hover {
-        border-bottom-color: @ui-active-type-hover;
-    }
-    */
-    &::after {
-        opacity: 1;
-        height: 4px;
-    }
-}
-
-.show-validation {
-
-    &.show-validation-type-error {
-        .umb-tab--error {
-            .badge {
-                display: block;
-                background-color: @red;
-            }
-
-            .umb-tab-button {
-                &::after {
-                    background-color: @red;
-                }
-            }
-        }
-    }
-
-    &.show-validation-type-warning {
-        .umb-tab--error {
-            .badge {
-                display: block;
-                background-color: @yellow-d2;
-            }
-
-            .umb-tab-button {
-                &::after {
-                    background-color: @yellow-d2;
-                }
-            }
-        }
-    }
-}
-
-// tabs tray
-
-.umb-tabs-tray {
-    right: 0;
-    left: auto;
-}
-
-.umb-tabs-tray > .umb-tab-button {
-    cursor: pointer;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-tags-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-tags-editor.less
deleted file mode 100644
index 9ef9a445f5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-tags-editor.less
+++ /dev/null
@@ -1,59 +0,0 @@
-.umb-tags-editor {
-    border: @inputBorder solid 1px;
-    padding: 5px;
-    min-height: 54px;
-    font-size: 13px;
-    text-shadow: none;
-    box-sizing: border-box;
-
-    .tag {
-        cursor: default;
-        margin: 10px;
-        padding: 10px 15px;
-        background: @blueExtraDark;
-        position: relative;
-        user-select: all;
-
-        > .btn-icon {
-            color: @white;
-            padding: 0;
-            position: relative;
-            cursor: pointer;
-            padding-left: 2px;
-            font-size: 15px;
-            right: -5px;
-            bottom: -1px;
-            user-select: none;
-        }
-
-        .umb_confirm-action {
-
-            &__overlay {
-                &.-left {
-                  top: 8px;
-                  left: auto;
-                  right: 15px;
-                }
-            }
-        }
-    }
-
-    .twitter-typeahead {
-        margin: 10px;
-        margin-top: 16px;
-        vertical-align: top;
-        max-width: calc(100% - 20px);
-
-        input {
-            border: none;
-            background: @white;
-            padding-left: 0;
-            max-width: 100%;
-        }
-    }
-}
-
-umb-tags-editor[readonly] {
-    border-color: @inputReadonlyBorderColor;
-    display: block;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-textarea.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-textarea.less
deleted file mode 100644
index 86df7c7dd5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-textarea.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.umb-textarea {
-    .umb-property-editor--limit-width();
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-textstring.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-textstring.less
deleted file mode 100644
index bc4ba033aa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-textstring.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.umb-textstring {
-    .umb-property-editor--limit-width();
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umbemailmarketing.less b/src/Umbraco.Web.UI.Client/src/less/components/umbemailmarketing.less
deleted file mode 100644
index f4b3183045..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/umbemailmarketing.less
+++ /dev/null
@@ -1,44 +0,0 @@
-.umb-email-marketing {
-
-    h2 {
-        font-weight: 800;
-        max-width: 26ex;
-        margin-top: 20px;
-    }
-
-    .layout {
-        display: flex;
-        align-items: center;
-        align-content: stretch;
-
-        .primary {
-            flex-basis: 50%;
-            padding-right: 40px;
-            padding-top: 20px;
-            padding-bottom: 20px;
-            .notice {
-                color: @gray-5;
-                font-style: italic;
-                a {
-                    color: @gray-5;
-                    &:hover {
-                        color: @ui-action-type-hover;
-                    }
-                }
-            }
-        }
-
-        .secondary {
-            flex-basis: 50%;
-            svg {
-                height: 200px;
-                width: 100%;
-                margin-top: -60px;
-            }
-        }
-    }
-
-    .cta {
-        text-align: right;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
deleted file mode 100644
index 7c327bfb88..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
+++ /dev/null
@@ -1,109 +0,0 @@
-.umb-user-cards {
-    display: grid;
-    grid-gap: 20px;
-    grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
-}
-
-.umb-user-card {
-    box-sizing: border-box;
-    max-width: 100%;
-    display: flex;
-    position: relative;
-    user-select: none;
-}
-
-.umb-user-card:hover,
-.umb-user-card:focus {
-    outline: none;
-    text-decoration: none !important;
-}
-
-.umb-user-card.-selectable {
-    cursor: pointer;
-}
-.umb-user-card.-selected, .umb-user-card.-selectable:hover {
-    &::before {
-        content: "";
-        position: absolute;
-        z-index:2;
-        top: -2px;
-        left: -2px;
-        right: -2px;
-        bottom: -2px;
-        border-radius: 5px;
-        pointer-events: none;
-        border: 2px solid @ui-selected-border;
-        box-shadow: 0 0 4px 0 darken(@ui-selected-border, 20), inset 0 0 2px 0 darken(@ui-selected-border, 20);
-    }
-}
-.umb-user-card.-selectable:hover {
-    &::before {
-        opacity: .33;
-    }
-}
-.umb-user-card.-selected:hover {
-    &::before {
-        opacity: .75;
-    }
-}
-
-.umb-user-card__content {
-    position: relative;
-    padding: 15px;
-    flex: 1 1 auto;
-    background-color: @white;
-    box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
-    border-radius: 3px;
-    box-sizing: border-box;
-    display: flex;
-    flex-direction: column;
-    max-width: 100%;
-}
-
-.umb-user-card__goToUser {
-    &:hover, &:focus {
-        text-decoration: none;
-
-        .umb-user-card__name {
-            text-decoration: underline;
-            color: @ui-option-type-hover;
-        }
-
-        .umb-avatar {
-            box-shadow: 0px 1px 3px rgba(0, 0, 0, .5);
-        }
-    }
-}
-
-.umb-user-card__avatar {
-    margin-bottom: 10px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-.umb-user-card__badge {
-    position: absolute;
-    top: 10px;
-    left: 10px;
-}
-
-
-.umb-user-card__name {
-    font-size: 15px;
-    font-weight: bold;
-    text-align: center;
-    margin-bottom: 2px;
-    word-wrap: break-word;
-}
-
-.umb-user-card__group {
-    font-size: 14px;
-    text-align: center;
-    margin-bottom: 15px;
-}
-
-.umb-user-card__last-login {
-    font-size: 13px;
-    text-align: center;
-    margin-top: auto;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-details.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-details.less
deleted file mode 100644
index a612af65ef..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-details.less
+++ /dev/null
@@ -1,119 +0,0 @@
-.umb-user-details-avatar {
-    margin-bottom: 20px;
-    padding-bottom: 20px;
-    border-bottom: 1px solid @gray-8;
-}
-
-div.umb-user-details-actions > div {
-    margin-bottom: 20px;
-}
-
-.umb-user-details-actions .umb-button {
-    margin-bottom: 20px;
-}
-
-.umb-user-details-view-title {
-    font-size: 20px;
-    font-weight: bold;
-    color: @black;
-    margin-bottom: 30px;
-}
-
-.umb-user-details-view-wrapper {
-    padding: 20px 60px;
-}
-
-@media (max-width: 768px) {
-
-    .umb-user-details-view-wrapper {
-        padding: 0;
-    }
-}
-
-.umb-user-details-section {
-    margin-bottom: 40px;
-}
-.umb-user-details-details {
-    display: flex;
-}
-
-a.umb-user-details-details__back-link {
-    font-weight: bold;
-    color: @black;
-}
-
-.umb-user-details-details__back-link:hover {
-    color: @gray-4;
-    text-decoration: none;
-}
-
-
-@sidebarwidth: 350px; // Width of sidebar. Ugly hack because of old version of Less
-
-.umb-user-details-details__main-content {
-    flex: 1 1 auto;
-    margin-right: 30px;
-    width: calc(~'100%' - ~'@{sidebarwidth}' - ~'30px'); // Make sure that the main content area doesn't gets affected by inline styling
-}
-
-.umb-user-details-details__main-content .umb-node-preview-add {
-    max-width: 100%;
-}
-
-
-.umb-user-details-details__sidebar {
-    flex: 0 0 @sidebarwidth;
-
-    .umb-button{
-        margin-left:0px;
-    }
-}
-
-@media (max-width: 768px) {
-
-    .umb-user-details-details {
-        flex-direction: column;
-    }
-
-    .umb-user-details-details__main-content {
-        flex: 1 1 auto;
-        width: 100%;
-        margin-bottom: 30px;
-        margin-right: 0;
-    }
-
-    .umb-user-details-details__sidebar {
-        flex: 1 1 auto;
-        width: 100%;
-    }
-}
-
-.umb-user-details-details__section-title {
-    font-size: 17px;
-    font-weight: bold;
-    color: @black;
-    margin-top: 0;
-    margin-bottom: 15px;
-}
-
-.umb-user-details-details__section-description {
-    font-size: 12px;
-    line-height: 1.6em;
-    margin-bottom: 15px;
-}
-
-.umb-user-details-details__information-item {
-    margin-bottom: 10px;
-    font-size: 13px;
-    margin-top:10px;
-}
-
-.umb-user-details-details__information-item-label {
-    color: @black;
-    font-weight: bold;
-}
-
-.umb-user-details-details__information-item-content {
-    word-break: break-word;
-}
-
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-group-picker-list.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-group-picker-list.less
deleted file mode 100644
index 0a06120b11..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-group-picker-list.less
+++ /dev/null
@@ -1,44 +0,0 @@
-.umb-user-group-picker-list {
-    display: flex;
-    flex-direction: column;
-}
-
-.umb-user-group-picker-list-item {
-    display: flex;
-    margin-bottom: 5px;
-    padding: 10px;
-    position: relative;
-}
-
-.umb-user-group-picker__action{
-    background: transparent;
-    border: 0 none;
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-}
-
-.umb-user-group-picker-list-item:hover {
-    background-color: @gray-10;
-    text-decoration: none;
-}
-
-.umb-user-group-picker-list-item__icon {
-    font-size: 20px;
-    line-height: 20px;
-    min-width: 20px;
-    margin-right: 15px;
-}
-
-.umb-user-group-picker-list-item__name {
-    font-size: 15px;
-    margin-bottom: 3px;
-    font-weight: bold;
-}
-
-.umb-user-group-picker-list-item__permission {
-    font-size: 13px;
-    color: @gray-4;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-group-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-group-preview.less
deleted file mode 100644
index e20763d891..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-group-preview.less
+++ /dev/null
@@ -1,68 +0,0 @@
-.umb-user-group-preview {
-    padding-top: 10px;
-    padding-bottom: 10px;
-    display: flex;
-    box-sizing: border-box;
-    border-bottom: 1px solid @gray-9;
-}
-
-.umb-user-group-preview:last-of-type {
-    border-bottom: none;
-    margin-bottom: 10px;
-}
-
-.umb-user-group-preview__icon {
-    display: flex;
-    width: 25px;
-    height: 25px;
-    justify-content: center;
-    align-items: center;
-    font-size: 20px;
-    margin-right: 10px;
-    flex: 0 0 auto;
-}
-
-.umb-user-group-preview__content {
-    flex: 1 1 auto;
-    margin-right: 25px;
-}
-
-.umb-user-group-preview__name {
-    font-size: 15px;
-    color: @black;
-    margin-bottom: 3px;
-    margin-top: 2px;
-}
-
-.umb-user-group-preview__permissions {
-    font-size: 13px;
-    color: @gray-3;
-
-    .umb-user-group-preview__permission:not(:last-child):after {
-        content: ', ';
-    }
-}
-
-.umb-user-group-preview__actions {
-    flex: 0 0 auto;
-    display: flex;
-    align-items: center;
-}
-
-.umb-user-group-preview__action {
-    margin-left: 5px;
-    margin-right: 5px;
-    font-size: 13px;
-    font-weight: bold;
-    color: @gray-5;
-}
-
-.umb-user-group-preview__action:hover {
-    color: @ui-action-type-hover;
-    text-decoration: none;
-    opacity: 1;
-}
-
-.umb-user-group-preview__action--red:hover {
-    color: @red;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-picker-list.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-picker-list.less
deleted file mode 100644
index 4a343f780a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-picker-list.less
+++ /dev/null
@@ -1,44 +0,0 @@
-.umb-user-picker-list {
-    display: flex;
-    flex-direction: column;
-}
-
-.umb-user-picker-list-item {
-    display: flex;
-    margin-bottom: 5px;
-    padding: 10px;
-    align-items: center;
-    width: 100%;
-    text-align: left;
-}
-
-.umb-user-picker-list-item:active,
-.umb-user-picker-list-item:focus {
-    text-decoration: none;
-}
-
-.umb-user-picker-list-item:hover {
-    background-color: @gray-10;
-    text-decoration: none;
-}
-
-.umb-user-picker-list-item__avatar {
-    margin-right: 15px;
-    position: relative;
-}
-
-.umb-user-picker-list-item__checkmark {
-    position: absolute;
-    bottom: -3px;
-    right: -3px;
-}
-
-.umb-user-picker-list-item__group {
-    font-size: 14px;
-    color: @gray-5;
-}
-
-.umb-user-picker-list-item__name {
-    font-size: 15px;
-    font-weight: bold;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-preview.less
deleted file mode 100644
index d0dca54403..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-preview.less
+++ /dev/null
@@ -1,59 +0,0 @@
-.umb-user-preview {
-    padding-top: 7px;
-    padding-bottom: 7px;
-    display: flex;
-    box-sizing: border-box;
-    border-bottom: 1px solid @gray-9;
-    flex-wrap: wrap;
-}
-
-.umb-editor-wrapper .umb-user-preview {
-    .umb-property-editor--limit-width();
-}
-
-.umb-user-preview:last-of-type {
-    border-bottom: none;
-    margin-bottom: 7px;
-}
-
-.umb-user-preview__avatar {
-    margin-right: 10px;
-}
-
-.umb-user-preview__content {
-    flex: 1 1 auto;
-}
-
-.umb-user-preview__name {
-    color: @black;
-    margin-bottom: 3px;
-    margin-top: 2px;
-}
-
-.umb-user-preview__actions {
-    flex: 0 0 auto;
-    display: flex;
-    align-items: center;
-    margin-left: auto;
-}
-
-.umb-user-preview__action {
-    background: transparent;
-    padding: 0;
-    border: 0 none;
-    margin-left: 5px;
-    margin-right: 5px;
-    font-size: 13px;
-    font-weight: bold;
-    color: @ui-action-type;
-}
-
-.umb-user-preview__action:hover {
-    color: @ui-action-type-hover;
-    text-decoration: none;
-    opacity: 1;
-}
-
-.umb-user-preview__action--red:hover {
-    color: @red;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less
deleted file mode 100644
index 31b126e77c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-table.less
+++ /dev/null
@@ -1,76 +0,0 @@
-.umb-user-table {
-
-    .umb-user-table-col-avatar {
-        flex: 0 0 32px;
-        padding: 15px 0;
-
-        > a {
-            overflow: visible;
-        }
-
-        .umb-checkmark {
-            margin-left:5px;
-        }
-    }
-
-    .umb-table-cell a {
-
-        &:hover, &:focus {
-            .umb-avatar {
-                box-shadow: 0px 1px 3px rgba(0, 0, 0, .5);
-            }
-        }
-    }
-    
-    .umb-table-body .umb-table-cell.umb-table__name {
-        a {
-            display: flex;
-        }
-    }
-    .umb-table-cell.umb-table__name a {
-        &:hover, &:focus {
-            text-decoration: underline;
-        }
-    }
-    
-    .umb-user-table-row {
-        .umb-checkmark {
-            visibility: hidden;
-        }
-    }
-    
-    &.-has-selection {
-        .umb-user-table-row.-selectable {
-            .umb-checkmark {
-                visibility: visible;
-            }
-        }
-    }
-    
-    .umb-user-table-row.-selectable:hover {
-        .umb-checkmark {
-            visibility: visible;
-        }
-    }
-    
-    .umb-user-table-row.-selected {
-        
-        .umb-checkmark {
-            visibility: visible;
-        }
-        
-        &::before {
-            content: "";
-            position: absolute;
-            z-index:1;
-            top: 1px;
-            left: 1px;
-            right: 1px;
-            bottom: 1px;
-            border: 2px solid @ui-selected-border;
-            box-shadow: 0 0 2px 0 fade(@ui-selected-border, 80%);
-            pointer-events: none;
-        }
-    }
-    
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards/content-templates.less b/src/Umbraco.Web.UI.Client/src/less/dashboards/content-templates.less
deleted file mode 100644
index 9966fc97e1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/dashboards/content-templates.less
+++ /dev/null
@@ -1,22 +0,0 @@
-.content-templates-dashboard{
-    p{
-        line-height: 1.6em;
-        margin-bottom: 30px;
-
-        &:last-child{
-            margin-bottom: 0;
-        }
-    }
-
-    ul{
-        margin-bottom: 15px;
-    }
-
-    li{
-        margin-bottom: 5px;
-
-        &:last-child{
-            margin-bottom: 0;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards/examine-management.less b/src/Umbraco.Web.UI.Client/src/less/dashboards/examine-management.less
deleted file mode 100644
index 533760149f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/dashboards/examine-management.less
+++ /dev/null
@@ -1,57 +0,0 @@
-.examine-management {
-
-    .form-search {
-
-        .search-query {
-            flex: 1 1 auto;
-            width: auto;
-        }
-
-        button.btn {
-            border-top-left-radius: 0;
-            border-bottom-left-radius: 0;
-        }
-    }
-
-    .umb-panel-group__details-status-content{
-        width:50%; // this is to fix flexbox not making the content too wide
-    }
-
-    .umb-panel-group__details-status-action{
-        background-color:transparent;
-        padding-left:0;
-    }
-
-    .result-table {
-        overflow-x:auto;
-        border:1px solid @tableBorder;
-
-        > table {
-            margin-bottom:0;
-            border:0;
-        }
-
-        th:first-child,
-        td:first-child {
-            position:sticky;
-            left:0;
-            background-color:@white;
-            border-right:1px solid @tableBorder;
-            border-left:0;
-
-            + td,
-            + th {
-                border-left:0;
-            }
-        }
-
-        th:last-child,
-        td:last-child {
-            position:sticky;
-            right:0;
-            background-color:@white;
-            border-left:1px solid @tableBorder;
-        }
-    }
-}
-
diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards/getstarted.less b/src/Umbraco.Web.UI.Client/src/less/dashboards/getstarted.less
deleted file mode 100644
index d64ffef098..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/dashboards/getstarted.less
+++ /dev/null
@@ -1,88 +0,0 @@
-.umb-getstarted {
-    display: flex;
-    flex-wrap: wrap;
-    margin-left: -10px;
-    margin-right: -10px;
-}
-
-.umb-getstartedcards {
-    display: flex;
-    flex-wrap: wrap;
-    margin: 0 auto;
-    max-width: 100%;
-
-    @media (min-width: 500px) {
-        margin: 0 -10px;
-    }
-}
-
-.umb-getstartedcard {
-    width: 100%;
-    padding: 0.5em;
-    text-align: center;
-    display: flex;
-    align-items: center;
-    border: 1px solid @gray-8;
-    background-color: @white;
-    margin: 0 0 0.5em;
-
-    @media (min-width: 500px) {
-        display: block;
-        align-items: unset;
-        padding: 1em 1em 0 1em;
-        margin: 0 10px 20px;
-        width: auto;
-        flex-basis: 35%;
-        max-width: 35%;
-    }
-
-    @media (min-width: 768px) {
-        width: auto;
-        flex-basis: 14%;
-        max-width: 14%;
-    }
-
-    @media (min-width: 1930px) {
-        width: auto;
-        flex-basis: 7%;
-        max-width: 7%;
-    }
-}
-
-
-.umb-getstartedcard img {
-    height: 3em;
-    max-width: 100%;
-
-    @media (min-width: 500px) {
-        height: auto;
-    }
-}
-
-.umb-getstartedcards {
-    margin: 0 auto;
-    max-width: 100%;
-}
-
-.umb-getstartedbody {
-    font-weight: bold;
-    margin: 0.5em;
-
-    @media (min-width: 500px) {
-        padding: 10px;
-        margin: auto;
-    }
-}
-
-.umb-getstartedbody p {
-    margin: 0;
-
-    @media (min-width: 500px) {
-        margin: inherit;
-    }
-}
-
-.umb-getstartedcard:hover {
-    border: 1px solid @turquoise;
-    cursor: pointer;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less b/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less
deleted file mode 100644
index 57bc1f8518..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less
+++ /dev/null
@@ -1,131 +0,0 @@
-
-.umb-healthcheck {
-	display: flex;
-	flex-wrap: wrap;
-	margin-left: -10px;
-	margin-right: -10px;
-}
-
-.umb-healthcheck-help-text {
-	line-height: 1.6em;
-}
-
-.umb-healthcheck-action-bar {
-	display: flex;
-	justify-content: flex-end;
-	margin-bottom: 20px;
-}
-
-
-/* Group and states */
-.umb-healthcheck-group {
-	display: flex;
-	flex-wrap: wrap;
-    flex-direction: column;
-    align-items: center;
-    background: @white;
-    border: 0;
-	border-radius: 3px;
-	padding: 20px;
-	box-sizing: border-box;
-	text-align: center;
-	box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
-	height: 100%;
-    box-sizing: border-box;
-    width: 100%;
-}
-
-.umb-healthcheck-group:hover {
-	box-shadow: 0 3px 6px 0 rgba(0,0,0,0.16);
-	cursor: pointer;
-	transition: box-shadow 150ms ease-in-out;
-}
-
-.umb-healthcheck-group__load-container {
-	position: relative;
-	height: 30px;
-	margin-top: 15px;
-	margin-bottom: 16px;
-}
-
-
-/* Title */
-.umb-healthcheck-title {
-	font-size: 14px;
-	font-weight: bold;
-}
-
-
-/* Messages */
-.umb-healthcheck-messages {
-	margin-top: 15px;
-}
-
-.umb-healthcheck-message {
-	position: relative;
-	background: @gray-10;
-    border-radius: 50px;
-    display: inline-flex;
-	align-items: center;
-	padding-left: 8px;
-	padding-right: 8px;
-    margin-bottom: 5px;
-    color: @black;
-    font-weight: bold;
-	font-size: 13px;
-}
-
-.umb-healthcheck-message .umb-icon {
-	font-size: 15px;
-	margin-right: 3px;
-}
-
-.umb-healthcheck-details-link {
-    color: @turquoise-d1;
-
-    &:hover {
-        color: @turquoise-d1;
-        text-decoration: none;
-    }
-}
-
-/* Spacing for boxes */
-.umb-air {
-	flex: 0 0 auto;
-	flex-basis: 100%;
-    max-width: 100%;
-	padding: 10px;
-	box-sizing: border-box;
-
-	@media (min-width: 500px) {
-		flex-basis: 50%;
-		max-width: 50%;
-	}
-
-	@media (min-width: 768px) {
-		flex-basis: 20%;
-		max-width: 20%;
-	}
-}
-
-
-/* DETAILS */
-
-.umb-healthcheck-back-link {
-    background: transparent;
-    border: 0 none;
-    padding: 0;
-    font-weight: bold;
-	color: @black;
-}
-
-.umb-healthcheck-status-icon {
-	margin-top: 2px;
-}
-
-.umb-healthcheck-status-icon.-large {
-	width: 70px;
-	height: 70px;
-	font-size: 30px;
-	background-color: @white;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards/nucache.less b/src/Umbraco.Web.UI.Client/src/less/dashboards/nucache.less
deleted file mode 100644
index 91922300fb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/dashboards/nucache.less
+++ /dev/null
@@ -1,13 +0,0 @@
-#nuCache {
-    .no-background {
-        background-color: transparent;
-    }
-
-    .top-border {
-        border-top: 2px solid @gray-10;
-    }
-
-    .no-left-padding {
-        padding-left: 0;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards/umbraco-forms.less b/src/Umbraco.Web.UI.Client/src/less/dashboards/umbraco-forms.less
deleted file mode 100644
index 21ec047d41..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/dashboards/umbraco-forms.less
+++ /dev/null
@@ -1,150 +0,0 @@
-.umb-dashboards-forms-install {
-    background: url('../img/forms/installer-background.png');
-    background-repeat: repeat-x;
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    padding-top: 30px;
-    background-color: @white;
-    overflow: auto;
-    display: flex;
-
-    small {
-        font-size: 14px;
-        opacity: .5;
-    }
-
-    .umb-loader {
-        width: 640px;
-        height: 4px;
-    }
-
-    .video_player {
-        video {
-            width: 100%;
-            max-width: 640px;
-            border: 1px solid @gray-9;
-            border-left: none;
-            border-bottom: none;
-            box-sizing: border-box;
-        }
-
-        input[type="range"] {
-            position: relative;
-            z-index: 999;
-            max-width: 640px;
-            width: 100%;
-            margin: 0 auto;
-            opacity: 0;
-            cursor: pointer;
-        }
-
-        input[type="range"]::-ms-fill-lower, input[type="range"]::-ms-fill-upper {
-            background: transparent;
-        }
-
-        input[type="range"]::-ms-tooltip {
-            display: none;
-        }
-
-        .video-controls {
-            position: relative;
-            max-width: 640px;
-            height: 20px;
-            margin: -13px auto 40px;
-            opacity: .8;
-        }
-
-        .loader {
-            display: block;
-            width: 100%;
-            height: 3px;
-            margin-top: -13px;
-            background-color: @gray-10;
-        }
-
-        .progress-bar {
-            display: block;
-            box-sizing: border-box;
-            max-width: 100%;
-            width: 200px;
-            height: 100%;
-            background: @gray-5;
-        }
-
-        .video-controls, .loader, .progress-bar {
-            transition: all 150ms ease-in-out;
-        }
-
-        .progress-bar {
-            transition-property: background;
-        }
-
-        .video_player video:hover + .video-controls, .video-controls:hover {
-            margin-top: -19px;
-            margin-bottom: 46px;
-            opacity: 1;
-        }
-
-        .video_player video:hover + .video-controls .loader, .video-controls:hover .loader {
-            height: 8px;
-        }
-
-        .video_player video:hover + .video-controls .progress-bar, .video-controls:hover .progress-bar {
-            background: @blueMid;
-        }
-    }
-
-    .forms-install-button {
-        .btn {
-            padding: 14px 40px;
-        }
-    }
-
-    .step-text {
-        font-size: 16px;
-        line-height: 1.5;
-        color: @gray;
-        margin-bottom: 20px;
-    }
-
-    .installing {
-        position: relative;
-    }
-
-    .installer-wrapper {
-        max-width: 800px;
-        text-align: center;
-        margin: auto;
-        padding: 20px;
-    }
-
-    .installer-intro {
-        overflow: hidden;
-        margin: 0 auto 30px;
-        height: 80px;
-        line-height: 80px;
-        text-align: center;
-        position: relative;
-        display: flex;
-        justify-content: center;
-
-        .icon, h3 {
-            display: inline-block;
-        }
-
-        .icon {
-            font-size: 80px;
-        }
-
-        h3 {
-            margin: 0 0 0 20px;
-            line-height: 80px;
-            font-weight: 700;
-            font-size: 36px;
-            letter-spacing: -1px;
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/fonts.less b/src/Umbraco.Web.UI.Client/src/less/fonts.less
deleted file mode 100644
index e9a84656f9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/fonts.less
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-  Lato
-    
-  Light: font-weight: 300;
-  Regular: font-weight: normal;
-  Bold: font-weight: bold;
-  Black: font-weight: 900;
-
-*/
-@fontPath: '../fonts';
-@latoPath: '@{fontPath}/lato';
-
-/* Webfont: LatoLatin-Black */
-@font-face {
-    font-family: 'Lato';
-    src: local('LatoLatin Black'),
-         local('LatoLatin-Black'),
-         url('@{latoPath}/LatoLatin-Black.woff2') format('woff2');
-    font-style: normal;
-    font-display: swap;
-    font-weight: 900;
-    text-rendering: optimizeLegibility;
-}
-
-/* Webfont: LatoLatin-BlackItalic */
-@font-face {
-    font-family: 'Lato';
-    src: local('LatoLatin BlackItalic'),
-         local('LatoLatin-BlackItalic'),
-         url('@{latoPath}/LatoLatin-BlackItalic.woff2') format('woff2');
-    font-style: italic;
-    font-weight: 900;
-    font-display: swap;
-    text-rendering: optimizeLegibility;
-}
-
-/* Webfont: LatoLatin-Bold */
-@font-face {
-    font-family: 'Lato';
-    src: local('LatoLatin Bold'),
-         local('LatoLatin-Bold'),
-         url('@{latoPath}/LatoLatin-Bold.woff2') format('woff2');
-    font-style: normal;
-    font-weight: 700;
-    font-display: swap;
-    text-rendering: optimizeLegibility;
-}
-
-/* Webfont: LatoLatin-BoldItalic */
-@font-face {
-    font-family: 'Lato';
-    src: local('LatoLatin BoldItalic'),
-         local('LatoLatin-BoldItalic'),
-         url('@{latoPath}/LatoLatin-BoldItalic.woff2') format('woff2');
-    font-style: italic;
-    font-weight: 700;
-    font-display: swap;
-    text-rendering: optimizeLegibility;
-}
-
-/* Webfont: LatoLatin-Italic */
-@font-face {
-    font-family: 'Lato';
-    src: local('LatoLatin Italic'),
-         local('LatoLatin-Italic'),
-         url('@{latoPath}/LatoLatin-Italic.woff2') format('woff2');
-    font-style: italic;
-    font-weight: 400;
-    font-display: swap;
-    text-rendering: optimizeLegibility;
-}
-
-/* Webfont: LatoLatin-Regular */
-@font-face {
-    font-family: 'Lato';
-    src: local('LatoLatin Regular'),
-         local('LatoLatin-Regular'),
-         url('@{latoPath}/LatoLatin-Regular.woff2') format('woff2');
-    font-style: normal;
-    font-weight: 400;
-    font-display: swap;
-    text-rendering: optimizeLegibility;
-}
-
-/* Webfont: LatoLatin-Light */
-@font-face {
-    font-family: 'Lato';
-    src: local('LatoLatin Light'),
-         local('LatoLatin-Light'),
-         url('@{latoPath}/LatoLatin-Light.woff2') format('woff2');
-    font-style: normal;
-    font-weight: 300;
-    font-display: swap;
-    text-rendering: optimizeLegibility;
-}
-
-/* Webfont: LatoLatin-LightItalic */
-@font-face {
-    font-family: 'Lato';
-    src: local('LatoLatin LightItalic'),
-         local('LatoLatin-LightItalic'),
-         url('@{latoPath}/LatoLatin-LightItalic.woff2') format('woff2');
-    font-style: italic;
-    font-weight: 300;
-    font-display: swap;
-    text-rendering: optimizeLegibility;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
deleted file mode 100644
index 7faf746022..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ /dev/null
@@ -1,870 +0,0 @@
-//
-// Forms
-// --------------------------------------------------
-
-// UMBRACO STYLES
-// --------------
-
-
-
-small.umb-detail,
-label small, .guiDialogTiny {
-  color: @gray-5 !important;
-  text-decoration: none;
-  display: block;
-  font-weight: normal;
-  font-size: 11px
-}
-
-label.control-label, .control-label {
-  font-weight: bold;
-  color: @black;
-  font-size: 14px;
-}
-
-label.control-label[disabled], .control-label[disabled] {
-  color: @gray-5;
-  pointer-events: none;
-}
-
-
-.umb-status-label{
-    color: @gray-3 !important;
-  }
-
-
-.controls-row label:not(.umb-form-check){padding: 0 10px 0 10px; vertical-align: middle;}
-
-
-
-//utill styll to hide child untill hover
-/*.hover-show{visibility: hidden;}
-*:hover > .hover-show{visibility: visible;}
-*/
-
-//breadcrumb modifications
-
-.breadcrumb{height: 30px; display: block; margin-top: 10px;}
-.breadcrumb li{height: 30px; vertical-align: middle;}
-.breadcrumb li a{vertical-align: middle; height: 30px;}
-.breadcrumb input{font-size: 11px !Important;}
-
-
-
-/* SEACH FORM */
-.form-search {
-  position: relative;
-  padding: 0;
-}
-.form-search a{
-    text-decoration:none;
-    cursor:pointer;
-}
-.form-search a:hover{
-    color: @gray-3;
-}
-.form-search h4 {
-    color: @gray-3;
-}
-.form-search small {
-    color: @gray-8;
-}
-
-.form-search .icon,
-.form-search i.icon-search {
-  position: absolute;
-  z-index: 1;
-  top: 50%;
-  left: 6px;
-  transform: translateY(-50%);
-  color: @gray-8;
-}
-
-.form-search .icon-search {
-    pointer-events: none;
-}
-
-.form-search input {
-  width: 90%;
-  font-size: @fontSizeLarge;
-  font-weight: 400;
-  border: 1px solid @gray-8;
-  padding: 4px 0px 4px 16px;
-  padding-left: 25px !Important;
-  line-height: 22px;
-  background: @white
-}
-
-.form-search .icon-search + .search-input {
-    padding-left: 25px !important;
-}
-
-.form-search .search-input {
-    font-weight: bold;
-    border-color: @gray-8;
-
-    &:hover,
-    &:focus,
-    &:focus:hover {
-        border-color: @gray-7;
-    }
-
-    &:-moz-placeholder {
-      font-weight: normal;
-    }
-    &:-ms-input-placeholder {
-      font-weight: normal;
-    }
-    &::-webkit-input-placeholder {
-      font-weight: normal;
-    }
-}
-
-.form-search .umb-search-field {
-    width: 100%;
-}
-
-.macro-select .form-search {
-    margin: 0 0 10px;
-}
-
-// GENERAL STYLES
-// --------------
-
-// Make all forms have space below them
-form {
-  margin: 0 0 @baseLineHeight;
-}
-
-form.-no-margin-bottom {
-   margin-bottom: 0;
-}
-
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-// Groups of fields with labels on top (legends)
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: @baseLineHeight;
-  font-size: (@baseFontSize * 1.5);
-  line-height: (@baseLineHeight * 2);
-  color: @grayDark;
-  border: 0;
-  border-bottom: 1px solid @gray-8;
-
-  // Small
-  small {
-    font-size: (@baseLineHeight * .75);
-    color: @gray-8;
-  }
-}
-
-
-
-// Set font for forms
-label,
-input,
-button,
-select,
-textarea {
-  #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here
-}
-input,
-button,
-select,
-textarea {
-  font-family: @baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
-}
-
-// Identify controls by their labels
-label {
-  display: inline-block;
-  margin-bottom: 5px;
-}
-
-// Form controls
-// -------------------------
-
-// Shared size and type resets
-select,
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  display: inline-block;
-  height: @inputHeight;
-  padding: 4px 6px;
-  margin-bottom: (@baseLineHeight / 2);
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  color: @gray-2;
-  .border-radius(@inputBorderRadius);
-  vertical-align: middle;
-  box-sizing: border-box;
-}
-
-input.-full-width-input {
-   width: 100%;
-   box-sizing: border-box;
-   padding: 4px 6px;
-}
-
-// Reset appearance properties for textual inputs and textarea
-// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
-input,
-textarea,
-.uneditable-input {
-  width: 206px; // plus 12px padding and 2px border
-}
-// Reset height since textareas have rows
-textarea {
-  height: auto;
-}
-// Everything else
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  background-color: @inputBackground;
-  border: 1px solid @inputBorder;
-  
-  .transition(~"border linear .2s, box-shadow linear .2s");
-
-  // Focus state
-  &:focus {
-    border-color: @inputBorderFocus;
-    outline: 0;
-
-    .tabbing-active & {
-        outline: 2px solid @ui-outline;
-    }
-  }
-}
-
-// Position radios and checkboxes better
-input[type="radio"],
-input[type="checkbox"] {
-  margin: 4px 0 0;
-  margin-top: 1px \9; /* IE8-9 */
-  line-height: normal;
-}
-
-// Reset width of input images, buttons, radios, checkboxes
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
-  width: auto; // Override of generic input selector
-}
-
-// Set the height of select and file controls to match text inputs
-select,
-input[type="file"] {
-  height: @inputHeight;
-  line-height: @inputHeight;
-}
-
-// Make select elements obey height by applying a border
-select {
-  width: 220px; // default input width + 10px of padding that doesn't get applied
-  border: 1px solid @inputBorder;
-  background-color: @inputBackground; // Chrome on Linux and Mobile Safari need background-color
-}
-
-// Make multiple select elements height not fixed
-select[multiple],
-select[size] {
-  height: auto;
-}
-
-// Focus for select, file, radio, and checkbox
-input[type="file"],
-input[type="radio"],
-input[type="checkbox"] {
-  &:focus {
-    border-color: @inputBorderFocus;
-    outline: 0;
-
-    .tabbing-active & {
-      outline: 2px solid @ui-outline;
-    }
-  }
-}
-
-
-// Uneditable inputs
-// -------------------------
-
-// Make uneditable inputs look inactive
-.uneditable-input,
-.uneditable-textarea {
-  color: @gray-8;
-  background-color: darken(@inputBackground, 1%);
-  border-color: @inputBorder;
-  .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
-  cursor: not-allowed;
-}
-
-// For text that needs to appear as an input but should not be an input
-.uneditable-input {
-  overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
-  white-space: nowrap;
-}
-
-// Make uneditable textareas behave like a textarea
-.uneditable-textarea {
-  width: auto;
-  height: auto;
-}
-
-
-// Placeholder
-// -------------------------
-
-// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector
-input,
-textarea {
-  .placeholder(@gray-6);
-}
-
-
-// CHECKBOXES & RADIOS
-// -------------------
-
-// Indent the labels to position radios/checkboxes as hanging
-.radio,
-.checkbox {
-  min-height: @baseLineHeight; // clear the floating input if there is no label text
-  padding-left: 20px;
-}
-
-.radio.no-indent,
-.checkbox.no-indent {
-  padding-left: 0;
-}
-
-.radio input[type="radio"],
-.checkbox input[type="checkbox"] {
-  float: left;
-  margin-left: 0px;
-  margin-right:5px;
-}
-
-// Move the options list down to align with labels
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
-  padding-top: 5px; // has to be padding because margin collaspes
-}
-
-// Radios and checkboxes on same line
-// TODO: v3: Convert .inline to .control-inline
-.radio.inline,
-.checkbox.inline {
-  display: inline-block;
-  padding-top: 5px;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-.radio.inline + .radio.inline,
-.checkbox.inline + .checkbox.inline {
-  margin-left: 10px; // space out consecutive inline controls
-}
-
-
-
-// INPUT SIZES
-// -----------
-
-// General classes for quick sizes
-.input-mini       { width: 60px; }
-.input-small      { width: 90px; }
-.input-medium     { width: 150px; }
-.input-large      { width: 210px; }
-.input-xlarge     { width: 270px; }
-.input-xxlarge    { width: 530px; }
-
-input.input--no-border { border: none; }
-
-// Grid style input sizes
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input[class*="span"],
-// Redeclare since the fluid row class is more specific
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"] {
-  float: none;
-  margin-left: 0;
-}
-// Ensure input-prepend/append never wraps
-.input-append input[class*="span"],
-.input-append .uneditable-input[class*="span"],
-.input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"],
-.row-fluid .input-prepend [class*="span"],
-.row-fluid .input-append [class*="span"] {
-  display: inline-block;
-}
-
-.bigInput, .input-large-type{
-    font-size: 20px !important;
-}
-
-
-// GRID SIZING FOR INPUTS
-// ----------------------
-
-// Grid sizes
-#grid > .input(@gridColumnWidth, @gridGutterWidth);
-
-// Control row for multiple inputs per line
-.controls-row {
-  .clearfix(); // Clear the float from controls
-}
-
-// Float to collapse white-space for proper grid alignment
-.controls-row [class*="span"],
-// Redeclare the fluid grid collapse since we undo the float for inputs
-.row-fluid .controls-row [class*="span"] {
-  float: left;
-}
-// Explicity set top padding on all checkboxes/radios, not just first-child
-.controls-row .checkbox[class*="span"],
-.controls-row .radio[class*="span"] {
-  padding-top: 5px;
-}
-
-
-
-
-// DISABLED STATE
-// --------------
-
-// Disabled and read-only inputs
-input[disabled],
-select[disabled],
-textarea[disabled] {
-  cursor: not-allowed;
-  background-color: @inputDisabledBackground;
-}
-
-// Explicitly reset the colors here
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
-}
-
-// READONLY STATE
-// --------------
-
-// Disabled and read-only inputs
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  border-color: @inputReadonlyBorderColor;
-}
-// Explicitly reset the colors here
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
-}
-
-
-//SD: NOTE: Had to change these to use our 'form' prefixed colors since we cannot
-// share colors with the notifications/alerts. Also had to change them so that
-// we do not show any errors unless the containing element has the show-validation
-// class assigned.
-
-// FORM FIELD FEEDBACK STATES
-// --------------------------
-
-// Error
-.show-validation.ng-invalid .control-group.error,
-.show-validation.ng-invalid .umb-editor-header__name-wrapper {
-    .formFieldState(@formErrorText, @formErrorText, @formErrorBackground);
-}
-
-// ValidationError as a warning
-.show-validation.show-validation-type-warning.ng-invalid .control-group.error,
-.show-validation.show-validation-type-warning.ng-invalid .umb-editor-header__name-wrapper {
-    .formFieldState(@formWarningText, @formWarningText, @formWarningBackground);
-}
-
-//val-highlight directive styling
-.highlight-error {
-    color: @formErrorText !important;
-    border-color: @red-l1 !important;
-    .show-validation-type-warning & {
-        color: @formWarningText !important;
-        border-color: @yellow-d2 !important;
-    }
-}
-
-// FORM ACTIONS
-// ------------
-
-.form-actions {
-  padding: (@baseLineHeight - 1) 20px @baseLineHeight;
-  margin-top: @baseLineHeight;
-  margin-bottom: @baseLineHeight;
-  background-color: @formActionsBackground;
-  border-top: 1px solid @gray-8;
-  .clearfix(); // Adding clearfix to allow for .pull-right button containers
-}
-
-
-
-// HELP TEXT
-// ---------
-
-.help-block,
-.help-inline {
-  color: lighten(@textColor, 15%); // lighten the text some for contrast
-}
-
-.help-block {
-  display: block; // account for any element using help-block
-  margin-bottom: (@baseLineHeight / 2);
-}
-
-.help-inline {
-  display: inline-block;
-  vertical-align: middle;
-  padding-top: 4px;
-  padding-left: 2px;
-}
-
-div.help {
-    margin-top: 5px;
-}
-
-// INPUT GROUPS
-// ------------
-
-// Allow us to put symbols and text within the input field for a cleaner look
-.input-append,
-.input-prepend {
-  display: inline-block;
-  margin-bottom: (@baseLineHeight / 2);
-  vertical-align: middle;
-  font-size: 0; // white space collapse hack
-  white-space: nowrap; // Prevent span and input from separating
-
-  // Reset the white space collapse hack
-  input,
-  select,
-  .uneditable-input,
-  .dropdown-menu,
-  .popover {
-    font-size: @baseFontSize;
-  }
-
-  input,
-  select,
-  .uneditable-input {
-    position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
-    margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
-    *margin-left: 0;
-    vertical-align: top;
-    // Make input on top when focused so blue border and shadow always show
-    &:focus {
-      z-index: 2;
-    }
-  }
-  .add-on {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    width: auto;
-    height: 22px;
-    min-width: 18px;
-    padding: 4px 6px;
-    font-size: @baseFontSize;
-    font-weight: normal;
-    line-height: @baseLineHeight;
-    text-align: center;
-    background-color: @white;
-    border: 1px solid @inputBorder;
-    color: @ui-option-type;
-
-    &:hover {
-        border-color:@inputBorderFocus;
-        color: @ui-option-type-hover;
-    }
-  }
-  .add-on,
-  .btn,
-  .btn-group > .dropdown-toggle {
-    vertical-align: top;
-    .border-radius(0);
-  }
-  .active {
-    background-color: lighten(@green, 30);
-    border-color: @green;
-  }
-}
-
-.input-prepend {
-  .add-on,
-  .btn {
-    margin-right: -1px;
-  }
-}
-
-.input-append {
-  .add-on,
-  .btn,
-  .btn-group {
-    margin-left: -1px;
-  }
-}
-
-// Remove all border-radius for inputs with both prepend and append
-.input-prepend.input-append {
-  input,
-  select,
-  .uneditable-input {
-    .border-radius(0);
-    + .btn-group .btn {
-      .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
-    }
-  }
-  .add-on:first-child,
-  .btn:first-child {
-    margin-right: -1px;
-    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
-  }
-  .add-on:last-child,
-  .btn:last-child {
-    margin-left: -1px;
-    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
-  }
-  .btn-group:first-child {
-    margin-left: 0;
-  }
-}
-
-
-
-
-// SEARCH FORM
-// -----------
-
-input.search-query {
-  padding-right: 4px \9;
-  padding-left: 14px;
-  margin: 0; // Remove the default margin on all inputs
-}
-
-/* Allow for input prepend/append in search forms */
-.form-search {
-    .input-prepend {
-        .btn {
-            .border-radius(0 @borderRadiusSmall @borderRadiusSmall 0);
-        }
-    }
-    .input-append {
-        .btn {
-            .border-radius(0 @borderRadiusSmall @borderRadiusSmall 0);
-        }
-    } 
-}
-
-// HORIZONTAL & VERTICAL FORMS
-// ---------------------------
-
-// Common properties
-// -----------------
-
-.form-search,
-.form-inline,
-.form-horizontal {
-  input,
-  textarea,
-  select,
-  .help-inline,
-  .uneditable-input,
-  .input-prepend,
-  .input-append {
-    display: inline-block;
-    margin-bottom: 0;
-    vertical-align: top;
-  }
-  // Re-hide hidden elements due to specifity
-  .hide {
-    display: none;
-  }
-}
-.form-search label,
-.form-inline label,
-.form-search .btn-group,
-.form-inline .btn-group {
-  display: inline-block;
-}
-// Remove margin for input-prepend/-append
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
-  margin-bottom: 0;
-}
-// Inline checkbox/radio labels (remove padding on left)
-.form-search .radio,
-.form-search .checkbox,
-.form-inline .radio,
-.form-inline .checkbox {
-  padding-left: 0;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-// Remove float and margin, set to inline-block
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
-  float: left;
-  margin-right: 3px;
-  margin-left: 0;
-}
-
-
-// Margin to space out fieldsets
-.control-group {
-  margin-bottom: (@baseLineHeight / 2) + 5px;
-}
-
-//modifier for control group
-.control-group.-no-margin {
-  margin-bottom:0;
-}
-
-// Legend collapses margin, so next element is responsible for spacing
-legend + .control-group {
-  margin-top: @baseLineHeight;
-  -webkit-margin-top-collapse: separate;
-}
-
-// Horizontal-specific styles
-// --------------------------
-
-.form-horizontal {
-  // Increase spacing between groups
-  .control-group {
-    margin-bottom: @baseLineHeight;
-    .clearfix();
-  }
-  // Float the labels left
-  .control-label {
-    float: left;
-    width: (@horizontalComponentOffset - 20);
-    padding-top: 5px;
-    text-align: right;
-    &[disabled] {
-      color: @gray-5;
-    }
-  }
-  // Move over all input controls and content
-  .controls {
-    margin-left: @horizontalComponentOffset;
-    &:first-child {
-      *padding-left: @horizontalComponentOffset;
-    }
-  }
-
- 
-  // Remove bottom margin on block level help text since that's accounted for on .control-group
-  .help-block {
-    margin-bottom: 0;
-  }
-  // And apply it only to .help-block instances that follow a form control
-  input,
-  select,
-  textarea,
-  .uneditable-input,
-  .input-prepend,
-  .input-append {
-    + .help-block {
-      margin-top: (@baseLineHeight / 2);
-    }
-  }
-  // Move over buttons in .form-actions to align with .controls
-  .form-actions {
-    padding-left: @horizontalComponentOffset;
-  }
-}
-
-// adjustments for properties tab
-.form-horizontal .block-form .control-label {
-    display: block;
-    float: none;
-    width: 100%;
-}
-.form-horizontal .block-form .controls {
-    margin-left: 0;
-}
-
-//make sure buttons are always on top
-.umb-panel-buttons .umb-btn-toolbar .btn {
-    position: relative;
-    z-index: 1000;
-}
-
-
-
-@media (max-width: 767px) {
-
-  // Labels on own row
-  .form-horizontal .control-label {
-    float:none;
-    text-align: inherit;
-    width: 100%;
-  }
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-
-}
-
-/* User/group selector */
-.group-selector .group-selector-list { float: left; }
-.group-selector .group-selector-list div { height: 24px; }
-.group-selector .group-selector-buttons { float: left; margin: 24px 16px; }
diff --git a/src/Umbraco.Web.UI.Client/src/less/forms/umb-validation-label.less b/src/Umbraco.Web.UI.Client/src/less/forms/umb-validation-label.less
deleted file mode 100644
index 54bd03d51b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/forms/umb-validation-label.less
+++ /dev/null
@@ -1,78 +0,0 @@
-.umb-validation-label {
-    position: absolute;
-    z-index: 1;
-    min-width: 80px;
-    max-width: 260px;
-    padding: 2px 6px;
-    background: @red;
-    color: @white;
-    font-size: 12px;
-    line-height: 1.5em;
-    border-radius: @baseBorderRadius;
-    pointer-events: none;
-    user-select: none;
-}
-
-.umb-validation-label:after {
-    bottom: 100%;
-    left: 10px;
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-    border-color: rgba(255, 255, 255, 0);
-    border-bottom-color: @red;
-    border-width: 4px;
-    margin-left: -4px;
-}
-
-.umb-validation-label.-left {
-    left: 0;
-    right: auto;
-
-    &:after {
-        left: 10px;
-        right: auto;
-    }
-}
-
-.umb-validation-label.-right {
-    right: 0;
-    left: auto;
-    
-    &:after {
-        right: 10px;
-        left: auto;
-    }
-}
-
-.umb-validation-label.-arrow-left {
-    margin-left: 10px;
-}
-
-.umb-validation-label.-arrow-left:after {
-    right: 100%;
-    top: 50%;
-    left: auto;
-    bottom: auto;
-    border-color: transparent;
-    border-right-color: @red;
-    margin-top: -4px;
-}
-
-
-.umb-validation-label.-arrow-bottom {
-    margin-left: 0;
-    margin-bottom: 10px;
-}
-
-.umb-validation-label.-arrow-bottom:after {
-    right: auto;
-    top: 100%;
-    left: 20px;
-    bottom: auto;
-    border-color: transparent;
-    border-top-color: @red;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less
deleted file mode 100644
index 83071a0d93..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/gridview.less
+++ /dev/null
@@ -1,865 +0,0 @@
-// Gridview
-// -------------------------
-
- .mceContentBody{
-         overflow-y:hidden!important;
-      }
-
-.usky-grid IFRAME {overflow:hidden;}
-
-
- // Sortabel
- // -------------------------
-
- .usky-grid .ui-sortable-helper  {
-     position:absolute !important;
-     border: dashed 1px @black !important;
-     background: @gray-7;
-     opacity: 0.4;
-     height: 80px !important;
-     width: 160px !important;
-     overflow: hidden;
-     padding: 5px;
-     border-radius:5px;
-     box-shadow: 3px 3px 12px 0 rgba(50, 50, 50, 0.45);
- }
-
- .usky-grid .ui-sortable-helper *{
-     border: none !important;
-     background: none !important;
-     color: @gray-5 !important;
-     padding: 0 !important;
-     margin: 0 !important;
- }
-
- .usky-grid .ui-sortable-helper .cell-tools{
-     display: none !important;
- }
-
- .usky-grid .ui-sortable-placeholder{
-     border: 2px dashed @gray-8;
-     padding: 20px;
-     font-family: icomoon;
-     text-align: center;
-     font-size: 85px;
-     line-height: 65px;
-     color: @gray-3;
-     vertical-align: middle;
-     background-color:@gray-10;
- }
-
- .usky-grid .ui-sortable-placeholder:hover{
-     border-color: @gray-3;
- }
-
- .usky-grid .ui-sortable-placeholder:before{
-     content: "\e1bd";
- }
-
-
-
- // utils
- // -------------------------
- .usky-grid-width {
-     margin: 20px auto;
-     width:100%;
- }
- .usky-grid  .right {
-     float:right;
- }
-
-
- // general layout components
- // -------------------------
- .usky-grid  .tb {
-     width: 100%;
- }
-
- .usky-grid  .td {
-     width: 100%;
-     display: inline-block;
-     vertical-align:top;
-     border-right:1px dashed rgba(182, 182, 182, 0.0);
-     box-sizing: border-box;
- }
-
- .usky-grid .tb:hover .td{
-     border-right:1px dashed @gray-9;
- }
- .usky-grid  .td.last {
-     border-right:1px dashed rgba(182, 182, 182, 0.0) !important;
- }
-
- .usky-grid  .middle {
-     text-align: center;
- }
-
- .usky-grid  .mainTb {
-     border-collapse: separate;
- }
- .usky-grid  .mainTd {
-     position:relative;
- }
-
- .usky-grid .grid-layout {
-    max-width: 600px;
-}
-
- // ROW
- // -------------------------
-.usky-grid .usky-row{
-     position: relative;
-     border: 1px dashed rgba(0,0,0,0);
-}
-
-.umb-grid .tb:hover .usky-row{
-    border-bottom:1px dashed rgba(182, 182, 182, 0) !important;
-}
-
-
-
-// CELL
-// -------------------------
-.usky-grid .usky-cell{
-     position: relative;
-     border: 1px dashed rgba(0,0,0,0);
-     min-height:127px;
-}
-
-.usky-grid  .cell-tools {
-    transition: all .20s ease-in-out;
-    position: absolute;
-    bottom: 0;
-    top: 0;
-    right: 0;
-    width: 50px;
-    opacity: 0.3;
-    z-index: 50;
-}
-//special rule to ensure forms doesnt overrride (forms will align in a later release)
-.umb-grid .cell-tools{width: 50px !important;}
-
-.usky-grid  .cell-tools.with-prompt {
-    width:200px;
-}
-
-.usky-grid .cell-tools:hover{
-    opacity: 1;
-}
-
-.usky-grid  .cell-tools-add {
-    position: absolute;
-    text-align: center;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: 0 45px 1px 0;
-
-    &.emptyArea{
-        margin: 0 0 1px 0;
-    }
-}
-
-.usky-grid .usky-control:hover .cell-tools-add{
-    opacity: 1;
-}
-
-.usky-grid .cell-tools-remove {
-    display:inline-block;
-    position: absolute;
-    top: 0;
-    right: 5px;
-    text-align: right;
-    z-index: 500;
-}
-
-.usky-grid .cell-tools-remove .iconBox:hover, .usky-grid .cell-tools-remove .iconBox:hover *{
-    background: @red !important;
-    border-color: @red !important;
-}
-
-.usky-grid  .cell-tools-move {
-    display:inline-block;
-    position: absolute;
-    top: 33px;
-    right: 5px;
-    z-index: 500;
-    cursor: move
-}
-
-.usky-grid .cell-tools-edit{
-    position: absolute;
-    top: 66px;
-    right: 5px;
-}
-
-
-// CONTROL
-// -------------------------
-.usky-grid .usky-control {
-    position:relative;
-    display:block;
-    background-clip: padding-box;
-
-    margin: 10px 0 0 0;
-}
-
-.usky-grid .warnhighlight, .usky-grid  .td.last.warnhighlight{
-     border: 1px dashed @red !important;
-}
-
-.usky-grid .infohighlight, .usky-grid  .td.last.infohighlight{
-     border: 1px dashed @blueMid !important;
-}
-
-.usky-grid .warnhighlight > ins.item-label{border-color: @red; color: @red;}
-.usky-grid .infohighlight > ins.item-label{border-color: @blueMid; color: @blueMid;}
-
-
-.usky-grid ins.item-label {
-    position: absolute;
-    top: -22px;
-    left: -1px;
-    text-decoration: none;
-    padding: 0 7px;
-    display:none;
-    font-size:0.8em;
-    background-color: @white;
-    color: @gray-8;
-    border: 1px dashed @gray-8;
-    border-bottom: 1px solid @white !important;
-    height: 20px;
-    overflow: hidden;
-}
-
-.usky-grid .usky-row-inner > ins.item-label{
-    top: -20px;
-    left: 0;
-}
-
-.usky-grid .usky-control-inner.selectedControl , .usky-grid .usky-row-inner.selectedRow{
-    border: 1px dashed @gray-8;
-
-    > ins.item-label {
-        display: block;
-        z-index:100000;
-    }
-}
-
-
-
-// CONTROL PLACEHOLDER
-// -------------------------
-.usky-grid  .usky-control-placeholder {
-    min-height: 20px;
-    position: relative;
-    text-align: center;
-    text-align: -moz-center;
-    cursor: text;
-}
-
-.usky-grid  .usky-control-placeholder .placeholder{
-    font-size: 14px; opacity: 0.7; text-align: left;
-    padding: 5px;
-    border:1px solid @gray-8;
-    height: 20px;
-}
-
-.usky-grid  .usky-control-placeholder:hover .placeholder{
-    border:1px solid @gray-7;
-}
-
-
-
-
-
-
-// EDITOR PLACEHOLDER
-// -------------------------
-.usky-grid .usky-editor-placeholder{
-    min-height: 65px;
-    padding: 20px;
-    padding-bottom: 30px;
-    position: relative;
-    background-color: @white;
-    border: 4px dashed @gray-10;
-    text-align: center;
-    text-align: -moz-center;
-}
-.usky-grid .usky-editor-placeholder i{
-    color: @gray-10;
-    font-size: 85px;
-    line-height: 85px;
-    display: block;
-    margin-bottom: 10px;
-}
-
-
-
-// Form elements
-// -------------------------
- .usky-grid  textarea.textstring{
-     display: block;
-     overflow: hidden;
-     border: none;
-     background: @white;
-     outline: none;
-     resize: none;
-     color: @gray-3;
- }
-
-.usky-grid .usky-cell-rte textarea{
-     display: none !important
-}
-
-.usky-grid .usky-cell-media .caption{
-     display: block;
-     overflow: hidden;
-     border: none;
-     background: @white;
-     outline: none;
-     width: 98%;
-     resize: none;
-     font-style: italic;
-}
-
- .usky-grid  .cellPanelRte {
-     min-height:60px;
- }
-
- .usky-grid .usky-cell-embed iframe {
-     width: 100%;
-}
-
-// ICONS
-// -------------------------
- .usky-grid  .iconBox {
-     padding: 4px 6px 4px 6px;
-     display: inline-block;
-     cursor: pointer;
-     border-radius: 200px;
-     background: @white;
-     border:1px solid @gray-7;
-     margin: 2px;
- }
-
-  .usky-grid  .iconBox span.prompt {
-      display:block;
-      white-space: nowrap;
-      text-align:center;
-
-  }
-
-  .usky-grid  .iconBox span.prompt > a {
-      text-decoration:underline;
-  }
-
- .usky-grid .iconBox:hover, .usky-grid .iconBox:hover *{
-    background: @blueMid !important;
-    color: @white !important;
-    border-color: @blueMid !important;
-    text-decoration:none;
- }
-
- .usky-grid  .iconBox a:hover {
-     text-decoration:none;
-     color: @white !important;
- }
-
- .usky-grid  .iconBox.selected {
-     -webkit-appearance: none;
-     background-image: -webkit-gradient(linear,0 0,0 100%,from(@gray-9),to(@gray-7));
-     background-image: -webkit-linear-gradient(top,@gray-9,@gray-7);
-     background-image: linear-gradient(to bottom,@gray-9,@gray-7);
-     background-repeat: repeat-x;
-     zoom: 1;
-     border-color: @gray-7 @gray-7 @gray-6;
-     border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
-     box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
-     border-radius: 3px;
-     background: transparent;
- }
-
- .usky-grid  .iconBox i {
-     font-size:16px !important;
-     color: @gray-4;
-     display:block;
- }
-
-
- .usky-grid  ul {
-     display:inline-block;
-     list-style:none;
-     padding:0;
-     margin: 10px 0 0 0;
-     text-align:center;
- }
-
- .usky-grid  .help-text {
-     background: @gray-10;
-     color: @gray-3;
-     font-size: 14px;
-     padding: 10px 20px 10px 20px;
-     border-radius: 15px;
-     display: inline-block;
-     clear: both;
- }
-
- .usky-grid  ul li {
-     display: inline-block;
-     width: 120px;
-     margin: 8px 8px 0 8px;
- }
-
-
-
-
- // TINYMCE EDITOR
- // -------------------------
- .usky-grid .mce-panel {
-     border: none !important;
-     clear:both;
- }
-
- .usky-grid .mce-btn button {
-     padding: 8px 6px;
-     line-height: inherit;
- }
-
- .usky-grid .mce-toolbar {
-     border: 1px solid @gray-8;
-     background-color: @gray-10;
-     z-index: 100;
-     display: inline-block;
-     float: left;
-     padding: -1px;
-     position: absolute;
-     margin: -1px -1px 0 -1px;
-     box-shadow: 2px 2px 10px 0 rgba(50, 50, 50, 0.14);
-     z-index: 9999999;
- }
-
- .mce-flow-layout-item {
-     margin: 0;
- }
-
- .usky-grid  .mce-panel {
-     background: transparent !important;
- }
- .usky-grid  .mce-floatpanel {
-     background-color: @gray-10 !important;
- }
-
-.usky-cell-rte{
-    border: 1px solid @gray-10;
-}
-
- // MEDIA EDITOR
- // -------------------------
- .usky-grid  .fullSizeImage {
-     width:100%
- }
-
-
-
-
- /**************************************************************************************************/
- /* Width */
- /**************************************************************************************************/
-
- .usky-grid  .boxWidth {
-     text-align:right;
-     margin-bottom: 10px;
- }
-
- .usky-grid  .boxWidth input {
-     text-align: center;
-     width: 40px;
- }
-
- .usky-grid  .boxWidth label {
-     font-size: 10px;
-     padding: 0;
-     margin: 5px 5px 0 0;
-     color: @gray-5;
- }
-
-
-
- /**************************************************************************************************/
- /* Margin control */
- /**************************************************************************************************/
-
- .usky-grid .usky-cell{
-    padding-top: 5px;
-    padding-bottom: 15px;
- }
-
- .usky-grid .usky-control{
-     margin: 10px 0 0 0;
-     padding: 5px;
-     border: 1px dashed transparent;
- }
-
- .usky-grid .usky-templates-columns{
-     margin-top: 30px;
- }
-
- .usky-grid .usky-row-inner{
-    margin-right: 45px;
-    border: 1px dashed transparent;
- }
-
- .usky-grid .usky-control-inner {
-    padding: 5px;
-    margin-right: 45px;
-    margin-bottom: 15px;
-
-    border: 1px dashed transparent;
-    min-height: 60px;
-    position:relative;
- }
-
- .usky-grid .uSky-templates .layout {
-    margin-top: 5px;
-    margin-bottom: 20px;
-    float: left;
-}
-
-
-.usky-grid .uSky-templates .columns {
-    margin-top: 5px;
-    margin-bottom: 25px;
-    float: left;
-}
-
-
-.usky-grid .uSky-templates .columns .preview-cell p {
-    font-size: 6px;
-    line-height: 8px;
-    text-align: center;
-}
-
-
- /**************************************************************************************************/
- /* template */
- /**************************************************************************************************/
-
- .usky-grid .uSky-templates {
-     text-align:center;
-     overflow:hidden;
-     width:100%;
- }
-
- .usky-grid .uSky-templates-template {
-     display:inline-block;
-     width:100px;
-     padding-right: 30px;
-     margin: 20px;
- }
-
- .usky-grid .uSky-templates-template button.tb:hover,
- .usky-grid .uSky-templates-template button.tb:focus {
-     border:5px solid @blueMid;
- }
-
- .usky-grid .uSky-templates-template .tb {
-     width:100%;
-     height:150px;
-     padding:10px;
-     background-color: @gray-10;
-     border: 5px solid @gray-8;
-     cursor:pointer;
-     position: relative;
- }
-
- .usky-grid .uSky-templates-template .tr {
-     height: 100%;
-     position: relative;
- }
-
- .usky-grid .uSky-templates-template .tb .uSky-templates-column {
-     height:100%;
-     border: 1px dashed @gray-8;
-     border-right: none;
- }
-
- .usky-grid .uSky-templates-template .tb .uSky-templates-column.last {
-     border-right: 1px dashed @gray-8 !important;
- }
-
- .usky-grid button.uSky-templates-column:hover, 
- .usky-grid button.uSky-templates-column:focus, 
- .usky-grid button.uSky-templates-column.selected{
-    background-color: @blueMid;
- }
-
-
- /**************************************************************************************************/
- /* template column */
- /**************************************************************************************************/
-
-/* New template preview */
-.usky-grid {
-
-	.templates-preview {
-		display: inline-block;
-		width: 100%;
-		text-align: center;
-
-		small {
-			position: absolute;
-			width: 100%;
-			left: 0;
-			bottom: -25px;
-			padding-top: 15px;
-		}
-
-		.help-text {
-			margin: 35px 35px 0 0;
-		}
-	}
-
-	.preview-rows {
-		display: inline-block;
-		position: relative;
-		box-sizing: border-box;
-		width: 125px;
-		margin: 35px 40px 15px 0;
-		border: 2px solid @gray-8; /* @grayLight */
-		transition: border 200ms linear;
-
-        &.prevalues-rows {
-            margin: 0 20px 20px 0;
-            width: 80px;
-            float:left;
-        }
-
-        &.prevalues-templates {
-            margin: 0 20px 20px 0;
-            float:left;
-
-        }
-
-		&:hover {
-			border-color: @blueMid;
-			cursor: pointer;
-		}
-
-		.preview-row {
-			display: inline-block;
-			width: 100%;
-			vertical-align: bottom;
-		}
-	}
-
-	.preview-rows.layout {
-		padding: 2px;
-
-		.preview-row {
-			height: 100%;
-		}
-
-		.preview-col {
-			height: 180px;
-			border: dashed 1px @gray-8;
-		}
-
-		.preview-cell {
-			background-color: @gray-10;
-		}
-		.preview-overlay {
-			display: none;
-		}
-	}
-
-	.preview-rows.columns {
-		min-height: 16px;
-		line-height: 11px;
-        padding: 0 1px 1px 1px;
-
-        &.prevalues-rows {
-            min-height: 30px;
-        }
-	}
-
-    .preview-rows {
-
-        .preview-col {
-
-		    display: block;
-		    float: left;
-		    box-sizing: border-box;
-		    width: 33.3%; /* temp value */
-		    height: 10px;
-		    margin: 0;
-		    border: 1px solid @white; /* @white */
-
-		    .preview-cell {
-			    display: block;
-			    width: 100%;
-			    height: 100%;
-			    background-color: @gray-8; /* @grayLight */
-			    margin: 0 1px 1px 0;
-		    }
-	    }
-
-        &.prevalues-templates {
-            .preview-col {
-                height: 80px;
-            }
-        }
-
-    }
-
-	.preview-overlay {
-		display: block;
-        width: 100%;
-        position: absolute;
-        height: 100%;
-        top: 0;
-        box-sizing: border-box;
-        left: 0;
-        border: 3px solid @white;
-	}
-}
-
- /**************************************************************************************************/
- /* overlay */
- /**************************************************************************************************/
- .usky-grid  .cell-tools-menu{
-     position: absolute;
-     width: 360px;
-     height: 380px;
-     overflow: auto;
-     border: 1px solid @gray-8;
-     margin-top: -270px;
-     margin-left: -150px;
-     background: @white;
-     padding: 7px;
-     top: 0;
-     left: 50%;
-     z-index: 6660;
-     box-shadow: 3px 3px 12px 0px rgba(50, 50, 50, 0.45);
- }
-
-
- .usky-grid .cell-tools-menu h5{
-     border-bottom: 1px solid @gray-8;
-     color: @gray-6;
-     padding: 10px;
-     margin-top: 0;
- }
-
- .usky-grid .elements{
-     display: block;
-     padding: 0;
-     margin: 0;
- }
-
- .usky-grid .elements li{
-     display: inline-block;
-     width: 90px;
-     height: 80px;
-     margin: 5px;
-     padding: 5px;
-     overflow: hidden;
-     font-size: 12px;
- }
-
- .usky-grid .elements li:hover, .usky-grid .elements li:hover *{
-     background: @blueMid;
-     color: @white;
- }
-
- .usky-grid .elements a{
-     color: @gray-2;
-     text-decoration: none;
- }
-
- .usky-grid .elements i{
-     font-size: 30px;
-     line-height: 50px;
-     color: @gray-5;
-     display: block
- }
-
-
- /**************************************************************************************************/
- /* Configuration specific styles */
- /**************************************************************************************************/
-.usky-grid-configuration .uSky-templates{
-    text-align: left;
-}
-
-.usky-grid-configuration ul{
-    display: block;
-}
-
-.usky-grid-configuration ul li{
-    display: block;
-    width: auto;
-    text-align: left;
-}
-
-.usky-grid-configuration .uSky-templates .uSky-templates-template .tb{
-    max-height: 50px;
-    border-width: 2px !important;
-    padding: 0;
-    border-spacing:2px;
-    overflow: hidden;
-}
-
-.usky-grid-configuration .uSky-templates .uSky-templates-template span{
-    background: @gray-8;
-    display: inline-block;
-}
-
-.usky-grid-configuration .uSky-templates .uSky-templates-template .tb:hover{
-    border-width: 2px !important;
-}
-
-.usky-grid-configuration .uSky-templates-column{
-    display: block;
-    float: left;
-    margin-left: -1px;
-    border: 1px @white solid !important;
-    background: @gray-8;
-}
-
-.usky-grid-configuration .uSky-templates-column.last{
-    margin-right: -1px;
-}
-
-.usky-grid-configuration .uSky-templates-column.add{
-    text-align: center;
-    font-size: 20px;
-    line-height: 70px;
-    color: @gray-8;
-    text-decoration: none;
-    background: @white;
-}
-
-.usky-grid-configuration .mainTdpt{
-    height: initial;
-    border: none;
-}
-
-.usky-grid-configuration .uSky-templates-rows .uSky-templates-row{
-    margin: 0 50px 20px 0;
-    width: 60px;
-}
-
-.usky-grid-configuration .uSky-templates-rows .uSky-templates-row .tb{
-    border-width: 2px !important;
-    padding: 0;
-    border-spacing:2px;
-}
-
-.usky-grid-configuration .uSky-templates-rows .mainTdpt{
-    height: 10px !important;
-}
-
-.usky-grid-configuration button.uSky-templates-column {
-    height: 70px !important;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/hacks.less b/src/Umbraco.Web.UI.Client/src/less/hacks.less
deleted file mode 100644
index 911d89e369..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/hacks.less
+++ /dev/null
@@ -1,229 +0,0 @@
-// Hacks
-// -------------------------
-
-/* CONTAINS ALL HACKS AND OTHER QUICK-FIXES */
-
-/*wft ms?*/
-*{ -ms-touch-action: none;}
-
-.ace_editor { height: 200px; }
-
-.nounderline {text-decoration: none !important}
-.nounderline:hover {text-decoration: underline !important}
-.nounderline * {text-decoration: none !important; border: none}
-
-.ui-sortable-placeholder {
-     margin-left: 0 !important;
-}
-.controls-row img {
-	max-width: none;
-}
-
-.thumbnail {
-    border-radius: 0;
-    min-width: 150px;
-
-    > a {
-        display: block;
-    }
-
-    img {
-	    max-width: 100% !important;
-        width: 100%;
-    }
-}
-
-#mapCanvas img {
-  max-width: none !important;
-}
-
-.btn-group .dropdown-backdrop {
-    display: none;
-}
-
-/* loading animation for iframes and content pages */
-iframe, .content-column-body {
-    background: center center url(../img/loader.gif) no-repeat;
-    border: none;
-}
-
-/* JQUERY FILEUPLOAD TEMP STYLES */
-.fileinput-button {
-  position: relative;
-  overflow: hidden;
-  margin-bottom:5px;
-}
-.fileinput-button input {
-  position: absolute;
-  top: 0;
-  right: 0;
-  margin: 0;
-  opacity: 0;
-  transform: translate(-300px, 0) scale(4);
-  font-size: 23px;
-  direction: ltr;
-  cursor: pointer;
-}
-
-
-/*tree legacy icon*/
-.legacy-custom-file {
-  width: 16px;
-  height: 16px;
-  min-width: 20px; /* this ensure the icon takes up same space as font-icon (20px) */
-  display: inline-block;
-  background-position: center center;
-  background-repeat: no-repeat;
-}
-
-/*
-    missing icon names in helveticons that are in font-awesome - used by the datepicker,
-    basically making them equivalent to their helviton icon
-*/
-.icon-chevron-up:before {
-	content: "\e128";
-}
-.icon-chevron-down:before {
-	content: "\e0c9";
-}
-
-
-/* Styling for validation in Public Access */
-
-.pa-umb-overlay {
-    -webkit-font-smoothing: antialiased;
-    font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}
-
-.pa-umb-overlay + .pa-umb-overlay {
-    padding-top: 30px;
-    border-top: 1px solid @gray-8;
-}
-
-.pa-select-type {
-    display: flex;
-    flex-wrap: nowrap;
-    flex-direction: row;
-    align-items: flex-start;
-
-    margin-top: 15px;
-}
-
-.pa-select-type label {
-    padding: 0 15px;
-}
-
-.pa-access-header {
-    margin: 0 0 3px 0;
-    padding-bottom: 0;
-}
-
-.pa-access-description {
-    color: @gray-7;
-    margin: 0;
-}
-
-.pa-validation-message {
-    padding: 6px 12px !important;
-    margin: 5px 0 0 0 !important;
-    display: inline-block;
-}
-
-.pa-select-pages label {
-    margin: 0;
-    font-size: 15px;
-}
-
-.pa-select-pages label + .controls-row {
-    padding-top: 0;
-}
-
-.pa-select-pages .umb-detail {
-    font-size: 13px;
-    margin: 2px 0 5px;
-}
-
-.pa-choose-page a {
-    color: @turquoise-d1;
-    font-size: 15px;
-}
-
-.pa-choose-page a:hover, .pa-choose-page a:active, .pa-choose-page a:focus {
-    color: @turquoise-d1;
-    text-decoration: none;
-}
-
-.pa-choose-page a:before {
-    content:"+";
-    margin-right: 3px;
-    font-weight: bold;
-}
-
-.pa-choose-page .treePickerTitle {
-    font-weight: bold;
-    font-size: 13px;
-    font-style: italic;
-    background: @gray-10;
-    padding: 3px 5px;
-    color: @gray-5;
-
-    border-bottom: none;
-}
-
-
-.pa-form + .pa-form {
-    margin-top: 10px;
-}
-
-
-// The below adds a default selector to all pre elements to ensure that styles are applied 
-// without having to add the class ".code" to the element. Styles have been created by 
-// combining the various declarations from the Bootstrap code.less file and fixing some mistakes
-// in Bootstrap 2.
-// This fixes issues with the markdown editor preview and should not cause issues with any other editor. 
-
-// Inline code
-// 1: Revert border radius to match look and feel of 7.4+
-code {
-    .border-radius(@baseBorderRadius); // 1
-}
-
-// Blocks of code
-// 1: Wrapping code is unreadable on small devices.
-pre {
-    display: block;
-    padding: ((@baseLineHeight - 1) / 2);
-    margin: 0 0 (@baseLineHeight / 2);
-    font-family: @sansFontFamily;
-    color: @gray-2;
-    line-height: @baseLineHeight;
-    white-space: pre-wrap; // 1
-    overflow-x: auto; // 1
-    background-color: @brownGrayLight;
-    border: 1px solid @gray-8;
-    .border-radius(@baseBorderRadius);
-
-    // Make prettyprint styles more spaced out for readability
-    &.prettyprint {
-        margin-bottom: @baseLineHeight;
-    }
-
-    // Account for some code outputs that place code tags in pre tags
-    code {
-        padding: 0;
-        white-space: pre; // 1
-        word-wrap: normal; // 1
-        background-color: transparent;
-        border: 0;
-    }
-}
-
-/* Styling for content/media sort order dialog */
-.sort-order {
-    td.tree-icon {
-        font-size:20px;
-        width:20px;
-        padding-right:0;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/helveticons.less b/src/Umbraco.Web.UI.Client/src/less/helveticons.less
deleted file mode 100644
index cded6b8269..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/helveticons.less
+++ /dev/null
@@ -1,1874 +0,0 @@
-@font-face {
-	font-family: 'icomoon';
-	src:url('../fonts/helveticons/helveticons.eot');
-	src:url('../fonts/helveticons/helveticons.eot?#iefix') format('embedded-opentype'),
-		url('../fonts/helveticons/helveticons.ttf') format('truetype'),
-		url('../fonts/helveticons/helveticons.svg#icomoon') format('svg');
-	font-weight: normal;
-	font-style: normal;
-}
-
-
-[class^="icon-"],
-[class*=" icon-"]{
-    font-family: 'icomoon';
-    speak: none;
-    font-style: normal;
-    font-weight: normal;
-    font-variant: normal;
-    text-transform: none;
-    line-height: 1;
-
-    /* Better Font Rendering =========== */
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}
-
-[class^="icon-"]:before,
-[class*=" icon-"]:before {
-    text-decoration: inherit;
-    display: inline-block;
-    speak: none;
-}
-
-i.large{
-	font-size: 32px;
-}
-i.medium{
-	font-size: 24px;
-}
-i.small{
-	font-size: 14px;
-}
-
-.icon-zoom-out:before {
-	content: "\e000";
-}
-.icon-truck:before {
-	content: "\e001";
-}
-.icon-zoom-in:before {
-	content: "\e002";
-}
-.icon-zip:before {
-	content: "\e003";
-}
-.icon-axis-rotation:before {
-	content: "\e004";
-}
-.icon-yen-bag:before {
-	content: "\e005";
-}
-.icon-axis-rotation-2:before {
-	content: "\e006";
-}
-.icon-axis-rotation-3:before {
-	content: "\e007";
-}
-.icon-wrench:before {
-	content: "\e008";
-}
-.icon-wine-glass:before {
-	content: "\e009";
-}
-.icon-wrong:before {
-	content: "\e00a";
-}
-.icon-windows:before {
-	content: "\e00b";
-}
-.icon-window-sizes:before {
-	content: "\e00c";
-}
-.icon-window-popin:before {
-	content: "\e00d";
-}
-.icon-wifi:before {
-	content: "\e00e";
-}
-.icon-width:before {
-	content: "\e00f";
-}
-.icon-weight:before {
-	content: "\e010";
-}
-.icon-war:before {
-	content: "\e011";
-}
-.icon-wand:before {
-	content: "\e012";
-}
-.icon-wallet:before {
-	content: "\e013";
-}
-.icon-wall-plug:before {
-	content: "\e014";
-}
-.icon-voice:before {
-	content: "\e016";
-}
-.icon-video:before {
-	content: "\e017";
-}
-.icon-vcard:before {
-	content: "\e018";
-}
-.icon-utilities:before {
-	content: "\e019";
-}
-.icon-users:before {
-	content: "\e01a";
-}
-.icon-users-alt:before {
-	content: "\e01b";
-}
-.icon-user:before {
-	content: "\e01c";
-}
-.icon-user-glasses:before {
-	content: "\e01d";
-}
-.icon-user-females:before {
-	content: "\e01e";
-}
-.icon-user-females-alt:before {
-	content: "\e01f";
-}
-.icon-user-female:before {
-	content: "\e020";
-}
-.icon-usb:before {
-	content: "\e021";
-}
-.icon-usb-connector:before {
-	content: "\e022";
-}
-.icon-unlocked:before {
-	content: "\e023";
-}
-.icon-universal:before {
-	content: "\e024";
-}
-.icon-undo:before {
-	content: "\e025";
-}
-.icon-umbrella:before {
-	content: "\e026";
-}
-.icon-umb-deploy:before {
-	content: "\e027";
-}
-.icon-umb-contour:before, .traycontour:before {
-	content: "\e028";
-}
-.icon-umb-settings:before, .traysettings:before {
-	content: "\e029";
-}
-.icon-umb-users:before, .trayuser:before, .trayusers:before{
-	content: "\e02a";
-}
-.icon-umb-media:before, .traymedia:before {
-	content: "\e02b";
-}
-.icon-umb-content:before, .traycontent:before{
-	content: "\e02c";
-}
-.icon-umb-developer:before, .traydeveloper:before {
-	content: "\e02d";
-}
-.icon-umb-members:before, .traymember:before {
-	content: "\e015";
-}
-.icon-umb-translation:before, .traytranslation:before {
-	content: "\e1fd";
-}
-.icon-tv:before {
-	content: "\e02e";
-}
-.icon-tv-old:before {
-	content: "\e02f";
-}
-.icon-trophy:before {
-	content: "\e030";
-}
-.icon-tree:before {
-	content: "\e031";
-}
-.icon-trash:before {
-	content: "\e032";
-}
-.icon-trash-alt:before {
-	content: "\e033";
-}
-.icon-trash-alt-2:before {
-	content: "\e034";
-}
-.icon-train:before {
-	content: "\e035";
-}
-.icon-trafic:before,
-.icon-traffic:before {
-	content: "\e036";
-}
-.icon-traffic-alt:before {
-	content: "\e037";
-}
-.icon-top:before {
-	content: "\e038";
-}
-.icon-tools:before {
-	content: "\e039";
-}
-.icon-timer:before {
-	content: "\e03a";
-}
-.icon-time:before {
-	content: "\e03b";
-}
-.icon-t-shirt:before {
-	content: "\e03c";
-}
-.icon-tab-key:before {
-	content: "\e03d";
-}
-.icon-tab:before {
-	content: "\e03e";
-}
-.icon-tactics:before {
-	content: "\e03f";
-}
-.icon-tag:before {
-	content: "\e040";
-}
-.icon-tags:before {
-	content: "\e041";
-}
-.icon-takeaway-cup:before {
-	content: "\e042";
-}
-.icon-target:before {
-	content: "\e043";
-}
-.icon-temperature-alt:before,
-.icon-temperatrure-alt:before {
-	content: "\e044";
-}
-.icon-temperature:before {
-	content: "\e045";
-}
-.icon-terminal:before {
-	content: "\e046";
-}
-.icon-theater:before {
-	content: "\e047";
-}
-.icon-thief:before,
-.icon-theif:before {
-	content: "\e048";
-}
-.icon-thought-bubble:before {
-	content: "\e049";
-}
-.icon-thumb-down:before {
-	content: "\e04a";
-}
-.icon-thumb-up:before {
-	content: "\e04b";
-}
-.icon-thumbnail-list:before {
-	content: "\e04c";
-}
-.icon-thumbnails-small:before {
-	content: "\e04d";
-}
-.icon-thumbnails:before {
-	content: "\e04e";
-}
-.icon-ticket:before {
-	content: "\e04f";
-}
-.icon-sync:before {
-	content: "\e050";
-}
-.icon-sweatshirt:before {
-	content: "\e051";
-}
-.icon-sunny:before {
-	content: "\e052";
-}
-.icon-stream:before {
-	content: "\e053";
-}
-.icon-store:before {
-	content: "\e054";
-}
-.icon-stop:before {
-	content: "\e055";
-}
-.icon-stop-hand:before {
-	content: "\e056";
-}
-.icon-stop-alt:before {
-	content: "\e057";
-}
-.icon-stamp:before {
-	content: "\e058";
-}
-.icon-stacked-disks:before {
-	content: "\e059";
-}
-.icon-ssd:before {
-	content: "\e05a";
-}
-.icon-squiggly-line:before {
-	content: "\e05b";
-}
-.icon-sprout:before {
-	content: "\e05c";
-}
-.icon-split:before {
-	content: "\e05d";
-}
-.icon-split-alt:before {
-	content: "\e05e";
-}
-.icon-speed-gauge:before {
-	content: "\e05f";
-}
-.icon-speaker:before {
-	content: "\e060";
-}
-.icon-sound:before {
-	content: "\e061";
-}
-.icon-spades:before {
-	content: "\e062";
-}
-.icon-sound-waves:before {
-	content: "\e063";
-}
-.icon-shipping-box:before {
-	content: "\e064";
-}
-.icon-shipping:before {
-	content: "\e065";
-}
-.icon-shoe:before {
-	content: "\e066";
-}
-.icon-shopping-basket-alt-2:before {
-	content: "\e067";
-}
-.icon-shopping-basket:before {
-	content: "\e068";
-}
-.icon-shopping-basket-alt:before {
-	content: "\e069";
-}
-.icon-shorts:before {
-	content: "\e06a";
-}
-.icon-shuffle:before {
-	content: "\e06b";
-}
-.icon-science:before,
-.icon-sience:before {
-	content: "\e06c";
-}
-.icon-simcard:before {
-	content: "\e06d";
-}
-.icon-single-note:before {
-	content: "\e06e";
-}
-.icon-sitemap:before {
-	content: "\e06f";
-}
-.icon-sleep:before {
-	content: "\e070";
-}
-.icon-slideshow:before {
-	content: "\e071";
-}
-.icon-smiley-inverted:before {
-	content: "\e072";
-}
-.icon-smiley:before {
-	content: "\e073";
-}
-.icon-snow:before {
-	content: "\e074";
-}
-.icon-sound-low:before {
-	content: "\e075";
-}
-.icon-sound-medium:before {
-	content: "\e076";
-}
-.icon-sound-off:before {
-	content: "\e077";
-}
-.icon-shift:before {
-	content: "\e078";
-}
-.icon-shield:before {
-	content: "\e079";
-}
-.icon-sharing-iphone:before {
-	content: "\e07a";
-}
-.icon-share:before {
-	content: "\e07b";
-}
-.icon-share-alt:before {
-	content: "\e07c";
-}
-.icon-share-alt-2:before {
-	content: "\e07d";
-}
-.icon-settings:before {
-	content: "\e07e";
-}
-.icon-settings-alt:before {
-	content: "\e07f";
-}
-.icon-settings-alt-2:before {
-	content: "\e080";
-}
-.icon-server:before {
-	content: "\e081";
-}
-.icon-server-alt:before {
-	content: "\e082";
-}
-.icon-sensor:before {
-	content: "\e083";
-}
-.icon-security-camera:before {
-	content: "\e084";
-}
-.icon-search:before {
-	content: "\e085";
-}
-.icon-scull:before {
-	content: "\e086";
-}
-.icon-script:before {
-	content: "\e087";
-}
-.icon-script-alt:before {
-	content: "\e088";
-}
-.icon-screensharing:before {
-	content: "\e089";
-}
-.icon-school:before {
-	content: "\e08a";
-}
-.icon-scan:before {
-	content: "\e08b";
-}
-.icon-refresh:before {
-	content: "\e08c";
-}
-.icon-remote:before {
-	content: "\e08d";
-}
-.icon-remove:before {
-	content: "\e08e";
-}
-.icon-repeat-one:before {
-	content: "\e08f";
-}
-.icon-repeat:before {
-	content: "\e090";
-}
-.icon-resize:before {
-	content: "\e091";
-}
-.icon-reply-arrow:before {
-	content: "\e092";
-}
-.icon-return-to-top:before {
-	content: "\e093";
-}
-.icon-right-double-arrow:before {
-	content: "\e094";
-}
-.icon-road:before {
-	content: "\e095";
-}
-.icon-roadsign:before {
-	content: "\e096";
-}
-.icon-rocket:before {
-	content: "\e097";
-}
-.icon-rss:before {
-	content: "\e098";
-}
-.icon-ruler-alt:before {
-	content: "\e099";
-}
-.icon-ruler:before {
-	content: "\e09a";
-}
-.icon-sandbox-toys:before {
-	content: "\e09b";
-}
-.icon-satellite-dish:before {
-	content: "\e09c";
-}
-.icon-save:before {
-	content: "\e09d";
-}
-.icon-safedial:before {
-	content: "\e09e";
-}
-.icon-safe:before {
-	content: "\e09f";
-}
-.icon-redo:before {
-	content: "\e0a0";
-}
-.icon-printer-alt:before {
-	content: "\e0a1";
-}
-.icon-planet:before {
-	content: "\e0a2";
-}
-.icon-paste-in:before {
-	content: "\e0a3";
-}
-.icon-os-x:before {
-	content: "\e0a4";
-}
-.icon-navigation-left:before {
-	content: "\e0a5";
-}
-.icon-message:before {
-	content: "\e0a6";
-}
-.icon-lock:before {
-	content: "\e0a7";
-}
-.icon-layers-alt:before {
-	content: "\e0a8";
-}
-.icon-record:before {
-	content: "\e0a9";
-}
-.icon-print:before {
-	content: "\e0aa";
-}
-.icon-plane:before {
-	content: "\e0ab";
-}
-.icon-partly-cloudy:before {
-	content: "\e0ac";
-}
-.icon-ordered-list:before {
-	content: "\e0ad";
-}
-.icon-navigation-last:before {
-	content: "\e0ae";
-}
-.icon-message-unopened:before {
-	content: "\e0af";
-}
-.icon-location-nearby:before {
-	content: "\e0b0";
-}
-.icon-laptop:before {
-	content: "\e0b1";
-}
-.icon-reception:before {
-	content: "\e0b2";
-}
-.icon-price-yen:before {
-	content: "\e0b3";
-}
-.icon-piracy:before {
-	content: "\e0b4";
-}
-.icon-parental-control:before {
-	content: "\e0b5";
-}
-.icon-operator:before {
-	content: "\e0b6";
-}
-.icon-navigation-horizontal:before {
-	content: "\e0b7";
-}
-.icon-message-open:before {
-	content: "\e0b8";
-}
-.icon-lab:before {
-	content: "\e0b9";
-}
-.icon-location-near-me:before {
-	content: "\e0ba";
-}
-.icon-receipt-yen:before {
-	content: "\e0bb";
-}
-.icon-price-pound:before {
-	content: "\e0bc";
-}
-.icon-pin-location:before {
-	content: "\e0bd";
-}
-.icon-parachute-drop:before {
-	content: "\e0be";
-}
-.icon-old-phone:before {
-	content: "\e0bf";
-}
-.icon-merge:before {
-	content: "\e0c0";
-}
-.icon-navigation-first:before {
-	content: "\e0c1";
-}
-.icon-locate:before {
-	content: "\e0c2";
-}
-.icon-keyhole:before {
-	content: "\e0c3";
-}
-.icon-receipt-pound:before {
-	content: "\e0c4";
-}
-.icon-price-euro:before {
-	content: "\e0c5";
-}
-.icon-piggy-bank:before {
-	content: "\e0c6";
-}
-.icon-paper-plane:before {
-	content: "\e0c7";
-}
-.icon-old-key:before {
-	content: "\e0c8";
-}
-.icon-navigation-down:before {
-	content: "\e0c9";
-}
-.icon-megaphone:before {
-	content: "\e0ca";
-}
-.icon-loading:before {
-	content: "\e0cb";
-}
-.icon-keychain:before {
-	content: "\e0cc";
-}
-.icon-receipt-euro:before {
-	content: "\e0cd";
-}
-.icon-price-dollar:before {
-	content: "\e0ce";
-}
-.icon-pie-chart:before {
-	content: "\e0cf";
-}
-.icon-paper-plane-alt:before {
-	content: "\e0d0";
-}
-.icon-notepad:before {
-	content: "\e0d1";
-}
-.icon-navigation-bottom:before {
-	content: "\e0d2";
-}
-.icon-meeting:before {
-	content: "\e0d3";
-}
-.icon-keyboard:before {
-	content: "\e0d4";
-}
-.icon-load:before {
-	content: "\e0d5";
-}
-.icon-receipt-dollar:before {
-	content: "\e0d6";
-}
-.icon-previous:before {
-	content: "\e0d7";
-}
-.icon-pictures:before {
-	content: "\e0d8";
-}
-.icon-notepad-alt:before {
-	content: "\e0d9";
-}
-.icon-paper-bag:before {
-	content: "\e0da";
-}
-.icon-badge:before {
-	content: "\e0db";
-}
-.icon-medicine:before {
-	content: "\e0dc";
-}
-.icon-list:before {
-	content: "\e0dd";
-}
-.icon-key:before {
-	content: "\e0de";
-}
-.icon-receipt-alt:before {
-	content: "\e0df";
-}
-.icon-previous-media:before {
-	content: "\e0e0";
-}
-.icon-pictures-alt:before {
-	content: "\e0e1";
-}
-.icon-pants:before {
-	content: "\e0e2";
-}
-.icon-nodes:before {
-	content: "\e0e3";
-}
-.icon-music:before {
-	content: "\e0e4";
-}
-.icon-readonly:before {
-	content: "\e0e5";
-}
-.icon-presentation:before {
-	content: "\e0e6";
-}
-.icon-pictures-alt-2:before {
-	content: "\e0e7";
-}
-.icon-panel-close:before,
-.icon-pannel-close:before {
-	content: "\e0e8";
-}
-.icon-next:before {
-	content: "\e0e9";
-}
-.icon-multiple-windows:before {
-	content: "\e0ea";
-}
-.icon-medical-emergency:before {
-	content: "\e0eb";
-}
-.icon-medal:before {
-	content: "\e0ec";
-}
-.icon-link:before {
-	content: "\e0ed";
-}
-.icon-linux-tux:before {
-	content: "\e0ee";
-}
-.icon-junk:before {
-	content: "\e0ef";
-}
-.icon-item-arrangement:before {
-	content: "\e0f0";
-}
-.icon-iphone:before {
-	content: "\e0f1";
-}
-.icon-lightning:before {
-	content: "\e0f2";
-}
-.icon-map:before {
-	content: "\e0f3";
-}
-.icon-multiple-credit-cards:before {
-	content: "\e0f4";
-}
-.icon-next-media:before {
-	content: "\e0f5";
-}
-.icon-panel-show:before {
-	content: "\e0f6";
-}
-.icon-picture:before {
-	content: "\e0f7";
-}
-.icon-power:before {
-	content: "\e0f8";
-}
-.icon-re-post:before {
-	content: "\e0f9";
-}
-.icon-rate:before {
-	content: "\e0fa";
-}
-.icon-rain:before {
-	content: "\e0fb";
-}
-.icon-radio:before {
-	content: "\e0fc";
-}
-.icon-radio-receiver:before {
-	content: "\e0fd";
-}
-.icon-radio-alt:before {
-	content: "\e0fe";
-}
-.icon-quote:before {
-	content: "\e0ff";
-}
-.icon-qr-code:before {
-	content: "\e100";
-}
-.icon-pushpin:before {
-	content: "\e101";
-}
-.icon-pulse:before {
-	content: "\e102";
-}
-.icon-projector:before {
-	content: "\e103";
-}
-.icon-play:before {
-	content: "\e104";
-}
-.icon-playing-cards:before {
-	content: "\e105";
-}
-.icon-playlist:before {
-	content: "\e106";
-}
-.icon-plugin:before {
-	content: "\e107";
-}
-.icon-podcast:before {
-	content: "\e108";
-}
-.icon-poker-chip:before {
-	content: "\e109";
-}
-.icon-poll:before {
-	content: "\e10a";
-}
-.icon-post-it:before {
-	content: "\e10b";
-}
-.icon-pound-bag:before {
-	content: "\e10c";
-}
-.icon-power-outlet:before {
-	content: "\e10d";
-}
-.icon-photo-album:before {
-	content: "\e10e";
-}
-.icon-phone:before {
-	content: "\e10f";
-}
-.icon-phone-ring:before {
-	content: "\e110";
-}
-.icon-people:before {
-	content: "\e111";
-}
-.icon-people-female:before {
-	content: "\e112";
-}
-.icon-people-alt:before {
-	content: "\e113";
-}
-.icon-people-alt-2:before {
-	content: "\e114";
-}
-.icon-pc:before {
-	content: "\e115";
-}
-.icon-pause:before {
-	content: "\e116";
-}
-.icon-path:before {
-	content: "\e117";
-}
-.icon-out:before {
-	content: "\e118";
-}
-.icon-outbox:before {
-	content: "\e119";
-}
-.icon-outdent:before {
-	content: "\e11a";
-}
-.icon-page-add:before {
-	content: "\e11b";
-}
-.icon-page-down:before {
-	content: "\e11c";
-}
-.icon-page-remove:before {
-	content: "\e11d";
-}
-.icon-page-restricted:before {
-	content: "\e11e";
-}
-.icon-page-up:before {
-	content: "\e11f";
-}
-.icon-paint-roller:before {
-	content: "\e120";
-}
-.icon-palette:before {
-	content: "\e121";
-}
-.icon-newspaper:before {
-	content: "\e122";
-}
-.icon-newspaper-alt:before {
-	content: "\e123";
-}
-.icon-network-alt:before {
-	content: "\e124";
-}
-.icon-navigational-arrow:before {
-	content: "\e125";
-}
-.icon-navigation:before {
-	content: "\e126";
-}
-.icon-navigation-vertical:before {
-	content: "\e127";
-}
-.icon-navigation-up:before {
-	content: "\e128";
-}
-.icon-navigation-top:before {
-	content: "\e129";
-}
-.icon-navigation-road:before {
-	content: "\e12a";
-}
-.icon-navigation-right:before {
-	content: "\e12b";
-}
-.icon-microscope:before {
-	content: "\e12c";
-}
-.icon-mindmap:before {
-	content: "\e12d";
-}
-.icon-molecular-network:before {
-	content: "\e12e";
-}
-.icon-molecular:before {
-	content: "\e12f";
-}
-.icon-mountain:before {
-	content: "\e130";
-}
-.icon-mouse-cursor:before {
-	content: "\e131";
-}
-.icon-mouse:before {
-	content: "\e132";
-}
-.icon-movie-alt:before {
-	content: "\e133";
-}
-.icon-map-marker:before {
-	content: "\e134";
-}
-.icon-movie:before {
-	content: "\e135";
-}
-.icon-map-location:before {
-	content: "\e136";
-}
-.icon-map-alt:before {
-	content: "\e137";
-}
-.icon-male-symbol:before {
-	content: "\e138";
-}
-.icon-male-and-female:before {
-	content: "\e139";
-}
-.icon-mailbox:before {
-	content: "\e13a";
-}
-.icon-magnet:before {
-	content: "\e13b";
-}
-.icon-loupe:before {
-	content: "\e13c";
-}
-.icon-mobile:before {
-	content: "\e13d";
-}
-.icon-logout:before {
-	content: "\e13e";
-}
-.icon-log-out:before {
-	content: "\e13f";
-}
-.icon-layers:before {
-	content: "\e140";
-}
-.icon-left-double-arrow:before {
-	content: "\e141";
-}
-.icon-layout:before {
-	content: "\e142";
-}
-.icon-legal:before {
-	content: "\e143";
-}
-.icon-lense:before {
-	content: "\e144";
-}
-.icon-library:before {
-	content: "\e145";
-}
-.icon-light-down:before {
-	content: "\e146";
-}
-.icon-light-up:before {
-	content: "\e147";
-}
-.icon-lightbulb-active:before {
-	content: "\e148";
-}
-.icon-lightbulb:before {
-	content: "\e149";
-}
-.icon-ipad:before {
-	content: "\e14a";
-}
-.icon-invoice:before {
-	content: "\e14b";
-}
-.icon-info:before {
-	content: "\e14c";
-}
-.icon-infinity:before {
-	content: "\e14d";
-}
-.icon-indent:before {
-	content: "\e14e";
-}
-.icon-inbox:before {
-	content: "\e14f";
-}
-.icon-inbox-full:before {
-	content: "\e150";
-}
-.icon-inactive-line:before {
-	content: "\e151";
-}
-.icon-imac:before {
-	content: "\e152";
-}
-.icon-hourglass:before {
-	content: "\e153";
-}
-.icon-home:before {
-	content: "\e154";
-}
-.icon-grid:before {
-	content: "\e155";
-}
-.icon-food:before {
-	content: "\e156";
-}
-.icon-favorite:before {
-	content: "\e157";
-}
-.icon-door-open-alt:before {
-	content: "\e158";
-}
-.icon-diagnostics:before {
-	content: "\e159";
-}
-.icon-contrast:before {
-	content: "\e15a";
-}
-.icon-coins-dollar-alt:before {
-	content: "\e15b";
-}
-.icon-circle-dotted-active:before {
-	content: "\e15c";
-}
-.icon-cinema:before {
-	content: "\e15d";
-}
-.icon-chip:before {
-	content: "\e15e";
-}
-.icon-chip-alt:before {
-	content: "\e15f";
-}
-.icon-chess:before {
-	content: "\e160";
-}
-.icon-checkbox:before {
-	content: "\e161";
-}
-.icon-checkbox-empty:before {
-	content: "\e162";
-}
-.icon-checkbox-dotted:before {
-	content: "\e163";
-}
-.icon-checkbox-dotted-active:before {
-	content: "\e164";
-}
-.icon-check:before {
-	content: "\e165";
-}
-.icon-chat:before {
-	content: "\e166";
-}
-.icon-chat-active:before {
-	content: "\e167";
-}
-.icon-chart:before {
-	content: "\e168";
-}
-.icon-chart-curve:before {
-	content: "\e169";
-}
-.icon-certificate:before {
-	content: "\e16a";
-}
-.icon-categories:before {
-	content: "\e16b";
-}
-.icon-cash-register:before {
-	content: "\e16c";
-}
-.icon-car:before {
-	content: "\e16d";
-}
-.icon-caps-lock:before {
-	content: "\e16e";
-}
-.icon-candy:before {
-	content: "\e16f";
-}
-.icon-circle-dotted:before {
-	content: "\e170";
-}
-.icon-circuits:before {
-	content: "\e171";
-}
-.icon-circus:before {
-	content: "\e172";
-}
-.icon-client:before {
-	content: "\e173";
-}
-.icon-clothes-hanger:before {
-	content: "\e174";
-}
-.icon-cloud-drive:before {
-	content: "\e175";
-}
-.icon-cloud-upload:before {
-	content: "\e176";
-}
-.icon-cloud:before {
-	content: "\e177";
-}
-.icon-cloudy:before {
-	content: "\e178";
-}
-.icon-clubs:before {
-	content: "\e179";
-}
-.icon-cocktail:before {
-	content: "\e17a";
-}
-.icon-code:before {
-	content: "\e17b";
-}
-.icon-coffee:before {
-	content: "\e17c";
-}
-.icon-coin-dollar:before {
-	content: "\e17d";
-}
-.icon-coin-pound:before {
-	content: "\e17e";
-}
-.icon-coin-yen:before {
-	content: "\e17f";
-}
-.icon-coin:before {
-	content: "\e180";
-}
-.icon-coins-alt:before {
-	content: "\e181";
-}
-.icon-console:before {
-	content: "\e182";
-}
-.icon-connection:before {
-	content: "\e183";
-}
-.icon-compress:before {
-	content: "\e184";
-}
-.icon-company:before {
-	content: "\e185";
-}
-.icon-command:before {
-	content: "\e186";
-}
-.icon-coin-euro:before {
-	content: "\e187";
-}
-.icon-combination-lock:before {
-	content: "\e188";
-}
-.icon-combination-lock-open:before {
-	content: "\e189";
-}
-.icon-comb:before {
-	content: "\e18a";
-}
-.icon-columns:before {
-	content: "\e18b";
-}
-.icon-colorpicker:before {
-	content: "\e18c";
-}
-.icon-color-bucket:before {
-	content: "\e18d";
-}
-.icon-coins:before {
-	content: "\e18e";
-}
-.icon-coins-yen:before {
-	content: "\e18f";
-}
-.icon-coins-yen-alt:before {
-	content: "\e190";
-}
-.icon-coins-pound:before {
-	content: "\e191";
-}
-.icon-coins-pound-alt:before {
-	content: "\e192";
-}
-.icon-coins-euro:before {
-	content: "\e193";
-}
-.icon-coins-euro-alt:before {
-	content: "\e194";
-}
-.icon-coins-dollar:before {
-	content: "\e195";
-}
-.icon-conversation-alt:before {
-	content: "\e196";
-}
-.icon-conversation:before {
-	content: "\e197";
-}
-.icon-coverflow:before {
-	content: "\e198";
-}
-.icon-credit-card-alt:before {
-	content: "\e199";
-}
-.icon-credit-card:before {
-	content: "\e19a";
-}
-.icon-crop:before {
-	content: "\e19b";
-}
-.icon-crosshair:before {
-	content: "\e19c";
-}
-.icon-crown-alt:before {
-	content: "\e19d";
-}
-.icon-crown:before {
-	content: "\e19e";
-}
-.icon-cupcake:before {
-	content: "\e19f";
-}
-.icon-curve:before {
-	content: "\e1a0";
-}
-.icon-cut:before {
-	content: "\e1a1";
-}
-.icon-dashboard:before {
-	content: "\e1a2";
-}
-.icon-defrag:before {
-	content: "\e1a3";
-}
-.icon-delete:before {
-	content: "\e1a4";
-}
-.icon-delete-key:before {
-	content: "\e1a5";
-}
-.icon-departure:before {
-	content: "\e1a6";
-}
-.icon-desk:before {
-	content: "\e1a7";
-}
-.icon-desktop:before {
-	content: "\e1a8";
-}
-.icon-donate:before {
-	content: "\e1a9";
-}
-.icon-dollar-bag:before {
-	content: "\e1aa";
-}
-.icon-documents:before {
-	content: "\e1ab";
-}
-.icon-document:before {
-	content: "\e1ac";
-}
-.icon-document-dashed-line:before {
-	content: "\e1ad";
-}
-.icon-dock-connector:before {
-	content: "\e1ae";
-}
-.icon-dna:before {
-	content: "\e1af";
-}
-.icon-display:before {
-	content: "\e1b0";
-}
-.icon-disk-image:before {
-	content: "\e1b1";
-}
-.icon-disc:before {
-	content: "\e1b2";
-}
-.icon-directions:before {
-	content: "\e1b3";
-}
-.icon-directions-alt:before {
-	content: "\e1b4";
-}
-.icon-diploma:before {
-	content: "\e1b5";
-}
-.icon-diploma-alt:before {
-	content: "\e1b6";
-}
-.icon-dice:before {
-	content: "\e1b7";
-}
-.icon-diamonds:before {
-	content: "\e1b8";
-}
-.icon-diamond:before {
-	content: "\e1b9";
-}
-.icon-diagonal-arrow:before {
-	content: "\e1ba";
-}
-.icon-diagonal-arrow-alt:before {
-	content: "\e1bb";
-}
-.icon-door-open:before {
-	content: "\e1bc";
-}
-.icon-download-alt:before {
-	content: "\e1bd";
-}
-.icon-download:before {
-	content: "\e1be";
-}
-.icon-drop:before {
-	content: "\e1bf";
-}
-.icon-eco:before {
-	content: "\e1c0";
-}
-.icon-economy:before {
-	content: "\e1c1";
-}
-.icon-edit:before {
-	content: "\e1c2";
-}
-.icon-eject:before {
-	content: "\e1c3";
-}
-.icon-employee:before {
-	content: "\e1c4";
-}
-.icon-energy-saving-bulb:before {
-	content: "\e1c5";
-}
-.icon-enter:before {
-	content: "\e1c6";
-}
-.icon-equalizer:before {
-	content: "\e1c7";
-}
-.icon-escape:before {
-	content: "\e1c8";
-}
-.icon-ethernet:before {
-	content: "\e1c9";
-}
-.icon-euro-bag:before {
-	content: "\e1ca";
-}
-.icon-exit-fullscreen:before {
-	content: "\e1cb";
-}
-.icon-eye:before {
-	content: "\e1cc";
-}
-.icon-facebook-like:before {
-	content: "\e1cd";
-}
-.icon-factory:before {
-	content: "\e1ce";
-}
-.icon-font:before {
-	content: "\e1cf";
-}
-.icon-folders:before {
-	content: "\e1d0";
-}
-.icon-folder:before, .icon-folder-close:before {
-	content: "\e1d1";
-}
-.icon-folder-outline:before {
-	content: "\e1d2";
-}
-.icon-folder-open:before {
-	content: "\e1d3";
-}
-.icon-flowerpot:before {
-	content: "\e1d4";
-}
-.icon-flashlight:before {
-	content: "\e1d5";
-}
-.icon-flash:before {
-	content: "\e1d6";
-}
-.icon-flag:before {
-	content: "\e1d7";
-}
-.icon-flag-alt:before {
-	content: "\e1d8";
-}
-.icon-firewire:before {
-	content: "\e1d9";
-}
-.icon-firewall:before {
-	content: "\e1da";
-}
-.icon-fire:before {
-	content: "\e1db";
-}
-.icon-fingerprint:before {
-	content: "\e1dc";
-}
-.icon-filter:before {
-	content: "\e1dd";
-}
-.icon-filter-arrows:before {
-	content: "\e1de";
-}
-.icon-files:before {
-	content: "\e1df";
-}
-.icon-file-cabinet:before {
-	content: "\e1e0";
-}
-.icon-female-symbol:before {
-	content: "\e1e1";
-}
-.icon-footprints:before {
-	content: "\e1e2";
-}
-.icon-hammer:before {
-	content: "\e1e3";
-}
-.icon-hand-active-alt:before {
-	content: "\e1e4";
-}
-.icon-forking:before {
-	content: "\e1e5";
-}
-.icon-hand-active:before {
-	content: "\e1e6";
-}
-.icon-hand-pointer-alt:before {
-	content: "\e1e7";
-}
-.icon-hand-pointer:before {
-	content: "\e1e8";
-}
-.icon-handprint:before {
-	content: "\e1e9";
-}
-.icon-handshake:before {
-	content: "\e1ea";
-}
-.icon-handtool:before {
-	content: "\e1eb";
-}
-.icon-hard-drive:before {
-	content: "\e1ec";
-}
-.icon-help:before {
-	content: "\e1ed";
-}
-.icon-graduate:before {
-	content: "\e1ee";
-}
-.icon-gps:before {
-	content: "\e1ef";
-}
-.icon-help-alt:before {
-	content: "\e1f0";
-}
-.icon-height:before {
-	content: "\e1f1";
-}
-.icon-globe:before {
-	content: "\e1f2";
-}
-.icon-hearts:before {
-	content: "\e1f3";
-}
-.icon-globe-inverted-europe-africa:before {
-	content: "\e1f4";
-}
-.icon-headset:before {
-	content: "\e1f5";
-}
-.icon-globe-inverted-asia:before {
-	content: "\e1f6";
-}
-.icon-headphones:before {
-	content: "\e1f7";
-}
-.icon-globe-inverted-america:before {
-	content: "\e1f8";
-}
-.icon-hd:before {
-	content: "\e1f9";
-}
-.icon-globe-europe-africa:before,
-.icon-globe-europe---africa:before {
-	content: "\e1fa";
-}
-.icon-hat:before {
-	content: "\e1fb";
-}
-.icon-globe-asia:before {
-	content: "\e1fc";
-}
-.icon-globe-alt:before {
-	content: "\e1fd";
-}
-.icon-hard-drive-alt:before {
-	content: "\e1fe";
-}
-.icon-glasses:before {
-	content: "\e1ff";
-}
-.icon-gift:before {
-	content: "\e200";
-}
-.icon-handtool-alt:before {
-	content: "\e201";
-}
-.icon-geometry:before {
-	content: "\e202";
-}
-.icon-game:before {
-	content: "\e203";
-}
-.icon-fullscreen:before {
-	content: "\e204";
-}
-.icon-fullscreen-alt:before {
-	content: "\e205";
-}
-.icon-frame:before {
-	content: "\e206";
-}
-.icon-frame-alt:before {
-	content: "\e207";
-}
-.icon-camera-roll:before {
-	content: "\e208";
-}
-.icon-bookmark:before {
-	content: "\e209";
-}
-.icon-bill:before {
-	content: "\e20a";
-}
-.icon-baby-stroller:before {
-	content: "\e20b";
-}
-.icon-alarm-clock:before {
-	content: "\e20c";
-}
-.icon-addressbook:before,
-.icon-adressbook:before {
-	content: "\e20d";
-}
-.icon-add:before {
-	content: "\e20e";
-}
-.icon-activity:before {
-	content: "\e20f";
-}
-.icon-untitled:before {
-	content: "\e210";
-}
-.icon-glasses:before {
-	content: "\e211";
-}
-.icon-camcorder:before {
-	content: "\e212";
-}
-.icon-calendar:before {
-	content: "\e213";
-}
-.icon-calendar-alt:before {
-	content: "\e214";
-}
-.icon-calculator:before {
-	content: "\e215";
-}
-.icon-bus:before {
-	content: "\e216";
-}
-.icon-burn:before {
-	content: "\e217";
-}
-.icon-bulleted-list:before {
-	content: "\e218";
-}
-.icon-bug:before {
-	content: "\e219";
-}
-.icon-brush:before {
-	content: "\e21a";
-}
-.icon-brush-alt:before {
-	content: "\e21b";
-}
-.icon-brush-alt-2:before {
-	content: "\e21c";
-}
-.icon-browser-window:before {
-	content: "\e21d";
-}
-.icon-briefcase:before {
-	content: "\e21e";
-}
-.icon-brick:before {
-	content: "\e21f";
-}
-.icon-brackets:before {
-	content: "\e220";
-}
-.icon-box:before {
-	content: "\e221";
-}
-.icon-box-open:before {
-	content: "\e222";
-}
-.icon-box-alt:before {
-	content: "\e223";
-}
-.icon-books:before {
-	content: "\e224";
-}
-.icon-billboard:before {
-	content: "\e225";
-}
-.icon-bills-dollar:before {
-	content: "\e226";
-}
-.icon-bills-euro:before {
-	content: "\e227";
-}
-.icon-bills-pound:before {
-	content: "\e228";
-}
-.icon-bills-yen:before {
-	content: "\e229";
-}
-.icon-bills:before {
-	content: "\e22a";
-}
-.icon-binarycode:before {
-	content: "\e22b";
-}
-.icon-binoculars:before {
-	content: "\e22c";
-}
-.icon-bird:before {
-	content: "\e22d";
-}
-.icon-birthday-cake:before {
-	content: "\e22e";
-}
-.icon-blueprint:before {
-	content: "\e22f";
-}
-.icon-block:before {
-	content: "\e230";
-}
-.icon-bluetooth:before {
-	content: "\e231";
-}
-.icon-boat-shipping:before {
-	content: "\e232";
-}
-.icon-bomb:before {
-	content: "\e233";
-}
-.icon-book-alt-2:before {
-	content: "\e234";
-}
-.icon-bones:before {
-	content: "\e235";
-}
-.icon-book-alt:before {
-	content: "\e236";
-}
-.icon-book:before {
-	content: "\e237";
-}
-.icon-bill-yen:before {
-	content: "\e238";
-}
-.icon-award:before {
-	content: "\e239";
-}
-.icon-bill-pound:before {
-	content: "\e23a";
-}
-.icon-autofill:before {
-	content: "\e23b";
-}
-.icon-bill-euro:before {
-	content: "\e23c";
-}
-.icon-auction-hammer:before {
-	content: "\e23d";
-}
-.icon-bill-dollar:before {
-	content: "\e23e";
-}
-.icon-attachment:before {
-	content: "\e23f";
-}
-.icon-bell:before {
-	content: "\e240";
-}
-.icon-article:before {
-	content: "\e241";
-}
-.icon-bell-off:before {
-	content: "\e242";
-}
-.icon-art-easel:before {
-	content: "\e243";
-}
-.icon-beer-glass:before {
-	content: "\e244";
-}
-.icon-arrow-up:before {
-	content: "\e245";
-}
-.icon-battery-low:before {
-	content: "\e246";
-}
-.icon-arrow-right:before {
-	content: "\e247";
-}
-.icon-battery-full:before {
-	content: "\e248";
-}
-.icon-arrow-left:before {
-	content: "\e249";
-}
-.icon-bars:before {
-	content: "\e24a";
-}
-.icon-arrow-down:before {
-	content: "\e24b";
-}
-.icon-barcode:before {
-	content: "\e24c";
-}
-.icon-arrivals:before {
-	content: "\e24d";
-}
-.icon-bar-chart:before {
-	content: "\e24e";
-}
-.icon-application-window:before {
-	content: "\e24f";
-}
-.icon-band-aid:before {
-	content: "\e250";
-}
-.icon-application-window-alt:before {
-	content: "\e251";
-}
-.icon-ball:before {
-	content: "\e252";
-}
-.icon-application-error:before {
-	content: "\e253";
-}
-.icon-badge-restricted:before {
-	content: "\e254";
-}
-.icon-app:before {
-	content: "\e255";
-}
-.icon-badge-remove:before {
-	content: "\e256";
-}
-.icon-anchor:before {
-	content: "\e257";
-}
-.icon-badge-count:before {
-	content: "\e258";
-}
-.icon-alt:before {
-	content: "\e259";
-}
-.icon-badge-add:before {
-	content: "\e25a";
-}
-.icon-alert:before {
-	content: "\e25b";
-}
-.icon-backspace:before {
-	content: "\e25c";
-}
-.icon-alert-alt:before {
-	content: "\e25d";
-}
-.icon-section:before {
-    content: "\e24f";
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/icons.less b/src/Umbraco.Web.UI.Client/src/less/icons.less
deleted file mode 100644
index 1bb3cea19e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/icons.less
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "helveticons.less";
-@import "components/umb-icon.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/installer.less b/src/Umbraco.Web.UI.Client/src/less/installer.less
deleted file mode 100644
index af72072f5f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/installer.less
+++ /dev/null
@@ -1,342 +0,0 @@
-// Core variables and mixins
-@import "fonts.less"; // Loading fonts
-@import "variables.less"; // Modify this for custom colors, font-sizes, etc
-@import "colors.less";
-@import "mixins.less";
-@import "application/umb-outline.less";
-@import "buttons.less";
-@import "forms.less";
-
-// Grid system and page structure
-@import "../../lib/bootstrap/less/scaffolding.less";
-@import "../../lib/bootstrap/less/grid.less";
-@import "../../lib/bootstrap/less/layouts.less";
-
-@import "../../lib/bootstrap/less/thumbnails.less";
-@import "../../lib/bootstrap/less/media.less";
-
-// Umbraco Components
-@import "components/umb-loader.less";
-@import "components/tooltip/umb-tooltip.less";
-@import "components/umb-range-slider.less";
-
-
-[ng\:cloak],
-[ng-cloak],
-[data-ng-cloak],
-[x-ng-cloak],
-.ng-cloak,
-.x-ng-cloak {
-  display: none !important;
-}
-
-body {
-  background: url('../img/installer.svg') no-repeat center center fixed;
-  background-size: cover;
-  margin: 0;
-  padding: 0;
-  height: 100vh;
-  width: 100%;
-  font-family: @baseFontFamily;
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  color: @textColor;
-  text-align: center;
-  // better font rendering
-  -webkit-font-smoothing: antialiased;
-  font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  // center items
-  display: grid;
-  place-items: center center;
-}
-
-#logo {
-  position: absolute;
-  top: 20px;
-  left: 20px;
-  opacity: 0.8;
-  z-index: 777;
-}
-
-#installer {
-  background: @white;
-  width: min-content;
-  min-width: 500px;
-  text-align: left;
-  padding: 3rem;
-  z-index: 667;
-  border-radius: 6px;
-  box-shadow: 0 0 2px 4px rgba(0, 0, 0, 0.16);
-}
-
-#overlay {
-  position: absolute;
-  top: 0;
-  right: 0;
-  left: 0;
-  bottom: 0;
-  background: @purple-d2;
-  z-index: 666;
-}
-
-.loading #overlay {
-  opacity: 0.5;
-  display: block !important;
-}
-
-
-#fact {
-  color: @white;
-  text-shadow: 0px 0px 4px @black;
-  font-size: 25px;
-  text-align: left;
-  line-height: 35px;
-  z-index: 667;
-  height: 600px;
-  width: 750px;
-
-  h2 {
-    font-size: 35px;
-    border-bottom: 1px solid @white;
-    padding-bottom: 10px;
-    margin-bottom: 20px;
-    color: @white;
-  }
-
-  a {
-    color: @white;
-  }
-}
-
-#feedback {
-  color: @white;
-  text-shadow: 0px 0px 4px @black;
-  font-size: 14px;
-  text-align: center;
-  line-height: 20px;
-  z-index: 667;
-  bottom: 20px;
-  right: 0;
-  left: 0;
-  height: 25px;
-  position: absolute;
-}
-
-
-h1 {
-  border-bottom: 1px solid @gray-10;
-  padding-bottom: 10px;
-  color: @gray-2;
-}
-
-.error h1,
-.error .message,
-span.error {
-  color: @red;
-}
-
-legend {
-  font-size: 14px;
-  font-weight: bold
-}
-
-#installer input {
-  width: 100%;
-
-  &[type=checkbox] {
-    width: auto;
-
-    &:focus {
-      outline: 2px solid @blueMidLight;
-    }
-  }
-}
-
-input.ng-dirty.ng-invalid {
-  border-color: @pink;
-  color: @pink;
-}
-
-.disabled {
-  opacity: 0.6;
-}
-
-.installer-cols {
-  display: grid;
-  grid-template-columns: repeat(2, minmax(300px, 1fr));
-  gap: 120px;
-}
-
-.user-col {
-  display: flex;
-  flex-direction: column;
-}
-
-.telemetry-col {
-  min-height: 500px
-}
-
-
-#installer label.control-label,
-#installer .constrol-label {
-  padding-top: 5px !important;
-}
-
-.controls {
-  text-align: left;
-
-  small {
-    display: block;
-    color: @gray-3;
-  }
-
-  &.-with-border {
-    border: 1px solid @inputBorder;
-  }
-}
-
-.control-actions {
-  margin-top: 2rem;
-}
-
-.controls-space-between {
-  display: flex;
-  justify-content: space-between;;
-}
-
-#installer .input-readonly-text {
-  padding: 4px 6px;
-}
-
-#installer legend {
-  clear: both;
-}
-
-.fade-hide,
-.fade-show {
-  transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-}
-
-.fade-hide {
-  opacity: 1;
-}
-
-.fade-hide.fade-hide-active {
-  opacity: 0;
-}
-
-.fade-show {
-  opacity: 0;
-}
-
-.fade-show.fade-show-active {
-  opacity: 1;
-}
-
-.umb-installer-loader {
-  margin: 0;
-  width: 0;
-  z-index: 777;
-
-  .umb-loader {
-    background-color: @white;
-    height: 5px;
-  }
-}
-
-.permissions-report {
-  overflow: auto;
-  height: 320px;
-  margin: 0;
-  display: block;
-  padding: 0;
-}
-
-.permissions-report>li {
-  list-style: none;
-}
-
-.permissions-report h4 {
-  margin: 7px;
-}
-
-.upgrade-report {
-  overflow: auto;
-  height: 280px;
-  display: block;
-}
-
-select {
-  width: 320px;
-}
-
-#ysod {
-  height: 500px;
-  width: 100%;
-  overflow: auto;
-  border: none;
-}
-
-#starterKits {
-  .thumbnails {
-    min-height: 128px;
-    padding-left: 0;
-  }
-
-  .thumbnail {
-    position: relative;
-    cursor: pointer;
-
-    small {
-      padding: 10px 10px 5px;
-      display: inline-block;
-    }
-
-    img {
-      position: relative;
-      z-index: 100;
-    }
-  }
-
-  .btn-link {
-    padding-left: 0;
-  }
-}
-
-.umb-tooltip {
-  border: 1px solid @ui-action-border;
-  max-width: 500px;
-}
-
-#consentSliderWrapper {
-  margin-bottom: 60px;
-}
-
-.password-toggle {
-  float: right;
-  user-select: none;
-
-  button {
-    opacity: .5;
-    display: inline-block;
-    z-index: 1;
-    -webkit-tap-highlight-color: transparent;
-
-    .password-text {
-      background-repeat: no-repeat;
-      background-size: 18px;
-      background-position: 0 1px;
-      padding-left: 24px;
-
-      &.show {
-        background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='0 0 32 32'%3E%3Cpath fill='%23444' d='M16 6C9 6 3 10 0 16c3 6 9 10 16 10s13-4 16-10c-3-6-9-10-16-10zm8 5.3c1.8 1.2 3.4 2.8 4.6 4.7-1.2 2-2.8 3.5-4.7 4.7-3 1.5-6 2.3-8 2.3s-6-.8-8-2.3C6 19.5 4 18 3 16c1.5-2 3-3.5 5-4.7l.6-.2C8 12 8 13 8 14c0 4.5 3.5 8 8 8s8-3.5 8-8c0-1-.3-2-.6-2.6l.4.3zM16 13c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3 3 1.3 3 3z'/%3E%3C/svg%3E");
-      }
-
-      &.hide {
-        display: none;
-        background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='0 0 32 32'%3E%3Cpath fill='%23444' d='M29.6.4C29 0 28 0 27.4.4L21 6.8c-1.4-.5-3-.8-5-.8C9 6 3 10 0 16c1.3 2.6 3 4.8 5.4 6.5l-5 5c-.5.5-.5 1.5 0 2 .3.4.7.5 1 .5s1 0 1.2-.4l27-27C30 2 30 1 29.6.4zM13 10c1.3 0 2.4 1 2.8 2L12 15.8c-1-.4-2-1.5-2-2.8 0-1.7 1.3-3 3-3zm-9.6 6c1.2-2 2.8-3.5 4.7-4.7l.7-.2c-.4 1-.6 2-.6 3 0 1.8.6 3.4 1.6 4.7l-2 2c-1.6-1.2-3-2.7-4-4.4zM24 13.8c0-.8 0-1.7-.4-2.4l-10 10c.7.3 1.6.4 2.4.4 4.4 0 8-3.6 8-8z'/%3E%3Cpath fill='%23444' d='M26 9l-2.2 2.2c2 1.3 3.6 3 4.8 4.8-1.2 2-2.8 3.5-4.7 4.7-2.7 1.5-5.4 2.3-8 2.3-1.4 0-2.6 0-3.8-.4L10 25c2 .6 4 1 6 1 7 0 13-4 16-10-1.4-2.8-3.5-5.2-6-7z'/%3E%3C/svg%3E");
-      }
-    }
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/legacydialog.less b/src/Umbraco.Web.UI.Client/src/less/legacydialog.less
deleted file mode 100644
index f1835a682c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/legacydialog.less
+++ /dev/null
@@ -1,58 +0,0 @@
-
-.umb-dialog .propertyItemheader {
-    width: 140px !Important;
-}
-
-.umb-dialog .diffDropdown {
-    width: 400px;
-}
-
-.umb-dialog .diffPanel {
-    height: 400px;
-}
-
-
-.umb-dialog .diff {
-    margin-top: 10px;
-    height: 100%;
-    overflow: auto;
-    border-top: 1px solid @gray-8;
-    border-top: 1px solid @gray-8;
-    padding: 5px;
-}
-
-.umb-dialog .diff table {
-    width: 95%;
-    max-width: 95%;
-    margin: 0 3px;
-}
-
-.umb-dialog .diff table th {
-    padding: 5px;
-    width: 25%;
-    border-bottom: 1px solid @gray-8;
-}
-
-.umb-dialog .diff table td {
-    border-bottom: 1px solid @gray-8;
-    padding: 3px;
-}
-
-.umb-dialog .diff del {
-    background: rgb(255, 230, 230) none repeat scroll 0%;
-    -moz-background-clip: -moz-initial;
-    -moz-background-origin: -moz-initial;
-    -moz-background-inline-policy: -moz-initial;
-}
-
-.umb-dialog .diff ins {
-    background: rgb(230, 255, 230) none repeat scroll 0%;
-    -moz-background-clip: -moz-initial;
-    -moz-background-origin: -moz-initial;
-    -moz-background-inline-policy: -moz-initial;
-}
-
-.umb-dialog .diff .diffnotice {
-    text-align: center;
-    margin-bottom: 10px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less
deleted file mode 100644
index 2fc6286c94..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/listview.less
+++ /dev/null
@@ -1,306 +0,0 @@
-// Listview
-// -------------------------
-
-.umb-listview {
-    min-height: 100px;
-}
-
-.umb-listview table {
-	border: 1px solid @gray-8;
-}
-
-.umb-listview table caption {
-  background: @white;
-  text-align: left;
-  vertical-align: middle;
-}
-
-.umb-sub-header {
-  padding: 0 0 20px 0;
-}
-
-.umb-sub-header .header-content-right {
-  float: right;
-}
-
-/* listview search */
-.form-search {
-    .inner-addon {
-        position: relative;
-
-        [class^="icon-"], [class*=" icon-"] {
-            position: absolute;
-            padding: 5px 8px;
-            pointer-events: none;
-
-            &i {
-                top: 2px;
-            }
-        }
-
-        input[type="text"] {
-            width: 190px;
-        }
-    }
-
-    /* align icon */
-    .left-addon [class^="icon-"], .left-addon [class*=" icon-"] { left: 0; right: inherit; }
-    .right-addon [class^="icon-"], .right-addon [class*=" icon-"] { right: 0; left: inherit; }
-
-    /* add padding */
-    .left-addon input[type="text"]  { padding-left: 30px !important; padding-right: 6px; }
-    .right-addon input[type="text"] { padding-right: 30px; padding-left: 6px !important; }
-
-    &__label-icon{
-        width: 30px; 
-        height: 30px; 
-        position: absolute; 
-        top: -1px; 
-        left:0; 
-        margin:0
-      }
-}
-
-.umb-listview table form {
-  position: relative;
-  margin: 0;
-}
-
-.umb-listview table input[type="text"] {
-  background: none;
-  transition: all .5s;
-  width: 60px;
-  padding: 4px 0 4px 20px;
-  border: 1px solid @gray-8;
-}
-
-.umb-listview table input::-webkit-input-placeholder,
-.umb-listview table input:-moz-placeholder,
-.umb-listview table input::-moz-placeholder,
-.umb-listview table input:-ms-input-placeholder {
-  color: @gray-3;
-}
-
-.umb-listview table input[type="text"]:focus {
-  width: 200px;
-  border: 1px solid @gray-8;
-  background: @white;
-  color: @black
-}
-
-.umb-listview table thead a {
-    cursor: default;
-}
-.umb-listview table thead a:hover {
-    text-decoration: none;
-}
-
-.umb-listview table thead a.sortable {
-    cursor: pointer;
-}
-.umb-listview table thead a.sortable span:hover {
-    text-decoration: underline;
-}
-
-.umb-listview .icon-star {
-  color: @gray-8;
-}
-
-.umb-listview .selected i.icon, .umb-listview tbody tr:hover i.icon{display: none}
-.umb-listview .selected input[type="checkbox"],
-.umb-listview tr:hover input[type="checkbox"]{display: inline-block !important;}
-.umb-listview .inactive{color: @gray-8;}
-
-.umb-listview .selected td{font-weight: bold;}
-
-.umb-listview table thead {
-  font-size: 12px;
-  font-weight: bold;
-  text-transform: uppercase;
-  background-color: @white;
-}
-
-.umb-listview table tfoot {
-	background: @gray-10;
-}
-
-.umb-listview table tfoot td:last-child {
-  border-left: none
-}
-
-.umb-listview table tfoot th {
-	padding: 0 20px;
-}
-
-.umb-listview .label {
-  color: @black;
-  text-shadow:none;
-  background: @gray-10;
-  border: 1px solid @gray-8;
-  font-size: 12px;
-  font-weight: normal;
-}
-
-.umb-listview .table-striped tbody > tr:nth-child(even) > td, .umb-listview .table-striped tbody > tr:nth-child(even) > th {
-  background-color: @gray-10;
-}
-
-.table-striped tbody > tr:nth-child(odd) > td, .table-striped tbody > tr:nth-child(odd) > th {
-  background: none
-}
-
-/* TEMP */
-
-.umb-minilistview {
-    .umb-table-row.not-allowed {
-      cursor: not-allowed;
-      .umb-minilistview__fade-not-allowed {
-        opacity: 0.6;
-      }
-    }
-
-    div.umb-mini-list-view__breadcrumb {
-        margin-bottom: 10px;
-    }
-
-    div.no-display {
-        display: none
-    }
-
-    div.umb-table-cell-padding {
-        padding-top: 8px;
-        padding-bottom: 8px;
-    }
-
-    div.umb-table-cell .form-search {
-        width: 100%;
-        margin-right: 0;
-
-        input {
-            width: 100%;
-        }
-
-        .icon-search {
-            font-size: 14px;
-        }
-    }
-}
-
-.umb-listview .table-striped tbody td {
-  position: relative
-}
-
-
-.umb-listview  .table-striped thead input[type="checkbox"] {
-  margin-left: 7px;
-}
-
-.umb-listview  .table-striped tbody input[type="checkbox"] {
-  display: none;
-  margin-left: 7px;
-  z-index: 5;
-}
-
-.umb-listview .table-striped tbody i {
-  display: block;
-  top: 10px;
-  left:6px;
-  padding: 0 0 0 4px;
-  z-index: 6;
-  background: @white;
-  width: 20px;
-  height: 20px;
-}
-
-.umb-listview .table-striped tbody > tr:nth-child(even) > td i, .umb-listview .table-striped tbody > tr:nth-child(even) > th i{
-  background-color: @gray-10;
-}
-
-/* don't hide all icons, e.g. for a sortable handle */
-.umb-listview .table-striped tbody i:not(.handle):hover {
-  display: none !important
-}
-
-/* Sticky sub header with correct focus ordering */
-.umb-listview .umb-listview__container {
-  display: flex;
-  flex-direction: column;
-}
-
-.umb-listview .umb-listview__container .umb-editor-sub-header {
-  order: -1;
-}
-
-/* ---------- LAYOUTS ---------- */
-
-.list-view-layout {
-    display: flex;
-    align-items: center;
-    padding: 10px 15px;
-    background: @gray-10;
-    margin-bottom: 1px;
-
-    &__sort-handle {
-        font-size: 14px;
-        color: @gray-8;
-        margin-right: 15px;
-    }
-
-    &__name {
-        flex: 5;
-        font-weight: bold;
-        margin-right: 15px;
-        display: flex;
-        align-content: center;
-        flex-wrap: wrap;
-        line-height: 1.2em;
-    }
-
-    &__name-text {
-        margin-right: 3px;
-    }
-
-    &__system {
-        font-size: 10px;
-        font-weight: normal;
-    }
-
-    &__path {
-        flex: 10;
-        margin-right: 15px;
-    }
-
-    &__icon-wrapper {
-        margin-right: 10px;
-    }
-
-    &__icon {
-        font-size: 18px;
-        vertical-align: middle;
-        border: 1px solid @gray-8;
-        background: @white;
-        padding: 0;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 30px;
-        height: 30px;
-    }
-
-    &__remove {
-        position: relative;
-        cursor: pointer;
-    }
-
-    input[type="text"] {
-        margin-bottom: 0;
-    }
-}
-
-.list-view-add-layout {
-    &:extend(.umb-node-preview-add);
-}
-
-.list-view-add-layout:hover {
-    &:extend(.umb-node-preview-add:hover);
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
deleted file mode 100644
index 8ac3c170e9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ /dev/null
@@ -1,709 +0,0 @@
-// Main
-// -------------------------
-
-
-// Utillity classes
-// @Per not sure where to put this part
-// -------------------------
-
-.fill {
-	height: 100%;
-	min-height: 100%;
-}
-.shadow {
-	box-shadow: 3px 0px 7px rgba(0,0,0,0.16);
-}
-
-img:not([src]):not([srcset]) {
-  visibility: hidden;
-}
-
-img.lazy {
-  -webkit-transition: opacity 1.2s cubic-bezier(0.16, 1.08, 0.38, 0.98);
-  transition: opacity 1.2s cubic-bezier(0.16, 1.08, 0.38, 0.98);
-  opacity: 0;
-}
-
-img.lazy.loaded {
-  opacity: 1;
-}
-
-.umb-scrollable, .umb-auto-overflow {
-	overflow: auto;
-}
-
-.umb-abstract {
-    display: block;
-    margin-top: 0px;
-    margin-bottom: 15px;
-    font-size: 14px;
-    color: @gray-7;
-}
-
-h5, .h5{
-  color: @gray-1;
-  font-weight: bold;
-  font-size: 15px;
-  margin-top: 15px;
-}
-
-h1.-border-bottom,
-h2.-border-bottom,
-h3.-border-bottom,
-h4.-border-bottom,
-h5.-border-bottom,
-h6.-border-bottom {
-	border-bottom: 1px solid @gray-9;
-	padding-bottom: 5px;
-}
-
-h1.-black,
-h2.-black,
-h3.-black,
-h4.-black,
-h5.-black,
-h6.-black {
-	color: @black;
-}
-
-/* MISC FORM ELEMENTS */
-.umb-form-actions {
-    background: none;
-    border: none
-}
-.bootstrap-datetimepicker-widget {
-  width: auto !important;
-    td {
-        &.active, span.active {
-            background: @blueMid !important;
-        }
-        &.today:not(.active):before {
-            border-bottom-color: @pinkLight !important;
-        }
-        a[data-action] {
-            padding: 0 !important;
-        }
-        .timepicker-hour,
-        .timepicker-minute,
-        .timepicker-second {
-            margin: 8px 0;
-        }
-    }
-}
-
-.umb-datetime-picker div.info {
-    vertical-align: middle
-}
-
-.umb-userwidget img {
-    float: left;
-    margin-right: 15px;
-}
-.umb-userwidget small {
-    display: block
-}
-.popover-title {
-    display: none
-}
-
-
-/*BUTTONS */
-.thumbnails > li.umb-plus-btn {
-  margin: 0 10px 10px 0
-}
-
-.umb-plus-btn a {
-  border: 2px dashed @gray-8;
-  width: 136px;
-  height: 136px;
-  line-height: 136px;
-  text-align: center;
-  font-size: 50px;
-  display: block;
-  color: @gray-8;
-  text-decoration: none;
-  transition: all 0.3s ease-in-out;
-}
-
-.umb-plus-btn a:hover {
-  border: 2px dashed @black;
-  color: @black
-}
-
-.umb-plus-btn i {
-    vertical-align: middle;
-    margin: auto
-}
-
-/* FORM GRID */
-.umb-pane {
-  margin: 20px;
-}
-.umb-control-group {
-    position: relative;
-
-    &.umb-control-group__listview {
-        // position: relative messes up the listview status messages (e.g. "no search results")
-        position: unset;
-    }
-
-    &::after {
-        content: '';
-        display:block;
-        margin-top: 20px;
-        width: 100%;
-        height: 1px;
-        background-color: @gray-11;
-    }
-}
-
-.umb-control-group.-no-border {
-    &::after {
-        margin-top: 0px;
-        height: 0;
-        background-color: transparent;
-    }
-}
-
-umb-property:last-of-type > .umb-property > ng-form > .umb-control-group {
-    &::after {
-        margin-top: 0px;
-        height: 0;
-        background-color: transparent;
-    }
-    margin-bottom: 0 !important;
-}
-
-/* BLOCK MODE */
-.block-form .umb-control-group {
-    margin-top: 0px;
-    &::after {
-        margin-top: 0px;
-        height: 0;
-        background-color: transparent;
-    }
-}
-
-.block-form .umb-control-group label .help-block,
-.block-form .umb-control-group label small {
-  font-size: 13px;
-  padding-top: 2px;
-  margin-bottom: 5px;
-}
-
-/*COMPACT MODE */
-.compact .umb-pane{margin: 0px 0px 15px 0px;}
-.compact .umb-control-group {
-  border-bottom: 1px solid @gray-10;
-  padding-bottom: 10px;
-  margin-bottom: 5px !important;
-}
-.compact label.control-label {
-  padding-top: 0px !important;
-  margin-bottom: 0px;
-}
-
-.compact .controls-row{padding-top: 0px }
-
-.umb-pane > .umb-control-group:last-child {
-  border: none;
-  padding-bottom: 0 !important;
-}
-
-.umb-control-group .umb-el-wrap {
-  padding: 0;
-}
-.umb-control-group .control-header {
-    
-    .control-label {
-        white-space: break-spaces;
-        overflow-wrap: break-word;
-        float: left;
-    }
-
-    .control-description {
-        display: block;
-        clear: both;
-        overflow-wrap: break-word;
-    }
-
-    &::after {
-        content: '';
-        display: block;
-        clear: both;
-    }
-}
-
-.umb-editor--infiniteMode .umb-control-group .control-header {
-    padding-bottom: 5px;
-}
-
-.form-horizontal .umb-control-group .control-header {
-    float: left;
-    width: 160px;
-    padding-bottom: 0;
-    text-align: left;
-    margin-bottom: 12px;
-
-    .control-label {
-        width: 100%;
-        box-sizing: border-box;
-        padding-top: 0;
-        text-align: left;
-    }
-
-    .control-description {
-        margin-bottom: 5px;
-    }
-}
-@media (max-width: 767px) {
-    
-    .form-horizontal .umb-control-group .control-header {
-        float: none;
-        width: 100%;
-
-        .control-label {
-            width: auto;
-        }
-
-        &::after {
-            content: "";
-            display: table;
-            clear: both;
-        }
-    }
-    
-}
-.form-horizontal .umb-control-group.--label-on-top > .umb-el-wrap {
-    & > .control-header {
-        float: none;
-        width: 100%;
-        &::after {
-            content: "";
-            display: table;
-            clear: both;
-        }
-    }
-
-    & .control-label {
-        width: auto;
-    }
-
-    & > .controls {
-        margin-left: 0;
-    }
-}
-
-/* LABELS*/
-.umb-control-group label.control-label, .umb-control-group .control-label {
-  text-align: left;
-}
-.umb-control-group label.control-label > div > label {
-  padding-left: 0;
-}
-.umb-control-group label .help-block,
-.umb-control-group label small {
-  font-size: 12px;
-  color: @gray-6;
-  line-height: 1.5em;
-  padding-top: 5px;
-}
-.umb-nolabel .controls {
-  margin-left: 0;
-}
-
-label[for=""] {
-  cursor: default;
-}
-
-label:not([for]) {
-  cursor: default;
-}
-
-/* CONTROL VALIDATION */
-.umb-control-required {
-    color: @controlRequiredColor;
-    font-weight: 900;
-}
-
-.controls-row {
-  padding-bottom: 5px;
-  margin-left: 240px;
-}
-
-.umb-user-panel .controls-row {
-    margin-left: 0;
-}
-
-.controls-row label:not(.umb-form-check) {
-  display: inline-block;
-}
-
-.controls-row > div > label {
-  padding-left: 0;
-}
-
-.block-form .controls-row {
-   margin-left: 0;
-   padding-top: 0;
-}
-
-.hidelabel > div > .controls-row, .hidelabel > .controls-row, .hidelabel > div > .controls {
-  padding: 0;
-  border: none;
-  margin: 0 !important;
-}
-
-.controls > .vertical-align-items,
-.controls-row > .vertical-align-items {
-  display: flex;
-  align-items: center;
-}
-
-.controls > .vertical-align-items > input.umb-property-editor-tiny,
-.controls > .vertical-align-items > input.umb-property-editor-small,
-.controls-row > .vertical-align-items > input.umb-property-editor-tiny,
-.controls-row > .vertical-align-items > input.umb-property-editor-small {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-
-.controls > .vertical-align-items > input.umb-property-editor-tiny:first-child
-.controls > .vertical-align-items > input.umb-property-editor-small:first-child,
-.controls-row > .vertical-align-items > input.umb-property-editor-tiny:first-child
-.controls-row > .vertical-align-items > input.umb-property-editor-small:first-child {
-  margin-left: 0;
-}
-
-.thumbnails .selected {
-  border-color: @black;
-  background: @black
-}
-
-.umb-version {
-    color: @gray-7;
-    position: absolute;
-    bottom: 5px;
-    right: 20px;
-}
-
-/* DASHBOARD */
-.dashboardHideLink {
-  display: none;
-}
-.dashboardWrapper {
-  position: relative
-}
-.dashboardWrapper h2 {
-  padding: 0px 0px 0px 45px
-}
-.dashboardWrapper h3 {
-  font-size: 14px;
-  font-weight: bold
-}
-.dashboardIcon {
-  position: absolute;
-  top: 2px;
-  left: 2px
-}
-
-.umb-dashboard-control
-  iframe{ position: absolute; display: block; width: 99%; height: 99%; overflow: auto !important;}
-
-
-/* TABLE */
-.umb-table {
-  table-layout: fixed;
-  word-wrap: break-word;
-}
-.umb-no-border {
-  border: none !important;
-}
-
-table thead a,
-table thead button {
-  color: @gray-2;
-}
-
-table thead button:hover,
-table thead button:focus{
-    text-decoration: underline;
-}
-
-/* UI interactions */
-
-.ui-sortable:not(.ui-sortable-disabled) .ui-sortable-handle {
-  cursor: move;
-}
-
-.umb-table tbody.ui-sortable tr {
-  cursor: pointer;
-}
-
-.umb-table tbody.ui-sortable tr.ui-sortable-helper {
-  background-color: @sortableHelperBg;
-  border: none;
-}
-
-.umb-table tbody.ui-sortable tr.ui-sortable-helper td {
-  border: none;
-}
-
-.umb-table tbody.ui-sortable tr.ui-sortable-placeholder {
-  background-color: @sortablePlaceholderBg;
-  border:none;
-}
-
-.umb-table tbody.ui-sortable tr.ui-sortable-placeholder td
-{
-    height:5px;
-    padding:0px;
-    line-height:0px;
-}
-
-/* MEDIA PICKER */
-
-.thumbnails > li.umb-thumbnail {
-  margin: 0 10px 10px 0;
-  position: relative;
-}
-
-.thumbnails > li.umb-thumbnail .umb-icons {
-  background: @gray-1;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  z-index: 1000;
-  padding: 17px 0
-}
-
-.thumbnails > li.umb-thumbnail .icon-crop {
-  position: absolute;
-  left: 10px;
-  top: 10px;
-  color: @white;
-  font-size: 14px
-}
-
-.thumbnails > li.umb-thumbnail .icon-remove {
-  position: absolute;
-  right: 10px;
-  top: 10px;
-  color: @white;
-  font-size: 14px
-}
-
-/* IMAGE CROPPER */
-
-.umb-image-crop {
-  margin: 0 30px 25px 0;
-  padding: 0 0 30px 0;
-  width: 400px;
-  float: left
-}
-
-.umb-image-mask {
-  width: 399px;
-  height: 300px;
-  position: relative;
-  margin: 0 30px 0 0
-}
-
-.umb-image-mask:after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 5999;
-  opacity: .6;
-  box-shadow: inset 0 0 0 40px white,inset 0 0 0 41px rgba(0,0,0,0.2),inset 0 0 20px 41px rgba(0,0,0,0.2);
-}
-
-.umb-image-mask .icon-screenshot {
-  color: @white;
-  font-size: 30px;
-  position: absolute;
-  top: 125px;
-  left: 110px;
-  z-index: 1000;
-}
-
-.umb-image-mask .icon-circle {
-  color: @turquoise-d1;
-  position: absolute;
-  top: 130px;
-  left: 115px;
-  z-index: 1;
-  font-size: 20px
-}
-
-.umb-crop-preview {
-  float: left;
-  width: 400px
-}
-
-
-.umb-image-controls {
-  width: 400px; /* Need to be set dynamic, accounding to the width of the current image */
-}
-
-.umb-image-controls .icon-minus {
-  float: left;
-  padding: 14px 10px 0 10px;
-  color: @inputBorder;
-}
-
-.umb-image-controls .icon-plus {
-  float: right;
-  text-align: left;
-  padding: 14px 10px 0 10px;
-  color: @inputBorder;
-}
-
-.umb-image-crop .range {
-  display: block;
-  -webkit-appearance: none;
-  background: @inputBorder;
-  height: 1px;
-  margin: 20px 0 0 0;
-  width: 82%;
-  float: left;
-}
-
-.umb-image-crop .range::-webkit-slider-thumb {
-  -webkit-appearance: none;
-  width:14px;
-  height:14px;
-  border:1px solid @inputBorder;
-  border-radius:2px;
-  content:"1";
-  background: @gray-10;
-  margin-top: -1px;
-}
-
-/* SEARCH */
-
-.umb-search-group li > div {
-    padding-left: 20px;
-}
-
-.umb-search-group li > div a > i {
-    height: 100%;
-}
-
-/* DICTIONARY */
-#dictionaryItems tr {
-    border-top:solid 1px @gray-8;
-}
-
-#dictionaryItems thead tr {
-    border-top:none;
-    font-weight:bold;
-}
-
-#dictionaryItems th {
-    text-align:left;
-    font-weight:normal;
-}
-
-#dictionaryItems td {
-    text-align:center;
- }
-
-#dictionaryItems thead td:first-of-type {
-    text-align: left;
-}
-
-#dictioanryItems i {
-    font-size:18px;
-}
-
-#dictionaryItems .icon-alert {
-    color:@red;
-}
-
-#dictionaryItems .icon-check {
-    color:@green;
-}
-
-// Helpers
-
-.strong {
-	font-weight: bold;
-}
-
-.inline {
-	display: inline;
-}
-
-.relative {
-  position:relative;
-}
-
-// Input label styles
-// @Simon: not sure where to put this part yet
-// --- TODO Needs to be divided into the right .less directories
-
-
-// Titles for input fields
-.input-label--title {
-	font-weight: bold;
-	color: @black;
-
-	margin-bottom: 3px;
-}
-
-
-// Used for input checkmark fields
-.input-label--small {
-	display: inline;
-
-	font-size: 12px;
-	font-weight: bold;
-	color: @gray-3;
-
-	&:hover {
-		color: @black;
-	}
-}
-
-input[type=checkbox]:checked + .input-label--small {
-	color: @turquoise-d1;
-}
-
-
-// Use this for headers in the panels
-.panel-dialog--header {
-	border-bottom: 1px solid @gray-3;
-	margin: 10px 0;
-	padding-bottom: 10px;
-	font-size: @fontSizeLarge;
-	font-weight: bold;
-	line-height: 20px;
-}
-
-
-// Datepicker styles
-.bootstrap-datetimepicker-widget,
-.bootstrap-datetimepicker-widget td,
-.bootstrap-datetimepicker-widget th,
-.bootstrap-datetimepicker-widget td span {
-	border-radius: 0 !important;
-}
-
-.diff del {
-  background-color: @red-l3;
-}
-
-.diff ins {
-  background-color: @green-l3;
-  text-decoration: none;
-}
-
-.language-icon {
-    color: #BBBABF;
-    margin-right: 5px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/mixins.less b/src/Umbraco.Web.UI.Client/src/less/mixins.less
deleted file mode 100644
index c0ddcd6cdb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/mixins.less
+++ /dev/null
@@ -1,631 +0,0 @@
-//
-// Mixins
-// --------------------------------------------------
-
-
-// UTILITY MIXINS
-// --------------------------------------------------
-
-// Clearfix
-// --------
-// For clearing floats like a boss h5bp.com/q
-.clearfix {
-  &:before,
-  &:after {
-    display: table;
-    content: "";
-    // Fixes Opera/contenteditable bug:
-    // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
-    line-height: 0;
-  }
-  &:after {
-    clear: both;
-  }
-}
-
-// Webkit-style focus
-// ------------------
-.tab-focus() {
-  // Default
-  outline: thin dotted @gray-3;
-  // Webkit
-  outline: 5px auto -webkit-focus-ring-color;
-}
-
-// Center-align a block level element
-// ----------------------------------
-.center-block() {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-// Sizing shortcuts
-// -------------------------
-.size(@height, @width) {
-  width: @width;
-  height: @height;
-}
-.square(@size) {
-  .size(@size, @size);
-}
-
-// Placeholder text
-// -------------------------
-.placeholder(@color: @placeholderText) {
-  &:-moz-placeholder {
-    color: @color;
-  }
-  &:-ms-input-placeholder {
-    color: @color;
-  }
-  &::-webkit-input-placeholder {
-    color: @color;
-  }
-}
-
-// Text overflow
-// -------------------------
-// Requires inline-block or block for proper styling
-.text-overflow() {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-// CSS image replacement
-// -------------------------
-// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-
-// FONTS
-// --------------------------------------------------
-
-#font {
-  #family {
-    .serif() {
-      font-family: @serifFontFamily;
-    }
-    .sans-serif() {
-      font-family: @sansFontFamily;
-    }
-    .monospace() {
-      font-family: @monoFontFamily;
-    }
-  }
-  .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    font-size: @size;
-    font-weight: @weight;
-    line-height: @lineHeight;
-  }
-  .serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    #font > #family > .serif;
-    #font > .shorthand(@size, @weight, @lineHeight);
-  }
-  .sans-serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    #font > #family > .sans-serif;
-    #font > .shorthand(@size, @weight, @lineHeight);
-  }
-  .monospace(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    #font > #family > .monospace;
-    #font > .shorthand(@size, @weight, @lineHeight);
-  }
-}
-
-
-// FORMS
-// --------------------------------------------------
-
-// Block level inputs
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: @inputHeight; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
-  .box-sizing(border-box); // Makes inputs behave like true block-level elements
-}
-
-
-
-// Mixin for form field states
-//SD: I've had to modify this slightly to work nicely with angular validation , note the
-// additional targetting of the ng-invalid class.
-.formFieldState(@textColor: @gray-4, @borderColor: @gray-7, @backgroundColor: @gray-10) {
-  // Set the text color
-  > .control-label,
-  > .umb-el-wrap > .control-label,
-  > .umb-el-wrap > .control-header > .control-label,
-  .help-block,
-  .help-inline {
-    color: @textColor;
-  }
-  // Style inputs accordingly
-  .checkbox.ng-invalid,
-  .radio.ng-invalid,
-  input.ng-invalid,
-  select.ng-invalid,
-  textarea.ng-invalid {
-    color: @textColor;
-  }
-  input.ng-invalid,
-  select.ng-invalid,
-  textarea.ng-invalid {
-    border-color: @borderColor;
-  }
-  // Give a small background color for input-prepend/-append
-  .input-prepend .add-on,
-  .input-append .add-on {
-    color: @textColor;
-    background-color: @backgroundColor;
-    border-color: @textColor;
-  }
-}
-
-// CSS3 PROPERTIES
-// --------------------------------------------------
-
-// Border Radius
-.border-radius(@radius) {
-    border-radius: @radius;
-}
-
-// Single Corner Border Radius
-.border-top-left-radius(@radius) {
-    border-top-left-radius: @radius;
-}
-.border-top-right-radius(@radius) {
-    border-top-right-radius: @radius;
-}
-.border-bottom-right-radius(@radius) {
-    border-bottom-right-radius: @radius;
-}
-.border-bottom-left-radius(@radius) {
-    border-bottom-left-radius: @radius;
-}
-
-// Single Side Border Radius
-.border-top-radius(@radius) {
-  .border-top-right-radius(@radius);
-  .border-top-left-radius(@radius);
-}
-.border-right-radius(@radius) {
-  .border-top-right-radius(@radius);
-  .border-bottom-right-radius(@radius);
-}
-.border-bottom-radius(@radius) {
-  .border-bottom-right-radius(@radius);
-  .border-bottom-left-radius(@radius);
-}
-.border-left-radius(@radius) {
-  .border-top-left-radius(@radius);
-  .border-bottom-left-radius(@radius);
-}
-
-// Drop shadows
-.box-shadow(@shadow) {
-    box-shadow: @shadow;
-}
-
-// Transitions
-.transition(@transition) {
-    transition: @transition;
-}
-.transition-delay(@transition-delay) {
-    transition-delay: @transition-delay;
-}
-.transition-duration(@transition-duration) {
-    transition-duration: @transition-duration;
-}
-
-// Transformations
-.rotate(@degrees) {
-    transform: rotate(@degrees);
-}
-.scale(@ratio) {
-    transform: scale(@ratio);
-}
-.translate(@x, @y) {
-    transform: translate(@x, @y);
-}
-.skew(@x, @y) {
-    transform: skew(@x, @y);
-    -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319
-}
-.translate3d(@x, @y, @z) {
-    transform: translate3d(@x, @y, @z);
-}
-
-// Backface visibility
-// Prevent browsers from flickering when using CSS 3D transforms.
-// Default value is `visible`, but can be changed to `hidden
-// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
-.backface-visibility(@visibility){
-	-webkit-backface-visibility: @visibility;
-	   -moz-backface-visibility: @visibility;
-	        backface-visibility: @visibility;
-}
-
-// Background clipping
-// Heads up: FF 3.6 and under need "padding" instead of "padding-box"
-.background-clip(@clip) {
-    background-clip: @clip;
-}
-
-// Background sizing
-.background-size(@size) {
-    background-size: @size;
-}
-
-
-// Box sizing
-.box-sizing(@boxmodel) {
-    box-sizing: @boxmodel;
-}
-
-// User select
-// For selecting text on the page
-.user-select(@select) {
-  -webkit-user-select: @select;
-     -moz-user-select: @select;
-      -ms-user-select: @select;
-       -o-user-select: @select;
-          user-select: @select;
-}
-
-// Resize anything
-.resizable(@direction) {
-  resize: @direction; // Options: horizontal, vertical, both
-  overflow: auto; // Safari fix
-}
-
-// CSS3 Content Columns
-.content-columns(@columnCount, @columnGap: @gridGutterWidth) {
-  -webkit-column-count: @columnCount;
-     -moz-column-count: @columnCount;
-          column-count: @columnCount;
-  -webkit-column-gap: @columnGap;
-     -moz-column-gap: @columnGap;
-          column-gap: @columnGap;
-}
-
-// Optional hyphenation
-.hyphens(@mode: auto) {
-  word-wrap: break-word;
-  -webkit-hyphens: @mode;
-     -moz-hyphens: @mode;
-      -ms-hyphens: @mode;
-       -o-hyphens: @mode;
-          hyphens: @mode;
-}
-
-// Opacity
-.opacity(@opacity) {
-  opacity: (@opacity / 100);
-}
-
-// Position
-.absolute() {
-    position:absolute;
-    top:0;
-    right:0;
-    bottom:0;
-    left:0;
-}
-
-// BACKGROUNDS
-// --------------------------------------------------
-
-// Add an alphatransparency value to any background or border color (via Elyse Holladay)
-#translucent {
-  .background(@color: @white, @alpha: 1) {
-    background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
-  }
-  .border(@color: @white, @alpha: 1) {
-    border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
-    .background-clip(padding-box);
-  }
-}
-
-// Gradient Bar Colors for buttons and alerts
-.gradientBar(@primaryColor, @secondaryColor, @textColor: @white) {
-  color: @textColor;
-  #gradient > .vertical(@primaryColor, @secondaryColor);
-  border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
-}
-
-// Gradients
-#gradient {
-  .horizontal(@startColor: @gray, @endColor: @grayDark) {
-    background-color: @endColor;
-    background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+
-    background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10
-    background-repeat: repeat-x;
-  }
-  .vertical(@startColor: @gray, @endColor: @grayDark) {
-    background-color: mix(@startColor, @endColor, 60%);
-    background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10
-    background-repeat: repeat-x;
-  }
-  .directional(@startColor: @gray, @endColor: @grayDark, @deg: 45deg) {
-    background-color: @endColor;
-    background-repeat: repeat-x;
-    background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+
-    background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10
-  }
-  .horizontal-three-colors(@startColor: @lightBlueIcon, @midColor: @purple-l1, @colorStop: 50%, @endColor: @pink) {
-    background-color: mix(@midColor, @endColor, 80%);
-    background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
-    background-image: -webkit-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
-    background-image: -moz-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
-    background-image: -o-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
-    background-image: linear-gradient(to right, @startColor, @midColor @colorStop, @endColor);
-    background-repeat: no-repeat;
-  }
-
-  .vertical-three-colors(@startColor: @lightBlueIcon, @midColor: @deepPurpleIcon, @colorStop: 50%, @endColor: @pink) {
-    background-color: mix(@midColor, @endColor, 80%);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
-    background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
-    background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-repeat: no-repeat;
-  }
-  .radial(@innerColor: @gray, @outerColor: @grayDark) {
-    background-color: @outerColor;
-    background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor));
-    background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor);
-    background-image: -moz-radial-gradient(circle, @innerColor, @outerColor);
-    background-image: -o-radial-gradient(circle, @innerColor, @outerColor);
-    background-repeat: no-repeat;
-  }
-  .striped(@color: @gray, @angle: 45deg) {
-    background-color: @color;
-    background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
-    background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-    background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-    background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-    background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-  }
-}
-
-.checkeredBackground(@backgroundColor: @white, @fillColor: @black, @fillOpacity: 0.1) {
-    background-image: url('data:image/svg+xml;charset=utf-8,\
-                        <svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 100 100" fill="@{fillColor}" fill-opacity="@{fillOpacity}" >\
-                            <rect x="50" width="50" height="50" />\
-                            <rect y="50" width="50" height="50" />\
-                        </svg>');
-    background-color: @backgroundColor;
-    background-size: 10px 10px;
-    background-repeat: repeat;
-}
-
-// COMPONENT MIXINS
-// --------------------------------------------------
-// Limit width of specific property editors
-.umb-property-editor--limit-width {
-    max-width: @propertyEditorLimitedWidth;
-}
-
-// Horizontal dividers
-// -------------------------
-// Dividers (basically an hr) within dropdowns and nav lists
-.nav-divider(@top: @gray-8, @bottom: @white) {
-  height: 1px;
-  margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
-  overflow: hidden;
-  background-color: @top;
-  border-bottom: 1px solid @bottom;
-}
-
-// Button backgrounds
-// ------------------
-.buttonBackground(@startColor, @hoverColor: @startColor, @textColor: @white, @textColorHover: @textColor, @disabledColor: @sand-1, @disabledTextColor: @white) {
-
-  color: @textColor;
-  border-color: @startColor @startColor darken(@startColor, 15%);
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
-
-  background-color: @startColor;
-
-  .caret {
-      border-top-color: @textColor;
-      border-bottom-color: @textColor;
-  }
-
-  // in these cases the gradient won't cover the background, so we override
-  &:focus,
-  &:hover {
-    color: @textColorHover;
-    background-color: @hoverColor;
-    text-decoration: none;
-  }
-
-  &.disabled, &[disabled] {
-    background-color: @disabledColor;
-    color: @disabledTextColor;
-  }
-}
-
-// Navbar vertical align
-// -------------------------
-// Vertically center elements in the navbar.
-// Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin.
-.navbarVerticalAlign(@elementHeight) {
-  margin-top: ((@navbarHeight - @elementHeight) / 2);
-}
-
-
-
-// Grid System
-// -----------
-
-// Centered container element
-.container-fixed() {
-  margin-right: auto;
-  margin-left: auto;
-  .clearfix();
-}
-
-// Table columns
-.tableColumns(@columnSpan: 1) {
-  float: none; // undo default grid column styles
-  width: ((@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16); // 16 is total padding on left and right of table cells
-  margin-left: 0; // undo default grid column styles
-}
-
-// Make a Grid
-// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
-.makeRow() {
-  margin-left: (@gridGutterWidth * -1);
-  .clearfix();
-}
-.makeColumn(@columns: 1, @offset: 0) {
-  float: left;
-  margin-left: ((@gridColumnWidth * @offset) + (@gridGutterWidth * (@offset - 1)) + (@gridGutterWidth * 2));
-  width: ((@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)));
-}
-
-// The Grid
-#grid {
-
-  .core (@gridColumnWidth, @gridGutterWidth) {
-
-    .spanX (@index) when (@index > 0) {
-      .span@{index} { .span(@index); }
-      .spanX((@index - 1));
-    }
-    .spanX (0) {}
-
-    .offsetX (@index) when (@index > 0) {
-      .offset@{index} { .offset(@index); }
-      .offsetX((@index - 1));
-    }
-    .offsetX (0) {}
-
-    .offset (@columns) {
-      margin-left: ((@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1)));
-    }
-
-    .span (@columns) {
-      width: ((@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)));
-    }
-
-    .row {
-      margin-left: (@gridGutterWidth * -1);
-      .clearfix();
-    }
-
-    [class*="span"] {
-      float: left;
-      min-height: 1px; // prevent collapsing columns
-      margin-left: @gridGutterWidth;
-    }
-
-    // Set the container width, and override it for fixed navbars in media queries
-    .container,
-    .navbar-static-top .container,
-    .navbar-fixed-top .container,
-    .navbar-fixed-bottom .container { .span(@gridColumns); }
-
-    // generate .spanX and .offsetX
-    .spanX (@gridColumns);
-    .offsetX (@gridColumns);
-
-  }
-
-  .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) {
-
-    .spanX (@index) when (@index > 0) {
-      .span@{index} { .span(@index); }
-      .spanX((@index - 1));
-    }
-    .spanX (0) {}
-
-    .offsetX (@index) when (@index > 0) {
-      .offset@{index} { .offset(@index); }
-      .offset@{index}:first-child { .offsetFirstChild(@index); }
-      .offsetX((@index - 1));
-    }
-    .offsetX (0) {}
-
-    .offset (@columns) {
-      margin-left: ((@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth * 2));
-    }
-
-    .offsetFirstChild (@columns) {
-      margin-left: ((@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth));
-    }
-
-    .span (@columns) {
-      width: ((@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)));
-    }
-
-    .row-fluid {
-      width: 100%;
-      .clearfix();
-      [class*="span"] {
-        .input-block-level();
-        float: left;
-        margin-left: @fluidGridGutterWidth;
-      }
-      [class*="span"]:first-child {
-        margin-left: 0;
-      }
-
-      // Space grid-sized controls properly if multiple per line
-      .controls-row [class*="span"] + [class*="span"] {
-        margin-left: @fluidGridGutterWidth;
-      }
-
-      // generate .spanX and .offsetX
-      .spanX (@gridColumns);
-      .offsetX (@gridColumns);
-    }
-
-  }
-
-  .input(@gridColumnWidth, @gridGutterWidth) {
-
-    .spanX (@index) when (@index > 0) {
-      input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index} { .span(@index); }
-      .spanX((@index - 1));
-    }
-    .spanX (0) {}
-
-    .span(@columns) {
-      width: ((@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) - 14);
-    }
-
-    input,
-    textarea,
-    .uneditable-input {
-      margin-left: 0; // override margin-left from core grid system
-    }
-
-    // Space grid-sized controls properly if multiple per line
-    .controls-row [class*="span"] + [class*="span"] {
-      margin-left: @gridGutterWidth;
-    }
-
-    // generate .spanX
-    .spanX (@gridColumns);
-
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less
deleted file mode 100644
index e944bba1b2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/modals.less
+++ /dev/null
@@ -1,210 +0,0 @@
-/* Modals
-// -------------------------*/
-
-/* Modalcolumn is used for menu panels */
-.umb-modalcolumn {
-	background: @white;
-}
-
-.umb-modalcolumn-header {
-  border-bottom: 1px solid @gray-9;
-  height: @editorHeaderHeight;
-  box-sizing: border-box;
-  padding: 0 20px;
-  display: flex;
-  align-items: center;
-  white-space: nowrap
-}
-
-.umb-modalcolumn-header h1,
-.umb-modalcolumn-header h2 {
-  margin: 0;
-  white-space: nowrap;
-  font-size: @fontSizeMedium;
-  font-weight: 400;
-}
-
-.umb-modalcolumn-body {
-	padding: 0;
-	background: @white;
-	top: @editorHeaderHeight;
-	position: absolute;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	overflow: auto;
-}
-
-.no-padding .umb-modalcolumn-body {
-	padding: 0;
-}
-
-.umb-modalcolumn .umb-modalcolumn-header .btn {
-	position: absolute;
-	top: 13px;
-	right: 15px
-}
-
-.umb-modalcolumn iframe.auto-expand, .umb-modal iframe.auto-expand {
-	border: none;
-	padding: 0;
-	margin: 0;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	position: absolute;
-}
-
-.--notInFront .umb-modalcolumn::after {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    right: 0;
-    left: 0;
-    background: rgba(0,0,0,.4);
-}
-
-/* re-align loader */
-.umb-modal .umb-loader-wrapper, .umb-modalcolumn .umb-loader-wrapper, .umb-dialog .umb-loader-wrapper{
-    position:relative;
-    margin: 20px -20px;
-}
-
-.umb-modal-left .umb-panel-header .umb-headline, .umb-modal-left .umb-panel-header h1 {
-  width: auto;
-  padding-left: 0;
-}
-
-/* umb.dialog is used for the dialogs on the conent tree*/
-.umb-dialog {
-	outline: none;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	position: absolute;
-	padding: 0;
-  	background: @white;
-}
-
-.umb-dialog .abstract{
-    margin-bottom:20px;
-}
-
-.umb-dialog .umb-btn-toolbar .umb-control-group {
-    border: none;
-    padding: none;
-}
-
-.umb-dialog-body{
-	position: absolute;
-    overflow:auto;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 49px;
-}
-.umb-dialog-body .umb-pane{margin-top: 15px;}
-
-.umb-dialog-footer{
-	position: absolute;
-	overflow:auto;
-	text-align: right;
-	height: 32px;
-	left: 0;
-	right: 0;
-	bottom: 0;
-    padding: 8px;
-    margin: 0;
-
-    .btn.umb-outline {
-        position: relative
-    }
-}
-
-/*we will always make sure to wrap iframe dialogs in proper padding*/
-.umbracoDialog{
-	width: auto !Important;
-	height: auto !Important;
-    padding: 20px;
-}
-.umbracoDialog .umb-pane{margin-left: 0; margin-right: 0; margin-top: 0;}
-.umbracoDialog .umb-dialog-body .umb-pane{margin-left: 20px; margin-right: 20px; margin-top: 20px;}
-.umbracoDialog form{height: 100%;}
-
-/*ensures dialogs doesnt have side-by-side labels*/
-.umbracoDialog .controls-row,
-.umb-modal .controls-row{margin-left: 0 !important;}
-
-/* modal and umb-modal are used for right.hand dialogs */
-.modal {
-    border-radius: 0 !important;
-
-    &.fade.in{border: none !important;}
-}
-.umb-modal.fade {
-	outline: none;
-	top: 0 !important;
-	left: -100% !important;
-	width: 0 !important;
-	transition: opacity 0.3s linear, top 0.3s ease-out;
-	height: 100% !important;
-}
-
-.umb-modal.fade.in {
-	top: 0 !important;
-	left: 100% !important;
-	margin-left: -440px;
-	width: 440px !important;
-	height: 100% !important;
-	display: block;
-}
-
-.umb-modal-left.fade {
-	top: 0 !important;
-	left: -100% !important;
-	width: 0 !important;
-	transition: opacity 0.3s linear, top 0.3s ease-out;
-	height: 100% !important;
-}
-.umb-modal-left.fade.in {
-	top: 0 !important;
-	left: 0 !important;
-	margin-left: 80px;
-	width: 440px !important;
-	height: 100% !important;
-	display: block;
-}
-
-/*Modal default panel styles*/
-.umb-modal .umb-panel-header {
-  padding: 20px;
-  background: @white;
-  border: none;
-  height: auto;
-}
-.umb-modal .umb-panel-body{
-	padding: 0 20px 0 20px;
-}
-
-.umb-modal.fade.in.wide {
-    margin-left: -640px;
-	width: 640px !important;
-}
-.umb-modal i {
-  font-size: 20px;
-}
-.umb-modal .breadcrumb {
-	background: none;
-	padding: 0
-}
-
-.umb-modal .breadcrumb input {
-	height: 12px
-}
-
-.umb-modal.ysod {
-    z-index: 10000;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/navs.less b/src/Umbraco.Web.UI.Client/src/less/navs.less
deleted file mode 100644
index b7897e90e5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/navs.less
+++ /dev/null
@@ -1,487 +0,0 @@
-//
-// Navs
-// --------------------------------------------------
-
-.list-icons li {
-    padding-left: 35px;
-    max-width: 300px;
-
-    > .umb-icon,
-    > i.icon {
-        margin-left: -25px;
-        padding-right: 7px;
-    }
-}
-
-.umb-icon.handle,
-.icon.handle {
-  color: @gray-8;
-}
-
-
-// BASE CLASS
-// ----------
-
-.nav {
-  margin-left: 0;
-  margin-bottom: @baseLineHeight;
-  list-style: none;
-}
-
-// Make links block level
-.nav > li > a {
-  display: block;
-}
-.nav > li > a:hover,
-.nav > li > a:focus {
-  text-decoration: none;
-  background-color: @gray-10;
-}
-
-// Prevent IE8 from misplacing imgs
-// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
-.nav > li > a > img {
-  max-width: none;
-}
-
-// Redeclare pull classes because of specifity
-.nav > .pull-right {
-  float: right;
-}
-
-// Nav headers (for dropdowns and lists)
-.nav-header {
-  display: block;
-  padding: 3px 15px;
-  font-size: 12px;
-  font-weight: bold;
-  line-height: @baseLineHeight;
-  color: @gray-8;
-  text-transform: uppercase;
-}
-// Space them out when they follow another list item (link)
-.nav li + .nav-header {
-  margin-top: 9px;
-}
-
-
-
-// NAV LIST
-// --------
-
-.nav-list {
-  padding-left: 15px;
-  padding-right: 15px;
-  margin-bottom: 0;
-}
-.nav-list > li > a,
-.nav-list .nav-header {
-  margin-left:  -15px;
-  margin-right: -15px;
-}
-.nav-list > li > a {
-  padding: 3px 15px;
-}
-.nav-list > .active > a,
-.nav-list > .active > a:hover,
-.nav-list > .active > a:focus {
-  color: @white;
-  background-color: @linkColor;
-}
-.nav-list [class^="icon-"],
-.nav-list [class*=" icon-"] {
-  margin-right: 2px;
-}
-// Dividers (basically an hr) within the dropdown
-.nav-list .divider {
-  .nav-divider();
-}
-
-
-
-// TABS AND PILLS
-// -------------
-
-// Common styles
-.nav-tabs,
-.nav-pills {
-  .clearfix();
-}
-.nav-tabs > li,
-.nav-pills > li {
-  float: left;
-}
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  margin-right: 15px;
-}
-
-// TABS
-// ----
-
-// Give the tabs something to sit on
-.nav-tabs {
-  // border-bottom: 1px solid @gray-9;
-}
-// Make the list-items overlay the bottom border
-.nav-tabs > li {
-  // margin-bottom: -1px;
-
-  &.dropdown {
-    margin-bottom: -3px;
-
-    >.dropdown-toggle {
-      padding-bottom: 2px;
-    }
-  }
-}
-// Actual tabs (as links)
-.nav-tabs > li > a {
-  color: @gray-3;
-  border-bottom: 2px solid transparent;
-  padding-bottom: 15px;
-
-  &:hover {
-      color: @black;
-  }
-  &:hover,
-  &:focus {
-    // border-color: transparent transparent @purple-l3;
-  }
-}
-// Active state, and it's :hover/:focus to override normal :hover/:focus
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover,
-.nav-tabs > .active > a:focus {
-  color: @black;
-  border-bottom-color: @turquoise;
-  cursor: default;
-}
-
-// PILLS
-// -----
-
-// Links rendered as pills
-.nav-pills > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  .border-radius(5px);
-}
-
-// Active state
-.nav-pills > .active > a,
-.nav-pills > .active > a:hover {
-  color: @white;
-  background-color: @linkColor;
-}
-
-
-
-// STACKED NAV
-// -----------
-
-// Stacked tabs and pills
-.nav-stacked > li {
-  float: none;
-}
-.nav-stacked > li > a {
-  position: relative;
-  margin-right: 0; // no need for the gap between nav items
-  color: @ui-action-discreet-type;
-  border-radius: 3px;
-}
-.nav-stacked > li > a:hover {
-  color: @ui-action-discreet-type-hover;
-  background-color: @ui-action-discreet-hover;
-}
-
-// Tabs
-.nav-tabs.nav-stacked {
-  border-bottom: 0;
-}
-.nav-tabs.nav-stacked > li > a {
-  border: 1px solid @gray-8;
-  .border-radius(0);
-}
-.nav-tabs.nav-stacked > li:first-child > a {
-  .border-top-radius(4px);
-}
-.nav-tabs.nav-stacked > li:last-child > a {
-  .border-bottom-radius(4px);
-}
-.nav-tabs.nav-stacked > li > a:hover,
-.nav-tabs.nav-stacked > li > a:focus {
-  border-color: @gray-8;
-  z-index: 2;
-}
-
-// Pills
-.nav-pills.nav-stacked > li > a {
-  margin-bottom: 3px;
-}
-.nav-pills.nav-stacked > li:last-child > a {
-  margin-bottom: 1px; // decrease margin to match sizing of stacked tabs
-}
-
-
-
-// DROPDOWNS
-// ---------
-.dropdown-menu {
-    display: block;
-  border-radius: @dropdownBorderRadius;
-  box-shadow: 0 5px 20px rgba(0,0,0,.3);
-  padding-top: 0;
-  padding-bottom: 0;
-}
-.dropdown-menu > li {
-    position: relative;
-}
-.dropdown-menu > li .dropdown-menu--active {
-    &::after {
-        content: "";
-        position: absolute;
-        width: 3px;
-        left:0;
-        top: 3px;
-        bottom: 3px;
-        background-color: @ui-light-active-border;
-        border-radius: 0 3px 3px 0;
-    }
-}
-
-// fix dropdown with checkbox + long text in label
-.dropdown-menu > li > .flex > label {
-    flex: 1 1 0;
-}
-
-.dropdown-menu > li > a {
-    position: relative;
-    padding: 8px 20px;
-    color: @ui-option-type;
-    text-decoration: none;
-}
-
-.dropdown-menu > li > button {
-    position: relative;
-    background: transparent;
-    border: 0;
-    padding: 8px 20px;
-    color: @ui-option-type;
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    clear: both;
-    font-weight: normal;
-    line-height: 20px;
-    white-space: nowrap;
-    cursor:pointer;
-    width: 100%;
-    text-align: left;
-}
-
-.dropdown-menu > li > a:hover, 
-.dropdown-menu > li > button:hover, 
-.dropdown-submenu:hover > a, 
-.dropdown-submenu:hover > button {
-    color: @ui-option-type-hover;
-    background: @ui-option-hover;
-}
-
-.dropdown-menu > li > button:disabled, 
-.dropdown-submenu:hover > button:disabled {
-    color: @ui-option-disabled-type;
-    background: transparent;
-}
-
-.nav-tabs .dropdown-menu {
-  .border-radius(0 0 3px 3px); // remove the top rounded corners here since there is a hard edge above the menu
-}
-.nav-pills .dropdown-menu {
-  .border-radius(6px); // make rounded corners match the pills
-}
-
-// Default dropdown links
-// -------------------------
-// Make carets use linkColor to start
-.nav .dropdown-toggle .caret {
-  border-top-color: @linkColor;
-  border-bottom-color: @linkColor;
-  margin-top: 6px;
-}
-.nav .dropdown-toggle:hover .caret,
-.nav .dropdown-toggle:focus .caret {
-  border-top-color: @linkColorHover;
-  border-bottom-color: @linkColorHover;
-}
-/* move down carets for tabs */
-.nav-tabs .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-// Active dropdown links
-// -------------------------
-.nav .active .dropdown-toggle .caret {
-  border-top-color: @white;
-  border-bottom-color: @white;
-}
-.nav-tabs .active .dropdown-toggle .caret {
-  border-top-color: @gray-3;
-  border-bottom-color: @gray-3;
-}
-
-// Active:hover/:focus dropdown links
-// -------------------------
-.nav > .dropdown.active > a:hover {
-  cursor: pointer;
-}
-
-// Open dropdowns
-// -------------------------
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > li.dropdown.open.active > a:hover {
-  /*color: @white;*/
-  background-color: @gray-8;
-  border-color: @gray-8;
-}
-.nav li.dropdown.open .caret,
-.nav li.dropdown.open.active .caret,
-.nav li.dropdown.open a:hover .caret {
-  border-top-color: @white;
-  border-bottom-color: @white;
-  .opacity(100);
-}
-
-// Dropdowns in stacked tabs
-.tabs-stacked .open > a:hover {
-  border-color: @gray-8;
-}
-
-
-
-// TABBABLE
-// --------
-
-
-// COMMON STYLES
-// -------------
-
-// Clear any floats
-.tabbable {
-  .clearfix();
-}
-.tab-content {
-  overflow: auto; // prevent content from running below tabs
-}
-
-// Remove border on bottom, left, right
-.tabs-below > .nav-tabs,
-.tabs-right > .nav-tabs,
-.tabs-left > .nav-tabs {
-  border-bottom: 0;
-}
-
-// Show/hide tabbable areas
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
-
-
-// BOTTOM
-// ------
-
-.tabs-below > .nav-tabs {
-  border-top: 1px solid @gray-8;
-}
-.tabs-below > .nav-tabs > li {
-  margin-top: -1px;
-  margin-bottom: 0;
-}
-.tabs-below > .nav-tabs > li > a {
-  .border-radius(0 0 4px 4px);
-  &:hover {
-    border-bottom-color: transparent;
-    border-top-color: @gray-8;
-  }
-}
-.tabs-below > .nav-tabs > .active > a,
-.tabs-below > .nav-tabs > .active > a:hover {
-  border-color: transparent @gray-8 @gray-8 @gray-8;
-}
-
-// LEFT & RIGHT
-// ------------
-
-// Common styles
-.tabs-left > .nav-tabs > li,
-.tabs-right > .nav-tabs > li {
-  float: none;
-}
-.tabs-left > .nav-tabs > li > a,
-.tabs-right > .nav-tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-
-// Tabs on the left
-.tabs-left > .nav-tabs {
-  float: left;
-  margin-right: 19px;
-  border-right: 1px solid @gray-8;
-}
-.tabs-left > .nav-tabs > li > a {
-  margin-right: -1px;
-  .border-radius(4px 0 0 4px);
-}
-.tabs-left > .nav-tabs > li > a:hover {
-  border-color: @gray-10 @gray-8 @gray-10 @gray-10;
-}
-.tabs-left > .nav-tabs .active > a,
-.tabs-left > .nav-tabs .active > a:hover {
-  border-color: @gray-8 transparent @gray-8 @gray-8;
-  *border-right-color: @white;
-}
-
-// Tabs on the right
-.tabs-right > .nav-tabs {
-  float: right;
-  margin-left: 19px;
-  border-left: 1px solid @gray-8;
-}
-.tabs-right > .nav-tabs > li > a {
-  margin-left: -1px;
-  .border-radius(0 4px 4px 0);
-}
-.tabs-right > .nav-tabs > li > a:hover {
-  border-color: @gray-10 @gray-10 @gray-10 @gray-8;
-}
-.tabs-right > .nav-tabs .active > a,
-.tabs-right > .nav-tabs .active > a:hover {
-  border-color: @gray-8 @gray-8 @gray-8 transparent;
-  *border-left-color: @white;
-}
-
-
-
-// DISABLED STATES
-// ---------------
-
-// Gray out text
-.nav > .disabled > a {
-  color: @gray-8;
-}
-// Nuke hover/focus effects
-.nav > .disabled > a:hover {
-  text-decoration: none;
-  background-color: transparent;
-  cursor: default;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/pages/login.less b/src/Umbraco.Web.UI.Client/src/less/pages/login.less
deleted file mode 100644
index e565e7d8ab..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/pages/login.less
+++ /dev/null
@@ -1,160 +0,0 @@
-// Login
-// -------------------------
-
-.login-overlay {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    z-index: 65537;
-    top: 0;
-    left: 0;
-    margin: 0 !important;
-    padding: 0;
-    border: none;
-    border-radius: 0;
-    overflow-y: auto;
-    background-color: @blueNight;
-}
-
-.login-overlay__background-image {
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: cover;
-    background-image: url('../img/login.svg');
-    width: 100%;
-    height: 100%;
-    position: absolute;
-}
-
-.login-overlay__logo {
-    position: absolute;
-    top: 12.5px;
-    left: 20px;
-    right: 25px;
-    min-width: 112px;    
-    height: 30px;
-    z-index: 1;
-}
-.login-overlay__logo img {
-    height: 100%;
-}
-
-.login-overlay .umb-modalcolumn {
-    background: none;
-    border: none;
-}
-
-.login-overlay .umb-login-container {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 100%;
-    height: 100%;
-    position: relative;
-    z-index: 3;
-    box-sizing: border-box;
-}
-
-@media (max-width: 565px) {
-    // making sure we don't crash into the logo
-    .login-overlay .umb-login-container {
-        padding-top: 80px;
-    }
-}
-
-.login-overlay .form {
-    background: @white;
-    padding: 30px;
-    width: 500px;
-    margin-left: 25px;
-    margin-right: 25px;
-    margin-top: auto;
-    margin-bottom: auto;
-    border-radius: @doubleBorderRadius;
-    box-shadow: 0 1px 6px 1px rgba(0, 0, 0, 0.12);
-}
-
-.login-overlay .form input[type="text"],
-.login-overlay .form input[type="password"],
-.login-overlay .form input[type="email"] {
-    height: 36px;
-    padding-left: 10px;
-    padding-right: 10px;
-}
-
-.login-overlay .form label {
-    font-weight: bold;
-}
-
-.login-overlay h1 {
-    display: block;
-    text-align: center;
-    color: @black;
-    font-size: 24px;
-    font-weight: bold;
-    margin-bottom: 20px;
-}
-
-.login-overlay .alert {
-    display: inline-block;
-    padding-right: 6px;
-    padding-left: 6px;
-    margin-top: 10px;
-    text-align: center;
-}
-
-.login-overlay .external-logins form {
-    margin-bottom: 20px;
-}
-
-.login-overlay .btn-social {
-    padding-top: 8px;
-    padding-bottom: 8px;
-    margin: 0;
-    margin-bottom: 5px;
-}
-
-.login-overlay .btn-social>:first-child {
-    line-height: 36px;
-}
-
-.login-overlay .btn-social > .umb-icon {
-    padding: 2px;
-    box-sizing: border-box;
-}
-
-.login-overlay .text-error,
-.login-overlay .text-info
-{
-    font-weight:bold;
-}
-
-.password-toggle {
-    position: relative;    
-    text-align: right;
-    user-select: none;
-    margin-left: auto;
-
-    button {
-        opacity: .5;
-        display: inline-block;
-        z-index: 1;
-        -webkit-tap-highlight-color: transparent;
-
-        .password-text {
-            background-repeat: no-repeat;
-            background-size: 18px;
-            background-position: 0 1px;
-            padding-left: 24px;
-
-            &.show {
-                background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='0 0 32 32'%3E%3Cpath fill='%23444' d='M16 6C9 6 3 10 0 16c3 6 9 10 16 10s13-4 16-10c-3-6-9-10-16-10zm8 5.3c1.8 1.2 3.4 2.8 4.6 4.7-1.2 2-2.8 3.5-4.7 4.7-3 1.5-6 2.3-8 2.3s-6-.8-8-2.3C6 19.5 4 18 3 16c1.5-2 3-3.5 5-4.7l.6-.2C8 12 8 13 8 14c0 4.5 3.5 8 8 8s8-3.5 8-8c0-1-.3-2-.6-2.6l.4.3zM16 13c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3 3 1.3 3 3z'/%3E%3C/svg%3E");
-            }
-
-            &.hide {
-                display: none;
-                background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='0 0 32 32'%3E%3Cpath fill='%23444' d='M29.6.4C29 0 28 0 27.4.4L21 6.8c-1.4-.5-3-.8-5-.8C9 6 3 10 0 16c1.3 2.6 3 4.8 5.4 6.5l-5 5c-.5.5-.5 1.5 0 2 .3.4.7.5 1 .5s1 0 1.2-.4l27-27C30 2 30 1 29.6.4zM13 10c1.3 0 2.4 1 2.8 2L12 15.8c-1-.4-2-1.5-2-2.8 0-1.7 1.3-3 3-3zm-9.6 6c1.2-2 2.8-3.5 4.7-4.7l.7-.2c-.4 1-.6 2-.6 3 0 1.8.6 3.4 1.6 4.7l-2 2c-1.6-1.2-3-2.7-4-4.4zM24 13.8c0-.8 0-1.7-.4-2.4l-10 10c.7.3 1.6.4 2.4.4 4.4 0 8-3.6 8-8z'/%3E%3Cpath fill='%23444' d='M26 9l-2.2 2.2c2 1.3 3.6 3 4.8 4.8-1.2 2-2.8 3.5-4.7 4.7-2.7 1.5-5.4 2.3-8 2.3-1.4 0-2.6 0-3.8-.4L10 25c2 .6 4 1 6 1 7 0 13-4 16-10-1.4-2.8-3.5-5.2-6-7z'/%3E%3C/svg%3E");
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/pages/nonodes.less b/src/Umbraco.Web.UI.Client/src/less/pages/nonodes.less
deleted file mode 100644
index 89fbd269c0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/pages/nonodes.less
+++ /dev/null
@@ -1,364 +0,0 @@
-@import "../fonts.less"; // Loading fonts
-@import "../variables.less"; // Loading variables
-@import "../colors.less"; // Loading colors that were in variables
-
-abbr,
-address,
-article,
-aside,
-audio,
-b,
-blockquote,
-body,
-canvas,
-caption,
-cite,
-code,
-dd,
-del,
-details,
-dfn,
-div,
-dl,
-dt,
-em,
-fieldset,
-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,
-p,
-pre,
-q,
-samp,
-section,
-small,
-span,
-strong,
-sub,
-summary,
-sup,
-table,
-tbody,
-td,
-tfoot,
-th,
-thead,
-time,
-tr,
-ul,
-var,
-video {
-    margin: 0;
-    padding: 0;
-    outline: 0;
-    border: 0;
-    background: 0 0;
-    vertical-align: baseline;
-    font-size: 100%;
-}
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-menu,
-nav,
-section {
-    display: block;
-}
-
-nav ul {
-    list-style: none;
-}
-
-blockquote,
-q {
-    quotes: none;
-}
-
-blockquote:after,
-blockquote:before,
-q:after,
-q:before {
-    content: '';
-    content: none;
-}
-
-a {
-    margin: 0;
-    padding: 0;
-    background: 0 0;
-    vertical-align: baseline;
-    font-size: 100%;
-}
-
-ins {
-    background-color: @yellow-l3;
-    color: @black;
-    text-decoration: none;
-}
-
-mark {
-    background-color: @yellow-l3;
-    color: @black;
-    font-weight: bold;
-    font-style: italic;
-}
-
-del {
-    text-decoration: line-through;
-}
-
-abbr[title],
-dfn[title] {
-    border-bottom: 1px dotted;
-    cursor: help;
-}
-
-table {
-    border-spacing: 0;
-    border-collapse: collapse;
-}
-
-hr {
-    display: block;
-    margin: 1em 0;
-    padding: 0;
-    height: 1px;
-    border: 0;
-    border-top: 1px solid @gray-8;
-}
-
-input,
-select {
-    vertical-align: middle;
-}
-
-html {
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}
-
-*,
-:after,
-:before {
-    box-sizing: border-box;
-}
-
-body,
-html {
-    height: 100%;
-    width: 100%;
-    color: @white;
-    font-family: @sansFontFamily;
-    font-weight: 400;
-    font-size: .9375em;
-    line-height: 1.5;
-}
-
-h1 {
-    font-size: 1.7em;
-    margin: 40px auto 10px;
-    font-weight: 700;
-}
-
-h2 {
-    font-size: 1.35em;
-    margin: 0 auto .4em;
-    font-weight: 700;
-}
-
-h3 {
-    font-size: 1em;
-    font-weight: 400;
-    font-style: italic;
-}
-
-p {
-    font-size: 1em;
-    line-height: 1.6;
-}
-
-p+a {
-    margin-top: 1rem;
-    display: inline-block;
-}
-
-a,
-a:active,
-a:visited {
-    text-decoration: none;
-}
-
-.cta {
-    margin: 4.5em auto 1.5em;
-    padding-bottom: 4.5em;
-}
-
-.button,
-.button:visited {
-    padding: .9375em 1.875em;
-    border-radius: .1em;
-    font-weight: 600;
-    font-size: 1.2em;
-    background: @green;
-    color: @white;
-    display: inline-block;
-    border: none;
-    transition: all 200ms ease-in-out;
-    border-radius: 3px;
-}
-
-.button:hover,
-.button:visited:hover {
-    border-bottom: none;
-    background: @green-d1;
-}
-
-section {
-    background-image: url(../img/nonodesbg.webp);
-    background-position: center center;
-    background-size: cover;
-    height: 100%;
-    width: 100%;
-    display: table;
-    padding: 3em 1.75em
-}
-
-section a,
-section a:focus,
-section a:visited {
-    color: @white;
-    font-size: 1.1625em;
-    border-bottom: 1px solid @white;
-    transition: border-bottom 100ms ease-in-out;
-}
-
-section a:focus:hover,
-section a:hover,
-section a:visited:hover {
-    border-bottom: 1px solid;
-}
-
-section:after {
-    content: "";
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    background: rgba(0, 0, 0, .17);
-    background: linear-gradient(45deg, rgba(85, 98, 112, .1) 10%, rgba(255, 107, 107, .1) 95%);
-    z-index: 0
-}
-
-section article {
-    display: table-cell;
-    vertical-align: middle;
-    margin: 0 auto;
-    text-align: center;
-    position: relative;
-    z-index: 100;
-}
-
-section article>div {
-    max-width: 60em;
-    margin: 0 auto;
-    padding-top: 50px;
-    padding-bottom: 70px;
-}
-
-section .logo {
-    margin: 0 auto;
-}
-
-section .row {
-    overflow: hidden;
-}
-
-section .row .col {
-    text-align: left;
-    width: 100%;
-}
-
-section .row .col:nth-child(2) {
-    margin-top: 3em;
-}
-
-@media screen and (min-width:48em) {
-    body,
-    html {
-        font-size: 1em;
-    }
-    h1 {
-        font-size: 2.5em;
-        margin: 70px auto 0;
-        letter-spacing: .5px;
-    }
-    h2 {
-        font-size: 1.4375em;
-        margin: 0 auto 1em;
-    }
-    h3 {
-        font-size: 1.2em;
-    }
-    a {
-        font-size: 1.1rem;
-        font-weight: 600;
-    }
-    p+a {
-        margin-top: 3rem;
-    }
-    .cta {
-        margin: 7.5em auto 2.5em;
-        border-bottom: 1px solid @gray-5;
-        padding-bottom: 7.5em;
-    }
-    section {
-        padding: 0 15px;
-    }
-    section .row .col {
-        float: left;
-        width: 50%;
-        padding-right: 5%;
-        display: inline-block;
-    }
-    section .row .col:nth-child(2) {
-        padding-right: 0;
-        padding-left: 5%;
-        margin-top: 0;
-    }
-    .button {
-        font-size: 1.1625em;
-    }
-}
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/less/pages/welcome-dashboard.less b/src/Umbraco.Web.UI.Client/src/less/pages/welcome-dashboard.less
deleted file mode 100644
index 426ffcb5e2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/pages/welcome-dashboard.less
+++ /dev/null
@@ -1,117 +0,0 @@
-// Title
-.welcome-dashboard__intro {
-    margin-top: 20px;
-    margin-bottom: 30px;
-}
-
-.welcome-dashboard__title {
-    font-size: 30px;
-    color: @gray-2;
-    line-height: 1.3em;
-    text-align: center;
-    max-width: 750px;
-    margin-left: auto;
-    margin-right: auto;
-    margin-bottom: 15px;
-    font-weight: bold;
-}
-
-.welcome-dashboard__intro-text {
-    font-size: 18px;
-    text-align: center;
-    max-width: 750px;
-    margin-left: auto;
-    margin-right: auto;
-    line-height: 1.6em;
-}
-
-// Info box
-.welcome-dashboard__info-box-boxes {
-    display: flex;
-    margin-bottom: 30px;
-}
-
-.welcome-dashboard__info-box {
-    background-color: @turquoise-washed;
-    border-radius: 3px;
-    border: 2px solid transparent;
-    padding: 25px;
-    text-decoration: none;
-    display: block;
-    margin: 10px;
-
-    &:hover {
-        border: 2px solid @turquoise;
-        cursor: pointer;
-        transition: border-color 150ms ease-in-out;
-        text-decoration: none;
-    }
-
-    &:active,
-    &:focus {
-        text-decoration: none;
-    }
-}
-
-.welcome-dashboard__info-box-title {
-    color: @turquoise-d1;
-    font-size: 16px;
-    text-align: center;
-    margin-bottom: 5px;
-    font-weight: bold;
-}
-
-.welcome-dashboard__info-box-description {
-    text-align: center;
-    line-height: 1.4em;
-}
-
-// Articles
-.welcome-dashboard__cards {
-    display: flex;
-    margin-bottom: 30px;
-}
-
-.welcome-dashboard__card {
-    background-color: @grayLighter;
-    border-radius: 3px;
-    margin: 10px;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-}
-
-.welcome-dashboard__card-image-wrapper {
-    flex: 0 0 auto;
-    width: 100%;
-    margin-bottom: 30px;
-    max-height: 225px;
-    overflow: hidden;
-}
-
-.welcome-dashboard__card-image {
-    cursor: pointer;
-    border-radius: 3px 3px 0 0;
-    width: 100%;
-}
-
-.welcome-dashboard__card-image-wrapper + .welcome-dashboard__card-content {
-    padding-top: 0px;
-}
-
-.welcome-dashboard__card-content {
-    padding: 30px;
-}
-
-.welcome-dashboard__card-title {
-    color: @gray-2;
-    font-size: 18px;
-    font-weight: bold;
-    margin-bottom: 10px;
-    line-height: 1.6em;
-}
-
-.welcome-dashboard__card-teaser {
-    font-size: 13px;
-    margin-bottom: 15px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
deleted file mode 100644
index 8b1060a7e8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/panel.less
+++ /dev/null
@@ -1,447 +0,0 @@
-// Panel
-// -------------------------
-.umb-panel {
-    background: @white;
-    position: absolute;
-    top: 0px;
-    bottom: 0px;
-    left: 0px;
-    right: 0px;
-}
-
-.umb-panel-nobody {
-    padding-top: 100px;
-    overflow: auto;
-}
-
-.umb-panel-header {
-    background: @gray-10;
-    border-bottom: 1px solid @purple-l3;
-    position: absolute;
-    height: 99px;
-    top: 0px;
-    right: 0px;
-    left: 0px;
-}
-
-.umb-panel-body {
-    top: 101px;
-    left: 0px;
-    right: 0px;
-    bottom: 0px;
-    position: absolute;
-    clear: both;
-    overflow: auto;
-}
-
-.umb-panel-body.no-header {
-    top: 20px;
-}
-
-.umb-panel-body.with-footer {
-    bottom: 90px;
-}
-
-.umb-mediapicker-upload {
-    display: flex;
-
-    .form-search {
-        flex: 1;
-
-        i.icon-search {
-            top: 16px;
-        }
-
-        &__toggle {
-            margin: 10px 0;
-            display: flex;
-            align-items: center;
-
-            label {
-                display: flex;
-                align-items: center;
-                margin-left: 5px;
-                margin-bottom: 0;
-
-                input[type="checkbox"] {
-                    margin: 0 5px 0 0;
-                }
-            }
-        }
-    }
-
-    .upload-button {
-        margin-left: 16px;
-    }
-}
-
-.umb-panel.editor-breadcrumb .umb-panel-body, .umb-panel.editor-breadcrumb .umb-bottom-bar {
-    bottom: 31px !important;
-}
-
-.umb-panel-header .umb-headline, .umb-panel-header h1 {
-    font-size: 16px;
-    border: none;
-    background: none;
-    margin: 15px 0 0 20px;
-    padding: 3px 5px;
-    line-height: 1.4;
-    height: auto;
-    width: 100%;
-    border: 1px solid @gray-10;
-}
-
-.umb-panel-header .umb-headline:focus, .umb-panel-header .umb-headline:active {
-    border: 1px solid @gray-8;
-    background-color: @white;
-}
-
-.umb-panel-header p {
-    margin: 0px 20px;
-}
-
-.umb-btn-toolbar .dimmed, .umb-dimmed {
-    opacity: 0.6;
-}
-
-.umb-panel-header-meta {
-    height: 50px;
-}
-
-.umb-panel-header .umb-btn-toolbar {
-    float: right;
-    padding: 5px 20px 0 0;
-}
-
-.umb-panel-footer {
-    margin: 0;
-    padding: 20px;
-    z-index: 999;
-    position: absolute;
-    bottom: 0px;
-    left: 0px;
-    right: 0px;
-}
-
-
-/* Publish */
-.umb-btn-toolbar .dropdown-menu {
-    right: 0;
-    left: auto;
-    border-radius: @tabsBorderRadius;
-    box-shadow: none;
-    padding: 0;
-    z-index: 6020;
-}
-
-.umb-btn-toolbar .dropdown-menu small {
-    background: @turquoise-l3;
-    display: block;
-    padding: 10px 20px;
-}
-
-.umb-btn-toolbar .dropdown-menu .btn  {
-    margin: 20px 29px;
-    width: 80px;
-}
-
-/* tab buttons */
-.umb-bottom-bar {
-    background: @white;
-    box-shadow: 0 -18px 20px rgba(255, 255, 255, 1);
-    border-top: 1px solid @gray-10;
-    padding: 10px 0 10px 0;
-    position: fixed;
-    bottom: 0;
-    left: 100px;
-    right: 40px;
-    z-index: 6010;
-
-    @media (min-width: 1101px) {
-        left: 460px;
-    }
-
-    @media (max-width: 767px) {
-        left: 80px;
-    }
-
-    @media (max-width: 500px) {
-        left: 60px;
-    }
-}
-
-.umb-tab-buttons {
-    padding-left: 0;
-
-    > .btn-group:not([style*="display:none"]):not([style*="display: none"]) {
-        margin-left: 0;
-    }
-
-    @media (min-width: 768px) {
-        padding-left: 180px;
-    }
-}
-
-.umb-tab-pane {
-    padding-bottom: 90px;
-}
-
-.tab-content {
-    overflow: visible;
-}
-
-.umb-panel-footer-nav {
-    position: absolute;
-    bottom: 0px;
-    height: 30px;
-    left: 0px;
-    right: 0px;
-    background: @gray-10;
-    border-top: @gray-8 1px solid;
-    display: block;
-    margin: 0;
-    overflow: hidden;
-}
-
-.umb-panel-footer-nav li a {
-    border-radius: 0;
-    display: block;
-    float: left;
-    height: 30px;
-    background: @gray-10;
-    text-align: center;
-    padding: 8px 0px 8px 30px;
-    position: relative;
-    margin: 0 1px 0 0;
-    text-decoration: none;
-    color: @gray-3;
-    font-size: 12px;
-}
-
-.umb-panel-footer-nav li a:after {
-    content: "";
-    border-top: 16px solid transparent;
-    border-bottom: 16px solid transparent;
-    border-left: 16px solid @gray-10;
-    position: absolute;
-    right: -16px;
-    top: 0;
-    z-index: 1;
-}
-
-.umb-panel-footer-nav li a:before {
-    content: "";
-    border-top: 16px solid transparent;
-    border-bottom: 16px solid transparent;
-    border-left: 16px solid @gray-8;
-    position: absolute;
-    left: 0;
-    top: 0;
-}
-
-.umb-panel-footer-nav li:first-child a {
-    padding-left: 20px;
-}
-
-.umb-panel-footer-nav li:first-child a:before {
-    display: none;
-}
-
-.umb-panel-footer-nav li:last-child a:after {
-    display: none;
-}
-
-// Utility classes
-
-//SD: Had to add these because if we want to use the bootstrap text colors
-// in a panel/editor they'll all show up as white on white - so we need to use the
-// form styles
-.umb-dialog .muted,
-.umb-panel .muted {
-    color: @gray-5;
-}
-
-.umb-dialog a.muted:hover,
-.umb-dialog a.muted:focus,
-.umb-dialog button.muted:hover,
-.umb-dialog button.muted:focus,
-.umb-panel a.muted:hover,
-.umb-panel a.muted:focus,
-.umb-panel button.muted:hover,
-.umb-panel button.muted:focus {
-    color: darken(@gray-5, 10%);
-    text-decoration: underline;
-}
-
-.umb-dialog .text-warning,
-.umb-panel .text-warning {
-    color: @formWarningText;
-}
-
-.umb-dialog a.text-warning:hover,
-.umb-dialog a.text-warning:focus,
-.umb-panel a.text-warning:hover,
-.umb-panel a.text-warning:focus {
-    color: darken(@formWarningText, 10%);
-}
-
-.umb-dialog .text-error,
-.umb-panel .text-error {
-    color: @formErrorText;
-}
-
-.umb-dialog a.text-error:hover,
-.umb-dialog a.text-error:focus,
-.umb-panel a.text-error:hover,
-.umb-panel a.text-error:focus {
-    color: darken(@formErrorText, 10%);
-}
-
-.umb-dialog .text-info,
-.umb-panel .text-info {
-    color: @formInfoText;
-}
-
-.umb-dialog a.text-info:hover,
-.umb-dialog a.text-info:focus,
-.umb-panel a.text-info:hover,
-.umb-panel a.text-info:focus {
-    color: darken(@formInfoText, 10%);
-}
-
-.umb-dialog .text-success,
-.umb-panel .text-success {
-    color: @formSuccessText;
-}
-
-.umb-dialog a.text-success:hover,
-.umb-dialog a.text-success:focus,
-.umb-panel a.text-success:hover,
-.umb-panel a.text-success:focus {
-    color: darken(@formSuccessText, 10%);
-}
-
-.external-logins form {
-    margin:0;
-}
-.external-logins button {
-    margin:5px;
-}
-
-/* --------- UMB PANEL HEADER ---------- */
-
-.umb-panel-header-content-wrapper {
-  display: flex;
-  flex-direction: column;
-}
-
-.umb-panel-header-content {
-  display: flex;
-  align-items: center;
-  flex: 1;
-}
-
-.umb-panel-header-left-side {
-   display: flex;
-   flex: 1;
-   flex-direction: row;
-}
-
-.umb-panel-header-icon {
-  cursor: pointer;
-  font-size: 2rem;
-  margin-right: 5px;
-  margin-top: -6px;
-  height: 50px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: @white;
-  border: 1px solid @ui-action-discreet-border;
-  animation: fadeIn 0.5s;
-  border-radius: 3px;
-  width: 50px;
-  &:hover {
-      .icon {
-          opacity: 0.8;
-      }
-      border-color: @ui-action-discreet-border-hover;
-  }
-}
-
-.umb-panel-header-title-wrapper {
-   position: relative;
-   width: 80%;
-}
-
-.umb-panel-header-alias {
-  position: absolute;
-  top: 5px;
-  right: 10px;
-}
-
-.umb-panel-header-alias .umb-locked-field {
-   display: flex;
-   align-items: center;
-}
-
-.umb-panel-header-alias .umb-locked-field,
-.umb-panel-header-alias .umb-locked-field .umb-locked-field__wrapper {
-   margin-bottom: 0;
-}
-
-.umb-panel-header-alias .umb-locked-field:after {
-   display: none;
-}
-
-.umb-panel-header-icon.-placeholder {
-  border: 1px dashed @gray-8;
-}
-
-.umb-panel-header-icon .icon {
-    font-size: 30px;
-    color: @gray-7;
-    transition: opacity 120ms;
-    line-height: 1;
-}
-
-.umb-panel-header-icon-text {
-  color: @green;
-  font-weight: bold;
-  font-size: 10px;
-}
-
-input.umb-panel-header-name-input.name-is-empty {
-  border: 1px dashed @gray-8;
-  background: @white;
-}
-
-.umb-panel-header-name {
-   font-size: 16px;
-   font-weight: bold;
-   margin: 0;
-   line-height: 1.2;
-}
-
-
-input.umb-panel-header-description {
-  background: transparent;
-  border-color: transparent;
-  margin-bottom: 0;
-  font-size: 13px;
-  box-sizing: border-box;
-  height: 22px;
-  line-height: 22px;
-  width: 100%;
-  &:hover {
-    background: @white;
-    border-color: @gray-8;
-  }
-}
-
-.umb-panel-header-locked-description {
-    font-size: 12px;
-    margin: 2px 0 0 0;
-    height: 22px;
-    line-height: 22px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/properties.less b/src/Umbraco.Web.UI.Client/src/less/properties.less
deleted file mode 100644
index 101faab724..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/properties.less
+++ /dev/null
@@ -1,157 +0,0 @@
-//----- SCHEDULED PUBLISH ------
-
-.date-wrapper {
-    display: flex;
-    flex-direction: row;
-    border-top: 1px solid @gray-10;
-    border-bottom: 1px solid @gray-10;
-}
-
-.date-wrapper__date {
-    padding: 10px;
-    flex: 1 1 50%;
-}
-
-.date-wrapper__date:last-of-type {
-    border-left: 1px solid @gray-10;
-}
-
-.date-wrapper__date .flatpickr-input > a,
-.date-wrapper__date .flatpickr-input > button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-weight: 700;
-    padding: 4px 15px;
-    box-sizing: border-box;
-    min-width: 200px;
-    color: @ui-action-discreet-type;
-    border: 1px dashed @ui-action-discreet-border;
-    border-radius: 3px;
-
-    &:hover, &:focus {
-        text-decoration: none;
-        color: @ui-action-discreet-type-hover;
-        border-color: @ui-action-discreet-border-hover;
-
-        localize {
-            text-decoration: none;
-        }
-    }
-}
-
-//----- VARIANTS SCHEDULED PUBLISH ------
-
-.date-wrapper-mini {
-    display: flex;
-    flex-direction: row;
-}
-
-.date-wrapper-mini--checkbox {
-    margin: 0 0 0 28px;
-}
-
-.date-wrapper-mini__date {
-    display: flex;
-    flex-direction: column;
-    margin-left: 5px;
-    margin-top: 5px;
-    margin-bottom: 10px;
-    flex: 1 1 50%;
-    
-    &:first-of-type {
-        margin-left: 0;
-    }
-    .flatpickr-input > button:first-of-type {
-        border-top-right-radius: 0;
-        border-bottom-right-radius: 0;
-    }
-}
-
-.date-wrapper-mini__date .flatpickr-input > a,
-.date-wrapper-mini__date .flatpickr-input > button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-weight: 700;
-    padding: 1px 15px;
-    box-sizing: border-box;
-    min-width: 180px;
-    
-    color: @ui-action-discreet-type;
-    border: 1px dashed @ui-action-discreet-border;
-    border-radius: 3px;
-    
-    &:hover, &:focus {
-        text-decoration: none;
-        color: @ui-action-discreet-type-hover;
-        border-color: @ui-action-discreet-border-hover;
-        
-        localize {
-            text-decoration: none;
-        }
-    }
-}
-
-//------------------- HISTORY ------------------
-
-.history {
-    position: relative;
-}
-
-.history-line {
-    width: 2px;
-    top: 10px;
-    bottom: 10px;
-    margin: 0 0 0 14px;
-    background-color: @gray-8;
-    position: absolute;
-}
-
-.history-item {
-    display: flex;
-    align-items: center;
-    margin-bottom: 24px;
-    position: relative;
-}
-
-.history-item__avatar {
-    margin-right: 7px;
-}
-
-.history-item__date {
-    font-size: 12px;
-    margin-top: -4px;
-    display: block;
-    color: @gray-5;
-}
-
-.history-item__break {
-    display: flex;
-    align-items: center;
-    min-width: 230px;
-    font-size: 14px;
-}
-
-.history-item__badge {
-    margin-right: 10px;
-}
-.history-item__description {
-    color: @gray-5;
-}
-
-/*  RESPONSIVE  */
-@media (min-width: 1101px) and (max-width: 1365px), (max-width: 979px) {
-    
-    .history-item {
-        display: block;
-    }
-
-    .history-item__break {
-        padding: 7px 0;
-    }
-
-    .history-line {
-        display: none;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
deleted file mode 100644
index f24365a806..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ /dev/null
@@ -1,1009 +0,0 @@
-//
-// Container styles
-// --------------------------------------------------
-.umb-property-editor {
-  width: 100%;
-
-  &--limit-width {
-      .umb-property-editor--limit-width();
-  }
-}
-
-.umb-property-editor-tiny {
-    width: 60px;
-
-	&.umb-editor-push {
-		width:30%;
-		min-width:0;
-	}
-}
-
-.umb-property-editor-small {
-  width: 90px;
-}
-
-.umb-modal .umb-property-editor {
-  width: 95%;
-}
-
-.umb-dialog .umb-property-editor {
-  width: 95%;
-}
-.umb-dialog .umb-control-group .help-block {
-  width: 95%;
-}
-
-.umb-codeeditor{
-  width: 99%;
-}
-
-// displays property inline with preceeding
-.umb-property {
-	&--pull {
-		float:left;
-		width:60%;
-	}
-
-	&--push {
-		float:right;
-		width:35%;
-	}
-
-	&--pull, &--push {
-		.umb-editor {
-			min-width:0;
-			width:100%;
-		}
-	}
-}
-
-.umb-property .alert {
-	border-radius: 3px;
-}
-
-
-
-//
-// Content picker
-// --------------------------------------------------
-.umb-contentpicker {
-    .umb-property-editor--limit-width();
-}
-
-.umb-contentpicker li a:hover .hover-hide, .umb-contentpicker li a .hover-show{
-  display: none;
-}
-.umb-contentpicker li a:hover .hover-show{display: inline-block;}
-
-.umb-contentpicker-popover .search-holder {
-  padding: 10px;
-}
-
-.umb-contentpicker__min-max-help {
-    font-size: 13px;
-    margin-top: 5px;
-    color: @gray-4;
-}
-
-.show-validation .umb-contentpicker__min-max-help {
-    display: none;
-}
-
-.umb-contentpicker small {
-
-  &:not(:last-child) {
-    padding-right: 3px;
-    border-right: 1px solid @gray-5;
-  }
-
-  a {
-    color: @gray-3;
-  }
-}
-
-
-
-//
-// Color picker
-// --------------------------------------------------
-
-/* pre-value editor */
-.umb-prevalues-multivalues.umb-colors {
-    max-width: 600px;
-    width: 100%;
-    min-width: 66.6%;
-
-    @media (min-width: 1101px) and (max-width: 1300px), (max-width: 930px) {
-        max-width: none;
-    }
-
-    .umb-overlay__form & {
-        width: 100%;
-    }
-}
-
-.control-group.color-picker-preval {
-    .thumbnail {
-        width: 34px;
-        height: 34px;
-        min-width: auto;
-        border: none;
-        cursor: move;
-        border-radius: 3px;
-        margin-top: auto;
-        margin-bottom: auto;
-        flex: 0 0 auto;
-    }
-
-    .handle {
-        float: left;
-        display: inline-flex;
-        margin: 5px 3px 5px 0;
-    }
-
-    div.color-picker-prediv {
-        display: inline-flex;
-        align-items: center;
-        max-width: 100%;
-        flex: 1;
-
-        pre {
-            display: inline-flex;
-            font-family: @monoFontFamily;
-            margin-left: 15px;
-            margin-right: 15px;
-            white-space: nowrap;
-            overflow: hidden;
-            margin-bottom: 0;
-            vertical-align: middle;
-            padding: 6px 10px;
-            background: @gray-11;
-            flex: 0 0 auto;
-        }
-
-        span {
-            margin-left: 5px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-    }
-
-    input[type="text"] {
-        display: flex;
-        flex: 1 1 100px;
-        margin-top: 1px;
-        margin-right: 15px;
-        min-width: auto;
-        width: auto;
-    }
-
-    label {
-        border: 1px solid @white;
-        padding: 6px 10px;
-        font-family: @monoFontFamily;
-        border: 1px solid @gray-8;
-        background: @gray-11;
-        margin: 0 15px 0 3px;
-        border-radius: 3px;
-    }
-}
-
-//
-// Image Cropper
-// --------------------------------------------------
-
-.umb-prevalues-multivalues.umb-cropsizes{
-
-    max-width: 500px;
-    width: 100%;
-    min-width: 66.6%;
-
-    @media (min-width: 1101px) and (max-width: 1300px), (max-width: 930px) {
-        max-width: none;
-    }
-
-    .umb-overlay__form & {
-        width: 100%;
-    }
-}
-
-.umb-cropsizes {
-
-    &__add {
-        display: inline-flex;
-        align-items: center;
-    }
-
-    &__controls {
-        margin: 24px 0 0;
-        display: flex;
-    }
-
-    &__input {
-        width: 100%;
-        &-wrap{
-            flex: 1 1 auto;
-            margin-right: 10px;
-            &--narrow {
-                flex: 0 1 100px;
-            }
-        }
-   }
-}
-
-
-//
-// Media picker
-// --------------------------------------------------
-
-.umb-mediapicker > div {
-    border: 1px solid @inputBorder;
-}
-.umb-mediapicker-single > div {
-    width:144px;
-}
-.umb-mediapicker-multi > div {
-    width:100%;
-    .umb-property-editor--limit-width();
-}
-
-
-.umb-mediapicker .add-link {
-    position: relative;
-    display: flex;
-    justify-content:center;
-    align-items:center;
-    //width: 120px;
-    text-align: center;
-    color: @gray-9;
-    border: 2px @gray-9 dashed;
-    text-decoration: none;
-
-    transition: all 150ms ease-in-out;
-
-    &:active,
-    &:hover {
-        color: @ui-action-discreet-type-hover;
-        border-color: @ui-action-discreet-type-hover;
-    }
-}
-
-.umb-mediapicker .label {
-    &__trashed {
-        background-color: @red;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        z-index: 1;
-        transform: translate3d(-50%,-50%,0);
-        margin: 0;
-        pointer-events: none;
-    }
-}
-
-.umb-mediapicker .picked-image {
-  position: absolute;
-  bottom: 10px;
-  right: 10px;
-  opacity: 0.5;
-
-  font-size: 24px;
-  color: @red;
-  background: @white;
-
-  line-height: 36px;
-  text-align: center;
-  border-radius: 15px;
-
-  height: 32px;
-  width: 32px;
-  overflow: hidden;
-  display: none;
-  text-decoration: none;
-}
-
-.umb-mediapicker .add-link-square {
-  height: 100px;
-  width: 100px;
-  margin: 10px;
-}
-
-
-
-.umb-thumbnails {
-    position: relative;
-    display: flex;
-    -ms-flex-direction: row;
-    flex-direction: row;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-    justify-content: flex-start;
-}
-
-.umb-thumbnails > li.icon {
-    width: 14%;
-    text-align: center;
-}
-
-.umb-thumbnails i{margin: auto;}
-.umb-thumbnails a{
-  outline: none;
-  border:none !important;
-  box-shadow:none !important;
-}
-
-.umb-sortable-thumbnails-container {
-    display: flex;
-    flex-wrap: wrap;
-    background-color: @white;
-}
-
-.umb-sortable-thumbnails {
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-}
-
-
-.umb-sortable-thumbnails li {
-    position: relative;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    flex-wrap: wrap;
-    padding: 5px;
-    margin: 5px;
-    background: @white;
-    max-width: 100%;
-}
-.umb-mediapicker {
-
-    .umb-sortable-thumbnails li {
-        border:none;
-    }
-
-}
-
-.umb-mediapicker .umb-sortable-thumbnails li {
-    flex-direction: column;
-}
-
-.umb-sortable-thumbnails li:hover a {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-.umb-sortable-thumbnails li img {
-    max-width: 100%;
-    max-height: 100%;
-    margin: auto;
-    display: block;
-    .checkeredBackground();
-}
-
-.umb-sortable-thumbnails li .trashed {
-    opacity:0.3;
-}
-
-.umb-sortable-thumbnails li img.noScale {
-    max-width: none !important;
-    max-height: none !important;
-}
-
-.umb-sortable-thumbnails .umb-sortable-thumbnails__wrapper {
-    width: 124px;
-    height: 124px;
-    overflow: hidden;
-    position: relative;
-}
-
-.umb-sortable-thumbnails .umb-sortable-thumbnails__loading {
-    position: absolute;
-    background-color: rgba(255,255,255,0.8);
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-}
-
-.umb-sortable-thumbnails .umb-sortable-thumbnails__actions {
-    position: absolute;
-    bottom: 10px;
-    right: 10px;
-    text-decoration: none;
-    display: flex;
-    flex-direction: row;
-}
-
-.umb-sortable-thumbnails.ui-sortable:not(.ui-sortable-disabled) {
-    > li:not(.unsortable) {
-        cursor: move;
-    }
-}
-
-.umb-sortable-thumbnails li:hover .umb-sortable-thumbnails__action  {
-    opacity: 1;
-}
-
-.umb-sortable-thumbnails .umb-sortable-thumbnails__action {
-    font-size: 16px;
-    background: @white;
-    height: 25px;
-    width: 25px;
-    border-radius: 15px;
-    color: @gray-1;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-left: 5px;
-    text-decoration: none;
-    .box-shadow(0 1px 2px rgba(0,0,0,0.25));
-    opacity: 0;
-    transition: opacity .1s ease-in-out;
-
-    .tabbing-active &:focus {
-        opacity: 1;
-    }
-}
-
-.umb-sortable-thumbnails .umb-sortable-thumbnails__action.-red {
-    color: @red;
-}
-
-.umb-sortable-thumbnails .umb-sortable-thumbnails__action:hover {
-    text-decoration: none;
-}
-
-
-//
-// Cropper
-// -------------------------------------------------
-
-.umb-cropper{
-    position: relative;
-    width: 100%;
-}
-
-.umb-cropper .crop-container {
-    position: relative;
-    width: 100%;
-    padding-bottom: (9 / 16 * 100%);
-}
-
-.umb-cropper img {
-    position: relative;
-    max-width: 100%;
-    height: auto;
-    top: 0;
-    left: 0;
- }
-
- .umb-cropper img {
-    max-width: none;
- }
-
- .umb-cropper .overlay {
-    position: absolute;
-    top: 0 !important;
-    bottom: 0;
-    left: 0 !important;
-    right: 0;
-    cursor: move;
-    z-index: @zindexCropperOverlay;
-    border: 1px solid @inputBorder;
-    outline: none;
-
-    &:focus {
-        border-color: @inputBorderFocus;
-    }
-}
-
-.umb-cropper .viewport {
-    position: absolute;
-    overflow: hidden;
-    width: 100%;
-    height: 100%;
-    .checkeredBackground();
-    contain: strict;
-
-    > img {
-        position: absolute;
-    }
- }
-
-.umb-cropper .viewport .__mask {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: (@zindexCropperOverlay - 1);
-    box-shadow: 0 0 0 2000px rgba(255, 255, 255, .8);
-}
-.umb-cropper .viewport .__mask-info {
-    position: absolute;
-    bottom: -20px;
-    height: 20px;
-    min-width: 100px;
-    right: 0;
-    text-align: right;
-    z-index: (@zindexCropperOverlay - 1);
-    font-size: 12px;
-    opacity: 0.7;
-    padding: 0px 6px;
-}
-
-.umb-cropper .crop-controls-wrapper {
-    display: flex;
-    height: 50px;
-    align-items: center;
-    background-color: #fff;
-    .btn:last-of-type {
-        margin-right: 10px;
-    }
-}
-
-.umb-cropper .crop-slider-wrapper {
-    flex: auto;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-wrap: wrap;
-
-    i {
-        color: @gray-3;
-        flex: 0 0 25px;
-        padding: 0 5px;
-        box-sizing: border-box;
-
-        &:first-of-type {
-            text-align: right;
-        }
-    }
-
-    .crop-slider {
-        width: calc(100% - 100px);
-    }
-}
-
-.umb-cropper .crop-controls-wrapper__icon-left,
-.umb-cropper .crop-controls-wrapper__icon-right {
-    color: @gray-3;
-}
-
-.umb-cropper .crop-controls-wrapper__icon-left {
-    margin-right: 15px;
-}
-
-.umb-cropper .crop-controls-wrapper__icon-right {
-    margin-left: 15px;
-    font-size: 22px;
-}
-
-.umb-crop-thumbnail-container {
-    img {
-        max-width: unset;
-    }
-}
-
-.cropList {
-    display: inline-block;
-    position: relative;
-    vertical-align: top;
-}
-
-.umb-cropper-imageholder-buttons {
-    display: flex;
-    justify-content: space-between;
-}
-
-.media-crop-details-buttons {
-    text-align: right;
-}
-
-.umb-fileupload,
-.umb-cropper-gravity {
-
-    .gravity-container {
-        border: 1px solid @inputBorder;
-        width: 100%;
-        height: 100%;
-        overflow: hidden;
-        box-sizing: border-box;
-        line-height: 0;
-        contain: content;
-        position: relative;
-        .checkeredBackground();
-
-        &:focus, &:focus-within {
-            border-color: @inputBorderFocus;
-        }
-
-        .viewport {
-            position: relative;
-            width: 100%;
-            height: 100%;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-
-            > a {
-                display: block;
-                width: 100%;
-                height: 100%;
-            }
-
-            img {
-                display: block;
-                max-width: 100%;
-                max-height: 100%;
-            }
-
-            &:hover {
-                cursor: pointer;
-            }
-        }
-    }
-}
-    
-.umb-cropper-gravity img {
-    position: relative;
-    max-width: 100%;
-    height: auto;
-    top: 0;
-    left: 0;
-}
-    
-.umb-cropper-gravity .overlayViewport {
-    position: absolute;
-    top:0;
-    bottom:0;
-    left:0;
-    right:0;
-    contain: strict;
-
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-.umb-cropper-gravity .overlay {
-    position: relative;
-    display: block;
-    max-width: 100%;
-    max-height: 100%;
-    cursor: crosshair;
-}
-.umb-cropper-gravity .overlay .focalPoint {
-    position: absolute;
-    top: 0;
-    left: 0;
-    cursor: move;
-    z-index: @zindexCropperOverlay;
-
-    width: 14px;
-    height: 14px;
-    // this element should have no width or height as its preventing the jQuery draggable-plugin to go all the way to the sides:
-    margin-left: -10px;
-    margin-top: -10px;
-    margin-right: -10px;
-    margin-bottom: -10px;
-        
-    text-align: center;
-    border-radius: 20px;
-    background: @pinkLight;
-    border: 3px solid @white;
-    opacity: 0.8;
-}
-
-.umb-cropper-gravity .overlay .focalPoint i {
-    font-size: 26px;
-    line-height: 26px;
-    opacity: 0.8 !important;
-}
-
-.imagecropper {
-    display: flex;
-    align-items: flex-start;
-    flex-direction: row;
-
-    @media (max-width: 768px) {
-        flex-direction: column;
-    }
-        
-}
-
-.imagecropper .umb-cropper__container {
-    position: relative;
-    width: 100%;
-}
-
-.imagecropper .umb-cropper__container .button-drawer {
-    display: flex;
-    justify-content: flex-end;
-    padding: 10px;
-    position: relative;
-
-    button {
-        margin-left: 4px;
-    }
-}
-
-.umb-close-cropper {
-    position: absolute;
-    top: 3px;
-    right: 3px;
-    cursor: pointer;
-    z-index: (@zindexCropperOverlay + 1);
-}
-
-.umb-close-cropper:hover {
-    opacity: .9;
-    background: @gray-10;
-}
-
-.imagecropper .umb-sortable-thumbnails {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-}
-
-.imagecropper .umb-sortable-thumbnails li {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    padding: 8px;
-    margin-top: 0;
-}
-
-.imagecropper .umb-sortable-thumbnails li.current {
-    border-color: @gray-8;
-    background: @gray-10;
-    color: @black;
-    cursor: pointer;
-}
-
-.imagecropper .umb-sortable-thumbnails li:hover,
-.imagecropper .umb-sortable-thumbnails li.current:hover {
-    border-color: @gray-8;
-    background: @gray-10;
-    color: @black;
-    cursor: pointer;
-    opacity: .95;
-}
-
-.imagecropper .umb-sortable-thumbnails li[disabled],
-.imagecropper .umb-sortable-thumbnails li[disabled]:hover {
-    cursor: not-allowed;
-}
-
-.imagecropper .umb-sortable-thumbnails li .crop-name,
-.imagecropper .umb-sortable-thumbnails li .crop-size,
-.imagecropper .umb-sortable-thumbnails li .crop-annotation {
-    display: block;
-    text-align: left;
-    font-size: 13px;
-    line-height: 1;
-}
-
-.imagecropper .umb-sortable-thumbnails li .crop-name {
-    font-weight: bold;
-    margin: 10px 0 5px;
-}
-
-.imagecropper .umb-sortable-thumbnails li .crop-size,
-.imagecropper .umb-sortable-thumbnails li .crop-annotation {
-    font-size: 10px;
-    font-style: italic;
-    margin: 0 0 5px;
-}
-
-.imagecropper .umb-sortable-thumbnails li .crop-annotation {
-    color: @gray-6;
-}
-
-.btn-crop-delete {
-    display: block;
-    text-align: left;
-}
-
-.imagecropper .cropList-container {
-    h5 {
-        margin-left: 10px;
-        margin-top: 0;
-    }
-}
-
-//
-// Folder browser
-// --------------------------------------------------
-.umb-folderbrowser .add-link {
-  display: inline-block;
-  height: 120px;
-  width: 120px;
-  text-align: center;
-  border: 1px @gray-10 dashed;
-  line-height: 120px
-}
-
-//
-// File upload
-// --------------------------------------------------
-.umb-fileupload {
-    display: flex;
-    flex-direction: column;
-    padding: 20px;
-    border: 1px solid @inputBorder;
-    box-sizing: border-box;
-    width: 100%;
-    .umb-property-editor--limit-width();
-}
-
-.umb-fileupload .preview {
-  border-radius: 5px;
-  padding: 3px;
-  background: @gray-9;
-  float: left;
-  margin-right: 30px;
-  margin-bottom: 30px;
-}
-
-.umb-fileupload ul {
-    list-style: none;
-    vertical-align: middle;
-    margin-bottom: 0;
-
-    img {
-        .checkeredBackground();
-    }
-}
-
-.umb-fileupload label {
-  vertical-align: middle;
-  padding-left: 7px;
-  font-weight: normal;
-}
-
-.umb-fileupload .preview-file {
-  color: @gray-4;
-  height: 45px;
-  width: 55px;
-  text-align: center;
-  text-transform: uppercase;
-  font-size: 10px;
-  padding-top: 27px;
-}
-
-.umb-fileupload input {
-  font-size: 12px;
-  line-height: 1;
-}
-
-//
-// Related links
-// --------------------------------------------------
-.umb-relatedlinks table > tr > td { word-wrap:break-word; word-break: break-all; border-bottom: 1px solid transparent; }
-.umb-relatedlinks .handle { cursor:move; }
-.umb-relatedlinks table > tbody > tr.unsortable .handle { cursor:default; }
-
-.umb-relatedlinks table td.col-sort { width: 20px; }
-.umb-relatedlinks table td.col-caption { min-width: 200px; }
-.umb-relatedlinks table td.col-link { min-width: 200px;  }
-.umb-relatedlinks table td.col-actions { min-width: 120px; }
-
-.umb-relatedlinks table td.col-caption .control-wrapper,
-.umb-relatedlinks table td.col-link .control-wrapper { display: flex; }
-
-.umb-relatedlinks table td.col-caption .control-wrapper input[type="text"],
-.umb-relatedlinks table td.col-link .control-wrapper input[type="text"] { width: auto; flex: 1; }
-
-/* sortable placeholder */
-.umb-relatedlinks .sortable-placeholder {
-    background-color: @tableBackgroundAccent;
-    display: table-row;
-}
-.umb-relatedlinks .sortable-placeholder > td {
-    display: table-cell;
-    padding: 8px;
-}
-.umb-relatedlinks .ui-sortable-helper {
-    display: table-row;
-    background-color: @white;
-    opacity: 0.7;
-}
-.umb-relatedlinks .ui-sortable-helper > td {
-    display: table-cell;
-    border-bottom: 1px solid @tableBorder;
-}
-
-
-//
-// Slider
-// --------------------------------------------------
-.umb-slider {
-    .umb-property-editor--limit-width();
-}
-
-//
-// Tags
-// --------------------------------------------------
-.umb-tags {
-    .umb-property-editor--limit-width();
-}
-
-//
-// Date/time picker
-// --------------------------------------------------
-.bootstrap-datetimepicker-widget .btn {padding: 0;}
-.bootstrap-datetimepicker-widget .picker-switch .btn { background: none; border: none;}
-.umb-datepicker .input-append .btn-clear {
-    border: none;
-    position: absolute;
-    margin-left: -31px;
-    margin-top: 1px;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    height: 30px;
-    padding: 4px 6px;
-    font-size: @baseFontSize;
-    font-weight: normal;
-    line-height: @baseLineHeight;
-    text-align: center;
-    background-color: @white;
-    color: @ui-option-type;
-
-    &:hover {
-        color: @ui-option-type-hover;
-    }
-}
-.umb-datepicker p {margin-top:10px;}
-.umb-datepicker p a{color: @gray-3;}
-
-//
-// Link picker
-// --------------------------------------------------
-.umb-linkpicker {
-    .umb-linkpicker__url {
-        width: 50%;
-        padding-right: 5px;
-
-        // when the anchor input is hidden by config
-        // the URL input should be full-width
-        &:only-child {
-            width: 100%;
-        }
-    }
-
-    .umb-linkpicker__anchor {
-        width: 50%;
-        padding-left: 5px;
-    }
-}
-
-//
-// Code mirror - even though this isn't a proprety editor right now, it could be so I'm putting the styles here
-// --------------------------------------------------
-
-.CodeMirror, .CodeMirror-scroll {
-	height: 100%;
-    min-height:200px;
-}
-
-//
-// Custom styles of property editors in property preview in document type editor
-// -----------------------------------------------------------------------------
-.umb-group-builder__property-preview {
-    .umb-property-editor {
-        .slider {
-            .tooltip {
-                display: none;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/rte-content.less b/src/Umbraco.Web.UI.Client/src/less/rte-content.less
deleted file mode 100644
index ffd94ff6ad..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/rte-content.less
+++ /dev/null
@@ -1,58 +0,0 @@
-@import "variables.less";
-@import "colors.less";
-
-.mce-content-body .umb-macro-holder {
-    border: 3px dotted @pinkLight;
-    padding: 7px;
-    margin: 3px;
-}
-.mce-content-body .umb-macro-holder.inlined-macro {
-  border: 1px dotted @pinkLight;
-  padding: 1px;
-  margin: 0px;
-}
-
-
-.umb-rte .mce-content-body .umb-macro-holder.loading {
-    background: url(assets/img/loader.gif) right no-repeat;
-    background-size: 18px; background-position-x: 99%;
-}
-
-
-.umb-rte .embeditem {
-    position:relative;
-    > * {
-        user-select: none;
-        pointer-events: none;
-    }
-}
-
-.umb-rte .embeditem[data-mce-selected] {
-    outline: 2px solid @pinkLight;
-}
-
-.umb-rte .embeditem::before {
-    z-index:1000;
-    width:100%;
-    height:100%;
-    position:absolute;
-    content:' ';
-}
-
-.umb-rte .embeditem[data-mce-selected]::before {
-    background:rgba(0,0,0,0.025);
-}
-
-.umb-rte *[data-mce-selected="inline-boundary"] {
-    background: rgba(0,0,0,.025);
-    color: @blueExtraDark;
-    outline: 2px solid @pinkLight;
-}
-
-
-.umb-rte.mce-content-body umb-rte-block[data-mce-selected], 
-.umb-rte.mce-content-body umb-rte-block-inline[data-mce-selected] {
-  cursor: auto;
-  --umb-rte-block--selected: 1;
-  outline: none;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
deleted file mode 100644
index 4f84d80495..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ /dev/null
@@ -1,201 +0,0 @@
-// Styles for the RTE, the whole stylesheet is used in Tiny and these are specific to it's content
-// -------------------------
-
-.umb-rte {
-    position: relative;
-
-    .umb-property-editor--limit-width();
-}
-
-.umb-rte .mce-tinymce {
-    box-shadow: none;
-}
-
-.umb-rte .umb-rte-editor-con {
-    height: 24px;
-    visibility: hidden;
-}
-.umb-rte .umb-rte-editor {
-    min-height: 100px;
-}
-.umb-rte.--initialized .umb-rte-editor-con {
-    height:auto;
-    min-height: 95px;
-    visibility: visible;
-}
-
-.umb-rte .mce-content-body {
-    background-color: @white;
-    line-height: 1.5em;
-    border: 1px solid @gray-8;
-    padding:10px;
-}
-
-.umb-rte .mce-container {
-    box-sizing: border-box;
-}
-
-.umb-rte .mce-top-part {
-	position: sticky;
-	top: 0;
-
-  umb-editor-tab-bar ~ div & {
-    top: 50px;
-  }
-}
-
-/* make sure the menu wraps */
-.umb-rte .mce-top-part.mce-container div {
-    white-space: normal;
-}
-
-.umb-rte .mce-tinymce .mce-edit-area {
-    border-radius: 0px !important;
-}
-
-/*
-.mce-panel {
-    background: @gray-10 !important;
-    border-color: @gray-8 !important;
-}
-
-.mce-btn-group, .mce-btn {
-    border: none !important;
-    background: none !important;
-}
-*/
-
-.umb-rte .mce-ico {
-    text-align: center;
-    font-size: 12px !important;
-    /*color: @gray-1 !important;*/
-}
-
-/* Special case to support helviticons for the tiny mce button controls */
-// Also used in Prevalue editor.
-.mce-ico.mce-i-custom[class^="icon-"],
-.mce-ico.mce-i-custom[class*=" icon-"] {
-    font-family: icomoon;
-    font-size: 16px !important;
-}
-
-
-/* pre-value editor */
-.rte-editor-preval .control-group .controls > div > label {
-    cursor: pointer !important;
-
-    .mce-cmd .checkbox {
-        padding-right: 0;
-    }
-    .mce-ico {
-        line-height: 20px;
-    }
-}
-
-.umb-rte .mce-toolbar .mce-btn-group {
-    padding: 0;
-}
-
-.umb-rte .mce-btn {
-    color: @ui-action-type;
-    border-radius: 3px;
-}
-
-.umb-rte .mce-btn-group .mce-btn {
-    margin-top:2px;
-    margin-bottom:2px;
-}
-
-.umb-rte .mce-btn {
-    button:hover {
-        .mce-caret {
-            border-top-color: @ui-action-type-hover;
-        }
-    }
-}
-
-.umb-rte .mce-btn:hover, .umb-rte .mce-btn:active {
-    background: @ui-action-hover;
-    border-color: transparent;
-    button {
-        color: @ui-action-type-hover;
-        .mce-ico {
-            color: @ui-action-type-hover;
-        }
-    }
-}
-
-.umb-rte .mce-btn.mce-active, .umb-rte .mce-btn.mce-active:active,
-.umb-rte .mce-btn.mce-active:hover, .umb-rte .mce-btn.mce-active:focus {
-    background: @gray-9;
-    border-color: transparent;
-    button {
-        color: @ui-action-type-hover;
-        .mce-ico {
-            color: @ui-action-type-hover;
-        }
-        .mce-caret {
-            border-top-color: @ui-action-type-hover;
-        }
-    }
-}
-
-.tox {
-  &.tox-tinymce-aux {
-    z-index: 65535;
-  }
-}
-
-.umb-rte-editor-con .tox.tox-tinymce {
-  border-radius: 6px;
-  border-width: 1px;
-  border-color: @inputBorder;
-}
-
-.umb-rte-editor-con .tox:not(.tox-tinymce-inline) .tox-editor-header {
-  box-shadow: none;
-  border-bottom: 1px solid #d8d7d9;
-}
-
-.tox-tinymce-inline {
-  z-index: 999;
-}
-
-.tox-tinymce-fullscreen {
-  position: absolute;
-}
-
-// FIXME: Remove this workaround when https://github.com/tinymce/tinymce/issues/6431 has been fixed
-.tox .tox-collection__item:not(.tox-collection__item--state-disabled) .tox-collection__item-label {
-  line-height: 1 !important;
-}
-
-.mce-menu {
-    border-radius: 3px;
-}
-
-.mce-menu-item.mce-menu-item-normal.mce-stack-layout-item {
-    .mce-text, .mce-ico {
-        color: @ui-action-type;
-    }
-    &:hover {
-        background: @ui-action-hover;
-        .mce-text, .mce-ico {
-            color: @ui-action-type-hover;
-        }
-    }
-}
-
-.mce-menu-item.mce-menu-item-normal.mce-stack-layout-item.mce-active {
-    &, &:hover {
-        background: @gray-9;
-    }
-    .mce-text, .mce-ico {
-        color: @ui-action-type-hover;
-    }
-}
-
-.umb-grid .umb-rte {
-    border: 1px solid @gray-8;
-    max-width: none;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less
deleted file mode 100644
index d4b5cfc998..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/sections.less
+++ /dev/null
@@ -1,151 +0,0 @@
-// Sections
-// -------------------------
-
-ul.sections {
-    margin: 0;
-    display: flex;
-    margin-left: -20px;
-
-    > li {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        position: relative;
-
-        > a {
-            color: @white;
-            height: @appHeaderHeight;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            position: relative;
-            padding: 0 10px;
-            text-decoration: none;
-            outline: none;
-            cursor: pointer;
-
-            &::after {
-                content: "";
-                left: 10px;
-                right: 10px;
-                height: 4px;
-                bottom: 0;
-                transform: translateY(4px);
-                background-color: @pinkLight;
-                position: absolute;
-                border-radius: 3px 3px 0 0;
-                opacity: 0;
-                padding: 0 2px;
-                transition: transform 240ms ease-in-out;
-            }
-
-            &:focus .section__name {
-                .tabbing-active & {
-                    border: 1px solid @gray-9;
-                }
-            }
-        }
-
-        .section__name {
-            border: 1px solid transparent;
-            border-radius: 3px;
-            margin-top: 1px;
-            padding: 3px 10px 4px 10px;
-            opacity: 0.8;
-            transition: opacity .1s linear, box-shadow .1s;
-        }
-
-        &.current > a {
-            color: @pinkLight;
-
-            &::after {
-                opacity: 1;
-                transform: translateY(0px);
-            }
-        }
-
-        &.expand {
-            i {
-                height: 5px;
-                width: 5px;
-                border-radius: 50%;
-                background: @white;
-                display: inline-block;
-                margin: 0 5px 0 0;
-                opacity: 0.6;
-                transition: opacity .1s linear;
-            }
-
-            &.current {
-                i {
-                    opacity: 1;
-                    background: @pinkLight;
-                }
-            }
-
-            &:hover i {
-                opacity: 1;
-            }
-        }
-
-        &.current .section__name,
-        a:hover .section__name {
-            opacity: 1;
-            -webkit-font-smoothing: subpixel-antialiased;
-        }
-    }
-}
-
-/* Sections tray */
-
-ul.sections-tray {
-    position: absolute;
-    top: @appHeaderHeight;
-    left: 0;
-    margin: 0;
-    list-style: none;
-    background: @blueExtraDark;
-    z-index: 10000;
-    border-radius: 0 0 3px 3px;
-
-    li {
-
-        &.current a {
-            color: @ui-active-border;
-            opacity: 1;
-
-            &::after {
-                opacity: 1;
-            }
-        }
-
-        a {
-            padding: 8px 24px;
-            color: @white;
-            text-decoration: none;
-            display: block;
-            position: relative;
-            outline: none;
-
-            &::after {
-                content: "";
-                width: 4px;
-                height: 100%;
-                background-color: @ui-active-border;
-                position: absolute;
-                border-radius: 0 3px 3px 0;
-                opacity: 0;
-                transition: all .2s linear;
-                top: 0;
-                left: 0;
-            }
-
-            &:focus .section__name {
-                .tabbing-active & {
-                    border: 1px solid;
-                    border-color: @gray-9;
-                }
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/tables.less b/src/Umbraco.Web.UI.Client/src/less/tables.less
deleted file mode 100644
index 2ecfa4d04e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/tables.less
+++ /dev/null
@@ -1,277 +0,0 @@
-//
-// Tables
-// --------------------------------------------------
-
-
-// BASE TABLES
-// -----------------
-
-table {
-  max-width: 100%;
-  background-color: @tableBackground;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-// BASELINE STYLES
-// ---------------
-
-.table {
-  width: 100%;
-  margin-bottom: @baseLineHeight;
-  box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
-  background: @tableBackground;
-  border-radius: @baseBorderRadius;
-  font-size: 14px;
-  // Cells
-  th,
-  td {
-    padding: 10px 20px;
-    line-height: @baseLineHeight;
-    text-align: left;
-    border-top: 1px solid @tableBorder;
-  }
-  th {
-    font-weight: bold;
-  }
-  // Bottom align for column headings
-  thead th {
-    padding-top: 15px;
-    padding-bottom: 15px;
-    color: @gray-3;
-    vertical-align: bottom;
-  }
-  // Remove top border from thead by default
-  caption + thead tr:first-child th,
-  caption + thead tr:first-child td,
-  colgroup + thead tr:first-child th,
-  colgroup + thead tr:first-child td,
-  thead:first-child tr:first-child th,
-  thead:first-child tr:first-child td {
-    border-top: 0;
-  }
-  // Account for multiple tbody instances
-  tbody + tbody {
-    border-top: 2px solid @tableBorder;
-  }
-
-  // Nesting
-  .table {
-    background-color: @bodyBackground;
-  }
-}
-
-
-.table:not(.table-bordered) tr > td:first-child {
-    border-left: 4px solid transparent;
-}
-.table tr.--selected > td:first-child {
-    border-left-color:@ui-selected-border;
-}
-
-
-
-
-// CONDENSED TABLE W/ HALF PADDING
-// -------------------------------
-
-.table-condensed tbody td {
-    padding: 5px 10px;
-}
-
-.table-condensed thead th {
-  padding: 10px;
-}
-
-
-// BORDERED VERSION
-// ----------------
-
-.table-bordered {
-  border: 1px solid @tableBorder;
-  border-collapse: separate; // Done so we can round those corners!
-  border-left: 0;
-  box-shadow: none;
-  .border-radius(@baseBorderRadius);
-  th,
-  td {
-    border-left: 1px solid @tableBorder;
-  }
-  // Prevent a double border
-  caption + thead tr:first-child th,
-  caption + tbody tr:first-child th,
-  caption + tbody tr:first-child td,
-  colgroup + thead tr:first-child th,
-  colgroup + tbody tr:first-child th,
-  colgroup + tbody tr:first-child td,
-  thead:first-child tr:first-child th,
-  tbody:first-child tr:first-child th,
-  tbody:first-child tr:first-child td {
-    border-top: 0;
-  }
-  // For first th/td in the first row in the first thead or tbody
-  thead:first-child tr:first-child > th:first-child,
-  tbody:first-child tr:first-child > td:first-child,
-  tbody:first-child tr:first-child > th:first-child {
-    .border-top-left-radius(@baseBorderRadius);
-  }
-  // For last th/td in the first row in the first thead or tbody
-  thead:first-child tr:first-child > th:last-child,
-  tbody:first-child tr:first-child > td:last-child,
-  tbody:first-child tr:first-child > th:last-child {
-    .border-top-right-radius(@baseBorderRadius);
-  }
-  // For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
-  thead:last-child tr:last-child > th:first-child,
-  tbody:last-child tr:last-child > td:first-child,
-  tbody:last-child tr:last-child > th:first-child,
-  tfoot:last-child tr:last-child > td:first-child,
-  tfoot:last-child tr:last-child > th:first-child {
-    .border-bottom-left-radius(@baseBorderRadius);
-  }
-  // For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
-  thead:last-child tr:last-child > th:last-child,
-  tbody:last-child tr:last-child > td:last-child,
-  tbody:last-child tr:last-child > th:last-child,
-  tfoot:last-child tr:last-child > td:last-child,
-  tfoot:last-child tr:last-child > th:last-child {
-    .border-bottom-right-radius(@baseBorderRadius);
-  }
-
-  // Clear border-radius for first and last td in the last row in the last tbody for table with tfoot
-  tfoot + tbody:last-child tr:last-child td:first-child {
-    .border-bottom-left-radius(0);
-  }
-  tfoot + tbody:last-child tr:last-child td:last-child {
-    .border-bottom-right-radius(0);
-  }
-
-  // Special fixes to round the left border on the first td/th
-  caption + thead tr:first-child th:first-child,
-  caption + tbody tr:first-child td:first-child,
-  colgroup + thead tr:first-child th:first-child,
-  colgroup + tbody tr:first-child td:first-child {
-    .border-top-left-radius(@baseBorderRadius);
-  }
-  caption + thead tr:first-child th:last-child,
-  caption + tbody tr:first-child td:last-child,
-  colgroup + thead tr:first-child th:last-child,
-  colgroup + tbody tr:first-child td:last-child {
-    .border-top-right-radius(@baseBorderRadius);
-  }
-
-}
-
-
-
-
-// ZEBRA-STRIPING
-// --------------
-
-// Default zebra-stripe styles (alternating gray and transparent backgrounds)
-.table-striped {
-  tbody {
-    > tr:nth-child(odd) > td,
-    > tr:nth-child(odd) > th {
-      background-color: @tableBackgroundAccent;
-    }
-  }
-}
-
-
-// HOVER EFFECT
-// ------------
-// Placed here since it has to come after the potential zebra striping
-.table-hover {
-  tbody {
-    tr:hover > td,
-    tr:hover > th {
-      background-color: @tableBackgroundHover;
-    }
-  }
-}
-
-
-// TABLE CELL SIZING
-// -----------------
-
-// Reset default grid behavior
-table td[class*="span"],
-table th[class*="span"],
-.row-fluid table td[class*="span"],
-.row-fluid table th[class*="span"] {
-  display: table-cell;
-  float: none; // undo default grid column styles
-  margin-left: 0; // undo default grid column styles
-}
-
-// Change the column widths to account for td/th padding
-.table td,
-.table th {
-  &.span1     { .tableColumns(1); }
-  &.span2     { .tableColumns(2); }
-  &.span3     { .tableColumns(3); }
-  &.span4     { .tableColumns(4); }
-  &.span5     { .tableColumns(5); }
-  &.span6     { .tableColumns(6); }
-  &.span7     { .tableColumns(7); }
-  &.span8     { .tableColumns(8); }
-  &.span9     { .tableColumns(9); }
-  &.span10    { .tableColumns(10); }
-  &.span11    { .tableColumns(11); }
-  &.span12    { .tableColumns(12); }
-}
-
-
-
-// TABLE BACKGROUNDS
-// -----------------
-// Exact selectors below required to override .table-striped
-
-.table tbody tr {
-  &.success > td {
-    background-color: @successBackground;
-  }
-  &.error > td {
-    background-color: @errorBackground;
-  }
-  &.warning > td {
-    background-color: @warningBackground;
-  }
-  &.info > td {
-    background-color: @infoBackground;
-  }
-}
-
-// Hover states for .table-hover
-.table-hover tbody tr {
-  &.success:hover > td {
-    background-color: darken(@successBackground, 5%);
-  }
-  &.error:hover > td {
-    background-color: darken(@errorBackground, 5%);
-  }
-  &.warning:hover > td {
-    background-color: darken(@warningBackground, 5%);
-  }
-  &.info:hover > td {
-    background-color: darken(@infoBackground, 5%);
-  }
-}
-
-// table sortable
-.table-sortable tbody tr {
-  cursor: move;
-}
-
-.table__action-overlay{
-    background: transparent;
-    border: 0 none;
-    padding: 0;
-    font-style: italic;
-
-    &:focus,
-    &:hover{
-        text-decoration: underline;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/tipmenu.less b/src/Umbraco.Web.UI.Client/src/less/tipmenu.less
deleted file mode 100644
index 9baec25eb2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/tipmenu.less
+++ /dev/null
@@ -1,20 +0,0 @@
-.tipmenu .tooltip{
-	position:absolute;
-	left:0;
-	right:0;
-	margin-left:auto;
-	margin-right:auto;
-}
-
-.tipmenu:hover .tooltip{
-	opacity: 1;
-}
-
-.tipmenu:hover .tooltip a{
-	color: @white;
-}
-
-.tipmenu .tooltip-inner{
-	margin-left:auto;
-	margin-right:auto;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/typeahead.less b/src/Umbraco.Web.UI.Client/src/less/typeahead.less
deleted file mode 100644
index 4822605200..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/typeahead.less
+++ /dev/null
@@ -1,52 +0,0 @@
-.typeahead,
-.tt-query,
-.tt-hint {
-    z-index: auto !important;
-    margin-top:-4px !important;
-    width: 396px;
-    height: 30px;
-    padding: 8px 12px;
-    font-size: 24px;
-    line-height: 30px;
-    border: 2px solid @gray-8;
-    border-radius: 2px !important;
-    outline: none;
-}
-
-.typeahead {
-  background-color: @white;
-}
-
-.tt-query {
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.tt-hint {
-  color: @gray-8 !important;
-}
-
-.tt-menu {
-  width: 422px;
-  margin-top: 12px;
-  padding: 8px 0;
-  background-color: @white;
-  border: 1px solid @gray-8;
-  border-radius: 3px;
-  box-shadow: 0 3px 6px rgba(0,0,0,.16);
-}
-
-.tt-suggestion {
-  padding: 3px 20px;
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  cursor:pointer;
-}
-
-.tt-suggestion.tt-cursor {
-  color: @white;
-  background-color: @ui-selected-type-hover;
-}
-
-.tt-suggestion p {
-  margin: 0;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/_cursor.less b/src/Umbraco.Web.UI.Client/src/less/utilities/_cursor.less
deleted file mode 100644
index dade8e0aae..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/_cursor.less
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-   CURSORS
-*/
-
-.cursor-auto {          cursor: auto; }
-.cursor-default {       cursor: default; }
-.cursor-none {          cursor: none; }
-.cursor-context-menu {  cursor: context-menu; }
-.cursor-help {          cursor: help; }
-.cursor-pointer {       cursor: pointer; }
-.cursor-progress {      cursor: progress; }
-.cursor-wait {          cursor: wait; }
-.cursor-cell {          cursor: cell; }
-.cursor-crosshair {     cursor: crosshair; }
-.cursor-text {          cursor: text; }
-.cursor-vertical-text { cursor: vertical-text; }
-.cursor-alias {         cursor: alias; }
-.cursor-copy {          cursor: copy; }
-.cursor-move {          cursor: move; }
-.cursor-no-drop {       cursor: no-drop; }
-.cursor-not-allowed {   cursor: not-allowed; }
-.cursor-e-resize {      cursor: e-resize; }
-.cursor-n-resize {      cursor: n-resize; }
-.cursor-ne-resize {     cursor: ne-resize; }
-.cursor-nw-resize {     cursor: nw-resize; }
-.cursor-s-resize {      cursor: s-resize; }
-.cursor-se-resize {     cursor: se-resize; }
-.cursor-sw-resize {     cursor: sw-resize; }
-.cursor-w-resize {      cursor: w-resize; }
-.cursor-ew-resize {     cursor: ew-resize; }
-.cursor-ns-resize {     cursor: ns-resize; }
-.cursor-nesw-resize {   cursor: nesw-resize; }
-.cursor-nwse-resize {   cursor: nwse-resize; }
-.cursor-col-resize {    cursor: col-resize; }
-.cursor-row-resize {    cursor: row-resize; }
-.cursor-all-scroll {    cursor: all-scroll; }
-.cursor-zoom-in {       cursor: zoom-in; }
-.cursor-zoom-out {      cursor: zoom-out; }
-
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less b/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less
deleted file mode 100644
index f9b697ad01..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-    Flexbox
-*/
-
-.flex { display: flex; }
-.flex-inline { display: inline-flex; }
-
-.flex-column  { flex-direction: column; }
-.flex-wrap    { flex-wrap: wrap; }
-
-.items-start    { align-items: flex-start; }
-.items-end      { align-items: flex-end; }
-.items-center   { align-items: center; }
-.items-baseline { align-items: baseline; }
-.items-stretch  { align-items: stretch; }
-
-.self-start    { align-self: flex-start; }
-.self-end      { align-self: flex-end; }
-.self-center   { align-self: center; }
-.self-baseline { align-self: baseline; }
-.self-stretch  { align-self: stretch; }
-
-.justify-start   { justify-content: flex-start; }
-.justify-end     { justify-content: flex-end; }
-.justify-center  { justify-content: center; }
-.justify-between { justify-content: space-between; }
-.justify-around  { justify-content: space-around; }
-
-.content-start   { align-content: flex-start; }
-.content-end     { align-content: flex-end; }
-.content-center  { align-content: center; }
-.content-between { align-content: space-between; }
-.content-around  { align-content: space-around; }
-.content-stretch { align-content: stretch; }
-
-.flx-i {
-  flex: 1;
-}
-
-.flx-gap-sm {
-  gap: 20px;
-}
-
-.flx-g0 {
-  flex-grow: 0;
-}
-.flx-g1 {
-  flex-grow: 1;
-}
-
-.flx-s0 {
-  flex-shrink: 0;
-}
-.flx-s1 {
-  flex-shrink: 1;
-}
-
-
-.flx-b0 {
-  flex-basis: 0%;
-}
-.flx-b1 {
-  flex-basis: 10%;
-}
-.flx-b2 {
-  flex-basis: 20%;
-}
-.flx-b3 {
-  flex-basis: 30%;
-}
-.flx-b4 {
-  flex-basis: 40%;
-}
-.flx-b5 {
-  flex-basis: 50%;
-}
-.flx-b6 {
-  flex-basis: 60%;
-}
-.flx-b7 {
-  flex-basis: 70%;
-}
-.flx-b8 {
-  flex-basis: 80%;
-}
-.flx-b9 {
-  flex-basis: 90%;
-}
-.flx-b10 {
-  flex-basis: 100%;
-}
-.flx-ba {
-  flex-basis: auto;
-}
-
-/* 1. Fix for Chrome 44 bug. https://code.google.com/p/chromium/issues/detail?id=506893 */
-.flex-auto {
-  flex: 1 1 auto;
-  min-width: 0; /* 1 */
-  min-height: 0; /* 1 */
-}
-
-.flex-none { flex: none; }
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/_font-weight.less b/src/Umbraco.Web.UI.Client/src/less/utilities/_font-weight.less
deleted file mode 100644
index 111ed4b2ef..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/_font-weight.less
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-   FONT WEIGHT
-*/
-
-
-
-.light       { font-weight: 300; }
-.normal      { font-weight: 500; }
-.semi-bold   { font-weight: 600; }
-.bold        { font-weight: 700; }
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/_spacing.less b/src/Umbraco.Web.UI.Client/src/less/utilities/_spacing.less
deleted file mode 100644
index ada33c2d63..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/_spacing.less
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-    Spacing
-*/
-
-@spacing-none: 0;
-@spacing-extra-small: .25rem;
-@spacing-small: .5rem;
-@spacing-medium: 1rem;
-@spacing-large: 2rem;
-@spacing-extra-large: 4rem;
-@spacing-extra-extra-large: 8rem;
-@spacing-extra-extra-extra-large: 16rem;
-
-/*
-   SPACING
-   An eight step powers of two scale ranging from 0 to 16rem.
-   Namespaces are composable and thus highly grockable - check the legend below
-   Legend:
-   p = padding
-   m = margin
-   a = all
-   h = horizontal
-   v = vertical
-   t = top
-   r = right
-   b = bottom
-   l = left
-   0 = none
-   1 = 1st step in spacing scale
-   2 = 2nd step in spacing scale
-   3 = 3rd step in spacing scale
-   4 = 4th step in spacing scale
-   5 = 5th step in spacing scale
-   6 = 6th step in spacing scale
-   7 = 7th step in spacing scale
-*/
-
-.m-center,
-.mx-auto {
-    margin-left: auto; 
-    margin-right: auto;
-}
-
-.my-auto {
-    margin-top: auto;
-    margin-bottom: auto;
-}
-
-.mt-auto { margin-top: auto; }
-.mb-auto { margin-bottom: auto; }
-.ml-auto { margin-left: auto; }
-.mr-auto { margin-right: auto; }
-
-.mt0 { margin-top: @spacing-none; }
-.mt1 { margin-top: @spacing-extra-small; }
-.mt2 { margin-top: @spacing-small; }
-.mt3 { margin-top: @spacing-medium; }
-.mt4 { margin-top: @spacing-large; }
-.mt5 { margin-top: @spacing-extra-large; }
-.mt6 { margin-top: @spacing-extra-extra-large; }
-.mt7 { margin-top: @spacing-extra-extra-extra-large; }
-
-.mb0 { margin-bottom: @spacing-none; }
-.mb1 { margin-bottom: @spacing-extra-small; }
-.mb2 { margin-bottom: @spacing-small; }
-.mb3 { margin-bottom: @spacing-medium; }
-.mb4 { margin-bottom: @spacing-large; }
-.mb5 { margin-bottom: @spacing-extra-large; }
-.mb6 { margin-bottom: @spacing-extra-extra-large; }
-.mb7 { margin-bottom: @spacing-extra-extra-extra-large; }
-
-.ml0 { margin-left: @spacing-none; }
-.ml1 { margin-left: @spacing-extra-small; }
-.ml2 { margin-left: @spacing-small; }
-.ml3 { margin-left: @spacing-medium; }
-.ml4 { margin-left: @spacing-large; }
-.ml5 { margin-left: @spacing-extra-large; }
-.ml6 { margin-left: @spacing-extra-extra-large; }
-.ml7 { margin-left: @spacing-extra-extra-extra-large; }
-
-.mr0 { margin-right: @spacing-none; }
-.mr1 { margin-right: @spacing-extra-small; }
-.mr2 { margin-right: @spacing-small; }
-.mr3 { margin-right: @spacing-medium; }
-.mr4 { margin-right: @spacing-large; }
-.mr5 { margin-right: @spacing-extra-large; }
-.mr6 { margin-right: @spacing-extra-extra-large; }
-.mr7 { margin-right: @spacing-extra-extra-extra-large; }
-
-.p0 { padding: @spacing-none; }
-
-.pt0 { padding-top: @spacing-none; }
-.pb0 { padding-bottom: @spacing-none; }
-.pl0 { padding-left: @spacing-none; }
-.pr0 { padding-right: @spacing-none; }
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/_text-align.less b/src/Umbraco.Web.UI.Client/src/less/utilities/_text-align.less
deleted file mode 100644
index 070078fc19..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/_text-align.less
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-  TEXT ALIGN
-*/
-
-.tl,
-.table td.tl,
-.table th.tl  { text-align: left; }
-.tr,
-.table td.tr,
-.table th.tr  { text-align: right; }
-.tc,
-.table td.tc,
-.table th.tc  { text-align: center; }
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/_width.less b/src/Umbraco.Web.UI.Client/src/less/utilities/_width.less
deleted file mode 100644
index a9f2fd3362..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/_width.less
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-    Width
-*/
-
-
-/* Width Scale */
-
-.w1 {    width: 1rem; }
-.w2 {    width: 2rem; }
-.w3 {    width: 4rem; }
-.w4 {    width: 8rem; }
-.w5 {    width: 16rem; }
-
-.w-10 {  width:  10%; }
-.w-20 {  width:  20%; }
-.w-25 {  width:  25%; }
-.w-33 {  width:  33%; }
-.w-34 {  width:  34%; }
-.w-40 {  width:  40%; }
-.w-50 {  width:  50%; }
-.w-60 {  width:  60%; }
-.w-75 {  width:  75%; }
-.w-80 {  width:  80%; }
-.w-100 { width: 100%; }
-
-.w-auto { width: auto; }
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/layout/_display.less b/src/Umbraco.Web.UI.Client/src/less/utilities/layout/_display.less
deleted file mode 100644
index 05959977de..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/layout/_display.less
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-   DISPLAY
-   Base:
-    d = display
-   Modifiers:
-    n     = none
-    b     = block
-    ib    = inline-block
-    it    = inline-table
-    t     = table
-    tc    = table-cell
-    tr    = table-row
-    tcol  = table-column
-    tcolg = table-column-group
-   Media Query Extensions:
-     -ns = not-small
-     -m  = medium
-     -l  = large
-*/
-
-.dn {              display: none; }
-.di {              display: inline; }
-.db {              display: block; }
-.dib {             display: inline-block; }
-.dit {             display: inline-table; }
-.dt {              display: table; }
-.dtc {             display: table-cell; }
-.dt-row {          display: table-row; }
-.dt-row-group {    display: table-row-group; }
-.dt-column {       display: table-column; }
-.dt-column-group { display: table-column-group; }
-
-/*
-  This will set table to full width and then
-  all cells will be equal width
-*/
-
-.dt--fixed {
-  table-layout: fixed;
-  width: 100%;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/theme/_opacity.less b/src/Umbraco.Web.UI.Client/src/less/utilities/theme/_opacity.less
deleted file mode 100644
index 4550827cdc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/theme/_opacity.less
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-
-  Opacity
-
-*/
-
-.o-100 { opacity: 1;    }
-.o-90  { opacity: 0.9;   }
-.o-80  { opacity: 0.8;   }
-.o-70  { opacity: 0.7;   }
-.o-60  { opacity: 0.6;   }
-.o-50  { opacity: 0.5;   }
-.o-40  { opacity: 0.4;   }
-.o-30  { opacity: 0.3;   }
-.o-20  { opacity: 0.2;   }
-.o-10  { opacity: 0.1;   }
-.o-05  { opacity: 0.05;  }
-.o-025 { opacity: 0.025; }
-.o-0   { opacity: 0; }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/typography/_text-decoration.less b/src/Umbraco.Web.UI.Client/src/less/utilities/typography/_text-decoration.less
deleted file mode 100644
index 39ba646aac..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/typography/_text-decoration.less
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
-
-   TEXT DECORATION
-
-*/
-
-.strike       { text-decoration: line-through; }
-.underline    { text-decoration: underline; }
-.no-underline { text-decoration: none; }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/typography/_white-space.less b/src/Umbraco.Web.UI.Client/src/less/utilities/typography/_white-space.less
deleted file mode 100644
index 5767b0b474..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/typography/_white-space.less
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-
-   WHITE SPACE
-
-*/
-
-.ws-normal { white-space: normal; }
-.nowrap { white-space: nowrap; }
-.pre { white-space: pre; }
-.pre-wrap { white-space: pre-wrap; }
-.pre-line { white-space: pre-line; }
-
-.truncate {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/typography/_word-break.less b/src/Umbraco.Web.UI.Client/src/less/utilities/typography/_word-break.less
deleted file mode 100644
index e9e8017330..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/typography/_word-break.less
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-  WORD BREAK
-*/
-
-.word-normal { word-break: normal; }
-.word-wrap { word-break: break-all; }
-.word-nowrap { word-break: keep-all; }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
deleted file mode 100644
index 505036cf06..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ /dev/null
@@ -1,555 +0,0 @@
-//
-// Variables
-// --------------------------------------------------
-
-
-// Global values
-// --------------------------------------------------
-
-
-// Grays
-// -------------------------
-@black: #000;
-@blackLight: #1D1D1D;
-@grayDarker: #222;
-@grayDark: #343434;
-@gray: #555;
-@grayMed: #7F7F7F;
-@blueGrey: #607D8B;
-@grayLight: #D9D9D9;
-@grayLighter: #F8F8F8;
-@white: #FFF;
-@grayIcon: #9E9E9E;
-
-
-// Colors
-// -------------------------
-
-@turquoise-d1: #00AEA2;
-@turquoise: #03BFB3;
-@turquoise-l1: #42CFC5;
-@turquoise-l2: #81DED8;
-@turquoise-l3: #C0F0ED;
-@turquoise-washed: #F3FDFC;
-
-@purple-d2: #1D1333;
-@purple-d1: #2E2246;
-@purple: #413659;
-@purple-l1: #675E7A;
-@purple-l2: #8D869B;
-@purple-l3: #B3AFBD;
-@purple-washed: #F6F3FD;
-
-// UI Colors
-@red-d1: #F02E28;
-@red: #D42054; // updated 2019
-@red-l1: #e22c60; // updated 2019
-@red-l2: #FE8B88;
-@red-l3: #FFB2B0;
-@red-washed: #FFECEB;
-
-@yellow-d2: #F0AC00;
-@yellow-d1: #FFC011;
-@yellow: #fad634; // updated 2019
-@yellow-l1: #FFD861;
-@yellow-l2: #FFE28A;
-@yellow-l3: #FFECB0;
-@yellow-washed: #FFFAEB;
-
-@green-d1: #1FB572;
-@green: #2bc37c; // updated 2019
-@green-l1: #4ECF95;
-@green-l2: #79E1B2;
-@green-l3: #A6F0CF;
-@green-washed: #EBFFF6;
-
-// Grayscale
-@gray-1: #1E1C1C;
-@gray-2: #303033;
-@gray-3: #515054;
-@gray-4: #68676B;
-@gray-5: #817F85;
-@gray-6: #A2A1A6;
-@gray-7: #BBBABF;
-@gray-8: #D8D7D9;
-@gray-9: #E9E9EB;
-@gray-10: #F3F3F5;
-@gray-11: #F6F6F7;
-@gray-12: #F9F9FA;
-@gray-13: #FBFBFD;
-
-@sand-1: #DED4CF; // added 2019
-@sand-2: #EBDED6; // added 2019
-@sand-5: #F3ECE8; // added 2019
-@sand-6: #F6F1EF; // added 2019
-@sand-7: #F9F7F5; // added 2019
-@sand-8: #fbfaf9; // added 2019
-@sand-9: #fdfcfc; // added 2019
-
-
-// Additional Icon Colours
-@brownIcon: #795548;
-@blueIcon: #2196F3;
-@lightBlueIcon: #03A9F4;
-@cyanIcon: #00BCD4;
-@greenIcon: #4CAF50;
-@lightGreenIcon: #8BC34A;
-@limeIcon: #CDDC39;
-@yellowIcon: #FFEB3B;
-@amberIcon: #FFC107;
-@orangeIcon: #FF9800;
-@deepOrangeIcon: #FF5722;
-@redIcon: #F44336;
-@pinkIcon: #E91E63;
-@purpleIcon: #9C27B0;
-@deepPurpleIcon: #673AB7;
-@indigoIcon: #3F51B5;
-
-
-// Brand colors
-// -------------------------
-
-//@blueLight:               #4f89de;
-@blue: #2E8AEA;
-@blueMid: #2152A3; // updated 2019
-@blueMidLight: #6ab4f0;
-@blueDark: #3544b1; // updated 2019
-@blueExtraDark: #1b264f; // added 2019
-@blueLight: #ADD8E6;
-@blueNight: #162335; // added 2019
-//@orange:              #f79c37;// updated 2019
-@pink: #D93F4C; // #C3325F;// update 2019
-@pinkLight: #f5c1bc; // added 2019
-@pinkExtraLight: #fee4e1; // added 2020
-@pinkRedLight: #ff8a89; // added 2019
-@brown: #9d8057; // added 2019
-@brownLight: #e4e0dd; // added 2019
-@brownGrayLight: #f6f4f4; // added 2019
-@brownGrayExtraLight: #faf9f9; // added 2019
-@orange: #ff9412; // added 2019
-
-//@u-greyLight:           #f2ebe6;// added 2019
-@u-white: #f9f7f4; // added 2019
-@u-black: @black; // added 2019
-
-
-// UI colors
-// -------------------------
-
-@ui-option-type: @blueExtraDark;
-@ui-option-type-hover: @blueMid;
-@ui-option: @white;
-@ui-option-hover: @gray-12;
-
-@ui-option-disabled-type: @gray-6;
-@ui-option-disabled-type-hover: @gray-5;
-@ui-option-disabled-hover: @gray-12;
-
-@ui-disabled-type: @gray-6;
-@ui-disabled-border: @gray-6;
-
-//@ui-active:           #346ab3;
-@ui-active: @pinkExtraLight;
-@ui-active-border: @pinkLight;
-@ui-active-blur: @brownLight;
-@ui-active-type: @blueExtraDark;
-@ui-active-type-hover: @blueMid;
-
-@ui-selected: @sand-5;
-@ui-selected-hover: ligthen(@sand-5, 10%);
-@ui-selected-type: @blueExtraDark;
-@ui-selected-type-hover: @blueMid;
-@ui-selected-border: @blueDark;
-@ui-selected-border-hover: darken(@blueDark, 10%);
-
-@ui-light-border: @pinkLight;
-@ui-light-type: @gray-3;
-@ui-light-type-hover: @blueMid;
-
-@ui-light-active-border: @pinkLight;
-@ui-light-active-type: @blueMid;
-@ui-light-active-type-hover: @blueMidLight;
-
-
-@ui-action: @white;
-@ui-action-hover: @gray-12;
-@ui-action-type: @blueExtraDark;
-@ui-action-type-hover: @blueMid;
-@ui-action-border: @blueExtraDark;
-@ui-action-border-hover: @blueMid;
-
-@ui-action-discreet: @white;
-@ui-action-discreet-hover: @gray-12;
-@ui-action-discreet-type: @blueExtraDark;
-@ui-action-discreet-type-hover: @blueMid;
-@ui-action-discreet-border: @gray-7;
-@ui-action-discreet-border-hover: @blueMid;
-
-@ui-outline: @blueMidLight;
-
-@type-white: @white;
-@type-black: @blueNight;
-
-@ui-btn: @blueExtraDark;
-@ui-btn-hover: @blueMid;
-@ui-btn-type: @white;
-
-@ui-btn-positive: @green;
-@ui-btn-positive-hover: lighten(@green, 6%);
-@ui-btn-positive-type: @white;
-
-@ui-btn-negative: @red;
-@ui-btn-negative-type: @white;
-@ui-btn-negative-hover: @red;
-
-@ui-icon: @blueNight;
-@ui-icon-hover: @blueMid;
-
-@ui-drop-area-color: @blueMidLight;
-
-
-// Scaffolding
-// -------------------------
-@appHeaderHeight: 55px;
-@bodyBackground: @gray-10;
-@textColor: @black;
-
-@editorHeaderHeight: 70px;
-@editorFooterHeight: 50px;
-
-
-// Links
-// -------------------------
-@linkColor: @black;
-@linkColorHover: darken(@linkColor, 15%);
-
-// Typography
-// -------------------------
-@sansFontFamily: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
-@serifFontFamily: Georgia, "Times New Roman", Times, serif;
-@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace;
-
-@baseFontSize: 15px;
-@baseFontFamily: @sansFontFamily;
-@baseLineHeight: 20px;
-@altFontFamily: @serifFontFamily;
-
-@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
-@headingsFontWeight: 500; // instead of browser default, bold
-@headingsColor: inherit; // empty to use BS default, @textColor
-
-
-// Component sizing
-// -------------------------
-// Based on 14px font-size and 20px line-height
-
-@fontSizeLarge: (@baseFontSize * 1.25); // ~18px
-@fontSizeMedium: (@baseFontSize * 1.15); // ~14px
-@fontSizeSmall: (@baseFontSize * 0.85); // ~12px
-@fontSizeMini: (@baseFontSize * 0.75); // ~11px
-
-@paddingLarge: 11px 19px; // 44px
-@paddingSmall: 2px 10px; // 26px
-@paddingMini: 0 6px; // 22px
-
-@propertyEditorLimitedWidth: 800px;
-
-// Disabled this to keep consistency throughout the backoffice UI. Untill a better solution is thought up, this will do.
-@baseBorderRadius: 3px; // 2px;
-@doubleBorderRadius: 6px;
-@borderRadiusLarge: 3px; // 6px;
-@borderRadiusSmall: 3px; // 3px;
-
-
-// Tables
-// -------------------------
-@tableBackground: @white; // overall background-color
-@tableBackgroundAccent: @gray-10; // for striping
-@tableBackgroundHover: @gray-10; // for hover
-@tableBorder: @gray-9; // table and cell border
-
-// Buttons
-// -------------------------
-@btnBackground: @gray-9;
-@btnBackgroundHighlight: @gray-10;
-@btnBorder: @gray-9;
-
-@btnPrimaryBackground: @ui-btn;
-@btnPrimaryBackgroundHighlight: @ui-btn-hover;
-
-@btnInfoType: @ui-btn-type; // updated 2019
-@btnInfoTypeHover: @ui-btn-type; // updated 2019
-@btnInfoBackground: @ui-btn; // updated 2019
-@btnInfoBackgroundHighlight: @ui-btn-hover; // updated 2019
-
-@btnWhiteType: @blueExtraDark; // updated 2019
-@btnWhiteTypeHover: @ui-action-type-hover; // updated 2019
-@btnWhiteBackground: @white; // updated 2019
-@btnWhiteBackgroundHighlight: @white; // updated 2019
-
-@btnSuccessType: @ui-btn-positive-type; // updated 2019
-@btnSuccessBackground: @ui-btn-positive; // updated 2019
-@btnSuccessBackgroundHighlight: @ui-btn-positive-hover; // updated 2019
-
-@btnWarningBackground: @yellow-d2;
-@btnWarningBackgroundHighlight: lighten(@yellow-d2, 10%);
-
-@btnDangerBackground: @red;
-@btnDangerBackgroundHighlight: @red-l1;
-
-@btnInverseBackground: @gray-2;
-@btnInverseBackgroundHighlight: @gray-2;
-
-@btnNeutralBackground: @gray-9;
-@btnNeutralBackgroundHighlight: @gray-9;
-
-
-// Forms
-// -------------------------
-@inputBackground: @white;
-@inputBorder: @gray-8;
-@inputBorderFocus: @gray-7;
-@inputBorderTabFocus: @ui-outline;
-@inputBorderRadius: 0;
-@inputDisabledBackground: @gray-10;
-@formActionsBackground: @gray-9;
-@inputHeight: (@baseLineHeight + 12px); // base line-height + 8px vertical padding + 2px top/bottom border
-@controlRequiredColor: @red;
-@inputReadonlyBorderColor: @gray-9;
-
-
-// Tabs
-// -------------------------
-
-@tabsBorderRadius: @baseBorderRadius;
-
-// Dropdowns
-// -------------------------
-@dropdownBackground: @white;
-@dropdownBorder: none;
-@dropdownBorderRadius: @baseBorderRadius;
-@dropdownDividerTop: @gray-8;
-@dropdownDividerBottom: @white;
-
-@dropdownLinkColor: @gray-2;
-@dropdownLinkColorHover: @white;
-@dropdownLinkColorActive: @white;
-
-@dropdownLinkBackgroundActive: @linkColor;
-@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
-
-
-
-// COMPONENT VARIABLES
-// --------------------------------------------------
-
-// Drawer
-@drawerWidth: 400px;
-
-
-// Z-index master list
-// -------------------------
-// Used for a bird's eye view of components dependent on the z-axis
-// Try to avoid customizing these :)
-@zIndexEditor: 100;
-@zIndexTree: 100;
-@zIndexBlockActions: 90; // Should be less than "zIndexEditor" to stay behind editor overlay in infinite mode.
-@zindexDropdown: 1000;
-@zindexPopover: 1010;
-@zindexTooltip: 1030;
-@zindexFixedNavbar: 1030;
-@zindexModalBackdrop: 1040;
-@zindexModal: 1050;
-@zindexSearchBox: 8000;
-@zindexUmbOverlay: 7500;
-@zindexOverlayBackdrop: 2000;
-
-@zindexNotification: 8000;
-
-// these are used for the tour which should be on top of everything else
-@zindexTourBackdrop: 9999;
-@zindexTourModal: 10000;
-
-// Sticky bar has a z-index of "500", which is set from javascript in directive
-// so set z-index of cropper should be lower to be behind sticky bar.
-@zindexCropperOverlay: 499;
-
-// Sprite icons path
-// -------------------------
-@iconSpritePath: "../img/glyphicons-halflings.png";
-@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
-
-
-// Input placeholder text color
-// -------------------------
-@placeholderText: @gray-8;
-
-
-// Hr border color
-// -------------------------
-@hrBorder: @gray-10;
-
-
-// Horizontal forms & lists
-// -------------------------
-@horizontalComponentOffset: 180px;
-
-
-// Wells
-// -------------------------
-@wellBackground: @gray-10;
-
-
-// Navbar
-// -------------------------
-@navbarCollapseWidth: 979px;
-@navbarCollapseDesktopWidth: (@navbarCollapseWidth + 1);
-
-@navbarHeight: 40px;
-@navbarBackgroundHighlight: @white;
-@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
-@navbarBorder: darken(@navbarBackground, 12%);
-
-@navbarText: @gray-4;
-@navbarLinkColor: @gray-4;
-@navbarLinkColorHover: @gray-2;
-@navbarLinkColorActive: @gray-3;
-@navbarLinkBackgroundHover: transparent;
-@navbarLinkBackgroundActive: darken(@navbarBackground, 5%);
-
-@navbarBrandColor: @navbarLinkColor;
-
-// Inverted navbar
-@navbarInverseBackground: @gray-1;
-@navbarInverseBackgroundHighlight: @gray-2;
-@navbarInverseBorder: @gray-2;
-
-@navbarInverseText: @gray-8;
-@navbarInverseLinkColor: @gray-8;
-@navbarInverseLinkColorHover: @white;
-@navbarInverseLinkColorActive: @navbarInverseLinkColorHover;
-@navbarInverseLinkBackgroundHover: transparent;
-@navbarInverseLinkBackgroundActive: @navbarInverseBackground;
-
-@navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%);
-@navbarInverseSearchBackgroundFocus: @white;
-@navbarInverseSearchBorder: @navbarInverseBackground;
-@navbarInverseSearchPlaceholderColor: @gray-7;
-
-@navbarInverseBrandColor: @navbarInverseLinkColor;
-
-
-// Pagination
-// -------------------------
-@paginationBackground: @white;
-@paginationBorder: @gray-8;
-@paginationActiveBackground: @gray-10;
-
-
-// Hero unit
-// -------------------------
-@heroUnitBackground: @gray-10;
-@heroUnitHeadingColor: inherit;
-@heroUnitLeadColor: inherit;
-
-
-// Alerts
-// -------------------------
-@warningText: @white;
-@warningBackground: @yellow-d2;
-@warningBorder: transparent;
-
-@errorText: @white;
-@errorBackground: @red;
-@errorBorder: transparent;
-
-@successText: @white;
-@successBackground: @green-d1;
-@successBorder: transparent;
-
-@infoText: @white;
-@infoBackground: @blueDark;
-@infoBorder: transparent;
-
-@alertBorderRadius: 0;
-
-// SD: Had to duplicate the above but prefix with 'form' inversed colors
-// because we cannot share the above alert colors with forms otherwise we end up with white
-// text and giant red backgrounds.
-
-// Form states
-// -------------------------
-@formWarningText: @warningBackground;
-@formWarningBackground: lighten(@warningBackground, 38%);
-@formWarningBorder: darken(spin(@warningBackground, -10), 3%);
-
-@formErrorText: @errorBackground;
-@formErrorBackground: @errorBackground;
-@formErrorBorder: @red;
-
-@formSuccessText: @successBackground;
-@formSuccessBackground: lighten(@successBackground, 48%);
-@formSuccessBorder: darken(spin(@successBackground, -10), 5%);
-
-@formInfoText: @infoBackground;
-@formInfoBackground: lighten(@infoBackground, 41%);
-@formInfoBorder: darken(spin(@infoBackground, -10), 7%);
-
-
-// Tooltips and popovers
-// -------------------------
-@tooltipColor: @white;
-@tooltipBackground: @black;
-@tooltipArrowWidth: 5px;
-@tooltipArrowColor: @tooltipBackground;
-
-@popoverBackground: @white;
-@popoverArrowWidth: 10px;
-@popoverArrowColor: @white;
-@popoverTitleBackground: darken(@popoverBackground, 3%);
-
-// Special enhancement for popovers
-@popoverArrowOuterWidth: (@popoverArrowWidth + 1);
-@popoverArrowOuterColor: @gray-7;
-
-
-
-// GRID
-// --------------------------------------------------
-
-
-// Default 940px grid
-// -------------------------
-@gridColumns: 12;
-@gridColumnWidth: 60px;
-@gridGutterWidth: 0;
-@gridRowWidth: ((@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)));
-
-// 1200px min
-@gridColumnWidth1200: 70px;
-@gridGutterWidth1200: 30px;
-@gridRowWidth1200: ((@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1)));
-
-// 768px-979px
-@gridColumnWidth768: 42px;
-@gridGutterWidth768: 20px;
-@gridRowWidth768: ((@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1)));
-
-
-// Fluid grid
-// -------------------------
-@fluidGridColumnWidth: percentage((@gridColumnWidth / @gridRowWidth));
-@fluidGridGutterWidth: percentage((@gridGutterWidth / @gridRowWidth));
-
-// 1200px min
-@fluidGridColumnWidth1200: percentage((@gridColumnWidth1200 / @gridRowWidth1200));
-@fluidGridGutterWidth1200: percentage((@gridGutterWidth1200 / @gridRowWidth1200));
-
-// 768px-979px
-@fluidGridColumnWidth768: percentage((@gridColumnWidth768 / @gridRowWidth768));
-@fluidGridGutterWidth768: percentage((@gridGutterWidth768 / @gridRowWidth768));
-
-// SORTABLE
-// --------------------------------------------------
-@sortableHelperBg: @turquoise-l2;
-@sortablePlaceholderBg : @turquoise;
diff --git a/src/Umbraco.Web.UI.Client/src/main.controller.js b/src/Umbraco.Web.UI.Client/src/main.controller.js
deleted file mode 100644
index 08d4322432..0000000000
--- a/src/Umbraco.Web.UI.Client/src/main.controller.js
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.MainController
- * @function
- *
- * @description
- * The main application controller
- *
- */
-function MainController($scope, $location, appState, treeService, notificationsService,
-    userService, historyService, updateChecker, navigationService, eventsService,
-    tmhDynamicLocale, localStorageService, editorService, overlayService, assetsService, tinyMceAssets) {
-
-    //the null is important because we do an explicit bool check on this in the view
-    $scope.authenticated = null;
-    $scope.touchDevice = appState.getGlobalState("touchDevice");
-    $scope.infiniteMode = false;
-    $scope.overlay = {};
-    $scope.drawer = {};
-    $scope.search = {};
-    $scope.login = {};
-    $scope.tabbingActive = false;
-
-    // Load TinyMCE assets ahead of time in the background for the user
-    // To help with first load of the RTE
-    tinyMceAssets.forEach(function (tinyJsAsset) {
-        assetsService.loadJs(tinyJsAsset, $scope);
-    });
-
-    // There are a number of ways to detect when a focus state should be shown when using the tab key and this seems to be the simplest solution.
-    // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2
-    function handleFirstTab(evt) {
-        if (evt.keyCode === 9) {
-            enableTabbingActive();
-        }
-    }
-
-    function enableTabbingActive() {
-        $scope.tabbingActive = true;
-        $scope.$digest();
-        window.addEventListener('mousedown', disableTabbingActive);
-        window.removeEventListener("keydown", handleFirstTab);
-    }
-
-    function disableTabbingActive(evt) {
-        $scope.tabbingActive = false;
-        $scope.$digest();
-        window.removeEventListener('mousedown', disableTabbingActive);
-        window.addEventListener("keydown", handleFirstTab);
-    }
-
-    window.addEventListener("keydown", handleFirstTab);
-
-    $scope.$on("showFocusOutline", function() {
-        $scope.tabbingActive = true;
-        window.addEventListener('mousedown', disableTabbingActive);
-        window.removeEventListener("keydown", handleFirstTab);
-    });
-
-
-    $scope.removeNotification = function (index) {
-        notificationsService.remove(index);
-    };
-
-    $scope.closeSearch = function() {
-        appState.setSearchState("show", false);
-    };
-
-    $scope.showLoginScreen = function (isTimedOut) {
-        $scope.login.pageTitle = $scope.$root.locationTitle;
-        $scope.login.isTimedOut = isTimedOut;
-        $scope.login.show = true;
-    };
-
-    $scope.hideLoginScreen = function () {
-        $scope.$root.locationTitle = $scope.login.pageTitle;
-        $scope.login.show = false;
-    };
-
-    var evts = [];
-
-    //when a user logs out or timesout
-    evts.push(eventsService.on("app.notAuthenticated", function (evt, data) {
-        $scope.authenticated = null;
-        $scope.user = null;
-        const isTimedOut = !!(data && data.isTimedOut);
-
-        $scope.showLoginScreen(isTimedOut);
-
-        // Remove the localstorage items for tours shown
-        // Means that when next logged in they can be re-shown if not already dismissed etc
-        localStorageService.remove("emailMarketingTourShown");
-        localStorageService.remove("introTourShown");
-    }));
-
-    evts.push(eventsService.on("app.userRefresh", function(evt) {
-        userService.refreshCurrentUser().then(function(data) {
-            $scope.user = data;
-
-            //Load locale file
-            if ($scope.user.locale) {
-                tmhDynamicLocale.set($scope.user.locale);
-            }
-        });
-    }));
-
-    //when the app is ready/user is logged in, setup the data
-    evts.push(eventsService.on("app.ready", function (evt, data) {
-
-        $scope.authenticated = data.authenticated;
-        $scope.user = data.user;
-
-        updateChecker.check().then(function (update) {
-            if (update && update !== "null") {
-                if (update.type !== "None") {
-                    var notification = {
-                        headline: "Update available",
-                        message: "Click to download",
-                        sticky: true,
-                        type: "info",
-                        url: update.url,
-                        target: "_blank"
-                    };
-                    notificationsService.add(notification);
-                }
-            }
-        });
-
-        //if the user has changed we need to redirect to the root so they don't try to continue editing the
-        //last item in the URL (NOTE: the user id can equal zero, so we cannot just do !data.lastUserId since that will resolve to true)
-        if (data.lastUserId !== undefined && data.lastUserId !== null && data.lastUserId !== data.user.id) {
-
-            var section = appState.getSectionState("currentSection");
-            if (section) {
-                //if there's a section already assigned, reload it so the tree is cleared
-                navigationService.reloadSection(section);
-            }
-
-            $location.path("/").search("");
-            historyService.removeAll();
-            treeService.clearCache();
-            editorService.closeAll();
-            overlayService.close();
-
-            //if the user changed, clearout local storage too - could contain sensitive data
-            localStorageService.clearAll();
-        }
-
-        //if this is a new login (i.e. the user entered credentials), then clear out local storage - could contain sensitive data
-        if (data.loginType === "credentials") {
-            localStorageService.clearAll();
-        }
-
-        //Load locale file
-        if ($scope.user.locale) {
-            tmhDynamicLocale.set($scope.user.locale);
-        }
-
-    }));
-
-    // events for search
-    evts.push(eventsService.on("appState.searchState.changed", function (e, args) {
-        if (args.key === "show") {
-            $scope.search.show = args.value;
-        }
-    }));
-
-    // events for drawer
-    // manage the help dialog by subscribing to the showHelp appState
-    evts.push(eventsService.on("appState.drawerState.changed", function (e, args) {
-        // set view
-        if (args.key === "view") {
-            $scope.drawer.view = args.value;
-        }
-        // set custom model
-        if (args.key === "model") {
-            $scope.drawer.model = args.value;
-        }
-        // show / hide drawer
-        if (args.key === "showDrawer") {
-            $scope.drawer.show = args.value;
-        }
-    }));
-
-    // events for overlays
-    evts.push(eventsService.on("appState.overlay", function (name, args) {
-        $scope.overlay = args;
-    }));
-
-    // events for tours
-    evts.push(eventsService.on("appState.tour.start", function (name, args) {
-        $scope.tour = args;
-        $scope.tour.show = true;
-    }));
-
-    evts.push(eventsService.on("appState.tour.end", function () {
-        $scope.tour = null;
-    }));
-
-    evts.push(eventsService.on("appState.tour.complete", function () {
-        $scope.tour = null;
-    }));
-
-    // events for backdrop
-    evts.push(eventsService.on("appState.backdrop", function (name, args) {
-        $scope.backdrop = args;
-    }));
-
-    // event for infinite editors
-    evts.push(eventsService.on("appState.editors.open", function (name, args) {
-        $scope.infiniteMode = args && args.editors.length > 0 ? true : false;
-    }));
-
-    evts.push(eventsService.on("appState.editors.close", function (name, args) {
-        $scope.infiniteMode = args && args.editors.length > 0 ? true : false;
-    }));
-
-    //ensure to unregister from all events!
-    $scope.$on('$destroy', function () {
-        for (var e in evts) {
-            eventsService.unsubscribe(evts[e]);
-        }
-    });
-
-}
-
-
-//register it
-angular.module('umbraco').controller("Umbraco.MainController", MainController).
-    config(function (tmhDynamicLocaleProvider) {
-        //Set url for locale files
-        tmhDynamicLocaleProvider.localeLocationPattern('lib/angular-i18n/angular-locale_{{locale | lowercase}}.js');
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/navigation.controller.js
deleted file mode 100644
index 11bea9b275..0000000000
--- a/src/Umbraco.Web.UI.Client/src/navigation.controller.js
+++ /dev/null
@@ -1,573 +0,0 @@
-
-/**
- * @ngdoc controller
- * @name Umbraco.NavigationController
- * @function
- *
- * @description
- * Handles the section area of the app
- *
- * @param {navigationService} navigationService A reference to the navigationService
- */
-function NavigationController($scope, $rootScope, $location, $log, $q, $routeParams, $timeout, $cookies, treeService, appState, navigationService, keyboardService, historyService, eventsService, angularHelper, languageResource, contentTypeResource, editorState) {
-
-    //this is used to trigger the tree to start loading once everything is ready
-    var treeInitPromise = $q.defer();
-
-    $scope.treeApi = {};
-
-    //Bind to the main tree events
-    $scope.onTreeInit = function () {
-
-        $scope.treeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
-
-        //when a tree is loaded into a section, we need to put it into appState
-        $scope.treeApi.callbacks.treeLoaded(function (args) {
-            appState.setTreeState("currentRootNode", args.tree);
-        });
-
-        //when a tree node is synced this event will fire, this allows us to set the currentNode
-        $scope.treeApi.callbacks.treeSynced(function (args) {
-
-            if (args.activate === undefined || args.activate === true) {
-                //set the current selected node
-                appState.setTreeState("selectedNode", args.node);
-                //when a node is activated, this is the same as clicking it and we need to set the
-                //current menu item to be this node as well.
-                //appState.setMenuState("currentNode", args.node);// Niels: No, we are setting it from the dialog.
-            }
-        });
-
-        //this reacts to the options item in the tree
-        $scope.treeApi.callbacks.treeOptionsClick(function (args) {
-            args.event.stopPropagation();
-            args.event.preventDefault();
-
-            //Set the current action node (this is not the same as the current selected node!)
-            //appState.setMenuState("currentNode", args.node);// Niels: No, we are setting it from the dialog.
-
-            if (args.event && args.event.altKey) {
-                args.skipDefault = true;
-            }
-
-            navigationService.showMenu(args);
-        });
-
-        $scope.treeApi.callbacks.treeNodeAltSelect(function (args) {
-            args.event.stopPropagation();
-            args.event.preventDefault();
-
-            args.skipDefault = true;
-            navigationService.showMenu(args);
-        });
-
-        //this reacts to tree items themselves being clicked
-        //the tree directive should not contain any handling, simply just bubble events
-        $scope.treeApi.callbacks.treeNodeSelect(function (args) {
-            var n = args.node;
-            args.event.stopPropagation();
-            args.event.preventDefault();
-
-            if (n.metaData && n.metaData["jsClickCallback"] && Utilities.isString(n.metaData["jsClickCallback"]) && n.metaData["jsClickCallback"] !== "") {
-                //this is a legacy tree node!
-                var jsPrefix = "javascript:";
-                var js;
-                if (n.metaData["jsClickCallback"].startsWith(jsPrefix)) {
-                    js = n.metaData["jsClickCallback"].substr(jsPrefix.length);
-                }
-                else {
-                    js = n.metaData["jsClickCallback"];
-                }
-                try {
-                    var func = eval(js);
-                    //this is normally not necessary since the eval above should execute the method and will return nothing.
-                    if (func != null && (typeof func === "function")) {
-                        func.call();
-                    }
-                }
-                catch (ex) {
-                    $log.error("Error evaluating js callback from legacy tree node: " + ex);
-                }
-            }
-            else if (n.routePath) {
-                //add action to the history service
-                historyService.add({ name: n.name, link: n.routePath, icon: n.icon });
-
-                //put this node into the tree state
-                appState.setTreeState("selectedNode", args.node);
-                //when a node is clicked we also need to set the active menu node to this node
-                //appState.setMenuState("currentNode", args.node);
-
-                //not legacy, lets just set the route value and clear the query string if there is one.
-                $location.path(n.routePath);
-                navigationService.clearSearch();
-            }
-            else if (n.section) {
-                $location.path(n.section);
-                navigationService.clearSearch();
-            }
-
-            navigationService.hideNavigation();
-        });
-
-        return treeInitPromise.promise;
-    }
-
-    //set up our scope vars
-    $scope.showContextMenuDialog = false;
-    $scope.showContextMenu = false;
-    $scope.showSearchResults = false;
-    $scope.menuDialogTitle = null;
-    $scope.menuActions = [];
-    $scope.menuNode = null;
-    $scope.languages = [];
-    $scope.selectedLanguage = {};
-    $scope.page = {};
-    $scope.page.languageSelectorIsOpen = false;
-
-    $scope.currentSection = null;
-    $scope.customTreeParams = null;
-    $scope.treeCacheKey = "_";
-    $scope.showNavigation = appState.getGlobalState("showNavigation");
-    // tracks all expanded paths so when the language is switched we can resync it with the already loaded paths
-    var expandedPaths = [];
-
-    //trigger search with a hotkey:
-    keyboardService.bind("ctrl+shift+s", function () {
-        navigationService.showSearch();
-    });
-
-    //// TODO: remove this it's not a thing
-    //$scope.selectedId = navigationService.currentId;
-
-    var isInit = false;
-    var evts = [];
-
-    //Listen for global state changes
-    evts.push(eventsService.on("appState.globalState.changed", function (e, args) {
-        if (args.key === "showNavigation") {
-            $scope.showNavigation = args.value;
-        }
-    }));
-
-    //Listen for menu state changes
-    evts.push(eventsService.on("appState.menuState.changed", function (e, args) {
-        if (args.key === "showMenuDialog") {
-            $scope.showContextMenuDialog = args.value;
-        }
-        if (args.key === "dialogTemplateUrl") {
-            $scope.dialogTemplateUrl = args.value;
-        }
-        if (args.key === "showMenu") {
-            $scope.showContextMenu = args.value;
-        }
-        if (args.key === "dialogTitle") {
-            $scope.menuDialogTitle = args.value;
-        }
-        if (args.key === "menuActions") {
-            $scope.menuActions = args.value;
-        }
-        if (args.key === "currentNode") {
-            $scope.menuNode = args.value;
-        }
-    }));
-
-    //Listen for tree state changes
-    evts.push(eventsService.on("appState.treeState.changed", function (e, args) {
-        if (args.key === "currentRootNode") {
-
-            //if the changed state is the currentRootNode, determine if this is a full screen app
-            if (args.value.root && args.value.root.containsTrees === false) {
-                $rootScope.emptySection = true;
-            }
-            else {
-                $rootScope.emptySection = false;
-            }
-        }
-
-    }));
-
-    //Listen for section state changes
-    evts.push(eventsService.on("appState.sectionState.changed", function (e, args) {
-
-        //section changed
-        if (args.key === "currentSection" && $scope.currentSection != args.value) {
-            //before loading the main tree we need to ensure that the nav is ready
-            navigationService.waitForNavReady().then(() => {
-                $scope.currentSection = args.value;
-                //load the tree
-                configureTreeAndLanguages();
-                $scope.treeApi.load({ section: $scope.currentSection, customTreeParams: $scope.customTreeParams, cacheKey: $scope.treeCacheKey });
-            });
-        }
-
-        //show/hide search results
-        if (args.key === "showSearchResults") {
-            $scope.showSearchResults = args.value;
-        }
-
-    }));
-
-    // Listen for language updates
-    evts.push(eventsService.on("editors.languages.languageDeleted", function (e, args) {
-        loadLanguages().then(function (languages) {
-            $scope.languages = languages;
-            const defaultCulture = $scope.languages[0].culture;
-
-            if (args.language.culture === $scope.selectedLanguage.culture) {
-                $scope.selectedLanguage = defaultCulture;
-
-                if ($scope.languages.length > 1) {
-                    $location.search("mculture", defaultCulture);
-                } else {
-                    $location.search("mculture", null);
-                }
-
-                var currentEditorState = editorState.getCurrent();
-                if (currentEditorState && currentEditorState.path) {
-                    $scope.treeApi.syncTree({ path: currentEditorState.path, activate: true });
-                }
-            }
-        });
-    }));
-
-    //Emitted when a language is created or an existing one saved/edited
-    evts.push(eventsService.on("editors.languages.languageSaved", function (e, args) {
-        if (args.isNew) {
-            //A new language has been created - reload languages for tree
-            loadLanguages().then(function (languages) {
-                $scope.languages = languages;
-            });
-        }
-        else if (args.language.isDefault) {
-            //A language was saved and was set to be the new default (refresh the tree, so its at the top)
-            loadLanguages().then(function (languages) {
-                $scope.languages = languages;
-            });
-        }
-    }));
-
-    //when a user logs out or timesout
-    evts.push(eventsService.on("app.notAuthenticated", function () {
-        $scope.authenticated = false;
-    }));
-
-    //when the application is ready and the user is authorized, setup the data
-    //this will occur anytime a new user logs in!
-    evts.push(eventsService.on("app.ready", function (evt, data) {
-        $scope.authenticated = true;
-        ensureInit();
-        ensureMainCulture();
-    }));
-
-    // event for infinite editors
-    evts.push(eventsService.on("appState.editors.open", function (name, args) {
-        $scope.infiniteMode = args && args.editors.length > 0 ? true : false;
-    }));
-
-    evts.push(eventsService.on("appState.editors.close", function (name, args) {
-        $scope.infiniteMode = args && args.editors.length > 0 ? true : false;
-    }));
-
-    evts.push(eventsService.on("treeService.removeNode", function (e, args) {
-        //check to see if the current page has been removed
-
-        var currentEditorState = editorState.getCurrent();
-        if (currentEditorState && currentEditorState.id.toString() === args.node.id.toString()) {
-            //current page is loaded, so navigate to root
-            var section = appState.getSectionState("currentSection");
-            $location.path("/" + section);
-        }
-    }));
-
-    /**
-     * For multi language sites, this ensures that mculture is set to either the last selected language or the default one
-     */
-    function ensureMainCulture() {
-        if ($location.search().mculture) {
-            return;
-        }
-        var language = lastLanguageOrDefault();
-        if (!language) {
-            return;
-        }
-        // trigger a language selection in the next digest cycle
-        $timeout(function () {
-            $scope.selectLanguage(language);
-        });
-    }
-
-    /**
-     * Based on the current state of the application, this configures the scope variables that control the main tree and language drop down
-     */
-    function configureTreeAndLanguages() {
-
-        //create the custom query string param for this tree, this is currently only relevant for content
-        if ($scope.currentSection === "content") {
-
-            //must use $location here because $routeParams isn't available until after the route change
-            var mainCulture = $location.search().mculture;
-            //select the current language if set in the query string
-            if (mainCulture && $scope.languages && $scope.languages.length > 1) {
-                var found = _.find($scope.languages, function (l) {
-                    if (mainCulture === true) {
-                        return false;
-                    }
-                    return l.culture.toLowerCase() === mainCulture.toLowerCase();
-                });
-                if (found) {
-                    //set the route param
-                    found.active = true;
-                    $scope.selectedLanguage = found;
-                }
-            }
-
-            var queryParams = {};
-            if ($scope.selectedLanguage && $scope.selectedLanguage.culture) {
-                queryParams["culture"] = $scope.selectedLanguage.culture;
-                if (!mainCulture) {
-                    $location.search("mculture", $scope.selectedLanguage.culture);
-                }
-            }
-            var queryString = $.param(queryParams); //create the query string from the params object
-        }
-
-        if (queryString) {
-            $scope.customTreeParams = queryString;
-            $scope.treeCacheKey = queryString; // this tree uses caching but we need to change it's cache key per lang
-        }
-        else {
-            $scope.treeCacheKey = "_"; // this tree uses caching, there's no lang selected so use the default
-        }
-
-    }
-
-    /**
-     * Called when the app is ready and sets up the navigation (should only be called once)
-     */
-    function ensureInit() {
-
-        //only run once ever!
-        if (isInit) {
-            return;
-        }
-
-        isInit = true;
-
-        var navInit = false;
-
-        //$routeParams will be populated after $routeChangeSuccess since this controller is used outside ng-view,
-        //* we listen for the first route change with a section to setup the navigation.
-        //* we listen for all route changes to track the current section.
-        $rootScope.$on('$routeChangeSuccess', function () {
-
-            //only continue if there's a section available
-            if ($routeParams.section) {
-
-                if (!navInit) {
-                    navInit = true;
-                    initNav();
-                }
-
-                //keep track of the current section when it changes
-                if ($scope.currentSection != $routeParams.section) {
-                    appState.setSectionState("currentSection", $routeParams.section);
-                }
-
-            }
-        });
-    }
-
-    /**
-     * This loads the language data, if the are no variant content types configured this will return no languages
-     */
-    function loadLanguages() {
-
-        return contentTypeResource.allowsCultureVariation().then(function (b) {
-            if (b === true) {
-                return languageResource.getAll();
-            } else {
-                return $q.when([]); //resolve an empty collection
-            }
-        });
-    }
-
-    /**
-     * Called once during init to initialize the navigation/tree/languages
-     */
-    function initNav() {
-        // load languages
-        loadLanguages().then(function (languages) {
-
-            $scope.languages = languages;
-
-            if ($scope.languages.length > 1) {
-                //if there's already one set, check if it exists
-                var language = null;
-                var mainCulture = $location.search().mculture;
-                if (mainCulture) {
-                    language = _.find($scope.languages, function (l) {
-                        return l.culture.toLowerCase() === mainCulture.toLowerCase();
-                    });
-                }
-                if (!language) {
-                    language = lastLanguageOrDefault();
-
-                    if (language) {
-                        $location.search("mculture", language.culture);
-                    }
-                }
-            }
-
-            $scope.currentSection = $routeParams.section;
-
-            configureTreeAndLanguages();
-
-            //resolve the tree promise, set it's property values for loading the tree which will make the tree load
-            treeInitPromise.resolve({
-                section: $scope.currentSection,
-                customTreeParams: $scope.customTreeParams,
-                cacheKey: $scope.treeCacheKey,
-
-                //because angular doesn't return a promise for the resolve method, we need to resort to some hackery, else
-                //like normal JS promises we could do resolve(...).then()
-                onLoaded: function () {
-
-                    //the nav is ready, let the app know
-                    eventsService.emit("app.navigationReady", { treeApi: $scope.treeApi });
-
-                }
-            });
-        });
-    }
-
-    function lastLanguageOrDefault() {
-        if (!$scope.languages || $scope.languages.length <= 1) {
-            return null;
-        }
-        // see if we can find a culture in the cookie set when changing language
-        var lastCulture = $cookies.get("UMB_MCULTURE");
-        var language = lastCulture ? _.find($scope.languages, function (l) {
-            return l.culture.toLowerCase() === lastCulture.toLowerCase();
-        }) : null;
-        if (!language) {
-            // no luck, look for the default language
-            language = _.find($scope.languages, function (l) {
-                return l.isDefault;
-            });
-        }
-        return language;
-    }
-
-    function nodeExpandedHandler(args) {
-        //store the reference to the expanded node path
-        if (args.node) {
-            treeService._trackExpandedPaths(args.node, expandedPaths);
-        }
-    }
-
-    $scope.selectLanguage = function (language) {
-
-        $location.search("mculture", language.culture);
-        // add the selected culture to a cookie so the user will log back into the same culture later on (cookie lifetime = one year)
-        var expireDate = new Date();
-        expireDate.setDate(expireDate.getDate() + 365);
-        $cookies.put("UMB_MCULTURE", language.culture, { path: "/", expires: expireDate });
-
-        // close the language selector
-        $scope.page.languageSelectorIsOpen = false;
-
-        configureTreeAndLanguages(); //re-bind language to the query string and update the tree params
-
-        //reload the tree with it's updated querystring args
-        $scope.treeApi.load({ section: $scope.currentSection, customTreeParams: $scope.customTreeParams, cacheKey: $scope.treeCacheKey }).then(function () {
-
-            //re-sync to currently edited node
-            var currNode = appState.getTreeState("selectedNode");
-            //create the list of promises
-            var promises = [];
-            //starting with syncing to the currently selected node if there is one
-            if (currNode) {
-                var path = treeService.getPath(currNode);
-                promises.push($scope.treeApi.syncTree({ path: path, activate: true }));
-            }
-            // TODO: If we want to keep all paths expanded ... but we need more testing since we need to deal with unexpanding
-            //for (var i = 0; i < expandedPaths.length; i++) {
-            //    promises.push($scope.treeApi.syncTree({ path: expandedPaths[i], activate: false, forceReload: true }));
-            //}
-            //execute them sequentially
-
-            // set selected language to active
-            Utilities.forEach($scope.languages, language => {
-                language.active = false;
-            });
-
-            language.active = true;
-
-            angularHelper.executeSequentialPromises(promises);
-        });
-
-    };
-
-    //this reacts to the options item in the tree
-    // TODO: migrate to nav service
-    // TODO: is this used?
-    $scope.searchShowMenu = function (ev, args) {
-        //always skip default
-        args.skipDefault = true;
-        navigationService.showMenu(args);
-    };
-
-    // TODO: migrate to nav service
-    // TODO: is this used?
-    $scope.searchHide = function () {
-        navigationService.hideSearch();
-    };
-
-    //the below assists with hiding/showing the tree
-    var treeActive = false;
-
-    //Sets a service variable as soon as the user hovers the navigation with the mouse
-    //used by the leaveTree method to delay hiding
-    $scope.enterTree = function (event) {
-        treeActive = true;
-    };
-
-    // Hides navigation tree, with a short delay, is cancelled if the user moves the mouse over the tree again
-    $scope.leaveTree = function (event) {
-        //this is a hack to handle IE touch events which freaks out due to no mouse events so the tree instantly shuts down
-        if (!event) {
-            return;
-        }
-        closeTree();
-    };
-
-    $scope.onOutsideClick = function () {
-        closeTree();
-    };
-
-    function closeTree() {
-        if (!appState.getGlobalState("touchDevice")) {
-            treeActive = false;
-            $timeout(function () {
-                if (!treeActive) {
-                    navigationService.hideTree();
-                }
-            }, 300);
-        }
-    }
-
-    $scope.toggleLanguageSelector = function () {
-        $scope.page.languageSelectorIsOpen = !$scope.page.languageSelectorIsOpen;
-    };
-
-    //ensure to unregister from all events!
-    $scope.$on('$destroy', function () {
-        for (var e in evts) {
-            eventsService.unsubscribe(evts[e]);
-        }
-    });
-}
-
-//register it
-angular.module('umbraco').controller("Umbraco.NavigationController", NavigationController);
diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
deleted file mode 100644
index d16d9b5b4d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ /dev/null
@@ -1,545 +0,0 @@
-
-/*********************************************************************************************************/
-/* Preview app and controller */
-/*********************************************************************************************************/
-
-var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.services'])
-
-  .controller("previewController", function ($scope, $window, $location, $http) {
-
-    $scope.currentCulture = { iso: '', title: '...', icon: 'icon-loading' }
-    var cultures = [];
-
-    $scope.tabbingActive = false;
-    // There are a number of ways to detect when a focus state should be shown when using the tab key and this seems to be the simplest solution.
-    // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2
-    function handleFirstTab(evt) {
-      if (evt.keyCode === 9) {
-        $scope.tabbingActive = true;
-        $scope.$digest();
-        window.removeEventListener('keydown', handleFirstTab);
-        window.addEventListener('mousedown', disableTabbingActive);
-      }
-    }
-
-    function disableTabbingActive(evt) {
-      $scope.tabbingActive = false;
-      $scope.$digest();
-      window.removeEventListener('mousedown', disableTabbingActive);
-      window.addEventListener("keydown", handleFirstTab);
-    }
-
-    var iframeWrapper = angular.element("#demo-iframe-wrapper");
-    var canvasDesignerPanel = angular.element("#canvasdesignerPanel");
-
-    window.addEventListener("keydown", handleFirstTab);
-    window.addEventListener("resize", scaleIframeWrapper);
-    iframeWrapper.on("transitionend", scaleIframeWrapper);
-
-    function scaleIframeWrapper() {
-      if ($scope.previewDevice.name == "fullsize") { // dont scale fullsize preview
-        iframeWrapper.css({ "transform": "" });
-      }
-      else {
-        var wrapWidth = canvasDesignerPanel.width(); // width of the wrapper
-        var wrapHeight = canvasDesignerPanel.height();
-        var childWidth = iframeWrapper.width() + 30; // width of child iframe plus some space
-        var childHeight = iframeWrapper.height() + 30; // child height plus some space
-        var wScale = wrapWidth / childWidth;
-        var hScale = wrapHeight / childHeight;
-        var scale = Math.min(wScale, hScale, 1);  // get the lowest ratio, but not higher than 1
-        iframeWrapper.css({ "transform": "scale(" + scale + ")" });  // set scale
-      }
-    }
-
-
-    //gets a real query string value
-    function getParameterByName(name, url) {
-      if (!url) url = $window.location.href;
-      name = name.replace(/[\[\]]/g, '\\$&');
-      var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
-        results = regex.exec(url);
-      if (!results) return null;
-      if (!results[2]) return '';
-      return decodeURIComponent(results[2].replace(/\+/g, ' '));
-    }
-
-    function configureSignalR(iframe) {
-
-      const reloadIframe = () => {
-        console.log("Reloading.");
-        var iframeDoc = (iframe.contentWindow || iframe.contentDocument);
-        if (iframeDoc) {
-          iframeDoc.location.reload();
-        } else {
-          console.error('could not reload iframe');
-        }
-      }
-
-      // visibility tracking
-      var dirtyContent = false;
-      var visibleContent = true;
-
-      document.addEventListener('visibilitychange', function () {
-        visibleContent = !document.hidden;
-        if (visibleContent && dirtyContent) {
-          dirtyContent = false;
-          reloadIframe();
-        }
-      });
-
-      // signalr hub
-      // If connection already exists and is connected just return
-      // otherwise we'll have multiple connections
-      if ($.connection && $.connection.connectionState === signalR.HubConnectionState.Connected) return;
-
-      $.connection = new signalR.HubConnectionBuilder()
-        .withUrl(Umbraco.Sys.ServerVariables.umbracoUrls.previewHubUrl)
-        .withAutomaticReconnect()
-        .configureLogging(signalR.LogLevel.Warning)
-        .build();
-
-      $.connection.on("refreshed", function (message) {
-        console.log("Notified by SignalR preview hub (" + message + ").");
-        if ($scope.pageId != message) {
-          console.log("Not a notification for us (" + $scope.pageId + ").");
-          return;
-        }
-        if (!visibleContent) {
-          console.log("Not visible, will reload.");
-          dirtyContent = true;
-          return;
-        }
-        reloadIframe();
-      })
-
-      try {
-        $.connection.start().then(function () {
-          console.log("Connected to SignalR preview hub (ID=" + $.connection.connectionId + ")");
-        }).catch(function () {
-          console.log("Could not connect to SignalR preview hub.");
-        });
-      } catch (e) {
-        console.error("Could not establish signalr connection. Error: " + e);
-      }
-    }
-
-    function fixExternalLinks(iframe) {
-      // Make sure external links don't open inside the iframe
-      Array.from(iframe.contentDocument.getElementsByTagName("a"))
-        .filter(a => a.hostname !== location.hostname && !a.target)
-        .forEach(a => a.target = "_top");
-    }
-
-    var isInit = getParameterByName("init");
-    if (isInit === "true") {
-      //do not continue, this is the first load of this new window, if this is passed in it means it's been
-      //initialized by the content editor and then the content editor will actually re-load this window without
-      //this flag. This is a required trick to get around chrome popup mgr.
-      return;
-    }
-
-    setPageUrl();
-
-    $scope.isOpen = false;
-    $scope.frameLoaded = false;
-
-    $scope.valueAreLoaded = false;
-    $scope.devices = [
-      { name: "fullsize", css: "fullsize", icon: "icon-application-window-alt", title: "Fit browser" },
-      { name: "desktop", css: "desktop shadow", icon: "icon-display", title: "Desktop" },
-      { name: "laptop - 1366px", css: "laptop shadow", icon: "icon-laptop", title: "Laptop" },
-      { name: "iPad portrait - 768px", css: "iPad-portrait shadow", icon: "icon-ipad", title: "Tablet portrait" },
-      { name: "iPad landscape - 1024px", css: "iPad-landscape shadow", icon: "icon-ipad flip", title: "Tablet landscape" },
-      { name: "smartphone portrait - 480px", css: "smartphone-portrait shadow", icon: "icon-iphone", title: "Smartphone portrait" },
-      { name: "smartphone landscape  - 320px", css: "smartphone-landscape shadow", icon: "icon-iphone flip", title: "Smartphone landscape" }
-    ];
-    $scope.previewDevice = $scope.devices[0];
-
-    $scope.sizeOpen = false;
-    $scope.cultureOpen = false;
-
-    $scope.toggleSizeOpen = function () {
-      $scope.sizeOpen = toggleMenu($scope.sizeOpen);
-    }
-    $scope.toggleCultureOpen = function () {
-      $scope.cultureOpen = toggleMenu($scope.cultureOpen);
-    }
-
-    function toggleMenu(isCurrentlyOpen) {
-      if (isCurrentlyOpen === false) {
-        closeOthers();
-        return true;
-      } else {
-        return false;
-      }
-    }
-    function closeOthers() {
-      $scope.sizeOpen = false;
-      $scope.cultureOpen = false;
-    }
-
-    $scope.windowClickHandler = function () {
-      closeOthers();
-    }
-
-    function windowBlurHandler() {
-      closeOthers();
-      $scope.$digest();
-    }
-    window.addEventListener("blur", windowBlurHandler);
-
-    function windowVisibilityHandler(e) {
-
-      var amountOfPreviewSessions = localStorage.getItem('UmbPreviewSessionAmount');
-
-      // When tab is visible again:
-      if (document.hidden === false) {
-        checkPreviewState();
-      }
-    }
-    document.addEventListener("visibilitychange", windowVisibilityHandler);
-
-    function beforeUnloadHandler(e) {
-      endPreviewSession();
-    }
-    window.addEventListener("beforeunload", beforeUnloadHandler, false);
-
-    $scope.$on("$destroy", function () {
-      window.removeEventListener("blur", windowBlurHandler);
-      document.removeEventListener("visibilitychange", windowVisibilityHandler);
-      window.removeEventListener("beforeunload", beforeUnloadHandler);
-    });
-
-
-    function setPageUrl() {
-      $scope.pageId = $location.search().id || getParameterByName("id");
-      var culture = $location.search().culture || getParameterByName("culture");
-
-      if ($scope.pageId) {
-        var query = 'id=' + $scope.pageId;
-        if (culture) {
-          query += "&culture=" + culture;
-        }
-        $scope.pageUrl = "frame?" + query;
-      }
-    }
-    function getCookie(cname) {
-      var name = cname + "=";
-      var ca = document.cookie.split(";");
-      for (var i = 0; i < ca.length; i++) {
-        var c = ca[i];
-        while (c.charAt(0) == " ") {
-          c = c.substring(1);
-        }
-        if (c.indexOf(name) == 0) {
-          return c.substring(name.length, c.length);
-        }
-      }
-      return null;
-    }
-    function setCookie(cname, cvalue, exminutes) {
-      var d = new Date();
-      d.setTime(d.getTime() + (exminutes * 60 * 1000));
-      document.cookie = cname + "=" + cvalue + ";expires=" + d.toUTCString() + ";path=/";
-    }
-    var hasPreviewDialog = false;
-    function checkPreviewState() {
-      if (getCookie("UMB_PREVIEW") === null) {
-
-        if (hasPreviewDialog === true) return;
-        hasPreviewDialog = true;
-
-        // Ask to re-enter preview mode?
-
-        const localizeVarsFallback = {
-          "returnToPreviewHeadline": "Preview website?",
-          "returnToPreviewDescription": "You have ended preview mode, do you want to enable it again to view the latest saved version of your website?",
-          "returnToPreviewAcceptButton": "Preview latest version",
-          "returnToPreviewDeclineButton": "View published version"
-        };
-        const umbLocalizedVars = Object.assign(localizeVarsFallback, $window.umbLocalizedVars);
-
-
-        // This modal is also used in websitepreview.js
-        var modelStyles = `
-
-                    /* Webfont: LatoLatin-Bold */
-                    @font-face {
-                        font-family: 'Lato';
-                        src: url('https://fonts.googleapis.com/css2?family=Lato:wght@700&display=swap');
-                        font-style: normal;
-                        font-weight: 700;
-                        font-display: swap;
-                        text-rendering: optimizeLegibility;
-                    }
-
-                    .umbraco-preview-dialog {
-                        position: fixed;
-                        display: flex;
-                        align-items: center;
-                        justify-content: center;
-                        z-index: 99999999;
-                        top:0;
-                        bottom:0;
-                        left:0;
-                        right:0;
-                        overflow: auto;
-                        background-color: rgba(0,0,0,0.6);
-                    }
-
-                    .umbraco-preview-dialog__modal {
-                        background-color: #fff;
-                        border-radius: 6px;
-                        box-shadow: 0 3px 7px rgba(0,0,0,0.3);
-                        margin: auto;
-                        padding: 30px 40px;
-                        width: 100%;
-                        max-width: 540px;
-                        font-family: Lato,Helvetica Neue,Helvetica,Arial,sans-serif;
-                        font-size: 15px;
-                    }
-
-                    .umbraco-preview-dialog__headline {
-                        font-weight: 700;
-                        font-size: 22px;
-                        color: #1b264f;
-                        margin-top:10px;
-                        margin-bottom:20px;
-                    }
-                    .umbraco-preview-dialog__question {
-                        margin-bottom:30px;
-                    }
-                    .umbraco-preview-dialog__modal > button {
-                        display: inline-block;
-                        cursor: pointer;
-                        padding: 8px 18px;
-                        text-align: center;
-                        vertical-align: middle;
-                        border-radius: 3px;
-                        border:none;
-                        font-family: inherit;
-                        font-weight: 700;
-                        font-size: 15px;
-                        float:right;
-                        margin-left:10px;
-
-                        color: #1b264f;
-                        background-color: #f6f1ef;
-                    }
-                    .umbraco-preview-dialog__modal > button:hover {
-                        color: #2152a3;
-                        background-color: #f6f1ef;
-                    }
-                    .umbraco-preview-dialog__modal > button.umbraco-preview-dialog__continue {
-                        color: #fff;
-                        background-color: #2bc37c;
-                    }
-                    .umbraco-preview-dialog__modal > button.umbraco-preview-dialog__continue:hover {
-                        background-color: #39d38b;
-                    }
-                `;
-
-        var bodyEl = document.getElementsByTagName("BODY")[0];
-
-        var fragment = document.createElement("div");
-        var shadowRoot = fragment.attachShadow({ mode: 'open' });
-
-        var style = document.createElement("style");
-        style.innerHTML = modelStyles;
-        shadowRoot.appendChild(style);
-
-        var con = document.createElement("div");
-        con.className = "umbraco-preview-dialog";
-        shadowRoot.appendChild(con);
-
-        var modal = document.createElement("div");
-        modal.className = "umbraco-preview-dialog__modal";
-        modal.innerHTML = `<div class="umbraco-preview-dialog__headline">${umbLocalizedVars.returnToPreviewHeadline}</div>
-                    <div class="umbraco-preview-dialog__question">${umbLocalizedVars.returnToPreviewDescription}</div>`;
-        con.appendChild(modal);
-
-        var declineButton = document.createElement("button");
-        declineButton.type = "button";
-        declineButton.innerHTML = umbLocalizedVars.returnToPreviewDeclineButton;
-        declineButton.addEventListener("click", () => {
-          bodyEl.removeChild(fragment);
-          $scope.exitPreview();
-          hasPreviewDialog = false;
-        });
-        modal.appendChild(declineButton);
-
-        var continueButton = document.createElement("button");
-        continueButton.type = "button";
-        continueButton.className = "umbraco-preview-dialog__continue";
-        continueButton.innerHTML = umbLocalizedVars.returnToPreviewAcceptButton;
-        continueButton.addEventListener("click", () => {
-          bodyEl.removeChild(fragment);
-          reenterPreviewMode();
-          hasPreviewDialog = false;
-        });
-        modal.appendChild(continueButton);
-
-        bodyEl.appendChild(fragment);
-        continueButton.focus();
-
-      }
-    }
-    function reenterPreviewMode() {
-      //Re-enter Preview Mode
-      $http({
-        method: 'POST',
-        url: '../preview/enterPreview',
-        params: {
-          id: $scope.pageId
-        }
-      })
-      startPreviewSession();
-    }
-    function getPageURL() {
-      var culture = $location.search().culture || getParameterByName("culture");
-      var relativeUrl = "/" + $scope.pageId;
-      if (culture) {
-        relativeUrl += '?culture=' + culture;
-      }
-      return relativeUrl;
-    }
-
-    function startPreviewSession() {
-      // lets registrer this preview session.
-      var amountOfPreviewSessions = Math.max(localStorage.getItem('UmbPreviewSessionAmount') || 0, 0);
-      amountOfPreviewSessions++;
-      localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
-    }
-    function resetPreviewSessions() {
-      localStorage.setItem('UmbPreviewSessionAmount', 0);
-    }
-    function endPreviewSession() {
-      var amountOfPreviewSessions = localStorage.getItem('UmbPreviewSessionAmount') || 0;
-      amountOfPreviewSessions--;
-      localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
-
-      if (amountOfPreviewSessions <= 0) {
-        // We are good to end preview mode.
-        navigator.sendBeacon("../preview/end");
-      }
-    }
-    startPreviewSession();
-
-    /*****************************************************************************/
-    /* Preview devices */
-    /*****************************************************************************/
-
-    // Set preview device
-    $scope.updatePreviewDevice = function (device) {
-      $scope.previewDevice = device;
-    };
-
-    /*****************************************************************************/
-    /* Open website in preview mode */
-    /*****************************************************************************/
-
-    $scope.openInBrowser = function () {
-      setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", 5);
-      window.open(getPageURL(), "_blank");
-    };
-
-    /*****************************************************************************/
-    /* Exit Preview */
-    /*****************************************************************************/
-
-    $scope.exitPreview = function () {
-      resetPreviewSessions();
-      window.top.location.href = "../preview/end?redir=" + encodeURIComponent(getPageURL());
-    };
-
-    $scope.onFrameLoaded = function (iframe) {
-
-      iframe.title = "Page preview";
-      $scope.frameLoaded = true;
-      configureSignalR(iframe);
-      fixExternalLinks(iframe);
-
-      $scope.currentCultureIso = $location.search().culture || null;
-    };
-
-    /*****************************************************************************/
-    /* Panel management */
-    /*****************************************************************************/
-
-    $scope.openPreviewDevice = function () {
-      $scope.showDevicesPreview = true;
-    };
-
-    /*****************************************************************************/
-    /* Change culture */
-    /*****************************************************************************/
-    $scope.changeCulture = function (iso) {
-      if ($location.search().culture !== iso) {
-        $scope.frameLoaded = false;
-        $scope.currentCultureIso = iso;
-        $location.search("culture", iso);
-        setPageUrl();
-      }
-    };
-    $scope.registerCulture = function (iso, title, isDefault) {
-      var cultureObject = { iso: iso, title: title, isDefault: isDefault };
-      cultures.push(cultureObject);
-    }
-
-    $scope.$watch("currentCultureIso", function (oldIso, newIso) {
-      // if no culture is selected, we will pick the default one:
-      if ($scope.currentCultureIso === null) {
-        $scope.currentCulture = cultures.find(function (culture) {
-          return culture.isDefault === true;
-        })
-        return;
-      }
-      $scope.currentCulture = cultures.find(function (culture) {
-        return culture.iso === $scope.currentCultureIso;
-      })
-    });
-
-  })
-
-
-  .component('previewIFrame', {
-    template: "<div style='width:100%;height:100%;margin:0 auto;overflow:hidden;'><iframe id='resultFrame' src='about:blank' ng-src=\"{{vm.src}}\" frameborder='0'></iframe></div>",
-    controller: function ($element, $scope, angularHelper) {
-
-      var vm = this;
-
-      vm.$postLink = function () {
-        var resultFrame = $element.find("#resultFrame").get(0);
-        resultFrame.addEventListener("load", iframeReady);
-      };
-
-      function iframeReady() {
-        var iframe = $element.find("#resultFrame").get(0);
-        hideUmbracoPreviewBadge(iframe);
-        angularHelper.safeApply($scope, function () {
-          vm.onLoaded({ iframe: iframe });
-          $scope.frameLoaded = true;
-        });
-      }
-
-      function hideUmbracoPreviewBadge(iframe) {
-        if (iframe && iframe.contentDocument && iframe.contentDocument.getElementById("umbracoPreviewBadge")) {
-          iframe.contentDocument.getElementById("umbracoPreviewBadge").style.display = "none";
-        }
-      };
-
-
-    },
-    controllerAs: "vm",
-    bindings: {
-      src: "<",
-      onLoaded: "&"
-    }
-
-  })
-
-  .config(function ($locationProvider) {
-    $locationProvider.html5Mode(false); //turn html5 mode off
-    $locationProvider.hashPrefix('');
-  });
diff --git a/src/Umbraco.Web.UI.Client/src/routes.js b/src/Umbraco.Web.UI.Client/src/routes.js
deleted file mode 100644
index c86c4ababc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/routes.js
+++ /dev/null
@@ -1,202 +0,0 @@
-window.app.config(function ($routeProvider) {
-
-    /**
-     * This determines if the route can continue depending on authentication and initialization requirements
-     * @param {boolean} authRequired If true, it checks if the user is authenticated and will resolve successfully
-        otherwise the route will fail and the $routeChangeError event will execute, in that handler we will redirect to the rejected
-        path that is resolved from this method and prevent default (prevent the route from executing)
-     * @returns {promise}
-     */
-    var canRoute = function(authRequired) {
-
-        return {
-            /** Checks that the user is authenticated, then ensures that are requires assets are loaded */
-            isAuthenticatedAndReady: function ($q, userService, $route, assetsService, appState) {
-
-                //don't need to check if we've redirected to login and we've already checked auth
-                if (!$route.current.params.section
-                    && ($route.current.params.check === false || $route.current.params.check === "false")) {
-                    return $q.when(true);
-                }
-
-                return userService.isAuthenticated()
-                    .then(function () {
-
-                        //before proceeding all initial assets must be loaded
-                        return assetsService._loadInitAssets().then(function () {
-
-                            //This could be the first time has loaded after the user has logged in, in this case
-                            // we need to broadcast the authenticated event - this will be handled by the startup (init)
-                            // handler to set/broadcast the ready state
-                            var broadcast = appState.getGlobalState("isReady") !== true;
-
-                            return userService.getCurrentUser({ broadcastEvent: broadcast }).then(function (user) {
-                                //is auth, check if we allow or reject
-                                if (authRequired) {
-
-                                    //This checks the current section and will force a redirect to 'content' as the default
-                                    if ($route.current.params.section.toLowerCase() === "default" || $route.current.params.section.toLowerCase() === "umbraco" || $route.current.params.section === "") {
-                                        $route.current.params.section = "content";
-                                    }
-
-                                    var found = _.find(user.allowedSections, function (s) {
-                                        return s.localeCompare($route.current.params.section, undefined, { sensitivity: 'accent' }) === 0;
-                                    })
-
-                                    // U4-5430, Benjamin Howarth
-                                    // We need to change the current route params if the user only has access to a single section
-                                    // To do this we need to grab the current user's allowed sections, then reject the promise with the correct path.
-                                    if (found) {
-                                        //this will resolve successfully so the route will continue
-                                        return $q.when(true);
-                                    } else {
-                                        return $q.reject({ path: "/" + user.allowedSections[0] });
-                                    }
-                                }
-                                else {
-                                    return $q.when(true);
-                                }
-                            });
-
-                        });
-
-                    }, function () {
-                        //not auth, check if we allow or reject
-                        if (authRequired) {
-                            //the check=false is checked above so that we don't have to make another http call to check
-                            //if they are logged in since we already know they are not.
-                            return $q.reject({ path: "/login/false" });
-                        }
-                        else {
-                            //this will resolve successfully so the route will continue
-                            return $q.when(true);
-                        }
-                    });
-
-            }
-        };
-    };
-
-    /** When this is used to resolve it will attempt to log the current user out */
-    var doLogout = function() {
-        return {
-            isLoggedOut: function ($q, $location, userService) {
-                return userService.logout().then(function () {
-                    //success so continue
-                    return $q.when(true);
-                }, function() {
-                    //logout failed somehow ? we'll reject with the login page i suppose
-                    return $q.reject({ path: "/login/false" });
-                });
-            }
-        }
-    }
-
-    $routeProvider
-        .when("/", {
-            redirectTo: '/content'
-        })
-        .when('/login', {
-            templateUrl: 'views/common/login.html',
-            //ensure auth is *not* required so it will redirect to /
-            resolve: canRoute(false)
-        })
-        .when('/login/:check', {
-            templateUrl: 'views/common/login.html',
-            //ensure auth is *not* required so it will redirect to /
-            resolve: canRoute(false)
-        })
-        .when('/logout', {
-            resolve: doLogout()
-        })
-        .when('/:section?', {
-            //This allows us to dynamically change the template for this route since you cannot inject services into the templateUrl method.
-            template: "<div ng-include='templateUrl'></div>",
-            //This controller will execute for this route, then we can execute some code in order to set the template Url
-            controller: function ($scope, $route, $routeParams, $location, sectionService) {
-
-                //We are going to check the currently loaded sections for the user and if the section we are navigating
-                //to has a custom route path we'll use that
-                sectionService.getSectionsForUser().then(function(sections) {
-                    //find the one we're requesting
-                    var found = _.find(sections, function(s) {
-                        return s.alias.localeCompare($routeParams.section, undefined, { sensitivity: 'accent' }) === 0;
-                    })
-                    if (found && found.routePath) {
-                        //there's a custom route path so redirect
-                        $location.path(found.routePath);
-                    }
-                    else {
-                        //there's no custom route path so continue as normal
-                        $routeParams.url = "dashboard.aspx?app=" + $routeParams.section;
-                        $scope.templateUrl = 'views/common/dashboard.html';
-                    }
-                });
-            },
-            reloadOnSearch: false,
-            resolve: canRoute(true)
-        })
-        .when('/:section/framed/:url', {
-            //This occurs when we need to launch some content in an iframe
-            templateUrl: function (rp) {
-                if (!rp.url)
-                    throw "A framed resource must have a url route parameter";
-
-                return 'views/common/legacy.html';
-            },
-            reloadOnSearch: false,
-            resolve: canRoute(true)
-        })
-        .when('/:section/:tree/:method?', {
-            //This allows us to dynamically change the template for this route since you cannot inject services into the templateUrl method.
-            template: "<div ng-include='templateUrl'></div>",
-            //This controller will execute for this route, then we replace the template dynamically based on the current tree.
-            controller: function ($scope, $routeParams, navigationService) {
-
-                if (!$routeParams.method) {
-                    $scope.templateUrl = "views/common/dashboard.html";
-                    return;
-                }
-
-                //TODO: Fix this special case by using components, the packager should be a component and then we just have a view for each route like normal rendering the component with the correct parameters
-                //special case for the package section
-                var packagePages = ["edit", "options"];
-                if ($routeParams.section.toLowerCase() === "packages" && $routeParams.tree.toLowerCase() === "packages" && packagePages.indexOf($routeParams.method.toLowerCase()) === -1) {
-                    $scope.templateUrl = "views/packages/overview.html";
-                    return;
-                }
-
-                //TODO: Fix this special case by using components, the users section should be a component and then we just have a view for each route like normal rendering the component with the correct parameters
-                //special case for the users section
-                var usersPages = ["user", "group"];
-                if ($routeParams.section.toLowerCase() === "users" && $routeParams.tree.toLowerCase() === "users" && usersPages.indexOf($routeParams.method.toLowerCase()) === -1) {
-                    $scope.templateUrl = "views/users/overview.html";
-                    return;
-                }
-                $scope.templateUrl = navigationService.getTreeTemplateUrl($routeParams.tree, $routeParams.method);
-            },
-            reloadOnSearch: false,
-            resolve: canRoute(true)
-        })
-        .when('/:section/:tree/:method?/:id', {
-            //This allows us to dynamically change the template for this route since you cannot inject services into the templateUrl method.
-            template: "<div ng-include='templateUrl'></div>",
-            //This controller will execute for this route, then we replace the template dynamically based on the current tree.
-            controller: function ($scope, $routeParams, navigationService) {
-
-                if (!$routeParams.tree || !$routeParams.method) {
-                    $scope.templateUrl = "views/common/dashboard.html";
-                    return;
-                }
-                $scope.templateUrl = navigationService.getTreeTemplateUrl($routeParams.tree, $routeParams.method);
-            },
-            reloadOnSearch: false,
-            reloadOnUrl: false,
-            resolve: canRoute(true)
-        })
-        .otherwise({ redirectTo: '/login' });
-    }).config(function ($locationProvider) {
-
-        $locationProvider.html5Mode(false); //turn html5 mode off
-        $locationProvider.hashPrefix('');
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/utilities.js b/src/Umbraco.Web.UI.Client/src/utilities.js
deleted file mode 100644
index 9ed93998b2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/utilities.js
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * A friendly utility collection to replace AngularJs' ng-functions
- * If it doesn't exist here, it's probably available as vanilla JS
- * 
- * Still carries a dependency on underscore, but if usages of underscore from 
- * elsewhere in the codebase can instead use these methods, the underscore
- * dependency will be nicely abstracted and can be removed/swapped later
- * 
- * This collection is open to extension...
- */
-(function (window) {
-
-    /**
-     * Equivalent to angular.noop
-     */
-    const noop = () => { };
-
-    /**
-     * Facade to angular.copy
-     */
-    const copy = (src, dst) => angular.copy(src, dst);
-
-    /**
-     * Equivalent to angular.isArray
-     */
-    const isArray = val => Array.isArray(val) || val instanceof Array;
-
-    /**
-     * Facade to angular.equals
-     */
-    const equals = (a, b) => angular.equals(a, b);
-    
-    /**
-     * Facade to angular.extend
-     * Use this with Angular objects, for vanilla JS objects, use Object.assign()
-     * This is an alias as it to allow passing an unknown number of arguments
-     */
-    const extend = angular.extend;
-
-    /**
-     * Equivalent to angular.isFunction
-     */
-    const isFunction = val => typeof val === 'function';
-
-    /**
-     * Equivalent to angular.isUndefined
-     */
-    const isUndefined = val => typeof val === 'undefined';
-
-    /**
-     * Equivalent to angular.isDefined. Inverts result of const isUndefined
-     */
-    const isDefined = val => !isUndefined(val);
-
-    /**
-     * Equivalent to angular.isString
-     */
-    const isString = val => typeof val === 'string';
-
-    /**
-     * Equivalent to angular.isNumber
-     */
-    const isNumber = val => typeof val === 'number';
-
-    /**
-     * Equivalent to angular.isObject
-     */
-    const isObject = val => val !== null && typeof val === 'object';
-
-    const isWindow = obj => obj && obj.window === obj;
-
-    const isScope = obj => obj && obj.$evalAsync && obj.$watch;
-
-    const toJsonReplacer = (key, value) => {
-        var val = value;
-        if (typeof key === 'string' && key.charAt(0) === '$' && key.charAt(1) === '$') {
-            val = undefined;
-        } else if (isWindow(value)) {
-            val = '$WINDOW';
-        } else if (value && window.document === value) {
-            val = '$DOCUMENT';
-        } else if (isScope(value)) {
-            val = '$SCOPE';
-        }
-        return val;
-    };
-
-    /**
-     * Equivalent to angular.toJson
-     */
-    const toJson = (obj, pretty) => {
-        if (isUndefined(obj)) return undefined;
-        if (!isNumber(pretty)) {
-            pretty = pretty ? 2 : null;
-        }
-        return JSON.stringify(obj, toJsonReplacer, pretty);
-    };
-
-    /**
-     * Equivalent to angular.fromJson
-     */
-    const fromJson = (val) => {
-        if (!isString(val)) {
-            return val;
-        }
-        return JSON.parse(val);
-    };
-
-    /**
-     * Not equivalent to angular.forEach. But like the angularJS method this does not fail on null or undefined.
-     */
-    const forEach = (obj, iterator) => {
-        if (obj && isArray(obj)) {
-            return obj.forEach(iterator);
-        }
-        return obj;
-    };
-
-    const MediaUploader = function (Upload, mediaHelper, mediaTypeHelper, localizationService, overlayService, mediaTypeResource) {
-        const umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
-        const allowedUploadFiles = mediaHelper.formatFileTypes(umbracoSettings.allowedUploadFiles);
-        const allowedImageFileTypes = mediaHelper.formatFileTypes(umbracoSettings.imageFileTypes);
-        const allowedFileTypes = `${allowedUploadFiles},${allowedImageFileTypes}`;
-        const disallowedFileTypes = mediaHelper.formatFileTypes(umbracoSettings.disallowedUploadFiles);
-        const maxFileSize = umbracoSettings.maxFileSize !== '' ? `${umbracoSettings.maxFileSize} KB` : '';
-        
-        const events = {};
-        const translations = {};
-
-        let initialized = false;
-        let uploadURL = '';
-        let allowedMediaTypes = [];
-        let queue = [];
-        let invalidEntries = [];
-
-        function init (options) {
-            uploadURL = options.uploadURL;
-
-            return new Promise((resolve, reject) => {
-                const promises = [
-                    mediaTypeResource.getAllFiltered(options.allowedMediaTypeAliases),
-                    localizationService.localizeMany(["media_disallowedFileType", "media_maxFileSize", "defaultdialogs_selectMediaType"])
-                ];
-
-                Promise.all(promises).then(values => {
-                    const mediaTypes = values[0];
-                    const translationValues = values[1];
-
-                    allowedMediaTypes = mediaTypes;
-                    translations.disallowedFileType = translationValues[0];
-                    translations.maxFileSize = translationValues[1] + " " + maxFileSize;
-                    translations.selectMediaTypeDialogTitle = translationValues[2];
-                    initialized = true;
-                    resolve();
-                }, (reason) => {
-                    reject(reason);
-                });
-            });
-        }
-
-        function requestUpload (files) {
-            if (!initialized) {
-                throw 'MediaUploader is not initialized';
-            }
-
-            const validBatch = [];
-            const uploadItems = createUploadItemsFromFiles(files);
-
-            // Validate based on server allowed file types
-            uploadItems.forEach(item => {
-                const isAllowedFileType = Upload.validatePattern(item.file, allowedFileTypes);
-                const isDisallowedFileType = Upload.validatePattern(item.file, disallowedFileTypes);
-                const underMaxFileSize = maxFileSize ? validateMaxFileSize(item.file, maxFileSize) : true;
-
-                if (isAllowedFileType && !isDisallowedFileType && underMaxFileSize) {
-                    _acceptMediaEntry(item.mediaEntry);
-                    validBatch.push(item);
-                    return;
-                }
-
-                if (!isAllowedFileType || isDisallowedFileType) {
-                    _rejectMediaEntry(item.mediaEntry, { type: 'pattern', message: translations.disallowedFileType });
-                    return;
-                }
-
-                if (!underMaxFileSize) {
-                    _rejectMediaEntry(item.mediaEntry, { type: 'maxSize', message: translations.maxFileSize });
-                    return;
-                }
-            });
-
-            _addItemsToQueue(validBatch);
-            _emit('queueStarted');
-            _processQueue();
-        }
-
-        function _acceptMediaEntry (mediaEntry) {
-            _emit('mediaEntryAccepted', { mediaEntry });
-        }
-
-        function _rejectMediaEntry (mediaEntry, reason) {
-            mediaEntry.error = true;
-            mediaEntry.errorType = {};
-            mediaEntry.errorType[reason.type] = true;
-            mediaEntry.errorText = reason.message;
-            
-            invalidEntries.push(mediaEntry);
-            _emit('mediaEntryRejected', { mediaEntry });
-        }
- 
-        function createUploadItemsFromFiles (files) {
-            // angular complains about "Illegal invocation" if the file is part of the model.value
-            // so we have to keep them separate
-            return files.map(file => {
-                const mediaEntry = {
-                    key: String.CreateGuid(),
-                    name: file.name,
-                    $uploadProgress: 0,
-                    $dataURL: ''
-                };
-
-                if (file.type.includes('image')) {
-                    Upload.base64DataUrl(file).then(function(url) {    
-                        mediaEntry.$dataURL = url;
-                    });
-                } else {
-                    mediaEntry.$extension = mediaHelper.getFileExtension(file.name);
-                }
-
-                return {
-                    mediaEntry,
-                    file
-                };
-            });
-        };
-
-        function validateMaxFileSize (file, val) {
-            return file.size - 0.1 <= Upload.translateScalars(val);
-        }
-    
-        function _upload(queueItem) {
-            const mediaEntry = queueItem.mediaEntry;
-
-            _emit('uploadStarted', { mediaEntry });
-            Upload.upload({
-                    url: uploadURL,
-                    file: queueItem.file
-                })
-                .progress(function(evt) {
-                    var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10);
-                    mediaEntry.$uploadProgress = progressPercentage;
-                })
-                .success(function (data) {
-                    _emit('uploadSuccess', { mediaEntry, ...data });
-                    _processQueue();
-                })
-                .error(function(error) {
-                    _emit('uploadError', { mediaEntry });
-                    _rejectMediaEntry(mediaEntry, { type: 'server', message: error.Message });
-                    _processQueue();
-                });
-        }
-
-        function _addItemsToQueue (queueItems) {
-            queue = [...queue, ...queueItems];
-        }
-
-        function _processQueue () {
-            const nextItem = queue.shift();
-
-            // queue is empty
-            if (!nextItem) {
-                _emit('queueCompleted');
-                return;
-            }
-
-            _getMatchedMediaType(nextItem.file).then(mediaType => {
-                nextItem.mediaEntry.mediaTypeAlias = mediaType.alias;
-                nextItem.mediaEntry.$icon = mediaType.icon;
-                _upload(nextItem);
-            }, () => {
-                _rejectMediaEntry(nextItem.mediaEntry, { type: 'pattern', message: translations.disallowedFileType });
-                _processQueue();
-            });
-        }
-
-        function _getMatchedMediaType(file) {
-            return new Promise((resolve, reject) => {
-                const uploadFileExtension = mediaHelper.getFileExtension(file.name);
-                const matchedMediaTypes = mediaTypeHelper.getTypeAcceptingFileExtensions(allowedMediaTypes, [uploadFileExtension]);
-                
-                if (matchedMediaTypes.length === 0) {
-                    reject();
-                    return;
-                };
-                
-                if (matchedMediaTypes.length === 1) {
-                    resolve(matchedMediaTypes[0]);
-                    return;
-                };
-
-                // when we get all media types, the "File" media type will always show up because it accepts all file extensions.
-                // If we don't remove it from the list we will always show the picker.
-                const matchedMediaTypesNoFile = matchedMediaTypes.filter(mediaType => mediaType.alias !== "File");
-                if (matchedMediaTypesNoFile.length === 1) {
-                    resolve(matchedMediaTypesNoFile[0]);
-                    return;
-                };
-    
-                if (matchedMediaTypes.length > 1) {
-                    _chooseMediaTypeDialog(matchedMediaTypes, file)
-                    .then((selectedMediaType) => {
-                        resolve(selectedMediaType);
-                    }, () => {
-                        reject();
-                    });
-                };
-            });
-        }
-
-        function _chooseMediaTypeDialog(mediaTypes, file) {
-            return new Promise((resolve, reject) => {
-                const dialog = {
-                    view: "itempicker",
-                    filter: mediaTypes.length > 8,
-                    availableItems: mediaTypes,
-                    submit: function (model) {
-                        resolve(model.selectedItem);
-                        overlayService.close();
-                    },
-                    close: function () {
-                        reject();
-                        overlayService.close();
-                    }
-                };
-
-                dialog.title = translations.selectMediaTypeDialogTitle;
-                dialog.subtitle = file.name;
-                overlayService.open(dialog);
-            });
-        }
-
-        function _emit(name, data) {
-            if (!events[name]) return;
-            events[name].forEach(callback => callback({name}, data));
-        }
-
-        function on(name, callback) {
-            if (typeof callback !== 'function') return;
-
-            const unsubscribe = function () {
-                events[name] = events[name].filter(cb => cb !== callback);
-            }
-
-            events[name] = events[name] || [];
-            events[name].push(callback);
-            return unsubscribe;
-        }
-    
-        return {
-            init,
-            requestUpload,
-            on
-        }
-    }
-
-    let _utilities = {
-        noop: noop,
-        copy: copy,
-        isArray: isArray,
-        equals: equals,
-        extend: extend,
-        isFunction: isFunction,
-        isUndefined: isUndefined,
-        isDefined: isDefined,
-        isString: isString,
-        isNumber: isNumber,
-        isObject: isObject,
-        fromJson: fromJson,
-        toJson: toJson,
-        forEach: forEach,
-        MediaUploader: MediaUploader
-    };
-
-    if (typeof (window.Utilities) === 'undefined') {
-        window.Utilities = _utilities;
-    }
-})(window);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/authorizeupgrade.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/authorizeupgrade.controller.js
deleted file mode 100644
index 12803dfd51..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/authorizeupgrade.controller.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/**
- * @ngdoc controller
- * @name Umbraco.MainController
- * @function
- * 
- * @description
- * The controller for the AuthorizeUpgrade login page
- * 
- */
-function AuthorizeUpgradeController($scope, $window) {
-    
-    $scope.loginAndRedirect = function (event) {
-
-        var qry = $window.location.search.trimStart("?").split("&");
-        var redir = _.find(qry, function(item) {
-            return item.startsWith("redir=");
-        });
-        if (redir) {
-            $window.location = decodeURIComponent(redir.split("=")[1]);
-        }
-        else {
-            $window.location = "/";
-        }
-
-    };
-
-}
-
-angular.module('umbraco').controller("Umbraco.AuthorizeUpgradeController", AuthorizeUpgradeController);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dashboard.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dashboard.controller.js
deleted file mode 100644
index 439af50273..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/dashboard.controller.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.DashboardController
- * @function
- * 
- * @description
- * Controls the dashboards of the application
- * 
- */
-
-function DashboardController($scope, $q, $routeParams, $location, dashboardResource, localizationService) {
-    const DASHBOARD_QUERY_PARAM = 'dashboard';
-
-    $scope.page = {};
-    $scope.page.nameLocked = true;
-    $scope.page.loading = true;
-
-    $scope.dashboard = {};
-
-    var promises = [];
-
-    promises.push(localizationService.localize("sections_" + $routeParams.section).then(function (name) {
-    	$scope.dashboard.name = name;
-    }));
-
-    promises.push(dashboardResource.getDashboard($routeParams.section).then(function (tabs) {
-        $scope.dashboard.tabs = tabs;
-
-        if ($scope.dashboard.tabs && $scope.dashboard.tabs.length > 0) {
-            initActiveTab();
-        }
-    }));
-
-    $q.all(promises).then(function () {
-        $scope.page.loading = false;
-    });
-
-    $scope.changeTab = function (tab) {
-        if ($scope.dashboard.tabs && $scope.dashboard.tabs.length > 0) {
-            $scope.dashboard.tabs.forEach(function (tab) {
-                tab.active = false;
-            });
-        }
-
-        tab.active = true;
-        $location.search(DASHBOARD_QUERY_PARAM, tab.alias);
-    };
-
-    function initActiveTab() {
-        // Check the query parameter for a dashboard alias
-        const dashboardAlias = $location.search()[DASHBOARD_QUERY_PARAM];
-        const dashboardIndex = $scope.dashboard.tabs.findIndex(tab => tab.alias === dashboardAlias);
-        const showDefaultDashboard = dashboardIndex === -1;
-
-        // Set the first dashboard to active if there is no query parameter or we can't find a matching dashboard for the alias
-        const activeIndex = showDefaultDashboard ? 0 : dashboardIndex;
-
-        const tab = $scope.dashboard.tabs[activeIndex];
-
-        tab.active = true;
-        if (!showDefaultDashboard) {
-            $location.search(DASHBOARD_QUERY_PARAM, tab.alias);
-        }
-    }
-}
-
-// Register it
-angular.module('umbraco').controller("Umbraco.DashboardController", DashboardController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html b/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
deleted file mode 100644
index f7ca16500a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<div ng-controller="Umbraco.DashboardController">
-
-    <ng-form name="dashboardForm" val-form-manager>
-
-        <umb-load-indicator ng-show="page.loading"></umb-load-indicator>
-
-        <div class="umb-dashboard" ng-if="!page.loading" data-element='dashboard'>
-
-            <div class="umb-dashboard__header" ng-show="dashboard.tabs.length > 1">
-                <umb-tabs-nav
-                    ng-if="dashboard.tabs"
-                    tabs="dashboard.tabs"
-                    on-tab-change="changeTab(tab)">
-                </umb-tabs-nav>
-            </div>
-
-            <div class="umb-dashboard__content">
-
-                <umb-tab-content ng-repeat="tab in dashboard.tabs" ng-if="tab.active" tab="tab" class="row-fluid">
-
-                    <div ng-repeat="property in tab.properties">
-
-                        <div class="clearfix">
-                            <div ng-include="property.view"></div>
-                        </div>
-
-                    </div>
-
-                </umb-tab-content>
-
-            </div>
-
-        </div>
-
-    </ng-form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js
deleted file mode 100644
index f69467b0a1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js
+++ /dev/null
@@ -1,282 +0,0 @@
-
-(function () {
-    "use strict";
-
-    function HelpDrawerController($scope, $routeParams, $timeout, dashboardResource, localizationService, userService, eventsService, helpService, appState, tourService, $filter, editorState, notificationsService, currentUserResource, platformService) {
-
-        var vm = this;
-        var evts = [];
-        vm.title = "";
-        vm.subtitle = "Umbraco version" + " " + Umbraco.Sys.ServerVariables.application.version;
-        vm.section = $routeParams.section;
-        vm.tree = $routeParams.tree;
-        vm.sectionName = "";
-        vm.customDashboard = null;
-        vm.tours = [];
-        vm.systemInfoDisplay = false;
-        vm.labels = {};
-        vm.labels.copiedSuccessInfo = "";
-        vm.labels.copySuccessStatus = "";
-        vm.labels.copiedErrorInfo = "";
-        vm.labels.copyErrorStatus = "";
-
-
-        vm.closeDrawer = closeDrawer;
-        vm.startTour = startTour;
-        vm.getTourGroupCompletedPercentage = getTourGroupCompletedPercentage;
-        vm.showTourButton = showTourButton;
-        vm.copyInformation = copyInformation;
-
-        vm.showDocTypeTour = false;
-        vm.docTypeTours = [];
-        vm.systemInfo = [];
-        vm.nodeName = '';
-
-        function startTour(tour) {
-            tourService.startTour(tour);
-            closeDrawer();
-        }
-
-        function oninit() {
-
-            // set title
-            localizationService.localize("general_help").then(function(data){
-                vm.title = data;
-            });
-            //Set help dashboard messages
-          var labelKeys = [
-            "general_help",
-            "speechBubbles_copySuccessMessage",
-            "general_success",
-            "speechBubbles_cannotCopyInformation",
-            "general_error"
-          ];
-          localizationService.localizeMany(labelKeys).then(function(resp){
-            [
-              vm.title,
-              vm.labels.copiedSuccessInfo,
-              vm.labels.copySuccessStatus,
-              vm.labels.copiedErrorInfo,
-              vm.labels.copyErrorStatus
-            ] = resp;
-          });
-
-            currentUserResource.getUserData().then(function(systemInfo){
-              vm.systemInfo = systemInfo;
-              let browserInfo = platformService.getBrowserInfo();
-              if(browserInfo != null){
-                vm.systemInfo.push({name :"Browser", data: browserInfo.name + " " + browserInfo.version});
-              }
-              vm.systemInfo.push({name :"Browser OS", data: getPlatform()});
-            } );
-            tourService.getGroupedTours().then(function(groupedTours) {
-                vm.tours = groupedTours;
-                getTourGroupCompletedPercentage();
-            });
-
-            // load custom help dashboard
-            dashboardResource.getDashboard("user-help").then(function (dashboard) {
-                vm.customDashboard = dashboard;
-            });
-
-            if (!vm.section) {
-                vm.section = "content";
-            }
-
-            setSectionName();
-
-            userService.getCurrentUser().then(function (user) {
-
-                vm.userType = user.userType;
-                vm.userLang = user.locale;
-
-                vm.hasAccessToSettings = _.contains(user.allowedSections, 'settings');
-
-                evts.push(eventsService.on("appState.treeState.changed", function (e, args) {
-                    handleSectionChange();
-                }));
-
-                evts.push(eventsService.on("editorState.changed",
-                    function (e, args) {
-                        setDocTypeTour(args.entity);
-                    }));
-
-                findHelp(vm.section, vm.tree, vm.userType, vm.userLang);
-
-            });
-
-            setDocTypeTour(editorState.getCurrent());
-
-            // check if a tour is running - if it is open the matching group
-            var currentTour = tourService.getCurrentTour();
-
-            if (currentTour) {
-                openTourGroup(currentTour.alias);
-            }
-
-        }
-
-        function closeDrawer() {
-            appState.setDrawerState("showDrawer", false);
-        }
-
-        function handleSectionChange() {
-            $timeout(function () {
-                if (vm.section !== $routeParams.section || vm.tree !== $routeParams.tree) {
-
-                    vm.section = $routeParams.section;
-                    vm.tree = $routeParams.tree;
-
-                    setSectionName();
-                    findHelp(vm.section, vm.tree, vm.userType, vm.userLang);
-                    setDocTypeTour();
-                }
-            });
-        }
-
-        function findHelp(section, tree, usertype, userLang) {
-
-            if (vm.hasAccessToSettings) {
-                helpService.getContextHelpForPage(section, tree).then(function (topics) {
-                    vm.topics = topics;
-                });
-            }
-
-
-            var rq = {};
-            rq.section = vm.section;
-            rq.usertype = usertype;
-            rq.lang = userLang;
-
-            if ($routeParams.url) {
-                rq.path = decodeURIComponent($routeParams.url);
-
-                if (rq.path.indexOf(Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath) === 0) {
-                    rq.path = rq.path.substring(Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath.length);
-                }
-
-                if (rq.path.indexOf(".aspx") > 0) {
-                    rq.path = rq.path.substring(0, rq.path.indexOf(".aspx"));
-                }
-
-            } else {
-                rq.path = rq.section + "/" + $routeParams.tree + "/" + $routeParams.method;
-            }
-
-
-            if (vm.hasAccessToSettings) {
-                helpService.findVideos(rq).then(function (videos) {
-                    vm.videos = videos;
-                });
-            }
-        }
-
-        function setSectionName() {
-            // Get section name
-            var languageKey = "sections_" + vm.section;
-            localizationService.localize(languageKey).then(function (value) {
-                vm.sectionName = value;
-            });
-        }
-
-        function showTourButton(index, tourGroup) {
-            if(index !== 0) {
-                var prevTour = tourGroup.tours[index - 1];
-                if(prevTour.completed) {
-                    return true;
-                }
-            } else {
-                return true;
-            }
-        }
-
-        function openTourGroup(tourAlias) {
-            vm.tours.forEach(function (group) {
-                group.tours.forEach(function (tour) {
-                    if (tour.alias === tourAlias) {
-                        group.open = true;
-                    }
-                });
-            });
-        }
-
-        function getTourGroupCompletedPercentage() {
-            // Finding out, how many tours are completed for the progress circle
-            vm.tours.forEach(function(group){
-                var completedTours = 0;
-                group.tours.forEach(function(tour){
-                    if(tour.completed) {
-                        completedTours++;
-                    }
-                });
-                group.completedPercentage = Math.round((completedTours/group.tours.length)*100);
-            });
-        }
-
-        function setDocTypeTour(node) {
-            vm.showDocTypeTour = false;
-            vm.docTypeTours = [];
-            vm.nodeName = '';
-
-            if (vm.section === 'content' && vm.tree === 'content') {
-
-                if (node) {
-                    tourService.getToursForDoctype(node.contentTypeAlias).then(function (data) {
-                        if (data && data.length > 0) {
-                            vm.docTypeTours = data;
-                            var currentVariant = _.find(node.variants, (x) => x.active);
-                            vm.nodeName = currentVariant.name;
-                            vm.showDocTypeTour = true;
-                        }
-                    });
-                }
-            }
-        }
-        function copyInformation(){
-          //Write start and end text for table formatting in github issues
-          let copyStartText = "<html>\n<body>\n<!--StartFragment-->\n\nCategory | Data\n-- | --\n";
-          let copyEndText = "\n<!--EndFragment-->\n</body>\n</html>";
-
-          let copyText = copyStartText;
-          vm.systemInfo.forEach(function (info){
-            copyText += info.name + " | " + info.data + "\n";
-          });
-
-          copyText += copyEndText;
-
-          // Check if copyText is only start + end text
-          // if it is something went wrong and we will not copy to clipboard
-          let emptyCopyText = copyStartText + copyEndText;
-          if(copyText !== emptyCopyText) {
-            notificationsService.success(vm.labels.copySuccessStatus, vm.labels.copiedSuccessInfo);
-            navigator.clipboard.writeText(copyText);
-          }
-          else {
-            notificationsService.error(vm.labels.copyErrorStatus, vm.labels.copiedErrorInfo);
-          }
-        }
-
-        function getPlatform() {
-          return window.navigator.platform;
-        }
-
-        evts.push(eventsService.on("appState.tour.complete", function (event, tour) {
-            tourService.getGroupedTours().then(function(groupedTours) {
-                vm.tours = groupedTours;
-                openTourGroup(tour.alias);
-                getTourGroupCompletedPercentage();
-            });
-        }));
-
-        $scope.$on('$destroy', function () {
-            for (var e in evts) {
-                eventsService.unsubscribe(evts[e]);
-            }
-        });
-
-        oninit();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Drawers.Help", HelpDrawerController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
deleted file mode 100644
index c14110437d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<div style="height: 100%" ng-controller="Umbraco.Drawers.Help as vm">
-    <umb-drawer-view>
-
-        <umb-drawer-header
-            title="{{vm.title}}"
-            description="{{vm.subtitle}}">
-        </umb-drawer-header>
-
-        <umb-drawer-content>
-
-            <!-- Doctype Tours -->
-            <div class="umb-help-section" ng-if="vm.showDocTypeTour" data-element="doctype-tour">
-                <h5>Need help editing current item '{{vm.nodeName}}' ?</h5>
-
-                <div class="umb-help-list">
-
-                    <div ng-repeat="tour in vm.docTypeTours | orderBy:'groupOrder'">
-                        <div data-element="tour-{{tour.alias}}" class="umb-help-list-item">
-                            <div class="umb-help-list-item__content justify-between">
-                                <div class="flex items-center">
-                                    <span class="umb-help-list-item__title">{{ tour.name }}</span>
-                                </div>
-                                <div>
-                                    <umb-button button-style="primary" size="xxs" type="button" label="Start" action="vm.startTour(tour)"></umb-button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Tours -->
-            <div class="umb-help-section" ng-if="vm.tours.length > 0" data-element="help-tours">
-
-                <h5 class="umb-help-section__title">
-                    <localize key="help_tours">Tours</localize>
-                </h5>
-
-                <div ng-repeat="tourGroup in vm.tours | orderBy:'groupOrder'">
-
-                    <div class="umb-help-list">
-
-                        <button
-                            type="button"
-                            class="umb-help-list-item umb-help-list-item__content flex items-center justify-between"
-                            ng-click="tourGroup.open = !tourGroup.open"
-                            aria-expanded="{{tourGroup.open === undefined ? false : tourGroup.open }}">
-                            <span class="umb-help-list-item__group-title bold">
-                                <umb-icon icon="{{tourGroup.open ? 'icon-navigation-down' : 'icon-navigation-right'}}"></umb-icon>
-                                <span ng-if="tourGroup.group !== 'undefined'">{{tourGroup.group}}</span>
-                                <span ng-if="tourGroup.group === 'undefined'">
-                                    <localize key="general_other">Other</localize>
-                                </span>
-                            </span>
-                            <umb-progress-circle
-                                percentage="{{tourGroup.completedPercentage}}"
-                                size="40">
-                            </umb-progress-circle>
-                        </button>
-
-                        <div ng-if="tourGroup.open">
-                            <div data-element="tour-{{tour.alias}}" class="umb-help-list-item" ng-repeat="tour in tourGroup.tours">
-                                <div class="umb-help-list-item__content justify-between">
-                                    <div class="flex items-center">
-                                        <div ng-if="!tour.completed" class="umb-number-badge umb-number-badge--xs umb-help-list-item__icon">{{ $index + 1 }}</div>
-                                        <umb-checkmark ng-if="tour.completed" size="xs" checked="tour.completed" class="umb-help-list-item__icon"></umb-checkmark>
-                                        <span ng-class="{'strike': tour.completed}" class="umb-help-list-item__title">{{ tour.name }}</span>
-                                    </div>
-                                    <div>
-                                        <umb-button ng-if="!tour.completed && vm.showTourButton($index, tourGroup)" button-style="primary" type="button" label="Start" action="vm.startTour(tour)"></umb-button>
-                                        <umb-button ng-if="tour.completed" type="button" label="Rerun" action="vm.startTour(tour)"></umb-button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-
-            <!-- Show in custom help dashboard -->
-            <div class="umb-help-section" data-element="help-custom-dashboard" ng-if="vm.customDashboard.length > 0">
-                <div ng-repeat="dashboard in vm.customDashboard">
-                    <h5 ng-show="dashboard.label">{{dashboard.label}}</h5>
-                    <div ng-repeat="property in dashboard.properties">
-                        <div>
-                            <div ng-include="property.view"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!--  Help Content -->
-            <div class="umb-help-section" data-element="help-articles" ng-if="vm.topics.length > 0">
-                <h5 class="umb-help-section__title">
-                    <localize key="general_articles">Articles</localize>
-                </h5>
-                <ul class="umb-help-list">
-                    <li class="umb-help-list-item" ng-repeat="topic in vm.topics track by $index">
-                        <a class="umb-help-list-item__content" data-element="help-article-{{topic.name}}" href="#" ng-href="{{topic.url}}?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv" target="_blank" rel="noopener">
-                            <span>
-                                <span class="umb-help-list-item__title">
-                                    <span class="bold">{{topic.name}}</span>
-                                    <umb-icon icon="icon-out" class="umb-help-list-item__open-icon"></umb-icon>
-                                </span>
-                                <span class="umb-help-list-item__description">{{topic.description}}</span>
-                            </span>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-
-            <!-- Umbraco tv content -->
-            <div class="umb-help-section" data-element="help-videos" ng-if="vm.hasAccessToSettings">
-                <h5 class="umb-help-section__title" ng-if="vm.videos.length > 0">
-                    <localize key="general_videos">Videos</localize>
-                </h5>
-                <ul class="umb-help-list">
-                    <li class="umb-help-list-item" ng-repeat="video in vm.videos track by $index">
-                        <a class="umb-help-list-item__content" data-element="help-article-{{video.title}}" href="#" ng-href="{{video.link}}?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv" target="_blank" rel="noopener">
-                            <umb-icon icon="icon-tv-old" class="umb-help-list-item__icon"></umb-icon>
-                            <span class="umb-help-list-item__title">{{video.title}}</span>
-                            <umb-icon icon="icon-out" class="umb-help-list-item__open-icon"></umb-icon>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-
-            <!-- Links -->
-            <div class="umb-help-section" data-element="help-links" ng-if="vm.hasAccessToSettings">
-                <a data-element="help-link-umbraco-tv" class="umb-help-badge" href="https://umbra.co/ulb" target="_blank" rel="noopener">
-                    <umb-icon icon="icon-tv-old" class="umb-help-badge__icon"></umb-icon>
-                    <div class="umb-help-badge__title">
-                        <localize key="help_umbracoLearningBase">Watch our free tutorial videos</localize>
-                    </div>
-                    <small>
-                        <localize key="help_umbracoLearningBaseDescription">on the Umbraco Learning Base</localize>
-                    </small>
-                </a>
-
-                <a data-element="help-link-our-umbraco" class="umb-help-badge" href="https://our.umbraco.com?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=our" target="_blank" rel="noopener">
-                    <umb-icon icon="icon-favorite" class="umb-help-badge__icon"></umb-icon>
-                    <div class="umb-help-badge__title">
-                        <localize key="help_umbracoForum">Visit our.umbraco.com</localize>
-                    </div>
-                    <small>
-                        <localize key="defaultdialogs_theFriendliestCommunity">The friendliest community</localize>
-                    </small>
-                </a>
-            </div>
-
-          <!-- System info -->
-          <div class="umb-help-section">
-
-            <h5 class="umb-help-section__title">System Information</h5>
-              <div class="umb-help-list">
-                <div class="umb-help-list-item__title-wrapper">
-                <button
-                  type="button"
-                  class="umb-help-list-item umb-help-list-item__content"
-                  ng-click="vm.systemInfoDisplay = !vm.systemInfoDisplay"
-                  aria-expanded="{{vm.systemInfoDisplay ===  true}}">
-                  <umb-icon class="mr1" icon="{{vm.systemInfoDisplay ? 'icon-navigation-down' : 'icon-navigation-right'}}"></umb-icon>
-                  <span class="flex-column items-start flex">
-                    <span class="umb-help-list-item__group-title bold">System Information</span>
-                    <span class="umb-help-list-item__description mt0">View your system information</span>
-                  </span>
-                </button>
-                <button
-                  ng-click="vm.copyInformation()"
-                  class="btn-reset"
-                  type="button"
-                  size="30">
-                    <span class="">
-                      <umb-icon icon="icon-documents" class="umb-help-list-item__icon"></umb-icon>
-                    </span>
-                </button>
-                </div>
-                <div ng-if="vm.systemInfoDisplay === true">
-                  <table class="table table-striped">
-                    <tr>
-                      <th>Category</th>
-                      <th>Data</th>
-                    </tr>
-                    <tr ng-repeat="info in vm.systemInfo">
-                      <td>{{info.name}}</td>
-                      <td>{{info.data}}</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-          </div>
-        </umb-drawer-content>
-
-        <umb-drawer-footer>
-
-            <div class="flex justify-end">
-                <umb-button
-                    alias="close"
-                    type="button"
-                    shortcut="esc"
-                    button-style="link"
-                    label-key="general_close"
-                    action="vm.closeDrawer()">
-                </umb-button>
-            </div>
-
-        </umb-drawer-footer>
-
-    </umb-drawer-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.content.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.content.html
deleted file mode 100644
index 15c3b9594f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.content.html
+++ /dev/null
@@ -1 +0,0 @@
-<umb-element-editor-content model="model.content"></umb-element-editor-content>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
deleted file mode 100644
index 64e3f67fea..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.controller.js
+++ /dev/null
@@ -1,105 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.Editors.BlockEditorController",
-        function ($scope, localizationService, formHelper, overlayService) {
-
-            var vm = this;
-
-            vm.model = $scope.model;
-            vm.tabs = [];
-
-            localizationService.localizeMany([
-                vm.model.createFlow ? "general_cancel" : (vm.model.liveEditing ? "prompt_discardChanges" : "general_close"),
-                vm.model.createFlow ? "general_create" : (vm.model.liveEditing ? "buttons_confirmActionConfirm" : "buttons_submitChanges")
-            ]).then(function (data) {
-                vm.closeLabel = data[0];
-                vm.submitLabel = data[1];
-            });
-
-            if (vm.model.content && vm.model.content.variants) {
-
-                var apps = vm.model.content.apps;
-
-                // configure the content app based on settings
-                var contentApp = apps.find(entry => entry.alias === "umbContent");
-                if (contentApp) {
-                    if (vm.model.hideContent) {
-                        apps.splice(apps.indexOf(contentApp), 1);
-                    }
-                    contentApp.active = (vm.model.openSettings !== true);
-                }
-
-                if (vm.model.settings && vm.model.settings.variants) {
-                    var settingsApp = apps.find(entry => entry.alias === "settings");
-                    if (settingsApp) {
-                        settingsApp.active = (vm.model.openSettings === true);
-                    }
-                }
-
-                var activeApp = apps.filter(x => x.active);
-                if (activeApp.length === 0 && apps.length > 0) {
-                  apps[0].active = true;
-                }
-
-                vm.tabs = apps;
-            }
-
-            vm.submitAndClose = function () {
-                if (vm.model && vm.model.submit) {
-
-                    // always keep server validations since this will be a nested editor and server validations are global
-                    if (formHelper.submitForm({
-                        scope: $scope,
-                        formCtrl: vm.blockForm,
-                        keepServerValidation: true
-                    })) {
-                        vm.model.submit(vm.model);
-                        vm.saveButtonState = "success";
-                    } else {
-                        vm.saveButtonState = "error";
-                    }
-                }
-            };
-
-            vm.close = function () {
-                if (vm.model && vm.model.close) {
-                    // TODO: At this stage there could very well have been server errors that have been cleared
-                    // but if we 'close' we are basically cancelling the value changes which means we'd want to cancel
-                    // all of the server errors just cleared. It would be possible to do that but also quite annoying.
-                    // The rudimentary way would be to:
-                    // * Track all cleared server errors here by subscribing to the prefix validation of controls contained here
-                    // * If this is closed, re-add all of those server validation errors
-                    // A more robust way to do this would be to:
-                    // * Add functionality to the serverValidationManager whereby we can remove validation errors and it will
-                    //      maintain a copy of the original errors
-                    // * It would have a 'commit' method to commit the removed errors - which we would call in the formHelper.submitForm when it's successful
-                    // * It would have a 'rollback' method to reset the removed errors - which we would call here
-
-                    if (vm.model.createFlow === true || vm.blockForm.$dirty === true) {
-                        var labels = vm.model.createFlow === true ? ["blockEditor_confirmCancelBlockCreationHeadline", "blockEditor_confirmCancelBlockCreationMessage"] : ["prompt_discardChanges", "blockEditor_blockHasChanges"];
-                        localizationService.localizeMany(labels).then(function (localizations) {
-                            const confirm = {
-                                title: localizations[0],
-                                view: "default",
-                                content: localizations[1],
-                                submitButtonLabelKey: "general_discard",
-                                submitButtonStyle: "danger",
-                                closeButtonLabelKey: "prompt_stay",
-                                submit: function () {
-                                    overlayService.close();
-                                    vm.model.close(vm.model);
-                                },
-                                close: function () {
-                                    overlayService.close();
-                                }
-                            };
-                            overlayService.open(confirm);
-                        });
-                    } else {
-                        vm.model.close(vm.model);
-                    }
-
-                }
-            };
-
-        }
-    );
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html
deleted file mode 100644
index 574786d8e7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="umb-block-editor" ng-controller="Umbraco.Editors.BlockEditorController as vm">
-
-    <ng-form name="vm.blockForm" val-form-manager>
-
-        <umb-editor-view umb-tabs ng-if="!page.loading">
-
-            <umb-editor-header
-                name="vm.model.title"
-                name-max-length="255"
-                name-required="false"
-                name-locked="true"
-                navigation="vm.tabs"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container>
-
-                <umb-editor-sub-views sub-views="vm.tabs" model="vm.model">
-                </umb-editor-sub-views>
-
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <!-- Missing breadcrumbs -->
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button
-                        action="vm.close()"
-                        shortcut="esc"
-                        button-style="link"
-                        label="{{vm.closeLabel}}"
-                        type="button">
-                    </umb-button>
-
-                    <umb-button
-                        ng-if="!vm.model.hideSubmitButton",
-                        action="vm.submitAndClose()"
-                        button-style="primary"
-                        state="vm.saveButtonState"
-                        label="{{vm.submitLabel}}"
-                        type="button">
-                    </umb-button>
-
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-        </umb-editor-view>
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.settings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.settings.html
deleted file mode 100644
index df69e2e648..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockeditor/blockeditor.settings.html
+++ /dev/null
@@ -1 +0,0 @@
-<umb-element-editor-content model="model.settings"></umb-element-editor-content>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.controller.js
deleted file mode 100644
index cae4b803d8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.controller.js
+++ /dev/null
@@ -1,103 +0,0 @@
-angular.module("umbraco")
-.controller("Umbraco.Editors.BlockPickerController",
-    function ($scope, localizationService, $filter) {
-
-        var unsubscribe = [];
-        const vm = this;
-
-        vm.navigation = [];
-
-        vm.filter = {
-            searchTerm: ""
-        };
-
-        vm.filteredItems = [];
-
-        // Ensure groupKey value, as we need it to be present for the filtering logic.
-        $scope.model.availableItems.forEach(item => {
-            item.blockConfigModel.groupKey = item.blockConfigModel.groupKey || null;
-        });
-
-        unsubscribe.push($scope.$watch('vm.filter.searchTerm', updateFiltering));
-
-        function updateFiltering() {
-            vm.filteredItems = $filter('umbCmsBlockCard')($scope.model.availableItems, vm.filter.searchTerm);
-        }
-
-        vm.filterByGroup = function (group) {
-
-            const items = $filter('filter')(vm.filteredItems, { blockConfigModel: { groupKey: group?.key || null } });
-
-            return items;
-        };
-
-        localizationService.localizeMany(["blockEditor_tabCreateEmpty", "blockEditor_tabClipboard"]).then(
-            function (data) {
-
-                vm.navigation = [{
-                    "alias": "empty",
-                    "name": data[0],
-                    "icon": "icon-add",
-                    "view": ""
-                },
-                {
-                    "alias": "clipboard",
-                    "name": data[1],
-                    "icon": "icon-paste-in",
-                    "view": "",
-                    "disabled": vm.model.clipboardItems.length === 0
-                }];
-
-                if (vm.model.singleBlockMode === true && vm.model.openClipboard === true) {
-                    vm.navigation.splice(0,1);
-                    vm.activeTab = vm.navigation[0];
-                }
-                else if (vm.model.openClipboard === true) {
-                    vm.activeTab = vm.navigation[1];
-                } else {
-                    vm.activeTab = vm.navigation[0];
-                }
-                
-                vm.activeTab.active = true;
-            }
-        );
-
-        vm.onNavigationChanged = function (tab) {
-            vm.activeTab.active = false;
-            vm.activeTab = tab;
-            vm.activeTab.active = true;
-        };
-
-        vm.clickClearClipboard = function () {
-            vm.model.clipboardItems = []; // This dialog is not connected via the clipboardService events, so we need to update manually.
-            vm.model.clickClearClipboard();
-            
-            if (vm.model.singleBlockMode !== true && vm.model.openClipboard !== true)
-            {
-                vm.onNavigationChanged(vm.navigation[0]);
-                vm.navigation[1].disabled = true; // disabled ws determined when creating the navigation, so we need to update it here.
-            }
-            else {
-                vm.close();
-            }
-        };
-
-        vm.model = $scope.model;
-
-        vm.selectItem = function (item, $event) {
-            vm.model.selectedItem = item;
-            vm.model.submit($scope.model, $event);
-        };
-
-        vm.close = function () {
-            if ($scope.model && $scope.model.close) {
-                $scope.model.close($scope.model);
-            }
-        };
-
-        $scope.$on('$destroy', function () {
-            unsubscribe.forEach(u => { u(); });
-        });
-
-    }
-);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html
deleted file mode 100644
index b7b38797da..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/blockpicker/blockpicker.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<div ng-controller="Umbraco.Editors.BlockPickerController as vm">
-
-    <umb-editor-view ng-if="!page.loading">
-
-        <umb-editor-header
-            name="vm.model.title"
-            navigation="vm.navigation"
-            on-select-navigation-item="vm.onNavigationChanged(item)"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container class="block-form">
-
-            <div ng-if="vm.activeTab.alias === 'empty'">
-
-                <div class="umb-control-group" ng-if="vm.model.filter === true" style="margin-bottom: 20px;">
-                    <umb-search-filter
-                        input-id="block-search"
-                        model="vm.filter.searchTerm"
-                        label-key="placeholders_filter"
-                        text="Type to filter..."
-                        css-class="w-100"
-                        auto-focus="true">
-                    </umb-search-filter>
-                </div>
-
-                <div class="umb-block-card-grid" ng-if="vm.filterByGroup(null).length > 0">
-
-                    <umb-block-card
-                        class="umb-outline"
-                        ng-repeat="block in vm.filterByGroup(null)"
-                        block-config-model="block.blockConfigModel"
-                        element-type-model="block.elementTypeModel"
-                        ng-click="vm.selectItem(block, $event)">
-                    </umb-block-card>
-
-                </div>
-                
-                <div ng-repeat="blockGroup in model.blockGroups" ng-if="vm.filterByGroup(blockGroup).length > 0">
-                    <h5>{{blockGroup.name}}</h5>
-
-                    <div class="umb-block-card-grid">
-
-                        <umb-block-card
-                            class="umb-outline"
-                            ng-repeat="block in vm.filterByGroup(blockGroup)"
-                            block-config-model="block.blockConfigModel"
-                            element-type-model="block.elementTypeModel"
-                            ng-click="vm.selectItem(block, $event)">
-                        </umb-block-card>
-
-                    </div>
-
-                </div>
-
-                <umb-empty-state ng-if="vm.filteredItems.length === 0"
-                                 position="center">
-                  <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
-                </umb-empty-state>
-
-            </div>
-
-            <div ng-if="vm.activeTab.alias === 'clipboard'">
-                <div style="margin-bottom:20px; text-align: right;">
-                    <umb-button
-                        type="button"
-                        icon="icon-trash"
-                        button-style="link"
-                        label-key="clipboard_labelForClearClipboard"
-                        action="vm.clickClearClipboard()">
-                    </umb-button>
-                </div>
-
-                <div class="umb-block-card-grid">
-
-                    <umb-block-card
-                        block-config-model="block.blockConfigModel"
-                        element-type-model="block.elementTypeModel"
-                        ng-repeat="block in vm.model.clipboardItems"
-                        ng-click="vm.model.clickPasteItem(block, $event)">
-                    </umb-block-card>
-
-                </div>
-            </div>
-
-        </umb-editor-container>
-
-        <umb-editor-footer>
-
-            <umb-editor-footer-content-right>
-
-                <umb-button
-                    action="vm.close()"
-                    shortcut="esc"
-                    button-style="link"
-                    label-key="general_cancel"
-                    type="button">
-                </umb-button>
-
-            </umb-editor-footer-content-right>
-
-        </umb-editor-footer>
-    </umb-editor-view>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
deleted file mode 100644
index f695b66fc1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
+++ /dev/null
@@ -1,131 +0,0 @@
-(function () {
-    "use strict";
-
-    function CompositionsController($scope, $location, $filter, $timeout, overlayService, localizationService) {
-
-        var vm = this;
-        var oldModel = null;
-
-        vm.showConfirmSubmit = false;
-        vm.loadingAlias = null;
-        vm.hideUnavailable = false;
-
-        vm.isSelected = isSelected;
-        vm.openContentType = openContentType;
-        vm.selectCompositeContentType = selectCompositeContentType;
-        vm.submit = submit;
-        vm.close = close;
-
-        function onInit() {
-
-            /* make a copy of the init model so it is possible to roll
-            back the changes on cancel */
-            oldModel = Utilities.copy($scope.model);
-
-            if (!$scope.model.title) {
-                $scope.model.title = "Compositions";
-            }
-
-            // Group the content types by their container paths
-            vm.availableGroups = $filter("orderBy")(
-                _.map(
-                    _.groupBy($scope.model.availableCompositeContentTypes, function (compositeContentType) {
-
-                        compositeContentType.selected = isSelected(compositeContentType.contentType.alias);
-
-                        return compositeContentType.contentType.metaData.containerPath;
-                    }), function (group) {
-                        return {
-                            containerPath: group[0].contentType.metaData.containerPath,
-                            compositeContentTypes: group
-                        };
-                    }
-                ), function (group) {
-                    return group.containerPath.replace(/\//g, " ");
-                });
-        }
-
-
-        function isSelected(alias) {
-            if ($scope.model.contentType.compositeContentTypes.indexOf(alias) !== -1) {
-                return true;
-            }
-            return false;
-        }
-
-        function openContentType(contentType, section) {
-            var url = (section === "documentType" ? "/settings/documentTypes/edit/" : "/settings/mediaTypes/edit/") + contentType.id;
-            $location.path(url);
-        }
-
-        function selectCompositeContentType(compositeContentType) {
-            vm.loadingAlias = compositeContentType.contentType.alias
-
-            var contentType = compositeContentType.contentType;
-
-            $scope.model.selectCompositeContentType(contentType).then(function (response) {
-                vm.loadingAlias = null;
-            });
-
-            // Check if the template is already selected.
-            var index = $scope.model.contentType.compositeContentTypes.indexOf(contentType.alias);
-
-            if (index === -1) {
-                $scope.model.contentType.compositeContentTypes.push(contentType.alias);
-            } else {
-                $scope.model.contentType.compositeContentTypes.splice(index, 1);
-            }
-        }
-
-        function submit() {
-            if ($scope.model && $scope.model.submit) {
-
-                // check if any compositions has been removed
-                var compositionRemoved = false;
-                for (var i = 0; oldModel.compositeContentTypes.length > i; i++) {
-                    var oldComposition = oldModel.compositeContentTypes[i];
-                    if (_.contains($scope.model.compositeContentTypes, oldComposition) === false) {
-                        compositionRemoved = true;
-                    }
-                }
-
-                /* submit the form if there havne't been removed any composition
-                or the confirm checkbox has been checked */
-                if (compositionRemoved) {
-                    vm.allowSubmit = false;
-                    localizationService.localize("general_remove").then(function (value) {
-                        const dialog = {
-                            view: "views/common/infiniteeditors/compositions/overlays/confirmremove.html",
-                            title: value,
-                            submitButtonLabelKey: "general_ok",
-                            submitButtonStyle: "danger",
-                            closeButtonLabelKey: "general_cancel",
-                            submit: function (model) {
-                                $scope.model.submit($scope.model);
-                                overlayService.close();
-                            },
-                            close: function () {
-                                overlayService.close();
-                            }
-                        };
-                        overlayService.open(dialog);
-                    });
-                    return;
-                }
-
-                $scope.model.submit($scope.model);
-            }
-        }
-
-        function close() {
-            if ($scope.model && $scope.model.close) {
-                $scope.model.close(oldModel);
-            }
-        }
-
-        onInit();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.CompositionsController", CompositionsController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
deleted file mode 100644
index 18d8e8d7ea..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<div ng-controller="Umbraco.Editors.CompositionsController as vm">
-
-    <umb-editor-view>
-
-        <form novalidate name="compositionsForm" val-form-manager>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content>
-
-                  <div ng-if="model.availableCompositeContentTypes.length !== 0">
-
-                    <div class="mb2">
-                      <localize key="contentTypeEditor_compositionsDescription">
-                        Inherit tabs and properties from an existing Document Type. New tabs will be added to the current Document Type or
-                        merged if a tab with an identical name exists.
-                      </localize>
-                    </div>
-
-                    <div class="umb-control-group">
-
-                      <umb-search-filter input-id="composition-search"
-                                         model="vm.searchTerm"
-                                         label-key="placeholders_filter"
-                                         text="Type to filter..."
-                                         css-class="w-100"
-                                         auto-focus="true">
-                      </umb-search-filter>
-
-                      
-                      <umb-checkbox model="vm.hideUnavailable"
-                                    label-key="actions_toggleHideUnavailable"
-                                    class="mt2" style="display: block;">
-                      </umb-checkbox>
-
-                    </div>
-
-                  </div>
-
-                    <div ng-if="model.availableCompositeContentTypes.length === 0">
-
-                      <div ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes <= 1">
-                        <localize key="contentTypeEditor_noAvailableCompositions">There are no Content Types available to use as a composition.</localize>
-                      </div>
-
-                      <div ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes > 1">
-                        <localize key="contentTypeEditor_compositionInUse">This Content Type is used in a composition, and therefore cannot be composed itself.</localize>
-                      </div>
-
-                      <div ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes > 1 && model.whereCompositionUsed.length > 0">
-                        <h5><localize key="contentTypeEditor_compositionUsageHeading">Where is this composition used?</localize></h5>
-                        <p><localize key="contentTypeEditor_compositionUsageSpecification">This composition is currently used in the composition of the following Content Types:</localize></p>
-                        <ul class="umb-checkbox-list">
-                          <li class="umb-checkbox-list__item"
-                              ng-repeat="contentTypeEntity in model.whereCompositionUsed">
-                            <a ng-click="vm.openContentType(contentTypeEntity.contentType, model.section)">
-                              <umb-icon icon="{{contentTypeEntity.contentType.icon}}"></umb-icon>
-                              &nbsp;{{contentTypeEntity.contentType.name}}
-                            </a>
-                          </li>
-                        </ul>
-                      </div>
-                    </div>
-
-                    <div class="umb-control-group -no-border" ng-if="vm.availableGroups.length > 0">
-                        <ul class="umb-checkbox-list" ng-repeat="group in vm.availableGroups | filter:vm.searchTerm">
-                            <li ng-show="vm.availableGroups.length > 1">
-                                <umb-icon icon="icon-folder" class="umb-checkbox-list__item-icon"></umb-icon>
-                                {{group.containerPath}}
-                            </li>
-                            <li class="umb-checkbox-list__item"
-                                ng-repeat="compositeContentType in group.compositeContentTypes | orderBy:'contentType.name' | filter:vm.searchTerm"
-                                ng-class="{'-hidden': ((compositeContentType.allowed === false && !compositeContentType.selected) || compositeContentType.inherited) && vm.hideUnavailable, '-disabled': (compositeContentType.allowed === false && !compositeContentType.selected) || compositeContentType.inherited, '-selected': compositeContentType.selected}">
-
-                                <div class="umb-checkbox-list__item-checkbox" ng-class="{'-selected': compositeContentType.selected }">
-                                    <umb-checkbox input-id="umb-overlay-comp-{{compositeContentType.contentType.key}}"
-                                                  model="compositeContentType.selected"
-                                                  on-change="vm.selectCompositeContentType(compositeContentType)"
-                                                  disabled="(compositeContentType.allowed === false && !compositeContentType.selected) || compositeContentType.inherited || vm.loadingAlias">
-                                    </umb-checkbox>
-                                </div>
-
-                                <label for="umb-overlay-comp-{{compositeContentType.contentType.key}}" class="umb-checkbox-list__item-text" ng-class="{'-faded': compositeContentType.allowed === false && !compositeContentType.selected}">
-                                    <span class="umb-checkbox-list__item-icon-wrapper">
-                                        <umb-icon icon="{{compositeContentType.contentType.icon}}" class="umb-checkbox-list__item-icon" ng-class="{'o-0': compositeContentType.contentType.alias === vm.loadingAlias}"></umb-icon>
-                                        <span ng-if="compositeContentType.contentType.alias === vm.loadingAlias" class="umb-button__progress -black umb-checkbox-list__item-checkbox-progress"></span>
-                                    </span>
-                                    {{ compositeContentType.contentType.name }}
-                                    <span class="umb-checkbox-list__item-caption" ng-if="compositeContentType.inherited">(inherited)</span>
-                                </label>
-
-                            </li>
-                        </ul>
-                    </div>
-
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-                <umb-button
-                    type="button"
-                    button-style="success"
-                    label-key="general_submit"
-                    state="vm.saveButtonState"
-                    action="vm.submit(model)">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-        </form>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/overlays/confirmremove.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/overlays/confirmremove.html
deleted file mode 100644
index 33f48b8c1e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/overlays/confirmremove.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div>
-
-    <div class="umb-alert umb-alert--warning mb2">
-        <localize key="contentTypeEditor_compositionRemoveWarning">Removing a composition will delete all the associated property data. Once you save the Document Type there's no way
-        back.</localize>
-    </div>
-
-    <localize key="defaultdialogs_confirmSure">Are you sure?</localize>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.controller.js
deleted file mode 100644
index 8d9acd4230..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.controller.js
+++ /dev/null
@@ -1,145 +0,0 @@
-(function () {
-    "use strict";
-
-    function CopyController($scope, localizationService, eventsService, entityHelper) {
-
-        var vm = this;
-
-        vm.labels = {};
-        vm.hideSearch = hideSearch;
-        vm.selectResult = selectResult;
-        vm.onSearchResults = onSearchResults;
-        vm.onToggle = toggleHandler;
-        vm.submit = submit;
-        vm.close = close;
-
-        var dialogOptions = $scope.model;
-        var node = dialogOptions.currentNode;
-
-      $scope.model.relateToOriginal = true;
-      $scope.model.includeDescendants = true;
-      $scope.dialogTreeApi = {};
-
-        vm.searchInfo = {
-            searchFromId: null,
-            searchFromName: null,
-            showSearch: false,
-            results: [],
-            selectedSearchResults: []
-        };
-
-        // get entity type based on the section
-        $scope.entityType = entityHelper.getEntityTypeFromSection(dialogOptions.section);
-
-        function onInit() {
-
-            var labelKeys = [
-                "general_copy"
-            ];
-
-            localizationService.localizeMany(labelKeys).then(function (data) {
-
-                vm.labels.title = data[0];
-
-                setTitle(vm.labels.title);
-            });
-        }
-
-        function setTitle(value) {
-            if (!$scope.model.title) {
-                $scope.model.title = value;
-            }
-        }
-
-        function nodeSelectHandler(args) {
-            if (args && args.event) {
-                args.event.preventDefault();
-                args.event.stopPropagation();
-            }
-
-            //eventsService.emit("editors.content.copyController.select", args);
-
-            if ($scope.model.target) {
-                //un-select if there's a current one selected
-                $scope.model.target.selected = false;
-            }
-
-            $scope.model.target = args.node;
-            $scope.model.target.selected = true;
-        }
-
-        function nodeExpandedHandler(args) {
-            // open mini list view for list views
-            if (args.node.metaData.isContainer) {
-                openMiniListView(args.node);
-            }
-        }
-
-        function hideSearch() {
-            vm.searchInfo.showSearch = false;
-            vm.searchInfo.searchFromId = null;
-            vm.searchInfo.searchFromName = null;
-            vm.searchInfo.results = [];
-        }
-
-        // method to select a search result
-        function selectResult(evt, result) {
-            result.selected = result.selected === true ? false : true;
-            nodeSelectHandler({ event: evt, node: result });
-        }
-
-        //callback when there are search results
-        function onSearchResults(results) {
-            vm.searchInfo.results = results;
-            vm.searchInfo.showSearch = true;
-        }
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-            $scope.dialogTreeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
-        }
-
-
-        // Mini list view
-        $scope.selectListViewNode = function (node) {
-            node.selected = node.selected === true ? false : true;
-            nodeSelectHandler({ node: node });
-        };
-
-        $scope.closeMiniListView = function () {
-            $scope.miniListView = undefined;
-        };
-
-        function openMiniListView(node) {
-            $scope.miniListView = node;
-        }
-
-        function submit() {
-            if ($scope.model && $scope.model.submit) {
-                $scope.model.submit($scope.model);
-            }
-        }
-
-        function close() {
-            if ($scope.model && $scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        function toggleHandler(type) {
-            // If the relateToOriginal toggle is clicked
-            if (type === "relate") {
-                $scope.model.relateToOriginal = !$scope.model.relateToOriginal;
-            }
-            // If the includeDescendants toggle is clicked
-            if (type === "descendants") {
-                $scope.model.includeDescendants = !$scope.model.includeDescendants;
-            }
-        }
-
-        onInit();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.CopyController", CopyController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.html
deleted file mode 100644
index c06c292a06..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<div ng-controller="Umbraco.Editors.CopyController as vm">
-
-    <umb-editor-view>
-
-        <form novalidate name="copyNodesForm" class="form-horizontal" val-form-manager>
-    
-            <umb-editor-header
-                name="model.title"
-                name-locked="true"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container>
-                <umb-box>
-                    <umb-box-content>
-                        <p class="abstract">
-                            <localize key="actions_infiniteEditorChooseWhereToCopy">Choose where to copy the selected item(s)</localize>
-                        </p>
-
-                        <div ng-hide="miniListView">
-                            <div class="umb-control-group">
-                                <umb-tree-search-box
-                                    hide-search-callback="vm.hideSearch"
-                                    search-callback="vm.onSearchResults"
-                                    search-from-id="{{vm.searchInfo.searchFromId}}"
-                                    search-from-name="{{vm.searchInfo.searchFromName}}"
-                                    show-search="{{vm.searchInfo.showSearch}}"
-                                    section="{{model.section}}">
-                                </umb-tree-search-box>
-                            </div>
-                    
-                            <div class="umb-control-group" ng-show="vm.searchInfo.showSearch">
-                                <umb-tree-search-results
-                                    ng-if="vm.searchInfo.showSearch"
-                                    results="vm.searchInfo.results"
-                                    select-result-callback="vm.selectResult">
-                                </umb-tree-search-results>
-                            </div>
-                    
-                            <div class="umb-control-group -no-border" ng-hide="vm.searchInfo.showSearch">
-                                <umb-tree
-                                    section="{{model.section}}"
-                                    hideheader="false"
-                                    hideoptions="true"
-                                    isdialog="true"
-                                    api="dialogTreeApi"
-                                    on-init="onTreeInit()"
-                                    enablelistviewexpand="true"
-                                    enablecheckboxes="true">
-                                </umb-tree>
-                            </div>
-                    
-                        </div>
-                        
-                        <div ng-if="miniListView" class="umb-control-group">
-                            <umb-mini-list-view
-                                node="miniListView"
-                                entity-type="{{entityType}}"
-                                on-select="selectListViewNode(node)"
-                                on-close="closeMiniListView()">
-                            </umb-mini-list-view>
-                        </div>
-                    
-                        <umb-pane>
-                            <umb-control-group localize="label" label="@defaultdialogs_relateToOriginalLabel">
-                                <umb-toggle label-position="left" checked="model.relateToOriginal" on-click="vm.onToggle('relate')"></umb-toggle>
-                            </umb-control-group>
-                        </umb-pane>
-                        <umb-pane>
-                            <umb-control-group localize="label" label="@defaultdialogs_includeDescendants">
-                                <umb-toggle label-position="left" checked="model.includeDescendants" on-click="vm.onToggle('descendants')"></umb-toggle>
-                            </umb-control-group>
-                        </umb-pane>
-                    </umb-box-content>
-                </umb-box>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                <umb-editor-footer-content-right>
-                    <umb-button
-                        type="button"
-                        button-style="link"
-                        label-key="general_close"
-                        shortcut="esc"
-                        action="vm.close()">
-                    </umb-button>
-                    <umb-button
-                        type="button"
-                        button-style="success"
-                        label-key="general_submit"
-                        state="vm.saveButtonState"
-                        action="vm.submit(model)"
-                        disabled="!model.target">
-                    </umb-button>
-                </umb-editor-footer-content-right>
-            </umb-editor-footer>
-
-        </form>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.controller.js
deleted file mode 100644
index dc68771ed0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.controller.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DataTypeConfigurationPickerController
- * @function
- *
- * @description
- * The controller for the content type editor data type configuration picker dialog
- */
-
-(function() {
-    "use strict";
-
-    function DataTypeConfigurationPicker($scope, $filter, dataTypeResource, dataTypeHelper, contentTypeResource, localizationService, editorService) {
-        
-        var vm = this;
-        
-        vm.configs = [];
-        
-        vm.loading = true;
-        
-        vm.newDataType = newDataType;
-        vm.pickDataType = pickDataType;
-        vm.close = close;
-
-        function activate() {
-            setTitle();
-            load();
-        }
-
-        function setTitle() {
-            if (!$scope.model.title) {
-                localizationService.localize("defaultdialogs_selectEditorConfiguration")
-                    .then(function(data){
-                        $scope.model.title = data;
-                    });
-            }
-        }
-
-        function load() {
-
-            dataTypeResource.getGroupedDataTypes().then(function(configs) {
-                
-                var filteredConfigs = [];
-                
-                Object.values(configs).forEach(configGroup => {
-                    for(var i = 0; i < configGroup.length; i++) {
-                        if (configGroup[i].alias === $scope.model.editor.alias) {
-                            filteredConfigs.push(configGroup[i]);
-                        }
-                    }
-                });
-            
-                vm.configs = filteredConfigs;
-                vm.loading = false;
-            });
-
-        }
-        
-        function newDataType() {
-
-            var dataTypeSettings = {
-                propertyEditor: $scope.model.editor,
-                property: $scope.model.property,
-                contentTypeName: $scope.model.contentTypeName,
-                create: true,
-                view: "views/common/infiniteeditors/datatypesettings/datatypesettings.html",
-                submit: function(model) {
-                    contentTypeResource.getPropertyTypeScaffold(model.dataType.id).then(function(propertyType) {
-                        $scope.model.submit(model.dataType, propertyType, true);
-                        editorService.close();
-                    });
-                },
-                close: function() {
-                    editorService.close();
-                }
-            };
-
-            editorService.open(dataTypeSettings);
-
-        }
-
-        function pickDataType(selectedConfig) {
-
-            selectedConfig.loading = true;
-            dataTypeResource.getById(selectedConfig.id).then(function(dataType) {
-                contentTypeResource.getPropertyTypeScaffold(dataType.id).then(function(propertyType) {
-                    selectedConfig.loading = false;
-                    $scope.model.submit(dataType, propertyType, false);
-                });
-            });
-        }
-        
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        activate();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.DataTypeConfigurationPickerController", DataTypeConfigurationPicker);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.html
deleted file mode 100644
index 7146d6dc7c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<div ng-controller="Umbraco.Editors.DataTypeConfigurationPickerController as vm">
-    <umb-editor-view data-element="editor-data-type-picker">
-
-        <form novalidate name="DataTypeConfigurationPickerForm" val-form-manager>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content>
-
-                    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-                    <div ng-if="!vm.loading">
-                        <ul class="umb-card-grid -three-in-row">
-                            <li ng-repeat="dataTypeConfig in vm.configs | orderBy:'name' track by $index"
-                                data-element="datatypeconfig-{{dataTypeConfig.name}}">
-                                <div ng-if="dataTypeConfig.loading" class="umb-card-grid-item__loading">
-                                    <div class="umb-button__progress"></div>
-                                </div>
-                                <button umb-auto-focus="{{$index === 0}}" class="btn-reset umb-card-grid-item" type="button" ng-click="vm.pickDataType(dataTypeConfig)" title="Select {{ dataTypeConfig.name }}">
-                                    <span>
-                                        <umb-icon icon="{{dataTypeConfig.icon || 'icon-autofill'}}"></umb-icon>
-                                        <span class="sr-only">Select</span> {{ dataTypeConfig.name }}
-                                    </span>
-                                </button>
-                            </li>
-                        </ul>
-                        <ul class="umb-card-grid -three-in-row">
-                            <li>
-                                <button umb-auto-focus="{{vm.configs.length === 0}}" class="btn-reset umb-card-grid-item-slot" type="button" ng-click="vm.newDataType()" title="Create a new configuration of {{ model.editor.name }}">
-                                    <span>
-                                        <umb-icon icon="icon-add" class="icon"></umb-icon>
-                                        Create new <span class="sr-only">configuration of {{ model.editor.name }}</span>
-                                    </span>
-                                </button>
-                            </li>
-                        </ul>
-
-                    </div>
-
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-        </form>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js
deleted file mode 100644
index d622ccea52..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.controller.js
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DataTypePickerController
- * @function
- *
- * @description
- * The controller for the content type editor data type picker dialog
- */
-
-(function() {
-    "use strict";
-
-    function DataTypePicker($scope, $filter, dataTypeResource, contentTypeResource, localizationService, editorService) {
-
-        var vm = this;
-        
-        vm.showDataTypes = true;
-        vm.dataTypes = [];
-        vm.loading = true;
-        vm.loadingConfigs = false;
-        vm.searchTerm = "";
-        vm.searchResult = null;
-        
-        vm.viewOptionsForEditor = viewOptionsForEditor;
-        vm.pickDataType = pickDataType;
-        vm.pickEditor = pickEditor;
-        vm.close = close;
-        vm.searchTermChanged = searchTermChanged;
-
-        function activate() {
-            setTitle();
-            loadTypes();
-        }
-
-        function setTitle() {
-            if (!$scope.model.title) {
-                localizationService.localize("defaultdialogs_selectEditor")
-                    .then(function(data){
-                        $scope.model.title = data;
-                    }
-                );
-            }
-        }
-        
-        function loadTypes() {
-            
-            dataTypeResource.getGroupedPropertyEditors().then(function(dataTypes) {
-                vm.dataTypes = dataTypes;
-                vm.loading = false;
-            });
-
-        }
-        
-        function loadConfigurations() {
-            
-            vm.loading = true;
-            vm.loadingConfigs = true;
-            
-            dataTypeResource.getGroupedDataTypes().then(function(configs) {
-                vm.configs = configs;
-                vm.loading = false;
-                performeSearch();
-            });
-
-        }
-
-        
-        function searchTermChanged() {
-            
-            vm.showDataTypes = (vm.searchTerm === "");
-            
-            if(vm.loadingConfigs !== true) {
-                loadConfigurations()
-            } else {
-                performeSearch();
-            }
-            
-        }
-        
-        function performeSearch() {
-            
-            if (vm.searchTerm) {
-                if (vm.configs) {
-                    
-                    var regex = new RegExp(vm.searchTerm, "i");
-                    vm.searchResult = {
-                        configs: filterCollection(vm.configs, regex),
-                        dataTypes: filterCollection(vm.dataTypes, regex)
-                    };
-                }
-            } else {
-                vm.searchResult = null;
-            }
-            
-        }
-        
-        function filterCollection(collection, regex) {
-            return _.map(_.keys(collection), function (key) {
-                return {
-                    group: key,
-                    entries: $filter('filter')(collection[key], function (dataType) {
-                        return regex.test(dataType.name) || regex.test(dataType.alias);
-                    })
-                }
-            });
-        }
-
-        
-        function viewOptionsForEditor(editor) {
-            
-            var dataTypeConfigurationPicker = {
-                editor: editor,
-                property: $scope.model.property,
-                contentTypeName: $scope.model.contentTypeName,
-                view: "views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.html",
-                size: "small",
-                submit: function(dataType, propertyType, isNew) {
-                    submit(dataType, propertyType, isNew);
-                    editorService.close();
-                },
-                close: function() {
-                    editorService.close();
-                }
-            };
-
-            editorService.open(dataTypeConfigurationPicker);
-
-        }
-
-        function pickDataType(selectedDataType) {
-            selectedDataType.loading = true;
-            dataTypeResource.getById(selectedDataType.id).then(function(dataType) {
-                contentTypeResource.getPropertyTypeScaffold(dataType.id).then(function(propertyType) {
-                    selectedDataType.loading = false;
-                    submit(dataType, propertyType, false);
-                });
-            });
-        }
-
-        function pickEditor(propertyEditor) {
-
-            var dataTypeSettings = {
-                propertyEditor: propertyEditor,
-                property: $scope.model.property,
-                contentTypeName: $scope.model.contentTypeName,
-                create: true,
-                view: "views/common/infiniteeditors/datatypesettings/datatypesettings.html",
-                submit: function(model) {
-                    contentTypeResource.getPropertyTypeScaffold(model.dataType.id).then(function(propertyType) {
-                        submit(model.dataType, propertyType, true);
-                        editorService.close();
-                    });
-                },
-                close: function() {
-                    editorService.close();
-                }
-            };
-
-            editorService.open(dataTypeSettings);
-
-        }
-
-        function submit(dataType, propertyType, isNew) {
-            // update property
-            $scope.model.property.config = propertyType.config;
-            $scope.model.property.editor = propertyType.editor;
-            $scope.model.property.view = propertyType.view;
-            $scope.model.property.dataTypeId = dataType.id;
-            $scope.model.property.dataTypeIcon = dataType.icon;
-            $scope.model.property.dataTypeName = dataType.name;
-
-            $scope.model.updateSameDataTypes = isNew;
-
-            $scope.model.submit($scope.model);
-        }
-        
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        activate();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.DataTypePickerController", DataTypePicker);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
deleted file mode 100644
index 5a3f7e9fc6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<div ng-controller="Umbraco.Editors.DataTypePickerController as vm">
-    <umb-editor-view data-element="editor-data-type-picker">
-
-        <form novalidate name="DataTypePickerForm" val-form-manager>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content>
-
-                    <umb-search-filter
-                        input-id="datatype-search"
-                        model="vm.searchTerm"
-                        label-key="placeholders_search"
-                        text="Type to search"
-                        on-change="vm.searchTermChanged()"
-                        css-class="w-100"
-                        auto-focus="true">
-                    </umb-search-filter>
-
-                    <umb-load-indicator ng-if="vm.loading === true"></umb-load-indicator>
-
-                    <div ng-if="vm.loading === false && vm.showDataTypes === true">
-                        <div ng-repeat="(key,value) in vm.dataTypes">
-                            <h2 class="h5">{{key | umbCmsTitleCase}}</h2>
-                            <ul class="umb-card-grid -six-in-row">
-                                <li ng-repeat="dataType in value | orderBy:'name'" data-element="datatype-{{dataType.name}}">
-                                    <button type="button"
-                                            class="btn-reset umb-card-grid-item"
-                                            ng-click="vm.viewOptionsForEditor(dataType)"
-                                            title="{{dataType.name}}">
-                                        <span>
-                                            <umb-icon icon="{{dataType.icon || 'icon-autofill'}}"></umb-icon>
-                                            {{dataType.name}}
-                                        </span>
-                                    </button>
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
-
-                    <!-- SEARCH RESULTS -->
-                    <div ng-if="vm.loading === false && vm.showDataTypes === false && vm.searchResult !== null">
-                        <h2 class="h5 -border-bottom -black">
-                            <localize key="contentTypeEditor_searchResultSettings">Available configurations</localize>
-                        </h2>
-                        <div ng-repeat="result in vm.searchResult.configs">
-                            <div ng-if="result.entries.length > 0">
-                                <h3 class="h5">{{result.group | umbCmsTitleCase}}</h3>
-                                <ul class="umb-card-grid -six-in-row">
-                                    <li ng-repeat="dataType in result.entries | orderBy:'name'"
-                                        ng-mouseover="vm.showDetailsOverlay(dataType)">
-                                        <div ng-if="dataType.loading" class="umb-card-grid-item__loading">
-                                            <div class="umb-button__progress"></div>
-                                        </div>
-                                        <button type="button"
-                                                class="btn-reset umb-card-grid-item"
-                                                ng-click="vm.pickDataType(dataType)"
-                                                title="{{dataType.name}}">
-                                            <span>
-                                                <umb-icon icon="{{dataType.icon || 'icon-autofill'}}"></umb-icon>
-                                                {{dataType.name}}
-                                            </span>
-                                        </button>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
-                        <h2 class="h5 -border-bottom -black">
-                            <localize key="contentTypeEditor_searchResultEditors">Create a new configuration</localize>
-                        </h2>
-                        <div ng-repeat="result in vm.searchResult.dataTypes">
-                            <div ng-if="result.entries.length > 0">
-                                <h3 class="h5">{{result.group | umbCmsTitleCase}}</h3>
-                                <ul class="umb-card-grid -six-in-row">
-                                    <li ng-repeat="dataType in result.entries | orderBy:'name'">
-                                        <button type="button"
-                                                class="btn-reset umb-card-grid-item"
-                                                ng-click="vm.pickEditor(dataType)"
-                                                title="{{dataType.name}}">
-                                            <span>
-                                                <umb-icon icon="{{dataType.icon || 'icon-autofill'}}"></umb-icon>
-                                                {{dataType.name}}
-                                            </span>
-                                        </button>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
-                    </div>
-
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-        </form>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
deleted file mode 100644
index 171f7d9c86..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DataTypeSettingsController
- * @function
- *
- * @description
- * The controller for the content type editor data type settings dialog
- */
-
-(function () {
-  "use strict";
-
-  function DataTypeSettingsController($scope, dataTypeResource, dataTypeHelper,
-                                      localizationService, notificationsService, overlayService, formHelper, eventsService) {
-
-    var vm = this;
-
-    vm.dataType = {};
-    vm.loadingDataType = false;
-    vm.saveButtonState = "init";
-
-    vm.close = close;
-    vm.submit = submit;
-
-    function onInit() {
-
-      setTitle();
-
-      if($scope.model.create) {
-        createNewDataType();
-      } else {
-        getDataType();
-      }
-    }
-
-    function setTitle() {
-      if(!$scope.model.title) {
-        localizationService.localize("contentTypeEditor_editorSettings")
-          .then(function(data){
-            $scope.model.title = data;
-          });
-      }
-    }
-
-    function createNewDataType() {
-
-      vm.loadingDataType = true;
-
-      var parentId = -1;
-      var newDataType = {};
-
-      dataTypeResource.getScaffold(parentId).then(function(dataType) {
-
-        newDataType = dataType;
-
-        // set alias
-        newDataType.selectedEditor = $scope.model.propertyEditor.alias;
-
-        // set name
-        var nameArray = [];
-
-        if ($scope.model.contentTypeName) {
-          nameArray.push($scope.model.contentTypeName);
-        }
-
-        if ($scope.model.property.label) {
-          nameArray.push($scope.model.property.label);
-        }
-
-        if ($scope.model.propertyEditor.name) {
-          nameArray.push($scope.model.propertyEditor.name);
-        }
-
-        // make name
-        newDataType.name = nameArray.join(" - ");
-
-        // get pre values
-        dataTypeResource.getPreValues(newDataType.selectedEditor).then(function(preValues) {
-          newDataType.preValues = dataTypeHelper.createPreValueProps(preValues);
-          vm.dataType = newDataType;
-          vm.loadingDataType = false;
-        });
-
-      });
-
-    }
-
-    function getDataType() {
-      vm.loadingDataType = true;
-      dataTypeResource.getById($scope.model.id).then(function (dataType) {
-        vm.dataType = dataType;
-        vm.dataType.preValues = dataTypeHelper.createPreValueProps(dataType.preValues);
-        vm.loadingDataType = false;
-      });
-    }
-
-    function close() {
-      if ($scope.model && $scope.model.close) {
-        $scope.model.close();
-      }
-    }
-
-    function submit() {
-      if (!formHelper.submitForm({ scope: $scope })) {
-        return;
-      }
-
-      vm.saveButtonState = "busy";
-
-      dataTypeResource.save(vm.dataType, vm.dataType.preValues, $scope.model.create).then(
-        function(newDataType) {
-          $scope.model.dataType = newDataType;
-
-          var args = { dataType: newDataType };
-          eventsService.emit("editors.dataTypeSettings.saved", args);
-
-          vm.saveButtonState = "success";
-
-          if ($scope.model && $scope.model.submit) {
-            $scope.model.submit($scope.model);
-          }
-        }, function(err) {
-          vm.saveButtonState = "error";
-
-          if(err.status === 400) {
-            if (err.data && (err.data.ModelState)) {
-
-              formHelper.handleServerValidation(err.data.ModelState);
-
-              for (var e in err.data.ModelState) {
-                notificationsService.error("Validation", err.data.ModelState[e][0]);
-              }
-            }
-          }
-        }
-      );
-
-    }
-
-    onInit();
-
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.DataTypeSettingsController", DataTypeSettingsController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
deleted file mode 100644
index 4e3923d3ee..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<div ng-controller="Umbraco.Editors.DataTypeSettingsController as vm">
-
-<form novalidate name="dataTypeSettingsForm" val-form-manager>
-
-    <umb-editor-view data-element="editor-data-type-settings">
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container class="form-horizontal">
-
-            <umb-load-indicator
-                ng-if="vm.loadingDataType">
-            </umb-load-indicator>
-
-            <umb-box ng-if="!vm.loadingDataType">
-                <umb-box-content>
-
-                    <div class="control-group umb-control-group" ng-if="vm.dataType.id !== 0">
-                        <umb-icon icon="icon-alert" class="red"></umb-icon>
-                        <strong class="red"><localize key="contentTypeEditor_allDocumentTypes">All Document Types</localize></strong> <localize key="usingEditor">using this editor will get updated with the new settings.</localize>
-                    </div>
-
-                    <div class="control-group umb-control-group">
-                        <div class="umb-el-wrap">
-                            <label class="control-label" for="dataTypeName">
-                                <localize key="general_name">Name</localize>
-                            </label>
-                            <div class="controls">
-                                <input type="text" id="dataTypeName" ng-model="vm.dataType.name" class="umb-property-editor" umb-auto-focus focus-on-filled="true" required />
-                            </div>
-                        </div>
-                    </div>
-
-                    <div ng-if="vm.dataType.preValues.length > 0">
-                        <h5><localize key="contentTypeEditor_configuration">Configuration</localize></h5>
-
-                        <umb-property property="preValue" ng-repeat="preValue in vm.dataType.preValues">
-                            <umb-property-editor model="preValue" pre-values="vm.dataType.preValues" is-pre-value="true"></umb-property-editor>
-                        </umb-property>
-                    </div>
-
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-                <umb-button
-                    alias="submit"
-                    type="button"
-                    button-style="success"
-                    label-key="general_submit"
-                    state="vm.saveButtonState"
-                    action="vm.submit(model)">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
deleted file mode 100644
index 8b1cffdc4c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
+++ /dev/null
@@ -1,165 +0,0 @@
-(function() {
-   "use strict";
-
-   function EmbedController($scope, $http, $sce, umbRequestHelper, localizationService) {
-
-        var vm = this;
-        var origWidth = 500;
-        var origHeight = 300;
-
-        vm.loading = false;
-        vm.trustedPreview = null;
-
-        $scope.model.embed = {
-            url: "",
-            width: 360,
-            height: 240,
-            constrain: true,
-            preview: "",
-            success: false,
-            info: "",
-            a11yInfo: "",
-            supportsDimensions: false,
-            originalWidth: 360,
-            originalHeight: 240
-   };
-
-        if ($scope.model.modify) {
-            Utilities.extend($scope.model.embed, $scope.model.modify);
-
-            showPreview();
-        }
-
-        vm.toggleConstrain = toggleConstrain;
-        vm.showPreview = showPreview;
-        vm.changeSize = changeSize;
-        vm.submit = submit;
-        vm.close = close;
-        
-       function onInit() {
-            if (!$scope.model.title) {
-                localizationService.localize("general_embed").then(function(value){
-                    $scope.model.title = value;
-                });
-            }
-        }
-
-        function showPreview() {
-
-            if ($scope.model.embed.url) {
-                $scope.model.embed.show = true;
-                $scope.model.embed.info = "";
-                $scope.model.embed.a11yInfo = "";
-                $scope.model.embed.success = false;
-                vm.loading = true;
-
-                $http({
-                    method: 'GET',
-                    url: umbRequestHelper.getApiUrl("embedApiBaseUrl", "GetEmbed"),
-                    params: {
-                        url: $scope.model.embed.url,
-                        width: $scope.model.embed.width,
-                        height: $scope.model.embed.height
-                    }
-                }).then(function(response) {
-
-                    $scope.model.embed.preview = "";
-
-                    switch (response.data.OEmbedStatus) {
-                        case 0:
-                        case 'NotSupported':
-                            //not supported
-                            $scope.model.embed.preview = "";
-                            $scope.model.embed.info = "Not supported";
-                            $scope.model.embed.a11yInfo = $scope.model.embed.info;
-                            $scope.model.embed.success = false;
-                            $scope.model.embed.supportsDimensions = false;
-                            vm.trustedPreview = null;
-                            break;
-                        case 1:
-                        case 'Error':
-                            //error
-                            $scope.model.embed.preview = "";
-                            $scope.model.embed.info = "Could not embed media - please ensure the URL is valid";
-                            $scope.model.embed.a11yInfo = $scope.model.embed.info;
-                            $scope.model.embed.success = false;
-                            $scope.model.embed.supportsDimensions = false;
-                            vm.trustedPreview = null;
-                            break;
-                        case 2:
-                        case 'Success':
-                            $scope.model.embed.success = true;
-                            $scope.model.embed.supportsDimensions = response.data.SupportsDimensions;
-                            $scope.model.embed.preview = response.data.Markup;
-                            $scope.model.embed.info = "";
-                            $scope.model.embed.a11yInfo = "Retrieved URL";
-                            vm.trustedPreview = $sce.trustAsHtml(response.data.Markup);
-                            break;
-                    }
-
-                    vm.loading = false;
-
-                }, function() {
-                    $scope.model.embed.success = false;
-                    $scope.model.embed.supportsDimensions = false;
-                    $scope.model.embed.preview = "";
-                    $scope.model.embed.info = "Could not embed media - please ensure the URL is valid";
-                    $scope.model.embed.a11yInfo = $scope.model.embed.info;
-                    vm.loading = false;
-                });
-            } else {
-                $scope.model.embed.supportsDimensions = false;
-                $scope.model.embed.preview = "";
-                $scope.model.embed.info = "Please enter a URL";
-                $scope.model.embed.a11yInfo = $scope.model.embed.info;
-            }
-        }
-
-       function changeSize(type) {
-
-           var width = parseInt($scope.model.embed.width, 10);
-           var height = parseInt($scope.model.embed.height, 10);
-           var originalWidth = parseInt($scope.model.embed.originalWidth, 10);
-           var originalHeight = parseInt($scope.model.embed.originalHeight, 10);
-           var resize = originalWidth !== width || originalHeight !== height;
-
-           if ($scope.model.embed.constrain) {
-
-               if (type === 'width') {
-                   origHeight = Math.round((width / origWidth) * height);
-                   $scope.model.embed.height = origHeight;
-               } else {
-                   origWidth = Math.round((height / origHeight) * width);
-                   $scope.model.embed.width = origWidth;
-               }
-           }
-           $scope.model.embed.originalWidth = $scope.model.embed.width;
-           $scope.model.embed.originalHeight = $scope.model.embed.height;
-           if ($scope.model.embed.url !== "" && resize) {
-               showPreview();
-           }
-
-       }
-
-       function toggleConstrain() {
-           $scope.model.embed.constrain = !$scope.model.embed.constrain;
-       }
-
-       function submit() {
-            if ($scope.model && $scope.model.submit) {
-                $scope.model.submit($scope.model);
-            }
-        }
-
-        function close() {
-            if ($scope.model && $scope.model.close) {
-                $scope.model.close();
-            }
-       }
-
-        onInit();
-   }
-
-   angular.module("umbraco").controller("Umbraco.Editors.EmbedController", EmbedController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
deleted file mode 100644
index fd86f55c07..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<div ng-controller="Umbraco.Editors.EmbedController as vm">
-    <form name="embedForm">
-
-        <umb-editor-view>
-                
-            <umb-editor-header
-                name="model.title"
-                name-locked="true"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container class="block-form">
-                <umb-box>
-                    <umb-box-content>
-
-                        <umb-control-group label="@general_url" alias="url">
-                            <input type="text" id="url" class="umb-property-editor input-block-level" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
-                            <umb-button
-                                type="button"
-                                action="vm.showPreview()"
-                                button-style="info"
-                                label-key="general_retrieve">
-                            </umb-button>
-                        </umb-control-group>
-
-                        <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-                        <div ng-if="!vm.loading">
-
-                            <umb-control-group>
-                                <p ng-bind="model.embed.info" aria-hidden="true"></p>
-                                <p ng-bind="model.embed.a11yInfo" class="sr-only" role="alert"></p>
-                                <div ng-bind-html="vm.trustedPreview"></div>
-                            </umb-control-group>
-                            
-                            <div ng-show="model.embed.supportsDimensions && model.embed.success">
-                                <umb-control-group label="@general_width" alias="width">
-                                    <input type="number" id="width" pattern="[0-9]*" min="0" ng-model="model.embed.width" ng-blur="vm.changeSize('width')" />
-                                </umb-control-group>
-                
-                                <umb-control-group label="@general_height" alias="height">
-                                    <input type="number" id="height" pattern="[0-9]*" min="0" ng-model="model.embed.height" ng-blur="vm.changeSize('height')" />
-                                </umb-control-group>
-                
-                                <umb-control-group label="@general_constrain" alias="constrain">
-                                    <umb-toggle checked="model.embed.constrain" id="constrain"  on-click="vm.toggleConstrain()"></umb-toggle>
-                                </umb-control-group>
-                            </div>
-
-                        </div>
-                        
-                    </umb-box-content>
-                </umb-box>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                <umb-editor-footer-content-right>
-                    <umb-button
-                        type="button"
-                        button-style="link"
-                        label-key="general_close"
-                        shortcut="esc"
-                        action="vm.close()">
-                    </umb-button>
-                    <umb-button
-                        type="button"
-                        button-style="success"
-                        label-key="general_submit"
-                        state="vm.saveButtonState"
-                        disabled="!model.embed.url.length || !model.embed.preview.length"
-                        action="vm.submit(model)">
-                    </umb-button>
-                </umb-editor-footer-content-right>
-            </umb-editor-footer>
-
-        </umb-editor-view>
-
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/eventpicker/eventpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/eventpicker/eventpicker.controller.js
deleted file mode 100644
index 2e19a102a2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/eventpicker/eventpicker.controller.js
+++ /dev/null
@@ -1,98 +0,0 @@
-(function () {
-  "use strict";
-
-  function EventPickerController($scope, languageResource, localizationService, webhooksResource) {
-
-    var vm = this;
-
-    vm.events = [];
-    vm.loading = false;
-
-    vm.selectEvent = selectEvent;
-    vm.submit = submit;
-    vm.close = close;
-
-    function onInit() {
-
-      vm.loading = true;
-
-      // set default title
-      if (!$scope.model.title) {
-        localizationService.localize("defaultdialogs_selectLanguages").then(function (value) {
-          $scope.model.title = value;
-        });
-      }
-
-      // make sure we can push to something
-      if (!$scope.model.selection) {
-        $scope.model.selection = [];
-      }
-
-      getAllEvents();
-      vm.loading = false;
-    }
-
-    function getAllEvents(){
-      // get all events
-      webhooksResource.getAllEvents()
-        .then((data) => {
-          let selectedEvents = [];
-          data.forEach(function (event) {
-            event.selected = false;
-            vm.events.push(event);
-            if($scope.model.selectedEvents && $scope.model.selectedEvents.some(x => x.alias === event.alias)){
-              selectedEvents.push(event);
-            }
-          });
-
-          selectedEvents.forEach(function (event) {
-            selectEvent(event)
-          });
-        });
-    }
-
-    function selectEvent(event) {
-      if (!event.selected) {
-        event.selected = true;
-        $scope.model.selection.push(event);
-
-        // Only filter if we have not selected an item yet.
-        if($scope.model.selection.length === 1){
-          vm.events = vm.events.filter(x => x.eventType === event.eventType);
-        }
-      }
-      else {
-        $scope.model.selection.forEach(function (selectedEvent, index) {
-          if (selectedEvent.alias === event.alias) {
-            event.selected = false;
-            $scope.model.selection.splice(index, 1);
-          }
-        });
-
-        if($scope.model.selection.length === 0){
-          vm.events = [];
-          $scope.model.selectedEvents = [];
-          getAllEvents();
-        }
-      }
-    }
-
-    function submit(model) {
-      if ($scope.model.submit) {
-        $scope.model.submit(model);
-      }
-    }
-
-    function close() {
-      if ($scope.model.close) {
-        $scope.model.close();
-      }
-    }
-
-    onInit();
-
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.EventPickerController", EventPickerController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/eventpicker/eventpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/eventpicker/eventpicker.html
deleted file mode 100644
index e87674791c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/eventpicker/eventpicker.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<div ng-controller="Umbraco.Editors.EventPickerController as vm">
-
-  <umb-editor-view>
-
-    <umb-editor-header
-      name="model.title"
-      name-locked="true"
-      hide-alias="true"
-      hide-icon="true"
-      hide-description="true">
-    </umb-editor-header>
-
-    <umb-editor-container>
-      <umb-box>
-        <umb-box-content>
-
-          <div class="umb-control-group">
-            <umb-search-filter
-              input-id="event-search"
-              model="vm.filter.searchTerm"
-              label-key="placeholders_search"
-              text="Type to search"
-              css-class="w-100"
-              auto-focus="true">
-            </umb-search-filter>
-          </div>
-
-          <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-          <div ng-show="vm.loading === false && filtered.length > 0">
-            <ul class="umb-tree">
-              <li class="umb-tree-item" ng-repeat="event in filtered = (vm.events | filter: { 'eventName': vm.filter.searchTerm } | orderBy: '+eventName')">
-                <div class="umb-tree-item__inner" style="padding: 5px 10px;">
-                  <button type="button"
-                          class="btn-reset text-left flex-auto"
-                          ng-class="{ 'umb-tree-node-checked': event.selected }"
-                          ng-click="vm.selectEvent(event)">
-                    <umb-icon icon="{{ event.selected ? 'icon-check' : 'icon-flag'}}"
-                              class="icon umb-tree-icon"
-                              ng-class="{ 'color-green': event.selected }">
-                    </umb-icon>
-                    <span>{{ event.eventName }}</span>
-                  </button>
-                </div>
-              </li>
-            </ul>
-          </div>
-
-          <umb-empty-state
-            ng-if="filtered.length === 0"
-            position="center">
-              <localize key="webhooks_noEventsFound">No events were found.</localize>
-          </umb-empty-state>
-        </umb-box-content>
-      </umb-box>
-    </umb-editor-container>
-
-    <umb-editor-footer>
-      <umb-editor-footer-content-right>
-        <umb-button type="button" button-style="link" label-key="general_close" shortcut="esc" action="vm.close()">
-        </umb-button>
-        <umb-button type="button" button-style="success" label-key="general_submit" action="vm.submit(model)">
-        </umb-button>
-      </umb-editor-footer-content-right>
-    </umb-editor-footer>
-
-  </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
deleted file mode 100644
index 98f37555f7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.IconPickerController
- * @function
- *
- * @description
- * The controller for the content type editor icon picker
- */
-function IconPickerController($scope, localizationService, iconHelper) {
-
-    var vm = this;
-
-    vm.filter = {
-        searchTerm: ''
-    };
-
-    vm.selectIcon = selectIcon;
-    vm.selectColor = selectColor;
-    vm.submit = submit;
-    vm.close = close;
-
-    vm.colors = [
-        { name: "Black", value: "color-black", default: true },
-        { name: "Blue Grey", value: "color-blue-grey" },
-        { name: "Grey", value: "color-grey" },
-        { name: "Brown", value: "color-brown" },
-        { name: "Blue", value: "color-blue" },
-        { name: "Light Blue", value: "color-light-blue" },
-        { name: "Indigo", value: "color-indigo" },
-        { name: "Purple", value: "color-purple" },
-        { name: "Deep Purple", value: "color-deep-purple" },
-        { name: "Cyan", value: "color-cyan" },
-        { name: "Green", value: "color-green" },
-        { name: "Light Green", value: "color-light-green" },
-        { name: "Lime", value: "color-lime" },
-        { name: "Yellow", value: "color-yellow" },
-        { name: "Amber", value: "color-amber" },
-        { name: "Orange", value: "color-orange" },
-        { name: "Deep Orange", value: "color-deep-orange" },
-        { name: "Red", value: "color-red" },
-        { name: "Pink", value: "color-pink" }
-    ];
-
-    function onInit() {
-
-        vm.loading = true;
-
-        setTitle();
-
-        iconHelper.getAllIcons()
-            .then(icons => {
-                vm.icons = icons;
-
-                // Get's legacy icons, removes duplicates then maps them to IconModel
-                iconHelper.getIcons()
-                    .then(icons => {
-                        if (icons && icons.length > 0) {
-                            let legacyIcons = icons
-                                .filter(icon => !vm.icons.find(x => x.name == icon))
-                                .map(icon => { return { name: icon, svgString: null }; });
-
-                            vm.icons = legacyIcons.concat(vm.icons);
-                        }
-
-                        vm.loading = false;
-                    });
-            });
-        
-        // set a default color if nothing is passed in
-        vm.color = $scope.model.color ? findColor($scope.model.color) : vm.colors.find(x => x.default);
-
-        // if an icon is passed in - preselect it
-        vm.icon = $scope.model.icon ? $scope.model.icon : undefined;
-    }
-
-    function setTitle() {
-        if (!$scope.model.title) {
-            localizationService.localize("defaultdialogs_selectIcon").then(data => {
-                $scope.model.title = data;
-            });
-        }
-    }
-
-    function selectIcon(icon, color) {
-        $scope.model.icon = icon;
-        $scope.model.color = color;
-        submit();
-    }
-
-    function findColor(value) {
-        return vm.colors.find(x => x.value === value);
-    }
-
-    function selectColor(color) {
-        let newColor = (color || vm.colors.find(x => x.default));
-        $scope.model.color = newColor.value;
-        vm.color = newColor;
-    }
-
-    function close() {
-        if($scope.model && $scope.model.close) {
-            $scope.model.close();
-        }
-    }
-
-    function submit() {
-        if ($scope.model && $scope.model.submit) {
-            $scope.model.submit($scope.model);
-        }
-    }
-
-    onInit();
-
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.IconPickerController", IconPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
deleted file mode 100644
index d0bc9bdf26..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<form name="IconPickerForm"
-    ng-controller="Umbraco.Editors.IconPickerController as vm"
-    novalidate
-    val-form-manager>
-
-<umb-editor-view>
-
-    <umb-editor-header
-        name="model.title"
-        name-locked="true"
-        hide-alias="true"
-        hide-icon="true"
-        hide-description="true">
-    </umb-editor-header>
-
-    <umb-editor-container>
-        <umb-box>
-            <umb-box-content>
-
-                <div class="umb-control-group">
-                    <umb-search-filter
-                        input-id="icon-search"
-                        model="vm.filter.searchTerm"
-                        label-key="placeholders_filter"
-                        text="Type to filter..."
-                        css-class="w-100"
-                        auto-focus="true">
-                    </umb-search-filter>
-                </div>
-
-                <div class="umb-control-group mt3" ng-if="model.hideColors !== true">
-                    <umb-color-swatches
-                        use-color-class="true"
-                        colors="vm.colors"
-                        selected-color="vm.color"
-                        size="xs"
-                        on-select="vm.selectColor(color)">
-                    </umb-color-swatches>
-                </div>
-
-                <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-                <div class="umb-control-group" ng-show="!vm.loading && filtered.length > 0 ">
-                    <ul class="umb-iconpicker" ng-class="vm.color.value" ng-show="vm.icons">
-                        <li class="umb-iconpicker-item" ng-class="{'-selected': icon.name == model.icon}" ng-repeat="icon in filtered = (vm.icons | filter: { 'name': vm.filter.searchTerm } | orderBy:'name') track by $id(icon)">
-                            <button type="button" title="{{icon.name}}" ng-click="vm.selectIcon(icon.name, vm.color.value)">
-                                <umb-icon icon="{{icon.name}}" class="umb-iconpicker-svg large"></umb-icon>
-                                <span class="sr-only"><localize key="buttons_select">Select</localize> {{icon.name}}</span>
-                            </button>
-                        </li>
-                    </ul>
-                </div>
-
-                <umb-empty-state
-                    ng-if="filtered.length === 0"
-                    position="center">
-                    <localize key="defaultdialogs_noIconsFound">No icons were found.</localize>
-                </umb-empty-state>
-
-            </umb-box-content>
-        </umb-box>
-    </umb-editor-container>
-
-    <umb-editor-footer>
-        <umb-editor-footer-content-right>
-            <umb-button
-                type="button"
-                button-style="link"
-                label-key="general_close"
-                shortcut="esc"
-                action="vm.close()">
-            </umb-button>
-            <umb-button
-                type="button"
-                button-style="success"
-                label-key="general_submit"
-                state="vm.saveButtonState"
-                action="vm.submit(model)">
-            </umb-button>
-        </umb-editor-footer-content-right>
-    </umb-editor-footer>
-
-</umb-editor-view>
-
-</form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.controller.js
deleted file mode 100644
index 2b40d496f5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.controller.js
+++ /dev/null
@@ -1,150 +0,0 @@
-(function () {
-    "use strict";
-
-    function InsertOverlayController($scope, localizationService, editorService) {
-
-        var vm = this;
-
-        vm.openMacroPicker = openMacroPicker;
-        vm.openPageFieldOverlay = openPageFieldOverlay;
-        vm.openDictionaryItemOverlay = openDictionaryItemOverlay;
-        vm.openPartialOverlay = openPartialOverlay;
-        vm.close = close;
-
-        function onInit() {
-            
-            if(!$scope.model.title) {
-                localizationService.localize("template_insert").then(function(value){
-                    $scope.model.title = value;
-                });
-            }
-    
-            if(!$scope.model.subtitle) {
-                localizationService.localize("template_insertDesc").then(function(value){
-                    $scope.model.subtitle = value;
-                });
-            }
-            
-        }
-
-        function openMacroPicker() {
-            var macroPicker = {
-                dialogData: {},
-                submit: function(model) {
-                    $scope.model.insert = {
-                        "type": "macro",
-                        "macroParams": model.macroParams,
-                        "selectedMacro": model.selectedMacro
-                    };
-                    $scope.model.submit($scope.model);
-                    editorService.close();
-                },
-                close: function() {
-                    editorService.close();
-                }
-            };
-            editorService.macroPicker(macroPicker);
-        }
-
-        function openPageFieldOverlay() {
-            var insertFieldEditor = {
-                submit: function(model) {
-                  $scope.model.insert = {
-                      "type": "umbracoField",
-                      "umbracoField": model.umbracoField
-                  };
-                  $scope.model.submit($scope.model);
-                  editorService.close();
-                },
-                close: function (model) {
-                    editorService.close();
-                }
-            };
-            editorService.insertField(insertFieldEditor);
-        }
-
-        function openDictionaryItemOverlay() {
-
-            var labelKeys = [
-                "template_insertDictionaryItem", 
-                "template_insertDictionaryItemDesc", 
-                "emptyStates_emptyDictionaryTree"
-            ];
-
-            localizationService.localizeMany(labelKeys).then(function(values){
-                var title = values[0];
-                var subtitle = values[1];
-                var emptyStateMessage = values[2];
-
-                var dictionaryItemPicker = {
-                    section: "translation",
-                    treeAlias: "dictionary",
-                    entityType: "dictionary",
-                    multiPicker: false,
-                    title: title,
-                    subtitle: subtitle,
-                    emptyStateMessage: emptyStateMessage,
-                    select: function(node){
-                        $scope.model.insert = {
-                            "type": "dictionary",
-                            "node": node
-                        };
-                        $scope.model.submit($scope.model);
-                        editorService.close();
-                    },
-    
-                    close: function() {
-                        editorService.close();
-                    }
-                };
-
-                editorService.treePicker(dictionaryItemPicker);
-
-            });
-        }
-
-        function openPartialOverlay() {
-            localizationService.localize("template_insertPartialView").then(function(value){
-                var title = value;
-
-                var partialItemPicker = {
-                    section: "settings",
-                    treeAlias: "partialViews",
-                    entityType: "partialView",
-                    multiPicker: false,
-                    title: title,
-                    filter: function(i) {
-                        if(i.name.indexOf(".cshtml") === -1 && i.name.indexOf(".vbhtml") === -1) {
-                            return true;
-                        }
-                    },
-                    filterCssClass: "not-allowed",
-                    select: function(node) {
-                        $scope.model.insert = {
-                            "type": "partial",
-                            "node": node
-                        };
-                        $scope.model.submit($scope.model); 
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-
-                editorService.treePicker(partialItemPicker);
-            });
-        }
-
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.InsertOverlay", InsertOverlayController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html
deleted file mode 100644
index 2ce7af8d9d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<div ng-controller="Umbraco.Editors.InsertOverlay as vm">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-box>
-                <umb-box-content>
-                    <div class="umb-insert-code-boxes">
-                        <button type="button" ng-if="model.allowedTypes.umbracoField" class="btn-reset umb-insert-code-box" ng-click="vm.openPageFieldOverlay()">
-                            <h2 class="umb-insert-code-box__title"><localize key="template_insertPageField">Value</localize></h2>
-                            <p class="umb-insert-code-box__description"><localize key="template_insertPageFieldDesc">Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values.</localize></p>
-                        </button>
-                        <button type="button" ng-if="model.allowedTypes.partial" class="btn-reset umb-insert-code-box" ng-click="vm.openPartialOverlay()">
-                            <h2 class="umb-insert-code-box__title"><localize key="template_insertPartialView">Partial view</localize></h2>
-                            <p class="umb-insert-code-box__description">
-                                <localize key="template_insertPartialViewDesc">A partial view is a separate template file which can be rendered inside another template, it's great for reusing markup or for separating complex templates into separate files.</localize>
-                            </p>
-                        </button>
-                        <button type="button" ng-if="model.allowedTypes.macro" class="btn-reset umb-insert-code-box" ng-click="vm.openMacroPicker()">
-                            <h2 class="umb-insert-code-box__title"><localize key="template_insertMacro">Macro</localize></h2>
-                            <p class="umb-insert-code-box__description">
-                                <localize key="template_insertMacroDesc">A Macro is a configurable component which is great for reusable parts of your design, where you need the option to provide parameters, such as galleries, forms and lists.</localize>
-                            </p>
-                        </button>
-                        <button type="button" ng-if="model.allowedTypes.dictionary" class="btn-reset umb-insert-code-box" ng-click="vm.openDictionaryItemOverlay()">
-                            <h2 class="umb-insert-code-box__title"><localize key="template_insertDictionaryItem">Dictionary item</localize></h2>
-                            <p class="umb-insert-code-box__description"><localize key="template_insertDictionaryItemDesc">A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites.</localize></p>
-                        </button>
-                    </div>
-                </umb-box-content>
-            </umb-box>
-
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.controller.js
deleted file mode 100644
index 3de26ba99c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.controller.js
+++ /dev/null
@@ -1,81 +0,0 @@
-(function () {
-    "use strict";
-
-    function InsertFieldController($scope, contentTypeResource, localizationService) {
-
-        var vm = this;
-
-        vm.field = null;
-        vm.defaultValue = null;
-        vm.recursive = false;
-        vm.showDefaultValue = false;
-
-        vm.generateOutputSample = generateOutputSample;
-        vm.submit = submit;
-        vm.close = close;
-
-        function onInit() {
-
-            var labelKeys = [
-                "template_insertPageField"
-            ];
-
-            // set default title
-            if(!$scope.model.title) {
-                localizationService.localizeMany(labelKeys).then(function (data) {
-                    $scope.model.title = data[0];
-                });
-            }
-
-            // Load all fields
-            contentTypeResource.getAllPropertyTypeAliases().then(function (array) {
-                vm.properties = array;
-            });
-
-            // Load all standard fields
-            contentTypeResource.getAllStandardFields().then(function (array) {
-                vm.standardFields = array;
-            });
-
-        }
-
-        function generateOutputSample() {
-
-            var fallback = null;
-
-            if (vm.recursive !== false && vm.defaultValue !== null) {
-                fallback = "Fallback.To(Fallback.Ancestors, Fallback.DefaultValue)";
-            } else if (vm.recursive !== false) {
-                fallback = "Fallback.ToAncestors";
-            } else if (vm.defaultValue !== null) {
-                fallback = "Fallback.ToDefaultValue";
-            }
-
-            var pageField = (vm.field !== null ? '@Model.Value("' + vm.field + '"' : "")
-                + (fallback  !== null? ', fallback: ' + fallback : "")
-                + (vm.defaultValue !== null ? ', defaultValue: new HtmlString("' + vm.defaultValue + '")' : "")
-
-                + (vm.field ? ')' : "");
-
-            $scope.model.umbracoField = pageField;
-
-            return pageField;
-        }
-
-        function submit(model) {
-            if ($scope.model.submit) {
-                $scope.model.submit(model);
-            }
-        }
-
-        function close() {
-            if ($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        onInit();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.InsertFieldController", InsertFieldController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html
deleted file mode 100644
index 00b18565f7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertfield/insertfield.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<div ng-controller="Umbraco.Editors.InsertFieldController as vm">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content>
-
-                    <!-- select field -->
-                    <div class="control-group umb-control-group -no-border">
-                        <div class="umb-el-wrap">
-                            <label class="control-label" for="chooseField"><localize key="templateEditor_chooseField">Choose field</localize></label>
-                            <div class="controls">
-                                <select ng-model="vm.field">
-                                    <optgroup localize="label" label="@templateEditor_customFields">
-                                        <option ng-repeat="(key, value) in vm.properties" value="{{value}}">{{value}}</option>
-                                    </optgroup>
-                                    <optgroup localize="label" label="@templateEditor_standardFields">
-                                        <option ng-repeat="(key, value) in vm.standardFields" value="{{value}}">{{value}}</option>
-                                    </optgroup>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- Default value -->
-                    <div>
-                        <button type="button" class="umb-node-preview-add mb3" ng-click="vm.showDefaultValue=true" ng-hide="vm.showDefaultValue">
-                            <localize key="templateEditor_addDefaultValue">Add default value</localize>
-                        </button>
-
-                        <div class="control-group umb-control-group -no-border" ng-hide="!vm.showDefaultValue">
-                            <div class="umb-el-wrap">
-                                <label class="control-label" for="altText"><localize key="templateEditor_defaultValue">Default value</localize></label>
-                                <div class="controls">
-                                    <input type="text" id="altText" name="altText" ng-model="vm.defaultValue" umb-auto-focus>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- Recursive -->
-                    <div class="control-group umb-control-group">
-                        <div class="umb-el-wrap">
-                            <div class="controls">
-                                <label class="control-label">
-                                    <localize key="templateEditor_recursive">Recursive</localize>
-                                </label>
-                                <div class="flex">
-                                    <umb-checkbox name="recursive"
-                                                  disabled="!vm.field"
-                                                  model="vm.recursive"
-                                                  text="Yes, make it recursive"
-                                                  label-key="templateEditor_recursiveDescr">
-                                    </umb-checkbox>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- Output -->
-                    <div class="control-group umb-control-group -no-border">
-                        <div class="umb-el-wrap">
-                            <div class="controls">
-                                <label class="control-label"><localize key="templateEditor_outputSample">Output sample</localize></label>
-                                <umb-code-snippet language="'cshtml'">{{ vm.generateOutputSample() }}</umb-code-snippet>
-                            </div>
-                        </div>
-                    </div>
-
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-                <umb-button
-                    type="button"
-                    button-style="success"
-                    label-key="general_submit"
-                    action="vm.submit(model)">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.controller.js
deleted file mode 100644
index 094e108d8f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.controller.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.ItemPickerController
- * @function
- *
- * @description
- * The controller for a reusable editor to pick items
- */
-
-function ItemPickerController($scope, localizationService) {
-
-    var vm = this;
-
-    vm.selectItem = selectItem;
-    vm.submit = submit;
-    vm.close = close;
-
-    function onInit() {
-        if (!$scope.model.title) {
-            localizationService.localize("defaultdialogs_selectItem").then(function(value){
-                $scope.model.title = value;
-            });
-        }
-    }
-
-    function selectItem(item) {
-        $scope.model.selectedItem = item;
-        submit($scope.model);
-    };
-
-    function submit(model) {
-        if($scope.model.submit) {
-            $scope.model.submit(model);
-        }
-    }
-
-    function close() {
-        if($scope.model.close) {
-            $scope.model.close();
-        }
-    }
-
-    onInit();
-
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.ItemPicker", ItemPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
deleted file mode 100644
index cd65922653..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/itempicker/itempicker.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<div ng-controller="Umbraco.Editors.ItemPicker as vm">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content>
-
-                    <div class="form-search mb3" ng-if="model.filter">
-                        <umb-search-filter
-                            input-id="itempicker-search"
-                            model="searchTerm"
-                            label-key="placeholders_filter"
-                            text="Type to filter..."
-                            css-class="w-100"
-                            auto-focus="true">
-                        </umb-search-filter>
-                    </div>
-
-                    <ul class="umb-card-grid -three-in-row">
-                        <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:'name' | filter:searchTerm">
-                            <button type="button" class="btn-reset umb-card-grid-item" title="{{ availableItem.name }}" ng-click="vm.selectItem(availableItem)">
-                                <span>
-                                    <umb-icon icon="{{availableItem.icon}}"></umb-icon>
-                                    {{availableItem.name}}
-                                </span>
-                            </button>
-                        </li>
-                    </ul>
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/languagepicker/languagepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/languagepicker/languagepicker.controller.js
deleted file mode 100644
index 5851d9ad58..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/languagepicker/languagepicker.controller.js
+++ /dev/null
@@ -1,92 +0,0 @@
-(function () {
-  "use strict";
-
-  function LanguagePickerController($scope, languageResource, localizationService) {
-
-    var vm = this;
-
-    vm.languages = [];
-    vm.loading = false;
-
-    vm.selectLanguage = selectLanguage;
-    vm.submit = submit;
-    vm.close = close;
-
-    function onInit() {
-
-      vm.loading = true;
-
-      // set default title
-      if (!$scope.model.title) {
-        localizationService.localize("defaultdialogs_selectLanguages").then(function (value) {
-          $scope.model.title = value;
-        });
-      }
-
-      // make sure we can push to something
-      if (!$scope.model.selection) {
-        $scope.model.selection = [];
-      }
-
-      // get languages
-      languageResource.getAll().then(function (languages) {
-        vm.languages = languages;
-
-        if ($scope.model.selection && $scope.model.selection.length > 0) {
-          preSelect($scope.model.selection);
-        }
-
-        vm.loading = false;
-      });
-
-    }
-
-    function preSelect(selection) {
-      selection.forEach(function (selected) {
-        vm.languages.forEach(function (language) {
-          if (selected.id === language.id) {
-            language.selected = true;
-          }
-        });
-      });
-    }
-
-    function selectLanguage(language) {
-
-      if (!language.selected) {
-
-        language.selected = true;
-        $scope.model.selection.push(language);
-
-      } else {
-
-        $scope.model.selection.forEach(function (selectedLanguage, index) {
-          if (selectedLanguage.id === language.id) {
-            language.selected = false;
-            $scope.model.selection.splice(index, 1);
-          }
-        });
-
-      }
-
-    }
-
-    function submit(model) {
-      if ($scope.model.submit) {
-        $scope.model.submit(model);
-      }
-    }
-
-    function close() {
-      if ($scope.model.close) {
-        $scope.model.close();
-      }
-    }
-
-    onInit();
-
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.LanguagePickerController", LanguagePickerController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/languagepicker/languagepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/languagepicker/languagepicker.html
deleted file mode 100644
index dc5010bcf4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/languagepicker/languagepicker.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<div ng-controller="Umbraco.Editors.LanguagePickerController as vm">
-
-  <umb-editor-view>
-
-    <umb-editor-header name="model.title" name-locked="true" hide-alias="true" hide-icon="true" hide-description="true">
-    </umb-editor-header>
-
-    <umb-editor-container>
-
-      <umb-load-indicator ng-if="vm.loading">
-      </umb-load-indicator>
-
-      <umb-box ng-if="!vm.loading">
-        <umb-box-content>
-          <ul class="umb-tree">
-            <li class="umb-tree-item" ng-repeat="language in vm.languages">
-              <div class="umb-tree-item__inner" style="padding: 5px 10px;">
-                <button type="button" class="btn-reset text-left flex-auto"
-                  ng-class="{ 'umb-tree-node-checked': language.selected }" ng-click="vm.selectLanguage(language)">
-                  <umb-icon icon="{{language.selected ? 'icon-check' : 'icon-globe'}}" class="icon umb-tree-icon"
-                    ng-class="{ 'color-green': language.selected }">
-                  </umb-icon>
-                  <span>{{ language.name }}</span>
-                </button>
-              </div>
-            </li>
-          </ul>
-        </umb-box-content>
-      </umb-box>
-    </umb-editor-container>
-
-    <umb-editor-footer>
-      <umb-editor-footer-content-right>
-        <umb-button type="button" button-style="link" label-key="general_close" shortcut="esc" action="vm.close()">
-        </umb-button>
-        <umb-button type="button" button-style="success" label-key="general_submit" action="vm.submit(model)">
-        </umb-button>
-      </umb-editor-footer-content-right>
-    </umb-editor-footer>
-
-  </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
deleted file mode 100644
index 3baba2b77a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
+++ /dev/null
@@ -1,290 +0,0 @@
-//used for the media picker dialog
-angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
-    function ($scope, eventsService, entityResource, mediaResource, udiParser, userService, localizationService, editorService) {
-
-        var vm = this;
-        var dialogOptions = $scope.model;
-
-        vm.submit = submit;
-        vm.close = close;
-        vm.toggleOpenInNewWindow = toggleOpenInNewWindow;
-
-        vm.labels = {};
-        localizationService.localizeMany(["defaultdialogs_openInNewWindow"]).then(function (data) {
-            vm.labels.openInNewWindow = data[0];
-        });
-
-        if (!$scope.model.title) {
-            localizationService.localize("defaultdialogs_selectLink")
-                .then(function (value) {
-                    $scope.model.title = value;
-                });
-        }
-        
-        $scope.customTreeParams = dialogOptions.dataTypeKey ? "dataTypeKey=" + dialogOptions.dataTypeKey : "";
-        $scope.dialogTreeApi = {};
-        $scope.model.target = {};
-        $scope.searchInfo = {
-            searchFromId: null,
-            searchFromName: null,
-            showSearch: false,
-            dataTypeKey: dialogOptions.dataTypeKey,
-            results: [],
-            selectedSearchResults: []
-        };
-
-      $scope.userLinkNameInput = '';
-
-        $scope.showTarget = $scope.model.hideTarget !== true;
-        $scope.showAnchor = $scope.model.hideAnchor !== true;
-
-        // this ensures that we only sync the tree once and only when it's ready
-        var oneTimeTreeSync = {
-            executed: false,
-            treeReady: false,
-            sync: function () {
-                // don't run this if:
-                // - it was already run once
-                // - the tree isn't ready yet
-                // - the model path hasn't been loaded yet
-                if (this.executed || !this.treeReady || !($scope.model.target && $scope.model.target.path)) {
-                    return;
-                }
-
-                this.executed = true;
-                // sync the tree to the model path
-                $scope.dialogTreeApi.syncTree({
-                    path: $scope.model.target.path,
-                    tree: "content"
-                });
-            }
-        };
-
-        if (dialogOptions.currentTarget) {
-            // clone the current target so we don't accidentally update the caller's model while manipulating $scope.model.target
-            $scope.model.target = Utilities.copy(dialogOptions.currentTarget);
-            // if we have a node ID, we fetch the current node to build the form data
-            if ($scope.model.target.id || $scope.model.target.udi) {
-
-                // will be either a udi or an int
-                var id = $scope.model.target.udi ? $scope.model.target.udi : $scope.model.target.id;
-
-                if ($scope.model.target.udi) {
-                    // extract the entity type from the udi and set target.isMedia accordingly
-                    var udi = udiParser.parse(id);
-
-                    if (udi && udi.entityType === "media") {
-                        $scope.model.target.isMedia = true;
-                    } else {
-                        delete $scope.model.target.isMedia;
-                    }
-                }
-
-                if ($scope.model.target.isMedia) {
-                    mediaResource.getById(id).then(function (resp) {
-                        $scope.model.target.url = resp.mediaLink;
-                    });
-                } else {
-                    // get the content path
-                    entityResource.getPath(id, "Document").then(function (path) {
-                        $scope.model.target.path = path;
-                        oneTimeTreeSync.sync();
-                    });
-
-                    entityResource.getUrlAndAnchors(id).then(function (resp) {
-                        $scope.anchorValues = resp.anchorValues;
-                        $scope.model.target.url = resp.url;
-                    });
-
-                }
-            } else if ($scope.model.target.url && $scope.model.target.url.length) {
-                // a url but no id/udi indicates an external link - trim the url to remove the anchor/qs
-                // only do the substring if there's a # or a ?
-                var indexOfAnchor = $scope.model.target.url.search(/(#|\?)/);
-                if (indexOfAnchor > -1) {
-                    // populate the anchor
-                    $scope.model.target.anchor = $scope.model.target.url.substring(indexOfAnchor);
-                    // then rewrite the model and populate the link
-                    $scope.model.target.url = $scope.model.target.url.substring(0, indexOfAnchor);
-                }
-            }
-
-            // need to translate the link target ("_blank" or "") into a boolean value for umb-checkbox
-            vm.openInNewWindow = $scope.model.target.target === "_blank";
-        }
-        else if (dialogOptions.anchors) {
-            $scope.anchorValues = dialogOptions.anchors;
-        }
-
-        function treeLoadedHandler(args) {
-            oneTimeTreeSync.treeReady = true;
-            oneTimeTreeSync.sync();
-        }
-
-        function nodeSelectHandler(args) {
-            if (args && args.event) {
-                args.event.preventDefault();
-                args.event.stopPropagation();
-            }
-
-            eventsService.emit("dialogs.linkPicker.select", args);
-
-            if ($scope.currentNode) {
-                if ($scope.currentNode.id == args.node.id && $scope.currentNode.selected) {
-                    $scope.model.target = {};
-                    $scope.currentNode.selected = false;
-
-                    return;
-                }
-
-                //un-select if there's a current one selected
-                $scope.currentNode.selected = false;
-            }
-
-            $scope.currentNode = args.node;
-            $scope.currentNode.selected = true;
-            $scope.model.target.id = args.node.id;
-            $scope.model.target.udi = args.node.udi;
-            if ($scope.oKToUpdateLinkTargetName()) {
-              $scope.model.target.name = args.node.name;
-            }
-
-            if (args.node.id < 0) {
-                $scope.model.target.url = "/";
-            }
-            else {
-                entityResource.getUrlAndAnchors(args.node.id).then(function (resp) {
-                    $scope.anchorValues = resp.anchorValues;
-                    $scope.model.target.url = resp.url;
-                });
-            }
-
-            if (!Utilities.isUndefined($scope.model.target.isMedia)) {
-                delete $scope.model.target.isMedia;
-            }
-        }
-
-
-        function nodeExpandedHandler(args) {
-            // open mini list view for list views
-            if (args.node.metaData.isContainer) {
-                openMiniListView(args.node);
-            }
-        }
-      $scope.trackUserInput = function (userInput) {
-        $scope.userLinkNameInput = userInput;
-
-      }
-      $scope.oKToUpdateLinkTargetName = function () {
-        if (!$scope.userLinkNameInput || !$scope.model.target.name) {
-          return true;
-        }
-        else {
-          return false;
-        }
-      }
-        $scope.switchToMediaPicker = function () {
-            userService.getCurrentUser().then(function (userData) {
-
-                var startNodeId, startNodeIsVirtual;
-                if (dialogOptions.ignoreUserStartNodes === true) {
-                    startNodeId = -1;
-                    startNodeIsVirtual = true;
-                }
-                else {
-                    startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                    startNodeIsVirtual = userData.startMediaIds.length !== 1;
-                }
-
-                var mediaPicker = {
-                    startNodeId: startNodeId,
-                    startNodeIsVirtual: startNodeIsVirtual,
-                    dataTypeKey: dialogOptions.dataTypeKey,
-                    submit: function (model) {
-                        var media = model.selection[0];
-
-                        $scope.model.target.id = media.id;
-                        $scope.model.target.udi = media.udi;
-                      $scope.model.target.isMedia = true;
-                      if ($scope.oKToUpdateLinkTargetName()) {
-                        $scope.model.target.name = media.name;
-                      }
-                        $scope.model.target.url = media.image;
-
-                        editorService.close();
-
-                        // make sure the content tree has nothing highlighted 
-                        $scope.dialogTreeApi.syncTree({
-                            path: "-1",
-                            tree: "content"
-                        });
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-                editorService.mediaPicker(mediaPicker);
-            });
-        };
-
-        $scope.hideSearch = function () {
-            $scope.searchInfo.showSearch = false;
-            $scope.searchInfo.searchFromId = null;
-            $scope.searchInfo.searchFromName = null;
-            $scope.searchInfo.results = [];
-        }
-
-        // method to select a search result
-        $scope.selectResult = function (evt, result) {
-            result.selected = result.selected === true ? false : true;
-            nodeSelectHandler({
-                event: evt,
-                node: result
-            });
-        };
-
-        //callback when there are search results
-        $scope.onSearchResults = function (results) {
-            $scope.searchInfo.results = results;
-            $scope.searchInfo.showSearch = true;
-        };
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeLoaded(treeLoadedHandler);
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-            $scope.dialogTreeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
-        }
-
-        // Mini list view
-        $scope.selectListViewNode = function (node) {
-            node.selected = node.selected === true ? false : true;
-            nodeSelectHandler({
-                node: node
-            });
-        };
-
-        $scope.closeMiniListView = function () {
-            $scope.miniListView = undefined;
-        };
-
-        function openMiniListView(node) {
-            $scope.miniListView = node;
-        }
-
-        function toggleOpenInNewWindow(model, value) {
-            $scope.model.target.target = model ? "_blank" : "";
-        }
-
-        function close() {
-            if ($scope.model && $scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        function submit() {
-            if ($scope.model && $scope.model.submit) {
-                $scope.model.submit($scope.model);
-            }
-        }
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
deleted file mode 100644
index 6a020f69ff..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<div ng-controller="Umbraco.Editors.LinkPickerController as vm" class="umb-linkpicker">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container class="block-form">
-            <umb-box>
-                <umb-box-content>
-
-                    <div ng-class="{'flex': showAnchor}">
-
-                        <umb-control-group label="@defaultdialogs_urlLinkPicker" class="umb-linkpicker__url" alias="urlLinkPicker">
-                            <input type="text"
-                                    style="margin-right: 10px;"
-                                    localize="placeholder"
-                                    placeholder="@general_url"
-                                    class="umb-property-editor umb-textstring"
-                                    ng-model="model.target.url"
-                                    umb-auto-focus
-                                    ng-disabled="model.target.id || model.target.udi"
-                                    id="urlLinkPicker"/>
-                        </umb-control-group>
-
-                        <umb-control-group label="@defaultdialogs_anchorLinkPicker" class="umb-linkpicker__anchor" ng-if="showAnchor" alias="anchor">
-                            <input type="text"
-                                    list="anchors"
-                                    localize="placeholder"
-                                    placeholder="@placeholders_anchor"
-                                    class="umb-property-editor umb-textstring"
-                                    ng-model="model.target.anchor"
-                                    id="anchor"/>
-
-                            <datalist id="anchors">
-                                <option value="{{a}}" ng-repeat="a in anchorValues"></option>
-                            </datalist>
-                        </umb-control-group>
-                    </div>
-
-                    <umb-control-group label="@defaultdialogs_nodeNameLinkPicker" alias="nodeNameLinkPicker">
-                        <input type="text"
-                                localize="placeholder"
-                                placeholder="@placeholders_entername"
-                                class="umb-property-editor umb-textstring"
-                                ng-model="model.target.name"
-                                ng-change="trackUserInput(model.target.name)"
-                                id="nodeNameLinkPicker"/>
-                    </umb-control-group>
-
-                    <umb-control-group ng-if="showTarget" label="@content_target" alias="openInNewWindow">
-                        <umb-checkbox
-                                      model="vm.openInNewWindow"
-                                      on-change="vm.toggleOpenInNewWindow(model, value)"
-                                      text="{{vm.labels.openInNewWindow}}"
-                                      input-id="openInNewWindow">
-                        </umb-checkbox>
-                    </umb-control-group>
-
-                    <div class="umb-control-group">
-                        <h5><localize key="defaultdialogs_linkToPage">Link to page</localize></h5>
-
-                        <div ng-hide="miniListView">
-                            <label for="treeSearch" class="sr-only"><localize key="visuallyHiddenTexts_searchContentTree">Search content tree</localize></label>
-                            <umb-tree-search-box hide-search-callback="hideSearch"
-                                                 search-callback="onSearchResults"
-                                                 search-from-id="{{searchInfo.searchFromId}}"
-                                                 search-from-name="{{searchInfo.searchFromName}}"
-                                                 datatype-key="{{searchInfo.dataTypeKey}}"
-                                                 show-search="{{searchInfo.showSearch}}"
-                                                 section="{{section}}"
-                                                 input-id="treeSearch">
-                            </umb-tree-search-box>
-
-                            <br />
-                            <umb-tree-search-results ng-if="searchInfo.showSearch"
-                                                     results="searchInfo.results"
-                                                     select-result-callback="selectResult"
-                                                     empty-search-result-position="default">
-                            </umb-tree-search-results>
-
-                            <div ng-hide="searchInfo.showSearch">
-                                <umb-tree section="content"
-                                          treealias="content"
-                                          hideheader="true"
-                                          hideoptions="true"
-                                          api="dialogTreeApi"
-                                          on-init="onTreeInit()"
-                                          enablelistviewexpand="true"
-                                          isdialog="true"
-                                          enablecheckboxes="true"
-                                          customtreeparams="{{customTreeParams}}"
-                                          id="treePicker">
-                                </umb-tree>
-                            </div>
-                        </div>
-
-                        <umb-mini-list-view
-                            ng-if="miniListView"
-                            node="miniListView"
-                            entity-type="Document"
-                            on-select="selectListViewNode(node)"
-                            on-close="closeMiniListView()">
-                        </umb-mini-list-view>
-
-                    </div>
-
-                    <div class="umb-control-group">
-                        <h5><localize key="defaultdialogs_linkToMedia">Link to media</localize></h5>
-                        <button type="button" ng-click="switchToMediaPicker()" class="btn">
-                            <localize key="defaultdialogs_selectMedia">Select media</localize>
-                        </button>
-                    </div>
-
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-                <umb-button
-                    type="button"
-                    button-style="success"
-                    label-key="general_submit"
-                    state="vm.saveButtonState"
-                    action="vm.submit(model)">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.controller.js
deleted file mode 100644
index 81e3e6bb34..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.controller.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.MacroParameterPickerController 
- * @function
- *
- * @description
- * The controller for the content type editor macro parameter dialog
- */
-
-(function() {
-    "use strict";
-
-    function MacroParameterController($scope, $filter, macroResource, localizationService, editorService) {
-
-        var vm = this;
-
-        vm.searchTerm = "";
-        vm.parameterEditors = [];
-        vm.loading = false;
-        vm.labels = {};
-
-        vm.filterItems = filterItems;
-        vm.showDetailsOverlay = showDetailsOverlay;
-        vm.hideDetailsOverlay = hideDetailsOverlay;
-        vm.pickParameterEditor = pickParameterEditor;
-        vm.close = close;
-
-        function init() {
-            setTitle();
-            getGroupedParameterEditors();
-        }
-
-        function setTitle() {
-            if (!$scope.model.title) {
-                localizationService.localize("defaultdialogs_selectEditor")
-                    .then(function(data){
-                        $scope.model.title = data;
-                    });
-            }
-        }
-
-        function getGroupedParameterEditors() {
-
-            vm.loading = true;
-            
-            macroResource.getGroupedParameterEditors().then(function (data) {
-                vm.parameterEditors = data;
-                vm.loading = false;
-            }, function () {
-                vm.loading = false;
-            });
-
-        }
-
-        function filterItems() {
-            // clear item details
-            $scope.model.itemDetails = null;
-
-            if (vm.searchTerm) {
-
-                var regex = new RegExp(vm.searchTerm, "i");
-
-                var parameterEditors = filterCollection(vm.parameterEditors, regex);
-
-                var totalResults = _.reduce(_.pluck(parameterEditors, 'count'), (m, n) => m + n, 0);
-
-                vm.filterResult = {
-                    parameterEditors: parameterEditors,
-                    totalResults: totalResults
-                };
-            } else {
-                vm.filterResult = null;
-            }
-        }
-
-        function filterCollection(collection, regex) {
-            return _.map(_.keys(collection), function (key) {
-
-                var filteredEditors = $filter('filter')(collection[key], function (editor) {
-                    return regex.test(editor.name) || regex.test(editor.alias);
-                });
-
-                return {
-                    group: key,
-                    count: filteredEditors.length,
-                    parameterEditors: filteredEditors
-                }
-            });
-        }
-
-        function showDetailsOverlay(property) {
-
-            var propertyDetails = {};
-            propertyDetails.icon = property.icon;
-            propertyDetails.title = property.name;
-
-            $scope.model.itemDetails = propertyDetails;
-        }
-
-        function hideDetailsOverlay() {
-            $scope.model.itemDetails = null;
-        }
-
-        function pickParameterEditor(selectedParameterEditor) {
-
-            $scope.model.parameter.editor = selectedParameterEditor.alias;
-            $scope.model.parameter.dataTypeName = selectedParameterEditor.name;
-            $scope.model.parameter.dataTypeIcon = selectedParameterEditor.icon;
-
-            $scope.model.submit($scope.model);
-        }
-
-        function close() {
-            if ($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        init();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.MacroParameterPickerController", MacroParameterController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.html
deleted file mode 100644
index 26248d392c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<div ng-controller="Umbraco.Editors.MacroParameterPickerController as vm">
-
-    <umb-editor-view data-element="editor-macro-parameter">
-
-        <form novalidate name="MacroParameterForm" val-form-manager>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content>
-
-                    <!-- FILTER -->
-                    <umb-search-filter
-                        input-id="macroparameter-search"
-                        model="vm.searchTerm"
-                        label-key="placeholders_filter"
-                        text="Type to filter..."
-                        css-class="w-100"
-                        on-change="vm.filterItems()"
-                        auto-focus="true">
-                    </umb-search-filter>
-
-                    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-                    <div ng-if="!vm.filterResult">
-                        <div ng-repeat="(key,value) in vm.parameterEditors">
-                            <h5>{{key | umbCmsTitleCase}}</h5>
-                            <ul class="umb-card-grid -four-in-row" ng-mouseleave="vm.hideDetailsOverlay()">
-                                <li ng-repeat="parameterEditor in value | orderBy:'name'"
-                                    data-element="editor-{{parameterEditor.name}}">
-                                    <button type="button"
-                                            ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
-                                            ng-click="vm.pickParameterEditor(parameterEditor)"
-                                            class="btn-reset umb-card-grid-item"
-                                            title="{{parameterEditor.name}}">
-                                        <span>
-                                            <umb-icon icon="{{parameterEditor.icon || 'icon-autofill'}}"></umb-icon>
-                                            {{parameterEditor.name}}
-                                        </span>
-                                    </button>
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
-
-                    <!-- FILTER RESULTS -->
-                    <div ng-if="vm.filterResult">
-                        <div ng-if="vm.filterResult.totalResults > 0">
-                            <div ng-repeat="result in vm.filterResult.parameterEditors">
-                                <div ng-if="result.parameterEditors.length > 0">
-                                    <h5>{{result.group | umbCmsTitleCase}}</h5>
-                                    <ul class="umb-card-grid -four-in-row" ng-mouseleave="vm.hideDetailsOverlay()">
-                                        <li ng-repeat="parameterEditor in result.parameterEditors | orderBy:'name'">
-                                            <div ng-if="parameterEditor.loading" class="umb-card-grid-item__loading">
-                                                <div class="umb-button__progress"></div>
-                                            </div>
-                                            <button type="button"
-                                                    ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
-                                                    ng-click="vm.pickParameterEditor(parameterEditor)"
-                                                    class="btn-reset umb-card-grid-item"
-                                                    title="{{parameterEditor.name}}">
-                                                <span>
-                                                    <umb-icon icon="{{parameterEditor.icon || 'icon-autofill'}}"></umb-icon>
-                                                    {{parameterEditor.name}}
-                                                </span>
-                                            </button>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
-
-                        <umb-empty-state position="center" ng-if="vm.filterResult.totalResults === 0">
-                            <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
-                        </umb-empty-state>
-                    </div>
-
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-        </form>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.controller.js
deleted file mode 100644
index 1701553efc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.controller.js
+++ /dev/null
@@ -1,175 +0,0 @@
-function MacroPickerController($scope, entityResource, macroResource, umbPropEditorHelper, macroService, formHelper, localizationService) {
-
-    $scope.macros = [];
-    $scope.a11yInfo = "";
-    $scope.model.selectedMacro = null;
-    $scope.model.macroParams = [];
-    $scope.displayA11YMessageForFilter = displayA11YMessageForFilter;
-    $scope.wizardStep = "macroSelect";
-    $scope.noMacroParams = false;
-    $scope.model.searchTerm = "";
-    function onInit() {
-        if (!$scope.model.title) {
-            localizationService.localize("defaultdialogs_selectMacro").then(function (value) {
-                $scope.model.title = value;
-            });
-        }
-    }
-
-    $scope.selectMacro = function (macro) {
-
-        $scope.model.selectedMacro = macro;
-
-        if ($scope.wizardStep === "macroSelect") {
-            editParams(true);
-        } else {
-            $scope.$broadcast("formSubmitting", { scope: $scope });
-            $scope.model.submit($scope.model);
-        }
-    };
-
-    $scope.close = function () {
-        if ($scope.model.close) {
-            $scope.model.close();
-        }
-    }
-
-    /** changes the view to edit the params of the selected macro */
-    /** if there is pnly one macro, and it has parameters - editor can skip selecting the Macro **/
-    function editParams(insertIfNoParameters) {
-        //whether to insert the macro in the rich text editor when editParams is called and there are no parameters see U4-10537 
-        insertIfNoParameters = (typeof insertIfNoParameters !== 'undefined') ? insertIfNoParameters : true;
-        //get the macro params if there are any
-        macroResource.getMacroParameters($scope.model.selectedMacro.id)
-            .then(function (data) {
-
-                //go to next page if there are params otherwise we can just exit
-                if (!Utilities.isArray(data) || data.length === 0) {
-
-                    if (insertIfNoParameters) {
-                        $scope.model.submit($scope.model);
-                    } else {
-                        $scope.wizardStep = 'macroSelect';
-                        displayA11yMessages($scope.macros);
-                    }
-
-                } else {
-
-                    $scope.wizardStep = "paramSelect";
-                    $scope.model.macroParams = data;
-
-                    //fill in the data if we are editing this macro
-                    if ($scope.model.dialogData && $scope.model.dialogData.macroData && $scope.model.dialogData.macroData.macroParamsDictionary) {
-                        _.each($scope.model.dialogData.macroData.macroParamsDictionary, function (val, key) {
-                            var prop = _.find($scope.model.macroParams, function (item) {
-                                return item.alias == key;
-                            });
-                            if (prop) {
-
-                                if (_.isString(val)) {
-                                    //we need to unescape values as they have most likely been escaped while inserted
-                                    val = _.unescape(val);
-
-                                    //detect if it is a json string
-                                    if (val.detectIsJson()) {
-                                        try {
-                                            //Parse it from json
-                                            prop.value = Utilities.fromJson(val);
-                                        }
-                                        catch (e) {
-                                            // not json
-                                            prop.value = val;
-                                        }
-                                    }
-                                    else {
-                                        prop.value = val;
-                                    }
-                                }
-                                else {
-                                    prop.value = val;
-                                }
-                            }
-                        });
-
-                    }
-                }
-
-            });
-    }
-
-    function displayA11yMessages(macros) {
-        if ($scope.noMacroParams || !macros || macros.length === 0)
-            localizationService.localize("general_searchNoResult").then(function (value) {
-                $scope.a11yInfo = value;
-            });
-        else if (macros) {
-            if (macros.length === 1) {
-                localizationService.localize("treeSearch_searchResult").then(function(value) {
-                    $scope.a11yInfo = "1 " + value;
-                });
-            } else {
-                localizationService.localize("treeSearch_searchResults").then(function (value) {
-                    $scope.a11yInfo = macros.length + " " + value;
-                });
-            }
-        }
-    }
-
-    function displayA11YMessageForFilter() {
-        var macros = _.filter($scope.macros, v => v.name.toLowerCase().includes($scope.model.searchTerm.toLowerCase()));
-        displayA11yMessages(macros);
-    }
-    //here we check to see if we've been passed a selected macro and if so we'll set the
-    //editor to start with parameter editing
-    if ($scope.model.dialogData && $scope.model.dialogData.macroData) {
-        $scope.wizardStep = "paramSelect";
-    }
-
-    //get the macro list - pass in a filter if it is only for rte
-    entityResource.getAll("Macro", ($scope.model.dialogData && $scope.model.dialogData.richTextEditor && $scope.model.dialogData.richTextEditor === true) ? "UseInEditor=true" : null)
-        .then(function (data) {
-
-            if (Utilities.isArray(data) && data.length == 0) {
-                $scope.nomacros = true;
-            }
-
-            //if 'allowedMacros' is specified, we need to filter
-            if (Utilities.isArray($scope.model.dialogData.allowedMacros) && $scope.model.dialogData.allowedMacros.length > 0) {
-                $scope.macros = _.filter(data, function (d) {
-                    return _.contains($scope.model.dialogData.allowedMacros, d.alias);
-                });
-            }
-            else {
-                $scope.macros = data;
-            }
-
-
-            //check if there's a pre-selected macro and if it exists
-            if ($scope.model.dialogData && $scope.model.dialogData.macroData && $scope.model.dialogData.macroData.macroAlias) {
-                var found = _.find(data, function (item) {
-                    return item.alias === $scope.model.dialogData.macroData.macroAlias;
-                });
-                if (found) {
-                    //select the macro and go to next screen
-                    $scope.model.selectedMacro = found;
-                    editParams(true);
-                    return;
-                }
-            }
-            //if there is only one macro in the site and it has parameters, let's not make the editor choose it from a selection of one macro (unless there are no parameters - then weirdly it's a better experience to make that selection)
-            if ($scope.macros.length == 1) {
-                $scope.model.selectedMacro = $scope.macros[0];
-                editParams(false);
-            }
-            else {
-                //we don't have a pre-selected macro so ensure the correct step is set
-                $scope.wizardStep = 'macroSelect';
-            }
-            displayA11yMessages($scope.macros);
-        });
-
-    onInit();
-    
-}
-
-angular.module("umbraco").controller("Umbraco.Overlays.MacroPickerController", MacroPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
deleted file mode 100644
index 0e936e52c4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<div ng-controller="Umbraco.Overlays.MacroPickerController">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content class="block-form">
-                    <div ng-switch="wizardStep">
-
-                        <div ng-switch-when="macroSelect" class="macro-select">
-                            <label for="macro-search" class="sr-only">{{model.title}}</label>
-                            <umb-search-filter input-id="macro-search"
-                                               model="model.searchTerm"
-                                               label-key="placeholders_filter"
-                                               text="Type to filter..."
-                                               css-class="w-100 mb-15"
-                                               on-change="displayA11YMessageForFilter()"
-                                               auto-focus="true">
-                            </umb-search-filter>
-                            <p ng-bind="a11yInfo" role="alert"></p>
-                            <ul class="umb-card-grid -three-in-row">
-                                <li ng-repeat="availableItem in macros | orderBy:'name' | filter:model.searchTerm">
-                                  <button class="btn-reset umb-card-grid-item" title="{{availableItem.name}}" ng-click="selectMacro(availableItem)">
-                                        <span>
-                                            <umb-icon icon="icon-settings-alt"></umb-icon>
-                                            {{availableItem.name}}
-                                        </span>
-                                  </button>
-                                </li>
-                            </ul>
-
-                            <umb-empty-state ng-if="nomacros"
-                                             position="center">
-                                <localize key="defaultdialogs_noMacros">
-                                    There are no macros available to insert
-                                </localize>
-                            </umb-empty-state>
-                        </div>
-
-                        <div ng-switch-when="paramSelect">
-
-                            <h5>{{model.selectedMacro.name}}</h5>
-
-                            <ul class="unstyled">
-                                <li ng-repeat="param in model.macroParams">
-
-                                    <ng-form name="parameterForm">
-                                        <umb-control-group label="{{param.name}}" alias="{{param.alias}}">
-                                            <umb-property-editor model="param"></umb-property-editor>
-                                        </umb-control-group>
-                                    </ng-form>
-
-                                </li>
-                            </ul>
-
-                            <umb-empty-state ng-if="noMacroParams"
-                                                position="center">
-                                <localize key="defaultdialogs_noMacroParams">There are no parameters for this macro</localize>
-                            </umb-empty-state>
-
-                        </div>
-                    </div>
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    shortcut="esc"
-                    label-key="general_close"
-                    action="close()">
-                </umb-button>
-
-                <umb-button
-                    type="button"
-                    button-style="success"
-                    label-key="general_submit"
-                    action="selectMacro(model.selectedMacro)">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediaentryeditor/mediaentryeditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediaentryeditor/mediaentryeditor.controller.js
deleted file mode 100644
index 05be10c5d0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediaentryeditor/mediaentryeditor.controller.js
+++ /dev/null
@@ -1,205 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.Editors.MediaEntryEditorController",
-        function ($scope, localizationService, entityResource, editorService, overlayService, eventsService, mediaHelper) {
-
-            var unsubscribe = [];
-            
-            const vm = this;
-            
-            vm.loading = true;
-            vm.model = $scope.model;
-            vm.mediaEntry = vm.model.mediaEntry;
-            vm.currentCrop = null;
-            vm.title = "";
-            
-            vm.focalPointChanged = focalPointChanged;
-            vm.onImageLoaded = onImageLoaded;
-            vm.openMedia = openMedia;
-            vm.repickMedia = repickMedia;
-            vm.selectCrop = selectCrop;
-            vm.deselectCrop = deselectCrop;
-            vm.resetCrop = resetCrop;
-            vm.submitAndClose = submitAndClose;
-            vm.close = close;   
-
-            function init() {
-
-                localizationService.localizeMany([
-                  vm.model.createFlow ? "general_cancel" : "general_close",
-                  vm.model.createFlow ? "general_create" : "buttons_submitChanges"
-                ]).then(data => {
-                  vm.closeLabel = data[0];
-                  vm.submitLabel = data[1];
-                });
-
-                updateMedia();
-
-                unsubscribe.push(eventsService.on("editors.media.saved", function(name, args) {
-                    // if this media item uses the updated media type we want to reload the media file
-                    if(args && args.media && args.media.key === vm.mediaEntry.mediaKey) {
-                        updateMedia();
-                    }
-                }));
-            }
-
-            function updateMedia() {
-
-                if (!vm.mediaEntry.mediaKey) {
-                    vm.imageSrc = vm.mediaEntry.$dataURL;
-                    vm.fileSrc = vm.mediaEntry.$dataURL;
-                    vm.loading = false;
-                    vm.hasDimensions = false;
-                    vm.isCroppable = false;
-                    vm.fileExtension = 'JPG';
-
-                    localizationService.localize("mediaPicker_editMediaEntryLabel", [vm.mediaEntry.name, vm.model.documentName]).then(data => {
-                        vm.title = data;
-                    });
-                    return;
-                }
-
-                vm.loading = true;
-
-                entityResource.getById(vm.mediaEntry.mediaKey, "Media").then(function (mediaEntity) {
-                    vm.media = mediaEntity;
-                    vm.imageSrc = mediaHelper.resolveFileFromEntity(mediaEntity, false);
-                    vm.fileSrc = mediaHelper.resolveFileFromEntity(mediaEntity, false);
-                    vm.fileExtension = mediaHelper.getFileExtension(vm.fileSrc);
-                    vm.loading = false;
-                    vm.hasDimensions = false;
-                    vm.isCroppable = false;
-
-                    localizationService.localize("mediaPicker_editMediaEntryLabel", [vm.media.name, vm.model.documentName]).then(data => {
-                        vm.title = data;
-                    });
-                }, function () {
-                    localizationService.localize("mediaPicker_deletedItem").then(localized => {
-                        vm.media = {
-                            name: localized,
-                            icon: "icon-picture",
-                            trashed: true
-                        };
-                        vm.loading = false;
-                        vm.hasDimensions = false;
-                        vm.isCroppable = false;
-                    });
-                });
-            }
-            
-            function onImageLoaded(isCroppable, hasDimensions) {
-                vm.isCroppable = isCroppable;
-                vm.hasDimensions = hasDimensions;
-            }
-            
-            function repickMedia() {
-                vm.model.propertyEditor.changeMediaFor(vm.model.mediaEntry, onMediaReplaced);
-            }
-
-            function onMediaReplaced() {
-
-                // mark we have changes:
-                vm.imageCropperForm.$setDirty();
-
-                // un-select crop:
-                vm.currentCrop = null;
-
-                updateMedia();
-            }
-            
-            function openMedia() {
-
-                const mediaEditor = {
-                    id: vm.mediaEntry.mediaKey,
-                    submit: () => {
-                        editorService.close();
-                    },
-                    close: () => {
-                        editorService.close();
-                    }
-                };
-                
-                editorService.mediaEditor(mediaEditor);
-            }
-
-            function focalPointChanged(left, top) {
-                // update the model focalpoint value
-                vm.mediaEntry.focalPoint = {
-                    left: left,
-                    top: top
-                };
-
-                // set form to dirty to track changes
-                setDirty();
-            }
-            
-            function selectCrop(targetCrop) {
-                vm.currentCrop = targetCrop;
-                setDirty();
-                // TODO: start watchin values of crop, first when changed set to dirty.
-            }
-            
-            function deselectCrop() {
-                vm.currentCrop = null;
-            }
-            
-            function resetCrop() {
-                if (vm.currentCrop) {
-                    $scope.$evalAsync( () => {
-                        vm.model.propertyEditor.resetCrop(vm.currentCrop);
-                        vm.forceUpdateCrop = Math.random();
-                    });
-                }
-            }
-
-            function setDirty() {
-                vm.imageCropperForm.$setDirty();
-            }
-
-            function submitAndClose() {
-                if (vm.model && vm.model.submit) {
-                    vm.model.submit(vm.model);
-                }
-            }
-            
-            function close() {
-                if (vm.model && vm.model.close)
-                {
-                    if (vm.model.createFlow === true || vm.imageCropperForm.$dirty === true)
-                    {
-                      const labelKeys = vm.model.createFlow === true
-                          ? ["mediaPicker_confirmCancelMediaEntryCreationHeadline", "mediaPicker_confirmCancelMediaEntryCreationMessage"]
-                          : ["prompt_discardChanges", "mediaPicker_confirmCancelMediaEntryHasChanges"];
-                        
-                        localizationService.localizeMany(labelKeys).then(localizations => {
-                            const confirm = {
-                                title: localizations[0],
-                                view: "default",
-                                content: localizations[1],
-                                submitButtonLabelKey: "general_discard",
-                                submitButtonStyle: "danger",
-                                closeButtonLabelKey: "prompt_stay",
-                                submit: () => {
-                                    overlayService.close();
-                                    vm.model.close(vm.model);
-                                },
-                                close: () => {
-                                    overlayService.close();
-                                }
-                            };
-                            overlayService.open(confirm);
-                        });
-                    } else {
-                        vm.model.close(vm.model);
-                    }
-
-                }
-            }
-
-            init();
-            
-            $scope.$on("$destroy", function () {
-                unsubscribe.forEach(x => x());
-            });
-
-        }
-    );
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediaentryeditor/mediaentryeditor.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediaentryeditor/mediaentryeditor.html
deleted file mode 100644
index 11ffef6200..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediaentryeditor/mediaentryeditor.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<div class="umb-media-entry-editor" ng-controller="Umbraco.Editors.MediaEntryEditorController as vm">
-  <ng-form name="vm.imageCropperForm" val-form-manager>
-    <umb-editor-view umb-tabs ng-if="!page.loading">
-      <umb-editor-header
-        name="vm.title"
-        name-required="false"
-        name-locked="true"
-        hide-alias="true"
-        hide-icon="true"
-        hide-description="true">
-      </umb-editor-header>
-
-      <div class="umb-editor-container umb-panel-body umb-scrollable">
-        <div ng-if="vm.media.trashed" class="umb-editor--trashed-message">
-          <umb-icon icon="icon-trash" class="icon"></umb-icon>
-          <localize key="content_nodeIsInTrash">This item is in the Recycle Bin</localize>
-        </div>
-
-        <div class="umb-media-entry-editor__pane">
-          <div class="umb-media-entry-editor__crops" ng-if="vm.isCroppable">
-            <button
-              class="btn-reset umb-outline"
-              ng-class="{'--is-active':vm.currentCrop === null}"
-              ng-click="vm.deselectCrop()">
-              <span class="__text">Media</span>
-            </button>
-
-            <button
-              ng-repeat="crop in vm.mediaEntry.crops track by crop.alias"
-              class="btn-reset umb-outline"
-              ng-class="{'--is-active':vm.currentCrop.alias === crop.alias, '--is-defined':!!vm.currentCrop.coordinates}"
-              ng-click="vm.selectCrop(crop)">
-              <umb-image-thumbnail
-                center="vm.mediaEntry.focalPoint"
-                crop="crop.coordinates"
-                src="vm.imageSrc"
-                height="{{crop.height}}"
-                width="{{crop.width}}"
-                max-size="75">
-              </umb-image-thumbnail>
-              <span class="__text">{{crop.label}}</span>
-            </button>
-          </div>
-
-          <div class="imagecropper umb-media-entry-editor__imagecropper">
-            <div ng-if="vm.currentCrop" class="umb-cropper__container">
-              <umb-image-crop
-                height="{{vm.currentCrop.height}}"
-                width="{{vm.currentCrop.width}}"
-                crop="vm.currentCrop.coordinates"
-                alias="{{vm.currentCrop.alias}}"
-                force-update="{{vm.forceUpdateCrop}}"
-                center="vm.mediaEntry.focalPoint"
-                src="vm.imageSrc">
-                <button class="btn btn-link" ng-click="vm.resetCrop()">
-                  <umb-icon icon="icon-wrong"></umb-icon>
-                  <localize key="imagecropper_reset">Reset this crop</localize>
-                </button>
-              </umb-image-crop>
-            </div>
-
-            <div ng-if="!vm.currentCrop" class="umb-cropper-imageholder">
-              <umb-image-gravity
-                class="umb-media-entry-editor__imageholder"
-                ng-if="vm.imageSrc"
-                src="vm.imageSrc"
-                center="vm.mediaEntry.focalPoint"
-                disable-focal-point="!vm.model.enableFocalPointSetter"
-                on-value-changed="vm.focalPointChanged(left, top)"
-                on-image-loaded="vm.onImageLoaded(isCroppable, hasDimensions)">
-              </umb-image-gravity>
-
-              <umb-media-preview
-                ng-if="vm.loading === false && !vm.imageSrc"
-                class="umb-media-entry-editor__previewholder"
-                ng-class="{'trashed': vm.media.trashed}"
-                extension="vm.fileExtension"
-                source="vm.fileSrc"
-                icon="vm.media.icon"
-                name="vm.media.name">
-              </umb-media-preview>
-
-              <div class="umb-media-entry-editor__imageholder-actions">
-                <button ng-if="vm.mediaEntry.mediaKey" class="btn btn-link" ng-click="vm.repickMedia()">
-                  <umb-icon icon="icon-wrong"></umb-icon>
-                  <localize key="mediaPicker_changeMedia">Replace media</localize>
-                </button>
-                <button ng-if="vm.mediaEntry.mediaKey" class="btn btn-link" ng-click="vm.openMedia()">
-                  <umb-icon icon="icon-out"></umb-icon>
-                  <localize key="mediaPicker_openMedia">Open media</localize>
-                </button>
-                <button
-                  type="button"
-                  ng-show="vm.model.enableFocalPointSetter && (vm.mediaEntry.focalPoint.left !== 0.5 && vm.mediaEntry.focalPoint.top !== 0.5)"
-                  class="btn btn-link"
-                  ng-click="vm.focalPointChanged(0.5, 0.5)">
-                  <umb-icon icon="icon-axis-rotation"></umb-icon>
-                  <localize key="content_resetFocalPoint">Reset focal point</localize>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <umb-editor-footer>
-        <!-- Missing breadcrumbs -->
-
-        <umb-editor-footer-content-right>
-          <umb-button
-            action="vm.close()"
-            shortcut="esc"
-            button-style="link"
-            label="{{vm.closeLabel}}"
-            type="button">
-          </umb-button>
-
-          <umb-button
-            action="vm.submitAndClose()"
-            button-style="primary"
-            state="vm.saveButtonState"
-            label="{{vm.submitLabel}}"
-            type="button">
-          </umb-button>
-        </umb-editor-footer-content-right>
-      </umb-editor-footer>
-    </umb-editor-view>
-  </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediaentryeditor/mediaentryeditor.less b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediaentryeditor/mediaentryeditor.less
deleted file mode 100644
index 982ef7bc63..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediaentryeditor/mediaentryeditor.less
+++ /dev/null
@@ -1,137 +0,0 @@
-.umb-media-entry-editor {
-    
-    .umb-cropper-imageholder {
-        position: relative;
-        width: 100%;
-        height: 100%;
-    }
-    .umb-cropper-gravity {
-        height: 100%;
-    }
-    .umb-cropper__container {
-        width: 100%;
-        height: 100%;
-    }
-    .umb-cropper {
-        height: 100%;
-    }
-    .umb-cropper .crop-container {
-        padding-bottom: 0;
-        height: calc(100% - 50px)
-    }
-    .umb-cropper .crop-controls-wrapper {
-        justify-content: center;
-    }
-    .umb-cropper .crop-slider-wrapper {
-        max-width: 500px;
-    }
-}
-
-.umb-media-entry-editor__pane {
-    display: flex;
-    flex-flow: row-reverse;
-    height: 100%;
-    width: 100%;
-}
-
-.umb-media-entry-editor__crops {
-    background-color: white;
-    overflow: auto;
-
-    > button {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        position: relative;
-        text-align: center;
-        padding: 4px 10px 0 10px;
-        border-bottom: 1px solid @gray-9;
-        box-sizing: border-box;
-        height: 120px;
-        width: 120px;
-        color: @ui-active-type;
-
-        &:hover {
-            color: @ui-active-type-hover;
-            text-decoration: none;
-        }
-
-        &:active {
-            .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
-        }
-
-        &::before {
-            content: "";
-            position: absolute;
-            width: 0px;
-            max-height: 50px;
-            height: (100% - 16px);
-            top: auto;
-            bottom: auto;
-            background-color: @ui-light-active-border;
-            left: 0;
-            border-radius: 0 3px 3px 0;
-            opacity: 0;
-            transition: all .2s linear;
-        }
-
-        &.--is-active {
-            color: @ui-light-active-type;
-
-            &::before {
-                opacity: 1;
-                width: 4px;
-            }
-        }
-
-        &.--is-defined {
-
-        }
-
-        > .__icon {
-            font-size: 24px;
-            display: block;
-            text-align: center;
-            margin-bottom: 7px;
-        }
-
-        > .__text {
-            font-size: 12px;
-            line-height: 1em;
-            margin-top: 4px;
-        }
-    }
-}
-
-.umb-media-entry-editor__imagecropper {
-    flex: auto;
-    height: 100%;
-}
-
-.umb-media-entry-editor__imageholder {
-
-    position: relative;
-    height: calc(100% - 50px);
-    
-    display: block;
-}
-
-.umb-media-entry-editor__previewholder {
-    
-    position: relative;
-    height: calc(100% - 50px);
-    
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    
-    overflow-y: auto;
-}
-
-.umb-media-entry-editor__imageholder-actions {
-    background-color: @white;
-    height: 50px;
-    display: flex;
-    justify-content: center;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
deleted file mode 100644
index ce6a09fa3f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ /dev/null
@@ -1,637 +0,0 @@
-//used for the media picker dialog
-angular.module("umbraco")
-    .controller("Umbraco.Editors.MediaPickerController",
-        function ($scope, $timeout, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, dateHelper, editorService, umbSessionStorage, notificationsService, clipboardService) {
-
-            var vm = this;
-
-            vm.submit = submit;
-            vm.close = close;
-
-            vm.toggle = toggle;
-            vm.upload = upload;
-            vm.dragLeave = dragLeave;
-            vm.dragEnter = dragEnter;
-            vm.onUploadComplete = onUploadComplete;
-            vm.onFilesQueue = onFilesQueue;
-            vm.changeSearch = changeSearch;
-            vm.submitFolder = submitFolder;
-            vm.enterSubmitFolder = enterSubmitFolder;
-            vm.focalPointChanged = focalPointChanged;
-            vm.changePagination = changePagination;
-            vm.onNavigationChanged = onNavigationChanged;
-            vm.clickClearClipboard = clickClearClipboard;
-
-            vm.clickHandler = clickHandler;
-            vm.clickItemName = clickItemName;
-            vm.gotoFolder = gotoFolder;
-            vm.toggleListView = toggleListView;
-            vm.selectLayout = selectLayout;
-            vm.showMediaList = false;
-
-            vm.navigation = [];
-
-            var dialogOptions = $scope.model;
-            vm.clipboardItems = dialogOptions.clipboardItems;
-
-            $scope.disableFolderSelect = (dialogOptions.disableFolderSelect && dialogOptions.disableFolderSelect !== "0") ? true : false;
-            $scope.disableFocalPoint = (dialogOptions.disableFocalPoint && dialogOptions.disableFocalPoint !== "0") ? true : false;
-            $scope.onlyImages = (dialogOptions.onlyImages && dialogOptions.onlyImages !== "0") ? true : false;
-            $scope.onlyFolders = (dialogOptions.onlyFolders && dialogOptions.onlyFolders !== "0") ? true : false;
-            $scope.showDetails = (dialogOptions.showDetails && dialogOptions.showDetails !== "0") ? true : false;
-            $scope.multiPicker = (dialogOptions.multiPicker && dialogOptions.multiPicker !== "0") ? true : false;
-            $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
-            $scope.cropSize = dialogOptions.cropSize;
-            $scope.lastOpenedNode = localStorageService.get("umbLastOpenedMediaNodeId");
-            $scope.lockedFolder = true;
-            $scope.allowMediaEdit = dialogOptions.allowMediaEdit ? dialogOptions.allowMediaEdit : false;
-
-            $scope.filterOptions = {
-                excludeSubFolders: umbSessionStorage.get("mediaPickerExcludeSubFolders") || false
-            };
-
-            var userStartNodes = [];
-
-            var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
-            var allowedUploadFiles = mediaHelper.formatFileTypes(umbracoSettings.allowedUploadFiles);
-
-            if ($scope.onlyImages) {
-                vm.acceptedFileTypes = mediaHelper.formatFileTypes(umbracoSettings.imageFileTypes);
-            } else {
-                // Use list of allowed file types if provided
-                if (allowedUploadFiles !== '') {
-                    vm.acceptedFileTypes = allowedUploadFiles;
-                } else {
-                    // If no allowed list, we pass in a disallowed list by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
-                    vm.acceptedFileTypes = !mediaHelper.formatFileTypes(umbracoSettings.disallowedUploadFiles);
-                }
-            }
-
-            vm.maxFileSize = umbracoSettings.maxFileSize + "KB";
-
-            $scope.model.selection = [];
-
-            vm.acceptedMediatypes = [];
-            mediaTypeHelper.getAllowedImagetypes($scope.startNodeId)
-                .then(function (types) {
-                    vm.acceptedMediatypes = types;
-                });
-
-            var dataTypeKey = null;
-            if ($scope.model && $scope.model.dataTypeKey) {
-                dataTypeKey = $scope.model.dataTypeKey;
-            }
-
-            vm.searchOptions = {
-                pageNumber: 1,
-                pageSize: 100,
-                totalItems: 0,
-                totalPages: 0,
-                filter: '',
-                dataTypeKey: dataTypeKey
-            };
-            vm.layout = {
-                layouts: [{ name: "Grid", icon: "icon-thumbnails-small", path: "gridpath", selected: true },
-                { name: "List", icon: "icon-list", path: "listpath", selected: true }],
-                activeLayout: { name: "Grid", icon: "icon-thumbnails-small", path: "gridpath", selected: true }
-            };
-
-            // preload selected item
-            $scope.target = null;
-
-            if (dialogOptions.currentTarget) {
-                $scope.target = dialogOptions.currentTarget;
-            }
-
-          function setTitle(data) {
-            if (!$scope.model.title)
-              $scope.model.title = data[0];        
-          }
-
-          function setNavigation(data) {
-            if (!vm.navigation.length) { 
-            vm.navigation = [{
-              "alias": "empty",
-              "name": data[0],
-              "icon": "icon-umb-media",
-              "active": true,
-              "view": ""
-            }];
-            if (vm.clipboardItems) {
-              vm.navigation.push({
-                "alias": "clipboard",
-                "name": data[1],
-                "icon": "icon-paste-in",
-                "view": "",
-                "disabled": vm.clipboardItems.length === 0
-              });
-            }
-              vm.activeTab = vm.navigation[0];
-            }       
-          }
-
-
-          function onInit() {
-
-
-              localizationService.localizeMany(["defaultdialogs_selectMedia", "mediaPicker_tabClipboard"])
-                .then(function (localizationResult) {
-                  setTitle(localizationResult);
-                  setNavigation(localizationResult);
-                });
-               
-
-                userService.getCurrentUser().then(function (userData) {
-                    userStartNodes = userData.startMediaIds;
-
-                    if ($scope.startNodeId !== -1) {
-                        entityResource.getById($scope.startNodeId, "media")
-                            .then(function (ent) {
-                                $scope.startNodeId = ent.id;
-                                run();
-                            });
-                    } else {
-                        run();
-                    }
-                });
-            }
-
-            function run() {
-                //default root item
-                if (!$scope.target) {
-                    if ($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
-                        entityResource.getById($scope.lastOpenedNode, "media")
-                            .then(ensureWithinStartNode, gotoStartNode);
-                    } else {
-                        gotoStartNode();
-                    }
-                } else {
-                    // if a target is specified, go look it up - generally this target will just contain ids not the actual full
-                    // media object so we need to look it up
-                    var originalTarget = $scope.target;
-                    var id = $scope.target.udi ? $scope.target.udi : $scope.target.id;
-                    var altText = $scope.target.altText;
-                    var caption = $scope.target.caption;
-
-                    // ID of a UDI or legacy int ID still could be null/undefinied here
-                    // As user may dragged in an image that has not been saved to media section yet
-                    if (id) {
-                        entityResource.getById(id, "Media")
-                            .then(function (node) {
-                                $scope.target = node;
-                                // Moving directly to existing node's folder
-                                gotoFolder({ id: node.parentId }).then(function () {
-                                    selectMedia(node);
-                                    $scope.target.url = mediaHelper.resolveFileFromEntity(node);
-                                    $scope.target.thumbnail = mediaHelper.resolveFileFromEntity(node, true);
-                                    $scope.target.altText = altText;
-                                    $scope.target.caption = caption;
-                                    $scope.target.focalPoint = originalTarget.focalPoint;
-                                    $scope.target.coordinates = originalTarget.coordinates;
-                                    openDetailsDialog();
-                                });
-                            }, gotoStartNode);
-                    } else {
-                        // No ID set - then this is going to be a tmpimg that has not been uploaded
-                        // User editing this will want to be changing the ALT text
-                        openDetailsDialog();
-                    }
-                }
-            }
-
-            function upload(v) {
-                var fileSelect = $(".umb-file-dropzone .file-select");
-                if (fileSelect.length === 0) {
-                    localizationService.localize('media_uploadNotAllowed').then(function (message) { notificationsService.warning(message); });
-                }
-                else {
-                    fileSelect.trigger("click");
-                }
-            }
-
-            function dragLeave() {
-                $scope.activeDrag = false;
-            }
-
-            function dragEnter() {
-                $scope.activeDrag = true;
-            }
-
-            function submitFolder() {
-                if ($scope.model.creatingFolder) {
-                    return;
-                }
-                if ($scope.model.newFolderName) {
-                    $scope.model.creatingFolder = true;
-                    mediaResource
-                        .addFolder($scope.model.newFolderName, $scope.currentFolder.id)
-                        .then(function (data) {
-                            //we've added a new folder so lets clear the tree cache for that specific item
-                            treeService.clearCache({
-                                cacheKey: "__media", //this is the main media tree cache key
-                                childrenOf: data.parentId //clear the children of the parent
-                            });
-                            $scope.model.creatingFolder = false;
-                            gotoFolder(data);
-                            $scope.model.showFolderInput = false;
-                            $scope.model.newFolderName = "";
-                        });
-                } else {
-                    $scope.model.showFolderInput = false;
-                }
-            }
-
-            function enterSubmitFolder(event) {
-                if (event.keyCode === 13) {
-                    submitFolder();
-                    event.stopPropagation();
-                }
-            }
-
-            function gotoFolder(folder) {
-                if (!$scope.multiPicker) {
-                    deselectAllMedia($scope.model.selection);
-                }
-
-                if (!folder) {
-                    folder = { id: -1, name: "Media", icon: "icon-folder" };
-                }
-
-                if (folder.id > 0) {
-                    entityResource.getAncestors(folder.id, "media", null, { dataTypeKey: dataTypeKey })
-                        .then(function (anc) {
-                            $scope.path = _.filter(anc,
-                                function (f) {
-                                    return f.path.indexOf($scope.startNodeId) !== -1;
-                                });
-                        });
-                } else {
-                    $scope.path = [];
-                }
-
-                mediaTypeHelper.getAllowedImagetypes(folder.id).then(function (types) { vm.acceptedMediatypes = types; });
-                $scope.lockedFolder = (folder.id === -1 && $scope.model.startNodeIsVirtual) || hasFolderAccess(folder) === false;
-                $scope.currentFolder = folder;
-
-                localStorageService.set("umbLastOpenedMediaNodeId", folder.id);
-
-                return getChildren(folder.id);
-            }
-
-            function toggleListView() {
-                vm.showMediaList = !vm.showMediaList;
-            }
-
-            function selectLayout(layout) {
-                //this somehow doesn't set the 'active=true' property for the chosen layout
-                vm.layout.activeLayout = layout;
-                //workaround
-                vm.layout.layouts.forEach(element => element.active = false);
-                layout.active = true;
-                //set whether to toggle the list
-                vm.showMediaList = (layout.name === "List");
-            }
-
-            function clickHandler(media, event, index) {
-
-                if (media.isFolder) {
-                    if ($scope.disableFolderSelect) {
-                        gotoFolder(media);
-                    } else {
-                        selectMedia(media);
-                    }
-                } else {
-                    if ($scope.showDetails) {
-
-                        $scope.target = media;
-
-                        // handle both entity and full media object
-                        if (media.image) {
-                            $scope.target.url = media.image;
-                        } else {
-                            $scope.target.url = mediaHelper.resolveFile(media);
-                        }
-
-                        openDetailsDialog();
-                    } else {
-                        selectMedia(media);
-                    }
-                }
-            }
-
-            function clickItemName(item, event, index) {
-                if (item.isFolder) {
-                    gotoFolder(item);
-                }
-                else {
-                    clickHandler(item, event, index);
-                }
-            };
-
-            function selectMedia(media) {
-                if (!media.selectable) {
-                    return;
-                }
-                if (media.selected) {
-                    for (var i = 0; $scope.model.selection.length > i; i++) {
-                        var imageInSelection = $scope.model.selection[i];
-                        if (media.key === imageInSelection.key) {
-                            media.selected = false;
-                            $scope.model.selection.splice(i, 1);
-                        }
-                    }
-                } else {
-                    if (!$scope.multiPicker) {
-                        deselectAllMedia($scope.model.selection);
-                    }
-                    eventsService.emit("dialogs.mediaPicker.select", media);
-                    media.selected = true;
-                    $scope.model.selection.push(media);
-                }
-            }
-
-            function deselectAllMedia(medias) {
-                for (var i = 0; i < medias.length; i++) {
-                    var media = medias[i];
-                    media.selected = false;
-                }
-                medias.length = 0;
-            }
-
-            function onUploadComplete(files) {
-                gotoFolder($scope.currentFolder).then(function () {
-                    $timeout(function () {
-                        if ($scope.multiPicker) {
-                            var images = _.rest(_.sortBy($scope.images, 'id'), $scope.images.length - files.length);
-                            images.forEach(image => selectMedia(image));
-                        } else {
-                            var image = _.sortBy($scope.images, 'id')[$scope.images.length - 1];
-                            clickHandler(image);
-                        }
-                    });
-                });
-            }
-
-            function onFilesQueue() {
-                $scope.activeDrag = false;
-            }
-
-            function ensureWithinStartNode(node) {
-                // make sure that last opened node is on the same path as start node
-                var nodePath = node.path.split(",");
-
-                // also make sure the node is not trashed
-                if (nodePath.indexOf($scope.startNodeId.toString()) !== -1 && node.trashed === false) {
-                    gotoFolder({ id: $scope.lastOpenedNode || $scope.startNodeId, name: "Media", icon: "icon-folder", path: node.path });
-                    return true;
-                } else {
-                    gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
-                    return false;
-                }
-            }
-
-            function hasFolderAccess(node) {
-                var nodePath = node.path ? node.path.split(',') : [node.id];
-
-                for (var i = 0; i < nodePath.length; i++) {
-                    if (userStartNodes.indexOf(parseInt(nodePath[i])) !== -1)
-                        return true;
-                }
-
-                return false;
-            }
-
-            function gotoStartNode() {
-                gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
-            }
-
-            function openDetailsDialog() {
-
-                const dialog = {
-                    size: "small",
-                    cropSize: $scope.cropSize,
-                    target: $scope.target,
-                    disableFocalPoint: $scope.disableFocalPoint,
-                    submit: function () {
-
-                        $scope.model.selection.push($scope.target);
-                        $scope.model.submit($scope.model);
-
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-
-                localizationService.localize("defaultdialogs_editSelectedMedia").then(value => {
-                    dialog.title = value;
-                    editorService.mediaCropDetails(dialog);
-                });
-            };
-
-            function onNavigationChanged(tab) {
-              vm.activeTab.active = false;
-              vm.activeTab = tab;
-              vm.activeTab.active = true;
-            };
-
-            function clickClearClipboard() {
-                vm.onNavigationChanged(vm.navigation[0]);
-                vm.navigation[1].disabled = true;
-                vm.clipboardItems = [];
-                dialogOptions.clickClearClipboard();
-            };
-
-            var debounceSearchMedia = _.debounce(function () {
-                $scope.$apply(function () {
-                    if (vm.searchOptions.filter) {
-                        searchMedia();
-                    } else {
-
-                        // reset pagination
-                        vm.searchOptions = {
-                            pageNumber: 1,
-                            pageSize: 100,
-                            totalItems: 0,
-                            totalPages: 0,
-                            filter: '',
-                            dataTypeKey: dataTypeKey
-                        };
-
-                        getChildren($scope.currentFolder.id);
-                    }
-                });
-            }, 500);
-
-            function changeSearch() {
-                vm.loading = true;
-                debounceSearchMedia();
-            }
-
-            function toggle() {
-                umbSessionStorage.set("mediaPickerExcludeSubFolders", $scope.filterOptions.excludeSubFolders);
-                // Make sure to activate the changeSearch function everytime the toggle is clicked
-                changeSearch();
-            }
-
-            function changePagination(pageNumber) {
-                vm.loading = true;
-                vm.searchOptions.pageNumber = pageNumber;
-                searchMedia();
-            };
-
-            function searchMedia() {
-                vm.loading = true;
-                entityResource.getPagedDescendants($scope.filterOptions.excludeSubFolders ? $scope.currentFolder.id : $scope.startNodeId, "Media", vm.searchOptions)
-                    .then(function (data) {
-
-                        // update image data to work with image grid
-                        if (data.items) {
-                            var allowedTypes = dialogOptions.filter ? dialogOptions.filter.split(",") : null;
-
-                            data.items.forEach(function(mediaItem) {
-                                setMediaMetaData(mediaItem);
-                                mediaItem.filtered = allowedTypes && allowedTypes.indexOf(mediaItem.metaData.ContentTypeAlias) < 0;
-                            });
-                        }
-
-                        // update images
-                        $scope.images = data.items ? data.items : [];
-
-                        // update pagination
-                        if (data.pageNumber > 0)
-                            vm.searchOptions.pageNumber = data.pageNumber;
-                        if (data.pageSize > 0)
-                            vm.searchOptions.pageSize = data.pageSize;
-
-                        vm.searchOptions.totalItems = data.totalItems;
-                        vm.searchOptions.totalPages = data.totalPages;
-
-                        // set already selected medias to selected
-                        preSelectMedia();
-                        vm.loading = false;
-                    });
-            }
-
-            function setMediaMetaData(mediaItem) {
-                // set thumbnail and src
-                mediaItem.thumbnail = mediaHelper.resolveFileFromEntity(mediaItem, true);
-                mediaItem.image = mediaHelper.resolveFileFromEntity(mediaItem, false);
-                // set properties to match a media object
-                if (mediaItem.metaData) {
-                    mediaItem.properties = [];
-                    if (mediaItem.metaData.umbracoWidth && mediaItem.metaData.umbracoHeight) {
-                        mediaItem.properties.push(
-                            {
-                                alias: "umbracoWidth",
-                                editor: mediaItem.metaData.umbracoWidth.PropertyEditorAlias,
-                                value: mediaItem.metaData.umbracoWidth.Value
-                            },
-                            {
-                                alias: "umbracoHeight",
-                                editor: mediaItem.metaData.umbracoHeight.PropertyEditorAlias,
-                                value: mediaItem.metaData.umbracoHeight.Value
-                            }
-                        );
-                    }
-                    if (mediaItem.metaData.umbracoFile) {
-                        // this is required for resolving files through the mediahelper
-                        mediaItem.properties.push(
-                            {
-                                alias: "umbracoFile",
-                                editor: mediaItem.metaData.umbracoFile.PropertyEditorAlias,
-                                value: mediaItem.metaData.umbracoFile.Value
-                            }
-                        );
-                    }
-                    if (mediaItem.metaData.UpdateDate !== null) {
-                        mediaItem.updateDate = mediaItem.metaData.UpdateDate;
-                    }
-                }
-            }
-
-            function getChildren(id) {
-                vm.loading = true;
-                return entityResource.getChildren(id, "Media", vm.searchOptions).then(function (data) {
-
-                    var allowedTypes = dialogOptions.filter ? dialogOptions.filter.split(",") : null;
-
-                    for (var i = 0; i < data.length; i++) {
-                        setDefaultData(data[i]);
-                        data[i].filtered = allowedTypes && allowedTypes.indexOf(data[i].metaData.ContentTypeAlias) < 0;
-                    }
-
-                    vm.searchOptions.filter = "";
-                    $scope.images = data ? data : [];
-
-                    // set already selected medias to selected
-                    preSelectMedia();
-                    vm.loading = false;
-                });
-            }
-
-            function setDefaultData(item) {
-                if (item.metaData.MediaPath !== null) {
-                    item.thumbnail = mediaHelper.resolveFileFromEntity(item, true);
-                    item.image = mediaHelper.resolveFileFromEntity(item, false);
-              }
-              if (item.metaData.UpdateDate !== null) {
-                userService.getCurrentUser().then(currentUser => {
-                  item.updateDate = dateHelper.getLocalDate(item.metaData.UpdateDate, currentUser.locale, "LLL");
-                });
-               
-                }
-            }
-
-            function preSelectMedia() {
-                for (var folderIndex = 0; folderIndex < $scope.images.length; folderIndex++) {
-                    var folderImage = $scope.images[folderIndex];
-                    var imageIsSelected = false;
-
-                    if ($scope.model && Utilities.isArray($scope.model.selection)) {
-                        for (var selectedIndex = 0;
-                            selectedIndex < $scope.model.selection.length;
-                            selectedIndex++) {
-                            var selectedImage = $scope.model.selection[selectedIndex];
-
-                            if (folderImage.key === selectedImage.key) {
-                                imageIsSelected = true;
-                            }
-                        }
-                    }
-
-                    if (imageIsSelected) {
-                        folderImage.selected = true;
-                    }
-                }
-            }
-
-            /**
-             * Called when the umbImageGravity component updates the focal point value
-             * @param {any} left
-             * @param {any} top
-             */
-            function focalPointChanged(left, top) {
-                // update the model focalpoint value
-                $scope.target.focalPoint = {
-                    left: left,
-                    top: top
-                };
-            }
-
-            function submit() {
-                if ($scope.model && $scope.model.submit) {
-                    $scope.model.submit($scope.model);
-                }
-            }
-
-            function close() {
-                if ($scope.model && $scope.model.close) {
-                    $scope.model.close($scope.model);
-                }
-            }
-
-            onInit();
-
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
deleted file mode 100644
index f38360809a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<div ng-controller="Umbraco.Editors.MediaPickerController as vm">
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            navigation="vm.navigation"
-            on-select-navigation-item="vm.onNavigationChanged(item)"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container ng-if="vm.activeTab.alias === 'empty'">
-
-            <form id="fileupload" method="POST" enctype="multipart/form-data" umb-image-upload="options">
-
-                <div on-drag-leave="vm.dragLeave()" on-drag-end="vm.dragLeave()" on-drag-enter="vm.dragEnter()">
-
-                    <div class="umb-control-group">
-
-                        <div class="umb-mediapicker-upload">
-                            <div class="form-search">
-                                <umb-search-filter input-id="datatype-search"
-                                                    model="vm.searchOptions.filter"
-                                                    label-key="placeholders_search"
-                                                    text="Type to search"
-                                                    on-change="vm.changeSearch()"
-                                                    css-class="w-100"
-                                                    auto-focus="true">
-                                </umb-search-filter>
-
-                                <div class="form-search__toggle">
-                                    <umb-checkbox model="filterOptions.excludeSubFolders"
-                                                    on-change="vm.toggle()"
-                                                    text="Include subfolders in search"
-                                                    label-key="general_excludeFromSubFolders">
-                                    </umb-checkbox>
-                                </div>
-                            </div>
-
-                            <div class="upload-button">
-                                <umb-button type="button"
-                                            label-key="general_upload"
-                                            action="vm.upload()"
-                                            disabled="lockedFolder"
-                                            button-style="action">
-                                </umb-button>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row umb-control-group" ng-show="vm.searchOptions.filter && images.length > 0 && !vm.loading && !activeDrag">
-                        <div style="margin-left:auto;text-align:right">
-                            <umb-layout-selector ng-show="vm.layout.layouts"
-                                                    layouts="vm.layout.layouts"
-                                                    active-layout="vm.layout.activeLayout"
-                                                    on-layout-select="vm.selectLayout(layout)">
-                            </umb-layout-selector>
-                        </div>
-                    </div>
-                    <div class="row umb-control-group" ng-show="!vm.searchOptions.filter">
-                        <div class="pull-right">
-                            <umb-layout-selector ng-show="vm.layout.layouts"
-                                                    layouts="vm.layout.layouts"
-                                                    active-layout="vm.layout.activeLayout"
-                                                    on-layout-select="vm.selectLayout(layout)">
-                            </umb-layout-selector>
-                        </div>
-
-                        <ul class="umb-breadcrumbs">
-                            <li ng-hide="startNodeId != -1" class="umb-breadcrumbs__ancestor">
-                                <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-click="vm.gotoFolder()" ng-class="{'--current':path.length === 0}">
-                                    <localize key="treeHeaders_media">Media</localize>
-                                </button>
-                                <span class="umb-breadcrumbs__separator" aria-hidden="true">&#47;</span>
-                            </li>
-                            <li ng-repeat="item in path" class="umb-breadcrumbs__ancestor">
-                                <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-click="vm.gotoFolder(item)" ng-class="{'--current':$last}">{{item.name}}</button>
-                                <span class="umb-breadcrumbs__separator" aria-hidden="true">&#47;</span>
-                            </li>
-                            <li class="umb-breadcrumbs__ancestor" ng-show="!lockedFolder">
-                                <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-hide="model.showFolderInput" ng-click="model.showFolderInput = true">
-                                    <umb-icon icon="icon-add" class="icon small"></umb-icon>
-                                    <span class="sr-only">
-                                        <localize key="visuallyHiddenTexts_createNewFolder">Create new folder</localize>
-                                    </span>
-                                </button>
-
-                                <input type="text"
-                                        class="umb-breadcrumbs__add-ancestor"
-                                        ng-show="model.showFolderInput"
-                                        ng-model="model.newFolderName"
-                                        ng-keydown="vm.enterSubmitFolder($event)"
-                                        ng-blur="vm.submitFolder()"
-                                        focus-when="{{model.showFolderInput}}" />
-                            </li>
-                        </ul>
-                        <umb-loader ng-if="model.creatingFolder"></umb-loader>
-                    </div>
-
-                    <umb-file-dropzone ng-if="vm.acceptedMediatypes.length > 0 && !vm.loading && !lockedFolder"
-                                        accepted-mediatypes="vm.acceptedMediatypes"
-                                        parent-id="{{currentFolder.id}}"
-                                        files-uploaded="vm.onUploadComplete"
-                                        files-queued="vm.onFilesQueue"
-                                        accept="{{vm.acceptedFileTypes}}"
-                                        max-file-size="{{vm.maxFileSize}}"
-                                        hide-dropzone="{{ !activeDrag && (images.length > 0 || vm.searchOptions.filter !== '') }}"
-                                        compact="{{ images.length > 0 }}">
-                    </umb-file-dropzone>
-
-                    <umb-media-grid ng-if="!vm.loading"
-                                    items="images"
-                                    on-click="vm.clickHandler"
-                                    on-click-name="vm.clickItemName"
-                                    item-max-width="150"
-                                    item-max-height="150"
-                                    item-min-width="100"
-                                    item-min-height="100"
-                                    disable-folder-select={{disableFolderSelect}}
-                                    only-images={{onlyImages}}
-                                    only-folders={{onlyFolders}}
-                                    include-sub-folders={{!filterOptions.excludeSubFolders}}
-                                    current-folder-id="{{currentFolder.id}}"
-                                    show-media-list=vm.showMediaList>
-                    </umb-media-grid>
-
-
-                    <umb-load-indicator ng-if="vm.loading">
-                    </umb-load-indicator>
-
-                    <div class="flex justify-center">
-                        <umb-pagination ng-if="vm.searchOptions.totalPages > 0 && !vm.loading"
-                                        page-number="vm.searchOptions.pageNumber"
-                                        total-pages="vm.searchOptions.totalPages"
-                                        on-change="vm.changePagination(pageNumber)">
-                        </umb-pagination>
-                    </div>
-
-                    <umb-empty-state ng-if="vm.searchOptions.filter && images.length === 0 && !vm.loading && !activeDrag" position="center">
-                        <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
-                    </umb-empty-state>
-
-                </div>
-            </form>
-
-        </umb-editor-container>
-        <umb-editor-container ng-if="vm.activeTab.alias === 'clipboard'">
-
-            <div style="margin-bottom:20px; text-align: right;">
-                <umb-button
-                    type="button"
-                    icon="icon-trash"
-                    button-style="link"
-                    label-key="clipboard_labelForClearClipboard"
-                    action="vm.clickClearClipboard()">
-                </umb-button>
-            </div>
-
-            <div class="umb-media-card-grid">
-                <umb-media-card
-                    ng-repeat="media in model.clipboardItems"
-                    media-key="!media.data.length ? media.data.mediaKey : null"
-                    name="media.data.length ? media.label : null"
-                    icon="media.data.length ? media.icon : null"
-                    ng-click="model.clickPasteItem(media, $event)">
-                </umb-media-card>
-            </div>
-
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-
-                <umb-button
-                    action="vm.close()"
-                    button-style="link"
-                    shortcut="esc"
-                    label-key="general_close"
-                    type="button">
-                </umb-button>
-
-                <umb-button
-                    button-style="success"
-                    label-key="buttons_select"
-                    type="button"
-                    disabled="model.selection.length === 0"
-                    action="vm.submit(model)">
-                </umb-button>
-
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js
deleted file mode 100644
index c6927cbaa9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js
+++ /dev/null
@@ -1,65 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.Editors.MediaCropDetailsController",
-        function ($scope) {
-
-            var vm = this;
-
-            vm.submit = submit;
-            vm.close = close;
-            vm.hasCrops = cropSet() === true;
-            vm.focalPointChanged = focalPointChanged;
-            vm.disableFocalPoint = false;
-            
-            if(typeof $scope.model.disableFocalPoint === "boolean") {
-                vm.disableFocalPoint = $scope.model.disableFocalPoint
-            }
-            else {
-                vm.disableFocalPoint = ($scope.model.disableFocalPoint !== undefined && $scope.model.disableFocalPoint !== "0") ? true : false;
-            }
-
-            if (!$scope.model.target.coordinates && !$scope.model.target.focalPoint) {
-                $scope.model.target.focalPoint = { left: .5, top: .5 };
-            }
-
-            if (!$scope.model.target.image) {
-                $scope.model.target.image = $scope.model.target.url;
-            }
-
-            if (!$scope.model.target 
-                || $scope.model.target.id 
-                || ($scope.model.target.url && $scope.model.target.url.toLowerCase().startsWith("blob:"))) {
-                vm.shouldShowUrl = false;
-            } else {
-                vm.shouldShowUrl = true;
-            }         
-
-            /**
-             * Called when the umbImageGravity component updates the focal point value
-             * @param {any} left
-             * @param {any} top
-             */
-            function focalPointChanged(left, top) {
-                // update the model focalpoint value
-                $scope.model.target.focalPoint = {
-                    left: left,
-                    top: top
-                };
-            }
-
-            function submit() {
-                if ($scope.model && $scope.model.submit) {
-                    $scope.model.submit($scope.model);
-                }
-            }
-
-            function close() {
-                if ($scope.model && $scope.model.close) {
-                    $scope.model.close($scope.model);
-                }
-            }
-
-            function cropSet() {
-                var model = $scope.model;
-                return (model.cropSize || {}).width !== undefined && (model.cropSize || {}).height !== undefined;
-            }
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html
deleted file mode 100644
index 9a01d3329d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<div ng-controller="Umbraco.Editors.MediaCropDetailsController as vm">
-    <umb-editor-view>
-
-        <umb-editor-header name="model.title"
-                           name-locked="true"
-                           hide-alias="true"
-                           hide-icon="true"
-                           hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <div class="umb-control-group" ng-if="vm.shouldShowUrl">
-                <h5>
-                    <localize key="@general_url">URL</localize>
-                </h5>
-                <input type="text" localize="placeholder" placeholder="@general_url" class="umb-property-editor umb-textstring" ng-model="model.target.url" />
-            </div>
-
-            <div class="umb-control-group" ng-if="model.target">
-                <h5>
-                    <localize key="@content_altTextOptional">Alternative text (optional)</localize>
-                </h5>
-                <input type="text" class="umb-property-editor umb-textstring" ng-model="model.target.altText" umb-auto-focus />
-            </div>
-
-            <div class="umb-control-group" ng-if="model.target">
-                <h5>
-                    <localize key="@content_captionTextOptional">Caption (optional)</localize>
-                </h5>
-                <input type="text" class="umb-property-editor umb-textstring" ng-model="model.target.caption" />
-            </div>
-
-            <div class="umb-control-group" ng-if="model.target">
-                <div ng-if="vm.hasCrops === false && vm.disableFocalPoint">
-                    <h5>
-                        <localize key="general_preview">Preview</localize>
-                    </h5>
-
-                    <img ng-src="{{model.target.thumbnail}}" alt="{{model.target.name}}" />
-                </div>
-
-                <div ng-if="vm.hasCrops === false && vm.disableFocalPoint == false">
-                    <h5>
-                        <localize key="@general_focalPoint">Focal point</localize>
-                    </h5>
-
-                    <div ng-if="model.target.image">
-                        <umb-image-gravity src="model.target.image"
-                                           center="model.target.focalPoint"
-                                           on-value-changed="vm.focalPointChanged(left, top)">
-                        </umb-image-gravity>
-                        <div class="media-crop-details-buttons">
-                            <button type="button" ng-show="(model.target.focalPoint.left !== 0.5 && model.target.focalPoint.top !== 0.5)" class="btn btn-link btn-gravity-reset" ng-click="vm.focalPointChanged(0.5,0.5)">
-                                <umb-icon icon="icon-axis-rotation"></umb-icon> <localize key="content_resetFocalPoint">Reset focal point</localize>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-
-                <div ng-if="vm.hasCrops">
-                    <h5>
-                        <localize key="@general_cropSection">Crop section</localize>
-                    </h5>
-
-                    <div>
-                        <umb-image-crop height="{{model.cropSize.height}}"
-                                        width="{{model.cropSize.width}}"
-                                        crop="model.target.coordinates"
-                                        center="model.target.focalPoint"
-                                        max-size="400"
-                                        src="model.target.image">
-                        </umb-image-crop>
-                    </div>
-                </div>
-
-            </div>
-
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-
-                <umb-button action="vm.close()"
-                            button-style="link"
-                            shortcut="esc"
-                            label-key="general_close"
-                            type="button">
-                </umb-button>
-
-                <umb-button button-style="success"
-                            label-key="buttons_select"
-                            type="button"
-                            disabled="model.selection.length === 0"
-                            action="vm.submit(model)">
-                </umb-button>
-
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/membergrouppicker/membergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/membergrouppicker/membergrouppicker.controller.js
deleted file mode 100644
index 0cd66a5608..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/membergrouppicker/membergrouppicker.controller.js
+++ /dev/null
@@ -1,90 +0,0 @@
-//used for the member picker dialog
-angular.module("umbraco").controller("Umbraco.Editors.MemberGroupPickerController",
-    function($scope, eventsService, localizationService) {
-
-        var vm = this;
-
-        $scope.dialogTreeApi = {};
-        $scope.multiPicker = $scope.model.multiPicker;
-
-        vm.submit = submit;
-        vm.close = close;
-
-        function activate() {
-
-            if(!$scope.model.title) {
-                localizationService.localize("defaultdialogs_selectMemberGroup").then(function(value){
-                    $scope.model.title = value;
-                });
-            }
-
-            if ($scope.multiPicker) {
-                $scope.model.selectedMemberGroups = [];
-            } else {
-                $scope.model.selectedMemberGroup = "";
-            }
-
-        }
-
-        function selectMemberGroup(id) {
-           $scope.model.selectedMemberGroup = id;
-        }
-
-        function selectMemberGroups(id) {
-            var index = $scope.model.selectedMemberGroups.indexOf(id);
-
-            if(index === -1){
-                // If the id does not exists in the array then add it
-                $scope.model.selectedMemberGroups.push(id);
-            }
-            else{
-                // Otherwise we will remove it from the array instead
-                $scope.model.selectedMemberGroups.splice(index, 1);
-            }
-        }
-
-        /** Method used for selecting a node */
-        function select(text, id) {
-
-            if ($scope.model.multiPicker) {
-               selectMemberGroups(id);
-            }
-            else {
-               selectMemberGroup(id);
-               $scope.model.submit($scope.model);
-            }
-        }
-
-        function nodeSelectHandler(args) {
-            args.event.preventDefault();
-            args.event.stopPropagation();
-
-            eventsService.emit("dialogs.memberGroupPicker.select", args);
-
-            //This is a tree node, so we don't have an entity to pass in, it will need to be looked up
-            //from the server in this method.
-            select(args.node.name, args.node.id);
-
-            //toggle checked state
-            args.node.selected = args.node.selected === true ? false : true;
-        }
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-        };
-        
-        function close() {
-            if($scope.model && $scope.model.close) {
-                $scope.model.close();
-            }
-        }
-    
-        function submit() {
-            if($scope.model && $scope.model.submit) {
-                $scope.model.submit($scope.model);
-            }
-        }
-        
-        activate();
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/membergrouppicker/membergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/membergrouppicker/membergrouppicker.html
deleted file mode 100644
index 7240ec8f06..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/membergrouppicker/membergrouppicker.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<div ng-controller="Umbraco.Editors.MemberGroupPickerController as vm">
-
-	<umb-editor-view>
-		<umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-			<umb-box>
-				<umb-box-content>
-					<umb-tree 
-						section="member"
-						treealias="memberGroups"
-						hideheader="true"
-						hideoptions="true"
-						isdialog="true"
-						api="dialogTreeApi"
-						on-init="onTreeInit()"
-						enablecheckboxes="{{model.multiPicker}}">
-					</umb-tree>
-				</umb-box-content>
-			</umb-box>
-		</umb-editor-container>
-
-		<umb-editor-footer>
-				<umb-editor-footer-content-right>
-					<umb-button
-						type="button"
-						button-style="link"
-						label-key="general_close"
-					    shortcut="esc"
-						action="vm.close()">
-					</umb-button>
-					<umb-button
-						type="button"
-						button-style="success"
-						label-key="general_submit"
-						state="vm.saveButtonState"
-						action="vm.submit(model)">
-					</umb-button>
-				</umb-editor-footer-content-right>
-			</umb-editor-footer>
-
-	</umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.controller.js
deleted file mode 100644
index 7e1e4b9047..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.controller.js
+++ /dev/null
@@ -1,128 +0,0 @@
- (function() {
-	"use strict";
-
-	function MoveController($scope, localizationService, entityHelper) {
-
-      var vm = this;
-
-      vm.hideSearch = hideSearch;
-      vm.selectResult = selectResult;
-      vm.onSearchResults = onSearchResults;
-      vm.submit = submit;
-      vm.close = close;
-
-      var dialogOptions = $scope.model;
-      var searchText = "Search...";
-      var node = dialogOptions.currentNode;
-
-      $scope.model.relateToOriginal = true;
-      $scope.dialogTreeApi = {};
-
-      vm.searchInfo = {
-          searchFromId: null,
-          searchFromName: null,
-          showSearch: false,
-          results: [],
-          selectedSearchResults: []
-      };
-
-      // get entity type based on the section
-      $scope.entityType = entityHelper.getEntityTypeFromSection(dialogOptions.section);
-
-        function onInit() {
-
-            if (!$scope.model.title) {
-                localizationService.localize("actions_move").then(function (value) {
-                    $scope.model.title = value;
-                });
-            }
-
-            localizationService.localize("general_search").then(function (value) {
-                searchText = value + "...";
-            });
-
-        }
-
-      function nodeSelectHandler(args) {
-
-          if(args && args.event) {
-              args.event.preventDefault();
-              args.event.stopPropagation();
-          }
-
-          //eventsService.emit("editors.content.copyController.select", args);
-
-          if ($scope.model.target) {
-              //un-select if there's a current one selected
-              $scope.model.target.selected = false;
-          }
-
-          $scope.model.target = args.node;
-          $scope.model.target.selected = true;
-
-      }
-
-      function nodeExpandedHandler(args) {
-          // open mini list view for list views
-          if (args.node.metaData.isContainer) {
-              openMiniListView(args.node);
-          }
-      }
-
-      function hideSearch() {
-          vm.searchInfo.showSearch = false;
-          vm.searchInfo.searchFromId = null;
-          vm.searchInfo.searchFromName = null;
-          vm.searchInfo.results = [];
-      }
-
-      // method to select a search result
-      function selectResult(evt, result) {
-          result.selected = result.selected === true ? false : true;
-          nodeSelectHandler({ event: evt, node: result });
-      }
-
-      //callback when there are search results
-      function onSearchResults(results) {
-          vm.searchInfo.results = results;
-          vm.searchInfo.showSearch = true;
-      }
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-            $scope.dialogTreeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
-        }
-
-      // Mini list view
-      $scope.selectListViewNode = function (node) {
-	      node.selected = node.selected === true ? false : true;
-		  nodeSelectHandler({ node: node });
-      };
-
-      $scope.closeMiniListView = function () {
-        $scope.miniListView = undefined;
-      };
-
-      function openMiniListView(node) {
-        $scope.miniListView = node;
-      }
-
-        function submit() {
-            if ($scope.model && $scope.model.submit) {
-                $scope.model.submit($scope.model);
-            }
-        }
-
-        function close() {
-            if ($scope.model && $scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-      onInit();
-
-	}
-
-	angular.module("umbraco").controller("Umbraco.Editors.MoveController", MoveController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.html
deleted file mode 100644
index 1c9fd5b822..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<div ng-controller="Umbraco.Editors.MoveController as vm">
-
-  <umb-editor-view>
-                
-    <umb-editor-header
-        name="model.title"
-        name-locked="true"
-        hide-alias="true"
-        hide-icon="true"
-        hide-description="true">
-    </umb-editor-header>
-
-    <umb-editor-container>
-      <umb-box>
-        <umb-box-content>
-          <p class="abstract" ng-hide="success">
-            <localize key="actions_infiniteEditorChooseWhereToMove">Choose where to move the selected item(s)</localize>
-          </p>
-
-          <div ng-hide="miniListView">
-            <div class="umb-control-group">
-                <umb-tree-search-box
-                  hide-search-callback="vm.hideSearch"
-                  search-callback="vm.onSearchResults"
-                  search-from-id="{{vm.searchInfo.searchFromId}}"
-                  search-from-name="{{vm.searchInfo.searchFromName}}"
-                  show-search="{{vm.searchInfo.showSearch}}"
-                  section="{{model.section}}">
-                </umb-tree-search-box>
-            </div>
-          
-            <div class="umb-control-group" ng-show="vm.searchInfo.showSearch">
-                <umb-tree-search-results
-                  ng-if="vm.searchInfo.showSearch"
-                  results="vm.searchInfo.results"
-                  select-result-callback="vm.selectResult">
-                </umb-tree-search-results>
-            </div>
-          
-            <div class="umb-control-group -no-border" ng-hide="vm.searchInfo.showSearch">
-              <umb-tree
-                section="{{model.section}}"
-                hideheader="false"
-                hideoptions="true"
-                isdialog="true"
-                api="dialogTreeApi"
-                on-init="onTreeInit()"
-                enablelistviewexpand="true"
-                enablecheckboxes="true">
-              </umb-tree>
-            </div>
-          
-          </div>
-          
-          <umb-mini-list-view
-            ng-if="miniListView"
-            node="miniListView"
-            entity-type="{{entityType}}"
-            on-select="selectListViewNode(node)"
-            on-close="closeMiniListView()">
-          </umb-mini-list-view>
-
-        </umb-box-content>
-      </umb-box>
-    </umb-editor-container>
-
-    <umb-editor-footer>
-        <umb-editor-footer-content-right>
-            <umb-button
-                type="button"
-                button-style="link"
-                label-key="general_close"
-                shortcut="esc"
-                action="vm.close()">
-            </umb-button>
-            <umb-button
-                type="button"
-                button-style="success"
-                label-key="general_submit"
-                state="vm.saveButtonState"
-                action="vm.submit(model)"
-                disabled="!model.target">
-            </umb-button>
-        </umb-editor-footer-content-right>
-    </umb-editor-footer>
-
-  </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/nodepermissions/nodepermissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/nodepermissions/nodepermissions.controller.js
deleted file mode 100644
index 15802feed9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/nodepermissions/nodepermissions.controller.js
+++ /dev/null
@@ -1,38 +0,0 @@
-(function () {
-    "use strict";
-
-    function NodePermissionsController($scope, localizationService) {
-
-        var vm = this;
-
-        vm.submit = submit;
-        vm.close = close;
-
-        function onInit() {
-            // set default title
-            if(!$scope.model.title) {
-                localizationService.localize("defaultdialogs_permissionsEdit").then(function(value){
-                    $scope.model.title = value + " " + $scope.model.node.name;
-                });
-            }
-        }
-
-        function submit() {
-            if($scope.model.submit) {
-                $scope.model.submit($scope.model);
-            }
-        }
-
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.NodePermissionsController", NodePermissionsController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/nodepermissions/nodepermissions.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/nodepermissions/nodepermissions.html
deleted file mode 100644
index 58490fa224..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/nodepermissions/nodepermissions.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<div class="block-form" ng-controller="Umbraco.Editors.NodePermissionsController as vm">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-box>
-                <umb-box-content>
-                    <umb-control-group
-                        ng-repeat="(category, permissions) in model.node.permissions"
-                        label="{{category}}">
-                        <umb-toggle-group items="permissions"></umb-toggle-group>
-                    </umb-control-group>
-                </umb-box-content>
-            </umb-box>
-
-        </umb-editor-container>
-
-        <umb-editor-footer>
-
-            <umb-editor-footer-content-right>
-
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-
-                <umb-button
-                    type="button"
-                    button-style="success"
-                    label-key="general_submit"
-                    action="vm.submit(model)">
-                </umb-button>
-        
-            </umb-editor-footer-content-right>
-    
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootcustomstep/pickdynamicrootcustomstep.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootcustomstep/pickdynamicrootcustomstep.controller.js
deleted file mode 100644
index 1af37043f1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootcustomstep/pickdynamicrootcustomstep.controller.js
+++ /dev/null
@@ -1,40 +0,0 @@
-(function () {
-    "use strict";
-
-    function PickDynamicRootCustomStepController($scope, localizationService) {
-
-        var vm = this;
-
-        function onInit() {
-            if(!$scope.model.title) {
-                localizationService.localize("dynamicRoot_pickDynamicRootQueryStepTitle").then(function(value){
-                    $scope.model.title = value;
-                });
-            }
-            if(!$scope.model.subtitle) {
-                localizationService.localize("dynamicRoot_pickDynamicRootQueryStepDesc").then(function(value){
-                    $scope.model.subtitle = value;
-                });
-            }
-        }
-
-        vm.submit = submit;
-        function submit() {
-          if ($scope.model.submit) {
-              $scope.model.submit($scope.model);
-          }
-        }
-
-        vm.close = close;
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.PickDynamicRootCustomStep", PickDynamicRootCustomStepController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootcustomstep/pickdynamicrootcustomstep.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootcustomstep/pickdynamicrootcustomstep.html
deleted file mode 100644
index 3c1a590300..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootcustomstep/pickdynamicrootcustomstep.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<div ng-controller="Umbraco.Editors.PickDynamicRootCustomStep as vm">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-box>
-                <umb-box-content>
-                    <div class="control-group">
-                      <label class="control-label" for="alias">Custom Query Step Alias</label>
-                      <div class="controls">
-                        <input
-                          type="text"
-                          id="alias"
-                          name="alias"
-                          placeholder=""
-                          required
-                          ng-model="model.value"
-                        />
-                      </div>
-                    </div>
-                </umb-box-content>
-            </umb-box>
-
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-                <umb-button
-                    type="button"
-                    button-style="primary"
-                    label-key="general_submit"
-                    action="vm.submit()">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js
deleted file mode 100644
index 9851c5f710..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js
+++ /dev/null
@@ -1,82 +0,0 @@
-(function () {
-    "use strict";
-
-    function PickDynamicRootOriginController($scope, localizationService, editorService, udiParser) {
-
-        var vm = this;
-
-        function onInit() {
-
-            if(!$scope.model.title) {
-                localizationService.localize("dynamicRoot_pickDynamicRootOriginTitle").then(function(value){
-                    $scope.model.title = value;
-                });
-            }
-            if(!$scope.model.subtitle) {
-                localizationService.localize("dynamicRoot_pickDynamicRootOriginDesc").then(function(value){
-                    $scope.model.subtitle = value;
-                });
-            }
-
-        }
-
-        vm.chooseRoot = function() {
-          $scope.model.value.originAlias = "Root";
-          $scope.model.value.originKey = null;
-          vm.submit($scope.model);
-        }
-        vm.chooseParent = function() {
-          $scope.model.value.originAlias = "Parent";
-          $scope.model.value.originKey = null;
-          vm.submit($scope.model);
-        }
-        vm.chooseCurrent = function() {
-          $scope.model.value.originAlias = "Current";
-          $scope.model.value.originKey = null;
-          vm.submit($scope.model);
-        }
-        vm.chooseSite = function() {
-          $scope.model.value.originAlias = "Site";
-          $scope.model.value.originKey = null;
-          vm.submit($scope.model);
-        }
-        vm.chooseByKey = function() {
-          var treePicker = {
-            idType: "udi",
-            section: $scope.model.contentType,
-            treeAlias: $scope.model.contentType,
-            multiPicker: false,
-            submit: function(model) {
-              var item = model.selection[0];
-              $scope.model.value.originAlias = "ByKey";
-              $scope.model.value.originKey = udiParser.parse(item.udi).value;
-              editorService.close();
-              vm.submit($scope.model);
-            },
-            close: function() {
-              editorService.close();
-            }
-          };
-          editorService.treePicker(treePicker);
-        }
-
-        vm.submit = submit;
-        function submit(model) {
-          if ($scope.model.submit) {
-              $scope.model.submit(model);
-          }
-        }
-
-        vm.close = close;
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.PickDynamicRootOrigin", PickDynamicRootOriginController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.html
deleted file mode 100644
index 2b5933f6cb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<div ng-controller="Umbraco.Editors.PickDynamicRootOrigin as vm">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-box>
-                <umb-box-content>
-                    <div class="umb-insert-code-boxes">
-                        <button type="button" class="btn-reset umb-insert-code-box" ng-click="vm.chooseRoot()">
-                            <h2 class="umb-insert-code-box__title"><localize key="dynamicRoot_originRootTitle">Root</localize></h2>
-                            <p class="umb-insert-code-box__description"><localize key="dynamicRoot_originRootDesc">Pick a specific Node as the origin for this query</localize></p>
-                        </button>
-                        <button type="button" class="btn-reset umb-insert-code-box" ng-click="vm.chooseParent()">
-                            <h2 class="umb-insert-code-box__title"><localize key="dynamicRoot_originParentTitle">Parent</localize></h2>
-                            <p class="umb-insert-code-box__description"><localize key="dynamicRoot_originParentDesc">The parent node of the source in this editing session</localize></p>
-                        </button>
-                        <button type="button" class="btn-reset umb-insert-code-box" ng-click="vm.chooseCurrent()">
-                            <h2 class="umb-insert-code-box__title"><localize key="dynamicRoot_originCurrentTitle">Current</localize></h2>
-                            <p class="umb-insert-code-box__description"><localize key="dynamicRoot_originCurrentDesc">The content node that is source for this editing session</localize></p>
-                        </button>
-                        <button type="button" class="btn-reset umb-insert-code-box" ng-click="vm.chooseSite()">
-                            <h2 class="umb-insert-code-box__title"><localize key="dynamicRoot_originSiteTitle">Site</localize></h2>
-                            <p class="umb-insert-code-box__description"><localize key="dynamicRoot_originSiteDesc">Find nearest node with a hostname</localize></p>
-                        </button>
-                        <button type="button" class="btn-reset umb-insert-code-box" ng-click="vm.chooseByKey()">
-                            <h2 class="umb-insert-code-box__title"><localize key="dynamicRoot_originByKeyTitle">Specific Node</localize></h2>
-                            <p class="umb-insert-code-box__description"><localize key="dynamicRoot_originByKeyDesc">Pick a specific Node as the origin for this query</localize></p>
-                        </button>
-                    </div>
-                </umb-box-content>
-            </umb-box>
-
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.controller.js
deleted file mode 100644
index 00005aa019..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.controller.js
+++ /dev/null
@@ -1,91 +0,0 @@
-(function () {
-    "use strict";
-
-    function PickDynamicRootQueryStepController($scope, localizationService, editorService, udiParser) {
-
-        var vm = this;
-
-        function onInit() {
-            if(!$scope.model.title) {
-                localizationService.localize("dynamicRoot_pickDynamicRootQueryStepTitle").then(function(value){
-                    $scope.model.title = value;
-                });
-            }
-            if(!$scope.model.subtitle) {
-                localizationService.localize("dynamicRoot_pickDynamicRootQueryStepDesc").then(function(value){
-                    $scope.model.subtitle = value;
-                });
-            }
-        }
-
-        vm.choose = function(queryStepAlias) {
-          var editor = {
-            multiPicker: true,
-            filterCssClass: "not-allowed not-published",
-            filter: function (item) {
-                // filter out folders (containers), element types (for content)
-                return item.nodeType === "container" || item.metaData.isElement;
-            },
-            submit: function (model) {
-                var typeKeys = _.map(model.selection, function(selected) { return udiParser.parse(selected.udi).value; });
-                $scope.model.value = {
-                  alias: queryStepAlias,
-                  anyOfDocTypeKeys: typeKeys
-                }
-                editorService.close();
-                vm.submit($scope.model);
-            },
-            close: function() {
-                editorService.close();
-            }
-          };
-
-          switch ($scope.model.contentType) {
-            case "content":
-              editorService.contentTypePicker(editor);
-              break;
-            case "media":
-              editorService.mediaTypePicker(editor);
-              break;
-          }
-        }
-
-        vm.chooseCustom = function() {
-          var customStepPicker = {
-            view: "views/common/infiniteeditors/pickdynamicrootcustomstep/pickdynamicrootcustomstep.html",
-            size: "small",
-            value: "",
-            submit: function(model) {
-              $scope.model.value = {
-                alias: model.value
-              }
-              editorService.close();
-              vm.submit($scope.model);
-            },
-            close: function() {
-              editorService.close();
-            }
-          };
-          editorService.open(customStepPicker);
-        }
-
-        vm.submit = submit;
-        function submit(model) {
-          if ($scope.model.submit) {
-              $scope.model.submit(model);
-          }
-        }
-
-        vm.close = close;
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.PickDynamicRootQueryStep", PickDynamicRootQueryStepController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.html
deleted file mode 100644
index a887cdd425..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<div ng-controller="Umbraco.Editors.PickDynamicRootQueryStep as vm">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-box>
-                <umb-box-content>
-                    <div class="umb-insert-code-boxes">
-                        <button type="button" class="btn-reset umb-insert-code-box" ng-click="vm.choose('NearestAncestorOrSelf')">
-                            <h2 class="umb-insert-code-box__title"><localize key="dynamicRoot_queryStepNearestAncestorOrSelfTitle">Nearest Ancestor Or Self</localize></h2>
-                            <p class="umb-insert-code-box__description"><localize key="dynamicRoot_queryStepNearestAncestorOrSelfDesc">Query the nearest ancestor or self that fits with one of the configured types</localize></p>
-                        </button>
-                        <button type="button" class="btn-reset umb-insert-code-box" ng-click="vm.choose('FurthestAncestorOrSelf')">
-                            <h2 class="umb-insert-code-box__title"><localize key="dynamicRoot_queryStepFurthestAncestorOrSelfTitle">Furthest Ancestor Or Self</localize></h2>
-                            <p class="umb-insert-code-box__description"><localize key="dynamicRoot_queryStepFurthestAncestorOrSelfDesc">Query the Furthest ancestor or self that fits with one of the configured types</localize></p>
-                        </button>
-                        <button type="button" class="btn-reset umb-insert-code-box" ng-click="vm.choose('NearestDescendantOrSelf')">
-                            <h2 class="umb-insert-code-box__title"><localize key="dynamicRoot_queryStepNearestDescendantOrSelfTitle">Nearest Descendant Or Self</localize></h2>
-                            <p class="umb-insert-code-box__description"><localize key="dynamicRoot_queryStepNearestDescendantOrSelfDesc">Query the nearest descendant or self that fits with one of the configured types</localize></p>
-                        </button>
-                        <button type="button" class="btn-reset umb-insert-code-box" ng-click="vm.choose('FurthestDescendantOrSelf')">
-                            <h2 class="umb-insert-code-box__title"><localize key="dynamicRoot_queryStepFurthestDescendantOrSelfTitle">Furthest Descendant Or Self</localize></h2>
-                            <p class="umb-insert-code-box__description"><localize key="dynamicRoot_queryStepFurthestDescendantOrSelfDesc">Query the Furthest descendant or self that fits with one of the configured types</localize></p>
-                        </button>
-                        <button type="button" class="btn-reset umb-insert-code-box" ng-click="vm.chooseCustom()">
-                            <h2 class="umb-insert-code-box__title"><localize key="dynamicRoot_queryStepCustomTitle">Custom</localize></h2>
-                            <p class="umb-insert-code-box__description"><localize key="dynamicRoot_queryStepCustomDesc">Query via a custom Query Step</localize></p>
-                        </button>
-                    </div>
-                </umb-box-content>
-            </umb-box>
-
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertyeditorpicker/propertyeditorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertyeditorpicker/propertyeditorpicker.controller.js
deleted file mode 100644
index 51032f077a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertyeditorpicker/propertyeditorpicker.controller.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.PropertyEditorPickerController
- * @function
- *
- * @description
- * The controller for the property editor picker dialog
- */
-
-(function() {
-    "use strict";
-
-    function PropertyEditorPicker($scope, localizationService) {
-
-        var vm = this;
-
-        vm.select = select;
-        vm.close = close;
-
-        function init() {
-
-            localizationService.localizeMany([
-                "propertyEditorPicker_title"
-            ]).then(data => {
-
-                if (!$scope.model.title) {
-                    $scope.model.title = data[0];
-                }
-            });
-        }
-
-        function select(editor) {
-            $scope.model.selection = [editor.alias];
-            submit();
-        }
-
-        function submit() {
-            if($scope.model.submit) {
-                $scope.model.submit($scope.model);
-            }
-        }
-
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        init();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.PropertyEditorPickerController", PropertyEditorPicker);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertyeditorpicker/propertyeditorpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertyeditorpicker/propertyeditorpicker.html
deleted file mode 100644
index e6d9aced10..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertyeditorpicker/propertyeditorpicker.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<div ng-controller="Umbraco.Editors.PropertyEditorPickerController as vm">
-    <umb-editor-view data-element="editor-property-editor-picker">
-
-        <form novalidate name="DataTypePickerForm" val-form-manager>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content>
-
-                    <umb-search-filter
-                        class="db mb3"
-                        input-id="propertyeditor-search"
-                        model="vm.searchTerm"
-                        label-key="placeholders_search"
-                        text="Type to search"
-                        css-class="w-100"
-                        auto-focus="true">
-                    </umb-search-filter>
-
-                    <ul class="umb-card-grid -six-in-row">
-                        <li ng-repeat="propertyEditor in model.propertyEditors | orderBy:'name' | filter: vm.searchTerm" data-element="propertyeditor-{{propertyeditor.name}}">
-                            <button type="button"
-                                    class="btn-reset umb-card-grid-item"
-                                    title="{{propertyEditor.name}}"
-                                    ng-click="vm.select(propertyEditor)">
-                                <span>
-                                    <umb-icon icon="{{propertyEditor.icon || 'icon-autofill'}}"></umb-icon>
-                                    {{propertyEditor.name}}
-                                </span>
-                            </button>
-                        </li>
-                    </ul>
-
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-        </form>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
deleted file mode 100644
index 76fbf8a3ba..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.PropertySettingsController
- * @function
- *
- * @description
- * The controller for the content type editor property settings dialog
- */
-
-(function () {
-    "use strict";
-
-    function PropertySettingsEditor($scope, contentTypeResource, dataTypeResource, dataTypeHelper, formHelper, localizationService, userService, editorService, propertyTypeResource) {
-
-        var vm = this;
-
-        const dataTypesCanBeChangedConfig = window.Umbraco.Sys.ServerVariables.umbracoSettings.dataTypesCanBeChanged;
-
-        vm.allowChangeDataType = false;
-        vm.changeDataTypeHelpTextIsVisible = false;
-        vm.propertyTypeHasValues = false;
-
-        vm.showValidationPattern = false;
-        vm.focusOnPatternField = false;
-        vm.focusOnMandatoryField = false;
-        vm.selectedValidationType = null;
-        vm.validationTypes = [];
-        vm.labels = {};
-
-        vm.changeValidationType = changeValidationType;
-        vm.changeValidationPattern = changeValidationPattern;
-        vm.openDataTypePicker = openDataTypePicker;
-        vm.openDataTypeSettings = openDataTypeSettings;
-        vm.submitOnEnter = submitOnEnter;
-        vm.submit = submit;
-        vm.close = close;
-
-        vm.toggleAllowCultureVariants = toggleAllowCultureVariants;
-        vm.toggleAllowSegmentVariants = toggleAllowSegmentVariants;
-        vm.toggleValidation = toggleValidation;
-        vm.toggleShowOnMemberProfile = toggleShowOnMemberProfile;
-        vm.toggleMemberCanEdit = toggleMemberCanEdit;
-        vm.toggleIsSensitiveData = toggleIsSensitiveData;
-        vm.toggleLabelOnTop = toggleLabelOnTop;
-
-        function onInit() {
-
-            userService.getCurrentUser().then(function(user) {
-                vm.showSensitiveData = user.userGroups.indexOf("sensitiveData") != -1;
-            });
-
-            const propertyAlias = $scope.model.property.alias;
-
-            if (propertyAlias && (dataTypesCanBeChangedConfig === "False" || dataTypesCanBeChangedConfig === "FalseWithHelpText")) {
-                propertyTypeResource.hasValues(propertyAlias)
-                .then(data => {
-                    vm.propertyTypeHasValues = data.hasValues;
-                    vm.allowChangeDataType = !vm.propertyTypeHasValues;
-                    vm.changeDataTypeHelpTextIsVisible = !vm.allowChangeDataType && dataTypesCanBeChangedConfig === "FalseWithHelpText";
-                });
-            } else {
-                vm.allowChangeDataType = true;
-            }
-
-            //make the default the same as the content type
-            if (!$scope.model.property.dataTypeId) {
-                $scope.model.property.allowCultureVariant = $scope.model.contentTypeAllowCultureVariant;
-            }
-
-            loadValidationTypes();
-
-        }
-
-        function loadValidationTypes() {
-
-            var labels = [
-                "validation_validateAsEmail",
-                "validation_validateAsNumber",
-                "validation_validateAsUrl",
-                "validation_enterCustomValidation",
-                "validation_fieldIsMandatory",
-                "contentTypeEditor_displaySettingsLabelOnTop"
-            ];
-
-            localizationService.localizeMany(labels)
-                .then(function(data){
-
-                    vm.labels.validateAsEmail = data[0];
-                    vm.labels.validateAsNumber = data[1];
-                    vm.labels.validateAsUrl = data[2];
-                    vm.labels.customValidation = data[3];
-                    vm.labels.fieldIsMandatory = data[4];
-                    vm.labels.displaySettingsLabelOnTop = data[5];
-
-                    vm.validationTypes = [
-                        {
-                            "name": vm.labels.validateAsEmail,
-                            "key": "email",
-                            "pattern": "[a-zA-Z0-9_\.\+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-\.]+",
-                            "enableEditing": true
-                        },
-                        {
-                            "name": vm.labels.validateAsNumber,
-                            "key": "number",
-                            "pattern": "^[0-9]*$",
-                            "enableEditing": true
-                        },
-                        {
-                            "name": vm.labels.validateAsUrl,
-                            "key": "url",
-                            "pattern": "https?\:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,}",
-                            "enableEditing": true
-                        },
-                        {
-                            "name": vm.labels.customValidation,
-                            "key": "custom",
-                            "pattern": "",
-                            "enableEditing": true
-                        }
-                    ];
-
-                    matchValidationType();
-
-                });
-
-        }
-
-        function changeValidationPattern() {
-            matchValidationType();
-        }
-
-        function openDataTypePicker(property) {
-
-            vm.focusOnMandatoryField = false;
-
-            var dataTypePicker = {
-                property: $scope.model.property,
-                contentTypeName: $scope.model.contentTypeName,
-                view: "views/common/infiniteeditors/datatypepicker/datatypepicker.html",
-                size: "medium",
-                submit: function(model) {
-
-                    $scope.model.updateSameDataTypes = model.updateSameDataTypes;
-
-                    vm.focusOnMandatoryField = true;
-
-                    // update property
-                    property.config = model.property.config;
-                    property.editor = model.property.editor;
-                    property.view = model.property.view;
-                    property.dataTypeId = model.property.dataTypeId;
-                    property.dataTypeIcon = model.property.dataTypeIcon;
-                    property.dataTypeName = model.property.dataTypeName;
-
-                    editorService.close();
-                },
-                close: function(model) {
-                    editorService.close();
-                }
-            };
-
-            editorService.open(dataTypePicker);
-
-        }
-
-        function openDataTypeSettings(property) {
-
-            vm.focusOnMandatoryField = false;
-
-            var dataTypeSettings = {
-                view: "views/common/infiniteeditors/datatypesettings/datatypesettings.html",
-                id: property.dataTypeId,
-                submit: function(model) {
-                    contentTypeResource.getPropertyTypeScaffold(model.dataType.id).then(function (propertyType) {
-                        // update editor
-                        property.config = propertyType.config;
-                        property.editor = propertyType.editor;
-                        property.view = propertyType.view;
-                        property.dataTypeId = model.dataType.id;
-                        property.dataTypeIcon = model.dataType.icon;
-                        property.dataTypeName = model.dataType.name;
-
-                        // set flag to update same data types
-                        $scope.model.updateSameDataTypes = true;
-
-                        vm.focusOnMandatoryField = true;
-
-                        editorService.close();
-                    });
-                },
-                close: function() {
-                    editorService.close();
-                }
-            };
-
-            editorService.open(dataTypeSettings);
-
-        }
-
-        function submitOnEnter(event) {
-            if(event && event.keyCode === 13) {
-                submit();
-            }
-        }
-
-        function submit() {
-            if($scope.model.submit) {
-                if (formHelper.submitForm({scope: $scope})) {
-                    $scope.model.submit($scope.model);
-                }
-            }
-        }
-
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        function matchValidationType() {
-
-            if ($scope.model.property.validation.pattern !== null && $scope.model.property.validation.pattern !== "" && $scope.model.property.validation.pattern !== undefined) {
-
-                var match = false;
-
-                // find and show if a match from the list has been chosen
-                vm.validationTypes.forEach(function (validationType, index) {
-                    if ($scope.model.property.validation.pattern === validationType.pattern) {
-                        vm.selectedValidationType = vm.validationTypes[index];
-                        vm.showValidationPattern = true;
-                        match = true;
-                    }
-                });
-
-                // if there is no match - choose the custom validation option.
-                if (!match) {
-                    vm.validationTypes.forEach(function (validationType) {
-                        if (validationType.key === "custom") {
-                            vm.selectedValidationType = validationType;
-                            vm.showValidationPattern = true;
-                        }
-                    });
-                }
-            }
-
-        }
-
-        function changeValidationType(selectedValidationType) {
-
-            if (selectedValidationType) {
-                $scope.model.property.validation.pattern = selectedValidationType.pattern;
-                vm.showValidationPattern = true;
-
-                // set focus on textarea
-                if (selectedValidationType.key === "custom") {
-                    vm.focusOnPatternField = true;
-                }
-
-            } else {
-                $scope.model.property.validation.pattern = "";
-                vm.showValidationPattern = false;
-            }
-
-        }
-
-        function toggleValue(settingValue) {
-            return !settingValue;
-        }
-
-        function toggleAllowCultureVariants() {
-            $scope.model.property.allowCultureVariant = toggleValue($scope.model.property.allowCultureVariant);
-        }
-
-        function toggleAllowSegmentVariants() {
-            $scope.model.property.allowSegmentVariant = toggleValue($scope.model.property.allowSegmentVariant);
-        }
-
-        function toggleValidation() {
-            $scope.model.property.validation.mandatory = toggleValue($scope.model.property.validation.mandatory);
-        }
-
-        function toggleShowOnMemberProfile() {
-            $scope.model.property.showOnMemberProfile = toggleValue($scope.model.property.showOnMemberProfile);
-        }
-
-        function toggleMemberCanEdit() {
-            $scope.model.property.memberCanEdit = toggleValue($scope.model.property.memberCanEdit);
-        }
-
-        function toggleIsSensitiveData() {
-            $scope.model.property.isSensitiveData = toggleValue($scope.model.property.isSensitiveData);
-        }
-        function toggleLabelOnTop() {
-            $scope.model.property.labelOnTop = toggleValue($scope.model.property.labelOnTop);
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.PropertySettingsController", PropertySettingsEditor);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
deleted file mode 100644
index 6edb11f819..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
+++ /dev/null
@@ -1,248 +0,0 @@
-<div ng-controller="Umbraco.Editors.PropertySettingsController as vm">
-
-<form name="propertySettingsForm" novalidate val-form-manager>
-
-    <umb-editor-view data-element="editor-property-settings">
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content>
-
-                    <div class="content-type-editor-dialog edit-property-settings">
-
-                        <div class="umb-control-group -no-border" ng-if="!model.property.locked">
-                            <div class="control-group -no-margin">
-                                <input type="text"
-                                          class="editor-label"
-                                          data-element="property-name"
-                                          name="propertyLabel"
-                                          ng-model="model.property.label"
-                                          localize="placeholder"
-                                          placeholder="@placeholders_entername"
-                                          umb-auto-focus
-                                          focus-on-filled="true"
-                                          required
-                                          ng-keypress="vm.submitOnEnter($event)" />
-                                <div ng-messages="propertySettingsForm.propertyLabel.$error" show-validation-on-submit>
-                                    <span class="umb-validation-label" ng-message="required">Required label</span>
-                                </div>
-                            </div>
-                            <div class="control-group -no-margin" style="margin-top:2px;">
-                                <umb-generate-alias enable-lock="true" alias-from="model.property.label" alias="model.property.alias"></umb-generate-alias>
-                            </div>
-                        </div>
-
-                        <div class="umb-control-group control-group -no-border">
-                            <textarea data-element="property-description"
-                                    class="editor-description"
-                                    ng-model="model.property.description"
-                                    localize="placeholder"
-                                    placeholder="@placeholders_enterDescription"
-                                    umb-auto-resize>
-                        </textarea>
-                        </div>
-
-                        <ng-form name="dataTypeForm">
-                            <div class="umb-control-group control-group" ng-model="model.property.editor" name="selectedEditor" val-require-component ng-if="!model.property.locked">
-                                <umb-button
-                                    class="editor-placeholder-button"
-                                    ng-if="!model.property.editor"
-                                    data-element="editor-add"
-                                    type="button"
-                                    button-style="[placeholder, block]"
-                                    label-key="defaultdialogs_selectEditor"
-                                    ng-click="vm.openDataTypePicker(model.property)"
-                                    shortcut="alt+shift+e">
-                                </umb-button>
-
-                                <div ng-messages="dataTypeForm.selectedEditor.$error" show-validation-on-submit>
-                                    <span class="umb-validation-label" ng-message="valRequiredComponent">
-                                        <localize key="general_required">Required</localize>
-                                    </span>
-                                </div>
-
-                                <div ng-if="model.property.editor">
-                                    <umb-node-preview
-                                        single
-                                        icon="model.property.dataTypeIcon || 'icon-autofill'"
-                                        name="model.property.dataTypeName"
-                                        description="model.property.editor"
-                                        allow-edit="true"
-                                        on-edit="vm.openDataTypeSettings(model.property)"
-                                        allow-change="vm.allowChangeDataType"
-                                        on-change="vm.openDataTypePicker(model.property)">
-                                    </umb-node-preview>
-
-                                    <div ng-if="vm.changeDataTypeHelpTextIsVisible" class="mt2 umb-alert umb-alert--info">
-                                        <localize key="contentTypeEditor_changeDataTypeHelpText">
-                                    </div>
-                                </div>
-                            </div>
-                        </ng-form>
-
-                        <div class="umb-control-group clearfix" ng-if="!model.property.locked">
-
-                            <h5><localize key="validation_validation">Validation</localize></h5>
-
-                            <umb-toggle data-element="validation_mandatory"
-                                        checked="model.property.validation.mandatory"
-                                        on-click="vm.toggleValidation()"
-                                        label-on="{{vm.labels.fieldIsMandatory}}"
-                                        label-off="{{vm.labels.fieldIsMandatory}}"
-                                        show-labels="true"
-                                        label-position="right"
-                                        focus-when="{{vm.focusOnMandatoryField}}"
-                                        class="mb1">
-                            </umb-toggle>
-
-                            <input type="text"
-                                   class="editor-validation-message"
-                                   localize="placeholder"
-                                   placeholder="@validation_mandatoryMessage"
-                                   ng-model="model.property.validation.mandatoryMessage"
-                                   ng-if="model.property.validation.mandatory"
-                                   ng-keypress="vm.submitOnEnter($event)" />
-
-                            <label class="mt3">
-                                <localize key="validation_customValidation">Custom validation</localize>
-                            </label>
-
-                            <select class="umb-dropdown" ng-options="validationType.name for validationType in vm.validationTypes" ng-model="vm.selectedValidationType" ng-change="vm.changeValidationType(vm.selectedValidationType)">
-                                <option value=""><localize key="validation_noValidation">No validation</localize></option>
-                            </select>
-
-                            <textarea class="editor-validation-pattern"
-                                      localize="placeholder"
-                                      placeholder="@validation_validationRegExp"
-                                      ng-model="model.property.validation.pattern"
-                                      ng-change="vm.changeValidationPattern()"
-                                      ng-if="vm.showValidationPattern"
-                                      umb-auto-resize
-                                      focus-when="{{vm.focusOnPatternField}}"
-                                      ng-keypress="vm.submitOnEnter($event)">
-                            </textarea>
-
-                            <input type="text"
-                                   class="editor-validation-message"
-                                   localize="placeholder"
-                                   placeholder="@validation_validationRegExpMessage"
-                                   ng-model="model.property.validation.patternMessage"
-                                   ng-if="vm.showValidationPattern"
-                                   ng-keypress="vm.submitOnEnter($event)" />
-
-                        </div>
-                        <div class="umb-control-group clearfix" ng-if="!model.property.locked">
-
-                            <h5><localize key="contentTypeEditor_displaySettingsHeadline">Appearance</localize></h5>
-
-                            <umb-toggle data-element="displaySettings_labelOnTop"
-                                        checked="model.property.labelOnTop"
-                                        on-click="vm.toggleLabelOnTop()"
-                                        label-on="{{vm.labels.displaySettingsLabelOnTop}}"
-                                        label-off="{{vm.labels.displaySettingsLabelOnTop}}"
-                                        show-labels="true"
-                                        label-position="right"
-                                        class="mb1">
-                            </umb-toggle>
-
-                        </div>
-                        <div class="umb-control-group clearfix -no-border" ng-if="model.contentType === 'documentType' && model.contentTypeAllowCultureVariant">
-
-                            <h5><localize key="contentTypeEditor_cultureVariantHeading">Allow vary by culture</localize></h5>
-                            <umb-toggle data-element="permissions-allow-culture-variant"
-                                        checked="model.property.allowCultureVariant"
-                                        on-click="vm.toggleAllowCultureVariants()">
-                            </umb-toggle>
-
-                        </div>
-                        <div class="umb-control-group clearfix" ng-if="model.contentType === 'documentType' && model.contentTypeAllowSegmentVariant">
-
-                            <h5><localize key="contentTypeEditor_segmentVariantHeading">Allow segmentation</localize></h5>
-
-                            <umb-toggle data-element="permissions-allow-segment-variant"
-                                        checked="model.property.allowSegmentVariant"
-                                        on-click="vm.toggleAllowSegmentVariants()">
-                            </umb-toggle>
-
-                        </div>
-
-                        <div class="umb-control-group clearfix -no-border" ng-if="model.contentType === 'memberType'">
-
-                            <h5><localize key="general_options">Options</localize></h5>
-
-                            <label class="mt3">
-                                <localize key="contentTypeEditor_showOnMemberProfile">Show on member profile</localize>
-                                <small><localize key="contentTypeEditor_showOnMemberProfileDescription">Allow this property value to be displayed on the member profile page</localize></small>
-                            </label>
-
-                            <umb-toggle data-element="settings_show_member_on_profile"
-                                        checked="model.property.showOnMemberProfile"
-                                        on-click="vm.toggleShowOnMemberProfile()">
-                            </umb-toggle>
-
-                            <label class="mt3">
-                                <localize key="contentTypeEditor_memberCanEdit">Member can edit</localize>
-                                <small><localize key="contentTypeEditor_memberCanEditDescription">Allow this property value to be edited by the member on their profile page</localize></small>
-                            </label>
-
-                            <umb-toggle data-element="settings_member_can_edit"
-                                        checked="model.property.memberCanEdit"
-                                        on-click="vm.toggleMemberCanEdit()">
-                            </umb-toggle>
-
-                            <label class="mt3" ng-if="vm.showSensitiveData">
-                                <localize key="contentTypeEditor_isSensitiveData">Is sensitive data</localize>
-                                <small><localize key="contentTypeEditor_isSensitiveDataDescription">Hide this property value from content editors that don't have access to view sensitive information</localize></small>
-                            </label>
-
-                            <umb-toggle ng-if="vm.showSensitiveData" data-element="settings_is_sensitive_data"
-                                        checked="model.property.isSensitiveData"
-                                        on-click="vm.toggleIsSensitiveData()">
-                            </umb-toggle>
-
-                        </div>
-                    </div>
-
-                </umb-box-content>
-
-            </umb-box>
-
-        </umb-editor-container>
-
-        <umb-editor-footer>
-
-            <umb-editor-footer-content-right>
-
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-
-                <umb-button
-                    alias="submit"
-                    type="button"
-                    button-style="success"
-                    label-key="general_submit"
-                    action="vm.submit(model)">
-                </umb-button>
-
-            </umb-editor-footer-content-right>
-
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.controller.js
deleted file mode 100644
index faca3b3fa0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.controller.js
+++ /dev/null
@@ -1,225 +0,0 @@
-(function() {
-    "use strict";
-
-    function QueryBuilderOverlayController($scope, templateQueryResource, localizationService, editorService) {
-
-        var everything = "";
-        var myWebsite = "";
-        var ascendingTranslation = "";
-        var descendingTranslation = "";
-
-        var vm = this;
-
-        vm.properties = [];
-        vm.contentTypes = [];
-        vm.conditions = [];
-
-        vm.datePickerConfig = {
-            dateFormat: "Y-m-d"
-        };
-
-        vm.chooseSource = chooseSource;
-        vm.getPropertyOperators = getPropertyOperators;
-        vm.addFilter = addFilter;
-        vm.trashFilter = trashFilter;
-        vm.changeSortOrder = changeSortOrder;
-        vm.setSortProperty = setSortProperty;
-        vm.setContentType = setContentType;
-        vm.setFilterProperty = setFilterProperty;
-        vm.setFilterTerm = setFilterTerm;
-        vm.changeConstraintValue = changeConstraintValue;
-        vm.datePickerChange = datePickerChange;
-        vm.submit = submit;
-        vm.close = close;
-
-        function onInit() {
-
-            if(!$scope.model.title) {
-                localizationService.localize("template_queryBuilder").then(function(value){
-                    $scope.model.title = value;
-                });
-            }
-
-            vm.query = {
-                contentType: {
-                    name: everything
-                },
-                source: {
-                    name: myWebsite
-                },
-                filters: [
-                    {
-                        property: undefined,
-                        operator: undefined
-                    }
-                ],
-                sort: {
-                    property: {
-                        alias: "",
-                        name: ""
-                    },
-                    direction: "ascending", //This is the value for sorting sent to server
-                    translation: {
-                        currentLabel: ascendingTranslation, //This is the localized UI value in the the dialog
-                        ascending: ascendingTranslation,
-                        descending: descendingTranslation
-                    }
-                }
-            };
-
-            templateQueryResource.getAllowedProperties()
-                .then(function(properties) {
-                    vm.properties = properties;
-                });
-
-            templateQueryResource.getContentTypes()
-                .then(function(contentTypes) {
-                    vm.contentTypes = contentTypes;
-                });
-
-            templateQueryResource.getFilterConditions()
-                .then(function(conditions) {
-                    vm.conditions = conditions;
-                });
-
-            throttledFunc();
-
-        }
-
-        function chooseSource(query) {
-            var contentPicker = {
-                submit: function(model) {
-                    var selectedNodeId = model.selection[0].id;
-                    var selectedNodeName = model.selection[0].name;
-                    if (selectedNodeId > 0) {
-                        query.source = { id: selectedNodeId, name: selectedNodeName };
-                    } else {
-                        query.source.name = myWebsite;
-                        delete query.source.id;
-                    }
-                    throttledFunc();
-                    editorService.close();
-                },
-                close: function() {
-                    editorService.close();
-                }
-            };
-            editorService.contentPicker(contentPicker);
-        }
-
-        function getPropertyOperators(property) {
-            var conditions = _.filter(vm.conditions,
-                function(condition) {
-                    var index = condition.appliesTo.indexOf(property.type);
-                    return index >= 0;
-                });
-            return conditions;
-        }
-
-        function addFilter(query) {
-            query.filters.push({});
-        }
-
-        function trashFilter(query, filter) {
-            for (var i = 0; i < query.filters.length; i++) {
-                if (query.filters[i] == filter) {
-                    query.filters.splice(i, 1);
-                }
-            }
-            //if we remove the last one, add a new one to generate ui for it.
-            if (query.filters.length == 0) {
-                query.filters.push({});
-            }
-
-        }
-
-        function changeSortOrder(query) {
-            if (query.sort.direction === "ascending") {
-                query.sort.direction = "descending";
-                query.sort.translation.currentLabel = query.sort.translation.descending;
-            } else {
-                query.sort.direction = "ascending";
-                query.sort.translation.currentLabel = query.sort.translation.ascending;
-            }
-            throttledFunc();
-        }
-
-        function setSortProperty(query, property) {
-            query.sort.property = property;
-            if (property.type === "datetime") {
-                query.sort.direction = "descending";
-                query.sort.translation.currentLabel = query.sort.translation.descending;
-            } else {
-                query.sort.direction = "ascending";
-                query.sort.translation.currentLabel = query.sort.translation.ascending;
-            }
-            throttledFunc();
-        }
-
-        function setContentType(contentType) {
-            vm.query.contentType = contentType;
-            throttledFunc();
-        }
-
-        function setFilterProperty(filter, property) {
-            filter.property = property;
-            filter.term = {};
-            filter.constraintValue = "";
-        }
-
-        function setFilterTerm(filter, term) {
-            filter.term = term;
-            if (filter.constraintValue) {
-                throttledFunc();
-            }
-        }
-
-        function changeConstraintValue() {
-            throttledFunc();
-        }
-
-        function datePickerChange(date, filter) {
-            const momentDate = moment(date);
-            if (momentDate && momentDate.isValid()) {
-                filter.constraintValue = momentDate.format(vm.datePickerConfig.format);
-                throttledFunc();
-            }
-        }
-
-        function submit(model) {
-            if($scope.model.submit) {
-                $scope.model.submit(model);
-            }
-        }
-
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        var throttledFunc = _.throttle(function() {
-
-                templateQueryResource.postTemplateQuery(vm.query)
-                    .then(function(response) {
-                        $scope.model.result = response;
-                    });
-
-            },
-            200);
-
-        localizationService.localizeMany([
-                "template_allContent", "template_websiteRoot", "template_ascending", "template_descending"
-            ])
-            .then(function(res) {
-                everything = res[0];
-                myWebsite = res[1];
-                ascendingTranslation = res[2];
-                descendingTranslation = res[3];
-                onInit();
-            });
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.QueryBuilderController", QueryBuilderOverlayController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
deleted file mode 100644
index 2d739e9872..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<div ng-controller="Umbraco.Editors.QueryBuilderController as vm">
-
-	<umb-editor-view>
-
-		<umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-		</umb-editor-header>
-
-		<umb-editor-container>
-
-			<umb-box>
-				<umb-box-content>
-
-                    <div class="umb-control-group umb-querybuilder">
-
-                        <div class="row">
-                            <div class="query-items">
-
-                                <span><localize key="template_iWant">I want</localize></span>
-
-                                <div class="btn-group">
-
-                                    <umb-button type="button"
-                                                button-style="outline"
-                                                action="vm.contentTypeSelectOpen = !vm.contentTypeSelectOpen"
-                                                label="{{vm.query.contentType.name}}"
-                                                show-caret="true">
-                                    </umb-button>
-
-                                    <umb-dropdown ng-if="vm.contentTypeSelectOpen" on-close="vm.contentTypeSelectOpen = false">
-                                        <umb-dropdown-item ng-repeat="contentType in vm.contentTypes">
-                                            <button type="button" class="btn-reset" ng-click="vm.setContentType(contentType); vm.contentTypeSelectOpen = false;">
-                                                {{contentType.name}}
-                                            </button>
-                                        </umb-dropdown-item>
-                                    </umb-dropdown>
-
-                                </div>
-
-                                <span><localize key="template_from">from</localize></span>
-
-                                <umb-button type="button"
-                                            button-style="outline"
-                                            action="vm.chooseSource(vm.query)"
-                                            label="{{vm.query.source.name}}">
-                                </umb-button>
-
-                            </div>
-
-                            <div class="query-items" ng-repeat="filter in vm.query.filters ">
-
-                                <span ng-if="$first">
-                                    <localize key="template_where">where</localize>
-                                </span>
-                                <span ng-if="!$first">
-                                    <localize key="template_and">and</localize>
-                                </span>
-
-                                <div class="btn-group">
-
-                                    <umb-button type="button"
-                                                button-style="outline"
-                                                action="vm.propertyFilterOpen[$index] = !vm.propertyFilterOpen[$index]"
-                                                label="{{filter.property.name}}"
-                                                show-caret="true">
-                                    </umb-button>
-
-                                    <umb-dropdown ng-if="vm.propertyFilterOpen[$index]" on-close="vm.propertyFilterOpen[$index] = false">
-                                        <umb-dropdown-item ng-repeat="property in vm.properties">
-                                            <button type="button" class="btn-reset" ng-click="vm.setFilterProperty(filter, property); vm.propertyFilterOpen[$parent.$parent.$index] = false;">
-                                                {{property.name}}
-                                            </button>
-                                        </umb-dropdown-item>
-                                    </umb-dropdown>
-
-                                </div>
-
-                                <div class="btn-group" ng-if="filter.property">
-
-                                    <umb-button type="button"
-                                                button-style="outline"
-                                                action="vm.termFilterOpen[$index] = !vm.termFilterOpen[$index]"
-                                                label="{{filter.term.name}}"
-                                                show-caret="true">
-                                    </umb-button>
-
-                                    <umb-dropdown ng-if="vm.termFilterOpen[$index]" on-close="vm.termFilterOpen[$index] = false">
-                                        <umb-dropdown-item ng-repeat="term in vm.getPropertyOperators(filter.property)">
-                                            <button type="button" class="btn-reset" ng-click="vm.setFilterTerm(filter, term); vm.termFilterOpen[$parent.$parent.$index] = false;">
-                                                {{term.name}}
-                                            </button>
-                                        </umb-dropdown-item>
-                                    </umb-dropdown>
-
-                                </div>
-
-                                <span ng-switch="filter.term.appliesTo[0]">
-
-                                    <!-- Filter term types  (string, int, date) -->
-                                    <input type="text" ng-switch-when="string" style="width:90px; margin-bottom: 0;" ng-model="filter.constraintValue" ng-change="vm.changeConstraintValue()" />
-                                    <input type="number" ng-switch-when="int" style="width:90px; margin-bottom: 0;" ng-model="filter.constraintValue" ng-change="vm.changeConstraintValue()" />
-
-                                    <span ng-switch-when="datetime">
-                                        <umb-date-time-picker options="vm.datePickerConfig"
-                                                              on-change="vm.datePickerChange(dateStr, filter)">
-                                        </umb-date-time-picker>
-                                    </span>
-
-                                </span>
-
-                                <button type="button" class="btn-reset" ng-click="vm.addFilter(vm.query)">
-                                    <umb-icon icon="icon-add"></umb-icon>
-                                </button>
-
-                                <button type="button" class="btn-reset" ng-click="vm.trashFilter(vm.query, filter)">
-                                    <umb-icon icon="icon-trash"></umb-icon>
-                                </button>
-
-                            </div>
-
-                            <div class="query-items">
-
-                                <span><localize key="template_orderBy">order by</localize></span>
-
-                                <div class="btn-group">
-
-                                    <umb-button type="button"
-                                                button-style="outline"
-                                                action="vm.sortPropertyOpen = !vm.sortPropertyOpen"
-                                                label="{{vm.query.sort.property.name}}"
-                                                show-caret="true">
-                                    </umb-button>
-
-                                    <umb-dropdown ng-if="vm.sortPropertyOpen" on-close="vm.sortPropertyOpen = false">
-                                        <umb-dropdown-item ng-repeat="property in vm.properties">
-                                            <button type="button" class="btn-reset" ng-click="vm.setSortProperty(vm.query, property); vm.sortPropertyOpen = false;">
-                                                {{property.name}}
-                                            </button>
-                                        </umb-dropdown-item>
-                                    </umb-dropdown>
-
-                                </div>
-
-                                <umb-button ng-show="vm.query.sort.property.name"
-                                            type="button"
-                                            button-style="outline"
-                                            action="vm.changeSortOrder(vm.query)"
-                                            label="{{vm.query.sort.translation.currentLabel}}">
-                                </umb-button>
-
-                            </div>
-                        </div>
-
-                        <h5>{{model.result.resultCount}} <localize key="template_itemsReturned">items, returned in</localize> {{model.result.executionTime}} ms</h5>
-
-                        <ul class="nav unstyled">
-                            <li ng-repeat="item in model.result.sampleResults">
-                                <umb-icon icon="{{item.icon}}" class="icon turquoise-d1"></umb-icon> {{item.name}}
-                            </li>
-                        </ul>
-
-                        <umb-code-snippet language="'csharp'">{{model.result.queryExpression}}</umb-code-snippet>
-
-                    </div>
-
-				</umb-box-content>
-			</umb-box>
-
-		</umb-editor-container>
-
-		<umb-editor-footer>
-
-			<umb-editor-footer-content-right>
-
-				<umb-button
-					type="button"
-					button-style="link"
-					label-key="general_close"
-				    shortcut="esc"
-					action="vm.close()">
-				</umb-button>
-
-				<umb-button
-					type="button"
-					button-style="success"
-					label-key="general_submit"
-					action="vm.submit(model)">
-				</umb-button>
-
-			</umb-editor-footer-content-right>
-
-		</umb-editor-footer>
-
-	</umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
deleted file mode 100644
index d59bbcefcf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ /dev/null
@@ -1,283 +0,0 @@
-(function () {
-    "use strict";
-
-    function RollbackController($scope, contentResource, localizationService, assetsService, dateHelper, userService, notificationsService) {
-
-        var vm = this;
-
-        vm.rollback = rollback;
-        vm.changeLanguage = changeLanguage;
-        vm.changeVersion = changeVersion;
-        vm.submit = submit;
-        vm.close = close;
-        vm.pinVersion = pinVersion;
-        vm.goToPage = goToPage;
-        vm.paginationCount = { from: 0, to: 0, total: 0 };
-
-        //////////
-
-        function onInit() {
-
-            vm.loading = true;
-            vm.variantVersions = [];
-            vm.diff = null;
-            vm.currentVersion = null;
-            vm.rollbackButtonDisabled = true;
-            vm.labels = {};
-
-            vm.pageSize = 15;
-            vm.pageNumber = 1;
-            vm.totalPages = 1;
-            vm.totalItems = 0;
-
-            // find the current version for invariant nodes
-            if($scope.model.node.variants.length === 1) {
-                vm.currentVersion = $scope.model.node.variants[0];
-            }
-
-            // find the current version for nodes with variants
-            if($scope.model.node.variants.length > 1) {
-                var active = _.find($scope.model.node.variants, function (v) {
-                    return v.active;
-                });
-
-                // preselect the language in the dropdown
-                if(active) {
-                    vm.selectedLanguage = active;
-                    vm.currentVersion = active;
-                }
-            }
-
-            localizationService.localizeMany(["actions_rollback", "general_choose"]).then(function (data) {
-                // set default title
-                if (!$scope.model.title) {
-                    $scope.model.title = data[0];
-                }
-                vm.labels.choose = data[1];
-            });
-
-            // Load in diff library
-            assetsService.loadJs('lib/jsdiff/diff.js', $scope).then(function () {
-
-                getVersions().then(function(){
-                    vm.loading = false;
-                });
-
-            });
-
-        }
-
-        function changeLanguage(language) {
-            vm.currentVersion = language;
-            vm.pageNumber = 1;
-            getVersions();
-        }
-
-        function canRollback(version) {
-            return !version.currentDraftVersion;
-        }
-
-        function changeVersion(version) {
-
-            if (canRollback(version) === false) {
-                return;
-            }
-
-            if (vm.previousVersion && version && vm.previousVersion.versionId === version.versionId) {
-                vm.previousVersion = null;
-                vm.diff = null;
-                vm.rollbackButtonDisabled = true;
-                return;
-            }
-
-            if (version && version.versionId) {
-                vm.loadingDiff = true;
-                const culture = $scope.model.node.variants.length > 1 ? vm.currentVersion.language.culture : null;
-
-                vm.previousVersion = null;
-                contentResource.getRollbackVersion(version.versionId, culture)
-                    .then(function(data) {
-                        vm.previousVersion = data;
-                        vm.previousVersion.versionId = version.versionId;
-                        vm.previousVersion.displayValue = version.displayValue + ' - ' + version.username;
-                        createDiff(vm.currentVersion, vm.previousVersion);
-
-                        const changed = (part) => part.added || part.removed;
-                        vm.diffHasChanges = vm.diff.name.some(changed) || vm.diff.properties.some((property) => property.diff.some(changed));
-
-                        vm.loadingDiff = false;
-                        vm.rollbackButtonDisabled = !vm.diffHasChanges;
-                    }, function () {
-                        vm.loadingDiff = false;
-                    });
-
-            } else {
-                vm.diff = null;
-                vm.rollbackButtonDisabled = true;
-            }
-        }
-
-        function getVersions() {
-
-            const nodeId = $scope.model.node.id;
-            const culture = vm.currentVersion.language ? vm.currentVersion.language.culture : null;
-
-            return contentResource.getPagedContentVersions(nodeId, vm.pageNumber, vm.pageSize, culture)
-                .then(function (data) {
-                    vm.totalPages = data.totalPages;
-                    vm.totalItems = data.totalItems;
-
-                    const possibleTotalItems = vm.pageNumber * vm.pageSize;
-
-                    vm.paginationCount = {
-                        from: (vm.pageNumber * vm.pageSize - vm.pageSize) + 1,
-                        to: vm.totalItems < possibleTotalItems ? vm.totalItems : possibleTotalItems,
-                        total: vm.totalItems
-                    };
-
-                    // get current backoffice user and format dates
-                    userService.getCurrentUser().then(function (currentUser) {
-                        vm.previousVersions = data.items
-                            // we don't ever want to show the draft version in the rollback list
-                            .filter(version => version.currentDraftVersion === false)
-                            .map(version => {
-                                var timestampFormatted = dateHelper.getLocalDate(version.versionDate, currentUser.locale, 'LLL');
-                                version.displayValue = timestampFormatted;
-                                return version;
-                            });
-                    });
-                });
-        }
-
-        /**
-         * This will load in a new version
-         */
-        function createDiff(currentVersion, previousVersion) {
-            vm.diff = {};
-            vm.diff.properties = [];
-
-            // find diff in name
-            vm.diff.name = Diff.diffWords(currentVersion.name, previousVersion.name);
-
-            // extract all properties from the tabs and create new object for the diff
-            currentVersion.tabs.forEach(function (tab) {
-                tab.properties.forEach(function (property) {
-                    let oldTabIndex = -1;
-                    let oldTabPropertyIndex = -1;
-                    const previousVersionTabs = previousVersion.tabs;
-
-                    // find the property by alias, but only search until we find it
-                    for (var oti = 0, length = previousVersionTabs.length; oti < length; oti++) {
-                        const opi = previousVersionTabs[oti].properties.findIndex(p => p.alias === property.alias);
-                        if (opi !== -1) {
-                            oldTabIndex = oti;
-                            oldTabPropertyIndex = opi;
-                            break;
-                        }
-                    }
-
-                    if (oldTabIndex !== -1 && oldTabPropertyIndex !== -1) {
-                        let oldProperty = previousVersion.tabs[oldTabIndex].properties[oldTabPropertyIndex];
-
-                        // copy existing properties, so it doesn't manipulate existing properties on page
-                        oldProperty = Utilities.copy(oldProperty);
-                        property = Utilities.copy(property);
-
-                        // we have to make properties storing values as object into strings (Grid, nested content, etc.)
-                        if (property.value instanceof Object) {
-                            property.value = JSON.stringify(property.value, null, 1);
-                            property.isObject = true;
-                        }
-
-                        if (oldProperty.value instanceof Object) {
-                            oldProperty.value = JSON.stringify(oldProperty.value, null, 1);
-                            oldProperty.isObject = true;
-                        }
-
-                        // diff requires a string
-                        property.value = property.value ? property.value + '' : '';
-                        oldProperty.value = oldProperty.value ? oldProperty.value + '' : '';
-
-                        const diffProperty = {
-                            'alias': property.alias,
-                            'label': property.label,
-                            'diff': property.isObject ? Diff.diffJson(property.value, oldProperty.value) : Diff.diffWords(property.value, oldProperty.value),
-                            'isObject': property.isObject || oldProperty.isObject
-                        };
-
-                        vm.diff.properties.push(diffProperty);
-                    }
-                });
-            });
-        }
-
-        function rollback() {
-
-            vm.rollbackButtonState = "busy";
-
-            const nodeId = $scope.model.node.id;
-            const versionId = vm.previousVersion.versionId;
-            const culture = $scope.model.node.variants.length > 1 ? vm.currentVersion.language.culture : null;
-
-            return contentResource.rollback(nodeId, versionId, culture)
-                .then(data => {
-                    vm.rollbackButtonState = "success";
-                    submit();
-                }, error => {
-                    vm.rollbackButtonState = "error";
-                });
-
-        }
-
-        function submit() {
-            if($scope.model.submit) {
-                $scope.model.submit($scope.model.submit);
-            }
-        }
-
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        function pinVersion (version, event) {
-            if (!version) {
-                return;
-            }
-
-            version.pinningState = 'busy';
-
-            const nodeId = $scope.model.node.id;
-            const versionId = version.versionId;
-            const preventCleanup = !version.preventCleanup;
-
-            contentResource.contentVersionPreventCleanup(nodeId, versionId, preventCleanup)
-                .then(() => {
-                    version.pinningState = 'success';
-                    version.preventCleanup = preventCleanup;
-                }, () => {
-                    version.pinningState = 'error';
-
-                    const localizationKey = preventCleanup ? 'speechBubbles_preventCleanupEnableError' : 'speechBubbles_preventCleanupDisableError';
-
-                    localizationService.localize(localizationKey).then(value => {
-                        notificationsService.error(value);
-                    });
-                });
-
-            event.stopPropagation();
-        }
-
-        function goToPage (pageNumber) {
-            vm.pageNumber = pageNumber;
-            getVersions();
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.RollbackController", RollbackController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
deleted file mode 100644
index e6f2a1c3a5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<div class="editor-rollback" ng-controller="Umbraco.Editors.RollbackController as vm">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-load-indicator
-                ng-if="vm.loading">
-            </umb-load-indicator>
-
-            <div class="main-content">
-
-                <umb-box class="side-panel">
-                    <umb-box-header title-key="rollback_versions">
-                        <small>
-                            <localize
-                                key="rollback_pagination"
-                                tokens="[vm.paginationCount.from, vm.paginationCount.to, vm.paginationCount.total]"
-                                watch-tokens="true">
-                            </localize>
-                        </small>
-                    </umb-box-header>
-
-                    <umb-box-content>
-
-                        <div ng-if="model.node.variants.length > 1">
-                            <h5 class="mt0"><localize key="general_language">Language</localize></h5>
-                            <select
-                                class="culture-select input-block-level"
-                                ng-model="vm.selectedLanguage"
-                                ng-options="variant as variant.displayName for variant in model.node.variants track by variant.language.culture"
-                                ng-change="vm.changeLanguage(vm.selectedLanguage)">
-                            </select>
-                        </div>
-
-                        <div>
-                            <div class="umb-table umb-table--condensed">
-
-                                <div class="umb-table-body">
-                                    <div class="umb-table-row umb-outline -selectable cursor-pointer"
-                                        ng-repeat="version in vm.previousVersions track by version.versionId"
-                                        ng-class="{'-selected': version.versionId === vm.previousVersion.versionId }"
-                                        ng-click="vm.changeVersion(version)">
-                                        <div class="umb-table-cell dn"></div>
-                                        <div class="umb-table-cell black">
-                                            <div class="flex flex-column">
-                                                <div>{{ version.displayValue }}</div>
-                                                <div class="version-details">{{version.username}}</div>
-                                                <div class="version-details">
-                                                    <localize ng-if="version.currentPublishedVersion" key="rollback_currentPublishedVersion">Current version</localize>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="umb-table-cell umb-table-cell--auto-width">
-                                            <umb-button
-                                                style="margin-left: auto;"
-                                                button-style="outline"
-                                                type="button"
-                                                size="xxs"
-                                                state="version.pinningState"
-                                                action="vm.pinVersion(version, $event)"
-                                                label="{{ version.preventCleanup ? 'Enable cleanup' : 'Prevent cleanup' }}"
-                                                label-key="{{version.preventCleanup ? 'contentTypeEditor_historyCleanupEnableCleanup' : 'contentTypeEditor_historyCleanupPreventCleanup' }}">
-                                            </umb-button>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            </div>
-                        </div>
-
-                        <umb-pagination
-                            ng-if="vm.totalPages > 0 && !vm.loading"
-                            page-number="vm.pageNumber"
-                            total-pages="vm.totalPages"
-                            on-change="vm.goToPage(pageNumber)">
-                        </umb-pagination>
-
-                    </umb-box-content>
-                </umb-box>
-
-                <umb-box class="compare-panel">
-
-                    <umb-box-header ng-if="vm.previousVersion" title="{{vm.previousVersion.displayValue}}"></umb-box-header>
-
-                    <umb-box-content>
-
-                        <umb-load-indicator ng-if="vm.loadingDiff"></umb-load-indicator>
-
-                        <umb-empty-state
-                            ng-if="!vm.diff"
-                            position="center">
-                            <localize key="rollback_headline"></localize>
-                        </umb-empty-state>
-
-                        <div ng-if="vm.diff && !vm.loadingDiff" class="diff">
-
-                            <small class="db" style="margin-bottom: 15px;">
-                                <localize key="rollback_diffHelp" ng-if="vm.diffHasChanges">
-                                    This shows the differences between the current (draft) version and the selected version<br /><del>Red text</del> will be
-                                    removed in the selected version, <ins>green text</ins> will be added
-                                </localize>
-                                <localize key="rollback_noDiff" ng-if="!vm.diffHasChanges">
-                                    There are no differences between the current (draft) version and the selected version
-                                </localize>
-                            </small>
-
-                            <table class="table table-condensed table-bordered" ng-if="vm.diffHasChanges">
-                                <tbody>
-                                    <tr>
-                                        <td class="bold">
-                                            <localize key="general_name">Name</localize>
-                                        </td>
-                                        <td>
-                                            <span ng-repeat="part in vm.diff.name track by $id(part)">
-                                                <ins ng-if="part.added">{{part.value}}</ins>
-                                                <del ng-if="part.removed">{{part.value}}</del>
-                                                <span ng-if="!part.added && !part.removed">{{part.value}}</span>
-                                            </span>
-                                        </td>
-                                    </tr>
-                                    <tr ng-repeat="property in vm.diff.properties track by property.alias">
-                                        <td class="bold">{{property.label}}</td>
-                                        <td ng-class="{'pre-line': property.isObject, 'word-wrap': !property.isObject}">
-                                            <span ng-repeat="part in property.diff track by $id(part)">
-                                                <ins ng-if="part.added">{{part.value}}</ins>
-                                                <del ng-if="part.removed">{{part.value}}</del>
-                                                <span ng-if="!part.added && !part.removed">{{part.value}}</span>
-                                            </span>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-
-                        </div>
-
-                    </umb-box-content>
-                </umb-box>
-
-            </div>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-                <umb-button
-                    type="button"
-                    button-style="success"
-                    state="vm.rollbackButtonState"
-                    label-key="actions_rollback"
-                    disabled="vm.rollbackButtonDisabled"
-                    action="vm.rollback()">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less
deleted file mode 100644
index 50c66fb9f4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less
+++ /dev/null
@@ -1,26 +0,0 @@
-.editor-rollback {
-
-  .main-content {
-    display: flex;
-    gap: 20px;
-  }
-
-  .side-panel {
-    flex: 0 0 33%;
-  }
-
-  .compare-panel {
-    flex: 1 1 auto;
-    position: relative;
-  }
-
-  .culture-select {
-    margin-bottom: 12px;
-  }
-
-  .version-details {
-    color: @gray-5;
-    font-size: 13px;
-  }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.controller.js
deleted file mode 100644
index f2a89ba7ea..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.controller.js
+++ /dev/null
@@ -1,103 +0,0 @@
-(function () {
-    "use strict";
-
-    function SectionPickerController($scope, sectionResource, localizationService) {
-        
-        var vm = this;
-
-        vm.sections = [];
-        vm.loading = false;
-
-        vm.selectSection = selectSection;
-        vm.submit = submit;
-        vm.close = close;
-
-        //////////
-
-        function onInit() {
-
-            vm.loading = true;
-
-            // set default title
-            if(!$scope.model.title) {
-                localizationService.localize("defaultdialogs_selectSections").then(function(value){
-                    $scope.model.title = value;
-                });
-            }
-
-            // make sure we can push to something
-            if(!$scope.model.selection) {
-                $scope.model.selection = [];
-            }
-
-            // get sections
-            sectionResource.getAllSections().then(function(sections){
-                vm.sections = sections;
-
-                setSectionIcon(vm.sections);
-                
-                if($scope.model.selection && $scope.model.selection.length > 0) {
-                    preSelect($scope.model.selection);
-                }
-                
-                vm.loading = false;
-
-            });
-            
-        }
-
-        function preSelect(selection) {
-            selection.forEach(function(selected){
-                vm.sections.forEach(function(section){
-                    if(selected.alias === section.alias) {
-                        section.selected = true;
-                    }
-                });
-            });
-        }
-
-        function selectSection(section) {
-
-            if(!section.selected) {
-                
-                section.selected = true;
-                $scope.model.selection.push(section);
-
-            } else {
-
-                $scope.model.selection.forEach(function(selectedSection, index){
-                    if(selectedSection.alias === section.alias) {
-                        section.selected = false;
-                        $scope.model.selection.splice(index, 1);
-                    }
-                });
-
-            }
-
-        }
-
-        function setSectionIcon(sections) {
-            sections.forEach(function(section) {
-                section.icon = "icon-section";
-            });
-        }
-
-        function submit(model) {
-            if($scope.model.submit) {
-                $scope.model.submit(model);
-            }
-        }
-
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.SectionPickerController", SectionPickerController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
deleted file mode 100644
index 296cdb61d7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<div ng-controller="Umbraco.Editors.SectionPickerController as vm">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-load-indicator
-                ng-if="vm.loading">
-            </umb-load-indicator>
-
-            <umb-box ng-if="!vm.loading">
-                <umb-box-content>
-                    <ul class="umb-tree">
-                        <li class="umb-tree-item" ng-repeat="section in vm.sections">
-                            <div class="umb-tree-item__inner" style="padding: 5px 10px;">
-                                <button type="button"
-                                        class="btn-reset text-left flex-auto"
-                                        ng-class="{ 'umb-tree-node-checked': section.selected }"
-                                        ng-click="vm.selectSection(section)">
-                                    <umb-icon icon="{{section.selected ? 'icon-check' : section.icon}}"
-                                              class="icon umb-tree-icon"
-                                              ng-class="{ 'color-green': section.selected }">
-                                    </umb-icon>
-                                    <span>{{ section.name }}</span>
-                                </button>
-                            </div>
-                        </li>
-                    </ul>
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-                <umb-button
-                    type="button"
-                    button-style="success"
-                    label-key="general_submit"
-                    action="vm.submit(model)">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.controller.js
deleted file mode 100644
index 8c728150da..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.controller.js
+++ /dev/null
@@ -1,62 +0,0 @@
-(function () {
-    "use strict";
-
-    function TemplateSectionsController($scope, formHelper, localizationService) {
-
-        var vm = this;
-
-        vm.labels = {};
-
-        vm.select = select;
-        vm.submit = submit;
-        vm.close = close;
-
-        $scope.model.mandatoryRenderSection = false;
-
-        function onInit() {
-            if ($scope.model.hasMaster) {
-                $scope.model.insertType = 'addSection';
-            } else {
-                $scope.model.insertType = 'renderBody';
-            }
-
-            var labelKeys = [
-                "template_insertSections",
-                "template_sectionMandatory"
-            ];
-
-            localizationService.localizeMany(labelKeys).then(function (data) {
-                vm.labels.title = data[0];
-                vm.labels.sectionMandatory = data[1];
-
-                setTitle(vm.labels.title);
-            });
-        }
-
-        function setTitle(value) {
-            if (!$scope.model.title) {
-                $scope.model.title = value;
-            }
-        }
-
-        function select(type) {
-            $scope.model.insertType = type;
-        }
-
-        function submit(model) {
-            if (formHelper.submitForm({scope: $scope})) {
-                $scope.model.submit($scope.model);
-            }
-        }
-
-        function close() {
-            if ($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        onInit();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.TemplateSectionsController", TemplateSectionsController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html
deleted file mode 100644
index 5e656bc260..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/templatesections/templatesections.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<div ng-controller="Umbraco.Editors.TemplateSectionsController as vm">
-
-    <form name="templateSectionsForm" novalidate val-form-manager>
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content>
-
-                    <div class="umb-insert-code-box" ng-click="vm.select('renderBody')">
-                        <div class="umb-insert-code-box__check" ng-class="{'umb-insert-code-box__check--checked': model.insertType === 'renderBody'  }">
-                            <umb-icon icon="icon-check" class="icon"></umb-icon>
-                        </div>
-
-                        <div class="umb-insert-code-box__title"><localize key="template_renderBody">Render child template</localize></div>
-
-                        <div class="umb-insert-code-box__description">
-                            <localize key="template_renderBodyDesc">Renders the contents of a child template, by inserting a <code>@RenderBody()</code> placeholder.</localize>
-                        </div>
-                    </div>
-
-                    <div class="umb-insert-code-box" ng-click="vm.select('renderSection')">
-
-                        <div class="umb-insert-code-box__check" ng-class="{'umb-insert-code-box__check--checked': model.insertType === 'renderSection' }">
-                            <umb-icon icon="icon-check" class="icon"></umb-icon>
-                        </div>
-                        <div class="umb-insert-code-box__title"><localize key="template_renderSection">Render a named section</localize></div>
-                        <div class="umb-insert-code-box__description">
-                            <localize key="template_renderSectionDesc">Renders a named area of a child template, by inserting a <code>@RenderSection(name)</code> placeholder.
-                                This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition.
-                            </localize>
-                        </div>
-
-                        <div ng-if="model.insertType === 'renderSection'" style="margin-top: 20px;">
-                            <div style="margin-bottom: 20px;">
-                                <label class="bold"><localize key="template_sectionName">Section Name</localize> <span class="red">*</span></label>
-                                <input type="text" name="renderSectionName" class="-full-width-input" ng-model="model.renderSectionName" required umb-auto-focus />
-                                <span ng-messages="templateSectionsForm.renderSectionName.$error" show-validation-on-submit>
-                                    <small class="red" ng-message="required"><localize key="required">Required</localize></small>
-                                </span>
-                            </div>
-
-                            <div>
-                                <div class="flex">
-                                    <umb-checkbox model="model.mandatoryRenderSection"
-                                                  text="{{vm.labels.sectionMandatory}}">
-                                    </umb-checkbox>
-                                </div>
-
-                                <div class="umb-insert-code-box__description">
-                                    <localize key="template_sectionMandatoryDesc">If mandatory, the child template must contain a <code>@section</code> definition, otherwise an error is shown.</localize>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-
-                    <div class="umb-insert-code-box" ng-click="vm.select('addSection')">
-
-                        <div class="umb-insert-code-box__check" ng-class="{'umb-insert-code-box__check--checked': model.insertType === 'addSection'  }">
-                            <umb-icon icon="icon-check" class="icon"></umb-icon>
-                        </div>
-                        <div class="umb-insert-code-box__title"><localize key="template_defineSection">Define a named section</localize></div>
-                        <div class="umb-insert-code-box__description">
-                            <localize key="template_defineSectionDesc">Defines a part of your template as a named section by wrapping it in <code>@section { ... }</code>.
-                                This can be rendered in a specific area of the parent of this template, by using <code>@RenderSection</code>.
-                            </localize>
-                        </div>
-
-                        <div ng-if="model.insertType === 'addSection'" style="margin-top: 20px;">
-                            <div>
-                                <label class="bold"><localize key="template_sectionName">Section Name</localize> <span class="red">*</span></label>
-                                <input type="text" name="sectionName" class="-full-width-input" ng-model="model.sectionName" required umb-auto-focus />
-                                <span ng-messages="templateSectionsForm.sectionName.$error" show-validation-on-submit>
-                                    <small class="red" ng-message="required"><localize key="required">Required</localize></small>
-                                </span>
-                            </div>
-                        </div>
-
-                    </div>
-
-                </umb-box-content>
-            </umb-box>
-
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-                <umb-button
-                    type="button"
-                    button-style="success"
-                    label-key="general_submit"
-                    action="vm.submit(model)">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
deleted file mode 100644
index 2edb7a4e96..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
+++ /dev/null
@@ -1,658 +0,0 @@
-//used for the media picker dialog
-angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
-    function ($scope,
-        entityResource,
-        eventsService,
-        angularHelper,
-        $timeout,
-        localizationService,
-        treeService,
-        languageResource) {
-
-        //used as the result selection
-        $scope.model.selection = [];
-
-        //the tree object when it loads
-        var tree = null;
-
-        // Search and listviews is only working for content, media and member section
-        var searchableSections = ["content", "media", "member"];
-        // tracks all expanded paths so when the language is switched we can resync it with the already loaded paths
-        var expandedPaths = [];
-
-        var vm = this;
-        vm.treeReady = false;
-        vm.dialogTreeApi = {};
-        vm.initDialogTree = initDialogTree;
-        vm.section = $scope.model.section;
-        vm.treeAlias = $scope.model.treeAlias;
-        vm.multiPicker = $scope.model.multiPicker;
-        vm.hideHeader = (typeof $scope.model.hideHeader) === "boolean" ? $scope.model.hideHeader : true;
-        vm.dataTypeKey = $scope.model.dataTypeKey;
-        vm.searchInfo = {
-            searchFromId: $scope.model.startNodeId,
-            searchFromName: null,
-            showSearch: false,
-            dataTypeKey: vm.dataTypeKey,
-            results: [],
-            selectedSearchResults: []
-        }
-        vm.startNodeId = $scope.model.startNodeId;
-        //Used for toggling an empty-state message
-        //Some trees can have no items (dictionary & forms email templates)
-        vm.hasItems = true;
-        vm.emptyStateMessage = $scope.model.emptyStateMessage;
-        vm.languages = [];
-        vm.selectedLanguage = {};
-        vm.languageSelectorIsOpen = false;
-        vm.showLanguageSelector = $scope.model.showLanguageSelector;
-        // Allow the entity type to be passed in but defaults to Document for backwards compatibility.
-        vm.entityType = $scope.model.entityType ? $scope.model.entityType : "Document";
-        vm.enableSearh = searchableSections.indexOf(vm.section) !== -1;
-
-
-        vm.toggleLanguageSelector = toggleLanguageSelector;
-        vm.selectLanguage = selectLanguage;
-        vm.onSearchResults = onSearchResults;
-        vm.selectResult = selectResult;
-        vm.hideSearch = hideSearch;
-        vm.closeMiniListView = closeMiniListView;
-        vm.selectListViewNode = selectListViewNode;
-        vm.listViewItemsLoaded = listViewItemsLoaded;
-        vm.submit = submit;
-        vm.close = close;
-
-        var currentNode = $scope.model.currentNode;
-
-        var previouslyFocusedElement = null;
-
-        function initDialogTree() {
-            vm.dialogTreeApi.callbacks.treeLoaded(treeLoadedHandler);
-            // TODO: Also deal with unexpanding!!
-            vm.dialogTreeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
-            vm.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-        }
-
-        /**
-         * Performs the initialization of this component
-         */
-        function onInit() {
-
-            if (vm.showLanguageSelector) {
-                // load languages
-                languageResource.getAll().then(function (languages) {
-                    vm.languages = languages;
-
-                    // set the default language
-                    vm.languages.forEach(function (language) {
-                        if (language.isDefault) {
-                            vm.selectedLanguage = language;
-                            vm.languageSelectorIsOpen = false;
-                        }
-                    });
-                });
-            }
-
-            if (vm.treeAlias === "content") {
-                vm.entityType = "Document";
-                if (!$scope.model.title) {
-                    localizationService.localize("defaultdialogs_selectContent").then(function (value) {
-                        $scope.model.title = value;
-                    });
-                }
-            }
-            else if (vm.treeAlias === "documentTypes") {
-                vm.entityType = "DocumentType";
-                if (!$scope.model.title) {
-                    localizationService.localize("defaultdialogs_selectContentType").then(function (value) {
-                        $scope.model.title = value;
-                    });
-                }
-            }
-            else if (vm.treeAlias === "member" || vm.section === "member") {
-                vm.entityType = "Member";
-                if (!$scope.model.title) {
-                    localizationService.localize("defaultdialogs_selectMember").then(function (value) {
-                        $scope.model.title = value;
-                    });
-                }
-            }
-            else if (vm.treeAlias === "memberTypes") {
-                vm.entityType = "MemberType";
-                if (!$scope.model.title) {
-                    localizationService.localize("defaultdialogs_selectMemberType").then(function (value) {
-                        $scope.model.title = value;
-                    });
-                }
-            }
-            else if (vm.treeAlias === "media" || vm.section === "media") {
-                vm.entityType = "Media";
-                if (!$scope.model.title) {
-                    localizationService.localize("defaultdialogs_selectMedia").then(function (value) {
-                        $scope.model.title = value;
-                    });
-                }
-            }
-            else if (vm.treeAlias === "mediaTypes") {
-                vm.entityType = "MediaType";
-                if (!$scope.model.title) {
-                    localizationService.localize("defaultdialogs_selectMediaType").then(function (value) {
-                        $scope.model.title = value;
-                    });
-                }
-            }
-            else if (vm.treeAlias === "templates") {
-                vm.entityType = "Template";
-            }
-
-            // TODO: Seems odd this logic is here, i don't think it needs to be and should just exist on the property editor using this
-            if ($scope.model.minNumber) {
-                $scope.model.minNumber = parseInt($scope.model.minNumber, 10);
-            }
-            if ($scope.model.maxNumber) {
-                $scope.model.maxNumber = parseInt($scope.model.maxNumber, 10);
-            }
-
-            //if a alternative startnode is used, we need to check if it is a container
-            if (vm.enableSearh &&
-                vm.startNodeId &&
-                vm.startNodeId !== -1 &&
-                vm.startNodeId !== "-1") {
-                entityResource.getById(vm.startNodeId, vm.entityType).then(function (node) {
-                    if (node.metaData.IsContainer) {
-                        openMiniListView(node);
-                    }
-                    initTree();
-                });
-            }
-            else {
-                initTree();
-            }
-
-            //Configures filtering
-            if ($scope.model.filter) {
-
-                $scope.model.filterExclude = false;
-                $scope.model.filterAdvanced = false;
-
-                //used advanced filtering
-                if (Utilities.isFunction($scope.model.filter)) {
-                    $scope.model.filterAdvanced = true;
-                }
-                else if (Utilities.isObject($scope.model.filter)) {
-                    $scope.model.filterAdvanced = true;
-                }
-                else {
-                    if ($scope.model.filter.startsWith("!")) {
-                        $scope.model.filterExclude = true;
-                        $scope.model.filter = $scope.model.filter.substring(1);
-                    }
-
-                    //used advanced filtering
-                    if ($scope.model.filter.startsWith("{")) {
-                        $scope.model.filterAdvanced = true;
-
-                        if ($scope.model.filterByMetadata && !Utilities.isFunction($scope.model.filter))
-                        {
-                            var filter = Utilities.fromJson($scope.model.filter);
-                            $scope.model.filter = function (node){ return _.isMatch(node.metaData, filter);};
-                        }
-                        else
-                        {
-                            //convert to object
-                            $scope.model.filter = Utilities.fromJson($scope.model.filter);
-                        }
-                    }
-                }
-            }
-
-            vm.filter = {
-                filterAdvanced: $scope.model.filterAdvanced,
-                filterExclude: $scope.model.filterExclude,
-                filter: $scope.model.filter
-            };
-        }
-
-        /**
-         * Updates the tree's query parameters
-         */
-        function initTree() {
-            //create the custom query string param for this tree
-            var queryParams = {};
-            if (vm.startNodeId) {
-                queryParams["startNodeId"] = $scope.model.startNodeId;
-            }
-            if (vm.selectedLanguage && vm.selectedLanguage.id) {
-                queryParams["culture"] = vm.selectedLanguage.culture;
-            }
-            if (vm.dataTypeKey) {
-                queryParams["dataTypeKey"] = vm.dataTypeKey;
-            }
-
-            var queryString = $.param(queryParams); //create the query string from the params object
-
-            if (!queryString) {
-                vm.customTreeParams = $scope.model.customTreeParams;
-            }
-            else {
-                vm.customTreeParams = queryString;
-                if ($scope.model.customTreeParams) {
-                    vm.customTreeParams += "&" + $scope.model.customTreeParams;
-                }
-            }
-
-            vm.treeReady = true;
-        }
-
-        function selectLanguage(language) {
-            vm.selectedLanguage = language;
-            // close the language selector
-            vm.languageSelectorIsOpen = false;
-
-            initTree(); //this will reset the tree params and the tree directive will pick up the changes in a $watch
-
-            //execute after next digest because the internal watch on the customtreeparams needs to be bound now that we've changed it
-            $timeout(function () {
-                //reload the tree with it's updated querystring args
-                vm.dialogTreeApi.load(vm.section).then(function () {
-
-                    //create the list of promises
-                    var promises = [];
-                    for (var i = 0; i < expandedPaths.length; i++) {
-                        promises.push(vm.dialogTreeApi.syncTree({ path: expandedPaths[i], activate: false }));
-                    }
-                    //execute them sequentially
-                    angularHelper.executeSequentialPromises(promises);
-                });
-            });
-        };
-
-        function toggleLanguageSelector() {
-            vm.languageSelectorIsOpen = !vm.languageSelectorIsOpen;
-        };
-
-        function nodeExpandedHandler(args) {
-
-            //store the reference to the expanded node path
-            if (args.node) {
-                treeService._trackExpandedPaths(args.node, expandedPaths);
-            }
-
-            // open mini list view for list views
-            if (args.node.metaData.isContainer) {
-                openMiniListView(args.node);
-            }
-
-            if (Utilities.isArray(args.children)) {
-
-                //iterate children
-                args.children.forEach(child => {
-                    //now we need to look in the already selected search results and
-                    // toggle the check boxes for those ones that are listed
-                    var exists = vm.searchInfo.selectedSearchResults.find(selected => child.id === selected.id);
-                    if (exists) {
-                        child.selected = true;
-                    }
-                });
-
-                //check filter
-                performFiltering(args.children);
-            }
-        }
-
-        //gets the tree object when it loads
-        function treeLoadedHandler(args) {
-            //args.tree contains children (args.tree.root.children)
-            vm.hasItems = args.tree.root.children.length > 0;
-
-            tree = args.tree;
-
-            var nodeHasPath = currentNode && currentNode.path;
-            var startNodeNotDefined = !vm.startNodeId;
-            if (startNodeNotDefined && nodeHasPath) {
-                vm.dialogTreeApi.syncTree({ path: currentNode.path, activate: true });
-            }
-        }
-
-        function getRootEntity(id, name) {
-          return {
-            icon: "icon-folder",
-            alias: null,
-            id,
-            name
-          };
-        }
-
-        //wires up selection
-        function nodeSelectHandler(args) {
-            args.event.preventDefault();
-            args.event.stopPropagation();
-
-            if (args.node.metaData.isSearchResult) {
-                //check if the item selected was a search result from a list view
-
-                //unselect
-                select(args.node.name, args.node.id);
-
-                //remove it from the list view children
-                var listView = args.node.parent();
-                listView.children = _.reject(listView.children,
-                    function (child) {
-                        return child.id == args.node.id;
-                    });
-
-                //remove it from the custom tracked search result list
-                vm.searchInfo.selectedSearchResults = _.reject(vm.searchInfo.selectedSearchResults,
-                    function (i) {
-                        return i.id == args.node.id;
-                    });
-            }
-            else {
-                eventsService.emit("dialogs.treePickerController.select", args);
-
-                if (args.node.filtered) {
-                    return;
-                }
-
-                //This is a tree node, so we don't have an entity to pass in, it will need to be looked up
-                //from the server in this method.
-                if ($scope.model.select) {
-                    $scope.model.select(args.node);
-                }
-                else {
-                    // If this is a container, construct a base entity to return immediately
-                    let entity = undefined;
-                    if (args.node.nodeType === "container") {
-                        entity = args.node;
-
-                        // mimic the server response from the EntityController
-                        entity.id = parseInt(entity.id, 10);
-                        entity.metaData.IsContainer = true;
-                        // end-mimic
-                    }
-
-                    // apply the item to the model
-                    select(args.node.name, args.node.id, entity);
-
-                    //toggle checked state
-                    args.node.selected = !args.node.selected;
-                }
-            }
-        }
-
-        /** Method used for selecting a node */
-        function select(text, id, entity) {
-            // we do not need to query the server in case an entity is provided
-            if (entity) {
-              applySelect(entity);
-            }
-            // nor do we need to query if a root entity was selected (id < 0)
-            else if (id < 0) {
-              applySelect(entity || getRootEntity(id, text));
-            }
-            // otherwise we have to get it from the server
-            else {
-              entityResource.getById(id, vm.entityType).then(function (ent) {
-                  applySelect(ent);
-              });
-            }
-        }
-
-        /** Method used to apply the selected entity to selections and submit the form if need-be **/
-        function applySelect(entity) {
-            multiSelectItem(entity);
-            if (!vm.multiPicker) {
-              $scope.model.submit($scope.model);
-            }
-        }
-
-        function multiSelectItem(item) {
-
-            if (!vm.multiPicker) {
-              $scope.model.selection.length = 0;
-              hideSearch();
-            }
-
-            var foundIndex = -1;
-
-            if ($scope.model.selection.length) {
-                foundIndex = $scope.model.selection.findIndex(ent => ent.id === parseInt(item.id, 10));
-            }
-
-            if (foundIndex !== -1) {
-                $scope.model.selection.splice(foundIndex, 1);
-            }
-            else {
-                $scope.model.selection.push(item);
-            }
-
-        }
-
-        function performFiltering(nodes) {
-
-            if (!$scope.model.filter) {
-                return;
-            }
-
-            //remove any list view search nodes from being filtered since these are special nodes that always must
-            // be allowed to be clicked on
-            nodes = _.filter(nodes,
-                function (n) {
-                    return !Utilities.isObject(n.metaData.listViewNode);
-                });
-
-            if ($scope.model.filterAdvanced) {
-
-                //filter either based on a method or an object
-                var filtered = Utilities.isFunction($scope.model.filter)
-                    ? _.filter(nodes, $scope.model.filter)
-                    : _.where(nodes, $scope.model.filter);
-
-                filtered.forEach(function (value) {
-                        value.filtered = true;
-                        if ($scope.model.filterCssClass) {
-                            if (!value.cssClasses) {
-                                value.cssClasses = [];
-                            }
-                            value.cssClasses.push($scope.model.filterCssClass);
-                            value.title = $scope.model.filterTitle;
-                        }
-                    });
-            }
-            else {
-                var a = $scope.model.filter.toLowerCase().replace(/\s/g, '').split(',');
-                nodes.forEach(function (value) {
-
-                        var found = a.indexOf(value.metaData.contentType.toLowerCase()) >= 0;
-
-                        if (!$scope.model.filterExclude && !found || $scope.model.filterExclude && found) {
-                            value.filtered = true;
-
-                            if ($scope.model.filterCssClass) {
-                                if (!value.cssClasses) {
-                                    value.cssClasses = [];
-                                }
-                                value.cssClasses.push($scope.model.filterCssClass);
-                                value.title = $scope.model.filterTitle;
-                            }
-                        }
-                    });
-            }
-        }
-
-        function openMiniListView(node) {
-            previouslyFocusedElement = document.activeElement;
-            vm.miniListView = node;
-        }
-
-        function multiSubmit(result) {
-            entityResource.getByIds(result, vm.entityType).then(function (ents) {
-                $scope.submit(ents);
-            });
-        }
-
-        /** method to select a search result */
-        function selectResult(evt, result) {
-
-            if (result.filtered) {
-                return;
-            }
-
-            result.selected = result.selected === true ? false : true;
-
-            //since result = an entity, we'll pass it in so we don't have to go back to the server
-            select(result.name, result.id, result);
-
-            //add/remove to our custom tracked list of selected search results
-            if (result.selected) {
-                vm.searchInfo.selectedSearchResults.push(result);
-            }
-            else {
-                vm.searchInfo.selectedSearchResults = _.reject(vm.searchInfo.selectedSearchResults,
-                    function (i) {
-                        return i.id == result.id;
-                    });
-            }
-
-            //ensure the tree node in the tree is checked/unchecked if it already exists there
-            if (tree) {
-                var found = treeService.getDescendantNode(tree.root, result.id);
-                if (found) {
-                    found.selected = result.selected;
-                }
-            }
-        }
-
-        function hideSearch() {
-
-            //Traverse the entire displayed tree and update each node to sync with the selected search results
-            if (tree) {
-
-                //we need to ensure that any currently displayed nodes that get selected
-                // from the search get updated to have a check box!
-                const checkChildren = function(children) {
-                    children.forEach(child => {
-                        //check if the id is in the selection, if so ensure it's flagged as selected
-                        var exists = vm.searchInfo.selectedSearchResults.find(selected => child.id === selected.id);
-                        //if the curr node exists in selected search results, ensure it's checked
-                        if (exists) {
-                            child.selected = true;
-                        }
-                        //if the curr node does not exist in the selected search result, and the curr node is a child of a list view search result
-                        else if (child.metaData.isSearchResult) {
-                            //if this tree node is under a list view it means that the node was added
-                            // to the tree dynamically under the list view that was searched, so we actually want to remove
-                            // it all together from the tree
-                            var listView = child.parent();
-                            listView.children = _.reject(listView.children,
-                                function (c) {
-                                    return c.id == child.id;
-                                });
-                        }
-
-                        //check if the current node is a list view and if so, check if there's any new results
-                        // that need to be added as child nodes to it based on search results selected
-                        if (child.metaData.isContainer) {
-
-                            child.cssClasses = _.reject(child.cssClasses,
-                                function (c) {
-                                    return c === 'tree-node-slide-up-hide-active';
-                                });
-
-                            var listViewResults = vm.searchInfo.selectedSearchResults.filter(i => i.parentId === child.id);
-
-                            listViewResults.forEach(item => {
-                                if (!child.children) return;
-
-                                var childExists = child.children.find(c => c.id === item.id);
-
-                                if (!childExists) {
-                                    var parent = child;
-                                    child.children.unshift({
-                                        id: item.id,
-                                        name: item.name,
-                                        cssClass: "icon umb-tree-icon sprTree " + item.icon,
-                                        level: child.level + 1,
-                                        metaData: {
-                                            isSearchResult: true
-                                        },
-                                        hasChildren: false,
-                                        parent: () => parent
-                                    });
-                                }
-                            });
-                        }
-
-                        //recurse
-                        if (child.children && child.children.length > 0) {
-                            checkChildren(child.children);
-                        }
-                    });
-                }
-
-                checkChildren(tree.root.children);
-            }
-
-            vm.searchInfo.showSearch = false;
-            vm.searchInfo.searchFromId = vm.startNodeId;
-            vm.searchInfo.searchFromName = null;
-            vm.searchInfo.results = [];
-        }
-
-        function onSearchResults(results) {
-
-            //filter all items - this will mark an item as filtered
-            performFiltering(results);
-
-            //now actually remove all filtered items so they are not even displayed
-            results = results.filter(item => !item.filtered);
-            vm.searchInfo.results = results;
-
-            //sync with the curr selected results
-            vm.searchInfo.results.forEach(result => {
-                var exists = $scope.model.selection.find(item => result.id === item.id);
-                if (exists) {
-                    result.selected = true;
-                }
-            });
-
-            vm.searchInfo.showSearch = true;
-        }
-
-        function selectListViewNode(node) {
-            select(node.name, node.id);
-            //toggle checked state
-            node.selected = node.selected === true ? false : true;
-        }
-
-        function closeMiniListView() {
-            vm.miniListView = undefined;
-            if (previouslyFocusedElement) {
-                $timeout(function () {
-                    previouslyFocusedElement.focus();
-                    previouslyFocusedElement = null;
-                });
-            }
-        }
-
-        function listViewItemsLoaded(items) {
-            var selectedIds = $scope.model.selection.map(x => x.id);
-            items.forEach(item => item.selected = selectedIds.includes(item.id));
-        }
-
-        function submit(model) {
-            if ($scope.model.submit) {
-                $scope.model.submit(model);
-            }
-        }
-
-        function close() {
-            if ($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        //initialize
-        onInit();
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
deleted file mode 100644
index cfe481c142..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<div ng-controller="Umbraco.Editors.TreePickerController as vm">
-
-    <form name="propertySettingsForm" novalidate val-form-manager>
-
-        <umb-editor-view>
-
-            <umb-editor-header
-                name="model.title"
-                name-locked="true"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container>
-                    <umb-box>
-                        <umb-box-content>
-
-                            <div ng-hide="vm.miniListView">
-
-                                <div class="umb-language-picker" ng-if="vm.showLanguageSelector && vm.languages.length > 1" on-outside-click="vm.page.languageSelectorIsOpen = false" style="padding-bottom: 5px">
-                                    <button class="umb-language-picker__toggle btn-reset" ng-click="vm.toggleLanguageSelector()">
-                                        <span>{{vm.selectedLanguage.name}}</span>
-                                        <umb-icon icon="{{vm.languageSelectorIsOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-language-picker__expand"></umb-icon>
-                                    </button>
-                                    <div class="umb-language-picker__dropdown" ng-if="vm.languageSelectorIsOpen">
-                                        <button class="btn-reset" ng-click="vm.selectLanguage(language)" ng-repeat="language in vm.languages">{{language.name}}</button>
-                                    </div>
-                                </div>
-
-                                <div class="umb-control-group" ng-if="vm.enableSearh">
-                                    <umb-tree-search-box
-                                        hide-search-callback="vm.hideSearch"
-                                        search-callback="vm.onSearchResults"
-                                        search-from-id="{{vm.searchInfo.searchFromId}}"
-                                        search-from-name="{{vm.searchInfo.searchFromName}}"
-                                        show-search="{{vm.searchInfo.showSearch}}"
-                                        datatype-key="{{vm.searchInfo.dataTypeKey}}"
-                                        section="{{vm.section}}"
-                                        auto-focus="true">
-                                    </umb-tree-search-box>
-                                </div>
-
-                                <umb-tree-search-results ng-if="vm.searchInfo.showSearch"
-                                                            results="vm.searchInfo.results"
-                                                            select-result-callback="vm.selectResult">
-                                </umb-tree-search-results>
-
-                                <umb-empty-state ng-if="!vm.hasItems && vm.emptyStateMessage" position="center">
-                                    {{ vm.emptyStateMessage }}
-                                </umb-empty-state>
-
-                                <div ng-if="vm.treeReady" ng-hide="vm.searchInfo.showSearch" ng-animate="'tree-fade-out'">
-                                    <umb-tree
-                                        section="{{vm.section}}"
-                                        treealias="{{vm.treeAlias}}"
-                                        hideheader="{{vm.hideHeader}}"
-                                        hideoptions="true"
-                                        isdialog="true"
-                                        customtreeparams="{{vm.customTreeParams}}"
-                                        enablelistviewsearch="true"
-                                        enablelistviewexpand="true"
-                                        enablecheckboxes="{{vm.multiPicker}}"
-                                        on-init="vm.initDialogTree()"
-                                        api="vm.dialogTreeApi">
-                                    </umb-tree>
-                                </div>
-
-                            </div>
-
-                            <umb-mini-list-view
-                                ng-if="vm.miniListView"
-                                node="vm.miniListView"
-                                entity-type="{{vm.entityType}}"
-                                start-node-id="vm.startNodeId"
-                                on-select="vm.selectListViewNode(node)"
-                                on-close="vm.closeMiniListView()"
-                                on-items-loaded="vm.listViewItemsLoaded(items)"
-                                entity-type-filter="vm.filter">
-                            </umb-mini-list-view>
-
-                        </umb-box-content>
-                    </umb-box>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button
-                        type="button"
-                        button-style="link"
-                        label-key="general_close"
-                        shortcut="esc"
-                        action="vm.close()">
-                    </umb-button>
-
-                    <umb-button
-                        ng-if="model.extraActions"
-                        ng-repeat="action in model.extraActions track by $index"
-                        type="button"
-                        button-style="{{action.style || 'link'}}"
-                        label-key="{{action.labelKey}}"
-                        action="action.action()">
-                    </umb-button>
-
-                    <umb-button
-                        ng-if="vm.multiPicker"
-                        type="button"
-                        button-style="success"
-                        label-key="general_submit"
-                        action="vm.submit(model)">
-                    </umb-button>
-
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-
-        </umb-editor-view>
-
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/configuretwofactor.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/configuretwofactor.controller.js
deleted file mode 100644
index d1175e7e7f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/configuretwofactor.controller.js
+++ /dev/null
@@ -1,109 +0,0 @@
-//used for the user editor overlay
-angular.module("umbraco").controller("Umbraco.Editors.ConfigureTwoFactorController",
-  function ($scope,
-    localizationService,
-    notificationsService,
-    overlayService,
-    twoFactorLoginResource,
-    editorService) {
-
-
-    let vm = this;
-    vm.close = close;
-    vm.enable = enable;
-    vm.disable = disable;
-    vm.code = "";
-    vm.buttonState = "init";
-
-    localizationService.localize("user_configureTwoFactor").then(function (value) {
-      vm.title = value;
-    });
-
-    function onInit() {
-      vm.code = "";
-
-      twoFactorLoginResource.get2FAProvidersForUser($scope.model.user.id)
-        .then(function (providers) {
-          vm.providers = providers;
-        });
-    }
-
-    function close() {
-      if ($scope.model.close) {
-        $scope.model.close();
-      }
-    }
-
-    function enable(providerName) {
-      twoFactorLoginResource.viewPathForProviderName(providerName)
-        .then(function (viewPath) {
-          var providerSettings = {
-            user: $scope.model.user,
-            providerName: providerName,
-            size: "small",
-            view: viewPath,
-            close: function () {
-              notificationsService.removeAll();
-              editorService.close();
-              onInit();
-            }
-          };
-
-          editorService.open(providerSettings);
-        }).catch(onError);
-    }
-
-    function disable(provider) {
-      if ($scope.model.isCurrentUser) {
-        const disableTwoFactorSettings = {
-          provider,
-          user: vm.user,
-          size: "small",
-          view: "views/common/infiniteeditors/twofactor/disabletwofactor.html",
-          close: function () {
-            editorService.close();
-            onInit();
-          }
-        };
-
-        editorService.open(disableTwoFactorSettings);
-      } else {
-        localizationService.localize("user_2faDisableForUser").then(function (value) {
-          const removeOverlay = {
-            content: value,
-            submitButtonLabelKey: 'actions_disable',
-            submit: function ({ close }) {
-              twoFactorLoginResource.disable(provider.providerName, $scope.model.user.key)
-                .then(onResponse)
-                .catch(onError);
-
-              close();
-            }
-          };
-
-          overlayService.confirmRemove(removeOverlay);
-        });
-      }
-    }
-
-    function onResponse(response) {
-      if (response) {
-        localizationService.localize("user_2faProviderIsDisabledMsg").then(function (value) {
-          notificationsService.info(value);
-        });
-        onInit();
-      } else {
-        localizationService.localize("user_2faProviderIsNotDisabledMsg").then(function (value) {
-          notificationsService.error(value);
-        });
-      }
-    }
-
-    function onError(error) {
-      vm.buttonState = "error";
-      overlayService.ysod(error);
-    }
-
-    //initialize
-    onInit();
-  });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/configuretwofactor.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/configuretwofactor.html
deleted file mode 100644
index cc25439bb9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/configuretwofactor.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<div ng-controller="Umbraco.Editors.ConfigureTwoFactorController as vm">
-
-  <umb-editor-view>
-
-    <umb-editor-header name="vm.title" name-locked="true" hide-alias="true" hide-icon="true" hide-description="true">
-    </umb-editor-header>
-
-    <umb-editor-container>
-
-      <umb-box ng-repeat="provider in vm.providers track by provider.providerName">
-
-        <umb-box-header title="{{provider.providerName}}"></umb-box-header>
-
-        <umb-box-content>
-
-          <umb-control-group>
-
-            <div ng-if="provider.isEnabledOnUser">
-              <p>
-                <localize key="user_2faProviderIsEnabled"></localize>
-                <umb-icon icon="icon-check" class="success"></umb-icon>
-              </p>
-
-              <umb-button type="button" action="vm.disable(provider)" button-style="[warning,block]" label="Disable"
-                label-key="actions_disable" size="m">
-              </umb-button>
-            </div>
-
-            <umb-button type="button" ng-if="!provider.isEnabledOnUser" button-style="[action,block]"
-              disabled="!model.isCurrentUser" action="vm.enable(provider.providerName)" label="Enable"
-              label-key="actions_enable" size="m" state="vm.buttonState">
-            </umb-button>
-
-          </umb-control-group>
-
-        </umb-box-content>
-      </umb-box>
-    </umb-editor-container>
-
-    <umb-editor-footer>
-
-      <umb-editor-footer-content-right>
-
-        <umb-button type="button" button-style="link" label-key="general_close" shortcut="esc" action="vm.close()">
-        </umb-button>
-
-      </umb-editor-footer-content-right>
-
-    </umb-editor-footer>
-
-  </umb-editor-view>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/disabletwofactor.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/disabletwofactor.controller.js
deleted file mode 100644
index b8e909e633..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/disabletwofactor.controller.js
+++ /dev/null
@@ -1,53 +0,0 @@
-//used for the user editor overlay
-angular.module("umbraco").controller("Umbraco.Editors.DisableTwoFactorController",
-  function ($scope,
-    localizationService,
-    notificationsService,
-    overlayService,
-    twoFactorLoginResource) {
-
-    let vm = this;
-    vm.close = close;
-    vm.disableWithCode = disableWithCode;
-    vm.code = "";
-    vm.buttonState = "init";
-    vm.authForm = {};
-
-    if (!$scope.model.provider) {
-      notificationsService.error("No provider specified");
-    }
-    vm.provider = $scope.model.provider;
-    vm.title = vm.provider.providerName;
-
-    function close() {
-      if ($scope.model.close) {
-        $scope.model.close();
-      }
-    }
-
-    function disableWithCode() {
-      vm.authForm.token.$setValidity("token", true);
-      vm.buttonState = "busy";
-      twoFactorLoginResource.disableWithCode(vm.provider.providerName, vm.code)
-        .then(onResponse)
-        .catch(onError);
-    }
-
-    function onResponse(response) {
-      if (response) {
-        vm.buttonState = "success";
-        localizationService.localize("user_2faProviderIsDisabledMsg").then(function (value) {
-          notificationsService.info(value);
-        });
-        close();
-      } else {
-        vm.buttonState = "error";
-        vm.authForm.token.$setValidity("token", false);
-      }
-    }
-
-    function onError(error) {
-      vm.buttonState = "error";
-      overlayService.ysod(error);
-    }
-  });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/disabletwofactor.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/disabletwofactor.html
deleted file mode 100644
index 11c2c813fd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/twofactor/disabletwofactor.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<div ng-controller="Umbraco.Editors.DisableTwoFactorController as vm">
-
-  <umb-editor-view>
-    <form name="vm.authForm" method="POST" ng-submit="vm.disableWithCode()">
-
-      <umb-editor-header name="vm.title" name-locked="true" hide-alias="true" hide-icon="true" hide-description="true">
-      </umb-editor-header>
-
-      <umb-editor-container>
-
-        <umb-box>
-
-          <umb-box-header title-key="actions_disable"></umb-box-header>
-
-          <umb-box-content>
-
-            <umb-control-group label-for="token" alias="2facode" label="@login_2faCodeInput"
-              description="@user_2faDisableText" required="true">
-
-              <input umb-auto-focus id="2facode" class="-full-width-input input-xlarge" type="text" name="token"
-                inputmode="numeric" autocomplete="one-time-code" ng-model="vm.code" localize="placeholder"
-                placeholder="@login_2faCodeInputHelp" aria-required="true" required no-dirty-check />
-
-              <div ng-messages="vm.authForm.token.$error" role="alert">
-                <span class="umb-validation-label" ng-message="token">
-                  <localize key="login_2faInvalidCode">Invalid code entered</localize>
-                </span>
-              </div>
-            </umb-control-group>
-
-          </umb-box-content>
-
-        </umb-box>
-
-      </umb-editor-container>
-
-      <umb-editor-footer>
-
-        <umb-editor-footer-content-right>
-
-          <umb-button type="button" button-style="link" label-key="general_close" shortcut="esc" action="vm.close()">
-          </umb-button>
-
-          <umb-button type="submit" button-style="warning" label="Disable" label-key="actions_disable" size="m"
-            disabled="vm.code.length === 0" state="vm.buttonState">
-          </umb-button>
-
-        </umb-editor-footer-content-right>
-
-      </umb-editor-footer>
-
-    </form>
-
-  </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/user/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/user/user.controller.js
deleted file mode 100644
index b51caff236..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/user/user.controller.js
+++ /dev/null
@@ -1,199 +0,0 @@
-angular.module("umbraco")
-  .controller("Umbraco.Editors.UserController", function ($scope, $location,
-    dashboardResource, userService, historyService, eventsService,
-    externalLoginInfoService, authResource, contentEditingHelper,
-    currentUserResource, overlayService, localizationService, editorService, twoFactorLoginResource) {
-
-    let vm = this;
-
-    vm.history = historyService.getCurrent();
-    vm.hasTwoFactorProviders = false;
-
-    localizationService.localize("general_user").then(function (value) {
-      vm.title = value;
-    });
-
-    // Set flag if any have deny local login, in which case we must disable all password functionality
-    vm.denyLocalLogin = externalLoginInfoService.hasDenyLocalLogin();
-    // Only include login providers that have editable options
-    vm.externalLoginProviders = externalLoginInfoService.getLoginProvidersWithOptions();
-
-    vm.externalLinkLoginFormAction = Umbraco.Sys.ServerVariables.umbracoUrls.externalLinkLoginsUrl;
-    var evts = [];
-    evts.push(eventsService.on("historyService.add", function (e, args) {
-      vm.history = args.all;
-    }));
-    evts.push(eventsService.on("historyService.remove", function (e, args) {
-      vm.history = args.all;
-    }));
-    evts.push(eventsService.on("historyService.removeAll", function (e, args) {
-      vm.history = [];
-    }));
-
-    vm.logout = function () {
-
-      //Add event listener for when there are pending changes on an editor which means our route was not successful
-      var pendingChangeEvent = eventsService.on("valFormManager.pendingChanges", function (e, args) {
-        //one time listener, remove the event
-        pendingChangeEvent();
-        vm.close();
-      });
-
-
-      //perform the path change, if it is successful then the promise will resolve otherwise it will fail
-      vm.close();
-      $location.path("/logout").search('');
-    };
-
-    vm.gotoHistory = function (link) {
-      $location.path(link);
-      vm.close();
-    };
-
-    function updateUserInfo() {
-      //get the user
-      userService.getCurrentUser().then(function (user) {
-        vm.user = user;
-        if (vm.user) {
-          vm.remainingAuthSeconds = vm.user.remainingAuthSeconds;
-          vm.canEditProfile = _.indexOf(vm.user.allowedSections, "users") > -1;
-
-          currentUserResource.getCurrentUserLinkedLogins().then(function (logins) {
-
-            //reset all to be un-linked
-            vm.externalLoginProviders.forEach(provider => provider.linkedProviderKey = undefined);
-
-            //set the linked logins
-            for (var login in logins) {
-              var found = _.find(vm.externalLoginProviders, function (i) {
-                return i.authType == login;
-              });
-              if (found) {
-                found.linkedProviderKey = logins[login];
-              }
-            }
-          });
-
-          //go get the config for the membership provider and add it to the model
-          authResource.getPasswordConfig(user.id).then(function (data) {
-            vm.changePasswordModel.config = data;
-            //ensure the hasPassword config option is set to true (the user of course has a password already assigned)
-            //this will ensure the oldPassword is shown so they can change it
-            // disable reset password functionality because it does not make sense inside the backoffice
-            vm.changePasswordModel.config.hasPassword = true;
-            vm.changePasswordModel.config.disableToggle = true;
-          });
-
-          twoFactorLoginResource.get2FAProvidersForUser(vm.user.id).then(function (providers) {
-            vm.hasTwoFactorProviders = providers.length > 0;
-          });
-
-        }
-      });
-    }
-
-    function changePassword() {
-      return currentUserResource.changePassword(vm.changePasswordModel.value).then(function () {
-        return true;
-      }, function (err) {
-        contentEditingHelper.handleSaveError({
-          err: err,
-          showNotifications: true
-        });
-        return false;
-      });
-    };
-
-    vm.linkProvider = function (e) {
-      e.target.submit();
-    }
-
-    vm.unlink = function (e, loginProvider, providerKey) {
-      var result = confirm("Are you sure you want to unlink this account?");
-      if (!result) {
-        e.preventDefault();
-        return;
-      }
-
-      authResource.unlinkLogin(loginProvider, providerKey).then(function (a, b, c) {
-        updateUserInfo();
-      });
-    }
-
-    //create the initial model for change password
-    vm.changePasswordModel = {
-      config: {},
-      value: {}
-    };
-
-    updateUserInfo();
-
-
-    //remove all event handlers
-    $scope.$on('$destroy', function () {
-      for (var e = 0; e < evts.length; e++) {
-        evts[e]();
-      }
-
-    });
-
-    vm.editUser = function () {
-      $location
-        .path('/users/users/user/' + vm.user.id);
-      vm.close();
-    }
-
-    vm.toggleChangePassword = function () {
-      //reset it
-      vm.user.changePassword = null;
-
-      localizationService.localizeMany(["general_cancel", "general_confirm", "general_changePassword"])
-        .then(function (data) {
-          const overlay = {
-            view: "changepassword",
-            title: data[2],
-            changePassword: vm.user.changePassword,
-            config: vm.changePasswordModel.config,
-            closeButtonLabel: data[0],
-            submitButtonLabel: data[1],
-            submitButtonStyle: 'success',
-            close: () => overlayService.close(),
-            submit: model => {
-              vm.changePasswordModel.value = model.changePassword;
-              changePassword().then(result => {
-                if (result) {
-                  overlayService.close();
-                }
-              });
-            }
-          };
-          overlayService.open(overlay);
-        });
-    }
-
-    vm.toggleConfigureTwoFactor = function () {
-
-      const configureTwoFactorSettings = {
-        create: true,
-        user: vm.user,
-        isCurrentUser: true,// From this view we are always current user (used by the overlay)
-        size: "small",
-        view: "views/common/infiniteeditors/twofactor/configuretwofactor.html",
-        close: function () {
-          editorService.close();
-        }
-      };
-
-      editorService.open(configureTwoFactorSettings);
-    }
-
-    vm.close = function () {
-      if ($scope.model.close) {
-        $scope.model.close();
-      }
-    }
-
-    dashboardResource.getDashboard("user-dialog").then(function (dashboard) {
-      vm.dashboard = dashboard;
-    });
-  });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/user/user.html
deleted file mode 100644
index 8871627ca0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/user/user.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<div ng-controller="Umbraco.Editors.UserController as vm">
-  <umb-editor-view data-element="overlay-user">
-
-    <umb-editor-header name="vm.user.name" name-locked="true" hide-alias="true" hide-icon="true"
-      hide-description="true">
-    </umb-editor-header>
-
-    <umb-editor-container>
-      <div ng-if="!vm.showPasswordFields">
-        <umb-box>
-          <umb-box-header title-key="user_yourProfile"></umb-box-header>
-          <umb-box-content>
-            <umb-control-group>
-              <div class="flex">
-                <umb-button action="vm.editUser()" alias="editUser" button-style="action" label="Edit"
-                  label-key="general_edit" ng-if="vm.canEditProfile" type="button">
-                </umb-button>
-
-                <umb-button action="vm.toggleChangePassword()" alias="changePassword" button-style="action"
-                  label="Change password" label-key="general_changePassword" ng-if="!vm.denyLocalLogin" type="button">
-                </umb-button>
-
-                <umb-button type="button" button-style="action" action="vm.toggleConfigureTwoFactor()"
-                  label="Configure Two-Factor" label-key="user_configureTwoFactor" ng-if="vm.hasTwoFactorProviders">
-                </umb-button>
-              </div>
-            </umb-control-group>
-          </umb-box-content>
-        </umb-box>
-
-        <umb-box class="umb-control-group external-logins" ng-if="vm.externalLoginProviders.length > 0">
-          <umb-box-header title-key="defaultdialogs_externalLoginProviders" title="External login providers">
-          </umb-box-header>
-
-          <umb-box-content>
-            <div class="flex flex-column flx-gap-sm">
-              <div ng-repeat="login in vm.externalLoginProviders">
-
-                <umb-custom-view
-                  ng-if="login.customView"
-                  ng-attr-custom-view="{{ ::login.customView }}"
-                  ng-attr-args='{{"{" +
-                  "\"providerName\": \"" + login.authType + "\"," +
-                  "\"displayName\": \"" + login.caption + "\"," +
-                  "\"externalLoginUrl\": \"" + vm.externalLinkLoginFormAction + "\"," +
-                  "\"userViewState\": \"loggedIn\"" +
-                  "}"
-                  | safe_html }}'>
-                </umb-custom-view>
-
-                <div ng-if="!login.customView">
-                  <form action="{{ ::vm.externalLinkLoginFormAction }}" id="oauthloginform-{{ ::login.authType }}" method="POST"
-                    name="oauthloginform" ng-if="login.linkedProviderKey == undefined"
-                    ng-submit="vm.linkProvider($event)">
-                    <input name="provider" type="hidden" value="{{ ::login.authType}}" />
-                    <uui-button
-                      type="submit"
-                      label="Link your {{ ::login.caption }} account"
-                      look="{{ ::login.options.buttonLook }}"
-                      color="{{ ::login.options.buttonColor }}">
-                      <uui-icon name="{{ ::login.options.icon }}"></uui-icon>
-                      <localize key="defaultdialogs_linkYour">Link your</localize>
-                      {{ ::login.caption}}
-                      <localize key="defaultdialogs_account">account</localize>
-                    </uui-button>
-                  </form>
-
-                  <uui-button
-                    ng-if="login.linkedProviderKey != undefined" value="{{login.authType}}"
-                    ng-click="vm.unlink($event, login.authType, login.linkedProviderKey)"
-                    name="provider"
-                    label="Un-Link your {{ ::login.caption }} account"
-                    look="{{ ::login.options.buttonLook }}"
-                    color="{{ ::login.options.buttonColor }}">
-                    <uui-icon name="{{ ::login.options.icon }}"></uui-icon>
-                    <localize key="defaultdialogs_unLinkYour">Un-link your</localize> {{ ::login.caption }} <localize key="defaultdialogs_account">account</localize>
-                  </uui-button>
-
-                </div>
-
-              </div>
-
-            </div>
-
-          </umb-box-content>
-
-        </umb-box>
-
-        <umb-box ng-if="vm.history.length">
-          <umb-box-header title-key="user_yourHistory"></umb-box-header>
-          <umb-box-content>
-            <umb-control-group>
-              <ul class="umb-tree">
-                <li ng-repeat="item in vm.history | orderBy:'time':true">
-                  <a ng-click="vm.gotoHistory(item.link)" ng-href="{{item.link}}" prevent-default>
-                    <umb-icon icon="{{item.icon}}"></umb-icon>
-                    {{item.name}}
-                    ({{ item.time | date : 'medium' }})
-                  </a>
-                </li>
-              </ul>
-            </umb-control-group>
-          </umb-box-content>
-        </umb-box>
-      </div>
-
-      <div class="umb-control-group" ng-if="vm.dashboard.length > 0">
-        <div ng-repeat="tab in vm.dashboard">
-          <h5 ng-if="tab.label">{{tab.label}}</h5>
-          <div ng-repeat="property in tab.properties">
-            <div ng-include="property.view"></div>
-          </div>
-        </div>
-      </div>
-    </umb-editor-container>
-
-    <umb-editor-footer>
-
-      <umb-editor-footer-content-right>
-
-        <umb-button class="btn-group-vertical" data-element="button-overlayClose" type="button" button-style="link"
-          label-key="general_close" shortcut="esc" action="vm.close()">
-        </umb-button>
-
-        <umb-button class="btn-group-vertical" type="button" label-key="general_logout" shortcut="ctrl+shift+l"
-          action="vm.logout()" alias="logOut" button-style="danger" label="Log out">
-        </umb-button>
-
-      </umb-editor-footer-content-right>
-
-    </umb-editor-footer>
-
-  </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.controller.js
deleted file mode 100644
index b11ae02e4e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.controller.js
+++ /dev/null
@@ -1,98 +0,0 @@
-(function () {
-    "use strict";
-
-    function UserGroupPickerController($scope, userGroupsResource, localizationService) {
-        
-        var vm = this;
-
-        vm.userGroups = [];
-        vm.loading = false;
-
-        vm.selectUserGroup = selectUserGroup;
-        vm.submit = submit;
-        vm.close = close;
-
-        //////////
-
-        function onInit() {
-
-            vm.loading = true;
-
-            // set default title
-            if(!$scope.model.title) {
-                localizationService.localize("user_selectUserGroups").then(function(value){
-                    $scope.model.title = value;
-                });
-            }
-
-            // make sure we can push to something
-            if(!$scope.model.selection) {
-                $scope.model.selection = [];
-            }
-
-            // get venues
-            userGroupsResource.getUserGroups().then(function(userGroups){
-                vm.userGroups = userGroups;
-                
-                if($scope.model.selection && $scope.model.selection.length > 0) {
-                    preSelect($scope.model.selection);
-                }
-                
-                vm.loading = false;
-
-            });
-            
-        }
-
-        function preSelect(selection) {
-
-            selection.forEach(function (selected) {
-
-                vm.userGroups.forEach(function(userGroup){
-                    if(selected.id === userGroup.id) {
-                        userGroup.selected = true;
-                    }
-                });
-
-            });
-        }
-
-        function selectUserGroup(userGroup) {
-
-            if(!userGroup.selected) {
-                
-                userGroup.selected = true;
-                $scope.model.selection.push(userGroup);
-
-            } else {
-
-                $scope.model.selection.forEach(function(selectedUserGroup, index){
-                    if(selectedUserGroup.id === userGroup.id) {
-                        userGroup.selected = false;
-                        $scope.model.selection.splice(index, 1);
-                    }
-                });
-
-            }
-
-        }
-
-        function submit(model) {
-            if($scope.model.submit) {
-                $scope.model.submit(model);
-            }
-        }
-
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.UserGroupPickerController", UserGroupPickerController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html
deleted file mode 100644
index 1e95482d9a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<div ng-controller="Umbraco.Editors.UserGroupPickerController as vm">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-            <umb-box>
-                <umb-box-content>
-
-                    <umb-search-filter
-                        input-id="usergroup-search"
-                        model="searchTerm"
-                        label-key="placeholders_filter"
-                        text="Type to filter..."
-                        css-class="w-100 mb-15"
-                        auto-focus="true">
-                    </umb-search-filter>
-
-                    <div class="umb-user-group-picker-list">
-
-                        <div class="umb-user-group-picker-list-item" ng-repeat="userGroup in vm.userGroups | filter:searchTerm">
-
-                            <button type="button" class="umb-user-group-picker__action" ng-click="vm.selectUserGroup(userGroup)">
-                                <span class="sr-only" ng-if="!userGroup.selected"><localize key="buttons_select">Select</localize> {{userGroup.name}}</span>
-                                <span class="sr-only" ng-if="userGroup.selected">{{userGroup.name}} <localize key="general_selected">Selected</localize></span>
-                            </button>
-
-                            <div class="umb-user-group-picker-list-item__icon">
-                                <umb-icon icon="{{userGroup.icon}}" ng-if="!userGroup.selected"></umb-icon>
-                                <umb-checkmark ng-if="userGroup.selected" checked="userGroup.selected" size="xs"></umb-checkmark>
-                            </div>
-
-                            <div>
-                                <div class="umb-user-group-picker-list-item__name">{{ userGroup.name }}</div>
-
-                                <div class="umb-user-group-picker-list-item__permission" ng-if="userGroup.sections">
-                                    <span>
-                                        <span class="bold"><localize key="main_sections">Sections</localize>:</span>
-                                        <span ng-repeat="section in userGroup.sections">{{ section.name }}<span ng-if="!$last">, </span></span>
-                                    </span>
-                                </div>
-
-                                <div class="umb-user-group-picker-list-item__permission">
-                                    <span>
-                                        <span class="bold"><localize key="user_startnode">Content start node</localize>:</span>
-                                        <span ng-if="!userGroup.contentStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
-                                        <span ng-if="userGroup.contentStartNode">{{ userGroup.contentStartNode.name }}</span>
-                                    </span>
-                                </div>
-
-                                <div class="umb-user-group-picker-list-item__permission">
-                                    <span>
-                                        <span class="bold"><localize key="user_mediastartnode">Media start node</localize>:</span>
-                                        <span ng-if="!userGroup.mediaStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
-                                        <span ng-if="userGroup.mediaStartNode">{{ userGroup.mediaStartNode.name }}</span>
-                                    </span>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-
-                    <umb-empty-state
-                        ng-if="vm.userGroups.length === 0 && !vm.loading"
-                        position="center">
-                        <localize key="user_noUserGroupsAdded">No user groups have been added</localize>
-                    </umb-empty-state>
-
-                </umb-box-content>
-            </umb-box>
-
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-                <umb-button
-                    type="button"
-                    button-style="success"
-                    label-key="general_submit"
-                    action="vm.submit(model)">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
deleted file mode 100644
index e2390a7a1a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
+++ /dev/null
@@ -1,124 +0,0 @@
-(function () {
-    "use strict";
-
-    function UserPickerController($scope, entityResource, localizationService, eventsService) {
-
-        var vm = this;
-
-        vm.users = [];
-        vm.loading = false;
-        vm.usersOptions = {};
-
-        vm.selectUser = selectUser;
-        vm.changePageNumber = changePageNumber;
-        vm.submit = submit;
-        vm.close = close;
-
-        vm.multiPicker = $scope.model.multiPicker === false ? false : true;
-
-        function onInit() {
-
-            vm.loading = true;
-
-            // set default title
-            if (!$scope.model.title) {
-
-                var labelKey = vm.multiPicker ? "defaultdialogs_selectUsers" : "defaultdialogs_selectUser";
-
-                localizationService.localize(labelKey).then(function(value){
-                    $scope.model.title = value;
-                });
-            }
-
-            // make sure we can push to something
-            if(!$scope.model.selection) {
-                $scope.model.selection = [];
-            }
-
-            // get users
-            getUsers();
-        }
-
-        function preSelect(selection, users) {
-            Utilities.forEach(selection, function(selected){
-                Utilities.forEach(users, function(user){
-                    if(selected.id === user.id) {
-                        user.selected = true;
-                    }
-                });
-            });
-        }
-
-        function selectUser(user) {
-
-            if (!user.selected) {
-                user.selected = true;
-                $scope.model.selection.push(user);
-            } else {
-
-                if (user.selected) {
-                    Utilities.forEach($scope.model.selection, function (selectedUser, index) {
-                        if (selectedUser.id === user.id) {
-                            user.selected = false;
-                            $scope.model.selection.splice(index, 1);
-                        }
-                    });
-                } else {
-                    if (!vm.multiPicker) {
-                        deselectAllUsers($scope.model.selection);
-                    }
-                    eventsService.emit("dialogs.userPicker.select", user);
-                    user.selected = true;
-                    $scope.model.selection.push(user);
-                }
-            }
-
-            if (!vm.multiPicker) {
-                submit($scope.model);
-            }
-        }
-
-        function deselectAllUsers(users) {
-            for (var i = 0; i < users.length; i++) {
-                var user = users[i];
-                user.selected = false;
-            }
-            users.length = 0;
-        }
-
-        function getUsers() {
-
-            vm.loading = true;
-
-            // Get users
-            entityResource.getAll("User").then(function (data) {
-                vm.users = data;
-                preSelect($scope.model.selection, vm.users);
-                vm.loading = false;
-            });
-        }
-
-        function changePageNumber(pageNumber) {
-            vm.usersOptions.pageNumber = pageNumber;
-            getUsers();
-        }
-
-        function submit(model) {
-            if ($scope.model.submit) {
-                $scope.model.submit(model);
-            }
-        }
-
-        function close() {
-            if ($scope.model.close) {
-               $scope.model.close();
-            }
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.UserPickerController", UserPickerController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html
deleted file mode 100644
index da7a5acf73..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<div ng-controller="Umbraco.Editors.UserPickerController as vm">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-load-indicator
-                ng-if="vm.loading">
-            </umb-load-indicator>
-
-            <umb-box>
-                <umb-box-content>
-                    <umb-search-filter
-                        input-id="userpicker-search"
-                        model="vm.usersOptions.filter"
-                        label-key="placeholders_filter"
-                        text="Type to filter..."
-                        css-class="w-100 mb-15"
-                        auto-focus="true">
-                    </umb-search-filter>
-
-                    <div class="umb-user-picker-item-list">
-                        <button type="button" class="btn-reset umb-user-picker-list-item" ng-repeat="user in vm.users | filter:vm.usersOptions.filter" ng-click="vm.selectUser(user)">
-                            <div class="umb-user-picker-list-item__avatar">
-                                <umb-checkmark
-                                    class="umb-user-picker-list-item__checkmark"
-                                    ng-if="user.selected"
-                                    checked="user.selected">
-                                </umb-checkmark>
-                                <umb-avatar
-                                    size="s"
-                                    color="secondary"
-                                    name="{{user.name}}"
-                                    img-src="{{user.avatars[0]}}"
-                                    img-srcset="{{user.avatars[1]}} 2x, {{user.avatars[2]}} 3x">
-                                </umb-avatar>
-                            </div>
-                            <div class="umb-user-picker-list-item__content">
-                                <div class="umb-user-picker-list-item__name">{{ user.name }}</div>
-                                <div class="umb-user-picker-list-item__group">
-                                    <span ng-repeat="userGroup in user.userGroups">{{ userGroup.name }}<span ng-if="!$last">, </span></span>
-                                </div>
-                            </div>
-                        </button>
-                    </div>
-
-                    <div class="flex justify-center">
-                        <umb-pagination
-                            ng-if="vm.usersOptions.totalPages"
-                            page-number="vm.usersOptions.pageNumber"
-                            total-pages="vm.usersOptions.totalPages"
-                            on-change="vm.changePageNumber(pageNumber)">
-                        </umb-pagination>
-                    </div>
-
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-                <umb-button
-                    ng-if="vm.multiPicker"
-                    type="button"
-                    disabled="model.selection.length === 0"
-                    button-style="success"
-                    label-key="general_submit"
-                    action="vm.submit(model)">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js
deleted file mode 100644
index 273dabb72f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.LegacyController
- * @function
- * 
- * @description
- * A controller to control the legacy iframe injection
- * 
-*/
-function LegacyController($scope, $routeParams, $element) {
-
-    var url = decodeURIComponent($routeParams.url.replace(/javascript\:/gi, ""));
-    //split into path and query
-    var urlParts = url.split("?");
-    var extIndex = urlParts[0].lastIndexOf(".");
-    var ext = extIndex === -1 ? "" : urlParts[0].substr(extIndex);
-    //path cannot be a js file
-    if (ext !== ".js" || ext === "") {
-        //path cannot contain any of these chars
-        var toClean = "*(){}[];:<>\\|'\"";
-        for (var i = 0; i < toClean.length; i++) {
-            var reg = new RegExp("\\" + toClean[i], "g");
-            urlParts[0] = urlParts[0].replace(reg, "");
-        }
-        //join cleaned path and query back together
-        url = urlParts[0] + (urlParts.length === 1 ? "" : ("?" + urlParts[1]));
-        $scope.legacyPath = url;
-    }
-    else {
-        throw "Invalid url";
-    }
-}
-
-angular.module("umbraco").controller('Umbraco.LegacyController', LegacyController);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/legacy.html b/src/Umbraco.Web.UI.Client/src/views/common/legacy.html
deleted file mode 100644
index 2fd41be41c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/legacy.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div ng-controller="Umbraco.LegacyController" id="legacyContainer" style="width: 100%; height: 100%;overflow: hidden;">
-    <iframe name="right" id="right" ng-src="{{legacyPath}}"></iframe>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/login-2fa.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/login-2fa.controller.js
deleted file mode 100644
index ad821819c6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/login-2fa.controller.js
+++ /dev/null
@@ -1,39 +0,0 @@
-angular.module("umbraco").controller("Umbraco.Login2faController",
-  function ($scope, userService, authResource) {
-    const vm = this;
-
-    vm.code = "";
-    vm.provider = "";
-    vm.providers = [];
-    vm.stateValidateButton = "init";
-    vm.authForm = {};
-
-    authResource.get2FAProviders()
-      .then(function (data) {
-        vm.providers = data;
-        if (vm.providers.length > 0) {
-          vm.provider = vm.providers[0];
-        }
-      });
-
-    vm.validate = function () {
-      vm.error = "";
-      vm.stateValidateButton = "busy";
-      vm.authForm.token.$setValidity('token', true);
-
-      authResource.verify2FACode(vm.provider, vm.code)
-        .then(function (data) {
-          vm.stateValidateButton = "success";
-          userService.setAuthenticationSuccessful(data);
-          $scope.vm.twoFactor.submitCallback();
-        })
-        .catch(function () {
-          vm.stateValidateButton = "error";
-          vm.authForm.token.$setValidity('token', false);
-        });
-    };
-
-    vm.goBack = function () {
-      $scope.vm.twoFactor.cancelCallback();
-    }
-  });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/login-2fa.html b/src/Umbraco.Web.UI.Client/src/views/common/login-2fa.html
deleted file mode 100644
index 5d8b9cd3fd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/login-2fa.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<div ng-controller="Umbraco.Login2faController as cvm" class="umb-login-container">
-  <div id="twoFactorlogin" ng-cloak="">
-    <form name="cvm.authForm" method="POST" ng-submit="cvm.validate()">
-      <header class="h4">
-        <localize key="login_2fatitle">One last step</localize>
-      </header>
-
-      <p>
-        <localize key="login_2faText">You have enabled 2-factor authentication and must verify your identity.</localize>
-      </p>
-
-      <br>
-
-      <!-- if there's only one provider active, it will skip this step! -->
-      <umb-control-group ng-if="cvm.providers.length > 1" label="@login_2faMultipleText" label-for="provider" alias="2faprovider">
-        <select id="2faprovider" name="provider" ng-model="cvm.provider">
-          <option ng-repeat="provider in cvm.providers" ng-value="provider">{{provider}}</option>
-        </select>
-      </umb-control-group>
-
-      <umb-control-group label-for="token" alias="2facode" label="@login_2faCodeInput" description="@user_2faDisableText" required="true">
-
-        <input type="text" id="2facode" class="-full-width-input input-xlarge" name="token"
-          inputmode="numeric" autocomplete="one-time-code" ng-model="cvm.code" localize="placeholder"
-          placeholder="@login_2faCodeInputHelp" aria-required="true" required umb-auto-focus no-dirty-check />
-
-        <div ng-messages="cvm.authForm.token.$error" role="alert">
-          <span class="umb-validation-label" ng-message="token">
-            <localize key="login_2faInvalidCode">Invalid code entered</localize>
-          </span>
-        </div>
-      </umb-control-group>
-
-      <div class="flex justify-between items-center">
-        <umb-button
-          type="submit"
-          button-style="success"
-          size="m"
-          label-key="general_validate"
-          state="cvm.stateValidateButton"
-          disabled="cvm.code.length === 0">
-        </umb-button>
-        <umb-button
-          type="button"
-          size="m"
-          label-key="general_back"
-          action="cvm.goBack()">
-        </umb-button>
-      </div>
-    </form>
-  </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/login.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/login.controller.js
deleted file mode 100644
index ec039dfdd7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/login.controller.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/** This controller is simply here to launch the login dialog when the route is explicitly changed to /login */
-angular.module('umbraco').controller("Umbraco.LoginController", function (eventsService, $scope, userService, $location, $rootScope, $window) {
-
-    userService._showLoginDialog();
-
-    var evtOn = eventsService.on("app.ready", function(evt, data){
-        $scope.avatar = "assets/img/application/logo.png";
-
-        var path = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath;
-
-      //check if there's a returnPath query string, if so redirect to it
-        var locationObj = $location.search();
-        if (locationObj.returnPath) {
-            // ensure that the returnPath is a valid URL under the current origin (prevents DOM-XSS among other things)
-            const returnPath = decodeURIComponent(locationObj.returnPath);
-            const url = new URL(returnPath, window.location.origin);
-            if (url.origin === window.location.origin) {
-                path = returnPath;
-            }
-        }
-
-        // Ensure path is not absolute
-        path = path.replace(/^.*\/\/[^\/]+/, '')
-
-        window.location.href = path;
-    });
-
-    $scope.$on('$destroy', function () {
-        eventsService.unsubscribe(evtOn);
-    });
-
-});
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/login.html b/src/Umbraco.Web.UI.Client/src/views/common/login.html
deleted file mode 100644
index d490d395eb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/login.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div ng-controller="Umbraco.LoginController">
-    
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.controller.js
deleted file mode 100644
index eb2b0e5930..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.controller.js
+++ /dev/null
@@ -1,36 +0,0 @@
-//used for the media picker dialog
-angular.module("umbraco").controller("Umbraco.Notifications.ConfirmRouteChangeController",
-	function ($scope, $location, $log, notificationsService, navigationService) {	
-
-		$scope.discard = function(not){
-
-			// allow for a callback for discard click
-			if(not.args.onDiscard) {
-				not.args.onDiscard()
-				return;
-			}
-
-			// when no callback is added run the normal functionality of the discard button
-			not.args.listener();
-			
-            navigationService.clearSearch();
-
-		    //we need to break the path up into path and query
-		    var parts = not.args.path.split("?");
-		    var query = {};
-            if (parts.length > 1) {
-                _.each(parts[1].split("&"), function(q) {
-                    var keyVal = q.split("=");
-                    query[keyVal[0]] = keyVal[1];
-                });
-            }
-
-            $location.path(parts[0]).search(query);
-			notificationsService.remove(not);
-		};
-
-		$scope.stay = function(not){
-			notificationsService.remove(not);
-		};
-
-	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.html b/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.html
deleted file mode 100644
index 6d47084f08..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div ng-controller="Umbraco.Notifications.ConfirmRouteChangeController">
-	<h4><localize key="prompt_unsavedChanges">You have unsaved changes</localize></h4>
-	<p><localize key="prompt_unsavedChangesWarning">Are you sure you want to navigate away from this page? - you have unsaved changes</localize></p>
-
-	<button class="btn" ng-click="discard(notification)"><localize key="prompt_discardChanges">Discard changes</localize></button>
-	<button class="btn btn-success" ng-click="stay(notification)" umb-auto-focus><localize key="prompt_stay">Stay</localize></button>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmunpublish.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmunpublish.controller.js
deleted file mode 100644
index 885df4b3a9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmunpublish.controller.js
+++ /dev/null
@@ -1,9 +0,0 @@
-angular.module("umbraco").controller("Umbraco.Notifications.ConfirmUnpublishController",
-	function ($scope, notificationsService, eventsService) {	
-
-		$scope.confirm = function(not, action){
-			eventsService.emit('content.confirmUnpublish', action);
-			notificationsService.remove(not);
-		};
-	
-	});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmunpublish.html b/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmunpublish.html
deleted file mode 100644
index 4bd3e2b964..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmunpublish.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div ng-controller="Umbraco.Notifications.ConfirmUnpublishController">
-	<h4><localize key="general_areyousure">Are you sure?</localize></h4>
-	<p><localize key="prompt_confirmUnpublish">Unpublishing will remove this page and all its descendants from the site</localize></p>
-	<button class="btn btn-warning" ng-click="confirm(notification, true)"><localize key="actions_unpublish">Unpublish</localize></button>
-	<button class="btn btn-default" ng-click="confirm(notification, false)" umb-auto-focus><localize key="general_cancel">Cancel</localize></button>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/changepassword/changepassword.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/changepassword/changepassword.html
deleted file mode 100644
index db69a32f7f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/changepassword/changepassword.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<ng-form name="passwordForm" class="block-form" val-form-manager>
-
-  <change-password password-values="model.changePassword" config="model.config">
-  </change-password>
-
-</ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html
deleted file mode 100644
index f35c24e96a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/confirm/confirm.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-
-    <p ng-bind-html="model.content"></p>
-
-    <div ng-if="model.confirmMessage"
-         class="umb-alert mb2"
-         ng-class="{ 'umb-alert--warning': model.confirmMessageStyle === 'warning',
-                     'umb-alert--danger': model.confirmMessageStyle === 'danger',
-                     'umb-alert--info': model.confirmMessageStyle === 'info'}"
-         ng-bind-html="model.confirmMessage">
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/default/default.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/default/default.html
deleted file mode 100644
index 04201dde70..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/default/default.html
+++ /dev/null
@@ -1 +0,0 @@
-<div>{{model.content}}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
deleted file mode 100644
index c4f60b766a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function ItemPickerOverlay($scope, localizationService) {
-
-    $scope.filter = {
-        searchTerm: ''
-    };
-
-    function onInit() {
-        $scope.model.hideSubmitButton = true;
-
-        if (!$scope.model.title) {
-            localizationService.localize("defaultdialogs_selectItem").then(function(value){
-                $scope.model.title = value;
-            });
-        }
-
-        if (!$scope.model.orderBy) {
-            $scope.model.orderBy = "name";
-        }
-    }
-
-    $scope.selectItem = function(item) {
-        $scope.model.selectedItem = item;
-        $scope.submitForm($scope.model);
-    };
-
-    $scope.tooltip = {
-        show: false,
-        event: null
-    };
-
-    $scope.showTooltip = function (item, $event) {
-        if (!item.tooltip) {
-            return;
-        }
-
-        $scope.tooltip = {
-            show: true,
-            event: $event,
-            text: item.tooltip
-        };
-    }
-
-    $scope.hideTooltip = function () {
-        $scope.tooltip = {
-            show: false,
-            event: null,
-            text: null
-        };
-    }
-
-    onInit();
-
-}
-
-angular.module("umbraco").controller("Umbraco.Overlays.ItemPickerOverlay", ItemPickerOverlay);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
deleted file mode 100644
index 2798d5615f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<div ng-controller="Umbraco.Overlays.ItemPickerOverlay" class="umb-itempicker">
-
-    <div class="mb3" ng-if="model.filter !== false">
-        <umb-search-filter
-            model="filter.searchTerm"
-            label-key="placeholders_filter"
-            text="Type to filter..."
-            css-class="w-100"
-            auto-focus="true">
-        </umb-search-filter>
-    </div>
-
-    <div class="umb-overlay__section-header" ng-if="(model.pasteItems | filter:filter.searchTerm).length > 0">
-        <h5><localize key="content_createFromClipboard">Paste from clipboard</localize></h5>
-        <button type="button" ng-if="model.clickClearPaste" ng-click="model.clickClearPaste($event)" alt="Clear clipboard for entries accepted in this context.">
-            <umb-icon icon="icon-trash"></umb-icon>
-        </button>
-    </div>
-
-    <ul class="umb-card-grid" ng-class="{'-three-in-row': model.availableItems.length < 7, '-four-in-row': model.availableItems.length >= 7}">
-        <li ng-repeat="pasteItem in model.pasteItems | filter:filter.searchTerm">
-            <button type="button" class="umb-card-grid-item btn-reset" ng-click="model.clickPasteItem(pasteItem)">
-                <span>
-                    <umb-icon icon="{{pasteItem.icon}}"></umb-icon>
-                    {{ pasteItem.name | truncate:true:36 }}
-                </span>
-            </button>
-        </li>
-    </ul>
-
-    <div class="umb-overlay__section-header" ng-if="model.pasteItems.length > 0 && (model.availableItems | filter:filter.searchTerm).length > 0">
-        <h5><localize key="content_createEmpty">Create new</localize></h5>
-    </div>
-
-    <ul class="umb-card-grid" ng-class="{'-three-in-row': model.availableItems.length < 7, '-four-in-row': model.availableItems.length >= 7}">
-        <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:model.orderBy | filter:filter.searchTerm">
-            <button type="button" class="umb-card-grid-item btn-reset" ng-click="selectItem(availableItem)">
-                <span ng-mouseover="showTooltip(availableItem, $event)" ng-mouseleave="hideTooltip()">
-                    <umb-icon icon="{{availableItem.icon}}"></umb-icon>
-                    <span>{{availableItem.name}}</span>
-                </span>
-            </button>
-        </li>
-        <li ng-if="model.createNewItem">
-            <button type="button" class="umb-card-grid-item btn-reset --creator" ng-click="model.createNewItem.action()">
-                <span>
-                    <umb-icon icon="{{model.createNewItem.icon}}"></umb-icon>
-                    {{model.createNewItem.name}}
-                </span>
-            </button>
-        </li>
-    </ul>
-
-    <umb-tooltip ng-if="tooltip.show" event="tooltip.event">
-        {{ tooltip.text }}
-    </umb-tooltip>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/keyboardshortcuts/keyboardshortcuts.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/keyboardshortcuts/keyboardshortcuts.html
deleted file mode 100644
index f3a0303b03..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/keyboardshortcuts/keyboardshortcuts.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="umb-keyboard-shortcuts-overview__keyboard-shortcuts-group" ng-repeat="shortcutGroup in model.shortcuts">
-    <h5 class="umb-keyboard-shortcuts-overview__keyboard-shortcuts-group-name">{{ shortcutGroup.name }}</h5>
-    <div class="umb-keyboard-shortcuts-overview__keyboard-shortcuts">
-        <div class="umb-keyboard-shortcuts-overview__keyboard-shortcut" ng-repeat="shortcut in shortcutGroup.shortcuts">
-            <div class="umb-keyboard-shortcuts-overview__description">{{ shortcut.description }}</div>
-            <div class="umb-keyboard-keys">
-                <div ng-repeat="key in shortcut.platformKeys">
-                    <div class="umb-keyboard-key-wrapper">
-                        <div class="umb-keyboard-key">{{ key.key }}</div>
-                        <div ng-if="!$last">
-                            <span ng-if="!keyboardShortcut.keyRange">+</span>
-                            <span ng-if="keyboardShortcut.keyRange">-</span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html
deleted file mode 100644
index 0079086f36..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/logviewersearch/logviewersearch.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div>
-    <p>
-        <strong>Query:</strong><br/>
-        {{model.query}}
-    </p>
-
-    <p>
-        <strong><localize key="general_name">Name</localize>:</strong><br />
-        <input type="text" class="-full-width-input" ng-model="model.queryName" name="queryName" ng-change="model.disableSubmitButton = model.name.length === 0" />
-    </p>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js
deleted file mode 100644
index f3c220075d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js
+++ /dev/null
@@ -1,33 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.Overlays.YsodController", function ($scope, localizationService) {
-
-        function onInit() {
-
-            if(!$scope.model.title) {
-                localizationService.localize("errors_receivedErrorFromServer").then(function(value){
-                    $scope.model.title = value;
-                });
-            }
-
-            if ($scope.model.error && $scope.model.error.data && $scope.model.error.data.StackTrace) {
-                //trim whitespace
-                $scope.model.error.data.StackTrace = $scope.model.error.data.StackTrace.trim();
-            }
-
-            if ($scope.model.error && $scope.model.error.data) {
-                $scope.model.error.data.InnerExceptions = [];
-                var ex = $scope.model.error.data.InnerException;
-                while (ex) {
-                    if (ex.StackTrace) {
-                        ex.StackTrace = ex.StackTrace.trim();
-                    }
-                    $scope.model.error.data.InnerExceptions.push(ex);
-                    ex = ex.InnerException;
-                }
-            }
-
-        }
-
-        onInit();
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.html
deleted file mode 100644
index fa0639fdd0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div ng-controller="Umbraco.Overlays.YsodController">
-
-    <h4 class="heading red">{{model.error.errorMsg}}</h4>
-    <p>{{model.error.data.ExceptionMessage || model.error.data.Message}}</p>
-
-    <div class="umb-control-group">
-        <h5>
-            <localize key="defaultdialogs_exceptionDetail">Exception Details:</localize>
-        </h5>
-        {{model.error.data.ExceptionType}}: {{model.error.data.ExceptionMessage}}
-    </div>
-
-    <div class="umb-control-group">
-        <h5>
-            <localize key="defaultdialogs_stacktrace">Stacktrace:</localize>
-        </h5>
-        <pre style="white-space: pre-wrap; overflow-x: auto;">{{model.error.data.StackTrace}}</pre>
-    </div>
-
-    <div class="umb-control-group" ng-repeat="e in model.error.data.InnerExceptions">
-        <h5>
-            <localize key="defaultdialogs_innerException">Inner Exception:</localize>
-        </h5>
-        <div>{{e.ExceptionType}}: {{e.ExceptionMessage}}</div>
-        <pre style="white-space: pre-wrap; overflow-x: auto;">{{e.StackTrace}}</pre>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbemailmarketing/confirm/confirm.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbemailmarketing/confirm/confirm.controller.js
deleted file mode 100644
index ef4f5ce1ce..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbemailmarketing/confirm/confirm.controller.js
+++ /dev/null
@@ -1,15 +0,0 @@
-(function () {
-    "use strict";
-
-    function ConfirmController($scope, userService) {
-
-        var vm = this;
-        vm.userEmailAddress = "";
-
-        userService.getCurrentUser().then(function(user){
-            vm.userEmailAddress = user.email;
-        });
-    }
-
-    angular.module("umbraco").controller("Umbraco.Tours.UmbEmailMarketing.ConfirmController", ConfirmController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbemailmarketing/confirm/confirm.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbemailmarketing/confirm/confirm.html
deleted file mode 100644
index 34acb194e3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbemailmarketing/confirm/confirm.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div ng-controller="Umbraco.Tours.UmbEmailMarketing.ConfirmController as vm">
-
-    <umb-tour-step-header title="model.currentStep.title"></umb-tour-step-header>
-
-    <umb-tour-step on-close="model.completeTour()">
-        <p>We have sent a welcome email to your email address <strong>{{ vm.userEmailAddress }}</strong></p>
-    </umb-tour-step>
-
-    <umb-tour-step-footer>
-        <div class="flex justify-end">
-            <umb-button type="button" button-style="link" action="model.completeTour()" label-key="general_close" shortcut="esc"></umb-button>
-        </div>
-    </umb-tour-step-footer>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbemailmarketing/emails/emails.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbemailmarketing/emails/emails.controller.js
deleted file mode 100644
index d3040a5c3f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbemailmarketing/emails/emails.controller.js
+++ /dev/null
@@ -1,21 +0,0 @@
-(function () {
-    "use strict";
-
-    function EmailsController($scope, userService) {
-
-        var vm = this;
-
-        vm.optIn = function() {
-            // Get the current user in backoffice
-            userService.getCurrentUser().then(function(user){
-                // Send this user along to opt in
-                // It's a fire & forget - not sure we need to check the response
-                userService.addUserToEmailMarketing(user);
-            });
-
-            $scope.model.nextStep();
-        }
-    }
-
-    angular.module("umbraco").controller("Umbraco.Tours.UmbEmailMarketing.EmailsController", EmailsController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbemailmarketing/emails/emails.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbemailmarketing/emails/emails.html
deleted file mode 100644
index 887624ed05..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbemailmarketing/emails/emails.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div ng-controller="Umbraco.Tours.UmbEmailMarketing.EmailsController as vm" class="umb-email-marketing">
-
-    <umb-tour-step on-close="model.endTour()">
-
-        <h2>{{ model.currentStep.title }}</h2>
-
-        <div class="layout">
-            <!-- HTML Content stored in tour JSON config file -->
-            <div class="primary">
-                <div ng-bind-html="model.currentStep.content"></div>
-            </div>
-
-            <!-- Secondary Column with paperplane -->
-            <div class="secondary">
-                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 220 1080 640"><defs><style>.cls-1{fill:#fba0a2;}.cls-2{fill:#3544b1;}</style></defs><title>paperplane</title><g id="Layer_54" data-name="Layer 54"><polygon class="cls-1" points="1012.92 370.19 894.84 709.81 832.53 529.1 691.24 457.68 1012.92 370.19"/><polygon class="cls-2" points="1012.92 370.19 832.53 529.1 894.84 709.81 1012.92 370.19"/><path class="cls-2" d="M784.24,590.07s-34.16,66.82-88,70.95l-11.65-32s46.67-12.34,79.51-42.3Z"/><path class="cls-2" d="M633.49,670s-66.81,25.65-94.62,7l-3.5-26s35.92,19.8,79.74-9.67Z"/><path class="cls-2" d="M475.1,673.19S405.19,650.45,383,623.94l4.21-15.08,95.94,33.81Z"/><path class="cls-2" d="M311.51,601.88s-36.8-46.78-77.3-41.65l3.14-21.17s36.46-21.71,82.28,31.89Z"/><path class="cls-2" d="M183.21,562.23S119,565.32,89.29,588.69L67.08,569.22s61.6-41.75,103.69-36.05Z"/></g></svg>
-            </div>
-        </div>
-
-        <div class="cta">
-            <umb-button size="m" button-style="link" type="button" label="No thanks" action="model.disableTour()"></umb-button>
-            <umb-button size="m" button-style="action" type="button" action="vm.optIn()" label="Keep me updated!"></umb-button>
-        </div>
-
-    </umb-tour-step>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatecontent/nodename/nodename.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatecontent/nodename/nodename.controller.js
deleted file mode 100644
index eca0c4582b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatecontent/nodename/nodename.controller.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function () {
-    "use strict";
-
-    function NodeNameController($scope) {
-
-        var vm = this;
-        var element = $($scope.model.currentStep.element);
-
-        vm.error = false;
-
-        vm.initNextStep = initNextStep;
-
-        function initNextStep() {
-            if (element.val().toLowerCase() === 'home') {
-                $scope.model.nextStep();
-            } else {
-                vm.error = true;
-            }
-        }
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Tours.UmbIntroCreateContent.NodeNameController", NodeNameController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatecontent/nodename/nodename.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatecontent/nodename/nodename.html
deleted file mode 100644
index b048b245c1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatecontent/nodename/nodename.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div ng-controller="Umbraco.Tours.UmbIntroCreateContent.NodeNameController as vm">
-
-    <umb-tour-step on-close="model.endTour()">
-            
-        <umb-tour-step-header
-            title="model.currentStep.title">
-        </umb-tour-step-header>
-        
-        <umb-tour-step-content
-            content="model.currentStep.content">
-            <div ng-if="vm.error" class="color-red" style="margin-top: 5px;">Please enter <b>Home</b> in the field</div>
-        </umb-tour-step-content>
-
-        <umb-tour-step-footer class="flex justify-between items-center">
-
-            <umb-tour-step-counter
-                current-step="model.currentStepIndex + 1"
-                total-steps="model.steps.length">
-            </umb-tour-step-counter>
-
-            <div>
-                <umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next"></umb-button>
-            </div>
-
-        </umb-tour-step-footer>
-
-    </umb-tour-step>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.controller.js
deleted file mode 100644
index ed5a0b93e3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.controller.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function () {
-    "use strict";
-
-    function DocTypeNameController($scope) {
-
-        var vm = this;
-        var element = $($scope.model.currentStep.element);
-
-        vm.error = false;
-
-        vm.initNextStep = initNextStep;
-
-        function initNextStep() {
-            if (element.val().toLowerCase() === 'home page') {
-                $scope.model.nextStep();
-            } else {
-                vm.error = true;
-            }
-        }
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Tours.UmbIntroCreateDocType.DocTypeNameController", DocTypeNameController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.html
deleted file mode 100644
index 3ae8943560..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div ng-controller="Umbraco.Tours.UmbIntroCreateDocType.DocTypeNameController as vm">
-
-    <umb-tour-step on-close="model.endTour()">
-            
-        <umb-tour-step-header
-            title="model.currentStep.title">
-        </umb-tour-step-header>
-        
-        <umb-tour-step-content
-            content="model.currentStep.content">
-            <div ng-if="vm.error" class="color-red" style="margin-top: 5px;">Please enter <b>Home Page</b> in the field</div>
-        </umb-tour-step-content>
-
-        <umb-tour-step-footer class="flex justify-between items-center">
-
-            <umb-tour-step-counter
-                current-step="model.currentStepIndex + 1"
-                total-steps="model.steps.length">
-            </umb-tour-step-counter>
-
-            <div>
-                <umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next"></umb-button>
-            </div>
-
-        </umb-tour-step-footer>
-
-    </umb-tour-step>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.controller.js
deleted file mode 100644
index 5ceae2f2f8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.controller.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function () {
-    "use strict";
-
-    function PropertyNameController($scope) {
-
-        var vm = this;
-        var element = $($scope.model.currentStep.element);
-
-        vm.error = false;
-
-        vm.initNextStep = initNextStep;
-
-        function initNextStep() {
-            if (element.val().toLowerCase() === 'welcome text') {
-                $scope.model.nextStep();
-            } else {
-                vm.error = true;
-            }
-        }
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Tours.UmbIntroCreateDocType.PropertyNameController", PropertyNameController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.html
deleted file mode 100644
index 2c255706c8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div ng-controller="Umbraco.Tours.UmbIntroCreateDocType.PropertyNameController as vm">
-
-    <umb-tour-step on-close="model.endTour()">
-            
-        <umb-tour-step-header
-            title="model.currentStep.title">
-        </umb-tour-step-header>
-        
-        <umb-tour-step-content
-            content="model.currentStep.content">
-            <div ng-if="vm.error" class="color-red" style="margin-top: 5px;">Please enter <b>Welcome Text</b> in the field</div>
-        </umb-tour-step-content>
-
-        <umb-tour-step-footer class="flex justify-between items-center">
-
-            <umb-tour-step-counter
-                current-step="model.currentStepIndex + 1"
-                total-steps="model.steps.length">
-            </umb-tour-step-counter>
-
-            <div>
-                <umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next"></umb-button>
-            </div>
-
-        </umb-tour-step-footer>
-
-    </umb-tour-step>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.controller.js
deleted file mode 100644
index c134e50a34..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.controller.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function () {
-    "use strict";
-
-    function TabNameController($scope) {
-
-        var vm = this;
-        var element = $($scope.model.currentStep.element);
-
-        vm.error = false;
-
-        vm.initNextStep = initNextStep;
-
-        function initNextStep() {
-            if (element.val().toLowerCase() === 'home') {
-                $scope.model.nextStep();
-            } else {
-                vm.error = true;
-            }
-        }
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Tours.UmbIntroCreateDocType.TabNameController", TabNameController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.html
deleted file mode 100644
index 0dfa084878..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div ng-controller="Umbraco.Tours.UmbIntroCreateDocType.TabNameController as vm">
-
-    <umb-tour-step on-close="model.endTour()">
-            
-        <umb-tour-step-header
-            title="model.currentStep.title">
-        </umb-tour-step-header>
-        
-        <umb-tour-step-content
-            content="model.currentStep.content">
-            <div ng-if="vm.error" class="color-red" style="margin-top: 5px;">Please enter <b>Home</b> in the field</div>
-        </umb-tour-step-content>
-
-        <umb-tour-step-footer class="flex justify-between items-center">
-
-            <umb-tour-step-counter
-                current-step="model.currentStepIndex + 1"
-                total-steps="model.steps.length">
-            </umb-tour-step-counter>
-
-            <div>
-                <umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next"></umb-button>
-            </div>
-
-        </umb-tour-step-footer>
-
-    </umb-tour-step>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.controller.js
deleted file mode 100644
index bad9718251..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.controller.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function () {
-    "use strict";
-
-    function FolderNameController($scope) {
-
-        var vm = this;
-        var element = $($scope.model.currentStep.element);
-
-        vm.error = false;
-
-        vm.initNextStep = initNextStep;
-
-        function initNextStep() {
-            if (element.val().toLowerCase() === "my images") {
-                $scope.model.nextStep();
-            } else {
-                vm.error = true;
-            }
-        }
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Tours.UmbIntroMediaSection.FolderNameController", FolderNameController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.html
deleted file mode 100644
index 063f332e1d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div ng-controller="Umbraco.Tours.UmbIntroMediaSection.FolderNameController as vm">
-
-    <umb-tour-step on-close="model.endTour()">
-
-        <umb-tour-step-header
-            title="model.currentStep.title">
-        </umb-tour-step-header>
-        
-        <umb-tour-step-content
-            content="model.currentStep.content">
-            <div ng-if="vm.error" class="color-red" style="margin-top: 5px;">Please enter <b>My Images</b> in the field</div>
-        </umb-tour-step-content>
-
-        <umb-tour-step-footer class="flex justify-between items-center">
-
-            <umb-tour-step-counter
-                current-step="model.currentStepIndex + 1"
-                total-steps="model.steps.length">
-            </umb-tour-step-counter>
-
-            <div>
-                <umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next" state="vm.buttonState"></umb-button>
-            </div>
-
-        </umb-tour-step-footer>
-
-    </umb-tour-step>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.controller.js
deleted file mode 100644
index 08f0751510..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.controller.js
+++ /dev/null
@@ -1,40 +0,0 @@
-(function () {
-    "use strict";
-
-    function UploadImagesController($scope, editorState, mediaResource) {
-
-        var vm = this;
-
-        vm.error = false;
-
-        vm.initNextStep = initNextStep;
-
-        function initNextStep() {
-
-            vm.error = false;
-            vm.buttonState = "busy";
-
-            var currentNode = editorState.getCurrent();
-
-            // make sure we have uploaded at least one image
-            mediaResource.getChildren(currentNode.id)
-                .then(function (data) {
-
-                    var children = data;
-
-                    if (children.items && children.items.length > 0) {
-                        $scope.model.nextStep();
-                    } else {
-                        vm.error = true;
-                    }
-
-                    vm.buttonState = "init";
-
-                });
-
-        }
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Tours.UmbIntroMediaSection.UploadImagesController", UploadImagesController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.html
deleted file mode 100644
index 0e13b9b645..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div ng-controller="Umbraco.Tours.UmbIntroMediaSection.UploadImagesController as vm">
-
-    <umb-tour-step on-close="model.endTour()">
-
-        <umb-tour-step-header
-            title="model.currentStep.title">
-        </umb-tour-step-header>
-        
-        <umb-tour-step-content
-            content="model.currentStep.content">
-            <div ng-if="vm.error" class="color-red" style="margin-top: 5px;">Please upload an image</div>
-        </umb-tour-step-content>
-
-        <umb-tour-step-footer class="flex justify-between items-center">
-
-            <umb-tour-step-counter
-                current-step="model.currentStepIndex + 1"
-                total-steps="model.steps.length">
-            </umb-tour-step-counter>
-
-            <div>
-                <umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next" state="vm.buttonState"></umb-button>
-            </div>
-
-        </umb-tour-step-footer>
-
-    </umb-tour-step>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrorenderintemplate/templatetree/templatetree.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrorenderintemplate/templatetree/templatetree.controller.js
deleted file mode 100644
index 4edd9c9837..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrorenderintemplate/templatetree/templatetree.controller.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function () {
-    "use strict";
-
-    function TemplatesTreeController($scope) {
-
-        var eventElement = $($scope.model.currentStep.eventElement);
-
-        function onInit() {
-            // check if tree is already open - if it is - go to next step
-            if (eventElement.hasClass("icon-navigation-down")) {
-                $scope.model.nextStep();
-            }
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Tours.UmbIntroRenderInTemplate.TemplatesTreeController", TemplatesTreeController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrorenderintemplate/templatetree/templatetree.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrorenderintemplate/templatetree/templatetree.html
deleted file mode 100644
index cc8896c964..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrorenderintemplate/templatetree/templatetree.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div ng-controller="Umbraco.Tours.UmbIntroRenderInTemplate.TemplatesTreeController as vm">
-    <umb-tour-step on-close="model.endTour()">
-            
-        <umb-tour-step-header
-            title="model.currentStep.title">
-        </umb-tour-step-header>
-        
-        <umb-tour-step-content
-            content="model.currentStep.content">
-        </umb-tour-step-content>
-
-        <umb-tour-step-footer class="flex justify-between items-center">
-
-            <umb-tour-step-counter
-                current-step="model.currentStepIndex + 1"
-                total-steps="model.steps.length">
-            </umb-tour-step-counter>
-
-        </umb-tour-step-footer>
-
-    </umb-tour-step>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
deleted file mode 100644
index 5688ea1b12..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<div>
-    <header role="banner" class="umb-app-header">
-
-        <button type="button" class="umb-app-header__skip-button" ng-click="skipToMenu()"><localize key="general_skipToMenu">Go to menu</localize></button>
-        <button type="button" class="umb-app-header__skip-button" ng-click="skipToContent()"><localize key="general_skipToContent">Go to content</localize></button>
-
-        <div class="umb-app-header__logo" ng-if="hideBackofficeLogo !== true">
-            <button type="button"
-                    id="umbraco-logo-mark"
-                    class="btn-reset"
-                    ng-click="toggleLogoModal()"
-                    localize="title"
-                    title="@general_umbracoInfo">
-
-              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 315.89 315.89" width="30" height="30">
-                <style type="text/css">
-                  #umbraco-logo-mark svg {
-                    vertical-align: top;
-                  }
-                  #umbraco-logo-mark svg path {
-                    fill: white;
-                    opacity: 0.8;
-                  }
-                  #umbraco-logo-mark:hover svg path {
-                    opacity: 1;
-                  }
-                  #umbraco-logo-mark.active svg path {
-                    fill: #f5c1bc;
-                    opacity: 1;
-                  }
-                </style>
-                <path d="M0,157.74A157.95,157.95,0,1,1,158,315.89,157.95,157.95,0,0,1,0,157.74Zm154.74,54.09a155.41,155.41,0,0,1-36.5-3.29,27.92,27.92,0,0,1-19.94-16q-5.35-12.34-5.21-38.1a243,243,0,0,1,1.69-26.84q1.55-13,3.09-21.46l1.07-5.59a2,2,0,0,0,0-.49,3.2,3.2,0,0,0-2.65-3.17L75.92,93.67h-.44a3.19,3.19,0,0,0-3.11,2.48c-.35,1.31-.56,2.27-1.17,5.38-1.16,6-2.24,11.85-3.43,20.38a264.17,264.17,0,0,0-2.3,27.94,145.24,145.24,0,0,0,0,19.57q.72,25.94,8.9,41.42t27.72,22.3q19.53,6.81,54.43,6.66h2.91q34.94.15,54.41-6.66t27.71-22.3q8.17-15.53,8.91-41.42a145.24,145.24,0,0,0,0-19.57,266.84,266.84,0,0,0-2.3-27.94c-1.2-8.44-2.27-14.26-3.44-20.38-.61-3.11-.81-4.07-1.16-5.38a3.21,3.21,0,0,0-3.12-2.48h-.52l-20.38,3.18a3.2,3.2,0,0,0-2.68,3.17,4,4,0,0,0,0,.49l1.08,5.59q1.55,8.48,3.12,21.46a245.68,245.68,0,0,1,1.65,26.84q.27,25.69-5.21,38.07a27.9,27.9,0,0,1-19.76,16.07,155.19,155.19,0,0,1-36.48,3.29Z"/>
-              </svg>
-
-            </button>
-            <div
-                tabindex="0"
-                class="umb-app-header__logo-modal"
-                on-outside-click="hideLogoModal()"
-                ng-click="stopClickEvent($event)"
-                ng-focus="keepLogoModal()"
-                ng-blur="hideLogoModal()"
-                ng-if="logoModal.show">
-                <img src="assets/img/application/logo.svg"
-                     alt="Umbraco — The Friendly CMS"
-                     width="120"
-                     draggable="false" />
-                <small> {{logoModal.text}} </small>
-                <br /><br />
-                <a href="https://umbraco.com"
-                   title="Umbraco website"
-                   target="_blank"
-                   rel="noopener"
-                   ng-focus="keepLogoModal()"
-                   ng-blur="hideLogoModal()">
-                Umbraco.com</a>
-            </div>
-        </div>
-
-        <umb-sections ng-if="authenticated" sections="sections"> </umb-sections>
-
-        <div class="umb-app-header__right">
-            <ul class="umb-app-header__actions">
-                <li data-element="global-search" class="umb-app-header__action">
-                    <button
-                        type="button"
-                        class="umb-app-header__button btn-reset"
-                        hotkey="ctrl+space"
-                        ng-click="searchClick()"
-                        ng-mousedown="rememberFocus()"
-                        localize="title"
-                        title="@general_search"
-                    >
-                        <span class="sr-only">
-                            <localize
-                                key="visuallyHiddenTexts_openBackofficeSearch"
-                                >Open backoffice search</localize
-                            >...
-                        </span>
-                        <span class="umb-app-header__action-icon">
-                            <umb-icon icon="icon-search"></umb-icon>
-                        </span>
-                    </button>
-                </li>
-                <li data-element="global-help" class="umb-app-header__action">
-                    <button
-                        type="button"
-                        class="umb-app-header__button btn-reset"
-                        hotkey="ctrl+shift+h"
-                        ng-click="helpClick()"
-                        localize="title"
-                        title="@general_help"
-                    >
-                        <span class="sr-only">
-                            <localize
-                                key="visuallyHiddenTexts_openCloseBackofficeHelp"
-                                >Open/Close backoffice help</localize
-                            >...
-                        </span>
-                        <span class="umb-app-header__action-icon">
-                            <umb-icon icon="icon-help-alt"></umb-icon>
-                        </span>
-                    </button>
-                </li>
-                <li data-element="global-user" class="umb-app-header__action">
-                    <button
-                        type="button"
-                        class="umb-app-header__button btn-reset"
-                        ng-click="avatarClick()"
-                        hotkey="ctrl+shift+u"
-                        title="{{user.name}}"
-                    >
-                        <span class="sr-only">
-                            <localize
-                                key="visuallyHiddenTexts_openCloseBackofficeProfileOptions"
-                                >Open/Close your profile options</localize
-                            >...
-                        </span>
-                        <umb-avatar
-                            class="umb-app-header__action-icon"
-                            size="xxs"
-                            color="secondary"
-                            name="{{user.name}}"
-                            img-src="{{avatar[0].value}}"
-                        >
-                        </umb-avatar>
-                    </button>
-                </li>
-            </ul>
-        </div>
-    </header>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-backdrop.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-backdrop.html
deleted file mode 100644
index 1ff3960ae9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-backdrop.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="umb-backdrop" ng-click="clickBackdrop($event)">
-
-    <!-- Backdrop with highlight -->
-    <div ng-if="highlightElement && !loading" class="umb-backdrop__backdrop">
-        <div class="umb-backdrop__rect umb-backdrop__rect--top" ng-style="rectTopCss"></div>
-        <div class="umb-backdrop__rect umb-backdrop__rect--right" ng-style="rectRightCss"></div>
-        <div class="umb-backdrop__rect umb-backdrop__rect--bottom" ng-style="rectBottomCss"></div>        
-        <div class="umb-backdrop__rect umb-backdrop__rect--left" ng-style="rectLeftCss"></div>
-    </div>
-
-    <!-- Full screen backdrop -->
-    <div ng-if="!highlightElement || loading" class="umb-backdrop__backdrop">
-        <div class="umb-backdrop__rect" ng-style="{'opacity': backdropOpacity }"></div>
-    </div>
-
-    <!-- Prevent clicks in highlighted area -->
-    <div ng-if="highlightPreventClick" class="umb-backdrop__highlight-prevent-click"></div>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-contextmenu.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-contextmenu.html
deleted file mode 100644
index cee9da9ebc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-contextmenu.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div id="contextMenu" class="umb-modalcolumn fill shadow" ng-animate="'slide'" umb-focus-lock role="dialog"
-    aria-labelledby="contextmenu-title" aria-describedby="contextmenu-description" on-outside-click="outSideClick()">
-    <div>
-        <div class="umb-modalcolumn-header">
-            <h1 id="contextmenu-title">{{menuDialogTitle}}</h1>
-            <p id="contextmenu-description" class="sr-only">
-                <localize key="visuallyHiddenTexts_contextMenuDescription">Select one of the options to edit the node.</localize>
-            </p>
-        </div>
-
-        <div class="umb-modalcolumn-body">
-            <ul class="umb-actions">
-                <li data-element="action-{{action.alias}}" class="umb-action"
-                    ng-class="{sep:action.separator, '-opens-dialog': action.opensDialog}" ng-repeat="action in menuActions">
-                    <button type="button" ng-click="executeMenuItem(action)"
-                        class="umb-action-link btn-reset umb-outline">
-                        <umb-icon icon="{{action.icon}}" class="icon"></umb-icon>
-                        <span class="menu-label">{{action.name}}</span>
-                    </button>
-                </li>
-            </ul>
-        </div>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
deleted file mode 100644
index b86abf033e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="login-overlay">
-    <div id="login" class="umb-modalcolumn umb-dialog" ng-cloak>
-        <umb-auth
-            ng-attr-logo-image="{{ ::vm.logoImage }}"
-            ng-attr-logo-image-alternative="{{ ::vm.logoImageAlternative }}"
-            ng-attr-background-image="{{ ::vm.backgroundImage }}"
-            ng-attr-username-is-email="{{ ::vm.usernameIsEmail || undefined }}"
-            ng-attr-allow-password-reset="{{ ::vm.allowPasswordReset || undefined }}"
-            ng-attr-disable-local-login="{{ ::vm.disableLocalLogin || undefined }}"
-            return-url=""
-            ng-on-umb-login-success="vm.onLoginSuccess($event)"
-        >
-            <span ng-if="vm.isTimedOut" slot="subheadline">
-                <umb-localize key="login_timeout">Log in below</umb-localize>.
-            </span>
-            <umb-external-login-provider
-                ng-repeat="login in vm.externalLoginProviders"
-                slot="external"
-                ng-attr-display-name="{{ ::login.caption }}"
-                ng-attr-provider-name="{{ ::login.authType }}"
-                ng-attr-custom-view="{{ ::login.customView }}"
-                ng-attr-icon="{{ ::login.options.icon }}"
-                external-login-url="{{ ::vm.externalLoginFormAction }}"
-                ng-attr-button-look="{{ ::login.options.buttonLook }}"
-                ng-attr-button-color="{{ ::login.options.buttonColor }}"
-                ng-attr-user-view-state="{{ ::vm.isTimedOut ? 'timedOut' : 'loggedOut' }}"
-            ></umb-external-login-provider>
-        </umb-auth>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
deleted file mode 100644
index 24a3cb4265..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<div id="leftcolumn" ng-controller="Umbraco.NavigationController" ng-mouseleave="leaveTree($event)" ng-mouseenter="enterTree($event)" on-outside-click="onOutsideClick()">
-
-    <!-- navigation container -->
-    <nav role="navigation" id="navigation" ng-show="showNavigation" class="fill umb-modalcolumn" ng-animate="'slide'" nav-resize
-    ng-class="{'--notInFront': infiniteMode}" localize="aria-label" aria-label="@actionCategories_content">
-
-        <div class="navigation-inner-container">
-
-            <div class="umb-language-picker" ng-if="currentSection === 'content' && languages.length > 1" deep-blur="page.languageSelectorIsOpen = false" on-outside-click="page.languageSelectorIsOpen = false">
-                <button type="button" class="umb-language-picker__toggle" ng-click="toggleLanguageSelector()" aria-haspopup="true" aria-expanded="{{page.languageSelectorIsOpen}}">
-                    <span>
-                        <span class="sr-only">
-                            <localize key="visuallyHiddenTexts_currentLanguage">Current language</localize>
-                            <span>: </span>
-                        </span>
-                        <span>{{selectedLanguage.name}}</span>
-                    </span>
-                    <umb-icon icon="{{page.languageSelectorIsOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-language-picker__expand"></umb-icon>
-                </button>
-                <div class="umb-language-picker__dropdown" ng-if="page.languageSelectorIsOpen">
-                    <button
-                        type="button"
-                        class="umb-language-picker__dropdown-item"
-                        ng-class="{'umb-language-picker__dropdown-item--current': language.active}"
-                        ng-click="selectLanguage(language)"
-                        ng-repeat="language in languages"
-                    >
-                    <span class="sr-only">
-                        <localize key="visuallyHiddenTexts_switchLanguage">Switch language to</localize>
-                        <span>: </span>
-                    </span>
-                    <span>{{language.name}}</span>
-                    </button>
-                </div>
-            </div>
-
-            <!-- the tree -->
-            <div id="tree" ng-show="authenticated">
-                <umb-tree
-                    api="treeApi"
-                    on-init="onTreeInit()">
-                </umb-tree>
-            </div>
-        </div>
-
-        <div class="offset6" id="navOffset" style="z-index: 10">
-
-            <umb-context-menu
-                ng-if="showContextMenu"
-                menu-dialog-title="{{menuDialogTitle}}"
-                current-section="{{currentSection}}"
-                current-node="menuNode"
-                menu-actions="menuActions">
-            </umb-context-menu>
-
-            <umb-context-dialog
-                ng-if="showContextMenuDialog"
-                dialog-title="menuDialogTitle"
-                current-node="menuNode"
-                view="dialogTemplateUrl">
-            </umb-context-dialog>
-
-        </div>
-
-        <div class="umb-editor__overlay"></div>
-
-    </nav>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-search.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-search.html
deleted file mode 100644
index 48430b579e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-search.html
+++ /dev/null
@@ -1,72 +0,0 @@
-
-<div class="umb-search" on-outside-click="vm.closeSearch()" ng-keydown="vm.handleKeyDown($event)" role="dialog"
-    aria-labelledby="search-overlay-title" aria-describedby="search-overlay-description">
-
-    <div class="sr-only">
-        <h1 id="search-overlay-title">
-            <localize key="visuallyHiddenTexts_searchOverlayTitle">Search the Umbraco backoffice</localize>
-        </h1>
-        <p id="search-overlay-description">
-            <localize key="visuallyHiddenTexts_searchOverlayDescription">Search for content nodes, media nodes etc. across the
-                backoffice.</localize>
-        </p>
-    </div>
-
-    <form class="flex items-center mb0" role="search" prevent-default>
-        <label for="app-search" class="umb-search__label">
-            <umb-icon icon="icon-search" class="umb-search-input-icon"></umb-icon>
-            <span class="sr-only">
-                <localize key="general_search">Search...</localize>
-            </span>
-        </label>
-        <span class="sr-only" id="search-input-description">
-            <localize key="visuallyHiddenTexts_searchInputDescription">When autocomplete results are available, press up and
-                down arrows,
-                or use the tab key and use the enter key to select.</localize>
-        </span>
-        <input
-            class="umb-search-input"
-            type="text"
-            ng-model="vm.searchQuery"
-            ng-model-options="{ debounce: 200 }"
-            ng-change="vm.search(vm.searchQuery)"
-            localize="placeholder"
-            placeholder="@placeholders_search"
-            id="app-search"
-            focus-when="{{vm.searchHasFocus}}"
-            aria-describedby="search-input-description"
-            aria-expanded="{{vm.hasResults}}"
-            aria-owns="search-results"
-            aria-autocomplete="list"
-        />
-        <button ng-show="vm.searchQuery.length > 0" class="umb-search-input-clear umb-animated" ng-click="vm.clearSearch()">
-            <localize key="general_clear">Clear</localize>
-        </button>
-    </form>
-
-    <div class="umb-search-results">
-        <div class="umb-search-group" ng-repeat="(key, group) in vm.searchResults" id="search-results" role="listbox">
-            <div class="umb-search-group__title" aria-hidden="true">{{key}}</div>
-            <ul class="umb-search-items">
-                <li class="umb-search-item" ng-repeat="result in group.results" active-result="{{result === vm.activeResult}}">
-                    <a class="umb-search-result__link" ng-href="#/{{result.editorPath}}" ng-click="vm.clickItem(result)">
-                        <umb-icon icon="{{result.icon}}" class="umb-search-result__icon"></umb-icon>
-                        <span class="umb-search-result__meta">
-                            <span class="umb-search-result__name">{{result.name}}</span>
-                            <span class="umb-search-result__description" ng-show="result.subTitle">
-                                <span class="sr-only">
-                                    <localize key="visuallyHiddenTexts_path">Path:</localize>
-                                </span>
-                                <span>{{result.subTitle}}</span>
-                            </span>
-                        </span>
-                    </a>
-                    <span class="sr-only">
-                        <localize key="visuallyHiddenTexts_foundIn">Found in</localize> {{key}}
-                    </span>
-                </li>
-            </ul>
-        </div>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
deleted file mode 100644
index fd2a87d5b2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div>
-    <nav role="navigation" id="applications" ng-class="{faded:stickyNavigation}" localize="aria-label" aria-label="@general_primary">
-        <ul class="sections" data-element="sections">
-
-            <li data-element="section-{{section.alias}}" ng-repeat="section in sections | limitTo: visibleSections" ng-class="{current: section.alias == currentSection}">
-                <a href="#/{{section.alias}}"
-                   ng-dblclick="sectionDblClick(section)"
-                   ng-click="sectionClick($event, section)"
-                   prevent-default
-                   ng-attr-aria-current="{{section.alias == currentSection ? 'page' : undefined}}"
-                   aria-label="{{section.name + (section.alias == currentSection ? ' (active)' : '')}}">
-                    <span class="section__name">{{section.name}}</span>
-                </a>
-            </li>
-
-            <li data-element="section-expand" class="expand" ng-class="{ 'open': showTray === true, current: currentSectionInOverflow() }" ng-show="visibleSections < sections.length">
-                <umb-button-ellipsis
-                    action="trayClick()"
-                    text="More sections"
-                    color="#ffffff"
-                    >
-                </umb-button-ellipsis>
-
-                <ul id="applications-tray" class="sections-tray shadow-depth-2" ng-if="showTray" on-outside-click="trayClick()">
-                    <li ng-repeat="section in sections | limitTo: sections.length | limitTo: -(sections.length - visibleSections)" ng-class="{current: section.alias == currentSection}">
-                        <a href="#/{{section.alias}}"
-                            ng-dblclick="sectionDblClick(section)"
-                            ng-click="sectionClick($event, section)"
-                            prevent-default
-                            ng-attr-aria-current="{{section.alias == currentSection ? 'page' : undefined}}"
-                            aria-label="{{section.name + (section.alias == currentSection ? ' (active)' : '')}}">
-                            <span class="section__name">{{section.name}}</span>
-                        </a>
-                    </li>
-                </ul>
-
-            </li>
-
-        </ul>
-    </nav>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
deleted file mode 100644
index 064dcf6945..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<div class="umb-tour">
-
-    <umb-loader class="umb-tour__loader" ng-if="loadingStep"></umb-loader>
-
-    <div class="umb-tour__pulse"></div>
-
-    <div class="umb-tour__popover shadow-depth-2" ng-class="{'umb-tour__popover--l': model.currentStep.type === 'intro' || model.currentStepIndex === model.steps.length, 'umb-tour__popover--promotion': model.currentStep.type === 'promotion'}">
-
-        <div ng-if="!configuredView && !elementNotFound">
-
-            <!-- Regular steps -->
-            <umb-tour-step ng-if="model.currentStepIndex < model.steps.length" on-close="model.endTour()">
-
-                <umb-tour-step-header
-                    title="model.currentStep.title">
-                </umb-tour-step-header>
-
-                <umb-tour-step-content
-                    content="model.currentStep.content">
-                </umb-tour-step-content>
-
-                <umb-tour-step-footer>
-
-                    <div class="flex justify-between items-center">
-
-                        <div>
-                            <umb-tour-step-counter
-                                current-step="model.currentStepIndex + 1"
-                                total-steps="model.steps.length">
-                            </umb-tour-step-counter>
-                            <div ng-if="model.allowDisable && model.currentStep.type === 'intro'">
-                                <button type="button" class="underline" ng-click="model.disableTour()" prevent-default>Don't show this tour again</button>
-                            </div>
-                        </div>
-
-                        <div ng-if="model.currentStep.type !== 'intro'">
-                            <umb-button size="xs" ng-if="!model.currentStep.event" button-style="action" type="button" action="model.nextStep()" label="Next"></umb-button>
-                        </div>
-
-                        <div ng-if="model.currentStep.type === 'intro'">
-                            <umb-button size="m" button-style="action" type="button" action="model.nextStep()" label="Start tour"></umb-button>
-                        </div>
-                    </div>
-
-                </umb-tour-step-footer>
-
-            </umb-tour-step>
-
-            <!-- Outro step -->
-            <umb-tour-step ng-if="model.currentStepIndex === model.steps.length" class="tc" hide-close="model.currentStepIndex === model.steps.length">
-
-                <umb-tour-step-content>
-                    <div class="flex items-center justify-center">
-                        <umb-checkmark size="xl" checked="true"></umb-checkmark>
-                    </div>
-                    <h3 class="bold">Congratulations!</h3>
-                    <p>You have reached the end of the <b>{{model.name}}</b> tour - way to go!</p>
-                </umb-tour-step-content>
-
-                <umb-tour-step-footer>
-                    <umb-button type="button" button-style="action" size="m" action="model.completeTour()" label="Complete"></umb-button>
-                </umb-tour-step-footer>
-
-            </umb-tour-step>
-
-        </div>
-
-        <!-- Custom step view -->
-        <div ng-if="configuredView && !loadingStep && !elementNotFound" ng-include="configuredView"></div>
-
-        <!-- Dom element not found error -->
-        <div ng-if="elementNotFound && !loadingStep">
-            <umb-tour-step class="tc" on-close="model.endTour()">
-                <umb-tour-step-header>
-                    <h4 class="bold color-red">Oh, we got lost!</h4>
-                </umb-tour-step-header>
-                <umb-tour-step-content>
-                    <p>We lost the next step <b>{{ model.currentStep.title }}</b> and don't know where to go.</p>
-                    <p>Please go back and start the tour again.</p>
-                </umb-tour-step-content>
-                <umb-tour-step-footer>
-                    <umb-button size="s" button-style="action" type="button" action="model.endTour()" label="End tour"></umb-button>
-                </umb-tour-step-footer>
-            </umb-tour-step>
-        </div>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer-content.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer-content.html
deleted file mode 100644
index 6bf6db6dc9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer-content.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-drawer-content" ng-transclude></div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer-footer.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer-footer.html
deleted file mode 100644
index e504fa7634..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer-footer.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-drawer-footer" ng-transclude></div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer-header.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer-header.html
deleted file mode 100644
index 900c7f76c9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer-header.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="umb-drawer-header">
-    <div class="umb-drawer-header__title">{{ title }}</div>
-    <div class="umb-drawer-header__subtitle">{{ description }}</div>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer-view.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer-view.html
deleted file mode 100644
index a0c69a70f3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer-view.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-drawer-view" ng-transclude></div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer.html
deleted file mode 100644
index 89c9963810..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbdrawer/umb-drawer.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="umb-drawer">
-    <div style="height: 100%;" ng-if="configuredView" ng-include="configuredView"></div>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-content.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-content.html
deleted file mode 100644
index 0010a2bc6d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-content.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="umb-tour-step__content">
-    <div ng-bind-html="content"></div>
-    <div ng-transclude></div>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-counter.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-counter.html
deleted file mode 100644
index bd4e0127d2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-counter.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-tour-step__counter">{{ currentStep }}/{{ totalSteps }}</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-footer.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-footer.html
deleted file mode 100644
index 82cc711cfa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-footer.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-tour-step__footer" ng-transclude></div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-header.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-header.html
deleted file mode 100644
index e34aa2025c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-header.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="umb-tour-step__header">
-    <div class="umb-tour-step__title">{{title}}</div>
-    <div ng-transclude></div>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html
deleted file mode 100644
index 851b18d60f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="umb-tour-step umb-tour-step--{{size}}">
-
-    <div ng-if="hideClose !== true">
-        <button type="button" class="umb-tour-step__close" hotkey="esc" ng-click="close()">
-            <umb-icon icon="icon-wrong"></umb-icon>
-            <span class="sr-only">
-                <localize key="general_close">Close</localize>
-            </span>
-        </button>
-    </div>
-
-    <div ng-transclude></div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card-grid.less b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card-grid.less
deleted file mode 100644
index 42ba81a6bb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card-grid.less
+++ /dev/null
@@ -1,7 +0,0 @@
-.umb-block-card-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
-    grid-auto-rows: minmax(150px, auto);
-    gap: 20px;
-    margin-bottom: 20px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card-group.less b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card-group.less
deleted file mode 100644
index 62b0f989ef..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card-group.less
+++ /dev/null
@@ -1,94 +0,0 @@
-.umb-block-card-group {
-    position: relative;
-    display: block;
-    width: 100%;
-    margin-top: 20px;
-
-    > .__controls {
-        display: flex;
-        align-content: center;
-
-        > .__handle {
-            display: inline-flex;
-            align-items: center;
-            width: 24px;
-            height: 32px;
-            opacity: 0;
-            margin-left: -28px;
-            transition: opacity 120ms;
-            &:hover {
-                opacity: 1;
-            }
-        }
-
-        > .__title {
-            border: 1px solid transparent;
-            font-weight: 700;
-            &:hover {
-                border-color: @inputBorder;
-            }
-        }
-        > .__remove {
-            opacity: 0;
-
-            position: relative;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            
-            color: @ui-action-discreet-type;
-            background-color: @ui-action-discreet;
-            font-weight: bold;
-            padding: 5px 15px;
-
-            border-radius: @baseBorderRadius;
-            box-sizing: border-box;
-
-            transition: opacity 120ms, color 120ms, background-color 120ms;
-            
-            &:not([disabled]):hover {
-                color: @ui-action-discreet-type-hover;
-                background-color: @ui-action-discreet-hover;
-                text-decoration: none;
-                z-index: 1;
-            }
-        }
-    }
-
-    &:focus-within > .__controls,
-    &:hover > .__controls {
-        > .__handle {
-            opacity: 0.5;
-        }
-        > .__remove {
-            opacity: 1;
-        }
-    }
-
-    > .umb-block-card-grid {
-        margin-top: 10px;
-    }
-    
-    &.--sortable-placeholder {
-
-        height: 50px;
-
-        &::after {
-            content: "";
-            position: absolute;
-            background-color:rgba(@ui-drop-area-color, .5);
-            border: 2px solid rgba(@ui-drop-area-color, 1);
-            border-radius: @doubleBorderRadius;
-            box-shadow: 0 0 4px rgba(@ui-drop-area-color, 0.05);
-            top:0;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            animation: umb-block-card--sortable-placeholder 400ms ease-in-out alternate infinite;
-            @keyframes umb-block-card--sortable-placeholder {
-                0%   { opacity: 1; }
-                100% { opacity: 0.5; }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
deleted file mode 100644
index d4c979d511..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div>
-    <div class="__showcase"
-         ng-class="{'--error':vm.elementTypeModel === null}"
-         ng-style="{'background-color': vm.blockConfigModel ? vm.blockConfigModel.backgroundColor : '', 'background-image': vm.styleBackgroundImage}">
-        <div class="__icon">
-            <umb-icon icon="{{vm.icon}}"
-                      ng-attr-style="{{'color:' + vm.blockConfigModel.iconColor}}"
-                      ng-if="vm.blockConfigModel == null || vm.blockConfigModel.thumbnail == null">
-            </umb-icon>
-        </div>
-    </div>
-    <div class="__info" ng-if="vm.elementTypeModel !== null">
-        <div class="__name" ng-bind="vm.elementTypeModel.name"></div>
-        <div class="__subname" ng-if="vm.elementTypeModel.description" ng-bind="vm.elementTypeModel.description"></div>
-    </div>
-    <div class="__info --error" ng-if="vm.elementTypeModel === null">
-        <div class="__name"><localize key="blockEditor_elementTypeDoesNotExistHeadline">Other</localize></div>
-        <div class="__subname"><localize key="blockEditor_elementTypeDoesNotExistDescription">Other</localize></div>
-    </div>
-
-    <ng-transclude></ng-transclude>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less
deleted file mode 100644
index 7be8008b8a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less
+++ /dev/null
@@ -1,159 +0,0 @@
-.umb-block-card, 
-umb-block-card {
-    position: relative;
-    display: inline-block;
-    width: 100%;
-    height: auto;
-    background-color: white;
-    border-radius: @doubleBorderRadius;
-    box-shadow: 0 1px 2px rgba(0,0,0,.2);
-
-    transition: box-shadow 120ms;
-
-    cursor: pointer;
-
-    .umb-outline();
-
-    &:hover {
-        box-shadow: 0 1px 3px rgba(@ui-action-type-hover, .5);
-    }
-
-    &.--isOpen {
-        &::after {
-            content: "";
-            position: absolute;
-            border: 2px solid @ui-active-border;
-            border-radius: @doubleBorderRadius;
-            top:0;
-            bottom: 0;
-            left: 0;
-            right: 0;
-        }
-    }
-
-    &.--sortable-placeholder {
-        &::after {
-            content: "";
-            position: absolute;
-            background-color:rgba(@ui-drop-area-color, .05);
-            border: 2px solid rgba(@ui-drop-area-color, .1);
-            border-radius: @doubleBorderRadius;
-            box-shadow: 0 0 4px rgba(@ui-drop-area-color, 0.05);
-            top:0;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            animation: umb-block-card--sortable-placeholder 400ms ease-in-out alternate infinite;
-            @keyframes umb-block-card--sortable-placeholder {
-                0%   { opacity: 1; }
-                100% { opacity: 0.5; }
-            }
-        }
-        box-shadow: none;
-    }
-
-    .__showcase {
-        position: relative;
-        width: 100%;
-        padding-bottom: (10 / 16 * 100%);
-        background-color: @gray-12;
-        
-        background-size: contain;
-        background-position: 50% 50%;
-        background-repeat: no-repeat;
-        
-        border-top-left-radius: @doubleBorderRadius;
-        border-top-right-radius: @doubleBorderRadius;
-
-        &.--error {
-            border: 2px solid @errorBackground;
-            border-bottom: none;
-            border-top-left-radius: 6px;
-            border-top-right-radius: 6px;
-            box-sizing: border-box;
-        }
-        
-        .__icon {
-            position: absolute;
-            width: 100%;
-            height: 100%;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            font-size:42px;
-        }
-    }
-    
-    .__info {
-        width: 100%;
-        background-color: #fff;
-        padding-top: 10px;
-        padding-bottom: 11px;// 10 + 1 to compentiate for the -1 substraction in margin-bottom.
-        border-bottom-left-radius: @doubleBorderRadius;
-        border-bottom-right-radius: @doubleBorderRadius;
-
-        &.--error {
-            background-color: @errorBackground;
-            .__name, .__subname {
-                color: @errorText;
-            }
-        }
-
-        .__name {
-            font-weight: bold;
-            font-size: 14px;
-            color: @ui-action-type;
-            margin: 0 16px -1px;
-            word-wrap: break-word;
-        }
-        .__subname {
-            color: @gray-4;
-            font-size: 12px;
-            margin: 1px 16px -1px;
-            line-height: 1.5em;
-        }
-    }
-
-    &:hover {
-        .__info:not(.--error) {
-            .__name {
-                color: @ui-action-type-hover;
-            }
-        }
-    }
-
-    .__actions {
-        position: absolute;
-        top: 10px;
-        right: 10px;
-        opacity: 0;
-        transition: opacity 120ms;
-        display: flex;
-        gap: 5px;
-
-        > div {
-            position: relative;
-        }
-
-        .__action {
-            display: inline-flex;
-            justify-content: center;
-            align-items: center;
-            border-radius: 50%;
-            width: 28px;
-            height: 28px;
-            background-color: white;
-            color: @ui-action-type;
-
-            &:hover {
-                color: @ui-action-type-hover;
-            }
-        }
-    }
-    &:hover, &:focus, &:focus-within {
-        .__actions {
-            opacity: 1;
-        }
-    }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js
deleted file mode 100644
index edcec632db..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js
+++ /dev/null
@@ -1,61 +0,0 @@
-(function () {
-    "use strict";
-
-    angular
-        .module("umbraco")
-        .component("umbBlockCard", {
-            templateUrl: "views/components/blockcard/umb-block-card.html",
-            controller: BlockCardController,
-            controllerAs: "vm",
-            transclude: true,
-            bindings: {
-                blockConfigModel: "<?",
-                elementTypeModel: "<"
-            }
-        });
-
-    function BlockCardController($scope, umbRequestHelper, mediaHelper) {
-
-        const vm = this;
-        vm.styleBackgroundImage = "none";
-
-        var unwatch = $scope.$watch("vm.blockConfigModel.thumbnail", (newValue, oldValue) => {
-            if (newValue !== oldValue) {
-                vm.updateThumbnail();
-            }
-        });
-
-        vm.$onInit = function () {
-            vm.updateThumbnail();
-        };
-
-        vm.$onChanges = function () {
-            vm.icon = vm.elementTypeModel ? vm.elementTypeModel.icon : 'icon-block';
-            if (vm.blockConfigModel.iconColor) {
-                // enforce configured icon color for catalogue appearance instead of icon color from element type
-                vm.icon = vm.icon.split(" ")[0];
-            }
-        };
-
-        vm.$onDestroy = function () {
-            unwatch();
-        };
-
-        vm.updateThumbnail = function () {
-            if (vm.blockConfigModel == null || vm.blockConfigModel.thumbnail == null || vm.blockConfigModel.thumbnail === "") {
-                vm.styleBackgroundImage = "none";
-                return;
-            }
-
-            var path = umbRequestHelper.convertVirtualToAbsolutePath(vm.blockConfigModel.thumbnail);
-            if (path.toLowerCase().endsWith(".svg") === false) {
-
-              path = mediaHelper.getThumbnailFromPath(path);
-            }
-
-            vm.styleBackgroundImage = `url('${path}')`;
-        };
-
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-ellipsis.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-ellipsis.html
deleted file mode 100644
index e89d4dfe48..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-ellipsis.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<button
-    type="button"
-    data-element="{{vm.element}}"
-    class="btn-reset umb-button-ellipsis {{vm.cssClass}}"
-    style="color:{{vm.color}};"
-    ng-class="{'umb-button-ellipsis--hidden': vm.state === 'hidden', 'show-text': vm.showText, 'umb-button-ellipsis--tab' : vm.mode === 'tab', 'umb-button-ellipsis--small' : vm.mode === 'small'}"
-    ng-click="vm.clickButton($event)">
-    <span class="umb-button-ellipsis__content">
-        <span class="umb-button-ellipsis__icon" aria-hidden="true">&bull;&bull;&bull;</span>
-        <span class="umb-button-ellipsis__text" ng-class="{'sr-only': vm.showText !== true}">{{vm.text}}</span>
-    </span>
-    <ng-transclude></ng-transclude>
-</button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
deleted file mode 100644
index f47b00913d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="btn-group umb-button-group" ng-class="{ 'dropup': direction === 'up', '-with-button-group-toggle': subButtons.length > 0, 'btn-group-justified': blockElement }">
-   <umb-button
-      ng-if="defaultButton"
-      alias="{{defaultButton.alias ? defaultButton.alias : 'groupPrimary' }}"
-      type="{{defaultButton.type}}"
-      action="defaultButton.handler()"
-      href="{{defaultButton.href}}"
-      href-target="{{defaultButton.hrefTarget}}"
-      button-style="{{buttonStyle}}"
-      state="state"
-      label="{{defaultButton.labelKey}}"
-      label-key="{{defaultButton.labelKey}}"
-      shortcut="{{defaultButton.hotKey}}"
-      shortcut-when-hidden="{{defaultButton.hotKeyWhenHidden}}"
-      size="{{size}}"
-      icon="{{icon}}"
-      add-ellipsis={{defaultButton.addEllipsis}}
-      disabled="disabled">
-   </umb-button>
-
-   <button
-      type="button"
-      data-element="button-group-toggle"
-      class="btn {{toggleStyle}} dropdown-toggle umb-button-group__toggle {{size ? 'umb-button--' + size : undefined}}"
-      ng-if="subButtons.length > 0"
-      ng-click="toggleDropdown()"
-      aria-haspopup="true"
-      aria-expanded="{{dropdown.isOpen}}"
-      ng-disabled="disabled">
-         <span class="caret">
-            <span class="sr-only">
-               <localize key="{{labelKey}}">{{label}}</localize>
-            </span>
-         </span>
-   </button>
-
-    <umb-dropdown
-         ng-if="subButtons.length > 0 && dropdown.isOpen"
-         class="umb-button-group__sub-buttons"
-         on-close="closeDropdown()"
-         deep-blur="closeDropdown()"
-         ng-class="{'-align-right': float === 'right'}">
-      <umb-dropdown-item ng-repeat="subButton in subButtons">
-         <button
-            type="button"
-            data-element="{{subButton.alias ? 'button-' + subButton.alias : 'button-group-secondary-' + $index }}"
-            ng-click="executeMenuItem(subButton)"
-            hotkey="{{subButton.hotKey}}"
-            hotkey-when-hidden="{{subButton.hotKeyWhenHidden}}"
-            ng-disabled="disabled">
-               <localize ng-if="subButton.labelKey" key="{{subButton.labelKey}}">{{subButton.labelKey}}</localize>
-               <span ng-if="subButton.label">{{subButton.label}}</span>
-               <span ng-if="subButton.addEllipsis === 'true'">...</span>
-         </button>
-      </umb-dropdown-item>
-   </umb-dropdown>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
deleted file mode 100644
index 365aad3817..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<div class="umb-button" ng-class="{'ml0': vm.generalActions, 'umb-button--block': vm.blockElement}" data-element="{{ vm.alias ? 'button-' + vm.alias : '' }}">
-
-    <div ng-if="vm.innerState">
-        <umb-icon icon="icon-check" class="umb-button__success" ng-class="{'-hidden': vm.innerState !== 'success', '-white': vm.isPrimaryButtonStyle, '-black': vm.buttonStyle === 'outline'}"></umb-icon>
-        <umb-icon icon="icon-delete" class="umb-button__error" ng-class="{'-hidden': vm.innerState !== 'error', '-white': vm.isPrimaryButtonStyle, '-black': vm.buttonStyle === 'outline'}"></umb-icon>
-        <div class="umb-button__progress" ng-class="{'-hidden': vm.innerState !== 'busy', '-white': vm.isPrimaryButtonStyle, '-black': vm.buttonStyle === 'outline'}"></div>
-        <div ng-if="vm.innerState !== 'init'" class="umb-button__overlay"></div>
-    </div>
-
-    <a ng-if="vm.type === 'link'"
-        ng-href="{{vm.href}}"
-        ng-attr-target="{{(vm.hrefTarget) ? vm.hrefTarget : undefined}}"
-        class="btn umb-button__button {{vm.style}} umb-button--{{vm.size}} umb-outline"
-        ng-click="vm.clickButton($event)"
-        hotkey="{{vm.shortcut}}"
-        hotkey-when-hidden="{{vm.shortcutWhenHidden}}">
-        <span class="umb-button__content" ng-class="{'-hidden': vm.innerState !== 'init'}">
-            <umb-icon icon="{{vm.icon}}" class="umb-button__icon" ng-if="vm.icon"></umb-icon>
-            {{vm.buttonLabel}}
-            <span ng-if="vm.showCaret" class="umb-button__caret caret" aria-hidden="true"></span>
-        </span>
-    </a>
-
-    <button
-        ng-if="vm.type === 'button'"
-        type="button"
-        class="btn umb-button__button {{vm.style}} umb-button--{{vm.size}} umb-outline"
-        ng-click="vm.clickButton($event)"
-        hotkey="{{vm.shortcut}}"
-        hotkey-when-hidden="{{vm.shortcutWhenHidden}}"
-        ng-disabled="vm.disabled"
-        umb-auto-focus="{{vm.autoFocus && !vm.disabled ? 'true' : 'false'}}"
-        aria-haspopup="{{vm.hasPopup}}"
-        aria-expanded="{{vm.isExpanded}}">
-        <span class="umb-button__content" ng-class="{'-hidden': vm.innerState !== 'init'}">
-            <umb-icon icon="{{vm.icon}}" class="umb-button__icon" ng-if="vm.icon"></umb-icon>
-            {{vm.buttonLabel}}
-            <span ng-if="vm.showCaret" class="umb-button__caret caret" aria-hidden="true"></span>
-        </span>
-    </button>
-
-    <button
-        ng-if="vm.type === 'submit'"
-        type="submit"
-        class="btn umb-button__button {{vm.style}} umb-button--{{vm.size}} umb-outline"
-        hotkey="{{vm.shortcut}}"
-        hotkey-when-hidden="{{vm.shortcutWhenHidden}}"
-        ng-disabled="vm.disabled"
-        umb-auto-focus="{{vm.autoFocus && !vm.disabled ? 'true' : 'false'}}">
-        <span class="umb-button__content" ng-class="{'-hidden': vm.innerState !== 'init'}">
-            <umb-icon icon="{{vm.icon}}" class="umb-button__icon" ng-if="vm.icon"></umb-icon>
-            {{vm.buttonLabel}}
-            <span ng-if="vm.showCaret" class="umb-button__caret caret" aria-hidden="true"></span>
-        </span>
-    </button>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle-group.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle-group.html
deleted file mode 100644
index 637404718b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle-group.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="umb-toggle-group">
-    <div class="umb-toggle-group-item" ng-repeat="item in items" ng-class="{'umb-toggle-group-item--disabled': item.disabled}">
-        <umb-toggle class="umb-toggle-group-item__toggle"
-                    checked="item.checked"
-                    disabled="item.disabled"
-                    input-id="{{item.inputId}}"
-                    aria-labelledby="{{item.labelId}}"
-                    on-click="change(item)">
-        </umb-toggle>
-        <div class="umb-toggle-group-item__content" ng-click="change(item)">
-            <div><label id="{{item.labelId}}" for="{{item.inputId}}">{{ item.name }}</label> </div>
-            <div class="umb-toggle-group-item__description">{{ item.description }}</div>
-        </div>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
deleted file mode 100644
index b0953406db..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<button role="checkbox" aria-checked="{{checked}}" ng-click="click($event)" type="button" class="umb-toggle" ng-disabled="disabled" ng-class="{'umb-toggle--checked': checked, 'umb-toggle--disabled': disabled}" id="{{inputId}}">
-    
-    <span ng-if="!labelPosition && showLabels === 'true' || labelPosition === 'left' && showLabels === 'true'">
-        <span class="umb-toggle__label umb-toggle__label--left">{{ checked ? displayLabelOn : displayLabelOff }}</span>
-    </span>
-
-    <div class="umb-toggle__toggle">
-        <umb-icon ng-show="hideIcons !== 'true'" icon="icon-check" class="umb-toggle__icon umb-toggle__icon--left"></umb-icon>
-        <umb-icon ng-show="hideIcons !== 'true'" icon="icon-wrong" class="umb-toggle__icon umb-toggle__icon--right"></umb-icon>
-        <div class="umb-toggle__handler"></div>
-    </div>
-
-    <span ng-if="labelPosition === 'right' && showLabels === 'true'">
-        <span class="umb-toggle__label umb-toggle__label--right">{{ checked ? displayLabelOn : displayLabelOff }}</span>
-    </span>
-
-</button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
deleted file mode 100644
index 97ecb95f31..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<div>
-
-    <umb-load-indicator ng-if="page.loading"></umb-load-indicator>
-
-    <form name="contentForm" ng-submit="save()" novalidate val-form-manager>
-
-        <umb-editor-view ng-if="!page.loading">
-
-            <umb-variant-content-editors
-                page="page"
-                content="content"
-                culture="culture"
-                segment="segment"
-                on-select-app="appChanged(app)"
-                on-select-app-anchor="appAnchorChanged(app, anchor)"
-                on-back="onBack()"
-                show-back="!(infiniteModel && infiniteModel.infiniteMode)">
-            </umb-variant-content-editors>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-left>
-
-                    <umb-breadcrumbs
-                        ng-if="ancestors && ancestors.length > 0"
-                        ancestors="ancestors"
-                        for-new-entity="page.isNew"
-                        entity-type="content">
-                    </umb-breadcrumbs>
-
-                </umb-editor-footer-content-left>
-
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button
-                        ng-if="infiniteModel.infiniteMode"
-                        action="close()"
-                        button-style="link"
-                        label-key="general_close"
-                        shortcut="esc"
-                        type="button"
-                        disabled="page.uploadsInProgress">
-                    </umb-button>
-
-                    <umb-button-group
-                        ng-if="!page.isNew && content.allowPreview && page.showPreviewButton"
-                        button-style="info"
-                        default-button="previewDefaultButton"
-                        sub-buttons="previewSubButtons"
-                        state="page.previewButtonState"
-                        direction="up"
-                        float="right"
-                        disabled="page.uploadsInProgress">
-                    </umb-button-group>
-
-                    <umb-button
-                        ng-if="page.showSaveButton"
-                        alias="save"
-                        type="button"
-                        button-style="{{page.saveButtonStyle}}"
-                        state="page.saveButtonState"
-                        action="save()"
-                        label-key="buttons_save"
-                        shortcut="ctrl+s"
-                        add-ellipsis="{{page.saveButtonEllipsis}}"
-                        disabled="page.uploadsInProgress">
-                    </umb-button>
-
-                    <umb-button-group
-                        ng-if="defaultButton && !content.trashed && !content.isElement"
-                        button-style="success"
-                        default-button="defaultButton"
-                        sub-buttons="subButtons"
-                        state="page.buttonGroupState"
-                        direction="up"
-                        float="right"
-                        label-key="buttons_morePublishingOptions"
-                        label="More publishing options"
-                        disabled="page.uploadsInProgress">
-                    </umb-button-group>
-
-                    <umb-button
-                        ng-if="infiniteModel.infiniteMode && page.allowInfiniteSaveAndClose"
-                        action="saveAndClose(content)"
-                        button-style="primary"
-                        state="saveAndCloseButtonState"
-                        label-key="buttons_saveAndClose"
-                        type="button"
-                        disabled="page.uploadsInProgress">
-                    </umb-button>
-
-                    <umb-button
-                        ng-if="infiniteModel.infiniteMode && page.allowInfinitePublishAndClose"
-                        action="publishAndClose(content)"
-                        button-style="primary"
-                        state="publishAndCloseButtonState"
-                        label-key="buttons_publishAndClose"
-                        type="button"
-                        disabled="page.uploadsInProgress">
-                    </umb-button>
-
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-
-        </umb-editor-view>
-
-    </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
deleted file mode 100644
index 8b80328ba7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
+++ /dev/null
@@ -1,188 +0,0 @@
-<div class="umb-package-details">
-
-    <div class="umb-package-details__main-content">
-
-        <umb-box ng-if="currentUrls" data-element="node-info-urls">
-            <umb-box-header title-key="general_links"></umb-box-header>
-            <umb-box-content class="block-form">
-                <ul class="nav nav-stacked mb0">
-                    <li ng-repeat="url in currentUrls">
-                        <a href="{{url.text}}" target="_blank" rel="noopener" ng-if="url.isUrl" class="umb-outline">
-                            <span ng-if="currentUrlsHaveMultipleCultures && url.culture" style="font-size: 13px; color: #cccccc; width: 55px;display: inline-block">{{url.culture}}</span>
-                            <umb-icon icon="icon-out" class="icon"></umb-icon>
-                            <span>{{url.text}}</span>
-                        </a>
-                        <div ng-if="!url.isUrl" style="margin-top: 4px;">
-                            <span ng-if="currentUrlsHaveMultipleCultures && url.culture" style="font-size: 13px; color: #cccccc; width: 55px;display: inline-block">{{url.culture}}</span>
-                            <em>{{url.text}}</em>
-                        </div>
-                    </li>
-                </ul>
-            </umb-box-content>
-        </umb-box>
-
-        <umb-tracked-references id="node.id" ng-if="loadingReferences" ></umb-tracked-references>
-
-        <umb-box data-element="node-info-redirects" ng-cloak ng-show="!urlTrackerDisabled && hasRedirects">
-            <umb-box-header title-key="redirectUrls_redirectUrlManagement"></umb-box-header>
-            <umb-box-content class="block-form">
-                <div style="position: relative;">
-                    <div ng-if="loadingRedirectUrls" style="background: rgba(255, 255, 255, 0.8); position: absolute; top: 0; left: 0; right: 0; bottom: 0;"></div>
-                    <umb-load-indicator ng-if="loadingRedirectUrls"></umb-load-indicator>
-                    <div ng-show="hasRedirects">
-                        <p><localize key="redirectUrls_panelInformation" class="ng-isolate-scope ng-scope">The following URLs redirect to this content item:</localize></p>
-                        <ul class="nav nav-stacked" style="margin-bottom: 0;">
-                            <li ng-repeat="redirectUrl in redirectUrls">
-                                <a href="{{redirectUrl.originalUrl}}" target="_blank" rel="noopener" class="umb-outline">
-                                    <umb-icon icon="icon-out" class="icon"></umb-icon>
-                                    {{redirectUrl.originalUrl}}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </umb-box-content>
-        </umb-box>
-
-        <umb-box data-element="node-info-history">
-
-            <umb-box-header title-key="{{historyLabelKey}}" ng-if="historyLabelKey">
-                <umb-button
-                    ng-if="node.allowedActions.includes('K')"
-                    ng-hide="node.trashed || node.id === 0"
-                    type="button"
-                    button-style="outline"
-                    action="openRollback()"
-                    label-key="actions_rollback"
-                    size="xs"
-                    add-ellipsis="true">
-                </umb-button>
-            </umb-box-header>
-
-            <umb-box-content class="block-form">
-
-                <div style="position: relative;">
-
-                    <div ng-show="loadingAuditTrail" style="background: rgba(255, 255, 255, 0.8); position: absolute; top: 0; left: 0; right: 0; bottom: 0;"></div>
-                    <umb-load-indicator ng-show="loadingAuditTrail"></umb-load-indicator>
-
-                    <div ng-show="auditTrail.length === 0" style="padding: 10px;">
-                        <umb-empty-state
-                            position="center"
-                            size="small">
-                            <localize key="content_noChanges">No changes have been made</localize>
-                        </umb-empty-state>
-                    </div>
-
-                    <div class="history">
-
-                        <div ng-show="auditTrail.length > 1" class="history-line"></div>
-
-                        <div class="history-item" ng-repeat="item in auditTrail">
-
-                            <div class="history-item__break">
-                                <div class="history-item__avatar">
-                                    <umb-avatar
-                                        color="secondary"
-                                        size="xs"
-                                        name="{{item.userName}}"
-                                        img-src="{{item.userAvatars[3]}}"
-                                        img-srcset="{{item.userAvatars[4]}} 2x, {{item.userAvatars[4]}} 3x">
-                                    </umb-avatar>
-                                </div>
-
-                                <div>
-                                    <div>{{ item.userName }}</div>
-                                    <div class="history-item__date">{{item.timestampFormatted}}</div>
-                                </div>
-                            </div>
-
-                            <div class="history-item__break">
-                                <umb-badge
-                                    class="history-item__badge"
-                                    size="xs"
-                                    color="{{item.logTypeColor}}">
-                                    <localize key="auditTrails_small{{ item.logType }}">{{ item.logType }}</localize>
-                                </umb-badge>
-                                <span class="history-item__description">
-                                    <localize key="auditTrails_{{ item.logType | lowercase }}" tokens="[item.parameters]">{{ item.comment }}</localize>
-                                </span>
-                            </div>
-
-                        </div>
-                    </div>
-
-                </div>
-
-                <div class="flex justify-center">
-                    <umb-pagination ng-if="auditTrailOptions.totalPages > 1"
-                                    page-number="auditTrailOptions.pageNumber"
-                                    total-pages="auditTrailOptions.totalPages"
-                                    on-change="auditTrailPageChange(pageNumber)">
-                    </umb-pagination>
-                </div>
-
-            </umb-box-content>
-        </umb-box>
-    </div>
-
-    <div class="umb-package-details__sidebar">
-
-        <umb-box data-element="node-info-general">
-            <umb-box-header title-key="general_general"></umb-box-header>
-            <umb-box-content class="block-form">
-
-                <umb-control-group data-element="node-info-status" label="@general_status">
-                    <umb-badge size="xs" color="{{status.color}}">
-                        <umb-variant-state variant="currentVariant"></umb-variant-state>
-                    </umb-badge>
-                </umb-control-group>
-
-                <umb-control-group ng-show="node.id !== 0" data-element="node-info-create-date" label="@template_createdDate">
-                    {{currentVariant.createDateFormatted}}
-                </umb-control-group>
-
-                <umb-control-group ng-show="node.id !== 0 && currentVariant.releaseDateFormatted" data-element="node-info-publish-date" label="@content_releaseDate">
-                    {{currentVariant.releaseDateFormatted}}
-                </umb-control-group>
-
-                <umb-control-group ng-show="node.id !== 0 && currentVariant.expireDateFormatted" data-element="node-info-expire-date" label="@content_expireDate">
-                    {{currentVariant.expireDateFormatted}}
-                </umb-control-group>
-
-                <umb-control-group data-element="node-info-document-type" label="@content_documentType">
-                    <umb-node-preview
-                        style="min-width: 100%; margin-bottom: 0;"
-                        icon="node.icon"
-                        name="node.contentTypeName"
-                        alias="documentType.alias"
-                        allow-open="allowChangeDocumentType"
-                        on-open="openDocumentType(documentType)">
-                    </umb-node-preview>
-                </umb-control-group>
-
-                <umb-control-group ng-if="disableTemplates == false" data-element="node-info-template" label="@template_template" alias="template">
-
-                    <div class="flex items-center">
-                        <select class="input-block-level mb0"
-                                id="template"
-                                ng-model="node.template"
-                                ng-options="key as value for (key, value) in availableTemplates"
-                                ng-change="updateTemplate(node.template)">
-                            <option value="">{{chooseLabel}}...</option>
-                        </select>
-                        <button type="button" ng-show="allowChangeTemplate && node.template !== null" class="umb-node-preview__action" style="margin-left:15px;" ng-click="openTemplate()">
-                            <localize key="general_open">Open</localize><span class="sr-only">&nbsp;{{node.template}} <localize key="template_template">Template</localize></span>
-                        </button>
-                    </div>
-                </umb-control-group>
-
-                <umb-control-group ng-show="node.id !== 0" data-element="node-info-id" label="Id">
-                    <div>{{ node.id }}</div>
-                    <small>{{ node.key }}</small>
-                </umb-control-group>
-
-            </umb-box-content>
-        </umb-box>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
deleted file mode 100644
index 2dd0b83130..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<div>
-    <ng-form name="tabbedContentForm">
-
-        <!-- TABS GO HERE -->
-        <umb-editor-tab-bar ng-if="tabs.length > 0">
-            <umb-tabs-nav tabs="tabs" on-tab-change="setActiveTab(tab)"></umb-tabs-nav>
-        </umb-editor-tab-bar>
-
-        <!-- TABS CONTENT GO HERE -->
-        <umb-box ng-repeat="tab in tabs track by tab.key" ng-show="tab.alias === activeTabAlias && tab.properties.length > 0">
-            <umb-box-content role="tabpanel" id="tabpanel-{{tab.alias}}" aria-labelledby="tab-{{tab.alias}}" data-element="tab-content-{{tab.alias}}">
-                <umb-property
-                    data-element="property-{{property.alias}}"
-                    ng-repeat="property in tab.properties track by property.alias"
-                    property="property"
-                    node="contentNodeModel"
-                    show-inherit="contentNodeModel.variants.length > 1 && property.variation !== 'CultureAndSegment'"
-                    inherits-from="defaultVariant.displayName">
-
-                    <umb-property-editor
-                        model="property"
-                        node="contentNodeModel"
-                        preview="((property.readonly || !allowUpdate) && !property.supportsReadOnly) || (propertyEditorDisabled(property) && allowUpdate)"
-                        allow-unlock="!property.readonly && allowUpdate && allowEditInvariantFromNonDefault"
-                        on-unlock="unlockInvariantValue(property)"
-                        ng-attr-readonly="{{property.readonly || !allowUpdate || undefined}}">
-                    </umb-property-editor>
-
-                </umb-property>
-            </umb-box-content>
-        </umb-box>
-
-        <div class="umb-group-panel"
-            retrive-dom-element="registerPropertyGroup(element[0], attributes.appAnchor)"
-            data-app-anchor="{{group.id}}"
-            data-element="group-{{group.alias}}"
-            ng-repeat="group in content.tabs track by group.key"
-            ng-if="group.type === 'Group'"
-            ng-show="group.parentAlias === activeTabAlias || tabs.length === 0">
-
-            <div class="umb-group-panel__header">
-                <div id="group-{{group.id}}"><h2>{{ group.label }}</h2></div>
-            </div>
-
-            <div class="umb-group-panel__content" data-element="tab-content-{{group.type === 'Group' ? group.parentAlias : group.alias}}">
-                <umb-property
-                    data-element="property-{{property.alias}}"
-                    ng-repeat="property in group.properties track by property.alias"
-                    property="property"
-                    node="contentNodeModel"
-                    show-inherit="contentNodeModel.variants.length > 1 && property.variation !== 'CultureAndSegment'"
-                    inherits-from="defaultVariant.displayName">
-
-                    <umb-property-editor
-                        model="property"
-                        node="contentNodeModel"
-                        preview="((property.readonly || !allowUpdate) && !property.supportsReadOnly) || (propertyEditorDisabled(property) && allowUpdate)"
-                        allow-unlock="!property.readonly && allowUpdate && allowEditInvariantFromNonDefault"
-                        on-unlock="unlockInvariantValue(property)"
-                        ng-attr-readonly="{{property.readonly || !allowUpdate || undefined}}">
-                    </umb-property-editor>
-
-                </umb-property>
-            </div>
-        </div>
-
-        <umb-empty-state
-            ng-if="content.tabs.length === 0"
-            position="center">
-            <localize key="content_noProperties">No content can be added for this item</localize>
-        </umb-empty-state>
-
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content-editors.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content-editors.html
deleted file mode 100644
index 247453c604..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content-editors.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="umb-split-views">
-    <div class="umb-split-view"
-         ng-repeat="editor in vm.editors track by editor.compositeId">
-
-        <umb-variant-content
-            page="vm.page"
-            content="vm.content"
-            editor="editor"
-            editor-index="$index"
-            editor-count="vm.editors.length"
-            on-open-split-view="vm.openSplitView(variant)"
-            on-close-split-view="vm.closeSplitView($index)"
-            on-select-variant="vm.selectVariant(variant, $index)"
-            on-select-app="vm.selectApp(app)"
-            on-select-app-anchor="vm.selectAppAnchor(app, anchor)"
-            on-back="vm.onBack()"
-            show-back="vm.showBack">
-        </umb-variant-content>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
deleted file mode 100644
index 80f0a2064c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div>
-    <umb-load-indicator
-        ng-if="vm.editor.loading">
-    </umb-load-indicator>
-
-    <div class="umb-split-view__content" ng-show="!vm.editor.loading">
-
-        <ng-form name="contentHeaderForm" ng-if="vm.content.apps.length > 0">
-            <umb-editor-content-header
-                menu="vm.page.menu"
-                hide-actions-menu="vm.page.hideActionsMenu"
-                disable-actions-menu="vm.disableActionsMenu"
-                name="vm.editor.content.name"
-                name-disabled="vm.nameDisabled"
-                name-readonly="vm.nameReadonly"
-                editor="vm.editor"
-                content="vm.content"
-                on-select-navigation-item="vm.selectApp(item)"
-                on-select-anchor-item="vm.selectAppAnchor(item, anchor)"
-                hide-change-variant="vm.page.hideChangeVariant"
-                show-back-button="vm.showBackButton()"
-                on-back="vm.onBack()"
-                split-view-open="vm.editorCount > 1"
-                on-open-in-split-view="vm.openSplitView(variant)"
-                on-close-split-view="vm.onCloseSplitView()"
-                on-select-variant="vm.selectVariant(variant)"
-                server-validation-name-field="{{'Variants[' + vm.editorIndex + '].Name'}}">
-            </umb-editor-content-header>
-        </ng-form>
-
-        <umb-editor-container ng-if="vm.content.apps.length > 0">
-
-            <!-- Deleted Context Message Bar (Displayed when viewing node in recycle bin) -->
-            <div ng-show="vm.content.trashed" class="umb-editor--trashed-message">
-                <umb-icon icon="icon-trash" class="icon"></umb-icon> <localize key="content_nodeIsInTrash">This item is in the Recycle Bin</localize>
-            </div>
-
-            <div class="umb-editor-sub-views">
-                <div ng-repeat="app in vm.editor.variantApps track by app.alias">
-                    <umb-editor-sub-view model="app" content="vm.content" variant-content="vm.editor.content">
-                    </umb-editor-sub-view>
-                </div>
-            </div>
-        </umb-editor-container>
-
-        <umb-empty-state
-            ng-if="vm.content.apps.length === 0"
-            position="center">
-            <localize key="content_noProperties">No content can be added for this item</localize>
-        </umb-empty-state>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-notification-list.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-notification-list.html
deleted file mode 100644
index d1ddcdb1dd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-notification-list.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<span class="db" ng-repeat="notification in vm.notifications">
-    <!-- These are server side notifications for messages, generally success/warning, validation messages handled separately -->
-    <!-- Success = 3, Error = 2, Warning = 4 -->
-    <span class="db umb-list-item__description"
-          ng-class="{'text-success': notification.type === 3, 'text-error': notification.type === 2 || notification.type === 4}">
-        {{notification.message}}
-    </span>
-</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-state.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-state.html
deleted file mode 100644
index 1e73155d5c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-state.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<span ng-switch="vm.variant.state">
-    <span ng-switch-when="NotCreated"><localize key="content_notCreated">Not created</localize></span>
-    <span ng-switch-when="Draft"><localize key="content_unpublished">Unpublished</localize></span>
-    <span ng-switch-when="PublishedPendingChanges"><localize key="content_publishedPendingChanges">Published (pending changes)</localize></span>
-    <span ng-switch-when="Published"><localize key="content_published">Published</localize></span>
-</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-group.html b/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-group.html
deleted file mode 100644
index 911ef54035..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-group.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<div data-element="group-{{vm.group.name}}" class="umb-group-builder__group" ng-class="{'-inherited': vm.group.inherited, 'umb-group-builder__group-handle -sortable': vm.sorting && !vm.group.inherited}" tabindex="0" ng-focus="vm.whenFocus()">
-    <div class="umb-group-builder__group-title-wrapper" ng-if="vm.allowName" data-element="{{vm.valTabAlias}}">
-
-        <ng-form name="groupNameForm" data-element="group-name" class="flx-g1">
-            <div class="umb-group-builder__group-title control-group -no-margin" ng-class="{'-inherited': vm.group.inherited}">
-                <umb-icon icon="icon-navigation"
-                          class="umb-group-builder__group-title-icon"
-                          ng-if="vm.sorting && !vm.group.inherited">
-                </umb-icon>
-                <input data-element="group-name-field"
-                        class="umb-group-builder__group-title-input w-100"
-                        type="text"
-                        localize="placeholder"
-                        placeholder="@placeholders_entername"
-                        name="groupName"
-                        title="{{vm.group.alias}}"
-                        ng-model="vm.group.name"
-                        ng-class="{'-placeholder': vm.group.name == ''}"
-                        ng-change="vm.updateName(vm.group)"
-                        ng-disabled="vm.group.inherited"
-                        umb-auto-focus
-                        ng-focus="vm.whenNameFocus()"
-                        required
-                        val-server-field="{{vm.valServerFieldName}}"
-                        no-password-manager />
-
-                <div class="umb-group-builder__group-title-val-message" ng-messages="groupNameForm.groupName.$error" show-validation-on-submit>
-                    <div class="umb-validation-label -arrow-left" ng-message="valServerField">{{groupNameForm.groupName.errorMsg}}</div>
-                    <div class="umb-validation-label -arrow-left" ng-message="required"><localize key="required">Required</localize></div>
-                </div>
-            </div>
-        </ng-form>
-
-        <div class="umb-group-builder__group-title-right">
-            <div class="umb-group-builder__group-inherited-label" ng-if="vm.group.inherited">
-                <umb-icon icon="icon-merge" class="icon"></umb-icon>
-                <localize key="contentTypeEditor_inheritedFrom">Inherited from</localize>: {{ vm.group.inheritedFromName }}
-                <span ng-repeat="contentTypeName in vm.group.parentTabContentTypeNames">
-                    <button type="button" class="btn-link btn-small p0" ng-click="vm.clickComposition(vm.group.parentTabContentTypes[$index])">{{ contentTypeName }}</button>
-                    <span ng-if="!$last">, </span>
-                </span>
-            </div>
-
-            <ng-form name="groupSortOrderForm" class="umb-group-builder__group-sort-order">
-                <div ng-if="vm.sorting">
-                    <input name="groupSortOrder" type="number" class="umb-property-editor-tiny" style="margin-bottom: 0;" ng-model="vm.group.sortOrder" ng-disabled="vm.group.inherited" ng-blur="vm.changeSortOrderValue()" required />
-
-                    <!-- This is a manual validation message not bound to a validator -->
-                    <div class="umb-validation-label -arrow-left" ng-if="groupSortOrderForm.groupSortOrder.$error.required && tab.showSortOrderMissing"><localize key="required">Required</localize></div>
-                    <div ng-messages="groupSortOrderForm.groupSortOrder.$error" show-validation-on-submit>
-                        <div class="umb-validation-label -arrow-left" ng-message="required"><localize key="required">Required</localize></div>
-                    </div>
-                </div>
-            </ng-form>
-        </div>
-
-        <div class="umb-group-builder__group-remove" ng-if="vm.allowRemove">
-            <umb-icon icon="icon-trash" ng-click="vm.removeGroup()"></umb-icon>
-        </div>
-    </div>
-
-    <div class="umb-group-builder__group-content">
-        <ng-transclude></ng-transclude>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-groups.html b/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-groups.html
deleted file mode 100644
index 0b73daa4bb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-groups.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-group-builder__groups" ng-transclude></div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-property.html b/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-property.html
deleted file mode 100644
index 9166f0c8ab..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-property.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<div data-element="property-{{vm.property.alias}}" class="umb-group-builder__property" ng-class="{'-active': vm.dialogIsOpen, '-active': vm.property.propertyState=='active', '-inherited': vm.property.inherited, '-locked': vm.property.locked, 'umb-group-builder__property-handle -sortable': vm.sortable && !vm.property.inherited, '-sortable-locked': vm.sortable && vm.property.inherited}">
-
-  <!-- property meta text -->
-  <div class="umb-group-builder__property-meta" ng-class="{'-full-width': vm.sortable}" data-element="{{vm.valTabAlias}}">
-
-    <ng-form name="propertyTypeForm">
-      <div class="control-group -no-margin" ng-if="!vm.sortable">
-
-        <div class="umb-group-builder__property-meta-alias umb-locked-field__text cursor-not-allowed" style="padding-left: 1px" ng-if="vm.property.inherited || vm.property.locked">{{ vm.property.alias }}</div>
-        <umb-locked-field ng-if="!vm.property.inherited && !vm.property.locked"
-                          locked="locked"
-                          ng-model="vm.property.alias"
-                          placeholder-text="'Alias...'"
-                          server-validation-field="{{ vm.valServerFieldAlias }}">
-        </umb-locked-field>
-
-        <div class="umb-group-builder__property-meta-label">
-          <textarea localize="placeholder"
-                    placeholder="@placeholders_label"
-                    ng-model="vm.property.label"
-                    ng-disabled="vm.property.inherited || vm.property.locked"
-                    name="groupName"
-                    umb-auto-resize
-                    required
-                    val-server-field="{{ vm.valServerFieldLabel }}">
-                  </textarea>
-
-          <div ng-messages="propertyTypeForm.groupName.$error" show-validation-on-submit>
-            <div class="umb-validation-label" ng-message="valServerField">{{propertyTypeForm.groupName.errorMsg}}</div>
-            <div class="umb-validation-label" ng-message="required"><localize key="contentTypeEditor_requiredLabel">Required label</localize></div>
-          </div>
-
-        </div>
-
-        <div class="umb-group-builder__property-meta-description">
-          <textarea localize="placeholder"
-                    placeholder="@placeholders_enterDescription"
-                    ng-model="vm.property.description"
-                    ng-disabled="vm.property.inherited || vm.property.locked"
-                    umb-auto-resize>
-                  </textarea>
-        </div>
-      </div>
-    </ng-form>
-
-    <div ng-if="vm.sortable" class="flex items-center">
-      <umb-icon icon="icon-navigation" class="icon" ng-if="!vm.property.inherited" style="margin-right: 10px;"></umb-icon>
-      <span class="umb-group-builder__property-meta-label">{{ vm.property.label }}</span>
-      <span class="umb-group-builder__property-meta-alias" style="margin-bottom: 0; margin-left: 5px; margin-top: 1px;">({{ vm.property.alias }})</span>
-      <input name="propertySortOrder" type="number" class="umb-group-builder__group-sort-value umb-property-editor-tiny" ng-model="vm.property.sortOrder" ng-disabled="vm.property.inherited" ng-blur="vm.changeSortOrderValue()" />
-    </div>
-
-  </div>
-
-
-  <div tabindex="-1" class="umb-group-builder__property-preview" ng-if="!vm.sortable" ng-class="{'-not-clickable': !vm.sortable && (vm.property.inherited || vm.property.locked)}">
-
-    <div class="umb-group-builder__property-tags">
-
-      <span class="umb-group-builder__property-tag -white">
-        <span ng-if="vm.property.dataTypeName !== undefined">{{vm.property.dataTypeName}}</span>
-        <span ng-if="vm.property.dataTypeName == undefined"><localize key="general_preview">Preview</localize></span>
-      </span>
-
-      <div class="umb-group-builder__property-tag -white" ng-if="vm.property.validation.mandatory">
-        <span class="umb-group-builder__property-tag-icon">*</span>
-        <localize key="general_mandatory">Mandatory</localize>
-      </div>
-
-      <div class="umb-group-builder__property-tag -white" ng-if="vm.property.showOnMemberProfile">
-        <umb-icon icon="icon-eye" class="umb-group-builder__property-tag-icon"></umb-icon>
-        <localize key="contentTypeEditor_showOnMemberProfile">Show on member profile</localize>
-      </div>
-
-      <div class="umb-group-builder__property-tag -white" ng-if="vm.property.memberCanEdit">
-        <umb-icon icon="icon-edit" class="umb-group-builder__property-tag-icon"></umb-icon>
-        <localize key="contentTypeEditor_memberCanEdit">Member can edit</localize>
-      </div>
-
-      <div class="umb-group-builder__property-tag -white" ng-if="vm.property.isSensitiveData">
-        <umb-icon icon="icon-lock" class="umb-group-builder__property-tag-icon"></umb-icon>
-        <localize key="contentTypeEditor_isSensitiveData">Is sensitive data</localize>
-      </div>
-
-      <div class="umb-group-builder__property-tag -white" ng-if="vm.property.allowCultureVariant">
-        <umb-icon icon="icon-shuffle" class="umb-group-builder__property-tag-icon"></umb-icon>
-        <localize key="contentTypeEditor_cultureVariantLabel">Vary by culture</localize>
-      </div>
-
-      <div class="umb-group-builder__property-tag -white" ng-if="vm.property.allowSegmentVariant">
-        <umb-icon icon="icon-shuffle" class="umb-group-builder__property-tag-icon"></umb-icon>
-        <localize key="contentTypeEditor_segmentVariantLabel">Vary by segments</localize>
-      </div>
-
-    </div>
-
-    <div class="umb-group-builder__property-tags -right">
-      <div class="umb-group-builder__property-tag" ng-if="vm.property.inherited">
-        <umb-icon icon="icon-merge" class="umb-group-builder__property-tag-icon"></umb-icon>
-        <span style="margin-right: 3px"><localize key="contentTypeEditor_inheritedFrom">Inherited from</localize></span>
-        <button type="button" class="btn btn-small btn-link p0" ng-click="vm.clickComposition(vm.property.contentTypeId)">
-          {{vm.property.contentTypeName}}
-        </button>
-      </div>
-
-      <div class="umb-group-builder__property-tag" ng-if="vm.property.locked">
-        <umb-icon icon="icon-lock" class="umb-group-builder__property-tag-icon"></umb-icon>
-        <localize key="general_locked">Locked</localize>
-      </div>
-    </div>
-
-    <ng-form inert class="umb-group-builder__property-preview-form" name="propertyEditorPreviewForm" umb-disable-form-validation ng-click="vm.edit()" tabindex="-1">
-      <umb-property-editor ng-if="vm.property.view !== undefined"
-                           model="vm.property"
-                           preview="true">
-      </umb-property-editor>
-    </ng-form>
-
-    <button type="button" aria-label="Open settings" class="umb-group-builder__open-settings" ng-if="!vm.property.inherited && !vm.property.locked" ng-click="vm.edit()"></button>
-
-  </div>
-
-  <!-- row tools -->
-  <div class="umb-group-builder__property-actions" ng-if="!vm.sortable">
-
-    <div ng-if="!vm.property.inherited">
-
-      <!-- settings for property -->
-      <div class="umb-group-builder__property-action">
-        <button type="button" aria-label="Open settings" class="btn-icon" ng-click="vm.edit()" localize="title" title="@general_edit">
-          <umb-icon icon="icon-settings"></umb-icon>
-        </button>
-      </div>
-
-      <!-- delete property -->
-      <div ng-if="!vm.property.locked" class="umb-group-builder__property-action">
-        <button type="button" aria-label="Delete property" class="btn-icon" ng-click="vm.remove()">
-          <umb-icon icon="icon-trash"></umb-icon>
-        </button>
-      </div>
-
-    </div>
-
-  </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-tab.html b/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-tab.html
deleted file mode 100644
index d2914c69e2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-tab.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<div
-    ng-click="vm.click()"
-    class="umb-group-builder__tab"
-    ng-class="{
-        'is-active': vm.isOpen,
-        'is-inherited': vm.tab.inherited,
-        'is-deletable': vm.allowRemove,
-        'umb-group-builder__tab-handle -sortable': vm.sorting && !vm.tab.inherited,
-        'has-error': vm.tab.hasError }"
-    val-tab="vm.tab"
-    ng-mouseenter="vm.mouseenter()"
-    ng-mouseleave="vm.mouseleave()">
-  <div>
-      <div class="umb-group-builder__tab-inherited-label" ng-if="vm.compositionLabelIsVisible">
-          <localize key="contentTypeEditor_inheritedFrom">Inherited from</localize>: {{ vm.tab.inheritedFromName }}
-          <span ng-repeat="contentTypeName in vm.tab.parentTabContentTypeNames">
-              <button type="button" class="btn-link btn-small p0" ng-click="vm.clickComposition(vm.tab.parentTabContentTypes[$index])">{{ contentTypeName }}</button>
-              <span ng-if="!$last">, </span>
-          </span>
-      </div>
-      <div class="umb-group-builder__tab-title-wrapper">
-            <umb-icon icon="icon-navigation"
-                      class="umb-group-builder__tab-title-icon"
-                      ng-if="vm.sorting && !vm.tab.inherited">
-            </umb-icon>
-            <umb-icon icon="icon-merge"
-                      class="umb-group-builder__tab-title-icon"
-                      ng-if="vm.tab.inherited">
-            </umb-icon>
-            <ng-form name="tabNameForm" data-element="tab-name">
-                <div class="umb-group-builder__tab-name" ng-if="vm.tab.inherited || !vm.isOpen" title="{{vm.tab.alias}}">{{ vm.tab.name }}</div>
-                <input
-                    ng-if="!vm.tab.inherited && vm.isOpen"
-                    class="umb-group-builder__group-title-input"
-                    data-element="tab-name-field"
-                    type="text"
-                    localize="placeholder"
-                    placeholder="@placeholders_entername"
-                    name="tabName"
-                    title="{{vm.tab.alias}}"
-                    ng-model="vm.tab.name"
-                    ng-class="{'-placeholder': vm.tab.name == ''}"
-                    ng-disabled="vm.allowChangeName === false"
-                    ng-change="vm.changeName()"
-                    umb-auto-focus
-                    umb-auto-resize
-                    val-server-field="{{ vm.valServerFieldName }}"
-                    no-password-manager
-                    maxlength="255"
-                    required />
-
-                <div class="umb-group-builder__tab-val-message" ng-messages="tabNameForm.tabName.$error" show-validation-on-submit>
-                    <div class="umb-validation-label" ng-message="valServerField">{{tabNameForm.tabName.errorMsg}}</div>
-                    <div class="umb-validation-label" ng-message="required"><localize key="required">Required</localize></div>
-                </div>
-            </ng-form>
-
-            <div ng-show="vm.tab.hasError && !vm.isOpen" class="badge">!</div>
-
-            <ng-form name="tabSortOrderForm">
-                <div class="umb-group-builder__tab-sort-order" ng-if="vm.sorting">
-                    <input name="tabSortOrder" type="number" class="umb-property-editor-tiny" style="margin-bottom: 0;" ng-model="vm.tab.sortOrder" ng-disabled="vm.tab.inherited" ng-blur="vm.changeSortOrderValue()" required />
-
-                    <!-- This is a manual validation message not bound to a validator -->
-                    <div class="umb-validation-label -arrow-left" ng-if="tabSortOrderForm.tabSortOrder.$error.required && vm.tab.showSortOrderMissing"><localize key="required">Required</localize></div>
-                    <div ng-messages="tabSortOrderForm.tabSortOrder.$error" show-validation-on-submit>
-                        <div class="umb-validation-label -arrow-left" ng-message="required"><localize key="required">Required</localize></div>
-                    </div>
-                </div>
-            </ng-form>
-      </div>
-  </div>
-  <div class="umb-group-builder__tab-remove" ng-if="vm.allowRemove">
-      <button type="button" class="btn-reset" ng-click="vm.removeTab()">
-          <umb-icon icon="icon-trash"></umb-icon>
-      </button>
-  </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header-content-left.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header-content-left.html
deleted file mode 100644
index 9c5297908b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header-content-left.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-editor-sub-header__content-left" ng-transclude></div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header-content-right.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header-content-right.html
deleted file mode 100644
index 982ea1868a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header-content-right.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-editor-sub-header__content-right" ng-transclude></div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header-section.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header-section.html
deleted file mode 100644
index 1b2ab2e639..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header-section.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-editor-sub-header__section" ng-transclude></div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header.html
deleted file mode 100644
index 140931ec4b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/subheader/umb-editor-sub-header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div
-   class="umb-editor-sub-header umb-editor-sub-header--{{appearance}}"
-   umb-sticky-bar
-   ng-transclude>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-breadcrumbs.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-breadcrumbs.html
deleted file mode 100644
index 1478d1da6f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-breadcrumbs.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<ul class="umb-breadcrumbs">
-    <li class="umb-breadcrumbs__ancestor" ng-repeat="ancestor in ancestors">
-        
-        <!-- go to node on click -->
-        <a ng-if="(!$last || forNewEntity) && !allowOnOpen" ng-href="#{{::pathTo(ancestor)}}" ng-click="openPath(ancestor, $event)" class="umb-breadcrumbs__ancestor-link" title="{{ancestor.name}}">{{ancestor.name}}</a>
-
-        <!-- use callback to handle click -->
-        <a ng-if="(!$last || forNewEntity) && allowOnOpen" href="#" ng-click="open(ancestor)" class="umb-breadcrumbs__ancestor-link" title="{{ancestor.name}}" prevent-default>{{ancestor.name}}</a>
-
-        <span ng-if="(!$last || forNewEntity)" class="umb-breadcrumbs__separator">&#47;</span>
-
-        <span class="umb-breadcrumbs__ancestor-text" ng-if="$last && !forNewEntity" title="{{ancestor.name}}">{{ancestor.name}}</span>
-
-    </li>
-</ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-container.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-container.html
deleted file mode 100644
index 2def207c70..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-container.html
+++ /dev/null
@@ -1,11 +0,0 @@
- <div data-element="editor-container" class="umb-editor-container umb-panel-body umb-scrollable row-fluid">
-
-     <!--This must be contained within a div else transclusion doesn't work when this is loaded dynamically :/ -->
-     <div>
-         <umb-overlay-backdrop></umb-overlay-backdrop>
-     </div>
-     
-     <div class="umb-pane">
-        <div class="umb-pane-content" ng-transclude></div>
-     </div>
- </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
deleted file mode 100644
index 5d69915583..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<div data-element="editor-header" class="umb-editor-header" ng-class="{'-split-view-active': splitViewOpen === true}">
-
-    <div class="flex items-center" style="height: 100%;">
-
-        <div ng-if="showBackButton === true && splitViewOpen !== true" style="margin-right: 15px;">
-            <button type="button" class="umb-editor-header__back" ng-click="goBack()">
-                <umb-icon icon="fa fa-arrow-left"></umb-icon>
-                <span class="sr-only"><localize key="visuallyHiddenTexts_goBack">Go back</localize></span>
-            </button>
-        </div>
-
-        <div class="flex items-center" style="flex: 1;">
-
-            <div id="nameField" class="umb-editor-header__name-and-description" style="flex: 1 1 auto;">
-                <div>
-                    <p tabindex="0" class="sr-only">{{a11yMessage}}</p>
-                </div>
-                <div class="umb-editor-header__name-wrapper">
-                    <label for="headerName" class="sr-only">{{a11yName}}</label>
-                    <ng-form name="headerNameForm">
-                        <input data-element="editor-name-field"
-                               type="text"
-                               class="umb-editor-header__name-input"
-                               localize="placeholder"
-                               placeholder="@placeholders_entername"
-                               name="headerName"
-                               id="headerName"
-                               ng-model="name"
-                               ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
-                               ng-disabled="nameDisabled"
-                               ng-readonly="nameReadonly"
-                               umb-auto-focus
-                               focus-on-filled="true"
-                               val-server-field="{{serverValidationNameField}}"
-                               no-password-manager
-                               required
-                               aria-required="true"
-                               aria-invalid="{{contentForm.headerNameForm.headerName.$invalid ? true : false}}"
-                               autocomplete="off"
-                               maxlength="255" />
-                    </ng-form>
-
-                    <button type="button" ng-if="vm.hasVariants === true && hideChangeVariant !== true" class="umb-variant-switcher__toggle umb-outline" ng-click="toggleDropdown()" ng-class="{'--error': vm.errorsOnOtherVariants}" aria-haspopup="true" aria-expanded="{{vm.dropdownOpen}}">
-                        <span ng-bind="editor.content.displayName"></span>
-                        <umb-icon icon="{{vm.dropdownOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-variant-switcher__expand"></umb-icon>
-                    </button>
-
-                    <span ng-if="vm.hasVariants === true && hideChangeVariant" class="umb-variant-switcher__toggle">
-                        <span ng-bind="editor.content.displayName"></span>
-                    </span>
-
-                    <umb-dropdown ng-if="vm.dropdownOpen" class="umb-variant-switcher" ng-class="{'--has-sub-variants': vm.hasSubVariants === true}" on-close="vm.dropdownOpen = false" umb-keyboard-list>
-                        <umb-dropdown-item
-                            ng-repeat-start="entry in vm.variantMenu track by entry.key"
-                            class="umb-variant-switcher__item"
-                            ng-class="{'--current': entry.variant === editor.content, '--active': entry.variant.active && vm.dropdownOpen, '--error': entry.variant.active !== true && entry.variant.hasError, '--state-notCreated':entry.variant.state==='NotCreated' && entry.variant.name == null, '--state-draft':entry.variant.state==='Draft' || (entry.variant.state==='NotCreated' && entry.variant.name != null)}">
-                            <button type="button" ng-if="entry.subVariants && entry.subVariants.length > 0" class="umb-variant-switcher__item-expand-button umb-outline" ng-click="entry.open = !entry.open">
-                                <umb-icon icon="{{entry.open ? 'icon-navigation-down' : 'icon-navigation-right'}}" class="icon"></umb-icon>
-                            </button>
-                            <button type="button" class="umb-variant-switcher__name-wrapper umb-outline" ng-click="selectVariant($event, entry.variant)">
-                                <span class="umb-variant-switcher__name-content">
-                                    <span class="umb-variant-switcher__name" ng-bind="entry.variant.displayName"></span>
-                                    <span class="umb-variant-switcher__state">
-                                        <umb-variant-state variant="entry.variant"></umb-variant-state>
-                                        <span ng-if="entry.variant.language.isMandatory"> - <localize key="general_mandatory">Mandatory</localize></span>
-                                        <span ng-if="entry.variant.language.isDefault"> - <localize key="general_default">Default</localize></span>
-                                    </span>
-                                </span>
-                            </button>
-                            <div ng-if="splitViewOpen !== true && !entry.variant.active" class="umb-variant-switcher__split-view umb-outline" ng-click="openInSplitView($event, entry.variant)">Open in split view</div>
-                        </umb-dropdown-item>
-                        <div
-                            ng-repeat-end
-                            ng-if="entry.open === true && entry.subVariants && entry.subVariants.length > 0"
-                            class="umb-variant-switcher__sub-variants umb-outline"
-                        >
-                            <umb-dropdown-item
-                                ng-repeat="subVariant in entry.subVariants track by $index"
-                                class="umb-variant-switcher__item"
-                                ng-class="{'--current': subVariant === editor.content, '--active': subVariant.active && vm.dropdownOpen, '--error': subVariant.active !== true && subVariant.hasError, '--state-notCreated':subVariant.state==='NotCreated', '--state-draft':subVariant.state==='Draft'}"
-                            >
-                                <button type="button" class="umb-variant-switcher__name-wrapper umb-outline" ng-click="selectVariant($event, subVariant)">
-                                    <span class="umb-variant-switcher__name-content">
-                                        <span class="umb-variant-switcher__name" ng-bind="subVariant.segment"></span>
-                                        <umb-variant-state variant="subVariant" class="umb-variant-switcher__state"></umb-variant-state>
-                                    </span>
-                                </button>
-                                <div ng-if="splitViewOpen !== true && !subVariant.active" class="umb-variant-switcher__split-view umb-outline" ng-click="openInSplitView($event, subVariant)">Open in split view</div>
-                            </umb-dropdown-item>
-                        </div>
-                    </umb-dropdown>
-
-                </div>
-
-            </div>
-
-        </div>
-
-        <div ng-if="editor.variantApps && splitViewOpen !== true">
-            <umb-editor-navigation
-                data-element="editor-sub-views"
-                navigation="editor.variantApps"
-                on-select="selectNavigationItem(item)"
-                on-anchor-select="selectAnchorItem(item, anchor)"
-                limit="vm.navigationItemLimit">
-            </umb-editor-navigation>
-        </div>
-
-        <div ng-if="menu.currentNode && splitViewOpen !== true && hideActionsMenu !== true">
-            <umb-editor-menu
-                data-element="editor-actions"
-                current-node="menu.currentNode"
-                current-section="{{menu.currentSection}}"
-                is-disabled="disableActionsMenu">
-            </umb-editor-menu>
-        </div>
-
-        <div ng-if="splitViewOpen">
-            <button type="button" class="btn-reset umb-editor-header__close-split-view" ng-click="closeSplitView()">
-                <umb-icon icon="icon-delete" class="icon-delete"></umb-icon>
-                <span class="sr-only"><localize key="general_closepane">Close Pane</localize></span>
-            </button>
-        </div>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer-content-left.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer-content-left.html
deleted file mode 100644
index 0d79cbe00e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer-content-left.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-editor-footer-content__left-side" ng-transclude></div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer-content-right.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer-content-right.html
deleted file mode 100644
index a46745afeb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer-content-right.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-editor-footer-content__right-side" ng-transclude></div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer.html
deleted file mode 100644
index cefa37a9e2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div data-element="editor-footer" class="umb-editor-footer">
-
-    <div class="umb-editor-footer-content" ng-transclude></div>
-    
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
deleted file mode 100644
index 8c2ca91cc0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<div data-element="editor-header" class="umb-editor-header" ng-class="{'-split-view-active': splitViewOpen === true}">
-    <umb-loader ng-show="initializing || loading"></umb-loader>
-    <div class="flex items-center" style="height: 100%;" ng-hide="initializing">
-
-        <div ng-if="showBackButton === true && splitViewOpen !== true" style="margin-right: 15px;">
-            <button type="button" class="umb-editor-header__back" ng-click="goBack()">
-                <umb-icon icon="fa fa-arrow-left"></umb-icon>
-                <span class="sr-only"><localize key="visuallyHiddenTexts_goBack">Go back</localize></span>
-            </button>
-        </div>
-
-        <div class="flex items-center" style="flex: 1;">
-
-            <ng-form data-element="editor-icon" name="iconForm">
-                <button
-                    type="button" class="umb-panel-header-icon"
-                    ng-if="!hideIcon"
-                    ng-click="openIconPicker()"
-                    ng-class="{'-placeholder': $parent.icon === '' || $parent.icon === null}"
-                    title="{{$parent.icon}}">
-                        <umb-icon icon="{{$parent.icon}}" class="icon" ng-if="$parent.icon !== '' && $parent.icon !== null"></umb-icon>
-                        <span class="umb-panel-header-icon-text" ng-if="$parent.icon === '' || $parent.icon === null">
-                            <localize key="settings_addIcon">Add icon</localize>
-                        </span>
-                </button>
-            </ng-form>
-
-            <div id="nameField" class="umb-editor-header__name-and-description" style="flex: 1 1 auto;">
-                <div>
-                    <p tabindex="0" class="sr-only" ng-show="accessibility.a11yMessageVisible">
-                        {{accessibility.a11yMessage}}
-                    </p>
-                </div>
-                <div class="umb-editor-header__name-wrapper" ng-show="!nameLocked || !hideAlias">
-                    <label for="headerName" class="sr-only" ng-show="accessibility.a11yNameVisible">{{accessibility.a11yName}}</label>
-                    <ng-form name="headerNameForm">
-                        <input type="text"
-                               id="headerName"
-                               class="umb-editor-header__name-input"
-                               localize="placeholder"
-                               placeholder="@placeholders_entername"
-                               data-element="editor-name-field"
-                               name="headerName"
-                               ng-show="!nameLocked"
-                               ng-model="name"
-                               ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
-                               umb-auto-focus
-                               focus-on-filled="true"
-                               val-server-field="Name"
-                               no-password-manager
-                               ng-required="nameRequired != null ? nameRequired : true"
-                               aria-required="{{nameRequired != null ? nameRequired : true}}"
-                               aria-invalid="{{contentForm.headerNameForm.headerName.$invalid ? true : false}}"
-                               autocomplete="off"
-                               maxlength="255"/>
-                    </ng-form>
-
-                    <umb-generate-alias data-element="editor-alias"
-                                        class="umb-panel-header-alias"
-                                        ng-if="!hideAlias"
-                                        alias="$parent.alias"
-                                        alias-from="$parent.name"
-                                        enable-lock="aliasLocked !== true"
-                                        validation-position="'right'"
-                                        server-validation-field="Alias">
-                    </umb-generate-alias>
-
-                </div>
-
-                <h1 class="umb-panel-header-name" id="editor-headline-{{$id}}" ng-if="nameLocked" title="{{key}}">{{ name }}</h1>
-
-                <input data-element="editor-description"
-                       no-password-manager
-                       type="text"
-                       class="umb-panel-header-description"
-                       localize="placeholder"
-                       placeholder="@placeholders_enterDescription"
-                       ng-if="!hideDescription && !descriptionLocked"
-                       ng-model="$parent.description"/>
-
-                <p class="umb-panel-header-locked-description" id="editor-description-{{$id}}" ng-if="descriptionLocked">{{ description }}</p>
-
-            </div>
-
-        </div>
-
-        <div ng-if="navigation && splitViewOpen !== true">
-            <umb-editor-navigation
-                data-element="editor-sub-views"
-                navigation="navigation"
-                on-select="selectNavigationItem(item)">
-            </umb-editor-navigation>
-        </div>
-
-        <div ng-if="menu.currentNode && splitViewOpen !== true && hideActionsMenu !== true">
-            <umb-editor-menu
-                data-element="editor-actions"
-                current-node="menu.currentNode"
-                current-section="{{menu.currentSection}}">
-            </umb-editor-menu>
-        </div>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
deleted file mode 100644
index aa6ec85bc3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="pull-right" style="position: relative;">
-
-    <umb-button
-        type="button"
-        button-style="white"
-        action="dropdown.isOpen = !dropdown.isOpen"
-        label-key="general_actions"
-        show-caret="true"
-        has-popup="true"
-        is-expanded="dropdown.isOpen"
-        disabled="!actions || !actions.length || isDisabled">
-    </umb-button>
-
-    <umb-dropdown ng-if="dropdown.isOpen" class="umb-actions" on-close="dropdown.isOpen = false" deep-blur="dropdown.isOpen = false">
-        <umb-dropdown-item class="umb-action" ng-class="{'sep': action.separator, '-opens-dialog': action.opensDialog}" ng-repeat="action in actions">
-            <button type="button" ng-click="executeMenuItem(action)">
-                <umb-icon icon="{{action.icon}}" class="icon"></umb-icon>
-                <!-- Render the text that will be visually displayed -->
-                <span class="menu-label" aria-hidden="true">{{action.name}}</span>
-                <!-- Render the textDescription from the language files if it's attached to the action object-->
-                <span class="sr-only" ng-if="action.textDescription">
-                    <localize key="visuallyHiddenTexts_{{action.alias}}Description" tokens="[currentNode.name]"></localize>
-                </span>
-                <!-- Otherwise render a combination of the nodename and the currentNode name-->
-                <span class="sr-only" ng-if="!action.textDescription">{{action.name}} {{currentNode.name}}</span>
-            </button>
-        </umb-dropdown-item>
-    </umb-dropdown>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
deleted file mode 100644
index 50c16e832f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<button data-element="sub-view-{{vm.item.alias}}"
-        type="button"
-        ng-click="vm.clicked()"
-        hotkey="{{::vm.hotkey}}"
-        hotkey-when-hidden="true"
-        ng-class="{'is-active': vm.item.active, '-has-error': vm.item.hasError }"
-        ng-disabled="vm.item.disabled"
-        class="umb-sub-views-nav-item__action umb-outline umb-outline--thin"
-        aria-haspopup="{{ vm.item.anchors && vm.item.anchors.length > 1 }}"
-        aria-expanded="{{ vm.expanded }}">
-    <umb-icon icon="{{vm.item.icon}}" class="icon"></umb-icon>
-    <span class="umb-sub-views-nav-item-text">{{ vm.item.name }}</span>
-    <div ng-show="vm.item.badge" class="badge -type-{{vm.item.badge.type}}">{{vm.item.badge.count}}</div>
-    <div ng-show="!vm.item.badge" class="badge -type-alert --error-badge">!</div>
-</button>
-
-<umb-dropdown on-close="vm.close()" deep-blur="vm.close()" umb-keyboard-list class="umb-sub-views-nav-item__anchor_dropdown" ng-class="{'is-expanded': vm.expanded}" ng-if="vm.item.anchors && vm.item.anchors.length > 1">
-    <umb-dropdown-item ng-repeat="anchor in vm.item.anchors" ng-class="{'is-active': vm.item.active && anchor.active}">
-        <a href="#group-{{anchor.id}}" ng-click="vm.anchorClicked(anchor, $event)" prevent-default>
-            <span class="sr-only"><localize key="visuallyHiddenTexts_jumpTo">Jump to</localize></span> {{anchor.label}} <span class="sr-only"><localize key="visuallyHiddenTexts_group"> group</localize></span>
-        </a>
-    </umb-dropdown-item>
-</umb-dropdown>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
deleted file mode 100644
index 8faf14c237..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<ul class="umb-sub-views-nav" ng-show="showNavigation">
-
-    <li ng-repeat="navItem in navigation | limitTo: itemsLimit ">
-        <div ng-show="navItem.alias !== 'more'"
-            ng-class="navItem.errorClass">
-            <umb-editor-navigation-item
-                item="navItem"
-                on-open="openNavigationItem(item)"
-                on-open-anchor="openAnchorItem(item, anchor)"
-                hotkey="$index + 1">
-            </umb-editor-navigation-item>
-        </div>
-    </li>
-
-    <li ng-show="showMoreButton">
-        <div class="umb-sub-views-nav-item umb-sub-views-nav-item-more">
-            <umb-button-ellipsis
-                element="sub-view-{{moreButton.alias}}"
-                action="toggleDropdown()"
-                color="{{ moreButton.hasError ? '#d42054' : '#1b264f' }}"
-                text="{{moreButton.name}}"
-                show-text="true"
-                mode="tab"
-                css-class="umb-sub-views-nav-item__action umb-outline umb-outline--thin {{moreButton.active ? 'is-active' : ''}} {{ moreButton.hasError ? '-has-error' : '' }} {{moreButton.activeHasError ? '-active-has-error' : ''}}"
-                >
-                <div class="badge -type-alert --error-badge">!</div>
-            </umb-button-ellipsis>
-        </div>
-    </li>
-
-    <li style="position: relative;">
-        <umb-dropdown ng-show="showDropdown" on-close="hideDropdown()" class="umb-sub-views-nav-item-more__dropdown">
-            <umb-dropdown-item ng-repeat="navItem in navigation | limitTo: overflowingItems">
-                <umb-editor-navigation-item
-                    item="navItem"
-                    on-open="openNavigationItem(item)"
-                    on-open-anchor="openAnchorItem(item, anchor)"
-                    index="{{$index}}">
-                </umb-editor-navigation-item>
-            </umb-dropdown-item>
-        </umb-dropdown>
-    </li>
-
-</ul>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-view.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-view.html
deleted file mode 100644
index 807c8c7ebc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-view.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="umb-editor-sub-view"
-    ng-class="'sub-view-' + model.name"
-    val-sub-view="model">
-
-    <div
-        class="umb-editor-sub-view__content"
-        ng-show="model.active === true"
-        ng-include="model.view">
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-views.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-views.html
deleted file mode 100644
index be6f21ed96..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-views.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="umb-editor-sub-views">
-  <div
-    id="sub-view-{{$index}}"
-    class="umb-editor-sub-view"
-    ng-repeat="subView in subViews track by subView.alias"
-    ng-class="'sub-view-' + subView.name"
-    val-sub-view="subView"
-    ng-show="subView.active"
-  >
-    <div class="umb-editor-sub-view__content" ng-include="subView.view"></div>
-  </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-tab-bar.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-tab-bar.html
deleted file mode 100644
index 99b8790420..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-tab-bar.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div data-element="editor-tab-bar" class="umb-editor-tab-bar">
-  <ng-transclude></ng-transclude>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html
deleted file mode 100644
index f99603afa4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="umb-panel umb-editor-wrapper"
-    ng-class="{
-        '-no-footer': footer === 'false'
-    }"
-    ng-transclude>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor.html
deleted file mode 100644
index 08f599f36b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="umb-editor" ng-style="model.style" ng-class="{'umb-editor--small': model.size === 'small', 'umb-editor--animating': model.animating}">
-    <div ng-if="!model.view && !model.animating" ng-transclude></div>
-    <div ng-if="model.view && !model.animating" ng-include="model.view"></div>
-    <div ng-if="model.showOverlay" class="umb-editor__overlay"></div>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
deleted file mode 100644
index 8443465e25..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editors.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="umb-editors">
-
-    <umb-editor-repeater class="umb-editor"
-                         ng-repeat="model in editors"
-                         ng-attr-umb-focus-lock="{{$last || undefined}}"
-                         ng-attr-inert="{{$last ? undefined : true}}"
-                         ng-class="{'umb-editor--small': model.size === 'small',
-                'umb-editor--medium': model.size === 'medium',
-                'umb-editor--large': model.size === 'large',
-                'umb-editor--animating': model.animating,
-                'umb-editor--notInFront': model.inFront !== true,
-                'umb-editor--infiniteMode': model.infiniteMode,
-                'umb-editor--moveRight': model.moveRight,
-                'umb-editor--n0': model.styleIndex === 0,
-                'umb-editor--n1': model.styleIndex === 1,
-                'umb-editor--n2': model.styleIndex === 2,
-                'umb-editor--n3': model.styleIndex === 3,
-                'umb-editor--outOfRange': model.level === -1,
-                'umb-editor--level0': model.level === 0,
-                'umb-editor--level1': model.level === 1,
-                'umb-editor--level2': model.level === 2,
-                'umb-editor--level3': model.level === 3}">
-
-        <div ng-if="!model.view && !model.animating" ng-transclude></div>
-
-        <div ng-if="model.view && !model.animating && !model.$parentScope" ng-include="model.view"></div>
-        <div ng-show="model.$parentScope" class="scoped-view"></div>
-        <div class="umb-editor__overlay"></div>
-
-    </umb-editor-repeater>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
deleted file mode 100644
index ca26b6bd22..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="form-horizontal">
-    <ng-form name="elementTypeContentForm">
-
-        <umb-editor-tab-bar ng-if="vm.tabs.length > 0">
-            <umb-tabs-nav tabs="vm.tabs" on-tab-change="vm.setActiveTab(tab)"></umb-tabs-nav>
-        </umb-editor-tab-bar>
-
-        <umb-box ng-repeat="tab in vm.tabs" ng-show="tab.alias === vm.activeTabAlias && tab.properties.length > 0">
-            <umb-box-content data-element="tab-content-{{tab.alias}}">
-                <umb-property
-                    data-element="property-{{property.alias}}"
-                    ng-repeat="property in tab.properties track by property.alias"
-                    property="property"
-                    element-key="{{vm.model.key}}"
-                    show-inherit="vm.model.variants.length > 1 && !property.culture && !activeVariant.language.isDefault"
-                    inherits-from="defaultVariant.language.name">
-
-                    <umb-property-editor
-                        model="property"
-                        preview="(vm.model.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue) || (!vm.allowUpdate && !property.supportsReadOnly)"
-                        ng-attr-readonly="{{!vm.allowUpdate || undefined}}">
-                    </umb-property-editor>
-
-                </umb-property>
-            </umb-box-content>
-        </umb-box>
-
-        <div class="umb-group-panel"
-             data-element="group-{{group.alias}}"
-             ng-repeat="group in vm.model.variants[0].tabs track by group.key"
-             ng-if="group.type === 'Group'"
-             ng-show="group.parentAlias === vm.activeTabAlias || vm.tabs.length === 0">
-
-            <div class="umb-group-panel__header">
-                <div id="group-{{group.id}}"><h2>{{ group.label }}</h2></div>
-            </div>
-
-            <div class="umb-group-panel__content" data-element="tab-content-{{group.type === 'Group' ? group.parentAlias : group.alias}}">
-                <umb-property
-                    data-element="property-{{property.alias}}"
-                    ng-repeat="property in group.properties track by property.alias"
-                    property="property"
-                    element-key="{{vm.model.key}}"
-                    show-inherit="vm.model.variants.length > 1 && !property.culture && !activeVariant.language.isDefault"
-                    inherits-from="defaultVariant.language.name">
-
-                    <umb-property-editor
-                        model="property"
-                        preview="vm.model.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue"
-                        ng-attr-readonly="{{!vm.allowUpdate || undefined}}">
-                    </umb-property-editor>
-
-                </umb-property>
-            </div>
-
-        </div>
-
-        <umb-empty-state
-            ng-if="vm.model.tabs.length === 0"
-            position="center">
-            <localize key="content_noProperties">No content can be added for this item</localize>
-        </umb-empty-state>
-
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js
deleted file mode 100644
index dd19f16db6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js
+++ /dev/null
@@ -1,62 +0,0 @@
-(function () {
-    'use strict';
-
-    // TODO: Add docs - this component is used to render a content item based on an Element Type as a nested editor
-
-    angular
-        .module('umbraco.directives')
-        .component('umbElementEditorContent', {
-            templateUrl: 'views/components/elementeditor/umb-element-editor-content.component.html',
-            controller: ElementEditorContentComponentController,
-            controllerAs: 'vm',
-            bindings: {
-                model: '='
-            }
-        });
-
-    function ElementEditorContentComponentController($scope, $filter, contentEditingHelper, contentTypeHelper) {
-
-        // We need a controller for the component to work.
-        var vm = this;
-
-        vm.tabs = [];
-        vm.activeTabAlias = null;
-
-        vm.getScope = getScope; // used by property editors to get a scope that is the root of split view, content apps etc.
-        vm.setActiveTab = setActiveTab;
-
-        $scope.$watchCollection('vm.model.variants[0].tabs', (newValue) => {
-
-            contentTypeHelper.defineParentAliasOnGroups(newValue);
-            contentTypeHelper.relocateDisorientedGroups(newValue);
-
-            vm.tabs = $filter("filter")(newValue, (tab) => {
-                return tab.type === contentTypeHelper.TYPE_TAB;
-            });
-
-            if (vm.tabs.length > 0) {
-                // if we have tabs and some groups that doesn't belong to a tab we need to render those on an "Other" tab.
-                contentEditingHelper.registerGenericTab(newValue);
-
-                setActiveTab(vm.tabs[0]);
-            }
-        });
-
-        $scope.$watchCollection('vm.model.variants', (newValue) => {
-            if (newValue && newValue.length > 0) {
-                vm.allowUpdate = newValue[0].allowedActions.includes('A');
-            }
-        });
-
-        function getScope() {
-            return $scope;
-        }
-
-        function setActiveTab (tab) {
-            vm.activeTabAlias = tab.alias;
-            vm.tabs.forEach(tab => tab.active = false);
-            tab.active = true;
-        }
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
deleted file mode 100644
index c8235ae042..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<label class="checkbox umb-form-check umb-form-check--checkbox {{vm.cssClass}}" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
-    <span class="umb-form-check__symbol">
-
-        <input type="checkbox"
-               id="{{vm.inputId}}"
-               name="{{vm.name}}"
-               value="{{vm.value}}"
-               class="umb-form-check__input"
-               val-server-field="{{vm.serverValidationField}}"
-               ng-model="vm.model"
-               ng-disabled="vm.disabled"
-               ng-required="vm.required"
-               ng-change="vm.change()"
-               ng-click="vm.click($event)"
-               no-dirty-check="{{vm.disableDirtyCheck}}" />
-
-        <span class="umb-form-check__state" aria-hidden="true">
-            <span class="umb-form-check__check">
-                <umb-icon icon="icon-check" class="umb-form-check__icon"></umb-icon>
-            </span>
-        </span>
-    </span>
-    <span class="umb-form-check__info" ng-transclude>
-        <umb-icon ng-if="vm.icon.length" icon="{{vm.icon}}"></umb-icon>
-        <span ng-if="vm.text.length" class="umb-form-check__text">{{vm.text}}</span>
-    </span>
-</label>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
deleted file mode 100644
index 765b9f0b5e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<label class="radio umb-form-check umb-form-check--radiobutton {{vm.cssClass}}" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
-    <span class="umb-form-check__symbol">
-
-        <input type="radio"
-               id="{{vm.inputId}}"
-               name="{{vm.name}}"
-               value="{{vm.value}}"
-               class="umb-form-check__input"
-               val-server-field="{{vm.serverValidationField}}"
-               ng-model="vm.model"
-               ng-disabled="vm.disabled"
-               ng-required="vm.required"
-               ng-change="vm.change()"
-               no-dirty-check="{{vm.disableDirtyCheck}}"
-               ng-click="vm.click($event)" />
-
-        <span class="umb-form-check__state" aria-hidden="true">
-            <span class="umb-form-check__check"></span>
-        </span>
-    </span>
-    <span class="umb-form-check__info" ng-transclude>
-        <umb-icon ng-if="vm.icon.length" icon="{{vm.icon}}"></umb-icon>
-        <span ng-if="vm.text.length" class="umb-form-check__text">{{vm.text}}</span>
-    </span>
-</label>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-search-filter.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-search-filter.html
deleted file mode 100644
index 7792d381ba..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-search-filter.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="umb-control-group -no-border">
-    <div class="umb-search-filter" ng-class="vm.cssClass">
-        <label for="{{vm.inputId}}" class="sr-only">{{vm.text}}</label>
-        <button type="button"
-                class="btn-reset icon icon-arrow-left"
-                ng-if="vm.showBackButton && vm.model.length > 0"
-                ng-click="vm.goBack()"
-                localize="title"
-                title="@general_back">
-        </button>
-        <umb-icon icon="icon-search" ng-if="!vm.showBackButton || vm.model.length === 0"></umb-icon>
-        <input type="text"
-               id="{{vm.inputId}}"
-               ng-change="vm.change()"
-               ng-keydown="vm.keyDown($event)"
-               ng-blur="vm.blur($event)"
-               ng-model="vm.model"
-               class="umb-search-filter__input"
-               placeholder="{{vm.text}}"
-               umb-auto-focus="{{vm.autoFocus}}"
-               prevent-enter-submit="{{vm.preventSubmitOnEnter}}"
-               no-dirty-check />
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html b/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
deleted file mode 100644
index cbd1ac3f30..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/grid/grid-rte.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-    <umb-load-indicator ng-if="isLoading"></umb-load-indicator>
-    <div disable-hotkeys class="umb-rte" id="{{textAreaHtmlId}}" ng-style="{ visibility :  isLoading ? 'hidden' : 'visible' }"></div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-content.html b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-content.html
deleted file mode 100644
index f3ebfcb505..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-content.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-box-content" ng-transclude></div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-header.html b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-header.html
deleted file mode 100644
index bff03f8855..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-header.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="umb-box-header">
-    <div>
-        <div class="umb-box-header-title" ng-if="titleLabel">
-            {{titleLabel}}
-        </div>
-        <div class="umb-box-header-description" ng-if="descriptionLabel">
-            {{descriptionLabel}}
-        </div>
-    </div>
-    <ng-transclude></ng-transclude>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box.html b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box.html
deleted file mode 100644
index 38c4ff58fe..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-box" ng-transclude></div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html
deleted file mode 100644
index dff71a0c4d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="umb-property">
-    <div class="control-group umb-control-group" ng-class="{ error: !formValid(), hidelabel: hideLabel == 'true' }">
-        <div class="umb-el-wrap">
-            <label ng-if="hideLabel!=='true'" class="control-label" for="{{labelFor}}">
-                <span ng-bind-html="labelstring"></span>
-                <span ng-if="required">
-                    <strong class="umb-control-required">*</strong>
-                </span>
-                <small ng-if="descriptionstring">{{descriptionstring}}</small>
-            </label>
-            <div class="controls" ng-transclude></div>
-        </div>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-pane.html b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-pane.html
deleted file mode 100644
index 7c94769d2d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-pane.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="umb-pane" ng-transclude>
-	
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-panel.html b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-panel.html
deleted file mode 100644
index a963eff309..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-panel.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="umb-panel tabbable" ng-transclude>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-crop.html b/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-crop.html
deleted file mode 100644
index 42861fc33a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-crop.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="umb-cropper umb-property-editor" ng-show="src">
-	<div class="crop-container">
-		<div class="viewport">
-            <img ng-src="{{src}}" ng-style="{
-                'top': dimensions.image.top + dimensions.margin.top,
-                'left': dimensions.image.left + dimensions.margin.left,
-                'width': dimensions.image.width,
-                'height': dimensions.image.height
-            }"/>
-            <div class="__mask" ng-style="maskStyle">
-                <div class="__mask-info">{{width}} &times; {{height}} px</div>
-            </div>
-            <div class="overlay" tabindex="1"></div>
-        </div>
-	</div>
-
-	<div class="crop-controls-wrapper" ng-if="loaded">
-        <div class="crop-slider-wrapper">
-
-            <umb-icon icon="icon-picture" class="crop-controls-wrapper__icon-left"></umb-icon>
-
-            <div class="crop-slider">
-                <umb-range-slider
-                    ng-model="sliderValue"
-                    options="sliderOptions"
-                    on-setup="setup(slider)"
-                    on-slide="slide(values)"
-                    on-change="change(values)">
-                </umb-range-slider>
-            </div>
-
-            <umb-icon icon="icon-picture" class="crop-controls-wrapper__icon-right"></umb-icon>
-
-        </div>
-        <ng-transclude></ng-transclude>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html b/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
deleted file mode 100644
index e74c1d8d65..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="umb-cropper-gravity">
-
-	<div class="gravity-container" ng-show="vm.loaded">
-        <div class="viewport">
-
-            <img ng-show="vm.isCroppable" ng-src="{{vm.src}}" src="" alt="" draggable="false" />
-            <img ng-show="!vm.isCroppable && !vm.hasDimensions" ng-src="{{vm.src}}" src="" alt="" draggable="false" class="cursor-default" />
-
-        </div>
-        <div class="overlayViewport">
-
-            <div ng-show="vm.isCroppable && vm.disableFocalPoint !== true" class="overlay umb-outline" ng-style="vm.overlayStyle" ng-click="vm.setFocalPoint($event)">
-                <div class="focalPoint" ng-style="vm.style">
-                </div>
-            </div>
-
-        </div>
-	</div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-thumbnail.html b/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-thumbnail.html
deleted file mode 100644
index 14d09a1623..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-thumbnail.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="umb-crop-thumbnail-container"
-	ng-style="{height: height, width: width, overflow: 'hidden', position: 'relative'}"
-	ng-show="loaded">
-	<img ng-src="{{src}}" alt="" ng-style="preview" class="noScale" />
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
deleted file mode 100644
index 1e5858ce4c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<div class="umb-package-details">
-
-    <umb-load-indicator ng-if="loading === true"></umb-load-indicator>
-
-    <!-- Main Column -->
-    <div class="umb-package-details__main-content">
-
-        <!-- Links -->
-        <umb-box data-element="node-info-urls" class="mb4">
-            <umb-box-header title-key="general_links"></umb-box-header>
-            <umb-box-content class="block-form">
-
-                <umb-empty-state ng-if="!nodeUrl"
-                                 size="small">
-                    <localize key="content_noMediaLink">This media item has no link</localize>
-                </umb-empty-state>
-
-                <ul ng-if="nodeUrl" class="nav nav-stacked mb0">
-                    <li>
-                        <a href="" ng-attr-href="{{node.extension !== 'svg' ? nodeUrl : undefined}}" ng-click="node.extension === 'svg' && openSVG()" target="_blank" rel="noopener" class="umb-outline">
-                            <umb-icon icon="icon-out" class="icon"></umb-icon>
-                            <span>{{nodeFileName}}</span>
-                        </a>
-                    </li>
-                </ul>
-
-            </umb-box-content>
-        </umb-box>
-
-        <umb-tracked-references id="node.id"></umb-tracked-references>
-
-        <umb-box data-element="node-info-history">
-
-            <umb-box-header title-key="{{historyLabelKey}}" ng-if="historyLabelKey">
-                <umb-button ng-if="node.allowedActions.includes('K')"
-                            ng-hide="node.trashed || node.id === 0"
-                            type="button"
-                            button-style="outline"
-                            action="openRollback()"
-                            label-key="actions_rollback"
-                            size="xs"
-                            add-ellipsis="true">
-                </umb-button>
-            </umb-box-header>
-
-            <umb-box-content class="block-form">
-
-                <div style="position: relative;">
-
-                    <div ng-show="loadingAuditTrail" style="background: rgba(255, 255, 255, 0.8); position: absolute; top: 0; left: 0; right: 0; bottom: 0;"></div>
-                    <umb-load-indicator ng-show="loadingAuditTrail"></umb-load-indicator>
-
-                    <div ng-show="auditTrail.length === 0" style="padding: 10px;">
-                        <umb-empty-state position="center"
-                                         size="small">
-                            <localize key="content_noChanges">No changes have been made</localize>
-                        </umb-empty-state>
-                    </div>
-
-                    <div class="history">
-
-                        <div ng-show="auditTrail.length > 1" class="history-line"></div>
-
-                        <div class="history-item" ng-repeat="item in auditTrail">
-
-                            <div class="history-item__break">
-                                <div class="history-item__avatar">
-                                    <umb-avatar color="secondary"
-                                                size="xs"
-                                                name="{{item.userName}}"
-                                                img-src="{{item.userAvatars[3]}}"
-                                                img-srcset="{{item.userAvatars[4]}} 2x, {{item.userAvatars[4]}} 3x">
-                                    </umb-avatar>
-                                </div>
-
-                                <div>
-                                    <div>{{ item.userName }}</div>
-                                    <div class="history-item__date">{{item.timestampFormatted}}</div>
-                                </div>
-                            </div>
-
-                            <div class="history-item__break">
-                                <umb-badge class="history-item__badge"
-                                           size="xs"
-                                           color="{{item.logTypeColor}}">
-                                    <localize key="auditTrails_small{{ item.logType }}">{{ item.logType }}</localize>
-                                </umb-badge>
-                                <span class="history-item__description">
-                                    <localize key="auditTrailsMedia_{{ item.logType | lowercase }}" tokens="[item.parameters]">{{ item.comment }}</localize>
-                                </span>
-                            </div>
-
-                        </div>
-                    </div>
-
-                </div>
-
-                <div class="flex justify-center">
-                    <umb-pagination ng-if="auditTrailOptions.totalPages > 1"
-                                    page-number="auditTrailOptions.pageNumber"
-                                    total-pages="auditTrailOptions.totalPages"
-                                    on-change="auditTrailPageChange(pageNumber)">
-                    </umb-pagination>
-                </div>
-
-            </umb-box-content>
-        </umb-box>
-    </div>
-
-    <!-- Sidebar -->
-    <div class="umb-package-details__sidebar">
-        <!-- General Info -->
-        <umb-box data-element="node-info-general">
-            <umb-box-header title-key="general_general"></umb-box-header>
-            <umb-box-content class="block-form">
-
-                <umb-control-group ng-if="node.id !== 0" data-element="node-info-create-date" label="@content_createDate">
-                    {{node.createDateFormatted}} by {{ node.owner.name }}
-                </umb-control-group>
-
-                <umb-control-group ng-if="node.id !== 0" data-element="node-info-update-date" label="@content_updateDate">
-                    {{node.updateDateFormatted}}
-                </umb-control-group>
-
-                <umb-control-group data-element="node-info-media-type" label="@content_mediatype">
-                    <umb-node-preview style="max-width: 100%; margin-bottom: 0px;"
-                                      icon="node.icon"
-                                      name="node.contentTypeName"
-                                      allow-open="allowChangeMediaType"
-                                      on-open="openMediaType(mediaType)">
-                    </umb-node-preview>
-                </umb-control-group>
-
-                <umb-control-group ng-if="node.id !== 0" data-element="node-info-id" label="Id">
-                    <div>{{ node.id }}</div>
-                    <small>{{ node.key }}</small>
-                </umb-control-group>
-
-            </umb-box-content>
-        </umb-box>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbaudiopreview/umb-audio-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umbaudiopreview/umb-audio-preview.html
deleted file mode 100644
index 4b7bd1c2a6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbaudiopreview/umb-audio-preview.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="umb-audio-preview" ng-controller="umbAudioPreviewController as controller">
-    <audio ng-if="vm.clientSide" name="{{vm.name}}" controls>
-        <source ng-init="previewUrl = controller.getClientSideUrl(vm.clientSideData)" ng-src="{{previewUrl}}">
-    </audio>
-    <audio ng-if="!vm.clientSide" name="{{vm.name}}" controls>
-        <source ng-src="{{vm.source}}">
-    </audio>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbaudiopreview/umb-audio-preview.less b/src/Umbraco.Web.UI.Client/src/views/components/media/umbaudiopreview/umb-audio-preview.less
deleted file mode 100644
index 5d69fa07f9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbaudiopreview/umb-audio-preview.less
+++ /dev/null
@@ -1,18 +0,0 @@
-.umb-audio-preview {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    audio {
-        max-width: 100%;
-    }
-    audio::-webkit-media-controls-panel {
-        background-color: white;
-    }
-    audio::-webkit-media-controls {
-        padding: 6px;
-    }
-    audio::-webkit-media-controls-enclosure {
-        &:extend(.shadow-depth-1);
-        border-radius: 6px;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbaudiopreview/umbaudiopreview.controller.js b/src/Umbraco.Web.UI.Client/src/views/components/media/umbaudiopreview/umbaudiopreview.controller.js
deleted file mode 100644
index 985c8540a3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbaudiopreview/umbaudiopreview.controller.js
+++ /dev/null
@@ -1,11 +0,0 @@
-angular.module("umbraco")
-    .controller("umbAudioPreviewController",
-        function () {
-
-            var vm = this;
-
-            vm.getClientSideUrl = function(source) {
-                return URL.createObjectURL(source);
-            }
-
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbfilepreview/umb-file-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umbfilepreview/umb-file-preview.html
deleted file mode 100644
index 2c72e27c82..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbfilepreview/umb-file-preview.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="umb-file-preview">
-  <a
-    class="umb-file-preview--file"
-    ng-show="!vm.clientSide"
-    href="#"
-    ng-href="{{vm.source}}"
-    alt="{{vm.name}}"
-    target="_blank"
-    rel="noopener"
-  >
-    <umb-file-icon extension="{{vm.extension}}" size="m"> </umb-file-icon>
-    <div class="mt2">{{vm.name}}</div>
-  </a>
-  <div class="umb-file-preview--file" ng-show="vm.clientSide">
-    <umb-file-icon extension="{{vm.extension}}" size="m"> </umb-file-icon>
-    <div class="mt2">{{vm.name}}</div>
-  </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbfilepreview/umb-file-preview.less b/src/Umbraco.Web.UI.Client/src/views/components/media/umbfilepreview/umb-file-preview.less
deleted file mode 100644
index 427ac38244..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbfilepreview/umb-file-preview.less
+++ /dev/null
@@ -1,13 +0,0 @@
-.umb-file-preview {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    .umb-file-preview--file {
-        display: block;
-        box-sizing: border-box;
-        text-align: center;
-        max-width: 320px;
-        padding: 10px;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umb-image-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umb-image-preview.html
deleted file mode 100644
index 989f8ef093..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umb-image-preview.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="umb-image-preview" ng-controller="umbImagePreviewController as controller">
-    <img class="umb-image-preview--image" ng-if="vm.clientSide" ng-init="previewUrl = controller.getClientSideUrl(vm.clientSideData)" ng-src="{{previewUrl}}" alt="{{vm.name}}" />
-    <a ng-if="!vm.clientSide" href="#" ng-href="{{vm.source}}" target="_blank" rel="noopener">
-        <img class="umb-image-preview--image" ng-init="previewUrl = controller.getThumbnail(vm.source)" ng-src="{{previewUrl}}" alt="{{vm.name}}" />
-    </a>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umb-image-preview.less b/src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umb-image-preview.less
deleted file mode 100644
index b0ce88a446..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umb-image-preview.less
+++ /dev/null
@@ -1,10 +0,0 @@
-.umb-image-preview {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    img {
-        width: 100%;
-        max-height: 50vh;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umbimagepreview.controller.js b/src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umbimagepreview.controller.js
deleted file mode 100644
index 36eb3958e2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umbimagepreview.controller.js
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-angular.module("umbraco")
-    .controller("umbImagePreviewController",
-        function (mediaHelper) {
-
-            var vm = this;
-
-            vm.getThumbnail = function(source) {
-                return mediaHelper.getThumbnailFromPath(source) || source;
-            }
-            vm.getClientSideUrl = function(sourceData) {
-                return URL.createObjectURL(sourceData);
-            }
-
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbmediapreview/umb-media-preview.less b/src/Umbraco.Web.UI.Client/src/views/components/media/umbmediapreview/umb-media-preview.less
deleted file mode 100644
index 085b2ecd6a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbmediapreview/umb-media-preview.less
+++ /dev/null
@@ -1,16 +0,0 @@
-umb-media-preview {
-    position: relative;
-}
-.umb-media-preview {
-    position: relative;
-    width: 100%;
-    height: 100%;
-
-    min-height: 240px;
-
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    
-    .checkeredBackground();
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbmediapreview/umbmediapreview.component.js b/src/Umbraco.Web.UI.Client/src/views/components/media/umbmediapreview/umbmediapreview.component.js
deleted file mode 100644
index b7b5536b0a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbmediapreview/umbmediapreview.component.js
+++ /dev/null
@@ -1,38 +0,0 @@
-(function () {
-    "use strict";
-
-    angular
-        .module("umbraco")
-        .component("umbMediaPreview", {
-            template: "<div ng-include='vm.previewView' class='umb-media-preview'></div><umb-load-indicator ng-if='vm.loading'></umb-load-indicator>",
-            controller: UmbMediaPreviewController,
-            controllerAs: "vm",
-            bindings: {
-                extension: "<",
-                source: "<",
-                name: "<",
-                clientSide: "<?",
-                clientSideData: "<?"
-            }
-        });
-
-    function UmbMediaPreviewController($scope, mediaPreview) {
-
-        var vm = this;
-
-        vm.loading = false;
-
-        vm.$onInit = function() {
-            vm.previewView = mediaPreview.getMediaPreview(vm.extension);
-        }
-
-        $scope.$on("mediaPreviewLoadingStart", () => {
-            vm.loading = true;
-        })
-        $scope.$on("mediaPreviewLoadingComplete", () => {
-            vm.loading = false;
-        })
-
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbvideopreview/umb-video-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umbvideopreview/umb-video-preview.html
deleted file mode 100644
index 26003ab4c1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbvideopreview/umb-video-preview.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="umb-video-preview" ng-controller="umbVideoPreviewController as controller">
-    <video ng-if="vm.clientSide" name="{{vm.name}}" controls>
-        <source ng-init="previewUrl = controller.getClientSideUrl(vm.clientSideData)" ng-src="{{previewUrl}}">
-    </video>
-    <video ng-if="!vm.clientSide" name="{{vm.name}}" controls>
-        <source ng-src="{{vm.source}}">
-    </video>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbvideopreview/umb-video-preview.less b/src/Umbraco.Web.UI.Client/src/views/components/media/umbvideopreview/umb-video-preview.less
deleted file mode 100644
index 3dd4e2f589..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbvideopreview/umb-video-preview.less
+++ /dev/null
@@ -1,10 +0,0 @@
-.umb-video-preview {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100%;
-    video {
-      max-width: 100%;
-      max-height: 100%;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbvideopreview/umbvideopreview.controller.js b/src/Umbraco.Web.UI.Client/src/views/components/media/umbvideopreview/umbvideopreview.controller.js
deleted file mode 100644
index 9c8b32d8b7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbvideopreview/umbvideopreview.controller.js
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-angular.module("umbraco")
-    .controller("umbVideoPreviewController",
-        function () {
-
-            var vm = this;
-
-            vm.getClientSideUrl = function(source) {
-                return URL.createObjectURL(source);
-            }
-
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card-grid.less b/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card-grid.less
deleted file mode 100644
index a7a432a03d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card-grid.less
+++ /dev/null
@@ -1,139 +0,0 @@
-.umb-media-card-grid {
-    /* Grid Setup */
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(160px, 1fr));
-    grid-auto-rows: minmax(100px, auto);
-    grid-gap: 10px;
-
-    justify-items: center;
-    align-items: center;
-}
-.umb-media-card-grid__cell {
-    position: relative;
-    display: flex;
-    width: 100%;
-    height: 100%;
-    align-items: center;
-    justify-content: center;
-}
-
-.umb-media-card-grid--inline-create-button {
-    position: absolute;
-    height: 100%;
-    z-index: 1;
-    opacity: 0;
-    outline: none;
-    left: 0;
-    width: 12px;
-    margin-left: -7px;
-    padding-left: 6px;
-    margin-right: -6px;
-    transition: opacity 240ms;
-
-    &::before {
-        content: '';
-        position: absolute;
-        background: @blueMid;
-        background: linear-gradient(0deg, rgba(@blueMid,0) 0%, rgba(@blueMid,1) 50%, rgba(@blueMid,0) 100%);
-        border-left: 1px solid white;
-        border-right: 1px solid white;
-        border-radius: 2px;
-        left: 0;
-        top: 0;
-        bottom: 0;
-        width: 2px;
-        animation: umb-media-card-grid--inline-create-button_before 400ms ease-in-out alternate infinite;
-        transform: scaleX(.99);
-        transition: transform 240ms ease-out;
-
-        @keyframes umb-media-card-grid--inline-create-button_before {
-            0%   { opacity: 1; }
-            100% { opacity: 0.5; }
-        }
-    }
-
-    > .__plus {
-        position: absolute;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        pointer-events: none; // lets stop avoiding the mouse values in JS move event.
-        box-sizing: border-box;
-        width: 28px;
-        height: 28px;
-        margin-left: -18px;
-        margin-top: (-18px - 8px);
-        border-radius: 3em;
-        font-size: 14px;
-        border: 2px solid @blueMid;
-        color: @blueMid;
-        background-color: rgba(255, 255, 255, .96);
-        box-shadow: 0 0 0 2px rgba(255, 255, 255, .96);
-        transform: scale(0);
-        transition: transform 240ms ease-in;
-        
-        animation: umb-media-card-grid--inline-create-button__plus 400ms ease-in-out alternate infinite;
-
-        @keyframes umb-media-card-grid--inline-create-button__plus {
-            0%   { color: rgba(@blueMid, 1); }
-            100% { color: rgba(@blueMid, 0.8); }
-        }
-        
-    }
-
-    &:focus {
-        > .__plus {
-            border-color: @ui-outline;
-        }
-    }
-
-    &:hover, &:focus {
-        opacity: 1;
-
-        &::before {
-            transform: scaleX(1);
-        }
-        > .__plus {
-            transform: scale(1);
-            transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.275);
-            
-        }
-    }
-}
-
-.umb-media-card-grid__create-button {
-    position: relative;
-    width: 100%;
-    padding-bottom: 100%;
-
-    border: 1px dashed @ui-action-discreet-border;
-    color: @ui-action-discreet-type;
-    font-weight: bold;
-    box-sizing: border-box;
-    border-radius: @baseBorderRadius;
-
-    > div {
-        position: absolute;
-        height: 100%;
-        width: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        flex-direction: column;
-    }
-}
-
-.umb-media-card-grid__create-button:hover {
-    color: @ui-action-discreet-type-hover;
-    border-color: @ui-action-discreet-border-hover;
-    text-decoration: none;
-}
-
-.umb-media-card-grid__create-button.--disabled,
-.umb-media-card-grid__create-button.--disabled:hover,
-.umb-media-card-grid__create-button[disabled],
-.umb-media-card-grid__create-button[disabled]:hover {
-    color: @gray-7;
-    border-color: @gray-7;
-    cursor: not-allowed;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card.html b/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card.html
deleted file mode 100644
index a4aa220eb5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<ng-form name="vm.mediaCardForm">
-    <div class="__showcase">
-
-        <div ng-if="vm.loading" class="umb-button__progress"></div>
-
-        <p ng-if="vm.media.trashed" class="__status --error">
-            <umb-icon icon="icon-trash"></umb-icon>
-            <localize key="mediaPicker_trashed">Trashed</localize>
-        </p>
-
-        <p ng-if="vm.notAllowed" class="__status --error">
-            <umb-icon icon="icon-block"></umb-icon>
-            <localize key="mediaPicker_notAllowed">Not allowed</localize>
-        </p>
-        
-        <!-- IMAGE and SVG-->
-        <img ng-if="vm.loading === false && vm.thumbnail"
-            ng-class="{'trashed': vm.media.trashed}"
-            ng-src="{{vm.thumbnail}}"
-            title="{{vm.media.name}}"
-            alt="{{vm.media.name}}"
-            draggable="false" />
-
-        <umb-file-icon ng-if="vm.loading === false && vm.icon"
-            icon="{{vm.icon}}"
-            size="s"
-            text="{{vm.name}}">
-        </umb-file-icon>
-
-        <!-- FILE -->
-        <umb-file-icon ng-if="vm.loading === false && !vm.thumbnail"
-            ng-class="{'trashed': vm.media.trashed}"
-            title="{{vm.media.name}}"
-            extension="{{vm.fileExtension}}"
-            icon="{{vm.media.icon}}"
-            size="s"
-            text="{{vm.media.name}}">
-        </umb-file-icon>
-
-    </div>
-    <button type="button" ng-click="vm.onNameClicked($event)" class="btn-reset __info" ng-if="vm.media !== null || vm.name">
-        <div class="__name" ng-bind="vm.media.name || vm.name"></div>
-        <div class="__subname" ng-if="vm.media.description" ng-bind="vm.media.description"></div>
-    </button>
-
-    <ng-transclude></ng-transclude>
-
-</ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card.less b/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card.less
deleted file mode 100644
index c0b6cd9e79..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umb-media-card.less
+++ /dev/null
@@ -1,223 +0,0 @@
-.umb-media-card,
-umb-media-card {
-    position: relative;
-    display: inline-block;
-    width: 100%;
-    border-radius: @baseBorderRadius;
-    overflow: hidden;
-    transition: box-shadow 120ms;
-    cursor: pointer;
-    .umb-outline();
-
-    &:hover {
-        box-shadow: 0 1px 3px rgba(@ui-action-type-hover, .5);
-    }
-
-    &.--isOpen {
-        &::after {
-            content: "";
-            position: absolute;
-            border: 2px solid @ui-active-border;
-            border-radius: @baseBorderRadius;
-            top: 0;
-            bottom: 0;
-            left: 0;
-            right: 0;
-        }
-    }
-
-    &.--hasError {
-        border: 2px solid @errorBackground;
-    }
-
-    &.--sortable-placeholder {
-        box-shadow: none;
-
-        &::after {
-            content: "";
-            position: absolute;
-            background-color: rgba(@ui-drop-area-color, .05);
-            border: 2px solid rgba(@ui-drop-area-color, .1);
-            border-radius: @baseBorderRadius;
-            box-shadow: 0 0 4px rgba(@ui-drop-area-color, 0.05);
-            top: 0;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            animation: umb-block-card--sortable-placeholder 400ms ease-in-out alternate infinite;
-
-            @keyframes umb-block-card--sortable-placeholder {
-                0% {
-                    opacity: 1;
-                }
-
-                100% {
-                    opacity: 0.5;
-                }
-            }
-        }
-    }
-
-    .__status {
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        padding: 2px;
-
-        &.--error {
-            background-color: @errorBackground;
-            color: @errorText;
-        }
-    }
-
-    .__showcase {
-        position: relative;
-        display: flex;
-        max-width: 100%;
-        min-height: 120px;
-        max-height: 240px;
-        text-align: center;
-        align-items: center;
-        justify-content: center;
-
-        .checkeredBackground();
-
-        img {
-            object-fit: contain;
-            max-height: 240px;
-        }
-
-        umb-file-icon {
-            width: 100%;
-            padding-bottom: 100%;
-            display: block;
-
-            .umb-file-icon {
-                position: absolute;
-                top: 0;
-                bottom: 0;
-                left: 10px;
-                right: 10px;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-            }
-        }
-    }
-
-    .__info {
-        position: absolute;
-        text-align: left;
-        bottom: 0;
-        width: 100%;
-        background-color: #fff;
-        padding-top: 6px;
-        padding-bottom: 7px; // 7 + 1 to compentiate for the -1 substraction in margin-bottom.
-
-        opacity: 0;
-        transition: opacity 120ms;
-
-        &.--error {
-            opacity: 1;
-            background-color: @errorBackground;
-
-            .__name,
-            .__subname {
-                color: @errorText;
-            }
-        }
-
-        .__name {
-            font-weight: bold;
-            font-size: 13px;
-            color: @ui-action-type;
-            margin-left: 16px;
-            margin-bottom: -1px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-
-        .__subname {
-            color: @gray-4;
-            font-size: 12px;
-            margin-left: 16px;
-            margin-top: 1px;
-            margin-bottom: -1px;
-            line-height: 1.5em;
-        }
-    }
-
-    &:hover, &:focus, &:focus-within {
-        .__info {
-            opacity: 1;
-        }
-
-        .__info:not(.--error) {
-            .__name {
-                color: @ui-action-type-hover;
-            }
-        }
-    }
-
-    .__actions {
-        position: absolute;
-        top: 10px;
-        right: 10px;
-        font-size: 0;
-        background-color: rgba(255, 255, 255, .96);
-        border-radius: 16px;
-        padding-left: 5px;
-        padding-right: 5px;
-        opacity: 0;
-        transition: opacity 120ms;
-
-        .__action {
-            position: relative;
-            display: inline-block;
-            padding: 5px;
-            font-size: 18px;
-            color: @ui-action-discreet-type;
-
-            &:hover {
-                color: @ui-action-discreet-type-hover;
-            }
-        }
-    }
-
-    &:hover, &:focus, &:focus-within {
-        .__actions {
-            opacity: 1;
-        }
-    }
-}
-
-
-.umb-media-card {
-    .__upload-progress-container {
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        width: 100%;
-        height: 100%;
-        backdrop-filter: blur(2px);
-        background-color: rgba(255,255,255,.7);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-
-        .__upload-progress {
-            width: 66%;
-            margin-top: 13px;
-        }
-
-        .__upload-progress-label {
-            font-size: 13px;
-            margin-top: 3px;
-        }
-    }
-}
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umbMediaCard.component.js b/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umbMediaCard.component.js
deleted file mode 100644
index 1014b95227..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/mediacard/umbMediaCard.component.js
+++ /dev/null
@@ -1,98 +0,0 @@
-(function () {
-    "use strict";
-
-    angular
-        .module("umbraco")
-        .component("umbMediaCard", {
-            templateUrl: "views/components/mediacard/umb-media-card.html",
-            controller: MediaCardController,
-            controllerAs: "vm",
-            transclude: true,
-            bindings: {
-                mediaKey: "<?",
-                icon: "<?",
-                name: "<?",
-                hasError: "<",
-                allowedTypes: "<?",
-                onNameClicked: "&?"
-            }
-        });
-
-    function MediaCardController($scope, $element, entityResource, mediaHelper, eventsService, localizationService) {
-
-        var unsubscribe = [];
-        var vm = this;
-        vm.paddingBottom = 100;// Square while loading.
-        vm.loading = false;
-
-        unsubscribe.push($scope.$watch("vm.mediaKey", (newValue, oldValue) => {
-            if(newValue !== oldValue) {
-                vm.updateThumbnail();
-            }
-        }));
-
-        function checkErrorState() {
-
-            vm.notAllowed = (vm.media &&vm.allowedTypes && vm.allowedTypes.length > 0 && vm.allowedTypes.indexOf(vm.media.metaData.ContentTypeAlias) === -1);
-
-            if (
-                vm.hasError === true || vm.notAllowed === true || (vm.media && vm.media.trashed === true)
-            ) {
-                $element.addClass("--hasError")
-                vm.mediaCardForm.$setValidity('error', false)
-            } else {
-                $element.removeClass("--hasError")
-                vm.mediaCardForm.$setValidity('error', true)
-            }
-        }
-
-        vm.$onInit = function () {
-
-            unsubscribe.push($scope.$watchGroup(["vm.media.trashed", "vm.hasError"], checkErrorState));
-
-            vm.updateThumbnail();
-
-            unsubscribe.push(eventsService.on("editors.media.saved", function(name, args) {
-                // if this media item uses the updated media type we want to reload the media file
-                if(args && args.media && args.media.key === vm.mediaKey) {
-                    vm.updateThumbnail();
-                }
-            }));
-        }
-
-
-        vm.$onDestroy = function () {
-            unsubscribe.forEach(x => x());
-        }
-
-        vm.updateThumbnail = function () {
-
-            if(vm.mediaKey && vm.mediaKey !== "") {
-                vm.loading = true;
-
-                entityResource.getById(vm.mediaKey, "Media").then(function (mediaEntity) {
-                    vm.media = mediaEntity;
-                    checkErrorState();
-                    vm.thumbnail = mediaHelper.resolveFileFromEntity(mediaEntity, true);
-                    vm.fileExtension = mediaHelper.getFileExtension(vm.media.metaData.MediaPath);
-
-                    vm.loading = false;
-                }, function () {
-                    localizationService.localize("mediaPicker_deletedItem").then(function (localized) {
-                        vm.media = {
-                            name: localized,
-                            icon: "icon-picture",
-                            trashed: true
-                        };
-                        vm.loading = false;
-                        $element.addClass("--hasError")
-                        vm.mediaCardForm.$setValidity('error', false)
-                    });
-                });
-            }
-
-        }
-
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/member/umb-member-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/member/umb-member-node-info.html
deleted file mode 100644
index 7811c7728c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/member/umb-member-node-info.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="umb-package-details">
-    <div class="umb-package-details__main-content">
-
-    </div>
-
-    <div class="umb-package-details__sidebar">
-        <umb-box data-element="node-info-general">
-            <umb-box-header title-key="general_general"></umb-box-header>
-            <umb-box-content class="block-form">
-
-                <umb-control-group ng-if="node.id !== 0" data-element="node-info-create-date" label="@content_createDate">
-                    {{node.createDateFormatted}} by {{ node.owner.name }}
-                </umb-control-group>
-
-                <umb-control-group ng-if="node.id !== 0" data-element="node-info-update-date" label="@content_updateDate">
-                    {{node.updateDateFormatted}}
-                </umb-control-group>
-
-                <umb-control-group data-element="node-info-member-type" label="@content_membertype">
-                    <umb-node-preview style="max-width: 100%; margin-bottom: 0px;"
-                                      icon="node.icon"
-                                      name="node.contentTypeName"
-                                      alias="node.contentTypeAlias"
-                                      allow-open="allowChangeMemberType"
-                                      on-open="openMemberType(memberType)">
-                    </umb-node-preview>
-                </umb-control-group>
-
-                <umb-control-group ng-if="node.id !== 0" data-element="node-info-id" label="Id">
-                    <div>{{ node.id }}</div>
-                    <small>{{ node.key }}</small>
-                </umb-control-group>
-
-            </umb-box-content>
-        </umb-box>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/member/umb-membergroup-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/member/umb-membergroup-node-info.html
deleted file mode 100644
index dfa90d3bfa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/member/umb-membergroup-node-info.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="umb-package-details">
-    <div class="umb-package-details__main-content">
-
-        <umb-box>
-            <umb-box-header title-key="content_membergroup"></umb-box-header>
-            <umb-box-content class="block-form">
-
-                <umb-empty-state size="small">
-                    <localize key="member_memberGroupNoProperties">Member groups have no additional properties for editing.</localize>
-                </umb-empty-state>
-
-            </umb-box-content>
-        </umb-box>
-
-    </div>
-
-    <div class="umb-package-details__sidebar">
-        <umb-box data-element="node-info-general">
-            <umb-box-header title-key="general_general"></umb-box-header>
-            <umb-box-content class="block-form">
-
-                <umb-control-group ng-if="node.id !== 0" data-element="node-info-id" label="Id">
-                    <div>{{ node.id }}</div>
-                    <small>{{ node.key }}</small>
-                </umb-control-group>
-
-            </umb-box-content>
-        </umb-box>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html b/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
deleted file mode 100644
index 065f2bd28c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="umb-notifications" id="umb-notifications-wrapper" ng-cloak>
-    <ul ng-if="notifications" class="umb-notifications__notifications" aria-live="assertive" aria-relevant="additions">
-        <li ng-repeat="notification in notifications"
-            class="alert alert-block alert-{{notification.type}} umb-notifications__notification animated -half-second fadeIn"
-            ng-class="{'-no-border -extra-padding': notification.type === 'form'}">
-
-            <div ng-if="notification.view">
-                <div ng-include="notification.view"></div>
-            </div>
-
-            <div ng-if="notification.headline">
-                <a ng-if="notification.url" ng-href="{{notification.url}}" href="" target="{{notification.target}}" rel="noreferrer">
-                    <strong ng-bind="notification.headline"></strong>
-                    <span ng-bind-html="notification.message"></span>
-                </a>
-                <div ng-if="!notification.url">
-                    <strong ng-bind="notification.headline"></strong>
-                    <span ng-bind-html="notification.message"></span>
-                </div>
-            </div>
-
-            <button type="button" class="close -align-right" ng-click="removeNotification($index)" aria-hidden="true">
-                <span>&times;</span>
-            </button>
-        </li>
-    </ul>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay-backdrop.html b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay-backdrop.html
deleted file mode 100644
index 170ae605f4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay-backdrop.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-overlay-backdrop animate umb-animated" ng-if="numberOfOverlays > 0"></div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
deleted file mode 100644
index 70914bcfb7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<div
-    data-element="{{name}}"
-    class="umb-overlay umb-overlay-{{position}} umb-overlay--{{size}}"
-    on-outside-click="outSideClick()"
-    umb-focus-lock
-    role="dialog"
-    aria-labelledby="umb-overlay-title"
-    aria-describedby="umb-overlay-description">
-    <ng-form class="umb-overlay__form" name="overlayForm" novalidate val-form-manager>
-        <div data-element="overlay-header" class="umb-overlay-header" ng-show="!model.hideHeader">
-            <h1 class="umb-overlay__title" id="umb-overlay-title">{{model.title}}</h1>
-            <p class="umb-overlay__subtitle" id="umb-overlay-description" ng-if="model.subtitle">{{model.subtitle}}</p>
-        </div>
-
-        <div data-element="overlay-content" class="umb-overlay-container form-horizontal">
-            <ng-transclude></ng-transclude>
-            <div ng-if="view && !parentScope" ng-include="view"></div>
-            <div class="scoped-view"></div>
-        </div>
-
-        <!-- If model contains the property of "itemDetails" we render  the relevant content here -->
-        <div class="umb-overlay__item-details" ng-if="model.itemDetails">
-            <div class="umb-overlay__item-details-title-wrapper" ng-if="model.itemDetails.icon || model.itemDetails.title">
-                <umb-icon
-                    icon="{{model.itemDetails.icon}}"
-                    class="umb-overlay__item-details-icon"
-                    ng-if="model.itemDetails.icon">
-                </umb-icon>
-                <h2 class="umb-overlay__item-details-title" ng-if="model.itemDetails.title">{{model.itemDetails.title}}</h2>
-            </div>
-            <p class="umb-overlay__item-details-description" ng-if="model.itemDetails.description">{{model.itemDetails.description}}</p>
-        </div>
-
-        <div data-element="overlay-footer" class="umb-overlay-drawer" ng-class="{'-auto-height': model.confirmSubmit.show}">
-
-            <div ng-if="model.confirmSubmit.show">
-
-                <h2 class="red" ng-if="model.confirmSubmit.title">
-                    <umb-icon icon="icon-alert"></umb-icon> {{model.confirmSubmit.title}}
-                </h2>
-                <p ng-if="model.confirmSubmit.description">{{model.confirmSubmit.description}}</p>
-
-                <label class="checkbox no-indent">
-                    <input type="checkbox" ng-model="directive.enableConfirmButton" />
-                    <strong>{{model.confirmSubmit.checkboxLabel}}</strong>
-                </label>
-
-                <div class="umb-overlay-drawer__align-right">
-                    <umb-button
-                        alias="overlayCancelSubmit"
-                        action="cancelConfirmSubmit()"
-                        button-style="link"
-                        label="Cancel"
-                        type="button">
-                    </umb-button>
-
-                    <umb-button
-                        data-element="overlay-confirm-submit"
-                        button-style="success"
-                        label="Confirm"
-                        type="button"
-                        disabled="!directive.enableConfirmButton"
-                        action="submitForm(model)"
-                        auto-focus="true">
-                    </umb-button>
-                </div>
-            </div>
-
-            <div class="umb-overlay-drawer__align-right" ng-if="!model.confirmSubmit.show">
-                <umb-button
-                    alias="overlayClose"
-                    action="closeOverLay()"
-                    button-style="link"
-                    label-key="{{model.closeButtonLabelKey}}"
-                    label="{{model.closeButtonLabel}}"
-                    type="button">
-                </umb-button>
-
-                <umb-button
-                    alias="overlaySubmit"
-                    button-style="{{model.submitButtonStyle || 'success'}}"
-                    label-key="{{model.submitButtonLabelKey}}"
-                    label="{{model.submitButtonLabel}}"
-                    ng-if="model.submit && model.hideSubmitButton !== true"
-                    type="button"
-                    disabled="model.disableSubmitButton"
-                    action="submitForm(model)"
-                    state="model.submitButtonState"
-                    auto-focus="true">
-                </umb-button>
-            </div>
-
-        </div>
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-template-remove-confirm.html b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-template-remove-confirm.html
deleted file mode 100644
index 17b853fcbc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-template-remove-confirm.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div>
-
-    <div ng-if="model.layout" class="umb-alert umb-alert--warning mb2">
-        <localize key="contentTypeEditor_removeChildNode">You are removing the child node</localize> <strong>{{model.layout.name}}</strong>.
-    </div>
-
-    <p>
-        <localize key="contentTypeEditor_removeChildNodeWarning">
-            Removing a child node will limit the editors options to create different content types beneath a node.
-        </localize>
-    </p>
-
-    <localize key="defaultdialogs_confirmdelete">Are you sure you want to remove</localize>?
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
deleted file mode 100644
index d6c798e5c3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="umb-property-actions" ng-class="{ '-open': vm.isOpen }" ng-if="vm.actions.length > 0">
-
-    <umb-button-ellipsis
-        css-class="umb-outline umb-property-actions__toggle"
-        action="vm.toggle()"
-        mode="small"
-        text="{{vm.isOpen ? vm.labels.closeText : vm.labels.openText}}">
-    </umb-button-ellipsis>
-
-    <div class="umb-property-actions__menu" role="menu" ng-if="vm.isOpen" on-outside-click="vm.close()" on-close="vm.close()" deep-blur="vm.close()">
-        <ul class="umb-contextmenu">
-            <li ng-repeat="action in vm.actions" role="menuitem" class="umb-contextmenu-item" ng-class="{'-opens-dialog': action.opensDialog}">
-                <button type="button" class="btn-reset umb-outline" ng-click="vm.executeAction(action)" ng-disabled="action.isDisabled === true">
-                    <umb-icon icon="{{action.icon}}" class="icon"></umb-icon>
-                    <span class="menu-label">{{::action.label}}</span>
-                </button>
-            </li>
-        </ul>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html
deleted file mode 100644
index b2387e230a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="umb-property-editor db" ng-class="{'is-preview': preview}">
-
-    <div ng-if="preview && allowUnlock" class="umb-property-editor__lock-overlay-container">
-        <div class="umb-property-editor__lock-overlay">
-
-            <span ng-if="model.variations === 'Nothing' && node.documentType.variations === 'Culture'" ng-bind-html="labels.invariantCulturePropertyUnlockHelp"></span>
-            <span ng-if="model.variations === 'Nothing' && node.documentType.variations === 'Segment'" ng-bind-html="labels.invariantSegmentPropertyUnlockHelp"></span>
-            <span ng-if="model.variations === 'Nothing' && node.documentType.variations === 'CultureAndSegment'" ng-bind-html="labels.invariantPropertyUnlockHelp"></span>
-
-            <span ng-if="model.variations === 'Culture' && node.documentType.variations === 'CultureAndSegment'" ng-bind-html="labels.invariantSegmentPropertyUnlockHelp"></span>
-            <span ng-if="model.variations === 'Segment' && node.documentType.variations === 'CultureAndSegment'" ng-bind-html="labels.invariantCulturePropertyUnlockHelp"></span>
-
-            <umb-button button-style="success" type="button" action="unlock()" label-key="general_edit" size="xxs"></umb-button>
-        </div>
-    </div>
-
-    <!-- layer to prevent clicks on elements with high z-index-->
-    <div ng-if="preview" class="umb-property-editor__preview-overlay"></div>
-
-    <div ng-class="{'umb-property-editor--preview': preview}" disable-tabindex="preview">
-        <div ng-include="propertyEditorView"></div>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-group.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-group.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
deleted file mode 100644
index e3a65a215b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<div class="umb-property">
-    <ng-form name="propertyForm">
-        <div class="control-group umb-control-group"
-             ng-class="{'hidelabel':vm.hideLabel || vm.property.hideLabel, '--label-on-top':vm.property.labelOnTop, 'umb-control-group__listview': vm.property.alias === '_umb_containerView'}">
-
-            <val-property-msg></val-property-msg>
-
-            <div class="umb-el-wrap">
-
-                <div class="control-header" ng-hide="(vm.hideLabel || vm.property.hideLabel) === true">
-
-                    <label data-element="property-label-{{vm.property.alias}}" class="control-label" for="{{vm.property.alias}}" ng-attr-title="{{vm.controlLabelTitle}}" aria-label="Property alias: {{vm.controlAriaLabel}}">{{vm.property.label}}<span ng-if="vm.property.validation.mandatory || vm.property.ncMandatory"><strong class="umb-control-required">*</strong></span></label>
-
-                    <umb-property-actions actions="vm.propertyActions"></umb-property-actions>
-
-                    <small class="control-description" ng-if="vm.property.description" ng-bind-html="vm.property.description | simpleMarkdown"></small>
-
-                    <div ng-if="vm.property.extendedDescription">
-
-                      <div ng-if="vm.property.extendedDescriptionVisible">
-                        <small class="control-description" ng-bind-html="vm.property.extendedDescription | simpleMarkdown"></small>
-                      </div>
-
-                      <button type="button" class="btn btn-mini btn-link btn-link-reverse p0" ng-click="vm.property.extendedDescriptionVisible = !vm.property.extendedDescriptionVisible">
-                          <localize ng-if="!vm.property.extendedDescriptionVisible" key="general_readMore"></localize>
-                          <localize ng-if="vm.property.extendedDescriptionVisible" key="general_close"></localize>
-                      </button>
-
-                    </div>
-
-                    <div class="umb-property-variant-label-container" ng-if="vm.showInherit && vm.property && vm.node">
-
-                        <span ng-if="vm.property.variations === 'Nothing'" class="umb-property-variant-label">
-                            <localize key="general_shared"></localize>
-                        </span>
-
-                        <span ng-if="vm.property.variations === 'Segment' && vm.node.documentType.variations === 'CultureAndSegment'" class="umb-property-variant-label">
-                            <localize key="languages_invariantLanguageProperty"></localize>
-                        </span>
-
-                        <span ng-if="vm.property.variations === 'Culture' || vm.property.variations === 'CultureAndSegment'" class="umb-property-variant-label">
-                            {{ vm.property.culture }}
-                        </span>
-
-                        <span ng-if="vm.property.variations === 'Culture' && vm.node.documentType.variations === 'CultureAndSegment'" class="umb-property-variant-label">
-                            <localize key="languages_invariantSegmentProperty"></localize>
-                        </span>
-
-                        <span ng-if="vm.property.variations === 'Segment' || vm.property.variations === 'CultureAndSegment'" class="umb-property-variant-label">
-                            <span>{{ vm.property.segment }}</span>
-                            <span ng-if="!vm.property.segment">Default</span>
-                        </span>
-
-                    </div>
-
-                </div>
-
-                <div class="controls" ng-transclude>
-                </div>
-            </div>
-        </div>
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/references/umb-tracked-references-bulk-action.html b/src/Umbraco.Web.UI.Client/src/views/components/references/umb-tracked-references-bulk-action.html
deleted file mode 100644
index 8d3c36f196..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/references/umb-tracked-references-bulk-action.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<umb-load-indicator ng-if="vm.loading === true"></umb-load-indicator>
-
-<div ng-if="vm.loading === false">
-    
-    <div ng-if="vm.hasReferences">
-        <umb-tracked-references-table items="vm.referencedItems.items"
-                                      total-pages="vm.referencedItems.totalPages"
-                                      page-number="vm.referencedItems.pageNumber"
-                                      headline="vm.referencedItemsTitle"
-                                      on-page-changed="vm.changeReferencesPageNumber(pageNumber)">
-        </umb-tracked-references-table>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/references/umb-tracked-references-table.html b/src/Umbraco.Web.UI.Client/src/views/components/references/umb-tracked-references-table.html
deleted file mode 100644
index 6ade19b372..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/references/umb-tracked-references-table.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<div>
-    <h5 class="mt0" style="margin-bottom: 20px;">
-        {{vm.headline}}
-    </h5>
-
-    <div class="umb-table">
-        <div class="umb-table-head">
-            <div class="umb-table-row">
-                <div class="umb-table-cell"></div>
-                <div class="umb-table-cell umb-table__name not-fixed"><localize key="general_nodeName">Node Name</localize></div>
-                <div ng-if="vm.showPublished" class="umb-table-cell"><localize key="general_status">Status</localize></div>
-                <div ng-if="vm.showTypeName" class="umb-table-cell"><localize key="general_typeName">Type Name</localize></div>
-                <div ng-if="vm.showType" class="umb-table-cell"><localize key="general_type">Type</localize></div>
-                <div ng-if="vm.showRelationTypeName" class="umb-table-cell"><localize key="relationType_relation">Relation</localize></div>
-            </div>
-        </div>
-        <div class="umb-table-body">
-            <div class="umb-table-row"
-                 ng-repeat="reference in vm.items"
-                 ng-class="{ '-light':!reference.published }">
-                <div class="umb-table-cell"><umb-icon icon="{{reference.icon}}" class="umb-table-body__icon"></umb-icon></div>
-                <div class="umb-table-cell umb-table__name"><a ng-href="{{vm.getUrl(reference.udi, reference.id)}}" ng-click="vm.referenceAnchorClicked($event, reference)">{{::reference.name}}</a></div>
-                <div ng-if="vm.showPublished" class="umb-table-cell">
-                  <div ng-if="reference.published !== null">
-                    <span ng-if="reference.published" title="@content_published" localize="title"><localize key="content_published">Published</localize></span>
-                    <span ng-if="!reference.published" title="@content_unpublished" localize="title"><localize key="content_unpublished">Unpublished</localize></span>
-                  </div>
-                </div>
-                <div ng-if="vm.showTypeName" class="umb-table-cell"><span title="{{::reference.contentTypeName}}">{{::reference.contentTypeName}}</span></div>
-                <div ng-if="vm.showType" class="umb-table-cell"><span title="{{::reference.type}}">{{::reference.type}}</span></div>
-                <div ng-if="vm.showRelationTypeName" class="umb-table-cell"><span title="{{::reference.relationTypeName}}">{{::reference.relationTypeName}}</span></div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Pagination -->
-    <div class="flex justify-center">
-        <umb-pagination ng-if="vm.totalPages"
-                        page-number="vm.pageNumber"
-                        total-pages="vm.totalPages"
-                        on-change="vm.changePageNumber(pageNumber)">
-        </umb-pagination>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/references/umb-tracked-references.html b/src/Umbraco.Web.UI.Client/src/views/components/references/umb-tracked-references.html
deleted file mode 100644
index ec6b7d76fb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/references/umb-tracked-references.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<umb-load-indicator ng-if="vm.loading === true"></umb-load-indicator>
-
-<umb-box ng-if="(vm.hasContentReferences === false) && (vm.hasContentReferencesInDescendants === false) && (vm.hasMediaReferences === false) && (vm.hasMediaReferencesInDescendants === false) && (vm.hasMemberReferences === false) && (vm.loading === false) && (vm.hideNoResult === false)">
-    <umb-box-header title-key="references_tabName"></umb-box-header>
-    <umb-box-content>
-        <umb-empty-state size="small">
-            <localize key="references_itemHasNoReferences">This item is not referenced</localize>
-        </umb-empty-state>
-    </umb-box-content>
-</umb-box>
-
-<div ng-if="vm.loading === false">
-
-    <!-- Combined list -->
-    <div ng-if="vm.hasReferences">
-        <umb-tracked-references-table
-            items="vm.references.items"
-            total-pages="vm.references.totalPages"
-            page-number="vm.references.pageNumber"
-            headline="vm.referencesTitle"
-            on-page-changed="vm.changeReferencesPageNumber(pageNumber)"
-            show-published="!vm.compact"
-            show-type-name="true"
-            show-type="!vm.compact"
-            show-relation-type-name="!vm.compact"
-            type-label-key="content_documentType">
-        </umb-tracked-references-table>
-    </div>
-
-    <div ng-if="vm.hasReferencesInDescendants">
-        <umb-tracked-references-table
-            items="vm.referencedDescendants.items"
-            total-pages="vm.referencedDescendants.totalPages"
-            page-number="vm.referencedDescendants.pageNumber"
-            headline="vm.referencedDescendantsTitle"
-            on-page-changed="vm.changeDescendantsPageNumber(pageNumber)">
-        </umb-tracked-references-table>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tab-content.html b/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tab-content.html
deleted file mode 100644
index cb1c20ef13..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tab-content.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div data-element="tab-content-{{vm.tab.alias}}">
-    <ng-transclude></ng-transclude>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html b/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html
deleted file mode 100644
index c97b9728fe..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-<ul role="tablist" class="umb-tabs-nav" aria-label="Content Fields">
-    <li class="umb-tab" ng-repeat="tab in vm.tabs |  limitTo: vm.maxTabs" data-element="tab-{{tab.alias}}" ng-class="{'umb-tab--active': tab.active, 'umb-tab--error': valTab_tabHasError}" val-tab>
-        <button role="tab" aria-selected="{{tab.active}}" aria-controls="tabpanel-{{tab.alias}}" tabindex="{{!tab.active ? '-1' : null}}" class="btn-reset umb-tab-button" ng-click="vm.clickTab($event, tab)" ng-disabled="tab.disabled" type="button">
-            {{ tab.label }}
-            <div ng-show="valTab_tabHasError && !tab.active" class="badge">!</div>
-        </button>
-    </li>
-
-    <li data-element="tab-expand" class="umb-tab umb-tab--expand" ng-class="{ 'open': vm.showTray }" ng-show="vm.needTray">
-        <umb-button-ellipsis
-            action="vm.toggleTray()"
-            text="View more options"
-            label-key="visuallyHiddenTexts_tabExpand"
-            color="#68676b"
-            >
-        </umb-button-ellipsis>
-
-        <umb-dropdown class="umb-tabs-tray" ng-if="vm.showTray" on-close="vm.hideTray()">
-            <umb-dropdown-item ng-repeat="tab in vm.tabs | limitTo: vm.overflowingTabs" data-element="tab-{{tab.alias}}" ng-class="{'umb-tab--error': valTab_tabHasError}" val-tab>
-                <button
-                    type="button"
-                    class="btn-reset umb-tray-button"
-                    ng-class="{'dropdown-menu--active': tab.active}"
-                    ng-click="vm.clickTab($event, tab)"
-                    role="tab"
-                    ng-disabled="tab.disabled"
-                    aria-selected="{{tab.active}}" >
-                    {{ tab.label }}
-                    <div ng-show="valTab_tabHasError && !tab.active" class="badge">!</div>
-                </button>
-            </umb-dropdown-item>
-        </umb-dropdown>
-    </li>
-</ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html b/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
deleted file mode 100644
index d52539b86b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="umb-tags-editor">
-    <ng-form name="vm.tagEditorForm">
-
-        <div ng-if="vm.isLoading">
-            <localize key="loading">Loading</localize>...
-        </div>
-
-        <div ng-if="!isLoading">
-
-            <input type="hidden" name="tagCount" ng-model="vm.viewModel.length" val-property-validator="vm.validateMandatory" />
-
-            <span ng-repeat="tag in vm.viewModel track by $index" class="label label-primary tag" ng-keyup="vm.onKeyUpOnTag(tag, $event)" tabindex="0">
-                <span ng-bind-html="tag"></span>
-
-                <umb-icon
-                    ng-if="!vm.readonly"
-                    icon="icon-trash"
-                    class="btn-icon"
-                    ng-click="vm.showPrompt($index, tag)"
-                    localize="title"
-                    title="@buttons_deleteTag">
-                </umb-icon>
-
-                <umb-confirm-action 
-                    ng-if="vm.promptIsVisible === $index"
-                    direction="left"
-                    on-confirm="vm.removeTag(tag)"
-                    on-cancel="vm.hidePrompt()">
-                </umb-confirm-action>
-            </span>
-
-            <input type="text"
-                   id="{{vm.inputId}}"
-                   class="typeahead tags-{{vm.inputId}}"
-                   ng-model="vm.tagToAdd"
-                   ng-keydown="vm.addTagOnEnter($event)"
-                   ng-blur="vm.addTag()"
-                   ng-maxlength="200"
-                   maxlength="200"
-                   localize="placeholder"
-                   placeholder="@placeholders_enterTags"
-                   aria-labelledby="{{vm.inputId}}"
-                   ng-readonly="vm.readonly" />
-
-        </div>
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
deleted file mode 100644
index 85cc5a4d46..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<li class="umb-tree-item" data-element="tree-item-{{::node.dataElement}}" ng-class="getNodeCssClass(node)"
-    on-right-click="altSelect(node, $event)">
-  <div class="umb-tree-item__inner" ng-swipe-right="options(node, $event)" ng-dblclick="load(node, $event)"
-       tabindex="-1">
-    <button data-element="tree-item-expand" class="umb-tree-item__arrow umb-outline btn-reset"
-            ng-style="{'visibility': (scope.enablelistviewexpand === 'true' || node.hasChildren && (!node.metaData.isContainer || isDialog)) ? 'visible' : 'hidden'}"
-            ng-click="load(node, $event)">
-      <umb-icon icon="{{(node.expanded && !node.metaData.isContainer) ? 'icon-navigation-down' : 'icon-navigation-right'}}"></umb-icon>
-      <!-- TODO: Use localization for this text -->
-      <span class="sr-only">
-        <localize key="visuallyHiddenTexts_expandChildItems">Expand child items for</localize>
-        {{node.name}}
-      </span>
-    </button>
-
-    <umb-icon icon="{{node.selected ? 'icon-check' : node.icon}}" class="icon umb-tree-icon sprTree"
-              ng-class="node.cssClass" title="{{::node.title}}" ng-click="select(node, $event)" ng-style="::node.style"
-              tabindex="-1"></umb-icon>
-    <span class="umb-tree-item__annotation"></span>
-    <a class="umb-tree-item__label" ng-href="#/{{::node.routePath}}" ng-click="select(node, $event)"
-       title="{{::node.title}}">{{node.name}}</a>
-
-    <!-- NOTE: These are the 'option' ellipsis -->
-    <umb-button-ellipsis ng-if="::node.menuUrl" element="tree-item-options" action="options(node, $event)"
-                         text="{{optionsText}} {{node.name}}" state="hidden" class="umb-options">
-    </umb-button-ellipsis>
-
-    <umb-loader ng-show="node.loading" position="bottom" class="umb-tree-item__loader"></umb-loader>
-  </div>
-
-  <ul ng-class="{collapsed: !node.expanded}">
-    <umb-tree-item class="umb-animated" ng-repeat="child in node.children track by child.id"
-                   enablelistviewexpand="{{enablelistviewexpand}}" tree="tree" current-node="currentNode" node="child"
-                   is-dialog="isDialog" section="{{section}}"></umb-tree-item>
-  </ul>
-</li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
deleted file mode 100644
index c2407db6fc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="form-search">
-
-    <umb-search-filter
-        input-id="{{inputId}}"
-        model="term"
-        label-key="general_typeToSearch"
-        text="Type to search..."
-        css-class="w-100"
-        auto-focus="autoFocus"
-        show-back-button="showSearch"
-        on-back="hideSearch()">
-    </umb-search-filter>
-
-    <h4 ng-if="showSearch && searchFromName">
-        <small><localize key="general_search">Search</localize>:&nbsp;</small>
-        {{searchFromName}}
-    </h4>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html
deleted file mode 100644
index 97b3f6824f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div>
-    <umb-empty-state ng-if="results.length === 0" position="{{emptySearchResultPosition}}">
-        <p role="alert"><localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize></p>
-    </umb-empty-state>
-    <p ng-if="results.length === 1" role="alert">1 <localize key="treeSearch_searchResult">item returned</localize></p>
-    <p ng-if="results.length > 1" role="alert">{{results.length}} <localize key="treeSearch_searchResults">items returned</localize></p>
-    <ul class="umb-tree">
-        <li class="root">
-            <ul class="umb-search-group">
-                <li class="umb-search-group-item" ng-class="{ 'not-published': !result.metaData.published }" ng-repeat="result in results">
-                    <div ng-class="{ 'umb-tree-node-checked': result.selected }">
-                        <button type="button"
-                                class="btn-reset umb-search-group-item-link"
-                                ng-class="{ first: $first }"
-                                ng-click="selectResultCallback($event, result)">
-                            <span class="umb-search-group-item-name">
-                                <umb-icon icon="{{result.selected ? 'icon-check' : result.icon}}" class="icon umb-tree-icon sprTree"></umb-icon>
-                                <span class="umb-search-group-item-name__text">{{ result.name }}</span>
-                            </span>
-                            <small class="search-subtitle" ng-if="result.subTitle">{{ result.subTitle }}</small>
-                        </button>
-                    </div>
-                </li>
-            </ul>
-        </li>
-    </ul>
-
-</div>
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html
deleted file mode 100644
index 055bcfedc1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<ul class="umb-tree" ng-class="{'hide-options': hideoptions === 'true'}">
-  <li ng-if="!tree.root.containsGroups">
-    <div class="umb-tree-root" data-element="tree-root" ng-class="getNodeCssClass(tree.root)"
-         ng-if="hideheader !== 'true'" on-right-click="altSelect(tree.root, $event)">
-      <h1>
-        <a ng-href="#/{{section}}" ng-click="select(tree.root, $event)" class="umb-tree-root-link umb-outline"
-           data-element="tree-root-link">
-          <umb-icon icon="icon-check" class="umb-tree-icon" ng-class="selectEnabledNodeClass(tree.root)"
-                    ng-if="enablecheckboxes === 'true'">
-          </umb-icon>
-          {{tree.name}}
-        </a>
-      </h1>
-
-      <umb-button-ellipsis element="tree-item-options" action="options(tree.root, $event)"
-                           text="{{labels.openContextNode}} {{tree.name}}" state="hidden" class="umb-options"
-                           ng-hide="tree.root.isContainer || !tree.root.menuUrl" ng-swipe-right="options(tree.root, $event)">
-      </umb-button-ellipsis>
-    </div>
-
-    <ul ng-if="tree.root.children.length > 0">
-      <umb-tree-item class="umb-animated" ng-repeat="child in tree.root.children"
-                     enablelistviewexpand="{{enablelistviewexpand}}" node="child" current-node="currentNode" tree="this"
-                     is-dialog="isdialog" section="{{section}}">
-      </umb-tree-item>
-    </ul>
-  </li>
-
-  <!-- REPEAT for each group in the tree -->
-  <li ng-if="tree.root.containsGroups" ng-repeat="group in tree.root.children">
-    <div class="umb-tree-root" data-element="tree-root" ng-class="getNodeCssClass(group)"
-         ng-hide="hideheader === 'true'" on-right-click="altSelect(group, $event)">
-      <h1>
-        <a ng-href="#/{{section}}" ng-click="select(group, $event)" class="umb-tree-root-link umb-outline"
-           data-element="tree-root-link">
-          <umb-icon icon="icon-check" class="umb-tree-icon" ng-class="selectEnabledNodeClass(group)"
-                    ng-if="enablecheckboxes === 'true'">
-          </umb-icon>
-          {{group.name}}
-        </a>
-      </h1>
-
-      <umb-button-ellipsis element="tree-item-options" action="options(group, $event)"
-                           text="{{labels.openContextNode}} {{group.name}}" state="hidden" class="umb-options"
-                           ng-hide="group.isContainer || !group.menuUrl" ng-swipe-right="options(group, $event)">
-      </umb-button-ellipsis>
-    </div>
-
-    <ul ng-if="group.children.length > 0">
-      <umb-tree-item class="umb-animated" ng-repeat="child in group.children"
-                     enablelistviewexpand="{{enablelistviewexpand}}" node="child" current-node="currentNode" tree="this"
-                     is-dialog="isdialog" section="{{section}}">
-      </umb-tree-item>
-    </ul>
-  </li>
-  <!-- END REPEAT -->
-</ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umbcontextdialog/umb-context-dialog.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umbcontextdialog/umb-context-dialog.html
deleted file mode 100644
index beeec89c8f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umbcontextdialog/umb-context-dialog.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div id="dialog"
-     class="umb-modalcolumn fill shadow"
-     on-outside-click="outSideClick()"
-     role="dialog"
-     aria-labelledby="contextdialog-title"
-     aria-describedby="contextdialog-description">
-    <div class="umb-modalcolumn-header">
-        <h2 id="contextdialog-title">{{dialogTitle}}</h2>
-        <p id="contextdialog-description" class="sr-only">
-            <localize key="visuallyHiddenTexts_contextDialogDescription" tokens="[dialogTitle,currentNode.name]">Perform action {{dialogTitle}} on the {{currentNode.name}} node</localize>
-        </p>
-    </div>
-    <div class="umb-modalcolumn-body" ng-include="view"></div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html
deleted file mode 100644
index 81c7d628d2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-    <img class="umb-avatar umb-avatar--{{size}}" ng-if="imgSrc" ng-src="{{imgSrc}}" ng-srcset="{{imgSrcset}}" alt="{{avatarAlt}}"/>
-    <div class="umb-avatar umb-avatar--{{size}} umb-avatar--{{color}}" ng-if="!imgSrc">
-        <span ng-if="name">{{ initials }}</span>
-        <span ng-if="!name">{{unknownChar}}</span>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-badge.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-badge.html
deleted file mode 100644
index 1fd0c91520..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-badge.html
+++ /dev/null
@@ -1 +0,0 @@
-<span class="umb-badge umb-badge--{{color}} umb-badge--{{size}}" ng-transclude></span>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-checkmark.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-checkmark.html
deleted file mode 100644
index 03125659b4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-checkmark.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="umb-checkmark umb-checkmark--{{size}} umb-outline" ng-class="{'umb-checkmark--checked': checked, 'cursor-auto': readonly}">
-    <umb-icon icon="icon-check"></umb-icon>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html
deleted file mode 100644
index 68eee26606..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<div class="umb-child-selector">
-
-    <div class="umb-child-selector__child -parent">
-        <div class="umb-child-selector__child-description">
-            <div class="umb-child-selector__child-icon-holder">
-                <umb-icon icon="{{parentIcon}}" class="umb-child-selector__child-icon"></umb-icon>
-            </div>
-            <span class="umb-child-selector__child-name">
-                <strong>{{parentName}}</strong>
-            </span>
-            <small>
-                (<localize key="general_current">current</localize>)
-            </small>
-        </div>
-    </div>
-
-    <div class="umb-child-selector__children-container" ui-sortable="sortableOptions" ng-model="selectedChildren">
-
-        <div class="umb-child-selector__child" ng-repeat="selectedChild in selectedChildren">
-            <div class="umb-child-selector__child-description">
-                <div class="umb-child-selector__child-icon-holder">
-                    <umb-icon icon="{{selectedChild.icon}}" class="umb-child-selector__child-icon"></umb-icon>
-                </div>
-                <span class="umb-child-selector__child-name">{{selectedChild.name}}</span>
-            </div>
-            <div class="umb-child-selector__child-actions">
-                <button type="button" class="umb-node-preview__action umb-node-preview__action--red umb-child-selector__child-remove" ng-click="removeChild(selectedChild, $index, $event)">
-                    <localize key="general_remove">Remove</localize>
-                </button>
-            </div>
-        </div>
-
-        <button type="button" class="umb-child-selector__child -placeholder unsortable" ng-click="addChild($event)" hotkey="alt+shift+c">
-            <div class="umb-child-selector__child-name -blue"><strong><localize key="shortcuts_addChild">Add Child</localize></strong></div>
-        </button>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-code-snippet.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-code-snippet.html
deleted file mode 100644
index 7a0ed5f540..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-code-snippet.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="umb-code-snippet" ng-class="{ 'umb-code-snippet--wrap': vm.wrap === true }">
-    <div class="umb-code-snippet__header">
-        <span class="language" ng-if="vm.language">{{vm.language}}</span>
-
-        <umb-button umb-clipboard
-                    umb-clipboard-success="vm.copySuccess()"
-                    umb-clipboard-error="vm.copyError()"
-                    umb-clipboard-target="#umbCodeSnippet_{{vm.guid}}"
-                    state="vm.page.copyCodeButtonState"
-                    icon="icon-documents"
-                    type="button"
-                    size="s"
-                    label="Copy"
-                    label-key="general_copy">
-        </umb-button>
-
-    </div>
-    <div class="umb-code-snippet__content">
-        <pre id="umbCodeSnippet_{{vm.guid}}">
-            <code ng-transclude></code>
-        </pre>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
deleted file mode 100644
index da1763ef5e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="umb-color-swatches" ng-class="{ 'with-labels': useLabel }">
-
-    <button
-        type="button"
-        class="umb-color-box umb-color-box--{{size}} {{colorClassNamePrefix}}-{{color.value}}"
-        ng-repeat="color in colors"
-        title="{{useLabel || useColorClass ? (color.label || color.value) : ('#' + color.value)}}"
-        hex-bg-inline="{{useColorClass === false}}"
-        hex-bg-color="{{color.value}}"
-        ng-class="{ 'active': isSelectedColor(color) }"
-        ng-click="setColor(color, $index, $event)">
-
-        <div class="umb-color-box-inner">
-            <div class="check_circle">
-                <umb-icon icon="icon-check" class="icon small" ng-show="isSelectedColor(color)"></umb-icon>
-            </div>
-            <div class="umb-color-box__label" ng-if="useLabel">
-                <div class="umb-color-box__name truncate">{{color.label || color.value}}</div>
-                <div class="umb-color-box__description">#{{color.value}}</div>
-            </div>
-        </div>
-    </button>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
deleted file mode 100644
index 530f017c60..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="umb_confirm-action__overlay"
-     ng-class="{
-     '-top': direction === 'top',
-     '-right': direction === 'right',
-     '-bottom': direction === 'bottom',
-     '-left': direction === 'left'}"
-     on-outside-click="clickCancel()">
-
-    <button type="button" class="umb_confirm-action__overlay-action -confirm btn-reset" ng-click="clickConfirm()" localize="title" title="@buttons_confirmActionConfirm">
-        <umb-icon icon="icon-check"></umb-icon>
-        <span class="sr-only">
-            <localize key="buttons_confirmActionConfirm">Confirm</localize>
-        </span>
-    </button>
-
-    <button type="button" class="umb_confirm-action__overlay-action -cancel btn-reset" ng-click="clickCancel()" localize="title" title="@buttons_confirmActionCancel">
-        <umb-icon icon="icon-delete"></umb-icon>
-        <span class="sr-only">
-            <localize key="buttons_confirmActionCancel">Cancel</localize>
-        </span>
-    </button>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
deleted file mode 100644
index 9895bc1510..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div>
-    <p ng-hide="!caption" class="umb-abstract">{{caption}}</p>
-    <div class="btn-toolbar umb-btn-toolbar">
-        <umb-button ng-if="showCancel"
-                    type="button"
-                    action="onCancel()"
-                    button-style="link"
-                    disabled="confirmButtonState === 'busy'"
-                    label-key="general_cancel">
-        </umb-button>
-        <umb-button ng-if="showConfirm"
-                    type="button"
-                    action="confirm()"
-                    button-style="{{confirmButtonStyle || 'primary'}}"
-                    state="confirmButtonState"
-                    disabled="confirmDisabled === true"
-                    label-key="{{confirmLabelKey || 'general_ok'}}">
-        </umb-button>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html
deleted file mode 100644
index 4adf75fd93..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="umb-content-grid">
-
-   <div
-      class="umb-content-grid__item umb-outline umb-outline--surrounding"
-      ng-repeat="item in content"
-      ng-class="{'-selected': item.selected, '-clickable': allowClick !== false}"
-      ng-click="clickItem(item, $event, $index)">
-
-      <div class="umb-content-grid__content">
-
-        <a class="umb-content-grid__item-name umb-outline"
-           ng-href="{{'#' + item.editPath}}"
-           ng-click="clickItemName(item, $event, $index)"
-           ng-class="{'-light': !item.published && item.updater != null}">
-            <umb-icon icon="{{item.icon}}" class="umb-content-grid__icon"></umb-icon>
-            <span>{{item.name}}</span>
-        </a>
-
-        <ul class="umb-content-grid__details-list" ng-class="{'-light': !item.published && item.updater != null}">
-            <li class="umb-content-grid__details-item" ng-if="item.state">
-                <div class="umb-content-grid__details-label"><localize key="general_status">Status</localize>:</div>
-                <div class="umb-content-grid__details-value"><umb-variant-state variant="item"></umb-variant-state></div>
-            </li>
-            <li class="umb-content-grid__details-item" ng-repeat="property in contentProperties">
-                <div class="umb-content-grid__details-label">{{ property.header }}:</div>
-                <div class="umb-content-grid__details-value">{{ item[property.alias].expression ? item[property.alias].expression({value: item[property.alias].value}) : item[property.alias] }}</div>
-            </li>
-        </ul>
-
-      </div>
-
-   </div>
-
-    <umb-empty-state
-       ng-if="!content"
-       position="center">
-       <localize key="content_noItemsToShow">There are no items to show</localize>
-    </umb-empty-state>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-date-time-picker.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-date-time-picker.html
deleted file mode 100644
index 6f3f5b3ec0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-date-time-picker.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="datepicker" style="position: relative;">
-
-    <div ng-hide="hasTranscludedContent" class="input-append date">
-        <input type="text" data-format="{{options.format}}" class="datepickerinput" />
-        <span class="add-on" aria-hidden="true">
-            <umb-icon icon="icon-calendar"></umb-icon>
-        </span>
-    </div>
-
-    <div class="js-datePicker__transcluded-content" ng-transclude></div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown-item.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown-item.html
deleted file mode 100644
index 98f9ece409..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown-item.html
+++ /dev/null
@@ -1 +0,0 @@
-<li role="menuitem" ng-transclude></li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown.html
deleted file mode 100644
index f2bde04232..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-dropdown.html
+++ /dev/null
@@ -1 +0,0 @@
-<ul class="dropdown-menu" role="menu" on-outside-click="close()" ng-transclude></ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-empty-state.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-empty-state.html
deleted file mode 100644
index e98227753e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-empty-state.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div
-    class="umb-empty-state"
-    ng-class="{
-        '-small': size === 'small',
-        '-large': size === 'large',
-        '-center': position === 'center'
-    }"
-    ng-transclude>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-file-icon.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-file-icon.html
deleted file mode 100644
index ee382c2171..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-file-icon.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<span class="umb-file-icon umb-file-icon--{{vm.size}}">
-    <span class="umb-file-icon__inner">
-        <umb-icon icon="{{vm.icon}}" class="icon"></umb-icon>
-        <span ng-if="vm.extension" class="umb-file-icon__extension">.{{vm.extension}}</span>
-    </span>
-    <small ng-if="vm.text" class="umb-file-icon__text">{{vm.text}}</small>
-</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-folder-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-folder-grid.html
deleted file mode 100644
index 4c1285f648..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-folder-grid.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="umb-folder-grid">
-
-   <div
-      class="umb-folder-grid__folder"
-      ng-repeat="folder in folders"
-      ng-class="{'-selected': folder.selected}"
-      ng-click="clickFolder(folder, $event, $index)">
-
-      <div class="umb-folder-grid__folder-description">
-          <umb-icon icon="{{folder.icon}}" class="umb-folder-grid__folder-icon"></umb-icon>
-          <div ng-click="clickFolderName(folder, $event, $index)" class="umb-folder-grid__folder-name">{{folder.name}}</div>
-      </div>
-
-   </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-generate-alias.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-generate-alias.html
deleted file mode 100644
index 820963b11b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-generate-alias.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div>
-    <span class="umb-locked-field__text cursor-not-allowed" ng-show="!enableLock">{{ alias }}</span>
-    <div ng-show="enableLock">
-    <umb-locked-field
-      locked="locked"
-      ng-model="alias"
-      placeholder-text="placeholderText"
-      validation-position="validationPosition"
-      server-validation-field="{{serverValidationField}}">
-    </umb-locked-field>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
deleted file mode 100644
index 502ece74e4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="umb-grid-selector">
-
-    <div class="umb-grid-selector__items">
-
-        <div class="umb-grid-selector__item -default" ng-if="defaultItem !== null">
-
-            <div class="umb-grid-selector__item-content">
-                <umb-icon icon="{{defaultItem.icon}}" class="umb-grid-selector__item-icon"></umb-icon>
-                <div class="umb-grid-selector__item-label">{{ defaultItem.name }}</div>
-                <div ng-show="defaultItem.id"><button class="umb-grid-selector__item-default-label btn-link -blue" ng-click="openTemplate(defaultItem)"><localize key="general_open">Open</localize></button></div>
-                <span class="umb-grid-selector__item-default-label">(<localize key="general_default">Default</localize> {{itemLabel}})</span>
-            </div>
-
-            <button type="button" class="btn-reset" ng-if="selectedItems.length === 1" ng-click="removeDefaultItem()">
-                <umb-icon icon="icon-trash" class="umb-grid-selector__item-remove"></umb-icon>
-                <span class="sr-only">Remove Template</span>
-            </button>
-
-        </div>
-
-        <div class="umb-grid-selector__item" ng-repeat="selectedItem in selectedItems | filter: { alias:'!'+defaultItem.alias }:true">
-
-            <div class="umb-grid-selector__item-content">
-                <umb-icon icon="{{selectedItem.icon}}" class="umb-grid-selector__item-icon"></umb-icon>
-
-                <div class="umb-grid-selector__item-label">{{ selectedItem.name }}</div>
-                <div><button class="umb-grid-selector__item-default-label btn-link -blue" ng-click="openTemplate(selectedItem)"><localize key="general_open">Open</localize></button></div>
-                <div><button class="umb-grid-selector__item-default-label btn-link -blue" ng-click="setAsDefaultItem(selectedItem)"><localize key="grid_setAsDefault">Set as default</localize></button></div>
-            </div>
-
-            <button type="button" class="btn-reset" ng-click="removeItem(selectedItem)">
-                <umb-icon icon="icon-trash" class="umb-grid-selector__item-remove"></umb-icon>
-                <span class="sr-only">Remove Template</span>
-            </button>
-
-        </div>
-
-        <button type="button" class="umb-grid-selector__item -placeholder" ng-if="(availableItems | compareArrays:selectedItems:'alias').length > 0" ng-click="openItemPicker($event)" hotkey="alt+shift+t">
-            <div class="umb-grid-selector__item-content">
-                <div class="umb-grid-selector__item-label -blue" ng-if="defaultItem !== null"><localize key="grid_chooseExtra">Choose extra</localize> {{itemLabel}}</div>
-                <div class="umb-grid-selector__item-label -blue" ng-if="defaultItem === null"><localize key="grid_chooseDefault">Choose default</localize> {{itemLabel}}</div>
-            </div>
-        </button>
-
-    </div>
-
-    <div class="text-center" ng-if="(availableItems | compareArrays:selectedItems:'alias').length === 0">
-        <small><localize key="general_all">All</localize> {{itemLabel}}s <localize key="grid_areAdded">are added</localize></small>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
deleted file mode 100644
index c35e1ee45a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<div data-element="groups-builder" class="clearfix">
-
-    <umb-editor-sub-header class="umb-group-builder__toolbar" appearance="white">
-
-        <umb-editor-sub-header-content-left class="left">
-            <div class="umb-group-builder__tabs" ng-if="(sortingMode && tabs.length > 0) || (!sortingMode)">
-                <button ng-show="overflow.left > 0" class="btn-reset umb-group-builder__tabs-overflow umb-group-builder__tabs-overflow--left" ng-click="moveTabsOverflowLeft()">
-                    <span class="caret"></span>
-                </button>
-
-                <ul class="umb-group-builder__tabs-list" ui-sortable="sortableOptionsTab" ng-model="tabs" umb-overflow-checker on-overflow="setTabOverflowState(overflowLeft, overflowRight)">
-                    <li ng-if="hasGenericTab" umb-droppable="droppableOptionsTab" data-tab-alias="{{genericTab.alias}}">
-                        <umb-content-type-tab
-                            tab="genericTab"
-                            is-open="genericTab.alias == openTabAlias"
-                            on-click="changeTab(genericTab)"
-                            allow-change-name="false">
-                        </umb-content-type-tab>
-                    </li>
-                    <li ng-repeat="(tabIndex, tab) in tabs track by tab.key" ng-class="{'umb-group-builder__tab-sortable': sortingMode}" umb-droppable="droppableOptionsTab" data-tab-key="{{tab.key}}"  data-tab-alias="{{tab.alias}}">
-                        <umb-content-type-tab
-                            tab="tab"
-                            is-open="tab.alias === openTabAlias"
-                            on-click="changeTab(tab)"
-                            on-click-composition="openContentType(contentTypeId)"
-                            sorting="sortingMode"
-                            allow-remove="canRemoveTab(tab) && !sortingMode"
-                            on-remove="removeTab(tab, tabIndex)"
-                            val-server-field-name="{{'Groups[' + tab.serverValidationIndex + '].Name'}}"
-                            on-change-sort-order-value="orderTabs()"
-                            on-change-name="onChangeTabName(tab)">
-                        </umb-content-type-tab>
-                    </li>
-                    <li class="umb-group-builder__tabs-list__add-tab">
-                        <umb-button
-                            ng-if="!sortingMode"
-                            class="umb-group-builder__tabs__add-tab"
-                            type="button"
-                            label-key="contentTypeEditor_addTab"
-                            icon="icon-add"
-                            button-style="white"
-                            action="addTab();">
-                        </umb-button>
-                    </li>
-                </ul>
-                <button ng-if="overflow.right < 0" class="btn-reset umb-group-builder__tabs-overflow umb-group-builder__tabs-overflow--right" ng-click="moveTabsOverflowRight()">
-                    <span class="caret"></span>
-                </button>
-            </div>
-
-        </umb-editor-sub-header-content-left>
-
-        <umb-editor-sub-header-content-right class="right">
-            <div
-                ng-if="sortingMode"
-                class="umb-group-builder__convert-dropzone"
-                umb-droppable="droppableOptionsConvert">
-                <localize key="contentTypeEditor_convertToTab">Convert to tab</localize>
-            </div>
-
-            <umb-button
-                style="margin-right: 5px;"
-                alias="compositions"
-                ng-if="compositions !== false"
-                type="button"
-                button-style="outline"
-                label-key="contentTypeEditor_compositions"
-                icon="icon-merge"
-                action="openCompositionsDialog()"
-                size="xs"
-                add-ellipsis="true"
-                state="compositionsButtonState">
-            </umb-button>
-
-            <umb-button
-                alias="reorder"
-                ng-if="sorting !== false"
-                type="button"
-                button-style="outline"
-                label-key="{{sortingButtonKey}}"
-                icon="icon-navigation"
-                action="toggleSortingMode();"
-                size="xs">
-            </umb-button>
-
-        </umb-editor-sub-header-content-right>
-
-    </umb-editor-sub-header>
-
-    <a ng-if="!sortingMode" hotkey="alt+shift+p" ng-click="addPropertyToActiveGroup()"></a>
-    <a ng-if="!sortingMode" hotkey="alt+shift+g" ng-click="addGroupToActiveTab()"></a>
-
-    <div ng-if="sortingMode && model.groups.length === 0" class="umb-group-builder__no-data-text">
-        <localize key="contentTypeEditor_noGroups">You have not added any groups</localize>
-    </div>
-
-    <!-- Properties added directly to a tab -->
-    <umb-box ng-repeat="(tabIndex, tab) in tabs track by tab.key" ng-show="isUngroupedPropertiesVisible(tab)" class="umb-group-builder__ungrouped-properties">
-        <umb-box-content>
-            <ul class="umb-group-builder__properties" ui-sortable="sortableOptionsProperty" ng-model="tab.properties" ng-show="tab.properties.length > 0 || sortingMode">
-                <li ng-repeat="(propertyIndex, property) in tab.properties track by propertyIndex" ng-class="{'umb-group-builder__property-sortable': sortingMode && !property.inherited}">
-                    <umb-content-type-property
-                        ng-if="property.propertyState !== 'init'"
-                        property="property"
-                        sortable="sortingMode"
-                        on-edit="editPropertyTypeSettings(property)"
-                        on-remove="deleteProperty(tab.properties, property)"
-                        on-click-composition="openContentType(contentTypeId)"
-                        val-server-field-alias="{{'Groups[' + tab.serverValidationIndex + '].Properties[' + propertyIndex + '].Alias'}}"
-                        val-server-field-label="{{'Groups[' + tab.serverValidationIndex + '].Properties[' + propertyIndex + '].Label'}}"
-                        on-change-sort-order-value="onChangePropertySortOrderValue(tab)"
-                        val-tab-alias="tab-content-{{tab.alias}}">
-                    </umb-content-type-property>
-                </li>
-            </ul>
-            <button
-                ng-if="!sortingMode"
-                type="button"
-                data-element="property-add"
-                class="umb-group-builder__group-add-property"
-                ng-click="addNewProperty(tab)">
-                <localize key="contentTypeEditor_addProperty">Add property</localize>
-            </button>
-
-            <umb-empty-state
-                ng-if="sortingMode && tab.properties.length === 0"
-                position="center">
-                {{ tabDirectPropertiesDropZoneLabel }}
-            </umb-empty-state>
-        </umb-box-content>
-    </umb-box>
-
-    <!-- Groups -->
-    <div class="umb-group-builder__groups" ui-sortable="sortableOptionsGroup" ng-model="model.groups">
-        <div
-            ng-repeat="(groupIndex, group) in model.groups track by group.key"
-            ng-show="group.type === 'Group' && group.parentAlias === openTabAlias"
-            ng-class="{'umb-group-builder__group-sortable': sortingMode && !group.inherited}"
-            data-group-key="{{group.key}}">
-
-            <umb-content-type-group
-                ng-if="group.tabState !== 'init'"
-                on-focus="activateGroup(group)"
-                allow-name="true"
-                group="group"
-                allow-remove="canRemoveGroup(group) && !sortingMode"
-                on-click-composition="openContentType(contentTypeId)"
-                on-remove="removeGroup(group)"
-                on-update-name="onChangeGroupName(group)"
-                sorting="sortingMode"
-                on-change-sort-order-value="onChangeGroupSortOrderValue(group)"
-                val-server-field-name="{{'Groups[' + group.serverValidationIndex + '].Name'}}"
-                val-tab-alias="tab-content-{{group.type === 'Group' ? group.parentAlias : group.alias}}">
-
-                <ul class="umb-group-builder__properties" ui-sortable="sortableOptionsProperty" ng-model="group.properties" ng-show="group.properties.length > 0 || sortingMode">
-                    <li ng-repeat="(propertyIndex, property) in group.properties track by propertyIndex" ng-class="{'umb-group-builder__property-sortable': sortingMode && !property.inherited}">
-                        <umb-content-type-property
-                            ng-if="property.propertyState !== 'init'"
-                            property="property"
-                            sortable="sortingMode"
-                            on-edit="editPropertyTypeSettings(property)"
-                            on-remove="deleteProperty(group.properties, property)"
-                            on-click-composition="openContentType(contentTypeId)"
-                            on-change-sort-order-value="onChangePropertySortOrderValue(group)"
-                            val-server-field-alias="{{'Groups[' + group.serverValidationIndex + '].Properties[' + propertyIndex + '].Alias'}}"
-                            val-server-field-label="{{'Groups[' + group.serverValidationIndex + '].Properties[' + propertyIndex + '].Label'}}"
-                            val-tab-alias="tab-content-{{group.type === 'Group' ? group.parentAlias : group.alias}}">
-                        </umb-content-type-property>
-                    </li>
-                </ul>
-                <button
-                    ng-if="!sortingMode"
-                    type="button"
-                    data-element="property-add"
-                    class="umb-group-builder__group-add-property"
-                    ng-click="addNewProperty(group)">
-                    <localize key="contentTypeEditor_addProperty">Add property</localize>
-                </button>
-            </umb-content-type-group>
-        </div>
-    </div>
-    <button
-        ng-if="!sortingMode"
-        type="button"
-        class="umb-group-builder__group -placeholder"
-        ng-click="addGroupToActiveTab()"
-        data-element="group-add">
-        <localize key="contentTypeEditor_addGroup">Add group</localize>
-    </button>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-icon.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-icon.html
deleted file mode 100644
index 7623f731ec..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-icon.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<span aria-hidden="true" class="umb-icon">
-    <span class="umb-icon__inner {{icon}}">
-        <ng-transclude>
-            <span ng-if="svgString" ng-bind-html="svgString"></span>
-            <i ng-if="!svgString && icon" class="{{icon}}"></i>
-        </ng-transclude>
-    </span>
-</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-keyboard-shortcuts-overview.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-keyboard-shortcuts-overview.html
deleted file mode 100644
index b5b6524ce3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-keyboard-shortcuts-overview.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="umb-keyboard-shortcuts-overview flex items-center cursor-pointer" data-hotkey="alt+shift+k" ng-click="toggleShortcutsOverlay()">
-        
-    <div class="umb-keyboard-shortcuts-overview__description">
-        <localize key="shortcuts_showShortcuts">show shortcuts</localize>
-    </div>
-    
-    <div class="umb-keyboard-keys">
-        <div class="umb-keyboard-key-wrapper">
-            <div class="umb-keyboard-key">alt</div>
-            <div>+</div>
-        </div>
-        <div class="umb-keyboard-key-wrapper">
-            <div class="umb-keyboard-key">shift</div>
-            <div>+</div>
-        </div>
-        <div class="umb-keyboard-key-wrapper">
-            <div class="umb-keyboard-key">k</div>
-        </div>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
deleted file mode 100644
index c28ea3c6b7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-layout-selector.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="umb-layout-selector" ng-show="vm.showLayoutSelector">
-
-   <button type="button" aria-expanded="{{vm.layoutDropDownIsOpen}}" class="umb-layout-selector__active-layout umb-outline" ng-click="vm.toggleLayoutDropdown()">
-      <umb-icon icon="{{vm.activeLayout.icon}}"></umb-icon>
-      <span class="sr-only">
-          <localize key="visuallyHiddenTexts_activeListLayout">Active layout:</localize>&nbsp;
-          {{vm.activeLayout.name}}
-      </span>
-   </button>
-
-   <div ng-if="vm.layoutDropDownIsOpen"
-        class="umb-layout-selector__dropdown shadow-depth-3 animated -half-second fadeIn"
-        on-outside-click="vm.closeLayoutDropdown()"
-        deep-blur="vm.leaveLayoutDropdown()">
-
-       <button type="button"
-               ng-repeat="layout in vm.layouts | filter: { selected: true } track by $id(layout)"
-               class="umb-layout-selector__dropdown-item"
-               ng-click="vm.pickLayout(layout)"
-               ng-class="{'-active': layout.active }"
-               ng-attr-title="{{layout.name}}">
-
-           <umb-icon icon="{{layout.icon}}" class="umb-layout-selector__dropdown-item-icon"></umb-icon>
-           <span class="sr-only">{{layout.name}}</span>
-       </button>
-
-   </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-lightbox.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-lightbox.html
deleted file mode 100644
index 16a02d0804..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-lightbox.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="umb-lightbox" ng-attr-umb-focus-lock="true">
-
-    <div class="umb-lightbox__backdrop" ng-click="close()" hotkey="esc"></div>
-
-    <button type="button" umb-auto-focus class="btn-reset umb-lightbox__close" localize="title" title="@general_close" ng-click="close()">
-        <umb-icon icon="icon-delete" class="umb-lightbox__control"></umb-icon>
-        <span class="sr-only">
-            <localize key="general_close">Close</localize>
-        </span>
-    </button>
-
-    <div class="umb-lightbox__images">
-        <div class="umb-lightbox__image shadow-depth-2" ng-repeat="item in items" ng-show="$index === activeItemIndex">
-            <img ng-src="{{ item.source }}" />
-        </div>
-    </div>
-
-    <button type="button" class="btn-reset umb-lightbox__control -prev" localize="title" title="@general_previous" ng-if="activeItemIndex > 0" ng-click="prev()" hotkey="left">
-        <umb-icon icon="icon-previous" class="umb-lightbox__control-icon"></umb-icon>
-        <span class="sr-only">
-            <localize key="general_previous">Previous</localize>
-        </span>
-    </button>
-
-    <button type="button" class="btn-reset umb-lightbox__control -next" localize="title" title="general_next" ng-if="activeItemIndex + 1 < items.length" ng-click="next()" hotkey="right">
-        <umb-icon icon="icon-next" class="umb-lightbox__control-icon"></umb-icon>
-        <span class="sr-only">
-            <localize key="general_next">Next</localize>
-        </span>
-    </button>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-layout.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-layout.html
deleted file mode 100644
index a4ea2d2481..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-layout.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-   <div ng-include="options.layout.activeLayout.path"></div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings-overlay.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings-overlay.html
deleted file mode 100644
index cddd27c01d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings-overlay.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<umb-editor-view>
-    <umb-editor-header 
-        name="model.title" 
-        name-locked="true" 
-        hide-alias="true" 
-        hide-description="model.hideDescription" 
-        hide-icon="model.hideIcon">
-    </umb-editor-header>
-    <umb-editor-container class="umb-list-view-settings__overlay">
-       <form name="listViewSettingsForm" novalidate val-form-manager>
-           <umb-box>
-               <umb-box-content>
-                    <!-- list view settings -->
-                    <umb-property property="preValue" ng-repeat="preValue in model.dataType.preValues">
-                        <umb-property-editor model="preValue" pre-values="vm.dataType.preValues" is-pre-value="true"></umb-property-editor>
-                    </umb-property>
-               </umb-box-content>
-           </umb-box>
-        </form>
-    </umb-editor-container>
-    <umb-editor-footer>
-        <umb-editor-footer-content-right>
-            <umb-button 
-                type="button" 
-                button-style="link" 
-                label-key="general_close"
-                shortcut="esc"
-                action="model.close()">
-            </umb-button>
-            <umb-button
-                type="button"               
-                button-style="success" 
-                label-key="buttons_saveListView" 
-                action="model.submit(model)">                
-            </umb-button>            
-        </umb-editor-footer-content-right>
-    </umb-editor-footer>
-</umb-editor-view>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html
deleted file mode 100644
index 2695300d47..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="umb-list-view-settings">
-
-  <div class="umb-list-view-settings__trigger">
-        <umb-toggle
-            checked="enableListView"
-            on-click="toggle()"
-            hotkey="alt+shift+l">
-        </umb-toggle>
-  </div>
-
-  <!-- list view enabled -->
-  <div ng-if="enableListView" class="flex">
-    <div class="umb-list-view-settings__box">
-        <div class="flex">
-            <umb-icon icon="icon-list" class="umb-list-view-settings__list-view-icon"></umb-icon>
-            <div>
-                <div class="umb-list-view-settings__name">
-                    {{dataType.name}} 
-                    <em ng-if="!customListViewCreated">(<localize key="general_default">default</localize>)</em>
-                </div>
-                <button type="button"
-                        class="btn-link umb-list-view-settings__create-new"
-                        ng-if="!customListViewCreated"
-                        ng-click="createCustomListViewDataType()">
-                    <localize key="editcontenttype_createListView">Create custom list view</localize>
-                </button>
-                <button type="button"
-                        class="btn-link umb-list-view-settings__remove-new"
-                        ng-if="customListViewCreated"
-                        ng-click="removeCustomListDataType()">
-                    <localize key="editcontenttype_removeListView">Remove custom list view</localize>
-                </button>
-            </div>
-        </div>
-        <umb-load-indicator ng-show="loading"></umb-load-indicator>
-    </div>    
-    <div class="umb-group-builder__property-actions">
-        <div class="umb-group-builder__property-action">
-            <button type="button"
-                    class="btn-icon"
-                    ng-click="showSettingsOverlay()"
-                    aria-label="Edit"
-                    localize="title"
-                    title="@general_edit">
-                <umb-icon icon="icon-settings"></umb-icon>
-            </button>
-        </div>
-    </div>
-  </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-load-indicator.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-load-indicator.html
deleted file mode 100644
index 4d545e21e2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-load-indicator.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<ul class="umb-load-indicator animated -half-second">
-  <li class="umb-load-indicator__bubble"></li>
-  <li class="umb-load-indicator__bubble"></li>
-  <li class="umb-load-indicator__bubble"></li>
-</ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-loader.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-loader.html
deleted file mode 100644
index 07aeb7fdfa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-loader.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="umb-loader-wrapper" ng-class="{ '-top': position === 'top', '-bottom': position === 'bottom' }">
-    <div class="umb-loader"></div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
deleted file mode 100644
index 9c4e694335..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<ng-form name="lockedFieldForm" class="umb-locked-field">
-
-    <div class="umb-locked-field__wrapper">
-
-        <button aria-label="Unlock" ng-if="locked" ng-click="unlock()" class="umb-locked-field__toggle">
-            <umb-icon icon="icon-lock" class="umb-locked-field__lock-icon"></umb-icon>
-        </button>
-
-        <button aria-label="Lock" ng-if="!locked" ng-click="lock()" class="umb-locked-field__toggle">
-            <umb-icon icon="icon-unlocked" class="umb-locked-field__lock-icon -unlocked"></umb-icon>
-        </button>
-
-        <input type="text"
-               no-password-manager
-               class="umb-locked-field__input"
-               name="lockedField"
-               ng-model="ngModel"
-               ng-disabled="locked"
-               ng-class="{'-unlocked': !locked}"
-               placeholder="{{placeholderText}}"
-               val-regex="{{regexValidation}}"
-               umb-auto-resize
-               required
-               val-server-field="{{serverValidationField}}"
-               title="{{ngModel}}"
-               focus-when="{{!locked}}"
-               umb-select-when="{{!locked}}"
-               ng-blur="lock()" />
-
-    </div>
-
-    <div ng-messages="lockedFieldForm.lockedField.$error" show-validation-on-submit>
-        <div class="umb-validation-label"
-             ng-class="{ '-left': validationPosition === 'left', '-right': validationPosition === 'right' }"
-             ng-message="required">
-            <localize key="general_required">Required</localize> <localize key="content_alias">alias</localize>
-        </div>
-        <div class="umb-validation-label"
-             ng-class="{ '-left': validationPosition === 'left', '-right': validationPosition === 'right' }"
-             ng-if="regexValidation.length > 0"
-             ng-message="valRegex">
-            <localize key="general_invalid">Invalid</localize> <localize key="content_alias">alias</localize>
-        </div>
-        <div class="umb-validation-label"
-             ng-class="{ '-left': validationPosition === 'left', '-right': validationPosition === 'right' }"
-             ng-if="serverValidationField.length > 0"
-             ng-message="valServerField">{{lockedFieldForm.lockedField.errorMsg}}
-        </div>
-    </div>
-
-</ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
deleted file mode 100644
index 3b486e4d11..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<div class="media-list-grid">
-    <div data-element="media-grid" class="umb-media-grid" ng-show="!showMediaList">
-        <div data-element="media-grid-item-{{$index}}"
-             class="umb-media-grid__item umb-outline umb-outline--surrounding"
-             title="{{item.name}}"
-             ng-click="clickItem(item, $event, $index)"
-             ng-repeat="item in items | filter:filterBy"
-             ng-style="item.flexStyle"
-             ng-class="{'-selected': item.selected, '-file': !item.thumbnail, '-folder': item.isFolder, '-svg': item.extension == 'svg', '-selectable': item.selectable, '-unselectable': !item.selectable, '-filtered': item.filtered}">
-
-            <div data-element="media-grid-item-edit"
-                    class="umb-media-grid__item-overlay umb-outline"
-                    ng-class="{'-locked': item.selected || !item.file || !item.thumbnail, '-can-open': (item.isFolder ? allowOpenFolder : allowOpenFile)}"
-                    ng-click="clickItemName(item, $event, $index)"
-                    tabindex="{{item.isFolder && item.selectable ? '0' : '-1'}}">
-                <umb-icon icon="icon-info"
-                          class="umb-media-grid__info"
-                          ng-if="onDetailsHover"
-                          ng-mouseover="hoverItemDetails(item, $event, true)"
-                          ng-mouseleave="hoverItemDetails(item, $event, false)">
-                </umb-icon>
-                <div class="umb-media-grid__item-name">{{item.name}}</div>
-            </div>
-
-            <!-- Select border must be right after .umb-media-grid__item-overlay -->
-            <div class="umb-media-grid__item-select"></div>
-
-            <!-- Checkered background -->
-            <div class="umb-media-grid__image-background" ng-if="item.thumbnail || item.extension === 'svg'"></div>
-
-            <!-- Image thumbnail -->
-            <img umb-image-lazy-load="{{item.thumbnail}}" class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="item.thumbnail" alt="{{item.name}}" draggable="false" />
-
-            <!-- SVG -->
-            <img class="umb-media-grid__item-image" width="{{item.width}}" height="{{item.height}}" ng-if="!item.thumbnail && item.extension === 'svg'" ng-src="{{item.image}}" alt="{{item.name}}" draggable="false" />
-
-            <!-- Transparent image - fallback - used to keep image proportions on wrapper-->
-            <img class="umb-media-grid__item-image-placeholder" ng-if="!item.thumbnail && item.extension !== 'svg'" src="assets/img/transparent.png" alt="{{item.name}}" draggable="false" />
-
-            <!-- Icon for files -->
-            <umb-file-icon ng-if="!item.thumbnail && item.extension !== 'svg'"
-                            class="umb-media-grid__item-file-icon"
-                            extension="{{item.extension}}"
-                            icon="{{item.icon}}"
-                            size="s">
-            </umb-file-icon>
-
-
-        </div>
-    </div>
-    <!-- markup for the media list -->
-
-    <div class="umb-media-grid__list-view" ng-show="showMediaList">
-            <div class="umb-table umb-table--condensed">
-                <div class="umb-table-head">
-                    <div class="umb-table-row">
-                        <div class="umb-table-cell">
-                            <input class="umb-table__input" type="checkbox"
-                                   ng-show="vm.allowSelectAll"
-                                   ng-click="vm.selectAll($event)"
-                                   ng-checked="vm.isSelectedAll()">
-                        </div>
-                        <div class="umb-table-cell umb-table__name">
-                            <button type="button"
-                                    class="umb-table-head__link sortable"
-                                    ng-click="setSort('name')">
-                                <localize key="general_name">Name</localize>
-                                <umb-icon ng-attr-icon="{{isSortDirection('name', 'asc') && 'icon-navigation-up' || isSortDirection('name', 'desc') && 'icon-navigation-down'}}" class="umb-table-head__icon"></umb-icon>
-                            </button>
-                        </div>
-                        <div class="umb-table-cell">
-                            <button type="button"
-                                    class="umb-table-head__link sortable"
-                                    ng-click="setSort('updateDate')">
-                                <localize key="general_lastUpdated">Last Updated</localize>
-                                <umb-icon ng-attr-icon="{{isSortDirection('updateDate', 'asc') && 'icon-navigation-up' || isSortDirection('updateDate', 'desc') && 'icon-navigation-down'}}" class="umb-table-head__icon"></umb-icon>
-                            </button>
-                        </div>
-
-                    </div>
-                </div>
-                <div class="umb-table-body"> 
-                    <div class="umb-table-row umb-media-grid__list-item -selectable"
-                         ng-click="clickItem(item, $event, $index)"
-                         ng-repeat="item in items | filter:filterBy | orderBy:sortBy:sortReverse"
-                         ng-class="{'-selected': item.selected, '-folder': item.isFolder, '-filtered': item.filtered}">
-                        <div class="umb-table-cell">
-                            <umb-icon icon="icon-check" class="umb-table-body__icon umb-table-body__checkicon" ng-if="item.selected"></umb-icon>
-                            <umb-icon icon="{{item.thumbnail ? 'icon-picture' : item.icon}}" class="umb-table-body__icon" ng-if="!item.selected"></umb-icon>
-                        </div>
-                        <div class="umb-table-cell umb-table__name">
-                            <div class="umb-media-grid__list-item-name"
-                                 ng-class="{'-locked': item.selected || !item.file || !item.thumbnail}"
-                                 ng-click="clickItemName(item, $event, $index)">
-                                <umb-icon icon="icon-navigation-right" ng-show="item.isFolder"></umb-icon>
-                                <span data-src="{{item.value.src}}" class="item-name">{{item.name}}</span>
-                            </div>
-                        </div>
-                        <div class="umb-table-cell">
-                            <span class="muted small" style="font-size:0.8em">{{item.updateDate | date:'medium'}}</span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
deleted file mode 100644
index c8b63fe0fc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<div class="umb-minilistview">
-
-    <div class="umb-mini-list-view umb-animated"
-        ng-class="{'umb-mini-list-view--forward': listViewAnimation === 'in', 'umb-mini-list-view--backwards': listViewAnimation === 'out'}"
-        ng-repeat="miniListView in miniListViews">
-
-        <div class="umb-mini-list-view__title">
-            <umb-icon icon="{{miniListView.node.icon}}" class="umb-mini-list-view__title-icon"></umb-icon>
-            <h4 class="umb-mini-list-view__title-text">{{ miniListView.node.name }}</h4>
-        </div>
-
-        <div class="umb-mini-list-view__breadcrumb">
-
-            <button type="button" ng-if="showBackButton()" class="btn-reset umb-mini-list-view__back" ng-click="exitMiniListView()">
-                <umb-icon icon="icon-arrow-left" class="umb-mini-list-view__back-icon"></umb-icon>
-                <span class="umb-mini-list-view__back-text"><localize key="general_back">Back</localize></span> /
-            </button>
-
-            <umb-breadcrumbs
-                ng-if="breadcrumb && breadcrumb.length > 0"
-                ancestors="breadcrumb"
-                entity-type="content"
-                on-open="clickBreadcrumb(ancestor)">
-            </umb-breadcrumbs>
-
-        </div>
-
-        <div class="umb-table umb-table--condensed">
-
-            <!-- Head -->
-            <div class="umb-table-head">
-                <div class="umb-table-row">
-                    <div class="umb-table-cell no-display"></div>
-                    <div class="umb-table-cell umb-table-cell-padding">
-                        <form class="flex w-100 -no-margin-bottom" novalidate>
-                            <div class="flex-auto">
-                                <umb-search-filter
-                                    input-id="mini-listview-search"
-                                    model="search"
-                                    label-key="general_typeToSearch"
-                                    text="Type to search..."
-                                    on-change="searchMiniListView(search, miniListView)"
-                                    css-class="w-100 mb-15"
-                                    auto-focus="true">
-                                </umb-search-filter>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Body -->
-            <div class="umb-table-body">
-
-                <!-- Load indicator when the list has items -->
-                <div class="umb-table__loading-overlay" ng-if="miniListView.loading && miniListView.children.length > 0">
-                    <umb-load-indicator></umb-load-indicator>
-                </div>
-
-                <!-- Items -->
-                <div class="umb-table-row cursor-pointer umb-outline"
-                    ng-repeat="child in miniListView.children"
-                    ng-click="selectNode(child)"
-                    ng-class="{'-selected':child.selected, 'not-allowed':!child.allowed}">
-                    <div class="umb-table-cell umb-table-cell--auto-width" ng-class="{'umb-table-cell--faded':child.published === false}">
-                        <div class="flex items-center">
-                            <umb-icon icon="icon-navigation-right" class="umb-table__row-expand cursor-pointer" ng-click="openNode($event, child)" ng-class="{'umb-table__row-expand--hidden': child.metaData.hasChildren !== true}">&nbsp;</umb-icon>
-                            <umb-icon icon="{{child.icon}}" class="umb-table-body__icon umb-table-body__fileicon umb-minilistview__fade-not-allowed"></umb-icon>
-                            <umb-icon icon="icon-check" class="umb-table-body__icon umb-table-body__checkicon"></umb-icon>
-                        </div>
-                    </div>
-                    <div class="umb-table-cell black umb-minilistview__fade-not-allowed" ng-class="{'umb-table-cell--faded':child.published === false}">{{ child.name }}</div>
-                </div>
-
-                <!-- Show a message when no items are found, depending on whether you searched or the list was empty anyway -->
-                <div ng-if="!miniListView.loading && miniListView.children.length === 0" class="umb-table-row umb-table-row--empty">
-                    <span ng-if="search === ''"><localize key="general_noItemsInList">No items have been added</localize></span>
-                    <span ng-if="search !== ''"><localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize></span>
-                </div>
-
-                <!-- Load indicator while items are retrieved -->
-                <div ng-if="miniListView.loading && miniListView.children.length === 0" class="umb-table-row umb-table-row--empty">
-                    <umb-load-indicator></umb-load-indicator>
-                </div>
-
-            </div>
-
-        </div>
-
-        <div class="flex justify-center">
-            <umb-pagination
-                ng-if="miniListView.pagination.totalPages > 0 && !miniListView.loading"
-                page-number="miniListView.pagination.pageNumber"
-                total-pages="miniListView.pagination.totalPages"
-                on-change="goToPage(pageNumber, miniListView)">
-            </umb-pagination>
-        </div>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html
deleted file mode 100644
index b562442ae6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<ng-form class="umb-mini-search" ng-class="{'--has-value': vm.model !== null && vm.model !== ''}" novalidate>
-    <umb-icon icon="icon-search" class="icon"></umb-icon>
-    <label class="sr-only" for="{{vm.inputId}}">
-        {{vm.text}}
-    </label>
-    <input type="text"
-           id="{{vm.inputId}}"
-           class="form-control search-input"
-           localize="placeholder,label"
-           label="@general_typeToSearch"
-           placeholder="@general_typeToSearch"
-           ng-model="vm.model"
-           ng-change="vm.onChange()"
-           ng-keydown="vm.onKeyDown($event)"
-           ng-blur="vm.onBlur($event)"
-           prevent-enter-submit
-           no-dirty-check>
-</ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
deleted file mode 100644
index 11d0d1997f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<div class="umb-node-preview" ng-class="{'umb-node-preview--sortable': sortable, 'umb-node-preview--unpublished': published === false }">
-    <div class="flex"> <!-- div keeps icon and nodename from wrapping -->
-        <umb-icon ng-if="icon" icon="{{icon}}" class="umb-node-preview__icon"></umb-icon>
-        
-        <div class="umb-node-preview__content">
-
-            <div class="umb-node-preview__name" ng-attr-title="{{nodeNameTitle}}">{{name}}</div>
-            <div class="umb-node-preview__description" ng-if="description">{{description}}</div>
-
-            <div class="umb-user-group-preview__permissions" ng-if="permissions">
-                <span>
-                    <span class="bold"><localize key="general_rights">Permissions</localize>:</span>
-                    <span ng-repeat="permission in permissions" class="umb-user-group-preview__permission">{{permission.name}}</span>
-                </span>
-            </div>
-        </div>
-    </div>
-    <div class="umb-node-preview__actions">
-
-        <!-- If editUrl has a value we render a link otherwise a button -->
-        <a class="umb-node-preview__action"
-           ng-href="{{editUrl}}"
-           ng-if="allowEdit && editUrl"
-           ng-click="onEdit()">
-            <localize key="general_edit">Edit</localize><span class="sr-only">&nbsp;{{name}}</span>
-        </a>
-
-        <button type="button"
-                class="umb-node-preview__action"
-                ng-if="allowEdit && !editUrl"
-                ng-click="onEdit()">
-            <localize key="general_edit">Edit</localize><span class="sr-only">&nbsp;{{name}}...</span>
-        </button>
-
-        <!-- If openUrl has a value we render a link otherwise a button -->
-        <a class="umb-node-preview__action"
-           ng-href="{{openUrl}}"
-           ng-if="allowOpen && openUrl"
-           ng-click="onOpen()">
-            <localize key="general_open">Open</localize><span class="sr-only">&nbsp;{{name}}</span>
-        </a>
-
-        <button type="button"
-                class="umb-node-preview__action"
-                ng-if="allowOpen && !openUrl"
-                ng-click="onOpen()">
-            <localize key="general_open">Open</localize><span class="sr-only">&nbsp;{{name}}...</span>
-        </button>
-
-        <!-- If removeUrl has a value we render a link otherwise a button -->
-        <a class="umb-node-preview__action"
-            ng-href="{{changeUrl}}"
-            ng-if="allowChange && changeUrl"
-            ng-click="onChange()">
-            <localize key="general_change">Change</localize><span class="sr-only">&nbsp;{{name}}</span>
-        </a>
-    
-        <button type="button"
-                class="umb-node-preview__action"
-                ng-if="allowChange && !changeUrl"
-                ng-click="onChange()">
-            <localize key="general_change">Change</localize><span class="sr-only">&nbsp;{{name}}</span>
-        </button>
-
-        <!-- If removeUrl has a value we render a link otherwise a button -->
-        <a class="umb-node-preview__action umb-node-preview__action--red"
-           ng-href="{{removeUrl}}"
-           ng-if="allowRemove && removeUrl"
-           ng-click="onRemove()">
-            <localize key="general_remove">Remove</localize><span class="sr-only">&nbsp;{{name}}</span>
-        </a>
-
-        <button type="button"
-                class="umb-node-preview__action umb-node-preview__action--red"
-                ng-if="allowRemove && !removeUrl"
-                ng-click="onRemove()">
-            <localize key="general_remove">Remove</localize><span class="sr-only">&nbsp;{{name}}</span>
-        </button>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-pagination.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-pagination.html
deleted file mode 100644
index f3c6c98cf9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-pagination.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="umb-pagination pagination">
-    <div ng-show="pagination.length > 1">
-        <ul>
-            <li ng-class="{disabled:pageNumber <= 1}">
-                <button type="button"
-                        class="btn-reset"
-                        ng-disabled="pageNumber <= 1"
-                        ng-click="prev()">
-                    <localize key="general_previous">Previous</localize>
-                </button>
-            </li>
-
-            <li ng-repeat="pgn in pagination track by $index"
-                ng-class="{active:pgn.isActive}">
-
-                <button type="button"
-                        class="btn-reset"
-                        ng-click="goToPage(pgn.val - 1)"
-                        ng-bind="pgn.name ? pgn.name : pgn.val"
-                        ng-disabled="pgn.val === pageNumber"
-                        ng-if="pgn.val != '...'">
-                </button>
-                <span ng-bind="pgn.val" ng-if="pgn.val == '...'"></span>
-            </li>
-
-            <li ng-class="{disabled:pageNumber >= totalPages}">
-                <button type="button"
-                        class="btn-reset"
-                        ng-disabled="pageNumber >= totalPages"
-                        ng-click="next()">
-                    <localize key="general_next">Next</localize>
-                </button>
-            </li>
-        </ul>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-progress-bar.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-progress-bar.html
deleted file mode 100644
index 46b06455c6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-progress-bar.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<span class="umb-progress-bar umb-progress-bar--{{size}}">
-    <span class="umb-progress-bar__progress umb-progress-bar__progress--{{color}}" ng-style="{'width': percentage + '%'}"></span>
-</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-progress-circle.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-progress-circle.html
deleted file mode 100644
index 3864042e9f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-progress-circle.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="umb-progress-circle" ng-style="{'width': size, 'height': size, 'line-height': size + 'px' }">
-    <svg class="umb-progress-circle__view-box" viewBox="0 0 100 100">
-        <circle class="umb-progress-circle__bg" cx="50" cy="50" r="47" fill="none" stroke-width="6"/>
-        <circle class="umb-progress-circle__highlight umb-progress-circle__highlight--{{ color }}" cx="50" cy="50" r="47" fill="none" stroke-width="6" stroke-dasharray="{{ strokeDashArray }}" stroke-dashoffset="{{ strokeDashOffset }}" />
-    </svg>
-    <div ng-style="{'font-size': percentageSize}" class="umb-progress-circle__percentage">{{ percentage }}%</div>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.html
deleted file mode 100644
index cb15a7ba93..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<button type="button"
-    title="{{ vm.show ? '' : vm.buttonTitle}}"
-    class="btn-reset umb-outline umb-outline--surrounding __button"
-    ng-click="vm.onMouseClick($event)"
-    ng-bind="vm.symbol">
-</button>
-<div class="__tooltip" ng-if="vm.show" on-outside-click="vm.onMouseClickOutside($event)">
-    <ng-transclude></ng-transclude>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.less b/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.less
deleted file mode 100644
index a892f1ca38..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.less
+++ /dev/null
@@ -1,120 +0,0 @@
-umb-property-info-button {
-    position: relative;
-    display: inline-block;
-    vertical-align: text-bottom;
-
-    .control-label + & {
-        margin-left: 3px;
-    }
-
-    > .__button {
-        position: relative;
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-        text-align: center;
-
-        width: 15px;
-        height: 15px;
-        padding: 2px 1px 1px 1px;
-        margin-top: -1px;
-        font-size: 12px;
-        font-weight: 700;
-
-        border-radius: 50%;
-        border: 1px solid @ui-option-type;
-        color: @ui-option-type;
-        &:hover {
-            border-color: @ui-option-type-hover;
-            color: @ui-option-type-hover;
-        }
-    }
-
-    > .__tooltip {
-        
-        position: absolute;
-        z-index: 1000;
-        top: 26px;
-        left: -8px;
-        font-size: 13px;
-
-        border-radius: 6px;
-        
-        min-width: 240px;
-        max-width: 320px;
-        padding: 10px 16px;
-        background-color:@blueExtraDark;
-        border: 1px solid @blueExtraDark;
-        color: white;
-        box-shadow: 0 2px 6px rgba(@blueExtraDark, .6);
-
-        a {
-            color: white;
-            text-decoration: underline;
-            &:hover {
-                color: @blueMidLight;
-            }
-        }
-
-        &::before {
-            content:'';
-            position: absolute;
-            transform: rotate(45deg);
-            background-color:@blueExtraDark;
-            top: -5px;
-            left: 10px;
-            width: 8px;
-            height: 8px;
-            border-left: 1px solid @blueExtraDark;
-            border-top: 1px solid @blueExtraDark;
-        }
-    }
-
-}
-
-// hide umb-info-button if inside umb-property
-.umb-property umb-property-info-button {
-    opacity: 0;
-    transition: opacity 120ms;
-}
-
-.umb-property:focus-within umb-property-info-button,
-.umb-property:hover umb-property-info-button,
-.umb-property umb-property-info-button:focus {
-    opacity: 1;
-}
-// Revert-style-hack that ensures that we only show property-actions on properties that are directly begin hovered.
-.umb-property:hover .umb-property:not(:hover) umb-property-info-button {
-    opacity: 0;
-}
-
-// hide umb-info-button if inside 
-.umb-control-group umb-property-info-button {
-    opacity: 0;
-    transition: opacity 120ms;
-}
-
-.umb-control-group:focus-within umb-property-info-button,
-.umb-control-group:hover umb-property-info-button,
-.umb-control-group umb-property-info-button:focus {
-    opacity: 1;
-}
-// Revert-style-hack that ensures that we only show property-actions on properties that are directly begin hovered.
-.umb-control-group:hover .umb-control-group:not(:hover) umb-property-info-button {
-    opacity: 0;
-}
-
-
-
-.umb-group-panel > .umb-group-panel__header umb-property-info-button {
-    opacity: 0;
-}
-.umb-group-panel > .umb-group-panel__header umb-property-info-button:focus {
-    opacity: 1;
-}
-.umb-group-panel:focus-within, 
-.umb-group-panel:hover {
-    > .umb-group-panel__header umb-property-info-button {
-        opacity: 1;
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umbpropertyinfobutton.component.js b/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umbpropertyinfobutton.component.js
deleted file mode 100644
index d4bd3729bd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umbpropertyinfobutton.component.js
+++ /dev/null
@@ -1,44 +0,0 @@
-(function () {
-    'use strict';
-
-    angular
-        .module('umbraco')
-        .component('umbPropertyInfoButton', {
-            templateUrl: 'views/components/umb-property-info-button/umb-property-info-button.html',
-            controller: UmbPropertyInfoButtonController,
-            controllerAs: 'vm',
-            transclude: true,
-            bindings: {
-                buttonTitle: "@?",
-                buttonTitleKey: "@?",
-                symbol: "@?"
-            }
-        });
-
-    function UmbPropertyInfoButtonController(localizationService) {
-
-        var vm = this;
-
-        vm.show = false;
-
-        vm.onMouseClick = function ($event) {
-            vm.show = !vm.show;
-        };
-
-        vm.onMouseClickOutside = function ($event) {
-            vm.show = false;
-        };
-
-        vm.$onInit = function() {
-            vm.symbol = vm.symbol || "i";
-
-            if (vm.buttonTitleKey) {
-                localizationService.localize(vm.buttonTitleKey).then(value => {
-                    vm.buttonTitle = value;
-                });
-            }
-        };
-
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
deleted file mode 100644
index 4462af5429..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<div>
-    <div class="umb-table" ng-if="vm.items">
-        <!-- Listviews head section -->
-        <div class="umb-table-head">
-            <div class="umb-table-row">
-                <div class="umb-table-cell">
-
-                    <button type="button" class="umb-table__action" ng-show="vm.allowSelectAll" ng-click="vm.selectAll()">
-                      <span class="sr-only"><localize key="general_selectAll">Select all</localize></span>
-                      <umb-checkmark checked="vm.isSelectedAll()" size="xs"></umb-checkmark>
-                    </button>
-
-                </div>
-                <div class="umb-table-cell umb-table__name">
-                    <button type="button"
-                            class="umb-table-head__link sortable"
-                            ng-click="vm.sort('Name', true, true)">
-                        <localize key="general_name">Name</localize>
-                        <i class="umb-table-head__icon icon" aria-hidden="true" ng-class="{'icon-navigation-up': vm.isSortDirection('Name', 'asc'), 'icon-navigation-down': vm.isSortDirection('Name', 'desc')}"></i>
-                    </button>
-                </div>
-                <div class="umb-table-cell" ng-show="vm.items[0].state">
-                    <localize key="general_status">Status</localize>
-                </div>
-                <div class="umb-table-cell" ng-repeat="column in vm.itemProperties track by column.alias">
-                    <button type="button"
-                            class="umb-table-head__link"
-                            ng-click="vm.sort(column.alias, column.allowSorting, column.isSystem)"
-                            ng-class="{'sortable':column.allowSorting}">
-                        <span ng-bind="column.header"></span>
-                        <i class="umb-table-head__icon icon" aria-hidden="true" ng-class="{'icon-navigation-up': vm.isSortDirection(column.alias, 'asc'), 'icon-navigation-down': vm.isSortDirection(column.alias, 'desc')}"></i>
-                    </button>
-                </div>
-            </div>
-        </div>
-        <!-- Listview body section -->
-        <div class="umb-table-body">
-            <div class="umb-table-row umb-outline"
-                 ng-repeat="item in vm.items track by $index"
-                 ng-init="item.icon = vm.getIcon(item)"
-                 ng-class="{'-selected':item.selected, '-light':!item.published && item.updater != null, '-selectable': vm.allowSelect !== false }"
-                 ng-click="vm.selectItem(item, $index, $event)">
-
-                <div class="umb-table-cell">
-                    <umb-icon icon="{{item.icon}}" class="umb-table-body__icon umb-table-body__fileicon" ng-if="!item.selected"></umb-icon>
-                    <umb-icon icon="icon-check" class="umb-table-body__icon umb-table-body__checkicon" ng-if="item.selected"></umb-icon>
-                </div>
-                <div class="umb-table-cell umb-table__name">
-                    <a title="{{item.name}}" class="umb-table-body__link"
-                       ng-href="{{'#' + item.editPath}}"
-                       ng-click="vm.clickItem(item, $event)"
-                       ng-bind="item.name">
-                    </a>
-                </div>
-                <div class="umb-table-cell" ng-show="item.state">
-                    <umb-variant-state
-                        variant="item">
-                    </umb-variant-state>
-                </div>
-                <div class="umb-table-cell" ng-repeat="column in vm.itemProperties track by column.alias">
-                    <span title="{{column.header}}: {{item[column.alias].expression ? item[column.alias].expression({value: item[column.alias].value}) : item[column.alias]}}">
-
-                        <div ng-if="!column.isSensitive">
-                            {{item[column.alias].expression ? item[column.alias].expression({value: item[column.alias].value}) : item[column.alias]}}
-                        </div>
-
-                        <em ng-show="column.isSensitive" class="muted">
-                            <localize key="content_isSensitiveValue_short">This value is hidden.</localize>
-                        </em>
-
-                    </span>
-                </div>
-            </div>
-        </div>
-    </div>
-    <!-- If list is empty, then display -->
-    <umb-empty-state ng-hide="vm.items"
-                     position="center">
-        <localize key="content_listViewNoItems">There are no items show in the list.</localize>
-    </umb-empty-state>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-tooltip.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-tooltip.html
deleted file mode 100644
index 18095e599c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-tooltip.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="umb-tooltip shadow-depth-2" ng-style="tooltipStyles" ng-transclude></div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
deleted file mode 100644
index 89f95f688d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<div data-element="dropzone" class="umb-file-dropzone">
-
-  <ng-form name="uploadForm" umb-isolate-form>
-    <!-- Drag and drop files area -->
-    <div ngf-drop
-         ng-hide="hideDropzone === 'true'"
-         ng-model="filesHolder"
-         ngf-change="handleFiles($files, $event, $invalidFiles)"
-         class="dropzone"
-         ngf-drag-over-class="'drag-over'"
-         ngf-multiple="true"
-         ngf-allow-dir="true"
-         ngf-pattern="{{ accept }}"
-         ngf-max-size="{{ maxFileSize }}"
-         ng-class="{'is-small': compact !=='false' || (processed.length + queue.length) > 0 }">
-
-      <div class="content">
-        <p>
-          <localize key="media_dragAndDropYourFilesIntoTheArea">Drag and drop your file(s) into the area</localize>
-        </p>
-
-        <!-- Drag and drop illustration -->
-        <img class="illustration" src="assets/img/uploader/upload-illustration.svg" alt=" " draggable="false" />
-
-        <!-- Select files -->
-        <button type="button"
-                data-element="button-uploadMedia"
-                class="file-select"
-                ngf-select
-                ng-model="filesHolder"
-                ngf-change="handleFiles($files, $event, $invalidFiles)"
-                ngf-multiple="true"
-                ngf-pattern="{{ accept }}"
-                ngf-max-size="{{ maxFileSize }}">
-          -&nbsp;<localize key="media_orClickHereToUpload">or click here to choose files</localize>
-        </button>
-      </div>
-    </div>
-
-    <!-- List of uploading/uploaded files  -->
-    <ul class="file-list" ng-show="queue.length > 0 || processed.length > 0 || filesHolder.length > 0">
-
-
-      <li class="file" ng-if="totalMessages > 1">
-        <div class="file-description">
-          <!-- Okay all -->
-          <button class="btn btn-primary ok-all" type="button" ng-click="dismissAllMessages()">
-            <localize key="general_ok">Ok</localize> (<localize key="general_all">All</localize>)
-          </button>
-        </div>
-      </li>
-
-      <li class="file" ng-repeat="file in processed track by file.key">
-
-        <div class="file-description">
-          <div>
-            <span>{{ file.name }}</span>
-            <span ng-if="file.messages.length > 0 || file.$error" class="file-messages">
-              <span class="errorMessage color-red" ng-repeat="message in ::file.messages" ng-if="message.message">{{::message.header}}: {{::message.message}}</span>
-              <span ng-if="file.$error === 'pattern'" class="errorMessage color-red"><localize key="media_disallowedFileType"></localize></span>
-              <span ng-if="file.$error === 'maxSize'" class="errorMessage color-red"><localize key="media_maxFileSize"></localize> "{{maxFileSize}}"</span>
-            </span>
-          </div>
-
-          <!-- upload success -->
-          <span ng-if="file.messages.length === 0">
-            <umb-icon icon="icon-check" class="icon color-green"></umb-icon>
-          </span>
-
-          <!-- requires user input -->
-          <button class="btn btn-primary" type="button" ng-click="dismissMessages(file)" ng-if="file.messages.length > 0">
-            <localize key="general_ok">Ok</localize>
-          </button>
-        </div>
-      </li>
-
-      <!-- We don't remove files from the processing array, so filter on the 'done' property -->
-      <li class="file" ng-repeat="file in processing track by file.key" ng-if="!file.done">
-        <div class="file-name">{{file.name}} {{file.uploadProgress + '%'}}</div>
-        <div class="file-progress">
-          <span class="file-progress-indicator" ng-style="{'width': file.uploadProgress + '%'}"></span>
-        </div>
-      </li>
-
-      <li class="file" ng-repeat="file in queue track by file.key">
-        <div class="file-description">{{ file.name }}</div>
-      </li>
-
-    </ul>
-  </ng-form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
deleted file mode 100644
index baf43aa499..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="umb-property-file-upload">
-  <ng-form name="vm.fileUploadForm" ng-class="{ 'drag-over': vm.dragover }">
-    <input
-      type="hidden"
-      ng-model="mandatoryValidator"
-      ng-required="vm.required && !vm.files.length" />
-
-    <div
-      class="fileinput-button umb-upload-button-big"
-      ng-hide="vm.files.length > 0">
-      <umb-icon icon="icon-page-up" class="icon"></umb-icon>
-      <p><localize key="media_clickToUpload">Click to upload</localize></p>
-      <umb-single-file-upload
-        accept-file-ext="vm.acceptFileExt"
-        ng-attr-readonly="{{ vm.readonly || undefined }}">
-      </umb-single-file-upload>
-    </div>
-
-    <div ng-if="vm.files.length > 0">
-      <div ng-if="!vm.hideSelection">
-        <div class="umb-fileupload clearfix" ng-repeat="file in vm.files">
-          <umb-media-preview
-            extension="file.extension"
-            source="file.fileSrc"
-            name="file.fileName"
-            client-side="file.isClientSide"
-            client-side-data="file.fileData">
-          </umb-media-preview>
-        </div>
-        <div ng-if="!vm.readonly" class="umb-property-file-upload--actions">
-          <button
-            type="button"
-            class="btn btn-link"
-            aria-hidden="true"
-            ng-click="vm.clear()">
-            <umb-icon icon="icon-trash"></umb-icon>
-            <localize key="content_uploadClear">Remove file</localize>
-          </button>
-          <button
-            type="button"
-            class="sr-only"
-            ng-if="file.isImage"
-            ng-click="vm.clear()">
-            <localize key="content_uploadClearImageContext">Click here to remove the image from the media item</localize>
-          </button>
-          <button
-            type="button"
-            class="sr-only"
-            ng-if="!file.isImage"
-            ng-click="vm.clear()">
-            <localize key="content_uploadClearFileContext">Click here to remove the file from the media item</localize>
-          </button>
-        </div>
-      </div>
-      <div ng-if="vm.hideSelection">
-        <div ng-transclude></div>
-      </div>
-    </div>
-  </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
deleted file mode 100644
index 9eaa34a6b1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<div>
-    <div class="alert alert-success text-center" ng-hide="!vm.passwordValues.generatedPassword">
-        <small>Password has been reset to:</small>
-        <br />
-        <strong>{{vm.passwordValues.generatedPassword}}</strong>
-    </div>
-    <div ng-switch="vm.changing">
-        <div ng-switch-when="false">
-            <button type="button" ng-click="vm.doChange()" class="btn umb-button__button btn-action umb-outline umb-outline--thin">
-                <localize key="general_changePassword">Change password</localize>
-            </button>
-        </div>
-        <div ng-switch-when="true">
-
-            <ng-form name="changePasswordForm">
-
-                <!-- we need to show the old pass field when the provider cannot retrieve the password -->
-                <umb-control-group alias="oldPassword" label="@user_oldPassword" ng-if="vm.showOldPass()" required="true">
-                    <input type="password" name="password" id="oldPassword" ng-model="vm.passwordValues.oldPassword"
-                           class="input-block-level umb-textstring textstring"
-                           autocomplete="current-password"
-                           required
-                           val-server-field="oldPassword"
-                           no-dirty-check
-                           spellcheck="false"
-                    />
-                    <span ng-messages="changePasswordForm.oldPassword.$error" show-validation-on-submit>
-                        <span class="help-inline" ng-message="required">Required</span>
-                        <span class="help-inline" ng-message="valServerField">{{changePasswordForm.oldPassword.errorMsg}}</span>
-                    </span>
-                </umb-control-group>
-
-                <umb-control-group alias="password" label="@user_newPassword" required="true">
-                    <input type="password" name="newPassword" id="password"
-                           class="input-block-level umb-textstring textstring"
-                           autocomplete="new-password"
-                           required
-                           val-server-field="password"
-                           ng-model="vm.passwordValues.newPassword"
-                           ng-minlength="{{vm.config.minPasswordLength}}"
-                           no-dirty-check
-                           ng-keyup="vm.newPasswordKeyUp($event)"
-                           spellcheck="false"
-                    />
-                    <span ng-messages="changePasswordForm.password.$error" show-validation-on-submit>
-                        <span class="help-inline" ng-message="required">Required</span>
-                        <span class="help-inline" ng-message="minlength">Minimum {{vm.config.minPasswordLength}} characters</span>
-                        <span class="help-inline" ng-message="valServerField">{{changePasswordForm.password.errorMsg}}</span>
-                    </span>
-                    <umb-password-tip password-val="vm.passwordVal" min-pwd-length="vm.config.minPasswordLength" min-pwd-non-alpha-num="vm.config.minNonAlphaNumericChars"></umb-password-tip>
-                </umb-control-group>
-
-                <umb-control-group alias="confirmPassword" label="@user_confirmNewPassword" required="true">
-                    <input type="password" name="confirmPassword" id="confirmPassword" ng-model="vm.passwordValues.confirm"
-                           class="input-block-level umb-textstring textstring"
-                           autocomplete="new-password"
-                           val-compare="newPassword"
-                           no-dirty-check
-                           spellcheck="false"
-                    />
-                    <span ng-messages="changePasswordForm.confirmPassword.$error" show-validation-on-submit>
-                        <span class="help-inline" ng-message="valCompare"><localize key="user_passwordMismatch">The confirmed password doesn't match the new password!</localize></span>
-                    </span>
-                </umb-control-group>
-
-                <button ng-click="vm.cancelChange()" ng-show="vm.showCancelBtn()" class="btn umb-button__button btn-cancel umb-button-- umb-outline umb-outline--thin">
-                    <localize key="general_cancel">Cancel</localize>
-                </button>
-
-            </ng-form>
-        </div>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html
deleted file mode 100644
index f96cdfa0ee..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<div class="umb-user-group-preview">
-
-    <umb-icon icon="{{icon}}" class="umb-user-group-preview__icon"></umb-icon>
-
-    <div class="umb-user-group-preview__content">
-        <div class="umb-user-group-preview__name">{{ name }}</div>
-
-        <div class="umb-user-group-preview__permissions" ng-if="sections">
-            <span>
-                <span class="bold"><localize key="main_sections">Sections</localize>:</span>
-                <span ng-repeat="section in sections" class="umb-user-group-preview__permission">{{ section.name }}</span>
-                <span ng-if="sections.length === 0">No sections</span>
-            </span>
-        </div>
-
-        <div class="umb-user-group-preview__permissions" ng-if="!hideContentStartNode">
-            <span>
-                <span class="bold"><localize key="user_startnode">Content start node</localize>:</span>
-                <span ng-if="!contentStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
-                <span ng-if="contentStartNode">{{ contentStartNode.name }}</span>
-            </span>
-        </div>
-
-        <div class="umb-user-group-preview__permissions" ng-if="!hideMediaStartNode">
-            <span>
-                <span class="bold"><localize key="user_mediastartnode">Media start node</localize>:</span>
-                <span ng-if="!mediaStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
-                <span ng-if="mediaStartNode">{{ mediaStartNode.name }}</span>
-            </span>
-        </div>
-
-        <div class="umb-user-group-preview__permissions" ng-if="permissions">
-            <span>
-                <span class="bold"><localize key="general_rights">Permissions</localize>:</span>
-                <span ng-repeat="permission in permissions" class="umb-user-group-preview__permission">{{ permission.name }}</span>
-            </span>
-        </div>
-
-    </div>
-
-    <div class="umb-user-group-preview__actions">
-        <button class="btn-link umb-user-group-preview__action" title="Edit" ng-if="allowEdit" ng-click="onEdit()"><localize key="general_edit">Edit</localize></button>
-        <button class="btn-link umb-user-group-preview__action umb-user-group-preview__action--red" title="Remove" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></button>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html
deleted file mode 100644
index 72c3844b5e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="umb-user-preview">
-
-    <div class="umb-user-preview__avatar">
-        <umb-avatar size="xxs"
-                    color="secondary"
-                    name="{{name}}"
-                    img-src="{{avatars[0]}}"
-                    img-srcset="{{avatars[1]}} 2x, {{avatars[2]}} 3x">
-        </umb-avatar>
-    </div>
-
-    <div class="umb-user-preview__content">
-        <div class="umb-user-preview__name">{{ name }}</div>
-    </div>
-
-    <div class="umb-user-preview__actions">
-        <button type="button"
-                class="umb-user-preview__action umb-user-preview__action--red btn-link"
-                title="Remove {{name}}"
-                ng-if="allowRemove"
-                ng-click="onRemove()">
-            <localize key="general_remove">Remove</localize>
-            <span class="sr-only">{{name}}</span>
-        </button>
-    <div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.controller.js
deleted file mode 100644
index 66747a8697..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.controller.js
+++ /dev/null
@@ -1,69 +0,0 @@
-(function () {
-    "use strict";
-
-    function ContentAppContentController($scope, $timeout, serverValidationManager) {
-
-        //the contentApp's viewModel is actually the index of the variant being edited, not the variant itself.
-        //if we make the viewModel the variant itself, we end up with a circular reference in the models which isn't ideal
-        // (i.e. variant.apps[contentApp].viewModel = variant)
-        //so instead since we already have access to the content, we can just get the variant directly by the index.
-        
-        var unbindLanguageWatcher = function() {};
-        var unbindSegmentWatcher = function() {};
-        var timeout = null;
-
-        var vm = this;
-        vm.loading = true;
-
-        function onInit() {
-            
-            serverValidationManager.notify();
-            vm.loading = false;
-            timeout = null;// ensure timeout is set to null, so we know that its not running anymore.
-
-            //if this variant has a culture/language assigned, then we need to watch it since it will change
-            //if the language drop down changes and we need to re-init
-            if ($scope.variantContent) {
-                if ($scope.variantContent.language) {
-                    unbindLanguageWatcher = $scope.$watch(function () {
-                        return $scope.variantContent.language.culture;
-                    }, function (newVal, oldVal) {
-                        if (newVal !== oldVal) {
-                            requestUpdate();
-                        }
-                    });
-                }
-
-                unbindSegmentWatcher = $scope.$watch(function () {
-                    return $scope.variantContent.segment;
-                }, function (newVal, oldVal) {
-                    if (newVal !== oldVal) {
-                        requestUpdate();
-                    }
-                });
-            }
-            
-        }
-
-        function requestUpdate() {
-            if (timeout === null) {
-                vm.loading = true;
-
-                // TODO: Can we minimize the flicker?
-                timeout = $timeout(function () {
-                    onInit();
-                }, 100);
-            }
-        }
-
-        onInit();
-
-        $scope.$on("$destroy", function() {
-            unbindLanguageWatcher();
-            unbindSegmentWatcher();
-            $timeout.cancel(timeout);
-        });
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Content.Apps.ContentController", ContentAppContentController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html
deleted file mode 100644
index 83fb83690f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="form-horizontal" ng-controller="Umbraco.Editors.Content.Apps.ContentController as vm">
-
-    <umb-tabbed-content
-        ng-if="!vm.loading"
-        content-node-model="content"
-        content="variantContent"
-        content-app="model">
-    </umb-tabbed-content>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/apps/info/info.html b/src/Umbraco.Web.UI.Client/src/views/content/apps/info/info.html
deleted file mode 100644
index c40486012c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/apps/info/info.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<umb-content-node-info
-    ng-if="content"
-    node="content">
-</umb-content-node-info>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/apps/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/apps/listview/listview.controller.js
deleted file mode 100644
index 3114d0d1ce..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/apps/listview/listview.controller.js
+++ /dev/null
@@ -1,18 +0,0 @@
-(function () {
-  "use strict";
-
-  function ContentAppListViewController($scope) {
-
-    var vm = this;
-
-    vm.propertyEditorReadonly = propertyEditorReadonly;
-
-    function propertyEditorReadonly () {
-      // check for permission to update
-      return $scope.variantContent && !$scope.variantContent.allowedActions.includes('A');
-    }
-
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Content.Apps.ListViewController", ContentAppListViewController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/apps/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/content/apps/listview/listview.html
deleted file mode 100644
index ef58583889..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/apps/listview/listview.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div ng-controller="Umbraco.Editors.Content.Apps.ListViewController as vm">
-
-    <umb-property ng-repeat="property in model.viewModel track by property.alias" property="property">
-        <umb-property-editor 
-            model="property"
-            ng-attr-readonly="{{ vm.propertyEditorReadonly() || undefined}}">
-        </umb-property-editor>
-    </umb-property>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html b/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html
deleted file mode 100644
index 42f19db8c5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<div ng-controller="Umbraco.Editors.Content.AssignDomainController as vm" ng-cloak>
-  <umb-load-indicator ng-show="vm.loading"></umb-load-indicator>
-
-  <form name="vm.domainForm" ng-submit="vm.save()" id="assignDomain" novalidate>
-    <div ng-hide="vm.loading" class="umb-dialog-body">
-      <umb-pane ng-if="!currentNode.metaData.variesByCulture">
-        <h5 class="umb-pane-title"><localize key="assignDomain_setLanguage">Culture</localize></h5>
-        <label for="assignDomain_language" class="control-label"><localize key="general_language">Language</localize></label>
-        <select class="umb-property-editor umb-dropdown" name="language" id="assignDomain_language" ng-model="vm.language" ng-options="lang.name for lang in vm.languages">
-          <option value=""><localize key="assignDomain_inherit">Inherit</localize></option>
-        </select>
-      </umb-pane>
-
-      <umb-pane>
-        <div ng-show="vm.error">
-          <div class="alert alert-error">
-            <div><strong>{{vm.error.errorMsg}}</strong></div>
-            <div>{{vm.error.data.Message}}</div>
-          </div>
-        </div>
-
-        <h5 class="umb-pane-title"><localize key="assignDomain_setDomains">Domains</localize></h5>
-        <p><small><localize key="assignDomain_domainHelpWithVariants">Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/". Furthermore also one-level paths in domains are supported, eg. "example.com/en" or "/en".</localize></small></p>
-
-        <div class="form-horizontal" ui-sortable="sortableOptions" ng-model="vm.domains">
-          <div ng-repeat="domain in vm.domains">
-            <div ng-if="domain.duplicate" class="alert alert-error property-error">
-              <localize key="assignDomain_duplicateDomain">Domain has already been assigned.</localize><span ng-if="domain.other"> ({{domain.other}})</span>
-            </div>
-            <div ng-if="vm.domainForm.$submitted" ng-messages="vm.domainForm['domain_name_' + $index].$error">
-              <div class="alert alert-error property-error" ng-message="required"><localize key="validation_invalidEmpty">Value cannot be empty</localize></div>
-            </div>
-            <div class="umb-prevalues-multivalues__listitem">
-              <umb-icon icon="icon-navigation" class="icon handle"></umb-icon>
-              <div class="umb-prevalues-multivalues__left">
-                <input type="text" ng-model="domain.name" name="domain_name_{{$index}}" required umb-auto-focus />
-                <select ng-model="domain.lang" name="domain_language_{{$index}}" ng-options="lang.name for lang in vm.languages" required></select>
-              </div>
-              <div class="umb-prevalues-multivalues__right">
-                <button type="button" class="umb-node-preview__action" ng-click="vm.removeDomain($index)"><localize key="general_remove">Remove</localize></button>
-              </div>
-            </div>
-          </div>
-        </div>
-        <umb-button-group ng-if="vm.buttonGroup"
-                          default-button="vm.buttonGroup.defaultButton"
-                          sub-buttons="vm.buttonGroup.subButtons"
-                          button-style="[placeholder, block]"
-                          float="right">
-        </umb-button-group>
-      </umb-pane>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-      <umb-button label-key="general_close"
-                  action="vm.closeDialog()"
-                  type="button"
-                  button-style="link">
-      </umb-button>
-      <umb-button label-key="buttons_save"
-                  type="submit"
-                  button-style="success"
-                  state="vm.submitButtonState">
-      </umb-button>
-    </div>
-  </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
deleted file mode 100644
index 61d710427e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
+++ /dev/null
@@ -1,178 +0,0 @@
-(function () {
-  "use strict";
-
-  function AssignDomainController($scope, localizationService, languageResource, contentResource, navigationService, notificationsService, $location) {
-    var vm = this;
-
-    vm.loading = true;
-    vm.closeDialog = closeDialog;
-    vm.removeDomain = removeDomain;
-    vm.save = save;
-    vm.languages = [];
-    vm.domains = [];
-    vm.language = null;
-
-    vm.buttonGroup = {
-      defaultButton: {
-        labelKey: 'assignDomain_addNew',
-        buttonStyle: 'info',
-        handler: addDomain
-      },
-      subButtons: [{
-        labelKey: 'assignDomain_addCurrent',
-        buttonStyle: 'success',
-        handler: addCurrentDomain
-      }]
-    };
-
-    $scope.sortableOptions = {
-      axis: 'y',
-      containment: 'parent',
-      cursor: 'move',
-      handle: ".handle",
-      placeholder: 'sortable-placeholder',
-      forcePlaceholderSize: true,
-      tolerance: 'pointer'
-    };
-
-    function activate() {
-      languageResource.getAll().then(langs => {
-        vm.languages = langs;
-
-        var defLang = langs.filter(l => {
-          return l.isDefault;
-        });
-
-        if (defLang.length > 0) {
-          vm.defaultLanguage = defLang[0];
-        }
-        else {
-          vm.defaultLanguage = langs[0];
-        }
-
-        contentResource.getCultureAndDomains($scope.currentNode.id).then(function (data) {
-          if (data.language !== "undefined") {
-            var lang = vm.languages.filter(function (l) {
-              return matchLanguageById(l, data.language);
-            });
-
-            if (lang.length > 0) {
-              vm.language = lang[0];
-            }
-          }
-
-          vm.domains = data.domains.map(function (d) {
-            var matchedLangs = vm.languages.filter(function (lng) {
-              return matchLanguageById(lng, d.lang);
-            });
-
-            return {
-              name: d.name,
-              lang: matchedLangs.length > 0 ? matchedLangs[0] : vm.defaultLanguage
-            }
-          });
-
-          vm.loading = false;
-        });
-      });
-    }
-
-    function matchLanguageById(language, id) {
-      var langId = parseInt(language.id);
-      var comparisonId = parseInt(id);
-
-      return langId === comparisonId;
-    }
-
-    function closeDialog() {
-      navigationService.hideDialog();
-    }
-
-    function addDomain() {
-      vm.domains.push({
-        name: '',
-        lang: vm.defaultLanguage
-      });
-    }
-
-    function addCurrentDomain() {
-      var domainToAdd = $location.host();
-      var port = $location.port();
-      if (port != 80 && port != 443) {
-        domainToAdd += ":" + port;
-      }
-
-      vm.domains.push({
-        name: domainToAdd,
-        lang: vm.defaultLanguage
-      });
-    }
-
-    function removeDomain(index) {
-      vm.domains.splice(index, 1);
-    }
-
-    function save() {
-      vm.error = null;
-      vm.submitButtonState = "busy";
-
-      if (vm.domainForm.$valid) {
-        // clear validation messages
-        vm.domains.forEach(domain => {
-          domain.duplicate = null;
-          domain.other = null;
-        });
-
-        var data = {
-          nodeId: $scope.currentNode.id,
-          domains: vm.domains.map(function (d) {
-            return {
-              name: d.name,
-              lang: d.lang.id
-            };
-          }),
-          language: vm.language != null ? vm.language.id : 0
-        };
-
-        contentResource.saveLanguageAndDomains(data).then(function (response) {
-          // validation is interesting. Check if response is valid
-          if (response.valid) {
-            vm.submitButtonState = "success";
-
-            localizationService.localize('speechBubbles_editCulturesAndHostnamesSaved').then(function (value) {
-              notificationsService.success(value);
-            });
-
-            closeDialog();
-          } else {
-            // show validation messages for each domain
-            response.domains.forEach(validation => {
-              vm.domains.forEach(domain => {
-                if (validation.name === domain.name) {
-                  domain.duplicate = validation.duplicate;
-                  domain.other = validation.other;
-                }
-              });
-            });
-
-            vm.submitButtonState = "error";
-
-            localizationService.localize('speechBubbles_editCulturesAndHostnamesError').then(function (value) {
-              notificationsService.error(value);
-            });
-          }
-        }, function (e) {
-          vm.error = e;
-          vm.submitButtonState = "error";
-        });
-      } else {
-        vm.submitButtonState = "error";
-      }
-    }
-
-    activate();
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Content.AssignDomainController", AssignDomainController);
-})();
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
deleted file mode 100644
index 01526bb907..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
+++ /dev/null
@@ -1,157 +0,0 @@
-angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
-    function ($scope, userService, eventsService, contentResource, navigationService, appState, treeService, localizationService, notificationsService) {
-
-	    var searchText = "Search...";
-	    localizationService.localize("general_search").then(function (value) {
-	        searchText = value + "...";
-	    });
-
-	    $scope.relateToOriginal = true;
-	    $scope.recursive = true;
-	    $scope.dialogTreeApi = {};
-	    $scope.busy = false;
-	    $scope.searchInfo = {
-	        searchFromId: null,
-	        searchFromName: null,
-	        showSearch: false,
-	        results: [],
-	        selectedSearchResults: []
-	    }
-	    $scope.treeModel = {
-	        hideHeader: false
-        }
-        $scope.toggle = toggleHandler;
-	    userService.getCurrentUser().then(function (userData) {
-            $scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1;
-	    });
-
-	    $scope.source = _.clone($scope.currentNode);
-
-        function treeLoadedHandler(args) {
-            if ($scope.source && $scope.source.path) {
-                $scope.dialogTreeApi.syncTree({ path: $scope.source.path, activate: false });
-            }
-        }
-
-	    function nodeSelectHandler(args) {
-
-			if(args && args.event) {
-	        	args.event.preventDefault();
-	        	args.event.stopPropagation();
-			}
-
-			eventsService.emit("editors.content.copyController.select", args);
-
-			if ($scope.target) {
-				//un-select if there's a current one selected
-				$scope.target.selected = false;
-			}
-
-			$scope.target = args.node;
-			$scope.target.selected = true;
-
-	    }
-
-	    function nodeExpandedHandler(args) {
-			// open mini list view for list views
-          	if (args.node.metaData.isContainer) {
-				openMiniListView(args.node);
-			}
-        }
-
-        function toggleHandler(type){
-            // If the relateToOriginal toggle is clicked
-            if(type === "relate"){
-                if($scope.relateToOriginal){
-                    $scope.relateToOriginal = false;
-                    return;
-                }
-                $scope.relateToOriginal = true;
-            }
-
-            // If the recurvise toggle is clicked
-            if(type === "recursive"){
-                if($scope.recursive){
-                    $scope.recursive = false;
-                    return;
-                }
-                $scope.recursive = true;
-            }
-		}
-		
-		$scope.closeDialog = function() {
-			navigationService.hideDialog();
-		};
-
-	    $scope.hideSearch = function () {
-	        $scope.searchInfo.showSearch = false;
-	        $scope.searchInfo.searchFromId = null;
-	        $scope.searchInfo.searchFromName = null;
-	        $scope.searchInfo.results = [];
-	    }
-
-	    // method to select a search result
-	    $scope.selectResult = function (evt, result) {
-	        result.selected = result.selected === true ? false : true;
-	        nodeSelectHandler({ event: evt, node: result });
-	    };
-
-	    //callback when there are search results
-	    $scope.onSearchResults = function (results) {
-	        $scope.searchInfo.results = results;
-	        $scope.searchInfo.showSearch = true;
-	    };
-
-	    $scope.copy = function () {
-
-	        $scope.busy = true;
-	        $scope.error = false;
-
-	        contentResource.copy({ parentId: $scope.target.id, id: $scope.source.id, relateToOriginal: $scope.relateToOriginal, recursive: $scope.recursive })
-                .then(function (path) {
-                    $scope.error = false;
-                    $scope.success = true;
-                    $scope.busy = false;
-
-                    //get the currently edited node (if any)
-                    var activeNode = appState.getTreeState("selectedNode");
-
-                    //we need to do a double sync here: first sync to the copied content - but don't activate the node,
-                    //then sync to the currenlty edited content (note: this might not be the content that was copied!!)
-
-                    navigationService.syncTree({ tree: "content", path: path, forceReload: true, activate: false }).then(function (args) {
-                        if (activeNode) {
-                            var activeNodePath = treeService.getPath(activeNode).join();
-                            //sync to this node now - depending on what was copied this might already be synced but might not be
-                            navigationService.syncTree({ tree: "content", path: activeNodePath, forceReload: false, activate: true });
-                        }
-                    });
-
-                }, function (err) {
-                    $scope.success = false;
-                    $scope.error = err;
-                    $scope.busy = false;                   
-                });
-	    };
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeLoaded(treeLoadedHandler);
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-            $scope.dialogTreeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
-        }
-
-		// Mini list view
-		$scope.selectListViewNode = function (node) {
-			node.selected = node.selected === true ? false : true;
-			nodeSelectHandler({ node: node });
-		};
-
-		$scope.closeMiniListView = function () {
-			$scope.miniListView = undefined;
-		};
-
-		function openMiniListView(node) {
-			$scope.miniListView = node;
-		}
-		
-	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
deleted file mode 100644
index c36a0a47b8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Content.CreateController
- * @function
- *
- * @description
- * The controller for the content creation dialog
- */
-function contentCreateController($scope,
-    $routeParams,
-    contentTypeResource,
-    iconHelper,
-    $location,
-    navigationService,
-    blueprintConfig,
-    authResource,
-    contentResource,
-    $q) {
-
-    var mainCulture = $routeParams.mculture ? $routeParams.mculture : null;
-
-    function initialize() {
-        $scope.loading = true;
-        $scope.allowedTypes = null;
-
-        var getAllowedTypes = contentTypeResource.getAllowedTypes($scope.currentNode.id).then(function (data) {
-            $scope.allowedTypes = iconHelper.formatContentTypeIcons(data);
-        });
-        var getCurrentUser = authResource.getCurrentUser().then(function (currentUser) {
-
-            $scope.hasSettingsAccess = currentUser.allowedSections.indexOf("settings") > -1;
-            if ($scope.hasSettingsAccess) {
-
-                if ($scope.currentNode.id > -1) {
-                    return contentResource.getById($scope.currentNode.id).then(function (data) {
-                        $scope.contentTypeId = data.contentTypeId;
-                    });
-                }
-            }
-        });
-
-        $q.all([getAllowedTypes, getCurrentUser]).then(function() {
-            if ($scope.hasSettingsAccess === true && $scope.allowedTypes.length === 0) {
-                return contentTypeResource.getCount().then(function(count) {
-                    $scope.countTypes = count;
-                });
-            }
-        }).then(function() {
-            $scope.loading = false;
-        });
-
-        $scope.selectContentType = true;
-        $scope.selectBlueprint = false;
-        $scope.allowBlank = blueprintConfig.allowBlank;
-    }
-
-    function close() {
-        navigationService.hideMenu();
-    }
-
-    function createBlank(docType) {
-        $location
-            .path("/content/content/edit/" + $scope.currentNode.id)
-            .search("doctype", docType.alias)
-            .search("create", "true")
-            /* when we create a new node we want to make sure it uses the same
-            language as what is selected in the tree */
-            .search("cculture", mainCulture)
-            /* when we create a new node we must make sure that any previously
-            opened segments is reset */
-            .search("csegment", null)
-            /* when we create a new node we must make sure that any previously
-            used blueprint is reset */
-            .search("blueprintId", null);
-        close();
-    }
-
-    function createOrSelectBlueprintIfAny(docType) {
-        // map the blueprints into a collection that's sortable in the view
-        var blueprints = _.map(_.pairs(docType.blueprints || {}), function (pair) {
-            return {
-                id: pair[0],
-                name: pair[1]
-            };
-        });
-        $scope.docType = docType;
-        if (blueprints.length) {
-            if (blueprintConfig.skipSelect) {
-                createFromBlueprint(blueprints[0].id);
-            } else {
-                $scope.selectContentType = false;
-                $scope.selectBlueprint = true;
-                $scope.selectableBlueprints = blueprints;
-            }
-        } else {
-            createBlank(docType);
-        }
-    }
-
-    function createFromBlueprint(blueprintId) {
-        $location
-            .path("/content/content/edit/" + $scope.currentNode.id)
-            .search("doctype", $scope.docType.alias)
-            .search("create", "true")
-            .search("blueprintId", blueprintId);
-        close();
-    }
-
-    $scope.close = function() {
-        close();
-    };
-
-    $scope.closeDialog = function (showMenu) {
-        navigationService.hideDialog(showMenu);
-    };
-
-    $scope.createContentType = function () {
-        $location.path("/settings/documentTypes/edit/-1").search("create", "true");
-        close();
-    };
-
-    $scope.editContentType = function () {
-        $location.path("/settings/documentTypes/edit/" + $scope.contentTypeId).search("view", "permissions");
-        close();
-    };
-
-    $scope.createBlank = createBlank;
-    $scope.createOrSelectBlueprintIfAny = createOrSelectBlueprintIfAny;
-    $scope.createFromBlueprint = createFromBlueprint;
-
-    // the current node changes behind the scenes when the context menu is clicked without closing
-    // the default menu first, so we must watch the current node and re-initialize accordingly
-    var unbindModelWatcher = $scope.$watch("currentNode", initialize);
-    $scope.$on('$destroy', function () {
-        unbindModelWatcher();
-    });
-
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Content.CreateController", contentCreateController);
-
-angular.module("umbraco").value("blueprintConfig", {
-    skipSelect: false,
-    allowBlank: true
-});
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js
deleted file mode 100644
index 9dc1b6cefd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.createblueprint.controller.js
+++ /dev/null
@@ -1,49 +0,0 @@
-(function () {
-
-    function CreateBlueprintController(
-        $scope,
-        contentResource,
-        navigationService,
-        localizationService,
-        formHelper,
-        contentEditingHelper) {
-
-        $scope.message = {
-            name: $scope.currentNode.name
-        };
-
-        localizationService.localize("blueprints_createBlueprintFrom", [$scope.message.name]).then(localizedVal => {
-            $scope.title = localizedVal;
-        });
-
-        $scope.cancel = function () {
-            navigationService.hideMenu();
-        };
-
-        $scope.create = function () {
-            if (formHelper.submitForm({
-                scope: $scope,
-                formCtrl: this.blueprintForm
-            })) {
-
-                contentResource.createBlueprintFromContent($scope.currentNode.id, $scope.message.name)
-                    .then(function (data) {
-
-                        formHelper.resetForm({ scope: $scope });
-
-                        navigationService.hideMenu();
-                    },
-                    function (err) {
-                        formHelper.resetForm({ scope: $scope, hasErrors: true });
-                        contentEditingHelper.handleSaveError({
-                            err: err
-                        });
-
-                    });
-            }
-        };
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Content.CreateBlueprintController", CreateBlueprintController);
-
-}());
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
deleted file mode 100644
index 771d1b9280..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Content.DeleteController
- * @function
- * 
- * @description
- * The controller for deleting content
- */
-function ContentDeleteController($scope, $timeout, contentResource, treeService, navigationService, editorState, $location, overlayService, languageResource, localizationService) {
-
-    /**
-     * Used to toggle UI elements during delete operations
-     * @param {any} isDeleting
-     */
-    function toggleDeleting(isDeleting) {
-        $scope.currentNode.loading = isDeleting;
-        $scope.busy = isDeleting;
-    }
-
-    $scope.checkingReferences = true;
-    $scope.warningText = null;
-    $scope.disableDelete = false;
-    
-    $scope.performDelete = function() {
-
-        // stop from firing again on double-click
-        if ($scope.busy) { return false; }
-
-        toggleDeleting(true);
-
-        contentResource.deleteById($scope.currentNode.id).then(function () {
-            
-            //get the root node before we remove it
-            var rootNode = treeService.getTreeRoot($scope.currentNode);
-
-            treeService.removeNode($scope.currentNode);
-
-            toggleDeleting(false);
-
-            if (rootNode) {
-                //ensure the recycle bin has child nodes now            
-                var recycleBin = treeService.getDescendantNode(rootNode, -20);
-                if (recycleBin) {
-                    recycleBin.hasChildren = true;
-                    //reload the recycle bin if it's already expanded so the deleted item is shown
-                    if (recycleBin.expanded) {
-                        treeService.loadNodeChildren({ node: recycleBin, section: "content" });
-                    }
-                }
-            }
-
-            //if the current edited item is the same one as we're deleting, we need to navigate elsewhere
-            if (editorState.current && editorState.current.id == $scope.currentNode.id) {
-
-                //If the deleted item lived at the root then just redirect back to the root, otherwise redirect to the item's parent
-                var location = "/content";
-                if ($scope.currentNode.parentId.toString() === "-20")
-                    location = "/content/content/recyclebin";
-                else if ($scope.currentNode.parentId.toString() !== "-1")
-                    location = "/content/content/edit/" + $scope.currentNode.parentId;
-
-                $location.path(location);
-            }
-
-            $scope.success = true;
-        }, function(err) {
-
-            toggleDeleting(false);
-
-            //check if response is ysod
-            if (err.status && err.status >= 500) {
-                // TODO: All YSOD handling should be done with an interceptor
-                overlayService.ysod(err);
-                navigationService.hideDialog();
-            }
-
-            if(err.data && err.data.notifications && err.data.notifications.length > 0) {
-                navigationService.hideDialog();
-            }
-        });
-
-    };
-
-    $scope.checkingReferencesComplete = () => {
-        $scope.checkingReferences = false;
-    };
-
-    $scope.onReferencesWarning = () => {
-        // check if the deletion of items that have references has been disabled
-        if (Umbraco.Sys.ServerVariables.umbracoSettings.disableDeleteWhenReferenced) {
-            // this will only be set to true if we have a warning, indicating that this item or its descendants have reference
-            $scope.disableDelete = true;
-
-            localizationService.localize("references_deleteDisabledWarning").then((value) => {
-                $scope.warningText = value;
-            });
-        }
-        else {
-            localizationService.localize("references_deleteWarning").then((value) => {
-                $scope.warningText = value;
-            });
-        }
-    };
-
-    $scope.cancel = function() {
-        toggleDeleting(false);
-        $scope.close();
-    };
-
-    $scope.close = function () {
-        navigationService.hideDialog();
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Content.DeleteController", ContentDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
deleted file mode 100644
index 2c7c53e31f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Content.EditController
- * @function
- * 
- * @description
- * The controller for the content editor
- */
-function ContentEditController($scope, $routeParams, contentResource) {
-
-    var infiniteMode = $scope.model && $scope.model.infiniteMode;
-
-    function scaffoldEmpty() {
-        return contentResource.getScaffold($routeParams.id, $routeParams.doctype);
-    }
-    function scaffoldInfiniteEmpty() {
-        return contentResource.getScaffold($scope.model.parentId, $scope.model.documentTypeAlias);
-    }
-    function scaffoldBlueprint() {
-        return contentResource.getBlueprintScaffold($routeParams.id, $routeParams.blueprintId);
-    }
-
-    $scope.contentId = infiniteMode ? $scope.model.id : $routeParams.id;
-    $scope.saveMethod = contentResource.save;
-    $scope.getMethod = contentResource.getById;
-    $scope.getScaffoldMethod = $routeParams.blueprintId ? scaffoldBlueprint : infiniteMode ? scaffoldInfiniteEmpty : scaffoldEmpty;
-    $scope.page = $routeParams.page;
-    $scope.isNew = infiniteMode ? $scope.model.create : $routeParams.create;
-    //load the default culture selected in the main tree if any
-    $scope.culture = $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture;
-    $scope.segment = $routeParams.csegment ? $routeParams.csegment : null;
-
-    //Bind to $routeUpdate which will execute anytime a location changes but the route is not triggered.
-    //This is so we can listen to changes on the cculture parameter since that will not cause a route change
-    //and then we can pass in the updated culture to the editor.
-    //This will also execute when we are redirecting from creating an item to a newly created item since that
-    //will not cause a route change and so we can update the isNew and contentId flags accordingly.
-    $scope.$on('$routeUpdate', function (event, next) {
-        $scope.culture = next.params.cculture ? next.params.cculture : $routeParams.mculture;
-        $scope.segment = next.params.csegment ? next.params.csegment : null;
-        $scope.isNew = next.params.create === "true";
-        $scope.contentId = infiniteMode ? $scope.model.id : $routeParams.id;
-    });
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Content.EditController", ContentEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.emptyrecyclebin.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.emptyrecyclebin.controller.js
deleted file mode 100644
index ee55b1ced4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.emptyrecyclebin.controller.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Content.EmptyRecycleBinController
- * @function
- * 
- * @description
- * The controller for deleting content
- */
-function ContentEmptyRecycleBinController($scope, contentResource, treeService, navigationService, notificationsService, $route) {
-
-    $scope.busy = false;
-
-    $scope.performDelete = function() {
-
-        //(used in the UI)
-        $scope.busy = true;
-        $scope.currentNode.loading = true;
-
-        contentResource.emptyRecycleBin($scope.currentNode.id).then(function (result) {
-
-            $scope.busy = false;
-            $scope.currentNode.loading = false;
-            
-            treeService.removeChildNodes($scope.currentNode);
-            navigationService.hideMenu();
-
-            //reload the current view
-            $route.reload();
-        });
-
-    };
-
-    $scope.cancel = function() {
-        navigationService.hideDialog();
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Content.EmptyRecycleBinController", ContentEmptyRecycleBinController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
deleted file mode 100644
index 56a75b7173..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
+++ /dev/null
@@ -1,138 +0,0 @@
-angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController",
-	function ($scope, userService, eventsService, contentResource, navigationService, appState, treeService, localizationService, notificationsService) {
-
-	    var searchText = "Search...";
-	    localizationService.localize("general_search").then(function (value) {
-	        searchText = value + "...";
-	    });
-
-	    $scope.dialogTreeApi = {};
-	    $scope.busy = false;
-	    $scope.searchInfo = {
-	        searchFromId: null,
-	        searchFromName: null,
-	        showSearch: false,
-	        results: [],
-	        selectedSearchResults: []
-        }
-        $scope.treeModel = {
-            hideHeader: false
-        }
-        userService.getCurrentUser().then(function (userData) {
-            $scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1;
-        });
-
-	    $scope.source = _.clone($scope.currentNode);
-
-        function treeLoadedHandler(args) {
-            if ($scope.source && $scope.source.path) {
-                $scope.dialogTreeApi.syncTree({ path: $scope.source.path, activate: false });
-            }
-        }
-
-	    function nodeSelectHandler(args) {
-
-			if(args && args.event) {
-				args.event.preventDefault();
-				args.event.stopPropagation();
-			}
-
-			eventsService.emit("editors.content.moveController.select", args);
-
-			if ($scope.target) {
-				//un-select if there's a current one selected
-				$scope.target.selected = false;
-			}
-
-			$scope.target = args.node;
-			$scope.target.selected = true;
-
-	    }
-
-	    function nodeExpandedHandler(args) {
-			// open mini list view for list views
-          	if (args.node.metaData.isContainer) {
-				openMiniListView(args.node);
-			}
-	    }
-
-	    $scope.hideSearch = function () {
-	        $scope.searchInfo.showSearch = false;
-	        $scope.searchInfo.searchFromId = null;
-	        $scope.searchInfo.searchFromName = null;
-	        $scope.searchInfo.results = [];
-	    }
-
-	    // method to select a search result 
-	    $scope.selectResult = function (evt, result) {
-	        result.selected = result.selected === true ? false : true;
-	        nodeSelectHandler({ event: evt, node: result });
-	    };
-
-	    //callback when there are search results 
-	    $scope.onSearchResults = function (results) {
-	        $scope.searchInfo.results = results;
-	        $scope.searchInfo.showSearch = true;
-		};
-		
-		$scope.close = function() {
-			navigationService.hideDialog();
-		};
-
-	    $scope.move = function () {
-
-	        $scope.busy = true;
-	        $scope.error = false;
-
-	        contentResource.move({ parentId: $scope.target.id, id: $scope.source.id })
-                .then(function (path) {
-                    $scope.error = false;
-                    $scope.success = true;
-                    $scope.busy = false;
-
-                    //first we need to remove the node that launched the dialog
-                    treeService.removeNode($scope.currentNode);
-
-                    //get the currently edited node (if any)
-                    var activeNode = appState.getTreeState("selectedNode");
-
-                    //we need to do a double sync here: first sync to the moved content - but don't activate the node,
-                    //then sync to the currently edited content (note: this might not be the content that was moved!!)
-
-                    navigationService.syncTree({ tree: "content", path: path, forceReload: true, activate: false }).then(function (args) {
-                        if (activeNode) {
-                            var activeNodePath = treeService.getPath(activeNode).join();
-                            //sync to this node now - depending on what was copied this might already be synced but might not be
-                            navigationService.syncTree({ tree: "content", path: activeNodePath, forceReload: false, activate: true });
-                        }
-                    });
-
-                }, function (err) {
-                    $scope.success = false;
-                    $scope.error = err;
-                    $scope.busy = false;
-                   
-                });
-	    };
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeLoaded(treeLoadedHandler);
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-            $scope.dialogTreeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
-        }	    
-        
-		// Mini list view
-		$scope.selectListViewNode = function (node) {
-			node.selected = node.selected === true ? false : true;
-			nodeSelectHandler({ node: node });
-		};
-
-		$scope.closeMiniListView = function () {
-			$scope.miniListView = undefined;
-		};
-
-		function openMiniListView(node) {
-			$scope.miniListView = node;
-		}
-
-	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.notify.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.notify.controller.js
deleted file mode 100644
index 29619f2b96..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.notify.controller.js
+++ /dev/null
@@ -1,54 +0,0 @@
-(function () {
-    function CreateNotifyController(
-        $scope,
-        contentResource,
-        navigationService,
-        localizationService) {
-        var vm = this;
-        vm.notifyOptions = [];
-        vm.save = save;
-        vm.cancel = cancel;
-        vm.notificationChanged = notificationChanged;
-        vm.message = {
-            name: $scope.currentNode.name
-        };
-        vm.labels = {};
-        function onInit() {
-            vm.loading = true;
-            contentResource.getNotifySettingsById($scope.currentNode.id).then(function (options) {
-                vm.loading = false;
-                vm.notifyOptions = options;
-            });
-            localizationService.localize("notifications_editNotifications", [$scope.currentNode.name]).then(function(value) {
-                vm.labels.headline = value;
-            });
-        }
-        function cancel() {
-            navigationService.hideMenu();
-        };
-        function save(notifyOptions) {
-            vm.saveState = "busy";
-            vm.saveError = false;
-            vm.saveSuccces = false;
-            var selectedString = [];
-            notifyOptions.forEach(function (option) {
-                    if (option.checked === true && option.notifyCode) {
-                        selectedString.push(option.notifyCode);
-                    }
-            })
-
-            contentResource.setNotifySettingsById($scope.currentNode.id, selectedString).then(function () {
-                vm.saveState = "success";
-                vm.saveSuccces = true;
-            }, function (error) {
-                vm.saveState = "error";
-                vm.saveError = error;
-            });
-        }
-        function notificationChanged(item) {
-            vm.canSave = true;
-        }
-        onInit();
-    }
-    angular.module("umbraco").controller("Umbraco.Editors.Content.CreateNotifyController", CreateNotifyController);
-}()); 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.protect.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.protect.controller.js
deleted file mode 100644
index 6561ed3499..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.protect.controller.js
+++ /dev/null
@@ -1,261 +0,0 @@
-(function () {
-    "use strict";
-
-    function ContentProtectController($scope, $q,  publicAccessResource, memberResource, memberGroupResource, navigationService, localizationService, editorService) {
-
-        var vm = this;
-        var id = $scope.currentNode.id;
-
-        vm.loading = false;
-        vm.buttonState = "init";
-
-        vm.isValid = isValid;
-        vm.next = next;
-        vm.save = save;
-        vm.close = close;
-        vm.toggle = toggle;
-        vm.pickLoginPage = pickLoginPage;
-        vm.pickErrorPage = pickErrorPage;
-        vm.pickGroup = pickGroup;
-        vm.removeGroup = removeGroup;
-        vm.pickMember = pickMember;
-        vm.removeMember = removeMember;
-        vm.removeProtection = removeProtection;
-        vm.removeProtectionConfirm = removeProtectionConfirm;
-
-        vm.type = null;
-        vm.step = null;
-
-        function onInit() {
-            vm.loading = true;
-
-            // get the current public access protection
-            publicAccessResource.getPublicAccess(id).then(function (publicAccess) {
-                vm.loading = false;
-
-                // init the current settings for public access (if any)
-                vm.loginPage = publicAccess.loginPage;
-                vm.errorPage = publicAccess.errorPage;
-                vm.groups = publicAccess.groups || [];
-                vm.members = publicAccess.members || [];
-                vm.canRemove = true;
-
-                if (vm.members.length) {
-                    vm.type = "member";
-                    next();
-                }
-                else if (vm.groups.length) {
-                    vm.type = "group";
-                    next();
-                }
-                else {
-                    vm.canRemove = false;
-                }
-            });
-        }
-
-        function next() {
-            if (vm.type === "group") {
-                vm.loading = true;
-                // get all existing member groups for lookup upon selection
-                // NOTE: if/when member groups support infinite editing, we can't rely on using a cached lookup list of valid groups anymore
-                memberGroupResource.getGroups().then(function (groups) {
-                    vm.step = vm.type;
-                    vm.allGroups = groups;
-                    vm.hasGroups = groups.length > 0;
-                    vm.loading = false;
-                });
-            }
-            else {
-                vm.step = vm.type;
-            }
-        }
-
-        function isValid() {
-            if (!vm.type) {
-                return false;
-            }
-            if (!vm.protectForm.$valid) {
-                return false;
-            }
-            if (!vm.loginPage || !vm.errorPage) {
-                return false;
-            }
-            if (vm.type === "group") {
-                return vm.groups && vm.groups.length > 0;
-            }
-            if (vm.type === "member") {
-                return vm.members && vm.members.length > 0;
-            }
-            return true;
-        }
-
-        function save() {
-            vm.buttonState = "busy";
-            var groups = _.map(vm.groups, function (group) { return encodeURIComponent(group.name); });
-            var usernames = _.map(vm.members, function (member) { return member.username; });
-            publicAccessResource.updatePublicAccess(id, groups, usernames, vm.loginPage.id, vm.errorPage.id).then(
-                function () {
-                    localizationService.localize("publicAccess_paIsProtected", [$scope.currentNode.name]).then(function (value) {
-                        vm.success = {
-                            message: value
-                        };
-                    });
-                    navigationService.syncTree({ tree: "content", path: $scope.currentNode.path, forceReload: true });
-                    $scope.dialog.confirmDiscardChanges = true;
-                }, function (error) {
-                    vm.error = error;
-                    vm.buttonState = "error";
-                }
-            );
-        }
-
-        function close() {
-            // ensure that we haven't set a locked state on the dialog before closing it
-            navigationService.allowHideDialog(true);
-            navigationService.hideDialog();
-        }
-
-        function toggle(group) {
-            group.selected = !group.selected;
-            $scope.dialog.confirmDiscardChanges = true;
-        }
-
-        function pickGroup() {
-            navigationService.allowHideDialog(false);
-            editorService.memberGroupPicker({
-                multiPicker: true,
-                submit: function(model) {
-                    var selectedGroupIds = model.selectedMemberGroups
-                        ? model.selectedMemberGroups
-                        : [model.selectedMemberGroup];
-                    _.each(selectedGroupIds,
-                        function (groupId) {
-                            // find the group in the lookup list and add it if it isn't already
-                            var group = _.find(vm.allGroups, function(g) { return g.id === parseInt(groupId); });
-                            if (group && !_.find(vm.groups, function (g) { return g.id === group.id })) {
-                                vm.groups.push(group);
-                            }
-                        });
-                    editorService.close();
-                    navigationService.allowHideDialog(true);
-                    $scope.dialog.confirmDiscardChanges = true;
-                },
-                close: function() {
-                    editorService.close();
-                    navigationService.allowHideDialog(true);
-                }
-            });
-        }
-
-        function removeGroup(group) {
-            vm.groups = _.reject(vm.groups, function(g) { return g.id === group.id });
-            $scope.dialog.confirmDiscardChanges = true;
-        }
-
-        function pickMember() {
-            navigationService.allowHideDialog(false);
-            // TODO: once editorService has a memberPicker method, use that instead
-            editorService.treePicker({
-                multiPicker: true,
-                entityType: "Member",
-                section: "member",
-                treeAlias: "member",
-                filter: function (i) {
-                    return i.metaData.isContainer;
-                },
-                filterCssClass: "not-allowed",
-                submit: function (model) {
-                    if (model.selection && model.selection.length) {
-                        var promises = [];
-                        // get the selected member usernames
-                        _.each(model.selection,
-                            function (member) {
-                                // TODO:
-                                // as-is we need to fetch all the picked members one at a time to get their usernames.
-                                // when editorService has a memberPicker method, see if this can't be avoided - otherwise
-                                // add a memberResource.getByKeys() method to do all this in one request
-                                promises.push(
-                                    memberResource.getByKey(member.key).then(function(newMember) {
-                                        if (!_.find(vm.members, function (currentMember) { return currentMember.username === newMember.username })) {
-                                            vm.members.push(newMember);
-                                        }
-                                    })
-                                );
-                            });
-                        editorService.close();
-                        navigationService.allowHideDialog(true);
-                        // wait for all the member lookups to complete
-                        vm.loading = true;
-                        $q.all(promises).then(function() {
-                            vm.loading = false;
-                        });
-                        $scope.dialog.confirmDiscardChanges = true;
-                    }
-                },
-                close: function () {
-                    editorService.close();
-                    navigationService.allowHideDialog(true);
-                }
-            });
-        }
-
-        function removeMember(member) {
-            vm.members = _.without(vm.members, member);
-        }
-
-        function pickLoginPage() {
-            pickPage(vm.loginPage);
-        }
-
-        function pickErrorPage() {
-            pickPage(vm.errorPage);
-        }
-
-        function pickPage(page) {
-            navigationService.allowHideDialog(false);
-            editorService.contentPicker({
-                submit: function (model) {
-                    if (page === vm.loginPage) {
-                        vm.loginPage = model.selection[0];
-                    }
-                    else {
-                        vm.errorPage = model.selection[0];
-                    }
-                    editorService.close();
-                    navigationService.allowHideDialog(true);
-                    $scope.dialog.confirmDiscardChanges = true;
-                },
-                close: function () {
-                    editorService.close();
-                    navigationService.allowHideDialog(true);
-                }
-            });
-        }
-
-        function removeProtection() {
-            vm.removing = true;
-        }
-
-        function removeProtectionConfirm() {
-            vm.buttonState = "busy";
-            publicAccessResource.removePublicAccess(id).then(
-                function () {
-                    localizationService.localize("publicAccess_paIsRemoved", [$scope.currentNode.name]).then(function(value) {
-                        vm.success = {
-                            message: value
-                        };
-                    });
-                    navigationService.syncTree({ tree: "content", path: $scope.currentNode.path, forceReload: true });
-                }, function (error) {
-                    vm.error = error;
-                    vm.buttonState = "error";
-                }
-            );
-        }
-
-        onInit();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Content.ProtectController", ContentProtectController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.recyclebin.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.recyclebin.controller.js
deleted file mode 100644
index ab3f5cc04a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.recyclebin.controller.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Content.RecycleBinController
- * @function
- * 
- * @description
- * Controls the recycle bin for content
- * 
- */
-
-function ContentRecycleBinController($scope, $routeParams, contentResource, navigationService, localizationService) {
-
-    //ensures the list view doesn't actually load until we query for the list view config
-    // for the section
-    $scope.page = {};
-    $scope.page.name = "Recycle Bin";
-    $scope.page.nameLocked = true;
-
-    //ensures the list view doesn't actually load until we query for the list view config
-    // for the section
-    $scope.listViewPath = null;
-
-    $routeParams.id = "-20";
-    contentResource.getRecycleBin().then(function (result) {
-        $scope.content = result;
-    });
-
-    // sync tree node
-    navigationService.syncTree({ tree: "content", path: ["-1", $routeParams.id], forceReload: false });
-
-    localizePageName();
-
-    function localizePageName() {
-
-        var pageName = "general_recycleBin";
-
-        localizationService.localize(pageName).then(function (value) {
-            $scope.page.name = value;
-        });
-
-    }
-}
-
-angular.module('umbraco').controller("Umbraco.Editors.Content.RecycleBinController", ContentRecycleBinController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
deleted file mode 100644
index cfebdeac0e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
+++ /dev/null
@@ -1,161 +0,0 @@
-angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController",
-    function ($scope, relationResource, contentResource, entityResource, navigationService, appState, treeService, userService, localizationService) {
-
-        $scope.source = _.clone($scope.currentNode);
-
-        $scope.error = null;
-        $scope.loading = true;
-        $scope.moving = false;
-        $scope.success = false;
-
-	    $scope.dialogTreeApi = {};
-        $scope.searchInfo = {
-            showSearch: false,
-            results: [],
-            selectedSearchResults: []
-        }
-        $scope.treeModel = {
-            hideHeader: false
-        }
-        userService.getCurrentUser().then(function (userData) {
-            $scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1;
-        });
-        $scope.labels = {};
-        localizationService.localizeMany(["treeHeaders_content"]).then(function (data) {
-            $scope.labels.treeRoot = data[0];
-        });
-
-        function nodeSelectHandler(args) {
-
-            if (args && args.event) {
-                args.event.preventDefault();
-                args.event.stopPropagation();
-            }
-
-            if ($scope.target) {
-                //un-select if there's a current one selected
-                $scope.target.selected = false;
-            }
-
-            $scope.target = args.node;
-            $scope.target.selected = true;
-
-        }
-
-        function nodeExpandedHandler(args) {
-            // open mini list view for list views
-            if (args.node.metaData.isContainer) {
-                openMiniListView(args.node);
-            }
-        }
-
-        $scope.hideSearch = function () {
-            $scope.searchInfo.showSearch = false;
-            $scope.searchInfo.results = [];
-        }
-
-        // method to select a search result 
-        $scope.selectResult = function (evt, result) {
-            result.selected = result.selected === true ? false : true;
-            nodeSelectHandler({ event: evt, node: result });
-        };
-
-        //callback when there are search results 
-        $scope.onSearchResults = function (results) {
-            $scope.searchInfo.results = results;
-            $scope.searchInfo.showSearch = true;
-        };
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-            $scope.dialogTreeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
-        }	    
-
-        // Mini list view
-        $scope.selectListViewNode = function (node) {
-            node.selected = node.selected === true ? false : true;
-            nodeSelectHandler({ node: node });
-        };
-
-        $scope.closeMiniListView = function () {
-            $scope.miniListView = undefined;
-        };
-
-        function openMiniListView(node) {
-            $scope.miniListView = node;
-        }
-
-        relationResource.getByChildId($scope.source.id, "relateParentDocumentOnDelete").then(function (data) {
-            $scope.loading = false;
-
-            if (!data.length) {
-                $scope.moving = true;
-                return;
-            }
-
-		    $scope.relation = data[0];
-
-			if ($scope.relation.parentId === -1) {
-                $scope.target = { id: -1, name: $scope.labels.treeRoot };
-
-            } else {
-                $scope.loading = true;
-
-                entityResource.getById($scope.relation.parentId, "Document").then(function (data) {
-                    $scope.loading = false;
-                    $scope.target = data;
-
-                    // make sure the target item isn't in the recycle bin
-                    if ($scope.target.path.indexOf("-20") !== -1) {
-                        $scope.moving = true;
-                        $scope.target = null;
-                    }
-				}, function (err) {
-                    $scope.loading = false;
-                    $scope.error = err;
-				});
-			}
-
-		}, function (err) {
-            $scope.loading = false;
-            $scope.error = err;
-		});
-
-		$scope.restore = function () {
-		    $scope.loading = true;
-
-		    // this code was copied from `content.move.controller.js`
-            contentResource.move({ parentId: $scope.target.id, id: $scope.source.id })
-				.then(function (path) {
-
-                    $scope.loading = false;
-					$scope.success = true;
-
-					//first we need to remove the node that launched the dialog
-					treeService.removeNode($scope.currentNode);
-
-					//get the currently edited node (if any)
-					var activeNode = appState.getTreeState("selectedNode");
-
-					//we need to do a double sync here: first sync to the moved content - but don't activate the node,
-					//then sync to the currenlty edited content (note: this might not be the content that was moved!!)
-
-					navigationService.syncTree({ tree: "content", path: path, forceReload: true, activate: false }).then(function (args) {
-						if (activeNode) {
-							var activeNodePath = treeService.getPath(activeNode).join();
-							//sync to this node now - depending on what was copied this might already be synced but might not be
-							navigationService.syncTree({ tree: "content", path: activeNodePath, forceReload: false, activate: true });
-						}
-					});
-
-				}, function (err) {
-                    $scope.loading = false;
-                    $scope.error = err;
-				});
-        };
-
-        $scope.close = function () {
-            navigationService.hideDialog();
-        };
-
-	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
deleted file mode 100644
index 727872c903..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
+++ /dev/null
@@ -1,230 +0,0 @@
-(function () {
-    "use strict";
-
-    function ContentRightsController($scope, $timeout, contentResource, localizationService, angularHelper, navigationService, overlayService) {
-
-        var vm = this;
-        var currentForm;
-
-        vm.availableUserGroups = [];
-        vm.selectedUserGroups = [];
-        vm.removedUserGroups = [];
-        vm.viewState = "manageGroups";
-        vm.labels = {};
-        vm.initialState = {};
-        vm.setViewSate = setViewSate;
-        vm.editPermissions = editPermissions;
-        vm.setPermissions = setPermissions;
-        vm.save = save;
-        vm.removePermissions = removePermissions;
-        vm.cancelManagePermissions = cancelManagePermissions;
-        vm.closeDialog = closeDialog;
-        vm.discardChanges = discardChanges;
-
-        function onInit() {
-            vm.loading = true;
-            contentResource.getDetailedPermissions($scope.currentNode.id).then(userGroups => {
-                initData(userGroups);
-                vm.loading = false;
-                currentForm = angularHelper.getCurrentForm($scope);
-            });
-        }
-
-        /**
-        * This will initialize the data and set the correct selectedUserGroups based on the default permissions and explicit permissions assigned
-        * @param {any} userGroups
-        */
-        function initData(userGroups) {
-          //reset this
-          vm.selectedUserGroups = [];
-          vm.availableUserGroups = userGroups;
-          vm.availableUserGroups.forEach(function (group) {
-            if (group.permissions) {
-              //if there's explicit permissions assigned than it's selected
-              assignGroupPermissions(group);
-            }
-          });
-          vm.initialState = angular.copy(userGroups);
-        }
-
-        function resetData() {
-            vm.selectedUserGroups = [];
-            vm.availableUserGroups = angular.copy(vm.initialState);
-            vm.availableUserGroups.forEach(function (group) {
-                if (group.permissions) {
-                    //if there's explicit permissions assigned than it's selected
-                    group.selected = false;
-                    assignGroupPermissions(group);
-                }
-            });
-            currentForm = angularHelper.getCurrentForm($scope);
-
-        }
-
-        function setViewSate(state) {
-            vm.viewState = state;
-        }
-
-        function editPermissions(group) {
-          vm.selectedUserGroup = group;
-          if (!vm.selectedUserGroup.permissions) {
-            //if no permissions are explicitly set this means we need to show the defaults
-            vm.selectedUserGroup.permissions = vm.selectedUserGroup.defaultPermissions;
-          }
-          localizationService.localize("defaultdialogs_permissionsSetForGroup", [$scope.currentNode.name, vm.selectedUserGroup.name]).then(value => {
-            vm.labels.permissionsSetForGroup = value;
-          });
-          setViewSate("managePermissions");
-          // hide dropdown
-          vm.groupsDropdownOpen = false;
-        }
-
-        function assignGroupPermissions(group) {
-          // clear allowed permissions before we make the list so we don't have duplicates
-          group.allowedPermissions = [];
-
-          // get list of checked permissions
-          Object.values(group.permissions).forEach(function (permissionGroup) {
-            permissionGroup.forEach(function (permission) {
-              if (permission.checked) {
-                //the `allowedPermissions` is what will get sent up to the server for saving
-                group.allowedPermissions.push(permission);
-              }
-            });
-          });
-
-          if (!group.selected) {
-            // set to selected so we can remove from the dropdown easily
-            group.selected = true;
-            vm.selectedUserGroups.push(group);
-            //remove from the removed groups if it's been re-added
-            vm.removedUserGroups = _.reject(vm.removedUserGroups, function (g) {
-              return g.id == group.id;
-            });
-          }
-        }
-
-        function setPermissions(group) {
-            assignGroupPermissions(group);
-            setViewSate("manageGroups");
-            $scope.dialog.confirmDiscardChanges = true;
-        }
-
-        /**
-         * This essentially resets the permissions for a group for this content item, it will remove it from the selected list
-         * @param {any} index
-         */
-        function removePermissions(index) {
-            // remove as selected so we can select it from the dropdown again
-            var group = vm.selectedUserGroups[index];
-            group.selected = false;
-            //reset assigned permissions - so it will default back to default permissions
-            group.permissions = [];
-            group.allowedPermissions = [];
-            vm.selectedUserGroups.splice(index, 1);
-            //track it in the removed so this gets pushed to the server
-            vm.removedUserGroups.push(group);
-        }
-
-        function cancelManagePermissions() {
-            setViewSate("manageGroups");
-            resetData();
-        }
-
-        function formatSaveModel(permissionsSave, selectedUserGroups, removedUserGroups) {
-          selectedUserGroups.forEach(function (g) {
-            permissionsSave[g.id] = [];
-            g.allowedPermissions.forEach(function (p) {
-              permissionsSave[g.id].push(p.permissionCode);
-            });
-          });
-          removedUserGroups.forEach(function (g) {
-            permissionsSave[g.id] = null;
-          });
-        }
-
-        function save() {
-
-            vm.saveState = "busy";
-            vm.saveError = false;
-            vm.saveSuccces = false;
-
-            //this is a dictionary that we need to populate
-            var permissionsSave = {};
-            //format the selectedUserGroups, then the removedUserGroups since we want to pass data from both collections up
-            formatSaveModel(permissionsSave, vm.selectedUserGroups,  vm.removedUserGroups);
-
-            var saveModel = {
-                contentId: $scope.currentNode.id,
-                permissions: permissionsSave
-            };
-
-            contentResource.savePermissions(saveModel).then(userGroups => {
-
-                //re-assign model from server since it could have changed
-                initData(userGroups);
-
-                // clear dirty state on the form so we don't see the discard changes notification
-                // we use a timeout here because in some cases the initData reformats the userGroups model and triggers a change after the form state was changed
-                $timeout(function() {
-                  if (currentForm) {
-                     currentForm.$dirty = false;
-                  }
-                });
-                
-                $scope.dialog.confirmDiscardChanges = false;
-                vm.saveState = "success";
-                vm.saveSuccces = true;
-
-            }, function(error){
-                vm.saveState = "error";
-                vm.saveError = error;
-            });
-        }
-
-        function closeDialog() {
-          // check if form has been changed. If it has show discard changes notification
-          if (currentForm && currentForm.$dirty) {
-
-            const labelKeys = [
-              "prompt_unsavedChanges",
-              "prompt_unsavedChangesWarning",
-              "prompt_discardChanges",
-              "prompt_stay"
-            ];
-
-            localizationService.localizeMany(labelKeys).then(values => {
-                
-                const overlay = {
-                    view: "default",
-                    title: values[0],
-                    content: values[1],
-                    disableBackdropClick: true,
-                    disableEscKey: true,
-                    submitButtonLabel: values[2],
-                    closeButtonLabel: values[3],
-                    submit: () => {
-                        overlayService.close();
-                        navigationService.hideDialog();
-                    },
-                    close: () => overlayService.close()
-                };
-
-              overlayService.open(overlay);
-            });
-          } else {
-            navigationService.hideDialog();
-          }
-        }
-
-        function discardChanges() {
-          navigationService.hideDialog();
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Content.RightsController", ContentRightsController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js
deleted file mode 100644
index 3fda4cb577..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js
+++ /dev/null
@@ -1,90 +0,0 @@
-(function () {
-    "use strict";
-
-    function ContentSortController($scope, $filter, $routeParams, contentResource, navigationService, eventsService) {
-
-        var vm = this;
-        var id = $scope.currentNode.id;
-
-        vm.loading = false;
-        vm.children = [];
-        vm.saveButtonState = "init";
-        vm.sortOrder = {};
-        vm.sortableOptions = {
-            axis: "y",
-            containment: "parent",
-            distance: 10,
-            tolerance: "pointer",
-            opacity: 0.7,
-            scroll: true,
-            cursor: "move",
-            helper: fixSortableHelper,
-            update: function() {
-                // clear the sort order when drag and drop is used
-                vm.sortOrder.column = "";
-                vm.sortOrder.reverse = false;
-            }
-        };
-
-        vm.save = save;
-        vm.sort = sort;
-        vm.close = close;
-
-        function onInit() {
-            vm.loading = true;
-            contentResource.getChildren(id, { cultureName: $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture })
-                .then(function(data){
-                    vm.children = data.items;
-                    vm.loading = false;
-                });
-        }
-
-        function save() {
-            vm.saveButtonState = "busy";
-            
-            var args = {
-                parentId: id,
-                sortedIds: _.map(vm.children, function(child){ return child.id; })
-            };
-
-            contentResource.sort(args)
-                .then(function(){
-                    navigationService.syncTree({ tree: "content", path: $scope.currentNode.path, forceReload: true })
-                        .then(() => navigationService.reloadNode($scope.currentNode));
-
-                    eventsService.emit("sortCompleted", { id: id });
-                    vm.saveButtonState = "success";
-                }, function(error) {
-                    vm.error = error;
-                    vm.saveButtonState = "error";
-                });
-        }
-
-        function fixSortableHelper(e, ui) {
-            // keep the correct width of each table cell when sorting
-            ui.children().each(function () {
-                $(this).width($(this).width());
-            });
-            return ui;
-        }
-
-        function sort(column) {
-            // reverse if it is already ordered by that column
-            if (vm.sortOrder.column === column) {
-                vm.sortOrder.reverse = !vm.sortOrder.reverse
-            } else {
-                vm.sortOrder.column = column;
-                vm.sortOrder.reverse = false;
-            }
-            vm.children = $filter('orderBy')(vm.children, vm.sortOrder.column, vm.sortOrder.reverse);
-        }
-
-        function close() {
-            navigationService.hideDialog();
-        }
-
-        onInit();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Content.SortController", ContentSortController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/copy.html b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
deleted file mode 100644
index 167e67431b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/copy.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<div ng-controller="Umbraco.Editors.Content.CopyController">
-    <div class="umb-dialog-body form-horizontal" ng-cloak>
-        <div class="umb-pane">
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-            <div ng-show="success">
-                <div class="alert alert-success">
-                    <strong>{{source.name}}</strong>
-                    <localize key="actions_wasCopiedTo">was copied to</localize>
-                    <strong>{{target.name}}</strong>
-                </div>
-                <button class="btn btn-primary" ng-click="closeDialog()">Ok</button>
-            </div>
-
-            <p class="abstract" ng-hide="success">
-                <localize key="actions_chooseWhereToCopy">Choose where to copy</localize>
-                <strong>{{source.name}}</strong>
-                <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>
-            </p>
-
-            <umb-loader ng-show="busy"></umb-loader>
-
-            <div ng-hide="success">
-
-                <div ng-hide="miniListView">
-                    <umb-tree-search-box
-                        hide-search-callback="hideSearch"
-                        search-callback="onSearchResults"
-                        search-from-id="{{searchInfo.searchFromId}}"
-                        search-from-name="{{searchInfo.searchFromName}}"
-                        show-search="{{searchInfo.showSearch}}"
-                        section="{{section}}">
-                    </umb-tree-search-box>
-
-                    <br />
-
-                    <umb-tree-search-results
-                        ng-if="searchInfo.showSearch"
-                        results="searchInfo.results"
-                        select-result-callback="selectResult">
-                    </umb-tree-search-results>
-
-                    <div ng-hide="searchInfo.showSearch">
-                        <umb-tree
-                            section="content"
-                            hideheader="{{treeModel.hideHeader}}"
-                            hideoptions="true"
-                            isdialog="true"
-                            api="dialogTreeApi"
-                            on-init="onTreeInit()"
-                            enablelistviewexpand="true"
-                            enablecheckboxes="true">
-                        </umb-tree>
-                    </div>
-                </div>
-
-                <umb-mini-list-view
-                    ng-if="miniListView"
-                    node="miniListView"
-                    entity-type="Document"
-                    on-select="selectListViewNode(node)"
-                    on-close="closeMiniListView()">
-                </umb-mini-list-view>
-
-                <umb-pane>
-                    <umb-control-group  localize="label" label="@defaultdialogs_relateToOriginalLabel">
-                        <umb-toggle checked="$parent.$parent.relateToOriginal" on-click="$parent.$parent.toggle('relate')"></umb-toggle>
-                    </umb-control-group>
-                </umb-pane>
-
-                <umb-pane>
-                    <umb-control-group localize="label" label="@defaultdialogs_includeDescendants">
-                        <umb-toggle checked="$parent.$parent.recursive" on-click="$parent.$parent.toggle('recursive')"></umb-toggle>
-                    </umb-control-group>
-                </umb-pane>
-
-            </div>
-        </div>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <button type="button" class="btn btn-link" ng-click="closeDialog()" ng-show="!busy">
-            <localize key="general_cancel">Cancel</localize>
-        </button>
-        <button type="button" class="btn btn-primary" ng-click="copy()" ng-disabled="busy || !target">
-            <localize key="actions_copy">Copy</localize>
-        </button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/create.html b/src/Umbraco.Web.UI.Client/src/views/content/create.html
deleted file mode 100644
index e2e3fb9453..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/create.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<div ng-controller="Umbraco.Editors.Content.CreateController">
-
-    <umb-load-indicator ng-if="loading"></umb-load-indicator>
-
-    <div ng-if="!loading" class="umb-dialog-body with-footer" ng-cloak>
-
-        <div class="umb-pane">
-            <h5 ng-show="selectContentType" id="selectContentType"><localize key="create_createUnder">Create a page under</localize> {{currentNode.name}}</h5>
-            <h5 ng-show="selectBlueprint"><localize key="blueprints_selectBlueprint">Select a blueprint</localize></h5>
-
-            <div ng-if="allowedTypes && allowedTypes.length === 0">
-                <p class="abstract" ng-if="!hasSettingsAccess">
-                    <localize key="create_noDocumentTypesWithNoSettingsAccess">The selected page in the content tree doesn't allow for any pages to be created below it.</localize>
-                </p>
-                <div ng-if="hasSettingsAccess && currentNode.id >= 0">
-                    <p class="abstract">
-                        <localize key="create_noDocumentTypes">There are no allowed Document Types available for creating content here. You must enable these in <strong>Document
-                            Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node
-                            types</strong> under <strong>Permissions</strong>.</localize>
-                    </p>
-                    <button type="button" class="btn umb-outline" ng-click="editContentType()">
-                        <localize key="create_noDocumentTypesEditPermissions">Edit permissions for this Document Type</localize>
-                    </button>
-                </div>
-                <div ng-if="hasSettingsAccess && currentNode.id < 0">
-                    <!-- There are existing document types, but none are allowed at root -->
-                    <p class="abstract" ng-if="countTypes > 0">
-                        <localize key="create_noDocumentTypesAllowedAtRoot">There are no allowed Document Types available for creating content here. You must enable these in <strong>Document
-                            Types</strong> within the <strong>Settings</strong> section, by changing the <strong>Allow as root</strong> option under <strong>Permissions</strong>.</localize>
-                    </p>
-
-                    <!-- There's no document types, help people create one -->
-                    <p class="abstract" ng-if="countTypes === 0">
-                        <localize key="create_noDocumentTypesAtRoot">There are no Document Types available for creating content here. You must create these in <strong>Document
-                            Types</strong> within the <strong>Settings</strong> section.</localize>
-                    </p>
-                    <button type="button" class="btn umb-outline" ng-click="createContentType()" ng-if="countTypes === 0">
-                        <localize key="create_noDocumentTypesCreateNew">Create a new Document Type</localize>
-                    </button>
-                </div>
-            </div>
-
-            <ul class="umb-actions umb-actions-child" ng-if="selectContentType && allowedTypes.length > 0" aria-labelledby="selectContentType">
-
-                <li class="umb-action" data-element="action-create-{{docType.alias}}" ng-repeat="docType in allowedTypes">
-                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createOrSelectBlueprintIfAny(docType)" umb-auto-focus ng-if="$index === 0">
-                        <umb-icon icon="{{docType.icon}}" class="icon large"></umb-icon>
-                        <span class="menu-label">
-                            {{docType.name}}
-                            <small>
-                                {{docType.description}}
-                            </small>
-                        </span>
-                    </button>
-                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createOrSelectBlueprintIfAny(docType)" ng-if="$index !== 0">
-                        <umb-icon icon="{{docType.icon}}" class="icon large"></umb-icon>
-                        <span class="menu-label">
-                            {{docType.name}}
-                            <small>
-                                {{docType.description}}
-                            </small>
-                        </span>
-                    </button>
-                </li>
-
-            </ul>
-
-            <ul class="umb-actions umb-actions-child" ng-if="selectBlueprint">
-
-                <li class="umb-action" ng-repeat="blueprint in selectableBlueprints | orderBy:'name':false track by $index">
-                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createFromBlueprint(blueprint.id)">
-                        <umb-icon icon="{{docType.icon}}" class="icon large"></umb-icon>
-                        <span class="menu-label">
-                            {{blueprint.name}}
-                        </span>
-                    </button>
-                </li>
-
-                <li class="umb-action sep" ng-show="allowBlank">
-                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createBlank(docType)">
-                        <umb-icon icon="{{docType.icon}}" class="icon large"></umb-icon>
-                        <span class="menu-label">
-                            <localize key="blueprints_blankBlueprint">Blank</localize>
-                        </span>
-                    </button>
-                </li>
-
-            </ul>
-
-        </div>
-    </div>
-
-    <div ng-if="!loading" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <button type="button" class="btn btn-info umb-outline" ng-click="closeDialog(true)">
-            <localize key="buttons_somethingElse">All Actions</localize>
-        </button>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/createblueprint.html b/src/Umbraco.Web.UI.Client/src/views/content/createblueprint.html
deleted file mode 100644
index 7a1c8c381e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/createblueprint.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<div ng-controller="Umbraco.Editors.Content.CreateBlueprintController">
-
-    <form name="blueprintForm"
-          novalidate
-          ng-submit="create()"
-          val-form-manager>
-
-        <div class="umb-dialog-body" ng-cloak>
-            <div class="umb-pane block-form">
-                
-                <h5 ng-bind-html="title"></h5>
-
-                <p class="abstract" style="margin-bottom: 20px;">
-                    <localize key="blueprints_blueprintDescription">A Content Template is pre-defined content that an editor can select to use as the basis for creating new content</localize>.
-                </p>
-
-                <umb-control-group label="@general_name" hide-label="false">
-                    <input type="text" name="name" ng-model="message.name" class="umb-textstring textstring input-block-level"
-                           val-server-field="name"
-                           required />
-                    <span ng-messages="blueprintForm.name.$error" show-validation-on-submit>
-                        <span class="help-inline" ng-message="required"><localize key="required">Required</localize></span>
-                        <span class="help-inline" ng-message="valServerField">{{blueprintForm.name.errorMsg}}</span>
-                    </span>           
-                </umb-control-group>
-
-            </div>
-
-        </div>
-        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-            
-            <umb-button label-key="general_cancel"
-                        action="cancel()"
-                        type="button"
-                        button-style="link">
-            </umb-button>
-            
-            <umb-button label-key="general_create"
-                        type="submit"
-                        button-style="success">
-            </umb-button>
-
-        </div>
-
-    </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/delete.html b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
deleted file mode 100644
index 765dbda531..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/delete.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<div class="umb-dialog" ng-controller="Umbraco.Editors.Content.DeleteController">
-    <div class="umb-dialog-body">
-
-        <div ng-show="success" class="umb-pane">
-            <div class="alert alert-success">
-                <strong>{{currentNode.name}}</strong>
-                <localize key="actions_wasDeleted">was deleted</localize>
-            </div>
-            <button class="btn btn-primary" ng-click="close()">Ok</button>
-        </div>
-
-        <div ng-hide="success" class="umb-pane">
-            <p class="abstract" ng-if="!disableDelete">
-                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-            </p>
-
-            <div class="abstract umb-alert umb-alert--warning" ng-show="currentNode.metaData.variesByCulture && !currentNode.trashed">
-                <localize key="defaultdialogs_variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</localize>
-            </div>
-
-            <umb-tracked-references id="currentNode.id" on-loading-complete="checkingReferencesComplete()" hide-no-result="true" compact="true" show-descendants="true" hide-none-dependencies="true" on-warning="onReferencesWarning()"></umb-tracked-references>
-
-            <div class="abstract umb-alert umb-alert--warning" ng-if="warningText">
-                {{warningText}}
-            </div>
-
-            <div class="umb-alert umb-alert--warning" ng-show="currentNode.trashed">
-                <localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.
-            </div>
-
-            <umb-confirm ng-if="!disableDelete" on-confirm="performDelete" confirm-button-style="danger" on-cancel="cancel" ng-hide="checkingReferences"></umb-confirm>
-
-            <umb-confirm ng-if="disableDelete" confirm-button-style="danger" on-cancel="cancel"></umb-confirm>
-        </div>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
deleted file mode 100644
index 94e8c25b89..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div data-element="editor-content" ng-controller="Umbraco.Editors.Content.EditController">
-    <content-editor create-options="createOptions"
-                    content-id="contentId"
-                    page="page"
-                    save-method="saveMethod"
-                    get-method="getMethod"
-                    get-scaffold-method="getScaffoldMethod"
-                    tree-alias="content"
-                    is-new="isNew"
-                    culture="culture"
-                    segment="segment"
-                    infinite-model="model">
-    </content-editor>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html b/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
deleted file mode 100644
index 093d2627cc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="umb-dialog" ng-controller="Umbraco.Editors.Content.EmptyRecycleBinController">
-    <div class="umb-dialog-body">
-        <umb-pane>
-
-            <umb-loader ng-show="busy"></umb-loader>
-
-            <div class="umb-alert umb-alert--warning">
-                <p><localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.</p>
-                <localize key="general_areyousure">Are you sure?</localize>
-            </div>
-
-            <umb-confirm on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
-            </umb-confirm>
-        </umb-pane>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/move.html b/src/Umbraco.Web.UI.Client/src/views/content/move.html
deleted file mode 100644
index 3c073ba404..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/move.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<div ng-controller="Umbraco.Editors.Content.MoveController">
-    <div class="umb-dialog-body" ng-cloak>
-        <div class="umb-pane">
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-            <div ng-show="success">
-                <div class="alert alert-success">
-                    <strong>{{source.name}}</strong>
-                    <localize key="actions_wasMovedTo">was moved to</localize>
-                    <strong>{{target.name}}</strong>
-                </div>
-                <button class="btn btn-primary" ng-click="close()">Ok</button>
-            </div>
-
-            <p class="abstract" ng-hide="success">
-                <localize key="actions_chooseWhereToMove">Choose where to move</localize>
-                <strong>{{source.name}}</strong>
-                <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>
-            </p>
-
-            <umb-loader ng-show="busy"></umb-loader>
-
-            <div ng-hide="success">
-
-                <div ng-hide="miniListView">
-                    <umb-tree-search-box
-                        hide-search-callback="hideSearch"
-                        search-callback="onSearchResults"
-                        search-from-id="{{searchInfo.searchFromId}}"
-                        search-from-name="{{searchInfo.searchFromName}}"
-                        show-search="{{searchInfo.showSearch}}"
-                        section="{{section}}">
-                    </umb-tree-search-box>
-
-                    <br />
-
-                    <umb-tree-search-results
-                        ng-if="searchInfo.showSearch"
-                        results="searchInfo.results"
-                        select-result-callback="selectResult">
-                    </umb-tree-search-results>
-
-                    <div ng-hide="searchInfo.showSearch">
-                        <umb-tree
-                            section="content"
-                            hideheader="{{treeModel.hideHeader}}"
-                            hideoptions="true"
-                            isdialog="true"
-                            api="dialogTreeApi"
-                            on-init="onTreeInit()"
-                            enablelistviewexpand="true"
-                            enablecheckboxes="true">
-                        </umb-tree>
-                    </div>
-                </div>
-
-                <umb-mini-list-view
-                    ng-if="miniListView"
-                    node="miniListView"
-                    entity-type="Document"
-                    on-select="selectListViewNode(node)"
-                    on-close="closeMiniListView()">
-                </umb-mini-list-view>
-
-            </div>
-        </div>
-    </div>
-
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
-            <localize key="general_cancel">Cancel</localize>
-        </button>
-        <button class="btn btn-primary" ng-click="move()" ng-disabled="busy || !target">
-            <localize key="actions_move">Move</localize>
-        </button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/notify.html b/src/Umbraco.Web.UI.Client/src/views/content/notify.html
deleted file mode 100644
index 2a993b8ba3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/notify.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<div ng-controller="Umbraco.Editors.Content.CreateNotifyController as vm">
-    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-    <div class="umb-dialog-body">
-        <div class="umb-pane" ng-show="!vm.loading">
-            <form name="notifyForm"
-                  novalidate
-                  val-form-manager>
-                <div ng-show="vm.saveError" ng-cloak>
-                    <div class="alert alert-error">
-                        <div><strong>{{vm.saveError.errorMsg}}</strong></div>
-                        <div>{{vm.saveError.data.message}}</div>
-                    </div>
-                </div>
-                <div ng-show="vm.saveSuccces" ng-cloak>
-                    <div class="alert alert-success">
-                        <localize key="notifications_notificationsSavedFor">Notification settings saved for</localize> <strong>{{currentNode.name}}</strong>
-                    </div>
-                    <button class="btn btn-primary" ng-click="vm.cancel()"><localize key="general_ok">Ok</localize></button>
-                </div>
-                <div ng-hide="vm.saveSuccces || vm.saveError" ng-cloak>
-                    <div class="block-form" ng-show="!vm.loading">
-                        <span ng-bind-html="vm.labels.headline"></span>
-                        <umb-control-group>
-                            <umb-toggle-group items="vm.notifyOptions" on-click="vm.notificationChanged(item)"></umb-toggle-group>
-                        </umb-control-group>
-                    </div>
-                </div>
-            </form>
-        </div>
-    </div>
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="vm.saveSuccces || vm.saveError">
-        <umb-button label-key="general_cancel"
-                    action="vm.cancel()"
-                    type="button"
-                    button-style="link">
-        </umb-button>
-        <umb-button label-key="buttons_save"
-                    type="button"
-                    action="vm.save(vm.notifyOptions)"
-                    state="vm.saveState"
-                    button-style="success"
-                    disabled="!vm.canSave">
-        </umb-button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
deleted file mode 100644
index e2fe85c323..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
+++ /dev/null
@@ -1,181 +0,0 @@
-(function () {
-    "use strict";
-
-    function PublishController($scope, localizationService, contentEditingHelper) {
-
-        var vm = this;
-        vm.loading = true;
-        vm.isNew = true;
-
-        vm.changeSelection = changeSelection;
-
-        function allowPublish (variant) {
-            return variant.allowedActions.includes("U");
-        }
-
-        /** 
-         * Returns true if publish meets the requirements of mandatory languages 
-         * */
-        function canPublish() {
-
-            var hasSomethingToPublish = false;
-
-            vm.variants.forEach(variant => {
-                // if varaint is mandatory and not already published:
-                if (variant.publish === false && notPublishedMandatoryFilter(variant)) {
-                    return false;
-                }
-                if (variant.publish === true) {
-                    hasSomethingToPublish = true;
-                }
-            });
-
-            return hasSomethingToPublish;
-        }
-
-        function changeSelection(variant) {
-            // update submit button state:
-            $scope.model.disableSubmitButton = !canPublish();
-            //need to set the Save state to same as publish.
-            variant.save = variant.publish;
-        }
-
-        function hasAnyDataFilter(variant) {
-
-            // if we have a name, then we have data.
-            if (variant.name != null && variant.name.length > 0) {
-                return true;
-            }
-
-            if(variant.isDirty === true) {
-                return true;
-            }
-
-            variant.tabs.forEach(tab => {
-                tab.properties.forEach(property => {
-                    if (property.value != null && property.value.length > 0) {
-                        return true;
-                    }
-                });
-            });
-
-            return false;
-        }
-
-        /**
-         * determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
-         *  * it's editor is in a $dirty state
-         *  * it has pending saves
-         *  * it is unpublished
-         * @param {*} variant 
-         */
-        function dirtyVariantFilter(variant) {
-            return (variant.isDirty || variant.state === "Draft" || variant.state === "PublishedPendingChanges");
-        }
-
-        /**
-         * determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
-         *  * variant is active
-         *  * it's editor is in a $dirty state
-         *  * it has pending saves
-         *  * it is unpublished
-         * @param {*} variant 
-         */
-        function publishableVariantFilter(variant) {
-            variant.notAllowed = allowPublish(variant) === false && variant.active;
-            return (variant.active || variant.isDirty || variant.state === "Draft" || variant.state === "PublishedPendingChanges") && (allowPublish(variant) || variant.active);
-        }
-
-        function notPublishedMandatoryFilter(variant) {
-            return variant.state !== "Published" && variant.state !== "PublishedPendingChanges" && variant.isMandatory === true;
-        }
-
-        /**
-         * determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
-         *  * has a mandatory language
-         *  * without having a segment, segments cant be mandatory at current state of code.
-         * @param {*} variant 
-         */
-        function isMandatoryFilter(variant) {            
-            return (variant.language && variant.language.isMandatory === true && variant.segment == null);
-        }
-
-        /**
-         * determine a variant is needed, but not already a choice.
-         *  * publishable — aka. displayed as a publish option.
-         *  * published — its already published and everything is then fine.
-         *  * mandatory — this is needed, and thats why we highlight it.
-         * @param {*} variant 
-         */
-        function notPublishableButMandatoryFilter(variant) {
-
-            return !publishableVariantFilter(variant) && variant.state !== "Published" && variant.isMandatory === true;
-        }
-
-        function onInit() {
-
-            vm.variants = $scope.model.variants;
-
-            // If we have a variant that's not in the state of NotCreated, 
-            // then we know we have data and it's not a new content node.
-            vm.isNew = vm.variants.some(variant => variant.state === 'NotCreated');
-
-            vm.variants.forEach(variant => {
-
-                // reset to not be published
-                variant.publish = variant.save = false;
-
-                
-                variant.isMandatory = isMandatoryFilter(variant);
-
-                
-                // if this is a new node and we have data on this variant.
-                if (vm.isNew === true && hasAnyDataFilter(variant)) {
-                    variant.save = true;
-                }
-                
-            });
-
-            vm.availableVariants = vm.variants.filter(publishableVariantFilter);
-            vm.missingMandatoryVariants = vm.variants.filter(notPublishableButMandatoryFilter);
-
-            // if any active varaiant that is available for publish, we set it to be published:
-            vm.availableVariants.forEach(v => {
-                if(v.active && allowPublish(v)) {
-                    v.save = v.publish = true;
-                }
-            });
-
-            if (vm.availableVariants.length !== 0) {
-                vm.availableVariants = contentEditingHelper.getSortedVariantsAndSegments(vm.availableVariants);
-            }
-
-            $scope.model.disableSubmitButton = !canPublish();
-
-            const localizeKey = vm.missingMandatoryVariants.length > 0 ? 'content_notReadyToPublish' : 
-                !$scope.model.title ? 'content_readyToPublish' : '';
-
-            if (localizeKey) {
-                localizationService.localize(localizeKey).then(value => {
-                    $scope.model.title = value;
-                    vm.loading = false;
-                });
-            } else {
-                vm.loading = false;
-            }
-        }
-
-        onInit();
-
-        //when this dialog is closed, reset all 'publish' flags
-        $scope.$on('$destroy', () => {
-            vm.variants.forEach(variant => {
-                variant.publish = variant.save = false;
-                variant.notAllowed = false;
-            });
-        });
-    }
-
-    angular.module("umbraco").controller("Umbraco.Overlays.PublishController", PublishController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
deleted file mode 100644
index 56ca5ddedf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<div class="umb-variant-selector-overlay" ng-controller="Umbraco.Overlays.PublishController as vm">
-
-  <div ng-if="vm.loading" style="min-height: 50px; position: relative;">
-    <umb-load-indicator></umb-load-indicator>
-  </div>
-
-  <div class="umb-list umb-list--condensed" ng-if="!vm.loading && vm.missingMandatoryVariants.length === 0">
-
-    <div class="mb3">
-      <p>
-        <localize key="content_variantsToPublish">Which variants would you like to publish?</localize>
-      </p>
-    </div>
-
-    <div class="umb-list-item"
-         ng-repeat="variant in vm.availableVariants track by variant.compositeId">
-      <ng-form name="publishVariantSelectorForm">
-        <div class="umb-variant-selector-entry"
-             ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid}">
-
-          <umb-checkbox input-id="{{variant.htmlId}}"
-                        model="variant.publish"
-                        name="publishVariantSelector"
-                        on-change="vm.changeSelection(variant)"
-                        server-validation-field="{{variant.htmlId}}"
-                        disabled="variant.notAllowed">
-
-                        <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
-                            <span ng-bind="variant.displayName"></span>
-                            <strong class="umb-control-required" ng-if="variant.isMandatory">*</strong>
-                        </span>
-            <span class="umb-variant-selector-entry__title" ng-if="variant.segment && variant.language">
-                            <span ng-bind="variant.segment"></span>
-                            <span class="__secondarytitle"> — {{variant.language.name}}</span>
-                            <strong class="umb-control-required" ng-if="variant.isMandatory">*</strong>
-                        </span>
-            <span class="umb-variant-selector-entry__description"
-                  ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                            <umb-variant-state variant="variant"></umb-variant-state>
-                            <span ng-if="variant.isMandatory"> - </span>
-                            <span ng-class="{'text-error': (variant.publish === false) }" ng-if="variant.isMandatory"><localize
-                              key="general_mandatory">Mandatory</localize></span>
-                            <span ng-if="variant.notAllowed"> - </span>
-                            <span ng-if="variant.notAllowed" class="text-error">
-                              <localize key="content_variantPublishNotAllowed"></localize>
-                            </span>
-                        </span>
-            <span class="umb-variant-selector-entry__description"
-                  ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                            <span class="text-error"
-                                  ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
-                        </span>
-
-          </umb-checkbox>
-
-          <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
-
-        </div>
-
-      </ng-form>
-    </div>
-    <br/>
-    <div class="mb3" ng-if="vm.isNew === true">
-      <p>
-        <localize key="content_variantsWillBeSaved">All new variants will be saved.</localize>
-      </p>
-    </div>
-  </div>
-
-  <div class="umb-list umb-list--condensed" ng-if="!vm.loading && vm.missingMandatoryVariants.length !== 0">
-    <div class="mb3">
-      <p>
-        <localize key="content_publishRequiresVariants">The following variants is required for publishing to take
-          place:
-        </localize>
-      </p>
-    </div>
-
-    <div class="umb-list-item" ng-repeat="variant in vm.missingMandatoryVariants track by variant.compositeId">
-      <div class="umb-variant-selector-entry"
-           ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid}">
-                <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
-                    <span ng-bind="variant.displayName"></span>
-                    <strong class="umb-control-required" ng-if="variant.isMandatory">*</strong>
-                </span>
-        <span class="umb-variant-selector-entry__title" ng-if="variant.segment && variant.language">
-                    <span ng-bind="variant.segment"></span>
-                    <span class="__secondarytitle"> — {{variant.language.name}}</span>
-                    <strong class="umb-control-required" ng-if="variant.isMandatory">*</strong>
-                </span>
-        <span class="umb-variant-selector-entry__description"
-              ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                    <umb-variant-state variant="variant"></umb-variant-state>
-                    <span ng-if="variant.isMandatory"> - </span>
-                    <span ng-class="{'text-error': (variant.publish === false) }" ng-if="variant.isMandatory"><localize
-                      key="languages_mandatoryLanguage">Mandatory language</localize></span>
-                </span>
-        <span class="umb-variant-selector-entry__description"
-              ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                    <span class="text-error"
-                          ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
-                </span>
-
-        <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
-
-      </div>
-    </div>
-  </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
deleted file mode 100644
index da8ee2d3a8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
+++ /dev/null
@@ -1,123 +0,0 @@
-(function () {
-    "use strict";
-
-    function PublishDescendantsController($scope, localizationService, contentEditingHelper) {
-
-        var vm = this;
-        vm.includeUnpublished = $scope.model.includeUnpublished || false;
-
-        vm.changeSelection = changeSelection;
-        vm.toggleIncludeUnpublished = toggleIncludeUnpublished;
-
-        function onInit() {
-
-            vm.variants = $scope.model.variants;
-            vm.displayVariants = vm.variants.slice(0); // shallow copy, we don't want to share the array-object (because we will be performing a sort method) but each entry should be shared (because we need validation and notifications).
-            vm.labels = {};
-
-            // get localized texts for use in directives
-            if (!$scope.model.title) {
-                localizationService.localize("buttons_publishDescendants").then(value => {
-                    $scope.model.title = value;
-                });
-            }
-            if (!vm.labels.includeUnpublished) {
-                localizationService.localize("content_includeUnpublished").then(value => {
-                    vm.labels.includeUnpublished = value;
-                });
-            }
-            if (!vm.labels.includeUnpublished) {
-                localizationService.localize("content_includeUnpublished").then(value => {
-                    vm.labels.includeUnpublished = value;
-                });
-            }
-
-            vm.variants.forEach(variant => {
-                variant.isMandatory = isMandatoryFilter(variant);
-            });
-
-            if (vm.variants.length > 1) {
-
-                vm.displayVariants = vm.displayVariants.filter(variant => allowPublish(variant));
-                vm.displayVariants = contentEditingHelper.getSortedVariantsAndSegments(vm.displayVariants);
-
-                var active = vm.variants.find(v => v.active);
-
-                if (active) {
-                    //ensure that the current one is selected
-                    active.publish = active.save = true;
-                }
-
-                $scope.model.disableSubmitButton = !canPublish();
-                
-            } else {
-                // localize help text for invariant content
-                vm.labels.help = {
-                    "key": "content_publishDescendantsHelp",
-                    "tokens": [vm.variants[0].name]
-                };
-            }            
-        }
-
-        function allowPublish (variant) {
-            return variant.allowedActions.includes("U");
-        }
-
-        function toggleIncludeUnpublished() {
-            vm.includeUnpublished = !vm.includeUnpublished;
-            // make sure this value is pushed back to the scope
-            $scope.model.includeUnpublished = vm.includeUnpublished;
-        }
-
-        /** Returns true if publishing is possible based on if there are un-published mandatory languages */
-        function canPublish() {
-            var selected = [];
-            vm.variants.forEach(variant => {
-
-                var published = !(variant.state === "NotCreated" || variant.state === "Draft");
-
-                if (variant.segment == null && variant.language && variant.language.isMandatory && !published && !variant.publish) {
-                    //if a mandatory variant isn't published 
-                    //and not flagged for saving
-                    //then we cannot continue
-
-                    // TODO: Show a message when this occurs
-                    return false;
-                }
-
-                if (variant.publish) {
-                    selected.push(variant.publish);
-                }
-            });
-
-            return selected.length > 0;
-        }
-
-        function changeSelection(variant) {
-            $scope.model.disableSubmitButton = !canPublish();
-            //need to set the Save state to true if publish is true
-            variant.save = variant.publish;
-        }
-
-        
-        function isMandatoryFilter(variant) {
-            //determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
-            // * has a mandatory language
-            // * without having a segment, segments cant be mandatory at current state of code.
-            return (variant.language && variant.language.isMandatory === true && variant.segment == null);
-        }
-
-        //when this dialog is closed, reset all 'publish' flags
-        $scope.$on('$destroy', () => {
-            vm.variants.forEach(variant => {
-                variant.publish = variant.save = false;
-            });
-        });
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Overlays.PublishDescendantsController", PublishDescendantsController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
deleted file mode 100644
index 54a0e9c6df..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<div ng-controller="Umbraco.Overlays.PublishDescendantsController as vm" class="umb-variant-selector-overlay">
-
-    <div ng-if="vm.displayVariants.length === 1">
-        <div class="mb3">
-            <p><localize key="{{vm.labels.help.key}}" tokens="vm.labels.help.tokens"></localize></p>
-        </div>
-
-        <div class="flex mb3">
-            <umb-toggle checked="vm.includeUnpublished"
-                        on-click="vm.toggleIncludeUnpublished()"
-                        class="mr2"
-                        input-id="includeUnpublished"
-                        label-on="{{vm.labels.includeUnpublished}}"
-                        label-off="{{vm.labels.includeUnpublished}}"
-                        label-position="right"
-                        show-labels="true">
-            </umb-toggle>
-        </div>
-
-    </div>
-
-    <div ng-if="vm.displayVariants.length > 1">
-
-        <div class="mb3">
-            <p><localize key="content_publishDescendantsWithVariantsHelp">Publish variants and variants of same type underneath and thereby making their content publicly available.</localize></p>
-        </div>
-
-        <div class="flex mb3">
-            <umb-toggle checked="vm.includeUnpublished"
-                        on-click="vm.toggleIncludeUnpublished()"
-                        class="mr2"
-                        label-on="{{vm.labels.includeUnpublished}}"
-                        label-off="{{vm.labels.includeUnpublished}}"
-                        label-position="right"
-                        show-labels="true">
-            </umb-toggle>
-        </div>
-
-        <div class="umb-list umb-list--condensed">
-
-            <div class="umb-list-item umb-list--condensed" ng-repeat="variant in vm.displayVariants track by variant.compositeId">
-                <ng-form name="publishVariantSelectorForm">
-                    <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid}">
-
-                        <umb-checkbox input-id="{{variant.htmlId}}"
-                                      name="publishVariantSelector"
-                                      model="variant.publish"
-                                      on-change="vm.changeSelection(variant)"
-                            server-validation-field="{{variant.htmlId}}">
-
-                            <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
-                                <span ng-bind="variant.displayName"></span>
-                                <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
-                            </span>
-                            <span class="umb-variant-selector-entry__title" ng-if="variant.segment && variant.language">
-                                <span ng-bind="variant.segment"></span>
-                                <span class="__secondarytitle"> — {{variant.language.name}}</span>
-                                <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
-                            </span>
-                            <span class="umb-variant-selector-entry__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                                <umb-variant-state variant="variant"></umb-variant-state>
-                                <span ng-if="variant.isMandatory"> - </span>
-                                <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.publish === false) }"><localize key="general_mandatory">Mandatory</localize></span>
-                            </span>
-                            <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                                <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
-                            </span>
-
-                        </umb-checkbox>
-
-                        <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
-                    </div>
-                </ng-form>
-            </div>
-        </div>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
deleted file mode 100644
index 308673bf21..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.controller.js
+++ /dev/null
@@ -1,117 +0,0 @@
-(function () {
-    "use strict";
-
-    function SaveContentController($scope, localizationService, contentEditingHelper) {
-
-        var vm = this;
-        vm.loading = true;
-        vm.hasPristineVariants = false;
-        vm.isNew = true;
-
-        vm.changeSelection = changeSelection;
-
-        function changeSelection(variant) {
-            var firstSelected = _.find(vm.variants, function (v) {
-                return v.save;
-            });
-            $scope.model.disableSubmitButton = !firstSelected; //disable submit button if there is none selected
-        }
-
-        function allowUpdate (variant) {
-            return variant.allowedActions.includes("A");
-        }
-
-        function saveableVariantFilter(variant) {
-            //determine a variant is 'dirty' (meaning it will show up as save-able) if it's
-            // * the active one
-            // * it's editor is in a $dirty state
-            // the editor has update permissions for the variant
-            variant.notAllowed = allowUpdate(variant) === false && variant.active;
-            return ((variant.active || variant.isDirty) && (allowUpdate(variant) || variant.active));
-        }
-
-        function isMandatoryFilter(variant) {
-            //determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
-            // * has a mandatory language
-            // * without having a segment, segments cant be mandatory at current state of code.
-            return (variant.language && variant.language.isMandatory === true && variant.segment == null);
-        }
-
-        function hasAnyData(variant) {
-            if(variant.name == null || variant.name.length === 0) {
-                return false;
-            }
-            var result = variant.isDirty != null;
-
-            if(result) return true;
-
-             for (var t=0; t < variant.tabs.length; t++){
-                 for (var p=0; p < variant.tabs[t].properties.length; p++){
-
-                     var property = variant.tabs[t].properties[p];
-
-                     if(property.culture == null) continue;
-
-                     result = result ||  (property.value != null && property.value.length > 0);
-
-                     if(result) return true;
-                 }
-             }
-
-            return result;
-        }
-
-        function onInit() {
-            vm.variants = $scope.model.variants;
-            vm.availableVariants = vm.variants.filter(saveableVariantFilter);
-
-            if (!$scope.model.title) {
-                localizationService.localize("content_readyToSave").then(value => {
-                    $scope.model.title = value;
-                });
-            }
-
-            vm.variants.forEach(variant => {
-
-                //reset state:
-                variant.save = variant.publish = false;
-                variant.isMandatory = isMandatoryFilter(variant);
-
-                if(variant.state === 'NotCreated' && hasAnyData(variant) && allowUpdate(variant)) {
-                    variant.save = true;
-                }
-            });
-
-            if (vm.variants.length !== 0) {
-                        
-                //ensure that the current one is selected
-                var active = vm.variants.find(v => v.active);
-                if (active && allowUpdate(active)) {
-                    active.save = true;
-                }
-
-                vm.availableVariants = contentEditingHelper.getSortedVariantsAndSegments(vm.availableVariants);
-
-            } else {
-                //disable save button if we have nothing to save
-                $scope.model.disableSubmitButton = true;
-            }
-
-            vm.loading = false;
-        }
-
-        onInit();
-
-        //when this dialog is closed, reset all 'save' and 'notAllowed' flags
-        $scope.$on('$destroy', () => {
-            vm.variants.forEach(variant => {
-                variant.save = false;
-                variant.notAllowed = false;
-            });
-        });
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Overlays.SaveContentController", SaveContentController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
deleted file mode 100644
index 9153ae1650..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<div ng-controller="Umbraco.Overlays.SaveContentController as vm" class="umb-variant-selector-overlay">
-
-    <div ng-if="vm.loading" style="min-height: 50px; position: relative;">
-        <umb-load-indicator></umb-load-indicator>
-    </div>
-
-    <div ng-if="!vm.loading">
-        <div class="mb3">
-            <p>
-                <localize key="content_variantsToSave">Choose which variants to be saved.</localize>
-            </p>
-        </div>
-
-        <div class="umb-list umb-list--condensed">
-
-            <div class="umb-list-item"
-                 ng-repeat="variant in vm.availableVariants track by variant.compositeId">
-                <ng-form name="saveVariantSelectorForm">
-                    <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--warning': saveVariantSelectorForm.saveVariantSelector.$invalid}">
-
-                        <input type="hidden" name="saveInvariant" val-server-field="_content_variant_invariant_null_" ng-model="variant.save"></input>
-
-                        <umb-checkbox input-id="{{variant.htmlId}}"
-                                      name="saveVariantSelector"
-                                      model="variant.save"
-                                      on-change="vm.changeSelection(variant)"
-                                      server-validation-field="{{variant.htmlId}}"
-                                      disabled="variant.notAllowed">
-
-                            <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
-                                <span ng-bind="variant.displayName"></span>
-                            </span>
-                            <span class="umb-variant-selector-entry__title" ng-if="variant.segment && variant.language">
-                                <span ng-bind="variant.segment"></span>
-                                <span class="__secondarytitle"> — {{variant.language.name}}</span>
-                                <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
-                            </span>
-                            <span class="umb-variant-selector-entry__description" ng-if="!saveVariantSelectorForm.saveVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                                <umb-variant-state variant="variant"></umb-variant-state>
-                                <span ng-if="variant.isMandatory"> - </span>
-                                <span ng-if="variant.isMandatory"><localize key="general_mandatory">Mandatory</localize></span>
-                                <span ng-if="variant.notAllowed"> - </span>
-                                <span ng-if="variant.notAllowed" class="text-error">
-                                    <localize key="content_variantSaveNotAllowed"></localize>
-                                </span>
-                            </span>
-                            <span class="umb-variant-selector-entry__description" ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
-                                <span class="text-warning" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
-                            </span>
-                            <span class="umb-variant-selector-entry__description" ng-messages="saveVariantSelectorForm.saveInvariant.$error" show-validation-on-submit>
-                                <span class="text-warning" ng-message="valServerField">{{saveVariantSelectorForm.saveInvariant.errorMsg}}</span>
-                            </span>
-
-                        </umb-checkbox>
-                        
-                        <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
-
-                    </div>
-                </ng-form>
-            </div>
-            <br/>
-        </div>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
deleted file mode 100644
index d9fa1604a7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js
+++ /dev/null
@@ -1,379 +0,0 @@
-(function () {
-    "use strict";
-    
-  function ScheduleContentController($scope, $timeout, editorState, localizationService, dateHelper, userService, contentEditingHelper) {
-
-        var vm = this;
-
-        vm.datePickerSetup = datePickerSetup;
-        vm.datePickerChange = datePickerChange;
-        vm.datePickerShow = datePickerShow;
-        vm.datePickerClose = datePickerClose;
-        vm.clearPublishDate = clearPublishDate;
-        vm.clearUnpublishDate = clearUnpublishDate;
-        vm.dirtyVariantFilter = dirtyVariantFilter;
-        vm.changeSelection = changeSelection;
-
-        vm.firstSelectedDates = {};
-        vm.currentUser = null;
-
-        //used to track the original values so if the user doesn't save the schedule and they close the dialog we reset the dates back to what they were.
-        var origDates = [];
-
-        function onInit() {
-            
-            //when this is null, we don't check permissions
-            vm.currentNodePermissions = contentEditingHelper.getPermissionsForContent();
-            vm.canUnpublish = vm.currentNodePermissions ? vm.currentNodePermissions.canUnpublish : true;
-
-            vm.variants = $scope.model.variants;
-            vm.displayVariants = vm.variants.slice(0);// shallow copy, we dont want to share the array-object(because we will be performing a sort method) but each entry should be shared (because we need validation and notifications).
-
-            if (!$scope.model.title) {
-                localizationService.localize("general_scheduledPublishing").then(value => {
-                    $scope.model.title = value;
-                });
-            }
-
-            vm.variants.forEach(variant => {
-                origDates.push({
-                    releaseDate: variant.releaseDate,
-                    expireDate: variant.expireDate
-                });
-
-                variant.isMandatory = isMandatoryFilter(variant);
-            });
-
-            // Check for variants: if a node is invariant it will still have the default language in variants
-            // so we have to check for length > 1
-            if (vm.variants.length > 1) {
-                vm.displayVariants = vm.displayVariants.filter(variant => allowPublish(variant));
-                vm.displayVariants = contentEditingHelper.getSortedVariantsAndSegments(vm.displayVariants);
-
-                vm.variants.forEach(v => {
-                    if (v.active) {
-                        v.save = true;
-                    }
-                });
-                
-                $scope.model.disableSubmitButton = !canSchedule();            
-            }
-
-            // get current backoffice user and format dates
-            userService.getCurrentUser().then(currentUser => {
-
-                vm.currentUser = currentUser;
-
-                vm.variants.forEach(variant => {
-
-                    // prevent selecting publish/unpublish date before today
-                    var now = new Date();
-                    var nowFormatted = moment(now).format("YYYY-MM-DD HH:mm");
-
-                    const datePickerPublishConfig  = {
-                        enableTime: true,
-                        dateFormat: "Y-m-d H:i",
-                        time_24hr: true,
-                        minDate: nowFormatted,
-                        defaultDate: nowFormatted,
-                        clickOpens: true
-                    };
-                    
-                    const datePickerUnpublishConfig = Utilities.extend({}, datePickerPublishConfig, {
-                        clickOpens: vm.canUnpublish
-                    });
-
-
-                    variant.datePickerPublishConfig = datePickerPublishConfig;
-                    variant.datePickerUnpublishConfig = datePickerUnpublishConfig;
-                    
-                    // format all dates to local
-                    if (variant.releaseDate || variant.expireDate) {
-                        formatDatesToLocal(variant);
-                    }
-                });
-            });
-        }
-
-        function allowPublish (variant) {
-            return variant.allowedActions.includes("U");
-        }
-
-        /**
-         * Callback when date is set up
-         * @param {any} variant
-         * @param {any} type publish or unpublish 
-         * @param {any} datePickerInstance The date picker instance
-         */
-        function datePickerSetup(variant, type, datePickerInstance) {
-            // store a date picker instance for publish and unpublish picker
-            // so we can change the settings independently.
-            if (type === 'publish') {
-                variant.releaseDatePickerInstance = datePickerInstance;
-            } else if (type === 'unpublish') {
-                variant.expireDatePickerInstance = datePickerInstance;
-            }
-            $scope.model.disableSubmitButton = !canSchedule();
-        };
-
-        /**
-         * Callback when date picker date changes
-         * @param {any} variant 
-         * @param {any} dateStr Date string from the date picker
-         * @param {any} type publish or unpublish
-         */
-        function datePickerChange(variant, dateStr, type) {
-            if (type === 'publish') {
-                setPublishDate(variant, dateStr);
-            } else if (type === 'unpublish') {
-                setUnpublishDate(variant, dateStr);
-            }
-            $scope.model.disableSubmitButton = !canSchedule();
-        }
-
-        /**
-         * Add flag when a date picker opens is we can prevent the overlay from closing
-         * @param {any} variant 
-         * @param {any} type publish or unpublish
-         */
-        function datePickerShow(variant, type) {
-            var activeDatePickerInstance;
-            if (type === 'publish') {
-                variant.releaseDatePickerOpen = true;
-                activeDatePickerInstance = variant.releaseDatePickerInstance;
-            } else if (type === 'unpublish') {
-                variant.expireDatePickerOpen = true;
-                activeDatePickerInstance = variant.expireDatePickerInstance;
-            }
-
-            // Prevent enter key in time fields from submitting the overlay before the associated input gets the updated time
-            if (activeDatePickerInstance && !activeDatePickerInstance.hourElement.hasAttribute("overlay-submit-on-enter"))
-            {
-                activeDatePickerInstance.hourElement.setAttribute("overlay-submit-on-enter", "false");
-            }
-            if (activeDatePickerInstance && !activeDatePickerInstance.minuteElement.hasAttribute("overlay-submit-on-enter"))
-            {
-                activeDatePickerInstance.minuteElement.setAttribute("overlay-submit-on-enter", "false");
-            }
-
-            checkForBackdropClick();
-            $scope.model.disableSubmitButton = !canSchedule();
-        }
-
-        /**
-         * Remove flag when a date picker closes so the overlay can be closed again
-         * @param {any} variant 
-         * @param {any} type publish or unpublish
-         */
-        function datePickerClose(variant, type) {
-            $timeout(function(){
-                if (type === 'publish') {
-                    variant.releaseDatePickerOpen = false;
-                } else if (type === 'unpublish') {
-                    variant.expireDatePickerOpen = false;
-                }
-                checkForBackdropClick();
-                $scope.model.disableSubmitButton = !canSchedule();
-            }, 200);
-
-        }
-
-        /**
-         * Prevent the overlay from closing if any date pickers are open
-         */
-        function checkForBackdropClick() {
-
-            var open = vm.variants.find(variant => variant.releaseDatePickerOpen || variant.expireDatePickerOpen);
-
-            if(open) {
-                $scope.model.disableBackdropClick = true;
-            } else {
-                $scope.model.disableBackdropClick = false;
-            }
-        }
-
-        /**
-         * Sets the selected publish date
-         * @param {any} variant 
-         * @param {any} date The selected date
-         */
-        function setPublishDate(variant, date) {
-
-            if (!date) {
-                return;
-            }
-
-            //The date being passed in here is the user's local date/time that they have selected
-            //we need to convert this date back to the server date on the model.
-            var serverTime = dateHelper.convertToServerStringTime(moment(date), Umbraco.Sys.ServerVariables.application.serverTimeOffset);
-
-            // update publish value
-            variant.releaseDate = serverTime;
-
-            // make sure dates are formatted to the user's locale
-            formatDatesToLocal(variant);
-
-            // make sure the unpublish date can't be before the publish date
-            variant.expireDatePickerInstance.set("minDate", moment(variant.releaseDate).format("YYYY-MM-DD HH:mm"));
-
-        }
-
-        /**
-         * Sets the selected unpublish date
-         * @param {any} variant 
-         * @param {any} date The selected date
-         */
-        function setUnpublishDate(variant, date) {
-
-            if (!date) {
-                return;
-            }
-
-            //The date being passed in here is the user's local date/time that they have selected
-            //we need to convert this date back to the server date on the model.
-            var serverTime = dateHelper.convertToServerStringTime(moment(date), Umbraco.Sys.ServerVariables.application.serverTimeOffset);
-
-            // update publish value
-            variant.expireDate = serverTime;
-
-            // make sure dates are formatted to the user's locale
-            formatDatesToLocal(variant);
-
-            // make sure the publish date can't be after the publish date
-            variant.releaseDatePickerInstance.set("maxDate", moment(variant.expireDate).format("YYYY-MM-DD HH:mm"));
-
-        }
-
-        /**
-         * Clears the publish date
-         * @param {any} variant 
-         */
-        function clearPublishDate(variant) {
-            if(variant && variant.releaseDate) {
-                variant.releaseDate = null;
-                // we don't have a publish date anymore so we can clear the min date for unpublish
-                var now = new Date();
-                var nowFormatted = moment(now).format("YYYY-MM-DD HH:mm");
-                variant.expireDatePickerInstance.set("minDate", nowFormatted);
-            }
-            $scope.model.disableSubmitButton = !canSchedule();
-        }
-
-        /**
-         * Clears the unpublish date
-         * @param {any} variant 
-         */
-        function clearUnpublishDate(variant) {
-            if(variant && variant.expireDate) {
-                variant.expireDate = null;
-                // we don't have a unpublish date anymore so we can clear the max date for publish
-                variant.releaseDatePickerInstance.set("maxDate", null);
-            }
-            $scope.model.disableSubmitButton = !canSchedule();
-        }
-
-        /**
-         * Formates the selected dates to fit the user culture
-         * @param {any} variant 
-         */
-        function formatDatesToLocal(variant) {
-            if(variant && variant.releaseDate) {
-                variant.releaseDateFormatted = dateHelper.getLocalDate(variant.releaseDate, vm.currentUser.locale, "MMM Do YYYY, HH:mm");
-            }
-            if(variant && variant.expireDate) {
-                variant.expireDateFormatted = dateHelper.getLocalDate(variant.expireDate, vm.currentUser.locale, "MMM Do YYYY, HH:mm");
-            }
-        }
-        
-        /**
-         * Called when new variants are selected or deselected
-         * @param {any} variant 
-         */
-        function changeSelection(variant) {
-            $scope.model.disableSubmitButton = !canSchedule();
-            //need to set the Save state to true if publish is true
-            variant.save = variant.save;
-        }
-
-        function dirtyVariantFilter(variant) {
-            //determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
-            // * the active one
-            // * it's editor is in a $dirty state
-            // * it has pending saves
-            // * it is unpublished
-            // * it is in NotCreated state
-            return (variant.active || variant.isDirty || variant.state === "Draft" || variant.state === "PublishedPendingChanges" || variant.state === "NotCreated");
-        }
-
-        function isMandatoryFilter(variant) {
-            //determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
-            // * has a mandatory language
-            // * without having a segment, segments cant be mandatory at current state of code.
-            return (variant.language && variant.language.isMandatory === true && variant.segment == null);
-        }
-
-        /** Returns true if publishing is possible based on if there are un-published mandatory languages */
-        function canSchedule() {
-
-            // sched is enabled if
-            //  1) when mandatory langs are not published AND all mandatory langs are selected AND all mandatory langs have a release date
-            //  2) OR all mandatory langs are published
-            //  3) OR all mandatory langs are are scheduled for publishing
-            //  4) OR there has been a persisted schedule for a variant and it has now been changed
-
-            var selectedWithDates = [];
-            for (var i = 0; i < vm.variants.length; i++) {
-                var variant = vm.variants[i];
-
-                //if the sched dates for this variant have been removed then we must allow the schedule button to be used to save the changes
-                var schedCleared = (origDates[i].releaseDate && origDates[i].releaseDate !== variant.releaseDate)
-                    || (origDates[i].expireDate && origDates[i].expireDate !== variant.expireDate);
-                if (schedCleared) {
-                    return true;
-                }
-
-                var isMandatory = variant.segment == null && variant.language && variant.language.isMandatory;
-
-                //if this variant will show up in the publish-able list
-                var publishable = dirtyVariantFilter(variant);
-                var published = !(variant.state === "NotCreated" || variant.state === "Draft");
-                var isScheduledPublished = variant.releaseDate;
-
-                if (isMandatory && !published && !isScheduledPublished && (!publishable || !variant.save)) {
-                    //if a mandatory variant isn't published or scheduled published
-                    //and it's not publishable or not selected to be published
-                    //then we cannot continue
-
-                    // TODO: Show a message when this occurs
-                    return false;
-                }
-
-                if (variant.save && (variant.releaseDate || variant.expireDate)) {
-                    selectedWithDates.push(variant.save);
-                }
-            }
-            return selectedWithDates.length > 0;
-        }
-        
-        onInit();
-
-        //when this dialog is closed, clean up
-        $scope.$on('$destroy', () => {
-            vm.variants.forEach(variant => {
-                variant.save = false;
-                // remove properties only needed for this dialog
-                delete variant.releaseDateFormatted;
-                delete variant.expireDateFormatted;
-                delete variant.datePickerPublishConfig;
-                delete variant.datePickerUnpublishConfig;
-                delete variant.releaseDatePickerInstance;
-                delete variant.expireDatePickerInstance;
-                delete variant.releaseDatePickerOpen;
-                delete variant.expireDatePickerOpen;
-            }); 
-        });
-    }
-
-    angular.module("umbraco").controller("Umbraco.Overlays.ScheduleContentController", ScheduleContentController);
-    
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
deleted file mode 100644
index 8fca0973e4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<div ng-controller="Umbraco.Overlays.ScheduleContentController as vm" class="umb-variant-selector-overlay">
-
-    <!-- invariant nodes -->
-    <div ng-if="vm.variants.length === 1">
-
-        <div class="mb3">
-            <p><localize key="content_schedulePublishHelp">Select the date and time to publish and/or unpublish the content item.</localize></p>
-        </div>
-
-        <div class="date-wrapper">
-            <div class="date-wrapper__date">
-                <label class="bold">
-                    <localize key="content_releaseDate">Publish at</localize>
-                </label>
-
-                <div class="btn-group flex" style="font-size: 15px;">
-
-                    <umb-date-time-picker
-                        ng-model="vm.variants[0].releaseDate"
-                        options="vm.variants[0].datePickerPublishConfig"
-                        on-setup="vm.datePickerSetup(vm.variants[0], 'publish', fpItem)"
-                        on-change="vm.datePickerChange(vm.variants[0], dateStr, 'publish')"
-                        on-open="vm.datePickerShow(vm.variants[0], 'publish')"
-                        on-close="vm.datePickerClose(vm.variants[0], 'publish')">
-
-                        <div>
-                            <button type="button"
-                                    ng-show="vm.variants[0].releaseDate"
-                                    class="btn btn-reset umb-button--xs"
-                                    style="outline: none;">
-                                {{vm.variants[0].releaseDateFormatted}}
-                            </button>
-
-                            <button type="button" class="btn-reset" ng-hide="vm.variants[0].releaseDate">
-                                <localize key="content_setDate">Set date</localize>
-                            </button>
-                        </div>
-
-                    </umb-date-time-picker>
-
-                    <button type="button"
-                            ng-show="vm.variants[0].releaseDate"
-                            ng-click="vm.clearPublishDate(vm.variants[0])"
-                            class="btn btn-reset umb-button--xs dropdown-toggle umb-button-group__toggle"
-                            style="margin-left: -2px;">
-                        <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                    </button>
-
-                </div>
-            </div>
-
-            <div class="date-wrapper__date">
-
-                <label class="bold">
-                    <localize key="content_unpublishDate">Unpublish at</localize>
-                </label>
-
-                <div class="btn-group flex" style="font-size: 15px;" ng-class="{'umb-dimmed cursor-not-allowed': !vm.canUnpublish}">
-                    <umb-date-time-picker
-                        ng-model="vm.variants[0].expireDate"
-                        ng-class="{ '--disabled': !vm.canUnpublish }"
-                        options="vm.variants[0].datePickerUnpublishConfig"
-                        on-setup="vm.datePickerSetup(vm.variants[0], 'unpublish', fpItem)"
-                        on-change="vm.datePickerChange(vm.variants[0], dateStr, 'unpublish')"
-                        on-open="vm.datePickerShow(vm.variants[0], 'unpublish')"
-                        on-close="vm.datePickerClose(vm.variants[0], 'unpublish')">
-
-                        <div>
-                            <button type="button"
-                                    ng-show="vm.variants[0].expireDate"
-                                    ng-disabled="!vm.canUnpublish"
-                                    class="btn btn-reset umb-button--xs"
-                                    style="outline: none;">
-                                {{vm.variants[0].expireDateFormatted}}
-                            </button>
-
-                            <button type="button"
-                                    class="btn-reset"
-                                    ng-hide="vm.variants[0].expireDate"
-                                    ng-disabled="!vm.canUnpublish">
-                                <localize key="content_setDate">Set date</localize>
-                            </button>
-                        </div>
-
-                    </umb-date-time-picker>
-
-                    <button type="button"
-                            ng-show="vm.variants[0].expireDate"
-                            ng-disabled="!vm.canUnpublish"
-                            ng-click="vm.clearUnpublishDate(vm.variants[0])"
-                            class="btn btn-reset umb-button--xs dropdown-toggle umb-button-group__toggle"
-                            style="margin-left: -2px;">
-                        <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                    </button>
-
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- nodes with variants -->
-    <div ng-if="vm.variants.length > 1">
-
-        <div class="mb3">
-            <p><localize key="content_languagesToSchedule">What languages would you like to schedule?</localize></p>
-        </div>
-
-        <div class="umb-list umb-list--condensed">
-
-            <div class="umb-list-item" ng-repeat="variant in vm.displayVariants track by variant.compositeId">
-                <ng-form name="scheduleSelectorForm" style="width:100%;">
-                    <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': scheduleSelectorForm.saveVariantReleaseDate.$invalid}">
-
-                        <umb-checkbox input-id="{{variant.htmlId}}"
-                                      name="saveVariantSelector"
-                                      model="variant.save"
-                                      on-change="vm.changeSelection(variant)"
-                                      server-validation-field="{{variant.htmlId}}">
-
-                            <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
-                                <span ng-bind="variant.displayName"></span>
-                                <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
-                            </span>
-                            <span class="umb-variant-selector-entry__title" ng-if="variant.segment && variant.language">
-                                <span ng-bind="variant.segment"></span>
-                                <span class="__secondarytitle"> — {{variant.language.name}}</span>
-                                <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
-                            </span>
-                            <span class="umb-variant-selector-entry__description"
-                                  ng-if="!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                                <umb-variant-state variant="variant"></umb-variant-state>
-                                <span ng-show="variant.language.isMandatory"> - <localize key="general_mandatory">Mandatory</localize></span>
-                            </span>
-
-                        </umb-checkbox>
-
-                        <div>
-                            <div class="date-wrapper-mini date-wrapper-mini--checkbox">
-                                <div class="date-wrapper-mini__date" ng-if="(variant.releaseDate || variant.save)">
-
-                                    <div style="font-size: 13px; margin-right: 5px;">Publish:<em ng-show="!variant.save">&nbsp;&nbsp;{{variant.releaseDateFormatted}}</em></div>
-
-                                    <div class="btn-group flex" style="font-size: 14px; margin-right: 10px;" ng-if="variant.save">
-                                        <umb-date-time-picker
-                                            ng-model="variant.releaseDate"
-                                            options="variant.datePickerPublishConfig"
-                                            on-setup="vm.datePickerSetup(variant, 'publish', fpItem)"
-                                            on-change="vm.datePickerChange(variant, dateStr, 'publish')"
-                                            on-open="vm.datePickerShow(variant, 'publish')"
-                                            on-close="vm.datePickerClose(variant, 'publish')">
-                                            <div>
-                                                <button type="button"
-                                                        ng-show="variant.releaseDate"
-                                                        class="btn btn-reset umb-button--xxs"
-                                                        style="outline: none;">
-                                                    {{variant.releaseDateFormatted}}
-                                                </button>
-
-                                                <button type="button" class="btn-reset" ng-hide="variant.releaseDate">
-                                                    <localize key="content_setDate">Set date</localize>
-                                                </button>
-                                            </div>
-                                        </umb-date-time-picker>
-                                        <button type="button"
-                                                ng-show="variant.releaseDate"
-                                                ng-click="vm.clearPublishDate(variant)"
-                                                class="btn btn-reset umb-button--xxs dropdown-toggle umb-button-group__toggle umb-outline"
-                                                style="margin-left: -2px;">
-                                            <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                        </button>
-                                    </div>
-                                </div>
-
-                                <div class="date-wrapper-mini__date" ng-if="variant.expireDate || variant.save">
-                                    <div style="font-size: 13px; margin-right: 5px;">Unpublish:<em ng-show="!variant.save">&nbsp;&nbsp;{{variant.expireDateFormatted}}</em></div>
-
-                                    <div class="btn-group flex" style="font-size: 14px;" ng-class="{'umb-dimmed cursor-not-allowed': !vm.canUnpublish}" ng-if="variant.save">
-                                        <umb-date-time-picker
-                                            ng-model="variant.expireDate"
-                                            ng-class="{ '--disabled': !vm.canUnpublish }"
-                                            options="variant.datePickerUnpublishConfig"
-                                            on-setup="vm.datePickerSetup(variant, 'unpublish', fpItem)"
-                                            on-change="vm.datePickerChange(variant, dateStr, 'unpublish')"
-                                            on-open="vm.datePickerShow(variant, 'unpublish')"
-                                            on-close="vm.datePickerClose(variant, 'unpublish')">
-                                            <div>
-                                                <button type="button"
-                                                        ng-show="variant.expireDate"
-                                                        class="btn btm-reset umb-button--xxs btn-outline"
-                                                        style="outline: none;">
-                                                    {{variant.expireDateFormatted}}
-                                                </button>
-
-                                                <button type="button" class="btn-reset" ng-hide="variant.expireDate">
-                                                    <localize key="content_setDate">Set date</localize>
-                                                </button>
-                                            </div>
-                                        </umb-date-time-picker>
-                                        <button type="button"
-                                                ng-show="variant.expireDate"
-                                                ng-click="vm.clearUnpublishDate(variant)"
-                                                class="btn btn-reset umb-button--xxs dropdown-toggle umb-button-group__toggle umb-outline"
-                                                style="margin-left: -2px;">
-                                            <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <input type="text" style="display:none;" ng-model="variant.releaseDate"
-                                   id="{{variant.htmlId}}"
-                                   name="saveVariantReleaseDate"
-                                   val-server-field="{{variant.htmlId}}" />
-
-                            <div ng-messages="scheduleSelectorForm.saveVariantReleaseDate.$error" show-validation-on-submit>
-                                <div class="umb-list-item__description text-error" ng-message="valServerField">{{scheduleSelectorForm.saveVariantReleaseDate.errorMsg}}</div>
-                            </div>
-
-                            <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
-
-                        </div>
-                    </div>
-                </ng-form>
-            </div>
-            <br />
-        </div>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js
deleted file mode 100644
index c1c91057da..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js
+++ /dev/null
@@ -1,90 +0,0 @@
-(function () {
-    "use strict";
-
-    function SendToPublishController($scope, localizationService, contentEditingHelper) {
-
-        var vm = this;
-        vm.loading = true;
-        vm.selectedVariants = [];
-
-        vm.changeSelection = changeSelection;
-
-        function onInit() {
-
-            vm.variants = $scope.model.variants;
-
-            // set dialog title
-            if (!$scope.model.title) {
-                localizationService.localize("content_sendForApproval").then(function (value) {
-                    $scope.model.title = value;
-                });
-            }
-
-            vm.variants.forEach(variant => {
-                variant.isMandatory = isMandatoryFilter(variant);
-            });
-
-            vm.availableVariants = vm.variants.filter(publishableVariantFilter);
-
-            if (vm.availableVariants.length !== 0) {
-
-                vm.availableVariants = contentEditingHelper.getSortedVariantsAndSegments(vm.availableVariants);
-            }
-
-            $scope.model.disableSubmitButton = true;
-            vm.loading = false;
-        }
-
-        function allowSendToPublish (variant) {
-            return variant.allowedActions.includes("H");
-        }
-
-        function changeSelection(variant) {
-          let foundVariant = vm.selectedVariants.find(x => x.compositeId === variant.compositeId);
-
-          if (foundVariant === undefined) {
-            variant.save = true;
-            vm.selectedVariants.push(variant);
-          } else {
-            variant.save = false;
-            let index = vm.selectedVariants.indexOf(foundVariant);
-            if (index !== -1) {
-              vm.selectedVariants.splice(index, 1);
-            }
-          }
-
-          let firstSelected = vm.variants.find(v => v.save);
-          $scope.model.disableSubmitButton = !firstSelected;
-        }
-
-
-      function isMandatoryFilter(variant) {
-            //determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
-            // * has a mandatory language
-            // * without having a segment, segments cant be mandatory at current state of code.
-            return (variant.language && variant.language.isMandatory === true && variant.segment == null);
-        }
-
-        function publishableVariantFilter(variant) {
-            //determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
-            // * variant is active
-            // * it's editor is in a $dirty state
-            // * it has pending saves
-            // * it is unpublished
-            variant.notAllowed = allowSendToPublish(variant) === false && variant.active;
-            return (variant.active || variant.isDirty || variant.state === "Draft" || variant.state === "PublishedPendingChanges") && (allowSendToPublish(variant) || variant.active);
-        }
-
-        //when this dialog is closed, reset all 'save' flags
-        $scope.$on('$destroy', function () {
-            vm.variants.forEach(variant => {
-                variant.save = false;
-                variant.notAllowed = false;
-            });
-        });
-
-        onInit();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Overlays.SendToPublishController", SendToPublishController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
deleted file mode 100644
index b9061a8eb6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<div ng-controller="Umbraco.Overlays.SendToPublishController as vm" class="umb-variant-selector-overlay">
-
-    <div class="mb3">
-        <p><localize key="content_languagesToSendForApproval">What languages would you like to send for approval?</localize></p>
-    </div>
-
-    <div ng-if="vm.loading" style="min-height: 50px; position: relative;">
-        <umb-load-indicator></umb-load-indicator>
-    </div>
-
-    <div class="umb-list umb-list--condensed" ng-if="!vm.loading">
-
-        <div class="umb-list-item" ng-repeat="variant in vm.availableVariants track by variant.compositeId">
-            <ng-form name="publishVariantSelectorForm">
-                <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid}">
-
-                    <umb-checkbox input-id="{{variant.htmlId}}"
-                                  name="publishVariantSelector"
-                                  model="variant.publish"
-                                  on-change="vm.changeSelection(variant)"
-                                  server-validation-field="{{variant.htmlId}}"
-                                  disabled="variant.notAllowed">
-
-                        <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
-                            <span ng-bind="variant.displayName"></span>
-                            <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
-                        </span>
-                        <span class="umb-variant-selector-entry__title" ng-if="variant.segment && variant.language">
-                            <span ng-bind="variant.segment"></span>
-                            <span class="__secondarytitle"> — {{variant.language.name}}</span>
-                            <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
-                        </span>
-                        <span class="umb-variant-selector-entry__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                            <umb-variant-state variant="variant"></umb-variant-state>
-                            <span ng-if="variant.isMandatory"> - </span>
-                            <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.publish === false) }"><localize key="general_mandatory">Mandatory</localize></span>
-                            <span ng-if="variant.notAllowed"> - </span>
-                            <span ng-if="variant.notAllowed" class="text-error">
-                                <localize key="content_variantSendForApprovalNotAllowed"></localize>
-                            </span>
-                        </span>
-                        <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                            <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
-                        </span>
-
-                    </umb-checkbox>
-
-                    <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
-                </div>
-
-            </ng-form>
-        </div>
-        <br />
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.controller.js
deleted file mode 100644
index 94c01662b5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.controller.js
+++ /dev/null
@@ -1,144 +0,0 @@
-(function () {
-    "use strict";
-
-    function UnpublishController($scope, localizationService, contentEditingHelper) {
-
-        var vm = this;
-        var autoSelectedVariants = [];
-
-        vm.id = $scope.content.id;
-        vm.warningText = null;
-        vm.changeSelection = changeSelection;
-
-        function onInit() {
-
-            $scope.model.hideSubmitButton = true;
-            vm.variants = $scope.model.variants;
-            vm.unpublishableVariants = vm.variants.filter(publishedVariantFilter)
-
-            // set dialog title
-            if (!$scope.model.title) {
-                localizationService.localize("content_unpublish").then(value => {
-                    $scope.model.title = value;
-                });
-            }
-
-            vm.variants.forEach(variant => {
-                variant.isMandatory = isMandatoryFilter(variant);
-            });
-
-            // node has variants
-            if (vm.variants.length !== 1) {
-                
-                vm.unpublishableVariants = contentEditingHelper.getSortedVariantsAndSegments(vm.unpublishableVariants);
-
-                var active = vm.variants.find(v => v.active);
-
-                if (active && publishedVariantFilter(active) && allowUnpublish(active)) {
-                    //ensure that the current one is selected
-                    active.save = true;
-                }
-
-                // autoselect other variants if needed
-                changeSelection(active);
-            }
-            
-        }
-
-        function allowUnpublish (variant) {
-            return variant.allowedActions.includes("Z");
-        }
-
-        function changeSelection(selectedVariant) {
-
-            // if a mandatory variant is selected we want to select all other variants, we cant have anything published if a mandatory variants gets unpublished.
-            // and disable selection for the others
-            if (selectedVariant.save && selectedVariant.segment == null && selectedVariant.language && selectedVariant.language.isMandatory) {
-
-                vm.variants.forEach(variant => {
-                    if (!variant.save) {
-                        // keep track of the variants we automaically select
-                        // so we can remove the selection again
-                        autoSelectedVariants.push(variant);
-                        variant.save = true;
-                    }
-                    variant.disabled = true;
-                });
-
-                // make sure the mandatory isn't disabled so we can deselect again
-                selectedVariant.disabled = false;
-            }
-
-            // if a mandatory variant is deselected we want to deselet all the variants
-            // that was automatically selected so it goes back to the state before the mandatory language was selected.
-            // We also want to enable all checkboxes again
-            if (!selectedVariant.save && selectedVariant.segment == null && selectedVariant.language && selectedVariant.language.isMandatory) {
-                
-                vm.variants.forEach(variant => {
-
-                    // check if variant was auto selected, then deselect
-                    let autoSelected = autoSelectedVariants.find(x => x.culture === variant.culture);
-                    if (autoSelected) {
-                        variant.save = false;
-                    }
-
-                    variant.disabled = false;
-                });
-
-                autoSelectedVariants = [];
-            }
-
-            // disable submit button if nothing is selected
-            var firstSelected = vm.variants.find(v => v.save);
-            $scope.model.disableSubmitButton = !firstSelected; //disable submit button if there is none selected
-
-        }
-
-        function isMandatoryFilter(variant) {
-            //determine a variant is 'dirty' (meaning it will show up as publish-able) if it's
-            // * has a mandatory language
-            // * without having a segment, segments cant be mandatory at current state of code.
-            return (variant.language && variant.language.isMandatory === true && variant.segment == null);
-        }
-
-        function publishedVariantFilter(variant) {
-            //determine a variant is 'published' (meaning it will show up as able unpublish)
-            // * it has been published
-            // * it has been published with pending changes
-            variant.notAllowed = allowUnpublish(variant) === false && variant.active;
-            return (variant.state === "Published" || variant.state === "PublishedPendingChanges") && (allowUnpublish(variant) || variant.active);
-        }
-
-        //when this dialog is closed, remove all unpublish and disabled flags
-        $scope.$on('$destroy', () => {
-            vm.variants.forEach(variant => {
-                variant.save = variant.disabled = false;
-                variant.notAllowed = false;
-            });
-        });
-
-        vm.checkingReferencesComplete = () => {
-            $scope.model.hideSubmitButton = false;
-        };
-
-        vm.onReferencesWarning = () => {
-            $scope.model.submitButtonStyle = "danger";
-
-            // check if the unpublishing of items that have references has been disabled
-            if (Umbraco.Sys.ServerVariables.umbracoSettings.disableUnpublishWhenReferenced) {
-                // this will only be disabled if we have a warning, indicating that this item or its descendants have reference
-                $scope.model.disableSubmitButton = true;
-            }
-
-            localizationService.localize("references_unpublishWarning").then((value) => {
-                vm.warningText = value;
-            });
-        };
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Overlays.UnpublishController", UnpublishController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
deleted file mode 100644
index aec494c6ae..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<div ng-controller="Umbraco.Overlays.UnpublishController as vm" class="umb-variant-selector-overlay">
-
-    <!-- Single language -->
-    <div ng-if="vm.variants.length === 1">
-        <p><localize key="prompt_confirmUnpublish">Unpublishing will remove this page and all its descendants from the site.</localize></p>
-    </div>
-
-    <!-- Multiple languages -->
-    <div ng-if="vm.variants.length > 1">
-        <div style="margin-bottom: 15px;">
-            <p><localize key="content_languagesToUnpublish">Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages.</localize></p>
-        </div>
-
-        <div class="umb-list umb-list--condensed">
-
-            <div class="umb-list-item" ng-repeat="variant in vm.unpublishableVariants track by variant.compositeId">
-                <ng-form name="unpublishVariantSelectorForm">
-                    <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--error': unpublishVariantSelectorForm.unpublishVariantSelector.$invalid}">
-
-                        <umb-checkbox input-id="{{variant.htmlId}}"
-                                      name="unpublishVariantSelector"
-                                      model="variant.save"
-                                      on-change="vm.changeSelection(variant)"
-                                      disabled="variant.disabled || variant.notAllowed"
-                                      server-validation-field="{{variant.htmlId}}">
-
-                            <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
-                                <span ng-bind="variant.displayName"></span>
-                                <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
-                            </span>
-                            <span class="umb-variant-selector-entry__title" ng-if="variant.segment && variant.language">
-                                <span ng-bind="variant.segment"></span>
-                                <span class="__secondarytitle"> — {{variant.language.name}}</span>
-                                <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
-                            </span>
-                            <span class="umb-variant-selector-entry__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                                <umb-variant-state variant="variant"></umb-variant-state>
-                                <span ng-if="variant.isMandatory"> - </span>
-                                <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.publish === false) }"><localize key="general_mandatory">Mandatory</localize></span>
-                                <span ng-if="variant.notAllowed"> - </span>
-                                <span ng-if="variant.notAllowed" class="text-error">
-                                    <localize key="content_variantUnpublishNotAllowed"></localize>
-                                </span>
-                            </span>
-                            <span class="umb-variant-selector-entry__description" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                                <span class="text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
-                            </span>
-
-                        </umb-checkbox>
-
-                        <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
-
-                    </div>
-                </ng-form>
-            </div>
-        </div>
-    </div>
-
-    <div style="margin-top: 15px;">
-        <umb-tracked-references id="vm.id" on-loading-complete="vm.checkingReferencesComplete()" hide-no-result="true" compact="true" show-descendants="true" hide-none-dependencies="true" on-warning="vm.onReferencesWarning()"></umb-tracked-references>
-    </div>
-
-    <div class="abstract umb-alert umb-alert--warning" ng-if="vm.warningText">
-        {{vm.warningText}}
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/protect.html b/src/Umbraco.Web.UI.Client/src/views/content/protect.html
deleted file mode 100644
index 544d266b3f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/protect.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<div ng-controller="Umbraco.Editors.Content.ProtectController as vm">
-    <form name="vm.protectForm" novalidate>
-        <div class="umb-dialog-body form-horizontal" ng-cloak>
-            <umb-pane ng-hide="vm.success">
-
-                <div ng-show="vm.error">
-                    <div class="alert alert-error">
-                        <div><strong>{{vm.error.errorMsg}}</strong></div>
-                        <div>{{vm.error.data.message}}</div>
-                    </div>
-                </div>
-
-                <umb-load-indicator ng-show="vm.loading">
-                </umb-load-indicator>
-
-                <div ng-show="!vm.step && !vm.loading">
-                    <p class="abstract" ng-hide="success">
-                        <localize key="publicAccess_paHowWould" tokens="[currentNode.name]">Choose how to restrict access to this page</localize>
-                    </p>
-
-                    <div class="pa-select-type">
-
-                        <umb-radiobutton input-id="protectionTypeMember"
-                                         name="protectionType"
-                                         value="member"
-                                         model="vm.type"
-                                         text="">
-                        </umb-radiobutton>
-
-                        <label for="protectionTypeMember" class="flex flex-column flex-auto">
-                            <strong class="pa-access-header bold"><localize key="publicAccess_paMembers">Specific members protection</localize></strong>
-                            <span class=""><localize key="publicAccess_paMembersHelp">If you want to grant access to specific members</localize></span>
-                        </label>
-                    </div>
-
-                    <div class="pa-select-type">
-
-                        <umb-radiobutton input-id="protectionTypeGroup"
-                                         name="protectionType"
-                                         value="group"
-                                         model="vm.type">
-                        </umb-radiobutton>
-
-                        <label for="protectionTypeGroup" class="flex flex-column flex-auto">
-                            <strong class="pa-access-header bold"><localize key="publicAccess_paGroups">Group based protection</localize></strong>
-                            <span><localize key="publicAccess_paGroupsHelp">If you want to grant access to all members of specific member groups</localize></span>
-                        </label>
-                    </div>
-                </div>
-
-                <div ng-show="vm.step && !vm.loading && !vm.removing">
-                    <div ng-if="vm.step === 'member'">
-                        <p><localize key="publicAccess_paSelectMembers" tokens="[currentNode.name]">Select the members that should have access to this page</localize></p>
-                        <div>
-                            <umb-node-preview ng-repeat="member in vm.members | orderBy:'name'"
-                                              icon="'icon-user'"
-                                              name="member.name"
-                                              allow-remove="true"
-                                              on-remove="vm.removeMember(member)">
-                            </umb-node-preview>
-                            <button type="button" ng-click="vm.pickMember()" class="umb-node-preview-add">
-                                <localize key="general_add">Add</localize>
-                            </button>
-                        </div>
-                    </div>
-
-                    <div ng-show="vm.step === 'group' && !vm.hasGroups">
-                        <p><localize key="publicAccess_paGroupsNoGroups">You need to create a member group before you can use group based authentication</localize></p>
-                    </div>
-
-                    <div ng-show="vm.step === 'group' && vm.hasGroups">
-                        <p><localize key="publicAccess_paSelectGroups" tokens="[currentNode.name]">Select the groups that should have access to this page</localize></p>
-                        <div>
-                            <umb-node-preview ng-repeat="group in vm.groups | orderBy:'name'"
-                                              icon="'icon-users'"
-                                              name="group.name"
-                                              allow-remove="true"
-                                              on-remove="vm.removeGroup(group)">
-                            </umb-node-preview>
-                            <button type="button" ng-click="vm.pickGroup()" class="umb-node-preview-add">
-                                <localize key="general_add">Add</localize>
-                            </button>
-                        </div>
-                    </div>
-
-                    <div ng-show="vm.step === 'member' || vm.hasGroups">
-                        <p class="mt4"><localize key="publicAccess_paSelectPages">Select the pages that contain login form and error messages</localize></p>
-                        <div>
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label>
-                                        <strong><localize key="publicAccess_paLoginPage">Login Page</localize></strong>
-                                        <small><localize key="publicAccess_paLoginPageHelp">Choose the page that contains the login form</localize></small>
-                                    </label>
-                                    <umb-node-preview ng-show="vm.loginPage"
-                                                      icon="vm.loginPage.icon"
-                                                      name="vm.loginPage.name"
-                                                      allow-remove="true"
-                                                      on-remove="vm.loginPage = null">
-                                    </umb-node-preview>
-                                    <button type="button" ng-show="!vm.loginPage" ng-click="vm.pickLoginPage()" class="umb-node-preview-add">
-                                        <localize key="general_add">Add</localize>
-                                    </button>
-                                </div>
-                            </div>
-                            <div class="control-group umb-control-group">
-                                <div class="umb-el-wrap">
-                                    <label>
-                                        <strong><localize key="publicAccess_paErrorPage">Error Page</localize></strong>
-                                        <small><localize key="publicAccess_paErrorPageHelp">Used when people are logged on, but do not have access</localize></small>
-                                    </label>
-                                    <umb-node-preview ng-show="vm.errorPage"
-                                                      icon="vm.errorPage.icon"
-                                                      name="vm.errorPage.name"
-                                                      allow-remove="true"
-                                                      on-remove="vm.errorPage = null">
-                                    </umb-node-preview>
-                                    <button type="button" ng-show="!vm.errorPage" ng-click="vm.pickErrorPage()" class="umb-node-preview-add">
-                                        <localize key="general_add">Add</localize>
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div ng-show="vm.removing">
-                    <p><localize key="publicAccess_paRemoveProtectionConfirm" tokens="[currentNode.name]">Are you sure you want to remove the protection from this page?</localize></p>
-                </div>
-
-            </umb-pane>
-
-            <umb-pane ng-show="vm.success">
-                <div class="alert alert-success" ng-bind-html="vm.success.message"></div>
-                <umb-button type="button"
-                            action="vm.close()"
-                            button-style="success"
-                            label-key="general_ok">
-                </umb-button>
-            </umb-pane>
-        </div>
-
-        <div class="umb-dialog-footer umb-btn-toolbar" ng-hide="vm.loading || vm.success">
-            <umb-button ng-hide="vm.removing"
-                        type="button"
-                        button-style="link"
-                        action="vm.close()"
-                        label-key="general_close">
-            </umb-button>
-
-            <umb-button ng-hide="vm.step  || vm.removing"
-                        type="button"
-                        action="vm.next()"
-                        button-style="action"
-                        label-key="general_next"
-                        disabled="vm.loading || !vm.type">
-            </umb-button>
-
-            <umb-button ng-show="vm.canRemove && !vm.removing"
-                        type="button"
-                        action="vm.removeProtection()"
-                        button-style="warning"
-                        label-key="publicAccess_paRemoveProtection"
-                        disabled="vm.buttonState === 'busy'">
-            </umb-button>
-
-            <umb-button ng-show="vm.step && !vm.removing"
-                        type="button"
-                        action="vm.save()"
-                        state="vm.buttonState"
-                        button-style="success"
-                        label-key="buttons_save"
-                        disabled="vm.buttonState === 'busy' || !vm.isValid()">
-            </umb-button>
-
-            <umb-button ng-show="vm.removing"
-                        type="button"
-                        button-style="link"
-                        action="vm.close()"
-                        label-key="buttons_confirmActionCancel">
-            </umb-button>
-
-            <umb-button ng-show="vm.removing"
-                        type="button"
-                        action="vm.removeProtectionConfirm()"
-                        state="vm.buttonState"
-                        button-style="success"
-                        label-key="buttons_confirmActionConfirm"
-                        disabled="vm.buttonState === 'busy'">
-            </umb-button>
-        </div>
-    </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html b/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
deleted file mode 100644
index 410ad938f8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<umb-editor-view>
-    <form ng-controller="Umbraco.Editors.Content.RecycleBinController" val-form-manager>
-
-        <umb-editor-header name="page.name"
-                           name-locked="page.nameLocked"
-                           hide-icon="true"
-                           hide-description="true"
-                           hide-alias="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-            <div class="umb-editor-sub-views">
-                <div id="sub-view-{{$index}}" ng-repeat="app in content.apps track by app.alias">
-                    <umb-editor-sub-view model="app" content="content">
-                    </umb-editor-sub-view>
-                </div>
-            </div>
-        </umb-editor-container>
-
-    </form>
-</umb-editor-view>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/restore.html b/src/Umbraco.Web.UI.Client/src/views/content/restore.html
deleted file mode 100644
index 2f7bacca82..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/restore.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<div ng-controller="Umbraco.Editors.Content.RestoreController">
-	<div class="umb-dialog-body" ng-cloak>
-        <umb-pane>
-            <umb-load-indicator
-                ng-show="loading">
-            </umb-load-indicator>
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.Message}}</div>
-                </div>
-            </div>
-
-            <div ng-show="success">
-                <div class="alert alert-success">
-                    <strong>{{source.name}}</strong>
-                    <span ng-hide="moving"><localize key="recycleBin_wasRestored">was restored under</localize></span>
-                    <span ng-show="moving"><localize key="editdatatype_wasMoved">was moved underneath</localize></span>
-                    <strong>{{target.name}}</strong>
-                </div>
-                <button class="btn btn-primary" ng-click="close()">Ok</button>
-            </div>
-
-            <div ng-hide="moving || loading || success">
-
-                <p class="abstract" ng-hide="error || success">
-                    <localize key="actions_restore">Restore</localize> <strong>{{source.name}}</strong> <localize key="general_under">under</localize> <strong>{{target.name}}</strong>?
-                </p>
-
-            </div>
-
-            <div ng-hide="!moving || loading || success">
-                <div>
-                    <div class="alert alert-info">
-                        <div><strong><localize key="recycleBin_itemCannotBeRestored">Cannot automatically restore this item</localize></strong></div>
-                        <div><localize key="recycleBin_itemCannotBeRestoredHelpText">There is no location where this item can be automatically restored. You can move the item manually using the tree below.</localize></div>
-                    </div>
-                </div>
-
-                <div ng-hide="miniListView">
-                    <umb-tree-search-box
-                        hide-search-callback="hideSearch"
-                        search-callback="onSearchResults"
-                        show-search="{{searchInfo.showSearch}}"
-                        section="content">
-                    </umb-tree-search-box>
-
-                    <br />
-
-                    <umb-tree-search-results
-                        ng-if="searchInfo.showSearch"
-                        results="searchInfo.results"
-                        select-result-callback="selectResult">
-                    </umb-tree-search-results>
-
-                    <div ng-hide="searchInfo.showSearch">
-                        <umb-tree
-                            section="content"
-                            hideheader="{{treeModel.hideHeader}}"
-                            hideoptions="true"
-                            isdialog="true"
-                            api="dialogTreeApi"
-                            on-init="onTreeInit()"
-                            enablelistviewexpand="true"
-                            enablecheckboxes="true">
-                        </umb-tree>
-                    </div>
-                </div>
-
-                <umb-mini-list-view
-                    ng-if="miniListView"
-                    node="miniListView"
-                    entity-type="Document"
-                    on-select="selectListViewNode(node)"
-                    on-close="closeMiniListView()">
-                </umb-mini-list-view>
-
-            </div>
-
-        </umb-pane>
-	</div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || moving || success">
-        <button type="button" class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></button>
-        <button class="btn btn-primary" ng-click="restore()" ng-show="error == null"><localize key="actions_restore">Restore</localize></button>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || !moving || success">
-        <button type="button" class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></button>
-        <button class="btn btn-primary" ng-click="restore()" ng-show="error == null" ng-disabled="!target"><localize key="actions_move">Move</localize></button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/rights.html b/src/Umbraco.Web.UI.Client/src/views/content/rights.html
deleted file mode 100644
index 3387d023f4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/rights.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<div ng-controller="Umbraco.Editors.Content.RightsController as vm">
-
-    <!-- Manage groups -->
-    <div ng-show="vm.viewState === 'manageGroups'">
-        <div class="umb-dialog-body" ng-cloak>
-
-            <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-            <div class="umb-pane" ng-show="!vm.loading" role="dialog" aria-labelledby="content_rights_title" aria-describedby="content_rights_description">
-                
-                <form name="permissionsForm">
-
-                    <div ng-show="vm.saveError">
-                        <div class="alert alert-error">
-                            <div><strong>{{vm.saveError.errorMsg}}</strong></div>
-                            <div>{{vm.saveError.data.message}}</div>
-                        </div>
-                    </div>
-
-                    <div ng-show="vm.saveSuccces">
-                        <div class="alert alert-success">
-                            <localize key="speechBubbles_permissionsSavedFor">Permissions saved for</localize><strong> {{currentNode.name}}</strong>
-                        </div>
-                    </div>
-
-                    <h5 id="content_rights_title"><localize key="defaultdialogs_permissionsSet">Set permissions for</localize> {{ currentNode.name }}</h5>
-                    <p id="content_rights_description" class="abstract" style="margin-bottom: 20px;"><localize key="defaultdialogs_permissionsHelp">Select the users groups you want to set permissions for</localize></p>
-
-                    <div style="position: relative; display: inline-block; margin-bottom: 20px;">
-                        <umb-button
-                            type="button"
-                            button-style="info"
-                            label-key="defaultdialogs_permissionsSet"
-                            action="vm.groupsDropdownOpen = !vm.groupsDropdownOpen"
-                            has-popup="true"
-                            is-expanded="vm.groupsDropdownOpen === undefined ? false : vm.groupsDropdownOpen"
-                            add-ellipsis="true">
-                        </umb-button>
-
-                        <umb-dropdown ng-if="vm.groupsDropdownOpen" on-close="vm.groupsDropdownOpen = false" deep-blur="vm.groupsDropdownOpen = !vm.groupsDropdownOpen">
-                            <umb-dropdown-item ng-repeat="group in vm.availableUserGroups | filter:{selected: '!true'}">
-                                <button type="button" ng-click="vm.editPermissions(group)">
-                                    <umb-icon icon="{{group.icon}}"></umb-icon>
-                                    {{group.name}}
-                                </button>
-                            </umb-dropdown-item>
-                        </umb-dropdown>
-
-                    </div>
-
-                    <div umb-set-dirty-on-change="{{vm.selectedUserGroups}}">
-                        <umb-user-group-preview
-                            ng-repeat="group in vm.selectedUserGroups"
-                            icon="group.icon"
-                            name="group.name"
-                            hide-content-start-node="true"
-                            hide-media-start-node="true"
-                            permissions="group.allowedPermissions"
-                            allow-remove="true"
-                            allow-edit="true"
-                            on-remove="vm.removePermissions($index, vm.selectedUserGroups)"
-                            on-edit="vm.editPermissions(group)">
-                        </umb-user-group-preview>
-                    </div>
-
-                </form>
-
-            </div>
-
-        </div>
-
-        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-            <umb-button
-                label-key="general_close"
-                disabled="vm.saveState === 'busy'"
-                action="vm.closeDialog()"
-                type="button"
-                button-style="link">
-            </umb-button>
-
-            <umb-button
-                label-key="buttons_save"
-                disabled="vm.saveState === 'busy'"
-                state="vm.saveState"
-                action="vm.save()"
-                type="button"
-                button-style="success">
-            </umb-button>
-        </div>
-
-    </div>
-
-    <!-- Manage permissions -->
-    <div ng-show="vm.viewState === 'managePermissions'">
-
-        <div class="umb-dialog-body" ng-cloak>
-            <div class="umb-pane block-form">
-                <h5>{{ vm.labels.permissionsSetForGroup }}</h5>
-                <umb-control-group
-                    ng-repeat="(category, permissions) in vm.selectedUserGroup.permissions"
-                    label="{{category}}">
-                    <umb-toggle-group items="permissions"></umb-toggle-group>
-                </umb-control-group>
-            </div>
-        </div>
-
-        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-
-            <umb-button
-                label-key="general_cancel"
-                action="vm.cancelManagePermissions()"
-                type="button"
-                button-style="link">
-            </umb-button>
-
-            <umb-button
-                label-key="actions_setPermissions"
-                action="vm.setPermissions(vm.selectedUserGroup)"
-                type="button"
-                button-style="success">
-            </umb-button>
-
-        </div>
-
-    </div>
-
-</div>
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/sort.html b/src/Umbraco.Web.UI.Client/src/views/content/sort.html
deleted file mode 100644
index b1d153464a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/sort.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<div ng-controller="Umbraco.Editors.Content.SortController as vm" ng-cloak>
-
-        <div class="umb-dialog-body with-footer sort-order">
-
-            <div class="umb-pane">
-
-                <div ng-if="vm.error" class="alert alert-error">
-                    <p>{{vm.error.errorMsg}}</p>
-                </div>
-
-                <umb-load-indicator
-                    ng-show="vm.loading">
-                </umb-load-indicator>
-
-                <div ng-if="!vm.loading">
-                    <p class="abstract"><localize key="sort_sortHelp">Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items</localize></p>
-                    <table class="table table-condensed table-sortable" ng-if="vm.children">
-                        <thead>
-                            <tr>
-                                <th colspan="2">
-                                    <button type="button" class="btn-reset" ng-click="vm.sort('name')">
-                                        <strong><localize key="general_name">Name</localize></strong>
-                                        <span ng-if="vm.sortOrder.column === 'name'">
-                                            <umb-icon icon="{{vm.sortOrder.reverse ? 'icon-navigation-up' : 'icon-navigation-down'}}"></umb-icon>
-                                        </span>
-                                    </button>
-                                </th>
-                                <th>
-                                    <button type="button" class="btn-reset" ng-click="vm.sort('createDate')">
-                                        <strong><localize key="sort_sortCreationDate">Creation date</localize></strong>
-                                        <span ng-if="vm.sortOrder.column === 'createDate'">
-                                            <umb-icon icon="{{vm.sortOrder.reverse ? 'icon-navigation-up' : 'icon-navigation-down'}}"></umb-icon>
-                                        </span>
-                                    </button>
-                                </th>
-                            </tr>
-                        </thead>
-                        <tbody ui-sortable="vm.sortableOptions" ng-model="vm.children">
-                            <tr ng-repeat="child in vm.children">
-                                <td class="tree-icon">
-                                    <umb-icon icon="{{child.icon}}"></umb-icon>
-                                </td>
-                                <td>{{child.name}}</td>
-                                <td>{{child.createDate}}</td>
-                            </tr>
-                        </tbody>
-                    </table>
-
-                    <umb-empty-state
-                        ng-if="!vm.children"
-                        position="center">
-                        <localize key="sort_sortEmptyState">This node has no child nodes to sort</localize>
-                    </umb-empty-state>
-                </div>
-
-            </div>
-
-        </div>
-
-        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-            <umb-button
-                type="button"
-                button-style="link"
-                action="vm.close()"
-                label-key="general_close">
-            </umb-button>
-            <umb-button
-                ng-if="vm.children"
-                type="button"
-                action="vm.save()"
-                state="vm.saveButtonState"
-                button-style="success"
-                label-key="buttons_save">
-            </umb-button>
-        </div>
-
-    </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/umbpreview.html b/src/Umbraco.Web.UI.Client/src/views/content/umbpreview.html
deleted file mode 100644
index f2693ec57a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/umbpreview.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <title>Loading</title>
-    <link href="/umbraco/assets/css/umbraco.min.css" type="text/css" rel="stylesheet">
-</head>
-<body class="content-column-body">
-</body>
-</html>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/create.controller.js
deleted file mode 100644
index 85e0dfe976..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/create.controller.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.ContentBlueprint.CreateController
- * @function
- *
- * @description
- * The controller for creating content blueprints
- */
-function ContentBlueprintCreateController($scope, $location, contentTypeResource, navigationService, appState) {
-
-    var vm = this;
-    var node = $scope.currentNode;
-    var section = appState.getSectionState("currentSection");
-
-    vm.createBlueprint = createBlueprint;
-    vm.close = close;
-
-    function onInit() {
-
-        vm.loading = true;
-
-        contentTypeResource.getAll()
-            .then(function (documentTypes) {
-                vm.documentTypes = documentTypes;
-                vm.loading = false;
-            });
-    }
-
-    function createBlueprint(documentType) {
-        $location.path("/" + section + "/contentBlueprints/edit/" + node.id).search("create", "true").search("doctype", documentType.alias);
-        navigationService.hideMenu();
-    }
-
-    function close() {
-        const showMenu = true;
-        navigationService.hideDialog(showMenu);
-    }
-
-    onInit();
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.ContentBlueprint.CreateController", ContentBlueprintCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/create.html b/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/create.html
deleted file mode 100644
index f58c330ce9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/create.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<div ng-controller="Umbraco.Editors.ContentBlueprint.CreateController as vm">
-
-    <div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
-
-        <div class="umb-pane">
-
-            <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
-            <p class="abstract">
-                <localize key="create_createContentBlueprint">Select the document type you want to make a content template for</localize>
-            </p>
-
-            <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-            <ul class="umb-actions umb-actions-child">
-                <li class="umb-action" ng-repeat="documentType in vm.documentTypes | orderBy:'name':false">
-                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createBlueprint(documentType)">
-                        <umb-icon icon="{{documentType.icon}}" class="icon large"></umb-icon>
-                        <span class="menu-label">
-                            {{documentType.name}}
-                            <small>{{documentType.description}}</small>
-                        </span>
-                    </button>
-                </li>
-            </ul>
-
-        </div>
-
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-
-        <umb-button label-key="buttons_somethingElse"
-                    action="vm.close()"
-                    type="button"
-                    button-style="info">
-        </umb-button>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/delete.controller.js
deleted file mode 100644
index 80c716732e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/delete.controller.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.ContentBlueprint.DeleteController
- * @function
- *
- * @description
- * The controller for deleting content blueprints
- */
-function ContentBlueprintDeleteController($scope, contentResource, treeService, navigationService) {
-
-    $scope.performDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        
-        contentResource.deleteBlueprint($scope.currentNode.id)
-            .then(function() {
-                $scope.currentNode.loading = false;
-                //get the root node before we remove it
-                var rootNode = treeService.getTreeRoot($scope.currentNode);
-                // TODO: Need to sync tree, etc...
-                treeService.removeNode($scope.currentNode);
-                navigationService.hideMenu();
-            });
-    };
-
-    $scope.cancel = function() {
-        navigationService.hideDialog();
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.ContentBlueprint.DeleteController", ContentBlueprintDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/delete.html b/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/delete.html
deleted file mode 100644
index f7f036178f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/delete.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.ContentBlueprint.DeleteController">
-    <div class="umb-dialog-body">
-
-        <p class="abstract">
-        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
-        </umb-confirm>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/edit.controller.js
deleted file mode 100644
index 15112650c6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/edit.controller.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Content.EditController
- * @function
- * 
- * @description
- * The controller for the content editor
- */
-function ContentBlueprintEditController($scope, $routeParams, contentResource) {
-    function getScaffold() {
-        return contentResource.getScaffold(-1, $routeParams.doctype)
-            .then(function (scaffold) {
-                return initialize(scaffold);
-            });
-    }
-
-    function getBlueprintById(id) {
-        return contentResource.getBlueprintById(id).then(function (blueprint) {
-            return initialize(blueprint);
-        });
-    }
-
-    function initialize(content) {
-        if (content.apps && content.apps.length) {
-            var contentApp = _.find(content.apps, function (app) {
-                return app.alias === "umbContent";
-            });
-            if (contentApp) {
-                content.apps = [contentApp];
-            } else {
-                content.apps = [];
-            }
-        }
-        content.allowPreview = false;
-        content.allowedActions = ["A", "S", "C"];
-        return content;
-    }
-
-    $scope.contentId = $routeParams.id;
-    $scope.isNew = $routeParams.id === "-1";
-    $scope.saveMethod = contentResource.saveBlueprint;
-    $scope.getMethod = getBlueprintById;
-    $scope.getScaffoldMethod = getScaffold;
-
-    //load the default culture selected in the main tree if any
-    $scope.culture = $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture;
-    $scope.segment = $routeParams.csegment ? $routeParams.csegment : null;
-
-    //Bind to $routeUpdate which will execute anytime a location changes but the route is not triggered.
-    //This is so we can listen to changes on the cculture parameter since that will not cause a route change
-    //and then we can pass in the updated culture to the editor.
-    //This will also execute when we are redirecting from creating an item to a newly created item since that
-    //will not cause a route change and so we can update the isNew and contentId flags accordingly.
-    $scope.$on('$routeUpdate', function (event, next) {
-        $scope.culture = next.params.cculture ? next.params.cculture : $routeParams.mculture;
-        $scope.segment = next.params.csegment ? next.params.csegment : null;
-        $scope.isNew = $routeParams.id === "-1";
-        $scope.contentId = $routeParams.id;
-    });
-
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.ContentBlueprint.EditController", ContentBlueprintEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/edit.html b/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/edit.html
deleted file mode 100644
index 751bbe5970..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/edit.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div ng-controller="Umbraco.Editors.ContentBlueprint.EditController">
-  <content-editor content-id="contentId"
-                  save-method="saveMethod"
-                  get-method="getMethod"
-                  get-scaffold-method="getScaffoldMethod"
-                  is-new="isNew"
-                  tree-alias="contentblueprints"
-                  culture="culture"
-                  segment="segment">
-  </content-editor>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/intro.html b/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/intro.html
deleted file mode 100644
index 57c29d31d6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/contentBlueprints/intro.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<div class="clearfix">
-    <umb-editor-view footer="false">
-
-        <umb-editor-header 
-            name="'Content Templates'"
-            name-locked="true"
-            hide-icon="true"
-            hide-description="true"                           
-            hide-alias="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-box>
-                <umb-box-content class="content-templates-dashboard">
-                    <h3>
-                        <localize key="contentTemplatesDashboard_whatHeadline">What are Content Templates?</localize>
-                    </h3>
-                    <p>
-                        <localize key="contentTemplatesDashboard_whatDescription">Content Templates are pre-defined content that can be selected when creating a new content node.</localize>
-                    </p>
-                    
-                    <h4 class="bold">
-                        <localize key="contentTemplatesDashboard_createHeadline">How do I create a Content Template?</localize>
-                    </h4>
-                    <localize key="contentTemplatesDashboard_createDescription">
-                        <p>There are two ways to create a Content Template:</p>
-                        <ul>
-                            <li>Right-click a content node and select "Create Content Template" to create a new Content Template.</li>
-                            <li>Right-click the Content Templates tree in the Settings section and select the Document Type you want to create a Content Template for.</li>
-                        </ul>
-                        <p>Once given a name, editors can start using the Content Template as a foundation for their new page.</p>
-                    </localize>
-
-                    <h4 class="bold">
-                        <localize key="contentTemplatesDashboard_manageHeadline">How do I manage Content Templates?</localize>
-                    </h4>
-                    <p>
-                        <localize key="contentTemplatesDashboard_manageDescription">You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Just expand the Document Type which the Content Template is based on and click it to edit or delete it.</localize>
-                    </p>
-                </umb-box-content>
-            </umb-box>
-
-        </umb-editor-container>
-
-    </umb-editor-view>
-</div>
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/ChangePassword.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/ChangePassword.html
deleted file mode 100644
index 8a2a524fe4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/ChangePassword.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<form novalidate name="passwordForm"
-    ng-controller="Umbraco.Dashboard.StartupChangePasswordController"
-    ng-submit="changePassword()"
-    val-form-manager>
-
-    <h3><localize key="user_changePassword">Change password</localize></h3>
-    
-    <umb-pane>
-        
-        <umb-property-editor model="changePasswordModel"></umb-property-editor>   
-        
-        <umb-control-group hideLabel="1">
-            <button class="btn btn-primary">
-                <localize key="user_change">Change</localize>
-            </button>
-        </umb-control-group>			
-    </umb-pane>
-</form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/overlays/delete.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/overlays/delete.html
deleted file mode 100644
index e3fa61ccfa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/overlays/delete.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div>
-
-    <div ng-if="model.redirect" class="umb-alert umb-alert--warning mb2">
-        <localize key="redirectUrls_redirectRemoveWarning">This will remove the redirect</localize><br><br>
-        <localize key="redirectUrls_originalUrl">Original URL</localize>: {{model.redirect.originalUrl}}<br>
-        <localize key="redirectUrls_redirectedTo">Redirected To</localize>: {{model.redirect.destinationUrl}}
-    </div>
-
-    <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>?
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/overlays/disable.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/overlays/disable.html
deleted file mode 100644
index 678fcd6e9a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/overlays/disable.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-
-    <localize key="redirectUrls_confirmDisable">Are you sure you want to disable the URL tracker?</localize>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.controller.js
deleted file mode 100644
index cca8a26c9b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.controller.js
+++ /dev/null
@@ -1,220 +0,0 @@
-(function() {
-    "use strict";
-
-    function RedirectUrlsController($scope, $q, redirectUrlsResource, notificationsService, localizationService, eventsService, overlayService) {
-        // TODO: search by url or url part
-        // TODO: search by domain
-        // TODO: display domain in dashboard results?
-
-        // used to cancel any request in progress if another one needs to take it's place
-        var vm = this;
-        var canceler = null;
-
-        vm.dashboard = {
-            searchTerm: "",
-            loading: false,
-            urlTrackerDisabled: false,
-            userIsAdmin: false
-        };
-
-        vm.pagination = {
-            pageIndex: 0,
-            pageNumber: 1,
-            totalPages: 1,
-            pageSize: 20
-        };
-
-        vm.goToPage = goToPage;
-        vm.search = search;
-        vm.removeRedirect = removeRedirect;
-        vm.disableUrlTracker = disableUrlTracker;
-        vm.enableUrlTracker = enableUrlTracker;
-        vm.filter = filter;
-        vm.checkEnabled = checkEnabled;
-
-        function activate() {            
-            vm.checkEnabled().then(function() {
-                vm.search();
-            });
-        }
-
-        function checkEnabled() {
-            vm.dashboard.loading = true;
-            return redirectUrlsResource.getEnableState().then(function (response) {
-                vm.dashboard.urlTrackerDisabled = response.enabled !== true;
-                vm.dashboard.userIsAdmin = response.userIsAdmin;
-                vm.dashboard.loading = false;
-            });
-        }
-
-        function goToPage(pageNumber) {
-            vm.pagination.pageIndex = pageNumber - 1;
-            vm.pagination.pageNumber = pageNumber;
-            vm.search();
-        }
-
-        function search() {
-
-            vm.dashboard.loading = true;
-
-            var searchTerm = vm.dashboard.searchTerm;
-            if (searchTerm === undefined) {
-                searchTerm = "";
-            }
-
-            redirectUrlsResource.searchRedirectUrls(searchTerm, vm.pagination.pageIndex, vm.pagination.pageSize).then(function(response) {
-
-                vm.redirectUrls = response.searchResults;
-
-                // update pagination
-                vm.pagination.pageIndex = response.currentPage;
-                vm.pagination.pageNumber = response.currentPage + 1;
-                vm.pagination.totalPages = response.pageCount;
-
-                vm.dashboard.loading = false;
-
-            });
-        }
-
-        function disableUrlTracker(event) {
-
-            const dialog = {
-                view: "views/dashboard/content/overlays/disable.html",
-                submitButtonLabel: "Disable",
-                submitButtonLabelKey: "actions_disable",
-                submitButtonStyle:"danger",
-                submit: function (model) {
-                    performDisable();
-                    overlayService.close();
-                },
-                close: function () {
-                    overlayService.close();
-                }
-            };
-
-            localizationService.localize("redirectUrls_disableUrlTracker").then(value => {
-                dialog.title = value;
-                overlayService.open(dialog);
-            });
-
-            event.preventDefault()
-            event.stopPropagation();
-        }
-
-        function removeRedirect(redirect, event) {
-
-            const dialog = {
-                view: "views/dashboard/content/overlays/delete.html",
-                redirect: redirect,
-                submitButtonLabelKey: "contentTypeEditor_yesDelete",
-                submitButtonStyle: "danger",
-                submit: function (model) {
-                    performDelete(model.redirect);
-                    overlayService.close();
-                },
-                close: function () {
-                    overlayService.close();
-                }
-            };
-
-            localizationService.localize("general_delete").then(value => {
-                dialog.title = value;
-                overlayService.open(dialog);
-            });
-
-            event.preventDefault()
-            event.stopPropagation();
-        }
-
-        function performDisable() {
-
-            redirectUrlsResource.toggleUrlTracker(true).then(function () {
-                activate();
-                localizationService.localize("redirectUrls_disabledConfirm").then(function (value) {
-                    notificationsService.success(value);
-                });
-            }, function (error) {
-                localizationService.localize("redirectUrls_disableError").then(function (value) {
-                    notificationsService.warning(value);
-                });
-            });
-        }
-
-        function performDelete(redirect) {
-            redirect.deleteButtonState = "busy";
-
-            redirectUrlsResource.deleteRedirectUrl(redirect.redirectId).then(function () {
-
-                // emit event
-                var args = { redirect: redirect };
-                eventsService.emit("editors.redirects.redirectDeleted", args);
-
-                // remove from list
-                var index = vm.redirectUrls.indexOf(redirect);
-                vm.redirectUrls.splice(index, 1);
-
-                localizationService.localize("redirectUrls_redirectRemoved").then(function (value) {
-                    notificationsService.success(value);
-                });
-
-                // check if new redirects needs to be loaded
-                if (vm.redirectUrls.length === 0 && vm.pagination.totalPages > 1) {
-
-                    // if we are not on the first page - get records from the previous
-                    if (vm.pagination.pageIndex > 0) {
-                        vm.pagination.pageIndex = vm.pagination.pageIndex - 1;
-                        vm.pagination.pageNumber = vm.pagination.pageNumber - 1;
-                    }
-
-                    search();
-                }
-            }, function (error) {
-                redirect.deleteButtonState = "error";
-
-                localizationService.localize("redirectUrls_redirectRemoveError").then(function (value) {
-                    notificationsService.error(value);
-                });
-            });
-        }
-
-        function enableUrlTracker() {
-            redirectUrlsResource.toggleUrlTracker(false).then(function () {
-                activate();
-                localizationService.localize("redirectUrls_enabledConfirm").then(function (value) {
-                    notificationsService.success(value);
-                });
-            }, function (error) {
-                localizationService.localize("redirectUrls_enableError").then(function (value) {
-                    notificationsService.warning(value);
-                });
-            });
-        }
-
-        var filterDebounced = _.debounce(function(e) {
-
-            $scope.$apply(function() {
-
-                //a canceler exists, so perform the cancelation operation and reset
-                if (canceler) {
-                    canceler.resolve();
-                    canceler = $q.defer();
-                } else {
-                    canceler = $q.defer();
-                }
-
-                vm.search();
-
-            });
-
-        }, 200);
-
-        function filter() {
-            vm.dashboard.loading = true;
-            filterDebounced();
-        }
-
-        activate();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Dashboard.RedirectUrlsController", RedirectUrlsController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html
deleted file mode 100644
index 284a879f07..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<div class="redirecturlsearch" ng-controller="Umbraco.Dashboard.RedirectUrlsController as vm">
-
-    <umb-load-indicator ng-if="vm.dashboard.loading"></umb-load-indicator>
-
-    <umb-editor-sub-header>
-
-        <umb-editor-sub-header-content-right>
-
-            <umb-editor-sub-header-section ng-if="vm.dashboard.userIsAdmin === true">
-
-                <umb-button
-                    ng-if="vm.dashboard.urlTrackerDisabled === false"
-                    type="button"
-                    size="s"
-                    action="vm.disableUrlTracker($event)"
-                    label-key="redirectUrls_disableUrlTracker"
-                    button-style="danger">
-                </umb-button>
-
-                <umb-button
-                    ng-if="vm.dashboard.urlTrackerDisabled === true"
-                    type="button"
-                    size="s"
-                    button-style="success"
-                    action="vm.enableUrlTracker()"
-                    label-key="redirectUrls_enableUrlTracker">
-                </umb-button>
-
-            </umb-editor-sub-header-section>
-
-            <umb-editor-sub-header-section ng-if="vm.dashboard.urlTrackerDisabled === false">
-
-                <ng-form novalidate>
-                    <div class="inner-addon left-addon">
-                        <umb-search-filter
-                            input-id="redirect-search"
-                            model="vm.dashboard.searchTerm"
-                            label-key="general_typeToSearch"
-                            text="Type to search"
-                            on-change="vm.filter()"
-                            prevent-submit-on-enter="true">
-                        </umb-search-filter>
-                    </div>
-                </ng-form>
-
-            </umb-editor-sub-header-section>
-
-        </umb-editor-sub-header-content-right>
-
-    </umb-editor-sub-header>
-
-    <div class="umb-table" ng-if="vm.redirectUrls.length > 0 && vm.dashboard.loading === false" ng-class="{'umb-table-inactive': vm.dashboard.urlTrackerDisabled === true}">
-
-        <div class="umb-table-head">
-            <div class="umb-table-row">
-                <div class="umb-table-cell not-fixed flx-s1 flx-g1 flx-b1"><localize key="redirectUrls_culture">Culture</localize></div>
-                <div class="umb-table-cell flx-s1 flx-g1 flx-b4"><localize key="redirectUrls_originalUrl">Original URL</localize></div>
-                <div class="umb-table-cell flx-s0 flx-g0" style="flex-basis: 20px;"></div>
-                <div class="umb-table-cell flx-s1 flx-g1 flx-b5"><localize key="redirectUrls_redirectedTo">Redirected To</localize></div>
-            </div>
-        </div>
-
-        <div class="umb-table-body">
-
-            <div class="umb-table-row -solid" ng-repeat="redirect in vm.redirectUrls">
-
-                <div class="umb-table-cell not-fixed flx-s1 flx-g1 flx-b1">
-                    {{redirect.culture ||'*'}}
-                </div>
-                <div class="umb-table-cell flx-s1 flx-g1 flx-b4">
-                    <a class="umb-table-body__link" href="{{redirect.originalUrl}}" target="_blank" rel="noopener" title="{{redirect.originalUrl}}">{{redirect.originalUrl}}</a>
-                </div>
-
-                <div class="umb-table-cell flx-s0 flx-g0" style="flex-basis: 20px;">
-                    <umb-icon icon="icon-arrow-right" class="umb-table-body__icon umb-table-body__fileicon" style="font-size: 12px; line-height: 1;"></umb-icon>
-                </div>
-
-                <div class="umb-table-cell flx-s1 flx-g1 flx-b5 items-center">
-                    <div class="flx-s1 flx-g1 flx-b0" style="margin-right: 20px;">
-                        <a class="umb-table-body__link" href="{{redirect.destinationUrl}}" target="_blank" rel="noopener" title="{{redirect.destinationUrl}}">{{redirect.destinationUrl}}</a>
-                    </div>
-                    <umb-button
-                        type="button"
-                        button-style="danger"
-                        size="xs"
-                        state="redirect.deleteButtonState"
-                        action="vm.removeRedirect(redirect, $event)"
-                        label-key="general_remove">
-                    </umb-button>
-                </div>
-
-            </div>
-
-        </div>
-
-    </div>
-
-    <umb-box ng-if="vm.redirectUrls.length === 0 && vm.dashboard.searchTerm.length === 0 && !vm.dashboard.loading">
-        <umb-box-content class="block-form">
-
-            <umb-empty-state size="small">
-                <div>
-                    <localize key="redirectUrls_noRedirects">No redirects have been made</localize>
-                </div>
-                <small class="faded">
-                    <localize key="redirectUrls_noRedirectsDescription">When a published page gets renamed or moved a redirect will
-                        automatically be made to the new page</localize>
-                </small>
-            </umb-empty-state>
-
-        </umb-box-content>
-    </umb-box>
-
-    <umb-box ng-if="vm.redirectUrls.length === 0 && vm.dashboard.searchTerm.length > 0 && !vm.dashboard.loading">
-        <umb-box-content class="block-form">
-
-            <umb-empty-state size="small">
-                <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
-            </umb-empty-state>
-
-        </umb-box-content>
-    </umb-box>
-
-    <div class="flex justify-center items-center">
-        <umb-pagination
-            ng-if="vm.pagination.totalPages > 1 && !vm.dashboard.loading"
-            page-number="vm.pagination.pageNumber"
-            total-pages="vm.pagination.totalPages"
-            on-next="vm.goToPage"
-            on-prev="vm.goToPage"
-            on-go-to-page="vm.goToPage">
-        </umb-pagination>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
deleted file mode 100644
index b7c07f48a7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
+++ /dev/null
@@ -1,176 +0,0 @@
-function startUpVideosDashboardController($scope, dashboardResource) {
-    $scope.videos = [];
-    $scope.init = function(url){
-
-        dashboardResource.getRemoteXmlData('COM', url).then(function (data) {
-            var feed = $(data.data);
-              $('item', feed).each(function (i, item) {
-                  var video = {};
-                  video.thumbnail = $(item).find('thumbnail').attr('url');
-                  video.title = $("title", item).text();
-                  video.link = $("guid", item).text();
-                  $scope.videos.push(video);
-              });
-
-        },
-        function (exception) {
-            console.error('ex from remote data', exception);
-        });
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Dashboard.StartupVideosController", startUpVideosDashboardController);
-
-
-function startUpDynamicContentController($q, $timeout, $scope, dashboardResource, assetsService, tourService, eventsService) {
-    var vm = this;
-    var evts = [];
-
-    vm.loading = true;
-    vm.showDefault = false;
-
-    vm.startTour = startTour;
-
-    function onInit() {
-        // load tours
-        tourService.getGroupedTours().then(function(groupedTours) {
-            vm.tours = groupedTours;
-        });
-    }
-
-    function startTour(tour) {
-        tourService.startTour(tour);
-    }
-
-    // default dashboard content
-    vm.defaultDashboard = {
-        infoBoxes: [
-            {
-                title: "Documentation",
-                description: "Find the answers to your Umbraco questions",
-                url: "https://docs.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=documentation/"
-            },
-            {
-                title: "Community",
-                description: "Find the answers or ask your Umbraco questions",
-                url: "https://our.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=our_forum"
-            },
-            {
-                title: "Umbraco.tv",
-                description: "Tutorial videos (some are free, some are on subscription)",
-                url: "https://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=tutorial_videos"
-            },
-            {
-                title: "Training",
-                description: "Real-life training and official Umbraco certifications",
-                url: "https://umbraco.com/training/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=training"
-            }
-        ],
-        articles: [
-            {
-                title: "Umbraco.TV - Learn from the source!",
-                description: "Umbraco.TV will help you go from zero to Umbraco hero at a pace that suits you. Our easy to follow online training videos will give you the fundamental knowledge to start building awesome Umbraco websites.",
-                img: "views/dashboard/default/umbracotv.png",
-                url: "https://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=tv",
-                altText: "Umbraco.TV - Hours of Umbraco Video Tutorials",
-                buttonText: "Visit Umbraco.TV"
-            },
-            {
-                title: "Our Umbraco - The Friendliest Community",
-                description: "Our Umbraco - the official community site is your one stop for everything Umbraco. Whether you need a question answered or looking for cool plugins, the world's best and friendliest community is just a click away.",
-                img: "views/dashboard/default/ourumbraco.png",
-                url: "https://our.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=our",
-                altText: "Our Umbraco",
-                buttonText: "Visit Our Umbraco"
-            }
-        ]
-    };
-
-    evts.push(eventsService.on("appState.tour.complete", function (name, completedTour) {
-        $timeout(function(){
-            Utilities.forEach(vm.tours, tourGroup => {
-                Utilities.forEach(tourGroup, tour => {
-                    if (tour.alias === completedTour.alias) {
-                        tour.completed = true;
-                    }
-                });
-            });
-        });
-    }));
-
-    //proxy remote css through the local server
-    assetsService.loadCss(dashboardResource.getRemoteDashboardCssUrl("content"), $scope);
-
-    dashboardResource.getRemoteDashboardContent("content").then(data => {
-
-        vm.loading = false;
-
-        //test if we have received valid data
-        //we capture it like this, so we avoid UI errors - which automatically triggers ui based on http response code
-        if (data && data.sections) {
-            vm.dashboard = data;
-        } else {
-            vm.showDefault = true;
-        }
-    },
-    function (exception) {
-        console.error(exception);
-        vm.loading = false;
-        vm.showDefault = true;
-    });
-
-    onInit();
-
-}
-
-angular.module("umbraco").controller("Umbraco.Dashboard.StartUpDynamicContentController", startUpDynamicContentController);
-
-function startupLatestEditsController($scope) {
-
-}
-angular.module("umbraco").controller("Umbraco.Dashboard.StartupLatestEditsController", startupLatestEditsController);
-
-function MediaFolderBrowserDashboardController($scope, $routeParams, $location, contentTypeResource, userService) {
-
-    var currentUser = {};
-
-    userService.getCurrentUser().then(function (user) {
-
-        currentUser = user;
-
-        // check if the user has access to the root which they will require to see this dashboard
-        if (currentUser.startMediaIds.indexOf(-1) >= 0) {
-
-            //get the system media listview
-            contentTypeResource.getPropertyTypeScaffold(-96)
-                .then(function(dt) {
-
-                    $scope.fakeProperty = {
-                        alias: "contents",
-                        config: dt.config,
-                        description: "",
-                        editor: dt.editor,
-                        hideLabel: true,
-                        id: 1,
-                        label: "Contents:",
-                        validation: {
-                            mandatory: false,
-                            pattern: null
-                        },
-                        value: "",
-                        view: dt.view
-                    };
-
-                    // tell the list view to list content at root
-                    $routeParams.id = -1;
-            });
-
-        } else if (currentUser.startMediaIds.length > 0){
-            // redirect to start node
-            $location.path("/media/media/edit/" + (currentUser.startMediaIds.length === 0 ? -1 : currentUser.startMediaIds[0]));
-        }
-
-    });
-
-}
-angular.module("umbraco").controller("Umbraco.Dashboard.MediaFolderBrowserDashboardController", MediaFolderBrowserDashboardController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardVideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardVideos.html
deleted file mode 100644
index 43061b4f96..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardVideos.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<h3>Hours of Umbraco training videos are only a click away</h3>
-<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="https://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> for even more Umbraco videos</p>
-
-<h4>To get you started:</h4>
-<div class="row-fluid"
-	ng-init="init('https://umbraco.tv/videos/implementor/chapterrss?sort=no')"
-	ng-controller="Umbraco.Dashboard.StartupVideosController">
-
-	<ul class="thumbnails">
-		<li class="span2" ng-repeat="video in videos">
-	    	<div class="thumbnail" style="margin-right: 20px">
-		    	<a target="_blank" rel="noopener" href="{{video.link}}" title="{{video.title}}">
-		    		<img ng-src="{{video.thumbnail}}"  alt="{{video.title}}">
-		    	</a>
-	    	</div>
-	    </li>
-	</ul>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.png b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.png
deleted file mode 100644
index d0fb4e6235..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/startupdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/startupdashboardintro.html
deleted file mode 100644
index 330548bedd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/startupdashboardintro.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<div class="umb-dashboard-grid" ng-controller="Umbraco.Dashboard.StartUpDynamicContentController as vm">
-
-    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-    <div class="row clearfix" ng-if="vm.dashboard">
-        <!-- Sections -->
-        <div class="grid-section" ng-repeat="section in vm.dashboard.sections">
-            <div class="{{'span' + section.grid + ' column dash-section'}}">
-
-                <!-- rows -->
-                <div class="row clearfix dash-row" ng-repeat="row in section.rows">
-                    <div class="dash-inner-row">
-
-                        <!-- areas -->
-                        <div ng-repeat="area in row.areas"
-                             class="{{'span' + area.grid + ' column dash-area'}}">
-                            <div class="dash-inner-area">
-
-                                <!-- Controls -->
-                                <div ng-repeat="control in area.controls" class="dash-control dash-control-{{control.alias}}">
-                                    <div class="dash-inner-control">
-                                        <div ng-bind-html="control.html | safe_html"></div>
-                                    </div>
-                                </div>
-                                <!-- Controls end -->
-                            </div>
-                        </div>
-                        <!-- Area end -->
-                    </div>
-                </div>
-            </div>
-            <!-- Section end -->
-
-        </div>
-    </div>
-    <!-- grid container end -->
-
-    <!-- Default content in case we cannot fetch content from the outside -->
-    <div style="max-width: 1200px" ng-if="vm.showDefault">
-
-        <div class="welcome-dashboard__intro">
-            <h1 class="welcome-dashboard__title">
-                <localize key="startupDashboard_fallbackHeadline">Welcome to The Friendly CMS</localize>
-            </h1>
-            <p class="welcome-dashboard__intro-text">
-                <localize key="startupDashboard_fallbackDescription">Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible.</localize>
-            </p>
-        </div>
-
-        <div class="welcome-dashboard__info-box-boxes">
-            <a ng-href="{{infoBox.url}}" href="" target="_blank" rel="noreferrer" class="welcome-dashboard__info-box" ng-repeat="infoBox in vm.defaultDashboard.infoBoxes">
-                <div class="welcome-dashboard__info-box-title">{{infoBox.title}}</div>
-                <div class="welcome-dashboard__info-box-description">{{infoBox.description}}</div>
-            </a>
-        </div>
-
-        <div class="welcome-dashboard__cards">
-            <div class="welcome-dashboard__card" ng-repeat="article in vm.defaultDashboard.articles">
-                <div class="welcome-dashboard__card-image-wrapper">
-                    <a ng-href="{{article.url}}" href="" target="_blank" rel="noreferrer">
-                        <img class="welcome-dashboard__card-image" ng-src="{{article.img}}" alt="{{article.altText}}" />
-                    </a>
-                </div>
-                <div class="welcome-dashboard__card-content">
-                    <h2 class="welcome-dashboard__card-title">{{article.title}}</h2>
-                    <div class="welcome-dashboard__card-teaser">{{article.description}}</div>
-                    <a class="button" ng-href="{{article.url}}" href="" target="_blank" rel="noreferrer">{{article.buttonText}}</a>
-                </div>
-            </div>
-        </div>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.png b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.png
deleted file mode 100644
index 173d2f36d0..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.png and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html
deleted file mode 100644
index f3a9b02134..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="umb-dashboards-forms-install">
-	<div class="installer-wrapper">
-
-		<div class="installer-intro">
-			<umb-icon icon="icon-umb-contour" class="icon"></umb-icon>
-			<h3>
-				<localize key="formsDashboard_formsHeadline">Umbraco Forms</localize>
-			</h3>
-		</div>
-
-    <p class="step-text">
-      <localize key="formsDashboard_formsDescription">Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!</localize>
-    </p>
-
-    <umb-button
-      class="forms-install-button"
-      type="link"
-      button-style="success"
-      label="Install"
-      label-key="general_readMore"
-      href-target="_blank"
-      href="https://our.umbraco.com/packages/developer-tools/umbraco-forms/">
-    </umb-button>
-
-	</div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
deleted file mode 100644
index 670fae2f6e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<h3>Hours of Umbraco training videos are only a click away</h3>
-<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="http://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> for even more Umbraco videos</p>
-
-<div class="row-fluid" 
-	ng-init="init('https://umbraco.tv/videos/implementor/chapterrss?sort=no')" 
-	ng-controller="Umbraco.Dashboard.StartupVideosController">
-
-    <div ng-show="videos.length">
-        <h4>To get you started:</h4>
-        <ul class="thumbnails" >
-            <li class="span2" ng-repeat="video in videos">
-                <div class="thumbnail" style="margin-right: 20px">
-                    <a target="_blank" rel="noopener" href="{{video.link}}" title="{{video.title}}">
-                        <img ng-src="{{video.thumbnail}}"  alt="{{video.title}}">
-                    </a>
-                </div>
-            </li>
-        </ul>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html
deleted file mode 100644
index 67d103c703..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div ng-controller="Umbraco.Dashboard.MediaFolderBrowserDashboardController">
-	<umb-property-editor ng-if="fakeProperty" model="fakeProperty"></umb-property-editor>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
deleted file mode 100644
index 1bb4d8bf03..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="row-fluid"
-	ng-init="init('feeds/videos/members')"
-	ng-controller="Umbraco.Dashboard.StartupVideosController">
-
-	<umb-box>
-		<umb-box-content>
-			<h3 class="bold"><localize key="settingsDashboardVideos_trainingHeadline">Hours of Umbraco training videos are only a click away</localize></h3>
-			<localize key="settingsDashboardVideos_learningBaseDescription">
-        <p>Want to master Umbraco? Spend a few minutes learning some best practices by visiting <a class="btn-link -underline" href="https://www.youtube.com/c/UmbracoLearningBase" target="_blank" rel="noopener">the Umbraco Learning Base Youtube channel</a>. Here you can find a bunch of video material covering many aspects of Umbraco.</p>
-      </localize>
-		</umb-box-content>
-	</umb-box>
-
-	<div ng-show="videos.length">
-        <h4><localize key="settingsDashboardVideos_getStarted">To get you started</localize>:</h4>
-        <ul class="thumbnails" >
-            <li class="span2" ng-repeat="video in videos">
-                <div class="thumbnail" style="margin-right: 20px">
-                    <a target="_blank" rel="noopener" href="{{video.link}}" title="{{video.title}}">
-                        <img ng-src="{{video.thumbnail}}" alt="{{video.title}}">
-                    </a>
-                </div>
-            </li>
-        </ul>
-	</div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/analytics.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/analytics.controller.js
deleted file mode 100644
index f7a591dc4a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/analytics.controller.js
+++ /dev/null
@@ -1,102 +0,0 @@
-(function () {
-  "use strict";
-
-  function AnalyticsController($q, analyticResource, localizationService, notificationsService) {
-
-    let sliderRef = null;
-
-    const vm = this;
-    vm.getConsentLevel = getConsentLevel;
-    vm.getAllConsentLevels = getAllConsentLevels;
-    vm.saveConsentLevel = saveConsentLevel;
-    vm.sliderChange = sliderChange;
-    vm.setup = setup;
-    vm.loading = true;
-    vm.consentLevel = '';
-    vm.consentLevels = [];
-    vm.val = 1;
-    vm.sliderOptions =
-      {
-        "start": 1,
-        "step": 1,
-        "tooltips": [false],
-        "range": {
-          "min": 1,
-          "max": 3
-        },
-        behaviour: 'smooth-steps-tap',
-        pips: {
-          mode: 'values',
-          density: 50,
-          values: [1, 2, 3],
-          format: {
-            to: function (value) {
-              return vm.consentLevels[value - 1];
-            },
-            from: function (value) {
-              return Number(value);
-            }
-          }
-        }
-      };
-    $q.all(
-      [getConsentLevel(),
-      getAllConsentLevels()
-    ]).then( () => {
-      vm.startPos = calculateStartPositionForSlider();
-      vm.sliderVal = vm.consentLevels[vm.startPos - 1];
-      vm.sliderOptions.start = vm.startPos;
-      vm.val = vm.startPos;
-      vm.sliderOptions.pips.format = {
-        to: function (value) {
-          return vm.consentLevels[value - 1];
-        },
-        from: function (value) {
-          return Number(value);
-        }
-      }
-      vm.loading = false;
-      if (sliderRef) {
-        sliderRef.noUiSlider.set(vm.startPos);
-      }
-
-    });
-
-    function setup(slider) {
-      sliderRef = slider;
-    }
-
-    function getConsentLevel() {
-      return analyticResource.getConsentLevel().then(function (response) {
-        vm.consentLevel = response;
-      })
-    }
-
-    function getAllConsentLevels(){
-      return analyticResource.getAllConsentLevels().then(function (response) {
-        vm.consentLevels = response;
-      })
-    }
-
-    function saveConsentLevel(){
-      analyticResource.saveConsentLevel(vm.sliderVal);
-      localizationService.localize("analytics_analyticsLevelSavedSuccess").then(function(value) {
-        notificationsService.success(value);
-      });
-    }
-
-    function sliderChange(values) {
-      const result = Math.round(Number(values[0]) - 1);
-      vm.sliderVal = vm.consentLevels[result];
-    }
-
-    function calculateStartPositionForSlider(){
-      let startPosition = vm.consentLevels.indexOf(vm.consentLevel) + 1;
-      if (startPosition === 0) {
-         return 2;// Default start value
-      }
-      return startPosition;
-    }
-  }
-    angular.module("umbraco").controller("Umbraco.Dashboard.AnalyticsController", AnalyticsController);
-  })();
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/analytics.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/analytics.html
deleted file mode 100644
index d4edf8c356..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/analytics.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<div ng-controller="Umbraco.Dashboard.AnalyticsController as vm">
-  <umb-box>
-    <umb-box-content>
-      <h3 class="bold">
-        <localize key="analytics_consentForAnalytics">Consent for telemetry data</localize>
-      </h3>
-      <div class="umb-healthcheck-help-text">
-        <localize key="analytics_analyticsDescription">
-          In order to improve Umbraco and add new functionality based on as relevant information as possible,
-          <br>we would like to collect system- and usage information from your installation.
-          <br>Aggregate data will be shared on a regular basis as well as learnings from these metrics.
-          <br>Hopefully, you will help us collect some valuable data.
-          <br>
-          <br>We <b>WILL NOT</b> collect any personal data such as content, code, user information, and all data will be fully anonymized.
-        </localize>
-        <div ng-if="!vm.loading" style="padding-left: 12px; padding-top: 50px; padding-bottom: 50px; width: 280px;">
-          <umb-range-slider
-            ng-model="vm.val"
-            on-setup="vm.setup(slider)"
-            options="vm.sliderOptions"
-            on-update="vm.sliderChange(values)">
-          </umb-range-slider>
-        </div>
-
-        <div ng-if="vm.sliderVal === 'Minimal'">
-          <localize key="analytics_minimalLevelDescription">We'll only send an anonymous site ID to let us know that the
-            site exists.
-          </localize>
-        </div>
-        <div ng-if="vm.sliderVal === 'Basic'">
-          <localize key="analytics_basicLevelDescription">We'll send site ID, umbraco version and packages installed
-          </localize>
-        </div>
-        <div ng-if="vm.sliderVal === 'Detailed'">
-          <localize key="analytics_detailedLevelDescription">
-            We will send:
-            <ul>
-              <li>Anonymized site ID, umbraco version, and packages installed.</li>
-              <li>Number of: Root nodes, Content nodes, Macros, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, and Property Editors in use.</li>
-              <li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li>
-              <li>Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, and if you are in debug mode.</li>
-            </ul>
-            <i>We might change what we send on the Detailed level in the future. If so, it will be listed above.
-            <br>By choosing "Detailed" you agree to current and future anonymized information being collected.</i>
-          </localize>
-        </div>
-      </div>
-      <div class="umb-panel-group__details-status-actions">
-        <umb-button type="button"
-                    button-style="success"
-                    label="Save"
-                    action="vm.saveConsentLevel()"
-                    ng-model="vm.sliderVal" ng-if="vm.consentLevel">
-        </umb-button>
-      </div>
-    </umb-box-content>
-  </umb-box>
-</div>
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js
deleted file mode 100644
index 117559d4cc..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js
+++ /dev/null
@@ -1,314 +0,0 @@
-function ExamineManagementController($http, $q, $timeout, umbRequestHelper, localizationService, overlayService, editorService) {
-
-    var vm = this;
-
-    vm.indexerDetails = [];
-    vm.searcherDetails = [];
-    vm.loading = true;
-    vm.viewState = "list";
-    vm.selectedIndex = null;
-    vm.selectedSearcher = null;
-    vm.searchResults = null;
-    vm.showSearchResultFields = [];
-
-    vm.showSelectFieldsDialog = showSelectFieldsDialog;
-    vm.showSearchResultDialog = showSearchResultDialog;
-    vm.showIndexInfo = showIndexInfo;
-    vm.showSearcherInfo = showSearcherInfo;
-    vm.search = search;
-    vm.toggle = toggle;
-    vm.rebuildIndex = rebuildIndex;
-    vm.setViewState = setViewState;
-    vm.nextSearchResultPage = nextSearchResultPage;
-    vm.prevSearchResultPage = prevSearchResultPage;
-    vm.goToPageSearchResultPage = goToPageSearchResultPage;
-    vm.goToResult = goToResult;
-
-    vm.infoOverlay = null;
-
-    function showSelectFieldsDialog() {
-        if (vm.searchResults) {
-
-            // build list of available fields
-            var availableFields = [];
-            vm.searchResults.results.map(r => Object.keys(r.values).map(key => {
-                if (availableFields.indexOf(key) == -1 && key != "__NodeId" && key != "nodeName") {
-                    availableFields.push(key);
-                }
-            }));
-
-            availableFields.sort();
-
-            editorService.open({
-                title: "Fields",
-                availableFields: availableFields,
-                fieldIsSelected: function(key) {
-                    return vm.showSearchResultFields.indexOf(key) > -1;
-                },
-                toggleField: vm.toggleField,
-                size: "small",
-                view: "views/dashboard/settings/examinemanagementfields.html",
-                close: function () {
-                    editorService.close();
-                }
-            });
-        }
-    }
-
-    function showSearchResultDialog(values) {
-        if (vm.searchResults) {
-            localizationService.localize("examineManagement_fieldValues").then(function (value) {
-                editorService.open({
-                    title: value,
-                    searchResultValues: values,
-                    size: "medium",
-                    view: "views/dashboard/settings/examinemanagementresults.html",
-                    close: function () {
-                        editorService.close();
-                    }
-                });
-            });
-        }
-    }
-
-    vm.toggleField = function(key) {
-        if (vm.showSearchResultFields.indexOf(key) > -1) {
-            vm.showSearchResultFields = vm.showSearchResultFields.filter(field => field != key);
-        }
-        else {
-            vm.showSearchResultFields.push(key);
-        }
-
-        vm.showSearchResultFields.sort();
-    };
-
-    function nextSearchResultPage(pageNumber) {
-        search(vm.selectedIndex ? vm.selectedIndex : vm.selectedSearcher, null, pageNumber);
-    }
-
-    function prevSearchResultPage(pageNumber) {
-        search(vm.selectedIndex ? vm.selectedIndex : vm.selectedSearcher, null, pageNumber);
-    }
-
-    function goToPageSearchResultPage(pageNumber) {
-        search(vm.selectedIndex ? vm.selectedIndex : vm.selectedSearcher, null, pageNumber);
-    }
-
-    function goToResult(result, event) {
-        if (!result.editUrl) {
-            return;
-        }
-        // targeting a new tab/window?
-        if (event.ctrlKey ||
-                event.shiftKey ||
-                event.metaKey || // apple
-                (event.button && event.button === 1) // middle click, >IE9 + everyone else
-        ) {
-            // yes, let the link open itself
-            return;
-        }
-
-        const editor = {
-            id: result.editId,
-            submit: function (model) {
-                editorService.close();
-            },
-            close: function () {
-                editorService.close();
-            }
-        };
-        switch (result.editSection) {
-            case "content":
-                editorService.contentEditor(editor);
-                break;
-            case "media":
-                editorService.mediaEditor(editor);
-                break;
-            case "member":
-                editorService.memberEditor(editor);
-                break;
-        }
-
-        event.stopPropagation();
-        event.preventDefault();
-    }
-
-    function setViewState(state) {
-        vm.searchResults = null;
-        vm.viewState = state;
-    }
-
-    function showIndexInfo(index) {
-        vm.selectedSearcher = null;
-        vm.selectedIndex = index;
-        setViewState("index-details");
-    }
-
-    function showSearcherInfo(searcher) {
-        vm.selectedIndex = null;
-        vm.selectedSearcher = searcher;
-        setViewState("searcher-details");
-    }
-
-    function checkProcessing(index, checkActionName) {
-        umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("examineMgmtBaseUrl",
-                    checkActionName,
-                    { indexName: index.name })),
-                'Failed to check index processing')
-            .then(function(data) {
-
-                if (data !== null && data !== "null") {
-
-                    //copy all resulting properties
-                    for (var k in data) {
-                        index[k] = data[k];
-                    }
-                    index.isProcessing = false;
-                } else {
-                    $timeout(() => {
-                            //don't continue if we've tried 100 times
-                            if (index.processingAttempts < 100) {
-                                checkProcessing(index, checkActionName);
-                                //add an attempt
-                                index.processingAttempts++;
-                            } else {
-                                //we've exceeded 100 attempts, stop processing
-                                index.isProcessing = false;
-                            }
-                        },
-                        1000);
-                }
-            });
-    }
-
-    function search(searcher, e, pageNumber) {
-
-        //deal with accepting pressing the enter key
-        if (e && e.keyCode !== 13) {
-            return;
-        }
-
-        if (!searcher) {
-            throw "searcher parameter is required";
-        }
-
-        searcher.isProcessing = true;
-
-        const pageIndex = pageNumber ? (pageNumber - 1) : 0;
-
-        umbRequestHelper.resourcePromise(
-                $http.get(umbRequestHelper.getApiUrl("examineMgmtBaseUrl",
-                    "GetSearchResults",
-                    {
-                        searcherName: searcher.name,
-                        query: encodeURIComponent(vm.searchText),
-                        pageIndex: pageIndex
-                    })),
-                'Failed to search')
-            .then(searchResults => {
-                searcher.isProcessing = false;
-                vm.searchResults = searchResults;
-                vm.searchResults.pageIndex = pageIndex;
-                vm.searchResults.pageNumber = pageNumber ? pageNumber : 1;
-                vm.searchResults.totalPages = Math.ceil(vm.searchResults.totalRecords / vm.searchResults.pageSize);
-                // add URLs to edit well known entities
-                _.each(vm.searchResults.results, function (result) {
-                    var section = result.values["__IndexType"][0];
-                    switch (section) {
-                        case "content":
-                        case "media":
-                            result.editUrl = "/" + section + "/" + section + "/edit/" + result.id;
-                            result.editId = result.id;
-                            result.editSection = section;
-                            break;
-                        case "member":
-                            result.editUrl = "/member/member/edit/" + result.values["__Key"][0];
-                            result.editId = result.values["__Key"][0];
-                            result.editSection = section;
-                            break;
-                    }
-                });
-            });
-    }
-
-    function toggle(provider, propName) {
-        if (provider[propName] !== undefined) {
-            provider[propName] = !provider[propName];
-        } else {
-            provider[propName] = true;
-        }
-    }
-
-    function rebuildIndex(index, event) {
-
-        const dialog = {
-            view: "views/dashboard/settings/overlays/examinemanagement.rebuild.html",
-            index: index,
-            submitButtonLabelKey: "general_ok",
-            submitButtonStyle :"danger",
-            submit: function (model) {
-                performRebuild(model.index);
-                overlayService.close();
-            },
-            close: function () {
-                overlayService.close();
-            }
-        };
-
-        localizationService.localize("examineManagement_rebuildIndex").then(value => {
-            dialog.title = value;
-            overlayService.open(dialog);
-        });
-
-        event.preventDefault()
-        event.stopPropagation();
-    }
-
-    function performRebuild(index) {
-        index.isProcessing = true;
-        index.processingAttempts = 0;
-
-        umbRequestHelper.resourcePromise(
-            $http.post(umbRequestHelper.getApiUrl("examineMgmtBaseUrl",
-                "PostRebuildIndex",
-                { indexName: index.name })),
-            'Failed to rebuild index')
-            .then(function () {
-
-                // rebuilding has started, nothing is returned accept a 200 status code.
-                // lets poll to see if it is done.
-                $timeout(() => { checkProcessing(index, "PostCheckRebuildIndex"), 1000 });
-
-            });
-    }
-
-    function init() {
-        // go get the data
-
-        //combine two promises and execute when they are both done
-        $q.all([
-
-                //get the indexer details
-                umbRequestHelper.resourcePromise(
-                    $http.get(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", "GetIndexerDetails")),
-                    'Failed to retrieve indexer details')
-                .then(function (data) {
-                    vm.indexerDetails = data;
-                }),
-
-                //get the searcher details
-                umbRequestHelper.resourcePromise(
-                    $http.get(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", "GetSearcherDetails")),
-                    'Failed to retrieve searcher details')
-                .then(data => {
-                    vm.searcherDetails = data;
-                })
-            ])
-            .then(() => { vm.loading = false });
-    }
-
-    init();
-}
-
-angular.module("umbraco").controller("Umbraco.Dashboard.ExamineManagementController", ExamineManagementController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html
deleted file mode 100644
index 7e6557bbfb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html
+++ /dev/null
@@ -1,462 +0,0 @@
-<div id="examineManagement" class="examine-management" ng-controller="Umbraco.Dashboard.ExamineManagementController as vm">
-
-    <div ng-show="vm.loading">
-        <umb-load-indicator></umb-load-indicator>
-    </div>
-
-    <div ng-hide="vm.loading">
-        <div ng-if="vm.viewState === 'list'" class="umb-panel-group__details">
-
-            <div class="umb-panel-group__details-group">
-
-                <div class="umb-panel-group__details-group-title">
-                    <div class="umb-panel-group__details-group-name"><localize key="examineManagement_indexers">Indexers</localize></div>
-                </div>
-
-                <div class="umb-panel-group__details-checks">
-                    <div class="umb-panel-group__details-check">
-                        <div class="umb-panel-group__details-check-title">
-                            <div class="umb-panel-group__details-check-name"><localize key="examineManagement_manageIndexes">Manage Examine's indexes</localize></div>
-                            <div class="umb-panel-group__details-check-description"><localize key="examineManagement_manageIndexesDescription">Allows you to view the details of each index and provides some tools for managing the indexes</localize></div>
-                        </div>
-
-                        <div class="umb-panel-group__details-status" ng-repeat="indexer in vm.indexerDetails">
-
-                            <div class="umb-panel-group__details-status-icon-container">
-                                <umb-icon icon="{{indexer.isHealthy ? 'icon-check' : 'icon-delete'}}"
-                                          ng-class="{'color-green' : indexer.isHealthy, 'color-red' : !indexer.isHealthy}">
-                                </umb-icon>
-                            </div>
-
-                            <div class="umb-panel-group__details-status-content">
-                                <div class="umb-panel-group__details-status-text">
-                                    <button type="button" class="btn-link -underline" ng-click="vm.showIndexInfo(indexer)">
-                                        {{indexer.name}}
-                                    </button>
-                                </div>
-                            </div>
-
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-
-            <br />
-
-            <div class="umb-panel-group__details-group">
-
-                <div class="umb-panel-group__details-group-title">
-                    <div class="umb-panel-group__details-group-name"><localize key="examineManagement_searchers">Searchers</localize></div>
-                </div>
-
-                <div class="umb-panel-group__details-checks">
-                    <div class="umb-panel-group__details-check">
-                        <div class="umb-panel-group__details-check-title">
-                            <div class="umb-panel-group__details-check-name"><localize key="examineManagement_configuredSearchers">Configured Searchers</localize></div>
-                            <div class="umb-panel-group__details-check-description"><localize key="examineManagement_configuredSearchersDescription">Shows properties and tools for any configured Searcher (i.e. such as a multi-index searcher)</localize></div>
-                        </div>
-
-                        <div class="umb-panel-group__details-status" ng-repeat="searcher in vm.searcherDetails">
-
-                            <div class="umb-panel-group__details-status-icon-container">
-                                <umb-icon icon="icon-info"></umb-icon>
-                            </div>
-
-                            <div class="umb-panel-group__details-status-content">
-                                <div class="umb-panel-group__details-status-text">
-                                    <button type="button" class="btn-link -underline" ng-click="vm.showSearcherInfo(searcher)">
-                                        {{searcher.name}}
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-
-        </div>
-
-        <div ng-if="vm.viewState === 'searcher-details'">
-
-            <umb-editor-sub-header>
-                <umb-editor-sub-header-content-left>
-                    <button type="button" class="umb-package-details__back-action" ng-click="vm.setViewState('list');"><span aria-hidden="true">&larr;</span> <localize key="general_backToOverview">Back to overview</localize></button>
-                </umb-editor-sub-header-content-left>
-            </umb-editor-sub-header>
-
-            <div class="umb-panel-group__details">
-
-                <div class="umb-panel-group__details-group">
-
-                    <div class="umb-panel-group__details-group-title">
-                        <div class="umb-panel-group__details-group-name">{{ vm.selectedSearcher.name }}</div>
-                    </div>
-
-                    <div class="umb-panel-group__details-checks">
-
-                        <!-- Search Tool -->
-
-                        <div class="umb-panel-group__details-check">
-
-                            <div class="umb-panel-group__details-check-title">
-                                <div class="umb-panel-group__details-check-name">
-                                    <localize key="general_search">Search</localize>
-                                </div>
-                                <div class="umb-panel-group__details-check-description">
-                                    <localize key="examineManagement_searchDescription">Search the index and view the results</localize>
-                                </div>
-                            </div>
-
-                            <div class="umb-panel-group__details-status">
-
-                                <div class="umb-panel-group__details-status-content">
-
-                                    <div class="umb-panel-group__details-status-actions">
-                                        <div class="umb-panel-group__details-status-action">
-                                            <ng-form name="searchTools">
-
-                                                <div class="row">
-                                                    <div class="flex">
-
-                                                        <div class="flex-auto">
-                                                            <umb-search-filter
-                                                                input-id="examine-search"
-                                                                model="vm.searchText"
-                                                                on-search="vm.search(vm.selectedIndex, $event)"
-                                                                label-key="placeholders_filter"
-                                                                text="Type to filter..."
-                                                                css-class="w-100">
-                                                            </umb-search-filter>
-                                                        </div>
-
-                                                        <umb-button disabled="vm.selectedSearcher.isProcessing"
-                                                                    type="button"
-                                                                    button-style="success"
-                                                                    action="vm.search(vm.selectedSearcher)"
-                                                                    label="Search"
-                                                                    label-key="general_search">
-                                                        </umb-button>
-
-                                                    </div>
-                                                </div>
-
-                                                <div ng-if="!vm.selectedSearcher.isProcessing && vm.searchResults">
-                                                    <br />
-
-                                                    <table class="table table-bordered table-condensed">
-                                                        <thead>
-                                                            <tr>
-                                                                <th class="score">Score</th>
-                                                                <th class="id">Id</th>
-                                                                <th><localize key="general_name">Name</localize></th>
-                                                            </tr>
-                                                        </thead>
-                                                        <tbody>
-                                                            <tr ng-repeat="result in vm.searchResults.results track by $index">
-                                                                <td>{{result.score}}</td>
-                                                                <td>{{result.id}}</td>
-                                                                <td>
-                                                                    <a ng-show="result.editUrl" ng-click="vm.goToResult(result, $event)" ng-href="#{{result.editUrl}}">{{ ::result.values['nodeName'] | umbCmsJoinArray:', '}}</a>
-                                                                    <span ng-hide="result.editUrl">{{ ::result.values['nodeName'] | umbCmsJoinArray:', '}}</span>
-                                                                    <button type="button" class="table__action-overlay color-green" ng-click="vm.showSearchResultDialog(result.values)">({{ ::result.fieldCount}} <localize key="examineManagement_fields">fields</localize>)</button>
-                                                                </td>
-                                                            </tr>
-                                                        </tbody>
-                                                    </table>
-
-                                                    <div class="flex justify-center">
-                                                        <umb-pagination page-number="vm.searchResults.pageNumber"
-                                                                        total-pages="vm.searchResults.totalPages"
-                                                                        on-next="vm.nextSearchResultPage"
-                                                                        on-prev="vm.prevSearchResultPage"
-                                                                        on-go-to-page="vm.goToPageSearchResultPage">
-                                                        </umb-pagination>
-                                                    </div>
-
-                                                </div>
-
-                                            </ng-form>
-                                        </div>
-                                    </div>
-
-                                </div>
-
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                </div>
-
-            </div>
-        </div>
-
-        <div ng-if="vm.viewState === 'index-details'">
-
-            <umb-editor-sub-header>
-                <umb-editor-sub-header-content-left>
-                    <button type="button" class="umb-package-details__back-action" ng-click="vm.setViewState('list');"><span aria-hidden="true">&larr;</span> <localize key="general_backToOverview">Back to overview</localize></button>
-                </umb-editor-sub-header-content-left>
-            </umb-editor-sub-header>
-
-
-            <div class="umb-panel-group__details">
-
-                <div class="umb-panel-group__details-group">
-
-                    <div class="umb-panel-group__details-group-title">
-                        <div class="umb-panel-group__details-group-name">{{ vm.selectedIndex.name }}</div>
-                    </div>
-
-                    <div class="umb-panel-group__details-checks">
-
-                        <!-- Health Status -->
-
-                        <div class="umb-panel-group__details-check">
-
-                            <div class="umb-panel-group__details-check-title">
-                                <div class="umb-panel-group__details-check-name"><localize key="examineManagement_healthStatus">Health status</localize></div>
-                                <div class="umb-panel-group__details-check-description"><localize key="examineManagement_healthStatusDescription">The health status of the index and if it can be read</localize></div>
-                            </div>
-
-                            <div class="umb-panel-group__details-status">
-
-                                <div class="umb-panel-group__details-status-icon-container">
-                                    <umb-icon icon="{{vm.selectedIndex.isHealthy ? 'icon-check' : 'icon-delete'}}"
-                                              ng-class="{ 'color-green' : vm.selectedIndex.isHealthy, 'color-red': !vm.selectedIndex.isHealthy}">
-                                    </umb-icon>
-                                </div>
-
-                                <div class="umb-panel-group__details-status-content">
-
-                                    <div class="umb-panel-group__details-status-text">
-                                        <div>{{vm.selectedIndex.healthStatus}}</div>
-                                        <div ng-show="!vm.selectedIndex" class="color-red">
-                                            <localize key="examineManagement_indexCannotRead">The index cannot be read and will need to be rebuilt</localize>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            </div>
-
-                        </div>
-
-                        <!-- Search Tool -->
-
-                        <div class="umb-panel-group__details-check">
-
-                            <div class="umb-panel-group__details-check-title">
-                                <div class="umb-panel-group__details-check-name"><localize key="general_search">Search</localize></div>
-                                <div class="umb-panel-group__details-check-description"><localize key="examineManagement_searchDescription">Search the index and view the results</localize></div>
-                            </div>
-
-                            <div class="umb-panel-group__details-status">
-
-                                <div class="umb-panel-group__details-status-content">
-
-                                    <div class="umb-panel-group__details-status-actions">
-                                        <div class="umb-panel-group__details-status-action">
-                                            <ng-form name="searchTools">
-
-                                                <div class="row">
-                                                    <div class="flex">
-
-                                                        <div class="flex-auto">
-                                                            <umb-search-filter
-                                                                input-id="examine-search"
-                                                                model="vm.searchText"
-                                                                on-search="vm.search(vm.selectedIndex, $event)"
-                                                                label-key="placeholders_filter"
-                                                                text="Type to filter..."
-                                                                css-class="w-100">
-                                                            </umb-search-filter>
-                                                        </div>
-
-                                                        <umb-button disabled="vm.selectedIndex.isProcessing"
-                                                                    type="button"
-                                                                    button-style="success"
-                                                                    action="vm.search(vm.selectedIndex)"
-                                                                    label="Search"
-                                                                    label-key="general_search">
-                                                        </umb-button>
-
-                                                    </div>
-                                                </div>
-
-                                                <div ng-if="!vm.selectedIndex.isProcessing && vm.searchResults">
-                                                    <br />
-                                                    <div class="result-table">
-                                                        <table class="table table-bordered table-condensed">
-                                                            <thead>
-                                                                <tr>
-                                                                    <th class="id nowrap" width="40">Id</th>
-                                                                    <th><localize key="general_name">Name</localize></th>
-                                                                    <th class="nowrap" ng-repeat="field in vm.showSearchResultFields">
-                                                                        <div class="flex justify-between">
-                                                                            <span>{{ field }}</span>
-                                                                            <button type="button" class="btn btn-mini btn-white ml-3" ng-click="vm.toggleField(field)">
-                                                                                &times;
-                                                                            </button>
-                                                                        </div>
-                                                                    </th>
-                                                                    <th class="tr nowrap" width="40">
-                                                                        <button type="button" class="btn btn-reset btn-link" style="font:inherit;color:inherit;" ng-click="vm.showSelectFieldsDialog()">Fields</button>
-                                                                    </th>
-                                                                    <th class="score tr nowrap" width="40">Score</th>
-                                                                </tr>
-                                                            </thead>
-                                                            <tbody>
-                                                                <tr ng-repeat="result in vm.searchResults.results track by $index" valign="top">
-                                                                    <td class="nowrap">{{result.id}}</td>
-                                                                    <td>
-                                                                        <a ng-show="result.editUrl" ng-click="vm.goToResult(result, $event)" ng-href="#{{result.editUrl}}">
-                                                                            {{ ::result.values['nodeName'] | umbCmsJoinArray:', ' }}
-                                                                        </a>
-                                                                        <span ng-hide="result.editUrl">{{ ::result.values['nodeName'] | umbCmsJoinArray:', ' }}</span>
-                                                                    </td>
-                                                                    <td ng-repeat="field in vm.showSearchResultFields">
-                                                                        {{ ::result.values[field] | umbCmsJoinArray:', ' }}
-                                                                    </td>
-                                                                    <td class="tr nowrap">
-                                                                        <button type="button"
-                                                                            class="table__action-overlay color-green"
-                                                                            ng-click="vm.showSearchResultDialog(result.values)">
-                                                                          ({{ ::result.fieldCount }} <localize key="examineManagement_fields">fields</localize>)
-                                                                        </button>
-                                                                    </td>
-                                                                    <td class="tr nowrap umb-avatar--white">
-                                                                        <span ng-attr-title="{{ result.score }}">
-                                                                            {{ ::result.score | number:4 }}
-                                                                        </span>
-                                                                    </td>
-                                                                </tr>
-                                                            </tbody>
-                                                            <tfoot>
-                                                                <tr>
-                                                                    <td colspan="{{vm.showSearchResultFields.length + 4}}">
-                                                                      <localize key="examineManagement_noResults" ng-if="::vm.searchResults.totalRecords === 0">
-                                                                        No results were found
-                                                                      </localize>
-                                                                      <localize key="examineManagement_searchResultsFound"
-                                                                                tokens="[(vm.searchResults.pageIndex * vm.searchResults.pageSize) + 1, (vm.searchResults.pageIndex * vm.searchResults.pageSize) + vm.searchResults.results.length, vm.searchResults.totalRecords, vm.searchResults.pageNumber, vm.searchResults.totalPages]"
-                                                                                watch-tokens="true"
-                                                                                ng-if="::vm.searchResults.totalRecords > 0">
-                                                                        Showing %0% - %1% of %2% result(s) - Page %3% of %4%
-                                                                      </localize>
-                                                                    </td>
-                                                                </tr>
-                                                            </tfoot>
-                                                        </table>
-                                                    </div>
-
-                                                    <div class="flex justify-center">
-                                                        <umb-pagination page-number="vm.searchResults.pageNumber"
-                                                                        total-pages="vm.searchResults.totalPages"
-                                                                        on-next="vm.nextSearchResultPage"
-                                                                        on-prev="vm.prevSearchResultPage"
-                                                                        on-go-to-page="vm.goToPageSearchResultPage">
-                                                        </umb-pagination>
-                                                    </div>
-
-                                                </div>
-
-                                            </ng-form>
-                                        </div>
-                                    </div>
-
-                                </div>
-
-                            </div>
-
-                        </div>
-
-                        <!-- Index Stats -->
-
-                        <div class="umb-panel-group__details-check">
-
-                            <div class="umb-panel-group__details-check-title">
-                                <div class="umb-panel-group__details-check-name"><localize key="examineManagement_indexInfo">Index info</localize></div>
-                                <div class="umb-panel-group__details-check-description"><localize key="examineManagement_indexInfoDescription">Lists the properties of the index</localize></div>
-                            </div>
-
-                            <div class="umb-panel-group__details-status">
-
-                                <div class="umb-panel-group__details-status-content">
-
-                                    <table class="table table-bordered table-condensed">
-                                        <caption class="sr-only"><localize key="examineManagement_contentInIndex">Content In Index</localize></caption>
-                                        <tr ng-repeat="(key, val) in vm.selectedIndex.providerProperties track by $index">
-                                            <th>{{key}}</th>
-                                            <td>{{val}}</td>
-                                        </tr>
-                                    </table>
-
-                                </div>
-
-                            </div>
-
-                        </div>
-
-                        <!-- Rebuild -->
-
-                        <div class="umb-panel-group__details-check">
-
-                            <div class="umb-panel-group__details-check-title">
-                                <div class="umb-panel-group__details-check-name"><localize key="examineManagement_tools">Tools</localize></div>
-                                <div class="umb-panel-group__details-check-description"><localize key="examineManagement_toolsDescription">Tools to manage the index</localize></div>
-                            </div>
-
-                            <div class="umb-panel-group__details-status">
-
-                                <div class="umb-panel-group__details-status-content">
-
-                                    <div class="umb-panel-group__details-status-actions">
-                                        <div class="umb-panel-group__details-status-action">
-                                            <ng-form name="indexTools">
-
-                                                <umb-button ng-show="!vm.selectedIndex.isProcessing && (!vm.selectedIndex.processingAttempts || vm.selectedIndex.processingAttempts < 100)"
-                                                            disabled="!vm.selectedIndex.canRebuild"
-                                                            type="button"
-                                                            button-style="danger"
-                                                            action="vm.rebuildIndex(vm.selectedIndex, $event)"
-                                                            label="Rebuild index"
-                                                            label-key="examineManagement_rebuildIndex">
-                                                </umb-button>
-
-                                                <div ng-show="vm.selectedIndex.isProcessing">
-                                                    <div class="umb-panel-group__details-status-overlay"></div>
-                                                    <umb-load-indicator></umb-load-indicator>
-                                                </div>
-
-                                                <div ng-show="vm.selectedIndex.processingAttempts >= 100">
-                                                    <localize key="examineManagement_processIsTakingLonger">The process is taking longer than expected, check the umbraco log to see if there have been any errors during this operation</localize>
-                                                </div>
-
-                                            </ng-form>
-
-                                            <div class="umb-panel-group__details-status-action-description pl0" ng-show="!vm.selectedIndex.canRebuild">
-                                                <localize key="examineManagement_indexCannotRebuild">This index cannot be rebuilt because it has no assigned </localize>
-                                                <code><localize key="examineManagement_iIndexPopulator">IIndexPopulator</localize></code>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                </div>
-
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                </div>
-
-            </div>
-
-        </div>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementfields.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementfields.html
deleted file mode 100644
index 83158436a7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementfields.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<div>
-    <umb-editor-view>
-        <umb-editor-header
-            name="model.title"
-            hide-icon="true"
-            hide-alias="true"
-            name-locked="true"
-            hide-description="true">
-        </umb-editor-header>
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content>
-                    <div class="flex mb2" ng-repeat="field in model.availableFields">
-                        <span class="mr2">
-                            <umb-toggle
-                                checked="model.fieldIsSelected(field)"
-                                on-click="model.toggleField(field)"
-                                hide-icons="true">
-                            </umb-toggle>
-                        </span>
-                        <span>{{ field }}</span>
-                    </div>
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="model.close()">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-    </umb-editor-view>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html
deleted file mode 100644
index ad888cfcf3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div>
-    <umb-editor-view>
-        <umb-editor-header
-            name="model.title"
-            hide-icon="true"
-            hide-alias="true"
-            name-locked="true"
-            hide-description="true">
-        </umb-editor-header>
-        <umb-editor-container>
-            <umb-box>
-                <umb-box-content>
-                    <table class="table table-bordered table-condensed">
-                        <thead>
-                            <tr>
-                                <th class="score"><localize key="general_field">Field</localize></th>
-                                <th class="id"><localize key="general_value">Value</localize></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr ng-repeat="(key, values) in model.searchResultValues track by key">
-                                <td>{{key}}</td>
-                                <td style="word-break: break-word;">{{ ::values | umbCmsJoinArray:', '}}</td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </umb-box-content>
-            </umb-box>
-        </umb-editor-container>
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="model.close()">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-    </umb-editor-view>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.controller.js
deleted file mode 100644
index 3480b96e64..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.controller.js
+++ /dev/null
@@ -1,146 +0,0 @@
-(function () {
-    "use strict";
-
-    function HealthCheckController(healthCheckResource) {
-        var SUCCESS = 0;
-        var WARNING = 1;
-        var ERROR = 2;
-        var INFO = 3;
-
-        var vm = this;
-
-        vm.viewState = "list";
-        vm.groups = [];
-        vm.selectedGroup = {};
-
-        vm.getStatus = getStatus;
-        vm.executeAction = executeAction;
-        vm.checkAllGroups = checkAllGroups;
-        vm.checkAllInGroup = checkAllInGroup;
-        vm.openGroup = openGroup;
-        vm.setViewState = setViewState;
-        vm.parseRegex = parseRegex;
-
-        // Get a (grouped) list of all health checks
-        healthCheckResource.getAllChecks()
-            .then(function (response) {
-                vm.groups = response;
-            });
-
-        function setGroupGlobalResultType(group) {
-            var totalSuccess = 0;
-            var totalError = 0;
-            var totalWarning = 0;
-            var totalInfo = 0;
-
-            // count total number of statusses
-            Utilities.forEach(group.checks, check => {
-
-                if (check.status) {
-                    check.status.forEach(status => {
-                        switch (status.resultType) {
-                            case SUCCESS:
-                            case 'Success':
-                                totalSuccess = totalSuccess + 1;
-                                break;
-                            case WARNING:
-                            case 'Warning':
-                                totalWarning = totalWarning + 1;
-                                break;
-                            case ERROR:
-                            case 'Error':
-                                totalError = totalError + 1;
-                                break;
-                            case INFO:
-                            case 'Info':
-                                totalInfo = totalInfo + 1;
-                                break;
-                        }
-                    });
-                }
-            });
-
-            group.totalSuccess = totalSuccess;
-            group.totalError = totalError;
-            group.totalWarning = totalWarning;
-            group.totalInfo = totalInfo;
-
-        }
-
-        // Get the status of an individual check
-        function getStatus(check) {
-            check.loading = true;
-            check.status = null;
-            healthCheckResource.getStatus(check.id)
-                .then(function (response) {
-                    check.loading = false;
-                  check.status = response;
-                });
-        }
-
-        function executeAction(check, index, action) {
-            check.loading = true;
-            healthCheckResource.executeAction(action)
-                .then(function (response) {
-                    check.status[index] = response;
-                    check.loading = false;
-                });
-        }
-
-        function checkAllGroups(groups) {
-            // set number of checks which has been executed
-            for (var i = 0; i < groups.length; i++) {
-                var group = groups[i];
-                checkAllInGroup(group, group.checks);
-            }
-            vm.groups = groups;
-        }
-
-        function checkAllInGroup(group, checks) {
-            group.checkCounter = 0;
-            group.loading = true;
-
-            if (checks) {
-                checks.forEach(check => {
-                    check.loading = true;
-
-                    healthCheckResource.getStatus(check.id)
-                        .then(function (response) {
-                            check.status = response;
-                            group.checkCounter = group.checkCounter + 1;
-                            check.loading = false;
-
-                            // when all checks are done, set global group result
-                            if (group.checkCounter === checks.length) {
-                                setGroupGlobalResultType(group);
-                                group.loading = false;
-                            }
-                        });
-                });
-            }
-        }
-
-        function openGroup(group) {
-            vm.selectedGroup = group;
-            vm.viewState = "details";
-        }
-
-        function setViewState(state) {
-            vm.viewState = state;
-
-            if (state === 'list') {
-
-                for (var i = 0; i < vm.groups.length; i++) {
-                    var group = vm.groups[i];
-                    setGroupGlobalResultType(group);
-                }
-            }
-        }
-
-        function parseRegex(regexAsString) {
-            return new RegExp(regexAsString);
-        }
-    }
-
-    angular.module("umbraco").controller("Umbraco.Dashboard.HealthCheckController", HealthCheckController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
deleted file mode 100644
index d970959e0e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/healthcheck.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<div ng-controller="Umbraco.Dashboard.HealthCheckController as vm">
-
-    <div ng-if="vm.viewState === 'list'">
-
-        <umb-box>
-            <umb-box-content>
-                <div class="umb-healthcheck-help-text">
-                    <localize key="healthcheck_helpText">
-                        <p>The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button.
-                            You can add your own health checks, have a look at <a href="https://docs.umbraco.com/umbraco-cms/extending/health-check" target="_blank" rel="noopener" class="btn-link -underline">the documentation for more information</a> about custom health checks.</p>
-                    </localize>
-                </div>
-                <div class="umb-panel-group__details-status-actions">
-                        <umb-button type="button"
-                                    button-style="success"
-                                    label="Check All Groups"
-                                    data-element="healthchecks-checkall-btn"
-                                    action="vm.checkAllGroups(vm.groups)">
-                        </umb-button>
-                </div>
-            </umb-box-content>
-        </umb-box>
-
-        <div class="umb-healthcheck">
-            <div class="umb-air" ng-repeat="group in vm.groups">
-                <button type="button" class="umb-healthcheck-group" ng-click="vm.openGroup(group);">
-
-                    <div class="umb-healthcheck-title">{{group.name}}</div>
-
-                    <div class="umb-healthcheck-group__load-container" ng-if="group.loading">
-                        <umb-load-indicator></umb-load-indicator>
-                    </div>
-
-                    <div class="umb-healthcheck-messages"
-                         ng-hide="group.loading || !group.totalSuccess && !group.totalWarning && !group.totalError && !group.totalInfo">
-
-                        <div class="umb-healthcheck-message" ng-if="group.totalSuccess > 0">
-                            <umb-icon icon="icon-check" class="color-green"></umb-icon>
-                            {{ group.totalSuccess }}
-                            <span class="sr-only">
-                                <localize key="visuallyHiddenTexts_passed">passed</localize>
-                            </span>
-                        </div>
-
-                        <div class="umb-healthcheck-message" ng-if="group.totalWarning > 0">
-                            <umb-icon icon="icon-alert" class="color-orange"></umb-icon>
-                            {{ group.totalWarning }}
-                            <span class="sr-only">
-                                <localize key="visuallyHiddenTexts_warning">warning</localize>
-                            </span>
-                        </div>
-
-                        <div class="umb-healthcheck-message" ng-if="group.totalError > 0">
-                            <umb-icon icon="icon-delete" class="color-red"></umb-icon>
-                            {{ group.totalError }}
-                            <span class="sr-only">
-                                <localize key="visuallyHiddenTexts_failed">failed</localize>
-                            </span>
-                        </div>
-
-                        <div class="umb-healthcheck-message" ng-if="group.totalInfo > 0">
-                            <umb-icon icon="icon-info" class="umb-healthcheck-status-icon"></umb-icon>
-                            {{ group.totalInfo }}
-                            <span class="sr-only">
-                                <localize key="visuallyHiddenTexts_suggestion">suggestion</localize>
-                            </span>
-                        </div>
-                    </div>
-                </button>
-            </div>
-        </div>
-    </div>
-
-    <div ng-if="vm.viewState === 'details'">
-
-        <umb-editor-sub-header>
-            <umb-editor-sub-header-content-left>
-                <button type="button" class="umb-healthcheck-back-link" ng-click="vm.setViewState('list');">
-                    <span aria-hidden="true">&larr;</span> <localize key="general_backToOverview">Back to overview</localize>
-                </button>
-            </umb-editor-sub-header-content-left>
-        </umb-editor-sub-header>
-
-        <div class="umb-panel-group__details">
-
-            <div class="umb-panel-group__details-group">
-                <div class="umb-panel-group__details-group-title">
-                    <div class="umb-panel-group__details-group-name">{{ vm.selectedGroup.name }}</div>
-                    <umb-button
-                        type="button"
-                        button-style="success"
-                        action="vm.checkAllInGroup(vm.selectedGroup, vm.selectedGroup.checks)"
-                        label="Check group"
-                        label-key="healthcheck_checkGroup">
-                    </umb-button>
-                </div>
-
-                <div class="umb-panel-group__details-checks">
-                    <div class="umb-panel-group__details-check" ng-repeat="check in vm.selectedGroup.checks">
-                        <div class="umb-panel-group__details-check-title">
-                            <div class="umb-panel-group__details-check-name">{{ check.name }}</div>
-                            <div class="umb-panel-group__details-check-description">{{ check.description }}</div>
-                        </div>
-
-                        <div class="umb-panel-group__details-status" ng-repeat="status in check.status">
-                            <div class="umb-panel-group__details-status-icon-container" aria-hidden="true">
-                                <umb-icon icon="icon-check" class="umb-healthcheck-status-icon color-green" ng-if="status.resultType === 'Success'"></umb-icon>
-                                <umb-icon icon="icon-alert" class="umb-healthcheck-status-icon color-orange" ng-if="status.resultType === 'Warning'"></umb-icon>
-                                <umb-icon icon="icon-delete" class="umb-healthcheck-status-icon color-red" ng-if="status.resultType === 'Error'"></umb-icon>
-                                <umb-icon icon="icon-info" class="umb-healthcheck-status-icon" ng-if="status.resultType === 'Info'"></umb-icon>
-                            </div>
-
-                            <div class="umb-panel-group__details-status-content">
-                                <div class="umb-panel-group__details-status-text">
-                                    <span class="sr-only" ng-if="status.resultType === 'Success'">
-                                        <localize key="visuallyHiddenTexts_checkPassed">Check passed</localize>:
-                                    </span>
-                                    <span class="sr-only" ng-if="status.resultType === 'Warning'">
-                                        <localize key="visuallyHiddenTexts_warning">warning</localize>:
-                                    </span>
-                                    <span class="sr-only" ng-if="status.resultType === 'Error'">
-                                        <localize key="visuallyHiddenTexts_checkFailed">Check failed</localize>:
-                                    </span>
-                                    <span class="sr-only" ng-if="status.resultType === 'Info'">
-                                        <localize key="visuallyHiddenTexts_suggestion">suggestion</localize>:
-                                    </span>
-                                    <div ng-bind-html="status.message"></div>
-                                    <div ng-if="status.description" ng-bind-html="status.description"></div>
-                                </div>
-
-                                <div class="umb-panel-group__details-status-actions" ng-if="status.actions">
-                                    <div class="umb-panel-group__details-status-action" ng-repeat="action in status.actions">
-                                        <ng-form name="healthCheckAction">
-
-                                            <div ng-if="action.valueRequired">
-                                                <div><label class="bold">Set new value:</label></div>
-
-                                                <div ng-switch on="action.providedValueValidation">
-                                                    <input ng-switch-when="email" name="providedValue" type="text" ng-model="action.providedValue" required val-email />
-                                                    <input ng-switch-when="regex" name="providedValue" type="text" ng-model="action.providedValue" required ng-pattern="vm.parseRegex(action.providedValueValidationRegex)" />
-                                                    <input ng-switch-default name="providedValue" type="text" ng-model="action.providedValue" required />
-                                                </div>
-                                            </div>
-
-                                            <umb-button type="button"
-                                                        button-style="success"
-                                                        size="s"
-                                                        disabled="healthCheckAction.providedValue.$invalid"
-                                                        action="vm.executeAction(check, $parent.$index, action)"
-                                                        label="{{action.name}}">
-                                            </umb-button>
-
-                                        </ng-form>
-
-                                        <div class="umb-panel-group__details-status-action-description" ng-if="action.description" ng-bind-html="action.description"></div>
-                                    </div>
-                                </div>
-                              <div class="umb-panel-group__details-status-readMoreLink" ng-if="status.readMoreLink">
-                                <a href="{{status.readMoreLink}}" class="btn btn-success" target="_blank">
-                                  <localize key="general_readMore">Read more</localize></a>
-                              </div>
-
-                            </div>
-                        </div>
-
-                        <div ng-show="check.loading">
-                            <div class="umb-panel-group__details-status-overlay"></div>
-                            <umb-load-indicator></umb-load-indicator>
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/modelsbuildermanagement.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/modelsbuildermanagement.controller.js
deleted file mode 100644
index 423a20d864..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/modelsbuildermanagement.controller.js
+++ /dev/null
@@ -1,38 +0,0 @@
-function modelsBuilderManagementController($scope, $http, umbRequestHelper, modelsBuilderManagementResource) {
-
-    var vm = this;
-
-    vm.reload = reload;
-    vm.generate = generate;
-    vm.dashboard = null;
-
-    function generate() {
-        vm.generating = true;
-        umbRequestHelper.resourcePromise(
-            $http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")),
-            'Failed to generate.')
-            .then(function (result) {
-                vm.generating = false;
-                vm.dashboard = result;
-            });
-    }
-
-    function reload() {
-        vm.loading = true;
-        modelsBuilderManagementResource.getDashboard().then(function (result) {
-            vm.dashboard = result;
-            vm.loading = false;
-        });
-    }
-
-    function init() {
-        vm.loading = true;
-        modelsBuilderManagementResource.getDashboard().then(function (result) {
-            vm.dashboard = result;
-            vm.loading = false;
-        });
-    }
-
-    init();
-}
-angular.module("umbraco").controller("Umbraco.Dashboard.ModelsBuilderManagementController", modelsBuilderManagementController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/modelsbuildermanagement.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/modelsbuildermanagement.html
deleted file mode 100644
index 1ba86bf72b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/modelsbuildermanagement.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<div id="modelsBuilder" ng-controller="Umbraco.Dashboard.ModelsBuilderManagementController as vm">
-
-    <umb-box>
-        <umb-box-content>
-
-            <div ng-show="!vm.loading" class="pull-right">
-                <button type="button" class="btn" ng-click="vm.reload()"><span>Reload</span></button>
-            </div>
-
-            <h3 class="bold">Models Builder</h3>
-
-            <umb-load-indicator ng-show="vm.loading"></umb-load-indicator>
-
-            <div ng-show="!vm.loading && vm.dashboard">
-                <div ng-bind-html="vm.dashboard.text"></div>
-
-                <div ng-if="vm.dashboard.outOfDateModels">
-                    <p>Models are <strong>out-of-date</strong>.</p>
-                </div>
-
-                <div ng-if="vm.dashboard.canGenerate">
-                    <div ng-if="vm.dashboard.generateCausesRestart">
-                        <p style="color: red; font-weight: bold;">Generating models will restart the application.</p>
-                    </div>
-                    <div ng-show="!vm.generating">
-                        <button type="button" ng-click="vm.generate()" class="btn btn-danger">
-                            <span>Generate models</span>
-                        </button>
-                    </div>
-                    <div class="umb-loader-wrapper" ng-show="vm.generating">
-                        <div class="umb-loader"></div>
-                    </div>
-                </div>
-
-                <div ng-if="vm.dashboard.lastError" style="margin-top: 32px;" ng-show="!vm.generating">
-                    <span style="color: red; font-weight: bold;">Last generation failed with the following error:</span>
-                    <pre style="width: 80%; white-space: pre-line; background: #f8f8f8; padding: 4px; font-size: small;">{{vm.dashboard.lastError}}</pre>
-                </div>
-            </div>
-
-        </umb-box-content>
-    </umb-box>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/overlays/examinemanagement.rebuild.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/overlays/examinemanagement.rebuild.html
deleted file mode 100644
index 49dd33a46a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/overlays/examinemanagement.rebuild.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div>
-
-    <div class="umb-alert umb-alert--warning mb2">
-        <localize key="examineManagement_rebuildIndexWarning">
-            This will cause the index to be rebuilt.<br>
-            Depending on how much content there is in your site this could take a while.<br>
-            It is not recommended to rebuild an index during times of high website traffic
-            or when editors are editing content.
-        </localize>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/overlays/nucache.rebuild.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/overlays/nucache.rebuild.html
deleted file mode 100644
index c8bbb5350e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/overlays/nucache.rebuild.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-
-    <div class="umb-alert umb-alert--warning mb2">
-        Rebuild content in cmsContentNu database table. Expensive.
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/overlays/nucache.reload.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/overlays/nucache.reload.html
deleted file mode 100644
index 77ca7ec476..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/overlays/nucache.reload.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-
-    <div class="umb-alert umb-alert--warning mb2">
-        Trigger a in-memory and local file cache reload on all servers.
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/profiler.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/profiler.controller.js
deleted file mode 100644
index 295263a47c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/profiler.controller.js
+++ /dev/null
@@ -1,38 +0,0 @@
-function ProfilerController($scope, $cookies, $http, umbRequestHelper) {
-	var vm = this;
-
-	vm.loading = true;
-	vm.toggle = toggle;
-
-	function toggle() {
-		if (vm.alwaysOn === true) {
-            $cookies.remove("UMB-DEBUG", {
-                path: "/"
-            });
-			vm.alwaysOn = false;
-		}
-		else {
-			$cookies.put("UMB-DEBUG", "true", {
-                path: "/",
-                expires: "Tue, 01 Jan 2100 00:00:01 GMT"
-            });
-			vm.alwaysOn = true;
-		}
-	}
-
-	function init() {
-        vm.alwaysOn = $cookies.get("UMB-DEBUG") === "true";
-
-        umbRequestHelper.resourcePromise(
-		    $http.get(umbRequestHelper.getApiUrl("webProfilingBaseUrl", "GetStatus")),
-			"Failed to retrieve status for web profiling"
-		).then(function(status) {
-			vm.loading = false;
-			vm.profilerEnabled = status.Enabled;
-		});
-	}
-
-	init();
-}
-
-angular.module("umbraco").controller("Umbraco.Dashboard.ProfilerController", ProfilerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/profiler.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/profiler.html
deleted file mode 100644
index 95c6af9f79..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/profiler.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<div ng-controller="Umbraco.Dashboard.ProfilerController as vm">
-
-    <div ng-show="vm.loading">
-        <umb-load-indicator></umb-load-indicator>
-    </div>
-
-    <umb-box ng-hide="vm.loading">
-        <umb-box-content>
-            <h3 class="bold">
-                <localize key="profiling_performanceProfiling">Performance profiling</localize>
-            </h3>
-            <div ng-show="vm.profilerEnabled">
-                <div class="mb4">
-                    <localize key="profiling_performanceProfilingDescription">
-                        <p>
-                            Umbraco currently runs in debug mode. This means you can use the built-in performance profiler to assess the performance when rendering pages.
-                        </p>
-                        <p>
-                            If you want to activate the profiler for a specific page rendering, simply add <b>umbDebug=true</b> to the querystring when requesting the page.
-                        </p>
-                        <p>
-                            If you want the profiler to be activated by default for all page renderings, you can use the toggle below.
-                            It will set a cookie in your browser, which then activates the profiler automatically.
-                            In other words, the profiler will only be active by default in <i>your</i> browser - not everyone else's.
-                        </p>
-                    </localize>
-                </div>
-                <div class="mb4">
-                    <div class="flex items-center">
-                        <umb-toggle checked="vm.alwaysOn" input-id="profilerAlwaysOn" on-click="vm.toggle()"></umb-toggle>
-                        <label for="profilerAlwaysOn" class="mb0 ml2">
-                            <localize key="profiling_activateByDefault">Activate the profiler by default</localize>
-                        </label>
-                    </div>
-                </div>
-                <h4>
-                    <localize key="profiling_reminder">Friendly reminder</localize>
-                </h4>
-                <localize key="profiling_reminderDescription">
-                    <p>
-                        You should never let a production site run in debug mode. Debug mode is turned off by setting <b>debug="false"</b> on the <b>&lt;compilation /&gt;</b> element in web.config.
-                    </p>
-                </localize>
-            </div>
-            <div ng-hide="vm.profilerEnabled">
-                <localize key="profiling_profilerEnabledDescription">
-                    <p>
-                        Umbraco currently does not run in debug mode, so you can't use the built-in profiler. This is how it should be for a production site.
-                    </p>
-                    <p>
-                        Debug mode is turned on by setting <b>debug="true"</b> on the <b>&lt;compilation /&gt;</b> element in web.config.
-                    </p>
-                </localize>
-            </div>
-        </umb-box-content>
-    </umb-box>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedsnapshotcache.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedsnapshotcache.controller.js
deleted file mode 100644
index 5270892fa5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedsnapshotcache.controller.js
+++ /dev/null
@@ -1,112 +0,0 @@
-function publishedSnapshotCacheController($scope, $http, umbRequestHelper, localizationService, overlayService) {
-
-    var vm = this;
-
-    vm.collect = collect;
-    vm.reload = reload;
-    vm.verify = verify;
-    vm.rebuild = rebuild;
-
-    function reload(event) {
-        if (vm.working) return;
-
-        const dialog = {
-            view: "views/dashboard/settings/overlays/nucache.reload.html",
-            submitButtonLabelKey: "general_ok",
-            submit: function (model) {
-                performReload();
-                overlayService.close();
-            },
-            close: function () {
-                overlayService.close();
-            }
-        };
-
-        localizationService.localize("general_reload").then(value => {
-            dialog.title = value;
-            overlayService.open(dialog);
-        });
-
-        event.preventDefault()
-        event.stopPropagation();
-    }
-
-    function collect() {
-        if (vm.working) return;
-        vm.working = true;
-        umbRequestHelper.resourcePromise(
-            $http.get(umbRequestHelper.getApiUrl("publishedSnapshotCacheStatusBaseUrl", "Collect")),
-                    'Failed to verify the cache.')
-            .then(function (result) {
-                vm.working = false;
-                vm.status = result;
-            });
-    }
-
-    function verify() {
-        if (vm.working) return;
-        vm.working = true;
-        umbRequestHelper.resourcePromise(
-            $http.get(umbRequestHelper.getApiUrl("publishedSnapshotCacheStatusBaseUrl", "GetStatus")),
-                    'Failed to verify the cache.')
-            .then(function (result) {
-                vm.working = false;
-                vm.status = result;
-            });
-    }
-
-    function rebuild(event) {
-        if (vm.working) return;
-
-        const dialog = {
-            view: "views/dashboard/settings/overlays/nucache.rebuild.html",
-            submitButtonLabelKey: "general_ok",
-            submit: function (model) {
-                performRebuild();
-                overlayService.close();
-            },
-            close: function () {
-                overlayService.close();
-            }
-        };
-
-        localizationService.localize("general_rebuild").then(value => {
-            dialog.title = value;
-            overlayService.open(dialog);
-        });
-
-        event.preventDefault()
-        event.stopPropagation();
-    }
-
-    function performReload() {
-        vm.working = true;
-
-        umbRequestHelper.resourcePromise(
-            $http.post(umbRequestHelper.getApiUrl("publishedSnapshotCacheStatusBaseUrl", "ReloadCache")),
-            'Failed to trigger a cache reload')
-            .then(function (result) {
-                vm.working = false;
-            });
-    }
-
-    function performRebuild() {
-        vm.working = true;
-
-        umbRequestHelper.resourcePromise(
-            $http.post(umbRequestHelper.getApiUrl("publishedSnapshotCacheStatusBaseUrl", "RebuildDbCache")),
-            'Failed to rebuild the cache.')
-            .then(function (result) {
-                vm.working = false;
-                vm.status = result;
-            });
-    }
-
-    function init() {
-        vm.working = false;
-        verify();
-    }
-
-    init();
-}
-angular.module("umbraco").controller("Umbraco.Dashboard.PublishedSnapshotCacheController", publishedSnapshotCacheController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedsnapshotcache.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedsnapshotcache.html
deleted file mode 100644
index 5640b23ded..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedsnapshotcache.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<div id="nuCache" style="position: relative;" ng-controller="Umbraco.Dashboard.PublishedSnapshotCacheController as vm">
-
-    <div ng-show="vm.loading || vm.working" style="background: rgba(255, 255, 255, 0.60); position: absolute; left: 0; right: 0; top: 0; bottom: 0; z-index: 1;">
-        <umb-load-indicator></umb-load-indicator>
-    </div>
-
-    <div class="umb-panel-group__details-group">
-        <div class="umb-panel-group__details-group-title">
-            <div class="umb-panel-group__details-group-name">
-                <localize key="nuCache_publishedCacheStatus">Published Cache Status</localize>
-            </div>
-        </div>
-        <div class="umb-panel-group__details-checks">
-            <div class="umb-panel-group__details-check">
-                <div class="umb-panel-group__details-status">
-                    <div class="umb-panel-group__details-status-content">
-                        <div class="umb-panel-group__details-status-text">
-                            <p class="umb-panel-group__details-status-action" ng-show="!vm.working">{{vm.status}}</p>
-                        </div>
-                        <div class="umb-panel-group__details-status-actions">
-                            <div class="umb-panel-group__details-status-action no-background no-left-padding">
-                                <button type="button" ng-click="vm.verify($event)" class="btn btn-danger">
-                                    <localize key="nuCache_refreshStatus">Refresh status</localize>
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <br />
-    <div class="umb-panel-group__details-group">
-        <div class="umb-panel-group__details-group-title">
-            <div class="umb-panel-group__details-group-name">
-                <localize key="nuCache_caches">Caches</localize>
-            </div>
-        </div>
-        <div class="umb-panel-group__details-checks">
-            <div class="umb-panel-group__details-check">
-                <div class="umb-panel-group__details-check-title">
-                    <div class="umb-panel-group__details-check-name">
-                        <localize key="nuCache_memoryCache">Memory Cache</localize>
-                    </div>
-                    <div class="umb-panel-group__details-check-description">
-                        <localize key="nuCache_memoryCacheDescription">
-                            This button lets you reload the in-memory cache, by entirely reloading it from the database
-                            cache (but it does not rebuild that database cache). This is relatively fast.
-                            Use it when you think that the memory cache has not been properly refreshed, after some events
-                            triggered&mdash;which would indicate a minor Umbraco issue.
-                            (note: triggers the reload on all servers in an LB environment).
-                        </localize>
-
-                    </div>
-
-                    <div class="umb-panel-group__details-status-actions">
-                        <div class="umb-panel-group__details-status-action no-background no-left-padding">
-                            <button type="button" ng-click="vm.reload($event)" class="btn btn-danger">
-                                <localize key="nuCache_reload">Reload</localize>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-
-
-                <div class="umb-panel-group__details-check-title top-border">
-                    <div class="umb-panel-group__details-check-name">
-                        <localize key="nuCache_databaseCache">Database Cache</localize>
-                    </div>
-                    <div class="umb-panel-group__details-check-description">
-                        <localize key="nuCache_databaseCacheDescription">
-                            This button lets you rebuild the database cache, ie the content of the cmsContentNu table.
-                            <strong>Rebuilding can be expensive.</strong>
-                            Use it when reloading is not enough, and you think that the database cache has not been
-                            properly generated&mdash;which would indicate some critical Umbraco issue.
-                        </localize>
-                    </div>
-                    <div class="umb-panel-group__details-status-actions">
-                        <div class="umb-panel-group__details-status-action no-background no-left-padding">
-                            <button type="button" ng-click="vm.rebuild($event)" class="btn btn-danger">
-                                <localize key="nuCache_rebuild">Rebuild</localize>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-
-
-                <div class="umb-panel-group__details-check-title top-border">
-                    <div class="umb-panel-group__details-check-name">
-                        <localize key="nuCache_internals">Internals</localize>
-                    </div>
-                    <div class="umb-panel-group__details-check-description">
-                        <localize key="nuCache_internalsDescription">
-                            This button lets you trigger a NuCache snapshots collection (after running a fullCLR GC).
-                            Unless you know what that means, you probably do <em>not</em> need to use it.
-                        </localize>
-
-                    </div>
-                    <div class="umb-panel-group__details-status-actions">
-                        <div class="umb-panel-group__details-status-action no-background no-left-padding">
-                            <button type="button" ng-click="vm.collect($event)" class="btn btn-danger">
-                                <localize key="nuCache_collect">Collect</localize>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.controller.js
deleted file mode 100644
index ca4d5e1450..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.controller.js
+++ /dev/null
@@ -1,14 +0,0 @@
-function publishedStatusController($scope, $http, umbRequestHelper) {
-
-    var vm = this;
-
-    // note: must defined base url in BackOfficeController
-    umbRequestHelper.resourcePromise(
-        $http.get(umbRequestHelper.getApiUrl('publishedStatusBaseUrl', 'GetPublishedStatusUrl')),
-        'Failed to get published status url')
-    .then(function (result) {
-        vm.includeUrl = result;
-    });
-
-}
-angular.module("umbraco").controller("Umbraco.Dashboard.PublishedStatusController", publishedStatusController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.html
deleted file mode 100644
index 3a8a99ff9b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="published" ng-controller="Umbraco.Dashboard.PublishedStatusController as vm">
-    <div ng-show="vm.loading">
-        <umb-load-indicator></umb-load-indicator>
-    </div>
-
-    <div ng-include="vm.includeUrl"></div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
deleted file mode 100644
index 3930d53e24..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<umb-box>
-    <umb-box-content>
-        <h1 class="bold h3">
-            <localize key="settingsDashboard_start">Start here</localize>
-        </h1>
-        <localize key="settingsDashboard_startDescription">
-            <p>This section contains the building blocks for your Umbraco site. Follow the below links to find out more about working with the items in the Settings section:</p>
-        </localize>:
-        <h2 class="h5">
-            <localize key="settingsDashboard_more">Find out more</localize>:
-        </h2>
-        <ul>
-            <li>
-                <localize key="settingsDashboard_bulletPointOne">Read more about working with the items in Settings <a class="btn-link -underline" href="https://docs.umbraco.com/umbraco-cms/fundamentals/backoffice/sections/" target="_blank" rel="noopener">in the Umbraco Documentation.</a></localize>
-            </li>
-            <li>
-                <localize key="settingsDashboard_bulletPointTwo">Ask a question in the <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank" rel="noopener">Community Forum</a></localize>
-            </li>
-            <li>
-                <localize key="settingsDashboard_bulletPointTutorials">Watch our free <a class="btn-link -underline" href="https://umbra.co/ulb" target="_blank" rel="noopener">tutorial videos on the Umbraco Learning Base</a></localize>
-            </li>
-            <li>
-                <localize key="settingsDashboard_bulletPointFour">Find out about our <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank" rel="noopener">productivity boosting tools and commercial support</a></localize>
-            </li>
-            <li>
-                <localize key="settingsDashboard_bulletPointFive">Find out about real-life <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank" rel="noopener">training and certification</a> opportunities</localize>
-            </li>
-        </ul>
-    </umb-box-content>
-</umb-box>
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
deleted file mode 100644
index 3e9c604215..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<h3>
-    <localize key="settingsDashboardVideos_trainingHeadline">Hours of Umbraco training videos are only a click away</localize>
-</h3>
-<localize key="settingsDashboardVideos_trainingDescription">
-    <p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="http://umbraco.tv" target="_blank" rel="noopener">umbraco.tv</a> for even more Umbraco videos</p>
-</localize>
-
-<div class="row-fluid" 
-	ng-init="init('https://umbraco.tv/videos/implementor/chapterrss?sort=no')" 
-	ng-controller="Umbraco.Dashboard.StartupVideosController">
-
-    <div ng-show="videos.length">
-        <h4>
-            <localize key="settingsDashboardVideos_getStarted">To get you started</localize>:
-        </h4>
-        <ul class="thumbnails" >
-            <li class="span2" ng-repeat="video in videos">
-                <div class="thumbnail" style="margin-right: 20px">
-                    <a target="_blank" rel="noopener" href="{{video.link}}" title="{{video.title}}">
-                        <img ng-src="{{video.thumbnail}}"  alt="{{video.title}}">
-                    </a>
-                </div>
-            </li>
-        </ul>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/dataTypes/copy.controller.js
deleted file mode 100644
index 3f7634b50b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/copy.controller.js
+++ /dev/null
@@ -1,62 +0,0 @@
-angular.module("umbraco")
-  .controller("Umbraco.Editors.DataType.CopyController",
-    function ($scope, dataTypeResource, treeService, navigationService, appState) {
-
-      $scope.dialogTreeApi = {};
-      $scope.source = _.clone($scope.currentNode);
-
-      function nodeSelectHandler(args) {
-        args.event.preventDefault();
-        args.event.stopPropagation();
-
-        if ($scope.target) {
-          //un-select if there's a current one selected
-          $scope.target.selected = false;
-        }
-
-        $scope.target = args.node;
-        $scope.target.selected = true;
-      }
-
-      $scope.copy = function () {
-
-        $scope.busy = true;
-        $scope.error = false;
-
-        dataTypeResource.copy({ parentId: $scope.target.id, id: $scope.source.id })
-          .then(function (path) {
-            $scope.error = false;
-            $scope.success = true;
-            $scope.busy = false;
-
-            //get the currently edited node (if any)
-            var activeNode = appState.getTreeState("selectedNode");
-
-            //we need to do a double sync here: first sync to the copied content - but don't activate the node,
-            //then sync to the currenlty edited content (note: this might not be the content that was copied!!)
-
-            navigationService.syncTree({ tree: "dataTypes", path: path, forceReload: true, activate: false }).then(function (args) {
-              if (activeNode) {
-                var activeNodePath = treeService.getPath(activeNode).join();
-                //sync to this node now - depending on what was copied this might already be synced but might not be
-                navigationService.syncTree({ tree: "dataTypes", path: activeNodePath, forceReload: false, activate: true });
-              }
-            });
-
-          }, function (err) {
-            $scope.success = false;
-            $scope.error = err;
-            $scope.busy = false;
-
-          });
-      };
-
-      $scope.onTreeInit = function () {
-        $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-      }
-
-      $scope.close = function () {
-        navigationService.hideDialog();
-      };
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/dataTypes/copy.html
deleted file mode 100644
index 64f815148b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/copy.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="umb-dialog" ng-controller="Umbraco.Editors.DataType.CopyController">
-
-    <div class="umb-dialog-body">
-        <div class="umb-pane">
-
-            <p class="abstract" ng-hide="success">
-                <localize key="contentTypeEditor_folderToCopy">Select the folder to copy</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
-            </p>
-
-            <umb-loader ng-show="busy"></umb-loader>
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-            <div ng-show="success">
-                <div class="alert alert-success">
-                    <strong>{{source.name}}</strong> <localize key="contentTypeEditor_copiedUnderneath">was copied underneath</localize>&nbsp;<strong>{{target.name}}</strong>
-                </div>
-                <button type="button" class="btn btn-primary" ng-click="close()">Ok</button>
-            </div>
-
-            <div ng-hide="success">
-
-                <div>
-                    <umb-tree section="settings"
-                              treealias="dataTypes"
-                              customtreeparams="foldersonly=1"
-                              hideheader="false"
-                              hideoptions="true"
-                              isdialog="true"
-                              api="dialogTreeApi"
-                              on-init="onTreeInit()"
-                              enablecheckboxes="true">
-                    </umb-tree>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
-            <localize key="general_cancel">Cancel</localize>
-        </button>
-        <button class="btn btn-primary" ng-click="copy()" ng-disabled="busy || !target">
-            <localize key="actions_copy">Copy</localize>
-        </button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/dataTypes/create.controller.js
deleted file mode 100644
index 9a0059506a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/create.controller.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DataType.CreateController
- * @function
- *
- * @description
- * The controller for the data type creation dialog
- */
-function DataTypeCreateController($scope, $location, navigationService, dataTypeResource, formHelper, appState) {
-
-    $scope.model = {
-        folderName: "",
-        creatingFolder: false
-    };
-
-    var node = $scope.currentNode;
-    var section = appState.getSectionState("currentSection");
-
-    $scope.showCreateFolder = function() {
-        $scope.model.creatingFolder = true;
-    }
-
-    $scope.createContainer = function () {
-        if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createFolderForm })) {
-            dataTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) {
-
-                navigationService.hideMenu();
-                var currPath = node.path ? node.path : "-1";
-                navigationService.syncTree({ tree: "datatypes", path: currPath + "," + folderId, forceReload: true, activate: true });
-
-                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm });
-
-            }, function(err) {
-
-                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm, hasErrors: true });
-               // TODO: Handle errors
-            });
-        };
-    }
-
-    $scope.createDataType = function() {
-        $location.search('create', null);
-        $location.path("/" + section + "/dataTypes/edit/" + node.id).search("create", "true");
-        navigationService.hideMenu();
-    };
-
-    $scope.close = function() {
-        const showMenu = true;
-        navigationService.hideDialog(showMenu);
-    };
-
-}
-
-angular.module('umbraco').controller("Umbraco.Editors.DataType.CreateController", DataTypeCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/create.html b/src/Umbraco.Web.UI.Client/src/views/dataTypes/create.html
deleted file mode 100644
index e78e70092b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/create.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<div ng-controller="Umbraco.Editors.DataType.CreateController">
-
-  <div ng-show="!model.creatingFolder">
-    <div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
-      <div class="umb-pane">
-        <h5>
-          <localize key="create_createUnder">Create an item under</localize>
-          {{currentNode.name}}
-        </h5>
-
-        <ul class="umb-actions umb-actions-child">
-          <li class="umb-action" data-element="action-data-type">
-            <button class="umb-action-link umb-outline btn-reset" ng-click="createDataType()" type="button"
-                    umb-auto-focus>
-              <umb-icon class="icon large" icon="icon-autofill"></umb-icon>
-              <span class="menu-label">
-                                <localize key="create_newDataType">New data type</localize>
-                            </span>
-            </button>
-          </li>
-          <li class="umb-action" data-element="action-folder">
-            <button class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()" type="button">
-              <umb-icon class="icon large" icon="icon-folder"></umb-icon>
-              <span class="menu-label">
-                                <localize key="create_newFolder">New folder</localize>...
-                            </span>
-            </button>
-          </li>
-        </ul>
-      </div>
-
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-      <button class="btn btn-info" ng-click="close()" type="button">
-        <localize key="buttons_somethingElse">Do something else</localize>
-      </button>
-    </div>
-  </div>
-
-  <div ng-show="model.creatingFolder">
-    <form name="createFolderForm" ng-submit="createContainer()"
-          novalidate
-          val-form-manager>
-      <div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
-        <div class="umb-pane" ng-show="model.creatingFolder">
-          <umb-control-group hide-label="false" label="Enter a folder name">
-            <input class="umb-textstring textstring input-block-level"
-                   focus-when="{{model.creatingFolder}}"
-                   name="folderName"
-                   ng-model="model.folderName"
-                   required
-                   type="text"/>
-          </umb-control-group>
-        </div>
-      </div>
-      <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <umb-button action="close()"
-                    button-style="link"
-                    label-key="general_close"
-                    type="button">
-        </umb-button>
-        <umb-button button-style="primary"
-                    label-key="general_create"
-                    type="submit">
-        </umb-button>
-      </div>
-    </form>
-  </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/datatype.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/dataTypes/datatype.delete.controller.js
deleted file mode 100644
index 90f3067abe..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/datatype.delete.controller.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.ContentDeleteController
- * @function
- * 
- * @description
- * The controller for deleting content
- */
-function DataTypeDeleteController($scope, dataTypeResource, treeService, navigationService, localizationService) {
-
-    var vm = this;
-
-    vm.hasReferences = false;
-    vm.references = [];
-
-    vm.performDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        dataTypeResource.deleteById($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            //get the root node before we remove it
-            var rootNode = treeService.getTreeRoot($scope.currentNode);
-            
-            // TODO: Need to sync tree, etc...
-            treeService.removeNode($scope.currentNode);
-            navigationService.hideMenu();
-        });
-    };
-
-    vm.performContainerDelete = function () {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        dataTypeResource.deleteContainerById($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            //get the root node before we remove it
-            var rootNode = treeService.getTreeRoot($scope.currentNode);
-
-            // TODO: Need to sync tree, etc...
-            treeService.removeNode($scope.currentNode);
-            navigationService.hideMenu();
-        });
-
-    };
-
-    vm.cancel = function() {
-        navigationService.hideDialog();
-    };
-
-    vm.onReferenceClicked = function(event) {
-        if (event.metaKey !== true) {
-            navigationService.hideDialog();
-        }
-    };
-
-    vm.labels = {};
-    localizationService
-        .localize("editdatatype_acceptDeleteConsequence", [$scope.currentNode.name])
-        .then(function (data) {
-            vm.labels.deleteConfirm = data;
-        });
-
-    var init = function() {
-
-        if($scope.currentNode.nodeType === "dataTypes") {
-
-            vm.loading = true;
-
-            dataTypeResource.getReferences($scope.currentNode.id)
-                .then(function (data) {
-                    vm.loading = false;
-                    vm.references = data;
-
-                    vm.hasReferences = data.documentTypes.length > 0 || data.mediaTypes.length > 0 || data.memberTypes.length > 0;
-                });
-
-        }
-
-    }
-
-    init();
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.DataType.DeleteController", DataTypeDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/datatype.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/dataTypes/datatype.edit.controller.js
deleted file mode 100644
index 0d6ed61877..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/datatype.edit.controller.js
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DataType.EditController
- * @function
- *
- * @description
- * The controller for the content editor
- */
-function DataTypeEditController($scope, $routeParams, appState, navigationService, dataTypeResource, serverValidationManager, contentEditingHelper, formHelper, editorState, dataTypeHelper, eventsService, localizationService) {
-
-    var evts = [];
-    var vm = this;
-
-    vm.header = {};
-    vm.header.editorfor = "visuallyHiddenTexts_newDataType";
-    vm.header.setPageTitle = true;
-
-    //setup scope vars
-    vm.page = {};
-    vm.page.loading = false;
-    vm.page.menu = {};
-    vm.page.menu.currentSection = appState.getSectionState("currentSection");
-    vm.page.menu.currentNode = null;
-
-    //set up the standard data type props
-    vm.properties = {
-        selectedEditor: {
-            alias: "selectedEditor",
-            description: "Select a property editor",
-            label: "Property editor",
-            validation: {
-                mandatory: true
-            }
-        }
-    };
-
-    //setup the pre-values as props
-    vm.preValues = [];
-
-
-    //method used to configure the pre-values when we retrieve them from the server
-    function createPreValueProps(preVals) {
-        vm.preValues = dataTypeHelper.createPreValueProps(preVals);
-    }
-
-
-    function setHeaderNameState(content) {
-        if(content.isSystem == 1) {
-            vm.page.nameLocked = true;
-        }
-    }
-
-
-    function loadDataType() {
-
-        vm.page.loading = true;
-        vm.showIdentifier = true;
-
-        //we are editing so get the content item from the server
-        dataTypeResource.getById($routeParams.id)
-            .then(function(data) {
-
-                vm.preValuesLoaded = true;
-                vm.content = data;
-
-                createPreValueProps(vm.content.preValues);
-
-                setHeaderNameState(vm.content);
-
-                //share state
-                editorState.set(vm.content);
-
-                //in one particular special case, after we've created a new item we redirect back to the edit
-                // route but there might be server validation errors in the collection which we need to display
-                // after the redirect, so we will bind all subscriptions which will show the server validation errors
-                // if there are any and then clear them so the collection no longer persists them.
-                serverValidationManager.notifyAndClearAllSubscriptions();
-
-                navigationService.syncTree({ tree: "dataTypes", path: data.path }).then(function (syncArgs) {
-                    vm.page.menu.currentNode = syncArgs.node;
-                });
-
-                vm.page.loading = false;
-
-            });
-
-    }
-
-    function saveDataType() {
-
-        if (formHelper.submitForm({ scope: $scope })) {
-
-            vm.page.saveButtonState = "busy";
-
-            dataTypeResource.save(vm.content, vm.preValues, $routeParams.create)
-                .then(function(data) {
-
-                    formHelper.resetForm({ scope: $scope });
-
-                    contentEditingHelper.handleSuccessfulSave({
-                        scope: $scope,
-                        savedContent: data,
-                        rebindCallback: function() {
-                            createPreValueProps(data.preValues);
-                        }
-                    });
-
-                    setHeaderNameState(vm.content);
-
-                    //share state
-                    editorState.set(vm.content);
-
-                    navigationService.syncTree({ tree: "dataTypes", path: data.path, forceReload: true }).then(function (syncArgs) {
-                        vm.page.menu.currentNode = syncArgs.node;
-                    });
-
-                    vm.page.saveButtonState = "success";
-
-                    dataTypeHelper.rebindChangedProperties(vm.content, data);
-
-                }, function(err) {
-
-                    formHelper.resetForm({ scope: $scope, hasErrors: true });
-                    //NOTE: in the case of data type values we are setting the orig/new props
-                    // to be the same thing since that only really matters for content/media.
-                    contentEditingHelper.handleSaveError({
-                        err: err
-                    });
-
-                    vm.page.saveButtonState = "error";
-
-                    //share state
-                    editorState.set(vm.content);
-                });
-        }
-
-    };
-
-    vm.save = saveDataType;
-
-    evts.push(eventsService.on("app.refreshEditor", function(name, error) {
-        loadDataType();
-    }));
-
-    //ensure to unregister from all events!
-    $scope.$on('$destroy', function () {
-        for (var e in evts) {
-            eventsService.unsubscribe(evts[e]);
-        }
-    });
-
-    function init() {
-
-        $scope.$watch("vm.content.selectedEditor", function (newVal, oldVal) {
-
-            //when the value changes, we need to dynamically load in the new editor
-            if (newVal && (newVal != oldVal && (oldVal || $routeParams.create))) {
-                //we are editing so get the content item from the server
-                var currDataTypeId = $routeParams.create ? undefined : $routeParams.id;
-                dataTypeResource.getPreValues(newVal, currDataTypeId)
-                    .then(function (data) {
-                        vm.preValuesLoaded = true;
-                        vm.content.preValues = data;
-                        createPreValueProps(vm.content.preValues);
-
-                        setHeaderNameState(vm.content);
-
-                        //share state
-                        editorState.set(vm.content);
-                    });
-            }
-        });
-
-        if ($routeParams.create) {
-
-            vm.page.loading = true;
-            vm.showIdentifier = false;
-
-            //we are creating so get an empty data type item
-            dataTypeResource.getScaffold($routeParams.id)
-                .then(function(data) {
-
-                    vm.preValuesLoaded = true;
-                    vm.content = data;
-                    vm.content.selectedEditor = null;
-
-                    setHeaderNameState(vm.content);
-
-                    //set a shared state
-                    editorState.set(vm.content);
-
-                    vm.page.loading = false;
-
-                });
-        }
-        else {
-            loadDataType();
-        }
-
-        var labelKeys = [
-            "general_settings",
-            "general_info"
-        ];
-
-        localizationService.localizeMany(labelKeys).then(function (values) {
-
-            vm.page.navigation = [
-                {
-                    "name": values[0],
-                    "alias": "settings",
-                    "icon": "icon-settings",
-                    "view": "views/dataTypes/views/datatype.settings.html",
-                    "active": true
-                },
-                {
-                    "name": values[1],
-                    "alias": "info",
-                    "icon": "icon-info",
-                    "view": "views/dataTypes/views/datatype.info.html"
-                }
-            ];
-        });
-    }
-
-    init();
-
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.DataType.EditController", DataTypeEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/dataTypes/delete.html
deleted file mode 100644
index 773724f25d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/delete.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<div class="umb-dialog umb-pane umb-dialog-datatype-delete" ng-controller="Umbraco.Editors.DataType.DeleteController as vm">
-    <div class="umb-dialog-body">
-
-        <ng-switch on="currentNode.nodeType">
-            <div ng-switch-when="container">
-
-                <p class="abstract">
-                    <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>&nbsp;<strong>{{currentNode.name}}</strong>?
-                </p>
-                <umb-confirm on-confirm="vm.performContainerDelete"
-                             on-cancel="vm.cancel"
-                             confirm-button-style="danger"
-                             confirm-label-key="general_delete">
-                </umb-confirm>
-            </div>
-
-            <div ng-switch-default>
-
-
-                    <umb-load-indicator ng-if="vm.loading === true"></umb-load-indicator>
-
-                    <div ng-if="vm.loading === false && vm.hasReferences === false">
-                        <p class="abstract">
-                            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>&nbsp;<strong>{{currentNode.name}}</strong>?
-                        </p>
-                    </div>
-
-                    <div ng-if="vm.loading === false && vm.hasReferences === true">
-
-                        <p class="abstract">
-                            <localize key="editdatatype_hasReferencesDeleteConsequence" tokens="[currentNode.name]">Deleting <strong>{{currentNode.name}}</strong> will have the following consequence</localize>
-                        </p>
-
-                        <hr/>
-
-                        <!-- Document Types -->
-
-                        <div ng-if="vm.references.documentTypes.length > 0">
-
-                            <h5 class="mt4" style="margin-bottom: 20px;">
-                                <localize key="treeHeaders_documentTypes">Document Types</localize>
-                            </h5>
-
-                            <table class="table table-condensed table-bordered">
-                                <thead>
-                                    <tr>
-                                        <th class="umb-dialog-datatype-delete__table-head-column-name"><localize key="general_name">Name</localize></th>
-                                        <th><localize key="general_properties">Properties</localize></th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr ng-repeat="relation in vm.references.documentTypes">
-                                        <td>
-                                            <a title="{{::relation.name}}({{::relation.alias}})" href="#/settings/documentTypes/edit/{{::relation.id}}" ng-click="vm.onReferenceClicked($event)">
-                                                <umb-icon icon="{{relation.icon}}" class="umb-table-body__icon"></umb-icon> {{::relation.name}}
-                                            </a>
-                                        </td>
-                                        <td>
-                                            <div>
-                                                <p class="red" ng-repeat="property in relation.properties">
-                                                    <umb-icon icon="icon-alert" class="icon red"></umb-icon> {{::property.name}}
-                                                </p>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-
-
-                        <!-- Media Types -->
-                        <div ng-if="vm.references.mediaTypes.length > 0">
-
-                            <h5 class="mt4" style="margin-bottom: 20px;">
-                                <localize key="treeHeaders_mediaTypes">Media Types</localize>
-                            </h5>
-
-                            <table class="table table-condensed table-bordered">
-                                <thead>
-                                    <tr>
-                                        <th class="umb-dialog-datatype-delete__table-head-column-name"><localize key="general_name">Name</localize></th>
-                                        <th><localize key="general_properties">Properties</localize></th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr ng-repeat="relation in vm.references.mediaTypes">
-                                        <td>
-                                            <a title="{{::relation.name}}({{::relation.alias}})" href="#/settings/documentTypes/edit/{{::relation.id}}" ng-click="vm.onReferenceClicked($event)">
-                                                <umb-icon icon="{{relation.icon}}" class="umb-table-body__icon"></umb-icon> {{::relation.name}}
-                                            </a>
-                                        </td>
-                                        <td>
-                                            <div>
-                                                <p class="red" ng-repeat="property in relation.properties">
-                                                    <umb-icon icon="icon-alert" class="icon red"></umb-icon> {{::property.name}}
-                                                </p>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-
-
-                        <!-- Member Types -->
-                        <div ng-if="vm.references.memberTypes.length > 0">
-
-                            <h5 class="mt4" style="margin-bottom: 20px;">
-                                <localize key="treeHeaders_memberTypes">Member Types</localize>
-                            </h5>
-
-                            <table class="table table-condensed table-bordered">
-                                    <thead>
-                                        <tr>
-                                            <th class="umb-dialog-datatype-delete__table-head-column-name"><localize key="general_name">Name</localize></th>
-                                            <th><localize key="general_properties">Properties</localize></th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <tr ng-repeat="relation in vm.references.memberTypes">
-                                            <td>
-                                                <a title="{{::relation.name}}({{::relation.alias}})" href="#/settings/documentTypes/edit/{{::relation.id}}" ng-click="vm.onReferenceClicked($event)">
-                                                    <umb-icon icon="{{relation.icon}}" class="umb-table-body__icon"></umb-icon> {{::relation.name}}
-                                                </a>
-                                            </td>
-                                            <td>
-                                                <div>
-                                                    <p class="red" ng-repeat="property in relation.properties">
-                                                        <umb-icon icon="icon-alert" class="icon red"></umb-icon> {{::property.name}}
-                                                    </p>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-
-                        </div>
-
-                        <umb-checkbox model="vm.confirmed" text="{{vm.labels.deleteConfirm}}"></umb-checkbox>
-
-                    </div>
-
-
-                <umb-confirm confirm-disabled="!(vm.confirmed || vm.hasReferences === false)"
-                             on-confirm="vm.performDelete"
-                             on-cancel="vm.cancel"
-                             confirm-button-style="danger"
-                             confirm-label-key="general_delete">
-                </umb-confirm>
-            </div>
-        </ng-switch>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/dataTypes/edit.html
deleted file mode 100644
index 2d481de852..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/edit.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<div data-element="editor-data-types" ng-controller="Umbraco.Editors.DataType.EditController as vm">
-
-    <form name="contentForm" novalidate val-form-manager ng-submit="vm.save()">
-        <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
-        <umb-editor-view ng-if="!vm.page.loading">
-            <umb-editor-header name="vm.content.name"
-                            name-locked="vm.page.nameLocked"
-                            hide-icon="true"
-                            hide-description="true"
-                            hide-alias="true"
-                            navigation="vm.page.navigation"
-                            editorfor="vm.header.editorfor"
-                            setpagetitle="vm.header.setPageTitle">
-            </umb-editor-header>
-
-            <umb-editor-container class="form-horizontal">
-                <umb-editor-sub-views sub-views="vm.page.navigation" model="vm">
-                </umb-editor-sub-views>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                <umb-editor-footer-content-right>
-                    <umb-button type="submit"
-                                button-style="success"
-                                state="vm.page.saveButtonState"
-                                shortcut="ctrl+s"
-                                label="Save"
-                                label-key="buttons_save">
-                    </umb-button>
-                </umb-editor-footer-content-right>
-            </umb-editor-footer>
-        </umb-editor-view>
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/move.controller.js b/src/Umbraco.Web.UI.Client/src/views/dataTypes/move.controller.js
deleted file mode 100644
index 742a2caa29..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/move.controller.js
+++ /dev/null
@@ -1,67 +0,0 @@
-angular.module("umbraco")
-.controller("Umbraco.Editors.DataType.MoveController",
-    function ($scope, dataTypeResource, treeService, navigationService, notificationsService, appState, eventsService) {
-
-        $scope.dialogTreeApi = {};
-        $scope.source = _.clone($scope.currentNode);
-
-        function nodeSelectHandler(args) {
-            args.event.preventDefault();
-            args.event.stopPropagation();
-
-            if ($scope.target) {
-                //un-select if there's a current one selected
-                $scope.target.selected = false;
-            }
-
-            $scope.target = args.node;
-            $scope.target.selected = true;
-        }
-
-        $scope.move = function () {
-
-            $scope.busy = true;
-            $scope.error = false;
-
-            dataTypeResource.move({ parentId: $scope.target.id, id: $scope.source.id })
-                .then(function (path) {
-                    $scope.error = false;
-                    $scope.success = true;
-                    $scope.busy = false;
-
-                    //first we need to remove the node that launched the dialog
-                    treeService.removeNode($scope.currentNode);
-
-                    //get the currently edited node (if any)
-                    var activeNode = appState.getTreeState("selectedNode");
-
-                    //we need to do a double sync here: first sync to the moved content - but don't activate the node,
-                    //then sync to the currenlty edited content (note: this might not be the content that was moved!!)
-
-                    navigationService.syncTree({ tree: "dataTypes", path: path, forceReload: true, activate: false }).then(function (args) {
-                        if (activeNode) {
-                            var activeNodePath = treeService.getPath(activeNode).join();
-                            //sync to this node now - depending on what was copied this might already be synced but might not be
-                            navigationService.syncTree({ tree: "dataTypes", path: activeNodePath, forceReload: false, activate: true });
-                        }
-                    });
-
-                    eventsService.emit('app.refreshEditor');
-
-                }, function (err) {
-                    $scope.success = false;
-                    $scope.error = err;
-                    $scope.busy = false;
-                    
-                });
-        };
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-        };
-
-        $scope.close = function() {
-            navigationService.hideDialog();
-        };
-        
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/move.html b/src/Umbraco.Web.UI.Client/src/views/dataTypes/move.html
deleted file mode 100644
index 7e7e70d650..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/move.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="umb-dialog" ng-controller="Umbraco.Editors.DataType.MoveController">
-
-    <div class="umb-dialog-body">
-        <div class="umb-pane">
-
-            <p class="abstract" ng-hide="success">
-                <localize key="editdatatype_selectFolder">Select the folder to move</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="editdatatype_inTheTree">to in the tree structure below</localize>
-            </p>
-
-            <umb-loader ng-show="busy"></umb-loader>
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-            <div ng-show="success">
-                <div class="alert alert-success">
-                    <strong>{{source.name}}</strong> <localize key="editdatatype_wasMoved">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong>
-                </div>
-                <button class="btn btn-primary" ng-click="close()">Ok</button>
-            </div>
-
-            <div ng-hide="success">
-
-                <div>
-                    <umb-tree section="settings"
-                              treealias="dataTypes"
-                              customtreeparams="foldersonly=1"
-                              hideheader="false"
-                              hideoptions="true"
-                              isdialog="true"
-                              api="dialogTreeApi"
-                              on-init="onTreeInit()"
-                              enablecheckboxes="true">
-                    </umb-tree>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
-            <localize key="general_cancel">Cancel</localize>
-        </button>
-        <button class="btn btn-primary" ng-click="move()" ng-disabled="busy || !target">
-            <localize key="actions_move">Move</localize>
-        </button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/rename.html b/src/Umbraco.Web.UI.Client/src/views/dataTypes/rename.html
deleted file mode 100644
index 380775dd4b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/rename.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.ContentTypeContainers.RenameController" ng-cloak>
-
-    <div class="umb-pane">
-        <form novalidate name="renameFolderForm"
-              ng-submit="renameContainer('dataTypeResource', 'dataTypes')"
-              val-form-manager>
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-            <umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
-                <input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
-            </umb-control-group>
-
-            <button type="submit" class="btn btn-primary"><localize key="general_rename">Rename</localize></button>
-        </form>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.info.controller.js b/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.info.controller.js
deleted file mode 100644
index ffee8b023c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.info.controller.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DataType.InfoController
- * @function
- *
- * @description
- * The controller for the info view of the datatype editor
- */
-function DataTypeInfoController($scope, $routeParams, dataTypeResource, $timeout, editorService) {
-
-    var vm = this;
-    var referencesLoaded = false;
-
-    vm.references = {};
-    vm.hasReferences = false;
-
-    vm.view = {};
-    vm.view.loading = true;
-    vm.openDocumentType = openDocumentType;
-    vm.openMediaType = openMediaType;
-    vm.openMemberType = openMemberType;
-
-    /** Loads in the data type references one time */
-    function loadRelations() {
-        if (!referencesLoaded) {
-            referencesLoaded = true;
-            dataTypeResource.getReferences($routeParams.id)
-                .then(function (data) {
-                    vm.view.loading = false;
-                    vm.references = data;
-                    vm.hasReferences = data.documentTypes.length > 0 || data.mediaTypes.length > 0 || data.memberTypes.length > 0;
-                });
-        }
-    }
-
-    function openDocumentType(id, event) {
-        open(id, event, "documentType");
-    }
-
-    function openMediaType(id, event) {
-        open(id, event, "mediaType");
-    }
-
-    function openMemberType(id, event) {
-        open(id, event, "memberType");
-    }
-
-    function open(id, event, type) {
-        // targeting a new tab/window?
-        if (event.ctrlKey ||
-            event.shiftKey ||
-            event.metaKey || // apple
-            (event.button && event.button === 1) // middle click, >IE9 + everyone else
-        ) {
-            // yes, let the link open itself
-            return;
-        }
-        event.stopPropagation();
-        event.preventDefault();
-
-        const editor = {
-            id: id,
-            entityType: type,
-            submit: function (model) {
-                editorService.close();
-                vm.view.loading = true;
-                referencesLoaded = false;
-                loadRelations();
-            },
-            close: function () {
-                editorService.close();
-            }
-        };
-
-        editorService.contentTypeEditor(editor);
-    }
-
-    loadRelations();
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.DataType.InfoController", DataTypeInfoController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.info.html b/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.info.html
deleted file mode 100644
index ac414fbbc4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.info.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<div ng-controller="Umbraco.Editors.DataType.InfoController as vm">
-
-    <div class="umb-package-details">
-        <div class="umb-package-details__main-content">
-
-
-            <umb-load-indicator ng-if="vm.view.loading === true"></umb-load-indicator>
-
-
-            <umb-box ng-if="vm.view.loading === false && vm.hasReferences === false">
-                <umb-box-header title-key="references_tabName"></umb-box-header>
-                <umb-box-content>
-                    <umb-empty-state size="small">
-                        <localize key="references_DataTypeNoReferences">This Data Type has no references.</localize>
-                    </umb-empty-state>
-                </umb-box-content>
-            </umb-box>
-
-
-            <div ng-if="vm.view.loading === false && vm.hasReferences === true">
-
-                <!-- Document Types -->
-
-                <div ng-if="vm.references.documentTypes.length > 0" class="mb4">
-
-                    <h5 class="mt0" style="margin-bottom: 20px;">
-                        <localize key="references_labelUsedByDocumentTypes">Used in Document Types</localize>
-                    </h5>
-
-                    <div class="umb-table">
-                        <div class="umb-table-head">
-                            <div class="umb-table-row">
-                                <div class="umb-table-cell"></div>
-                                <div class="umb-table-cell umb-table__name not-fixed"><localize key="general_name">Name</localize></div>
-                                <div class="umb-table-cell"><localize key="content_alias">Alias</localize></div>
-                                <div class="umb-table-cell"><localize key="references_usedByProperties">Used in</localize></div>
-                                <div class="umb-table-cell umb-table-cell--nano"><localize key="general_open" style="visibility:hidden;">Open</localize></div>
-                            </div>
-                        </div>
-                        <div class="umb-table-body">
-                            <div class="umb-table-row" ng-repeat="reference in vm.references.documentTypes">
-                                <div class="umb-table-cell"><umb-icon icon="{{reference.icon}}" class="umb-table-body__icon"></umb-icon></div>
-                                <div class="umb-table-cell umb-table__name"><span>{{::reference.name}}</span></div>
-                                <div class="umb-table-cell"><span title="{{::reference.alias}}">{{::reference.alias}}</span></div>
-                                <div class="umb-table-cell --noOverflow"><span>{{::reference.properties | umbCmsJoinArray:', ':'name'}} {{::reference.listViews | umbCmsJoinArray:', ':'name'}}</span></div>
-                                <div class="umb-table-cell umb-table-cell--nano"><a href="#/settings/documentTypes/edit/{{::reference.id}}" ng-click="vm.openDocumentType(reference.id, $event)"><localize key="general_open">Open</localize></a></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-
-                <!-- Media Types -->
-                <div ng-if="vm.references.mediaTypes.length > 0" class="mb4">
-                    
-                    <h5 class="mt0" style="margin-bottom: 20px;">
-                        <localize key="references_labelUsedByMediaTypes">Used in Media Types</localize>
-                    </h5>
-
-                    <div class="umb-table">
-                        <div class="umb-table-head">
-                            <div class="umb-table-row">
-                                <div class="umb-table-cell"></div>
-                                <div class="umb-table-cell umb-table__name not-fixed"><localize key="general_name">Name</localize></div>
-                                <div class="umb-table-cell"><localize key="content_alias">Alias</localize></div>
-                                <div class="umb-table-cell"><localize key="references_usedByProperties">Used in</localize></div>
-                                <div class="umb-table-cell umb-table-cell--nano"><localize key="general_open" style="visibility:hidden;">Open</localize></div>
-                            </div>
-                        </div>
-                        <div class="umb-table-body">
-                            <div class="umb-table-row" ng-repeat="reference in vm.references.mediaTypes">
-                                <div class="umb-table-cell"><umb-icon icon="{{reference.icon}}" class="umb-table-body__icon"></umb-icon></div>
-                                <div class="umb-table-cell umb-table__name"><span>{{::reference.name}}</span></div>
-                                <div class="umb-table-cell"><span title="{{::reference.alias}}">{{::reference.alias}}</span></div>
-                                <div class="umb-table-cell --noOverflow"><span>{{::reference.properties | umbCmsJoinArray:', ':'name'}} {{::reference.listViews | umbCmsJoinArray:', ':'name'}} </span></div>
-                                <div class="umb-table-cell umb-table-cell--nano"><a href="#/settings/mediaTypes/edit/{{::reference.id}}" ng-click="vm.openMediaType(reference.id, $event)"><localize key="general_open">Open</localize></a></div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-
-
-                <!-- Member Types -->
-                <div ng-if="vm.references.memberTypes.length > 0" class="mb4">
-
-                    <h5 class="mt0" style="margin-bottom: 20px;">
-                        <localize key="references_labelUsedByMemberTypes">Used in Member Types</localize>
-                    </h5>
-
-                    <div class="umb-table">
-                        <div class="umb-table-head">
-                            <div class="umb-table-row">
-                                <div class="umb-table-cell"></div>
-                                <div class="umb-table-cell umb-table__name not-fixed"><localize key="general_name">Name</localize></div>
-                                <div class="umb-table-cell"><localize key="content_alias">Alias</localize></div>
-                                <div class="umb-table-cell"><localize key="references_usedByProperties">Used in</localize></div>
-                                <div class="umb-table-cell umb-table-cell--nano"><localize key="general_open" style="visibility:hidden;">Open</localize></div>
-                            </div>
-                        </div>
-                        <div class="umb-table-body">
-                            <div class="umb-table-row" ng-repeat="reference in vm.references.memberTypes">
-                                <div class="umb-table-cell"><umb-icon icon="{{reference.icon}}" class="umb-table-body__icon"></umb-icon></div>
-                                <div class="umb-table-cell umb-table__name"><span>{{::reference.name}}</span></div>
-                                <div class="umb-table-cell"><span title="{{::reference.alias}}">{{::reference.alias}}</span></div>
-                                <div class="umb-table-cell --noOverflow"><span>{{::reference.properties | umbCmsJoinArray:', ':'name'}} {{::reference.listViews | umbCmsJoinArray:', ':'name'}}</span></div>
-                                <div class="umb-table-cell umb-table-cell--nano"><a href="#/settings/memberTypes/edit/{{::reference.id}}" ng-click="vm.openMemberType(reference.id, $event)"><localize key="general_open">Open</localize></a></div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-
-
-            </div>
-
-        </div>
-
-        <div class="umb-package-details__sidebar">
-            <umb-box data-element="node-info-general">
-                <umb-box-header title-key="general_general"></umb-box-header>
-                <umb-box-content class="block-form">
-
-                    <umb-control-group label="Id" ng-if="model.showIdentifier">
-                        <div>{{model.content.id}}</div>
-                        <small>{{model.content.key}}</small>
-                    </umb-control-group>
-
-                    <umb-control-group label="Property Editor Alias" ng-if="model.content.selectedEditor">
-                        <div>{{model.content.selectedEditor}}</div>
-                    </umb-control-group>
-
-                </umb-box-content>
-            </umb-box>
-        </div>
-
-    </div>
-
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.settings.controller.js b/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.settings.controller.js
deleted file mode 100644
index e0adb48112..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.settings.controller.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DataType.SettingsController
- * @function
- *
- * @description
- * The controller for the settings view of the datatype editor
- */
- function DataTypeSettingsController($scope, $routeParams, dataTypeResource, editorService) {
-
-  var vm = this;
-
-  vm.selectedEditorModel = null;
-
-  const dataTypeId = $routeParams.id;
-  const dataTypesCanBeChangedConfig = window.Umbraco.Sys.ServerVariables.umbracoSettings.dataTypesCanBeChanged;
-
-  vm.allowChangePropertyEditor = false;
-  vm.changePropertyEditorHelpTextIsVisible = false;
-  vm.dataTypeHasValues = false;
-
-  vm.openPropertyEditorPicker = openPropertyEditorPicker;
-
-  function init () {
-    vm.selectedEditorModel = $scope.model.content.availableEditors.find(editor => editor.alias === $scope.model.content.selectedEditor);
-
-    if (dataTypeId !== "-1" && (dataTypesCanBeChangedConfig === "False" || dataTypesCanBeChangedConfig === "FalseWithHelpText")) {
-
-      // We always allow changing the property editor if the data type is not in use.
-      dataTypeResource.hasValues($routeParams.id)
-        .then(data => {
-          vm.dataTypeHasValues = data.hasValues;
-          vm.allowChangePropertyEditor = !vm.dataTypeHasValues;
-          vm.changePropertyEditorHelpTextIsVisible = !vm.allowChangePropertyEditor && dataTypesCanBeChangedConfig === "FalseWithHelpText";
-        });
-    } else {
-      vm.allowChangePropertyEditor = true;
-    }
-  }
-
-  function openPropertyEditorPicker () {
-
-    const propertyEditorPicker = {
-      view: 'views/common/infiniteeditors/propertyeditorpicker/propertyeditorpicker.html',
-      size: 'small',
-      propertyEditors: $scope.model.content.availableEditors,
-      submit: model => {
-        const selected = model.selection[0];
-        $scope.model.content.selectedEditor = selected;
-        vm.selectedEditorModel = $scope.model.content.availableEditors.find(editor => editor.alias === selected);
-        editorService.close();
-      },
-      close: () => editorService.close()
-    };
-
-    editorService.open(propertyEditorPicker);
-  }
-
-  init();
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.DataType.SettingsController", DataTypeSettingsController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.settings.html b/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.settings.html
deleted file mode 100644
index f0eb5b535b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.settings.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<div ng-controller="Umbraco.Editors.DataType.SettingsController as vm">
-
-    <umb-box>
-
-        <umb-box-content>
-
-            <umb-property property="model.properties.selectedEditor">
-
-                <ng-form name="propertyEditorForm">
-
-                    <div
-                        ng-model="model.content.selectedEditor"
-                        name="selectedEditor"
-                        val-require-component
-                        class="umb-property-editor--limit-width">
-
-                        <umb-button
-                            ng-if="!model.content.selectedEditor"
-                            data-element="property-editor-add"
-                            type="button"
-                            button-style="[placeholder, block]"
-                            label-key="propertyEditorPicker_openPropertyEditorPicker"
-                            ng-click="vm.openPropertyEditorPicker()">
-                        </umb-button>
-
-                        <div class="help-inline" ng-messages="propertyEditorForm.selectedEditor.$error" show-validation-on-submit>
-                            <span ng-message="valRequiredComponent">
-                                <localize key="general_required">Required</localize>
-                            </span>
-                        </div>
-
-                        <div ng-if="model.content.selectedEditor">
-                            <umb-node-preview
-                                single
-                                icon="vm.selectedEditorModel.icon || 'icon-autofill'"
-                                name="vm.selectedEditorModel.name"
-                                description="vm.selectedEditorModel.alias"
-                                allow-change="vm.allowChangePropertyEditor"
-                                on-change="vm.openPropertyEditorPicker()">
-                            </umb-node-preview>
-
-                            <div ng-if="vm.changePropertyEditorHelpTextIsVisible" class="mt2 umb-alert umb-alert--info" style="max-width: 800px;">
-                                <localize key="editdatatype_canChangePropertyEditorHelp">
-                                    Changing a property editor on a data type with a stored value is disabled.
-                                </localize>
-                            </div>
-                        </div>
-                    </div>
-                </ng-form>
-
-            </umb-property>
-
-            <umb-property property="preValue"
-                        ng-repeat="preValue in model.preValues">
-                <umb-property-editor model="preValue" pre-values="model.preValues" is-pre-value="true"></umb-property-editor>
-            </umb-property>
-
-        </umb-box-content>
-
-    </umb-box>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html
deleted file mode 100644
index 62546298f0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="umbracoDialog" ng-controller="Umbraco.Editors.Dictionary.CreateController as vm">
-
-    <form novalidate name="createDictionaryForm"
-          ng-submit="vm.createItem()"
-          val-form-manager>
-        <div class="umb-dialog-body with-footer">
-            <div class="umb-pane">
-                <h5 tabindex="0"><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
-            </div>
-
-            <div class="umb-pane">
-                <umb-control-group label="@general_name" hide-label="false" alias="itemKey">
-                    <input type="text" name="itemKey" id="itemKey" ng-model="vm.itemKey" class="umb-textstring textstring input-block-level"
-                           umb-auto-focus required
-                           maxlength="1000" />
-                </umb-control-group>
-            </div>
-        </div>
-        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-            <umb-button type="button"
-                        button-style="link"
-                        action="vm.close()"
-                        label-key="general_close">
-            </umb-button>
-            <umb-button type="submit"
-                        button-style="primary"
-                        label-key="general_create">
-            </umb-button>
-        </div>
-    </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/delete.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/delete.html
deleted file mode 100644
index 1f7e0940eb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/delete.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Dictionary.DeleteController as vm" >
-  <div class="umb-dialog-body" auto-scale="90">
-        
-    <p class="abstract">
-      <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-    </p>
-
-    <umb-confirm on-confirm="vm.performDelete" on-cancel="vm.cancel"  confirm-button-style="danger" >    
-    </umb-confirm>
-
-  </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js
deleted file mode 100644
index 74c1455aea..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Dictionary.CreateController
- * @function
- * 
- * @description
- * The controller for creating dictionary items
- */
-function DictionaryCreateController($scope, $location, dictionaryResource, navigationService, notificationsService, formHelper, appState) {
-
-    var vm = this;
-
-    vm.itemKey = "";
-    vm.createItem = createItem;
-    vm.close = close;
-    $scope.$emit("$changeTitle", "");
-
-    function close() {
-        navigationService.hideDialog();
-    }
-
-    function createItem() {
-
-        if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createDictionaryForm })) {
-
-            var node = $scope.currentNode;
-
-            dictionaryResource.create(node.id, vm.itemKey).then(function (data) {
-                navigationService.hideMenu();
-
-                // set new item as active in tree
-                var currPath = node.path ? node.path : "-1";
-                navigationService.syncTree({ tree: "dictionary", path: currPath + "," + data, forceReload: true, activate: true });
-
-                // reset form state
-                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createDictionaryForm });
-
-                // navigate to edit view
-                var currentSection = appState.getSectionState("currentSection");
-                $location.path("/" + currentSection + "/dictionary/edit/" + data);
-
-            }, function (err) {
-                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createDictionaryForm, hasErrors: true });
-                if (err.data && err.data.message) {
-                    notificationsService.error(err.data.message);
-                    navigationService.hideMenu();
-                }
-            });
-        }
-    }
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Dictionary.CreateController", DictionaryCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.delete.controller.js
deleted file mode 100644
index 43d6bac401..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.delete.controller.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Dictionary.DeleteController
- * @function
- * 
- * @description
- * The controller for deleting dictionary items
- */
-function DictionaryDeleteController($scope, $location, dictionaryResource, treeService, navigationService, appState) {
-    var vm = this;
-
-    function cancel() {
-        navigationService.hideDialog();
-    }
-
-    function performDelete() {
-        // stop from firing again on double-click
-        if ($scope.busy) { return false; }
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        $scope.busy = true;
-
-        dictionaryResource.deleteById($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            // get the parent id 
-            var parentId = $scope.currentNode.parentId;
-
-            treeService.removeNode($scope.currentNode);
-
-            navigationService.hideMenu();
-
-            var currentSection = appState.getSectionState("currentSection");
-            if (parentId !== "-1") {
-                // set the view of the parent item
-                $location.path("/" + currentSection + "/dictionary/edit/" + parentId);
-            } else {
-                // we have no parent, so redirect to section
-                $location.path("/" + currentSection + "/");
-            }
-
-        });
-    }
-
-    vm.cancel = cancel;
-    vm.performDelete = performDelete;
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Dictionary.DeleteController", DictionaryDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js
deleted file mode 100644
index d77273f0d9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.edit.controller.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Dictionary.EditController
- * @function
- * 
- * @description
- * The controller for editing dictionary items
- */
-function DictionaryEditController($scope, $routeParams, $location, dictionaryResource, navigationService, appState, editorState, contentEditingHelper, formHelper, notificationsService, localizationService, userService) {
-
-  var vm = this;
-
-  //setup scope vars
-  vm.nameDirty = false;
-  vm.header = {};
-  vm.header.editorfor = "template_insertDictionaryItem";
-  vm.header.setPageTitle = true;
-
-  vm.page = {};
-  vm.page.navigation = {};
-  vm.page.loading = false;
-  vm.page.nameLocked = false;
-  vm.page.menu = {};
-  vm.page.menu.currentSection = appState.getSectionState("currentSection");
-  vm.page.menu.currentNode = null;
-  vm.description = "";
-  vm.showBackButton = true;
-  vm.maxlength = 1000;
-  vm.currentUser = null;
-
-  vm.save = saveDictionary;
-  vm.back = back;
-  vm.change = change;
-
-  function loadDictionary() {
-
-    vm.page.loading = true;
-
-    //we are editing so get the content item from the server
-    dictionaryResource.getById($routeParams.id)
-      .then(function (data) {
-        bindDictionary(data);
-        vm.page.navigation = data.apps;
-        data.apps[0].active = true;
-        vm.page.loading = false;
-      });
-  }
-
-  function createTranslationProperty(translation) {
-    return {
-      alias: translation.isoCode,
-      label: translation.displayName,
-      hideLabel: false
-    }
-  }
-
-  function bindDictionary(data) {
-
-    data.translations.forEach(translation => {
-      const allowUpdate = vm.currentUser.allowedLanguageIds && vm.currentUser.allowedLanguageIds.length > 0 && vm.currentUser.allowedLanguageIds.includes(translation.languageId);
-      translation.allowUpdate = allowUpdate;
-    });
-
-    localizationService.localize("dictionaryItem_description").then(function (value) {
-      vm.description = value.replace("%0%", data.name);
-    });
-
-    // create data for  umb-property displaying
-    for (var i = 0; i < data.translations.length; i++) {
-      data.translations[i].property = createTranslationProperty(data.translations[i]);
-      change(data.translations[i]);
-    }
-
-    contentEditingHelper.handleSuccessfulSave({
-      scope: $scope,
-      savedContent: data
-    });
-
-    // set content
-    vm.content = data;
-
-    //share state
-    editorState.set(vm.content);
-
-    navigationService.syncTree({ tree: "dictionary", path: data.path, forceReload: true }).then(function (syncArgs) {
-      vm.page.menu.currentNode = syncArgs.node;
-    });
-  }
-
-  function onInit() {
-    vm.page.loading = true;
-
-    userService.getCurrentUser().then(user => {
-      vm.currentUser = user;
-      vm.page.loading = false;
-
-      loadDictionary();
-    });
-  }
-
-  function saveDictionary() {
-    if (formHelper.submitForm({ scope: $scope, statusMessage: "Saving..." })) {
-
-      vm.page.saveButtonState = "busy";
-
-      dictionaryResource.save(vm.content, vm.nameDirty)
-        .then(function (data) {
-
-          formHelper.resetForm({ scope: $scope });
-
-          bindDictionary(data);
-
-          vm.page.saveButtonState = "success";
-        },
-          function (err) {
-
-            formHelper.resetForm({ scope: $scope, hasErrors: true });
-
-            contentEditingHelper.handleSaveError({
-              err: err
-            });
-
-            notificationsService.error(err.data.message);
-
-            vm.page.saveButtonState = "error";
-          });
-    }
-  }
-
-  function back() {
-    $location.path(vm.page.menu.currentSection + "/dictionary/list");
-  }
-
-  function change(translation) {
-    if (translation.translation) {
-      var charsCount = translation.translation.length;
-      translation.nearMaxLimit = charsCount > Math.max(vm.maxlength * .8, vm.maxlength - 50);
-    }
-  }
-
-  $scope.$watch("vm.content.name", function (newVal, oldVal) {
-    //when the value changes, we need to set the name dirty
-    if (newVal && (newVal !== oldVal) && typeof (oldVal) !== "undefined") {
-      vm.nameDirty = true;
-    }
-  });
-
-  onInit();
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Dictionary.EditController", DictionaryEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js
deleted file mode 100644
index 788e438936..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Dictionary.ListController
- * @function
- * 
- * @description
- * The controller for listting dictionary items
- */
-function DictionaryListController($scope, $location, dictionaryResource, localizationService, appState, navigationService) {
-
-    const vm = this;
-    
-    vm.title = "Dictionary overview";
-    vm.loading = false;
-    vm.items = [];
-    vm.filter = {
-      searchTerm: ""
-    };
-
-    function loadList() {
-
-        vm.loading = true;
-        
-        dictionaryResource.getList()
-            .then(data => {
-                let items = data || [];
-                
-                items.forEach(item => {
-                  item.style = { "paddingLeft": item.level * 10 };
-                });
-                vm.items = items;
-                vm.loading = false;
-            });
-    }
-
-    function clickItem(id) {
-        var currentSection = appState.getSectionState("currentSection");
-        $location.path("/" + currentSection + "/dictionary/edit/" + id);
-    }
-
-    function createNewItem() {
-        var rootNode = appState.getTreeState("currentRootNode").root;
-        //We need to load the menu first before we can access the menu actions.
-        navigationService.showMenu({ node: rootNode }).then(function () {
-            const action = appState.getMenuState("menuActions").find(item => item.alias === "create");
-            navigationService.executeMenuAction(action, rootNode, appState.getSectionState("currentSection"));
-        });
-      }
-
-    vm.clickItem = clickItem;
-    vm.createNewItem = createNewItem;
-
-    function onInit() {
-        localizationService.localize("dictionaryItem_overviewTitle").then(value => {
-            vm.title = value;
-        });
-
-        loadList();
-    }
-
-    onInit();
-}
-
-
-angular.module("umbraco").controller("Umbraco.Editors.Dictionary.ListController", DictionaryListController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
deleted file mode 100644
index fad9bd9026..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<div ng-controller="Umbraco.Editors.Dictionary.EditController as vm">
-  <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
-
-  <form name="contentForm"
-        ng-submit="vm.save()"
-        novalidate
-        val-form-manager>
-
-    <umb-editor-view ng-if="!vm.page.loading">
-      <umb-editor-header name="vm.content.name"
-                         name-locked="vm.page.nameLocked"
-                         hide-icon="true"
-                         hide-description="true"
-                         hide-alias="true"
-                         navigation="vm.page.navigation"
-                         on-back="vm.back()"
-                         show-back-button="vm.showBackButton"
-                         editorfor="vm.header.editorfor"
-                         setpagetitle="vm.header.setPageTitle">
-      </umb-editor-header>
-
-      <umb-editor-container class="form-horizontal">
-        <umb-editor-sub-views sub-views="vm.page.navigation"
-                              model="vm">
-        </umb-editor-sub-views>
-      </umb-editor-container>
-
-      <umb-editor-footer>
-
-        <umb-editor-footer-content-right>
-
-          <umb-button type="submit"
-                      button-style="success"
-                      state="vm.page.saveButtonState"
-                      shortcut="ctrl+s"
-                      label="Save"
-                      label-key="buttons_save"
-                      ng-disabled="vm.page.loading">
-          </umb-button>
-
-        </umb-editor-footer-content-right>
-
-      </umb-editor-footer>
-    </umb-editor-view>
-  </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/export.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/export.controller.js
deleted file mode 100644
index df922e6d96..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/export.controller.js
+++ /dev/null
@@ -1,18 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.Editors.Dictionary.ExportController",
-        function ($scope, dictionaryResource, navigationService) {
-            $scope.includeChildren = false;
-
-            $scope.toggleHandler = function () {
-              $scope.includeChildren = !$scope.includeChildren
-            };
-
-            $scope.export = function () {
-                dictionaryResource.exportItem($scope.currentNode.id, $scope.includeChildren);
-                navigationService.hideMenu();
-            };
-
-            $scope.cancel = function () {
-                navigationService.hideDialog();
-            };
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/export.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/export.html
deleted file mode 100644
index c1f5c6b2da..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/export.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Dictionary.ExportController">
-  <div class="umb-dialog-body form-horizontal" ng-cloak>
-      <umb-pane>
-        <umb-control-group localize="label" label="@defaultdialogs_includeDescendants">
-          <umb-toggle checked="includeChildren" on-click="toggleHandler()"></umb-toggle>
-        </umb-control-group>
-      </umb-pane>
-  </div>
-  <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-    <button type="button" class="btn btn-link" ng-click="cancel()">
-      <localize key="general_cancel">Cancel</localize>
-    </button>
-    <button class="btn btn-primary" ng-click="export()">
-      <localize key="actions_export">Export</localize>
-    </button>
-  </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/import.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/import.controller.js
deleted file mode 100644
index 3936217343..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/import.controller.js
+++ /dev/null
@@ -1,67 +0,0 @@
-angular.module("umbraco")
-  .controller("Umbraco.Editors.Dictionary.ImportController",
-    function ($scope, dictionaryResource, notificationsService, navigationService, Upload, umbRequestHelper) {
-      var vm = this;
-
-      vm.state = "upload";
-      vm.model = {};
-      vm.uploadStatus = "";
-
-      vm.cancelButtonLabel = "cancel";
-
-      $scope.dialogTreeApi = {};
-
-      function nodeSelectHandler(args) {
-        args.event.preventDefault();
-        args.event.stopPropagation();
-
-        if ($scope.target) {
-          //un-select if there's a current one selected
-          $scope.target.selected = false;
-        }
-        $scope.target = args.node;
-        $scope.target.selected = true;
-      }
-
-      $scope.handleFiles = function (files, event, invalidFiles) {
-        if (files && files.length > 0) {
-          $scope.upload(files[0]);
-        }
-      };
-
-      $scope.upload = function (file) {
-        Upload.upload({
-          url: umbRequestHelper.getApiUrl("dictionaryApiBaseUrl", "Upload"),
-          fields: {},
-          file: file
-        }).then(function (response) {
-
-          vm.model = response.data;
-          vm.state = "confirm";
-          vm.uploadStatus = "done";
-
-        }, function (err) {
-          notificationsService.error(err.data.notifications[0].header, err.data.notifications[0].message);
-        });
-      };
-
-      $scope.import = function () {
-        var parentId = $scope.target !== undefined ? $scope.target.id : 0;
-
-        dictionaryResource.importItem(vm.model.tempFileName, parentId).then(function (path) {
-          navigationService.syncTree({ tree: "dictionary", path: path, forceReload: true, activate: false });
-
-          vm.state = "done";
-          vm.cancelButtonLabel = "general_close";
-        });
-      };
-
-      $scope.onTreeInit = function () {
-        $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-      };
-
-      $scope.close = function () {
-        navigationService.hideDialog();
-      };
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/import.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/import.html
deleted file mode 100644
index 8f0a1ec15d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/import.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<div class="umb-dialog" ng-controller="Umbraco.Editors.Dictionary.ImportController as vm">
-
-  <div class="umb-dialog-body with-footer">
-    <div class="umb-pane">
-      <div ng-if="vm.state === 'upload'">
-        <p>
-          <localize key="dictionary_importDictionaryItemHelp">
-            To import a Dictionary item, find the '.udt' file on your computer by clicking the 'Import' button (you'll be
-            asked for confirmation on the next screen)
-          </localize>
-        </p>
-
-        <form name="importDictionaryItem">
-
-          <!-- Select files -->
-          <button accept=".udt"
-                  class="btn btn-action"
-                  name="file"
-                  ng-model="filesHolder"
-                  ngf-change="handleFiles($files, $event, $invalidFiles)"
-                  ngf-multiple="true"
-                  ngf-pattern="*.udt"
-                  ngf-select>
-            <localize key="general_import">Import</localize>
-          </button>
-        </form>
-      </div>
-      <div ng-if="vm.state === 'confirm'">
-        <strong>
-          <localize key="dictionaryListCaption">Dictionary items</localize>
-          :
-        </strong>
-        <div ng-repeat="dictionaryItem in vm.model.dictionaryItems" style="padding-left:{{dictionaryItem.level * 20}}px;">{{dictionaryItem.name}}</div>
-        <br />
-        <br />
-
-        <div>
-
-          <hr />
-
-          <p>
-            <strong>
-              <localize key="actions_chooseWhereToImport">Chose where to import</localize>
-              <localize key="dictionaryListCaption">dictionary items</localize>.
-            </strong>
-            (optional)
-          </p>
-
-          <umb-tree section="translation"
-                    treealias="dictionary"
-                    customtreeparams="foldersonly=1"
-                    hideheader="false"
-                    hideoptions="true"
-                    isdialog="true"
-                    api="dialogTreeApi"
-                    on-init="onTreeInit()"
-                    enablecheckboxes="true">
-          </umb-tree>
-        </div>
-
-        <button class="btn btn-primary" ng-click="import()">
-          <localize key="general_import">Import</localize>
-        </button>
-      </div>
-      <div ng-if="vm.state === 'done'">
-        <strong>
-          <localize key="speechBubbles_dictionaryItemImported">The following dictionary item(s) has been imported!</localize>        
-        </strong>
-        <div ng-repeat="dictionaryItem in vm.model.dictionaryItems" style="padding-left:{{dictionaryItem.level * 20}}px;">{{dictionaryItem.name}}</div>
-      </div>
-    </div>
-  </div>
-
-  <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-    <umb-button action="close()"
-                button-style="link"
-                label-key="{{vm.cancelButtonLabel}}"
-                type="button">
-    </umb-button>
-  </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
deleted file mode 100644
index 8729cb74a9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<div ng-controller="Umbraco.Editors.Dictionary.ListController as vm">
-
-    <umb-editor-view>
-        <umb-editor-header
-            name="vm.title"
-            hide-alias="true"
-            hide-description="true"
-            hide-icon="true"
-            name-locked="true">
-        </umb-editor-header>
-        <umb-editor-container>
-
-          <umb-editor-sub-header>
-
-            <umb-editor-sub-header-content-left>
-              <umb-button button-style="outline"
-                          type="button"
-                          action="vm.createNewItem()"
-                          label-key="dictionary_createNew">
-              </umb-button>
-            </umb-editor-sub-header-content-left>
-
-            <umb-editor-sub-header-content-right>
-              <umb-search-filter model="vm.filter.searchTerm"
-                                 label-key="placeholders_filter"
-                                 text="Type to filter...">
-              </umb-search-filter>
-            </umb-editor-sub-header-content-right>
-
-          </umb-editor-sub-header>
-
-          <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-          <umb-box ng-if="!vm.loading && vm.items.length === 0">
-            <umb-box-content class="block-form">
-
-              <umb-empty-state size="small">
-                <localize key="dictionary_noItems">There are no dictionary items.</localize>
-              </umb-empty-state>
-
-            </umb-box-content>
-          </umb-box>
-
-          <table class="table table-hover" ng-show="!vm.loading && vm.filtered.length > 0">
-            <caption class="sr-only"><localize key="visuallyHiddenTexts_dictionaryListCaption">Dictionary items</localize></caption>
-            <thead>
-              <tr>
-                <th><localize key="general_name">Name</localize></th>
-                <th ng-repeat="column in vm.items[0].translations | orderBy:'displayName'">{{column.displayName}}</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr ng-repeat="item in vm.filtered = (vm.items | filter: { 'name': vm.filter.searchTerm })" ng-click="vm.clickItem(item.id)" class="cursor-pointer">
-                <th>
-                  <span ng-style="item.style" class="bold">{{item.name}}</span>
-                </th>
-                <td ng-repeat="column in item.translations | orderBy:'displayName'">
-                  <div>
-                    <umb-icon icon="{{ column.hasTranslation ? 'icon-check' : 'icon-alert' }}"
-                              class="{{ column.hasTranslation ? 'color-green' : 'color-red' }}">
-                    </umb-icon>
-                    <span class="sr-only">
-                      <localize ng-if="column.hasTranslation" key="visuallyHiddenTexts_hasTranslation">Has translation</localize>
-                      <localize ng-if="!column.hasTranslation" key="visuallyHiddenTexts_noTranslation">Missing translation</localize>
-                    </span>
-                  </div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-
-          <umb-empty-state ng-if="!vm.loading && vm.filtered.length === 0"
-                           position="center">
-            <localize key="dictionary_noItemsFound">There were no dictionary items found.</localize>
-          </umb-empty-state>
-
-        </umb-editor-container>
-    </umb-editor-view>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/move.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/move.controller.js
deleted file mode 100644
index a99f09af21..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/move.controller.js
+++ /dev/null
@@ -1,66 +0,0 @@
-angular.module("umbraco")
-  .controller("Umbraco.Editors.Dictionary.MoveController",
-    function ($scope, dictionaryResource, treeService, navigationService, notificationsService, appState, eventsService) {
-
-        $scope.dialogTreeApi = {};
-        $scope.source = _.clone($scope.currentNode);
-
-        function nodeSelectHandler(args) {
-            args.event.preventDefault();
-            args.event.stopPropagation();
-
-            if ($scope.target) {
-                //un-select if there's a current one selected
-                $scope.target.selected = false;
-            }
-            $scope.target = args.node;
-            $scope.target.selected = true;
-        }
-
-        $scope.move = function () {
-
-            $scope.busy = true;
-            $scope.error = false;
-
-            dictionaryResource.move({ parentId: $scope.target.id, id: $scope.source.id })
-                .then(function (path) {
-                    $scope.error = false;
-                    $scope.success = true;
-                    $scope.busy = false;
-
-                    //first we need to remove the node that launched the dialog
-                    treeService.removeNode($scope.currentNode);
-
-                    //get the currently edited node (if any)
-                    var activeNode = appState.getTreeState("selectedNode");
-
-                    //we need to do a double sync here: first sync to the moved content - but don't activate the node,
-                    //then sync to the currenlty edited content (note: this might not be the content that was moved!!)
-
-                  navigationService.syncTree({ tree: "dictionary", path: path, forceReload: true, activate: false }).then(function (args) {
-                        if (activeNode) {
-                            var activeNodePath = treeService.getPath(activeNode).join();
-                            //sync to this node now - depending on what was copied this might already be synced but might not be
-                          navigationService.syncTree({ tree: "dictionary", path: activeNodePath, forceReload: false, activate: true });
-                        }
-                    });
-
-                    eventsService.emit('app.refreshEditor');
-
-                }, function (err) {
-                    $scope.success = false;
-                    $scope.error = err;
-                    $scope.busy = false;
-                 
-                });
-        };
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-        };
-
-        $scope.close = function() {
-            navigationService.hideDialog();
-        };
-        
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/move.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/move.html
deleted file mode 100644
index d8accbb5d5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/move.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="umb-dialog" ng-controller="Umbraco.Editors.Dictionary.MoveController">
-
-    <div class="umb-dialog-body">
-        <div class="umb-pane">
-
-            <p class="abstract" ng-hide="success">
-                <localize key="actions_chooseWhereToMove">Choose where to move </localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
-            </p>
-
-            <umb-loader ng-show="busy"></umb-loader>
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-            <div ng-show="success">
-                <div class="alert alert-success">
-                    <strong>{{source.name}}</strong> <localize key="contentTypeEditor_movedUnderneath">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong>
-                </div>
-                <button type="button" class="btn btn-primary" ng-click="close()">Ok</button>
-            </div>
-
-            <div ng-hide="success">
-
-                <div>
-                    <umb-tree section="translation"
-                              treealias="dictionary"
-                              customtreeparams="foldersonly=1"
-                              hideheader="false"
-                              hideoptions="true"
-                              isdialog="true"
-                              api="dialogTreeApi"
-                              on-init="onTreeInit()"
-                              enablecheckboxes="true">
-                    </umb-tree>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
-            <localize key="general_cancel">Cancel</localize>
-        </button>
-        <button class="btn btn-primary" ng-click="move()" ng-disabled="busy || !target">
-            <localize key="actions_move">Move</localize>
-        </button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/views/content/content.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/views/content/content.html
deleted file mode 100644
index d48cb954b2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/views/content/content.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<umb-box>
-  <umb-box-content>
-    <p ng-bind-html="model.description"></p>
-    <umb-property ng-repeat="translation in model.content.translations | orderBy:'displayName'" property="translation.property">
-      <textarea rows="2" class="autogrow w-100"
-                id="{{translation.property.alias}}"
-                ng-model="translation.translation"
-                maxlength="1000"
-                ng-keyup="model.change(translation)"
-                ng-trim="false"
-                ng-readonly="!translation.allowUpdate"></textarea>
-      <div class="help" ng-if="translation.nearMaxLimit">
-        <p tabindex="0">
-          <span class="sr-only">{{ translation.displayName }} </span>
-          <localize key="textbox_characters_left" tokens="[model.maxlength - translation.translation.length]" watch-tokens="true">%0% characters left.</localize>
-        </p>
-      </div>
-    </umb-property>
-  </umb-box-content>
-</umb-box>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/documentTypes/copy.controller.js
deleted file mode 100644
index 2039175819..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/copy.controller.js
+++ /dev/null
@@ -1,62 +0,0 @@
-angular.module("umbraco")
-.controller("Umbraco.Editors.DocumentTypes.CopyController",
-    function ($scope, contentTypeResource, treeService, navigationService, notificationsService, appState, eventsService) {
-
-        $scope.dialogTreeApi = {};
-        $scope.source = _.clone($scope.currentNode);
-
-        function nodeSelectHandler(args) {
-            args.event.preventDefault();
-            args.event.stopPropagation();
-
-            if ($scope.target) {
-                //un-select if there's a current one selected
-                $scope.target.selected = false;
-            }
-
-            $scope.target = args.node;
-            $scope.target.selected = true;
-        }
-
-        $scope.copy = function () {
-
-            $scope.busy = true;
-            $scope.error = false;
-
-            contentTypeResource.copy({ parentId: $scope.target.id, id: $scope.source.id })
-                .then(function (path) {
-                    $scope.error = false;
-                    $scope.success = true;
-                    $scope.busy = false;
-
-                    //get the currently edited node (if any)
-                    var activeNode = appState.getTreeState("selectedNode");
-
-                    //we need to do a double sync here: first sync to the copied content - but don't activate the node,
-                    //then sync to the currenlty edited content (note: this might not be the content that was copied!!)
-
-                    navigationService.syncTree({ tree: "documentTypes", path: path, forceReload: true, activate: false }).then(function (args) {
-                        if (activeNode) {
-                            var activeNodePath = treeService.getPath(activeNode).join();
-                            //sync to this node now - depending on what was copied this might already be synced but might not be
-                            navigationService.syncTree({ tree: "documentTypes", path: activeNodePath, forceReload: false, activate: true });
-                        }
-                    });
-
-                }, function (err) {
-                    $scope.success = false;
-                    $scope.error = err;
-                    $scope.busy = false;
-                    
-                });
-        };
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-        }
-        
-        $scope.close = function() {
-            navigationService.hideDialog();
-        };
-        
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/copy.html
deleted file mode 100644
index 824527be34..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/copy.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="umb-dialog" ng-controller="Umbraco.Editors.DocumentTypes.CopyController">
-
-    <div class="umb-dialog-body">
-        <div class="umb-pane">
-
-            <p class="abstract" ng-hide="success">
-                <localize key="contentTypeEditor_folderToCopy">Select the folder to copy</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
-            </p>
-
-            <umb-loader ng-show="busy"></umb-loader>
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-            <div ng-show="success">
-                <div class="alert alert-success">
-                    <strong>{{source.name}}</strong> <localize key="contentTypeEditor_copiedUnderneath">was copied underneath</localize>&nbsp;<strong>{{target.name}}</strong>
-                </div>
-                <button type="button" class="btn btn-primary" ng-click="close()">Ok</button>
-            </div>
-
-            <div ng-hide="success">
-
-                <div>
-                    <umb-tree section="settings"
-                              treealias="documentTypes"
-                              customtreeparams="foldersonly=1"
-                              hideheader="false"
-                              hideoptions="true"
-                              isdialog="true"
-                              api="dialogTreeApi"
-                              on-init="onTreeInit()"
-                              enablecheckboxes="true">
-                    </umb-tree>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
-            <localize key="general_cancel">Cancel</localize>
-        </button>
-        <button class="btn btn-primary" ng-click="copy()" ng-disabled="busy || !target">
-            <localize key="actions_copy">Copy</localize>
-        </button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/documentTypes/create.controller.js
deleted file mode 100644
index b89066363c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/create.controller.js
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DocumentType.CreateController
- * @function
- *
- * @description
- * The controller for the doc type creation dialog
- */
-function DocumentTypesCreateController($scope, $location, navigationService, contentTypeResource, formHelper, appState) {
-
-  $scope.model = {
-    allowCreateFolder: $scope.currentNode.parentId === null || $scope.currentNode.nodeType === 'container',
-    folderName: '',
-    creatingFolder: false
-  };
-
-  var disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates;
-  $scope.model.disableTemplates = disableTemplates;
-
-  var node = $scope.currentNode;
-
-  $scope.showCreateFolder = function () {
-    $scope.model.creatingFolder = true;
-  };
-
-  $scope.createContainer = function () {
-
-    if (formHelper.submitForm({scope: $scope, formCtrl: $scope.createFolderForm})) {
-
-      contentTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) {
-
-        navigationService.hideMenu();
-
-        var currPath = node.path ? node.path : '-1';
-
-        navigationService.syncTree({
-          tree: 'documentTypes',
-          path: currPath + ',' + folderId,
-          forceReload: true,
-          activate: true
-        });
-
-        formHelper.resetForm({scope: $scope, formCtrl: $scope.createFolderForm});
-
-        var section = appState.getSectionState('currentSection');
-
-      }, function (err) {
-
-        formHelper.resetForm({scope: $scope, formCtrl: $scope.createFolderForm, hasErrors: true});
-        $scope.error = err;
-
-      });
-    }
-  };
-
-  function createDocType(config) {
-
-    $location.search('create', null);
-    $location.search('notemplate', null);
-    $location.search('iscomposition', null);
-    $location.search('iselement', null);
-    $location.search('icon', null);
-
-    var icon = null;
-
-    if (config.icon != undefined && config.icon != null) {
-      icon = config.icon;
-      if (config.color) {
-        icon += ' ' + config.color;
-      }
-    }
-
-    $location
-      .path('/settings/documentTypes/edit/' + node.id)
-      .search('create', 'true')
-      .search('notemplate', config.notemplate ? 'true' : null)
-      .search('iscomposition', config.iscomposition ? 'true' : null)
-      .search('iselement', config.iselement ? 'true' : null)
-      .search('icon', icon);
-    navigationService.hideMenu();
-  }
-
-
-  // Disabling logic for creating document type with template if disableTemplates is set to true
-  if (!disableTemplates) {
-    $scope.createDocType = function (icon) {
-      createDocType({icon});
-    };
-  }
-
-  $scope.createComponent = function (icon) {
-    createDocType({notemplate: true, icon});
-  };
-
-  $scope.createComposition = function (icon) {
-    createDocType({notemplate: true, iscomposition: true, iselement: true, icon});
-  };
-
-  $scope.createElement = function (icon) {
-    createDocType({notemplate: true, iselement: true, icon});
-  };
-
-  $scope.close = function () {
-    const showMenu = true;
-    navigationService.hideDialog(showMenu);
-  };
-}
-
-angular.module('umbraco').controller('Umbraco.Editors.DocumentTypes.CreateController', DocumentTypesCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/create.html
deleted file mode 100644
index 0caba5f511..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/create.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<div ng-controller="Umbraco.Editors.DocumentTypes.CreateController">
-
-    <div ng-show="!model.creatingFolder" ng-cloak>
-        <div class="umbracoDialog umb-dialog-body with-footer">
-            <div class="umb-pane">
-                <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
-
-            <ul class="umb-actions umb-actions-child">
-                <li data-element="action-documentType" class="umb-action" ng-hide="model.disableTemplates">
-                    <button type="button" ng-click="createDocType('icon-document')" class="umb-action-link umb-outline btn-reset" umb-auto-focus>
-                        <umb-icon icon="icon-document" class="icon large"></umb-icon>
-                        <span class="menu-label">
-                            <localize key="create_documentTypeWithTemplate">Document Type with Template</localize>
-                            <small><localize key="create_documentTypeWithTemplateDescription">The data definition for a content page that can be created by editors in the content tree and is directly accessible via a URL.</localize></small>
-                        </span>
-                    </button>
-                </li>
-                <li data-element="action-documentTypeWithoutTemplate" class="umb-action">
-                    <button type="button" ng-click="createComponent('icon-item-arrangement')" class="umb-action-link umb-outline btn-reset">
-                        <umb-icon icon="icon-item-arrangement" class="icon large"></umb-icon>
-                        <span class="menu-label">
-                            <localize key="create_documentType">Document Type</localize>
-                            <small><localize key="create_documentTypeDescription">The data definition for a content component that can be created by editors in the content tree and be picked on other pages but has no direct URL.</localize></small>
-                        </span>
-                    </button>
-                </li>
-                <li data-element="action-documentTypeWithIsElementTypeChecked" class="umb-action">
-                    <button type="button" ng-click="createElement('icon-science')" class="umb-action-link umb-outline btn-reset">
-                        <umb-icon icon="icon-science" class="icon large"></umb-icon>
-                        <span class="menu-label">
-                            <localize key="create_elementType">Element Type</localize>
-                            <small><localize key="create_elementTypeDescription">Defines the schema for a repeating set of properties, for example, in a 'Block List' or 'Nested Content' property editor.</localize></small>
-                        </span>
-                    </button>
-                </li>
-                <li data-element="action-documentTypeWithoutTemplateForComposition" class="umb-action">
-                    <button type="button" ng-click="createComposition('icon-defrag')" class="umb-action-link umb-outline btn-reset">
-                        <umb-icon icon="icon-defrag" class="icon large"></umb-icon>
-                        <span class="menu-label">
-                            <localize key="create_composition">Composition</localize>
-                            <small><localize key="create_compositionDescription">Defines a re-usable set of properties that can be included in the definition of multiple other Document Types. For example, a set of 'Common Page Settings'.</localize></small>
-                        </span>
-                    </button>
-                </li>
-                <li data-element="action-folder" ng-if="model.allowCreateFolder" class="umb-action">
-                    <button type="button" ng-click="showCreateFolder()" class="umb-action-link umb-outline btn-reset">
-                        <umb-icon icon="icon-folder" class="icon large"></umb-icon>
-                        <span class="menu-label">
-                            <localize key="create_folder">Folder</localize>
-                            <small>
-                                <localize key="create_folderDescription">Used to organise the Document Types, Compositions and Element Types created in this Document Type tree.</localize>
-                            </small>
-                        </span>
-                    </button>
-                </li>
-            </ul>
-        </div>
-
-            
-        </div>
-
-        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-            <button type="button" class="btn btn-info" ng-click="close(true)">
-                <localize key="buttons_somethingElse">Do something else</localize>
-            </button>
-
-        </div>
-    </div>
-
-    <div ng-show="model.creatingFolder" ng-cloak>
-        <form novalidate name="createFolderForm"
-              ng-submit="createContainer()"
-              val-form-manager>
-            <div class="umbracoDialog umb-dialog-body with-footer">
-                <div class="umb-pane">
-                    <div ng-show="error">
-                        <div class="alert alert-error">
-                            <div><strong>{{error.errorMsg}}</strong></div>
-                            <div>{{error.data.message}}</div>
-                        </div>
-                    </div>
-
-                    <umb-control-group label="Enter a folder name" hide-label="false">
-                        <input type="text"
-                               name="folderName"
-                               maxlength="255"
-                               ng-model="model.folderName"
-                               class="umb-textstring textstring input-block-level"
-                               focus-when="{{model.creatingFolder}}"
-                               required />
-                    </umb-control-group>
-                </div>
-            </div>
-            <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-                <umb-button type="button"
-                            button-style="link"
-                            action="close(true)"
-                            label-key="general_close">
-                </umb-button>
-                <umb-button type="submit"
-                            button-style="primary"
-                            label-key="general_create">
-                </umb-button>
-            </div>
-        </form>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/documentTypes/delete.controller.js
deleted file mode 100644
index f0c8a18251..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/delete.controller.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DocumentType.DeleteController
- * @function
- *
- * @description
- * The controller for deleting content
- */
-function DocumentTypesDeleteController($scope, dataTypeResource, contentTypeResource, treeService, navigationService, localizationService) {
-
-    $scope.performDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        contentTypeResource.deleteById($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            //get the root node before we remove it
-            var rootNode = treeService.getTreeRoot($scope.currentNode);
-
-            // TODO: Need to sync tree, etc...
-            treeService.removeNode($scope.currentNode);
-            navigationService.hideMenu(); 
-
-        });
-
-    };
-
-    $scope.performContainerDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        contentTypeResource.deleteContainerById($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            //get the root node before we remove it
-            var rootNode = treeService.getTreeRoot($scope.currentNode);
-
-            // TODO: Need to sync tree, etc...
-            treeService.removeNode($scope.currentNode);
-            navigationService.hideMenu();
-
-        });
-
-    };
-
-    $scope.cancel = function() {
-        navigationService.hideDialog();
-    };
-
-    $scope.labels = {};
-    localizationService
-        .format(["contentTypeEditor_yesDelete", "contentTypeEditor_andAllDocuments"], "%0% " + $scope.currentNode.name + " %1%")
-        .then(function (data) {
-            $scope.labels.deleteConfirm = data;
-        });
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.DocumentTypes.DeleteController", DocumentTypesDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/delete.html
deleted file mode 100644
index 13ea27b45c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/delete.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.DocumentTypes.DeleteController">
-
-    <div class="umb-dialog-body">
-
-        <p class="abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>
-            <strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <ng-switch on="currentNode.nodeType">
-            <div ng-switch-when="container">
-                <umb-confirm
-                    on-confirm="performContainerDelete"
-                    on-cancel="cancel" confirm-button-style="danger">
-                </umb-confirm>
-            </div>
-
-            <div ng-switch-default>
-                <p>
-                    <umb-icon icon="icon-alert" class="red"></umb-icon>
-                    <strong class="red">
-                        <localize key="contentTypeEditor_allDocuments">All Documents</localize>
-                    </strong>
-                    <localize key="contentTypeEditor_usingThisDocument">
-                        using this document type will be deleted permanently, please confirm you want to delete these as well.
-                    </localize>
-                </p>
-
-                <hr />
-
-                <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}"></umb-checkbox>
-
-                <umb-confirm confirm-disabled="!confirmed" confirm-label-key="delete" on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
-                </umb-confirm>
-            </div>
-        </ng-switch>
-
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documentTypes/edit.controller.js
deleted file mode 100644
index d83cf350db..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/edit.controller.js
+++ /dev/null
@@ -1,515 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DocumentType.EditController
- * @function
- *
- * @description
- * The controller for the content type editor
- */
-(function () {
-    "use strict";
-
-    function DocumentTypesEditController($scope, $routeParams, $q,
-        contentTypeResource, editorState, contentEditingHelper,
-        navigationService, iconHelper, contentTypeHelper, notificationsService,
-        localizationService, overlayHelper, eventsService, angularHelper, editorService) {
-
-        var vm = this;
-        var evts = [];
-
-        var disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates;
-        var documentTypeId = $routeParams.id;
-        var create = $routeParams.create;
-        var noTemplate = $routeParams.notemplate;
-        var isElement = $routeParams.iselement;
-        var icon = $routeParams.icon;
-        var allowVaryByCulture = $routeParams.culturevary;
-        var infiniteMode = $scope.model && $scope.model.infiniteMode;
-        var documentTypeIcon = "";
-
-        vm.save = save;
-        vm.close = close;
-
-        vm.currentNode = null;
-        vm.contentType = {};
-        vm.header = {};
-        vm.header.editorfor = "content_documentType";
-        vm.header.setPageTitle = true;
-        vm.labels = {};
-        vm.submitButtonKey = "buttons_save";
-        vm.generateModelsKey = "buttons_saveAndGenerateModels";
-
-        vm.page = {};
-        vm.page.loading = false;
-        vm.page.saveButtonState = "init";
-        vm.page.navigation = [];
-
-        var labelKeys = [
-            "general_design",
-            "general_listView",
-            "general_rights",
-            "treeHeaders_templates",
-            "main_sections",
-            "shortcuts_navigateSections",
-            "shortcuts_addTab",
-            "shortcuts_addGroup",
-            "shortcuts_addProperty",
-            "defaultdialogs_selectEditor",
-            "shortcuts_editDataType",
-            "shortcuts_toggleListView",
-            "shortcuts_toggleAllowAsRoot",
-            "shortcuts_addChildNode",
-            "shortcuts_addTemplate",
-            "shortcuts_toggleAllowCultureVariants"
-        ];
-
-        onInit();
-
-        function onInit() {
-            // get init values from model when in infinite mode
-            if (infiniteMode) {
-                documentTypeId = $scope.model.id;
-                create = $scope.model.create;
-                if (create && !documentTypeId) documentTypeId = -1;
-                noTemplate = $scope.model.notemplate || $scope.model.noTemplate;
-                isElement = $scope.model.isElement;
-                icon = $scope.model.icon;
-                allowVaryByCulture = $scope.model.allowVaryByCulture;
-                vm.submitButtonKey = "buttons_saveAndClose";
-                vm.generateModelsKey = "buttons_generateModelsAndClose";
-            }
-        }
-
-        localizationService.localizeMany(labelKeys).then(function (values) {
-            // navigation
-            vm.labels.design = values[0];
-            vm.labels.listview = values[1];
-            vm.labels.permissions = values[2];
-            vm.labels.templates = values[3];
-            // keyboard shortcuts
-            vm.labels.sections = values[4];
-            vm.labels.navigateSections = values[5];
-            vm.labels.addTab = values[6]
-            vm.labels.addGroup = values[7];
-            vm.labels.addProperty = values[8];
-            vm.labels.addEditor = values[9];
-            vm.labels.editDataType = values[10];
-            vm.labels.toggleListView = values[11];
-            vm.labels.allowAsRoot = values[12];
-            vm.labels.addChildNode = values[13];
-            vm.labels.addTemplate = values[14];
-            vm.labels.allowCultureVariants = values[15];
-
-            vm.page.keyboardShortcutsOverview = [
-                {
-                    "name": vm.labels.sections,
-                    "shortcuts": [
-                        {
-                            "description": vm.labels.navigateSections,
-                            "keys": [{ "key": "1" }, { "key": "4" }],
-                            "keyRange": true
-                        }
-                    ]
-                },
-                {
-                    "name": vm.labels.design,
-                    "shortcuts": [
-                        {
-                            "description": vm.labels.addTab,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "a" }]
-                        },
-                        {
-                            "description": vm.labels.addGroup,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "g" }]
-                        },
-                        {
-                            "description": vm.labels.addProperty,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }]
-                        },
-                        {
-                            "description": vm.labels.addEditor,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }]
-                        },
-                        {
-                            "description": vm.labels.editDataType,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
-                        }
-                    ]
-                },
-                {
-                    "name": vm.labels.listview,
-                    "shortcuts": [
-                        {
-                            "description": vm.labels.toggleListView,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "l" }]
-                        }
-                    ]
-                },
-                {
-                    "name": vm.labels.permissions,
-                    "shortcuts": [
-                        {
-                            "description": vm.labels.allowAsRoot,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "r" }]
-                        },
-                        {
-                            "description": vm.labels.addChildNode,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "c" }]
-                        },
-                        {
-                            "description": vm.labels.allowCultureVariants,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "v" }]
-                        }
-                    ]
-                },
-                {
-                    "name": vm.labels.templates,
-                    "shortcuts": [
-                        {
-                            "description": vm.labels.addTemplate,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
-                        }
-                    ]
-                }
-            ];
-        });
-
-        contentTypeHelper.checkModelsBuilderStatus().then(function (result) {
-            vm.page.modelsBuilder = result;
-            if (result) {
-                //Models builder mode:
-                vm.page.defaultButton = {
-                    alias: "save",
-                    hotKey: "ctrl+s",
-                    hotKeyWhenHidden: true,
-                    labelKey: vm.submitButtonKey,
-                    letter: "S",
-                    handler: function () { vm.save(); }
-                };
-                vm.page.subButtons = [{
-                    alias: "saveAndGenerateModels",
-                    hotKey: "ctrl+g",
-                    hotKeyWhenHidden: true,
-                    labelKey: vm.generateModelsKey,
-                    letter: "G",
-                    handler: function () {
-
-                        vm.page.saveButtonState = "busy";
-
-                        saveInternal().then(function (result) {
-
-                            vm.page.saveButtonState = "busy";
-
-                            localizationService.localize("modelsBuilder_buildingModels").then(function (headerValue) {
-                                localizationService.localize("modelsBuilder_waitingMessage").then(function (msgValue) {
-                                    notificationsService.info(headerValue, msgValue);
-                                });
-                            });
-
-                            contentTypeHelper.generateModels().then(function (result) {
-
-                                // generateModels() returns the dashboard content
-                                if (!result.lastError) {
-
-                                    //re-check model status
-                                    contentTypeHelper.checkModelsBuilderStatus().then(function (statusResult) {
-                                        vm.page.modelsBuilder = statusResult;
-                                    });
-
-                                    //clear and add success
-                                    vm.page.saveButtonState = "init";
-                                    localizationService.localize("modelsBuilder_modelsGenerated").then(function (value) {
-                                        notificationsService.success(value);
-                                    });
-
-                                } else {
-                                    vm.page.saveButtonState = "error";
-                                    localizationService.localize("modelsBuilder_modelsExceptionInUlog").then(function (value) {
-                                        notificationsService.error(value);
-                                    });
-                                }
-
-                            }, function () {
-                                vm.page.saveButtonState = "error";
-                                localizationService.localize("modelsBuilder_modelsGeneratedError").then(function (value) {
-                                    notificationsService.error(value);
-                                });
-                            });
-                        });
-                    }
-                }];
-            }
-        });
-
-        if (create) {
-            vm.page.loading = true;
-
-            //we are creating so get an empty data type item
-            contentTypeResource.getScaffold(documentTypeId)
-                .then(function (dt) {
-                    init(dt);
-                    vm.page.loading = false;
-                });
-        }
-        else {
-            loadDocumentType();
-        }
-
-        function loadDocumentType() {
-            vm.page.loading = true;
-            contentTypeResource.getById(documentTypeId).then(function (dt) {
-                init(dt);
-                // we don't need to sync the tree in infinite mode
-                if (!infiniteMode) {
-                    syncTreeNode(vm.contentType, dt.path, true);
-                }
-                vm.page.loading = false;
-            });
-        }
-
-        function loadButtons() {
-            vm.page.navigation = vm.contentType.apps;
-
-            if (disableTemplates === true) {
-                Utilities.forEach(vm.contentType.apps,
-                    (app, index) => {
-                        if (app.alias === "templates") {
-                            vm.page.navigation.splice(index, 1);
-                        }
-                    });
-            }
-
-            initializeActiveNavigationPanel();
-        }
-
-        function initializeActiveNavigationPanel() {
-            // Initialise first loaded panel based on page route paramater
-            // i.e. ?view=design|listview|permissions
-            var initialViewSetFromRouteParams = false;
-            var view = $routeParams.view;
-            if (view) {
-                for (var i = 0; i < vm.page.navigation.length; i++) {
-                    if (vm.page.navigation[i].alias.localeCompare(view, undefined, { sensitivity: 'accent' }) === 0) {
-                        vm.page.navigation[i].active = true;
-                        initialViewSetFromRouteParams = true;
-                        break;
-                    }
-                }
-            }
-            if (initialViewSetFromRouteParams === false) {
-                vm.page.navigation[0].active = true;
-            }
-        }
-
-        /* ---------- SAVE ---------- */
-
-        function save() {
-            saveInternal().then(Utilities.noop, Utilities.noop);
-        }
-
-        /** This internal save method performs the actual saving and returns a promise, not to be bound to any buttons but used by other bound methods */
-        function saveInternal() {
-
-            // only save if there are no dialogs open
-            if (overlayHelper.getNumberOfOverlays() === 0 && (editorService.getNumberOfEditors() === 0 || infiniteMode)) {
-
-                vm.page.saveButtonState = "busy";
-
-                // reformat allowed content types to array if id's
-                vm.contentType.allowedContentTypes = contentTypeHelper.createIdArray(vm.contentType.allowedContentTypes);
-
-                //if this is a new item and it's creating a template, ensure that the template alias is synced correctly
-                syncTemplateAlias(vm.contentType);
-
-                return contentEditingHelper.contentEditorPerformSave({
-                    saveMethod: contentTypeResource.save,
-                    scope: $scope,
-                    content: vm.contentType,
-                    infiniteMode: infiniteMode,
-                    rebindCallback: function (_, savedContentType) {
-                        // we need to rebind... the IDs that have been created!
-                        contentTypeHelper.rebindSavedContentType(vm.contentType, savedContentType);
-                    }
-                }).then(function (data) {
-                    // allow UI to access server validation state
-                    vm.contentType.ModelState = data.ModelState;
-
-                    //success
-                    // we don't need to sync the tree in infinite mode
-                    if (!infiniteMode) {
-                        syncTreeNode(vm.contentType, data.path);
-                    }
-
-                    // emit event
-                    var args = { documentType: vm.contentType };
-                    eventsService.emit("editors.documentType.saved", args);
-
-                    if (documentTypeIcon !== vm.contentType.icon) {
-                        eventsService.emit("editors.tree.icon.changed", args);
-                    }
-
-                    vm.page.saveButtonState = "success";
-
-                    if (infiniteMode && $scope.model.submit) {
-                        $scope.model.documentTypeAlias = vm.contentType.alias;
-                        $scope.model.documentTypeKey = vm.contentType.key;
-                        $scope.model.submit($scope.model);
-                    }
-
-                    return $q.resolve(data);
-                }, function (err) {
-                    //error
-                    if (err) {
-                        // allow UI to access server validation state
-                        vm.contentType.ModelState = err.data.ModelState;
-                        editorState.set($scope.content);
-                    }
-                    else {
-                        localizationService.localize("speechBubbles_validationFailedHeader").then(function (headerValue) {
-                            localizationService.localize("speechBubbles_validationFailedMessage").then(function (msgValue) {
-                                notificationsService.error(headerValue, msgValue);
-                            });
-                        });
-                    }
-                    vm.page.saveButtonState = "error";
-                    return $q.reject(err);
-                });
-            }
-            else {
-                return $q.reject();
-            }
-        }
-
-        function init(contentType) {
-
-            // insert template on new doc types
-            if (!noTemplate && contentType.id === 0) {
-                contentType.defaultTemplate = contentTypeHelper.insertDefaultTemplatePlaceholder(contentType.defaultTemplate);
-                contentType.allowedTemplates = contentTypeHelper.insertTemplatePlaceholder(contentType.allowedTemplates);
-            }
-
-            // set isElement checkbox by default
-            if (isElement) {
-                contentType.isElement = true;
-            }
-
-            // set icon if one is provided
-            if (icon !== null && icon !== undefined) {
-                contentType.icon = icon;
-            }
-
-            // set vary by culture checkbox by default
-            if (allowVaryByCulture) {
-                contentType.allowCultureVariant = true;
-            }
-
-            // convert icons for content type
-            convertLegacyIcons(contentType);
-
-            //set a shared state
-            editorState.set(contentType);
-
-            vm.contentType = contentType;
-
-            documentTypeIcon = contentType.icon;
-
-            loadButtons();
-        }
-
-        /** Syncs the template alias for new doc types before saving if a template is to be created */
-        function syncTemplateAlias(contentType) {
-            if (!noTemplate && contentType.id === 0) {
-                //sync default template that had the placeholder flag
-                if (contentType.defaultTemplate !== null && contentType.defaultTemplate.placeholder) {
-                    contentType.defaultTemplate.name = contentType.name;
-                    contentType.defaultTemplate.alias = contentType.alias;
-                }
-                //sync allowed templates that had the placeholder flag
-                contentType.allowedTemplates.forEach(function (allowedTemplate) {
-                    if (allowedTemplate.placeholder) {
-                        allowedTemplate.name = contentType.name;
-                        allowedTemplate.alias = contentType.alias;
-                    }
-                });
-            }
-        }
-
-        function convertLegacyIcons(contentType) {
-            // make array to store contentType icon
-            var contentTypeArray = [];
-
-            // push icon to array
-            contentTypeArray.push({ "icon": contentType.icon });
-
-            // run through icon method
-            iconHelper.formatContentTypeIcons(contentTypeArray);
-
-            // set icon back on contentType
-            contentType.icon = contentTypeArray[0].icon;
-        }
-
-        /** Syncs the content type  to it's tree node - this occurs on first load and after saving */
-        function syncTreeNode(dt, path, initialLoad) {
-            const args = { tree: "documentTypes", path: path.split(","), forceReload: initialLoad !== true };
-            navigationService.syncTree(args)
-                .then(function (syncArgs) {
-                    vm.currentNode = syncArgs.node;
-                });
-        }
-
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close($scope.model);
-            }
-        }
-
-        evts.push(eventsService.on("app.refreshEditor", function (name, error) {
-            loadDocumentType();
-        }));
-
-        evts.push(eventsService.on("editors.documentType.reload", function (name, args) {
-            if (args && args.node && vm.contentType.id === args.node.id) {
-                loadDocumentType();
-            }
-        }));
-
-        evts.push(eventsService.on("editors.documentType.saved", function(name, args) {
-            if(args.documentType.allowedTemplates.length > 0) {
-                navigationService.hasTree("templates").then(function (treeExists) {
-                    if (treeExists) {
-                        navigationService.syncTree({ tree: "templates", path: [], forceReload: true })
-                            .then(function (syncArgs) {
-                                navigationService.reloadNode(syncArgs.node);
-                            });
-                    }
-                });
-            }
-        }));
-
-        evts.push(eventsService.on("editors.groupsBuilder.changed", function(name, args) {
-            angularHelper.getCurrentForm($scope).$setDirty();
-        }));
-
-        //ensure to unregister from all events!
-        $scope.$on('$destroy', function () {
-            for (var e in evts) {
-                eventsService.unsubscribe(evts[e]);
-            }
-        });
-
-        // #3368 - changes on the other "buttons" do not register on the current form, so we manually have to flag the form as dirty
-        $scope.$watch(
-            "vm.contentType.allowedContentTypes.length + vm.contentType.allowAsRoot + vm.contentType.allowCultureVariant + vm.contentType.isElement + " +
-            "vm.contentType.allowedTemplates.length + vm.contentType.isContainer + vm.contentType.compositeContentTypes.length",
-            function(newVal, oldVal) {
-                if (oldVal === undefined) {
-                    // still initializing, ignore
-                    return;
-                }
-                angularHelper.getCurrentForm($scope).$setDirty();
-            }
-        );
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.DocumentTypes.EditController", DocumentTypesEditController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/edit.html
deleted file mode 100644
index cfbee358eb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/edit.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<div data-element="editor-document-types" ng-controller="Umbraco.Editors.DocumentTypes.EditController as vm">
-
-    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
-
-    <form novalidate name="contentTypeForm" val-form-manager>
-
-        <umb-editor-view ng-if="!vm.page.loading">
-
-            <umb-editor-header
-                name="vm.contentType.name"
-                alias="vm.contentType.alias"
-                key="vm.contentType.key"
-                description="vm.contentType.description"
-                navigation="vm.page.navigation"
-                icon="vm.contentType.icon"
-                editorfor="vm.header.editorfor"
-                setpagetitle="vm.header.setPageTitle">
-            </umb-editor-header>
-
-            <umb-editor-container class="editors-document-type-container">
-
-                <div class="editors-document-type-canvas">
-                    <umb-editor-sub-views
-                        ng-if="!vm.page.loading"
-                        sub-views="vm.page.navigation"
-                        model="vm.contentType">
-                    </umb-editor-sub-views>
-                </div>
-
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-left>
-
-                    <umb-keyboard-shortcuts-overview
-                        model="vm.page.keyboardShortcutsOverview">
-                    </umb-keyboard-shortcuts-overview>
-
-                </umb-editor-footer-content-left>
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button
-                        ng-if="model.infiniteMode"
-                        type="button"
-                        button-style="link"
-                        label-key="general_close"
-                        shortcut="esc"
-                        action="vm.close()">
-                    </umb-button>
-
-                    <umb-button
-                        alias="save"
-                        ng-if="!vm.page.modelsBuilder"
-                        type="button" 
-                        button-style="success"
-                        state="vm.page.saveButtonState"
-                        label-key="{{vm.submitButtonKey}}"
-                        shortcut="ctrl+s"
-                        action="vm.save()">
-                    </umb-button>
-
-                    <umb-button-group
-                        ng-if="vm.page.modelsBuilder"
-                        button-style="success"
-                        default-button="vm.page.defaultButton"
-                        sub-buttons="vm.page.subButtons"
-                        state="vm.page.saveButtonState"
-                        direction="up"
-                        float="right">
-                    </umb-button-group>
-
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-
-        </umb-editor-view>
-
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/export.controller.js b/src/Umbraco.Web.UI.Client/src/views/documentTypes/export.controller.js
deleted file mode 100644
index 630dfb3f7f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/export.controller.js
+++ /dev/null
@@ -1,13 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.Editors.DocumentTypes.ExportController",
-        function ($scope, contentTypeResource, navigationService) {
-
-            $scope.export = function () {
-                contentTypeResource.export($scope.currentNode.id);
-                navigationService.hideMenu();
-            };
-
-            $scope.cancel = function () {
-                navigationService.hideDialog();
-            };
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/export.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/export.html
deleted file mode 100644
index b9aa4d9d3a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/export.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.DocumentTypes.ExportController">
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <button type="button" class="btn btn-link" ng-click="cancel()">
-            <localize key="general_cancel">Cancel</localize>
-        </button>
-        <button class="btn btn-primary" ng-click="export()">
-            <localize key="actions_export">Export</localize>
-        </button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/import.controller.js b/src/Umbraco.Web.UI.Client/src/views/documentTypes/import.controller.js
deleted file mode 100644
index 3983377550..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/import.controller.js
+++ /dev/null
@@ -1,80 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.Editors.DocumentTypes.ImportController",
-        function ($scope, contentTypeResource, navigationService, Upload, umbRequestHelper) {
-            var vm = this;
-            vm.serverErrorMessage = "";
-            vm.state = "upload";
-            vm.model = {};
-            vm.uploadStatus = "";
-
-            vm.cancelButtonLabel = "cancel";
-
-            $scope.handleFiles = function (files, event, invalidFiles) {
-                if (files && files.length > 0) {
-                    $scope.upload(files[0]);
-                }
-            };
-
-            $scope.upload = function (file) {
-                Upload.upload({
-                    url: umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "Upload"),
-                    fields: {},
-                    file: file
-                }).success(function (data, status, headers, config) {
-                    if (data.notifications && data.notifications.length > 0) {
-
-                        // set error status on file
-                        vm.uploadStatus = "error";
-
-                        // Throw message back to user with the cause of the error
-                        vm.serverErrorMessage = data.notifications[0].message;
-                    } else {
-
-                        // set done status on file
-                        vm.uploadStatus = "done";
-                        vm.model = data;
-                        vm.state = "confirm";
-                    }
-                }).error(function (evt, status, headers, config) {
-
-                    // set status done
-                    $scope.uploadStatus = "error";
-
-                    // If file not found, server will return a 404 and display this message
-                    if (status === 404) {
-                        $scope.serverErrorMessage = "File not found";
-                    }
-                    else if (status == 400) {
-                        //it's a validation error
-                        $scope.serverErrorMessage = evt.message;
-                    }
-                    else {
-                        //it's an unhandled error
-                        //if the service returns a detailed error
-                        if (evt.InnerException) {
-                            $scope.serverErrorMessage = evt.InnerException.ExceptionMessage;
-
-                            //Check if its the common "too large file" exception
-                            if (evt.InnerException.StackTrace && evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0) {
-                                $scope.serverErrorMessage = "File too large to upload";
-                            }
-
-                        } else if (evt.Message) {
-                            $scope.serverErrorMessage = evt.Message;
-                        }
-                    }
-                });
-            };
-
-            $scope.import = function () {
-                contentTypeResource.import(vm.model.tempFileName);
-                vm.state = "done";
-
-                vm.cancelButtonLabel = "general_close";
-            }
-
-            $scope.close = function () {
-                navigationService.hideDialog();
-            };
-
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/importdocumenttype.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/importdocumenttype.html
deleted file mode 100644
index 32322558bd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/importdocumenttype.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="umb-dialog" ng-controller="Umbraco.Editors.DocumentTypes.ImportController as vm">
-
-  <div class="umb-dialog-body with-footer">
-    <div class="umb-pane">
-      <div ng-if="vm.state === 'upload'">
-        <p>
-          <localize key="settings_importDocumentTypeHelp">
-            To import a document type, find the '.udt' file on your computer by clicking the 'Import' button (you'll be
-            asked for confirmation on the next screen)
-          </localize>
-        </p>
-
-        <form name="importDoctype">
-
-          <!-- Select files -->
-          <button accept=".udt"
-                  class="btn btn-action"
-                  name="file"
-                  ng-model="filesHolder"
-                  ngf-change="handleFiles($files, $event, $invalidFiles)"
-                  ngf-multiple="true"
-                  ngf-pattern="*.udt"
-                  ngf-select>
-            <localize key="general_import">Import</localize>
-          </button>
-        </form>
-
-        <div ng-if="importDoctype.file.$error.pattern">Please choose a .udt file to import</div>
-
-      </div>
-      <div ng-if="vm.state === 'confirm'">
-        <strong>
-          <localize key="name">Name</localize>
-          :
-        </strong>
-        {{vm.model.name}}
-        <br/>
-        <strong>
-          <localize key="alias">Alias</localize>
-          :
-        </strong>
-        {{vm.model.alias}}
-        <br/>
-        <br/>
-        <button class="btn btn-primary" ng-click="import()">
-          <localize key="actions_importDocumentType">Import</localize>
-        </button>
-      </div>
-      <div ng-if="vm.state === 'done'">
-        {{vm.model.name}} has been imported!
-      </div>
-    </div>
-  </div>
-
-  <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-    <umb-button action="close()"
-                button-style="link"
-                label-key="{{vm.cancelButtonLabel}}"
-                type="button">
-    </umb-button>
-  </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/move.controller.js b/src/Umbraco.Web.UI.Client/src/views/documentTypes/move.controller.js
deleted file mode 100644
index e63656cee3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/move.controller.js
+++ /dev/null
@@ -1,67 +0,0 @@
-angular.module("umbraco")
-.controller("Umbraco.Editors.DocumentTypes.MoveController",
-    function ($scope, contentTypeResource, treeService, navigationService, notificationsService, appState, eventsService) {
-
-        $scope.dialogTreeApi = {};
-        $scope.source = _.clone($scope.currentNode);
-
-        function nodeSelectHandler(args) {
-            args.event.preventDefault();
-            args.event.stopPropagation();
-
-            if ($scope.target) {
-                //un-select if there's a current one selected
-                $scope.target.selected = false;
-            }
-
-            $scope.target = args.node;
-            $scope.target.selected = true;
-        }
-
-        $scope.move = function () {
-
-            $scope.busy = true;
-            $scope.error = false;
-
-            contentTypeResource.move({ parentId: $scope.target.id, id: $scope.source.id })
-                .then(function (path) {
-                    $scope.error = false;
-                    $scope.success = true;
-                    $scope.busy = false;
-
-                    //first we need to remove the node that launched the dialog
-                    treeService.removeNode($scope.currentNode);
-
-                    //get the currently edited node (if any)
-                    var activeNode = appState.getTreeState("selectedNode");
-
-                    //we need to do a double sync here: first sync to the moved content - but don't activate the node,
-                    //then sync to the currenlty edited content (note: this might not be the content that was moved!!)
-
-                    navigationService.syncTree({ tree: "documentTypes", path: path, forceReload: true, activate: false }).then(function (args) {
-                        if (activeNode) {
-                            var activeNodePath = treeService.getPath(activeNode).join();
-                            //sync to this node now - depending on what was copied this might already be synced but might not be
-                            navigationService.syncTree({ tree: "documentTypes", path: activeNodePath, forceReload: false, activate: true });
-                        }
-                    });
-
-                    eventsService.emit('app.refreshEditor');
-
-                }, function (err) {
-                    $scope.success = false;
-                    $scope.error = err;
-                    $scope.busy = false;
-                 
-                });
-        };
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-        };
-
-        $scope.close = function() {
-            navigationService.hideDialog();
-        };
-        
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/move.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/move.html
deleted file mode 100644
index b623b6131d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/move.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="umb-dialog" ng-controller="Umbraco.Editors.DocumentTypes.MoveController">
-
-    <div class="umb-dialog-body">
-        <div class="umb-pane">
-
-            <p class="abstract" ng-hide="success">
-                <localize key="contentTypeEditor_folderToMove">Select the folder to move</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
-            </p>
-
-            <umb-loader ng-show="busy"></umb-loader>
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-            <div ng-show="success">
-                <div class="alert alert-success">
-                    <strong>{{source.name}}</strong> <localize key="contentTypeEditor_movedUnderneath">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong>
-                </div>
-                <button type="button" class="btn btn-primary" ng-click="close()">Ok</button>
-            </div>
-
-            <div ng-hide="success">
-
-                <div>
-                    <umb-tree section="settings"
-                              treealias="documentTypes"
-                              customtreeparams="foldersonly=1"
-                              hideheader="false"
-                              hideoptions="true"
-                              isdialog="true"
-                              api="dialogTreeApi"
-                              on-init="onTreeInit()"
-                              enablecheckboxes="true">
-                    </umb-tree>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
-            <localize key="general_cancel">Cancel</localize>
-        </button>
-        <button class="btn btn-primary" ng-click="move()" ng-disabled="busy || !target">
-            <localize key="actions_move">Move</localize>
-        </button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/property.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/property.html
deleted file mode 100644
index 659e52b7b6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/property.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="edt-property">
-	<label> <umb-icon icon="icon-autofill" class="icon"></umb-icon> {{property.label}}</label>
-	<small>{{property.description}}</small>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/propertygroup.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/propertygroup.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/rename.controller.js b/src/Umbraco.Web.UI.Client/src/views/documentTypes/rename.controller.js
deleted file mode 100644
index 814349258a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/rename.controller.js
+++ /dev/null
@@ -1,51 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.Editors.ContentTypeContainers.RenameController",
-        function($scope, $injector, navigationService, notificationsService, localizationService) {
-            var notificationHeader;
-
-            function reportSuccessAndClose(treeName) {
-                var lastComma = $scope.currentNode.path.lastIndexOf(","),
-                    path = lastComma === -1
-                        ? $scope.currentNode.path
-                        : $scope.currentNode.path.substring(0, lastComma - 1);
-
-                navigationService.syncTree({
-                    tree: treeName,
-                    path: path,
-                    forceReload: true,
-                    activate: true
-                });
-
-                localizationService.localize(
-                    "renamecontainer_folderWasRenamed",
-                    [$scope.currentNode.name, $scope.model.folderName])
-                    .then(function(msg) {
-                        notificationsService.showNotification({
-                            type: 0,
-                            header: notificationHeader,
-                            message: msg
-                        });
-                    });
-
-                navigationService.hideMenu();
-            }
-
-            localizationService.localize("renamecontainer_renamed")
-                .then(function(s) { notificationHeader = s; });
-
-            $scope.model = {
-                folderName: $scope.currentNode.name
-            }
-
-            $scope.renameContainer = function(resourceKey, treeName) {
-                var resource = $injector.get(resourceKey);
-
-                resource.renameContainer($scope.currentNode.id, $scope.model.folderName)
-                    .then(function() {
-                        reportSuccessAndClose(treeName);
-                    }, function(err) {
-                        $scope.error = err;
-                    });
-            }
-        }
-    );
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/rename.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/rename.html
deleted file mode 100644
index 1942cd689d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/rename.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.ContentTypeContainers.RenameController" ng-cloak>
-
-    <div class="umb-pane">
-        <form novalidate name="renameFolderForm"
-              ng-submit="renameContainer('contentTypeResource', 'documentTypes')"
-              val-form-manager>
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-            <umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
-                <input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
-            </umb-control-group>
-
-            <button type="submit" class="btn btn-primary"><localize key="general_rename">Rename</localize></button>
-        </form>
-    </div>
-
-</div>
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/design/design.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/design/design.html
deleted file mode 100644
index 805be7bdb1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/design/design.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<umb-groups-builder
-   model="model"
-   content-type="documentType">
-</umb-groups-builder>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/listview/listview.html
deleted file mode 100644
index 6c7ae4d1a0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/listview/listview.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<umb-box ng-hide="model.isElement">
-    <umb-box-content>
-        <div class="sub-view-columns">
-            <div class="sub-view-column-left">
-                <h5><localize key="contentTypeEditor_enableListViewHeading">Enable list view</localize></h5>
-                <small><localize key="contentTypeEditor_enableListViewDescription">Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree</localize></small>
-            </div>
-            <div class="sub-view-column-right">
-                <umb-list-view-settings
-                    enable-list-view="model.isContainer"
-                    model-alias="model.alias"
-                    list-view-name="model.listViewEditorName"
-                    content-type="documentType">
-                </umb-list-view-settings>
-            </div>
-        </div>
-    </umb-box-content>
-</umb-box>
-<umb-empty-state
-    ng-show="model.isElement"
-    position="center">
-    <localize key="contentTypeEditor_elementDoesNotSupport">This is not applicable for an Element type</localize>
-</umb-empty-state>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/permissions/permissions.controller.js
deleted file mode 100644
index dc25200201..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/permissions/permissions.controller.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DocumentType.PropertyController
- * @function
- *
- * @description
- * The controller for the content type editor property dialog
- */
-(function () {
-    'use strict';
-
-    function PermissionsController($scope, $timeout, contentTypeResource, iconHelper, contentTypeHelper, editorService) {
-
-        /* ----------- SCOPE VARIABLES ----------- */
-
-        var vm = this;
-
-        vm.contentTypes = [];
-        vm.selectedChildren = [];
-        vm.showAllowSegmentationOption = Umbraco.Sys.ServerVariables.umbracoSettings.showAllowSegmentationForDocumentTypes || false;
-
-        vm.addChild = addChild;
-        vm.removeChild = removeChild;
-        vm.sortChildren = sortChildren;
-        vm.toggleAllowAsRoot = toggleAllowAsRoot;
-        vm.toggleAllowCultureVariants = toggleAllowCultureVariants;
-        vm.toggleAllowSegmentVariants = toggleAllowSegmentVariants;
-        vm.canToggleIsElement = false;
-        vm.toggleIsElement = toggleIsElement;
-        vm.toggleHistoryCleanupPreventCleanup = toggleHistoryCleanupPreventCleanup;
-
-        /* ---------- INIT ---------- */
-
-        init();
-
-        function init() {
-
-            contentTypeResource.getAll().then(contentTypes => {
-                vm.contentTypes = contentTypes.filter(x => !x.isElement);
-
-                // convert legacy icons
-                iconHelper.formatContentTypeIcons(vm.contentTypes);
-
-                vm.selectedChildren = contentTypeHelper.makeObjectArrayFromId($scope.model.allowedContentTypes, contentTypes);
-
-                if ($scope.model.id === 0) {
-                    contentTypeHelper.insertChildNodePlaceholder(vm.contentTypes, $scope.model.name, $scope.model.icon, $scope.model.id);
-                }
-            });
-
-            // Can only switch to an element type if there are no content nodes already created from the type.
-            if ($scope.model.id > 0 && !$scope.model.isElement) {
-                contentTypeResource.hasContentNodes($scope.model.id).then(result => {
-                    vm.canToggleIsElement = !result;
-                });
-            } else {
-                vm.canToggleIsElement = true;
-            }
-
-            if(!$scope.model.historyCleanup){
-                $scope.model.historyCleanup = {};
-            }
-
-        }
-
-        function addChild($event) {
-
-            var editor = {
-                multiPicker: true,
-                filterCssClass: 'not-allowed not-published',
-                filter: item =>
-                    !vm.contentTypes.some(x => x.udi == item.udi) || vm.selectedChildren.some(x => x.udi === item.udi),
-                submit: model => {
-                    model.selection.forEach(item =>
-                        contentTypeResource.getById(item.id).then(contentType => {
-                            vm.selectedChildren.push(contentType);
-                            $scope.model.allowedContentTypes.push(item.id);
-                        }));
-
-                    editorService.close();
-                },
-                close: () => editorService.close()
-            };
-
-            editorService.contentTypePicker(editor);
-        }
-
-        function removeChild(selectedChild, index) {
-            // remove from vm
-            vm.selectedChildren.splice(index, 1);
-
-            // remove from content type model
-            var selectedChildIndex = $scope.model.allowedContentTypes.indexOf(selectedChild.id);
-            $scope.model.allowedContentTypes.splice(selectedChildIndex, 1);
-        }
-
-        function sortChildren() {
-            // we need to wait until the next digest cycle for vm.selectedChildren to be updated
-            $timeout(() => $scope.model.allowedContentTypes = vm.selectedChildren.map(x => x.id));
-        }
-
-        // note: 'safe toggling' here ie handling cases where the value is undefined, etc
-
-        function toggleAllowAsRoot() {
-            $scope.model.allowAsRoot = $scope.model.allowAsRoot ? false : true;
-        }
-
-        function toggleAllowCultureVariants() {
-            $scope.model.allowCultureVariant = $scope.model.allowCultureVariant ? false : true;
-        }
-
-        function toggleAllowSegmentVariants() {
-            $scope.model.allowSegmentVariant = $scope.model.allowSegmentVariant ? false : true;
-        }
-
-        function toggleIsElement() {
-            $scope.model.isElement = $scope.model.isElement ? false : true;
-        }
-
-        function toggleHistoryCleanupPreventCleanup() {
-            $scope.model.historyCleanup.preventCleanup = $scope.model.historyCleanup.preventCleanup ? false : true;
-        }
-
-    }
-
-    angular.module('umbraco').controller('Umbraco.Editors.DocumentType.PermissionsController', PermissionsController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/permissions/permissions.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/permissions/permissions.html
deleted file mode 100644
index 088a32d45e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/permissions/permissions.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<div ng-controller="Umbraco.Editors.DocumentType.PermissionsController as vm">
-
-    <umb-box>
-        <umb-box-content>
-
-            <div class="sub-view-columns" ng-hide="model.isElement">
-
-                <div class="sub-view-column-left">
-                    <h5><localize key="contentTypeEditor_allowAsRootHeading">Allow as root</localize></h5>
-                    <small><localize key="contentTypeEditor_allowAsRootDescription">Allow editors to create content of this type in the root of the content tree.</localize></small>
-                </div>
-                <div class="sub-view-column-right">
-                    <umb-toggle data-element="permissions-allow-as-root"
-                                checked="model.allowAsRoot"
-                                on-click="vm.toggleAllowAsRoot()"
-                                hotkey="alt+shift+r">
-                    </umb-toggle>
-                </div>
-
-            </div>
-
-            <div class="sub-view-columns" ng-hide="model.isElement">
-
-                <div class="sub-view-column-left">
-                    <h5><localize key="contentTypeEditor_childNodesHeading">Allowed child node types</localize></h5>
-                    <small><localize key="contentTypeEditor_childNodesDescription">Allow content of the specified types to be created underneath content of this type.</localize></small>
-                </div>
-
-                <div class="sub-view-column-right">
-                    <umb-child-selector selected-children="vm.selectedChildren"
-                                        available-children="vm.contentTypes"
-                                        parent-name="model.name"
-                                        parent-icon="model.icon"
-                                        parent-id="model.id"
-                                        on-add="vm.addChild"
-                                        on-remove="vm.removeChild"
-                                        on-sort="vm.sortChildren">
-                    </umb-child-selector>
-                </div>
-
-            </div>
-
-            <div class="sub-view-columns">
-
-                <div class="sub-view-column-left">
-                    <h5><localize key="contentTypeEditor_cultureVariantHeading">Allow vary by culture</localize></h5>
-                    <small><localize key="contentTypeEditor_cultureVariantDescription">Allow editors to create content of different languages.</localize></small>
-                </div>
-
-                <div class="sub-view-column-right">
-                    <umb-toggle data-element="permissions-allow-culture-variant"
-                                checked="model.allowCultureVariant"
-                                on-click="vm.toggleAllowCultureVariants()"
-                                hotkey="alt+shift+v">
-                    </umb-toggle>
-                </div>
-
-            </div>
-
-
-            <div class="sub-view-columns" ng-if="vm.showAllowSegmentationOption">
-
-                <div class="sub-view-column-left">
-                    <h5><localize key="contentTypeEditor_segmentVariantHeading">Allow segmentation</localize></h5>
-                    <small><localize key="contentTypeEditor_segmentVariantDescription">Allow editors to create segments of this content.</localize></small>
-                </div>
-
-                <div class="sub-view-column-right">
-                    <umb-toggle data-element="permissions-allow-culture-variant"
-                                checked="model.allowSegmentVariant"
-                                on-click="vm.toggleAllowSegmentVariants()">
-                    </umb-toggle>
-                </div>
-
-            </div>
-
-            <div class="sub-view-columns">
-
-                <div class="sub-view-column-left">
-                    <h5><localize key="contentTypeEditor_elementHeading">Is an Element Type</localize></h5>
-                    <small><localize key="contentTypeEditor_elementDescription">An Element Type is meant to be used within other Document Types, and not in the Content tree.</localize></small>
-                    <small ng-if="!vm.canToggleIsElement"><br/><localize key="contentTypeEditor_elementCannotToggle">A Document Type cannot be changed to an Element Type once it has been used to create one or more content items.</localize></small>
-                </div>
-
-                <div class="sub-view-column-right">
-                    <umb-toggle data-element="permissions-is-element"
-                                checked="model.isElement"
-                                disabled="!vm.canToggleIsElement"
-                                on-click="vm.toggleIsElement()">
-                    </umb-toggle>
-                </div>
-
-            </div>
-
-
-            <div class="sub-view-columns">
-
-                <div class="sub-view-column-left">
-                    <h5><localize key="contentTypeEditor_historyCleanupHeading">History cleanup</localize></h5>
-                    <small><localize key="contentTypeEditor_historyCleanupDescription">Allow override the global settings for when history versions are removed.</localize></small>
-                </div>
-
-                <div class="sub-view-column-right">
-                  <umb-box-content>
-                    <div class="umb-panel-group__details-status-text umb-alert umb-alert--info mb3" ng-if="!model.historyCleanup.globalEnableCleanup">
-                      <p class="mb0">
-                        <localize key="contentTypeEditor_historyCleanupGloballyDisabled"><b>NOTE!</b> The cleanup of historically content versions are disabled globally. These settings will not take effect before it is enabled.</localize>
-                      </p>
-                    </div>
-
-                    <umb-control-group label="@contentTypeEditor_historyCleanupPreventCleanup">
-                        <umb-toggle checked="model.historyCleanup.preventCleanup" on-click="vm.toggleHistoryCleanupPreventCleanup()"></umb-toggle>
-                    </umb-control-group>
-
-                    <umb-control-group label="@contentTypeEditor_historyCleanupKeepAllVersionsNewerThanDays">
-                        <input ng-readonly="model.historyCleanup.preventCleanup" placeholder="{{model.historyCleanup.globalKeepAllVersionsNewerThanDays}}" type="number" min="0" max="2147483647" ng-model="model.historyCleanup.keepAllVersionsNewerThanDays" />
-                    </umb-control-group>
-
-                    <umb-control-group label="@contentTypeEditor_historyCleanupKeepLatestVersionPerDayForDays">
-                        <input ng-readonly="model.historyCleanup.preventCleanup" placeholder="{{model.historyCleanup.globalKeepLatestVersionPerDayForDays}}" type="number" min="0" max="2147483647" ng-model="model.historyCleanup.keepLatestVersionPerDayForDays" />
-                    </umb-control-group>
-                </div>
-
-            </div>
-
-            </umb-box-content>
-    </umb-box>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/templates/templates.controller.js b/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/templates/templates.controller.js
deleted file mode 100644
index 46e856410d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/templates/templates.controller.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DocumentType.TemplatesController
- * @function
- *
- * @description
- * The controller for the content type editor templates sub view
- */
-(function () {
-    'use strict';
-
-    function TemplatesController($scope, entityResource, contentTypeHelper, contentTypeResource, editorService, $routeParams) {
-
-        /* ----------- SCOPE VARIABLES ----------- */
-
-        var vm = this;
-
-        vm.availableTemplates = [];
-        vm.canCreateTemplate = false;
-        vm.updateTemplatePlaceholder = false;
-        vm.loadingTemplates = false;
-        vm.isElement = $scope.model.isElement;
-
-        vm.createTemplate = createTemplate;
-        vm.openTemplatePicker = openTemplatePicker;
-
-        /* ---------- INIT ---------- */
-
-        function onInit() {
-            vm.loadingTemplates = true;
-            entityResource.getAll("Template").then(function (templates) {
-
-                vm.availableTemplates = templates;
-
-                // update placeholder template information on new doc types
-                if (!$routeParams.notemplate && $scope.model.id === 0) {
-                    vm.updateTemplatePlaceholder = true;
-                    vm.availableTemplates = contentTypeHelper.insertTemplatePlaceholder(vm.availableTemplates);
-                }
-
-                vm.loadingTemplates = false;
-                checkIfTemplateExists();
-
-            });
-
-        }
-
-        function createTemplate() {
-
-            vm.createTemplateButtonState = "busy";
-
-            contentTypeResource.createDefaultTemplate($scope.model.id).then(function (savedTemplate) {
-                // add icon
-                savedTemplate.icon = "icon-layout";
-                    
-                vm.availableTemplates.push(savedTemplate);
-                vm.canCreateTemplate = false;
-
-                $scope.model.allowedTemplates.push(savedTemplate);
-
-                if ($scope.model.defaultTemplate === null) {
-                    $scope.model.defaultTemplate = savedTemplate;
-                }
-
-                vm.createTemplateButtonState = "success";
-
-            }, function() {
-                vm.createTemplateButtonState = "error";
-            });
-
-        };
-
-        function checkIfTemplateExists() {
-            if ($scope.model.id === 0) {
-                return;
-            }
-
-            var existingTemplate = vm.availableTemplates.find(function (availableTemplate) {
-                return (availableTemplate.name === $scope.model.name || availableTemplate.placeholder);
-            });
-
-            vm.canCreateTemplate = existingTemplate ? false : true;
-        }
-
-        function openTemplatePicker() {
-            const editor = {
-                title: "Choose template",
-                filterCssClass: 'not-allowed',
-                multiPicker: true,
-                filter: item => {
-                    return !vm.availableTemplates.some(template => template.id == item.id) ||
-                        $scope.model.allowedTemplates.some(template => template.id == item.id);
-                },
-                submit: model => {
-                    model.selection.forEach(item => {
-                        $scope.model.allowedTemplates.push(item);
-                    });
-                    editorService.close();
-                },
-                close: function() {
-                    editorService.close();
-                }
-            }
-
-            editorService.templatePicker(editor);
-        }
-
-        var unbindWatcher = $scope.$watch("model.isElement",
-            function(newValue, oldValue) {
-                vm.isElement = newValue;
-            }
-        );
-        $scope.$on("$destroy", function () {
-            unbindWatcher();
-        });
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.DocumentType.TemplatesController", TemplatesController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/templates/templates.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/templates/templates.html
deleted file mode 100644
index 6c3d52b8c7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/views/templates/templates.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<div ng-controller="Umbraco.Editors.DocumentType.TemplatesController as vm">
-    <umb-box ng-hide="vm.isElement">
-        <umb-box-content>
-            <div class="sub-view-columns">
-
-                <div class="sub-view-column-left">
-                    <h5><localize key="contentTypeEditor_allowedTemplatesHeading">Allowed Templates</localize></h5>
-                    <small><localize key="contentTypeEditor_allowedTemplatesDescription">Choose which templates editors are allowed to use on content of this type</localize></small>
-                </div>
-                
-                <div class="sub-view-column-right">
-                    <umb-grid-selector
-                        ng-if="vm.availableTemplates"
-                        selected-items="model.allowedTemplates"
-                        available-items="vm.availableTemplates"
-                        default-item="model.defaultTemplate"
-                        item-name="template"
-                        name="model.name"
-                        alias="model.alias"
-                        update-placeholder="vm.updateTemplatePlaceholder"
-                        item-picker="vm.openTemplatePicker">
-                    </umb-grid-selector>
-
-                    <umb-button
-                        ng-if="vm.canCreateTemplate"
-                        type="button"
-                        button-style="info"
-                        action="vm.createTemplate()"
-                        state="vm.createTemplateButtonState"
-                        label-key="settings_createMatchingTemplate">
-                    </umb-button>
-
-                </div>
-
-            </div>
-        </umb-box-content>
-    </umb-box>
-    <umb-empty-state
-        ng-show="vm.isElement"
-        position="center">
-        <localize key="contentTypeEditor_elementDoesNotSupport">This is not applicable for an Element type</localize>
-    </umb-empty-state>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/errors/BootFailed.html b/src/Umbraco.Web.UI.Client/src/views/errors/BootFailed.html
deleted file mode 100644
index 1bd82a2aa5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/errors/BootFailed.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>Boot Failed</title>
-        <style>
-            @font-face {
-                font-family: Lato;
-                src: local("LatoLatin Regular"), local("LatoLatin-Regular"),
-                    url(/umbraco/assets/fonts/lato/LatoLatin-Regular.woff2)
-                        format("woff2");
-                font-style: normal;
-                font-weight: 400;
-                font-display: swap;
-                text-rendering: optimizeLegibility;
-            }
-            @font-face {
-                font-family: Lato;
-                src: local("LatoLatin Bold"), local("LatoLatin-Bold"),
-                    url(/umbraco/assets/fonts/lato/LatoLatin-Bold.woff2)
-                        format("woff2");
-                font-style: normal;
-                font-weight: 700;
-                font-display: swap;
-                text-rendering: optimizeLegibility;
-            }
-            body {
-                background-repeat: no-repeat;
-                background-size: cover;
-                background-position: 50%;
-                background-image: url(/umbraco/assets/img/login.svg);
-                margin: 0;
-                padding: 0;
-                font-family: Lato, Helvetica Neue, Helvetica, Arial, sans-serif;
-                font-size: 15px;
-                line-height: 20px;
-                color: #000;
-                background-color: #f3f3f5;
-                -webkit-font-smoothing: antialiased;
-                font-smoothing: antialiased;
-                -moz-osx-font-smoothing: grayscale;
-            }
-            .logo {
-                position: absolute;
-                top: 22px;
-                left: 25px;
-                z-index: 1;
-            }
-            .error-container {
-                display: grid;
-                justify-content: center;
-                align-content: center;
-                height: 100vh;
-            }
-            .error {
-                background: #fff;
-                padding: 30px;
-                max-width: 500px;
-                margin: auto 25px;
-                border-radius: 3px;
-            }
-            .error h1 {
-                font-size: 24px;
-                font-weight: 700;
-                margin-bottom: 20px;
-            }
-        </style>
-    </head>
-    <body>
-        <main class="error-container">
-            <img src="/umbraco/assets/img/application/logo_white.svg"
-                 alt="Umbraco"
-                 width="30"
-                 height="30"
-                 draggable="false"
-                 class="logo" />
-            <div class="error">
-                <h1>Boot Failed</h1>
-                <p>
-                    Umbraco failed to boot, if you are the owner of the website
-                    please see the log file for more details.
-                </p>
-            </div>
-        </main>
-    </body>
-</html>
diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/languages/edit.controller.js
deleted file mode 100644
index b2b5f487be..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/languages/edit.controller.js
+++ /dev/null
@@ -1,188 +0,0 @@
-(function () {
-    "use strict";
-
-    function LanguagesEditController($scope, $q, $timeout, $location, $routeParams, overlayService, navigationService, notificationsService, localizationService, languageResource, formHelper, eventsService) {
-        var vm = this;
-
-        vm.isNew = false;
-        vm.initIsDefault = false;
-
-        vm.language = {};
-        vm.availableCultures = null;
-        vm.breadcrumbs = [];
-        vm.labels = {};
-        vm.showDefaultLanguageInfo = false;
-        vm.save = save;
-        vm.back = back;
-        vm.goToPage = goToPage;
-        vm.toggleMandatory = toggleMandatory;
-        vm.toggleDefault = toggleDefault;
-
-        var initCulture = null;
-
-        function init() {
-            vm.loading = true;
-
-            var promises = [];
-
-            // Localize labels
-            promises.push(localizationService.localizeMany([
-                "treeHeaders_languages",
-                "languages_addLanguage",
-                "defaultdialogs_confirmSure",
-                "defaultdialogs_editlanguage"
-            ]).then(function (values) {
-                vm.labels.languages = values[0];
-                vm.labels.addLanguage = values[1];
-                vm.labels.areYouSure = values[2];
-                vm.labels.editLanguage = values[3];
-
-                if ($routeParams.create) {
-                    vm.isNew = true;
-                    vm.language.name = vm.labels.addLanguage;
-                }
-            }));
-
-            // Load all culture/languages
-            promises.push(languageResource.getCultures().then(function (culturesDictionary) {
-                vm.availableCultures = culturesDictionary;
-            }));
-
-            // Load all possible fallback languages
-            promises.push(languageResource.getAll().then(function (languages) {
-                vm.availableLanguages = languages.filter(function (l) {
-                    return $routeParams.id != l.id;
-                });
-            }));
-
-            if (!$routeParams.create) {
-                promises.push(languageResource.getById($routeParams.id).then(function (lang) {
-                    vm.language = lang;
-
-                    // We need to store the initial default state so we can disable the toggle if it is the default.
-                    // We need to prevent from not having a default language.
-                    vm.initIsDefault = Utilities.copy(vm.language.isDefault);
-
-                    makeBreadcrumbs();
-
-                    // Store to check if we are changing the lang culture
-                    initCulture = vm.language.culture;
-                }));
-            }
-
-            $q.all(promises).then(function () {
-                if ($routeParams.create) {
-                    $scope.$emit("$changeTitle", vm.labels.addLanguage);
-                } else {
-                    $scope.$emit("$changeTitle", vm.labels.editLanguage + ": " + vm.language.name);
-                }
-
-                vm.loading = false;
-            });
-
-            // Activate tree node
-            $timeout(function () {
-                navigationService.syncTree({ tree: $routeParams.tree, path: [-1], activate: true });
-            });
-        }
-
-        function save() {
-            // Set new language name to culture name
-            if (vm.isNew && vm.language.culture && vm.availableCultures) {
-                vm.language.name = vm.availableCultures[vm.language.culture];
-            }
-
-            if (formHelper.submitForm({ scope: $scope })) {
-                vm.saveButtonState = "busy";
-
-                // Check if the culture is being changed
-                if (initCulture && vm.language.culture !== initCulture) {
-                    overlayService.open({
-                        title: vm.labels.areYouSure,
-                        view: "views/languages/overlays/change.html",
-                        submitButtonLabelKey: "general_continue",
-                        submit: function () {
-                            saveLanguage();
-                            overlayService.close();
-                        },
-                        close: function () {
-                            overlayService.close();
-                            vm.saveButtonState = "init";
-                        }
-                    });
-                } else {
-                    saveLanguage();
-                }
-            }
-        }
-
-        function saveLanguage() {
-            languageResource.save(vm.language).then(function (lang) {
-                formHelper.resetForm({ scope: $scope });
-
-                vm.language = lang;
-                vm.saveButtonState = "success";
-
-                $scope.$emit("$changeTitle", vm.labels.editLanguage + ": " + vm.language.name);
-
-                localizationService.localize("speechBubbles_languageSaved").then(function (value) {
-                    notificationsService.success(value);
-                });
-
-                // Emit event when language is created or updated/saved
-                eventsService.emit("editors.languages.languageSaved", {
-                    language: lang,
-                    isNew: vm.isNew
-                });
-
-                vm.isNew = false;
-            }, function (err) {
-                vm.saveButtonState = "error";
-                formHelper.resetForm({ scope: $scope, hasErrors: true });
-                formHelper.handleError(err);
-            });
-        }
-
-        function back() {
-            $location.path("settings/languages/overview");
-        }
-
-        function goToPage(ancestor) {
-            $location.path(ancestor.path);
-        }
-
-        function toggleMandatory() {
-            vm.language.isMandatory = !vm.language.isMandatory;
-        }
-
-        function toggleDefault() {
-            // It shouldn't be possible to uncheck the default language
-            if (vm.initIsDefault) {
-                return;
-            }
-
-            vm.language.isDefault = !vm.language.isDefault;
-            if (vm.language.isDefault) {
-                vm.showDefaultLanguageInfo = true;
-            } else {
-                vm.showDefaultLanguageInfo = false;
-            }
-        }
-
-        function makeBreadcrumbs() {
-            vm.breadcrumbs = [
-                {
-                    "name": vm.labels.languages,
-                    "path": "/settings/languages/overview"
-                },
-                {
-                    "name": vm.language.name
-                }
-            ];
-        }
-
-        init();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Languages.EditController", LanguagesEditController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/edit.html b/src/Umbraco.Web.UI.Client/src/views/languages/edit.html
deleted file mode 100644
index b9a492cb21..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/languages/edit.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<div data-element="editor-languages" ng-controller="Umbraco.Editors.Languages.EditController as vm" class="clearfix">
-
-    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-    <form name="editLanguageForm" novalidate val-form-manager>
-
-        <umb-editor-view ng-if="!vm.loading">
-    
-            <umb-editor-header name="vm.language.name"
-                               name-locked="vm.isNew"
-                               on-back="vm.back()"
-                               show-back-button="true"
-                               hide-icon="true"
-                               hide-alias="true"
-                               hide-description="true">
-            </umb-editor-header>
-    
-            <umb-editor-container class="form-horizontal">
-
-                <umb-box>
-                    <umb-box-content>
-
-                        <umb-control-group label="@general_language" required="true">
-                            <select name="newLang"
-                                    class="input-block-level"
-                                    ng-model="vm.language.culture"
-                                    ng-options="key as value for (key, value) in vm.availableCultures"
-                                    val-server-field="IsoCode"
-                                    required></select>
-                            <span ng-messages="editLanguageForm.newLang.$error" show-validation-on-submit>
-                                <span class="help-inline" ng-message="required">Required</span>
-                                <span class="help-inline" ng-message="valServerField">{{editLanguageForm.newLang.errorMsg}}</span>
-                            </span>
-                        </umb-control-group>
-
-                        <umb-control-group label="@languages_culture">
-                            <span ng-bind="vm.language.culture"></span>
-                        </umb-control-group>
-
-                        <umb-control-group label="@general_settings" class="umb-toggle-group">
-
-                            <div class="umb-toggle-group-item" ng-click="vm.toggleDefault()" ng-class="{ 'umb-toggle-group-item--disabled': vm.initIsDefault }">
-                                <umb-toggle class="umb-toggle-group-item__toggle"
-                                            checked="vm.language.isDefault"
-                                            disabled="vm.initIsDefault">
-                                </umb-toggle>
-                                <div class="umb-toggle-group-item__content">
-                                    <localize key="languages_defaultLanguage"></localize>
-                                    <span class="umb-toggle-group-item__description"><localize key="languages_defaultLanguageHelp"></localize></span>
-                                </div>
-                            </div>
-
-                            <div class="umb-toggle-group-item" ng-click="vm.toggleMandatory()">
-                                <umb-toggle class="umb-toggle-group-item__toggle"
-                                            checked="vm.language.isMandatory">
-                                </umb-toggle>
-                                <div class="umb-toggle-group-item__content">
-                                    <localize key="languages_mandatoryLanguage"></localize>
-                                    <span class="umb-toggle-group-item__description"><localize key="languages_mandatoryLanguageHelp"></localize></span>
-                                </div>
-                            </div>
-
-                            <div class="umb-alert umb-alert--info" style="margin-top: 20px;" ng-if="vm.showDefaultLanguageInfo">
-                                <localize key="languages_changingDefaultLanguageWarning">Switching default language may result in default content missing.</localize>
-                            </div>
-
-                        </umb-control-group>
-
-                        <umb-control-group label="@languages_fallbackLanguage" description="@languages_fallbackLanguageDescription">
-                            <select ng-model="vm.language.fallbackLanguageId"
-                                    ng-options="l.id as l.name for l in vm.availableLanguages">
-                                <option value="" localize="label" label="languages_noFallbackLanguageOption"></option>
-                            </select>
-                        </umb-control-group>
-
-                    </umb-box-content>
-                </umb-box>
-
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-left>
-                    <umb-breadcrumbs ancestors="vm.breadcrumbs"
-                                     allow-on-open="true"
-                                     on-open="vm.goToPage(ancestor)">
-                    </umb-breadcrumbs>
-                </umb-editor-footer-content-left>
-
-                <umb-editor-footer-content-right>
-                    <umb-button type="button"
-                                action="vm.save()"
-                                state="vm.saveButtonState"
-                                button-style="success"
-                                shortcut="ctrl+s"
-                                label="Save"
-                                label-key="buttons_save"
-                                disabled="vm.loading">
-                    </umb-button>
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-    
-        </umb-editor-view>
-
-    </form>
-    
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/overlays/change.html b/src/Umbraco.Web.UI.Client/src/views/languages/overlays/change.html
deleted file mode 100644
index c5e813fa51..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/languages/overlays/change.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-
-    <div class="umb-alert umb-alert--warning mb2">
-        <localize key="defaultdialogs_languageChangeWarning">Changing the culture for a language may be an expensive operation and will result in the content cache and indexes being rebuilt</localize>.
-    </div>
-    
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/overlays/delete.html b/src/Umbraco.Web.UI.Client/src/views/languages/overlays/delete.html
deleted file mode 100644
index 38ee080d4f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/languages/overlays/delete.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div>
-
-    <div ng-if="model.language" class="umb-alert umb-alert--warning mb2">
-      <localize key="defaultdialogs_languagedeletewarning">This will delete the language and all content related to the language</localize> <strong>{{model.language.name}} [{{model.language.culture}}]</strong>.
-    </div>
-
-    <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>?
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js
deleted file mode 100644
index ef30ca6d46..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/languages/overview.controller.js
+++ /dev/null
@@ -1,106 +0,0 @@
-(function () {
-    "use strict";
-
-    function LanguagesOverviewController($q, $timeout, $location, $routeParams, navigationService, localizationService, languageResource, eventsService, overlayService, $scope) {
-        var vm = this;
-
-        vm.page = {};
-        vm.languages = [];
-        vm.labels = {};
-
-        vm.addLanguage = addLanguage;
-        vm.editLanguage = editLanguage;
-        vm.deleteLanguage = deleteLanguage;
-
-        vm.getLanguageById = function(id) {
-            for (var i = 0; i < vm.languages.length; i++) {
-                if (vm.languages[i].id === id) {
-                    return vm.languages[i];
-                }
-            }
-
-            return null;
-        };
-
-        function init() {
-            vm.loading = true;
-
-            var promises = [];
-
-            // Localize labels
-            promises.push(localizationService.localize("treeHeaders_languages").then(function (value) {
-                vm.page.name = value;
-                $scope.$emit("$changeTitle", value);
-            }));
-
-            // Load all languages
-            promises.push(languageResource.getAll().then(function (languages) {
-                vm.languages = languages;
-            }));
-
-            $q.all(promises).then(function () {
-                vm.loading = false;
-            });
-
-            // Activate tree node
-            $timeout(function () {
-                navigationService.syncTree({ tree: $routeParams.tree, path: [-1], activate: true });
-            });
-        }
-
-        function addLanguage() {
-            $location.search('create', null);
-            $location.path("/settings/languages/edit/-1").search("create", "true");
-        }
-
-        function editLanguage(language) {
-            $location.search('create', null);
-            $location.path("/settings/languages/edit/" + language.id);
-        }
-
-        function deleteLanguage(language, event) {
-            const dialog = {
-                view: "views/languages/overlays/delete.html",
-                language: language,
-                submitButtonLabelKey: "contentTypeEditor_yesDelete",
-                submitButtonStyle: "danger",
-                submit: function (model) {
-                    performDelete(model.language);
-                    overlayService.close();
-                },
-                close: function () {
-                    overlayService.close();
-                }
-            };
-
-            localizationService.localize("general_delete").then(value => {
-                dialog.title = value;
-                overlayService.open(dialog);
-            });
-
-            event.preventDefault();
-            event.stopPropagation();
-        }
-
-        function performDelete(language) {
-            language.deleteButtonState = "busy";
-
-            languageResource.deleteById(language.id).then(function () {
-                // Emit event when language is deleted
-                eventsService.emit("editors.languages.languageDeleted", {
-                    language: language
-                });
-
-                // Remove from list
-                var index = vm.languages.indexOf(language);
-                vm.languages.splice(index, 1);
-            }, function () {
-                language.deleteButtonState = "error";
-            });
-        }
-
-        init();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Languages.OverviewController", LanguagesOverviewController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/overview.html b/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
deleted file mode 100644
index 3fb917ce9d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<div data-element="editor-languages" ng-controller="Umbraco.Editors.Languages.OverviewController as vm" class="clearfix">
-
-    <umb-editor-view footer="false">
-
-        <umb-editor-header name="vm.page.name"
-                           name-locked="true"
-                           hide-icon="true"
-                           hide-description="true"
-                           hide-alias="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-            <umb-editor-sub-header>
-
-                <umb-editor-sub-header-content-left>
-                    <umb-button type="button"
-                                action="vm.addLanguage()"
-                                button-style="outline"
-                                label-key="languages_addLanguage">
-                    </umb-button>
-                </umb-editor-sub-header-content-left>
-
-            </umb-editor-sub-header>
-
-            <table class="table table-hover" ng-if="!vm.loading">
-                <thead>
-                    <tr>
-                        <th><localize key="general_language"></localize></th>
-                        <th><localize key="languages_culture"></localize></th>
-                        <th><localize key="languages_defaultLanguage"></localize></th>
-                        <th><localize key="languages_mandatoryLanguage"></localize></th>
-                        <th><localize key="languages_fallbackLanguage"></localize></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr ng-repeat="language in vm.languages track by language.id" ng-click="vm.editLanguage(language)" style="cursor: pointer;">
-                        <td>
-                            <umb-icon icon="icon-globe" class="language-icon"></umb-icon>
-                            <span>{{ language.name }}</span>
-                        </td>
-                        <td>
-                            {{ language.culture }}
-                        </td>
-                        <td>
-                            <umb-checkmark ng-if="language.isDefault"
-                                           checked="language.isDefault"
-                                           size="xs">
-                            </umb-checkmark>
-                        </td>
-                        <td>
-                            <umb-checkmark ng-if="language.isMandatory"
-                                           checked="language.isMandatory"
-                                           size="xs">
-                            </umb-checkmark>
-                        </td>
-                        <td>
-                            <span ng-if="language.fallbackLanguageId">{{ vm.getLanguageById(language.fallbackLanguageId).name }}</span>
-                            <span ng-if="!language.fallbackLanguageId">(<localize key="languages_none"></localize>)</span>
-                        </td>
-                        <td style="text-align: right;">
-                            <umb-button ng-if="!language.isDefault"
-                                        type="button"
-                                        action="vm.deleteLanguage(language, $event)"
-                                        state="language.deleteButtonState"
-                                        button-style="danger"
-                                        size="xxs"
-                                        label-key="general_delete">
-                            </umb-button>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-
-        </umb-editor-container>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/logViewer/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/logViewer/overview.controller.js
deleted file mode 100644
index bbcb30368f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/logViewer/overview.controller.js
+++ /dev/null
@@ -1,219 +0,0 @@
-(function () {
-    "use strict";
-
-    function LogViewerOverviewController($q, $location, $timeout, logViewerResource, navigationService) {
-
-        var vm = this;
-
-        vm.loading = false;
-        vm.canLoadLogs = false;
-        vm.searches = [];
-        vm.numberOfErrors = 0;
-        vm.commonLogMessages = [];
-        vm.commonLogMessagesCount = 10;
-        vm.dateRangeLabel = "";
-
-        vm.config = {
-            enableTime: false,
-            dateFormat: "Y-m-d",
-            time_24hr: false,
-            mode: "range",
-            maxDate: "today",
-            conjunction: " to "
-        };
-
-        // ChartJS Options - for count/overview of log distribution
-        vm.logTypeLabels = ["Debug", "Info", "Warning", "Error", "Fatal"];
-        vm.logTypeData = [0, 0, 0, 0, 0];
-        vm.logTypeColors = ['#2e8aea', '#2bc37c', '#ff9412', '#d42054', '#343434'];
-        vm.chartOptions = {
-            legend: {
-                display: true,
-                position: 'left'
-            }
-        };
-
-        // Functions
-        vm.searchLogQuery = searchLogQuery;
-        vm.findMessageTemplate = findMessageTemplate;
-        vm.searchErrors = searchErrors;
-        vm.showMore = showMore;
-        vm.dateRangeChange = dateRangeChange;
-        
-        let querystring = $location.search();
-        if (querystring.startDate) {
-            vm.startDate = querystring.startDate;
-            vm.dateRangeLabel = getDateRangeLabel("Selected Time Period");
-        } else {
-            vm.startDate = new Date(Date.now());
-            vm.startDate.setDate(vm.startDate.getDate() - 1);
-            vm.startDate = vm.startDate.toIsoDateString();
-            vm.dateRangeLabel = getDateRangeLabel("Today");
-        }
-
-        if (querystring.endDate) {
-            vm.endDate = querystring.endDate;
-
-            if (querystring.endDate === querystring.startDate) {
-                vm.dateRangeLabel = getDateRangeLabel("Selected Date");
-            }
-        } else {
-            vm.endDate = new Date(Date.now()).toIsoDateString();
-        }
-
-        vm.period = [vm.startDate, vm.endDate];
-
-        function preFlightCheck() {
-            vm.loading = true;
-            // Do our pre-flight check (to see if we can view logs)
-            // IE the log file is NOT too big such as 1GB & crash the site
-            logViewerResource.canViewLogs(vm.startDate, vm.endDate).then(function (result) {
-                vm.loading = false;
-                vm.canLoadLogs = result;
-
-                if (result) {
-                    // Can view logs - so initialize
-                    init();
-                }
-            });
-        }
-
-        function showMore() {
-            vm.commonLogMessagesCount += 10;
-        }
-
-        function init() {
-
-            vm.loading = true;
-
-            var savedSearches = logViewerResource.getSavedSearches().then(function (data) {
-                    vm.searches = data;
-                },
-                // Fallback to some defaults if error from API response
-                function () {
-                    vm.searches = [
-                        {
-                            "name": "Find all logs where the Level is NOT Verbose and NOT Debug",
-                            "query": "Not(@Level='Verbose') and Not(@Level='Debug')"
-                    },
-                        {
-                            "name": "Find all logs that has an exception property (Warning, Error & Fatal with Exceptions)",
-                            "query": "Has(@Exception)"
-                    },
-                        {
-                            "name": "Find all logs that have the property 'Duration'",
-                            "query": "Has(Duration)"
-                    },
-                        {
-                            "name": "Find all logs that have the property 'Duration' and the duration is greater than 1000ms",
-                            "query": "Has(Duration) and Duration > 1000"
-                    },
-                        {
-                            "name": "Find all logs that are from the namespace 'Umbraco.Core'",
-                            "query": "StartsWith(SourceContext, 'Umbraco.Core')"
-                    },
-                        {
-                            "name": "Find all logs that use a specific log message template",
-                            "query": "@MessageTemplate = '[Timing {TimingId}] {EndMessage} ({TimingDuration}ms)'"
-                    }
-                ]
-                });
-
-            var numOfErrors = logViewerResource.getNumberOfErrors(vm.startDate, vm.endDate).then(function (data) {
-                vm.numberOfErrors = data;
-            });
-
-            var logCounts = logViewerResource.getLogLevelCounts(vm.startDate, vm.endDate).then(function (data) {
-                vm.logTypeData = [];
-
-                for (let [key, value] of Object.entries(data)) {
-                    const index = vm.logTypeLabels.findIndex(x => key.startsWith(x));
-                    if (index > -1) {
-                        vm.logTypeData[index] = value;
-                    }                
-                }
-            });
-
-            var commonMsgs = logViewerResource.getMessageTemplates(vm.startDate, vm.endDate).then(function (data) {
-                vm.commonLogMessages = data;
-            });
-            
-            var logLevels = logViewerResource.getLogLevels().then(function(data) {
-                vm.logLevels = {};
-                vm.logLevelsCount = 0;
-
-                for (let [key, value] of Object.entries(data)) {
-                    const index = vm.logTypeLabels.findIndex(x => value.startsWith(x));
-                    if (index > -1) {
-                        vm.logLevels[key] = index;
-                        vm.logLevelsCount++;
-                    }
-                }
-            });
-
-            // Set loading indicator to false when these 3 queries complete
-            $q.all([savedSearches, numOfErrors, logCounts, commonMsgs, logLevels]).then(function () {
-                vm.loading = false;
-            });
-
-            $timeout(function () {
-                navigationService.syncTree({
-                    tree: "logViewer",
-                    path: "-1"
-                });
-            });
-        }
-
-        preFlightCheck();
-
-        function searchLogQuery(logQuery) {
-            $location.path("/settings/logViewer/search").search({
-                lq: logQuery,
-                startDate: vm.startDate,
-                endDate: vm.endDate
-            });
-        }
-
-        function findMessageTemplate(template) {
-            var logQuery = "@MessageTemplate='" + template.MessageTemplate + "'";
-            searchLogQuery(logQuery);
-        }
-
-        function getDateRangeLabel(suffix) {
-            return "Log Overview for " + suffix;
-        }
-      
-        function searchErrors() {
-            var logQuery = "@Level='Fatal' or @Level='Error' or Has(@Exception)";
-            searchLogQuery(logQuery);
-        }
-
-        function dateRangeChange(selectedDates, dateStr, instance) {
-
-            if (selectedDates.length > 0) {
-
-                // Update view by re-requesting route with updated querystring.
-                // By doing this we make sure the URL matches the selected time period, aiding sharing the link.
-                // Also resolves a minor layout issue where the " to " conjunction between the selected dates
-                // is collapsed to a comma.
-                const startDate = selectedDates[0].toIsoDateString();
-                const endDate = selectedDates[selectedDates.length - 1].toIsoDateString(); // Take the last date as end
-
-                // Check if date range has changed
-                if (startDate === vm.period[0] && endDate === vm.period[1]) {
-                    // Same date range
-                    return;
-                }
-
-                $location.path("/settings/logViewer/overview").search({
-                    startDate: startDate,
-                    endDate: endDate
-                });
-            }
-
-        }
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.LogViewer.OverviewController", LogViewerOverviewController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/logViewer/overview.html b/src/Umbraco.Web.UI.Client/src/views/logViewer/overview.html
deleted file mode 100644
index b312d0b789..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/logViewer/overview.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<div data-element="editor-logs" ng-controller="Umbraco.Editors.LogViewer.OverviewController as vm" class="clearfix" id="logview">
-
-    <umb-editor-view footer="false">
-
-        <umb-editor-header
-            name="vm.dateRangeLabel"
-            name-locked="true"
-            hide-icon="true"
-            hide-description="true"
-            hide-alias="true"
-            setPageTitle="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-            <!-- Warning message (if unable to view log files) -->
-            <div class="umb-logviewer" ng-show="!vm.loading">
-                <div class="umb-logviewer__main-content">
-                    <div ng-show="!vm.canLoadLogs">
-                        <umb-box>
-                            <umb-box-header title="Unable to view logs"></umb-box-header>
-                            <umb-box-content>
-                                <p>Today's log file is too large to be viewed and would cause performance problems.</p>
-                                <p>If you need to view the log files, try opening them manually</p>
-                            </umb-box-content>
-                        </umb-box>
-                    </div>
-                    <div ng-show="vm.canLoadLogs">
-                        <!-- Saved Searches -->
-                        <umb-box>
-                            <umb-box-header title="Saved Searches"></umb-box-header>
-                            <umb-box-content>
-                                <table>
-                                    <caption class="sr-only">Saved Searches</caption>
-                                    <tbody>
-                                        <tr>
-                                            <td>
-                                                <button type="button" ng-click="vm.searchLogQuery()" title="View all Logs" class="btn btn-link">All Logs <umb-icon icon="icon-search"></umb-icon></button>
-                                            </td>
-                                        </tr>
-                                        <!-- Fetch saved searches  -->
-                                        <tr ng-repeat="search in vm.searches">
-                                            <td>
-                                                <button type="button" ng-click="vm.searchLogQuery(search.query)" title="{{search.name}}" class="btn btn-link">{{search.name}} <umb-icon icon="icon-search"></umb-icon></button>
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </umb-box-content>
-                        </umb-box>
-
-                        <!-- List of top X common log messages -->
-                        <umb-box>
-                            <umb-box-header title="Common Log Messages"></umb-box-header>
-                            <umb-box-content class="block-form">
-                                <em>Total Unique Message types</em>: {{ vm.commonLogMessages.length }}
-                            <table class="table table-hover">
-                                <caption class="sr-only">Common Log Messages Total Unique Message types: {{ vm.commonLogMessages.length }}</caption>
-                                <tbody>
-                                    <tr ng-repeat="template in vm.commonLogMessages | limitTo:vm.commonLogMessagesCount" ng-click="vm.findMessageTemplate(template)" style="cursor: pointer;">
-                                        <td>
-                                            {{ template.MessageTemplate }}
-                                        </td>
-                                        <td>
-                                            {{ template.Count }}
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                                <umb-button ng-if="vm.commonLogMessagesCount < vm.commonLogMessages.length"
-                                            button-style="action"
-                                            type="button"
-                                            action="vm.showMore()"
-                                            label="Show More">
-                                </umb-button>
-                            </umb-box-content>
-                        </umb-box>
-                    </div>
-                </div>
-                <div class="umb-logviewer__sidebar">
-
-                    <!-- Time period -->
-                    <umb-box>
-                        <umb-box-header title="Time Period" id="timePeriod"></umb-box-header>
-
-                        <umb-date-time-picker class="datepicker"
-                                       ng-model="vm.period"
-                                       options="vm.config"
-                                       on-close="vm.dateRangeChange(selectedDates, dateStr, instance)"
-                                       label="timePeriod">
-                        </umb-date-time-picker>
-                    </umb-box>
-
-                    <div ng-show=" vm.canLoadLogs">
-                        <div class="umb-box-row">
-                        <!-- No of Errors -->
-                            <umb-box ng-click="vm.searchErrors()" style="cursor:pointer;">
-                                <umb-box-header title="Number of Errors"></umb-box-header>
-                                <umb-box-content class="block-form" style="font-size: 40px; font-weight:900; text-align:center; color:#fe6561;">
-                                    {{ vm.numberOfErrors }}
-                                </umb-box-content>
-                            </umb-box>
-
-                            <umb-box>
-                                <umb-box-header title="Log level"></umb-box-header>
-                                <umb-box-content class="block-form">
-                                    <div ng-repeat="(sink, logTypeIndex) in vm.logLevels">
-                                        <p ng-if="vm.logLevelsCount == 1" style="font-weight: 900; text-align: center; color: {{ vm.logTypeColors[logTypeIndex] }} ">{{ vm.logTypeLabels[logTypeIndex] }}</p>
-                                        <p ng-if="vm.logLevelsCount > 1">
-                                             {{sink}}: <span style="font-weight: 900; color: {{ vm.logTypeColors[logTypeIndex] }} ">{{ vm.logTypeLabels[logTypeIndex] }}</span>
-                                        </p>
-                                    </div>
-                                </umb-box-content>
-                            </umb-box>
-                        </div>
-
-                        <!-- Chart of diff log types -->
-                        <umb-box>
-                            <umb-box-header title="Log Types"></umb-box-header>
-                            <umb-box-content class="block-form">
-
-                                <canvas chart-doughnut
-                                        chart-data="vm.logTypeData"
-                                        chart-labels="vm.logTypeLabels"
-                                        chart-colors="vm.logTypeColors"
-                                        chart-options="vm.chartOptions">
-                                </canvas>
-
-                            </umb-box-content>
-                        </umb-box>
-
-                    </div>
-                </div>
-            </div>
-
-        </umb-editor-container>
-    </umb-editor-view>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/logViewer/search.controller.js b/src/Umbraco.Web.UI.Client/src/views/logViewer/search.controller.js
deleted file mode 100644
index c9adeb8d5c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/logViewer/search.controller.js
+++ /dev/null
@@ -1,438 +0,0 @@
-(function () {
-    "use strict";
-
-    function LogViewerSearchController($location, $timeout, logViewerResource, overlayService, localizationService) {
-
-        var vm = this;
-
-        vm.loading = false;
-        vm.logsLoading = false;
-
-        vm.showBackButton = true;
-        vm.page = {};
-
-        // this array is also used to map the logTypeColor param onto the log items
-        // in setLogTypeColors()
-        vm.logLevels = [
-            {
-                name: 'Verbose',
-                logTypeColor: 'gray'
-            },
-            {
-                name: 'Debug',
-                logTypeColor: 'info'
-            },
-            {
-                name: 'Information',
-                logTypeColor: 'success'
-            },
-            {
-                name: 'Warning',
-                logTypeColor: 'warning'
-            },
-            {
-                name: 'Error',
-                logTypeColor: 'danger'
-            },
-            {
-                name: 'Fatal',
-                logTypeColor: 'dark'
-            }
-        ];
-
-        vm.polling = {
-            enabled: false,
-            interval: 0,
-            promise: null,
-
-            defaultButton: {
-                labelKey: "logViewer_polling",
-                handler: function() {
-                    if (vm.polling.enabled) {
-                        vm.polling.enabled = false;
-                        vm.polling.interval = 0;
-                        vm.polling.defaultButton.icon = null;
-                        vm.polling.defaultButton.labelKey = "logViewer_polling";
-                    }
-                    else {
-                        vm.polling.subButtons[0].handler();
-                    }
-                }
-            },
-            subButtons: [
-                {
-                    labelKey: "logViewer_every2",
-                    handler: function() {
-                        enablePolling(2);
-                    }
-                },
-                {
-                    labelKey: "logViewer_every5",
-                    handler: function() {
-                        enablePolling(5);
-                    }
-                },
-                {
-                    labelKey: "logViewer_every10",
-                    handler: function() {
-                        enablePolling(10);
-                    }
-                },
-                {
-                    labelKey: "logViewer_every20",
-                    handler: function() {
-                        enablePolling(20);
-                    }
-                },
-                {
-                    labelKey: "logViewer_every30",
-                    handler: function() {
-                        enablePolling(30);
-                    }
-                }
-            ]
-
-        }
-
-        function enablePolling(interval) {
-            vm.polling.enabled = true;
-            vm.polling.interval = interval;
-            vm.polling.defaultButton.icon = "icon-axis-rotation fa-spin";
-            vm.polling.defaultButton.labelKey = "logViewer_pollingEvery" + interval;
-
-            if (vm.polling.promise)
-            {
-                $timeout.cancel(vm.polling.promise);
-            }
-            vm.polling.promise = poll(interval);
-        }
-
-        function poll(interval) {
-            vm.polling.promise = $timeout(function() {
-                getLogs(true, true);
-                if (vm.polling.enabled && vm.polling.interval > 0) {
-                    poll(vm.polling.interval);
-                }
-            }, interval*1000);
-        }
-
-
-        vm.searches = [];
-
-        vm.logItems = {};
-        vm.logOptions = {};
-        vm.logOptions.orderDirection = 'Descending';
-
-        vm.fromDatePickerConfig = {
-            pickTime: true,
-            useSeconds: false,
-            useCurrent: false,
-            format: "YYYY-MM-DD HH:mm",
-            icons: {
-                time: "icon-time",
-                date: "icon-calendar",
-                up: "icon-chevron-up",
-                down: "icon-chevron-down"
-            }
-        };
-
-        vm.toDatePickerConfig = {
-            pickTime: true,
-            useSeconds: false,
-            format: "YYYY-MM-DD HH:mm",
-            icons: {
-                time: "icon-time",
-                date: "icon-calendar",
-                up: "icon-chevron-up",
-                down: "icon-chevron-down"
-            }
-        };
-
-        //Functions
-        vm.getLogs = getLogs;
-        vm.changePageNumber = changePageNumber;
-        vm.search = search;
-        vm.getFilterName = getFilterName;
-        vm.setLogLevelFilter = setLogLevelFilter;
-        vm.selectAllLogLevelFilters = selectAllLogLevelFilters;
-        vm.deselectAllLogLevelFilters = deselectAllLogLevelFilters;
-        vm.toggleOrderBy = toggleOrderBy;
-        vm.selectSearch = selectSearch;
-        vm.resetSearch = resetSearch;
-        vm.findItem = findItem;
-        vm.checkForSavedSearch = checkForSavedSearch;
-        vm.addToSavedSearches = addToSavedSearches;
-        vm.deleteSavedSearch = deleteSavedSearch;
-        vm.back = back;
-
-        function init() {
-
-            //If we have a Querystring set for lq (log query)
-            //Then update vm.logOptions.filterExpression
-            var querystring = $location.search();
-            if(querystring.lq){
-                vm.logOptions.filterExpression = querystring.lq;
-            }
-
-            if(querystring.startDate){
-                vm.logOptions.startDate = querystring.startDate;
-            }
-
-            if(querystring.endDate){
-                vm.logOptions.endDate = querystring.endDate;
-            }
-
-            vm.loading = true;
-
-            logViewerResource.getSavedSearches().then(function (data) {
-                vm.searches = data;
-                vm.loading = false;
-            },
-            // fallback to some defaults if error from API response
-            function () {
-                vm.searches = [
-                    {
-                        "name": "Find all logs where the Level is NOT Verbose and NOT Debug",
-                        "query": "Not(@Level='Verbose') and Not(@Level='Debug')"
-                    },
-                    {
-                        "name": "Find all logs that has an exception property (Warning, Error & Fatal with Exceptions)",
-                        "query": "Has(@Exception)"
-                    },
-                    {
-                        "name": "Find all logs that have the property 'Duration'",
-                        "query": "Has(Duration)"
-                    },
-                    {
-                        "name": "Find all logs that have the property 'Duration' and the duration is greater than 1000ms",
-                        "query": "Has(Duration) and Duration > 1000"
-                    },
-                    {
-                        "name": "Find all logs that are from the namespace 'Umbraco.Core'",
-                        "query": "StartsWith(SourceContext, 'Umbraco.Core')"
-                    },
-                    {
-                        "name": "Find all logs that use a specific log message template",
-                        "query": "@MessageTemplate = '[Timing {TimingId}] {EndMessage} ({TimingDuration}ms)'"
-                    }
-                ];
-            });
-
-            //Get all logs on init load
-            getLogs();
-
-        }
-
-
-        function search(){
-            //Update the querystring lq (log query)
-            $location.search('lq', vm.logOptions.filterExpression);
-
-            //Reset pagenumber back to 1
-            vm.logOptions.pageNumber = 1;
-            getLogs();
-        }
-
-        function changePageNumber(pageNumber) {
-            vm.logOptions.pageNumber = pageNumber;
-            getLogs();
-        }
-
-        function getLogs(hideLoadingIndicator, keepOpenItems){
-            vm.logsLoading = !hideLoadingIndicator;
-
-            logViewerResource.getLogs(vm.logOptions).then(function (data) {
-                if (keepOpenItems) {
-                    var openItemTimestamps = vm.logItems.items.filter(item => item.open).map(item => item.Timestamp);
-                    data.items = data.items.map(item => {
-                        item.open = openItemTimestamps.indexOf(item.Timestamp) > -1;
-                        return item;
-                    });
-                }
-                vm.logItems = data;
-                vm.logsLoading = false;
-
-                setLogTypeColor(vm.logItems.items);
-            }, function(err){
-                vm.logsLoading = false;
-            });
-        }
-
-        function setLogTypeColor(logItems) {
-            logItems.forEach(logItem =>
-                logItem.logTypeColor = vm.logLevels.find(x => x.name === logItem.Level).logTypeColor);
-        }
-
-        function getFilterName(array) {
-            var name = "All";
-            var found = false;
-            array.forEach(function (item) {
-                if (item.selected) {
-                    if (!found) {
-                        name = item.name
-                        found = true;
-                    } else {
-                        name = name + ", " + item.name;
-                    }
-                }
-            });
-            return name;
-        }
-
-        function setLogLevelFilter(logLevel) {
-
-            if (!vm.logOptions.logLevels) {
-                vm.logOptions.logLevels = [];
-            }
-
-            if (logLevel.selected) {
-                vm.logOptions.logLevels.push(logLevel.name);
-            } else {
-                var index = vm.logOptions.logLevels.indexOf(logLevel.name);
-                vm.logOptions.logLevels.splice(index, 1);
-            }
-
-            getLogs();
-        }
-
-        function updateAllLogLevelFilterCheckboxes(bool) {
-            vm.logLevels.forEach(logLevel => logLevel.selected = bool);
-        }
-
-        function selectAllLogLevelFilters() {
-            vm.logOptions.logLevels = vm.logLevels.map(logLevel => logLevel.name);
-            updateAllLogLevelFilterCheckboxes(true);
-
-            getLogs();
-        }
-
-        function deselectAllLogLevelFilters() {
-            vm.logOptions.logLevels = [];
-            updateAllLogLevelFilterCheckboxes(false);
-
-            getLogs();
-        }
-
-        function toggleOrderBy(){
-            vm.logOptions.orderDirection = vm.logOptions.orderDirection === 'Descending' ? 'Ascending' : 'Descending';
-
-            getLogs();
-        }
-
-        function selectSearch(searchItem){
-            //Update search box input
-            vm.logOptions.filterExpression = searchItem.query;
-            vm.dropdownOpen = false;
-
-            search();
-        }
-
-        function resetSearch(){
-            vm.logOptions.filterExpression = '';
-            search();
-        }
-
-        function findItem(key, value){
-            if(isNaN(value)){
-                vm.logOptions.filterExpression = key + "='" + value + "'";
-            }
-            else {
-                vm.logOptions.filterExpression = key + "=" + value;
-            }
-
-            search();
-        }
-
-        //Return a bool to toggle display of the star/fav
-        function checkForSavedSearch(){
-            //Check if we have a value in
-            if(!vm.logOptions.filterExpression){
-                return false;
-            }
-            else {
-                //Check what we have searched for is not an existing saved search
-                var findQuery = _.findWhere(vm.searches, {query: vm.logOptions.filterExpression});
-                return !findQuery ? true: false;
-            }
-        }
-
-        function addToSavedSearches(){
-
-            const overlay = {
-                title: "Save Search",
-                closeButtonLabel: "Cancel",
-                submitButtonLabel: "Save Search",
-                disableSubmitButton: true,
-                view: "logviewersearch",
-                query: vm.logOptions.filterExpression,
-                submit: function (model) {
-                    //Resource call with two params (name & query)
-                    //API that opens the JSON and adds it to the bottom
-                    logViewerResource.postSavedSearch(model.queryName, model.query).then(function(data){
-                        vm.searches = data;
-                        overlayService.close();
-                    });
-                },
-                close: () => overlayService.close()
-            };
-
-            var labelKeys = [
-                "general_cancel",
-                "logViewer_saveSearch",
-                "logViewer_saveSearchDescription"
-            ];
-
-            localizationService.localizeMany(labelKeys).then(values => {
-                overlay.title = values[1];
-                overlay.subtitle = values[2],
-                overlay.submitButtonLabel = values[1],
-                overlay.closeButtonLabel = values[0],
-
-                overlayService.open(overlay);
-            });
-        }
-
-        function deleteSavedSearch(searchItem) {
-
-            const overlay = {
-                title: "Delete Saved Search",
-                closeButtonLabel: "Cancel",
-                submitButtonLabel: "Delete Saved Search",
-                submitButtonStyle: "danger",
-                submit: function (model) {
-                    //Resource call with two params (name & query)
-                    //API that opens the JSON and adds it to the bottom
-                    logViewerResource.deleteSavedSearch(searchItem.name, searchItem.query).then(function(data){
-                        vm.searches = data;
-                        overlayService.close();
-                    });
-                },
-                close: () => overlayService.close()
-            };
-
-            var labelKeys = [
-                "general_cancel",
-                "defaultdialogs_confirmdelete",
-                "logViewer_deleteSavedSearch"
-            ];
-
-            localizationService.localizeMany(labelKeys).then(values => {
-                overlay.title = values[2];
-                overlay.subtitle = values[1];
-                overlay.submitButtonLabel = values[2];
-                overlay.closeButtonLabel = values[0];
-
-                overlayService.open(overlay);
-            });
-        }
-
-        function back() {
-            $location.path("settings/logViewer/overview").search('lq', null);
-        }
-
-        init();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.LogViewer.SearchController", LogViewerSearchController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/logViewer/search.html b/src/Umbraco.Web.UI.Client/src/views/logViewer/search.html
deleted file mode 100644
index c3a0668253..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/logViewer/search.html
+++ /dev/null
@@ -1,289 +0,0 @@
-<div data-element="editor-logs" ng-controller="Umbraco.Editors.LogViewer.SearchController as vm" class="clearfix umb-logviewer-search">
-
-    <umb-editor-view footer="false">
-
-        <umb-editor-header name="'Log Search'"
-                           name-locked="true"
-                           on-back="vm.back()"
-                           show-back-button="vm.showBackButton"
-                           hide-icon="true"
-                           hide-description="true"
-                           hide-alias="true"
-                           setPageTitle="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-            <form ng-submit="vm.search()">
-
-                <umb-editor-sub-header>
-                    <umb-editor-sub-header-content-left class="flex-auto flex-wrap">
-
-                        <div class="flex mr-auto mb2">
-
-                            <!-- Log Level filter -->
-                            <div class="umb-filter">
-                                <button type="button"
-                                        class="btn btn-link dropdown-toggle umb-filter__toggle"
-                                        ng-click="vm.page.showLevelFilter = !vm.page.showLevelFilter"
-                                        aria-haspopup="true"
-                                        aria-expanded="{{vm.page.showLevelFilter === undefined ? false : vm.page.showLevelFilter}}">
-
-                                    <span><localize key="logViewer_logLevels">Log Levels</localize>:</span>
-                                    <span class="bold truncate dib umb-filter__label">{{ vm.getFilterName(vm.logLevels) }}</span>
-                                    <span class="caret" aria-hidden="true"></span>
-                                </button>
-                                <umb-dropdown class="pull-left" ng-if="vm.page.showLevelFilter" on-close="vm.page.showLevelFilter = false;">
-                                    <umb-dropdown-item ng-repeat="level in vm.logLevels" class="dropdown-item">
-                                        <div class="flex items-center">
-                                            <umb-checkbox input-id="loglevel-{{$index}}"
-                                                          name="loglevel"
-                                                          model="level.selected"
-                                                          on-change="vm.setLogLevelFilter(level)">
-                                            </umb-checkbox>
-                                            <label for="loglevel-{{$index}}">
-                                                <umb-badge size="s" color="{{level.logTypeColor}}">{{level.name}}</umb-badge>
-                                            </label>
-                                        </div>
-                                    </umb-dropdown-item>
-
-                                    <!-- Select all log level filters -->
-                                    <umb-dropdown-item>
-                                        <umb-button action="vm.selectAllLogLevelFilters()"
-                                                    label="Select all"
-                                                    label-key="logViewer_selectAllLogLevelFilters"
-                                                    type="button"
-                                                    button-style="link"
-                                                    size="xs">
-                                        </umb-button>
-                                    </umb-dropdown-item>
-
-                                    <!-- Deselect all log level filters -->
-                                    <umb-dropdown-item>
-                                        <umb-button action="vm.deselectAllLogLevelFilters()"
-                                                    label="Deselect all"
-                                                    label-key="logViewer_deselectAllLogLevelFilters"
-                                                    type="button"
-                                                    button-style="link"
-                                                    size="xs">
-                                        </umb-button>
-                                    </umb-dropdown-item>
-
-                                </umb-dropdown>
-                            </div>
-
-                        </div>
-                        <div class="flex">
-                            <!-- Polling Button -->
-                            <umb-button-group default-button="vm.polling.defaultButton"
-                                              sub-buttons="vm.polling.subButtons"
-                                              icon="{{vm.polling.defaultButton.icon}}"
-                                              direction="down"
-                                              float="right">
-                            </umb-button-group>
-                        </div>
-                        <div class="flex search-box">
-                            <div class="flex-auto">
-                                <!-- Search/expression filter -->
-                                <input class="form-control search-input" type="text" ng-model="vm.logOptions.filterExpression" placeholder="Search logs..." />
-
-                                <!-- Save Search & Clear Search icon buttons -->
-                                <button type="button" class="btn-reset save-search" ng-show="vm.checkForSavedSearch()" ng-click="vm.addToSavedSearches()">
-                                    <umb-icon icon="icon-rate"></umb-icon>
-                                    <localize class="sr-only" key="logViewer_saveSearch">Save Search</localize>
-                                </button>
-                                <button type="button" class="btn-reset filter-search" ng-show="vm.logOptions.filterExpression" ng-click="vm.resetSearch()">
-                                    <umb-icon icon="icon-wrong"></umb-icon>
-                                    <localize class="sr-only" key="logViewer_filterSearch">Filter Search</localize>
-                                </button>
-
-                                <!-- Saved Searches -->
-                                <button type="button" class="umb-variant-switcher__toggle" ng-click="vm.dropdownOpen = !vm.dropdownOpen">
-                                    <localize key="logViewer_savedSearches">Saved Searches</localize>
-                                    <umb-icon icon="{{vm.dropdownOpen ? 'icon-navigation-up' : 'icon-navigation-down'}}" class="umb-variant-switcher__expand"></umb-icon>
-                                </button>
-
-                                <!-- Saved Searches Dropdown -->
-                                <umb-dropdown ng-if="vm.dropdownOpen" class="saved-searches" on-close="vm.dropdownOpen = false" umb-keyboard-list>
-                                    <umb-dropdown-item class="umb-variant-switcher__item" ng-class="{'umb-variant-switcher_item--current': variant.active}" ng-repeat="search in vm.searches">
-                                        <button type="button" class="umb-variant-switcher__name-wrapper" ng-click="vm.selectSearch(search)">
-                                            <span class="umb-variant-switcher__name">{{search.name}}</span>
-                                            <span>{{search.query}}</span>
-                                        </button>
-                                        <button type="button" class="btn-reset" style="width: auto;" ng-click="vm.deleteSavedSearch(search)" localize="title" title="@logViewer_deleteThisSearch">
-                                            <umb-icon icon="icon-trash" class="text-error"></umb-icon>
-                                        </button>
-                                    </umb-dropdown-item>
-                                </umb-dropdown>
-
-                            </div>
-
-                            <!-- Search Button -->
-                            <umb-button button-style="action"
-                                        type="submit"
-                                        action="vm.search()"
-                                        label-key="general_search">
-                            </umb-button>
-                        </div>
-
-                    </umb-editor-sub-header-content-left>
-                </umb-editor-sub-header>
-            </form>
-
-            <div ng-if="!vm.loading" class="log-items">
-
-                <!-- Loader for the main logs content when paging -->
-                <umb-load-indicator ng-if="vm.logsLoading"></umb-load-indicator>
-
-                <!-- Empty states -->
-                <umb-empty-state ng-if="vm.logItems.totalItems === 0 && !vm.logsLoading" position="center">
-                    <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
-                </umb-empty-state>
-
-                <!-- Main Log Table -->
-                <umb-box data-element="node-info-history" ng-if="!vm.logsLoading && vm.logItems.totalItems > 0">
-                    <umb-box-content class="block-form">
-
-                        <div ng-if="vm.logItems.totalItems > 0">
-                            <p> <localize key="logViewer_totalItems">Total Items</localize>: {{ vm.logItems.totalItems }}</p>
-                        </div>
-
-                        <table class="table table-hover" style="table-layout: fixed;" ng-if="vm.logItems.totalItems > 0">
-                            <thead>
-                            <tr>
-                                <th ng-click="vm.toggleOrderBy()" style="width: 22ch">
-                                    <localize key="logViewer_timestamp">Timestamp</localize>
-                                    <umb-icon icon="{{vm.logOptions.orderDirection === 'Descending' ? 'icon-navigation-down' : 'icon-navigation-up'}}" class="icon-navigation-down" ng-class="{'icon-navigation-down': vm.logOptions.orderDirection === 'Descending', 'icon-navigation-up': vm.logOptions.orderDirection !== 'Descending'}">&nbsp;</umb-icon>
-                                </th>
-                                <th style="width: 12ch"><localize key="logViewer_level">Level</localize></th>
-                                <th style="width: 14ch"><localize key="logViewer_machine">Machine</localize></th>
-                                <th><localize key="logViewer_message">Message</localize></th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                                <tr ng-repeat-start="log in vm.logItems.items" ng-click="log.open = !log.open">
-                                    <td>{{ log.Timestamp | date:'medium' }}</td>
-                                    <td><umb-badge size="s" color="{{ log.logTypeColor }}">{{ log.Level }}</umb-badge></td>
-                                    <td>{{ log.Properties.MachineName.Value }}</td>
-                                    <td style="word-break: break-word;">{{ log.RenderedMessage }}</td>
-                                </tr>
-
-                                <!-- Log Details (Exception & Properties) -->
-                                <tr ng-repeat-end ng-if="log.open">
-                                    <td colspan="4" style="padding: 0;background: none;">
-
-                                        <div ng-if="log.Exception" style="border-left:4px solid #D42054;">
-                                            <pre style="white-space: pre-wrap;">{{ log.Exception }}</pre>
-                                        </div>
-
-                                        <table class="table">
-                                            <tbody>
-                                                <tr>
-                                                    <th style="width:38.5ch">Timestamp</th>
-                                                    <td>{{log.Timestamp}}</td>
-                                                </tr>
-                                                <tr>
-                                                    <th>@MessageTemplate</th>
-                                                    <td>{{log.MessageTemplateText}}</td>
-                                                </tr>
-                                                <tr ng-repeat="(key, val) in log.Properties">
-                                                    <th>{{key}}</th>
-                                                    <td ng-switch on="key">
-                                                        <button type="button" class="btn-reset" ng-switch-when="HttpRequestNumber" ng-click="vm.findItem(key, val.Value)" localize="title" title="@logViewer_findLogsWithRequestId" aria-describedby="{{key}}">
-                                                            {{val.Value}} <umb-icon icon="icon-search" aria-hidden="true"></umb-icon> 
-                                                        </button>
-                                                        <button type="button" class="btn-reset" ng-switch-when="SourceContext" ng-click="vm.findItem(key, val.Value)" localize="title" title="@logViewer_findLogsWithNamespace" aria-describedby="{{key}}">
-                                                            {{val.Value}} <umb-icon icon="icon-search" aria-hidden="true"></umb-icon>
-                                                        </button>
-                                                        <button type="button" class="btn-reset" ng-switch-when="MachineName" ng-click="vm.findItem(key, val.Value)" localize="title" title="@logViewer_findLogsWithMachineName" aria-describedby="{{key}}">
-                                                            {{val.Value}} <umb-icon icon="icon-search"></umb-icon>
-                                                        </button>
-                                                        <a class="btn-reset" ng-switch-when="RequestUrl" href="{{val.Value}}" target="_blank" rel="noopener" localize="title" title="@logViewer_Open" aria-describedby="{{key}}">
-                                                            {{val.Value}} <umb-icon icon="icon-link"></umb-icon>
-                                                        </a>
-                                                        <span ng-switch-default>
-                                                            <span ng-if="val.Value">
-                                                                {{val.Value}}
-                                                            </span>
-                                                            <pre ng-if="!val.Value">{{val | json}}</pre>
-                                                        </span>
-                                                    </td>
-                                                </tr>
-                                            </tbody>
-                                        </table>
-
-                                        <div class="btn-group" style="margin-bottom:20px" deep-blur="log.searchDropdownOpen = !log.searchDropdownOpen">
-                                            <button type="button"
-                                                    class="btn btn-info dropdown-toggle"
-                                                    aria-haspopup="true"
-                                                    aria-expanded="{{log.searchDropdownOpen === undefined ? false : log.searchDropdownOpen}}"
-                                                    ng-click="log.searchDropdownOpen = !log.searchDropdownOpen">
-                                                <umb-icon icon="icon-search" class="icon-search"></umb-icon>
-                                                <localize key="general_search">Search</localize>
-                                                <span class="caret" aria-hidden="true"></span>
-                                            </button>
-
-                                            <umb-dropdown ng-if="log.searchDropdownOpen" on-close="log.searchDropdownOpen = false">
-                                                <umb-dropdown-item>
-                                                    <a ng-href="https://www.google.com/search?q={{ log.RenderedMessage }}" href="" target="_blank" rel="noopener" localize="title" title="@logViewer_searchThisMessageWithGoogle">
-                                                        <img src="https://www.google.com/favicon.ico" width="16" height="16" alt="" /> <localize key="logViewer_searchWithGoogle">Search With Google</localize>
-                                                    </a>
-                                                </umb-dropdown-item>
-
-                                                <umb-dropdown-item>
-                                                    <a ng-href="https://www.bing.com/search?q={{ log.RenderedMessage }}" target="_blank" title="Search this message with Bing">
-                                                        <img src="https://www.bing.com/favicon.ico" width="16" height="16" /> Search With Bing
-                                                    </a>
-                                                </umb-dropdown-item>
-
-                                                <umb-dropdown-item>
-                                                    <a ng-href="https://our.umbraco.com/search?q={{ log.RenderedMessage }}&content=wiki,forum,documentation" target="_blank" title="Search this message on Our Umbraco forums and docs">
-                                                        <img src="https://our.umbraco.com/assets/images/app-icons/favicon.png" width="16" height="16" /> Search Our Umbraco
-                                                    </a>
-                                                </umb-dropdown-item>
-
-                                                <umb-dropdown-item>
-                                                    <a ng-href="https://www.google.co.uk/?q=site:our.umbraco.com {{ log.RenderedMessage }}&safe=off#q=site:our.umbraco.com {{ log.RenderedMessage }} {{ log.Properties['SourceContext'].Value }}&safe=off" target="_blank" title="Search Our Umbraco forums using Google">
-                                                        <img src="https://www.google.com/favicon.ico" width="16" height="16" /> Search Our Umbraco with Google
-                                                    </a>
-                                                </umb-dropdown-item>
-
-                                                <umb-dropdown-item>
-                                                    <a ng-href="https://github.com/umbraco/Umbraco-CMS/search?q={{ log.Properties['SourceContext'].Value }}" target="_blank" title="Search within Umbraco source code on Github">
-                                                        <img src="https://www.github.com/favicon.ico" width="16" height="16" /> Search Umbraco Source
-                                                    </a>
-                                                </umb-dropdown-item>
-
-                                                <umb-dropdown-item>
-                                                    <a ng-href="https://github.com/umbraco/Umbraco-CMS/issues?q={{ log.Properties['SourceContext'].Value }}" target="_blank" title="Search Umbraco Issues on Github">
-                                                        <img src="https://www.github.com/favicon.ico" width="16" height="16" /> Search Umbraco Issues
-                                                    </a>
-                                                </umb-dropdown-item>
-                                            </umb-dropdown>
-                                        </div>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-
-                        <!-- Pagination -->
-                        <div ng-if="!vm.loading" class="flex justify-center">
-                            <umb-pagination
-                                ng-if="vm.logItems.totalPages"
-                                page-number="vm.logItems.pageNumber"
-                                total-pages="vm.logItems.totalPages"
-                                on-change="vm.changePageNumber(pageNumber)">
-                            </umb-pagination>
-                        </div>
-                    </umb-box-content>
-                </umb-box>
-
-            </div>
-
-        </umb-editor-container>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/create.html b/src/Umbraco.Web.UI.Client/src/views/macros/create.html
deleted file mode 100644
index 8cf4424247..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/macros/create.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<div ng-controller="Umbraco.Editors.Macros.CreateController as vm">
-
-    <form novalidate name="createMacroForm"
-          ng-submit="vm.createItem()"
-          val-form-manager>
-        <div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
-
-            <div class="umb-pane">
-                <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
-            </div>
-
-            <div class="umb-pane">
-                <div ng-show="error">
-                    <div class="alert alert-error">
-                        <div><strong>{{error.errorMsg}}</strong></div>
-                        <div>{{error.data.message}}</div>
-                    </div>
-                </div>
-
-                <umb-control-group label="@macro_enterMacroName" hide-label="false">
-                    <input type="text" name="itemKey" ng-model="vm.itemKey" class="umb-textstring textstring input-block-level"
-                           umb-auto-focus required maxlength="255" />
-                </umb-control-group>
-            </div>
-
-        </div>
-        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-            <umb-button type="button"
-                        button-style="link"
-                        action="close()"
-                        label-key="general_close">
-            </umb-button>
-            <umb-button type="submit"
-                        button-style="primary"
-                        label-key="general_create">
-            </umb-button>
-        </div>
-    </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/delete.html b/src/Umbraco.Web.UI.Client/src/views/macros/delete.html
deleted file mode 100644
index 834d7f97ee..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/macros/delete.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Macros.DeleteController as vm">
-    <div class="umb-dialog-body" auto-scale="90">
-
-        <p class="abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{vm.name}}</strong>?
-        </p>
-
-        <umb-confirm on-confirm="vm.performDelete" on-cancel="vm.cancel" confirm-button-style="danger"></umb-confirm>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/edit.html b/src/Umbraco.Web.UI.Client/src/views/macros/edit.html
deleted file mode 100644
index 9640419ee2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/macros/edit.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<div data-element="editor-macros" ng-controller="Umbraco.Editors.Macros.EditController as vm">   
-    <form name="macroForm" novalidate val-form-manager ng-submit="vm.save()">
-        <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
-        <umb-editor-view ng-if="!vm.page.loading">
-            <umb-editor-header name="vm.macro.name"
-                               alias="vm.macro.alias"
-                               hide-description="true"
-                               hide-icon="true"
-                               navigation="vm.page.navigation"editorfor="vm.header.editorfor"
-                               setpagetitle="vm.header.setPageTitle">
-            </umb-editor-header>
-
-            <umb-editor-container class="form-horizontal">
-                <umb-editor-sub-views sub-views="vm.page.navigation" model="vm">
-                </umb-editor-sub-views>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                <umb-editor-footer-content-right>
-                    <umb-button type="submit"
-                                button-style="success"
-                                state="vm.page.saveButtonState"
-                                shortcut="ctrl+s"
-                                label="Save"
-                                label-key="buttons_save">
-                    </umb-button>
-                </umb-editor-footer-content-right>
-            </umb-editor-footer>
-        </umb-editor-view>
-    </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.controller.js
deleted file mode 100644
index 6fe8c303a0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.controller.js
+++ /dev/null
@@ -1,54 +0,0 @@
-(function() {
-	"use strict";
-
-    function ParameterEditorController($scope, formHelper, editorService) {
-
-        const vm = this;
-
-        vm.submit = submit;
-        vm.close = close;
-
-        vm.openMacroParameterPicker = openMacroParameterPicker;
-
-        function openMacroParameterPicker(parameter) {
-
-            vm.focusOnMandatoryField = false;
-
-            var overlay = {
-                parameter: $scope.model.parameter,
-                view: "views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.html",
-                size: "small",
-                submit: function (model) {
-
-                    vm.focusOnMandatoryField = true;
-
-                    // update property
-                    parameter.editor = model.parameter.editor;
-
-                    editorService.close();
-                },
-                close: function (model) {
-                    editorService.close();
-                }
-            };
-
-            editorService.open(overlay);
-        }
-
-        function submit() {
-            
-            if ($scope.model && $scope.model.submit && formHelper.submitForm({scope: $scope})) {
-                $scope.model.submit($scope.model);
-            }
-        }
-
-        function close() {
-            if ($scope.model && $scope.model.close) {
-                $scope.model.close();
-            }
-        }
-	}
-
-    angular.module("umbraco").controller("Umbraco.Editors.ParameterEditorController", ParameterEditorController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.html b/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.html
deleted file mode 100644
index 7156050d96..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<div ng-controller="Umbraco.Editors.ParameterEditorController as vm">
-
-    <form name="parameterForm" novalidate val-form-manager>
-
-        <umb-editor-view>
-
-            <umb-editor-header
-                name="model.title"
-                name-locked="true"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container>
-
-                <umb-box>
-
-                    <umb-box-content class="block-form content-type-editor-dialog edit-property-settings">
-
-                        <div class="umb-control-group" ng-if="!model.parameter.locked">
-                            <div class="control-group">
-                                <textarea class="editor-label"
-                                          data-element="property-name"
-                                          name="propertyLabel"
-                                          ng-model="model.parameter.label"
-                                          localize="placeholder"
-                                          placeholder="@placeholders_entername"
-                                          umb-auto-focus
-                                          focus-on-filled="true"
-                                          umb-auto-resize
-                                          required
-                                          ng-keypress="vm.submitOnEnter($event)">
-                                </textarea>
-                                <div ng-messages="parameterForm.propertyLabel.$error" show-validation-on-submit>
-                                    <span class="umb-validation-label" ng-message="required">Required label</span>
-                                </div>
-                            </div>
-                            <div class="control-group -no-margin">
-                                <umb-generate-alias enable-lock="true" alias-from="model.parameter.label" alias="model.parameter.key"></umb-generate-alias>
-                            </div>
-                        </div>
-
-                        <button type="button" class="btn-reset editor-placeholder" data-element="editor-add" ng-if="!model.parameter.editor" hotkey="alt+shift+e" ng-click="vm.openMacroParameterPicker(model.parameter)">
-                            <localize key="shortcuts_addEditor">Add editor</localize>
-                        </button>
-
-                        <div class="editor clearfix" ng-if="model.parameter.editor">
-
-                            <button type="button" class="btn-reset editor-info" ng-click="vm.openMacroParameterPicker(model.parameter)">
-                                <div class="editor-icon-wrapper">
-                                    <umb-icon icon="{{model.parameter.dataTypeIcon || 'icon-autofill'}}" class="icon"></umb-icon>
-                                </div>
-
-                                <div class="editor-details">
-                                    <span class="editor-name">{{ model.parameter.dataTypeName }}</span>
-                                    <span class="editor-editor">{{ model.parameter.editor }}</span>
-                                </div>
-                            </button>
-
-                        </div>
-
-                    </umb-box-content>
-                </umb-box>
-
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                <umb-editor-footer-content-right>
-                    <umb-button type="button"
-                                button-style="link"
-                                label-key="general_close"
-                                shortcut="esc"
-                                action="vm.close()">
-                    </umb-button>
-                    <umb-button type="button"
-                                button-style="success"
-                                label-key="general_submit"
-                                state="vm.saveButtonState"
-                                action="vm.submit(model)">
-                    </umb-button>
-                </umb-editor-footer-content-right>
-            </umb-editor-footer>
-            '
-        </umb-editor-view>
-
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js
deleted file mode 100644
index 06fe48f3b1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Macros.CreateController
- * @function
- * 
- * @description
- * The controller for creating macro items
- */
-function MacrosCreateController($scope, $location, macroResource, navigationService, notificationsService, formHelper, appState) {
-    var vm = this;
-
-    vm.itemKey = "";
-
-    function createItem() {
-
-        if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createMacroForm })) {
-
-            var node = $scope.currentNode;
-
-            macroResource.createMacro(vm.itemKey).then(function (data) {
-                navigationService.hideMenu();
-
-                // set new item as active in tree
-                var currPath = node.path ? node.path : "-1";
-                navigationService.syncTree({ tree: "macros", path: currPath + "," + data, forceReload: true, activate: true });
-
-                // reset form state
-                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createMacroForm });
-
-                // navigate to edit view
-                var currentSection = appState.getSectionState("currentSection");
-                $location.path("/" + currentSection + "/macros/edit/" + data);
-
-
-            }, function (err) {
-                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createMacroForm, hasErrors: true });
-                if (err.data && err.data.message) {
-                    notificationsService.error(err.data.message);
-                    navigationService.hideMenu();
-                }
-            });
-        }
-    }
-
-    $scope.close = function () {
-        navigationService.hideDialog(true);
-    };
-
-    vm.createItem = createItem;
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Macros.CreateController", MacrosCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/macros.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/macros.delete.controller.js
deleted file mode 100644
index a11842ba35..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/macros/macros.delete.controller.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Macros.DeleteController
- * @function
- * 
- * @description
- * The controller for deleting macro items
- */
-function MacrosDeleteController($scope, macroResource, navigationService, treeService) {
-    var vm = this;
-    
-    vm.name = $scope.currentNode.name;
-    function performDelete() {
-        $scope.currentNode.loading = true;
-        macroResource.deleteById($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            treeService.removeNode($scope.currentNode);
-            
-            navigationService.hideMenu();
-        });
-    }
-
-    function cancel() {
-        navigationService.hideDialog();
-    }
-    
-    vm.performDelete = performDelete;
-    vm.cancel = cancel;
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Macros.DeleteController", MacrosDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js
deleted file mode 100644
index 127f566995..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Macros.EditController
- * @function
- *
- * @description
- * The controller for editing macros.
- */
-function MacrosEditController($scope, $q, $routeParams, macroResource, editorState, navigationService, formHelper, contentEditingHelper, localizationService, angularHelper) {
-
-    var vm = this;
-
-    vm.promises = {};
-    vm.header = {};
-    vm.header.editorfor = "general_macro";
-    vm.header.setPageTitle = true;
-
-    vm.page = {};
-    vm.page.loading = false;
-    vm.page.saveButtonState = "init";
-    vm.page.menu = {}
-    vm.labels = {};
-
-    function toggleValue(key) {
-        vm.macro[key] = !vm.macro[key];
-    }
-
-    vm.toggle = toggleValue;
-
-    function saveMacro() {       
-
-        if (formHelper.submitForm({ scope: $scope, statusMessage: "Saving..." })) {
-            vm.page.saveButtonState = "busy";
-            
-            macroResource.saveMacro(vm.macro).then(function (data) {
-                formHelper.resetForm({ scope: $scope });
-                bindMacro(data);
-                vm.page.saveButtonState = "success";
-            }, function (error) {
-                formHelper.resetForm({ scope: $scope, hasErrors: true });
-                contentEditingHelper.handleSaveError({
-                    err: error
-                });
-
-                vm.page.saveButtonState = "error";
-            });
-        }
-    }
-
-    vm.save = saveMacro;
-
-    function setFormDirty() {
-        var currentForm = angularHelper.getCurrentForm($scope);
-
-        if (currentForm) {
-
-            currentForm.$setDirty();
-        }
-    }
-
-    vm.setDirty = setFormDirty;
-
-    function getPartialViews() {
-        var deferred = $q.defer();
-
-        macroResource.getPartialViews().then(function (data) {
-            deferred.resolve(data);
-        }, function () {
-            deferred.reject();
-        });
-
-        return deferred.promise;
-    }
-
-    function getMacro() {
-        var deferred = $q.defer();
-
-        macroResource.getById($routeParams.id).then(function (data) {
-            deferred.resolve(data);
-        }, function () {
-            deferred.reject();
-        });
-
-        return deferred.promise;
-    }
-
-    function bindMacro(data) {
-        vm.macro = data;
-
-        if (vm.macro && vm.macro.view) {
-            vm.macro.node = { icon: 'icon-article', name: vm.macro.view };
-        }
-
-        editorState.set(vm.macro);
-
-        navigationService.syncTree({ tree: "macros", path: vm.macro.path, forceReload: true }).then(function (syncArgs) {
-            vm.page.menu.currentNode = syncArgs.node;
-        });
-    }
-
-    function init() {
-        vm.page.loading = true;
-
-        vm.promises['partialViews'] = getPartialViews();
-        vm.promises['macro'] = getMacro();
-
-        vm.views = [];
-        vm.node = null;
-
-        $q.all(vm.promises).then(function (values) {
-            var keys = Object.keys(values);
-
-            for (var i = 0; i < keys.length; i++) {
-                var key = keys[i];
-
-                if (key === 'partialViews') {
-                    vm.views = values[key];
-                }
-
-                if (key === 'macro') {
-                    bindMacro(values[key]);
-                }
-            }
-
-            vm.page.loading = false;
-        });
-
-        var labelKeys = [
-            "general_settings",
-            "macro_parameters"
-        ];
-
-        localizationService.localizeMany(labelKeys).then(function (values) {
-            // navigation
-            vm.labels.settings = values[0];
-            vm.labels.parameters = values[1];
-            
-            vm.page.navigation = [
-                {
-                    "name": vm.labels.settings,
-                    "alias": "settings",
-                    "icon": "icon-settings",
-                    "view": "views/macros/views/settings.html",
-                    "active": true
-                },
-                {
-                    "name": vm.labels.parameters,
-                    "alias": "parameters",
-                    "icon": "icon-list",
-                    "view": "views/macros/views/parameters.html"
-                }
-            ];
-        });
-    }
-
-    init();      
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Macros.EditController", MacrosEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js
deleted file mode 100644
index 936af369f9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Macros.ParametersController
- * @function
- *
- * @description
- * The controller for editing macros parameters
- */
-function MacrosParametersController($scope, $q, editorService, localizationService, macroResource) {
-
-    const vm = this;
-
-    vm.add = add;
-    vm.edit = edit;
-    vm.remove = remove;
-
-    vm.labels = {};
-
-    $scope.sortableOptions = {
-        axis: 'y',
-        containment: 'parent',
-        cursor: 'move',
-        items: '> div.control-group',
-        handle: '.handle',
-        tolerance: 'pointer',
-        update: function (e, ui) {
-            setDirty();
-        }
-    };
-
-
-    function remove(parameter, evt) {
-        evt.preventDefault();
-
-        $scope.model.macro.parameters = _.without($scope.model.macro.parameters, parameter);
-        setDirty();
-    }
-
-    function add(evt) {
-        evt.preventDefault();
-
-        openOverlay({}, vm.labels.addParameter, (newParameter) => {
-            if (!$scope.model.macro.parameters) {
-                $scope.model.macro.parameters = [];
-            }
-            $scope.model.macro.parameters.push(newParameter);
-            setDirty();
-        });
-    }
-
-    function edit(parameter, evt) {
-        evt.preventDefault();
-
-        var promises = [
-            getParameterEditorByAlias(parameter.editor)
-        ];
-
-        $q.all(promises).then(function (values) {
-            parameter.dataTypeName = values[0].name;
-
-            openOverlay(parameter, vm.labels.editParameter, (newParameter) => {
-
-                parameter.key = newParameter.key;
-                parameter.label = newParameter.label;
-                parameter.editor = newParameter.editor;
-                setDirty();
-            });
-        });
-    }
-
-    function getParameterEditorByAlias(alias) {
-        var deferred = $q.defer();
-
-        macroResource.getParameterEditorByAlias(alias).then(function (data) {
-            deferred.resolve(data);
-        }, function () {
-            deferred.reject();
-        });
-
-        return deferred.promise;
-    }
-
-    function openOverlay(parameter, title, onSubmit) {
-
-        const ruleDialog = {
-            title: title,
-            parameter: _.clone(parameter),
-            view: "views/macros/infiniteeditors/parameter.html",
-            size: "small",
-            submit: function (model) {
-                onSubmit(model.parameter);
-                editorService.close();
-            },
-            close: function () {
-                editorService.close();
-            }
-        };
-
-        editorService.open(ruleDialog);
-    }
-
-    function setDirty() {
-        $scope.model.setDirty();
-    }
-
-    function init() {
-        localizationService.localizeMany(["macro_addParameter", "macro_editParameter"]).then(function (data) {
-            vm.labels.addParameter = data[0];
-            vm.labels.editParameter = data[1];
-        });
-    }
-
-    init();
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Macros.ParametersController", MacrosParametersController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.settings.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.settings.controller.js
deleted file mode 100644
index fd7889a7a6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.settings.controller.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Macros.SettingsController
- * @function
- *
- * @description
- * The controller for editing macros settings
- */
-function MacrosSettingsController($scope, editorService, localizationService) {
-
-    const vm = this;
-
-    //vm.openViewPicker = openViewPicker;
-    //vm.removeMacroView = removeMacroView;
-    $scope.model.openViewPicker = openViewPicker;
-    $scope.model.removeMacroView = removeMacroView;
-    var labels = {};
-    vm.macroPartialViewPickerProperty = { alias : "macroPartialViewPickerProperty", description: "", label: "Macro partial view", validation: {mandatory : true}}
-    localizationService.localizeMany(["macro_selectViewFile"]).then(function(data) {
-        labels.selectViewFile = data[0];
-        vm.macroPartialViewPickerProperty.description = data[0];
-    });
-
-    function openViewPicker() {
-        const controlPicker = {
-            title: labels.selectViewFile,
-            section: "settings",
-            treeAlias: "partialViewMacros",
-            entityType: "partialView",
-            onlyInitialized: false,
-            filter: function (i) {
-                if (i.name.indexOf(".cshtml") === -1 && i.name.indexOf(".vbhtml") === -1) {
-                    return true;
-                }
-            },
-            filterCssClass: "not-allowed",
-            select: function (node) {
-                const id = decodeURIComponent(node.id.replace(/\+/g, " "));
-
-                //vm.macro.view = id;
-                $scope.model.macro.view = "~/Views/MacroPartials/" + id;
-
-                $scope.model.macro.node = {
-                    icon: node.icon,
-                    name: $scope.model.macro.view
-                };
-
-                //$scope.model.submit($scope.model);
-
-                editorService.close();
-            },
-            close: function () {
-                editorService.close();
-            }
-        };
-        editorService.treePicker(controlPicker);
-    }
-
-    function removeMacroView() {
-        //vm.macro.view = null;
-        $scope.model.macro.node = null;
-        $scope.model.macro.view = null;
-    }
-
-    function init() {
-
-    }
-
-    init();
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Macros.SettingsController", MacrosSettingsController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html b/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html
deleted file mode 100644
index b0a94b0f8a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<div ng-controller="Umbraco.Editors.Macros.ParametersController as vm">
-    <umb-box>
-        <umb-box-content>
-            <div class="sub-view-columns">
-                <div class="sub-view-column-left">
-                    <h5><localize key="macro_parameters">Parameters</localize></h5>
-                    <small><localize key="macro_parametersDescription">Define the parameters that should be available when using this macro.</localize></small>
-                </div>
-                <div class="sub-view-column-right">
-                    <div class="umb-property-editor form-horizontal">
-                        <div ui-sortable="sortableOptions" ng-model="model.macro.parameters">
-                            <div class="control-group umb-prevalues-multivalues__listitem" ng-repeat="parameter in model.macro.parameters track by $id(parameter)">
-                                <umb-icon icon="icon-navigation" class="icon handle"></umb-icon>
-                                <div class="umb-prevalues-multivalues__left">
-                                    <span>{{parameter.label}}</span>&nbsp;<span class="muted">({{parameter.key}})</span>:&nbsp;<small>{{parameter.editor}}</small>
-                                </div>
-                                <div class="umb-prevalues-multivalues__right">
-                                    <button type="button" class="umb-node-preview__action" ng-click="vm.edit(parameter, $event)"><localize key="general_edit">Edit</localize></button>
-                                    <button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="vm.remove(parameter, $event)"><localize key="general_remove">Remove</localize></button>
-                                </div>
-                            </div>
-                        </div>
-                        <umb-button type="button"
-                                    button-style="info"
-                                    action="vm.add($event)"
-                                    label-key="general_add">
-                        </umb-button>
-                    </div>
-                </div>
-            </div>
-
-        </umb-box-content>
-    </umb-box>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html b/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
deleted file mode 100644
index 0975da878a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<div ng-controller="Umbraco.Editors.Macros.SettingsController as vm">
-
-    <div class="umb-package-details">
-
-        <div class="umb-package-details__main-content">
-
-            <umb-box>
-                <umb-box-content>
-                  <umb-property property="vm.macroPartialViewPickerProperty">
-                      <ng-form  name="vm.macroPartialViewPickerForm">
-                        <umb-node-preview
-                            ng-if="model.macro.node"
-                            icon="model.macro.node.icon"
-                            name="model.macro.node.name"
-                            allow-edit="true"
-                            allow-remove="true"
-                            on-edit="model.openViewPicker()"
-                            on-remove="model.removeMacroView()">
-                        </umb-node-preview>
-
-                        <input type="hidden" name="partialView" ng-model="mandatoryViewValidator" ng-required="!model.macro.node" />
-
-                        <button type="button"
-                                id="{{vm.macroPartialViewPickerProperty.alias}}"
-                                class="umb-node-preview-add"
-                                ng-show="!model.macro.node"
-                                ng-click="model.openViewPicker()">
-                            <localize key="general_add">Add</localize>
-                        </button>
-
-                        <div class="help-inline" ng-messages="vm.macroPartialViewPickerForm.partialView.$error" show-validation-on-submit>
-                            <span ng-message="required">
-                                <localize key="general_required">Required</localize>
-                            </span>
-                        </div>
-                      </ng-form>
-                  </umb-property>
-                </umb-box-content>
-            </umb-box>
-            <umb-box>
-                <umb-box-header title="Editor settings"></umb-box-header>
-                <umb-box-content>
-                    <umb-control-group label="Use in rich text editor and the grid">
-                        <umb-toggle checked="model.macro.useInEditor" on-click="model.toggle('useInEditor')"></umb-toggle>
-                    </umb-control-group>
-                    <umb-control-group label="Render in rich text editor and the grid" ng-if="model.macro.useInEditor">
-                        <umb-toggle checked="model.macro.renderInEditor && model.macro.useInEditor" on-click="model.toggle('renderInEditor')"></umb-toggle>
-                    </umb-control-group>
-                </umb-box-content>
-            </umb-box>
-            <umb-box>
-                <umb-box-header title="Cache settings"></umb-box-header>
-                <umb-box-content>
-                    <umb-control-group label="Cache period">
-                        <input type="number" min="0" ng-model="model.macro.cachePeriod" />
-                    </umb-control-group>
-                    <umb-control-group label="Cache by page">
-                        <umb-toggle checked="model.macro.cacheByPage" on-click="model.toggle('cacheByPage')"></umb-toggle>
-                    </umb-control-group>
-                    <umb-control-group label="Cache personalized">
-                        <umb-toggle checked="model.macro.cacheByUser" on-click="model.toggle('cacheByUser')"></umb-toggle>
-                    </umb-control-group>
-                </umb-box-content>
-            </umb-box>
-
-        </div>
-
-        <div class="umb-package-details__sidebar">
-            <umb-box data-element="node-info-general">
-                <umb-box-header title-key="general_general"></umb-box-header>
-                <umb-box-content class="block-form">
-                    <umb-control-group label="Id">
-                        <div>{{model.macro.id}}</div>
-                        <small>{{model.macro.key}}</small>
-                    </umb-control-group>
-                </umb-box-content>
-            </umb-box>
-        </div>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.controller.js
deleted file mode 100644
index 49b41981e4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.controller.js
+++ /dev/null
@@ -1,39 +0,0 @@
-(function () {
-    "use strict";
-
-    function MediaAppContentController($scope, $filter, contentEditingHelper, contentTypeHelper) {
-
-        var vm = this;
-
-        vm.tabs = [];
-        vm.activeTabAlias = null;
-
-        vm.setActiveTab = setActiveTab;
-
-        $scope.$watchCollection('content.tabs', (newValue) => {
-
-            contentTypeHelper.defineParentAliasOnGroups(newValue);
-            contentTypeHelper.relocateDisorientedGroups(newValue);
-
-            vm.tabs = $filter("filter")(newValue, (tab) => {
-                return tab.type === contentTypeHelper.TYPE_TAB;
-            });
-
-            if (vm.tabs.length > 0) {
-                // if we have tabs and some groups that doesn't belong to a tab we need to render those on an "Other" tab.
-                contentEditingHelper.registerGenericTab(newValue);
-
-                setActiveTab(vm.tabs[0]);
-            }
-        });
-
-        function setActiveTab (tab) {
-            vm.activeTabAlias = tab.alias;
-            vm.tabs.forEach(tab => tab.active = false);
-            tab.active = true;
-        }
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Media.Apps.ContentController", MediaAppContentController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
deleted file mode 100644
index 240fc52fac..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="form-horizontal" ng-controller="Umbraco.Editors.Media.Apps.ContentController as vm">
-
-    <umb-editor-tab-bar ng-if="vm.tabs.length > 0">
-        <umb-tabs-nav tabs="vm.tabs" on-tab-change="vm.setActiveTab(tab)"></umb-tabs-nav>
-    </umb-editor-tab-bar>
-
-    <umb-box ng-repeat="tab in vm.tabs track by tab.key" ng-show="tab.alias === vm.activeTabAlias && tab.properties.length > 0">
-        <umb-box-content data-element="tab-content-{{tab.alias}}">
-            <umb-property
-                data-element="property-{{property.alias}}"
-                ng-repeat="property in tab.properties track by property.alias"
-                property="property">
-
-                    <umb-property-editor model="property"></umb-property-editor>
-
-            </umb-property>
-        </umb-box-content>
-    </umb-box>
-
-    <div
-        class="umb-group-panel"
-        data-element="group-{{group.alias}}"
-        ng-repeat="group in content.tabs | filter: { hide : '!' + true } track by group.id"
-        ng-if="group.type === 'Group'"
-        ng-show="group.parentAlias === vm.activeTabAlias || vm.tabs.length === 0">
-
-        <div class="umb-group-panel__header">
-            <div>{{ group.label }}</div>
-        </div>
-
-        <div class="umb-group-panel__content" data-element="tab-content-{{group.type === 'Group' ? group.parentAlias : group.alias}}">
-            <umb-property
-                data-element="property-{{property.alias}}"
-                ng-repeat="property in group.properties"
-                property="property">
-                <umb-property-editor model="property"></umb-property-editor>
-            </umb-property>
-        </div>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/apps/info/info.html b/src/Umbraco.Web.UI.Client/src/views/media/apps/info/info.html
deleted file mode 100644
index 84b7327b8a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/apps/info/info.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<umb-media-node-info
-    ng-if="content"
-    node="content">
-</umb-media-node-info>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/apps/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/media/apps/listview/listview.html
deleted file mode 100644
index 6c558301c7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/apps/listview/listview.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-
-    <umb-property ng-repeat="property in model.viewModel track by property.alias" property="property">
-        <umb-property-editor model="property"></umb-property-editor>
-    </umb-property>
-    
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/create.html b/src/Umbraco.Web.UI.Client/src/views/media/create.html
deleted file mode 100644
index a09c7cea1c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/create.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<div ng-controller="Umbraco.Editors.Media.CreateController">
-	<div class="umb-dialog-body with-footer">
-		<div class="umb-pane">
-
-			<h5><localize key="create_createUnder">Create under</localize> {{currentNode.name}}</h5>
-
-            <div ng-if="allowedTypes && allowedTypes.length === 0">
-                <p class="abstract" ng-if="!hasSettingsAccess"><localize key="create_noMediaTypesWithNoSettingsAccess">The selected media in the tree doesn't allow for any other media to be created below it.</localize></p>
-                <div ng-if="hasSettingsAccess">
-                    <p class="abstract"><localize key="create_noMediaTypes">There are no allowed Media Types available for creating media here. You must enable these in <strong>Media Types
-						Types</strong> within the <strong>Settings</strong> section, by editing the <strong>Allowed child node
-						types</strong> under <strong>Permissions</strong>.</localize></p>
-                    <a class="btn" href="#settings/mediaTypes/edit/{{mediaTypeId}}?view=permissions" role="button" ng-click="close()">
-                        <localize key="create_noMediaTypesEditPermissions">Edit permissions for this Media Type</localize>
-                    </a>
-                </div>
-            </div>
-
-			<ul class="umb-actions umb-actions-child">
-				<li data-element="action-{{docType.alias}}" class="umb-action" ng-repeat="docType in allowedTypes">
-					<button type="button" ng-click="createMediaItem(docType)" class="umb-action-link umb-outline btn-reset">
-						<umb-icon icon="{{docType.icon}}" class="icon large"></umb-icon>
-						<span class="menu-label">
-							{{docType.name}}
-							<small>{{docType.description}}</small>
-						</span>
-					</button>
-				</li>
-			</ul>
-
-		</div>
-	</div>
-
-	<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-		<button type="button" class="btn btn-info" ng-click="closeDialog()">
-			<localize key="buttons_somethingElse">Do something else</localize>
-		</button>
-	</div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/delete.html b/src/Umbraco.Web.UI.Client/src/views/media/delete.html
deleted file mode 100644
index 3296b01749..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/delete.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Media.DeleteController">
-    <div class="umb-dialog-body" auto-scale="90">
-
-        <div ng-show="success">
-            <div class="alert alert-success">
-                <strong>{{currentNode.name}}</strong>
-                <localize key="actions_wasDeleted">was deleted</localize>
-            </div>
-            <button class="btn btn-primary" ng-click="close()">Ok</button>
-        </div>
-
-        <div ng-hide="success">
-            <p class="abstract" ng-if="!disableDelete">
-                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-            </p>
-
-            <umb-tracked-references
-                id="currentNode.id"
-                show-descendants="true"
-                hide-no-result="true" compact="true"
-                hide-none-dependencies="true"
-                on-loading-complete="checkingReferencesComplete()"
-                on-warning="onReferencesWarning()">
-            </umb-tracked-references>
-
-            <div class="abstract umb-alert umb-alert--warning" ng-if="warningText">
-                {{warningText}}
-            </div>
-
-            <div class="umb-alert umb-alert--warning" ng-show="currentNode.trashed">
-                <localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.
-            </div>
-
-            <umb-confirm ng-if="!disableDelete" on-confirm="performDelete" confirm-button-style="danger" on-cancel="close" ng-hide="checkingReferences"></umb-confirm>
-
-            <umb-confirm ng-if="disableDelete" confirm-button-style="danger" on-cancel="close"></umb-confirm>
-        </div>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
deleted file mode 100644
index 8f8a62474b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<div data-element="editor-media" ng-controller="Umbraco.Editors.Media.EditController">
-
-    <umb-load-indicator ng-if="page.loading"></umb-load-indicator>
-
-    <form novalidate name="contentForm"
-          ng-submit="save()"
-          val-form-manager>
-
-        <umb-editor-view ng-if="!page.loading">
-
-            <umb-editor-header name="content.name"
-                               menu="page.menu"
-                               hide-icon="true"
-                               hide-description="true"
-                               hide-alias="true"
-                               navigation="content.apps"
-                               on-select-navigation-item="appChanged(item)"
-                               show-back-button="showBack()"
-                               on-back="onBack()"
-                               setpagetitle="header.setPageTitle">
-            </umb-editor-header>
-
-            <umb-editor-container>
-                <div class="umb-editor-sub-views" ng-if="!page.loading">
-                    <div id="sub-view-{{$index}}" ng-repeat="app in content.apps track by app.alias">
-                        <umb-editor-sub-view model="app" content="content">
-                        </umb-editor-sub-view>
-                    </div>
-                </div>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-left>
-
-                    <umb-breadcrumbs ng-if="ancestors && ancestors.length > 0"
-                                     ancestors="ancestors"
-                                     entity-type="media">
-                    </umb-breadcrumbs>
-
-                </umb-editor-footer-content-left>
-
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button ng-if="model.infiniteMode"
-                                type="button"
-                                button-style="link"
-                                label-key="general_close"
-                                shortcut="esc"
-                                action="close()">
-                    </umb-button>
-
-                    <umb-button alias="returnToList"
-                                ng-if="page.listViewPath && !model.infiniteMode"
-                                type="link"
-                                href="#{{page.listViewPath}}"
-                                label-key="buttons_returnToList">
-                    </umb-button>
-
-                    <!-- label-key="buttons_save" -->
-                    <umb-button alias="save"
-                                type="submit"
-                                button-style="success"
-                                state="page.saveButtonState"
-                                label-key="{{page.submitButtonLabelKey}}"
-                                shortcut="ctrl+s">
-                    </umb-button>
-
-                </umb-editor-footer-content-right>
-
-
-            </umb-editor-footer>
-
-
-        </umb-editor-view>
-
-    </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html b/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
deleted file mode 100644
index 471880cfe8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="umb-dialog" ng-controller="Umbraco.Editors.Media.EmptyRecycleBinController">
-    <div class="umb-dialog-body">
-        
-        <umb-pane>
-
-            <umb-loader ng-show="busy"></umb-loader>
-
-            <div class="umb-alert umb-alert--warning">
-                <p><localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.</p>
-                <localize key="general_areyousure">Are you sure?</localize>
-            </div>
-
-            <umb-confirm on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
-            </umb-confirm>
-        </umb-pane>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.create.controller.js
deleted file mode 100644
index b1fddb8928..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.create.controller.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Media.CreateController
- * @function
- * 
- * @description
- * The controller for the media creation dialog
- */
-function mediaCreateController($scope, $location, mediaTypeResource, iconHelper, navigationService, authResource, mediaResource) {
-
-    function initialize() {
-        $scope.allowedTypes = null;
-        mediaTypeResource.getAllowedTypes($scope.currentNode.id).then(function(data) {
-            $scope.allowedTypes = iconHelper.formatContentTypeIcons(data);
-        });
-
-        if ($scope.currentNode.id > -1) {
-            authResource.getCurrentUser().then(function(currentUser) {
-                if (currentUser.allowedSections.indexOf("settings") > -1) {
-                    $scope.hasSettingsAccess = true;
-                    mediaResource.getById($scope.currentNode.id).then(function (data) {
-                        $scope.mediaTypeId = data.contentType.id;
-                    });
-                }
-            });
-        }
-    }
-
-    $scope.createMediaItem = function(docType) {
-        $location.path("/media/media/edit/" + $scope.currentNode.id).search("doctype", docType.alias).search("create", "true");
-        navigationService.hideMenu();
-    };
-
-    $scope.close = function() {
-        navigationService.hideMenu();
-    };
-
-    $scope.closeDialog = function () {
-        const showMenu = true;
-        navigationService.hideDialog(showMenu);
-    };
-
-    // the current node changes behind the scenes when the context menu is clicked without closing 
-    // the default menu first, so we must watch the current node and re-initialize accordingly
-    var unbindModelWatcher = $scope.$watch("currentNode", initialize);
-    $scope.$on('$destroy', function () {
-        unbindModelWatcher();
-    });
-}
-
-angular.module('umbraco').controller("Umbraco.Editors.Media.CreateController", mediaCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
deleted file mode 100644
index 0761504b6b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.ContentDeleteController
- * @function
- * 
- * @description
- * The controller for deleting content
- */
-function MediaDeleteController($scope, mediaResource, treeService, navigationService, editorState, $location, overlayService, localizationService) {
-
-    $scope.checkingReferences = true;
-    $scope.warningText = null;
-    $scope.disableDelete = false;
-
-    $scope.performDelete = function() {
-
-        // stop from firing again on double-click
-        if ($scope.busy) { return false; }
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        $scope.busy = true;
-
-        mediaResource.deleteById($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            //get the root node before we remove it
-            var rootNode = treeService.getTreeRoot($scope.currentNode);
-
-            treeService.removeNode($scope.currentNode);
-
-            if (rootNode) {
-                //ensure the recycle bin has child nodes now
-                var recycleBin = treeService.getDescendantNode(rootNode, -21);
-                if (recycleBin) {
-                    recycleBin.hasChildren = true;
-                    //reload the recycle bin if it's already expanded so the deleted item is shown
-                    if (recycleBin.expanded) {
-                        treeService.loadNodeChildren({ node: recycleBin, section: "media" });
-                    }
-                }
-            }
-            
-            //if the current edited item is the same one as we're deleting, we need to navigate elsewhere
-            if (editorState.current && editorState.current.id == $scope.currentNode.id) {
-
-            	//If the deleted item lived at the root then just redirect back to the root, otherwise redirect to the item's parent
-                var location = "/media";
-                if ($scope.currentNode.parentId.toString() === "-21")
-                    location = "/media/media/recyclebin";
-            	else if ($scope.currentNode.parentId.toString() !== "-1")
-            		location = "/media/media/edit/" + $scope.currentNode.parentId;
-
-                $location.path(location);
-            }
-
-            $scope.success = true;
-        }, function (err) {
-
-            $scope.currentNode.loading = false;
-            $scope.busy = false;
-
-            //check if response is ysod
-            if (err.status && err.status >= 500) {
-                // TODO: All YSOD handling should be done with an interceptor
-                overlayService.ysod(err);
-            }
-
-        });
-    };
-
-    $scope.checkingReferencesComplete = () => {
-        $scope.checkingReferences = false;
-    };
-
-    $scope.onReferencesWarning = () => {
-        // check if the deletion of items that have references has been disabled
-        if (Umbraco.Sys.ServerVariables.umbracoSettings.disableDeleteWhenReferenced) {
-            // this will only be set to true if we have a warning, indicating that this item or its descendants have reference
-            $scope.disableDelete = true;
-
-            localizationService.localize("references_deleteDisabledWarning").then((value) => {
-                $scope.warningText = value;
-            });
-        }
-        else {
-            localizationService.localize("references_deleteWarning").then((value) => {
-                $scope.warningText = value;
-            });
-        }
-    };
-
-    $scope.close = function() {
-        navigationService.hideDialog();
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Media.DeleteController", MediaDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
deleted file mode 100644
index 66db534475..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
+++ /dev/null
@@ -1,318 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Media.EditController
- * @function
- *
- * @description
- * The controller for the media editor
- */
-function mediaEditController($scope, $routeParams, $location, $http, $q, appState, mediaResource,
-    entityResource, navigationService, notificationsService, localizationService,
-    serverValidationManager, contentEditingHelper, fileManager, formHelper,
-    editorState, umbRequestHelper, eventsService) {
-
-    var evts = [];
-    var nodeId = null;
-    var create = false;
-    var infiniteMode = $scope.model && $scope.model.infiniteMode;
-
-    // when opening the editor through infinite editing get the
-    // node id from the model instead of the route param
-    if(infiniteMode && $scope.model.id) {
-        nodeId = $scope.model.id;
-    } else {
-        nodeId = $routeParams.id;
-    }
-
-    // when opening the editor through infinite editing get the
-    // create option from the model instead of the route param
-    if(infiniteMode) {
-        create = $scope.model.create;
-    } else {
-        create = $routeParams.create;
-    }
-
-    //setup scope vars
-    $scope.currentSection = appState.getSectionState("currentSection");
-    $scope.currentNode = null; //the editors affiliated node
-    $scope.header = {};
-    $scope.header.setPageTitle = $scope.currentSection ==="media";
-    $scope.page = {};
-    $scope.page.loading = false;
-    $scope.page.menu = {};
-    $scope.page.menu.currentSection = appState.getSectionState("currentSection");
-    $scope.page.menu.currentNode = null; //the editors affiliated node
-    $scope.page.listViewPath = null;
-    $scope.page.saveButtonState = "init";
-    $scope.page.submitButtonLabelKey = "buttons_save";
-    $scope.app = null;
-
-    if (create) {
-
-        $scope.page.loading = true;
-
-        mediaResource.getScaffold(nodeId, $routeParams.doctype).then(function (data) {
-            $scope.content = data;
-
-            init();
-
-            $scope.page.loading = false;
-        }, function () {
-            $scope.page.loading = false;
-        });
-    }
-    else {
-        $scope.page.loading = true;
-
-        loadMedia().then(function(){
-            $scope.page.loading = false;
-        }, function () {
-            $scope.page.loading = false;
-        });
-    }
-
-    function init() {
-
-        var content = $scope.content;
-
-        // we need to check whether an app is present in the current data, if not we will present the default app.
-        var isAppPresent = false;
-
-        // on first init, we dont have any apps. but if we are re-initializing, we do, but ...
-        if ($scope.app) {
-
-            // lets check if it still exists as part of our apps array. (if not we have made a change to our docType, even just a re-save of the docType it will turn into new Apps.)
-            content.apps.forEach(app => {
-                if (app === $scope.app) {
-                    isAppPresent = true;
-                }
-            });
-
-            // if we did reload our DocType, but still have the same app we will try to find it by the alias.
-            if (isAppPresent === false) {
-                content.apps.forEach(app => {
-                    if (app.alias === $scope.app.alias) {
-                        isAppPresent = true;
-                        app.active = true;
-                        $scope.appChanged(app);
-                    }
-                });
-            }
-
-        }
-
-        // if we still dont have a app, lets show the first one:
-        if (isAppPresent === false) {
-            content.apps[0].active = true;
-            $scope.appChanged(content.apps[0]);
-        }
-
-        editorState.set($scope.content);
-
-        bindEvents();
-        $scope.contentForm.$dirty = false;
-    }
-
-    function bindEvents() {
-        //bindEvents can be called more than once and we don't want to have multiple bound events
-        for (var e in evts) {
-            eventsService.unsubscribe(evts[e]);
-        }
-
-        evts.push(eventsService.on("editors.mediaType.saved", function(name, args) {
-            // if this media item uses the updated media type we need to reload the media item
-            if(args && args.mediaType && args.mediaType.key === $scope.content.contentType.key) {
-                $scope.page.loading = true;
-                loadMedia().then(function() {
-                    $scope.page.loading = false;
-                }, function () {
-                    $scope.page.loading = false;
-                });
-            }
-        }));
-    }
-    $scope.page.submitButtonLabelKey = "buttons_save";
-
-    /** Syncs the content item to it's tree node - this occurs on first load and after saving */
-    function syncTreeNode(content, path, initialLoad) {
-
-        if (infiniteMode) {
-            return;
-        }
-
-        if (!$scope.content.isChildOfListView) {
-            navigationService.syncTree({ tree: "media", path: path.split(","), forceReload: initialLoad !== true }).then(function (syncArgs) {
-                $scope.page.menu.currentNode = syncArgs.node;
-            });
-        }
-        else if (initialLoad === true) {
-
-            //it's a child item, just sync the ui node to the parent
-            navigationService.syncTree({ tree: "media", path: path.substring(0, path.lastIndexOf(",")).split(","), forceReload: initialLoad !== true });
-
-            //if this is a child of a list view and it's the initial load of the editor, we need to get the tree node
-            // from the server so that we can load in the actions menu.
-            umbRequestHelper.resourcePromise(
-                $http.get(content.treeNodeUrl),
-                'Failed to retrieve data for child node ' + content.id).then(function (node) {
-                    $scope.page.menu.currentNode = node;
-                });
-        }
-    }
-
-    /** Just shows a simple notification that there are client side validation issues to be fixed */
-    function showValidationNotification() {
-        //TODO: We need to make the validation UI much better, there's a lot of inconsistencies in v8 including colors, issues with the property groups and validation errors between variants
-
-        //need to show a notification else it's not clear there was an error.
-        localizationService.localizeMany([
-                "speechBubbles_validationFailedHeader",
-                "speechBubbles_validationFailedMessage"
-            ]
-        ).then(function (data) {
-            notificationsService.error(data[0], data[1]);
-        });
-    }
-
-    $scope.save = function () {
-
-        if($scope.page.saveButtonState == "busy"){
-            return;
-        }
-
-        if (formHelper.submitForm({ scope: $scope })) {
-
-            $scope.page.saveButtonState = "busy";
-
-            mediaResource.save($scope.content, create, fileManager.getFiles())
-                .then(function(data) {
-
-                    formHelper.resetForm({ scope: $scope });
-
-                    // close the editor if it's infinite mode
-                    // submit function manages rebinding changes
-                    if(infiniteMode && $scope.model.submit) {
-                        $scope.model.mediaNode = $scope.content;
-                        $scope.model.submit($scope.model);
-                    } else {
-                        // if not infinite mode, rebind changed props etc
-                        contentEditingHelper.handleSuccessfulSave({
-                            scope: $scope,
-                            savedContent: data,
-                            rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data)
-                        });
-
-                        editorState.set($scope.content);
-
-                        syncTreeNode($scope.content, data.path);
-
-                        $scope.page.saveButtonState = "success";
-
-                        init();
-                    }
-
-                    eventsService.emit("editors.media.saved", {media: data});
-
-                    return data;
-
-                }, function(err) {
-
-                    formHelper.resetForm({ scope: $scope, hasErrors: true });
-                    contentEditingHelper.handleSaveError({
-                        err: err,
-                        rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, err.data)
-                    });
-
-                    editorState.set($scope.content);
-                    $scope.page.saveButtonState = "error";
-
-                });
-        }
-        else {
-            showValidationNotification();
-        }
-
-    };
-
-    function loadMedia() {
-
-        return mediaResource.getById(nodeId)
-            .then(function (data) {
-
-                $scope.content = data;
-
-                if (data.isChildOfListView && data.trashed === false) {
-                    $scope.page.listViewPath = ($routeParams.page)
-                        ? "/media/media/edit/" + data.parentId + "?page=" + $routeParams.page
-                        : "/media/media/edit/" + data.parentId;
-                }
-
-                editorState.set($scope.content);
-
-                //in one particular special case, after we've created a new item we redirect back to the edit
-                // route but there might be server validation errors in the collection which we need to display
-                // after the redirect, so we will bind all subscriptions which will show the server validation errors
-                // if there are any and then clear them so the collection no longer persists them.
-                serverValidationManager.notifyAndClearAllSubscriptions();
-
-                if(!infiniteMode) {
-                    syncTreeNode($scope.content, data.path, true);
-                }
-
-                if ($scope.content.parentId && $scope.content.parentId !== -1 && $scope.content.parentId !== -21) {
-                    //We fetch all ancestors of the node to generate the footer breadcrump navigation
-                    entityResource.getAncestors(nodeId, "media")
-                        .then(function (anc) {
-                            $scope.ancestors = anc;
-                        });
-                }
-
-                init();
-
-                $scope.page.loading = false;
-
-                $q.resolve($scope.content);
-
-            }, function (error) {
-                $scope.page.loading = false;
-
-                $q.reject(error);
-            });
-    }
-
-    $scope.close = function() {
-        if($scope.model.close) {
-            $scope.model.close($scope.model);
-        }
-    };
-
-    $scope.appChanged = function (app) {
-        $scope.app = app;
-
-        // setup infinite mode
-        if(infiniteMode) {
-            $scope.page.submitButtonLabelKey = "buttons_saveAndClose";
-        }
-    }
-
-    $scope.showBack = function () {
-        return !infiniteMode && !!$scope.page.listViewPath;
-    };
-
-    /** Callback for when user clicks the back-icon */
-    $scope.onBack = function() {
-        if ($scope.page.listViewPath) {
-            $location.path($scope.page.listViewPath.split("?")[0]);
-        }
-    };
-
-    //ensure to unregister from all events!
-    $scope.$on('$destroy', function () {
-        for (var e in evts) {
-            eventsService.unsubscribe(evts[e]);
-        }
-    });
-
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Media.EditController", mediaEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.emptyrecyclebin.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.emptyrecyclebin.controller.js
deleted file mode 100644
index 64dd8678c5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.emptyrecyclebin.controller.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Media.EmptyRecycleBinController
- * @function
- * 
- * @description
- * The controller for deleting media
- */
-function MediaEmptyRecycleBinController($scope, mediaResource, treeService, navigationService, notificationsService, $route) {
-
-    $scope.busy = false;
-
-    $scope.performDelete = function() {
-
-        //(used in the UI)
-        $scope.busy = true;
-        $scope.currentNode.loading = true;
-
-        mediaResource.emptyRecycleBin($scope.currentNode.id).then(function (result) {
-
-            $scope.busy = false;
-            $scope.currentNode.loading = false;
-
-            treeService.removeChildNodes($scope.currentNode);
-            navigationService.hideMenu();
-
-            //reload the current view
-            $route.reload();
-        });
-
-    };
-
-    $scope.cancel = function() {
-        navigationService.hideDialog();
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Media.EmptyRecycleBinController", MediaEmptyRecycleBinController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
deleted file mode 100644
index 3c9d393c3b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
+++ /dev/null
@@ -1,128 +0,0 @@
-//used for the media picker dialog
-angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
-    function ($scope, userService, eventsService, mediaResource, appState, treeService, navigationService) {
-
-	    $scope.dialogTreeApi = {};
-        $scope.source = _.clone($scope.currentNode);
-
-        $scope.busy = false;
-        $scope.searchInfo = {
-            searchFromId: null,
-            searchFromName: null,
-            showSearch: false,
-            results: [],
-            selectedSearchResults: []
-        }
-        $scope.treeModel = {
-            hideHeader: false
-        }
-        userService.getCurrentUser().then(function (userData) {
-            $scope.treeModel.hideHeader = userData.startMediaIds.length > 0 && userData.startMediaIds.indexOf(-1) == -1;
-        });
-
-        function treeLoadedHandler(args) {
-            if ($scope.source && $scope.source.path) {
-                $scope.dialogTreeApi.syncTree({ path: $scope.source.path, activate: false });
-            }
-        }
-
-	    function nodeSelectHandler(args) {
-
-			if(args && args.event) {
-				args.event.preventDefault();
-				args.event.stopPropagation();
-			}
-
-	        eventsService.emit("editors.media.moveController.select", args);
-
-	        if ($scope.target) {
-	            //un-select if there's a current one selected
-	            $scope.target.selected = false;
-	        }
-
-	        $scope.target = args.node;
-	        $scope.target.selected = true;
-	    }
-
-		function nodeExpandedHandler(args) {
-			// open mini list view for list views
-        	if (args.node.metaData.isContainer) {
-				openMiniListView(args.node);
-			}
-	    }
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeLoaded(treeLoadedHandler);
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-            $scope.dialogTreeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
-        }	  
-        
-        $scope.close = function() {
-            navigationService.hideDialog();
-        };
-        $scope.hideSearch = function () {
-            $scope.searchInfo.showSearch = false;
-            $scope.searchInfo.searchFromId = null;
-            $scope.searchInfo.searchFromName = null;
-            $scope.searchInfo.results = [];
-        }
-
-        // method to select a search result 
-        $scope.selectResult = function (evt, result) {
-            result.selected = result.selected === true ? false : true;
-            nodeSelectHandler({ event: evt, node: result });
-        };
-
-        //callback when there are search results 
-        $scope.onSearchResults = function (results) {
-            $scope.searchInfo.results = results;
-            $scope.searchInfo.showSearch = true;
-        };
-
-	    $scope.move = function () {
-	        $scope.busy = true;
-            mediaResource.move({ parentId: $scope.target.id, id: $scope.source.id })
-                .then(function (path) {
-	                $scope.busy = false;
-                    $scope.error = false;
-                    $scope.success = true;
-
-                    //first we need to remove the node that launched the dialog
-                    treeService.removeNode($scope.currentNode);
-
-                    //get the currently edited node (if any)
-                    var activeNode = appState.getTreeState("selectedNode");
-
-                    //we need to do a double sync here: first sync to the moved content - but don't activate the node,
-                    //then sync to the currenlty edited content (note: this might not be the content that was moved!!)
-
-                    navigationService.syncTree({ tree: "media", path: path, forceReload: true, activate: false }).then(function (args) {
-                        if (activeNode) {
-                            var activeNodePath = treeService.getPath(activeNode).join();
-                            //sync to this node now - depending on what was copied this might already be synced but might not be
-                            navigationService.syncTree({ tree: "media", path: activeNodePath, forceReload: false, activate: true });
-                        }
-                    });
-
-                }, function (err) {
-                    $scope.busy = false;
-                    $scope.success = false;
-                    $scope.error = err;
-                });
-	    };
-
-		// Mini list view
-		$scope.selectListViewNode = function (node) {
-			node.selected = node.selected === true ? false : true;
-			nodeSelectHandler({ node: node });
-		};
-
-		$scope.closeMiniListView = function () {
-			$scope.miniListView = undefined;
-		};
-
-		function openMiniListView(node) {
-			$scope.miniListView = node;
-		}
-
-	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.recyclebin.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.recyclebin.controller.js
deleted file mode 100644
index 00e09bd34d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.recyclebin.controller.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Content.MediaRecycleBinController
- * @function
- * 
- * @description
- * Controls the recycle bin for media
- * 
- */
-
-function MediaRecycleBinController($scope, $routeParams, mediaResource, navigationService, localizationService) {
-
-    //ensures the list view doesn't actually load until we query for the list view config
-    // for the section
-    $scope.page = {};
-    $scope.page.name = "Recycle Bin";
-    $scope.page.nameLocked = true;
-
-    //ensures the list view doesn't actually load until we query for the list view config
-    // for the section
-    $scope.listViewPath = null;
-
-    $routeParams.id = "-21";
-    mediaResource.getRecycleBin().then(function (result) {
-        $scope.content = result;
-    });
-
-    // sync tree node
-    navigationService.syncTree({ tree: "media", path: ["-1", $routeParams.id], forceReload: false });
-
-    localizePageName();
-
-    function localizePageName() {
-
-        var pageName = "general_recycleBin";
-
-        localizationService.localize(pageName).then(function (value) {
-            $scope.page.name = value;
-        });
-
-    }
-}
-
-angular.module('umbraco').controller("Umbraco.Editors.Media.RecycleBinController", MediaRecycleBinController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js
deleted file mode 100644
index c8087b39e1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js
+++ /dev/null
@@ -1,161 +0,0 @@
-angular.module("umbraco").controller("Umbraco.Editors.Media.RestoreController",
-    function ($scope, relationResource, mediaResource, entityResource, navigationService, appState, treeService, userService, localizationService) {
-
-        $scope.source = _.clone($scope.currentNode);
-
-		$scope.error = null;
-        $scope.loading = true;
-        $scope.moving = false;
-        $scope.success = false;
-
-        $scope.dialogTreeApi = {};
-        $scope.searchInfo = {
-            showSearch: false,
-            results: [],
-            selectedSearchResults: []
-        }
-        $scope.treeModel = {
-            hideHeader: false
-        }
-        userService.getCurrentUser().then(function (userData) {
-            $scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1;
-        });
-        $scope.labels = {};
-        localizationService.localizeMany(["treeHeaders_media"]).then(function (data) {
-            $scope.labels.treeRoot = data[0];
-        });
-
-        function nodeSelectHandler(args) {
-
-            if (args && args.event) {
-                args.event.preventDefault();
-                args.event.stopPropagation();
-            }
-
-            if ($scope.target) {
-                //un-select if there's a current one selected
-                $scope.target.selected = false;
-            }
-
-            $scope.target = args.node;
-            $scope.target.selected = true;
-
-        }
-
-        function nodeExpandedHandler(args) {
-            // open mini list view for list views
-            if (args.node.metaData.isContainer) {
-                openMiniListView(args.node);
-            }
-        }
-
-        $scope.hideSearch = function () {
-            $scope.searchInfo.showSearch = false;
-            $scope.searchInfo.results = [];
-        }
-
-        // method to select a search result 
-        $scope.selectResult = function (evt, result) {
-            result.selected = result.selected === true ? false : true;
-            nodeSelectHandler({ event: evt, node: result });
-        };
-
-        //callback when there are search results 
-        $scope.onSearchResults = function (results) {
-            $scope.searchInfo.results = results;
-            $scope.searchInfo.showSearch = true;
-        };
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-            $scope.dialogTreeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
-        }
-
-        // Mini list view
-        $scope.selectListViewNode = function (node) {
-            node.selected = node.selected === true ? false : true;
-            nodeSelectHandler({ node: node });
-        };
-
-        $scope.closeMiniListView = function () {
-            $scope.miniListView = undefined;
-        };
-
-        function openMiniListView(node) {
-            $scope.miniListView = node;
-        }
-
-        relationResource.getByChildId($scope.source.id, "relateParentMediaFolderOnDelete").then(function (data) {
-            $scope.loading = false;
-
-            if (!data.length) {
-                $scope.moving = true;
-                return;
-            }
-
-		    $scope.relation = data[0];
-
-			if ($scope.relation.parentId === -1) {
-                $scope.target = { id: -1, name: $scope.labels.treeRoot };
-
-			} else {
-                $scope.loading = true;
-
-			    entityResource.getById($scope.relation.parentId, "media").then(function (data) {
-			        $scope.loading = false;
-			        $scope.target = data;
-
-			        // make sure the target item isn't in the recycle bin
-			        if ($scope.target.path.indexOf("-21") !== -1) {
-			            $scope.moving = true;
-			            $scope.target = null;
-			        }
-				}, function (err) {
-			        $scope.loading = false;
-			        $scope.error = err;
-			    });
-			}
-
-		}, function (err) {
-            $scope.loading = false;
-            $scope.error = err;
-		});
-
-		$scope.restore = function () {
-            $scope.loading = true;
-
-			// this code was copied from `content.move.controller.js`
-            mediaResource.move({ parentId: $scope.target.id, id: $scope.source.id })
-				.then(function (path) {
-
-                    $scope.loading = false;
-					$scope.success = true;
-
-					//first we need to remove the node that launched the dialog
-					treeService.removeNode($scope.currentNode);
-
-					//get the currently edited node (if any)
-					var activeNode = appState.getTreeState("selectedNode");
-
-					//we need to do a double sync here: first sync to the moved media item - but don't activate the node,
-					//then sync to the currenlty edited media item (note: this might not be the media item that was moved!!)
-
-					navigationService.syncTree({ tree: "media", path: path, forceReload: true, activate: false }).then(function (args) {
-						if (activeNode) {
-							var activeNodePath = treeService.getPath(activeNode).join();
-							//sync to this node now - depending on what was copied this might already be synced but might not be
-							navigationService.syncTree({ tree: "media", path: activeNodePath, forceReload: false, activate: true });
-						}
-					});
-
-				}, function (err) {
-                    $scope.loading = false;
-                    $scope.error = err;
-				});
-		};
-
-		$scope.close = function() {
-			navigationService.hideDialog();
-		};
-
-	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js
deleted file mode 100644
index 2cc27be914..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js
+++ /dev/null
@@ -1,91 +0,0 @@
-(function () {
-    "use strict";
-
-    function MediaSortController($scope, $filter, mediaResource, navigationService, eventsService) {
-
-        var vm = this;
-        var id = $scope.currentNode.id;
-
-        vm.loading = false;
-        vm.children = [];
-        vm.saveButtonState = "init";
-        vm.sortOrder = {};
-        vm.sortableOptions = {
-            axis: "y",
-            containment: "parent",
-            distance: 10,
-            tolerance: "pointer",
-            opacity: 0.7,
-            scroll: true,
-            cursor: "move",
-            helper: fixSortableHelper,
-            update: function() {
-                // clear the sort order when drag and drop is used
-                vm.sortOrder.column = "";
-                vm.sortOrder.reverse = false;
-            }
-        };
-
-        vm.save = save;
-        vm.sort = sort;
-        vm.close = close;
-
-        function onInit() {
-            vm.loading = true;
-            mediaResource.getChildren(id)
-                .then(function(data){
-                    vm.children = data.items;
-                    vm.loading = false;
-                });
-        }
-
-        function save() {
-            vm.saveButtonState = "busy";
-            
-            var args = {
-                parentId: id,
-                sortedIds: _.map(vm.children, function(child){ return child.id; })
-            };
-
-            mediaResource.sort(args)
-                .then(function(){
-                    navigationService.syncTree({ tree: "media", path: $scope.currentNode.path, forceReload: true })
-                        .then(() => navigationService.reloadNode($scope.currentNode));
-
-                    eventsService.emit("sortCompleted", { id: id });
-                    vm.saveButtonState = "success";
-                }, function(error) {
-                    vm.error = error;
-                    vm.saveButtonState = "error";
-                });
-        }
-
-        function fixSortableHelper(e, ui) {
-            // keep the correct width of each table cell when sorting
-            ui.children().each(function () {
-                $(this).width($(this).width());
-            });
-            return ui;
-        }
-
-        function sort(column) {
-            // reverse if it is already ordered by that column
-            if(vm.sortOrder.column === column) {
-                vm.sortOrder.reverse = !vm.sortOrder.reverse
-            } else {
-                vm.sortOrder.column = column;
-                vm.sortOrder.reverse = false;
-            }
-            vm.children = $filter('orderBy')(vm.children, vm.sortOrder.column, vm.sortOrder.reverse);
-        }
-
-        function close() {
-            navigationService.hideDialog();
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Media.SortController", MediaSortController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/move.html b/src/Umbraco.Web.UI.Client/src/views/media/move.html
deleted file mode 100644
index d601b34832..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/move.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<div ng-controller="Umbraco.Editors.Media.MoveController">
-    <div class="umb-dialog-body" ng-cloak>
-	    <div class="umb-pane">
-
-		    <div ng-show="error">
-			    <div class="alert alert-error">
-				    <div><strong>{{error.errorMsg}}</strong></div>
-				    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-		    <div ng-show="success">
-			    <div class="alert alert-success">
-			        <strong>{{source.name}}</strong>
-			        <localize key="actions_wasMovedTo">was moved to</localize>
-			        <strong>{{target.name}}</strong>
-			    </div>
-			    <button class="btn btn-primary" ng-click="close()">Ok</button>
-		    </div>
-
-		    <p class="abstract" ng-hide="success">
-                <localize key="actions_chooseWhereToMove">Choose where to move</localize>
-                <strong>{{source.name}}</strong>
-                <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>
-            </p>
-
-		    <div ng-hide="success">
-
-			    <div ng-hide="miniListView">
-                    <umb-tree-search-box
-                        hide-search-callback="hideSearch"
-                        search-callback="onSearchResults"
-                        search-from-id="{{searchInfo.searchFromId}}"
-                        search-from-name="{{searchInfo.searchFromName}}"
-                        show-search="{{searchInfo.showSearch}}"
-                        section="media">
-                    </umb-tree-search-box>
-
-                    <br />
-
-                    <umb-tree-search-results
-                        ng-if="searchInfo.showSearch"
-                        results="searchInfo.results"
-                        select-result-callback="selectResult">
-                    </umb-tree-search-results>
-
-                    <div ng-hide="searchInfo.showSearch">
-                        <umb-tree
-                            section="media"
-                            hideheader="{{treeModel.hideHeader}}"
-                            hideoptions="true"
-                            isdialog="true"
-					    api="dialogTreeApi"
-                                            on-init="onTreeInit()"
-                            enablelistviewexpand="true"
-                            enablecheckboxes="true">
-                        </umb-tree>
-                    </div>
-			    </div>
-
-			    <umb-mini-list-view
-				    ng-if="miniListView"
-				    node="miniListView"
-				    entity-type="Media"
-				    on-select="selectListViewNode(node)"
-				    on-close="closeMiniListView()">
-			    </umb-mini-list-view>
-
-		    </div>
-	    </div>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-	    <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy"><localize key="general_cancel">Cancel</localize></button>
-	    <button class="btn btn-primary" ng-click="move()" ng-disabled="busy || !target"><localize key="actions_move">Move</localize></button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html b/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
deleted file mode 100644
index fddf63bef3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<umb-editor-view>
-    <form ng-controller="Umbraco.Editors.Media.RecycleBinController" val-form-manager>
-
-        <umb-editor-header name="page.name"
-                           name-locked="page.nameLocked"
-                           hide-icon="true"
-                           hide-description="true"
-                           hide-alias="true">
-        </umb-editor-header>
-
-
-        <umb-editor-container>
-            <div class="umb-editor-sub-views">
-                <div id="sub-view-{{$index}}" ng-repeat="app in content.apps track by app.alias">
-                    <umb-editor-sub-view model="app" content="content">
-                    </umb-editor-sub-view>
-                </div>
-            </div>
-        </umb-editor-container>
-
-    </form>
-</umb-editor-view>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/restore.html b/src/Umbraco.Web.UI.Client/src/views/media/restore.html
deleted file mode 100644
index ef53777c2b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/restore.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<div ng-controller="Umbraco.Editors.Media.RestoreController">
-    <div class="umb-dialog-body">
-        <umb-pane>
-            <umb-load-indicator ng-show="loading">
-            </umb-load-indicator>
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.Message}}</div>
-                </div>
-            </div>
-
-            <div ng-show="success">
-                <div class="alert alert-success">
-                    <strong>{{source.name}}</strong>
-                    <span ng-hide="moving"><localize key="recycleBin_wasRestored">was restored under</localize></span>
-                    <span ng-show="moving"><localize key="editdatatype_wasMoved">was moved underneath</localize></span>
-                    <strong>{{target.name}}</strong>
-                </div>
-                <button class="btn btn-primary" ng-click="close()">Ok</button>
-            </div>
-
-            <div ng-hide="moving || loading || success">
-
-                <p class="abstract" ng-hide="error || success">
-                    <localize key="actions_restore">Restore</localize> <strong>{{source.name}}</strong> <localize key="general_under">under</localize> <strong>{{target.name}}</strong>?
-                </p>
-
-            </div>
-
-            <div ng-hide="!moving || loading || success">
-                <div>
-                    <div class="alert alert-info">
-                        <div><strong><localize key="recycleBin_itemCannotBeRestored">Cannot automatically restore this item</localize></strong></div>
-                        <div><localize key="recycleBin_itemCannotBeRestoredHelpText">There is no location where this item can be automatically restored. You can move the item manually using the tree below.</localize></div>
-                    </div>
-                </div>
-
-                <div ng-hide="miniListView">
-                    <umb-tree-search-box hide-search-callback="hideSearch"
-                                         search-callback="onSearchResults"
-                                         show-search="{{searchInfo.showSearch}}"
-                                         section="media">
-                    </umb-tree-search-box>
-
-                    <br />
-
-                    <umb-tree-search-results ng-if="searchInfo.showSearch"
-                                             results="searchInfo.results"
-                                             select-result-callback="selectResult">
-                    </umb-tree-search-results>
-
-                    <div ng-hide="searchInfo.showSearch">
-                        <umb-tree section="media"
-                                  hideheader="{{treeModel.hideHeader}}"
-                                  hideoptions="true"
-                                  isdialog="true"
-                                  api="dialogTreeApi"
-                                  on-init="onTreeInit()"
-                                  enablelistviewexpand="true"
-                                  enablecheckboxes="true">
-                        </umb-tree>
-                    </div>
-                </div>
-
-                <umb-mini-list-view ng-if="miniListView"
-                                    node="miniListView"
-                                    entity-type="Document"
-                                    on-select="selectListViewNode(node)"
-                                    on-close="closeMiniListView()">
-                </umb-mini-list-view>
-
-            </div>
-        </umb-pane>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || moving || success">
-        <button type="button" class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></button>
-        <button class="btn btn-primary" ng-click="restore()" ng-show="error == null"><localize key="actions_restore">Restore</localize></button>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || !moving || success">
-        <button type="button" class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></button>
-        <button class="btn btn-primary" ng-click="restore()" ng-show="error == null" ng-disabled="!target"><localize key="actions_move">Move</localize></button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/sort.html b/src/Umbraco.Web.UI.Client/src/views/media/sort.html
deleted file mode 100644
index e0187be6cb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/media/sort.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<div ng-controller="Umbraco.Editors.Media.SortController as vm" ng-cloak>
-
-    <div class="umb-dialog-body with-footer sort-order">
-
-        <div class="umb-pane">
-
-            <div ng-if="vm.error" class="alert alert-error">
-                <p>{{vm.error.errorMsg}}</p>
-            </div>
-
-            <umb-load-indicator
-                ng-show="vm.loading">
-            </umb-load-indicator>
-
-            <div ng-if="!vm.loading">
-                <p class="abstract"><localize key="sort_sortHelp">Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items</localize></p>
-                <table class="table table-condensed table-sortable" ng-if="vm.children">
-                    <thead>
-                        <tr>
-                            <th colspan="2">
-                                <button type="button" class="btn-reset" ng-click="vm.sort('name')">
-                                    <strong><localize key="general_name">Name</localize></strong>
-                                    <span ng-if="vm.sortOrder.column === 'name'">
-                                        <umb-icon icon="{{vm.sortOrder.reverse ? 'icon-navigation-up' : 'icon-navigation-down'}}"></umb-icon>
-                                    </span>
-                                </button>
-                            </th>
-                            <th>
-                                <button type="button" class="btn-reset" ng-click="vm.sort('createDate')">
-                                    <strong><localize key="sort_sortCreationDate">Creation date</localize></strong>
-                                    <span ng-if="vm.sortOrder.column === 'createDate'">
-                                        <umb-icon icon="{{vm.sortOrder.reverse ? 'icon-navigation-up' : 'icon-navigation-down'}}"></umb-icon>
-                                    </span>
-                                </button>
-                            </th>
-                        </tr>
-                    </thead>
-                    <tbody ui-sortable="vm.sortableOptions" ng-model="vm.children">
-                        <tr ng-repeat="child in vm.children">
-                            <td class="tree-icon">
-                                <umb-icon icon="{{child.icon}}"></umb-icon>
-                            </td>
-                            <td>{{child.name}}</td>
-                            <td>{{child.createDate}}</td>
-                        </tr>
-                    </tbody>
-                </table>
-
-                <umb-empty-state
-                    ng-if="!vm.children"
-                    position="center">
-                    <localize key="sort_sortEmptyState">This node has no child nodes to sort</localize>
-                </umb-empty-state>
-            </div>
-
-        </div>
-
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <umb-button
-            type="button"
-            button-style="link"
-            action="vm.close()"
-            label-key="general_close">
-        </umb-button>
-        <umb-button
-            ng-if="vm.children"
-            type="button"
-            action="vm.save()"
-            state="vm.saveButtonState"
-            button-style="success"
-            label-key="buttons_save">
-        </umb-button>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/copy.controller.js
deleted file mode 100644
index 9f77581815..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/copy.controller.js
+++ /dev/null
@@ -1,62 +0,0 @@
-angular.module("umbraco")
-.controller("Umbraco.Editors.MediaTypes.CopyController",
-    function ($scope, mediaTypeResource, treeService, navigationService, notificationsService, appState, eventsService) {
-
-        $scope.dialogTreeApi = {};
-        $scope.source = _.clone($scope.currentNode);
-
-        function nodeSelectHandler(args) {
-            args.event.preventDefault();
-            args.event.stopPropagation();
-
-            if ($scope.target) {
-                //un-select if there's a current one selected
-                $scope.target.selected = false;
-            }
-
-            $scope.target = args.node;
-            $scope.target.selected = true;
-        }
-
-        $scope.copy = function () {
-
-            $scope.busy = true;
-            $scope.error = false;
-
-            mediaTypeResource.copy({ parentId: $scope.target.id, id: $scope.source.id })
-                .then(function (path) {
-                    $scope.error = false;
-                    $scope.success = true;
-                    $scope.busy = false;
-
-                    //get the currently edited node (if any)
-                    var activeNode = appState.getTreeState("selectedNode");
-
-                    //we need to do a double sync here: first sync to the copied content - but don't activate the node,
-                    //then sync to the currenlty edited content (note: this might not be the content that was copied!!)
-
-                    navigationService.syncTree({ tree: "mediaTypes", path: path, forceReload: true, activate: false }).then(function (args) {
-                        if (activeNode) {
-                            var activeNodePath = treeService.getPath(activeNode).join();
-                            //sync to this node now - depending on what was copied this might already be synced but might not be
-                            navigationService.syncTree({ tree: "mediaTypes", path: activeNodePath, forceReload: false, activate: true });
-                        }
-                    });
-
-                }, function (err) {
-                    $scope.success = false;
-                    $scope.error = err;
-                    $scope.busy = false;
-                    
-                });
-        };
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-        };
-
-        $scope.close = function() {
-            navigationService.hideDialog();
-        };
-        
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/copy.html
deleted file mode 100644
index 58968c9dfa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/copy.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="umb-dialog" ng-controller="Umbraco.Editors.MediaTypes.CopyController">
-
-    <div class="umb-dialog-body">
-        <div class="umb-pane">
-
-            <p class="abstract" ng-hide="success">
-                <localize key="contentTypeEditor_folderToCopy">Select the folder to copy</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
-            </p>
-
-            <umb-loader ng-show="busy"></umb-loader>
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-            <div ng-show="success">
-                <div class="alert alert-success">
-                    <strong>{{source.name}}</strong> <localize key="contentTypeEditor_copiedUnderneath">was copied underneath</localize>&nbsp;<strong>{{target.name}}</strong>
-                </div>
-                <button type="button" class="btn btn-primary" ng-click="close()">Ok</button>
-            </div>
-
-            <div ng-hide="success">
-
-                <div>
-                    <umb-tree section="settings"
-                              treealias="mediaTypes"
-                              customtreeparams="foldersonly=1"
-                              hideheader="false"
-                              hideoptions="true"
-                              isdialog="true"
-                              api="dialogTreeApi"
-                              on-init="onTreeInit()"
-                              enablecheckboxes="true">
-                    </umb-tree>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
-            <localize key="general_cancel">Cancel</localize>
-        </button>
-        <button class="btn btn-primary" ng-click="copy()" ng-disabled="busy || !target">
-            <localize key="actions_copy">Copy</localize>
-        </button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.controller.js
deleted file mode 100644
index df26473720..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.controller.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.MediaType.CreateController
- * @function
- *
- * @description
- * The controller for the media type creation dialog
- */
-function MediaTypesCreateController($scope, $location, navigationService, mediaTypeResource, formHelper, appState, localizationService) {
-
-    $scope.model = {
-      allowCreateFolder: $scope.currentNode.parentId === null || $scope.currentNode.nodeType === 'container',
-      folderName: "",
-      creatingFolder: false
-    };
-
-    var node = $scope.currentNode;
-
-    $scope.showCreateFolder = function() {
-        $scope.model.creatingFolder = true;
-    }
-
-    $scope.createContainer = function () {
-        if (formHelper.submitForm({
-            scope: $scope,
-            formCtrl: $scope.createFolderForm
-        })) {
-            mediaTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) {
-
-                navigationService.hideMenu();
-                var currPath = node.path ? node.path : "-1";
-                navigationService.syncTree({ tree: "mediaTypes", path: currPath + "," + folderId, forceReload: true, activate: true });
-
-                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm });
-
-                var section = appState.getSectionState("currentSection");
-
-            }, function (err) {
-                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm, hasErrors: true });
-                $scope.error = err;
-            });
-        };
-    }
-
-    $scope.createMediaType = function() {
-        $location.search('create', null);
-        $location.path("/settings/mediaTypes/edit/" + node.id).search("create", "true");
-        navigationService.hideMenu();
-    };
-
-    $scope.close = function() {
-        const showMenu = true;
-        navigationService.hideDialog(showMenu);
-    };
-}
-
-angular.module('umbraco').controller("Umbraco.Editors.MediaTypes.CreateController", MediaTypesCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.html b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.html
deleted file mode 100644
index 36a0fce9f2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<div ng-controller="Umbraco.Editors.MediaTypes.CreateController">
-
-  <div ng-cloak ng-show="!model.creatingFolder">
-    <div class="umbracoDialog umb-dialog-body with-footer">
-
-      <div class="umb-pane">
-        <h5>
-          <localize key="create_createUnder">Create an item under</localize>
-          {{currentNode.name}}
-        </h5>
-
-        <ul class="umb-actions umb-actions-child">
-          <li data-element="action-mediaType" class="umb-action">
-            <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMediaType()" umb-auto-focus>
-              <umb-icon class="icon large" icon="icon-item-arrangement"></umb-icon>
-              <span class="menu-label">
-                  <localize key="general_new">New</localize>
-                  <localize key="content_mediatype">Media type</localize>
-              </span>
-            </button>
-          </li>
-          <li data-element="action-folder" class="umb-action" ng-if="model.allowCreateFolder">
-            <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
-              <umb-icon class="icon large" icon="icon-folder"></umb-icon>
-              <span class="menu-label">
-                <localize key="general_folder">Folder</localize>
-              </span>
-            </button>
-          </li>
-        </ul>
-      </div>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-      <button class="btn btn-info" ng-click="close()" type="button">
-        <localize key="buttons_somethingElse">Do something else</localize>
-      </button>
-    </div>
-
-  </div>
-
-  <div ng-cloak ng-show="model.creatingFolder">
-    <form name="createFolderForm" ng-submit="createContainer()"
-          novalidate
-          val-form-manager>
-      <div class="umbracoDialog umb-dialog-body with-footer">
-        <div class="umb-pane" ng-show="model.creatingFolder">
-          <div ng-show="error">
-            <div class="alert alert-error">
-              <div><strong>{{error.errorMsg}}</strong></div>
-              <div>{{error.data.message}}</div>
-            </div>
-          </div>
-
-          <umb-control-group hide-label="false" label="Enter a folder name">
-            <input class="umb-textstring textstring input-block-level"
-                   focus-when="{{model.creatingFolder}}"
-                   name="folderName"
-                   ng-model="model.folderName"
-                   required
-                   type="text"/>
-          </umb-control-group>
-        </div>
-      </div>
-      <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <umb-button action="close()"
-                    button-style="link"
-                    label-key="general_close"
-                    type="button">
-        </umb-button>
-        <umb-button button-style="primary"
-                    label-key="general_create"
-                    type="submit">
-        </umb-button>
-      </div>
-    </form>
-  </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/delete.controller.js
deleted file mode 100644
index 2acad6f909..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/delete.controller.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.MediaType.DeleteController
- * @function
- *
- * @description
- * The controller for the media type delete dialog
- */
-function MediaTypesDeleteController($scope, mediaTypeResource, treeService, navigationService, localizationService) {
-
-    $scope.performDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        mediaTypeResource.deleteById($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            //get the root node before we remove it
-            var rootNode = treeService.getTreeRoot($scope.currentNode);
-
-            // TODO: Need to sync tree, etc...
-            treeService.removeNode($scope.currentNode);
-            navigationService.hideMenu();
-        });
-
-    };
-
-    $scope.performContainerDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        mediaTypeResource.deleteContainerById($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            //get the root node before we remove it
-            var rootNode = treeService.getTreeRoot($scope.currentNode);
-
-            // TODO: Need to sync tree, etc...
-            treeService.removeNode($scope.currentNode);
-            navigationService.hideMenu();
-        });
-
-    };
-
-    $scope.cancel = function() {
-        navigationService.hideDialog();
-    };
-
-    $scope.labels = {};
-    localizationService
-        .format(["contentTypeEditor_yesDelete", "contentTypeEditor_andAllMediaItems"], "%0% " + $scope.currentNode.name + " %1%")
-        .then(function (data) {
-            $scope.labels.deleteConfirm = data;
-        });
-
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.MediaTypes.DeleteController", MediaTypesDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/delete.html
deleted file mode 100644
index 051126f2d5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/delete.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.MediaTypes.DeleteController">
-    <div class="umb-dialog-body">
-
-        <p class="abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>&nbsp;<strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <ng-switch on="currentNode.nodeType">
-            <div ng-switch-when="container">
-                <umb-confirm
-                    on-confirm="performContainerDelete"
-                    on-cancel="cancel" confirm-button-style="danger">
-                </umb-confirm>
-            </div>
-
-            <div ng-switch-default>
-                <p>
-                    <umb-icon icon="icon-alert" class="red"></umb-icon>
-                    <strong class="red">
-                        <localize key="contentTypeEditor_allMediaItems">All media items</localize>
-                    </strong>
-                    <localize key="contentTypeEditor_usingThisMedia">using this media type will be deleted permanently, please confirm you want to delete these as well.</localize>
-                </p>
-
-                <hr />
-
-                <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}"></umb-checkbox>
-
-                <umb-confirm confirm-disabled="!confirmed" confirm-label-key="delete" on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
-                </umb-confirm>
-            </div>
-        </ng-switch>
-
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
deleted file mode 100644
index 8c0ce561d9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
+++ /dev/null
@@ -1,413 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.MediaType.EditController
- * @function
- *
- * @description
- * The controller for the media type editor
- */
-(function () {
-    "use strict";
-
-    function MediaTypesEditController($scope, $routeParams, $q,
-        mediaTypeResource, editorState, contentEditingHelper,
-        navigationService, iconHelper, contentTypeHelper, notificationsService,
-        localizationService, overlayHelper, eventsService, angularHelper) {
-
-        var vm = this;
-        var evts = [];
-        var mediaTypeId = $routeParams.id;
-        var create = $routeParams.create;
-        var infiniteMode = $scope.model && $scope.model.infiniteMode;
-        var mediaTypeIcon = "";
-
-        vm.save = save;
-        vm.close = close;
-
-        vm.currentNode = null;
-        vm.header = {};
-        vm.header.editorfor = "content_mediatype";
-        vm.header.setPageTitle = true;
-        vm.contentType = {};
-        vm.page = {};
-        vm.page.loading = false;
-        vm.page.saveButtonState = "init";
-        vm.labels = {};
-        vm.saveButtonKey = "buttons_save";
-        vm.generateModelsKey = "buttons_saveAndGenerateModels";
-
-        onInit();
-
-        function onInit() {
-            // get init values from model when in infinite mode
-            if (infiniteMode) {
-                mediaTypeId = $scope.model.id;
-                create = $scope.model.create;
-                vm.saveButtonKey = "buttons_saveAndClose";
-                vm.generateModelsKey = "buttons_generateModelsAndClose";
-            }
-        }
-
-        var labelKeys = [
-            "general_design",
-            "general_listView",
-            "general_rights",
-
-            "main_sections",
-            "shortcuts_navigateSections",
-            "shortcuts_addGroup",
-            "shortcuts_addProperty",
-            "shortcuts_addEditor",
-            "shortcuts_editDataType",
-            "shortcuts_toggleListView",
-            "shortcuts_toggleAllowAsRoot",
-            "shortcuts_addChildNode"
-        ];
-
-        localizationService.localizeMany(labelKeys).then(function (values) {
-            // navigation
-            vm.labels.design = values[0];
-            vm.labels.listview = values[1];
-            vm.labels.permissions = values[2];
-            // keyboard shortcuts
-            vm.labels.sections = values[3];
-            vm.labels.navigateSections = values[4];
-            vm.labels.addGroup = values[5];
-            vm.labels.addProperty = values[6];
-            vm.labels.addEditor = values[7];
-            vm.labels.editDataType = values[8];
-            vm.labels.toggleListView = values[9];
-            vm.labels.allowAsRoot = values[10];
-            vm.labels.addChildNode = values[11];
-
-            vm.page.navigation = [
-                {
-                    "name": vm.labels.design,
-                    "alias": "design",
-                    "icon": "icon-document-dashed-line",
-                    "view": "views/mediaTypes/views/design/design.html"
-                },
-                {
-                    "name": vm.labels.listview,
-                    "alias": "listView",
-                    "icon": "icon-list",
-                    "view": "views/mediaTypes/views/listview/listview.html"
-                },
-                {
-                    "name": vm.labels.permissions,
-                    "alias": "permissions",
-                    "icon": "icon-keychain",
-                    "view": "views/mediaTypes/views/permissions/permissions.html"
-                }
-            ];
-
-            vm.page.keyboardShortcutsOverview = [
-                {
-                    "name": vm.labels.sections,
-                    "shortcuts": [
-                        {
-                            "description": vm.labels.navigateSections,
-                            "keys": [{ "key": "1" }, { "key": "3" }],
-                            "keyRange": true
-                        }
-                    ]
-                },
-                {
-                    "name": vm.labels.design,
-                    "shortcuts": [
-                    {
-                        "description": vm.labels.addGroup,
-                        "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "g" }]
-                    },
-                    {
-                        "description": vm.labels.addProperty,
-                        "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }]
-                    },
-                    {
-                        "description": vm.labels.addEditor,
-                        "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }]
-                    },
-                    {
-                        "description": vm.labels.editDataType,
-                        "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
-                    }
-                    ]
-                },
-                {
-                    "name": vm.labels.listview,
-                    "shortcuts": [
-                        {
-                            "description": vm.labels.toggleListView,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "l" }]
-                        }
-                    ]
-                },
-                {
-                    "name": vm.labels.permissions,
-                    "shortcuts": [
-                        {
-                            "description": vm.labels.allowAsRoot,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "r" }]
-                        },
-                        {
-                            "description": vm.labels.addChildNode,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "c" }]
-                        }
-                    ]
-                }
-            ];
-
-            initializeActiveNavigationPanel();
-        });
-
-        function initializeActiveNavigationPanel() {
-            // Initialise first loaded page based on page route paramater
-            // i.e. ?view=design|listview|permissions
-            var initialViewSetFromRouteParams = false;
-            var view = $routeParams.view;
-            if (view) {
-                var viewPath = "views/mediaTypes/views/" + view + "/" + view + ".html";
-                for (var i = 0; i < vm.page.navigation.length; i++) {
-                    if (vm.page.navigation[i].view === viewPath) {
-                        vm.page.navigation[i].active = true;
-                        initialViewSetFromRouteParams = true;
-                        break;
-                    }
-                }
-            }
-
-            if (initialViewSetFromRouteParams === false) {
-                vm.page.navigation[0].active = true;
-            }
-        }
-
-        contentTypeHelper.checkModelsBuilderStatus().then(function (result) {
-            vm.page.modelsBuilder = result;
-            if (result) {
-                //Models builder mode:
-                vm.page.defaultButton = {
-                    hotKey: "ctrl+s",
-                    hotKeyWhenHidden: true,
-                    labelKey: vm.saveButtonKey,
-                    letter: "S",
-                    handler: function () { vm.save(); }
-                };
-                vm.page.subButtons = [{
-                    hotKey: "ctrl+g",
-                    hotKeyWhenHidden: true,
-                    labelKey: vm.generateModelsKey,
-                    letter: "G",
-                    handler: function () {
-
-                        vm.page.saveButtonState = "busy";
-
-                        vm.save().then(function (result) {
-
-                            vm.page.saveButtonState = "busy";
-
-                            localizationService.localize("modelsBuilder_buildingModels").then(function (headerValue) {
-                                localizationService.localize("modelsBuilder_waitingMessage").then(function(msgValue) {
-                                    notificationsService.info(headerValue, msgValue);
-                                });
-                            });
-
-                            contentTypeHelper.generateModels().then(function (result) {
-
-                                if (!result.lastError) {
-
-                                    //re-check model status
-                                    contentTypeHelper.checkModelsBuilderStatus().then(function (statusResult) {
-                                        vm.page.modelsBuilder = statusResult;
-                                    });
-
-                                    //clear and add success
-                                    vm.page.saveButtonState = "init";
-                                    localizationService.localize("modelsBuilder_modelsGenerated").then(function(value) {
-                                        notificationsService.success(value);
-                                    });
-
-                                } else {
-                                    vm.page.saveButtonState = "error";
-                                    localizationService.localize("modelsBuilder_modelsExceptionInUlog").then(function(value) {
-                                        notificationsService.error(value);
-                                    });
-                                }
-
-                            }, function () {
-                                vm.page.saveButtonState = "error";
-                                localizationService.localize("modelsBuilder_modelsGeneratedError").then(function(value) {
-                                    notificationsService.error(value);
-                                });
-                            });
-
-                        });
-
-                    }
-                }];
-            }
-        });
-
-        if (create) {
-
-            vm.page.loading = true;
-
-            //we are creating so get an empty data type item
-            mediaTypeResource.getScaffold(mediaTypeId)
-                .then(function(dt) {
-                    init(dt);
-
-                    vm.page.loading = false;
-                });
-        }
-        else {
-            loadMediaType();
-        }
-
-        function loadMediaType() {
-            vm.page.loading = true;
-
-            mediaTypeResource.getById(mediaTypeId).then(function(dt) {
-                init(dt);
-
-                if(!infiniteMode) {
-                    syncTreeNode(vm.contentType, dt.path, true);
-                }
-
-                vm.page.loading = false;
-            });
-        }
-
-        /* ---------- SAVE ---------- */
-
-        function save() {
-
-            // only save if there is no overlays open
-            if (overlayHelper.getNumberOfOverlays() === 0) {
-
-                var deferred = $q.defer();
-
-                vm.page.saveButtonState = "busy";
-
-                // reformat allowed content types to array if id's
-                vm.contentType.allowedContentTypes = contentTypeHelper.createIdArray(vm.contentType.allowedContentTypes);
-
-                contentEditingHelper.contentEditorPerformSave({
-                    saveMethod: mediaTypeResource.save,
-                    scope: $scope,
-                    content: vm.contentType,
-                    rebindCallback: function (_, savedContentType) {
-                        // we need to rebind... the IDs that have been created!
-                        contentTypeHelper.rebindSavedContentType(vm.contentType, savedContentType);
-                    }
-                }).then(function (data) {
-                    //success
-
-                    if(!infiniteMode) {
-                        syncTreeNode(vm.contentType, data.path);
-                    }
-
-                    // emit event
-                    var args = { mediaType: vm.contentType };
-                    eventsService.emit("editors.mediaType.saved", args);
-
-                    if (mediaTypeIcon !== vm.contentType.icon) {
-                        eventsService.emit("editors.tree.icon.changed", args);
-                    }
-
-                    vm.page.saveButtonState = "success";
-
-                    if (infiniteMode && $scope.model.submit) {
-                        $scope.model.submit();
-                    }
-
-                    deferred.resolve(data);
-
-                }, function (err) {
-                    //error
-                    if (err) {
-                        editorState.set($scope.content);
-                    }
-                    else {
-                        localizationService.localize("speechBubbles_validationFailedHeader").then(function (headerValue) {
-                            localizationService.localize("speechBubbles_validationFailedMessage").then(function (msgValue) {
-                                notificationsService.error(headerValue, msgValue);
-                            });
-                        });
-                    }
-
-                    vm.page.saveButtonState = "error";
-
-                    deferred.reject(err);
-                });
-
-                return deferred.promise;
-            }
-        }
-
-        function init(contentType) {
-
-            // convert icons for content type
-            convertLegacyIcons(contentType);
-
-            //set a shared state
-            editorState.set(contentType);
-
-            vm.contentType = contentType;
-
-            mediaTypeIcon = contentType.icon;
-        }
-
-        function convertLegacyIcons(contentType) {
-            // make array to store contentType icon
-            var contentTypeArray = [];
-
-            // push icon to array
-            contentTypeArray.push({ "icon": contentType.icon });
-
-            // run through icon method
-            iconHelper.formatContentTypeIcons(contentTypeArray);
-
-            // set icon back on contentType
-            contentType.icon = contentTypeArray[0].icon;
-        }
-
-        /** Syncs the content type  to it's tree node - this occurs on first load and after saving */
-        function syncTreeNode(dt, path, initialLoad) {
-            navigationService.syncTree({ tree: "mediaTypes", path: path.split(","), forceReload: initialLoad !== true }).then(function(syncArgs) {
-                vm.currentNode = syncArgs.node;
-            });
-        }
-
-        function close() {
-            if (infiniteMode && $scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        evts.push(eventsService.on("app.refreshEditor", function(name, error) {
-            loadMediaType();
-        }));
-
-        evts.push(eventsService.on("editors.groupsBuilder.changed", function(name, args) {
-            angularHelper.getCurrentForm($scope).$setDirty();
-        }));
-
-        //ensure to unregister from all events!
-        $scope.$on('$destroy', function () {
-            for (var e in evts) {
-                eventsService.unsubscribe(evts[e]);
-            }
-        });
-
-        // changes on the other "buttons" do not register on the current form, so we manually have to flag the form as dirty
-        $scope.$watch("vm.contentType.allowedContentTypes.length + vm.contentType.allowAsRoot + vm.contentType.isContainer + vm.contentType.compositeContentTypes.length", function (newVal, oldVal) {
-            if (oldVal === undefined) {
-                // still initializing, ignore
-                return;
-            }
-            angularHelper.getCurrentForm($scope).$setDirty();
-        });
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.MediaTypes.EditController", MediaTypesEditController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.html
deleted file mode 100644
index 153a0a4505..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<div data-element="editor-media-types" ng-controller="Umbraco.Editors.MediaTypes.EditController as vm">
-
-    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
-
-    <form novalidate name="contentTypeForm" val-form-manager>
-
-        <umb-editor-view ng-if="!vm.page.loading">
-
-            <umb-editor-header
-                name="vm.contentType.name"
-                alias="vm.contentType.alias"
-                alias-locked="vm.contentType.isSystemMediaType"
-                key="vm.contentType.key"
-                description="vm.contentType.description"
-                navigation="vm.page.navigation"
-                icon="vm.contentType.icon"
-                editorfor="vm.header.editorfor"
-                setpagetitle="vm.header.setPageTitle">
-            </umb-editor-header>
-
-            <umb-editor-container class="editors-document-type-container">
-
-                <div class="editors-document-type-canvas">
-                    <umb-editor-sub-views
-                        ng-if="!vm.page.loading"
-                        sub-views="vm.page.navigation"
-                        model="vm.contentType">
-                    </umb-editor-sub-views>
-                </div>
-
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-left>
-
-                    <umb-keyboard-shortcuts-overview
-                        model="vm.page.keyboardShortcutsOverview">
-                    </umb-keyboard-shortcuts-overview>
-
-                </umb-editor-footer-content-left>
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button
-                        ng-if="model.infiniteMode"
-                        type="button"
-                        button-style="link"
-                        label-key="general_close"
-                        shortcut="esc"
-                        action="vm.close()">
-                    </umb-button>
-
-                    <umb-button
-                        ng-if="!vm.page.modelsBuilder"
-                        type="button"
-                        button-style="success"
-                        state="vm.page.saveButtonState"
-                        label-key="{{vm.saveButtonKey}}"
-                        shortcut="ctrl+s"
-                        action="vm.save()">
-                    </umb-button>
-
-                    <umb-button-group
-                        ng-if="vm.page.modelsBuilder"
-                        button-style="success"
-                        default-button="vm.page.defaultButton"
-                        sub-buttons="vm.page.subButtons"
-                        state="vm.page.saveButtonState"
-                        direction="up"
-                        float="right">
-                    </umb-button-group>
-
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-
-        </umb-editor-view>
-
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/move.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/move.controller.js
deleted file mode 100644
index 263cefea64..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/move.controller.js
+++ /dev/null
@@ -1,67 +0,0 @@
-angular.module("umbraco")
-.controller("Umbraco.Editors.MediaTypes.MoveController",
-    function ($scope, mediaTypeResource, treeService, navigationService, notificationsService, appState, eventsService) {
-
-        $scope.dialogTreeApi = {};
-        $scope.source = _.clone($scope.currentNode);
-
-        function nodeSelectHandler(args) {
-            args.event.preventDefault();
-            args.event.stopPropagation();
-
-            if ($scope.target) {
-                //un-select if there's a current one selected
-                $scope.target.selected = false;
-            }
-
-            $scope.target = args.node;
-            $scope.target.selected = true;
-        }
-
-        $scope.move = function () {
-
-            $scope.busy = true;
-            $scope.error = false;
-
-            mediaTypeResource.move({ parentId: $scope.target.id, id: $scope.source.id })
-                .then(function (path) {
-                    $scope.error = false;
-                    $scope.success = true;
-                    $scope.busy = false;
-
-                    //first we need to remove the node that launched the dialog
-                    treeService.removeNode($scope.currentNode);
-
-                    //get the currently edited node (if any)
-                    var activeNode = appState.getTreeState("selectedNode");
-
-                    //we need to do a double sync here: first sync to the moved content - but don't activate the node,
-                    //then sync to the currenlty edited content (note: this might not be the content that was moved!!)
-
-                    navigationService.syncTree({ tree: "mediaTypes", path: path, forceReload: true, activate: false }).then(function (args) {
-                        if (activeNode) {
-                            var activeNodePath = treeService.getPath(activeNode).join();
-                            //sync to this node now - depending on what was copied this might already be synced but might not be
-                            navigationService.syncTree({ tree: "mediaTypes", path: activeNodePath, forceReload: false, activate: true });
-                        }
-                    });
-
-                    eventsService.emit('app.refreshEditor');
-
-                }, function (err) {
-                    $scope.success = false;
-                    $scope.error = err;
-                    $scope.busy = false;
-                   
-                });
-        };
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-        };
-
-        $scope.close = function() {
-            navigationService.hideDialog();
-        };
-        
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/move.html b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/move.html
deleted file mode 100644
index 6bb1b6fa10..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/move.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="umb-dialog" ng-controller="Umbraco.Editors.MediaTypes.MoveController">
-
-    <div class="umb-dialog-body">
-        <div class="umb-pane">
-
-            <p class="abstract" ng-hide="success">
-                    <localize key="contentTypeEditor_folderToMove">Select the folder to move</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
-            </p>
-
-            <umb-loader ng-show="busy"></umb-loader>
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-            <div ng-show="success">
-                <div class="alert alert-success">
-                    <strong>{{source.name}}</strong> <localize key="contentTypeEditor_movedUnderneath">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong>
-                </div>
-                <button type="button" class="btn btn-primary" ng-click="close()">Ok</button>
-            </div>
-
-            <div ng-hide="success">
-
-                <div>
-                    <umb-tree section="settings"
-                              treealias="mediaTypes"
-                              customtreeparams="foldersonly=1"
-                              hideheader="false"
-                              hideoptions="true"
-                              isdialog="true"
-                              api="dialogTreeApi"
-                              on-init="onTreeInit()"
-                              enablecheckboxes="true">
-                    </umb-tree>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
-            <localize key="general_cancel">Cancel</localize>
-        </button>
-        <button class="btn btn-primary" ng-click="move()" ng-disabled="busy || !target">
-            <localize key="actions_move">Move</localize>
-        </button>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/rename.html b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/rename.html
deleted file mode 100644
index d348ae30b7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/rename.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.ContentTypeContainers.RenameController" ng-cloak>
-
-    <div class="umb-pane">
-        <form novalidate name="renameFolderForm"
-              ng-submit="renameContainer('mediaTypeResource', 'mediaTypes')"
-              val-form-manager>
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-            <umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
-                <input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
-            </umb-control-group>
-
-            <button type="submit" class="btn btn-primary"><localize key="general_rename">Rename</localize></button>
-        </form>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/design/design.html b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/design/design.html
deleted file mode 100644
index 215664e4db..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/design/design.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<umb-groups-builder
-   model="model"
-   content-type="mediaType">
-</umb-groups-builder>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/listview/listview.html
deleted file mode 100644
index d04a07fe00..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/listview/listview.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<umb-box>
-    <umb-box-content>
-        <div class="sub-view-columns">
-            <div class="sub-view-column-left">
-                <h5><localize key="contentTypeEditor_enableListViewHeading">Enable list view</localize></h5>
-                <small><localize key="contentTypeEditor_enableListViewDescription">Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree</localize></small>
-            </div>
-            <div class="sub-view-column-right">
-                <umb-list-view-settings 
-                    enable-list-view="model.isContainer" 
-                    model-alias="model.alias" 
-                    list-view-name="model.listViewEditorName"
-                    content-type="mediaType">
-                </umb-list-view-settings>
-            </div>
-        </div>
-    </umb-box-content>
-</umb-box>
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/permissions/permissions.controller.js
deleted file mode 100644
index 126d31f7c8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/permissions/permissions.controller.js
+++ /dev/null
@@ -1,92 +0,0 @@
-(function() {
-    'use strict';
-
-    function PermissionsController($scope, $timeout, mediaTypeResource, iconHelper, contentTypeHelper, editorService) {
-
-        /* ----------- SCOPE VARIABLES ----------- */
-
-        var vm = this;
-
-        vm.mediaTypes = [];
-        vm.selectedChildren = [];
-
-        vm.addChild = addChild;
-        vm.removeChild = removeChild;
-        vm.sortChildren = sortChildren;
-        vm.toggle = toggle;
-
-        /* ---------- INIT ---------- */
-
-        init();
-
-        function init() {
-
-            mediaTypeResource.getAll().then(mediaTypes => {
-
-                vm.mediaTypes = mediaTypes;
-
-                // convert legacy icons
-                iconHelper.formatContentTypeIcons(vm.mediaTypes);
-
-                vm.selectedChildren = contentTypeHelper.makeObjectArrayFromId($scope.model.allowedContentTypes, vm.mediaTypes);
-
-                if($scope.model.id === 0) {
-                   contentTypeHelper.insertChildNodePlaceholder(vm.mediaTypes, $scope.model.name, $scope.model.icon, $scope.model.id);
-                }
-
-            });
-
-        }
-
-        function addChild($event) {
-
-            var editor = {
-                multiPicker: true,
-                filterCssClass: 'not-allowed not-published',
-                filter: item => 
-                    !vm.mediaTypes.some(x => x.udi == item.udi) || vm.selectedChildren.some(x => x.udi === item.udi),                
-                submit: model => {
-                    model.selection.forEach(item => 
-                        mediaTypeResource.getById(item.id).then(contentType => {
-                            vm.selectedChildren.push(contentType);
-                            $scope.model.allowedContentTypes.push(item.id);
-                        }));
-
-                    editorService.close();
-                },
-                close: () => editorService.close()                
-            };
-
-            editorService.mediaTypePicker(editor);
-        }
-
-        function removeChild(selectedChild, index) {
-           // remove from vm
-           vm.selectedChildren.splice(index, 1);
-
-           // remove from content type model
-           var selectedChildIndex = $scope.model.allowedContentTypes.indexOf(selectedChild.id);
-           $scope.model.allowedContentTypes.splice(selectedChildIndex, 1);
-        }
-
-        function sortChildren() {
-            // we need to wait until the next digest cycle for vm.selectedChildren to be updated
-            $timeout(() => $scope.model.allowedContentTypes = vm.selectedChildren.map(x => x.id));
-        }
-
-        /**
-         * Toggle the $scope.model.allowAsRoot value to either true or false
-         */
-        function toggle(){
-            if($scope.model.allowAsRoot){
-                $scope.model.allowAsRoot = false;
-                return;
-            }
-
-            $scope.model.allowAsRoot = true;
-        }
-
-    }
-
-    angular.module('umbraco').controller('Umbraco.Editors.MediaType.PermissionsController', PermissionsController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/permissions/permissions.html b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/permissions/permissions.html
deleted file mode 100644
index cb95b4707c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/permissions/permissions.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<div ng-controller="Umbraco.Editors.MediaType.PermissionsController as vm">
-    <umb-box>
-        <umb-box-content>
-            <div class="sub-view-columns">
-                <div class="sub-view-column-left">
-                    <h5><localize key="contentTypeEditor_allowAsRootHeading">Allow as root</localize></h5>
-                    <small><localize key="contentTypeEditor_allowAsRootDescription">Allow editors to create content of this type in the root of the content tree.</localize></small>
-                </div>
-                <div class="sub-view-column-right">
-                    <umb-toggle
-                        checked="model.allowAsRoot"
-                        on-click="vm.toggle()"
-                        hotkey="alt+shift+r">
-                    </umb-toggle>
-                </div>
-            </div>
-            <div class="sub-view-columns">
-                <div class="sub-view-column-left">
-                    <h5><localize key="contentTypeEditor_childNodesHeading">Allowed child node types</localize></h5>
-                    <small><localize key="contentTypeEditor_childNodesDescription">Allow content of the specified types to be created underneath content of this type.</localize></small>
-                </div>
-                <div class="sub-view-column-right">
-                    <umb-child-selector
-                        selected-children="vm.selectedChildren"
-                        available-children="vm.mediaTypes"
-                        parent-name="model.name"
-                        parent-icon="model.icon"
-                        parent-id="model.id"
-                        on-add="vm.addChild"
-                        on-remove="vm.removeChild"
-                        on-sort="vm.sortChildren">
-                    </umb-child-selector>
-                </div>
-            </div>
-        </umb-box-content>
-    </umb-box>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.controller.js
deleted file mode 100644
index ffa8a34f86..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.controller.js
+++ /dev/null
@@ -1,38 +0,0 @@
-(function () {
-    "use strict";
-
-    function MemberAppContentController($scope, $filter, contentEditingHelper, contentTypeHelper) {
-
-        var vm = this;
-
-        vm.tabs = [];
-        vm.activeTabAlias = null;
-
-        vm.setActiveTab = setActiveTab;
-
-        $scope.$watchCollection('content.tabs', (newValue) => {
-
-            contentTypeHelper.defineParentAliasOnGroups(newValue);
-            contentTypeHelper.relocateDisorientedGroups(newValue);
-
-            vm.tabs = $filter("filter")(newValue, (tab) => {
-                return tab.type === contentTypeHelper.TYPE_TAB;
-            });
-
-            if (vm.tabs.length > 0) {
-                // if we have tabs and some groups that doesn't belong to a tab we need to render those on an "Other" tab.
-                contentEditingHelper.registerGenericTab(newValue);
-
-                setActiveTab(vm.tabs[0]);
-            }
-        });
-
-        function setActiveTab (tab) {
-            vm.activeTabAlias = tab.alias;
-            vm.tabs.forEach(tab => tab.active = false);
-            tab.active = true;
-        }
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Member.Apps.ContentController", MemberAppContentController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
deleted file mode 100644
index 9de0e09479..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="form-horizontal" ng-controller="Umbraco.Editors.Member.Apps.ContentController as vm">
-
-    <umb-editor-tab-bar ng-if="vm.tabs.length > 0">
-        <umb-tabs-nav tabs="vm.tabs" on-tab-change="vm.setActiveTab(tab)"></umb-tabs-nav>
-    </umb-editor-tab-bar>
-
-    <umb-box ng-repeat="tab in vm.tabs track by tab.key" ng-show="tab.alias === vm.activeTabAlias && tab.properties.length > 0">
-        <umb-box-content data-element="tab-content-{{tab.alias}}">
-            <umb-property data-element="property-{{property.alias}}" ng-repeat="property in tab.properties track by property.alias" property="property">
-                <umb-property-editor model="property"></umb-property-editor>
-            </umb-property>
-        </umb-box-content>
-    </umb-box>
-
-    <div
-    class="umb-group-panel"
-    data-element="group-{{group.alias}}"
-    ng-repeat="group in content.tabs"
-    ng-if="group.type === 'Group'" ng-show="group.parentAlias === vm.activeTabAlias || vm.tabs.length === 0">
-        <div class="umb-group-panel__header">
-            <div>{{ group.label }}</div>
-        </div>
-        <div class="umb-group-panel__content" data-element="tab-content-{{group.type === 'Group' ? group.parentAlias : group.alias}}">
-            <umb-property
-                data-element="property-{{property.alias}}"
-                ng-repeat="property in group.properties  track by property.alias"
-                property="property">
-                <umb-property-editor model="property"></umb-property-editor>
-            </umb-property>
-        </div>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/apps/info/info.html b/src/Umbraco.Web.UI.Client/src/views/member/apps/info/info.html
deleted file mode 100644
index bd9cb98b64..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/member/apps/info/info.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<umb-member-node-info
-    ng-if="content"
-    node="content">
-</umb-member-node-info>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/apps/membership/membership.html b/src/Umbraco.Web.UI.Client/src/views/member/apps/membership/membership.html
deleted file mode 100644
index d541bb2c56..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/member/apps/membership/membership.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<umb-box data-element="node-membership" class="form-horizontal">
-    <umb-box-content>
-        <umb-property ng-repeat="property in content.membershipProperties track by property.alias" property="property">
-            <umb-property-editor model="property"></umb-property-editor>
-        </umb-property>
-    </umb-box-content>
-</umb-box>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/create.html b/src/Umbraco.Web.UI.Client/src/views/member/create.html
deleted file mode 100644
index b25856d9ba..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/member/create.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<div ng-controller="Umbraco.Editors.Member.CreateController">
-    <div class="umb-dialog-body with-footer" ng-cloak>
-        <div class="umb-pane">
-
-            <h5><localize key="member_createNewMember">Create a new member</localize></h5>
-            <ul class="umb-actions umb-actions-child">
-
-                <li class="umb-action" ng-repeat="docType in allowedTypes">
-                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMemberType(docType)">
-                        <umb-icon icon="{{docType.icon}}" class="icon large"></umb-icon>
-                        <span class="menu-label">
-                            {{docType.name}}
-                            <small>{{docType.description}}</small>
-                        </span>
-                    </button>
-                </li>
-            </ul>
-
-        </div>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" >
-        <button type="button" class="btn btn-info" ng-click="close()">
-            <localize key="buttons_somethingElse">Do something else</localize>
-        </button>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/delete.html b/src/Umbraco.Web.UI.Client/src/views/member/delete.html
deleted file mode 100644
index 26cd2fc649..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/member/delete.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Member.DeleteController">
-    <div class="umb-dialog-body" auto-scale="90">
-        
-        <p class="abstract">
-        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel"  confirm-button-style="danger">    
-        </umb-confirm>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/edit.html b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
deleted file mode 100644
index ff32b072be..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/member/edit.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<div data-element="editor-members" ng-controller="Umbraco.Editors.Member.EditController">
-
-   <umb-load-indicator ng-if="page.loading"></umb-load-indicator>
-
-   <form novalidate name="contentForm"
-      ng-submit="save()"
-      val-form-manager>
-
-      <umb-editor-view ng-if="!page.loading">
-
-         <umb-editor-header
-            name="content.name"
-            menu="page.menu"
-            hide-actions-menu="page.hideActionsMenu"
-            hide-icon="true"
-            hide-description="true"
-            hide-alias="true"
-            navigation="content.apps"
-            on-select-navigation-item="appChanged(item)"
-            show-back-button="showBack()"
-            on-back="onBack()"
-            editorfor="header.editorfor"
-            setpagetitle="header.setPageTitle">
-          </umb-editor-header>
-
-          
-        <umb-editor-container>
-            <div class="umb-editor-sub-views" ng-if="!page.loading">
-                <div id="sub-view-{{$index}}" ng-repeat="app in content.apps track by app.alias">
-                    <umb-editor-sub-view model="app" content="content">
-                    </umb-editor-sub-view>
-                </div>
-            </div>
-        </umb-editor-container>
-
-         <umb-editor-footer>
-
-            <umb-editor-footer-content-left>
-                <umb-breadcrumbs
-                  ng-if="ancestors && ancestors.length > 0"
-                  ancestors="ancestors">
-                </umb-breadcrumbs>
-            </umb-editor-footer-content-left>
-
-
-            <umb-editor-footer-content-right>
-
-                <umb-button ng-if="page.listViewPath"
-                            type="link"
-                            href="#{{page.listViewPath}}"
-                            button-style="link"
-                            label="Return to list"
-                            label-key="buttons_returnToList">
-                </umb-button>
-
-                <umb-button ng-if="model.infiniteMode"
-                            type="button"
-                            button-style="link"
-                            label-key="general_close"
-                            shortcut="esc"
-                            action="model.close(model)">
-                </umb-button>
-
-                <umb-button type="submit"
-                            label="Save"
-                            label-key="buttons_save"
-                            button-style="success"
-                            shortcut="ctrl+s"
-                            state="page.saveButtonState">
-                </umb-button>
-
-            </umb-editor-footer-content-right>
-
-
-         </umb-editor-footer>
-
-
-      </umb-editor-view>
-
-   </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/list.html b/src/Umbraco.Web.UI.Client/src/views/member/list.html
deleted file mode 100644
index 4f27b54aa9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/member/list.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<div ng-controller="Umbraco.Editors.Member.ListController">
-
-   <umb-load-indicator ng-if="page.loading"></umb-load-indicator>
-
-   <form novalidate name="contentForm" ng-show="!page.loading" val-form-manager>
-
-       <umb-editor-view umb-tabs>
-
-           <umb-editor-header name="content.name"
-                              name-locked="page.lockedName"
-                              tabs="content.tabs"
-                              menu="page.menu"
-                              hide-icon="true"
-                              hide-description="true"
-                              hide-alias="true">
-           </umb-editor-header>
-
-           <umb-editor-container>
-               <div class="umb-editor-sub-views">
-                   <div id="sub-view-{{$index}}" ng-repeat="app in content.apps track by app.alias">
-                       <umb-editor-sub-view model="app" content="content">
-                       </umb-editor-sub-view>
-                   </div>
-               </div>
-           </umb-editor-container>
-
-       </umb-editor-view>
-
-   </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/member/listview/listview.html
deleted file mode 100644
index 6c558301c7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/member/listview/listview.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-
-    <umb-property ng-repeat="property in model.viewModel track by property.alias" property="property">
-        <umb-property-editor model="property"></umb-property-editor>
-    </umb-property>
-    
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js
deleted file mode 100644
index e0cf6cf914..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Member.CreateController
- * @function
- * 
- * @description
- * The controller for the member creation dialog
- */
-function memberCreateController($scope, memberTypeResource, iconHelper, navigationService, $location) {
-    
-    memberTypeResource.getTypes($scope.currentNode.id).then(function (data) {
-        $scope.allowedTypes = iconHelper.formatContentTypeIcons(data);
-    });
-
-    $scope.close = function() {
-        const showMenu = true;
-        navigationService.hideDialog(showMenu);
-    };
-
-    $scope.createMemberType = function (memberType) {        
-        $location.path("/member/member/edit/" + $scope.currentNode.id).search("doctype", memberType.alias).search("create", "true");
-        navigationService.hideNavigation();
-    };
-}
-
-angular.module('umbraco').controller("Umbraco.Editors.Member.CreateController", memberCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.delete.controller.js
deleted file mode 100644
index 6ce8f86ce2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.delete.controller.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Member.DeleteController
- * @function
- *
- * @description
- * The controller for deleting content
- */
-function MemberDeleteController($scope, memberResource, treeService, navigationService, editorState, $location, $routeParams) {
-
-    $scope.performDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-
-        memberResource.deleteByKey($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            treeService.removeNode($scope.currentNode);
-
-            //if the current edited item is the same one as we're deleting, we need to navigate elsewhere
-            if (editorState.current && editorState.current.key == $scope.currentNode.id) {
-                $location.path("/member/member/list/" + ($routeParams.listName ? $routeParams.listName : 'all-members'));
-            }
-
-            navigationService.hideMenu();
-        });
-
-    };
-
-    $scope.cancel = function() {
-        navigationService.hideDialog();
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Member.DeleteController", MemberDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
deleted file mode 100644
index 25386cd06d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
+++ /dev/null
@@ -1,342 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Member.EditController
- * @function
- *
- * @description
- * The controller for the member editor
- */
-function MemberEditController($scope, $routeParams, $location, $http, $q, appState, memberResource,
-    entityResource, navigationService, notificationsService, localizationService,
-    serverValidationManager, contentEditingHelper, fileManager, formHelper,
-    editorState, umbRequestHelper, eventsService) {
-
-    var evts = [];
-
-    var infiniteMode = $scope.model && $scope.model.infiniteMode;
-
-    var id = infiniteMode ? $scope.model.id : $routeParams.id;
-    var create = infiniteMode ? $scope.model.create : $routeParams.create;
-    var listName = infiniteMode ? $scope.model.listname : $routeParams.listName;
-    var docType = infiniteMode ? $scope.model.doctype : $routeParams.doctype;
-
-    $scope.header = {};
-    $scope.header.editorfor = "visuallyHiddenTexts_newMember";
-    $scope.header.setPageTitle = true;
-
-    //setup scope vars
-    $scope.page = {};
-    $scope.page.loading = true;
-    $scope.page.menu = {};
-    $scope.page.menu.currentSection = appState.getSectionState("currentSection");
-    $scope.page.menu.currentNode = null; //the editors affiliated node
-    $scope.page.nameLocked = false;
-    $scope.page.saveButtonState = "init";
-    $scope.page.exportButton = "init";
-    $scope.page.hideActionsMenu = infiniteMode ? true : false;
-
-    //build a path to sync the tree with
-    function buildTreePath(data) {
-        return listName ? "-1," + listName : "-1";
-    }
-
-    if (create) {
-
-        //if there is no doc type specified then we are going to assume that
-        // we are not using the umbraco membership provider
-        if (docType) {
-
-            //we are creating so get an empty member item
-            memberResource.getScaffold(docType)
-                .then(function(data) {
-
-                    $scope.content = data;
-
-                    init();
-
-                    $scope.page.loading = false;
-
-                });
-        }
-        else {
-
-            memberResource.getScaffold()
-                .then(function (data) {
-                    $scope.content = data;
-
-                    init();
-
-                    $scope.page.loading = false;
-
-                });
-        }
-
-    }
-    else {
-        $scope.page.loading = true;
-        loadMember()
-            .then(function () {
-                $scope.page.loading = false;
-            });
-    }
-
-    function init() {
-
-        var content = $scope.content;
-
-        // we need to check wether an app is present in the current data, if not we will present the default app.
-        var isAppPresent = false;
-
-        // on first init, we dont have any apps. but if we are re-initializing, we do, but ...
-        if ($scope.app) {
-
-            // lets check if it still exists as part of our apps array. (if not we have made a change to our docType, even just a re-save of the docType it will turn into new Apps.)
-            _.forEach(content.apps, function (app) {
-                if (app === $scope.app) {
-                    isAppPresent = true;
-                }
-            });
-
-            // if we did reload our DocType, but still have the same app we will try to find it by the alias.
-            if (isAppPresent === false) {
-                _.forEach(content.apps, function (app) {
-                    if (app.alias === $scope.app.alias) {
-                        isAppPresent = true;
-                        app.active = true;
-                        $scope.appChanged(app);
-                    }
-                });
-            }
-
-        }
-
-        // if we still dont have a app, lets show the first one:
-        if (isAppPresent === false) {
-            content.apps[0].active = true;
-            $scope.appChanged(content.apps[0]);
-        }
-
-        if (content.membershipScenario === 0) {
-            $scope.page.nameLocked = true;
-        }
-
-        editorState.set($scope.content);
-
-        bindEvents();
-
-        $scope.contentForm.$dirty = false;
-    }
-
-    function bindEvents() {
-        //bindEvents can be called more than once and we don't want to have multiple bound events
-        for (var e in evts) {
-            eventsService.unsubscribe(evts[e]);
-        }
-
-        evts.push(eventsService.on("editors.memberType.saved", function (name, args) {
-            // if this member item uses the updated member type we need to reload the member item
-            if (args && args.memberType && args.memberType.key.replace(/-/g, '') === $scope.content.contentType.key) {
-                $scope.page.loading = true;
-                loadMember().then(function () {
-                    $scope.page.loading = false;
-                });
-            }
-        }));
-    }
-
-    /** Syncs the content item to it's tree node - this occurs on first load and after saving */
-    function syncTreeNode(content, path, initialLoad) {
-
-        if (infiniteMode) {
-            return;
-        }
-
-        if (!$scope.content.isChildOfListView) {
-            navigationService.syncTree({ tree: "member", path: path.split(","), forceReload: initialLoad !== true }).then(function (syncArgs) {
-                $scope.page.menu.currentNode = syncArgs.node;
-            });
-        }
-        else if (initialLoad === true) {
-
-            //it's a child item, just sync the ui node to the parent
-            navigationService.syncTree({ tree: "member", path: path.substring(0, path.lastIndexOf(",")).split(","), forceReload: initialLoad !== true });
-
-            //if this is a child of a list view and it's the initial load of the editor, we need to get the tree node 
-            // from the server so that we can load in the actions menu.
-            umbRequestHelper.resourcePromise(
-                $http.get(content.treeNodeUrl),
-                'Failed to retrieve data for child node ' + content.id).then(function (node) {
-                    $scope.page.menu.currentNode = node;
-                });
-        }
-    }
-
-    /** Just shows a simple notification that there are client side validation issues to be fixed */
-    function showValidationNotification() {
-        //TODO: We need to make the validation UI much better, there's a lot of inconsistencies in v8 including colors, issues with the property groups and validation errors between variants
-
-        //need to show a notification else it's not clear there was an error.
-        localizationService.localizeMany([
-                "speechBubbles_validationFailedHeader",
-                "speechBubbles_validationFailedMessage"
-            ]
-        ).then(function (data) {
-            notificationsService.error(data[0], data[1]);
-        });
-    }
-
-    $scope.save = function() {
-
-        if (formHelper.submitForm({ scope: $scope })) {
-
-            $scope.page.saveButtonState = "busy";
-
-            memberResource.save($scope.content, create, fileManager.getFiles())
-                .then(function(data) {
-
-                    formHelper.resetForm({ scope: $scope });
-
-                    // close the editor if it's infinite mode
-                    // submit function manages rebinding changes
-                    if (infiniteMode && $scope.model.submit) {
-                        $scope.model.memberNode = $scope.content;
-                        $scope.model.submit($scope.model);
-                    } else {
-                        // if not infinite mode, rebind changed props etc
-                        contentEditingHelper.handleSuccessfulSave({
-                            scope: $scope,
-                            savedContent: data,
-                            //specify a custom id to redirect to since we want to use the GUID
-                            redirectId: data.key,
-                            rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data)
-                        });
-
-                        editorState.set($scope.content);
-
-                        var path = buildTreePath(data);
-
-                        navigationService.syncTree({ tree: "member", path: path.split(",") });
-                        //syncTreeNode($scope.content, data.path);
-
-                        $scope.page.saveButtonState = "success";
-
-                        init();
-                    }
-
-                }, function(err) {
-                    formHelper.resetForm({ scope: $scope, hasErrors: true });
-                    contentEditingHelper.handleSaveError({
-                        err: err,
-                        rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, err.data)
-                    });
-
-                    editorState.set($scope.content);
-                    $scope.page.saveButtonState = "error";
-
-                });
-        }
-        else {
-            showValidationNotification();
-        }
-
-    };
-
-    function loadMember() {
-
-        var deferred = $q.defer();
-
-        //so, we usually reference all editors with the Int ID, but with members we have
-        //a different pattern, adding a route-redirect here to handle this just in case.
-        //(isNumber doesnt work here since its seen as a string)
-        //The reason this might be an INT is due to the routing used for the member list view
-        //but this is now configured to use the key, so this is just a fail safe
-
-        if (id && id.length < 9) {
-
-            entityResource.getById(id, "Member").then(function (entity) {
-                $location.path("/member/member/edit/" + entity.key);
-
-                deferred.resolve($scope.content);
-            }, function () {
-                deferred.reject();
-            });
-        }
-        else {
-
-            //we are editing so get the content item from the server
-            memberResource.getByKey(id)
-                .then(function (data) {
-
-                    $scope.content = data;
-
-                    if (!infiniteMode) {
-                        var path = buildTreePath(data);
-
-                        navigationService.syncTree({ tree: "member", path: path.split(","), forceReload: true });
-                        //syncTreeNode($scope.content, data.path, true);
-                    }
-
-                    //it's the initial load of the editor, we need to get the tree node
-                    // from the server so that we can load in the actions menu.
-                    umbRequestHelper.resourcePromise(
-                        $http.get(data.treeNodeUrl),
-                        'Failed to retrieve data for child node ' + data.key).then(function (node) {
-                            $scope.page.menu.currentNode = node;
-                        });
-
-                    //in one particular special case, after we've created a new item we redirect back to the edit
-                    // route but there might be server validation errors in the collection which we need to display
-                    // after the redirect, so we will bind all subscriptions which will show the server validation errors
-                    // if there are any and then clear them so the collection no longer persists them.
-                    serverValidationManager.notifyAndClearAllSubscriptions();
-
-                    init();
-
-                    $scope.page.loading = false;
-
-                    deferred.resolve($scope.content);
-
-                }, function () {
-                    deferred.reject();
-                });
-        }
-
-        return deferred.promise;
-    }
-
-    $scope.appChanged = function (app) {
-        $scope.app = app;
-
-        // setup infinite mode
-        if (infiniteMode) {
-            $scope.page.submitButtonLabelKey = "buttons_saveAndClose";
-        }
-    }
-
-    $scope.showBack = function () {
-        return !infiniteMode && !!listName;
-    };
-
-    /** Callback for when user clicks the back-icon */
-    $scope.onBack = function () {
-        $location.path("/member/member/list/" + listName);
-        $location.search("listName", null);
-        if ($routeParams.page) {
-            $location.search("page", $routeParams.page);
-        }
-    };
-
-    $scope.export = function () {
-        var memberKey = $scope.content.key;
-        memberResource.exportMemberData(memberKey);
-    };
-
-    //ensure to unregister from all events!
-    $scope.$on('$destroy', function () {
-        for (var e in evts) {
-            eventsService.unsubscribe(evts[e]);
-        }
-    });
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Member.EditController", MemberEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js
deleted file mode 100644
index b099396142..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Member.ListController
- * @function
- *
- * @description
- * The controller for the member list view
- */
-function MemberListController($scope, $routeParams, $location, $q, $window, appState, memberResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, formHelper, umbModelMapper, editorState, localizationService) {
-
-    //setup scope vars
-    $scope.currentSection = appState.getSectionState("currentSection");
-    $scope.currentNode = null; //the editors affiliated node
-
-    $scope.page = {};
-    $scope.page.lockedName = true;
-    $scope.page.loading = true;
-
-    //we are editing so get the content item from the server
-    memberResource.getListNode($routeParams.id)
-        .then(function (data) {
-
-            $scope.content = data;
-
-            //translate "All Members"
-            if ($scope.content != null && $scope.content.name != null && $scope.content.name.replace(" ", "").toLowerCase() == "allmembers") {
-                localizationService.localize("member_allMembers").then(function (value) {
-                    $scope.content.name = value;
-                });
-            }
-
-            editorState.set($scope.content);
-
-            navigationService.syncTree({ tree: "member", path: data.path.split(",") }).then(function (syncArgs) {
-                $scope.currentNode = syncArgs.node;
-            });
-
-            //in one particular special case, after we've created a new item we redirect back to the edit
-            // route but there might be server validation errors in the collection which we need to display
-            // after the redirect, so we will bind all subscriptions which will show the server validation errors
-            // if there are any and then clear them so the collection no longer persists them.
-            serverValidationManager.notifyAndClearAllSubscriptions();
-
-            $scope.page.loading = false;
-
-        });
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Member.ListController", MemberListController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberGroups/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/memberGroups/delete.controller.js
deleted file mode 100644
index 7e434b6f3b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberGroups/delete.controller.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.MemberGroups.DeleteController
- * @function
- *
- * @description
- * The controller for deleting member groups
- */
-function MemberGroupsDeleteController($scope, memberGroupResource, treeService, navigationService) {
-
-    $scope.performDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        memberGroupResource.deleteById($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            //get the root node before we remove it
-            var rootNode = treeService.getTreeRoot($scope.currentNode);
-
-            // TODO: Need to sync tree, etc...
-            treeService.removeNode($scope.currentNode);
-            navigationService.hideMenu();
-        });
-
-    };
-
-    $scope.cancel = function() {
-        navigationService.hideDialog();
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.MemberGroups.DeleteController", MemberGroupsDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberGroups/delete.html b/src/Umbraco.Web.UI.Client/src/views/memberGroups/delete.html
deleted file mode 100644
index 17a71fa9de..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberGroups/delete.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.MemberGroups.DeleteController">
-    <div class="umb-dialog-body" auto-scale="90">
-
-        <p class="abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
-        </umb-confirm>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberGroups/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/memberGroups/edit.controller.js
deleted file mode 100644
index 4602a5aa25..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberGroups/edit.controller.js
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.MemberGroups.EditController
- * @function
- *
- * @description
- * The controller for the member group editor
- */
-function MemberGroupsEditController($scope, $routeParams, appState, navigationService, memberGroupResource, contentEditingHelper, formHelper, editorState, eventsService) {
-
-    //setup scope vars
-    $scope.page = {};
-    $scope.page.loading = false;
-    $scope.header = {};
-    $scope.header.editorfor = "content_membergroup";
-    $scope.header.setPageTitle = true;
-    $scope.page.menu = {};
-    $scope.page.menu.currentSection = appState.getSectionState("currentSection");
-    $scope.page.menu.currentNode = null;
-    var evts = [];
-
-    if ($routeParams.create) {
-
-        $scope.page.loading = true;
-
-        //we are creating so get an empty member group item
-        memberGroupResource.getScaffold()
-            .then(function(data) {
-
-                $scope.content = data;
-
-                //set a shared state
-                editorState.set($scope.content);
-
-                $scope.page.loading = false;
-
-            });
-    }
-    else {
-        loadMemberGroup();
-    }
-
-    function loadMemberGroup() {
-
-        $scope.page.loading = true;
-
-        //we are editing so get the content item from the server
-        memberGroupResource.getById($routeParams.id)
-            .then(function (data) {
-                $scope.content = data;
-
-                //share state
-                editorState.set($scope.content);
-
-                navigationService.syncTree({ tree: "memberGroups", path: data.path }).then(function (syncArgs) {
-                    $scope.page.menu.currentNode = syncArgs.node;
-                });
-
-                $scope.page.loading = false;
-
-            });
-    }
-
-    $scope.save = function () {
-
-        if (formHelper.submitForm({ scope: $scope })) {
-
-            $scope.page.saveButtonState = "busy";
-
-            memberGroupResource.save($scope.content, $scope.preValues, $routeParams.create)
-                .then(function (data) {
-
-                    formHelper.resetForm({ scope: $scope });
-
-                    contentEditingHelper.handleSuccessfulSave({
-                        scope: $scope,
-                        savedContent: data
-                    });
-
-                    //share state
-                    editorState.set($scope.content);
-
-                    navigationService.syncTree({ tree: "memberGroups", path: data.path, forceReload: true }).then(function (syncArgs) {
-                        $scope.page.menu.currentNode = syncArgs.node;
-                    });
-
-                    $scope.page.saveButtonState = "success";
-
-                }, function (err) {
-
-                    formHelper.resetForm({ scope: $scope, hasErrors: true });
-                    contentEditingHelper.handleSaveError({
-                        err: err
-                    });
-
-                    $scope.page.saveButtonState = "error";
-
-                    //share state
-                    editorState.set($scope.content);
-                });
-        }
-
-    };
-
-    evts.push(eventsService.on("app.refreshEditor", function (name, error) {
-        loadMemberGroup();
-    }));
-
-    //ensure to unregister from all events!
-    $scope.$on('$destroy', function () {
-        for (var e in evts) {
-            eventsService.unsubscribe(evts[e]);
-        }
-    });
-
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.MemberGroups.EditController", MemberGroupsEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberGroups/edit.html b/src/Umbraco.Web.UI.Client/src/views/memberGroups/edit.html
deleted file mode 100644
index 63089de20c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberGroups/edit.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<div ng-controller="Umbraco.Editors.MemberGroups.EditController as vm">
-
-    <umb-load-indicator ng-if="page.loading"></umb-load-indicator>
-
-    <form name="contentForm"
-          ng-submit="save()"
-          novalidate
-          val-form-manager>
-
-        <umb-editor-view ng-if="!page.loading">
-
-            <umb-editor-header menu="page.menu"
-                               name="content.name"
-                               name-locked="page.nameLocked"
-                               hide-icon="true"
-                               hide-description="true"
-                               hide-alias="true"
-                               editorfor="header.editorfor"
-                               setpagetitle="header.setPageTitle">
-            </umb-editor-header>
-
-            <umb-editor-container>
-
-                <umb-membergroup-node-info ng-if="content"
-                                           node="content">
-                </umb-membergroup-node-info>
-
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button type="submit"
-                                button-style="success"
-                                state="page.saveButtonState"
-                                shortcut="ctrl+s"
-                                label="Save"
-                                label-key="buttons_save">
-                    </umb-button>
-
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-
-
-        </umb-editor-view>
-
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/memberTypes/copy.controller.js
deleted file mode 100644
index aa94b4bd04..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/copy.controller.js
+++ /dev/null
@@ -1,61 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.Editors.MemberTypes.CopyController",
-    function ($scope, memberTypeResource, treeService, navigationService, notificationsService, appState, eventsService) {
-
-        $scope.dialogTreeApi = {};
-        $scope.source = _.clone($scope.currentNode);
-
-        function nodeSelectHandler(args) {
-            args.event.preventDefault();
-            args.event.stopPropagation();
-
-            if ($scope.target) {
-                //un-select if there's a current one selected
-                $scope.target.selected = false;
-            }
-
-            $scope.target = args.node;
-            $scope.target.selected = true;
-        }
-
-        $scope.copy = function () {
-
-            $scope.busy = true;
-            $scope.error = false;
-
-            memberTypeResource.copy({ parentId: $scope.target.id, id: $scope.source.id })
-                .then(function (path) {
-                    $scope.error = false;
-                    $scope.success = true;
-                    $scope.busy = false;
-
-                    //get the currently edited node (if any)
-                    var activeNode = appState.getTreeState("selectedNode");
-
-                    //we need to do a double sync here: first sync to the copied content - but don't activate the node,
-                    //then sync to the currenlty edited content (note: this might not be the content that was copied!!)
-
-                    navigationService.syncTree({ tree: "memberTypes", path: path, forceReload: true, activate: false }).then(function (args) {
-                        if (activeNode) {
-                            var activeNodePath = treeService.getPath(activeNode).join();
-                            //sync to this node now - depending on what was copied this might already be synced but might not be
-                            navigationService.syncTree({ tree: "memberTypes", path: activeNodePath, forceReload: false, activate: true });
-                        }
-                    });
-
-                }, function (err) {
-                    $scope.success = false;
-                    $scope.error = err;
-                    $scope.busy = false;
-                });
-        };
-
-        $scope.onTreeInit = function () {
-            $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-        };
-
-        $scope.close = function() {
-            navigationService.hideDialog();
-        };
-        
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/memberTypes/copy.html
deleted file mode 100644
index fb7c6b5584..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/copy.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="umb-dialog" ng-controller="Umbraco.Editors.MemberTypes.CopyController">
-
-    <div class="umb-dialog-body">
-        <div class="umb-pane">
-
-            <p class="abstract" ng-hide="success">
-                <localize key="contentTypeEditor_folderToCopy">Select the folder to copy</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
-            </p>
-
-            <umb-loader ng-show="busy"></umb-loader>
-
-            <div ng-show="error">
-                <div class="alert alert-error">
-                    <div><strong>{{error.errorMsg}}</strong></div>
-                    <div>{{error.data.message}}</div>
-                </div>
-            </div>
-
-            <div ng-show="success">
-                <div class="alert alert-success">
-                    <strong>{{source.name}}</strong> <localize key="contentTypeEditor_copiedUnderneath">was copied underneath</localize>&nbsp;<strong>{{target.name}}</strong>
-                </div>
-                <button type="button" class="btn btn-primary" ng-click="close()">Ok</button>
-            </div>
-
-            <div ng-hide="success">
-
-                <div>
-                    <umb-tree section="settings"
-                              treealias="memberTypes"
-                              customtreeparams="foldersonly=1"
-                              hideheader="false"
-                              hideoptions="true"
-                              isdialog="true"
-                              api="dialogTreeApi"
-                              on-init="onTreeInit()"
-                              enablecheckboxes="true">
-                    </umb-tree>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <button type="button" class="btn btn-link" ng-click="close()" ng-show="!busy">
-            <localize key="general_cancel">Cancel</localize>
-        </button>
-        <button class="btn btn-primary" ng-click="copy()" ng-disabled="busy || !target">
-            <localize key="actions_copy">Copy</localize>
-        </button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.controller.js
deleted file mode 100644
index 4210d162d3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.controller.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.MemberTypes.CreateController
- * @function
- *
- * @description
- * The controller for the member type creation dialog
- */
-function MemberTypesCreateController($scope, $location, navigationService, memberTypeResource, formHelper, appState, localizationService) {
-
-    $scope.model = {
-      allowCreateFolder: $scope.currentNode.parentId === null || $scope.currentNode.nodeType === 'container',
-      folderName: "",
-      creatingFolder: false
-    };
-
-    var node = $scope.currentNode;
-    var section = appState.getSectionState("currentSection");
-
-    $scope.showCreateFolder = function() {
-        $scope.model.creatingFolder = true;
-    }
-
-    $scope.createContainer = function () {
-        if (formHelper.submitForm({
-            scope: $scope,
-            formCtrl: this.createFolderForm
-        })) {
-            memberTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) {
-
-                navigationService.hideMenu();
-                var currPath = node.path ? node.path : "-1";
-                navigationService.syncTree({ tree: "memberTypes", path: currPath + "," + folderId, forceReload: true, activate: true });
-
-                formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm });
-
-            }, function(err) {
-                formHelper.resetForm({ scope: $scope, formCtrl: this.createFolderForm, hasErrors: true });
-               // TODO: Handle errors
-            });
-        };
-    }
-
-    $scope.createMemberType = function() {
-        $location.search('create', null);
-        $location.path("/" + section + "/memberTypes/edit/" + node.id).search("create", "true");
-        navigationService.hideMenu();
-    }
-}
-
-angular.module('umbraco').controller("Umbraco.Editors.MemberTypes.CreateController", MemberTypesCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.html b/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.html
deleted file mode 100644
index ac6f633db8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/create.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<div ng-controller="Umbraco.Editors.MemberTypes.CreateController">
-
-    <div class="umbracoDialog umb-dialog-body with-footer">
-        <div class="umb-pane" ng-if="!model.creatingFolder">
-            <h5>
-                <localize key="create_createUnder">Create a type under</localize> {{currentNode.name}}
-            </h5>
-
-            <ul class="umb-actions umb-actions-child">
-                <li data-element="action-memberType" class="umb-action">
-                  <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMemberType()">
-                    <umb-icon icon="icon-item-arrangement" class="icon large"></umb-icon>
-                    <span class="menu-label">
-                      <localize key="general_new">New</localize>
-                      <localize key="content_memberType">Member type</localize>
-                    </span>
-                  </button>
-                </li>
-                <li data-element="action-folder" class="umb-action">
-                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
-                        <umb-icon icon="icon-folder" class="icon large"></umb-icon>
-                        <span class="menu-label">
-                            <localize key="general_folder">Folder</localize>
-                        </span>
-                    </button>
-                </li>
-            </ul>
-        </div>
-
-        <div class="umb-pane" ng-if="model.creatingFolder">
-            <form novalidate name="createFolderForm" ng-submit="createFolder()" val-form-manager>
-
-                <umb-control-group label="Enter a folder name" hide-label="false">
-                    <input type="text" name="folderName" ng-model="model.folderName"
-                        class="umb-textstring textstring input-block-level" required />
-                </umb-control-group>
-
-                <button type="submit" class="btn btn-primary">
-                    <localize key="general_create">Create</localize>
-                </button>
-            </form>
-        </div>
-
-    </div>
-
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
-        <button type="button" class="btn btn-info" ng-click="nav.hideDialog(true)">
-            <localize key="buttons_somethingElse">Do something else</localize>
-        </button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/memberTypes/delete.controller.js
deleted file mode 100644
index 94781dd5e7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/delete.controller.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.MemberTypes.DeleteController
- * @function
- *
- * @description
- * The controller for deleting member types
- */
-function MemberTypesDeleteController($scope, memberTypeResource, treeService, navigationService, localizationService) {
-
-    $scope.performDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        memberTypeResource.deleteById($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            //get the root node before we remove it
-            var rootNode = treeService.getTreeRoot($scope.currentNode);
-
-            // TODO: Need to sync tree, etc...
-            treeService.removeNode($scope.currentNode);
-            navigationService.hideMenu();
-
-        });
-
-    };
-
-    $scope.cancel = function() {
-        navigationService.hideDialog();
-    };
-
-    $scope.labels = {};
-    localizationService
-        .format(["contentTypeEditor_yesDelete", "contentTypeEditor_andAllMembers"], "%0% " + $scope.currentNode.name + " %1%")
-        .then(function (data) {
-            $scope.labels.deleteConfirm = data;
-        });
-
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.MemberTypes.DeleteController", MemberTypesDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/memberTypes/delete.html
deleted file mode 100644
index 5930339d6e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/delete.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.MemberTypes.DeleteController">
-    <div class="umb-dialog-body">
-
-        <p class="abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <p>
-            <umb-icon icon="icon-alert" class="red"></umb-icon>
-            <strong class="red"><localize key="member_allMembers">All members</localize></strong>
-            <localize key="contentTypeEditor_usingThisMember">using this member type will be deleted permanently, please confirm you want to delete these as well.</localize>
-        </p>
-
-        <hr />
-
-        <umb-checkbox model="confirmed" text="{{labels.deleteConfirm}}"></umb-checkbox>
-
-        <umb-confirm confirm-disabled="!confirmed" confirm-label-key="delete" on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
-        </umb-confirm>
-
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js
deleted file mode 100644
index f5658ad1df..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js
+++ /dev/null
@@ -1,327 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.MemberTypes.EditController
- * @function
- *
- * @description
- * The controller for the member type editor
- */
-(function () {
-    "use strict";
-
-    function MemberTypesEditController($scope, $routeParams, $q,
-        memberTypeResource, editorState, iconHelper,
-        navigationService, contentEditingHelper, notificationsService, localizationService,
-        overlayHelper, contentTypeHelper, angularHelper, eventsService) {
-
-        var evts = [];
-        var vm = this;
-        var infiniteMode = $scope.model && $scope.model.infiniteMode;
-        var memberTypeId = $routeParams.id;
-        var create = $routeParams.create;
-        var memberTypeIcon = "";
-
-        vm.save = save;
-        vm.close = close;
-
-        vm.editorfor = "visuallyHiddenTexts_newMember";
-        vm.header = {};
-        vm.header.editorfor = "content_membergroup";
-        vm.header.setPageTitle = true;
-        vm.currentNode = null;
-        vm.contentType = {};
-        vm.page = {};
-        vm.page.loading = false;
-        vm.page.saveButtonState = "init";
-        vm.labels = {};
-        vm.saveButtonKey = "buttons_save";
-        vm.generateModelsKey = "buttons_saveAndGenerateModels";
-
-        onInit();
-
-        function onInit() {
-            // get init values from model when in infinite mode
-            if (infiniteMode) {
-                memberTypeId = $scope.model.id;
-                create = $scope.model.create;
-                vm.saveButtonKey = "buttons_saveAndClose";
-                vm.generateModelsKey = "buttons_generateModelsAndClose";
-            }
-        }
-
-        var labelKeys = [
-            "general_design",
-            "shortcuts_shortcut",
-            "shortcuts_addGroup",
-            "shortcuts_addProperty",
-            "shortcuts_addEditor",
-            "shortcuts_editDataType"
-        ];
-
-        localizationService.localizeMany(labelKeys).then(function(values){
-
-            vm.labels.design = values[0];
-            vm.labels.shortcut = values[1];
-            vm.labels.addGroup = values[2];
-            vm.labels.addProperty = values[3];
-            vm.labels.addEditor = values[4];
-            vm.labels.editDataType = values[5];
-
-            vm.page.navigation = [
-                {
-                    "name": vm.labels.design,
-                    "icon": "icon-document-dashed-line",
-                    "view": "views/memberTypes/views/design/design.html",
-                    "active": true
-                }
-            ];
-
-            vm.page.keyboardShortcutsOverview = [
-                {
-                    "name": vm.labels.shortcut,
-                    "shortcuts": [
-                        {
-                            "description": vm.labels.addGroup,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "g" }]
-                        },
-                        {
-                            "description": vm.labels.addProperty,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }]
-                        },
-                        {
-                            "description": vm.labels.addEditor,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }]
-                        },
-                        {
-                            "description": vm.labels.editDataType,
-                            "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
-                        }
-                    ]
-                }
-            ];
-
-        });
-
-        contentTypeHelper.checkModelsBuilderStatus().then(function (result) {
-            vm.page.modelsBuilder = result;
-            if (result) {
-                //Models builder mode:
-                vm.page.defaultButton = {
-                    hotKey: "ctrl+s",
-                    hotKeyWhenHidden: true,
-                    labelKey: vm.saveButtonKey,
-                    letter: "S",
-                    handler: function () { vm.save(); }
-                };
-                vm.page.subButtons = [{
-                    hotKey: "ctrl+g",
-                    hotKeyWhenHidden: true,
-                    labelKey: infiniteMode ? "buttons_generateModelsAndClose" : "buttons_saveAndGenerateModels",
-                    letter: "G",
-                    handler: function () {
-
-                        vm.page.saveButtonState = "busy";
-
-                        vm.save().then(function (result) {
-
-                            vm.page.saveButtonState = "busy";
-
-                            localizationService.localize("modelsBuilder_buildingModels").then(function (headerValue) {
-                                localizationService.localize("modelsBuilder_waitingMessage").then(function(msgValue) {
-                                    notificationsService.info(headerValue, msgValue);
-                                });
-                            });
-
-                            contentTypeHelper.generateModels().then(function (result) {
-
-                                if (!result.lastError) {
-
-                                    //re-check model status
-                                    contentTypeHelper.checkModelsBuilderStatus().then(function (statusResult) {
-                                        vm.page.modelsBuilder = statusResult;
-                                    });
-
-                                    //clear and add success
-                                    vm.page.saveButtonState = "init";
-                                    localizationService.localize("modelsBuilder_modelsGenerated").then(function(value) {
-                                        notificationsService.success(value);
-                                    });
-
-                                } else {
-                                    vm.page.saveButtonState = "error";
-                                    localizationService.localize("modelsBuilder_modelsExceptionInUlog").then(function(value) {
-                                        notificationsService.error(value);
-                                    });
-                                }
-
-                            }, function () {
-                                vm.page.saveButtonState = "error";
-                                localizationService.localize("modelsBuilder_modelsGeneratedError").then(function(value) {
-                                    notificationsService.error(value);
-                                });
-                            });
-
-
-                        });
-
-                    }
-                }];
-            }
-        });
-
-        if (create) {
-
-            vm.page.loading = true;
-
-            //we are creating so get an empty data type item
-            memberTypeResource.getScaffold(memberTypeId)
-                .then(function (dt) {
-                    init(dt);
-
-                    vm.page.loading = false;
-                });
-        }
-        else {
-            loadMemberType();
-        }
-
-        function loadMemberType() {
-
-            vm.page.loading = true;
-
-            memberTypeResource.getById(memberTypeId).then(function (dt) {
-                init(dt);
-
-                if (!infiniteMode) {
-                    syncTreeNode(vm.contentType, dt.path, true);
-                }
-
-                vm.page.loading = false;
-            });
-        }
-
-        /* ---------- SAVE ---------- */
-
-        function save() {
-
-            // only save if there is no overlays open
-            if(overlayHelper.getNumberOfOverlays() === 0) {
-
-                var deferred = $q.defer();
-
-                vm.page.saveButtonState = "busy";
-
-                contentEditingHelper.contentEditorPerformSave({
-                    saveMethod: memberTypeResource.save,
-                    scope: $scope,
-                    content: vm.contentType,
-                    rebindCallback: function (_, savedContentType) {
-                        // we need to rebind... the IDs that have been created!
-                        contentTypeHelper.rebindSavedContentType(vm.contentType, savedContentType);
-                    }
-                }).then(function (data) {
-                    //success
-
-                    if(!infiniteMode) {
-                        syncTreeNode(vm.contentType, data.path);
-                    }
-
-                    // emit event
-                    var args = { memberType: vm.contentType };
-                    eventsService.emit("editors.memberType.saved", args);
-
-                    if (memberTypeIcon !== vm.contentType.icon) {
-                        eventsService.emit("editors.tree.icon.changed", args);
-                    }
-
-                    vm.page.saveButtonState = "success";
-
-                    if(infiniteMode && $scope.model.submit) {
-                        $scope.model.submit();
-                    }
-
-                    deferred.resolve(data);
-
-                }, function (err) {
-                    //error
-                    if (err) {
-                        editorState.set($scope.content);
-                    }
-                    else {
-                        localizationService.localize("speechBubbles_validationFailedHeader").then(function (headerValue) {
-                            localizationService.localize("speechBubbles_validationFailedMessage").then(function (msgValue) {
-                                notificationsService.error(headerValue, msgValue);
-                            });
-                        });
-                    }
-
-                    vm.page.saveButtonState = "error";
-
-                    deferred.reject(err);
-                });
-
-                return deferred.promise;
-            }
-
-        }
-
-        function init(contentType) {
-
-            // convert legacy icons
-            convertLegacyIcons(contentType);
-
-            //set a shared state
-            editorState.set(contentType);
-
-            vm.contentType = contentType;
-
-            memberTypeIcon = contentType.icon;
-        }
-
-        function convertLegacyIcons(contentType) {
-
-            // make array to store contentType icon
-            var contentTypeArray = [];
-
-            // push icon to array
-            contentTypeArray.push({ "icon": contentType.icon });
-
-            // run through icon method
-            iconHelper.formatContentTypeIcons(contentTypeArray);
-
-            // set icon back on contentType
-            contentType.icon = contentTypeArray[0].icon;
-        }
-
-        /** Syncs the content type  to it's tree node - this occurs on first load and after saving */
-        function syncTreeNode(dt, path, initialLoad) {
-            navigationService.syncTree({ tree: "memberTypes", path: path.split(","), forceReload: initialLoad !== true }).then(function (syncArgs) {
-                vm.currentNode = syncArgs.node;
-            });
-        }
-
-        function close() {
-            if (infiniteMode && $scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        evts.push(eventsService.on("app.refreshEditor", function (name, error) {
-            loadMemberType();
-        }));
-
-        evts.push(eventsService.on("editors.groupsBuilder.changed", function(name, args) {
-            angularHelper.getCurrentForm($scope).$setDirty();
-        }));
-
-        //ensure to unregister from all events!
-        $scope.$on('$destroy', function () {
-            for (var e in evts) {
-                eventsService.unsubscribe(evts[e]);
-            }
-        });
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.MemberTypes.EditController", MemberTypesEditController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.html
deleted file mode 100644
index c4c521c857..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<div data-element="editor-member-types" ng-controller="Umbraco.Editors.MemberTypes.EditController as vm">
-
-    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
-
-    <form novalidate name="contentTypeForm" val-form-manager>
-
-        <umb-editor-view ng-if="!vm.page.loading">
-
-            <umb-editor-header
-                name="vm.contentType.name"
-                alias="vm.contentType.alias"
-                description="vm.contentType.description"
-                navigation="vm.page.navigation"
-                icon="vm.contentType.icon"
-                editorfor="vm.header.editorfor"
-                setpagetitle="vm.header.setPageTitle">
-            </umb-editor-header>
-
-            <umb-editor-container class="editors-document-type-container">
-
-                <div class="editors-document-type-canvas">
-                    <umb-editor-sub-views
-                        ng-if="!vm.page.loading"
-                        sub-views="vm.page.navigation"
-                        model="vm.contentType">
-                    </umb-editor-sub-views>
-                </div>
-
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-left>
-
-                    <umb-keyboard-shortcuts-overview
-                        model="vm.page.keyboardShortcutsOverview">
-                    </umb-keyboard-shortcuts-overview>
-
-                </umb-editor-footer-content-left>
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button ng-if="model.infiniteMode"
-                        type="button"
-                        button-style="link"
-                        label-key="general_close"
-                        shortcut="esc"
-                        action="vm.close()">
-                    </umb-button>
-
-                    <umb-button
-                        ng-if="!vm.page.modelsBuilder"
-                        type="button"
-                        action="vm.save()"
-                        state="vm.page.saveButtonState"
-                        button-style="success"
-                        shortcut="ctrl+s"
-                        label-key="{{vm.saveButtonKey}}">
-                    </umb-button>
-
-                    <umb-button-group
-                        ng-if="vm.page.modelsBuilder"
-                        button-style="success"
-                        default-button="vm.page.defaultButton"
-                        sub-buttons="vm.page.subButtons"
-                        state="vm.page.saveButtonState"
-                        direction="up"
-                        float="right">
-                    </umb-button-group>
-
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-
-        </umb-editor-view>
-
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/move.controller.js b/src/Umbraco.Web.UI.Client/src/views/memberTypes/move.controller.js
deleted file mode 100644
index fe7288f4e2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/move.controller.js
+++ /dev/null
@@ -1,5 +0,0 @@
-angular.module("umbraco")
-.controller("Umbraco.Editors.MemberTypes.MoveController",
-    function($scope){
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/move.html b/src/Umbraco.Web.UI.Client/src/views/memberTypes/move.html
deleted file mode 100644
index 0eeadfab80..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/move.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.MemberTypes.MoveController">
-
-    <div class="umb-dialog-body">
-
-        <p class="umb-abstract">
-        	<localize key="contentTypeEditor_folderToMove">Select the folder to move</localize> {{currentNode.name}} <localize key="general_to">to</localize>.
-        </p>
-
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/views/design/design.html b/src/Umbraco.Web.UI.Client/src/views/memberTypes/views/design/design.html
deleted file mode 100644
index f9350023dd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/views/design/design.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<umb-groups-builder
-    model="model"
-    content-type="memberType">
-</umb-groups-builder>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
deleted file mode 100644
index 808d71daa2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
+++ /dev/null
@@ -1,439 +0,0 @@
-(function () {
-  "use strict";
-
-  function EditController($scope, $location, $routeParams, umbRequestHelper, entityResource, packageResource, editorService, formHelper, localizationService) {
-
-    const vm = this;
-
-    const packageId = $routeParams.id;
-    const create = $routeParams.create;
-
-    vm.showBackButton = true;
-
-    // open all expansion panels
-    vm.loading = true;
-    vm.mediaNodeDisplayModels = [];
-    vm.back = back;
-    vm.createOrUpdatePackage = createOrUpdatePackage;
-    vm.removeContentItem = removeContentItem;
-    vm.openContentPicker = openContentPicker;
-    vm.openViewPicker = openViewPicker;
-    vm.removePackageView = removePackageView;
-    vm.downloadFile = downloadFile;
-
-    vm.selectDocumentType = selectDocumentType;
-    vm.selectMediaType = selectMediaType;
-    vm.selectTemplate = selectTemplate;
-    vm.selectStyleSheet = selectStyleSheet;
-    vm.selectScript = selectScript;
-    vm.selectPartialView = selectPartialView;
-    vm.selectMacro = selectMacro;
-    vm.selectLanguage = selectLanguage;
-    vm.selectDictionaryItem = selectDictionaryItem;
-    vm.selectDataType = selectDataType;
-
-    vm.mediaPickerModel = {
-      hideLabel: true,
-      view: "mediapicker",
-      value: "",
-      config: {
-        multiPicker: true,
-        allowEdit: false
-      }
-    }
-    vm.labels = {};
-
-    vm.versionRegex = /^(\d+\.)(\d+\.)(\*|\d+)$/;
-
-    vm.aceOption = {
-      mode: "xml",
-      theme: "chrome",
-      showPrintMargin: false,
-      advanced: {
-        fontSize: '14px',
-        enableSnippets: true,
-        enableBasicAutocompletion: true,
-        enableLiveAutocompletion: false
-      },
-      onLoad: function (_editor) {
-        vm.editor = _editor;
-
-        vm.editor.setValue(vm.package.actions);
-      }
-    };
-
-    function onInit() {
-
-      if (create) {
-        // Pre populate package with some values
-        packageResource.getEmpty().then(scaffold => {
-          vm.package = scaffold;
-
-          loadResources();
-
-          vm.loading = false;
-        });
-
-        localizationService.localizeMany(["general_create", "packager_includeAllChildNodes"]).then(function (values) {
-          vm.labels.button = values[0];
-          vm.labels.includeAllChildNodes = values[1];
-        });
-      } else {
-        // Load package
-        packageResource.getCreatedById(packageId).then(createdPackage => {
-          vm.package = createdPackage;
-
-          loadResources();
-
-          vm.loading = false;
-
-          // Get render model for content node
-          if (vm.package.contentNodeId) {
-            entityResource.getById(vm.package.contentNodeId, "Document")
-              .then((entity) => {
-                vm.contentNodeDisplayModel = entity;
-              });
-          }
-
-          vm.mediaPickerModel.value = vm.package.mediaUdis.join(',');
-        });
-
-
-        localizationService.localizeMany(["buttons_save", "packager_includeAllChildNodes"]).then(function (values) {
-          vm.labels.button = values[0];
-          vm.labels.includeAllChildNodes = values[1];
-        });
-      }
-    }
-
-    function loadResources() {
-
-      // Get all document types
-      entityResource.getAll("DocumentType").then(documentTypes => {
-        // a package stores the id as a string so we
-        // need to convert all ids to string for comparison
-        documentTypes.forEach(documentType => {
-          documentType.id = documentType.id.toString();
-          documentType.selected = vm.package.documentTypes.indexOf(documentType.id) !== -1;
-        });
-        vm.documentTypes = documentTypes;
-      });
-
-      // Get all media types
-      entityResource.getAll("MediaType").then(mediaTypes => {
-        // a package stores the id as a string so we
-        // need to convert all ids to string for comparison
-        mediaTypes.forEach(mediaType => {
-          mediaType.id = mediaType.id.toString();
-          mediaType.selected = vm.package.mediaTypes.indexOf(mediaType.id) !== -1;
-        });
-        vm.mediaTypes = mediaTypes;
-      });
-
-      // Get all templates
-      entityResource.getAll("Template").then(templates => {
-        // a package stores the id as a string so we
-        // need to convert all ids to string for comparison
-        templates.forEach(template => {
-          template.id = template.id.toString();
-          template.selected = vm.package.templates.indexOf(template.id) >= 0;
-        });
-        vm.templates = templates;
-      });
-
-      // Get all stylesheets
-      entityResource.getAll("Stylesheet").then(stylesheets => {
-        stylesheets.forEach(stylesheet => {
-          stylesheet.selected = vm.package.stylesheets.indexOf(stylesheet.path) >= 0;
-        });
-        vm.stylesheets = stylesheets;
-      });
-
-      // Get all scripts
-      entityResource.getAll("Script").then(scripts => {
-        scripts.forEach(script => {
-          script.selected = vm.package.scripts.indexOf(script.path) >= 0;
-        });
-        vm.scripts = scripts;
-      });
-
-      // Get all partial views
-      entityResource.getAll("PartialView").then(partialViews => {
-        partialViews.forEach(view => {
-          view.selected = vm.package.partialViews.indexOf(view.path) >= 0;
-        });
-        vm.partialViews = partialViews;
-      });
-
-      // Get all macros
-      entityResource.getAll("Macro").then(macros => {
-        // a package stores the id as a string so we
-        // need to convert all ids to string for comparison
-        macros.forEach(macro => {
-          macro.id = macro.id.toString();
-          macro.selected = vm.package.macros.indexOf(macro.id) !== -1;
-        });
-        vm.macros = macros;
-      });
-
-      // Get all languages
-      entityResource.getAll("Language").then(languages => {
-        // a package stores the id as a string so we
-        // need to convert all ids to string for comparison
-        languages.forEach(language => {
-          language.id = language.id.toString();
-          language.selected = vm.package.languages.indexOf(language.id) !== -1;
-        });
-        vm.languages = languages;
-      });
-
-      // Get all dictionary items
-      entityResource.getAll("DictionaryItem").then(dictionaryItems => {
-        // a package stores the id as a string so we
-        // need to convert all ids to string for comparison
-        dictionaryItems.forEach(dictionaryItem => {
-          dictionaryItem.id = dictionaryItem.id.toString();
-          dictionaryItem.selected = vm.package.dictionaryItems.indexOf(dictionaryItem.id) !== -1;
-        });
-        vm.dictionaryItems = dictionaryItems;
-      });
-
-      // Get all data types
-      entityResource.getAll("DataType").then(dataTypes => {
-        // a package stores the id as a string so we
-        // need to convert all ids to string for comparison
-        dataTypes.forEach(dataType => {
-          dataType.id = dataType.id.toString();
-          dataType.selected = vm.package.dataTypes.indexOf(dataType.id) !== -1;
-        });
-        vm.dataTypes = dataTypes;
-      });
-
-    }
-
-    function downloadFile(id) {
-      var url = umbRequestHelper.getApiUrl(
-        "packageApiBaseUrl",
-        "DownloadCreatedPackage",
-        { id: id });
-
-      umbRequestHelper.downloadFile(url).then(function () {
-
-      });
-    }
-
-    function back() {
-      $location.path("packages/packages/created").search("create", null).search("packageId", null);
-    }
-
-    function createOrUpdatePackage(editPackageForm) {
-
-      // Split by comma and remove empty entries
-      vm.package.mediaUdis = vm.mediaPickerModel.value.split(",").filter(i => i);
-      if (formHelper.submitForm({ formCtrl: editPackageForm, scope: $scope })) {
-
-        vm.buttonState = "busy";
-
-        packageResource.savePackage(vm.package).then((updatedPackage) => {
-
-          vm.package = updatedPackage;
-          vm.buttonState = "success";
-
-          formHelper.resetForm({ scope: $scope, formCtrl: editPackageForm });
-
-          if (create) {
-            //if we are creating, then redirect to the correct url and reload
-            $location.path("packages/packages/edit/" + vm.package.id).search("create", null);
-            //don't add a browser history for this
-            $location.replace();
-          }
-
-        }, function (err) {
-          formHelper.resetForm({ scope: $scope, formCtrl: editPackageForm, hasErrors: true });
-          formHelper.handleError(err);
-          vm.buttonState = "error";
-        });
-      }
-    }
-
-    function removeContentItem() {
-      vm.package.contentNodeId = null;
-    }
-
-    function openContentPicker() {
-      const contentPicker = {
-        submit: function (model) {
-          if (model.selection && model.selection.length > 0) {
-            vm.package.contentNodeId = model.selection[0].id.toString();
-            vm.contentNodeDisplayModel = model.selection[0];
-          }
-          editorService.close();
-        },
-        close: function () {
-          editorService.close();
-        }
-      };
-      editorService.contentPicker(contentPicker);
-    }
-
-    function openViewPicker() {
-        
-        const controlPicker = {
-          title: "Select view",
-          onlyInitialized: false,
-          filter: i => {
-            if (i.name.indexOf(".html") === -1 && i.name.indexOf(".htm") === -1) {
-              return true;
-            }
-          },
-          filterCssClass: "not-allowed",
-          select: node => {
-              const id = decodeURIComponent(node.id.replace(/\+/g, " "));
-              vm.package.packageView = id;
-              editorService.close();
-          },
-          close: () => editorService.close()
-        };
-
-        editorService.filePicker(controlPicker);
-    }
-
-    function removePackageView() {
-      vm.package.packageView = null;
-    }
-
-    function selectDocumentType(doctype) {
-
-      // Check if the document type is already selected.
-      var index = vm.package.documentTypes.indexOf(doctype.id);
-
-      if (index === -1) {
-        vm.package.documentTypes.push(doctype.id);
-      } else {
-        vm.package.documentTypes.splice(index, 1);
-      }
-    }
-
-    function selectMediaType(mediatype) {
-
-      // Check if the document type is already selected.
-      var index = vm.package.mediaTypes.indexOf(mediatype.id);
-
-      if (index === -1) {
-        vm.package.mediaTypes.push(mediatype.id);
-      } else {
-        vm.package.mediaTypes.splice(index, 1);
-      }
-    }
-
-    function selectTemplate(template) {
-
-      // Check if the template is already selected.
-      var index = vm.package.templates.indexOf(template.id);
-
-      if (index === -1) {
-        vm.package.templates.push(template.id);
-      } else {
-        vm.package.templates.splice(index, 1);
-      }
-    }
-
-    function selectStyleSheet(stylesheet) {
-
-      // Check if the style sheet is already selected.
-      var index = vm.package.stylesheets.indexOf(stylesheet.path);
-
-      if (index === -1) {
-        vm.package.stylesheets.push(stylesheet.path);
-      } else {
-        vm.package.stylesheets.splice(index, 1);
-      }
-    }
-
-    function selectScript(script) {
-
-      // Check if the script is already selected.
-      var index = vm.package.scripts.indexOf(script.path);
-
-      if (index === -1) {
-        vm.package.scripts.push(script.path);
-      } else {
-        vm.package.scripts.splice(index, 1);
-      }
-    }
-
-    function selectPartialView(view) {
-
-      // Check if the view is already selected.
-      var index = vm.package.partialViews.indexOf(view.path);
-
-      if (index === -1) {
-        vm.package.partialViews.push(view.path);
-      } else {
-        vm.package.partialViews.splice(index, 1);
-      }
-    }
-
-    function selectMacro(macro) {
-
-      // Check if the macro is already selected.
-      var index = vm.package.macros.indexOf(macro.id);
-
-      if (index === -1) {
-        vm.package.macros.push(macro.id);
-      } else {
-        vm.package.macros.splice(index, 1);
-      }
-    }
-
-    function selectLanguage(language) {
-
-      // Check if the language is already selected.
-      var index = vm.package.languages.indexOf(language.id);
-
-      if (index === -1) {
-        vm.package.languages.push(language.id);
-      } else {
-        vm.package.languages.splice(index, 1);
-      }
-    }
-
-    function selectDictionaryItem(dictionaryItem) {
-
-      // Check if the dictionary item is already selected.
-      var index = vm.package.dictionaryItems.indexOf(dictionaryItem.id);
-
-      if (index === -1) {
-        vm.package.dictionaryItems.push(dictionaryItem.id);
-      } else {
-        vm.package.dictionaryItems.splice(index, 1);
-      }
-    }
-
-    function selectDataType(dataType) {
-
-      // Check if the dictionary item is already selected.
-      var index = vm.package.dataTypes.indexOf(dataType.id);
-
-      if (index === -1) {
-        vm.package.dataTypes.push(dataType.id);
-      } else {
-        vm.package.dataTypes.splice(index, 1);
-      }
-    }
-
-    function getVals(array) {
-      var vals = [];
-      for (var i = 0; i < array.length; i++) {
-        vals.push({ value: array[i] });
-      }
-      return vals;
-    }
-
-    onInit();
-
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Packages.EditController", EditController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
deleted file mode 100644
index 578117a469..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<div data-element="editor-packages" ng-controller="Umbraco.Editors.Packages.EditController as vm">
-
-  <form name="editPackageForm" no-validate val-form-manager>
-
-    <umb-editor-view>
-
-      <umb-editor-header name="vm.package.name"
-                         on-back="vm.back()"
-                         show-back-button="vm.showBackButton"
-                         hide-icon="true"
-                         hide-description="true"
-                         hide-alias="true">
-      </umb-editor-header>
-
-      <umb-editor-container class="form-horizontal">
-
-        <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-        <div class="umb-expansion-panel">
-
-          <div class="umb-expansion-panel__header">
-            <span><localize key="packager_packageContent">Package Content</localize></span>
-          </div>
-
-          <div class="umb-expansion-panel__content">
-
-            <umb-control-group label="@general_content">
-
-              <umb-node-preview ng-if="vm.package.contentNodeId"
-                                icon="vm.contentNodeDisplayModel.icon"
-                                name="vm.contentNodeDisplayModel.name"
-                                allow-edit="true"
-                                allow-remove="true"
-                                on-edit="vm.openContentPicker()"
-                                on-remove="vm.removeContentItem()">
-              </umb-node-preview>
-
-              <button type="button"
-                      ng-if="!vm.package.contentNodeId"
-                      style="margin-bottom: 10px;"
-                      class="umb-node-preview-add"
-                      ng-click="vm.openContentPicker()">
-                <localize key="general_add">Add</localize>
-              </button>
-
-              <umb-checkbox model="vm.package.contentLoadChildNodes"
-                            disabled="!vm.package.contentNodeId"
-                            text="{{vm.labels.includeAllChildNodes}}">
-              </umb-checkbox>
-
-            </umb-control-group>
-
-
-
-            <umb-control-group label="@general_media">
-
-
-
-              <umb-property property="vm.mediaPickerModel" ng-if="vm.loading === false">
-                <umb-property-editor model="vm.mediaPickerModel" is-pre-value="true"></umb-property-editor>
-              </umb-property>
-
-              <umb-checkbox model="vm.package.mediaLoadChildNodes"
-                            disabled="vm.mediaPickerModel.value.length === 0"
-                            text="{{vm.labels.includeAllChildNodes}}">
-              </umb-checkbox>
-            </umb-control-group>
-
-            <umb-control-group label="@treeHeaders_documentTypes">
-              <div ng-repeat="doctype in ::vm.documentTypes | orderBy:'name'">
-                <umb-checkbox model="doctype.selected"
-                              on-change="vm.selectDocumentType(doctype)"
-                              text="{{doctype.name}}">
-                </umb-checkbox>
-              </div>
-            </umb-control-group>
-
-            <umb-control-group label="@treeHeaders_mediaTypes">
-              <div ng-repeat="mediatype in ::vm.mediaTypes | orderBy:'name'">
-                <umb-checkbox model="mediatype.selected"
-                              on-change="vm.selectMediaType(mediatype)"
-                              text="{{mediatype.name}}">
-                </umb-checkbox>
-              </div>
-            </umb-control-group>
-
-            <umb-control-group label="@treeHeaders_macros">
-              <div ng-repeat="macro in ::vm.macros | orderBy:'name'">
-                <umb-checkbox model="macro.selected"
-                              on-change="vm.selectMacro(macro)"
-                              text="{{macro.name}}">
-                </umb-checkbox>
-              </div>
-            </umb-control-group>
-
-            <umb-control-group label="@treeHeaders_languages">
-              <div ng-repeat="language in ::vm.languages | orderBy:'name'">
-                <umb-checkbox model="language.selected"
-                              on-change="vm.selectLanguage(language)"
-                              text="{{language.name}}">
-                </umb-checkbox>
-              </div>
-            </umb-control-group>
-
-            <umb-control-group label="@treeHeaders_dictionary">
-              <div ng-repeat="dictionaryItem in ::vm.dictionaryItems | orderBy:'name'">
-                <umb-checkbox model="dictionaryItem.selected"
-                              on-change="vm.selectDictionaryItem(dictionaryItem)"
-                              text="{{dictionaryItem.name}}">
-                </umb-checkbox>
-              </div>
-            </umb-control-group>
-
-            <umb-control-group label="@treeHeaders_dataTypes">
-              <div ng-repeat="dataType in ::vm.dataTypes | orderBy:'name'">
-                <umb-checkbox model="dataType.selected"
-                              on-change="vm.selectDataType(dataType)"
-                              text="{{dataType.name}}">
-                </umb-checkbox>
-              </div>
-            </umb-control-group>
-
-            <umb-control-group label="@treeHeaders_templates">
-              <div ng-repeat="template in ::vm.templates | orderBy:'name'">
-                <umb-checkbox model="template.selected"
-                              on-change="vm.selectTemplate(template)"
-                              text="{{template.name}}">
-                </umb-checkbox>
-              </div>
-            </umb-control-group>
-
-            <umb-control-group label="@treeHeaders_stylesheets">
-              <div ng-repeat="stylesheet in ::vm.stylesheets | orderBy:'path'">
-                <umb-checkbox model="stylesheet.selected"
-                              on-change="vm.selectStyleSheet(stylesheet)"
-                              text="{{stylesheet.path}}">
-                </umb-checkbox>
-              </div>
-            </umb-control-group>
-
-            <umb-control-group label="@treeHeaders_scripts">
-              <div ng-repeat="script in ::vm.scripts | orderBy:'path'">
-                <umb-checkbox model="script.selected"
-                              on-change="vm.selectScript(script)"
-                              text="{{script.path}}">
-                </umb-checkbox>
-              </div>
-            </umb-control-group>
-
-            <umb-control-group label="@treeHeaders_partialViews">
-              <div ng-repeat="partialView in ::vm.partialViews | orderBy:'path'">
-                <umb-checkbox model="partialView.selected"
-                              on-change="vm.selectPartialView(partialView)"
-                              text="{{partialView.path}}">
-                </umb-checkbox>
-              </div>
-            </umb-control-group>
-
-          </div>
-
-        </div>
-
-      </umb-editor-container>
-
-      <umb-editor-footer>
-
-        <umb-editor-footer-content-right>
-
-          <umb-button ng-if="vm.package.packagePath"
-                      type="button"
-                      action="vm.downloadFile(vm.package.id)"
-                      disabled="vm.loading || vm.buttonState=='busy'"
-                      button-style="info"
-                      label-key="general_download">
-          </umb-button>
-
-          <umb-button type="button"
-                      action="vm.createOrUpdatePackage(editPackageForm)"
-                      state="vm.buttonState"
-                      button-style="success"
-                      label="{{vm.labels.button}}"
-                      disabled="vm.loading">
-          </umb-button>
-
-        </umb-editor-footer-content-right>
-
-      </umb-editor-footer>
-
-    </umb-editor-view>
-
-  </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/options.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/options.controller.js
deleted file mode 100644
index b99ea7a979..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/options.controller.js
+++ /dev/null
@@ -1,47 +0,0 @@
-(function () {
-  "use strict";
-
-  function OptionsController($scope, $location, $routeParams, packageResource, umbRequestHelper) {
-
-    const vm = this;
-
-    vm.showBackButton = true;
-    vm.loading = true;
-    vm.back = back; 
-
-    const packageId = $routeParams.id;
-
-    function onInit() {
-
-      packageResource.getInstalledByName(packageId).then(pck => {
-        vm.package = pck;
-
-        //set the $scope too, packages can then access this if they wanted from their own scope or parent scope
-        $scope.package = pck;
-
-        vm.loading = false;
-
-        //make sure the packageView is formatted as a virtual path
-        pck.packageView = pck.packageView.startsWith("~/")
-          ? pck.packageView
-          : pck.packageView.startsWith("/")
-            ? "~" + pck.packageView
-            : "~/" + pck.packageView;
-
-        pck.packageView = umbRequestHelper.convertVirtualToAbsolutePath(pck.packageView);
-
-      });
-    }
-
-    function back() {
-      $location.path("packages/packages/installed").search("packageId", null);
-    }
-
-
-    onInit();
-
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Packages.OptionsController", OptionsController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/options.html b/src/Umbraco.Web.UI.Client/src/views/packages/options.html
deleted file mode 100644
index f34ac77ac2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/options.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<div data-element="editor-packages" ng-controller="Umbraco.Editors.Packages.OptionsController as vm">
-
-    <form name="editPackageForm" no-validate val-form-manager>
-
-        <umb-editor-view>
-
-            <umb-editor-header
-                name="vm.package.name"
-                name-locked="true"
-                on-back="vm.back()"
-                show-back-button="vm.showBackButton"
-                hide-icon="true"
-                hide-description="true"
-                hide-alias="true">
-            </umb-editor-header>
-
-            <umb-editor-container class="form-horizontal">
-
-                <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-                <p ng-if="!vm.package.packageView">
-                    <localize key="packager_noConfigurationView">This package has no configuration view</localize>
-                </p>
-
-                <div ng-if="vm.package.packageView"
-                     ng-include="vm.package.packageView"></div>
-
-            </umb-editor-container>
-
-            <!--A footer is nice but the developer can't interact with it, hrmmm-->
-            <!--<umb-editor-footer>
-                <umb-editor-footer-content-right>
-                </umb-editor-footer-content-right>
-            </umb-editor-footer>-->
-
-        </umb-editor-view>
-
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/overlays/delete.html b/src/Umbraco.Web.UI.Client/src/views/packages/overlays/delete.html
deleted file mode 100644
index d5a7035904..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/overlays/delete.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-    <div ng-if="model.package" class="umb-alert umb-alert--warning mb2">
-        <localize key="packager_deletewarning">This will delete the language</localize> <strong>{{model.package.name}}</strong> [version: {{model.package.version}}].
-    </div>
-
-    <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>?
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js
deleted file mode 100644
index 406795fcd7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js
+++ /dev/null
@@ -1,99 +0,0 @@
-(function () {
-  "use strict";
-
-  function PackagesOverviewController($location, $routeParams, localizationService, localStorageService) {
-
-    //Hack!
-    // if there is a local storage value for packageInstallData then we need to redirect there,
-    // the issue is that we still have webforms and we cannot go to a hash location and then window.reload
-    // because it will double load it.
-    // we will refresh and then navigate there.
-
-    let packageInstallData = localStorageService.get("packageInstallData");
-    let packageUri = $routeParams.method;
-
-    if (packageInstallData) {
-      localStorageService.remove("packageInstallData");
-
-      if (packageInstallData.postInstallationPath) {
-        //navigate to the custom installer screen if set
-        $location.path(packageInstallData.postInstallationPath).search("packageId", packageInstallData.id);
-        return;
-      }
-
-      //if it is "installed" then set the uri/path to that
-      if (packageInstallData === "installed") {
-        packageUri = "installed";
-      }
-    }
-
-    var vm = this;
-    vm.page = {};
-    vm.page.labels = {};
-    vm.page.name = "";
-    vm.page.navigation = [];
-
-    onInit();
-
-    function onInit() {
-
-      loadNavigation();
-
-      setPageName();
-    }
-
-    function loadNavigation() {
-
-      var labels = ["sections_marketplace", "packager_installed", "packager_installLocal", "packager_created"];
-
-      localizationService.localizeMany(labels).then(function (data) {
-        vm.page.labels.marketplace = data[0];
-        vm.page.labels.installed = data[1];
-        vm.page.labels.install = data[2];
-        vm.page.labels.created = data[3];
-
-        vm.page.navigation = [
-          {
-            "name": vm.page.labels.marketplace,
-            "icon": "icon-cloud",
-            "view": "views/packages/views/marketplace.html",
-            "active": !packageUri || packageUri === "repo",
-            "alias": "umbMarketplace",
-            "action": function () {
-              $location.path("/packages/packages/repo");
-            }
-          },
-          {
-            "name": vm.page.labels.installed,
-            "icon": "icon-box",
-            "view": "views/packages/views/installed.html",
-            "active": packageUri === "installed",
-            "alias": "umbInstalled",
-            "action": function () {
-              $location.path("/packages/packages/installed");
-            }
-          },
-          {
-            "name": vm.page.labels.created,
-            "icon": "icon-files",
-            "view": "views/packages/views/created.html",
-            "active": packageUri === "created",
-            "alias": "umbCreatedPackages",
-            "action": function () {
-              $location.path("/packages/packages/created");
-            }
-          }
-        ];
-      });
-    }
-
-    function setPageName() {
-      localizationService.localize("sections_packages").then(function (data) {
-        vm.page.name = data;
-      })
-    }
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Packages.OverviewController", PackagesOverviewController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/overview.html b/src/Umbraco.Web.UI.Client/src/views/packages/overview.html
deleted file mode 100644
index 84f594b48d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/overview.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div data-element="editor-packages" ng-controller="Umbraco.Editors.Packages.OverviewController as vm" class="clearfix">
-
-    <umb-editor-view footer="false">
-
-        <umb-editor-header
-            name="vm.page.name"
-            name-locked="true"
-            hide-icon="true"
-            hide-description="true"
-            navigation="vm.page.navigation"
-            hide-alias="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-
-            <umb-editor-sub-views
-                sub-views="vm.page.navigation" model="vm.page">
-            </umb-editor-sub-views>
-
-        </umb-editor-container>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/views/created.controller.js
deleted file mode 100644
index 503d85fe8d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.controller.js
+++ /dev/null
@@ -1,79 +0,0 @@
-(function () {
-    "use strict";
-
-    function CreatedController($timeout, $location, packageResource, localizationService, overlayService) {
-
-        const vm = this;
-
-        vm.deleteCreatedPackage = deleteCreatedPackage;
-        vm.goToPackage = goToPackage;
-        vm.createPackage = createPackage;
-
-        function onInit() {
-
-            vm.createdPackages = [];
-
-            packageResource.getAllCreated().then(createdPackages => {
-                vm.createdPackages = createdPackages;
-            }, Utilities.noop);
-
-        }
-
-        function deleteCreatedPackage(event, index, createdPackage) {
-
-            event.stopPropagation();
-            event.preventDefault();
-
-            const dialog = {
-                view: "views/packages/overlays/delete.html",
-                package: createdPackage,
-                submitButtonLabelKey: "contentTypeEditor_yesDelete",
-                submitButtonStyle:"danger",
-                submit: function (model) {
-                    performDelete(index, createdPackage);
-                    overlayService.close();
-                },
-                close: function () {
-                    overlayService.close();
-                }
-            };
-
-            const keys = [
-                "general_delete",
-                "defaultdialogs_confirmdelete"
-            ];
-    
-            localizationService.localizeMany(keys).then(values => {
-                dialog.title = values[0];
-                dialog.content = values[1];
-                overlayService.open(dialog);
-            });
-
-        }
-
-        function performDelete(index, createdPackage) {        
-            createdPackage.deleteButtonState = "busy";
-
-            packageResource.deleteCreatedPackage(createdPackage.id).then(function () {
-                vm.createdPackages.splice(index, 1);
-            }, function (err) {
-                createdPackage.deleteButtonState = "error";
-            });
-        }
-
-        function goToPackage(createdPackage) {
-            $location.path("packages/packages/edit/" + createdPackage.id);
-        }
-
-        function createPackage() {
-            $location.search('create', null);
-            $location.path("packages/packages/edit/-1").search("create", "true");
-        }
-
-        onInit();
-        
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Packages.CreatedController", CreatedController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
deleted file mode 100644
index c9a5a70148..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<div ng-controller="Umbraco.Editors.Packages.CreatedController as vm">
-
-    <umb-editor-sub-header>
-
-        <umb-editor-sub-header-content-left>
-            <umb-button
-                button-style="action"
-                type="button"
-                action="vm.createPackage()"
-                label="Create package"
-                label-key="packager_createPackage">
-            </umb-button>
-        </umb-editor-sub-header-content-left>
-
-    </umb-editor-sub-header>
-
-    <table class="table table-hover">
-        <tbody>
-            <tr ng-repeat="createdPackage in vm.createdPackages track by createdPackage.id" style="cursor: pointer;" ng-click="vm.goToPackage(createdPackage)">
-                <td class="flex items-center">
-                    <div class="umb-package-list__item-icon">
-                        <umb-icon ng-if="!createdPackage.iconUrl" icon="icon-box"></umb-icon>
-                        <img ng-if="createdPackage.iconUrl" ng-src="{{createdPackage.iconUrl}}" alt="" />
-                    </div>
-                    <div class="umb-package-list__item-content">
-                        <div class="umb-package-list__item-name">{{ createdPackage.name }}</div>                        
-                    </div>
-                </td>
-                <td style="text-align: right;">
-                    <umb-button
-                        type="button"
-                        button-style="danger"
-                        state="createdPackage.deleteButtonState"
-                        label-key="general_delete"
-                        action="vm.deleteCreatedPackage($event, $index, createdPackage)">
-                    </umb-button>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-
-    <umb-empty-state
-        ng-if="vm.createdPackages.length === 0"
-        position="center">
-        <localize key="packager_noPackagesCreated">No packages have been created yet</localize>
-    </umb-empty-state>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.controller.js
deleted file mode 100644
index 5996ae105c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.controller.js
+++ /dev/null
@@ -1,212 +0,0 @@
-(function () {
-    "use strict";
-
-    function PackagesInstallLocalController($scope, Upload, umbRequestHelper, packageResource, localStorageService, $timeout, $window, localizationService, $q) {
-
-        var vm = this;
-        vm.state = "upload";
-
-        vm.localPackage = {};
-        vm.installPackage = installPackage;
-        vm.installState = {
-            status: "",
-            progress: 0
-        };
-        vm.installCompleted = false;
-        vm.zipFile = {
-            uploadStatus: "idle",
-            uploadProgress: 0,
-            serverErrorMessage: null
-        };
-
-        $scope.handleFiles = function (files, event, invalidFiles) {
-            if (files) {
-                for (var i = 0; i < files.length; i++) {
-                    upload(files[i]);
-                }
-            }
-        };
-
-        var labels = {};
-        var labelKeys = [
-            "packager_installStateImporting",
-            "packager_installStateInstalling",
-            "packager_installStateRestarting",
-            "packager_installStateComplete",
-            "packager_installStateCompleted"
-        ];
-
-        localizationService.localizeMany(labelKeys).then(function (values) {
-            labels.installStateImporting = values[0];
-            labels.installStateInstalling = values[1];
-            labels.installStateRestarting = values[2];
-            labels.installStateComplete = values[3];
-            labels.installStateCompleted = values[4];
-        });
-
-        function upload(file) {
-
-            Upload.upload({
-                url: umbRequestHelper.getApiUrl("packageInstallApiBaseUrl", "UploadLocalPackage"),
-                fields: {},
-                file: file
-            }).progress(function (evt) {
-
-                // hack: in some browsers the progress event is called after success
-                // this prevents the UI from going back to a uploading state
-                if (vm.zipFile.uploadStatus !== "done" && vm.zipFile.uploadStatus !== "error") {
-
-                    // set view state to uploading
-                    vm.state = 'uploading';
-
-                    // calculate progress in percentage
-                    var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10);
-
-                    // set percentage property on file
-                    vm.zipFile.uploadProgress = progressPercentage;
-
-                    // set uploading status on file
-                    vm.zipFile.uploadStatus = "uploading";
-
-                }
-
-            }).success(function (data, status, headers, config) {
-
-                if (data.notifications && data.notifications.length > 0) {
-
-                    // set error status on file
-                    vm.zipFile.uploadStatus = "error";
-
-                    // Throw message back to user with the cause of the error
-                    vm.zipFile.serverErrorMessage = data.notifications[0].message;
-
-                } else {
-
-                    // set done status on file
-                    vm.zipFile.uploadStatus = "done";
-                    loadPackage();
-                    vm.zipFile.uploadProgress = 100;
-                    vm.localPackage = data;
-                }
-
-            }).error(function (evt, status, headers, config) {
-
-                // set status done
-                vm.zipFile.uploadStatus = "error";
-
-                // If file not found, server will return a 404 and display this message
-                if (status === 404) {
-                    vm.zipFile.serverErrorMessage = "File not found";
-                }
-                else if (status == 400) {
-                    //it's a validation error
-                    vm.zipFile.serverErrorMessage = evt.message;
-                }
-                else {
-                    //it's an unhandled error
-                    //if the service returns a detailed error
-                    if (evt.InnerException) {
-                        vm.zipFile.serverErrorMessage = evt.InnerException.ExceptionMessage;
-
-                        //Check if its the common "too large file" exception
-                        if (evt.InnerException.StackTrace && evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0) {
-                            vm.zipFile.serverErrorMessage = "File too large to upload";
-                        }
-
-                    } else if (evt.Message) {
-                        vm.zipFile.serverErrorMessage = evt.Message;
-                    }
-                }
-            });
-        }
-
-        function loadPackage() {
-            if (vm.zipFile.uploadStatus === "done") {
-                vm.state = "packageDetails";
-            }
-        }
-
-        function installPackage() {
-
-            vm.installState.status = labels.installStateImporting;
-            vm.installState.progress = "0";
-
-            packageResource
-                .import(vm.localPackage)
-                .then(function (pack) {
-                    vm.installState.progress = "25";
-                    vm.installState.status = labels.installStateInstalling;
-                    return packageResource.installFiles(pack);
-                },
-                    installError)
-                .then(function (pack) {
-                    vm.installState.status = labels.installStateRestarting;
-                    vm.installState.progress = "50";
-                    var deferred = $q.defer();
-
-                    //check if the app domain is restarted ever 2 seconds
-                    var count = 0;
-
-                    function checkRestart() {
-                        $timeout(function () {
-                            packageResource.checkRestart(pack).then(function (d) {
-                                count++;
-                                //if there is an id it means it's not restarted yet but we'll limit it to only check 10 times
-                                if (d.isRestarting && count < 10) {
-                                    checkRestart();
-                                }
-                                else {
-                                    //it's restarted!
-                                    deferred.resolve(d);
-                                }
-                            },
-                                installError);
-                        },
-                            2000);
-                    }
-
-                    checkRestart();
-
-                    return deferred.promise;
-                },
-                    installError)
-                .then(function (pack) {
-                    vm.installState.status = labels.installStateInstalling;
-                    vm.installState.progress = "75";
-                    return packageResource.installData(pack);
-                },
-                    installError)
-                .then(function (pack) {
-                    vm.installState.status = labels.installStateComplete;
-                    vm.installState.progress = "100";
-                    return packageResource.cleanUp(pack);
-                },
-                    installError)
-                .then(function (result) {
-
-                    //Put the package data in local storage so we can use after reloading
-                    localStorageService.set("packageInstallData", result);
-
-                    vm.installState.status = labels.installStateCompleted;
-                    vm.installCompleted = true;
-
-
-                }, installError);
-        }
-
-        function installError() {
-            //This will return a rejection meaning that the promise change above will stop
-            return $q.reject();
-        }
-
-        vm.reloadPage = function () {
-            //reload on next digest (after cookie)
-            $timeout(function () {
-                $window.location.reload(true);
-            });
-        }
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Packages.InstallLocalController", PackagesInstallLocalController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
deleted file mode 100644
index 4d44af7d6e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<div ng-controller="Umbraco.Editors.Packages.InstallLocalController as vm">
-
-    <div class="umb-packages-view-wrapper" ng-if="vm.state === 'upload'">
-
-        <!-- Upload -->
-        <div class="flex items-center justify-center">
-            <ng-form novalidate name="localPackageForm" class="flex flex-column justify-center items-center tc">
-
-                <!-- Drag and drop files area -->
-                <div ngf-drop
-                     ng-hide="hideDropzone"
-                     ng-model="filesHolder"
-                     ngf-change="handleFiles($files, $event, $invalidFiles)"
-                     class="umb-upload-local__dropzone"
-                     ngf-drag-over-class="'drag-over'"
-                     ngf-multiple="false"
-                     ngf-allow-dir="false"
-                     ngf-max-size="{{maxFileSize}}"
-                     ngf-pattern="'.zip'"
-                     accept=".zip"
-                     ng-class="{ 'is-small': compact !== 'false' || (done.length + queue.length) > 0 }">
-
-                    <div class="content" draggable="false">
-
-                        <!-- Drag and drop illustration -->
-                        <umb-icon icon="icon-box"></umb-icon>
-                        <small class="faded">
-                            <strong><localize key="packager_dropHere">Drop to upload</localize></strong>
-                        </small>
-
-                        <!-- Select files -->
-                        <div class="umb-upload-local__select-file"
-                             ngf-select
-                             ng-model="filesHolder"
-                             ngf-change="handleFiles($files, $event, $invalidFiles)"
-                             ngf-multiple="true"
-                             ngf-max-size="{{maxFileSize}}"
-                             ngf-pattern="'.zip'"
-                             accept=".zip">
-                            - <localize key="packager_orClickHereToUpload">or click here to choose files</localize>
-                        </div>
-
-                    </div>
-
-                </div>
-
-                <h3><strong><localize key="packager_uploadPackage">Upload package</localize></strong></h3>
-                <p class="faded">
-                    <localize key="packager_localPackageDescription">Install a local package by selecting it from your machine. Only install packages from sources you know and trust</localize>.
-                </p>
-
-            </ng-form>
-        </div>
-    </div>
-
-    <div ng-if="vm.state === 'uploading'">
-
-        <umb-editor-sub-header>
-            <umb-editor-sub-header-content-left>
-                <button type="button" class="umb-package-details__back-action" ng-click="vm.state = 'upload'" prevent-default><span aria-hidden="true">&larr;</span> <localize key="packager_uploadAnother">Upload another package</localize></button>
-            </umb-editor-sub-header-content-left>
-        </umb-editor-sub-header>
-
-        <div class="umb-packages-view-wrapper">
-
-            <div class="flex items-center justify-center">
-                <div class="umb-info-local-items">
-                    <div class="umb-package-icon">
-                        <umb-icon icon="icon-box" ng-if="!vm.localPackage.iconUrl"></umb-icon>
-                    </div>
-                    <div class="umb-package-info">
-
-                        <h4 class="umb-info-local-item"><strong><localize key="packager_installStateUploading">Uploading package...</localize></strong></h4>
-
-                        <umb-progress-bar
-                            percentage="{{vm.zipFile.uploadProgress}}">
-                        </umb-progress-bar>
-
-                        <div class="umb-info-local-item text-error mt3" ng-if="vm.zipFile.uploadStatus === 'error'">
-                            {{ vm.zipFile.serverErrorMessage }}
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-
-        </div>
-
-    </div>
-
-    <div ng-if="vm.state === 'packageDetails'">
-
-        <umb-editor-sub-header>
-            <umb-editor-sub-header-content-left>
-                <button type="button" class="umb-package-details__back-action" ng-click="vm.state = 'upload'" prevent-default><span aria-hidden="true">&larr;</span> <localize key="packager_cancelAndUploadAnother">Cancel and upload another package</localize></button>
-            </umb-editor-sub-header-content-left>
-        </umb-editor-sub-header>
-
-        <div class="umb-packages-view-wrapper">
-
-            <!-- Package details -->
-            <div class="flex items-center justify-center">
-                <div class="umb-info-local-items">
-
-                    <form novalidate name="localPackageForm" class="w-100">
-                        <div class="umb-package-icon">
-                            <umb-icon ng-if="!vm.localPackage.iconUrl" icon="icon-box"></umb-icon>
-                            <img ng-if="vm.localPackage.iconUrl" ng-src="{{vm.localPackage.iconUrl}}" alt="" />
-                        </div>
-
-                        <div class="umb-package-info">
-                            <h4 class="umb-info-local-item"><strong>{{ vm.localPackage.name }}</strong></h4>
-
-                            <div class="umb-info-local-item">
-                                <strong><localize key="packager_packageAuthor">Author</localize></strong><br>
-                                <a href="{{ vm.localPackage.authorUrl }}" target="_blank" rel="noopener">{{ vm.localPackage.author }}</a>
-                            </div>
-
-                            <div class="umb-info-local-item" ng-if="vm.localPackage.contributors && vm.localPackage.contributors.length > 0">
-                                <strong><localize key="packager_packageContrib">Contributors</localize></strong><br>
-                                <span>{{ vm.localPackage.contributors.join(', ')}}</span>
-                            </div>
-
-                            <div class="umb-info-local-item">
-                                <strong><localize key="packager_packageVersion">Version</localize></strong><br>
-                                {{ vm.localPackage.version }}
-                                <p ng-if="vm.localPackage.originalVersion">
-                                    <small>
-                                        <em>
-                                            <localize key="packager_packageVersionUpgrade">Upgrading from version</localize>
-                                            {{ vm.localPackage.originalVersion }}
-                                        </em>
-                                    </small>
-                                </p>
-                            </div>
-
-                            <div class="umb-info-local-item">
-                                <strong><localize key="packager_packageLicense">License</localize></strong><br>
-                                <a href="{{ vm.localPackage.licenseUrl }}" target="_blank" rel="noopener">{{ vm.localPackage.license }}</a>
-                            </div>
-
-                            <div class="umb-info-local-item">
-                                <strong><localize key="packager_packageReadme">Read me</localize></strong><br>
-                                <small ng-bind-html="vm.localPackage.readme"></small>
-                            </div>
-
-                            <div class="umb-info-local-item mt4 flex items-center flex-column" ng-if="vm.installState.status == '' && vm.localPackage.isCompatible">
-
-                                <umb-checkbox model="vm.localPackage.packageLicenseAccept" required="true">
-                                    <strong class="label-text"><localize key="packager_accept">I accept</localize> <a href="#" ng-href="{{vm.localPackage.licenseUrl}}" target="_blank" rel="noopener"><localize key="packager_termsOfUse">terms of use</localize></a></strong>
-                                </umb-checkbox>
-
-                                <umb-button class="mt3"
-                                            type="button"
-                                            size="m"
-                                            button-style="success"
-                                            disabled="localPackageForm.$invalid"
-                                            action="vm.installPackage()"
-                                            label-key="packager_packageInstall">
-                                </umb-button>
-                            </div>
-
-                            <div class="umb-info-local-item">
-                                <umb-progress-bar ng-if="vm.installState.status !== ''"
-                                                  percentage="{{vm.installState.progress}}">
-                                </umb-progress-bar>
-                            </div>
-
-                            <div class="umb-info-local-item text-error" ng-if="!vm.localPackage.isCompatible">
-                                <localize key="packager_targetVersionMismatch">This package cannot be installed, it requires a minimum Umbraco version of</localize> {{vm.localPackage.umbracoVersion}}
-                            </div>
-                            <div class="umb-info-local-item text-info">
-                                <p>{{vm.installState.status}}</p>
-                            </div>
-
-                            <div class="umb-info-local-item text-info"
-                                 ng-show="vm.installCompleted">
-
-                                <button type="button"
-                                        class="btn btn-success flex-inline mt3"
-                                        ng-click="vm.reloadPage()">
-                                    <localize key="packager_installFinish">Finish</localize>
-                                </button>
-                            </div>
-
-                        </div>
-                    </form>
-
-                </div>
-            </div>
-        </div>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.controller.js
deleted file mode 100644
index ebae83b9a3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.controller.js
+++ /dev/null
@@ -1,66 +0,0 @@
-(function () {
-  "use strict";
-
-  function PackagesInstalledController($location, packageResource, localizationService) {
-
-    var vm = this;
-
-    vm.confirmMigrations = confirmMigrations;
-    vm.packageOptions = packageOptions;
-    vm.runMigrations = runMigrations;
-    vm.state = "list";
-    vm.installState = {
-      status: "",
-      state: ""
-    };
-    vm.package = {};
-
-    var labels = {};
-
-    function init() {
-      packageResource.getInstalled()
-        .then(function (packs) {
-          vm.installedPackages = packs;
-        });
-      
-      var labelKeys = [
-        "packager_packageMigrationsComplete"
-      ];
-
-      localizationService.localizeMany(labelKeys).then(function (values) {
-        labels.packageMigrationsComplete = values[0];
-      });
-    }
-
-    function packageOptions(pck) {
-      $location.path("packages/packages/options/" + pck.name)
-        .search("packageId", null); //ensure the installId flag is gone, it's only available on first install
-    }
-
-    function confirmMigrations(pck) {
-      vm.state = "runMigration";
-      vm.package = pck;
-      vm.installState.state = "";
-      vm.installState.status = "";
-    }
-
-    function runMigrations(pck) {
-      vm.installState.state = "running";
-      packageResource.runMigrations(pck.name)
-        .then(function (packs) {
-          vm.installState.state = "success";
-          vm.installState.status = labels.packageMigrationsComplete;
-          vm.installedPackages = packs;
-        }, function (err) {
-          vm.installState.state = "error";
-          vm.installState.status = err.data.message;
-        });
-    }
-
-    init();
-
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Packages.InstalledController", PackagesInstalledController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html
deleted file mode 100644
index ef420921fe..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<div ng-controller="Umbraco.Editors.Packages.InstalledController as vm">
-
-    <!-- Package list-->
-    <div class="umb-packages-view-wrapper" ng-if="vm.state == 'list'">
-
-        <div ng-if="vm.installedPackages.length > 0">
-
-            <div class="umb-packages-view-title"><localize key="packager_installedPackages">Installed packages</localize></div>
-
-            <table class="table">
-                <tbody>
-                    <tr ng-repeat="installedPackage in vm.installedPackages track by installedPackage.name">
-                        <td class="flex items-center">
-                            <div class="umb-package-list__item-icon"> 
-                                <umb-icon ng-if="!installedPackage.iconUrl" icon="icon-box" class="icon-box"></umb-icon>
-                                <img ng-if="installedPackage.iconUrl" ng-src="{{installedPackage.iconUrl}}" />
-                            </div>
-                            <div class="umb-package-list__item-content">
-                                <div class="umb-package-list__item-name">{{ installedPackage.name }}</div>
-                                <div class="umb-package-list__item-id" ng-if="installedPackage.id">{{ installedPackage.id }}</div>
-                                <div class="umb-package-list__item-description" ng-if="installedPackage.version">Version: {{ installedPackage.version }}</div>
-                                <div class="umb-package-list__item-description">
-                                    <localize ng-if="installedPackage.hasMigrations && !installedPackage.hasPendingMigrations"
-                                              key="packager_packageMigrationsNonePending">No pending migrations</localize>
-                                </div>
-                            </div>
-                          <!-- TODO: Show migrations up to date if they are -->
-                        </td>
-                        <td style="text-align: right;">
-                          <umb-button ng-show="installedPackage.hasPendingMigrations"
-                                      type="button"
-                                      button-style="warning"
-                                      size="xxs"
-                                      label-key="packager_packageMigrationsRun"
-                                      action="vm.confirmMigrations(installedPackage)">
-                          </umb-button>
-
-                          <umb-button ng-show="installedPackage.packageView"
-                                      type="button"
-                                      button-style="info"
-                                      size="xxs"
-                                      label-key="packager_packageOptions"
-                                      action="vm.packageOptions(installedPackage)">
-                          </umb-button>
-
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-
-        </div>
-
-        <umb-empty-state
-            ng-if="vm.installedPackages.length === 0"
-            position="center">
-            <h2><strong><localize key="packager_noPackages">No packages have been installed</localize>.</strong></h2>
-            <p class="faded"><localize key="packager_noPackagesDescription">Browse through the available packages using the <strong>'Packages'</strong> icon in the top right of your screen</localize>.</p>
-        </umb-empty-state>
-
-    </div>
-
-    <div ng-if="vm.state === 'runMigration'">
-
-      <umb-editor-sub-header>
-        <umb-editor-sub-header-content-left>
-          <button type="button" class="umb-package-details__back-action" ng-click="vm.state = 'list'" prevent-default><span aria-hidden="true">&larr;</span> <localize key="general_back">Back</localize></button>
-        </umb-editor-sub-header-content-left>
-      </umb-editor-sub-header>
-
-      <div class="flex items-center justify-center">
-
-        <div class="umb-info-local-items">
-
-          <form novalidate name="uninstallForm" class="w-100">
-            <div class="umb-package-icon">
-              <umb-icon ng-if="!vm.package.iconUrl" icon="icon-box" class="icon-box"></umb-icon>
-              <img ng-if="vm.package.iconUrl" ng-src="{{vm.package.iconUrl}}" alt="" />
-            </div>
-
-            <div class="umb-package-info">
-              <h4 class="umb-info-local-item"><strong>{{ vm.package.name }}</strong></h4>
-
-              <div class="umb-info-local-item mt4 flex items-center flex-column" ng-if="vm.installState.status != 'success'">
-
-                <umb-button class="mt3"
-                            type="button"
-                            disabled="vm.installState.state == 'running' || vm.installState.state == 'success'"
-                            button-style="success"
-                            size="m"
-                            action="vm.runMigrations(vm.package)"
-                            label-key="packager_packageMigrationsRun">
-                </umb-button>
-              </div>
-
-              <div class="umb-info-local-item text-info" ng-if="vm.installState.state == 'success'">
-                <p>{{vm.installState.status}}</p>
-              </div>
-
-              <div class="umb-info-local-item text-error" ng-if="vm.installState.state == 'error'">
-                <p>{{vm.installState.status}}</p>
-              </div>
-
-            </div>
-          </form>
-
-        </div>
-
-      </div>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/marketplace.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/views/marketplace.controller.js
deleted file mode 100644
index f2a4deb2c1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/marketplace.controller.js
+++ /dev/null
@@ -1,18 +0,0 @@
-(function () {
-  "use strict";
-
-  function MarketplaceController($sce) {
-
-    var vm = this;
-    var marketplaceUrl = new URL(Umbraco.Sys.ServerVariables.umbracoUrls.marketplaceUrl);
-
-    function init() {
-      vm.marketplaceUrl = $sce.trustAsResourceUrl(marketplaceUrl.toString());
-    }
-
-    init();
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Packages.MarketplaceController", MarketplaceController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/marketplace.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/marketplace.html
deleted file mode 100644
index 95a28061b4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/marketplace.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div
-  class="umb-marketplace-view-wrapper clearfix"
-  ng-controller="Umbraco.Editors.Packages.MarketplaceController as vm"
->
-  <iframe
-    ng-if="::vm.marketplaceUrl"
-    ng-src="{{ ::vm.marketplaceUrl }}"
-    class="umb-marketplace-view"
-    title="Umbraco Marketplace"
-    allowfullscreen
-    allow="geolocation; autoplay; clipboard-write; encrypted-media"
-  ></iframe>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/create.controller.js
deleted file mode 100644
index 42b5b13646..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/create.controller.js
+++ /dev/null
@@ -1,91 +0,0 @@
-(function () {
-    "use strict";
-
-    function PartialViewMacrosCreateController($scope, codefileResource, $location, navigationService, formHelper, appState) {
-
-        var vm = this;
-        var node = $scope.currentNode;
-
-        vm.snippets = [];
-        vm.createFolderError = "";
-        vm.folderName = "";
-        vm.fileName = "";
-        vm.showSnippets = false;
-        vm.creatingFolder = false;
-
-        vm.showCreateFolder = showCreateFolder;
-        vm.createFolder = createFolder;
-        vm.createFile = createFile;
-        vm.createFileWithoutMacro = createFileWithoutMacro;
-        vm.showCreateFromSnippet = showCreateFromSnippet;
-        vm.createFileFromSnippet = createFileFromSnippet;
-        vm.close = close;
-
-        function onInit() {
-            codefileResource.getSnippets('partialViewMacros')
-                .then(function (snippets) {
-                    vm.snippets = snippets;
-                });
-        }
-
-        function showCreateFolder() {
-            vm.creatingFolder = true;
-        }
-
-        function createFolder(form) {
-            if (formHelper.submitForm({ scope: $scope, formCtrl: form })) {
-
-                codefileResource.createContainer("partialViewMacros", node.id, vm.folderName).then(function (saved) {
-
-                    navigationService.hideMenu();
-
-                    navigationService.syncTree({
-                        tree: "partialViewMacros",
-                        path: saved.path,
-                        forceReload: true,
-                        activate: true
-                    });
-
-                    formHelper.resetForm({ scope: $scope, formCtrl: form });
-
-                    var section = appState.getSectionState("currentSection");
-
-                }, function (err) {
-
-                    formHelper.resetForm({ scope: $scope, formCtrl: form, hasErrors: true });
-                    vm.createFolderError = err;
-
-                });
-            }
-        }
-
-        function createFile() {
-            $location.path("/settings/partialViewMacros/edit/" + node.id).search("create", "true");
-            navigationService.hideMenu();
-        }
-
-        function createFileWithoutMacro() {
-            $location.path("/settings/partialViewMacros/edit/" + node.id).search("create", "true").search("nomacro", "true");
-            navigationService.hideMenu();
-        }
-
-        function createFileFromSnippet(snippet) {
-            $location.path("/settings/partialViewMacros/edit/" + node.id).search("create", "true").search("snippet", snippet.fileName);
-            navigationService.hideMenu();
-        }
-
-        function showCreateFromSnippet() {
-            vm.showSnippets = true;
-        }
-
-        function close() {
-            const showMenu = true;
-            navigationService.hideDialog(showMenu);
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.PartialViewMacros.CreateController", PartialViewMacrosCreateController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/create.html
deleted file mode 100644
index 341f89c2ed..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/create.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<div ng-cloak ng-controller="Umbraco.Editors.PartialViewMacros.CreateController as vm">
-
-  <div ng-if="!vm.creatingFolder">
-    <div class="umbracoDialog umb-dialog-body with-footer">
-
-      <div class="umb-pane">
-        <!-- Main options -->
-        <div ng-if="!vm.showSnippets">
-
-          <h5>
-            <localize key="create_createUnder">Create an item under</localize>
-            {{currentNode.name}}
-          </h5>
-
-          <ul class="umb-actions umb-actions-child">
-            <li class="umb-action">
-              <button class="umb-action-link umb-outline btn-reset" ng-click="vm.createFile()" type="button"
-                      umb-auto-focus>
-                <umb-icon class="icon large" icon="icon-article"></umb-icon>
-                <span class="menu-label"><localize
-                  key="create_newPartialViewMacro">New partial view macro</localize></span>
-              </button>
-            </li>
-            <li class="umb-action">
-              <button class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileWithoutMacro()"
-                      type="button">
-                <umb-icon class="icon large" icon="icon-article"></umb-icon>
-                <span class="menu-label"><localize key="create_newPartialViewMacroNoMacro">New partial view macro (without macro)</localize></span>
-              </button>
-            </li>
-            <li class="umb-action">
-              <button class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()" type="button">
-                <umb-icon class="icon large" icon="icon-article"></umb-icon>
-                <span class="menu-label"><localize key="create_newPartialViewMacroFromSnippet">>New partial view macro from snippet</localize>...</span>
-              </button>
-            </li>
-            <li class="umb-action">
-              <button class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()" type="button">
-                <umb-icon class="icon large" icon="icon-folder"></umb-icon>
-                <span class="menu-label"><localize key="general_folder">Folder</localize>...</span>
-              </button>
-            </li>
-          </ul>
-        </div>
-
-        <!-- Snippets list -->
-        <div ng-if="vm.showSnippets">
-
-          <h5>
-            <localize key="defaultdialogs_selectSnippet">Select snippet</localize>
-          </h5>
-
-          <ul class="umb-actions umb-actions-child">
-            <li class="umb-action" ng-repeat="snippet in vm.snippets">
-              <button class="umb-action-link umb-outline btn-reset" ng-click="vm.createFileFromSnippet(snippet)"
-                      style="padding-top: 6px; padding-bottom: 6px;" type="button">
-                <umb-icon class="icon large" icon="icon-article"></umb-icon>
-                <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
-              </button>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-
-    <!-- Dialog footer -->
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-      <button class="btn btn-info" ng-click="vm.close()">
-        <localize key="buttons_somethingElse">Do something else</localize>
-      </button>
-    </div>
-  </div>
-
-  <div ng-if="vm.creatingFolder">
-    <form name="createFolderForm" ng-submit="vm.createFolder(createFolderForm)"
-          novalidate
-          val-form-manager>
-      <div class="umbracoDialog umb-dialog-body with-footer">
-        <!-- Create folder -->
-        <div class="umb-pane">
-          <div ng-show="vm.createFolderError">
-            <div class="alert alert-error">
-              <div>{{vm.createFolderError.data.message}}</div>
-            </div>
-          </div>
-
-          <umb-control-group hide-label="false" label="Enter a folder name">
-            <input class="umb-textstring textstring input-block-level" name="folderName" ng-model="vm.folderName"
-                   no-dirty-check required type="text" umb-auto-focus/>
-          </umb-control-group>
-
-        </div>
-      </div>
-      <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <umb-button action="vm.close()"
-                    button-style="link"
-                    label-key="general_close"
-                    type="button">
-        </umb-button>
-        <umb-button button-style="primary"
-                    label-key="general_create"
-                    type="submit">
-        </umb-button>
-      </div>
-    </form>
-  </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/delete.controller.js
deleted file mode 100644
index 21e34e3cd9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/delete.controller.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.PartialViewMacros.DeleteController
- * @function
- *
- * @description
- * The controller for deleting partial view macros
- */
-function PartialViewMacrosDeleteController($scope, codefileResource, treeService, navigationService) {
-
-    $scope.performDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        
-        codefileResource.deleteByPath('partialViewMacros', $scope.currentNode.id)
-            .then(function() {
-                $scope.currentNode.loading = false;
-                //get the root node before we remove it
-                var rootNode = treeService.getTreeRoot($scope.currentNode);
-                // TODO: Need to sync tree, etc...
-                treeService.removeNode($scope.currentNode);
-                navigationService.hideMenu();
-
-            });
-    };
-
-    $scope.cancel = function() {
-        navigationService.hideDialog();
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.PartialViewMacros.DeleteController", PartialViewMacrosDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/delete.html b/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/delete.html
deleted file mode 100644
index b5d187eb57..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/delete.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.PartialViewMacros.DeleteController">
-    <div class="umb-dialog-body">
-
-        <p class="abstract">
-        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
-        </umb-confirm>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/edit.controller.js
deleted file mode 100644
index d72cdbe69a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/edit.controller.js
+++ /dev/null
@@ -1,367 +0,0 @@
-(function () {
-  "use strict";
-
-  function partialViewMacrosEditController($scope, $routeParams, codefileResource, assetsService, notificationsService, editorState, navigationService, appState, macroService, angularHelper, $timeout, contentEditingHelper, localizationService, templateHelper, macroResource, editorService) {
-
-    var vm = this;
-
-    vm.runtimeModeProduction = Umbraco.Sys.ServerVariables.application.runtimeMode == 'Production';
-
-    vm.header = {};
-    vm.header.editorfor = "visuallyHiddenTexts_newPartialViewMacro";
-    vm.header.setPageTitle = true;
-    vm.page = {};
-    vm.page.loading = true;
-    vm.partialViewMacroFile = {};
-
-    //menu
-    vm.page.menu = {};
-    vm.page.menu.currentSection = appState.getSectionState("currentSection");
-    vm.page.menu.currentNode = null;
-
-    // insert buttons
-    vm.page.insertDefaultButton = {
-      labelKey: "general_insert",
-      addEllipsis: "true",
-      handler: function () {
-        vm.openInsertOverlay();
-      }
-    };
-    vm.page.insertSubButtons = [
-      {
-        labelKey: "template_insertPageField",
-        addEllipsis: "true",
-        handler: function () {
-          vm.openPageFieldOverlay();
-        }
-      },
-      {
-        labelKey: "template_insertMacro",
-        addEllipsis: "true",
-        handler: function () {
-          vm.openMacroOverlay()
-        }
-      },
-      {
-        labelKey: "template_insertDictionaryItem",
-        addEllipsis: "true",
-        handler: function () {
-          vm.openDictionaryItemOverlay();
-        }
-      }
-    ];
-
-    // bind functions to view model
-    vm.save = save;
-    vm.openPageFieldOverlay = openPageFieldOverlay;
-    vm.openDictionaryItemOverlay = openDictionaryItemOverlay;
-    vm.openQueryBuilderOverlay = openQueryBuilderOverlay;
-    vm.openMacroOverlay = openMacroOverlay;
-    vm.openInsertOverlay = openInsertOverlay;
-
-    /* Functions bound to view model */
-
-    function save() {
-
-      vm.page.saveButtonState = "busy";
-      vm.partialViewMacro.content = vm.editor.getValue();
-
-      contentEditingHelper.contentEditorPerformSave({
-        saveMethod: codefileResource.save,
-        scope: $scope,
-        content: vm.partialViewMacro,
-        rebindCallback: function (orignal, saved) { }
-      }).then(function (saved) {
-        // create macro if needed
-        if ($routeParams.create && $routeParams.nomacro !== "true") {
-          macroResource.createPartialViewMacroWithFile(saved.virtualPath, saved.name).then(function (created) {
-            navigationService.syncTree({
-              tree: "macros",
-              path: '-1,new',
-              forceReload: true,
-              activate: false
-            });
-            completeSave(saved);
-          }, Utilities.noop);
-
-
-        } else {
-          completeSave(saved);
-        }
-
-      }, function (err) {
-
-        vm.page.saveButtonState = "error";
-
-        localizationService.localize("speechBubbles_validationFailedHeader").then(function (headerValue) {
-          localizationService.localize("speechBubbles_validationFailedMessage").then(function (msgValue) {
-            notificationsService.error(headerValue, msgValue);
-          });
-        });
-
-      });
-
-    }
-
-    function completeSave(saved) {
-
-      localizationService.localize("speechBubbles_partialViewSavedHeader").then(function (headerValue) {
-        localizationService.localize("speechBubbles_partialViewSavedText").then(function (msgValue) {
-          notificationsService.success(headerValue, msgValue);
-        });
-      });
-
-      //check if the name changed, if so we need to redirect
-      if (vm.partialViewMacro.id !== saved.id) {
-        contentEditingHelper.redirectToRenamedContent(saved.id);
-      }
-      else {
-        vm.page.saveButtonState = "success";
-        vm.partialViewMacro = saved;
-
-        //sync state
-        editorState.set(vm.partialViewMacro);
-
-        // normal tree sync
-        navigationService.syncTree({ tree: "partialViewMacros", path: vm.partialViewMacro.path, forceReload: true }).then(function (syncArgs) {
-          vm.page.menu.currentNode = syncArgs.node;
-        });
-
-        // clear $dirty state on form
-        setFormState("pristine");
-      }
-
-    }
-
-    function openInsertOverlay() {
-      var insertOverlay = {
-        allowedTypes: {
-          macro: true,
-          dictionary: true,
-          umbracoField: true
-        },
-        submit: function (model) {
-          switch (model.insert.type) {
-            case "macro":
-              var macroObject = macroService.collectValueData(model.insert.selectedMacro, model.insert.macroParams, "Mvc");
-              insert(macroObject.syntax);
-              break;
-            case "dictionary":
-              var code = templateHelper.getInsertDictionarySnippet(model.insert.node.name);
-              insert(code);
-              break;
-            case "umbracoField":
-              insert(model.insert.umbracoField);
-              break;
-          }
-          editorService.close();
-        },
-        close: function (oldModel) {
-          // close the dialog
-          editorService.close();
-          // focus editor
-          vm.editor.focus();
-        }
-      };
-      editorService.insertCodeSnippet(insertOverlay);
-    }
-
-    function openMacroOverlay() {
-      var macroPicker = {
-        dialogData: {},
-        submit: function (model) {
-          var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, "Mvc");
-          insert(macroObject.syntax);
-          editorService.close();
-        },
-        close: function () {
-          editorService.close();
-          vm.editor.focus();
-        }
-      };
-      editorService.macroPicker(macroPicker);
-    }
-
-
-    function openPageFieldOverlay() {
-      var insertFieldEditor = {
-        submit: function (model) {
-          insert(model.umbracoField);
-          editorService.close();
-        },
-        close: function () {
-          editorService.close();
-          vm.editor.focus();
-        }
-      };
-      editorService.insertField(insertFieldEditor);
-    }
-
-
-    function openDictionaryItemOverlay() {
-
-      var labelKeys = [
-        "template_insertDictionaryItem",
-        "emptyStates_emptyDictionaryTree"
-      ];
-
-      localizationService.localizeMany(labelKeys).then(function (values) {
-        var title = values[0];
-        var emptyStateMessage = values[1];
-
-        var dictionaryPicker = {
-          section: "translation",
-          treeAlias: "dictionary",
-          entityType: "dictionary",
-          multiPicker: false,
-          title: title,
-          emptyStateMessage: emptyStateMessage,
-          select: function (node) {
-            var code = templateHelper.getInsertDictionarySnippet(node.name);
-            insert(code);
-            editorService.close();
-          },
-          close: function (model) {
-            // close dialog
-            editorService.close();
-            // focus editor
-            vm.editor.focus();
-          }
-        };
-
-        editorService.treePicker(dictionaryPicker);
-
-      });
-    }
-
-    function openQueryBuilderOverlay() {
-      var queryBuilder = {
-        submit: function (model) {
-          var code = templateHelper.getQuerySnippet(model.result.queryExpression);
-          insert(code);
-          editorService.close();
-        },
-        close: function (model) {
-          // close dialog
-          editorService.close();
-          // focus editor
-          vm.editor.focus();
-        }
-      };
-      editorService.queryBuilder(queryBuilder);
-    }
-
-    /* Local functions */
-
-    function init() {
-      //we need to load this somewhere, for now its here.
-      assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css", $scope);
-
-      if ($routeParams.create) {
-
-        var snippet = "Empty";
-
-        if ($routeParams.snippet) {
-          snippet = $routeParams.snippet;
-        }
-
-        codefileResource.getScaffold("partialViewMacros", $routeParams.id, snippet).then(function (partialViewMacro) {
-          if ($routeParams.name) {
-            partialViewMacro.name = $routeParams.name;
-          }
-          ready(partialViewMacro, false);
-        });
-
-      } else {
-        codefileResource.getByPath('partialViewMacros', $routeParams.id).then(function (partialViewMacro) {
-          ready(partialViewMacro, true);
-        });
-      }
-    }
-
-    function ready(partialViewMacro, syncTree) {
-
-      vm.page.loading = false;
-      vm.partialViewMacro = partialViewMacro;
-
-      //sync state
-      editorState.set(vm.partialViewMacro);
-
-      if (syncTree) {
-        navigationService.syncTree({ tree: "partialViewMacros", path: vm.partialViewMacro.path, forceReload: true }).then(function (syncArgs) {
-          vm.page.menu.currentNode = syncArgs.node;
-        });
-      }
-
-      // ace configuration
-      vm.aceOption = {
-        mode: "razor",
-        theme: "chrome",
-        showPrintMargin: false,
-        advanced: {
-          fontSize: '14px'
-        },
-        onLoad: function (_editor) {
-          vm.editor = _editor;
-
-          // Set read-only when using runtime mode Production
-          _editor.setReadOnly(vm.runtimeModeProduction);
-
-          // initial cursor placement
-          // Keep cursor in name field if we are create a new template
-          // else set the cursor at the bottom of the code editor
-          if (!$routeParams.create) {
-            $timeout(function () {
-              vm.editor.navigateFileEnd();
-              vm.editor.focus();
-              persistCurrentLocation();
-            });
-          }
-
-          //change on blur, focus
-          vm.editor.on("blur", persistCurrentLocation);
-          vm.editor.on("focus", persistCurrentLocation);
-          vm.editor.on("change", changeAceEditor);
-
-        }
-      }
-
-    }
-
-    function insert(str) {
-      vm.editor.focus();
-      vm.editor.moveCursorToPosition(vm.currentPosition);
-      vm.editor.insert(str);
-
-      // set form state to $dirty
-      setFormState("dirty");
-    }
-
-    function persistCurrentLocation() {
-      vm.currentPosition = vm.editor.getCursorPosition();
-    }
-
-    function changeAceEditor() {
-      setFormState("dirty");
-    }
-
-    function setFormState(state) {
-
-      // get the current form
-      var currentForm = angularHelper.getCurrentForm($scope);
-
-      // set state
-      if (state === "dirty") {
-        currentForm.$setDirty();
-      } else if (state === "pristine") {
-        currentForm.$setPristine();
-      }
-    }
-
-
-    init();
-
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.PartialViewMacros.EditController", partialViewMacrosEditController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/edit.html b/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/edit.html
deleted file mode 100644
index 7cffa70aa1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/edit.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<div data-element="editor-partial-view-macros" ng-controller="Umbraco.Editors.PartialViewMacros.EditController as vm">
-
-  <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
-
-  <form name="contentForm"
-        ng-submit="vm.save()"
-        novalidate
-        val-form-manager>
-
-    <umb-editor-view ng-if="!vm.page.loading">
-
-      <umb-editor-header name="vm.partialViewMacro.name"
-                         name-locked="vm.runtimeModeProduction"
-                         hide-alias="true"
-                         description="vm.partialViewMacro.virtualPath"
-                         description-locked="true"
-                         hide-icon="true"
-                         editorfor="vm.header.editorfor"
-                         setpagetitle="vm.header.setPageTitle">
-      </umb-editor-header>
-
-      <umb-editor-container>
-        <umb-box>
-          <umb-box-content>
-            <div class="umb-alert umb-alert--info mb3" ng-if="vm.runtimeModeProduction">
-              <localize key="template_runtimeModeProduction">Content is not editable when using runtime mode <code>Production</code>.</localize>
-            </div>
-
-            <div class="flex mb3" ng-if="!vm.runtimeModeProduction">
-
-              <div class="flex" style="margin-left: auto;">
-
-                <umb-button-group style="margin-right: 5px;"
-                                  default-button="vm.page.insertDefaultButton"
-                                  sub-buttons="vm.page.insertSubButtons"
-                                  size="xs"
-                                  icon="icon-add">
-                </umb-button-group>
-
-                <umb-button type="button"
-                            size="xs"
-                            action="vm.openQueryBuilderOverlay()"
-                            icon="icon-wand"
-                            label-key="template_queryBuilder"
-                            add-ellipsis="true">
-                </umb-button>
-
-              </div>
-
-            </div>
-
-            <div auto-scale="90"
-                 umb-ace-editor="vm.aceOption"
-                 model="vm.partialViewMacro.content">
-            </div>
-
-          </umb-box-content>
-        </umb-box>
-      </umb-editor-container>
-
-      <umb-editor-footer>
-
-        <umb-editor-footer-content-right>
-
-          <umb-button type="submit"
-                      button-style="success"
-                      state="vm.page.saveButtonState"
-                      disabled="vm.runtimeModeProduction"
-                      shortcut="ctrl+s"
-                      label="Save"
-                      label-key="buttons_save">
-          </umb-button>
-
-        </umb-editor-footer-content-right>
-
-      </umb-editor-footer>
-
-    </umb-editor-view>
-  </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViews/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialViews/create.controller.js
deleted file mode 100644
index 4fb9d62b16..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/partialViews/create.controller.js
+++ /dev/null
@@ -1,85 +0,0 @@
-(function () {
-    "use strict";
-
-    function PartialViewsCreateController($scope, codefileResource, $location, navigationService, formHelper, appState) {
-
-        var vm = this;
-        var node = $scope.currentNode;
-
-        vm.snippets = [];
-        vm.showSnippets = false;
-        vm.creatingFolder = false;
-        vm.createFolderError = "";
-        vm.folderName = "";
-
-        vm.createPartialView = createPartialView;
-        vm.showCreateFolder = showCreateFolder;
-        vm.createFolder = createFolder;
-        vm.showCreateFromSnippet = showCreateFromSnippet;
-        vm.close = close;
-
-        function onInit() {
-            codefileResource.getSnippets('partialViews')
-                .then(function(snippets) {
-                    vm.snippets = snippets;
-                });
-        }
-
-        function createPartialView(selectedSnippet) {
-
-            var snippet = null;
-
-            if(selectedSnippet && selectedSnippet.fileName) {
-                snippet = selectedSnippet.fileName;
-            }
-
-            $location.path("/settings/partialViews/edit/" + node.id).search("create", "true").search("snippet", snippet);
-            navigationService.hideMenu();
-
-        }
-
-        function showCreateFolder() {
-            vm.creatingFolder = true;
-        }
-
-        function createFolder(form) {
-            if (formHelper.submitForm({scope: $scope, formCtrl: form })) {
-
-                codefileResource.createContainer("partialViews", node.id, vm.folderName).then(function(saved) {
-
-                    navigationService.hideMenu();
-
-                    navigationService.syncTree({
-                        tree: "partialViews",
-                        path: saved.path,
-                        forceReload: true,
-                        activate: true
-                    });
-
-                    formHelper.resetForm({ scope: $scope, formCtrl: form });
-
-                    var section = appState.getSectionState("currentSection");
-
-                }, function(err) {
-
-                    formHelper.resetForm({ scope: $scope, formCtrl: form, hasErrors: true });
-                    vm.createFolderError = err;
-                });
-            }
-        }
-
-        function showCreateFromSnippet() {
-            vm.showSnippets = true;
-        }
-
-        function close() {
-            const showMenu = true;
-            navigationService.hideDialog(showMenu);
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.PartialViews.CreateController", PartialViewsCreateController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialViews/create.html
deleted file mode 100644
index 63157a0dab..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/partialViews/create.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<div ng-cloak ng-controller="Umbraco.Editors.PartialViews.CreateController as vm">
-
-  <div ng-if="!vm.creatingFolder">
-    <div class="umbracoDialog umb-dialog-body with-footer">
-
-      <div class="umb-pane">
-
-        <h5>
-          <localize key="create_createUnder">Create an item under</localize>
-          {{currentNode.name}}
-        </h5>
-
-        <!-- Main options -->
-        <div ng-if="!vm.showSnippets">
-          <ul class="umb-actions umb-actions-child">
-            <li class="umb-action">
-              <button class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView()" type="button"
-                      umb-auto-focus>
-                <umb-icon class="icon large" icon="icon-article"></umb-icon>
-                <span class="menu-label"><localize
-                  key="create_newEmptyPartialView">New empty partial view</localize></span>
-              </button>
-            </li>
-            <li class="umb-action">
-              <button class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFromSnippet()" type="button">
-                <umb-icon class="icon large" icon="icon-article"></umb-icon>
-                <span class="menu-label"><localize
-                  key="create_newPartialViewFromSnippet">New partial view from snippet</localize>...</span>
-              </button>
-            </li>
-            <li class="umb-action">
-              <button class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()" type="button">
-                <umb-icon class="icon large" icon="icon-folder"></umb-icon>
-                <span class="menu-label"><localize key="general_folder">Folder</localize>...</span>
-              </button>
-            </li>
-          </ul>
-        </div>
-
-        <!-- Snippets list -->
-        <div ng-if="vm.showSnippets">
-          <ul class="umb-actions umb-actions-child">
-            <li class="umb-action" ng-repeat="snippet in vm.snippets">
-              <button class="umb-action-link umb-outline btn-reset" ng-click="vm.createPartialView(snippet)"
-                      style="padding-top: 6px; padding-bottom: 6px;" type="button">
-                <umb-icon class="icon large" icon="icon-article"></umb-icon>
-                <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
-              </button>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-
-    <!-- Dialog footer -->
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-      <button class="btn btn-info" ng-click="vm.close()" type="button">
-        <localize key="buttons_somethingElse">Do something else</localize>
-      </button>
-    </div>
-  </div>
-
-  <div ng-if="vm.creatingFolder">
-    <form name="createFolderForm" ng-submit="vm.createFolder(createFolderForm)"
-          novalidate
-          val-form-manager>
-      <div class="umbracoDialog umb-dialog-body with-footer">
-        <!-- Create folder -->
-        <div class="umb-pane">
-          <div ng-show="vm.createFolderError">
-            <div class="alert alert-error">
-              <div>{{vm.createFolderError.data.message}}</div>
-            </div>
-          </div>
-
-          <umb-control-group hide-label="false" label="@create_enterFolderName" localize="label">
-            <input class="umb-textstring textstring input-block-level" name="folderName" ng-model="vm.folderName"
-                   required type="text" umb-auto-focus/>
-          </umb-control-group>
-        </div>
-      </div>
-      <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <umb-button action="vm.close()"
-                    button-style="link"
-                    label-key="general_close"
-                    type="button">
-        </umb-button>
-        <umb-button button-style="primary"
-                    label-key="general_create"
-                    type="submit">
-        </umb-button>
-      </div>
-    </form>
-  </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViews/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialViews/delete.controller.js
deleted file mode 100644
index dddfb1b293..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/partialViews/delete.controller.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.PartialViews.DeleteController
- * @function
- *
- * @description
- * The controller for deleting partial views
- */
-function PartialViewsDeleteController($scope, codefileResource, treeService, navigationService) {
-
-    $scope.performDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-
-        // Reset the error message
-        $scope.error = null;
-        
-        codefileResource.deleteByPath('partialViews', $scope.currentNode.id)
-            .then(function() {
-                $scope.currentNode.loading = false;
-                //get the root node before we remove it
-                var rootNode = treeService.getTreeRoot($scope.currentNode);
-                // TODO: Need to sync tree, etc...
-                treeService.removeNode($scope.currentNode);
-                navigationService.hideMenu();
-
-            }, function (err) {
-                $scope.currentNode.loading = false;
-                $scope.error = err;
-            });
-    };
-
-    $scope.cancel = function() {
-        navigationService.hideDialog();
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.PartialViews.DeleteController", PartialViewsDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViews/delete.html b/src/Umbraco.Web.UI.Client/src/views/partialViews/delete.html
deleted file mode 100644
index 4964007fb0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/partialViews/delete.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.PartialViews.DeleteController">
-    <div class="umb-dialog-body">
-
-        <div ng-show="error">
-            <div class="alert alert-error">
-                <div><strong>{{error.errorMsg}}</strong></div>
-                <div>{{error.data.message}}</div>
-            </div>
-        </div>
-
-        <p class="abstract">
-        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
-        </umb-confirm>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViews/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialViews/edit.controller.js
deleted file mode 100644
index 512c1176c1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/partialViews/edit.controller.js
+++ /dev/null
@@ -1,438 +0,0 @@
-(function () {
-  "use strict";
-
-  function PartialViewsEditController($scope, $routeParams, codefileResource, assetsService, notificationsService, editorState, navigationService, appState, macroService, angularHelper, $timeout, contentEditingHelper, localizationService, templateHelper, editorService) {
-
-    var vm = this;
-    var infiniteMode = $scope.model && $scope.model.infiniteMode;
-    var id = infiniteMode ? $scope.model.id : $routeParams.id;
-    var create = infiniteMode ? $scope.model.create : $routeParams.create;
-    var snippet = infiniteMode ? $scope.model.snippet : $routeParams.snippet;
-
-    function close() {
-      if ($scope.model.close) {
-        $scope.model.close($scope.model);
-      }
-    }
-
-    vm.close = close;
-
-    vm.runtimeModeProduction = Umbraco.Sys.ServerVariables.application.runtimeMode == 'Production';
-
-    vm.header = {};
-    vm.header.editorfor = "visuallyHiddenTexts_newPartialView";
-    vm.header.setPageTitle = true;
-
-    vm.page = {};
-    vm.page.loading = true;
-    vm.partialView = {};
-
-    //menu
-    vm.page.menu = {};
-    vm.page.menu.currentSection = appState.getSectionState("currentSection");
-    vm.page.menu.currentNode = null;
-
-    // insert buttons
-    vm.page.insertDefaultButton = {
-      labelKey: "general_insert",
-      addEllipsis: "true",
-      handler: function () {
-        vm.openInsertOverlay();
-      }
-    };
-    vm.page.insertSubButtons = [
-      {
-        labelKey: "template_insertPageField",
-        addEllipsis: "true",
-        handler: function () {
-          vm.openPageFieldOverlay();
-        }
-      },
-      {
-        labelKey: "template_insertMacro",
-        addEllipsis: "true",
-        handler: function () {
-          vm.openMacroOverlay()
-        }
-      },
-      {
-        labelKey: "template_insertDictionaryItem",
-        addEllipsis: "true",
-        handler: function () {
-          vm.openDictionaryItemOverlay();
-        }
-      }
-    ];
-
-    //Used to toggle the keyboard shortcut modal
-    //From a custom keybinding in ace editor - that conflicts with our own to show the dialog
-    vm.showKeyboardShortcut = false;
-
-    //Keyboard shortcuts for help dialog
-    vm.page.keyboardShortcutsOverview = [];
-
-    templateHelper.getGeneralShortcuts().then(function (data) {
-      vm.page.keyboardShortcutsOverview.push(data);
-    });
-    templateHelper.getEditorShortcuts().then(function (data) {
-      vm.page.keyboardShortcutsOverview.push(data);
-    });
-    templateHelper.getPartialViewEditorShortcuts().then(function (data) {
-      vm.page.keyboardShortcutsOverview.push(data);
-    });
-
-
-    // bind functions to view model
-    vm.save = save;
-    vm.openPageFieldOverlay = openPageFieldOverlay;
-    vm.openDictionaryItemOverlay = openDictionaryItemOverlay;
-    vm.openQueryBuilderOverlay = openQueryBuilderOverlay;
-    vm.openMacroOverlay = openMacroOverlay;
-    vm.openInsertOverlay = openInsertOverlay;
-
-    /* Functions bound to view model */
-
-    function save() {
-
-      vm.page.saveButtonState = "busy";
-      vm.partialView.content = vm.editor.getValue();
-
-      contentEditingHelper.contentEditorPerformSave({
-        saveMethod: codefileResource.save,
-        scope: $scope,
-        content: vm.partialView,
-        rebindCallback: function (orignal, saved) { }
-      }).then(function (saved) {
-
-        localizationService.localize("speechBubbles_partialViewSavedHeader").then(function (headerValue) {
-          localizationService.localize("speechBubbles_partialViewSavedText").then(function (msgValue) {
-            notificationsService.success(headerValue, msgValue);
-          });
-        });
-
-        //check if the name changed, if so we need to redirect
-        if (vm.partialView.id !== saved.id) {
-          contentEditingHelper.redirectToRenamedContent(saved.id);
-        }
-        else {
-          vm.page.saveButtonState = "success";
-          vm.partialView = saved;
-
-          //sync state
-          editorState.set(vm.partialView);
-
-          // normal tree sync
-          navigationService.syncTree({ tree: "partialViews", path: vm.partialView.path, forceReload: true }).then(function (syncArgs) {
-            vm.page.menu.currentNode = syncArgs.node;
-          });
-
-          // clear $dirty state on form
-          setFormState("pristine");
-        }
-      }, function (err) {
-
-        vm.page.saveButtonState = "error";
-
-        localizationService.localize("speechBubbles_validationFailedHeader").then(function (headerValue) {
-          localizationService.localize("speechBubbles_validationFailedMessage").then(function (msgValue) {
-            notificationsService.error(headerValue, msgValue);
-          });
-        });
-
-      });
-
-    }
-
-    function openInsertOverlay() {
-      var insertOverlay = {
-        allowedTypes: {
-          macro: true,
-          dictionary: true,
-          umbracoField: true
-        },
-        submit: function (model) {
-
-          switch (model.insert.type) {
-            case "macro":
-              var macroObject = macroService.collectValueData(model.insert.selectedMacro, model.insert.macroParams, "Mvc");
-              insert(macroObject.syntax);
-              break;
-            case "dictionary":
-              var code = templateHelper.getInsertDictionarySnippet(model.insert.node.name);
-              insert(code);
-              break;
-            case "umbracoField":
-              insert(model.insert.umbracoField);
-              break;
-          }
-          editorService.close();
-        },
-        close: function () {
-          // close the dialog
-          editorService.close();
-          // focus editor
-          vm.editor.focus();
-        }
-      };
-      editorService.insertCodeSnippet(insertOverlay);
-    }
-
-
-    function openMacroOverlay() {
-      var macroPicker = {
-        dialogData: {},
-        submit: function (model) {
-          var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, "Mvc");
-          insert(macroObject.syntax);
-          editorService.close();
-        },
-        close: function () {
-          editorService.close();
-          vm.editor.focus();
-        }
-      };
-      editorService.macroPicker(macroPicker);
-    }
-
-    function openPageFieldOverlay() {
-      var insertFieldEditor = {
-        submit: function (model) {
-          insert(model.umbracoField);
-          editorService.close();
-        },
-        close: function () {
-          editorService.close();
-          vm.editor.focus();
-        }
-      };
-      editorService.insertField(insertFieldEditor);
-    }
-
-
-    function openDictionaryItemOverlay() {
-
-      var labelKeys = [
-        "template_insertDictionaryItem",
-        "emptyStates_emptyDictionaryTree"
-      ];
-
-      localizationService.localizeMany(labelKeys).then(function (values) {
-        var title = values[0];
-        var emptyStateMessage = values[1];
-
-        var dictionaryItem = {
-          section: "translation",
-          treeAlias: "dictionary",
-          entityType: "dictionary",
-          multiPicker: false,
-          title: title,
-          emptyStateMessage: emptyStateMessage,
-          select: function (node) {
-            var code = templateHelper.getInsertDictionarySnippet(node.name);
-            insert(code);
-            editorService.close();
-          },
-          close: function (model) {
-            // close dialog
-            editorService.close();
-            // focus editor
-            vm.editor.focus();
-          }
-        };
-        editorService.treePicker(dictionaryItem);
-      });
-    }
-
-    function openQueryBuilderOverlay() {
-      var queryBuilder = {
-        title: "Query for content",
-        submit: function (model) {
-          var code = templateHelper.getQuerySnippet(model.result.queryExpression);
-          insert(code);
-          editorService.close();
-        },
-        close: function () {
-          // close dialog
-          editorService.close();
-          // focus editor
-          vm.editor.focus();
-        }
-      };
-      editorService.queryBuilder(queryBuilder);
-    }
-
-    /* Local functions */
-
-    function init() {
-      //we need to load this somewhere, for now its here.
-      assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css", $scope);
-
-      if (create) {
-
-        if (!snippet) {
-          snippet = "Empty";
-        }
-
-        codefileResource.getScaffold("partialViews", id, snippet).then(function (partialView) {
-          ready(partialView, false);
-        });
-
-      } else {
-        codefileResource.getByPath('partialViews', id).then(function (partialView) {
-          ready(partialView, true);
-        });
-      }
-
-    }
-
-    function ready(partialView, syncTree) {
-
-      vm.page.loading = false;
-      vm.partialView = partialView;
-
-      //sync state
-      editorState.set(vm.partialView);
-
-      if (!infiniteMode && syncTree) {
-        navigationService.syncTree({ tree: "partialViews", path: vm.partialView.path, forceReload: true }).then(function (syncArgs) {
-          vm.page.menu.currentNode = syncArgs.node;
-        });
-      }
-
-      // ace configuration
-      vm.aceOption = {
-        mode: "razor",
-        theme: "chrome",
-        showPrintMargin: false,
-        advanced: {
-          fontSize: '14px'
-        },
-        onLoad: function (_editor) {
-          vm.editor = _editor;
-
-          // Set read-only when using runtime mode Production
-          _editor.setReadOnly(vm.runtimeModeProduction);
-
-          //Update the auto-complete method to use ctrl+alt+space
-          _editor.commands.bindKey("ctrl-alt-space", "startAutocomplete");
-
-          //Unassigns the keybinding (That was previously auto-complete)
-          //As conflicts with our own tree search shortcut
-          _editor.commands.bindKey("ctrl-space", null);
-
-          // Assign new keybinding
-          _editor.commands.addCommands([
-            //Disable (alt+shift+K)
-            //Conflicts with our own show shortcuts dialog - this overrides it
-            {
-              name: 'unSelectOrFindPrevious',
-              bindKey: 'Alt-Shift-K',
-              exec: function () {
-                //Toggle the show keyboard shortcuts overlay
-                $scope.$apply(function () {
-                  vm.showKeyboardShortcut = !vm.showKeyboardShortcut;
-                });
-              },
-              readOnly: true
-            },
-            {
-              name: 'insertUmbracoValue',
-              bindKey: 'Alt-Shift-V',
-              exec: function () {
-                $scope.$apply(function () {
-                  openPageFieldOverlay();
-                });
-              },
-              readOnly: true
-            },
-            {
-              name: 'insertDictionary',
-              bindKey: 'Alt-Shift-D',
-              exec: function () {
-                $scope.$apply(function () {
-                  openDictionaryItemOverlay();
-                });
-              },
-              readOnly: true
-            },
-            {
-              name: 'insertUmbracoMacro',
-              bindKey: 'Alt-Shift-M',
-              exec: function () {
-                $scope.$apply(function () {
-                  openMacroOverlay();
-                });
-              },
-              readOnly: true
-            },
-            {
-              name: 'insertQuery',
-              bindKey: 'Alt-Shift-Q',
-              exec: function () {
-                $scope.$apply(function () {
-                  openQueryBuilderOverlay();
-                });
-              },
-              readOnly: true
-            }
-
-          ]);
-
-          // initial cursor placement
-          // Keep cursor in name field if we are create a new template
-          // else set the cursor at the bottom of the code editor
-          if (!create) {
-            $timeout(function () {
-              vm.editor.navigateFileEnd();
-              vm.editor.focus();
-              persistCurrentLocation();
-            });
-          }
-
-          //change on blur, focus
-          vm.editor.on("blur", persistCurrentLocation);
-          vm.editor.on("focus", persistCurrentLocation);
-          vm.editor.on("change", changeAceEditor);
-
-        }
-      }
-
-    }
-
-    function insert(str) {
-      vm.editor.focus();
-      vm.editor.moveCursorToPosition(vm.currentPosition);
-      vm.editor.insert(str);
-
-      // set form state to $dirty
-      setFormState("dirty");
-    }
-
-    function persistCurrentLocation() {
-      vm.currentPosition = vm.editor.getCursorPosition();
-    }
-
-    function changeAceEditor() {
-      setFormState("dirty");
-    }
-
-    function setFormState(state) {
-
-      // get the current form
-      var currentForm = angularHelper.getCurrentForm($scope);
-
-      // set state
-      if (state === "dirty") {
-        currentForm.$setDirty();
-      } else if (state === "pristine") {
-        currentForm.$setPristine();
-      }
-    }
-
-
-    init();
-
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.PartialViews.EditController", PartialViewsEditController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViews/edit.html b/src/Umbraco.Web.UI.Client/src/views/partialViews/edit.html
deleted file mode 100644
index e1eb195545..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/partialViews/edit.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<div data-element="editor-partial-views" ng-controller="Umbraco.Editors.PartialViews.EditController as vm">
-
-  <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
-
-  <form name="contentForm"
-        ng-submit="vm.save()"
-        novalidate
-        val-form-manager>
-
-    <umb-editor-view ng-if="!vm.page.loading">
-
-      <umb-editor-header name="vm.partialView.name"
-                         name-locked="vm.runtimeModeProduction"
-                         hide-alias="true"
-                         description="vm.partialView.virtualPath"
-                         description-locked="true"
-                         hide-icon="true"
-                         editorfor="vm.header.editorfor"
-                         setpagetitle="vm.header.setPageTitle">
-      </umb-editor-header>
-
-      <umb-editor-container>
-
-        <umb-box>
-          <umb-box-content>
-            <div class="umb-alert umb-alert--info mb3" ng-if="vm.runtimeModeProduction">
-              <localize key="template_runtimeModeProduction">Content is not editable when using runtime mode <code>Production</code>.</localize>
-            </div>
-
-            <div class="flex mb3" ng-if="!vm.runtimeModeProduction">
-
-              <div class="flex" style="margin-left: auto;">
-
-                <umb-button-group style="margin-right: 5px;"
-                                  default-button="vm.page.insertDefaultButton"
-                                  sub-buttons="vm.page.insertSubButtons"
-                                  size="xs"
-                                  icon="icon-add">
-                </umb-button-group>
-
-                <umb-button type="button"
-                            size="xs"
-                            action="vm.openQueryBuilderOverlay()"
-                            icon="icon-wand"
-                            label-key="template_queryBuilder"
-                            add-ellipsis="true">
-                </umb-button>
-
-              </div>
-
-            </div>
-
-            <div auto-scale="90"
-                 umb-ace-editor="vm.aceOption"
-                 model="vm.partialView.content">
-            </div>
-
-          </umb-box-content>
-        </umb-box>
-
-      </umb-editor-container>
-
-      <umb-editor-footer>
-
-        <umb-editor-footer-content-left>
-          <umb-keyboard-shortcuts-overview ng-if="!vm.runtimeModeProduction"
-                                           model="vm.page.keyboardShortcutsOverview"
-                                           show-overlay="vm.showKeyboardShortcut"
-                                           on-close="vm.showKeyboardShortcut = false;">
-          </umb-keyboard-shortcuts-overview>
-        </umb-editor-footer-content-left>
-
-        <umb-editor-footer-content-right>
-
-          <umb-button ng-if="model.infiniteMode"
-                      type="button"
-                      button-style="link"
-                      label-key="general_close"
-                      shortcut="esc"
-                      action="vm.close()">
-          </umb-button>
-
-          <umb-button type="submit"
-                      button-style="success"
-                      state="vm.page.saveButtonState"
-                      disabled="vm.runtimeModeProduction"
-                      shortcut="ctrl+s"
-                      label="Save"
-                      label-key="buttons_save">
-          </umb-button>
-        </umb-editor-footer-content-right>
-
-      </umb-editor-footer>
-
-    </umb-editor-view>
-  </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js
deleted file mode 100644
index 9ce7e18f06..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js
+++ /dev/null
@@ -1,30 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PrevalueEditors.BooleanController",
-    function ($scope) {
-
-        function updateToggleValue() {
-            $scope.toggleValue = false;
-
-            if ($scope.model && Object.toBoolean($scope.model.value)) {
-                $scope.toggleValue = true;
-            }
-        }
-
-        if($scope.model.value === null){
-            $scope.model.value = "0";
-        }
-
-        updateToggleValue();
-
-        $scope.toggle = function(){
-            if (Object.toBoolean($scope.model.value)) {
-                $scope.model.value = "0";
-                updateToggleValue();
-
-                return;
-            }
-
-            $scope.model.value = "1";
-
-            updateToggleValue();
-        }
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.html
deleted file mode 100644
index 1c969014c4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div ng-controller="Umbraco.PrevalueEditors.BooleanController">
-    <umb-toggle
-        input-id="{{model.alias}}"
-        checked="toggleValue"
-        on-click="toggle()">
-    </umb-toggle>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/checkboxlist.controller.js
deleted file mode 100644
index cd8ab17b4a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/checkboxlist.controller.js
+++ /dev/null
@@ -1,78 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PrevalueEditors.CheckboxListController",
-    function ($scope) {
-        
-        const vm = this;
-
-        vm.configItems = [];
-        vm.viewItems = [];
-        vm.change = change;
-
-        function init() {
-
-            const prevalues = ($scope.model.config ? $scope.model.config.prevalues : $scope.model.prevalues) || [];
-
-            let items = [];
-
-            for (let i = 0; i < prevalues.length; i++) {
-                const item = {};
-
-                if (Utilities.isObject(prevalues[i])) {
-                    item.value = prevalues[i].value;
-                    item.label = prevalues[i].label || prevalues[i].value;
-                }
-                else {
-                    item.value = prevalues[i];
-                    item.label = prevalues[i];
-                }
-
-                items.push({ value: item.value, label: item.label });
-            }
-
-            vm.configItems = items;
-
-            if ($scope.model.value === null || $scope.model.value === undefined) {
-                $scope.model.value = [];
-            }
-
-            // update view model.
-            generateViewModel($scope.model.value);
-        }
-
-        function generateViewModel(newVal) {
-
-            vm.viewItems = [];
-
-            let iConfigItem;
-            for (let i = 0; i < vm.configItems.length; i++) {
-                iConfigItem = vm.configItems[i];
-                const isChecked = _.contains(newVal, iConfigItem.value);
-                vm.viewItems.push({
-                    checked: isChecked,
-                    value: iConfigItem.value,
-                    label: iConfigItem.label
-                });
-            }
-
-        }
-
-        function change(model, value) {
-
-            const index = $scope.model.value.indexOf(value);
-
-            if (model === true) {
-                //if it doesn't exist in the model, then add it
-                if (index < 0) {
-                    $scope.model.value.push(value);
-                }
-            } else {
-                //if it exists in the model, then remove it
-                if (index >= 0) {
-                    $scope.model.value.splice(index, 1);
-                }
-            }
-
-        }
-
-        init();
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/checkboxlist.html
deleted file mode 100644
index acebf2f550..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/checkboxlist.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="umb-checkboxlist-preval" ng-controller="Umbraco.PrevalueEditors.CheckboxListController as vm">
-
-    <ul class="unstyled" ng-if="vm.viewItems.length">
-        <li ng-repeat="item in vm.viewItems track by $id(item)">
-            <umb-checkbox
-                value="{{item.value}}"
-                model="item.checked"
-                text="{{item.label}}"
-                on-change="vm.change(model, value)">
-            </umb-checkbox>
-        </li>
-    </ul>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/colorpicker.controller.js
deleted file mode 100644
index b7a38e562e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/colorpicker.controller.js
+++ /dev/null
@@ -1,64 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PrevalueEditors.ColorPickerController",
-    function ($scope) {
-
-        //setup the default config
-        var config = {
-            useLabel: false
-        };
-
-        //map the user config
-        Utilities.extend(config, $scope.model.config);
-
-        //map back to the model
-        $scope.model.config = config;
-
-        $scope.isConfigured = $scope.model.prevalues && _.keys($scope.model.prevalues).length > 0;
-
-        $scope.model.items = [];
-
-        // Make an array from the dictionary
-        var items = [];
-
-        if (Utilities.isArray($scope.model.prevalues)) {
-
-            for (var i in $scope.model.prevalues) {
-                var oldValue = $scope.model.prevalues[i];
-
-                if (!isValidHex(oldValue.value || oldValue))
-                    continue;
-
-                var hexCode;
-
-                if (oldValue.hasOwnProperty("value")) {
-                    hexCode = toFullHex(oldValue.value);
-                    items.push({
-                        value: hexCode.substr(1, hexCode.length),
-                        label: oldValue.label,
-                        id: i
-                    });
-                } else {
-                    hexCode = toFullHex(oldValue);
-                    items.push({
-                        value: hexCode.substr(1, hexCode.length),
-                        label: oldValue,
-                        id: i
-                    });
-                }
-            }
-
-            // Now make the editor model the array
-            $scope.model.items = items;
-        }
-
-        function toFullHex(hex) {
-            if (hex.length === 4 && hex.charAt(0) === "#") {
-                hex = "#" + hex.charAt(1) + hex.charAt(1) + hex.charAt(2) + hex.charAt(2) + hex.charAt(3) + hex.charAt(3);
-            }
-            return hex.toLowerCase();
-        }
-
-        function isValidHex(str) {
-            return /(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(str);
-        }
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/colorpicker.html
deleted file mode 100644
index 21727b766e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/colorpicker.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div ng-controller="Umbraco.PrevalueEditors.ColorPickerController">
-
-    <div ng-if="!isConfigured">
-        <localize key="colorpicker_noColors">You haven't defined any colors</localize>
-    </div>
-
-    <umb-color-swatches
-        colors="model.items"
-        selected-color="model.value"
-        size="s"
-        use-label="model.config.useLabel">
-    </umb-color-swatches>
-
-    <input type="hidden" name="modelValue" ng-model="model.value" />
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/decimal.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/decimal.html
deleted file mode 100644
index 43a328dbfe..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/decimal.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-    <ng-form name="prevalueDecimalForm">
-        <input name="decimalField" class="umb-property-editor umb-number"
-               type="number"
-               ng-model="model.value"
-               fix-number />
-
-        <span ng-messages="prevalueDecimalForm.decimalField.$error" show-validation-on-submit >
-            <span class="help-inline" ng-message="number">Not a number</span>
-        </span>
-        
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/dropdown.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/dropdown.controller.js
deleted file mode 100644
index 73f3558f34..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/dropdown.controller.js
+++ /dev/null
@@ -1,53 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PrevalueEditors.DropDownListController",
-    function ($scope) {
-        
-        const vm = this;
-        
-        vm.configItems = [];
-        vm.viewItems = [];
-
-        function init() {
-
-            const prevalues = ($scope.model.config ? $scope.model.config.prevalues : $scope.model.prevalues) || [];
-
-            let items = [];
-
-            for (let i = 0; i < prevalues.length; i++) {
-                const item = {};
-
-                if (Utilities.isObject(prevalues[i])) {
-                    item.value = prevalues[i].value;
-                    item.label = prevalues[i].label || prevalues[i].value;
-                }
-                else {
-                    item.value = prevalues[i];
-                    item.label = prevalues[i];
-                }
-
-                items.push({ value: item.value, label: item.label });
-            }
-
-            vm.configItems = items;
-
-            // update view model.
-            generateViewModel();
-        }
-
-        function generateViewModel() {
-
-            vm.viewItems = [];
-
-            let iConfigItem;
-            for (let i = 0; i < vm.configItems.length; i++) {
-                iConfigItem = vm.configItems[i];
-                vm.viewItems.push({
-                    value: iConfigItem.value,
-                    label: iConfigItem.label
-                });
-            }
-
-        }
-
-        init();
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/dropdown.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/dropdown.html
deleted file mode 100644
index adcb04da16..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/dropdown.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="umb-dropdown-preval" ng-controller="Umbraco.PrevalueEditors.DropDownListController as vm">
-
-    <select name="dropDownList"
-            class="umb-dropdown"
-            ng-if="vm.viewItems.length"
-            ng-model="model.value"
-            ng-options="item.value as item.label for item in vm.viewItems">
-        <option></option>
-    </select>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/hidden.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/hidden.html
deleted file mode 100644
index 93cacef8c8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/hidden.html
+++ /dev/null
@@ -1 +0,0 @@
-<input name="hidden" type="hidden" ng-model="model.value" id="{{model.alias}}" />
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.controller.js
deleted file mode 100644
index 3cb3596261..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.controller.js
+++ /dev/null
@@ -1,32 +0,0 @@
-function imageFilePickerController($scope, editorService) {
-    var vm = this;
-    vm.model = $scope.model;
-
-    vm.add = add;
-    vm.remove = remove;
-
-    function add() {
-        var mediaPickerOptions = {
-            view: "mediapicker",
-            multiPicker: false,
-            disableFolderSelect: true,
-            onlyImages: true,
-            submit: function (model) {
-                vm.model.value = model.selection[0].image;
-
-                editorService.close();
-            },
-            close: function () {
-                editorService.close();
-            } 
-        };
-        editorService.mediaPicker(mediaPickerOptions);
-    };
-
-    function remove() {
-        vm.model.value = null;
-    };
-
-}
-
-angular.module('umbraco').controller("Umbraco.PrevalueEditors.ImageFilePickerController", imageFilePickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
deleted file mode 100644
index 4affd5de42..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div ng-controller="Umbraco.PrevalueEditors.ImageFilePickerController as vm" class="umb-property-editor umb-mediapicker umb-mediapicker-single">
-    <div class="flex flex-wrap error">
-        <ul class="umb-sortable-thumbnails">
-            <li ng-if="vm.model.value" class="umb-sortable-thumbnails__wrapper">
-                <img ng-src="{{vm.model.value}}" alt="">
-
-                <div class="umb-sortable-thumbnails__actions" data-element="sortable-thumbnail-actions">
-                    <button type="button" aria-label="Remove" class="umb-sortable-thumbnails__action -red btn-reset" ng-click="vm.remove()">
-                        <umb-icon icon="icon-delete" class="icon"></umb-icon>
-                    </button>
-                </div>
-            </li>
-
-            <li style="border: none;" class="add-wrapper unsortable" ng-hide="vm.model.value">
-                <button type="button" aria-label="Open media picker" class="add-link add-link-square btn-reset umb-outline umb-outline--surrounding" ng-click="vm.add()">
-                    <umb-icon icon="icon-add" class="icon large"></umb-icon>
-                </button>
-            </li>
-        </ul>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.controller.js
deleted file mode 100644
index 569fc1007b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.controller.js
+++ /dev/null
@@ -1,56 +0,0 @@
-function mediaFolderPickerController($scope, editorService, entityResource) {
-    
-    
-    $scope.folderName = "";
-    
-    
-    function retrieveFolderData() {
-        
-        var id = $scope.model.value;
-        
-        if (id == null) {
-            $scope.folderName = "";
-            return;
-        }
-        
-        entityResource.getById(id, "Media").then(
-            function (media) {
-                $scope.media = media;
-            }
-        );
-    }
-    
-    
-    retrieveFolderData();
-    
-    
-    $scope.add = function() {
-        var mediaPickerOptions = {
-            view: "mediapicker",
-            multiPicker: false, // We only want to allow you to pick one folder at a given time
-            disableFolderSelect: false,
-            onlyImages: false,
-            onlyFolders: true,
-            submit: function (model) {
-                
-                $scope.model.value = model.selection[0].udi;
-                
-                retrieveFolderData();
-                
-                editorService.close();
-            },
-            close: function () {
-                editorService.close();
-            } 
-        };
-        editorService.mediaPicker(mediaPickerOptions);
-    };
-
-    $scope.remove = function () {
-        $scope.model.value = null;
-        retrieveFolderData();
-    };
-
-}
-
-angular.module('umbraco').controller("Umbraco.PrevalueEditors.MediaFolderPickerController", mediaFolderPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.html
deleted file mode 100644
index f72846ea98..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediafolderpicker.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<div ng-controller="Umbraco.PrevalueEditors.MediaFolderPickerController" class="umb-property-editor umb-mediapicker umb-mediapicker-single">
-
-    <div class="flex flex-wrap error">
-        <ul class="umb-sortable-thumbnails">
-            <li ng-if="model.value" class="umb-sortable-thumbnails__wrapper">
-
-                <p class="label label__trashed" ng-if="media.trashed">
-                    <localize key="mediaPicker_trashed">Trashed</localize>
-                    <umb-icon icon="icon-trash"></umb-icon>
-                </p>
-
-                <!-- FILE -->
-                <umb-file-icon ng-hide="media.thumbnail" ng-class="{'trashed': media.trashed}"
-                               extension="{{media.extension}}"
-                               icon="{{media.icon}}"
-                               size="s"
-                               text="{{media.name}}">
-                </umb-file-icon>
-
-                <div class="umb-sortable-thumbnails__actions" data-element="sortable-thumbnail-actions">
-                    <button type="button" class="umb-sortable-thumbnails__action -red btn-reset" data-element="action-remove" ng-click="remove()">
-                        <umb-icon icon="icon-delete" class="icon"></umb-icon>
-                        <span class="sr-only">
-                            <localize key="general_remove">Remove</localize>
-                        </span>
-                    </button>
-                </div>
-            </li>
-
-            <li style="border: none;" class="add-wrapper unsortable" ng-hide="model.value">
-                <button type="button" data-element="sortable-thumbnails-add" class="add-link add-link-square btn-reset umb-outline umb-outline--surrounding" ng-click="add()">
-                    <umb-icon icon="icon-add" class="icon large"></umb-icon>
-                    <span class="sr-only">
-                        <localize key="mediaPicker_openMediaPicker">Open media picker</localize>
-                    </span>
-                </button>
-            </li>
-        </ul>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
deleted file mode 100644
index 65e5fa906f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
+++ /dev/null
@@ -1,115 +0,0 @@
-//this controller simply tells the dialogs service to open a mediaPicker window
-//with a specified callback, this callback will receive an object with a selection on it
-function mediaPickerController($scope, entityResource, iconHelper, editorService, angularHelper) {
-
-    function trim(str, chr) {
-        var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
-        return str.replace(rgxtrim, '');
-    }
-
-    $scope.renderModel = [];   
-
-    $scope.allowRemove = true;
-    $scope.allowEdit = true;
-    $scope.sortable = false;
-
-    var dialogOptions = {
-        multiPicker: false,
-        entityType: "Media",
-        section: "media",
-        treeAlias: "media",
-        idType: "udi"
-    };
-
-    //combine the dialogOptions with any values returned from the server
-    if ($scope.model.config) {
-        Utilities.extend(dialogOptions, $scope.model.config);
-    }
-
-    $scope.openTreePicker = function () {
-        var treePicker = dialogOptions;
-
-        treePicker.submit = function (model) {
-            if (treePicker.multiPicker) {
-                _.each(model.selection, function (item, i) {
-                    $scope.add(item);
-                });
-            } else {
-                $scope.clear();
-                $scope.add(model.selection[0]);
-            }
-            editorService.close();
-        };
-
-        treePicker.close = function () {
-            editorService.close();
-        };
-
-        editorService.treePicker(treePicker);
-    }
-
-    $scope.remove =function(index){
-        $scope.renderModel.splice(index, 1);
-        syncModelValue();
-    };
-
-    $scope.clear = function() {
-        $scope.renderModel = [];
-        syncModelValue();
-    };
-
-    $scope.add = function (item) {
-
-        var itemId = dialogOptions.idType === "udi" ? item.udi : item.id;
-
-        var currIds = _.map($scope.renderModel, function (i) {
-            return dialogOptions.idType === "udi" ? i.udi : i.id;
-        });
-        if (currIds.indexOf(itemId) < 0) {
-                
-            item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-            $scope.renderModel.push({ name: item.name, id: item.id, icon: item.icon, udi: item.udi });
-
-            // store the index of the new item in the renderModel collection so we can find it again
-            var itemRenderIndex = $scope.renderModel.length - 1;
-			// get and update the path for the picked node
-            entityResource.getUrl(item.id, dialogOptions.entityType).then(function(data){
-			    $scope.renderModel[itemRenderIndex].path = data;
-            });
-
-        }	
-
-        syncModelValue();
-    };
-
-    function syncModelValue() {
-        var currIds = _.map($scope.renderModel, function (i) {
-            return dialogOptions.idType === "udi" ? i.udi : i.id;
-        });
-        $scope.model.value = trim(currIds.join(), ",");
-        angularHelper.getCurrentForm($scope).$setDirty();
-    }
-
-    //load media data
-    var modelIds = $scope.model.value ? $scope.model.value.split(',') : [];
-    if (modelIds.length > 0) {
-        entityResource.getByIds(modelIds, dialogOptions.entityType).then(function (data) {
-            _.each(data, function (item, i) {
-
-                item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-                $scope.renderModel.push({ name: item.name, id: item.id,  icon: item.icon, udi: item.udi });
-                
-                // store the index of the new item in the renderModel collection so we can find it again
-                var itemRenderIndex = $scope.renderModel.length - 1;
-                // get and update the path for the picked node
-                entityResource.getUrl(item.id, dialogOptions.entityType).then(function(data){
-                    $scope.renderModel[itemRenderIndex].path = data;
-                });
-
-            });
-        });
-    }
-        
-}
-
-angular.module('umbraco').controller("Umbraco.PrevalueEditors.MediaPickerController",mediaPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
deleted file mode 100644
index c00c5585f2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div ng-controller="Umbraco.PrevalueEditors.MediaPickerController" class="umb-property-editor umb-contentpicker">
-
-	<div ng-model="renderModel">
-		<umb-node-preview
-			ng-repeat="node in renderModel"
-			icon="node.icon"
-			name="node.name"
-			published="node.published"
-			description="node.path"
-			sortable="sortable"
-			allow-remove="allowRemove"
-			allow-edit="allowEdit"
-			on-remove="remove($index)"
-			on-edit="openTreePicker()">
-		</umb-node-preview>
-	</div>
-
-	<button type="button"
-            class="umb-node-preview-add"
-            ng-show="model.config.multiPicker === true || renderModel.length === 0"
-            ng-click="openTreePicker()">
-		<localize key="general_add">Add</localize>
-	</button>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.controller.js
deleted file mode 100644
index 93d72d2a1b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.controller.js
+++ /dev/null
@@ -1,93 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PrevalueEditors.MultiValuesController",
-    function ($scope, $timeout) {
-       
-        //NOTE: We need to make each item an object, not just a string because you cannot 2-way bind to a primitive.
-
-        $scope.newItem = "";
-        $scope.hasError = false;
-        $scope.focusOnNew = false;
-       
-        if (!Utilities.isArray($scope.model.value)) {
-
-            //make an array from the dictionary
-            var items = [];
-            for (var i in $scope.model.value) { 
-                items.push({ 
-                    value: $scope.model.value[i].value,
-                    sortOrder: $scope.model.value[i].sortOrder,
-                    id: i
-                });
-            }
-
-            //ensure the items are sorted by the provided sort order
-            items.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
-            
-            //now make the editor model the array
-            $scope.model.value = items;
-        }
-
-        $scope.remove = function(item, evt) {
-            evt.preventDefault();
-
-            $scope.model.value = _.reject($scope.model.value, function (x) {
-                return x.value === item.value;
-            });
-            
-        };
-
-        $scope.add = function (evt) {
-            evt.preventDefault();
-            
-            if ($scope.newItem) {
-                if (!_.contains($scope.model.value, $scope.newItem)) {                
-                    $scope.model.value.push({ value: $scope.newItem });
-                    $scope.newItem = "";
-                    $scope.hasError = false;
-                    $scope.focusOnNew = true;
-                    return;
-                }
-            }
-
-            //there was an error, do the highlight (will be set back by the directive)
-            $scope.hasError = true;            
-        };
-
-        $scope.sortableOptions = {
-            axis: 'y',
-            containment: 'parent',
-            cursor: 'move',
-            items: '> div.control-group',
-            tolerance: 'pointer',
-            update: function (e, ui) {
-                // Get the new and old index for the moved element (using the text as the identifier, so 
-                // we'd have a problem if two prevalues were the same, but that would be unlikely)
-                var newIndex = ui.item.index();
-                var movedPrevalueText = $('input[type="text"]', ui.item).val();
-                var originalIndex = getElementIndexByPrevalueText(movedPrevalueText);
-
-                // Move the element in the model
-                if (originalIndex > -1) {
-                    var movedElement = $scope.model.value[originalIndex];
-                    $scope.model.value.splice(originalIndex, 1);
-                    $scope.model.value.splice(newIndex, 0, movedElement);
-                }
-            }
-        };
-
-        $scope.createNew = function (event) {
-            if (event.keyCode == 13) {
-                $scope.add(event);
-            }
-        };
-
-        function getElementIndexByPrevalueText(value) {
-            for (var i = 0; i < $scope.model.value.length; i++) {
-                if ($scope.model.value[i].value === value) {
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
deleted file mode 100644
index f57254ad85..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="umb-property-editor umb-prevalues-multivalues" ng-controller="Umbraco.PrevalueEditors.MultiValuesController">
-    <div class="control-group umb-prevalues-multivalues__add">
-        <div class="umb-prevalues-multivalues__left">
-            <input type="text" name="newItem" focus-when="{{focusOnNew}}" ng-keydown="createNew($event)" ng-model="newItem" val-highlight="{{hasError}}" overlay-submit-on-enter="false" />
-        </div>
-        <div class="umb-prevalues-multivalues__right">
-            <button type="button" class="btn btn-info" ng-click="add($event)"><localize key="general_add">Add</localize></button>
-        </div>
-    </div>
-    <div ui-sortable="sortableOptions">
-        <div class="control-group umb-prevalues-multivalues__listitem" ng-repeat="item in model.value">
-            <umb-icon icon="icon-navigation" class="icon handle"></umb-icon>
-            <div class="umb-prevalues-multivalues__left">
-                <input type="text" ng-model="item.value" val-server="item_{{$index}}" required />
-            </div>
-            <div class="umb-prevalues-multivalues__right">
-                <button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></button>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/nodetype.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/nodetype.html
deleted file mode 100644
index d5dcbf9205..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/nodetype.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<select ng-model="model.value">
-	<option value="content">Content</option>
-	<option value="media">Media</option>
-	<option value="member">Members</option>
-</select>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/number.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/number.html
deleted file mode 100644
index 3f35dc244c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/number.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div>
-    <ng-form name="prevalueNumberForm">
-        <input name="numberField" class="umb-property-editor umb-number"
-               type="number"
-               ng-model="model.value"
-               fix-number />
-
-        <span ng-messages="prevalueNumberForm.numberField.$error" show-validation-on-submit >
-            <span class="help-inline" ng-message="number">Not a number</span>
-        </span>
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.html
deleted file mode 100644
index 2d223ed40a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="umb-property-editor umb-prevalues-numberrange">
-    <ng-form name="prevalueNumberRangeForm" class="flex">
-        <div>
-            <input name="numberFieldMin" class="__min-input"
-            type="number"
-            ng-model="model.value.min"
-            placeholder="0"
-            min="0"
-            ng-max="model.value.max"
-            fix-number
-            id="{{model.alias}}" />
-            <span ng-messages="prevalueNumberRangeForm.numberFieldMin.$error" show-validation-on-submit >
-                <span class="db mt1 red" ng-message="number" aria-describedby="{{model.alias}}">
-                    <localize key="validation_invalidNumber">Not a number</localize>
-                </span>
-            </span>
-        </div>
-        <span class="__enDash">–</span>
-        <div>
-            <label for="validationLimitMax" class="sr-only">
-                <localize key="maxAmount">Maximum amount</localize>
-            </label>
-            <input name="numberFieldMax" class="__max-input"
-                   type="number"
-                   ng-model="model.value.max"
-                   placeholder="∞"
-                   ng-min="model.value.min || 0"
-                   fix-number
-                   id="validationLimitMax" />
-
-            <span ng-messages="prevalueNumberRangeForm.numberFieldMax.$error" show-validation-on-submit >
-                <span class="db mt1 red" ng-message="number" aria-describedby="amountMax">
-                    <localize key="validation_invalidNumber">Not a number</localize>
-                </span>
-            </span>
-        </div>
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.less b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.less
deleted file mode 100644
index cc95b7cb8e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.less
+++ /dev/null
@@ -1,7 +0,0 @@
-.umb-prevalues-numberrange {
-    .__enDash {
-        display: inline-block;
-        vertical-align: middle;
-        margin: 5px 2px 0;
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/overlaysize.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/overlaysize.controller.js
deleted file mode 100644
index f3a2f7dd8b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/overlaysize.controller.js
+++ /dev/null
@@ -1,6 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PrevalueEditors.OverlaySizeController",
-    function ($scope) {
-        if (!$scope.model.value) {
-            $scope.model.value = "small";
-        }
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/overlaysize.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/overlaysize.html
deleted file mode 100644
index 413ef3b1d2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/overlaysize.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="umb-property-editor umb-prevalues-overlaysize" ng-controller="Umbraco.PrevalueEditors.OverlaySizeController">
-    <div class="vertical-align-items">
-        <select ng-model="model.value">
-            <option value="small">Small</option>
-            <option value="medium">Medium</option>
-            <option value="large">Large</option>
-        </select>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.controller.js
deleted file mode 100644
index 973fc974db..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.controller.js
+++ /dev/null
@@ -1,53 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PrevalueEditors.RadiobuttonListController",
-    function ($scope) {
-        
-        const vm = this;
-
-        vm.configItems = [];
-        vm.viewItems = [];
-
-        function init() {
-
-            const prevalues = ($scope.model.config ? $scope.model.config.prevalues : $scope.model.prevalues) || [];
-
-            let items = [];
-
-            for (let i = 0; i < prevalues.length; i++) {
-                const item = {};
-
-                if (Utilities.isObject(prevalues[i])) {
-                    item.value = prevalues[i].value;
-                    item.label = prevalues[i].label || prevalues[i].value;
-                }
-                else {
-                    item.value = prevalues[i];
-                    item.label = prevalues[i];
-                }
-
-                items.push({ value: item.value, label: item.label });
-            }
-            
-            vm.configItems = items;
-
-            // update view model.
-            generateViewModel();
-        }
-
-        function generateViewModel() {
-
-            vm.viewItems = [];
-
-            let iConfigItem;
-            for (let i = 0; i < vm.configItems.length; i++) {
-                iConfigItem = vm.configItems[i];
-                vm.viewItems.push({
-                    value: iConfigItem.value,
-                    label: iConfigItem.label
-                });
-            }
-
-        }
-
-        init();
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.html
deleted file mode 100644
index e8058773f6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/radiobuttonlist.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="umb-radiobuttons-preval" ng-controller="Umbraco.PrevalueEditors.RadiobuttonListController as vm">
-
-    <ul class="unstyled" ng-if="vm.viewItems.length">
-        <li ng-repeat="item in vm.viewItems track by $id(item)">
-            <umb-radiobutton
-                value="{{item.value}}"
-                model="model.value"
-                text="{{item.label}}">
-            </umb-radiobutton>
-        </li>
-    </ul>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/readonlykeyvalues.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/readonlykeyvalues.html
deleted file mode 100644
index a9a55588d4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/readonlykeyvalues.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div ng-show="model.value.length > 0">
-    <ul>
-        <li ng-repeat="preVal in model.value">
-            <i>{{preVal.Key}}</i>&nbsp;:&nbsp;<strong>{{preVal.Value}}</strong>   
-        </li>
-    </ul>        
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/requiredfield.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/requiredfield.html
deleted file mode 100644
index a1c643b21f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/requiredfield.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div>
-    <ng-form name="prevalueRequiredFieldForm">
-        <input name="requiredfield" type="text" class="umb-property-editor umb-textstring"
-               ng-model="model.value"
-               required />
-
-        <span ng-messages="prevalueRequiredFieldForm.requiredfield.$error" show-validation-on-submit >
-            <span class="help-inline" ng-message="required">Required</span>
-        </span>
-        
-    </ng-form>    
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textarea.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textarea.html
deleted file mode 100644
index abc3ae2304..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textarea.html
+++ /dev/null
@@ -1 +0,0 @@
-<textarea name="textarea" class="umb-property-editor umb-textarea" ng-model="model.value" rows="4"></textarea>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstring.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstring.html
deleted file mode 100644
index 5d613881b1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstring.html
+++ /dev/null
@@ -1 +0,0 @@
-<input type="text" id="{{model.alias}}" ng-model="model.value" ng-trim="false" class="umb-property-editor umb-textstring" />
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstringlimited.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstringlimited.html
deleted file mode 100644
index 9ec218bba5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstringlimited.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div>
-    <ng-form name="prevalueTextLimitedForm">
-        <input name="textLimitedField" class="umb-property-editor umb-number"
-               type="number"
-               ng-model="model.value"
-               val-server="value"
-               min="0"
-               max="512"
-               fix-number />
-
-        <span ng-messages="prevalueTextLimitedForm.textLimitedField.$error" show-validation-on-submit >
-            <span class="help-inline" ng-message="number">Not a number</span>
-        </span>
-
-    </ng-form>
-     
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js
deleted file mode 100644
index 7495d58780..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js
+++ /dev/null
@@ -1,130 +0,0 @@
-//this controller simply tells the dialogs service to open a mediaPicker window
-//with a specified callback, this callback will receive an object with a selection on it
-angular.module('umbraco')
-    .controller("Umbraco.PrevalueEditors.TreePickerController",
-
-    function ($scope, entityResource, iconHelper, editorService) {
-        $scope.renderModel = [];
-        $scope.ids = [];
-
-        $scope.allowRemove = true;
-        $scope.allowEdit = true;
-        $scope.sortable = false;
-
-        var config = {
-            multiPicker: false,
-            entityType: "Document",
-            type: "content",
-            treeAlias: "content",
-            idType: "udi"
-        };
-
-        //combine the config with any values returned from the server
-        if ($scope.model.config) {
-            Utilities.extend(config, $scope.model.config);
-        }
-
-        if ($scope.model.value) {
-
-            if (!Array.isArray($scope.model.value)) {
-                $scope.ids = $scope.model.value.split(",");
-            } else {
-                $scope.ids.push($scope.model.value);
-            }
-
-            entityResource.getByIds($scope.ids, config.entityType).then(function (data) {
-                _.each(data, function (item, i) {
-
-                    item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-                    $scope.renderModel.push({ name: item.name, id: item.id, icon: item.icon, udi: item.udi });
-
-                    // store the index of the new item in the renderModel collection so we can find it again
-                    var itemRenderIndex = $scope.renderModel.length - 1;
-                    // get and update the path for the picked node
-                    entityResource.getUrl(item.id, config.entityType).then(function (data) {
-                        $scope.renderModel[itemRenderIndex].path = data;
-                    });
-
-                });
-            });
-        }
-
-        $scope.openTreePicker = function () {
-            var treePicker = config;
-            treePicker.section = config.type;
-
-            treePicker.submit = function (model) {
-                if (config.multiPicker) {
-                    populate(model.selection);
-                } else {
-                    populate(model.selection[0]);
-                }
-                editorService.close();
-            };
-
-            treePicker.close = function () {
-                editorService.close();
-            };
-
-            editorService.treePicker(treePicker);
-        };
-
-        $scope.remove = function (index) {
-            $scope.renderModel.splice(index, 1);
-            $scope.ids.splice(index, 1);
-            $scope.model.value = trim($scope.ids.join(), ",");
-        };
-
-        $scope.clear = function () {
-            $scope.model.value = "";
-            $scope.renderModel = [];
-            $scope.ids = [];
-        };
-
-        $scope.add = function (item) {
-
-            var itemId = config.idType === "udi" ? item.udi : item.id;
-
-            if ($scope.ids.indexOf(itemId) < 0) {
-
-                item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-                $scope.ids.push(itemId);
-                $scope.renderModel.push({ name: item.name, id: item.id, icon: item.icon, udi: item.udi });
-                $scope.model.value = trim($scope.ids.join(), ",");
-
-                // store the index of the new item in the renderModel collection so we can find it again
-                var itemRenderIndex = $scope.renderModel.length - 1;
-                // get and update the path for the picked node
-                entityResource.getUrl(item.id, config.entityType).then(function (data) {
-                    $scope.renderModel[itemRenderIndex].path = data;
-                });
-
-            }
-        };
-
-
-        var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
-            $scope.model.value = trim($scope.ids.join(), ",");
-        });
-
-        //when the scope is destroyed we need to unsubscribe
-        $scope.$on('$destroy', function () {
-            unsubscribe();
-        });
-
-        function trim(str, chr) {
-            var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
-            return str.replace(rgxtrim, '');
-        }
-
-        function populate(data) {
-            if (Utilities.isArray(data)) {
-                _.each(data, function (item, i) {
-                    $scope.add(item);
-                });
-            } else {
-                $scope.clear();
-                $scope.add(data);
-            }
-        }
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
deleted file mode 100644
index a543c6ad3a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div ng-controller="Umbraco.PrevalueEditors.TreePickerController" class="umb-property-editor umb-contentpicker">
-
-	<div ng-model="renderModel">
-		<umb-node-preview
-			ng-repeat="node in renderModel"
-			icon="node.icon"
-			name="node.name"
-			published="node.published"
-			description="node.path"
-			sortable="sortable"
-			allow-remove="allowRemove"
-			allow-edit="allowEdit"
-			on-remove="remove($index)"
-            on-edit="openTreePicker()">
-		</umb-node-preview>
-	</div>
-
-	<button type="button"
-		    class="umb-node-preview-add"
-            ng-show="model.config.multiPicker === true || renderModel.length === 0"
-		    ng-click="openTreePicker()">
-		<localize key="general_add">Add</localize>
-	</button>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
deleted file mode 100644
index bf24d143ad..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
+++ /dev/null
@@ -1,381 +0,0 @@
-//this controller simply tells the dialogs service to open a mediaPicker window
-//with a specified callback, this callback will receive an object with a selection on it
-angular.module('umbraco')
-.controller("Umbraco.PrevalueEditors.TreeSourceController",
-
-  function ($scope, $filter, $timeout, $q, entityResource, angularHelper, iconHelper, editorService, eventsService, localizationService, udiService, udiParser) {
-
-    const vm = this;
-
-    vm.clear = clear;
-    vm.clearXPath = clearXPath;
-    vm.clearDynamicStartNode = clearDynamicStartNode;
-    vm.chooseDynamicStartNode = chooseDynamicStartNode;
-    vm.chooseXPath = chooseXPath;
-    vm.openContentPicker = openContentPicker;
-    vm.openDynamicRootOriginPicker = openDynamicRootOriginPicker;
-    vm.appendDynamicQueryStep = appendDynamicQueryStep;
-    vm.removeQueryStep = removeQueryStep;
-
-    vm.dynamicRootOrigin = null;
-    vm.querySteps = [];
-    vm.sortableModel = [];
-
-    vm.sortableOptionsForQuerySteps = {
-      axis: "y",
-      containment: "parent",
-      distance: 10,
-      opacity: 0.7,
-      tolerance: "pointer",
-      scroll: true,
-      zIndex: 6000,
-      update: function (e, ui) {
-        setDirty();
-      }
-    };
-
-    vm.showDynamicStartNode = false;
-    vm.showXPath = false;
-
-    if (!$scope.model) {
-        $scope.model = {};
-    }
-    if (!$scope.model.value) {
-      $scope.model.value = {
-          type: "content"
-      };
-    }
-    if (!$scope.model.config) {
-      $scope.model.config = {
-          idType: "udi"
-      };
-    }
-
-    if ($scope.model.value.dynamicRoot && $scope.model.value.dynamicRoot.querySteps) {
-
-      vm.sortableModel = $scope.model.value.dynamicRoot.querySteps;
-
-      syncRenderModel();
-    }
-
-    if ($scope.model.value.id && $scope.model.value.type !== "member") {
-      entityResource.getById($scope.model.value.id, entityType()).then(item => {
-          populate(item);
-      });
-    } else {
-      $timeout(function () {
-          treeSourceChanged();
-      }, 100);
-    }
-
-    function entityType() {
-      var ent = "Document";
-      if ($scope.model.value.type === "media"){
-          ent = "Media";
-      }
-      else if ($scope.model.value.type === "member") {
-          ent = "Member";
-      }
-      return ent;
-    }
-
-    function setDirty() {
-      const currentForm = angularHelper.getCurrentForm($scope);
-      if (currentForm) {
-        currentForm.$setDirty();
-      }
-    }
-
-    function openContentPicker() {
-			const treePicker = {
-        idType: $scope.model.config.idType,
-				section: $scope.model.value.type,
-				treeAlias: $scope.model.value.type,
-				multiPicker: false,
-				submit: function(model) {
-					var item = model.selection[0];
-					populate(item);
-					editorService.close();
-				},
-				close: function() {
-					editorService.close();
-				}
-      };
-
-			editorService.treePicker(treePicker);
-		}
-
-    function chooseXPath() {
-			vm.showXPath = true;
-      $scope.model.value.dynamicRoot = null;
-    }
-
-    function chooseDynamicStartNode() {
-			vm.showXPath = false;
-      $scope.model.value.dynamicRoot = {
-        originAlias: "Parent",
-        querySteps: []
-      };
-		}
-
-    function clearXPath() {
-      vm.showXPath = false;
-      $scope.model.value.query = null;
-    }
-
-    function clearDynamicStartNode() {
-      vm.showDynamicStartNode = false;
-      vm.querySteps = [];
-      vm.sortableModel = [];
-      $scope.model.value.dynamicRoot = null;
-      setSortingState(vm.querySteps);
-    }
-
-    function clear() {
-			$scope.model.value.id = null;
-      $scope.node = null;
-      $scope.model.value.query = null;
-      $scope.model.value.dynamicRoot = null;
-      treeSourceChanged();
-		}
-
-    function treeSourceChanged() {
-      eventsService.emit("treeSourceChanged", { value: $scope.model.value.type });
-    }
-
-		//we always need to ensure we dont submit anything broken
-    var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
-      if ($scope.model.value.type === "member") {
-        $scope.model.value.id = null;
-        $scope.model.value.query = "";
-        $scope.model.value.dynamicRoot = null;
-      }
-    });
-
-    //when the scope is destroyed we need to unsubscribe
-    $scope.$on('$destroy', function () {
-      unsubscribe();
-    });
-
-		function populate(item) {
-			clear();
-			item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-			$scope.node = item;
-      $scope.node.path = "";
-      $scope.model.value.id = $scope.model.config.idType === "udi" ? item.udi : item.id;
-      entityResource.getUrl(item.id, entityType()).then(function (data) {
-          $scope.node.path = data;
-      });
-		}
-
-    // Dynamic Root specific
-    $scope.$watch("model.value.dynamicRoot", function (newVal, oldVal) {
-
-      const alias = newVal ? newVal.originAlias : null;
-      const originKey = newVal ? newVal.originKey : null;
-
-      if (!alias) {
-        vm.dynamicRootOrigin = null;
-        return;
-      }
-
-      const icon = getIconForOriginAlias(alias);
-      const key = `dynamicRoot_origin${alias}Title`;
-
-      vm.dynamicRootOrigin = {
-        alias: alias,
-        icon: icon
-      };
-
-      setSortingState(newVal.querySteps);
-
-      if (originKey) {
-        const lookupId = udiService.build($scope.model.value.type === 'content' ? 'document' : $scope.model.value.type, originKey);
-
-        vm.dynamicRootOrigin.description = "Loading...";
-        //vm.dynamicRootOrigin.description = $filter('ncNodeName')(lookupId);
-
-        const udi = udiParser.parse(lookupId);
-        if (udi) {
-          entityResource.getById(udi.value, udi.entityType).then(ent => {
-            vm.dynamicRootOrigin.description = ent.name;
-          })
-        }
-
-      }
-
-      localizationService.localize(key).then(data => {
-        vm.dynamicRootOrigin.name = data;
-      });
-
-    });
-
-    $scope.$watchCollection("vm.sortableModel", function (newVal, oldVal) {
-      if (newVal !== oldVal) {
-        $scope.model.value.dynamicRoot.querySteps = newVal;
-
-        syncRenderModel();
-      }
-    });
-
-    function syncRenderModel() {
-      const promises = [];
-
-      $scope.model.value.dynamicRoot.querySteps.forEach(x => {
-        promises.push(getDataForQueryStep(x));
-      });
-
-      $q.all(promises).then(data => {
-        vm.querySteps = data;
-        setSortingState(vm.querySteps);
-      });
-    }
-
-    function getIconForOriginAlias(originAlias) {
-      switch (originAlias) {
-        case "Root":
-          return "icon-home";
-        case "Parent":
-          return "icon-page-up";
-        case "Current":
-          return "icon-document";
-        case "Site":
-          return "icon-home";
-        case "ByKey":
-          return "icon-wand";
-      }
-    }
-
-    function getIconForQueryStep(queryStep) {
-      switch (queryStep.alias) {
-        case "NearestAncestorOrSelf":
-          return "icon-chevron-up";
-        case "FurthestAncestorOrSelf":
-          return "icon-chevron-up";
-        case "NearestDescendantOrSelf":
-          return "icon-chevron-down";
-        case "FurthestDescendantOrSelf":
-          return "icon-chevron-down";
-      }
-      return "icon-lab";
-    }
-
-    function getNameKeyForQueryStep(queryStep) {
-
-      let key = "";
-
-      switch (queryStep.alias) {
-        case "NearestAncestorOrSelf":
-        case "FurthestAncestorOrSelf":
-        case "NearestDescendantOrSelf":
-        case "FurthestDescendantOrSelf":
-          key = `dynamicRoot_queryStep${queryStep.alias}Title`;
-      }
-
-      return key;
-    }
-
-    function getDataForQueryStep(queryStep) {
-      const deferred = $q.defer();
-
-      const icon = getIconForQueryStep(queryStep);
-      let nameKey = getNameKeyForQueryStep(queryStep);
-
-      const keys = [
-        nameKey,
-        "dynamicRoot_queryStepTypes"
-      ];
-
-      localizationService.localizeMany(keys).then(values => {
-
-        const name = values[0] === "[]" ? queryStep.alias : values[0];
-        let description = null;
-
-        if (queryStep.anyOfDocTypeKeys && queryStep.anyOfDocTypeKeys.length > 0) {
-          description = (values[1] || "That matches types: ") + queryStep.anyOfDocTypeKeys.join(", ")
-        }
-
-        const obj = {
-          alias: queryStep.alias,
-          name: name,
-          description: description,
-          icon: icon
-        };
-
-        deferred.resolve(obj);
-
-      });
-
-      return deferred.promise;
-    }
-
-    function removeQueryStep(queryStep, index) {
-      if (index !== -1) {
-        $scope.model.value.dynamicRoot.querySteps.splice(index, 1);
-        vm.sortableModel = $scope.model.value.dynamicRoot.querySteps;
-        vm.querySteps.splice(index, 1);
-        setSortingState(vm.querySteps);
-      }
-    }
-
-    function setSortingState(items) {
-      // disable sorting if the list only consist of one item
-      if (items.length <= 1 || $scope.readonly) {
-        vm.sortableOptionsForQuerySteps.disabled = true;
-      } else {
-        vm.sortableOptionsForQuerySteps.disabled = false;
-      }
-    }
-
-    function openDynamicRootOriginPicker() {
-			const originPicker = {
-        view: "views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.html",
-        contentType: $scope.model.value.type,
-        size: "small",
-        value: {...$scope.model.value.dynamicRoot},
-				multiPicker: false,
-				submit: function(model) {
-          $scope.model.value.dynamicRoot = model.value;
-					editorService.close();
-				},
-				close: function() {
-					editorService.close();
-				}
-			};
-			editorService.open(originPicker);
-		}
-
-    function appendDynamicQueryStep() {
-      const queryStepPicker = {
-        view: "views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.html",
-        contentType: $scope.model.value.type,
-        size: "small",
-				multiPicker: false,
-				submit: function(model) {
-          if (!$scope.model.value.dynamicRoot.querySteps) {
-            $scope.model.value.dynamicRoot.querySteps = [];
-          }
-
-          $scope.model.value.dynamicRoot.querySteps.push(model.value);
-
-          vm.sortableModel = $scope.model.value.dynamicRoot.querySteps;
-
-          const promises = [
-            getDataForQueryStep(model.value)
-          ];
-
-          $q.all(promises).then(data => {
-            vm.querySteps.push(data[0]);
-            setSortingState(vm.querySteps);
-          });
-
-					editorService.close();
-				},
-				close: function() {
-					editorService.close();
-				}
-			};
-			editorService.open(queryStepPicker);
-    }
-
-});
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
deleted file mode 100644
index a0cc2496ad..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<div ng-controller="Umbraco.PrevalueEditors.TreeSourceController as vm" class="umb-property-editor umb-contentpicker">
-
-	<select ng-model="model.value.type" class="umb-property-editor" ng-change="vm.clear()">
-		<option value="content">Content</option>
-		<option value="media">Media</option>
-		<option value="member">Members</option>
-	</select>
-
-  <h5 ng-if="node"><localize key="contentPicker_configurationStartNodeTitle">Root node</localize></h5>
-
-  <umb-node-preview
-		  ng-if="node"
-      class="mt1"
-		  icon="node.icon"
-		  name="node.name"
-		  published="node.published"
-		  description="node.path"
-		  allow-remove="true"
-		  allow-edit="true"
-		  on-remove="vm.clear()"
-		  on-edit="vm.openContentPicker()">
-	</umb-node-preview>
-
-    <div ng-if="!node && model.value.type === 'content'" class="mt2">
-        <div ng-hide="(vm.showXPath || model.value.query) || (vm.showDynamicStartNode || model.value.dynamicRoot)" class="flex">
-          <button
-            type="button"
-            class="umb-node-preview-add"
-            ng-click="vm.openContentPicker()">
-            <localize key="contentPicker_defineRootNode">Pick root node</localize>
-          </button>
-          <button
-            type="button"
-            class="umb-node-preview-add"
-            ng-click="vm.chooseXPath()">
-            <localize key="contentPicker_defineXPathOrigin">Specify root via XPath</localize>
-          </button>
-          <button
-            type="button"
-            class="umb-node-preview-add"
-            ng-click="vm.chooseDynamicStartNode()">
-            <localize key="contentPicker_defineDynamicRoot">Specify a Dynamic Root</localize>
-          </button>
-        </div>
-
-        <div ng-if="vm.showXPath || model.value.query">
-
-          <h5><localize key="contentPicker_configurationXPathTitle">XPath Query</localize></h5>
-
-            <input type="text"
-                   ng-model="model.value.query"
-                   class="umb-property-editor umb-textstring"
-                   placeholder="Enter XPath query">
-
-            <ul class="unstyled list-icons mt3">
-                <li style="max-width: 600px">
-                    <umb-icon icon="icon-help-alt" class="icon"></umb-icon>
-                    <button type="button" class="btn-link" ng-click="showHelp = !showHelp">{{showHelp ? 'Hide' : 'Show'}} XPath query help</button>
-
-                    <div class="small" ng-show="showHelp">
-                        <p>
-                            Use an XPath query to set a root node on the tree, either based on a search from the root of the content tree, or by using a context-aware placeholder.
-                        </p>
-
-                        <p>
-                            A placeholder finds the nearest published ID and runs its query from there, so for instance:
-                        </p>
-
-                        <pre>$parent/newsArticle</pre>
-
-                        <p>
-                            Will try to get the parent if available, but will then fall back to the nearest ancestor and query for all news article children there.
-                        </p>
-
-                        <p>
-                            Available placeholders: <br/>
-                            <code>$current</code>: Current page or closest found ancestor<br/>
-                            <code>$parent</code>: Parent page or closest found ancestor<br/>
-                            <code>$root</code>: Root of the content tree<br/>
-                            <code>$site</code>: Ancestor node at level 1<br/>
-                        </p>
-                        <p>
-                            Note: The placeholder can only be used at the beginning of the query.
-                        </p>
-                    </div>
-                </li>
-                <li>
-                    <umb-icon icon="icon-delete" class="icon red"></umb-icon>
-                    <button type="button" class="btn-link" ng-click="vm.clearXPath()">Cancel and clear query</button>
-                </li>
-            </ul>
-        </div>
-      <div ng-if="vm.showDynamicStartNode || model.value.dynamicRoot">
-
-        <h5><localize key="dynamicRoot_configurationTitle">Dynamic Root Query</localize></h5>
-
-        <!-- Origin -->
-        <umb-node-preview
-            single
-            icon="vm.dynamicRootOrigin.icon"
-            name="vm.dynamicRootOrigin.name"
-            description="vm.dynamicRootOrigin.description"
-            allow-change="true"
-            allow-remove="false"
-            on-change="vm.openDynamicRootOriginPicker()">
-        </umb-node-preview>
-
-        <!-- List of query steps -->
-        <div ui-sortable="vm.sortableOptionsForQuerySteps" ng-model="vm.sortableModel" ng-if="vm.querySteps">
-          <umb-node-preview
-              ng-repeat="queryStep in vm.querySteps track by $id(queryStep)"
-              single
-              class="mt1"
-              icon="queryStep.icon"
-              name="queryStep.name"
-              description="queryStep.description"
-              allow-edit="false"
-              allow-remove="true"
-              on-remove="vm.removeQueryStep(queryStep, $index)">
-          </umb-node-preview>
-        </div>
-
-        <button
-          type="button"
-          class="umb-node-preview-add mt1"
-          ng-click="vm.appendDynamicQueryStep()">
-          <localize key="dynamicRoot_addQueryStep">Add query step</localize>
-        </button>
-
-        <ul class="unstyled list-icons mt3">
-          <li>
-            <umb-icon icon="icon-delete" class="icon red"></umb-icon>
-            <button type="button" class="btn-link" ng-click="vm.clearDynamicStartNode()"><localize key="dynamicRoot_cancelAndClearQuery">Cancel and clear query</localize></button>
-          </li>
-        </ul>
-      </div>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
deleted file mode 100644
index d02e626bfa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
+++ /dev/null
@@ -1,109 +0,0 @@
-function TreeSourceTypePickerController($scope, contentTypeResource, mediaTypeResource, memberTypeResource, editorService, eventsService, angularHelper) {
-    var vm = this;
-    vm.loading = false;
-    vm.itemTypes = [];
-    vm.remove = remove;
-    vm.add = add;
-
-    var allItemTypes = null;
-    var currentItemType = null;
-
-    function init() {
-        vm.loading = true;
-
-        switch (currentItemType) {
-            case "content":
-                contentTypeResource.getAll().then(getAllItemTypesCallback);
-                break;
-            case "media":
-                mediaTypeResource.getAll().then(getAllItemTypesCallback);
-                break;
-            case "member":
-                memberTypeResource.getTypes().then(getAllItemTypesCallback);
-                break;
-        }
-    }
-
-    function getAllItemTypesCallback(all) {
-        allItemTypes = all;
-        vm.loading = false;
-        // the model value is a comma separated list of content type aliases
-        var currentItemTypes = _.map(($scope.model.value || "").split(","), function (s) { return s.trim(); });
-        vm.itemTypes = _.filter(allItemTypes, function (itemType) {
-            return currentItemTypes.indexOf(itemType.alias) >= 0;
-        });
-    }
-
-    function add() {
-        if (!currentItemType) {
-            return;
-        }
-
-        var editor = {
-            multiPicker: true,
-            filterCssClass: "not-allowed not-published",
-            filter: function (item) {
-                // filter out folders (containers), element types (for content) and already selected items
-                return item.nodeType === "container" || item.metaData.isElement || !!_.findWhere(vm.itemTypes, { udi: item.udi });
-            },
-            submit: function (model) {
-                var newItemTypes = _.map(model.selection,
-                    function(selected) {
-                        return _.findWhere(allItemTypes, { udi: selected.udi });
-                    });
-                vm.itemTypes = _.uniq(_.union(vm.itemTypes, newItemTypes));
-                updateModel();
-                editorService.close();
-            },
-            close: function() {
-                editorService.close();
-            }
-        };
-
-        switch (currentItemType) {
-            case "content":
-                editorService.contentTypePicker(editor);
-                break;
-            case "media":
-                editorService.mediaTypePicker(editor);
-                break;
-            case "member":
-                editorService.memberTypePicker(editor);
-                break;
-        }
-    }
-
-    function remove(itemType) {
-        vm.itemTypes = _.without(vm.itemTypes, itemType);
-        updateModel();
-    }
-
-    function updateModel() {
-        // the model value is a comma separated list of content type aliases
-        $scope.model.value = _.pluck(vm.itemTypes, "alias").join();
-        angularHelper.getCurrentForm($scope).$setDirty();
-    }
-    var evts = [];
-    evts.push(eventsService.on("treeSourceChanged", function (e, args) {
-        // reset the model value if we changed node type (but not on the initial load)
-        if (!!currentItemType && currentItemType !== args.value) {
-            vm.itemTypes = [];
-            updateModel();
-        }
-        currentItemType = args.value;
-        init();
-    }));
-
-    $scope.$on('$destroy', function () {
-        for (var e in evts) {
-            eventsService.unsubscribe(evts[e]);
-        }
-    });
-
-    if ($scope.model.config.itemType) {
-        currentItemType = $scope.model.config.itemType;
-        init();
-    }
-}
-
-angular.module('umbraco').controller("Umbraco.PrevalueEditors.TreeSourceTypePickerController", TreeSourceTypePickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html
deleted file mode 100644
index cdbacfc7f3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div ng-controller="Umbraco.PrevalueEditors.TreeSourceTypePickerController as vm" class="umb-property-editor umb-contenttypepicker">
-
-    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-    <div ng-show="!vm.loading">
-        <umb-node-preview ng-repeat="itemType in vm.itemTypes"
-                          class="mt1"
-                          icon="itemType.icon"
-                          name="itemType.name"
-                          allow-remove="true"
-                          allow-edit="false"
-                          on-remove="vm.remove(itemType)">
-        </umb-node-preview>
-
-        <button type="button"
-                class="umb-node-preview-add"
-                ng-click="vm.add()">
-            <localize key="general_add">Add</localize>
-        </button>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/valuetype.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/valuetype.html
deleted file mode 100644
index 739ef11226..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/valuetype.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<select ng-model="model.value" required>
-    <option value="STRING">String</option>
-    <option value="DECIMAL">Decimal</option>
-    <option value="DATETIME">Date/time</option>
-    <option value="TIME">Time</option>
-    <option value="INT">Integer</option>
-    <option value="BIGINT">Big integer</option>
-    <option value="TEXT">Long string</option>
-</select>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgrid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgrid.html
deleted file mode 100644
index 05432fa862..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgrid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<umb-block-grid-property-editor 
-    model="model" 
-    ng-attr-readonly="{{ readonly || undefined }}">
-</umb-block-grid-property-editor>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html
deleted file mode 100644
index 31d759188c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<style>
-    .blockelement-gridblock-editor {
-        position: relative;
-        border-radius: 3px;
-        height: 100%;/* Add this to fill the cell fully */
-        box-sizing: border-box;
-        border: 1px solid #E9E9EB;
-        background-color: white;
-    }
-    
-    .blockelement-gridblock-editor > button {
-        position: relative;
-        display: flex;
-        align-items: center;
-        width: 100%;
-        min-height: 48px;
-        cursor: pointer;
-        color: #1b264f;
-        background-color: white;
-        text-align: left;
-        padding: 0 20px;
-        user-select: none;
-        border: none;
-        transition: border-color 120ms, background-color 120ms;
-    }
-    .blockelement-gridblock-editor > button:hover {
-        color: #2152A3;
-    }
-    .blockelement-gridblock-editor .icon {
-        font-size: 22px;
-        margin-right: 10px;
-        display: inline-block;
-    }
-
-    .blockelement-gridblock-editor > button > span {
-        position: relative;
-        display: inline-block;
-        padding-top:2px;
-        padding-bottom:2px;
-    }
-    
-    :host {
-        --inherited--areas-column-gap: var(--umb-block-grid--areas-column-gap, 0);
-        --inherited--areas-row-gap: var(--umb-block-grid--areas-row-gap, 0);
-    }
-
-    [part='area-container'] {
-        box-sizing: border-box;
-        padding: 10px;
-        --umb-block-grid--areas-column-gap: 10px;
-        --umb-block-grid--areas-row-gap: 10px;
-    }
-    [part='area-container'] slot {
-        --umb-block-grid--areas-column-gap: var(--inherited--areas-column-gap, 0);
-        --umb-block-grid--areas-row-gap: var(--inherited--areas-row-gap, 0);
-    }
-
-</style>
-
-<div class="blockelement-gridblock-editor" ng-class="{ '--active': block.active, '--error': parentForm.$invalid && valFormManager.isShowingValidation() }">
-    <button type="button"
-        ng-click="block.showContent ? block.edit() : null"
-        ng-focus="block.focus"
-        val-server-property-class="">
-        <umb-icon icon="{{block.content.icon}}" class="icon"></umb-icon>
-        <span>{{block.label}}</span>
-    </button>
-
-    <umb-block-grid-render-area-slots ng-if="block.layout.areas.length > 0"></umb-block-grid-render-area-slots>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.controller.js
deleted file mode 100644
index 3d55ea1836..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.controller.js
+++ /dev/null
@@ -1,73 +0,0 @@
-(function () {
-    'use strict';
-
-    function GridInlineBlockEditor($scope, $compile, $element) {
-
-        const vm = this;
-
-        var propertyEditorElement;
-
-        vm.$onInit = function() {
-            
-            vm.property = $scope.block.content.variants[0].tabs[0]?.properties[0];
-
-            if (vm.property) {
-                vm.propertySlotName = "umbBlockGridProxy_" + vm.property.alias + "_" + String.CreateGuid();
-                
-                propertyEditorElement = $('<div slot="{{vm.propertySlotName}}"></div>');
-                propertyEditorElement.html(
-                    `
-                    <umb-property
-                        data-element="grid-block-property-{{vm.property.alias}}"
-                        property="vm.property"
-                        node="$scope.block.content"
-                        hide-label="true">
-
-                        <umb-property-editor 
-                            model="vm.property" 
-                            preview="$scope.api.internal.readonly" 
-                            ng-attr-readonly="{{$scope.api.internal.readonly || undefined}}">
-                        </umb-property-editor>
-
-                    </umb-property>
-                    `
-                );
-                
-                $element[0].addEventListener('umb-rte-focus', onRteFocus);
-                $element[0].addEventListener('umb-rte-blur', onRteBlur);
-
-                const connectedCallback = () => {
-                    
-                    $compile(propertyEditorElement)($scope)
-                };
-                
-                const event = new CustomEvent("UmbBlockGrid_AppendProperty", {composed: true, bubbles: true, detail: {'property': propertyEditorElement[0], 'contentUdi': $scope.block.layout.contentUdi, 'slotName': vm.propertySlotName, 'connectedCallback':connectedCallback}});
-                
-                $element[0].dispatchEvent(event);
-                
-            }
-        }
-
-        function onRteFocus() {
-            $element[0].classList.add('umb-block-grid--force-focus');
-        }
-        function onRteBlur() {
-            $element[0].classList.remove('umb-block-grid--force-focus');
-        }
-
-        vm.$onDestroy = function() {
-            if (vm.property) {
-                const event = new CustomEvent("UmbBlockGrid_RemoveProperty", {composed: true, bubbles: true, detail: {'slotName': vm.propertySlotName}});
-                $element[0].dispatchEvent(event);
-            }
-
-            $element[0].removeEventListener('umb-rte-focus', onRteFocus);
-            $element[0].removeEventListener('umb-rte-blur', onRteBlur);
-            propertyEditorElement = null;
-        }
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockEditor.GridInlineBlockEditor", GridInlineBlockEditor);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.html
deleted file mode 100644
index 2964cebc86..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<style>
-    .blockelement-gridinlineblock-editor {
-        position: relative;
-        border-radius: 3px;
-        height: 100%;/* Add this to fill the cell fully */
-        box-sizing: border-box;
-        border: 1px solid #E9E9EB;
-        background-color: white;
-    }
-    
-    .blockelement-gridinlineblock-editor > .blockelement-gridinlineblock-label {
-        position: relative;
-        display: flex;
-        align-items: center;
-        width: 100%;
-        min-height: 48px;
-        color: #1b264f;
-        background-color: white;
-        text-align: left;
-        padding: 0 20px;
-        user-select: none;
-        border: none;
-        box-sizing: border-box;
-        transition: min-height 120ms;
-    }
-    .blockelement-gridinlineblock-editor > .blockelement-gridinlineblock-label > .icon {
-        font-size: 22px;
-        margin-right: 10px;
-        display: inline-block;
-    }
-    .blockelement-gridinlineblock-editor > .blockelement-gridinlineblock-label > span {
-        position: relative;
-        display: inline-block;
-        padding-top:2px;
-        padding-bottom:2px;
-    }
-
-    .blockelement-gridinlineblock-editor > button {
-        cursor: pointer;
-        transition: border-color 120ms, background-color 120ms;
-    }
-    .blockelement-gridinlineblock-editor > button:hover {
-        color: #2152A3;
-    }
-
-
-    :host .blockelement-gridinlineblock-editor > .blockelement-gridinlineblock-label {
-        min-height: 0;
-        height: 0;
-        overflow: hidden;
-    }
-    .blockelement-gridinlineblock-editor.umb-block-grid--force-focus > .blockelement-gridinlineblock-label,
-    :host(:focus) .blockelement-gridinlineblock-editor > .blockelement-gridinlineblock-label,
-    :host(:focus-within) .blockelement-gridinlineblock-editor > .blockelement-gridinlineblock-label {
-        min-height: 48px;
-        height: auto;
-    }
-
-    .blockelement-gridinlineblock-editor > slot {
-        --umb-block-grid--inline-editor--pointer-events--condition: var(--umb-block-grid--dragging-mode) none;
-        pointer-events: var(--umb-block-grid--inline-editor--pointer-events--condition, auto);
-    }
-
-</style>
-
-<div 
-    class="blockelement-gridinlineblock-editor"
-    ng-controller="Umbraco.PropertyEditors.BlockEditor.GridInlineBlockEditor as vm"
-    ng-class="{ '--active': block.active, '--error': parentForm.$invalid && valFormManager.isShowingValidation() }">
-    
-    <button 
-        ng-if="!block.config.forceHideContentEditorInOverlay"
-        type="button"
-        ng-click="block.edit()"
-        ng-focus="block.focus"
-        class="blockelement-gridinlineblock-label"
-        val-server-property-class="">
-        <umb-icon icon="{{block.content.icon}}" class="icon"></umb-icon>
-        <span>{{block.label}}</span>
-    </button>
-    <div 
-        ng-if="block.config.forceHideContentEditorInOverlay"
-        class="blockelement-gridinlineblock-label"
-        val-server-property-class="">
-        <umb-icon icon="{{block.content.icon}}" class="icon"></umb-icon>
-        <span>{{block.label}}</span>
-    </div>
-
-    <slot name="{{vm.propertySlotName}}"></slot>
-
-    <umb-block-grid-render-area-slots ng-if="block.layout.areas.length > 0"></umb-block-grid-render-area-slots>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridsortblock/gridsortblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridsortblock/gridsortblock.editor.html
deleted file mode 100644
index bd1ab8afc9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridsortblock/gridsortblock.editor.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<style>
-    @keyframes umb-icon-jump {
-        0%, 100% { transform: rotate(6deg); }
-        50% { transform: rotate(-6deg); }
-    }
-
-    .umb-icon {
-        animation: umb-icon-jump 1s infinite ease-in-out;
-    }
-
-    .blockelement-gridsortblock-editor {
-        position: relative;
-        border-radius: 3px;
-        height: 100%;/* Add this to fill the cell fully */
-        box-sizing: border-box;
-        border: 1px solid #E9E9EB;
-        background-color: white;
-    }
-    
-    .blockelement-gridsortblock-editor > button {
-        position: relative;
-        display: flex;
-        align-items: center;
-        width: 100%;
-        min-height: 48px;
-        cursor: pointer;
-        color: #1b264f;
-        background-color: white;
-        text-align: left;
-        padding: 0 20px;
-        user-select: none;
-        border: none;
-        transition: border-color 120ms, background-color 120ms;
-    }
-    .blockelement-gridsortblock-editor > button:hover {
-        color: #2152A3;
-    }
-    .blockelement-gridsortblock-editor .icon {
-        font-size: 22px;
-        margin-right: 10px;
-        display: inline-block;
-    }
-
-    .blockelement-gridsortblock-editor > button > span {
-        position: relative;
-        display: inline-block;
-        padding-top:2px;
-        padding-bottom:2px;
-    }
-
-    :host {
-        --inherited--column-gap: var(--umb-block-grid--column-gap, 10px);
-        --inherited--row-gap: var(--umb-block-grid--row-gap, 10px);
-        --inherited--areas-column-gap: var(--umb-block-grid--areas-column-gap, 10px);
-        --inherited--areas-row-gap: var(--umb-block-grid--areas-row-gap, 10px);
-    }
-
-    [part='area-container'] {
-        box-sizing: border-box;
-        padding: 10px;
-        --umb-block-grid--column-gap: var(--inherited--column-gap, 10px);
-        --umb-block-grid--row-gap: var(--inherited--row-gap, 10px);
-        --umb-block-grid--areas-column-gap: var(--inherited--areas-column-gap, 10px);
-        --umb-block-grid--areas-row-gap: var(--inherited--areas-row-gap, 10px);
-    }
-
-</style>
-
-<div class="blockelement-gridsortblock-editor" ng-class="{ '--active': block.active, '--error': parentForm.$invalid && valFormManager.isShowingValidation() }">
-    <button type="button"
-        ng-click="block.showContent ? block.edit() : null"
-        ng-focus="block.focus"
-        val-server-property-class="">
-        <umb-icon icon="{{block.content.icon}}" class="icon"></umb-icon>
-        <span>{{block.label}}</span>
-    </button>
-
-    <umb-block-grid-render-area-slots ng-if="block.layout.areas.length > 0"></umb-block-grid-render-area-slots>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.html
deleted file mode 100644
index ed0795e791..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<style>
-    .blockelement-unsupportedblock-editor {
-        position: relative;
-        display: block;
-        box-sizing: border-box;
-        width: 100%;
-        border: 1px solid #E9E9EB;
-        border-radius: 3px;
-        background-color: lightgrey;
-    }
-
-    .blockelement-unsupportedblock-editor > .__header {
-        display: flex;
-        align-items: center;
-        padding-left: 20px;
-        padding-bottom: 2px;
-        min-height: 48px;
-        border-bottom: 1px solid #E9E9EB;  
-        background-color: white;
-        color: #333333;
-    }
-            
-    .blockelement-unsupportedblock-editor > .__header.icon {
-        font-size: 22px;
-        margin-right: 5px;
-        display: inline-block;
-        vertical-align: middle;
-    }
-    .blockelement-unsupportedblock-editor > .__headerspan {
-        display: inline-block;
-        vertical-align: middle;
-    }
-
-    .blockelement-unsupportedblock-editor > .__body {
-        padding: 20px;
-    }
-    .blockelement-unsupportedblock-editor > .__body a {
-        text-decoration: underline;
-        color: blue;
-    }
-
-
-</style>
-
-<div class="blockelement-unsupportedblock-editor" ng-focus="block.focus">
-    <div class="__header">
-        <umb-icon icon="icon-alert" class="icon" style="margin-right:10px"></umb-icon>
-        <span>{{block.config.label}}</span>
-    </div>
-    <div class="__body">
-        This content is no longer supported in this context.<br/>
-        You might want to remove this block, or contact your developer to take actions for making this block available again.<br/><br/>
-        <!-- TODO: Add link when we have one 
-		    <a href="http://our.umbraco.com" target="_blank" rel="noopener">Learn more about this warning</a>
-		-->
-        <h5>Block data:</h5>
-        <pre>{{block.data | json : 4 }}</pre>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.less
deleted file mode 100644
index 8b8fcef9e7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.less
+++ /dev/null
@@ -1,46 +0,0 @@
-.blockelement-unsupportedblock-editor {
-    position: relative;
-    display: block;
-    box-sizing: border-box;
-    margin-bottom: 4px;
-    margin-top: 4px;
-    width: 100%;
-    border: 1px solid @gray-9;
-    border-radius: @baseBorderRadius;
-
-    > .__header {
-        display: flex;
-        align-items: center;
-        padding-left: 20px;
-        padding-bottom: 2px;
-        min-height: 48px;
-        border-bottom: 1px solid @gray-9;    
-        background-color: @gray-11;
-        color: @gray-6;
-        
-        .icon {
-            font-size: 22px;
-            margin-right: 5px;
-            display: inline-block;
-            vertical-align: middle;
-        }
-        span {
-            display: inline-block;
-            vertical-align: middle;
-        }
-    }
-
-    > .__body {
-        padding: 20px;
-        background-color: @gray-11;
-
-        a {
-            text-decoration: underline;
-            color: @ui-action-type;
-
-            &:hover {
-                color: @ui-action-type-hover;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
deleted file mode 100644
index 1f31a8b48d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
+++ /dev/null
@@ -1,781 +0,0 @@
-@import "../../../less/variables.less";
-@import "../../../less/mixins.less";
-@import "../../../less/icons.less";
-@import "../../../less/buttons.less";
-@import "../../../less/accessibility/sr-only.less";
-
-@umb-block-grid__item_minimum_height: 48px;
-
-.umb-block-grid {
-    padding-bottom:10px;
-}
-
-.umb-block-grid .umb-load-indicator {
-    margin-bottom:20px;
-}
-
-.umb-block-grid {
-    position: relative;
-}
-
-.umb-block-grid__layout-item {
-    position: relative;
-}
-
-.umb-block-grid__block--validation-border {
-    display:none;
-}
-ng-form.ng-invalid-val-server-match-settings > .umb-block-grid__block:not(.--active) > .umb-block-grid__block--validation-border, 
-ng-form.ng-invalid-val-server-match-content > .umb-block-grid__block:not(.--active) > .umb-block-grid__block--validation-border {
-    display: block;
-    position: absolute;
-    inset: 0;
-    border-radius: 3px;
-    border: 1px solid @formErrorText;
-    box-shadow: 0 0 0 1px rgba(255, 255, 255, .7), inset 0 0 0 1px rgba(255, 255, 255, .7);
-    /* TODO: not working cause we are in a shadow DOM: */
-    .show-validation-type-warning & {
-        border-color: @formWarningText;
-    }
-    pointer-events: none;
-}
-
-.umb-block-grid__block {
-    position: relative;
-    width: 100%;
-    height: 100%;
-
-    --umb-block-grid--block-ui-opacity: 0;
-    --umb-block-grid--hint-area-ui: 0;
-
-    &::after {
-        content: '';
-        position: absolute;
-        z-index: 1;
-        pointer-events: none;
-        display: none;
-        inset: 0;
-        border: 1px solid transparent;
-        border-radius: 3px;
-        box-shadow: 0 0 0 1px rgba(255, 255, 255, .7), inset 0 0 0 1px rgba(255, 255, 255, .7);
-        
-        transition: border-color 240ms ease-in;
-    }
-
-    > .umb-block-grid__block--actions {
-        opacity: 0;
-        transition: opacity 120ms;
-    }
-    > .umb-block-grid__block--context {
-        opacity: 0;
-        transition: opacity 120ms;
-    }
-    > umb-block-grid-block > umb-block-grid-entries > .umb-block-grid__block--context {
-        opacity: 0;
-        transition: opacity 120ms;
-    }
-
-    &:hover,
-    &:focus,
-    &:focus-within {
-
-        --umb-block-grid--hint-area-ui: 1;
-
-        &::after {
-            display: var(--umb-block-grid--block-ui-display, block);
-            border-color: @blueDark;
-        }
-    }
-    &.--active {
-        &::after {
-            display: block;
-            border-color: @pinkLight;
-        }
-        
-        > .umb-block-grid__block--context {
-            .__context-bar {
-                background-color: @ui-active-border;
-                color: @ui-active-type;
-            }
-        }
-    }
-
-    &.--scale-mode {
-        &::after {
-            display: block;
-
-            z-index: 10;
-            cursor: nwse-resize;
-            pointer-events: all;
-
-            transition: background-color 240ms ease-in;
-            animation: umb-block-grid__scalebox__pulse 400ms ease-in-out alternate infinite;
-            @keyframes umb-block-grid__scalebox__pulse {
-                0%   { background-color: rgba(@blueMidLight, 0.33); }
-                100% { background-color: rgba(@blueMidLight, 0.22); }
-            }
-        }
-
-        > .umb-block-grid__block--context {
-            opacity: 1;
-        }
-        > .umb-block-grid__scale-handler {
-            opacity: 1;
-        }
-        > .umb-block-grid__scale-label {
-            opacity: 1;
-        }
-    }
-    
-    /** make sure to hide child block ui: */
-    &.--hovering-area:not(.--block-ui-visible) {
-        &::after {
-            display: none;
-        }
-        > .umb-block-grid__scale-handler {
-            display: none;
-        }
-        > .umb-block-grid__block--context {
-            display: none;
-        }
-        > .umb-block-grid__block--actions {
-            display: none;
-        }
-    }
-    &.--block-ui-visible {
-
-        > .umb-block-grid__block--context {
-            /* take full width to prevent interaction with elements behind.*/
-            left: 0;
-        }
-        .umb-block-grid__area-container, .umb-block-grid__block--view::part(area-container) {
-            --umb-block-grid--block-ui-display: none;
-            pointer-events: none;
-        }
-        .umb-block-grid__layout-item {
-            pointer-events: none;
-        }
-        .umb-block-grid__block {
-            pointer-events: none;
-            --umb-block-grid--block-ui-opacity: 0;
-        }
-    }
-    
-    &.--hovering-area.--block-ui-visible:hover,
-    &.--hovering-area.--block-ui-visible:focus,
-    &.--hovering-area.--block-ui-visible:focus-within,
-
-    &:not(.--hovering-area):hover,
-    &:not(.--hovering-area):focus,
-    &:not(.--hovering-area):focus-within,
-    &.--active {
-
-        /** Avoid displaying hover when dragging-mode */
-        --umb-block-grid--block-ui-opacity--condition: var(--umb-block-grid--dragging-mode) 0;
-        --umb-block-grid--block-ui-opacity: var(--umb-block-grid--block-ui-opacity--code, 1);
-        
-        > .umb-block-grid__block--context {
-            opacity: var(--umb-block-grid--block-ui-opacity);
-        }
-        &:not(.--scale-mode) {
-            > .umb-block-grid__block--actions {
-                z-index: 4;
-                opacity: var(--umb-block-grid--block-ui-opacity);
-            }
-    
-            > umb-block-grid-block > umb-block-grid-entries > .umb-block-grid__layout-container > .umb-block-grid__area-actions {
-                opacity: var(--umb-block-grid--block-ui-opacity);
-            }
-        }
-        
-        > .umb-block-grid__scale-handler {
-            opacity: var(--umb-block-grid--block-ui-opacity);
-        }
-    }
-}
-
-ng-form.ng-invalid > .umb-block-grid__block:not(.--active) > .umb-block-grid__block--actions {
-    opacity: 1;
-}
-
-.umb-block-grid__block--view {
-    height: 100%;
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-}
-
-.umb-block-grid__block--context {
-    position: absolute;
-    bottom: 100%;
-    right: -1px;
-    max-width: 100%;
-    font-size: 12px;
-    z-index: 4;
-    display: var(--umb-block-grid--block-ui-display, flex);
-    justify-content: end;
-
-    /** prevent interaction with inline-create button just beneath the context-bar: */
-    &::after {
-        content: '';
-        position: absolute;
-        top: 100%;
-        left: 0;
-        right: 0;
-        height: 12px;
-    }
-
-    .__context-bar {
-        padding: 0 9px;
-        padding-top: 1px;
-        background-color: @blueDark;
-        color: white;
-        border-top: rgba(255, 255, 255, .7) 1px solid;
-        border-left: rgba(255, 255, 255, .7) 1px solid;
-        border-right: rgba(255, 255, 255, .7) 1px solid;
-        border-top-left-radius: 3px;
-        border-top-right-radius: 3px;
-        display: inline-flex;
-        box-sizing: border-box;
-
-        max-width: 100%;
-        white-space: nowrap;
-
-        /* Ensure that the bar is visually connected with the border **/
-        &::before {
-            content: '';
-            position: absolute;
-            left: 0;
-            bottom: -1px;
-            width: 1px;
-            border-top: 1px solid @blueDark;
-            box-sizing: border-box;
-            background: none;
-        }
-        &::after {
-            content: '';
-            position: absolute;
-            right: 1px;
-            bottom: -2px;
-            height: 2px;
-            width: 2px;
-            border-top: 1px solid @blueDark;
-            border-right: 1px solid @blueDark;
-            box-sizing: border-box;
-            background: none;
-        }
-
-        .action {
-            color: currentColor;
-            font-size: 12px;
-            line-height: inherit;
-
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-        .__divider {
-            margin: 0 3px;
-        }
-        .__label {
-            align-items: center;
-            padding: 0;
-            font-weight: 700;
-            user-select: none;
-
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-    }
-}
-
-.umb-block-grid__block--actions {
-    position: absolute;
-    top: 0px;
-    padding-top:10px;/** set to make sure programmatic scrolling gets the top of the block into view. */
-
-    right: 10px;
-
-    /*
-    If child block, it can be hidden if a parents sets: --umb-block-grid--block-ui-display: none;
-    */
-    display: var(--umb-block-grid--block-ui-display, flex);
-    opacity: 1;
-    z-index:3;
-    
-    font-size: 0;
-    background-color: rgba(255, 255, 255, .96);
-    border-radius: 16px;
-    align-items: center;
-    padding: 0 5px;
-    margin-top:10px;
-
-    .action {
-        color: @ui-action-discreet-type;
-        font-size: 18px;
-        padding: 5px;
-        &:hover {
-            color: @ui-action-discreet-type-hover;
-        }
-    }
-
-    .action {
-        position: relative;
-        display: inline-block;
- 
-        &.--error {
-            color: @errorBackground;
-            /** TODO: warning color class does not work in shadowDOM. */
-            .show-validation-type-warning & {
-                color: @warningBackground;
-            }
-        }
-
-        > .__error-badge {
-            position: absolute;
-            top: -2px;
-            right: -2px;
-            min-width: 8px;
-            color: @white;
-            background-color: @ui-active-type;
-            border: 2px solid @white;
-            border-radius: 50%;
-            font-size: 8px;
-            font-weight: bold;
-            padding: 2px;
-            line-height: 8px;
-            background-color: @errorBackground;
-            .show-validation-type-warning & {
-                background-color: @warningBackground;
-            }
-            display: none;
-            font-weight: 900;
-        }
-        &.--error > .__error-badge {
-            display: block;
-
-            animation-duration: 1.4s;
-            animation-iteration-count: infinite;
-            animation-name: umb-block-grid__action--badge-bounce;
-            animation-timing-function: ease;
-            @keyframes umb-block-grid__action--badge-bounce {
-                0%   { transform: translateY(0); }
-                20%  { transform: translateY(-4px); }
-                40%  { transform: translateY(0); }
-                55%  { transform: translateY(-2px); }
-                70%  { transform: translateY(0); }
-                100% { transform: translateY(0); }
-            }
-
-        }
-    }
-}
-
-
-.umb-block-grid__scale-handler {
-    cursor: nwse-resize;
-    position: absolute;
-    display: var(--umb-block-grid--block-ui-display, block);
-    Z-index:10;
-    bottom: -4px;
-    right: -4px;
-    width:8px;
-    height:8px;
-    padding: 0;
-    background-color: white;
-    border: @blueDark solid 1px;
-    box-shadow: 0 0 0 1px rgba(255, 255, 255, .7);
-    opacity: 0;
-    transition: opacity 120ms;
-}
-.umb-block-grid__scale-handler:focus {
-    opacity: 1;
-}
-.umb-block-grid__scale-handler::after {
-    content: '';
-    position: absolute;
-    inset: -10px;
-    background-color: rgba(0,0,0,0);
-}
-
-.umb-block-grid__scale-handler:focus + .umb-block-grid__scale-label,
-.umb-block-grid__scale-handler:hover + .umb-block-grid__scale-label {
-    opacity: 1;
-}
-
-
-.umb-block-grid__scale-label {
-    position: absolute;
-    display: block;
-    left: 100%;
-    margin-left: 6px;
-    margin-top: 6px;
-    z-index: 2;
-
-    background-color: white;
-    color: black;
-    font-size: 12px;
-    padding: 0px 6px;
-    border-radius: 3px;
-    opacity: 0;
-    transition: opacity 120ms;
-
-    pointer-events: none;
-    white-space: nowrap;
-}
-
-
-.umb-block-grid__block--inline-create-button {
-    top: 0px;
-    position: absolute;
-    z-index: 1; /** overwritten for the first one of an area. */
-
-    /** Avoid showing inline-create in dragging-mode */
-
-    --umb-block-grid__block--inline-create-button-display--condition: var(--umb-block-grid--dragging-mode) none;
-    display: var(--umb-block-grid__block--inline-create-button-display--condition);
-}
-.umb-block-grid__block--inline-create-button.--above {
-    left: 0;
-    width: var(--umb-block-grid-editor--inline-create-width, 100%);
-
-    top: calc(var(--umb-block-grid--row-gap, 0px) * -0.5);
-}
-.umb-block-grid__layout-item:first-of-type > .umb-block-grid__block--inline-create-button.--above {
-    /* Do not use row-gap if the first one. */
-    top: 0;
-}
-.umb-block-grid__block--inline-create-button.--above.--at-root {
-    /* If at root, and full-width then become 40px wider: */
-    --calc: clamp(0, calc(var(--umb-block-grid--item-column-span) - (var(--umb-block-grid--grid-columns)-1)), 1);
-    left: calc(-20px * var(--calc));
-    width: calc(var(--umb-block-grid-editor--inline-create-width, 100%) + 40px * var(--calc));
-}
-
-.umb-block-grid__block--inline-create-button.--after {
-    right: calc(1px - (var(--umb-block-grid--column-gap, 0px) * 0.5));
-}
-.umb-block-grid__block--inline-create-button.--after.--at-root {
-    /* If at root, and full-width then move a little out to the right: */
-    --calc: clamp(0, calc(var(--umb-block-grid--item-column-span) - (var(--umb-block-grid--grid-columns)-1)), 1);
-    right: calc(-2px * var(--calc));
-}
-.umb-block-grid__block--inline-create-button.--after.--hide {
-    /** If at right side, hide, but do still act on mouseOver so we can reevaluate if it should be shown again.*/
-    opacity: 0;
-    cursor: move !important;
-}
-.umb-block-grid__block--inline-create-button.--after.--hide > * {
-    pointer-events: none;
-}
-
-.umb-block-grid__block--last-inline-create-button {
-    z-index:4;
-    width: 100%;
-    /* Move inline create button slightly up, to avoid collision with others*/
-    margin-bottom: -7px;
-    margin-top: -13px;
-
-    /** Avoid showing last-inline-create in dragging-mode */
-    --umb-block-grid__block--last-inline-create-button-display--condition: var(--umb-block-grid--dragging-mode) none;
-    display: var(--umb-block-grid__block--last-inline-create-button-display--condition);
-}
-
-
-
-.umb-block-grid__actions {
-    display:flex;
-    border: 1px dashed @ui-action-discreet-border;
-    border-radius: @baseBorderRadius;
-    box-sizing: border-box;
-
-    &:hover {
-        border-color: transparent;
-        > button {
-
-            border-color: @ui-action-discreet-border;
-
-            &.umb-block-grid__clipboard-button {
-                opacity: 1;
-            }
-        }
-        
-    }
-
-    > button {
-        position: relative;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        
-        color: @ui-action-discreet-type;
-        font-weight: bold;
-        margin: -1px;
-        padding: 5px 15px;
-
-        border: 1px dashed transparent;
-        border-radius: @baseBorderRadius;
-        box-sizing: border-box;
-        
-        &:not([disabled]):hover {
-            color: @ui-action-discreet-type-hover;
-            border-color: @ui-action-discreet-border-hover;
-            text-decoration: none;
-            z-index: 1;
-        }
-
-        &[disabled],
-        &[disabled]:hover {
-            color: @gray-7;
-            border-color: @gray-7;
-            cursor: default;
-        }
-
-        &.umb-block-grid__create-button {
-            flex-grow: 1;
-            border-top-right-radius: 0;
-            border-bottom-right-radius: 0;
-        }
-    
-        &.umb-block-grid__clipboard-button {
-            margin-left: 0;
-            padding: 5px 12px;
-            font-size: 18px;
-            border-top-left-radius: 0;
-            border-bottom-left-radius: 0;
-
-            opacity: 0;
-            &:hover, &:focus {
-                opacity: 1;
-            }
-
-            &.--jump {
-
-                @keyframes umb-block-grid__jump-clipboard-button {
-                    0% { opacity: 0; }
-                    10% { opacity: 1; }
-                    90% { opacity: 1; }
-                    100% { opacity: 0; }
-                }
-                animation: umb-block-grid__jump-clipboard-button 2s;
-
-                i{
-                    @keyframes umb-block-grid__jump-clipboard-button-i {
-                        10% { transform: scale(1); }
-                        10% { transform: scale(1.33); }
-                        20% { transform: scale(.82); }
-                        30% { transform: scale(1.24); }
-                        40% { transform: scale(.94); }
-                        50% { transform: scale(1); }
-                    }
-                    animation: umb-block-grid__jump-clipboard-button-i 2s;
-                }
-            }
-            
-        }
-    }
-}
-
-.umb-block-grid__area-actions {
-    grid-column: span var(--umb-block-grid--area-column-span);
-    flex-grow: 1;
-    opacity: calc(var(--umb-block-grid--hint-area-ui, 0) * .5 + var(--umb-block-grid--show-area-ui, 0));
-    transition: opacity 120ms;
-
-    &:focus, 
-    &:focus-within {
-        opacity: 1;
-    }
-    &.--highlight {
-        opacity: 1;
-    }
-
-    > button {
-        position: relative;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        
-        color: var(--umb-block-grid--text-color, @ui-action-discreet-type);
-        font-weight: bold;
-        padding: 5px 15px;
-
-        border: 1px dashed var(--umb-block-grid--text-color, @ui-action-discreet-border);
-        border-radius: @baseBorderRadius;
-        box-sizing: border-box;
-
-        width: 100%;
-        height: 100%;
-        
-        &:hover {
-            color: var(--umb-block-grid--text-color-hover, @ui-action-discreet-type-hover);
-            border-color: var(--umb-block-grid--text-color-hover, @ui-action-discreet-border-hover);
-            text-decoration: none;
-            z-index: 1;
-        }
-    }
-}
-
-
-.umb-block-grid__layout-item-placeholder {
-    background: transparent;
-    border-radius: 3px;
-
-    box-sizing: border-box;
-    border: solid 1px;
-    border-color: rgba(@blueDark, .5);
-    border-radius: 3px;
-
-    height: 100%;
-}
-
-
-.umb-block-grid__layout-item-placeholder > * {
-    display: none;
-}
-
-.umb-block-grid__layout-item-placeholder::before {
-    content: '';
-    position:absolute;
-    z-index:1;
-    inset: 0;
-    border-radius: 3px;
-    background-color: white;
-    pointer-events:none;
-}
-.umb-block-grid__layout-item-placeholder::after {
-    content: '';
-    position:absolute;
-    z-index:1;
-    inset: 0;
-    border-radius: 3px;
-    pointer-events:none;
-
-    transition: background-color 240ms ease-in;
-    animation: umb-block-grid__placeholder__pulse 400ms ease-in-out alternate infinite;
-    @keyframes umb-block-grid__placeholder__pulse {
-        0%   { background-color: rgba(@blueMidLight, 0.33); }
-        100% { background-color: rgba(@blueMidLight, 0.22); }
-    }
-}
-
-
-.umb-block-grid__area {
-    position: relative;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-
-    --umb-block-grid__area--show-area-ui--condition: var(--umb-block-grid--dragging-mode) 1;
-    --umb-block-grid--show-area-ui: var(--umb-block-grid__area--show-area-ui--condition, 0);
-}
-.umb-block-grid__area:focus,
-.umb-block-grid__area:focus-within,
-.umb-block-grid__area:hover {
-    --umb-block-grid--show-area-ui: 1;
-}
-.umb-block-grid__area::after {
-    content: '';
-    position: absolute;
-    inset: 0;
-    top:0;
-    bottom: 0;
-    border-radius: 3px;
-    border: 1px solid rgba(@gray-5, 0.3);
-    pointer-events: none;
-    opacity: var(--umb-block-grid--show-area-ui, 0);
-    transition: opacity 240ms;
-    z-index:3;
-}
-.umb-block-grid__area.--highlight::after {
-    /* Moved slightly in to align with the inline-create button, which is moved slightly in to avoid collision with other create buttons. */
-    top:2px;
-    bottom: 2px;
-    border-color: @blueDark;
-    box-shadow: 0 0 0 1px rgba(255, 255, 255, .7), inset 0 0 0 1px rgba(255, 255, 255, .7);
-
-}
-.umb-block-grid__area:has( .umb-block-grid__layout-item-placeholder )::after {
-    opacity: 1;
-    border-color: @blueDark;
-    box-shadow: 0 0 0 1px rgba(255, 255, 255, .7), inset 0 0 0 1px rgba(255, 255, 255, .7);
-
-    /* Moved back to edge for this case */
-    top: 0;
-    bottom: 0;
-
-    animation: umb-block-grid__area-after__border-pulse 400ms ease-in-out alternate infinite;
-    @keyframes umb-block-grid__area-after__border-pulse {
-        0%   { border-color: rgba(@blueDark, 1); }
-        100% { border-color: rgba(@blueDark, 0.66); }
-    }
-}
-.umb-block-grid__area > ng-form {
-    display: contents;
-}
-
-.umb-block-grid__scalebox-backdrop {
-    position: absolute;
-    top:0;
-    left:0;
-    bottom:0;
-    right:0;
-    z-index: 1;
-    cursor: nwse-resize;
-}
-
-
-
-
-
-
-/** make sure block with areas stay on top, so they don't look like they are 'not-allowed'*/
-.umb-block-grid__layout-container.--not-allowing-drop {
-    .umb-block-grid__layout-item.--has-areas {
-        z-index: 2;
-    }
-}
-
-.umb-block-grid__layout-container .umb-block-grid__layout-item:not([depth='0']):first-of-type .umb-block-grid__block--inline-create-button.--above {
-    /* Move the above inline create button slightly down, to avoid collision with others*/
-    margin-top: -7px;
-
-    z-index:4;
-}
-
-.umb-block-grid__not-allowed-box {
-    position: absolute;
-    inset: 0;
-    z-index:1;
-    border: 1px solid @red;
-    pointer-events: none;
-    cursor: no-drop;
-
-    animation: umb-block-grid__not-allowed-box__pulse 400ms ease-in-out alternate infinite;
-    @keyframes umb-block-grid__not-allowed-box__pulse {
-        0%   { background-color: rgba(@red, 0.33); }
-        100% { background-color: rgba(@red, 0.22); }
-    }
-}
-
-
-.show-validation umb-block-grid-entries.--invalid {
-    border: 2px solid @errorBackground;
-    border-radius: 3px;
-
-    box-shadow: 0 0 0 1px rgba(255, 255, 255, .2), inset 0 0 0 1px rgba(255, 255, 255, .2);
-}
-
-.umb-block-grid__entries-validation-message {
-    padding: 3px 6px;
-    user-select: none;
-
-    border-radius: 6px;
-    color: @errorBackground;
-}
-
-.show-validation .umb-block-grid__entries-validation-message {
-    background-color: @errorBackground;
-    color: @errorText;
-    border-radius: 0;
-    border-top: 1px solid rgba(255, 255, 255, .2);
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/datamodels.temp b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/datamodels.temp
deleted file mode 100644
index df19432413..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/datamodels.temp
+++ /dev/null
@@ -1,88 +0,0 @@
-
-//Pre-values model:
-
-gridColumns: 12, 
-validationLimit: {
-    min: 1,
-    max: 14
-},
-blocks: [
-    {
-        contentElementTypeKey: 123,
-        allowAtRoot: true,
-        rowMinSpan: null,
-        rowMaxSpan: null,
-        columnSpanOptions: [
-            {columnSpan: 12},
-            ...
-        ],
-        areaGridColumns: null,
-        areas: [
-            {
-                key: "ABD1",
-                alias: "",
-                columnSpan: 6,
-                rowSpan: 1,
-                minAllowed: 1,
-                maxAllowed: 2,
-                specifiedAllowance: [{
-                        elementTypeKey: 345;
-                        minAllowed: 1,
-                        maxAllowed: 4,
-                    },
-                    ...
-                ]
-            },
-            ...
-        ]
-    }
-]
-
-
-
-// property value model (model.value):
-layout: [
-    {
-        contentUdi: "1234-1234-1234",
-        columnSpan: 12,
-        // grid 2 column
-        // Section with area A B
-        areas: [
-            {
-                key: "1234-1234-1234"// Generated GUID
-                items: [
-                    {
-                        contentUdi: "1234-1234-1234",
-                        columnSpan: 6,
-                        rowSpan: 1,
-                        areas: [
-                            {
-                                key: "1234-1234-1234"// Generated GUID
-                                items: [
-                                    ...
-                                ]
-                            }
-                        ]
-                    },
-                    ...
-                ]
-            },
-            ...
-        ]
-    },
-    ...
-],
-contentData: [
-   {
-        udi: "1234-1234-1234",
-        contentTypeKey: "element://1234-1234-1234"
-   },
-   ...
-],
-settingsData: [
-   {
-        udi: "1234-1234-1234",
-        contentTypeKey: "element://1234-1234-1234"
-   },
-   ...
-],
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.area.overlay.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.area.overlay.controller.js
deleted file mode 100644
index 1c2f7e1c2b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.area.overlay.controller.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.BlockGrid.BlockConfigurationOverlayController
- * @function
- *
- * @description
- * The controller for the content type editor property settings dialog
- */
-
-(function () {
-    "use strict";
-
-    function BlockConfigurationAreaOverlayController($scope) {
-
-        var unsubscribe = [];
-
-        var vm = this;
-
-        vm.area = $scope.model.area;
-        vm.area.specifiedAllowance = vm.area.specifiedAllowance || [];
-
-        vm.minMaxModel = {
-            hideLabel: true,
-            view: "numberrange",
-            value: {min:vm.area.minAllowed, max:vm.area.maxAllowed}
-        }
-
-        unsubscribe.push($scope.$watch('vm.area.alias', (newVal) => {
-            $scope.model.updateTitle();
-            if($scope.blockGridBlockConfigurationAreaForm.alias) {
-                $scope.blockGridBlockConfigurationAreaForm.alias.$setValidity("alias", $scope.model.otherAreaAliases.indexOf(newVal) === -1);
-            }
-        }));
-        
-        vm.submit = function() {
-            if($scope.blockGridBlockConfigurationAreaForm.$valid === false) {
-                $scope.submitButtonState = "error";
-                return;
-            }
-            if ($scope.model && $scope.model.submit) {
-
-                // Transfer minMaxModel to area:
-                vm.area.minAllowed = vm.minMaxModel.value.min;
-                vm.area.maxAllowed = vm.minMaxModel.value.max;
-
-                $scope.submitButtonState = "success";
-                $scope.model.submit($scope.model);
-            }
-        };
-
-        vm.close = function() {
-            if ($scope.model && $scope.model.close) {
-                $scope.model.close($scope.model);
-            }
-        };
-
-        $scope.$on('$destroy', function() {
-            unsubscribe.forEach(u => { u(); });
-        });
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockGrid.BlockConfigurationAreaOverlayController", BlockConfigurationAreaOverlayController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.area.overlay.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.area.overlay.html
deleted file mode 100644
index c117e0fbc3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.area.overlay.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.BlockGrid.BlockConfigurationAreaOverlayController as vm">
-
-    <form novalidate name="blockGridBlockConfigurationAreaForm" val-form-manager>
-
-        <umb-editor-view ng-if="!page.loading">
-
-            <umb-editor-header
-                name="model.title"
-                name-locked="true"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container>
-                <div class="form-vertical">
-
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_areaIdentification">Identification</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- alias -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="alias"><localize key="general_alias">Alias</localize></label>
-                                    <strong class="umb-control-required">*</strong>
-                                    <umb-property-info-button button-title-key="general_readMore">
-                                      <localize key="blockEditor_areaAliasHelp">When using GetBlockGridHTML() to render the Block Grid, the alias will be rendered in the markup as a 'data-area-alias' attribute. Use the alias attribute to target the element for the area. Example. .umb-block-grid__area[data-area-alias="MyAreaAlias"] { ... }</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <input type="text" name="alias" ng-model="vm.area.alias" val-server="alias" class="w-100" required umb-auto-focus/>
-                                    </div>
-                                    <div ng-messages="blockGridBlockConfigurationAreaForm.alias.$error" class="red">
-                                        <div ng-message="alias">
-                                            <localize key="blockEditor_areaAliasIsNotUnique" tokens="[vm.area.alias]" watch-tokens="true">This Areas Alias must be unique compared to the other Areas of this Block.</localize>
-                                        </div>
-                                        <span ng-message="valServer" ng-bind-html="blockGridBlockConfigurationAreaForm.alias.errorMsg"></span>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- createLabel -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="createLabel"><localize key="blockEditor_areaCreateLabelTitle">Create Button Label</localize></label>
-                                    <umb-property-info-button button-title-key="general_readMore">
-                                      <localize key="blockEditor_areaCreateLabelHelp">Override the label text for adding a new Block to this Area, Example: 'Add Widget'</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <input type="text" name="createLabel" ng-model="vm.area.createLabel" class="w-100" umb-auto-focus/>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_areaValidation">Validation</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- min/max -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="minMaxEditor"><localize key="blockEditor_areaNumberOfBlocks">Number of blocks</localize></label>
-                                    <div class="controls">
-                                        <umb-property-editor name="minMaxEditor" model="vm.minMaxModel" is-pre-value="true"></umb-property-editor>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- specifiedAllowance -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label"><localize key="blockEditor_areaAllowedBlocks">Allowed block types</localize></label>
-                                    <umb-property-info-button button-title-key="general_readMore">
-                                        <localize key="blockEditor_areaAllowedBlocksHelp">Define the types of blocks that are allowed in this area, and optionally how many of each type that should be present.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <umb-block-grid-area-allowance-editor model="vm.area.specifiedAllowance" all-block-types="model.allBlockTypes" all-block-groups="model.allBlockGroups" loaded-element-types="model.loadedElementTypes"></umb-block-grid-area-allowance-editor>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                </div>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button
-                        action="vm.close()"
-                        shortcut="esc"
-                        button-style="link"
-                        label-key="general_close"
-                        type="button">
-                    </umb-button>
-
-                    <umb-button
-                        action="vm.submit()"
-                        button-style="primary"
-                        state="submitButtonState"
-                        label-key="buttons_submitChanges"
-                        type="button">
-                    </umb-button>
-
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-        </umb-editor-view>
-    </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.controller.js
deleted file mode 100644
index 3f0584556c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.controller.js
+++ /dev/null
@@ -1,442 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.BlockGrid.BlockConfigurationController
- * @function
- *
- * @description
- * The controller for the content type editor property settings dialog
- */
-
-(function () {
-    "use strict";
-
-    function TransferProperties(fromObject, toObject) {
-        for (var p in fromObject) {
-            toObject[p] = fromObject[p];
-        }
-    }
-
-    const DEFAULT_GRID_COLUMNS = 12;
-
-    const DEFAULT_BLOCKTYPE_OBJECT = {
-        "columnSpanOptions": [],
-        "allowAtRoot": true,
-        "allowInAreas": true,
-        "rowMinSpan": 1,
-        "rowMaxSpan": 1,
-        "contentElementTypeKey": null,
-        "settingsElementTypeKey": null,
-        "label": "",
-        "view": null,
-        "stylesheet": null,
-        "editorSize": "medium",
-        "iconColor": null,
-        "backgroundColor": null,
-        "thumbnail": null,
-        "areaGridColumns": null,
-        "areas": [],
-        "groupKey": null
-    };
-
-    function BlockConfigurationController($scope, $element, $http, elementTypeResource, overlayService, localizationService, editorService, eventsService, udiService, dataTypeResource, umbRequestHelper) {
-
-        var unsubscribe = [];
-
-        const vm = this;
-
-        vm.openBlock = null;
-        vm.showSampleDataCTA = false;
-
-        function onInit() {
-
-            $element.closest('.umb-control-group').addClass('-no-border');
-
-            // Somehow the preValues models are different, so we will try to match either key or alias.
-            vm.gridColumnsPreValue = $scope.preValues.find(x => x.key ? x.key === "gridColumns" : x.alias === "gridColumns");
-            const blockGroupModel = $scope.preValues.find(x => x.key ? x.key === "blockGroups" : x.alias === "blockGroups");
-            if (blockGroupModel.value == null) {
-                blockGroupModel.value = [];
-            }
-
-            vm.blockGroups = blockGroupModel.value;
-
-            if (!$scope.model.value) {
-                $scope.model.value = [];
-            }
-
-            // Ensure good values:
-            $scope.model.value.forEach(block => {
-                block.columnSpanOptions = block.columnSpanOptions || [];
-            });
-            $scope.model.value.forEach(block => {
-                block.areas = block.areas || [];
-            });
-
-            loadElementTypes();
-        }
-
-        function loadElementTypes() {
-            return elementTypeResource.getAll().then(elementTypes => {
-                vm.elementTypes = elementTypes;
-            });
-        }
-
-        function updateUsedElementTypes(event, args) {
-            var key = args.documentType.key;
-            for (var i = 0; i<vm.elementTypes.length; i++) {
-                if (vm.elementTypes[i].key === key) {
-                    vm.elementTypes[i] = args.documentType;
-                }
-            }
-        }
-
-        unsubscribe.push(eventsService.on("editors.documentType.saved", updateUsedElementTypes));
-
-        function removeReferencesToElementTypeKey(contentElementTypeKey) {
-            // Clean up references to this one:
-            $scope.model.value.forEach(blockType => {
-                blockType.areas.forEach(area => {
-                    area.specifiedAllowance = area.specifiedAllowance?.filter(allowance =>
-                        allowance.elementTypeKey !== contentElementTypeKey
-                    ) || [];
-                });
-            });
-        }
-
-        function removeReferencesToGroupKey(groupKey) {
-            // Clean up references to this one:
-            $scope.model.value.forEach(blockType => {
-                blockType.areas.forEach(area => {
-                    area.specifiedAllowance = area.specifiedAllowance?.filter(allowance =>
-                        allowance.groupKey !== groupKey
-                    ) || [];
-                });
-            });
-        }
-
-        vm.requestRemoveBlockByIndex = function (index, event) {
-
-            const labelKeys = [
-              "general_delete",
-              "blockEditor_confirmDeleteBlockTypeMessage",
-              "blockEditor_confirmDeleteBlockTypeNotice"
-            ];
-
-            localizationService.localizeMany(labelKeys).then(data => {
-                var contentElementType = vm.getElementTypeByKey($scope.model.value[index].contentElementTypeKey);
-                overlayService.confirmDelete({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [contentElementType ? contentElementType.name : "(Unavailable ElementType)"]),
-                    confirmMessage: data[2],
-                    submit: () => {
-                        vm.removeBlockByIndex(index);
-                        overlayService.close();
-                    },
-                    close: overlayService.close()
-                });
-            });
-
-            event.stopPropagation();
-        }
-
-        vm.removeBlockByIndex = function (index) {
-            const blockType = $scope.model.value[index];
-            if (blockType) {
-                $scope.model.value.splice(index, 1);
-                removeReferencesToElementTypeKey(blockType.contentElementTypeKey);
-            }
-        };
-
-        const defaultOptions = {
-            tolerance: "pointer",
-            opacity: 0.7,
-            scroll: true
-        };
-
-        vm.groupSortableOptions = {
-            ...defaultOptions,
-            axis: 'y',
-            handle: '.__handle',
-            items: ".umb-block-card-group",
-            cursor: "grabbing",
-            placeholder: 'umb-block-card-group --sortable-placeholder'
-        };
-
-        vm.blockSortableOptions = {
-            ...defaultOptions,
-            "ui-floating": true,
-            connectWith: ".umb-block-card-grid",
-            items: "umb-block-card",
-            cursor: "grabbing",
-            placeholder: '--sortable-placeholder',
-            forcePlaceHolderSize: true,
-            stop: function(e, ui) {
-                if (ui.item.sortable.droptarget && ui.item.sortable.droptarget.length > 0) {
-                    // We do not want sortable to actually move the data, as we are using the same ng-model. Instead we just change the groupKey and cancel the transfering.
-                    ui.item.sortable.model.groupKey = ui.item.sortable.droptarget[0].dataset.groupKey || null;
-                    ui.item.sortable.cancel();
-                }
-            }
-        };
-
-        vm.getAvailableElementTypes = function () {
-            return vm.elementTypes.filter(function (type) {
-                return !$scope.model.value.find(function (entry) {
-                    return type.key === entry.contentElementTypeKey;
-                });
-            });
-        };
-
-        vm.getElementTypeByKey = function(key) {
-            if (vm.elementTypes) {
-                return vm.elementTypes.find(function (type) {
-                    return type.key === key;
-                }) || null;
-            }
-        };
-
-        vm.openAddDialog = function (groupKey) {
-
-            localizationService.localize("blockEditor_headlineCreateBlock").then(function(localizedTitle) {
-
-                const dialog = {
-                    title: localizedTitle,
-                    entityType: "documentType",
-                    filter: function (node) {
-                        if (node.metaData.isElement === true) {
-                            var key = udiService.getKey(node.udi);
-                            // If a Block with this ElementType as content already exists, we will emit it as a possible option.
-                            return $scope.model.value.find(function(entry) {
-                                return key === entry.contentElementTypeKey;
-                            });
-                        }
-                        return true;
-                    },
-                    filterCssClass: "not-allowed",
-                    select: function(node) {
-                        vm.addBlockFromElementTypeKey(udiService.getKey(node.udi), groupKey);
-                        editorService.close();
-                    },
-                    close: function() {
-                        editorService.close();
-                    },
-                    extraActions: [
-                        {
-                            style: "primary",
-                            labelKey: "blockEditor_labelcreateNewElementType",
-                            action: function () {
-                                vm.createElementTypeAndCallback((documentTypeKey) => {
-                                    vm.addBlockFromElementTypeKey(documentTypeKey, groupKey);
-
-                                    // At this point we will close the contentTypePicker.
-                                    editorService.close();
-                                });
-                            }
-                        }
-                    ]
-                };
-
-                editorService.contentTypePicker(dialog);
-            });
-        };
-
-        vm.createElementTypeAndCallback = function(callback) {
-            const editor = {
-                create: true,
-                infiniteMode: true,
-                noTemplate: true,
-                isElement: true,
-                submit: function(model) {
-                    loadElementTypes().then(function() {
-                        callback(model.documentTypeKey);
-                    });
-                    editorService.close();
-                },
-                close: function() {
-                    editorService.close();
-                }
-            };
-            editorService.documentTypeEditor(editor);
-        }
-
-        vm.addBlockFromElementTypeKey = function(key, groupKey) {
-
-            const blockType = { ...DEFAULT_BLOCKTYPE_OBJECT, "contentElementTypeKey": key, "groupKey": groupKey || null}
-
-            $scope.model.value.push(blockType);
-
-            vm.openBlockOverlay(blockType);
-        };
-
-        vm.openBlockOverlay = function (block, openAreas) {
-
-            var elementType = vm.getElementTypeByKey(block.contentElementTypeKey);
-
-            if (elementType) {
-                localizationService.localize("blockEditor_blockConfigurationOverlayTitle", [elementType.name]).then(function (data) {
-
-                    var clonedBlockData = Utilities.copy(block);
-                    vm.openBlock = block;
-
-                    const overlayModel = {
-                        block: clonedBlockData,
-                        allBlockTypes: $scope.model.value,
-                        allBlockGroups: vm.blockGroups,
-                        loadedElementTypes: vm.elementTypes,
-                        gridColumns: vm.gridColumnsPreValue.value || DEFAULT_GRID_COLUMNS,
-                        title: data,
-                        openAreas: openAreas,
-                        view: "views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html",
-                        size: "medium",
-                        submit: function(overlayModel) {
-                            loadElementTypes()// lets load elementType again, to ensure we are up to date.
-                            TransferProperties(overlayModel.block, block);// transfer properties back to block object. (Doing this cause we dont know if block object is added to model jet, therefor we cant use index or replace the object.)
-
-                            overlayModel.close();
-                        },
-                        close: function() {
-                            editorService.close();
-                            vm.openBlock = null;
-                        }
-                    };
-
-                    // open property settings editor
-                    editorService.open(overlayModel);
-
-                });
-            } else {
-
-              const overlay = {
-                close: () => {
-                  overlayService.close()
-                }
-              };
-
-              localizationService.localize("blockEditor_elementTypeDoesNotExist").then(data => {
-                overlay.content = data;
-                overlayService.open(overlay);
-              });
-            }
-
-        };
-
-
-        vm.requestRemoveGroup = function(blockGroup) {
-            if (blockGroup.key) {
-                localizationService.localizeMany(["general_delete", "blockEditor_confirmDeleteBlockGroupMessage", "blockEditor_confirmDeleteBlockGroupNotice"]).then(function (data) {
-                    overlayService.confirmDelete({
-                        title: data[0],
-                        content: localizationService.tokenReplace(data[1], [blockGroup.name ? blockGroup.name : "'Unnamed group'"]),
-                        confirmMessage: data[2],
-                        close: function () {
-                            overlayService.close();
-                        },
-                        submit: function () {
-
-                            // Remove all blocks of this group:
-                            $scope.model.value = $scope.model.value.filter(block => {
-                                    if (block.groupKey === blockGroup.key) {
-                                        // Clean up references to this one:
-                                        removeReferencesToElementTypeKey(block.contentElementTypeKey);
-
-                                        return false;
-                                    } else {
-                                        return true;
-                                    }
-                                }
-                            );
-
-                            // Remove any special allowance for this
-
-                            // Then remove group:
-                            const groupIndex = vm.blockGroups.indexOf(blockGroup);
-                            if (groupIndex !== -1) {
-                                vm.blockGroups.splice(groupIndex, 1);
-                                removeReferencesToGroupKey(blockGroup.key);
-                            }
-
-                            // Remove any special allowance for this.
-
-                            overlayService.close();
-                        }
-                    });
-                });
-            }
-        }
-
-        dataTypeResource.getAll().then(function(dataTypes) {
-            if (dataTypes.filter(x => x.alias === "Umbraco.BlockGrid").length === 0) {
-                vm.showSampleDataCTA = true;
-            }
-        });
-
-        vm.setupSample = function() {
-            umbRequestHelper.resourcePromise(
-                $http.post(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "PostCreateBlockGridSample")),
-                'Failed to create content types for block grid sample').then(function (data) {
-
-                    loadElementTypes().then(() => {
-
-                        const groupName = "Demo Blocks";
-                        var sampleGroup =  vm.blockGroups.find(x => x.name === groupName);
-                        if (!sampleGroup) {
-                            sampleGroup = {
-                                key: String.CreateGuid(),
-                                name: groupName
-                            };
-                            vm.blockGroups.push(sampleGroup);
-                        }
-
-                        function initSampleBlock(udi, groupKey, options) {
-                            const key = udiService.getKey(udi);
-                            if ($scope.model.value.find(X => X.contentElementTypeKey === key) === undefined) {
-                                const blockType = { ...DEFAULT_BLOCKTYPE_OBJECT, "contentElementTypeKey": key, "groupKey": groupKey, ...options};
-                                $scope.model.value.push(blockType);
-                            }
-                        }
-
-                        initSampleBlock(data.umbBlockGridDemoHeadlineBlock, sampleGroup.key, {"label": "Headline ({{headline | truncate:true:36}})", "view": "~/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews/umbBlockGridDemoHeadlineBlock.html"});
-                        initSampleBlock(data.umbBlockGridDemoImageBlock, sampleGroup.key, {"label": "Image", "view": "~/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews/umbBlockGridDemoImageBlock.html"});
-                        initSampleBlock(data.umbBlockGridDemoRichTextBlock, sampleGroup.key, { "label": "Rich Text  ({{richText | ncRichText | truncate:true:36}})", "view": "~/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews/umbBlockGridDemoRichTextBlock.html"});
-
-                        const twoColumnLayoutAreas = [
-                            {
-                                'key': String.CreateGuid(),
-                                'alias': 'left',
-                                'columnSpan': 6,
-                                'rowSpan': 1,
-                                'minAllowed': 0,
-                                'maxAllowed': null,
-                                'specifiedAllowance': []
-                            },
-                            {
-                                'key': String.CreateGuid(),
-                                'alias': 'right',
-                                'columnSpan': 6,
-                                'rowSpan': 1,
-                                'minAllowed': 0,
-                                'maxAllowed': null,
-                                'specifiedAllowance': []
-                            }
-                        ];
-                        
-                        initSampleBlock(data.umbBlockGridDemoTwoColumnLayoutBlock, sampleGroup.key, {"label": "Two Column Layout", "view": "~/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews/umbBlockGridDemoTwoColumnLayoutBlock.html", "allowInAreas": false, "areas": twoColumnLayoutAreas});
-
-                        vm.showSampleDataCTA = false;
-                    });
-
-                });
-        }
-
-
-        $scope.$on('$destroy', function () {
-            unsubscribe.forEach(u => { u(); });
-        });
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockGrid.BlockConfigurationController", BlockConfigurationController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.html
deleted file mode 100644
index ac92a117d8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<div class="umb-block-grid-block-configuration" ng-controller="Umbraco.PropertyEditors.BlockGrid.BlockConfigurationController as vm">
-
-    <div ng-if="vm.showSampleDataCTA" class="__get-sample-box">
-        <h3><localize key="blockEditor_getSampleHeadline">Install Sample Configuration</localize></h3>
-        <localize key="blockEditor_getSampleDescription">This will add basic Blocks and help you get started with the Block Grid Editor. You'll get Blocks for Headline, Rich Text, Image, as well as a Two Column Layout.</localize>
-        <umb-button action="vm.setupSample()" button-style="primary" state="vm.sampleButtonState" label-key="blockEditor_getSampleButton" type="button"></umb-button>
-    </div>
-
-    
-    <div class="umb-block-card-group">
-
-        <div class="umb-block-card-grid" ui-sortable="vm.blockSortableOptions" ng-model="model.value">
-
-            <umb-block-card
-                ng-repeat="block in model.value track by block.contentElementTypeKey"
-                ng-show="block.groupKey === null"
-                block-config-model="block"
-                element-type-model="vm.getElementTypeByKey(block.contentElementTypeKey)"
-                ng-class="{'--isOpen':vm.openBlock === block}"
-                ng-click="vm.openBlockOverlay(block)"
-                data-content-element-type-key="{{block.contentElementTypeKey}}">
-                <div class="__actions" ng-click="$event.stopPropagation()" tabindex="-1">
-                    <div ng-if="block.areas.length > 0">
-                        <button type="button" class="btn-reset __action umb-outline" ng-click="vm.openBlockOverlay(block, true); $event.stopPropagation();">
-                            <umb-icon icon="icon-layout" class="icon"></umb-icon>
-                            <localize key="blockEditor_tabAreas" class="sr-only">Areas</localize>
-                        </button>
-                    </div>
-                    <div>
-                        <button type="button" class="btn-reset __action umb-outline" ng-click="vm.requestRemoveBlockByIndex($index, $event)">
-                            <umb-icon icon="icon-trash" class="icon"></umb-icon>
-                            <localize key="general_delete" class="sr-only">Delete</localize>
-                        </button>
-                    </div>
-                </div>
-            </umb-block-card>
-
-            <uui-button id="{{model.alias}}" look="{{(model.value.length === 0 && vm.blockGroups.length === 0) ? 'primary' : 'placeholder'}}" color="primary" ng-click="vm.openAddDialog()">
-                <localize key="blockEditor_addBlockType">Add Block</localize>
-            </uui-button>
-
-            <uui-button ng-if="!vm.showSampleDataCTA && model.value.length === 0 && vm.blockGroups.length === 0" look="placeholder" color="primary" ng-click="vm.setupSample()">
-                <localize key="blockEditor_getSampleHeadline">Install demo Blocks</localize>
-            </uui-button>
-
-        </div>
-
-    </div>
-
-    <div ui-sortable="vm.groupSortableOptions" ng-model="vm.blockGroups">
-        <div class="umb-block-card-group" ng-repeat="blockGroup in vm.blockGroups track by blockGroup.key">
-
-            <div class="__controls">
-                
-                <div class="__handle">
-                  <umb-icon icon="icon-navigation"></umb-icon>
-                </div>
-                
-                <input type="text" class="__title" title="group name" ng-model="blockGroup.name" />
-
-                <button 
-                    type="button" 
-                    class="btn-reset umb-outline __remove"
-                    localize="title"
-                    title="actions_delete"
-                    ng-click="vm.requestRemoveGroup(blockGroup);"
-                    ng-disabled="vm.disabled">
-                    <umb-icon icon="icon-trash" class="icon"></umb-icon>
-                    <span class="sr-only">
-                        <localize key="actions_delete">Delete</localize>
-                    </span>
-                </button>
-            </div>
-
-            <div class="umb-block-card-grid" ui-sortable="vm.blockSortableOptions" ng-model="model.value" data-group-key="{{blockGroup.key}}">
-
-                <umb-block-card 
-                    ng-repeat="block in model.value track by block.contentElementTypeKey"
-                    ng-show="block.groupKey === blockGroup.key"
-                    block-config-model="block"
-                    element-type-model="vm.getElementTypeByKey(block.contentElementTypeKey)"
-                    ng-class="{'--isOpen':vm.openBlock === block}"
-                    ng-click="vm.openBlockOverlay(block)"
-                    data-content-element-type-key="{{block.contentElementTypeKey}}">
-                    <div class="__actions" ng-click="$event.stopPropagation()" tabindex="-1">
-                        <div ng-if="block.areas.length > 0">
-                            <button type="button" class="btn-reset __action umb-outline" ng-click="vm.openBlockOverlay(block, true); $event.stopPropagation();">
-                                <umb-icon icon="icon-layout" class="icon"></umb-icon>
-                                <localize key="blockEditor_tabAreas" class="sr-only">Areas</localize>
-                            </button>
-                        </div>
-                        <div>
-                            <button type="button" class="btn-reset __action umb-outline" ng-click="vm.requestRemoveBlockByIndex($index, $event)">
-                                <umb-icon icon="icon-trash" class="icon"></umb-icon>
-                                <localize key="general_delete" class="sr-only">Delete</localize>
-                            </button>
-                        </div>
-                    </div>
-                </umb-block-card>
-
-                <uui-button id="{{model.alias}}" look="placeholder" color="primary" ng-click="vm.openAddDialog(blockGroup.key)">
-                    <localize key="blockEditor_addBlockType">Add Block</localize>
-                </uui-button>
-            </div>
-
-        </div>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.less
deleted file mode 100644
index 771d6c2af8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.less
+++ /dev/null
@@ -1,29 +0,0 @@
-.umb-block-grid-block-configuration {
-  margin-bottom: 20px;
-
-  uui-button {
-    --uui-button-border-radius: 6px;
-    font-weight: 700;
-    min-height: 80px;
-  }
-
-  .__get-sample-box {
-    position: relative;
-    border: 1px solid @gray-10;
-    border-radius: 6px;
-    box-shadow: 3px 3px 6px rgba(0, 0, 0, .07);
-    padding-left: 40px;
-    padding-right: 40px;
-    padding-top: 15px;
-    padding-bottom: 20px;
-    margin-bottom: 40px;
-    max-width: 480px;
-
-    umb-button {
-      margin-left: auto;
-      margin-right: 0;
-      display: block;
-      width: fit-content;
-    }
-  }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.controller.js
deleted file mode 100644
index 11a0972309..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.controller.js
+++ /dev/null
@@ -1,366 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.BlockGrid.BlockConfigurationOverlayController
- * @function
- *
- * @description
- * The controller for the content type editor property settings dialog
- */
-
-(function () {
-    "use strict";
-
-    function BlockConfigurationOverlayController($scope, overlayService, localizationService, editorService, elementTypeResource, eventsService, udiService, angularHelper) {
-
-        var unsubscribe = [];
-
-        var vm = this;
-        
-        vm.navigation = [];
-
-        localizationService.localizeMany(["blockEditor_tabBlockTypeSettings", "blockEditor_tabAreas", "blockEditor_tabAdvanced"]).then(
-            function (data) {
-                
-                vm.navigation = [{
-                    "alias": "block",
-                    "name": data[0],
-                    "icon": "icon-settings",
-                    "view": ""
-                },
-                {
-                    "alias": "areas",
-                    "name": data[1],
-                    "icon": "icon-layout",
-                    "view": ""
-                },
-                {
-                    "alias": "advance",
-                    "name": data[2],
-                    "icon": "icon-lab",
-                    "view": ""
-                }];
-
-                vm.activeTab = vm.navigation[$scope.model.openAreas === true ? 1 : 0];
-                vm.activeTab.active = true;
-            }
-        );
-
-        vm.onNavigationChanged = function (tab) {
-            vm.activeTab.active = false;
-            vm.activeTab = tab;
-            vm.activeTab.active = true;
-        };
-
-
-        vm.block = $scope.model.block;
-
-        vm.colorPickerOptions = {
-            type: "color",
-            allowEmpty: true,
-            showAlpha: true
-        };
-
-        vm.rowMinMaxModel = {
-            hideLabel: true,
-            view: "numberrange",
-            value: {min: vm.block.rowMinSpan || 1, max: vm.block.rowMaxSpan || 1}
-        }
-
-        vm.showSizeOptions = vm.block.columnSpanOptions.length > 0 || vm.rowMinMaxModel.value.min !== 1 || vm.rowMinMaxModel.value.max !== 1;
-        vm.showAreaOptions = vm.block.areas.length > 0;
-        vm.showAppearanceOptions = !!vm.block.backgroundColor || !!vm.block.iconColor || !!vm.block.thumbnail;
-
-        loadElementTypes();
-
-        function loadElementTypes() {
-            return elementTypeResource.getAll().then(function(elementTypes) {
-                vm.elementTypes = elementTypes;
-
-                vm.contentPreview = vm.getElementTypeByKey(vm.block.contentElementTypeKey);
-                vm.settingsPreview = vm.getElementTypeByKey(vm.block.settingsElementTypeKey);
-            });
-        }
-
-        vm.getElementTypeByKey = function(key) {
-            return vm.elementTypes.find(function (type) {
-                return type.key === key;
-            });
-        };
-
-        vm.openElementType = function(elementTypeKey) {
-            var elementType = vm.getElementTypeByKey(elementTypeKey);
-            if (elementType) {
-                var elementTypeId = elementType.id;
-                const editor = {
-                    id: elementTypeId,
-                    submit: function () {
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-                editorService.documentTypeEditor(editor);
-            }
-        };
-
-        vm.createElementTypeAndCallback = function(callback) {
-            const editor = {
-                create: true,
-                infiniteMode: true,
-                isElement: true,
-                noTemplate: true,
-                submit: function (model) {
-                    callback(model.documentTypeKey);
-                    editorService.close();
-                },
-                close: function () {
-                    editorService.close();
-                }
-            };
-            editorService.documentTypeEditor(editor);
-        };
-
-        vm.addSettingsForBlock = function($event, block) {
-
-            localizationService.localize("blockEditor_headlineAddSettingsElementType").then(localizedTitle => {
-
-                const settingsTypePicker = {
-                    title: localizedTitle,
-                    entityType: "documentType",
-                    isDialog: true,
-                    filter: node => {
-                        if (node.metaData.isElement === true) {
-                            return false;
-                        }
-                        return true;
-                    },
-                    filterCssClass: "not-allowed",
-                    select: node => {
-                        vm.applySettingsToBlock(block, udiService.getKey(node.udi));
-                        editorService.close();
-                    },
-                    close: () => editorService.close(),
-                    extraActions: [
-                        {
-                            style: "primary",
-                            labelKey: "blockEditor_labelcreateNewElementType",
-                            action: () => {
-                                vm.createElementTypeAndCallback((key) => {
-                                    vm.applySettingsToBlock(block, key);
-
-                                    // At this point we will close the contentTypePicker.
-                                    editorService.close();
-                                });
-                            }
-                        }
-                    ]
-                };
-
-                editorService.contentTypePicker(settingsTypePicker);
-
-            });
-        };
-
-        vm.applySettingsToBlock = function(block, key) {
-            block.settingsElementTypeKey = key;
-            vm.settingsPreview = vm.getElementTypeByKey(vm.block.settingsElementTypeKey);
-        };
-
-        vm.requestRemoveSettingsForBlock = function(block) {
-            localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
-
-                var settingsElementType = vm.getElementTypeByKey(block.settingsElementTypeKey);
-
-                overlayService.confirmRemove({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [(settingsElementType ? settingsElementType.name : "(Unavailable ElementType)")]),
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        vm.removeSettingsForBlock(block);
-                        overlayService.close();
-                    }
-                });
-            });
-        };
-
-        vm.removeSettingsForBlock = function(block) {
-            block.settingsElementTypeKey = null;
-        };
-
-        function updateUsedElementTypes(event, args) {
-            var key = args.documentType.key;
-            for (var i = 0; i<vm.elementTypes.length; i++) {
-                if (vm.elementTypes[i].key === key) {
-                    vm.elementTypes[i] = args.documentType;
-                }
-            }
-            if (vm.contentPreview && vm.contentPreview.key === key) {
-                vm.contentPreview = args.documentType;
-                $scope.$evalAsync();
-            }
-            if (vm.settingsPreview && vm.settingsPreview.key === key) {
-                vm.settingsPreview = args.documentType;
-                $scope.$evalAsync();
-            }
-        }
-
-        unsubscribe.push(eventsService.on("editors.documentType.saved", updateUsedElementTypes));
-
-        vm.addViewForBlock = function(block) {
-            localizationService.localize("blockEditor_headlineAddCustomView").then(localizedTitle => {
-
-                const filePicker = {
-                    title: localizedTitle,
-                    isDialog: true,
-                    filter: i => {
-                        return !(i.name.indexOf(".html") !== -1);
-                    },
-                    filterCssClass: "not-allowed",
-                    select: node => {
-                        const filepath = decodeURIComponent(node.id.replace(/\+/g, " "));
-                        block.view = "~/" + filepath.replace("wwwroot/", "");
-                        editorService.close();
-                    },
-                    close: () => editorService.close()
-                };
-
-                editorService.staticFilePicker(filePicker);
-
-            });
-        };
-
-        vm.requestRemoveViewForBlock = function(block) {
-            localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
-                overlayService.confirmRemove({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [block.view]),
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        vm.removeViewForBlock(block);
-                        overlayService.close();
-                    }
-                });
-            });
-        };
-
-        vm.removeViewForBlock = function(block) {
-            block.view = null;
-        };
-
-        vm.addStylesheetForBlock = function(block) {
-          localizationService.localize("blockEditor_headlineAddCustomStylesheet").then(localizedTitle => {
-
-            const filePicker = {
-              title: localizedTitle,
-              isDialog: true,
-              filter: i => {
-                return !(i.name.indexOf(".css") !== -1);
-              },
-              filterCssClass: "not-allowed",
-              select: node => {
-                const filepath = decodeURIComponent(node.id.replace(/\+/g, " "));
-                block.stylesheet = "~/" + filepath.replace("wwwroot/", "");
-                editorService.close();
-              },
-              close: () => editorService.close()
-            };
-
-            editorService.staticFilePicker(filePicker);
-
-          });
-        };
-
-        vm.requestRemoveStylesheetForBlock = function(block) {
-            localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
-                overlayService.confirmRemove({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [block.stylesheet]),
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        vm.removeStylesheetForBlock(block);
-                        overlayService.close();
-                    }
-                });
-            });
-        };
-
-        vm.removeStylesheetForBlock = function(block) {
-            block.stylesheet = null;
-        };
-
-        vm.addThumbnailForBlock = function(block) {
-
-          localizationService.localize("blockEditor_headlineAddThumbnail").then(localizedTitle => {
-
-                let allowedFileExtensions = ['jpg', 'jpeg', 'png', 'svg', 'webp', 'gif'];
-
-                const thumbnailPicker = {
-                    title: localizedTitle,
-                    isDialog: true,
-                    filter: i => {
-                        let ext = i.name.substr((i.name.lastIndexOf('.') + 1));
-                        return allowedFileExtensions.includes(ext) === false;
-                    },
-                    filterCssClass: "not-allowed",
-                    select: file => {
-                        const id = decodeURIComponent(file.id.replace(/\+/g, " "));
-                        block.thumbnail = "~/" + id.replace("wwwroot/", "");
-                        editorService.close();
-                    },
-                    close: () => editorService.close()
-                };
-
-                editorService.staticFilePicker(thumbnailPicker);
-
-            });
-        };
-
-        vm.removeThumbnailForBlock = function(entry) {
-            entry.thumbnail = null;
-        };
-
-        vm.changeIconColor = function (color) {
-            angularHelper.safeApply($scope, function () {
-                vm.block.iconColor = color ? color.toString() : null;
-            });
-        };
-
-        vm.changeBackgroundColor = function (color) {
-            angularHelper.safeApply($scope, function () {
-                vm.block.backgroundColor = color ? color.toString() : null;
-            });
-        };
-
-        vm.submit = function() {
-            if ($scope.model && $scope.model.submit) {
-
-                // Transfer minMaxModel to area:
-                vm.block.rowMinSpan = vm.rowMinMaxModel.value.min;
-                vm.block.rowMaxSpan = vm.rowMinMaxModel.value.max;
-
-                $scope.model.submit($scope.model);
-            }
-        };
-
-        vm.close = function() {
-            if ($scope.model && $scope.model.close) {
-                $scope.model.close($scope.model);
-            }
-        };
-
-        $scope.$on('$destroy', function() {
-            unsubscribe.forEach(u => { u(); });
-        });
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockGrid.BlockConfigurationOverlayController", BlockConfigurationOverlayController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html
deleted file mode 100644
index d042fbd6e8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html
+++ /dev/null
@@ -1,412 +0,0 @@
-<div class="umb-block-grid-block-configuration-overlay" ng-controller="Umbraco.PropertyEditors.BlockGrid.BlockConfigurationOverlayController as vm">
-
-    <form novalidate name="blockGridBlockConfigurationForm" val-form-manager>
-        <umb-editor-view ng-if="!page.loading">
-
-            <umb-editor-header
-                name="model.title"
-                navigation="vm.navigation"
-                on-select-navigation-item="vm.onNavigationChanged(item)"
-                name-locked="true"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container>
-
-                <div ng-if="vm.activeTab.alias === 'block'" class="form-vertical">
-
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="general_General">General</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- label -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="label"><localize key="blockEditor_labelLabelTemplate">label</localize></label>
-                                    <div class="controls">
-                                        <input type="text" name="label" ng-model="vm.block.label" style="width:100%"/>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- Content Element Type -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label"><localize key="blockEditor_labelContentElementType">Content ElementType</localize></label>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.contentElementTypeKey !== null" >
-                                            <umb-node-preview icon="vm.contentPreview.icon" name="vm.contentPreview.name" alias="vm.contentPreview.alias"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" class="btn-reset __control-actions-btn --open umb-outline" ng-click="vm.openElementType(vm.block.contentElementTypeKey)">
-                                                    <umb-icon icon="icon-edit" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- Settings Element Type -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label"><localize key="blockEditor_labelSettingsElementType">Settings Element Type</localize></label>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.settingsElementTypeKey !== null">
-                                            <umb-node-preview icon="vm.settingsPreview.icon" name="vm.settingsPreview.name" alias="vm.settingsPreview.alias"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" class="btn-reset __control-actions-btn --open umb-outline" ng-click="vm.openElementType(vm.block.settingsElementTypeKey)">
-                                                    <umb-icon icon="icon-edit" class="icon"></umb-icon>
-                                                </button>
-                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.requestRemoveSettingsForBlock(vm.block)">
-                                                    <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <button type="button" class="btn-reset __settings-input --noValue --hideText umb-outline" ng-if="vm.block.settingsElementTypeKey === null" ng-click="vm.addSettingsForBlock($event, vm.block)">
-                                            <localize key="blockEditor_addSettingsElementType">Add settings</localize>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-
-
-
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_headlineAllowance">Permissions</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- allowAtRoot -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="allowAtRoot"><localize key="blockEditor_allowBlockInRoot">Allow in root</localize></label>
-                                    <umb-property-info-button button-title-key="general_readMore">
-                                        <localize key="blockEditor_allowBlockInRootHelp">Make this block available in the root of the layout.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <umb-toggle
-                                            input-id="allowAtRoot"
-                                            checked="vm.block.allowAtRoot"
-                                            on-click="vm.block.allowAtRoot = !vm.block.allowAtRoot || false">
-                                        </umb-toggle>
-                                    </div>
-                                </div>
-                            </div>
-
-
-                            <!-- allowInAreas -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="allowInAreas"><localize key="blockEditor_allowBlockInAreas">Allow in areas</localize></label>
-                                    <umb-property-info-button button-title-key="general_readMore">
-                                        <localize key="blockEditor_allowBlockInAreasHelp">Make this block available within other Blocks.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <umb-toggle
-                                            input-id="allowInAreas"
-                                            checked="vm.block.allowInAreas"
-                                            on-click="vm.block.allowInAreas = !vm.block.allowInAreas || false">
-                                        </umb-toggle>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-
-
-
-
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <div>
-                                <localize key="blockEditor_sizeOptions">Size options</localize>
-                                <umb-property-info-button button-title-key="general_readMore">
-                                    <localize key="blockEditor_sizeOptionsHelp">Define one or more size options, this enables resizing of the Block</localize>
-                                </umb-property-info-button>
-                            </div>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <button ng-if="!vm.showSizeOptions" type="button" class="btn-reset __settings-input --noValue umb-outline" style="height: 80px;" ng-click="vm.showSizeOptions = true">
-                                <localize key="blockEditor_showSizeOptions">Show size options</localize>
-                            </button>
-
-                            <!-- Column span options -->
-                            <div ng-if="vm.showSizeOptions" class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="addNewColumnSpan"><localize key="blockEditor_allowedBlockColumns">Available column spans</localize></label>
-                                    <umb-property-info-button button-title-key="general_readMore">
-                                        <localize key="blockEditor_allowedBlockColumnsHelp">Define the different number of layout columns this block is allowed to span across.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <umb-block-grid-column-editor model="vm.block.columnSpanOptions" block="vm.block" grid-columns="model.gridColumns"></umb-block-grid-column-editor>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- min/max Row span options -->
-                            <div ng-if="vm.showSizeOptions" class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="label"><localize key="blockEditor_allowedBlockRows">Available row spans</localize></label>
-                                    <umb-property-info-button button-title-key="general_readMore">
-                                        <localize key="blockEditor_allowedBlockRowsHelp">Define the range of layout rows this block is allowed to span across.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <umb-property-editor name="rowMinMaxModel" model="vm.rowMinMaxModel" is-pre-value="true"></umb-property-editor>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                </div>
-
-                <div ng-if="vm.activeTab.alias === 'areas'">
-
-                    <div class="umb-group-panel">
-
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_areas">Areas</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- areaGridColumns -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="areaGridColumns"><localize key="blockEditor_areasLayoutColumns">Area layout columns</localize></label>
-                                    <umb-property-info-button button-title-key="general_readMore">
-                                        <localize key="blockEditor_areasLayoutColumnsHelp">Define how many layout columns that will be available for areas. If not defined, the number of layout columns defined for the entire layout will be used.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <input type="number" pattern="[0-9]*" min="1" max="100" name="areaGridColumns" placeholder="{{model.gridColumns}}" ng-model="vm.block.areaGridColumns" fix-number />
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- areas -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="label"><localize key="blockEditor_areasConfigurations">Area configurations</localize></label>
-                                    <umb-property-info-button button-title-key="general_readMore">
-                                      <localize key="blockEditor_areasConfigurationsHelp">To enable the nesting of blocks within this block, define one or more areas. Areas follow the layout defined by their own grid column configuration. The 'column span' and 'row span' for each area can be adjusted by using the scale-handler box in the bottom right hand corner of the selected area.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <umb-block-grid-area-editor model="vm.block.areas" block="vm.block" grid-columns="model.gridColumns" all-block-types="model.allBlockTypes" all-block-groups="model.allBlockGroups" loaded-element-types="model.loadedElementTypes"></umb-block-grid-area-editor>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-
-                <div ng-if="vm.activeTab.alias === 'advance'">
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_headlineAdvanced">Advanced</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- custom view -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="iconcolor"><localize key="blockEditor_labelCustomView">Custom view</localize></label>
-                                    <umb-property-info-button button-title-key="blockEditor_labelCustomViewInfoTitle">
-                                        <localize key="blockEditor_labelCustomViewDescription">Overwrite how this block appears in the BackOffice UI. Pick a .html file containing your presentation.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.view !== null" >
-
-                                            <umb-node-preview icon="'icon-document'" name="vm.block.view"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.requestRemoveViewForBlock(vm.block)">
-                                                    <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <button type="button" class="btn-reset __settings-input --noValue --hideText umb-outline" ng-if="vm.block.view === null" ng-click="vm.addViewForBlock(vm.block)">
-                                            <localize key="blockEditor_addCustomView">Add custom view</localize>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- custom stylesheet -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="iconcolor"><localize key="blockEditor_labelCustomStylesheet">Custom stylesheet</localize></label>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.stylesheet !== null" >
-
-                                            <umb-node-preview icon="'icon-document'" name="vm.block.stylesheet"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.requestRemoveStylesheetForBlock(vm.block)">
-                                                    <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <button type="button" class="btn-reset __settings-input --noValue --hideText umb-outline" ng-if="vm.block.stylesheet === null" ng-click="vm.addStylesheetForBlock(vm.block)">
-                                            <localize key="blockEditor_addCustomStylesheet">Add custom stylesheet</localize>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- editor overlay size -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="editorSize"><localize key="blockEditor_labelEditorSize">Editor size</localize></label>
-                                    <div class="controls">
-                                        <select id="editorSize" ng-model="vm.block.editorSize">
-                                            <option value="small">Small</option>
-                                            <option value="medium">Medium</option>
-                                            <option value="large">Large</option>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- inlineEditing -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label ng-attr-disabled="{{(vm.block.view !== null) || undefined}}" class="control-label" for="inlineEditing"><localize key="blockEditor_gridInlineEditing">Inline editing</localize></label>
-                                    <umb-property-info-button ng-if="vm.block.view === null" button-title-key="general_readMore">
-                                        <localize key="blockEditor_gridInlineEditingHelp">Hide the content edit button and the content editor from the Block Editor overlay.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <umb-toggle checked="(vm.block.view === null ? vm.block.inlineEditing : false)" disabled="vm.block.view !== null" on-click="vm.block.inlineEditing = vm.block.inlineEditing != true"></umb-toggle>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- forceHideContentEditorInOverlay -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="forceHideContentEditorInOverlay"><localize key="blockEditor_forceHideContentEditor">Hide content editor</localize></label>
-                                    <umb-property-info-button button-title-key="general_readMore">
-                                        <localize key="blockEditor_forceHideContentEditorHelp">Hide the content edit button and the content editor from the Block Editor overlay.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <umb-toggle checked="vm.block.forceHideContentEditorInOverlay" on-click="vm.block.forceHideContentEditorInOverlay = vm.block.forceHideContentEditorInOverlay != true"></umb-toggle>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_headlineCatalogueAppearance">Catalogue appearance</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- backgroundColor -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="backgroundColor"><localize key="blockEditor_labelBackgroundColor">Background Color</localize></label>
-                                    <div class="controls">
-                                        <umb-color-picker
-                                            ng-model="vm.block.backgroundColor"
-                                            options="vm.colorPickerOptions"
-                                            on-change="vm.changeBackgroundColor(color)">
-                                        </umb-color-picker>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- iconColor -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="iconColor"><localize key="blockEditor_labelIconColor">Icon Color</localize></label>
-                                    <div class="controls">
-                                        <umb-color-picker
-                                            ng-model="vm.block.iconColor"
-                                            options="vm.colorPickerOptions"
-                                            on-change="vm.changeIconColor(color)">
-                                        </umb-color-picker>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- thumbnail -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="iconcolor"><localize key="blockEditor_thumbnail">Thumbnail</localize></label>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.thumbnail !== null" >
-
-                                            <umb-node-preview icon="'icon-document'" name="vm.block.thumbnail"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.removeThumbnailForBlock(vm.block)">
-                                                    <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <button type="button" class="btn-reset __settings-input --noValue --hideText umb-outline" ng-if="vm.block.thumbnail === null" ng-click="vm.addThumbnailForBlock(vm.block)">
-                                            <localize key="blockEditor_addThumbnail">Add thumbnail</localize>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                </div>
-
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button
-                        action="vm.close()"
-                        shortcut="esc"
-                        button-style="link"
-                        label-key="general_close"
-                        type="button">
-                    </umb-button>
-
-                    <umb-button
-                        action="vm.submit()"
-                        button-style="primary"
-                        state="submitButtonState"
-                        label-key="buttons_submitChanges"
-                        type="button">
-                    </umb-button>
-
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-        </umb-editor-view>
-    </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.less
deleted file mode 100644
index e2e422d267..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.less
+++ /dev/null
@@ -1,105 +0,0 @@
-.umb-block-grid-block-configuration-overlay {
-
-
-    .umb-node-preview {
-        flex-grow: 1;
-    }
-
-    .__control-actions {
-        position: absolute;
-        display: flex;
-        align-items: center;
-        top:0;
-        bottom: 0;
-        right: 0;
-        background-color: rgba(255, 255, 255, 0.8);
-        opacity: 0;
-        transition: opacity 120ms;
-    }
-    .control-group:hover,
-    .control-group:focus,
-    .control-group:focus-within {
-        .__control-actions {
-            opacity: 1;
-        }
-    }
-    .__control-actions-btn {
-        position: relative;
-        color: @ui-action-discreet-type;
-        height: 32px;
-        width: 26px;
-        &:hover {
-            color: @ui-action-discreet-type-hover;
-        }
-        &:last-of-type {
-            margin-right: 7px;
-        }
-    }
-    
-    .umb-node-preview {
-        border-bottom: none;
-    }
-
-    .__settings-input {
-        position: relative;
-        padding: 5px 8px;
-        margin-bottom: 10px;
-        color: @ui-action-discreet-type;
-        border: 1px dashed @ui-action-discreet-border;
-        width: 100%;
-        font-weight: bold;
-        display: inline-flex;
-        flex-flow: row nowrap;
-        align-items: center;
-
-        localize {
-            width: 100%;
-        }
-
-        .umb-node-preview {
-            padding: 3px 0;
-            margin-left: 5px;
-            overflow: hidden;
-        }
-
-        
-
-        &.--noValue {
-            text-align: center;
-            border-radius: @baseBorderRadius;
-            transition: color 120ms;
-            &.--hideText {
-                color: @ui-action-discreet-type;
-            }
-            &:hover, &:focus {
-                color: @ui-action-discreet-type-hover;
-                border-color: @ui-action-discreet-border-hover;
-            }
-        }
-
-        &.--hasValue {
-            border: 1px solid @inputBorder;
-            padding: 0;
-        }
-    }
-
-    .__add-button {
-        width:100%;
-        color: @ui-action-discreet-type;
-        border: 1px dashed @ui-action-discreet-border;
-        border-radius: @baseBorderRadius;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        padding: 5px 15px;
-        box-sizing: border-box;
-        margin: 20px 0;
-        font-weight: bold;
-    }
-    
-    .__add-button:hover {
-        color: @ui-action-discreet-type-hover;
-        border-color: @ui-action-discreet-border-hover;
-    }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.groupconfiguration.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.groupconfiguration.controller.js
deleted file mode 100644
index 3775aff28b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.groupconfiguration.controller.js
+++ /dev/null
@@ -1,18 +0,0 @@
-(function () {
-    "use strict";
-
-    function GroupConfigurationController($scope) {
-
-        var vm = this;
-        vm.addGroup = function() {
-            $scope.model.value.push({
-                key: String.CreateGuid(),
-                name: "Unnamed group"
-            });
-        }
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockGrid.GroupConfigurationController", GroupConfigurationController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.groupconfiguration.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.groupconfiguration.html
deleted file mode 100644
index 25a7282ca2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.groupconfiguration.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="controls" ng-controller="Umbraco.PropertyEditors.BlockGrid.GroupConfigurationController as vm">
-    <uui-button look="placeholder" color="primary" ng-click="vm.addGroup($event)" style="font-weight: 700; width: 100%;">
-        <localize key="blockEditor_addBlockGroup">Add group</localize>
-    </uui-button>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.stylesheetpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.stylesheetpicker.controller.js
deleted file mode 100644
index 60595efca2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.stylesheetpicker.controller.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.BlockGrid.BlockConfigurationController
- * @function
- *
- * @description
- * The controller for the content type editor property settings dialog
- */
-
-(function () {
-    "use strict";
-
-    function StylesheetPickerController($scope, localizationService, editorService, overlayService) {
-
-        //var unsubscribe = [];
-
-        var vm = this;
-
-        vm.addStylesheet = function() {
-            localizationService.localize("blockEditor_headlineAddCustomStylesheet").then(localizedTitle => {
-  
-                const filePicker = {
-                    title: localizedTitle,
-                    isDialog: true,
-                    filter: i => {
-                        return !(i.name.indexOf(".css") !== -1);
-                    },
-                    filterCssClass: "not-allowed",
-                    select: node => {
-                        const filepath = decodeURIComponent(node.id.replace(/\+/g, " "));
-                        $scope.model.value = "~/" + filepath.replace("wwwroot/", "");
-                        editorService.close();
-                    },
-                    close: () => editorService.close()
-                };
-
-                editorService.staticFilePicker(filePicker);
-
-            });
-        };
-
-        vm.requestRemoveStylesheet = function() {
-            localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
-                overlayService.confirmRemove({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [$scope.model.value]),
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        vm.requestRemoveStylesheet();
-                        overlayService.close();
-                    }
-                });
-            });
-        };
-
-        vm.requestRemoveStylesheet = function() {
-            $scope.model.value = null;
-        };
-
-/*
-        $scope.$on('$destroy', function () {
-            unsubscribe.forEach(u => { u(); });
-        });
-*/
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockGrid.StylesheetPickerController", StylesheetPickerController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.stylesheetpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.stylesheetpicker.html
deleted file mode 100644
index ed17cd0bb2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.stylesheetpicker.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="umb-block-list-block-configuration-overlay umb-property-editor--limit-width" ng-controller="Umbraco.PropertyEditors.BlockGrid.StylesheetPickerController as vm">
-    <div class="__settings-input --hasValue" ng-if="model.value" >
-
-        <umb-node-preview icon="'icon-document'" name="model.value"></umb-node-preview>
-        <div class="__control-actions">
-            <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.requestRemoveStylesheet()">
-                <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-            </button>
-        </div>
-    </div>
-    <button type="button" class="btn-reset __settings-input --noValue umb-outline" ng-if="!model.value" ng-click="vm.addStylesheet()">
-        <localize key="blockEditor_addCustomStylesheet">Add custom stylesheet</localize>
-    </button>
-    <umb-button type="link" button-style="link" href="/umbraco/assets/css/umbraco-blockgridlayout.css" href-target="_blank" label="Get default stylesheet" label-key="blockEditor_defaultLayoutStylesheet">
-    </umb-button>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-allowance-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-allowance-editor.html
deleted file mode 100644
index 8bb04feef7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-allowance-editor.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<div class="umb-block-grid-area-allowance-editor">
-
-    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-    <div ng-show="vm.loading !== true" class="__list">
-        
-        <div ng-repeat="allowance in vm.model track by allowance.$key" class="umb-block-grid-area-allowance-editor__entry">
-            <select 
-                ng-model="allowance.$chosenValue"
-                localize="title"
-                title="@blockEditor_pickSpecificAllowance"
-                required>
-                <option ng-repeat="blockGroup in vm.allBlockGroups" value="groupKey:{{blockGroup.key}}">{{blockGroup.name}}</option>
-                <option disabled value="">---------</option>
-                <option ng-repeat="blockType in vm.allBlockTypes" ng-init="elementType = vm.getElementTypeByKey(blockType.contentElementTypeKey)" value="elementTypeKey:{{elementType.key}}">{{elementType.name}}</option>
-            </select>
-            <input 
-                type="number"
-                pattern="[0-9]*"
-                name="label"
-                min="0"
-                ng-max="model.value.max"
-                placeholder="0"
-                ng-model="allowance.minAllowed"
-                localize="title"
-                title="@blockEditor_allowanceMinimum"
-                fix-number />
-            <span>–</span>
-            <input 
-                type="number"
-                pattern="[0-9]*"
-                name="label"
-                ng-model="allowance.maxAllowed"
-                placeholder="∞"
-                ng-min="model.value.min || 0"
-                localize="title"
-                title="@blockEditor_allowanceMaximum"
-                fix-number />
-            <button 
-                type="button" 
-                class="btn-reset umb-outline"
-                localize="title"
-                title="@actions_delete"
-                ng-click="vm.deleteAllowance(allowance);">
-                <umb-icon icon="icon-trash" class="icon"></umb-icon>
-                <span class="sr-only">
-                    <localize key="actions_delete">Delete</localize>
-                </span>
-            </button>
-        </div>
-    </div>
-
-    <button
-        type="button"
-        class="btn-reset umb-block-grid-area-editor__create-button umb-outline"
-        ng-click="vm.onNewAllowanceClick()">
-        <localize key="general_add">Add</localize>
-    </button>
-
-    <div ng-if="vm.model.length === 0" class="__empty-label">
-      <localize key="blockEditor_areaAllowedBlocksEmpty">By default, all block types are allowed in an Area, Use this option to allow only selected types.</localize>
-    </div>
-
-</div>
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-allowance-editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-allowance-editor.less
deleted file mode 100644
index eea1dda5b7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-allowance-editor.less
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-.umb-block-grid-area-allowance-editor > button {
-    width: 100%;
-}
-
-.umb-block-grid-area-allowance-editor .__empty-label {
-    font-size: 12px;
-    color: @gray-6;
-    line-height: 1.5em;
-    padding-top: 5px;
-}
-
-.umb-block-grid-area-allowance-editor__entry {
-    display:flex;
-    align-items: baseline;
-    select {  
-        margin-right: 15px;
-        width: 260px;
-    }
-    > span {
-        margin: 0 3px;
-    }
-    input {
-        width: 60px;
-    }
-}
-
-.umb-block-grid-area-allowance-editor__entry button {
-    position: relative;
-    border-radius: 3px;
-    color: @ui-action-type;
-    height: 32px;
-    display: inline-flex;
-    justify-content: center;
-    align-items: center;
-    width: 32px;
-    margin-left: 5px;
-    align-self: normal;
-}
-
-.umb-block-grid-area-allowance-editor__entry button:hover {
-    background-color: @ui-action-hover;
-    color: @ui-action-type-hover;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-editor.html
deleted file mode 100644
index 2146f9b1a5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-editor.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="umb-block-grid-area-editor">
-
-    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-    <div ng-if="vm.loading === false"
-        class="umb-block-grid-area-editor__grid-wrapper"
-        style="--umb-block-grid--block-grid-columns: {{vm.block.areaGridColumns || vm.rootLayoutColumns}}"
-        umb-block-grid-sorter="::vm.sorterOptions"
-        umb-block-grid-sorter-model="vm.model">
-
-        <umb-block-grid-configuration-area-entry ng-repeat="area in vm.model track by area.key"
-            class="umb-block-grid-area-editor__area"
-            ng-class="{'--isOpen':vm.openArea === area}"
-            data-area-key="{{area.key}}"
-            data-col-span="{{area.columnSpan}}"
-            data-row-span="{{area.rowSpan}}"
-            style="
-            --umb-block-grid--grid-column: {{area.columnSpan}};
-            --umb-block-grid--area-column-span: {{area.columnSpan}};
-            --umb-block-grid--area-row-span: {{area.rowSpan}};
-            "
-            area="area"
-            ng-click="vm.editArea(area)"
-            on-edit="vm.editArea(area)"
-            on-delete="vm.requestDeleteArea(area)"
-        >
-        </umb-block-grid-configuration-area-entry>
-
-    </div>
-
-    <button
-        type="button"
-        ng-disabled="vm.disabled"
-        class="btn-reset umb-block-grid-area-editor__create-button umb-outline"
-        ng-click="vm.onNewAreaClick()">
-        <localize key="general_add">Add</localize>
-    </button>
-
-</div>
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-editor.less
deleted file mode 100644
index 4f5d45c67c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-editor.less
+++ /dev/null
@@ -1,243 +0,0 @@
-
-
-/*
-Grid part:
-*/
-/*
-.umb-block-grid__layout-container {
-    display: grid;
-    grid-template-columns: repeat(12, minmax(0, 1fr));
-    grid-gap: 10px;
-
-    grid-auto-flow: row;
-}
-
-
-.umb-block-grid__layout-item {
-    grid-column: span 4;
-}
-*/
-
-.umb-block-grid-area-editor__grid-wrapper {
-    position: relative;
-    display: grid;
-    grid-template-columns: repeat(var(--umb-block-grid--block-grid-columns, 1), minmax(0, 1fr));
-
-    grid-gap: 0px;
-    grid-auto-flow: row;
-    grid-auto-rows: minmax(50px, auto);
-}
-.umb-block-grid-area-editor__grid-wrapper > * {
-    grid-column: span var(--umb-block-grid--area-column-span, 12);
-    grid-row: span var(--umb-block-grid--area-row-span, 1);
-}
-
-.umb-block-grid-area-editor__area {
-    position: relative;
-    background-color: @gray-11;
-    box-sizing: border-box;
-    cursor: move;
-    
-    &::after {
-        content: '';
-        position: absolute;
-        pointer-events: none;
-        inset: 0;
-        border: 1px solid @gray-7;
-        border-radius: 3px;
-    }
-
-    .umb-block-grid__area--actions {
-        opacity: 0;
-        transition: opacity 120ms;
-    }
-
-    &:hover,
-    &:focus,
-    &:focus-within,
-    &.--active {
-        .umb-block-grid__area--actions {
-            opacity: 1;
-        }
-    }
-}
-.umb-block-grid-area-editor__area:hover {
-    background-color: @gray-9;
-    &::after {
-        border-color: @blueDark;
-    }
-}
-.umb-block-grid-area-editor__area .__label {
-    margin-top: 15px;
-    margin-left: 20px;
-    opacity: 60%;
-    pointer-events: none;
-    user-select: none;
-}
-
-.umb-block-grid-area-editor__area-placeholder {
-    background: transparent;
-    border-radius: 3px;
-
-    border: @blueDark solid 1px;
-    border-radius: 3px;
-
-    ::after {
-        content: '';
-        position:absolute;
-        z-index:1;
-        inset: 0;
-        border-radius: 3px;
-    
-        transition: background-color 240ms ease-in;
-        animation: umb-block-grid-area-editor__placeholder__pulse 400ms ease-in-out alternate infinite;
-        @keyframes umb-block-grid-area-editor__placeholder__pulse {
-            0%   { background-color: rgba(@blueMidLight, 0.33); }
-            100% { background-color: rgba(@blueMidLight, 0.22); }
-        }
-    }
-}
-
-
-.umb-block-grid__area--actions {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    font-size: 0;
-    background-color: rgba(255, 255, 255, .96);
-    border-radius: 16px;
-    padding-left: 5px;
-    padding-right: 5px;
-    .action {
-        position: relative;
-        display: inline-block;
-        color: @ui-action-discreet-type;
-        font-size: 18px;
-        padding: 5px;
-        &:hover {
-            color: @ui-action-discreet-type-hover;
-        }
-    }
-}
-
-.umb-block-grid-area-editor__scale-handler {
-    cursor: nwse-resize;
-    position: absolute;
-    Z-index:10;
-    bottom: -4px;
-    right: -4px;
-    width:8px;
-    height:8px;
-    padding: 0;
-    background-color: white;
-    border: @blueDark solid 1px;
-    opacity: 0;
-    transition: opacity 120ms;
-}
-
-.umb-block-grid-area-editor__scale-handler::after {
-    content: '';
-    position: absolute;
-    inset: -10px;
-    background-color: rgba(0,0,0,0);
-}
-.umb-block-grid-area-editor__area:focus-within, 
-.umb-block-grid-area-editor__area:hover {
-    .umb-block-grid-area-editor__scale-handler {
-        opacity: 1;
-    }
-}
-.umb-block-grid-area-editor__scale-handler:focus {
-    opacity: 1;
-}
-/* When inside scalebox its always visible: */
-.umb-block-grid-area-editor__scalebox .umb-block-grid-area-editor__scale-handler {
-    opacity: 1;
-}
-
-.umb-block-grid-area-editor__scale-handler:focus + .umb-block-grid-area-editor__scale-label,
-.umb-block-grid-area-editor__scale-handler:hover + .umb-block-grid-area-editor__scale-label {
-    opacity: 1;
-}
-
-.umb-block-grid-area-editor__scale-label {
-    position: absolute;
-    display: block;
-    right: 0;
-    top: 100%;
-    margin-top: 6px;
-    transform: translateX(50%);
-    z-index: 2;
-
-    background-color: white;
-    color: black;
-    font-size: 12px;
-    padding: 0px 6px;
-    border-radius: 3px;
-    opacity: 0;
-    transition: opacity 120ms;
-
-    pointer-events: none;
-    white-space: nowrap;
-}
-
-
-.umb-block-grid-area-editor__scalebox-backdrop {
-    background-color: rgba(255, 255, 255, 0.1);
-    position: absolute;
-    top:0;
-    left:0;
-    bottom:0;
-    right:0;
-    z-index: 1;
-    cursor: nwse-resize;
-}
-.umb-block-grid-area-editor__scalebox {
-    position: absolute;
-    top:0;
-    left:0;
-    z-index: 10;
-    cursor: nwse-resize;
-
-    border: @blueDark solid 1px;
-    border-radius: 3px;
-
-    transition: background-color 240ms ease-in;
-    animation: umb-block-grid__scalebox__pulse 400ms ease-in-out alternate infinite;
-    @keyframes umb-block-grid__scalebox__pulse {
-        0%   { background-color: rgba(@blueMidLight, 0.33); }
-        100% { background-color: rgba(@blueMidLight, 0.22); }
-    }
-}
-
-
-
-.umb-block-grid-area-editor__create-button {
-    position: relative;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    height:50px;
-    width:100%;
-    
-    color: @ui-action-discreet-type;
-    font-weight: bold;
-    margin: -1px;
-    padding: 5px 15px;
-
-    border: 1px dashed @ui-action-discreet-border;
-    border-radius: @baseBorderRadius;
-    box-sizing: border-box;
-    
-    &:not([disabled]):hover {
-        color: @ui-action-discreet-type-hover;
-        border-color: @ui-action-discreet-border-hover;
-        text-decoration: none;
-        z-index: 1;
-    }
-}
-.umb-block-grid-area-editor__create-button[disabled] {
-    color: @ui-disabled-type;
-    border-color: @ui-disabled-border;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-column-editor-option.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-column-editor-option.html
deleted file mode 100644
index f77153239f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-column-editor-option.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="__column" ng-class="{'--active': vm.columnSpanOption}">
-    <div ng-if="vm.columnSpanOption">
-
-        <span>
-            {{vm.columnSpanOption.columnSpan}}
-        </span>
-        <div class="__border"></div>
-        <button type="button" ng-attr-title="{{vm.removeLabel}}" class="btn-reset" ng-click="vm.onClickRemove()">
-            <span class="sr-only">
-                <localize key="general_remove">Remove</localize>
-            </span>
-        </button>
-    </div>
-    <div ng-if="!vm.columnSpanOption">
-        <span>
-            {{vm.column}}
-        </span>
-        <div class="__border"></div>
-        <button type="button" class="btn-reset" ng-click="vm.onClickAdd()">
-            <span class="sr-only">
-                <localize key="blockEditor_addColumnSpanOption" tokens="[vm.columnSpanOption.columnSpan]">Add span option</localize>
-                {{vm.columnSpanOption.columnSpan}}
-            </span>
-        </button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-column-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-column-editor.html
deleted file mode 100644
index 097e4780a0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-column-editor.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div 
-    class="umb-block-grid-column-editor"
-    style="--umb-block-grid--gridColumns: {{vm.gridColumns}}"
->
-    <div class="__grid-box"></div>
-    <umb-block-grid-column-editor-option 
-        ng-repeat="colN in vm.emptyGridColumnArray track by $index"
-        column-span-option="(vm.block.columnSpanOptions | filter : {'columnSpan':colN} : true)[0]"
-        column="colN"
-        on-click-add="vm.addSpanOption(colN)"
-        on-click-remove="vm.removeSpanOption(colN)"
-        style="--umb-block-grid--columnN: {{colN}}"
-        >
-    </umb-block-grid-column-editor-option>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-column-editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-column-editor.less
deleted file mode 100644
index 4241c7e8c0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-column-editor.less
+++ /dev/null
@@ -1,116 +0,0 @@
-.umb-block-grid-column-editor {
-
-    position: relative;
-    width: 100%;
-    --umb-block-grid-column-editor-ui-height: 22px;
-    padding-bottom: 10px;
-
-    .__grid-box {
-        border: 1px solid grey;
-        margin-top: var(--umb-block-grid-column-editor-ui-height);
-        width: 100%;
-        height: 40px;
-    }
-
-    .__column {
-
-        position: absolute;
-        top: 1px;
-        height: 40px;
-        pointer-events: none;
-        width: 100%;
-        //z-index: calc(var(--umb-block-grid--gridColumns) - var(--umb-block-grid--columnN));
-
-        &::before {
-            content: '';
-            position: absolute;
-            inset: 0;
-            //z-index: calc(var(--umb-block-grid--gridColumns) - var(--umb-block-grid--columnN));
-            transition: background-color 120ms;
-            width: calc((100% / var(--umb-block-grid--gridColumns)) * (var(--umb-block-grid--columnN)));
-            pointer-events:none;
-        }
-
-
-        > div {
-            position: absolute;
-            left: calc((100% / var(--umb-block-grid--gridColumns)) * (var(--umb-block-grid--columnN) - 0.5));
-            top: 0;
-            width: calc(100% / var(--umb-block-grid--gridColumns));
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            > span {
-                display: block;
-                font-size: 13px;
-                font-weight: 700;
-                opacity: 18%;
-                height: var(--umb-block-grid-column-editor-ui-height);
-                margin-top: calc(var(--umb-block-grid-column-editor-ui-height) * -1);
-                transition: opacity 120ms;
-            }
-            .__border {
-                position:absolute;
-                height:40px;
-                right: 50%;
-                margin-right: -2px;
-                width:1px;
-                background-color: @blueExtraDark;
-                border-left: 1px solid white;
-                z-index: calc(var(--umb-block-grid--gridColumns) + 2);
-                opacity: 18%;
-                transition: opacity 120ms, border-left-width 120ms, right 120ms;
-            }
-            button {
-                width: 100%;
-                height:40px;
-                margin-top: 3px;
-                pointer-events: all;
-                opacity: 18%;
-                transition: opacity 120ms;
-            }
-        }
-
-
-        &.--active {
-            &::before {
-                background-color: @blueExtraDark;
-            }
-            > div {
-                .__border {
-                    border-left-width: 2px;
-                    opacity: 100% !important;
-                }
-                > span {
-                    opacity: 80%;
-                }
-            }
-            button {
-                opacity: 18%;
-            }
-        }
-        
-
-        &:hover {
-            &::before {
-                z-index: calc(var(--umb-block-grid--gridColumns) + 1);
-                background-color: @blueMid;
-                transition-delay: 0ms;
-            }
-            > div {
-                .__border {
-                    border-left-width: 2px;
-                    opacity: 50%;
-                }
-                > span {
-                    opacity: 100%;
-                }
-            }
-            button {
-                opacity: 100%;
-            }
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-configuration-area-entry.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-configuration-area-entry.html
deleted file mode 100644
index ddba94cbd5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-configuration-area-entry.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<div>
-    <div class="__label">{{vm.area.alias}}</div>
-
-    <div class="umb-block-grid__area--actions">
-        <button type="button"
-                class="btn-reset umb-outline action --edit"
-                localize="title"
-                title="@blockEditor_configureArea"
-                ng-click="vm.onEditClick($event);">
-            <umb-icon icon="icon-edit" class="icon"></umb-icon>
-            <span class="sr-only">
-                <localize key="blockEditor_configureArea">Edit</localize>
-            </span>
-        </button>
-        <button type="button"
-                class="btn-reset umb-outline action --delete"
-                localize="title"
-                title="@blockEditor_deleteArea"
-                ng-click="vm.onDeleteClick($event);">
-            <umb-icon icon="icon-trash" class="icon"></umb-icon>
-            <span class="sr-only">
-                <localize key="blockEditor_deleteArea">Delete</localize>
-            </span>
-        </button>
-    </div>
-    
-    <button type="button"
-            class="btn-reset umb-block-grid-area-editor__scale-handler umb-outline"
-            ng-mousedown="vm.scaleHandlerMouseDown($event)"
-            ng-keyup="vm.scaleHandlerKeyUp($event)">
-    </button>
-    
-    <div class="umb-block-grid-area-editor__scale-label">
-        {{vm.area.columnSpan}} x {{vm.area.rowSpan}}
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridAreaAllowanceEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridAreaAllowanceEditor.component.js
deleted file mode 100644
index 9729ddd85b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridAreaAllowanceEditor.component.js
+++ /dev/null
@@ -1,106 +0,0 @@
-(function () {
-    "use strict";
-
-    /**
-     * @ngdoc directive
-     * @name umbraco.directives.directive:umbBlockGridAreaEditor
-     * @function
-     *
-     * @description
-     * The component for the block grid area prevalue editor.
-     */
-    angular
-        .module("umbraco")
-        .component("umbBlockGridAreaAllowanceEditor", {
-            templateUrl: "views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-allowance-editor.html",
-            controller: BlockGridAreaAllowanceController,
-            controllerAs: "vm",
-            bindings: {
-                model: "=",
-                allBlockTypes: "<",
-                allBlockGroups: "<",
-                loadedElementTypes: "<",
-                disabled: "<"
-            },
-            require: {
-                propertyForm: "^form"
-            }
-        });
-
-    function BlockGridAreaAllowanceController($scope) {
-
-        var unsubscribe = [];
-
-        var vm = this;
-        vm.loading = true;
-
-        vm.$onInit = function() {
-            vm.loading = false;
-
-            vm.model.forEach((x) => {
-                x['$key'] = String.CreateGuid();
-
-                // transfer the chosen key onto the $chosenValue property.
-                if(x.groupKey) {
-                    x['$chosenValue'] = "groupKey:"+x.groupKey;
-                } else if (x.elementTypeKey) {
-                    x['$chosenValue'] = "elementTypeKey:"+x.elementTypeKey;
-                }
-            });
-        };
-
-        vm.getElementTypeByKey = function(key) {
-            if (vm.loadedElementTypes) {
-                return vm.loadedElementTypes.find(function (type) {
-                    return type.key === key;
-                }) || null;
-            }
-        };
-
-        vm.deleteAllowance = function(allowance) {
-            const index = vm.model.indexOf(allowance);
-            if(index !== -1) {
-                vm.model.splice(index, 1);
-            }
-        }
-
-        vm.onNewAllowanceClick = function() {
-            const allowance = {
-                $key: String.CreateGuid(),
-                elementTypeKey: null,
-                groupKey: null,
-                min: 0,
-                max: 0
-            };
-            vm.model.push(allowance);
-            setDirty();
-        }
-        
-        function setDirty() {
-            if (vm.propertyForm) {
-                vm.propertyForm.$setDirty();
-            }
-        }
-        
-        $scope.$on("$destroy", function () {
-
-            // Set groupKey or elementTypeKey based on $chosenValue.
-            vm.model.forEach((x) => {
-                const value = x['$chosenValue'];
-                if (value.indexOf('groupKey:') === 0) {
-                    x.groupKey = value.slice(9);
-                    x.elementTypeKey = null;
-                } else if (value.indexOf('elementTypeKey:') === 0) {
-                    x.groupKey = null;
-                    x.elementTypeKey = value.slice(15);
-                }
-            });
-
-            for (const subscription of unsubscribe) {
-                subscription();
-            }
-        });
-        
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridAreaEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridAreaEditor.component.js
deleted file mode 100644
index 914e701fa6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridAreaEditor.component.js
+++ /dev/null
@@ -1,274 +0,0 @@
-(function () {
-    "use strict";
-
-
-    // Utils:
-
-    function getInterpolatedIndexOfPositionInWeightMap(target, weights) {
-        const map = [0];
-        weights.reduce((a, b, i) => { return map[i+1] = a+b; }, 0);
-        const foundValue = map.reduce((a, b) => {
-            let aDiff = Math.abs(a - target);
-            let bDiff = Math.abs(b - target);
-    
-            if (aDiff === bDiff) {
-                return a < b ? a : b;
-            } else {
-                return bDiff < aDiff ? b : a;
-            }
-        })
-        const foundIndex = map.indexOf(foundValue);
-        const targetDiff = (target-foundValue);
-        let interpolatedIndex = foundIndex;
-        if (targetDiff < 0 && foundIndex === 0) {
-            // Don't adjust.
-        } else if (targetDiff > 0 && foundIndex === map.length-1) {
-            // Don't adjust.
-        } else {
-            const foundInterpolationWeight = weights[targetDiff >= 0 ? foundIndex : foundIndex-1];
-            interpolatedIndex += foundInterpolationWeight === 0 ? interpolatedIndex : (targetDiff/foundInterpolationWeight)
-        }
-        return interpolatedIndex;
-    }
-
-    function getAccumulatedValueOfIndex(index, weights) {
-        let i = 0, len = Math.min(index, weights.length), calc = 0;
-        while(i<len) {
-            calc += weights[i++];
-        }
-        return calc;
-    }
-
-    function TransferProperties(fromObject, toObject) {
-        for (var p in fromObject) {
-            toObject[p] = fromObject[p];
-        }
-    }
-
-    /**
-     * @ngdoc directive
-     * @name umbraco.directives.directive:umbBlockGridAreaEditor
-     * @function
-     *
-     * @description
-     * The component for the block grid area prevalue editor.
-     */
-    angular
-        .module("umbraco")
-        .component("umbBlockGridAreaEditor", {
-            templateUrl: "views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-editor.html",
-            controller: BlockGridAreaController,
-            controllerAs: "vm",
-            bindings: {
-                model: "<",
-                block: "<",
-                allBlockTypes: "<",
-                allBlockGroups: "<",
-                loadedElementTypes: "<",
-                gridColumns: "<"
-            },
-            require: {
-                propertyForm: "^form"
-            }
-        });
-
-    function BlockGridAreaController($scope, localizationService, editorService, overlayService) {
-
-        var unsubscribe = [];
-
-        var vm = this;
-        vm.loading = true;
-        vm.rootLayoutColumns = 12;
-
-        vm.$onInit = function() {
-
-            vm.rootLayoutColumns = vm.gridColumns;
-            initializeSortable();
-            vm.loading = false;
-
-        };
-
-        function initializeSortable() {
-
-            vm.sorterOptions = {
-                resolveVerticalDirection: resolveVerticalDirection,
-                compareElementToModel: (el, modelEntry) => modelEntry.key === el.dataset.areaKey,
-                querySelectModelToElement: (container, modelEntry) => container.querySelector(`[data-area-key='${modelEntry.key}']`),
-                itemHasNestedContainersResolver: () => false,// We never have nested in this case.
-                containerSelector: ".umb-block-grid-area-editor__grid-wrapper",
-                itemSelector: ".umb-block-grid-area-editor__area",
-                placeholderClass: "umb-block-grid-area-editor__area-placeholder",
-                onSync: onSortSync
-            }
-
-            function onSortSync() {
-                $scope.$evalAsync();
-                setDirty();
-            }
-
-            function resolveVerticalDirection(data) {
-
-                /** We need some data about the grid to figure out if there is room to be placed next to the found element */
-                const approvedContainerComputedStyles = getComputedStyle(data.containerElement);
-                const gridColumnGap = Number(approvedContainerComputedStyles.columnGap.split("px")[0]) || 0;
-                const gridColumnNumber = vm.rootLayoutColumns;
-    
-                const foundElColumns = parseInt(data.relatedElement.dataset.colSpan, 10);
-                const currentElementColumns = data.item.columnSpan;
-
-                if(currentElementColumns >= gridColumnNumber) {
-                    return true;
-                }
-    
-                // Get grid template:
-                const approvedContainerGridColumns = approvedContainerComputedStyles.gridTemplateColumns.trim().split("px").map(x => Number(x)).filter(n => n > 0).map((n, i, list) => list.length === i ? n : n + gridColumnGap);
-    
-                // ensure all columns are there.
-                // This will also ensure handling non-css-grid mode,
-                // use container width divided by amount of columns( or the item width divided by its amount of columnSpan)
-                let amountOfColumnsInWeightMap = approvedContainerGridColumns.length;
-                const amountOfUnknownColumns = gridColumnNumber-amountOfColumnsInWeightMap;
-                if(amountOfUnknownColumns > 0) {
-                    let accumulatedValue = getAccumulatedValueOfIndex(amountOfColumnsInWeightMap, approvedContainerGridColumns) || 0;
-                    const layoutWidth = data.containerRect.width;
-                    const missingColumnWidth = (layoutWidth-accumulatedValue)/amountOfUnknownColumns;
-                    if(missingColumnWidth > 0) {
-                        while(amountOfColumnsInWeightMap++ < gridColumnNumber) {
-                            approvedContainerGridColumns.push(missingColumnWidth);
-                        }
-                    }
-                }
-    
-                let offsetPlacement = 0;
-                /* If placeholder is in this same line, we want to assume that it will offset the placement of the found element, 
-                which provides more potential space for the item to drop at.
-                This is relevant in this calculation where we look at the space to determine if its a vertical or horizontal drop in relation to the found element.
-                */
-                if(data.placeholderIsInThisRow && data.elementRect.left < data.relatedRect.left) {
-                    offsetPlacement = -(data.elementRect.width + gridColumnGap);
-                }
-    
-                const relatedStartX = Math.max(data.relatedRect.left - data.containerRect.left + offsetPlacement, 0);
-                const relatedStartCol = Math.round(getInterpolatedIndexOfPositionInWeightMap(relatedStartX, approvedContainerGridColumns));
-    
-                // If the found related element does not have enough room after which for the current element, then we go vertical mode:
-                return (relatedStartCol + (data.horizontalPlaceAfter ? foundElColumns : 0) + currentElementColumns > gridColumnNumber);
-                
-            }
-    
-
-        }
-
-        vm.editArea = function(area) {
-            vm.openAreaOverlay(area);
-        }
-
-        vm.requestDeleteArea = function (area) {
-            localizationService.localizeMany(["general_delete", "blockEditor_confirmDeleteBlockAreaMessage", "blockEditor_confirmDeleteBlockAreaNotice"]).then(function (data) {
-                overlayService.confirmDelete({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [area.alias]),
-                    confirmMessage: data[2],
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        vm.deleteArea(area);
-                        overlayService.close();
-                    }
-                });
-            });
-        }
-        vm.deleteArea = function(area) {
-            const index = vm.model.findIndex(x => x.key === area.key);
-            if(index !== -1) {
-                vm.model.splice(index, 1);
-            }
-            setDirty();
-        }
-
-        vm.onNewAreaClick = function() {
-
-            const areaGridColumns = (vm.block.areaGridColumns || vm.rootLayoutColumns)
-            const columnSpan = areaGridColumns/2 === Math.round(areaGridColumns/2) ? areaGridColumns/2 : areaGridColumns;
-
-            const newArea = {
-                'key': String.CreateGuid(),
-                'alias': '',
-                'columnSpan': columnSpan,
-                'rowSpan': 1,
-                'minAllowed': 0,
-                'maxAllowed': null,
-                'specifiedAllowance': [
-                    /*{
-                        'elementTypeKey': 345,
-                        'min': 0,
-                        'max': null
-                    }*/
-                ]
-
-            };
-            vm.model.push(newArea)
-            vm.openAreaOverlay(newArea);
-            setDirty();
-        }
-
-        vm.openArea = null;
-        vm.openAreaOverlay = function (area) {
-            localizationService.localize("blockEditor_blockConfigurationOverlayTitle").then(function (localized) {
-
-                var clonedAreaData = Utilities.copy(area);
-                vm.openArea = area;
-
-                function updateTitle() {
-                    overlayModel.title = localizationService.tokenReplace(localized, [clonedAreaData.alias]);
-                }
-
-                const areaIndex = vm.model.indexOf(area);
-                const otherAreas = [...vm.model];
-                otherAreas.splice(areaIndex, 1);
-
-                var overlayModel = {
-                    otherAreaAliases: otherAreas.map(x => x.alias),
-                    area: clonedAreaData,
-                    updateTitle: updateTitle,
-                    allBlockTypes: vm.allBlockTypes,
-                    allBlockGroups: vm.allBlockGroups,
-                    loadedElementTypes: vm.loadedElementTypes,
-                    view: "views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.area.overlay.html",
-                    size: "small",
-                    submit: function(overlayModel) {
-                        TransferProperties(overlayModel.area, area);
-                        overlayModel.close();
-                        setDirty();
-                    },
-                    close: function() {
-                        editorService.close();
-                        vm.openArea = null;
-                    }
-                };
-
-                updateTitle();
-
-                // open property settings editor
-                editorService.open(overlayModel);
-
-            });
-
-        };
-        
-        function setDirty() {
-            if (vm.propertyForm) {
-                vm.propertyForm.$setDirty();
-            }
-        }
-        
-        $scope.$on("$destroy", function () {
-            for (const subscription of unsubscribe) {
-                subscription();
-            }
-        });
-        
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridColumnEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridColumnEditor.component.js
deleted file mode 100644
index 1dcbc5b2da..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridColumnEditor.component.js
+++ /dev/null
@@ -1,61 +0,0 @@
-(function () {
-    "use strict";
-
-    /**
-     * @ngdoc directive
-     * @name umbraco.directives.directive:umbBlockGridColumnSpanEditor
-     * @function
-     *
-     * @description
-     * The component for the block grid column span prevalue editor.
-     */
-    angular
-        .module("umbraco")
-        .component("umbBlockGridColumnEditor", {
-            templateUrl: "views/propertyeditors/blockgrid/prevalue/umb-block-grid-column-editor.html",
-            controller: BlockGridColumnController,
-            controllerAs: "vm",
-            bindings: {
-                model: "=",
-                block: "<",
-                gridColumns: "<"
-            },
-            require: {
-                propertyForm: "^form"
-            }
-        });
-
-    function BlockGridColumnController() {
-
-        var vm = this;
-
-        vm.$onInit = function() {
-            
-            vm.emptyGridColumnArray = Array.from(Array(vm.gridColumns + 1).keys()).slice(1);
-
-            vm.block.columnSpanOptions = vm.block.columnSpanOptions.filter(
-                (value, index, self) => {
-                    return value.columnSpan <= vm.gridColumns &&
-                        self.findIndex(v => v.columnSpan === value.columnSpan) === index;
-                }
-            );
-        };
-
-        vm.addSpanOption = function(colN) {
-            vm.block.columnSpanOptions.push({'columnSpan': colN});
-            setDirty();
-        }
-        vm.removeSpanOption = function(colN) {
-            vm.block.columnSpanOptions = vm.block.columnSpanOptions.filter(value => value.columnSpan !== colN);
-            setDirty();
-        }
-
-        function setDirty() {
-            if (vm.propertyForm) {
-                vm.propertyForm.$setDirty();
-            }
-        }
-        
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridColumnEditorOption.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridColumnEditorOption.component.js
deleted file mode 100644
index 6436b3f510..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridColumnEditorOption.component.js
+++ /dev/null
@@ -1,41 +0,0 @@
-(function () {
-    "use strict";
-
-    /**
-     * @ngdoc directive
-     * @name umbraco.directives.directive:umbBlockGridColumnSpanEditorOption
-     * @function
-     *
-     * @description
-     * A component for the block grid column span prevalue editor.
-     */
-    angular
-        .module("umbraco")
-        .component("umbBlockGridColumnEditorOption", {
-            templateUrl: "views/propertyeditors/blockgrid/prevalue/umb-block-grid-column-editor-option.html",
-            controller: BlockGridColumnOptionController,
-            controllerAs: "vm",
-            bindings: {
-                columnSpanOption: "<",
-                column: "<",
-                onClickAdd: "&",
-                onClickRemove: "&"
-            }
-        });
-
-    function BlockGridColumnOptionController(localizationService) {
-
-      var vm = this;
-
-      localizationService.localize("general_remove").then(function (value) {
-        vm.removeLabel = value;
-      })
-
-        vm.$onInit = function() {
-
-        };
-
-        
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridConfigurationAreaEntry.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridConfigurationAreaEntry.component.js
deleted file mode 100644
index 64d5e421e2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umbBlockGridConfigurationAreaEntry.component.js
+++ /dev/null
@@ -1,260 +0,0 @@
-(function () {
-    "use strict";
-
-    /**
-     * Note for new backoffice: there is a lot of similarities between the Area configuration and the Block entry, as they both share Grid scaling features.
-     */
-
-
-    /**
-     * Helper method that takes a weight map and finds the index of the value.
-     * @param {number} position - the value to find the index of.
-     * @param {number[]} weights - array of numbers each representing the weight/length.
-     * @returns {number} - the index of the weight that contains the accumulated value
-     */
-    function getInterpolatedIndexOfPositionInWeightMap(target, weights) {
-        const map = [0];
-        weights.reduce((a, b, i) => { return map[i+1] = a+b; }, 0);
-        const foundValue = map.reduce((a, b) => {
-            let aDiff = Math.abs(a - target);
-            let bDiff = Math.abs(b - target);
-    
-            if (aDiff === bDiff) {
-                return a < b ? a : b;
-            } else {
-                return bDiff < aDiff ? b : a;
-            }
-        });
-
-        // Adding interpolation to the index, to get 
-        const foundIndex = map.indexOf(foundValue);
-        const targetDiff = (target-foundValue);
-        let interpolatedIndex = foundIndex;
-        if (targetDiff < 0 && foundIndex === 0) {
-            // Don't adjust.
-        } else if (targetDiff > 0 && foundIndex === map.length-1) {
-            // Don't adjust.
-        } else {
-            const foundInterpolationWeight = weights[targetDiff >= 0 ? foundIndex : foundIndex-1];
-            interpolatedIndex += foundInterpolationWeight === 0 ? interpolatedIndex : (targetDiff/foundInterpolationWeight)
-        }
-        return interpolatedIndex;
-    }
-
-    function getAccumulatedValueOfIndex(index, weights) {
-        let i = 0, len = Math.min(index, weights.length), calc = 0;
-        while(i<len) {
-            calc += weights[i++];
-        }
-        return calc;
-    }
-    
-
-
-    /**
-     * @ngdoc directive
-     * @name umbraco.directives.directive:umbBlockGridConfigurationAreaEntry
-     * @description
-     * Rendering the a specific area configuration for the block grid editor
-     */
-    angular
-        .module("umbraco")
-        .component("umbBlockGridConfigurationAreaEntry", {
-            templateUrl: 'views/propertyeditors/blockgrid/prevalue/umb-block-grid-configuration-area-entry.html',
-            controller: BlockGridConfigurationAreaEntryController,
-            controllerAs: "vm",
-            bindings: {
-                area: "=",
-                onEdit: "&",
-                onDelete: "&"
-            }
-        }
-    );
-
-    function BlockGridConfigurationAreaEntryController($scope, $element) {
-
-        const vm = this;
-
-        // Block sizing functionality:
-        let layoutContainer = null;
-        let gridColumns = null;
-        let gridRows = null;
-        let scaleBoxEl = null;
-        let scaleBoxBackdropEl = null;
-
-
-        function getNewSpans(startX, startY, endX, endY) {
-
-            const blockStartCol = Math.round(getInterpolatedIndexOfPositionInWeightMap(startX, gridColumns));
-            const blockStartRow = Math.round(getInterpolatedIndexOfPositionInWeightMap(startY, gridRows));
-            const blockEndCol = getInterpolatedIndexOfPositionInWeightMap(endX, gridColumns);
-            const blockEndRow = getInterpolatedIndexOfPositionInWeightMap(endY, gridRows);
-
-            const newColumnSpan = Math.round(Math.max(blockEndCol-blockStartCol, 1));
-            const newRowSpan = Math.round(Math.max(blockEndRow-blockStartRow, 1));
-
-            return {'columnSpan': newColumnSpan, 'rowSpan': newRowSpan, 'startCol': blockStartCol, 'startRow': blockStartRow};
-        }
-
-        function updateGridLayoutData() {
-
-            if(!layoutContainer) {
-                layoutContainer = $element[0].closest('.umb-block-grid-area-editor__grid-wrapper');
-                if(!layoutContainer) {
-                    console.error($element[0], 'could not find area-container');
-                }
-            }
-
-            const computedStyles = window.getComputedStyle(layoutContainer);
-
-            gridColumns = computedStyles.gridTemplateColumns.trim().split("px").map(x => Number(x));
-            gridRows = computedStyles.gridTemplateRows.trim().split("px").map(x => Number(x));
-
-            // remove empties:
-            if(gridColumns[gridColumns.length-1] === 0) {
-                gridColumns.pop();
-            }
-            if(gridRows[gridRows.length-1] === 0) {
-                gridRows.pop();
-            }
-
-            // Add extra options for the ability to extend beyond current content:
-            gridRows.push(50);
-            gridRows.push(50);
-            gridRows.push(50);
-        }
-
-        vm.scaleHandlerMouseDown = function($event) {
-            $event.originalEvent.preventDefault();
-            
-            window.addEventListener('mousemove', vm.onMouseMove);
-            window.addEventListener('mouseup', vm.onMouseUp);
-            window.addEventListener('mouseleave', vm.onMouseUp);
-
-            updateGridLayoutData();
-
-            scaleBoxBackdropEl = document.createElement('div');
-            scaleBoxBackdropEl.className = 'umb-block-grid-area-editor__scalebox-backdrop';
-            layoutContainer.appendChild(scaleBoxBackdropEl);
-
-            scaleBoxEl = document.createElement('div');
-            scaleBoxEl.className = 'umb-block-grid-area-editor__scalebox';
-
-            const scaleBoxScaleHandler = document.createElement('button');
-            scaleBoxScaleHandler.className = 'umb-block-grid-area-editor__scale-handler';
-            scaleBoxEl.appendChild(scaleBoxScaleHandler);
-
-            $element[0].appendChild(scaleBoxEl);
-
-        }
-        vm.onMouseMove = function(e) {
-
-            updateGridLayoutData();
-
-            const layoutContainerRect = layoutContainer.getBoundingClientRect();
-            const layoutItemRect = $element[0].getBoundingClientRect();
-
-            const startX = layoutItemRect.left - layoutContainerRect.left;
-            const startY = layoutItemRect.top - layoutContainerRect.top;
-            const endX = e.pageX - layoutContainerRect.left;
-            const endY = e.pageY - layoutContainerRect.top;
-
-            const newSpans = getNewSpans(startX, startY, endX, endY);
-            const endCol = newSpans.startCol + newSpans.columnSpan;
-            const endRow = newSpans.startRow + newSpans.rowSpan;
-
-
-            const startCellX =  getAccumulatedValueOfIndex(newSpans.startCol, gridColumns);
-            const startCellY =  getAccumulatedValueOfIndex(newSpans.startRow, gridRows);
-            const endCellX =  getAccumulatedValueOfIndex(endCol, gridColumns);
-            const endCellY =  getAccumulatedValueOfIndex(endRow, gridRows);
-
-            scaleBoxEl.style.width = Math.round(endCellX-startCellX)+'px';
-            scaleBoxEl.style.height = Math.round(endCellY-startCellY)+'px';
-            
-            // update as we go:
-            vm.area.columnSpan = newSpans.columnSpan;
-            vm.area.rowSpan = newSpans.rowSpan;
-
-            $scope.$evalAsync();
-        }
-
-        vm.onMouseUp = function(e) {
-
-            const layoutContainerRect = layoutContainer.getBoundingClientRect();
-            const layoutItemRect = $element[0].getBoundingClientRect();
-
-            const startX = layoutItemRect.left - layoutContainerRect.left;
-            const startY = layoutItemRect.top - layoutContainerRect.top;
-            const endX = e.pageX - layoutContainerRect.left;
-            const endY = e.pageY - layoutContainerRect.top;
-
-            const newSpans = getNewSpans(startX, startY, endX, endY);
-
-            // Remove listeners:
-            window.removeEventListener('mousemove', vm.onMouseMove);
-            window.removeEventListener('mouseup', vm.onMouseUp);
-            window.removeEventListener('mouseleave', vm.onMouseUp);
-
-            layoutContainer.removeChild(scaleBoxBackdropEl);
-            $element[0].removeChild(scaleBoxEl);
-
-            // Clean up variables:
-            layoutContainer = null;
-            gridColumns = null;
-            gridRows = null;
-            scaleBoxEl = null;
-            scaleBoxBackdropEl = null;
-
-            // Update block size:
-            vm.area.columnSpan = newSpans.columnSpan;
-            vm.area.rowSpan = newSpans.rowSpan;
-            $scope.$evalAsync();
-        }
-
-
-
-        vm.scaleHandlerKeyUp = function($event) {
-
-            updateGridLayoutData();
-
-            let addCol = 0;
-            let addRow = 0;
-
-            switch ($event.originalEvent.key) {
-                case 'ArrowUp':
-                    addRow = -1;
-                    break;
-                case 'ArrowDown':
-                    addRow = 1;
-                    break;
-                case 'ArrowLeft':
-                    addCol = -1;
-                    break;
-                case 'ArrowRight':
-                    addCol = 1;
-                    break;
-            }
-
-            // Todo: Ensure value fit with configuration.
-            vm.area.columnSpan = Math.min(Math.max(vm.area.columnSpan + addCol, 1), gridColumns.length);
-            vm.area.rowSpan = Math.max(vm.area.rowSpan + addRow, 1);
-
-            $event.originalEvent.stopPropagation();
-        }
-
-
-
-        vm.onEditClick = function($event) {
-            $event.stopPropagation();
-            vm.onEdit();
-        }
-
-        vm.onDeleteClick = function($event) {
-            $event.stopPropagation();
-            vm.onDelete();
-        }
-
-    }   
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/razorhtml.temp.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/razorhtml.temp.html
deleted file mode 100644
index 5c64d795d1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/razorhtml.temp.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<div class="umb-block-grid"
-     data-grid-columns="{{vm.gridColumns}}"
-     style="--umb-block-grid--grid-columns: {{vm.gridColumns}};"
->
-    
-    <!-- Notice this is the same markup used everytime we will be printing a list of blocks: -->
-    <div class="umb-block-grid__layout-container">
-
-        <!-- repeat for each layout entry placed in the root of layout. -->
-        <div
-            class="umb-block-grid__layout-item"
-            data-content-element-type-alias="{{layoutEntry.$block.content.contentTypeAlias}}"
-            data-content-element-type-key="{{layoutEntry.$block.content.contentTypeKey}}"
-            data-element-udi="{{layoutEntry.contentUdi}}"
-            data-col-span="{{layoutEntry.columnSpan}}"
-            data-row-span="{{layoutEntry.rowSpan}}"
-            style="
-            --umb-block-grid--item-column-span: {{layoutEntry.columnSpan}};
-            --umb-block-grid--item-row-span: {{layoutEntry.rowSpan}};
-            "
-        >
-
-            <div class="umb-block-grid__block--view" style="--umb-block-grid--area-grid-columns: {{ 'the-configured-amount' or 'inherited layout columns'}};">
-                <!-- render razor view for this block. -->
-                <!-- Razor view must handle/inject/ decide where the 'area-container' should be printed: -->
-                <div class="umb-block-grid__area-container">
-
-                    <!-- repeat for each area configured for this block type. -->
-                    <div
-                        class="umb-block-grid__area"
-                        data-area-col-span="{{areaEntry.$config.columnSpan}}"
-                        data-area-row-span="{{areaEntry.$config.rowSpan}}"
-                        data-area-alias="{{areaEntry.$config.alias}}"
-                        style="
-                        --umb-block-grid--grid-columns: {{areaEntry.$config.columnSpan}};
-                        --umb-block-grid--area-column-span: {{areaEntry.$config.columnSpan}};
-                        --umb-block-grid--area-row-span: {{areaEntry.$config.rowSpan}};
-                        ">
-
-                            <!-- Notice here we print the same markup used everytime we will be printing a list of blocks(same as the one in the root of this document..):
-                            <div class="umb-block-grid__layout-container">
-                                ...
-                            </div>
-                            End of notice,  -->
-                    </div>
-                    <!-- end of repeat -->
-                </div>
-
-            </div>
-
-        </div>
-        <!-- end of repeat -->
-        
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entries.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entries.html
deleted file mode 100644
index ef02d28318..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entries.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<ng-form name="vm.entriesForm">
-    <div
-        class="umb-block-grid__layout-container"
-        ng-class="{
-            '--not-allowing-drop': vm.showNotAllowedUI
-        }"
-        umb-block-grid-sorter="::vm.sorterOptions"
-        umb-block-grid-sorter-model="vm.entries"
-    >
-        <umb-block-grid-entry ng-repeat="layoutEntry in vm.entries track by layoutEntry.$block.key"
-            class="umb-block-grid__layout-item"
-            ng-class="{'--has-areas': layoutEntry.areas.length > 0}"
-            data-content-element-type-alias="{{layoutEntry.$block.content.contentTypeAlias}}"
-            data-content-element-type-key="{{layoutEntry.$block.content.contentTypeKey}}"
-            data-element-udi="{{layoutEntry.contentUdi}}"
-            data-col-span="{{layoutEntry.columnSpan}}"
-            data-row-span="{{layoutEntry.rowSpan}}"
-            style="
-            --umb-block-grid--item-column-span: {{layoutEntry.columnSpan}};
-            --umb-block-grid--item-row-span: {{layoutEntry.rowSpan}};
-            "
-
-            parent-block="vm.parentBlock"
-            property-editor-form="vm.propertyEditorForm"
-            area-key="vm.areaKey"
-            layout-columns="vm.layoutColumns"
-            index="$index"
-            layout-entry="layoutEntry"
-            block-editor-api="vm.blockEditorApi"
-            depth="{{vm.depth}}"
-        >
-
-        </umb-block-grid-entry>
-    </div>
-
-    <div ng-if="vm.showNotAllowedUI" class="umb-block-grid__not-allowed-box">
-    </div>
-
-    <div 
-        class="umb-block-grid__area-actions" 
-        ng-if="!vm.blockEditorApi.readonly && vm.depth !== '0' && (vm.entries.length === 0 || !vm.entriesForm.areaMinCount.$valid)" 
-        ng-class="{'--highlight': vm.entries.length === 0 || !vm.entriesForm.areaMinCount.$valid || !vm.entriesForm.areaMaxCount.$valid || !vm.entriesForm.areaTypeRequirements.$valid}"
-
-        data-min="{{vm.entriesForm.areaMinCount.$valid ? 'true' : 'false'}}"
-        data-max="{{vm.entriesForm.areaMaxCount.$valid ? 'true' : 'false'}}"
-        data-type="{{vm.entriesForm.areaTypeRequirements.$valid ? 'true' : 'false'}}"
-        >
-        <button
-                id="{{vm.model.alias}}"
-                type="button"
-                class="btn-reset umb-block-grid__create-button umb-outline"
-                ng-disabled="vm.locallyAvailableBlockTypes.length === 0"
-                ng-click="vm.blockEditorApi.requestShowCreate(vm.parentBlock, vm.areaKey, vm.entries.length, $event)">
-            <span ng-if="vm.createLabel">{{vm.createLabel}}</span>
-            <localize ng-if="!vm.createLabel && vm.locallyAvailableBlockTypes.length !== 1" key="blockEditor_addBlock">Add content</localize>
-            <localize ng-if="!vm.createLabel && vm.locallyAvailableBlockTypes.length === 1" key="blockEditor_addThis" tokens="[vm.locallyAvailableBlockTypes[0].elementTypeModel.name]">Add content</localize>
-        </button>
-    </div>
-
-    <uui-button-inline-create
-        ng-if="!vm.blockEditorApi.readonly && vm.depth !== '0' && !(vm.entries.length === 0 || !vm.entriesForm.areaMinCount.$valid)"
-        class="umb-block-grid__block--last-inline-create-button"
-        ng-mouseover="vm.blockEditorApi.internal.showAreaHighlight(vm.parentBlock, vm.areaKey)"
-        ng-mouseleave="vm.blockEditorApi.internal.hideAreaHighlight(vm.parentBlock, vm.areaKey)"
-        ng-click="vm.blockEditorApi.requestShowCreate(vm.parentBlock, vm.areaKey, vm.entries.length, $event)">
-    </uui-button-inline-create>
-
-    <div class="umb-block-grid__actions" ng-if="!vm.blockEditorApi.readonly && vm.depth === '0'">
-        <button
-                id="{{vm.model.alias}}"
-                type="button"
-                class="btn-reset umb-block-grid__create-button umb-outline"
-                ng-disabled="vm.locallyAvailableBlockTypes.length === 0"
-                ng-click="vm.blockEditorApi.requestShowCreate(vm.parentBlock, vm.areaKey, vm.entries.length, $event)">
-                <span ng-if="vm.createLabel">{{vm.createLabel}}</span>
-            <localize ng-if="!vm.createLabel && vm.locallyAvailableBlockTypes.length !== 1" key="blockEditor_addBlock">Add content</localize>
-            <localize ng-if="!vm.createLabel && vm.locallyAvailableBlockTypes.length === 1" key="blockEditor_addThis" tokens="[vm.locallyAvailableBlockTypes[0].elementTypeModel.name]">Add content</localize>
-        </button>
-        <button type="button"
-                class="btn-reset umb-block-grid__clipboard-button umb-outline"
-                ng-class="{'--jump': vm.jumpClipboardButton}"
-                ng-disabled="vm.clipboardItems.length === 0"
-                ng-click="vm.blockEditorApi.requestShowClipboard(vm.parentBlock, vm.areaKey, vm.entries.length, $event)"
-                localize="title"
-                title="@blockEditor_tabClipboard">
-            <umb-icon icon="icon-paste-in" class="icon"></umb-icon>
-            <span class="sr-only">
-                <localize key="blockEditor_tabClipboard">Clipboard</localize>
-            </span>
-        </button>
-    </div>
-
-
-    <input type="hidden" name="areaMinCount" ng-model="vm.entries" val-server="areaMinCount" />
-    <input type="hidden" name="areaMaxCount" ng-model="vm.entries" val-server="areaMaxCount" />
-    <input type="hidden" name="areaTypeRequirements" ng-model="vm.entries" val-server="areaTypeRequirements" />
-
-    <div ng-if="vm.invalidAmount" class="umb-block-grid__entries-validation-message">
-
-        <div ng-messages="vm.entriesForm.areaMinCount.$error">
-            <div ng-message="areaMinCount">
-                <localize key="validation_entriesShort" tokens="[vm.areaConfig.minAllowed, vm.areaConfig.minAllowed - vm.entries.length]" watch-tokens="true">Minimum %0% entries, needs <strong>%1%</strong> more.</localize>
-            </div>
-            <span ng-message="valServer" ng-bind-html="vm.entriesForm.areaMinCount.errorMsg"></span>
-        </div>
-
-        <div ng-messages="vm.entriesForm.areaMaxCount.$error">
-            <div ng-message="areaMaxCount">
-                <localize key="validation_entriesExceed" tokens="[vm.areaConfig.maxAllowed, vm.entries.length - vm.areaConfig.maxAllowed]" watch-tokens="true">Maximum %0% entries, <strong>%1%</strong> too many.</localize>
-            </div>
-            <span ng-message="valServer" ng-bind-html="vm.entriesForm.areaMaxCount.errorMsg"></span>
-        </div>
-
-        <div ng-if="vm.entriesForm.areaMinCount.$valid && vm.entriesForm.areaMaxCount.$valid" ng-messages="vm.entriesForm.areaTypeRequirements.$error">
-            <div ng-message="areaTypeRequirements">
-                <div ng-repeat="invalidBlockType in vm.invalidBlockTypes track by invalidBlockType.key">
-                    <localize
-                        key="{{(invalidBlockType.amount < invalidBlockType.minRequirement) ? 'blockEditor_areaValidationEntriesShort' : 'blockEditor_areaValidationEntriesExceed'}}"
-                        tokens="[invalidBlockType.name, invalidBlockType.amount, invalidBlockType.minRequirement, invalidBlockType.maxRequirement]"
-                        watch-tokens="true"
-                        >%0% must be present between %2%–%3% times.</localize>
-                </div>
-            </div>
-            <span ng-message="valServer" ng-bind-html="vm.entriesForm.areaTypeRequirements.errorMsg"></span>
-        </div>
-
-    </div>
-</ng-form>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entry.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entry.html
deleted file mode 100644
index 567d20ff25..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entry.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<uui-button-inline-create
-    ng-if="!vm.blockEditorApi.readonly && !vm.hideInlineCreateAbove"
-    class="umb-block-grid__block--inline-create-button --above"
-    style="--umb-block-grid-editor--inline-create-width: {{vm.inlineCreateAboveWidth}};"
-    ng-class="{'--at-root': vm.depth === '0'}"
-    ng-click="vm.clickInlineCreateAbove()"
-    ng-mouseover="vm.mouseOverInlineCreate()"
-    ng-mouseleave="vm.mouseOutInlineCreate()">
-</uui-button-inline-create>
-
-<ng-form name="vm.blockForm" val-server-match="{ 'contains' : { 'valServerMatchContent': vm.layoutEntry.$block.content.key, 'valServerMatchSettings': vm.layoutEntry.$block.settings.key } }">
-    <div
-        class="umb-block-grid__block"
-        ng-mouseleave="vm.layoutEntry.$block.onMouseLeave()"
-        ng-mouseenter="vm.layoutEntry.$block.onMouseEnter()"
-        ng-class="{
-                    '--active':vm.layoutEntry.$block.active,
-                    '--show-validation': vm.layoutEntry.$block.showValidation === true,
-                    '--hovering-area': vm.isHoveringArea,
-                    '--scale-mode': vm.isScaleMode,
-                    '--block-ui-visible': vm.layoutEntry.$block.blockUiVisibility === true
-                }">
-
-        <umb-block-grid-block class="umb-block-grid__block--view"
-                              stylesheet="{{::vm.layoutEntry.$block.stylesheet}}"
-                              view="{{::vm.layoutEntry.$block.view}}"
-                              api="vm.blockEditorApi"
-                              block="vm.layoutEntry.$block"
-                              index="vm.index"
-                              parent-form="vm.blockForm"
-                              style="--umb-block-grid--area-grid-columns: {{vm.areaGridColumns}}"
-                              >
-            <slot
-                ng-repeat="proxyProp in vm.proxyProperties track by proxyProp.slotName"
-                data-is-property-editor-proxy
-                name="{{proxyProp.slotName}}"
-                slot="{{proxyProp.slotName}}">
-            </slot>
-            <umb-block-grid-entries 
-                ng-repeat="areaEntry in vm.layoutEntry.areas track by areaEntry.key"
-                slot="{{::areaEntry.$config.alias}}"
-                class="umb-block-grid__area"
-                ng-class="{'--highlight': areaEntry.$highlight}"
-                data-area-col-span="{{::areaEntry.$config.columnSpan}}"
-                data-area-row-span="{{::areaEntry.$config.rowSpan}}"
-                data-area-alias="{{::areaEntry.$config.alias}}"
-                style="
-                --umb-block-grid--grid-columns: {{::areaEntry.$config.columnSpan}};
-                --umb-block-grid--area-column-span: {{::areaEntry.$config.columnSpan}};
-                --umb-block-grid--area-row-span: {{::areaEntry.$config.rowSpan}};
-                "
-                block-editor-api="vm.blockEditorApi"
-                entries="areaEntry.items"
-                area-key="areaEntry.key"
-                layout-columns="areaEntry.$config.columnSpan"
-                parent-block="vm.layoutEntry.$block"
-                parent-form="vm.blockForm"
-                property-editor-form="vm.propertyEditorForm"
-                ng-mouseover="vm.mouseOverArea(areaEntry)"
-                ng-mouseleave="vm.mouseLeaveArea()"
-                depth="{{vm.childDepth}}"
-                create-label="{{::areaEntry.$config.createLabel}}">
-            </umb-block-grid-entries>
-
-        </umb-block-grid-block>
-
-        <div class="umb-block-grid__block--validation-border"></div>
-
-        <div class="umb-block-grid__block--context">
-            <div class="__context-bar">
-                <button
-                    ng-if="vm.parentBlock"
-                    type="button"
-                    class="btn-reset umb-outline action"
-                    localize="title"
-                    title="blockEditor_focusParentBlock"
-                    ng-click="vm.parentBlock.showBlockUI()"
-                    ng-class="{ '--error': false && vm.valFormManager.isShowingValidation() }"
-                    ng-bind="vm.parentBlock.label"
-                ></button>
-                <div class="__divider" ng-if="vm.parentBlock">/</div>
-                <div class="__label" title="{{vm.layoutEntry.$block.label}}" ng-bind="vm.layoutEntry.$block.label"></div>
-            </div>
-        </div>
-
-        <div class="umb-block-grid__block--actions">
-
-            <button type="button" class="btn-reset umb-outline action --content" localize="title" title="actions_editContent"
-                    ng-click="vm.blockEditorApi.editBlock(vm.layoutEntry.$block, false, vm.index, vm.blockForm);"
-                    ng-class="{ '--error': vm.blockForm.$error.valServerMatchContent }"
-                    ng-if="vm.layoutEntry.$block.showContent === true">
-                <umb-icon icon="icon-edit" class="icon"></umb-icon>
-                <span class="sr-only">
-                    <localize key="general_content">Content</localize>
-                </span>
-                <div class="__error-badge">!</div>
-            </button>
-
-            <button type="button" class="btn-reset umb-outline action --settings" localize="title" title="actions_editSettings"
-                    ng-click="vm.blockEditorApi.openSettingsForBlock(vm.layoutEntry.$block, vm.index, vm.blockForm);"
-                    ng-class="{ '--error': vm.blockForm.$error.valServerMatchSettings }"
-                    ng-if="vm.layoutEntry.$block.showSettings === true">
-                <umb-icon icon="icon-settings" class="icon"></umb-icon>
-                <span class="sr-only">
-                    <localize key="general_settings">Settings</localize>
-                </span>
-                <div class="__error-badge">!</div>
-            </button>
-            <button type="button" class="btn-reset umb-outline action --copy" localize="title" title="actions_copy"
-                    ng-click="vm.blockEditorApi.copyBlock(vm.layoutEntry.$block);"
-                    ng-if="vm.layoutEntry.$block.showCopy === true">
-                <umb-icon icon="icon-documents" class="icon"></umb-icon>
-                <span class="sr-only">
-                    <localize key="general_copy">Copy</localize>
-                </span>
-            </button>
-            <button ng-if="!vm.blockEditorApi.readonly"
-                    type="button" class="btn-reset umb-outline action --delete" localize="title" title="actions_delete"
-                    ng-click="vm.blockEditorApi.requestDeleteBlock(vm.layoutEntry.$block);">
-                <umb-icon icon="icon-trash" class="icon"></umb-icon>
-                <span class="sr-only">
-                    <localize key="general_delete">Delete</localize>
-                </span>
-            </button>
-        </div>
-
-        <button 
-            ng-if="::!vm.blockEditorApi.readonly && vm.canScale" 
-            type="button"
-            title="@blockEditor_scaleHandlerButtonTitle"
-            localize="title"
-            class="umb-block-grid__scale-handler"
-            ng-mousedown="vm.scaleHandlerMouseDown($event)"
-            ng-keyup="vm.scaleHandlerKeyUp($event)">
-        </button>
-        <div ng-if="::!vm.blockEditorApi.readonly && vm.canScale" 
-            class="umb-block-grid__scale-label">
-            {{vm.layoutEntry.columnSpan}} x {{vm.layoutEntry.rowSpan}}
-        </div>
-
-    </div>
-</ng-form>
-
-<uui-button-inline-create
-    ng-if="!vm.blockEditorApi.readonly && !vm.hideInlineCreateAfter"
-    class="umb-block-grid__block--inline-create-button --after"
-    ng-class="{'--at-root': vm.depth === '0'}"
-    ng-click="vm.clickInlineCreateAfter($event)"
-    ng-mouseover="vm.mouseOverInlineCreate()"
-    ng-mouseleave="vm.mouseOutInlineCreate()"
-    vertical>
-</uui-button-inline-create>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-property-editor.html
deleted file mode 100644
index 834f55e685..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-property-editor.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div>
-
-    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-    <div class="umb-block-grid__wrapper" ng-style="vm.editorWrapperStyles">
-
-        <umb-editor-sub-header ng-if="vm.sortMode" appearance="blue">
-            <umb-editor-sub-header-content-right>
-                <umb-button
-                    type="button"
-                    icon="icon-delete"
-                    button-style="primary"
-                    label-key="blockEditor_actionExitSortMode"
-                    action="vm.exitSortMode()">
-                </umb-button>
-            </umb-editor-sub-header-content-right>
-        </umb-editor-sub-header>
-
-        <div ng-show="vm.loading !== true">
-
-            <umb-block-grid-root
-                grid-columns="{{::vm.gridColumns}}"
-                create-label="{{::vm.createLabel}}"
-                stylesheet="{{::vm.layoutStylesheet}}"
-                block-editor-api="vm.blockEditorApi"
-                property-editor-form="vm.propertyForm"
-                entries="vm.layout"
-                loading="vm.loading"
-                >
-            </umb-block-grid-root>
-
-        </div>
-        
-        <input type="hidden" name="minCount" ng-model="vm.layout" val-server="minCount" />
-        <input type="hidden" name="maxCount" ng-model="vm.layout" val-server="maxCount" />
-
-        <div ng-messages="vm.propertyForm.minCount.$error">
-            <div class="help text-error" ng-message="minCount">
-                <localize key="validation_entriesShort" tokens="[vm.validationLimit.min, vm.validationLimit.min - vm.layout.length]" watch-tokens="true">Minimum %0% entries, needs <strong>%1%</strong> more.</localize>
-            </div>
-            <span class="help-inline" ng-message="valServer" ng-bind-html="vm.propertyForm.minCount.errorMsg">></span>
-        </div>
-        <div ng-messages="vm.propertyForm.maxCount.$error">
-            <div class="help text-error" ng-message="maxCount">
-                <localize key="validation_entriesExceed" tokens="[vm.validationLimit.max, vm.layout.length - vm.validationLimit.max]" watch-tokens="true">Maximum %0% entries, <strong>%1%</strong> too many.</localize>
-            </div>
-            <span class="help-inline" ng-message="valServer" ng-bind-html="vm.propertyForm.maxCount.errorMsg"></span>
-        </div>
-        
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-property-editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-property-editor.less
deleted file mode 100644
index d06b6377c3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-property-editor.less
+++ /dev/null
@@ -1,8 +0,0 @@
-.umb-block-grid__wrapper {
-    position: relative;
-    max-width: 1200px;
-}
-
-.umb-block-grid__wrapper .umb-rte {
-    max-width: 100%;
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-render-area-slots.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-render-area-slots.html
deleted file mode 100644
index e8d53c7457..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-render-area-slots.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div part="area-container">
-    <slot ng-repeat="area in ::block.layout.areas" name="{{::area.$config.alias}}"></slot>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbBlockGridPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbBlockGridPropertyEditor.component.js
deleted file mode 100644
index 296d98ab7a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbBlockGridPropertyEditor.component.js
+++ /dev/null
@@ -1,1401 +0,0 @@
-(function () {
-    "use strict";
-
-    function GetAreaAtBlock(parentBlock, areaKey) {
-        if(parentBlock != null) {
-            var area = parentBlock.layout.areas.find(x => x.key === areaKey);
-            if(!area) {
-                return null;
-            }
-
-            return area;
-        }
-        return null;
-    }
-
-    function closestColumnSpanOption(target, map, max) {
-        if(map.length > 0) {
-            const result = map.reduce((a, b) => {
-                if (a.columnSpan > max) {
-                    return b;
-                }
-                let aDiff = Math.abs(a.columnSpan - target);
-                let bDiff = Math.abs(b.columnSpan - target);
-        
-                if (aDiff === bDiff) {
-                    return a.columnSpan < b.columnSpan ? a : b;
-                } else {
-                    return bDiff < aDiff ? b : a;
-                }
-            });
-            if(result) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-
-    const DefaultViewFolderPath = "views/propertyeditors/blockgrid/blockgridentryeditors/";
-
-
-    /**
-     * @ngdoc directive
-     * @name umbraco.directives.directive:umbBlockGridPropertyEditor
-     * @function
-     *
-     * @description
-     * The component for the block grid property editor.
-     */
-    angular
-        .module("umbraco")
-        .component("umbBlockGridPropertyEditor", {
-            templateUrl: "views/propertyeditors/blockgrid/umb-block-grid-property-editor.html",
-            controller: BlockGridController,
-            controllerAs: "vm",
-            bindings: {
-                model: "="
-            },
-            require: {
-                propertyForm: "^form",
-                umbProperty: "?^umbProperty",
-                umbVariantContent: '?^^umbVariantContent',
-                umbVariantContentEditors: '?^^umbVariantContentEditors',
-                umbElementEditorContent: '?^^umbElementEditorContent',
-                valFormManager: '?^^valFormManager'
-            }
-        });
-    function BlockGridController($element, $attrs, $scope, $timeout, $q, editorService, clipboardService, localizationService, overlayService, blockEditorService, udiService, serverValidationManager, angularHelper, eventsService, assetsService, umbRequestHelper) {
-
-        var unsubscribe = [];
-        var modelObject;
-        var gridRootEl;
-
-        // Property actions:
-        var propertyActions = null;
-        var enterSortModeAction = null;
-        var exitSortModeAction = null;
-        var copyAllBlocksAction = null;
-        var deleteAllBlocksAction = null;
-
-        var liveEditing = true;
-
-        var shadowRoot;
-        var firstLayoutContainer;
-
-
-        var vm = this;
-
-        vm.readonly = false;
-
-        $attrs.$observe('readonly', (value) => {
-            vm.readonly = value !== undefined;
-
-            vm.blockEditorApi.readonly = vm.readonly;
-
-            if (deleteAllBlocksAction) {
-                deleteAllBlocksAction.isDisabled = vm.readonly;
-            }
-        });
-
-        vm.loading = true;
-
-        vm.currentBlockInFocus = null;
-        vm.setBlockFocus = function (block) {
-            if (vm.currentBlockInFocus !== null) {
-                vm.currentBlockInFocus.focus = false;
-            }
-            vm.currentBlockInFocus = block;
-            block.focus = true;
-        };
-
-        vm.showAreaHighlight = function(parentBlock, areaKey) {
-            const area = GetAreaAtBlock(parentBlock, areaKey)
-            if(area) {
-                area.$highlight = true;
-            }
-        }
-        vm.hideAreaHighlight = function(parentBlock, areaKey) {
-            const area = GetAreaAtBlock(parentBlock, areaKey)
-            if(area) {
-                area.$highlight = false;
-            }
-        }
-
-        vm.supportCopy = clipboardService.isSupported();
-        vm.clipboardItems = [];
-        unsubscribe.push(eventsService.on("clipboardService.storageUpdate", updateClipboard));
-        unsubscribe.push($scope.$on("editors.content.splitViewChanged", (event, eventData) => {
-            var compositeId = vm.umbVariantContent.editor.compositeId;
-            if(eventData.editors.some(x => x.compositeId === compositeId)) {
-                updateAllBlockObjects();
-            }
-        }));
-
-        vm.layout = []; // The layout object specific to this Block Editor, will be a direct reference from Property Model.
-        vm.availableBlockTypes = []; // Available block entries of this property editor.
-        vm.labels = {};
-        vm.options = {
-            createFlow: false
-        };
-        vm.sortMode = false;
-        vm.sortModeView = DefaultViewFolderPath + "gridsortblock/gridsortblock.editor.html";
-
-        localizationService.localizeMany(["grid_addElement", "content_createEmpty", "blockEditor_addThis"]).then(function (data) {
-            vm.labels.grid_addElement = data[0];
-            vm.labels.content_createEmpty = data[1];
-            vm.labels.blockEditor_addThis = data[2]
-        });
-
-        vm.onAppendProxyProperty = (event) => {
-            event.stopPropagation();
-            gridRootEl.appendChild(event.detail.property);
-            event.detail.connectedCallback();
-        };
-        vm.onRemoveProxyProperty = (event) => {
-            event.stopPropagation();
-            const el = gridRootEl.querySelector(`:scope > [slot='${event.detail.slotName}']`);
-            gridRootEl.removeChild(el);
-        };
-
-        vm.$onInit = function() {
-
-            gridRootEl = $element[0].querySelector('umb-block-grid-root');
-
-            $element[0].addEventListener("UmbBlockGrid_AppendProperty", vm.onAppendProxyProperty);
-            $element[0].addEventListener("UmbBlockGrid_RemoveProperty", vm.onRemoveProxyProperty);
-
-            //listen for form validation changes
-            vm.valFormManager.onValidationStatusChanged(function () {
-                vm.showValidation = vm.valFormManager.showValidation;
-            });
-            //listen for the forms saving event
-            unsubscribe.push($scope.$on("formSubmitting", function () {
-                vm.showValidation = true;
-            }));
-
-            //listen for the forms saved event
-            unsubscribe.push($scope.$on("formSubmitted", function () {
-                vm.showValidation = false;
-            }));
-
-            if (vm.umbProperty && !vm.umbVariantContent) {// if we don't have vm.umbProperty, it means we are in the DocumentTypeEditor.
-                // not found, then fallback to searching the scope chain, this may be needed when DOM inheritance isn't maintained but scope
-                // inheritance is (i.e.infinite editing)
-                var found = angularHelper.traverseScopeChain($scope, s => s && s.vm && s.vm.constructor.name === "umbVariantContentController");
-                vm.umbVariantContent = found ? found.vm : null;
-                if (!vm.umbVariantContent) {
-                    throw "Could not find umbVariantContent in the $scope chain";
-                }
-            }
-
-            // set the onValueChanged callback, this will tell us if the block grid model changed on the server
-            // once the data is submitted. If so we need to re-initialize
-            vm.model.onValueChanged = onServerValueChanged;
-
-            liveEditing = vm.model.config.useLiveEditing;
-
-            vm.validationLimit = vm.model.config.validationLimit;
-            vm.gridColumns = vm.model.config.gridColumns || 12;
-            vm.createLabel = vm.model.config.createLabel || "";
-            vm.blockGroups = vm.model.config.blockGroups;
-            vm.uniqueEditorKey = String.CreateGuid();
-
-            vm.editorWrapperStyles = {};
-
-            if (vm.model.config.maxPropertyWidth) {
-                vm.editorWrapperStyles['max-width'] = vm.model.config.maxPropertyWidth;
-            }
-
-            if (vm.model.config.layoutStylesheet) {
-                vm.layoutStylesheet = umbRequestHelper.convertVirtualToAbsolutePath(vm.model.config.layoutStylesheet);
-            } else {
-                vm.layoutStylesheet = "assets/css/umbraco-blockgridlayout.css";
-            }
-
-            // We need to ensure that the property model value is an object, this is needed for modelObject to receive a reference and keep that updated.
-            if(typeof vm.model.value !== 'object' || vm.model.value === null) {// testing if we have null or undefined value or if the value is set to another type than Object.
-                vm.model.value = {};
-            }
-
-            var scopeOfExistence = $scope;
-            if(vm.umbVariantContentEditors && vm.umbVariantContentEditors.getScope) {
-                scopeOfExistence = vm.umbVariantContentEditors.getScope();
-            } else if(vm.umbElementEditorContent && vm.umbElementEditorContent.getScope) {
-                scopeOfExistence = vm.umbElementEditorContent.getScope();
-            }
-
-            enterSortModeAction = {
-                labelKey: 'blockEditor_actionEnterSortMode',
-                icon: 'navigation-vertical',
-                method: enableSortMode,
-                isDisabled: false
-            };
-            exitSortModeAction = {
-                labelKey: 'blockEditor_actionExitSortMode',
-                icon: 'navigation-vertical',
-                method: exitSortMode,
-                isDisabled: false
-            };
-
-            copyAllBlocksAction = {
-                labelKey: "clipboard_labelForCopyAllEntries",
-                labelTokens: [vm.model.label],
-                icon: "documents",
-                method: requestCopyAllBlocks,
-                isDisabled: true
-            };
-
-            deleteAllBlocksAction = {
-                labelKey: 'clipboard_labelForRemoveAllEntries',
-                icon: 'trash',
-                method: requestDeleteAllBlocks,
-                isDisabled: true
-            };
-
-            propertyActions = [
-                enterSortModeAction,
-                copyAllBlocksAction,
-                deleteAllBlocksAction
-            ];
-
-            if (vm.umbProperty) {
-                vm.umbProperty.setPropertyActions(propertyActions);
-            }
-
-            // Create Model Object, to manage our data for this Block Editor.
-            modelObject = blockEditorService.createModelObject(vm.model.value, vm.model.editor, vm.model.config.blocks, scopeOfExistence, $scope);
-
-            modelObject.load().then(onLoaded);
-
-        };
-
-        // Called when we save the value, the server may return an updated data and our value is re-synced
-        // we need to deal with that here so that our model values are all in sync so we basically re-initialize.
-        function onServerValueChanged(newVal) {
-
-            // We need to ensure that the property model value is an object, this is needed for modelObject to receive a reference and keep that updated.
-            if (typeof newVal !== 'object' || newVal === null) {// testing if we have null or undefined value or if the value is set to another type than Object.
-                vm.model.value = newVal = {};
-            }
-
-            modelObject.update(vm.model.value, $scope);
-            onLoaded();
-        }
-
-
-        function onLoaded() {
-
-            // Store a reference to the layout model, because we need to maintain this model.
-            vm.layout = modelObject.getLayout([]);
-
-
-            initializeLayout(vm.layout);
-
-            vm.availableContentTypesAliases = modelObject.getAvailableAliasesForBlockContent();
-            vm.availableBlockTypes = modelObject.getAvailableBlocksForBlockPicker();
-
-            updateClipboard(true);
-
-            vm.loading = false;
-
-            window.requestAnimationFrame(() => {
-                shadowRoot = $element[0].querySelector('umb-block-grid-root').shadowRoot;
-                firstLayoutContainer = shadowRoot.querySelector('.umb-block-grid__layout-container');
-            })
-
-        }
-
-
-
-        function initializeLayout(layoutList, parentBlock, areaKey) {
-
-            // reference the invalid items of this list, to be removed after the loop.
-            var invalidLayoutItems = [];
-
-            // Append the blockObjects to our layout.
-            layoutList.forEach(layoutEntry => {
-
-                var block = initializeLayoutEntry(layoutEntry, parentBlock, areaKey);
-                if(!block) {
-                    // then we need to filter this out and also update the underlying model. This could happen if the data is invalid.
-                    invalidLayoutItems.push(layoutEntry);
-                }
-            });
-
-            // remove the ones that are invalid
-            invalidLayoutItems.forEach(entry => {
-                var index = layoutList.findIndex(x => x === entry);
-                if (index >= 0) {
-                    layoutList.splice(index, 1);
-                }
-            });
-        }
-
-        function initializeLayoutEntry(layoutEntry, parentBlock, areaKey) {
-
-            // $block must have the data property to be a valid BlockObject, if not, its considered as a destroyed blockObject.
-            if (!layoutEntry.$block || layoutEntry.$block.data === undefined) {
-
-                // each layoutEntry should have a child array,
-                layoutEntry.areas = layoutEntry.areas || [];
-                
-                var block = getBlockObject(layoutEntry);
-
-                // If this entry was not supported by our property-editor it would return 'null'.
-                if (block !== null) {
-                    layoutEntry.$block = block;
-                } else {
-                    return null;
-                }
-
-                // Create areas that is not already created:
-                block.config.areas?.forEach(areaConfig => {
-                    const areaIndex = layoutEntry.areas.findIndex(x => x.key === areaConfig.key);
-                    if(areaIndex === -1) {
-                        layoutEntry.areas.push({
-                            $config: areaConfig,
-                            key: areaConfig.key,
-                            items: []
-                        })
-                    } else {
-                        // set $config as its not persisted:
-                        layoutEntry.areas[areaIndex].$config = areaConfig;
-                        initializeLayout(layoutEntry.areas[areaIndex].items, block, areaConfig.key);
-                    }
-                });
-
-                // Clean up areas that does not exist in config:
-                let i = layoutEntry.areas.length;
-                while(i--) {
-                    const layoutEntryArea = layoutEntry.areas[i];
-                    const areaConfigIndex = block.config.areas.findIndex(x => x.key === layoutEntryArea.key);
-                    if(areaConfigIndex === -1) {
-                        layoutEntry.areas.splice(i, 1);
-                    }
-                }
-
-                // Ensure Areas are ordered like the area configuration is:
-                layoutEntry.areas.sort((left, right) => {
-                    return block.config.areas?.findIndex(config => config.key === left.key) < block.config.areas?.findIndex(config => config.key === right.key) ? -1 : 1;
-                });
-
-
-                const contextColumns = getContextColumns(parentBlock, areaKey);
-                const relevantColumnSpanOptions = block.config.columnSpanOptions?.filter(option => option.columnSpan <= contextColumns) ?? [];
-
-                // if no columnSpan or no columnSpanOptions configured, then we set(or rewrite) one:
-                if (!layoutEntry.columnSpan || layoutEntry.columnSpan > contextColumns || relevantColumnSpanOptions.length === 0) {
-                    if (relevantColumnSpanOptions.length > 0) {
-                        // Find greatest columnSpanOption within contextColumns, or fallback to contextColumns.
-                        layoutEntry.columnSpan = relevantColumnSpanOptions.reduce((prev, option) => Math.max(prev, option.columnSpan), 0) || contextColumns;
-                    } else {
-                        layoutEntry.columnSpan = contextColumns;
-                    }
-                } else {
-                    // Check that columnSpanOption still is available or equal contextColumns, or find closest option fitting:
-                    if (relevantColumnSpanOptions.find(option => option.columnSpan === layoutEntry.columnSpan) === undefined || layoutEntry.columnSpan !== contextColumns) {
-                        layoutEntry.columnSpan = closestColumnSpanOption(layoutEntry.columnSpan, relevantColumnSpanOptions, contextColumns)?.columnSpan || contextColumns;
-                    }
-                }
-
-                // if no rowSpan, then we set one:
-                if (!layoutEntry.rowSpan) {
-                    layoutEntry.rowSpan = 1;
-                }
-
-                
-            } else {
-                updateBlockObject(layoutEntry.$block);
-            }
-
-            return layoutEntry.$block;
-        }
-
-        vm.getContextColumns = getContextColumns;
-        function getContextColumns(parentBlock, areaKey) {
-
-            if(parentBlock != null) {
-                var area = parentBlock.layout.areas.find(x => x.key === areaKey);
-                if(!area) {
-                    return null;
-                }
-
-                return area.$config.columnSpan;
-            }
-
-            return vm.gridColumns;
-        }
-
-        vm.getBlockGroupName = getBlockGroupName;
-        function getBlockGroupName(groupKey) {
-            return vm.blockGroups.find(x => x.key === groupKey)?.name;
-        }
-
-
-        function updateAllBlockObjects() {
-            // Update the blockObjects in our layout.
-            vm.layout.forEach(entry => {
-                // $block must have the data property to be a valid BlockObject, if not its considered as a destroyed blockObject.
-                if (entry.$block) {
-                    updateBlockObject(entry.$block);
-                }
-            });
-        }
-
-        function applyDefaultViewForBlock(block) {
-
-            if (block.config.unsupported === true) {
-                block.view = DefaultViewFolderPath + "unsupportedblock/unsupportedblock.editor.html";
-            } else if (block.config.inlineEditing) {
-                block.view = DefaultViewFolderPath + "gridinlineblock/gridinlineblock.editor.html";
-            } else {
-                block.view = DefaultViewFolderPath + "gridblock/gridblock.editor.html";
-            }
-
-        }
-
-        /**
-         * Ensure that the containing content variant language and current property culture is transferred along
-         * to the scaffolded content object representing this block.
-         * This is required for validation along with ensuring that the umb-property inheritance is constantly maintained.
-         * @param {any} content
-         */
-        function ensureCultureData(content) {
-
-            if (!content) return;
-
-            if (vm.umbVariantContent.editor.content.language) {
-                // set the scaffolded content's language to the language of the current editor
-                content.language = vm.umbVariantContent.editor.content.language;
-            }
-            // currently we only ever deal with invariant content for blocks so there's only one
-            content.variants[0].tabs.forEach(tab => {
-                tab.properties.forEach(prop => {
-                    // set the scaffolded property to the culture of the containing property
-                    prop.culture = vm.umbProperty.property.culture;
-                });
-            });
-        }
-
-        function getBlockObject(entry) {
-            var block = modelObject.getBlockObject(entry);
-
-            if (block === null) return null;
-
-            if (!block.config.view) {
-                applyDefaultViewForBlock(block);
-            } else {
-                block.view = block.config.view;
-            }
-
-            block.stylesheet = block.config.stylesheet;
-            block.showValidation = true;
-
-            block.hideContentInOverlay = block.config.forceHideContentEditorInOverlay === true;
-            block.showContent = !block.hideContentInOverlay && block.content?.variants[0].tabs?.some(tab=>tab.properties.length) === true;
-            block.showSettings = block.config.settingsElementTypeKey != null;
-
-            // If we have content, otherwise it doesn't make sense to copy.
-            block.showCopy = vm.supportCopy && block.config.contentElementTypeKey != null;
-
-            block.blockUiVisibility = false;
-            block.showBlockUI = () => {
-                delete block.__timeout;
-                $timeout(() => {
-                    shadowRoot.querySelector('*[data-element-udi="'+block.layout.contentUdi+'"] > ng-form > .umb-block-grid__block > .umb-block-grid__block--context').scrollIntoView({block: "nearest", inline: "nearest", behavior: "smooth"});
-                }, 100);
-                block.blockUiVisibility = true;
-            };
-            block.onMouseLeave = function () {
-                block.__timeout = $timeout(() => {block.blockUiVisibility = false}, 200);
-            };
-            block.onMouseEnter = function () {
-                if (block.__timeout) {
-                    $timeout.cancel(block.__timeout);
-                    delete block.__timeout;
-                }
-            };
-
-
-            // Index is set by umbblockgridblock component and kept up to date by it.
-            block.index = 0;
-            block.setParentForm = function (parentForm) {
-                this._parentForm = parentForm;
-            };
-
-            /** decorator methods, to enable switching out methods without loosing references that would have been made in Block Views codes */
-            block.activate = function() {
-                this._activate();
-            };
-            block.edit = function() {
-                this._edit();
-            };
-            block.editSettings = function() {
-                this._editSettings();
-            };
-            block.requestDelete = function() {
-                this._requestDelete();
-            };
-            block.delete = function() {
-                this._delete();
-            };
-            block.copy = function() {
-                this._copy();
-            };
-            updateBlockObject(block);
-
-            return block;
-        }
-
-        /** As the block object now contains references to this instance of a property editor, we need to ensure that the Block Object contains latest references.
-         * This is a bit hacky but the only way to maintain this reference currently.
-         * Notice this is most relevant for invariant properties on variant documents, specially for the scenario where the scope of the reference we stored is destroyed, therefor we need to ensure we always have references to a current running property editor*/
-        function updateBlockObject(block) {
-
-            ensureCultureData(block.content);
-            ensureCultureData(block.settings);
-
-            block._activate = activateBlock.bind(null, block);
-            block._edit = function () {
-                var blockIndex = vm.layout.indexOf(this.layout);
-                editBlock(this, false, blockIndex, this._parentForm);
-            };
-            block._editSettings = function () {
-                var blockIndex = vm.layout.indexOf(this.layout);
-                editBlock(this, true, blockIndex, this._parentForm);
-            };
-            block._requestDelete = requestDeleteBlock.bind(null, block);
-            block._delete = deleteBlock.bind(null, block);
-            block._copy = copyBlock.bind(null, block);
-        }
-
-        function addNewBlock(parentBlock, areaKey, index, contentElementTypeKey, options) {
-
-            // Create layout entry. (not added to property model jet.)
-            const layoutEntry = modelObject.create(contentElementTypeKey);
-            if (layoutEntry === null) {
-                return false;
-            }
-
-            // Development note: Notice this is ran before added to the data model.
-            initializeLayoutEntry(layoutEntry, parentBlock, areaKey);
-
-            // make block model
-            const blockObject = layoutEntry.$block;
-            if (blockObject === null) {
-                return false;
-            }
-
-            const area = parentBlock?.layout.areas.find(x => x.key === areaKey);
-
-            // fit in row?
-            if (options.fitInRow === true) {
-                /*
-                Idea for finding the proper size for this new block:
-                Use clientRect to measure previous items, once one is more to the right than the one before, then it must be a new line.
-                Combine those from the line to inspect if there is left room. Se if the left room fits?
-                Additionally the sizingOptions of the other can come into play?
-                */
-
-                if(blockObject.config.columnSpanOptions.length > 0) {
-                    const minColumnSpan = blockObject.config.columnSpanOptions.reduce((prev, option) => Math.min(prev, option.columnSpan), vm.gridColumns);
-                    layoutEntry.columnSpan = minColumnSpan;
-                } else {
-                    // because no columnSpanOptions defined, then use contextual layout columns.
-                    layoutEntry.columnSpan = area? area.$config.columnSpan : vm.gridColumns;
-                }
-                
-            } else {
-
-                if(blockObject.config.columnSpanOptions.length > 0) {
-                    // set columnSpan to maximum allowed span for this BlockType:
-                    const maximumColumnSpan = blockObject.config.columnSpanOptions.reduce((prev, option) => Math.max(prev, option.columnSpan), 1);
-                    layoutEntry.columnSpan = maximumColumnSpan;
-                } else {
-                    // because no columnSpanOptions defined, then use contextual layout columns.
-                    layoutEntry.columnSpan = area? area.$config.columnSpan : vm.gridColumns;
-                }
-
-            }
-
-            // add layout entry at the decided location in layout.
-            if(parentBlock != null) {
-                
-                if(!area) {
-                    console.error("Could not find area in block creation");
-                }
-
-                // limit columnSpan by areaConfig columnSpan:
-                layoutEntry.columnSpan = Math.min(layoutEntry.columnSpan, area.$config.columnSpan);
-
-                area.items.splice(index, 0, layoutEntry);
-            } else {
-
-                // limit columnSpan by grid columnSpan:
-                layoutEntry.columnSpan = Math.min(layoutEntry.columnSpan, vm.gridColumns);
-
-                vm.layout.splice(index, 0, layoutEntry);
-            }
-
-            // lets move focus to this new block.
-            vm.setBlockFocus(blockObject);
-
-            return true;
-        }
-
-        function getLayoutEntryByContentID(layoutList, contentUdi) {
-            for(const entry of layoutList) {
-                if(entry.contentUdi === contentUdi) {
-                    return {entry: entry, layoutList: layoutList};
-                }
-                for(const area of entry.areas) {
-                    const result = getLayoutEntryByContentID(area.items, contentUdi);
-                    if(result !== null) {
-                        return result;
-                    }
-                }
-            }
-            return null;
-        }
-
-        // Used by umbblockgridentries.component to check for drag n' drop allowance:
-        vm.isElementTypeKeyAllowedAt = isElementTypeKeyAllowedAt;
-        function isElementTypeKeyAllowedAt(parentBlock, areaKey, contentElementTypeKey) {
-            return getAllowedTypesOf(parentBlock, areaKey).filter(x => x.blockConfigModel.contentElementTypeKey === contentElementTypeKey).length > 0;
-        }
-
-        // Used by umbblockgridentries.component to set data for a block when drag n' drop specials(force new line etc.):
-        vm.getLayoutEntryByIndex = getLayoutEntryByIndex;
-        function getLayoutEntryByIndex(parentBlock, areaKey, index) {
-            if(parentBlock) {
-                const area = parentBlock.layout.areas.find(x => x.key === areaKey);
-                if(area && area.items.length >= index) {
-                    return area.items[index];
-                }
-            } else {
-                return vm.layout[index];
-            }
-            return null;
-        }
-        
-
-        // Used by umbblockgridentries.component to check how many block types that are available for creation in an area:
-        vm.getAllowedTypesOf = getAllowedTypesOf;
-        function getAllowedTypesOf(parentBlock, areaKey) {
-
-            if(areaKey == null || parentBlock == null) {
-                return vm.availableBlockTypes.filter(x => x.blockConfigModel.allowAtRoot);
-            }
-
-            const area = parentBlock.layout.areas.find(x => x.key === areaKey);
-
-            if(area) {
-                if(area.$config.specifiedAllowance.length > 0) {
-
-                    const allowedElementTypes = [];
-
-                    // Then add specific types (This allows to overwrite the amount for a specific type)
-                    area.$config.specifiedAllowance?.forEach(allowance => {
-                        if(allowance.groupKey) {
-                            vm.availableBlockTypes.forEach(blockType => {
-                                if(blockType.blockConfigModel.groupKey === allowance.groupKey && blockType.blockConfigModel.allowInAreas === true) {
-                                    if(allowedElementTypes.indexOf(blockType) === -1) {
-                                        allowedElementTypes.push(blockType);
-                                    }
-                                }
-                            });
-                        } else 
-                        if(allowance.elementTypeKey) {
-                            const blockType = vm.availableBlockTypes.find(x => x.blockConfigModel.contentElementTypeKey === allowance.elementTypeKey);
-                            if(blockType && allowedElementTypes.indexOf(blockType) === -1) {
-                                allowedElementTypes.push(blockType);
-                            }
-                        }
-                    });
-
-                    return allowedElementTypes;
-                } else {
-                    // as none specifiedAllowance was defined we will allow all area Blocks:
-                    return vm.availableBlockTypes.filter(x => x.blockConfigModel.allowInAreas === true);
-                }
-            }
-            return vm.availableBlockTypes;
-        }
-
-        function deleteBlock(block) {
-
-            const result = getLayoutEntryByContentID(vm.layout, block.layout.contentUdi);
-            if (result === null) {
-                console.error("Could not find layout entry of block with udi: "+block.layout.contentUdi);
-                return;
-            }
-
-            setDirty();
-
-            result.entry.areas.forEach(area => {
-                area.items.forEach(areaEntry => {
-                    deleteBlock(areaEntry.$block);
-                });
-            });
-
-            const layoutListIndex = result.layoutList.indexOf(result.entry);
-            var removed = result.layoutList.splice(layoutListIndex, 1);
-            removed.forEach(x => {
-                // remove any server validation errors associated
-                var guids = [udiService.getKey(x.contentUdi), (x.settingsUdi ? udiService.getKey(x.settingsUdi) : null)];
-                guids.forEach(guid => {
-                    if (guid) {
-                        serverValidationManager.removePropertyError(guid, vm.umbProperty.property.culture, vm.umbProperty.property.segment, "", { matchType: "contains" });
-                    }
-                })
-            });
-
-            modelObject.removeDataAndDestroyModel(block);
-        }
-
-        function deleteAllBlocks() {
-            while(vm.layout.length) {
-                deleteBlock(vm.layout[0].$block);
-            }
-        }
-
-        function activateBlock(blockObject) {
-            blockObject.active = true;
-        }
-
-        function editBlock(blockObject, openSettings, blockIndex, parentForm, options) {
-
-            options = options || vm.options;
-
-            /*
-            We cannot use the blockIndex as is not possibility in grid, cause of the polymorphism.
-            But we keep it to stay consistent with Block List Editor.
-            if (blockIndex === undefined) {
-                throw "blockIndex was not specified on call to editBlock";
-            }
-            */
-
-            var wasNotActiveBefore = blockObject.active !== true;
-            
-            // don't open the editor overlay if block has hidden its content editor in overlays and we are requesting to open content, not settings.
-            if (openSettings !== true && blockObject.hideContentInOverlay === true) {
-                return;
-            }
-
-            // if requesting to open settings but we don't have settings then return.
-            if (openSettings === true && !blockObject.config.settingsElementTypeKey) {
-                return;
-            }
-
-            activateBlock(blockObject);
-
-            // make a clone to avoid editing model directly.
-            var blockContentClone = Utilities.copy(blockObject.content);
-            var blockSettingsClone = null;
-
-            if (blockObject.config.settingsElementTypeKey) {
-                blockSettingsClone = Utilities.copy(blockObject.settings);
-            }
-
-            var blockEditorModel = {
-                $parentScope: $scope, // pass in a $parentScope, this maintains the scope inheritance in infinite editing
-                $parentForm: parentForm || vm.propertyForm, // pass in a $parentForm, this maintains the FormController hierarchy with the infinite editing view (if it contains a form)
-                hideContent: blockObject.hideContentInOverlay,
-                openSettings: openSettings === true,
-                createFlow: options.createFlow === true,
-                liveEditing: liveEditing,
-                title: blockObject.label,
-                view: "views/common/infiniteeditors/blockeditor/blockeditor.html",
-                size: blockObject.config.editorSize || "medium",
-                hideSubmitButton: vm.readonly,
-                submit: function(blockEditorModel) {
-
-                    if (liveEditing === false) {
-                        // transfer values when submitting in none-liveediting mode.
-                        blockObject.retrieveValuesFrom(blockEditorModel.content, blockEditorModel.settings);
-                    }
-
-                    blockObject.active = false;
-                    editorService.close();
-                },
-                close: function(blockEditorModel) {
-                    if (blockEditorModel.createFlow) {
-                        deleteBlock(blockObject);
-                    } else {
-                        if (liveEditing === true) {
-                            // revert values when closing in liveediting mode.
-                            blockObject.retrieveValuesFrom(blockContentClone, blockSettingsClone);
-                        }
-                        if (wasNotActiveBefore === true) {
-                            blockObject.active = false;
-                        }
-                    }
-                    editorService.close();
-                }
-            };
-
-            if (liveEditing === true) {
-                blockEditorModel.content = blockObject.content;
-                blockEditorModel.settings = blockObject.settings;
-            } else {
-                blockEditorModel.content = blockContentClone;
-                blockEditorModel.settings = blockSettingsClone;
-            }
-
-            // open property settings editor
-            editorService.open(blockEditorModel);
-        }
-
-        vm.requestShowCreate = requestShowCreate;
-        function requestShowCreate(parentBlock, areaKey, createIndex, mouseEvent, options) {
-
-            vm.hideAreaHighlight(parentBlock, areaKey);
-
-            if (vm.blockTypePickerIsOpen === true) {
-                return;
-            }
-
-            options = options || {};
-
-            const availableTypes = getAllowedTypesOf(parentBlock, areaKey);
-
-            if (availableTypes.length === 1) {
-                var wasAdded = false;
-                var blockType = availableTypes[0];
-
-                wasAdded = addNewBlock(parentBlock, areaKey, createIndex, blockType.blockConfigModel.contentElementTypeKey, options);
-
-                if(wasAdded && !(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
-                    userFlowWhenBlockWasCreated(parentBlock, areaKey, createIndex);
-                }
-            } else {
-                showCreateDialog(parentBlock, areaKey, createIndex, false, options);
-            }
-
-        }
-        vm.requestShowClipboard = requestShowClipboard;
-        function requestShowClipboard(parentBlock, areaKey, createIndex) {
-            showCreateDialog(parentBlock, areaKey, createIndex, true);
-        }
-
-        vm.showCreateDialog = showCreateDialog;
-        function showCreateDialog(parentBlock, areaKey, createIndex, openClipboard, options) {
-
-            if (vm.blockTypePickerIsOpen === true) {
-                return;
-            }
-
-
-            options = options || {};
-
-            const availableTypes = getAllowedTypesOf(parentBlock, areaKey);
-
-            if (availableTypes.length === 0) {
-                return;
-            }
-
-            const availableBlockGroups = vm.blockGroups.filter(group => !!availableTypes.find(item => item.blockConfigModel.groupKey === group.key));
-            
-            var amountOfAvailableTypes = availableTypes.length;
-            var availableContentTypesAliases = modelObject.getAvailableAliasesOfElementTypeKeys(availableTypes.map(x => x.blockConfigModel.contentElementTypeKey));
-            var availableClipboardItems = vm.clipboardItems.filter(
-                (entry) => {
-                    if(entry.aliases) {
-                        return entry.aliases.filter((alias, index) => availableContentTypesAliases.indexOf(alias) === index);
-                    } else {
-                        return availableContentTypesAliases.indexOf(entry.alias) !== -1;
-                    }
-                }
-            );
-
-            var createLabel;
-            if(parentBlock) {
-                const area = parentBlock.layout.areas.find(x => x.key === areaKey);
-                createLabel = area.$config.createLabel;
-            } else {
-                createLabel = vm.createLabel;
-            }
-            const headline = createLabel || (amountOfAvailableTypes.length === 1 ? localizationService.tokenReplace(vm.labels.blockEditor_addThis, [availableTypes[0].elementTypeModel.name]) : vm.labels.grid_addElement);
-            
-            var blockPickerModel = {
-                $parentScope: $scope, // pass in a $parentScope, this maintains the scope inheritance in infinite editing
-                $parentForm: vm.propertyForm, // pass in a $parentForm, this maintains the FormController hierarchy with the infinite editing view (if it contains a form)
-                availableItems: availableTypes,
-                blockGroups: availableBlockGroups,
-                title: headline,
-                openClipboard: openClipboard,
-                orderBy: "$index",
-                view: "views/common/infiniteeditors/blockpicker/blockpicker.html",
-                size: (amountOfAvailableTypes > 8 ? "medium" : "small"),
-                filter: (amountOfAvailableTypes > 8),
-                clickPasteItem: function(item, mouseEvent) {
-                    if (Array.isArray(item.pasteData)) {
-                        var indexIncrementor = 0;
-                        item.pasteData.forEach(function (entry) {
-                            if (requestPasteFromClipboard(parentBlock, areaKey, createIndex + indexIncrementor, entry, item.type)) {
-                                indexIncrementor++;
-                            }
-                        });
-                    } else {
-                        requestPasteFromClipboard(parentBlock, areaKey, createIndex, item.pasteData, item.type);
-                    }
-                    if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
-                        blockPickerModel.close();
-                    }
-                },
-                submit: function(blockPickerModel, mouseEvent) {
-                    var wasAdded = false;
-                    if (blockPickerModel && blockPickerModel.selectedItem) {
-                        wasAdded = addNewBlock(parentBlock, areaKey, createIndex, blockPickerModel.selectedItem.blockConfigModel.contentElementTypeKey, options);
-                    }
-
-                    if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
-                        blockPickerModel.close();
-                        if (wasAdded) {
-                            userFlowWhenBlockWasCreated(parentBlock, areaKey, createIndex);
-                        }
-                    }
-                },
-                close: function() {
-                    // if opened by a inline creator button(index less than length), we want to move the focus away, to hide line-creator.
-                    
-                    // add layout entry at the decided location in layout.
-                    if(parentBlock != null) {
-                        var area = parentBlock.layout.areas.find(x => x.key === areaKey);
-                        if(!area) {
-                            console.error("Could not find area in block creation close flow");
-                        }
-                        if (createIndex < area.items.length) {
-                            const blockOfInterest = area.items[Math.max(createIndex-1, 0)].$block;
-                            vm.setBlockFocus(blockOfInterest);
-                        }
-                    } else {
-                        if (createIndex < vm.layout.length) {
-                            const blockOfInterest = vm.layout[Math.max(createIndex-1, 0)].$block;
-                            vm.setBlockFocus(blockOfInterest);
-                        }
-                    }
-                    
-
-                    editorService.close();
-                    vm.blockTypePickerIsOpen = false;
-                }
-            };
-
-            blockPickerModel.clickClearClipboard = function () {
-                clipboardService.clearEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, availableContentTypesAliases);
-                clipboardService.clearEntriesOfType(clipboardService.TYPES.BLOCK, availableContentTypesAliases);
-            };
-
-            blockPickerModel.clipboardItems = availableClipboardItems;
-
-            vm.blockTypePickerIsOpen = true;
-            // open block picker overlay
-            editorService.open(blockPickerModel);
-
-        }
-        function userFlowWhenBlockWasCreated(parentBlock, areaKey, createIndex) {
-            var blockObject;
-            
-            if (parentBlock) {
-                var area = parentBlock.layout.areas.find(x => x.key === areaKey);
-                if (!area) {
-                    console.error("Area could not be found...", parentBlock, areaKey)
-                }
-                blockObject = area.items[createIndex].$block;
-            } else {
-                if (vm.layout.length <= createIndex) {
-                    console.error("Create index does not fit within available items of root.")
-                }
-                blockObject = vm.layout[createIndex].$block;
-            }
-            // edit block if not `hideContentInOverlay` and there is content properties.
-            if(blockObject.hideContentInOverlay !== true && blockObject.content.variants[0].tabs.find(tab => tab.properties.length > 0) !== undefined) {
-                vm.options.createFlow = true;
-                blockObject.edit();
-                vm.options.createFlow = false;
-            }
-        }
-
-        function updateClipboard(firstTime) {
-
-            var oldAmount = vm.clipboardItems.length;
-            var entriesForPaste;
-
-            vm.clipboardItems = [];
-
-            entriesForPaste = clipboardService.retrieveEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, vm.availableContentTypesAliases);
-            entriesForPaste.forEach(function (entry) {
-                var pasteEntry = {
-                    type: clipboardService.TYPES.ELEMENT_TYPE,
-                    date: entry.date,
-                    alias: entry.alias,
-                    pasteData: entry.data,
-                    elementTypeModel: {
-                        name: entry.label,
-                        icon: entry.icon
-                    }
-                }
-                if(Array.isArray(entry.data) === false) {
-                    var scaffold = modelObject.getScaffoldFromAlias(entry.alias);
-                    if(scaffold) {
-                        pasteEntry.blockConfigModel = modelObject.getBlockConfiguration(scaffold.contentTypeKey);
-                    }
-                }
-                vm.clipboardItems.push(pasteEntry);
-            });
-
-            entriesForPaste = clipboardService.retrieveEntriesOfType(clipboardService.TYPES.BLOCK, vm.availableContentTypesAliases);
-            entriesForPaste.forEach(function (entry) {
-                var pasteEntry = {
-                    type: clipboardService.TYPES.BLOCK,
-                    date: entry.date,
-                    alias: entry.alias,
-                    aliases: entry.aliases,
-                    pasteData: entry.data,
-                    elementTypeModel: {
-                        name: entry.label,
-                        icon: entry.icon
-                    }
-                }
-                if(Array.isArray(entry.data) === false) {
-                    pasteEntry.blockConfigModel = modelObject.getBlockConfiguration(entry.data.data.contentTypeKey);
-                }
-                vm.clipboardItems.push(pasteEntry);
-            });
-
-            vm.clipboardItems.sort( (a, b) => {
-                return b.date - a.date
-            });
-
-            if(firstTime !== true && vm.clipboardItems.length > oldAmount) {
-                jumpClipboard();
-            }
-        }
-
-        var jumpClipboardTimeout;
-        function jumpClipboard() {
-
-            if(jumpClipboardTimeout) {
-                return;
-            }
-
-            vm.jumpClipboardButton = true;
-            jumpClipboardTimeout = $timeout(() => {
-                vm.jumpClipboardButton = false;
-                jumpClipboardTimeout = null;
-            }, 2000);
-        }
-
-        function requestCopyAllBlocks() {
-
-            var aliases = [];
-
-            var elementTypesToCopy = vm.layout.filter(entry => entry.$block.config.unsupported !== true).map(
-                (entry) => {
-
-                    aliases.push(entry.$block.content.contentTypeAlias);
-
-                    const clipboardData = { "layout": entry.$block.layout, "data": entry.$block.data, "settingsData": entry.$block.settingsData };
-                    // If areas:
-                    if(entry.$block.layout.areas.length > 0) {
-                        clipboardData.nested = gatherNestedBlocks(entry.$block);
-                    }
-                    // No need to clone the data as its begin handled by the clipboardService.
-                    return clipboardData;
-                }
-            );
-
-            // remove duplicate aliases
-            aliases = aliases.filter((item, index) => aliases.indexOf(item) === index);
-
-            var contentNodeName = "?";
-            var contentNodeIcon = null;
-            if (vm.umbVariantContent) {
-                contentNodeName = vm.umbVariantContent.editor.content.name;
-                if (vm.umbVariantContentEditors) {
-                    contentNodeIcon = vm.umbVariantContentEditors.content.icon.split(" ")[0];
-                } else if (vm.umbElementEditorContent) {
-                    contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon.split(" ")[0];
-                }
-            } else if (vm.umbElementEditorContent) {
-                contentNodeName = vm.umbElementEditorContent.model.documentType.name;
-                contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon.split(" ")[0];
-            }
-
-            localizationService.localize("clipboard_labelForArrayOfItemsFrom", [vm.model.label, contentNodeName]).then(function (localizedLabel) {
-                clipboardService.copyArray(clipboardService.TYPES.BLOCK, aliases, elementTypesToCopy, localizedLabel, contentNodeIcon || "icon-thumbnail-list", vm.model.id);
-            });
-        }
-
-        function gatherNestedBlocks(block) {
-            const nested = [];
-
-            block.layout.areas.forEach(area => {
-                area.items.forEach(item => {
-                    const itemData = {"layout": item.$block.layout, "data": item.$block.data, "settingsData":item.$block.settingsData, "areaKey": area.key};
-                    if(item.$block.layout.areas?.length > 0) {
-                        itemData.nested = gatherNestedBlocks(item.$block);
-                    }
-                    nested.push(itemData);
-                });
-            });
-
-            return nested;
-        }
-        function copyBlock(block) {
-
-            const clipboardData = {"layout": block.layout, "data": block.data, "settingsData":block.settingsData};
-
-            // If areas:
-            if(block.layout.areas.length > 0) {
-                clipboardData.nested = gatherNestedBlocks(block);
-            }
-
-            clipboardService.copy(clipboardService.TYPES.BLOCK, block.content.contentTypeAlias, clipboardData, block.label, block.content.icon, block.content.udi);
-        }
-
-        function pasteClipboardEntry(parentBlock, areaKey, index, pasteEntry, pasteType) {
-
-            if (pasteEntry === undefined) {
-                return null;
-            }
-
-            if(!isElementTypeKeyAllowedAt(parentBlock, areaKey, pasteEntry.data.contentTypeKey)) {
-                console.error("paste clipboard entry inserted an disallowed type.")
-                return {failed: true};
-            }
-
-            var layoutEntry;
-            if (pasteType === clipboardService.TYPES.ELEMENT_TYPE) {
-                layoutEntry = modelObject.createFromElementType(pasteEntry);
-            } else if (pasteType === clipboardService.TYPES.BLOCK) {
-                layoutEntry = modelObject.createFromBlockData(pasteEntry);
-            } else {
-                // Not a supported paste type.
-                return null;
-            }
-
-            if (layoutEntry === null) {
-                // Pasting did not go well.
-                return null;
-            }
-
-            if (initializeLayoutEntry(layoutEntry, parentBlock, areaKey) === null) {
-                return null;
-            }
-            
-            if (layoutEntry.$block === null) {
-                // Initialization of the Block Object didn't go well, therefor we will fail the paste action.
-                return null;
-            }
-
-            var nestedBlockFailed = false;
-            if(pasteEntry.nested && pasteEntry.nested.length) {
-
-                // Handle nested blocks:
-                pasteEntry.nested.forEach( nestedEntry => {
-                    if(nestedEntry.areaKey) {
-                        const data = pasteClipboardEntry(layoutEntry.$block, nestedEntry.areaKey, null, nestedEntry, pasteType);
-                        if(data === null || data.failed === true) {
-                            nestedBlockFailed = true;
-                        }
-                    }
-                });
-
-            }
-
-            // insert layout entry at the decided location in layout.
-            if(parentBlock != null) {
-                var area = parentBlock.layout.areas.find(x => x.key === areaKey);
-                if (!area) {
-                    console.error("Area could not be found...", parentBlock, areaKey)
-                }
-                if(index !== null) {
-                    area.items.splice(index, 0, layoutEntry);
-                } else {
-                    area.items.push(layoutEntry);
-                }
-            } else {
-                if(index !== null) {
-                    vm.layout.splice(index, 0, layoutEntry);
-                } else {
-                    vm.layout.push(layoutEntry);
-                }
-            }
-            
-            return {layoutEntry, failed: nestedBlockFailed};
-        }
-
-        function requestPasteFromClipboard(parentBlock, areaKey, index, pasteEntry, pasteType) {
-
-            const data = pasteClipboardEntry(parentBlock, areaKey, index, pasteEntry, pasteType);
-            if(data) { 
-                if(data.failed === true) {
-                    // one or more of nested block creation failed.
-                    // Ask wether the user likes to continue:
-                    if(data.layoutEntry) {
-                        var blockToRevert = data.layoutEntry.$block;
-                        localizationService.localizeMany(["blockEditor_confirmPasteDisallowedNestedBlockHeadline", "blockEditor_confirmPasteDisallowedNestedBlockMessage", "general_revert", "general_continue"]).then(function (localizations) {
-                            const overlay = {
-                                title: localizations[0],
-                                content: localizationService.tokenReplace(localizations[1], [blockToRevert.label]),
-                                disableBackdropClick: true,
-                                closeButtonLabel: localizations[2],
-                                submitButtonLabel: localizations[3],
-                                close: function () {
-                                    // revert: 
-                                    deleteBlock(blockToRevert);
-                                    overlayService.close();
-                                },
-                                submit: function () {
-                                    // continue: 
-                                    overlayService.close();
-                                }
-                            };
-            
-                            overlayService.open(overlay);
-                        });
-                    } else {
-                        console.error("Pasting failed, there was nothing to revert. Should be good to move on with content creation.")
-                    }
-                } else {
-                    vm.currentBlockInFocus = data.layoutEntry.$block;
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        function requestDeleteBlock(block) {
-            if (vm.readonly) return;
-
-            localizationService.localizeMany(["general_delete", "blockEditor_confirmDeleteBlockMessage", "contentTypeEditor_yesDelete"]).then(function (data) {
-                const overlay = {
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [block.label]),
-                    submitButtonLabel: data[2],
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        deleteBlock(block);
-                        overlayService.close();
-                    }
-                };
-
-                overlayService.confirmDelete(overlay);
-            });
-        }
-
-        function requestDeleteAllBlocks() {
-            localizationService.localizeMany(["content_nestedContentDeleteAllItems", "general_delete"]).then(function (data) {
-                overlayService.confirmDelete({
-                    title: data[1],
-                    content: data[0],
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        deleteAllBlocks();
-                        overlayService.close();
-                    }
-                });
-            });
-        }
-
-        function openSettingsForBlock(block, blockIndex, parentForm) {
-            editBlock(block, true, blockIndex, parentForm);
-        }
-
-        vm.blockEditorApi = {
-            activateBlock: activateBlock,
-            editBlock: editBlock,
-            copyBlock: copyBlock,
-            requestDeleteBlock: requestDeleteBlock,
-            deleteBlock: deleteBlock,
-            openSettingsForBlock: openSettingsForBlock,
-            requestShowCreate: requestShowCreate,
-            requestShowClipboard: requestShowClipboard,
-            internal: vm,
-            readonly: vm.readonly
-        };
-
-        vm.setDirty = setDirty;
-        function setDirty() {
-            if (vm.propertyForm) {
-                vm.propertyForm.$setDirty();
-            }
-        }
-
-        function enableSortMode() {
-            vm.sortMode = true;
-            propertyActions.splice(propertyActions.indexOf(enterSortModeAction), 1, exitSortModeAction);
-            if (vm.umbProperty) {
-                vm.umbProperty.setPropertyActions(propertyActions);
-            }
-        }
-
-        vm.exitSortMode = exitSortMode;
-        function exitSortMode() {
-            vm.sortMode = false;
-            propertyActions.splice(propertyActions.indexOf(exitSortModeAction), 1, enterSortModeAction);
-            if (vm.umbProperty) {
-                vm.umbProperty.setPropertyActions(propertyActions);
-            }
-        }
-
-        vm.startDraggingMode = startDraggingMode;
-        function startDraggingMode() {
-
-            document.documentElement.style.setProperty("--umb-block-grid--dragging-mode", ' ');
-            firstLayoutContainer.style.minHeight = firstLayoutContainer.getBoundingClientRect().height + "px";
-            
-        }
-        vm.exitDraggingMode = exitDraggingMode;
-        function exitDraggingMode() {
-
-            document.documentElement.style.setProperty("--umb-block-grid--dragging-mode", 'initial');
-            firstLayoutContainer.style.minHeight = "";
-            
-        }
-
-        function onAmountOfBlocksChanged() {
-
-            // enable/disable property actions
-            if (copyAllBlocksAction) {
-                copyAllBlocksAction.isDisabled = vm.layout.length === 0;
-            }
-            if (deleteAllBlocksAction) {
-                deleteAllBlocksAction.isDisabled = vm.layout.length === 0;
-            }
-
-            // validate limits:
-            if (vm.propertyForm && vm.validationLimit) {
-
-                var isMinRequirementGood = vm.validationLimit.min === null || vm.layout.length >= vm.validationLimit.min;
-                vm.propertyForm.minCount.$setValidity("minCount", isMinRequirementGood);
-
-                var isMaxRequirementGood = vm.validationLimit.max === null || vm.layout.length <= vm.validationLimit.max;
-                vm.propertyForm.maxCount.$setValidity("maxCount", isMaxRequirementGood);
-            }
-        }
-
-        unsubscribe.push($scope.$watch(() => vm.layout.length, onAmountOfBlocksChanged));
-
-        $scope.$on("$destroy", function () {
-
-            $element[0].removeEventListener("UmbBlockGrid_AppendProperty", vm.onAppendProxyProperty);
-            $element[0].removeEventListener("UmbBlockGrid_RemoveProperty", vm.onRemoveProxyProperty);
-
-            for (const subscription of unsubscribe) {
-                subscription();
-            }
-
-            firstLayoutContainer = null;
-            gridRootEl = null;
-        });
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridblock.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridblock.component.js
deleted file mode 100644
index 73ce2495fe..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridblock.component.js
+++ /dev/null
@@ -1,87 +0,0 @@
-(function () {
-    "use strict";
-
-    /**
-     * @ngdoc directive
-     * @name umbraco.directives.directive:umbBlockGridBlock
-     * @description
-     * The component to render the view for a block in the Block Grid Editor.
-     * If a stylesheet is used then this uses a ShadowDom to make a scoped element.
-     * This way the backoffice styling does not collide with the block style.
-     */
-
-    angular
-        .module("umbraco")
-        .component("umbBlockGridBlock", {
-            controller: BlockGridBlockController,
-            controllerAs: "model",
-            bindings: {
-                stylesheet: "@",
-                view: "@",
-                block: "=",
-                api: "<",
-                index: "<",
-                parentForm: "<"
-            },
-            require: {
-                valFormManager: "^^valFormManager"
-            }
-        }
-    );
-
-    function BlockGridBlockController($scope, $compile, $element) {
-        var model = this;
-
-        model.$onInit = function () {
-
-            // let the Block know about its form
-            model.block.setParentForm(model.parentForm);
-
-            // let the Block know about the current index
-            model.block.index = model.index;
-
-            $scope.block = model.block;
-            $scope.api = model.api;
-            $scope.index = model.index;
-            $scope.parentForm = model.parentForm;
-            $scope.valFormManager = model.valFormManager;
-
-            var shadowRoot = $element[0].attachShadow({ mode: 'open' });
-            shadowRoot.innerHTML = 
-            `
-                <style>@import "assets/css/icons.css?umb__rnd=${Umbraco.Sys.ServerVariables.application.cacheBuster}"</style>
-            
-                ${ model.stylesheet ? `
-                    <style>
-                        @import "${model.stylesheet}?umb__rnd=${Umbraco.Sys.ServerVariables.application.cacheBuster}"
-                    </style>`
-                    : ''
-                }
-                
-                <div 
-                    style="display:contents;" 
-                    ng-class="{'show-validation': vm.blockEditorApi.internal.showValidation}"
-                    ng-include="api.internal.sortMode ? api.internal.sortModeView : '${model.view}'">
-                </div>
-            `;
-            $compile(shadowRoot)($scope);
-            
-        };
-        
-
-        // We need to watch for changes on primitive types and update the $scope values.
-        model.$onChanges = function (changes) {
-            if (changes.index) {
-                var index = changes.index.currentValue;
-                $scope.index = index;
-
-                // let the Block know about the current index:
-                model.block.index = index;
-                model.block.updateLabel();
-            }
-        };
-        
-    }
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridentries.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridentries.component.js
deleted file mode 100644
index acf4dd16ad..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridentries.component.js
+++ /dev/null
@@ -1,321 +0,0 @@
-(function () {
-    "use strict";
-
-
-    // Utils:
-
-    function getInterpolatedIndexOfPositionInWeightMap(target, weights) {
-        const map = [0];
-        weights.reduce((a, b, i) => { return map[i+1] = a+b; }, 0);
-        const foundValue = map.reduce((a, b) => {
-            let aDiff = Math.abs(a - target);
-            let bDiff = Math.abs(b - target);
-
-            if (aDiff === bDiff) {
-                return a < b ? a : b;
-            } else {
-                return bDiff < aDiff ? b : a;
-            }
-        })
-        const foundIndex = map.indexOf(foundValue);
-        const targetDiff = (target-foundValue);
-        let interpolatedIndex = foundIndex;
-        if (targetDiff < 0 && foundIndex === 0) {
-            // Don't adjust.
-        } else if (targetDiff > 0 && foundIndex === map.length-1) {
-            // Don't adjust.
-        } else {
-            const foundInterpolationWeight = weights[targetDiff >= 0 ? foundIndex : foundIndex-1];
-            interpolatedIndex += foundInterpolationWeight === 0 ? interpolatedIndex : (targetDiff/foundInterpolationWeight)
-        }
-        return interpolatedIndex;
-    }
-
-    function getAccumulatedValueOfIndex(index, weights) {
-        let i = 0, len = Math.min(index, weights.length), calc = 0;
-        while(i<len) {
-            calc += weights[i++];
-        }
-        return calc;
-    }
-
-
-
-    /**
-     * @ngdoc directive
-     * @name umbraco.directives.directive:umbBlockGridEntries
-     * @description
-     * renders all blocks for a given list for the block grid editor
-     */
-
-    angular
-        .module("umbraco")
-        .component("umbBlockGridEntries", {
-            templateUrl: 'views/propertyeditors/blockgrid/umb-block-grid-entries.html',
-            controller: BlockGridEntriesController,
-            controllerAs: "vm",
-            bindings: {
-                blockEditorApi: "<",
-                entries: "<",
-                layoutColumns: "<",
-                areaKey: "<?",
-                parentBlock: "<?",
-                parentForm: "<?",
-                propertyEditorForm: "<?",
-                depth: "@",
-                createLabel: "@?"
-            }
-        }
-    );
-
-    function BlockGridEntriesController($element, $scope) {
-
-        const unsubscribe = [];
-        const vm = this;
-        vm.invalidAmount = false;
-        vm.areaConfig = null;
-        vm.locallyAvailableBlockTypes = 0;
-        vm.invalidBlockTypes = [];
-
-        vm.showNotAllowedUI = false;
-        let currentContainedPropertyEditorProxies = [];
-
-        vm.$onInit = function () {
-
-            initializeSorter();
-
-            if(vm.parentBlock) {
-                vm.areaConfig = vm.parentBlock.config.areas.find(area => area.key === vm.areaKey);
-            }
-
-            vm.locallyAvailableBlockTypes = vm.blockEditorApi.internal.getAllowedTypesOf(vm.parentBlock, vm.areaKey);
-
-            unsubscribe.push($scope.$watch('vm.entries', onLocalAmountOfBlocksChanged, true));
-        };
-
-        function onLocalAmountOfBlocksChanged() {
-
-            if (vm.entriesForm && vm.areaConfig) {
-
-                var isMinRequirementGood = vm.entries.length >= vm.areaConfig.minAllowed;
-                vm.entriesForm.areaMinCount.$setValidity("areaMinCount", isMinRequirementGood);
-
-                var isMaxRequirementGood = vm.areaConfig.maxAllowed == null || vm.entries.length <= vm.areaConfig.maxAllowed;
-                vm.entriesForm.areaMaxCount.$setValidity("areaMaxCount", isMaxRequirementGood);
-
-                vm.invalidBlockTypes = [];
-
-                vm.areaConfig.specifiedAllowance.forEach(allowance => {
-
-                    const minAllowed = allowance.minAllowed || 0;
-                    const maxAllowed = allowance.maxAllowed || 0;
-
-                    // For block groups:
-                    if(allowance.groupKey) {
-
-                        const groupElementTypeKeys = vm.locallyAvailableBlockTypes.filter(blockType => blockType.blockConfigModel.groupKey === allowance.groupKey && blockType.blockConfigModel.allowInAreas === true).map(x => x.blockConfigModel.contentElementTypeKey);
-                        const groupAmount = vm.entries.filter(entry => groupElementTypeKeys.indexOf(entry.$block.data.contentTypeKey) !== -1).length;
-
-                        if(groupAmount < minAllowed || (maxAllowed > 0 && groupAmount > maxAllowed)) {
-                            vm.invalidBlockTypes.push({
-                                'groupKey': allowance.groupKey,
-                                'name': vm.blockEditorApi.internal.getBlockGroupName(allowance.groupKey),
-                                'amount': groupAmount,
-                                'minRequirement': minAllowed,
-                                'maxRequirement': maxAllowed
-                            });
-                        }
-                    } else
-                    // For specific elementTypes:
-                    if(allowance.elementTypeKey) {
-
-                        const amount = vm.entries.filter(entry => entry.$block.data.contentTypeKey === allowance.elementTypeKey).length;
-
-                        if(amount < minAllowed || (maxAllowed > 0 && amount > maxAllowed)) {
-                            vm.invalidBlockTypes.push({
-                                'key': allowance.elementTypeKey,
-                                'name': vm.locallyAvailableBlockTypes.find(blockType => blockType.blockConfigModel.contentElementTypeKey === allowance.elementTypeKey).elementTypeModel.name,
-                                'amount': amount,
-                                'minRequirement': minAllowed,
-                                'maxRequirement': maxAllowed
-                            });
-                        }
-                    }
-                });
-                var isTypeRequirementGood = vm.invalidBlockTypes.length === 0;
-                vm.entriesForm.areaTypeRequirements.$setValidity("areaTypeRequirements", isTypeRequirementGood);
-
-
-                vm.invalidAmount = !isMinRequirementGood || !isMaxRequirementGood || !isTypeRequirementGood;
-
-                $element.toggleClass("--invalid", vm.invalidAmount);
-            }
-        }
-
-        // Used by umb block grid entries component, to trigger other blocks to update.
-        vm.notifyVisualUpdate = notifyVisualUpdate;
-        function notifyVisualUpdate() {
-            $scope.$broadcast("blockGridEditorVisualUpdate", {areaKey: vm.areaKey});
-        }
-
-        function removeAllContainedPropertyEditorProxies() {
-            currentContainedPropertyEditorProxies.forEach(slotName => {
-                removePropertyEditorProxies(slotName);
-            });
-        }
-        function removePropertyEditorProxies(slotName) {
-            const event = new CustomEvent("UmbBlockGrid_RemoveProperty", {composed: true, bubbles: true, detail: {'slotName': slotName}});
-            $element[0].dispatchEvent(event);
-        }
-
-
-
-
-        function resolveVerticalDirection(data) {
-
-            /** We need some data about the grid to figure out if there is room to be placed next to the found element */
-            const approvedContainerComputedStyles = getComputedStyle(data.containerElement);
-            const gridColumnGap = Number(approvedContainerComputedStyles.columnGap.split("px")[0]) || 0;
-            const gridColumnNumber = parseInt(approvedContainerComputedStyles.getPropertyValue("--umb-block-grid--grid-columns"), 10);
-
-                    const foundElColumns = parseInt(data.relatedElement.dataset.colSpan, 10);
-                    const currentElementColumns = data.item.columnSpan;
-
-            if(currentElementColumns >= gridColumnNumber) {
-                return true;
-            }
-
-                    // Get grid template:
-                    const approvedContainerGridColumns = approvedContainerComputedStyles.gridTemplateColumns.trim().split("px").map(x => Number(x)).filter(n => n > 0).map((n, i, list) => list.length === i ? n : n + gridColumnGap);
-
-                    // ensure all columns are there.
-                    // This will also ensure handling non-css-grid mode,
-                    // use container width divided by amount of columns( or the item width divided by its amount of columnSpan)
-                    let amountOfColumnsInWeightMap = approvedContainerGridColumns.length;
-                    const amountOfUnknownColumns = gridColumnNumber-amountOfColumnsInWeightMap;
-                    if(amountOfUnknownColumns > 0) {
-                        let accumulatedValue = getAccumulatedValueOfIndex(amountOfColumnsInWeightMap, approvedContainerGridColumns) || 0;
-                        const layoutWidth = data.containerRect.width;
-                        const missingColumnWidth = (layoutWidth-accumulatedValue)/amountOfUnknownColumns;if(missingColumnWidth > 0) {
-                        while(amountOfColumnsInWeightMap++ < gridColumnNumber) {
-                            approvedContainerGridColumns.push(missingColumnWidth);
-                        }
-                    }}
-
-            let offsetPlacement = 0;
-            /* If placeholder is in this same line, we want to assume that it will offset the placement of the found element,
-            which provides more potential space for the item to drop at.
-            This is relevant in this calculation where we look at the space to determine if its a vertical or horizontal drop in relation to the found element.
-            */
-            if(data.placeholderIsInThisRow && data.elementRect.left < data.relatedRect.left) {
-                offsetPlacement = -(data.elementRect.width + gridColumnGap);
-            }
-
-                    const relatedStartX = Math.max(data.relatedRect.left - data.containerRect.left + offsetPlacement, 0);
-                    const relatedStartCol = Math.round(getInterpolatedIndexOfPositionInWeightMap(relatedStartX, approvedContainerGridColumns));
-
-            // If the found related element does not have enough room after which for the current element, then we go vertical mode:
-            return (relatedStartCol + (data.horizontalPlaceAfter ? foundElColumns : 0) + currentElementColumns > gridColumnNumber);
-        }
-
-
-
-
-        function initializeSorter() {
-            vm.sorterOptions = {
-                ownerVM: vm,
-                resolveVerticalDirection: resolveVerticalDirection,
-                dataTransferResolver: (dataTransfer, item) => {dataTransfer.setData("text/plain", item.$block.label)}, // (Optional) Append OS data to the moved item.
-                compareElementToModel: (el, modelEntry) => modelEntry.contentUdi === el.dataset.elementUdi,
-                querySelectModelToElement: (container, modelEntry) => container.querySelector(`[data-element-udi='${modelEntry.contentUdi}']`),
-                itemHasNestedContainersResolver: (foundEl) => foundEl.classList.contains('--has-areas'), // (Optional) improve performance for recognizing if an items has inner containers.
-                identifier: "BlockGridEditor_"+vm.blockEditorApi.internal.uniqueEditorKey,
-                boundarySelector: ".umb-block-grid__area", // (Optional) Used for extended boundary between containers.
-                containerSelector: ".umb-block-grid__layout-container", // Used for connecting with others
-                itemSelector: ".umb-block-grid__layout-item",
-                draggableSelector: ".umb-block-grid__block--view",
-                placeholderClass: "umb-block-grid__layout-item-placeholder",
-                ghostClass: "umb-block-grid__layout-item-ghost",
-                onStart: onSortStart,
-                onEnd: onSortEnd,
-                onContainerChange: onSortContainerChange,
-                onSync: onSortSync,
-                onDisallowed: onSortDisallowed,
-                onAllowed: onSortAllowed,
-                onRequestDrop: onSortRequestDrop
-            }
-        }
-
-        var currentItemColumnSpanTarget;
-        function onSortStart(data) {
-            currentItemColumnSpanTarget = data.item.columnSpan;
-
-            // Gather containedPropertyEditorProxies from this element.
-            currentContainedPropertyEditorProxies = Array.from(data.element.querySelectorAll('slot[data-is-property-editor-proxy]')).map(x => x.getAttribute('name'));
-            vm.blockEditorApi.internal.startDraggingMode();
-        }
-
-        function onSortEnd() {
-            vm.blockEditorApi.internal.exitDraggingMode();
-            currentContainedPropertyEditorProxies = [];
-            notifyVisualUpdate();
-            $scope.$evalAsync();
-        }
-
-        function getColumnSpanForContext(currentColumnSpan, columnSpanOptions, contextColumns) {
-            if (columnSpanOptions.length > 0) {
-                const availableOptions = columnSpanOptions.filter(option => option.columnSpan <= contextColumns);
-                if(availableOptions.length > 0) {
-                    const closestColumnSpan = availableOptions.map(x => x.columnSpan).reduce(
-                        (prev, curr) => {
-                            return Math.abs(curr - currentColumnSpan) < Math.abs(prev - currentColumnSpan) ? curr : prev
-                        }, 99999
-                    );
-                    if(closestColumnSpan) {
-                        return closestColumnSpan;
-                    }
-                }
-            }
-            return contextColumns;
-        }
-
-        function onSortContainerChange(data) {
-            const contextColumns = vm.blockEditorApi.internal.getContextColumns(data.ownerVM.parentBlock, data.ownerVM.areaKey);
-            data.item.columnSpan = getColumnSpanForContext(currentItemColumnSpanTarget, data.item.$block.config.columnSpanOptions, contextColumns);
-        }
-
-        function onSortSync(data) {
-            if (data.fromController !== data.toController) {
-                removeAllContainedPropertyEditorProxies();
-            }
-            $scope.$evalAsync();
-            vm.blockEditorApi.internal.setDirty();
-        }
-
-        function onSortDisallowed() {
-            vm.showNotAllowedUI = true;
-            $scope.$evalAsync();
-        }
-        function onSortAllowed() {
-            vm.showNotAllowedUI = false;
-            $scope.$evalAsync();
-        }
-        function onSortRequestDrop(data) {
-            return vm.blockEditorApi.internal.isElementTypeKeyAllowedAt(vm.parentBlock, vm.areaKey, data.item.$block.config.contentElementTypeKey);
-        }
-
-
-
-
-
-
-
-
-        $scope.$on('$destroy', function () {
-            for (const subscription of unsubscribe) {
-                subscription();
-            }
-        });
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridentry.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridentry.component.js
deleted file mode 100644
index dd030ec6a8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridentry.component.js
+++ /dev/null
@@ -1,500 +0,0 @@
-(function () {
-    "use strict";
-
-
-    /**
-     * Helper method that takes a weight map and finds the index of the value.
-     * @param {number} position - the value to find the index of.
-     * @param {number[]} weights - array of numbers each representing the weight/length.
-     * @returns {number} - the index of the weight that contains the accumulated value
-     */
-    function getInterpolatedIndexOfPositionInWeightMap(target, weights) {
-        const map = [0];
-        weights.reduce((a, b, i) => { return map[i+1] = a+b; }, 0);
-        const foundValue = map.reduce((a, b) => {
-            let aDiff = Math.abs(a - target);
-            let bDiff = Math.abs(b - target);
-    
-            if (aDiff === bDiff) {
-                return a < b ? a : b;
-            } else {
-                return bDiff < aDiff ? b : a;
-            }
-        })
-        const foundIndex = map.indexOf(foundValue);
-        const targetDiff = (target-foundValue);
-        let interpolatedIndex = foundIndex;
-        if (targetDiff < 0 && foundIndex === 0) {
-            // Don't adjust.
-        } else if (targetDiff > 0 && foundIndex === map.length-1) {
-            // Don't adjust.
-        } else {
-            const foundInterpolationWeight = weights[targetDiff >= 0 ? foundIndex : foundIndex-1];
-            interpolatedIndex += foundInterpolationWeight === 0 ? interpolatedIndex : (targetDiff/foundInterpolationWeight)
-        }
-        return interpolatedIndex;
-    }
-
-    function getAccumulatedValueOfIndex(index, weights) {
-        let i = 0, len = Math.min(index, weights.length), calc = 0;
-        while(i<len) {
-            calc += weights[i++];
-        }
-        return calc;
-    }
-    
-    function closestColumnSpanOption(target, map, max) {
-        if(map.length > 0) {
-            const result = map.reduce((a, b) => {
-                if (a.columnSpan > max) {
-                    return b;
-                }
-                let aDiff = Math.abs(a.columnSpan - target);
-                let bDiff = Math.abs(b.columnSpan - target);
-        
-                if (aDiff === bDiff) {
-                    return a.columnSpan < b.columnSpan ? a : b;
-                } else {
-                    return bDiff < aDiff ? b : a;
-                }
-            });
-            if(result) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-
-
-    /**
-     * @ngdoc directive
-     * @name umbraco.directives.directive:umbBlockGridEntry
-     * @description
-     * renders each row for the block grid editor
-     */
-    angular
-        .module("umbraco")
-        .component("umbBlockGridEntry", {
-            templateUrl: 'views/propertyeditors/blockgrid/umb-block-grid-entry.html',
-            controller: BlockGridEntryController,
-            controllerAs: "vm",
-            bindings: {
-                blockEditorApi: "<",
-                layoutColumns: "<",
-                layoutEntry: "<",
-                index: "<",
-                parentBlock: "<",
-                areaKey: "<",
-                propertyEditorForm: "<?",
-                depth: "@"
-            },
-            require: {
-                umbBlockGridEntries: "?^^umbBlockGridEntries"
-            }
-        }
-    );
-
-    function BlockGridEntryController($scope, $element, $timeout) {
-
-        let updateInlineCreateTimeout;
-        let updateInlineCreateRaf;
-
-        const unsubscribe = [];
-        const vm = this;
-        vm.areaGridColumns = '';
-        vm.isHoveringArea = false;
-        vm.isScaleMode = false;
-        vm.layoutColumnsInt = 0;
-        vm.inlineCreateAboveWidth = "";
-        vm.hideInlineCreateAbove = true;
-        vm.hideInlineCreateAfter = true;
-        vm.canScale = false;
-
-        vm.proxyProperties = [];
-        vm.onAppendProxyProperty = (event) => {
-            // Only insert a proxy slot for the direct Block of this entry (as all the blocks share the same ShadowDom though they are slotted into each other when nested through areas.)
-            if (event.detail.contentUdi === vm.layoutEntry.contentUdi) {
-                vm.proxyProperties.push({
-                    slotName: event.detail.slotName
-                });
-                $scope.$evalAsync();
-            }
-        };
-        vm.onRemoveProxyProperty = (event) => {
-            // Only react to proxies from the direct Block of this entry:
-            if (event.detail.contentUdi === vm.layoutEntry.contentUdi) {
-                const index = vm.proxyProperties.findIndex(x => x.slotName === event.detail.slotName);
-                if(index !== -1) {
-                    vm.proxyProperties.splice(index, 1);
-                }
-                $scope.$evalAsync();
-            }
-        };
-
-        vm.$onInit = function() {
-
-            $element[0].addEventListener("UmbBlockGrid_AppendProperty", vm.onAppendProxyProperty);
-            $element[0].addEventListener("UmbBlockGrid_RemoveProperty", vm.onRemoveProxyProperty);
-
-            vm.childDepth = parseInt(vm.depth) + 1;
-
-            if(vm.layoutEntry.$block.config.areaGridColumns) {
-                vm.areaGridColumns = vm.layoutEntry.$block.config.areaGridColumns.toString();
-            } else {
-                vm.areaGridColumns = vm.blockEditorApi.internal.gridColumns.toString();
-            }
-
-            vm.layoutColumnsInt = parseInt(vm.layoutColumns, 10);
-
-            vm.relevantColumnSpanOptions = vm.layoutEntry.$block.config.columnSpanOptions ? vm.layoutEntry.$block.config.columnSpanOptions.filter(x => x.columnSpan <= vm.layoutColumnsInt).sort((a,b) => (a.columnSpan > b.columnSpan) ? 1 : ((b.columnSpan > a.columnSpan) ? -1 : 0)) : [];
-            const hasRelevantColumnSpanOptions = vm.relevantColumnSpanOptions.length > 1;
-            const hasRowSpanOptions = vm.layoutEntry.$block.config.rowMinSpan && vm.layoutEntry.$block.config.rowMaxSpan && vm.layoutEntry.$block.config.rowMaxSpan !== vm.layoutEntry.$block.config.rowMinSpan;
-            vm.canScale = (hasRelevantColumnSpanOptions || hasRowSpanOptions);
-            
-            unsubscribe.push(vm.layoutEntry.$block.__scope.$watch(() => vm.layoutEntry.$block.index, visualUpdateCallback));
-            unsubscribe.push($scope.$on("blockGridEditorVisualUpdate", (evt, data) => {if(data.areaKey === vm.areaKey) { visualUpdateCallback()}}));
-
-            updateInlineCreateTimeout = $timeout(updateInlineCreate, 500);
-
-            $scope.$evalAsync();
-        }
-        unsubscribe.push($scope.$watch("depth", () => {
-            vm.childDepth = parseInt(vm.depth) + 1;
-        }));
-
-        function visualUpdateCallback() {
-            cancelAnimationFrame(updateInlineCreateRaf);
-            updateInlineCreateRaf = requestAnimationFrame(updateInlineCreate);
-        }
-        
-        /**
-         * We want to only show the validation errors on the specific Block, not the parent blocks.
-         * So we need to avoid having a Block as the parent to the Block Form.
-         * Therefor we skip any parent blocks forms, and sets the parent form to the property editor.
-         */
-        vm.$postLink = function() {
-            // If parent form is not the property editor form, then its another Block Forms and we will change it.
-            if(vm.blockForm.$$parentForm !== vm.propertyEditorForm) {
-                // Remove from parent block:
-                vm.blockForm.$$parentForm.$removeControl(vm.blockForm);
-                // Connect with property editor form:
-                vm.propertyEditorForm.$addControl(vm.blockForm);
-            }
-        }
-        vm.mouseOverArea = function(area) {
-            if(area.items.length > 0) {
-                vm.isHoveringArea = true;
-            }
-        }
-        vm.mouseLeaveArea = function() {
-            vm.isHoveringArea = false;
-        }
-
-        // Block sizing functionality:
-        let layoutContainer = null;
-        let gridColumns = null;
-        let columnGap = 0;
-        let rowGap = 0;
-        let gridRows = null;
-        let lockedGridRows = 0;
-        let scaleBoxBackdropEl = null;
-        let raf = null;
-
-        function getNewSpans(startX, startY, endX, endY) {
-
-            const blockStartCol = Math.round(getInterpolatedIndexOfPositionInWeightMap(startX, gridColumns));
-            const blockStartRow = Math.round(getInterpolatedIndexOfPositionInWeightMap(startY, gridRows));
-            const blockEndCol = getInterpolatedIndexOfPositionInWeightMap(endX, gridColumns);
-            const blockEndRow = getInterpolatedIndexOfPositionInWeightMap(endY, gridRows);
-
-            let newColumnSpan = Math.max(blockEndCol-blockStartCol, 1);
-
-            // Find nearest allowed Column:
-            const bestColumnSpanOption = closestColumnSpanOption(newColumnSpan , vm.relevantColumnSpanOptions, vm.layoutColumnsInt - blockStartCol)
-            newColumnSpan = bestColumnSpanOption ? bestColumnSpanOption.columnSpan : vm.layoutColumnsInt;
-
-            let newRowSpan = Math.round(Math.max(blockEndRow-blockStartRow, vm.layoutEntry.$block.config.rowMinSpan || 1));
-            if(vm.layoutEntry.$block.config.rowMaxSpan != null) {
-                newRowSpan = Math.min(newRowSpan, vm.layoutEntry.$block.config.rowMaxSpan);
-            }
-
-            return {'columnSpan': newColumnSpan, 'rowSpan': newRowSpan, 'startCol': blockStartCol, 'startRow': blockStartRow};
-        }
-
-        function updateGridLayoutData(layoutContainerRect, layoutItemRect, updateRowTemplate) {
-
-            const computedStyles = window.getComputedStyle(layoutContainer);
-
-
-            columnGap = Number(computedStyles.columnGap.split("px")[0]) || 0;
-            rowGap = Number(computedStyles.rowGap.split("px")[0]) || 0;
-
-            gridColumns = computedStyles.gridTemplateColumns.trim().split("px").map(x => Number(x));
-            gridRows = computedStyles.gridTemplateRows.trim().split("px").map(x => Number(x));
-
-            // remove empties:
-            gridColumns = gridColumns.filter(n => n > 0);
-            gridRows = gridRows.filter(n => n > 0);
-
-            // We use this code to lock the templateRows, while scaling. otherwise scaling Rows is too crazy.
-            if(updateRowTemplate || gridRows.length > lockedGridRows) {
-                lockedGridRows = gridRows.length;
-                layoutContainer.style.gridTemplateRows = computedStyles.gridTemplateRows;
-            }
-
-            // add gaps:
-            const gridColumnsLen = gridColumns.length;
-            gridColumns = gridColumns.map((n, i) => gridColumnsLen === i ? n : n + columnGap);
-            const gridRowsLen = gridRows.length;
-            gridRows = gridRows.map((n, i) => gridRowsLen === i ? n : n + rowGap);
-
-            // ensure all columns are there.
-            // This will also ensure handling non-css-grid mode,
-            // use container width divided by amount of columns( or the item width divided by its amount of columnSpan)
-            let amountOfColumnsInWeightMap = gridColumns.length;
-            let gridColumnNumber = parseInt(computedStyles.getPropertyValue('--umb-block-grid--grid-columns'));
-            const amountOfUnknownColumns = gridColumnNumber-amountOfColumnsInWeightMap;
-            if(amountOfUnknownColumns > 0) {
-                let accumulatedValue = getAccumulatedValueOfIndex(amountOfColumnsInWeightMap, gridColumns) || 0;
-                const layoutWidth = layoutContainerRect.width;
-                const missingColumnWidth = (layoutWidth-accumulatedValue)/amountOfUnknownColumns;
-                while(amountOfColumnsInWeightMap++ < gridColumnNumber) {
-                    gridColumns.push(missingColumnWidth);
-                }
-            }
-
-
-            // Handle non css grid mode for Rows:
-            // use item height divided by rowSpan to identify row heights.
-            if(gridRows.length === 0) {
-                // Push its own height twice, to give something to scale with.
-                gridRows.push(layoutItemRect.top - layoutContainerRect.top);
-
-                let i = 0;
-                const itemSingleRowHeight = layoutItemRect.height;
-                while(i++ < vm.layoutEntry.rowSpan) {
-                    gridRows.push(itemSingleRowHeight);
-                }
-            }
-
-            // add a few extra rows, so there is something to extend too.
-            // Add extra options for the ability to extend beyond current content:
-            gridRows.push(50);
-            gridRows.push(50);
-            gridRows.push(50);
-            gridRows.push(50);
-            gridRows.push(50);
-        }
-
-        vm.scaleHandlerMouseDown = function($event) {
-            $event.originalEvent.preventDefault();
-            
-            layoutContainer = $element[0].closest('.umb-block-grid__layout-container');
-            if(!layoutContainer) {
-                console.error($element[0], 'could not find parent layout-container');
-                return;
-            }
-
-            vm.isScaleMode = true;
-            
-            window.addEventListener('mousemove', vm.onMouseMove);
-            window.addEventListener('mouseup', vm.onMouseUp);
-            window.addEventListener('mouseleave', vm.onMouseUp);
-
-            const layoutContainerRect = layoutContainer.getBoundingClientRect();
-            const layoutItemRect = $element[0].getBoundingClientRect();
-            updateGridLayoutData(layoutContainerRect, layoutItemRect, true);
-
-            
-            scaleBoxBackdropEl = document.createElement('div');
-            scaleBoxBackdropEl.className = 'umb-block-grid__scalebox-backdrop';
-            layoutContainer.appendChild(scaleBoxBackdropEl);
-
-        }
-        vm.onMouseMove = function(e) {
-
-            const layoutContainerRect = layoutContainer.getBoundingClientRect();
-            const layoutItemRect = $element[0].getBoundingClientRect();
-
-
-            const startX = layoutItemRect.left - layoutContainerRect.left;
-            const startY = layoutItemRect.top - layoutContainerRect.top;
-            const endX = e.clientX  - layoutContainerRect.left;
-            const endY = e.clientY - layoutContainerRect.top;
-
-            const newSpans = getNewSpans(startX, startY, endX, endY);
-
-            const updateRowTemplate = vm.layoutEntry.columnSpan !== newSpans.columnSpan;
-
-            if(updateRowTemplate) {
-                // If we like to update we need to first remove the lock, make the browser render onces and then update.
-                layoutContainer.style.gridTemplateRows = "";
-            }
-            cancelAnimationFrame(raf);
-            raf = requestAnimationFrame(() => {
-                // As mentioned above we need to wait until the browser has rendered DOM without the lock of gridTemplateRows.
-                updateGridLayoutData(layoutContainerRect, layoutItemRect, updateRowTemplate);
-            })
-
-            // update as we go:
-            vm.layoutEntry.columnSpan = newSpans.columnSpan;
-            vm.layoutEntry.rowSpan = newSpans.rowSpan;
-
-            $scope.$evalAsync();
-        }
-
-        vm.onMouseUp = function(e) {
-
-            cancelAnimationFrame(raf);
-
-            // Remove listeners:
-            window.removeEventListener('mousemove', vm.onMouseMove);
-            window.removeEventListener('mouseup', vm.onMouseUp);
-            window.removeEventListener('mouseleave', vm.onMouseUp);
-
-
-            const layoutContainerRect = layoutContainer.getBoundingClientRect();
-            const layoutItemRect = $element[0].getBoundingClientRect();
-
-            const startX = layoutItemRect.left - layoutContainerRect.left;
-            const startY = layoutItemRect.top - layoutContainerRect.top;
-            const endX = e.clientX  - layoutContainerRect.left;
-            const endY = e.clientY - layoutContainerRect.top;
-
-            const newSpans = getNewSpans(startX, startY, endX, endY);
-
-
-            // release the lock of gridTemplateRows:
-            layoutContainer.removeChild(scaleBoxBackdropEl);
-            layoutContainer.style.gridTemplateRows = "";
-            vm.isScaleMode = false;
-
-            // Clean up variables:
-            layoutContainer = null;
-            gridColumns = null;
-            gridRows = null;
-            lockedGridRows = 0;
-            scaleBoxBackdropEl = null;
- 
-            // Update block size:
-            vm.layoutEntry.columnSpan = newSpans.columnSpan;
-            vm.layoutEntry.rowSpan = newSpans.rowSpan;
-
-            vm.umbBlockGridEntries.notifyVisualUpdate();
-            vm.blockEditorApi.internal.setDirty();
-            $scope.$evalAsync();
-        }
-
-
-
-        vm.scaleHandlerKeyUp = function($event) {
-
-            
-            let addColIndex = 0;
-            let addRow = 0;
-
-            switch ($event.originalEvent.key) {
-                case 'ArrowUp':
-                    addRow = -1;
-                    break;
-                case 'ArrowDown':
-                    addRow = 1;
-                    break;
-                case 'ArrowLeft':
-                    addColIndex = -1;
-                    break;
-                case 'ArrowRight':
-                    addColIndex = 1;
-                    break;
-            }
-
-            if(addColIndex !== 0) {
-                if (vm.relevantColumnSpanOptions.length > 0) {
-                    const sortOptions = vm.relevantColumnSpanOptions;
-                    const currentColIndex = sortOptions.findIndex(x => x.columnSpan === vm.layoutEntry.columnSpan);
-                    const newColIndex = Math.min(Math.max(currentColIndex + addColIndex, 0), sortOptions.length-1);
-                    vm.layoutEntry.columnSpan = sortOptions[newColIndex].columnSpan;
-                } else {
-                    vm.layoutEntry.columnSpan = vm.layoutColumnsInt;
-                }
-            }
-            let newRowSpan = Math.max(vm.layoutEntry.rowSpan + addRow, vm.layoutEntry.$block.config.rowMinSpan || 1);
-            if(vm.layoutEntry.$block.config.rowMaxSpan != null) {
-                newRowSpan = Math.min(newRowSpan, vm.layoutEntry.$block.config.rowMaxSpan);
-            }
-            vm.layoutEntry.rowSpan = newRowSpan;
-
-            vm.umbBlockGridEntries.notifyVisualUpdate();
-            vm.blockEditorApi.internal.setDirty();
-            $event.originalEvent.stopPropagation();
-        }
-
-
-        vm.clickInlineCreateAbove = function($event) {
-            if(vm.hideInlineCreateAbove === false) {
-                vm.blockEditorApi.requestShowCreate(vm.parentBlock, vm.areaKey, vm.index, $event);
-            }
-        }
-        vm.clickInlineCreateAfter = function($event) {
-            if(vm.hideInlineCreateAfter === false) {
-                vm.blockEditorApi.requestShowCreate(vm.parentBlock, vm.areaKey, vm.index+1, $event, {'fitInRow': true});
-            }
-        }
-        vm.mouseOverInlineCreate = function() {
-            vm.blockEditorApi.internal.showAreaHighlight(vm.parentBlock, vm.areaKey);
-        }
-        vm.mouseOutInlineCreate = function() {
-            vm.blockEditorApi.internal.hideAreaHighlight(vm.parentBlock, vm.areaKey);
-        }
-        
-        function updateInlineCreate() {
-            layoutContainer = $element[0].closest('.umb-block-grid__layout-container');
-            if(!layoutContainer) {
-                return;
-            }
-
-            const layoutContainerRect = layoutContainer.getBoundingClientRect();
-            const layoutItemRect = $element[0].getBoundingClientRect();
-
-            if(layoutContainerRect.width === 0) {
-                $timeout.cancel(updateInlineCreateTimeout);
-                vm.hideInlineCreateAbove = true;
-                vm.hideInlineCreateAfter = true;
-                vm.inlineCreateAboveWidth = "";
-                $scope.$evalAsync();
-                updateInlineCreateTimeout = $timeout(updateInlineCreate, 500);
-                return;
-            }
-
-            if(layoutItemRect.right > layoutContainerRect.right - 5) {
-                vm.hideInlineCreateAfter = true;
-            } else {
-                vm.hideInlineCreateAfter = false;
-            }
-
-            if(layoutItemRect.left > layoutContainerRect.left + 5) {
-                vm.hideInlineCreateAbove = true;
-                vm.inlineCreateAboveWidth = "";
-            } else {
-                vm.inlineCreateAboveWidth = getComputedStyle(layoutContainer).width;
-                vm.hideInlineCreateAbove = false;
-            }
-            $scope.$evalAsync();
-        }
-
-        $scope.$on("$destroy", function () {
-
-            $timeout.cancel(updateInlineCreateTimeout);
-
-            $element[0].removeEventListener("UmbBlockGrid_AppendProperty", vm.onAppendProxyProperty);
-            $element[0].removeEventListener("UmbBlockGrid_RemoveProperty", vm.onRemoveProxyProperty);
-
-            for (const subscription of unsubscribe) {
-                subscription();
-            }
-        });
-
-    }   
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridrenderareaslots.directive.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridrenderareaslots.directive.js
deleted file mode 100644
index 43837e9c5c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridrenderareaslots.directive.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function () {
-    'use strict';
-
-    function UmbBlockGridRenderAreaSlots() {
-
-
-        var directive = {
-            restrict: 'E',
-            replace: true,
-            templateUrl: 'views/propertyeditors/blockgrid/umb-block-grid-render-area-slots.html',
-            scope: false
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbBlockGridRenderAreaSlots', UmbBlockGridRenderAreaSlots);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridroot.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridroot.component.js
deleted file mode 100644
index bfa0746a30..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridroot.component.js
+++ /dev/null
@@ -1,66 +0,0 @@
-(function () {
-    "use strict";
-
-    /**
-     * @ngdoc directive
-     * @name umbraco.directives.directive:umbBlockGridRoot
-     * @description
-     * The component to render the view for a block grid in the Property Editor.
-     * Creates a ShadowDom for the layout.
-     */
-
-    angular
-        .module("umbraco")
-        .component("umbBlockGridRoot", {
-            controller: umbBlockGridRootController,
-            controllerAs: "vm",
-            bindings: {
-                gridColumns: "@",
-                createLabel: "@",
-                stylesheet: "@",
-                blockEditorApi: "<",
-                propertyEditorForm: "<?",
-                entries: "<",
-                loading: "<"
-            }
-        }
-    );
-
-    function umbBlockGridRootController($scope, $compile, $element) {
-        var vm = this;
-
-        vm.$onInit = function () {
-            
-            var shadowRoot = $element[0].attachShadow({ mode: 'open' });
-            shadowRoot.innerHTML = 
-            `
-                <style>
-                    {{vm.stylesheet ? "@import '" + vm.stylesheet + "?umb__rnd=${Umbraco.Sys.ServerVariables.application.cacheBuster}';" : ""}}
-                    @import 'assets/css/blockgridui.css?umb__rnd=${Umbraco.Sys.ServerVariables.application.cacheBuster}';
-                    :host {
-                        --umb-block-grid--grid-columns: ${vm.gridColumns};
-                    }
-                </style>
-                <div 
-                    ng-if="vm.loading !== true"
-                    class="umb-block-grid"
-                    ng-class="{'show-validation': vm.blockEditorApi.internal.showValidation}"
-                    data-grid-columns="${vm.gridColumns}"
-                >
-                    <umb-block-grid-entries
-                        block-editor-api="vm.blockEditorApi"
-                        entries="vm.entries"
-                        layout-columns="vm.gridColumns"
-                        property-editor-form="vm.propertyEditorForm"
-                        depth="0"
-                        create-label="{{::vm.createLabel}}">
-                    </umb-block-grid-entries>
-                </div>
-            `;
-            $compile(shadowRoot)($scope);
-            
-        };
-    }
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridsortable.directive.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridsortable.directive.js
deleted file mode 100644
index cfcab3b9be..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridsortable.directive.js
+++ /dev/null
@@ -1,717 +0,0 @@
-(function () {
-    'use strict';
-
-    function isWithinRect(x, y, rect, modifier) {
-        return (x > rect.left - modifier && x < rect.right + modifier && y > rect.top - modifier && y < rect.bottom + modifier);
-    }
-
-
-    function getParentScrollElement(el, includeSelf) {
-        // skip to window
-        if (!el || !el.getBoundingClientRect) return null;
-        var elem = el;
-        var gotSelf = false;
-    
-        while(elem) {
-            
-            // we don't need to get elem css if it isn't even overflowing in the first place (performance)
-            if (elem.clientWidth < elem.scrollWidth || elem.clientHeight < elem.scrollHeight) {
-                var elemCSS = getComputedStyle(elem);
-
-                if (
-                    elem.clientHeight < elem.scrollHeight && (elemCSS.overflowY == 'auto' || elemCSS.overflowY == 'scroll')
-                    ||
-                    elem.clientWidth < elem.scrollWidth && (elemCSS.overflowX == 'auto' || elemCSS.overflowX == 'scroll')
-                ) {
-                    if (!elem.getBoundingClientRect || elem === document.body) return null;
-                    if (gotSelf || includeSelf) return elem;
-                    gotSelf = true;
-                }
-            }
-
-            if(elem.parentNode === document) {
-                return null;
-            } else if(elem.parentNode instanceof DocumentFragment) {
-                elem = elem.parentNode.host;
-            } else {
-                elem = elem.parentNode;
-            }
-        }
-    
-        return null;
-    }
- 
-
-
-
-    const DefaultConfig = {
-        compareElementToModel: (el, modelEntry) => modelEntry.contentUdi === el.dataset.elementUdi,
-        querySelectModelToElement: (container, modelEntry) => container.querySelector(`[data-element-udi='${modelEntry.contentUdi}']`),
-        identifier: "UmbBlockGridSorter",
-        containerSelector: "ol", // To find container and to connect with others.
-        ignorerSelector: "a, img, iframe",
-        itemSelector: "li",
-        placeholderClass: "umb-drag-placeholder"
-    }
-
-
-
-    function UmbBlockGridSorter() {
-        
-        function link(scope, element) {
-
-
-            let observer = new MutationObserver(function(mutations) {
-                mutations.forEach(function(mutation) {
-                    mutation.addedNodes.forEach(function(addedNode) {
-                        if (addedNode.matches && addedNode.matches(scope.config.itemSelector)) {
-                            setupItem(addedNode);
-                        }
-                    });
-                    mutation.removedNodes.forEach(function(removedNode) {
-                        if (removedNode.matches && removedNode.matches(scope.config.itemSelector)) {
-                            destroyItem(removedNode);
-                        }
-                    });
-                });
-            });
-
-
-            let vm = {};
-
-            const config = {...DefaultConfig, ...scope.config};
-
-            vm.identifier = config.identifier;
-            vm.ownerVM = config.ownerVM || null;
-
-            let scrollElement = null;
-
-            let containerEl = config.containerSelector ? element[0].closest(config.containerSelector) : element[0];
-            if (!containerEl) {
-                console.error("Could not initialize umb block grid sorter.", element[0])
-                return;
-            }
-
-            
-
-            function init() {
-
-                containerEl['umbBlockGridSorter:vm'] = () => {
-                    return vm;
-                };
-                containerEl.addEventListener('dragover', preventDragOver);
-
-                observer.observe(containerEl, {childList: true, subtree: false});
-            }
-            init();
-
-            function preventDragOver(e) {
-                e.preventDefault()
-            }
-
-            function setupItem(element) {
-
-                setupIgnorerElements(element);
-
-                element.draggable = true;
-                element.addEventListener('dragstart', handleDragStart);
-            }
-
-            function destroyItem(element) {
-
-                destroyIgnorerElements(element);
-
-                element.removeEventListener('dragstart', handleDragStart);
-            }
-
-            function setupIgnorerElements(element) {
-                config.ignorerSelector.split(',').forEach(function (criteria) {
-                    element.querySelectorAll(criteria.trim()).forEach(setupPreventEvent);
-                });
-            }
-            function destroyIgnorerElements(element) {
-                config.ignorerSelector.split(',').forEach(function (criteria) {
-                    element.querySelectorAll(criteria.trim()).forEach(destroyPreventEvent);
-                });
-            }
-            function setupPreventEvent(element) {
-                element.draggable = false
-            }
-            function destroyPreventEvent(element) {
-                element.removeAttribute('draggable');
-            }
-
-
-
-
-
-            let currentContainerElement = containerEl;
-            let currentContainerVM = vm;
-
-            let rqaId = null;
-            let currentItem = null;
-            let currentElement = null;
-            let currentDragElement = null;
-            let currentDragRect = null;
-            let dragX = 0;
-            let dragY = 0;
-
-            function handleDragStart(event) {
-
-                if(currentElement) {
-                    handleDragEnd();
-                }
-
-                event.stopPropagation();
-                event.dataTransfer.effectAllowed = "move";// copyMove when we enhance the drag with clipboard data.
-                event.dataTransfer.dropEffect = "none";// visual feedback when dropped.
-                
-                if(!scrollElement) {
-                    scrollElement = getParentScrollElement(containerEl, true);
-                }
-                
-                const element = event.target.closest(config.itemSelector);
-                
-                currentElement = element;
-                currentDragElement = config.draggableSelector ? currentElement.querySelector(config.draggableSelector) : currentElement;
-                currentDragRect = currentDragElement.getBoundingClientRect();
-                currentItem = vm.getItemOfElement(currentElement);
-                if(!currentItem) {
-                    console.error("Could not find item related to this element.");
-                    return;
-                }
-
-                currentElement.style.transform = 'translateZ(0)';// Solves problem with FireFox and ShadowDom in the drag-image.
-                
-                if (config.dataTransferResolver) {
-                    config.dataTransferResolver(event.dataTransfer, currentItem);
-                }
-
-                if (config.onStart) {
-                    config.onStart({item: currentItem, element: currentElement});
-                }
-
-                window.addEventListener('dragover', handleDragMove);
-                window.addEventListener('dragend', handleDragEnd);
-
-                // We must wait one frame before changing the look of the block.
-                rqaId = requestAnimationFrame(() => {// It should be okay to use the same refId, as the move does not or is okay not to happen on first frame/drag-move.
-                    rqaId = null;
-                    currentElement.style.transform = '';
-                    currentElement.classList.add(config.placeholderClass);
-                });
-                
-            }
-            
-            function handleDragEnd() {
-
-                if(!currentElement) {
-                    return;
-                }
-
-                window.removeEventListener('dragover', handleDragMove);
-                window.removeEventListener('dragend', handleDragEnd);
-                currentElement.style.transform = '';
-                currentElement.classList.remove(config.placeholderClass);
-
-                stopAutoScroll();
-                removeAllowIndication();
-
-                if(currentContainerVM.sync(currentElement, vm) === false) {
-                    // Sync could not succeed, might be because item is not allowed here.
-
-                    currentContainerVM = vm;
-                    if (config.onContainerChange) {
-                        config.onContainerChange({item: currentItem, element: currentElement, ownerVM: currentContainerVM.ownerVM});
-                    }
-
-                    // Lets move the Element back to where it came from:
-                    const movingItemIndex = scope.model.indexOf(currentItem);
-                    if(movingItemIndex < scope.model.length-1) {
-                        const afterItem = scope.model[movingItemIndex+1];
-                        const afterEl = config.querySelectModelToElement(containerEl, afterItem);
-                        containerEl.insertBefore(currentElement, afterEl);
-                    } else {
-                        containerEl.appendChild(currentElement);
-                    }
-
-                }
-
-                if (config.onEnd) {
-                    config.onEnd({item: currentItem, element: currentElement});
-                }
-
-                if(rqaId) {
-                    cancelAnimationFrame(rqaId);
-                }
-
-                currentContainerElement = containerEl;
-                currentContainerVM = vm;
-
-                rqaId = null
-                currentItem = null;
-                currentElement = null;
-                currentDragElement = null;
-                currentDragRect = null;
-                dragX = 0;
-                dragY = 0;
-                
-            }
-
-            function handleDragMove(event) {
-
-                if(!currentElement) {
-                    return;
-                }
-
-                const clientX = (event.touches ? event.touches[0] : event).clientX;
-                const clientY = (event.touches ? event.touches[1] : event).clientY;
-                if(clientX !== 0 && clientY !== 0) {
-
-
-                    if(dragX === clientX && dragY === clientY) {
-                        return;
-                    }
-                    dragX = clientX;
-                    dragY = clientY;
-
-                    handleAutoScroll(dragX, dragY);
-                    
-                    currentDragRect = currentDragElement.getBoundingClientRect();
-                    const insideCurrentRect = isWithinRect(dragX, dragY, currentDragRect, 0);
-                    if (!insideCurrentRect) {
-                        if(rqaId === null) {
-                            rqaId = requestAnimationFrame(moveCurrentElement);
-                        }
-                    }
-                }
-            }
-
-            
-
-            function moveCurrentElement() {
-
-                rqaId = null;
-                if(!currentElement) {
-                    return;
-                }
-                
-                const currentElementRect = currentElement.getBoundingClientRect();
-                const insideCurrentRect = isWithinRect(dragX, dragY, currentElementRect);
-                if (insideCurrentRect) {
-                    return;
-                }
-
-                // If we have a boundarySelector, try it, if we didn't get anything fall back to currentContainerElement.
-                var currentBoundaryElement = (config.boundarySelector ? currentContainerElement.closest(config.boundarySelector) : currentContainerElement) || currentContainerElement;
-
-                var currentBoundaryRect = currentBoundaryElement.getBoundingClientRect();
-                
-                const currentContainerHasItems = currentContainerVM.hasOtherItemsThan(currentItem);
-
-                // if empty we will be move likely to accept an item (add 20px to the bounding box)
-                // If we have items we must be 10 within the container to accept the move.
-                const offsetEdge = currentContainerHasItems ? -10 : 20;
-                if(!isWithinRect(dragX, dragY, currentBoundaryRect, offsetEdge)) {
-                    // we are outside the current container boundary, so lets see if there is a parent we can move.
-                    var parentContainer = currentContainerElement.parentNode.closest(config.containerSelector);
-                    if(parentContainer) {
-                        const parentContainerVM = parentContainer['umbBlockGridSorter:vm']();
-                        if(parentContainerVM.identifier === vm.identifier) {
-                            currentContainerElement = parentContainer;
-                            currentContainerVM = parentContainerVM;
-                            if (config.onContainerChange) {
-                                config.onContainerChange({item: currentItem, element: currentElement, ownerVM: currentContainerVM.ownerVM});
-                            }
-                        }
-                    }
-                }
-
-
-
-               
-                // We want to retrieve the children of the container, every time to ensure we got the right order and index
-                const orderedContainerElements = Array.from(currentContainerElement.children);
-
-                var currentContainerRect = currentContainerElement.getBoundingClientRect();
-                
-
-                // gather elements on the same row.
-                let elementsInSameRow = [];
-                let placeholderIsInThisRow = false;
-                for (const el of orderedContainerElements) {
-                    const elRect = el.getBoundingClientRect();
-                    // gather elements on the same row.
-                    if(dragY >= elRect.top && dragY <= elRect.bottom) {
-
-                        const dragElement = config.draggableSelector ? el.querySelector(config.draggableSelector) : el;
-                        const dragElementRect = dragElement.getBoundingClientRect();
-                        if(el !== currentElement) {
-                            elementsInSameRow.push({el:el, dragRect:dragElementRect});
-                        } else {
-                            placeholderIsInThisRow = true;
-                        }
-                    }
-                }
-
-                let lastDistance = 99999;
-                let foundEl = null; 
-                let foundElDragRect = null;
-                let placeAfter = false;
-                elementsInSameRow.forEach( sameRow => {
-                    const centerX = (sameRow.dragRect.left + (sameRow.dragRect.width*.5));
-                    let distance = Math.abs(dragX - centerX);
-                    if(distance < lastDistance) {
-                        foundEl = sameRow.el;
-                        foundElDragRect = sameRow.dragRect;
-                        lastDistance = Math.abs(distance);
-                        placeAfter = dragX > centerX;
-                    }
-                });
-
-                // If we are on top or closest to our self, we should not do anything.
-                if (foundEl === currentElement) {
-                    return;
-                }
-
-                if (foundEl) {
-
-                    const isInsideFound = isWithinRect(dragX, dragY, foundElDragRect, 0);
-                    
-                    // If we are inside the found element, lets look for sub containers.
-                    // use the itemHasNestedContainersResolver, if not configured fallback to looking for the existence of a container via DOM.
-                    if (isInsideFound && 
-                        config.itemHasNestedContainersResolver ? config.itemHasNestedContainersResolver(foundEl) : foundEl.querySelector(config.containerSelector)) {
-                        
-                        // Find all sub containers:
-                        const subLayouts = foundEl.querySelectorAll(config.containerSelector);
-                        for (const subLayoutEl of subLayouts) {
-
-                            // Use boundary element or fallback to container element.
-                            var subBoundaryElement = (config.boundarySelector ? subLayoutEl.closest(config.boundarySelector) : subLayoutEl) || subLayoutEl;
-                            var subBoundaryRect = subBoundaryElement.getBoundingClientRect();
-
-                            const subContainerHasItems = subLayoutEl.querySelector(config.itemSelector+':not(.'+config.placeholderClass+')');
-                            // gather elements on the same row.
-                            const subOffsetEdge = subContainerHasItems ? -10 : 20;
-                            if(isWithinRect(dragX, dragY, subBoundaryRect, subOffsetEdge)) {
-                                
-                                var subVm = subLayoutEl['umbBlockGridSorter:vm']();
-                                if(subVm.identifier === vm.identifier) {
-                                    currentContainerElement = subLayoutEl;
-                                    currentContainerVM = subVm;
-                                    if (config.onContainerChange) {
-                                        config.onContainerChange({item: currentItem, element: currentElement, ownerVM: currentContainerVM.ownerVM});
-                                    }
-                                    moveCurrentElement();
-                                    return;
-                                }
-                            }
-                        }
-                    }
-                    
-                    
-                    // Indication if drop is good:
-                    if(updateAllowIndication(currentContainerVM, currentItem) === false) {
-                        return;
-                    }
-
-                    let verticalDirection = scope.config.resolveVerticalDirection ? scope.config.resolveVerticalDirection({
-                        containerElement: currentContainerElement,
-                        containerRect: currentContainerRect,
-                        item: currentItem,
-                        element: currentElement,
-                        elementRect: currentElementRect,
-                        relatedElement: foundEl,
-                        relatedRect: foundElDragRect,
-                        placeholderIsInThisRow: placeholderIsInThisRow,
-                        horizontalPlaceAfter: placeAfter
-                    }) : true;
-                    
-                    if (verticalDirection) {
-                        placeAfter = (dragY > foundElDragRect.top + (foundElDragRect.height*.5));
-                    }
-
-                    if(verticalDirection) {
-
-                        let el;
-                        if(placeAfter === false) {
-                            let lastLeft = foundElDragRect.left;
-                            elementsInSameRow.findIndex((x) => {
-                                if(x.dragRect.left < lastLeft) {
-                                    lastLeft = x.dragRect.left;
-                                    el = x.el; 
-                                }
-                            });
-                        } else {
-                            let lastRight = foundElDragRect.right;
-                            elementsInSameRow.findIndex((x) => {
-                                if(x.dragRect.right > lastRight) {
-                                    lastRight = x.dragRect.right;
-                                    el = x.el; 
-                                }
-                            });
-                        }
-                        if(el) {
-                            foundEl = el;
-                        }
-                    }
-
-                    const foundElIndex = orderedContainerElements.indexOf(foundEl);
-                    const placeAt = (placeAfter ? foundElIndex+1 : foundElIndex);
-
-                    move(orderedContainerElements, placeAt);
-
-                    return;
-                }
-                // We skipped the above part cause we are above or below container:
-
-                // Indication if drop is good:
-                if(updateAllowIndication(currentContainerVM, currentItem) === false) {
-                    return;
-                }
-                
-                if(dragY < currentContainerRect.top) {
-                    move(orderedContainerElements, 0);
-                } else if(dragY > currentContainerRect.bottom) {
-                    move(orderedContainerElements, -1);
-                }
-            }
-
-            function move(orderedContainerElements, newElIndex) {
-
-                newElIndex = newElIndex === -1 ? orderedContainerElements.length : newElIndex;
-                
-                const placeBeforeElement = orderedContainerElements[newElIndex];
-                if (placeBeforeElement) {
-                    // We do not need to move this, if the element to be placed before is it self.
-                    if(placeBeforeElement !== currentElement) {
-                        currentContainerElement.insertBefore(currentElement, placeBeforeElement);
-                    }
-                } else {
-                    currentContainerElement.appendChild(currentElement);
-                }
-
-                if(config.onChange) {
-                    config.onChange({element: currentElement, item: currentItem, ownerVM: currentContainerVM.ownerVM});
-                }
-            }
-
-
-            /** Removes an element from container and returns its items-data entry */
-            vm.getItemOfElement = function (element) {
-                if(!element) {
-                    return null;
-                }
-                return scope.model.find(entry => config.compareElementToModel(element, entry));
-            }
-            vm.removeItem = function (item) {
-                if(!item) {
-                    return null;
-                }
-                const oldIndex = scope.model.indexOf(item);
-                if(oldIndex !== -1) {
-                    return scope.model.splice(oldIndex, 1)[0];
-                }
-                return null;
-            }
-
-            vm.hasOtherItemsThan = function(item) {
-                return scope.model.filter(x => x !== item).length > 0;
-            }
-
-            vm.sync = function(element, fromVm) {
-
-                const movingItem = fromVm.getItemOfElement(element);
-                if(!movingItem) {
-                    console.error("Could not find item of sync item")
-                    return false;
-                }
-                if(vm.notifyRequestDrop({item: movingItem}) === false) {
-                    return false;
-                }
-                if(fromVm.removeItem(movingItem) === null) {
-                    console.error("Sync could not remove item")
-                    return false;
-                }
-
-                /** Find next element, to then find the index of that element in items-data, to use as a safe reference to where the item will go in our items-data.
-                 * This enables the container to contain various other elements and as well having these elements change while sorting is occurring.
-                 */
-
-                // find next valid element (This assumes the next element in DOM is presented in items-data, aka. only moving one item between each sync)
-                let nextEl;
-                let loopEl = element;
-                while((loopEl = loopEl.nextElementSibling)) {
-                    if(loopEl.matches && loopEl.matches(config.itemSelector)) {
-                        nextEl = loopEl;
-                        break;
-                    }
-                }
-
-                let newIndex = scope.model.length;
-                if(nextEl) {
-                    // We had a reference element, we want to get the index of it.
-                    // This is problem if a item is being moved forward?
-                    newIndex = scope.model.findIndex(entry => config.compareElementToModel(nextEl, entry));
-                }
-
-                scope.model.splice(newIndex, 0, movingItem);
-
-                const eventData = {item: movingItem, fromController:fromVm, toController:vm};
-                if(fromVm !== vm) {
-                    fromVm.notifySync(eventData);
-                }
-                vm.notifySync(eventData);
-
-                return true;
-            }
-
-            
-
-
-
-
-
-            var _lastIndicationContainerVM = null;
-            function updateAllowIndication(contextVM, item) {
-
-                // Remove old indication:
-                if(_lastIndicationContainerVM !== null && _lastIndicationContainerVM !== contextVM) {
-                    _lastIndicationContainerVM.notifyAllowed();
-                }
-                _lastIndicationContainerVM = contextVM;
-                
-                if(contextVM.notifyRequestDrop({item: item}) === true) {
-                    contextVM.notifyAllowed();
-                    return true;
-                }
-
-                contextVM.notifyDisallowed();// This block is not accepted to we will indicate that its not allowed.
-                return false;
-            }
-            function removeAllowIndication() {
-
-                // Remove old indication:
-                if(_lastIndicationContainerVM !== null) {
-                    _lastIndicationContainerVM.notifyAllowed();
-                }
-                _lastIndicationContainerVM = null;
-            }
-
-
-
-
-
-            let autoScrollRAF;
-            let autoScrollEl;
-            const autoScrollSensitivity = 50;
-            const autoScrollSpeed = 16;
-            let autoScrollX = 0;
-            let autoScrollY = 0;
-
-            function handleAutoScroll(clientX, clientY) {
-
-                let scrollRect = null;
-                if (scrollElement) {
-                    autoScrollEl = scrollElement;
-                    scrollRect = scrollElement.getBoundingClientRect();
-                } else {
-                    autoScrollEl = document.scrollingElement || document.documentElement;
-                    scrollRect = {top: 0,
-                        left: 0,
-                        bottom: window.innerHeight,
-                        right: window.innerWidth,
-                        height: window.innerHeight,
-                        width: window.innerWidth
-                    }
-                }
-
-                const scrollWidth = autoScrollEl.scrollWidth;
-                const scrollHeight = autoScrollEl.scrollHeight;
-                const canScrollX = scrollRect.width < scrollWidth;
-                const canScrollY = scrollRect.height < scrollHeight;
-                const scrollPosX = autoScrollEl.scrollLeft;
-                const scrollPosY = autoScrollEl.scrollTop;
-
-                cancelAnimationFrame(autoScrollRAF);
-
-                if(canScrollX || canScrollY) {
-
-                    autoScrollX = (Math.abs(scrollRect.right - clientX) <= autoScrollSensitivity && scrollPosX + scrollRect.width < scrollWidth) - (Math.abs(scrollRect.left - clientX) <= autoScrollSensitivity && !!scrollPosX);
-                    autoScrollY = (Math.abs(scrollRect.bottom - clientY) <= autoScrollSensitivity && scrollPosY + scrollRect.height < scrollHeight) - (Math.abs(scrollRect.top - clientY) <= autoScrollSensitivity && !!scrollPosY);
-                    autoScrollRAF = requestAnimationFrame(performAutoScroll);
-                }
-            }
-            function performAutoScroll() {
-                autoScrollEl.scrollLeft += autoScrollX * autoScrollSpeed;
-                autoScrollEl.scrollTop += autoScrollY * autoScrollSpeed;
-                autoScrollRAF = requestAnimationFrame(performAutoScroll);
-            }
-            function stopAutoScroll() {
-                cancelAnimationFrame(autoScrollRAF);
-                autoScrollRAF = null;
-            }
-
-
-
-
-            vm.notifySync = function(data) {
-                if(config.onSync) {
-                    config.onSync(data);
-                }
-            }
-            vm.notifyDisallowed = function() {
-                if(config.onDisallowed) {
-                    config.onDisallowed();
-                }
-            }
-            vm.notifyAllowed = function() {
-                if(config.onAllowed) {
-                    config.onAllowed();
-                }
-            }
-            vm.notifyRequestDrop = function(data) {
-                if(config.onRequestDrop) {
-                    return config.onRequestDrop(data);
-                }
-                return true;
-            }
-
-
-
-            scope.$on('$destroy', () => {
-
-                if(currentElement) {
-                    handleDragEnd()
-                }
-
-                _lastIndicationContainerVM = null;
-
-                containerEl['umbBlockGridSorter:vm'] = null
-                containerEl.removeEventListener('dragover', preventDragOver);
-
-                observer.disconnect();
-                observer = null;
-                containerEl = null;
-                scrollElement = null;
-                vm = null;
-            });
-        }
-
-        var directive = {
-            restrict: 'A',
-            scope: {
-                config: '=umbBlockGridSorter',
-                model: '=umbBlockGridSorterModel'
-            },
-            link: link
-        };
-
-        return directive;
-
-    }
-
-    angular.module('umbraco.directives').directive('umbBlockGridSorter', UmbBlockGridSorter);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout-flexbox.css b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout-flexbox.css
deleted file mode 100644
index 3f921c0470..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout-flexbox.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/** Example of how a grid layout stylehseet could be done with Flex box: */
-
-.umb-block-grid__layout-container {
-    position: relative;
-    display: flex;
-    flex-wrap: wrap;
-    gap: var(--umb-block-grid--row-gap, 0) var(--umb-block-grid--column-gap, 0);
-}
-.umb-block-grid__layout-item {
-    position: relative;
-    --umb-block-grid__layout-item-calc: calc(var(--umb-block-grid--item-column-span) / var(--umb-block-grid--grid-columns));
-    width: calc(var(--umb-block-grid__layout-item-calc) * 100% - (1 - var(--umb-block-grid__layout-item-calc)) * var(--umb-block-grid--column-gap, 0px));
-}
-
-
-.umb-block-grid__area-container, .umb-block-grid__block--view::part(area-container) {
-    position: relative;
-    display: flex;
-    flex-wrap: wrap;
-    width: 100%;
-    gap: var(--umb-block-grid--areas-row-gap, 0) var(--umb-block-grid--areas-column-gap, 0);
-}
-.umb-block-grid__area {
-    position: relative;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    --umb-block-grid__area-calc: calc(var(--umb-block-grid--area-column-span) / var(--umb-block-grid--area-grid-columns, 1));
-    width: calc(var(--umb-block-grid__area-calc) * 100% - (1 - var(--umb-block-grid__area-calc)) * var(--umb-block-grid--areas-column-gap, 0px));
-}
-
-
-.umb-block-grid__actions {
-    clear: both;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout.css b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout.css
deleted file mode 100644
index 8a4f567cac..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbraco-blockgridlayout.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.umb-block-grid__layout-container {
-    position: relative;
-    display: grid;
-    grid-template-columns: repeat(var(--umb-block-grid--grid-columns, 1), minmax(0, 1fr));
-    grid-auto-flow: row;
-    grid-auto-rows: minmax(50px, min-content);
-
-    column-gap: var(--umb-block-grid--column-gap, 0);
-    row-gap: var(--umb-block-grid--row-gap, 0);
-}
-.umb-block-grid__layout-item {
-    position: relative;
-    /* For small devices we scale columnSpan by three, to make everything bigger than 1/3 take full width: */
-    grid-column-end: span min(calc(var(--umb-block-grid--item-column-span, 1) * 3), var(--umb-block-grid--grid-columns));
-    grid-row: span var(--umb-block-grid--item-row-span, 1);
-}
-
-
-.umb-block-grid__area-container, .umb-block-grid__block--view::part(area-container) {
-    position: relative;
-    display: grid;
-    grid-template-columns: repeat(var(--umb-block-grid--area-grid-columns, var(--umb-block-grid--grid-columns, 1)), minmax(0, 1fr));
-    grid-auto-flow: row;
-    grid-auto-rows: minmax(50px, min-content);
-
-    column-gap: var(--umb-block-grid--areas-column-gap, 0);
-    row-gap: var(--umb-block-grid--areas-row-gap, 0);
-}
-.umb-block-grid__area {
-    position: relative;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    /* For small devices we scale columnSpan by three, to make everything bigger than 1/3 take full width: */
-    grid-column-end: span min(calc(var(--umb-block-grid--area-column-span, 1) * 3), var(--umb-block-grid--area-grid-columns));
-    grid-row: span var(--umb-block-grid--area-row-span, 1);
-}
-
-@media (min-width:1024px) {
-    .umb-block-grid__layout-item {
-        grid-column-end: span min(var(--umb-block-grid--item-column-span, 1), var(--umb-block-grid--grid-columns));
-    }
-    .umb-block-grid__area {
-        grid-column-end: span min(var(--umb-block-grid--area-column-span, 1), var(--umb-block-grid--area-grid-columns));
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html
deleted file mode 100644
index 8f6042613d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<umb-block-list-property-editor 
-  model="model"
-  ng-attr-readonly="{{ readonly || undefined }}">
-</umb-block-list-property-editor>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js
deleted file mode 100644
index 06c1424838..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.controller.js
+++ /dev/null
@@ -1,27 +0,0 @@
-(function () {
-    'use strict';
-
-    function InlineBlockEditor($scope) {
-
-        const bc = this;
-
-        bc.openBlock = function(block) {
-
-            // if we are closing:
-            if (block.active === true) {
-                // boardcast the formSubmitting event to trigger syncronization or none-live property-editors
-                $scope.$broadcast("formSubmitting", { scope: $scope });
-                // Some property editors need to performe an action after all property editors have reacted to the formSubmitting.
-                $scope.$broadcast("formSubmittingFinalPhase", { scope: $scope });
-
-                block.active = false;
-            } else {
-                $scope.api.activateBlock(block);
-            }
-        }
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockEditor.InlineBlockEditor", InlineBlockEditor);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html
deleted file mode 100644
index 54210a522a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="blockelement-inlineblock-editor"
-        ng-controller="Umbraco.PropertyEditors.BlockEditor.InlineBlockEditor as vm"
-        ng-class="{ '--error': parentForm.$invalid && valFormManager.isShowingValidation() }">
-    <button type="button" class="btn-reset umb-outline blockelement__draggable-element"
-            ng-click="vm.openBlock(block)"
-            ng-focus="block.focus">
-        <span class="caret"></span>
-        <umb-icon icon="{{block.content.icon}}" class="icon"></umb-icon>
-        <span class="name">{{block.label}}</span>
-    </button>
-    <div class="blockelement-inlineblock-editor__inner" ng-class="{'--singleGroup':block.content.variants[0].tabs.length === 1}" ng-if="block.active === true">
-        <umb-element-editor-content model="block.content"></umb-element-editor-content>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less
deleted file mode 100644
index 4cf79ee044..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less
+++ /dev/null
@@ -1,177 +0,0 @@
-.blockelement-inlineblock-editor {
-    display: block;
-    margin-bottom: 4px;
-    margin-top: 4px;
-    border: 1px solid @gray-9;
-    border-radius: @baseBorderRadius;
-    transition: border-color 120ms, background-color 120ms;
-
-	.umb-box {
-		margin-bottom: 0;
-	}
-
-    .umb-block-list__block:not(.--active) &:hover {
-        border-color: @gray-8;
-    }
-
-    .umb-editor-tab-bar {
-        margin: 0;
-        position: static;
-        padding: 0;
-    }
-
-    > button {
-        width: 100%;
-        min-height: 48px;
-        cursor: pointer;
-        color: @ui-action-discreet-type;
-        text-align: left;
-        padding-left: 10px;
-        padding-bottom: 2px;
-        user-select: none;
-        background-color: white;
-
-        .caret {
-            vertical-align: middle;
-            transform: rotate(-90deg);
-            transition: transform 80ms ease-out;
-        }
-
-        .icon {
-            font-size: 1.1rem;
-            display: inline-block;
-            vertical-align: middle;
-        }
-
-        span.name {
-            position: relative;
-            display: inline-block;
-            vertical-align: middle;
-        }
-
-        &:hover {
-            color: @ui-action-discreet-type-hover;
-            border-color: @gray-8;
-        }
-    }
-
-    ng-form.ng-invalid-val-server-match-content > .umb-block-list__block > .umb-block-list__block--content > div > & {
-        > button {
-            color: @formErrorText;
-
-            .show-validation-type-warning & {
-                color: @formWarningText;
-            }
-
-            span.caret {
-                border-top-color: @formErrorText;
-
-                .show-validation-type-warning & {
-                    border-top-color: @formWarningText;
-                }
-            }
-        }
-    }
-
-    ng-form.ng-invalid-val-server-match-content > .umb-block-list__block:not(.--active) > .umb-block-list__block--content > div > & {
-        > button {
-            span.name {
-                &::after {
-                    content: "!";
-                    text-align: center;
-                    position: absolute;
-                    top: -6px;
-                    right: -15px;
-                    min-width: 10px;
-                    color: @white;
-                    background-color: @ui-active-type;
-                    border: 2px solid @white;
-                    border-radius: 50%;
-                    font-size: 10px;
-                    font-weight: bold;
-                    padding: 2px;
-                    line-height: 10px;
-                    background-color: @formErrorText;
-
-                    .show-validation-type-warning & {
-                        background-color: @formWarningText;
-                    }
-
-                    font-weight: 900;
-                    animation-duration: 1.4s;
-                    animation-iteration-count: infinite;
-                    animation-name: blockelement-inlineblock-editor--badge-bounce;
-                    animation-timing-function: ease;
-
-                    @keyframes blockelement-inlineblock-editor--badge-bounce {
-                        0% {
-                            transform: translateY(0);
-                        }
-
-                        20% {
-                            transform: translateY(-4px);
-                        }
-
-                        40% {
-                            transform: translateY(0);
-                        }
-
-                        55% {
-                            transform: translateY(-2px);
-                        }
-
-                        70% {
-                            transform: translateY(0);
-                        }
-
-                        100% {
-                            transform: translateY(0);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-.umb-block-list__block.--active {
-    border-color: @gray-8;
-    box-shadow: 0 0 2px 0px rgba(0, 0, 0, 0.05);
-
-    > .umb-block-list__block--content {
-        > .umb-block-list__block--view  {
-            > .blockelement-inlineblock-editor {
-                > button {
-                    > .caret {
-                        transform: rotate(0deg);
-                    }
-                }
-            }
-        }
-    }
-}
-
-.blockelement-inlineblock-editor__inner {
-    border-top: 1px solid @gray-8;
-    background-color: @gray-12;
-
-    > * > * > * > .umb-group-panel {
-        background-color: transparent;
-        box-shadow: none;
-        margin-top: 10px;
-        margin-bottom: 0;
-        > .umb-group-panel__content .umb-property {
-            margin-bottom: 20px;
-        }
-    }
-    .umb-group-panel + .umb-group-panel {
-        margin-top: 20px;
-    }
-    &.--singleGroup > * > * > * > .umb-group-panel {
-        margin-top: 0;
-        > .umb-group-panel__header {
-            display: none;
-        }
-    }
-    
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html
deleted file mode 100644
index 335b477928..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<button
-  type="button"
-  class="btn-reset umb-outline blockelement-labelblock-editor blockelement__draggable-element"
-  ng-click="block.edit()"
-  ng-focus="block.focus"
-  ng-class="{ '--active': block.active, '--error': parentForm.$invalid && valFormManager.isShowingValidation() }"
-  val-server-property-class=""
->
-  <umb-icon icon="{{block.content.icon}}" class="icon"></umb-icon>
-  <span>{{block.label}}</span>
-</button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less
deleted file mode 100644
index 8391923339..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.less
+++ /dev/null
@@ -1,87 +0,0 @@
-.blockelement-labelblock-editor {
-    position: relative;
-    display: flex;
-    align-items: center;
-    margin-bottom: 4px;
-    margin-top: 4px;
-    width: 100%;
-    min-height: 48px;
-    border: 1px solid @gray-9;
-    border-radius: @baseBorderRadius;
-    cursor: pointer;
-    color: @ui-action-discreet-type;
-    background-color: white;
-    text-align: left;
-    padding: 0 20px;
-    user-select: none;
-    transition: border-color 120ms, background-color 120ms;
-
-    > .icon {
-        font-size: 22px;
-        margin-right: 10px;
-        display: inline-block;
-    }
-
-    > span {
-        position: relative;
-        display: inline-block;
-        padding-top:2px;
-        padding-bottom:2px;
-    }
-
-    &:hover {
-        color: @ui-action-discreet-type-hover;
-        background-color: @ui-action-hover;
-    }
-
-    &.--active {
-        color: @ui-active-type;
-        border-color: @ui-active;
-        background-color: @ui-active;
-    }
-
-    ng-form.ng-invalid-val-server-match-content > .umb-block-list__block > .umb-block-list__block--content > div > & {
-        color: @formErrorText;
-        .show-validation-type-warning & {
-            color: @formWarningText;
-        }
-    }
-    ng-form.ng-invalid-val-server-match-content > .umb-block-list__block:not(.--active) > .umb-block-list__block--content > div > & {
-        > span {
-            &::after {
-                content: "!";
-                text-align: center;
-                position: absolute;
-                top: -6px;
-                right: -15px;
-                min-width: 10px;
-                color: @white;
-                background-color: @ui-active-type;
-                border: 2px solid @white;
-                border-radius: 50%;
-                font-size: 10px;
-                font-weight: bold;
-                padding: 2px;
-                line-height: 10px;
-                background-color: @formErrorText;
-                .show-validation-type-warning & {
-                    background-color: @formWarningText;
-                }
-                font-weight: 900;
-
-                animation-duration: 1.4s;
-                animation-iteration-count: infinite;
-                animation-name: blockelement-inlineblock-editor--badge-bounce;
-                animation-timing-function: ease;
-                @keyframes blockelement-inlineblock-editor--badge-bounce {
-                    0%   { transform: translateY(0); }
-                    20%  { transform: translateY(-4px); }
-                    40%  { transform: translateY(0); }
-                    55%  { transform: translateY(-2px); }
-                    70%  { transform: translateY(0); }
-                    100% { transform: translateY(0); }
-                }
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html
deleted file mode 100644
index 0c0d98105d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="blockelement-unsupportedblock-editor blockelement__draggable-element" ng-focus="block.focus">
-    <div class="__header">
-        <umb-icon icon="icon-alert" class="icon"></umb-icon>
-        <span>{{block.label}}</span>
-    </div>
-    <div class="__body">
-        This content is no longer supported in this context.<br/>
-        You might want to remove this block, or contact your developer to take actions for making this block available again.<br/><br/>
-        <!-- TODO: Add link when we have one 
-		    <a href="http://our.umbraco.com" target="_blank" rel="noopener">Learn more about this warning</a>
-		-->
-        <h5>Block data:</h5>
-        <umb-code-snippet language="'JSON'">{{block.data | json : 4 }}</umb-code-snippet>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.less
deleted file mode 100644
index 8b8fcef9e7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.less
+++ /dev/null
@@ -1,46 +0,0 @@
-.blockelement-unsupportedblock-editor {
-    position: relative;
-    display: block;
-    box-sizing: border-box;
-    margin-bottom: 4px;
-    margin-top: 4px;
-    width: 100%;
-    border: 1px solid @gray-9;
-    border-radius: @baseBorderRadius;
-
-    > .__header {
-        display: flex;
-        align-items: center;
-        padding-left: 20px;
-        padding-bottom: 2px;
-        min-height: 48px;
-        border-bottom: 1px solid @gray-9;    
-        background-color: @gray-11;
-        color: @gray-6;
-        
-        .icon {
-            font-size: 22px;
-            margin-right: 5px;
-            display: inline-block;
-            vertical-align: middle;
-        }
-        span {
-            display: inline-block;
-            vertical-align: middle;
-        }
-    }
-
-    > .__body {
-        padding: 20px;
-        background-color: @gray-11;
-
-        a {
-            text-decoration: underline;
-            color: @ui-action-type;
-
-            &:hover {
-                color: @ui-action-type-hover;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js
deleted file mode 100644
index 89e62e390d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.BlockList.BlockConfigurationController
- * @function
- *
- * @description
- * The controller for the content type editor property settings dialog
- */
-
-(function () {
-    "use strict";
-
-    function TransferProperties(fromObject, toObject) {
-        for (var p in fromObject) {
-            toObject[p] = fromObject[p];
-        }
-    }
-
-    function BlockConfigurationController($scope, elementTypeResource, overlayService, localizationService, editorService, eventsService, udiService) {
-
-        var unsubscribe = [];
-
-        const vm = this;
-        vm.openBlock = null;
-
-        function onInit() {
-
-            if (!$scope.model.value) {
-                $scope.model.value = [];
-            }
-
-            loadElementTypes();
-        }
-
-        function loadElementTypes() {
-            return elementTypeResource.getAll().then(elementTypes => {
-                vm.elementTypes = elementTypes;
-            });
-        }
-
-        function updateUsedElementTypes(event, args) {
-            var key = args.documentType.key;
-            for (var i = 0; i<vm.elementTypes.length; i++) {
-                if (vm.elementTypes[i].key === key) {
-                    vm.elementTypes[i] = args.documentType;
-                }
-            }
-        }
-
-        unsubscribe.push(eventsService.on("editors.documentType.saved", updateUsedElementTypes));
-
-        vm.requestRemoveBlockByIndex = function (index, event) {
-
-            const labelKeys = [
-              "general_delete",
-              "blockEditor_confirmDeleteBlockTypeMessage",
-              "blockEditor_confirmDeleteBlockTypeNotice"
-            ];
-
-            localizationService.localizeMany(labelKeys).then(data => {
-                var contentElementType = vm.getElementTypeByKey($scope.model.value[index].contentElementTypeKey);
-                overlayService.confirmDelete({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [contentElementType ? contentElementType.name : "(Unavailable ElementType)"]),
-                    confirmMessage: data[2],
-                    submit: () => {
-                        vm.removeBlockByIndex(index);
-                        overlayService.close();
-                    },
-                    close: overlayService.close()
-                });
-            });
-
-            event.stopPropagation();
-        };
-
-        vm.removeBlockByIndex = function (index) {
-            $scope.model.value.splice(index, 1);
-        };
-
-        vm.sortableOptions = {
-            "ui-floating": true,
-            items: "umb-block-card",
-            cursor: "grabbing",
-            placeholder: 'umb-block-card --sortable-placeholder'
-        };
-
-        vm.getAvailableElementTypes = function () {
-            return vm.elementTypes.filter(function (type) {
-                return !$scope.model.value.find(function (entry) {
-                    return type.key === entry.contentElementTypeKey;
-                });
-            });
-        };
-
-        vm.getElementTypeByKey = function(key) {
-            if (vm.elementTypes) {
-                return vm.elementTypes.find(type => type.key === key) || null;
-            }
-        };
-
-        vm.openAddDialog = function () {
-
-            localizationService.localize("blockEditor_headlineCreateBlock").then(localizedTitle => {
-
-                const dialog = {
-                    title: localizedTitle,
-                    entityType: "documentType",
-                    filter: function (node) {
-                        if (node.metaData.isElement === true) {
-                            var key = udiService.getKey(node.udi);
-                            
-                            // If a Block with this ElementType as content already exists, we will emit it as a posible option.
-                            return $scope.model.value.find(entry => entry.contentElementTypeKey === key);
-                        }
-                        return true;
-                    },
-                    filterCssClass: "not-allowed",
-                    select: function (node) {
-                        vm.addBlockFromElementTypeKey(udiService.getKey(node.udi));
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    },
-                    extraActions: [
-                        {
-                            style: "primary",
-                            labelKey: "blockEditor_labelcreateNewElementType",
-                            action: function () {
-                                vm.createElementTypeAndCallback((documentTypeKey) => {
-                                    vm.addBlockFromElementTypeKey(documentTypeKey);
-
-                                    // At this point we will close the contentTypePicker.
-                                    editorService.close();
-                                });
-                            }
-                        }
-                    ]
-                };
-                
-                editorService.contentTypePicker(dialog);
-            });
-        };
-
-        vm.createElementTypeAndCallback = function(callback) {
-            const editor = {
-                create: true,
-                infiniteMode: true,
-                noTemplate: true,
-                isElement: true,
-                submit: function (model) {
-                    loadElementTypes().then(() => {
-                        callback(model.documentTypeKey);
-                    });
-                    
-                    editorService.close();
-                },
-                close: function () {
-                    editorService.close();
-                }
-            };
-            editorService.documentTypeEditor(editor);
-        }
-
-        vm.addBlockFromElementTypeKey = function(key) {
-
-            const blockType = {
-                contentElementTypeKey: key,
-                settingsElementTypeKey: null,
-                labelTemplate: "",
-                view: null,
-                stylesheet: null,
-                editorSize: "medium",
-                iconColor: null,
-                backgroundColor: null,
-                thumbnail: null
-            };
-
-            $scope.model.value.push(blockType);
-
-            vm.openBlockOverlay(blockType);
-        };
-
-        vm.openBlockOverlay = function (block) {
-
-            var elementType = vm.getElementTypeByKey(block.contentElementTypeKey);
-
-            if (elementType) {
-                
-                let clonedBlockData = Utilities.copy(block);
-                vm.openBlock = block;
-
-                const overlayModel = {
-                    block: clonedBlockData,
-                      
-                    view: "views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html",
-                    size: "small",
-                    submit: function(overlayModel) {
-                        loadElementTypes()// lets load elementType again, to ensure we are up to date.
-                        TransferProperties(overlayModel.block, block);// transfer properties back to block object. (Doing this cause we dont know if block object is added to model jet, therefor we cant use index or replace the object.)
-                        overlayModel.close();
-                    },
-                    close: function() {
-                        editorService.close();
-                        vm.openBlock = null;
-                    }
-                };
-
-                localizationService.localize("blockEditor_blockConfigurationOverlayTitle", [elementType.name]).then(data => {
-                    overlayModel.title = data,
-                    
-                    // open property settings editor
-                    editorService.open(overlayModel);
-                });
-            } else {
-
-              const overlay = {
-                close: () => {
-                  overlayService.close()
-                }
-              };
-
-              localizationService.localize("blockEditor_elementTypeDoesNotExist").then(data => {
-                overlay.content = data;
-                overlayService.open(overlay);
-              });
-            }
-
-        };
-
-        $scope.$on('$destroy', function () {
-            unsubscribe.forEach(u => { u(); });
-        });
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockList.BlockConfigurationController", BlockConfigurationController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.html
deleted file mode 100644
index 1f4a696380..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="umb-block-list-block-configuration" ng-controller="Umbraco.PropertyEditors.BlockList.BlockConfigurationController as vm">
-
-    <div class="umb-block-card-grid" ui-sortable="vm.sortableOptions" ng-model="model.value">
-        
-        <umb-block-card
-            block-config-model="block"
-            element-type-model="vm.getElementTypeByKey(block.contentElementTypeKey)"
-            ng-repeat="block in model.value"
-            ng-class="{'--isOpen':vm.openBlock === block}"
-            ng-click="vm.openBlockOverlay(block)">
-            <div class="__actions" ng-click="$event.stopPropagation()" tabindex="-1">
-                <div>
-                    <button type="button" class="btn-reset __action umb-outline" ng-click="vm.requestRemoveBlockByIndex($index, $event)">
-                        <umb-icon icon="icon-trash" class="icon"></umb-icon>
-                        <localize key="general_delete" class="sr-only">Delete</localize>
-                    </button>
-                </div>
-            </div>
-        </umb-block-card>
-
-        <uui-button id="{{model.alias}}" look="{{model.value.length === 0 ? 'primary' : 'placeholder'}}" color="primary" ng-click="vm.openAddDialog($event)">
-          <localize key="blockEditor_addBlockType">Add Block</localize>
-        </uui-button>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less
deleted file mode 100644
index 9ceadc7a3a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less
+++ /dev/null
@@ -1,34 +0,0 @@
-.umb-block-list-block-configuration {
-
-    uui-button {
-      --uui-button-border-radius: 6px;
-      font-weight: 700;
-      min-height: 80px;
-    }
-
-    .__add-button {
-        position: relative;
-        display: inline-flex;
-        width: 100%;
-        height: 100%;
-        margin-right: 20px;
-        margin-bottom: 20px;
-
-        color: @ui-action-discreet-type;
-        border: 1px dashed @ui-action-discreet-border;
-        border-radius: @doubleBorderRadius;
-
-        align-items: center;
-        justify-content: center;
-
-        padding: 5px 15px;
-        box-sizing: border-box;
-        font-weight: bold;
-
-        &:hover {
-          color: @ui-action-discreet-type-hover;
-          border-color: @ui-action-discreet-border-hover;
-        }
-    }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js
deleted file mode 100644
index 0fdc251949..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js
+++ /dev/null
@@ -1,314 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.BlockList.BlockConfigurationOverlayController
- * @function
- *
- * @description
- * The controller for the content type editor property settings dialog
- */
-
-(function () {
-    "use strict";
-
-    function BlockConfigurationOverlayController($scope, overlayService, localizationService, editorService, elementTypeResource, eventsService, udiService, angularHelper) {
-
-        var unsubscribe = [];
-
-        var vm = this;
-        vm.block = $scope.model.block;
-
-        vm.colorPickerOptions = {
-            type: "color",
-            allowEmpty: true,
-            showAlpha: true
-        };
-
-        loadElementTypes();
-
-        function loadElementTypes() {
-            return elementTypeResource.getAll().then(function(elementTypes) {
-                vm.elementTypes = elementTypes;
-
-                vm.contentPreview = vm.getElementTypeByKey(vm.block.contentElementTypeKey);
-                vm.settingsPreview = vm.getElementTypeByKey(vm.block.settingsElementTypeKey);
-            });
-        }
-
-        vm.getElementTypeByKey = function(key) {
-            return vm.elementTypes.find(function (type) {
-                return type.key === key;
-            });
-        };
-
-        vm.openElementType = function(elementTypeKey) {
-            var elementType = vm.getElementTypeByKey(elementTypeKey);
-            if (elementType) {
-                var elementTypeId = elementType.id;
-                const editor = {
-                    id: elementTypeId,
-                    submit: function (model) {
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-                editorService.documentTypeEditor(editor);
-            }
-        };
-
-        vm.createElementTypeAndCallback = function(callback) {
-            const editor = {
-                create: true,
-                infiniteMode: true,
-                isElement: true,
-                noTemplate: true,
-                submit: function (model) {
-                    callback(model.documentTypeKey);
-                    editorService.close();
-                },
-                close: function () {
-                    editorService.close();
-                }
-            };
-            editorService.documentTypeEditor(editor);
-        };
-
-        vm.addSettingsForBlock = function($event, block) {
-
-            localizationService.localize("blockEditor_headlineAddSettingsElementType").then(localizedTitle => {
-
-                const settingsTypePicker = {
-                    title: localizedTitle,
-                    entityType: "documentType",
-                    isDialog: true,
-                    filter: node => {
-                        if (node.metaData.isElement === true) {
-                            return false;
-                        }
-                        return true;
-                    },
-                    filterCssClass: "not-allowed",
-                    select: node => {
-                        vm.applySettingsToBlock(block, udiService.getKey(node.udi));
-                        editorService.close();
-                    },
-                    close: () => editorService.close(),
-                    extraActions: [
-                        {
-                            style: "primary",
-                            labelKey: "blockEditor_labelcreateNewElementType",
-                            action: () => {
-                                vm.createElementTypeAndCallback((key) => {
-                                    vm.applySettingsToBlock(block, key);
-
-                                    // At this point we will close the contentTypePicker.
-                                    editorService.close();
-                                });
-                            }
-                        }
-                    ]
-                };
-
-                editorService.contentTypePicker(settingsTypePicker);
-
-            });
-        };
-
-        vm.applySettingsToBlock = function(block, key) {
-            block.settingsElementTypeKey = key;
-            vm.settingsPreview = vm.getElementTypeByKey(vm.block.settingsElementTypeKey);
-        };
-
-        vm.requestRemoveSettingsForBlock = function(block) {
-            localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
-
-                var settingsElementType = vm.getElementTypeByKey(block.settingsElementTypeKey);
-
-                overlayService.confirmRemove({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [(settingsElementType ? settingsElementType.name : "(Unavailable ElementType)")]),
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        vm.removeSettingsForBlock(block);
-                        overlayService.close();
-                    }
-                });
-            });
-        };
-
-        vm.removeSettingsForBlock = function(block) {
-            block.settingsElementTypeKey = null;
-        };
-
-        function updateUsedElementTypes(event, args) {
-            var key = args.documentType.key;
-            for (var i = 0; i<vm.elementTypes.length; i++) {
-                if (vm.elementTypes[i].key === key) {
-                    vm.elementTypes[i] = args.documentType;
-                }
-            }
-            if (vm.contentPreview && vm.contentPreview.key === key) {
-                vm.contentPreview = args.documentType;
-                $scope.$evalAsync();
-            }
-            if (vm.settingsPreview && vm.settingsPreview.key === key) {
-                vm.settingsPreview = args.documentType;
-                $scope.$evalAsync();
-            }
-        }
-
-        unsubscribe.push(eventsService.on("editors.documentType.saved", updateUsedElementTypes));
-
-        vm.addViewForBlock = function(block) {
-            localizationService.localize("blockEditor_headlineAddCustomView").then(localizedTitle => {
-
-                const filePicker = {
-                    title: localizedTitle,
-                    isDialog: true,
-                    filter: i => {
-                        return !(i.name.indexOf(".html") !== -1);
-                    },
-                    filterCssClass: "not-allowed",
-                    select: node => {
-                        const filepath = decodeURIComponent(node.id.replace(/\+/g, " "));
-                        block.view = "~/" + filepath.replace("wwwroot/", "");
-                        editorService.close();
-                    },
-                    close: () => editorService.close()
-                };
-
-                editorService.staticFilePicker(filePicker);
-
-            });
-        };
-
-        vm.requestRemoveViewForBlock = function(block) {
-            localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
-                overlayService.confirmRemove({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [block.view]),
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        vm.removeViewForBlock(block);
-                        overlayService.close();
-                    }
-                });
-            });
-        };
-
-        vm.removeViewForBlock = function(block) {
-            block.view = null;
-        };
-
-        vm.addStylesheetForBlock = function(block) {
-          localizationService.localize("blockEditor_headlineAddCustomStylesheet").then(localizedTitle => {
-
-            const filePicker = {
-              title: localizedTitle,
-              isDialog: true,
-              filter: i => {
-                return !(i.name.indexOf(".css") !== -1);
-              },
-              filterCssClass: "not-allowed",
-              select: node => {
-                const filepath = decodeURIComponent(node.id.replace(/\+/g, " "));
-                block.stylesheet = "~/" + filepath.replace("wwwroot/", "");
-                editorService.close();
-              },
-              close: () => editorService.close()
-            };
-
-            editorService.staticFilePicker(filePicker);
-
-          });
-        };
-
-        vm.requestRemoveStylesheetForBlock = function(block) {
-            localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
-                overlayService.confirmRemove({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [block.stylesheet]),
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        vm.removeStylesheetForBlock(block);
-                        overlayService.close();
-                    }
-                });
-            });
-        };
-
-        vm.removeStylesheetForBlock = function(block) {
-            block.stylesheet = null;
-        };
-
-        vm.addThumbnailForBlock = function(block) {
-
-          localizationService.localize("blockEditor_headlineAddThumbnail").then(localizedTitle => {
-
-                let allowedFileExtensions = ['jpg', 'jpeg', 'png', 'svg', 'webp', 'gif'];
-
-                const thumbnailPicker = {
-                    title: localizedTitle,
-                    isDialog: true,
-                    filter: i => {
-                        let ext = i.name.substr((i.name.lastIndexOf('.') + 1));
-                        return allowedFileExtensions.includes(ext) === false;
-                    },
-                    filterCssClass: "not-allowed",
-                    select: file => {
-                        const id = decodeURIComponent(file.id.replace(/\+/g, " "));
-                        block.thumbnail = "~/" + id.replace("wwwroot/", "");
-                        editorService.close();
-                    },
-                    close: () => editorService.close()
-                };
-
-                editorService.staticFilePicker(thumbnailPicker);
-
-            });
-        };
-
-        vm.removeThumbnailForBlock = function(entry) {
-            entry.thumbnail = null;
-        };
-
-        vm.changeIconColor = function (color) {
-            angularHelper.safeApply($scope, function () {
-                vm.block.iconColor = color ? color.toString() : null;
-            });
-        };
-
-        vm.changeBackgroundColor = function (color) {
-            angularHelper.safeApply($scope, function () {
-                vm.block.backgroundColor = color ? color.toString() : null;
-            });
-        };
-
-        vm.submit = function() {
-            if ($scope.model && $scope.model.submit) {
-                $scope.model.submit($scope.model);
-            }
-        };
-
-        vm.close = function() {
-            if ($scope.model && $scope.model.close) {
-                $scope.model.close($scope.model);
-            }
-        };
-
-        $scope.$on('$destroy', function() {
-            unsubscribe.forEach(u => { u(); });
-        });
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockList.BlockConfigurationOverlayController", BlockConfigurationOverlayController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html
deleted file mode 100644
index 58ca11b716..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html
+++ /dev/null
@@ -1,266 +0,0 @@
-<div class="umb-block-list-block-configuration-overlay" ng-controller="Umbraco.PropertyEditors.BlockList.BlockConfigurationOverlayController as vm">
-
-    <form novalidate name="blockListBlockConfigurationForm" val-form-manager>
-
-        <umb-editor-view ng-if="!page.loading">
-
-            <umb-editor-header
-                name="model.title"
-                name-locked="true"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container>
-                <div class="form-vertical">
-
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_headlineEditorAppearance">Editor appearance</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- label -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockLabel"><localize key="blockEditor_labelLabelTemplate">label</localize></label>
-                                    <div class="controls">
-                                        <input type="text" name="label" id="blockLabel" ng-model="vm.block.label" style="width:100%" umb-auto-focus/>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- custom view -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockCustomView"><localize key="blockEditor_labelCustomView">Custom view</localize></label>
-                                    <umb-property-info-button button-title-key="blockEditor_labelCustomViewInfoTitle">
-                                        <localize key="blockEditor_labelCustomViewDescription">Overwrite how this block appears in the BackOffice UI. Pick a .html file containing your presentation.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.view !== null" >
-
-                                            <umb-node-preview icon="'icon-document'" name="vm.block.view"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.requestRemoveViewForBlock(vm.block)">
-                                                    <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <button type="button" id="blockCustomView" class="btn-reset __settings-input --noValue umb-outline" ng-if="vm.block.view === null" ng-click="vm.addViewForBlock(vm.block)">
-                                            <localize key="blockEditor_addCustomView">Add custom view</localize>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- custom stylesheet -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockStyleSheet"><localize key="blockEditor_labelCustomStylesheet">Custom stylesheet</localize></label>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.stylesheet !== null" >
-
-                                            <umb-node-preview icon="'icon-document'" name="vm.block.stylesheet"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.requestRemoveStylesheetForBlock(vm.block)">
-                                                    <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <button type="button" id="blockStyleSheet" class="btn-reset __settings-input --noValue umb-outline" ng-if="vm.block.stylesheet === null" ng-click="vm.addStylesheetForBlock(vm.block)">
-                                            <localize key="blockEditor_addCustomStylesheet">Add custom stylesheet</localize>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- editor overlay size -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockEditorSize"><localize key="blockEditor_labelEditorSize">Editor size</localize></label>
-                                    <div class="controls">
-                                        <select id="blockEditorSize" ng-model="vm.block.editorSize">
-                                            <option value="small">Small</option>
-                                            <option value="medium">Medium</option>
-                                            <option value="large">Large</option>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_headlineDataModels">Data Models</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- Content Element Type -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockContentElemenType"><localize key="blockEditor_labelContentElementType">Content ElementType</localize></label>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.contentElementTypeKey !== null" >
-                                            <umb-node-preview icon="vm.contentPreview.icon" name="vm.contentPreview.name" alias="vm.contentPreview.alias"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" id="blockContentElemenType" class="btn-reset __control-actions-btn --open umb-outline" ng-click="vm.openElementType(vm.block.contentElementTypeKey)">
-                                                    <umb-icon icon="icon-edit" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- Settings Element Type -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockSettingsElemenType"><localize key="blockEditor_labelSettingsElementType">Settings Element Type</localize></label>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.settingsElementTypeKey !== null">
-                                            <umb-node-preview icon="vm.settingsPreview.icon" name="vm.settingsPreview.name" alias="vm.settingsPreview.alias"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" class="btn-reset __control-actions-btn --open umb-outline" ng-click="vm.openElementType(vm.block.settingsElementTypeKey)">
-                                                    <umb-icon icon="icon-edit" class="icon"></umb-icon>
-                                                </button>
-                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.requestRemoveSettingsForBlock(vm.block)">
-                                                    <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <button type="button" id="blockSettingsElemenType" class="btn-reset __settings-input --noValue umb-outline" ng-if="vm.block.settingsElementTypeKey === null" ng-click="vm.addSettingsForBlock($event, vm.block)">
-                                            <localize key="blockEditor_addSettingsElementType">Add settings</localize>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_headlineCatalogueAppearance">Catalogue appearance</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- backgroundColor -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockBackgroundColor"><localize key="blockEditor_labelBackgroundColor">Background Color</localize></label>
-                                    <div class="controls">
-                                        <umb-color-picker
-                                            id="blockBackgroundColor"
-                                            ng-model="vm.block.backgroundColor"
-                                            options="vm.colorPickerOptions"
-                                            on-change="vm.changeBackgroundColor(color)">
-                                        </umb-color-picker>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- iconColor -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockIconColor"><localize key="blockEditor_labelIconColor">Icon Color</localize></label>
-                                    <div class="controls">
-                                        <umb-color-picker
-                                            id="blockIconColor"
-                                            ng-model="vm.block.iconColor"
-                                            options="vm.colorPickerOptions"
-                                            on-change="vm.changeIconColor(color)">
-                                        </umb-color-picker>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- thumbnail -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockThumbnail"><localize key="blockEditor_thumbnail">Thumbnail</localize></label>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.thumbnail !== null" >
-
-                                            <umb-node-preview icon="'icon-document'" name="vm.block.thumbnail"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.removeThumbnailForBlock(vm.block)">
-                                                    <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <button type="button" id="blockThumbnail" class="btn-reset __settings-input --noValue umb-outline" ng-if="vm.block.thumbnail === null" ng-click="vm.addThumbnailForBlock(vm.block)">
-                                            <localize key="blockEditor_addThumbnail">Add thumbnail</localize>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_headlineAdvanced">Advanced</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- forceHideContentEditorInOverlay -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockforceHideContentEditorInOverlay"><localize key="blockEditor_forceHideContentEditor">Force hide content editor</localize></label>
-                                    <div class="controls">
-                                        <umb-toggle
-                                            input-id="blockforceHideContentEditorInOverlay"
-                                            checked="vm.block.forceHideContentEditorInOverlay"
-                                            on-click="vm.block.forceHideContentEditorInOverlay = vm.block.forceHideContentEditorInOverlay != true">
-                                        </umb-toggle>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                </div>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button
-                        action="vm.close()"
-                        shortcut="esc"
-                        button-style="link"
-                        label-key="general_close"
-                        type="button">
-                    </umb-button>
-
-                    <umb-button
-                        action="vm.submit()"
-                        button-style="primary"
-                        state="submitButtonState"
-                        label-key="buttons_submitChanges"
-                        type="button">
-                    </umb-button>
-
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-        </umb-editor-view>
-    </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.less
deleted file mode 100644
index 40454189db..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.less
+++ /dev/null
@@ -1,103 +0,0 @@
-.umb-block-list-block-configuration-overlay {
-
-
-    .umb-node-preview {
-        flex-grow: 1;
-    }
-
-    .__control-actions {
-        position: absolute;
-        display: flex;
-        align-items: center;
-        top:0;
-        bottom: 0;
-        right: 0;
-        background-color: rgba(255, 255, 255, 0.8);
-        opacity: 0;
-        transition: opacity 120ms;
-    }
-    .controls:hover &,
-    .controls:focus &,
-    .controls:focus-within &,
-    .control-group:hover,
-    .control-group:focus,
-    .control-group:focus-within {
-        .__control-actions {
-            opacity: 1;
-        }
-    }
-    .__control-actions-btn {
-        position: relative;
-        color: @ui-action-discreet-type;
-        height: 32px;
-        width: 26px;
-        &:hover {
-            color: @ui-action-discreet-type-hover;
-        }
-        &:last-of-type {
-            margin-right: 7px;
-        }
-    }
-    
-    .umb-node-preview {
-        border-bottom: none;
-    }
-
-    .__settings-input {
-        position: relative;
-        padding: 5px 8px;
-        margin-bottom: 10px;
-        color: @ui-action-discreet-type;
-        border: 1px dashed @ui-action-discreet-border;
-        width: 100%;
-        font-weight: bold;
-        display: inline-flex;
-        flex-flow: row nowrap;
-
-        localize {
-            width: 100%;
-        }
-
-        .umb-node-preview {
-            padding: 3px 0;
-            margin-left: 5px;
-            overflow: hidden;
-        }
-
-        &.--noValue {
-            text-align: center;
-            border-radius: @baseBorderRadius;
-            color: @ui-action-discreet-type;
-            transition: color 120ms;
-            &:hover, &:focus {
-                color: @ui-action-discreet-type-hover;
-                border-color: @ui-action-discreet-border-hover;
-            }
-        }
-
-        &.--hasValue {
-            border: 1px solid @inputBorder;
-            padding: 0;
-        }
-    }
-
-    .__add-button {
-        width:100%;
-        color: @ui-action-discreet-type;
-        border: 1px dashed @ui-action-discreet-border;
-        border-radius: @baseBorderRadius;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        padding: 5px 15px;
-        box-sizing: border-box;
-        margin: 20px 0;
-        font-weight: bold;
-    }
-    
-    .__add-button:hover {
-        color: @ui-action-discreet-type-hover;
-        border-color: @ui-action-discreet-border-hover;
-    }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
deleted file mode 100644
index 6463f41b37..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<div class="umb-block-list">
-
-    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-    <div class="umb-block-list__wrapper" ng-style="vm.listWrapperStyles">
-
-        <div ui-sortable="vm.sortableOptions" ng-model="vm.layout" ng-if="vm.loading !== true">
-
-            <div ng-repeat="layout in vm.layout track by layout.$block.key">
-
-                <button type="button"
-                        class="btn-reset umb-block-list__block--create-button"
-                        ng-click="vm.requestShowCreate($index, $event)"
-                        ng-controller="Umbraco.PropertyEditors.BlockListPropertyEditor.CreateButtonController as inlineCreateButtonCtrl"
-                        ng-mousemove="inlineCreateButtonCtrl.onMouseMove($event)"
-                        ng-if="!vm.singleBlockMode"
-                        ng-show="!vm.readonly">
-                    <div class="__plus" ng-style="{'left':inlineCreateButtonCtrl.plusPosX}">
-                        <umb-icon icon="icon-add" class="icon"></umb-icon>
-                    </div>
-                </button>
-
-                <umb-block-list-row 
-                    block-editor-api="vm.blockEditorApi"
-                    layout="layout"
-                    index="$index">
-                </umb-block-list-row>
-
-            </div>
-        </div>
-
-        <div class="umb-block-list__actions" ng-if="vm.loading !== true && !vm.singleBlockMode">
-            <button
-                    id="button_{{vm.model.alias}}"
-                    type="button"
-                    class="btn-reset umb-block-list__create-button umb-outline"
-                    ng-disabled="vm.availableBlockTypes.length === 0 || vm.readonly"
-                    ng-click="vm.requestShowCreate(vm.layout.length, $event)">
-                <localize ng-if="vm.availableBlockTypes.length !== 1" key="blockEditor_addBlock">Add content</localize>
-                <localize ng-if="vm.availableBlockTypes.length === 1" key="blockEditor_addThis" tokens="[vm.availableBlockTypes[0].elementTypeModel.name]">Add content</localize>
-            </button>
-            <button type="button"
-                    class="btn-reset umb-block-list__clipboard-button umb-outline"
-                    ng-class="{'--jump': vm.jumpClipboardButton}"
-                    ng-disabled="vm.clipboardItems.length === 0 || vm.readonly"
-                    ng-click="vm.requestShowClipboard(vm.layout.length, $event)"
-                    localize="title"
-                    title="@blockEditor_tabClipboard">
-                <umb-icon icon="icon-paste-in" class="icon"></umb-icon>
-                <span class="sr-only">
-                    <localize key="blockEditor_tabClipboard">Clipboard</localize>
-                </span>
-            </button>
-        </div>
-
-        <input type="hidden" name="minCount" ng-model="vm.layout" val-server="minCount" />
-        <input type="hidden" name="maxCount" ng-model="vm.layout" val-server="maxCount" />
-
-        <div ng-messages="vm.propertyForm.minCount.$error">
-            <div class="help text-error" ng-message="minCount">
-                <localize key="validation_entriesShort" tokens="[vm.validationLimit.min, vm.validationLimit.min - vm.layout.length]" watch-tokens="true">Minimum %0% entries, needs <strong>%1%</strong> more.</localize>
-            </div>
-            <span class="help-inline" ng-message="valServer" ng-bind-html="vm.propertyForm.minCount.errorMsg">></span>
-        </div>
-        <div ng-messages="vm.propertyForm.maxCount.$error">
-            <div class="help text-error" ng-message="maxCount">
-                <localize key="validation_entriesExceed" tokens="[vm.validationLimit.max, vm.layout.length - vm.validationLimit.max]" watch-tokens="true">Maximum %0% entries, <strong>%1%</strong> too many.</localize>
-            </div>
-            <span class="help-inline" ng-message="valServer" ng-bind-html="vm.propertyForm.maxCount.errorMsg"></span>
-        </div>
-
-    </div>
-
-    <umb-overlay
-        ng-if="vm.blockTypePicker.show"
-        position="target"
-        size="vm.blockTypePicker.size"
-        view="vm.blockTypePicker.view"
-        model="vm.blockTypePicker">
-    </umb-overlay>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less
deleted file mode 100644
index bd9f90a484..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less
+++ /dev/null
@@ -1,338 +0,0 @@
-@umb-block-list__item_minimum_height: 48px;
-
-.umb-block-list {
-    padding-bottom:10px;
-}
-
-.umb-block-list .umb-load-indicator {
-    margin-bottom:20px;
-}
-
-.umb-block-list__wrapper {
-    position: relative;
-    .umb-property-editor--limit-width();
-    > .ui-sortable > .ui-sortable-helper > .umb-block-list__block > .umb-block-list__block--content > * {
-        box-shadow: 0px 5px 10px 0 rgba(0,0,0,.2);
-    }
-}
-
-.umb-block-list__block {
-    position: relative;
-    width: 100%;
-
-    > .umb-block-list__block--actions {
-        opacity: 0;
-        transition: opacity 120ms;
-    }
-
-    &:hover,
-    &:focus,
-    &:focus-within,
-    &.--active {
-
-        > .umb-block-list__block--actions {
-            opacity: 1;
-        }
-    }
-
-    &.--show-validation {
-        ng-form.ng-invalid-val-server-match-content > & {
-            border: 2px solid @formErrorText;
-            border-radius: @baseBorderRadius;
-            &::after {
-                content: "!";
-                position: absolute;
-                top: -12px;
-                right: -12px;
-                display: inline-flex;
-                align-items: center;
-                justify-content: center;
-                width: 18px;
-                height: 18px;
-                border-radius: 50%;
-                font-size: 13px;
-                text-align: center;
-                font-weight: bold;
-                background-color: @errorBackground;
-                color: @errorText;
-                border: 2px solid @white;
-                font-weight: 900;
-    
-                animation-duration: 1.4s;
-                animation-iteration-count: infinite;
-                animation-name: umb-block-list__block--content--badge-bounce;
-                animation-timing-function: ease;
-                @keyframes umb-block-list__block--content--badge-bounce {
-                    0%   { transform: translateY(0); }
-                    20%  { transform: translateY(-6px); }
-                    40%  { transform: translateY(0); }
-                    55%  { transform: translateY(-3px); }
-                    70%  { transform: translateY(0); }
-                    100% { transform: translateY(0); }
-                }
-            }
-        }
-    }
-}
-ng-form.ng-invalid-val-server-match-settings > .umb-block-list__block > .umb-block-list__block--actions {
-    opacity: 1;
-}
-.umb-block-list__block--actions {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    font-size: 0;
-    background-color: rgba(255, 255, 255, .96);
-    border-radius: 16px;
-    padding-left: 5px;
-    padding-right: 5px;
-    z-index: @zIndexBlockActions;
-    .action {
-        position: relative;
-        display: inline-block;
-        color: @ui-action-discreet-type;
-        font-size: 18px;
-        padding: 5px;
-        &:hover {
-            color: @ui-action-discreet-type-hover;
-        }
-        &.--error {
-            color: @errorBackground;
-            .show-validation-type-warning & {
-                color: @warningBackground;
-            }
-        }
-        > .__error-badge {
-            position: absolute;
-            top: -2px;
-            right: -2px;
-            min-width: 8px;
-            color: @white;
-            background-color: @ui-active-type;
-            border: 2px solid @white;
-            border-radius: 50%;
-            font-size: 8px;
-            font-weight: bold;
-            padding: 2px;
-            line-height: 8px;
-            background-color: @errorBackground;
-            .show-validation-type-warning & {
-                background-color: @warningBackground;
-            }
-            display: none;
-            font-weight: 900;
-        }
-        &.--error > .__error-badge {
-            display: block;
-
-            animation-duration: 1.4s;
-            animation-iteration-count: infinite;
-            animation-name: umb-block-list__action--badge-bounce;
-            animation-timing-function: ease;
-            @keyframes umb-block-list__action--badge-bounce {
-                0%   { transform: translateY(0); }
-                20%  { transform: translateY(-4px); }
-                40%  { transform: translateY(0); }
-                55%  { transform: translateY(-2px); }
-                70%  { transform: translateY(0); }
-                100% { transform: translateY(0); }
-            }
-
-        }
-    }
-}
-
-.umb-block-list__block--content {
-
-    > div {
-        position: relative;
-        width: 100%;
-        min-height: @umb-block-list__item_minimum_height;
-        background-color: @white;
-        border-radius: @baseBorderRadius;
-        box-sizing: border-box;
-    }
-
-}
-
-.blockelement__draggable-element {
-    cursor: grab;
-}
-
-
-.umb-block-list__block--create-button {
-    position: absolute;
-    width: 100%;
-    z-index: 1;
-    opacity: 0;
-    outline: none;
-    height: 12px;
-    margin-top: -9px;
-    padding-top: 6px;
-    margin-bottom: -6px;
-    transition: opacity 240ms;
-
-    &::before {
-        content: '';
-        position: absolute;
-        background-color: @blueMid;
-        border-top: 1px solid white;
-        border-bottom: 1px solid white;
-        border-radius: 2px;
-        top: 5px;
-        right: 0;
-        left: 0;
-        height: 2px;
-        animation: umb-block-list__block--create-button_before 400ms ease-in-out alternate infinite;
-        transform: scaleX(.99);
-        transition: transform 240ms ease-out;
-
-        @keyframes umb-block-list__block--create-button_before {
-            0%   { opacity: 1; }
-            100% { opacity: 0.5; }
-        }
-    }
-
-    > .__plus {
-        position: absolute;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        pointer-events: none; // lets stop avoiding the mouse values in JS move event.
-        box-sizing: border-box;
-        width: 28px;
-        height: 28px;
-        margin-left: (-16px - 8px);
-        margin-top: -16px;
-        border-radius: 3em;
-        font-size: 14px;
-        border: 2px solid @blueMid;
-        color: @blueMid;
-        background-color: rgba(255, 255, 255, .96);
-        box-shadow: 0 0 0 2px rgba(255, 255, 255, .96);
-        transform: scale(0);
-        transition: transform 240ms ease-in;
-        
-        animation: umb-block-list__block--create-button__plus 400ms ease-in-out alternate infinite;
-
-        @keyframes umb-block-list__block--create-button__plus {
-            0%   { color: rgba(@blueMid, 1); }
-            100% { color: rgba(@blueMid, 0.8); }
-        }
-        
-    }
-
-    &:focus {
-        > .__plus {
-            border-color: @ui-outline;
-        }
-    }
-
-    &:hover, &:focus {
-        opacity: 1;
-
-        &::before {
-            transform: scaleX(1);
-        }
-        > .__plus {
-            transform: scale(1);
-            transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.275);
-            
-        }
-    }
-}
-
-.umb-block-list__actions {
-    display: flex;
-
-    border: 1px dashed @ui-action-discreet-border;
-    border-radius: @baseBorderRadius;
-    box-sizing: border-box;
-
-    &:hover {
-        border-color: transparent;
-        > button {
-
-            border-color: @ui-action-discreet-border;
-
-            &.umb-block-list__clipboard-button {
-                opacity: 1;
-            }
-        }
-        
-    }
-
-    > button {
-        position: relative;
-        display: flex;
-        //width: 100%;
-        align-items: center;
-        justify-content: center;
-        
-        color: @ui-action-discreet-type;
-        font-weight: bold;
-        margin: -1px;
-        padding: 5px 15px;
-
-        border: 1px dashed transparent;
-        border-radius: @baseBorderRadius;
-        box-sizing: border-box;
-        
-        &:hover {
-            color: @ui-action-discreet-type-hover;
-            border-color: @ui-action-discreet-border-hover;
-            text-decoration: none;
-            z-index: 1;
-        }
-
-        &[disabled],
-        &[disabled]:hover {
-            color: @gray-7;
-            border-color: @gray-7;
-            cursor: not-allowed;
-        }
-
-        &.umb-block-list__create-button {
-            flex-grow: 1;
-            border-top-right-radius: 0;
-            border-bottom-right-radius: 0;
-        }
-    
-        &.umb-block-list__clipboard-button {
-            margin-left: 0;
-            padding: 5px 12px;
-            font-size: 18px;// Align with block action buttons.
-            border-top-left-radius: 0;
-            border-bottom-left-radius: 0;
-
-            opacity: 0;
-            &:hover, &:focus {
-                opacity: 1;
-            }
-
-            &.--jump {
-
-                @keyframes umb-block-list__jump-clipboard-button {
-                    0% { opacity: 0; }
-                    10% { opacity: 1; }
-                    90% { opacity: 1; }
-                    100% { opacity: 0; }
-                }
-                animation: umb-block-list__jump-clipboard-button 2s;
-
-                i{
-                    @keyframes umb-block-list__jump-clipboard-button-i {
-                        10% { transform: scale(1); }
-                        10% { transform: scale(1.33); }
-                        20% { transform: scale(.82); }
-                        30% { transform: scale(1.24); }
-                        40% { transform: scale(.94); }
-                        50% { transform: scale(1); }
-                    }
-                    animation: umb-block-list__jump-clipboard-button-i 2s;
-                }
-            }
-            
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html
deleted file mode 100644
index 4d72ee2e85..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-row.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<ng-form name="vm.blockRowForm" val-server-match="{ 'contains' : { 'valServerMatchContent': vm.layout.$block.content.key, 'valServerMatchSettings': vm.layout.$block.settings.key } }">
-    <div class="umb-block-list__block" ng-class="{'--active':vm.layout.$block.active, '--show-validation': vm.layout.$block.showValidation === true}">
-
-        <umb-block-list-block stylesheet="{{::vm.layout.$block.config.stylesheet}}"
-                              class="umb-block-list__block--content"
-                              ng-class="{'blockelement__draggable-element': vm.layout.$block.config.stylesheet}"
-                              view="{{vm.layout.$block.view}}"
-                              api="vm.blockEditorApi"
-                              block="vm.layout.$block"
-                              index="vm.index"
-                              parent-form="vm.blockRowForm">
-        </umb-block-list-block>
-
-        <div class="umb-block-list__block--actions">
-            <button type="button" class="btn-reset umb-outline action --settings" localize="title" title="actions_editSettings"
-                    ng-click="vm.blockEditorApi.openSettingsForBlock(vm.layout.$block, vm.index, vm.blockRowForm);"
-                    ng-class="{ '--error': vm.blockRowForm.$error.valServerMatchSettings && vm.valFormManager.isShowingValidation() }"
-                    ng-if="vm.layout.$block.showSettings === true">
-                <umb-icon icon="icon-settings" class="icon"></umb-icon>
-                <span class="sr-only">
-                    <localize key="general_settings">Settings</localize>
-                </span>
-                <div class="__error-badge">!</div>
-            </button>
-            <button type="button" class="btn-reset umb-outline action --copy" localize="title" title="actions_copy"
-                    ng-click="vm.blockEditorApi.copyBlock(vm.layout.$block);"
-                    ng-if="vm.layout.$block.showCopy === true">
-                <umb-icon icon="icon-documents" class="icon"></umb-icon>
-                <span class="sr-only">
-                    <localize key="general_copy">Copy</localize>
-                </span>
-            </button>
-            <button ng-if="!vm.blockEditorApi.readonly && (!vm.blockEditorApi.singleBlockMode || vm.index > 0)" type="button" class="btn-reset umb-outline action --delete" localize="title" title="actions_delete"
-                    ng-click="vm.blockEditorApi.requestDeleteBlock(vm.layout.$block);">
-                <umb-icon icon="icon-trash" class="icon"></umb-icon>
-                <span class="sr-only">
-                    <localize key="general_delete">Delete</localize>
-                </span>
-            </button>
-        </div>
-    </div>
-</ng-form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
deleted file mode 100644
index 4ebb3ea2a9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
+++ /dev/null
@@ -1,893 +0,0 @@
-(function () {
-    "use strict";
-
-
-    /**
-     * @ngdoc directive
-     * @name umbraco.directives.directive:umbBlockListPropertyEditor
-     * @function
-     *
-     * @description
-     * The component for the block list property editor.
-     */
-    angular
-        .module("umbraco")
-        .component("umbBlockListPropertyEditor", {
-            templateUrl: "views/propertyeditors/blocklist/umb-block-list-property-editor.html",
-            controller: BlockListController,
-            controllerAs: "vm",
-            bindings: {
-                model: "="
-            },
-            require: {
-                propertyForm: "^form",
-                umbProperty: "?^umbProperty",
-                umbVariantContent: '?^^umbVariantContent',
-                umbVariantContentEditors: '?^^umbVariantContentEditors',
-                umbElementEditorContent: '?^^umbElementEditorContent'
-            }
-        });
-
-    function BlockListController($scope, $timeout, $interpolate, editorService, clipboardService, localizationService, overlayService, blockEditorService, udiService, serverValidationManager, angularHelper, eventsService, $attrs) {
-
-        var unsubscribe = [];
-        var modelObject;
-
-        // Property actions:
-        let copyAllBlocksAction = null;
-        let deleteAllBlocksAction = null;
-        let pasteSingleBlockAction = null;
-
-        var inlineEditing = false;
-        var liveEditing = true;
-
-        var vm = this;
-
-        vm.readonly = false;
-        vm.singleBlockMode = false;
-
-        $attrs.$observe('readonly', (value) => {
-            vm.readonly = value !== undefined;
-
-            vm.sortableOptions.disabled = vm.readonly || vm.singleBlockMode;
-            vm.blockEditorApi.readonly = vm.readonly;
-
-            if (deleteAllBlocksAction) {
-                deleteAllBlocksAction.isDisabled = vm.readonly;
-            }
-        });
-
-        vm.loading = true;
-        vm.currentBlockInFocus = null;
-        vm.setBlockFocus = function (block) {
-            if (vm.currentBlockInFocus !== null) {
-                vm.currentBlockInFocus.focus = false;
-            }
-            vm.currentBlockInFocus = block;
-            block.focus = true;
-        };
-
-        vm.supportCopy = clipboardService.isSupported();
-        vm.clipboardItems = [];
-        unsubscribe.push(eventsService.on("clipboardService.storageUpdate", updateClipboard));
-        unsubscribe.push($scope.$on("editors.content.splitViewChanged", (event, eventData) => {
-            var compositeId = vm.umbVariantContent.editor.compositeId;
-            if(eventData.editors.some(x => x.compositeId === compositeId)) {
-                updateAllBlockObjects();
-            }
-        }));
-
-        vm.layout = []; // The layout object specific to this Block Editor, will be a direct reference from Property Model.
-        vm.availableBlockTypes = []; // Available block entries of this property editor.
-        vm.labels = {};
-        vm.options = {
-            createFlow: false
-        };
-
-        localizationService.localizeMany(["grid_addElement", "content_createEmpty"]).then(function (data) {
-            vm.labels.grid_addElement = data[0];
-            vm.labels.content_createEmpty = data[1];
-        });
-
-        vm.$onInit = function() {
-
-            if (vm.umbProperty && !vm.umbVariantContent) {// if we dont have vm.umbProperty, it means we are in the DocumentTypeEditor.
-                // not found, then fallback to searching the scope chain, this may be needed when DOM inheritance isn't maintained but scope
-                // inheritance is (i.e.infinite editing)
-                var found = angularHelper.traverseScopeChain($scope, s => s && s.vm && s.vm.constructor.name === "umbVariantContentController");
-                vm.umbVariantContent = found ? found.vm : null;
-                if (!vm.umbVariantContent) {
-                    throw "Could not find umbVariantContent in the $scope chain";
-                }
-            }
-
-            // set the onValueChanged callback, this will tell us if the block list model changed on the server
-            // once the data is submitted. If so we need to re-initialize
-            vm.model.onValueChanged = onServerValueChanged;
-
-            inlineEditing = vm.model.config.useInlineEditingAsDefault;
-            liveEditing = vm.model.config.useLiveEditing;
-
-            vm.singleBlockMode =
-                vm.model.config.validationLimit.min == 1 &&
-                vm.model.config.validationLimit.max == 1 &&
-                vm.model.config.blocks.length == 1 &&
-                vm.model.config.useSingleBlockMode;
-
-            vm.blockEditorApi.singleBlockMode = vm.singleBlockMode;
-
-            vm.validationLimit = vm.model.config.validationLimit;
-
-            vm.listWrapperStyles = {};
-
-            if (vm.model.config.maxPropertyWidth) {
-                vm.listWrapperStyles['max-width'] = vm.model.config.maxPropertyWidth;
-            }
-
-            // We need to ensure that the property model value is an object, this is needed for modelObject to recive a reference and keep that updated.
-            if (typeof vm.model.value !== 'object' || vm.model.value === null) {// testing if we have null or undefined value or if the value is set to another type than Object.
-                vm.model.value = {};
-            }
-
-            var scopeOfExistence = $scope;
-            if (vm.umbVariantContentEditors && vm.umbVariantContentEditors.getScope) {
-                scopeOfExistence = vm.umbVariantContentEditors.getScope();
-            } else if(vm.umbElementEditorContent && vm.umbElementEditorContent.getScope) {
-                scopeOfExistence = vm.umbElementEditorContent.getScope();
-            }
-
-            vm.sortableOptions = {
-                axis: "y",
-                containment: "parent",
-                cursor: "grabbing",
-                handle: ".blockelement__draggable-element",
-                cancel: "input,textarea,select,option",
-                classes: ".blockelement--dragging",
-                distance: 5,
-                tolerance: "pointer",
-                scroll: true,
-                disabled: vm.readonly || vm.singleBlockMode,
-                update: function (ev, ui) {
-                    setDirty();
-                }
-            };
-
-            copyAllBlocksAction = {
-                labelKey: "clipboard_labelForCopyAllEntries",
-                labelTokens: [vm.model.label],
-                icon: "icon-documents",
-                method: requestCopyAllBlocks,
-                isDisabled: true,
-                useLegacyIcon: false
-            };
-
-            deleteAllBlocksAction = {
-                labelKey: "clipboard_labelForRemoveAllEntries",
-                labelTokens: [],
-                icon: "icon-trash",
-                method: requestDeleteAllBlocks,
-                isDisabled: true,
-                useLegacyIcon: false
-            };
-
-            pasteSingleBlockAction = {
-                labelKey: "content_createFromClipboard",
-                labelTokens: [],
-                icon: "icon-paste-in",
-                method: requestShowClipboard,
-                isDisabled: false,
-                useLegacyIcon: false
-            };
-
-            var propertyActions = [copyAllBlocksAction, deleteAllBlocksAction];
-
-            var propertyActionsForSingleBlockMode = [pasteSingleBlockAction];
-
-            if (vm.umbProperty) {
-                if (vm.singleBlockMode) {
-                  vm.umbProperty.setPropertyActions(propertyActionsForSingleBlockMode);
-                } else {
-                  vm.umbProperty.setPropertyActions(propertyActions);
-                }
-            }
-
-            // Create Model Object, to manage our data for this Block Editor.
-            modelObject = blockEditorService.createModelObject(vm.model.value, vm.model.editor, vm.model.config.blocks, scopeOfExistence, $scope);
-            modelObject.load().then(onLoaded);
-
-        };
-
-        // Called when we save the value, the server may return an updated data and our value is re-synced
-        // we need to deal with that here so that our model values are all in sync so we basically re-initialize.
-        function onServerValueChanged(newVal, oldVal) {
-
-            // We need to ensure that the property model value is an object, this is needed for modelObject to recive a reference and keep that updated.
-            if (typeof newVal !== 'object' || newVal === null) {// testing if we have null or undefined value or if the value is set to another type than Object.
-                vm.model.value = newVal = {};
-            }
-
-            modelObject.update(vm.model.value, $scope);
-            onLoaded();
-        }
-
-        function setDirty() {
-            if (vm.propertyForm) {
-                vm.propertyForm.$setDirty();
-            }
-        }
-
-        function onLoaded() {
-
-            // Store a reference to the layout model, because we need to maintain this model.
-            vm.layout = modelObject.getLayout([]);
-
-            var invalidLayoutItems = [];
-
-            // Append the blockObjects to our layout.
-            vm.layout.forEach(entry => {
-                // $block must have the data property to be a valid BlockObject, if not its considered as a destroyed blockObject.
-                if (entry.$block === undefined || entry.$block === null || entry.$block.data === undefined) {
-                    var block = getBlockObject(entry);
-
-                    // If this entry was not supported by our property-editor it would return 'null'.
-                    if (block !== null) {
-                        entry.$block = block;
-                    }
-                    else {
-                        // then we need to filter this out and also update the underlying model. This could happen if the data
-                        // is invalid for some reason or the data structure has changed.
-                        invalidLayoutItems.push(entry);
-                    }
-                } else {
-                    updateBlockObject(entry.$block);
-                }
-            });
-
-            // remove the ones that are invalid
-            invalidLayoutItems.forEach(entry => {
-                var index = vm.layout.findIndex(x => x === entry);
-                if (index >= 0) {
-                    vm.layout.splice(index, 1);
-                }
-            });
-
-            vm.availableContentTypesAliases = modelObject.getAvailableAliasesForBlockContent();
-            vm.availableBlockTypes = modelObject.getAvailableBlocksForBlockPicker();
-
-            updateClipboard(true);
-
-            if (vm.singleBlockMode && vm.layout.length == 0 && vm.availableBlockTypes?.length > 0) {
-                var wasAdded = false;
-                var blockType = vm.availableBlockTypes[0];
-
-                wasAdded = addNewBlock(1, blockType.blockConfigModel.contentElementTypeKey);
-
-                if (wasAdded && inlineEditing === true) {
-                    var blockObject = vm.layout[0]?.$block;
-                    if (blockObject) {
-                        blockObject.activate();
-                    }
-                }
-            }
-
-            vm.loading = false;
-
-            $scope.$evalAsync();
-
-        }
-
-        function updateAllBlockObjects() {
-            // Update the blockObjects in our layout.
-            vm.layout.forEach(entry => {
-                // $block must have the data property to be a valid BlockObject, if not its considered as a destroyed blockObject.
-                if (entry.$block) {
-                    updateBlockObject(entry.$block);
-                }
-            });
-        }
-
-        function getDefaultViewForBlock(block) {
-
-            var defaultViewFolderPath = "views/propertyeditors/blocklist/blocklistentryeditors/";
-
-            if (block.config.unsupported === true)
-                return defaultViewFolderPath + "unsupportedblock/unsupportedblock.editor.html";
-
-            if (inlineEditing === true)
-                return defaultViewFolderPath + "inlineblock/inlineblock.editor.html";
-            return defaultViewFolderPath + "labelblock/labelblock.editor.html";
-        }
-
-        /**
-         * Ensure that the containing content variant languag and current property culture is transfered along
-         * to the scaffolded content object representing this block.
-         * This is required for validation along with ensuring that the umb-property inheritance is constently maintained.
-         * @param {any} content
-         */
-        function ensureCultureData(content) {
-
-            if (!content || !vm.umbVariantContent) return;
-
-            if (vm.umbVariantContent.editor.content.language) {
-                // set the scaffolded content's language to the language of the current editor
-                content.language = vm.umbVariantContent.editor.content.language;
-            }
-
-            // currently we only ever deal with invariant content for blocks so there's only one
-            content.variants[0].tabs.forEach(tab => {
-                tab.properties.forEach(prop => {
-                    // set the scaffolded property to the culture of the containing property
-                    prop.culture = vm.umbProperty.property.culture;
-                });
-            });
-
-            // set the scaffolded allowed actions to the allowed actions of the document
-            content.allowedActions = vm.umbVariantContent.content.allowedActions;
-
-            // set the scaffolded variants' allowed actions to the allowed actions of the current variant
-            content.variants.forEach(variant => {
-                variant.allowedActions = vm.umbVariantContent.editor.content.allowedActions;
-            });
-        }
-
-        function getBlockObject(entry) {
-            var block = modelObject.getBlockObject(entry);
-
-            if (block === null) return null;
-
-            block.view = (block.config.view ? block.config.view : getDefaultViewForBlock(block));
-            block.showValidation = block.config.view ? true : false;
-
-            block.hideContentInOverlay = block.config.forceHideContentEditorInOverlay === true || inlineEditing === true;
-            block.showSettings = block.config.settingsElementTypeKey != null;
-
-            // If we have content, otherwise it doesn't make sense to copy.
-            block.showCopy = vm.supportCopy && block.config.contentElementTypeKey != null;
-
-            // Index is set by umbblocklistblock component and kept up to date by it.
-            block.index = 0;
-            block.setParentForm = function (parentForm) {
-                this._parentForm = parentForm;
-            };
-
-            /** decorator methods, to enable switching out methods without loosing references that would have been made in Block Views codes */
-            block.activate = function() {
-                this._activate();
-            };
-            block.edit = function() {
-                this._edit();
-            };
-            block.editSettings = function() {
-                this._editSettings();
-            };
-            block.requestDelete = function() {
-                this._requestDelete();
-            };
-            block.delete = function() {
-                this._delete();
-            };
-            block.copy = function() {
-                this._copy();
-            };
-            updateBlockObject(block);
-
-            return block;
-        }
-
-        /** As the block object now contains references to this instance of a property editor, we need to ensure that the Block Object contains latest references.
-         * This is a bit hacky but the only way to maintain this reference currently.
-         * Notice this is most relevant for invariant properties on variant documents, specially for the scenario where the scope of the reference we stored is destroyed, therefor we need to ensure we always have references to a current running property editor*/
-        function updateBlockObject(block) {
-
-            ensureCultureData(block.content);
-            ensureCultureData(block.settings);
-
-            block._activate = activateBlock.bind(null, block);
-            block._edit = function () {
-                var blockIndex = vm.layout.indexOf(this.layout);
-                editBlock(this, false, blockIndex, this._parentForm);
-            };
-            block._editSettings = function () {
-                var blockIndex = vm.layout.indexOf(this.layout);
-                editBlock(this, true, blockIndex, this._parentForm);
-            };
-            block._requestDelete = requestDeleteBlock.bind(null, block);
-            block._delete = deleteBlock.bind(null, block);
-            block._copy = copyBlock.bind(null, block);
-        }
-
-        function addNewBlock(index, contentElementTypeKey) {
-
-            // Create layout entry. (not added to property model jet.)
-            var layoutEntry = modelObject.create(contentElementTypeKey);
-            if (layoutEntry === null) {
-                return false;
-            }
-
-            // make block model
-            var blockObject = getBlockObject(layoutEntry);
-            if (blockObject === null) {
-                return false;
-            }
-
-            // If we reach this line, we are good to add the layoutEntry and blockObject to our models.
-
-            // Add the Block Object to our layout entry.
-            layoutEntry.$block = blockObject;
-
-            // add layout entry at the decired location in layout.
-            vm.layout.splice(index, 0, layoutEntry);
-
-            // lets move focus to this new block.
-            vm.setBlockFocus(blockObject);
-
-            return true;
-        }
-
-        function deleteBlock(block) {
-
-            var layoutIndex = vm.layout.findIndex(entry => entry.contentUdi === block.layout.contentUdi);
-            if (layoutIndex === -1) {
-                throw new Error("Could not find layout entry of block with udi: "+block.layout.contentUdi)
-            }
-
-            setDirty();
-
-            var removed = vm.layout.splice(layoutIndex, 1);
-            removed.forEach(x => {
-                // remove any server validation errors associated
-                var guids = [udiService.getKey(x.contentUdi), (x.settingsUdi ? udiService.getKey(x.settingsUdi) : null)];
-                guids.forEach(guid => {
-                    if (guid) {
-                        serverValidationManager.removePropertyError(guid, vm.umbProperty.property.culture, vm.umbProperty.property.segment, "", { matchType: "contains" });
-                    }
-                })
-            });
-
-            modelObject.removeDataAndDestroyModel(block);
-        }
-
-        function deleteAllBlocks() {
-            while(vm.layout.length) {
-                deleteBlock(vm.layout[0].$block);
-            };
-        }
-
-        function activateBlock(blockObject) {
-            blockObject.active = true;
-        }
-
-        function editBlock(blockObject, openSettings, blockIndex, parentForm, options) {
-
-            options = options || vm.options;
-
-            // this must be set
-            if (blockIndex === undefined) {
-                throw "blockIndex was not specified on call to editBlock";
-            }
-
-            var wasNotActiveBefore = blockObject.active !== true;
-
-	        // dont open the editor overlay if block has hidden its content editor in overlays and we are requesting to open content, not settings.
-            if (openSettings !== true && blockObject.hideContentInOverlay === true) {
-                return;
-            }
-
-            // if requesting to open settings but we dont have settings then return.
-            if (openSettings === true && !blockObject.config.settingsElementTypeKey) {
-                return;
-            }
-
-            activateBlock(blockObject);
-
-            // make a clone to avoid editing model directly.
-            var blockContentClone = Utilities.copy(blockObject.content);
-            var blockSettingsClone = null;
-
-            if (blockObject.config.settingsElementTypeKey) {
-                blockSettingsClone = Utilities.copy(blockObject.settings);
-            }
-
-            var blockEditorModel = {
-                $parentScope: $scope, // pass in a $parentScope, this maintains the scope inheritance in infinite editing
-                $parentForm: parentForm || vm.propertyForm, // pass in a $parentForm, this maintains the FormController hierarchy with the infinite editing view (if it contains a form)
-                hideContent: blockObject.hideContentInOverlay,
-                openSettings: openSettings === true,
-                createFlow: options.createFlow === true,
-                liveEditing: liveEditing,
-                title: blockObject.label,
-                view: "views/common/infiniteeditors/blockeditor/blockeditor.html",
-                size: blockObject.config.editorSize || "medium",
-                hideSubmitButton: vm.readonly,
-                submit: function(blockEditorModel) {
-
-                    if (liveEditing === false) {
-                        // transfer values when submitting in none-liveediting mode.
-                        blockObject.retrieveValuesFrom(blockEditorModel.content, blockEditorModel.settings);
-                    }
-
-                    blockObject.active = false;
-                    editorService.close();
-                },
-                close: function(blockEditorModel) {
-                    if (blockEditorModel.createFlow) {
-                        deleteBlock(blockObject);
-                    } else {
-                        if (liveEditing === true) {
-                            // revert values when closing in liveediting mode.
-                            blockObject.retrieveValuesFrom(blockContentClone, blockSettingsClone);
-                        }
-                        if (wasNotActiveBefore === true) {
-                            blockObject.active = false;
-                        }
-                    }
-                    editorService.close();
-                }
-            };
-
-            if (liveEditing === true) {
-                blockEditorModel.content = blockObject.content;
-                blockEditorModel.settings = blockObject.settings;
-            } else {
-                blockEditorModel.content = blockContentClone;
-                blockEditorModel.settings = blockSettingsClone;
-            }
-
-            // open property settings editor
-            editorService.open(blockEditorModel);
-        }
-
-        vm.requestShowCreate = requestShowCreate;
-
-        function requestShowCreate(createIndex, mouseEvent) {
-
-            if (vm.blockTypePicker) {
-                return;
-            }
-
-            if (vm.availableBlockTypes.length === 1) {
-                var wasAdded = false;
-                var blockType = vm.availableBlockTypes[0];
-
-                wasAdded = addNewBlock(createIndex, blockType.blockConfigModel.contentElementTypeKey);
-
-                if(wasAdded && !(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
-                    userFlowWhenBlockWasCreated(createIndex);
-                }
-            } else {
-                showCreateDialog(createIndex);
-            }
-
-        }
-
-        vm.requestShowClipboard = requestShowClipboard;
-
-        function requestShowClipboard(createIndex) {
-            showCreateDialog(createIndex, true);
-        }
-
-        vm.showCreateDialog = showCreateDialog;
-
-        function showCreateDialog(createIndex, openClipboard) {
-
-            if (vm.blockTypePicker) {
-                return;
-            }
-
-            if (vm.availableBlockTypes.length === 0) {
-                return;
-            }
-
-            var amountOfAvailableTypes = vm.availableBlockTypes.length;
-            var blockPickerModel = {
-                $parentScope: $scope, // pass in a $parentScope, this maintains the scope inheritance in infinite editing
-                $parentForm: vm.propertyForm, // pass in a $parentForm, this maintains the FormController hierarchy with the infinite editing view (if it contains a form)
-                availableItems: vm.availableBlockTypes,
-                title: vm.labels.grid_addElement,
-                openClipboard: openClipboard,
-                singleBlockMode: vm.singleBlockMode,
-                orderBy: "$index",
-                view: "views/common/infiniteeditors/blockpicker/blockpicker.html",
-                size: (amountOfAvailableTypes > 8 ? "medium" : "small"),
-                filter: (amountOfAvailableTypes > 8),
-                clickPasteItem: function(item, mouseEvent) {
-                    if (Array.isArray(item.pasteData)) {
-                        var indexIncrementor = 0;
-                        item.pasteData.forEach(function (entry) {
-                            if (requestPasteFromClipboard(createIndex + indexIncrementor, entry, item.type)) {
-                                indexIncrementor++;
-                            }
-                        });
-                    } else {
-                        requestPasteFromClipboard(createIndex, item.pasteData, item.type);
-                    }
-                    if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
-                        blockPickerModel.close();
-                    }
-                },
-                submit: function(blockPickerModel, mouseEvent) {
-                    var wasAdded = false;
-                    if (blockPickerModel && blockPickerModel.selectedItem) {
-                        wasAdded = addNewBlock(createIndex, blockPickerModel.selectedItem.blockConfigModel.contentElementTypeKey);
-                    }
-
-                    if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
-                        editorService.close();
-                        if (wasAdded) {
-                            userFlowWhenBlockWasCreated(createIndex);
-                        }
-                    }
-                },
-                close: function() {
-                    // If opened by a inline creator button(index less than length), we want to move the focus away, to hide line-creator.
-                    if (createIndex < vm.layout.length) {
-                        vm.setBlockFocus(vm.layout[Math.max(createIndex-1, 0)].$block);
-                    }
-
-                    editorService.close();
-                }
-            };
-
-            blockPickerModel.clickClearClipboard = function ($event) {
-                clipboardService.clearEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, vm.availableContentTypesAliases);
-                clipboardService.clearEntriesOfType(clipboardService.TYPES.BLOCK, vm.availableContentTypesAliases);
-            };
-
-            blockPickerModel.clipboardItems = vm.clipboardItems;
-
-            // open block picker overlay
-            editorService.open(blockPickerModel);
-
-        };
-
-        function userFlowWhenBlockWasCreated(createIndex) {
-            if (vm.layout.length > createIndex) {
-                var blockObject = vm.layout[createIndex].$block;
-                if (inlineEditing === true) {
-                    blockObject.activate();
-                } else if (inlineEditing === false && blockObject.hideContentInOverlay !== true && blockObject.content.variants[0].tabs.find(tab => tab.properties.length > 0) !== undefined) {
-                    vm.options.createFlow = true;
-                    blockObject.edit();
-                    vm.options.createFlow = false;
-                }
-            }
-        }
-
-        function updateClipboard(firstTime) {
-
-            var oldAmount = vm.clipboardItems.length;
-
-            vm.clipboardItems = [];
-
-            var entriesForPaste = clipboardService.retrieveEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, vm.availableContentTypesAliases);
-            entriesForPaste.forEach(function (entry) {
-                var pasteEntry = {
-                    type: clipboardService.TYPES.ELEMENT_TYPE,
-                    date: entry.date,
-                    pasteData: entry.data,
-                    elementTypeModel: {
-                        name: entry.label,
-                        icon: entry.icon
-                    }
-                }
-                if(Array.isArray(entry.data) === false) {
-                    var scaffold = modelObject.getScaffoldFromAlias(entry.alias);
-                    if(scaffold) {
-                        pasteEntry.blockConfigModel = modelObject.getBlockConfiguration(scaffold.contentTypeKey);
-                    }
-                }
-                vm.clipboardItems.push(pasteEntry);
-            });
-
-            entriesForPaste = clipboardService.retrieveEntriesOfType(clipboardService.TYPES.BLOCK, vm.availableContentTypesAliases);
-            entriesForPaste.forEach(function (entry) {
-                var pasteEntry = {
-                    type: clipboardService.TYPES.BLOCK,
-                    date: entry.date,
-                    pasteData: entry.data,
-                    elementTypeModel: {
-                        name: entry.label,
-                        icon: entry.icon
-                    }
-                }
-                if(Array.isArray(entry.data) === false) {
-                    pasteEntry.blockConfigModel = modelObject.getBlockConfiguration(entry.data.data.contentTypeKey);
-                }
-                vm.clipboardItems.push(pasteEntry);
-            });
-
-            vm.clipboardItems.sort( (a, b) => {
-                return b.date - a.date
-            });
-
-            if (firstTime !== true && vm.clipboardItems.length > oldAmount) {
-                jumpClipboard();
-            }
-
-            pasteSingleBlockAction.isDisabled = vm.clipboardItems.length === 0;
-        }
-
-        var jumpClipboardTimeout;
-        function jumpClipboard() {
-
-            if (jumpClipboardTimeout) {
-                return;
-            }
-
-            vm.jumpClipboardButton = true;
-            jumpClipboardTimeout = $timeout(() => {
-                vm.jumpClipboardButton = false;
-                jumpClipboardTimeout = null;
-            }, 2000);
-        }
-
-        function requestCopyAllBlocks() {
-
-            var aliases = [];
-
-            var elementTypesToCopy = vm.layout.filter(entry => entry.$block.config.unsupported !== true).map(
-                (entry) => {
-
-                    aliases.push(entry.$block.content.contentTypeAlias);
-
-                    // No need to clone the data as its begin handled by the clipboardService.
-                    return { "layout": entry.$block.layout, "data": entry.$block.data, "settingsData": entry.$block.settingsData }
-                }
-            );
-
-            // remove duplicate aliases
-            aliases = aliases.filter((item, index) => aliases.indexOf(item) === index);
-
-            var contentNodeName = "?";
-            var contentNodeIcon = null;
-            if (vm.umbVariantContent) {
-                contentNodeName = vm.umbVariantContent.editor.content.name;
-                if (vm.umbVariantContentEditors) {
-                    contentNodeIcon = vm.umbVariantContentEditors.content.icon.split(" ")[0];
-                } else if (vm.umbElementEditorContent) {
-                    contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon.split(" ")[0];
-                }
-            } else if (vm.umbElementEditorContent) {
-                contentNodeName = vm.umbElementEditorContent.model.documentType.name;
-                contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon.split(" ")[0];
-            }
-
-            localizationService.localize("clipboard_labelForArrayOfItemsFrom", [vm.model.label, contentNodeName]).then(function (localizedLabel) {
-                clipboardService.copyArray(clipboardService.TYPES.BLOCK, aliases, elementTypesToCopy, localizedLabel, contentNodeIcon || "icon-thumbnail-list", vm.model.id);
-            });
-        };
-
-        function copyBlock(block) {
-            clipboardService.copy(clipboardService.TYPES.BLOCK, block.content.contentTypeAlias, {"layout": block.layout, "data": block.data, "settingsData":block.settingsData}, block.label, block.content.icon, block.content.udi);
-        }
-
-        function requestPasteFromClipboard(index, pasteEntry, pasteType) {
-
-            if (pasteEntry === undefined) {
-                return false;
-            }
-
-            if (vm.singleBlockMode) {
-                if (vm.layout.length > 0) {
-                  deleteBlock(vm.layout[0].$block);
-                  index = 1;
-                }
-            }
-
-            var layoutEntry;
-            if (pasteType === clipboardService.TYPES.ELEMENT_TYPE) {
-                layoutEntry = modelObject.createFromElementType(pasteEntry);
-            } else if (pasteType === clipboardService.TYPES.BLOCK) {
-                layoutEntry = modelObject.createFromBlockData(pasteEntry);
-            } else {
-                // Not a supported paste type.
-                return false;
-            }
-
-            if (layoutEntry === null) {
-                // Pasting did not go well.
-                return false;
-            }
-
-            // make block model
-            var blockObject = getBlockObject(layoutEntry);
-            if (blockObject === null) {
-                // Initialization of the Block Object didn't go well, therefor we will fail the paste action.
-                return false;
-            }
-
-            // set the BlockObject on our layout entry.
-            layoutEntry.$block = blockObject;
-
-            // insert layout entry at the desired location in layout.
-            vm.layout.splice(index, 0, layoutEntry);
-
-            vm.currentBlockInFocus = blockObject;
-
-            return true;
-        }
-
-        function requestDeleteBlock(block) {
-            if (vm.readonly) return;
-
-            localizationService.localizeMany(["general_delete", "blockEditor_confirmDeleteBlockMessage", "contentTypeEditor_yesDelete"]).then(function (data) {
-                const overlay = {
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [block.label]),
-                    submitButtonLabel: data[2],
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        deleteBlock(block);
-                        overlayService.close();
-                    }
-                };
-
-                overlayService.confirmDelete(overlay);
-            });
-        }
-
-        function requestDeleteAllBlocks() {
-            localizationService.localizeMany(["content_nestedContentDeleteAllItems", "general_delete"]).then(function (data) {
-                overlayService.confirmDelete({
-                    title: data[1],
-                    content: data[0],
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        deleteAllBlocks();
-                        overlayService.close();
-                    }
-                });
-            });
-        }
-
-        function openSettingsForBlock(block, blockIndex, parentForm) {
-            editBlock(block, true, blockIndex, parentForm);
-        }
-
-        vm.blockEditorApi = {
-            activateBlock: activateBlock,
-            editBlock: editBlock,
-            copyBlock: copyBlock,
-            requestDeleteBlock: requestDeleteBlock,
-            deleteBlock: deleteBlock,
-            openSettingsForBlock: openSettingsForBlock,
-            readonly: vm.readonly,
-            singleBlockMode: vm.singleBlockMode
-        };
-
-        function onAmountOfBlocksChanged() {
-
-            // enable/disable property actions
-            if (copyAllBlocksAction) {
-                copyAllBlocksAction.isDisabled = vm.layout.length === 0;
-            }
-
-            if (deleteAllBlocksAction) {
-                deleteAllBlocksAction.isDisabled = vm.layout.length === 0 || vm.readonly;
-            }
-
-            // validate limits:
-            if (vm.propertyForm && vm.validationLimit) {
-
-                var isMinRequirementGood = vm.validationLimit.min === null || vm.layout.length >= vm.validationLimit.min;
-                vm.propertyForm.minCount.$setValidity("minCount", isMinRequirementGood);
-
-                var isMaxRequirementGood = vm.validationLimit.max === null || vm.layout.length <= vm.validationLimit.max;
-                vm.propertyForm.maxCount.$setValidity("maxCount", isMaxRequirementGood);
-            }
-        }
-
-        unsubscribe.push($scope.$watch(() => vm.layout.length, onAmountOfBlocksChanged));
-
-        $scope.$on("$destroy", function () {
-            for (const subscription of unsubscribe) {
-                subscription();
-            }
-        });
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js
deleted file mode 100644
index 365ec809ac..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.createButton.controller.js
+++ /dev/null
@@ -1,18 +0,0 @@
-(function () {
-    "use strict";
-
-    angular
-    .module("umbraco")
-    .controller("Umbraco.PropertyEditors.BlockListPropertyEditor.CreateButtonController", 
-    function Controller($scope) {
-        
-        var vm = this;
-        vm.plusPosX = 0;
-
-        vm.onMouseMove = function ($event) {
-            vm.plusPosX = $event.offsetX;
-        };
-
-    });
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js
deleted file mode 100644
index ec58b5a37f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js
+++ /dev/null
@@ -1,86 +0,0 @@
-(function () {
-  "use strict";
-
-  /**
-   * @ngdoc directive
-   * @name umbraco.directives.directive:umbBlockListBlock
-   * @description
-   * The component to render the view for a block.
-   * If a stylesheet is used then this uses a ShadowDom to make a scoped element.
-   * This way the backoffice styling does not collide with the block style.
-   */
-
-  angular
-    .module("umbraco")
-    .component("umbBlockListBlock", {
-      controller: BlockListBlockController,
-      controllerAs: "model",
-      bindings: {
-        stylesheet: "@",
-        view: "@",
-        block: "=",
-        api: "<",
-        index: "<",
-        parentForm: "<"
-      },
-      require: {
-        valFormManager: "^^valFormManager"
-      }
-    }
-  );
-
-  function BlockListBlockController($scope, $compile, $element) {
-    var model = this;
-
-    model.$onInit = function () {
-      // This is ugly and is only necessary because we are not using components and instead
-      // relying on ng-include. It is definitely possible to compile the contents
-      // of the view into the DOM using $templateCache and $http instead of using
-      // ng - include which means that the controllerAs flows directly to the view.
-      // This would mean that any custom components would need to be updated instead of relying on $scope.
-      // Guess we'll leave it for now but means all things need to be copied to the $scope and then all
-      // primitives need to be watched.
-
-      // let the Block know about its form
-      model.block.setParentForm(model.parentForm);
-
-      // let the Block know about the current index
-      model.block.index = model.index;
-
-      $scope.block = model.block;
-      $scope.api = model.api;
-      $scope.index = model.index;
-      $scope.parentForm = model.parentForm;
-      $scope.valFormManager = model.valFormManager;
-
-      if (model.stylesheet) {
-        var shadowRoot = $element[0].attachShadow({ mode: 'open' });
-        shadowRoot.innerHTML = `
-                    <style>
-                    @import "${model.stylesheet}"
-                    </style>
-                    <div class="umb-block-list__block--view" ng-include="'${model.view}'"></div>
-                `;
-        $compile(shadowRoot)($scope);
-      }
-      else {
-        $element.append($compile('<div class="umb-block-list__block--view" ng-include="model.view"></div>')($scope));
-      }
-    };
-
-    // We need to watch for changes on primitive types and update the $scope values.
-    model.$onChanges = function (changes) {
-      if (changes.index) {
-        var index = changes.index.currentValue;
-        $scope.index = index;
-
-        // let the Block know about the current index:
-        if ($scope.block) {
-          $scope.block.index = index;
-        }
-      }
-    };
-  }
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistrow.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistrow.component.js
deleted file mode 100644
index a79ee557a2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistrow.component.js
+++ /dev/null
@@ -1,37 +0,0 @@
-(function () {
-    "use strict";
-
-    /**
-     * @ngdoc directive
-     * @name umbraco.directives.directive:umbBlockListRow
-     * @description
-     * renders each row for the block list editor
-     */
-    
-    angular
-        .module("umbraco")
-        .component("umbBlockListRow", {
-            templateUrl: 'views/propertyeditors/blocklist/umb-block-list-row.html',
-            controller: BlockListRowController,
-            controllerAs: "vm",
-            bindings: {
-                blockEditorApi: "<",
-                layout: "<",
-                index: "<"
-            },
-            require: {
-                valFormManager: "^^valFormManager"
-            }
-        }
-    );
-
-    function BlockListRowController($scope) {
-
-        var vm = this;
-
-        vm.$onInit = function () {
-          
-        };
-    }   
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
deleted file mode 100644
index 313a72ed1c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
+++ /dev/null
@@ -1,80 +0,0 @@
-function booleanEditorController($scope) {
-
-    // Setup the default config
-    // This allow to overwrite the configuration when property editor is re-used
-    // in e.g. third party packages, dashboard or content app. For example when using umb-property-editor.
-    // At the moment this use "1/0" as default for "truevalue" and "falsevalue", but allow "True/False" as well.
-    // Maybe sometime later we can make it support "Yes/No" or "On/Off" as well similar to ng-true-value and ng-false-value in Angular.
-    var config = {
-        truevalue: "1",
-        falsevalue: "0",
-        showLabels: false
-    };
-
-    if ($scope.model.config) {
-        $scope.model.config.showLabels = $scope.model.config.showLabels ? Object.toBoolean($scope.model.config.showLabels) : config.showLabels;
-    }
-
-    // Map the user config
-    Utilities.extend(config, $scope.model.config);
-
-    function setupViewModel() {
-
-        $scope.renderModel = {
-            value: false
-        };
-
-        if (config && config.default && Object.toBoolean(config.default) && $scope.model && !$scope.model.value) {
-            $scope.renderModel.value = true;
-        }
-
-        if ($scope.model && $scope.model.value && Object.toBoolean($scope.model.value)) {
-            $scope.renderModel.value = true;
-        }
-    }
-
-    function setDirty() {
-        if ($scope.modelValueForm) {
-            $scope.modelValueForm.modelValue.$setDirty();
-        }
-    }
-
-    setupViewModel();
-
-    if ($scope.model && !$scope.model.value) {
-        $scope.model.value = ($scope.renderModel.value === true) ? config.truevalue : config.falsevalue;
-    }
-
-    // Here we declare a special method which will be called whenever the value has changed from the server
-    // this is instead of doing a watch on the model.value = faster
-    $scope.model.onValueChanged = function (newVal, oldVal) {
-        //update the display val again if it has changed from the server
-        setupViewModel();
-    };
-
-    // If another property editor changes the model.value we want to pick that up and reflect the value in this one.
-    var unsubscribe = $scope.$watch("model.value", function(newVal, oldVal) {
-        if(newVal !== oldVal) {
-            setupViewModel();
-        }
-    });
-
-    // Update the value when the toggle is clicked
-    $scope.toggle = function(){
-        setDirty();
-        if ($scope.renderModel.value){
-            $scope.model.value = config.falsevalue;
-            setupViewModel();
-            return;
-        }
-
-        $scope.model.value = config.truevalue;
-        setupViewModel();
-    };
-
-    $scope.$on('$destroy', function () {
-        unsubscribe();
-    });
-
-}
-angular.module("umbraco").controller("Umbraco.PropertyEditors.BooleanController", booleanEditorController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
deleted file mode 100644
index 1b2f0010df..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="umb-property-editor umb-boolean" ng-controller="Umbraco.PropertyEditors.BooleanController">
-
-    <ng-form name="modelValueForm">
-
-        <umb-toggle input-id="{{model.alias}}"
-                    checked="renderModel.value"
-                    disabled="model.readonly"
-                    on-click="toggle()"
-                    show-labels="{{model.config.showLabels}}"
-                    label-position="right"
-                    label-on="{{model.config.labelOn}}"
-                    label-off="{{model.config.labelOff}}"
-                    ng-attr-readonly="{{readonly || undefined}}">
-        </umb-toggle>
-
-        <input type="hidden" name="modelValue" ng-model="renderModel.value" />
-    </ng-form>
-    
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js
deleted file mode 100644
index 4e0c269fbf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js
+++ /dev/null
@@ -1,54 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PropertyEditors.ChangePasswordController",
-  function ($scope, $routeParams) {
-
-    $scope.isNew = $routeParams.create;
-
-    function resetModel() {
-      //the model config will contain an object, if it does not we'll create defaults      
-      /*
-      {
-          hasPassword: true/false,          
-          minPasswordLength: 10
-      }
-      */
-
-      //set defaults if they are not available
-      if (!$scope.model.config || $scope.model.config.disableToggle === undefined) {
-        $scope.model.config.disableToggle = false;
-      }
-      if (!$scope.model.config || $scope.model.config.hasPassword === undefined) {
-        $scope.model.config.hasPassword = false;
-      }      
-      if (!$scope.model.config || $scope.model.config.minPasswordLength === undefined) {
-        $scope.model.config.minPasswordLength = 0;
-      }
-      if (!$scope.model.config || $scope.model.config.minNonAlphaNumericChars === undefined) {
-          $scope.model.config.minNonAlphaNumericChars = 0;
-      }
-
-      //set the model defaults
-      if (!Utilities.isObject($scope.model.value)) {
-        //if it's not an object then just create a new one
-        $scope.model.value = {
-          newPassword: null,
-          oldPassword: null,
-          reset: null,
-          answer: null
-        };
-      }
-      else {
-        //just reset the values
-
-        if (!$scope.isNew) {
-          //if it is new, then leave the generated pass displayed
-          $scope.model.value.newPassword = null;
-          $scope.model.value.oldPassword = null;
-        }
-        $scope.model.value.reset = null;
-        $scope.model.value.answer = null;
-      }
-    }
-
-    resetModel();    
-
-  });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html
deleted file mode 100644
index cf70622175..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.ChangePasswordController">
-  <change-password is-new="isNew"
-                   password-values="model.value"
-                   config="model.config">
-  </change-password>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
deleted file mode 100644
index 9226ce14d5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
+++ /dev/null
@@ -1,105 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListController",
-    function ($scope, validationMessageService) {
-        
-        const vm = this;
-        
-        vm.configItems = [];
-        vm.viewItems = [];
-        vm.change = change;
-        
-        function init() {
-
-            vm.uniqueId = String.CreateGuid();
-            
-            // currently the property editor will only work if our input is an object.
-            if (Utilities.isObject($scope.model.config.items)) {
-
-                // formatting the items in the dictionary into an array
-                let sortedItems = [];
-                let vals = _.values($scope.model.config.items);
-                let keys = _.keys($scope.model.config.items);
-                
-                for (var i = 0; i < vals.length; i++) {
-                    sortedItems.push({ key: keys[i], sortOrder: vals[i].sortOrder, value: vals[i].value});
-                }
-
-                // ensure the items are sorted by the provided sort order
-                sortedItems.sort((a, b) => (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0) );
-                
-                vm.configItems = sortedItems;
-                
-                if ($scope.model.value === null || $scope.model.value === undefined) {
-                    $scope.model.value = [];
-                }
-                
-                // update view model.
-                generateViewModel($scope.model.value);
-                
-                //watch the model.value in case it changes so that we can keep our view model in sync
-                $scope.$watchCollection("model.value", updateViewModel);
-            }
-            
-            // Set the message to use for when a mandatory field isn't completed.
-            // Will either use the one provided on the property type or a localised default.
-            validationMessageService.getMandatoryMessage($scope.model.validation).then(value => {
-                $scope.mandatoryMessage = value;
-            });  
-            
-        }
-        
-        function updateViewModel(newVal) {
-            
-            let i = vm.configItems.length;
-            while(i--) {
-                
-                const item = vm.configItems[i];
-                
-                // are this item the same in the model
-                if (item.checked !== (newVal.indexOf(item.value) !== -1)) {
-                    
-                    // if not lets update the full model.
-                    generateViewModel(newVal);
-                    
-                    return;
-                }
-            }
-            
-        }
-            
-        function generateViewModel(newVal) {
-            
-            vm.viewItems = [];
-            
-            let iConfigItem;
-            for (let i = 0; i < vm.configItems.length; i++) {
-                iConfigItem = vm.configItems[i];
-                const isChecked = _.contains(newVal, iConfigItem.value);
-                vm.viewItems.push({
-                    checked: isChecked,
-                    key: iConfigItem.key,
-                    value: iConfigItem.value
-                });
-            }
-        }
-
-        function change(model, value) {
-            
-            const index = $scope.model.value.indexOf(value);
-            
-            if (model === true) {
-                //if it doesn't exist in the model, then add it
-                if (index < 0) {
-                    $scope.model.value.push(value);
-                }
-            } else {
-                //if it exists in the model, then remove it
-                if (index >= 0) {
-                    $scope.model.value.splice(index, 1);
-                }
-            }
-            
-        }
-
-        init();
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
deleted file mode 100644
index 7682af355e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="umb-property-editor umb-checkboxlist" ng-controller="Umbraco.PropertyEditors.CheckboxListController as vm">
-
-    <ng-form name="checkboxListFieldForm">
-
-        <ul class="unstyled" ng-if="vm.viewItems.length">
-            <li ng-repeat="item in vm.viewItems track by item.key">
-                <umb-checkbox 
-                    name="{{::model.alias}}_{{::vm.uniqueId}}" 
-                    value="{{::item.value}}" 
-                    model="item.checked" 
-                    text="{{::item.value}}" 
-                    on-change="vm.change(model, value)" 
-                    required="model.validation.mandatory && !model.value.length"
-                    ng-attr-readonly="{{ readonly || undefined }}">
-                </umb-checkbox>
-            </li>
-        </ul>
-
-        <div ng-messages="checkboxListFieldForm[model.alias + '_' + vm.uniqueId].$error" show-validation-on-submit>
-            <p class="help-inline" ng-message="required">{{mandatoryMessage}}</p>
-        </div>
-
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
deleted file mode 100644
index c04853957b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
+++ /dev/null
@@ -1,148 +0,0 @@
-function ColorPickerController($scope, $timeout) {
-
-    var vm = this;
-
-    // setup the default config
-    var config = {
-        items: [],
-        multiple: false
-    };
-    
-    // map the user config
-    Utilities.extend(config, $scope.model.config);
-
-    // map back to the model
-    $scope.model.config = config;
-    
-    $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
-
-    if ($scope.isConfigured) {
-
-        for (var key in $scope.model.config.items) {
-            if (!$scope.model.config.items[key].hasOwnProperty("value"))
-                $scope.model.config.items[key] = {
-                    value: $scope.model.config.items[key],
-                    label: $scope.model.config.items[key]
-                };
-        }
-
-        $scope.model.useLabel = Object.toBoolean($scope.model.config.useLabel);
-        initActiveColor();
-    }
-
-    if (!Utilities.isArray($scope.model.config.items)) {
-        //make an array from the dictionary
-        var items = [];
-        for (var i in $scope.model.config.items) {
-            var oldValue = $scope.model.config.items[i];
-            if (Object.prototype.hasOwnProperty.call(oldValue, "value")) {
-                items.push({
-                    value: oldValue.value,
-                    label: oldValue.label,
-                    sortOrder: oldValue.sortOrder,
-                    id: i
-                });
-            } else {
-                items.push({
-                    value: oldValue,
-                    label: oldValue,
-                    sortOrder: oldValue.sortOrder,
-                    id: i
-                });
-            }
-        }
-
-        //ensure the items are sorted by the provided sort order
-        items.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
-
-        //now make the editor model the array
-        $scope.model.config.items = items;
-    }
-
-    vm.selectColor = function (color) {
-        // this is required to re-validate
-        $timeout(function () {
-            var newColor = color ? color.value : null;
-            vm.modelValueForm.selectedColor.$setViewValue(newColor);
-        });
-    };
-
-    // Method required by the valPropertyValidator directive (returns true if the property editor has at least one color selected)
-    $scope.validateMandatory = function () {
-        var isValid = !$scope.model.validation.mandatory || (
-            $scope.model.value != null
-            && $scope.model.value != ""
-            && (!Object.prototype.hasOwnProperty.call($scope.model.value, "value") || $scope.model.value.value !== "")
-        );
-        return {
-            isValid: isValid,
-            errorMsg: $scope.model.validation.mandatoryMessage || "Value cannot be empty",
-            errorKey: "required"
-        };
-    };
-
-    // Finds the color best matching the model's color,
-    // and sets the model color to that one. This is useful when
-    // either the value or label was changed on the data type.
-    function initActiveColor() {
-
-        // no value
-        if (!$scope.model.value)
-            return;
-
-        // Backwards compatibility, the color used to be stored as a hex value only
-        if (typeof $scope.model.value === "string") {
-            $scope.model.value = { value: $scope.model.value, label: $scope.model.value };
-        }
-
-        // Complex color (value and label)?
-        if (!Object.prototype.hasOwnProperty.call($scope.model.value, "value"))
-            return;
-
-        var modelColor = $scope.model.value.value;
-        var modelLabel = $scope.model.value.label;
-
-        // Check for a full match or partial match.
-        var item;
-        var foundItem = null;
-
-        // Look for a fully matching color.
-        for (var key in $scope.model.config.items) {
-            item = $scope.model.config.items[key];
-            if (item.value == modelColor && item.label == modelLabel) {
-                foundItem = item;
-                break;
-            }
-        }
-
-        // Look for a color with a matching value.
-        if (!foundItem) {
-            for (var valueKey in $scope.model.config.items) {
-                item = $scope.model.config.items[valueKey];
-                if (item.value == modelColor) {
-                    foundItem = item;
-                    break;
-                }
-            }
-        }
-
-        // Look for a color with a matching label.
-        if (!foundItem) {
-            for (var colorKey in $scope.model.config.items) {
-                item = $scope.model.config.items[colorKey];
-                if (item.label == modelLabel) {
-                    foundItem = item;
-                    break;
-                }
-            }
-        }
-
-        // If a match was found, set it as the active color.
-        if (foundItem) {
-            $scope.model.value.value = foundItem.value;
-            $scope.model.value.label = foundItem.label;
-        }
-    }
-}
-
-angular.module("umbraco").controller("Umbraco.PropertyEditors.ColorPickerController", ColorPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
deleted file mode 100644
index b4c01a4920..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.ColorPickerController as vm">
-
-    <ng-form name="vm.modelValueForm">
-        <div ng-if="!isConfigured">
-            <localize key="colorpicker_noColors">You haven't defined any colors</localize>
-        </div>
-
-        <umb-color-swatches 
-            colors="model.config.items"
-            selected-color="model.value"
-            size="m"
-            use-label="model.useLabel"
-            on-select="vm.selectColor(color)"
-            ng-attr-readonly="{{ readonly || undefined }}">
-        </umb-color-swatches>
-
-        <input type="hidden" name="selectedColor" ng-model="model.selectedColor" val-property-validator="validateMandatory" />
-    </ng-form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
deleted file mode 100644
index 5f6f784f55..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<div class="umb-property-editor umb-prevalues-multivalues umb-colors" ng-controller="Umbraco.PrevalueEditors.MultiColorPickerController as vm">
-  <div class="control-group  umb-prevalues-multivalues__add color-picker-preval">
-    <div class="umb-prevalues-multivalues__left">
-
-      <umb-color-picker ng-model="newColor"
-                        options="options"
-                        on-hide="vm.hide(color)"
-                        on-show="vm.show(color)"
-                        on-change="vm.change(color)">
-      </umb-color-picker>
-
-      <label val-highlight="{{colorHasError}}">#{{newColor}}</label>
-      <input type="text" name="newLabel"
-             ng-model="newLabel"
-             focus-when="{{focusOnNew}}"
-             class="umb-property-editor color-label"
-             localize="placeholder"
-             placeholder="@general_label"
-             ng-show="vm.labelEnabled"
-             ng-keydown="vm.addOnEnter($event)"
-             ng-keyup="vm.validateLabel()"
-             val-highlight="{{labelHasError}}" />
-    </div>
-    <div class="umb-prevalues-multivalues__right">
-      <button type="button" class="btn btn-info add" ng-if="vm.editItem == null" ng-click="vm.add($event)"><localize key="general_add">Add</localize></button>
-      <button type="button" class="btn btn-info add" ng-if="vm.editItem != null" ng-click="vm.add($event)"><localize key="general_update">Update</localize></button>
-      <button type="button" class="btn btn-link" ng-if="vm.editItem != null" ng-click="vm.cancel($event)"><localize key="general_cancel">Cancel</localize></button>
-    </div>
-  </div>
-  <div ui-sortable="sortableOptions" ng-model="model.value">
-    <div class="control-group umb-prevalues-multivalues__listitem color-picker-preval" ng-repeat="item in model.value track by $id(item)">
-      <umb-icon icon="icon-navigation" class="icon handle"></umb-icon>
-      <div class="umb-prevalues-multivalues__left">
-        <div class="thumbnail span1" hex-bg-color="{{item.value}}" hex-bg-orig="transparent"></div>
-        <div class="color-picker-prediv">
-          <pre>#{{item.value}}</pre>
-          <span ng-bind="item.label" ng-if="vm.labelEnabled"></span>
-        </div>
-      </div>
-      <div class="umb-prevalues-multivalues__right">
-        <button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="vm.edit(item, $event)"><localize key="general_edit">Edit</localize></button>
-        <button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="vm.remove(item, $event)"><localize key="general_remove">Remove</localize></button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
deleted file mode 100644
index b16722e7de..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
+++ /dev/null
@@ -1,228 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PrevalueEditors.MultiColorPickerController",
-  function ($scope, angularHelper, $element, eventsService) {
-
-    const vm = this;
-
-    vm.add = add;
-    vm.addOnEnter = addOnEnter;
-    vm.validateLabel = validateLabel;
-    vm.remove = remove;
-    vm.edit = edit;
-    vm.cancel = cancel;
-
-    vm.show = show;
-    vm.hide = hide;
-    vm.change = change;
-
-    vm.labelEnabled = false;
-    vm.editItem = null;
-
-    // NOTE: We need to make each color an object, not just a string because you cannot 2-way bind to a primitive.
-    const defaultColor = "000000";
-    const defaultLabel = null;
-
-    $scope.newColor = defaultColor;
-    $scope.newLabel = defaultLabel;
-    $scope.colorHasError = false;
-    $scope.labelHasError = false;
-    $scope.focusOnNew = false;
-
-    $scope.options = {
-      type: "color",
-      color: defaultColor,
-      allowEmpty: false,
-      showAlpha: false
-    };
-
-    function hide() {
-      // show the add button
-      $element.find(".btn.add").show();
-    }
-
-    function show() {
-      // hide the add button
-      $element.find(".btn.add").hide();
-    }
-
-    function change(color) {
-      angularHelper.safeApply($scope, function () {
-        if (color) {
-          $scope.newColor = color.toHexString().trimStart("#");
-          $scope.colorHasError = !colorIsValid();
-        }
-      });
-    }
-
-    var evts = [];
-    evts.push(eventsService.on("toggleValue", function (e, args) {
-      if (args.inputId === "useLabel") {
-        vm.labelEnabled = args.value;
-      }
-    }));
-
-    $scope.$on('$destroy', function () {
-      for (var e in evts) {
-        eventsService.unsubscribe(evts[e]);
-      }
-    });
-
-    if (!Utilities.isArray($scope.model.value)) {
-      //make an array from the dictionary
-      var items = [];
-      for (var i in $scope.model.value) {
-        var oldValue = $scope.model.value[i];
-        if (Object.prototype.hasOwnProperty.call(oldValue, "value")) {
-          items.push({
-            value: oldValue.value,
-            label: oldValue.label,
-            sortOrder: oldValue.sortOrder,
-            id: i
-          });
-        } else {
-          items.push({
-            value: oldValue,
-            label: oldValue,
-            sortOrder: oldValue.sortOrder,
-            id: i
-          });
-        }
-      }
-
-      //ensure the items are sorted by the provided sort order
-      items.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
-
-      //now make the editor model the array
-      $scope.model.value = items;
-    }
-
-    // ensure labels
-    for (var ii = 0; ii < $scope.model.value.length; ii++) {
-      var item = $scope.model.value[ii];
-      item.label = Object.prototype.hasOwnProperty.call(item, "label") ? item.label : item.value;
-    }
-
-    function remove(item, evt) {
-
-      evt.preventDefault();
-
-      $scope.model.value = _.reject($scope.model.value, function (x) {
-        return x.value === item.value && x.label === item.label;
-      });
-
-      setDirty();
-    }
-
-    function colorIsValid() {
-      var colorExists = _.find($scope.model.value, function (item) {
-        return item != vm.editItem && item.value.toUpperCase() === $scope.newColor.toUpperCase();
-      });
-
-      return colorExists ? false : true;
-    }
-
-    function getLabel() {
-      var validLabel = $scope.newLabel !== null && typeof $scope.newLabel !== "undefined" && $scope.newLabel !== "" && $scope.newLabel.length && $scope.newLabel.length > 0;
-      return validLabel ? $scope.newLabel : $scope.newColor;
-    }
-
-    function labelIsValid() {
-      var label = getLabel();
-      label = label.toUpperCase();
-
-      var labelExists = _.find($scope.model.value, function (item) {
-        return item != vm.editItem && item.label.toUpperCase() === label;
-      });
-
-      return labelExists ? false : true;
-    }
-
-    function validateLabel() {
-      $scope.labelHasError = !labelIsValid();
-    }
-
-    function addOnEnter(evt) {
-      if (evt.keyCode === 13) {
-        add(evt);
-      }
-    }
-
-    function add(evt) {
-      evt.preventDefault();
-
-      if ($scope.newColor) {
-
-        $scope.colorHasError = !colorIsValid();
-        $scope.labelHasError = !labelIsValid();
-
-        if ($scope.labelHasError || $scope.colorHasError) {
-          return;
-        }
-
-        var newLabel = getLabel();
-
-        if (vm.editItem == null) {
-          $scope.model.value.push({
-            value: $scope.newColor,
-            label: newLabel
-          });
-        } else {
-
-          if (vm.editItem.value === vm.editItem.label && vm.editItem.value === newLabel) {
-            vm.editItem.label = $scope.newColor;
-
-          }
-          else {
-            vm.editItem.label = newLabel;
-          }
-
-          vm.editItem.value = $scope.newColor;
-
-          vm.editItem = null;
-        }
-
-        $scope.newLabel = "";
-        $scope.colorHasError = false;
-        $scope.labelHasError = false;
-        $scope.focusOnNew = true;
-        setDirty();
-        return;
-
-      }
-    }
-
-    function edit(item, evt) {
-      evt.preventDefault();
-
-      vm.editItem = item;
-
-      $scope.newColor = item.value;
-      $scope.newLabel = item.label;
-    }
-
-    function cancel(evt) {
-      evt.preventDefault();
-
-      vm.editItem = null;
-      $scope.newColor = defaultColor;
-      $scope.newLabel = defaultLabel;
-    }
-
-    function setDirty() {
-      if (vm.modelValueForm) {
-        vm.modelValueForm.selectedColor.$setDirty();
-      }
-    }
-
-    $scope.sortableOptions = {
-      axis: 'y',
-      containment: 'parent',
-      cursor: 'move',
-      //handle: ".handle, .thumbnail",
-      items: '> div.control-group',
-      tolerance: 'pointer',
-      update: function () {
-        setDirty();
-      }
-    };
-
-  });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
deleted file mode 100644
index a6fc601d8f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ /dev/null
@@ -1,635 +0,0 @@
-
-/**
- * The controller that is used for a couple different Property Editors: Multi Node Tree Picker, Content Picker,
- * since this is used by MNTP and it supports content, media and members, there is code to deal with all 3 of those types
- * @param {any} $scope
- * @param {any} $q
- * @param {any} $routeParams
- * @param {any} $location
- * @param {any} entityResource
- * @param {any} editorState
- * @param {any} iconHelper
- * @param {any} angularHelper
- * @param {any} navigationService
- * @param {any} localizationService
- * @param {any} editorService
- * @param {any} userService
- */
-function contentPickerController($scope, $q, $routeParams, $location, entityResource, editorState, iconHelper, navigationService, localizationService, editorService, userService, overlayService) {
-
-    var vm = {
-        labels: {
-            general_recycleBin: "",
-            general_add: ""
-        }
-    };
-
-    var unsubscribe;
-
-    function subscribe() {
-        unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
-            var currIds = _.map($scope.renderModel, function (i) {
-                return $scope.model.config.idType === "udi" ? i.udi : i.id;
-            });
-            $scope.model.value = trim(currIds.join(), ",");
-        });
-    }
-
-    function trim(str, chr) {
-        var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
-        return str.replace(rgxtrim, '');
-    }
-
-    /** Performs validation based on the renderModel data */
-    function validate() {
-        if ($scope.contentPickerForm) {
-            //Validate!
-            var hasItemsOrMandatory = $scope.renderModel.length !== 0 || ($scope.model.validation && $scope.model.validation.mandatory);
-            if (hasItemsOrMandatory && $scope.minNumberOfItems && $scope.minNumberOfItems > $scope.renderModel.length) {
-                $scope.contentPickerForm.minCount.$setValidity("minCount", false);
-            }
-            else {
-                $scope.contentPickerForm.minCount.$setValidity("minCount", true);
-            }
-
-            if ($scope.maxNumberOfItems && $scope.maxNumberOfItems < $scope.renderModel.length) {
-                $scope.contentPickerForm.maxCount.$setValidity("maxCount", false);
-            }
-            else {
-                $scope.contentPickerForm.maxCount.$setValidity("maxCount", true);
-            }
-        }
-    }
-
-    function startWatch() {
-
-        //due to the way angular-sortable works, it needs to update a model, we don't want it to update renderModel since renderModel
-        //is updated based on changes to model.value so if we bound angular-sortable to that and put a watch on it we'd end up in a
-        //infinite loop. Instead we have a custom array model for angular-sortable and we'll watch that which we'll use to sync the model.value
-        //which in turn will sync the renderModel.
-        $scope.$watchCollection("sortableModel", function (newVal, oldVal) {
-            $scope.model.value = newVal.join();
-        });
-
-        //if the underlying model changes, update the view model, this ensures that the view is always consistent with the underlying
-        //model if it changes (i.e. based on server updates, or if used in split view, etc...)
-        $scope.$watch("model.value", function (newVal, oldVal) {
-            if (newVal !== oldVal) {
-                syncRenderModel(true);
-            }
-        });
-    }
-
-    $scope.renderModel = [];
-    $scope.sortableModel = [];
-
-    $scope.labels = vm.labels;
-
-    $scope.dialogEditor = editorState && editorState.current && editorState.current.isDialogEditor === true;
-
-    //the default pre-values
-    var defaultConfig = {
-        multiPicker: false,
-        showOpenButton: false,
-        showEditButton: false,
-        showPathOnHover: false,
-        dataTypeKey: null,
-        maxNumber: 1,
-        minNumber: 0,
-        startNode: {
-            query: "",
-            dynamicRoot: null,
-            type: "content",
-            id: $scope.model.config.startNodeId ? $scope.model.config.startNodeId : -1 // get start node for simple Content Picker
-        }
-    };
-
-    let removeAllEntriesAction = {
-        labelKey: "clipboard_labelForRemoveAllEntries",
-        labelTokens: [],
-        icon: "icon-trash",
-        method: removeAllEntries,
-        isDisabled: true,
-        useLegacyIcon: false
-    };
-
-    if ($scope.model.config) {
-        //special case, if the `startNode` is falsy on the server config delete it entirely so the default value is merged in
-        if (!$scope.model.config.startNode) {
-            delete $scope.model.config.startNode;
-        }
-        //merge the server config on top of the default config, then set the server config to use the result
-        $scope.model.config = Utilities.extend(defaultConfig, $scope.model.config);
-
-        // if the property is mandatory, set the minCount config to 1 (unless of course it is set to something already),
-        // that way the minCount/maxCount validation handles the mandatory as well
-        if ($scope.model.validation && $scope.model.validation.mandatory && !$scope.model.config.minNumber) {
-            $scope.model.config.minNumber = 1;
-        }
-
-        if ($scope.model.config.multiPicker === true && $scope.umbProperty) {
-            var propertyActions = [
-                removeAllEntriesAction
-            ];
-
-            $scope.umbProperty.setPropertyActions(propertyActions);
-        }
-
-        // use these to avoid the nested property lookups/null-checks
-        $scope.minNumberOfItems = $scope.model.config.minNumber ? parseInt($scope.model.config.minNumber) : 0;
-        $scope.maxNumberOfItems = $scope.model.config.maxNumber ? parseInt($scope.model.config.maxNumber) : 0;
-    }
-
-    // sortable options
-    $scope.sortableOptions = {
-        axis: "y",
-        containment: "parent",
-        distance: 10,
-        opacity: 0.7,
-        tolerance: "pointer",
-        scroll: true,
-        zIndex: 6000,
-        disabled: $scope.readonly || $scope.maxNumberOfItems === 1,
-        update: function (e, ui) {
-          setDirty();
-        }
-    };
-
-    //Umbraco persists boolean for prevalues as "0" or "1" so we need to convert that!
-    $scope.model.config.multiPicker = Object.toBoolean($scope.model.config.multiPicker);
-    $scope.model.config.showOpenButton = Object.toBoolean($scope.model.config.showOpenButton);
-    $scope.model.config.showEditButton = Object.toBoolean($scope.model.config.showEditButton);
-    $scope.model.config.showPathOnHover = Object.toBoolean($scope.model.config.showPathOnHover);
-
-    var entityType = $scope.model.config.startNode.type === "member"
-        ? "Member"
-        : $scope.model.config.startNode.type === "media"
-            ? "Media"
-            : "Document";
-
-    $scope.allowOpenButton = false;
-    $scope.allowEditButton = entityType === "Document" && !$scope.readonly;
-    $scope.allowRemove = !$scope.readonly;
-    $scope.allowAdd = !$scope.readonly;
-
-    //the dialog options for the picker
-    var dialogOptions = {
-        multiPicker: $scope.model.config.multiPicker,
-        entityType: entityType,
-        filterCssClass: "not-allowed not-published",
-        startNodeId: null,
-        dataTypeKey: $scope.model.dataTypeKey,
-        currentNode: editorState ? editorState.current : null,
-        callback: function (data) {
-            if (Utilities.isArray(data)) {
-                _.each(data, function (item, i) {
-                    $scope.add(item);
-                });
-            } else {
-                $scope.clear();
-                $scope.add(data);
-            }
-            setDirty();
-        },
-        treeAlias: $scope.model.config.startNode.type,
-        section: $scope.model.config.startNode.type,
-        idType: "udi"
-    };
-
-    //since most of the pre-value config's are used in the dialog options (i.e. maxNumber, minNumber, etc...) we'll merge the
-    // pre-value config on to the dialog options
-    Utilities.extend(dialogOptions, $scope.model.config);
-
-    dialogOptions.dataTypeKey = $scope.model.dataTypeKey;
-
-    // if we can't pick more than one item, explicitly disable multiPicker in the dialog options
-    if ($scope.maxNumberOfItems === 1) {
-        dialogOptions.multiPicker = false;
-    }
-
-    // add the current filter (if any) as title for the filtered out nodes
-    if ($scope.model.config.filter) {
-        localizationService.localize("contentPicker_allowedItemTypes", [$scope.model.config.filter]).then(function (data) {
-            dialogOptions.filterTitle = data;
-        });
-    }
-
-    //We need to manually handle the filter for members here since the tree displayed is different and only contains
-    // searchable list views
-    if (entityType === "Member") {
-        //first change the not allowed filter css class
-        dialogOptions.filterCssClass = "not-allowed";
-        var currFilter = dialogOptions.filter;
-        //now change the filter to be a method
-        dialogOptions.filter = function (i) {
-            //filter out the list view nodes
-            if (i.metaData.isContainer) {
-                return true;
-            }
-            if (!currFilter) {
-                return false;
-            }
-            //now we need to filter based on what is stored in the pre-vals, this logic duplicates what is in the treepicker.controller,
-            // but not much we can do about that since members require special filtering.
-            var filterItem = currFilter.toLowerCase().split(',');
-            // NOTE: when used in a mini list view, the item content type alias is metaData.ContentTypeAlias (in regular views it's metaData.contentType)
-            var itemContentType = i.metaData.contentType || i.metaData.ContentTypeAlias;
-            var found = filterItem.indexOf(itemContentType.toLowerCase()) >= 0;
-            if (!currFilter.startsWith("!") && !found || currFilter.startsWith("!") && found) {
-                return true;
-            }
-
-            return false;
-        }
-    }
-    if ($routeParams.section === "settings" && $routeParams.tree === "documentTypes") {
-        //if the content-picker is being rendered inside the document-type editor, we don't need to process the startnode query
-        dialogOptions.startNodeId = -1;
-    }
-    else if ($scope.model.config.startNode.query) {
-        entityResource.getByXPath(
-            $scope.model.config.startNode.query,
-            editorState.current.id,
-            editorState.current.parentId,
-            "Document"
-        ).then(function (ent) {
-            dialogOptions.startNodeId = ($scope.model.config.idType === "udi" ? ent.udi : ent.id).toString();
-        });
-    }
-    else if ($scope.model.config.startNode.dynamicRoot) {
-
-        entityResource.getDynamicRoot(
-          JSON.stringify($scope.model.config.startNode.dynamicRoot),
-            editorState.current.id,
-            editorState.current.parentId,
-            $scope.model.culture,
-            $scope.model.segment
-        ).then(function (ent) {
-          if(ent) {
-            dialogOptions.startNodeId = ($scope.model.config.idType === "udi" ? ent.udi : ent.id).toString();
-          } else {
-            console.error("The Dynamic Root query did not find any valid results");
-            $scope.invalidStartNode = true;
-          }
-        });
-    }
-
-    else {
-        dialogOptions.startNodeId = $scope.model.config.startNode.id;
-    }
-
-    //dialog
-    $scope.openCurrentPicker = function () {
-        if($scope.invalidStartNode) {
-
-          localizationService.localizeMany(["dynamicRoot_noValidStartNodeTitle", "dynamicRoot_noValidStartNodeDesc"]).then(function (data) {
-            overlayService.open({
-              title: data[0],
-              content: data[1],
-              hideSubmitButton: true,
-              close: () => {
-                  overlayService.close();
-              },
-              submit: () => {
-                  // close the confirmation
-                  overlayService.close();
-              }
-            });
-          });
-          return;
-        }
-
-        $scope.currentPicker = dialogOptions;
-
-        $scope.currentPicker.submit = function (model) {
-            if (Utilities.isArray(model.selection)) {
-                _.each(model.selection, function (item, i) {
-                    $scope.add(item);
-                });
-                setDirty();
-            }
-            setDirty();
-            editorService.close();
-        }
-
-        $scope.currentPicker.close = function () {
-            editorService.close();
-        }
-
-        //open the correct editor based on the entity type
-        switch (entityType) {
-            case "Document":
-                editorService.contentPicker($scope.currentPicker);
-                break;
-            case "Media":
-                editorService.mediaPicker($scope.currentPicker);
-                break;
-            case "Member":
-                editorService.memberPicker($scope.currentPicker);
-                break;
-
-            default:
-        }
-
-    };
-
-    $scope.remove = function (index) {
-        if (!$scope.allowRemove) return;
-
-        var currIds = $scope.model.value ? $scope.model.value.split(',') : [];
-        if (currIds.length > 0) {
-            currIds.splice(index, 1);
-            setDirty();
-            $scope.model.value = currIds.join();
-        }
-
-        removeAllEntriesAction.isDisabled = currIds.length === 0;
-    };
-
-    $scope.showNode = function (index) {
-        var item = $scope.renderModel[index];
-        var id = item.id;
-        var section = $scope.model.config.startNode.type.toLowerCase();
-
-        entityResource.getPath(id, entityType).then(function (path) {
-            navigationService.changeSection(section);
-            navigationService.showTree(section, {
-                tree: section, path: path, forceReload: false, activate: true
-            });
-            var routePath = section + "/" + section + "/edit/" + id.toString();
-            $location.path(routePath).search("");
-        });
-    }
-
-    $scope.add = function (item) {
-        if (!$scope.allowAdd) return;
-
-        var currIds = $scope.model.value ? $scope.model.value.split(',') : [];
-
-        var itemId = ($scope.model.config.idType === "udi" ? item.udi : item.id).toString();
-
-        if (currIds.indexOf(itemId) < 0) {
-            currIds.push(itemId);
-            $scope.model.value = currIds.join();
-        }
-
-        removeAllEntriesAction.isDisabled = false;
-    };
-
-    $scope.clear = function () {
-        $scope.model.value = null;
-        removeAllEntriesAction.isDisabled = true;
-    };
-
-    $scope.openEditor = function (item) {
-        var editor = {
-            id: entityType === "Member" ? item.key : item.id,
-            submit: function (model) {
-
-                var node = entityType === "Member" ? model.memberNode :
-                           entityType === "Media" ? model.mediaNode :
-                                                    model.contentNode;
-
-                // update the node
-                item.name = node.name;
-
-                if (entityType !== "Member") {
-                    if (entityType === "Document") {
-                        item.published = node.hasPublishedVersion;
-                    }
-                    entityResource.getUrl(node.id, entityType).then(function (data) {
-                        item.url = data;
-                    });
-                }
-                editorService.close();
-            },
-            close: function () {
-                editorService.close();
-            }
-        };
-
-        switch (entityType) {
-            case "Document":
-                editorService.contentEditor(editor);
-                break;
-            case "Media":
-                editorService.mediaEditor(editor);
-                break;
-            case "Member":
-                editorService.memberEditor(editor);
-                break;
-        }
-    };
-
-    //when the scope is destroyed we need to unsubscribe
-    $scope.$on('$destroy', function () {
-        if (unsubscribe) {
-            unsubscribe();
-        }
-    });
-
-    function setDirty() {
-        if ($scope.contentPickerForm && $scope.contentPickerForm.modelValue) {
-            $scope.contentPickerForm.modelValue.$setDirty();
-        }
-    }
-
-    /** Syncs the renderModel based on the actual model.value and returns a promise */
-    function syncRenderModel(doValidation) {
-
-        var valueIds = $scope.model.value ? $scope.model.value.split(',') : [];
-
-        //sync the sortable model
-        $scope.sortableModel = valueIds;
-
-        removeAllEntriesAction.isDisabled = valueIds.length === 0 || $scope.readonly;
-
-        //load current data if anything selected
-        if (valueIds.length > 0) {
-
-            //need to determine which items we already have loaded
-            var renderModelIds = _.map($scope.renderModel, function (d) {
-                return ($scope.model.config.idType === "udi" ? d.udi : d.id).toString();
-            });
-
-            //get the ids that no longer exist
-            var toRemove = _.difference(renderModelIds, valueIds);
-
-
-            //remove the ones that no longer exist
-            for (var j = 0; j < toRemove.length; j++) {
-                var index = renderModelIds.indexOf(toRemove[j]);
-                $scope.renderModel.splice(index, 1);
-            }
-
-            //get the ids that we need to lookup entities for
-            var missingIds = _.difference(valueIds, renderModelIds);
-
-            if (missingIds.length > 0) {
-
-                var requests = [
-                    entityResource.getByIds(missingIds, entityType),
-                    entityResource.getUrlsByIds(missingIds, entityType)
-                ];
-
-                return $q.all(requests).then(function ([data, urlMap]) {
-                    _.each(valueIds,
-                        function (id, i) {
-                            var entity = _.find(data, function (d) {
-                                return $scope.model.config.idType === "udi" ? (d.udi == id) : (d.id == id);
-                            });
-
-                            if (entity) {
-
-                              entity.url = entity.trashed
-                                ? vm.labels.general_recycleBin
-                                : urlMap[id];
-
-                              addSelectedItem(entity);
-                            }
-
-                        });
-
-                    if (doValidation) {
-                        validate();
-                    }
-
-                    setSortingState($scope.renderModel);
-                    return $q.when(true);
-                });
-            }
-            else {
-                //if there's nothing missing, make sure it's sorted correctly
-
-                var current = $scope.renderModel;
-                $scope.renderModel = [];
-                for (var k = 0; k < valueIds.length; k++) {
-                    var id = valueIds[k];
-                    var found = _.find(current, function (d) {
-                        return $scope.model.config.idType === "udi" ? (d.udi == id) : (d.id == id);
-                    });
-                    if (found) {
-                        $scope.renderModel.push(found);
-                    }
-                }
-
-                if (doValidation) {
-                    validate();
-                }
-
-                setSortingState($scope.renderModel);
-                return $q.when(true);
-            }
-        }
-        else {
-            $scope.renderModel = [];
-            if (doValidation) {
-                validate();
-            }
-            setSortingState($scope.renderModel);
-            return $q.when(true);
-        }
-
-    }
-
-    function addSelectedItem(item) {
-
-        // set icon
-        if (item.icon) {
-            item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-        }
-
-        // set default icon
-        if (!item.icon) {
-            switch (entityType) {
-                case "Document":
-                    item.icon = "icon-document";
-                    break;
-                case "Media":
-                    item.icon = "icon-picture";
-                    break;
-                case "Member":
-                    item.icon = "icon-user";
-                    break;
-            }
-        }
-
-        $scope.renderModel.push({
-            "name": item.name,
-            "id": item.id,
-            "udi": item.udi,
-            "icon": item.icon,
-            "path": item.path,
-            "url": item.url,
-            "key": item.key,
-            "trashed": item.trashed,
-            "published": (item.metaData && item.metaData.IsPublished === false && entityType === "Document") ? false : true
-            // only content supports published/unpublished content so we set everything else to published so the UI looks correct
-        });
-    }
-
-    function setSortingState(items) {
-        // disable sorting if the list only consist of one item
-        if (items.length <= 1 || $scope.readonly) {
-            $scope.sortableOptions.disabled = true;
-        } else {
-            $scope.sortableOptions.disabled = false;
-        }
-    }
-
-    function removeAllEntries() {
-        localizationService.localizeMany(["content_nestedContentDeleteAllItems", "general_delete"]).then(function (data) {
-            overlayService.confirmDelete({
-                title: data[1],
-                content: data[0],
-                close: function () {
-                    overlayService.close();
-                },
-                submit: function () {
-                    $scope.clear();
-                    overlayService.close();
-                }
-            });
-        });
-    }
-
-    function init() {
-
-        userService.getCurrentUser().then(function (user) {
-            switch (entityType) {
-                case "Document":
-                    var hasAccessToContent = user.allowedSections.indexOf("content") !== -1;
-                    $scope.allowOpen = hasAccessToContent;
-                    break;
-                case "Media":
-                    var hasAccessToMedia = user.allowedSections.indexOf("media") !== -1;
-                    $scope.allowOpen = hasAccessToMedia;
-                    break;
-                case "Member":
-                    var hasAccessToMember = user.allowedSections.indexOf("member") !== -1;
-                    $scope.allowOpen = hasAccessToMember;
-                    break;
-
-                default:
-            }
-        });
-
-        localizationService.localizeMany(["general_recycleBin", "general_add"])
-            .then(function(data) {
-                vm.labels.general_recycleBin = data[0];
-                vm.labels.general_add = data[1];
-
-                syncRenderModel(false).then(function () {
-                    //everything is loaded, start the watch on the model
-                    startWatch();
-                    subscribe();
-                    validate();
-                });
-            });
-    }
-
-    init();
-
-}
-
-angular.module('umbraco').controller("Umbraco.PropertyEditors.ContentPickerController", contentPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
deleted file mode 100644
index 9e8561cc57..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.ContentPickerController" class="umb-property-editor umb-contentpicker">
-
-    <p ng-if="(renderModel|filter:{trashed:true}).length == 1"><localize key="contentPicker_pickedTrashedItem">You have picked a content item currently deleted or in the recycle bin</localize></p>
-    <p ng-if="(renderModel|filter:{trashed:true}).length > 1"><localize key="contentPicker_pickedTrashedItems">You have picked content items currently deleted or in the recycle bin</localize></p>
-
-    <ng-form name="contentPickerForm">
-
-        <div ui-sortable="sortableOptions" ng-model="sortableModel">
-            <umb-node-preview ng-repeat="node in renderModel track by node.id"
-                              icon="node.icon"
-                              name="node.name"
-                              published="node.published"
-                              description="node.url"
-                              sortable="!sortableOptions.disabled"
-                              allow-remove="allowRemove"
-                              allow-open="model.config.showOpenButton && allowOpen && !dialogEditor && !readonly"
-                              on-remove="remove($index)"
-                              on-open="openEditor(node)">
-            </umb-node-preview>
-        </div>
-
-        <button ng-show="model.config.multiPicker === true && renderModel.length < maxNumberOfItems || renderModel.length === 0 || !maxNumberOfItems"
-                type="button"
-                class="umb-node-preview-add"
-                ng-click="openCurrentPicker()"
-                id="{{model.alias}}"
-                aria-label="{{model.label}}: {{labels.general_add}}"
-                ng-disabled="!allowAdd">
-            <localize key="general_add">Add</localize>
-            <span class="sr-only">...</span>
-        </button>
-
-        <div class="umb-contentpicker__min-max-help" ng-if="model.config.multiPicker === true && (maxNumberOfItems > 1 || minNumberOfItems > 0) && (renderModel.length !== 0 || (model.validation && model.validation.mandatory))">
-
-            <!-- Both min and max items -->
-            <span ng-if="minNumberOfItems && maxNumberOfItems && minNumberOfItems !== maxNumberOfItems">
-                <span ng-if="renderModel.length < maxNumberOfItems">Add between {{minNumberOfItems}} and {{maxNumberOfItems}} item(s)</span>
-                <span ng-if="renderModel.length > maxNumberOfItems">
-                    <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected"> item(s) selected</localize>
-                </span>
-            </span>
-
-            <!-- Equal min and max -->
-            <span ng-if="minNumberOfItems && maxNumberOfItems && minNumberOfItems === maxNumberOfItems">
-                <span ng-if="renderModel.length < maxNumberOfItems">Add {{minNumberOfItems - renderModel.length}} item(s)</span>
-                <span ng-if="renderModel.length > maxNumberOfItems">
-                    <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected"> item(s) selected</localize>
-                </span>
-            </span>
-
-            <!-- Only max -->
-            <span ng-if="!minNumberOfItems && maxNumberOfItems">
-                <span ng-if="renderModel.length < maxNumberOfItems">Add up to {{maxNumberOfItems}} items</span>
-                <span ng-if="renderModel.length > maxNumberOfItems">
-                    <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected">item(s) selected</localize>
-                </span>
-            </span>
-
-            <!-- Only min -->
-            <span ng-if="minNumberOfItems && !maxNumberOfItems && renderModel.length < minNumberOfItems">
-                Add at least {{minNumberOfItems}} item(s)
-            </span>
-
-        </div>
-
-        <input type="hidden" name="modelValue" ng-model="model.value" />
-
-        <!--These are here because we need ng-form fields to validate against-->
-        <input type="hidden" name="minCount" ng-model="renderModel" />
-        <input type="hidden" name="maxCount" ng-model="renderModel" />
-
-        <div ng-messages="contentPickerForm.minCount.$error" show-validation-on-submit>
-            <div class="help-inline" ng-message="minCount">
-                <localize key="validation_minCount">You need to add at least</localize> {{minNumberOfItems}} <localize key="validation_items">item(s)</localize>
-            </div>
-        </div>
-        <div ng-messages="contentPickerForm.maxCount.$error" show-validation-on-submit>
-            <div class="help-inline" ng-message="maxCount">
-                <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected">item(s) selected</localize>
-            </div>
-        </div>
-
-    </ng-form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
deleted file mode 100644
index e210e94aa1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
+++ /dev/null
@@ -1,225 +0,0 @@
-function dateTimePickerController($scope, angularHelper, dateHelper, validationMessageService) {
-
-  const vm = this;
-
-  vm.clearDatePicker = clearDatePicker;
-  vm.inputChanged = inputChanged;
-
-  let flatPickr = null;
-
-  function onInit() {
-
-    $scope.hasDatetimePickerValue = $scope.model.value ? true : false;
-    $scope.model.datetimePickerValue = null;
-    $scope.serverTime = null;
-    $scope.serverTimeNeedsOffsetting = false;
-
-    // setup the default config
-    var config = {
-      pickTime: true,
-      useSeconds: true,
-      format: "YYYY-MM-DD HH:mm:ss",
-      icons: {
-        time: "icon-time",
-        date: "icon-calendar",
-        up: "icon-chevron-up",
-        down: "icon-chevron-down"
-      }
-    };
-
-    // map the user config
-    $scope.model.config = Utilities.extend(config, $scope.model.config);;
-
-    // ensure the format doesn't get overwritten with an empty string
-    if ($scope.model.config.format === "" || $scope.model.config.format === undefined || $scope.model.config.format === null) {
-      $scope.model.config.format = $scope.model.config.pickTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
-    }
-
-    // check whether a server time offset is needed
-    if (Umbraco.Sys.ServerVariables.application.serverTimeOffset !== undefined) {
-      // Will return something like 120
-      var serverOffset = Umbraco.Sys.ServerVariables.application.serverTimeOffset;
-
-      // Will return something like -120
-      var localOffset = new Date().getTimezoneOffset();
-
-      // If these aren't equal then offsetting is needed
-      // note the minus in front of serverOffset needed
-      // because C# and javascript return the inverse offset
-      $scope.serverTimeNeedsOffsetting = (-serverOffset !== localOffset);
-    }
-
-    const dateFormat = $scope.model.config.pickTime ? "Y-m-d H:i:S" : "Y-m-d";
-
-    // date picker config
-    $scope.datePickerConfig = {
-      enableTime: $scope.model.config.pickTime,
-      dateFormat: dateFormat,
-      time_24hr: true,
-      clickOpens: !$scope.readonly
-    };
-
-    // Don't show calendar if date format has been set to only time
-    const timeFormat = $scope.model.config.format.toLowerCase();
-    const timeFormatPattern = /^h{1,2}:m{1,2}(:s{1,2})?\s?a?$/gmi;
-    if (timeFormat.match(timeFormatPattern)) {
-      $scope.datePickerConfig.enableTime = true;
-      $scope.datePickerConfig.noCalendar = true;
-    }
-
-    setDatePickerVal();
-
-    // Set the message to use for when a mandatory field isn't completed.
-    // Will either use the one provided on the property type or a localised default.
-    validationMessageService.getMandatoryMessage($scope.model.validation).then(function (value) {
-      $scope.mandatoryMessage = value;
-    });
-  }
-
-  function clearDatePicker(event) {
-
-    event.preventDefault();
-    event.stopPropagation();
-
-    $scope.clearDate();
-  }
-
-  $scope.clearDate = function () {
-    $scope.hasDatetimePickerValue = false;
-    if ($scope.model) {
-      $scope.model.datetimePickerValue = null;
-      $scope.model.datetimePickerInputValue = null;
-      $scope.model.value = null;
-    }
-    if ($scope.datePickerForm && $scope.datePickerForm.datepicker) {
-      $scope.datePickerForm.datepicker.$setValidity("pickerError", true);
-    }
-  }
-
-  $scope.datePickerSetup = function (instance) {
-    flatPickr = instance;
-  };
-
-  $scope.datePickerChange = function (date) {
-    const momentDate = moment(date);
-    setDate(momentDate);
-    setDatePickerVal();
-  };
-
-  function inputChanged() {
-    if ($scope.model.datetimePickerValue === "" && $scope.hasDatetimePickerValue) {
-      // $scope.hasDatetimePickerValue indicates that we had a value before the input was changed,
-      // but now the input is empty.
-      $scope.clearDate();
-    } else if ($scope.model.datetimePickerValue) {
-      var momentDate = moment($scope.model.datetimePickerInputValue, $scope.model.config.format, true);
-      if (!momentDate || !momentDate.isValid()) {
-        momentDate = moment(new Date($scope.model.datetimePickerInputValue));
-      }
-      if (momentDate && momentDate.isValid()) {
-        setDate(momentDate);
-      }
-      setDatePickerVal();
-      flatPickr.setDate($scope.model.datetimePickerValue, false);
-    }
-  }
-
-  //here we declare a special method which will be called whenever the value has changed from the server
-  //this is instead of doing a watch on the model.value = faster
-  $scope.model.onValueChanged = function (newVal, oldVal) {
-    if (newVal != oldVal) {
-      //check for c# System.DateTime.MinValue being passed as the clear indicator
-      var minDate = moment('0001-01-01');
-      var newDate = moment(newVal);
-
-      if (newDate.isAfter(minDate)) {
-        setDate(newDate);
-      } else {
-        $scope.clearDate();
-      }
-    }
-  };
-
-  function setDate(momentDate) {
-    angularHelper.safeApply($scope, function () {
-      // when a date is changed, update the model
-      if (momentDate && momentDate.isValid()) {
-        $scope.datePickerForm.datepicker.$setValidity("pickerError", true);
-        $scope.hasDatetimePickerValue = true;
-        $scope.model.datetimePickerValue = momentDate.format($scope.model.config.format);
-      }
-      else {
-        $scope.hasDatetimePickerValue = false;
-        $scope.model.datetimePickerValue = null;
-      }
-      updateModelValue(momentDate);
-    });
-  }
-
-  function updateModelValue(momentDate) {
-    var curMoment = moment($scope.model.value);
-    if ($scope.hasDatetimePickerValue) {
-      if ($scope.model.config.pickTime) {
-        //check if we are supposed to offset the time
-        if ($scope.model.value && Object.toBoolean($scope.model.config.offsetTime) && Umbraco.Sys.ServerVariables.application.serverTimeOffset !== undefined) {
-          $scope.model.value = dateHelper.convertToServerStringTime(momentDate, Umbraco.Sys.ServerVariables.application.serverTimeOffset);
-          $scope.serverTime = dateHelper.convertToServerStringTime(momentDate, Umbraco.Sys.ServerVariables.application.serverTimeOffset, "YYYY-MM-DD HH:mm:ss Z");
-        }
-        else {
-          $scope.model.value = momentDate.format("YYYY-MM-DD HH:mm:ss");
-        }
-      }
-      else {
-        $scope.model.value = momentDate.format("YYYY-MM-DD");
-      }
-    }
-    else {
-      $scope.model.value = null;
-    }
-
-    if (!curMoment.isSame(momentDate)) {
-      setDirty();
-    }
-  }
-
-  function setDirty() {
-    if ($scope.datePickerForm) {
-      $scope.datePickerForm.datepicker.$setDirty();
-    }
-  }
-
-  /** Sets the value of the date picker control adn associated viewModel objects based on the model value */
-  function setDatePickerVal() {
-    if ($scope.model.value) {
-      var dateVal;
-      //check if we are supposed to offset the time
-      if ($scope.model.value && Object.toBoolean($scope.model.config.offsetTime) && $scope.serverTimeNeedsOffsetting) {
-        //get the local time offset from the server
-        dateVal = dateHelper.convertToLocalMomentTime($scope.model.value, Umbraco.Sys.ServerVariables.application.serverTimeOffset);
-        $scope.serverTime = dateHelper.convertToServerStringTime(dateVal, Umbraco.Sys.ServerVariables.application.serverTimeOffset, "YYYY-MM-DD HH:mm:ss Z");
-      }
-      else {
-        //create a normal moment , no offset required
-        dateVal = $scope.model.value ? moment($scope.model.value, "YYYY-MM-DD HH:mm:ss") : moment();
-      }
-      $scope.model.datetimePickerValue = dateVal.format("YYYY-MM-DD HH:mm:ss");
-      $scope.model.datetimePickerInputValue = dateVal.format($scope.model.config.format);
-
-    }
-    else {
-      $scope.clearDate();
-    }
-  }
-
-  $scope.$watch("model.value", function (newVal, oldVal) {
-    if (newVal !== oldVal) {
-      $scope.hasDatetimePickerValue = newVal ? true : false;
-      setDatePickerVal();
-    }
-  });
-
-  onInit();
-
-}
-
-angular.module("umbraco").controller("Umbraco.PropertyEditors.DatepickerController", dateTimePickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
deleted file mode 100644
index 8f291b9a06..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<div class="umb-property-editor umb-datepicker" ng-controller="Umbraco.PropertyEditors.DatepickerController as vm">
-
-  <ng-form name="datePickerForm">
-    <div id="datepicker{{model.alias}}">
-      <umb-date-time-picker
-        ng-model="model.datetimePickerValue"
-        options="datePickerConfig"
-        on-setup="datePickerSetup(fpItem)"
-        on-change="datePickerChange(dateStr)">
-        <div class="input-append">
-          <input
-            type="text"
-            name="datepicker"
-            id="{{model.alias}}"
-            ng-model="model.datetimePickerInputValue"
-            ng-blur="vm.inputChanged()"
-            ng-required="model.validation.mandatory"
-            val-server="value"
-            class="datepickerinput"
-            ng-readonly="readonly" />
-          <button
-            ng-if="!readonly"
-            type="button"
-            class="btn-clear"
-            ng-click="vm.clearDatePicker($event)"
-            ng-show="hasDatetimePickerValue === true || datePickerForm.datepicker.$error.pickerError === true">
-            <umb-icon icon="icon-delete"></umb-icon>
-            <span class="sr-only">
-              <localize key="content_removeDate">Clear date</localize>
-            </span>
-          </button>
-          <span ng-if="!readonly" class="add-on">
-            <umb-icon
-              icon="icon-{{ datePickerConfig.noCalendar ? 'time' : 'calendar' }}">
-            </umb-icon>
-          </span>
-        </div>
-      </umb-date-time-picker>
-    </div>
-
-    <div
-      ng-messages="datePickerForm.datepicker.$error"
-      show-validation-on-submit>
-      <p class="help-inline" ng-message="required">{{mandatoryMessage}}</p>
-      <p class="help-inline" ng-message="valServer">
-        {{datePickerForm.datepicker.errorMsg}}
-      </p>
-      <p class="help-inline" ng-message="pickerError">
-        <localize key="validation_invalidDate">Invalid date</localize>
-      </p>
-    </div>
-
-    <p
-      ng-if="model.config.offsetTime === '1' && serverTimeNeedsOffsetting && model.value"
-      class="muted">
-      <small>
-        <localize key="content_scheduledPublishServerTime"
-          >This translates to the following time on the server:
-        </localize>
-        {{serverTime}} </small><br />
-      <small>
-        <localize key="content_scheduledPublishDocumentation">What does this mean?</localize>
-      </small>
-    </p>
-  </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
deleted file mode 100644
index 52f5c23bcf..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="umb-property-editor">
-    <ng-form name="decimalFieldForm">
-        <input name="decimalField"
-               type="number"
-               pattern="[\-0-9]+([,\.][0-9]+)?"
-               class="umb-property-editor umb-number"
-               ng-model="model.value"
-               ng-required="model.validation.mandatory"
-               aria-required="{{model.validation.mandatory}}"
-               id="{{model.alias}}"
-               val-server="value"
-               min="{{model.config.min}}"
-               max="{{model.config.max}}"
-               step="{{model.config.step}}"
-               ng-step="model.config.step"
-               fix-number
-               ng-readonly="readonly" />
-
-        <span ng-messages="decimalFieldForm.decimalField.$error" show-validation-on-submit>
-            <span class="help-inline" ng-message="number"><localize key="validation_invalidNumber">Not a number</localize></span>
-            <span class="help-inline" ng-message="step"><localize key="validation_invalidNumberStepSize">Not a valid numeric step size</localize></span>
-            <span class="help-inline" ng-message="valServer">{{decimalFieldForm.decimalField.errorMsg}}</span>
-        </span>
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
deleted file mode 100644
index db8b903d88..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
+++ /dev/null
@@ -1,105 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PropertyEditors.DropdownFlexibleController",
-    function ($scope, validationMessageService) {
-
-        //setup the default config
-        var config = {
-            items: [],
-            multiple: false
-        };
-
-        //map the user config
-        Utilities.extend(config, $scope.model.config);
-
-        //map back to the model
-        $scope.model.config = config;
-
-        //ensure this is a bool, old data could store zeros/ones or string versions
-        $scope.model.config.multiple = Object.toBoolean($scope.model.config.multiple);
-        
-        //ensure when form is saved that we don't store [] or [null] as string values in the database when no items are selected
-        $scope.$on("formSubmitting", function () {
-            if ($scope.model.value !== null && ($scope.model.value.length === 0 || $scope.model.value[0] === null)) {
-                $scope.model.value = null;
-            }
-        });
-        
-        function convertArrayToDictionaryArray(model){
-            //now we need to format the items in the dictionary because we always want to have an array
-            var newItems = [];
-            for (var i = 0; i < model.length; i++) {
-                newItems.push({ id: model[i], sortOrder: 0, value: model[i] });
-            }
-
-            return newItems;
-        }
-
-
-        function convertObjectToDictionaryArray(model){
-            //now we need to format the items in the dictionary because we always want to have an array
-            var newItems = [];
-            var vals = _.values($scope.model.config.items);
-            var keys = _.keys($scope.model.config.items);
-
-            for (var i = 0; i < vals.length; i++) {
-                var label = vals[i].value ? vals[i].value : vals[i]; 
-                newItems.push({ id: keys[i], sortOrder: vals[i].sortOrder, value: label });
-            }
-
-            return newItems;
-        }
-
-        $scope.updateSingleDropdownValue = function() {
-            $scope.model.value = [$scope.model.singleDropdownValue];
-        }
-
-        if (Utilities.isArray($scope.model.config.items)) {
-            //PP: I dont think this will happen, but we have tests that expect it to happen..
-            //if array is simple values, convert to array of objects
-            if (!Utilities.isObject($scope.model.config.items[0])){
-                $scope.model.config.items = convertArrayToDictionaryArray($scope.model.config.items);
-            }
-        }
-        else if (Utilities.isObject($scope.model.config.items)) {
-            $scope.model.config.items = convertObjectToDictionaryArray($scope.model.config.items);
-        }
-        else {
-            throw "The items property must be either an array or a dictionary";
-        }
-        
-
-        //sort the values
-        $scope.model.config.items.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
-
-        //now we need to check if the value is null/undefined, if it is we need to set it to "" so that any value that is set
-        // to "" gets selected by default
-        if ($scope.model.value === null || $scope.model.value === undefined) {
-            if ($scope.model.config.multiple) {
-                $scope.model.value = [];
-            }
-            else {
-                $scope.model.value = "";
-            }
-        }
-        
-        // if we run in single mode we'll store the value in a local variable
-        // so we can pass an array as the model as our PropertyValueEditor expects that
-        $scope.model.singleDropdownValue = "";
-        if (!Object.toBoolean($scope.model.config.multiple) && $scope.model.value) {
-            $scope.model.singleDropdownValue = Array.isArray($scope.model.value) ? $scope.model.value[0] : $scope.model.value;
-        }
-
-        // if we run in multiple mode, make sure the model is an array (in case the property was previously saved in single mode)
-        // also explicitly set the model to null if it's an empty array, so mandatory validation works on the client
-        if ($scope.model.config.multiple === "1" && $scope.model.value) {
-            $scope.model.value = !Array.isArray($scope.model.value) ? [$scope.model.value] : $scope.model.value;
-            if ($scope.model.value.length === 0) {
-                $scope.model.value = null;
-            }
-        }
-
-        // Set the message to use for when a mandatory field isn't completed.
-        // Will either use the one provided on the property type or a localised default.
-        validationMessageService.getMandatoryMessage($scope.model.validation).then(function (value) {
-            $scope.mandatoryMessage = value;
-        });
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.html
deleted file mode 100644
index a76b5dd866..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.DropdownFlexibleController" ng-switch="model.config.multiple">
-
-    <ng-form name="dropDownListForm">
-        
-        <select name="dropDownList"
-                class="umb-property-editor umb-dropdown"
-                ng-switch-default
-                ng-change="updateSingleDropdownValue()"
-                ng-model="model.singleDropdownValue"
-                ng-options="item.value as item.value for item in model.config.items"
-                ng-required="model.validation.mandatory"
-                ng-disabled="readonly">
-            <option></option>
-        </select>
-
-        <!--NOTE: This ng-switch is required because ng-multiple doesn't actually support dynamic bindings with multi-select lists -->
-        <select name="dropDownList"
-                class="umb-property-editor umb-dropdown"
-                ng-switch-when="true"
-                multiple
-                ng-model="model.value"
-                ng-options="item.value as item.value for item in model.config.items"
-                ng-required="model.validation.mandatory"
-                ng-disabled="readonly">
-        </select>
-
-        <div ng-messages="dropDownListForm.dropDownList.$error" show-validation-on-submit>
-            <p class="help-inline" ng-message="required">{{mandatoryMessage}}</p>
-        </div>
-
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.controller.js
deleted file mode 100644
index 7ed7531bc5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.controller.js
+++ /dev/null
@@ -1,10 +0,0 @@
-function emailController($scope, validationMessageService) {
-    
-    // Set the message to use for when a mandatory field isn't completed.
-    // Will either use the one provided on the property type or a localised default.
-    validationMessageService.getMandatoryMessage($scope.model.validation).then(function(value) {
-        $scope.mandatoryMessage = value;
-    }); 
-    
-}
-angular.module('umbraco').controller("Umbraco.PropertyEditors.EmailController", emailController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
deleted file mode 100644
index 15afe290d1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.EmailController">
-    <ng-form name="emailFieldForm">
-        <input type="email"
-               name="textbox"
-               ng-model="model.value"
-               id="{{model.alias}}"
-               class="umb-property-editor umb-textstring textstring"
-               val-email
-               ng-required="model.config.IsRequired || model.validation.mandatory"
-               val-server="value"
-               ng-readonly="readonly" />
-
-        <div ng-messages="emailFieldForm.textbox.$error" show-validation-on-submit>
-            <p class="help-inline" ng-message="required">{{mandatoryMessage}}</p>
-            <p class="help-inline" ng-message="valEmail"><localize key="validation_invalidEmail">Invalid email</localize></p>
-            <p class="help-inline" ng-message="valServer">{{emailFieldForm.textbox.errorMsg}}</p>
-        </div>
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.controller.js
deleted file mode 100644
index dead3da6ec..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.controller.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/** A drop down list or multi value select list based on an entity type, this can be re-used for any entity types */
-function entityPicker($scope, entityResource) {
-
-    //set the default to DocumentType
-    if (!$scope.model.config.entityType) {
-        $scope.model.config.entityType = "DocumentType";
-    }
-
-    //Determine the select list options and which value to publish
-    if (!$scope.model.config.publishBy) {
-        $scope.selectOptions = "entity.id as entity.name for entity in entities";
-    }
-    else {
-        $scope.selectOptions = "entity." + $scope.model.config.publishBy + " as entity.name for entity in entities";
-    }
-
-    entityResource.getAll($scope.model.config.entityType).then(function (data) {
-        //convert the ids to strings so the drop downs work properly when comparing
-        _.each(data, function(d) {
-            d.id = d.id.toString();
-        });
-        $scope.entities = data;
-    });
-
-    if ($scope.model.value === null || $scope.model.value === undefined) {
-        if ($scope.model.config.multiple) {
-            $scope.model.value = [];
-        }
-        else {
-            $scope.model.value = "";
-        }
-    }
-    else {
-        //if it's multiple, change the value to an array
-        if (Object.toBoolean($scope.model.config.multiple)) {
-            if (_.isString($scope.model.value)) {
-                $scope.model.value = $scope.model.value.split(',');
-            }
-        }
-    }
-}
-angular.module('umbraco').controller("Umbraco.PropertyEditors.EntityPickerController", entityPicker);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.html
deleted file mode 100644
index 09b10d7007..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/entitypicker/entitypicker.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.EntityPickerController" ng-switch="model.config.multiple">
-    
-    <select name="contentTypeList"
-        class="umb-property-editor umb-dropdown"
-        ng-switch-default
-        ng-model="model.value"
-        ng-options="{{selectOptions}}">
-    </select>
-    
-    <!--NOTE: This ng-switch is required because ng-multiple doesn't actually support dynamic bindings with multi-select lists -->
-    <select name="contentTypeList"
-        class="umb-property-editor umb-dropdown"
-        ng-switch-when="1"
-        multiple
-        ng-model="model.value"
-        ng-options="{{selectOptions}}">
-    </select>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.controller.js
deleted file mode 100644
index 82a0d18cab..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.controller.js
+++ /dev/null
@@ -1,44 +0,0 @@
-function EyeDropperColorPickerController($scope, angularHelper) {
-
-    var vm = this;
-
-    //setup the default config
-    var config = {
-        showAlpha: true,
-        showPalette: true,
-        allowEmpty: true
-    };
-    
-    // map the user config
-    Utilities.extend(config, $scope.model.config);
-
-    // map back to the model
-    $scope.model.config = config;
-
-    vm.options = $scope.model.config;
-
-    vm.color = $scope.model.value || null;
-
-    vm.selectColor = function (color) {
-        angularHelper.safeApply($scope, function () {
-            vm.color = color ? color.toString() : null;
-            $scope.model.value = vm.color;
-            $scope.propertyForm.selectedColor.$setViewValue(vm.color);
-        });
-    };
-
-    // Method required by the valPropertyValidator directive (returns true if the property editor has at least one color selected)
-    $scope.validateMandatory = function () {
-        var isValid = !$scope.model.validation.mandatory || (
-            $scope.model.value != null
-            && $scope.model.value != "");
-
-        return {
-            isValid: isValid,
-            errorMsg: $scope.model.validation.mandatoryMessage || "Value cannot be empty",
-            errorKey: "required"
-        };
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.PropertyEditors.EyeDropperColorPickerController", EyeDropperColorPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.html
deleted file mode 100644
index c75dea7409..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/eyedropper/eyedropper.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.EyeDropperColorPickerController as vm">
-
-    <umb-color-picker
-        ng-model="vm.color"
-        options="vm.options"
-        on-change="vm.selectColor(color)"
-        ng-attr-readonly="{{ readonly || undefined }}">
-    </umb-color-picker>
-
-    <input type="hidden" name="selectedColor" ng-model="model.selectedColor" val-property-validator="validateMandatory" />
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
deleted file mode 100644
index 5d4776b8f4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
+++ /dev/null
@@ -1,66 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * @ngdoc controller
-     * @name Umbraco.Editors.FileUploadController
-     * @function
-     *
-     * @description
-     * The controller for the file upload property editor.
-     *
-    */
-    function fileUploadController($scope, fileManager) {
-
-        $scope.fileChanged = onFileChanged;
-        //declare a special method which will be called whenever the value has changed from the server
-        $scope.model.onValueChanged = onValueChanged;
-
-
-        $scope.fileExtensionsString = $scope.model.config.fileExtensions ? $scope.model.config.fileExtensions.map(x => "."+x.value).join(",") : "";
-
-        /**
-         * Called when the file selection value changes
-         * @param {any} value
-         */
-        function onFileChanged(value) {
-            $scope.model.value = value;
-        }
-
-        /**
-         * called whenever the value has changed from the server
-         * @param {any} newVal
-         * @param {any} oldVal
-         */
-        function onValueChanged(newVal, oldVal) {
-            //clear current uploaded files
-            fileManager.setFiles({
-                propertyAlias: $scope.model.alias,
-                culture: $scope.model.culture,
-                segment: $scope.model.segment,
-                files: []
-            });
-        }
-
-    };
-
-    angular.module("umbraco")
-        .controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController)
-        .run(function (mediaHelper) {
-            if (mediaHelper && mediaHelper.registerFileResolver) {
-
-                //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
-                // they contain different data structures so if we need to query against it we need to be aware of this.
-                mediaHelper.registerFileResolver("Umbraco.UploadField", function (property, entity, thumbnail) {
-                    if (thumbnail) {
-                        return mediaHelper.getThumbnailFromPath(property.value);
-                    } else {
-                        return property.value;
-                    }
-                });
-
-            }
-        });
-
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html
deleted file mode 100644
index 3e99a3fee9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.FileUploadController">
-    <umb-property-file-upload 
-        culture="{{model.culture}}"
-        segment="{{model.segment}}"
-        property-alias="{{model.alias}}"
-        value="model.value"
-        required="model.validation.mandatory"
-        on-files-selected="fileChanged(value)"
-        accept-file-ext="fileExtensionsString"
-        ng-attr-readonly="{{ readonly || undefined }}">
-    </umb-property-file-upload>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.default.config.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.default.config.js
deleted file mode 100644
index 0b751a532c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.default.config.js
+++ /dev/null
@@ -1,364 +0,0 @@
-//TODO: What is this file? Is it used?? I don't think so
-var uSkyGridConfig = [
-{
-
-    style:[
-        {
-            label: "Set a background image",
-            description: "Set a row background",
-            key: "background-image",
-            view: "imagepicker",
-            modifier: "url({0})"
-        },
-
-        {
-            label: "Set a font color",
-            description: "Pick a color",
-            key: "color",
-            view: "colorpicker"
-        }
-    ],
-
-    config:[
-        {
-            label: "Preview",
-            description: "Display a live preview",
-            key: "preview",
-            view: "boolean"
-        },
-
-        {
-            label: "Class",
-            description: "Set a css class",
-            key: "class",
-            view: "textstring"
-        }
-    ],
-
-    layouts: [
-    {
-        grid: 12,
-        percentage: 100,
-
-
-        rows: [
-        {
-            name: "Single column",
-                columns: [{
-                    grid: 12,
-                    percentage: 100
-                }]
-        },
-
-        {
-            name: "Article",
-                models: [{
-                    grid: 4,
-                    percentage: 33.3,
-                    allowed: ["media","quote"]
-                }, {
-                    grid: 8,
-                    percentage: 66.6,
-                    allowed: ["rte"]
-                }]
-        },
-
-        {
-         name: "Article, reverse",
-         models: [
-         {
-          grid: 8,
-          percentage: 66.6,
-          allowed: ["rte","macro"]
-      },
-      {
-         grid: 4,
-         percentage: 33.3,
-         allowed: ["media","quote","embed"]
-     }]
- },
- {
-     name: "Profile page",
-     models: [
-     {
-         grid: 4,
-         percentage: 33.3,
-         allowed: ["media"]
-     },
-     {
-      grid: 8,
-      percentage: 66.6,
-      allowed: ["rte"]
-  }
-  ]
-},
-{
- name: "Headline",
- models: [
- {
-     grid: 12,
-     percentage: 100,
-     max: 1,
-     allowed: ["headline"]
- }
- ]
-},
-{
-    name: "Three columns",
-    models: [{
-        grid: 4,
-        percentage: 33.3,
-        allowed: ["rte"]
-    },
-    {
-         grid: 4,
-         percentage: 33.3,
-         allowed: ["rte"]
-    },
-    {
-        grid: 4,
-        percentage: 33.3,
-        allowed: ["rte"]
-    }]
-}
-]
-
-}
-]
-},
-{
-    columns: [
-    {
-        grid: 9,
-        percentage: 70,
-
-        cellModels: [
-        {
-            models: [{
-                grid: 12,
-                percentage: 100
-            }]
-        }, {
-            models: [{
-                grid: 6,
-                percentage: 50
-            }, {
-                grid: 6,
-                percentage: 50
-            }]
-        }, {
-            models: [{
-                grid: 4,
-                percentage: 33.3
-            }, {
-                grid: 4,
-                percentage: 33.3
-            }, {
-                grid: 4,
-                percentage: 33.3
-            }]
-        }, {
-            models: [{
-                grid: 3,
-                percentage: 25
-            }, {
-                grid: 3,
-                percentage: 25
-            }, {
-                grid: 3,
-                percentage: 25
-            }, {
-                grid: 3,
-                percentage: 25
-            } ]
-        }, {
-            models: [{
-                grid: 2,
-                percentage: 16.6
-            }, {
-                grid: 2,
-                percentage: 16.6
-            }, {
-                grid: 2,
-                percentage: 16.6
-            }, {
-                grid: 2,
-                percentage: 16.6
-            }, {
-                grid: 2,
-                percentage: 16.6
-            }, {
-                grid: 2,
-                percentage: 16.6
-            }]
-        }, {
-            models: [{
-                grid: 8,
-                percentage: 60
-            }, {
-                grid: 4,
-                percentage: 40
-            }]
-        }, {
-            models: [{
-                grid: 4,
-                percentage: 40
-            }, {
-                grid: 8,
-                percentage: 60
-            }]
-        }
-        ]
-    },
-    {
-        grid: 3,
-        percentage: 30,
-        cellModels: [
-        {
-            models: [{
-                grid: 12,
-                percentage: 100
-            }]
-        }
-        ]
-    }
-    ]
-},
-{
-    columns: [
-    {
-        grid: 3,
-        percentage: 30,
-        cellModels: [
-        {
-            models: [{
-                grid: 12,
-                percentage: 100
-            }]
-        }
-        ]
-    },
-    {
-        grid: 9,
-        percentage: 70,
-        cellModels: [
-        {
-            models: [{
-                grid: 12,
-                percentage: 100
-            }]
-        }, {
-            models: [{
-                grid: 6,
-                percentage: 50
-            }, {
-                grid: 6,
-                percentage: 50
-            }]
-        }, {
-            models: [{
-                grid: 4,
-                percentage: 33.3
-            }, {
-                grid: 4,
-                percentage: 33.3
-            }, {
-                grid: 4,
-                percentage: 33.3
-            }]
-        }, {
-            models: [{
-                grid: 3,
-                percentage: 25
-            }, {
-                grid: 3,
-                percentage: 25
-            }, {
-                grid: 3,
-                percentage: 25
-            }, {
-                grid: 3,
-                percentage: 25
-            } ]
-        }, {
-            models: [{
-                grid: 2,
-                percentage: 16.6
-            }, {
-                grid: 2,
-                percentage: 16.6
-            }, {
-                grid: 2,
-                percentage: 16.6
-            }, {
-                grid: 2,
-                percentage: 16.6
-            }, {
-                grid: 2,
-                percentage: 16.6
-            }, {
-                grid: 2,
-                percentage: 16.6
-            }]
-        }, {
-            models: [{
-                grid: 8,
-                percentage: 60
-            }, {
-                grid: 4,
-                percentage: 40
-            }]
-        }, {
-            models: [{
-                grid: 4,
-                percentage: 40
-            }, {
-                grid: 8,
-                percentage: 60
-            }]
-        }
-        ]
-    }
-    ]
-},
-{
-    columns: [
-    {
-        grid: 4,
-        percentage: 33.3,
-        cellModels: [
-        {
-            models: [{
-                grid: 12,
-                percentage: 100
-            }]
-        }
-        ]
-    },
-    {
-        grid: 4,
-        percentage: 33.3,
-        cellModels: [
-        {
-            models: [{
-                grid: 12,
-                percentage: 100
-            }]
-        }
-        ]
-    },
-    {
-        grid: 4,
-        percentage: 33.3,
-        cellModels: [
-        {
-            models: [{
-                grid: 12,
-                percentage: 100
-            }]
-        }
-        ]
-    }
-    ]
-}
-];
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
deleted file mode 100644
index 7330d69b2f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
+++ /dev/null
@@ -1,40 +0,0 @@
-function ConfigController($scope) {
-
-    var vm = this;
-
-    vm.submit = submit;
-    vm.close = close;
-
-    function submit() {
-        if ($scope.model && $scope.model.submit) {
-            $scope.model.submit($scope.model);
-        }
-    }
-
-    function close() {
-        if ($scope.model.close) {
-            $scope.model.close();
-        }
-    }
-
-    vm.showEmptyState = false;
-    vm.showConfig = false;
-    vm.showStyles = false;
-
-    $scope.$watchCollection('model.config', onWatch);
-    $scope.$watchCollection('model.styles', onWatch);
-
-    function onWatch() {
-
-        vm.showConfig = $scope.model.config &&
-            ($scope.model.config.length > 0 || Object.keys($scope.model.config).length > 0);
-        vm.showStyles = $scope.model.styles &&
-            ($scope.model.styles.length > 0 || Object.keys($scope.model.styles).length > 0);
-
-        vm.showEmptyState = vm.showConfig === false && vm.showStyles === false;
-
-    }
-
-}
-
-angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.ConfigController", ConfigController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
deleted file mode 100644
index 88585b76fa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.ConfigController as vm">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-            <ng-form name="gridItemConfigEditor" val-form-manager>
-
-                <umb-empty-state position="center" ng-if="vm.showEmptyState">
-                    <localize key="grid_noConfiguration">No further configuration available</localize>
-                </umb-empty-state>
-
-                <umb-box ng-if="vm.showConfig">
-                    <umb-box-header title-key="grid_settings"></umb-box-header>
-                    <umb-box-content>
-                        <div>
-                            <umb-property property="configValue"
-                                          ng-repeat="configValue in model.config">
-                                <umb-property-editor model="configValue" is-pre-value="true"></umb-property-editor>
-                            </umb-property>
-                        </div>
-                    </umb-box-content>
-                </umb-box>
-
-                <umb-box ng-if="vm.showStyles">
-                    <umb-box-header title-key="grid_styles"></umb-box-header>
-                    <umb-box-content>
-                        <div>
-                            <umb-property property="styleValue"
-                                          ng-repeat="styleValue in model.styles">
-                                <umb-property-editor model="styleValue" is-pre-value="true"></umb-property-editor>
-                            </umb-property>
-                        </div>
-                    </umb-box-content>
-                </umb-box>
-
-            </ng-form>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button type="button"
-                            button-style="link"
-                            label-key="general_close"
-                            shortcut="esc"
-                            action="vm.close()">
-                </umb-button>
-                <umb-button ng-if="vm.showConfig || vm.showStyles"
-                            type="button"
-                            button-style="success"
-                            label-key="general_submit"
-                            action="vm.submit()">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js
deleted file mode 100644
index 969f675139..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js
+++ /dev/null
@@ -1,78 +0,0 @@
-function EditConfigController($scope, angularHelper) {
-
-    var vm = this;
-    
-    vm.submit = submit;
-    vm.close = close;
-
-    vm.aceOption = {
-        mode: "json",
-        theme: "chrome",
-        showPrintMargin: false,
-        advanced: {
-            fontSize: '14px',
-            enableSnippets: true,
-            enableBasicAutocompletion: true,
-            enableLiveAutocompletion: false
-        },
-        onLoad: function (_editor) {
-            vm.editor = _editor;
-
-            vm.configJson = Utilities.toJson($scope.model.config, true);
-
-            vm.editor.setValue(vm.configJson);
-
-            vm.editor.on("blur", blurAceEditor);
-        }
-    };
-
-    function blurAceEditor(event, _editor) {
-        const code = _editor.getValue();
-
-        //var form = angularHelper.getCurrentForm($scope);
-        var form = vm.gridConfigEditor;
-        var isValid = isValidJson(code);
-
-        if (isValid) {
-            $scope.model.config = Utilities.fromJson(code);
-
-            setValid(form);
-        }
-        else {
-            setInvalid(form);
-        }
-    }
-
-    function isValidJson(model) {
-        var flag = true;
-        try {
-            Utilities.fromJson(model)
-        } catch (err) {
-            flag = false;
-        }
-        return flag;
-    }
-
-    function setValid(form) {
-        form.$setValidity('json', true);
-    }
-
-    function setInvalid(form) {
-        form.$setValidity('json', false);
-    }
-
-    function submit() {
-        if ($scope.model && $scope.model.submit) {
-            $scope.model.submit($scope.model);
-        }
-    }
-
-    function close() {
-        if ($scope.model.close) {
-            $scope.model.close();
-        }
-    }
-
-}
-
-angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.EditConfigController", EditConfigController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
deleted file mode 100644
index 4470c50274..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="usky-grid usky-grid-configuration" ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.EditConfigController as vm">
-
-    <umb-editor-view>
-
-        <form novalidate name="EditConfigForm" val-form-manager>
-
-            <umb-editor-header
-                name="model.title"
-                name-locked="true"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container>
-                <umb-box>
-                    <umb-box-content>
-
-                        <ng-form name="vm.gridConfigEditor">
-
-                            <h4>{{model.name}}</h4>
-                            <p>Settings will only save if the entered json configuration is valid</p>
-
-                            <div data-element="code-editor"
-                                 auto-scale="85"
-                                 umb-ace-editor="vm.aceOption"
-                                 model="vm.configJson">
-                            </div>
-
-                            <div class="alert alert-error mt3" ng-show="vm.gridConfigEditor.$invalid === true">
-                                This configuration is not valid json, and will not be saved.
-                            </div>
-
-                        </ng-form>
-
-                    </umb-box-content>
-                </umb-box>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                <umb-editor-footer-content-right>
-                    <umb-button
-                        type="button"
-                        button-style="link"
-                        label-key="general_close"
-                        shortcut="esc"
-                        action="vm.close()">
-                    </umb-button>
-                    <umb-button
-                        type="button"
-                        button-style="success"
-                        label-key="general_submit"
-                        action="vm.submit()">
-                    </umb-button>
-                </umb-editor-footer-content-right>
-            </umb-editor-footer>
-
-        </form>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
deleted file mode 100644
index fdf70693b2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
+++ /dev/null
@@ -1,162 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.PropertyEditors.GridPrevalueEditor.LayoutConfigController",
-    function ($scope, localizationService) {
-
-            var vm = this;
-
-            vm.toggleAllowed = toggleAllowed;
-            vm.configureSection = configureSection;
-            vm.deleteSection = deleteSection;
-            vm.selectRow = selectRow;
-            vm.percentage = percentage;
-            vm.scaleUp = scaleUp;
-            vm.scaleDown = scaleDown;
-            vm.close = close;
-            vm.submit = submit;
-
-            vm.labels = {};
-        
-            function init() {
-
-                $scope.currentLayout = $scope.model.currentLayout;
-                $scope.columns = $scope.model.columns;
-                $scope.rows = $scope.model.rows;
-                $scope.currentSection = null;
-
-                // Setup copy of rows on sections
-                if ($scope.currentLayout && $scope.currentLayout.sections) {
-                    $scope.currentLayout.sections.forEach(section => {
-                        section.rows = Utilities.copy($scope.rows);
-
-                        // Check if rows are selected
-                        section.rows.forEach(row => {
-                            row.selected = section.allowed && section.allowed.includes(row.name);
-                        });
-                    });
-                }
-
-                var labelKeys = [
-                    "grid_addGridLayout",
-                    "grid_allowAllRowConfigurations"
-                ];
-
-                localizationService.localizeMany(labelKeys).then(function (data) {
-
-                    vm.labels.title = data[0];
-                    vm.labels.allowAllRowConfigurations = data[1];
-
-                    setTitle(vm.labels.title);
-                });
-            }
-
-            function setTitle(value) {
-                if (!$scope.model.title) {
-                    $scope.model.title = value;
-                }
-            }
-
-            function scaleUp(section, max, overflow){
-    		   var add = 1;
-    		   if (overflow !== true){
-    		       add = (max > 1) ? 1 : max;
-    		   }
-    		   //var add = (max > 1) ? 1 : max;
-    		   section.grid = section.grid+add;
-    		}
-
-            function scaleDown(section){
-    		   var remove = (section.grid > 1) ? 1 : 0;
-    		   section.grid = section.grid-remove;
-    		}
-
-    		function percentage(spans){
-    		    return ((spans / $scope.columns) * 100).toFixed(8);
-    		}
-
-    		/****************
-    		    Section
-    		*****************/
-            function configureSection(section, template) {
-    		    if (section === null || section === undefined) {
-    		        var space = ($scope.availableLayoutSpace > 4) ? 4 : $scope.availableLayoutSpace;
-    		        section = {
-                        grid: space,
-                        rows: Utilities.copy($scope.rows)
-    		        };
-    		        template.sections.push(section);
-                }
-
-                section.allowAll = section.allowAll || !section.allowed || !section.allowed.length;
-
-                $scope.currentSection = section;
-    		}
-
-            function toggleAllowed(section) {
-                section.allowAll = !section.allowAll;
-
-                if (section.allowed) {
-                    delete section.allowed;
-                }
-                else {
-                    section.allowed = [];
-                }
-            }
-
-            function deleteSection(section, template) {
-    			if ($scope.currentSection === section) {
-    				$scope.currentSection = null;
-    			}
-    			var index = template.sections.indexOf(section)
-    			template.sections.splice(index, 1);
-    		}
-
-            function selectRow(section, row) {
-
-                section.allowed = section.allowed || [];
-
-                var index = section.allowed.indexOf(row.name);
-                if (row.selected === true) {
-                    if (index === -1) {
-                        section.allowed.push(row.name); 
-                    }
-                }
-                else {
-                    section.allowed.splice(index, 1);
-                }
-            }
-    		
-            function close() {
-                if ($scope.model.close) {
-                    cleanUpRows();
-                    $scope.model.close();
-                }
-            }
-
-            function submit() {
-                if ($scope.model.submit) {
-                    cleanUpRows();
-                    $scope.model.submit($scope.currentLayout);
-                }
-            }
-
-            function cleanUpRows () {
-                $scope.currentLayout.sections.forEach(section => {
-                    if (section.rows) {
-                        delete section.rows;
-                    }
-                });
-            }
-
-    		$scope.$watch("currentLayout", function(layout){
-    		    if (layout) {
-    		        var total = 0;
-    		        _.forEach(layout.sections, function(section){
-    		            total = (total + section.grid);
-    		        });
-
-    		        $scope.availableLayoutSpace = $scope.columns - total;
-    		    }
-    		}, true);
-            
-            init();
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
deleted file mode 100644
index 457986bc19..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<div class="usky-grid usky-grid-configuration"
-     ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.LayoutConfigController as vm">
-
-    <umb-editor-view>
-
-        <form novalidate name="LayoutConfigForm" val-form-manager>
-
-            <umb-editor-header
-                name="model.title"
-                name-locked="true"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container>
-                <umb-box>
-                    <umb-box-content>
-
-                        <div class="umb-forms-settings form-horizontal">
-
-                            <p>
-                                <localize key="grid_addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</localize>
-                            </p>
-
-                            <umb-control-group label="@general_name">
-                                <input type="text" ng-model="currentLayout.name"/>
-                            </umb-control-group>
-
-                            <div class="uSky-templates-template"
-                                 style="margin: 0; width: 350px; position: relative;">
-
-                                <div class="tb" style="height: 70px; border-width: 2px; padding: 2px">
-                                    <div class="tr">
-
-                                        <button type="button" class="btn-reset td uSky-templates-column"
-                                           ng-class="{last: $last, selected: section == currentSection}"
-                                           ng-repeat="section in currentLayout.sections"
-                                           ng-click="vm.configureSection(section, currentLayout)"
-                                           ng-style="{width: vm.percentage(section.grid) +'%'}">
-                                           <span class="sr-only">
-                                                <localize key="grid_editGridLayout">Edit grid layout</localize>
-                                           </span>
-                                        </button>
-
-                                        <button type="button" class="btn-reset td uSky-templates-column add" ng-if="availableLayoutSpace > 0"
-                                                ng-click="vm.configureSection(null, currentLayout)"
-                                                ng-style="{width: vm.percentage(availableLayoutSpace) + '%'}">
-                                            <umb-icon icon="icon-add" class="icon"></umb-icon>
-                                            <span class="sr-only">
-                                                <localize key="grid_addGridLayout">Add grid layout</localize>
-                                            </span>
-                                        </button>
-
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div ng-if="currentSection" style="padding-bottom: 50px;">
-
-                                <umb-control-group label="@general_width">
-                                    <div class="grid-size-scaler">
-                                        <button type="button" class="btn-link" ng-click="vm.scaleDown(currentSection)">
-                                            <umb-icon icon="icon-remove" class="icon"></umb-icon>
-                                        </button>
-                                        <span>{{currentSection.grid}}</span>
-                                        <button type="button" class="btn-link" ng-click="vm.scaleUp(currentSection, availableLayoutSpace)">
-                                            <umb-icon icon="icon-add" class="icon"></umb-icon>
-                                        </button>
-                                    </div>
-                                </umb-control-group>
-
-                                <umb-control-group hide-label="true">
-                                    <umb-icon icon="icon-delete" class="red"></umb-icon>
-                                    <button type="button" class="btn btn-small btn-link"
-                                            ng-click="vm.deleteSection(currentSection, currentLayout)">
-                                        <localize key="general_delete" class="ng-isolate-scope ng-scope">Delete</localize>
-                                    </button>
-                                </umb-control-group>
-
-                                <umb-control-group hide-label="true">
-
-                                    <umb-toggle
-                                        class="umb-toggle-group-item__toggle"
-                                        checked="currentSection.allowAll"
-                                        on-click="vm.toggleAllowed(currentSection)"
-                                        show-labels="true"
-                                        label-position="right"
-                                        label-off="Allow all row configurations"
-                                        label-on="Allow all row configurations"
-                                        style="margin-left: 18px">
-                                    </umb-toggle>
-
-                                    <div ng-if="currentSection.allowAll === false">
-                                        <hr/>
-
-                                        <div class="control-group uSky-templates-rows">
-                                            <ul class="unstyled">
-
-                                                <li ng-repeat="row in currentSection.rows track by $id(row)">
-
-                                                    <div class="flex">
-
-                                                        <umb-checkbox model="row.selected"
-                                                                      input-id="rowconfig-{{$index}}"
-                                                                      on-change="vm.selectRow(currentSection, row)">
-                                                        </umb-checkbox>
-
-                                                        <button type="button"
-                                                                class="btn-reset flex flex-auto tl"
-                                                                ng-click="row.selected = !row.selected; vm.selectRow(currentSection, row)">
-
-                                                            <span class="preview-rows columns" style="margin-top: auto;">
-                                                                <span class="preview-row">
-                                                                    <span class="preview-col"
-                                                                          ng-class="{last:$last}"
-                                                                          ng-repeat="area in row.areas"
-                                                                          ng-style="{width: vm.percentage(area.grid) + '%'}">
-
-                                                                        <span class="preview-cell"></span>
-                                                                    </span>
-                                                                </span>
-                                                            </span>
-
-                                                            <span>
-                                                                {{row.name}}<br />
-                                                                <small>{{row.areas.length}} cells</small>
-                                                            </span>
-                                                        </button>
-
-                                                    </div>
-
-                                                    <br style="clear: both"/>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </umb-control-group>
-                            </div>
-
-                        </div>
-
-                    </umb-box-content>
-                </umb-box>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                <umb-editor-footer-content-right>
-                    <umb-button
-                        type="button"
-                        button-style="link"
-                        label-key="general_close"
-                        shortcut="esc"
-                        action="vm.close()">
-                    </umb-button>
-                    <umb-button
-                        type="button"
-                        button-style="success"
-                        label-key="general_submit"
-                        action="vm.submit()">
-                    </umb-button>
-                </umb-editor-footer-content-right>
-            </umb-editor-footer>
-
-        </form>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
deleted file mode 100644
index b36352a66b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
+++ /dev/null
@@ -1,171 +0,0 @@
-function RowConfigController($scope, localizationService) {
-
-    var vm = this;
-
-    vm.configureCell = configureCell;
-    vm.closeArea = closeArea;
-    vm.deleteArea = deleteArea;
-    vm.selectEditor = selectEditor;
-    vm.toggleAllowed = toggleAllowed;
-    vm.percentage = percentage;
-    vm.scaleUp = scaleUp;
-    vm.scaleDown = scaleDown;
-    vm.close = close;
-    vm.submit = submit;
-
-    vm.labels = {};
-    
-    function init() {
-
-        $scope.currentRow = $scope.model.currentRow;
-        $scope.columns = $scope.model.columns;
-        $scope.editors = $scope.model.editors;
-        $scope.nameChanged = false;
-
-        var labelKeys = [
-            "grid_addRowConfiguration",
-            "grid_allowAllEditors"
-        ];
-
-        localizationService.localizeMany(labelKeys).then(function (data) {
-
-            vm.labels.title = data[0];
-            vm.labels.allowAllEditors = data[1];
-
-            setTitle(vm.labels.title);
-        });
-    }
-
-    function setTitle(value) {
-        if (!$scope.model.title) {
-            $scope.model.title = value;
-        }
-    }
-
-    function scaleUp(section, max, overflow) {
-        var add = 1;
-        if (overflow !== true) {
-            add = (max > 1) ? 1 : max;
-        }
-        //var add = (max > 1) ? 1 : max;
-        section.grid = section.grid + add;
-    };
-
-    function scaleDown(section) {
-        var remove = (section.grid > 1) ? 1 : 0;
-        section.grid = section.grid - remove;
-    }
-
-    function percentage(spans) {
-        return ((spans / $scope.columns) * 100).toFixed(8);
-    }
-
-    /****************
-        area
-    *****************/
-    function configureCell(cell, row) {
-        if ($scope.currentCell && $scope.currentCell === cell) {
-            delete $scope.currentCell;
-        }
-        else {
-            if (cell === null) {
-                var available = $scope.availableRowSpace;
-                var space = 4;
-
-                if (available < 4 && available > 0) {
-                    space = available;
-                }
-
-                cell = {
-                    grid: space
-                };
-
-                row.areas.push(cell);
-            }
-
-            cell.allowed = cell.allowed || [];
-
-            $scope.editors.forEach(function (e) { e.allowed = cell.allowed.indexOf(e.alias) !== -1 });
-
-            cell.allowAll = cell.allowAll || !cell.allowed || !cell.allowed.length;
-
-            $scope.currentCell = cell;
-        }
-    }
-
-    function toggleAllowed(cell) {
-        cell.allowAll = !cell.allowAll;
-
-        if (cell.allowed) {
-            delete cell.allowed;
-        }
-        else {
-            cell.allowed = [];
-        }
-    }
-
-    function deleteArea(cell, row) {
-    	if ($scope.currentCell === cell) {
-    		$scope.currentCell = null;
-    	}
-    	var index = row.areas.indexOf(cell)
-    	row.areas.splice(index, 1);
-    }
-
-    // This doesn't seem to be used?
-    function closeArea() {
-        $scope.currentCell = null;
-    }
-
-    function selectEditor(cell, editor) {
-        cell.allowed = cell.allowed || [];
-
-        var index = cell.allowed.indexOf(editor.alias);
-        if (editor.allowed === true) {
-            if (index === -1) {
-                cell.allowed.push(editor.alias);
-            }
-        }
-        else {
-            cell.allowed.splice(index, 1);
-        }
-    }
-    
-    function close () {
-        if ($scope.model.close) {
-            $scope.model.close();
-        }
-    }
-
-    function submit() {
-        if ($scope.model.submit) {
-            $scope.model.submit($scope.currentRow);
-        }
-    }
-
-    $scope.$watch("currentRow", function(row) {
-        if (row) {
-
-            var total = 0;
-            _.forEach(row.areas, function(area) {
-                total = (total + area.grid);
-            });
-
-            $scope.availableRowSpace = $scope.columns - total;
-
-            var originalName = $scope.currentRow.name;
-            if (originalName) {
-                if (originalName != row.name) {
-                    $scope.nameChanged = true;
-                }
-                else {
-                    $scope.nameChanged = false;
-                }
-            }
-        }
-    }, true);
-    
-    init();
-}
-
-angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController", RowConfigController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
deleted file mode 100644
index 698ff6daeb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<div class="usky-grid usky-grid-configuration" ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController as vm">
-
-    <umb-editor-view>
-
-        <form novalidate name="RowConfigurationForm" val-form-manager>
-
-            <umb-editor-header
-                name="model.title"
-                name-locked="true"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container>
-                <umb-box>
-                    <umb-box-content>
-
-                    <div class="umb-form-settings form-horizontal">
-
-                        <p><localize key="grid_addRowConfigurationDetail">Adjust the row by setting cell widths and adding additional cells</localize></p>
-
-                        <div class="alert alert-warn ng-scope" ng-show="nameChanged">
-                            <localize key="grid_warningText">
-                                <p>Modifying a row configuration name will result in loss of
-                                    data for any existing content that is based on this configuration.</p>
-                                <p><strong>Modifying only the label will not result in data loss.</strong></p>
-                            </localize>
-                        </div>
-
-                        <umb-control-group label="@general_name">
-                            <input type="text" ng-model="currentRow.name" />
-                        </umb-control-group>
-
-                        <umb-control-group label="@general_label">
-                            <input type="text" ng-model="currentRow.label" placeholder="Overrides name" />
-                        </umb-control-group>
-
-                        <div class="uSky-templates-template"
-                            style="margin: 0; width: 350px; position: relative;">
-
-                            <div class="tb" style="height: auto; border: none !important; background: none">
-                                <div class="tr">
-
-                                    <button type="button" class="btn-reset td uSky-templates-column"
-                                            ng-class="{last: $last, selected: cell == currentCell}"
-                                            ng-repeat="cell in currentRow.areas"
-                                            ng-click="vm.configureCell(cell, currentRow)"
-                                            ng-style="{width: vm.percentage(cell.grid) + '%'}">
-                                        <span class="sr-only">
-                                            <span class="sr-only">
-                                                <localize key="grid_editRowConfiguration">Edit row configuration</localize>
-                                            </span>
-                                        </span>
-                                    </button>
-
-                                    <button type="button" class="btn-reset td uSky-templates-column add"
-                                            ng-click="vm.configureCell(null, currentRow)"
-                                            ng-style="{width: vm.percentage(availableRowSpace) + '%'}">
-                                        <umb-icon icon="icon-add" class="icon"></umb-icon>
-                                        <span class="sr-only">
-                                            <localize key="grid_addRowConfiguration">Add row configuration</localize>
-                                        </span>
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div ng-if="currentCell" style="padding-bottom: 50px;">
-
-                            <umb-control-group label="@general_width">
-                                <div class="grid-size-scaler">
-                                    <button type="button" class="btn-link" ng-click="vm.scaleDown(currentCell)">
-                                        <umb-icon icon="icon-remove" class="icon"></umb-icon>
-                                        <span class="sr-only">
-                                            <localize key="general_remove">Remove</localize>
-                                        </span>
-                                    </button>
-                                    <span>{{currentCell.grid}}</span>
-                                    <button type="button" class="btn-link" ng-click="vm.scaleUp(currentCell, availableRowSpace, true)">
-                                        <umb-icon icon="icon-add" class="icon"></umb-icon>
-                                        <span class="sr-only">
-                                            <localize key="general_add">Add</localize>
-                                        </span>
-                                    </button>
-                                </div>
-                            </umb-control-group>
-
-                            <umb-control-group label="@grid_maxItems" description="@grid_maxItemsDescription">
-                                <input type="number" ng-model="currentCell.maxItems" class="umb-property-editor-tiny" placeholder="Max" min="0" />
-                            </umb-control-group>
-
-                            <umb-control-group hide-label="true">
-                                <umb-icon icon="icon-delete" class="red"></umb-icon>
-                                <button type="button" class="btn btn-small btn-link" ng-click="vm.deleteArea(currentCell, currentRow)">
-                                    <localize key="general_delete" class="ng-isolate-scope ng-scope">Delete</localize>
-                                </button>
-                            </umb-control-group>
-
-                            <umb-control-group hide-label="true">
-
-                                <umb-toggle class="umb-toggle-group-item__toggle"
-                                            checked="currentCell.allowAll"
-                                            on-click="vm.toggleAllowed(currentCell)"
-                                            show-labels="true"
-                                            label-position="right"
-                                            label-off="{{vm.labels.allowAllEditors}}"
-                                            label-on="{{vm.labels.allowAllEditors}}"
-                                            style="margin-left: 18px">
-                                </umb-toggle>
-
-                                <div ng-if="currentCell.allowAll === false">
-                                    <hr />
-                                    <ul class="unstyled">
-                                        <li ng-repeat="editor in editors track by $id(editor)">
-
-                                            <umb-checkbox model="editor.allowed"
-                                                          input-id="editorconfig-{{$index}}"
-                                                          on-change="vm.selectEditor(currentCell, editor)">
-                                                <umb-icon icon="{{editor.icon}}" class="icon"></umb-icon>
-                                                <small class="input-label--small">({{editor.alias}})</small>
-                                            </umb-checkbox>
-
-                                        </li>
-                                    </ul>
-                                </div>
-                            </umb-control-group>
-                        </div>
-
-                    </div>
-
-                    </umb-box-content>
-                </umb-box>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                <umb-editor-footer-content-right>
-                    <umb-button
-                        type="button"
-                        button-style="link"
-                        label-key="general_close"
-                        shortcut="esc"
-                        action="vm.close()">
-                    </umb-button>
-                    <umb-button
-                        type="button"
-                        button-style="success"
-                        label-key="general_submit"
-                        action="vm.submit()">
-                    </umb-button>
-                </umb-editor-footer-content-right>
-            </umb-editor-footer>
-
-        </form>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
deleted file mode 100644
index 909b2a555f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
+++ /dev/null
@@ -1,52 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.PropertyEditors.Grid.EmbedController",
-    function ($scope, $timeout, $sce, editorService) {
-
-        function onInit() {
-
-            $scope.control.icon = $scope.control.icon || 'icon-movie-alt';
-
-            var embedPreview = Utilities.isObject($scope.control.value) && $scope.control.value.preview ? $scope.control.value.preview : $scope.control.value;
-
-            $scope.trustedValue = embedPreview ? $sce.trustAsHtml(embedPreview) : null;
-
-            if(!$scope.control.value) {
-                $timeout(function(){
-                    if($scope.control.$initializing){
-                        $scope.setEmbed();
-                    }
-                }, 200);
-            }
-        }
-
-        $scope.setEmbed = function () {
-
-            var modify = Utilities.isObject($scope.control.value) ? $scope.control.value : null;
-
-            var embed = {
-                modify: modify,
-                submit: function (model) {
-
-                    var embed = {
-                        constrain: model.embed.constrain,
-                        height: model.embed.height,
-                        width: model.embed.width,
-                        url: model.embed.url,
-                        info: model.embed.info,
-                        preview: model.embed.preview
-                    };
-
-                    $scope.control.value = embed;
-                    $scope.trustedValue = $sce.trustAsHtml(embed.preview);
-
-                    editorService.close();
-                },
-                close: function() {
-                    editorService.close();
-                }
-            };
-            editorService.embed(embed);
-        };
-
-        onInit();
-});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
deleted file mode 100644
index d3e14c5db1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.Grid.EmbedController">
-
-    <button type="button" class="btn-reset umb-editor-placeholder" ng-click="setEmbed()" ng-if="trustedValue === null">
-        <umb-icon icon="{{control.icon}}" class="icon"></umb-icon>
-        <span class="help-text"><localize key="grid_clickToEmbed">Click to embed</localize></span>
-    </button>
-
-    <button type="button" class="btn-reset umb-editor-preview" ng-if="control.value" ng-click="setEmbed()">
-        <span class="umb-editor-preview-overlay"></span>
-        <span ng-bind-html="trustedValue"></span>
-    </button>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/error.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/error.html
deleted file mode 100644
index 5437c2bf85..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/error.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<p class="red">Something went wrong with this editor, below is the data stored:</p>
-<umb-code-snippet language="'JSON'">{{control | json}}</umb-code-snippet>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.controller.js
deleted file mode 100644
index 486bdab044..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.controller.js
+++ /dev/null
@@ -1,61 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.PropertyEditors.Grid.MacroController",
-        function ($scope, $timeout, editorService, macroResource, macroService, localizationService, $routeParams) {
-
-            $scope.control.icon = $scope.control.icon || 'icon-settings-alt';
-
-            localizationService.localize("grid_clickToInsertMacro").then(function(label) {
-                $scope.title = label;
-            });
-
-            $scope.setMacro = function () {
-
-                var dialogData = {
-                    richTextEditor: true,
-                    macroData: $scope.control.value || {
-                        macroAlias: $scope.control.editor.config && $scope.control.editor.config.macroAlias
-                            ? $scope.control.editor.config.macroAlias : ""
-                    }
-                };
-
-                var macroPicker = {
-                    dialogData: dialogData,
-                    submit: function (model) {
-                        var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, dialogData.renderingEngine);
-
-                        $scope.control.value = {
-                            macroAlias: macroObject.macroAlias,
-                            macroParamsDictionary: macroObject.macroParamsDictionary
-                        };
-
-                        $scope.setPreview($scope.control.value);
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                }
-                editorService.macroPicker(macroPicker);
-            };
-
-            $scope.setPreview = function (macro) {
-                var contentId = $routeParams.id;
-
-                macroResource.getMacroResultAsHtmlForEditor(macro.macroAlias, contentId, macro.macroParamsDictionary)
-                    .then(function (htmlResult) {
-                        $scope.title = macro.macroAlias;
-                        if (htmlResult.trim().length > 0 && htmlResult.indexOf("Macro:") < 0) {
-                            $scope.preview = htmlResult;
-                        }
-                    });
-
-            };
-
-            $timeout(function () {
-                if ($scope.control.$initializing) {
-                    $scope.setMacro();
-                } else if ($scope.control.value) {
-                    $scope.setPreview($scope.control.value);
-                }
-            }, 200);
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html
deleted file mode 100644
index 9db4c324ec..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.Grid.MacroController">
-
-	<button type="button" class="btn-reset umb-editor-placeholder" ng-click="setMacro()">
-		<span ng-if="!preview">
-			<umb-icon icon="{{control.icon}}" class="icon"></umb-icon>
-			<span class="help-text">{{title}}</span>
-		</span>
-		<span ng-if="preview" style="text-align: left; pointer-events: none; cursor: default;"
-			ng-bind-html="preview">
-		</span>
-	</button>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
deleted file mode 100644
index 71519c5245..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ /dev/null
@@ -1,110 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.PropertyEditors.Grid.MediaController",
-    function ($scope, userService, editorService, localizationService, mediaHelper) {
-
-        $scope.control.icon = $scope.control.icon || 'icon-picture';
-
-        updateThumbnailUrl();
-
-        if (!$scope.model.config.startNodeId) {
-            if ($scope.model.config.ignoreUserStartNodes === true) {
-                $scope.model.config.startNodeId = -1;
-                $scope.model.config.startNodeIsVirtual = true;
-
-            } else {
-                userService.getCurrentUser().then(userData => {
-                    $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                    $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
-                });
-            }
-        }
-
-        $scope.setImage = function() {
-            var startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : null;
-
-            var mediaPicker = {
-                startNodeId: startNodeId,
-                startNodeIsVirtual: startNodeId ? $scope.model.config.startNodeIsVirtual : null,
-                cropSize: $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : null,
-                showDetails: true,
-                disableFolderSelect: true,
-                onlyImages: true,
-                dataTypeKey: $scope.model.dataTypeKey,
-                submit: model => {
-                    updateControlValue(model.selection[0]);
-                    editorService.close();
-                },
-                close: () => editorService.close()
-            };
-
-            editorService.mediaPicker(mediaPicker);
-        };
-
-        $scope.editImage = function() {
-
-            const mediaCropDetailsConfig = {
-                size: 'small',
-                target: $scope.control.value,
-                submit: model => {
-                    updateControlValue(model.target);
-                    editorService.close();
-                },
-                close: () => editorService.close()
-            };
-
-            localizationService.localize('defaultdialogs_editSelectedMedia').then(value => {
-                mediaCropDetailsConfig.title = value;
-                editorService.mediaCropDetails(mediaCropDetailsConfig);
-            });
-        }
-
-        /**
-         *
-         */
-        function updateThumbnailUrl() {
-            if ($scope.control.value && $scope.control.value.image) {
-                var options = {
-                    width: 800
-                };
-
-                if ($scope.control.value.coordinates) {
-                    // Use crop
-                    options.crop = $scope.control.value.coordinates;
-                } else if ($scope.control.value.focalPoint) {
-                    // Otherwise use focal point
-                    options.focalPoint = $scope.control.value.focalPoint;
-                }
-
-                if ($scope.control.editor.config && $scope.control.editor.config.size) {
-                    options.width = $scope.control.editor.config.size.width;
-                    options.height = $scope.control.editor.config.size.height;
-                }
-
-                mediaHelper.getProcessedImageUrl($scope.control.value.image, options).then(imageUrl => {
-                    $scope.thumbnailUrl = imageUrl;
-                });
-            } else {
-                $scope.thumbnailUrl = null;
-            }
-        }
-
-        /**
-         *
-         * @param {object} selectedImage
-         */
-        function updateControlValue(selectedImage) {
-            // we could apply selectedImage directly to $scope.control.value,
-            // but this allows excluding fields in future if needed
-            $scope.control.value = {
-                focalPoint: selectedImage.focalPoint,
-                coordinates: selectedImage.coordinates,
-                id: selectedImage.id,
-                udi: selectedImage.udi,
-                image: selectedImage.image,
-                caption: selectedImage.caption,
-                altText: selectedImage.altText
-            };
-
-            updateThumbnailUrl();
-        }
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
deleted file mode 100644
index 02558e9526..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.Grid.MediaController">
-
-    <button type="button" class="btn-reset umb-editor-placeholder" ng-click="setImage()" ng-if="control.value === null">
-        <umb-icon icon="{{control.icon}}" class="icon"></umb-icon>
-        <span ng-id="!control.$inserted" class="help-text">
-            <localize key="grid_clickToInsertImage">Click to insert image</localize>
-        </span>
-    </button>
-
-    <div ng-if="thumbnailUrl !== null" class="relative">
-        
-        <img ng-src="{{thumbnailUrl}}" class="fullSizeImage" alt="" />
-
-        <div class="umb-grid-media--controls">
-            <umb-button                
-                action="setImage()"
-                type="button"
-                button-style="info"
-                label-key="defaultdialogs_selectMedia">
-            </umb-button>            
-            <umb-button                
-                action="editImage()"
-                type="button"
-                button-style="info"
-                label-key="general_edit">
-            </umb-button>
-        </div>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
deleted file mode 100644
index c80786b573..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
+++ /dev/null
@@ -1,10 +0,0 @@
-(function() {
-    "use strict";
-
-    function GridRichTextEditorController() {
-        var vm = this;
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.Grid.RichTextEditorController", GridRichTextEditorController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
deleted file mode 100644
index 2fbd0b2fe3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.Grid.RichTextEditorController as vm" class="umb-rte">
-
-	<grid-rte
-		configuration="model.config.rte"
-		value="control.value"
-		unique-id="control.$uniqueId"
-    datatype-key="{{model.dataTypeKey}}"
-    ignore-user-start-nodes="{{model.config.ignoreUserStartNodes}}">
-	</grid-rte>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.controller.js
deleted file mode 100644
index 31be899ce3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.controller.js
+++ /dev/null
@@ -1,8 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.PropertyEditors.Grid.TextStringController",
-    function () {
-
-        
-
-    });
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.html
deleted file mode 100644
index 89689e42cb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/textstring.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div>
-	<textarea
-		rows="1"
-		umb-auto-resize
-		umb-auto-focus
-		class="textstring input-block-level"
-		id="{{control.$uniqueId}}_text"
-		ng-model="control.value"
-		ng-attr-style="{{control.editor.config.style}}"
-		localize="placeholder"
-		placeholder="@grid_placeholderWriteHere">
-	</textarea>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
deleted file mode 100644
index 0add6cf0ef..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ /dev/null
@@ -1,1023 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.PropertyEditors.GridController",
-        function (
-            $scope,
-            localizationService,
-            gridService,
-            umbRequestHelper,
-            angularHelper,
-            $element,
-            eventsService,
-            editorService,
-            overlayService,
-            $interpolate
-        ) {
-
-            // Grid status variables
-            var placeHolder = "";
-            var currentForm = angularHelper.getCurrentForm($scope);
-
-            $scope.currentRowWithActiveChild = null;
-            $scope.currentCellWithActiveChild = null;
-            $scope.active = null;
-
-            $scope.currentRow = null;
-            $scope.currentCell = null;
-            $scope.currentToolsControl = null;
-            $scope.currentControl = null;
-
-            $scope.openRTEToolbarId = null;
-            $scope.hasSettings = false;
-            $scope.showRowConfigurations = true;
-            $scope.sortMode = false;
-            $scope.reorderKey = "general_reorder";
-
-            // *********************************************
-            // Sortable options
-            // *********************************************
-
-            var draggedRteSettings;// holds a dictionary of RTE settings to remember when dragging things around.
-
-            $scope.sortableOptionsRow = {
-                distance: 10,
-                cursor: "move",
-                placeholder: "ui-sortable-placeholder",
-                handle: ".umb-row-title-bar",
-                helper: "clone",
-                forcePlaceholderSize: true,
-                tolerance: "pointer",
-                zIndex: '999999999999999999',
-                scrollSensitivity: 100,
-                disabled: $scope.readonly,
-                cursorAt: {
-                    top: 40,
-                    left: 60
-                },
-
-                sort: function (event, ui) {
-                    /* prevent vertical scroll out of the screen */
-                    var max = $(".umb-grid").width() - 150;
-                    if (parseInt(ui.helper.css("left")) > max) {
-                        ui.helper.css({ "left": max + "px" });
-                    }
-                    if (parseInt(ui.helper.css("left")) < 20) {
-                        ui.helper.css({ "left": 20 });
-                    }
-                },
-
-                start: function (e, ui) {
-
-                    // Fade out row when sorting
-                    ui.item[0].style.display = "block";
-                    ui.item[0].style.opacity = "0.5";
-
-                    draggedRteSettings = {};
-                    ui.item.find(".umb-rte").each(function (key, value) {
-                        // remove all RTEs in the dragged row and save their settings
-                        var rteId = value.id;
-                        var editor = _.findWhere(tinyMCE.editors, { id: rteId });
-                        if (editor) {
-                            draggedRteSettings[rteId] = editor.settings;
-                        }
-                    });
-                },
-
-                stop: function (e, ui) {
-
-                    // Fade in row when sorting stops
-                    ui.item[0].style.opacity = "1";
-
-                    // reset all RTEs affected by the dragging
-                    ui.item.parents(".umb-column").find(".umb-rte").each(function (key, value) {
-                        var rteId = value.id;
-                        var settings = draggedRteSettings[rteId];
-                        if (!settings) {
-                            var editor = _.findWhere(tinyMCE.editors, { id: rteId });
-                            if (editor) {
-                                settings = editor.settings;
-                            }
-                        }
-                        if (settings) {
-                            tinyMCE.execCommand("mceRemoveEditor", false, rteId);
-                            tinyMCE.init(settings);
-                        }
-                    });
-                    currentForm.$setDirty();
-                }
-            };
-
-            var notIncludedRte = [];// used for RTEs that has been affected by the sorting
-            var cancelMove = false;
-            var startingArea;
-            $scope.sortableOptionsCell = {
-                distance: 10,
-                cursor: "move",
-                uiFloating: true,
-                placeholder: "ui-sortable-placeholder",
-                handle: ".umb-control-handle",
-                helper: "clone",
-                connectWith: ".umb-cell-inner",
-                forcePlaceholderSize: true,
-                tolerance: "pointer",
-                zIndex: '999999999999999999',
-                scrollSensitivity: 100,
-                disabled: $scope.readonly,
-                cursorAt: {
-                    top: 45,
-                    left: 90
-                },
-
-                sort: function (event, ui) {
-
-                    /* prevent vertical scroll out of the screen */
-                    var position = parseInt(ui.item.parent().offset().left) + parseInt(ui.helper.css("left")) - parseInt($(".umb-grid").offset().left);
-                    var max = $(".umb-grid").width() - 220;
-                    if (position > max) {
-                        ui.helper.css({ "left": max - parseInt(ui.item.parent().offset().left) + parseInt($(".umb-grid").offset().left) + "px" });
-                    }
-                    if (position < 0) {
-                        ui.helper.css({ "left": 0 - parseInt(ui.item.parent().offset().left) + parseInt($(".umb-grid").offset().left) + "px" });
-                    }
-                },
-
-                over: function (event, ui) {
-
-                    var area = event.target.getScope_HackForSortable().area;
-                    var allowedEditors = area.$allowedEditors.map(e => e.alias);
-
-                    if (($.inArray(ui.item[0].getScope_HackForSortable().control.editor.alias, allowedEditors) < 0) ||
-                        (startingArea != area && area.maxItems != '' && area.maxItems > 0 && area.maxItems < area.controls.length + 1)) {
-
-                        $scope.$apply(function () {
-                            area.dropNotAllowed = true;
-                        });
-
-                        ui.placeholder.hide();
-                        cancelMove = true;
-                    }
-                    else {
-                        if (area.controls.length == 0) {
-
-                            $scope.$apply(function () {
-                                area.dropOnEmpty = true;
-                            });
-                            ui.placeholder.hide();
-                        } else {
-                            ui.placeholder.show();
-                        }
-                        cancelMove = false;
-                    }
-                },
-
-                out: function (event, ui) {
-                    $scope.$apply(function () {
-                        var dropArea = event.target.getScope_HackForSortable().area;
-                        dropArea.dropNotAllowed = false;
-                        dropArea.dropOnEmpty = false;
-                    });
-                },
-
-                update: function (event, ui) {
-                    /* add all RTEs which are affected by the dragging */
-                    if (!ui.sender) {
-                        if (cancelMove) {
-                            ui.item.sortable.cancel();
-                        }
-                        ui.item.parents(".umb-cell-content").find(".umb-rte").each(function (key, value) {
-                            var rteId = value.id;
-
-                            if ($.inArray(rteId, notIncludedRte) < 0) {
-
-                                // remember this RTEs settings, cause we need to update it later.
-                                var editor = _.findWhere(tinyMCE.editors, { id: rteId })
-                                if (editor) {
-                                    draggedRteSettings[rteId] = editor.settings;
-                                }
-                                notIncludedRte.splice(0, 0, rteId);
-                            }
-                        });
-                    }
-                    else {
-                        $(event.target).find(".umb-rte").each(function () {
-
-                            var rteId = $(this).attr("id");
-
-                            if ($.inArray(rteId, notIncludedRte) < 0) {
-
-                                // remember this RTEs settings, cause we need to update it later.
-                                var editor = _.findWhere(tinyMCE.editors, { id: rteId })
-                                if (editor) {
-                                    draggedRteSettings[rteId] = editor.settings;
-                                }
-
-                                notIncludedRte.splice(0, 0, $(this).attr("id"));
-                            }
-                        });
-                    }
-                    currentForm.$setDirty();
-                },
-
-                start: function (event, ui) {
-                    //Get the starting area for reference
-                    var area = event.target.getScope_HackForSortable().area;
-                    startingArea = area;
-
-                    // fade out control when sorting
-                    ui.item[0].style.display = "block";
-                    ui.item[0].style.opacity = "0.5";
-
-                    // reset dragged RTE settings in case a RTE isn't dragged
-                    draggedRteSettings = {};
-                    notIncludedRte = [];
-
-                    ui.item[0].style.display = "block";
-                    ui.item.find(".umb-rte").each(function (key, value) {
-
-                        var rteId = value.id;
-
-                        // remember this RTEs settings, cause we need to update it later.
-                        var editor = _.findWhere(tinyMCE.editors, { id: rteId });
-
-                        // save the dragged RTE settings
-                        if (editor) {
-                            draggedRteSettings[rteId] = editor.settings;
-
-                            // remove the dragged RTE
-                            tinyMCE.execCommand("mceRemoveEditor", false, rteId);
-
-                        }
-
-                    });
-                },
-
-                stop: function (event, ui) {
-                    // Fade in control when sorting stops
-                    ui.item[0].style.opacity = "1";
-
-                    ui.item.offsetParent().find(".umb-rte").each(function (key, value) {
-                        var rteId = value.id;
-                        if ($.inArray(rteId, notIncludedRte) < 0) {
-
-                            var editor = _.findWhere(tinyMCE.editors, { id: rteId });
-                            if (editor) {
-                                draggedRteSettings[rteId] = editor.settings;
-                            }
-
-                            // add all dragged's neighbouring RTEs in the new cell
-                            notIncludedRte.splice(0, 0, rteId);
-                        }
-                    });
-
-                    // reconstruct the dragged RTE (could be undefined when dragging something else than RTE)
-                    if (draggedRteSettings !== undefined) {
-                        tinyMCE.init(draggedRteSettings);
-                    }
-
-                    _.forEach(notIncludedRte, function (rteId) {
-                        // reset all the other RTEs
-                        if (draggedRteSettings === undefined || rteId !== draggedRteSettings.id) {
-                            tinyMCE.execCommand("mceRemoveEditor", false, rteId);
-                            if (draggedRteSettings[rteId]) {
-                                tinyMCE.init(draggedRteSettings[rteId]);
-                            }
-                        }
-                    });
-
-                    $scope.$apply(function () {
-                        var cell = event.target.getScope_HackForSortable().area;
-
-                        if (hasActiveChild(cell, cell.controls)) {
-                            $scope.currentCellWithActiveChild = cell;
-                        }
-                        $scope.active = cell;
-
-                    });
-                }
-
-            };
-
-            $scope.toggleSortMode = function () {
-                $scope.sortMode = !$scope.sortMode;
-                if ($scope.sortMode) {
-                    $scope.reorderKey = "general_reorderDone";
-                } else {
-                    $scope.reorderKey = "general_reorder";
-                }
-            };
-
-            $scope.showReorderButton = function () {
-                if ($scope.readonly) return false;
-
-                if ($scope.model.value && $scope.model.value.sections) {
-                    for (var i = 0; $scope.model.value.sections.length > i; i++) {
-                        var section = $scope.model.value.sections[i];
-                        if (section.rows && section.rows.length > 0) {
-                            return true;
-                        }
-                    }
-                }
-            };
-
-            // *********************************************
-            // Add items overlay menu
-            // *********************************************
-            $scope.openEditorOverlay = function (event, area, index, key) {
-                const dialog = {
-                    view: "itempicker",
-                    filter: area.$allowedEditors.length > 15,
-                    availableItems: area.$allowedEditors,
-                    event: event,
-                    submit: function (model) {
-                        if (model.selectedItem) {
-                            $scope.addControl(model.selectedItem, area, index);
-                            overlayService.close();
-                        }
-                    },
-                    close: function () {
-                        overlayService.close();
-                    }
-                };
-
-                localizationService.localize("grid_insertControl").then(value => {
-                    dialog.title = value;
-                    overlayService.open(dialog);
-                });
-            };
-
-            // *********************************************
-            // Template management functions
-            // *********************************************
-
-            $scope.addTemplate = function (template) {
-                $scope.model.value = Utilities.copy(template);
-
-                //default row data
-                _.forEach($scope.model.value.sections, function (section) {
-                    $scope.initSection(section);
-                });
-            };
-
-
-            // *********************************************
-            // Row management function
-            // *********************************************
-
-            $scope.clickRow = function (index, rows, $event) {
-                if ($scope.readonly) return;
-
-                $scope.currentRowWithActiveChild = null;
-                $scope.active = rows[index];
-
-                $event.stopPropagation();
-            };
-
-            function getAllowedLayouts(section) {
-
-                var layouts = $scope.model.config.items.layouts;
-
-                //This will occur if it is a new section which has been
-                // created from a 'template'
-                if (section.allowed && section.allowed.length > 0) {
-                    return _.filter(layouts, function (layout) {
-                        return _.indexOf(section.allowed, layout.name) >= 0;
-                    });
-                }
-                else {
-
-
-                    return layouts;
-                }
-            }
-
-            $scope.addRow = function (section, layout, isInit) {
-
-                //copy the selected layout into the rows collection
-                var row = Utilities.copy(layout);
-
-                // Init row value
-                row = $scope.initRow(row);
-
-                // Push the new row
-                if (row) {
-                    section.rows.push(row);
-                }
-                if (!isInit) {
-                    currentForm.$setDirty();
-                }
-
-                $scope.showRowConfigurations = false;
-
-                eventsService.emit("grid.rowAdded", { scope: $scope, element: $element, row: row });
-
-                if (!isInit) {
-                    // TODO: find a nicer way to do this without relying on setTimeout
-                    setTimeout(function () {
-                        var newRowEl = $element.find("[data-rowid='" + row.$uniqueId + "']");
-
-                        if (newRowEl !== null) {
-                            newRowEl.focus();
-                        }
-                    }, 0);
-                }
-
-            };
-
-            $scope.removeRow = function (section, $index) {
-                if (section.rows.length > 0) {
-                    section.rows.splice($index, 1);
-                    $scope.currentRow = null;
-                    $scope.currentRowWithActiveChild = null;
-                    $scope.openRTEToolbarId = null;
-                    currentForm.$setDirty();
-                }
-
-                if (section.rows.length === 0) {
-                    $scope.showRowConfigurations = true;
-                }
-            };
-
-            var shouldApply = function (item, itemType, gridItem) {
-                if (item.applyTo === undefined || item.applyTo === null || item.applyTo === "") {
-                    return true;
-                }
-
-                if (typeof (item.applyTo) === "string") {
-                    return item.applyTo === itemType;
-                }
-
-                if (itemType === "row") {
-                    if (item.applyTo.row === undefined) {
-                        return false;
-                    }
-                    if (item.applyTo.row === null || item.applyTo.row === "") {
-                        return true;
-                    }
-                    var rows = item.applyTo.row.split(',');
-                    return _.indexOf(rows, gridItem.name) !== -1;
-                } else if (itemType === "cell") {
-                    if (item.applyTo.cell === undefined) {
-                        return false;
-                    }
-                    if (item.applyTo.cell === null || item.applyTo.cell === "") {
-                        return true;
-                    }
-                    var cells = item.applyTo.cell.split(',');
-                    var cellSize = gridItem.grid.toString();
-                    return _.indexOf(cells, cellSize) !== -1;
-                }
-            }
-
-            $scope.editGridItemSettings = function (gridItem, itemType) {
-
-                placeHolder = "{0}";
-
-                var styles, config;
-                if (itemType === 'control') {
-                    styles = null;
-                    config = Utilities.copy(gridItem.editor.config.settings);
-                } else {
-                    styles = _.filter(Utilities.copy($scope.model.config.items.styles), function (item) { return shouldApply(item, itemType, gridItem); });
-                    config = _.filter(Utilities.copy($scope.model.config.items.config), function (item) { return shouldApply(item, itemType, gridItem); });
-                }
-
-                if (Utilities.isObject(gridItem.config)) {
-                    _.each(config, function (cfg) {
-                        var val = gridItem.config[cfg.key];
-                        if (val) {
-                            cfg.value = stripModifier(val, cfg.modifier);
-                        }
-                    });
-                }
-
-                if (Utilities.isObject(gridItem.styles)) {
-                    _.each(styles, function (style) {
-                        var val = gridItem.styles[style.key];
-                        if (val) {
-                            style.value = stripModifier(val, style.modifier);
-                        }
-                    });
-                }
-
-                var dialogOptions = {
-                    view: "views/propertyeditors/grid/dialogs/config.html",
-                    size: "small",
-                    styles: styles,
-                    config: config,
-                    submit: function (model) {
-                        var styleObject = {};
-                        var configObject = {};
-
-                        _.each(model.styles, function (style) {
-                            if (style.value) {
-                                styleObject[style.key] = addModifier(style.value, style.modifier);
-                            }
-                        });
-                        _.each(model.config, function (cfg) {
-                            cfg.alias = cfg.key;
-                            cfg.label = cfg.value;
-
-                            if (cfg.value) {
-                                configObject[cfg.key] = addModifier(cfg.value, cfg.modifier);
-                            }
-                        });
-
-                        gridItem.styles = styleObject;
-                        gridItem.config = configObject;
-                        gridItem.hasConfig = gridItemHasConfig(styleObject, configObject);
-
-                        currentForm.$setDirty();
-
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-
-                localizationService.localize("general_settings").then(value => {
-                    dialogOptions.title = value;
-                    editorService.open(dialogOptions);
-                });
-
-            };
-
-            function stripModifier(val, modifier) {
-                if (!val || !modifier || modifier.indexOf(placeHolder) < 0) {
-                    return val;
-                } else {
-                    var paddArray = modifier.split(placeHolder);
-                    if (paddArray.length == 1) {
-                        if (modifier.indexOf(placeHolder) === 0) {
-                            return val.slice(0, -paddArray[0].length);
-                        } else {
-                            return val.slice(paddArray[0].length, 0);
-                        }
-                    } else {
-                        if (paddArray[1].length === 0) {
-                            return val.slice(paddArray[0].length);
-                        }
-                        return val.slice(paddArray[0].length, -paddArray[1].length);
-                    }
-                }
-            }
-
-            var addModifier = function (val, modifier) {
-                if (!modifier || modifier.indexOf(placeHolder) < 0) {
-                    return val;
-                } else {
-                    return modifier.replace(placeHolder, val);
-                }
-            };
-
-            function gridItemHasConfig(styles, config) {
-
-                if (_.isEmpty(styles) && _.isEmpty(config)) {
-                    return false;
-                } else {
-                    return true;
-                }
-
-            }
-
-            // *********************************************
-            // Area management functions
-            // *********************************************
-
-            $scope.clickCell = function (index, cells, row, $event) {
-                if ($scope.readonly) return;
-
-                $scope.currentCellWithActiveChild = null;
-
-                $scope.active = cells[index];
-                $scope.currentRowWithActiveChild = row;
-                $event.stopPropagation();
-            };
-
-            $scope.cellPreview = function (cell) {
-                if (cell && cell.$allowedEditors) {
-                    var editor = cell.$allowedEditors[0];
-                    return editor.icon;
-                } else {
-                    return "icon-layout";
-                }
-            };
-
-
-            // *********************************************
-            // Control management functions
-            // *********************************************
-            $scope.clickControl = function (index, controls, cell, $event) {
-                if ($scope.readonly) return;
-
-                $scope.active = controls[index];
-                $scope.currentCellWithActiveChild = cell;
-
-                $event.stopPropagation();
-            };
-
-            function hasActiveChild(item, children) {
-
-                var activeChild = false;
-
-                for (var i = 0; children.length > i; i++) {
-                    var child = children[i];
-
-                    if (child.active) {
-                        activeChild = true;
-                    }
-                }
-
-                if (activeChild) {
-                    return true;
-                }
-
-            }
-
-            $scope.setUniqueId = function () {
-                return String.CreateGuid();
-            };
-
-            $scope.addControl = function (editor, cell, index, initialize) {
-
-                initialize = (initialize !== false);
-
-                var newControl = {
-                    value: null,
-                    editor: editor,
-                    $initializing: initialize
-                };
-
-                if (index === undefined) {
-                    index = cell.controls.length;
-                }
-
-                $scope.active = newControl;
-
-                //populate control
-                $scope.initControl(newControl, index + 1);
-
-                cell.controls.push(newControl);
-
-                eventsService.emit("grid.itemAdded", { scope: $scope, element: $element, cell: cell, item: newControl });
-
-            };
-
-            $scope.addTinyMce = function (cell) {
-                var rte = $scope.getEditor("rte");
-                $scope.addControl(rte, cell);
-            };
-
-            $scope.getEditor = function (alias) {
-                return _.find($scope.availableEditors, function (editor) { return editor.alias === alias; });
-            };
-
-            $scope.removeControl = function (cell, $index) {
-                $scope.currentControl = null;
-                cell.controls.splice($index, 1);
-                currentForm.$setDirty();
-            };
-
-            $scope.percentage = function (spans) {
-                return ((spans / $scope.model.config.items.columns) * 100).toFixed(8);
-            };
-
-
-            $scope.clearPrompt = function (scopedObject, e) {
-                scopedObject.deletePrompt = false;
-                e.preventDefault();
-                e.stopPropagation();
-            };
-
-            $scope.togglePrompt = function (scopedObject) {
-                scopedObject.deletePrompt = !scopedObject.deletePrompt;
-            };
-
-            $scope.hidePrompt = function (scopedObject) {
-                scopedObject.deletePrompt = false;
-            };
-
-            $scope.toggleAddRow = function () {
-                $scope.showRowConfigurations = !$scope.showRowConfigurations;
-            };
-
-            $scope.getTemplateName = function (control) {
-                var templateName = control.editor.name;
-                if (control.editor.nameExp) {
-                    var valueOfTemplate = control.editor.nameExp(control);
-                    if (valueOfTemplate != "") {
-                        templateName += ": ";
-                        templateName += valueOfTemplate;
-                    }
-                }
-                return templateName;
-            }
-
-            // *********************************************
-            // Initialization
-            // these methods are called from ng-init on the template
-            // so we can controll their first load data
-            //
-            // intialization sets non-saved data like percentage sizing, allowed editors and
-            // other data that should all be pre-fixed with $ to strip it out on save
-            // *********************************************
-
-            // *********************************************
-            // Init template + sections
-            // *********************************************
-            $scope.initContent = function () {
-                var clear = true;
-
-                //settings indicator shortcut
-                if (($scope.model.config.items.config && $scope.model.config.items.config.length > 0) || ($scope.model.config.items.styles && $scope.model.config.items.styles.length > 0)) {
-                    $scope.hasSettings = true;
-                }
-
-                //ensure the grid has a column value set,
-                //if nothing is found, set it to 12
-                if (!$scope.model.config.items.columns) {
-                    $scope.model.config.items.columns = 12;
-                } else if (Utilities.isString($scope.model.config.items.columns)) {
-                    $scope.model.config.items.columns = parseInt($scope.model.config.items.columns);
-                }
-
-                if ($scope.model.value && $scope.model.value.sections && $scope.model.value.sections.length > 0 && $scope.model.value.sections[0].rows && $scope.model.value.sections[0].rows.length > 0) {
-
-                    if ($scope.model.value.name && Utilities.isArray($scope.model.config.items.templates)) {
-
-                        //This will occur if it is an existing value, in which case
-                        // we need to determine which layout was applied by looking up
-                        // the name
-                        // TODO: We need to change this to an immutable ID!!
-
-                        var found = _.find($scope.model.config.items.templates, function (t) {
-                            return t.name === $scope.model.value.name;
-                        });
-
-                        if (found && Utilities.isArray(found.sections) && found.sections.length === $scope.model.value.sections.length) {
-
-                            //Cool, we've found the template associated with our current value with matching sections counts, now we need to
-                            // merge this template data on to our current value (as if it was new) so that we can preserve what is and isn't
-                            // allowed for this template based on the current config.
-
-                            _.each(found.sections, function (templateSection, index) {
-                                Utilities.extend($scope.model.value.sections[index], Utilities.copy(templateSection));
-                            });
-
-                        }
-                    }
-
-                    _.forEach($scope.model.value.sections, function (section, index) {
-
-                        if (section.grid > 0) {
-                            $scope.initSection(section);
-
-                            //we do this to ensure that the grid can be reset by deleting the last row
-                            if (section.rows.length > 0) {
-                                clear = false;
-                            }
-                        } else {
-                            $scope.model.value.sections.splice(index, 1);
-                        }
-                    });
-                } else if ($scope.model.config.items.templates && $scope.model.config.items.templates.length === 1) {
-                    $scope.addTemplate($scope.model.config.items.templates[0]);
-                    clear = false;
-                }
-
-                if (clear) {
-                    $scope.model.value = undefined;
-                }
-            };
-
-            $scope.initSection = function (section) {
-                section.$percentage = $scope.percentage(section.grid);
-
-                section.$allowedLayouts = getAllowedLayouts(section);
-
-                if (!section.rows || section.rows.length === 0) {
-                    section.rows = [];
-                    if (section.$allowedLayouts.length === 1) {
-                        $scope.addRow(section, section.$allowedLayouts[0], true);
-                    }
-                } else {
-                    _.forEach(section.rows, function (row, index) {
-                        if (!row.$initialized) {
-                            var initd = $scope.initRow(row);
-
-                            //if init fails, remove
-                            if (!initd) {
-                                section.rows.splice(index, 1);
-                            } else {
-                                section.rows[index] = initd;
-                            }
-                        }
-                    });
-
-                    // if there is more than one row added - hide row add tools
-                    $scope.showRowConfigurations = false;
-                }
-            };
-
-
-            // *********************************************
-            // Init layout / row
-            // *********************************************
-            $scope.initRow = function (row) {
-
-                //merge the layout data with the original config data
-                //if there are no config info on this, splice it out
-                var original = _.find($scope.model.config.items.layouts, function (o) { return o.name === row.name; });
-
-                if (!original) {
-                    return null;
-                } else {
-                    //make a copy to not touch the original config
-                    original = Utilities.copy(original);
-                    original.styles = row.styles;
-                    original.config = row.config;
-                    original.hasConfig = gridItemHasConfig(row.styles, row.config);
-
-
-                    //sync area configuration
-                    _.each(original.areas, function (area, areaIndex) {
-
-
-                        if (area.grid > 0) {
-                            var currentArea = row.areas[areaIndex];
-
-                            if (currentArea) {
-                                area.config = currentArea.config;
-                                area.styles = currentArea.styles;
-                                area.hasConfig = gridItemHasConfig(currentArea.styles, currentArea.config);
-                            }
-
-                            //set editor permissions
-                            if (!area.allowed || area.allowAll === true) {
-                                area.$allowedEditors = $scope.availableEditors;
-                                area.$allowsRTE = true;
-                            } else {
-                                area.$allowedEditors = _.filter($scope.availableEditors, function (editor) {
-                                    return _.indexOf(area.allowed, editor.alias) >= 0;
-                                });
-
-                                if (_.indexOf(area.allowed, "rte") >= 0) {
-                                    area.$allowsRTE = true;
-                                }
-                            }
-
-                            //copy over existing controls into the new areas
-                            if (row.areas.length > areaIndex && row.areas[areaIndex].controls) {
-                                area.controls = currentArea.controls;
-
-                                _.forEach(area.controls, function (control, controlIndex) {
-                                    $scope.initControl(control, controlIndex);
-                                });
-
-                            } else {
-                                //if empty
-                                area.controls = [];
-
-                                //if only one allowed editor
-                                if (area.$allowedEditors.length === 1) {
-                                    $scope.addControl(area.$allowedEditors[0], area, 0, false);
-                                }
-                            }
-
-                            //set width
-                            area.$percentage = $scope.percentage(area.grid);
-                            area.$uniqueId = $scope.setUniqueId();
-
-                        } else {
-                            original.areas.splice(areaIndex, 1);
-                        }
-                    });
-
-                    //replace the old row
-                    original.$initialized = true;
-
-                    //set a disposable unique ID
-                    original.$uniqueId = $scope.setUniqueId();
-
-                    //set a no disposable unique ID (util for row styling)
-                    original.id = !row.id ? $scope.setUniqueId() : row.id;
-
-                    return original;
-                }
-
-            };
-
-
-            // *********************************************
-            // Init control
-            // *********************************************
-
-            $scope.initControl = function (control, index) {
-                control.$index = index;
-                control.$uniqueId = $scope.setUniqueId();
-
-                //error handling in case of missing editor..
-                //should only happen if stripped earlier
-                if (!control.editor) {
-                    control.$editorPath = "views/propertyeditors/grid/editors/error.html";
-                }
-
-                if (!control.$editorPath) {
-                    var editorConfig = $scope.getEditor(control.editor.alias);
-
-                    if (editorConfig) {
-                        control.editor = editorConfig;
-
-                        //if its an absolute path
-                        if (control.editor.view.startsWith("/") || control.editor.view.startsWith("~/")) {
-                            control.$editorPath = umbRequestHelper.convertVirtualToAbsolutePath(control.editor.view);
-                        }
-                        else {
-                            //use convention
-                            control.$editorPath = "views/propertyeditors/grid/editors/" + control.editor.view + ".html";
-                        }
-                    }
-                    else {
-                        control.$editorPath = "views/propertyeditors/grid/editors/error.html";
-                    }
-                }
-
-
-            };
-
-
-            gridService.getGridEditors().then(function (response) {
-                $scope.availableEditors = response.data;
-
-                //Localize the grid editor names
-                $scope.availableEditors.forEach(function (value) {
-                    //If no translation is provided, keep using the editor name from the manifest
-                    localizationService.localize("grid_" + value.alias, undefined, value.name).then(function (v) {
-                        value.name = v;
-                    });
-                    // setup nametemplate
-
-                    value.nameExp = value.nameTemplate
-                        ? $interpolate(value.nameTemplate)
-                        : undefined;
-                });
-
-                $scope.contentReady = true;
-
-                // *********************************************
-                // Init grid
-                // *********************************************
-
-                eventsService.emit("grid.initializing", { scope: $scope, element: $element });
-
-                $scope.initContent();
-
-                eventsService.emit("grid.initialized", { scope: $scope, element: $element });
-
-            });
-
-            //Clean the grid value before submitting to the server, we don't need
-            // all of that grid configuration in the value to be stored!! All of that
-            // needs to be merged in at runtime to ensure that the real config values are used
-            // if they are ever updated.
-
-            var unsubscribe = $scope.$on("formSubmitting", function (e, args) {
-
-                if (args.action === "save" && $scope.model.value && $scope.model.value.sections) {
-                    _.each($scope.model.value.sections, function (section) {
-                        if (section.rows) {
-                            _.each(section.rows, function (row) {
-                                if (row.areas) {
-                                    _.each(row.areas, function (area) {
-
-                                        //Remove the 'editors' - these are the allowed editors, these will
-                                        // be injected at runtime to this editor, it should not be persisted
-
-                                        if (area.editors) {
-                                            delete area.editors;
-                                        }
-
-                                        if (area.controls) {
-                                            _.each(area.controls, function (control) {
-                                                if (control.editor) {
-                                                    //replace
-                                                    var alias = control.editor.alias;
-                                                    control.editor = {
-                                                        alias: alias
-                                                    };
-                                                }
-                                            });
-                                        }
-                                    });
-                                }
-                            });
-                        }
-                    });
-                }
-            });
-
-            //when the scope is destroyed we need to unsubscribe
-            $scope.$on("$destroy", function () {
-                unsubscribe();
-            });
-
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.getScopeHack.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.getScopeHack.controller.js
deleted file mode 100644
index 3df8c01d61..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.getScopeHack.controller.js
+++ /dev/null
@@ -1,25 +0,0 @@
-(function () {
-    "use strict";
-
-    function umbGridHackScope() {
-        
-        function link($scope, $element) {
-            
-            // Since the grid used the el.scope() method, which should only be used by debugging, and only are avilable in debug-mode. I had to make a replica method doig the same:
-            $element[0].getScope_HackForSortable = function() {
-                return $scope;
-            }
-        }
-        
-        var directive = {
-            restrict: "A",
-            link: link
-        };
-
-        return directive;
-
-    }
-    
-    angular.module("umbraco").directive("umbGridHackScope", umbGridHackScope);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
deleted file mode 100644
index 432c2a7d29..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.GridController" class="umb-grid umb-property-editor clearfix" id="umb-grid">
-
-    <umb-editor-sub-header ng-if="showReorderButton()" appearance="white">
-
-        <umb-editor-sub-header-content-right>
-            <umb-button
-                type="button"
-                icon="icon-navigation"
-                button-style="link"
-                label-key="{{reorderKey}}"
-                action="toggleSortMode()">
-            </umb-button>
-        </umb-editor-sub-header-content-right>
-
-    </umb-editor-sub-header>
-
-
-    <div ng-if="contentReady">
-
-        <!-- Template picker -->
-
-        <div class="templates-preview"
-             ng-show="!model.value || model.value == ''">
-
-             <p><strong><localize key="grid_chooseLayout">Choose a layout</localize></strong></p>
-
-            <div class="preview-rows layout"
-                 ng-repeat="template in model.config.items.templates"
-                 ng-click="addTemplate(template)">
-
-                <div class="preview-row">
-
-                    <div class="preview-col"
-                         ng-repeat="section in template.sections"
-                         ng-style="{width: percentage(section.grid) + '%'}">
-
-                        <div class="preview-cell">
-                        </div>
-
-                    </div>
-
-                </div>
-
-                <div class="preview-overlay">
-                </div>
-
-                <small>{{template.name}}</small>
-
-            </div> <!-- .templates-preview-rows -->
-
-        </div> <!-- .templates-preview -->
-        <!-- template picker end -->
-
-        <!-- Grids -->
-        <div class="umb-grid-width">
-            <div class="tb">
-
-                <!-- for each column in model -->
-                <div class="umb-column td"
-                     ng-repeat="section in model.value.sections"
-                     ng-init="initSection(section)"
-                     ng-style="{width: section.$percentage + '%'}">
-
-                    <div ui-sortable="sortableOptionsRow" ng-model="section.rows">
-
-                        <!-- for each row in template section -->
-                        <!-- ng-mouseenter="setCurrentRow(row)" -->
-                        <!-- ng-mouseleave="disableCurrentRow()"  -->
-                        <div class="umb-row"
-                             ng-repeat="row in section.rows"
-                             ng-click="clickRow($index, section.rows, $event)"
-                             ng-class="{
-                                     '-has-config': row.hasConfig,
-                                     '-active': row === active,
-                                     '-active-child': row === currentRowWithActiveChild}"
-
-                             bind-click-on="{{row === active || row === currentRowWithActiveChild}}"
-                             data-rowid="{{row.$uniqueId}}">
-
-                            <div class="umb-row-title-bar">
-
-                                <div class=".umb-grid-right">
-                                    <div class="umb-row-title">{{row.label || row.name}}</div>
-
-                                    <div class="umb-grid-has-config" ng-if="row.hasConfig && !sortMode">
-                                            <p><localize key="grid_settingsApplied">Settings applied</localize></p>
-                                    </div>
-                                </div>
-
-                               <!-- Row tool -->
-                               <div class="umb-tools row-tools" ng-show="(row === active || row === currentRowWithActiveChild) && !sortMode">
-
-                                   <div class="cell-tools-edit row-tool" ng-if="hasSettings && !readonly">
-                                       <button type="button" class="btn-icon" ng-click="editGridItemSettings(row, 'row')" localize="title" title="@grid_settings">
-                                           <umb-icon icon="icon-settings"></umb-icon>
-                                           <span class="sr-only">
-                                               <localize key="grid_settings">Settings</localize>
-                                           </span>
-                                       </button>
-                                   </div>
-
-                                    <div ng-if="!readonly" class="cell-tools-remove row-tool">
-                                        <button class="icon-trash btn-reset" ng-click="togglePrompt(row)" type="button"></button>
-                                        <umb-confirm-action
-                                            ng-if="row.deletePrompt"
-                                            direction="left"
-                                            on-confirm="removeRow(section, $index)"
-                                            on-cancel="hidePrompt(row)">
-                                        </umb-confirm-action>
-                                    </div>
-
-                               </div>
-
-
-                            </div>
-
-                            <!-- row container -->
-                            <div class="{{row.cssClass}} umb-row-inner">
-
-                                <div class="mainTb">
-                                    <div class="tb">
-                                        <div>
-
-                                            <!-- Areas in row -->
-                                            <div class="umb-cell td mainTd"
-                                                 ng-repeat="area in row.areas"
-                                                 ng-style="{width: area.$percentage + '%'}"
-                                                 ng-class="{
-                                                    '-has-config': area.hasConfig,
-                                                    '-active': area === active,
-                                                    '-active-child': area === currentCellWithActiveChild}"
-                                                 ng-model="area.controls"
-                                                 ng-click="clickCell($index, row.areas, row, $event)"
-
-                                                 bind-click-on="{{area === active}}">
-
-                                                 <!-- Cell -->
-                                                 <div class="umb-cell-content"
-                                                      ng-class="{'-active': area === active, '-has-editors': area.controls.length > 0, '-collapsed': sortMode}">
-
-                                                      <!-- disable drop overlay -->
-                                                      <div class="drop-overlay -disable" ng-if="area.dropNotAllowed">
-                                                          <umb-icon icon="icon-delete" class="drop-icon"></umb-icon>
-                                                          <p><localize key="grid_contentNotAllowed">This content is not allowed here</localize></p>
-                                                      </div>
-
-                                                      <!-- allow drop overlay -->
-                                                      <div class="drop-overlay -allow" ng-if="area.dropOnEmpty">
-                                                          <umb-icon icon="icon-download" class="drop-icon"></umb-icon>
-                                                          <p><localize key="grid_contentAllowed">This content is allowed here</localize></p>
-                                                      </div>
-
-                                                      <div class="umb-grid-has-config" ng-if="area.hasConfig && !sortMode">
-                                                         <p>
-                                                            <localize key="grid_settingsApplied">Settings applied</localize>
-                                                         </p>
-                                                      </div>
-
-                                                      <div class="cell-tools" ng-if="(area === active || area === currentCellWithActiveChild) && !sortMode && !readonly">
-                                                          <button type="button" aria-haspopup="true" class="btn-icon cell-tool" ng-click="editGridItemSettings(area, 'cell')">
-                                                              <umb-icon icon="icon-settings"></umb-icon>
-                                                              <span class="sr-only">Open column settings</span>
-                                                          </button>
-                                                      </div>
-
-                                                      <div class="umb-cell-inner" ui-sortable="sortableOptionsCell" umb-grid-hack-scope ng-model="area.controls">
-
-                                                          <!-- Control placeholder -->
-                                                          <button class="umb-cell-placeholder btn-reset" type="button" ng-if="area.controls.length === 0" ng-click="openEditorOverlay($event, area, 0, area.$uniqueId);" ng-disabled="readonly">
-                                                               <div class="cell-tools-add -center">
-                                                                   <p>
-                                                                        <localize ng-if="!sortMode" key="grid_addElement">Add content</localize>
-                                                                        <localize ng-if="sortMode" key="grid_dropElement">Drop element</localize>
-                                                                   </p>
-                                                               </div>
-                                                          </button>
-
-                                                          <!-- for each control in areas -->
-                                                          <div class="umb-control"
-                                                              umb-grid-hack-scope
-                                                              ng-repeat="control in area.controls"
-                                                              ng-click="clickControl($index, area.controls, area, $event)"
-                                                              ng-class="{'-active': control === active}"
-
-                                                              bind-click-on="{{control === active}}"
-                                                              umb-set-dirty-on-change="{{control.value}}"
-                                                              data-itemid="{{control.$uniqueId}}">
-
-                                                              <div class="umb-control-click-overlay" ng-show="control !== active && !sortMode"></div>
-
-                                                              <div class="umb-control-collapsed umb-control-handle" ng-show="sortMode">
-                                                                  {{ getTemplateName(control) }}
-                                                              </div>
-
-                                                              <div class="umb-control-inner" ng-hide="sortMode">
-
-                                                                  <div class="umb-control-bar umb-control-handle">
-
-                                                                      <div class="umb-control-title" ng-if="control === active">
-                                                                          {{ getTemplateName(control) }}
-                                                                      </div>
-
-                                                                      <div class="umb-tools" ng-if="control === active">
-
-                                                                          <div class="umb-control-tool" ng-if="control.editor.config.settings && !readonly">
-                                                                              <button type="button" class="umb-control-tool-icon btn-icon" ng-click="editGridItemSettings(control, 'control')">
-                                                                                  <umb-icon icon="icon-settings"></umb-icon>
-                                                                                  <span class="sr-only">
-                                                                                      <localize key="general_edit">Edit</localize>
-                                                                                  </span>
-                                                                              </button>
-                                                                          </div>
-
-                                                                          <div ng-if="!readonly" class="umb-control-tool">
-                                                                              <button class="umb-control-tool-icon icon-trash btn-reset" ng-click="togglePrompt(control)" type="button"></button>
-                                                                              <umb-confirm-action ng-if="control.deletePrompt"
-                                                                                                  direction="left"
-                                                                                                  on-confirm="removeControl(area, $index)"
-                                                                                                  on-cancel="hidePrompt(control)">
-                                                                              </umb-confirm-action>
-                                                                          </div>
-
-                                                                      </div>
-
-                                                                  </div>
-
-                                                                  <!-- Redering the editor for specific control -->
-                                                                  <div ng-if="control && control.$editorPath"
-                                                                       ng-include="control.$editorPath"
-                                                                       class="umb-cell-{{control.editor.view}}">
-                                                                  </div>
-
-                                                              </div>
-                                                          </div>
-
-                                                      </div>
-                                                      <!-- Controls repeat end -->
-
-                                                      <!-- if area is empty tools -->
-                                                      <div ng-if="!readonly" class="umb-grid-add-more-content" ng-if="area.controls.length > 0 && !sortMode && (area.maxItems == undefined || area.maxItems == '' || area.maxItems == 0 || area.maxItems > area.controls.length)">
-                                                            <button 
-                                                                class="cell-tools-add -bar newbtn btn-reset" 
-                                                                type="button" 
-                                                                ng-click="openEditorOverlay($event, area, 0, area.$uniqueId);"
-                                                                ng-disabled="readonly">
-                                                                    <localize key="grid_addElement">Add element</localize>
-                                                            </button>
-                                                      </div>
-
-                                                 </div>
-
-                                            </div>
-                                            <!-- cells repeat end -->
-
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <!-- row container end -->
-
-                        </div>
-                        <!-- row repeat -->
-
-                    </div>
-                    <!-- row sortable end -->
-                    <!-- column tools -->
-
-                    <div class="umb-add-row" ng-if="!sortMode && !readonly">
-
-                        <button type="button"
-                                class="iconBox btn-reset"
-                                title="{{section.$allowedLayouts.length == 1 ? section.$allowedLayouts[0].label || section.$allowedLayouts[0].name : ''}}"
-                                ng-click="section.$allowedLayouts.length == 1 ? addRow(section, section.$allowedLayouts[0]) : toggleAddRow()"
-                                ng-if="!showRowConfigurations">
-                            <umb-icon icon="icon-add" class="icon"></umb-icon>
-                            <span class="sr-only">
-                                <localize key="visuallyHiddenTexts_addNewRow">Add new row</localize>
-                            </span>
-                        </button>
-
-                    </div>
-
-                    <div class="templates-preview" ng-if="showRowConfigurations">
-
-                        <p ng-hide="section.rows.length > 0"><strong><localize key="grid_addRows">Add row</localize></strong></p>
-
-                        <button class="preview-rows columns btn-reset"
-                             ng-repeat="layout in  section.$allowedLayouts"
-                             ng-show="layout.areas.length > 0"
-                             ng-click="addRow(section, layout)"
-                             type="button">
-
-                            <div class="preview-row">
-
-                                <div class="preview-col" ng-style="{width: percentage(area.grid) + '%'}" ng-repeat="area in layout.areas">
-
-                                    <div class="preview-cell">
-                                    </div>
-
-                                </div>
-
-                            </div>
-
-                            <div class="preview-overlay">
-                            </div>
-
-                            <small>{{layout.label || layout.name}}</small>
-
-                        </button> <!-- .templates-preview-rows -->
-
-                    </div> <!-- .templates-preview -->
-                    <!-- column tools end -->
-
-                </div>
-                <!-- column repeat end -->
-            </div>
-        </div>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
deleted file mode 100644
index 0dc5b68d09..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
+++ /dev/null
@@ -1,328 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.PropertyEditors.GridPrevalueEditorController",
-        function ($scope, gridService, editorService, localizationService, overlayService) {
-
-            var vm = this;
-
-            vm.configureTemplate = configureTemplate;
-            vm.deleteTemplate = deleteTemplate;
-
-            vm.configureLayout = configureLayout;
-            vm.deleteLayout = deleteLayout;
-
-            vm.toggleCollection = toggleCollection;
-            vm.percentage = percentage;
-            vm.zeroWidthFilter = zeroWidthFilter;
-
-            vm.removeConfigValue = removeConfigValue;
-            vm.editConfig = editConfig;
-            vm.editStyles = editStyles;
-
-            var emptyModel = {
-                styles: [
-                    {
-                        label: "Set a background image",
-                        description: "Set a row background",
-                        key: "background-image",
-                        view: "imagepicker",
-                        modifier: "url({0})"
-                    }
-                ],
-
-                config: [
-                    {
-                        label: "Class",
-                        description: "Set a css class",
-                        key: "class",
-                        view: "textstring"
-                    }
-                ],
-
-                columns: 12,
-                templates: [
-                    {
-                        name: "1 column layout",
-                        sections: [
-                            {
-                                grid: 12
-                            }
-                        ]
-                    },
-                    {
-                        name: "2 column layout",
-                        sections: [
-                            {
-                                grid: 4
-                            },
-                            {
-                                grid: 8
-                            }
-                        ]
-                    }
-                ],
-
-
-                layouts: [
-                    {
-                        label: "Headline",
-                        name: "Headline",
-                        areas: [
-                            {
-                                grid: 12,
-                                editors: ["headline"]
-                            }
-                        ]
-                    },
-                    {
-                        label: "Article",
-                        name: "Article",
-                        areas: [
-                            {
-                                grid: 4
-                            },
-                            {
-                                grid: 8
-                            }
-                        ]
-                    }
-                ]
-            };
-
-            /****************
-                Template
-            *****************/
-
-            function configureTemplate(template) {
-
-                var index = $scope.model.value.templates.indexOf(template);
-
-                if (template === undefined) {
-                    template = {
-                        name: "",
-                        sections: []
-                    };
-                }
-
-                var layoutConfigOverlay = {
-                    currentLayout: Utilities.copy(template),
-                    rows: $scope.model.value.layouts,
-                    columns: $scope.model.value.columns,
-                    view: "views/propertyeditors/grid/dialogs/layoutconfig.html",
-                    size: "small",
-                    submit: function (model) {
-                        if (index === -1) {
-                            $scope.model.value.templates.push(model);
-                        } else {
-                            $scope.model.value.templates[index] = model;
-                        }
-                        editorService.close();
-                    },
-                    close: function (model) {
-                        editorService.close();
-                    }
-                };
-
-                editorService.open(layoutConfigOverlay);
-            }
-
-            function deleteTemplate(template, index, event) {
-
-                const dialog = {
-                    view: "views/propertyEditors/grid/overlays/layoutdeleteconfirm.html",
-                    layout: template,
-                    submitButtonLabelKey: "contentTypeEditor_yesDelete",
-                    submitButtonStyle: "danger",
-                    submit: function (model) {
-                        $scope.model.value.templates.splice(index, 1);
-                        overlayService.close();
-                    },
-                    close: function () {
-                        overlayService.close();
-                    }
-                };
-
-                localizationService.localize("general_delete").then(value => {
-                    dialog.title = value;
-                    overlayService.open(dialog);
-                });
-
-                event.preventDefault();
-                event.stopPropagation();
-            }
-
-            /****************
-                Row
-            *****************/
-
-            function configureLayout(layout) {
-
-                var index = $scope.model.value.layouts.indexOf(layout);
-
-                if (layout === undefined) {
-                    layout = {
-                        name: "",
-                        areas: []
-                    };
-                }
-
-                var rowConfigOverlay = {
-                    currentRow: Utilities.copy(layout),
-                    editors: $scope.editors,
-                    columns: $scope.model.value.columns,
-                    view: "views/propertyeditors/grid/dialogs/rowconfig.html",
-                    size: "small",
-                    submit: function (model) {
-                        if (index === -1) {
-                            $scope.model.value.layouts.push(model);
-                        } else {
-                            $scope.model.value.layouts[index] = model;
-                        }
-                        editorService.close();
-                    },
-                    close: function (model) {
-                        editorService.close();
-                    }
-                };
-
-                editorService.open(rowConfigOverlay);
-            }
-
-            function deleteLayout(layout, index, event) {
-                const dialog = {
-                    view: "views/propertyeditors/grid/overlays/rowdeleteconfirm.html",
-                    layout: layout,
-                    submitButtonLabelKey: "contentTypeEditor_yesDelete",
-                    submitButtonStyle: "danger",
-                    submit: function (model) {
-                        $scope.model.value.layouts.splice(index, 1);
-                        overlayService.close();
-                    },
-                    close: function () {
-                        overlayService.close();
-                    }
-                };
-
-                localizationService.localize("general_delete").then(value => {
-                    dialog.title = value;
-                    overlayService.open(dialog);
-                });
-
-                event.preventDefault();
-                event.stopPropagation();
-            }
-
-            /****************
-                Utilities
-            *****************/
-            function toggleCollection(collection, toggle) {
-                if (toggle) {
-                    collection = [];
-                } else {
-                    collection = null;
-                }
-            };
-
-            function percentage(spans) {
-                return ((spans / $scope.model.value.columns) * 100).toFixed(8);
-            }
-
-            function zeroWidthFilter(cell) {
-                return cell.grid > 0;
-            }
-
-            /****************
-                Config
-            *****************/
-
-            function removeConfigValue(collection, index) {
-                collection.splice(index, 1);
-            }
-
-            var editConfigCollection = function (configValues, title, callback) {
-
-                var editConfigCollectionOverlay = {
-                    config: configValues,
-                    title: title,
-                    view: "views/propertyeditors/grid/dialogs/editconfig.html",
-                    size: "small",
-                    submit: function (model) {
-                        callback(model.config);
-                        editorService.close();
-                    },
-                    close: function (model) {
-                        editorService.close();
-                    }
-                };
-
-                editorService.open(editConfigCollectionOverlay);
-            };
-
-            function editConfig() {
-                editConfigCollection($scope.model.value.config, "Settings", function (data) {
-                    $scope.model.value.config = data;
-                });
-            }
-
-            function editStyles() {
-                editConfigCollection($scope.model.value.styles, "Styling", function (data) {
-                    $scope.model.value.styles = data;
-                });
-            }
-
-            /****************
-                Editors
-            *****************/
-            gridService.getGridEditors().then(function (response) {
-                $scope.editors = response.data;
-            });
-
-
-            /* Init grid data */
-            if (!$scope.model.value || $scope.model.value === "" || !$scope.model.value.templates) {
-                $scope.model.value = emptyModel;
-            } else {
-
-                if (!$scope.model.value.columns) {
-                    $scope.model.value.columns = emptyModel.columns;
-                }
-
-
-                if (!$scope.model.value.config) {
-                    $scope.model.value.config = [];
-                }
-
-                if (!$scope.model.value.styles) {
-                    $scope.model.value.styles = [];
-                }
-            }
-
-            /****************
-                Clean up
-            *****************/
-            var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
-                var ts = $scope.model.value.templates;
-                var ls = $scope.model.value.layouts;
-
-                _.each(ts, function (t) {
-                    _.each(t.sections, function (section, index) {
-                        if (section.grid === 0) {
-                            t.sections.splice(index, 1);
-                        }
-                    });
-                });
-
-                _.each(ls, function (l) {
-                    _.each(l.areas, function (area, index) {
-                        if (area.grid === 0) {
-                            l.areas.splice(index, 1);
-                        }
-                    });
-                });
-            });
-
-            //when the scope is destroyed we need to unsubscribe
-            $scope.$on('$destroy', function () {
-                unsubscribe();
-            });
-
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
deleted file mode 100644
index 9fcd43d834..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.GridPrevalueEditorController as vm" class="usky-grid usky-grid-configuration">
-    <div class="grid-layout">
-        <div class="control-group uSky-templates">
-
-            <h4>
-                <localize key="grid_gridLayouts">
-                    Grid Layouts
-                </localize>
-            </h4>
-            <p>
-                <localize key="grid_gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</localize>
-            </p>
-
-            <ul class="unstyled"
-                ui-sortable
-                ng-model="model.value.templates">
-
-                <li ng-repeat="template in model.value.templates" class="clearfix">
-
-                    <button type="button" ng-click="vm.configureTemplate(template)" class="btn-reset preview-rows layout">
-
-                        <span class="preview-row">
-                            <span class="preview-col"
-                                 ng-class="{last:$last}"
-                                 ng-repeat="section in template.sections | filter: vm.zeroWidthFilter"
-                                 ng-style="{width: vm.percentage(section.grid) + '%', height: '60px', 'max-width': '100%'}">
-                                <span class="preview-cell"></span>
-                            </span>
-                        </span>
-                    </button>
-
-                    <div>
-                        <p>{{template.name}}</p>
-                        <button type="button" class="btn btn-small btn-link" ng-click="vm.deleteTemplate(template, $index, $event)">
-                            <umb-icon icon="icon-delete" class="red"></umb-icon>
-                            <localize key="general_delete">Delete</localize>
-                        </button>
-                    </div>
-
-                </li>
-            </ul>
-
-            <button type="button" class="btn btn-small btn-info" ng-click="vm.configureTemplate()">
-                <umb-icon icon="icon-add"></umb-icon>
-                <localize key="grid_addGridLayout">Add Grid Layout</localize>
-            </button>
-        </div>
-    </div>
-    <div class="grid-layout">
-
-        <div class="control-group uSky-templates">
-
-            <h4>
-                <localize key="grid_rowConfigurations">Row Configurations</localize>
-            </h4>
-            <p>
-                <localize key="grid_rowConfigurationsDetail">Rows are predefined cells arranged horizontally</localize>
-            </p>
-
-            <div class="control-group uSky-templates-rows">
-                <ul class="unstyled"
-                    ui-sortable
-                    ng-model="model.value.layouts">
-
-                    <li ng-repeat="layout in model.value.layouts" class="clearfix">
-
-                        <button type="button" ng-click="vm.configureLayout(layout)" class="btn-reset preview-rows columns">
-
-                            <span class="preview-row">
-                                <span class="preview-col"
-                                     ng-class="{last:$last}"
-                                     ng-repeat="area in layout.areas | filter: vm.zeroWidthFilter"
-                                     ng-style="{width: vm.percentage(area.grid) + '%', 'max-width': '100%'}">
-
-                                    <span class="preview-cell">
-                                        <span ng-show="area.maxItems > 0">{{area.maxItems}}</span>
-                                    </span>
-                                </span>
-                            </span>
-                        </button>
-
-                        <div>
-                            <p>{{layout.label || layout.name}}</p>
-                            <button type="button" class="btn btn-small btn-link" ng-click="vm.deleteLayout(layout, $index, $event)">
-                                <umb-icon icon="icon-delete" class="red"></umb-icon>
-                                <localize key="general_delete">Delete</localize>
-                            </button>
-                        </div>
-
-                    </li>
-                </ul>
-
-                <button type="button" class="btn btn-small btn-info" ng-click="vm.configureLayout()">
-                    <umb-icon icon="icon-add"></umb-icon>
-                    <localize key="grid_addRowConfiguration">Add row configuration</localize>
-                </button>
-
-            </div>
-        </div>
-
-    </div>
-
-
-    <div class="grid-layout">
-
-        <umb-control-group label="@grid_columns"
-                           description="@grid_columnsDetails">
-            <input type="number" min="1" ng-model="model.value.columns" />
-        </umb-control-group>
-
-        <umb-control-group label="@grid_settings"
-                           description="@grid_settingsDetails">
-
-            <ul class="unstyled list-icons umb-contentpicker"
-                ui-sortable
-                ng-model="model.value.config">
-
-                <li ng-repeat="configValue in model.value.config">
-                    <umb-icon icon="icon-navigation" class="icon handle"></umb-icon>
-                    <button type="button" class="btn-link" ng-click="vm.removeConfigValue(model.value.config, $index)">
-                        <umb-icon icon="icon-delete" class="icon red"></umb-icon>
-                    </button>
-                    <span>{{configValue.label}}</span>
-                </li>
-            </ul>
-
-            <ul class="unstyled list-icons">
-                <li>
-                    <button type="button" ng-click="vm.editConfig()" class="btn-link">
-                        <umb-icon icon="icon-settings-alt-2" class="icon turquoise"></umb-icon>
-                        <localize key="general_edit">Edit</localize>
-                    </button>
-                </li>
-            </ul>
-        </umb-control-group>
-
-
-        <umb-control-group label="@grid_styles"
-                           description="@grid_stylesDetails">
-
-            <ul class="unstyled list-icons umb-contentpicker"
-                ui-sortable
-                ng-model="model.value.styles">
-
-                <li ng-repeat="style in model.value.styles">
-                    <umb-icon icon="icon-navigation" class="icon handle"></umb-icon>
-                    <button type="button" class="btn-link" ng-click="vm.removeConfigValue(model.value.styles, $index)">
-                        <umb-icon icon="icon-delete" class="icon red"></umb-icon>
-                    </button>
-                    <span>{{style.label}}</span>
-                </li>
-            </ul>
-
-            <ul class="unstyled list-icons">
-                <li>
-                    <button type="button" ng-click="vm.editStyles()" class="btn-link">
-                        <umb-icon icon="icon-settings-alt-2" class="icon turquoise"></umb-icon>
-                        <localize key="general_edit">Edit</localize>
-                    </button>
-                </li>
-            </ul>
-        </umb-control-group>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/overlays/layoutdeleteconfirm.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/overlays/layoutdeleteconfirm.html
deleted file mode 100644
index 4fedf61865..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/overlays/layoutdeleteconfirm.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div>
-    <div ng-if="model.layout" class="umb-alert umb-alert--warning mb2">
-        <localize key="grid_deleteLayout">You are deleting the layout</localize> <strong>{{model.layout.name}}</strong>.
-    </div>
-
-    <p>
-        <localize key="grid_deletingALayout">
-            Modifying layout will result in loss of data for any existing content that is based on this configuration.
-        </localize>
-    </p>
-
-    <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>?
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/overlays/rowdeleteconfirm.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/overlays/rowdeleteconfirm.html
deleted file mode 100644
index ded2e5b940..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/overlays/rowdeleteconfirm.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div>
-
-    <div ng-if="model.layout" class="umb-alert umb-alert--warning mb2">
-        <localize key="grid_youAreDeleting">You are deleting the row configuration</localize> <strong>{{model.layout.name}}</strong>.
-    </div>
-
-    <p>
-        <localize key="grid_deletingARow">
-            Modifying a row configuration name will result in loss of
-            data for any existing content that is based on this configuration.
-        </localize>
-    </p>
-
-    <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>?
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/idwithguid/idwithguid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/idwithguid/idwithguid.controller.js
deleted file mode 100644
index 1402226f78..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/idwithguid/idwithguid.controller.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.IdWithGuidValueController
- * @function
- * 
- * @description
- * The controller for the idwithguid property editor, which formats the ID as normal
- * with the GUID in smaller text below, as used across the backoffice.
-*/
-function IdWithGuidValueController($rootScope, $scope, $filter) {
-
-    function formatDisplayValue() {
-        if ($scope.model.value.length > 1) {
-            $scope.displayid = $scope.model.value[0];
-            $scope.displayguid = $scope.model.value[1];   
-        } else {
-            $scope.displayid = $scope.model.value;
-        }
-    }
-
-    //format the display value on init:
-    formatDisplayValue();
-}
-
-angular.module('umbraco').controller("Umbraco.PropertyEditors.IdWithGuidValueController", IdWithGuidValueController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/idwithguid/idwithguid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/idwithguid/idwithguid.html
deleted file mode 100644
index 02179b7c71..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/idwithguid/idwithguid.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="umb-property-editor umb-readonlyvalue" ng-controller="Umbraco.PropertyEditors.IdWithGuidValueController">
-    <div>{{ displayid }}</div>
-    <small>{{ displayguid }}</small>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
deleted file mode 100644
index 80d0cc16c9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
+++ /dev/null
@@ -1,272 +0,0 @@
-angular.module('umbraco')
-    .controller("Umbraco.PropertyEditors.ImageCropperController",
-        function ($scope, fileManager, $timeout, mediaHelper) {
-
-            var config = Utilities.copy($scope.model.config);
-
-            $scope.filesSelected = onFileSelected;
-            $scope.filesChanged = onFilesChanged;
-            $scope.fileUploaderInit = onFileUploaderInit;
-            $scope.imageLoaded = imageLoaded;
-            $scope.crop = crop;
-            $scope.done = done;
-            $scope.clear = clear;
-            $scope.reset = reset;
-            $scope.close = close;
-            $scope.isCustomCrop = isCustomCrop;
-            $scope.focalPointChanged = focalPointChanged;
-            //declare a special method which will be called whenever the value has changed from the server
-            $scope.model.onValueChanged = onValueChanged;
-
-            var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
-            $scope.acceptFileExt = mediaHelper.formatFileTypes(umbracoSettings.imageFileTypes);
-            
-            /**
-             * Called when the umbImageGravity component updates the focal point value
-             * @param {any} left
-             * @param {any} top
-             */
-            function focalPointChanged(left, top) {
-                //update the model focalpoint value
-                $scope.model.value.focalPoint = {
-                    left: left,
-                    top: top
-                };
-
-                //set form to dirty to track changes
-                setDirty();
-            }
-
-            /**
-             * Used to assign a new model value
-             * @param {any} src
-             */
-            function setModelValueWithSrc(src) {
-                if (!$scope.model.value || !$scope.model.value.src) {
-                    //we are copying to not overwrite the original config
-                    $scope.model.value = Utilities.extend(Utilities.copy($scope.model.config), { src: src });
-                }
-            }
-
-            /**
-             * called whenever the value has changed from the server
-             * @param {any} newVal
-             * @param {any} oldVal
-             */
-            function onValueChanged(newVal, oldVal) {
-                //clear current uploaded files
-                fileManager.setFiles({
-                    propertyAlias: $scope.model.alias,
-                    culture: $scope.model.culture,
-                    segment: $scope.model.segment,
-                    files: []
-                });
-            }
-
-            /**
-             * Called when the a new file is selected
-             * @param {any} value
-             */
-            function onFileSelected(value, files) {
-                setModelValueWithSrc(value);
-                //set form to dirty to track changes
-                setDirty();
-            }
-
-            function setDirty() {
-                if ($scope.imageCropperForm) {
-                    $scope.imageCropperForm.modelValue.$setDirty();
-                }                
-            }
-
-            function imageLoaded(isCroppable, hasDimensions) {
-                $scope.isCroppable = isCroppable;
-                $scope.hasDimensions = hasDimensions;
-            }
-
-            /**
-             * Called when the file collection changes
-             * @param {any} value
-             * @param {any} files
-             */
-            function onFilesChanged(files) {
-                if (files && files[0]) {
-                    $scope.imageSrc = files[0].fileSrc;
-                    //set form to dirty to track changes
-                    setDirty();
-                }
-            }
-
-            /**
-             * Called when the file uploader initializes
-             * @param {any} value
-             */
-            function onFileUploaderInit(value, files) {
-                //move previously saved value to the editor
-                if ($scope.model.value) {
-                    //backwards compat with the old file upload (incase some-one swaps them..)
-                    if (Utilities.isString($scope.model.value)) {
-                        setModelValueWithSrc($scope.model.value);
-                    }
-                    else {
-                        //sync any config changes with the editor and drop outdated crops
-                        _.each($scope.model.value.crops, function (saved) {
-                            var configured = _.find(config.crops, function (item) { return item.alias === saved.alias });
-
-                            if (configured && configured.height === saved.height && configured.width === saved.width) {
-                                configured.coordinates = saved.coordinates;
-                            }
-                        });
-                        $scope.model.value.crops = config.crops;
-
-                        //restore focalpoint if missing
-                        if (!$scope.model.value.focalPoint) {
-                            $scope.model.value.focalPoint = { left: 0.5, top: 0.5 };
-                        }
-                    }
-
-                    //if there are already files in the client assigned then set the src
-                    if (files && files[0]) {
-                        $scope.imageSrc = files[0].fileSrc;
-                    }
-                    else {
-                        $scope.imageSrc = $scope.model.value.src;
-                    }
-
-                }
-            }
-
-            /**
-             * crop a specific crop
-             * @param {any} targetCrop
-             */
-            function crop(targetCrop) {
-                if ($scope.readonly) return;
-
-                if (!$scope.currentCrop) {
-                    // clone the crop so we can discard the changes
-                    $scope.currentCrop = Utilities.copy(targetCrop);
-                    $scope.currentPoint = null;
-
-                    //set form to dirty to track changes
-                    setDirty();
-                }
-                else {
-                    // we have a crop open already - close the crop (this will discard any changes made)
-                    close();
-
-                    // the crop editor needs a digest cycle to close down properly, otherwise its state
-                    // is reused for the new crop... and that's really bad
-                    $timeout(function () {
-                        crop(targetCrop);
-                        $scope.pendingCrop = false;
-                    });
-
-                    // this is necessary to keep the screen from flickering too badly while we wait for the new crop to open
-                    // - check the view for its usage (basically it makes sure we keep the space reserved for the new crop)
-                    $scope.pendingCrop = true;
-                }
-            };
-
-            /** done cropping */
-            function done() {
-                if (!$scope.currentCrop) {
-                    return;
-                }
-                // find the original crop by crop alias and update its coordinates
-                var editedCrop = _.find($scope.model.value.crops, crop => crop.alias === $scope.currentCrop.alias);
-                editedCrop.coordinates = $scope.currentCrop.coordinates;
-                $scope.close();
-
-                //set form to dirty to track changes
-                setDirty();
-            };
-
-            function reset() {
-                $scope.currentCrop.coordinates = undefined;
-                $scope.done();
-            }
-
-            function close() {
-                $scope.currentCrop = undefined;
-                $scope.currentPoint = undefined;
-            }
-
-            /**
-             * crop a specific crop
-             * @param {any} crop
-             */
-            function clear(crop) {
-                //clear current uploaded files
-                fileManager.setFiles({
-                    propertyAlias: $scope.model.alias,
-                    culture: $scope.model.culture,
-                    segment: $scope.model.segment,
-                    files: []
-                });
-
-                //clear the ui
-                $scope.imageSrc = null;
-                if ($scope.model.value) {
-                    $scope.model.value = null;
-                }
-
-                //set form to dirty to track changes
-                setDirty();
-            };
-
-            function isCustomCrop(crop) {
-                return !!crop.coordinates;
-            }
-
-            var unsubscribe = $scope.$on("formSubmitting", function () {
-                $scope.currentCrop = null;
-                $scope.currentPoint = null;
-            });
-
-            $scope.$on('$destroy', function () {
-                unsubscribe();
-            });
-        })
-    .run(function (mediaHelper, umbRequestHelper) {
-        if (mediaHelper && mediaHelper.registerFileResolver) {
-
-            //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
-            // they contain different data structures so if we need to query against it we need to be aware of this.
-            mediaHelper.registerFileResolver("Umbraco.ImageCropper", function (property, entity, thumbnail) {
-                if (property.value && property.value.src) {
-
-                    if (thumbnail === true) {
-                        return mediaHelper.getThumbnailFromPath(property.value.src);
-                    } else {
-                        return property.value.src;
-                    }
-
-                    //this is a fallback in case the cropper has been asssigned a upload field
-                }
-                else if (Utilities.isString(property.value)) {
-                    if (thumbnail) {
-
-                        if (mediaHelper.detectIfImageByExtension(property.value)) {
-
-                            var thumbnailUrl = umbRequestHelper.getApiUrl(
-                                "imagesApiBaseUrl",
-                                "GetBigThumbnail",
-                                [{ originalImagePath: property.value }]);
-
-                            return thumbnailUrl;
-                        }
-                        else {
-                            return null;
-                        }
-
-                    }
-                    else {
-                        return property.value;
-                    }
-                }
-
-                return null;
-            });
-        }
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
deleted file mode 100644
index 204b65ca1c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<div class="umb-property-editor umb-mediapicker"
-     ng-controller="Umbraco.PropertyEditors.ImageCropperController">
-
-    <ng-form name="imageCropperForm">
-
-        <input type="hidden" name="modelValue" ng-model="model.value" />
-
-        <umb-property-file-upload 
-            culture="{{model.culture}}"
-            segment="{{model.segment}}"
-            property-alias="{{model.alias}}"
-            value="model.value.src"
-            required="model.validation.mandatory"
-            on-files-selected="filesSelected(value, files)"
-            on-files-changed="filesChanged(files)"
-            on-init="fileUploaderInit(value, files)"
-            hide-selection="true"
-            accept-file-ext="acceptFileExt"
-            ng-attr-readonly="{{ readonly || undefined }}">
-
-            <div class="imagecropper clearfix">
-
-                <div ng-if="currentCrop || pendingCrop" style="float:left; width: 100%;" class="clearfix">
-                    <div class="umb-cropper__container">
-
-                        <div ng-if="currentCrop">
-                            <umb-image-crop 
-                                height="{{currentCrop.height}}"
-                                width="{{currentCrop.width}}"
-                                crop="currentCrop.coordinates"
-                                center="model.value.focalPoint"
-                                src="imageSrc">
-                            </umb-image-crop>
-                        </div>
-
-                        <div class="button-drawer" ng-if="currentCrop">
-                            <button type="button" class="btn btn-link" ng-click="reset()"><localize key="imagecropper_reset">Reset this crop</localize></button>
-                            <button type="button" class="btn" ng-click="close()"><localize key="imagecropper_undoEditCrop">Undo edits</localize></button>
-                            <button type="button" class="btn btn-success" ng-click="done()"><localize key="imagecropper_updateEditCrop">Done</localize></button>
-                        </div>
-
-                    </div>
-                </div>
-
-                <div ng-if="!currentCrop && !pendingCrop" class="umb-cropper-imageholder clearfix">
-                    <umb-image-gravity 
-                        src="imageSrc"
-                        center="model.value.focalPoint"
-                        on-value-changed="focalPointChanged(left, top)"
-                        on-image-loaded="imageLoaded(isCroppable, hasDimensions)"
-                        disable-focal-point="readonly">
-                    </umb-image-gravity>
-
-                    <div ng-if="!readonly" class="umb-cropper-imageholder-buttons">
-                        <button type="button" class="btn btn-link btn-crop-delete" ng-click="clear()"><umb-icon icon="icon-delete" class="red"></umb-icon> <localize key="content_uploadClear">Remove file</localize></button>
-                        <button type="button" class="sr-only" ng-click="vm.clear()"><localize key="content_uploadClearImageContext">Click here to remove the image from the media item</localize></button>
-                        <button type="button" ng-show="(model.value.focalPoint.left !== 0.5 && model.value.focalPoint.top !== 0.5)" class="btn btn-link btn-gravity-reset" ng-click="focalPointChanged(0.5,0.5)">
-                            <umb-icon icon="icon-axis-rotation"></umb-icon> <localize key="content_resetFocalPoint">Reset focal point</localize>
-                        </button>
-                    </div>
-                </div>
-
-
-                <ul ng-if="isCroppable" class="umb-sortable-thumbnails cropList clearfix">
-                    <li ng-repeat=" (key,value) in model.value.crops" ng-class="{'current':currentCrop.alias === value.alias}" ng-click="crop(value)" ng-attr-disabled="{{ readonly || undefined }}">
-
-                        <umb-image-thumbnail 
-                            center="model.value.focalPoint"
-                            crop="value.coordinates"
-                            src="imageSrc"
-                            height="{{value.height}}"
-                            width="{{value.width}}"
-                            max-size="75">
-                        </umb-image-thumbnail>
-
-                        <div class="crop-information">
-                            <span class="crop-name crop-text">{{value.alias}}</span>
-                            <span class="crop-size crop-text">{{value.width}} &times; {{value.height}} px</span>
-                            <span class="crop-annotation crop-text"><localize key="imagecropper_customCrop" ng-show="isCustomCrop(value)">User defined</localize>&nbsp;</span>
-                        </div>
-                    </li>
-                </ul>
-
-            </div>
-
-        </umb-property-file-upload>
-
-    </ng-form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.controller.js
deleted file mode 100644
index 398d01a64c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.controller.js
+++ /dev/null
@@ -1,85 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PrevalueEditors.CropSizesController",
-	function ($scope) {
-
-	    if (!$scope.model.value) {
-	        $scope.model.value = [];
-	    }
-
-        $scope.editMode = false;
-        $scope.setFocus = false;
-
-	    $scope.remove = function (item, evt) {
-	        evt.preventDefault();
-	        $scope.model.value = _.reject($scope.model.value, function (x) {
-	            return x.alias === item.alias;
-	        });
-	    };
-
-	    $scope.edit = function (item, evt) {
-            evt.preventDefault();
-            $scope.editMode = true;
-            $scope.setFocus = false;
-
-	        $scope.newItem = item;
-	    };
-
-	    $scope.cancel = function (evt) {
-            evt.preventDefault();
-            $scope.editMode = false;
-            $scope.setFocus = true;
-
-	        $scope.newItem = null;
-	    };
-
-        $scope.change = function () {
-            // Listen to the change event and set focus 2 false
-            if ($scope.setFocus) {
-                $scope.setFocus = false;
-                return;
-            }
-        };
-
-	    $scope.add = function (evt) {
-            evt.preventDefault();
-
-            $scope.editMode = false;
-            $scope.setFocus = true;
-
-	        if ($scope.newItem && $scope.newItem.alias &&
-                Utilities.isNumber($scope.newItem.width) && Utilities.isNumber($scope.newItem.height) &&
-                $scope.newItem.width > 0 && $scope.newItem.height > 0) {
-
-                var exists = _.find($scope.model.value, function (item) { return $scope.newItem.alias === item.alias; });
-
-	            if (!exists) {
-	                $scope.model.value.push($scope.newItem);
-	                $scope.newItem = {};
-                    $scope.hasError = false;
-                    $scope.cropAdded = false;
-	                return;
-                }
-                else{
-                    $scope.newItem = null;
-                    $scope.hasError = false;
-                    return;
-                }
-	        }
-
-	        //there was an error, do the highlight (will be set back by the directive)
-	        $scope.hasError = true;
-        };
-
-        $scope.createNew = function (event) {
-            if (event.keyCode == 13) {
-                $scope.add(event);
-            }
-        };
-
-        $scope.sortableOptions = {
-            axis: 'y',
-            containment: 'parent',
-            cursor: 'move',
-            tolerance: 'pointer'
-        };
-
-	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
deleted file mode 100644
index 50e4f3ece1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<div ng-controller="Umbraco.PrevalueEditors.CropSizesController" class="umb-property-editor umb-prevalues-multivalues umb-cropsizes">
-
-    <div class="control-group umb-cropsizes__add">
-
-        <div class="umb-cropsizes__input-wrap">
-            <label for="addcropalias"><localize key="general_alias">Alias</localize></label>
-            <input type="text"
-                   id="addcropalias"
-                   name="newItem.alias"
-                   ng-model="newItem.alias"
-                   class="umb-cropsizes__input"
-                   val-highlight="{{hasError}}"
-                   localize="placeholder"
-                   placeholder="@general_alias"
-                   focus-when="{{setFocus}}"
-                   ng-change="change()"
-                   ng-keydown="createNew($event)"
-                   overlay-submit-on-enter="false" />
-        </div>
-
-        <div class="umb-cropsizes__input-wrap umb-cropsizes__input-wrap--narrow">
-            <label for="addcropwidth"><localize key="general_width">Width</localize></label>
-            <input type="number"
-                   name="newItem.width"
-                   localize="placeholder"
-                   placeholder="@general_width"
-                   ng-model="newItem.width"
-                   class="umb-cropsizes__input"
-                   val-highlight="{{hasError}}"
-                   id="addcropwidth"
-                   min="0"
-                   pattern="[0-9]*"
-                   ng-keydown="createNew($event)"
-                   overlay-submit-on-enter="false" />
-        </div>
-
-        <div class="umb-cropsizes__input-wrap umb-cropsizes__input-wrap--narrow">
-            <label for="addcropheight"><localize key="general_height">Height</localize></label>
-            <input type="number"
-                   name="newItem.height"
-                   localize="placeholder"
-                   placeholder="@general_height"
-                   ng-model="newItem.height"
-                   class="umb-cropsizes__input"
-                   val-highlight="{{hasError}}"
-                   id="addcropheight"
-                   min="0"
-                   pattern="[0-9]*"
-                   ng-keydown="createNew($event)"
-                   overlay-submit-on-enter="false" />
-        </div>
-
-        <div class="umb-cropsizes__controls">
-            <button type="button" class="btn btn-info add" ng-hide="editMode" ng-click="add($event)"><localize key="general_add">Add</localize></button>
-            <button type="button" class="btn btn-info add" ng-show="editMode" ng-click="add($event)"><localize key="general_update">Update</localize></button>
-            <button type="button" class="btn btn-link" ng-show="editMode" ng-click="cancel($event)"><localize key="general_cancel">Cancel</localize></button>
-        </div>
-
-    </div>
-
-    <div ui-sortable="sortableOptions" class="umb-cropsizes__sortable" ng-model="model.value">
-        <div class="control-group umb-prevalues-multivalues__listitem" ng-repeat="item in model.value">
-            <umb-icon icon="icon-navigation" class="icon handle"></umb-icon>
-            <div class="umb-prevalues-multivalues__left">
-                <p><span>{{item.alias}}</span> <small>({{item.width}} &times; {{item.height}}px)</small></p>
-            </div>
-            <div class="umb-prevalues-multivalues__right">
-                <button type="button" class="umb-node-preview__action" ng-click="edit(item, $event)"><localize key="general_edit">Edit</localize></button>
-                <button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(item, $event)"><localize key="general_remove">Remove</localize></button>
-            </div>
-        </div>
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
deleted file mode 100644
index fb4fa7f25e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="umb-property-editor">
-    <ng-form name="integerFieldForm">
-        <input name="integerField"
-               type="number"
-               pattern="[\-0-9]*"
-               class="umb-property-editor umb-number"
-               ng-model="model.value"
-               ng-required="model.validation.mandatory"
-               aria-required="{{model.validation.mandatory}}"
-               id="{{model.alias}}"
-               val-server="value"
-               min="{{model.config.min}}"
-               max="{{model.config.max}}"
-               step="{{model.config.step}}"
-               ng-step="model.config.step"
-               fix-number
-               ng-readonly="readonly" />
-
-        <span ng-messages="integerFieldForm.integerField.$error" show-validation-on-submit>
-            <span class="help-inline" ng-message="number"><localize key="validation_invalidNumber">Not a number</localize></span>
-            <span class="help-inline" ng-message="step"><localize key="validation_invalidNumberStepSize">Not a valid numeric step size</localize></span>
-            <span class="help-inline" ng-message="valServer">{{integerFieldForm.integerField.errorMsg}}</span>
-        </span>
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/bulkActionPermissions.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/bulkActionPermissions.prevalues.html
deleted file mode 100644
index 46b82dc56a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/bulkActionPermissions.prevalues.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="umb-property-editor">
-
-    <umb-toggle checked="model.value.allowBulkPublish"
-                on-click="model.value.allowBulkPublish = !model.value.allowBulkPublish"
-                show-labels="true"
-                label-position="right"
-                label-off="Allow bulk publish (content only)"
-                label-on="Allow bulk publish (content only)"
-                class="mb1">
-    </umb-toggle>
-
-    <umb-toggle checked="model.value.allowBulkUnpublish"
-                on-click="model.value.allowBulkUnpublish = !model.value.allowBulkUnpublish"
-                show-labels="true"
-                label-position="right"
-                label-off="Allow bulk unpublish (content only)"
-                label-on="Allow bulk unpublish (content only)"
-                class="mb1">
-    </umb-toggle>
-
-    <umb-toggle checked="model.value.allowBulkCopy"
-                on-click="model.value.allowBulkCopy = !model.value.allowBulkCopy"
-                show-labels="true"
-                label-position="right"
-                label-off="Allow bulk copy (content only)"
-                label-on="Allow bulk copy (content only)"
-                class="mb1">
-    </umb-toggle>
-
-    <umb-toggle checked="model.value.allowBulkMove"
-                on-click="model.value.allowBulkMove = !model.value.allowBulkMove"
-                show-labels="true"
-                label-position="right"
-                label-off="Allow bulk move"
-                label-on="Allow bulk move"
-                class="mb1">
-    </umb-toggle>
-
-    <umb-toggle checked="model.value.allowBulkDelete"
-                on-click="model.value.allowBulkDelete = !model.value.allowBulkDelete"
-                show-labels="true"
-                label-position="right"
-                label-off="Allow bulk delete"
-                label-on="Allow bulk delete">
-    </umb-toggle>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.controller.js
deleted file mode 100644
index 4ad2935981..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.controller.js
+++ /dev/null
@@ -1,39 +0,0 @@
-function iconPreValsController($scope, editorService) {
-
-    if (!$scope.model.value) {
-        $scope.model.value = "icon-list";
-    }
-
-    let valueArray = $scope.model.value.split(' ');
-    $scope.icon = valueArray[0];
-    $scope.color = valueArray[1];
-
-    $scope.openIconPicker = function () {
-        var iconPicker = {
-            icon: $scope.icon,
-            color: $scope.color,
-            size: "medium",
-            submit: function (model) {
-                if (model.icon) {
-                    if (model.color) {
-                        $scope.model.value = model.icon + " " + model.color;
-                        $scope.color = model.color;
-                    } else {
-                        $scope.model.value = model.icon;
-                    }                    
-
-                    $scope.icon = model.icon;
-                    $scope.iconForm.$setDirty();
-                }
-                editorService.close();
-            },
-            close: function () {
-                editorService.close();
-            }
-        };
-        editorService.iconPicker(iconPicker);
-    };
-}
-
-
-angular.module("umbraco").controller("Umbraco.PrevalueEditors.IconPickerController", iconPreValsController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.html
deleted file mode 100644
index 4f6735d069..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/icon.prevalues.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div ng-controller="Umbraco.PrevalueEditors.IconPickerController">
-    <ng-form data-element="editor-icon" name="iconForm">
-        <button type="button" class="btn-reset umb-panel-header-icon" ng-if="!hideIcon" ng-click="openIconPicker()" ng-class="{'-placeholder': model.value==='' || model.value===null}"
-             title="{{model.value}}">
-            <umb-icon icon="{{icon}}" class="{{color}}" ng-if="model.value !== '' && model.value !== null"></umb-icon>
-            <span class="umb-panel-header-icon-text" ng-if="model.value === '' || model.value === null">
-                <localize key="settings_addIcon">Add icon</localize>
-            </span>
-        </button>
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.controller.js
deleted file mode 100644
index d3399a35e1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.controller.js
+++ /dev/null
@@ -1,163 +0,0 @@
-function includePropsPreValsController($rootScope, $scope, localizationService, contentTypeResource) {
-
-    if (!$scope.model.value) {
-        $scope.model.value = [];
-    }
-
-    $scope.hasError = false;
-    $scope.errorMsg = "";
-
-    $scope.propertyAliases = [];
-    $scope.selectedField = null;
-    $scope.systemFields = [
-        { value: "sortOrder", localizedKey: "general_sort" },
-        { value: "updateDate", localizedKey: "content_updateDate" },
-        { value: "updater", localizedKey: "content_updatedBy" },
-        { value: "createDate", localizedKey: "content_createDate" },
-        { value: "owner", localizedKey: "content_createBy" },
-        { value: "published", localizedKey: "content_isPublished" },
-        { value: "contentTypeAlias", localizedKey: "content_documentType" },
-        { value: "email", localizedKey: "general_email" },
-        { value: "username", localizedKey: "general_username" },
-        { value: "failedPasswordAttempts", localizedKey: "user_failedPasswordAttempts" },
-        { value: "approved", localizedKey: "user_stateApproved" },
-        { value: "lockedOut", localizedKey: "user_stateLockedOut" },
-        { value: "lastLockoutDate", localizedKey: "user_lastLockoutDate" },
-        { value: "lastLoginDate", localizedKey: "user_lastLogin" },
-        { value: "lastPasswordChangeDate", localizedKey: "user_lastPasswordChangeDate" }
-    ];
-
-    $scope.getLocalizedKey = function (alias) {
-        const translationKey = $scope.systemFields.find(x => x.value === alias)?.localizedKey;
-        return translationKey !== undefined ? translationKey : alias;
-    }
-
-    $scope.changeField = function () {
-        $scope.hasError = false;
-        $scope.errorMsg = "";
-    }
-
-    $scope.removeField = function (e) {
-        var index = $scope.model.value.indexOf(e);
-        $scope.model.value.splice(index, 1);
-    }
-
-    //now we'll localize these strings, for some reason the directive doesn't work inside of the select group with an ng-model declared
-    _.each($scope.systemFields, function (e, i) {
-        var key = $scope.getLocalizedKey(e.value);
-        localizationService.localize(key).then(function (v) {
-            e.name = v;
-
-            switch (e.value) {
-                case "published":
-                case "updater":
-                    e.name += " (Content only)";
-                    break;
-                case "username":
-                case "email":
-                case "failedPasswordAttempts":
-                case "approved":
-                case "lockedOut":
-                case "lastLockoutDate":
-                case "lastLoginDate":
-                case "lastPasswordChangeDate":
-                    e.name += " (Members only)";
-                    break;
-            }
-
-        });
-    });
-
-    // Return a helper with preserved width of cells
-    var fixHelper = function (e, ui) {
-        ui.children().each(function () {
-            $(this).width($(this).width());
-        });
-
-        var row = ui.clone();
-        row.css("background-color", "lightgray");
-
-        return row;
-    };
-
-    $scope.sortableOptions = {
-        helper: fixHelper,
-        handle: ".handle",
-        opacity: 0.5,
-        axis: 'y',
-        containment: 'parent',
-        cursor: 'move',
-        items: '> tr',
-        tolerance: 'pointer',
-        forcePlaceholderSize: true,
-        start: function(e, ui){
-            ui.placeholder.height(ui.item.height());
-        },
-        update: function (e, ui) {
-            
-            // Get the new and old index for the moved element (using the text as the identifier)
-            var newIndex = ui.item.index();
-            var movedAlias = $('.alias-value', ui.item).text().trim();
-            var originalIndex = getAliasIndexByText(movedAlias);
-
-            // Move the element in the model
-            if (originalIndex > -1) {
-                var movedElement = $scope.model.value[originalIndex];
-                $scope.model.value.splice(originalIndex, 1);
-                $scope.model.value.splice(newIndex, 0, movedElement);
-            }
-        }
-    };
-
-    contentTypeResource.getAllPropertyTypeAliases().then(function(data) {
-        $scope.propertyAliases = data;
-    });
-
-    $scope.addField = function () {
-
-        var val = $scope.selectedField;
-        if (val) {
-            var isSystem = val.startsWith("_system_");
-            if (isSystem) {
-                val = val.trimStart("_system_");
-            }
-
-            var exists = _.find($scope.model.value, function (i) {
-                return i.alias === val;
-            });
-
-            if (!exists) {
-                $scope.hasError = false;
-                $scope.errorMsg = "";
-
-                $scope.model.value.push({
-                    alias: val,
-                    isSystem: isSystem ? 1 : 0
-                });
-            }
-            else {
-                //there was an error, do the highlight (will be set back by the directive)
-                $scope.hasError = true;
-                $scope.errorMsg = "Property is already added";
-            }
-        }
-        else {
-            $scope.hasError = true;
-            $scope.errorMsg = "No property selected";
-        }
-    }
-
-    function getAliasIndexByText(value) {
-        for (var i = 0; i < $scope.model.value.length; i++) {
-            if ($scope.model.value[i].alias === value) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-}
-
-
-angular.module("umbraco").controller("Umbraco.PrevalueEditors.IncludePropertiesListViewController", includePropsPreValsController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
deleted file mode 100644
index 9e022d0e0f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<div class="umb-property-editor" ng-controller="Umbraco.PrevalueEditors.IncludePropertiesListViewController">
-    <div class="control-group">
-        <select ng-model="selectedField" ng-change="changeField()" val-highlight="{{hasError}}">
-            <optgroup label="System Fields">
-                <option ng-repeat="field in systemFields" value="_system_{{field.value}}" ng-bind="field.name"></option>
-            </optgroup>
-            <optgroup label="Custom Fields">
-                <option ng-repeat="alias in propertyAliases" value="{{alias}}" ng-bind="alias"></option>
-            </optgroup>
-        </select>
-        <button type="button" class="btn" ng-click="addField()">
-            <localize key="general_add">Add</localize>
-        </button>
-        <span class="help-inline" ng-bind="errorMsg"></span>
-    </div>
-    <div class="control-group">
-        <table class="table" ng-show="model.value.length > 0">
-            <thead>
-                <tr>
-                    <td></td>
-                    <th><localize key="general_alias">Alias</localize></th>
-                    <th><localize key="general_header">Header</localize></th>
-                    <th><localize key="template_template">Template</localize></th>
-                    <td></td>
-                </tr>
-            </thead>
-            <tbody ui-sortable="sortableOptions" ng-model="model.value">
-                <tr ng-repeat="val in model.value">
-                    <td>
-                        <umb-icon icon="icon-navigation" class="icon handle" aria-label="Sort"></umb-icon>
-                    </td>
-                    <td>
-                       <div class="list-view-layout__name flex-column content-start">
-                            <span class="list-view-layout__name-text" ng-bind="val.alias"></span>
-                            <span class="list-view-layout__system" ng-show="val.isSystem == 1">(<localize key="general_systemField">systemField</localize>)</span>
-                       </div>
-                    </td>
-                    <td>
-                        <ng-form name="headerForm" ng-if="!val.isSystem">
-                            <input type="text" name="header" ng-model="val.header" required />
-                            <span ng-messages="headerForm.header.$error" show-validation-on-submit>
-                                <span class="help-inline" ng-message="required">
-                                    <localize key="general_required">Required</localize>
-                                </span>
-                            </span>
-                        </ng-form>
-
-                        <span ng-if="val.isSystem">
-                            <localize key="{{getLocalizedKey(val.alias)}}">{{val.alias}}</localize>
-                        </span>
-                    </td>
-                    <td>
-                        <ng-form name="templateForm" ng-if="!val.isSystem">
-                            <input type="text" name="template" ng-model="val.nameTemplate" />
-                        </ng-form>
-                    </td>
-                    <td>
-                        <button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="removeField(val)">
-                            <localize key="general_remove">Remove</localize><span class="sr-only"> {{val.alias}}</span>
-                        </button>
-                    </td>
-                </tr>
-            </tbody>
-
-        </table>
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
deleted file mode 100644
index d8320711c9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.PrevalueEditors.ListViewLayoutsPreValsController
- * @function
- *
- * @description
- * The controller for configuring layouts for list views
- */
-(function() {
-   "use strict";
-
-    function ListViewLayoutsPreValsController($scope, editorService, localizationService, overlayService) {
-
-        var vm = this;
-        vm.focusLayoutName = false;
-
-        vm.layoutsSortableOptions = {
-            axis: "y",
-            containment: "parent",
-            distance: 10,
-            tolerance: "pointer",
-            opacity: 0.7,
-            scroll: true,
-            cursor: "move",
-            handle: ".list-view-layout__sort-handle"
-        };
-
-        vm.addLayout = addLayout;
-        vm.removeLayout = removeLayout;
-        vm.openIconPicker = openIconPicker;
-
-        function addLayout() {
-
-            vm.focusLayoutName = false;
-
-            var layout = {
-                "name": "",
-                "path": "",
-                "icon": "icon-stop",
-                "selected": true
-            };
-
-            $scope.model.value.push(layout);
-        }
-
-       function removeLayout(template, index, event) {
-
-           const dialog = {
-               view: "views/propertyEditors/listview/overlays/removeListViewLayout.html",
-               layout: template,
-               submitButtonLabelKey: "defaultdialogs_yesRemove",
-               submitButtonStyle: "danger",
-               submit: function (model) {
-                   $scope.model.value.splice(index, 1);
-                   overlayService.close();
-               },
-               close: function () {
-                   overlayService.close();
-               }
-           };
-
-           localizationService.localize("general_remove").then(value => {
-               dialog.title = value;
-               overlayService.open(dialog);
-           });
-
-           event.preventDefault();
-           event.stopPropagation();
-       }
-
-        function openIconPicker(layout) {
-            var iconPicker = {
-                icon: layout.icon.split(' ')[0],
-                color: layout.icon.split(' ')[1],
-                size: "medium",
-                submit: function (model) {
-                    if (model.icon) {
-                        if (model.color) {
-                            layout.icon = model.icon + " " + model.color;
-                        } else {
-                            layout.icon = model.icon;
-                        }
-                    }
-                    vm.focusLayoutName = true;
-                    editorService.close();
-                },
-                close: function() {
-                    editorService.close();
-                }
-            };
-            editorService.iconPicker(iconPicker);
-        }
-
-    }
-
-   angular.module("umbraco").controller("Umbraco.PrevalueEditors.ListViewLayoutsPreValsController", ListViewLayoutsPreValsController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
deleted file mode 100644
index 36ebc45f38..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div ng-controller="Umbraco.PrevalueEditors.ListViewLayoutsPreValsController as vm">
-
-   <div class="list-view-layouts-container">
-
-       <div class="list-view-layouts" ui-sortable="vm.layoutsSortableOptions" ng-model="model.value">
-
-           <div class="list-view-layout" ng-repeat="layout in model.value">
-
-               <umb-icon icon="icon-navigation" class="list-view-layout__sort-handle" aria-label="Sort"></umb-icon>
-
-               <div class="list-view-layout__icon-wrapper">
-
-                   <button type="button"
-                           class="btn-reset"
-                           ng-disabled="layout.isSystem === 1"
-                           ng-click="vm.openIconPicker(layout)"
-                           umb-auto-focus="{{layout.isSystem !== 1}}">
-                       <span class="list-view-layout__icon">
-                           <umb-icon icon="{{layout.icon}}"></umb-icon>
-                       </span>
-                   </button>
-
-               </div>
-
-               <div class="list-view-layout__name">
-                   <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.name" placeholder="Name..." class="-full-width-input" focus-when="{{ vm.focusLayoutName }}" />
-                   <span ng-if="layout.isSystem === 1" class="list-view-layout__name-text">{{layout.name}}</span>
-                   <span ng-if="layout.isSystem === 1" class="list-view-layout__system">(system layout)</span>
-               </div>
-
-               <div class="list-view-layout__path">
-                   <input ng-if="layout.isSystem !== 1" type="text" ng-model="layout.path" placeholder="Layout path..." class="-full-width-input" />
-               </div>
-
-               <div class="list-view-layout__action">
-                    <umb-checkbox ng-if="layout.isSystem === 1" model="layout.selected"></umb-checkbox>
-
-                    <div class="list-view-layout__remove" ng-if="layout.isSystem !== 1">
-                        <button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="vm.removeLayout(layout, $index, $event)">
-                           <localize key="general_remove">Remove</localize>
-                        </button>
-                    </div>
-               </div>
-
-           </div>
-
-       </div>
-
-      <button type="button" class="list-view-add-layout mt2" ng-click="vm.addLayout()">Add layout</button>
-
-   </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
deleted file mode 100644
index 6d24c9acb8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.ListView.GridLayoutController as vm">
-
-    <div ng-if="entityType !== 'media'">
-
-        <umb-content-grid 
-            ng-if="items"
-            content="items"
-            content-properties="options.includeProperties"
-            allow-click="!options.readonly"
-            on-click="vm.selectContentItem"
-            on-click-name="vm.goToItem">
-        </umb-content-grid>
-
-        <umb-empty-state ng-if="!items && options.filter.length === 0 && !vm.isRecycleBin"
-                         position="center">
-            <div ng-if="entityType === 'content'"><localize key="content_listViewNoContent">No content has been added</localize></div>
-            <div ng-if="entityType === 'member'"><localize key="content_listViewNoMembers">No members have been added</localize></div>
-        </umb-empty-state>
-
-        <umb-empty-state ng-if="!items && options.filter.length > 0"
-                         position="center">
-            <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
-        </umb-empty-state>
-
-        <umb-empty-state ng-if="!items && options.filter.length == 0 && vm.isRecycleBin"
-                         position="center">
-            <localize key="general_recycleBinEmpty">Your recycle bin is empty</localize>
-        </umb-empty-state>
-
-    </div>
-
-    <div ng-if="entityType === 'media'"
-         on-drag-leave="vm.dragLeave()"
-         on-drag-end="vm.dragLeave()"
-         on-drag-enter="vm.dragEnter()">
-
-        <umb-file-dropzone ng-if="!vm.isRecycleBin && vm.acceptedMediatypes.length > 0"
-                           accepted-mediatypes="vm.acceptedMediatypes"
-                           parent-id="{{vm.nodeId}}"
-                           files-uploaded="vm.onUploadComplete"
-                           accept="{{vm.acceptedFileTypes}}"
-                           max-file-size="{{vm.maxFileSize}}"
-                           hide-dropzone="{{ options.filter.length > 0 }}"
-                           compact="{{ items.length > 0 }}"
-                           files-queued="vm.onFilesQueue">
-        </umb-file-dropzone>
-
-        <umb-folder-grid ng-if="folders.length > 0"
-                         folders="folders"
-                         on-click="vm.selectFolder"
-                         on-click-name="vm.goToItem">
-        </umb-folder-grid>
-
-        <umb-media-grid items="vm.itemsWithoutFolders"
-                        on-details-hover="vm.hoverMediaItemDetails"
-                        on-click="vm.selectItem"
-                        on-click-name="vm.goToItem"
-                        allow-open-folder="true"
-                        allow-open-file="true">
-        </umb-media-grid>
-
-        <umb-tooltip ng-if="vm.mediaDetailsTooltip.show"
-                     event="vm.mediaDetailsTooltip.event">
-            <ul class="umb-tooltip-list">
-                <li class="umb-tooltip-list__item" ng-repeat="property in options.includeProperties">
-                    <div class="umb-tooltip-list__item-label">{{ property.header }}</div>
-                    <div class="umb-tooltip-list__item-value">{{ vm.mediaDetailsTooltip.item[property.alias] }}</div>
-                </li>
-            </ul>
-        </umb-tooltip>
-
-        <umb-empty-state ng-if="vm.itemsWithoutFolders.length === 0 && folders.length === 0 && options.filter.length == 0 && vm.isRecycleBin"
-                         position="center">
-            <localize key="general_recycleBinEmpty">Your recycle bin is empty</localize>
-        </umb-empty-state>
-
-        <umb-empty-state ng-if="vm.itemsWithoutFolders.length === 0 && folders.length === 0 && options.filter.length > 0"
-                         position="center">
-            <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
-        </umb-empty-state>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
deleted file mode 100644
index 36b45773cb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.DocumentType.EditController
- * @function
- *
- * @description
- * The controller for the content type editor
- */
-(function () {
-    "use strict";
-
-    function ListViewGridLayoutController($scope, mediaHelper, $location, listViewHelper, mediaTypeHelper) {
-
-        var vm = this;
-        var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
-
-        vm.nodeId = $scope.contentId;
-        // Use list of allowed file types if provided
-        vm.acceptedFileTypes = mediaHelper.formatFileTypes(umbracoSettings.allowedUploadFiles);
-        if (vm.acceptedFileTypes === '') {
-            // If not provided, we pass in a disallowed list by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
-            vm.acceptedFileTypes = !mediaHelper.formatFileTypes(umbracoSettings.disallowedUploadFiles);
-        }
-
-        vm.maxFileSize = umbracoSettings.maxFileSize + "KB";
-        vm.activeDrag = false;
-        vm.mediaDetailsTooltip = {};
-        vm.itemsWithoutFolders = [];
-        vm.isRecycleBin = $scope.contentId === '-21' || $scope.contentId === '-20';
-        vm.acceptedMediatypes = [];
-
-        vm.dragEnter = dragEnter;
-        vm.dragLeave = dragLeave;
-        vm.onFilesQueue = onFilesQueue;
-        vm.onUploadComplete = onUploadComplete;
-
-        vm.hoverMediaItemDetails = hoverMediaItemDetails;
-        vm.selectContentItem = selectContentItem;
-        vm.selectItem = selectItem;
-        vm.selectFolder = selectFolder;
-        vm.goToItem = goToItem;
-
-        function activate() {
-            vm.itemsWithoutFolders = filterOutFolders($scope.items);
-
-            //no need to make another REST/DB call if this data is not used when we are browsing the bin
-            if ($scope.entityType === 'media' && !vm.isRecycleBin) {
-                mediaTypeHelper.getAllowedImagetypes(vm.nodeId).then(function (types) {
-                    vm.acceptedMediatypes = types;
-                });
-            }
-
-        }
-
-        function filterOutFolders(items) {
-
-            var newArray = [];
-
-            if (items && items.length) {
-
-                for (var i = 0; items.length > i; i++) {
-                    var item = items[i];
-                    var isFolder = !mediaHelper.hasFilePropertyType(item);
-
-                    if (!isFolder) {
-                        newArray.push(item);
-                    }
-                }
-
-            }
-
-            return newArray;
-        }
-
-        function dragEnter(el, event) {
-            vm.activeDrag = true;
-        }
-
-        function dragLeave(el, event) {
-            vm.activeDrag = false;
-        }
-
-        function onFilesQueue() {
-            vm.activeDrag = false;
-        }
-
-        function onUploadComplete() {
-            $scope.getContent($scope.contentId);
-        }
-
-        function hoverMediaItemDetails(item, event, hover) {
-
-            if (hover && !vm.mediaDetailsTooltip.show) {
-
-                vm.mediaDetailsTooltip.event = event;
-                vm.mediaDetailsTooltip.item = item;
-                vm.mediaDetailsTooltip.show = true;
-
-            } else if (!hover && vm.mediaDetailsTooltip.show) {
-
-                vm.mediaDetailsTooltip.show = false;
-
-            }
-
-        }
-
-        function selectContentItem(item, $event, $index) {
-            if ($scope.options.readonly) return;
-            listViewHelper.selectHandler(item, $index, $scope.items, $scope.selection, $event);
-        }
-
-        function selectItem(item, $event, $index) {
-            if ($scope.options.readonly) return;
-            listViewHelper.selectHandler(item, $index, vm.itemsWithoutFolders, $scope.selection, $event);
-        }
-
-        function selectFolder(folder, $event, $index) {
-            if ($scope.options.readonly) return;
-            listViewHelper.selectHandler(folder, $index, $scope.folders, $scope.selection, $event);
-        }
-
-        function goToItem(item, $event, $index) {
-            listViewHelper.editItem(item, $scope);
-        }
-
-        activate();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.ListView.GridLayoutController", ListViewGridLayoutController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
deleted file mode 100644
index 174f411f22..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<div
-    ng-class="{'-content':(entityType === 'content')}"
-    ng-controller="Umbraco.PropertyEditors.ListView.ListLayoutController as vm">
-
-    <div
-        ng-if="entityType === 'media'"
-        on-drag-leave="vm.dragLeave()"
-        on-drag-end="vm.dragLeave()"
-        on-drag-enter="vm.dragEnter()">
-
-        <umb-file-dropzone
-           ng-if="!vm.isRecycleBin && vm.acceptedMediatypes.length > 0"
-           accepted-mediatypes="vm.acceptedMediatypes"
-           parent-id="{{vm.nodeId}}"
-           files-uploaded="vm.onUploadComplete"
-           accept="{{vm.acceptedFileTypes}}"
-           max-file-size="{{vm.maxFileSize}}"
-           hide-dropzone="{{options.filter.length > 0}}"
-           compact="{{ items.length > 0 }}"
-           files-queued="vm.onFilesQueue">
-        </umb-file-dropzone>
-
-        <umb-table
-            ng-if="items"
-            items="items"
-            allow-select-all="options.bulkActionsAllowed"
-            item-properties="options.includeProperties"
-            on-select="vm.selectItem(item, $index, $event)"
-            on-click="vm.clickItem(item)"
-            on-select-all="vm.selectAll($event)"
-            on-selected-all="vm.isSelectedAll()"
-            on-sorting-direction="vm.isSortDirection(col, direction)"
-            on-sort="vm.sort(field, allow, isSystem)">
-        </umb-table>
-
-    </div>
-
-    <div ng-if="entityType !== 'media'">
-
-        <umb-table
-            ng-if="items"
-            items="items"
-            allow-select="!options.readonly"
-            allow-select-all="options.bulkActionsAllowed"
-            item-properties="options.includeProperties"
-            on-select="vm.selectItem(item, $index, $event)"
-            on-click="vm.clickItem(item)"
-            on-select-all="vm.selectAll($event)"
-            on-selected-all="vm.isSelectedAll()"
-            on-sorting-direction="vm.isSortDirection(col, direction)"
-            on-sort="vm.sort(field, allow, isSystem)">
-        </umb-table>
-
-        <umb-empty-state
-            ng-if="!items && options.filter.length === 0 && !vm.isRecycleBin"
-            position="center">
-            <div ng-show="entityType === 'content'"><localize key="content_listViewNoContent">No content has been added</localize></div>
-            <div ng-show="entityType === 'member'"><localize key="content_listViewNoMembers">No members have been added</localize></div>
-        </umb-empty-state>
-
-    </div>
-
-    <umb-empty-state
-        ng-if="!items && options.filter.length > 0"
-        position="center">
-        <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
-    </umb-empty-state>
-
-    <umb-empty-state
-        ng-if="!items && options.filter.length == 0 && vm.isRecycleBin"
-        position="center">
-        <localize key="general_recycleBinEmpty">Your recycle bin is empty</localize>
-    </umb-empty-state>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
deleted file mode 100644
index 096341c2dd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
+++ /dev/null
@@ -1,112 +0,0 @@
-(function () {
-    "use strict";
-
-    function ListViewListLayoutController($scope, listViewHelper, mediaHelper, mediaTypeHelper, urlHelper) {
-
-        var vm = this;
-        var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
-
-        vm.nodeId = $scope.contentId;
-
-        // Use list of allowed file types if provided
-        vm.acceptedFileTypes = mediaHelper.formatFileTypes(umbracoSettings.allowedUploadFiles);
-        if (vm.acceptedFileTypes === '') {
-            // If not provided, we pass in a disallowed list by adding ! to the file extensions, allowing everything EXCEPT for disallowedUploadFiles
-            vm.acceptedFileTypes = !mediaHelper.formatFileTypes(umbracoSettings.disallowedUploadFiles);
-        }
-
-        vm.maxFileSize = umbracoSettings.maxFileSize + "KB";
-        vm.activeDrag = false;
-        vm.isRecycleBin = $scope.contentId === '-21' || $scope.contentId === '-20';
-        vm.acceptedMediatypes = [];
-
-        vm.selectItem = selectItem;
-        vm.clickItem = clickItem;
-        vm.selectAll = selectAll;
-        vm.isSelectedAll = isSelectedAll;
-        vm.isSortDirection = isSortDirection;
-        vm.sort = sort;
-        vm.dragEnter = dragEnter;
-        vm.dragLeave = dragLeave;
-        vm.onFilesQueue = onFilesQueue;
-        vm.onUploadComplete = onUploadComplete;
-        markAsSensitive();
-
-        function activate() {
-            if ($scope.entityType === 'media') {
-                mediaTypeHelper.getAllowedImagetypes(vm.nodeId).then(function (types) {
-                    vm.acceptedMediatypes = types;
-                });
-            }
-        }
-
-        function selectAll() {
-            if ($scope.options.readonly) return;
-            listViewHelper.selectAllItemsToggle($scope.items, $scope.selection);
-        }
-
-        function isSelectedAll() {
-            return listViewHelper.isSelectedAll($scope.items, $scope.selection);
-        }
-
-        function selectItem(selectedItem, $index, $event) {
-            if ($scope.options.readonly) return;
-            listViewHelper.selectHandler(selectedItem, $index, $scope.items, $scope.selection, $event);
-        }
-
-        function clickItem(item) {
-            listViewHelper.editItem(item, $scope);
-        }
-
-        function isSortDirection(col, direction) {
-            return listViewHelper.setSortingDirection(col, direction, $scope.options);
-        }
-
-        function sort(field, allow, isSystem) {
-            if (allow) {
-                $scope.options.orderBySystemField = isSystem;
-                listViewHelper.setSorting(field, allow, $scope.options);
-                $scope.getContent($scope.contentId);
-            }
-        }
-
-        // Dropzone upload functions
-        function dragEnter(el, event) {
-            vm.activeDrag = true;
-        }
-
-        function dragLeave(el, event) {
-            vm.activeDrag = false;
-        }
-
-        function onFilesQueue() {
-            vm.activeDrag = false;
-        }
-
-        function onUploadComplete() {
-            $scope.getContent($scope.contentId);
-        }
-
-        function markAsSensitive() {
-            $scope.options.includeProperties.forEach(function (option) {
-                option.isSensitive = false;
-
-                if ($scope.items && $scope.items.length) {
-                    $scope.items.forEach(function (item) {
-                        item.properties.forEach(function (property) {
-                            if (option.alias === property.alias) {
-                                option.isSensitive = property.isSensitive;
-                            }
-                         });
-                    });
-                }
-            });
-        }
-
-        activate();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.ListView.ListLayoutController", ListViewListLayoutController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
deleted file mode 100644
index 0edcd67c19..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ /dev/null
@@ -1,949 +0,0 @@
-function listViewController($scope, $interpolate, $routeParams, $injector, $timeout, currentUserResource, notificationsService, iconHelper, editorState, localizationService, appState, $location, contentEditingHelper, listViewHelper, navigationService, editorService, overlayService, languageResource, mediaHelper, eventsService) {
-
-  //this is a quick check to see if we're in create mode, if so just exit - we cannot show children for content
-  // that isn't created yet, if we continue this will use the parent id in the route params which isn't what
-  // we want. NOTE: This is just a safety check since when we scaffold an empty model on the server we remove
-  // the list view tab entirely when it's new.
-  if ($routeParams.create) {
-    $scope.isNew = true;
-    return;
-  }
-
-  //Now we need to check if this is for media, members or content because that will depend on the resources we use
-  var contentResource, getContentTypesCallback, getListResultsCallback, deleteItemCallback, getIdCallback, createEditUrlCallback;
-
-  //check the config for the entity type, or the current section name (since the config is only set in c#, not in pre-vals)
-  if (($scope.model.config.entityType && $scope.model.config.entityType === "member") || (appState.getSectionState("currentSection") === "member")) {
-    //handling issue 13770
-    if ($scope.model.config.entityType && $scope.model.config.entityType === "media") {
-
-      $scope.entityType = "media";
-      contentResource = $injector.get('mediaResource');
-      getContentTypesCallback = $injector.get('mediaTypeResource').getAllowedTypes;
-
-      getListResultsCallback = contentResource.getChildren;
-      deleteItemCallback = contentResource.deleteById;
-      getIdCallback = function (selected) {
-        return selected.id;
-      };
-      createEditUrlCallback = function (item) {
-        return "/" + $scope.entityType + "/" + $scope.entityType + "/edit/" + item.id
-          + "?list=" + $routeParams.id + "&page=" + $scope.options.pageNumber + "&filter=" + $scope.options.filter
-          + "&orderBy=" + $scope.options.orderBy + "&orderDirection=" + $scope.options.orderDirection;
-      };
-
-
-    } else {
-      $scope.entityType = "member";
-      contentResource = $injector.get('memberResource');
-      getContentTypesCallback = $injector.get('memberTypeResource').getTypes;
-      getListResultsCallback = contentResource.getPagedResults;
-      deleteItemCallback = contentResource.deleteByKey;
-      getIdCallback = function (selected) {
-        return selected.key;
-      };
-      createEditUrlCallback = function (item) {
-        return "/" + $scope.entityType + "/" + $scope.entityType + "/edit/" + item.key + "?page=" + $scope.options.pageNumber + "&listName=" + $scope.contentId;
-      };
-    }
-
-
-  }
-  else {
-    //check the config for the entity type, or the current section name (since the config is only set in c#, not in pre-vals)
-    if (($scope.model.config.entityType && $scope.model.config.entityType === "media") || (appState.getSectionState("currentSection") === "media")) {
-      $scope.entityType = "media";
-      contentResource = $injector.get('mediaResource');
-      getContentTypesCallback = $injector.get('mediaTypeResource').getAllowedTypes;
-    }
-    else {
-      $scope.entityType = "content";
-      contentResource = $injector.get('contentResource');
-      getContentTypesCallback = $injector.get('contentTypeResource').getAllowedTypes;
-    }
-    getListResultsCallback = contentResource.getChildren;
-    deleteItemCallback = contentResource.deleteById;
-    getIdCallback = function (selected) {
-      return selected.id;
-    };
-    createEditUrlCallback = function (item) {
-      return "/" + $scope.entityType + "/" + $scope.entityType + "/edit/" + item.id
-        + "?list=" + $routeParams.id + "&page=" + $scope.options.pageNumber + "&filter=" + $scope.options.filter
-        + "&orderBy=" + $scope.options.orderBy + "&orderDirection=" + $scope.options.orderDirection;
-    };
-  }
-
-  $scope.pagination = [];
-  $scope.isNew = false;
-  $scope.actionInProgress = false;
-  $scope.selection = [];
-  $scope.folders = [];
-  $scope.page = {
-    createDropdownOpen: false
-  };
-  $scope.listViewResultSet = {
-    totalPages: 0,
-    items: []
-  };
-
-  $scope.createAllowedButtonSingle = false;
-  $scope.createAllowedButtonSingleWithBlueprints = false;
-  $scope.createAllowedButtonMultiWithBlueprints = false;
-
-  //when this is null, we don't check permissions
-  $scope.currentNodePermissions = $scope.entityType === "content" ? contentEditingHelper.getPermissionsForContent() : null;
-
-  //when this is null, we don't check permissions
-  $scope.buttonPermissions = null;
-
-  //When we are dealing with 'content', we need to deal with permissions on child nodes.
-  // Currently there is no real good way to
-  if ($scope.entityType === "content") {
-
-    var idsWithPermissions = null;
-
-    $scope.buttonPermissions = {
-      canCopy: false,
-      canCreate: false,
-      canDelete: false,
-      canMove: false,
-      canPublish: false,
-      canUnpublish: false
-    };
-
-    $scope.$watch("selection.length", function (newVal, oldVal) {
-
-      if ((idsWithPermissions == null && newVal > 0) || (idsWithPermissions != null)) {
-
-        //get all of the selected ids
-        var ids = _.map($scope.selection, function (i) {
-          return i.id.toString();
-        });
-
-        //remove the dictionary items that don't have matching ids
-        var filtered = {};
-        _.each(idsWithPermissions, function (value, key, list) {
-          if (_.contains(ids, key)) {
-            filtered[key] = value;
-          }
-        });
-        idsWithPermissions = filtered;
-
-        //find all ids that we haven't looked up permissions for
-        var existingIds = _.keys(idsWithPermissions);
-        var missingLookup = _.map(_.difference(ids, existingIds), function (i) {
-          return Number(i);
-        });
-
-        if (missingLookup.length > 0) {
-          currentUserResource.getPermissions(missingLookup).then(function (p) {
-            $scope.buttonPermissions = listViewHelper.getButtonPermissions(p, idsWithPermissions);
-          });
-        }
-        else {
-          $scope.buttonPermissions = listViewHelper.getButtonPermissions({}, idsWithPermissions);
-        }
-      }
-    });
-
-  }
-
-  var listParamsForCurrent = $routeParams.id == $routeParams.list;
-
-  $scope.options = {
-    useInfiniteEditor: $scope.model.config.useInfiniteEditor === true,
-    pageSize: $scope.model.config.pageSize ? $scope.model.config.pageSize : 10,
-    pageNumber: (listParamsForCurrent && $routeParams.page && !isNaN($routeParams.page) && Number($routeParams.page) > 0) ? $routeParams.page : 1,
-    filter: (listParamsForCurrent && $routeParams.filter ? $routeParams.filter : '').trim(),
-    orderBy: (listParamsForCurrent && $routeParams.orderBy ? $routeParams.orderBy : $scope.model.config.orderBy ? $scope.model.config.orderBy : 'VersionDate').trim(),
-    orderDirection: (listParamsForCurrent && $routeParams.orderDirection ? $routeParams.orderDirection : $scope.model.config.orderDirection ? $scope.model.config.orderDirection : "desc").trim(),
-    orderBySystemField: true,
-    includeProperties: $scope.model.config.includeProperties ? $scope.model.config.includeProperties : [
-      { alias: 'updateDate', header: 'Last edited', isSystem: 1 },
-      { alias: 'updater', header: 'Last edited by', isSystem: 1 }
-    ],
-    layout: {
-      layouts: $scope.model.config.layouts,
-      activeLayout: listViewHelper.getLayout($routeParams.id, $scope.model.config.layouts)
-    },
-    allowBulkPublish: $scope.entityType === 'content' && $scope.model.config.bulkActionPermissions.allowBulkPublish && !$scope.readonly,
-    allowBulkUnpublish: $scope.entityType === 'content' && $scope.model.config.bulkActionPermissions.allowBulkUnpublish && !$scope.readonly,
-    allowBulkCopy: $scope.entityType === 'content' && $scope.model.config.bulkActionPermissions.allowBulkCopy && !$scope.readonly,
-    allowBulkMove: $scope.entityType !== 'member' && $scope.model.config.bulkActionPermissions.allowBulkMove && !$scope.readonly,
-    allowBulkDelete: $scope.model.config.bulkActionPermissions.allowBulkDelete && !$scope.readonly,
-    allowCreate: !$scope.readonly,
-    cultureName: $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture,
-    readonly: $scope.readonly
-  };
-
-  _.each($scope.options.includeProperties, function (property) {
-    property.nameExp = property.nameTemplate
-      ? $interpolate(property.nameTemplate)
-      : undefined;
-  });
-
-  //watch for culture changes in the query strings and update accordingly
-  $scope.$watch(function () {
-    return $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture;
-  }, function (newVal, oldVal) {
-    if (newVal && newVal !== oldVal) {
-      //update the options
-      $scope.options.cultureName = newVal;
-      $scope.reloadView($scope.contentId);
-    }
-  });
-
-  // Check if selected order by field is actually custom field
-  for (var j = 0; j < $scope.options.includeProperties.length; j++) {
-    var includedProperty = $scope.options.includeProperties[j];
-    if (includedProperty.alias.toLowerCase() === $scope.options.orderBy.toLowerCase()) {
-      $scope.options.orderBySystemField = includedProperty.isSystem === 1;
-      break;
-    }
-  }
-
-  //update all of the system includeProperties to enable sorting
-  _.each($scope.options.includeProperties, function (e, i) {
-    e.allowSorting = true;
-
-    // Special case for members, only the configured system fields should be enabled sorting
-    // (see MemberRepository.ApplySystemOrdering)
-    if (e.isSystem && $scope.entityType === "member") {
-      e.allowSorting = e.alias === "username" ||
-        e.alias === "email" ||
-        e.alias === "updateDate" ||
-        e.alias === "createDate" ||
-        e.alias === "contentTypeAlias" ||
-        e.alias === "failedPasswordAttempts" ||
-        e.alias === "approved" ||
-        e.alias === "lockedOut" ||
-        e.alias === "lastLockoutDate" ||
-        e.alias === "lastLoginDate" ||
-        e.alias === "lastPasswordChangeDate";
-    }
-
-    if (e.isSystem) {
-      //localize the header
-      var key = getLocalizedKey(e.alias);
-      localizationService.localize(key).then(function (v) {
-        e.header = v;
-      });
-    }
-  });
-
-  $scope.selectLayout = function (layout) {
-    $scope.options.layout.activeLayout = listViewHelper.setLayout($routeParams.id, layout, $scope.model.config.layouts);
-  };
-
-  function showNotificationsAndReset(err, reload, successMsgPromise) {
-
-    //check if response is ysod
-    if (err.status && err.status >= 500) {
-
-      // Open ysod overlay
-      overlayService.ysod(err);
-    }
-
-    $timeout(function () {
-      $scope.bulkStatus = "";
-      $scope.actionInProgress = false;
-    }, 500);
-
-    if (successMsgPromise) {
-      localizationService.localize("bulk_done").then(function (v) {
-        successMsgPromise.then(function (successMsg) {
-          notificationsService.success(v, successMsg);
-        })
-      });
-    }
-  }
-
-  $scope.next = function (pageNumber) {
-    $scope.options.pageNumber = pageNumber;
-    $scope.reloadView($scope.contentId);
-  };
-
-  $scope.goToPage = function (pageNumber) {
-    $scope.options.pageNumber = pageNumber;
-    $scope.reloadView($scope.contentId);
-  };
-
-  $scope.prev = function (pageNumber) {
-    $scope.options.pageNumber = pageNumber;
-    $scope.reloadView($scope.contentId);
-  };
-
-
-  /*Loads the search results, based on parameters set in prev,next,sort and so on*/
-  /*Pagination is done by an array of objects, due angularJS's funky way of monitoring state
-  with simple values */
-
-  $scope.getContent = function (contentId) {
-    $scope.reloadView($scope.contentId, true);
-  };
-
-  $scope.reloadView = function (id, reloadActiveNode) {
-    if (!id) {
-      return;
-    }
-
-    $scope.viewLoaded = false;
-    $scope.folders = [];
-
-    listViewHelper.clearSelection($scope.listViewResultSet.items, $scope.folders, $scope.selection);
-
-    getListResultsCallback(id, $scope.options).then(function (data) {
-
-      $scope.actionInProgress = false;
-      $scope.listViewResultSet = data;
-
-      //update all values for display
-      var section = appState.getSectionState("currentSection");
-      if ($scope.listViewResultSet.items) {
-        _.each($scope.listViewResultSet.items, function (e, index) {
-          setPropertyValues(e);
-          // create the folders collection (only for media list views)
-          if (section === "media" && !mediaHelper.hasFilePropertyType(e)) {
-            $scope.folders.push(e);
-          }
-        });
-      }
-
-      $scope.viewLoaded = true;
-
-      //NOTE: This might occur if we are requesting a higher page number than what is actually available, for example
-      // if you have more than one page and you delete all items on the last page. In this case, we need to reset to the last
-      // available page and then re-load again
-      if ($scope.options.pageNumber > $scope.listViewResultSet.totalPages) {
-        $scope.options.pageNumber = $scope.listViewResultSet.totalPages;
-
-        //reload!
-        $scope.reloadView(id, reloadActiveNode);
-      }
-            // in the media section, the list view items are by default also shown in the tree, so we need 
-      // to refresh the current tree node when changing the folder contents (adding and removing)
-      else if (reloadActiveNode && section === "media") {
-        var activeNode = appState.getTreeState("selectedNode");
-        if (activeNode) {
-          if (activeNode.expanded) {
-            navigationService.reloadNode(activeNode);
-          }
-        } else {
-          navigationService.reloadSection(section);
-        }
-      }
-    }).catch(function (error) {
-      // if someone attempts to add mix listviews across sections (i.e. use a members list view on content types),
-      // a not-supported exception will be most likely be thrown, at least for the default list views - lets be
-      // helpful and show a meaningful error message directly in content/content type UI
-      if (error.data && error.data.ExceptionType && error.data.ExceptionType.indexOf("System.NotSupportedException") > -1) {
-        $scope.viewLoadedError = error.errorMsg + ": " + error.data.ExceptionMessage;
-      }
-      $scope.viewLoaded = true;
-    });
-  };
-
-  $scope.makeSearch = function () {
-    if ($scope.options.filter !== null && $scope.options.filter !== undefined) {
-      $scope.options.pageNumber = 1;
-      $scope.reloadView($scope.contentId);
-    }
-  };
-
-  $scope.onSearchStartTyping = function () {
-    $scope.viewLoaded = false;
-  }
-
-  $scope.selectedItemsCount = function () {
-    return $scope.selection.length;
-  };
-
-  $scope.clearSelection = function () {
-    listViewHelper.clearSelection($scope.listViewResultSet.items, $scope.folders, $scope.selection);
-  };
-
-  $scope.getIcon = function (entry) {
-    return iconHelper.convertFromLegacyIcon(entry.icon);
-  };
-
-  function serial(selected, fn, getStatusMsg, index) {
-    return fn(selected, index).then(function (content) {
-      index++;
-      getStatusMsg(index, selected.length).then(function (value) {
-        $scope.bulkStatus = value;
-      });
-      return index < selected.length ? serial(selected, fn, getStatusMsg, index) : content;
-    }, function (err) {
-      var reload = index > 0;
-      showNotificationsAndReset(err, reload);
-      return err;
-    });
-  }
-
-  function applySelected(fn, getStatusMsg, getSuccessMsg, confirmMsg) {
-    var selected = $scope.selection;
-    if (selected.length === 0)
-      return;
-    if (confirmMsg && !confirm(confirmMsg))
-      return;
-
-    $scope.actionInProgress = true;
-
-    getStatusMsg(0, selected.length).then(function (value) {
-      $scope.bulkStatus = value;
-    });
-
-    return serial(selected, fn, getStatusMsg, 0).then(function (result) {
-      // executes once the whole selection has been processed
-      // in case of an error (caught by serial), result will be the error
-      if (!(result.data && Utilities.isArray(result.data.notifications)))
-        showNotificationsAndReset(result, true, getSuccessMsg(selected.length));
-    });
-  }
-
-  $scope.delete = function (numberOfItems, totalItems) {
-
-    const dialog = {
-      view: "views/propertyeditors/listview/overlays/delete.html",
-      deletesVariants: selectionHasVariants(),
-      isTrashed: $scope.isTrashed,
-      selection: $scope.selection,
-      submitButtonLabelKey: "contentTypeEditor_yesDelete",
-      submitButtonStyle: "danger",
-      submit: function (model) {
-        performDelete();
-        overlayService.close();
-      },
-      close: function () {
-        overlayService.close();
-      },
-      numberOfItems: numberOfItems,
-      totalItems: totalItems
-    };
-
-    localizationService.localize("general_delete").then(value => {
-      dialog.title = value;
-      overlayService.open(dialog);
-    });
-  };
-
-  function performDelete() {
-    applySelected(
-      function (selected, index) { return deleteItemCallback(getIdCallback(selected[index])); },
-      function (count, total) {
-        var key = (total === 1 ? "bulk_deletedItemOfItem" : "bulk_deletedItemOfItems");
-        return localizationService.localize(key, [count, total]);
-      },
-      function (total) {
-        var key = (total === 1 ? "bulk_deletedItem" : "bulk_deletedItems");
-        return localizationService.localize(key, [total]);
-      }).then(function () {
-        $scope.reloadView($scope.contentId, true);
-      });
-  }
-
-  function selectionHasVariants() {
-    let variesByCulture = false;
-
-    // check if any of the selected nodes has variants
-    $scope.selection.forEach(selectedItem => {
-      $scope.listViewResultSet.items.forEach(resultItem => {
-        if ((selectedItem.id === resultItem.id || selectedItem.key === resultItem.key) && resultItem.variesByCulture) {
-          variesByCulture = true;
-        }
-      })
-    });
-
-    return variesByCulture;
-  }
-
-  $scope.publish = function () {
-
-    const dialog = {
-      view: "views/propertyeditors/listview/overlays/listviewpublish.html",
-      submitButtonLabelKey: "actions_publish",
-      submit: function (model) {
-        // create a comma separated array of selected cultures
-        let selectedCultures = [];
-        if (model.languages && model.languages.length > 0) {
-          model.languages.forEach(language => {
-            if (language.publish) {
-              selectedCultures.push(language.culture);
-            }
-          });
-        }
-        performPublish(selectedCultures);
-        overlayService.close();
-      },
-      close: function () {
-        overlayService.close();
-      }
-    };
-
-        // if any of the selected nodes has variants we want to 
-    // show a dialog where the languages can be chosen
-    if (selectionHasVariants()) {
-      languageResource.getAll()
-        .then(languages => {
-          dialog.languages = languages;
-          overlayService.open(dialog);
-        }, error => {
-          notificationsService.error(error);
-        });
-    } else {
-      overlayService.open(dialog);
-    }
-
-  };
-
-  function performPublish(cultures) {
-    applySelected(
-      function (selected, index) { return contentResource.publishById(getIdCallback(selected[index]), cultures); },
-      function (count, total) {
-        var key = (total === 1 ? "bulk_publishedItemOfItem" : "bulk_publishedItemOfItems");
-        return localizationService.localize(key, [count, total]);
-      },
-      function (total) {
-        var key = (total === 1 ? "bulk_publishedItem" : "bulk_publishedItems");
-        return localizationService.localize(key, [total]);
-      }).then(function () {
-        $scope.reloadView($scope.contentId);
-      });
-  }
-
-  $scope.unpublish = function () {
-
-    const dialog = {
-      view: "views/propertyeditors/listview/overlays/listviewunpublish.html",
-      submitButtonLabelKey: "actions_unpublish",
-      submitButtonStyle: "warning",
-      selection: $scope.selection,
-      submit: function (model) {
-        // create a comma separated array of selected cultures
-        let selectedCultures = [];
-        if (model.languages && model.languages.length > 0) {
-          model.languages.forEach(language => {
-            if (language.unpublish) {
-              selectedCultures.push(language.culture);
-            }
-          });
-        }
-        performUnpublish(selectedCultures);
-        overlayService.close();
-      },
-      close: function () {
-        overlayService.close();
-      }
-    };
-
-        // if any of the selected nodes has variants we want to 
-    // show a dialog where the languages can be chosen
-    if (selectionHasVariants()) {
-      languageResource.getAll()
-        .then(languages => {
-          dialog.languages = languages;
-          overlayService.open(dialog);
-        }, error => {
-          notificationsService.error(error);
-        });
-    } else {
-      overlayService.open(dialog);
-    }
-
-  };
-
-  function performUnpublish(cultures) {
-    applySelected(
-      function (selected, index) { return contentResource.unpublish(getIdCallback(selected[index]), cultures); },
-      function (count, total) {
-        var key = (total === 1 ? "bulk_unpublishedItemOfItem" : "bulk_unpublishedItemOfItems");
-        return localizationService.localize(key, [count, total]);
-      },
-      function (total) {
-        var key = (total === 1 ? "bulk_unpublishedItem" : "bulk_unpublishedItems");
-        return localizationService.localize(key, [total]);
-      }).then(function () {
-        $scope.reloadView($scope.contentId, true);
-      });
-  }
-
-  $scope.move = function () {
-    var move = {
-      section: $scope.entityType,
-      currentNode: $scope.contentId,
-      submit: function (model) {
-        if (model.target) {
-          performMove(model.target);
-        }
-        editorService.close();
-      },
-      close: function () {
-        editorService.close();
-      }
-    }
-    editorService.move(move);
-  };
-
-
-  function performMove(target) {
-
-    //NOTE: With the way this applySelected/serial works, I'm not sure there's a better way currently to return
-    // a specific value from one of the methods, so we'll have to try this way. Even though the first method
-    // will fire once per every node moved, the destination path will be the same and we need to use that to sync.
-    var newPath = null;
-    applySelected(
-      function (selected, index) {
-        return contentResource.move({ parentId: target.id, id: getIdCallback(selected[index]) })
-          .then(function (path) {
-            newPath = path;
-            return path;
-          });
-      },
-      function (count, total) {
-        var key = (total === 1 ? "bulk_movedItemOfItem" : "bulk_movedItemOfItems");
-        return localizationService.localize(key, [count, total]);
-      },
-      function (total) {
-        var key = (total === 1 ? "bulk_movedItem" : "bulk_movedItems");
-        return localizationService.localize(key, [total]);
-      })
-      .then(function () {
-        //executes if all is successful, let's sync the tree
-        if (newPath) {
-          // reload the current view so the moved items are no longer shown
-          $scope.reloadView($scope.contentId);
-
-          //we need to do a double sync here: first refresh the node where the content was moved,
-          // then refresh the node where the content was moved from
-          navigationService.syncTree({
-            tree: target.nodeType ? target.nodeType : (target.metaData.treeAlias),
-            path: newPath,
-            forceReload: true,
-            activate: false
-          })
-            .then(function (args) {
-              //get the currently edited node (if any)
-              var activeNode = appState.getTreeState("selectedNode");
-              if (activeNode) {
-                navigationService.reloadNode(activeNode);
-              }
-            });
-        }
-      });
-  }
-
-  $scope.copy = function () {
-    var copyEditor = {
-      section: $scope.entityType,
-      currentNode: $scope.contentId,
-      submit: function (model) {
-        if (model.target) {
-          performCopy(model.target, model.relateToOriginal, model.includeDescendants);
-        }
-        editorService.close();
-      },
-      close: function () {
-        editorService.close();
-      }
-    };
-    editorService.copy(copyEditor);
-  };
-
-  function performCopy(target, relateToOriginal, includeDescendants) {
-    var newPath = null;
-    var newTarget = null;
-    applySelected(
-      function (selected, index) {
-        return contentResource.copy({ parentId: target.id, id: getIdCallback(selected[index]), relateToOriginal: relateToOriginal, recursive: includeDescendants })
-          .then(function (path) {
-            newPath = path;
-            newTarget = parseInt(target.id);
-            return path;
-          });
-      },
-      function (count, total) {
-        var key = (total === 1 ? "bulk_copiedItemOfItem" : "bulk_copiedItemOfItems");
-        return localizationService.localize(key, [count, total]);
-      },
-      function (total) {
-        var key = (total === 1 ? "bulk_copiedItem" : "bulk_copiedItems");
-        return localizationService.localize(key, [total]);
-      })
-      .then(function () {
-        //executes if all is successful
-        if (newPath) {
-          if (newTarget === $scope.contentId) {
-            // if we copied this to the same parent, reload the current view completely
-            $scope.reloadView($scope.contentId);
-          } else {
-            // Otherwise just clear the current selection but don't reload
-            $scope.clearSelection();
-          }
-        }
-      });
-  }
-
-  function getCustomPropertyValue(alias, properties) {
-    var value = '';
-    var index = 0;
-    var foundAlias = false;
-    for (var i = 0; i < properties.length; i++) {
-      if (properties[i].alias == alias) {
-        foundAlias = true;
-        break;
-      }
-      index++;
-    }
-
-    if (foundAlias) {
-      value = properties[index].value;
-    }
-
-    return value;
-  }
-
-  /** This ensures that the correct value is set for each item in a row, we don't want to call a function during interpolation or ng-bind as performance is really bad that way */
-  function setPropertyValues(result) {
-
-    //set the edit url
-    result.editPath = createEditUrlCallback(result);
-
-    _.each($scope.options.includeProperties, function (e, i) {
-
-      var alias = e.alias;
-
-      // First try to pull the value directly from the alias (e.g. updatedBy)
-      var value = result[alias];
-
-      // If this returns an object, look for the name property of that (e.g. owner.name)
-      if (value === Object(value)) {
-        value = value['name'];
-      }
-
-      // If we've got nothing yet, look at a user defined property
-      if (typeof value === 'undefined') {
-        value = getCustomPropertyValue(alias, result.properties);
-      }
-
-      // If we have a date, format it
-      if (isDate(value)) {
-        value = value.substring(0, value.length - 3);
-      }
-
-      if (e.nameExp) {
-        if (/{{.*\s*\w+\s*\|\s*\w+\s*.*}}/.test(e.nameTemplate)) { //check whether the name template has a filter
-          value = {
-            value,
-            expression: e.nameExp
-          };
-        }
-        else {
-          var newValue = e.nameExp({ value });
-
-          if (newValue && (newValue = newValue.trim())) {
-            value = newValue;
-          }
-        }
-      }
-
-      // set what we've got on the result
-      result[alias] = value;
-    });
-  }
-
-  function isDate(val) {
-    if (Utilities.isString(val)) {
-      return val.match(/^(\d{4})\-(\d{2})\-(\d{2})\ (\d{2})\:(\d{2})\:(\d{2})$/);
-    }
-    return false;
-  }
-
-  function initView() {
-
-    var id = $routeParams.id;
-    if (id === undefined) {
-      // no ID found in route params - don't list anything as we don't know for sure where we are
-      return;
-    }
-
-    // Get current id for node to load it's children
-    $scope.contentId = editorState.current ? editorState.current.id : id;
-    $scope.isTrashed = editorState.current ? editorState.current.trashed : id === "-20" || id === "-21";
-
-    $scope.options.allowBulkPublish = $scope.options.allowBulkPublish && !$scope.isTrashed;
-    $scope.options.allowBulkUnpublish = $scope.options.allowBulkUnpublish && !$scope.isTrashed;
-    $scope.options.allowBulkCopy = $scope.options.allowBulkCopy && !$scope.isTrashed;
-
-    $scope.options.bulkActionsAllowed = $scope.options.allowBulkPublish ||
-      $scope.options.allowBulkUnpublish ||
-      $scope.options.allowBulkCopy ||
-      $scope.options.allowBulkMove ||
-      $scope.options.allowBulkDelete;
-
-    if ($scope.isTrashed === false) {
-      getContentTypesCallback(id).then(function (listViewAllowedTypes) {
-        $scope.listViewAllowedTypes = listViewAllowedTypes;
-
-        var blueprints = false;
-        _.each(listViewAllowedTypes, function (allowedType) {
-          if (_.isEmpty(allowedType.blueprints)) {
-            // this helps the view understand that there are no blueprints available
-            allowedType.blueprints = null;
-          }
-          else {
-            blueprints = true;
-            // turn the content type blueprints object into an array of sortable objects for the view
-            allowedType.blueprints = _.map(_.pairs(allowedType.blueprints || {}), function (pair) {
-              return {
-                id: pair[0],
-                name: pair[1]
-              };
-            });
-          }
-        });
-
-        if (listViewAllowedTypes.length === 1 && blueprints === false) {
-          $scope.createAllowedButtonSingle = true;
-        }
-        if (listViewAllowedTypes.length === 1 && blueprints === true) {
-          $scope.createAllowedButtonSingleWithBlueprints = true;
-        }
-        if (listViewAllowedTypes.length > 1) {
-          $scope.createAllowedButtonMultiWithBlueprints = true;
-        }
-      });
-    }
-
-    $scope.reloadView($scope.contentId);
-  }
-
-  function getLocalizedKey(alias) {
-
-    switch (alias) {
-      case "sortOrder":
-        return "general_sort";
-      case "updateDate":
-        return "content_updateDate";
-      case "updater":
-        return "content_updatedBy";
-      case "createDate":
-        return "content_createDate";
-      case "owner":
-        return "content_createBy";
-      case "published":
-        return "content_isPublished";
-      case "contentTypeAlias":
-        return $scope.entityType === "content"
-          ? "content_documentType"
-          : $scope.entityType === "media"
-            ? "content_mediatype"
-            : "content_membertype";
-      case "email":
-        return "general_email";
-      case "username":
-        return "general_username";
-      case "failedPasswordAttempts":
-        return "user_failedPasswordAttempts";
-      case "approved":
-        return "user_stateApproved";
-      case "lockedOut":
-        return "user_stateLockedOut";
-      case "lastLockoutDate":
-        return "user_lastLockoutDate";
-      case "lastLoginDate":
-        return "user_lastLogin";
-      case "lastPasswordChangeDate":
-        return "user_lastPasswordChangeDate";
-    }
-    return alias;
-  }
-
-  function getItemKey(itemId) {
-    for (var i = 0; i < $scope.listViewResultSet.items.length; i++) {
-      var item = $scope.listViewResultSet.items[i];
-      if (item.id === itemId) {
-        return item.key;
-      }
-    }
-  }
-
-  function createBlank(entityType, docTypeAlias) {
-    if ($scope.options.useInfiniteEditor) {
-
-      var editorModel = {
-        create: true,
-        submit: function (model) {
-          editorService.close();
-          $scope.reloadView($scope.contentId);
-        },
-        close: function () {
-          editorService.close();
-          $scope.reloadView($scope.contentId);
-        }
-      };
-
-      if (entityType == "content") {
-        editorModel.parentId = $scope.contentId;
-        editorModel.documentTypeAlias = docTypeAlias;
-        editorService.contentEditor(editorModel);
-        return;
-      }
-
-      if (entityType == "media") {
-        editorService.mediaEditor(editorModel);
-        return;
-      }
-
-      if (entityType == "member") {
-        editorModel.doctype = docTypeAlias;
-        editorService.memberEditor(editorModel);
-        return;
-      }
-    }
-
-    $location
-      .path("/" + entityType + "/" + entityType + "/edit/" + $scope.contentId)
-      .search("doctype", docTypeAlias)
-      .search("create", "true");
-  }
-
-  function createFromBlueprint(entityType, docTypeAlias, blueprintId) {
-    $location
-      .path("/" + entityType + "/" + entityType + "/edit/" + $scope.contentId)
-      .search("doctype", docTypeAlias)
-      .search("create", "true")
-      .search("blueprintId", blueprintId);
-  }
-
-  function toggleDropdown() {
-    $scope.page.createDropdownOpen = !$scope.page.createDropdownOpen;
-  }
-
-  function leaveDropdown() {
-    $scope.page.createDropdownOpen = false;
-  }
-
-  $scope.createBlank = createBlank;
-  $scope.createFromBlueprint = createFromBlueprint;
-  $scope.toggleDropdown = toggleDropdown;
-  $scope.leaveDropdown = leaveDropdown;
-
-  // if this listview has sort order in it, make sure it is updated when sorting is performed on the current content
-  if (_.find($scope.options.includeProperties, property => property.alias === "sortOrder")) {
-    var eventSubscription = eventsService.on("sortCompleted", function (e, args) {
-      if (parseInt(args.id) === parseInt($scope.contentId)) {
-        $scope.reloadView($scope.contentId);
-      }
-    });
-
-    $scope.$on('$destroy', function () {
-      eventsService.unsubscribe(eventSubscription);
-    });
-  }
-
-  //GO!
-  initView();
-}
-
-
-angular.module("umbraco").controller("Umbraco.PropertyEditors.ListViewController", listViewController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
deleted file mode 100644
index b7462696b6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<div class="umb-property-editor umb-listview" ng-controller="Umbraco.PropertyEditors.ListViewController" ng-switch="isNew">
-
-   <div class="row-fluid" ng-switch-when="true">
-
-   </div>
-
-   <div class="row-fluid umb-listview__container" ng-switch-when="false">
-
-       <umb-editor-sub-header ng-if="(selection.length == 0)">
-
-           <umb-editor-sub-header-content-left>
-
-               <umb-editor-sub-header-section ng-if="(listViewAllowedTypes && listViewAllowedTypes.length > 0 && (selection.length == 0)) && (currentNodePermissions == null || currentNodePermissions.canCreate) && options.allowCreate">
-
-                    <!-- Renders when it's only possible to create one specific document type for, which no blueprint exists-->
-                   <div class="btn-group" ng-show="createAllowedButtonSingle">
-                       <button type="button" class="btn btn-outline umb-outline" ng-click="createBlank(entityType,listViewAllowedTypes[0].alias)">
-                           <localize key="actions_create">Create</localize> {{listViewAllowedTypes[0].name}}
-                       </button>
-                   </div>
-
-                   <!-- Renders when it's only possible to create one specific document type for which a blueprint exits-->
-                   <div class="btn-group" ng-show="createAllowedButtonSingleWithBlueprints" deep-blur="leaveDropdown()">
-                       <button type="button" class="btn btn-outline umb-outline dropdown-toggle" aria-expanded="{{page.createDropdownOpen}}" ng-click="toggleDropdown()">
-                           <span>
-                               <localize key="actions_create">Create</localize> {{listViewAllowedTypes[0].name}}
-                           </span>
-                           <span class="caret" aria-hidden="true"></span>
-                        </button>
-
-                       <umb-dropdown ng-if="page.createDropdownOpen" on-close="page.createDropdownOpen = false">
-                           <umb-dropdown-item ng-repeat="contentType in listViewAllowedTypes track by contentType.key | orderBy:'name':false">
-                                <button type="button" ng-click="createBlank(entityType,contentType.alias)">
-                                    <umb-icon icon="{{::contentType.icon}}"></umb-icon>
-                                    {{::contentType.name}} <span ng-show="contentType.blueprints" style="text-transform: lowercase;">(<localize key="blueprints_blankBlueprint">blank</localize>)</span>
-                                </button>
-
-                                <button type="button" ng-repeat="blueprint in contentType.blueprints track by blueprint.id | orderBy:'name':false" ng-click="createFromBlueprint(entityType, contentType.alias, blueprint.id)">
-                                    &nbsp;&nbsp;<umb-icon icon="{{::contentType.icon}}"></umb-icon>
-                                    {{::blueprint.name}}
-                                </button>
-                            </umb-dropdown-item>
-                       </umb-dropdown>
-                   </div>
-
-                   <!-- Renders when it's possible to create multiple document types and blueprints for one or more of the document types-->
-                   <div class="btn-group" ng-show="createAllowedButtonMultiWithBlueprints" deep-blur="leaveDropdown()">
-                       <button type="button" class="btn btn-outline umb-outline dropdown-toggle" aria-expanded="{{page.createDropdownOpen === undefined ? false : page.createDropdownOpen}}" ng-click="toggleDropdown()">
-                           <localize key="actions_create">Create</localize>
-                           <span class="caret" aria-hidden="true"></span>
-                       </button>
-
-                       <umb-dropdown class="umb-actions" ng-if="page.createDropdownOpen" on-close="page.createDropdownOpen = false">
-                           <umb-dropdown-item ng-repeat="contentType in listViewAllowedTypes track by contentType.key | orderBy:'name':false">
-                               <button type="button" ng-click="createBlank(entityType,contentType.alias)">
-                                   <umb-icon icon="{{::contentType.icon}}"></umb-icon>
-                                   <span class="menu-label">{{::contentType.name}}</span> <span ng-show="contentType.blueprints" style="text-transform: lowercase;">(<localize key="blueprints_blankBlueprint">blank</localize>)</span>
-                               </button>
-                               <button type="button" ng-repeat="blueprint in contentType.blueprints track by blueprint.id | orderBy:'name':false" ng-click="createFromBlueprint(entityType, contentType.alias, blueprint.id)">
-                                   <umb-icon icon="{{::contentType.icon}}"></umb-icon>
-                                   <span class="menu-label">{{::blueprint.name}}</span>
-                               </button>
-                           </umb-dropdown-item>
-                       </umb-dropdown>
-                   </div>
-
-                   <ul class="umb-actions umb-actions-child">
-
-                       <li ng-repeat="blueprint in docType.blueprints track by blueprint.id | orderBy:'name':false">
-                           <button type="button" ng-click="createFromBlueprint(blueprint.id)">
-                               <umb-icon icon="{{docType.icon}}" class="large"></umb-icon>
-                               <span class="menu-label">
-                                   {{blueprint.name}}&nbsp;
-                               </span>
-                            </button>
-                       </li>
-
-                       <li class="sep" ng-show="allowBlank">
-                           <button type="button" ng-click="createBlank(docType)">
-                               <umb-icon icon="{{docType.icon}}" class="large"></umb-icon>
-                               <span class="menu-label">
-                                   <localize key="blueprints_blankBlueprint">Blank</localize>
-                               </span>
-                            </button>
-                       </li>
-
-                   </ul>
-
-               </umb-editor-sub-header-section>
-
-           </umb-editor-sub-header-content-left>
-
-
-           <umb-editor-sub-header-content-right>
-
-               <umb-editor-sub-header-section>
-
-                   <umb-layout-selector
-                       ng-show="options.layout.layouts"
-                       layouts="options.layout.layouts"
-                       active-layout="options.layout.activeLayout"
-                       on-layout-select="selectLayout(layout)">
-                   </umb-layout-selector>
-
-               </umb-editor-sub-header-section>
-
-               <umb-editor-sub-header-section>
-
-                    <umb-mini-search model="options.filter" on-search="makeSearch()" on-start-typing="onSearchStartTyping()">
-                    </umb-mini-search>
-
-               </umb-editor-sub-header-section>
-           </umb-editor-sub-header-content-right>
-
-       </umb-editor-sub-header>
-
-       <umb-list-view-layout
-         ng-if="viewLoaded && !viewLoadedError"
-         content-id="contentId"
-         folders="folders"
-         items="listViewResultSet.items"
-         selection="selection"
-         options="options"
-         entity-type="{{entityType}}"
-         on-get-content="getContent(contentId)">
-      </umb-list-view-layout>
-
-      <umb-load-indicator ng-show="!viewLoaded"></umb-load-indicator>
-
-      <div ng-if="viewLoaded && viewLoadedError" class="umb-alert umb-alert--warning">{{viewLoadedError}}</div>
-
-      <umb-editor-sub-header class="--state-selection" ng-if="(selection.length > 0)">
-
-        <umb-editor-sub-header-content-left>
-
-            <umb-editor-sub-header-section>
-                <umb-button type="button" label="Clear selection" label-key="buttons_clearSelection" button-style="white"
-                  action="clearSelection()" disabled="actionInProgress">
-                </umb-button>
-            </umb-editor-sub-header-section>
-
-            <umb-editor-sub-header-section>
-                <strong ng-show="!actionInProgress">{{ selectedItemsCount() }}
-                  <localize key="general_of">of</localize> {{
-                  listViewResultSet.items.length }}
-                  <localize key="general_selected">selected</localize>
-                </strong>
-                <strong ng-show="actionInProgress" ng-bind="bulkStatus"></strong>
-                <umb-loader position="bottom" ng-show="actionInProgress"></umb-loader>
-            </umb-editor-sub-header-section>
-
-        </umb-editor-sub-header-content-left>
-
-
-        <umb-editor-sub-header-content-right>
-
-          <umb-editor-sub-header-section>
-            <umb-button ng-if="options.allowBulkPublish && (buttonPermissions == null || buttonPermissions.canPublish)"
-              style="margin-right: 5px" type="button" button-style="white" label-key="actions_publish" icon="icon-globe"
-              action="publish()" disabled="actionInProgress" size="xs" add-ellipsis="true">
-            </umb-button>
-
-            <umb-button
-              ng-if="options.allowBulkUnpublish && (buttonPermissions == null || buttonPermissions.canUnpublish)"
-              style="margin-right: 5px" type="button" button-style="white" label-key="actions_unpublish" icon="icon-block"
-              action="unpublish()" disabled="actionInProgress" size="xs" add-ellipsis="true">
-            </umb-button>
-
-            <umb-button ng-if="options.allowBulkCopy && (buttonPermissions == null || buttonPermissions.canCopy)"
-              style="margin-right: 5px" type="button" button-style="white" label-key="actions_copy" icon="icon-documents"
-              action="copy()" disabled="actionInProgress" size="xs" add-ellipsis="true">
-            </umb-button>
-
-            <umb-button ng-if="options.allowBulkMove && (buttonPermissions == null || buttonPermissions.canMove)"
-              style="margin-right: 5px" type="button" button-style="white" label-key="actions_move" icon="icon-enter"
-              action="move()" disabled="actionInProgress" size="xs" add-ellipsis="true">
-            </umb-button>
-
-            <umb-button ng-if="options.allowBulkDelete && (buttonPermissions == null || buttonPermissions.canDelete)"
-              type="button" button-style="white" label-key="actions_delete" icon="icon-trash"
-              action="delete(selection.length, listViewResultSet.items.length)" disabled="actionInProgress" size="xs"
-              add-ellipsis="true">
-            </umb-button>
-          </umb-editor-sub-header-section>
-
-        </umb-editor-sub-header-content-right>
-
-      </umb-editor-sub-header>
-
-      <div class="flex justify-center">
-          <umb-pagination
-             ng-show="listViewResultSet.totalPages"
-             page-number="options.pageNumber"
-             total-pages="listViewResultSet.totalPages"
-             on-next="next"
-             on-prev="prev"
-             on-go-to-page="goToPage">
-          </umb-pagination>
-      </div>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/orderDirection.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/orderDirection.prevalues.html
deleted file mode 100644
index b6028ad5bb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/orderDirection.prevalues.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div>
-    <ng-form name="listViewOrderDirectionForm" class="flex">
-        <ul class="inline">
-            <li class="-no-padding-left">
-                <umb-radiobutton name="orderDirection"
-                                 value="asc"
-                                 model="model.value"
-                                 text="Ascending [a-z]"
-                                 required="true">
-                </umb-radiobutton>
-            </li>
-            <li>
-                <umb-radiobutton name="orderDirection"
-                                 value="desc"
-                                 model="model.value"
-                                 text="Descending [z-a]"
-                                 required="true">
-                </umb-radiobutton>
-            </li>
-        </ul>
-
-        <span ng-messages="listViewOrderDirectionForm.orderDirection.$error" show-validation-on-submit>
-            <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
-        </span>
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/delete.controller.js
deleted file mode 100644
index 85c8b82620..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/delete.controller.js
+++ /dev/null
@@ -1,40 +0,0 @@
-(function () {
-    "use strict";
-
-    function ListViewDeleteController($scope, localizationService) {
-
-        var vm = this;
-        vm.loading = true;
-        vm.disableDelete = false;
-
-        function onInit() {
-            $scope.model.hideSubmitButton = true;
-        }
-
-        vm.checkingReferencesComplete = () => {
-            $scope.model.hideSubmitButton = false;
-        };
-
-        vm.onReferencesWarning = () => {
-            $scope.model.submitButtonStyle = "danger";
-
-            // check if the deletion of items that have references has been disabled
-            if (Umbraco.Sys.ServerVariables.umbracoSettings.disableDeleteWhenReferenced) {
-                // this will only be set to true if we have a warning, indicating that this item or its descendants have reference
-                vm.disableDelete = true;
-                $scope.model.disableSubmitButton = true;
-            }
-
-            localizationService.localize("general_delete").then(function (action) {
-              localizationService.localize("references_listViewDialogWarning", [action.toLowerCase()]).then((value) => {
-                    vm.warningText = value;
-                });
-            });
-        };
-
-        onInit();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Overlays.ListViewDeleteController", ListViewDeleteController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/delete.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/delete.html
deleted file mode 100644
index b137c74260..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/delete.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div ng-controller="Umbraco.Overlays.ListViewDeleteController as vm">
-
-    <p class="abstract" ng-if="!vm.disableDelete">
-        <localize key="defaultdialogs_confirmdeleteNumberOfItems" tokens="[model.numberOfItems, model.totalItems]">Are you sure you want to delete</localize>?
-    </p>
-
-    <umb-tracked-references-bulk-action selection="model.selection" on-loading-complete="vm.checkingReferencesComplete()" hide-no-result="true" compact="true" on-warning="vm.onReferencesWarning()"></umb-tracked-references-listview>
-
-    <div class="abstract umb-alert umb-alert--warning" ng-if="vm.warningText">
-        {{vm.warningText}}
-    </div>
-
-    <div class="umb-alert umb-alert--warning" ng-show="model.deletesVariants && !model.isTrashed">
-        <localize key="defaultdialogs_variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</localize>
-    </div>
-
-    <div class="umb-alert umb-alert--warning" ng-show="model.isTrashed">
-        <localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.controller.js
deleted file mode 100644
index bb34588663..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.controller.js
+++ /dev/null
@@ -1,77 +0,0 @@
-(function () {
-    "use strict";
-
-    function ListViewPublishController($scope, $routeParams, localizationService) {
-
-        var vm = this;
-        vm.loading = true;
-
-        vm.changeSelection = changeSelection;
-        
-        function changeSelection(language) {
-
-            // disable submit button if nothing is selected
-            var firstSelected = _.find(vm.languages, function (language) {
-                return language.publish;
-            });
-
-            $scope.model.disableSubmitButton = !firstSelected;
-
-            //need to set the Save state to true if publish is true
-            language.save = language.publish;
-        }
-
-        function onInit() {
-
-            vm.languages = $scope.model.languages;
-
-            if (!$scope.model.title) {
-                localizationService.localize("content_readyToPublish").then(function (value) {
-                    $scope.model.title = value;
-                });
-            }
-
-            // node has variants
-            if (vm.languages && vm.languages.length > 0) {
-
-                var culture = $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture;
-
-                if(culture) {
-                    
-                    // sort languages so the active on is on top
-                    vm.languages = _.sortBy(vm.languages, function (language) {
-                        return language.culture === culture ? 0 : 1;
-                    });
-                    
-                    var active = _.find(vm.languages, function (language) {
-                        return language.culture === culture;
-                    });
-
-                    if (active) {
-                        //ensure that the current one is selected
-                        active.publish = true;
-                    }
-
-                }
-            }
-
-            vm.loading = false;
-            
-        }
-
-        onInit();
-
-        //when this dialog is closed, reset all 'publish' flags
-        $scope.$on('$destroy', function () {
-            if(vm.languages && vm.languages.length > 0) {
-                for (var i = 0; i < vm.languages.length; i++) {
-                    vm.languages[i].publish = false;
-                    vm.languages[i].save = false;
-                }
-            }
-        });
-    }
-
-    angular.module("umbraco").controller("Umbraco.Overlays.ListViewPublishController", ListViewPublishController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html
deleted file mode 100644
index b6933dffc0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<div ng-controller="Umbraco.Overlays.ListViewPublishController as vm">
-
-        <!-- Single language -->
-        <div ng-if="!vm.languages">
-            <p><localize key="prompt_confirmListViewPublish">Publishing will make the selected items visible on the site.</localize></p>
-        </div>
-
-        <div ng-if="vm.loading" style="min-height: 50px; position: relative;">
-                <umb-load-indicator></umb-load-indicator>
-        </div>
-
-        <!-- Multiple languages -->
-        <div ng-if="vm.languages.length > 1 && !vm.loading">
-
-            <div class="mb3">
-                <p><localize key="content_languagesToPublish">What languages would you like to publish?</localize></p>
-            </div>
-
-            <div class="umb-list umb-list--condensed">
-
-                <div class="bold mb1">
-                    <localize key="treeHeaders_languages">Languages</localize>
-                </div>
-
-                <div class="umb-list-item" ng-repeat="language in vm.languages track by language.id">
-                    <ng-form name="publishLanguageSelectorForm">
-                        <div>
-
-                            <umb-checkbox name="publishLanguageSelector"
-                                          model="language.publish"
-                                          on-change="vm.changeSelection(language)"
-                                          text="{{language.name}}">
-                            </umb-checkbox>
-
-                            <div>
-                                <span class="db umb-list-item__description umb-list-item__description--checkbox">
-                                    <span ng-if="language.isMandatory"><localize key="languages_mandatoryLanguage">Mandatory language</localize></span>
-                                </span>
-                            </div>
-
-                        </div>
-
-                    </ng-form>
-                </div>
-            </div>
-
-        </div>
-
-    </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.controller.js
deleted file mode 100644
index cf432c0318..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.controller.js
+++ /dev/null
@@ -1,106 +0,0 @@
-(function () {
-    "use strict";
-
-    function ListViewUnpublishController($scope, $routeParams, localizationService) {
-
-        var vm = this;
-        vm.loading = true;
-        vm.warningText = null;
-
-        vm.changeSelection = changeSelection;
-        
-        function changeSelection(language) {
-
-            // disable submit button if nothing is selected
-            var firstSelected = _.find(vm.languages, function (language) {
-                return language.unpublish;
-            });
-
-            $scope.model.disableSubmitButton = !firstSelected;
-
-            if (language.isMandatory) {
-                $scope.model.languages.forEach(function (lang) {
-                    if (lang !== language) {
-                        lang.unpublish = true;
-                        lang.disabled = language.unpublish;
-                    }
-                });
-            }
-        }
-
-        function onInit() {
-
-            vm.selection = $scope.model.selection;
-            vm.languages = $scope.model.languages;
-            $scope.model.hideSubmitButton = true;
-
-            if (!$scope.model.title) {
-                localizationService.localize("content_unpublish").then(function (value) {
-                    $scope.model.title = value;
-                });
-            }
-
-            // node has variants
-            if (vm.languages && vm.languages.length > 0) {
-
-                var culture = $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture;
-
-                if(culture) {
-                    
-                    // sort languages so the active on is on top
-                    vm.languages = _.sortBy(vm.languages, function (language) {
-                        return language.culture === culture ? 0 : 1;
-                    });
-                    
-                    var active = _.find(vm.languages, function (language) {
-                        return language.culture === culture;
-                    });
-
-                    if (active) {
-                        //ensure that the current one is selected
-                        active.unpublish = true;
-                        changeSelection(active);
-                    }
-
-                }
-            }
-
-            vm.loading = false;
-        }
-
-        vm.checkingReferencesComplete = () => {
-            $scope.model.hideSubmitButton = false;
-        };
-
-        vm.onReferencesWarning = () => {
-            $scope.model.submitButtonStyle = "danger";
-          
-            // check if the unpublishing of items that have references has been disabled
-            if (Umbraco.Sys.ServerVariables.umbracoSettings.disableUnpublishWhenReferenced) {
-                // this will only be disabled if we have a warning, indicating that this item or its descendants have reference
-                $scope.model.disableSubmitButton = true;
-            }
-
-            localizationService.localize("content_unpublish").then(function (action) {
-                localizationService.localize("references_listViewDialogWarning", [action.toLowerCase()]).then((value) => {
-                    vm.warningText = value;
-                });
-            });
-        };
-
-        onInit();
-
-        //when this dialog is closed, reset all 'publish' flags
-        $scope.$on('$destroy', function () {
-            if(vm.languages && vm.languages.length > 0) {
-                for (var i = 0; i < vm.languages.length; i++) {
-                    vm.languages[i].unpublish = false;
-                    vm.languages[i].save = false;
-                }
-            }
-        });
-    }
-
-    angular.module("umbraco").controller("Umbraco.Overlays.ListViewUnpublishController", ListViewUnpublishController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html
deleted file mode 100644
index 2d255cbb25..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<div ng-controller="Umbraco.Overlays.ListViewUnpublishController as vm">
-
-        <!-- Single language -->
-        <div ng-if="!vm.languages">
-            <p><localize key="prompt_confirmListViewUnpublish">Unpublishing will remove the selected items and all their descendants from the site.</localize></p>
-        </div>
-
-        <div style="margin-top: 15px;">
-            <umb-tracked-references-bulk-action selection="vm.selection" on-loading-complete="vm.checkingReferencesComplete()" hide-no-result="true" compact="true" on-warning="vm.onReferencesWarning()"></umb-tracked-references-listview>
-        </div>
-
-        <div class="abstract umb-alert umb-alert--warning" ng-if="vm.warningText">
-            {{vm.warningText}}
-        </div>
-
-        <div ng-if="vm.loading" style="min-height: 50px; position: relative;">
-                <umb-load-indicator></umb-load-indicator>
-        </div>
-
-        <!-- Multiple languages -->
-        <div ng-if="vm.languages.length > 1 && !vm.loading">
-
-            <div class="mb3">
-                <p><localize key="content_languagesToUnpublish">Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages.</localize></p>
-            </div>
-
-            <div class="umb-list umb-list--condensed">
-
-                <div class="bold mb1">
-                    <localize key="treeHeaders_languages">Languages</localize>
-                </div>
-
-                <div class="umb-list-item" ng-repeat="language in vm.languages track by language.id">
-                    <ng-form name="unpublishLanguageSelectorForm">
-                        <div>
-
-                            <umb-checkbox name="unpublishLanguageSelector"
-                                          model="language.unpublish"
-                                          on-change="vm.changeSelection(language)"
-                                          text="{{language.name}}"
-                                          disabled="language.disabled">
-                            </umb-checkbox>
-
-                            <div>
-                                <span class="db umb-list-item__description umb-list-item__description--checkbox">
-                                    <span ng-if="language.isMandatory"><localize key="languages_mandatoryLanguage">Mandatory language</localize></span>
-                                </span>
-                            </div>
-
-                        </div>
-
-                    </ng-form>
-                </div>
-
-            </div>
-
-        </div>
-
-    </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/removeListViewLayout.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/removeListViewLayout.html
deleted file mode 100644
index 80080a82b0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/removeListViewLayout.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div>
-	<div ng-if="model.layout" class="umb-alert umb-alert--warning mb2">
-		<localize key="defaultdialogs_deleteLayout">You are deleting the layout</localize> <strong>{{model.layout.name}}</strong>.
-	</div>
-
-	<p>
-		<localize key="defaultdialogs_deletingALayout">
-			Modifying layout will result in loss of data for any existing content that is based on this configuration.
-		</localize>
-	</p>
-
-	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>?
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/sortby.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/sortby.prevalues.controller.js
deleted file mode 100644
index dcc4a8ebec..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/sortby.prevalues.controller.js
+++ /dev/null
@@ -1,94 +0,0 @@
-function sortByPreValsController($rootScope, $scope, localizationService, editorState, listViewPrevalueHelper) {
-    //Get the prevalue from the correct place
-    function getPrevalues() {
-        if (editorState.current.preValues) {
-            return editorState.current.preValues;
-        }
-        else {
-            return listViewPrevalueHelper.getPrevalues();
-        }
-    }
-
-    //Watch the prevalues
-    $scope.$watch(function () {
-            return _.findWhere(getPrevalues(), { key: "includeProperties" }).value;
-    }, function () {
-        populateFields();
-    }, true); //Use deep watching, otherwise we won't pick up header changes
-
-    function populateFields() {
-        // Helper to find a particular value from the list of sort by options
-        function findFromSortByFields(value) {
-            return _.find($scope.sortByFields, function (e) {
-                return e.value.toLowerCase() === value.toLowerCase();
-            });
-        }
-
-        // Get list of properties assigned as columns of the list view
-        var propsPreValue = _.findWhere(getPrevalues(), { key: "includeProperties" });
-
-        // Populate list of options for the default sort (all the columns plus then node name)
-        $scope.sortByFields = [];
-        $scope.sortByFields.push({ value: "name", name: "Name", isSystem: 1 });
-        if (propsPreValue != undefined) {
-            for (var i = 0; i < propsPreValue.value.length; i++) {
-                var value = propsPreValue.value[i];
-                $scope.sortByFields.push({
-                    value: value.alias,
-                    name: value.header,
-                    isSystem: value.isSystem
-                });
-            }
-        }
-
-        // Localize the system fields, for some reason the directive doesn't work inside of the select group with an ng-model declared
-	// beware: ensure that GetDatabaseFieldNameForOrderBy knows about those fields!
-        var systemFields = [
-            { value: "SortOrder", key: "general_sort" },
-            { value: "Name", key: "general_name" },
-            { value: "UpdateDate", key: "content_updateDate" },
-            { value: "Updater", key: "content_updatedBy" },
-            { value: "CreateDate", key: "content_createDate" },
-            { value: "Owner", key: "content_createBy" },
-            { value: "ContentTypeAlias", key: "content_documentType" },
-            { value: "Published", key: "content_isPublished" },
-            { value: "Email", key: "general_email" },
-            { value: "Username", key: "general_username" },
-            { value: "failedPasswordAttempts", key: "user_failedPasswordAttempts" },
-            { value: "approved", key: "user_stateApproved" },
-            { value: "lockedOut", key: "user_stateLockedOut" },
-            { value: "lastLockoutDate", key: "user_lastLockoutDate" },
-            { value: "lastLoginDate", key: "user_lastLogin" },
-            { value: "lastPasswordChangeDate", key: "user_lastPasswordChangeDate" }
-        ];
-        _.each(systemFields, function (e) {
-            localizationService.localize(e.key).then(function (v) {
-                var sortByListValue = findFromSortByFields(e.value);
-                if (sortByListValue) {
-                    sortByListValue.name = v;
-                }
-            });
-        });
-
-        _.each($scope.sortByFields, function (sortByField) {
-            if (!sortByField.name) {
-                sortByField.name = "(" + sortByField.value + ")";
-            }
-        });
-
-        // Check existing model value is available in list and ensure a value is set
-        var existingValue = findFromSortByFields($scope.model.value);
-        if (existingValue) {
-            // Set the existing value
-            // The old implementation pre Umbraco 7.5 used PascalCase aliases, this uses camelCase, so this ensures that any previous value is set
-            $scope.model.value = existingValue.value;
-        }
-        else {
-            // Existing value not found, set to first value
-            $scope.model.value = $scope.sortByFields[0].value;
-        }
-    }
-}
-
-
-angular.module("umbraco").controller("Umbraco.PrevalueEditors.SortByListViewController", sortByPreValsController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/sortby.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/sortby.prevalues.html
deleted file mode 100644
index 754afd9b60..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/sortby.prevalues.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<select ng-model="model.value"
-        ng-controller="Umbraco.PrevalueEditors.SortByListViewController"
-        ng-options="field.value as field.name for field in sortByFields">
-</select>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
deleted file mode 100644
index 1c76ba64f4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
+++ /dev/null
@@ -1,106 +0,0 @@
-//inject umbracos assetsServce and dialog service
-function MarkdownEditorController($scope, $element, assetsService, editorService, $timeout) {
-
-    //tell the assets service to load the markdown.editor libs from the markdown editors
-    //plugin folder
-
-    if ($scope.model.value === null || $scope.model.value === "") {
-        $scope.model.value = $scope.model.config.defaultValue;
-    }
-
-    // create a unique ID for the markdown editor, so the button bar bindings can handle split view
-    // - must be bound on scope, not scope.model - otherwise it won't work, because $scope.model is used in both sides of the split view
-    $scope.editorId = $scope.model.alias + _.uniqueId("-");
-
-    function openMediaPicker(callback) {
-        var mediaPicker = {
-            disableFolderSelect: true,
-            submit: function(model) {
-                var selectedImagePath = model.selection[0].image;
-                callback(selectedImagePath);
-                editorService.close();
-            },
-            close: function() {
-                editorService.close();
-            }
-        };
-        editorService.mediaPicker(mediaPicker);
-    }
-
-    function openLinkPicker(callback) {
-
-        const linkPicker = {
-            hideTarget: true,
-            size: $scope.model.config.overlaySize,
-            submit: model => {
-                callback(model.target.url, model.target.name);
-                editorService.close();
-            },
-            close: () => {
-                editorService.close();
-            }
-        };
-
-        editorService.linkPicker(linkPicker);
-    }
-
-    function setDirty() {
-        if ($scope.modelValueForm) {
-            $scope.modelValueForm.modelValue.$setDirty();
-        }
-    }
-
-    assetsService
-        .load([
-            "lib/markdown/markdown.converter.js",
-            "lib/markdown/markdown.sanitizer.js",
-            "lib/markdown/markdown.editor.js"
-        ])
-        .then(function () {
-
-            // we need a short delay to wait for the textbox to appear.
-            setTimeout(function () {
-                //this function will execute when all dependencies have loaded
-                // but in the case that they've been previously loaded, we can only
-                // init the md editor after this digest because the DOM needs to be ready first
-                // so run the init on a timeout
-                $timeout(function () {
-                    $scope.markdownEditorInitComplete = false;
-                    var converter2 = new Markdown.Converter();
-                    var editor2 = new Markdown.Editor(converter2, "-" + $scope.editorId);
-                    editor2.run();
-
-                    //subscribe to the image dialog clicks
-                    editor2.hooks.set("insertImageDialog", function (callback) {
-                        openMediaPicker(callback);
-                        return true; // tell the editor that we'll take care of getting the image url
-                    });
-
-                    //subscribe to the link dialog clicks
-                    editor2.hooks.set("insertLinkDialog", function (callback) {
-                        openLinkPicker(callback);
-                        return true; // tell the editor that we'll take care of getting the link url
-                    });
-
-                    editor2.hooks.set("onPreviewRefresh", function () {
-                        // We must manually update the model as there is no way to hook into the markdown editor events without exstensive edits to the library.
-                        if ($scope.model.value !== $("textarea", $element).val()) {
-                            if ($scope.markdownEditorInitComplete) {
-                                //only set dirty after init load to avoid "unsaved" dialogue when we don't want it
-                                setDirty();
-                            } else {
-                                $scope.markdownEditorInitComplete = true;
-                            }
-                            $scope.model.value = $("textarea", $element).val();
-                        }
-                    });
-
-                }, 200);
-            });
-
-            // HACK: load the separate css for the editor to avoid it blocking our js loading TEMP HACK
-            assetsService.loadCss("lib/markdown/markdown.css", $scope);
-        })
-}
-
-angular.module("umbraco").controller("Umbraco.PropertyEditors.MarkdownEditorController", MarkdownEditorController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.html
deleted file mode 100644
index 0cb617e4c9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="wmd-panel" ng-controller="Umbraco.PropertyEditors.MarkdownEditorController">
-
-    <ng-form name="modelValueForm">
-        <div class="btn-toolbar-container" id="wmd-button-bar-{{editorId}}" ng-attr-readonly="{{ readonly || undefined }}"></div>
-
-        <textarea
-            name="modelValue"
-            class="wmd-input"
-            id="wmd-input-{{editorId}}"
-            ng-model="model.value"
-            ng-required="model.validation.mandatory"
-            ng-readonly="readonly">
-        </textarea>
-
-        <div class="wmd-panel wmd-preview" id="wmd-preview-{{editorId}}" ng-show="model.config.preview"></div>
-    </ng-form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
deleted file mode 100644
index 4389d1d560..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ /dev/null
@@ -1,405 +0,0 @@
-//this controller simply tells the dialogs service to open a mediaPicker window
-//with a specified callback, this callback will receive an object with a selection on it
-angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
-    function ($scope, entityResource, mediaHelper, $timeout, userService, localizationService, editorService, overlayService, clipboardService) {
-
-        const vm = this;
-
-        vm.labels = {};
-        vm.labels.deletedItem = "";
-
-        vm.add = add;
-        vm.remove = remove;
-        vm.copyItem = copyItem;
-        vm.editItem = editItem;
-        vm.showAdd = showAdd;
-
-        vm.mediaItems = [];
-        let selectedIds = [];
-
-        //check the pre-values for multi-picker
-        var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
-        var onlyImages = $scope.model.config.onlyImages && $scope.model.config.onlyImages !== '0' ? true : false;
-        var disableFolderSelect = $scope.model.config.disableFolderSelect && $scope.model.config.disableFolderSelect !== '0' ? true : false;
-
-        $scope.allowEditMedia = false;
-        $scope.allowAddMedia = false;
-        $scope.allowRemoveMedia = !$scope.readonly;
-
-        function setupViewModel() {
-            $scope.isMultiPicker = multiPicker;
-
-            if ($scope.model.value) {
-                var ids = $scope.model.value.split(',');
-
-                //NOTE: We need to use the entityResource NOT the mediaResource here because
-                // the mediaResource has server side auth configured for which the user must have
-                // access to the media section, if they don't they'll get auth errors. The entityResource
-                // acts differently in that it allows access if the user has access to any of the apps that
-                // might require it's use. Therefore we need to use the metaData property to get at the thumbnail
-                // value.
-
-                entityResource.getByIds(ids, "Media").then(function (medias) {
-
-                    // The service only returns item results for ids that exist (deleted items are silently ignored).
-                    // This results in the picked items value to be set to contain only ids of picked items that could actually be found.
-                    // Since a referenced item could potentially be restored later on, instead of changing the selected values here based
-                    // on whether the items exist during a save event - we should keep "placeholder" items for picked items that currently
-                    // could not be fetched. This will preserve references and ensure that the state of an item does not differ depending
-                    // on whether it is simply resaved or not.
-                    // This is done by remapping the int/guid ids into a new array of items, where we create "Deleted item" placeholders
-                    // when there is no match for a selected id. This will ensure that the values being set on save, are the same as before.
-
-                    medias = ids.map(id => {
-                        // We could use coercion (two ='s) here .. but not sure if this works equally well in all browsers and
-                        // it's prone to someone "fixing" it at some point without knowing the effects. Rather use toString()
-                        // compares and be completely sure it works.
-                        var found = medias.find(m => m.udi.toString() === id.toString() || m.id.toString() === id.toString());
-
-                        var mediaItem = found ||
-                        {
-                            name: vm.labels.deletedItem,
-                            id: $scope.model.config.idType !== "udi" ? id : null,
-                            udi: $scope.model.config.idType === "udi" ? id : null,
-                            icon: "icon-picture",
-                            thumbnail: null,
-                            trashed: true
-                        };
-
-                        return mediaItem;
-                    });
-
-                    medias.forEach(media => appendMedia(media));
-
-                    sync();
-                });
-            }
-        }
-
-        function appendMedia(media) {
-            if (!media.extension && media.id && media.metaData) {
-                media.extension = mediaHelper.getFileExtension(media.metaData.MediaPath);
-            }
-
-            // if there is no thumbnail, try getting one if the media is not a placeholder item
-            if (!media.thumbnail && media.id && media.metaData) {
-                media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
-            }
-
-            vm.mediaItems.push(media);
-
-            if ($scope.model.config.idType === "udi") {
-                selectedIds.push(media.udi);
-            } else {
-                selectedIds.push(media.id);
-            }
-        }
-
-        function sync() {
-            $scope.model.value = selectedIds.join();
-            removeAllEntriesAction.isDisabled = selectedIds.length === 0 || !$scope.allowRemoveMedia;
-            copyAllEntriesAction.isDisabled = selectedIds.length === 0;
-        }
-
-        function setDirty() {
-            if (vm.modelValueForm) {
-                vm.modelValueForm.modelValue.$setDirty();
-            }
-        }
-
-        function reloadUpdatedMediaItems(updatedMediaNodes) {
-            // because the images can be edited through the media picker we need to
-            // reload. We only reload the images that is already picked but has been updated.
-            // We have to get the entities from the server because the media
-            // can be edited without being selected
-            vm.mediaItems.forEach(media => {
-                if (updatedMediaNodes.indexOf(media.udi) !== -1) {
-                    media.loading = true;
-                    entityResource.getById(media.udi, "Media")
-                        .then(function (mediaEntity) {
-                            Utilities.extend(media, mediaEntity);
-                            media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
-                            media.loading = false;
-                        });
-                }
-            });
-        }
-
-        function init() {
-
-            // localize labels
-            var labelKeys = [
-                "mediaPicker_deletedItem",
-                "mediaPicker_trashed"
-            ];
-
-            localizationService.localizeMany(labelKeys)
-                .then(function (data) {
-                    vm.labels.deletedItem = data[0];
-                    vm.labels.trashed = data[1];
-
-                    userService.getCurrentUser().then(function (userData) {
-
-                        if (!$scope.model.config.startNodeId) {
-                            if ($scope.model.config.ignoreUserStartNodes === true) {
-                                $scope.model.config.startNodeId = -1;
-                                $scope.model.config.startNodeIsVirtual = true;
-                            }
-                            else {
-                                $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                                $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
-                            }
-                        }
-
-                        // only allow users to add and edit media if they have access to the media section
-                        var hasAccessToMedia = userData.allowedSections.indexOf("media") !== -1;
-                        $scope.allowEditMedia = hasAccessToMedia && !$scope.readonly;
-                        $scope.allowAddMedia = hasAccessToMedia && !$scope.readonly;
-
-                        setupViewModel();
-                    });
-                });
-        }
-
-        function remove(index) {
-            if (!$scope.allowRemoveMedia) return;
-            
-            vm.mediaItems.splice(index, 1);
-            selectedIds.splice(index, 1);
-            sync();
-            setDirty();
-        }
-
-        function copyAllEntries() {
-            if($scope.mediaItems.length > 0) {
-
-                // gather aliases
-                var aliases = $scope.mediaItems.map(mediaEntity => mediaEntity.metaData.ContentTypeAlias);
-
-                // remove duplicate aliases
-                aliases = aliases.filter((item, index) => aliases.indexOf(item) === index);
-
-                var data = $scope.mediaItems.map(mediaEntity => { return {"mediaKey": mediaEntity.key }});
-
-                localizationService.localize("clipboard_labelForArrayOfItems", [$scope.model.label]).then(function(localizedLabel) {
-                    clipboardService.copyArray(clipboardService.TYPES.MEDIA, aliases, data, localizedLabel, "icon-thumbnail-list", $scope.model.id);
-                });
-            }
-        }
-
-        function copyItem(mediaItem) {
-
-            var mediaEntry = {};
-            mediaEntry.mediaKey = mediaItem.key;
-
-            clipboardService.copy(clipboardService.TYPES.MEDIA, mediaItem.metaData.ContentTypeAlias, mediaEntry, mediaItem.name, mediaItem.icon, mediaItem.udi);
-        }
-
-        function pasteFromClipboard(pasteEntry, pasteType) {
-            if (!$scope.readonly) return;
-
-            if (pasteEntry === undefined) {
-                return;
-            }
-
-            pasteEntry = clipboardService.parseContentForPaste(pasteEntry, pasteType);
-
-            entityResource.getById(pasteEntry.mediaKey, "Media").then(function (mediaEntity) {
-
-                if(disableFolderSelect === true && mediaEntity.metaData.ContentTypeAlias === "Folder") {
-                    return;
-                }
-
-                appendMedia(mediaEntity);
-                sync();
-            });
-        }
-
-        function editItem(item) {
-            if (!$scope.allowEditMedia) return;
-
-            var mediaEditor = {
-                id: item.id,
-                submit: function (model) {
-                    editorService.close();
-                    // update the selected media item to match the saved media item
-                    // the media picker is using media entities so we get the
-                    // entity so we easily can format it for use in the media grid
-                    if (model && model.mediaNode) {
-                        entityResource.getById(model.mediaNode.id, "Media")
-                            .then(function (mediaEntity) {
-                                // if an image is selecting more than once
-                                // we need to update all the media items
-                                vm.mediaItems.forEach(media => {
-                                    if (media.id === model.mediaNode.id) {
-                                        Utilities.extend(media, mediaEntity);
-                                        media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
-                                    }
-                                });
-                            });
-                    }
-                },
-                close: function () {
-                    editorService.close();
-                }
-            };
-            editorService.mediaEditor(mediaEditor);
-        }
-
-        function add() {
-            if (!$scope.allowAddMedia) return;
-
-            var mediaPicker = {
-                startNodeId: $scope.model.config.startNodeId,
-                startNodeIsVirtual: $scope.model.config.startNodeIsVirtual,
-                dataTypeKey: $scope.model.dataTypeKey,
-                multiPicker: multiPicker,
-                onlyImages: onlyImages,
-                disableFolderSelect: disableFolderSelect,
-                clickPasteItem: function(item, mouseEvent) {
-                    if (Array.isArray(item.data)) {
-                        var indexIncrementor = 0;
-                        item.data.forEach(function (entry) {
-                            if (pasteFromClipboard(entry, item.type)) {
-                                indexIncrementor++;
-                            }
-                        });
-                    } else {
-                        pasteFromClipboard(item.data, item.type);
-                    }
-                    if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
-                        editorService.close();
-                    }
-                    setDirty();
-                },
-                submit: function (model) {
-
-                    editorService.close();
-
-                    model.selection.forEach(media => {
-                        // if there is no thumbnail, try getting one if the media is not a placeholder item
-                        if (!media.thumbnail && media.id && media.metaData) {
-                            media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
-                        }
-
-                        vm.mediaItems.push(media);
-
-                        if ($scope.model.config.idType === "udi") {
-                            selectedIds.push(media.udi);
-                        }
-                        else {
-                            selectedIds.push(media.id);
-                        }
-
-                    });
-
-                    sync();
-                    reloadUpdatedMediaItems(model.updatedMediaNodes);
-                    setDirty();
-                },
-                close: function (model) {
-                    editorService.close();
-                    reloadUpdatedMediaItems(model.updatedMediaNodes);
-                }
-            }
-
-
-            var allowedTypes = null;
-            if(onlyImages) {
-                allowedTypes = ["Image"]; // Media Type Image Alias.
-            }
-
-            mediaPicker.clickClearClipboard = function ($event) {
-                clipboardService.clearEntriesOfType(clipboardService.TYPES.Media, allowedTypes);
-            };
-
-            mediaPicker.clipboardItems = clipboardService.retrieveEntriesOfType(clipboardService.TYPES.MEDIA, allowedTypes);
-            mediaPicker.clipboardItems.sort( (a, b) => {
-                return b.date - a.date
-            });
-
-            editorService.mediaPicker(mediaPicker);
-        }
-
-        function showAdd() {
-            if (!multiPicker) {
-                if ($scope.model.value && $scope.model.value !== "") {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        function removeAllEntries() {
-            if (!$scope.allowRemoveMedia) return;
-
-            localizationService.localizeMany(["content_nestedContentDeleteAllItems", "general_delete"]).then(function (data) {
-                overlayService.confirmDelete({
-                    title: data[1],
-                    content: data[0],
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        vm.mediaItems.length = 0;// AngularJS way to empty the array.
-                        selectedIds.length = 0;// AngularJS way to empty the array.
-                        sync();
-                        setDirty();
-                        overlayService.close();
-                    }
-                });
-            });
-        }
-
-        let copyAllEntriesAction = {
-            labelKey: "clipboard_labelForCopyAllEntries",
-            labelTokens: ['Media'],
-            icon: "icon-documents",
-            method: copyAllEntries,
-            isDisabled: true,
-            useLegacyIcon: false
-        }
-
-        let removeAllEntriesAction = {
-            labelKey: "clipboard_labelForRemoveAllEntries",
-            labelTokens: [],
-            icon: "icon-trash",
-            method: removeAllEntries,
-            isDisabled: true,
-            useLegacyIcon: false
-        };
-
-        if (multiPicker === true) {
-            var propertyActions = [
-                copyAllEntriesAction,
-                removeAllEntriesAction
-            ];
-
-            if ($scope.umbProperty) {
-                $scope.umbProperty.setPropertyActions(propertyActions);
-            }
-        }
-
-        $scope.sortableOptions = {
-            containment: 'parent',
-            cursor: 'move',
-            tolerance: 'pointer',
-            disabled: !multiPicker || $scope.readonly,
-            items: "li:not(.add-wrapper)",
-            cancel: ".unsortable",
-            update: function () {
-                setDirty();
-                $timeout(function () {
-                    // TODO: Instead of doing this with a timeout would be better to use a watch like we do in the
-                    // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
-                    // watch do all the rest.
-                    selectedIds = vm.mediaItems.map(media => $scope.model.config.idType === "udi" ? media.udi : media.id);
-
-                    sync();
-                });
-            }
-        };
-
-        init();
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
deleted file mode 100644
index eef979bfa8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="umb-property-editor umb-mediapicker" ng-class="{'umb-mediapicker-multi':isMultiPicker, 'umb-mediapicker-single':!isMultiPicker}" ng-controller="Umbraco.PropertyEditors.MediaPickerController as vm">
-
-    <p ng-if="(vm.mediaItems|filter:{trashed:true}).length == 1"><localize key="mediaPicker_pickedTrashedItem">You have picked a media item currently deleted or in the recycle bin</localize></p>
-    <p ng-if="(vm.mediaItems|filter:{trashed:true}).length > 1"><localize key="mediaPicker_pickedTrashedItems">You have picked media items currently deleted or in the recycle bin</localize></p>
-
-    <div data-element="sortable-thumbnails" class="umb-sortable-thumbnails-container error">
-        <ul ui-sortable="sortableOptions" ng-model="vm.mediaItems" class="umb-sortable-thumbnails">
-            <li data-element="sortable-thumbnail-{{$index}}" class="umb-sortable-thumbnails__wrapper" ng-repeat="media in vm.mediaItems track by $index">
-
-                <p class="label label__trashed" ng-if="media.trashed">
-                    <localize key="mediaPicker_trashed">Trashed</localize>
-                    <umb-icon icon="icon-trash"></umb-icon>
-                </p>
-
-                <div ng-if="image.loading" class="umb-sortable-thumbnails__loading">
-                    <div class="umb-button__progress"></div>
-                </div>
-
-                <!-- IMAGE -->
-                <img ng-if="media.thumbnail && media.extension !== 'svg'"
-                     ng-class="{'trashed': media.trashed}" ng-src="{{media.thumbnail}}"
-                     ng-attr-title="{{media.trashed ? (vm.labels.trashed || 'Trashed') + ': ' + media.name : media.name}}"
-                     alt="{{media.name}}" />
-
-                <!-- SVG -->
-                <img ng-if="media.thumbnail && media.extension === 'svg'"
-                     ng-class="{'trashed': media.trashed}" ng-src="{{media.thumbnail}}"
-                     ng-attr-title="{{media.trashed ? (vm.labels.trashed || 'Trashed') + ': ' + media.name : media.name}}"
-                     alt="{{media.name}}" />
-
-                <!-- FILE -->
-                <umb-file-icon ng-hide="media.thumbnail" ng-class="{'trashed': media.trashed}"
-                               extension="{{media.extension}}"
-                               icon="{{media.icon}}"
-                               size="s"
-                               text="{{media.name}}">
-                </umb-file-icon>
-
-                <div class="umb-sortable-thumbnails__actions" data-element="sortable-thumbnail-actions">
-                    <button type="button" aria-label="Edit media" ng-if="allowEditMedia && !media.trashed" class="umb-sortable-thumbnails__action btn-reset" data-element="action-edit" ng-click="vm.editItem(media)">
-                        <umb-icon icon="icon-edit" class="icon"></umb-icon>
-                    </button>
-                    <button ng-if="allowRemoveMedia" type="button" aria-label="Remove" class="umb-sortable-thumbnails__action -red btn-reset" data-element="action-remove" ng-click="vm.remove($index)">
-                        <umb-icon icon="icon-delete" class="icon"></umb-icon>
-                    </button>
-                </div>
-            </li>
-            <li style="border: none;" class="add-wrapper unsortable" ng-if="vm.showAdd() && allowAddMedia">
-                <button type="button" aria-label="Open media picker" data-element="sortable-thumbnails-add" class="add-link btn-reset umb-outline umb-outline--surrounding" ng-click="vm.add()" ng-class="{'add-link-square': (vm.mediaItems.length === 0 || isMultiPicker)}">
-                    <umb-icon icon="icon-add" class="icon large"></umb-icon>
-                </button>
-            </li>
-        </ul>
-    </div>
-
-    <ng-form name="vm.modelValueForm">
-        <input type="hidden" name="modelValue" ng-model="vm.mediaItems.length" ng-required="model.validation.mandatory && !vm.mediaItems.length" />
-    </ng-form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/mediapicker3.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/mediapicker3.html
deleted file mode 100644
index 36e3e246b2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/mediapicker3.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<umb-media-picker3-property-editor
-  model="model"
-  node="node"
-  ng-attr-readonly="{{ readonly || undefined }}">
-</umb-media-picker3-property-editor>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/prevalue/mediapicker3.crops.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/prevalue/mediapicker3.crops.controller.js
deleted file mode 100644
index b26c6f8549..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/prevalue/mediapicker3.crops.controller.js
+++ /dev/null
@@ -1,120 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PropertyEditors.MediaPicker3.CropConfigurationController",
-	function ($scope) {
-
-        var unsubscribe = [];
-
-	    if (!$scope.model.value) {
-	        $scope.model.value = [];
-	    }
-
-        $scope.setFocus = false;
-
-	    $scope.remove = function (crop, evt) {
-	        evt.preventDefault();
-	        const i = $scope.model.value.indexOf(crop);
-            if (i > -1) {
-                $scope.model.value.splice(i, 1);
-            }
-	    };
-
-	    $scope.edit = function (crop, evt) {
-            evt.preventDefault();
-            crop.editMode = true;
-	    };
-
-        $scope.addNewCrop = function (evt) {
-            evt.preventDefault();
-
-            var crop = {};
-            crop.editMode = true;
-
-            $scope.model.value.push(crop);
-            $scope.validate(crop);
-        };
-
-        $scope.setChanges = function (crop) {
-            $scope.validate(crop);
-            if(
-                crop.hasWidthError !== true &&
-                crop.hasHeightError !== true &&
-                crop.hasAliasError !== true
-            ) {
-                crop.editMode = false;
-                window.dispatchEvent(new Event('resize.umbImageGravity'));
-            }
-        };
-
-        $scope.isEmpty = function (crop) {
-            return !crop.label && !crop.alias && !crop.width && !crop.height;
-        };
-
-        $scope.useForAlias = function (crop) {
-            if (crop.alias == null || crop.alias === "") {
-                crop.alias = (crop.label || "").toCamelCase();
-            }
-        };
-
-        $scope.validate = function (crop) {
-            $scope.validateWidth(crop);
-            $scope.validateHeight(crop);
-            $scope.validateAlias(crop);
-        };
-
-        $scope.validateWidth = function (crop) {
-            crop.hasWidthError = !(Utilities.isNumber(crop.width) && crop.width > 0);
-        };
-
-        $scope.validateHeight = function (crop) {
-            crop.hasHeightError = !(Utilities.isNumber(crop.height) && crop.height > 0);
-        };
-
-        $scope.validateAlias = function (crop, $event) {
-            var exists = $scope.model.value.find( x => crop !== x && crop.alias === x.alias);
-            if (exists !== undefined || crop.alias === "") {
-                // alias is not valid
-                crop.hasAliasError = true;
-            } else {
-                // everything was good:
-                crop.hasAliasError = false;
-            }
-        };
-
-        $scope.confirmChanges = function (crop, event) {
-            if (event.keyCode == 13) {
-                $scope.setChanges(crop, event);
-                event.preventDefault();
-            }
-        };
-
-        $scope.focusNextField = function (event) {
-            if (event.keyCode == 13) {
-
-                var el = event.target;
-
-                var inputs = Array.from(document.querySelectorAll("input:not(disabled)"));
-                var inputIndex = inputs.indexOf(el);
-                if (inputIndex > -1) {
-                    var nextIndex = inputs.indexOf(el) +1;
-
-                    if(inputs.length > nextIndex) {
-                        inputs[nextIndex].focus();
-                        event.preventDefault();
-                    }
-                }
-            }
-        };
-
-        $scope.sortableOptions = {
-            axis: 'y',
-            containment: 'parent',
-            cursor: 'move',
-            tolerance: 'pointer'
-        };
-
-        $scope.$on("$destroy", function () {
-            for (const subscription of unsubscribe) {
-                subscription();
-            }
-        });
-
-	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/prevalue/mediapicker3.crops.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/prevalue/mediapicker3.crops.html
deleted file mode 100644
index de7e7b1767..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/prevalue/mediapicker3.crops.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.MediaPicker3.CropConfigurationController as vm" class="umb-property-editor umb-mediapicker3-crops">
-
-    <div class="umb-table">
-        <div class="umb-table-head">
-            <div class="umb-table-row">
-                <div class="umb-table-cell not-fixed">
-                    <localize key="general_label">Label</localize>
-                </div>
-                <div class="umb-table-cell">
-                    <localize key="general_alias">Alias</localize>
-                </div>
-                <div class="umb-table-cell">
-                    <localize key="general_width">Width</localize>
-                </div>
-                <div class="umb-table-cell">
-                    <localize key="general_height">Height</localize>
-                </div>
-                <div class="umb-table-cell">
-                    <localize key="general_actions">Actions</localize>
-                </div>
-            </div>
-        </div>
-        <div class="umb-table-body" ui-sortable="sortableOptions" ng-model="model.value">
-
-            <div class="umb-table-row" ng-repeat="crop in model.value">
-
-                <div ng-if="crop.editMode !== true" class="umb-table-cell not-fixed">{{crop.label}}</div>
-                <div ng-if="crop.editMode !== true" class="umb-table-cell">{{crop.alias}}</div>
-                <div ng-if="crop.editMode !== true" class="umb-table-cell">{{crop.width}}px</div>
-                <div ng-if="crop.editMode !== true" class="umb-table-cell">{{crop.height}}px</div>
-                <div ng-if="crop.editMode !== true" class="umb-table-cell">
-                    <button type="button" class="btn-reset umb-outline umb-outline--surrounding" ng-click="edit(crop, $event)"><localize key="general_edit">Edit</localize></button>
-                    <button type="button" class="btn-reset umb-outline umb-outline--surrounding" ng-click="remove(crop, $event)"><localize key="general_remove">Remove</localize></button>
-                </div>
-
-                <div ng-if="crop.editMode === true" class="umb-table-cell not-fixed">
-                    <input type="text"
-                        ng-model="crop.label"
-                        localize="placeholder"
-                        placeholder="@general_label"
-                        required
-                        focus-when="{{crop.editMode === true}}"
-                        ng-keydown="focusNextField($event)"
-                        ng-blur="useForAlias(crop)"
-                        overlay-submit-on-enter="false"/>
-                </div>
-
-                <div ng-if="crop.editMode === true" class="umb-table-cell">
-                    <input type="text"
-                        ng-model="crop.alias"
-                        localize="placeholder"
-                        placeholder="@general_alias"
-                        valid-when="{{!crop.hasAliasError}}"
-                        required
-                        ng-keydown="focusNextField($event)"
-                        ng-blur="validateAlias(crop)"
-                        ng-change="validateAlias(crop)" />
-                </div>
-
-                <div ng-if="crop.editMode === true" class="umb-table-cell">
-                    <input type="number"
-                        ng-model="crop.width"
-                        localize="placeholder"
-                        placeholder="@general_width"
-                        required
-                        min="0"
-                        pattern="[0-9]*"
-                        ng-keydown="focusNextField($event)"
-                        ng-change="validateWidth(crop)" />
-                </div>
-
-                <div ng-if="crop.editMode === true" class="umb-table-cell">
-                    <input type="number"
-                        ng-model="crop.height"
-                        localize="placeholder"
-                        placeholder="@general_height"
-                        required
-                        min="0"
-                        pattern="[0-9]*"
-                        ng-keydown="confirmChanges(crop, $event)"
-                        ng-change="validateHeight(crop)" />
-                </div>
-                <div ng-if="crop.editMode === true" class="umb-table-cell">
-                    <button type="button" class="btn-reset umb-outline umb-outline--surrounding" ng-click="setChanges(crop, $event)"><localize key="general_submit">Submit</localize></button>
-                    <button type="button" class="btn-reset umb-outline umb-outline--surrounding" ng-click="remove(crop, $event)" ng-if="isEmpty(crop)"><localize key="general_cancel">Cancel</localize></button>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-    <button type="button" class="btn-reset umb-mediapicker3-crops__add umb-outline" ng-click="addNewCrop($event)" aria-hidden="false">
-		<localize key="general_add" class="ng-isolate-scope">Add</localize>
-	</button>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/prevalue/mediapicker3.crops.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/prevalue/mediapicker3.crops.less
deleted file mode 100644
index 5f5a2d4689..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/prevalue/mediapicker3.crops.less
+++ /dev/null
@@ -1,40 +0,0 @@
-.umb-mediapicker3-crops {
-
-    input.ng-invalid.ng-touched {
-        border-color:@formErrorBorder;
-        color:@formErrorBorder
-    }
-
-    .umb-table button {
-        position: relative;
-        color: @ui-action-discreet-type;
-        margin-right: 10px;
-        font-size: 14px;
-        &:hover {
-            color: @ui-action-discreet-type-hover;
-        }
-    }
-
-}
-
-.umb-mediapicker3-crops__add {
-
-    margin-top:10px;
-    
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background: transparent;
-    border: 1px dashed @ui-action-discreet-border;
-    color: @ui-action-discreet-type;
-    font-weight: bold;
-    padding: 5px 15px;
-    box-sizing: border-box;
-    width: 100%;
-}
-
-.umb-mediapicker3-crops__add:hover {
-    color: @ui-action-discreet-type-hover;
-    border-color: @ui-action-discreet-border-hover;
-    text-decoration: none;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html
deleted file mode 100644
index d5cad18630..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<div class="umb-mediapicker3">
-
-    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-    <div
-        class="dropzone"
-        ngf-drop
-        ngf-change="vm.handleFiles($files, $invalidFiles)"
-        ngf-drag-over-class="'drag-over'"
-        ngf-multiple="{{vm.model.config.multiple}}"
-        ngf-allow-dir="{{ vm.allowDir }}"
-        ngf-drop-disabled="{{!vm.allowDropMedia}}"
-        ng-disabled="vm.readonly">
-
-        <div class="drop-overlay">
-            <localize key="media_dragAndDropYourFilesIntoTheArea"></localize>
-        </div>
-
-        <div class="umb-media-card-grid" ng-class="{'--singleMode':(vm.validationLimit.max === 1 && vm.model.value.length <= 1)}">
-
-            <div style="display:contents;" ui-sortable="vm.sortableOptions" ng-model="vm.model.value" ng-if="vm.loading !== true">
-
-                <div ng-repeat="media in vm.model.value track by media.key" class="umb-media-card-grid__cell">
-
-                    <button type="button"
-                            ng-if="vm.loading !== true && vm.allowAdd && ((vm.singleMode === true && vm.model.value.length === 0) || vm.singleMode === false)"
-                            class="btn-reset umb-media-card-grid--inline-create-button"
-                            ng-click="vm.addMediaAt($index, $event)"
-                            ng-controller="Umbraco.PropertyEditors.MediaPicker3PropertyEditor.CreateButtonController as inlineCreateButtonCtrl"
-                            ng-mousemove="inlineCreateButtonCtrl.onMouseMove($event)"
-                            ng-disabled="!vm.allowAddMedia">
-                            <div class="__plus" ng-style="{'top':inlineCreateButtonCtrl.plusPosY}">
-                                <umb-icon icon="icon-add" class="icon"></umb-icon>
-                            </div>
-                    </button>
-
-                    <div ng-if="!media.mediaKey" class="umb-media-card">
-                        <div class="__showcase">
-
-                            <div ng-if="media.$uploadProgress < 100" class="__upload-progress-container">
-                                <div class="__upload-progress">
-                                    <umb-progress-bar class="__upload-progress-bar" percentage="{{media.$uploadProgress}}"></umb-progress-bar>
-                                    <div class="__upload-progress-label" ng-if="media.$uploadProgress === 0">Waiting...</div>
-                                    <div class="__upload-progress-label" ng-if="media.$uploadProgress > 0">{{media.$uploadProgress}}%</div>
-                                </div>
-                            </div>
-
-                            <img
-                                ng-if="media.$dataURL"
-                                ng-src="{{media.$dataURL}}"
-                                title="{{media.name}}"
-                                alt="{{media.name}}"
-                                draggable="false" />
-
-                            <umb-file-icon ng-if="!media.$dataURL && media.$icon"
-                                icon="{{media.$icon}}"
-                                size="s"
-                                text="{{media.name}}"
-                                extension="{{media.$extension}}">
-                            </umb-file-icon>
-
-                            <button
-                                type="button"
-                                class="btn-reset __info"
-                                ng-click="vm.editMedia(media, $index, $event)"
-                                ng-disabled="media.$uploadProgress < 100">
-                                <div class="__name" ng-bind="media.name"></div>
-                            </button>
-
-                            <div class="__actions">
-                                <button
-                                    ng-if="vm.allowRemoveMedia"
-                                    type="button" class="btn-reset __action umb-outline"
-                                    localize="title"
-                                    title="general_remove"
-                                    ng-click="vm.removeMedia(media); $event.stopPropagation();"
-                                    ng-disabled="media.$uploadProgress < 100">
-                                    <umb-icon icon="icon-trash" class="icon"></umb-icon>
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-
-                    <umb-media-card
-                        ng-if="media.mediaKey"
-                        media-key="media.mediaKey"
-                        on-name-clicked="vm.editMedia(media, $index, $event)"
-                        ng-class="{'--active': vm.activeMediaEntry === media}"
-                        has-error="vm.propertyForm.maxCount.$valid === false && $index >= vm.validationLimit.max"
-                        allowed-types="vm.allowedTypes">
-                        <div class="__actions">
-                            <button ng-if="vm.supportCopy" type="button" class="btn-reset __action umb-outline" localize="title" title="actions_copy" ng-click="vm.copyMedia(media); $event.stopPropagation();">
-                                <umb-icon icon="icon-documents" class="icon"></umb-icon>
-                            </button>
-                            <button ng-if="vm.allowRemoveMedia" type="button" class="btn-reset __action umb-outline" localize="title" title="general_remove" ng-click="vm.removeMedia(media); $event.stopPropagation();">
-                                <umb-icon icon="icon-trash" class="icon"></umb-icon>
-                            </button>
-                        </div>
-                    </umb-media-card>
-
-                </div>
-            </div>
-
-            <button ng-if="vm.loading !== true && ((vm.singleMode === true && vm.model.value.length === 0) || vm.singleMode !== true)"
-                    id="button_{{vm.model.alias}}"
-                    type="button"
-                    class="btn-reset umb-media-card-grid__create-button umb-outline"
-                    ng-disabled="!vm.allowAddMedia"
-                    ng-click="vm.addMediaAt(vm.model.value.length, $event)">
-                    <div>
-                        <umb-icon icon="icon-add" class="icon large"></umb-icon>
-                        <localize key="general_add">Add</localize>
-                    </div>
-            </button>
-
-        </div>
-    </div>
-
-    <div class="help" ng-repeat="invalidEntry in vm.invalidEntries track by invalidEntry.key">
-        <span>{{ invalidEntry.name }}</span>
-        <span ng-if="invalidEntry.error" class="text-error">{{ invalidEntry.errorText }}</span>
-    </div>
-
-    <input type="hidden" name="modelValue" ng-model="vm.model.value" val-server="value" />
-    <input type="hidden" name="minCount" ng-model="vm.model.value" val-server="minCount" />
-    <input type="hidden" name="maxCount" ng-model="vm.model.value" val-server="maxCount" />
-
-    <div ng-messages="vm.propertyForm.minCount.$error">
-        <div class="help text-error" ng-message="minCount">
-            <localize key="validation_entriesShort" tokens="[vm.validationLimit.min, vm.validationLimit.min - vm.model.value.length]" watch-tokens="true">Minimum %0% entries, needs <strong>%1%</strong> more.</localize>
-        </div>
-        <span class="help-inline" ng-message="valServer" ng-bind-html="vm.propertyForm.minCount.errorMsg">></span>
-    </div>
-    <div ng-messages="vm.propertyForm.maxCount.$error">
-        <div class="help text-error" ng-message="maxCount">
-            <localize key="validation_entriesExceed" tokens="[vm.validationLimit.max, vm.model.value.length - vm.validationLimit.max]" watch-tokens="true">Maximum %0% entries, <strong>%1%</strong> too many.</localize>
-        </div>
-        <span class="help-inline" ng-message="valServer" ng-bind-html="vm.propertyForm.maxCount.errorMsg"></span>
-    </div>
-
-    <ng-form name="vm.modelValueForm">
-        <input type="hidden" name="modelValue" ng-model="vm.model.value.length" ng-required="vm.model.validation.mandatory && vm.model.value.length === 0" />
-    </ng-form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.less
deleted file mode 100644
index 7f3af3aaa5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.less
+++ /dev/null
@@ -1,58 +0,0 @@
-.umb-mediapicker3 {
-    .umb-property-editor--limit-width();
-
-    .umb-media-card-grid {
-        padding: 20px;
-        border: 1px solid @inputBorder;
-        box-sizing: border-box;
-
-        &.--singleMode {
-            max-width: 202px;
-        }
-    }
-}
-
-umb-media-picker3-property-editor[readonly] {
-    .umb-mediapicker3 {
-        .umb-media-card-grid {
-            border-color: @inputReadonlyBorderColor;
-        }
-    }
-}
-
-.umb-mediapicker3 {
-    .dropzone {
-        position: relative;
-    
-        .drop-overlay {
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
-            position: absolute;
-            box-sizing: border-box;
-            width: 100%;
-            height: 100%;
-            padding: 12px;
-            background-color: rgba(27,38,79,.2);
-            z-index: 1;
-            backdrop-filter: blur(0px);
-            opacity: 0;
-            pointer-events: none;
-            transition: backdrop-filter 200ms ease-in-out, opacity 200ms ease-in-out;
-            margin: -1px;
-        }
-        
-        &.drag-over {
-            .drop-overlay {
-                backdrop-filter: blur(2px);
-                opacity: 1;
-                pointer-events: all;
-                border: 2px solid @blueExtraDark;
-            }
-        }
-    };
-}
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.component.js
deleted file mode 100644
index 59b798c532..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.component.js
+++ /dev/null
@@ -1,554 +0,0 @@
-(function () {
-    "use strict";
-
-
-    /**
-     * @ngdoc directive
-     * @name umbraco.directives.directive:umbMediaPicker3PropertyEditor
-     * @function
-     *
-     * @description
-     * The component for the Media Picker property editor.
-     */
-    angular
-        .module("umbraco")
-        .component("umbMediaPicker3PropertyEditor", {
-            templateUrl: "views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html",
-            controller: MediaPicker3Controller,
-            controllerAs: "vm",
-            bindings: {
-                model: "=",
-                node: "="
-            },
-            require: {
-                propertyForm: "^form",
-                umbProperty: "?^umbProperty",
-                umbVariantContent: '?^^umbVariantContent',
-                umbVariantContentEditors: '?^^umbVariantContentEditors',
-                umbElementEditorContent: '?^^umbElementEditorContent'
-            }
-        });
-
-    function MediaPicker3Controller($scope, $element, editorService, clipboardService, localizationService, overlayService, userService, entityResource, $attrs, umbRequestHelper, $injector, uploadTracker, editorState) {
-
-        const mediaUploader = $injector.instantiate(Utilities.MediaUploader);
-        let uploadInProgress = false;
-
-        var unsubscribe = [];
-
-        // Property actions:
-        let copyAllMediasAction = null;
-        let removeAllMediasAction = null;
-
-        var vm = this;
-
-        vm.loading = true;
-
-        vm.activeMediaEntry = null;
-        vm.supportCopy = clipboardService.isSupported();
-
-        vm.allowAddMedia = true;
-        vm.allowRemoveMedia = true;
-        vm.allowEditMedia = true;
-        vm.allowDropMedia = true;
-
-        vm.handleFiles = handleFiles;
-
-        vm.invalidEntries = [];
-
-        vm.addMediaAt = addMediaAt;
-        vm.editMedia = editMedia;
-        vm.removeMedia = removeMedia;
-        vm.copyMedia = copyMedia;
-        vm.allowDir = true;
-
-        vm.labels = {};
-
-        localizationService.localizeMany(["grid_addElement", "content_createEmpty"]).then(function (data) {
-            vm.labels.grid_addElement = data[0];
-            vm.labels.content_createEmpty = data[1];
-        });
-
-        $attrs.$observe('readonly', (value) => {
-            vm.readonly = value !== undefined;
-
-            vm.allowAddMedia = !vm.readonly;
-            vm.allowRemoveMedia = !vm.readonly;
-            vm.allowEditMedia = !vm.readonly;
-            vm.allowDropMedia = !vm.readonly;
-
-            vm.sortableOptions.disabled = vm.readonly || vm.singleMode;
-        });
-
-      vm.$onInit = function() {
-            vm.node = vm.node || editorState.getCurrent();
-
-            // If we do not have a node on the scope, then disallow drop media
-            if (!vm.node?.key) {
-              console.warn('An Umbraco.MediaPicker3 did not detect a valid content node and disabled drag & drop.', $element[0]);
-              vm.allowDropMedia = false;
-            }
-
-            vm.validationLimit = vm.model.config.validationLimit || {};
-            // If single-mode we only allow 1 item as the maximum:
-            if (vm.model.config.multiple === false) {
-                vm.validationLimit.max = 1;
-            }
-            vm.model.config.crops = vm.model.config.crops || [];
-            vm.singleMode = vm.validationLimit.max === 1;
-            vm.allowedTypes = vm.model.config.filter ? vm.model.config.filter.split(",") : null;
-
-            const uploaderOptions = {
-                uploadURL: umbRequestHelper.getApiUrl("mediaPickerThreeBaseUrl", "uploadMedia"),
-                allowedMediaTypeAliases: vm.allowedTypes
-            };
-
-            unsubscribe.push(mediaUploader.on('mediaEntryAccepted', _handleMediaEntryAccepted));
-            unsubscribe.push(mediaUploader.on('mediaEntryRejected', _handleMediaEntryRejected));
-            unsubscribe.push(mediaUploader.on('queueStarted', _handleMediaQueueStarted));
-            unsubscribe.push(mediaUploader.on('uploadSuccess', _handleMediaUploadSuccess));
-            unsubscribe.push(mediaUploader.on('queueCompleted', _handleMediaQueueCompleted));
-
-            vm.sortableOptions = {
-                cursor: "grabbing",
-                handle: "umb-media-card, .umb-media-card",
-                cancel: "input,textarea,select,option",
-                classes: ".umb-media-card--dragging",
-                distance: 5,
-                tolerance: "pointer",
-                scroll: true,
-                disabled: vm.readonly || vm.singleMode,
-                update: function (ev, ui) {
-                  setDirty();
-                }
-            };
-
-            copyAllMediasAction = {
-                labelKey: "clipboard_labelForCopyAllEntries",
-                labelTokens: [vm.model.label],
-                icon: "icon-documents",
-                method: requestCopyAllMedias,
-                isDisabled: true,
-                useLegacyIcon: false
-            };
-
-            removeAllMediasAction = {
-                labelKey: "clipboard_labelForRemoveAllEntries",
-                labelTokens: [],
-                icon: "icon-trash",
-                method: requestRemoveAllMedia,
-                isDisabled: true,
-                useLegacyIcon: false
-            };
-
-            var propertyActions = [];
-            if(vm.supportCopy) {
-                propertyActions.push(copyAllMediasAction);
-            }
-            propertyActions.push(removeAllMediasAction);
-
-            if (vm.umbProperty) {
-                vm.umbProperty.setPropertyActions(propertyActions);
-            }
-
-            if (vm.model.value === null || !Array.isArray(vm.model.value)) {
-                vm.model.value = [];
-            }
-
-            vm.model.value.forEach(mediaEntry => updateMediaEntryData(mediaEntry));
-
-            // set the onValueChanged callback, this will tell us if the media picker model changed on the server
-            // once the data is submitted. If so we need to re-initialize
-            vm.model.onValueChanged = onServerValueChanged;
-
-            userService.getCurrentUser().then(function (userData) {
-
-                if (!vm.model.config.startNodeId) {
-                    if (vm.model.config.ignoreUserStartNodes === true) {
-                        vm.model.config.startNodeId = -1;
-                        vm.model.config.startNodeIsVirtual = true;
-                    } else {
-                        vm.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                        vm.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
-                    }
-                }
-
-                // only allow users to add and edit media if they have access to the media section
-                var hasAccessToMedia = userData.allowedSections.indexOf("media") !== -1;
-                vm.allowEdit = hasAccessToMedia;
-                vm.allowAdd = hasAccessToMedia;
-
-                mediaUploader.init(uploaderOptions).then(() => {
-                  vm.loading = false;
-                  $scope.$apply();
-                });
-            });
-        };
-
-        function handleFiles (files, invalidFiles) {
-            if (vm.readonly) return;
-            const allFiles = [...files, ...invalidFiles];
-            mediaUploader.requestUpload(allFiles);
-        };
-
-        function _handleMediaEntryAccepted (event, data) {
-            vm.model.value.push(data.mediaEntry);
-            setDirty();
-        }
-
-        function _handleMediaEntryRejected (event, data) {
-            // we need to make sure the media entry hasn't been accepted earlier in process
-            const index = vm.model.value.findIndex(mediaEntry => mediaEntry.key === data.mediaEntry.key);
-            if (index !== -1) {
-                vm.model.value.splice(index, 1);
-            }
-            vm.invalidEntries.push(data.mediaEntry);
-            setDirty();
-        }
-
-        function _handleMediaUploadSuccess (event, data) {
-            const mediaEntry = vm.model.value.find(mediaEntry => mediaEntry.key === data.mediaEntry.key);
-            if (!mediaEntry) return;
-
-            mediaEntry.tmpLocation = data.tmpLocation;
-            updateMediaEntryData(mediaEntry);
-        }
-
-        function _handleMediaQueueStarted () {
-            uploadInProgress = true;
-            uploadTracker.uploadStarted(vm.node.key);
-        }
-
-        function _handleMediaQueueCompleted () {
-            uploadInProgress = false;
-            uploadTracker.uploadEnded(vm.node.key);
-        }
-
-        function onServerValueChanged(newVal, oldVal) {
-            if(newVal === null || !Array.isArray(newVal)) {
-                newVal = [];
-                vm.model.value = newVal;
-            }
-
-            vm.model.value.forEach(mediaEntry => updateMediaEntryData(mediaEntry));
-        }
-
-        function setDirty() {
-            if (vm.propertyForm) {
-                vm.propertyForm.$setDirty();
-            }
-
-            if (vm.modelValueForm) {
-                vm.modelValueForm.modelValue.$setDirty();
-            }
-        }
-
-        function addMediaAt(createIndex, $event) {
-            if (!vm.allowAddMedia) return;
-
-            const mediaPicker = {
-                startNodeId: vm.model.config.startNodeId,
-                startNodeIsVirtual: vm.model.config.startNodeIsVirtual,
-                dataTypeKey: vm.model.dataTypeKey,
-                multiPicker: vm.singleMode !== true,
-                clickPasteItem: function(item, mouseEvent) {
-
-                    if (Array.isArray(item.data)) {
-                        var indexIncrementor = 0;
-                        item.data.forEach(function (entry) {
-                            if (requestPasteFromClipboard(createIndex + indexIncrementor, entry, item.type)) {
-                                indexIncrementor++;
-                            }
-                        });
-                    } else {
-                        requestPasteFromClipboard(createIndex, item.data, item.type);
-                    }
-                    if (!(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
-                        mediaPicker.close();
-                    }
-                },
-                submit: function (model) {
-                    editorService.close();
-
-                    var indexIncrementor = 0;
-                    model.selection.forEach((entry) => {
-                        var mediaEntry = {};
-                        mediaEntry.key = String.CreateGuid();
-                        mediaEntry.mediaKey = entry.key;
-                        updateMediaEntryData(mediaEntry);
-                        vm.model.value.splice(createIndex + indexIncrementor, 0, mediaEntry);
-                        indexIncrementor++;
-                    });
-
-                    setDirty();
-                },
-                close: function () {
-                    editorService.close();
-                }
-            }
-
-            if (vm.model.config.filter) {
-                mediaPicker.filter = vm.model.config.filter;
-            }
-
-            mediaPicker.clickClearClipboard = function ($event) {
-                clipboardService.clearEntriesOfType(clipboardService.TYPES.Media, vm.allowedTypes || null);
-            };
-
-            mediaPicker.clipboardItems = clipboardService.retrieveEntriesOfType(clipboardService.TYPES.MEDIA, vm.allowedTypes || null);
-            mediaPicker.clipboardItems.sort((a, b) => {
-                return b.date - a.date
-            });
-
-            editorService.mediaPicker(mediaPicker);
-        }
-
-        // To be used by infinite editor. (defined here cause we need configuration from property editor)
-        function changeMediaFor(mediaEntry, onSuccess) {
-            if (!vm.allowAddMedia) return;
-
-            var mediaPicker = {
-                startNodeId: vm.model.config.startNodeId,
-                startNodeIsVirtual: vm.model.config.startNodeIsVirtual,
-                dataTypeKey: vm.model.dataTypeKey,
-                multiPicker: false,
-                submit: function (model) {
-                    editorService.close();
-
-                    model.selection.forEach((entry) => {// only one.
-                        mediaEntry.mediaKey = entry.key;
-                    });
-
-                    // reset focal and crops:
-                    mediaEntry.crops = null;
-                    mediaEntry.focalPoint = null;
-                    updateMediaEntryData(mediaEntry);
-
-                    if (onSuccess) {
-                        onSuccess();
-                    }
-
-                    setDirty();
-                },
-                close: function () {
-                    editorService.close();
-                }
-            };
-
-            if (vm.model.config.filter) {
-                mediaPicker.filter = vm.model.config.filter;
-            }
-
-            editorService.mediaPicker(mediaPicker);
-        }
-
-        function resetCrop(cropEntry) {
-            if (!vm.allowEditMedia) return;
-
-            Object.assign(cropEntry, vm.model.config.crops.find( c => c.alias === cropEntry.alias));
-            cropEntry.coordinates = null;
-            setDirty();
-        }
-
-        function updateMediaEntryData(mediaEntry) {
-            if (!vm.allowEditMedia) return;
-
-            mediaEntry.crops = mediaEntry.crops || [];
-            mediaEntry.focalPoint = mediaEntry.focalPoint || {
-                left: 0.5,
-                top: 0.5
-            };
-
-            // Copy config and only transfer coordinates.
-            var newCrops = Utilities.copy(vm.model.config.crops);
-            newCrops.forEach(crop => {
-                var oldCrop = mediaEntry.crops.filter(x => x.alias === crop.alias).shift();
-                if (oldCrop && oldCrop.height === crop.height && oldCrop.width === crop.width) {
-                    crop.coordinates = oldCrop.coordinates;
-                }
-            });
-            mediaEntry.crops = newCrops;
-        }
-
-        function removeMedia(media) {
-            if (!vm.allowRemoveMedia) return;
-
-            var index = vm.model.value.indexOf(media);
-            if (index !== -1) {
-                vm.model.value.splice(index, 1);
-            }
-
-            setDirty();
-        }
-
-        function deleteAllMedias() {
-            if (!vm.allowRemoveMedia) return;
-
-            vm.model.value = [];
-            setDirty();
-        }
-
-        function setActiveMedia(mediaEntryOrNull) {
-            vm.activeMediaEntry = mediaEntryOrNull;
-        }
-
-        function editMedia(mediaEntry, options, $event) {
-            if (!vm.allowEditMedia) return;
-
-            if($event)
-            $event.stopPropagation();
-
-            options = options || {};
-
-            setActiveMedia(mediaEntry);
-
-            var documentInfo = getDocumentNameAndIcon();
-
-            // make a clone to avoid editing model directly.
-            var mediaEntryClone = Utilities.copy(mediaEntry);
-
-            const mediaEditorModel = {
-                $parentScope: $scope, // pass in a $parentScope, this maintains the scope inheritance in infinite editing
-                $parentForm: vm.propertyForm, // pass in a $parentForm, this maintains the FormController hierarchy with the infinite editing view (if it contains a form)
-                createFlow: options.createFlow === true,
-                documentName: documentInfo.name,
-                mediaEntry: mediaEntryClone,
-                propertyEditor: {
-                    changeMediaFor: changeMediaFor,
-                    resetCrop: resetCrop
-                },
-                enableFocalPointSetter: vm.model.config.enableLocalFocalPoint || false,
-                view: "views/common/infiniteeditors/mediaentryeditor/mediaentryeditor.html",
-                size: "large",
-                submit: function(model) {
-                    vm.model.value[vm.model.value.indexOf(mediaEntry)] = mediaEntryClone;
-                    setActiveMedia(null)
-                    editorService.close();
-                },
-                close: function(model) {
-                    if(model.createFlow === true) {
-                        // This means that the user cancelled the creation and we should remove the media item.
-                        // TODO: remove new media item.
-                    }
-                    setActiveMedia(null)
-                    editorService.close();
-                }
-            };
-
-            // open property settings editor
-            editorService.open(mediaEditorModel);
-        }
-
-        var getDocumentNameAndIcon = function () {
-            // get node name
-            var contentNodeName = "?";
-            var contentNodeIcon = null;
-            if (vm.umbVariantContent) {
-                contentNodeName = vm.umbVariantContent.editor.content.name;
-                if (vm.umbVariantContentEditors) {
-                    contentNodeIcon = vm.umbVariantContentEditors.content.icon.split(" ")[0];
-                } else if (vm.umbElementEditorContent) {
-                    contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon.split(" ")[0];
-                }
-            } else if (vm.umbElementEditorContent) {
-                contentNodeName = vm.umbElementEditorContent.model.documentType.name;
-                contentNodeIcon = vm.umbElementEditorContent.model.documentType.icon.split(" ")[0];
-            }
-
-            return {
-                name: contentNodeName,
-                icon: contentNodeIcon
-            }
-        };
-
-        var requestCopyAllMedias = function () {
-            var mediaKeys = vm.model.value.map(x => x.mediaKey)
-            entityResource.getByIds(mediaKeys, "Media").then(function (entities) {
-
-                // gather aliases
-                var aliases = entities.map(mediaEntity => mediaEntity.metaData.ContentTypeAlias);
-
-                // remove duplicate aliases
-                aliases = aliases.filter((item, index) => aliases.indexOf(item) === index);
-
-                var documentInfo = getDocumentNameAndIcon();
-
-                localizationService.localize("clipboard_labelForArrayOfItemsFrom", [vm.model.label, documentInfo.name]).then(function (localizedLabel) {
-                    clipboardService.copyArray(clipboardService.TYPES.MEDIA, aliases, vm.model.value, localizedLabel, documentInfo.icon || "icon-thumbnail-list", vm.model.id);
-                });
-            });
-        };
-
-        function copyMedia(mediaEntry) {
-            entityResource.getById(mediaEntry.mediaKey, "Media").then(function (mediaEntity) {
-                clipboardService.copy(clipboardService.TYPES.MEDIA, mediaEntity.metaData.ContentTypeAlias, mediaEntry, mediaEntity.name, mediaEntity.icon, mediaEntry.key);
-            });
-        }
-
-        function requestPasteFromClipboard(createIndex, pasteEntry, pasteType) {
-            if (!vm.allowAddMedia) return;
-
-            if (pasteEntry === undefined) {
-                return false;
-            }
-
-            pasteEntry = clipboardService.parseContentForPaste(pasteEntry, pasteType);
-
-            pasteEntry.key = String.CreateGuid();
-            updateMediaEntryData(pasteEntry);
-            vm.model.value.splice(createIndex, 0, pasteEntry);
-
-            return true;
-        }
-
-        function requestRemoveAllMedia() {
-            localizationService.localizeMany(["mediaPicker_confirmRemoveAllMediaEntryMessage", "general_remove"]).then(function (data) {
-                overlayService.confirmDelete({
-                    title: data[1],
-                    content: data[0],
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        deleteAllMedias();
-                        overlayService.close();
-                    }
-                });
-            });
-        }
-
-        function onAmountOfMediaChanged() {
-
-            // enable/disable property actions
-            if (copyAllMediasAction) {
-                copyAllMediasAction.isDisabled = vm.model.value.length === 0;
-            }
-            if (removeAllMediasAction) {
-                removeAllMediasAction.isDisabled = vm.model.value.length === 0 || !vm.allowRemoveMedia;
-            }
-
-            // validate limits:
-            if (vm.propertyForm && vm.validationLimit) {
-
-                var isMinRequirementGood = vm.validationLimit.min === null || vm.model.value.length >= vm.validationLimit.min;
-                vm.propertyForm.minCount.$setValidity("minCount", isMinRequirementGood);
-
-                var isMaxRequirementGood = vm.validationLimit.max === null || vm.model.value.length <= vm.validationLimit.max;
-                vm.propertyForm.maxCount.$setValidity("maxCount", isMaxRequirementGood);
-            }
-        }
-
-        unsubscribe.push($scope.$watch(() => vm.model.value?.length || 0, onAmountOfMediaChanged));
-
-        $scope.$on("$destroy", function () {
-            for (const subscription of unsubscribe) {
-                subscription();
-            }
-
-            if (uploadInProgress) {
-                uploadTracker.uploadEnded(vm.node.key);
-            }
-        });
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.createButton.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.createButton.controller.js
deleted file mode 100644
index b561784d9f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umbMediaPicker3PropertyEditor.createButton.controller.js
+++ /dev/null
@@ -1,18 +0,0 @@
-(function () {
-    "use strict";
-
-    angular
-    .module("umbraco")
-    .controller("Umbraco.PropertyEditors.MediaPicker3PropertyEditor.CreateButtonController",
-    function Controller($scope) {
-
-        var vm = this;
-        vm.plusPosY = 0;
-
-        vm.onMouseMove = function($event) {
-            vm.plusPosY = $event.offsetY;
-        }
-
-    });
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js
deleted file mode 100644
index 90ad86121e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js
+++ /dev/null
@@ -1,148 +0,0 @@
-//this controller tells the dialogs service to open a memberPicker window
-//with a specified callback, this callback will receive an object with a selection on it
-function memberGroupPicker($scope, editorService, memberGroupResource, localizationService, overlayService){
-
-    const vm = this;
-
-    vm.openMemberGroupPicker = openMemberGroupPicker;
-    vm.remove = remove;
-    vm.clear = clear;
-
-    function trim(str, chr) {
-        var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
-        return str.replace(rgxtrim, '');
-    }
-
-    $scope.renderModel = [];
-    $scope.allowRemove = !$scope.readonly;
-    $scope.allowAdd = !$scope.readonly;
-    $scope.groupIds = [];
-
-    let removeAllEntriesAction = {
-        labelKey: "clipboard_labelForRemoveAllEntries",
-        labelTokens: [],
-        icon: "icon-trash",
-        method: removeAllEntries,
-        isDisabled: !$scope.allowRemove,
-        useLegacyIcon: false
-    };
-
-    if ($scope.model.config && $scope.umbProperty) {
-        $scope.umbProperty.setPropertyActions([
-            removeAllEntriesAction
-        ]);
-    }
-
-    if ($scope.model.value) {
-        var groupIds = $scope.model.value.split(',');
-
-        memberGroupResource.getByIds(groupIds).then(function(groups) {
-            $scope.renderModel = groups;
-        });
-
-        removeAllEntriesAction.isDisabled = groupIds.length === 0 || !$scope.allowRemove;
-    }
-
-    function setDirty() {
-        if ($scope.modelValueForm) {
-            $scope.modelValueForm.modelValue.$setDirty();
-        }
-    }
-
-    function openMemberGroupPicker($event) {
-        if (!$scope.allowAdd) {
-            $event.preventDefault();
-            $event.stopPropagation();
-            return;
-        }
-
-        var memberGroupPicker = {
-            multiPicker: true,
-            submit: function (model) {
-                var selectedGroupIds = _.map(model.selectedMemberGroups
-                    ? model.selectedMemberGroups
-                    : [model.selectedMemberGroup],
-                    function (id) { return parseInt(id); }
-                );
-
-                var currIds = renderModelIds();
-
-                // figure out which groups are new and fetch them
-                var newGroupIds = _.difference(selectedGroupIds, currIds);
-
-                removeAllEntriesAction.isDisabled = (currIds.length === 0 && newGroupIds.length === 0) || !$scope.allowRemove;
-
-                if (newGroupIds && newGroupIds.length) {
-                    memberGroupResource.getByIds(newGroupIds).then(function (groups) {
-                        $scope.renderModel = _.union($scope.renderModel, groups);
-                        setDirty();
-                        editorService.close();
-                    });
-                }
-                else {
-                    // no new groups selected
-                    editorService.close();
-                }
-            },
-            close: function() {
-                editorService.close();
-            }
-        };
-        editorService.memberGroupPicker(memberGroupPicker);
-    }
-
-    function remove(index) {
-        if (!$scope.allowRemove) return;
-
-        $scope.renderModel.splice(index, 1);
-
-        var currIds = renderModelIds();
-        removeAllEntriesAction.isDisabled = currIds.length === 0 || !$scope.allowRemove;
-
-        setDirty();
-    }
-
-    function clear() {
-        if (!$scope.allowRemove) return;
-
-        $scope.renderModel = [];
-        removeAllEntriesAction.isDisabled = true;
-
-        setDirty();
-    }
-
-    function removeAllEntries() {
-        if (!$scope.allowRemove) return;
-
-        localizationService.localizeMany(["content_nestedContentDeleteAllItems", "general_delete"]).then(data => {
-            overlayService.confirmDelete({
-                title: data[1],
-                content: data[0],
-                close: () => {
-                    overlayService.close();
-                },
-                submit: () => {
-                    vm.clear();
-                    overlayService.close();
-                }
-            });
-        });
-    }
-
-    function renderModelIds() {
-        var currIds = $scope.renderModel.map(i => i.id);
-        return currIds;
-    }
-
-    var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
-        $scope.model.value = trim(renderModelIds().join(), ",");
-    });
-
-    //when the scope is destroyed we need to unsubscribe
-    $scope.$on('$destroy', function () {
-        unsubscribe();
-    });
-
-}
-
-angular.module('umbraco').controller("Umbraco.PropertyEditors.MemberGroupPickerController", memberGroupPicker);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
deleted file mode 100644
index f2f22ed781..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.MemberGroupPickerController as vm" class="umb-property-editor umb-membergrouppicker">
-
-	<div ng-model="renderModel">
-		<umb-node-preview
-			ng-repeat="node in renderModel"
-			icon="node.icon"
-			name="node.name"
-			allow-remove="allowRemove"
-			on-remove="vm.remove($index)">
-		</umb-node-preview>
-	</div>
-
-	<button
-		type="button"
-		class="umb-node-preview-add"
-		ng-click="vm.openMemberGroupPicker($event)"
-		ng-disabled="readonly">
-
-		<localize key="general_add">Add</localize>
-	</button>
-
-	<ng-form name="modelValueForm">
-		<input type="hidden" name="modelValue" ng-model="renderModel.length" ng-required="model.validation.mandatory && !renderModel.length" />
-	</ng-form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.controller.js
deleted file mode 100644
index af22f6c800..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.controller.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function memberGroupController($scope, editorService, memberGroupResource) {
-
-    var vm = this;
-
-    vm.pickGroup = pickGroup;
-    vm.removeGroup = removeGroup;
-
-    //set the selected to the keys of the dictionary who's value is true
-    $scope.getSelected = function () {
-        var selected = [];
-        for (var n in $scope.model.value) {
-            if ($scope.model.value[n] === true) {
-                selected.push(n);
-            }
-        }
-        return selected;
-    };
-
-    function setDirty() {
-        if ($scope.modelValueForm) {
-            $scope.modelValueForm.modelValue.$setDirty();
-        }
-    }
-
-    function pickGroup() {
-        editorService.memberGroupPicker({
-            multiPicker: true,
-            submit: function (model) {
-                var selectedGroupIds = _.map(model.selectedMemberGroups
-                    ? model.selectedMemberGroups
-                    : [model.selectedMemberGroup],
-                    function(id) { return parseInt(id) }
-                );
-                memberGroupResource.getByIds(selectedGroupIds).then(function (selectedGroups) {
-                    _.each(selectedGroups, function(group) {
-                        $scope.model.value[group.name] = true;
-                    });
-                });
-                setDirty();
-                editorService.close();
-            },
-            close: function () {
-                editorService.close();
-            }
-        });
-    }
-
-    function removeGroup(group) {
-        $scope.model.value[group] = false;
-        setDirty();
-    }
-}
-angular.module('umbraco').controller("Umbraco.PropertyEditors.MemberGroupController", memberGroupController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html
deleted file mode 100644
index 81b9f9d30b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.MemberGroupController as vm">
-
-    <umb-node-preview ng-repeat="group in getSelected() | orderBy"
-                      icon="'icon-users-alt'"
-                      name="group"
-                      allow-remove="true"
-                      on-remove="vm.removeGroup(group)">
-    </umb-node-preview>
-
-    <button type="button"
-            class="umb-node-preview-add"
-            ng-click="vm.pickGroup()">
-        <localize key="general_add">Add</localize>
-    </button>
-
-    <ng-form name="modelValueForm">
-        <input type="hidden" name="modelValue" ng-model="model.value" />
-    </ng-form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js
deleted file mode 100644
index 5b2b16d497..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.controller.js
+++ /dev/null
@@ -1,131 +0,0 @@
-//this controller simply tells the dialogs service to open a memberPicker window
-//with a specified callback, this callback will receive an object with a selection on it
-function memberPickerController($scope, entityResource, iconHelper, editorService){
-
-    function trim(str, chr) {
-        var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
-        return str.replace(rgxtrim, '');
-    }
-
-    $scope.renderModel = [];
-    $scope.allowRemove = !$scope.readonly;
-    $scope.allowAdd = !$scope.readonly;
-
-    var dialogOptions = {
-        multiPicker: false,
-        entityType: "Member",
-        section: "member",
-        treeAlias: "member",
-        filter: function(i) {
-            return i.metaData.isContainer == true;
-        },
-        filterCssClass: "not-allowed",
-        callback: function(data) {
-            if (Utilities.isArray(data)) {
-                _.each(data, function (item, i) {
-                    $scope.add(item);
-                });
-            } else {
-                $scope.clear();
-                $scope.add(data);
-            }            
-        }
-    };
-
-    function setDirty() {
-        if ($scope.modelValueForm) {
-            $scope.modelValueForm.modelValue.$setDirty();
-        }
-    }
-
-    //since most of the pre-value config's are used in the dialog options (i.e. maxNumber, minNumber, etc...) we'll merge the
-    // pre-value config on to the dialog options
-    if ($scope.model.config) {
-        Utilities.extend(dialogOptions, $scope.model.config);
-    }
-
-    $scope.openMemberPicker = function () {
-        if(!$scope.allowAdd) return;
-
-        var memberPicker = dialogOptions;
-
-        memberPicker.submit = function (model) {
-            if (model.selection) {
-                _.each(model.selection, function (item, i) {
-                    $scope.add(item);
-                });
-            }
-            editorService.close();
-        };
-
-        memberPicker.close = function () {
-            editorService.close();
-        };
-
-        editorService.treePicker(memberPicker);
-    };
-
-    $scope.remove = function (index) {
-        if (!$scope.allowRemove) return;
-
-        $scope.renderModel.splice(index, 1);
-        setDirty();
-    };
-
-    $scope.add = function (item) {
-        if (!$scope.allowAdd) return; 
-
-        var currIds = _.map($scope.renderModel, function (i) {
-            if ($scope.model.config.idType === "udi") {
-                return i.udi;
-            }
-            else {
-                return i.id;
-            }            
-        });
-
-        var itemId = $scope.model.config.idType === "udi" ? item.udi : item.id;
-
-        if (currIds.indexOf(itemId) < 0) {
-            item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-            $scope.renderModel.push({ name: item.name, id: item.id, udi: item.udi, icon: item.icon });
-            setDirty();
-        }
-    };
-
-    $scope.clear = function() {
-        if (!$scope.allowRemove) return;
-
-        $scope.renderModel = [];
-    };
-
-    var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
-        var currIds = _.map($scope.renderModel, function (i) {
-            if ($scope.model.config.idType === "udi") {
-                return i.udi;
-            }
-            else {
-                return i.id;
-            }   
-        });
-        $scope.model.value = trim(currIds.join(), ",");
-    });
-
-    //when the scope is destroyed we need to unsubscribe
-    $scope.$on('$destroy', function () {
-        unsubscribe();
-    });
-
-    //load member data
-    var modelIds = $scope.model.value ? $scope.model.value.split(',') : [];
-    entityResource.getByIds(modelIds, "Member").then(function (data) {
-        _.each(data, function (item, i) {
-            // set default icon if it's missing
-            item.icon = (item.icon) ? iconHelper.convertFromLegacyIcon(item.icon) : "icon-user";
-            $scope.renderModel.push({ name: item.name, id: item.id, udi: item.udi, icon: item.icon });
-        });
-    });
-}
-
-
-angular.module('umbraco').controller("Umbraco.PropertyEditors.MemberPickerController", memberPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html
deleted file mode 100644
index 758898f942..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/memberpicker/memberpicker.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.MemberPickerController" class="umb-property-editor umb-memberpicker">
-
-	<div>
-		<umb-node-preview 
-			ng-repeat="node in renderModel"
-			icon="node.icon"
-			name="node.name"
-			allow-remove="allowRemove"
-			on-remove="remove($index)">
-		</umb-node-preview>
-	</div>
-
-	<button 
-			type="button"
-			class="umb-node-preview-add"
-			ng-show="model.config.multiPicker === true || renderModel.length === 0"
-			ng-click="openMemberPicker()"
-			ng-disabled="readonly">
-
-		<localize key="general_add">Add</localize>
-	</button>
-
-	<ng-form name="modelValueForm">
-		<input type="hidden" name="modelValue" ng-model="renderModel.length" ng-required="model.validation.mandatory && !renderModel.length" />
-	</ng-form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
deleted file mode 100644
index 4d164abfb6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
+++ /dev/null
@@ -1,185 +0,0 @@
-function MultipleTextBoxController($scope, $timeout) {
-
-    var backspaceHits = 0;
-
-    // Set the visible prompt to -1 to ensure it will not be visible
-    $scope.promptIsVisible = "-1";
-
-    $scope.sortableOptions = {
-        axis: 'y',
-        containment: 'parent',
-        cursor: 'move',
-        items: '> div.textbox-wrapper',
-        tolerance: 'pointer',
-        disabled: $scope.readonly
-    };
-
-    if (!$scope.model.value) {
-        $scope.model.value = [];
-    }
-
-    // Add any fields that there isn't values for
-    if ($scope.model.config.min > 0) {
-        for (var i = 0; i < $scope.model.config.min; i++) {
-            if ((i + 1) > $scope.model.value.length) {
-                $scope.model.value.push({ value: "" });
-            }
-        }
-    }
-
-    $scope.paste = function (event, index) {
-        event.preventDefault();
-
-        if ($scope.readonly) return;
-
-        var text = (event.clipboardData || window.clipboardData || event.originalEvent.clipboardData).getData('text');
-        var lines = text.split(/\r?\n/).map(line => { return { value: line, hasFocus: false } });
-
-        if (lines.length > 0) {
-            // merge with the current text
-            var currentText = $scope.model.value[index].value;
-            lines[0].value = currentText.substring(0, event.target.selectionStart) + lines[0].value;
-            lines[lines.length - 1].value = lines[lines.length - 1].value + currentText.substring(event.target.selectionEnd);
-
-            // clear selection
-            event.target.selectionEnd = event.target.selectionStart;
-
-            // remove focus from existing values
-            $scope.model.value.forEach(value => value.hasFocus = false);
-
-            // add all the lines to the value
-            lines[lines.length - 1].hasFocus = true;
-            $scope.model.value.splice(index, 1, ...lines);
-        }
-    }
-
-    $scope.addRemoveOnKeyDown = function (event, index) {
-        event.preventDefault();
-
-        if ($scope.readonly) return;
-
-        var txtBoxValue = $scope.model.value[index];
-
-        switch (event.keyCode) {
-            case 13:
-                if ($scope.model.config.max <= 0 && txtBoxValue.value || $scope.model.value.length < $scope.model.config.max && txtBoxValue.value) {
-                    var newItemIndex = index + 1;
-                    $scope.model.value.splice(newItemIndex, 0, { value: "" });
-                    // Focus on the newly added value
-                    $scope.model.value[newItemIndex].hasFocus = true;
-                }
-                break;
-            case 8:
-
-                if ($scope.model.value.length > $scope.model.config.min) {
-                    var remainder = [];
-
-                    // Used to require an extra hit on backspace for the field to be removed
-                    if (txtBoxValue.value === "") {
-                        backspaceHits++;
-                    } else {
-                        backspaceHits = 0;
-                    }
-
-                    if (txtBoxValue.value === "" && backspaceHits === 2) {
-                        for (var x = 0; x < $scope.model.value.length; x++) {
-                            if (x !== index) {
-                                remainder.push($scope.model.value[x]);
-                            }
-                        }
-
-                        $scope.model.value = remainder;
-
-                        var prevItemIndex = index - 1;
-
-                        // Set focus back on false as the directive only watches for true
-                        if (prevItemIndex >= 0) {
-                            $scope.model.value[prevItemIndex].hasFocus = false;
-                            $timeout(function () {
-                                // Focus on the previous value
-                                $scope.model.value[prevItemIndex].hasFocus = true;
-                            });
-                        }
-
-                        backspaceHits = 0;
-                    }
-                }
-
-                break;
-            default:
-        }
-        validate();
-    };
-
-    $scope.add = function ($event) {
-        if ($scope.readonly) {
-            $event.preventDefault();
-            $event.stopPropagation();
-            return;
-        }
-
-        if ($scope.model.config.max <= 0 || $scope.model.value.length < $scope.model.config.max) {
-            $scope.model.value.push({ value: "" });
-
-            // Focus new value
-            var newItemIndex = $scope.model.value.length - 1;
-            $scope.model.value[newItemIndex].hasFocus = true;
-        }
-        validate();
-    };
-
-    $scope.remove = function (index) {
-        if ($scope.readonly) return;
-
-        // Make sure not to trigger other prompts when remove is triggered
-        $scope.hidePrompt();
-
-        var remainder = [];
-        for (var x = 0; x < $scope.model.value.length; x++) {
-            if (x !== index) {
-                remainder.push($scope.model.value[x]);
-            }
-        }
-        $scope.model.value = remainder;
-    };
-
-    $scope.showPrompt = function (idx, item) {
-        if ($scope.readonly) return;
-
-        var i = $scope.model.value.indexOf(item);
-
-        // Make the prompt visible for the clicked tag only
-        if (i === idx) {
-            $scope.promptIsVisible = i;
-        }
-    };
-
-    $scope.hidePrompt = function () {
-        $scope.promptIsVisible = "-1";
-    };
-
-    function validate() {
-        if ($scope.multipleTextboxForm) {
-            var invalid = $scope.model.validation.mandatory && !$scope.model.value.length
-            $scope.multipleTextboxForm.mandatory.$setValidity("minCount", !invalid);
-        }
-    }
-
-    $timeout(function () {
-        validate();
-    });
-
-    // We always need to ensure we dont submit anything broken
-    var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
-        
-        // Filter to items with values
-        $scope.model.value = $scope.model.value.filter(el => el.value.trim() !== "") || [];
-    });
-
-    // When the scope is destroyed we need to unsubscribe
-    $scope.$on('$destroy', function () {
-        unsubscribe();
-    });
-}
-
-angular.module("umbraco").controller("Umbraco.PropertyEditors.MultipleTextBoxController", MultipleTextBoxController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
deleted file mode 100644
index fdd0674819..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="umb-property-editor umb-multiple-textbox" ng-controller="Umbraco.PropertyEditors.MultipleTextBoxController">
-  <ng-form name="multipleTextboxForm">
-    <div ui-sortable="sortableOptions" ng-model="model.value">
-      <div class="flex flex-wrap textbox-wrapper" ng-repeat="item in model.value track by $index">
-          <input type="text" name="item_{{$index}}" ng-model="item.value"
-                 class="umb-property-editor umb-textstring textstring flx-i"
-                 ng-trim="false"
-                 ng-keyup="addRemoveOnKeyDown($event, $index)"
-                 ng-paste="paste($event, $index)"
-                 focus-when="{{item.hasFocus}}"
-                 ng-readonly="readonly" />
-
-          <div ng-if="!readonly" class="icon-wrapper">
-              <umb-icon icon="icon-navigation" class="icon handle" localize="title" title="@general_move"></umb-icon>
-  
-              <div class="umb-multiple-textbox__confirm" ng-show="model.value.length > model.config.min">
-                  <button type="button" class="umb-multiple-textbox__confirm-action" ng-click="showPrompt($index, item)" localize="title" title="@content_removeTextBox">
-                      <umb-icon icon="icon-trash"></umb-icon>
-                  </button>
-  
-                  <umb-confirm-action
-                      ng-if="promptIsVisible === $index"
-                      direction="left"
-                      on-confirm="remove($index)"
-                      on-cancel="hidePrompt()">
-                  </umb-confirm-action>
-              </div>
-          </div>
-      </div>
-    </div>
-
-    <button type="button" class="add-link" localize="title" title="@content_addTextBox"
-       ng-show="model.config.max <= 0 || model.value.length < model.config.max"
-       ng-click="add($event)"
-       ng-disabled="readonly">
-        <localize key="general_add">Add</localize>
-    </button>
-
-    <input type="hidden" name="mandatory" ng-model="model.value" />
-  </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
deleted file mode 100644
index 6f201eaf3f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ /dev/null
@@ -1,236 +0,0 @@
-function multiUrlPickerController($scope, localizationService, entityResource, iconHelper, editorService, overlayService) {
-
-    var vm = {
-        labels: {
-            general_recycleBin: ""
-        }
-    };
-
-    $scope.allowAdd = !$scope.readonly;
-    $scope.allowEdit = !$scope.readonly;
-    $scope.allowRemove = !$scope.readonly;
-
-    let removeAllEntriesAction = {
-        labelKey: "clipboard_labelForRemoveAllEntries",
-        labelTokens: [],
-        icon: "icon-trash",
-        method: removeAllEntries,
-        isDisabled: !$scope.allowRemove,
-        useLegacyIcon: false
-    };
-
-    $scope.renderModel = [];
-
-    if ($scope.model.config) {
-
-        $scope.minNumberOfItems = $scope.model.config.minNumber ? parseInt($scope.model.config.minNumber) : 0;
-        $scope.maxNumberOfItems = $scope.model.config.maxNumber ? parseInt($scope.model.config.maxNumber) : 0;
-
-        if ($scope.umbProperty && $scope.maxNumberOfItems !== 1) {
-            let propertyActions = [
-               removeAllEntriesAction
-            ];
-
-            $scope.umbProperty.setPropertyActions(propertyActions);
-        }
-    }
-
-    if (!Array.isArray($scope.model.value)) {
-        $scope.model.value = [];
-    }
-
-    $scope.sortableOptions = {
-        axis: "y",
-        containment: "parent",
-        distance: 10,
-        opacity: 0.7,
-        tolerance: "pointer",
-        scroll: true,
-        zIndex: 6000,
-        disabled: $scope.readonly || $scope.maxNumberOfItems === 1,
-        update: function () {
-            setDirty();
-        }
-    };
-
-    $scope.model.value.forEach(link => {
-        link.icon = iconHelper.convertFromLegacyIcon(link.icon);
-        $scope.renderModel.push(link);
-    });
-
-    $scope.$on("formSubmitting", () => {
-        $scope.model.value = $scope.renderModel;
-    });
-
-    $scope.$watch(
-        function () {
-            return $scope.renderModel.length;
-        },
-        function () {
-            //Validate!
-            if ($scope.model.config && $scope.model.config.minNumber && parseInt($scope.model.config.minNumber) > $scope.renderModel.length) {
-                $scope.multiUrlPickerForm.minCount.$setValidity("minCount", false);
-            }
-            else {
-                $scope.multiUrlPickerForm.minCount.$setValidity("minCount", true);
-            }
-
-            if ($scope.model.config && $scope.model.config.maxNumber && parseInt($scope.model.config.maxNumber) < $scope.renderModel.length) {
-                $scope.multiUrlPickerForm.maxCount.$setValidity("maxCount", false);
-            }
-            else {
-                $scope.multiUrlPickerForm.maxCount.$setValidity("maxCount", true);
-            }
-
-            $scope.sortableOptions.disabled = $scope.renderModel.length === 1 || $scope.readonly;
-
-            removeAllEntriesAction.isDisabled = $scope.renderModel.length === 0 || $scope.readonly;
-
-            //Update value
-            $scope.model.value = $scope.renderModel;
-        }
-    );
-
-    $scope.remove = function ($index) {
-        if (!$scope.allowRemove) return;
-
-        $scope.renderModel.splice($index, 1);
-
-        setDirty();
-    };
-
-    $scope.clear = function () {
-      $scope.renderModel = [];
-
-      setDirty();
-    };
-
-    $scope.openLinkPicker = function (link) {
-        if (!$scope.allowAdd || !$scope.allowEdit) return;
-
-        var target = link ? {
-            name: link.name,
-            anchor: link.queryString,
-            udi: link.udi,
-            url: link.url,
-            target: link.target
-        } : null;
-
-        const linkPicker = {
-            currentTarget: target,
-            dataTypeKey: $scope.model.dataTypeKey,
-            ignoreUserStartNodes : ($scope.model.config && $scope.model.config.ignoreUserStartNodes) ? $scope.model.config.ignoreUserStartNodes : "0",
-            hideAnchor: $scope.model.config && $scope.model.config.hideAnchor ? true : false,
-            size: $scope.model.config.overlaySize,
-            submit: model => {
-                if (model.target.url || model.target.anchor) {
-                    // if an anchor exists, check that it is appropriately prefixed
-                    if (model.target.anchor && model.target.anchor[0] !== '?' && model.target.anchor[0] !== '#') {
-                        model.target.anchor = (model.target.anchor.indexOf('=') === -1 ? '#' : '?') + model.target.anchor;
-                    }
-                    if (link) {
-                        link.udi = model.target.udi;
-                        link.name = model.target.name || model.target.url || model.target.anchor;
-                        link.queryString = model.target.anchor;
-                        link.target = model.target.target;
-                        link.url = model.target.url;
-                    } else {
-                        link = {
-                            name: model.target.name || model.target.url || model.target.anchor,
-                            queryString: model.target.anchor,
-                            target: model.target.target,
-                            udi: model.target.udi,
-                            url: model.target.url
-                        };
-                        $scope.renderModel.push(link);
-                    }
-
-                    if (link.udi) {
-                        const entityType = model.target.isMedia ? "Media" : "Document";
-
-                        entityResource.getById(link.udi, entityType).then(data => {
-
-                            link.icon = iconHelper.convertFromLegacyIcon(data.icon);
-                            link.published = (data.metaData && data.metaData.IsPublished === false && entityType === "Document") ? false : true;
-                            link.trashed = data.trashed;
-
-                            if (link.trashed) {
-                                link.url = vm.labels.general_recycleBin;
-                            }
-                        });
-                    } else {
-                        link.icon = "icon-link";
-                        link.published = true;
-                    }
-
-                    setDirty();
-                }
-                editorService.close();
-            },
-            close: () => {
-                editorService.close();
-            }
-        };
-
-        editorService.linkPicker(linkPicker);
-    };
-
-    function setDirty() {
-        if ($scope.multiUrlPickerForm) {
-            $scope.multiUrlPickerForm.modelValue.$setDirty();
-        }
-    }
-
-    function removeAllEntries() {
-        localizationService.localizeMany(["content_nestedContentDeleteAllItems", "general_delete"]).then(function (data) {
-          overlayService.confirmDelete({
-            title: data[1],
-            content: data[0],
-            close: function () {
-              overlayService.close();
-            },
-            submit: function () {
-              $scope.clear();
-              overlayService.close();
-            }
-          });
-        });
-    }
-
-    function init() {
-
-        localizationService.localizeMany(["general_recycleBin"])
-            .then(data => {
-                vm.labels.general_recycleBin = data[0];
-            });
-
-        // if the property is mandatory, set the minCount config to 1 (unless of course it is set to something already),
-        // that way the minCount/maxCount validation handles the mandatory as well
-        if ($scope.model.validation && $scope.model.validation.mandatory && !$scope.model.config.minNumber) {
-            $scope.model.config.minNumber = 1;
-        }
-
-        const ids = [];
-        $scope.model.value.forEach(item => {
-            // we must reload the "document" link URLs to match the current editor culture
-            if (item.udi && item.udi.indexOf("/document/") > 0 && ids.indexOf(item.udi) < 0) {
-                ids.push(item.udi);
-                item.url = null;
-            }
-        });
-
-        if(ids.length){
-            entityResource.getUrlsByIds(ids, "Document").then(function(urlMap){
-                Object.keys(urlMap).forEach((udi) => {
-                    const items = $scope.model.value.filter(item => item.udi === udi);
-                    items.forEach(item => item.url = urlMap[udi]);
-                })
-            });
-        }
-    }
-
-    init();
-}
-
-angular.module("umbraco").controller("Umbraco.PropertyEditors.MultiUrlPickerController", multiUrlPickerController);
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
deleted file mode 100644
index cb0fcc7d9c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.MultiUrlPickerController" class="umb-property-editor umb-contentpicker">
-    <p ng-if="(renderModel|filter:{trashed:true}).length == 1"><localize key="contentPicker_pickedTrashedItem">You have picked a content item currently deleted or in the recycle bin</localize></p>
-    <p ng-if="(renderModel|filter:{trashed:true}).length > 1"><localize key="contentPicker_pickedTrashedItems">You have picked content items currently deleted or in the recycle bin</localize></p>
-
-    <ng-form name="multiUrlPickerForm">
-        <div ui-sortable="sortableOptions" ng-model="renderModel">
-            <umb-node-preview ng-repeat="link in renderModel"
-                              icon="link.icon"
-                              name="link.name"
-                              published="link.published"
-                              description="link.url + (link.queryString ? link.queryString : '')"
-                              sortable="!sortableOptions.disabled"
-                              allow-remove="allowRemove"
-                              allow-edit="allowEdit"
-                              on-remove="remove($index)"
-                              on-edit="openLinkPicker(link, $index)">
-            </umb-node-preview>
-        </div>
-
-        <button ng-show="!model.config.maxNumber || renderModel.length < model.config.maxNumber"
-                type="button"
-                class="umb-node-preview-add"
-                ng-click="openLinkPicker()"
-                ng-disabled="!allowAdd">
-            <span class="sr-only">{{ model.label }}:</span>
-            <localize key="general_add">Add</localize>
-            <span class="sr-only">url</span>
-        </button>
-
-        <div class="umb-contentpicker__min-max-help">
-
-            <!-- Both min and max items -->
-            <span ng-if="model.config.minNumber && model.config.maxNumber && model.config.minNumber !== model.config.maxNumber">
-                <span ng-if="renderModel.length < model.config.maxNumber">Add between {{model.config.minNumber}} and {{model.config.maxNumber}} items</span>
-                <span ng-if="renderModel.length > model.config.maxNumber">
-                    <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_itemsSelected"> item(s) selected</localize>
-                </span>
-            </span>
-
-            <!-- Equal min and max -->
-            <span ng-if="model.config.minNumber && model.config.maxNumber && model.config.minNumber === model.config.maxNumber">
-                <span ng-if="renderModel.length < model.config.maxNumber">Add {{model.config.minNumber - renderModel.length}} item(s)</span>
-                <span ng-if="renderModel.length > model.config.maxNumber">
-                    <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_urlsSelected"> url(s) selected</localize>
-                </span>
-            </span>
-
-            <!-- Only max -->
-            <span ng-if="!model.config.minNumber && model.config.maxNumber">
-                <span ng-if="renderModel.length < model.config.maxNumber"><localize key="validation_addUpTo">Add up to</localize> {{model.config.maxNumber}} <localize key="validation_urls">url(s)</localize></span>
-                <span ng-if="renderModel.length > model.config.maxNumber">
-                    <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_urlsSelected">url(s) selected</localize>
-                </span>
-            </span>
-
-            <!-- Only min -->
-            <span ng-if="model.config.minNumber && !model.config.maxNumber && renderModel.length < model.config.minNumber">
-                <localize key="validation_minCount">You need to add at least</localize> {{model.config.minNumber}} <localize key="validation_urls">url(s)</localize>
-            </span>
-
-        </div>
-
-        <input type="hidden" name="modelValue" ng-model="renderModel.length" />
-
-        <!--These are here because we need ng-form fields to validate against-->
-        <input type="hidden" name="minCount" ng-model="renderModel" />
-        <input type="hidden" name="maxCount" ng-model="renderModel" />
-
-        <div ng-messages="multiUrlPickerForm.minCount.$error" show-validation-on-submit>
-            <div class="help-inline" ng-message="minCount">
-                <localize key="validation_minCount">You need to add at least</localize> {{model.config.minNumber}} <localize key="validation_urls">url(s)</localize>
-            </div>
-        </div>
-        <div ng-messages="multiUrlPickerForm.maxCount.$error" show-validation-on-submit>
-            <div class="help-inline" ng-message="maxCount">
-                <localize key="validation_maxCount">You can only have</localize> {{model.config.maxNumber}} <localize key="validation_urlsSelected">url(s) selected</localize>
-            </div>
-        </div>
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
deleted file mode 100644
index 64363914f9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ /dev/null
@@ -1,800 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * When performing a copy, we do copy the ElementType Data Model, but each inner Nested Content property is still stored as the Nested Content Model, aka. each property is just storing its value. To handle this we need to ensure we handle both scenarios.
-     */
-
-
-    angular.module('umbraco').run(['clipboardService', function (clipboardService) {
-
-        function resolveNestedContentPropertiesForPaste(prop, propClearingMethod) {
-
-            // if prop.editor is "Umbraco.NestedContent"
-            if ((typeof prop === 'object' && prop.editor === "Umbraco.NestedContent")) {
-
-                var value = prop.value;
-                for (var i = 0; i < value.length; i++) {
-                    var obj = value[i];
-
-                    // generate a new key.
-                    obj.key = String.CreateGuid();
-
-                    // Loop through all inner properties:
-                    for (var k in obj) {
-                        propClearingMethod(obj[k], clipboardService.TYPES.RAW);
-                    }
-                }
-            }
-        }
-
-        clipboardService.registerPastePropertyResolver(resolveNestedContentPropertiesForPaste, clipboardService.TYPES.ELEMENT_TYPE)
-
-
-        function resolveInnerNestedContentPropertiesForPaste(prop, propClearingMethod) {
-
-            // if we got an array, and it has a entry with ncContentTypeAlias this meants that we are dealing with a NestedContent property data.
-            if ((Array.isArray(prop) && prop.length > 0 && prop[0].ncContentTypeAlias !== undefined)) {
-
-                for (var i = 0; i < prop.length; i++) {
-                    var obj = prop[i];
-
-                    // generate a new key.
-                    obj.key = String.CreateGuid();
-
-                    // Loop through all inner properties:
-                    for (var k in obj) {
-                        propClearingMethod(obj[k], clipboardService.TYPES.RAW);
-                    }
-                }
-            }
-        }
-
-        clipboardService.registerPastePropertyResolver(resolveInnerNestedContentPropertiesForPaste, clipboardService.TYPES.RAW)
-    }]);
-
-    angular
-        .module('umbraco')
-        .component('nestedContentPropertyEditor', {
-            templateUrl: 'views/propertyeditors/nestedcontent/nestedcontent.propertyeditor.html',
-            controller: NestedContentController,
-            controllerAs: 'vm',
-            require: {
-                umbProperty: '?^umbProperty',
-                umbVariantContent: '?^^umbVariantContent'
-            }
-        });
-
-    function NestedContentController($scope, $interpolate, $filter, serverValidationManager, contentResource, localizationService, iconHelper, clipboardService, eventsService, overlayService, $attrs) {
-
-        const vm = this;
-
-        var model = $scope.$parent.$parent.model;
-
-        vm.readonly = false;
-
-        var contentTypeAliases = [];
-        _.each(model.config.contentTypes, function (contentType) {
-            contentTypeAliases.push(contentType.ncAlias);
-        });
-
-        _.each(model.config.contentTypes, function (contentType) {
-            contentType.nameExp = contentType.nameTemplate
-                ? $interpolate(contentType.nameTemplate)
-                : undefined;
-        });
-
-        $attrs.$observe('readonly', value => {
-            vm.readonly = value !== undefined;
-
-            vm.allowRemove = !vm.readonly;
-            vm.allowAdd = !vm.readonly;
-
-            vm.sortableOptions.disabled = vm.readonly;
-
-            removeAllEntriesAction.isDisabled = vm.readonly;
-        });
-
-        vm.nodes = [];
-        vm.currentNode = null;
-        vm.scaffolds = null;
-        vm.sorting = false;
-        vm.inited = false;
-
-        vm.minItems = model.config.minItems || 0;
-        vm.maxItems = model.config.maxItems || 0;
-
-        vm.singleMode = vm.minItems === 1 && vm.maxItems === 1 && model.config.contentTypes.length === 1;
-        vm.expandsOnLoad = Object.toBoolean(model.config.expandsOnLoad)
-        vm.showIcons = Object.toBoolean(model.config.showIcons);
-        vm.wideMode = Object.toBoolean(model.config.hideLabel);
-        vm.hasContentTypes = model.config.contentTypes.length > 0;
-
-        var cultureChanged = eventsService.on('editors.content.cultureChanged', (name, args) => updateModel());
-
-        var labels = {};
-        vm.labels = labels;
-        localizationService.localizeMany(["grid_addElement", "content_createEmpty", "actions_copy"]).then(function (data) {
-            labels.grid_addElement = data[0];
-            labels.content_createEmpty = data[1];
-            labels.copy_icon_title = data[2];
-        });
-
-        function setCurrentNode(node, focusNode) {
-            updateModel();
-            vm.currentNode = node;
-            vm.focusOnNode = focusNode;
-        }
-
-        var copyAllEntries = function () {
-
-            syncCurrentNode();
-
-            // list aliases
-            var aliases = vm.nodes.map((node) => node.contentTypeAlias);
-
-            // remove dublicates
-            aliases = aliases.filter((item, index) => aliases.indexOf(item) === index);
-
-            var nodeName = "";
-
-            if (vm.umbVariantContent) {
-                nodeName = vm.umbVariantContent.editor.content.name;
-            }
-
-            localizationService.localize("clipboard_labelForArrayOfItemsFrom", [model.label, nodeName]).then(function (data) {
-                clipboardService.copyArray(clipboardService.TYPES.ELEMENT_TYPE, aliases, vm.nodes, data, "icon-thumbnail-list", model.id, clearNodeForCopy);
-            });
-        }
-
-        let copyAllEntriesAction = {
-            labelKey: "clipboard_labelForCopyAllEntries",
-            labelTokens: [model.label],
-            icon: "icon-documents",
-            method: copyAllEntries,
-            isDisabled: true,
-            useLegacyIcon: false
-        };
-
-        let removeAllEntriesAction = {
-            labelKey: "clipboard_labelForRemoveAllEntries",
-            labelTokens: [],
-            icon: "icon-trash",
-            method: removeAllEntries,
-            isDisabled: true,
-            useLegacyIcon: false
-        };
-
-        function removeAllEntries() {
-
-            localizationService.localizeMany(["content_nestedContentDeleteAllItems", "general_delete"]).then(data => {
-                overlayService.confirmDelete({
-                    title: data[1],
-                    content: data[0],
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        vm.nodes = [];
-                        setDirty();
-                        updateModel();
-                        overlayService.close();
-                    }
-                });
-            });
-        }
-
-        // helper to force the current form into the dirty state
-        function setDirty() {
-            if (vm.umbProperty) {
-                vm.umbProperty.setDirty();
-            }
-        };
-
-        function addNode(alias) {
-            var scaffold = getScaffold(alias);
-
-            var newNode = createNode(scaffold, null);
-
-            setCurrentNode(newNode, true);
-            setDirty();
-            validate();
-        };
-
-        vm.maxItemsExceeded = function () {
-            return vm.maxItems !== 0 && vm.nodes.length > vm.maxItems;
-        }
-
-        vm.maxItemsReached = function () {
-            return vm.maxItems !== 0 && vm.nodes.length >= vm.maxItems;
-        }
-
-        vm.openNodeTypePicker = function ($event) {
-
-            if (vm.maxItemsReached()) {
-                return;
-            }
-
-            var availableItems = [];
-            _.each(vm.scaffolds, function (scaffold) {
-                availableItems.push({
-                    alias: scaffold.contentTypeAlias,
-                    name: scaffold.contentTypeName,
-                    icon: iconHelper.convertFromLegacyIcon(scaffold.icon),
-                    tooltip: scaffold.documentType.description
-                });
-            });
-
-            const dialog = {
-                orderBy: "$index",
-                view: "itempicker",
-                event: $event,
-                filter: availableItems.length > 12,
-                size: availableItems.length > 6 ? "medium" : "small",
-                availableItems: availableItems,
-                clickPasteItem: function (item) {
-                    if (Array.isArray(item.data)) {
-                        _.each(item.data, function (entry) {
-                            pasteFromClipboard(entry);
-                        });
-                    } else {
-                        pasteFromClipboard(item.data);
-                    }
-
-                    overlayService.close();
-                },
-                submit: function (model) {
-                    if (model && model.selectedItem) {
-                        addNode(model.selectedItem.alias);
-                    }
-
-                    overlayService.close();
-                },
-                close: function () {
-                    overlayService.close();
-                }
-            };
-
-            if (dialog.availableItems.length === 0) {
-                return;
-            }
-
-            dialog.pasteItems = [];
-
-            var entriesForPaste = clipboardService.retrieveEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, contentTypeAliases);
-            _.each(entriesForPaste, function (entry) {
-                dialog.pasteItems.push({
-                    date: entry.date,
-                    name: entry.label,
-                    data: entry.data,
-                    icon: entry.icon
-                });
-            });
-
-            dialog.pasteItems.sort( (a, b) => {
-                return b.date - a.date
-            });
-
-            dialog.title = dialog.pasteItems.length > 0 ? labels.grid_addElement : labels.content_createEmpty;
-            dialog.hideHeader = dialog.pasteItems.length > 0;
-
-            dialog.clickClearPaste = function ($event) {
-                $event.stopPropagation();
-                $event.preventDefault();
-                clipboardService.clearEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, contentTypeAliases);
-                dialog.pasteItems = [];// This dialog is not connected via the clipboardService events, so we need to update manually.
-                dialog.hideHeader = false;
-            };
-
-            if (dialog.availableItems.length === 1 && dialog.pasteItems.length === 0) {
-                // only one scaffold type - no need to display the picker
-                addNode(vm.scaffolds[0].contentTypeAlias);
-
-                dialog.close();
-
-                return;
-            }
-
-            overlayService.open(dialog);
-        };
-
-        vm.editNode = function (idx) {
-            if (vm.currentNode && vm.currentNode.key === vm.nodes[idx].key) {
-                setCurrentNode(null, false);
-            } else {
-                setCurrentNode(vm.nodes[idx], true);
-            }
-        };
-
-        vm.canDeleteNode = function (idx) {
-            return (vm.nodes.length > vm.minItems)
-                ? true
-                : model.config.contentTypes.length > 1;
-        };
-
-        function deleteNode(idx) {
-            var removed = vm.nodes.splice(idx, 1);
-
-            setDirty();
-
-            removed.forEach(x => {
-                // remove any server validation errors associated
-                serverValidationManager.removePropertyError(x.key, vm.umbProperty.property.culture, vm.umbProperty.property.segment, "", { matchType: "contains" });
-            });
-
-            updateModel();
-            validate();
-        };
-
-        vm.requestDeleteNode = function (idx) {
-            if (!vm.canDeleteNode(idx)) {
-                return;
-            }
-            if (model.config.confirmDeletes === true) {
-                localizationService.localizeMany(["content_nestedContentDeleteItem", "general_delete", "general_cancel", "contentTypeEditor_yesDelete"]).then(function (data) {
-                    const overlay = {
-                        title: data[1],
-                        content: data[0],
-                        closeButtonLabel: data[2],
-                        submitButtonLabel: data[3],
-                        submitButtonStyle: "danger",
-                        close: function () {
-                            overlayService.close();
-                        },
-                        submit: function () {
-                            deleteNode(idx);
-                            overlayService.close();
-                        }
-                    };
-
-                    overlayService.open(overlay);
-                });
-            } else {
-                deleteNode(idx);
-            }
-        };
-
-        vm.getName = function (idx) {
-            if (!model.value || !model.value.length) {
-                return "";
-            }
-
-            var name = "";
-
-            if (model.value[idx]) {
-
-                var contentType = getContentTypeConfig(model.value[idx].ncContentTypeAlias);
-
-                if (contentType != null) {
-                    // first try getting a name using the configured label template
-                    if (contentType.nameExp) {
-                        // Run the expression against the stored dictionary value, NOT the node object
-                        var item = model.value[idx];
-
-                        // Add a temporary index property
-                        item["$index"] = (idx + 1);
-
-                        var newName = contentType.nameExp(item);
-                        if (newName && (newName = newName.trim())) {
-                            name = newName;
-                        }
-
-                        // Delete the index property as we don't want to persist it
-                        delete item["$index"];
-                    }
-
-                    // if we still do not have a name and we have multiple content types to choose from, use the content type name (same as is shown in the content type picker)
-                    if (!name && vm.scaffolds.length > 1) {
-                        var scaffold = getScaffold(contentType.ncAlias);
-                        if (scaffold) {
-                            name = scaffold.contentTypeName;
-                        }
-                    }
-                }
-
-            }
-
-            if (!name) {
-                name = "Item " + (idx + 1);
-            }
-
-            // Update the nodes actual name value
-            if (vm.nodes[idx].name !== name) {
-                vm.nodes[idx].name = name;
-            }
-
-            return name;
-        };
-
-        vm.getIcon = function (idx) {
-            if (!model.value || !model.value.length) {
-                return "";
-            }
-
-            var scaffold = getScaffold(model.value[idx].ncContentTypeAlias);
-            return scaffold && scaffold.icon ? iconHelper.convertFromLegacyIcon(scaffold.icon) : "icon-folder";
-        };
-
-        vm.sortableOptions = {
-            axis: "y",
-            containment: "parent",
-            cursor: "move",
-            handle: '.umb-nested-content__header-bar',
-            distance: 10,
-            opacity: 0.7,
-            tolerance: "pointer",
-            scroll: true,
-            disabled: vm.readOnly,
-            start: function (ev, ui) {
-                updateModel();
-                // Yea, yea, we shouldn't modify the dom, sue me
-                $("#umb-nested-content--" + model.id + " .umb-rte textarea").each(function () {
-                    tinymce.execCommand("mceRemoveEditor", false, $(this).attr("id"));
-                    $(this).css("visibility", "hidden");
-                });
-                $scope.$apply(function () {
-                    vm.sorting = true;
-                });
-            },
-            update: function (ev, ui) {
-                setDirty();
-            },
-            stop: function (ev, ui) {
-                $("#umb-nested-content--" + model.id + " .umb-rte textarea").each(function () {
-                    tinymce.execCommand("mceAddEditor", true, $(this).attr("id"));
-                    $(this).css("visibility", "visible");
-                });
-                $scope.$apply(function () {
-                    vm.sorting = false;
-                    updateModel();
-                });
-            }
-        };
-
-        function getScaffold(alias) {
-            return _.find(vm.scaffolds, function (scaffold) {
-                return scaffold.contentTypeAlias === alias;
-            });
-        }
-
-        function getContentTypeConfig(alias) {
-            return _.find(model.config.contentTypes, function (contentType) {
-                return contentType.ncAlias === alias;
-            });
-        }
-
-        function clearNodeForCopy(clonedData) {
-            delete clonedData.key;
-            delete clonedData.$$hashKey;
-
-            var variant = clonedData.variants[0];
-            for (var t = 0; t < variant.tabs.length; t++) {
-                var tab = variant.tabs[t];
-                for (var p = 0; p < tab.properties.length; p++) {
-                    var prop = tab.properties[p];
-
-                    // If we have ncSpecific data, lets revert to standard data model.
-                    if (prop.propertyAlias) {
-                        prop.alias = prop.propertyAlias;
-                        delete prop.propertyAlias;
-                    }
-
-                    if(prop.ncMandatory !== undefined) {
-                        prop.validation.mandatory = prop.ncMandatory;
-                        delete prop.ncMandatory;
-                    }
-                }
-            }
-
-        }
-
-        vm.showCopy = clipboardService.isSupported();
-        vm.showPaste = false;
-
-        vm.clickCopy = function ($event, node) {
-
-            syncCurrentNode();
-
-            clipboardService.copy(clipboardService.TYPES.ELEMENT_TYPE, node.contentTypeAlias, node, null, null, null, clearNodeForCopy);
-            $event.stopPropagation();
-        }
-
-
-        function pasteFromClipboard(newNode) {
-
-            if (newNode === undefined) {
-                return;
-            }
-
-            newNode = clipboardService.parseContentForPaste(newNode, clipboardService.TYPES.ELEMENT_TYPE);
-
-            // generate a new key.
-            newNode.key = String.CreateGuid();
-
-            // Ensure we have NC data in place:
-            var variant = newNode.variants[0];
-            for (var t = 0; t < variant.tabs.length; t++) {
-                var tab = variant.tabs[t];
-                for (var p = 0; p < tab.properties.length; p++) {
-                    extendPropertyWithNCData(tab.properties[p]);
-                }
-            }
-
-            vm.nodes.push(newNode);
-            setDirty();
-            //updateModel();// done by setting current node...
-
-            setCurrentNode(newNode, true);
-        }
-
-        function checkAbilityToPasteContent() {
-            vm.showPaste = clipboardService.hasEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, contentTypeAliases);
-        }
-
-        var storageUpdate = eventsService.on("clipboardService.storageUpdate", checkAbilityToPasteContent);
-        $scope.$on('$destroy', function () {
-            storageUpdate();
-        });
-        var notSupported = [
-            "Umbraco.UploadField",
-            "Umbraco.ImageCropper",
-            "Umbraco.BlockList"
-        ];
-
-        // Initialize
-        vm.scaffolds = [];
-
-        contentResource.getScaffolds(-20, contentTypeAliases).then(function (scaffolds){
-            // Loop through all the content types
-            _.each(model.config.contentTypes, function (contentType){
-                // Get the scaffold from the result
-                var scaffold = scaffolds[contentType.ncAlias];
-
-                // make sure it's an element type before allowing the user to create new ones
-                if (scaffold.isElement) {
-                    // remove all tabs except the specified tab
-                    var tabs = scaffold.variants[0].tabs;
-                    var tab = _.find(tabs, function (tab) {
-                        return tab.id !== 0 && (tab.label.toLowerCase() === contentType.ncTabAlias.toLowerCase() || contentType.ncTabAlias === "");
-                    });
-                    scaffold.variants[0].tabs = [];
-                    if (tab) {
-                        scaffold.variants[0].tabs.push(tab);
-
-                        tab.properties.forEach(
-                            function (property) {
-                                if (_.find(notSupported, function (x) { return x === property.editor; })) {
-                                    property.notSupported = true;
-                                    // TODO: Not supported message to be replaced with 'content_nestedContentEditorNotSupported' dictionary key. Currently not possible due to async/timing quirk.
-                                    property.notSupportedMessage = "Property " + property.label + " uses editor " + property.editor + " which is not supported by Nested Content.";
-                                }
-                            }
-                        );
-                    }
-
-                    // Ensure Culture Data for Complex Validation.
-                    ensureCultureData(scaffold);
-
-                    // Store the scaffold object
-                    vm.scaffolds.push(scaffold);
-                }
-            });
-
-            // Initialize once all scaffolds have been loaded
-            initNestedContent();
-        });
-
-        /**
-         * Ensure that the containing content variant language and current property culture is transferred along
-         * to the scaffolded content object representing this block.
-         * This is required for validation along with ensuring that the umb-property inheritance is constantly maintained.
-         * @param {any} content
-         */
-         function ensureCultureData(content) {
-
-            if (!content || !vm.umbVariantContent || !vm.umbProperty) return;
-
-            if (vm.umbVariantContent.editor.content.language) {
-                // set the scaffolded content's language to the language of the current editor
-                content.language = vm.umbVariantContent.editor.content.language;
-            }
-            // currently we only ever deal with invariant content for blocks so there's only one
-            content.variants[0].tabs.forEach(tab => {
-                tab.properties.forEach(prop => {
-                    // set the scaffolded property to the culture of the containing property
-                    prop.culture = vm.umbProperty.property.culture;
-                });
-            });
-        }
-
-        var initNestedContent = function () {
-            // Initialize when all scaffolds have loaded
-            // Sort the scaffold explicitly according to the sort order defined by the data type.
-            vm.scaffolds = $filter("orderBy")(vm.scaffolds, function (s) {
-                return contentTypeAliases.indexOf(s.contentTypeAlias);
-            });
-
-            // Convert stored nodes
-            if (model.value) {
-                for (var i = 0; i < model.value.length; i++) {
-                    var item = model.value[i];
-                    var scaffold = getScaffold(item.ncContentTypeAlias);
-                    if (scaffold == null) {
-                        // No such scaffold - the content type might have been deleted. We need to skip it.
-                        continue;
-                    }
-                    createNode(scaffold, item);
-                }
-            }
-
-            // Enforce min items if we only have one scaffold type
-            var modelWasChanged = false;
-            if (vm.nodes.length < vm.minItems && vm.scaffolds.length === 1) {
-                for (var ii = vm.nodes.length; ii < model.config.minItems; ii++) {
-                    addNode(vm.scaffolds[0].contentTypeAlias);
-                }
-                modelWasChanged = true;
-            }
-
-            // If there is only one item and expandsOnLoad property is true, set it as current node
-            if (vm.singleMode || (vm.expandsOnLoad && vm.nodes.length === 1)) {
-                setCurrentNode(vm.nodes[0], false);
-            }
-
-            validate();
-
-            vm.inited = true;
-
-            if (modelWasChanged) {
-                updateModel();
-            }
-
-            updatePropertyActionStates();
-            checkAbilityToPasteContent();
-        }
-
-        function extendPropertyWithNCData(prop) {
-
-            if (prop.propertyAlias === undefined) {
-                // store the original alias before we change below, see notes
-                prop.propertyAlias = prop.alias;
-
-                // NOTE: This is super ugly, the reason it is like this is because it controls the label/html id in the umb-property component at a higher level.
-                // not pretty :/ but we can't change this now since it would require a bunch of plumbing to be able to change the id's higher up.
-                prop.alias = model.alias + "___" + prop.alias;
-            }
-
-            // TODO: Do we need to deal with this separately?
-            // Force validation to occur server side as this is the
-            // only way we can have consistency between mandatory and
-            // regex validation messages. Not ideal, but it works.
-            if(prop.ncMandatory === undefined) {
-                prop.ncMandatory = prop.validation.mandatory;
-                prop.validation = {
-                    mandatory: false,
-                    pattern: ""
-                };
-            }
-        }
-
-        function createNode(scaffold, fromNcEntry) {
-            var node = Utilities.copy(scaffold);
-
-            node.key = fromNcEntry && fromNcEntry.key ? fromNcEntry.key : String.CreateGuid();
-
-            var variant = node.variants[0];
-
-            for (var t = 0; t < variant.tabs.length; t++) {
-                var tab = variant.tabs[t];
-
-                for (var p = 0; p < tab.properties.length; p++) {
-                    var prop = tab.properties[p];
-
-                    extendPropertyWithNCData(prop);
-
-                    if (fromNcEntry && fromNcEntry[prop.propertyAlias]) {
-                        prop.value = fromNcEntry[prop.propertyAlias];
-                    }
-                }
-            }
-
-            vm.nodes.push(node);
-
-            return node;
-        }
-
-        function convertNodeIntoNCEntry(node) {
-            var obj = {
-                key: node.key,
-                name: node.name,
-                ncContentTypeAlias: node.contentTypeAlias
-            };
-            for (var t = 0; t < node.variants[0].tabs.length; t++) {
-                var tab = node.variants[0].tabs[t];
-                for (var p = 0; p < tab.properties.length; p++) {
-                    var prop = tab.properties[p];
-                    if (typeof prop.value !== "function") {
-                        obj[prop.propertyAlias] = prop.value;
-                    }
-                }
-            }
-            return obj;
-        }
-
-
-
-
-        function syncCurrentNode() {
-            if (vm.currentNode) {
-                $scope.$broadcast("ncSyncVal", { key: vm.currentNode.key });
-            }
-        }
-
-        function updateModel() {
-            syncCurrentNode();
-
-            if (vm.inited) {
-                var newValues = [];
-                for (var i = 0; i < vm.nodes.length; i++) {
-                    newValues.push(convertNodeIntoNCEntry(vm.nodes[i]));
-                }
-                model.value = newValues;
-            }
-
-            updatePropertyActionStates();
-        }
-
-        function updatePropertyActionStates() {
-            copyAllEntriesAction.isDisabled = !model.value || !model.value.length;
-            removeAllEntriesAction.isDisabled = copyAllEntriesAction.isDisabled || vm.readonly;
-        }
-
-        var propertyActions = [
-            copyAllEntriesAction,
-            removeAllEntriesAction
-        ];
-
-        this.$onInit = function () {
-            if (vm.umbProperty) {
-                vm.umbProperty.setPropertyActions(propertyActions);
-            }
-        };
-
-        var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
-            updateModel();
-        });
-
-        var validate = function () {
-            if (vm.nodes.length < vm.minItems) {
-                $scope.nestedContentForm.minCount.$setValidity("minCount", false);
-            }
-            else {
-                $scope.nestedContentForm.minCount.$setValidity("minCount", true);
-            }
-
-            if (vm.maxItemsExceeded()) {
-                $scope.nestedContentForm.maxCount.$setValidity("maxCount", false);
-            }
-            else {
-                $scope.nestedContentForm.maxCount.$setValidity("maxCount", true);
-            }
-        }
-
-        var watcher = $scope.$watch(
-            function () {
-                return vm.nodes.length;
-            },
-            function () {
-                validate();
-            }
-        );
-
-        $scope.$on("$destroy", function () {
-            unsubscribe();
-            cultureChanged();
-            watcher();
-        });
-
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.controller.js
deleted file mode 100644
index 9464f494cb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.controller.js
+++ /dev/null
@@ -1,159 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.DocTypePickerController", [
-
-    "$scope",
-    "Umbraco.PropertyEditors.NestedContent.Resources",
-    "overlayService",
-    "localizationService",
-    "iconHelper",
-
-    function ($scope, ncResources, overlayService, localizationService, iconHelper) {
-        var selectElementTypeModalTitle = "";
-
-        $scope.elemTypeTabs = [];
-        $scope.expandTemplate = false;
-
-
-        init();
-
-
-        function init() {
-            localizationService.localize("content_nestedContentSelectElementTypeModalTitle").then(function (value) {
-                selectElementTypeModalTitle = value;
-            });
-
-            ncResources.getContentTypes().then(function (elemTypes) {
-                $scope.model.elemTypes = elemTypes;
-
-                // convert legacy icons
-                iconHelper.formatContentTypeIcons($scope.model.elemTypes);
-
-                // Count doctype name occurrences
-                var elTypeNameOccurrences= _.countBy(elemTypes, 'name');
-
-                // Populate document type tab dictionary
-                // And append alias to name if multiple doctypes have the same name
-                elemTypes.forEach(function (value) {
-                    $scope.elemTypeTabs[value.alias] = value.tabs;
-                    
-                    if (elTypeNameOccurrences[value.name] > 1) {
-                        value.name += " (" + value.alias + ")";
-                    }
-                });
-            });
-
-        }
-
-
-        $scope.add = function () {
-            $scope.model.value.push({
-                // As per PR #4, all stored content type aliases must be prefixed "nc" for easier recognition.
-                // For good measure we'll also prefix the tab alias "nc"
-                ncAlias: "",
-                ncTabAlias: "",
-                nameTemplate: ""
-            });
-        }
-
-        $scope.remove = function (index) {
-            $scope.model.value.splice(index, 1);
-        }
-
-        $scope.sortableOptions = {
-            axis: "y",
-            cursor: "move",
-            handle: ".handle",
-            placeholder: 'sortable-placeholder',
-            forcePlaceholderSize: true,
-            helper: function (e, ui) {
-                // When sorting table rows, the cells collapse. This helper fixes that: https://www.foliotek.com/devblog/make-table-rows-sortable-using-jquery-ui-sortable/
-                ui.children().each(function () {
-                    $(this).width($(this).width());
-                });
-                return ui;
-            },
-            start: function (e, ui) {
-
-                var cellHeight = ui.item.height();
-
-                // Build a placeholder cell that spans all the cells in the row: https://stackoverflow.com/questions/25845310/jquery-ui-sortable-and-table-cell-size
-                var cellCount = 0;
-                $('td, th', ui.helper).each(function () {
-                    // For each td or th try and get it's colspan attribute, and add that or 1 to the total
-                    var colspan = 1;
-                    var colspanAttr = $(this).attr('colspan');
-                    if (colspanAttr > 1) {
-                        colspan = colspanAttr;
-                    }
-                    cellCount += colspan;
-                });
-
-                // Add the placeholder UI - note that this is the item's content, so td rather than tr - and set height of tr
-                ui.placeholder.html('<td colspan="' + cellCount + '"></td>').height(cellHeight);
-            }
-        };
-
-
-        $scope.placeholder = function (config) {
-            return _.find($scope.model.elemTypes, function (elType) {
-                return elType.alias === config.ncAlias;
-            });
-        }
-
-        $scope.selectableElemTypesFor = function (config) {
-            // return all elemTypes that are:
-            // 1. either already selected for this config, or
-            // 2. not selected in any other config
-            return _.filter($scope.model.elemTypes, function (elType) {
-                return elType.alias === config.ncAlias || !_.find($scope.model.value, function (c) {
-                    return elType.alias === c.ncAlias;
-                });
-            });
-        }
-
-        $scope.canAdd = function () {
-            return !$scope.model.value || _.some($scope.model.elemTypes, function (elType) {
-                return !_.find($scope.model.value, function (c) {
-                    return elType.alias === c.ncAlias;
-                });
-            });
-        }
-
-        $scope.openElemTypeModal = function ($event, config) {
-
-            //we have to add the alias to the objects (they are stored as ncAlias)
-            var selectedItems = _.each($scope.model.value, function (obj) {
-                obj.alias = obj.ncAlias;
-                return obj;
-            })
-
-            var elemTypeSelectorOverlay = {
-                view: "itempicker",
-                title: selectElementTypeModalTitle,
-                availableItems: $scope.selectableElemTypesFor(config),
-                selectedItems: selectedItems,
-                position: "target",
-                event: $event,
-                submit: function (model) {
-                    config.ncAlias = model.selectedItem.alias;
-                    if (model.selectedItem.tabs.length === 1) {
-                        config.ncTabAlias = model.selectedItem.tabs[0];
-                    }
-                    overlayService.close();
-                },
-                close: function () {
-                    overlayService.close();
-                }
-            };
-
-            overlayService.open(elemTypeSelectorOverlay);
-        }
-
-
-
-        if (!$scope.model.value) {
-            $scope.model.value = [];
-            $scope.add();
-        }
-
-    }
-]);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html
deleted file mode 100644
index 58843db6ae..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<div id="{{model.alias}}" class="umb-nested-content__doctypepicker" ng-controller="Umbraco.PropertyEditors.NestedContent.DocTypePickerController">
-    <div>
-        <table class="table table-striped">
-            <thead>
-                <tr>
-                    <th></th>
-                    <th>
-                        <localize key="contentTypeEditor_elementType">Element Type</localize>
-                    </th>
-                    <th>
-                        <localize key="general_group">Group</localize>
-                    </th>
-                    <th ng-class="{'w-100':expandTemplate}">
-                        <button type="button" class="pull-right p0 btn btn-link" ng-click="expandTemplate = !expandTemplate"
-                                ng-class="{'fa-flip-horizontal': !expandTemplate}">
-                          <umb-icon icon="icon-tab-key"></umb-icon>
-                        </button>
-                        <localize key="template_template">Template</localize>
-                    </th>
-                    <th></th>
-                </tr>
-            </thead>
-            <tbody ui-sortable="sortableOptions" ng-model="model.value">
-                <tr ng-repeat="config in model.value">
-                    <td>
-                        <umb-icon icon="icon-navigation" class="handle"></umb-icon>
-                    </td>
-                    <td>
-                        {{ph = placeholder(config);hasTabsOrFirstRender = (elemTypeTabs[config.ncAlias].length || config.ncAlias=='');""}}
-                        <button type="button" class="btn-reset umb-nested-content__placeholder" ng-class="{'umb-nested-content__placeholder--selected':ph}" ng-click="openElemTypeModal($event, config)">
-                            <umb-node-preview ng-if="ph" icon="ph.icon" name="ph.name"></umb-node-preview>
-                            <localize key="content_nestedContentAddElementType" ng-if="!ph">Add element type</localize>
-                        </button>
-
-                    </td>
-                    <td>
-                        <select ng-show="hasTabsOrFirstRender" id="{{model.alias}}_tab_select"
-                                ng-options="t for t in elemTypeTabs[config.ncAlias]"
-                                ng-model="config.ncTabAlias" required></select>
-                        <span ng-show="!hasTabsOrFirstRender" class="red">
-                            <localize key="content_nestedContentNoGroups">
-                                The selected element type does not contain any supported groups (tabs are not supported by this editor, either change them to groups or use the Block List editor).
-                            </localize>
-                        </span>
-                    </td>
-                    <td>
-                        <input type="text" ng-model="config.nameTemplate" />
-                    </td>
-                    <td>
-                        <button type="button" class="btn btn-danger" ng-click="remove($index)">
-                            <localize key="general_delete">Delete</localize>
-                        </button>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-        <div>
-            <button type="button" class="btn" ng-click="add()" ng-disabled="!canAdd()">
-                <localize key="general_add">Add</localize>
-            </button>
-            <button type="button" class="btn-reset umb-nested-content__help-action" ng-click="showHelpText = !showHelpText">
-                <umb-icon icon="icon-help-alt" class="medium umb-nested-content__help-icon"></umb-icon>
-            </button>
-        </div>
-    </div>
-    <br />
-    <div class="umb-nested-content__help-text" ng-show="showHelpText">
-        <p>
-            <strong><localize key="general_group">Group</localize>:</strong><br />
-            <localize key="content_nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the element type will be used.</localize>
-        </p>
-        <p>
-            <strong><localize key="template_template">Template</localize>:</strong><br />
-            <localize key="content_nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</localize>
-            <code ng-non-bindable>{{$index}}</code>
-            <localize key="content_nestedContentTemplateHelpTextPart2">to display the item index</localize>
-        </p>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
deleted file mode 100644
index e07c219b2e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="umb-pane">
-    <div ng-repeat="property in tab.properties" class="umb-nested-content-property-container">
-
-        <umb-property 
-            property="property"
-            property-alias="{{property.propertyAlias}}"
-            element-key="{{model.key}}"
-            ng-class="{'umb-nested-content--not-supported': property.notSupported }"
-            data-element="property-{{property.alias}}">
-
-            <umb-property-editor
-                model="property"
-                preview="readonly && !property.supportsReadOnly"
-                ng-attr-readonly="{{readonly  || undefined }}">
-            </umb-property-editor>
-
-        </umb-property>
-
-        <div ng-if="property.notSupported" class="umb-nested-content-overlay"></div>
-
-        <p ng-if="property.notSupported">{{property.notSupportedMessage}}</p>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
deleted file mode 100644
index c551dc4bc3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-    <nested-content-property-editor
-        ng-attr-readonly="{{ readonly || undefined }}">
-    </nested-content-property-editor>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.propertyeditor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.propertyeditor.html
deleted file mode 100644
index e5f4564e08..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.propertyeditor.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<div id="umb-nested-content--{{model.id}}" class="umb-nested-content" ng-class="{'umb-nested-content--narrow':!vm.wideMode, 'umb-nested-content--wide':vm.wideMode}">
-
-    <umb-load-indicator class="mt2" ng-if="!vm.inited"></umb-load-indicator>
-
-    <ng-form name="nestedContentForm" ng-show="vm.inited">
-
-        <div class="umb-nested-content__items" ng-hide="vm.nodes.length === 0" ui-sortable="vm.sortableOptions" ng-model="vm.nodes">
-
-            <div ng-repeat="node in vm.nodes" ng-init="node.icon = vm.getIcon($index)">
-
-                <ng-form name="ncRowForm" val-server-match="{ 'contains': node.key }">
-
-                    <div class="umb-nested-content__item"
-                         ng-class="{ 'umb-nested-content__item--active' : vm.currentNode.key === node.key, 'umb-nested-content__item--single' : vm.singleMode, '--error': ncRowForm.$invalid }">
-
-                        <div class="umb-nested-content__header-bar"
-                             ng-click="vm.editNode($index)"
-                             ng-hide="vm.singleMode"
-                             umb-auto-focus="{{vm.focusOnNode && vm.currentNode.key === node.key ? 'true' : 'false'}}">
-
-                            <div class="umb-nested-content__heading">
-                                <umb-icon icon="{{node.icon}}" class="icon umb-nested-content__item-icon"></umb-icon>
-                                <span class="umb-nested-content__item-name" ng-class="{'--has-icon': vm.showIcons}" ng-bind="vm.getName($index)"></span>
-                            </div>
-
-                            <div class="umb-nested-content__icons">
-                                <button type="button" class="umb-nested-content__icon umb-nested-content__icon--copy" title="{{vm.labels.copy_icon_title}}" ng-click="vm.clickCopy($event, node);" ng-if="vm.showCopy">
-                                    <umb-icon icon="icon-documents" class="icon"></umb-icon>
-                                    <span class="sr-only">{{vm.labels.copy_icon_title}}</span>
-                                </button>
-                                <button ng-if="vm.allowRemove" type="button" class="umb-nested-content__icon umb-nested-content__icon--delete" localize="title" title="general_delete" ng-class="{ 'umb-nested-content__icon--disabled': !vm.canDeleteNode($index) }" ng-click="vm.requestDeleteNode($index); $event.stopPropagation();">
-                                    <umb-icon icon="icon-trash" class="icon"></umb-icon>
-                                    <span class="sr-only">
-                                        <localize key="general_delete">Delete</localize>
-                                    </span>
-                                </button>
-                            </div>
-                        </div>
-
-                        <div class="umb-nested-content__content" ng-if="vm.currentNode.key === node.key && !vm.sorting">
-                            <umb-nested-content-editor 
-                                ng-model="node" 
-                                tab-alias="ncTabAlias"
-                                ng-attr-readonly="{{ vm.readonly || undefined }}">
-                            </umb-nested-content-editor>
-                        </div>
-                    </div>
-
-                </ng-form>
-            </div>
-
-        </div>
-
-        <div ng-hide="vm.hasContentTypes">
-            <div class="umb-nested-content__help-text">
-                <localize key="content_nestedContentNoContentTypes">No content types are configured for this property.</localize>
-            </div>
-        </div>
-        <div class="umb-nested-content__footer-bar" ng-hide="!vm.inited || vm.hasContentTypes === false || vm.singleMode === true">
-            <button
-                type="button"
-                class="btn-reset umb-nested-content__add-content umb-focus"
-                ng-class="{ '--disabled': (!vm.scaffolds.length || vm.maxItemsReached()) }"
-                ng-click="vm.openNodeTypePicker($event)"
-                aria-disabled="{{!vm.scaffolds.length || vm.maxItemsReached()}}"
-                ng-disabled="!vm.allowAdd">
-                <localize key="grid_addElement">Add element</localize>
-            </button>
-        </div>
-
-
-        <!--These are here because we need ng-form fields to validate against-->
-        <input type="hidden" name="minCount" ng-model="vm.nodes" />
-        <input type="hidden" name="maxCount" ng-model="vm.nodes" />
-
-        <div ng-messages="nestedContentForm.minCount.$error" show-validation-on-submit>
-            <div class="help text-error" ng-message="minCount">
-                <localize key="validation_entriesShort" tokens="[vm.minItems, vm.minItems - vm.nodes.length]" watch-tokens="true">Minimum %0% entries, needs <strong>%1%</strong> more.</localize>
-            </div>
-        </div>
-        <div ng-if="nestedContentForm.minCount.$error === true || vm.maxItemsExceeded()">
-            <div class="help text-error">
-                <localize key="validation_entriesExceed" tokens="[vm.maxItems, vm.nodes.length - vm.maxItems]" watch-tokens="true">Maximum %0% entries, <strong>%1%</strong> too many.</localize>
-            </div>
-        </div>
-
-    </ng-form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.html
deleted file mode 100644
index f052415a05..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="umb-property-editor umb-property-editor--notsupported">
-    <localize key="blockEditor_propertyEditorNotSupported" tokens="[model.label, model.editor]"></localize>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.less
deleted file mode 100644
index d2c7641b3f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/notsupported/notsupported.less
+++ /dev/null
@@ -1,7 +0,0 @@
-.umb-property-editor.umb-property-editor--notsupported {
-    background-color: @red;
-    color: white;
-    padding: 5px 10px;
-    width: auto;
-    border-radius: (@baseBorderRadius * 2);
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js
deleted file mode 100644
index f0293a179f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.controller.js
+++ /dev/null
@@ -1,40 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PropertyEditors.RadioButtonsController",
-    function ($scope, validationMessageService) {
-
-        const vm = this;
-
-        vm.viewItems = [];
-
-        function init() {
-
-            vm.uniqueId = String.CreateGuid();
-
-            //we can't really do anything if the config isn't an object
-            if (Utilities.isObject($scope.model.config.items)) {
-
-                // formatting the items in the dictionary into an array
-                let sortedItems = [];
-                let vals = _.values($scope.model.config.items);
-                let keys = _.keys($scope.model.config.items);
-                
-                for (let i = 0; i < vals.length; i++) {
-                    sortedItems.push({ key: keys[i], sortOrder: vals[i].sortOrder, value: vals[i].value });
-                }
-
-                // ensure the items are sorted by the provided sort order
-                sortedItems.sort((a, b) => (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0) );
-
-                vm.viewItems = sortedItems;
-            }
-
-            // Set the message to use for when a mandatory field isn't completed.
-            // Will either use the one provided on the property type or a localised default.
-            validationMessageService.getMandatoryMessage($scope.model.validation).then(value => {
-                $scope.mandatoryMessage = value;
-            });
-            
-        }
-
-        init();
-
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
deleted file mode 100644
index 49f08fd165..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="umb-property-editor umb-radiobuttons" ng-controller="Umbraco.PropertyEditors.RadioButtonsController as vm">
-    <ng-form name="radioButtonsFieldForm">
-
-        <ul class="unstyled" ng-if="vm.viewItems.length">
-            <li ng-repeat="item in vm.viewItems track by item.key">
-                <umb-radiobutton 
-                    name="{{model.alias}}_{{vm.uniqueId}}"
-                    value="{{item.value}}"
-                    model="model.value"
-                    text="{{item.value}}"
-                    required="model.validation.mandatory && model.value == ''"
-                    ng-attr-readonly="{{ readonly || undefined }}">
-                </umb-radiobutton>
-            </li>
-        </ul>
-
-        <div ng-messages="radioButtonsFieldForm[model.alias + '_' + vm.uniqueId].$error" show-validation-on-submit>
-            <p class="help-inline" ng-message="required">{{mandatoryMessage}}</p>
-        </div>
-
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js
deleted file mode 100644
index a49ffeadaa..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.ReadOnlyValueController
- * @function
- * 
- * @description
- * The controller for the readonlyvalue property editor. 
- *  This controller offer more functionality than just a simple label as it will be able to apply formatting to the 
- *  value to be displayed. This means that we also have to apply more complex logic of watching the model value when 
- *  it changes because we are creating a new scope value called displayvalue which will never change based on the server data.
- *  In some cases after a form submission, the server will modify the data that has been persisted, especially in the cases of 
- *  readonlyvalues so we need to ensure that after the form is submitted that the new data is reflected here.
-*/
-function ReadOnlyValueController($rootScope, $scope, $filter) {
-
-    function formatDisplayValue() {
-        if ($scope.model.config && $scope.model.config.filter) {
-            if ($scope.model.config.format) {
-                $scope.displayvalue = $filter($scope.model.config.filter)($scope.model.value, $scope.model.config.format);
-            } else {
-                $scope.displayvalue = $filter($scope.model.config.filter)($scope.model.value);
-            }
-        } else {
-            $scope.displayvalue = $scope.model.value;
-        }
-    }
-
-    //format the display value on init:
-    formatDisplayValue();
-
-    $scope.$watch("model.value", function (newVal, oldVal) {
-        //cannot just check for !newVal because it might be an empty string which we 
-        //want to look for.
-        if (newVal !== null && newVal !== undefined && newVal !== oldVal) {
-            //update the display val again
-            formatDisplayValue();
-        }
-    });
-}
-
-angular.module('umbraco').controller("Umbraco.PropertyEditors.ReadOnlyValueController", ReadOnlyValueController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html
deleted file mode 100644
index 893ba342db..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="umb-property-editor umb-readonlyvalue" ng-controller="Umbraco.PropertyEditors.ReadOnlyValueController">
-    <span ng-bind-html="displayvalue"></span>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
deleted file mode 100644
index e642051733..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
+++ /dev/null
@@ -1,234 +0,0 @@
-angular.module("umbraco")
-    .controller("Umbraco.PropertyEditors.RelatedLinksController",
-        function ($scope, iconHelper, editorService) {
-
-            if (!$scope.model.value) {
-                $scope.model.value = [];
-            }
-
-            $scope.model.config.max = isNumeric($scope.model.config.max) && $scope.model.config.max !== 0 ? $scope.model.config.max : Number.MAX_VALUE;
-            
-            $scope.newCaption = '';
-            $scope.newLink = 'http://';
-            $scope.newNewWindow = false;
-            $scope.newInternal = null;
-            $scope.newInternalName = '';
-            $scope.newInternalIcon = null;
-            $scope.addExternal = true;
-            $scope.currentEditLink = null;
-            $scope.hasError = false;
-
-            $scope.internal = function ($event) {
-                
-                $scope.currentEditLink = null;
-
-                var contentPicker = {
-                    section: "content",
-                    treeAlias: "content",
-                    multiPicker: false,
-                    idType: $scope.model.config.idType ? $scope.model.config.idType : "int",
-                    submit: function (model) {
-                        select(model.selection[0]);
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-
-                editorService.treePicker(contentPicker);
-
-                $event.preventDefault();
-            };
-
-            $scope.selectInternal = function ($event, link) {
-                
-                $scope.currentEditLink = link;
-
-                var contentPicker = {
-                    section: "content",
-                    treeAlias: "content",
-                    multiPicker: false,
-                    idType: $scope.model.config.idType ? $scope.model.config.idType : "udi",
-                    submit: function (model) {
-                        select(model.selection[0]);
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-                editorService.treePicker(contentPicker);
-
-                $event.preventDefault();
-            };
-
-            $scope.edit = function (idx) {
-                for (var i = 0; i < $scope.model.value.length; i++) {
-                    $scope.model.value[i].edit = false;
-                }
-                $scope.model.value[idx].edit = true;
-            };
-
-            $scope.saveEdit = function (idx) {
-                $scope.model.value[idx].title = $scope.model.value[idx].caption;
-                $scope.model.value[idx].edit = false;
-            };
-
-            $scope.delete = function (idx) {               
-                $scope.model.value.splice(idx, 1);               
-            };
-
-            $scope.add = function ($event) {
-				if (!Utilities.isArray($scope.model.value)) {
-                  $scope.model.value = [];
-				}
-				
-                if ($scope.newCaption == "") {
-                    $scope.hasError = true;
-                } else {
-                    if ($scope.addExternal) {
-                        var newExtLink = new function() {
-                            this.caption = $scope.newCaption;
-                            this.link = $scope.newLink;
-                            this.newWindow = $scope.newNewWindow;
-                            this.edit = false;
-                            this.isInternal = false;
-                            this.type = "external";
-                            this.title = $scope.newCaption;
-                        };
-                        $scope.model.value.push(newExtLink);
-                    } else {
-                        var newIntLink = new function() {
-                            this.caption = $scope.newCaption;
-                            this.link = $scope.newInternal;
-                            this.newWindow = $scope.newNewWindow;
-                            this.internal = $scope.newInternal;
-                            this.edit = false;
-                            this.isInternal = true;
-                            this.internalName = $scope.newInternalName;
-                            this.internalIcon = $scope.newInternalIcon;
-                            this.type = "internal";
-                            this.title = $scope.newCaption;
-                        };
-                        $scope.model.value.push(newIntLink);
-                    }
-                    $scope.newCaption = '';
-                    $scope.newLink = 'http://';
-                    $scope.newNewWindow = false;
-                    $scope.newInternal = null;
-                    $scope.newInternalName = '';
-                    $scope.newInternalIcon = null;
-                }
-                $event.preventDefault();
-            };
-
-            $scope.switch = function ($event) {
-                $scope.addExternal = !$scope.addExternal;
-                $event.preventDefault();
-            };
-            
-            $scope.switchLinkType = function ($event, link) {
-                link.isInternal = !link.isInternal;                
-                link.type = link.isInternal ? "internal" : "external";
-                if (!link.isInternal)
-                    link.link = $scope.newLink;
-                $event.preventDefault();
-            };
-
-            $scope.move = function (index, direction) {
-                var temp = $scope.model.value[index];
-                $scope.model.value[index] = $scope.model.value[index + direction];
-                $scope.model.value[index + direction] = temp;                
-            };
-
-            //helper for determining if a user can add items
-            $scope.canAdd = function () {
-                return $scope.model.config.max <= 0 || $scope.model.config.max > countVisible();
-            }
-
-            //helper that returns if an item can be sorted
-            $scope.canSort = function () {
-                return countVisible() > 1;
-            }
-
-            $scope.sortableOptions = {
-                axis: 'y',
-                handle: '.handle',
-                cursor: 'move',
-                cancel: '.no-drag',
-                containment: 'parent',
-                placeholder: 'sortable-placeholder',
-                forcePlaceholderSize: true,
-                helper: function (e, ui) {
-                    // When sorting table rows, the cells collapse. This helper fixes that: https://www.foliotek.com/devblog/make-table-rows-sortable-using-jquery-ui-sortable/
-                    ui.children().each(function () {
-                        $(this).width($(this).width());
-                    });
-                    return ui;
-                },
-                items: '> tr:not(.unsortable)',
-                tolerance: 'pointer',
-                update: function (e, ui) {
-                    // Get the new and old index for the moved element (using the URL as the identifier)
-                    var newIndex = ui.item.index();
-                    var movedLinkUrl = ui.item.attr('data-link');
-                    var originalIndex = getElementIndexByUrl(movedLinkUrl);
-
-                    // Move the element in the model
-                    var movedElement = $scope.model.value[originalIndex];
-                    $scope.model.value.splice(originalIndex, 1);
-                    $scope.model.value.splice(newIndex, 0, movedElement);
-                },
-                start: function (e, ui) {
-                    //ui.placeholder.html("<td colspan='5'></td>");
-
-                    // Build a placeholder cell that spans all the cells in the row: https://stackoverflow.com/questions/25845310/jquery-ui-sortable-and-table-cell-size
-                    var cellCount = 0;
-                    $('td, th', ui.helper).each(function () {
-                        // For each td or th try and get it's colspan attribute, and add that or 1 to the total
-                        var colspan = 1;
-                        var colspanAttr = $(this).attr('colspan');
-                        if (colspanAttr > 1) {
-                            colspan = colspanAttr;
-                        }
-                        cellCount += colspan;
-                    });
-
-                    // Add the placeholder UI - note that this is the item's content, so td rather than tr - and set height of tr
-                    ui.placeholder.html('<td colspan="' + cellCount + '"></td>').height(ui.item.height());
-                }
-            };
-
-            //helper to count what is visible
-            function countVisible() {
-                return $scope.model.value.length;
-            }
-
-            function isNumeric(n) {
-                return !isNaN(parseFloat(n)) && isFinite(n);
-            }
-
-            function getElementIndexByUrl(url) {
-                for (var i = 0; i < $scope.model.value.length; i++) {
-                    if ($scope.model.value[i].link == url) {
-                        return i;
-                    }
-                }
-
-                return -1;
-            }
-
-            function select(data) {
-                if ($scope.currentEditLink != null) {
-                    $scope.currentEditLink.internal = $scope.model.config.idType === "udi" ? data.udi : data.id;
-                    $scope.currentEditLink.internalName = data.name;
-                    $scope.currentEditLink.internalIcon = iconHelper.convertFromLegacyIcon(data.icon);
-                    $scope.currentEditLink.link = $scope.model.config.idType === "udi" ? data.udi : data.id;
-                } else {
-                    $scope.newInternal = $scope.model.config.idType === "udi" ? data.udi : data.id;
-                    $scope.newInternalName = data.name;
-                    $scope.newInternalIcon = iconHelper.convertFromLegacyIcon(data.icon);
-                }
-            }
-        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
deleted file mode 100644
index 387b7010c9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<div class="umb-property-editor umb-relatedlinks" ng-controller="Umbraco.PropertyEditors.RelatedLinksController">
-
-    <table class="table table-striped">
-        <thead>
-            <tr>
-                <td></td>
-                <td><localize key="relatedlinks_caption">Caption</localize></td>
-                <td><localize key="relatedlinks_link">Link</localize></td>
-                <td><localize key="relatedlinks_newWindow">New window</localize></td>
-                <td></td>
-            </tr>
-        </thead>
-        <tbody ui-sortable="sortableOptions" ng-model="model.value">
-            <tr ng-repeat="link in model.value" data-link="{{link.link}}" ng-class="{ 'unsortable': model.value.length <= 1 }">
-                <td class="col-sort"><umb-icon icon="icon-navigation" class="icon handle" ng-show="canSort()"></umb-icon></td>
-                <td class="col-caption">
-                    <span ng-show="!link.edit">{{link.caption}}</span>
-                    <div class="control-wrapper">
-                        <input type="text" ng-model="link.caption" ng-show="link.edit" />
-                    </div>
-                </td>
-                <td class="col-link">
-                    <div ng-show="!link.edit">
-                        <umb-icon icon="{{link.internalIcon}}" class="icon" ng-show="link.internalIcon"></umb-icon>
-                        <a href="{{link.link}}" target="_blank" rel="noopener" ng-show="!link.isInternal">{{link.link}}</a>
-                        <a href="#/content/content/edit/{{link.internal}}" target="_blank" rel="noopener" ng-show="link.isInternal" ng-bind="link.internalName"></a>
-                    </div>
-                    <div ng-show="link.edit">
-                        <div ng-show="!link.isInternal">
-                            <div class="control-wrapper">
-                                <input type="text" ng-model="link.link" />
-                            </div>
-                            <localize key="or">or</localize> <a href="#" ng-click="switchLinkType($event,link)"><localize key="relatedlinks_chooseInternal">choose internal page</localize></a>
-                        </div>
-
-                        <div ng-show="link.isInternal">
-                            <umb-icon icon="{{link.internalIcon}}" class="icon" ng-show="link.internalIcon"></umb-icon>
-                            <span ng-bind="link.internalName"></span> <a href="#" ng-click="selectInternal($event,link)"><localize key="choose">Choose</localize></a><br />
-                            <localize key="or">or</localize> <a href="#" ng-click="switchLinkType($event,link)"><localize key="relatedlinks_enterExternal">enter external link</localize></a>
-                        </div>
-                    </div>
-                </td>
-                <td class="col-newwindow">
-                    <span ng-show="!link.edit">{{link.newWindow}}</span>
-                    <input type="checkbox" ng-model="link.newWindow" ng-show="link.edit" />
-                </td>
-                <td class="col-actions">
-                    <div class="btn-group" ng-show="!link.edit">
-                        <button type="button" class="btn btn-default" ng-click="edit($index)"><localize key="edit">Edit</localize></button>
-                        <button type="button" class="btn btn-default" ng-click="delete($index)"><localize key="delete">Delete</localize></button>
-                    </div>
-                    <div class="btn-group" ng-show="link.edit" style="margin-left: 0;">
-                        <button type="button" class="btn btn-default" ng-click="saveEdit($index)"><localize key="buttons_save">Save</localize></button>
-                    </div>
-                </td>
-            </tr>
-        </tbody>
-        <tfoot ng-show="canAdd()">
-            <tr>
-                <td class="col-sort"></td>
-                <td class="col-caption">
-                    <div class="control-wrapper">
-                        <input type="text" ng-model="newCaption" localize="placeholder" placeholder="@relatedlinks_captionPlaceholder" val-highlight="hasError" />
-                    </div>
-                </td>
-                <td class="col-link">
-                    <div ng-show="addExternal">
-                        <div class="control-wrapper">
-                            <input type="text" ng-model="newLink" localize="placeholder" placeholder="@relatedlinks_externalLinkPlaceholder" />
-                        </div>
-                        <localize key="or">or</localize>
-                        <a href="#" ng-click="switch($event)"><localize key="relatedlinks_chooseInternal">choose internal page</localize></a>
-                    </div>
-
-                    <div ng-show="!addExternal">
-                        <umb-icon icon="{{newInternalIcon}}" class="icon" ng-show="newInternalIcon"></umb-icon>
-                        <span ng-bind="newInternalName"></span> <a href="#" ng-click="internal($event)"><localize key="choose">Choose</localize></a><br />
-                        <localize key="or">or</localize> <a href="#" ng-click="switch($event)"><localize key="relatedlinks_enterExternal">enter external link</localize></a>
-                    </div>
-                </td>
-                <td class="col-newwindow"><input type="checkbox" ng-model="newNewWindow" /></td>
-                <td class="col-actions">
-                    <div class="btn-group">
-                        <button class="btn btn-default" ng-click="add($event)" ng-disabled="newCaption == '' || !canAdd()" ng-show="canAdd()"><localize key="general_add">Add</localize></button>
-                    </div>
-                </td>
-            </tr>
-        </tfoot>
-    </table>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blockrteui.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blockrteui.less
deleted file mode 100644
index 428c3e980c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blockrteui.less
+++ /dev/null
@@ -1,114 +0,0 @@
-@import "../../../less/variables.less";
-@import "../../../less/mixins.less";
-@import "../../../less/icons.less";
-@import "../../../less/buttons.less";
-@import "../../../less/accessibility/sr-only.less";
-
-@umb-block-rte__item_minimum_height: 48px;
-
-
-.umb-block-rte__block {
-  position: relative;
-}
-
-ng-form.ng-invalid .umb-block-rte__block--actions {
-    opacity: 1;
-}
-
-
-.umb-block-rte--view {
-  position: relative;
-}
-.umb-block-rte--view::after {
-  position:absolute;
-  content: '';
-  inset: 0;
-  border-style: solid;
-  border-color: #6ab4f0;
-  border-width: calc(var(--umb-rte-block--selected, 0) * 2px);
-  border-radius:3px;
-  pointer-events:none;
-}
-
-.umb-block-rte__block--actions {
-    
-    position: absolute;
-    top: 0px;
-    padding-top:10px;/** set to make sure programmatic scrolling gets the top of the block into view. */
-
-    right: 10px;
-
-    /*
-    If child block, it can be hidden if a parents sets: --umb-block-rte--block-ui-display: none;
-    */
-    display: flex;
-    opacity: 1;
-    z-index:3;
-    
-    font-size: 0;
-    background-color: rgba(255, 255, 255, .96);
-    border-radius: 16px;
-    align-items: center;
-    padding: 0 5px;
-    margin-top:10px;
-
-    .action {
-        color: @ui-action-discreet-type;
-        font-size: 18px;
-        padding: 5px;
-        &:hover {
-            color: @ui-action-discreet-type-hover;
-        }
-    }
-
-    .action {
-        position: relative;
-        display: inline-block;
- 
-        &.--error {
-            color: @errorBackground;
-            /** TODO: warning color class does not work in shadowDOM. */
-            .show-validation-type-warning & {
-                color: @warningBackground;
-            }
-        }
-
-        > .__error-badge {
-            position: absolute;
-            top: -2px;
-            right: -2px;
-            min-width: 8px;
-            color: @white;
-            background-color: @ui-active-type;
-            border: 2px solid @white;
-            border-radius: 50%;
-            font-size: 8px;
-            font-weight: bold;
-            padding: 2px;
-            line-height: 8px;
-            background-color: @errorBackground;
-            .show-validation-type-warning & {
-                background-color: @warningBackground;
-            }
-            display: none;
-            font-weight: 900;
-        }
-        &.--error > .__error-badge {
-            display: block;
-
-            animation-duration: 1.4s;
-            animation-iteration-count: infinite;
-            animation-name: umb-block-rte__action--badge-bounce;
-            animation-timing-function: ease;
-            @keyframes umb-block-rte__action--badge-bounce {
-                0%   { transform: translateY(0); }
-                20%  { transform: translateY(-4px); }
-                40%  { transform: translateY(0); }
-                55%  { transform: translateY(-2px); }
-                70%  { transform: translateY(0); }
-                100% { transform: translateY(0); }
-            }
-
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/blockrteentryeditors/labelblock/rtelabelblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/blockrteentryeditors/labelblock/rtelabelblock.editor.html
deleted file mode 100644
index ea8d3bffd9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/blockrteentryeditors/labelblock/rtelabelblock.editor.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<style>
-    .blockelement-rteblock-editor {
-        position: relative;
-        border-radius: 3px;
-        min-height: 48px;
-        box-sizing: border-box;
-        border: 1px solid #E9E9EB;
-        background-color: white;
-    }
-
-    .blockelement-rteblock-editor > button {
-        position: relative;
-        display: flex;
-        align-items: center;
-        width: 100%;
-        min-height: 48px;
-        cursor: pointer;
-        color: #1b264f;
-        background-color: white;
-        text-align: left;
-        padding: 0 20px;
-
-        border: none;
-        transition: border-color 120ms, background-color 120ms;
-    }
-    .blockelement-rteblock-editor > button:hover {
-        color: #2152A3;
-    }
-    .blockelement-rteblock-editor .icon {
-        font-size: 22px;
-        margin-right: 10px;
-        display: inline-block;
-    }
-
-    .blockelement-rteblock-editor > button > span {
-        position: relative;
-        display: inline-block;
-        padding-top:2px;
-        padding-bottom:2px;
-    }
-
-
-    .blockelement-rteblock-editor.--inline {
-        width: 240px;
-    }
-
-
-</style>
-
-<div class="blockelement-rteblock-editor" ng-class="{ '--active': block.active, '--inline': block.config.displayInline, '--error': parentForm.$invalid && valFormManager.isShowingValidation() }">
-    <button type="button"
-        ng-click="block.edit()"
-        ng-focus="block.focus"
-        val-server-property-class="">
-        <umb-icon icon="{{block.content.icon}}" class="icon"></umb-icon>
-        <span>{{block.label}}</span>
-    </button>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/blockrteentryeditors/unsupportedblock/unsupportedblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/blockrteentryeditors/unsupportedblock/unsupportedblock.editor.html
deleted file mode 100644
index 259f3d72e6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/blockrteentryeditors/unsupportedblock/unsupportedblock.editor.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<style>
-    .blockelement-unsupportedblock-editor {
-        position: relative;
-        display: block;
-        box-sizing: border-box;
-        width: 100%;
-        border: 1px solid #E9E9EB;
-        border-radius: 3px;
-        background-color: lightgrey;
-    }
-
-    .blockelement-unsupportedblock-editor > .__header {
-        display: flex;
-        align-items: center;
-        padding-left: 20px;
-        padding-bottom: 2px;
-        min-height: 48px;
-        border-bottom: 1px solid #E9E9EB;
-        background-color: white;
-        color: #333333;
-    }
-
-    .blockelement-unsupportedblock-editor > .__header.icon {
-        font-size: 22px;
-        margin-right: 5px;
-        display: inline-block;
-        vertical-align: middle;
-    }
-    .blockelement-unsupportedblock-editor > .__headerspan {
-        display: inline-block;
-        vertical-align: middle;
-    }
-
-    .blockelement-unsupportedblock-editor > .__body {
-        padding: 20px;
-    }
-    .blockelement-unsupportedblock-editor > .__body a {
-        text-decoration: underline;
-        color: blue;
-    }
-
-
-</style>
-
-<div class="blockelement-unsupportedblock-editor" ng-focus="block.focus">
-    <div class="__header">
-        <umb-icon icon="icon-alert" class="icon" style="margin-right:10px"></umb-icon>
-        <span>{{block.config.label}}</span>
-    </div>
-    <div class="__body">
-        This content is no longer supported in this context.<br/>
-        You might want to remove this block, or contact your developer to take actions for making this block available again.<br/><br/>
-        <!-- TODO: Add link when we have one
-		    <a href="http://our.umbraco.com" target="_blank" rel="noopener">Learn more about this warning</a>
-		-->
-        <h5>Block data:</h5>
-        <pre>{{block.data | json : 4 }}</pre>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.controller.js
deleted file mode 100644
index 8e7892d5a0..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.controller.js
+++ /dev/null
@@ -1,246 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.BlockRTE.BlockConfigurationController
- * @function
- *
- * @description
- * The controller for the content type editor property settings dialog
- */
-
-(function () {
-    "use strict";
-
-    function TransferProperties(fromObject, toObject) {
-        for (var p in fromObject) {
-            toObject[p] = fromObject[p];
-        }
-    }
-
-    function BlockConfigurationController($scope, elementTypeResource, overlayService, localizationService, editorService, eventsService, udiService) {
-
-        var unsubscribe = [];
-
-        const vm = this;
-        vm.openBlock = null;
-
-        function onInit() {
-
-            if (!$scope.model.value) {
-                $scope.model.value = [];
-            }
-
-            loadElementTypes();
-        }
-
-        function loadElementTypes() {
-            return elementTypeResource.getAll().then(elementTypes => {
-                vm.elementTypes = elementTypes;
-            });
-        }
-
-        function updateUsedElementTypes(event, args) {
-            var key = args.documentType.key;
-            for (var i = 0; i<vm.elementTypes.length; i++) {
-                if (vm.elementTypes[i].key === key) {
-                    vm.elementTypes[i] = args.documentType;
-                }
-            }
-        }
-
-        unsubscribe.push(eventsService.on("editors.documentType.saved", updateUsedElementTypes));
-
-        vm.requestRemoveBlockByIndex = function (index, event) {
-
-            const labelKeys = [
-              "general_delete",
-              "blockEditor_confirmDeleteBlockTypeMessage",
-              "blockEditor_confirmDeleteBlockTypeNotice"
-            ];
-
-            localizationService.localizeMany(labelKeys).then(data => {
-                var contentElementType = vm.getElementTypeByKey($scope.model.value[index].contentElementTypeKey);
-                overlayService.confirmDelete({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [contentElementType ? contentElementType.name : "(Unavailable ElementType)"]),
-                    confirmMessage: data[2],
-                    submit: () => {
-                        vm.removeBlockByIndex(index);
-                        overlayService.close();
-                    },
-                    close: overlayService.close()
-                });
-            });
-
-            event.stopPropagation();
-        };
-
-        vm.removeBlockByIndex = function (index) {
-            $scope.model.value.splice(index, 1);
-        };
-
-        vm.sortableOptions = {
-            "ui-floating": true,
-            items: "umb-block-card",
-            cursor: "grabbing",
-            placeholder: 'umb-block-card --sortable-placeholder'
-        };
-
-        vm.getAvailableElementTypes = function () {
-            return vm.elementTypes.filter(function (type) {
-                return !$scope.model.value.find(function (entry) {
-                    return type.key === entry.contentElementTypeKey;
-                });
-            });
-        };
-
-        vm.getElementTypeByKey = function(key) {
-            if (vm.elementTypes) {
-                return vm.elementTypes.find(type => type.key === key) || null;
-            }
-        };
-
-        vm.openAddDialog = function () {
-
-            localizationService.localize("blockEditor_headlineCreateBlock").then(localizedTitle => {
-
-                const contentTypePicker = {
-                    title: localizedTitle,
-                    section: "settings",
-                    treeAlias: "documentTypes",
-                    entityType: "documentType",
-                    isDialog: true,
-                    filter: function (node) {
-                        if (node.metaData.isElement === true) {
-                            var key = udiService.getKey(node.udi);
-
-                            // If a Block with this ElementType as content already exists, we will emit it as a posible option.
-                            return $scope.model.value.find(entry => entry.contentElementTypeKey === key);
-                        }
-                        return true;
-                    },
-                    filterCssClass: "not-allowed",
-                    select: function (node) {
-                        vm.addBlockFromElementTypeKey(udiService.getKey(node.udi));
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    },
-                    extraActions: [
-                        {
-                            style: "primary",
-                            labelKey: "blockEditor_labelcreateNewElementType",
-                            action: function () {
-                                vm.createElementTypeAndCallback((documentTypeKey) => {
-                                    vm.addBlockFromElementTypeKey(documentTypeKey);
-
-                                    // At this point we will close the contentTypePicker.
-                                    editorService.close();
-                                });
-                            }
-                        }
-                    ]
-                };
-
-                editorService.treePicker(contentTypePicker);
-            });
-        };
-
-        vm.createElementTypeAndCallback = function(callback) {
-            const editor = {
-                create: true,
-                infiniteMode: true,
-                noTemplate: true,
-                isElement: true,
-                submit: function (model) {
-                    loadElementTypes().then(() => {
-                        callback(model.documentTypeKey);
-                    });
-
-                    editorService.close();
-                },
-                close: function () {
-                    editorService.close();
-                }
-            };
-            editorService.documentTypeEditor(editor);
-        }
-
-        vm.addBlockFromElementTypeKey = function(key) {
-
-            const blockType = {
-                contentElementTypeKey: key,
-                settingsElementTypeKey: null,
-                labelTemplate: "",
-                displayInline: false,
-                view: null,
-                stylesheet: null,
-                editorSize: "medium",
-                iconColor: null,
-                backgroundColor: null,
-                thumbnail: null
-            };
-
-            $scope.model.value.push(blockType);
-
-            vm.openBlockOverlay(blockType);
-        };
-
-        vm.openBlockOverlay = function (block) {
-
-            var elementType = vm.getElementTypeByKey(block.contentElementTypeKey);
-
-            if (elementType) {
-
-                let clonedBlockData = Utilities.copy(block);
-                vm.openBlock = block;
-
-                const overlayModel = {
-                    block: clonedBlockData,
-
-                    view: "views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.overlay.html",
-                    size: "small",
-                    submit: function(overlayModel) {
-                        loadElementTypes()// lets load elementType again, to ensure we are up to date.
-                        TransferProperties(overlayModel.block, block);// transfer properties back to block object. (Doing this cause we dont know if block object is added to model jet, therefor we cant use index or replace the object.)
-                        overlayModel.close();
-                    },
-                    close: function() {
-                        editorService.close();
-                        vm.openBlock = null;
-                    }
-                };
-
-                localizationService.localize("blockEditor_blockConfigurationOverlayTitle", [elementType.name]).then(data => {
-                    overlayModel.title = data,
-
-                    // open property settings editor
-                    editorService.open(overlayModel);
-                });
-            } else {
-
-              const overlay = {
-                close: () => {
-                  overlayService.close()
-                }
-              };
-
-              localizationService.localize("blockEditor_elementTypeDoesNotExist").then(data => {
-                overlay.content = data;
-                overlayService.open(overlay);
-              });
-            }
-
-        };
-
-        $scope.$on('$destroy', function () {
-            unsubscribe.forEach(u => { u(); });
-        });
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockRTE.BlockConfigurationController", BlockConfigurationController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.html
deleted file mode 100644
index c7aed33262..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="umb-block-list-block-configuration" ng-controller="Umbraco.PropertyEditors.BlockRTE.BlockConfigurationController as vm">
-
-    <div class="umb-block-card-grid" ui-sortable="vm.sortableOptions" ng-model="model.value">
-
-        <umb-block-card
-            block-config-model="block"
-            element-type-model="vm.getElementTypeByKey(block.contentElementTypeKey)"
-            ng-repeat="block in model.value"
-            ng-class="{'--isOpen':vm.openBlock === block}"
-            ng-click="vm.openBlockOverlay(block)">
-            <div class="__actions" ng-click="$event.stopPropagation()" tabindex="-1">
-                <button type="button"
-                        class="btn-reset __action umb-outline"
-                        ng-click="vm.requestRemoveBlockByIndex($index, $event)">
-                    <umb-icon icon="icon-trash" class="icon"></umb-icon>
-                    <localize key="general_delete" class="sr-only">Delete</localize>
-                </button>
-            </div>
-        </umb-block-card>
-
-        <button type="button" id="{{model.alias}}" class="btn-reset __add-button" ng-click="vm.openAddDialog($event)">
-            <localize key="general_add">Add</localize>
-        </button>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.overlay.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.overlay.controller.js
deleted file mode 100644
index fc8e0ae547..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.overlay.controller.js
+++ /dev/null
@@ -1,314 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.BlockRTE.BlockConfigurationOverlayController
- * @function
- *
- * @description
- * The controller for the content type editor property settings dialog
- */
-
-(function () {
-    "use strict";
-
-    function BlockConfigurationOverlayController($scope, overlayService, localizationService, editorService, elementTypeResource, eventsService, udiService, angularHelper) {
-
-        var unsubscribe = [];
-
-        var vm = this;
-        vm.block = $scope.model.block;
-
-        vm.colorPickerOptions = {
-            type: "color",
-            allowEmpty: true,
-            showAlpha: true
-        };
-
-        loadElementTypes();
-
-        function loadElementTypes() {
-            return elementTypeResource.getAll().then(function(elementTypes) {
-                vm.elementTypes = elementTypes;
-
-                vm.contentPreview = vm.getElementTypeByKey(vm.block.contentElementTypeKey);
-                vm.settingsPreview = vm.getElementTypeByKey(vm.block.settingsElementTypeKey);
-            });
-        }
-
-        vm.getElementTypeByKey = function(key) {
-            return vm.elementTypes.find(function (type) {
-                return type.key === key;
-            });
-        };
-
-        vm.openElementType = function(elementTypeKey) {
-            var elementType = vm.getElementTypeByKey(elementTypeKey);
-            if (elementType) {
-                var elementTypeId = elementType.id;
-                const editor = {
-                    id: elementTypeId,
-                    submit: function (model) {
-                        editorService.close();
-                    },
-                    close: function () {
-                        editorService.close();
-                    }
-                };
-                editorService.documentTypeEditor(editor);
-            }
-        };
-
-        vm.createElementTypeAndCallback = function(callback) {
-            const editor = {
-                create: true,
-                infiniteMode: true,
-                isElement: true,
-                noTemplate: true,
-                submit: function (model) {
-                    callback(model.documentTypeKey);
-                    editorService.close();
-                },
-                close: function () {
-                    editorService.close();
-                }
-            };
-            editorService.documentTypeEditor(editor);
-        };
-
-        vm.addSettingsForBlock = function($event, block) {
-
-            localizationService.localize("blockEditor_headlineAddSettingsElementType").then(localizedTitle => {
-
-                const settingsTypePicker = {
-                    title: localizedTitle,
-                    entityType: "documentType",
-                    isDialog: true,
-                    filter: node => {
-                        if (node.metaData.isElement === true) {
-                            return false;
-                        }
-                        return true;
-                    },
-                    filterCssClass: "not-allowed",
-                    select: node => {
-                        vm.applySettingsToBlock(block, udiService.getKey(node.udi));
-                        editorService.close();
-                    },
-                    close: () => editorService.close(),
-                    extraActions: [
-                        {
-                            style: "primary",
-                            labelKey: "blockEditor_labelcreateNewElementType",
-                            action: () => {
-                                vm.createElementTypeAndCallback((key) => {
-                                    vm.applySettingsToBlock(block, key);
-
-                                    // At this point we will close the contentTypePicker.
-                                    editorService.close();
-                                });
-                            }
-                        }
-                    ]
-                };
-
-                editorService.contentTypePicker(settingsTypePicker);
-
-            });
-        };
-
-        vm.applySettingsToBlock = function(block, key) {
-            block.settingsElementTypeKey = key;
-            vm.settingsPreview = vm.getElementTypeByKey(vm.block.settingsElementTypeKey);
-        };
-
-        vm.requestRemoveSettingsForBlock = function(block) {
-            localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
-
-                var settingsElementType = vm.getElementTypeByKey(block.settingsElementTypeKey);
-
-                overlayService.confirmRemove({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [(settingsElementType ? settingsElementType.name : "(Unavailable ElementType)")]),
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        vm.removeSettingsForBlock(block);
-                        overlayService.close();
-                    }
-                });
-            });
-        };
-
-        vm.removeSettingsForBlock = function(block) {
-            block.settingsElementTypeKey = null;
-        };
-
-        function updateUsedElementTypes(event, args) {
-            var key = args.documentType.key;
-            for (var i = 0; i<vm.elementTypes.length; i++) {
-                if (vm.elementTypes[i].key === key) {
-                    vm.elementTypes[i] = args.documentType;
-                }
-            }
-            if (vm.contentPreview && vm.contentPreview.key === key) {
-                vm.contentPreview = args.documentType;
-                $scope.$evalAsync();
-            }
-            if (vm.settingsPreview && vm.settingsPreview.key === key) {
-                vm.settingsPreview = args.documentType;
-                $scope.$evalAsync();
-            }
-        }
-
-        unsubscribe.push(eventsService.on("editors.documentType.saved", updateUsedElementTypes));
-
-        vm.addViewForBlock = function(block) {
-            localizationService.localize("blockEditor_headlineAddCustomView").then(localizedTitle => {
-
-                const filePicker = {
-                    title: localizedTitle,
-                    isDialog: true,
-                    filter: i => {
-                        return !(i.name.indexOf(".html") !== -1);
-                    },
-                    filterCssClass: "not-allowed",
-                    select: node => {
-                        const filepath = decodeURIComponent(node.id.replace(/\+/g, " "));
-                        block.view = "~/" + filepath.replace("wwwroot/", "");
-                        editorService.close();
-                    },
-                    close: () => editorService.close()
-                };
-
-                editorService.staticFilePicker(filePicker);
-
-            });
-        };
-
-        vm.requestRemoveViewForBlock = function(block) {
-            localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
-                overlayService.confirmRemove({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [block.view]),
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        vm.removeViewForBlock(block);
-                        overlayService.close();
-                    }
-                });
-            });
-        };
-
-        vm.removeViewForBlock = function(block) {
-            block.view = null;
-        };
-
-        vm.addStylesheetForBlock = function(block) {
-          localizationService.localize("blockEditor_headlineAddCustomStylesheet").then(localizedTitle => {
-
-            const filePicker = {
-              title: localizedTitle,
-              isDialog: true,
-              filter: i => {
-                return !(i.name.indexOf(".css") !== -1);
-              },
-              filterCssClass: "not-allowed",
-              select: node => {
-                const filepath = decodeURIComponent(node.id.replace(/\+/g, " "));
-                block.stylesheet = "~/" + filepath.replace("wwwroot/", "");
-                editorService.close();
-              },
-              close: () => editorService.close()
-            };
-
-            editorService.staticFilePicker(filePicker);
-
-          });
-        };
-
-        vm.requestRemoveStylesheetForBlock = function(block) {
-            localizationService.localizeMany(["general_remove", "defaultdialogs_confirmremoveusageof"]).then(function (data) {
-                overlayService.confirmRemove({
-                    title: data[0],
-                    content: localizationService.tokenReplace(data[1], [block.stylesheet]),
-                    close: function () {
-                        overlayService.close();
-                    },
-                    submit: function () {
-                        vm.removeStylesheetForBlock(block);
-                        overlayService.close();
-                    }
-                });
-            });
-        };
-
-        vm.removeStylesheetForBlock = function(block) {
-            block.stylesheet = null;
-        };
-
-        vm.addThumbnailForBlock = function(block) {
-
-          localizationService.localize("blockEditor_headlineAddThumbnail").then(localizedTitle => {
-
-                let allowedFileExtensions = ['jpg', 'jpeg', 'png', 'svg', 'webp', 'gif'];
-
-                const thumbnailPicker = {
-                    title: localizedTitle,
-                    isDialog: true,
-                    filter: i => {
-                        let ext = i.name.substr((i.name.lastIndexOf('.') + 1));
-                        return allowedFileExtensions.includes(ext) === false;
-                    },
-                    filterCssClass: "not-allowed",
-                    select: file => {
-                        const id = decodeURIComponent(file.id.replace(/\+/g, " "));
-                        block.thumbnail = "~/" + id.replace("wwwroot/", "");
-                        editorService.close();
-                    },
-                    close: () => editorService.close()
-                };
-
-                editorService.staticFilePicker(thumbnailPicker);
-
-            });
-        };
-
-        vm.removeThumbnailForBlock = function(entry) {
-            entry.thumbnail = null;
-        };
-
-        vm.changeIconColor = function (color) {
-            angularHelper.safeApply($scope, function () {
-                vm.block.iconColor = color ? color.toString() : null;
-            });
-        };
-
-        vm.changeBackgroundColor = function (color) {
-            angularHelper.safeApply($scope, function () {
-                vm.block.backgroundColor = color ? color.toString() : null;
-            });
-        };
-
-        vm.submit = function() {
-            if ($scope.model && $scope.model.submit) {
-                $scope.model.submit($scope.model);
-            }
-        };
-
-        vm.close = function() {
-            if ($scope.model && $scope.model.close) {
-                $scope.model.close($scope.model);
-            }
-        };
-
-        $scope.$on('$destroy', function() {
-            unsubscribe.forEach(u => { u(); });
-        });
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.BlockRTE.BlockConfigurationOverlayController", BlockConfigurationOverlayController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.overlay.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.overlay.html
deleted file mode 100644
index ddb1ed727e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.overlay.html
+++ /dev/null
@@ -1,281 +0,0 @@
-<div class="umb-block-list-block-configuration-overlay" ng-controller="Umbraco.PropertyEditors.BlockRTE.BlockConfigurationOverlayController as vm">
-
-    <form novalidate name="blockListBlockConfigurationForm" val-form-manager>
-
-        <umb-editor-view ng-if="!page.loading">
-
-            <umb-editor-header
-                name="model.title"
-                name-locked="true"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container>
-                <div class="form-vertical">
-
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_headlineEditorAppearance">Editor appearance</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- label -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockLabel"><localize key="blockEditor_labelLabelTemplate">label</localize></label>
-                                    <div class="controls">
-                                        <input type="text" name="label" id="blockLabel" ng-model="vm.block.label" style="width:100%" umb-auto-focus/>
-                                    </div>
-                                </div>
-                            </div>
-
-
-                            <!-- inline-mode -->
-                            <div class="control-group umb-control-group -no-border">
-                              <div class="umb-el-wrap">
-                                  <label class="control-label" for="blockDisplayInline"><localize key="blockEditor_labelInlineMode">Display inline with text</localize></label>
-                                  <div class="controls">
-                                    <umb-toggle
-                                        input-id="blockDisplayInline"
-                                        checked="vm.block.displayInline"
-                                        on-click="vm.block.displayInline = vm.block.displayInline != true">
-                                    </umb-toggle>
-                                  </div>
-                              </div>
-                          </div>
-
-                            <!-- custom view -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockCustomView"><localize key="blockEditor_labelCustomView">Custom view</localize></label>
-                                    <umb-property-info-button button-title-key="blockEditor_labelCustomViewInfoTitle">
-                                        <localize key="blockEditor_labelCustomViewDescription">Overwrite how this block appears in the BackOffice UI. Pick a .html file containing your presentation.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.view !== null" >
-
-                                            <umb-node-preview icon="'icon-document'" name="vm.block.view"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.requestRemoveViewForBlock(vm.block)">
-                                                    <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <button type="button" id="blockCustomView" class="btn-reset __settings-input --noValue umb-outline" ng-if="vm.block.view === null" ng-click="vm.addViewForBlock(vm.block)">
-                                            <localize key="blockEditor_addCustomView">Add custom view</localize>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- custom stylesheet -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockStyleSheet"><localize key="blockEditor_labelCustomStylesheet">Custom stylesheet</localize></label>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.stylesheet !== null" >
-
-                                            <umb-node-preview icon="'icon-document'" name="vm.block.stylesheet"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.requestRemoveStylesheetForBlock(vm.block)">
-                                                    <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <button type="button" id="blockStyleSheet" class="btn-reset __settings-input --noValue umb-outline" ng-if="vm.block.stylesheet === null" ng-click="vm.addStylesheetForBlock(vm.block)">
-                                            <localize key="blockEditor_addCustomStylesheet">Add custom stylesheet</localize>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- editor overlay size -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockEditorSize"><localize key="blockEditor_labelEditorSize">Editor size</localize></label>
-                                    <div class="controls">
-                                        <select id="blockEditorSize" ng-model="vm.block.editorSize">
-                                            <option value="small">Small</option>
-                                            <option value="medium">Medium</option>
-                                            <option value="large">Large</option>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_headlineDataModels">Data Models</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- Content Element Type -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockContentElemenType"><localize key="blockEditor_labelContentElementType">Content ElementType</localize></label>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.contentElementTypeKey !== null" >
-                                            <umb-node-preview icon="vm.contentPreview.icon" name="vm.contentPreview.name" alias="vm.contentPreview.alias"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" id="blockContentElemenType" class="btn-reset __control-actions-btn --open umb-outline" ng-click="vm.openElementType(vm.block.contentElementTypeKey)">
-                                                    <umb-icon icon="icon-edit" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- Settings Element Type -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockSettingsElemenType"><localize key="blockEditor_labelSettingsElementType">Settings Element Type</localize></label>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.settingsElementTypeKey !== null">
-                                            <umb-node-preview icon="vm.settingsPreview.icon" name="vm.settingsPreview.name" alias="vm.settingsPreview.alias"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" class="btn-reset __control-actions-btn --open umb-outline" ng-click="vm.openElementType(vm.block.settingsElementTypeKey)">
-                                                    <umb-icon icon="icon-edit" class="icon"></umb-icon>
-                                                </button>
-                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.requestRemoveSettingsForBlock(vm.block)">
-                                                    <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <button type="button" id="blockSettingsElemenType" class="btn-reset __settings-input --noValue umb-outline" ng-if="vm.block.settingsElementTypeKey === null" ng-click="vm.addSettingsForBlock($event, vm.block)">
-                                            <localize key="blockEditor_addSettingsElementType">Add settings</localize>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_headlineCatalogueAppearance">Catalogue appearance</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- backgroundColor -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockBackgroundColor"><localize key="blockEditor_labelBackgroundColor">Background Color</localize></label>
-                                    <div class="controls">
-                                        <umb-color-picker
-                                            id="blockBackgroundColor"
-                                            ng-model="vm.block.backgroundColor"
-                                            options="vm.colorPickerOptions"
-                                            on-change="vm.changeBackgroundColor(color)">
-                                        </umb-color-picker>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- iconColor -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockIconColor"><localize key="blockEditor_labelIconColor">Icon Color</localize></label>
-                                    <div class="controls">
-                                        <umb-color-picker
-                                            id="blockIconColor"
-                                            ng-model="vm.block.iconColor"
-                                            options="vm.colorPickerOptions"
-                                            on-change="vm.changeIconColor(color)">
-                                        </umb-color-picker>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- thumbnail -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockThumbnail"><localize key="blockEditor_thumbnail">Thumbnail</localize></label>
-                                    <div class="controls">
-                                        <div class="__settings-input --hasValue" ng-if="vm.block.thumbnail !== null" >
-
-                                            <umb-node-preview icon="'icon-document'" name="vm.block.thumbnail"></umb-node-preview>
-                                            <div class="__control-actions">
-                                                <button type="button" class="btn-reset __control-actions-btn --remove umb-outline" ng-click="vm.removeThumbnailForBlock(vm.block)">
-                                                    <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <button type="button" id="blockThumbnail" class="btn-reset __settings-input --noValue umb-outline" ng-if="vm.block.thumbnail === null" ng-click="vm.addThumbnailForBlock(vm.block)">
-                                            <localize key="blockEditor_addThumbnail">Add thumbnail</localize>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                    <div class="umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_headlineAdvanced">Advanced</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- forceHideContentEditorInOverlay -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="blockforceHideContentEditorInOverlay"><localize key="blockEditor_forceHideContentEditor">Force hide content editor</localize></label>
-                                    <div class="controls">
-                                        <umb-toggle
-                                            input-id="blockforceHideContentEditorInOverlay"
-                                            checked="vm.block.forceHideContentEditorInOverlay"
-                                            on-click="vm.block.forceHideContentEditorInOverlay = vm.block.forceHideContentEditorInOverlay != true">
-                                        </umb-toggle>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                </div>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button
-                        action="vm.close()"
-                        shortcut="esc"
-                        button-style="link"
-                        label-key="general_close"
-                        type="button">
-                    </umb-button>
-
-                    <umb-button
-                        action="vm.submit()"
-                        button-style="primary"
-                        state="submitButtonState"
-                        label-key="buttons_submitChanges"
-                        type="button">
-                    </umb-button>
-
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-        </umb-editor-view>
-    </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.overlay.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.overlay.less
deleted file mode 100644
index d2d875aa94..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/prevalue/blockrte.blockconfiguration.overlay.less
+++ /dev/null
@@ -1,103 +0,0 @@
-.umb-block-list-block-configuration-overlay {
-
-
-    .umb-node-preview {
-        flex-grow: 1;
-    }
-
-    .__control-actions {
-        position: absolute;
-        display: flex;
-        align-items: center;
-        top:0;
-        bottom: 0;
-        right: 0;
-        background-color: rgba(255, 255, 255, 0.8);
-        opacity: 0;
-        transition: opacity 120ms;
-    }
-    .controls:hover &,
-    .controls:focus &,
-    .controls:focus-within &,
-    .control-group:hover,
-    .control-group:focus,
-    .control-group:focus-within {
-        .__control-actions {
-            opacity: 1;
-        }
-    }
-    .__control-actions-btn {
-        position: relative;
-        color: @ui-action-discreet-type;
-        height: 32px;
-        width: 26px;
-        &:hover {
-            color: @ui-action-discreet-type-hover;
-        }
-        &:last-of-type {
-            margin-right: 7px;
-        }
-    }
-    
-    .umb-node-preview {
-        border-bottom: none;
-    }
-
-    .__settings-input {
-        position: relative;
-        padding: 5px 8px;
-        margin-bottom: 10px;
-        color: @ui-action-discreet-type;
-        border: 1px dashed @ui-action-discreet-border;
-        width: 100%;
-        font-weight: bold;
-        display: inline-flex;
-        flex-flow: row nowrap;
-
-        localize {
-            width: 100%;
-        }
-
-        .umb-node-preview {
-            padding: 3px 0;
-            margin-left: 5px;
-            overflow: hidden;
-        }
-
-        &.--noValue {
-            text-align: center;
-            border-radius: @baseBorderRadius;
-            color: white;
-            transition: color 120ms;
-            &:hover, &:focus {
-                color: @ui-action-discreet-type-hover;
-                border-color: @ui-action-discreet-border-hover;
-            }
-        }
-
-        &.--hasValue {
-            border: 1px solid @inputBorder;
-            padding: 0;
-        }
-    }
-
-    .__add-button {
-        width:100%;
-        color: @ui-action-discreet-type;
-        border: 1px dashed @ui-action-discreet-border;
-        border-radius: @baseBorderRadius;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        padding: 5px 15px;
-        box-sizing: border-box;
-        margin: 20px 0;
-        font-weight: bold;
-    }
-    
-    .__add-button:hover {
-        color: @ui-action-discreet-type-hover;
-        border-color: @ui-action-discreet-border-hover;
-    }
-
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/umb-rte-block.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/umb-rte-block.component.js
deleted file mode 100644
index 0c4c8e2e50..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/umb-rte-block.component.js
+++ /dev/null
@@ -1,127 +0,0 @@
-(function () {
-  'use strict';
-
-  /**
-   * A component to render the property action toggle
-   */
-
-  function umbRteBlockController($scope, $compile, $element) {
-
-      var model = this;
-
-      model.$onDestroy = onDestroy;
-      model.$onInit = onInit;
-
-
-      function onDestroy() {
-        $element[0]._isInitializedUmbBlock = false;
-      }
-
-      function onInit() {
-        $element[0]._isInitializedUmbBlock = true;
-        $scope.block = $element[0].$block;
-        $scope.api = $element[0].$api;
-        $scope.index = $element[0].$index;
-        $scope.culture = $element[0].$culture || null;
-        $scope.segment = $element[0].$segment || null;
-        $scope.parentForm = $element[0].$parentForm;
-        $scope.valFormManager = $element[0].$valFormManager;
-
-        const stylesheet = $scope.block.config.stylesheet;
-
-        var shadowRoot = $element[0].attachShadow({ mode: 'open' });
-          shadowRoot.innerHTML =
-          `
-              <style>
-                @import "assets/css/icons.css?umb__rnd=${Umbraco.Sys.ServerVariables.application.cacheBuster}";
-                @import "assets/css/blockrteui.css?umb__rnd=${Umbraco.Sys.ServerVariables.application.cacheBuster}";
-                ${ stylesheet ? `@import "${stylesheet}?umb__rnd=${Umbraco.Sys.ServerVariables.application.cacheBuster}";` : ''}
-
-                :host {
-                  display: ${$element[0].nodeName.toLowerCase() === 'umb-rte-block-inline' ? 'inline-block' : 'block'};
-                  user-select:none;
-                  user-drag:auto;
-                }
-
-                .umb-block-rte__block--actions {
-                  opacity: 0;
-                  transition: opacity 120ms;
-                }
-
-                :host(:focus) .umb-block-rte__block--actions,
-                :host(:focus-within) .umb-block-rte__block--actions,
-                :host(:hover) .umb-block-rte__block--actions {
-                  opacity: 1;
-                }
-
-              </style>
-
-              <div class="umb-block-rte__block">
-                <ng-form name="model.blockForm" val-server-match="{ 'contains' : { 'valServerMatchContent': block.content.key, 'valServerMatchSettings': block.settings.key }, 'culture': culture, 'segment': segment, }">
-
-                  <div
-                      class="umb-block-rte--view"
-                      ng-class="{'show-validation': api.internal.showValidation}" ng-include="block.view">
-                  </div>
-
-                  <div class="umb-block-rte__block--actions">
-
-                    <button type="button" class="btn-reset action --content" localize="title" title="actions_editContent"
-                            ng-click="api.editBlock(block, false, index, model.blockForm);"
-                            ng-if="block.showContent === true"
-                            ng-class="{ '--error': model.blockForm.$error.valServerMatchContent }">
-                        <umb-icon icon="icon-edit" class="icon"></umb-icon>
-                        <span class="sr-only">
-                            <localize key="general_content">Content</localize>
-                        </span>
-                        <div class="__error-badge">!</div>
-                    </button>
-
-                    <button type="button" class="btn-reset action --settings" localize="title" title="actions_editSettings"
-                            ng-click="api.openSettingsForBlock(block, index, model.blockForm);"
-                            ng-class="{ '--error': model.blockForm.$error.valServerMatchSettings }"
-                            ng-if="block.showSettings === true">
-                        <umb-icon icon="icon-settings" class="icon"></umb-icon>
-                        <span class="sr-only">
-                            <localize key="general_settings">Settings</localize>
-                        </span>
-                        <div class="__error-badge">!</div>
-                    </button>
-                    <button type="button" class="btn-reset action --copy" localize="title" title="actions_copy"
-                            ng-click="api.copyBlock(block);"
-                            ng-if="block.showCopy === true">
-                        <umb-icon icon="icon-documents" class="icon"></umb-icon>
-                        <span class="sr-only">
-                            <localize key="general_copy">Copy</localize>
-                        </span>
-                    </button>
-                    <button ng-if="!api.readonly"
-                            type="button" class="btn-reset action --delete" localize="title" title="actions_delete"
-                            ng-click="api.requestDeleteBlock(block);">
-                        <umb-icon icon="icon-trash" class="icon"></umb-icon>
-                        <span class="sr-only">
-                            <localize key="general_delete">Delete</localize>
-                        </span>
-                    </button>
-                  </div>
-              </ng-form>
-            </div>
-          `;
-        $compile(shadowRoot)($scope);
-
-      }
-
-  }
-
-  var umbRteBlockComponent = {
-      bindings: {
-          dataUdi: "<"
-      },
-      controller: umbRteBlockController,
-      controllerAs: "model"
-  };
-
-  angular.module('umbraco.directives').component('umbRteBlock', umbRteBlockComponent);
-  angular.module('umbraco.directives').component('umbRteBlockInline', umbRteBlockComponent);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.controller.js
deleted file mode 100644
index 841134fa5a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.controller.js
+++ /dev/null
@@ -1,63 +0,0 @@
-(function () {
-    "use strict";
-
-    function CodeEditorController($scope, localizationService) {
-
-        var vm = this;
-        vm.submit = submit;
-        vm.close = close;
-
-        vm.aceOption = {};
-        vm.aceOption = {
-            mode: "razor",
-            theme: "chrome",
-            showPrintMargin: false,
-            autoFocus: true,
-            advanced: {
-                fontSize: "14px",
-                enableSnippets: false, //The Razor mode snippets are awful (Need a way to override these)
-                enableBasicAutocompletion: true,
-                enableLiveAutocompletion: false,
-                wrap: true
-            },
-            onLoad: function(aceEditor) {
-                vm.aceEditor = aceEditor;
-            }
-        }
-
-        vm.template = {};
-        vm.template.content = $scope.model.content;
-
-        //////////
-
-        function onInit() {
-
-            // set default title
-            if(!$scope.model.title) {
-                // TODO: localize
-                $scope.model.title = "Edit source code";
-            }
-        }
-
-        function submit(model) {
-
-            // refresh the model
-            model.content = vm.aceEditor.getValue();
-
-            if($scope.model.submit) {
-                $scope.model.submit(model);
-            }
-        }
-
-        function close() {
-            if($scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-        onInit();
-    }
-
-    angular.module("umbraco").controller("Umbraco.PropertyEditors.RTECodeEditorController", CodeEditorController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.html
deleted file mode 100644
index 2bccd039db..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.RTECodeEditorController as vm">
-
-    <umb-editor-view>
-
-        <umb-editor-header
-            name="model.title"
-            name-locked="true"
-            hide-alias="true"
-            hide-icon="true"
-            hide-description="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-            <div
-                data-element="code-editor"
-                auto-scale="85"
-                umb-ace-editor="vm.aceOption"
-                model="vm.template.content">
-            </div>
-        </umb-editor-container>
-
-        <umb-editor-footer>
-            <umb-editor-footer-content-right>
-                <umb-button
-                    type="button"
-                    button-style="link"
-                    label-key="general_close"
-                    shortcut="esc"
-                    action="vm.close()">
-                </umb-button>
-                <umb-button
-                    type="button"
-                    button-style="success"
-                    label-key="general_submit"
-                    action="vm.submit(model)">
-                </umb-button>
-            </umb-editor-footer-content-right>
-        </umb-editor-footer>
-
-    </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.component.js
deleted file mode 100644
index 7f06215148..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.component.js
+++ /dev/null
@@ -1,981 +0,0 @@
-(function () {
-  "use strict";
-
-  /**
-   * @ngdoc directive
-   * @name umbraco.directives.directive:umbBlockListPropertyEditor
-   * @function
-   *
-   * @description
-   * The component for the block list property editor.
-   */
-  angular
-      .module("umbraco")
-      .component("umbRtePropertyEditor", {
-          templateUrl: "views/propertyeditors/rte/umb-rte-property-editor.html",
-          controller: BlockRteController,
-          controllerAs: "vm",
-          bindings: {
-              model: "="
-          },
-          require: {
-              propertyForm: "^form",
-              umbProperty: "?^umbProperty",
-              umbVariantContent: '?^^umbVariantContent',
-              umbVariantContentEditors: '?^^umbVariantContentEditors',
-              umbElementEditorContent: '?^^umbElementEditorContent',
-              valFormManager: "^^valFormManager"
-          }
-      });
-
-  function BlockRteController($element, $scope, $q, $timeout, $interpolate, assetsService, editorService, clipboardService, localizationService, overlayService, blockEditorService, udiService, serverValidationManager, angularHelper, eventsService, $attrs, tinyMceAssets, tinyMceService) {
-
-      var unsubscribe = [];
-      var modelObject;
-
-      // Property actions:
-      //let copyAllBlocksAction = null;
-      //let deleteAllBlocksAction = null;
-      //let pasteSingleBlockAction = null;
-
-      var liveEditing = true;
-
-      var vm = this;
-
-      vm.readonly = false;
-      vm.noBlocksMode = false;
-      vm.tinyMceEditor = null;
-
-      $attrs.$observe('readonly', (value) => {
-          vm.readonly = value !== undefined;
-
-          vm.blockEditorApi.readonly = vm.readonly;
-
-          /*if (deleteAllBlocksAction) {
-              deleteAllBlocksAction.isDisabled = vm.readonly;
-          }*/
-      });
-
-      vm.loading = true;
-      vm.rteLoading = true;
-      vm.blocksLoading = true;
-      vm.updateLoading = function () {
-        if(!vm.rteLoading && !vm.blocksLoading) {
-          vm.loading = false;
-        }
-      }
-      vm.currentBlockInFocus = null;
-      vm.setBlockFocus = function (block) {
-          if (vm.currentBlockInFocus !== null) {
-              vm.currentBlockInFocus.focus = false;
-          }
-          vm.currentBlockInFocus = block;
-          block.focus = true;
-      };
-
-      vm.supportCopy = clipboardService.isSupported();
-      vm.clipboardItems = [];
-      unsubscribe.push(eventsService.on("clipboardService.storageUpdate", updateClipboard));
-      unsubscribe.push($scope.$on("editors.content.splitViewChanged", (event, eventData) => {
-          var compositeId = vm.umbVariantContent.editor.compositeId;
-          if(eventData.editors.some(x => x.compositeId === compositeId)) {
-              updateAllBlockObjects();
-          }
-      }));
-
-      vm.layout = []; // The layout object specific to this Block Editor, will be a direct reference from Property Model.
-      vm.availableBlockTypes = []; // Available block entries of this property editor.
-      vm.labels = {};
-      vm.options = {
-          createFlow: false
-      };
-
-      localizationService.localizeMany(["blockEditor_insertBlock", "content_createEmpty"]).then(function (data) {
-          vm.labels.blockEditor_insertBlock = data[0];
-          vm.labels.content_createEmpty = data[1];
-      });
-
-      vm.$onInit = function() {
-
-          if (vm.umbProperty && !vm.umbVariantContent) {// if we dont have vm.umbProperty, it means we are in the DocumentTypeEditor.
-              // not found, then fallback to searching the scope chain, this may be needed when DOM inheritance isn't maintained but scope
-              // inheritance is (i.e.infinite editing)
-              var found = angularHelper.traverseScopeChain($scope, s => s && s.vm && s.vm.constructor.name === "umbVariantContentController");
-              vm.umbVariantContent = found ? found.vm : null;
-              if (!vm.umbVariantContent) {
-                //Could not find umbVariantContent in the $scope chain, lets go into no blocks mode:
-                vm.noBlocksMode = true;
-                vm.blocksLoading = false;
-                this.updateLoading();
-              }
-          }
-
-          const config = vm.model.config || {};
-
-          // set the onValueChanged callback, this will tell us if the block list model changed on the server
-          // once the data is submitted. If so we need to re-initialize
-          vm.model.onValueChanged = onServerValueChanged;
-          liveEditing = config.useLiveEditing;
-
-          vm.listWrapperStyles = {};
-
-          if (config.maxPropertyWidth) {
-              vm.listWrapperStyles['max-width'] = config.maxPropertyWidth;
-          }
-
-          // We need to ensure that the property model value is an object, this is needed for modelObject to receive a reference and keep that updated.
-          ensurePropertyValue(vm.model.value);
-
-          const assetPromises = [];
-
-          if(vm.noBlocksMode !== true) {
-
-            var scopeOfExistence = $scope;
-            if (vm.umbVariantContentEditors && vm.umbVariantContentEditors.getScope) {
-                scopeOfExistence = vm.umbVariantContentEditors.getScope();
-            } else if(vm.umbElementEditorContent && vm.umbElementEditorContent.getScope) {
-                scopeOfExistence = vm.umbElementEditorContent.getScope();
-            }
-
-            /*
-            copyAllBlocksAction = {
-                labelKey: "clipboard_labelForCopyAllEntries",
-                labelTokens: [vm.model.label],
-                icon: "icon-documents",
-                method: requestCopyAllBlocks,
-                isDisabled: true,
-                useLegacyIcon: false
-            };
-
-            deleteAllBlocksAction = {
-                labelKey: "clipboard_labelForRemoveAllEntries",
-                labelTokens: [],
-                icon: "icon-trash",
-                method: requestDeleteAllBlocks,
-                isDisabled: true,
-                useLegacyIcon: false
-            };
-
-            var propertyActions = [copyAllBlocksAction, deleteAllBlocksAction];
-            */
-
-            // Create Model Object, to manage our data for this Block Editor.
-            modelObject = blockEditorService.createModelObject(vm.model.value.blocks, vm.model.editor, config.blocks, scopeOfExistence, $scope);
-            const blockModelObjectLoading = modelObject.load();
-            assetPromises.push(blockModelObjectLoading)
-            blockModelObjectLoading.then(onLoaded);
-          }
-
-
-          // ******************** //
-          // RTE PART:
-          // ******************** //
-
-
-          // To id the html textarea we need to use the datetime ticks because we can have multiple rte's per a single property alias
-          // because now we have to support having 2x (maybe more at some stage) content editors being displayed at once. This is because
-          // we have this mini content editor panel that can be launched with MNTP.
-          vm.textAreaHtmlId = vm.model.alias + "_" + String.CreateGuid();
-
-          var editorConfig = config.editor ?? null;
-          if (!editorConfig || Utilities.isString(editorConfig)) {
-              editorConfig = tinyMceService.defaultPrevalues();
-          }
-
-
-          var width = editorConfig.dimensions ? parseInt(editorConfig.dimensions.width, 10) || null : null;
-          var height = editorConfig.dimensions ? parseInt(editorConfig.dimensions.height, 10) || null : null;
-
-          vm.containerWidth = "auto";
-          vm.containerHeight = "auto";
-          vm.containerOverflow = "inherit"
-
-          //queue file loading
-          tinyMceAssets.forEach(function (tinyJsAsset) {
-              assetPromises.push(assetsService.loadJs(tinyJsAsset, $scope));
-          });
-
-          //wait for assets to load before proceeding
-          $q.all(assetPromises)
-            .then(function () {
-              return tinyMceService.getTinyMceEditorConfig({
-                htmlId: vm.textAreaHtmlId,
-                stylesheets: editorConfig.stylesheets,
-                toolbar: editorConfig.toolbar,
-                mode: editorConfig.mode
-              })
-            })
-
-            // Handle additional assets loading depending on the configuration before initializing the editor
-            .then(function (tinyMceConfig) {
-              // Load the plugins.min.js file from the TinyMCE Cloud if a Cloud Api Key is specified
-              if (tinyMceConfig.cloudApiKey) {
-                return assetsService.loadJs(`https://cdn.tiny.cloud/1/${tinyMceConfig.cloudApiKey}/tinymce/${tinymce.majorVersion}.${tinymce.minorVersion}/plugins.min.js`)
-                  .then(() => tinyMceConfig);
-              }
-
-              return tinyMceConfig;
-            })
-
-            //wait for config to be ready after assets have loaded
-            .then(function (standardConfig) {
-
-                if (height !== null) {
-                    standardConfig.plugins.splice(standardConfig.plugins.indexOf("autoresize"), 1);
-                }
-
-                //create a baseline Config to extend upon
-                let baseLineConfigObj = {
-                    maxImageSize: editorConfig.maxImageSize,
-                    width: width,
-                    height: height
-                };
-
-                baseLineConfigObj.setup = function (editor) {
-
-                    //set the reference
-                    vm.tinyMceEditor = editor;
-
-                    vm.tinyMceEditor.on('init', function (e) {
-                        $timeout(function () {
-                            vm.rteLoading = false;
-                            vm.updateLoading();
-                        });
-                    });
-                    vm.tinyMceEditor.on("focus", function () {
-                        $element[0].dispatchEvent(new CustomEvent('umb-rte-focus', {composed: true, bubbles: true}));
-                    });
-                    vm.tinyMceEditor.on("blur", function () {
-                        $element[0].dispatchEvent(new CustomEvent('umb-rte-blur', {composed: true, bubbles: true}));
-                    });
-
-                    //initialize the standard editor functionality for Umbraco
-                    tinyMceService.initializeEditor({
-                        //scope: $scope,
-                        editor: editor,
-                        toolbar: editorConfig.toolbar,
-                        model: vm.model,
-                        getValue: function () {
-                          return vm.model.value.markup;
-                        },
-                        setValue: function (newVal) {
-                          vm.model.value.markup = newVal;
-                          $scope.$evalAsync();
-                        },
-                        culture: vm.umbProperty?.culture ?? null,
-                        segment: vm.umbProperty?.segment ?? null,
-                      blockEditorApi: vm.noBlocksMode ? undefined : vm.blockEditorApi,
-                        parentForm: vm.propertyForm,
-                        valFormManager: vm.valFormManager,
-                        currentFormInput: $scope.rteForm.modelValue
-                    });
-
-                };
-
-                Utilities.extend(baseLineConfigObj, standardConfig);
-
-                // Readonly mode
-                baseLineConfigObj.toolbar = vm.readonly ? false : baseLineConfigObj.toolbar;
-                baseLineConfigObj.readonly = vm.readonly ? 1 : baseLineConfigObj.readonly;
-
-                // We need to wait for DOM to have rendered before we can find the element by ID.
-                $timeout(function () {
-                  tinymce.init(baseLineConfigObj);
-                }, 50);
-
-                //listen for formSubmitting event (the result is callback used to remove the event subscription)
-                unsubscribe.push($scope.$on("formSubmitting", function () {
-                    if (vm.tinyMceEditor != null && !vm.rteLoading) {
-
-                      // Remove unused Blocks of Blocks Layout. Leaving only the Blocks that are present in Markup.
-                      var blockElements = vm.tinyMceEditor.dom.select(`umb-rte-block, umb-rte-block-inline`);
-                      const usedContentUdis = blockElements.map(blockElement => blockElement.getAttribute('data-content-udi'));
-
-                      const unusedBlocks = vm.layout.filter(x => usedContentUdis.indexOf(x.contentUdi) === -1);
-                      unusedBlocks.forEach(blockLayout => {
-                        deleteBlock(blockLayout.$block);
-                      });
-
-
-                      // Remove Angular Classes from markup:
-                      var parser = new DOMParser();
-                      var doc = parser.parseFromString(vm.model.value.markup, 'text/html');
-
-                      // Get all elements in the parsed document
-                      var elements = doc.querySelectorAll('*[class]');
-                      elements.forEach(element => {
-                        var classAttribute = element.getAttribute("class");
-                        if (classAttribute) {
-                          // Split the class attribute by spaces and remove "ng-scope" and "ng-isolate-scope"
-                          var classes = classAttribute.split(" ");
-                          var newClasses = classes.filter(function (className) {
-                            return className !== "ng-scope" && className !== "ng-isolate-scope";
-                          });
-
-                          // Update the class attribute with the remaining classes
-                          if (newClasses.length > 0) {
-                            element.setAttribute('class', newClasses.join(' '));
-                          } else {
-                            // If no remaining classes, remove the class attribute
-                            element.removeAttribute('class');
-                          }
-                        }
-                      });
-
-                      vm.model.value.markup = doc.body.innerHTML;
-
-                    }
-                }));
-
-            });
-
-      };
-
-      vm.focusRTE = function () {
-        if (vm.tinyMceEditor) {
-          vm.tinyMceEditor.focus();
-        }
-      }
-
-      // Called when we save the value, the server may return an updated data and our value is re-synced
-      // we need to deal with that here so that our model values are all in sync so we basically re-initialize.
-      function onServerValueChanged(newVal, oldVal) {
-
-          ensurePropertyValue(newVal);
-
-          if(modelObject) {
-            modelObject.update(vm.model.value.blocks, $scope);
-          }
-          onLoaded();
-      }
-
-      function ensurePropertyValue(newVal) {
-        // We need to ensure that the property model value is an object, this is needed for modelObject to receive a reference and keep that updated.
-        if (typeof newVal !== 'object' || newVal == null) {// testing if we have null or undefined value or if the value is set to another type than Object.
-            vm.model.value = {markup:vm.model.value ?? "", blocks: {}};
-        } else if(!newVal.markup) {
-          vm.model.value.markup = "";
-        } else if(!newVal.blocks) {
-          vm.model.value.blocks = {};
-        }
-      }
-
-      function setDirty() {
-          if (vm.propertyForm) {
-              vm.propertyForm.$setDirty();
-          }
-      }
-
-      function onLoaded() {
-
-          // Store a reference to the layout model, because we need to maintain this model.
-          vm.layout = modelObject.getLayout([]);
-
-          var invalidLayoutItems = [];
-
-          // Append the blockObjects to our layout.
-          vm.layout.forEach(entry => {
-              // $block must have the data property to be a valid BlockObject, if not its considered as a destroyed blockObject.
-              if (entry.$block === undefined || entry.$block === null || entry.$block.data === undefined) {
-                  var block = getBlockObject(entry);
-
-                  // If this entry was not supported by our property-editor it would return 'null'.
-                  if (block !== null) {
-                      entry.$block = block;
-                  }
-                  else {
-                      // then we need to filter this out and also update the underlying model. This could happen if the data
-                      // is invalid for some reason or the data structure has changed.
-                      invalidLayoutItems.push(entry);
-                  }
-              } else {
-                  updateBlockObject(entry.$block);
-              }
-          });
-
-          // remove the ones that are invalid
-          invalidLayoutItems.forEach(entry => {
-              var index = vm.layout.findIndex(x => x === entry);
-              if (index >= 0) {
-                  vm.layout.splice(index, 1);
-              }
-          });
-
-          vm.availableContentTypesAliases = modelObject.getAvailableAliasesForBlockContent();
-          vm.availableBlockTypes = modelObject.getAvailableBlocksForBlockPicker();
-
-          updateClipboard(true);
-
-          vm.blocksLoading = false;
-          vm.updateLoading();
-
-          $scope.$evalAsync();
-
-      }
-
-      function updateAllBlockObjects() {
-          // Update the blockObjects in our layout.
-          vm.layout.forEach(entry => {
-              // $block must have the data property to be a valid BlockObject, if not its considered as a destroyed blockObject.
-              if (entry.$block) {
-                  updateBlockObject(entry.$block);
-              }
-          });
-      }
-
-      function getDefaultViewForBlock(block) {
-
-        // TODO: new paths:
-          var defaultViewFolderPath = "views/propertyeditors/rte/blocks/blockrteentryeditors/";
-
-          if (block.config.unsupported === true) {
-            return defaultViewFolderPath + "unsupportedblock/unsupportedblock.editor.html";
-          }
-
-          return defaultViewFolderPath + "labelblock/rtelabelblock.editor.html";
-      }
-
-      /**
-       * Ensure that the containing content variant language and current property culture is transferred along
-       * to the scaffolded content object representing this block.
-       * This is required for validation along with ensuring that the umb-property inheritance is constantly maintained.
-       * @param {any} content
-       */
-      function ensureCultureData(content) {
-
-          if (!content) return;
-
-          if (vm.umbVariantContent.editor.content.language) {
-              // set the scaffolded content's language to the language of the current editor
-              content.language = vm.umbVariantContent.editor.content.language;
-          }
-          // currently we only ever deal with invariant content for blocks so there's only one
-          content.variants[0].tabs.forEach(tab => {
-              tab.properties.forEach(prop => {
-                  // set the scaffolded property to the culture of the containing property
-                  prop.culture = vm.umbProperty.property.culture;
-              });
-          });
-
-          // set the scaffolded allowed actions to the allowed actions of the document
-          content.allowedActions = vm.umbVariantContent.content.allowedActions;
-
-          // set the scaffolded variants' allowed actions to the allowed actions of the current variant
-          content.variants.forEach(variant => {
-              variant.allowedActions = vm.umbVariantContent.editor.content.allowedActions;
-          });
-      }
-
-      function getBlockObject(entry) {
-          var block = modelObject.getBlockObject(entry);
-
-          if (block === null) return null;
-
-          block.view = (block.config.view ? block.config.view : getDefaultViewForBlock(block));
-          block.showValidation = block.config.view ? true : false;
-
-          block.hideContentInOverlay = block.config.forceHideContentEditorInOverlay === true;
-          block.showContent = !block.hideContentInOverlay && block.content?.variants[0].tabs?.some(tab=>tab.properties.length) === true;
-          block.showSettings = block.config.settingsElementTypeKey != null;
-
-          // If we have content, otherwise it doesn't make sense to copy.
-          block.showCopy = vm.supportCopy && block.config.contentElementTypeKey != null;
-
-          // Index is not begin updated in RTE Blocks, the order of element and Blocks of layout is not synced, meaning the index could be incorrect depending on the perspective.
-          block.index = 0;
-          block.setParentForm = function (parentForm) {
-              this._parentForm = parentForm;
-          };
-
-          /** decorator methods, to enable switching out methods without loosing references that would have been made in Block Views codes */
-          block.activate = function() {
-              this._activate();
-          };
-          block.edit = function() {
-              this._edit();
-          };
-          block.editSettings = function() {
-              this._editSettings();
-          };
-          block.requestDelete = function() {
-              this._requestDelete();
-          };
-          block.delete = function() {
-              this._delete();
-          };
-          block.copy = function() {
-              this._copy();
-          };
-          updateBlockObject(block);
-
-          return block;
-      }
-
-      /** As the block object now contains references to this instance of a property editor, we need to ensure that the Block Object contains latest references.
-       * This is a bit hacky but the only way to maintain this reference currently.
-       * Notice this is most relevant for invariant properties on variant documents, specially for the scenario where the scope of the reference we stored is destroyed, therefor we need to ensure we always have references to a current running property editor*/
-      function updateBlockObject(block) {
-
-          ensureCultureData(block.content);
-          ensureCultureData(block.settings);
-
-          block._activate = activateBlock.bind(null, block);
-          block._edit = function () {
-              var blockIndex = vm.layout.indexOf(this.layout);
-              editBlock(this, false, blockIndex, this._parentForm);
-          };
-          block._editSettings = function () {
-              var blockIndex = vm.layout.indexOf(this.layout);
-              editBlock(this, true, blockIndex, this._parentForm);
-          };
-          block._requestDelete = requestDeleteBlock.bind(null, block);
-          block._delete = deleteBlock.bind(null, block);
-          block._copy = copyBlock.bind(null, block);
-      }
-
-      function addNewBlock(index, contentElementTypeKey) {
-
-          // Create layout entry. (not added to property model jet.)
-          var layoutEntry = modelObject.create(contentElementTypeKey);
-          if (layoutEntry === null) {
-              return false;
-          }
-
-          // make block model
-          var blockObject = getBlockObject(layoutEntry);
-          if (blockObject === null) {
-              return false;
-          }
-
-          // If we reach this line, we are good to add the layoutEntry and blockObject to our models.
-
-          // Add the Block Object to our layout entry.
-          layoutEntry.$block = blockObject;
-
-          // add layout entry at the desired location in layout.
-          vm.layout.splice(index, 0, layoutEntry);
-
-          // lets move focus to this new block.
-          vm.setBlockFocus(blockObject);
-
-          setDirty();
-
-          return true;
-      }
-
-      function deleteBlock(block) {
-
-          var layoutIndex = vm.layout.findIndex(entry => entry.contentUdi === block.layout.contentUdi);
-          if (layoutIndex === -1) {
-              throw new Error("Could not find layout entry of block with udi: "+block.layout.contentUdi)
-          }
-
-          setDirty();
-
-          var removed = vm.layout.splice(layoutIndex, 1);
-          removed.forEach(x => {
-
-            var blockElementsOfThisUdi = vm.tinyMceEditor.dom.select(`umb-rte-block[data-content-udi='${x.contentUdi}'], umb-rte-block-inline[data-content-udi='${x.contentUdi}']`);
-            blockElementsOfThisUdi.forEach(blockElement => {
-              vm.tinyMceEditor.dom.remove(blockElement);
-            });
-
-            // remove any server validation errors associated
-            var guids = [udiService.getKey(x.contentUdi), (x.settingsUdi ? udiService.getKey(x.settingsUdi) : null)];
-            guids.forEach(guid => {
-                if (guid) {
-                    serverValidationManager.removePropertyError(guid, vm.umbProperty.property.culture, vm.umbProperty.property.segment, "", { matchType: "contains" });
-                }
-            })
-          });
-
-          if(removed.length > 0) {
-            vm.model.value.markup = vm.tinyMceEditor.getContent();
-            $scope.$evalAsync();
-          }
-
-          modelObject.removeDataAndDestroyModel(block);
-      }
-
-      /*function deleteAllBlocks() {
-          while(vm.layout.length) {
-              deleteBlock(vm.layout[0].$block);
-          };
-      }*/
-
-      function activateBlock(blockObject) {
-          blockObject.active = true;
-      }
-
-      function editBlock(blockObject, openSettings, blockIndex, parentForm, options) {
-
-          options = options || vm.options;
-
-          // this must be set
-          if (blockIndex === undefined) {
-              throw "blockIndex was not specified on call to editBlock";
-          }
-
-          var wasNotActiveBefore = blockObject.active !== true;
-
-          // don't open the editor overlay if block has hidden its content editor in overlays and we are requesting to open content, not settings.
-          if (openSettings !== true && blockObject.hideContentInOverlay === true) {
-              return;
-          }
-
-          // if requesting to open settings but we dont have settings then return.
-          if (openSettings === true && !blockObject.config.settingsElementTypeKey) {
-              return;
-          }
-
-          activateBlock(blockObject);
-
-          // make a clone to avoid editing model directly.
-          var blockContentClone = Utilities.copy(blockObject.content);
-          var blockSettingsClone = null;
-
-          if (blockObject.config.settingsElementTypeKey) {
-              blockSettingsClone = Utilities.copy(blockObject.settings);
-          }
-
-          var blockEditorModel = {
-              $parentScope: $scope, // pass in a $parentScope, this maintains the scope inheritance in infinite editing
-              $parentForm: parentForm || vm.propertyForm, // pass in a $parentForm, this maintains the FormController hierarchy with the infinite editing view (if it contains a form)
-              hideContent: blockObject.hideContentInOverlay,
-              openSettings: openSettings === true,
-              createFlow: options.createFlow === true,
-              liveEditing: liveEditing,
-              title: blockObject.label,
-              view: "views/common/infiniteeditors/blockeditor/blockeditor.html",
-              size: blockObject.config.editorSize || "medium",
-              hideSubmitButton: vm.readonly,
-              submit: function(blockEditorModel) {
-
-                  if (liveEditing === false) {
-                      // transfer values when submitting in none-live-editing mode.
-                      blockObject.retrieveValuesFrom(blockEditorModel.content, blockEditorModel.settings);
-                  }
-
-                  setDirty();
-                  blockObject.active = false;
-                  editorService.close();
-              },
-              close: function(blockEditorModel) {
-                  if (blockEditorModel.createFlow) {
-                      deleteBlock(blockObject);
-                  } else {
-                      if (liveEditing === true) {
-                          // revert values when closing in live-editing mode.
-                          blockObject.retrieveValuesFrom(blockContentClone, blockSettingsClone);
-                      }
-                      if (wasNotActiveBefore === true) {
-                          blockObject.active = false;
-                      }
-                  }
-                  editorService.close();
-              }
-          };
-
-          if (liveEditing === true) {
-              blockEditorModel.content = blockObject.content;
-              blockEditorModel.settings = blockObject.settings;
-          } else {
-              blockEditorModel.content = blockContentClone;
-              blockEditorModel.settings = blockSettingsClone;
-          }
-
-          // open property settings editor
-          editorService.open(blockEditorModel);
-      }
-
-      vm.requestShowCreate = requestShowCreate;
-      function requestShowCreate(createIndex, mouseEvent) {
-
-          if (vm.blockTypePicker) {
-              return;
-          }
-
-          if (vm.availableBlockTypes.length === 1) {
-              var wasAdded = false;
-              var blockType = vm.availableBlockTypes[0];
-
-              wasAdded = addNewBlock(createIndex, blockType.blockConfigModel.contentElementTypeKey);
-
-              if(wasAdded && !(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
-                  userFlowWhenBlockWasCreated(createIndex);
-              }
-          } else {
-              showCreateDialog(createIndex);
-          }
-
-      }
-
-      vm.requestShowClipboard = requestShowClipboard;
-      function requestShowClipboard(createIndex) {
-          showCreateDialog(createIndex, true);
-      }
-
-      vm.showCreateDialog = showCreateDialog;
-      function showCreateDialog(createIndex, openClipboard, addedCallback) {
-
-          if (vm.blockTypePicker) {
-              return;
-          }
-
-          if (vm.availableBlockTypes.length === 0) {
-            alert("No Blocks configured for this data-type");
-            return;
-          }
-
-          if(createIndex === undefined) {
-            createIndex = vm.layout.length - 1;
-          }
-
-          var amountOfAvailableTypes = vm.availableBlockTypes.length;
-          var blockPickerModel = {
-              $parentScope: $scope, // pass in a $parentScope, this maintains the scope inheritance in infinite editing
-              $parentForm: vm.propertyForm, // pass in a $parentForm, this maintains the FormController hierarchy with the infinite editing view (if it contains a form)
-              availableItems: vm.availableBlockTypes,
-              title: vm.labels.blockEditor_insertBlock,
-              openClipboard: openClipboard,
-              orderBy: "$index",
-              view: "views/common/infiniteeditors/blockpicker/blockpicker.html",
-              size: (amountOfAvailableTypes > 8 ? "medium" : "small"),
-              filter: (amountOfAvailableTypes > 8),
-              clickPasteItem: function(item, mouseEvent) {
-                  if (Array.isArray(item.pasteData)) {
-                      const BlocksThatGotPasted = [];
-                      var indexIncrementor = 0;
-                      item.pasteData.forEach(function (entry) {
-                          const wasAdded = requestPasteFromClipboard(createIndex + indexIncrementor, entry, item.type)
-                          if (wasAdded) {
-                            const newBlock = vm.layout[createIndex + indexIncrementor].$block;
-                            BlocksThatGotPasted.push(newBlock);
-                            indexIncrementor++;
-                          }
-                      });
-                      if(BlocksThatGotPasted.length > 0) {
-                        addedCallback(BlocksThatGotPasted);
-                      }
-                  } else {
-                      const wasAdded = requestPasteFromClipboard(createIndex, item.pasteData, item.type);
-                      if(wasAdded && vm.layout[createIndex]) {
-                        const newBlock = vm.layout[createIndex].$block;
-                        addedCallback(newBlock);
-                      }
-                  }
-                  if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
-                      blockPickerModel.close();
-                  }
-              },
-              submit: function(blockPickerModel, mouseEvent) {
-                  var wasAdded = false;
-                  if (blockPickerModel && blockPickerModel.selectedItem) {
-                      wasAdded = addNewBlock(createIndex, blockPickerModel.selectedItem.blockConfigModel.contentElementTypeKey);
-                      if(wasAdded && vm.layout[createIndex]) {
-                        const newBlock = vm.layout[createIndex].$block;
-                        addedCallback(newBlock);
-                      }
-                  }
-
-                  if(!(mouseEvent.ctrlKey || mouseEvent.metaKey)) {
-                      editorService.close();
-                      if (wasAdded) {
-                          userFlowWhenBlockWasCreated(createIndex);
-                      }
-                  }
-              },
-              close: function() {
-                  // If opened by a inline creator button(index less than length), we want to move the focus away, to hide line-creator.
-                  if (createIndex < vm.layout.length) {
-                      vm.setBlockFocus(vm.layout[Math.max(createIndex-1, 0)].$block);
-                  }
-
-                  editorService.close();
-              }
-          };
-
-          blockPickerModel.clickClearClipboard = function ($event) {
-              clipboardService.clearEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, vm.availableContentTypesAliases);
-              clipboardService.clearEntriesOfType(clipboardService.TYPES.BLOCK, vm.availableContentTypesAliases);
-          };
-
-          blockPickerModel.clipboardItems = vm.clipboardItems;
-
-          // open block picker overlay
-          editorService.open(blockPickerModel);
-
-      };
-
-      function userFlowWhenBlockWasCreated(createIndex) {
-          if (vm.layout.length > createIndex) {
-              var blockObject = vm.layout[createIndex].$block;
-              if (blockObject.hideContentInOverlay !== true && blockObject.content.variants[0].tabs.find(tab => tab.properties.length > 0) !== undefined) {
-                  vm.options.createFlow = true;
-                  blockObject.edit();
-                  vm.options.createFlow = false;
-              }
-          }
-      }
-
-      function updateClipboard(firstTime) {
-
-        //var oldAmount = vm.clipboardItems.length;
-
-        vm.clipboardItems = [];
-
-        var entriesForPaste = clipboardService.retrieveEntriesOfType(clipboardService.TYPES.ELEMENT_TYPE, vm.availableContentTypesAliases);
-        entriesForPaste.forEach(function (entry) {
-            var pasteEntry = {
-                type: clipboardService.TYPES.ELEMENT_TYPE,
-                date: entry.date,
-                pasteData: entry.data,
-                elementTypeModel: {
-                    name: entry.label,
-                    icon: entry.icon
-                }
-            }
-            if(Array.isArray(entry.data) === false) {
-                var scaffold = modelObject.getScaffoldFromAlias(entry.alias);
-                if(scaffold) {
-                    pasteEntry.blockConfigModel = modelObject.getBlockConfiguration(scaffold.contentTypeKey);
-                }
-            }
-            vm.clipboardItems.push(pasteEntry);
-        });
-
-        entriesForPaste = clipboardService.retrieveEntriesOfType(clipboardService.TYPES.BLOCK, vm.availableContentTypesAliases);
-        entriesForPaste.forEach(function (entry) {
-            var pasteEntry = {
-                type: clipboardService.TYPES.BLOCK,
-                date: entry.date,
-                pasteData: entry.data,
-                elementTypeModel: {
-                    name: entry.label,
-                    icon: entry.icon
-                }
-            }
-            if(Array.isArray(entry.data) === false) {
-                pasteEntry.blockConfigModel = modelObject.getBlockConfiguration(entry.data.data.contentTypeKey);
-            }
-            vm.clipboardItems.push(pasteEntry);
-        });
-
-        vm.clipboardItems.sort( (a, b) => {
-            return b.date - a.date
-        });
-
-        //pasteSingleBlockAction.isDisabled = vm.clipboardItems.length === 0;
-      }
-
-      function copyBlock(block) {
-          clipboardService.copy(clipboardService.TYPES.BLOCK, block.content.contentTypeAlias, {"layout": block.layout, "data": block.data, "settingsData":block.settingsData}, block.label, block.content.icon, block.content.udi);
-      }
-
-      function requestPasteFromClipboard(index, pasteEntry, pasteType) {
-
-          if (pasteEntry === undefined) {
-              return false;
-          }
-
-          var layoutEntry;
-          if (pasteType === clipboardService.TYPES.ELEMENT_TYPE) {
-              layoutEntry = modelObject.createFromElementType(pasteEntry);
-          } else if (pasteType === clipboardService.TYPES.BLOCK) {
-              layoutEntry = modelObject.createFromBlockData(pasteEntry);
-          } else {
-              // Not a supported paste type.
-              return false;
-          }
-
-          if (layoutEntry === null) {
-              // Pasting did not go well.
-              return false;
-          }
-
-          // make block model
-          var blockObject = getBlockObject(layoutEntry);
-          if (blockObject === null) {
-              // Initialization of the Block Object didn't go well, therefor we will fail the paste action.
-              return false;
-          }
-
-          // set the BlockObject on our layout entry.
-          layoutEntry.$block = blockObject;
-
-          // insert layout entry at the desired location in layout.
-          vm.layout.splice(index, 0, layoutEntry);
-
-          vm.currentBlockInFocus = blockObject;
-
-          return true;
-      }
-
-      function requestDeleteBlock(block) {
-          if (vm.readonly) return;
-
-          localizationService.localizeMany(["general_delete", "blockEditor_confirmDeleteBlockMessage", "contentTypeEditor_yesDelete"]).then(function (data) {
-              const overlay = {
-                  title: data[0],
-                  content: localizationService.tokenReplace(data[1], [block.label]),
-                  submitButtonLabel: data[2],
-                  close: function () {
-                      overlayService.close();
-                  },
-                  submit: function () {
-                      deleteBlock(block);
-                      setDirty();
-                      overlayService.close();
-                  }
-              };
-
-              overlayService.confirmDelete(overlay);
-          });
-      }
-
-      function openSettingsForBlock(block, blockIndex, parentForm) {
-          editBlock(block, true, blockIndex, parentForm);
-      }
-
-      function getBlockByContentUdi(blockContentUdi) {
-
-        var layoutIndex = vm.layout.findIndex(entry => entry.contentUdi === blockContentUdi);
-        if (layoutIndex === -1) {
-          return undefined;
-        }
-
-        return vm.layout[layoutIndex].$block;
-    }
-
-      vm.blockEditorApi = {
-          getBlockByContentUdi: getBlockByContentUdi,
-          showCreateDialog: showCreateDialog,
-          activateBlock: activateBlock,
-          editBlock: editBlock,
-          copyBlock: copyBlock,
-          requestDeleteBlock: requestDeleteBlock,
-          deleteBlock: deleteBlock,
-          openSettingsForBlock: openSettingsForBlock,
-          readonly: vm.readonly,
-          singleBlockMode: false
-      };
-
-      $scope.$on("$destroy", function () {
-          for (const subscription of unsubscribe) {
-              subscription();
-          }
-
-          // When the element is disposed we need to unsubscribe!
-          // NOTE: this is very important otherwise if this is part of a modal, the listener still exists because the dom
-          // element might still be there even after the modal has been hidden.
-          if (vm.tinyMceEditor != null) {
-            if($element) {
-              $element[0]?.dispatchEvent(new CustomEvent('blur', {composed: true, bubbles: true}));
-            }
-            vm.tinyMceEditor.destroy();
-            vm.tinyMceEditor = null;
-          }
-      });
-  }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
deleted file mode 100644
index 94307f410e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<umb-rte-property-editor
-  model="model"
-  ng-attr-readonly="{{ readonly || undefined }}">
-</umb-rte-property-editor>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
deleted file mode 100644
index 41055567e1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
+++ /dev/null
@@ -1,228 +0,0 @@
-angular.module("umbraco").controller("Umbraco.PrevalueEditors.RteController",
-    function ($scope, $sce, tinyMceService, stylesheetResource, assetsService) {
-        var cfg = tinyMceService.defaultPrevalues();
-
-        if($scope.model.value) {
-            if (Utilities.isString($scope.model.value)){
-                $scope.model.value = cfg;
-            }
-        }else {
-            $scope.model.value = cfg;
-        }
-
-        if (!$scope.model.value.stylesheets) {
-            $scope.model.value.stylesheets = [];
-        }
-        if (!$scope.model.value.toolbar) {
-            $scope.model.value.toolbar = [];
-        }
-        if (!$scope.model.value.maxImageSize && $scope.model.value.maxImageSize != 0) {
-            $scope.model.value.maxImageSize = cfg.maxImageSize;
-        }
-        if (!$scope.model.value.mode) {
-            $scope.model.value.mode = "classic";
-        }
-        else if ($scope.model.value.mode === 'distraction-free') {
-            // Due to legacy reasons, the older 'distraction-free' mode is kept and remapped to 'inline'
-            $scope.model.value.mode = 'inline';
-        }
-
-        tinyMceService.configuration().then(config => {
-          $scope.tinyMceConfig = config;
-
-            // extend commands with properties for font-icon and if it is a custom command
-            $scope.tinyMceConfig.commands = _.map($scope.tinyMceConfig.commands, obj => {
-                const icon = getIcon(obj.alias);
-
-                const objCmd = Utilities.extend(obj, {
-                    fontIcon: icon.name,
-                    isCustom: icon.isCustom,
-                    selected: $scope.model.value.toolbar.indexOf(obj.alias) >= 0,
-                    icon: "mce-ico " + (icon.isCustom ? ' mce-i-custom ' : ' mce-i-') + icon.name
-                });
-
-                return objCmd;
-            });
-
-            assetsService.loadJs("lib/tinymce/icons/default/icons.js", $scope).then(() => {
-                const icons = tinymce.IconManager.get('default').icons;
-                const parser = new DOMParser();
-
-                Utilities.forEach($scope.tinyMceConfig.commands, cmd => {
-                    let icon = getTinyIcon(cmd.alias);
-
-                    if (!cmd.isCustom && icons.hasOwnProperty(icon)) {
-                        const svg = icons[icon];
-                        const frag = parser.parseFromString(svg, 'text/html').body.childNodes[0];
-                        const width = frag.getAttribute("width");
-                        const height = frag.getAttribute("height");
-
-                        frag.setAttribute("viewBox", `0 0 ${width} ${height}`);
-                        cmd.svgIcon = $sce.trustAsHtml(frag.outerHTML);
-                        cmd.icon = null;
-                    }
-                });
-            });
-
-        });
-
-        stylesheetResource.getAll().then(stylesheets => {
-            $scope.stylesheets = stylesheets;
-
-            // if the CSS directory changes, previously assigned stylesheets are retained, but will not be visible
-            // and will throw a 404 when loading the RTE. Remove them here. Still needs to be saved...
-            let cssPath = Umbraco.Sys.ServerVariables.umbracoSettings.cssPath;
-            $scope.model.value.stylesheets = $scope.model.value.stylesheets
-                .filter(sheet => sheet.startsWith(cssPath));
-
-            $scope.stylesheets.forEach(stylesheet => {
-                // support both current format (full stylesheet path) and legacy format (stylesheet name only)
-                stylesheet.selected = $scope.model.value.stylesheets.indexOf(stylesheet.path) >= 0 ||$scope.model.value.stylesheets.indexOf(stylesheet.name) >= 0;
-            });
-        });
-
-        $scope.selectCommand = function(command){
-            var index = $scope.model.value.toolbar.indexOf(command.alias);
-
-            if (command.selected && index === -1){
-                $scope.model.value.toolbar.push(command.alias);
-            }else if (index >= 0){
-                $scope.model.value.toolbar.splice(index, 1);
-            }
-        };
-
-        $scope.selectStylesheet = css => {
-
-            // find out if the stylesheet is already selected; first look for the full stylesheet path (current format)
-            var index = $scope.model.value.stylesheets.indexOf(css.path);
-            if (index === -1) {
-                // ... then look for the stylesheet name (legacy format)
-                index = $scope.model.value.stylesheets.indexOf(css.name);
-            }
-
-            if (index === -1){
-                $scope.model.value.stylesheets.push(css.path);
-            } else {
-                $scope.model.value.stylesheets.splice(index, 1);
-            }
-        };
-
-        // Map command alias to icon name.
-        function getTinyIcon(alias) {
-            let icon = alias;
-
-            switch (alias) {
-                case "ace":
-                case "code":
-                    icon = "sourcecode";
-                    break;
-                case "anchor":
-                    icon = "bookmark";
-                    break;
-                case "alignleft":
-                    icon = "align-left";
-                    break;
-                case "aligncenter":
-                    icon = "align-center";
-                    break;
-                case "alignright":
-                    icon = "align-right";
-                    break;
-                case "alignjustify":
-                    icon = "align-justify";
-                    break;
-                case "charmap":
-                    icon = "insert-character";
-                    break;
-                case "hr":
-                    icon = "horizontal-rule";
-                    break;
-                case "bullist":
-                    icon = "unordered-list";
-                    break;
-                case "numlist":
-                    icon = "ordered-list";
-                    break;
-                case "strikethrough":
-                    icon = "strike-through";
-                    break;
-                case "removeformat":
-                    icon = "remove-formatting";
-                    break;
-                case "blockquote":
-                    icon = "quote";
-                    break;
-                case "forecolor":
-                    icon = "text-color";
-                    break;
-                case "hilitecolor":
-                    icon = "highlight-bg-color";
-                    break;
-                case "wordcount":
-                    icon = "character-count";
-                    break;
-                case "emoticons":
-                    icon = "emoji";
-                    break;
-                case "codesample":
-                    icon = "code-sample";
-                    break;
-            }
-
-            return icon;
-        }
-
-        // Map properties for specific commands
-        function getIcon(alias) {
-            var icon = { name: alias, isCustom: false };
-
-            switch (alias) {
-                case "ace":
-                    icon.name = "code";
-                    icon.isCustom = false;
-                    break;
-                case "styleselect":
-                case "styles":
-                case "fontsizeselect":
-                    icon.name = "icon-list";
-                    icon.isCustom = true;
-                    break;
-                case "umbembeddialog":
-                    icon.name = "icon-tv";
-                    icon.isCustom = true;
-                    break;
-                case "umbmediapicker":
-                    icon.name = "icon-picture";
-                    icon.isCustom = true;
-                    break;
-                case "umbblockpicker":
-                    icon.name = "icon-document";
-                    icon.isCustom = true;
-                    break;
-                case "umbmacro":
-                    icon.name = "icon-settings-alt";
-                    icon.isCustom = true;
-                    break;
-                default:
-                    icon.name = alias;
-                    icon.isCustom = false;
-            }
-
-            return icon;
-        }
-
-        var unsubscribe = $scope.$on("formSubmitting", function () {
-
-            var commands = _.where($scope.tinyMceConfig.commands, {selected: true});
-            $scope.model.value.toolbar = _.pluck(commands, "alias");
-
-        });
-
-        // when the scope is destroyed we need to unsubscribe
-        $scope.$on('$destroy', function () {
-            unsubscribe();
-        });
-
-        // load TinyMCE skin which contains css for font-icons
-        assetsService.loadCss("lib/tinymce/skins/lightgray/skin.min.css", $scope);
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
deleted file mode 100644
index b7f87fbc57..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<div ng-controller="Umbraco.PrevalueEditors.RteController" class="rte-editor-preval umb-rte">
-
-    <umb-control-group label="Toolbar" description="Pick the toolbar options that should be available when editing">
-        <div ng-repeat="cmd in tinyMceConfig.commands">
-            <umb-checkbox
-                model="cmd.selected"
-                on-change="selectCommand(cmd)"
-                class="mce-cmd">
-                <umb-icon ng-if="cmd.icon" icon="{{cmd.icon}}"></umb-icon>
-                <span ng-if="!cmd.icon && cmd.svgIcon" ng-bind-html="cmd.svgIcon" class="umb-icon"></span>
-                <span ng-if="cmd.name" class="umb-form-check__text">{{cmd.name}}</span>
-            </umb-checkbox>
-        </div>
-    </umb-control-group>
-
-    <umb-control-group label="Stylesheets" description="Pick the stylesheets whose editor styles should be available when editing">
-        <div ng-repeat="css in stylesheets">
-            <umb-checkbox
-                model="css.selected"
-                on-change="selectStylesheet(css)"
-                text="{{css.name}}">
-            </umb-checkbox>
-        </div>
-    </umb-control-group>
-
-    <umb-control-group label="Dimensions" description="Set the editor dimensions">
-        <div class="vertical-align-items">
-            <input type="number" min="0" ng-model="model.value.dimensions.width" class="umb-property-editor-small" title="Width" placeholder="Width" /> &times;
-            <input type="number" min="0" ng-model="model.value.dimensions.height" class="umb-property-editor-small" title="Height" placeholder="Height" /> Pixels
-        </div>
-    </umb-control-group>
-
-    <umb-control-group label="Maximum size for inserted images" description="Maximum width or height - enter 0 to disable resizing">
-        <div class="vertical-align-items">
-            <input type="number" min="0" ng-model="model.value.maxImageSize" class="umb-property-editor-small" title="Maximum width or height" placeholder="Maximum width or height" /> Pixels
-        </div>
-    </umb-control-group>
-
-    <umb-control-group label="Mode" description="Select mode">
-        <div class="vertical-align-items">
-            <select ng-model="model.value.mode">
-                <option value="classic">Classic</option> <!-- Theme:modern & inline:false-->
-                <option value="inline">Inline</option> <!-- Theme:modern & inline:true-->
-            </select>
-        </div>
-    </umb-control-group>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/umb-rte-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/umb-rte-property-editor.html
deleted file mode 100644
index 2d7307676d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/umb-rte-property-editor.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="umb-property-editor umb-rte" ng-class="{'--initialized': !vm.loading}">
-  <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-  <ng-form name="rteForm">
-      <div class="umb-rte-editor-con">
-          <input type="text" id="{{vm.model.alias}}" ng-focus="vm.focusRTE()" name="modelValue" ng-model="vm.model.value.markup" style="position:absolute;top:0;width:0;height:0;padding:0;border:none;" />
-          <div disable-hotkeys id="{{vm.textAreaHtmlId}}" class="umb-rte-editor" ng-style="{ width: vm.containerWidth, height: vm.containerHeight, overflow: vm.containerOverflow}"></div>
-      </div>
-  </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/sensitivevalue/sensitivevalue.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/sensitivevalue/sensitivevalue.html
deleted file mode 100644
index 6460d882b2..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/sensitivevalue/sensitivevalue.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="umb-editor umb-readonlyvalue">
-    <em class="muted">
-        <localize key="content_isSensitiveValue">Hide this property value from content editors that don't have access to view sensitive information</localize>
-    </em>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js
deleted file mode 100644
index 700f831f5a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js
+++ /dev/null
@@ -1,101 +0,0 @@
-function sliderController($scope) {
-
-    let sliderRef = null;
-
-    /** configure some defaults on init */
-    function configureDefaults() {
-        $scope.model.config.enableRange = $scope.model.config.enableRange ? Object.toBoolean($scope.model.config.enableRange) : false;
-        $scope.model.config.initVal1 = $scope.model.config.initVal1 ? parseFloat($scope.model.config.initVal1) : 0;
-        $scope.model.config.initVal2 = $scope.model.config.initVal2 ? parseFloat($scope.model.config.initVal2) : 0;
-        $scope.model.config.minVal = $scope.model.config.minVal ? parseFloat($scope.model.config.minVal) : 0;
-        $scope.model.config.maxVal = $scope.model.config.maxVal ? parseFloat($scope.model.config.maxVal) : 100;
-        $scope.model.config.step = $scope.model.config.step ? parseFloat($scope.model.config.step) : 1;
-    }
-
-    function setModelValue(values) {
-        $scope.model.value = values ? values.toString() : null;
-        setDirty();
-    }
-
-    function setDirty() {
-        if ($scope.modelValueForm) {
-            $scope.modelValueForm.modelValue.$setDirty();
-        }
-    }
-
-    $scope.setup = function(slider) {
-        sliderRef = slider;
-    };
-
-    $scope.change = function (values) {
-        setModelValue(values);
-    };
-
-    function init() {
-        configureDefaults();
-
-        // format config to fit slider plugin
-        const start = $scope.model.config.enableRange ? [$scope.model.config.initVal1, $scope.model.config.initVal2] : [$scope.model.config.initVal1];
-        const step = $scope.model.config.step;
-        const tooltips = $scope.model.config.enableRange ? [true, true] : [true];
-        const min = $scope.model.config.minVal ? [$scope.model.config.minVal] : [$scope.model.config.minVal];
-        const max = $scope.model.config.maxVal ? [$scope.model.config.maxVal] : [$scope.model.config.maxVal];
-
-        // set model.value to the default value if it's not set (but don't trigger setDirty, just silently update with the default value)
-        if (!$scope.model.value) {
-            $scope.model.value = start.toString();
-        }
-
-        // convert to array - exiting value can be a number if switching from numeric/decimal property editor
-        $scope.sliderValue = $scope.model.value
-            ? Utilities.isString($scope.model.value) || Utilities.isNumber($scope.model.value)
-                    ? $scope.model.value.toString().split(',')
-                    : null
-            : null;
-        
-        // don't render values with decimal places if the step increment in a whole number
-        var stepDecimalPlaces = $scope.model.config.step % 1 == 0
-            ? 0
-            : _.last($scope.model.config.step.toString().replace(",", ".").split(".")).length;
-        // setup default
-        $scope.sliderOptions = {
-            "start": start,
-            "step": step,
-            "tooltips": tooltips,
-            "format": {
-                to: function (value) {
-                    return value.toFixed(stepDecimalPlaces);
-                },
-                from: function (value) {
-                    return Number(value);
-                }
-            },
-            "range": {
-                "min": min,
-                "max": max
-            },
-            "pips": {
-                mode: 'steps',
-                density: 100,
-                filter: filterPips
-            }
-        };
-
-        function filterPips(value) {
-            // show a pip for min and maximum value
-            return value === $scope.model.config.minVal || value === $scope.model.config.maxVal ? 1 : -1;
-        }
-
-    }
-    
-    $scope.$watch('model.value', function(newValue, oldValue){
-        if(newValue && newValue !== oldValue) {
-            $scope.sliderValue = newValue.split(',');
-            sliderRef.noUiSlider.set($scope.sliderValue);
-        }
-    })
-
-    init();
-
-}
-angular.module("umbraco").controller("Umbraco.PropertyEditors.SliderController", sliderController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.html
deleted file mode 100644
index 084a4e9bf5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="umb-property-editor umb-slider" ng-controller="Umbraco.PropertyEditors.SliderController">
-
-    <ng-form name="modelValueForm">
-        <div style="padding-top: 50px; padding-bottom: 40px;">
-            <umb-range-slider 
-                ng-model="sliderValue"
-                options="sliderOptions"
-                on-setup="setup(slider)"
-                on-change="change(values)"
-                ng-attr-readonly="{{ readonly || undefined }}">
-            </umb-range-slider>
-        </div>
-        <input type="hidden" name="modelValue" ng-model="model.value" />
-    </ng-form>    
-    
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
deleted file mode 100644
index 688ac7693f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
+++ /dev/null
@@ -1,10 +0,0 @@
-angular.module("umbraco")
-.controller("Umbraco.PropertyEditors.TagsController",
-    function ($scope) {
-
-        $scope.valueChanged = function(value) {
-            $scope.model.value = value;
-        }
-
-    }
-);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
deleted file mode 100644
index c73c48ca5d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.TagsController" class="umb-property-editor umb-tags">
-
-    <umb-tags-editor 
-        value="model.value"
-        config="model.config"
-        validation="model.validation"
-        on-value-changed="valueChanged(value)"
-        culture="model.culture"
-        input-id="{{model.alias}}"
-        ng-attr-readonly="{{ readonly || undefined }}">
-    </umb-tags-editor>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.prevalues.html
deleted file mode 100644
index 60ee37d20c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.prevalues.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div >
-
-    <select name="dropDownList"
-            class="umb-property-editor umb-dropdown"
-            ng-model="model.value">
-        <option>Json</option>
-        <option>Csv</option>
-    </select>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/templatepicker/templatepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/templatepicker/templatepicker.html
deleted file mode 100644
index bb0852684c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/templatepicker/templatepicker.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="umb-property-editor umb-templatepicker">
-    <div ng-model="model.value">{{model.value | json}}</div>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js
deleted file mode 100644
index 4f3cb6770b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.controller.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function textAreaController($scope, validationMessageService) {
-
-    // macro parameter editor doesn't contains a config object,
-    // so we create a new one to hold any properties
-    if (!$scope.model.config) {
-        $scope.model.config = {};
-    }
-
-    $scope.maxChars = $scope.model.config.maxChars || 0;
-    $scope.maxCharsLimit = ($scope.model.config && $scope.model.config.maxChars > 0);
-    $scope.charsCount = 0;
-    $scope.nearMaxLimit = false;
-    $scope.validLength = true;
-
-    $scope.$on("formSubmitting", function() {
-        if ($scope.validLength) {
-            $scope.textareaFieldForm.textarea.$setValidity("maxChars", true);
-        } else {
-            $scope.textareaFieldForm.textarea.$setValidity("maxChars", false);
-        }
-    });
-
-    function checkLengthVadility() {
-        $scope.validLength = !($scope.maxCharsLimit === true && $scope.charsCount > $scope.maxChars);
-    }
-
-    $scope.change = function () {
-        if ($scope.model.value) {
-            $scope.charsCount = $scope.model.value.length;
-            checkLengthVadility();
-            $scope.nearMaxLimit = $scope.maxCharsLimit === true && $scope.validLength === true && $scope.charsCount > Math.max($scope.maxChars*.8, $scope.maxChars-50);
-        }
-    }
-    $scope.model.onValueChanged = $scope.change;
-    $scope.change();
-
-    // Set the message to use for when a mandatory field isn't completed.
-    // Will either use the one provided on the property type or a localised default.
-    validationMessageService.getMandatoryMessage($scope.model.validation).then(function (value) {
-        $scope.mandatoryMessage = value;
-    });
-}
-angular.module('umbraco').controller("Umbraco.PropertyEditors.textAreaController", textAreaController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
deleted file mode 100644
index f9e9ede0e1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.textAreaController">
-    <ng-form name="textareaFieldForm">
-        <textarea ng-model="model.value"
-            id="{{model.alias}}"
-            name="textarea"
-            rows="{{model.config.rows || 10}}"
-            class="umb-property-editor umb-textarea textstring"
-            val-server="value"
-            ng-change="change()"
-            ng-trim="false"
-            ng-required="model.validation.mandatory"
-            aria-required="{{model.validation.mandatory}}"
-            ng-readonly="readonly"
-            aria-invalid="{{validLength ? false : true}}">
-        </textarea>
-
-        <span ng-messages="textareaFieldForm.textarea.$error" show-validation-on-submit >
-            <span class="help-inline" ng-message="required">{{mandatoryMessage}}</span>
-            <span class="help-inline" ng-message="valServer">{{textareaFieldForm.textarea.errorMsg}}</span>
-        </span>
-
-        <div class="help" ng-if="nearMaxLimit">
-            <p class="sr-only" tabindex="0">{{model.label}} <localize key="textbox_characters_left" tokens="[maxChars - charsCount]" watch-tokens="true">%0% characters left.</localize></p>
-            <p aria-hidden="true"><localize key="textbox_characters_left" tokens="[maxChars - charsCount]" watch-tokens="true">%0% characters left.</localize></p>
-        </div>
-        <div class="help text-error" ng-if="validLength === false">
-            <p class="sr-only" tabindex="0">{{model.label}} <localize key="textbox_characters_exceed" tokens="[maxChars, charsCount - maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize></p>
-            <p aria-hidden="true"><localize key="textbox_characters_exceed" tokens="[maxChars, charsCount - maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize></p>
-        </div>
-
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js
deleted file mode 100644
index 3e4539c6ae..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function textboxController($scope, validationMessageService) {
-    // macro parameter editor doesn't contains a config object,
-    // so we create a new one to hold any properties
-    if (!$scope.model.config) {
-        $scope.model.config = {};
-    }
-
-    // 512 is the maximum number that can be stored
-    // in the database, so set it to the max, even
-    // if no max is specified in the config
-    $scope.maxChars = Math.min($scope.model.config.maxChars || 512, 512);
-    $scope.charsCount = 0;
-    $scope.nearMaxLimit = false;
-    $scope.validLength = true;
-
-    $scope.$on("formSubmitting", function() {
-        if ($scope.validLength === true) {
-            $scope.textboxFieldForm.textbox.$setValidity("maxChars", true);
-        } else {
-            $scope.textboxFieldForm.textbox.$setValidity("maxChars", false);
-        }
-    });
-
-    function checkLengthVadility() {
-        $scope.validLength = $scope.charsCount <= $scope.maxChars;
-    }
-
-    $scope.change = function () {
-        if ($scope.model.value) {
-            $scope.charsCount = $scope.model.value.length;
-            checkLengthVadility();
-            $scope.nearMaxLimit = $scope.validLength && $scope.charsCount > Math.max($scope.maxChars*.8, $scope.maxChars-25);
-        }
-        else {
-            $scope.charsCount = 0;
-            checkLengthVadility();
-        }
-    }
-    $scope.model.onValueChanged = $scope.change;
-    $scope.change();
-
-    // Set the message to use for when a mandatory field isn't completed.
-    // Will either use the one provided on the property type or a localised default.
-    validationMessageService.getMandatoryMessage($scope.model.validation).then(function(value) {
-        $scope.mandatoryMessage = value;
-    });
-}
-angular.module('umbraco').controller("Umbraco.PropertyEditors.textboxController", textboxController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
deleted file mode 100644
index 1a324b598a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.textboxController">
-    <ng-form name="textboxFieldForm">
-        <input type="text"
-               id="{{model.alias}}"
-               name="textbox"
-               ng-model="model.value"
-               class="umb-property-editor umb-textstring textstring"
-               val-server="value"
-               ng-required="model.validation.mandatory"
-               aria-required="{{model.validation.mandatory}}"
-               aria-invalid="{{validLength ? false : true}}"
-               ng-trim="false"
-               ng-change="change()"
-               ng-readonly="readonly" />
-
-        <div ng-messages="textboxFieldForm.textbox.$error" show-validation-on-submit>
-            <p class="sr-only" ng-message="valServer" tabindex="0">{{model.label}} {{textboxFieldForm.textbox.errorMsg}}</p>
-            <p class="help-inline" ng-message="valServer" tabindex="0" aria-hidden="true">{{textboxFieldForm.textbox.errorMsg}}</p>
-            <p class="help-inline" ng-message="required">{{mandatoryMessage}}</p>
-        </div>
-
-        <div class="help" ng-if="nearMaxLimit">
-            <p class="sr-only" tabindex="0">{{model.label}} <localize key="textbox_characters_left" tokens="[maxChars - charsCount]" watch-tokens="true">%0% characters left.</localize></p>
-            <p aria-hidden="true"><localize key="textbox_characters_left" tokens="[maxChars - charsCount]" watch-tokens="true">%0% characters left.</localize></p>
-        </div>
-        <div class="help text-error" ng-if="validLength === false">
-            <p class="sr-only" tabindex="0">{{model.label}} <localize key="textbox_characters_exceed" tokens="[maxChars, charsCount - maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize></p>
-            <p aria-hidden="true"><localize key="textbox_characters_exceed" tokens="[maxChars, charsCount - maxChars]" watch-tokens="true">Maximum %0% characters, <strong>%1%</strong> too many.</localize></p>
-        </div>
-
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.controller.js
deleted file mode 100644
index 1b913d7014..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.controller.js
+++ /dev/null
@@ -1,45 +0,0 @@
-angular.module('umbraco').controller("Umbraco.PropertyEditors.UrlListController",
-	function($rootScope, $scope, $filter) {
-
-	    function formatDisplayValue() {            
-	        if (Utilities.isArray($scope.model.value)) {
-	            //it's the json value
-	            $scope.renderModel = _.map($scope.model.value, function (item) {
-	                return {
-	                    url: item.url,
-	                    linkText: item.linkText,
-	                    urlTarget: (item.target) ? item.target : "_blank",
-	                    icon: (item.icon) ? item.icon : "icon-out"
-	                };
-	            });
-	        }
-	        else {
-                //it's the default csv value
-	            $scope.renderModel = _.map($scope.model.value.split(","), function (item) {
-	                return {
-	                    url: item,
-	                    linkText: "",
-	                    urlTarget: ($scope.config && $scope.config.target) ? $scope.config.target : "_blank",
-	                    icon: ($scope.config && $scope.config.icon) ? $scope.config.icon : "icon-out"
-	                };
-	            });
-	        }
-        }
-
-	    $scope.getUrl = function(valueUrl) {
-	        if (valueUrl.indexOf("/") >= 0) {
-	            return valueUrl;
-	        }
-	        return "#";
-	    };
-
-	    formatDisplayValue();
-	    
-	    //here we declare a special method which will be called whenever the value has changed from the server
-	    //this is instead of doing a watch on the model.value = faster
-	    $scope.model.onValueChanged = function(newVal, oldVal) {
-	        //update the display val again
-	        formatDisplayValue();
-	    };
-
-	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html
deleted file mode 100644
index 268995d1e4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.UrlListController">
-    <ul class="nav nav-stacked">
-        <li ng-repeat="value in renderModel">
-            <a href="{{getUrl(value.url)}}" prevent-default="{{value.url.indexOf('/') == -1}}" target="{{value.urlTarget}}" class="umb-outline">
-                <umb-icon icon="{{value.icon}}"></umb-icon>
-                <span>{{value.linkText || value.url}}</span>
-            </a>
-        </li>
-    </ul>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/overlays/remove.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/overlays/remove.html
deleted file mode 100644
index 69812032e7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/overlays/remove.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div>
-
-    <div class="umb-alert umb-alert--warning mb2">
-        <localize key="defaultdialogs_propertyuserpickerremovewarning" tokens="[model.username]">This will remove the user <strong>{{ model.username }}</strong>.</localize>
-    </div>
-
-    <localize key="defaultdialogs_confirmremove">Yes, remove</localize>?
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
deleted file mode 100644
index 7d86e19e68..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
+++ /dev/null
@@ -1,132 +0,0 @@
-function userPickerController($scope, iconHelper, editorService, overlayService, entityResource) {
-
-    var vm = this;
-
-    function trim(str, chr) {
-        var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
-        return str.replace(rgxtrim, '');
-    }
-
-    $scope.renderModel = [];
-    $scope.allowRemove = !$scope.readonly;
-    $scope.allowAdd = !$scope.readonly;
-
-    var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
-
-    function setDirty() {
-        if ($scope.modelValueForm) {
-            $scope.modelValueForm.modelValue.$setDirty();
-        }
-    }
-
-    $scope.openUserPicker = function () {
-        if (!$scope.allowAdd) return;
-
-        var currentSelection = [];
-        var userPicker = {
-            multiPicker: multiPicker,
-            selection: currentSelection,
-            submit: function (model) {
-                if (model.selection) {
-                    _.each(model.selection, function (item, i) {
-                        $scope.add(item);
-                    });
-                }
-                editorService.close();
-            },
-            close: function () {
-                editorService.close();
-            }
-        };
-
-        editorService.userPicker(userPicker);
-    };
-
-    $scope.remove = function (index) {
-        if (!$scope.allowRemove) return;
-
-        const dialog = {
-            view: "views/propertyeditors/userpicker/overlays/remove.html",
-            username: $scope.renderModel[index].name,
-            submitButtonLabelKey: "defaultdialogs_yesRemove",
-            submitButtonStyle: "danger",
-
-            submit: function () {
-                $scope.renderModel.splice(index, 1);
-                $scope.userName = '';
-                setDirty();
-                overlayService.close();
-            },
-            close: function () {
-                overlayService.close();
-            }
-        };
-
-        overlayService.open(dialog);
-    };
-
-    $scope.add = function (item) {
-        if (!$scope.allowAdd) return;
-
-        var currIds = _.map($scope.renderModel, function (i) {
-            if ($scope.model.config.idType === "udi") {
-                return i.udi;
-            }
-            else {
-                return i.id;
-            }
-        });
-
-        var itemId = $scope.model.config.idType === "udi" ? item.udi : item.id;
-
-        if (currIds.indexOf(itemId) < 0) {
-            item.icon = item.icon ? iconHelper.convertFromLegacyIcon(item.icon) : "icon-user";
-            $scope.renderModel.push({ name: item.name, id: item.id, udi: item.udi, icon: item.icon, avatars: item.avatars });
-            setDirty();
-        }
-    };
-
-    $scope.clear = function() {
-        if (!$scope.allowRemove) return;
-        
-        $scope.renderModel = [];
-        setDirty();
-    };
-
-    var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
-        var currIds = _.map($scope.renderModel, function (i) {
-            if ($scope.model.config.idType === "udi") {
-                return i.udi;
-            }
-            else {
-                return i.id;
-            }
-        });
-        $scope.model.value = trim(currIds.join(), ",");
-    });
-
-    //when the scope is destroyed we need to unsubscribe
-    $scope.$on('$destroy', function () {
-        unsubscribe();
-    });
-
-    //load user data - split to an array of ints (map)
-    const modelIds = $scope.model.value ? $scope.model.value.split(',').map(x => +x) : [];
-    if(modelIds.length !== 0) {
-        entityResource.getAll("User").then(function (users) {
-            const filteredUsers = users.filter(user => modelIds.indexOf(user.id) !== -1);
-            filteredUsers.forEach(item => {
-                    $scope.renderModel.push({
-                        name: item.name,
-                        id: item.id,
-                        udi: item.udi,
-                        icon: item.icon = item.icon ? iconHelper.convertFromLegacyIcon(item.icon) : "icon-user",
-                        avatars: item.avatars
-                    });
-                });
-            });
-    }
-}
-
-
-angular.module('umbraco').controller("Umbraco.PropertyEditors.UserPickerController", userPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html
deleted file mode 100644
index 2934390f2c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div ng-controller="Umbraco.PropertyEditors.UserPickerController as vm" class="umb-property-editor umb-userpicker">
-
-    <div>
-        <umb-user-preview 
-            ng-repeat="user in renderModel"
-            name="user.name"
-            avatars="user.avatars"
-            allow-remove="allowRemove"
-            on-remove="remove($index)">
-        </umb-user-preview>
-    </div>
-
-    <button
-        type="button"
-        ng-show="model.config.multiPicker === true || renderModel.length === 0"    
-        class="umb-node-preview-add"
-        ng-click="openUserPicker()"
-        ng-disabled="readonly">
-        
-        <localize key="general_add">Add</localize>
-    </button>
-
-    <ng-form name="modelValueForm">
-        <input type="hidden" name="modelValue" ng-model="renderModel.length" ng-required="model.validation.mandatory && !renderModel.length" />
-    </ng-form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/validationtest/validationtest.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/validationtest/validationtest.html
deleted file mode 100644
index 1224b83c30..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/validationtest/validationtest.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div>
-    <ng-form name="validationTestForm">
-        <p>Enter a numeric value</p>
-
-        <input name="myInput" type="text" ng-model="model.value" class="umb-textstring span7 textstring"
-               required
-               val-regex="^\d*$"
-               val-server="value" />
-
-        <span ng-messages="validationTestForm.myInput.$error" show-validation-on-submit >
-            <span class="help-inline" ng-message="required">Required!</span>
-            <span class="help-inline" ng-message="valRegex">The value entered is not a number</span>
-            <span class="help-inline" ng-message="valServer">A server error occurred</span>
-        </span>
-        
-    </ng-form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationTypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationTypes/create.controller.js
deleted file mode 100644
index 1ebf5dea45..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/relationTypes/create.controller.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.RelationTypes.CreateController
- * @function
- *
- * @description
- * The controller for creating relation types.
- */
-function RelationTypeCreateController($scope, $location, relationTypeResource, navigationService, formHelper, appState, notificationsService) {
-    var vm = this;
-    vm.relationType = {};
-    vm.objectTypes = {};
-
-    vm.createRelationType = createRelationType;
-
-    init();
-
-    function init() {
-        $scope.$emit("$changeTitle", "");
-        relationTypeResource.getRelationObjectTypes().then(function(data) {
-                vm.objectTypes = data;
-            },
-            function(err) {
-                notificationsService.error("Could not load form.");
-            });
-    }
-
-    function createRelationType() {
-        if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createRelationTypeForm, statusMessage: "Creating relation type..." })) {
-            var node = $scope.currentNode;
-
-            relationTypeResource.create(vm.relationType).then(function (data) {
-                navigationService.hideMenu();
-
-                // Set the new item as active in the tree
-                var currentPath = node.path ? node.path : "-1";
-                navigationService.syncTree({ tree: "relationTypes", path: currentPath + "," + data, forceReload: true, activate: true });
-
-                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createRelationTypeForm });
-
-                var currentSection = appState.getSectionState("currentSection");
-                $location.path("/" + currentSection + "/relationTypes/edit/" + data);
-            }, function (err) {
-                formHelper.resetForm({ scope: $scope, formCtrl: $scope.createRelationTypeForm, hasErrors: true });
-                if (err.data && err.data.message) {
-                    notificationsService.error(err.data.message);
-                    navigationService.hideMenu();
-                }
-            });
-        }
-    }
-
-    $scope.close = function () {
-        navigationService.hideDialog(true);
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.RelationTypes.CreateController", RelationTypeCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationTypes/create.html b/src/Umbraco.Web.UI.Client/src/views/relationTypes/create.html
deleted file mode 100644
index e910dd31ce..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/relationTypes/create.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<div ng-cloak ng-controller="Umbraco.Editors.RelationTypes.CreateController as vm">
-
-  <form name="createRelationTypeForm" ng-submit="vm.createRelationType()"
-        novalidate
-        val-form-manager>
-    <div class="umbracoDialog umb-dialog-body with-footer">
-      <div class="umb-pane">
-        <!-- Name -->
-        <umb-control-group alias="relationTypeName" label="@relationType_name">
-          <input class="umb-textstring textstring input-block-level" id="relationTypeName" name="relationTypeName" ng-model="vm.relationType.name"
-                 required type="text" umb-auto-focus/>
-        </umb-control-group>
-
-        <!-- Direction -->
-        <umb-control-group label="@relationType_direction">
-          <p class="sr-only" tabindex="0">
-            <localize key="relationType_direction"></localize>
-          </p>
-          <ul class="unstyled">
-            <li>
-              <label class="radio" for="parentToChild">
-                <umb-radiobutton input-id="parentToChild"
-                                 label-key="relationType_parentToChild"
-                                 model="vm.relationType.isBidirectional" name="relationType-direction" required="true"
-                                 value="false">
-                </umb-radiobutton>
-              </label>
-            </li>
-            <li>
-              <label class="radio" for="bidirectional">
-                <umb-radiobutton input-id="bidirectional"
-                                 label-key="relationType_bidirectional"
-                                 model="vm.relationType.isBidirectional" name="relationType-direction" required="true"
-                                 value="true">
-                </umb-radiobutton>
-              </label>
-            </li>
-          </ul>
-        </umb-control-group>
-
-        <!-- Parent -->
-        <umb-control-group alias="relationType-parent" label="@relationType_parent">
-          <select class="umb-property-editor umb-dropdown" id="relationType-parent"
-                  name="relationType-parent"
-                  ng-model="vm.relationType.parentObjectType" required>
-            <option ng-repeat="objectType in vm.objectTypes" value="{{objectType.id}}">{{objectType.name}}</option>
-          </select>
-        </umb-control-group>
-
-        <!-- Child -->
-        <umb-control-group alias="relationType-child" label="@relationType_child">
-          <select class="umb-property-editor umb-dropdown" id="relationType-child"
-                  name="relationType-child"
-                  ng-model="vm.relationType.childObjectType" required>
-            <option ng-repeat="objectType in vm.objectTypes" value="{{objectType.id}}">{{objectType.name}}</option>
-          </select>
-        </umb-control-group>
-
-        <!-- IsDependency -->
-
-        <umb-control-group label="@relationType_isDependency">
-          <p class="sr-only" tabindex="0">
-            <localize key="relationType_direction"></localize>
-          </p>
-          <ul class="unstyled">
-            <li>
-              <label class="radio" for="dependency">
-                <umb-radiobutton input-id="dependency"
-                                 label-key="relationType_dependency"
-                                 model="vm.relationType.isDependency" name="relationType-isdependency" required="true"
-                                 value="true">
-                </umb-radiobutton>
-              </label>
-            </li>
-            <li>
-              <label class="radio" for="nodependency">
-                <umb-radiobutton input-id="nodependency"
-                                 label-key="relationType_noDependency"
-                                 model="vm.relationType.isDependency" name="relationType-isdependency" required="true"
-                                 value="false">
-                </umb-radiobutton>
-              </label>
-            </li>
-          </ul>
-        </umb-control-group>
-      </div>
-    </div>
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-      <umb-button action="close()"
-                  button-style="link"
-                  label-key="general_close"
-                  type="button">
-      </umb-button>
-      <umb-button button-style="primary"
-                  label-key="general_create"
-                  type="submit">
-      </umb-button>
-    </div>
-  </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationTypes/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationTypes/delete.controller.js
deleted file mode 100644
index 1a32f17a46..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/relationTypes/delete.controller.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.RelationTypes.DeleteController
- * @function
- *
- * @description
- * The controller for deleting relation types.
- */
-function RelationTypeDeleteController($scope, $location, relationTypeResource, treeService, navigationService, appState) {
-
-    var vm = this;
-
-    vm.cancel = cancel;
-    vm.performDelete = performDelete;
-
-    function cancel() {
-        navigationService.hideDialog();
-    }
-
-    function performDelete() {
-        // stop from firing again on double-click
-        if ($scope.busy) { return false; }
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        $scope.busy = true;
-
-        relationTypeResource.deleteById($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            treeService.removeNode($scope.currentNode);
-
-            navigationService.hideMenu();
-
-            var currentSection = appState.getSectionState("currentSection");
-            $location.path("/" + currentSection + "/");
-        });
-    }
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.RelationTypes.DeleteController", RelationTypeDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationTypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/relationTypes/delete.html
deleted file mode 100644
index 246e5bdb7a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/relationTypes/delete.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.RelationTypes.DeleteController as vm">
-    <div class="umb-dialog-body" auto-scale="90">
-
-        <p class="abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <umb-confirm on-confirm="vm.performDelete" on-cancel="vm.cancel" confirm-button-style="danger">
-        </umb-confirm>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationTypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationTypes/edit.controller.js
deleted file mode 100644
index 5dd7f3165b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/relationTypes/edit.controller.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.RelationTypes.EditController
- * @function
- *
- * @description
- * The controller for editing relation types.
- */
-function RelationTypeEditController($scope, $routeParams, relationTypeResource, editorState, navigationService, dateHelper, userService, notificationsService, formHelper, contentEditingHelper, localizationService, eventsService) {
-
-    var vm = this;
-
-    vm.header = {};
-    vm.header.editorfor = "relationType_tabRelationType";
-    vm.header.setPageTitle = true;
-
-    vm.page = {};
-    vm.page.loading = false;
-    vm.page.saveButtonState = "init";
-    vm.page.menu = {}
-
-    vm.save = saveRelationType;
-
-    init();
-
-    function init() {
-        vm.page.loading = true;
-        vm.relationsLoading = true;
-
-        vm.changePageNumber = changePageNumber;
-        vm.options = {};
-
-        var labelKeys = [
-            "relationType_tabRelationType",
-            "relationType_tabRelations"
-        ];
-
-        localizationService.localizeMany(labelKeys).then(function (data) {
-            vm.page.navigation = [
-                {
-                    "name": data[0],
-                    "alias": "relationType",
-                    "icon": "icon-info",
-                    "view": "views/relationTypes/views/relationType.html",
-                    "active": true
-                },
-                {
-                    "name": data[1],
-                    "alias": "relations",
-                    "icon": "icon-trafic",
-                    "view": "views/relationTypes/views/relations.html"
-                }
-            ];
-        });
-
-        // load references when the 'relations' tab is first activated/switched to
-        loadRelations();
-
-        // Inital page/overview API call of relation type
-        relationTypeResource.getById($routeParams.id)
-            .then(function (data) {
-                bindRelationType(data);
-                vm.page.loading = false;
-            });
-    }
-
-    function changePageNumber(pageNumber) {
-        vm.options.pageNumber = pageNumber;
-        loadRelations();
-    }
-
-
-    /** Loads in the references one time  when content app changed */
-    function loadRelations() {
-        relationTypeResource.getPagedResults($routeParams.id, vm.options)
-            .then(function (data) {
-                formatDates(data.items);
-                vm.relationsLoading = false;
-                vm.relations = data;
-            });
-    }
-
-
-    function bindRelationType(relationType) {
-        // Convert property value to string, since the umb-radiobutton component at the moment only handle string values.
-        // Sometime later the umb-radiobutton might be able to handle value as boolean.
-        relationType.isBidirectional = (relationType.isBidirectional || false).toString();
-        relationType.isDependency = (relationType.isDependency || false).toString();
-
-        vm.relationType = relationType;
-
-        editorState.set(vm.relationType);
-
-        navigationService.syncTree({ tree: "relationTypes", path: relationType.path, forceReload: true }).then(function (syncArgs) {
-            vm.page.menu.currentNode = syncArgs.node;
-        });
-    }
-
-    function formatDates(relations) {
-        if (relations) {
-            userService.getCurrentUser().then(function (currentUser) {
-                relations.forEach(function (relation) {
-                    relation.timestampFormatted = dateHelper.getLocalDate(relation.createDate, currentUser.locale, 'LLL');
-                });
-            });
-        }
-    }
-
-    function saveRelationType() {
-
-        if (formHelper.submitForm({ scope: $scope, statusMessage: "Saving..." })) {
-
-            vm.page.saveButtonState = "busy";
-
-            relationTypeResource.save(vm.relationType).then(function (data) {
-                formHelper.resetForm({ scope: $scope });
-                bindRelationType(data);
-
-                vm.page.saveButtonState = "success";
-
-            }, function (error) {
-                formHelper.resetForm({ scope: $scope, hasErrors: true });
-                contentEditingHelper.handleSaveError({
-                    err: error
-                });
-
-                notificationsService.error(error.data.message);
-
-                vm.page.saveButtonState = "error";
-            });
-        }
-    }
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.RelationTypes.EditController", RelationTypeEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationTypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/relationTypes/edit.html
deleted file mode 100644
index 4b51c44c18..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/relationTypes/edit.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<div data-element="editor-relation-types" ng-controller="Umbraco.Editors.RelationTypes.EditController as vm">
-    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
-
-    <form name="relationTypeForm" novalidate val-form-manager ng-submit="vm.save()">
-        <umb-editor-view ng-if="!vm.page.loading">
-            <umb-editor-header
-                name="vm.relationType.name"
-                alias="vm.relationType.alias"
-                alias-locked="vm.relationType.isSystemRelationType"
-                hide-description="true"
-                hide-icon="true"
-                navigation="vm.page.navigation"
-                editorfor="vm.header.editorfor"
-                setpagetitle="vm.header.setPageTitle">
-            </umb-editor-header>
-
-            <umb-editor-container class="form-horizontal">
-                <umb-editor-sub-views sub-views="vm.page.navigation" model="vm">
-                </umb-editor-sub-views>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                <umb-editor-footer-content-right>
-                    <umb-button
-                        type="submit"
-                        button-style="success"
-                        state="vm.page.saveButtonState"
-                        shortcut="ctrl+s"
-                        label="Save"
-                        label-key="buttons_save">
-                    </umb-button>
-                </umb-editor-footer-content-right>
-            </umb-editor-footer>
-        </umb-editor-view>
-    </form>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationTypes/views/relationType.html b/src/Umbraco.Web.UI.Client/src/views/relationTypes/views/relationType.html
deleted file mode 100644
index 613bb5dc2b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/relationTypes/views/relationType.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<div ng-controller="Umbraco.Editors.RelationTypes.SettingsController as vm">
-
-    <div class="umb-package-details">
-
-        <div class="umb-package-details__main-content">
-
-            <umb-box>
-                <umb-box-content>
-
-                    <!-- Direction -->
-                    <umb-control-group label="@relationType_direction">
-                        <ul class="unstyled">
-                            <li>
-                                <umb-radiobutton name="relationTypeDirection"
-                                                 value="false"
-                                                 model="model.relationType.isBidirectional"
-                                                 text="{{vm.labels.parentToChild}}">
-                                </umb-radiobutton>
-                            </li>
-                            <li>
-                                <umb-radiobutton name="relationTypeDirection"
-                                                 value="true"
-                                                 model="model.relationType.isBidirectional"
-                                                 text="{{vm.labels.bidirectional}}">
-                                </umb-radiobutton>
-                            </li>
-                        </ul>
-                    </umb-control-group>
-
-                    <!-- Parent-->
-                    <umb-control-group label="@relationType_parent">
-                        <div>{{model.relationType.parentObjectTypeName}}</div>
-                    </umb-control-group>
-
-                    <!-- Child -->
-                    <umb-control-group label="@relationType_child">
-                        <div>{{model.relationType.childObjectTypeName}}</div>
-                    </umb-control-group>
-
-                  <!-- IsDependency -->
-                  <umb-control-group label="@relationType_isDependency">
-                    <ul class="unstyled">
-                      <li>
-                        <umb-radiobutton name="relationTypeIsDependency"
-                                         value="true"
-                                         model="model.relationType.isDependency"
-                                         text="{{vm.labels.dependency}}">
-                        </umb-radiobutton>
-                      </li>
-                      <li>
-                        <umb-radiobutton name="relationTypeIsDependency"
-                                         value="false"
-                                         model="model.relationType.isDependency"
-                                         text="{{vm.labels.noDependency}}">
-                        </umb-radiobutton>
-                      </li>
-                    </ul>
-                  </umb-control-group>
-
-                    <!-- Relation count -->
-                    <umb-control-group label="@relationType_count" ng-if="model.relationType.relations.length > 0">
-                        <div>{{model.relationType.relations.length}}</div>
-                    </umb-control-group>
-                </umb-box-content>
-            </umb-box>
-
-        </div>
-
-        <div class="umb-package-details__sidebar">
-            <umb-box data-element="node-info-general">
-                <umb-box-header title-key="general_general"></umb-box-header>
-                <umb-box-content class="block-form">
-                    <umb-control-group label="Id">
-                        <div>{{model.relationType.id}}</div>
-                        <small>{{model.relationType.key}}</small>
-                    </umb-control-group>
-                </umb-box-content>
-            </umb-box>
-        </div>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationTypes/views/relationType.settings.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationTypes/views/relationType.settings.controller.js
deleted file mode 100644
index 01b5367eab..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/relationTypes/views/relationType.settings.controller.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.RelationTypes.SettingsController
- * @function
- *
- * @description
- * The controller for editing relation type settings.
- */
-function RelationTypeSettingsController($scope, localizationService) {
-
-    var vm = this;
-
-    vm.labels = {};
-
-    function init() {
-
-        var labelKeys = [
-            "relationType_parentToChild",
-            "relationType_bidirectional",
-            "relationType_dependency",
-            "relationType_noDependency"
-
-        ];
-
-        localizationService.localizeMany(labelKeys).then(function (data) {
-            vm.labels.parentToChild = data[0];
-            vm.labels.bidirectional = data[1];
-            vm.labels.dependency = data[2];
-            vm.labels.noDependency = data[3];
-        });
-    }
-
-    init();
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.RelationTypes.SettingsController", RelationTypeSettingsController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationTypes/views/relations.html b/src/Umbraco.Web.UI.Client/src/views/relationTypes/views/relations.html
deleted file mode 100644
index b525fbcba3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/relationTypes/views/relations.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<umb-load-indicator ng-if="model.relationsLoading"></umb-load-indicator>
-
-<umb-box ng-if="model.relationsLoading === false">
-    <umb-box-content class="block-form">
-
-        <umb-empty-state size="small" ng-if="model.relations.totalItems === 0">
-            <localize key="relationType_noRelations">No relations for this relation type.</localize>
-        </umb-empty-state>
-
-        <!-- Relations -->
-        <umb-control-group label="@relationType_relations" ng-if="model.relations.items.length > 0">
-            <div>
-                <table class="table">
-                    <tr>
-                        <th><localize key="relationType_parent">Parent</localize></th>
-                        <th><localize key="relationType_child">Child</localize></th>
-                        <th><localize key="relationType_created">Created</localize></th>
-                        <th><localize key="relationType_comment">Comment</localize></th>
-                    </tr>
-                    <tr ng-repeat="relation in model.relations.items">
-                        <td>{{relation.parentName}}</td>
-                        <td>{{relation.childName}}</td>
-                        <td>{{relation.timestampFormatted}}</td>
-                        <td>{{relation.comment}}</td>
-                    </tr>
-                </table>
-            </div>
-
-            <!-- Pagination -->
-            <div class="flex justify-center">
-                <umb-pagination ng-if="model.relations.totalPages"
-                                page-number="model.relations.pageNumber"
-                                total-pages="model.relations.totalPages"
-                                on-change="model.changePageNumber(pageNumber)">
-                </umb-pagination>
-            </div>
-        </umb-control-group>
-    </umb-box-content>
-</umb-box>
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
deleted file mode 100644
index 14d7e54a66..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
+++ /dev/null
@@ -1,65 +0,0 @@
-(function () {
-    "use strict";
-
-    function ScriptsCreateController($scope, $location, navigationService, formHelper, codefileResource, localizationService, appState) {
-
-        var vm = this;
-        var node = $scope.currentNode;
-
-        vm.creatingFolder = false;
-        vm.folderName = "";
-        vm.createFolderError = "";
-        vm.fileExtension = "";
-
-        vm.createFile = createFile;
-        vm.showCreateFolder = showCreateFolder;
-        vm.createFolder = createFolder;
-        vm.close = close;
-
-        function createFile() {
-            $location.path("/settings/scripts/edit/" + node.id).search("create", "true");
-            navigationService.hideMenu();
-        }
-
-        function showCreateFolder() {
-            vm.creatingFolder = true;
-        }
-
-        function createFolder(form) {
-
-            if (formHelper.submitForm({ scope: $scope, formCtrl: form })) {
-
-                codefileResource.createContainer("scripts", node.id, vm.folderName).then(function (saved) {
-
-                    navigationService.hideMenu();
-
-                    navigationService.syncTree({
-                        tree: "scripts",
-                        path: saved.path,
-                        forceReload: true,
-                        activate: true
-                    });
-
-                    formHelper.resetForm({ scope: $scope, formCtrl: form });
-
-                    var section = appState.getSectionState("currentSection");
-
-                }, function (err) {
-
-                    formHelper.resetForm({ scope: $scope, formCtrl: form, hasErrors: true });
-                    vm.createFolderError = err;
-
-                });
-            }
-
-        }
-
-        function close() {
-            const showMenu = true;
-            navigationService.hideDialog(showMenu);
-        }
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Scripts.CreateController", ScriptsCreateController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
deleted file mode 100644
index f1adb6072c..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<div ng-controller="Umbraco.Editors.Scripts.CreateController as vm" ng-cloak>
-
-    <div ng-if="!vm.creatingFolder">
-        <div class="umbracoDialog umb-dialog-body with-footer">
-
-            <div class="umb-pane">
-                <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
-
-                <ul class="umb-actions umb-actions-child">
-                    <li class="umb-action">
-                        <button type="button" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
-                            <umb-icon icon="icon-script" class="icon large"></umb-icon>
-                            <span class="menu-label"><localize key="create_newJavascriptFile">New javascript file</localize></span>
-                        </button>
-                    </li>
-                    <li class="umb-action">
-                        <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
-                            <umb-icon icon="icon-folder" class="icon large"></umb-icon>
-                            <span class="menu-label"><localize key="general_folder">Folder</localize>...</span>
-                        </button>
-                    </li>
-                </ul>
-            </div>
-        </div>
-
-        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-            <button class="btn btn-info" ng-click="vm.close()">
-                <localize key="buttons_somethingElse">Do something else</localize>
-            </button>
-        </div>
-    </div>
-    <div ng-if="vm.creatingFolder">
-        <form novalidate name="createFolderForm"
-              ng-submit="vm.createFolder(createFolderForm)"
-              val-form-manager>
-            <div class="umbracoDialog umb-dialog-body with-footer">
-                <div class="umb-pane">
-                    <div ng-show="vm.createFolderError">
-                        <div class="alert alert-error">
-                            <div>{{vm.createFolderError.data.message}}</div>
-                        </div>
-                    </div>
-
-                    <umb-control-group label="Enter a folder name" hide-label="false">
-                        <input type="text" name="folderName" ng-model="vm.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
-                    </umb-control-group>
-                </div>
-            </div>
-            <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-                <umb-button type="button"
-                            button-style="link"
-                            action="vm.close()"
-                            label-key="general_close">
-                </umb-button>
-                <umb-button type="submit"
-                            button-style="primary"
-                            label-key="general_create">
-                </umb-button>
-            </div>
-        </form>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/delete.controller.js
deleted file mode 100644
index f7db66f786..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/delete.controller.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Scripts.DeleteController
- * @function
- *
- * @description
- * The controller for deleting scripts
- */
-function ScriptsDeleteController($scope, codefileResource, treeService, navigationService) {
-
-    $scope.performDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        
-        codefileResource.deleteByPath('scripts', $scope.currentNode.id)
-            .then(function() {
-                $scope.currentNode.loading = false;
-                //get the root node before we remove it
-                var rootNode = treeService.getTreeRoot($scope.currentNode);
-                // TODO: Need to sync tree, etc...
-                treeService.removeNode($scope.currentNode);
-                navigationService.hideMenu();
-
-            });
-    };
-
-    $scope.cancel = function() {
-        navigationService.hideDialog();
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Scripts.DeleteController", ScriptsDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/delete.html b/src/Umbraco.Web.UI.Client/src/views/scripts/delete.html
deleted file mode 100644
index c8f6a2a9b5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/delete.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Scripts.DeleteController">
-    <div class="umb-dialog-body">
-
-        <p class="abstract">
-        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
-        </umb-confirm>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js
deleted file mode 100644
index 0fa8044b6b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js
+++ /dev/null
@@ -1,205 +0,0 @@
-(function () {
-    "use strict";
-
-    function ScriptsEditController($scope, $routeParams, $timeout, appState, editorState, navigationService, assetsService, codefileResource, contentEditingHelper, notificationsService, localizationService, templateHelper, angularHelper) {
-
-        var vm = this;
-        var currentPosition = null;
-
-        vm.header = {};
-        vm.header.editorfor = "settings_script";
-        vm.header.setPageTitle = true;
-
-        vm.page = {};
-        vm.page.loading = true;
-        vm.page.menu = {};
-        vm.page.menu.currentSection = appState.getSectionState("currentSection");
-        vm.page.menu.currentNode = null;
-        vm.page.saveButtonState = "init";
-
-         //Used to toggle the keyboard shortcut modal
-        //From a custom keybinding in ace editor - that conflicts with our own to show the dialog
-        vm.showKeyboardShortcut = false;
-
-        //Keyboard shortcuts for help dialog
-        vm.page.keyboardShortcutsOverview = [];
-
-        templateHelper.getGeneralShortcuts().then(function(shortcuts){
-            vm.page.keyboardShortcutsOverview.push(shortcuts);
-        });
-
-        templateHelper.getEditorShortcuts().then(function(shortcuts){
-            vm.page.keyboardShortcutsOverview.push(shortcuts);
-        });
-
-        vm.script = {};
-
-        // bind functions to view model
-        vm.save = save;
-
-        /* Function bound to view model */
-
-        function save() {
-
-            vm.page.saveButtonState = "busy";
-            
-            vm.script.content = vm.editor.getValue();
-
-            contentEditingHelper.contentEditorPerformSave({
-                saveMethod: codefileResource.save,
-                scope: $scope,
-                content: vm.script,
-                rebindCallback: function (orignal, saved) {}
-            }).then(function (saved) {
-
-                localizationService.localizeMany(["speechBubbles_fileSavedHeader", "speechBubbles_fileSavedText"]).then(function(data){
-                    var header = data[0];
-                    var message = data[1];
-                    notificationsService.success(header, message);
-                });
-
-                //check if the name changed, if so we need to redirect
-                if (vm.script.id !== saved.id) {
-                    contentEditingHelper.redirectToRenamedContent(saved.id);
-                }
-                else {
-                    vm.page.saveButtonState = "success";
-                    vm.script = saved;
-
-                    //sync state
-                    editorState.set(vm.script);
-
-                    // sync tree
-                    navigationService.syncTree({ tree: "scripts", path: vm.script.path, forceReload: true }).then(function (syncArgs) {
-                        vm.page.menu.currentNode = syncArgs.node;
-                    });
-                }
-
-            }, function (err) {
-
-                vm.page.saveButtonState = "error";
-                
-                localizationService.localizeMany(["speechBubbles_validationFailedHeader", "speechBubbles_validationFailedMessage"]).then(function(data){
-                    var header = data[0];
-                    var message = data[1];
-                    notificationsService.error(header, message);
-                });
-
-            });
-
-
-        }
-
-        /* Local functions */
-
-        function init() {
-
-            //we need to load this somewhere, for now its here.
-            assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css", $scope);
-
-            if ($routeParams.create) {
-                codefileResource.getScaffold("scripts", $routeParams.id).then(function (script) {
-                    ready(script, false);
-                });
-            } else {
-                codefileResource.getByPath('scripts', $routeParams.id).then(function (script) {
-                    ready(script, true);
-                });
-            }
-
-        }
-
-        function ready(script, syncTree) {
-
-            vm.page.loading = false;
-
-            vm.script = script;
-
-            //sync state
-            editorState.set(vm.script);
-
-            if (syncTree) {
-                navigationService.syncTree({ tree: "scripts", path: vm.script.path, forceReload: true }).then(function (syncArgs) {
-                    vm.page.menu.currentNode = syncArgs.node;
-                });
-            }
-
-            vm.aceOption = {
-                mode: "javascript",
-                theme: "chrome",
-                showPrintMargin: false,
-                advanced: {
-                    fontSize: '14px',
-                    enableSnippets: true,
-                    enableBasicAutocompletion: true,
-                    enableLiveAutocompletion: false
-                },
-                onLoad: function(_editor) {
-                    
-                    vm.editor = _editor;
-
-                    //Update the auto-complete method to use ctrl+alt+space
-                    _editor.commands.bindKey("ctrl-alt-space", "startAutocomplete");
-                    
-                    //Unassigns the keybinding (That was previously auto-complete)
-                    //As conflicts with our own tree search shortcut
-                    _editor.commands.bindKey("ctrl-space", null);
-
-                    // TODO: Move all these keybinding config out into some helper/service
-                    _editor.commands.addCommands([
-                        //Disable (alt+shift+K)
-                        //Conflicts with our own show shortcuts dialog - this overrides it
-                        {
-                            name: 'unSelectOrFindPrevious',
-                            bindKey: 'Alt-Shift-K',
-                            exec: function() {
-                                //Toggle the show keyboard shortcuts overlay
-                                $scope.$apply(function(){
-                                    vm.showKeyboardShortcut = !vm.showKeyboardShortcut;
-                                });
-                            },
-                            readOnly: true
-                        }
-                    ]);
-                    
-                    // initial cursor placement
-                    // Keep cursor in name field if we are create a new script
-                    // else set the cursor at the bottom of the code editor
-                    if(!$routeParams.create) {
-                        $timeout(function(){
-                            vm.editor.navigateFileEnd();
-                            vm.editor.focus();
-                        });
-                    }
-
-                    vm.editor.on("change", changeAceEditor);
-
-            	}
-            }
-
-            function changeAceEditor() {
-                setFormState("dirty");
-            }
-
-            function setFormState(state) {
-                
-                // get the current form
-                var currentForm = angularHelper.getCurrentForm($scope);
-
-                // set state
-                if(state === "dirty") {
-                    currentForm.$setDirty();
-                } else if(state === "pristine") {
-                    currentForm.$setPristine();
-                }
-            }
-
-
-        }
-
-        init();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Scripts.EditController", ScriptsEditController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.html b/src/Umbraco.Web.UI.Client/src/views/scripts/edit.html
deleted file mode 100644
index fe27d4e006..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<div data-element="editor-scripts" ng-controller="Umbraco.Editors.Scripts.EditController as vm">
-
-    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
-
-    <form name="scriptsForm"
-      ng-submit="vm.save()"
-      novalidate
-      val-form-manager>
-
-        <umb-editor-view ng-if="!vm.page.loading">
-
-            <umb-editor-header
-                name="vm.script.name"
-                hide-alias="true"
-                description="vm.script.virtualPath"
-                description-locked="true"
-                hide-icon="true"
-                editorfor="vm.header.editorfor"
-                setpagetitle="vm.header.setPageTitle">
-            </umb-editor-header>
-
-            <umb-editor-container>
-                <umb-box>
-                    <umb-box-content>
-                        <div
-                            data-element="code-editor"
-                            auto-scale="85"
-                            umb-ace-editor="vm.aceOption"
-                            model="vm.script.content">
-                        </div>
-                    </umb-box-content>
-                </umb-box>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                <umb-editor-footer-content-left>
-
-                    <umb-keyboard-shortcuts-overview
-                        model="vm.page.keyboardShortcutsOverview"
-                        show-overlay="vm.showKeyboardShortcut"
-                        on-close="vm.showKeyboardShortcut = false;">
-                    </umb-keyboard-shortcuts-overview>
-
-                </umb-editor-footer-content-left>
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button
-                        type="submit"
-                        button-style="success"
-                        state="vm.page.saveButtonState"
-                        shortcut="ctrl+s"
-                        label="Save"
-                        label-key="buttons_save">
-                    </umb-button>
-
-                </umb-editor-footer-content-right>
-
-         </umb-editor-footer>
-
-        </umb-editor-view>
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js
deleted file mode 100644
index af80878c35..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js
+++ /dev/null
@@ -1,65 +0,0 @@
-(function () {
-    "use strict";
-
-    function StyleSheetsCreateController($scope, $location, navigationService, formHelper, codefileResource) {
-
-        var vm = this;
-        var node = $scope.currentNode;
-
-        vm.createFile = createFile;
-        vm.createRichtextStyle = createRichtextStyle;
-        vm.close = close;
-        vm.creatingFolder = false;
-        vm.showCreateFolder = showCreateFolder;
-        vm.createFolder = createFolder;
-
-        function createFile() {
-            $location.path("/settings/stylesheets/edit/" + node.id).search("create", "true");
-            navigationService.hideMenu();
-        }
-
-        function createRichtextStyle() {
-            $location.path("/settings/stylesheets/edit/" + node.id).search("create", "true").search("rtestyle", "true");
-            navigationService.hideMenu();
-        }
-
-        function showCreateFolder() {
-            vm.creatingFolder = true;
-        }
-
-        function createFolder(form) {
-
-            if (formHelper.submitForm({ scope: $scope, formCtrl: form })) {
-
-                codefileResource.createContainer("stylesheets", node.id, vm.folderName).then(function (saved) {
-
-                    navigationService.hideMenu();
-
-                    navigationService.syncTree({
-                        tree: "stylesheets",
-                        path: saved.path,
-                        forceReload: true,
-                        activate: true
-                    });
-
-                    formHelper.resetForm({ scope: $scope, formCtrl: form });
-
-                }, function (err) {
-
-                    formHelper.resetForm({ scope: $scope, formCtrl: form, hasErrors: true });
-                    vm.createFolderError = err;
-
-                });
-            }
-
-        }
-
-        function close() {
-            const showMenu = true;
-            navigationService.hideDialog(showMenu);
-        }
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.StyleSheets.CreateController", StyleSheetsCreateController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
deleted file mode 100644
index e3e338120d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<div ng-controller="Umbraco.Editors.StyleSheets.CreateController as vm" ng-cloak>
-
-    <div ng-if="!vm.creatingFolder">
-        <div class="umbracoDialog umb-dialog-body with-footer">
-
-            <div class="umb-pane">
-                <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
-
-                <ul class="umb-actions umb-actions-child">
-                    <li class="umb-action">
-                        <button type="button" class="umb-action-link umb-outline btn-reset" umb-auto-focus ng-click="vm.createFile()">
-                            <umb-icon icon="icon-script" class="icon large"></umb-icon>
-                            <span class="menu-label"><localize key="create_newStyleSheetFile">New style sheet file</localize></span>
-                        </button>
-                    </li>
-                    <li class="umb-action">
-                        <button type="button" ng-click="vm.createRichtextStyle()" class="umb-action-link umb-outline btn-reset">
-                            <umb-icon icon="icon-script" class="icon large"></umb-icon>
-                            <span class="menu-label"><localize key="create_newRteStyleSheetFile">New richtext style sheet file</localize></span>
-                        </button>
-                    </li>
-                    <li class="umb-action">
-                        <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.showCreateFolder()">
-                            <umb-icon icon="icon-folder" class="icon large"></umb-icon>
-                            <span class="menu-label"><localize key="general_folder">Folder</localize>...</span>
-                        </button>
-                    </li>
-                </ul>
-            </div>
-        </div>
-
-        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="vm.creatingFolder">
-            <button type="button" class="btn btn-info" ng-click="vm.close()">
-                <localize key="buttons_somethingElse">Do something else</localize>
-            </button>
-        </div>
-    </div>
-    <div ng-if="vm.creatingFolder">
-        <form novalidate name="createFolderForm"
-              ng-submit="vm.createFolder(createFolderForm)"
-              val-form-manager>
-            <div class="umbracoDialog umb-dialog-body with-footer">
-                <div class="umb-pane">
-                    <div ng-show="vm.createFolderError">
-                        <div class="alert alert-error">
-                            <div>{{vm.createFolderError.data.message}}</div>
-                        </div>
-                    </div>
-
-                    <umb-control-group label="Enter a folder name" hide-label="false">
-                        <input type="text" name="folderName" ng-model="vm.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
-                    </umb-control-group>
-                </div>
-            </div>
-            <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-                <umb-button type="button"
-                            button-style="link"
-                            action="vm.close()"
-                            label-key="general_close">
-                </umb-button>
-                <umb-button type="submit"
-                            button-style="primary"
-                            label-key="general_create">
-                </umb-button>
-            </div>
-        </form>
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/stylesheets/delete.controller.js
deleted file mode 100644
index cdfe92d105..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/delete.controller.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.StyleSheets.DeleteController
- * @function
- *
- * @description
- * The controller for deleting stylesheets
- */
-function StyleSheetsDeleteController($scope, codefileResource, treeService, navigationService) {
-
-    $scope.performDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-        
-        codefileResource.deleteByPath('stylesheets', $scope.currentNode.id)
-            .then(function() {
-                $scope.currentNode.loading = false;
-                treeService.removeNode($scope.currentNode);
-                navigationService.hideMenu();
-            });
-    };
-
-    $scope.cancel = function() {
-        navigationService.hideDialog();
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.StyleSheets.DeleteController", StyleSheetsDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/delete.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/delete.html
deleted file mode 100644
index abd082d413..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/delete.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.StyleSheets.DeleteController">
-    <div class="umb-dialog-body">
-
-        <p class="abstract">
-        	<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
-        </umb-confirm>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/stylesheets/edit.controller.js
deleted file mode 100644
index 8380857537..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/edit.controller.js
+++ /dev/null
@@ -1,299 +0,0 @@
-(function () {
-    "use strict";
-
-    function StyleSheetsEditController($scope, $routeParams, $timeout, $http, appState, editorState, navigationService, assetsService, codefileResource, contentEditingHelper, notificationsService, localizationService, templateHelper, angularHelper, umbRequestHelper) {
-
-        var vm = this;
-
-        vm.page = {};
-        vm.page.loading = true;
-        vm.page.menu = {};
-        vm.page.menu.currentSection = appState.getSectionState("currentSection");
-        vm.page.menu.currentNode = null;
-        vm.page.saveButtonState = "init";
-        
-        vm.header = {};
-        vm.header.editorfor = "settings_stylesheet";
-        vm.header.setPageTitle = true;
-
-         //Used to toggle the keyboard shortcut modal
-        //From a custom keybinding in ace editor - that conflicts with our own to show the dialog
-        vm.showKeyboardShortcut = false;
-
-        //Keyboard shortcuts for help dialog
-        vm.page.keyboardShortcutsOverview = [];
-
-        templateHelper.getGeneralShortcuts().then(function(shortcuts){
-            vm.page.keyboardShortcutsOverview.push(shortcuts);
-        });
-
-        templateHelper.getEditorShortcuts().then(function(shortcuts){
-            vm.page.keyboardShortcutsOverview.push(shortcuts);
-        });
-
-        vm.stylesheet = {
-            content: "",
-            rules: []
-        };
-
-        // bind functions to view model
-        vm.save = interpolateAndSave;
-
-        /* Function bound to view model */
-
-        function interpolateAndSave() {
-            vm.page.saveButtonState = "busy";
-
-            var activeApp = _.find(vm.page.navigation, function(item) {
-                return item.active;
-            });
-
-            if (activeApp.alias === "rules") {
-                // we're on the rules tab: interpolate the rules into the editor value and save the output as stylesheet content
-                interpolateRules().then(
-                    function (content) {
-                        vm.stylesheet.content = content;
-                        save(activeApp);
-                    },
-                    function(err) {
-                    }
-                );
-            } else {
-                // we're on the code tab: just save the editor value as stylesheet content
-                vm.stylesheet.content = vm.editor.getValue();
-                save(activeApp);
-            }
-        }
-
-        /* Local functions */
-
-        function save(activeApp) {            
-            contentEditingHelper.contentEditorPerformSave({
-                saveMethod: codefileResource.save,
-                scope: $scope,
-                content: vm.stylesheet,
-                rebindCallback: function (orignal, saved) {}
-            }).then(function (saved) {
-
-                localizationService.localizeMany(["speechBubbles_fileSavedHeader", "speechBubbles_fileSavedText"]).then(function(data){
-                    var header = data[0];
-                    var message = data[1];
-                    notificationsService.success(header, message);
-                });
-
-                //check if the name changed, if so we need to redirect
-                if (vm.stylesheet.id !== saved.id) {
-                    contentEditingHelper.redirectToRenamedContent(saved.id);
-                }
-                else {
-                    vm.page.saveButtonState = "success";
-                    vm.stylesheet = saved;
-
-                    //sync state
-                    editorState.set(vm.stylesheet);
-
-                    // sync tree
-                    navigationService.syncTree({ tree: "stylesheets", path: vm.stylesheet.path, forceReload: true }).then(function (syncArgs) {
-                        vm.page.menu.currentNode = syncArgs.node;
-                    });
-
-                    if (activeApp.alias === "rules") {
-                        $scope.selectApp(activeApp);
-                    }
-                }
-
-            }, function (err) {
-
-                vm.page.saveButtonState = "error";
-                
-                localizationService.localizeMany(["speechBubbles_validationFailedHeader", "speechBubbles_validationFailedMessage"]).then(function(data){
-                    var header = data[0];
-                    var message = data[1];
-                    notificationsService.error(header, message);
-                });
-
-            });
-
-
-        }
-
-        function init() {
-
-            //we need to load this somewhere, for now its here.
-            assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css", $scope);
-
-            if ($routeParams.create) {
-                codefileResource.getScaffold("stylesheets", $routeParams.id).then(function (stylesheet) {
-                    const mode = $routeParams.rtestyle ? "RTE" : null;
-                    ready(stylesheet, false);
-                    generateNavigation(mode);
-                });
-            } else {
-                codefileResource.getByPath('stylesheets', $routeParams.id).then(function (stylesheet) {
-                    ready(stylesheet, true);
-                    extractRules().then(rules => {
-                        vm.stylesheet.rules = rules;
-                        const mode = rules && rules.length > 0 ? "RTE" : null;
-                        generateNavigation(mode);
-                    });
-                });
-            }
-
-        }
-
-        function generateNavigation(mode) {
-            localizationService.localizeMany(["stylesheet_tabRules", "stylesheet_tabCode"]).then(function (data) {
-                vm.page.navigation = [
-                    {
-                        "name": data[0],
-                        "alias": "rules",
-                        "icon": "icon-font",
-                        "view": "views/stylesheets/views/rules/rules.html"
-                    },
-                    {
-                        "name": data[1],
-                        "alias": "code",
-                        "icon": "icon-brackets",
-                        "view": "views/stylesheets/views/code/code.html"
-                    }
-                ];
-                if(mode === "RTE") {
-                    vm.page.navigation[0].active = true;
-                } else {
-                    vm.page.navigation[1].active = true;
-                }
-            });
-        }
-
-        function ready(stylesheet, syncTree) {
-
-            vm.page.loading = false;
-
-            vm.stylesheet = stylesheet;
-
-            vm.setDirty = function () {
-                setFormState("dirty");
-            }
-
-            //sync state
-            editorState.set(vm.stylesheet);
-
-            if (syncTree) {
-                navigationService.syncTree({ tree: "stylesheets", path: vm.stylesheet.path, forceReload: true }).then(function (syncArgs) {
-                    vm.page.menu.currentNode = syncArgs.node;
-                });
-            }
-
-            vm.aceOption = {
-                mode: "css",
-                theme: "chrome",
-                showPrintMargin: false,
-                advanced: {
-                    fontSize: '14px',
-                    enableSnippets: true,
-                    enableBasicAutocompletion: true,
-                    enableLiveAutocompletion: false
-                },
-                onLoad: function(_editor) {
-                    
-                    vm.editor = _editor;
-
-                    //Update the auto-complete method to use ctrl+alt+space
-                    _editor.commands.bindKey("ctrl-alt-space", "startAutocomplete");
-                    
-                    //Unassigns the keybinding (That was previously auto-complete)
-                    //As conflicts with our own tree search shortcut
-                    _editor.commands.bindKey("ctrl-space", null);
-
-                    // TODO: Move all these keybinding config out into some helper/service
-                    _editor.commands.addCommands([
-                        //Disable (alt+shift+K)
-                        //Conflicts with our own show shortcuts dialog - this overrides it
-                        {
-                            name: 'unSelectOrFindPrevious',
-                            bindKey: 'Alt-Shift-K',
-                            exec: function() {
-                                //Toggle the show keyboard shortcuts overlay
-                                $scope.$apply(function(){
-                                    vm.showKeyboardShortcut = !vm.showKeyboardShortcut;
-                                });
-                            },
-                            readOnly: true
-                        }
-                    ]);
-                    
-                    // initial cursor placement
-                    // Keep cursor in name field if we are create a new style sheet
-                    // else set the cursor at the bottom of the code editor
-                    if(!$routeParams.create) {
-                        $timeout(function(){
-                            vm.editor.navigateFileEnd();
-                            vm.editor.focus();
-                        });
-                    }
-
-                    vm.editor.on("change", changeAceEditor);
-
-                }
-            }
-
-            function changeAceEditor() {
-                setFormState("dirty");
-            }
-
-            function setFormState(state) {
-                
-                // get the current form
-                var currentForm = angularHelper.getCurrentForm($scope);
-
-                // set state
-                if(state === "dirty") {
-                    currentForm.$setDirty();
-                } else if(state === "pristine") {
-                    currentForm.$setPristine();
-                }
-            }
-        }
-
-        function interpolateRules() {
-            return codefileResource.interpolateStylesheetRules(vm.stylesheet.content, vm.stylesheet.rules);
-        }
-
-        function extractRules() {
-            return codefileResource.extractStylesheetRules(vm.stylesheet.content);
-        }
-        
-        $scope.selectApp = function (app) {
-            vm.page.loading = true;
-
-            // are we going to the code tab?
-            if (app.alias === "code") {
-                // yes - interpolate the rules into the current editor value before displaying the editor
-                interpolateRules().then(
-                    function(content) {
-                        vm.stylesheet.content = content;
-                        vm.page.loading = false;
-                    },
-                    function(err) {
-                    }
-                );
-            }
-            else {
-                // no - extract the rules from the current editor value before displaying the rules tab
-                extractRules().then(
-                    function(rules) {
-                        vm.stylesheet.rules = rules;
-                        vm.page.loading = false;
-                    },
-                    function(err) {
-                    }
-                );
-            }
-        }
-
-        init();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.StyleSheets.EditController", StyleSheetsEditController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/edit.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/edit.html
deleted file mode 100644
index 8632ba781d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/edit.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<div data-element="editor-stylesheets" ng-controller="Umbraco.Editors.StyleSheets.EditController as vm">
-
-    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
-
-    <form name="stylesheetsForm"
-          ng-submit="vm.save()"
-          novalidate
-          val-form-manager>
-
-        <umb-editor-view ng-if="!vm.page.loading">
-
-            <umb-editor-header name="vm.stylesheet.name"
-                               hide-alias="true"
-                               description="vm.stylesheet.virtualPath"
-                               description-locked="true"
-                               navigation="vm.page.navigation"
-                               on-select-navigation-item="selectApp(item)"
-                               hide-icon="true"
-                               editorfor="vm.header.editorfor"
-                               setpagetitle="vm.header.setPageTitle">
-            </umb-editor-header>
-
-            <umb-editor-container>
-                <umb-editor-sub-views
-                    ng-if="!vm.page.loading"
-                    sub-views="vm.page.navigation"
-                    model="vm">
-                </umb-editor-sub-views>
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                <umb-editor-footer-content-left>
-
-                    <umb-keyboard-shortcuts-overview model="vm.page.keyboardShortcutsOverview"
-                                                     show-overlay="vm.showKeyboardShortcut"
-                                                     on-close="vm.showKeyboardShortcut = false;">
-                    </umb-keyboard-shortcuts-overview>
-
-                </umb-editor-footer-content-left>
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button type="submit"
-                                button-style="success"
-                                state="vm.page.saveButtonState"
-                                shortcut="ctrl+s"
-                                label="Save"
-                                label-key="buttons_save">
-                    </umb-button>
-
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-
-        </umb-editor-view>
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.controller.js b/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.controller.js
deleted file mode 100644
index 092cdaa55e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.controller.js
+++ /dev/null
@@ -1,27 +0,0 @@
-(function() {
-	"use strict";
-
-	function RichTextRuleController($scope, formHelper) {
-
-        const vm = this;
-
-        vm.submit = submit;
-        vm.close = close;
-
-        function submit() {
-            if ($scope.model && $scope.model.submit && formHelper.submitForm({scope: $scope})) {
-                $scope.model.submit($scope.model);
-            }
-        }
-
-        function close() {
-            if ($scope.model && $scope.model.close) {
-                $scope.model.close();
-            }
-        }
-
-	}
-
-	angular.module("umbraco").controller("Umbraco.Editors.RichTextRuleController", RichTextRuleController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html
deleted file mode 100644
index c190921dcb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/infiniteeditors/richtextrule/richtextrule.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<div ng-controller="Umbraco.Editors.RichTextRuleController as vm">
-    
-    <form novalidate name="richTextRuleForm" val-form-manager>
-
-        <umb-editor-view>
-
-            <umb-editor-header
-                name="model.title"
-                name-locked="true"
-                hide-alias="true"
-                hide-icon="true"
-                hide-description="true">
-            </umb-editor-header>
-
-            <umb-editor-container>
-
-                <umb-box>
-
-                    <umb-box-content class="block-form">
-                        
-                        <umb-control-group label="@general_name" description="@stylesheet_nameHelp">
-                            <input type="text" ng-model="model.rule.name" umb-auto-focus required />
-                        </umb-control-group>
-
-                        <umb-control-group label="@stylesheet_selector" description="@stylesheet_selectorHelp">
-                            <input type="text" ng-model="model.rule.selector" required />
-                        </umb-control-group>
-
-                        <umb-control-group label="@stylesheet_styles" description="@stylesheet_stylesHelp">
-                            <textarea class="umb-stylesheet-rule-styles" ng-model="model.rule.styles" ng-required="model.rule.selector.charAt(0) === '.' || model.rule.selector.charAt(0) === '#' "></textarea>
-                        </umb-control-group>
-
-                        <umb-control-group label="@stylesheet_preview" description="@stylesheet_previewHelp">
-                            <div class="umb-stylesheet-rule-preview" style="{{model.rule.styles}}">
-                                a b c d e f g h i j k l m n o p q r s t u v w x t z
-                                <br>
-                                A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
-                                <br>
-                                1 2 3 4 5 6 7 8 9 0 € £ $ % & (.,;:'\"!?) 
-                                <br>
-                                Just keep examining every bid quoted for zinc etchings.
-                            </div>
-                        </umb-control-group>
-
-                    </umb-box-content>
-                </umb-box>
-
-            </umb-editor-container>
-
-            <umb-editor-footer>
-                <umb-editor-footer-content-right>
-                    <umb-button
-                        type="button"
-                        button-style="link"
-                        label-key="general_close"
-                        shortcut="esc"
-                        action="vm.close()">
-                    </umb-button>
-                    <umb-button
-                        type="button"
-                        button-style="success"
-                        label-key="general_submit"
-                        state="vm.saveButtonState"
-                        action="vm.submit(model)">
-                    </umb-button>
-                </umb-editor-footer-content-right>
-            </umb-editor-footer>
-        </umb-editor-view>
-
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/code/code.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/code/code.html
deleted file mode 100644
index ce8b2c8b2f..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/code/code.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<umb-box>
-    <umb-box-content>
-        <div data-element="code-editor"
-             auto-scale="85"
-             umb-ace-editor="model.aceOption"
-             model="model.stylesheet.content">
-        </div>
-    </umb-box-content>
-</umb-box>
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.controller.js b/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.controller.js
deleted file mode 100644
index de2865d843..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.controller.js
+++ /dev/null
@@ -1,78 +0,0 @@
-angular.module("umbraco").controller("Umbraco.Editors.StyleSheets.RulesController",
-    function ($scope, localizationService, editorService) {       
-        $scope.sortableOptions = {
-            axis: 'y',
-            containment: 'parent',
-            cursor: 'move',
-            items: 'div.umb-stylesheet-rules__listitem',
-            handle: '.handle',
-            tolerance: 'pointer',
-            update: function (e, ui) {
-                setDirty();
-            }
-        };
-
-        $scope.add = function (evt) {
-            evt.preventDefault();
-
-            openOverlay({}, $scope.labels.addRule, (newRule) => {
-                if(!$scope.model.stylesheet.rules) {
-                    $scope.model.stylesheet.rules = [];
-                } 
-                $scope.model.stylesheet.rules.push(newRule);
-                setDirty();
-            });
-        }
-
-        $scope.edit = function(rule, evt) {
-            evt.preventDefault();
-
-            openOverlay(rule, $scope.labels.editRule, (newRule) => {
-                rule.name = newRule.name;
-                rule.selector = newRule.selector;
-                rule.styles = newRule.styles;
-                setDirty();
-            });
-        }
-
-        $scope.remove = function (rule, evt) {
-            evt.preventDefault();
-
-            $scope.model.stylesheet.rules = _.without($scope.model.stylesheet.rules, rule);
-            setDirty();
-        }
-
-        function openOverlay(rule, title, onSubmit) {
-
-            const ruleDialog = {
-                title: title,
-                rule: _.clone(rule),
-                view: "views/stylesheets/infiniteeditors/richtextrule/richtextrule.html",
-                size: "small",
-                submit: function(model) {
-                    onSubmit(model.rule);
-                    editorService.close();
-                },
-                close: function() {
-                    editorService.close();
-                }
-            };
-
-            editorService.open(ruleDialog);
-        }
-
-        function setDirty() {
-            $scope.model.setDirty();
-        }
-
-        function init() {
-            localizationService.localizeMany(["stylesheet_addRule", "stylesheet_editRule"]).then(function (data) {
-                $scope.labels = {
-                    addRule: data[0],
-                    editRule: data[1]
-                }
-            });
-        }
-
-        init();
-    });
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html
deleted file mode 100644
index 72ae4dc483..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<umb-box>
-    <umb-box-content>
-        <div class="sub-view-columns">
-            <div class="sub-view-column-left">
-                <h5><localize key="stylesheet_editorRules">Rich text editor styles</localize></h5>
-                <small><localize key="stylesheet_editorRulesHelp">Define the styles that should be available in the rich text editor for this stylesheet</localize></small>
-            </div>
-            <div class="sub-view-column-right">
-                <div class="umb-property-editor umb-stylesheet-rules form-horizontal" ng-controller="Umbraco.Editors.StyleSheets.RulesController">
-                    <div ui-sortable="sortableOptions" ng-model="model.stylesheet.rules">
-                        <div class="umb-stylesheet-rules__listitem" ng-repeat="rule in model.stylesheet.rules track by $id(rule)">
-                            <umb-icon icon="icon-navigation" class="icon handle"></umb-icon>
-                            <div class="umb-stylesheet-rules__left">{{rule.name}}</div>
-                            <div class="umb-stylesheet-rules__right">
-                                <button type="button" class="umb-node-preview__action" ng-click="edit(rule, $event)"><localize key="general_edit">Edit</localize></button>
-                                <button type="button" class="umb-node-preview__action umb-node-preview__action--red" ng-click="remove(rule, $event)"><localize key="general_remove">Remove</localize></button>
-                            </div>
-                        </div>
-                    </div>
-                    <umb-button
-                        type="button"
-                        button-style="info"
-                        action="add($event)"
-                        label-key="general_add">
-                    </umb-button>
-                </div>
-            </div>
-        </div>
-
-    </umb-box-content>
-</umb-box>
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/delete.controller.js
deleted file mode 100644
index bed7a43bae..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/templates/delete.controller.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Templates.DeleteController
- * @function
- *
- * @description
- * The controller for the template delete dialog
- */
-function TemplatesDeleteController($scope, templateResource, treeService, navigationService) {
-
-    $scope.performDelete = function() {
-
-        //mark it for deletion (used in the UI)
-        $scope.currentNode.loading = true;
-
-        // Reset the error message
-        $scope.error = null;
-
-        templateResource.deleteById($scope.currentNode.id).then(function () {
-            $scope.currentNode.loading = false;
-
-            //get the root node before we remove it
-            var rootNode = treeService.getTreeRoot($scope.currentNode);
-
-            // TODO: Need to sync tree, etc...
-            treeService.removeNode($scope.currentNode);
-            navigationService.hideMenu();
-
-        }, function (err) {
-            $scope.currentNode.loading = false;
-            $scope.error = err;
-        });
-
-    };
-    
-    $scope.cancel = function() {
-        navigationService.hideDialog();
-    };
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Templates.DeleteController", TemplatesDeleteController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/delete.html b/src/Umbraco.Web.UI.Client/src/views/templates/delete.html
deleted file mode 100644
index d45353db26..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/templates/delete.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Templates.DeleteController">
-    <div class="umb-dialog-body">
-
-        <div ng-show="error">
-            <div class="alert alert-error">
-                <div><strong>{{error.errorMsg}}</strong></div>
-                <div>{{error.data.message}}</div>
-            </div>
-        </div>
-
-        <p class="abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize>&nbsp;<strong>{{currentNode.name}}</strong>?
-        </p>
-
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel" confirm-button-style="danger">
-        </umb-confirm>
-
-    </div>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
deleted file mode 100644
index 1b6b000e28..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
+++ /dev/null
@@ -1,730 +0,0 @@
-(function () {
-  "use strict";
-
-  function TemplatesEditController($scope, $routeParams, $timeout, templateResource, assetsService, notificationsService, editorState, navigationService, appState, macroService, treeService, contentEditingHelper, localizationService, angularHelper, templateHelper, editorService) {
-
-    var vm = this;
-    var oldMasterTemplateAlias = null;
-    var infiniteMode = $scope.model && $scope.model.infiniteMode;
-    var id = infiniteMode ? $scope.model.id : $routeParams.id;
-    var create = infiniteMode ? $scope.model.create : $routeParams.create;
-
-    vm.runtimeModeProduction = Umbraco.Sys.ServerVariables.application.runtimeMode == 'Production';
-
-    vm.header = {};
-    vm.header.editorfor = "template_template";
-    vm.header.setPageTitle = true;
-
-    vm.page = {};
-    vm.page.loading = true;
-    vm.templates = [];
-
-    //menu
-    vm.page.menu = {};
-    vm.page.menu.currentSection = appState.getSectionState("currentSection");
-    vm.page.menu.currentNode = null;
-
-    // insert buttons
-    vm.page.insertDefaultButton = {
-      labelKey: "general_insert",
-      addEllipsis: "true",
-      handler: function () {
-        vm.openInsertOverlay();
-      }
-    };
-    vm.page.insertSubButtons = [
-      {
-        labelKey: "template_insertPageField",
-        addEllipsis: "true",
-        handler: function () {
-          vm.openPageFieldOverlay();
-        }
-      },
-      {
-        labelKey: "template_insertPartialView",
-        addEllipsis: "true",
-        handler: function () {
-          vm.openPartialOverlay();
-        }
-      },
-      {
-        labelKey: "template_insertDictionaryItem",
-        addEllipsis: "true",
-        handler: function () {
-          vm.openDictionaryItemOverlay();
-        }
-      },
-      {
-        labelKey: "template_insertMacro",
-        addEllipsis: "true",
-        handler: function () {
-          vm.openMacroOverlay()
-        }
-      }
-    ];
-
-    //Used to toggle the keyboard shortcut modal
-    //From a custom keybinding in ace editor - that conflicts with our own to show the dialog
-    vm.showKeyboardShortcut = false;
-
-    //Keyboard shortcuts for help dialog
-    vm.page.keyboardShortcutsOverview = [];
-
-    templateHelper.getGeneralShortcuts().then(function (data) {
-      vm.page.keyboardShortcutsOverview.push(data);
-    });
-    templateHelper.getEditorShortcuts().then(function (data) {
-      vm.page.keyboardShortcutsOverview.push(data);
-    });
-    templateHelper.getTemplateEditorShortcuts().then(function (data) {
-      vm.page.keyboardShortcutsOverview.push(data);
-    });
-
-    vm.save = function (suppressNotification) {
-      vm.page.saveButtonState = "busy";
-
-      vm.template.content = vm.editor.getValue();
-
-      contentEditingHelper.contentEditorPerformSave({
-        saveMethod: templateResource.save,
-        scope: $scope,
-        content: vm.template,
-        rebindCallback: function (orignal, saved) { }
-      }).then(function (saved) {
-
-        if (!suppressNotification) {
-          localizationService.localizeMany(["speechBubbles_templateSavedHeader", "speechBubbles_templateSavedText"]).then(function (data) {
-            var header = data[0];
-            var message = data[1];
-            notificationsService.success(header, message);
-          });
-        }
-
-        vm.page.saveButtonState = "success";
-        vm.template = saved;
-
-        //sync state
-        if (!infiniteMode) {
-          editorState.set(vm.template);
-        }
-
-        // sync tree
-        // if master template alias has changed move the node to it's new location
-        if (!infiniteMode && oldMasterTemplateAlias !== vm.template.masterTemplateAlias) {
-
-          // When creating a new template the id is -1. Make sure We don't remove the root node.
-          if (vm.page.menu.currentNode.id !== "-1") {
-            // move node to new location in tree
-            //first we need to remove the node that we're working on
-            treeService.removeNode(vm.page.menu.currentNode);
-          }
-
-          // update stored alias to the new one so the node won't move again unless the alias is changed again
-          oldMasterTemplateAlias = vm.template.masterTemplateAlias;
-
-          navigationService.syncTree({ tree: "templates", path: vm.template.path, forceReload: true, activate: true }).then(function (args) {
-            vm.page.menu.currentNode = args.node;
-          });
-
-        } else {
-
-          // normal tree sync
-          if (!infiniteMode) {
-            navigationService.syncTree({ tree: "templates", path: vm.template.path, forceReload: true }).then(function (syncArgs) {
-              vm.page.menu.currentNode = syncArgs.node;
-            });
-          }
-
-        }
-
-        // clear $dirty state on form
-        setFormState("pristine");
-
-        if (infiniteMode) {
-          submit();
-        }
-
-
-      }, function (err) {
-        if (suppressNotification) {
-          vm.page.saveButtonState = "error";
-
-          localizationService.localizeMany(["speechBubbles_validationFailedHeader", "speechBubbles_validationFailedMessage"]).then(function (data) {
-            var header = data[0];
-            var message = data[1];
-            notificationsService.error(header, message);
-          });
-        }
-      });
-
-    };
-
-    vm.init = function () {
-
-      // we need to load this somewhere, for now its here.
-      assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css", $scope);
-
-      // load templates - used in the master template picker
-      templateResource.getAll()
-        .then(function (templates) {
-          vm.templates = templates;
-        });
-
-      if (create) {
-        templateResource.getScaffold((id)).then(function (template) {
-          vm.ready(template);
-        });
-      } else {
-        templateResource.getById(id).then(function (template) {
-          vm.ready(template);
-        });
-      }
-
-    };
-
-
-    vm.ready = function (template) {
-      vm.page.loading = false;
-      vm.template = template;
-
-      // if this is a new template, bind to the blur event on the name
-      if (create) {
-        $timeout(function () {
-          var nameField = $('[data-element="editor-name-field"]');
-          if (nameField) {
-            nameField.on('blur', function (event) {
-              if (event.target.value) {
-                vm.save(true);
-              }
-            });
-          }
-        });
-      }
-
-      // sync state
-      if (!infiniteMode) {
-        editorState.set(vm.template);
-        navigationService.syncTree({ tree: "templates", path: vm.template.path, forceReload: true }).then(function (syncArgs) {
-          vm.page.menu.currentNode = syncArgs.node;
-        });
-      }
-
-      // save state of master template to use for comparison when syncing the tree on save
-      oldMasterTemplateAlias = Utilities.copy(template.masterTemplateAlias);
-
-      // ace configuration
-      vm.aceOption = {
-        mode: "razor",
-        theme: "chrome",
-        showPrintMargin: false,
-        advanced: {
-          fontSize: '14px',
-          enableSnippets: false, //The Razor mode snippets are awful (Need a way to override these)
-          enableBasicAutocompletion: true,
-          enableLiveAutocompletion: false
-        },
-        onLoad: function (_editor) {
-          vm.editor = _editor;
-
-          // Set read-only when using runtime mode Production
-          _editor.setReadOnly(vm.runtimeModeProduction);
-
-          // Update the auto-complete method to use ctrl+alt+space
-          _editor.commands.bindKey("ctrl-alt-space", "startAutocomplete");
-
-          // Unassigns the keybinding (That was previously auto-complete)
-          // As conflicts with our own tree search shortcut
-          _editor.commands.bindKey("ctrl-space", null);
-
-          // Assign new keybinding
-          _editor.commands.addCommands([
-            // Disable (alt+shift+K)
-            // Conflicts with our own show shortcuts dialog - this overrides it
-            {
-              name: 'unSelectOrFindPrevious',
-              bindKey: 'Alt-Shift-K',
-              exec: function () {
-                // Toggle the show keyboard shortcuts overlay
-                $scope.$apply(function () {
-                  vm.showKeyboardShortcut = !vm.showKeyboardShortcut;
-                });
-
-              },
-              readOnly: true
-            },
-            {
-              name: 'insertUmbracoValue',
-              bindKey: 'Alt-Shift-V',
-              exec: function () {
-                $scope.$apply(function () {
-                  openPageFieldOverlay();
-                });
-              },
-              readOnly: true
-            },
-            {
-              name: 'insertPartialView',
-              bindKey: 'Alt-Shift-P',
-              exec: function () {
-                $scope.$apply(function () {
-                  openPartialOverlay();
-                });
-              },
-              readOnly: true
-            },
-            {
-              name: 'insertDictionary',
-              bindKey: 'Alt-Shift-D',
-              exec: function () {
-                $scope.$apply(function () {
-                  openDictionaryItemOverlay();
-                });
-              },
-              readOnly: true
-            },
-            {
-              name: 'insertUmbracoMacro',
-              bindKey: 'Alt-Shift-M',
-              exec: function () {
-                $scope.$apply(function () {
-                  openMacroOverlay();
-                });
-              },
-              readOnly: true
-            },
-            {
-              name: 'insertQuery',
-              bindKey: 'Alt-Shift-Q',
-              exec: function () {
-                $scope.$apply(function () {
-                  openQueryBuilderOverlay();
-                });
-              },
-              readOnly: true
-            },
-            {
-              name: 'insertSection',
-              bindKey: 'Alt-Shift-S',
-              exec: function () {
-                $scope.$apply(function () {
-                  openSectionsOverlay();
-                });
-              },
-              readOnly: true
-            },
-            {
-              name: 'chooseMasterTemplate',
-              bindKey: 'Alt-Shift-T',
-              exec: function () {
-                $scope.$apply(function () {
-                  openMasterTemplateOverlay();
-                });
-              },
-              readOnly: true
-            }
-
-          ]);
-
-          // initial cursor placement
-          // Keep cursor in name field if we are create a new template
-          // else set the cursor at the bottom of the code editor
-          if (!create) {
-            $timeout(function () {
-              vm.editor.navigateFileEnd();
-              vm.editor.focus();
-              persistCurrentLocation();
-            });
-          }
-
-          // change on blur, focus
-          vm.editor.on("blur", persistCurrentLocation);
-          vm.editor.on("focus", persistCurrentLocation);
-          vm.editor.on("change", changeAceEditor);
-        }
-      }
-
-    };
-
-    vm.openPageFieldOverlay = openPageFieldOverlay;
-    vm.openDictionaryItemOverlay = openDictionaryItemOverlay;
-    vm.openQueryBuilderOverlay = openQueryBuilderOverlay;
-    vm.openMacroOverlay = openMacroOverlay;
-    vm.openInsertOverlay = openInsertOverlay;
-    vm.openSectionsOverlay = openSectionsOverlay;
-    vm.openPartialOverlay = openPartialOverlay;
-    vm.openMasterTemplateOverlay = openMasterTemplateOverlay;
-    vm.selectMasterTemplate = selectMasterTemplate;
-    vm.getMasterTemplateName = getMasterTemplateName;
-    vm.removeMasterTemplate = removeMasterTemplate;
-    vm.closeShortcuts = closeShortcuts;
-    vm.submit = submit;
-    vm.close = close;
-
-    function openInsertOverlay() {
-      var code;
-      var insertOverlay = {
-        allowedTypes: {
-          macro: true,
-          dictionary: true,
-          partial: true,
-          umbracoField: true
-        },
-        submit: function (model) {
-          switch (model.insert.type) {
-            case "macro":
-              var macroObject = macroService.collectValueData(model.insert.selectedMacro, model.insert.macroParams, "Mvc");
-              insert(macroObject.syntax);
-              break;
-            case "dictionary":
-              code = templateHelper.getInsertDictionarySnippet(model.insert.node.name);
-              insert(code);
-              break;
-            case "partial":
-              code = templateHelper.getInsertPartialSnippet(model.insert.node.parentId, model.insert.node.name);
-              insert(code);
-              break;
-            case "umbracoField":
-              insert(model.insert.umbracoField);
-              break;
-          }
-          editorService.close();
-        },
-        close: function () {
-          // close the dialog
-          editorService.close();
-          // focus editor
-          vm.editor.focus();
-        }
-      };
-      editorService.insertCodeSnippet(insertOverlay);
-    }
-
-    function openMacroOverlay() {
-      var macroPicker = {
-        dialogData: {},
-        submit: function (model) {
-          var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, "Mvc");
-          insert(macroObject.syntax);
-          editorService.close();
-        },
-        close: function () {
-          editorService.close();
-          vm.editor.focus();
-        }
-      };
-      editorService.macroPicker(macroPicker);
-    }
-
-    function openPageFieldOverlay() {
-      var insertFieldEditor = {
-        submit: function (model) {
-          insert(model.umbracoField);
-          editorService.close();
-        },
-        close: function () {
-          editorService.close();
-          vm.editor.focus();
-        }
-      };
-      editorService.insertField(insertFieldEditor);
-    }
-
-
-    function openDictionaryItemOverlay() {
-
-      var labelKeys = [
-        "template_insertDictionaryItem",
-        "emptyStates_emptyDictionaryTree"
-      ];
-
-      localizationService.localizeMany(labelKeys).then(function (values) {
-        var title = values[0];
-        var emptyStateMessage = values[1];
-
-        var dictionaryItem = {
-          section: "translation",
-          treeAlias: "dictionary",
-          entityType: "dictionary",
-          multiPicker: false,
-          title: title,
-          emptyStateMessage: emptyStateMessage,
-          select: function (node) {
-            var code = templateHelper.getInsertDictionarySnippet(node.name);
-            insert(code);
-            editorService.close();
-          },
-          close: function () {
-            // close dialog
-            editorService.close();
-            // focus editor
-            vm.editor.focus();
-          }
-        };
-
-        editorService.treePicker(dictionaryItem);
-
-      });
-
-    }
-
-    function openPartialOverlay() {
-
-      localizationService.localize("template_insertPartialView").then(function (value) {
-        var title = value;
-
-        var partialItem = {
-          section: "settings",
-          treeAlias: "partialViews",
-          entityType: "partialView",
-          multiPicker: false,
-          title: title,
-          filter: function (i) {
-            if (i.name.indexOf(".cshtml") === -1 && i.name.indexOf(".vbhtml") === -1) {
-              return true;
-            }
-          },
-          filterCssClass: "not-allowed",
-          select: function (node) {
-            var code = templateHelper.getInsertPartialSnippet(node.parentId, node.name);
-            insert(code);
-            editorService.close();
-          },
-          close: function () {
-            // close dialog
-            editorService.close();
-            // focus editor
-            vm.editor.focus();
-          }
-        };
-
-        editorService.treePicker(partialItem);
-      });
-    }
-
-    function openQueryBuilderOverlay() {
-      var queryBuilder = {
-        submit: function (model) {
-          var code = templateHelper.getQuerySnippet(model.result.queryExpression);
-          insert(code);
-          editorService.close();
-        },
-        close: function () {
-          editorService.close();
-          // focus editor
-          vm.editor.focus();
-        }
-      };
-      editorService.queryBuilder(queryBuilder);
-    }
-
-
-    function openSectionsOverlay() {
-      var code;
-      var templateSections = {
-        isMaster: vm.template.isMasterTemplate,
-        submit: function (model) {
-
-          if (model.insertType === 'renderBody') {
-            code = templateHelper.getRenderBodySnippet();
-            insert(code);
-          }
-
-          if (model.insertType === 'renderSection') {
-            code = templateHelper.getRenderSectionSnippet(model.renderSectionName, model.mandatoryRenderSection);
-            insert(code);
-          }
-
-          if (model.insertType === 'addSection') {
-            code = templateHelper.getAddSectionSnippet(model.sectionName);
-            wrap(code);
-          }
-
-          editorService.close();
-
-        },
-        close: function () {
-          editorService.close();
-          vm.editor.focus();
-        }
-      }
-      editorService.templateSections(templateSections);
-    }
-
-    function openMasterTemplateOverlay() {
-
-      // make collection of available master templates
-      var availableMasterTemplates = [];
-
-      // filter out the current template and the selected master template
-      vm.templates.forEach(function (template) {
-        if (template.alias !== vm.template.alias && template.alias !== vm.template.masterTemplateAlias) {
-          var templatePathArray = template.path.split(',');
-          // filter descendant templates of current template
-          if (templatePathArray.indexOf(String(vm.template.id)) === -1) {
-            availableMasterTemplates.push(template);
-          }
-        }
-      });
-
-      const editor = {
-        filterCssClass: 'not-allowed',
-        filter: item => !availableMasterTemplates.some(template => template.id == item.id),
-        submit: model => {
-          const template = model.selection[0];
-          if (template && template.alias) {
-            vm.template.masterTemplateAlias = template.alias;
-            setLayout(template.alias + ".cshtml");
-          } else {
-            vm.template.masterTemplateAlias = null;
-            setLayout(null);
-          }
-          editorService.close();
-        },
-        close: () => editorService.close()
-      }
-
-      localizationService.localize("template_mastertemplate").then(title => {
-        editor.title = title;
-
-        const currentTemplate = vm.templates.find(template => template.alias == vm.template.masterTemplateAlias);
-        if (currentTemplate) {
-          editor.currentNode = {
-            path: currentTemplate.path
-          };
-        }
-
-        editorService.templatePicker(editor);
-      });
-
-    }
-
-    function selectMasterTemplate(template) {
-
-      if (template && template.alias) {
-        vm.template.masterTemplateAlias = template.alias;
-        setLayout(template.alias + ".cshtml");
-      } else {
-        vm.template.masterTemplateAlias = null;
-        setLayout(null);
-      }
-
-    }
-
-    function getMasterTemplateName(masterTemplateAlias, templates) {
-      if (masterTemplateAlias) {
-        var templateName = "";
-        templates.forEach(function (template) {
-          if (template.alias === masterTemplateAlias) {
-            templateName = template.name;
-          }
-        });
-        return templateName;
-      }
-    }
-
-    function removeMasterTemplate() {
-
-      vm.template.masterTemplateAlias = null;
-
-      // call set layout with no paramters to set layout to null
-      setLayout();
-
-    }
-
-    function setLayout(templatePath) {
-
-      var templateCode = vm.editor.getValue();
-      var newValue = templatePath;
-      var layoutDefRegex = new RegExp("(@{[\\s\\S]*?Layout\\s*?=\\s*?)(\"[^\"]*?\"|null)(;[\\s\\S]*?})", "gi");
-
-      if (newValue !== undefined && newValue !== "") {
-        if (layoutDefRegex.test(templateCode)) {
-          // Declaration exists, so just update it
-          templateCode = templateCode.replace(layoutDefRegex, "$1\"" + newValue + "\"$3");
-        } else {
-          // Declaration doesn't exist, so prepend to start of doc
-          // TODO: Maybe insert at the cursor position, rather than just at the top of the doc?
-          templateCode = "@{\n\tLayout = \"" + newValue + "\";\n}\n" + templateCode;
-        }
-      } else {
-        if (layoutDefRegex.test(templateCode)) {
-          // Declaration exists, so just update it
-          templateCode = templateCode.replace(layoutDefRegex, "$1null$3");
-        }
-      }
-
-      vm.editor.setValue(templateCode);
-      vm.editor.clearSelection();
-      vm.editor.navigateFileStart();
-
-      vm.editor.focus();
-      // set form state to $dirty
-      setFormState("dirty");
-
-    }
-
-
-    function insert(str) {
-      vm.editor.focus();
-      vm.editor.moveCursorToPosition(vm.currentPosition);
-      vm.editor.insert(str);
-
-      // set form state to $dirty
-      setFormState("dirty");
-    }
-
-    function wrap(str) {
-
-      var selectedContent = vm.editor.session.getTextRange(vm.editor.getSelectionRange());
-      str = str.replace("{0}", selectedContent);
-      vm.editor.insert(str);
-      vm.editor.focus();
-
-      // set form state to $dirty
-      setFormState("dirty");
-    }
-
-    function persistCurrentLocation() {
-      vm.currentPosition = vm.editor.getCursorPosition();
-    }
-
-    function changeAceEditor() {
-      setFormState("dirty");
-    }
-
-    function setFormState(state) {
-
-      // get the current form
-      var currentForm = angularHelper.getCurrentForm($scope);
-
-      // set state
-      if (state === "dirty") {
-        currentForm.$setDirty();
-      } else if (state === "pristine") {
-        currentForm.$setPristine();
-      }
-    }
-
-    function closeShortcuts() {
-      vm.showKeyboardShortcut = false;
-    }
-
-    function submit() {
-      if ($scope.model.submit) {
-        $scope.model.template = vm.template;
-        $scope.model.submit($scope.model);
-      }
-    }
-
-    function close() {
-      if ($scope.model.close) {
-        $scope.model.close();
-      }
-    }
-
-    vm.init();
-
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Templates.EditController", TemplatesEditController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
deleted file mode 100644
index a5527095d7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<div data-element="editor-templates" ng-controller="Umbraco.Editors.Templates.EditController as vm">
-
-  <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
-
-  <form name="contentForm"
-        ng-submit="vm.save()"
-        novalidate
-        val-form-manager>
-
-    <umb-editor-view ng-if="!vm.page.loading">
-
-      <umb-editor-header name="vm.template.name"
-                         alias="vm.template.alias"
-                         alias-locked="vm.runtimeModeProduction"
-                         key="vm.template.key"
-                         description="vm.template.virtualPath"
-                         description-locked="true"
-                         hide-icon="false"
-                         editorfor="vm.header.editorfor"
-                         setpagetitle="vm.header.setPageTitle">
-      </umb-editor-header>
-
-      <umb-editor-container>
-        <umb-box>
-
-          <umb-box-content>
-            <div class="umb-alert umb-alert--info mb3" ng-if="vm.runtimeModeProduction">
-              <localize key="template_runtimeModeProduction">Content is not editable when using runtime mode <code>Production</code>.</localize>
-            </div>
-
-            <div class="flex mb3" ng-if="!vm.runtimeModeProduction">
-
-              <div class="flex">
-
-                <div ng-class="{'btn-group': vm.template.masterTemplateAlias}" style="margin-right: 10px;">
-
-                  <button type="button"
-                          data-element="button-masterTemplate"
-                          class="btn umb-button__button umb-button--xs umb-outline"
-                          style="font-size: 14px;"
-                          ng-click="vm.openMasterTemplateOverlay()">
-                    <span class="bold"><localize key="template_mastertemplate">Master template</localize>:</span>
-                    <span style="margin-left: 5px;">
-                      <span ng-if="vm.template.masterTemplateAlias">{{ vm.getMasterTemplateName(vm.template.masterTemplateAlias, vm.templates) }}</span>
-                      <span ng-if="!vm.template.masterTemplateAlias"><localize key="template_noMaster">No master</localize></span>
-                    </span>
-                  </button>
-
-                  <button type="button"
-                          class="btn umb-button__button umb-button--xs dropdown-toggle umb-button-group__toggle flex-inline items-center"
-                          style="font-size: 14px; height: 100%;"
-                          localize="title"
-                          title="@general_remove"
-                          ng-if="vm.template.masterTemplateAlias"
-                          ng-click="vm.removeMasterTemplate()">
-                    <umb-icon icon="icon-wrong" class="icon"></umb-icon>
-                  </button>
-
-                </div>
-
-              </div>
-
-              <div class="flex" style="margin-left: auto;">
-
-                <umb-button-group style="margin-right: 5px;"
-                                  default-button="vm.page.insertDefaultButton"
-                                  sub-buttons="vm.page.insertSubButtons"
-                                  size="xs">
-                </umb-button-group>
-
-                <umb-button style="margin-right: 5px;"
-                            alias="queryBuilder"
-                            type="button"
-                            size="xs"
-                            action="vm.openQueryBuilderOverlay()"
-                            icon="icon-wand"
-                            label-key="template_queryBuilder"
-                            add-ellipsis="true">
-                </umb-button>
-
-                <umb-button alias="sections"
-                            type="button"
-                            size="xs"
-                            action="vm.openSectionsOverlay()"
-                            icon="icon-indent"
-                            label-key="template_insertSections"
-                            add-ellipsis="true">
-                </umb-button>
-
-              </div>
-
-            </div>
-
-            <div data-element="code-editor"
-                 auto-scale="90"
-                 umb-ace-editor="vm.aceOption"
-                 model="vm.template.content">
-            </div>
-          </umb-box-content>
-        </umb-box>
-
-      </umb-editor-container>
-
-      <umb-editor-footer>
-
-        <umb-editor-footer-content-left>
-
-          <umb-keyboard-shortcuts-overview ng-if="!vm.runtimeModeProduction"
-                                           model="vm.page.keyboardShortcutsOverview"
-                                           show-overlay="vm.showKeyboardShortcut"
-                                           on-close="vm.closeShortcuts()">
-          </umb-keyboard-shortcuts-overview>
-
-        </umb-editor-footer-content-left>
-
-        <umb-editor-footer-content-right>
-
-          <umb-button ng-if="model.infiniteMode"
-                      type="button"
-                      button-style="link"
-                      label-key="general_close"
-                      shortcut="esc"
-                      action="vm.close()">
-          </umb-button>
-
-          <umb-button alias="save"
-                      type="submit"
-                      button-style="success"
-                      state="vm.page.saveButtonState"
-                      shortcut="ctrl+s"
-                      label="Save"
-                      label-key="buttons_save">
-          </umb-button>
-
-        </umb-editor-footer-content-right>
-
-      </umb-editor-footer>
-
-    </umb-editor-view>
-  </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
deleted file mode 100644
index 712aa6fef3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
+++ /dev/null
@@ -1,397 +0,0 @@
-(function () {
-  "use strict";
-
-  function UserGroupEditController($scope, $location, $routeParams, userGroupsResource, localizationService, contentEditingHelper, editorService, overlayService, eventsService) {
-
-    var infiniteMode = $scope.model && $scope.model.infiniteMode;
-    var id = infiniteMode ? $scope.model.id : $routeParams.id;
-    var create = infiniteMode ? $scope.model.create : $routeParams.create;
-
-    var vm = this;
-    var contentPickerOpen = false;
-
-    vm.page = {};
-    vm.page.rootIcon = "icon-folder";
-    vm.page.submitButtonLabelKey = infiniteMode ? "buttons_saveAndClose" : "buttons_save";
-
-    vm.languageIcon = "icon-globe";
-
-    vm.userGroup = {};
-    vm.labels = {};
-    vm.showBackButton = !infiniteMode;
-
-    vm.goToPage = goToPage;
-    vm.openLanguagePicker = openLanguagePicker;
-    vm.toggleAllowAllLanguages = toggleAllowAllLanguages;
-    vm.removeLanguage = removeLanguage;
-    vm.openSectionPicker = openSectionPicker;
-    vm.openContentPicker = openContentPicker;
-    vm.openMediaPicker = openMediaPicker;
-    vm.openUserPicker = openUserPicker;
-    vm.removeSection = removeSection;
-    vm.removeAssignedPermissions = removeAssignedPermissions;
-    vm.removeUser = removeUser;
-    vm.clearStartNode = clearStartNode;
-    vm.save = save;
-    vm.openGranularPermissionsPicker = openGranularPermissionsPicker;
-    vm.setPermissionsForNode = setPermissionsForNode;
-
-    function init() {
-
-      vm.loading = true;
-
-      var labelKeys = [
-        "general_cancel",
-        "defaultdialogs_selectContentStartNode",
-        "defaultdialogs_selectMediaStartNode",
-        "defaultdialogs_selectNode",
-        "general_groups",
-        "content_contentRoot",
-        "media_mediaRoot",
-        "user_allowAccessToAllLanguages"
-      ];
-
-      localizationService.localizeMany(labelKeys).then(function (values) {
-        vm.labels.cancel = values[0];
-        vm.labels.selectContentStartNode = values[1];
-        vm.labels.selectMediaStartNode = values[2];
-        vm.labels.selectNode = values[3];
-        vm.labels.groups = values[4];
-        vm.labels.contentRoot = values[5];
-        vm.labels.mediaRoot = values[6];
-        vm.labels.allowAccessToAllLanguages = values[7];
-      });
-      localizationService.localize("general_add").then(function (name) {
-        vm.labels.add = name;
-      });
-      localizationService.localize("user_noStartNode").then(function (name) {
-        vm.labels.noStartNode = name;
-      });
-
-      if (create) {
-        // get user group scaffold
-        userGroupsResource.getUserGroupScaffold().then(function (userGroup) {
-          vm.userGroup = userGroup;
-          setSectionIcon(vm.userGroup.sections);
-          makeBreadcrumbs();
-          vm.loading = false;
-        });
-      } else {
-        // get user group
-        userGroupsResource.getUserGroup(id).then(function (userGroup) {
-          vm.userGroup = userGroup;
-          formatGranularPermissionSelection();
-          setSectionIcon(vm.userGroup.sections);
-          makeBreadcrumbs();
-          vm.loading = false;
-        });
-      }
-    }
-
-    function save() {
-      vm.page.saveButtonState = "busy";
-
-      contentEditingHelper.contentEditorPerformSave({
-        saveMethod: userGroupsResource.saveUserGroup,
-        scope: $scope,
-        content: vm.userGroup,
-        rebindCallback: function (orignal, saved) { }
-      }).then(function (saved) {
-
-        vm.userGroup = saved;
-
-        if (infiniteMode) {
-          $scope.model.submit(vm.userGroup);
-        } else {
-          formatGranularPermissionSelection();
-          setSectionIcon(vm.userGroup.sections);
-          makeBreadcrumbs();
-          vm.page.saveButtonState = "success";
-
-          eventsService.emit("editors.userGroups.userGroupSaved", {
-            userGroup: vm.userGroup,
-            isNew: create
-          });
-        }
-      }, function (err) {
-        vm.page.saveButtonState = "error";
-      });
-    }
-
-    function goToPage(ancestor) {
-      $location.path(ancestor.path);
-    }
-
-    function toggleAllowAllLanguages () {
-      vm.userGroup.hasAccessToAllLanguages = !vm.userGroup.hasAccessToAllLanguages;
-      setDirty();
-    }
-
-    function openLanguagePicker() {
-      var currentSelection = [];
-      Utilities.copy(vm.userGroup.languages, currentSelection);
-      var languagePicker = {
-        selection: currentSelection,
-        submit: function (model) {
-          vm.userGroup.languages = model.selection;
-          setDirty();
-          editorService.close();
-        },
-        close: function () {
-          editorService.close();
-        }
-      };
-      editorService.languagePicker(languagePicker);
-    }
-
-    function removeLanguage (index) {
-      vm.userGroup.languages.splice(index, 1);
-      setDirty();
-    }
-
-    function openSectionPicker() {
-      var currentSelection = [];
-      Utilities.copy(vm.userGroup.sections, currentSelection);
-      var sectionPicker = {
-        selection: currentSelection,
-        submit: function (model) {
-          vm.userGroup.sections = model.selection;
-          setDirty();
-          editorService.close();
-        },
-        close: function () {
-          editorService.close();
-        }
-      };
-      editorService.sectionPicker(sectionPicker);
-    }
-
-    function openContentPicker() {
-      var contentPicker = {
-        title: vm.labels.selectContentStartNode,
-        section: "content",
-        treeAlias: "content",
-        hideSubmitButton: true,
-        hideHeader: false,
-        submit: function (model) {
-          if (model.selection) {
-            vm.userGroup.contentStartNode = model.selection[0];
-            if (vm.userGroup.contentStartNode.id === "-1") {
-              vm.userGroup.contentStartNode.name = vm.labels.contentRoot;
-              vm.userGroup.contentStartNode.icon = "icon-folder";
-            }
-            setDirty();
-          }
-          editorService.close();
-        },
-        close: function () {
-          editorService.close();
-        }
-      };
-      editorService.treePicker(contentPicker);
-    }
-
-    function openMediaPicker() {
-      var mediaPicker = {
-        title: vm.labels.selectMediaStartNode,
-        section: "media",
-        treeAlias: "media",
-        entityType: "media",
-        hideSubmitButton: true,
-        hideHeader: false,
-        submit: function (model) {
-          if (model.selection) {
-            vm.userGroup.mediaStartNode = model.selection[0];
-            if (vm.userGroup.mediaStartNode.id === "-1") {
-              vm.userGroup.mediaStartNode.name = vm.labels.mediaRoot;
-              vm.userGroup.mediaStartNode.icon = "icon-folder";
-            }
-            setDirty();
-          }
-          editorService.close();
-        },
-        close: function () {
-          editorService.close();
-        }
-      };
-      editorService.treePicker(mediaPicker);
-    }
-
-    function openUserPicker() {
-      var currentSelection = [];
-      Utilities.copy(vm.userGroup.users, currentSelection);
-      var userPicker = {
-        selection: currentSelection,
-        submit: function (model) {
-          vm.userGroup.users = model.selection;
-          setDirty();
-          editorService.close();
-        },
-        close: function () {
-          editorService.close();
-        }
-      };
-      editorService.userPicker(userPicker);
-    }
-
-    /**
-     * The granular permissions structure gets returned from the server in the dictionary format with each key being the permission category
-     * however the list to display the permissions isn't via the dictionary way so we need to format it
-     */
-    function formatGranularPermissionSelection() {
-      vm.userGroup.assignedPermissions.forEach(function (node) {
-        formatGranularPermissionSelectionForNode(node);
-      });
-    }
-
-    function formatGranularPermissionSelectionForNode(node) {
-      //the dictionary is assigned via node.permissions we will reformat to node.allowedPermissions
-      node.allowedPermissions = [];
-      Object.values(node.permissions).forEach(function (permissions) {
-        permissions.forEach(function (p) {
-          if (p.checked) {
-            node.allowedPermissions.push(p);
-          }
-        });
-      });
-    }
-
-    function openGranularPermissionsPicker() {
-      var contentPicker = {
-        title: vm.labels.selectNode,
-        section: "content",
-        treeAlias: "content",
-        hideSubmitButton: true,
-        select: function (node) {
-          if (node) {
-            //check if this is already in our selection
-            var found = _.find(vm.userGroup.assignedPermissions, function (i) {
-              return i.id === node.id;
-            });
-            node = found ? found : node;
-            setPermissionsForNode(node);
-            setDirty();
-          }
-        },
-        close: function () {
-          editorService.close();
-        }
-      };
-      editorService.treePicker(contentPicker);
-      contentPickerOpen = true;
-    }
-
-    function setPermissionsForNode(node) {
-
-      //clone the current defaults to pass to the model
-      if (!node.permissions) {
-        node.permissions = Utilities.copy(vm.userGroup.defaultPermissions);
-      }
-
-      vm.nodePermissions = {
-        node: node,
-        submit: function (model) {
-
-          if (model && model.node && model.node.permissions) {
-
-            formatGranularPermissionSelectionForNode(node);
-
-            if (!vm.userGroup.assignedPermissions) {
-              vm.userGroup.assignedPermissions = [];
-            }
-
-            //check if this is already in our selection
-            var found = _.find(vm.userGroup.assignedPermissions, function (i) {
-              return i.id === node.id;
-            });
-            if (!found) {
-              vm.userGroup.assignedPermissions.push(node);
-            }
-          }
-
-          editorService.close();
-
-          if (contentPickerOpen) {
-            editorService.close();
-            contentPickerOpen = false;
-          }
-
-        },
-        close: function () {
-          editorService.close();
-        }
-      };
-
-      editorService.nodePermissions(vm.nodePermissions);
-
-    }
-
-    function removeSection(index) {
-      vm.userGroup.sections.splice(index, 1);
-      setDirty();
-    }
-
-    function removeAssignedPermissions(index) {
-      vm.userGroup.assignedPermissions.splice(index, 1);
-      setDirty();
-    }
-
-    function removeUser(index) {
-      const dialog = {
-        view: "views/users/views/overlays/remove.html",
-        username: vm.userGroup.users[index].username,
-        userGroupName: vm.userGroup.name.toLowerCase(),
-        submitButtonLabelKey: "defaultdialogs_yesRemove",
-        submitButtonStyle: "danger",
-
-        submit: function () {
-          vm.userGroup.users.splice(index, 1);
-          setDirty();
-          overlayService.close();
-        },
-        close: function () {
-          overlayService.close();
-        }
-      };
-
-      overlayService.open(dialog);
-    }
-
-    function clearStartNode(type) {
-      if (type === "content") {
-        vm.userGroup.contentStartNode = null;
-      } else if (type === "media") {
-        vm.userGroup.mediaStartNode = null;
-      }
-      setDirty();
-    }
-
-    function makeBreadcrumbs() {
-      vm.breadcrumbs = [
-        {
-          "name": vm.labels.groups,
-          "path": "/users/users/groups"
-        },
-        {
-          "name": vm.userGroup.name
-        }
-      ];
-    }
-
-    function setSectionIcon(sections) {
-      sections.forEach(function (section) {
-        section.icon = "icon-section";
-      });
-    }
-
-    function setDirty() {
-      $scope.editUserGroupForm.$setDirty();
-    }
-
-    init();
-
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Users.GroupController", UserGroupEditController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html
deleted file mode 100644
index f255aa1dea..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<div ng-controller="Umbraco.Editors.Users.GroupController as vm" class="clearfix">
-
-  <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-  <form name="editUserGroupForm" novalidate val-form-manager>
-
-    <umb-editor-view ng-if="!vm.loading">
-
-      <umb-editor-header name="vm.userGroup.name" alias="vm.userGroup.alias"
-        alias-locked="vm.userGroup.isSystemUserGroup" icon="vm.userGroup.icon" hide-description="true"
-        on-back="vm.goToPage(vm.breadcrumbs[0])" show-back-button="vm.showBackButton">
-      </umb-editor-header>
-
-      <umb-editor-container>
-
-        <div class="umb-packages-view-wrapper" style="padding: 0;">
-
-          <div class="umb-package-details">
-
-            <div class="umb-package-details__main-content">
-
-              <umb-box>
-
-                <umb-box-header title-key="user_assignAccess"></umb-box-header>
-
-                <umb-box-content class="block-form">
-
-                  <umb-control-group style="margin-bottom: 20px;" label="@main_sections"
-                    description="@user_sectionsHelp">
-                    <umb-node-preview style="max-width: 100%;" ng-repeat="section in vm.userGroup.sections"
-                      icon="section.icon" name="section.name" allow-remove="true" on-remove="vm.removeSection($index)">
-                    </umb-node-preview>
-
-                    <button type="button" class="umb-node-preview-add" style="max-width: 100%;"
-                      ng-click="vm.openSectionPicker()">
-                      <localize key="general_add">Add</localize>
-                    </button>
-                  </umb-control-group>
-
-                  <umb-control-group style="margin-bottom: 20px;" label="@treeHeaders_languages"
-                    description="@user_languagesHelp">
-                    
-                    <umb-toggle
-                      style="margin-bottom: 10px;"
-                      checked="vm.userGroup.hasAccessToAllLanguages" 
-                      on-click="vm.toggleAllowAllLanguages()"
-                      label-on="{{ vm.labels.allowAccessToAllLanguages }}"
-                      label-off="{{ vm.labels.allowAccessToAllLanguages }}"
-                      label-position="right"
-                      show-labels="true">
-                    </umb-toggle>
-                    
-                    <div ng-if="!vm.userGroup.hasAccessToAllLanguages">
-                      <umb-node-preview style="max-width: 100%;" ng-repeat="language in vm.userGroup.languages"
-                        icon="vm.languageIcon" name="language.name" allow-remove="true"
-                        on-remove="vm.removeLanguage($index)">
-                      </umb-node-preview>
-
-                      <button type="button" class="umb-node-preview-add" style="max-width: 100%;"
-                        ng-click="vm.openLanguagePicker()">
-                        <localize key="general_add">Add</localize>
-                      </button>
-                    </div>
-                  </umb-control-group>
-
-                  <umb-control-group style="margin-bottom: 20px;" label="@user_startnode"
-                    description="@user_startnodehelp">
-                    <umb-node-preview ng-if="vm.userGroup.contentStartNode.id" style="max-width: 100%;"
-                      icon="vm.userGroup.contentStartNode.icon" name="vm.userGroup.contentStartNode.name"
-                      allow-edit="true" allow-remove="true" on-edit="vm.openContentPicker()"
-                      on-remove="vm.clearStartNode('content')">
-                    </umb-node-preview>
-
-
-                    <button type="button" ng-if="!vm.userGroup.contentStartNode" class="umb-node-preview-add"
-                      style="max-width: 100%;" ng-click="vm.openContentPicker()">
-                      <localize key="general_add">Add</localize>
-                    </button>
-
-                  </umb-control-group>
-
-                  <umb-control-group label="@user_mediastartnode" description="@user_mediastartnodehelp">
-
-                    <umb-node-preview ng-if="vm.userGroup.mediaStartNode.id" style="max-width: 100%;"
-                      icon="vm.userGroup.mediaStartNode.icon" name="vm.userGroup.mediaStartNode.name" allow-edit="true"
-                      allow-remove="true" on-edit="vm.openMediaPicker()" on-remove="vm.clearStartNode('media')">
-                    </umb-node-preview>
-
-
-                    <button type="button" ng-if="!vm.userGroup.mediaStartNode" class="umb-node-preview-add"
-                      style="max-width: 100%;" ng-click="vm.openMediaPicker()">
-                      <localize key="general_add">Add</localize>
-                    </button>
-
-                  </umb-control-group>
-
-                </umb-box-content>
-              </umb-box>
-
-              <umb-box>
-                <umb-box-header title-key="user_permissionsDefault"></umb-box-header>
-                <umb-box-content class="block-form">
-                  <umb-control-group ng-repeat="(category, permissions) in vm.userGroup.defaultPermissions"
-                    label="{{ category }}">
-                    <umb-toggle-group items="permissions"></umb-toggle-group>
-                  </umb-control-group>
-                </umb-box-content>
-              </umb-box>
-
-              <umb-box>
-                <umb-box-header title-key="user_permissionsGranular"></umb-box-header>
-                <umb-box-content class="block-form">
-                  <umb-control-group label="Nodes" description="@user_permissionsGranularHelp">
-
-                    <umb-node-preview ng-repeat="node in vm.userGroup.assignedPermissions" style="max-width: 100%;"
-                      icon="node.icon" name="node.name" permissions="node.allowedPermissions" allow-remove="true"
-                      on-remove="vm.removeAssignedPermissions($index)" allow-edit="true"
-                      on-edit="vm.setPermissionsForNode(node)">
-                    </umb-node-preview>
-
-                    <button type="button" class="umb-node-preview-add" style="max-width: 100%;"
-                      ng-click="vm.openGranularPermissionsPicker()">
-                      <localize key="general_add">Add</localize>
-                    </button>
-                  </umb-control-group>
-
-                </umb-box-content>
-              </umb-box>
-
-            </div>
-
-            <div class="umb-package-details__sidebar">
-
-              <umb-box>
-                <umb-box-header title-key="sections_users"></umb-box-header>
-                <umb-box-content>
-
-                  <umb-user-preview ng-repeat="user in vm.userGroup.users" name="user.name" avatars="user.avatars"
-                    allow-remove="true" on-remove="vm.removeUser($index)">
-                  </umb-user-preview>
-
-                  <button type="button" class="umb-node-preview-add" ng-click="vm.openUserPicker()">
-                    <localize key="general_add">Add</localize>
-                  </button>
-
-                </umb-box-content>
-              </umb-box>
-
-            </div>
-
-          </div>
-
-        </div>
-
-
-      </umb-editor-container>
-
-      <umb-editor-footer>
-
-        <umb-editor-footer-content-left>
-
-          <umb-breadcrumbs ancestors="vm.breadcrumbs" allow-on-open="true" on-open="vm.goToPage(ancestor)">
-          </umb-breadcrumbs>
-
-        </umb-editor-footer-content-left>
-
-        <umb-editor-footer-content-right>
-
-          <umb-button ng-if="model.infiniteMode" type="button" button-style="link" label-key="general_close"
-            shortcut="esc" action="model.close(model)">
-          </umb-button>
-
-          <umb-button type="button" action="vm.save()" state="vm.page.saveButtonState" button-style="success"
-            shortcut="ctrl+s" label="Save" label-key="{{vm.page.submitButtonLabelKey}}">
-          </umb-button>
-
-        </umb-editor-footer-content-right>
-
-      </umb-editor-footer>
-
-    </umb-editor-view>
-
-  </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js
deleted file mode 100644
index 91c6d8acb1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js
+++ /dev/null
@@ -1,60 +0,0 @@
-(function () {
-    "use strict";
-
-    function UsersOverviewController($scope, $location, $routeParams, localizationService) {
-
-        var vm = this;
-        let usersUri = $routeParams.method;
-        
-        //note on the below, we dont assign a view unless it's the right route since if we did that it will load in that controller
-        //for the view which is unecessary and will cause extra overhead/requests to occur
-        vm.page = {};
-        vm.page.labels = {};
-        vm.page.name = "";
-        vm.page.navigation = [];
-
-        function onInit() {
-            loadNavigation();
-        }
-
-        function loadNavigation() {
-
-            var labels = ["sections_users", "general_groups", "user_userManagement"];
-
-            localizationService.localizeMany(labels).then(function (data) {
-                vm.page.labels.users = data[0];
-                vm.page.labels.groups = data[1];
-                vm.page.name = data[2];
-
-                vm.page.navigation = [
-                    {
-                        "name": vm.page.labels.users,
-                        "icon": "icon-user",
-                        "action": function () {
-                            $location.path("/users/users/users").search("create", null);
-                        },
-                        "view": !usersUri || usersUri === "users" ? "views/users/views/users/users.html" : null,
-                        "active": !usersUri || usersUri === "users",
-                        "alias": "users"
-                    },
-                    {
-                        "name": vm.page.labels.groups,
-                        "icon": "icon-users",
-                        "action": function () {
-                            $location.path("/users/users/groups").search("create", null);
-                        },
-                        "view": usersUri === "groups" ? "views/users/views/groups/groups.html" : null,
-                        "active": usersUri === "groups",
-                        "alias": "userGroups"
-                    }
-                ];
-            });
-        }
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Users.OverviewController", UsersOverviewController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/overview.html b/src/Umbraco.Web.UI.Client/src/views/users/overview.html
deleted file mode 100644
index f58339a937..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/users/overview.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div data-element="editor-users" ng-controller="Umbraco.Editors.Users.OverviewController as vm" class="clearfix">
-
-    <umb-editor-view footer="false">
-
-        <umb-editor-header
-            name="vm.page.name"
-            name-locked="true"
-            hide-icon="true"
-            hide-description="true"
-            navigation="vm.page.navigation"
-            hide-alias="true">
-        </umb-editor-header>
-
-        <umb-editor-container>
-                        
-            <umb-editor-sub-views
-                sub-views="vm.page.navigation">
-            </umb-editor-sub-views>
-
-        </umb-editor-container>
-
-    </umb-editor-view>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
deleted file mode 100644
index 1df0827ace..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
+++ /dev/null
@@ -1,588 +0,0 @@
-(function () {
-    "use strict";
-
-    function UserEditController($scope, eventsService, $q, $location, $routeParams, formHelper, usersResource, twoFactorLoginResource,
-        userService, contentEditingHelper, localizationService, mediaHelper, Upload, umbRequestHelper,
-        usersHelper, authResource, dateHelper, editorService, overlayService, externalLoginInfoService) {
-
-        var currentLoggedInUser = null;
-
-        var vm = this;
-
-        vm.page = {};
-        vm.page.rootIcon = "icon-folder";
-        vm.user = {
-            changePassword: null
-        };
-        vm.breadcrumbs = [];
-        vm.showBackButton = true;
-        vm.hasTwoFactorProviders = false;
-        vm.avatarFile = {};
-        vm.labels = {};
-        vm.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB";
-        vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
-        vm.usernameIsEmail = Umbraco.Sys.ServerVariables.umbracoSettings.usernameIsEmail;
-
-        //create the initial model for change password
-        vm.changePasswordModel = {
-            config: {},
-            isChanging: false,
-            value: {}
-        };
-
-        vm.goToPage = goToPage;
-        vm.openUserGroupPicker = openUserGroupPicker;
-        vm.openContentPicker = openContentPicker;
-        vm.openMediaPicker = openMediaPicker;
-        vm.editSelectedItem = editSelectedItem;
-        vm.removeSelectedItem = removeSelectedItem;
-        vm.disableUser = disableUser;
-        vm.enableUser = enableUser;
-        vm.unlockUser = unlockUser;
-        vm.toggleConfigureTwoFactor = toggleConfigureTwoFactor;
-        vm.resendInvite = resendInvite;
-        vm.deleteNonLoggedInUser = deleteNonLoggedInUser;
-        vm.changeAvatar = changeAvatar;
-        vm.clearAvatar = clearAvatar;
-        vm.save = save;
-        vm.allowGroupEdit = allowGroupEdit;
-
-        vm.changePassword = changePassword;
-        vm.toggleChangePassword = toggleChangePassword;
-
-        vm.denyLocalLogin = externalLoginInfoService.hasDenyLocalLogin();
-
-        function init() {
-
-            vm.loading = true;
-
-            var labelKeys = [
-                "general_saving",
-                "general_cancel",
-                "defaultdialogs_selectContentStartNode",
-                "defaultdialogs_selectMediaStartNode",
-                "sections_users",
-                "content_contentRoot",
-                "media_mediaRoot",
-                "user_noStartNodes",
-                "user_defaultInvitationMessage",
-                "user_deleteUserConfirmation"
-            ];
-
-            localizationService.localizeMany(labelKeys).then(function (values) {
-                vm.labels.saving = values[0];
-                vm.labels.cancel = values[1];
-                vm.labels.selectContentStartNode = values[2];
-                vm.labels.selectMediaStartNode = values[3];
-                vm.labels.users = values[4];
-                vm.labels.contentRoot = values[5];
-                vm.labels.mediaRoot = values[6];
-                vm.labels.noStartNodes = values[7];
-                vm.labels.defaultInvitationMessage = values[8];
-                vm.labels.deleteUserConfirmation = values[9];
-            });
-
-            // get user
-            usersResource.getUser($routeParams.id).then(function (user) {
-                vm.user = user;
-                makeBreadcrumbs(vm.user);
-                setUserDisplayState();
-                formatDatesToLocal(vm.user);
-
-                vm.usernameIsEmail = Umbraco.Sys.ServerVariables.umbracoSettings.usernameIsEmail && user.email === user.username;
-
-                //go get the config for the membership provider and add it to the model
-                authResource.getPasswordConfig(user.id).then(function (data) {
-                  vm.changePasswordModel.config = data;
-
-                    //the user has a password if they are not states: Invited, NoCredentials
-                    vm.changePasswordModel.config.hasPassword = vm.user.userState !== "Invited" && vm.user.userState !== "Inactive";
-
-                    vm.changePasswordModel.config.disableToggle = true;
-
-                    $scope.$emit("$setAccessibleHeader", false, "general_user", false, vm.user.name, "", true);
-                    vm.loading = false;
-                });
-
-              twoFactorLoginResource.get2FAProvidersForUser(vm.user.id).then(function (providers) {
-                vm.hasTwoFactorProviders = providers.length > 0;
-              });
-            });
-        }
-        
-        /**
-         * @ngdoc function
-         * @function    
-         *
-         * @deprecated
-         */
-        function getLocalDate(date, culture, format) {
-            return dateHelper.getLocaleDate(date, culture, format);
-        }
-
-        function toggleChangePassword() {
-            //reset it
-            vm.user.changePassword = null;
-
-            localizationService.localizeMany(["general_cancel", "general_confirm", "general_changePassword"])
-                .then(function (data) {
-                    const overlay = {
-                        view: "changepassword",
-                        title: data[2],
-                        changePassword: vm.user.changePassword,
-                        config: vm.changePasswordModel.config,
-                        closeButtonLabel: data[0],
-                        submitButtonLabel: data[1],
-                        submitButtonStyle: 'success',
-                        close: () => overlayService.close(),
-                        submit: model => {
-                            overlayService.close();
-                            vm.changePasswordModel.value = model.changePassword;
-                            changePassword();
-                        }
-                    };
-                    overlayService.open(overlay);
-                });
-        }
-
-        function save() {
-
-            if (formHelper.submitForm({ scope: $scope })) {
-
-                vm.page.saveButtonState = "busy";
-
-                //save current nav to be restored later so that the tabs dont change
-                var currentNav = vm.user.navigation;
-
-                usersResource.saveUser(vm.user)
-                    .then(function (saved) {
-
-                        //if the user saved, then try to execute all extended save options
-                        extendedSave(saved).then(function (result) {
-                            //if all is good, then reset the form
-                            formHelper.resetForm({ scope: $scope });
-                        }, function () {
-                            formHelper.resetForm({ scope: $scope, hasErrors: true });
-                        });
-
-                        vm.user = _.omit(saved, "navigation");
-                        //restore
-                        vm.user.navigation = currentNav;
-                        setUserDisplayState();
-                        formatDatesToLocal(vm.user);
-
-                        vm.page.saveButtonState = "success";
-
-                    }, function (err) {
-                        formHelper.resetForm({ scope: $scope, hasErrors: true });
-                        contentEditingHelper.handleSaveError({
-                            err: err,
-                            showNotifications: true
-                        });
-
-                        vm.page.saveButtonState = "error";
-                    });
-            }
-        }
-
-        /**
-         *
-         */
-        function changePassword() {
-            //anytime a user is changing another user's password, we are in effect resetting it so we need to set that flag here
-            if (vm.changePasswordModel.value) {
-                //NOTE: the check for allowManuallyChangingPassword is due to this legacy user membership provider setting, if that is true, then the current user
-                //can change their own password without entering their current one (this is a legacy setting since that is a security issue but we need to maintain compat).
-                //if allowManuallyChangingPassword=false, then we are using default settings and the user will need to enter their old password to change their own password.
-                vm.changePasswordModel.value.reset = (!vm.changePasswordModel.value.oldPassword && !vm.user.isCurrentUser) || vm.changePasswordModel.config.allowManuallyChangingPassword;
-            }
-
-            // since we don't send the entire user model, the id is required
-            vm.changePasswordModel.value.id = vm.user.id;
-
-            usersResource.changePassword(vm.changePasswordModel.value)
-                .then(() => {
-                    vm.changePasswordModel.isChanging = false;
-                    vm.changePasswordModel.value = {};
-
-                    //the user has a password if they are not states: Invited, NoCredentials
-                    vm.changePasswordModel.config.hasPassword = vm.user.userState !== "Invited" && vm.user.userState !== "Inactive";
-                }, err => {
-                    contentEditingHelper.handleSaveError({
-                        err: err,
-                        showNotifications: true
-                    });
-                });
-        }
-
-        /**
-         * Used to emit the save event and await any async operations being performed by editor extensions
-         * @param {any} savedUser
-         */
-        function extendedSave(savedUser) {
-
-            //used to track any promises added by the event handlers to be awaited
-            var promises = [];
-
-            var args = {
-                //getPromise: getPromise,
-                user: savedUser,
-                //a promise can be added by the event handler if the handler needs an async operation to be awaited
-                addPromise: function (p) {
-                    promises.push(p);
-                }
-            };
-
-            //emit the event
-            eventsService.emit("editors.user.editController.save", args);
-
-            //await all promises to complete
-            var resultPromise = $q.all(promises);
-
-            return resultPromise;
-        }
-
-        function goToPage(ancestor) {
-            $location.path(ancestor.path);
-        }
-
-        function openUserGroupPicker() {
-            var currentSelection = [];
-            Utilities.copy(vm.user.userGroups, currentSelection);
-            var userGroupPicker = {
-                selection: currentSelection,
-                submit: function (model) {
-                    // apply changes
-                    if (model.selection) {
-                        vm.user.userGroups = model.selection;
-                    }
-                    editorService.close();
-                },
-                close: function () {
-                    editorService.close();
-                }
-            };
-            editorService.userGroupPicker(userGroupPicker);
-        }
-
-        function openContentPicker() {
-            var contentPicker = {
-                title: vm.labels.selectContentStartNode,
-                section: "content",
-                treeAlias: "content",
-                multiPicker: true,
-                selection: vm.user.startContentIds,
-                hideHeader: false,
-                submit: function (model) {
-                    // select items
-                    if (model.selection) {
-                        model.selection.forEach(function (item) {
-                            if (item.id === "-1") {
-                                item.name = vm.labels.contentRoot;
-                                item.icon = "icon-folder";
-                            }
-                            multiSelectItem(item, vm.user.startContentIds);
-                        });
-                    }
-                    editorService.close();
-                },
-                close: function () {
-                    editorService.close();
-                }
-            };
-            editorService.treePicker(contentPicker);
-        }
-
-        function openMediaPicker() {
-            var mediaPicker = {
-                title: vm.labels.selectMediaStartNode,
-                section: "media",
-                treeAlias: "media",
-                entityType: "media",
-                multiPicker: true,
-                hideHeader: false,
-                show: true,
-                submit: function (model) {
-                    // select items
-                    if (model.selection) {
-                        model.selection.forEach(function (item) {
-                            if (item.id === "-1") {
-                                item.name = vm.labels.mediaRoot;
-                                item.icon = "icon-folder";
-                            }
-                            multiSelectItem(item, vm.user.startMediaIds);
-                        });
-                    }
-                    // close overlay
-                    editorService.close();
-                },
-                close: function () {
-                    // close overlay
-                    editorService.close();
-                }
-            };
-            editorService.treePicker(mediaPicker);
-        }
-
-        function multiSelectItem(item, selection) {
-            var found = false;
-            // check if item is already in the selected list
-            if (selection.length > 0) {
-                selection.forEach(function (selectedItem) {
-                    if (selectedItem.udi === item.udi) {
-                        found = true;
-                    }
-                });
-            }
-            // only add the selected item if it is not already selected
-            if (!found) {
-                selection.push(item);
-            }
-        }
-
-        function editSelectedItem(index, selection) {
-            var group = selection[index];
-            const editor = {
-                id: group.id,
-                submit: function (model) {
-                    selection[index] = model;
-                    editorService.close();
-                },
-                close: function () {
-                    editorService.close();
-                }
-            };
-            editorService.userGroupEditor(editor);
-        }
-
-        function removeSelectedItem(index, selection) {
-            selection.splice(index, 1);
-        }
-
-        function disableUser() {
-            vm.disableUserButtonState = "busy";
-            usersResource.disableUsers([vm.user.id]).then(function (data) {
-                vm.user.userState = "Disabled";
-                setUserDisplayState();
-                vm.disableUserButtonState = "success";
-
-            }, function (error) {
-                vm.disableUserButtonState = "error";
-
-            });
-        }
-
-        function enableUser() {
-            vm.enableUserButtonState = "busy";
-            usersResource.enableUsers([vm.user.id]).then(function (data) {
-                vm.user.userState = "Active";
-                setUserDisplayState();
-                vm.enableUserButtonState = "success";
-            }, function (error) {
-                vm.enableUserButtonState = "error";
-            });
-        }
-
-        function unlockUser() {
-            vm.unlockUserButtonState = "busy";
-            usersResource.unlockUsers([vm.user.id]).then(function (data) {
-                vm.user.userState = "Active";
-                vm.user.failedPasswordAttempts = 0;
-                setUserDisplayState();
-                vm.unlockUserButtonState = "success";
-
-            }, function (error) {
-                vm.unlockUserButtonState = "error";
-            });
-        }
-
-        function toggleConfigureTwoFactor() {
-
-          var configureTwoFactorSettings = {
-            create: true,
-            user: vm.user,
-            isCurrentUser:  vm.user.isCurrentUser,
-            size: "small",
-            view: "views/common/infiniteeditors/twofactor/configuretwofactor.html",
-            close: function() {
-              editorService.close();
-            }
-          };
-
-          editorService.open(configureTwoFactorSettings);
-        }
-
-
-        function resendInvite() {
-            vm.resendInviteButtonState = "busy";
-
-            if (vm.resendInviteMessage) {
-                vm.user.message = vm.resendInviteMessage;
-            }
-            else {
-                vm.user.message = vm.labels.defaultInvitationMessage;
-            }
-
-            usersResource.inviteUser(vm.user).then(function (data) {
-                vm.resendInviteButtonState = "success";
-                vm.resendInviteMessage = "";
-                formHelper.showNotifications(data);
-            }, function (error) {
-                vm.resendInviteButtonState = "error";
-                formHelper.showNotifications(error.data);
-            });
-        }
-
-        function deleteNonLoggedInUser() {
-            vm.deleteNotLoggedInUserButtonState = "busy";
-
-            var confirmationMessage = vm.labels.deleteUserConfirmation;
-
-            localizationService.localizeMany(["general_delete", "general_cancel", "contentTypeEditor_yesDelete"])
-                .then(function (data) {
-
-                    const overlay = {
-                        view: "confirm",
-                        title: data[0],
-                        content: confirmationMessage,
-                        closeButtonLabel: data[1],
-                        submitButtonLabel: data[2],
-                        submitButtonStyle: "danger",
-                        close: function () {
-                            vm.deleteNotLoggedInUserButtonState = "danger";
-                            overlayService.close();
-                        },
-                        submit: function () {
-                            performDelete();
-                            overlayService.close();
-                        }
-                    };
-                    overlayService.open(overlay);
-
-                });
-        }
-
-        function performDelete() {
-            usersResource.deleteNonLoggedInUser(vm.user.id).then(function (data) {
-               goToPage(vm.breadcrumbs[0]);
-            }, function (error) {
-                vm.deleteNotLoggedInUserButtonState = "error";
-                formHelper.showNotifications(error.data);
-            });
-        }
-
-        function clearAvatar() {
-            // get user
-            usersResource.clearAvatar(vm.user.id).then(function (data) {
-                vm.user.avatars = data;
-            });
-        }
-
-        function changeAvatar(files, event) {
-            if (files && files.length > 0) {
-                upload(files[0]);
-            }
-        };
-
-        function upload(file) {
-
-            vm.avatarFile.uploadProgress = 0;
-
-            Upload.upload({
-                url: umbRequestHelper.getApiUrl("userApiBaseUrl", "PostSetAvatar", { id: vm.user.id }),
-                fields: {},
-                file: file
-            }).progress(function (evt) {
-
-                if (vm.avatarFile.uploadStatus !== "done" && vm.avatarFile.uploadStatus !== "error") {
-                    // set uploading status on file
-                    vm.avatarFile.uploadStatus = "uploading";
-
-                    // calculate progress in percentage
-                    var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10);
-
-                    // set percentage property on file
-                    vm.avatarFile.uploadProgress = progressPercentage;
-                }
-
-            }).success(function (data, status, headers, config) {
-
-                // set done status on file
-                vm.avatarFile.uploadStatus = "done";
-                vm.avatarFile.uploadProgress = 100;
-                vm.user.avatars = data;
-
-            }).error(function (evt, status, headers, config) {
-
-                // set status done
-                vm.avatarFile.uploadStatus = "error";
-
-                // If file not found, server will return a 404 and display this message
-                if (status === 404) {
-                    vm.avatarFile.serverErrorMessage = "File not found";
-                }
-                else if (status == 400) {
-                    //it's a validation error
-                    vm.avatarFile.serverErrorMessage = evt.message;
-                }
-                else {
-                    //it's an unhandled error
-                    //if the service returns a detailed error
-                    if (evt.InnerException) {
-                        vm.avatarFile.serverErrorMessage = evt.InnerException.ExceptionMessage;
-
-                        //Check if its the common "too large file" exception
-                        if (evt.InnerException.StackTrace && evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0) {
-                            vm.avatarFile.serverErrorMessage = "File too large to upload";
-                        }
-
-                    } else if (evt.Message) {
-                        vm.avatarFile.serverErrorMessage = evt.Message;
-                    }
-                }
-            });
-        }
-
-        function makeBreadcrumbs() {
-            vm.breadcrumbs = [
-                {
-                    "name": vm.labels.users,
-                    "path": "/users/users/users"
-                },
-                {
-                    "name": vm.user.name
-                }
-            ];
-        }
-
-        function setUserDisplayState() {
-            vm.user.userDisplayState = usersHelper.getUserStateByKey(vm.user.userState);
-        }
-
-        function formatDatesToLocal(user) {
-            // get current backoffice user and format dates
-            userService.getCurrentUser().then(function (currentUser) {
-                currentLoggedInUser = currentUser;
-
-                user.formattedLastLogin = dateHelper.getLocalDate(user.lastLoginDate, currentUser.locale, "LLL");
-                user.formattedLastLockoutDate = dateHelper.getLocalDate(user.lastLockoutDate, currentUser.locale, "LLL");
-                user.formattedCreateDate = dateHelper.getLocalDate(user.createDate, currentUser.locale, "LLL");
-                user.formattedUpdateDate = dateHelper.getLocalDate(user.updateDate, currentUser.locale, "LLL");
-                user.formattedLastPasswordChangeDate = dateHelper.getLocalDate(user.lastPasswordChangeDate, currentUser.locale, "LLL");
-            });
-        }
-
-        function allowGroupEdit(group) {
-            if (!currentLoggedInUser) {
-                return false;
-            }
-            if (currentLoggedInUser.userGroups.indexOf(group.alias) === -1 && currentLoggedInUser.userGroups.indexOf("admin") === -1) {
-                return false;
-            }
-            return true;
-        }
-
-        init();
-    }
-    angular.module("umbraco").controller("Umbraco.Editors.Users.UserController", UserEditController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.html b/src/Umbraco.Web.UI.Client/src/views/users/user.html
deleted file mode 100644
index a2ec69b757..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<div ng-controller="Umbraco.Editors.Users.UserController as vm" class="clearfix">
-
-    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-    <form name="editUserForm" novalidate val-form-manager>
-
-        <umb-editor-view>
-
-            <umb-editor-header name="vm.user.name"
-                               name-locked="vm.denyLocalLogin"
-                               hide-icon="true"
-                               hide-description="true"
-                               hide-alias="true"
-                               navigation="vm.user.navigation"
-                               on-back="vm.goToPage(vm.breadcrumbs[0])"
-                               show-back-button="vm.showBackButton">
-            </umb-editor-header>
-
-            <umb-editor-container>
-
-                <div ng-if="!vm.loading" class="umb-user-details-view-wrapper" style="padding: 0;">
-
-                    <umb-editor-sub-views
-                        ng-if="!vm.loading"
-                        sub-views="vm.user.navigation"
-                        model="vm">
-                    </umb-editor-sub-views>
-
-                </div>
-
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-left>
-
-                    <umb-breadcrumbs ancestors="vm.breadcrumbs"
-                                     allow-on-open="true"
-                                     on-open="vm.goToPage(ancestor)">
-                    </umb-breadcrumbs>
-
-                </umb-editor-footer-content-left>
-
-                <umb-editor-footer-content-right>
-
-                    <umb-button type="button"
-                                action="vm.goToPage(vm.breadcrumbs[0])"
-                                button-style="link"
-                                label="Return to list"
-                                label-key="buttons_returnToList"
-                                disabled="vm.loading">
-                    </umb-button>
-
-                    <umb-button type="button"
-                                action="vm.save()"
-                                state="vm.page.saveButtonState"
-                                button-style="success"
-                                shortcut="ctrl+s"
-                                label="Save"
-                                label-key="buttons_save"
-                                disabled="vm.loading">
-                    </umb-button>
-
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-
-        </umb-editor-view>
-
-    </form>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
deleted file mode 100644
index f7e1590da8..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
+++ /dev/null
@@ -1,146 +0,0 @@
-(function () {
-    "use strict";
-
-    function UserGroupsController($scope, $timeout, $location, $filter, userService, userGroupsResource, 
-        formHelper, localizationService, listViewHelper, overlayService) {
-
-        var vm = this;
-
-        vm.userGroups = [];
-        vm.selection = [];
-
-        vm.clickUserGroupName = clickUserGroupName;
-        vm.createUserGroup = createUserGroup;
-        vm.clearSelection = clearSelection;
-        vm.selectUserGroup = selectUserGroup;
-        vm.deleteUserGroups = deleteUserGroups;
-
-        vm.filter = null;
-
-        var currentUser = null;
-
-        function onInit() {
-
-            vm.loading = true;
-
-            userService.getCurrentUser().then(function(user) {
-                currentUser = user;
-                // Get usergroups
-                userGroupsResource.getUserGroups().then(function (userGroups) {
-
-                    // only allow editing and selection if user is member of the group or admin
-                    vm.userGroups = _.map(userGroups, function (ug) {
-                        ug.hasAccess = user.userGroups.indexOf(ug.alias) !== -1 || user.userGroups.indexOf("admin") !== -1;
-                        return ug;
-                    });
-                    vm.filteredUserGroups = vm.userGroups;
-
-                    vm.loading = false;
-                });
-            });
-
-        }
-
-        function createUserGroup() {
-            // clear all query params
-            $location.search({});
-            // go to create user group
-            $location.path('users/users/group/-1').search("create", "true");;
-        }
-        
-        function goToUserGroup(userGroup, $event) {
-            
-            // only allow editing if user is member of the group or admin
-            if (currentUser.userGroups.indexOf(userGroup.alias) === -1 && currentUser.userGroups.indexOf("admin") === -1) {
-                return;
-            }
-            $location.path(getEditPath(userGroup)).search("create", null);
-        }
-        
-        function clickUserGroupName(item, $event) {
-           if(!($event.metaKey || $event.ctrlKey)) {
-              goToUserGroup(item, $event);
-              $event.preventDefault();
-           }
-           $event.stopPropagation();
-        };
-        
-        function getEditPath(userGroup) {
-            
-            // only allow editing if user is member of the group or admin
-            if (currentUser.userGroups.indexOf(userGroup.alias) === -1 && currentUser.userGroups.indexOf("admin") === -1) {
-                return "";
-            }
-            
-            return 'users/users/group/' + userGroup.id;
-        }
-
-        function selectUserGroup(userGroup, $index, $event) {
-            
-            // Only allow selection if user is member of the group or admin
-            if (currentUser.userGroups.indexOf(userGroup.alias) === -1 && currentUser.userGroups.indexOf("admin") === -1) {
-                return;
-            }
-            // Disallow selection of the admin/translators group, the checkbox is not visible in the UI, but clicking(and thus selecting) is still possible.
-            // Currently selection can only be used for deleting, and the Controller will also disallow deleting the admin group.
-            if (userGroup.isSystemUserGroup)
-                return;
-            
-            listViewHelper.selectHandler(userGroup, $index, vm.userGroups, vm.selection, $event);
-            
-            if(event) {
-                event.stopPropagation();
-            }
-        }
-
-        function deleteUserGroups() {
-
-            if(vm.selection.length > 0) {
-
-                localizationService.localizeMany(["general_delete", "defaultdialogs_confirmdelete", "general_cancel", "contentTypeEditor_yesDelete"])
-                    .then(function (data) {
-                        const overlay = {
-                            title: data[0],
-                            content: data[1] + "?",
-                            closeButtonLabel: data[2],
-                            submitButtonLabel: data[3],
-                            submitButtonStyle: "danger",
-                            close: function () {
-                                overlayService.close();
-                            },
-                            submit: function () {
-                                userGroupsResource.deleteUserGroups(_.pluck(vm.selection, "id")).then(function (data) {
-                                    clearSelection();
-                                    onInit();
-                                }, Utilities.noop);
-                                overlayService.close();
-                            }
-                        };
-                        overlayService.open(overlay);
-                    });
-
-            }
-        }
-
-        function clearSelection() {
-            vm.userGroups.forEach(function (userGroup) {
-                userGroup.selected = false;
-            });
-            vm.selection = [];
-        }
-
-        var unbindFilterWatcher = $scope.$watch("vm.filter", function (newVal, oldVal) {
-            vm.filteredUserGroups = $filter('filter')(vm.userGroups, vm.filter);
-        });
-
-        $scope.$on("$destroy", function () {
-            unbindFilterWatcher();
-        });
-
-        onInit();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Users.GroupsController", UserGroupsController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
deleted file mode 100644
index 0d77e3e97e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<div ng-controller="Umbraco.Editors.Users.GroupsController as vm" class="clearfix">
-
-    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-    <umb-editor-sub-header ng-class="{'--state-selection':(vm.selection.length > 0)}">
-
-        <!-- No selection -->
-        <umb-editor-sub-header-content-left ng-if="vm.selection.length === 0">
-            <umb-button
-                type="button"
-                button-style="outline"
-                action="vm.createUserGroup()"
-                label="Create Group"
-                label-key="actions_createGroup">
-            </umb-button>
-        </umb-editor-sub-header-content-left>
-
-        <umb-editor-sub-header-content-right ng-if="vm.selection.length === 0">
-
-            <umb-editor-sub-header-section>
-
-                <umb-mini-search model="vm.filter">
-                </umb-mini-search>
-
-            </umb-editor-sub-header-section>
-
-        </umb-editor-sub-header-content-right>
-
-        <!-- With selection -->
-        <umb-editor-sub-header-content-left ng-if="vm.selection.length > 0">
-            <umb-editor-sub-header-section>
-                <umb-button
-                    type="button"
-                    label-key="buttons_clearSelection"
-                    button-style="white"
-                    action="vm.clearSelection()"
-                    size="xs">
-                </umb-button>
-            </umb-editor-sub-header-section>
-            <umb-editor-sub-header-section>
-                <strong>{{ vm.selection.length }} <localize key="general_of">of</localize> {{ vm.userGroups.length }} <localize key="general_selected">selected</localize></strong>
-            </umb-editor-sub-header-section>
-        </umb-editor-sub-header-content-left>
-
-        <umb-editor-sub-header-content-right ng-if="vm.selection.length > 0">
-            <umb-button
-                type="button"
-                label="Delete"
-                label-key="general_delete"
-                button-style="white"
-                icon="icon-trash"
-                action="vm.deleteUserGroups()"
-                size="xs">
-            </umb-button>
-        </umb-editor-sub-header-content-right>
-
-    </umb-editor-sub-header>
-
-    <div style="margin-bottom: 20px;" class="flex items-center">
-        <div style="font-size: 16px;">
-            <span class="bold"><localize key="general_groups">Groups</localize> </span> <span>({{vm.userGroups.length}})</span>
-        </div>
-    </div>
-
-    <div class="umb-table" ng-if="!vm.loading && vm.filteredUserGroups.length">
-
-        <div class="umb-table-head">
-            <div class="umb-table-row">
-                <div class="umb-table-cell"></div>
-                <div class="umb-table-cell"><localize key="general_name">Name</localize></div>
-                <div class="umb-table-cell"><localize key="main_sections">Sections</localize></div>
-                <div class="umb-table-cell umb-table-cell--small"><localize key="user_startnode">Content start node</localize></div>
-                <div class="umb-table-cell umb-table-cell--small"><localize key="user_mediastartnode">Media start node</localize></div>
-            </div>
-        </div>
-
-        <div class="umb-table-body">
-            <div class="umb-table-row"
-                ng-repeat="group in vm.filteredUserGroups track by $index"
-                ng-click="vm.selectUserGroup(group, $index, $event)"
-                ng-class="{'-selected': group.selected, '-selectable': group.hasAccess && !group.isSystemUserGroup}">
-
-                <div class="umb-table-cell">
-                    <umb-icon icon="{{group.icon}}" class="umb-table-body__icon umb-table-body__fileicon" ng-if="!group.selected"></umb-icon>
-                    <umb-icon icon="icon-check" class="umb-table-body__icon umb-table-body__checkicon" ng-if="group.selected"></umb-icon>
-                </div>
-                <div class="umb-table-cell">
-                    <a
-                        class="umb-table-body__link"
-                        ng-class="{'cursor-pointer': group.hasAccess, 'cursor-not-allowed': !group.hasAccess}"
-                        ng-click="vm.clickUserGroupName(group, $event)"
-                        ng-href="#{{::vm.getEditPath(group)}}"
-                        ng-bind="group.name">
-                    </a>
-                </div>
-                <div class="umb-table-cell">
-                    <div>
-                        <span ng-repeat="section in group.sections">{{ section.name }}<span ng-if="!$last">, </span></span>
-                        <span ng-if="group.sections.length === 0">No sections</span>
-                    </div>
-                </div>
-                <div class="umb-table-cell umb-table-cell--small">
-                    <span ng-if="!group.contentStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
-                    <span ng-if="group.contentStartNode">{{ group.contentStartNode.name }}</span>
-                </div>
-                <div class="umb-table-cell umb-table-cell--small">
-                    <span ng-if="!group.mediaStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
-                    <span ng-if="group.mediaStartNode">{{ group.mediaStartNode.name }}</span>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Empty states -->
-    <umb-empty-state ng-if="!vm.loading && !vm.filteredUserGroups.length" position="center">
-        <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
-    </umb-empty-state>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/overlays/remove.html b/src/Umbraco.Web.UI.Client/src/views/users/views/overlays/remove.html
deleted file mode 100644
index 97eb7db0b6..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/overlays/remove.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div>
-
-    <div class="umb-alert umb-alert--warning mb2">
-        <localize key="defaultdialogs_userremovewarning" tokens="[model.username, model.userGroupName]">This will remove the user <strong>{{ model.username }} from the {{ model.userGropName }} group</strong>.</localize>
-    </div>
-
-    <localize key="defaultdialogs_confirmremove">Yes, remove</localize>?
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.controller.js
deleted file mode 100644
index 67d1efec85..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.controller.js
+++ /dev/null
@@ -1,14 +0,0 @@
-(function () {
-    "use strict";
-
-    function DetailsController($scope, externalLoginInfoService) {
-
-        var vm = this;
-
-        vm.denyLocalLogin = externalLoginInfoService.hasDenyLocalLogin();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Users.DetailsController", DetailsController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
deleted file mode 100644
index eaa92b7a6e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
+++ /dev/null
@@ -1,414 +0,0 @@
-<div ng-controller="Umbraco.Editors.Users.DetailsController as vm" class="umb-user-details-details">
-
-    <div class="umb-user-details-details__main-content">
-
-        <umb-box>
-            <ng-form name="userProfileForm">
-                <umb-box-header title-key="user_profile"></umb-box-header>
-
-                <umb-box-content class="block-form">
-
-                    <umb-control-group label="@general_email" required="true" alias="email">
-
-                        <div ng-if="!vm.denyLocalLogin">
-                            <input type="email"
-                                   localize="placeholder"
-                                   placeholder="@placeholders_enteremail"
-                                   class="input-block-level"
-                                   ng-model="model.user.email"
-                                   umb-auto-focus
-                                   name="email"
-                                   id="email"
-                                   val-email
-                                   ng-required="true"
-                                   val-server-field="Email" />
-                            <span ng-messages="userProfileForm.email.$error" show-validation-on-submit>
-                                <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
-                                <span class="help-inline" ng-message="valEmail"><localize key="validation_invalidEmail">Invalid email</localize></span>
-                                <span class="help-inline" ng-message="valServerField">{{userProfileForm.email.errorMsg}}</span>
-                            </span>
-                        </div>
-                        <div ng-if="vm.denyLocalLogin">
-                            <input type="email"
-                                   class="input-block-level"
-                                   ng-model="model.user.email"
-                                   id="email"
-                                   disabled />
-                        </div>
-                    </umb-control-group>
-
-                    <umb-control-group label="@general_username" ng-if="!model.usernameIsEmail" required="true">
-                        <input type="text"
-                               localize="placeholder"
-                               placeholder="@placeholders_enterusername"
-                               class="input-block-level"
-                               ng-model="model.user.username"
-                               umb-auto-focus name="username"
-                               required
-                               val-server-field="Username" />
-                        <span ng-messages="userProfileForm.username.$error" show-validation-on-submit>
-                            <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
-                            <span class="help-inline" ng-message="valServerField">{{userProfileForm.username.errorMsg}}</span>
-                        </span>
-                    </umb-control-group>
-
-                    <umb-control-group label="@user_language" description="@user_languageHelp">
-                        <select class="input-block-level"
-                                ng-model="model.user.culture"
-                                ng-options="key as value for (key, value) in model.user.availableCultures"
-                                name="culture"
-                                required
-                                val-server-field="Culture"></select>
-                        <span ng-messages="userProfileForm.culture.$error" show-validation-on-submit>
-                            <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
-                            <span class="help-inline" ng-message="valServerField">{{userProfileForm.username.errorMsg}}</span>
-                        </span>
-                    </umb-control-group>
-                </umb-box-content>
-            </ng-form>
-        </umb-box>
-
-        <umb-box>
-            <umb-box-header title-key="user_assignAccess"></umb-box-header>
-            <umb-box-content class="block-form">
-
-                <umb-control-group style="margin-bottom: 25px;" label="@general_groups" description="@user_groupsHelp" required="true">
-
-                    <umb-user-group-preview ng-repeat="userGroup in model.user.userGroups"
-                                            icon="userGroup.icon"
-                                            name="userGroup.name"
-                                            sections="userGroup.sections"
-                                            content-start-node="userGroup.contentStartNode"
-                                            media-start-node="userGroup.mediaStartNode"
-                                            allow-remove="true"
-                                            allow-edit="model.allowGroupEdit(userGroup)"
-                                            on-edit="model.editSelectedItem($index, model.user.userGroups)"
-                                            on-remove="model.removeSelectedItem($index, model.user.userGroups)">
-                    </umb-user-group-preview>
-
-                    <button type="button"
-                            class="umb-node-preview-add"
-                            ng-click="model.openUserGroupPicker()">
-                        <localize key="general_add">Add</localize>
-                    </button>
-
-                </umb-control-group>
-
-                <umb-control-group style="margin-bottom: 25px;" label="@user_startnodes" description="@user_startnodeshelp">
-
-                    <umb-node-preview style="max-width: 100%;"
-                                      ng-repeat="node in model.user.startContentIds"
-                                      icon="node.icon"
-                                      name="node.name"
-                                      allow-remove="true"
-                                      on-remove="model.removeSelectedItem($index, model.user.startContentIds)">
-                    </umb-node-preview>
-
-                    <umb-node-preview ng-if="model.user.startContentIds.length === 0 && model.user.isCurrentUser"
-                                      style="max-width: 100%;"
-                                      name="model.labels.noStartNodes">
-                    </umb-node-preview>
-
-                    <button type="button"
-                            class="umb-node-preview-add"
-                            id="content-start-add"
-                            ng-click="model.openContentPicker()">
-                        <localize key="general_add">Add</localize>
-                    </button>
-
-                </umb-control-group>
-
-                <umb-control-group label="@user_mediastartnodes" description="@user_mediastartnodeshelp">
-
-                    <umb-node-preview style="max-width: 100%;"
-                                      ng-repeat="node in model.user.startMediaIds"
-                                      icon="node.icon"
-                                      name="node.name"
-                                      allow-remove="true"
-                                      on-remove="model.removeSelectedItem($index, model.user.startMediaIds)">
-                    </umb-node-preview>
-
-                    <umb-node-preview ng-if="model.user.startMediaIds.length === 0 && model.user.isCurrentUser"
-                                      style="max-width: 100%;"
-                                      name="model.labels.noStartNodes">
-                    </umb-node-preview>
-
-                    <button type="button"
-                            class="umb-node-preview-add"
-                            ng-click="model.openMediaPicker()"
-                            id="media-start-add">
-                        <localize key="general_add">Add</localize>
-                    </button>
-
-                </umb-control-group>
-
-            </umb-box-content>
-        </umb-box>
-
-        <umb-box>
-            <umb-box-header title-key="user_access" description-key="user_accessHelp"></umb-box-header>
-            <umb-box-content class="block-form">
-
-                <umb-control-group label="@sections_content">
-                    <umb-node-preview style="max-width: 100%;"
-                                      ng-repeat="node in model.user.calculatedStartContentIds"
-                                      icon="node.icon"
-                                      name="node.name">
-                    </umb-node-preview>
-                    <umb-node-preview ng-if="model.user.calculatedStartContentIds.length === 0"
-                                      style="max-width: 100%;"
-                                      name="model.labels.noStartNodes">
-                    </umb-node-preview>
-                </umb-control-group>
-
-                <umb-control-group label="@sections_media">
-                    <umb-node-preview style="max-width: 100%;"
-                                      ng-repeat="node in model.user.calculatedStartMediaIds"
-                                      icon="node.icon"
-                                      name="node.name">
-                    </umb-node-preview>
-                    <umb-node-preview ng-if="model.user.calculatedStartMediaIds.length === 0"
-                                      style="max-width: 100%;"
-                                      name="model.labels.noStartNodes">
-                    </umb-node-preview>
-                </umb-control-group>
-
-            </umb-box-content>
-        </umb-box>
-    </div>
-
-    <div class="umb-user-details-details__sidebar">
-
-        <umb-box>
-
-            <umb-box-content>
-
-                <!-- Avatar -->
-                <div class="umb-user-details-avatar">
-                    <ng-form name="avatarForm" class="flex flex-column justify-center items-center">
-
-                        <umb-avatar style="margin-bottom: 15px;"
-                                    color="secondary"
-                                    size="xxl"
-                                    name="{{model.user.name}}"
-                                    img-src="{{model.user.avatars[3]}}"
-                                    img-srcset="{{model.user.avatars[4]}} 2x, {{model.user.avatars[4]}} 3x">
-                        </umb-avatar>
-
-                        <umb-progress-bar style="max-width: 120px;"
-                                          ng-if="model.avatarFile.uploadStatus === 'uploading'"
-                                          progress="{{ model.avatarFile.uploadProgress }}"
-                                          size="s">
-                        </umb-progress-bar>
-
-                        <div class="flex items-center" ng-if="model.avatarFile.uploadStatus !== 'uploading'">
-
-                            <button class="btn-link umb-user-group-preview__action"
-                                    ngf-select ng-model="filesHolder"
-                                    ngf-change="model.changeAvatar($files, $event)"
-                                    ngf-multiple="false"
-                                    ngf-pattern="{{model.acceptedFileTypes}}"
-                                    ngf-max-size="{{ model.maxFileSize }}">
-                                <localize key="user_changePhoto">Change photo</localize>
-                            </button>
-
-
-                            <button ng-if="model.user.avatars.length > 0"
-                                    class="btn-link umb-user-group-preview__action umb-user-group-preview__action--red"
-                                    ng-click="model.clearAvatar()"
-                                    prevent-default>
-                                <localize key="user_removePhoto">Remove photo</localize>
-                            </button>
-
-                        </div>
-
-                    </ng-form>
-
-                </div>
-
-                <!-- Actions -->
-                <div class="umb-user-details-actions">
-
-                    <div>
-                        <umb-button ng-if="model.user.userDisplayState.key === 'Disabled' && !model.user.isCurrentUser"
-                                    type="button"
-                                    button-style="[success,block]"
-                                    state="model.enableUserButtonState"
-                                    action="model.enableUser()"
-                                    label="Enable"
-                                    label-key="actions_enable"
-                                    size="s">
-                        </umb-button>
-                    </div>
-
-                    <div>
-                        <umb-button ng-if="model.user.userDisplayState.key === 'LockedOut' && !model.user.isCurrentUser"
-                                    type="button"
-                                    button-style="[success,block]"
-                                    state="model.unlockUserButtonState"
-                                    action="model.unlockUser()"
-                                    label="Unlock"
-                                    label-key="actions_unlock"
-                                    size="s">
-                        </umb-button>
-                    </div>
-                    <div>
-                        <umb-button ng-if="model.user.userDisplayState.key !== 'Disabled' && model.user.userDisplayState.key !== 'Invited' && !model.user.isCurrentUser"
-                                    type="button"
-                                    button-style="[warning,block]"
-                                    action="model.disableUser()"
-                                    state="model.disableUserButtonState"
-                                    label="Disable"
-                                    label-key="actions_disable"
-                                    size="s">
-                        </umb-button>
-                    </div>
-                    <div ng-if="!vm.denyLocalLogin">
-
-                        <umb-button type="button" ng-if="model.user.userDisplayState.key !== 'Invited'"
-                                    button-style="[action,block]"
-                                    action="model.toggleChangePassword()"
-                                    label="Change password"
-                                    label-key="general_changePassword"
-                                    state="changePasswordButtonState"
-                                    size="s">
-                        </umb-button>
-                    </div>
-                    <div ng-if="model.hasTwoFactorProviders">
-                      <umb-button type="button"
-                                  button-style="[action,block]"
-                                  action="model.toggleConfigureTwoFactor()"
-                                  label="Configure Two-Factor"
-                                  label-key="user_configureTwoFactor"
-                                  size="s">
-                      </umb-button>
-                    </div>
-
-                    <div>
-                        <umb-button type="button" ng-if="!model.user.lastLoginDate"
-                                    button-style="[danger,block]"
-                                    action="model.deleteNonLoggedInUser()"
-                                    label="Delete"
-                                    label-key="user_deleteUser"
-                                    state="deleteNotLoggedInUserButtonState"
-                                    size="s">
-                        </umb-button>
-                    </div>
-
-                    <div ng-if="!vm.denyLocalLogin && model.user.resetPasswordValue">
-                        <p><br />Password reset to value: <strong>{{model.user.resetPasswordValue}}</strong></p>
-                    </div>
-
-                </div>
-
-                <!-- User stats -->
-                <div class="umb-user-details-details__information-item">
-                    <div class="umb-user-details-details__information-item-label">
-                        <localize key="general_status">Status</localize>:
-                    </div>
-                    <div class="umb-user-details-details__information-item-content">
-                        <umb-badge style="margin-top: 4px;" size="xs" color="{{model.user.userDisplayState.color}}">
-                            {{model.user.userDisplayState.name}}
-                        </umb-badge>
-                    </div>
-                </div>
-
-                <div ng-if="model.user.userDisplayState.key === 'Invited' && !model.user.isCurrentUser">
-                    <textarea name="resendInviteMessage"
-                              type="text"
-                              class="input-block-level"
-                              localize="placeholder"
-                              placeholder="@placeholders_enterMessage"
-                              ng-model="model.resendInviteMessage"
-                              rows="4">
-                </textarea>
-                    <umb-button type="button"
-                                button-style="[action,block]"
-                                action="model.resendInvite()"
-                                state="model.resendInviteButtonState"
-                                label="Resend Invite"
-                                label-key="actions_resendInvite"
-                                size="s">
-                    </umb-button>
-                </div>
-
-                <div class="umb-user-details-details__information-item">
-                    <div class="umb-user-details-details__information-item-label">
-                        <localize key="user_lastLogin">Last login</localize>:
-                    </div>
-                    <div class="umb-user-details-details__information-item-content">
-                        <span ng-if="model.user.lastLoginDate">{{ model.user.formattedLastLogin }}</span>
-                        <span ng-if="!model.user.lastLoginDate">{{ model.user.name | umbWordLimit:1 }} <localize key="user_noLogin">has not logged in yet</localize></span>
-                    </div>
-                </div>
-
-                <div class="umb-user-details-details__information-item">
-                    <div class="umb-user-details-details__information-item-label">
-                        <localize key="user_failedPasswordAttempts">Failed login attempts</localize>:
-                    </div>
-                    <div class="umb-user-details-details__information-item-content">
-                        {{ model.user.failedPasswordAttempts }}
-                    </div>
-                </div>
-
-                <div class="umb-user-details-details__information-item">
-                    <div class="umb-user-details-details__information-item-label">
-                        <localize key="user_lastLockoutDate">Last lockout date</localize>:
-                    </div>
-                    <div class="umb-user-details-details__information-item-content">
-                        <span ng-if="model.user.lastLockoutDate === '0001-01-01T00:00:00'">
-                            {{ model.user.name | umbWordLimit:1 }} <localize key="user_noLockouts">hasn't been locked out</localize>
-                        </span>
-                        <span ng-if="model.user.lastLockoutDate !== '0001-01-01T00:00:00'">{{ model.user.formattedLastLockoutDate }}</span>
-                    </div>
-                </div>
-
-                <div class="umb-user-details-details__information-item">
-                    <div class="umb-user-details-details__information-item-label">
-                        <localize key="user_lastPasswordChangeDate">Password is last changed</localize>:
-                    </div>
-                    <div class="umb-user-details-details__information-item-content">
-                        <span ng-if="model.user.lastPasswordChangeDate === '0001-01-01T00:00:00'">
-                            <localize key="user_noPasswordChange">The password hasn't been changed</localize>
-                        </span>
-                        <span ng-if="model.user.lastPasswordChangeDate !== '0001-01-01T00:00:00'">{{ model.user.formattedLastPasswordChangeDate }}</span>
-                    </div>
-                </div>
-
-                <div class="umb-user-details-details__information-item">
-                    <div class="umb-user-details-details__information-item-label">
-                        <localize key="user_createDate">User is created</localize>:
-                    </div>
-                    <div class="umb-user-details-details__information-item-content">
-                        {{ model.user.formattedCreateDate }}
-                    </div>
-                </div>
-
-                <div class="umb-user-details-details__information-item">
-                    <div class="umb-user-details-details__information-item-label">
-                        <localize key="user_updateDate">User is last updated</localize>:
-                    </div>
-                    <div class="umb-user-details-details__information-item-content">
-                        {{ model.user.formattedUpdateDate }}
-                    </div>
-                </div>
-
-                <div class="umb-user-details-details__information-item">
-                    <div class="umb-user-details-details__information-item-label">
-                        <localize key="general_id">Id</localize>:
-                    </div>
-                    <div class="umb-user-details-details__information-item-content">
-                        {{ model.user.id }}
-                    </div>
-                    <div class="umb-user-details-details__information-item-content">
-                        <small>{{ model.user.key }}</small>
-                    </div>
-                </div>
-
-            </umb-box-content>
-
-        </umb-box>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
deleted file mode 100644
index 823f7ee6fd..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ /dev/null
@@ -1,856 +0,0 @@
-(function () {
-    "use strict";
-
-    function UsersController($scope, $timeout, $location, $routeParams, usersResource,
-        userGroupsResource, userService, localizationService,
-        usersHelper, formHelper, dateHelper, editorService,
-        listViewHelper, externalLoginInfoService) {
-
-        var vm = this;
-
-        vm.page = {};
-        vm.users = [];
-        vm.userGroups = [];
-        vm.userStates = [];
-        vm.selection = [];
-        vm.newUser = {};
-        vm.usersOptions = {};
-        vm.userSortData = [
-            { label: "Name (A-Z)", key: "Name", direction: "Ascending" },
-            { label: "Name (Z-A)", key: "Name", direction: "Descending" },
-            { label: "Newest", key: "CreateDate", direction: "Descending" },
-            { label: "Oldest", key: "CreateDate", direction: "Ascending" },
-            { label: "Last login", key: "LastLoginDate", direction: "Descending" }
-        ];
-
-        localizationService.localizeMany(_.map(vm.userSortData, function (userSort) {
-            return "user_sort" + userSort.key + userSort.direction;
-        })).then(function (data) {
-            var reg = /^\[[\S\s]*]$/g;
-            _.each(data, function (value, index) {
-                if (!reg.test(value)) {
-                    // Only translate if key exists
-                    vm.userSortData[index].label = value;
-                }
-            });
-        });
-
-        vm.labels = {};
-        localizationService.localizeMany(["user_stateAll"]).then(function (data) {
-            vm.labels.all = data[0];
-        });
-
-        vm.userStatesFilter = [];
-        vm.newUser.userGroups = [];
-        vm.usersViewState = 'overview';
-
-        vm.selectedBulkUserGroups = [];
-
-        vm.usernameIsEmail = Umbraco.Sys.ServerVariables.umbracoSettings.usernameIsEmail;
-
-        vm.allowDisableUser = true;
-        vm.allowEnableUser = true;
-        vm.allowUnlockUser = true;
-        vm.allowSetUserGroup = true;
-
-        vm.layouts = [
-            {
-                "icon": "icon-thumbnails-small",
-                "path": "1",
-                "selected": true
-            },
-            {
-                "icon": "icon-list",
-                "path": "2",
-                "selected": true
-            }
-        ];
-
-        // Get last selected layout for "users" (defaults to first layout = card layout)
-        vm.activeLayout = listViewHelper.getLayout("users", vm.layouts);
-
-        vm.denyLocalLogin = externalLoginInfoService.hasDenyLocalLogin();
-
-        // returns the object representing the user create button, returns null if deny local login is true
-        function getCreateUserButton() {
-            if (!vm.denyLocalLogin) {
-                return {
-                    type: "button",
-                    labelKey: "user_createUser",
-                    handler: function () {
-                        vm.setUsersViewState('createUser');
-                    }
-                };
-            }
-            return null;
-        }
-
-        // No default buttons with denyLocalLogin
-        // Don't show the invite button if no email is configured
-        if (Umbraco.Sys.ServerVariables.umbracoSettings.showUserInvite) {
-            vm.defaultButton = {
-                type: "button",
-                labelKey: "user_inviteUser",
-                handler: function () {
-                    vm.setUsersViewState('inviteUser');
-                }
-            };
-            var createUserBtn = getCreateUserButton();
-            if (createUserBtn) {
-                vm.subButtons = [createUserBtn];
-            }
-        }
-        else {
-            vm.defaultButton = getCreateUserButton();
-        }
-
-
-
-        vm.toggleFilter = toggleFilter;
-        vm.setUsersViewState = setUsersViewState;
-        vm.selectLayout = selectLayout;
-        vm.isSelectable = isSelectable;
-        vm.selectUser = selectUser;
-        vm.clearSelection = clearSelection;
-        vm.clickUser = clickUser;
-        vm.getEditPath = getEditPath;
-        vm.disableUsers = disableUsers;
-        vm.enableUsers = enableUsers;
-        vm.unlockUsers = unlockUsers;
-        vm.openBulkUserGroupPicker = openBulkUserGroupPicker;
-        vm.openUserGroupPicker = openUserGroupPicker;
-        vm.removeSelectedUserGroup = removeSelectedUserGroup;
-        vm.selectAll = selectAll;
-        vm.areAllSelected = areAllSelected;
-        vm.searchUsers = searchUsers;
-        vm.onBlurSearch = onBlurSearch;
-        vm.getFilterName = getFilterName;
-        vm.setUserStatesFilter = setUserStatesFilter;
-        vm.setUserGroupFilter = setUserGroupFilter;
-        vm.setOrderByFilter = setOrderByFilter;
-        vm.changePageNumber = changePageNumber;
-        vm.createUser = createUser;
-        vm.inviteUser = inviteUser;
-        vm.getSortLabel = getSortLabel;
-        vm.toggleNewUserPassword = toggleNewUserPassword;
-        vm.copySuccess = copySuccess;
-        vm.copyError = copyError;
-        vm.goToUser = goToUser;
-
-        function init() {
-
-            initViewOptions();
-
-            if ($routeParams.create) {
-                setUsersViewState("createUser");
-            }
-            else if ($routeParams.invite) {
-                setUsersViewState("inviteUser");
-            }
-
-            // Get users
-            getUsers();
-
-            // Get user groups
-            userGroupsResource.getUserGroups({ onlyCurrentUserGroups: false }).then(function (userGroups) {
-                vm.userGroups = userGroups;
-                initUserGroupSelections();
-            });
-
-        }
-
-        function initViewOptions() {
-
-            // Start with default view options.
-            vm.usersOptions.filter = "";
-            vm.usersOptions.orderBy = "Name";
-            vm.usersOptions.orderDirection = "Ascending";
-
-            // Update from querystring if available.
-            initViewOptionFromQueryString("filter");
-            initViewOptionFromQueryString("orderBy");
-            initViewOptionFromQueryString("orderDirection");
-            initViewOptionFromQueryString("pageNumber");
-            initViewOptionFromQueryString("userStates", true);
-            initViewOptionFromQueryString("userGroups", true);
-        }
-
-        function initViewOptionFromQueryString(key, isCollection) {
-            var value = $location.search()[key];
-            if (value) {
-                if (isCollection) {
-                    value = value.split(",");
-                }
-
-                vm.usersOptions[key] = value;
-            }
-        }
-
-        function initUserStateSelections() {
-            if (!vm.usersOptions.userStates && vm.userStatesFilter) {
-                  // create a new empty userStates array
-                  vm.usersOptions.userStates = [];
-
-                  // add selected userStatesFilters to usersOptions.userStates array
-                  for (var i = 0; i < vm.userStatesFilter.length; i++) {
-                      if (vm.userStatesFilter[i].selected) {
-                        vm.usersOptions.userStates.push(vm.userStatesFilter[i].key);
-                      }
-                  }
-
-                  // If there are any selected userStates, update location and change pagenumber
-                  if (vm.usersOptions.userStates.length > 0) {
-                      updateLocation("userStates", vm.usersOptions.userStates.join(","));
-                      changePageNumber(1);
-                  }
-              }
-        }
-
-        function initUserGroupSelections() {
-            initUsersOptionsFilterSelections(vm.userGroups, vm.usersOptions.userGroups, "alias");
-        }
-
-        function initUsersOptionsFilterSelections(filterCollection, selectedCollection, keyField) {
-            if (selectedCollection && selectedCollection.length > 0 && filterCollection && filterCollection.length > 0) {
-                for (var i = 0; i < selectedCollection.length; i++) {
-                    for (var j = 0; j < filterCollection.length; j++) {
-                        if (filterCollection[j][keyField] === selectedCollection[i]) {
-                            filterCollection[j].selected = true;
-                        }
-                    }
-                }
-            }
-        }
-
-        function getSortLabel(sortKey, sortDirection) {
-            var found = _.find(vm.userSortData,
-                function (i) {
-                    return i.key === sortKey && i.direction === sortDirection;
-                });
-            return found ? found.label : sortKey;
-        }
-
-        function toggleFilter(type) {
-            // hack: on-outside-click prevents us from closing the dropdown when clicking on another link
-            // so I had to do this manually
-            switch (type) {
-                case "state":
-                    vm.page.showStatusFilter = !vm.page.showStatusFilter;
-                    vm.page.showGroupFilter = false;
-                    vm.page.showOrderByFilter = false;
-                    break;
-                case "group":
-                    vm.page.showGroupFilter = !vm.page.showGroupFilter;
-                    vm.page.showStatusFilter = false;
-                    vm.page.showOrderByFilter = false;
-                    break;
-                case "orderBy":
-                    vm.page.showOrderByFilter = !vm.page.showOrderByFilter;
-                    vm.page.showStatusFilter = false;
-                    vm.page.showGroupFilter = false;
-                    break;
-            }
-        }
-
-        function setUsersViewState(state) {
-
-            if (state === "createUser") {
-                clearAddUserForm();
-
-                $location.search("create", "true");
-                $location.search("invite", null);
-            }
-            else if (state === "inviteUser") {
-                clearAddUserForm();
-
-                $location.search("create", null);
-                $location.search("invite", "true");
-            }
-            else if (state === "overview") {
-                $location.search("create", null);
-                $location.search("invite", null);
-            }
-
-            vm.usersViewState = state;
-        }
-
-        function selectLayout(selectedLayout) {
-            // save the selected layout for "users" so it's applied next time the user visits this section
-            vm.activeLayout = listViewHelper.setLayout("users", selectedLayout, vm.layouts);
-        }
-
-        function isSelectable(user) {
-            return !user.isCurrentUser;
-        }
-
-        function selectUser(user) {
-
-            if (!isSelectable(user)) {
-                return;
-            }
-
-            if (user.selected) {
-                var index = vm.selection.indexOf(user.id);
-                vm.selection.splice(index, 1);
-                user.selected = false;
-            } else {
-                user.selected = true;
-                vm.selection.push(user.id);
-            }
-
-            setBulkActions(vm.users);
-
-        }
-
-        function clearSelection() {
-            vm.users.forEach(function (user) {
-                user.selected = false;
-            });
-            vm.selection = [];
-        }
-
-        function clickUser(user, $event) {
-
-            $event.stopPropagation();
-
-            if ($event) {
-                // targeting a new tab/window?
-                if ($event.ctrlKey ||
-                    $event.shiftKey ||
-                    $event.metaKey || // apple
-                    ($event.button && $event.button === 1) // middle click, >IE9 + everyone else
-                ) {
-                    // yes, let the link open itself
-                    return;
-                }
-            }
-
-            goToUser(user);
-            $event.preventDefault();
-
-        }
-
-        function disableUsers() {
-            vm.disableUserButtonState = "busy";
-            usersResource.disableUsers(vm.selection).then(function (data) {
-                // update userState
-                data.disabledUserIds.forEach(function (userId) {
-                    var user = getUserFromArrayById(userId, vm.users);
-                    if (user) {
-                        user.userState = "Disabled";
-                    }
-                });
-                // show the correct badges
-                setUserDisplayState(vm.users);
-
-                vm.disableUserButtonState = "init";
-                clearSelection();
-
-            }, function (error) {
-                vm.disableUserButtonState = "error";
-            });
-        }
-
-        function enableUsers() {
-            vm.enableUserButtonState = "busy";
-            usersResource.enableUsers(vm.selection).then(function (data) {
-                // update userState
-                vm.selection.forEach(function (userId) {
-                    var user = getUserFromArrayById(userId, vm.users);
-                    if (user) {
-                        user.userState = "Active";
-                    }
-                });
-                // show the correct badges
-                setUserDisplayState(vm.users);
-                vm.enableUserButtonState = "init";
-                clearSelection();
-            }, function (error) {
-                vm.enableUserButtonState = "error";
-            });
-        }
-
-        function unlockUsers() {
-            vm.unlockUserButtonState = "busy";
-            usersResource.unlockUsers(vm.selection).then(function (data) {
-                // update userState
-                vm.selection.forEach(function (userId) {
-                    var user = getUserFromArrayById(userId, vm.users);
-                    if (user) {
-                        user.userState = "Active";
-                    }
-                });
-                // show the correct badges
-                setUserDisplayState(vm.users);
-                vm.unlockUserButtonState = "init";
-                clearSelection();
-            }, function (error) {
-                vm.unlockUserButtonState = "error";
-            });
-        }
-
-        function getUserFromArrayById(userId, users) {
-            return _.find(users, function (u) { return u.id === userId });
-        }
-
-        function openBulkUserGroupPicker() {
-            var firstSelectedUser = getUserFromArrayById(vm.selection[0], vm.users);
-
-            vm.selectedBulkUserGroups = _.clone(firstSelectedUser.userGroups);
-
-            var userGroupPicker = {
-                selection: vm.selectedBulkUserGroups,
-                submit: function (model) {
-                    usersResource.setUserGroupsOnUsers(model.selection, vm.selection).then(function (data) {
-                        // sorting to ensure they show up in right order when updating the UI
-                        vm.selectedBulkUserGroups.sort(function (a, b) {
-                            return a.alias > b.alias ? 1 : a.alias < b.alias ? -1 : 0;
-                        });
-                        // apply changes to UI
-                        _.each(vm.selection,
-                            function (userId) {
-                                var user = getUserFromArrayById(userId, vm.users);
-                                user.userGroups = vm.selectedBulkUserGroups;
-                            });
-                        vm.selectedBulkUserGroups = [];
-                        editorService.close();
-                        clearSelection();
-                    }, Utilities.noop);
-                },
-                close: function () {
-                    vm.selectedBulkUserGroups = [];
-                    editorService.close();
-                }
-            };
-            editorService.userGroupPicker(userGroupPicker);
-        }
-
-        function openUserGroupPicker() {
-            var currentSelection = [];
-            Utilities.copy(vm.newUser.userGroups, currentSelection);
-            var userGroupPicker = {
-                selection: currentSelection,
-                submit: function (model) {
-                    // apply changes
-                    if (model.selection) {
-                        vm.newUser.userGroups = model.selection;
-                    }
-                    editorService.close();
-                },
-                close: function () {
-                    // rollback on close
-                    editorService.close();
-                }
-            };
-            editorService.userGroupPicker(userGroupPicker);
-        }
-
-        function removeSelectedUserGroup(index, selection) {
-            selection.splice(index, 1);
-        }
-
-        function selectAll() {
-            if (areAllSelected()) {
-                vm.selection = [];
-                vm.users.forEach(function (user) {
-                    user.selected = false;
-                });
-            } else {
-                // clear selection so we don't add the same user twice
-                vm.selection = [];
-                // select all users
-                vm.users.forEach(function (user) {
-                    // prevent the current user to be selected
-                    if (!user.isCurrentUser) {
-                        user.selected = true;
-                        vm.selection.push(user.id);
-                    }
-                });
-            }
-        }
-
-        function areAllSelected() {
-            // we need to check if the current user is part of the selection and
-            // subtract the user from the total selection to find out if all users are selected
-            var includesCurrentUser = vm.users.some(function (user) { return user.isCurrentUser === true; });
-
-            if (includesCurrentUser) {
-                if (vm.selection.length === vm.users.length - 1) { return true; }
-            } else {
-                if (vm.selection.length === vm.users.length) { return true; }
-            }
-        }
-
-        var search = _.debounce(function () {
-            $scope.$apply(function () {
-                vm.usersOptions.pageNumber = 1;
-                getUsers();
-            });
-        }, 500);
-
-        function searchUsers() {
-            search();
-        }
-
-        function onBlurSearch() {
-            updateLocation("filter", vm.usersOptions.filter);
-        }
-
-        function getFilterName(array) {
-            var name = vm.labels.all;
-            var found = false;
-            array.forEach(function (item) {
-                if (item.selected) {
-                    if (!found) {
-                        name = item.name
-                        found = true;
-                    } else {
-                        name = name + ", " + item.name;
-                    }
-                }
-            });
-            return name;
-        }
-
-        function setUserStatesFilter(userState) {
-
-            if (!vm.usersOptions.userStates) {
-                vm.usersOptions.userStates = [];
-            }
-
-            //If the selection is "ALL" then we need to unselect everything else since this is an 'odd' filter
-            if (userState.key === "All") {
-                vm.userStatesFilter.forEach(function (i) {
-                    i.selected = false;
-                });
-                //we can't unselect All
-                userState.selected = true;
-                //reset the selection passed to the server
-                vm.usersOptions.userStates = [];
-            }
-            else {
-                vm.userStatesFilter.forEach(function (i) {
-                    if (i.key === "All") {
-                        i.selected = false;
-                    }
-                });
-                var indexOfAll = vm.usersOptions.userStates.indexOf("All");
-                if (indexOfAll >= 0) {
-                    vm.usersOptions.userStates.splice(indexOfAll, 1);
-                }
-            }
-
-            if (userState.selected) {
-                vm.usersOptions.userStates.push(userState.key);
-            }
-            else {
-                var index = vm.usersOptions.userStates.indexOf(userState.key);
-                vm.usersOptions.userStates.splice(index, 1);
-            }
-
-            updateLocation("userStates", vm.usersOptions.userStates.join(","));
-            changePageNumber(1);
-        }
-
-        function setUserGroupFilter(userGroup) {
-
-            if (!vm.usersOptions.userGroups) {
-                vm.usersOptions.userGroups = [];
-            }
-
-            if (userGroup.selected) {
-                vm.usersOptions.userGroups.push(userGroup.alias);
-            } else {
-                var index = vm.usersOptions.userGroups.indexOf(userGroup.alias);
-                vm.usersOptions.userGroups.splice(index, 1);
-            }
-
-            updateLocation("userGroups", vm.usersOptions.userGroups.join(","));
-            changePageNumber(1);
-        }
-
-        function setOrderByFilter(value, direction) {
-            vm.usersOptions.orderBy = value;
-            vm.usersOptions.orderDirection = direction;
-            updateLocation("orderBy", value);
-            updateLocation("orderDirection", direction);
-            getUsers();
-        }
-
-        function changePageNumber(pageNumber) {
-            vm.usersOptions.pageNumber = pageNumber;
-            updateLocation("pageNumber", pageNumber);
-            getUsers();
-        }
-
-        function updateLocation(key, value) {
-            $location.search("filter", vm.usersOptions.filter);// update filter, but first when something else requests a url update.
-            $location.search(key, value);
-        }
-
-        function createUser(addUserForm) {
-
-            if (formHelper.submitForm({ formCtrl: addUserForm, scope: $scope })) {
-
-                vm.newUser.id = -1;
-                vm.newUser.parentId = -1;
-                vm.page.createButtonState = "busy";
-
-                usersResource.createUser(vm.newUser)
-                    .then(function (saved) {
-                        vm.page.createButtonState = "success";
-                        vm.newUser = saved;
-                        setUsersViewState('createUserSuccess');
-                        getUsers();
-                    }, function (err) {
-                        formHelper.handleError(err);
-                        vm.page.createButtonState = "error";
-                    });
-            }
-
-        }
-
-        function inviteUser(addUserForm) {
-
-            if (formHelper.submitForm({ formCtrl: addUserForm, scope: $scope })) {
-                vm.newUser.id = -1;
-                vm.newUser.parentId = -1;
-                vm.page.createButtonState = "busy";
-
-                usersResource.inviteUser(vm.newUser)
-                    .then(function (saved) {
-                        //success
-                        vm.page.createButtonState = "success";
-                        vm.newUser = saved;
-                        setUsersViewState('inviteUserSuccess');
-                        getUsers();
-                    }, function (err) {
-                        //error
-                        formHelper.handleError(err);
-                        vm.page.createButtonState = "error";
-                    });
-            }
-
-        }
-
-        function toggleNewUserPassword() {
-            vm.newUser.showPassword = !vm.newUser.showPassword;
-        }
-
-        // copy to clip board success
-        function copySuccess() {
-            if (vm.page.copyPasswordButtonState !== "success") {
-                $timeout(function () {
-                    vm.page.copyPasswordButtonState = "success";
-                });
-                $timeout(function () {
-                    resetClipboardButtonState();
-                }, 1000);
-            }
-        }
-
-        // copy to clip board error
-        function copyError() {
-            if (vm.page.copyPasswordButtonState !== "error") {
-                $timeout(function () {
-                    vm.page.copyPasswordButtonState = "error";
-                });
-                $timeout(function () {
-                    resetClipboardButtonState();
-                }, 1000);
-            }
-        }
-
-        function resetClipboardButtonState() {
-            vm.page.copyPasswordButtonState = "init";
-        }
-
-        function goToUser(user) {
-            $location.path(pathToUser(user))
-                .search("orderBy", vm.usersOptions.orderBy)
-                .search("orderDirection", vm.usersOptions.orderDirection)
-                .search("pageNumber", vm.usersOptions.pageNumber)
-                .search("userStates", getUsersOptionsFilterCollectionAsDelimitedStringOrNull(vm.usersOptions.userStates))
-                .search("userGroups", getUsersOptionsFilterCollectionAsDelimitedStringOrNull(vm.usersOptions.userGroups))
-                .search("create", null)
-                .search("invite", null);
-        }
-
-        function getUsersOptionsFilterCollectionAsDelimitedStringOrNull(collection) {
-            if (collection && collection.length > 0) {
-                return collection.join(",");
-            }
-
-            return null;
-        }
-
-        function getEditPath(user) {
-            return pathToUser(user) + usersOptionsAsQueryString();
-        }
-
-        function pathToUser(user) {
-            return "/users/users/user/" + user.id;
-        }
-
-        function usersOptionsAsQueryString() {
-            var qs = "?orderBy=" + vm.usersOptions.orderBy +
-                "&orderDirection=" + vm.usersOptions.orderDirection +
-                "&pageNumber=" + vm.usersOptions.pageNumber +
-                "&filter=" + vm.usersOptions.filter;
-
-            qs += addUsersOptionsFilterCollectionToQueryString("userStates", vm.usersOptions.userStates);
-            qs += addUsersOptionsFilterCollectionToQueryString("userGroups", vm.usersOptions.userGroups);
-
-            qs += "&mculture=" + $location.search().mculture;
-
-            return qs;
-        }
-
-        function addUsersOptionsFilterCollectionToQueryString(name, collection) {
-            if (collection && collection.length > 0) {
-                return "&" + name + "=" + collection.join(",");
-            }
-
-            return "";
-        }
-
-        // helpers
-        function getUsers() {
-
-            vm.loading = true;
-
-            // Get users
-            usersResource.getPagedResults(vm.usersOptions).then(function (data) {
-
-                vm.users = data.items;
-
-                vm.usersOptions.pageNumber = data.pageNumber;
-                vm.usersOptions.pageSize = data.pageSize;
-                vm.usersOptions.totalItems = data.totalItems;
-                vm.usersOptions.totalPages = data.totalPages;
-
-                formatDates(vm.users);
-                setUserDisplayState(vm.users);
-                vm.userStatesFilter = usersHelper.getUserStatesFilter(data.userStates);
-                initUserStateSelections();
-
-                vm.loading = false;
-
-            }, function (error) {
-
-                vm.loading = false;
-
-            });
-        }
-
-        function setUserDisplayState(users) {
-            users.forEach(function (user) {
-                user.userDisplayState =  usersHelper.getUserStateByKey(user.userState);
-            });
-        }
-
-        function formatDates(users) {
-            users.forEach(function (user) {
-                if (user.lastLoginDate) {
-                    var dateVal;
-                    var serverOffset = Umbraco.Sys.ServerVariables.application.serverTimeOffset;
-                    var localOffset = new Date().getTimezoneOffset();
-                    var serverTimeNeedsOffsetting = (-serverOffset !== localOffset);
-
-                    if (serverTimeNeedsOffsetting) {
-                        dateVal = dateHelper.convertToLocalMomentTime(user.lastLoginDate, serverOffset);
-                    } else {
-                        dateVal = moment(user.lastLoginDate, "YYYY-MM-DD HH:mm:ss");
-                    }
-
-                    // get current backoffice user and format date
-                    userService.getCurrentUser().then(function (currentUser) {
-                        user.formattedLastLogin = dateVal.locale(currentUser.locale).format("LLL");
-                    });
-                }
-            });
-        }
-
-        function setBulkActions(users) {
-
-            // reset all states
-            vm.allowDisableUser = true;
-            vm.allowEnableUser = true;
-            vm.allowUnlockUser = true;
-            vm.allowSetUserGroup = true;
-
-            var firstSelectedUserGroups;
-
-            users.forEach(function (user) {
-
-                if (!user.selected) {
-                    return;
-                }
-
-
-                // if the current user is selected prevent any bulk actions with the user included
-                if (user.isCurrentUser) {
-                    vm.allowDisableUser = false;
-                    vm.allowEnableUser = false;
-                    vm.allowUnlockUser = false;
-                    vm.allowSetUserGroup = false;
-
-                    return false;
-                }
-
-                if (user.userDisplayState && user.userDisplayState.key === "Disabled") {
-                    vm.allowDisableUser = false;
-                }
-
-                if (user.userDisplayState && user.userDisplayState.key === "Active") {
-                    vm.allowEnableUser = false;
-                }
-
-                if (user.userDisplayState && user.userDisplayState.key === "Invited") {
-                    vm.allowEnableUser = false;
-                    vm.allowDisableUser = false;
-                }
-
-                if (user.userDisplayState && user.userDisplayState.key === "LockedOut") {
-                    vm.allowEnableUser = false;
-                }
-
-                if (user.userDisplayState && user.userDisplayState.key !== "LockedOut") {
-                    vm.allowUnlockUser = false;
-                }
-
-                // store the user group aliases of the first selected user
-                if (vm.allowSetUserGroup === true) {
-                    if (!firstSelectedUserGroups) {
-                        firstSelectedUserGroups = user.userGroups.map(function (ug) { return ug.alias; });
-                    } else {
-                        // for 2nd+ selected user, compare the user group aliases to determine if we should allow bulk editing.
-                        // we don't allow bulk editing of users not currently having the same assigned user groups, as we can't
-                        // really support that in the user group picker.
-                        var userGroups = user.userGroups.map(function (ug) { return ug.alias; });
-                        if (_.difference(firstSelectedUserGroups, userGroups).length > 0) {
-                            vm.allowSetUserGroup = false;
-                        }
-                    }
-                }
-            });
-        }
-
-        function clearAddUserForm() {
-            // clear form data
-            vm.newUser.name = "";
-            vm.newUser.email = "";
-            vm.newUser.userGroups = [];
-            vm.newUser.message = "";
-            // clear button state
-            vm.page.createButtonState = "init";
-            $scope.$emit("$setAccessibleHeader", true, "general_user", false, "", "", true);
-        }
-
-        init();
-
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Users.UsersController", UsersController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
deleted file mode 100644
index acf86263e3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ /dev/null
@@ -1,550 +0,0 @@
-<div ng-controller="Umbraco.Editors.Users.UsersController as vm" class="clearfix">
-
-    <!-- Users Overview -->
-    <div ng-if="vm.usersViewState === 'overview'">
-
-        <umb-load-indicator ng-show="vm.loading"></umb-load-indicator>
-
-        <umb-editor-sub-header ng-class="{'--state-selection':(vm.selection.length > 0)}">
-
-            <!-- No selection -->
-            <umb-editor-sub-header-content-left ng-if="vm.selection.length === 0">
-                <umb-button-group
-                    ng-if="vm.defaultButton"
-                    button-style="outline"
-                    default-button="vm.defaultButton"
-                    sub-buttons="vm.subButtons">
-                </umb-button-group>
-            </umb-editor-sub-header-content-left>
-
-            <umb-editor-sub-header-content-right ng-if="vm.selection.length === 0">
-                <umb-editor-sub-header-section>
-                    <umb-layout-selector
-                        ng-if="vm.layouts"
-                        layouts="vm.layouts"
-                        active-layout="vm.activeLayout"
-                        on-layout-select="vm.selectLayout(layout)">
-                    </umb-layout-selector>
-                </umb-editor-sub-header-section>
-                <umb-editor-sub-header-section>
-
-                    <umb-mini-search model="vm.usersOptions.filter" on-search="vm.searchUsers()" on-blur="vm.onBlurSearch()">
-                    </umb-mini-search>
-
-                </umb-editor-sub-header-section>
-            </umb-editor-sub-header-content-right>
-
-            <!-- With selection -->
-            <umb-editor-sub-header-content-left ng-if="vm.selection.length > 0">
-                <umb-editor-sub-header-section>
-                    <umb-button
-                        type="button"
-                        button-style="white"
-                        label-key="buttons_clearSelection"
-                        action="vm.clearSelection()"
-                        disabled="actionInProgress">
-                    </umb-button>
-                </umb-editor-sub-header-section>
-                <umb-editor-sub-header-section>
-                    <strong>{{ vm.selection.length }} <localize key="general_of">of</localize> {{ vm.users.length }} <localize key="general_selected">selected</localize></strong>
-                </umb-editor-sub-header-section>
-
-            </umb-editor-sub-header-content-left>
-
-            <umb-editor-sub-header-content-right ng-if="vm.selection.length > 0">
-                <umb-button
-                    style="margin-right: 5px;"
-                    disabled="!vm.allowSetUserGroup"
-                    type="button"
-                    size="xs"
-                    button-style="white"
-                    label-key="actions_setGroup"
-                    icon="icon-users"
-                    action="vm.openBulkUserGroupPicker()">
-                </umb-button>
-
-                <umb-button
-                    style="margin-right: 5px;"
-                    disabled="!vm.allowEnableUser"
-                    type="button"
-                    size="xs"
-                    button-style="white"
-                    state="vm.enableUserButtonState"
-                    label-key="actions_enable"
-                    icon="icon-check"
-                    action="vm.enableUsers()">
-                </umb-button>
-
-                <umb-button
-                    style="margin-right: 5px;"
-                    disabled="!vm.allowUnlockUser"
-                    type="button"
-                    size="xs"
-                    button-style="white"
-                    state="vm.unlockUserButtonState"
-                    label-key="actions_unlock"
-                    icon="icon-unlocked"
-                    action="vm.unlockUsers()">
-                </umb-button>
-
-                <umb-button
-                    disabled="!vm.allowDisableUser"
-                    type="button"
-                    size="xs"
-                    button-style="white"
-                    state="vm.disableUserButtonState"
-                    label-key="actions_disable"
-                    icon="icon-block"
-                    action="vm.disableUsers()">
-                </umb-button>
-
-            </umb-editor-sub-header-content-right>
-
-        </umb-editor-sub-header>
-
-        <!-- Filters -->
-        <div class="flex items-center mb3">
-
-            <div style="font-size: 16px;">
-                <span class="bold"><localize key="sections_users">Users</localize></span> <span ng-if="vm.usersOptions.totalItems">({{vm.usersOptions.totalItems}})</span>
-            </div>
-
-            <div class="flex ml-auto">
-                <!-- State filter -->
-                <div class="umb-filter" ng-if="vm.userStatesFilter.length > 0">
-                    <button type="button" class="btn btn-link dropdown-toggle umb-filter__toggle" ng-click="vm.toggleFilter('state')">
-                        <span><localize key="general_status">Status</localize>:</span>
-                        <span class="bold truncate dib umb-filter__label">{{ vm.getFilterName(vm.userStatesFilter) }}</span>
-                        <span class="caret" aria-hidden="true"></span>
-                    </button>
-                    <umb-dropdown class="pull-right" ng-if="vm.page.showStatusFilter" on-close="vm.page.showStatusFilter = false;">
-                        <umb-dropdown-item ng-repeat="userState in vm.userStatesFilter | filter:{ key: '!All'}" ng-show="userState.count > 0" style="padding: 8px 20px 8px 16px;">
-                            <div class="flex items-center">
-                                <umb-checkbox input-id="userstate-{{$index}}"
-                                              name="userstate"
-                                              model="userState.selected"
-                                              on-change="vm.setUserStatesFilter(userState)">
-                                </umb-checkbox>
-                                <label for="userstate-{{$index}}">
-                                    <umb-badge size="s" color="{{userState.color}}">{{userState.name}} <span class="ml1 umb-badge__count">{{userState.count}}</span></umb-badge>
-                                </label>
-                            </div>
-                        </umb-dropdown-item>
-                    </umb-dropdown>
-                </div>
-
-                <!-- Groups filter -->
-                <div class="umb-filter">
-                    <button type="button" class="btn btn-link dropdown-toggle umb-filter__toggle" ng-click="vm.toggleFilter('group')">
-                        <span><localize key="general_groups">Groups</localize>:</span>
-                        <span class="bold truncate dib umb-filter__label">{{ vm.getFilterName(vm.userGroups) }}</span>
-                        <span class="caret" aria-hidden="true"></span>
-                    </button>
-                    <umb-dropdown class="pull-right" ng-if="vm.page.showGroupFilter" on-close="vm.page.showGroupFilter = false;">
-                        <umb-dropdown-item ng-repeat="userGroup in vm.userGroups" style="padding: 8px 20px 8px 16px;">
-                            <div class="flex items-center">
-                                <umb-checkbox input-id="usergroup-{{$index}}"
-                                              name="usergroup"
-                                              model="userGroup.selected"
-                                              on-change="vm.setUserGroupFilter(userGroup)">
-                                </umb-checkbox>
-                                <label for="usergroup-{{$index}}">
-                                    <span class="flex items-center">
-                                        <umb-icon icon="{{userGroup.icon}}"></umb-icon>
-                                        <span class="ml1">{{userGroup.name}}</span>
-                                    </span>
-                                </label>
-                            </div>
-                        </umb-dropdown-item>
-                    </umb-dropdown>
-                </div>
-
-                <!-- Order By -->
-                <div class="umb-filter">
-                    <button type="button" class="btn btn-link dropdown-toggle umb-filter__toggle" ng-click="vm.toggleFilter('orderBy')">
-                        <span><localize key="general_orderBy">Order by</localize>:</span>
-                        <span class="bold truncate dib umb-filter__label">{{ vm.getSortLabel(vm.usersOptions.orderBy, vm.usersOptions.orderDirection) }} </span>
-                        <span class="caret" aria-hidden="true"></span>
-                    </button>
-                    <umb-dropdown class="pull-right" ng-if="vm.page.showOrderByFilter" on-close="vm.page.showOrderByFilter = false;" umb-keyboard-list>
-                        <umb-dropdown-item ng-repeat="sortData in vm.userSortData">
-                            <button type="button" ng-click="vm.setOrderByFilter(sortData.key, sortData.direction)">{{sortData.label}}</button>
-                        </umb-dropdown-item>
-                    </umb-dropdown>
-                </div>
-
-            </div>
-
-        </div>
-
-        <!-- Empty states -->
-        <umb-empty-state
-            ng-if="!vm.loading && !vm.users.length && vm.usersOptions.filter.length > 0"
-            position="center">
-            <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
-        </umb-empty-state>
-
-        <!-- Layout: Cards -->
-        <div class="umb-user-cards" ng-if="vm.activeLayout.path === '1' && vm.loading === false">
-            <div class="umb-user-card umb-outline umb-outline--surrounding" ng-class="{'-selected': user.selected, '-selectable': vm.isSelectable(user)}" ng-repeat="user in vm.users track by user.key" ng-click="vm.selectUser(user, $event)">
-                <div class="umb-user-card__content">
-                    <umb-badge class="umb-user-card__badge" size="xs" ng-if="user.userDisplayState.key !== 'Active'" color="{{user.userDisplayState.color}}">
-                        {{ user.userDisplayState.name }}
-                    </umb-badge>
-                    <a class="umb-user-card__goToUser" ng-click="vm.clickUser(user, $event)" ng-href="#{{::vm.getEditPath(user)}}">
-                        <div class="umb-user-card__avatar">
-                            <umb-avatar size="l" color="secondary" name="{{user.name}}" img-src="{{user.avatars[2]}}" img-srcset="{{user.avatars[3]}} 2x, {{user.avatars[4]}} 3x">
-                            </umb-avatar>
-                        </div>
-                        <div class="umb-user-card__name">{{user.name}}</div>
-                    </a>
-                    <div class="umb-user-card__group">
-                        <span ng-repeat="userGroup in user.userGroups">{{ userGroup.name }}<span ng-if="!$last">, </span></span>
-                    </div>
-                    <div class="umb-user-card__last-login">
-                        <div ng-if="user.formattedLastLogin">
-                            <div>
-                                <localize key="user_lastLogin">Last login</localize>
-                            </div>
-                            {{ user.formattedLastLogin }}
-                        </div>
-                        <div ng-if="!user.formattedLastLogin">
-                            <div>{{ user.name | umbWordLimit:1 }}
-                                <localize key="user_noLogin">has not logged in yet</localize>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <!-- Layout: Table -->
-        <div ng-if="vm.activeLayout.path === '2'">
-
-            <div class="umb-table umb-user-table" ng-class="{'-has-selection': vm.selection.length > 0}">
-                <div class="umb-table-head">
-                    <div class="umb-table-row">
-                        <div class="umb-table-cell umb-user-table-col-avatar not-fixed" style="width: 70px; padding:10px 15px;">
-                            <button type="button" class="btn-reset umb-checkmark__action" style="outline: none;" ng-click="vm.selectAll()">
-                                <umb-checkmark checked="vm.areAllSelected()" size="xs"></umb-checkmark>
-                            </button>
-                        </div>
-                        <div class="umb-table-cell umb-table__name"><localize key="general_name">Name</localize></div>
-                        <div class="umb-table-cell"><localize key="user_usergroup">User group</localize></div>
-                        <div class="umb-table-cell"><localize key="user_lastLogin">Last login</localize></div>
-                        <div class="umb-table-cell"><localize key="general_status">Status</localize></div>
-                    </div>
-                </div>
-                <div class="umb-table-body">
-                    <div ng-repeat="user in vm.users track by user.key"
-                        ng-click="vm.selectUser(user, vm.selection, $event)"
-                        ng-class="{'-selected': user.selected, '-selectable': vm.isSelectable(user)}"
-                        class="umb-table-row umb-user-table-row umb-outline umb-outline--surrounding">
-                        <div class="umb-table-cell umb-user-table-col-avatar not-fixed" scope="row" style="width: 70px; padding:10px 15px;">
-                            <a ng-click="vm.clickUser(user, $event)" ng-href="#{{::vm.getEditPath(user)}}">
-                                <umb-avatar
-                                    size="xs"
-                                    color="secondary"
-                                    name="{{user.name}}"
-                                    img-src="{{user.avatars[0]}}"
-                                    img-srcset="{{user.avatars[1]}} 2x, {{user.avatars[2]}} 3x">
-                                </umb-avatar>
-                            </a>
-                        </div>
-                        <div class="umb-table-cell umb-table__name">
-                            <a class="umb-table-body__link"
-                               ng-click="vm.clickUser(user, $event)"
-                               ng-href="#{{::vm.getEditPath(user)}}"
-                               ng-bind="user.name">
-                            </a>
-                        </div>
-                        <div class="umb-table-cell"><div><span ng-repeat="userGroup in user.userGroups">{{ userGroup.name }}<span ng-if="!$last">, </span></span></div></div>
-                        <div class="umb-table-cell">{{ user.formattedLastLogin }}</div>
-                        <div class="umb-table-cell" style="text-transform: capitalize;">
-                            <umb-badge
-                                size="xs"
-                                ng-if="user.userDisplayState.key !== 'Active'"
-                                color="{{user.userDisplayState.color}}">
-                                {{ user.userDisplayState.name }}
-                            </umb-badge>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-
-        <!-- Pagination -->
-        <div ng-if="!vm.loading" class="flex justify-center">
-            <umb-pagination
-                ng-if="vm.usersOptions.totalPages"
-                page-number="vm.usersOptions.pageNumber"
-                total-pages="vm.usersOptions.totalPages"
-                on-change="vm.changePageNumber(pageNumber)">
-            </umb-pagination>
-        </div>
-
-    </div>
-
-    <!-- Add user -->
-    <div ng-if="vm.usersViewState === 'inviteUser' || vm.usersViewState === 'createUser'">
-
-        <umb-editor-sub-header>
-            <umb-editor-sub-header-content-left>
-                <button type="button" class="umb-package-details__back-action" ng-click="vm.setUsersViewState('overview');"><span aria-hidden="true">&larr;</span> <localize key="user_backToUsers">Back to users</localize></button>
-            </umb-editor-sub-header-content-left>
-        </umb-editor-sub-header>
-
-        <div class="flex justify-center">
-            <umb-box style="max-width: 600px;">
-                <umb-box-content>
-                    <form name="addUserForm" no-validate val-form-manager class="block-form">
-                        <div>
-                            <div ng-if="vm.usersViewState === 'inviteUser'">
-                                <h3 class="bold" style="margin-bottom: 0;">
-                                    <localize key="user_inviteUser">Invite User</localize>
-                                </h3>
-                                <p style="line-height: 1.6em; margin-bottom: 15px;">
-                                    <localize key="user_inviteUserHelp">Invite new users to give them access to Umbraco. An invite email will be sent to the user with information on how to log in to Umbraco. Invites last for 72 hours.</localize>
-                                </p>
-                            </div>
-                            <div ng-if="vm.usersViewState === 'createUser'">
-                                <h2 class="h3 bold" style="margin-bottom: 0;">
-                                    <localize key="user_createUser">Create user</localize>
-                                </h2>
-                                <p style="line-height: 1.6em; margin-bottom: 15px;">
-                                    <localize key="user_createUserHelp">Create new users to give them access to Umbraco. When a new user is created a password will be generated that you can share with the user.</localize>
-                                </p>
-                            </div>
-                        </div>
-
-                        <umb-control-group label="@general_name" label-for="name" required="true">
-                            <input type="text" name="name" id="name" localize="placeholder" placeholder="@placeholders_entername" class="input-block-level" ng-model="vm.newUser.name"
-                                   umb-auto-focus required val-server-field="Name" />
-                            <span ng-messages="addUserForm.name.$error" show-validation-on-submit>
-                              <span class="help-inline" ng-message="required"><localize key="user_nameRequired">Required</localize></span>
-                              <span class="help-inline" ng-message="valServerField">{{addUserForm.name.errorMsg}}</span>
-                            </span>
-
-                        </umb-control-group>
-
-                        <umb-control-group label="@general_username" label-for="username" required="true" ng-if="!vm.usernameIsEmail">
-                            <input type="text" name="username" id="username" localize="placeholder" placeholder="@placeholders_enterusername" class="input-block-level"
-                                   ng-model="vm.newUser.username" val-server-field="Username" ng-required="vm.usernameIsEmail" />
-                            <span ng-messages="addUserForm.username.$error" show-validation-on-submit >
-                                <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
-                                <span class="help-inline" ng-message="valServerField">{{addUserForm.username.errorMsg}}</span>
-                            </span>
-
-                        </umb-control-group>
-
-                        <umb-control-group label="@general_email" label-for="email" required="true">
-                            <input type="email" name="email" id="email" localize="placeholder" placeholder="@placeholders_enteremail" class="input-block-level"
-                                   ng-model="vm.newUser.email" required val-email val-server-field="Email" />
-                            <span ng-messages="addUserForm.email.$error" show-validation-on-submit>
-                              <span class="help-inline" ng-message="required"><localize key="user_emailRequired">Required</localize></span>
-                              <span class="help-inline" ng-message="valEmail"><localize key="validation_invalidEmail">Invalid email</localize></span>
-                              <span class="help-inline" ng-message="valServerField">{{addUserForm.email.errorMsg}}</span>
-                            </span>
-                        </umb-control-group>
-
-                        <umb-control-group label="@user_usergroup" description="@user_groupsHelp" required="true">
-
-                            <umb-user-group-preview
-                                ng-repeat="group in vm.newUser.userGroups"
-                                icon="group.icon"
-                                name="group.name"
-                                sections="group.sections"
-                                content-start-node="group.contentStartNode"
-                                media-start-node="group.mediaStartNode"
-                                allow-remove="true"
-                                on-remove="vm.removeSelectedUserGroup($index, vm.newUser.userGroups)">
-                            </umb-user-group-preview>
-
-                            <button type="button" style="max-width: 100%;" class="btn-reset umb-node-preview-add" ng-click="vm.openUserGroupPicker($event)">
-                                <localize key="general_add">Add</localize>
-                            </button>
-
-                            <input type="hidden" ng-model="vm.newUser.userGroupsValidation" ng-required="!vm.newUser.userGroups.length" />
-
-                        </umb-control-group>
-
-                        <umb-control-group label="@general_message" ng-if="vm.usersViewState === 'inviteUser'" label-for="message" required="true">
-                            <textarea name="message"
-                                      type="text"
-                                      class="input-block-level"
-                                      localize="placeholder"
-                                      placeholder="@placeholders_enterMessage"
-                                      ng-model="vm.newUser.message"
-                                      rows="4"
-                                      required val-server-field="Message">
-                            </textarea>
-                            <span ng-messages="addUserForm.message.$error" show-validation-on-submit >
-                                <span class="help-inline" ng-message="required"><localize key="general_required">Required</localize></span>
-                                <span class="help-inline" ng-message="valServerField">{{addUserForm.message.errorMsg}}</span>
-                            </span>
-                        </umb-control-group>
-
-                        <umb-button
-                            ng-if="vm.usersViewState === 'inviteUser'"
-                            button-style="action"
-                            state="vm.page.createButtonState"
-                            type="button"
-                            action="vm.inviteUser(addUserForm)"
-                            label-key="user_sendInvite"
-                            size="m">
-                        </umb-button>
-
-                        <umb-button
-                            ng-if="vm.usersViewState === 'createUser'"
-                            button-style="action"
-                            state="vm.page.createButtonState"
-                            type="button"
-                            action="vm.createUser(addUserForm)"
-                            label-key="user_createUser"
-                            size="m">
-                        </umb-button>
-
-                    </form>
-                </umb-box-content>
-            </umb-box>
-        </div>
-    </div>
-
-    <!-- Create user success -->
-    <div ng-if="vm.usersViewState === 'createUserSuccess'">
-
-        <umb-editor-sub-header>
-            <umb-editor-sub-header-content-left>
-                <button type="button" class="umb-package-details__back-action" ng-click="vm.setUsersViewState('overview');"><span aria-hidden="true">&larr;</span> <localize key="user_backToUsers">Back to users</localize></button>
-            </umb-editor-sub-header-content-left>
-        </umb-editor-sub-header>
-
-        <div class="flex justify-center">
-
-            <umb-box style="max-width: 500px;">
-                <umb-box-content>
-
-                    <!-- Success text -->
-                    <div class="flex items-center" style="margin-bottom: 15px;">
-                        <umb-checkmark
-                            checked="vm.usersViewState === 'createUserSuccess'"
-                            size="m">
-                        </umb-checkmark>
-                        <h3 class="bold" style="margin: 0 0 0 10px;">
-                            {{vm.newUser.name | umbWordLimit:1}}
-                            <localize key="user_userCreated">has been created</localize>
-                        </h3>
-                    </div>
-
-                    <p style="line-height: 1.6em; margin-bottom: 20px;"><localize key="user_userCreatedSuccessHelp">The new user has successfully been created. To log in to Umbraco use the password below.</localize></p>
-
-                    <!-- New password -->
-                    <div>
-                        <label class="bold"><localize key="user_password">Password</localize></label>
-                        <div class="flex items-center justify-between" style="background-color: #f3f3f5; padding: 10px 20px; border-radius: 3px; margin-bottom: 30px;">
-                            <div ng-show="vm.newUser.showPassword">{{vm.newUser.resetPasswordValue}}</div>
-                            <div ng-show="!vm.newUser.showPassword">&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;</div>
-                            <div>
-                                <umb-button ng-if="!vm.newUser.showPassword"
-                                            type="button"
-                                            action="vm.toggleNewUserPassword()"
-                                            label-key="general_show"
-                                            size="xs">
-                                </umb-button>
-                                <umb-button ng-if="vm.newUser.showPassword"
-                                            type="button"
-                                            action="vm.toggleNewUserPassword()"
-                                            label-key="general_hide"
-                                            size="xs">
-                                </umb-button>
-                                <umb-button ng-if="vm.newUser.resetPasswordValue"
-                                            umb-clipboard
-                                            umb-clipboard-success="vm.copySuccess(e)"
-                                            umb-clipboard-error="vm.copyError(e)"
-                                            umb-clipboard-text="{{vm.newUser.resetPasswordValue}}"
-                                            state="vm.page.copyPasswordButtonState"
-                                            type="button"
-                                            label-key="general_copy" size="xs">
-                                </umb-button>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- actions -->
-                    <div>
-                        <umb-button
-                            type="button" button-style="info"
-                            label-key="user_createAnotherUser"
-                            action="vm.setUsersViewState('createUser');"
-                            size="m">
-                        </umb-button>
-                        <umb-button
-                            type="button"
-                            button-style="action"
-                            label-key="user_goToProfile"
-                            action="vm.goToUser(vm.newUser);"
-                            size="m">
-                        </umb-button>
-                    </div>
-
-                </umb-box-content>
-            </umb-box>
-
-        </div>
-    </div>
-
-    <!-- Invite user success -->
-    <div ng-if="vm.usersViewState === 'inviteUserSuccess'">
-        <umb-editor-sub-header>
-            <umb-editor-sub-header-content-left>
-                <button type="button" class="umb-package-details__back-action" ng-click="vm.setUsersViewState('overview');"><span aria-hidden="true">&larr;</span> <localize key="user_backToUsers">Back to users</localize></button>
-            </umb-editor-sub-header-content-left>
-        </umb-editor-sub-header>
-
-        <div class="flex justify-center">
-
-            <umb-box style="max-width: 500px;">
-                <umb-box-content>
-
-                <!-- Success text -->
-                <div class="flex items-center" style="margin-bottom: 15px;">
-                    <umb-checkmark
-                        checked="vm.usersViewState === 'inviteUserSuccess'"
-                        readonly="true"
-                        size="m">
-                    </umb-checkmark>
-                    <h3 class="bold" style="margin: 0 0 0 10px;">
-                        {{vm.newUser.name | umbWordLimit:1}}
-                        <localize key="user_userInvited">has been invited</localize>
-                    </h3>
-                </div>
-
-                <p style="line-height: 1.6em; margin-bottom: 20px;"><localize key="user_userInvitedSuccessHelp">An invitation has been sent to the new user with details about how to log in to Umbraco.</localize></p>
-
-                <!-- actions -->
-                <div>
-                    <umb-button
-                        type="button" button-style="info"
-                        label-key="user_inviteAnotherUser"
-                        action="vm.setUsersViewState('inviteUser');"
-                        size="m">
-                    </umb-button>
-                    <umb-button
-                        ng-if="vm.newUser.id"
-                        type="button"
-                        button-style="action"
-                        label-key="user_goToProfile"
-                        action="vm.goToUser(vm.newUser);"
-                        size="m">
-                    </umb-button>
-                </div>
-
-                </umb-box-content>
-            </umb-box>
-
-        </div>
-
-    </div>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/webhooks/edit.controller.js
deleted file mode 100644
index 4a12d5254d..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/webhooks/edit.controller.js
+++ /dev/null
@@ -1,359 +0,0 @@
-(function () {
-    "use strict";
-
-    function WebhooksEditController($scope, $q, $timeout, $location, $routeParams, editorService, eventsService, navigationService, notificationsService, localizationService, contentTypeResource, mediaTypeResource, memberTypeResource, webhooksResource, formHelper) {
-
-        const vm = this;
-
-        vm.isNew = false;
-        vm.showIdentifier = true;
-
-        vm.contentTypes = [];
-        vm.webhook = {};
-        vm.breadcrumbs = [];
-        vm.labels = {};
-        vm.save = save;
-        vm.back = back;
-        vm.goToPage = goToPage;
-
-        vm.clearContentType = clearContentType;
-        vm.clearEvent = clearEvent;
-        vm.openContentTypePicker = openContentTypePicker;
-        vm.openEventPicker = openEventPicker;
-        vm.openCreateHeader = openCreateHeader;
-        vm.removeHeader = removeHeader;
-
-        function init() {
-            vm.loading = true;
-
-            let promises = [];
-
-            // Localize labels
-            promises.push(localizationService.localizeMany([
-                "treeHeaders_webhooks",
-                "webhooks_addWebhook",
-                "defaultdialogs_confirmSure",
-                "defaultdialogs_editWebhook",
-                "webhooks_selectEventFirst",
-                "general_name",
-                "general_value"
-            ]).then(function (values) {
-                vm.labels.webhooks = values[0];
-                vm.labels.addWebhook = values[1];
-                vm.labels.areYouSure = values[2];
-                vm.labels.editWebhook = values[3];
-                vm.labels.selectEventFirst = values[4];
-                vm.labels.headerName = values[5];
-                vm.labels.headerValue = values[6];
-
-                if ($routeParams.create) {
-                  vm.isNew = true;
-                  vm.showIdentifier = false;
-                  vm.webhook.name = vm.labels.addWebhook;
-                  vm.webhook.enabled = true;
-                }
-            }));
-
-            // Load events
-            promises.push(loadEvents());
-
-            if (!$routeParams.create) {
-
-                promises.push(webhooksResource.getByKey($routeParams.id).then(webhook => {
-
-                    vm.webhook = webhook;
-                    vm.webhook.name = vm.labels.editWebhook;
-
-                    const eventType = vm.webhook ? vm.webhook.events[0].eventType.toLowerCase() : null;
-                    const contentTypes = webhook.contentTypeKeys.map(x => ({ key: x }));
-
-                    getEntities(contentTypes, eventType);
-
-                    makeBreadcrumbs();
-                }));
-            }
-
-            $q.all(promises).then(() => {
-                if ($routeParams.create) {
-                    $scope.$emit("$changeTitle", vm.labels.addWebhook);
-                } else {
-                  $scope.$emit("$changeTitle", vm.labels.editWebhook + ": " + vm.webhook.key);
-                }
-
-                vm.loading = false;
-            });
-
-            // Activate tree node
-            $timeout(function () {
-                navigationService.syncTree({ tree: $routeParams.tree, path: [-1], activate: true });
-            });
-        }
-
-        function openEventPicker() {
-
-          const dialog = {
-            selectedEvents: vm.webhook.events,
-            submit(model) {
-              vm.webhook.events = model.selection;
-              editorService.close();
-            },
-            close() {
-              editorService.close();
-            }
-          };
-
-          localizationService.localize("defaultdialogs_selectEvent").then(value => {
-            dialog.title = value;
-            editorService.eventPicker(dialog);
-          });
-        }
-
-        function openContentTypePicker() {
-          const eventType = vm.webhook ? vm.webhook.events[0].eventType.toLowerCase() : null;
-
-          const editor = {
-            multiPicker: true,
-            filterCssClass: "not-allowed not-published",
-            filter: function (item) {
-              // filter out folders (containers), element types (for content) and already selected items
-              return item.nodeType === "container"; // || item.metaData.isElement || !!_.findWhere(vm.itemTypes, { udi: item.udi });
-            },
-            submit(model) {
-              getEntities(model.selection, eventType);
-              vm.webhook.contentTypeKeys = model.selection.map(item => item.key);
-              editorService.close();
-            },
-            close() {
-              editorService.close();
-            }
-          };
-
-          switch (eventType.toLowerCase()) {
-            case "content":
-              editorService.contentTypePicker(editor);
-              break;
-            case "media":
-              editorService.mediaTypePicker(editor);
-              break;
-            case "member":
-              editorService.memberTypePicker(editor);
-              break;
-          }
-        }
-
-        function getEntities(selection, eventType) {
-          let resource;
-          switch (eventType.toCamelCase()) {
-            case "content":
-              resource = contentTypeResource;
-              break;
-            case "media":
-              resource = mediaTypeResource;
-              break;
-            case "member":
-              resource = memberTypeResource;
-              break;
-            default:
-              return;
-          }
-          vm.contentTypes = [];
-          selection.forEach(entity => {
-            resource.getById(entity.key)
-              .then(data => {
-                if (!vm.contentTypes.some(x => x.key === data.key)) {
-                  vm.contentTypes.push(data);
-                }
-              }).catch(err => {
-                let name;
-                switch (eventType.toCamelCase()) {
-                  case "content":
-                    name = "Unknown content type";
-                    break;
-                  case "media":
-                    name = "Unknown media type";
-                    break;
-                  case "member":
-                    name = "Unknown member type";
-                    break;
-                  default:
-                    name = "Unknown type";
-                }
-
-                let data = {
-                  icon: "icon-alert",
-                  name: name,
-                  description: "An error occurred while loading the content type.",
-                  key: entity.key
-                }
-                vm.contentTypes.push(data);
-            });
-          });
-        }
-
-        function loadEvents() {
-          return webhooksResource.getAllEvents()
-            .then(data => {
-              vm.events = data;
-            });
-        }
-
-        function clearContentType(contentTypeKey) {
-          if (Utilities.isArray(vm.webhook.contentTypeKeys)) {
-            vm.webhook.contentTypeKeys = vm.webhook.contentTypeKeys.filter(x => x !== contentTypeKey);
-          }
-          if (Utilities.isArray(vm.contentTypes)) {
-            vm.contentTypes = vm.contentTypes.filter(x => x.key !== contentTypeKey);
-          }
-        }
-
-        function clearEvent(event) {
-          if (Utilities.isArray(vm.webhook.events)) {
-            vm.webhook.events = vm.webhook.events.filter(x => x !== event);
-          }
-
-          if (Utilities.isArray(vm.contentTypes)) {
-            vm.events = vm.events.filter(x => x.key !== event);
-          }
-        }
-
-        function openCreateHeader() {
-
-          const dialog = {
-            view: "views/webhooks/overlays/header.html",
-            size: 'small',
-            position: 'right',
-            submit(model) {
-              if (!vm.webhook.headers) {
-                vm.webhook.headers = {};
-              }
-              vm.webhook.headers[model.key] = model.value;
-              editorService.close();
-            },
-            close() {
-              editorService.close();
-            }
-          };
-
-          localizationService.localize("webhooks_createHeader").then(value => {
-            dialog.title = value;
-            editorService.open(dialog);
-          });
-        }
-
-        function removeHeader(key) {
-          delete vm.webhook.headers[key];
-        }
-
-        function save() {
-
-            if (!formHelper.submitForm({ scope: $scope })) {
-              return;
-            }
-
-            saveWebhook();
-        }
-
-        function saveWebhook() {
-
-          if (vm.isNew) {
-            webhooksResource.create(vm.webhook)
-              .then(webhook => {
-
-                formHelper.resetForm({ scope: $scope });
-
-                vm.webhook = webhook;
-                vm.webhook.name = vm.labels.editWebhook;
-
-                vm.saveButtonState = "success";
-
-                $scope.$emit("$changeTitle", vm.labels.editWebhook + ": " + vm.webhook.key);
-
-                localizationService.localize("speechBubbles_webhookSaved").then(value => {
-                  notificationsService.success(value);
-                });
-
-                // Emit event when language is created or updated/saved
-                eventsService.emit("editors.webhooks.webhookSaved", {
-                  webhook: webhook,
-                  isNew: vm.isNew
-                });
-
-                vm.isNew = false;
-                vm.showIdentifier = true;
-
-              }, x => {
-                let errorMessage = undefined;
-                if (x.data.ModelState) {
-                  errorMessage = `Message: ${Object.values(x.data.ModelState).flat().join(' ')}`;
-                }
-                handleSubmissionError(x, `Error saving webhook. ${errorMessage ?? ''}`);
-              });
-          }
-          else {
-            webhooksResource.update(vm.webhook)
-              .then(webhook => {
-
-                formHelper.resetForm({ scope: $scope });
-
-                vm.webhook = webhook;
-                vm.webhook.name = vm.labels.editWebhook;
-
-                vm.saveButtonState = "success";
-
-                $scope.$emit("$changeTitle", vm.labels.editWebhook + ": " + vm.webhook.key);
-
-                localizationService.localize("speechBubbles_webhookSaved").then(value => {
-                  notificationsService.success(value);
-                });
-
-                // Emit event when language is created or updated/saved
-                eventsService.emit("editors.webhooks.webhookSaved", {
-                  webhook: webhook,
-                  isNew: vm.isNew
-                });
-
-                vm.isNew = false;
-                vm.showIdentifier = true;
-
-              }, x => {
-                let errorMessage = undefined;
-                if (x.data.ModelState) {
-                  errorMessage = `Message: ${Object.values(x.data.ModelState).flat().join(' ')}`;
-                }
-                handleSubmissionError(x, `Error saving webhook. ${errorMessage ?? ''}`);
-              });
-            }
-        }
-
-        function handleSubmissionError(err, errorMessage) {
-          notificationsService.error(errorMessage);
-          vm.saveButtonState = 'error';
-          formHelper.resetForm({ scope: $scope, hasErrors: true });
-          formHelper.handleError(err);
-        }
-
-        function back() {
-            $location.path("settings/webhooks/overview");
-        }
-
-        function goToPage(ancestor) {
-            $location.path(ancestor.path);
-        }
-
-        function makeBreadcrumbs() {
-            vm.breadcrumbs = [
-                {
-                    "name": vm.labels.webhooks,
-                    "path": "/settings/webhooks/overview"
-                },
-                {
-                    "name": vm.webhook.name
-                }
-            ];
-        }
-
-        init();
-    }
-
-    angular.module("umbraco").controller("Umbraco.Editors.Webhooks.EditController", WebhooksEditController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/edit.html b/src/Umbraco.Web.UI.Client/src/views/webhooks/edit.html
deleted file mode 100644
index f64ef5d69b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/webhooks/edit.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<div data-element="editor-webhooks" ng-controller="Umbraco.Editors.Webhooks.EditController as vm" class="clearfix">
-
-    <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-    <form name="editWebhookForm" novalidate val-form-manager>
-
-        <umb-editor-view ng-if="!vm.loading">
-    
-            <umb-editor-header
-                name="vm.webhook.name"
-                name-locked="true"
-                on-back="vm.back()"
-                show-back-button="true"
-                hide-icon="true"
-                hide-alias="true"
-                hide-description="true">
-            </umb-editor-header>
-    
-            <umb-editor-container class="form-horizontal">
-
-                <div class="umb-package-details">
-
-                    <div class="umb-package-details__main-content">
-
-                      <umb-box>
-                        <umb-box-content>
-
-                          <umb-control-group
-                                label="@webhooks_url"
-                                description="@webhooks_urlDescription"
-                                alias="webhookUrl"
-                                required="true">
-
-                            <input type="url"
-                                   data-element="webhook-url"
-                                   name="webhookUrl"
-                                   ng-model="vm.webhook.url"
-                                   class="umb-property-editor umb-textstring"
-                                   no-dirty-check
-                                   focus-on-filled="true"
-                                   placeholder="https://example.com/api/webhook"
-                                   umb-auto-focus
-                                   required />
-
-                          </umb-control-group>
-
-                          <umb-control-group
-                              label="@webhooks_events"
-                              description="@webhooks_eventDescription"
-                              alias="webhookEvents"
-                              required="true">
-
-                            <umb-node-preview
-                                ng-repeat="event in vm.webhook.events"
-                                ng-show="event"
-                                icon="icon-flag"
-                                name="event.eventName"
-                                alias="event.eventAlias"
-                                description=""
-                                allow-remove="true"
-                                allow-open="false"
-                                on-remove="vm.clearEvent(event)">
-                            </umb-node-preview>
-                            <button type="button"
-                                    class="umb-node-preview-add"
-                                    ng-click="vm.openEventPicker()">
-                              <localize key="general_add">Add</localize>
-                            </button>
-
-                          </umb-control-group>
-
-                          <umb-control-group
-                              label="@webhooks_contentType"
-                              description="@webhooks_contentTypeDescription"
-                              alias="webhookContentType">
-
-                            <umb-node-preview
-                                ng-repeat="contentType in vm.contentTypes"
-                                ng-show="contentType"
-                                icon="contentType.icon"
-                                name="contentType.name"
-                                alias="contentType.alias"
-                                description="contentType.description"
-                                allow-remove="true"
-                                allow-open="false"
-                                on-remove="vm.clearContentType(contentType.key)">
-                            </umb-node-preview>
-
-                            <button type="button"
-                                    class="umb-node-preview-add"
-                                    ng-disabled="!vm.webhook.events || vm.webhook.events.length === 0"
-                                    ng-click="vm.openContentTypePicker()">
-                              <span ng-if="vm.webhook.events && vm.webhook.events.length !== 0">
-                                <localize key="general_add">Add</localize>
-                              </span>
-                              <span ng-if="!vm.webhook.events || vm.webhook.events.length === 0">
-                                  {{vm.labels.selectEventFirst}}
-                              </span>
-                            </button>
-
-                          </umb-control-group>
-
-                          <umb-control-group label="@webhooks_enabled" description="@webhooks_enabledDescription" alias="webhookEnabled">
-                            <umb-toggle
-                                checked="vm.webhook.enabled"
-                                on-click="vm.webhook.enabled = !vm.webhook.enabled">
-                            </umb-toggle>
-                          </umb-control-group>
-
-                          <umb-control-group
-                              label="@webhooks_headers"
-                              description="@webhooks_headersDescription"
-                              alias="webhookHeaders">
-
-                            <div class="umb-property-editor--limit-width">
-                              <table class="table table-hover">
-                                <thead>
-                                  <tr>
-                                    <th>{{vm.labels.headerName}}</th>
-                                    <th>{{vm.labels.headerValue}}</th>
-                                  </tr>
-                                </thead>
-                                <tbody>
-                                  <tr ng-repeat="(key, value) in vm.webhook.headers">
-                                    <td>{{key}}</td>
-                                    <td>{{value}}</td>
-                                    <td style="text-align: right;">
-                                      <umb-button
-                                          type="button"
-                                          button-style="danger"
-                                          label-key="general_delete" ,
-                                          size="xxs"
-                                          action="vm.removeHeader(key)">
-                                      </umb-button>
-                                    </td>
-                                  </tr>
-                                  <tr ng-if="!vm.webhook.headers || vm.webhook.headers.length === 0">
-                                    <td colspan="3">
-                                      <localize key="webhooks_noHeaders">No webhook headers have been added.</localize>
-                                    </td>
-                                  </tr>
-                                </tbody>
-                              </table>
-                              <umb-button
-                                  type="button"
-                                  action="vm.openCreateHeader()"
-                                  button-style="outline"
-                                  label-key="webhooks_addWebhookHeader">
-                              </umb-button>
-                            </div>
-
-                          </umb-control-group>
-
-                        </umb-box-content>
-                      </umb-box>
-
-                  </div>
-
-                  <div class="umb-package-details__sidebar">
-                    <umb-box data-element="node-info-general">
-                      <umb-box-header title-key="general_general"></umb-box-header>
-                      <umb-box-content class="block-form">
-
-                        <umb-control-group label="Id" ng-if="vm.showIdentifier">
-                          <div>{{vm.webhook.id}}</div>
-                          <small>{{vm.webhook.key}}</small>
-                        </umb-control-group>
-
-                      </umb-box-content>
-                    </umb-box>
-                  </div>
-
-                </div>
-
-            </umb-editor-container>
-
-            <umb-editor-footer>
-
-                <umb-editor-footer-content-left>
-                    <umb-breadcrumbs
-                        ancestors="vm.breadcrumbs"
-                        allow-on-open="true"
-                        on-open="vm.goToPage(ancestor)">
-                    </umb-breadcrumbs>
-                </umb-editor-footer-content-left>
-
-                <umb-editor-footer-content-right>
-                    <umb-button
-                        type="button"
-                        action="vm.save()"
-                        state="vm.saveButtonState"
-                        button-style="success"
-                        shortcut="ctrl+s"
-                        label="Save"
-                        label-key="buttons_save"
-                        disabled="vm.loading">
-                    </umb-button>
-                </umb-editor-footer-content-right>
-
-            </umb-editor-footer>
-    
-        </umb-editor-view>
-
-    </form>
-    
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/logs.controller.js b/src/Umbraco.Web.UI.Client/src/views/webhooks/logs.controller.js
deleted file mode 100644
index c4d032b806..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/webhooks/logs.controller.js
+++ /dev/null
@@ -1,66 +0,0 @@
-(function () {
-  "use strict";
-
-  function WebhookLogController($q, webhooksResource, editorService, userService, dateHelper) {
-
-    const vm = this;
-
-    vm.logs = [];
-    vm.openLogOverlay = openLogOverlay;
-    vm.isChecked = isChecked;
-
-    function init() {
-      vm.loading = true;
-
-      let promises = [];
-
-      promises.push(loadLogs());
-
-      $q.all(promises).then(function () {
-        vm.loading = false;
-      });
-    }
-
-    function loadLogs() {
-      return webhooksResource.getLogs()
-        .then(data => {
-          vm.logs = data.items;
-          vm.logs.forEach(log => {
-            formatDatesToLocal(log);
-          });
-        });
-    }
-
-    function formatDatesToLocal(log) {
-      userService.getCurrentUser().then(currentUser => {
-        log.formattedLogDate = dateHelper.getLocalDate(log.date, currentUser.locale, "LLL");
-      });
-    }
-
-    function openLogOverlay(log) {
-
-      const dialog = {
-        view: "views/webhooks/overlays/details.html",
-        title: 'Details',
-        position: 'right',
-        size: 'medium',
-        log,
-        currentUser: this.currentUser,
-        close: () => {
-          editorService.close();
-        }
-      };
-
-      editorService.open(dialog);
-    }
-
-    function isChecked(log) {
-      return log.statusCode === "OK (200)";
-    }
-
-    init();
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Webhooks.WebhookLogController", WebhookLogController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/logs.html b/src/Umbraco.Web.UI.Client/src/views/webhooks/logs.html
deleted file mode 100644
index 3a92c04a56..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/webhooks/logs.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<div ng-controller="Umbraco.Editors.Webhooks.WebhookLogController as vm">
-  <table class="table table-hover" ng-if="!vm.loading">
-    <thead>
-      <tr>
-        <th></th>
-        <th><localize key="webhooks_webhookKey">Webhook key</localize></th>
-        <th><localize key="general_date">Date</localize></th>
-        <th><localize key="webhooks_url">Url</localize></th>
-        <th><localize key="webhooks_event">Event</localize></th>
-        <th><localize key="webhooks_retryCount">Retry count</localize></th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr ng-repeat="log in vm.logs track by log.key" ng-click="vm.openLogOverlay(log)" style="cursor: pointer;">
-        <td style="width: 20px;">
-          <umb-checkmark
-            ng-if="vm.isChecked(log)"
-            checked="vm.isChecked(log)"
-            size="m">
-          </umb-checkmark>
-          <umb-icon icon="icon-wrong" class="umb-checkmark umb-checkmark--m" style="cursor: default;" ng-if="!vm.isChecked(log)"></umb-icon>
-        </td>
-        <td>{{ log.webhookKey }}</td>
-        <td>{{ log.formattedLogDate }}</td>
-        <td>{{ log.url }}</td>
-        <td>{{ log.eventAlias }}</td>
-        <td>{{ log.retryCount }}</td>
-      </tr>
-    </tbody>
-  </table>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/overlays/details.controller.js b/src/Umbraco.Web.UI.Client/src/views/webhooks/overlays/details.controller.js
deleted file mode 100644
index 39d25c0205..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/webhooks/overlays/details.controller.js
+++ /dev/null
@@ -1,33 +0,0 @@
-(function () {
-  "use strict";
-  function DetailsController($scope) {
-    const vm = this;
-
-    vm.close = close;
-    vm.formatData = formatData;
-
-    function formatData(data) {
-
-      let obj = data;
-
-      if (data.detectIsJson()) {
-        try {
-          obj = Utilities.fromJson(data)
-        } catch (err) {
-          obj = data;
-        }
-      }
-
-      return obj;
-    }
-
-    function close() {
-      if ($scope.model && $scope.model.close) {
-        $scope.model.close();
-      }
-    }
-
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Webhooks.DetailsController", DetailsController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/overlays/details.html b/src/Umbraco.Web.UI.Client/src/views/webhooks/overlays/details.html
deleted file mode 100644
index 1c07398dba..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/webhooks/overlays/details.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<div ng-controller="Umbraco.Editors.Webhooks.DetailsController as vm" class="headless-webhook-log-entry-details-overlay"
-     style="margin-top: 20px;">
-
-  <umb-editor-view>
-
-    <umb-editor-header
-      name="model.title"
-      name-locked="true"
-      hide-alias="true"
-      hide-icon="true"
-      hide-description="true">
-    </umb-editor-header>
-
-    <umb-editor-container>
-
-      <umb-box>
-        <umb-box-header title-key="general_general"></umb-box-header>
-        <umb-box-content class="block-form">
-
-          <umb-control-group>
-            <div class="flex items-center">
-              <div class="flx-g0 flx-s0" style="flex-basis: 40px;">
-                <umb-checkmark checked="true" size="m" style="cursor: default"
-                               ng-if="model.log.statusCode === 'OK (200)'"></umb-checkmark>
-                <umb-icon icon="icon-wrong" class="umb-checkmark umb-checkmark--m" style="cursor: default;"
-                          ng-if="model.log.statusCode !== 'OK (200)'"></umb-icon>
-              </div>
-              <div class="flx-g1 flx-s1 flx-b2">{{model.log.statusCode}}</div>
-            </div>
-          </umb-control-group>
-
-          <umb-control-group label="@general_date">
-            <div>{{model.log.formattedLogDate}}</div>
-          </umb-control-group>
-
-          <umb-control-group label="@general_url">
-            <div>{{model.log.url}}</div>
-          </umb-control-group>
-
-          <umb-control-group label="Event">
-            <div>{{model.log.eventAlias}}</div>
-          </umb-control-group>
-
-          <umb-control-group label="Retry count">
-            <div>{{model.log.retryCount}}</div>
-          </umb-control-group>
-
-        </umb-box-content>
-
-      </umb-box>
-
-      <umb-box>
-        <umb-box-header title="Request"></umb-box-header>
-        <umb-box-content class="block-form">
-          <pre class="code">{{model.log.requestHeaders}}</pre>
-          <umb-code-snippet language="'JSON'" wrap="true">{{vm.formatData(model.log.requestBody) | json}}
-          </umb-code-snippet>
-        </umb-box-content>
-      </umb-box>
-        <umb-box>
-          <umb-box-header title="Response"></umb-box-header>
-          <umb-box-content class="block-form">
-            <pre class="code">{{model.log.responseHeaders}}</pre>
-            <umb-code-snippet language="'TEXT'" wrap="true">{{vm.formatData(model.log.responseBody) | json}}
-            </umb-code-snippet>
-          </umb-box-content>
-        </umb-box>
-      <div ng-if="model.log.exceptionOccured">
-        <umb-box>
-          <umb-box-header title="Request failed"></umb-box-header>
-          <umb-box-content class="block-form">
-            <a href="/umbraco#/settings/logViewer/search?lq=WebhookKey%3D'{{model.log.webhookKey}}'">
-              The webhook request has failed, please look at the logs for a more detailed description of the error.
-            </a>
-          </umb-box-content>
-        </umb-box>
-      </div>
-
-
-    </umb-editor-container>
-
-    <umb-editor-footer>
-      <umb-editor-footer-content-right>
-        <umb-button
-          type="button"
-          button-style="link"
-          label-key="general_close"
-          shortcut="esc"
-          action="vm.close()">
-        </umb-button>
-      </umb-editor-footer-content-right>
-    </umb-editor-footer>
-
-  </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/overlays/header.controller.js b/src/Umbraco.Web.UI.Client/src/views/webhooks/overlays/header.controller.js
deleted file mode 100644
index baa816146a..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/webhooks/overlays/header.controller.js
+++ /dev/null
@@ -1,25 +0,0 @@
-(function () {
-  "use strict";
-  function HeaderController($scope) {
-    const vm = this;
-
-    vm.submit = submit;
-    vm.close = close;
-
-    vm.headers = ["Accept", "Content-Type", "User-Agent", "Content-Length"];
-
-    $scope.headerModel = { key: "", value: "" };
-
-    function submit() {
-      if ($scope.headerModel.key && $scope.headerModel.value) {
-        $scope.model.submit($scope.headerModel);
-      }
-    }
-
-    function close() {
-      $scope.model.close();
-    }
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Webhooks.HeaderController", HeaderController);
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/overlays/header.html b/src/Umbraco.Web.UI.Client/src/views/webhooks/overlays/header.html
deleted file mode 100644
index 114eab70c9..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/webhooks/overlays/header.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<div ng-controller="Umbraco.Editors.Webhooks.HeaderController as vm">
-  <umb-editor-view>
-    <ng-form name="createWebhookHeader" novalidate val-form-manager>
-      <umb-editor-header
-        name="model.title"
-        name-locked="true"
-        hide-alias="true"
-        hide-icon="true"
-        hide-description="true">
-      </umb-editor-header>
-      <umb-editor-container>
-        <umb-box>
-          <umb-box-content>
-            <umb-control-group label="Name" description="The name of the header" alias="headerNameGroup" required="true">
-              <input type="text"
-                     data-element="webhook-headerName"
-                     name="headerName"
-                     ng-model="headerModel.key"
-                     class="umb-property-editor umb-textstring"
-                     no-dirty-check
-                     focus-on-filled="true"
-                     placeholder="Accept"
-                     list="webhook-headers"
-                     umb-auto-focus
-                     required />
-              <datalist id="webhook-headers">
-                <option ng-repeat="header in vm.headers" ng-value="header"></option>
-              </datalist>
-            </umb-control-group>
-            <umb-control-group label="Value" description="The value of the header" alias="headerValueGroup" required="true">
-              <input type="text"
-                     data-element="webhook-headerValue"
-                     name="headerValue"
-                     ng-model="headerModel.value"
-                     class="umb-property-editor umb-textstring"
-                     no-dirty-check
-                     focus-on-filled="true"
-                     placeholder="application/json"
-                     umb-auto-focus
-                     required/>
-            </umb-control-group>
-          </umb-box-content>
-        </umb-box>
-      </umb-editor-container>
-      <umb-editor-footer>
-        <umb-editor-footer-content-right>
-          <umb-button
-            type="button"
-            button-style="link"
-            label-key="general_close"
-            shortcut="esc"
-            action="vm.close()">
-          </umb-button>
-          <umb-button
-            type="button"
-            button-style="action"
-            disabled="disableSubmitButton"
-            label="Create"
-            action="vm.submit()">
-          </umb-button>
-        </umb-editor-footer-content-right>
-      </umb-editor-footer>
-    </ng-form>
-  </umb-editor-view>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/webhooks/overview.controller.js
deleted file mode 100644
index a8dcf8658b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/webhooks/overview.controller.js
+++ /dev/null
@@ -1,66 +0,0 @@
-(function () {
-  "use strict";
-
-  function OverviewController($location, $routeParams, localizationService) {
-
-    const vm = this;
-
-    vm.page = {};
-    vm.page.labels = {};
-    vm.page.name = "";
-    vm.page.navigation = [];
-
-    let webhookUri = $routeParams.method;
-
-    onInit();
-
-    function onInit() {
-
-      loadNavigation();
-
-      setPageName();
-    }
-
-    function loadNavigation() {
-
-      const labelKeys = ["treeHeaders_webhooks", "webhooks_deliveries"];
-
-      localizationService.localizeMany(labelKeys).then(data => {
-        vm.page.labels.webhooks = data[0];
-        vm.page.labels.logs = data[1];
-
-        vm.page.navigation = [
-          {
-            "name": vm.page.labels.webhooks,
-            "icon": "icon-webhook",
-            "view": "views/webhooks/webhooks.html",
-            "active": webhookUri === 'overview',
-            "alias": "umbWebhooks",
-            "action": function () {
-              $location.path("/settings/webhooks/overview");
-            }
-          },
-          {
-            "name": vm.page.labels.logs,
-            "icon": "icon-box-alt",
-            "view": "views/webhooks/logs.html",
-            "active": webhookUri === 'logs',
-            "alias": "umbWebhookLogs",
-            "action": function () {
-              $location.path("/settings/webhooks/overview");
-            }
-          }
-        ];
-      });
-    }
-
-    function setPageName() {
-      localizationService.localize("treeHeaders_webhooks").then(data => {
-        vm.page.name = data;
-      })
-    }
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Webhooks.OverviewController", OverviewController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/overview.html b/src/Umbraco.Web.UI.Client/src/views/webhooks/overview.html
deleted file mode 100644
index 981cf09f44..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/webhooks/overview.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div data-element="editor-languages" ng-controller="Umbraco.Editors.Webhooks.OverviewController as vm" class="clearfix">
-
-  <umb-editor-view footer="false">
-
-    <umb-editor-header
-        name="vm.page.name"
-        name-locked="true"
-        hide-icon="true"
-        hide-description="true"
-        hide-alias="true"
-        navigation="vm.page.navigation">
-    </umb-editor-header>
-
-    <umb-editor-container>
-
-      <umb-editor-sub-views
-        sub-views="vm.page.navigation" model="vm.page">
-      </umb-editor-sub-views>
-
-    </umb-editor-container>
-
-  </umb-editor-view>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.controller.js b/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.controller.js
deleted file mode 100644
index ff4e214596..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.controller.js
+++ /dev/null
@@ -1,158 +0,0 @@
-(function () {
-  "use strict";
-
-  function WebhookController($q, $timeout, $location, $routeParams, webhooksResource, navigationService, notificationsService, overlayService, contentTypeResource, mediaTypeResource, memberTypeResource) {
-
-    const vm = this;
-
-    vm.addWebhook = addWebhook;
-    vm.editWebhook = editWebhook;
-    vm.deleteWebhook = deleteWebhook;
-    vm.handleSubmissionError = handleSubmissionError;
-    vm.resolveTypeNames = resolveTypeNames;
-    vm.resolveEventNames = resolveEventNames;
-
-    vm.page = {};
-    vm.webhooks = [];
-    vm.events = [];
-    vm.webhooksContentTypes = {};
-    vm.webhookEvents = {};
-
-    function init() {
-      vm.loading = true;
-
-      let promises = [];
-
-      promises.push(loadEvents());
-      promises.push(loadWebhooks());
-
-      $q.all(promises).then(function () {
-        vm.loading = false;
-      });
-
-      // Activate tree node
-      $timeout(function () {
-        navigationService.syncTree({ tree: $routeParams.tree, path: [-1], activate: true });
-      });
-    }
-
-    function loadEvents() {
-      return webhooksResource.getAllEvents()
-        .then(data => {
-          vm.events = data;
-        });
-    }
-
-    function resolveEventNames(webhook) {
-      webhook.events.forEach(event => {
-        if (!vm.webhookEvents[webhook.key]) {
-          vm.webhookEvents[webhook.key] = event.eventName;
-        } else {
-          vm.webhookEvents[webhook.key] += ", " + event.eventName;
-        }
-      });
-    }
-
-    function determineResource(resourceType){
-      let resource;
-      switch (resourceType) {
-        case "content":
-          resource = contentTypeResource;
-          break;
-        case "media":
-          resource = mediaTypeResource;
-          break;
-        case "member":
-          resource = memberTypeResource;
-          break;
-        default:
-          return;
-      }
-
-      return resource;
-    }
-
-    function resolveTypeNames(webhook) {
-      let resource = determineResource(webhook.events[0].eventType.toLowerCase());
-
-      if (vm.webhooksContentTypes[webhook.key]){
-        delete vm.webhooksContentTypes[webhook.key];
-      }
-
-      webhook.contentTypeKeys.forEach(key => {
-        resource.getById(key)
-          .then(data => {
-            if (!vm.webhooksContentTypes[webhook.key]) {
-              vm.webhooksContentTypes[webhook.key] = data.name;
-            } else {
-              vm.webhooksContentTypes[webhook.key] += ", " + data.name;
-            }
-          });
-      });
-    }
-
-    function handleSubmissionError(model, errorMessage) {
-      notificationsService.error(errorMessage);
-      model.disableSubmitButton = false;
-      model.submitButtonState = 'error';
-    }
-
-    function addWebhook() {
-      $location.search('create', null);
-      $location.path("/settings/webhooks/edit/-1").search("create", "true");
-    }
-
-    function editWebhook(webhook) {
-      $location.search('create', null);
-      $location.path("/settings/webhooks/edit/" + webhook.key);
-    }
-
-    function loadWebhooks(){
-      return webhooksResource
-        .getAll()
-        .then(result => {
-          vm.webhooks = result;
-          vm.webhookEvents = {};
-          vm.webhooksContentTypes = {};
-
-          vm.webhooks.forEach(webhook => {
-            resolveTypeNames(webhook);
-            resolveEventNames(webhook);
-          })
-        });
-    }
-
-    function deleteWebhook(webhook, event) {
-      overlayService.open({
-        title: 'Confirm delete webhook',
-        content: 'Are you sure you want to delete the webhook?',
-        submitButtonLabel: 'Yes, delete',
-        submitButtonStyle: 'danger',
-        closeButtonLabel: 'Cancel',
-        submit: () => {
-          webhooksResource.delete(webhook.key)
-            .then(() => {
-              const index = this.webhooks.indexOf(webhook);
-              this.webhooks.splice(index, 1);
-
-              notificationsService.success('Webhook deleted.');
-              overlayService.close();
-            }, () => {
-              notificationsService.error('Error deleting webhook.');
-            });
-        },
-        close: () => {
-          overlayService.close();
-        }
-      });
-
-      event.preventDefault();
-      event.stopPropagation();
-    }
-
-    init();
-  }
-
-  angular.module("umbraco").controller("Umbraco.Editors.Webhooks.WebhookController", WebhookController);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.html b/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.html
deleted file mode 100644
index 44e69cd499..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div ng-controller="Umbraco.Editors.Webhooks.WebhookController as vm">
-
-  <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
-
-  <umb-editor-sub-header>
-
-    <umb-editor-sub-header-content-left>
-      <umb-button type="button"
-                  action="vm.addWebhook()"
-                  button-style="outline"
-                  label-key="webhooks_addWebhook">
-      </umb-button>
-    </umb-editor-sub-header-content-left>
-
-  </umb-editor-sub-header>
-
-  <table class="table table-hover" ng-if="!vm.loading">
-    <thead>
-    <tr>
-      <th><localize key="webhooks_enabled">Enabled</localize></th>
-      <th><localize key="webhooks_events">Events</localize></th>
-      <th><localize key="webhooks_url">Url</localize></th>
-      <th><localize key="webhooks_types">Types</localize></th>
-    </tr>
-    </thead>
-    <tbody>
-    <tr ng-repeat="webhook in vm.webhooks track by webhook.key" ng-click="vm.editWebhook(webhook)" style="cursor: pointer;">
-      <td style="width: 60px;">
-        <umb-checkmark
-          ng-if="webhook.enabled"
-          checked="webhook.enabled"
-          size="xs">
-        </umb-checkmark>
-      </td>
-      <td>
-        <span>{{ vm.webhookEvents[webhook.key] }}</span>
-      </td>
-      <td>{{ webhook.url }}</td>
-      <td>{{ vm.webhooksContentTypes[webhook.key] }}</td>
-      <td style="text-align: right;">
-        <umb-button
-          type="button"
-          action="vm.deleteWebhook(webhook, $event)"
-          button-style="danger"
-          size="xxs"
-          label-key="general_delete">
-        </umb-button>
-      </td>
-    </tr>
-    </tbody>
-  </table>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
deleted file mode 100644
index d6e84e7ef3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
+++ /dev/null
@@ -1,227 +0,0 @@
-
-/*********************************************************************************************************/
-/* website preview */
-/*********************************************************************************************************/
-
-(function() {
-
-
-    if ( window.location !== window.parent.location ) {
-        //we are in an iFrame, so lets skip the dialog.
-        return;
-    }
-
-    const scriptElement = document.currentScript;
-
-    function setCookie(cname, cvalue, exminutes) {
-        var d = new Date();
-        d.setTime(d.getTime() + (exminutes * 60 * 1000));
-        document.cookie = cname + "=" + cvalue + ";expires="+d.toUTCString() + ";path=/";
-    }
-
-    function getCookie(cname) {
-        var name = cname + "=";
-        var ca = document.cookie.split(";");
-        for(var i = 0; i < ca.length; i++) {
-            var c = ca[i];
-            while (c.charAt(0) == " ") {
-                c = c.substring(1);
-            }
-            if (c.indexOf(name) == 0) {
-                return c.substring(name.length, c.length);
-            }
-        }
-        return null;
-    }
-
-
-    function beforeUnloadHandler(e) {
-        endPreviewSession();
-    }
-    window.addEventListener("beforeunload", beforeUnloadHandler, false);
-
-    function startPreviewSession() {
-        // lets registrer this preview session.
-        var amountOfPreviewSessions = Math.max(localStorage.getItem('UmbPreviewSessionAmount') || 0, 0);
-        amountOfPreviewSessions++;
-        localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
-    }
-    function resetPreviewSessions() {
-        localStorage.setItem('UmbPreviewSessionAmount', 0);
-    }
-    function endPreviewSession() {
-        var amountOfPreviewSessions = localStorage.getItem('UmbPreviewSessionAmount') || 0;
-        amountOfPreviewSessions--;
-        localStorage.setItem('UmbPreviewSessionAmount', amountOfPreviewSessions);
-
-        if(amountOfPreviewSessions <= 0) {
-            // We are good to secretly end preview mode.
-            navigator.sendBeacon(scriptElement.getAttribute("data-umbraco-path")+"/preview/end");
-        }
-    }
-    startPreviewSession();
-
-    function endPreviewMode() {
-        resetPreviewSessions();
-        window.top.location.href = scriptElement.getAttribute("data-umbraco-path")+"/preview/end?redir=" + encodeURIComponent(window.location.pathname+window.location.search);
-    }
-    function continuePreviewMode(minutsToExpire) {
-        setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", minutsToExpire || 4);
-    }
-
-    var user = getCookie("UMB-WEBSITE-PREVIEW-ACCEPT");
-    if (user != "true") {
-        askToViewPublishedVersion();
-    } else {
-        continuePreviewMode();
-    }
-
-    function askToViewPublishedVersion() {
-
-        scriptElement.getAttribute("data-umbraco-path");
-
-        const request = new XMLHttpRequest();
-        request.open("GET", scriptElement.getAttribute("data-umbraco-path") + "/LocalizedText");
-        request.send();
-
-        request.onreadystatechange = (e) => {
-            if (request.readyState == 4 && request.status == 200) {
-                const jsonLocalization = JSON.parse(request.responseText);
-                createAskUserAboutVersionDialog(jsonLocalization);
-            }
-        }
-
-    }
-    function createAskUserAboutVersionDialog(jsonLocalization) {
-
-        const localizeVarsFallback = {
-            "viewPublishedContentHeadline": "Preview content?",
-            "viewPublishedContentDescription":"You have ended preview mode, do you want to continue previewing this content?",
-            "viewPublishedContentAcceptButton":"You have ended preview mode, do you want to continue previewing this content?",
-            "viewPublishedContentDeclineButton":"Preview"
-        };
-
-        const umbLocalizedVars = jsonLocalization || {};
-        umbLocalizedVars.preview = Object.assign(localizeVarsFallback, jsonLocalization.preview);
-
-
-
-        // This modal is also used in preview.js
-        var modelStyles = `
-            /* Webfont: LatoLatin-Bold */
-            @font-face {
-                font-family: 'Lato';
-                src: url('https://fonts.googleapis.com/css2?family=Lato:wght@700&display=swap');
-                font-style: normal;
-                font-weight: 700;
-                font-display: swap;
-                text-rendering: optimizeLegibility;
-            }
-
-            .umbraco-preview-dialog {
-                position: fixed;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                z-index: 99999999;
-                top:0;
-                bottom:0;
-                left:0;
-                right:0;
-                overflow: auto;
-                background-color: rgba(0,0,0,0.6);
-            }
-
-            .umbraco-preview-dialog__modal {
-                background-color: #fff;
-                border-radius: 6px;
-                box-shadow: 0 3px 7px rgba(0,0,0,0.3);
-                margin: auto;
-                padding: 30px 40px;
-                width: 100%;
-                max-width: 540px;
-                font-family: Lato,Helvetica Neue,Helvetica,Arial,sans-serif;
-                font-size: 15px;
-                line-height: 1.5;
-            }
-
-            .umbraco-preview-dialog__headline {
-                font-weight: 700;
-                font-size: 22px;
-                color: #1b264f;
-                margin-top:10px;
-                margin-bottom:20px;
-            }
-            .umbraco-preview-dialog__question {
-                margin-bottom:30px;
-            }
-            .umbraco-preview-dialog__modal > button {
-                display: inline-block;
-                cursor: pointer;
-                padding: 8px 18px;
-                text-align: center;
-                vertical-align: middle;
-                border-radius: 3px;
-                border:none;
-                font-family: inherit;
-                font-weight: 700;
-                font-size: 15px;
-                float:right;
-                margin-left:10px;
-
-                color: #1b264f;
-                background-color: #f6f1ef;
-            }
-            .umbraco-preview-dialog__modal > button:hover {
-                color: #2152a3;
-                background-color: #f6f1ef;
-            }
-            .umbraco-preview-dialog__modal > button.umbraco-preview-dialog__continue {
-                color: #fff;
-                background-color: #2bc37c;
-            }
-            .umbraco-preview-dialog__modal > button.umbraco-preview-dialog__continue:hover {
-                background-color: #39d38b;
-            }
-        `;
-
-        var bodyEl = document.getElementsByTagName("BODY")[0];
-
-        var fragment = document.createElement("div");
-        var shadowRoot = fragment.attachShadow({ mode: 'open' });
-
-        var style = document.createElement("style");
-        style.innerHTML = modelStyles;
-        shadowRoot.appendChild(style);
-
-        var con = document.createElement("div");
-        con.className = "umbraco-preview-dialog";
-        shadowRoot.appendChild(con);
-
-        var modal = document.createElement("div");
-        modal.className = "umbraco-preview-dialog__modal";
-        modal.innerHTML = `<div class="umbraco-preview-dialog__headline">${umbLocalizedVars.preview.viewPublishedContentHeadline}</div>
-            <div class="umbraco-preview-dialog__question">${umbLocalizedVars.preview.viewPublishedContentDescription}</div>`;
-        con.appendChild(modal);
-
-        var continueButton = document.createElement("button");
-        continueButton.type = "button";
-        continueButton.className = "umbraco-preview-dialog__continue";
-        continueButton.innerHTML = umbLocalizedVars.preview.viewPublishedContentAcceptButton;
-        continueButton.addEventListener("click", endPreviewMode);
-        modal.appendChild(continueButton);
-
-        var exitButton = document.createElement("button");
-        exitButton.type = "button";
-        exitButton.innerHTML = umbLocalizedVars.preview.viewPublishedContentDeclineButton;
-        exitButton.addEventListener("click", function() {
-            bodyEl.removeChild(fragment);
-            continuePreviewMode(5);
-        });
-        modal.appendChild(exitButton);
-
-        bodyEl.appendChild(fragment);
-        continueButton.focus();
-    }
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/test/config/app.unit.js b/src/Umbraco.Web.UI.Client/test/config/app.unit.js
deleted file mode 100644
index 9e265215dd..0000000000
--- a/src/Umbraco.Web.UI.Client/test/config/app.unit.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var app = angular.module('umbraco', [
-    'umbraco.filters',
-    'umbraco.directives',
-    'umbraco.resources',
-    'umbraco.services',
-    
-	'umbraco.mocks',
-	'umbraco.interceptors',
-
-    'ngRoute',
-    'ngAnimate',
-    'ngCookies',
-    'ngSanitize',
-    
-    //'ngMessages',
-    'tmh.dynamicLocale',
-    //'ngFileUpload',
-    'LocalStorageModule'
-    //'chart.js'
-]);
diff --git a/src/Umbraco.Web.UI.Client/test/config/e2e.js b/src/Umbraco.Web.UI.Client/test/config/e2e.js
deleted file mode 100644
index bd9239fc3c..0000000000
--- a/src/Umbraco.Web.UI.Client/test/config/e2e.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// base path, that will be used to resolve files and exclude
-basePath = '../..';
-
-// list of files / patterns to load in the browser
-files = [
-  ANGULAR_SCENARIO,
-  ANGULAR_SCENARIO_ADAPTER,
-  'test/e2e/**/*.scenario.js'
-];
-
-// use dots reporter, as travis terminal does not support escaping sequences
-// possible values: 'dots' || 'progress'
-reporters = 'progress';
-
-// these are default values, just to show available options
-
-// web server port
-port = 8080;
-
-// cli runner port
-runnerPort = 9100;
-
-urlRoot = '/__testacular/';
-
-proxies = {
-  '/': 'http://localhost:3000/'
-};
-
-// enable / disable colors in the output (reporters and logs)
-colors = true;
-
-// level of logging
-// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
-logLevel = LOG_INFO;
-
-// enable / disable watching file and executing tests whenever any file changes
-autoWatch = false;
-
-// polling interval in ms (ignored on OS that support inotify)
-autoWatchInterval = 0;
-
-// Start these browsers, currently available:
-// - Chrome
-// - ChromeCanary
-// - Firefox
-// - Opera
-// - Safari
-// - PhantomJS
-browsers = ['Chrome'];
-
-// Continuous Integration mode
-// if true, it capture browsers, run tests and exit
-singleRun = true;
diff --git a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
deleted file mode 100644
index 097236e250..0000000000
--- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
+++ /dev/null
@@ -1,154 +0,0 @@
-const jsdom = require("jsdom");
-module.exports = function (config) {
-
-  config.set({
-
-    // base path, that will be used to resolve files and exclude
-    basePath: '../..',
-
-    frameworks: ['jasmine'],
-
-    // list of files / patterns to load in the browser
-    files: [
-
-      // Jasmine plugins
-
-      //libraries
-      'node_modules/jquery/dist/jquery.min.js',
-      'node_modules/angular/angular.min.js',
-      'node_modules/angular-animate/angular-animate.min.js',
-      'node_modules/angular-cookies/angular-cookies.min.js',
-      'node_modules/angular-aria/angular-aria.min.js',
-      'node_modules/angular-local-storage/dist/angular-local-storage.min.js',
-      'node_modules/angular-route/angular-route.min.js',
-      'node_modules/angular-sanitize/angular-sanitize.min.js',
-      'node_modules/angular-mocks/angular-mocks.js',
-      'node_modules/angular-ui-sortable/dist/sortable.min.js',
-      'node_modules/underscore/underscore-min.js',
-      'node_modules/moment/min/moment-with-locales.js',
-      'lib/umbraco/Extensions.js',
-      'node_modules/lazyload-js/LazyLoad.min.js',
-      'node_modules/angular-dynamic-locale/dist/tmhDynamicLocale.min.js',
-
-      //app bootstrap and loader
-      'test/config/app.unit.js',
-
-      //application files
-      '../Umbraco.Cms.StaticAssets/wwwroot/umbraco/js/*.controllers.min.js',
-      '../Umbraco.Cms.StaticAssets/wwwroot/umbraco/js/*.directives.min.js',
-      '../Umbraco.Cms.StaticAssets/wwwroot/umbraco/js/*.filters.min.js',
-      '../Umbraco.Cms.StaticAssets/wwwroot/umbraco/js/*.services.min.js',
-      '../Umbraco.Cms.StaticAssets/wwwroot/umbraco/js/*.interceptors.min.js',
-      '../Umbraco.Cms.StaticAssets/wwwroot/umbraco/js/*.resources.min.js',
-
-      //mocked data and routing
-      'src/common/mocks/umbraco.servervariables.js',
-      'src/common/mocks/**/*.js',
-
-      //tests
-      'test/unit/**/*.spec.js'
-    ],
-
-    // list of files to exclude
-    exclude: [],
-
-    // use dolts reporter, as travis terminal does not support escaping sequences
-    // possible values: 'dots', 'progress', 'junit', 'spec'
-    // ***
-    // progress: Outputs a simple list like: "Executed 128 of 144 SUCCESS (0 secs / 0.814 secs)"
-    // spec: Outputs a more verbose report which is more useful for debugging if one of the tests fails.
-    // ***
-    // CLI --reporters progress
-
-    reporters: ['spec', 'junit'],
-    specReporter: {
-      maxLogLines: 5,         // limit number of lines logged per test
-      suppressErrorSummary: true,  // do not print error summary
-      suppressFailed: false,  // do not print information about failed tests
-      suppressPassed: false,  // do not print information about passed tests
-      suppressSkipped: true,  // do not print information about skipped tests
-      showSpecTiming: false // print the time elapsed for each spec
-    },
-
-
-    // web server port
-    // CLI --port 9876
-    port: 9876,
-
-    // cli runner port
-    // CLI --runner-port 9100
-    runnerPort: 9100,
-
-    // Add support for new DNS resolution in Node 17+
-    listenAddress: '::',
-
-    // enable / disable colors in the output (reporters and logs)
-    // CLI --colors --no-colors
-    colors: true,
-
-    // level of logging
-    // possible values: karma.LOG_DISABLE || karma.LOG_ERROR || karma.LOG_WARN || karma.LOG_INFO || karma.LOG_DEBUG
-    // CLI --log-level debug
-    logLevel: config.LOG_INFO,
-
-    // enable / disable watching file and executing tests whenever any file changes
-    // CLI --auto-watch --no-auto-watch
-    autoWatch: false,
-
-    // Start these browsers, currently available:
-    // - Chrome
-    // - ChromeCanary
-    // - Firefox
-    // - Opera
-    // - Safari (only Mac)
-    // - PhantomJS
-    // - IE (only Windows)
-    // CLI --browsers Chrome,Firefox,Safari
-    browsers: ['jsdom'],
-
-    // Configure a user agent so the log file gets generated properly
-    jsdomLauncher: {
-      jsdom: {
-        resources: new jsdom.ResourceLoader({
-          userAgent: "umbraco-test-suite"
-        })
-      }
-    },
-
-    // allow waiting a bit longer, some machines require this
-
-    browserNoActivityTimeout: 100000,     // default 10,000ms
-
-    // Auto run tests on start (when browsers are captured) and exit
-    // CLI --single-run --no-single-run
-    singleRun: true,
-
-    // report which specs are slower than 500ms
-    // CLI --report-slower-than 500
-    reportSlowerThan: 500,
-
-    plugins: [
-      require('karma-jasmine'),
-      require('karma-jsdom-launcher'),
-      require('karma-junit-reporter'),
-      require('karma-spec-reporter')
-    ],
-
-    // the default configuration
-    junitReporter: {
-      outputDir: '', // results will be saved as $outputDir/$browserName.xml
-      outputFile: undefined, // if included, results will be saved as $outputDir/$browserName/$outputFile
-      suite: '', // suite will become the package name attribute in xml testsuite element
-      useBrowserName: true, // add browser name to report and classes names
-      nameFormatter: undefined, // function (browser, result) to customize the name attribute in xml testcase element
-      classNameFormatter: undefined, // function (browser, result) to customize the classname attribute in xml testcase element
-      properties: {} // key value pair of properties to add to the <properties> section of the report
-    },
-
-    client: {
-      jasmine: {
-        random: false
-      }
-    }
-  });
-};
diff --git a/src/Umbraco.Web.UI.Client/test/e2e/app/admin/users/users-edit.scenario.js b/src/Umbraco.Web.UI.Client/test/e2e/app/admin/users/users-edit.scenario.js
deleted file mode 100644
index ea17450a08..0000000000
--- a/src/Umbraco.Web.UI.Client/test/e2e/app/admin/users/users-edit.scenario.js
+++ /dev/null
@@ -1,23 +0,0 @@
-describe('admin edit user', function() {
-
-  beforeEach(function() {
-    browser().navigateTo('/admin/users/new');
-    input('user.email').enter('admin@abc.com');
-    input('user.password').enter('changeme');
-    element('button.login').trigger('click');
-  });
-
-  it('enables the save button when the user info is filled in correctly', function() {
-    expect(element('button.save:disabled').count()).toBe(1);
-    input('user.email').enter('test@app.com');
-    input('user.lastName').enter('Test');
-    input('user.firstName').enter('App');
-    input('user.password').enter('t');
-    input('password').enter('t');
-    element('#password').query(function(elements, done) {
-      expect(element('#passwordRepeat').text()).toContain(elements.text());
-      done();
-    });
-    expect(element('button.save:disabled').count()).toBe(0);
-  });
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/e2e/index.scenario.js b/src/Umbraco.Web.UI.Client/test/e2e/index.scenario.js
deleted file mode 100644
index 70ddaa2a63..0000000000
--- a/src/Umbraco.Web.UI.Client/test/e2e/index.scenario.js
+++ /dev/null
@@ -1,10 +0,0 @@
-describe('my app', function() {
-
-  beforeEach(function() {
-    browser().navigateTo('/');
-  });
-
-  it('should be publicly accessible and default route to be /content', function() {
-    expect(browser().location().path()).toBe("/content");
-  });
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js b/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js
deleted file mode 100644
index 0c9f8f3154..0000000000
--- a/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js
+++ /dev/null
@@ -1,1886 +0,0 @@
-/**
- * @license AngularJS v1.1.5
- * (c) 2010-2012 Google, Inc. http://angularjs.org
- * License: MIT
- *
- * TODO(vojta): wrap whole file into closure during build
- */
-
-/**
- * @ngdoc overview
- * @name angular.mock
- * @description
- *
- * Namespace from 'angular-mocks.js' which contains testing related code.
- */
-angular.mock = {};
-
-/**
- * ! This is a private undocumented service !
- *
- * @name ngMock.$browser
- *
- * @description
- * This service is a mock implementation of {@link ng.$browser}. It provides fake
- * implementation for commonly used browser apis that are hard to test, e.g. setTimeout, xhr,
- * cookies, etc...
- *
- * The api of this service is the same as that of the real {@link ng.$browser $browser}, except
- * that there are several helper methods available which can be used in tests.
- */
-angular.mock.$BrowserProvider = function () {
-    this.$get = function () {
-        return new angular.mock.$Browser();
-    };
-};
-
-angular.mock.$Browser = function () {
-    var self = this;
-
-    this.isMock = true;
-    self.$$url = "http://server/";
-    self.$$lastUrl = self.$$url; // used by url polling fn
-    self.pollFns = [];
-
-    // TODO(vojta): remove this temporary api
-    self.$$completeOutstandingRequest = angular.noop;
-    self.$$incOutstandingRequestCount = angular.noop;
-
-
-    // register url polling fn
-
-    self.onUrlChange = function (listener) {
-        self.pollFns.push(
-            function () {
-                if (self.$$lastUrl != self.$$url) {
-                    self.$$lastUrl = self.$$url;
-                    listener(self.$$url);
-                }
-            }
-        );
-
-        return listener;
-    };
-
-    self.cookieHash = {};
-    self.lastCookieHash = {};
-    self.deferredFns = [];
-    self.deferredNextId = 0;
-
-    self.defer = function (fn, delay) {
-        delay = delay || 0;
-        self.deferredFns.push({ time: (self.defer.now + delay), fn: fn, id: self.deferredNextId });
-        self.deferredFns.sort(function (a, b) { return a.time - b.time; });
-        return self.deferredNextId++;
-    };
-
-
-    self.defer.now = 0;
-
-
-    self.defer.cancel = function (deferId) {
-        var fnIndex;
-
-        Utilities.forEach(self.deferredFns, function (fn, index) {
-            if (fn.id === deferId) fnIndex = index;
-        });
-
-        if (fnIndex !== undefined) {
-            self.deferredFns.splice(fnIndex, 1);
-            return true;
-        }
-
-        return false;
-    };
-
-
-    /**
-     * @name ngMock.$browser#defer.flush
-     * @methodOf ngMock.$browser
-     *
-     * @description
-     * Flushes all pending requests and executes the defer callbacks.
-     *
-     * @param {number=} number of milliseconds to flush. See {@link #defer.now}
-     */
-    self.defer.flush = function (delay) {
-        if (Utilities.isDefined(delay)) {
-            self.defer.now += delay;
-        } else {
-            if (self.deferredFns.length) {
-                self.defer.now = self.deferredFns[self.deferredFns.length - 1].time;
-            } else {
-                throw Error('No deferred tasks to be flushed');
-            }
-        }
-
-        while (self.deferredFns.length && self.deferredFns[0].time <= self.defer.now) {
-            self.deferredFns.shift().fn();
-        }
-    };
-    /**
-     * @name ngMock.$browser#defer.now
-     * @propertyOf ngMock.$browser
-     *
-     * @description
-     * Current milliseconds mock time.
-     */
-
-    self.$$baseHref = '';
-    self.baseHref = function () {
-        return this.$$baseHref;
-    };
-};
-angular.mock.$Browser.prototype = {
-
-    /**
-      * @name ngMock.$browser#poll
-      * @methodOf ngMock.$browser
-      *
-      * @description
-      * run all fns in pollFns
-      */
-    poll: function poll() {
-        Utilities.forEach(this.pollFns, function (pollFn) {
-            pollFn();
-        });
-    },
-
-    addPollFn: function (pollFn) {
-        this.pollFns.push(pollFn);
-        return pollFn;
-    },
-
-    url: function (url, replace) {
-        if (url) {
-            this.$$url = url;
-            return this;
-        }
-
-        return this.$$url;
-    },
-
-    cookies: function (name, value) {
-        if (name) {
-            if (value == undefined) {
-                delete this.cookieHash[name];
-            } else {
-                if (Utilities.isString(value) &&       //strings only
-                    value.length <= 4096) {          //strict cookie storage limits
-                    this.cookieHash[name] = value;
-                }
-            }
-        } else {
-            if (!Utilities.equals(this.cookieHash, this.lastCookieHash)) {
-                this.lastCookieHash = Utilities.copy(this.cookieHash);
-                this.cookieHash = Utilities.copy(this.cookieHash);
-            }
-            return this.cookieHash;
-        }
-    },
-
-    notifyWhenNoOutstandingRequests: function (fn) {
-        fn();
-    }
-};
-
-
-/**
- * @ngdoc object
- * @name ngMock.$exceptionHandlerProvider
- *
- * @description
- * Configures the mock implementation of {@link ng.$exceptionHandler} to rethrow or to log errors passed
- * into the `$exceptionHandler`.
- */
-
-/**
- * @ngdoc object
- * @name ngMock.$exceptionHandler
- *
- * @description
- * Mock implementation of {@link ng.$exceptionHandler} that rethrows or logs errors passed
- * into it. See {@link ngMock.$exceptionHandlerProvider $exceptionHandlerProvider} for configuration
- * information.
- *
- *
- * <pre>
- *   describe('$exceptionHandlerProvider', function() {
- *
- *     it('should capture log messages and exceptions', function() {
- *
- *       module(function($exceptionHandlerProvider) {
- *         $exceptionHandlerProvider.mode('log');
- *       });
- *
- *       inject(function($log, $exceptionHandler, $timeout) {
- *         $timeout(function() { $log.log(1); });
- *         $timeout(function() { $log.log(2); throw 'banana peel'; });
- *         $timeout(function() { $log.log(3); });
- *         expect($exceptionHandler.errors).toEqual([]);
- *         expect($log.assertEmpty());
- *         $timeout.flush();
- *         expect($exceptionHandler.errors).toEqual(['banana peel']);
- *         expect($log.log.logs).toEqual([[1], [2], [3]]);
- *       });
- *     });
- *   });
- * </pre>
- */
-
-angular.mock.$ExceptionHandlerProvider = function () {
-    var handler;
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$exceptionHandlerProvider#mode
-     * @methodOf ngMock.$exceptionHandlerProvider
-     *
-     * @description
-     * Sets the logging mode.
-     *
-     * @param {string} mode Mode of operation, defaults to `rethrow`.
-     *
-     *   - `rethrow`: If any errors are passed into the handler in tests, it typically
-     *                means that there is a bug in the application or test, so this mock will
-     *                make these tests fail.
-     *   - `log`: Sometimes it is desirable to test that an error is thrown, for this case the `log` mode stores an
-     *            array of errors in `$exceptionHandler.errors`, to allow later assertion of them.
-     *            See {@link ngMock.$log#assertEmpty assertEmpty()} and
-     *             {@link ngMock.$log#reset reset()}
-     */
-    this.mode = function (mode) {
-        switch (mode) {
-            case 'rethrow':
-                handler = function (e) {
-                    throw e;
-                };
-                break;
-            case 'log':
-                var errors = [];
-
-                handler = function (e) {
-                    if (arguments.length == 1) {
-                        errors.push(e);
-                    } else {
-                        errors.push([].slice.call(arguments, 0));
-                    }
-                };
-
-                handler.errors = errors;
-                break;
-            default:
-                throw Error("Unknown mode '" + mode + "', only 'log'/'rethrow' modes are allowed!");
-        }
-    };
-
-    this.$get = function () {
-        return handler;
-    };
-
-    this.mode('rethrow');
-};
-
-
-/**
- * @ngdoc service
- * @name ngMock.$log
- *
- * @description
- * Mock implementation of {@link ng.$log} that gathers all logged messages in arrays
- * (one array per logging level). These arrays are exposed as `logs` property of each of the
- * level-specific log function, e.g. for level `error` the array is exposed as `$log.error.logs`.
- *
- */
-angular.mock.$LogProvider = function () {
-
-    function concat(array1, array2, index) {
-        return array1.concat(Array.prototype.slice.call(array2, index));
-    }
-
-
-    this.$get = function () {
-        var $log = {
-            log: function () { $log.log.logs.push(concat([], arguments, 0)); },
-            warn: function () { $log.warn.logs.push(concat([], arguments, 0)); },
-            info: function () { $log.info.logs.push(concat([], arguments, 0)); },
-            error: function () { $log.error.logs.push(concat([], arguments, 0)); }
-        };
-
-        /**
-         * @ngdoc method
-         * @name ngMock.$log#reset
-         * @methodOf ngMock.$log
-         *
-         * @description
-         * Reset all of the logging arrays to empty.
-         */
-        $log.reset = function () {
-            /**
-             * @ngdoc property
-             * @name ngMock.$log#log.logs
-             * @propertyOf ngMock.$log
-             *
-             * @description
-             * Array of messages logged using {@link ngMock.$log#log}.
-             *
-             * @example
-             * <pre>
-             * $log.log('Some Log');
-             * var first = $log.log.logs.unshift();
-             * </pre>
-             */
-            $log.log.logs = [];
-            /**
-             * @ngdoc property
-             * @name ngMock.$log#warn.logs
-             * @propertyOf ngMock.$log
-             *
-             * @description
-             * Array of messages logged using {@link ngMock.$log#warn}.
-             *
-             * @example
-             * <pre>
-             * $log.warn('Some Warning');
-             * var first = $log.warn.logs.unshift();
-             * </pre>
-             */
-            $log.warn.logs = [];
-            /**
-             * @ngdoc property
-             * @name ngMock.$log#info.logs
-             * @propertyOf ngMock.$log
-             *
-             * @description
-             * Array of messages logged using {@link ngMock.$log#info}.
-             *
-             * @example
-             * <pre>
-             * $log.info('Some Info');
-             * var first = $log.info.logs.unshift();
-             * </pre>
-             */
-            $log.info.logs = [];
-            /**
-             * @ngdoc property
-             * @name ngMock.$log#error.logs
-             * @propertyOf ngMock.$log
-             *
-             * @description
-             * Array of messages logged using {@link ngMock.$log#error}.
-             *
-             * @example
-             * <pre>
-             * $log.log('Some Error');
-             * var first = $log.error.logs.unshift();
-             * </pre>
-             */
-            $log.error.logs = [];
-        };
-
-        /**
-         * @ngdoc method
-         * @name ngMock.$log#assertEmpty
-         * @methodOf ngMock.$log
-         *
-         * @description
-         * Assert that the all of the logging methods have no logged messages. If messages present, an exception is thrown.
-         */
-        $log.assertEmpty = function () {
-            var errors = [];
-            Utilities.forEach(['error', 'warn', 'info', 'log'], function (logLevel) {
-                Utilities.forEach($log[logLevel].logs, function (log) {
-                    Utilities.forEach(log, function (logItem) {
-                        errors.push('MOCK $log (' + logLevel + '): ' + String(logItem) + '\n' + (logItem.stack || ''));
-                    });
-                });
-            });
-            if (errors.length) {
-                errors.unshift("Expected $log to be empty! Either a message was logged unexpectedly, or an expected " +
-                    "log message was not checked and removed:");
-                errors.push('');
-                throw new Error(errors.join('\n---------\n'));
-            }
-        };
-
-        $log.reset();
-        return $log;
-    };
-};
-
-
-(function () {
-    var R_ISO8061_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?:\:?(\d\d)(?:\:?(\d\d)(?:\.(\d{3}))?)?)?(Z|([+-])(\d\d):?(\d\d)))?$/;
-
-    function jsonStringToDate(string) {
-        var match;
-        if (match = string.match(R_ISO8061_STR)) {
-            var date = new Date(0),
-                tzHour = 0,
-                tzMin = 0;
-            if (match[9]) {
-                tzHour = int(match[9] + match[10]);
-                tzMin = int(match[9] + match[11]);
-            }
-            date.setUTCFullYear(int(match[1]), int(match[2]) - 1, int(match[3]));
-            date.setUTCHours(int(match[4] || 0) - tzHour, int(match[5] || 0) - tzMin, int(match[6] || 0), int(match[7] || 0));
-            return date;
-        }
-        return string;
-    }
-
-    function int(str) {
-        return parseInt(str, 10);
-    }
-
-    function padNumber(num, digits, trim) {
-        var neg = '';
-        if (num < 0) {
-            neg = '-';
-            num = -num;
-        }
-        num = '' + num;
-        while (num.length < digits) num = '0' + num;
-        if (trim)
-            num = num.substr(num.length - digits);
-        return neg + num;
-    }
-
-
-    /**
-     * @ngdoc object
-     * @name angular.mock.TzDate
-     * @description
-     *
-     * *NOTE*: this is not an injectable instance, just a globally available mock class of `Date`.
-     *
-     * Mock of the Date type which has its timezone specified via constructor arg.
-     *
-     * The main purpose is to create Date-like instances with timezone fixed to the specified timezone
-     * offset, so that we can test code that depends on local timezone settings without dependency on
-     * the time zone settings of the machine where the code is running.
-     *
-     * @param {number} offset Offset of the *desired* timezone in hours (fractions will be honored)
-     * @param {(number|string)} timestamp Timestamp representing the desired time in *UTC*
-     *
-     * @example
-     * !!!! WARNING !!!!!
-     * This is not a complete Date object so only methods that were implemented can be called safely.
-     * To make matters worse, TzDate instances inherit stuff from Date via a prototype.
-     *
-     * We do our best to intercept calls to "unimplemented" methods, but since the list of methods is
-     * incomplete we might be missing some non-standard methods. This can result in errors like:
-     * "Date.prototype.foo called on incompatible Object".
-     *
-     * <pre>
-     * var newYearInBratislava = new TzDate(-1, '2009-12-31T23:00:00Z');
-     * newYearInBratislava.getTimezoneOffset() => -60;
-     * newYearInBratislava.getFullYear() => 2010;
-     * newYearInBratislava.getMonth() => 0;
-     * newYearInBratislava.getDate() => 1;
-     * newYearInBratislava.getHours() => 0;
-     * newYearInBratislava.getMinutes() => 0;
-     * newYearInBratislava.getSeconds() => 0;
-     * </pre>
-     *
-     */
-    angular.mock.TzDate = function (offset, timestamp) {
-        var self = new Date(0);
-        if (Utilities.isString(timestamp)) {
-            var tsStr = timestamp;
-
-            self.origDate = jsonStringToDate(timestamp);
-
-            timestamp = self.origDate.getTime();
-            if (isNaN(timestamp))
-                throw {
-                    name: "Illegal Argument",
-                    message: "Arg '" + tsStr + "' passed into TzDate constructor is not a valid date string"
-                };
-        } else {
-            self.origDate = new Date(timestamp);
-        }
-
-        var localOffset = new Date(timestamp).getTimezoneOffset();
-        self.offsetDiff = localOffset * 60 * 1000 - offset * 1000 * 60 * 60;
-        self.date = new Date(timestamp + self.offsetDiff);
-
-        self.getTime = function () {
-            return self.date.getTime() - self.offsetDiff;
-        };
-
-        self.toLocaleDateString = function () {
-            return self.date.toLocaleDateString();
-        };
-
-        self.getFullYear = function () {
-            return self.date.getFullYear();
-        };
-
-        self.getMonth = function () {
-            return self.date.getMonth();
-        };
-
-        self.getDate = function () {
-            return self.date.getDate();
-        };
-
-        self.getHours = function () {
-            return self.date.getHours();
-        };
-
-        self.getMinutes = function () {
-            return self.date.getMinutes();
-        };
-
-        self.getSeconds = function () {
-            return self.date.getSeconds();
-        };
-
-        self.getMilliseconds = function () {
-            return self.date.getMilliseconds();
-        };
-
-        self.getTimezoneOffset = function () {
-            return offset * 60;
-        };
-
-        self.getUTCFullYear = function () {
-            return self.origDate.getUTCFullYear();
-        };
-
-        self.getUTCMonth = function () {
-            return self.origDate.getUTCMonth();
-        };
-
-        self.getUTCDate = function () {
-            return self.origDate.getUTCDate();
-        };
-
-        self.getUTCHours = function () {
-            return self.origDate.getUTCHours();
-        };
-
-        self.getUTCMinutes = function () {
-            return self.origDate.getUTCMinutes();
-        };
-
-        self.getUTCSeconds = function () {
-            return self.origDate.getUTCSeconds();
-        };
-
-        self.getUTCMilliseconds = function () {
-            return self.origDate.getUTCMilliseconds();
-        };
-
-        self.getDay = function () {
-            return self.date.getDay();
-        };
-
-        // provide this method only on browsers that already have it
-        if (self.toISOString) {
-            self.toISOString = function () {
-                return padNumber(self.origDate.getUTCFullYear(), 4) + '-' +
-                    padNumber(self.origDate.getUTCMonth() + 1, 2) + '-' +
-                    padNumber(self.origDate.getUTCDate(), 2) + 'T' +
-                    padNumber(self.origDate.getUTCHours(), 2) + ':' +
-                    padNumber(self.origDate.getUTCMinutes(), 2) + ':' +
-                    padNumber(self.origDate.getUTCSeconds(), 2) + '.' +
-                    padNumber(self.origDate.getUTCMilliseconds(), 3) + 'Z'
-            }
-        }
-
-        //hide all methods not implemented in this mock that the Date prototype exposes
-        var unimplementedMethods = ['getUTCDay',
-            'getYear', 'setDate', 'setFullYear', 'setHours', 'setMilliseconds',
-            'setMinutes', 'setMonth', 'setSeconds', 'setTime', 'setUTCDate', 'setUTCFullYear',
-            'setUTCHours', 'setUTCMilliseconds', 'setUTCMinutes', 'setUTCMonth', 'setUTCSeconds',
-            'setYear', 'toDateString', 'toGMTString', 'toJSON', 'toLocaleFormat', 'toLocaleString',
-            'toLocaleTimeString', 'toSource', 'toString', 'toTimeString', 'toUTCString', 'valueOf'];
-
-        Utilities.forEach(unimplementedMethods, function (methodName) {
-            self[methodName] = function () {
-                throw Error("Method '" + methodName + "' is not implemented in the TzDate mock");
-            };
-        });
-
-        return self;
-    };
-
-    //make "tzDateInstance instanceof Date" return true
-    angular.mock.TzDate.prototype = Date.prototype;
-})();
-
-/**
- * @ngdoc function
- * @name angular.mock.createMockWindow
- * @description
- *
- * This function creates a mock window object useful for controlling access ot setTimeout, but mocking out
- * sufficient window's properties to allow Angular to execute.
- *
- * @example
- *
- * <pre>
-    beforeEach(module(function($provide) {
-      $provide.value('$window', window = angular.mock.createMockWindow());
-    }));
-
-    it('should do something', inject(function($window) {
-      var val = null;
-      $window.setTimeout(function() { val = 123; }, 10);
-      expect(val).toEqual(null);
-      window.setTimeout.expect(10).process();
-      expect(val).toEqual(123);
-    });
- * </pre>
- *
- */
-angular.mock.createMockWindow = function () {
-    var mockWindow = {};
-    var setTimeoutQueue = [];
-
-    mockWindow.document = window.document;
-    mockWindow.getComputedStyle = angular.bind(window, window.getComputedStyle);
-    mockWindow.scrollTo = angular.bind(window, window.scrollTo);
-    mockWindow.navigator = window.navigator;
-    mockWindow.setTimeout = function (fn, delay) {
-        setTimeoutQueue.push({ fn: fn, delay: delay });
-    };
-    mockWindow.setTimeout.queue = setTimeoutQueue;
-    mockWindow.setTimeout.expect = function (delay) {
-        if (setTimeoutQueue.length > 0) {
-            return {
-                process: function () {
-                    var tick = setTimeoutQueue.shift();
-                    expect(tick.delay).toEqual(delay);
-                    tick.fn();
-                }
-            };
-        } else {
-            expect('SetTimoutQueue empty. Expecting delay of ').toEqual(delay);
-        }
-    };
-
-    return mockWindow;
-};
-
-/**
- * @ngdoc function
- * @name angular.mock.dump
- * @description
- *
- * *NOTE*: this is not an injectable instance, just a globally available function.
- *
- * Method for serializing common angular objects (scope, elements, etc..) into strings, useful for debugging.
- *
- * This method is also available on window, where it can be used to display objects on debug console.
- *
- * @param {*} object - any object to turn into string.
- * @return {string} a serialized string of the argument
- */
-angular.mock.dump = function (object) {
-    return serialize(object);
-
-    function serialize(object) {
-        var out;
-
-        if (angular.isElement(object)) {
-            object = $(object);
-            out = $('<div></div>');
-            Utilities.forEach(object, function (element) {
-                out.append($(element).clone());
-            });
-            out = out.html();
-        } else if (Utilities.isArray(object)) {
-            out = [];
-            Utilities.forEach(object, function (o) {
-                out.push(serialize(o));
-            });
-            out = '[ ' + out.join(', ') + ' ]';
-        } else if (Utilities.isObject(object)) {
-            if (Utilities.isFunction(object.$eval) && Utilities.isFunction(object.$apply)) {
-                out = serializeScope(object);
-            } else if (object instanceof Error) {
-                out = object.stack || ('' + object.name + ': ' + object.message);
-            } else {
-                out = angular.toJson(object, true);
-            }
-        } else {
-            out = String(object);
-        }
-
-        return out;
-    }
-
-    function serializeScope(scope, offset) {
-        offset = offset || '  ';
-        var log = [offset + 'Scope(' + scope.$id + '): {'];
-        for (var key in scope) {
-            if (scope.hasOwnProperty(key) && !key.match(/^(\$|this)/)) {
-                log.push('  ' + key + ': ' + angular.toJson(scope[key]));
-            }
-        }
-        var child = scope.$$childHead;
-        while (child) {
-            log.push(serializeScope(child, offset + '  '));
-            child = child.$$nextSibling;
-        }
-        log.push('}');
-        return log.join('\n' + offset);
-    }
-};
-
-/**
- * @ngdoc object
- * @name ngMock.$httpBackend
- * @description
- * Fake HTTP backend implementation suitable for unit testing applications that use the
- * {@link ng.$http $http service}.
- *
- * *Note*: For fake HTTP backend implementation suitable for end-to-end testing or backend-less
- * development please see {@link ngMockE2E.$httpBackend e2e $httpBackend mock}.
- *
- * During unit testing, we want our unit tests to run quickly and have no external dependencies so
- * we don’t want to send {@link https://developer.mozilla.org/en/xmlhttprequest XHR} or
- * {@link http://en.wikipedia.org/wiki/JSONP JSONP} requests to a real server. All we really need is
- * to verify whether a certain request has been sent or not, or alternatively just let the
- * application make requests, respond with pre-trained responses and assert that the end result is
- * what we expect it to be.
- *
- * This mock implementation can be used to respond with static or dynamic responses via the
- * `expect` and `when` apis and their shortcuts (`expectGET`, `whenPOST`, etc).
- *
- * When an Angular application needs some data from a server, it calls the $http service, which
- * sends the request to a real server using $httpBackend service. With dependency injection, it is
- * easy to inject $httpBackend mock (which has the same API as $httpBackend) and use it to verify
- * the requests and respond with some testing data without sending a request to real server.
- *
- * There are two ways to specify what test data should be returned as http responses by the mock
- * backend when the code under test makes http requests:
- *
- * - `$httpBackend.expect` - specifies a request expectation
- * - `$httpBackend.when` - specifies a backend definition
- *
- *
- * # Request Expectations vs Backend Definitions
- *
- * Request expectations provide a way to make assertions about requests made by the application and
- * to define responses for those requests. The test will fail if the expected requests are not made
- * or they are made in the wrong order.
- *
- * Backend definitions allow you to define a fake backend for your application which doesn't assert
- * if a particular request was made or not, it just returns a trained response if a request is made.
- * The test will pass whether or not the request gets made during testing.
- *
- *
- * <table class="table">
- *   <tr><th width="220px"></th><th>Request expectations</th><th>Backend definitions</th></tr>
- *   <tr>
- *     <th>Syntax</th>
- *     <td>.expect(...).respond(...)</td>
- *     <td>.when(...).respond(...)</td>
- *   </tr>
- *   <tr>
- *     <th>Typical usage</th>
- *     <td>strict unit tests</td>
- *     <td>loose (black-box) unit testing</td>
- *   </tr>
- *   <tr>
- *     <th>Fulfills multiple requests</th>
- *     <td>NO</td>
- *     <td>YES</td>
- *   </tr>
- *   <tr>
- *     <th>Order of requests matters</th>
- *     <td>YES</td>
- *     <td>NO</td>
- *   </tr>
- *   <tr>
- *     <th>Request required</th>
- *     <td>YES</td>
- *     <td>NO</td>
- *   </tr>
- *   <tr>
- *     <th>Response required</th>
- *     <td>optional (see below)</td>
- *     <td>YES</td>
- *   </tr>
- * </table>
- *
- * In cases where both backend definitions and request expectations are specified during unit
- * testing, the request expectations are evaluated first.
- *
- * If a request expectation has no response specified, the algorithm will search your backend
- * definitions for an appropriate response.
- *
- * If a request didn't match any expectation or if the expectation doesn't have the response
- * defined, the backend definitions are evaluated in sequential order to see if any of them match
- * the request. The response from the first matched definition is returned.
- *
- *
- * # Flushing HTTP requests
- *
- * The $httpBackend used in production, always responds to requests with responses asynchronously.
- * If we preserved this behavior in unit testing, we'd have to create async unit tests, which are
- * hard to write, follow and maintain. At the same time the testing mock, can't respond
- * synchronously because that would change the execution of the code under test. For this reason the
- * mock $httpBackend has a `flush()` method, which allows the test to explicitly flush pending
- * requests and thus preserving the async api of the backend, while allowing the test to execute
- * synchronously.
- *
- *
- * # Unit testing with mock $httpBackend
- *
- * <pre>
-   // controller
-   function MyController($scope, $http) {
-     $http.get('/auth.py').success(function(data) {
-       $scope.user = data;
-     });
-
-     this.saveMessage = function(message) {
-       $scope.status = 'Saving...';
-       $http.post('/add-msg.py', message).success(function(response) {
-         $scope.status = '';
-       }).error(function() {
-         $scope.status = 'ERROR!';
-       });
-     };
-   }
-
-   // testing controller
-   var $httpBackend;
-
-   beforeEach(inject(function($injector) {
-     $httpBackend = $injector.get('$httpBackend');
-
-     // backend definition common for all tests
-     $httpBackend.when('GET', '/auth.py').respond({userId: 'userX'}, {'A-Token': 'xxx'});
-   }));
-
-
-   afterEach(function() {
-     $httpBackend.verifyNoOutstandingExpectation();
-     $httpBackend.verifyNoOutstandingRequest();
-   });
-
-
-   it('should fetch authentication token', function() {
-     $httpBackend.expectGET('/auth.py');
-     var controller = scope.$new(MyController);
-     $httpBackend.flush();
-   });
-
-
-   it('should send msg to server', function() {
-     // now you don’t care about the authentication, but
-     // the controller will still send the request and
-     // $httpBackend will respond without you having to
-     // specify the expectation and response for this request
-     $httpBackend.expectPOST('/add-msg.py', 'message content').respond(201, '');
-
-     var controller = scope.$new(MyController);
-     $httpBackend.flush();
-     controller.saveMessage('message content');
-     expect(controller.status).toBe('Saving...');
-     $httpBackend.flush();
-     expect(controller.status).toBe('');
-   });
-
-
-   it('should send auth header', function() {
-     $httpBackend.expectPOST('/add-msg.py', undefined, function(headers) {
-       // check if the header was send, if it wasn't the expectation won't
-       // match the request and the test will fail
-       return headers['Authorization'] == 'xxx';
-     }).respond(201, '');
-
-     var controller = scope.$new(MyController);
-     controller.saveMessage('whatever');
-     $httpBackend.flush();
-   });
-   </pre>
- */
-angular.mock.$HttpBackendProvider = function () {
-    this.$get = ['$rootScope', createHttpBackendMock];
-};
-
-/**
- * General factory function for $httpBackend mock.
- * Returns instance for unit testing (when no arguments specified):
- *   - passing through is disabled
- *   - auto flushing is disabled
- *
- * Returns instance for e2e testing (when `$delegate` and `$browser` specified):
- *   - passing through (delegating request to real backend) is enabled
- *   - auto flushing is enabled
- *
- * @param {Object=} $delegate Real $httpBackend instance (allow passing through if specified)
- * @param {Object=} $browser Auto-flushing enabled if specified
- * @return {Object} Instance of $httpBackend mock
- */
-function createHttpBackendMock($rootScope, $delegate, $browser) {
-    var definitions = [],
-        expectations = [],
-        responses = [],
-        responsesPush = angular.bind(responses, responses.push);
-
-    function createResponse(status, data, headers) {
-        if (Utilities.isFunction(status)) return status;
-
-        return function () {
-            return angular.isNumber(status)
-                ? [status, data, headers]
-                : [200, status, data];
-        };
-    }
-
-    // TODO(vojta): change params to: method, url, data, headers, callback
-    function $httpBackend(method, url, data, callback, headers, timeout) {
-        var xhr = new MockXhr(),
-            expectation = expectations[0],
-            wasExpected = false;
-
-        function prettyPrint(data) {
-            return (Utilities.isString(data) || Utilities.isFunction(data) || data instanceof RegExp)
-                ? data
-                : angular.toJson(data);
-        }
-
-        function wrapResponse(wrapped) {
-            if (!$browser && timeout && timeout.then) timeout.then(handleTimeout);
-
-            return handleResponse;
-
-            function handleResponse() {
-                var response = wrapped.response(method, url, data, headers);
-                xhr.$$respHeaders = response[2];
-                callback(response[0], response[1], xhr.getAllResponseHeaders());
-            }
-
-            function handleTimeout() {
-                for (var i = 0, ii = responses.length; i < ii; i++) {
-                    if (responses[i] === handleResponse) {
-                        responses.splice(i, 1);
-                        callback(-1, undefined, '');
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (expectation && expectation.match(method, url)) {
-            if (!expectation.matchData(data))
-                throw Error('Expected ' + expectation + ' with different data\n' +
-                    'EXPECTED: ' + prettyPrint(expectation.data) + '\nGOT:      ' + data);
-
-            if (!expectation.matchHeaders(headers))
-                throw Error('Expected ' + expectation + ' with different headers\n' +
-                    'EXPECTED: ' + prettyPrint(expectation.headers) + '\nGOT:      ' +
-                    prettyPrint(headers));
-
-            expectations.shift();
-
-            if (expectation.response) {
-                responses.push(wrapResponse(expectation));
-                return;
-            }
-            wasExpected = true;
-        }
-
-        var i = -1, definition;
-        while ((definition = definitions[++i])) {
-            if (definition.match(method, url, data, headers || {})) {
-                if (definition.response) {
-                    // if $browser specified, we do auto flush all requests
-                    ($browser ? $browser.defer : responsesPush)(wrapResponse(definition));
-                } else if (definition.passThrough) {
-                    $delegate(method, url, data, callback, headers, timeout);
-                } else throw Error('No response defined !');
-                return;
-            }
-        }
-        throw wasExpected ?
-            Error('No response defined !') :
-            Error('Unexpected request: ' + method + ' ' + url + '\n' +
-                (expectation ? 'Expected ' + expectation : 'No more request expected'));
-    }
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#when
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new backend definition.
-     *
-     * @param {string} method HTTP method.
-     * @param {string|RegExp} url HTTP url.
-     * @param {(string|RegExp)=} data HTTP request body.
-     * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
-     *   object and returns true if the headers match the current definition.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     *   request is handled.
-     *
-     *  - respond – `{function([status,] data[, headers])|function(function(method, url, data, headers)}`
-     *    – The respond method takes a set of static data to be returned or a function that can return
-     *    an array containing response status (number), response data (string) and response headers
-     *    (Object).
-     */
-    $httpBackend.when = function (method, url, data, headers) {
-        var definition = new MockHttpExpectation(method, url, data, headers),
-            chain = {
-                respond: function (status, data, headers) {
-                    definition.response = createResponse(status, data, headers);
-                }
-            };
-
-        if ($browser) {
-            chain.passThrough = function () {
-                definition.passThrough = true;
-            };
-        }
-
-        definitions.push(definition);
-        return chain;
-    };
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#whenGET
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new backend definition for GET requests. For more info see `when()`.
-     *
-     * @param {string|RegExp} url HTTP url.
-     * @param {(Object|function(Object))=} headers HTTP headers.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     * request is handled.
-     */
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#whenHEAD
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new backend definition for HEAD requests. For more info see `when()`.
-     *
-     * @param {string|RegExp} url HTTP url.
-     * @param {(Object|function(Object))=} headers HTTP headers.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     * request is handled.
-     */
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#whenDELETE
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new backend definition for DELETE requests. For more info see `when()`.
-     *
-     * @param {string|RegExp} url HTTP url.
-     * @param {(Object|function(Object))=} headers HTTP headers.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     * request is handled.
-     */
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#whenPOST
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new backend definition for POST requests. For more info see `when()`.
-     *
-     * @param {string|RegExp} url HTTP url.
-     * @param {(string|RegExp)=} data HTTP request body.
-     * @param {(Object|function(Object))=} headers HTTP headers.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     * request is handled.
-     */
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#whenPUT
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new backend definition for PUT requests.  For more info see `when()`.
-     *
-     * @param {string|RegExp} url HTTP url.
-     * @param {(string|RegExp)=} data HTTP request body.
-     * @param {(Object|function(Object))=} headers HTTP headers.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     * request is handled.
-     */
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#whenJSONP
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new backend definition for JSONP requests. For more info see `when()`.
-     *
-     * @param {string|RegExp} url HTTP url.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     * request is handled.
-     */
-    createShortMethods('when');
-
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#expect
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new request expectation.
-     *
-     * @param {string} method HTTP method.
-     * @param {string|RegExp} url HTTP url.
-     * @param {(string|RegExp)=} data HTTP request body.
-     * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
-     *   object and returns true if the headers match the current expectation.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     *  request is handled.
-     *
-     *  - respond – `{function([status,] data[, headers])|function(function(method, url, data, headers)}`
-     *    – The respond method takes a set of static data to be returned or a function that can return
-     *    an array containing response status (number), response data (string) and response headers
-     *    (Object).
-     */
-    $httpBackend.expect = function (method, url, data, headers) {
-        var expectation = new MockHttpExpectation(method, url, data, headers);
-        expectations.push(expectation);
-        return {
-            respond: function (status, data, headers) {
-                expectation.response = createResponse(status, data, headers);
-            }
-        };
-    };
-
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#expectGET
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new request expectation for GET requests. For more info see `expect()`.
-     *
-     * @param {string|RegExp} url HTTP url.
-     * @param {Object=} headers HTTP headers.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     * request is handled. See #expect for more info.
-     */
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#expectHEAD
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new request expectation for HEAD requests. For more info see `expect()`.
-     *
-     * @param {string|RegExp} url HTTP url.
-     * @param {Object=} headers HTTP headers.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     *   request is handled.
-     */
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#expectDELETE
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new request expectation for DELETE requests. For more info see `expect()`.
-     *
-     * @param {string|RegExp} url HTTP url.
-     * @param {Object=} headers HTTP headers.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     *   request is handled.
-     */
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#expectPOST
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new request expectation for POST requests. For more info see `expect()`.
-     *
-     * @param {string|RegExp} url HTTP url.
-     * @param {(string|RegExp)=} data HTTP request body.
-     * @param {Object=} headers HTTP headers.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     *   request is handled.
-     */
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#expectPUT
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new request expectation for PUT requests. For more info see `expect()`.
-     *
-     * @param {string|RegExp} url HTTP url.
-     * @param {(string|RegExp)=} data HTTP request body.
-     * @param {Object=} headers HTTP headers.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     *   request is handled.
-     */
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#expectPATCH
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new request expectation for PATCH requests. For more info see `expect()`.
-     *
-     * @param {string|RegExp} url HTTP url.
-     * @param {(string|RegExp)=} data HTTP request body.
-     * @param {Object=} headers HTTP headers.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     *   request is handled.
-     */
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#expectJSONP
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Creates a new request expectation for JSONP requests. For more info see `expect()`.
-     *
-     * @param {string|RegExp} url HTTP url.
-     * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-     *   request is handled.
-     */
-    createShortMethods('expect');
-
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#flush
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Flushes all pending requests using the trained responses.
-     *
-     * @param {number=} count Number of responses to flush (in the order they arrived). If undefined,
-     *   all pending requests will be flushed. If there are no pending requests when the flush method
-     *   is called an exception is thrown (as this typically a sign of programming error).
-     */
-    $httpBackend.flush = function (count) {
-        $rootScope.$digest();
-        if (!responses.length) throw Error('No pending request to flush !');
-
-        if (Utilities.isDefined(count)) {
-            while (count--) {
-                if (!responses.length) throw Error('No more pending request to flush !');
-                responses.shift()();
-            }
-        } else {
-            while (responses.length) {
-                responses.shift()();
-            }
-        }
-        $httpBackend.verifyNoOutstandingExpectation();
-    };
-
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#verifyNoOutstandingExpectation
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Verifies that all of the requests defined via the `expect` api were made. If any of the
-     * requests were not made, verifyNoOutstandingExpectation throws an exception.
-     *
-     * Typically, you would call this method following each test case that asserts requests using an
-     * "afterEach" clause.
-     *
-     * <pre>
-     *   afterEach($httpBackend.verifyExpectations);
-     * </pre>
-     */
-    $httpBackend.verifyNoOutstandingExpectation = function () {
-        $rootScope.$digest();
-        if (expectations.length) {
-            throw Error('Unsatisfied requests: ' + expectations.join(', '));
-        }
-    };
-
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#verifyNoOutstandingRequest
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Verifies that there are no outstanding requests that need to be flushed.
-     *
-     * Typically, you would call this method following each test case that asserts requests using an
-     * "afterEach" clause.
-     *
-     * <pre>
-     *   afterEach($httpBackend.verifyNoOutstandingRequest);
-     * </pre>
-     */
-    $httpBackend.verifyNoOutstandingRequest = function () {
-        if (responses.length) {
-            throw Error('Unflushed requests: ' + responses.length);
-        }
-    };
-
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$httpBackend#resetExpectations
-     * @methodOf ngMock.$httpBackend
-     * @description
-     * Resets all request expectations, but preserves all backend definitions. Typically, you would
-     * call resetExpectations during a multiple-phase test when you want to reuse the same instance of
-     * $httpBackend mock.
-     */
-    $httpBackend.resetExpectations = function () {
-        expectations.length = 0;
-        responses.length = 0;
-    };
-
-    return $httpBackend;
-
-
-    function createShortMethods(prefix) {
-        Utilities.forEach(['GET', 'DELETE', 'JSONP'], function (method) {
-            $httpBackend[prefix + method] = function (url, headers) {
-                return $httpBackend[prefix](method, url, undefined, headers)
-            }
-        });
-
-        Utilities.forEach(['PUT', 'POST', 'PATCH'], function (method) {
-            $httpBackend[prefix + method] = function (url, data, headers) {
-                return $httpBackend[prefix](method, url, data, headers)
-            }
-        });
-    }
-}
-
-function MockHttpExpectation(method, url, data, headers) {
-
-    this.data = data;
-    this.headers = headers;
-
-    this.match = function (m, u, d, h) {
-        if (method != m) return false;
-        if (!this.matchUrl(u)) return false;
-        if (Utilities.isDefined(d) && !this.matchData(d)) return false;
-        if (Utilities.isDefined(h) && !this.matchHeaders(h)) return false;
-        return true;
-    };
-
-    this.matchUrl = function (u) {
-        if (!url) return true;
-        if (Utilities.isFunction(url.test)) return url.test(u);
-        return url == u;
-    };
-
-    this.matchHeaders = function (h) {
-        if (Utilities.isUndefined(headers)) return true;
-        if (Utilities.isFunction(headers)) return headers(h);
-        return Utilities.equals(headers, h);
-    };
-
-    this.matchData = function (d) {
-        if (Utilities.isUndefined(data)) return true;
-        if (data && Utilities.isFunction(data.test)) return data.test(d);
-        if (data && !Utilities.isString(data)) return Utilities.toJson(data) == d;
-        return data == d;
-    };
-
-    this.toString = function () {
-        return method + ' ' + url;
-    };
-}
-
-function MockXhr() {
-
-    // hack for testing $http, $httpBackend
-    MockXhr.$$lastInstance = this;
-
-    this.open = function (method, url, async) {
-        this.$$method = method;
-        this.$$url = url;
-        this.$$async = async;
-        this.$$reqHeaders = {};
-        this.$$respHeaders = {};
-    };
-
-    this.send = function (data) {
-        this.$$data = data;
-    };
-
-    this.setRequestHeader = function (key, value) {
-        this.$$reqHeaders[key] = value;
-    };
-
-    this.getResponseHeader = function (name) {
-        // the lookup must be case insensitive, that's why we try two quick lookups and full scan at last
-        var header = this.$$respHeaders[name];
-        if (header) return header;
-
-        name = name.toLowerCase();
-        header = this.$$respHeaders[name];
-        if (header) return header;
-
-        header = undefined;
-        Utilities.forEach(this.$$respHeaders, function (headerVal, headerName) {
-            if (!header && headerName.toLowerCase() == name) header = headerVal;
-        });
-        return header;
-    };
-
-    this.getAllResponseHeaders = function () {
-        var lines = [];
-
-        Utilities.forEach(this.$$respHeaders, function (value, key) {
-            lines.push(key + ': ' + value);
-        });
-        return lines.join('\n');
-    };
-
-    this.abort = angular.noop;
-}
-
-
-/**
- * @ngdoc function
- * @name ngMock.$timeout
- * @description
- *
- * This service is just a simple decorator for {@link ng.$timeout $timeout} service
- * that adds a "flush" and "verifyNoPendingTasks" methods.
- */
-
-angular.mock.$TimeoutDecorator = function ($delegate, $browser) {
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$timeout#flush
-     * @methodOf ngMock.$timeout
-     * @description
-     *
-     * Flushes the queue of pending tasks.
-     */
-    $delegate.flush = function () {
-        $browser.defer.flush();
-    };
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$timeout#verifyNoPendingTasks
-     * @methodOf ngMock.$timeout
-     * @description
-     *
-     * Verifies that there are no pending tasks that need to be flushed.
-     */
-    $delegate.verifyNoPendingTasks = function () {
-        if ($browser.deferredFns.length) {
-            throw Error('Deferred tasks to flush (' + $browser.deferredFns.length + '): ' +
-                formatPendingTasksAsString($browser.deferredFns));
-        }
-    };
-
-    function formatPendingTasksAsString(tasks) {
-        var result = [];
-        Utilities.forEach(tasks, function (task) {
-            result.push('{id: ' + task.id + ', ' + 'time: ' + task.time + '}');
-        });
-
-        return result.join(', ');
-    }
-
-    return $delegate;
-};
-
-/**
- *
- */
-angular.mock.$RootElementProvider = function () {
-    this.$get = function () {
-        return $('<div ng-app></div>');
-    }
-};
-
-/**
- * @ngdoc overview
- * @name ngMock
- * @description
- *
- * The `ngMock` is an angular module which is used with `ng` module and adds unit-test configuration as well as useful
- * mocks to the {@link AUTO.$injector $injector}.
- */
-angular.module('ngMock', ['ng']).provider({
-    $browser: angular.mock.$BrowserProvider,
-    $exceptionHandler: angular.mock.$ExceptionHandlerProvider,
-    $log: angular.mock.$LogProvider,
-    $httpBackend: angular.mock.$HttpBackendProvider,
-    $rootElement: angular.mock.$RootElementProvider
-}).config(function ($provide) {
-    $provide.decorator('$timeout', angular.mock.$TimeoutDecorator);
-});
-
-/**
- * @ngdoc overview
- * @name ngMockE2E
- * @description
- *
- * The `ngMockE2E` is an angular module which contains mocks suitable for end-to-end testing.
- * Currently there is only one mock present in this module -
- * the {@link ngMockE2E.$httpBackend e2e $httpBackend} mock.
- */
-angular.module('ngMockE2E', ['ng']).config(function ($provide) {
-    $provide.decorator('$httpBackend', angular.mock.e2e.$httpBackendDecorator);
-});
-
-/**
- * @ngdoc object
- * @name ngMockE2E.$httpBackend
- * @description
- * Fake HTTP backend implementation suitable for end-to-end testing or backend-less development of
- * applications that use the {@link ng.$http $http service}.
- *
- * *Note*: For fake http backend implementation suitable for unit testing please see
- * {@link ngMock.$httpBackend unit-testing $httpBackend mock}.
- *
- * This implementation can be used to respond with static or dynamic responses via the `when` api
- * and its shortcuts (`whenGET`, `whenPOST`, etc) and optionally pass through requests to the
- * real $httpBackend for specific requests (e.g. to interact with certain remote apis or to fetch
- * templates from a webserver).
- *
- * As opposed to unit-testing, in an end-to-end testing scenario or in scenario when an application
- * is being developed with the real backend api replaced with a mock, it is often desirable for
- * certain category of requests to bypass the mock and issue a real http request (e.g. to fetch
- * templates or static files from the webserver). To configure the backend with this behavior
- * use the `passThrough` request handler of `when` instead of `respond`.
- *
- * Additionally, we don't want to manually have to flush mocked out requests like we do during unit
- * testing. For this reason the e2e $httpBackend automatically flushes mocked out requests
- * automatically, closely simulating the behavior of the XMLHttpRequest object.
- *
- * To setup the application to run with this http backend, you have to create a module that depends
- * on the `ngMockE2E` and your application modules and defines the fake backend:
- *
- * <pre>
- *   myAppDev = angular.module('myAppDev', ['myApp', 'ngMockE2E']);
- *   myAppDev.run(function($httpBackend) {
- *     phones = [{name: 'phone1'}, {name: 'phone2'}];
- *
- *     // returns the current list of phones
- *     $httpBackend.whenGET('/phones').respond(phones);
- *
- *     // adds a new phone to the phones array
- *     $httpBackend.whenPOST('/phones').respond(function(method, url, data) {
- *       phones.push(JSON.parse(data));
- *     });
- *     $httpBackend.whenGET(/^\/templates\//).passThrough();
- *     //...
- *   });
- * </pre>
- *
- * Afterwards, bootstrap your app with this new module.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#when
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition.
- *
- * @param {string} method HTTP method.
- * @param {string|RegExp} url HTTP url.
- * @param {(string|RegExp)=} data HTTP request body.
- * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
- *   object and returns true if the headers match the current definition.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- *
- *  - respond – `{function([status,] data[, headers])|function(function(method, url, data, headers)}`
- *    – The respond method takes a set of static data to be returned or a function that can return
- *    an array containing response status (number), response data (string) and response headers
- *    (Object).
- *  - passThrough – `{function()}` – Any request matching a backend definition with `passThrough`
- *    handler, will be pass through to the real backend (an XHR request will be made to the
- *    server.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenGET
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for GET requests. For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenHEAD
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for HEAD requests. For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenDELETE
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for DELETE requests. For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenPOST
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for POST requests. For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @param {(string|RegExp)=} data HTTP request body.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenPUT
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for PUT requests.  For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @param {(string|RegExp)=} data HTTP request body.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenPATCH
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for PATCH requests.  For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @param {(string|RegExp)=} data HTTP request body.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenJSONP
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for JSONP requests. For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-angular.mock.e2e = {};
-angular.mock.e2e.$httpBackendDecorator = ['$rootScope', '$delegate', '$browser', createHttpBackendMock];
-
-
-angular.mock.clearDataCache = function () {
-    var key,
-        cache = angular.element.cache;
-
-    for (key in cache) {
-        if (cache.hasOwnProperty(key)) {
-            var handle = cache[key].handle;
-
-            handle && $(handle.elem).unbind();
-            delete cache[key];
-        }
-    }
-};
-
-
-window.jstestdriver && (function (window) {
-    /**
-     * Global method to output any number of objects into JSTD console. Useful for debugging.
-     */
-    window.dump = function () {
-        var args = [];
-        Utilities.forEach(arguments, function (arg) {
-            args.push(angular.mock.dump(arg));
-        });
-        jstestdriver.console.log.apply(jstestdriver.console, args);
-        if (window.console) {
-            window.console.log.apply(window.console, args);
-        }
-    };
-})(window);
-
-
-(window.jasmine || window.mocha) && (function (window) {
-
-    var currentSpec = null;
-
-    beforeEach(function () {
-        currentSpec = this;
-    });
-
-    afterEach(function () {
-        var injector = currentSpec.$injector;
-
-        currentSpec.$injector = null;
-        currentSpec.$modules = null;
-        currentSpec = null;
-
-        if (injector) {
-            injector.get('$rootElement').unbind();
-            injector.get('$browser').pollFns.length = 0;
-        }
-
-        angular.mock.clearDataCache();
-
-        // clean up jquery's fragment cache
-        Utilities.forEach(angular.element.fragments, function (val, key) {
-            delete angular.element.fragments[key];
-        });
-
-        MockXhr.$$lastInstance = null;
-
-        Utilities.forEach(angular.callbacks, function (val, key) {
-            delete angular.callbacks[key];
-        });
-        angular.callbacks.counter = 0;
-    });
-
-    function isSpecRunning() {
-        return currentSpec && (window.mocha || currentSpec.queue.running);
-    }
-
-    /**
-     * @ngdoc function
-     * @name angular.mock.module
-     * @description
-     *
-     * *NOTE*: This function is also published on window for easy access.<br>
-     *
-     * This function registers a module configuration code. It collects the configuration information
-     * which will be used when the injector is created by {@link angular.mock.inject inject}.
-     *
-     * See {@link angular.mock.inject inject} for usage example
-     *
-     * @param {...(string|Function)} fns any number of modules which are represented as string
-     *        aliases or as anonymous module initialization functions. The modules are used to
-     *        configure the injector. The 'ng' and 'ngMock' modules are automatically loaded.
-     */
-    window.module = angular.mock.module = function () {
-        var moduleFns = Array.prototype.slice.call(arguments, 0);
-        return isSpecRunning() ? workFn() : workFn;
-        /////////////////////
-        function workFn() {
-            if (currentSpec.$injector) {
-                throw Error('Injector already created, can not register a module!');
-            } else {
-                var modules = currentSpec.$modules || (currentSpec.$modules = []);
-                Utilities.forEach(moduleFns, function (module) {
-                    modules.push(module);
-                });
-            }
-        }
-    };
-
-    /**
-     * @ngdoc function
-     * @name angular.mock.inject
-     * @description
-     *
-     * *NOTE*: This function is also published on window for easy access.<br>
-     *
-     * The inject function wraps a function into an injectable function. The inject() creates new
-     * instance of {@link AUTO.$injector $injector} per test, which is then used for
-     * resolving references.
-     *
-     * See also {@link angular.mock.module module}
-     *
-     * Example of what a typical jasmine tests looks like with the inject method.
-     * <pre>
-     *
-     *   angular.module('myApplicationModule', [])
-     *       .value('mode', 'app')
-     *       .value('version', 'v1.0.1');
-     *
-     *
-     *   describe('MyApp', function() {
-     *
-     *     // You need to load modules that you want to test,
-     *     // it loads only the "ng" module by default.
-     *     beforeEach(module('myApplicationModule'));
-     *
-     *
-     *     // inject() is used to inject arguments of all given functions
-     *     it('should provide a version', inject(function(mode, version) {
-     *       expect(version).toEqual('v1.0.1');
-     *       expect(mode).toEqual('app');
-     *     }));
-     *
-     *
-     *     // The inject and module method can also be used inside of the it or beforeEach
-     *     it('should override a version and test the new version is injected', function() {
-     *       // module() takes functions or strings (module aliases)
-     *       module(function($provide) {
-     *         $provide.value('version', 'overridden'); // override version here
-     *       });
-     *
-     *       inject(function(version) {
-     *         expect(version).toEqual('overridden');
-     *       });
-     *     ));
-     *   });
-     *
-     * </pre>
-     *
-     * @param {...Function} fns any number of functions which will be injected using the injector.
-     */
-    window.inject = angular.mock.inject = function () {
-        var blockFns = Array.prototype.slice.call(arguments, 0);
-        var errorForStack = new Error('Declaration Location');
-        return isSpecRunning() ? workFn() : workFn;
-        /////////////////////
-        function workFn() {
-            var modules = currentSpec.$modules || [];
-
-            modules.unshift('ngMock');
-            modules.unshift('ng');
-            var injector = currentSpec.$injector;
-            if (!injector) {
-                injector = currentSpec.$injector = angular.injector(modules);
-            }
-            for (var i = 0, ii = blockFns.length; i < ii; i++) {
-                try {
-                    injector.invoke(blockFns[i] || angular.noop, this);
-                } catch (e) {
-                    if (e.stack && errorForStack) e.stack += '\n' + errorForStack.stack;
-                    throw e;
-                } finally {
-                    errorForStack = null;
-                }
-            }
-        }
-    };
-})(window);
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/content/create-content-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/content/create-content-controller.spec.js
deleted file mode 100644
index 5954a2f984..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/app/content/create-content-controller.spec.js
+++ /dev/null
@@ -1,133 +0,0 @@
-(function () {
-
-    describe("create content dialog",
-        function () {
-
-            var scope,
-                allowedTypes = [
-                    { id: 1, alias: "x" },
-                    { id: 2, alias: "y", blueprints: { "1": "a", "2": "b" } }
-                ],
-                location,
-                searcher,
-                controller,
-                rootScope,
-                contentTypeResource;
-
-            beforeEach(module("umbraco"));
-
-            function initialize(blueprintConfig) {
-                scope = rootScope.$new();
-                scope.currentNode = { id: 1234 };
-                var dependencies = {
-                    $scope: scope,
-                    contentTypeResource: contentTypeResource
-                };
-                if (blueprintConfig) {
-                    dependencies.blueprintConfig = blueprintConfig;
-                }
-                controller("Umbraco.Editors.Content.CreateController",
-                    dependencies);
-
-                scope.$digest();
-
-            }
-
-            beforeEach(inject(function ($controller, $rootScope, $q, $location, authMocks) {
-
-                authMocks.register();
-
-                contentTypeResource = {
-                    getAllowedTypes: function () {
-                        var def = $q.defer();
-                        def.resolve(allowedTypes);
-                        return def.promise;
-                    }
-                };
-                location = $location;
-                controller = $controller;
-                rootScope = $rootScope;
-
-                searcher = { search: function () { } };
-                spyOn(location, "path").and.returnValue(searcher)
-                spyOn(searcher, "search").and.returnValue(searcher);
-
-                initialize();
-            }));
-
-            it("shows available child document types for the given node",
-                function () {
-                    expect(scope.selectContentType).toBe(true);
-                    expect(scope.allowedTypes).toBe(allowedTypes);
-                });
-
-            it("creates content directly when there are no blueprints",
-                function () {
-                    scope.createOrSelectBlueprintIfAny(allowedTypes[0]);
-
-                    expect(location.path).toHaveBeenCalledWith("/content/content/edit/1234");
-                    expect(searcher.search).toHaveBeenCalledWith('doctype', 'x');
-                    expect(searcher.search).toHaveBeenCalledWith('create', 'true');
-                });
-
-            it("shows list of blueprints when there are some",
-                function () {
-                    scope.createOrSelectBlueprintIfAny(allowedTypes[1]);
-                    expect(scope.selectContentType).toBe(false);
-                    expect(scope.selectBlueprint).toBe(true);
-                    expect(scope.docType).toBe(allowedTypes[1]);
-                });
-
-            it("creates blueprint when selected",
-                function () {
-                    scope.createOrSelectBlueprintIfAny(allowedTypes[1]);
-                    scope.createFromBlueprint("1");
-
-                    expect(location.path).toHaveBeenCalledWith("/content/content/edit/1234");
-                    expect(searcher.search).toHaveBeenCalledWith("doctype", "y");
-                    expect(searcher.search).toHaveBeenCalledWith("create", "true");
-                    expect(searcher.search).toHaveBeenCalledWith("blueprintId", "1");
-                });
-
-            it("skips selection and creates first blueprint when configured to",
-                function () {
-                    initialize({
-                        allowBlank: true,
-                        skipSelect: true
-                    });
-
-                    scope.createOrSelectBlueprintIfAny(allowedTypes[1]);
-
-                    expect(location.path).toHaveBeenCalledWith("/content/content/edit/1234");
-                    expect(searcher.search).toHaveBeenCalledWith("doctype", "y");
-                    expect(searcher.search).toHaveBeenCalledWith("create", "true");
-                    expect(searcher.search).toHaveBeenCalledWith("blueprintId", "1");
-                });
-
-            it("allows blank to be selected",
-                function () {
-                    expect(scope.allowBlank).toBe(true);
-                });
-
-            it("creates blank when selected",
-                function () {
-                    scope.createBlank(allowedTypes[1]);
-
-                    expect(location.path).toHaveBeenCalledWith("/content/content/edit/1234");
-                    expect(searcher.search).toHaveBeenCalledWith('doctype', 'y');
-                    expect(searcher.search).toHaveBeenCalledWith('create', 'true');
-                });
-
-            it("hides blank when configured to",
-                function () {
-                    initialize({
-                        allowBlank: false,
-                        skipSelect: false
-                    });
-
-                    expect(scope.allowBlank).toBe(false);
-                });
-
-        });
-
-}());
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js
deleted file mode 100644
index 949ec4eef9..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js
+++ /dev/null
@@ -1,94 +0,0 @@
-// The content editor has been wrapped in a directive
-// The current setup will have problems with loading the HTML etc.
-// These tests are therefore ignored for now.
-
-// describe('edit content controller tests', function () {
-    // var scope, controller, routeParams, httpBackend, wasSaved, q;
-    // routeParams = {id: 1234, create: false};
-
-    // beforeEach(module('umbraco'));
-
-    // //inject the contentMocks service
-    // beforeEach(inject(function ($rootScope, $q, $controller, $compile, angularHelper, $httpBackend, contentMocks, entityMocks, mocksUtils, localizationMocks) {
-      // q = $q;
-        // //for these tests we don't want any authorization to occur
-        // mocksUtils.disableAuth();
-
-        // httpBackend = $httpBackend;
-        // scope = $rootScope.$new();
-        
-        // //have the contentMocks register its expect urls on the httpbackend
-        // //see /mocks/content.mocks.js for how its setup
-        // contentMocks.register();
-        // entityMocks.register();
-        // localizationMocks.register();
-
-        // //this controller requires an angular form controller applied to it
-        // scope.contentForm = angularHelper.getNullForm("contentForm");
-
-        // var deferred = $q.defer();
-        // wasSaved = false;
-        // scope.saveMethod = function() { wasSaved = true; };
-        // scope.getMethod = function() { return function() { return deferred.promise; } };
-        // scope.treeAlias = "content";
-
-        // controller = $controller('Umbraco.Editors.Content.EditorDirectiveController', {
-            // $scope: scope,
-            // $routeParams: routeParams
-        // });
-
-        // //For controller tests its easiest to have the digest and flush happen here
-        // //since its intially always the same $http calls made
-
-        // // Resolve the get method
-        // deferred.resolve(mocksUtils.getMockContent(1234));
-
-        // //scope.$digest resolves the promise
-        // scope.$digest();
-    // }));
-
-    // describe('content edit controller save and publish', function () {
-        
-        // it('it should have an content object', function() {
-            // //controller should have a content object
-            // expect(scope.content).not.toBeUndefined();
-
-            // //if should be the same as the routeParams defined one
-            // expect(scope.content.id).toBe(1234);
-        // });
-
-        // it('it should have a tabs collection', function () {
-          // expect(scope.content.tabs.length).toBe(7);
-        // });
-
-        // it('it should have a properties collection on each tab', function () {
-              // $(scope.content.tabs).each(function(i, tab){
-                  // expect(tab.properties.length).toBeGreaterThan(0);
-              // });
-        // });
-
-        
-        // it('it should change updateDate on save', function () {
-          // var currentUpdateDate = scope.content.updateDate;
-
-          // setTimeout(function(){
-              // scope.save(scope.content);
-              // expect(scope.content.updateDate).toBeGreaterThan(currentUpdateDate);
-              // }, 1000);
-        // });
-
-        // it('it should change publishDate on publish', function () {
-          // var currentPublishDate = scope.content.publishDate;
-
-          // //wait a sec before you publish
-          // setTimeout(function(){
-              // scope.saveAndPublish(scope.content);
-              
-              // expect(scope.content.publishDate).toBeGreaterThan(currentPublishDate);
-              
-              // }, 1000);
-        // });
-
-
-    // });
-// });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js
deleted file mode 100644
index 484cbeb0dc..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js
+++ /dev/null
@@ -1,59 +0,0 @@
-describe('edit media controller tests', function () {
-    var scope, controller, routeParams, httpBackend;
-    routeParams = { id: 1234, create: false };
-
-    beforeEach(module('umbraco'));
-
-    //inject the contentMocks service
-    beforeEach(inject(function ($rootScope, $controller, angularHelper, $httpBackend, mediaMocks, entityMocks, mocksUtils, localizationMocks) {
-        //for these tests we don't want any authorization to occur
-        mocksUtils.disableAuth();
-
-        httpBackend = $httpBackend;
-        scope = $rootScope.$new();
-
-        //have the contentMocks register its expect urls on the httpbackend
-        //see /mocks/content.mocks.js for how its setup
-        mediaMocks.register();
-        entityMocks.register();
-        localizationMocks.register();
-
-        //this controller requires an angular form controller applied to it
-        scope.contentForm = angularHelper.getNullForm("contentForm");
-
-        controller = $controller('Umbraco.Editors.Media.EditController', {
-            $scope: scope,
-            $routeParams: routeParams
-        });
-
-        //For controller tests its easiest to have the digest and flush happen here
-        //since its intially always the same $http calls made
-
-        //scope.$digest resolves the promise against the httpbackend
-        scope.$digest();
-        //httpbackend.flush() resolves all request against the httpbackend
-        //to fake a async response, (which is what happens on a real setup)
-        httpBackend.flush();
-    }));
-
-    describe('media edit controller init', function () {
-
-        it('it should have an media object', function () {
-
-            //controller should have a content object
-            expect(scope.content).not.toBeUndefined();
-
-            //if should be the same as the routeParams defined one
-            expect(scope.content.id).toBe(1234);
-        });
-
-        it('it should have an apps collection', function () {
-            expect(scope.content.apps.length).toBe(2);
-        });
-
-        it('it should have added an info app', function () {
-            expect(scope.content.apps[1].alias).toBe("info");
-        });
-        
-    });
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
deleted file mode 100644
index c111421d75..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
+++ /dev/null
@@ -1,115 +0,0 @@
-describe('Content picker controller tests', function () {
-    var scope, controller, httpBackend;
-    routeParams = {id: 1234, create: false};
-
-    beforeEach(module('umbraco'));
-
-    //inject the contentMocks service
-    beforeEach(inject(function ($rootScope, $controller, angularHelper, $httpBackend, entityMocks, mocksUtils, localizationMocks, userMocks) {
-
-        //for these tests we don't want any authorization to occur
-        mocksUtils.setAuth();
-		
-        httpBackend = $httpBackend;
-        scope = $rootScope.$new();
-
-        scope.model = {
-                        alias: "property",
-                        value:"1233,1231,23121",
-                        label: "My content picker",
-                        description: "desc",
-                        config: {
-                            startNode: {
-                                type: "content"
-                            }
-                        }
-                      };
-
-        //this controller requires an angular form controller applied to it
-        scope.contentPickerForm = angularHelper.getNullForm("contentPickerForm");
-        scope.contentPickerForm.minCount = angularHelper.getNullForm("minCount");
-        scope.contentPickerForm.maxCount = angularHelper.getNullForm("maxCount");
-        
-        //have the contentMocks register its expect urls on the httpbackend
-        //see /mocks/content.mocks.js for how its setup
-        entityMocks.register();
-        localizationMocks.register();
-        userMocks.register();
-
-        controller = $controller('Umbraco.PropertyEditors.ContentPickerController', {
-            $scope: scope,
-            $routeParams: routeParams
-        });
-
-        //For controller tests its easiest to have the digest and flush happen here
-        //since its intially always the same $http calls made
-		
-        //scope.$digest resolves the promise against the httpbackend
-        scope.$digest();
-
-        //httpbackend.flush() resolves all request against the httpbackend
-        //to fake a async response, (which is what happens on a real setup)
-        httpBackend.flush();
-    }));
-
-    describe('content edit controller save and publish', function () {
-        
-        var item;
-
-        beforeEach(function () {
-            item = {
-                name: "meh",
-                id: 666,
-                icon: "woop"
-            };
-        });
-
-        it('should define the default properties on construction', function () {
-            expect(scope.model.value).not.toBeUndefined();            
-        });
-        
-        it("should populate scope.renderModel", function(){
-            expect(scope.renderModel).not.toBeUndefined();
-            expect(scope.renderModel.length).toBe(3);
-        });
-
-        it("Each rendermodel item should contain name, id and icon", function(){
-            var item = scope.renderModel[0];
-            expect(item.name).not.toBeUndefined();
-            expect(item.id).toBe(1233);
-            expect(item.icon).not.toBeUndefined();
-        });
-
-        it("Removing an item should update renderModel, ids and model.value", function(){
-            scope.remove(1);
-            scope.$apply();
-            expect(scope.renderModel.length).toBe(2);
-            expect(scope.model.value).toBe("1233,23121");
-        });
-
-        it("Adding an item should update renderModel, ids and model.value", function(){
-            
-            scope.add(item);
-            scope.$apply();
-            httpBackend.flush();
-
-            expect(scope.renderModel.length).toBe(4);
-            expect(scope.model.value).toBe("1233,1231,23121,666");
-        });
-
-        it("Adding a duplicate item should note update renderModel, ids and model.value", function(){
-            scope.add(item);
-            scope.$apply();
-            httpBackend.flush();
-            expect(scope.renderModel.length).toBe(4);
-            expect(scope.model.value).toBe("1233,1231,23121,666");
-
-            scope.add(item);
-            scope.$apply();
-            
-            expect(scope.renderModel.length).toBe(4);
-            expect(scope.model.value).toBe("1233,1231,23121,666");
-
-        });  
-    });
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/dropdown-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/dropdown-controller.spec.js
deleted file mode 100644
index a82a926a6d..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/dropdown-controller.spec.js
+++ /dev/null
@@ -1,90 +0,0 @@
-describe('Drop down controller tests', function () {
-    var scope, controllerFactory;
-    
-    beforeEach(module('umbraco'));
-
-    beforeEach(inject(function ($rootScope, $controller) {
-
-        controllerFactory = $controller;
-        scope = $rootScope.$new();
-        scope.model = {};
-    }));
-
-    describe('initialization', function () {
-
-        it('should define the default properties on construction', function () {
-             
-            controllerFactory('Umbraco.PropertyEditors.DropdownFlexibleController', {
-                $scope: scope,
-                $routeParams: routeParams
-            });
-            
-            expect(scope.model.config).toBeDefined();
-            expect(scope.model.config.items).toBeDefined();
-            expect(scope.model.config.multiple).toBeDefined();
-        });
-    
-        it("should convert simple array to dictionary", function () {
-            
-            scope.model = {
-                config: {
-                    items: ["value0", "value1", "value2"]
-                }
-            };
-
-            controllerFactory('Umbraco.PropertyEditors.DropdownFlexibleController', {
-                $scope: scope,
-                $routeParams: routeParams
-            });
-             
-            // this should be the expected format based on the changes made to the sortable prevalues
-            expect(scope.model.config.items[0].value).toBe("value0");
-            expect(scope.model.config.items[1].value).toBe("value1");
-            expect(scope.model.config.items[2].value).toBe("value2"); 
-        });
-        
-
-        it("should allow an existing valid dictionary", function () {
-
-            scope.model = {
-                config: {
-                    items: {
-                        "value0" : "Value 0",
-                        "value1" : "Value 1",
-                        "value2" : "Value 2" 
-                    }
-                }
-            };
-
-            var test = function() {
-                controllerFactory('Umbraco.PropertyEditors.DropdownFlexibleController', {
-                    $scope: scope,
-                    $routeParams: routeParams
-                });
-            };
-
-            expect(test).not.toThrow();
-
-        });
-        
-        it("should not allow a non-array or non-dictionary", function () {
-
-            scope.model = {
-                config: {
-                    items: true
-                }
-            };
-
-            var test = function () {
-                controllerFactory('Umbraco.PropertyEditors.DropdownFlexibleController', {
-                    $scope: scope,
-                    $routeParams: routeParams
-                });
-            };
-
-            expect(test).toThrow();
-
-        });
-
-    });
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js
deleted file mode 100644
index b60969b3d2..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/rte-controller.spec.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*describe('RTE controller tests', function () {
-    var scope, controllerFactory, element;
-
-    //mock tinymce globals
-    if ((typeof tinymce) === "undefined") {
-        tinymce = {
-            DOM: {
-                events: {
-                    domLoaded: false
-                }
-            },
-            baseUrl: ""
-        }
-    }
-
-    beforeEach(module('LocalStorageModule'));
-
-    beforeEach(module('umbraco', function ($provide) {
-        $provide.value('tinyMceAssets', []);
-    }));
-
-    beforeEach(inject(function ($rootScope, $controller) {
-        controllerFactory = $controller;
-        scope = $rootScope.$new();
-        scope.model = {value: "<p>hello</p>"};
-        element = $("<div></div>");
-    }));
-
-
-    describe('initialization', function () {
-
-        it('should define the default properties on construction', function () {
-            controllerFactory('Umbraco.PropertyEditors.RTEController', {
-                $scope: scope,
-                $routeParams: routeParams,
-                $element: element
-            });
-        });
-
-    });
-
-});
-*/
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/templates/template-editor-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/templates/template-editor-controller.spec.js
deleted file mode 100644
index 9b872f137f..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/app/templates/template-editor-controller.spec.js
+++ /dev/null
@@ -1,109 +0,0 @@
-(function() {
-    "use strict";
-
-    describe("templates editor controller",
-        function() {
-
-
-            var scope,
-                controllerFactory,
-                q,
-                ace,
-                controller,
-                nada = function() {};
-
-            beforeEach(module("umbraco"));
-
-            beforeEach(inject(function($controller, $rootScope, $q) {
-
-                controllerFactory = $controller;
-                scope = $rootScope.$new();
-                q = $q;
-
-                ace = {
-                    on: function(){},
-                    navigateFileEnd: function() {},
-                    getCursorPosition: function() {},
-                    getValue: function() {},
-                    setValue: function() {},
-                    setReadOnly: function () { },
-                    focus: function() {},
-                    clearSelection: function() {},
-                    navigateFileStart: function() {},
-                    commands: {
-                        bindKey: function() {},
-                        addCommands: function() {}
-                    }
-                };
-
-                controller = createController();
-                scope.$digest();
-                controller.aceOption.onLoad(ace);
-
-            }));
-
-            function resolvedPromise(obj) {
-                return function() {
-                    var def = q.defer();
-                    def.resolve(obj);
-                    return def.promise;
-                }
-            }
-
-            function createController() {
-                return controllerFactory("Umbraco.Editors.Templates.EditController",
-                {
-                    $scope: scope,
-                    $routeParams: {},
-                    templateResource: {
-                        getById: resolvedPromise({}),
-                        getAll: resolvedPromise({})
-                    },
-                    assetsService: {
-                        loadCss: function() {}
-                    },
-                    notificationsService: {
-                    },
-                    editorState: {
-                        set: function(){}
-                    },
-                    navigationService: {
-                        syncTree: resolvedPromise({})
-                    },
-                    appState: {
-                        getSectionState : function() { return {}; }
-                    },
-                    macroService: {},
-                    contentEditingHelper: {},
-                    localizationService: {
-                        localize: resolvedPromise({})
-                    },
-                    angularHelper: {
-                        getCurrentForm: function() { 
-                            return {
-                                $setDirty: function() {},
-                                $setPristine: function() {}
-                            }
-                        }
-                    },
-                    templateHelper: {
-                        getInsertDictionary: function() { return ""; },
-                        getInsertPartialSnippet: function() { return ""; },
-                        getQuerySnippet: function() { return ""; },
-                        getRenderBodySnippet: function() { return ""; },
-                        getRenderSectionSnippet: function() { return ""; },
-
-                        getGeneralShortcuts: resolvedPromise({}),
-                        getEditorShortcuts: resolvedPromise({}),
-                        getTemplateEditorShortcuts: resolvedPromise({})
-                    }
-                });
-            }
-
-            it("has ace editor", function () {
-                expect(controller.editor).toBe(ace);
-            });
-            
-        });
-
-}());
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/directives/val-email.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/directives/val-email.spec.js
deleted file mode 100644
index 1a1c850b15..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/directives/val-email.spec.js
+++ /dev/null
@@ -1,35 +0,0 @@
-describe('valEmail directive tests', function() {
-
-    var valEmailExpression;
-
-    beforeEach(module('umbraco'));
-
-    beforeEach(inject(function ($injector) {
-        // TODO: I have no idea why this doesn't work!!?? it freakin should
-        //valEmailExpression = $injector.get('valEmailExpression');
-
-        //in the meantime, i've had to hard code the regex statement here
-        valEmailExpression = {
-            EMAIL_REGEXP: /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i
-        };
-
-    }));
-
-    describe('EMAIL_REGEXP', function () {
-        /* global EMAIL_REGEXP: false */
-        it('should validate email', function () {
-            expect(valEmailExpression.EMAIL_REGEXP.test('a@b.com')).toBe(true);
-            expect(valEmailExpression.EMAIL_REGEXP.test('a@b.museum')).toBe(true);
-            expect(valEmailExpression.EMAIL_REGEXP.test('a@B.c')).toBe(true);
-            expect(valEmailExpression.EMAIL_REGEXP.test('a@.b.c')).toBe(false);
-            expect(valEmailExpression.EMAIL_REGEXP.test('a@-b.c')).toBe(false);
-            expect(valEmailExpression.EMAIL_REGEXP.test('a@b-.c')).toBe(false);
-            expect(valEmailExpression.EMAIL_REGEXP.test('a@3b.c')).toBe(true);
-            expect(valEmailExpression.EMAIL_REGEXP.test('a@b')).toBe(true);
-            expect(valEmailExpression.EMAIL_REGEXP.test('abc@xyz.financial')).toBe(true);
-            expect(valEmailExpression.EMAIL_REGEXP.test('admin@c.pizza')).toBe(true);
-            expect(valEmailExpression.EMAIL_REGEXP.test('admin+gmail-syntax@c.pizza')).toBe(true);            
-        });
-    });
-
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/filters/truncate-filters.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/filters/truncate-filters.spec.js
deleted file mode 100644
index 64a984b499..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/filters/truncate-filters.spec.js
+++ /dev/null
@@ -1,68 +0,0 @@
-(function () {
-    
-    describe('truncate filter', function() {
-        var $truncate;
-
-        var testCases = [
-            {input:'test',                          noOfChars:5,    appendDots:true,    expectedResult: 'test'},
-            {input:'test ',                          noOfChars:4,    appendDots:true,    expectedResult: 'test…'},
-            {input:'test a long text with space',   noOfChars:5,    appendDots:true,    expectedResult: 'test …'},
-            {input:'scenarios is a long word',      noOfChars:5,    appendDots:true,    expectedResult: 'scena…'},
-            {input:'scenarios is a long word',      noOfChars:10,   appendDots:true,    expectedResult: 'scenarios …'},
-            {input:'test',                          noOfChars:5,    appendDots:false,   expectedResult: 'test'},
-            {input:'test a long text with space',   noOfChars:5,    appendDots:false,   expectedResult: 'test '},
-            {input:'scenarios is a long word',      noOfChars:5,    appendDots:false,   expectedResult: 'scena'},
-            {input:'scenarios is a long word',      noOfChars:10,   appendDots:false,   expectedResult: 'scenarios '}
-        ];
-
-        var testCasesNew = [
-            {value:'test',                          wordwise:false,    max:20,  tail:'...',  expectedResult: 'test'},
-            {value:'LoremIpsumLoremIpsumLoremIpsum',wordwise:false,    max:20,  tail:null,  expectedResult: 'LoremIpsumLoremIpsum…'}
-        ];
-        
-        beforeEach(module('umbraco'));
-        
-        beforeEach(inject(function($filter) {
-            $truncate = $filter('truncate');
-        }));
-        
-        it('empty string as input is expected to give an empty string', function() {
-            expect($truncate('', 5, true)).toBe('');
-        });
-        
-        it('null as input is expected to give an empty string', function() {
-            expect($truncate(null, 5, true)).toBe('');
-        });
-        
-        it('undefined as input is expected to give an empty string', function() {
-            expect($truncate(undefined, 5, true)).toBe('');
-        });
-
-        it('null as noOfChars to result in \'test\'', function() {
-            expect($truncate('test', null, true)).toBe('test');
-        });
-        
-        it('undefined as noOfChars to result in \'test\'', function() {
-            expect($truncate('test', undefined, true)).toBe('test');
-        });
-
-        it('null as appendDots to behave as false', function() {
-            expect($truncate('test', 5, null)).toBe('test');
-        });
-        
-        testCases.forEach(function(test){
-            
-            it('Expects \'' + test.input + '\' to be truncated as \''+ test.expectedResult + '\', when noOfChars=' + test.noOfChars + ', and appendDots=' + test.appendDots, function() {
-                expect($truncate(test.input, test.noOfChars, test.appendDots)).toBe(test.expectedResult);
-            });
-        });
-        
-        testCasesNew.forEach(function(test){
-            it('Expects \'' + test.value + '\' to be truncated as \''+ test.expectedResult + '\', when wordwise=' + test.wordwise + ', and max=' + test.max  + ', and tail=' + test.tail, function() {
-                expect($truncate(test.value, test.wordwise, test.max, test.tail)).toBe(test.expectedResult);
-            });
-        });
-        
-    });
-
-}());
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/filters/umbCmsJoinArray.filter.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/filters/umbCmsJoinArray.filter.spec.js
deleted file mode 100644
index 1c33a91b09..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/filters/umbCmsJoinArray.filter.spec.js
+++ /dev/null
@@ -1,32 +0,0 @@
-(function () {
-
-    describe('umbCmsJoinArray filter', function() {
-        var $umbCmsJoinArray;
-
-        var testCases = [
-            {input:[{param:'a'},{param:'b'},{param:'c'}],  separator:', ', prop:'param' ,   expectedResult: 'a, b, c'},
-            {input:[{param:'a'},{param:'b'},{param:'c'}],  separator:' ', prop:'param' ,   expectedResult: 'a b c'},
-            {input:[{param:'a'},{param:'b'},{param:'c'}],  separator:'', prop:'param' ,   expectedResult: 'abc'},
-            {input:[{param:'a'},{param:'b'},{param:'c'}],  separator:'', prop:'wrong' ,   expectedResult: ''},
-            {input:[],  separator:', ', prop:'param' ,   expectedResult: ''},
-            {input:[{param:'a'},{param:'b'},{param:'c'}],  separator:', ', prop:null ,   expectedResult: ', , '},
-            {input:[{param:'a'},{param:'b'},{param:'c'}],  separator:null, prop:'param' ,   expectedResult: 'abc'},
-            {input:'test',  separator:', ', prop:'param', expectedResult: 'test'},
-            {input:null,  separator:', ', prop:'param', expectedResult: ''},
-            {input:undefined,  separator:', ', prop:'param', expectedResult: ''},
-        ];
-
-        beforeEach(module('umbraco'));
-
-        beforeEach(inject(function($filter) {
-            $umbCmsJoinArray = $filter('umbCmsJoinArray');
-        }));
-
-        testCases.forEach(function(test){
-            it('Blackbox tests with expected result=\''+test.expectedResult+'\'', function() {
-                expect($umbCmsJoinArray(test.input, test.separator, test.prop)).toBe(test.expectedResult);
-            });
-        });
-    });
-
-}());
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/app-state.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/app-state.spec.js
deleted file mode 100644
index 749bbca3de..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/app-state.spec.js
+++ /dev/null
@@ -1,97 +0,0 @@
-describe('appState tests', function () {
-    var appState, $rootScope, editorState;
-    
-    beforeEach(module('umbraco.services'));
-
-    beforeEach(inject(function ($injector) {
-        appState = $injector.get('appState');
-        $rootScope = $injector.get('$rootScope');
-        editorState = $injector.get('editorState');
-    }));
-
-    describe('Editor state', function () {
-        it('Can set', function () {
-            editorState.set({ some: "object" });
-            expect(editorState.current).not.toBeNull();
-            expect(editorState.current.some).toBe("object");
-        });
-        it('Can reset', function () {
-            editorState.reset();
-            expect(editorState.current).toBeNull();
-        });
-        it('Throws when setting current', function () {
-            function setCurrent() {
-                editorState.current = { some: "object" };
-            }            
-            expect(setCurrent).toThrow();
-        });
-    });
-
-    describe('Global state', function () {
-        it('Can get/set state', function () {
-            appState.setGlobalState("showNavigation", true);
-            expect(appState.getGlobalState("showNavigation")).toBe(true);
-        });        
-        it('Throws when invalid key', function () {
-            function setInvalidKey() {
-                appState.setGlobalState("blah", true);
-            }
-            function getInvalidKey() {
-                appState.getGlobalState("blah");
-            }            
-            expect(setInvalidKey).toThrow();
-            expect(getInvalidKey).toThrow();
-        });
-    });
-    
-    describe('Section state', function () {
-        it('Can get/set state', function () {
-            appState.setSectionState("currentSection", true);
-            expect(appState.getSectionState("currentSection")).toBe(true);
-        });
-        it('Throws when invalid key', function () {
-            function setInvalidKey() {
-                appState.getSectionState("blah", true);
-            }
-            function getInvalidKey() {
-                appState.setSectionState("blah");
-            }
-            expect(setInvalidKey).toThrow();
-            expect(getInvalidKey).toThrow();
-        });
-    });
-    
-    describe('Tree state', function () {
-        it('Can get/set state', function () {
-            appState.setTreeState("selectedNode", true);
-            expect(appState.getTreeState("selectedNode")).toBe(true);
-        });
-        it('Throws when invalid key', function () {
-            function setInvalidKey() {
-                appState.getTreeState("blah", true);
-            }
-            function getInvalidKey() {
-                appState.setTreeState("blah");
-            }
-            expect(setInvalidKey).toThrow();
-            expect(getInvalidKey).toThrow();
-        });
-    });
-    
-    describe('Menu state', function () {
-        it('Can get/set state', function () {
-            appState.setMenuState("showMenu", true);
-            expect(appState.getMenuState("showMenu")).toBe(true);
-        });
-        it('Throws when invalid key', function () {
-            function setInvalidKey() {
-                appState.getMenuState("blah", true);
-            }
-            function getInvalidKey() {
-                appState.setMenuState("blah");
-            }
-            expect(setInvalidKey).toThrow();
-            expect(getInvalidKey).toThrow();
-        });
-    });
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/assets-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/assets-service.spec.js
deleted file mode 100644
index 34a0ffbe62..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/assets-service.spec.js
+++ /dev/null
@@ -1,31 +0,0 @@
-describe('Assets service tests', function () {
-   var assetsService, $window, $rootScope;
-   beforeEach(module('umbraco.services'));
-   beforeEach(module('umbraco.mocks.services'));
-
-   beforeEach(inject(function ($injector) {
-        assetsService = $injector.get('assetsService');
-        $window = $injector.get("$window");
-        $rootScope = $injector.get('$rootScope');
-   }));
-
-   afterEach(inject(function($rootScope) {
-     $rootScope.$apply();
-   }));
-
-   describe('Loading js assets', function () {
-        
-        it('Loads a javascript file', function () {
-
-          var loaded = false;
-          // runs( function(){
-          //       assetsService.loadJs("lib/umbraco/NamespaceManager.js").then(function(){
-          //           expect(Umbraco.Sys).toNotBe(undefined);
-          //       });
-          // });
-          // runs(function(){
-          //    expect(Umbraco.Sys).toNotBe(undefined);
-          // });
-        });
-    });
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/block-editor-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/block-editor-service.spec.js
deleted file mode 100644
index ee9dd9d901..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/block-editor-service.spec.js
+++ /dev/null
@@ -1,422 +0,0 @@
-describe('blockEditorService tests', function () {
-
-    var contentKey = "6A1F5BDD-67EF-4173-B061-D6348ED07094";
-    var contentUdi = "umb://element/6A1F5BDD67EF4173B061D6348ED07094";
-    var settingsKey = "2AF42343-C8A2-400D-BA43-4818C2B3CDC5";
-    var settingsUdi = "umb://element/2AF42343C8A2400DBA434818C2B3CDC5";
-
-    var blockEditorService, contentResource, $rootScope, $scope, $q, localizationService, $timeout;
-
-    beforeEach(module('umbraco.services'));
-    beforeEach(module('umbraco.resources'));
-    beforeEach(module('umbraco.mocks'));
-    beforeEach(module('umbraco'));
-
-    beforeEach(inject(function ($injector, mocksUtils, _$rootScope_, _$q_, _$timeout_) {
-
-        mocksUtils.disableAuth();
-
-        $rootScope = _$rootScope_;
-        $scope = $rootScope.$new();
-        $q = _$q_;
-        $timeout = _$timeout_;
-
-        contentResource = $injector.get("contentResource");
-        spyOn(contentResource, "getScaffoldByKeys").and.callFake(
-            function () {
-                var scaffold = mocksUtils.getMockVariantContent(1234, contentKey, contentUdi);
-                return $q.resolve([scaffold]);
-            }
-        );
-        // this seems to be required because of the poor promise implementation in localizationService (see TODO in that service)
-        localizationService = $injector.get("localizationService");
-        spyOn(localizationService, "localize").and.callFake(
-            function () {
-                return $q.resolve("Localized test text");
-            }
-        );
-
-        blockEditorService = $injector.get('blockEditorService');
-
-    }));
-
-
-    var blockConfigurationMock = { contentElementTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", label: "Test label", settingsElementTypeKey: null, view: "/testview.html" };
-
-    var propertyModelMock = {
-        layout: {
-            "Umbraco.TestBlockEditor": [
-                {
-                    contentUdi: contentUdi
-                }
-            ]
-        },
-        contentData: [
-            {
-                udi: contentUdi,
-                contentTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB",
-                testproperty: "myTestValue"
-            }
-        ]
-    };
-
-    var blockWithSettingsConfigurationMock = { contentElementTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", label: "Test label", settingsElementTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB", view: "/testview.html" };
-    var propertyModelWithSettingsMock = {
-        layout: {
-            "Umbraco.TestBlockEditor": [
-                {
-                    contentUdi: contentUdi,
-                    settingsUdi: settingsUdi
-                }
-            ]
-        },
-        contentData: [
-            {
-                udi: contentUdi,
-                contentTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB",
-                testproperty: "myTestValue"
-            }
-        ],
-        settingsData: [
-            {
-                udi: settingsUdi,
-                contentTypeKey: "7C5B74D1-E2F9-45A3-AE4B-FC7A829BF8AB",
-                testproperty: "myTestValueForSettings"
-            }
-        ]
-    };
-
-    describe('init blockEditorModelObject', function () {
-
-        it('fail if no model value', function () {
-            function createWithNoModelValue() {
-                blockEditorService.createModelObject(null, "Umbraco.TestBlockEditor", [], $scope, $scope);
-            }
-            expect(createWithNoModelValue).toThrow();
-        });
-
-        it('return a object, with methods', function () {
-            var modelObject = blockEditorService.createModelObject({}, "Umbraco.TestBlockEditor", [], $scope, $scope);
-
-            expect(modelObject).not.toBeUndefined();
-            expect(modelObject.load).not.toBeUndefined();
-        });
-
-        it('getBlockConfiguration provide the requested block configurtion', function () {
-            var modelObject = blockEditorService.createModelObject({}, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
-
-            expect(modelObject.getBlockConfiguration(blockConfigurationMock.contentElementTypeKey).label).toBe(blockConfigurationMock.label);
-        });
-
-        it('load provides data for itemPicker', function (done) {
-            var modelObject = blockEditorService.createModelObject({}, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
-
-            modelObject.load().then(() => {
-                try {
-                    var itemPickerOptions = modelObject.getAvailableBlocksForBlockPicker();
-                    expect(itemPickerOptions.length).toBe(1);
-                    expect(itemPickerOptions[0].blockConfigModel.contentElementTypeKey).toBe(blockConfigurationMock.contentElementTypeKey);
-                    done();
-                } catch (e) {
-                    done.fail(e);
-                }
-            });
-
-            $rootScope.$digest();
-            $timeout.flush();
-        });
-
-        it('getLayoutEntry has values', function (done) {
-
-
-            var modelObject = blockEditorService.createModelObject(propertyModelMock, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
-
-            modelObject.load().then(() => {
-
-                try {
-                    var layout = modelObject.getLayout();
-
-                    expect(layout).not.toBeUndefined();
-                    expect(layout.length).toBe(1);
-                    expect(layout[0]).toBe(propertyModelMock.layout["Umbraco.TestBlockEditor"][0]);
-                    expect(layout[0].contentUdi).toBe(propertyModelMock.layout["Umbraco.TestBlockEditor"][0].contentUdi);
-
-                    done();
-                } catch (e) {
-                    done.fail(e);
-                }
-            });
-
-            $rootScope.$digest();
-            $timeout.flush();
-        });
-
-        it('getBlockObject has values', function (done) {
-
-
-            var modelObject = blockEditorService.createModelObject(propertyModelMock, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
-
-            modelObject.load().then(() => {
-
-                try {
-                    var layout = modelObject.getLayout();
-
-                    var blockObject = modelObject.getBlockObject(layout[0]);
-
-                    expect(blockObject).not.toBeUndefined();
-                    expect(blockObject.data.udi).toBe(propertyModelMock.contentData[0].udi);
-                    expect(blockObject.content.variants[0].tabs[0].properties[0].value).toBe(propertyModelMock.contentData[0].testproperty);
-
-                    done();
-                } catch (e) {
-                    done.fail(e);
-                }
-            });
-
-            $rootScope.$digest();
-            $timeout.flush();
-        });
-
-
-        it('getBlockObject syncs primitive values', function (done) {
-
-            var propertyModel = angular.copy(propertyModelMock);
-
-            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
-
-            modelObject.load().then(() => {
-
-                try {
-                    var layout = modelObject.getLayout();
-
-                    var blockObject = modelObject.getBlockObject(layout[0]);
-
-                    blockObject.content.variants[0].tabs[0].properties[0].value = "anotherTestValue";
-
-                    // invoke angularJS Store.
-                    $timeout(function () {
-                        expect(blockObject.data).toEqual(propertyModel.contentData[0]);
-                        expect(blockObject.data.testproperty).toBe("anotherTestValue");
-                        expect(propertyModel.contentData[0].testproperty).toBe("anotherTestValue");
-
-                        done();
-                    });
-
-                } catch (e) {
-                    done.fail(e);
-                }
-            });
-
-            $rootScope.$digest();
-            $timeout.flush();
-
-        });
-
-
-        it('getBlockObject syncs values of object', function (done) {
-
-            var propertyModel = angular.copy(propertyModelMock);
-
-            var complexValue = { "list": ["A", "B", "C"] };
-            propertyModel.contentData[0].testproperty = complexValue;
-
-
-            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
-
-            modelObject.load().then(() => {
-
-                try {
-                    var layout = modelObject.getLayout();
-
-                    var blockObject = modelObject.getBlockObject(layout[0]);
-
-                    blockObject.content.variants[0].tabs[0].properties[0].value.list[0] = "AA";
-                    blockObject.content.variants[0].tabs[0].properties[0].value.list.push("D");
-
-                    // invoke angularJS Store.
-                    $timeout(function () {
-                        expect(propertyModel.contentData[0].testproperty.list[0]).toBe("AA");
-                        expect(propertyModel.contentData[0].testproperty.list.length).toBe(4);
-
-                        done();
-                    });
-
-
-                } catch (e) {
-                    done.fail(e);
-                }
-            });
-
-            $rootScope.$digest();
-            $timeout.flush();
-        });
-
-        it('layout is referencing layout of propertyModel', function (done) {
-
-            var propertyModel = angular.copy(propertyModelMock);
-
-            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
-
-            modelObject.load().then(() => {
-
-                var layout = modelObject.getLayout();
-
-                // remove from layout;
-                layout.splice(0, 1);
-
-                expect(propertyModel.layout["Umbraco.TestBlockEditor"].length).toBe(0);
-                expect(propertyModel.layout["Umbraco.TestBlockEditor"][0]).toBeUndefined();
-
-                done();
-            });
-
-            $rootScope.$digest();
-            $timeout.flush();
-        });
-
-        it('removeDataAndDestroyModel removes data', function (done) {
-
-            var propertyModel = angular.copy(propertyModelMock);
-
-            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockConfigurationMock], $scope, $scope);
-
-            modelObject.load().then(() => {
-
-                try {
-                    var layout = modelObject.getLayout();
-
-                    var blockObject = modelObject.getBlockObject(layout[0]);
-
-                    expect(blockObject).not.toBeUndefined();
-                    expect(blockObject).not.toBe(null);
-
-                    // remove from layout;
-                    layout.splice(0, 1);
-
-                    // remove from data;
-                    modelObject.removeDataAndDestroyModel(blockObject);
-
-                    expect(propertyModel.contentData.length).toBe(0);
-                    expect(propertyModel.contentData[0]).toBeUndefined();
-                    expect(propertyModel.layout["Umbraco.TestBlockEditor"].length).toBe(0);
-                    expect(propertyModel.layout["Umbraco.TestBlockEditor"][0]).toBeUndefined();
-
-                    done();
-                } catch (e) {
-                    done.fail(e);
-                }
-            });
-
-            $rootScope.$digest();
-            $timeout.flush();
-        });
-
-        it('getBlockObject of block with settings has values', function (done) {
-
-            var propertyModel = angular.copy(propertyModelWithSettingsMock);
-
-            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockWithSettingsConfigurationMock], $scope, $scope);
-
-            modelObject.load().then(() => {
-
-                var layout = modelObject.getLayout();
-
-                var blockObject = modelObject.getBlockObject(layout[0]);
-
-                expect(blockObject).not.toBeUndefined();
-                expect(blockObject.data.udi).toBe(propertyModel.contentData[0].udi);
-                expect(blockObject.content.variants[0].tabs[0].properties[0].value).toBe(propertyModel.contentData[0].testproperty);
-
-                done();
-            });
-
-            $rootScope.$digest();
-            $timeout.flush();
-        });
-
-
-        it('getBlockObject of block with settings syncs primative values', function (done) {
-
-            var propertyModel = angular.copy(propertyModelWithSettingsMock);
-
-            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockWithSettingsConfigurationMock], $scope, $scope);
-
-            modelObject.load().then(() => {
-
-                var layout = modelObject.getLayout();
-
-                var blockObject = modelObject.getBlockObject(layout[0]);
-
-                blockObject.content.variants[0].tabs[0].properties[0].value = "anotherTestValue";
-                blockObject.settings.variants[0].tabs[0].properties[0].value = "anotherTestValueForSettings";
-
-                // invoke angularJS Store.
-                $timeout(function () {
-                    expect(blockObject.data).toEqual(propertyModel.contentData[0]);
-                    expect(blockObject.data.testproperty).toBe("anotherTestValue");
-                    expect(propertyModel.contentData[0].testproperty).toBe("anotherTestValue");
-
-                    expect(blockObject.settingsData).toEqual(propertyModel.settingsData[0]);
-                    expect(blockObject.settingsData.testproperty).toBe("anotherTestValueForSettings");
-                    expect(propertyModel.settingsData[0].testproperty).toBe("anotherTestValueForSettings");
-
-                    done();
-                });
-
-            });
-
-            $rootScope.$digest();
-            $timeout.flush();
-        });
-
-
-        it('getBlockObject of block with settings syncs values of object', function (done) {
-
-            var propertyModel = angular.copy(propertyModelWithSettingsMock);
-
-            var complexValue = { "list": ["A", "B", "C"] };
-            propertyModel.contentData[0].testproperty = complexValue;
-
-            var complexSettingsValue = { "list": ["A", "B", "C"] };
-            propertyModel.settingsData[0].testproperty = complexSettingsValue;
-
-            var modelObject = blockEditorService.createModelObject(propertyModel, "Umbraco.TestBlockEditor", [blockWithSettingsConfigurationMock], $scope, $scope);
-
-            modelObject.load().then(() => {
-
-                try {
-                    var layout = modelObject.getLayout();
-
-                    var blockObject = modelObject.getBlockObject(layout[0]);
-
-                    blockObject.content.variants[0].tabs[0].properties[0].value.list[0] = "AA";
-                    blockObject.content.variants[0].tabs[0].properties[0].value.list.push("D");
-
-                    blockObject.settings.variants[0].tabs[0].properties[0].value.list[0] = "settingsValue";
-                    blockObject.settings.variants[0].tabs[0].properties[0].value.list.push("settingsNewValue");
-
-                    // invoke angularJS Store.
-                    $timeout(function () {
-                        expect(propertyModel.contentData[0].testproperty.list[0]).toBe("AA");
-                        expect(propertyModel.contentData[0].testproperty.list.length).toBe(4);
-
-                        expect(propertyModel.settingsData[0].testproperty.list[0]).toBe("settingsValue");
-                        expect(propertyModel.settingsData[0].testproperty.list.length).toBe(4);
-
-                        done();
-                    });
-
-
-                } catch (e) {
-                    done.fail(e);
-                }
-            });
-
-            $rootScope.$digest();
-            $timeout.flush();
-        });
-
-
-    });
-
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/content-editing-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/content-editing-helper.spec.js
deleted file mode 100644
index 227a359d1d..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/content-editing-helper.spec.js
+++ /dev/null
@@ -1,241 +0,0 @@
-describe('contentEditingHelper tests', function () {
-    var contentEditingHelper, $routeParams, serverValidationManager, mocksUtils, notificationsService, formHelper;
-
-    beforeEach(module('umbraco.services'));
-    beforeEach(module('umbraco.mocks'));
-    beforeEach(module('ngRoute'));
-
-    beforeEach(inject(function ($injector, localizationMocks) {
-        localizationMocks.register();
-
-        contentEditingHelper = $injector.get('contentEditingHelper');
-        $routeParams = $injector.get('$routeParams');
-        serverValidationManager = $injector.get('serverValidationManager');
-        mocksUtils = $injector.get('mocksUtils');
-        notificationsService = $injector.get('notificationsService');
-        formHelper = $injector.get('formHelper');
-    }));
-
-    describe('handles http validation errors', function () {
-
-        it('handles validation errors for 400 results', function () {
-
-            //arrange
-            var content = mocksUtils.getMockContent(1234);
-            var err = {
-                data: content,
-                status: 400
-            };
-            err.data.ModelState = {};
-
-            //act
-            var handled = contentEditingHelper.handleSaveError({
-                err: err,
-                allNewProps: contentEditingHelper.getAllProps(content),
-                allOrigProps: contentEditingHelper.getAllProps(content)
-            });
-
-            //assert
-            expect(handled).toBe(true);
-        });
-        
-        it('does not handle validation errors that are not 400', function () {
-
-            //arrange
-            var err = {
-                status: 410
-            };
-            
-            //act
-            var handled = contentEditingHelper.handleSaveError({
-                err: err,
-                allNewProps: [],
-                allOrigProps: []
-            });
-
-            //assert
-            expect(handled).toBe(false);
-        });
-        
-        it('does not handle validation errors that are 400 without model state', function () {
-
-            //arrange
-            var content = mocksUtils.getMockContent(1234);
-            var err = {
-                data: content,
-                status: 400
-            };
-
-            //act
-            var handled = contentEditingHelper.handleSaveError({
-                err: err,
-                allNewProps: contentEditingHelper.getAllProps(content),
-                allOrigProps: contentEditingHelper.getAllProps(content)
-            });
-
-            //assert
-            expect(handled).toBe(false);
-        });
-
-    });
-
-    describe('handling validation errors', function () {
-
-        it('adds a field level server validation error when name is invalid', function () {
-
-            //arrange
-            var content = mocksUtils.getMockContent(1234);
-            var allProps = contentEditingHelper.getAllProps(content);
-
-            //act
-            formHelper.handleServerValidation({ Name: ["Required"] });
-
-            //assert
-            expect(serverValidationManager.items.length).toBe(1);
-            expect(serverValidationManager.items[0].fieldName).toBe("Name");
-            expect(serverValidationManager.items[0].errorMsg).toBe("Required"); 
-            expect(serverValidationManager.items[0].propertyAlias).toBe(null);
-        });
-
-        it('adds a property level server validation error when a property is invalid', function () {
-
-            //arrange
-            var content = mocksUtils.getMockContent(1234);
-            var allProps = contentEditingHelper.getAllProps(content);
-
-            //act
-            formHelper.handleServerValidation({ "_Properties.bodyText": ["Required"] });
-
-            //assert
-            expect(serverValidationManager.items.length).toBe(1);
-            expect(serverValidationManager.items[0].fieldName).toBe("");
-            expect(serverValidationManager.items[0].errorMsg).toBe("Required");
-            expect(serverValidationManager.items[0].propertyAlias).toBe("bodyText");
-        });
-        
-        it('adds a property level server validation error with a specific field when a property is invalid', function () {
-
-            //arrange
-            var content = mocksUtils.getMockContent(1234);
-            var allProps = contentEditingHelper.getAllProps(content);
-
-            //act
-            //note the null, that's because culture is null
-            formHelper.handleServerValidation({ "_Properties.bodyText.null.null.value": ["Required"] });
-
-            //assert
-            expect(serverValidationManager.items.length).toBe(1);
-            expect(serverValidationManager.items[0].fieldName).toBe("value");
-            expect(serverValidationManager.items[0].errorMsg).toBe("Required");
-            expect(serverValidationManager.items[0].propertyAlias).toBe("bodyText");
-            expect(serverValidationManager.items[0].culture).toBe("invariant");
-            expect(serverValidationManager.items[0].segment).toBeNull();
-        });
-        
-        it('adds a multiple property and field level server validation errors when they are invalid', function () {
-
-            //arrange
-            var content = mocksUtils.getMockContent(1234);
-            var allProps = contentEditingHelper.getAllProps(content);
-
-            //act
-            formHelper.handleServerValidation(
-                {
-                    "Name": ["Required"],
-                    "UpdateDate": ["Invalid date"],
-                    //note the null, that's because culture is null
-                    "_Properties.bodyText.en-US.mySegment.value": ["Required field"],
-                    "_Properties.textarea": ["Invalid format"]
-                });
-
-            //assert
-            expect(serverValidationManager.items.length).toBe(4);
-            expect(serverValidationManager.items[0].fieldName).toBe("Name");
-            expect(serverValidationManager.items[0].errorMsg).toBe("Required");
-            expect(serverValidationManager.items[0].propertyAlias).toBe(null);
-            expect(serverValidationManager.items[1].fieldName).toBe("UpdateDate");
-            expect(serverValidationManager.items[1].errorMsg).toBe("Invalid date");
-            expect(serverValidationManager.items[1].propertyAlias).toBe(null);
-            expect(serverValidationManager.items[2].fieldName).toBe("value");
-            expect(serverValidationManager.items[2].errorMsg).toBe("Required field");
-            expect(serverValidationManager.items[2].propertyAlias).toBe("bodyText");
-            expect(serverValidationManager.items[2].culture).toBe("en-US");
-            expect(serverValidationManager.items[2].segment).toBe("mySegment");
-            expect(serverValidationManager.items[3].fieldName).toBe("");
-            expect(serverValidationManager.items[3].errorMsg).toBe("Invalid format");
-            expect(serverValidationManager.items[3].propertyAlias).toBe("textarea");
-        });
-
-    });
-
-    describe('redirecting behavior after saving content', function () {
-
-        it('does not redirect when editing existing content', function () {
-
-            //arrange
-            $routeParams.create = undefined;
-
-            //act
-            var result = contentEditingHelper.redirectToCreatedContent(1234, null);
-
-            //assert
-            expect(result).toBe(false);
-        });
-        
-        it('does a redirect when creating content with a valid name', function () {
-            
-            //arrange
-            $routeParams.create = true;
-
-            //act
-            var result = contentEditingHelper.redirectToCreatedContent(1234, null);
-
-            //assert
-            expect(result).toBe(true);
-        });
-        
-        it('does not redirect when creating content with an invalid id', function () {
-            
-            //arrange
-            $routeParams.create = true;
-
-            //act
-            var result = contentEditingHelper.redirectToCreatedContent(0, {Name: ["Required"]});
-
-            //assert
-            expect(result).toBe(false);
-            
-        });
-
-    });
-    
-    describe('wires up property values after saving', function () {
-
-        it('does not update un-changed values', function () {
-
-            //arrange
-            var origContent = mocksUtils.getMockContent(1234);
-            origContent.save = true;
-            origContent.tabs[0].properties[0].value = { complex1: "origValue1a", complex2: "origValue1b" };
-            origContent.tabs[1].properties[0].value = "origValue2";
-            origContent.tabs[1].properties[1].value = "origValue3";
-            origContent.tabs[1].properties[2].value = "origValue4";
-
-            var newContent = mocksUtils.getMockContent(1234);
-            newContent.tabs[0].properties[0].value = { complex1: "origValue1a", complex2: "newValue1b" };
-            newContent.tabs[1].properties[0].value = "origValue2";
-            newContent.tabs[1].properties[1].value = "newValue3";
-            newContent.tabs[1].properties[2].value = "origValue4";
-
-            //act
-            var changed = contentEditingHelper.reBindChangedProperties(origContent, newContent);
-
-            
-            //assert
-            expect(changed.length).toBe(2);
-            expect(changed[0].alias).toBe("grid");
-            expect(changed[1].alias).toBe("bodyText");
-        });
-
-    });
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js
deleted file mode 100644
index e7b3d7dbee..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js
+++ /dev/null
@@ -1,66 +0,0 @@
-describe('content factory tests', function () {
-    var $rootScope, $httpBackend, contentFactory, mocks, $http;
-
-    beforeEach(module('umbraco.services'));
-    beforeEach(module('umbraco.resources'));
-    beforeEach(module('umbraco.mocks'));
-
-    beforeEach(inject(function ($injector, mocksUtils) {
-        
-        //for these tests we don't want any authorization to occur
-        mocksUtils.disableAuth();
-
-        $rootScope = $injector.get('$rootScope');
-        $httpBackend = $injector.get('$httpBackend');
-        mocks = $injector.get("contentMocks");
-        mocks.register();
-        contentFactory = $injector.get('contentResource');
-    }));
-
-
-    afterEach(function () {
-        $httpBackend.verifyNoOutstandingExpectation();
-        $httpBackend.verifyNoOutstandingRequest();
-    });
-
-
-    describe('global content factory crud', function () {
-       
-       
-        it('should return a content object, given an id', function () {
-            var doc;
-            contentFactory.getById(1234).then(function(result){
-                doc = result;
-            });
-
-            $rootScope.$digest();
-            $httpBackend.flush();
-
-            expect(doc).not.toBeUndefined();
-            expect(doc.id).toBe(1234);   
-        });
-
-
-        it('should return a all children collection given an id', function () {
-
-            var collection;
-            contentFactory.getChildren(1234, undefined).then(function (data) {
-                collection = data;
-            });            
-            $rootScope.$digest();
-            $httpBackend.flush();            
-            expect(collection.items.length).toBe(56);
-        });
-        
-        it('should return paged children collection given an id', function () {
-
-            var collection;
-            contentFactory.getChildren(1234, { pageSize: 5, pageNumber: 1, filter: "" }).then(function (data) {
-                collection = data;
-            });
-            $rootScope.$digest();
-            $httpBackend.flush();
-            expect(collection.items.length).toBe(5);
-        });
-  });
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/content-type-factory.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/content-type-factory.spec.js
deleted file mode 100644
index ac8cbb2049..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/content-type-factory.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-describe('content type factory tests', function () {
-    var $rootScope, $httpBackend, contentTypeResource, mocks;
-
-    // beforeEach(module('ngMockE2E'));
-    beforeEach(module('umbraco.services'));
-    beforeEach(module('umbraco.resources'));
-    beforeEach(module('umbraco.mocks'));
-    
-    beforeEach(inject(function ($injector, mocksUtils) {
-        
-        //for these tests we don't want any authorization to occur
-        mocksUtils.disableAuth();
-
-        $rootScope = $injector.get('$rootScope');
-        $httpBackend = $injector.get('$httpBackend'); 
-        mocks = $injector.get("contentTypeMocks");
-        mocks.register();
-        contentTypeResource = $injector.get('contentTypeResource');
-    }));
-
-    describe('global content type factory crud', function () {
-      
-        it('should return a allowed content type collection given a document id', function(){
-
-           // m.expectAllowedChildren();
-
-            var collection;
-            contentTypeResource.getAllowedTypes(1234).then(function(result){
-                collection = result;
-            });
-
-
-            $rootScope.$digest();
-            $httpBackend.flush();
-
-            expect(collection.length).toBe(3);
-        });      
-  });
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/content-type-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/content-type-helper.spec.js
deleted file mode 100644
index 1b7ef3b417..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/content-type-helper.spec.js
+++ /dev/null
@@ -1,217 +0,0 @@
-describe('contentTypeHelper tests', function () {
-  var contentTypeHelper, contentTypeResource, dataTypeResource, filter, injector, q;
-
-  beforeEach(module('umbraco.services'));
-  beforeEach(module('umbraco.mocks'));
-  beforeEach(module('ngRoute'));
-
-  beforeEach(inject(function ($injector, localizationMocks) {
-      localizationMocks.register();
-
-      contentTypeHelper = $injector.get('contentTypeHelper');
-      contentTypeResource = $injector.get('contentTypeResource');
-      dataTypeResource = $injector.get('dataTypeResource');
-      filter = $injector.get('$filter');
-      injector = $injector.get('$injector');
-      q = $injector.get('$q');
-  }));
-
-  describe('Group type', function () {
-    it('should return the group type', function () {
-        var groupType = contentTypeHelper.TYPE_GROUP;
-        expect(groupType).toBe('Group');
-    });
-  });
-
-  describe('Tab type', function () {
-    it('should return the tab type', function () {
-        var tabType = contentTypeHelper.TYPE_TAB;
-        expect(tabType).toBe('Tab');
-    });
-  });
-
-  describe('isAliasUnique', function () {
-    const groups = [{ alias: 'alias' }];
-
-    it('should return true when alias is unique', function () {
-        var isUnique = contentTypeHelper.isAliasUnique(groups, 'uniqueAlias');
-        expect(isUnique).toBe(true);
-    });
-
-    it('should return false when alias is not unique', function () {
-      var isUnique = contentTypeHelper.isAliasUnique(groups, 'alias');
-      expect(isUnique).toBe(false);
-    });
-  });
-
-  describe('createUniqueAlias', function () {
-
-    it('should generate a unique alias', function () {
-        const groups = [{ alias: 'alias' }, { alias: 'otherAlias' }, { alias: 'otherAlias1' }];
-
-        var alias = contentTypeHelper.createUniqueAlias(groups, 'alias');
-        expect(alias).toBe('alias1');
-        
-        alias = contentTypeHelper.createUniqueAlias(groups, 'otherAlias');
-        expect(alias).toBe('otherAlias2');
-    });
-
-  });
-
-  describe('generateLocalAlias', function () {
-
-      it('should generate an alias when given a name', function () {
-          var alias = contentTypeHelper.generateLocalAlias('my cool name');
-          expect(alias).toBe('myCoolName');
-      });
-
-      it('should generate a guid if not given a name', function () {
-        var regex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-        var alias = contentTypeHelper.generateLocalAlias();
-        const match = regex.test(alias)
-        expect(match).toBeTrue();
-      });
-
-  });
-
-  describe('getLocalAlias', function () {
-
-    it('should get group alias', function () {
-        var alias = contentTypeHelper.getLocalAlias('groupAlias');
-        expect(alias).toBe('groupAlias');
-    });
-
-    it('should get group alias inside a tab', function () {
-      var alias = contentTypeHelper.getLocalAlias('tabAlias/groupAlias');
-      expect(alias).toBe('groupAlias');
-    });
-    
-  });
-
-  describe('updateLocalAlias', function () {
-
-    it('it should update local alias', function () {
-      const group = { alias: 'group' };
-      const newAlias = contentTypeHelper.updateLocalAlias(group.alias, 'newGroupAlias');
-      expect(newAlias).toBe('newGroupAlias');
-    });
-
-    it('it should update alias on a group when inside a tab', function () {
-      const group = { alias: 'tab/group' };
-      const newAlias = contentTypeHelper.updateLocalAlias(group.alias, 'newGroupAlias');
-      expect(newAlias).toBe('tab/newGroupAlias');
-    });
-    
-  });
-
-  describe('getParentAlias', function () {
-
-    it('should return null if no parent', function () {
-        var parentAlias = contentTypeHelper.getParentAlias('groupAlias');
-        expect(parentAlias).toBeNull();
-    });
-
-    it('should return parent alias', function () {
-      var parentAlias = contentTypeHelper.getParentAlias('tabAlias/groupAlias');
-      expect(parentAlias).toBe('tabAlias');
-    });
-    
-  });
-
-  describe('updateParentAlias', function () {
-
-    it('it should update parent alias', function () {
-      const group = { alias: 'tab/group' };
-      const newAlias = contentTypeHelper.updateParentAlias(group.alias, 'newTabAlias');
-      expect(newAlias).toBe('newTabAlias/group');
-    });
-
-    it('it should add parent alias to alias if it doesnt exist', function () {
-      const group = { alias: 'group' };
-      const newAlias = contentTypeHelper.updateParentAlias(group.alias, 'newTabAlias');
-      expect(newAlias).toBe('newTabAlias/group');
-    });
-    
-  });
-
-  describe('defineParentAliasOnGroups', function () {
-
-    it('it should set parent alias on a group based on the alias', function () {
-      var groups = [
-        { alias: 'group' },
-        { alias: 'tab/group' }
-      ];
-  
-      contentTypeHelper.defineParentAliasOnGroups(groups);
-  
-      expect(groups[0].parentAlias).toBeNull();
-      expect(groups[1].parentAlias).toBe('tab');
-    });
-
-  });
-
-  describe('relocateDisorientedGroups', function () {
-
-    it('should remove parentAlias from groups where the tab doesnt exist', function () {
-
-      const groups = [
-        { alias: 'group', parentAlias: null, type: contentTypeHelper.TYPE_GROUP },
-        { alias: 'tab/group', parentAlias: 'tab', type: contentTypeHelper.TYPE_GROUP },
-        { alias: 'tab', parentAlias: null, type: contentTypeHelper.TYPE_TAB },
-        { alias: 'notExistingTab/group', parentAlias: 'notExistingTab', type: contentTypeHelper.TYPE_GROUP }
-      ];
-
-      contentTypeHelper.relocateDisorientedGroups(groups);
-
-      expect(groups[0].parentAlias).toBeNull();
-      expect(groups[1].parentAlias).toBe('tab');
-      expect(groups[2].parentAlias).toBeNull();
-      expect(groups[3].parentAlias).toBeNull();
-    });
-
-  });
-
-  describe('convertGroupToTab', function () {
-
-    it('should convert group to tab', function () {
-      const groups = [
-        { type: contentTypeHelper.TYPE_GROUP, alias: 'hero', name: 'Hero' },
-        { type: contentTypeHelper.TYPE_GROUP, alias: 'content' },
-        { type: contentTypeHelper.TYPE_GROUP, alias: 'footer' }
-      ];
-
-      const newTab = groups[0];
-
-      contentTypeHelper.convertGroupToTab(groups, newTab);
-
-      expect(newTab.type).toBe(contentTypeHelper.TYPE_TAB);
-      expect(newTab.alias).toBe('hero');
-      expect(newTab.parentAlias).toBeNull();
-    });
-
-    it('should set sort order to 0 if it is the first tab', function () {
-      const groups = [
-        { type: contentTypeHelper.TYPE_GROUP, alias: 'hero', name: 'Hero' }
-      ];
-      
-      const newTab = groups[0];
-      contentTypeHelper.convertGroupToTab(groups, newTab);
-
-      expect(newTab.sortOrder).toBe(0);
-    });
-
-    it('should set sort order to 1 higher than the last tab', function () {
-      const groups = [
-        { type: contentTypeHelper.TYPE_GROUP, alias: 'settings', name: 'Settings', sortOrder: 100 },
-        { type: contentTypeHelper.TYPE_TAB, alias: 'content', name: 'Content', sortOrder: 5 }
-      ];
-      
-      const newTab = groups[0];
-      contentTypeHelper.convertGroupToTab(groups, newTab);
-
-      expect(newTab.sortOrder).toBe(6);
-    });
-
-  });
-
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/date-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/date-helper.spec.js
deleted file mode 100644
index 313a927ed5..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/date-helper.spec.js
+++ /dev/null
@@ -1,53 +0,0 @@
-describe('date helper tests', function () {
-    var dateHelper;
-
-    beforeEach(module('umbraco.services'));
-
-    beforeEach(inject(function ($injector) {
-        dateHelper = $injector.get('dateHelper');
-    }));
-
-    describe('converting to local moments', function () {
-
-        it('converts from a positive offset', function () {
-            var offsetMin = 600; //+10
-            var strDate = "2016-01-01 10:00:00";
-
-            var result = dateHelper.convertToLocalMomentTime(strDate, offsetMin);
-
-            //expect(result.format("YYYY-MM-DD HH:mm:ss Z")).toBe("2016-01-01 01:00:00 +01:00");
-        });
-
-        it('converts from a negataive offset', function () {
-            var offsetMin = -420; //-7
-            var strDate = "2016-01-01 10:00:00";
-
-            var result = dateHelper.convertToLocalMomentTime(strDate, offsetMin);
-
-            //expect(result.format("YYYY-MM-DD HH:mm:ss Z")).toBe("2016-01-01 18:00:00 +01:00");
-        });
-
-    });
-
-    describe('converting to server strings', function () {
-
-        it('converts to a positive offset', function () {
-            var offsetMin = 600; //+10
-            var localDate = moment("2016-01-01 10:00:00");
-
-            var result = dateHelper.convertToServerStringTime(localDate, offsetMin, "YYYY-MM-DD HH:mm:ss Z");
-
-            //expect(result).toBe("2016-01-01 19:00:00 +10:00");
-        });
-
-        it('converts from a negataive offset', function () {
-            var offsetMin = -420; //-7
-            var localDate = moment("2016-01-01 10:00:00");
-
-            var result = dateHelper.convertToServerStringTime(localDate, offsetMin, "YYYY-MM-DD HH:mm:ss Z");
-
-            //expect(result).toBe("2016-01-01 02:00:00 -07:00");
-        });
-
-    });
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/events-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/events-service.spec.js
deleted file mode 100644
index 95d9f05cdf..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/events-service.spec.js
+++ /dev/null
@@ -1,131 +0,0 @@
-describe('angular event tests', function () {
-    var $rootScope, eventsService, $timeout, $q;
-    
-    beforeEach(module('umbraco.services'));
-
-    beforeEach(inject(function ($injector) {
-        $rootScope = $injector.get('$rootScope');
-        eventsService = $injector.get('eventsService');
-        $timeout = $injector.get('$timeout');
-        $q = $injector.get('$q');
-    }));
-
-    describe('event handling', function () {
-
-        it('will handle one non async process', function () {
-            var eventArgs = {
-                val: ""
-            };
-            
-            eventsService.on("testEvent", function (e, args) {                
-                args.val = "changed";
-            });
-
-            eventsService.emit("testEvent", eventArgs);
-            
-            expect(eventArgs.val).toBe("changed");
-            
-            $rootScope.$digest();
-        });
-        
-        it('will handle 2 non async process', function () {
-            var eventArgs = {
-                val: ""
-            };
-
-            eventsService.on("testEvent", function (e, args) {
-                args.val = "changed";
-            });
-            
-            eventsService.on("testEvent", function (e, args) {
-                args.val = "changed1";
-            });
-
-            eventsService.emit("testEvent", eventArgs);
-
-            expect(eventArgs.val).toBe("changed1");
-
-            $rootScope.$digest();
-        });
-
-        it('will handle one async process', function () {
-            var eventArgs = {
-                val: ""
-            };
-
-            eventsService.on("testEvent", function (e, msg) {
-                $timeout(function () {                    
-                    msg.val = "changed";
-                    //NOTE: We could resolve anything here
-                    msg.resolve(msg);
-                }, 1000);
-            });
-
-            
-            //this won't be changed yet
-            expect(eventArgs.val).toBe("");
-
-            /*
-            promises[0].then(function (args) {
-                expect(args.val).toBe("changed");
-                expect(eventArgs.val).toBe("changed");
-            });*/
-
-            $rootScope.$digest();
-        });
-        
-        //NOTE: This logic has been merged into the eventsService
-        it('POC will wait to execute after all handlers', function () {
-
-            //assign multiple listeners
-
-            $rootScope.$on("testEvent", function(e, args) {
-                $timeout(function () {
-                    args.val = "changed1";
-                    args.resolve(args);
-                }, 1000);
-            });
-            
-            $rootScope.$on("testEvent", function (e, args) {
-                $timeout(function () {
-                    args.val = "changed2";
-                    args.resolve(args);
-                }, 1000);
-            });
-
-            //setup a promise for each listener
-            var promises = [];
-            for (var i = 0; i < $rootScope.$$listeners["testEvent"].length; i++) {
-                promises.push($q.defer());
-            }
-            var eventArgs = {
-                val: "",
-                reject: function(args) {
-                    promises.pop().reject(args);
-                },
-                resolve: function(args) {
-                    promises.pop().resolve(args);
-                }                
-            };
-
-            $rootScope.$broadcast("testEvent", eventArgs);
-
-            //We can still do stuff here after the event execution...
-
-            //This is where we'd wait for each one to finish.
-            var index = 0;
-            _.each(promises, function(p) {
-                p.promise.then(function (args) {
-                    index++;
-                    expect(args.val).toBe("changed" + index);
-                });
-            });
-            
-            $rootScope.$digest();
-            $timeout.flush();
-
-        });
-
-    });
-    
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/file-manager.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/file-manager.spec.js
deleted file mode 100644
index e5751341bc..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/file-manager.spec.js
+++ /dev/null
@@ -1,48 +0,0 @@
-describe('file manager tests', function () {
-    var fileManager;
-
-    beforeEach(module('umbraco.services'));
-
-    beforeEach(inject(function ($injector) {
-        fileManager = $injector.get('fileManager');
-    }));
-
-    describe('file management', function () {
-
-        it('adding a file adds to the collection', function () {
-            fileManager.setFiles({
-                propertyAlias: 'testProp',
-                files: ["testFile"]
-            });
-            expect(fileManager.getFiles().length).toBe(1);
-        });
-
-        it('adding a file with the same property id replaces the existing one', function () {
-            fileManager.setFiles({
-                propertyAlias: 'testProp',
-                files: ["testFile"]
-            });
-            fileManager.setFiles({
-                propertyAlias: 'testProp',
-                files: ["testFile2"]
-            });
-            expect(fileManager.getFiles().length).toBe(1);
-            expect(fileManager.getFiles()[0].file).toBe("testFile2");
-        });
-        
-        it('clears all files', function () {
-            fileManager.setFiles({
-                propertyAlias: 'testProp',
-                files: ["testFile"]
-            });
-            fileManager.setFiles({
-                propertyAlias: 'testProp2',
-                files: ["testFile"]
-            });
-            expect(fileManager.getFiles().length).toBe(2);
-            fileManager.clearFiles();
-            expect(fileManager.getFiles().length).toBe(0);
-        });
-
-    });
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/icon-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/icon-helper.spec.js
deleted file mode 100644
index 189c800d9a..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/icon-helper.spec.js
+++ /dev/null
@@ -1,40 +0,0 @@
-describe('icon helper tests', function () {
-    var iconHelper;
-
-    beforeEach(module('umbraco.services'));
-
-    beforeEach(inject(function ($injector) {
-        iconHelper = $injector.get('iconHelper');
-    }));
-
-    describe('converting icon formats to Belle formats', function () {
-
-        it('detects a file based icon', function () {
-            var fileBased = "this-is-file-based.jpg";
-            var legacyBased = ".legacy-class";
-            var belleBased = "normal-class";
-            
-            expect(iconHelper.isFileBasedIcon(fileBased)).toBe(true);
-            expect(iconHelper.isFileBasedIcon(legacyBased)).toBe(false);
-            expect(iconHelper.isFileBasedIcon(belleBased)).toBe(false);
-        });
-        
-        it('detects a legacy icon', function () {
-            var fileBased = "this-is-file-based.jpg";
-            var legacyBased = ".legacy-class";
-            var belleBased = "normal-class";
-
-            expect(iconHelper.isLegacyIcon(fileBased)).toBe(false);
-            expect(iconHelper.isLegacyIcon(legacyBased)).toBe(true);
-            expect(iconHelper.isLegacyIcon(belleBased)).toBe(false);
-        });
-        
-        it('converts from legacy icon', function () {
-            var legacyBased = ".sprTreeSettingDomain";
-
-            expect(iconHelper.convertFromLegacyIcon(legacyBased)).toBe("icon-home");
-            
-        });
-
-    });
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/keyboard-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/keyboard-service.spec.js
deleted file mode 100644
index 0daa1d3e13..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/keyboard-service.spec.js
+++ /dev/null
@@ -1,51 +0,0 @@
-describe('keyboard service tests', function () {
-    var keyboardService, $window, $rootScope;
-
-    var createKeyEvent = function (mainKey, alt, ctrl, shift, meta) {
-        var keyEvent = jQuery.Event("keypress");
-        keyEvent.keyCode = mainKey.charCodeAt(0);
-        keyEvent.altKey = alt;
-        keyEvent.ctrlKey = ctrl;
-        keyEvent.shiftKey = shift;
-        keyEvent.metaKey = meta;
-        return keyEvent;
-    };
-    
-   
-  
-    beforeEach(module('umbraco.services'));
-    beforeEach(inject(function ($injector) {
-        keyboardService = $injector.get('keyboardService');
-        $window = $injector.get("$window");
-        $rootScope = $injector.get("$rootScope");
-    }));
-
-
-    describe('Detecting key combinations', function () {
-
-        it('Detects ctrl+s', function () {
-            
-            var ctrls = false;
-            var el = $("<span></span>");
-            var ev = createKeyEvent("s", false, false, false);
-            keyboardService.bind("s", function(){
-                ctrls = true;
-            });
-
-            //initially it should be false
-            expect(ctrls).toBe(false);
-            
-            //trigger the ctrls+s event
-            //triggerEvent(el, "s", true);
-            el.trigger(ev);
-
-            $rootScope.$digest();
-
-            //it should now be true - this fails for some reason
-            //we will investigate some other time
-          // expect(ctrls).toBe(true);
-     });
-        
-
-    });
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/list-view-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/list-view-helper.spec.js
deleted file mode 100644
index 8726da7c14..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/list-view-helper.spec.js
+++ /dev/null
@@ -1,48 +0,0 @@
-describe('list view helper tests', function () {
-    var $scope, listViewHelper;
-
-    beforeEach(module('LocalStorageModule'));
-    beforeEach(module('umbraco.services'));
-
-    beforeEach(inject(function ($injector) {
-        $scope = $injector.get('$rootScope');
-        listViewHelper = $injector.get('listViewHelper');
-    }));
-
-    describe('getButtonPermissions', function () {
-
-        it('should update the currentIdsWithPermissions dictionary', function () {
-
-            var currentIdsWithPermissions = {};
-            var result = listViewHelper.getButtonPermissions({ "1234": ["A", "B", "C"] }, currentIdsWithPermissions);
-
-            expect(_.has(currentIdsWithPermissions, "1234")).toBe(true);
-            expect(_.keys(currentIdsWithPermissions).length).toEqual(1);
-
-        });
-
-        it('returns button permissions', function () {
-
-            var currentIdsWithPermissions = {};
-            var result1 = listViewHelper.getButtonPermissions({ "1234": ["O", "C", "D", "M", "U"] }, currentIdsWithPermissions);
-
-            expect(result1["canCopy"]).toBe(true);
-            expect(result1["canCreate"]).toBe(true);
-            expect(result1["canDelete"]).toBe(true);
-            expect(result1["canMove"]).toBe(true);
-            expect(result1["canPublish"]).toBe(true);
-            expect(result1["canUnpublish"]).toBe(true);
-
-            var result2 = listViewHelper.getButtonPermissions({ "1234": ["A", "B"] }, currentIdsWithPermissions);
-
-            expect(result2["canCopy"]).toBe(false);
-            expect(result2["canCreate"]).toBe(false);
-            expect(result2["canDelete"]).toBe(false);
-            expect(result2["canMove"]).toBe(false);
-            expect(result2["canPublish"]).toBe(false);
-            expect(result2["canUnpublish"]).toBe(false);
-
-        });
-
-    });
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/macro-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/macro-service.spec.js
deleted file mode 100644
index c319c3b524..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/macro-service.spec.js
+++ /dev/null
@@ -1,142 +0,0 @@
-describe('macro service tests', function () {
-    var macroService;
-
-    beforeEach(module('umbraco.services'));
-
-    beforeEach(inject(function ($injector) {
-        macroService = $injector.get('macroService');
-    }));
-
-    describe('generates macro syntax', function() {
-
-        it('can parse syntax for macros', function () {
-
-            var result = macroService.parseMacroSyntax("<?UMBRACO_MACRO macroAlias='Map' test=\"asdf\" test2='hello' />");
-
-
-            expect(result).not.toBeNull();
-            expect(result.macroAlias).toBe("Map");
-            expect(result.macroParamsDictionary).not.toBeUndefined();
-
-            expect(result.macroParamsDictionary.test).not.toBeUndefined();
-            expect(result.macroParamsDictionary.test).toBe("asdf");
-
-            expect(result.macroParamsDictionary.test2).not.toBeUndefined();
-            expect(result.macroParamsDictionary.test2).toBe("hello");
-
-
-        });
-
-        it('can parse syntax for macros with aliases containing dots', function () {
-
-            var result = macroService.parseMacroSyntax("<?UMBRACO_MACRO macroAlias='Map.Test' test=\"asdf\" test2='hello' />");
-
-            expect(result).not.toBeNull();
-            expect(result.macroAlias).toBe("Map.Test");
-            expect(result.macroParamsDictionary.test).not.toBeUndefined();
-            expect(result.macroParamsDictionary.test).toBe("asdf");
-            expect(result.macroParamsDictionary.test2).not.toBeUndefined();
-            expect(result.macroParamsDictionary.test2).toBe("hello");
-        });
-
-        it('can parse syntax for macros when macroAlias is not the first parameter', function () {
-
-            var result = macroService.parseMacroSyntax("<?UMBRACO_MACRO test=\"asdf\" test2='hello' macroAlias='Map.Test' />");
-
-            expect(result).not.toBeNull();
-            expect(result.macroAlias).toBe("Map.Test");
-            expect(result.macroParamsDictionary.test).not.toBeUndefined();
-            expect(result.macroParamsDictionary.test).toBe("asdf");
-            expect(result.macroParamsDictionary.test2).not.toBeUndefined();
-            expect(result.macroParamsDictionary.test2).toBe("hello");
-        });
-
-        it('can parse syntax for macros with aliases containing whitespace and other chars', function () {
-
-            var result = macroService.parseMacroSyntax("<?UMBRACO_MACRO macroAlias='Map Test [Hello\\World]' test=\"asdf\" test2='hello' />");
-
-            expect(result).not.toBeNull();
-            expect(result.macroAlias).toBe("Map Test [Hello\\World]");
-            expect(result.macroParamsDictionary.test).not.toBeUndefined();
-            expect(result.macroParamsDictionary.test).toBe("asdf");
-            expect(result.macroParamsDictionary.test2).not.toBeUndefined();
-            expect(result.macroParamsDictionary.test2).toBe("hello");
-        });
-
-        it('can parse syntax for macros with body', function () {
-
-            var result = macroService.parseMacroSyntax("<?UMBRACO_MACRO macroAlias='Map' test1=\"asdf\" test2='hello' ><img src='blah.jpg'/></?UMBRACO_MACRO>");
-
-            expect(result).not.toBeNull();
-            expect(result.macroAlias).toBe("Map");
-            expect(result.macroParamsDictionary.test1).not.toBeUndefined();
-            expect(result.macroParamsDictionary.test1).toBe("asdf");
-            expect(result.macroParamsDictionary.test2).not.toBeUndefined();
-            expect(result.macroParamsDictionary.test2).toBe("hello");
-
-
-        });
-
-    });
-
-    describe('generates macro syntax', function () {
-
-        it('can generate syntax for macros', function () {
-
-            var syntax = macroService.generateMacroSyntax({
-                macroAlias: "myMacro",
-                macroParamsDictionary: {
-                    param1: "value1",
-                    param2: "value2",
-                    param3: "value3"
-                }
-            });
-
-            expect(syntax).
-                toBe("<?UMBRACO_MACRO macroAlias=\"myMacro\" param1=\"value1\" param2=\"value2\" param3=\"value3\" />");
-
-        });
-
-        it('can generate syntax for macros with no params', function () {
-
-            var syntax = macroService.generateMacroSyntax({
-                macroAlias: "myMacro",
-                macroParamsDictionary: {}
-            });
-
-            expect(syntax).
-                toBe("<?UMBRACO_MACRO macroAlias=\"myMacro\" />");
-
-        });
-
-        it('can generate syntax for MVC', function () {
-
-            var syntax = macroService.generateMvcSyntax({
-                macroAlias: "myMacro",
-                macroParamsDictionary: {
-                    param1: "value1",
-                    param2: "value2",
-                    param3: "value3"
-                }
-            });
-
-            expect(syntax).
-                toBe("@await Umbraco.RenderMacroAsync(\"myMacro\", new {param1=\"value1\", param2=\"value2\", param3=\"value3\"})");
-
-
-        });
-
-        it('can generate syntax for MVC with no params', function () {
-
-            var syntax = macroService.generateMvcSyntax({
-                macroAlias: "myMacro",
-                macroParamsDictionary: {}
-            });
-
-            expect(syntax).
-                toBe("@await Umbraco.RenderMacroAsync(\"myMacro\")");
-
-        });
-
-    });
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/media-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/media-helper.spec.js
deleted file mode 100644
index 15f8eb87d1..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/media-helper.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-describe('mediaHelper service tests', function () {
-    var mediaHelper;
-
-    beforeEach(module('umbraco.services'));
-
-    beforeEach(inject(function ($injector) {
-        mediaHelper = $injector.get('mediaHelper');
-    }));
-
-    describe('formatFileTypes', function () {
-
-        it('will ignore any empty strings passed as arguments', function () {
-            
-            var result = mediaHelper.formatFileTypes("");
-            expect(result.length).toBe(0);
-
-            result = mediaHelper.formatFileTypes(" ");
-            expect(result.length).toBe(0);
-
-            result = mediaHelper.formatFileTypes("  ");
-            expect(result.length).toBe(0);
-
-            result = mediaHelper.formatFileTypes("  , ");
-            expect(result.length).toBe(0);
-
-            result = mediaHelper.formatFileTypes("  , ,,");
-            expect(result.length).toBe(0);
-
-        });
-
-        it('includes prefixed dot when formatting', function () {
-
-            var result = mediaHelper.formatFileTypes(".jpg, .png, gif");
-            expect(result).toBe(".jpg,.png,.gif");
-
-        });
-
-    });
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/navigation-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/navigation-service.spec.js
deleted file mode 100644
index b09d867d8d..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/navigation-service.spec.js
+++ /dev/null
@@ -1,50 +0,0 @@
-describe('navigation services tests', function () {
-    var navigationService;
-
-    beforeEach(module('umbraco.services'));
-    beforeEach(module('ngRoute'));
-
-    beforeEach(inject(function ($injector) {
-        navigationService = $injector.get('navigationService');
-    }));
-
-    describe('determine if route change causes navigation', function () {
-
-        it('navigates when parameters added', function () {
-            var currParams = { section: "content", id: 123 };
-            var nextParams = { section: "content", id: 123, create: true };
-            var result = navigationService.isRouteChangingNavigation(currParams, nextParams);
-            expect(result).toBe(true);
-        });
-
-        it('navigates when parameters removed', function () {
-            var currParams = { section: "content", id: 123, create: true };
-            var nextParams = { section: "content", id: 123 };
-            var result = navigationService.isRouteChangingNavigation(currParams, nextParams);
-            expect(result).toBe(true);
-        });
-
-        it('does not navigate when non routing parameters added', function () {
-            var currParams = { section: "content", id: 123 };
-            var nextParams = { section: "content", id: 123, mculture: "abc", cculture: "xyz" };
-            var result = navigationService.isRouteChangingNavigation(currParams, nextParams);
-            expect(result).toBe(false);
-        });
-
-        it('does not navigate when non routing parameters changed', function () {
-            var currParams = { section: "content", id: 123, mculture: "abc" };
-            var nextParams = { section: "content", id: 123, mculture: "ooo", cculture: "xyz" };
-            var result = navigationService.isRouteChangingNavigation(currParams, nextParams);
-            expect(result).toBe(false);
-        });
-
-        it('does not navigate when non routing parameters removed', function () {
-            var currParams = { section: "content", id: 123, mculture: "abc", cculture: "xyz" };
-            var nextParams = { section: "content", id: 123, cculture: "xyz" };
-            var result = navigationService.isRouteChangingNavigation(currParams, nextParams);
-            expect(result).toBe(false);
-        });
-
-    });
-    
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/notifications.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/notifications.spec.js
deleted file mode 100644
index 071c2158b8..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/notifications.spec.js
+++ /dev/null
@@ -1,36 +0,0 @@
-describe('notification tests', function () {
-    var $scope, notifications;
-
-    beforeEach(module('umbraco.services'));
-
-    beforeEach(inject(function($injector) {
-      $scope = $injector.get('$rootScope');
-      notifications = $injector.get('notificationsService');
-    }));
-
-    describe('global notifications crud', function () {
-
-      it('should allow to add, get and remove notifications', function () {
-        var not1 = notifications.success("success", "something great happened");
-        var not2 = notifications.error("error", "something great happened");
-        var not3 = notifications.warning("warning", "something great happened");
-          var not4 = notifications.warning("warning", "");
-          var not5 = notifications.info("info", "something informative happened");
-
-        expect(notifications.getCurrent().length).toBe(5);
-
-        //remove at index 0
-        notifications.remove(0);
-
-        expect(notifications.getCurrent().length).toEqual(4);
-        expect(notifications.getCurrent()[0].headline).toBe("error: ");
-        expect(notifications.getCurrent()[1].headline).toBe("warning: ");
-          expect(notifications.getCurrent()[2].headline).toBe("warning");
-          expect(notifications.getCurrent()[3].headline).toBe("info: ");
-
-        notifications.removeAll();
-        expect(notifications.getCurrent().length).toEqual(0);
-      });
-
-    });
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/server-validation-manager.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/server-validation-manager.spec.js
deleted file mode 100644
index ab2a5cdd69..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/server-validation-manager.spec.js
+++ /dev/null
@@ -1,780 +0,0 @@
-describe('serverValidationManager tests', function () {
-    var $rootScope, serverValidationManager, $timeout;
-
-    beforeEach(module('umbraco.services'));
-    
-    beforeEach(inject(function ($injector) {
-        $rootScope = $injector.get('$rootScope');
-        $timeout = $injector.get('$timeout');
-        serverValidationManager = $injector.get('serverValidationManager');
-        serverValidationManager.clear();
-    }));
-
-    describe('managing field validation errors', function () {
-
-        it('can add and retrieve field validation errors', function () {
-
-            //arrange
-            serverValidationManager.addFieldError("Name", "Required");
-
-            //act
-            var err = serverValidationManager.getFieldError("Name");
-
-            //assert
-            expect(err).not.toBeUndefined();
-            expect(err.propertyAlias).toBeNull();
-            expect(err.fieldName).toEqual("Name");
-            expect(err.errorMsg).toEqual("Required");
-            expect(err.culture).toEqual("invariant");
-        });
-        
-        it('will return null for a non-existing field error', function () {
-
-            //arrange
-            serverValidationManager.addFieldError("Name", "Required");
-
-            //act
-            var err = serverValidationManager.getFieldError("DoesntExist");            
-
-            //assert
-            expect(err).toBeUndefined();
-            
-        });
-        
-        it('detects if a field error exists', function () {
-
-            //arrange
-            serverValidationManager.addFieldError("Name", "Required");
-
-            //act            
-            var err1 = serverValidationManager.hasFieldError("Name");
-            var err2 = serverValidationManager.hasFieldError("DoesntExist");
-
-            //assert
-            expect(err1).toBe(true);
-            expect(err2).toBe(false);
-
-        });
-        
-
-    });
-    
-    describe('managing property validation errors', function () {
-
-        it('can retrieve property validation errors for a sub field', function () {
-
-            //arrange
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", null);
-            serverValidationManager.addPropertyError("myProperty", null, "value2", "Another value 2");
-
-            //act
-            var err1 = serverValidationManager.getPropertyError("myProperty", null, "value1", null);
-            var err2 = serverValidationManager.getPropertyError("myProperty", null, "value2", null);
-
-            //assert            
-            expect(err1).not.toBeUndefined();
-            expect(err1.propertyAlias).toEqual("myProperty");
-            expect(err1.fieldName).toEqual("value1");
-            expect(err1.errorMsg).toEqual("Some value 1");
-            expect(err1.culture).toEqual("invariant");
-            
-            expect(err2).not.toBeUndefined();
-            expect(err2.propertyAlias).toEqual("myProperty");
-            expect(err2.fieldName).toEqual("value2");
-            expect(err2.errorMsg).toEqual("Another value 2");
-            expect(err2.culture).toEqual("invariant");
-        });
-
-        it('can retrieve property validation errors for a sub field for culture', function () {
-
-            //arrange
-            serverValidationManager.addPropertyError("myProperty", "en-US", "value1", "Some value 1", null);
-            serverValidationManager.addPropertyError("myProperty", "fr-FR", "value2", "Another value 2", null);
-
-            //act
-            var err1 = serverValidationManager.getPropertyError("myProperty", "en-US", "value1", null);
-            var err1NotFound = serverValidationManager.getPropertyError("myProperty", null, "value1", null);
-            var err2 = serverValidationManager.getPropertyError("myProperty", "fr-FR", "value2", null);
-            var err2NotFound = serverValidationManager.getPropertyError("myProperty", null, "value2", null);
-
-
-            //assert            
-            expect(err1NotFound).toBeUndefined();
-            expect(err2NotFound).toBeUndefined();
-
-            expect(err1).not.toBeUndefined();
-            expect(err1.propertyAlias).toEqual("myProperty");
-            expect(err1.fieldName).toEqual("value1");
-            expect(err1.errorMsg).toEqual("Some value 1");
-            expect(err1.culture).toEqual("en-US");
-
-            expect(err2).not.toBeUndefined();
-            expect(err2.propertyAlias).toEqual("myProperty");
-            expect(err2.fieldName).toEqual("value2");
-            expect(err2.errorMsg).toEqual("Another value 2");
-            expect(err2.culture).toEqual("fr-FR");
-        });
-
-        it('can retrieve property validation errors for a sub field for segments', function () {
-
-            //arrange
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", "segment1");
-            serverValidationManager.addPropertyError("myProperty", null, "value2", "Another value 2", "segment2");
-
-            //act
-            var err1 = serverValidationManager.getPropertyError("myProperty", null, "value1", "segment1");
-            var err1NotFound = serverValidationManager.getPropertyError("myProperty", null, "value1", null);
-            var err2 = serverValidationManager.getPropertyError("myProperty", null, "value2", "segment2");
-            var err2NotFound = serverValidationManager.getPropertyError("myProperty", null, "value2", null);
-
-
-            //assert            
-            expect(err1NotFound).toBeUndefined();
-            expect(err2NotFound).toBeUndefined();
-
-            expect(err1).not.toBeUndefined();
-            expect(err1.propertyAlias).toEqual("myProperty");
-            expect(err1.fieldName).toEqual("value1");
-            expect(err1.errorMsg).toEqual("Some value 1");
-            expect(err1.segment).toEqual("segment1");
-
-            expect(err2).not.toBeUndefined();
-            expect(err2.propertyAlias).toEqual("myProperty");
-            expect(err2.fieldName).toEqual("value2");
-            expect(err2.errorMsg).toEqual("Another value 2");
-            expect(err2.segment).toEqual("segment2");
-        });
-
-        
-        it('can retrieve property validation errors for a sub field for culture with segments', function () {
-
-            //arrange
-            serverValidationManager.addPropertyError("myProperty", "en-US", "value1", "Some value 1", "segment1");
-            serverValidationManager.addPropertyError("myProperty", "fr-FR", "value2", "Another value 2", "segment2");
-
-            //act
-            var err1 = serverValidationManager.getPropertyError("myProperty", "en-US", "value1", "segment1");
-            expect(serverValidationManager.getPropertyError("myProperty", null, "value1", null)).toBeUndefined();
-            expect(serverValidationManager.getPropertyError("myProperty", "en-US", "value1", null)).toBeUndefined();
-            expect(serverValidationManager.getPropertyError("myProperty", null, "value1", "segment1")).toBeUndefined();
-            var err2 = serverValidationManager.getPropertyError("myProperty", "fr-FR", "value2", "segment2");
-            expect(serverValidationManager.getPropertyError("myProperty", null, "value2", null)).toBeUndefined();
-            expect(serverValidationManager.getPropertyError("myProperty", "fr-FR", "value2", null)).toBeUndefined();
-            expect(serverValidationManager.getPropertyError("myProperty", null, "value2", "segment2")).toBeUndefined();
-
-
-            //assert
-
-            expect(err1).not.toBeUndefined();
-            expect(err1.propertyAlias).toEqual("myProperty");
-            expect(err1.fieldName).toEqual("value1");
-            expect(err1.errorMsg).toEqual("Some value 1");
-            expect(err1.culture).toEqual("en-US");
-            expect(err1.segment).toEqual("segment1");
-
-            expect(err2).not.toBeUndefined();
-            expect(err2.propertyAlias).toEqual("myProperty");
-            expect(err2.fieldName).toEqual("value2");
-            expect(err2.errorMsg).toEqual("Another value 2");
-            expect(err2.culture).toEqual("fr-FR");
-            expect(err2.segment).toEqual("segment2");
-        });
-        
-        it('can add a property errors with multiple sub fields and it the first will be retreived with only the property alias', function () {
-
-            //arrange
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", null);
-            serverValidationManager.addPropertyError("myProperty", null, "value2", "Another value 2", null);
-
-            //act
-            var err = serverValidationManager.getPropertyError("myProperty");
-
-            //assert
-            expect(err).not.toBeUndefined();
-            expect(err.propertyAlias).toEqual("myProperty");
-            expect(err.fieldName).toEqual("value1");
-            expect(err.errorMsg).toEqual("Some value 1");
-            expect(err.culture).toEqual("invariant");
-        });
-
-        it('will return null for a non-existing property error', function () {
-
-            //arrage
-            serverValidationManager.addPropertyError("myProperty", null, "value", "Required", null);
-
-            //act
-            var err = serverValidationManager.getPropertyError("DoesntExist", null, "value", null);
-
-            //assert
-            expect(err).toBeUndefined();
-
-        });
-
-        it('detects if a property error exists', function () {
-
-            //arrange
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", null);
-            serverValidationManager.addPropertyError("myProperty", null, "value2", "Another value 2", null);
-
-            //act
-            var err1 = serverValidationManager.hasPropertyError("myProperty");
-            var err2 = serverValidationManager.hasPropertyError("myProperty", null, "value1", null);
-            var err3 = serverValidationManager.hasPropertyError("myProperty", null, "value2", null);
-            var err4 = serverValidationManager.hasPropertyError("notFound");
-            var err5 = serverValidationManager.hasPropertyError("myProperty", null, "notFound", null);
-
-            //assert
-            expect(err1).toBe(true);            
-            expect(err2).toBe(true);
-            expect(err3).toBe(true);
-            expect(err4).toBe(false);
-            expect(err5).toBe(false);
-
-        });
-        
-        it('can remove a property error with a sub field specified', function () {
-
-            //arrage
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", null);
-            serverValidationManager.addPropertyError("myProperty", null, "value2", "Another value 2", null);
-
-            //act
-            serverValidationManager.removePropertyError("myProperty", null, "value1", null);
-
-            //assert
-            expect(serverValidationManager.hasPropertyError("myProperty", null, "value1", null)).toBe(false);
-            expect(serverValidationManager.hasPropertyError("myProperty", null, "value2", null)).toBe(true);
-
-        });
-        
-        it('can remove a property error and all sub field errors by specifying only the property', function () {
-
-            //arrage
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1");
-            serverValidationManager.addPropertyError("myProperty", null, "value2", "Another value 2");
-
-            //act
-            serverValidationManager.removePropertyError("myProperty");
-
-            //assert
-            expect(serverValidationManager.hasPropertyError("myProperty", null, "value1", null)).toBe(false);
-            expect(serverValidationManager.hasPropertyError("myProperty", null, "value2", null)).toBe(false);
-
-        });
-
-    });
-
-    describe('managing culture validation errors', function () {
-
-        it('can retrieve culture validation errors', function () {
-
-            //arrange
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", null);
-            serverValidationManager.addPropertyError("myProperty", "en-US", "value1", "Some value 2", null);
-            serverValidationManager.addPropertyError("myProperty", null, "value2", "Another value 2", null);
-            serverValidationManager.addPropertyError("myProperty", "fr-FR", "value2", "Another value 3", null);
-
-            //assert
-            expect(serverValidationManager.hasCultureError(null)).toBe(true);
-            expect(serverValidationManager.hasCultureError("en-US")).toBe(true);
-            expect(serverValidationManager.hasCultureError("fr-FR")).toBe(true);
-            expect(serverValidationManager.hasCultureError("es-ES")).toBe(false);
-
-        });
-
-    });
-
-    describe('managing variant validation errors', function () {
-
-        it('can retrieve variant validation errors', function () {
-
-            //arrange
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", null);
-            serverValidationManager.addPropertyError("myProperty", "en-US", "value1", "Some value 2", null);
-            serverValidationManager.addPropertyError("myProperty", null, "value2", "Another value 2", null);
-            serverValidationManager.addPropertyError("myProperty", "fr-FR", "value2", "Another value 3", null);
-
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", "MySegment");
-            serverValidationManager.addPropertyError("myProperty", "en-US", "value1", "Some value 2", "MySegment");
-            serverValidationManager.addPropertyError("myProperty", null, "value2", "Another value 2", "MySegment");
-            serverValidationManager.addPropertyError("myProperty", "fr-FR", "value2", "Another value 3", "MySegment");
-
-            //assert
-            expect(serverValidationManager.hasVariantError(null, null)).toBe(true);
-            expect(serverValidationManager.hasVariantError("en-US", null)).toBe(true);
-            expect(serverValidationManager.hasVariantError("fr-FR", null)).toBe(true);
-
-            expect(serverValidationManager.hasVariantError(null, "MySegment")).toBe(true);
-            expect(serverValidationManager.hasVariantError("en-US", "MySegment")).toBe(true);
-            expect(serverValidationManager.hasVariantError("fr-FR", "MySegment")).toBe(true);
-
-            expect(serverValidationManager.hasVariantError("es-ES", null)).toBe(false);
-            expect(serverValidationManager.hasVariantError("es-ES", "MySegment")).toBe(false);
-            expect(serverValidationManager.hasVariantError("fr-FR", "MySegmentNotRight")).toBe(false);
-            expect(serverValidationManager.hasVariantError(null, "MySegmentNotRight")).toBe(false);
-
-        });
-
-    });
-
-    describe('managing complex editor validation errors', function () {
-
-        // this root element doesn't have it's own attached errors, instead it has model state just 
-        // showing that it has errors within it's nested properties. that ModelState is automatically
-        // added on the server side.
-        var nonRootLevelComplexValidationMsg = `[
-    {
-        "$elementTypeAlias": "addressBook",
-		"$id": "34E3A26C-103D-4A05-AB9D-7E14032309C3",
-        "addresses":
-        [
-			{
-				"$elementTypeAlias": "addressInfo",
-				"$id": "FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1",
-				"ModelState":
-                {
-                    "_Properties.city.invariant.null.country": [
-                        "City is not in Australia"
-                    ],
-                    "_Properties.city.invariant.null.capital": [
-                        "Not a capital city"
-                    ]
-                }
-			},
-			{
-				"$elementTypeAlias": "addressInfo",
-				"$id": "7170A4DD-2441-4B1B-A8D3-437D75C4CBC9",
-				"ModelState":
-                {
-                    "_Properties.city.invariant.null.country": [
-                        "City is not in Australia"
-                    ],
-                    "_Properties.city.invariant.null.capital": [
-                        "Not a capital city"
-                    ]
-                }
-			}
-        ],
-        "ModelState":
-        {
-            "_Properties.addresses.invariant.null": [
-                ""
-            ]
-        }
-    }
-]`;
-
-        it('create dictionary of id to ModelState', function () {
-
-            //arrange
-            var complexValidationMsg = `[
-    {
-        "$elementTypeAlias": "addressBook",
-		"$id": "34E3A26C-103D-4A05-AB9D-7E14032309C3",
-        "addresses":
-        [
-			{
-				"$elementTypeAlias": "addressInfo",
-				"$id": "FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1",
-				"ModelState":
-                {
-                    "_Properties.city.invariant.null.country": [
-                        "City is not in Australia"
-                    ],
-                    "_Properties.city.invariant.null.capital": [
-                        "Not a capital city"
-                    ]
-                }
-			},
-			{
-				"$elementTypeAlias": "addressInfo",
-				"$id": "7170A4DD-2441-4B1B-A8D3-437D75C4CBC9",
-				"ModelState":
-                {
-                    "_Properties.city.invariant.null.country": [
-                        "City is not in Australia"
-                    ],
-                    "_Properties.city.invariant.null.capital": [
-                        "Not a capital city"
-                    ]
-                }
-			}
-        ],
-        "ModelState":
-        {
-            "_Properties.addresses.invariant.null.counter": [
-                "Must have at least 3 addresses"
-            ],
-            "_Properties.bookName.invariant.null.book": [
-                "Invalid address book name"
-            ]
-        }
-    }
-]`;
-            
-            //act 
-            var ms = serverValidationManager.parseComplexEditorError(complexValidationMsg, "myBlockEditor");
-
-            //assert
-            expect(ms.length).toEqual(3);
-            expect(ms[0].validationPath).toEqual("myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3");
-            expect(ms[1].validationPath).toEqual("myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1");
-            expect(ms[2].validationPath).toEqual("myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/7170A4DD-2441-4B1B-A8D3-437D75C4CBC9");
-
-        });
-
-        it('create dictionary of id to ModelState with inherited errors', function () {
-
-            //act 
-            var ms = serverValidationManager.parseComplexEditorError(nonRootLevelComplexValidationMsg, "myBlockEditor");
-
-            //assert
-            expect(ms.length).toEqual(3);
-            expect(ms[0].validationPath).toEqual("myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3");
-            var item0ModelState = ms[0].modelState;
-            expect(Object.keys(item0ModelState).length).toEqual(1);
-            expect(item0ModelState["_Properties.addresses.invariant.null"].length).toEqual(1);
-            expect(item0ModelState["_Properties.addresses.invariant.null"][0]).toEqual("");
-            expect(ms[1].validationPath).toEqual("myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1");
-            expect(ms[2].validationPath).toEqual("myBlockEditor/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/7170A4DD-2441-4B1B-A8D3-437D75C4CBC9");
-
-        });
-
-        it('add errors for ModelState with inherited errors', function () {
-
-            //act 
-            let modelState = {
-                "_Properties.blockFeatures.invariant.null": [
-                    nonRootLevelComplexValidationMsg
-                ]
-            };
-            serverValidationManager.addErrorsForModelState(modelState);
-
-            //assert
-            var propertyErrors = [
-                "blockFeatures",
-                "blockFeatures/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses",
-                "blockFeatures/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city",
-                "blockFeatures/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/7170A4DD-2441-4B1B-A8D3-437D75C4CBC9/city"
-            ]
-            // These will all exist
-            propertyErrors.forEach(x => expect(serverValidationManager.getPropertyError(x)).toBeDefined());
-
-            // These field errors also exist
-            expect(serverValidationManager.getPropertyError(propertyErrors[2], null, "country")).toBeDefined();
-            expect(serverValidationManager.getPropertyError(propertyErrors[2], null, "capital")).toBeDefined();
-            expect(serverValidationManager.getPropertyError(propertyErrors[3], null, "country")).toBeDefined();
-            expect(serverValidationManager.getPropertyError(propertyErrors[3], null, "capital")).toBeDefined();
-        });
-
-    });
-
-    describe('validation error subscriptions', function() {
-
-        it('can subscribe to a field error', function() {
-            var args;
-
-            //arrange
-            serverValidationManager.subscribe(null, null, "Name", function (isValid, propertyErrors, allErrors) {
-                args = {
-                    isValid: isValid,
-                    propertyErrors: propertyErrors,
-                    allErrors: allErrors
-                };
-            }, null);
-
-            
-
-            //act
-            serverValidationManager.addFieldError("Name", "Required");
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", null);
-
-            //assert
-            expect(args).not.toBeUndefined();
-            expect(args.isValid).toBe(false);
-            expect(args.propertyErrors.length).toEqual(1);
-            expect(args.propertyErrors[0].errorMsg).toEqual("Required");
-            expect(args.allErrors.length).toEqual(2);
-        });
-        
-        it('can get the field subscription callbacks', function () {
-            
-            //arrange
-            var cb1 = function() {
-            };
-            var cb2 = function () {
-            };
-            serverValidationManager.subscribe(null, null, "Name", cb1, null);
-            
-            serverValidationManager.subscribe(null, null, "Title", cb2, null);
-            
-
-            //act
-            serverValidationManager.addFieldError("Name", "Required");
-            serverValidationManager.addFieldError("Title", "Invalid");
-
-            //assert
-            var nameCb = serverValidationManager.getFieldCallbacks("Name");
-            expect(nameCb).not.toBeUndefined();
-            expect(nameCb.length).toEqual(1);
-            expect(nameCb[0].propertyAlias).toBeNull();
-            expect(nameCb[0].fieldName).toEqual("Name");
-            expect(nameCb[0].callback).toEqual(cb1);
-
-            var titleCb = serverValidationManager.getFieldCallbacks("Title");
-            expect(titleCb).not.toBeUndefined();
-            expect(titleCb.length).toEqual(1);
-            expect(titleCb[0].propertyAlias).toBeNull();
-            expect(titleCb[0].fieldName).toEqual("Title");
-            expect(titleCb[0].callback).toEqual(cb2);
-        });
-        
-        it('can subscribe to a property error for both a property and its sub field', function () {
-            var args1;
-            var args2;
-            var numCalled = 0;
-            var numCalledWithErrors = 0;
-
-            //arrange
-            serverValidationManager.subscribe("myProperty", null, "value1", function (isValid, propertyErrors, allErrors) {
-                args1 = {
-                    isValid: isValid,
-                    propertyErrors: propertyErrors,
-                    allErrors: allErrors
-                };
-            }, null);
-            
-            
-            serverValidationManager.subscribe("myProperty", null, "", function (isValid, propertyErrors, allErrors) {
-                numCalled++;
-                if (propertyErrors.length > 0) {
-                    numCalledWithErrors++;
-                }
-                args2 = {
-                    isValid: isValid,
-                    propertyErrors: propertyErrors,
-                    allErrors: allErrors
-                };
-            }, null);
-            
-            //act
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", null);
-            serverValidationManager.addPropertyError("myProperty", null, "value2", "Some value 2", null);
-            serverValidationManager.addPropertyError("myProperty", null, "", "Some value 3", null);
-
-            //assert
-            expect(args1).not.toBeUndefined();
-            expect(args1.isValid).toBe(false);
-            //this is only one because this subscription is targetting only a sub field
-            expect(args1.propertyErrors.length).toEqual(1);
-            expect(args1.propertyErrors[0].errorMsg).toEqual("Some value 1");
-            //NOTE: though you might think this should be 3, it's actually correct at 2 since the last error that doesn't have a sub field
-            // specified doesn't actually get added because it already detects that a property error exists for the alias.
-            expect(args1.allErrors.length).toEqual(2);
-            
-            expect(args2).not.toBeUndefined();
-            expect(args2.isValid).toBe(false);
-            //This is 2 because we are looking for all property errors including sub fields
-            expect(args2.propertyErrors.length).toEqual(2);
-            expect(args2.propertyErrors[0].errorMsg).toEqual("Some value 1");
-            expect(args2.propertyErrors[1].errorMsg).toEqual("Some value 2");
-            expect(args2.allErrors.length).toEqual(2);
-            //3 errors are added but a call to subscribe also calls the callback
-            expect(numCalled).toEqual(4);
-            expect(numCalledWithErrors).toEqual(3);
-        });
-
-        it('can subscribe to a culture error for both a property and its sub field', function () {
-            var args1;
-            var args2;
-            var numCalled = 0;
-            var numCalledWithErrors = 0;
-
-            //arrange
-            serverValidationManager.subscribe(null, "en-US", null, function (isValid, propertyErrors, allErrors) {
-                numCalled++;
-                if (propertyErrors.length > 0) {
-                    numCalledWithErrors++;
-                }
-                args1 = {
-                    isValid: isValid,
-                    propertyErrors: propertyErrors,
-                    allErrors: allErrors
-                };
-            }, null);
-            
-
-            serverValidationManager.subscribe(null, "es-ES", null, function (isValid, propertyErrors, allErrors) {
-                numCalled++;
-                if (propertyErrors.length > 0) {
-                    numCalledWithErrors++;
-                }
-                args2 = {
-                    isValid: isValid,
-                    propertyErrors: propertyErrors,
-                    allErrors: allErrors
-                };
-            }, null);
-
-            //act
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "Some value 1", null);       // doesn't match
-            serverValidationManager.addPropertyError("myProperty", "en-US", "value1", "Some value 1", null);    // matches callback 1
-            serverValidationManager.addPropertyError("myProperty", "en-US", "value2", "Some value 2", null);    // matches callback 1
-            serverValidationManager.addPropertyError("myProperty", "fr-FR", "", "Some value 3", null);          // doesn't match - but all callbacks still execute
-
-            //assert
-            expect(args1.isValid).toBe(false);
-            expect(args2.isValid).toBe(true); // no errors registered for this callback
-
-            expect(numCalled).toEqual(10); // both subscriptions will be called once per addPropertyError and also called on subscribe
-            expect(numCalledWithErrors).toEqual(3); // the first subscription is called 3 times with errors because the 4th time we call addPropertyError all callbacks still execute
-        });
-
-        it('can subscribe to a property validation path prefix', function () {
-            var callbackA = [];
-            var callbackB = [];
-
-            //arrange
-            serverValidationManager.subscribe("myProperty", null, null, function (isValid, propertyErrors, allErrors) {
-                if (propertyErrors.length > 0) {
-                    callbackA.push(propertyErrors);
-                }
-            }, null, { matchType: "prefix" });
-
-            serverValidationManager.subscribe("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses", null, null, function (isValid, propertyErrors, allErrors) {
-                if (propertyErrors.length > 0) {
-                    callbackB.push(propertyErrors);
-                }
-            }, null, { matchType: "prefix" });
-
-            //act
-            // will match A:
-            serverValidationManager.addPropertyError("myProperty", null, null, "property error", null);
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "value error", null);
-            // will match A + B
-            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", null, null, "property error", null);
-            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", null, "value1", "value error", null);
-            // won't match:
-            serverValidationManager.addPropertyError("myProperty", "en-US", null, "property error", null);
-            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", "en-US", null, "property error", null);
-            serverValidationManager.addPropertyError("otherProperty", null, null, "property error", null);
-            serverValidationManager.addPropertyError("otherProperty", null, "value1", "value error", null);
-
-            //assert
-
-            // both will be called each time addPropertyError is called
-            expect(callbackA.length).toEqual(8);
-            expect(callbackB.length).toEqual(6); // B - will only be called 6 times with errors because the first 2 calls to addPropertyError haven't added errors for B yet
-            expect(callbackA[callbackA.length - 1].length).toEqual(4); // 4 errors for A
-            expect(callbackB[callbackB.length - 1].length).toEqual(2); // 2 errors for B
-
-            // clear the data and notify
-            callbackA = [];
-            callbackB = [];
-
-            serverValidationManager.notify();
-            $timeout.flush();
-
-            expect(callbackA.length).toEqual(1);
-            expect(callbackB.length).toEqual(1);
-            expect(callbackA[0].length).toEqual(4); // 4 errors for A
-            expect(callbackB[0].length).toEqual(2); // 2 errors for B
-            
-        });
-
-        it('can subscribe to a property validation path suffix', function () {
-            var callbackA = [];
-            var callbackB = [];
-
-            //arrange
-            serverValidationManager.subscribe("myProperty", null, null, function (isValid, propertyErrors, allErrors) {
-                if (propertyErrors.length > 0) {
-                    callbackA.push(propertyErrors);
-                }
-            }, null, { matchType: "suffix" });
-
-            serverValidationManager.subscribe("city", null, null, function (isValid, propertyErrors, allErrors) {
-                if (propertyErrors.length > 0) {
-                    callbackB.push(propertyErrors);
-                }
-            }, null, { matchType: "suffix" });
-
-            //act
-            // will match A:
-            serverValidationManager.addPropertyError("myProperty", null, null, "property error", null);
-            serverValidationManager.addPropertyError("myProperty", null, "value1", "value error", null);
-            // will match B
-            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", null, null, "property error", null);
-            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", null, "value1", "value error", null);
-            // won't match:
-            serverValidationManager.addPropertyError("myProperty", "en-US", null, "property error", null);
-            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", "en-US", null, "property error", null);
-            serverValidationManager.addPropertyError("otherProperty", null, null, "property error", null);
-            serverValidationManager.addPropertyError("otherProperty", null, "value1", "value error", null);
-
-            //assert
-
-            // both will be called each time addPropertyError is called
-            expect(callbackA.length).toEqual(8);
-            expect(callbackB.length).toEqual(6); // B - will only be called 6 times with errors because the first 2 calls to addPropertyError haven't added errors for B yet
-            expect(callbackA[callbackA.length - 1].length).toEqual(2); // 2 errors for A
-            expect(callbackB[callbackB.length - 1].length).toEqual(2); // 2 errors for B
-
-            // clear the data and notify
-            callbackA = [];
-            callbackB = [];
-
-            serverValidationManager.notify();
-            $timeout.flush();
-
-            expect(callbackA.length).toEqual(1);
-            expect(callbackB.length).toEqual(1);
-            expect(callbackA[0].length).toEqual(2); // 2 errors for A
-            expect(callbackB[0].length).toEqual(2); // 2 errors for B
-
-        });
-
-        it('can subscribe to a property validation path contains', function () {
-            var callbackA = [];
-
-            //arrange
-            serverValidationManager.subscribe("addresses", null, null, function (isValid, propertyErrors, allErrors) {
-                if (propertyErrors.length > 0) {
-                    callbackA.push(propertyErrors);
-                }
-            }, null, { matchType: "contains" });
-
-            //act
-            // will match A:
-            serverValidationManager.addPropertyError("addresses", null, null, "property error", null);
-            serverValidationManager.addPropertyError("addresses", null, "value1", "value error", null);
-            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", null, null, "property error", null);
-            serverValidationManager.addPropertyError("myProperty/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", null, "value1", "value error", null);
-            // won't match:
-            serverValidationManager.addPropertyError("addresses", "en-US", null, "property error", null);
-            serverValidationManager.addPropertyError("addresses/34E3A26C-103D-4A05-AB9D-7E14032309C3/addresses/FBEAEE8F-4BC9-43EE-8B81-FCA8978850F1/city", "en-US", null, "property error", null);
-            serverValidationManager.addPropertyError("otherProperty", null, null, "property error", null);
-            serverValidationManager.addPropertyError("otherProperty", null, "value1", "value error", null);
-
-            //assert
-
-            // both will be called each time addPropertyError is called
-            expect(callbackA.length).toEqual(8);
-            expect(callbackA[callbackA.length - 1].length).toEqual(4); // 4 errors for A
-
-            // clear the data and notify
-            callbackA = [];
-
-            serverValidationManager.notify();
-            $timeout.flush();
-
-            expect(callbackA.length).toEqual(1);
-            expect(callbackA[0].length).toEqual(4); // 4 errors for A
-
-        });
-
-        // TODO: Finish testing the rest!
-
-    });
-
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/template-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/template-helper.spec.js
deleted file mode 100644
index 69da0ce786..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/template-helper.spec.js
+++ /dev/null
@@ -1,108 +0,0 @@
-describe('service: templateHelper', function () {
-
-    var templateHelper;
-
-    beforeEach(module("umbraco.services"));
-
-    beforeEach(inject(function ($injector) {
-        templateHelper = $injector.get('templateHelper');
-    }));
-
-    afterEach(inject(function ($rootScope) {
-        $rootScope.$apply();
-    }));
-
-    describe('getInsertDictionarySnippet', function () {
-
-        it('should return the snippet for inserting a dictionary item', function () {
-            var snippet = '@Umbraco.GetDictionaryValue("nodeName")';
-            expect(templateHelper.getInsertDictionarySnippet('nodeName')).toBe(snippet);
-        });
-
-    });
-
-    describe('getInsertPartialSnippet', function () {
-
-        it('should return the snippet for inserting a partial from the root', function () {
-            var parentId = "";
-            var nodeName = "Footer.cshtml";
-            var snippet = '@await Html.PartialAsync("Footer")';
-            expect(templateHelper.getInsertPartialSnippet(parentId, nodeName)).toBe(snippet);
-        });
-
-        it('should return the snippet for inserting a partial from a folder', function () {
-            var parentId = "Folder";
-            var nodeName = "Footer.cshtml";
-            var snippet = '@await Html.PartialAsync("Folder/Footer")';
-            expect(templateHelper.getInsertPartialSnippet(parentId, nodeName)).toBe(snippet);
-        });
-
-        it('should return the snippet for inserting a partial from a nested folder', function () {
-            var parentId = "Folder/NestedFolder";
-            var nodeName = "Footer.cshtml";
-            var snippet = '@await Html.PartialAsync("Folder/NestedFolder/Footer")';
-            expect(templateHelper.getInsertPartialSnippet(parentId, nodeName)).toBe(snippet);
-        });
-
-        it('should return the snippet for inserting a partial from a folder with spaces in its name', function () {
-            var parentId = "Folder with spaces";
-            var nodeName = "Footer.cshtml";
-            var snippet = '@await Html.PartialAsync("Folder with spaces/Footer")';
-            expect(templateHelper.getInsertPartialSnippet(parentId, nodeName)).toBe(snippet);
-        });
-
-    });
-
-    describe('getQuerySnippet', function () {
-
-        it('should return the snippet for a query', function () {
-            var queryExpression = "queryExpression";
-            var snippet = "\n@{\n" + "\tvar selection = " + queryExpression + ";\n}\n";
-            snippet += "<ul>\n" +
-                "\t@foreach (var item in selection)\n" +
-                "\t{\n" +
-                "\t\t<li>\n" +
-                "\t\t\t<a href=\"@item.Url()\">@item.Name()</a>\n" +
-                "\t\t</li>\n" +
-                "\t}\n" +
-                "</ul>\n\n";
-
-            expect(templateHelper.getQuerySnippet(queryExpression)).toBe(snippet);
-        });
-
-    });
-
-    describe('getRenderBodySnippet', function () {
-
-        it('should return the snippet for render body', function () {
-            var snippet = '@RenderBody()';
-            expect(templateHelper.getRenderBodySnippet()).toBe(snippet);
-        });
-
-    });
-
-    describe('getRenderSectionSnippet', function () {
-
-        it('should return the snippet for defining a section', function () {
-            var snippet = '@RenderSection("sectionName", false)';
-            expect(templateHelper.getRenderSectionSnippet("sectionName", false)).toBe(snippet);
-        });
-
-        it('should return the snippet for defining a mandatory section', function () {
-            var snippet = '@RenderSection("sectionName", true)';
-            expect(templateHelper.getRenderSectionSnippet("sectionName", true)).toBe(snippet);
-        });
-
-    });
-
-    describe('getAddSectionSnippet', function () {
-
-        it('should return the snippet for implementing a section', function () {
-            var sectionName = "sectionName";
-            var snippet = "@section " + sectionName + "\r\n{\r\n\r\n\t{0}\r\n\r\n}\r\n";
-            expect(templateHelper.getAddSectionSnippet(sectionName)).toEqual(snippet);
-        });
-
-    });
-
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/tree-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/tree-service.spec.js
deleted file mode 100644
index 4d19cf557a..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/tree-service.spec.js
+++ /dev/null
@@ -1,410 +0,0 @@
-describe('tree service tests', function () {
-    var treeService, $rootScope, $httpBackend, mocks;
-
-    function getContentTree() {
-
-        var url = "/umbraco/UmbracoTrees/ApplicationTreeApi/GetChildren?treeType=content&id=1234&level=1";
-        var menuUrl = "/umbraco/UmbracoTrees/ApplicationTreeApi/GetMenu?treeType=content&id=1234&parentId=456";
-
-        var t = {
-            name: "content",
-            id: -1,
-            children: [
-                {
-                    name: "My website", id: 1234, childNodesUrl: url, icon: "icon-home", expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl,
-                    children: [
-                        { name: "random-name-1", childNodesUrl: url, id: 11, icon: "icon-home",  children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
-                        { name: "random-name-2", childNodesUrl: url, id: 12, icon: "icon-folder-close",  children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
-                        { name: "random-name-3", childNodesUrl: url, id: 13, icon: "icon-folder-close",  children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
-                        { name: "random-name-4", childNodesUrl: url, id: 14, icon: "icon-folder-close",  children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl }
-                    ]
-                },
-                { name: "Components", id: 1235, childNodesUrl: url, icon: "icon-cogs", children: [], expanded: false, hasChildren: true, level: 1,  menuUrl: menuUrl },
-                { name: "Archieve", id: 1236, childNodesUrl: url, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1,  menuUrl: menuUrl },
-                { name: "Recycle Bin", id: -20, childNodesUrl: url, icon: "icon-trash", routePath: "content/recyclebin", children: [], expanded: false, hasChildren: true, level: 1,  menuUrl: menuUrl }
-            ],
-            expanded: true,
-            hasChildren: true,
-            level: 0,
-            menuUrl: menuUrl,
-            metaData: { treeAlias: "content" }
-        };
-
-        treeService._formatNodeDataForUseInUI(t, t.children, "content", 0);
-        treeService._formatNodeDataForUseInUI(t.children[0], t.children[0].children, "content", 1);
-
-        return t;
-    }
-
-    beforeEach(module('umbraco.services'));
-    beforeEach(module('umbraco.resources'));
-    beforeEach(module('umbraco.mocks'));
-    beforeEach(module('ngRoute'));
-
-    beforeEach(inject(function ($injector, mocksUtils) {
-
-        //for these tests we don't want any authorization to occur
-        mocksUtils.disableAuth();
-
-        $rootScope = $injector.get('$rootScope');
-        $httpBackend = $injector.get('$httpBackend');
-        mocks = $injector.get("treeMocks");
-        mocks.register();
-        treeService = $injector.get('treeService');
-    }));
-
-    describe('tree cache', function () {
-
-        it('does not cache with no args', function () {
-
-            var cache;
-            treeService.getTree().then(function (data) {
-                cache = treeService._getTreeCache();
-            });
-
-            $rootScope.$digest();
-            $httpBackend.flush();
-
-            expect(_.keys(cache).length).toBe(0);
-        });
-
-        it('does not cache with no cacheKey', function () {
-            var cache;
-            treeService.getTree({section: "content"}).then(function (data) {
-                cache = treeService._getTreeCache();
-
-            });
-
-            $rootScope.$digest();
-            $httpBackend.flush();
-
-            expect(_.keys(cache).length).toBe(0);
-        });
-
-        it('caches by section with cache key', function () {
-            var cache;
-            treeService.getTree({ section: "media", cacheKey: "_" }).then(function (data) {
-                cache = treeService._getTreeCache();
-            });
-
-            $rootScope.$digest();
-            $httpBackend.flush();
-
-            expect(cache["__media"]).toBeDefined();
-        });
-
-        it('caches by default content section with cache key', function () {
-            var cache;
-            treeService.getTree({ cacheKey: "_" }).then(function (data) {
-                cache = treeService._getTreeCache();
-            });
-
-            $rootScope.$digest();
-            $httpBackend.flush();
-
-            expect(cache).toBeDefined();
-            expect(cache["__content"]).toBeDefined();
-        });
-
-        it('removes by section with cache key', function () {
-            var cache;
-            treeService.getTree({ section: "media", cacheKey: "_" }).then(function (data) {
-                treeService.getTree({ section: "content", cacheKey: "_" }).then(function (d) {
-                    cache = treeService._getTreeCache();
-                });
-            });
-
-            $rootScope.$digest();
-            $httpBackend.flush();
-
-            expect(cache["__media"]).toBeDefined();
-            expect(_.keys(cache).length).toBe(2);
-
-            treeService.clearCache({ section: "media", cacheKey: "_" });
-            cache = treeService._getTreeCache();
-
-            expect(cache["__media"]).not.toBeDefined();
-            expect(_.keys(cache).length).toBe(1);
-
-        });
-
-        it('removes cache by key regardless of section', function () {
-            var cache;
-
-            treeService.getTree({ section: "media", cacheKey: "_" }).then(function (data) {
-                treeService.getTree({ section: "content", cacheKey: "_" }).then(function (d) {
-                    treeService.getTree({ section: "content", cacheKey: "anotherkey" }).then(function (dd) {
-                        cache = treeService._getTreeCache();
-                    });
-                });
-            });
-
-            $rootScope.$digest();
-            $httpBackend.flush();
-
-            expect(cache["__media"]).toBeDefined();
-            expect(cache["__content"]).toBeDefined();
-            expect(_.keys(cache).length).toBe(3);
-
-            treeService.clearCache({ cacheKey: "_" });
-
-            cache = treeService._getTreeCache();
-            expect(cache["__media"]).not.toBeDefined();
-            expect(cache["__content"]).not.toBeDefined();
-            expect(_.keys(cache).length).toBe(1);
-        });
-
-        it('removes all section cache regardless of key', function () {
-
-            var cache;
-
-            treeService.getTree({ section: "media", cacheKey: "_" }).then(function (data) {
-                treeService.getTree({ section: "media", cacheKey: "anotherkey" }).then(function (d) {
-                    treeService.getTree({ section: "content", cacheKey: "anotherkey" }).then(function (dd) {
-                        cache = treeService._getTreeCache();
-                    });
-                });
-            });
-
-            $rootScope.$digest();
-            $httpBackend.flush();
-
-            expect(cache["anotherkey_media"]).toBeDefined();
-            expect(cache["__media"]).toBeDefined();
-            expect(_.keys(cache).length).toBe(3);
-
-            treeService.clearCache({ section: "media" });
-
-            cache = treeService._getTreeCache();
-            expect(cache["anotherkey_media"]).not.toBeDefined();
-            expect(cache["__media"]).not.toBeDefined();
-            expect(_.keys(cache).length).toBe(1);
-        });
-
-        it('removes all cache', function () {
-
-            var cache;
-
-            treeService.getTree({ section: "media", cacheKey: "_" }).then(function (data) {
-                treeService.getTree({ section: "media", cacheKey: "anotherkey" }).then(function (d) {
-                    treeService.getTree({ section: "content", cacheKey: "anotherkey" }).then(function(dd) {
-                        cache = treeService._getTreeCache();
-                    });
-                });
-            });
-
-            $rootScope.$digest();
-            $httpBackend.flush();
-
-            expect(cache["anotherkey_media"]).toBeDefined();
-            expect(cache["__media"]).toBeDefined();
-            expect(cache["anotherkey_content"]).toBeDefined();
-            expect(_.keys(cache).length).toBe(3);
-
-            treeService.clearCache();
-
-            cache = treeService._getTreeCache();
-            expect(_.keys(cache).length).toBe(0);
-        });
-
-        it('clears cache by key using a filter that returns null', function () {
-
-            var cache;
-
-            treeService.getTree({ section: "media", cacheKey: "_" }).then(function (d) {
-                treeService.getTree({ section: "content", cacheKey: "_" }).then(function (dd) {
-                    cache = treeService._getTreeCache();
-                });
-            });
-
-            $rootScope.$digest();
-            $httpBackend.flush();
-
-            expect(_.keys(cache).length).toBe(2);
-
-            treeService.clearCache({
-                cacheKey: "__content",
-                filter: function(currentCache) {
-                    return null;
-                }
-            });
-
-            cache = treeService._getTreeCache();
-
-            expect(_.keys(cache).length).toBe(1);
-        });
-
-        it('removes cache by key using a filter', function () {
-
-            var cache;
-
-            treeService.getTree({ section: "media", cacheKey: "_" }).then(function (d) {
-                treeService.getTree({ section: "content", cacheKey: "_" }).then(function (dd) {
-                    cache = treeService._getTreeCache();
-                });
-            });
-
-            $rootScope.$digest();
-            $httpBackend.flush();
-
-            expect(_.keys(cache).length).toBe(2);
-            expect(cache.__content.root.children.length).toBe(4);
-
-            treeService.clearCache({
-                cacheKey: "__content",
-                filter: function (currentCache) {
-                    var toRemove = treeService.getDescendantNode(currentCache.root, 1235);
-                    toRemove.parent().children = _.without(toRemove.parent().children, toRemove);
-                    return currentCache;
-                }
-            });
-
-            cache = treeService._getTreeCache();
-
-            expect(cache.__content.root.children.length).toBe(3);
-        });
-
-        it('removes cache children for a parent id specified', function () {
-
-            var cache;
-
-            treeService.getTree({ section: "content", cacheKey: "_" }).then(function (dd) {
-                treeService.loadNodeChildren({ node: dd.root.children[0] }).then(function () {
-                    cache = treeService._getTreeCache();
-                });
-            });
-
-            $rootScope.$digest();
-            $httpBackend.flush();
-
-            expect(cache.__content.root.children.length).toBe(4);
-            expect(cache.__content.root.children[0].children.length).toBe(4);
-
-            treeService.clearCache({
-                cacheKey: "__content",
-                childrenOf: "1234"
-            });
-
-            cache = treeService._getTreeCache();
-
-            expect(cache.__content.root.children.length).toBe(4);
-            expect(cache.__content.root.children[0].children).toBeNull();
-            expect(cache.__content.root.children[0].expanded).toBe(false);
-        });
-
-    });
-
-    describe('lookup plugin based trees', function() {
-
-        it('can find a plugin based tree', function () {
-            //we know this exists in the mock umbraco server vars
-            var found = treeService.getTreePackageFolder("myTree");
-            expect(found).toBe("MyPackage");
-        });
-
-        it('returns undefined for a not found tree', function () {
-            //we know this does not exist in the mock umbraco server vars
-            var found = treeService.getTreePackageFolder("asdfasdf");
-            expect(found).not.toBeDefined();
-        });
-
-    });
-
-    describe('Remove existing nodes', function() {
-
-        it('hasChildren has to be updated on parent', function () {
-            var tree = getContentTree();
-
-            while (tree.children.length > 0) {
-                treeService.removeNode(tree.children[0]);
-            }
-
-            expect(tree.hasChildren).toBe(false);
-        });
-
-    });
-
-    describe('query existing node structure of the tree', function () {
-
-        it('can get a descendant node with string id', function () {
-
-            var tree = getContentTree();
-            var found = treeService.getDescendantNode(tree, "13");
-
-            expect(found).toBeDefined();
-            expect(found).not.toBeNull();
-            expect(found.id).toBe(13);
-            expect(found.name).toBe("random-name-3");
-        });
-
-        it('can get a descendant node', function() {
-
-            var tree = getContentTree();
-            var found = treeService.getDescendantNode(tree, 13);
-
-            expect(found).toBeDefined();
-            expect(found).not.toBeNull();
-            expect(found.id).toBe(13);
-            expect(found.name).toBe("random-name-3");
-        });
-
-        it('returns null for a descendant node that doesnt exist', function () {
-
-            var tree = getContentTree();
-            var found = treeService.getDescendantNode(tree, 123456);
-
-            expect(found).toBeNull();
-        });
-
-        it('can get a child node', function () {
-
-            var tree = getContentTree();
-            var found = treeService.getChildNode(tree, 1235);
-
-            expect(found).toBeDefined();
-            expect(found).not.toBeNull();
-            expect(found.id).toBe(1235);
-            expect(found.name).toBe("Components");
-        });
-
-        it('returns null for a child node that doesnt exist', function () {
-
-            var tree = getContentTree();
-            var found = treeService.getChildNode(tree, 123456);
-
-            expect(found).toBeNull();
-        });
-
-        it('returns null for a descendant node that doesnt exist', function () {
-
-            var tree = getContentTree();
-            var found = treeService.getDescendantNode(tree, 123456);
-
-            expect(found).toBeNull();
-        });
-
-        it('can get the root node from a child node', function () {
-
-            var tree = getContentTree();
-            var testNode = tree.children[0].children[3];
-            var root = treeService.getTreeRoot(testNode);
-
-            expect(root).toBeDefined();
-            expect(root).not.toBeNull();
-            expect(root.id).toBe(-1);
-            expect(root.name).toBe("content");
-        });
-
-        it('can get the root node from the root node', function () {
-
-            var tree = getContentTree();
-            var root = treeService.getTreeRoot(tree);
-
-            expect(root).toBeDefined();
-            expect(root).not.toBeNull();
-            expect(root.id).toBe(-1);
-            expect(root.name).toBe("content");
-        });
-
-    });
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/udi-parser.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/udi-parser.spec.js
deleted file mode 100644
index 6d7cdffef3..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/udi-parser.spec.js
+++ /dev/null
@@ -1,61 +0,0 @@
-describe("udiParser tests", function () {
-
-    var udiParser;
-
-    beforeEach(module('umbraco.services'));
-
-    beforeEach(inject(function ($injector) {
-        udiParser = $injector.get('udiParser');
-    }));
-
-    describe("Parse UDI", function () {
-        it("can parse a valid document UDI", function() {
-            var entityType = "document";
-            var key = "c0a62ced-6402-4025-8d46-a234a34f6a56";
-            var value = "umb://" + entityType + "/" + key;
-
-            var udi = udiParser.parse(value);
-
-            expect(udi.entityType).toBe(entityType);
-            expect(udi.value).toBe(key);
-        });
-
-        it("can parse a valid media UDI", function() {
-            var entityType = "media";
-            var key = "f82f3313-f8e9-42b0-a67f-80a7f452dd21";
-            var value = "umb://" + entityType + "/" + key;
-
-            var udi = udiParser.parse(value);
-
-            expect(udi.entityType).toBe(entityType);
-            expect(udi.value).toBe(key);
-        });
-
-        it("returns the full UDI when calling toString() on the returned value", function() {
-            var value = "umb://document/c0a62ced-6402-4025-8d46-a234a34f6a56";
-
-            var udi = udiParser.parse(value);
-
-            expect(udi.toString()).toBe(value);
-        });
-
-        it("can parse an open UDI", function() {
-            var entityType = "media";
-            var value = "umb://" + entityType;
-
-            var udi = udiParser.parse(value);
-
-            expect(udi.entityType).toBe(entityType);
-            expect(udi.value).toBeNull();
-            expect(udi.toString()).toBe(value);
-        });
-
-        it("returns null if the input is invalid", function() {
-            var value = "not an UDI";
-
-            var udi = udiParser.parse(value);
-
-            expect(udi).toBeNull();
-        });
-    });
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-data-formatter-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-data-formatter-service.spec.js
deleted file mode 100644
index 7c307a96e1..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-data-formatter-service.spec.js
+++ /dev/null
@@ -1,88 +0,0 @@
-describe('umbDataFormatter service tests', function () {
-    var umbDataFormatter;
-
-    beforeEach(module('umbraco.services'));
-
-    beforeEach(inject(function ($injector) {
-        umbDataFormatter = $injector.get('umbDataFormatter');
-    }));
-
-    describe('formatting GET content data', function () {
-
-        it('will set the same invariant property instance reference between all variants', function () {
-
-            var model = {
-                variants: [
-                    {
-                        language: { culture: "en-US" },
-                        tabs: [
-                            {
-                                properties: [
-                                    { alias: "test1", culture: null, value: "test1" },
-                                    { alias: "test2", culture: "en-US", value: "test2" }
-                                ]
-                            },
-                            {
-                                properties: [
-                                    { alias: "test3", culture: "en-US", value: "test3" },
-                                    { alias: "test4", culture: null, value: "test4" }
-                                ]
-                            }
-                        ]
-
-                    },
-                    {
-                        language: { culture: "es-ES" },
-                        tabs: [
-                            {
-                                properties: [
-                                    { alias: "test1", culture: null, value: "test5" },
-                                    { alias: "test2", culture: "en-US", value: "test6" }
-                                ]
-                            },
-                            {
-                                properties: [
-                                    { alias: "test3", culture: "en-US", value: "test7" },
-                                    { alias: "test4", culture: null, value: "test8" }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        language: { culture: "fr-FR" },
-                        tabs: [
-                            {
-                                properties: [
-                                    { alias: "test1", culture: null, value: "test9" },
-                                    { alias: "test2", culture: "en-US", value: "test10" }
-                                ]
-                            },
-                            {
-                                properties: [
-                                    { alias: "test3", culture: "en-US", value: "test11" },
-                                    { alias: "test4", culture: null, value: "test12" }
-                                ]
-                            }
-                        ]
-                    }
-                ]
-            };
-            var result = umbDataFormatter.formatContentGetData(model);
-
-            //make sure the same property reference exists for property 0 and 3 for each variant
-            for (var i = 1; i < result.variants.length; i++) {
-                expect(result.variants[0].tabs[0].properties[0]).toBe(result.variants[i].tabs[0].properties[0]);
-                expect(result.variants[0].tabs[1].properties[3]).toBe(result.variants[i].tabs[1].properties[3]);
-            }
-
-            //test that changing a property value in one variant is definitely updating the same object reference and therefor
-            //is done on all variants.
-            result.variants[0].tabs[0].properties[0].value = "hello";
-            for (var i = 1; i < result.variants.length; i++) {
-                expect(result.variants[0].tabs[0].properties[0].value).toBe("hello");
-            }
-
-        });
-
-    });
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-image-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-image-helper.spec.js
deleted file mode 100644
index e74deaa07e..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-image-helper.spec.js
+++ /dev/null
@@ -1,27 +0,0 @@
-describe('image helper tests', function () {
-    var umbImageHelper;
-
-    beforeEach(module('umbraco.services'));
-    beforeEach(module('umbraco.mocks'));
-
-    beforeEach(inject(function ($injector) {
-        umbImageHelper = $injector.get('imageHelper');
-    }));
-
-    describe('basic utility methods return correct values', function () {
-
-        it('detects an image based file', function () {
-
-            var image1 = "a-jpeg.jpg";
-            var image2 = "a-png.png";
-            var image3 = "thisisagif.blah.gif";
-            var doc1 = "anormaldocument.doc";
-            
-            expect(umbImageHelper.detectIfImageByExtension(image1)).toBe(true);
-            expect(umbImageHelper.detectIfImageByExtension(image2)).toBe(true);
-            expect(umbImageHelper.detectIfImageByExtension(image3)).toBe(true);
-            expect(umbImageHelper.detectIfImageByExtension(doc1)).toBe(false);
-        });
-        
-    });
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-model-mapper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-model-mapper.spec.js
deleted file mode 100644
index 1bb1ce1be0..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-model-mapper.spec.js
+++ /dev/null
@@ -1,99 +0,0 @@
-describe('model mapper tests', function () {
-    var umbModelMapper;
-    
-    beforeEach(module('umbraco.services'));
-
-    beforeEach(inject(function ($injector) {
-        umbModelMapper = $injector.get('umbModelMapper');        
-    }));
-
-    describe('maps basic entity', function () {
-
-        it('can map content object', function () {
-            var content = {
-                id: "1",
-                name: "test",
-                icon: "icon",
-                key: "some key",
-                parentId: "-1",
-                alias: "test alias",
-                path: "-1,1",
-                metaData: {hello:"world"},
-                publishDate: null,
-                releaseDate: null,
-                removeDate: false,
-                template: "test",
-                urls: [],
-                allowedActions: [],
-                contentTypeName: null,
-                notifications: [],
-                ModelState: {},
-                tabs: [],
-                properties: [],                
-            };
-
-            var mapped = umbModelMapper.convertToEntityBasic(content);
-            var keys = _.keys(mapped);
-
-            expect(keys.length).toBe(8);
-            expect(mapped.id).toBe("1");
-            expect(mapped.name).toBe("test");
-            expect(mapped.icon).toBe("icon");
-            expect(mapped.key).toBe("some key");
-            expect(mapped.parentId).toBe("-1");
-            expect(mapped.alias).toBe("test alias");
-            expect(mapped.metaData.hello).toBe("world");
-        });
-        
-        it('throws when info is missing', function () {
-            var content = {
-                id: "1",
-                //name: "test", //removed
-                icon: "icon",
-                key: "some key",
-                parentId: "-1",
-                alias: "test alias",
-                path: "-1,1",
-                metaData: { hello: "world" },
-                publishDate: null,
-                releaseDate: null,
-                removeDate: false,
-                template: "test",
-                urls: [],
-                allowedActions: [],
-                contentTypeName: null,
-                notifications: [],
-                ModelState: {},
-                tabs: [],
-                properties: [],
-            };
-
-            function doMap() {
-                umbModelMapper.convertToEntityBasic(content);
-            }
-           
-            expect(doMap).toThrow();
-        });
-        
-        it('can map the minimum props', function () {
-            var content = {
-                id: "1",
-                name: "test",
-                icon: "icon",
-                parentId: "-1",
-                path: "-1,1"          
-            };
-
-            var mapped = umbModelMapper.convertToEntityBasic(content);
-            var keys = _.keys(mapped);
-
-            expect(keys.length).toBe(5);
-            expect(mapped.id).toBe("1");
-            expect(mapped.name).toBe("test");
-            expect(mapped.icon).toBe("icon");
-            expect(mapped.parentId).toBe("-1");
-        });
-        
-    });
-    
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-request-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-request-helper.spec.js
deleted file mode 100644
index 68d1340f13..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-request-helper.spec.js
+++ /dev/null
@@ -1,65 +0,0 @@
-describe('umbRequestHelper tests', function () {
-    var umbRequestHelper;
-
-    beforeEach(module('umbraco'));
-    beforeEach(module('umbraco.services'));
-
-    beforeEach(inject(function ($injector) {
-        umbRequestHelper = $injector.get('umbRequestHelper');
-
-        // set the Umbraco.Sys.ServerVariables.application.applicationPath
-        if (!Umbraco) Umbraco = {};
-        if (!Umbraco.Sys) Umbraco.Sys = {};
-        if (!Umbraco.Sys.ServerVariables) Umbraco.Sys.ServerVariables = {};
-        if (!Umbraco.Sys.ServerVariables.application) Umbraco.Sys.ServerVariables.application = {};
-        Umbraco.Sys.ServerVariables.application.applicationPath = "/mysite/";
-    }));
-
-    describe('formatting Urls', function () {
-
-        it('can create a query string from name value pairs', function () {
-
-            expect(umbRequestHelper.dictionaryToQueryString([
-                { key1: "value1" },
-                { key2: "value2" },
-                { key3: "value3" },
-                { trying: "?to&hack=you" },
-                { "?trying=to&hack": "you" }
-            ])).toBe(
-            "key1=value1" +
-            "&key2=value2" +
-            "&key3=value3" +
-            "&trying=%3Fto%26hack%3Dyou" +
-            "&%3Ftrying%3Dto%26hack=you"
-            );
-        });
-
-        it('can create a url based on server vars', function () {
-
-            expect(umbRequestHelper.getApiUrl("contentTypeApiBaseUrl", "GetAllowedChildren", [{ contentId: 123 }])).toBe(
-                    "/umbraco/Api/ContentType/GetAllowedChildren?contentId=123");
-        });
-
-    });
-
-    describe('Virtual Paths', function () {
-
-        it('can convert virtual path to absolute url', function () {
-            var result = umbRequestHelper.convertVirtualToAbsolutePath("~/App_Plugins/hello/world.css");
-            expect(result).toBe("/mysite/App_Plugins/hello/world.css");
-        });
-
-        it('can convert absolute path to absolute url', function () {
-            var result = umbRequestHelper.convertVirtualToAbsolutePath("/App_Plugins/hello/world.css");
-            expect(result).toBe("/App_Plugins/hello/world.css");
-        });
-
-        it('throws on invalid virtual path', function () {
-            var relativePath = "App_Plugins/hello/world.css";
-            expect(function () {
-                umbRequestHelper.convertVirtualToAbsolutePath(relativePath);
-            }).toThrow("The path " + relativePath + " is not a virtual path");
-        });
-
-    });
-});
diff --git a/src/Umbraco.Web.UI.Client/test/unit/utilities.spec.js b/src/Umbraco.Web.UI.Client/test/unit/utilities.spec.js
deleted file mode 100644
index db642fde9f..0000000000
--- a/src/Umbraco.Web.UI.Client/test/unit/utilities.spec.js
+++ /dev/null
@@ -1,63 +0,0 @@
-(function () {
-    describe("Utilities", function () {
-        describe("fromJson", function () {
-            it("should deserialize json as object", function () {
-                expect(Utilities.fromJson('{"a":1,"b":2}')).toEqual({ a: 1, b: 2 });
-            });
-            it("should return object as object", function () {
-                expect(Utilities.fromJson({ a: 1, b: 2 })).toEqual({ a: 1, b: 2 });
-            });
-        }),
-        describe("toJson", function () {
-            it("should delegate to JSON.stringify", function () {
-                var spy = spyOn(JSON, "stringify").and.callThrough();
-
-                expect(Utilities.toJson({})).toEqual("{}");
-                expect(spy).toHaveBeenCalled();
-            });
-
-            it("should format objects pretty", function () {
-                expect(Utilities.toJson({ a: 1, b: 2 }, true)).toBe(
-                    '{\n  "a": 1,\n  "b": 2\n}'
-                );
-                expect(Utilities.toJson({ a: { b: 2 } }, true)).toBe(
-                    '{\n  "a": {\n    "b": 2\n  }\n}'
-                );
-                expect(Utilities.toJson({ a: 1, b: 2 }, false)).toBe('{"a":1,"b":2}');
-                expect(Utilities.toJson({ a: 1, b: 2 }, 0)).toBe('{"a":1,"b":2}');
-                expect(Utilities.toJson({ a: 1, b: 2 }, 1)).toBe(
-                    '{\n "a": 1,\n "b": 2\n}'
-                );
-                expect(Utilities.toJson({ a: 1, b: 2 }, {})).toBe(
-                    '{\n  "a": 1,\n  "b": 2\n}'
-                );
-            });
-
-            it("should not serialize properties starting with $$", function () {
-                expect(Utilities.toJson({ $$some: "value" }, false)).toEqual("{}");
-            });
-
-            it("should serialize properties starting with $", function () {
-                expect(Utilities.toJson({ $few: "v" }, false)).toEqual('{"$few":"v"}');
-            });
-
-            it("should not serialize $window object", function () {
-                expect(Utilities.toJson(window)).toEqual('"$WINDOW"');
-            });
-
-            it("should not serialize $document object", function () {
-                expect(Utilities.toJson(document)).toEqual('"$DOCUMENT"');
-            });
-
-            it("should not serialize scope instances", inject(function (
-                $rootScope
-            ) {
-                expect(Utilities.toJson({ key: $rootScope })).toEqual('{"key":"$SCOPE"}');
-            }));
-
-            it("should serialize undefined as undefined", function () {
-                expect(Utilities.toJson(undefined)).toEqual(undefined);
-            });
-        });
-    });
-})();
diff --git a/src/Umbraco.Web.UI.Login/public/login.jpg b/src/Umbraco.Web.UI.Login/public/login.jpg
deleted file mode 120000
index 6dbf39e433..0000000000
--- a/src/Umbraco.Web.UI.Login/public/login.jpg
+++ /dev/null
@@ -1 +0,0 @@
-../../Umbraco.Web.UI.Client/src/assets/img/login.jpg
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Login/public/login.jpg b/src/Umbraco.Web.UI.Login/public/login.jpg
new file mode 100644
index 0000000000..3adc277159
Binary files /dev/null and b/src/Umbraco.Web.UI.Login/public/login.jpg differ
diff --git a/src/Umbraco.Web.UI.Login/public/logo_dark.svg b/src/Umbraco.Web.UI.Login/public/logo_dark.svg
deleted file mode 120000
index f4ffd8fbdc..0000000000
--- a/src/Umbraco.Web.UI.Login/public/logo_dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_blue.svg
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Login/public/logo_dark.svg b/src/Umbraco.Web.UI.Login/public/logo_dark.svg
new file mode 100644
index 0000000000..578bf592f6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Login/public/logo_dark.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_2_00000159465072208785227250000008040336475015305350_"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1256.6 344.8"
+	 style="enable-background:new 0 0 1256.6 344.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#283A97;}
+</style>
+<g id="Layer_1-2">
+	<g>
+		<path class="st0" d="M5,172.2C5.1,79.7,80.2,4.9,172.6,5s167.3,75.2,167.2,167.6c-0.1,92.4-75,167.2-167.4,167.2
+			C79.9,339.7,5,264.7,5,172.2L5,172.2L5,172.2z M169,229.5c-13,0.4-26-0.8-38.7-3.5c-9.4-1.9-17.3-8.2-21.2-17
+			c-3.8-8.7-5.6-22.2-5.5-40.4c0.1-9.5,0.7-19,1.8-28.4c1.1-9.2,2.2-16.8,3.2-22.8l1.1-5.9c0-0.2,0-0.3,0-0.5c0-1.7-1.2-3.1-2.8-3.4
+			l-21.6-3.4H85c-1.6,0-2.9,1.1-3.3,2.6c-0.4,1.4-0.6,2.4-1.2,5.7c-1.2,6.4-2.4,12.6-3.6,21.6c-1.3,9.8-2.1,19.7-2.4,29.6
+			c-0.5,6.9-0.5,13.8,0,20.7c0.5,18.3,3.7,33,9.4,43.9s15.6,18.8,29.4,23.6c13.8,4.8,33,7.2,57.7,7.1h3.1
+			c24.7,0.1,43.9-2.2,57.7-7.1c13.8-4.8,23.6-12.7,29.4-23.6c5.8-11,8.9-25.6,9.4-43.9c0.5-6.9,0.5-13.8,0-20.7
+			c-0.3-9.9-1.1-19.8-2.4-29.6c-1.3-9-2.4-15.1-3.6-21.6c-0.6-3.3-0.9-4.3-1.2-5.7c-0.4-1.5-1.7-2.6-3.3-2.6h-0.6l-21.6,3.4
+			c-1.6,0.3-2.8,1.7-2.8,3.4c0,0.2,0,0.3,0,0.5l1.2,5.9c1.1,6,2.2,13.6,3.3,22.7c1.1,9.4,1.7,18.9,1.8,28.4
+			c0.2,18.2-1.7,31.6-5.5,40.4c-3.8,8.7-11.6,15-20.9,17c-12.7,2.7-25.7,3.9-38.7,3.5L169,229.5L169,229.5z"/>
+		<g>
+			<path class="st0" d="M1155.2,186.1c0-33.4,9.6-56.9,48.2-56.9s48.2,23.5,48.2,56.9s-9.6,56.9-48.2,56.9
+				S1155.2,219.5,1155.2,186.1z M1227.1,186.1c0-23.2-3-36.5-23.6-36.5s-23.6,13.3-23.6,36.5s3.1,36.5,23.6,36.5
+				S1227.1,209.2,1227.1,186.1z"/>
+			<path class="st0" d="M487.2,238.7c0.6,1,1.6,1.6,2.8,1.6h9c1.8,0,3.2-1.4,3.2-3.2l0,0V135c0-1.8-1.4-3.2-3.2-3.2h-18
+				c-1.8,0-3.2,1.4-3.2,3.2v81c-7.7,4.3-16.4,6.5-25.2,6.3c-11.5,0-17.2-5-17.2-16.1V135c0-1.8-1.4-3.2-3.2-3.2h-17.9
+				c-1.8,0-3.2,1.4-3.2,3.2v73.4c0,20.8,9.8,34.5,37.3,34.5c12.6-0.1,24.9-4.1,35.2-11.3l3.2,7.2L487.2,238.7L487.2,238.7z"/>
+			<path class="st0" d="M689.8,163.7c0-20.6-10.2-34.5-35.9-34.5c-12.4,0-24.5,3.8-34.8,10.7c-4.6-6.7-13.3-10.7-27.8-10.7
+				c-11.8,0.2-23.3,4.2-32.8,11.3l-3.2-7.2l0,0c-0.6-1-1.6-1.7-2.8-1.7h-9c-1.8,0-3.2,1.4-3.2,3.2v102.1c0,1.8,1.4,3.2,3.2,3.2h18
+				c1.8,0,3.2-1.4,3.2-3.2v-80.8c6.9-4.1,14.8-6.3,22.8-6.3c9.8,0,15.4,3.6,15.4,14v73.4c0,1.8,1.4,3.2,3.2,3.2h18
+				c1.8,0,3.2-1.4,3.2-3.2v-81.1c6.8-4.2,14.8-6.4,22.8-6.4c9.6,0,15.4,3.6,15.4,14v73.4c0,1.8,1.4,3.2,3.2,3.2h18
+				c1.8,0,3.2-1.4,3.2-3.2l0,0L689.8,163.7L689.8,163.7z"/>
+			<path class="st0" d="M745.4,231.7c10.2,7.5,22.5,11.5,35.2,11.3c31.7,0,43.4-21.3,43.4-56.9s-11.7-56.9-43.4-56.9
+				c-10.3,0.1-20.4,3-29.1,8.5v-32.8c0-1.8-1.4-3.2-3.2-3.2h-18c-1.8,0-3.2,1.4-3.2,3.2v132.3c0,1.8,1.4,3.2,3.2,3.2h9
+				c1.2,0,2.2-0.6,2.8-1.6l0,0L745.4,231.7L745.4,231.7z M774.9,222.3c-8.2,0-16.3-2.1-23.4-6.3v-59.9c7.1-4.1,15.2-6.3,23.4-6.3
+				c21.3,0,24.5,16.3,24.5,36.2S796.2,222.3,774.9,222.3L774.9,222.3L774.9,222.3z"/>
+			<path class="st0" d="M913.9,150.5c-2.8-0.4-5.6-0.6-8.5-0.5c-9.7-0.4-19.3,1.9-27.8,6.5v80.6c0,1.8-1.4,3.2-3.2,3.2h-18
+				c-1.8,0-3.2-1.4-3.2-3.2V135c0-1.8,1.4-3.2,3.2-3.2h9c1.2,0,2.2,0.6,2.8,1.6l0,0l3.2,7.2c9.9-7.5,22-11.5,34.4-11.3
+				c2.8,0,5.7,0.2,8.5,0.7l0,0c1.7,0,3,2.7,3,4.4v13c0,1.8-1.4,3.2-3.2,3.2h-0.2"/>
+			<path class="st0" d="M976.1,190.2c-10.7,1.3-17.2,5.4-17.2,16.7c0,8.3,3.6,16.1,16.7,16.1c8.3,0.1,16.4-2.4,23.2-7.2v-28.1
+				L976.1,190.2L976.1,190.2z M1004.8,231.7C995.5,239,984,243,972.1,243c-28,0-37.3-17.4-37.3-34.8c0-23.5,15.2-33.4,39.7-35.4
+				l24.4-1.9v-5.4c0-11.1-5.2-15.4-21.3-15.4c-10.1,0-20.1,1.7-29.6,4.9c-0.3,0.1-0.7,0.1-1,0c-1.8,0-3.2-1.4-3.2-3.2v-14.4
+				c0-1.4,0.8-2.6,2.1-3.1l0,0c10.8-3.6,22.1-5.4,33.5-5.4c35.6,0,43.8,15.6,43.8,38.7v69.3c0,1.8-1.4,3.2-3.2,3.2h-9
+				c-1.2,0-2.2-0.6-2.8-1.6l0,0L1004.8,231.7L1004.8,231.7z"/>
+			<path class="st0" d="M1128.6,218c0.3,0,0.7,0,1,0c1.8,0,3.2,1.4,3.2,3.2v14.4c0,1.3-0.8,2.5-2,3l0,0c-8.9,3.2-18.4,4.8-27.9,4.6
+				c-38.5,0-50.3-23-50.3-56.9s11.8-56.9,50.3-56.9c9.4-0.2,18.9,1.2,27.8,4.4l0,0c1.2,0.5,2,1.7,2,3v14.5c0,1.8-1.4,3.2-3.2,3.2
+				c-0.4,0.1-0.7,0.1-1.1,0l0,0c-7.8-2.5-16-3.7-24.2-3.6c-21.1,0-27.2,14.4-27.2,35.4s6.1,35.4,27.2,35.4
+				c8.2,0.1,16.4-1.1,24.2-3.6"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/src/Umbraco.Web.UI.Login/public/logo_light.svg b/src/Umbraco.Web.UI.Login/public/logo_light.svg
deleted file mode 120000
index 8d8d636018..0000000000
--- a/src/Umbraco.Web.UI.Login/public/logo_light.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_white.svg
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Login/public/logo_light.svg b/src/Umbraco.Web.UI.Login/public/logo_light.svg
new file mode 100644
index 0000000000..01f7260cd3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Login/public/logo_light.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_2_00000109717856507224707600000004572449649498936508_"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1256.6 344.8"
+	 style="enable-background:new 0 0 1256.6 344.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g id="Layer_1-2">
+	<g>
+		<path class="st0" d="M5,172.2C5.1,79.7,80.2,4.9,172.6,5s167.3,75.2,167.2,167.6c-0.1,92.4-75,167.2-167.4,167.2
+			C79.9,339.7,4.9,264.7,5,172.2L5,172.2L5,172.2z M169,229.5c-13,0.4-26-0.8-38.7-3.5c-9.4-1.9-17.3-8.2-21.2-17
+			c-3.8-8.7-5.6-22.2-5.5-40.4c0.1-9.5,0.7-19,1.8-28.4c1.1-9.2,2.2-16.8,3.2-22.8l1.1-5.9c0-0.2,0-0.3,0-0.5c0-1.7-1.2-3.1-2.8-3.4
+			l-21.6-3.4H85c-1.6,0-2.9,1.1-3.3,2.6c-0.4,1.4-0.6,2.4-1.2,5.7c-1.2,6.4-2.4,12.6-3.6,21.6c-1.3,9.8-2.1,19.7-2.4,29.6
+			c-0.5,6.9-0.5,13.8,0,20.7c0.5,18.3,3.7,33,9.4,43.9s15.6,18.8,29.4,23.6c13.8,4.8,33,7.2,57.7,7.1h3.1
+			c24.7,0.1,43.9-2.2,57.7-7.1c13.8-4.8,23.6-12.7,29.4-23.6c5.8-11,8.9-25.6,9.4-43.9c0.5-6.9,0.5-13.8,0-20.7
+			c-0.3-9.9-1.1-19.8-2.4-29.6c-1.3-8.9-2.4-15.1-3.6-21.6c-0.6-3.3-0.9-4.3-1.2-5.7c-0.4-1.5-1.7-2.6-3.3-2.6h-0.6l-21.6,3.4
+			c-1.6,0.3-2.8,1.7-2.8,3.4c0,0.2,0,0.3,0,0.5l1.2,5.9c1.1,6,2.2,13.6,3.3,22.7c1.1,9.4,1.7,18.9,1.8,28.4
+			c0.2,18.2-1.7,31.6-5.5,40.4c-3.8,8.7-11.6,15-20.9,17c-12.7,2.7-25.7,3.9-38.7,3.5L169,229.5L169,229.5z"/>
+		<g>
+			<path class="st0" d="M1155.2,186.1c0-33.4,9.6-56.9,48.2-56.9s48.2,23.5,48.2,56.9s-9.6,56.9-48.2,56.9
+				S1155.2,219.5,1155.2,186.1z M1227.1,186.1c0-23.2-3-36.5-23.6-36.5s-23.6,13.3-23.6,36.5s3.1,36.5,23.6,36.5
+				S1227.1,209.2,1227.1,186.1z"/>
+			<path class="st0" d="M487.2,238.7c0.6,1,1.6,1.6,2.8,1.6h9c1.8,0,3.2-1.4,3.2-3.2l0,0V135c0-1.8-1.4-3.2-3.2-3.2h-18
+				c-1.8,0-3.2,1.4-3.2,3.2v81c-7.7,4.3-16.4,6.5-25.2,6.3c-11.5,0-17.2-5-17.2-16.1V135c0-1.8-1.4-3.2-3.2-3.2h-17.9
+				c-1.8,0-3.2,1.4-3.2,3.2v73.4c0,20.8,9.8,34.5,37.3,34.5c12.6-0.1,24.9-4.1,35.2-11.3l3.2,7.2L487.2,238.7L487.2,238.7z"/>
+			<path class="st0" d="M689.8,163.7c0-20.6-10.2-34.5-35.9-34.5c-12.4,0-24.5,3.8-34.8,10.7c-4.6-6.7-13.3-10.7-27.8-10.7
+				c-11.8,0.2-23.3,4.2-32.8,11.3l-3.2-7.2l0,0c-0.6-1-1.6-1.7-2.8-1.7h-9c-1.8,0-3.2,1.4-3.2,3.2v102.1c0,1.8,1.4,3.2,3.2,3.2h18
+				c1.8,0,3.2-1.4,3.2-3.2v-80.8c6.9-4.1,14.8-6.3,22.8-6.3c9.8,0,15.4,3.6,15.4,14v73.4c0,1.8,1.4,3.2,3.2,3.2h18
+				c1.8,0,3.2-1.4,3.2-3.2v-81.1c6.8-4.2,14.8-6.4,22.8-6.4c9.6,0,15.4,3.6,15.4,14v73.4c0,1.8,1.4,3.2,3.2,3.2h18
+				c1.8,0,3.2-1.4,3.2-3.2l0,0L689.8,163.7L689.8,163.7z"/>
+			<path class="st0" d="M745.4,231.7c10.2,7.5,22.5,11.5,35.2,11.3c31.7,0,43.4-21.3,43.4-56.9s-11.7-56.9-43.4-56.9
+				c-10.3,0.1-20.4,3-29.1,8.5v-32.9c0-1.8-1.4-3.2-3.2-3.2h-18c-1.8,0-3.2,1.4-3.2,3.2v132.3c0,1.8,1.4,3.2,3.2,3.2h9
+				c1.2,0,2.2-0.6,2.8-1.6l0,0L745.4,231.7L745.4,231.7z M774.9,222.3c-8.2,0-16.3-2.1-23.4-6.3v-59.9c7.1-4.1,15.2-6.3,23.4-6.3
+				c21.3,0,24.5,16.3,24.5,36.2S796.2,222.3,774.9,222.3L774.9,222.3L774.9,222.3z"/>
+			<path class="st0" d="M913.9,150.5c-2.8-0.4-5.6-0.6-8.5-0.5c-9.7-0.4-19.3,1.9-27.8,6.5v80.6c0,1.8-1.4,3.2-3.2,3.2h-18
+				c-1.8,0-3.2-1.4-3.2-3.2V135c0-1.8,1.4-3.2,3.2-3.2h9c1.2,0,2.2,0.6,2.8,1.6l0,0l3.2,7.2c9.9-7.5,22-11.5,34.4-11.3
+				c2.8,0,5.7,0.2,8.5,0.7l0,0c1.7,0,3,2.7,3,4.4v13c0,1.8-1.4,3.2-3.2,3.2L913.9,150.5"/>
+			<path class="st0" d="M976.1,190.2c-10.7,1.3-17.2,5.4-17.2,16.7c0,8.3,3.6,16.1,16.7,16.1c8.3,0.1,16.4-2.4,23.2-7.2v-28.1
+				L976.1,190.2L976.1,190.2z M1004.8,231.7C995.5,239,984,243,972.1,243c-28,0-37.3-17.4-37.3-34.8c0-23.5,15.2-33.4,39.7-35.4
+				l24.4-1.9v-5.4c0-11.1-5.2-15.4-21.3-15.4c-10.1,0-20.1,1.7-29.6,4.9c-0.3,0.1-0.7,0.1-1,0c-1.8,0-3.2-1.4-3.2-3.2v-14.4
+				c0-1.4,0.8-2.6,2.1-3.1l0,0c10.8-3.6,22.1-5.4,33.5-5.4c35.6,0,43.8,15.6,43.8,38.7v69.3c0,1.8-1.4,3.2-3.2,3.2h-9
+				c-1.2,0-2.2-0.6-2.8-1.6l0,0L1004.8,231.7L1004.8,231.7z"/>
+			<path class="st0" d="M1128.6,218c0.3,0,0.7,0,1,0c1.8,0,3.2,1.4,3.2,3.2v14.4c0,1.3-0.8,2.5-2,3l0,0c-8.9,3.2-18.4,4.8-27.9,4.6
+				c-38.5,0-50.3-23-50.3-56.9s11.8-56.9,50.3-56.9c9.4-0.2,18.9,1.2,27.8,4.4l0,0c1.2,0.5,2,1.7,2,3v14.5c0,1.8-1.4,3.2-3.2,3.2
+				c-0.4,0.1-0.7,0.1-1.1,0l0,0c-7.8-2.5-16-3.7-24.2-3.6c-21.1,0-27.2,14.4-27.2,35.4s6.1,35.4,27.2,35.4
+				c8.2,0.1,16.4-1.1,24.2-3.6"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/src/Umbraco.Web.UI.New/.gitignore b/src/Umbraco.Web.UI.New/.gitignore
index 42a5e04d1a..bc2664609b 100644
--- a/src/Umbraco.Web.UI.New/.gitignore
+++ b/src/Umbraco.Web.UI.New/.gitignore
@@ -6,7 +6,7 @@ App_Plugins/
 App_Code/
 Views/
 !Views/Partials/blocklist/
-!Views/Partials/grid/
+!Views/Partials/blockgrid/
 !Views/_ViewImports.cshtml
 appsettings.json
 appsettings.Development.json
diff --git a/src/Umbraco.Web.UI.New/Program.cs b/src/Umbraco.Web.UI.New/Program.cs
index ce23e48ff6..e91f6ba60d 100644
--- a/src/Umbraco.Web.UI.New/Program.cs
+++ b/src/Umbraco.Web.UI.New/Program.cs
@@ -23,7 +23,6 @@ app.UseUmbraco()
     })
     .WithEndpoints(u =>
     {
-        u.UseInstallerEndpoints();
         u.UseBackOfficeEndpoints();
         u.UseWebsiteEndpoints();
     });
diff --git a/src/Umbraco.Web.UI/Views/Partials/blockgrid/area.cshtml b/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/area.cshtml
similarity index 100%
rename from src/Umbraco.Web.UI/Views/Partials/blockgrid/area.cshtml
rename to src/Umbraco.Web.UI.New/Views/Partials/blockgrid/area.cshtml
diff --git a/src/Umbraco.Web.UI/Views/Partials/blockgrid/areas.cshtml b/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/areas.cshtml
similarity index 100%
rename from src/Umbraco.Web.UI/Views/Partials/blockgrid/areas.cshtml
rename to src/Umbraco.Web.UI.New/Views/Partials/blockgrid/areas.cshtml
diff --git a/src/Umbraco.Web.UI/Views/Partials/blockgrid/default.cshtml b/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/default.cshtml
similarity index 100%
rename from src/Umbraco.Web.UI/Views/Partials/blockgrid/default.cshtml
rename to src/Umbraco.Web.UI.New/Views/Partials/blockgrid/default.cshtml
diff --git a/src/Umbraco.Web.UI/Views/Partials/blockgrid/items.cshtml b/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/items.cshtml
similarity index 100%
rename from src/Umbraco.Web.UI/Views/Partials/blockgrid/items.cshtml
rename to src/Umbraco.Web.UI.New/Views/Partials/blockgrid/items.cshtml
diff --git a/src/Umbraco.Web.UI/Views/_ViewImports.cshtml b/src/Umbraco.Web.UI.New/Views/_ViewImports.cshtml
similarity index 100%
rename from src/Umbraco.Web.UI/Views/_ViewImports.cshtml
rename to src/Umbraco.Web.UI.New/Views/_ViewImports.cshtml
diff --git a/src/Umbraco.Web.UI/Composers/ControllersAsServicesComposer.cs b/src/Umbraco.Web.UI/Composers/ControllersAsServicesComposer.cs
deleted file mode 100644
index d70a2183f4..0000000000
--- a/src/Umbraco.Web.UI/Composers/ControllersAsServicesComposer.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Controllers;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Composing;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Web;
-using Umbraco.Cms.Web.Website.Controllers;
-using Umbraco.Extensions;
-using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
-
-namespace Umbraco.Cms.Web.UI.Composers
-{
-    /// <summary>
-    /// Adds controllers to the service collection.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Umbraco 9 out of the box, makes use of <see cref="DefaultControllerActivator"/> which doesn't resolve controller
-    /// instances from the IOC container, instead it resolves the required dependencies of the controller and constructs an instance
-    /// of the controller.
-    /// </para>
-    /// <para>
-    /// Some users may wish to switch to <see cref="ServiceBasedControllerActivator"/> (perhaps to make use of interception/decoration).
-    /// </para>
-    /// <para>
-    /// This composer exists to help us detect ambiguous constructors in the CMS such that we do not cause unnecessary effort downstream.
-    /// </para>
-    /// <para>
-    /// This Composer is not shipped by the Umbraco.Templates package.
-    /// </para>
-    /// </remarks>
-    public class ControllersAsServicesComposer : IComposer
-    {
-        /// <inheritdoc />
-        public void Compose(IUmbracoBuilder builder) => builder.Services
-            .AddMvc()
-            .AddControllersAsServicesWithoutChangingActivator();
-    }
-
-    internal static class MvcBuilderExtensions
-    {
-        /// <summary>
-        /// <see cref="MvcCoreMvcBuilderExtensions.AddControllersAsServices"/> but without the replacement of
-        /// <see cref="DefaultControllerActivator"/>.
-        /// </summary>
-        /// <remarks>
-        /// We don't need to opt in to <see cref="ServiceBasedControllerActivator"/> to ensure container validation
-        /// passes.
-        /// </remarks>
-        public static IMvcBuilder AddControllersAsServicesWithoutChangingActivator(this IMvcBuilder builder)
-        {
-            var feature = new ControllerFeature();
-            builder.PartManager.PopulateFeature(feature);
-
-            foreach (Type controller in feature.Controllers.Select(c => c.AsType()))
-            {
-                builder.Services.TryAddTransient(controller, controller);
-            }
-
-            builder.Services.AddUnique<RenderNoContentController>(x => new RenderNoContentController(x.GetService<IUmbracoContextAccessor>()!, x.GetService<IOptionsSnapshot<GlobalSettings>>()!, x.GetService<IHostingEnvironment>()!));
-            return builder;
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI/Program.cs b/src/Umbraco.Web.UI/Program.cs
deleted file mode 100644
index ce23e48ff6..0000000000
--- a/src/Umbraco.Web.UI/Program.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
-
-builder.CreateUmbracoBuilder()
-    .AddBackOffice()
-    .AddWebsite()
-    .AddDeliveryApi()
-    .AddComposers()
-    .Build();
-
-WebApplication app = builder.Build();
-
-await app.BootUmbracoAsync();
-
-#if (UseHttpsRedirect)
-app.UseHttpsRedirection();
-#endif
-
-app.UseUmbraco()
-    .WithMiddleware(u =>
-    {
-        u.UseBackOffice();
-        u.UseWebsite();
-    })
-    .WithEndpoints(u =>
-    {
-        u.UseInstallerEndpoints();
-        u.UseBackOfficeEndpoints();
-        u.UseWebsiteEndpoints();
-    });
-
-await app.RunAsync();
diff --git a/src/Umbraco.Web.UI/Properties/launchSettings.json b/src/Umbraco.Web.UI/Properties/launchSettings.json
deleted file mode 100644
index 0f5957beb0..0000000000
--- a/src/Umbraco.Web.UI/Properties/launchSettings.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:9000",
-      "sslPort": 44331
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Umbraco.Web.UI": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:44331;http://localhost:9000"
-    }
-  }
-}
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
deleted file mode 100644
index b2bb3f7acb..0000000000
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ /dev/null
@@ -1,57 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-  <PropertyGroup>
-    <RootNamespace>Umbraco.Cms.Web.UI</RootNamespace>
-    <IsPackable>false</IsPackable>
-    <EnablePackageValidation>false</EnablePackageValidation>
-  </PropertyGroup>
-
-  <Import Project="..\Umbraco.Cms.Targets\buildTransitive\Umbraco.Cms.Targets.props" />
-  <Import Project="..\Umbraco.Cms.Targets\buildTransitive\Umbraco.Cms.Targets.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Cms\Umbraco.Cms.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- Add design/build time support for EF Core migrations -->
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- Ensure the AppLocalIcu setting is the same as the referenced ICU package version and changes are also done to the template project! -->
-    <!-- Opt-in to app-local ICU to ensure consistent globalization APIs across different platforms -->
-    <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" VersionOverride="72.1.0.3" />
-    <RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="72.1.0.3" Condition="$(RuntimeIdentifier.StartsWith('linux')) or $(RuntimeIdentifier.StartsWith('win')) or ('$(RuntimeIdentifier)' == '' and !$([MSBuild]::IsOSPlatform('osx')))" />
- </ItemGroup>
-
-  <ItemGroup>
-    <_ContentIncludedByDefault Remove="umbraco\UmbracoBackOffice\AuthorizeUpgrade.cshtml" />
-    <_ContentIncludedByDefault Remove="umbraco\UmbracoBackOffice\Default.cshtml" />
-    <_ContentIncludedByDefault Remove="umbraco\UmbracoBackOffice\Preview.cshtml" />
-    <_ContentIncludedByDefault Remove="umbraco\UmbracoInstall\Index.cshtml" />
-    <_ContentIncludedByDefault Remove="umbraco\UmbracoLogin\Index.cshtml" />
-    <_ContentIncludedByDefault Remove="umbraco\UmbracoWebsite\Maintenance.cshtml" />
-    <_ContentIncludedByDefault Remove="umbraco\UmbracoWebsite\NoNodes.cshtml" />
-    <_ContentIncludedByDefault Remove="umbraco\UmbracoWebsite\NotFound.cshtml" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <!-- Razor files are needed for the backoffice to work correctly -->
-    <CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- Remove RazorCompileOnBuild and RazorCompileOnPublish when not using ModelsMode InMemoryAuto -->
-    <RazorCompileOnBuild>false</RazorCompileOnBuild>
-    <RazorCompileOnPublish>false</RazorCompileOnPublish>
-  </PropertyGroup>
-
-  <Target Name="CopyAppsettingsTemplate" BeforeTargets="Build" Condition="!Exists('appsettings.json')">
-    <Message Text="Copying appsettings.template.json to appsettings.json because it doesn't exist" Importance="high" />
-    <Copy SourceFiles="appsettings.template.json" DestinationFiles="appsettings.json" />
-  </Target>
-
-  <Target Name="CopyAppsettingsDevelopmentTemplate" BeforeTargets="Build" Condition="!Exists('appsettings.Development.json')">
-    <Message Text="Copying appsettings.Development.template.json to appsettings.Development.json because it doesn't exist" Importance="high" />
-    <Copy SourceFiles="appsettings.Development.template.json" DestinationFiles="appsettings.Development.json" />
-  </Target>
-</Project>
diff --git a/src/Umbraco.Web.UI/UseLegacyBackofficeSignInManagerComposer.cs b/src/Umbraco.Web.UI/UseLegacyBackofficeSignInManagerComposer.cs
deleted file mode 100644
index a4b8f9280b..0000000000
--- a/src/Umbraco.Web.UI/UseLegacyBackofficeSignInManagerComposer.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Composing;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Cms.Web.Common.Security;
-
-namespace Umbraco.Cms.Web.UI;
-
-public class UseLegacyBackofficeSignInManagerComposer : IComposer
-{
-    public void Compose(IUmbracoBuilder builder)
-    {
-        builder.Services.Configure<BackOfficeAuthenticationTypeSettings>(options =>
-        {
-            options.AuthenticationType = Constants.Security.BackOfficeAuthenticationType;
-            options.ExternalAuthenticationType = Constants.Security.BackOfficeExternalAuthenticationType;
-            options.TwoFactorAuthenticationType = Constants.Security.BackOfficeTwoFactorAuthenticationType;
-            options.TwoFactorRememberMeAuthenticationType = Constants.Security.BackOfficeTwoFactorRememberMeAuthenticationType;
-        });
-    }
-}
diff --git a/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml b/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml
deleted file mode 100644
index accca2ef37..0000000000
--- a/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml
+++ /dev/null
@@ -1,13 +0,0 @@
-@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockListModel>
-@{
-    if (Model?.Any() != true) { return; }
-}
-<div class="umb-block-list">
-    @foreach (var block in Model)
-    {
-        if (block?.ContentUdi == null) { continue; }
-        var data = block.Content;
-
-        @await Html.PartialAsync("blocklist/Components/" + data.ContentType.Alias, block)
-    }
-</div>
diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3-fluid.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3-fluid.cshtml
deleted file mode 100644
index b92734e761..0000000000
--- a/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3-fluid.cshtml
+++ /dev/null
@@ -1,106 +0,0 @@
-@using System.Web
-@using Microsoft.AspNetCore.Html
-@using Newtonsoft.Json.Linq
-@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
-
-@*
-    Razor helpers located at the bottom of this file
-*@
-
-@if (Model is JObject && Model?.sections is not null)
-{
-    var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
-
-    <div class="umb-grid">
-        @if (oneColumn)
-        {
-            foreach (var section in Model.sections)
-            {
-                <div class="grid-section">
-                    @foreach (var row in section.rows)
-                    {
-                        renderRow(row);
-                    }
-                </div>
-            }
-        }
-        else
-        {
-            <div class="row clearfix">
-                @foreach (var sec in Model.sections)
-                {
-                    <div class="grid-section">
-                        <div class="col-md-@sec.grid column">
-                            @foreach (var row in sec.rows)
-                            {
-                                renderRow(row);
-                            }
-                        </div>
-                    </div>
-                }
-            </div>
-        }
-    </div>
-}
-
-@functions{
-
-    private async Task renderRow(dynamic row)
-    {
-        <div @RenderElementAttributes(row)>
-            <div class="row clearfix">
-                @foreach (var area in row.areas)
-                {
-                    <div class="col-md-@area.grid column">
-                        <div @RenderElementAttributes(area)>
-                            @foreach (var control in area.controls)
-                            {
-                                if (control?.editor?.view != null)
-                                {
-                                    <text>@await Html.PartialAsync("grid/editors/base", (object)control)</text>
-                                }
-                            }
-                        </div>
-                    </div>
-                 }
-            </div>
-        </div>
-    }
-}
-
-@functions{
-
-    public static HtmlString RenderElementAttributes(dynamic contentItem)
-    {
-        var attrs = new List<string>();
-        JObject cfg = contentItem.config;
-
-        if (cfg != null)
-        {
-            foreach (JProperty property in cfg.Properties())
-            {
-                var propertyValue = HttpUtility.HtmlAttributeEncode(property.Value.ToString());
-                attrs.Add(property.Name + "=\"" + propertyValue + "\"");
-            }
-        }
-
-        JObject style = contentItem.styles;
-
-        if (style != null) {
-            var cssVals = new List<string>();
-            foreach (JProperty property in style.Properties())
-            {
-                var propertyValue = property.Value.ToString();
-                if (string.IsNullOrWhiteSpace(propertyValue) == false)
-                {
-                    cssVals.Add(property.Name + ":" + propertyValue + ";");
-                }
-            }
-
-            if (cssVals.Any())
-                attrs.Add("style='" + HttpUtility.HtmlAttributeEncode(string.Join(" ", cssVals)) + "'");
-        }
-
-        return new HtmlString(string.Join(" ", attrs));
-    }
-}
diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3.cshtml
deleted file mode 100644
index 886378848b..0000000000
--- a/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3.cshtml
+++ /dev/null
@@ -1,112 +0,0 @@
-@using System.Web
-@using Microsoft.AspNetCore.Html
-@using Newtonsoft.Json.Linq
-@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
-
-@if (Model is JObject && Model?.sections is not null)
-{
-  var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
-
-    <div class="umb-grid">
-        @if (oneColumn)
-        {
-            foreach (var section in Model.sections)
-            {
-                <div class="grid-section">
-                    @foreach (var row in section.rows)
-                    {
-                        renderRow(row, true);
-                    }
-                </div>
-            }
-        }
-        else
-        {
-            <div class="container">
-                <div class="row clearfix">
-                    @foreach (var sec in Model.sections)
-                    {
-                        <div class="grid-section">
-                            <div class="col-md-@sec.grid column">
-                                @foreach (var row in sec.rows)
-                                {
-                                    renderRow(row, false);
-                                }
-                            </div>
-                        </div>
-                    }
-                </div>
-            </div>
-        }
-    </div>
-}
-
-@functions{
-
-    private async Task renderRow(dynamic row, bool singleColumn)
-    {
-        <div @RenderElementAttributes(row)>
-            @if (singleColumn) {
-                @:<div class="container">
-            }
-            <div class="row clearfix">
-                @foreach (var area in row.areas)
-                {
-                    <div class="col-md-@area.grid column">
-                        <div @RenderElementAttributes(area)>
-                            @foreach (var control in area.controls)
-                            {
-                                if (control?.editor?.view != null)
-                                {
-                                    <text>@await Html.PartialAsync("grid/editors/base", (object)control)</text>
-                                }
-                            }
-                        </div>
-                    </div>
-                 }
-            </div>
-            @if (singleColumn) {
-                @:</div>
-            }
-        </div>
-    }
-
-}
-
-@functions{
-
-    public static HtmlString RenderElementAttributes(dynamic contentItem)
-    {
-        var attrs = new List<string>();
-        JObject cfg = contentItem.config;
-
-        if (cfg != null)
-        {
-            foreach (JProperty property in cfg.Properties())
-            {
-                var propertyValue = HttpUtility.HtmlAttributeEncode(property.Value.ToString());
-                attrs.Add(property.Name + "=\"" + propertyValue + "\"");
-            }
-        }
-
-        JObject style = contentItem.styles;
-
-        if (style != null)
-        {
-            var cssVals = new List<string>();
-            foreach (JProperty property in style.Properties())
-            {
-                var propertyValue = property.Value.ToString();
-                if (string.IsNullOrWhiteSpace(propertyValue) == false)
-                {
-                    cssVals.Add(property.Name + ":" + propertyValue + ";");
-                }
-            }
-
-            if (cssVals.Any())
-                attrs.Add("style=\"" + HttpUtility.HtmlAttributeEncode(string.Join(" ", cssVals)) + "\"");
-        }
-
-        return new HtmlString(string.Join(" ", attrs));
-    }
-}
diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/editors/base.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/base.cshtml
deleted file mode 100644
index e40543b494..0000000000
--- a/src/Umbraco.Web.UI/Views/Partials/grid/editors/base.cshtml
+++ /dev/null
@@ -1,27 +0,0 @@
-@model dynamic
-
-@try
-{
-    string editor = EditorView(Model);
-    <text>@await Html.PartialAsync(editor, Model as object)</text>
-}
-catch (Exception ex)
-{
-    <pre>@ex.ToString()</pre>
-}
-
-@functions{
-
-    public static string EditorView(dynamic contentItem)
-    {
-        string view = contentItem.editor.render != null ? contentItem.editor.render.ToString() : contentItem.editor.view.ToString();
-        view = view.Replace(".html", ".cshtml");
-
-        if (!view.Contains("/"))
-        {
-            view = "grid/editors/" + view;
-        }
-
-        return view;
-    }
-}
diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/editors/embed.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/embed.cshtml
deleted file mode 100644
index 74c8fe2753..0000000000
--- a/src/Umbraco.Web.UI/Views/Partials/grid/editors/embed.cshtml
+++ /dev/null
@@ -1,11 +0,0 @@
-@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
-
-@if (Model is not null)
-{
-  string embedValue = Convert.ToString(Model.value);
-  embedValue = embedValue.DetectIsJson() ? Model.value.preview : Model.value;
-
-  <div class="video-wrapper">
-    @Html.Raw(embedValue)
-  </div>
-}
diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/editors/macro.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/macro.cshtml
deleted file mode 100644
index a4450d1c03..0000000000
--- a/src/Umbraco.Web.UI/Views/Partials/grid/editors/macro.cshtml
+++ /dev/null
@@ -1,15 +0,0 @@
-@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
-
-@if (Model?.value is not null)
-{
-    string macroAlias = Model.value.macroAlias.ToString();
-    var parameters = new Dictionary<string,object>();
-    foreach (var mpd in Model.value.macroParamsDictionary)
-    {
-        parameters.Add(mpd.Name, mpd.Value);
-    }
-
-    <text>
-        @await Umbraco.RenderMacroAsync(macroAlias, parameters)
-    </text>
-}
diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/editors/media.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/media.cshtml
deleted file mode 100644
index bc3b111332..0000000000
--- a/src/Umbraco.Web.UI/Views/Partials/grid/editors/media.cshtml
+++ /dev/null
@@ -1,64 +0,0 @@
-@model dynamic
-@using Umbraco.Cms.Core.Media
-@using Umbraco.Cms.Core.PropertyEditors.ValueConverters
-@inject IImageUrlGenerator ImageUrlGenerator
-
-@if (Model?.value is not null)
-{
-    var url = Model.value.image;
-
-    if (Model.editor.config != null && Model.editor.config.size != null)
-    {
-        if (Model.value.coordinates != null)
-        {
-            url = ImageCropperTemplateCoreExtensions.GetCropUrl(
-                (string)url,
-                ImageUrlGenerator,
-                width: (int)Model.editor.config.size.width,
-                height: (int)Model.editor.config.size.height,
-                cropAlias: "default",
-                cropDataSet: new ImageCropperValue
-                {
-                    Crops = new[]
-                    {
-                        new ImageCropperValue.ImageCropperCrop
-                        {
-                            Alias = "default",
-                            Coordinates = new ImageCropperValue.ImageCropperCropCoordinates
-                            {
-                                X1 = (decimal)Model.value.coordinates.x1,
-                                Y1 = (decimal)Model.value.coordinates.y1,
-                                X2 = (decimal)Model.value.coordinates.x2,
-                                Y2 = (decimal)Model.value.coordinates.y2
-                            }
-                        }
-                    }
-                });
-        }
-        else
-        {
-            url = ImageCropperTemplateCoreExtensions.GetCropUrl(
-                (string)url,
-                ImageUrlGenerator,
-                width: (int)Model.editor.config.size.width,
-                height: (int)Model.editor.config.size.height,
-                cropDataSet: new ImageCropperValue
-                {
-                    FocalPoint = new ImageCropperValue.ImageCropperFocalPoint
-                    {
-                        Top = Model.value.focalPoint == null ? 0.5m : Model.value.focalPoint.top,
-                        Left = Model.value.focalPoint == null ? 0.5m : Model.value.focalPoint.left
-                    }
-                });
-        }
-    }
-
-    var altText = Model.value.altText ?? Model.value.caption ?? string.Empty;
-
-    <img src="@url" alt="@altText">
-
-    if (Model.value.caption != null)
-    {
-        <p class="caption">@Model.value.caption</p>
-    }
-}
diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/editors/rte.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/rte.cshtml
deleted file mode 100644
index 944566688a..0000000000
--- a/src/Umbraco.Web.UI/Views/Partials/grid/editors/rte.cshtml
+++ /dev/null
@@ -1,13 +0,0 @@
-@using Umbraco.Cms.Core.Templates
-@model dynamic
-@inject HtmlLocalLinkParser HtmlLocalLinkParser;
-@inject HtmlUrlParser HtmlUrlParser;
-@inject HtmlImageSourceParser HtmlImageSourceParser;
-
-@{
-    var value = HtmlLocalLinkParser.EnsureInternalLinks(Model?.value.ToString());
-    value = HtmlUrlParser.EnsureUrls(value);
-    value = HtmlImageSourceParser.EnsureImageSources(value);
-}
-
-@Html.Raw(value)
diff --git a/src/Umbraco.Web.UI/Views/Partials/grid/editors/textstring.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/textstring.cshtml
deleted file mode 100644
index e6b93523b3..0000000000
--- a/src/Umbraco.Web.UI/Views/Partials/grid/editors/textstring.cshtml
+++ /dev/null
@@ -1,22 +0,0 @@
-@model dynamic
-
-@if (Model?.editor.config.markup is not null)
-{
-    string markup = Model.editor.config.markup.ToString();
-    markup = markup.Replace("#value#", Html.ReplaceLineBreaks((string)Model.value.ToString()).ToString());
-
-    if (Model.editor.config.style != null)
-    {
-        markup = markup.Replace("#style#", Model.editor.config.style.ToString());
-    }
-
-    <text>
-        @Html.Raw(markup)
-    </text>
-}
-else
-{
-    <text>
-        <div style="@Model?.editor.config.style">@Model?.value</div>
-    </text>
-}
diff --git a/src/Umbraco.Web.UI/appsettings.Development.template.json b/src/Umbraco.Web.UI/appsettings.Development.template.json
deleted file mode 100644
index b02fdd604a..0000000000
--- a/src/Umbraco.Web.UI/appsettings.Development.template.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "$schema": "appsettings-schema.json",
-  "Serilog": {
-    "MinimumLevel": {
-      "Default": "Information",
-      "Override": {
-        "Examine.Lucene.Providers.LuceneIndex": "Debug",
-        "Examine.BaseIndexProvider": "Debug",
-        "Examine.Lucene.LoggingReplicationClient": "Debug",
-        "Examine.Lucene.ExamineReplicator": "Debug"
-      }
-    },
-    "WriteTo": [
-      {
-        "Name": "Async",
-        "Args": {
-          "configure": [
-            {
-              "Name": "Console"
-            }
-          ]
-        }
-      }
-    ]
-  },
-  "Umbraco": {
-    "CMS": {
-      "Examine": {
-        "LuceneDirectoryFactory": "TempFileSystemDirectoryFactory"
-      },
-      "Global": {
-        "Smtp": {
-          //"From": "your@email.here",
-          //"Host": "localhost",
-          // "Port": "25"
-        }
-      },
-      "Hosting": {
-        "Debug": true
-      },
-      "RuntimeMinification": {
-        "useInMemoryCache": true,
-        "cacheBuster": "Timestamp"
-      }
-    }
-  }
-}
diff --git a/src/Umbraco.Web.UI/appsettings.template.json b/src/Umbraco.Web.UI/appsettings.template.json
deleted file mode 100644
index c0d6784ac2..0000000000
--- a/src/Umbraco.Web.UI/appsettings.template.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "$schema": "appsettings-schema.json",
-  "ConnectionStrings": {
-    "umbracoDbDSN": ""
-  },
-  "Serilog": {
-    "MinimumLevel": {
-      "Default": "Information",
-      "Override": {
-        "Microsoft": "Warning",
-        "Microsoft.Hosting.Lifetime": "Information",
-        "System": "Warning"
-      }
-    }
-  },
-  "Umbraco": {
-    "CMS": {
-      "Content": {
-        "Notifications": {
-          "Email": "your@email.here"
-        },
-        "MacroErrors": "Throw"
-      },
-      "Global": {
-        "DefaultUILanguage": "en-us",
-        "HideTopLevelNodeFromPath": true,
-        "TimeOutInMinutes": 20,
-        "UseHttps": false
-      },
-      "Hosting": {
-        "Debug": false
-      },
-      "KeepAlive": {
-        "DisableKeepAliveTask": false,
-        "KeepAlivePingUrl": "~/api/keepalive/ping"
-      },
-      "RequestHandler": {
-        "ConvertUrlsToAscii": "try"
-      },
-      "RuntimeMinification": {
-        "dataFolder": "umbraco/Data/TEMP/Smidge",
-        "version": "637642136775050602"
-      },
-      "Security": {
-        "KeepUserLoggedIn": false,
-        "UsernameIsEmail": true,
-        "HideDisabledUsersInBackoffice": false,
-        "AllowedUserNameCharacters": "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._@+\\",
-        "UserPassword": {
-          "RequiredLength": 10,
-          "RequireNonLetterOrDigit": false,
-          "RequireDigit": false,
-          "RequireLowercase": false,
-          "RequireUppercase": false,
-          "MaxFailedAccessAttemptsBeforeLockout": 5
-        },
-        "MemberPassword": {
-          "RequiredLength": 10,
-          "RequireNonLetterOrDigit": false,
-          "RequireDigit": false,
-          "RequireLowercase": false,
-          "RequireUppercase": false,
-          "MaxFailedAccessAttemptsBeforeLockout": 5
-        }
-      },
-      "Tours": {
-        "EnableTours": true
-      },
-      "ModelsBuilder": {
-        "ModelsMode": "InMemoryAuto"
-      }
-    }
-  }
-}
diff --git a/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
deleted file mode 100644
index cce2140d06..0000000000
--- a/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
+++ /dev/null
@@ -1,64 +0,0 @@
-@using Microsoft.Extensions.Options;
-@using Umbraco.Cms.Core
-@using Umbraco.Cms.Core.Configuration
-@using Umbraco.Cms.Core.Configuration.Models
-@using Umbraco.Cms.Core.Hosting
-@using Umbraco.Cms.Core.WebAssets
-@using Umbraco.Cms.Infrastructure.WebAssets
-@using Umbraco.Cms.Web.BackOffice.Controllers
-@using Umbraco.Cms.Web.BackOffice.Security
-@using Umbraco.Extensions
-@inject BackOfficeServerVariables backOfficeServerVariables
-@inject IUmbracoVersion umbracoVersion
-@inject IHostingEnvironment hostingEnvironment
-@inject IOptions<GlobalSettings> globalSettings
-@inject IBackOfficeExternalLoginProviders externalLogins
-@inject IRuntimeMinifier runtimeMinifier
-
-@{
-    var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment);
-}
-
-<!DOCTYPE html>
-
-<html lang="en">
-<head>
-    <base href="@backOfficePath.EnsureEndsWith('/')" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <title>Umbraco</title>
-
-    @Html.Raw(await runtimeMinifier.RenderCssHereAsync(BackOfficeWebAssets.UmbracoUpgradeCssBundleName))
-
-    @*Because we're lazy loading angular js, the embedded cloak style will not be loaded initially, but we need it*@
-    <style>
-        [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
-            display: none !important;
-        }
-    </style>
-
-</head>
-<body id="umbracoMainPageBody" ng-controller="Umbraco.AuthorizeUpgradeController" class="login-only">
-
-    <umb-login on-login="loginAndRedirect()"></umb-login>
-
-    <umb-notifications></umb-notifications>
-
-    @{
-        var externalLoginUrl = Url.Action("ExternalLogin", "BackOffice", new
-        {
-            area = ViewData.GetUmbracoPath(),
-            //Custom redirect URL since we don't want to just redirect to the back office since this is for authing upgrades
-            redirectUrl = Url.Action("AuthorizeUpgrade", "BackOffice")
-        });
-    }
-
-    @await Html.BareMinimumServerVariablesScriptAsync(backOfficeServerVariables)
-
-    @*And finally we can load in our angular app*@
-    <script type="text/javascript" src="lib/lazyload-js/LazyLoad.min.js"></script>
-    <script src="@Url.GetUrlWithCacheBust("Application", "BackOffice", null!, hostingEnvironment, umbracoVersion, runtimeMinifier)"></script>
-
-</body>
-</html>
diff --git a/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Default.cshtml
deleted file mode 100644
index faa84121e6..0000000000
--- a/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Default.cshtml
+++ /dev/null
@@ -1,134 +0,0 @@
-@using Microsoft.Extensions.Options;
-@using System.Globalization
-@using Umbraco.Cms.Core.Configuration
-@using Umbraco.Cms.Core.Configuration.Models
-@using Umbraco.Cms.Core.Hosting
-@using Umbraco.Cms.Core.Logging
-@using Umbraco.Cms.Core.Routing
-@using Umbraco.Cms.Core.WebAssets
-@using Umbraco.Cms.Infrastructure.WebAssets
-@using Umbraco.Cms.Web.BackOffice.Controllers
-@using Umbraco.Cms.Web.BackOffice.Security
-@using Umbraco.Extensions
-@inject BackOfficeServerVariables backOfficeServerVariables
-@inject IUmbracoVersion umbracoVersion
-@inject IHostingEnvironment hostingEnvironment
-@inject IOptions<GlobalSettings> globalSettings
-@inject IRuntimeMinifier runtimeMinifier
-@inject IProfilerHtml profilerHtml
-@inject IBackOfficeExternalLoginProviders externalLogins
-@{
-    bool.TryParse(Context.Request.Query["umbDebug"], out bool isDebug);
-    var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment);
-}
-
-<!DOCTYPE html>
-
-<html lang="@CultureInfo.CurrentCulture.Name.ToLowerInvariant()">
-<head>
-    <base href="@backOfficePath.EnsureEndsWith('/')" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="robots" content="noindex, nofollow">
-    <meta name="pinterest" content="nopin" />
-
-    <title ng-bind="$root.locationTitle">Umbraco</title>
-
-    @Html.Raw(await runtimeMinifier.RenderCssHereAsync(BackOfficeWebAssets.UmbracoInitCssBundleName))
-</head>
-<body ng-class="{'touch':touchDevice, 'emptySection':emptySection, 'umb-drawer-is-visible':drawer.show, 'umb-tour-is-visible': tour.show, 'tabbing-active':tabbingActive}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">
-    <noscript>
-        <div class="flex flex-wrap flex-column items-center justify-center" style="height: 100%">
-            <h1 class="h3" style="display: inline-flex; align-items: center; gap: 10px">
-                <img aria-hidden="true" alt="logo" src="~/umbraco/assets/img/application/logo.svg" style="width: 30px" />
-                <span>Umbraco</span>
-            </h1>
-            <p>For full functionality of Umbraco CMS it is necessary to enable JavaScript.</p>
-            <p>Here are the <a href="https://www.enable-javascript.com/" target="_blank" rel="noopener" style="text-decoration: underline;">instructions how to enable JavaScript in your web browser</a>.</p>
-        </div>
-    </noscript>
-
-    <umb-backoffice-icon-registry>
-        <div ng-hide="!authenticated" ng-cloak>
-
-            <div style="display: none;" id="mainwrapper" class="clearfix">
-
-                <umb-app-header></umb-app-header>
-
-                <div class="umb-app-content">
-
-                    <umb-navigation></umb-navigation>
-
-                    <section id="contentwrapper">
-
-                        <div id="contentcolumn">
-                            <div class="umb-editor" ng-view></div>
-                        </div>
-
-                    </section>
-
-                </div>
-
-            </div>
-
-            <umb-tour ng-if="tour.show"
-                      model="tour">
-            </umb-tour>
-
-            <!-- help dialog controller by the help button - this also forces the backoffice UI to shift 400px  -->
-            <umb-drawer data-element="drawer" ng-if="drawer.show" model="drawer.model" view="drawer.view"></umb-drawer>
-
-            <umb-search ng-attr-umb-focus-lock="true" ng-if="search.show" on-close="closeSearch()"></umb-search>
-
-        </div>
-
-        <umb-notifications></umb-notifications>
-
-        <umb-backdrop ng-if="backdrop.show || infiniteMode"
-                      backdrop-opacity="backdrop.opacity"
-                      highlight-element="backdrop.element"
-                      highlight-prevent-click="backdrop.elementPreventClick"
-                      disable-events-on-click="backdrop.disableEventsOnClick">
-        </umb-backdrop>
-
-        <umb-overlay ng-if="overlay.show"
-                     model="overlay"
-                     position="{{overlay.position}}"
-                     size="overlay.size"
-                     view="overlay.view"
-                     name="overlay.name"
-                     parent-scope="overlay.parentScope">
-        </umb-overlay>
-
-        <umb-editors ng-show="infiniteMode"></umb-editors>
-
-        <umb-login ng-if="login.show"
-                   is-timed-out="login.isTimedOut"
-                   on-login="hideLoginScreen()">
-        </umb-login>
-    </umb-backoffice-icon-registry>
-
-    @await Html.BareMinimumServerVariablesScriptAsync(backOfficeServerVariables)
-
-    <script>
-        document.angularReady = function(app) {
-            @await Html.AngularValueExternalLoginInfoScriptAsync(externalLogins, ViewData.GetExternalSignInProviderErrors()!)
-            @Html.AngularValueResetPasswordCodeInfoScript(ViewData[ViewDataExtensions.TokenPasswordResetCode]!)
-            @await Html.AngularValueTinyMceAssetsAsync(runtimeMinifier)
-            //required for the noscript trick
-            document.getElementById("mainwrapper").style.display = "inherit";
-        }
-    </script>
-
-    <script src="@WebPath.Combine(backOfficePath.TrimStart("~"), "/lib/lazyload-js/LazyLoad.min.js")"></script>
-    <script src="@Url.GetUrlWithCacheBust("Application", "BackOffice", null!, hostingEnvironment, umbracoVersion, runtimeMinifier)"></script>
-
-    @if (isDebug)
-    {
-        @Html.Raw(profilerHtml.Render())
-    }
-
-</body>
-</html>
diff --git a/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Preview.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Preview.cshtml
deleted file mode 100644
index 80231d3ac5..0000000000
--- a/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Preview.cshtml
+++ /dev/null
@@ -1,114 +0,0 @@
-@using Microsoft.Extensions.Options;
-@using Umbraco.Cms.Core.Configuration
-@using Umbraco.Cms.Core.Configuration.Models
-@using Umbraco.Cms.Core.Hosting
-@using Umbraco.Cms.Core.Logging
-@using Umbraco.Cms.Core.Services
-@using Umbraco.Cms.Core.WebAssets
-@using Umbraco.Cms.Infrastructure.WebAssets
-@using Umbraco.Cms.Web.BackOffice.Controllers
-@using Umbraco.Cms.Web.BackOffice.Security
-@using Umbraco.Extensions
-@inject IBackOfficeSignInManager SignInManager
-@inject BackOfficeServerVariables BackOfficeServerVariables
-@inject IUmbracoVersion UmbracoVersion
-@inject IHostingEnvironment HostingEnvironment
-@inject IOptions<GlobalSettings> GlobalSettings
-@inject IRuntimeMinifier RuntimeMinifier
-@inject IProfilerHtml ProfilerHtml
-@inject ILocalizedTextService LocalizedTextService
-
-@model Umbraco.Cms.Core.Editors.BackOfficePreviewModel
-@{
-    var disableDevicePreview = Model?.DisableDevicePreview.ToString().ToLowerInvariant();
-
-    var EndLabel = LocalizedTextService.Localize("preview", "endLabel");
-    var EndTitle = LocalizedTextService.Localize("preview", "endTitle");
-    var OpenWebsiteLabel = LocalizedTextService.Localize("preview", "openWebsiteLabel");
-    var OpenWebsiteTitle = LocalizedTextService.Localize("preview", "openWebsiteTitle");
-    var returnToPreviewHeadline = LocalizedTextService.Localize("preview", "returnToPreviewHeadline");
-    var returnToPreviewDescription = LocalizedTextService.Localize("preview", "returnToPreviewDescription");
-    var returnToPreviewAcceptButton = LocalizedTextService.Localize("preview", "returnToPreviewAcceptButton");
-    var returnToPreviewDeclineButton = LocalizedTextService.Localize("preview", "returnToPreviewDeclineButton");
-}
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>Umbraco Preview</title>
-    <meta name="robots" content="noindex, nofollow">
-    <meta name="pinterest" content="nopin" />
-
-    @Html.Raw(await RuntimeMinifier.RenderCssHereAsync(BackOfficeWebAssets.UmbracoPreviewCssBundleName))
-
-    <script type="text/javascript">
-        window.umbLocalizedVars = {
-            'returnToPreviewHeadline': '@returnToPreviewHeadline',
-            'returnToPreviewDescription':'@returnToPreviewDescription',
-            'returnToPreviewAcceptButton':'@returnToPreviewAcceptButton',
-            'returnToPreviewDeclineButton':'@returnToPreviewDeclineButton'
-        };
-    </script>
-</head>
-<body id="canvasdesignerPanel" ng-mouseover="outlinePositionHide()" ng-controller="previewController" ng-class="{'tabbing-active': tabbingActive === true}" ng-click="windowClickHandler($event)">
-    <div class="wait" ng-show="!frameLoaded"></div>
-
-    @if (!string.IsNullOrWhiteSpace(Model?.PreviewExtendedHeaderView))
-    {
-        @await Html.PartialAsync(Model.PreviewExtendedHeaderView)
-    }
-
-    <div id="demo-iframe-wrapper" class="{{previewDevice.css}}">
-        <preview-i-frame src="pageUrl" on-loaded="onFrameLoaded(iframe)"></preview-i-frame>
-    </div>
-    <div class="canvasdesigner" ng-init="showDevicesPreview = true; showDevices = !@(disableDevicePreview);" ng-mouseenter="positionSelectedHide()">
-        <div class="menu-bar selected">
-
-            <div class="menu-bar__title">Preview Mode</div>
-
-            <div class="menu-bar__right-part">
-
-                <div class="preview-menu-option" ng-class="{'--open': sizeOpen === true}" ng-click="$event.stopPropagation()">
-                    <button class="menu-bar__button umb-outline" ng-click="toggleSizeOpen()"><i class="icon {{previewDevice.icon}}"></i><span>{{previewDevice.title}}</span></button>
-                    <div class="dropdown-menu">
-                        <button ng-repeat="device in devices" class="menu-bar__button umb-outline" ng-class="{ '--active':previewDevice === device }" ng-click="updatePreviewDevice(device)">
-                            <i class="icon {{device.icon}}"></i><span>{{device.title}}</span>
-                        </button>
-                    </div>
-                </div>
-
-                @if (Model?.Languages.Any() == true)
-                {
-                    <div class="preview-menu-option" ng-class="{'--open': cultureOpen === true}" ng-click="$event.stopPropagation()">
-                        <button class="menu-bar__button umb-outline" ng-click="toggleCultureOpen()"><i class="icon icon-globe-europe---africa"></i><span>{{currentCulture.title}}</span></button>
-                        <div class="dropdown-menu">
-                            @foreach (var language in Model.Languages)
-                            {
-                                <button class="menu-bar__button umb-outline" ng-class="{ '--active': currentCultureIso === '@language.IsoCode' || (@language.IsDefault.ToString().ToLower() && currentCultureIso === null) }" ng-click="changeCulture('@language.IsoCode')" ng-init="registerCulture('@language.IsoCode', '@language.CultureName', @language.IsDefault.ToString().ToLower())">
-                                    <i class="icon icon-globe-europe---africa"></i><span>@language.CultureName</span>
-                                </button>
-                            }
-                        </div>
-                    </div>
-                }
-
-                <button ng-click="openInBrowser()" title="@OpenWebsiteTitle" class="menu-bar__button umb-outline">
-                    <i class="icon icon-out"></i><span>@OpenWebsiteLabel</span>
-                </button>
-
-                <button ng-click="exitPreview()" title="@EndTitle" class="menu-bar__button umb-outline">
-                    <i class="icon icon-power"></i><span>@EndLabel</span>
-                </button>
-
-            </div>
-        </div>
-
-    </div>
-
-    @await Html.BareMinimumServerVariablesScriptAsync(BackOfficeServerVariables)
-
-    <script src="../lib/lazyload-js/LazyLoad.min.js"></script>
-    <script src="@Url.GetUrlWithCacheBust("Application", "Preview", null!, HostingEnvironment, UmbracoVersion, RuntimeMinifier)"></script>
-
-</body>
-</html>
diff --git a/src/Umbraco.Web.UI/umbraco/UmbracoInstall/Index.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoInstall/Index.cshtml
deleted file mode 100644
index a8cb03c00f..0000000000
--- a/src/Umbraco.Web.UI/umbraco/UmbracoInstall/Index.cshtml
+++ /dev/null
@@ -1,80 +0,0 @@
-@using Umbraco.Extensions
-@{
-    Layout = null;
-}
-<!doctype html>
-<html lang="en">
-<head>
-    <base href="@ViewData.GetUmbracoBaseFolder()/" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <title>Install Umbraco</title>
-    <link rel="stylesheet" href="assets/css/installer.min.css" />
-    <link rel="stylesheet" href="lib/nouislider/nouislider.min.css" />
-</head>
-
-<body ng-class="{loading:installer.loading}" ng-controller="Umbraco.InstallerController" id="umbracoInstallPageBody">
-
-    <img src="assets/img/application/logo_white.svg" aria-hidden="true" width="91" height="91" alt="Umbraco" draggable="false" id="logo" />
-
-    <umb-loader position="bottom"
-                class="umb-installer-loader"
-                ng-if="installer.loading"
-                ng-style="{'width': installer.progress}">
-    </umb-loader>
-
-    <div id="overlay" ng-cloak ng-animate="'fade'" ng-show="installer.done"></div>
-
-    <div id="installer"
-         ng-cloak
-         ng-animate="'fade'"
-         ng-show="installer.configuring">
-
-        <div id="contentwrapper" ng-if="installer.current" ng-switch on="installer.current.view">
-            <div ng-switch-when="ysod">
-                <h1>A server error occurred</h1>
-                <p>This is most likely due to an error during application startup</p>
-                <iframe id="ysod" title="Error details"></iframe>
-            </div>
-            <div ng-switch-default>
-                <div ng-include="installer.current.view"></div>
-            </div>
-        </div>
-    </div>
-
-
-    <div ng-cloak ng-animate="'fade'" id="fact" class="absolute-center clearfix" ng-show="installer.fact">
-        <h2>Did you know</h2>
-        <p ng-bind-html="installer.fact"></p>
-    </div>
-
-    <h3 ng-cloak ng-animate="'fade'" id="feedback" ng-show="installer.feedback">{{installer.feedback}}</h3>
-
-    <div id="missinglazyload" style="display: none;">
-        <h3>There has been a problem with the build.</h3>
-        <p>This might be because you could be offline or on a slow connection. Please try the following steps</p>
-        <ol>
-            <li>Make sure you have <a href="https://nodejs.org" target="_blank">Node.js</a> installed.</li>
-            <li>Open command prompt and cd to \src\Umbraco.Web.UI.Client.</li>
-            <li>Check to see if \src\Umbraco.Web.UI.Client\node_modules folder exists (this could be hidden); if so, delete it.</li>
-            <li>Run npm ci; if successfull the node_modules folder should be created in the Umbraco.Web.UI.Client directory.</li>
-            <li>Run \build\build.ps1.</li>
-        </ol>
-    </div>
-
-    <script type="text/javascript">
-        var Umbraco = {};
-        Umbraco.Sys = {};
-        Umbraco.Sys.ServerVariables = {
-            "installApiBaseUrl": "@ViewData.GetInstallApiBaseUrl()",
-            "umbracoBaseUrl": "@ViewData.GetUmbracoBaseFolder()",
-            "application": {
-               version: "@ViewData.GetUmbracoVersion()?.Major"
-           }
-        };
-    </script>
-    <script src="lib/lazyload-js/LazyLoad.min.js"></script>
-    <script src="js/install.loader.min.js"></script>
-</body>
-</html>
diff --git a/src/Umbraco.Web.UI/umbraco/UmbracoLogin/Index.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoLogin/Index.cshtml
deleted file mode 100644
index a8cb03c00f..0000000000
--- a/src/Umbraco.Web.UI/umbraco/UmbracoLogin/Index.cshtml
+++ /dev/null
@@ -1,80 +0,0 @@
-@using Umbraco.Extensions
-@{
-    Layout = null;
-}
-<!doctype html>
-<html lang="en">
-<head>
-    <base href="@ViewData.GetUmbracoBaseFolder()/" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <title>Install Umbraco</title>
-    <link rel="stylesheet" href="assets/css/installer.min.css" />
-    <link rel="stylesheet" href="lib/nouislider/nouislider.min.css" />
-</head>
-
-<body ng-class="{loading:installer.loading}" ng-controller="Umbraco.InstallerController" id="umbracoInstallPageBody">
-
-    <img src="assets/img/application/logo_white.svg" aria-hidden="true" width="91" height="91" alt="Umbraco" draggable="false" id="logo" />
-
-    <umb-loader position="bottom"
-                class="umb-installer-loader"
-                ng-if="installer.loading"
-                ng-style="{'width': installer.progress}">
-    </umb-loader>
-
-    <div id="overlay" ng-cloak ng-animate="'fade'" ng-show="installer.done"></div>
-
-    <div id="installer"
-         ng-cloak
-         ng-animate="'fade'"
-         ng-show="installer.configuring">
-
-        <div id="contentwrapper" ng-if="installer.current" ng-switch on="installer.current.view">
-            <div ng-switch-when="ysod">
-                <h1>A server error occurred</h1>
-                <p>This is most likely due to an error during application startup</p>
-                <iframe id="ysod" title="Error details"></iframe>
-            </div>
-            <div ng-switch-default>
-                <div ng-include="installer.current.view"></div>
-            </div>
-        </div>
-    </div>
-
-
-    <div ng-cloak ng-animate="'fade'" id="fact" class="absolute-center clearfix" ng-show="installer.fact">
-        <h2>Did you know</h2>
-        <p ng-bind-html="installer.fact"></p>
-    </div>
-
-    <h3 ng-cloak ng-animate="'fade'" id="feedback" ng-show="installer.feedback">{{installer.feedback}}</h3>
-
-    <div id="missinglazyload" style="display: none;">
-        <h3>There has been a problem with the build.</h3>
-        <p>This might be because you could be offline or on a slow connection. Please try the following steps</p>
-        <ol>
-            <li>Make sure you have <a href="https://nodejs.org" target="_blank">Node.js</a> installed.</li>
-            <li>Open command prompt and cd to \src\Umbraco.Web.UI.Client.</li>
-            <li>Check to see if \src\Umbraco.Web.UI.Client\node_modules folder exists (this could be hidden); if so, delete it.</li>
-            <li>Run npm ci; if successfull the node_modules folder should be created in the Umbraco.Web.UI.Client directory.</li>
-            <li>Run \build\build.ps1.</li>
-        </ol>
-    </div>
-
-    <script type="text/javascript">
-        var Umbraco = {};
-        Umbraco.Sys = {};
-        Umbraco.Sys.ServerVariables = {
-            "installApiBaseUrl": "@ViewData.GetInstallApiBaseUrl()",
-            "umbracoBaseUrl": "@ViewData.GetUmbracoBaseFolder()",
-            "application": {
-               version: "@ViewData.GetUmbracoVersion()?.Major"
-           }
-        };
-    </script>
-    <script src="lib/lazyload-js/LazyLoad.min.js"></script>
-    <script src="js/install.loader.min.js"></script>
-</body>
-</html>
diff --git a/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/Maintenance.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/Maintenance.cshtml
deleted file mode 100644
index 46739cdef7..0000000000
--- a/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/Maintenance.cshtml
+++ /dev/null
@@ -1,69 +0,0 @@
-@using Microsoft.Extensions.Options
-@using Umbraco.Cms.Core.Configuration.Models
-@using Umbraco.Cms.Core.Hosting
-@using Umbraco.Cms.Core.Routing
-@using Umbraco.Extensions
-@inject IHostingEnvironment hostingEnvironment
-@inject IOptions<GlobalSettings> globalSettings
-@{
-    var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment);
-}
-<!doctype html>
-<html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-
-    <title>Website is Under Maintainance</title>
-
-    <link rel="stylesheet" href="@WebPath.Combine(backOfficePath.TrimStart("~"), "/assets/css/nonodes.style.min.css")" />
-    <style type="text/css">
-        body {
-            color:initial;
-        }
-
-        section {
-            background: none;
-        }
-
-        section a, section a:focus, section a:visited {
-            color:initial;
-            border-color:currentColor;
-        }
-    </style>
-</head>
-<body>
-
-    <section>
-        <article>
-            <div>
-                <h1>Website is Under Maintenance</h1>
-
-                    <div class="cta"></div>
-
-                    <div class="row">
-                        <div class="col">
-                            <h2>This page can be replaced</h2>
-                            <p>
-                                Custom error handling might make your site look more on-brand and minimize the impact of errors on user experience - for example, a custom 404 with some helpful links (or a search function) could bring some value to the site.
-                            </p>
-
-                            <a href="https://umbra.co/custom-error-pages" target="_blank" rel="noopener">Implementing custom error pages &rarr;</a>
-                        </div>
-
-                        <div class="col">
-                            <h2>Finish the maintenance</h2>
-                            <p>If you are an administrator, you finish the maintanance by going to backoffice.</p>
-
-                            <a href="@backOfficePath">Handle the upgrade &rarr;</a>
-                        </div>
-                    </div>
-
-            </div>
-        </article>
-
-    </section>
-
-</body>
-</html>
diff --git a/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NoNodes.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NoNodes.cshtml
deleted file mode 100644
index e773e81516..0000000000
--- a/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NoNodes.cshtml
+++ /dev/null
@@ -1,59 +0,0 @@
-@using Microsoft.Extensions.Options
-@using Umbraco.Cms.Core.Configuration.Models
-@using Umbraco.Cms.Core.Hosting
-@using Umbraco.Cms.Core.Routing
-@using Umbraco.Extensions
-@model Umbraco.Cms.Web.Website.Models.NoNodesViewModel
-@inject IHostingEnvironment hostingEnvironment
-@inject IOptions<GlobalSettings> globalSettings
-@{
-    var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment);
-}
-<!doctype html>
-<html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-
-    <title>Umbraco: No Published Content</title>
-
-    <link rel="stylesheet" href="@WebPath.Combine(backOfficePath.TrimStart("~"), "/assets/css/nonodes.style.min.css")" />
-</head>
-<body>
-
-    <section>
-        <article>
-            <div>
-                <div class="logo"></div>
-
-                <h1>Welcome to your Umbraco installation</h1>
-                <h3>You're seeing this wonderful page because your website doesn't contain any published content yet.</h3>
-
-                <div class="cta">
-                    <a href="@Model?.UmbracoPath" class="button">Open Umbraco</a>
-                </div>
-
-                <div class="row">
-                    <div class="col">
-                        <h2>Easy start with Umbraco Learning Base</h2>
-                        <p>We have created a bunch of 'how-to' videos, to get you easily started with Umbraco. Learn how to build projects in just a couple of minutes. Easiest CMS in the world.</p>
-
-                        <a href="https://www.youtube.com/channel/UCbGfwSAPflebnadyhEPw-wA?ref=tvFromInstaller" target="_blank" rel="noopener">Umbraco Learning Base &rarr;</a>
-                    </div>
-
-                    <div class="col">
-                        <h2>Be a part of the community</h2>
-                        <p>The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we're sure that you can get your answers from the community.</p>
-
-                        <a href="https://our.umbraco.com/?ref=ourFromInstaller" target="_blank" rel="noopener">our.Umbraco &rarr;</a>
-                    </div>
-                </div>
-
-            </div>
-        </article>
-
-    </section>
-
-</body>
-</html>
diff --git a/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NotFound.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NotFound.cshtml
deleted file mode 100644
index ea9d0d41aa..0000000000
--- a/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NotFound.cshtml
+++ /dev/null
@@ -1,84 +0,0 @@
-@using Microsoft.Extensions.Options
-@using Umbraco.Cms.Core.Configuration.Models
-@using Umbraco.Cms.Core.Hosting
-@using Umbraco.Cms.Core.Routing
-@using Umbraco.Extensions
-@inject IHostingEnvironment hostingEnvironment
-@inject IOptions<GlobalSettings> globalSettings
-@{
-    var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment);
-}
-<!doctype html>
-<html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-
-    <title>Page Not Found</title>
-
-    <link rel="stylesheet" href="@WebPath.Combine(backOfficePath.TrimStart("~"), "/assets/css/nonodes.style.min.css")" />
-    <style type="text/css">
-        body {
-            color:initial;
-        }
-
-        section {
-            background: none;
-        }
-
-        section a, section a:focus, section a:visited {
-            color:initial;
-            border-color:currentColor;
-        }
-    </style>
-</head>
-<body>
-
-    <section>
-        <article>
-            <div>
-                <h1>Page Not Found</h1>
-                @if (hostingEnvironment.IsDebugMode)
-                {
-
-                    var reason = (string?)Context.Items["reason"];
-                    var message = (string?)Context.Items["message"];
-
-                    if (!reason.IsNullOrWhiteSpace())
-                    {
-                        <h3>@reason</h3>
-                    }
-                    if (!message.IsNullOrWhiteSpace())
-                    {
-                        <p>@message</p>
-                    }
-
-                    <div class="cta"></div>
-
-                    <div class="row">
-                        <div class="col">
-                            <h2>This page can be replaced</h2>
-                            <p>
-                                Custom error handling might make your site look more on-brand and minimize the impact of errors on user experience - for example, a custom 404 with some helpful links (or a search function) could bring some value to the site.
-                            </p>
-
-                            <a href="https://umbra.co/custom-error-pages" target="_blank" rel="noopener">Implementing custom error pages &rarr;</a>
-                        </div>
-
-                        <div class="col">
-                            <h2>Be a part of the community</h2>
-                            <p>The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we're sure that you can get your answers from the community.</p>
-
-                            <a href="https://our.umbraco.com/" target="_blank" rel="noopener">our.Umbraco &rarr;</a>
-                        </div>
-                    </div>
-
-                }
-            </div>
-        </article>
-
-    </section>
-
-</body>
-</html>
diff --git a/src/Umbraco.Web.UI/wwwroot/favicon.ico b/src/Umbraco.Web.UI/wwwroot/favicon.ico
deleted file mode 100644
index c0749ddf7f..0000000000
Binary files a/src/Umbraco.Web.UI/wwwroot/favicon.ico and /dev/null differ
diff --git a/src/Umbraco.Web.Website/Middleware/BasicAuthenticationMiddleware.cs b/src/Umbraco.Web.Website/Middleware/BasicAuthenticationMiddleware.cs
index 528d464ef4..0b20a57ff8 100644
--- a/src/Umbraco.Web.Website/Middleware/BasicAuthenticationMiddleware.cs
+++ b/src/Umbraco.Web.Website/Middleware/BasicAuthenticationMiddleware.cs
@@ -10,7 +10,7 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Security;
+using Umbraco.Cms.Web.Common.Security;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Web.Common.Middleware;
diff --git a/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs b/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs
index b05774bdf7..8eab5cdc4e 100644
--- a/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs
+++ b/src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs
@@ -147,9 +147,8 @@ public class UmbracoRouteValueTransformer : DynamicRouteValueTransformer
                 return new RouteValueDictionary()
                 {
                     //TODO figure out constants
-                    [ControllerToken] = "Install",
-                    [ActionToken] = "Index",
-                    [AreaToken] = Constants.Web.Mvc.InstallArea,
+                    [ControllerToken] = "BackOfficeDefault",
+                    [ActionToken] = "Index"
                 };
             }
 
diff --git a/templates/Umbraco.Templates.csproj b/templates/Umbraco.Templates.csproj
index 854a3095d7..8d349c6ddc 100644
--- a/templates/Umbraco.Templates.csproj
+++ b/templates/Umbraco.Templates.csproj
@@ -16,27 +16,27 @@
     <Content Include="UmbracoPackage\**" Exclude="bin;obj" />
     <Content Include="UmbracoPackageRcl\**" Exclude="bin;obj" />
     <Content Include="UmbracoProject\**" Exclude="bin;obj" />
-    <Content Include="..\src\Umbraco.Web.UI\Program.cs">
+    <Content Include="..\src\Umbraco.Web.UI.New\Program.cs">
       <Link>UmbracoProject\Program.cs</Link>
       <PackagePath>UmbracoProject</PackagePath>
     </Content>
-    <Content Include="..\src\Umbraco.Web.UI\Views\Partials\blocklist\**">
+    <Content Include="..\src\Umbraco.Web.UI.New\Views\Partials\blocklist\**">
       <Link>UmbracoProject\Views\Partials\blocklist\%(RecursiveDir)%(Filename)%(Extension)</Link>
       <PackagePath>UmbracoProject\Views\Partials\blocklist</PackagePath>
     </Content>
-    <Content Include="..\src\Umbraco.Web.UI\Views\Partials\grid\**">
+    <Content Include="..\src\Umbraco.Web.UI.New\Views\Partials\grid\**">
       <Link>UmbracoProject\Views\Partials\grid\%(RecursiveDir)%(Filename)%(Extension)</Link>
       <PackagePath>UmbracoProject\Views\Partials\grid</PackagePath>
     </Content>
-    <Content Include="..\src\Umbraco.Web.UI\Views\Partials\blockgrid\**">
+    <Content Include="..\src\Umbraco.Web.UI.New\Views\Partials\blockgrid\**">
       <Link>UmbracoProject\Views\Partials\blockgrid\%(RecursiveDir)%(Filename)%(Extension)</Link>
       <PackagePath>UmbracoProject\Views\Partials\blockgrid</PackagePath>
     </Content>
-    <Content Include="..\src\Umbraco.Web.UI\Views\_ViewImports.cshtml">
+    <Content Include="..\src\Umbraco.Web.UI.New\Views\_ViewImports.cshtml">
       <Link>UmbracoProject\Views\_ViewImports.cshtml</Link>
       <PackagePath>UmbracoProject\Views</PackagePath>
     </Content>
-    <Content Include="..\src\Umbraco.Web.UI\wwwroot\favicon.ico">
+    <Content Include="..\src\Umbraco.Web.UI.New\wwwroot\favicon.ico">
       <Link>UmbracoProject\wwwroot\favicon.ico</Link>
       <PackagePath>UmbracoProject\wwwroot</PackagePath>
     </Content>
diff --git a/tests/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs b/tests/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs
deleted file mode 100644
index 87d1065d5e..0000000000
--- a/tests/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Tests.Common.Attributes;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-
-namespace Umbraco.Cms.Tests.Integration.TestServerTest.Controllers;
-
-[TestFixture]
-public class EnsureNotAmbiguousActionNameControllerTests : UmbracoTestServerTestBase
-{
-    [Test]
-    [LongRunning]
-    public void EnsureNotAmbiguousActionName()
-    {
-        var intId = 0;
-        var guidId = Guid.Empty;
-        var udiId = Udi.Create(Constants.UdiEntityType.Script, "test");
-
-        Assert.Multiple(() =>
-        {
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetById(intId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetById(guidId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetById(udiId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetNiceUrl(intId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetNiceUrl(guidId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetNiceUrl(udiId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetEmpty("test", 0)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x =>
-                x.GetChildren(intId, string.Empty, 0, 0, "SortOrder", Direction.Ascending, true, string.Empty, string.Empty)));
-
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentTypeController>(x => x.GetById(intId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentTypeController>(x => x.GetById(guidId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentTypeController>(x => x.GetById(udiId)));
-
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DataTypeController>(x => x.GetById(intId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DataTypeController>(x => x.GetById(guidId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DataTypeController>(x => x.GetById(udiId)));
-
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DictionaryController>(x => x.GetById(intId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DictionaryController>(x => x.GetById(guidId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DictionaryController>(x => x.GetById(udiId)));
-
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<EntityController>(x => x.GetPath(intId, UmbracoEntityTypes.Document)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<EntityController>(x => x.GetPath(guidId, UmbracoEntityTypes.Document)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<EntityController>(x => x.GetPath(udiId, UmbracoEntityTypes.Document)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<EntityController>(x => x.GetUrl(intId, UmbracoEntityTypes.Document, null)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetUrl(udiId, null)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<EntityController>(x => x.GetUrlAndAnchors(intId, null)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<EntityController>(x => x.GetUrlAndAnchors(udiId, null)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<EntityController>(x => x.GetById(intId, UmbracoEntityTypes.Document)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<EntityController>(x => x.GetById(guidId, UmbracoEntityTypes.Document)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<EntityController>(x => x.GetById(udiId, UmbracoEntityTypes.Document)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<EntityController>(x => x.GetByIds(new Guid[0], UmbracoEntityTypes.Document)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<EntityController>(x => x.GetByIds(new Udi[0], UmbracoEntityTypes.Document)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<EntityController>(x => x.GetByIds(new int[0], UmbracoEntityTypes.Document)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x =>
-                x.GetPagedChildren(intId, UmbracoEntityTypes.Document, 0, 1, "SortOrder", Direction.Ascending, string.Empty, null)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x =>
-                x.GetPagedChildren(guidId.ToString(), UmbracoEntityTypes.Document, 0, 1, "SortOrder", Direction.Ascending, string.Empty, null)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x =>
-                x.GetPagedChildren(udiId.ToString(), UmbracoEntityTypes.Document, 0, 1, "SortOrder", Direction.Ascending, string.Empty, null)));
-
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<IconController>(x => x.GetIcon(string.Empty)));
-
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaTypeController>(x => x.GetById(intId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaTypeController>(x => x.GetById(guidId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaTypeController>(x => x.GetById(udiId)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<MediaTypeController>(x => x.GetAllowedChildren(intId)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<MediaTypeController>(x => x.GetAllowedChildren(guidId)));
-            EnsureNotAmbiguousActionName(
-                PrepareApiControllerUrl<MediaTypeController>(x => x.GetAllowedChildren(udiId)));
-
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberGroupController>(x => x.GetById(intId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberGroupController>(x => x.GetById(guidId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberGroupController>(x => x.GetById(udiId)));
-
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberTypeController>(x => x.GetById(intId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberTypeController>(x => x.GetById(guidId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberTypeController>(x => x.GetById(udiId)));
-
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<RelationTypeController>(x => x.GetById(intId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<RelationTypeController>(x => x.GetById(guidId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<RelationTypeController>(x => x.GetById(udiId)));
-
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<TemplateController>(x => x.GetById(intId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<TemplateController>(x => x.GetById(guidId)));
-            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<TemplateController>(x => x.GetById(udiId)));
-        });
-    }
-
-    private void EnsureNotAmbiguousActionName(string url) =>
-        Assert.DoesNotThrowAsync(async () => await Client.GetAsync(url));
-}
diff --git a/tests/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs b/tests/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
index dd8bb3608a..570e5aa2ee 100644
--- a/tests/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
+++ b/tests/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
@@ -11,7 +11,7 @@ using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Security;
+using Umbraco.Cms.Web.Common.Security;
 
 namespace Umbraco.Cms.Tests.Integration.TestServerTest;
 
diff --git a/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs b/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
index bb6314aab1..6ca839ed51 100644
--- a/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
+++ b/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
@@ -17,6 +17,7 @@ using Umbraco.Cms.Api.Common.Attributes;
 using Umbraco.Cms.Api.Delivery.Controllers.Content;
 using Umbraco.Cms.Api.Management.Controllers;
 using Umbraco.Cms.Api.Management.Controllers.ModelsBuilder;
+using Umbraco.Cms.Api.Management.DependencyInjection;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Composing;
@@ -28,7 +29,6 @@ using Umbraco.Cms.Persistence.SqlServer;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.DependencyInjection;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.Common.Controllers;
 using Umbraco.Cms.Web.Website.Controllers;
 
@@ -254,13 +254,9 @@ namespace Umbraco.Cms.Tests.Integration.TestServerTest
                 .AddBackOfficeAuthentication()
                 .AddBackOfficeIdentity()
                 .AddMembersIdentity()
-                .AddBackOfficeAuthorizationPolicies(TestAuthHandler.TestAuthenticationScheme)
-                .AddPreviewSupport()
+                // .AddBackOfficeAuthorizationPolicies(TestAuthHandler.TestAuthenticationScheme)
                 .AddMvcAndRazor(mvcBuilding: mvcBuilder =>
                 {
-                    // Adds Umbraco.Web.BackOffice
-                    mvcBuilder.AddApplicationPart(typeof(ContentController).Assembly);
-
                     // Adds Umbraco.Web.Common
                     mvcBuilder.AddApplicationPart(typeof(RenderController).Assembly);
 
@@ -309,7 +305,6 @@ namespace Umbraco.Cms.Tests.Integration.TestServerTest
                 })
                 .WithEndpoints(u =>
                 {
-                    u.UseInstallerEndpoints();
                     u.UseBackOfficeEndpoints();
                     u.UseWebsiteEndpoints();
                 });
diff --git a/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
index c44c908fe8..3c30673414 100644
--- a/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
@@ -5,6 +5,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Api.Management.DependencyInjection;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.IO;
@@ -133,7 +134,6 @@ public abstract class UmbracoIntegrationTest : UmbracoIntegrationTestBase
         services.AddSingleton<IConflictingRouteService, TestConflictingRouteService>();
         services.AddSingleton<IWebProfilerRepository, TestWebProfilerRepository>();
 
-        
         services.AddLogger(webHostEnvironment, Configuration);
 
         // Add it!
@@ -163,8 +163,7 @@ public abstract class UmbracoIntegrationTest : UmbracoIntegrationTestBase
         {
             // TODO: Should these just be called from within AddUmbracoCore/AddWebComponents?
             builder
-                .AddCoreMappingProfiles()
-                .AddWebMappingProfiles();
+                .AddCoreMappingProfiles();
         }
 
         services.AddSignalR();
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs
index ee03065592..fb9e40ea57 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs
@@ -135,168 +135,6 @@ public class UmbracoMapperTests : UmbracoIntegrationTest
         }
     }
 
-    private void AssertDisplayProperty<T>(IContentProperties<T> result, IProperty p)
-        where T : ContentPropertyBasic
-    {
-        var pDto = result.Properties.SingleOrDefault(x => x.Alias == p.Alias);
-        Assert.IsNotNull(pDto);
-
-        // pDto.Alias = p.Alias;
-        // pDto.Description = p.PropertyType.Description;
-        // pDto.Label = p.PropertyType.Name;
-        // pDto.Config = applicationContext.Services.DataTypeService.GetPreValuesByDataTypeId(p.PropertyType.DataTypeDefinitionId);
-    }
-
-    [Test]
-    public void To_Display_Model()
-    {
-        var contentType = _contentTypeBuilder
-            .WithId(0)
-            .AddPropertyGroup()
-            .WithId(1)
-            .AddPropertyType()
-            .Done()
-            .Done()
-            .AddPropertyGroup()
-            .WithId(2)
-            .AddPropertyType()
-            .Done()
-            .Done()
-            .AddPropertyGroup()
-            .WithId(3)
-            .AddPropertyType()
-            .Done()
-            .Done()
-            .AddPropertyGroup()
-            .WithId(4)
-            .AddPropertyType()
-            .Done()
-            .Done()
-            .Build();
-        _contentTypeService.Save(contentType);
-
-        var content = _contentBuilder
-            .WithContentType(contentType)
-            .WithCreatorId(Constants.Security.SuperUserId)
-            .Build();
-
-        var result = _sut.Map<IContent, ContentItemDisplay>(content);
-
-        AssertBasics(result, content);
-
-        var invariantContent = result.Variants.First();
-        foreach (var p in content.Properties)
-        {
-            AssertBasicProperty(invariantContent, p);
-            AssertDisplayProperty(invariantContent, p);
-        }
-
-        Assert.AreEqual(4, invariantContent.Tabs.Count());
-        Assert.IsTrue(invariantContent.Tabs.First().IsActive);
-        Assert.IsTrue(invariantContent.Tabs.Except(new[] { invariantContent.Tabs.First() })
-            .All(x => x.IsActive == false));
-    }
-
-    [Test]
-    public void To_Display_Model_No_Tabs()
-    {
-        var contentType = _contentTypeBuilder
-            .WithId(0)
-            .Build();
-        _contentTypeService.Save(contentType);
-
-        var content = _contentBuilder
-            .WithContentType(contentType)
-            .WithCreatorId(Constants.Security.SuperUserId)
-            .Build();
-
-        var result = _sut.Map<IContent, ContentItemDisplay>(content);
-
-        AssertBasics(result, content);
-
-        var invariantContent = result.Variants.First();
-        foreach (var p in content.Properties)
-        {
-            AssertBasicProperty(invariantContent, p);
-            AssertDisplayProperty(invariantContent, p);
-        }
-
-        Assert.AreEqual(contentType.CompositionPropertyGroups.Count(), invariantContent.Tabs.Count());
-    }
-
-    [Test]
-    public void To_Display_Model_With_Non_Grouped_Properties()
-    {
-        var contentType = _contentTypeBuilder
-            .WithId(0)
-            .AddPropertyType()
-            .WithId(1)
-            .WithValueStorageType(ValueStorageType.Ntext)
-            .WithPropertyEditorAlias("nonGrouped1")
-            .WithName("Non Grouped 1")
-            .Done()
-            .AddPropertyType()
-            .WithId(2)
-            .WithValueStorageType(ValueStorageType.Ntext)
-            .WithPropertyEditorAlias("nonGrouped2")
-            .WithName("Non Grouped 2")
-            .Done()
-            .Build();
-        _contentTypeService.Save(contentType);
-
-        var content = _contentBuilder
-            .WithContentType(contentType)
-            .WithCreatorId(Constants.Security.SuperUserId)
-            .Build();
-
-        var result = _sut.Map<IContent, ContentItemDisplay>(content);
-
-        AssertBasics(result, content);
-
-        var invariantContent = result.Variants.First();
-        foreach (var p in content.Properties)
-        {
-            AssertBasicProperty(invariantContent, p);
-            AssertDisplayProperty(invariantContent, p);
-        }
-
-        Assert.AreEqual(contentType.CompositionPropertyGroups.Count(), invariantContent.Tabs.Count() - 1);
-        Assert.IsTrue(
-            invariantContent.Tabs.Any(x => x.Label == _localizedTextService.Localize("general", "properties")));
-        Assert.AreEqual(
-            2,
-            invariantContent.Tabs.Where(x => x.Label == _localizedTextService.Localize("general", "properties"))
-                .SelectMany(x => x.Properties.Where(p => p.Alias.StartsWith("_umb_") == false)).Count());
-    }
-
-    private void AssertBasics(ContentItemDisplay result, IContent content)
-    {
-        Assert.AreEqual(content.Id, result.Id);
-
-        var ownerId = content.CreatorId;
-        if (ownerId != 0)
-        {
-            Assert.IsNotNull(result.Owner);
-            Assert.AreEqual(Constants.Security.SuperUserId, result.Owner.UserId);
-            Assert.AreEqual("Administrator", result.Owner.Name);
-        }
-        else
-        {
-            Assert.IsNull(result.Owner); // because, 0 is no user
-        }
-
-        var invariantContent = result.Variants.First();
-
-        Assert.AreEqual(content.ParentId, result.ParentId);
-        Assert.AreEqual(content.UpdateDate, invariantContent.UpdateDate);
-        Assert.AreEqual(content.CreateDate, invariantContent.CreateDate);
-        Assert.AreEqual(content.Name, invariantContent.Name);
-        Assert.AreEqual(
-            content.Properties.Count(),
-            ((IContentProperties<ContentPropertyDisplay>)invariantContent).Properties.Count(x =>
-                x.Alias.StartsWith("_umb_") == false));
-    }
-
     private void AssertBasics<T, TPersisted>(ContentItemBasic<T> result, TPersisted content)
         where T : ContentPropertyBasic
         where TPersisted : IContentBase
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Variants/ContentVariantAllowedActionTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Variants/ContentVariantAllowedActionTests.cs
deleted file mode 100644
index 116a770605..0000000000
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Variants/ContentVariantAllowedActionTests.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Attributes;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Tests.Integration.TestServerTest;
-using Language = Umbraco.Cms.Core.Models.Language;
-
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Extensions;
-
-[TestFixture]
-public class ContentVariantAllowedActionTests : UmbracoTestServerTestBase
-{
-    private const string UsIso = "en-US";
-    private const string DkIso = "da-DK";
-    private ILanguageService LanguageService => GetRequiredService<ILanguageService>();
-
-    private IUserService UserService => GetRequiredService<IUserService>();
-
-    private IUmbracoMapper UmbracoMapper => GetRequiredService<IUmbracoMapper>();
-
-    [SetUp]
-    public async Task SetUpTestDate()
-    {
-        var dk = new Language(DkIso, "Danish");
-        await LanguageService.CreateAsync(dk, Constants.Security.SuperUserKey);
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task CanCheckIfUserHasAccessToLanguage()
-    {
-        // setup user groups
-        var user = UserBuilder.CreateUser();
-        UserService.Save(user);
-
-        var userGroup = UserGroupBuilder.CreateUserGroup();
-        var languageId = (await LanguageService.GetAsync(DkIso))?.Id;
-        userGroup.AddAllowedLanguage(languageId!.Value);
-        UserService.Save(userGroup, new []{ user.Id});
-        var currentUser = UserService.GetUserById(user.Id);
-
-        var result = CreateContent(currentUser);
-
-        var danishVariant = result.Variants.FirstOrDefault(x => x.Language!.IsoCode is DkIso);
-        var usVariant = result.Variants.FirstOrDefault(x => x.Language!.IsoCode is UsIso);
-
-        // Right now we duplicate allowedActions if you have access, this should be changed
-        // when we implement granular permissions for languages
-        Assert.AreEqual(danishVariant!.AllowedActions, result.AllowedActions);
-        Assert.AreEqual(usVariant!.AllowedActions, new [] { ActionBrowse.ActionLetter.ToString() });
-    }
-
-    private ContentItemDisplay CreateContent(IUser user)
-    {
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-        var contentType = new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
-        contentTypeService.Save(contentType);
-
-        var rootNode = new ContentBuilder()
-            .WithoutIdentity()
-            .WithContentType(contentType)
-            .WithCultureName(UsIso, "Root")
-            .WithCultureName(DkIso, "Rod")
-            .Build();
-
-        var contentService = GetRequiredService<IContentService>();
-        contentService.Save(rootNode);
-        contentService.Publish(rootNode, new[] { "*" });
-
-        ContentItemDisplay? display = UmbracoMapper.Map<ContentItemDisplay>(rootNode, context =>
-        {
-            context.Items["CurrentUser"] = user;
-        });
-
-        if (display is not null)
-        {
-            display.AllowPreview = display.AllowPreview && rootNode?.Trashed == false &&
-                                   rootNode.ContentType.IsElement == false;
-        }
-
-        return display;
-    }
-}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/BackOfficeExamineSearcherTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/BackOfficeExamineSearcherTests.cs
index 72ea645d9a..f0545a552d 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/BackOfficeExamineSearcherTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/BackOfficeExamineSearcherTests.cs
@@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Api.Management.DependencyInjection;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
@@ -21,7 +20,7 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
-using Umbraco.Cms.Web.BackOffice.Security;
+using Umbraco.Cms.Web.Common.Security;
 
 namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
 
@@ -61,6 +60,8 @@ public class BackOfficeExamineSearcherTests : ExamineBaseTest
 
     private IBackOfficeSignInManager BackOfficeSignInManager => GetRequiredService<IBackOfficeSignInManager>();
 
+    private IHttpContextAccessor HttpContextAccessor => GetRequiredService<IHttpContextAccessor>();
+
     protected override void CustomTestSetup(IUmbracoBuilder builder)
     {
         builder.Services.AddUnique<IBackOfficeExamineSearcher, BackOfficeExamineSearcher>();
@@ -70,8 +71,6 @@ public class BackOfficeExamineSearcherTests : ExamineBaseTest
                 ContentTreeChangeDistributedCacheNotificationHandler>();
         builder.AddNotificationHandler<ContentCacheRefresherNotification, ContentIndexingNotificationHandler>();
         builder.AddExamineIndexes();
-        builder.AddBackOfficeIdentity();
-        BackOfficeAuthBuilderExtensions.AddBackOfficeAuthentication(builder);
         builder.Services.AddHostedService<QueuedHostedService>();
     }
 
@@ -89,6 +88,9 @@ public class BackOfficeExamineSearcherTests : ExamineBaseTest
         var identity =
             await BackOfficeUserStore.FindByIdAsync(userId, CancellationToken.None);
         await BackOfficeSignInManager.SignInAsync(identity, false);
+        var principal = await BackOfficeSignInManager.CreateUserPrincipalAsync(identity);
+        HttpContextAccessor.HttpContext.SetPrincipalForRequest(principal);
+
     }
 
     private async Task<PublishResult> CreateDefaultPublishedContent(string contentName)
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexTests.cs
index 85198d6691..a4258755e8 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexTests.cs
@@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Api.Management.DependencyInjection;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models.ContentEditing;
@@ -20,7 +19,7 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
-using Umbraco.Cms.Web.BackOffice.Security;
+using Umbraco.Cms.Web.Common.Security;
 
 namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
 
@@ -63,6 +62,8 @@ public class ExamineExternalIndexTests : ExamineBaseTest
 
     private ICoreScopeProvider CoreScopeProvider => GetRequiredService<ICoreScopeProvider>();
 
+    private IHttpContextAccessor HttpContextAccessor => GetRequiredService<IHttpContextAccessor>();
+
     protected override void CustomTestSetup(IUmbracoBuilder builder)
     {
         builder.Services.AddUnique<IExamineExternalIndexSearcherTest, ExamineExternalIndexSearcherTest>();
@@ -72,8 +73,6 @@ public class ExamineExternalIndexTests : ExamineBaseTest
                 ContentTreeChangeDistributedCacheNotificationHandler>();
         builder.AddNotificationHandler<ContentCacheRefresherNotification, ContentIndexingNotificationHandler>();
         builder.AddExamineIndexes();
-        builder.AddBackOfficeIdentity();
-        BackOfficeAuthBuilderExtensions.AddBackOfficeAuthentication(builder);
         builder.Services.AddHostedService<QueuedHostedService>();
     }
 
@@ -91,6 +90,8 @@ public class ExamineExternalIndexTests : ExamineBaseTest
         var identity =
             await BackOfficeUserStore.FindByIdAsync(userId, CancellationToken.None);
         await BackOfficeSignInManager.SignInAsync(identity, false);
+        var principal = await BackOfficeSignInManager.CreateUserPrincipalAsync(identity);
+        HttpContextAccessor.HttpContext.SetPrincipalForRequest(principal);
     }
 
     [Test]
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs
deleted file mode 100644
index 550bb0356a..0000000000
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Net;
-using System.Threading.Tasks;
-using NUnit.Framework;
-using Umbraco.Cms.Tests.Common.Attributes;
-using Umbraco.Cms.Tests.Integration.TestServerTest;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers;
-
-[TestFixture]
-public class BackOfficeAssetsControllerTests : UmbracoTestServerTestBase
-{
-    [Test]
-    [LongRunning]
-    public async Task EnsureSuccessStatusCode()
-    {
-        // Arrange
-        var url = PrepareApiControllerUrl<BackOfficeAssetsController>(x => x.GetSupportedLocales());
-
-        // Act
-        var response = await Client.GetAsync(url);
-
-        // Assert
-        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-    }
-}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
deleted file mode 100644
index ed72b8e73e..0000000000
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
+++ /dev/null
@@ -1,817 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Net;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Attributes;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Tests.Integration.TestServerTest;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Formatters;
-
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers;
-
-[TestFixture]
-public class ContentControllerTests : UmbracoTestServerTestBase
-{
-    private const string UsIso = "en-US";
-    private const string DkIso = "da-DK";
-
-    /// <summary>
-    ///     Returns 404 if the content wasn't found based on the ID specified
-    /// </summary>
-    [Test]
-    [LongRunning]
-    public async Task PostSave_Validate_Existing_Content()
-    {
-        var languageService = GetRequiredService<ILanguageService>();
-
-        // Add another language
-        await languageService.CreateAsync(
-            new LanguageBuilder()
-            .WithCultureInfo(DkIso)
-            .WithIsDefault(false)
-            .Build(),
-            Constants.Security.SuperUserKey);
-
-        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-
-        var contentService = GetRequiredService<IContentService>();
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-
-        var contentType = new ContentTypeBuilder()
-            .WithId(0)
-            .AddPropertyType()
-            .WithAlias("title")
-            .WithValueStorageType(ValueStorageType.Integer)
-            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-            .WithName("Title")
-            .Done()
-            .WithContentVariation(ContentVariation.Nothing)
-            .Build();
-
-        contentTypeService.Save(contentType);
-
-        var content = new ContentBuilder()
-            .WithId(0)
-            .WithName("Invariant")
-            .WithContentType(contentType)
-            .AddPropertyData()
-            .WithKeyValue("title", "Cool invariant title")
-            .Done()
-            .Build();
-        contentService.Save(content);
-        contentService.Publish(content, Array.Empty<string>());
-
-        var model = new ContentItemSaveBuilder()
-            .WithContent(content)
-            .WithId(-1337) // HERE We overwrite the Id, so we don't expect to find it on the server
-            .Build();
-
-        // Act
-        var response =
-            await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
-
-        // Assert
-        Assert.AreEqual(HttpStatusCode.NotFound, response.StatusCode);
-        //// Assert.AreEqual(")]}',\n{\"Message\":\"content was not found\"}", response.Item1.Content.ReadAsStringAsync().Result);
-        ////
-        ////             //var obj = JsonConvert.DeserializeObject<PagedResult<UserDisplay>>(response.Item2);
-        ////             //Assert.AreEqual(0, obj.TotalItems);
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task PostSave_Validate_At_Least_One_Variant_Flagged_For_Saving()
-    {
-        var languageService = GetRequiredService<ILanguageService>();
-
-        // Add another language
-        await languageService.CreateAsync(
-            new LanguageBuilder()
-            .WithCultureInfo(DkIso)
-            .WithIsDefault(false)
-            .Build(),
-            Constants.Security.SuperUserKey);
-
-        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-
-        var contentType = new ContentTypeBuilder()
-            .WithId(0)
-            .AddPropertyType()
-            .WithAlias("title")
-            .WithValueStorageType(ValueStorageType.Integer)
-            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-            .WithName("Title")
-            .Done()
-            .WithContentVariation(ContentVariation.Nothing)
-            .Build();
-
-        contentTypeService.Save(contentType);
-
-        var contentService = GetRequiredService<IContentService>();
-        var content = new ContentBuilder()
-            .WithId(0)
-            .WithName("Invariant")
-            .WithContentType(contentType)
-            .AddPropertyData()
-            .WithKeyValue("title", "Cool invariant title")
-            .Done()
-            .Build();
-        contentService.Save(content);
-        contentService.Publish(content, Array.Empty<string>());
-
-        var model = new ContentItemSaveBuilder()
-            .WithContent(content)
-            .Build();
-
-        // HERE we force the test to fail
-        model.Variants = model.Variants.Select(x =>
-        {
-            x.Save = false;
-            return x;
-        });
-
-        // Act
-        var response =
-            await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
-
-        // Assert
-        var body = await response.Content.ReadAsStringAsync();
-
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.NotFound, response.StatusCode);
-            Assert.AreEqual(
-                AngularJsonMediaTypeFormatter.XsrfPrefix + "{\"Message\":\"No variants flagged for saving\"}", body);
-        });
-    }
-
-    /// <summary>
-    ///     Returns 404 if any of the posted properties dont actually exist
-    /// </summary>
-    [Test]
-    [LongRunning]
-    public async Task PostSave_Validate_Properties_Exist()
-    {
-        var languageService = GetRequiredService<ILanguageService>();
-
-        // Add another language
-        await languageService.CreateAsync(
-            new LanguageBuilder()
-            .WithCultureInfo(DkIso)
-            .WithIsDefault(false)
-            .Build(),
-            Constants.Security.SuperUserKey);
-
-        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-
-        var contentService = GetRequiredService<IContentService>();
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-
-        var contentType = new ContentTypeBuilder()
-            .WithId(0)
-            .AddPropertyType()
-            .WithAlias("title")
-            .WithValueStorageType(ValueStorageType.Integer)
-            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-            .WithName("Title")
-            .Done()
-            .WithContentVariation(ContentVariation.Nothing)
-            .Build();
-
-        contentTypeService.Save(contentType);
-
-        var content = new ContentBuilder()
-            .WithId(0)
-            .WithName("Invariant")
-            .WithContentType(contentType)
-            .AddPropertyData()
-            .WithKeyValue("title", "Cool invariant title")
-            .Done()
-            .Build();
-        contentService.Save(content);
-        contentService.Publish(content, Array.Empty<string>());
-
-        var model = new ContentItemSaveBuilder()
-            .WithId(content.Id)
-            .WithContentTypeAlias(content.ContentType.Alias)
-            .AddVariant()
-            .AddProperty()
-            .WithId(2)
-            .WithAlias("doesntexists")
-            .WithValue("Whatever")
-            .Done()
-            .Done()
-            .Build();
-
-        // Act
-        var response =
-            await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
-
-        // Assert
-        var body = await response.Content.ReadAsStringAsync();
-
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-
-        Assert.AreEqual(HttpStatusCode.NotFound, response.StatusCode);
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task PostSave_Simple_Invariant()
-    {
-        var languageService = GetRequiredService<ILanguageService>();
-
-        // Add another language
-        await languageService.CreateAsync(
-            new LanguageBuilder()
-            .WithCultureInfo(DkIso)
-            .WithIsDefault(false)
-            .Build(),
-            Constants.Security.SuperUserKey);
-
-        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-
-        var contentService = GetRequiredService<IContentService>();
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-
-        var contentType = new ContentTypeBuilder()
-            .WithId(0)
-            .AddPropertyType()
-            .WithAlias("title")
-            .WithValueStorageType(ValueStorageType.Integer)
-            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-            .WithName("Title")
-            .Done()
-            .WithContentVariation(ContentVariation.Nothing)
-            .Build();
-
-        contentTypeService.Save(contentType);
-
-        var content = new ContentBuilder()
-            .WithId(0)
-            .WithName("Invariant")
-            .WithContentType(contentType)
-            .AddPropertyData()
-            .WithKeyValue("title", "Cool invariant title")
-            .Done()
-            .Build();
-        contentService.Save(content);
-        contentService.Publish(content, Array.Empty<string>());
-        var model = new ContentItemSaveBuilder()
-            .WithContent(content)
-            .Build();
-
-        // Act
-        var response =
-            await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
-
-        // Assert
-        var body = await response.Content.ReadAsStringAsync();
-
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode, body);
-            var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-            Assert.AreEqual(1, display.Variants.Count());
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task PostSave_Validate_Empty_Name()
-    {
-        var languageService = GetRequiredService<ILanguageService>();
-
-        // Add another language
-        await languageService.CreateAsync(
-            new LanguageBuilder()
-            .WithCultureInfo(DkIso)
-            .WithIsDefault(false)
-            .Build(),
-            Constants.Security.SuperUserKey);
-
-        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-
-        var contentService = GetRequiredService<IContentService>();
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-
-        var contentType = new ContentTypeBuilder()
-            .WithId(0)
-            .AddPropertyType()
-            .WithAlias("title")
-            .WithValueStorageType(ValueStorageType.Integer)
-            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-            .WithName("Title")
-            .Done()
-            .WithContentVariation(ContentVariation.Nothing)
-            .Build();
-
-        contentTypeService.Save(contentType);
-
-        var content = new ContentBuilder()
-            .WithId(0)
-            .WithName("Invariant")
-            .WithContentType(contentType)
-            .AddPropertyData()
-            .WithKeyValue("title", "Cool invariant title")
-            .Done()
-            .Build();
-        contentService.Save(content);
-        contentService.Publish(content, Array.Empty<string>());
-
-        content.Name = null; // Removes the name of one of the variants to force an error
-        var model = new ContentItemSaveBuilder()
-            .WithContent(content)
-            .Build();
-
-        // Act
-        var response =
-            await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
-
-        // Assert
-        var body = await response.Content.ReadAsStringAsync();
-
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.BadRequest, response.StatusCode);
-            var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-            Assert.AreEqual(1, display.Errors.Count(), string.Join(",", display.Errors));
-            CollectionAssert.Contains(display.Errors.Keys, "Variants[0].Name");
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task PostSave_Validate_Variants_Empty_Name()
-    {
-        var languageService = GetRequiredService<ILanguageService>();
-
-        // Add another language
-        await languageService.CreateAsync(
-            new LanguageBuilder()
-            .WithCultureInfo(DkIso)
-            .WithIsDefault(false)
-            .Build(),
-            Constants.Security.SuperUserKey);
-
-        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-
-        var contentService = GetRequiredService<IContentService>();
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-
-        var contentType = new ContentTypeBuilder()
-            .WithId(0)
-            .AddPropertyType()
-            .WithAlias("title")
-            .WithValueStorageType(ValueStorageType.Integer)
-            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-            .WithName("Title")
-            .Done()
-            .WithContentVariation(ContentVariation.Culture)
-            .Build();
-
-        contentTypeService.Save(contentType);
-
-        var content = new ContentBuilder()
-            .WithId(0)
-            .WithCultureName(UsIso, "English")
-            .WithCultureName(DkIso, "Danish")
-            .WithContentType(contentType)
-            .AddPropertyData()
-            .WithKeyValue("title", "Cool invariant title")
-            .Done()
-            .Build();
-        contentService.Save(content);
-        contentService.Publish(content, content.AvailableCultures.ToArray());
-
-        content.CultureInfos[0].Name = null; // Removes the name of one of the variants to force an error
-        var model = new ContentItemSaveBuilder()
-            .WithContent(content)
-            .Build();
-
-        // Act
-        var response =
-            await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
-
-        // Assert
-        var body = await response.Content.ReadAsStringAsync();
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.BadRequest, response.StatusCode);
-            var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-            Assert.AreEqual(2, display.Errors.Count());
-            CollectionAssert.Contains(display.Errors.Keys, "Variants[0].Name");
-            CollectionAssert.Contains(display.Errors.Keys, "_content_variant_en-US_null_");
-        });
-    }
-
-    [Retry(5)] // TODO make this test non-flaky.
-    [Test]
-    [LongRunning]
-    public async Task PostSave_Validates_Domains_Exist()
-    {
-        var languageService = GetRequiredService<ILanguageService>();
-        await languageService.CreateAsync(
-            new LanguageBuilder()
-            .WithCultureInfo(DkIso)
-            .WithIsDefault(false)
-            .Build(),
-            Constants.Security.SuperUserKey);
-
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-        var contentType = new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
-        contentTypeService.Save(contentType);
-
-        var content = new ContentBuilder()
-            .WithId(1)
-            .WithContentType(contentType)
-            .WithCultureName(UsIso, "Root")
-            .WithCultureName(DkIso, "Rod")
-            .Build();
-
-        var model = new ContentItemSaveBuilder()
-            .WithContent(content)
-            .WithAction(ContentSaveAction.PublishNew)
-            .Build();
-
-        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-
-        var response =
-            await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
-
-        var body = await response.Content.ReadAsStringAsync();
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-        var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-
-        var localizedTextService = GetRequiredService<ILocalizedTextService>();
-        var expectedMessage = localizedTextService.Localize("speechBubbles", "publishWithNoDomains");
-
-        Assert.Multiple(() =>
-        {
-            Assert.IsNotNull(display);
-            Assert.AreEqual(1, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-            Assert.AreEqual(
-                expectedMessage,
-                display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task PostSave_Validates_All_Ancestor_Cultures_Are_Considered()
-    {
-        var sweIso = "sv-SE";
-        var languageService = GetRequiredService<ILanguageService>();
-        //Create 2 new languages
-        await languageService.CreateAsync(
-            new LanguageBuilder()
-            .WithCultureInfo(DkIso)
-            .WithIsDefault(false)
-            .Build(),
-            Constants.Security.SuperUserKey);
-
-        await languageService.CreateAsync(
-            new LanguageBuilder()
-            .WithCultureInfo(sweIso)
-            .WithIsDefault(false)
-            .Build(),
-            Constants.Security.SuperUserKey);
-
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-        var contentType = new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
-        contentTypeService.Save(contentType);
-
-        var content = new ContentBuilder()
-            .WithoutIdentity()
-            .WithContentType(contentType)
-            .WithCultureName(UsIso, "Root")
-            .Build();
-
-        var contentService = GetRequiredService<IContentService>();
-        contentService.Save(content);
-        contentService.Publish(content, content.AvailableCultures.ToArray());
-
-        var childContent = new ContentBuilder()
-            .WithoutIdentity()
-            .WithContentType(contentType)
-            .WithParent(content)
-            .WithCultureName(DkIso, "Barn")
-            .WithCultureName(UsIso, "Child")
-            .Build();
-
-        contentService.Save(childContent);
-        contentService.Publish(childContent, content.AvailableCultures.ToArray());
-
-        var grandChildContent = new ContentBuilder()
-            .WithoutIdentity()
-            .WithContentType(contentType)
-            .WithParent(childContent)
-            .WithCultureName(sweIso, "Bjarn")
-            .Build();
-
-
-        var model = new ContentItemSaveBuilder()
-            .WithContent(grandChildContent)
-            .WithParentId(childContent.Id)
-            .WithAction(ContentSaveAction.PublishNew)
-            .Build();
-
-        var enLanguage = await languageService.GetAsync(UsIso);
-        var dkLanguage = await languageService.GetAsync(DkIso);
-
-        var domainService = GetRequiredService<IDomainService>();
-
-        await domainService.UpdateDomainsAsync(
-            content.Key,
-            new DomainsUpdateModel
-            {
-                Domains = new[] { new DomainModel { DomainName = "/en", IsoCode = enLanguage.IsoCode } }
-            });
-
-        await domainService.UpdateDomainsAsync(
-            childContent.Key,
-            new DomainsUpdateModel
-            {
-                Domains = new[] { new DomainModel { DomainName = "/dk", IsoCode = dkLanguage.IsoCode } }
-            });
-
-        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-
-        var result = JsonConvert.SerializeObject(model);
-        var response =
-            await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
-
-        var body = await response.Content.ReadAsStringAsync();
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-        var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-
-
-        var localizedTextService = GetRequiredService<ILocalizedTextService>();
-        var expectedMessage =
-            localizedTextService.Localize("speechBubbles", "publishWithMissingDomain", new[] {"sv-SE"});
-
-        Assert.Multiple(() =>
-        {
-            Assert.NotNull(display);
-            Assert.AreEqual(1, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-            Assert.AreEqual(
-                expectedMessage,
-                display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task PostSave_Validates_All_Cultures_Has_Domains()
-    {
-        var languageService = GetRequiredService<ILanguageService>();
-        await languageService.CreateAsync(
-            new LanguageBuilder()
-            .WithCultureInfo(DkIso)
-            .WithIsDefault(false)
-            .Build(),
-            Constants.Security.SuperUserKey);
-
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-        var contentType = new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
-        contentTypeService.Save(contentType);
-
-        var content = new ContentBuilder()
-            .WithoutIdentity()
-            .WithContentType(contentType)
-            .WithCultureName(UsIso, "Root")
-            .WithCultureName(DkIso, "Rod")
-            .Build();
-
-        var contentService = GetRequiredService<IContentService>();
-        contentService.Save(content);
-
-        var model = new ContentItemSaveBuilder()
-            .WithContent(content)
-            .WithAction(ContentSaveAction.Publish)
-            .Build();
-
-        var dkLanguage = await languageService.GetAsync(DkIso);
-        var domainService = GetRequiredService<IDomainService>();
-
-        await domainService.UpdateDomainsAsync(
-            content.Key,
-            new DomainsUpdateModel
-            {
-                Domains = new[] { new DomainModel { DomainName = "/", IsoCode = dkLanguage.IsoCode } }
-            });
-
-        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-
-        var response =
-            await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
-
-        var body = await response.Content.ReadAsStringAsync();
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-        var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-
-
-        var localizedTextService = GetRequiredService<ILocalizedTextService>();
-        var expectedMessage = localizedTextService.Localize("speechBubbles", "publishWithMissingDomain", new[] {UsIso});
-
-        Assert.Multiple(() =>
-        {
-            Assert.NotNull(display);
-            Assert.AreEqual(1, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-            Assert.AreEqual(
-                expectedMessage,
-                display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task PostSave_Checks_Ancestors_For_Domains()
-    {
-        var languageService = GetRequiredService<ILanguageService>();
-        await languageService.CreateAsync(
-            new LanguageBuilder()
-            .WithCultureInfo(DkIso)
-            .WithIsDefault(false)
-            .Build(),
-            Constants.Security.SuperUserKey);
-
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-        var contentType = new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
-        contentTypeService.Save(contentType);
-
-        var rootNode = new ContentBuilder()
-            .WithoutIdentity()
-            .WithContentType(contentType)
-            .WithCultureName(UsIso, "Root")
-            .WithCultureName(DkIso, "Rod")
-            .Build();
-
-        var contentService = GetRequiredService<IContentService>();
-        contentService.Save(rootNode);
-        contentService.Publish(rootNode, rootNode.AvailableCultures.ToArray());
-
-        var childNode = new ContentBuilder()
-            .WithoutIdentity()
-            .WithParent(rootNode)
-            .WithContentType(contentType)
-            .WithCultureName(DkIso, "Barn")
-            .WithCultureName(UsIso, "Child")
-            .Build();
-
-        contentService.Save(childNode);
-        contentService.Publish(childNode, childNode.AvailableCultures.ToArray());
-
-        var grandChild = new ContentBuilder()
-            .WithoutIdentity()
-            .WithParent(childNode)
-            .WithContentType(contentType)
-            .WithCultureName(DkIso, "BarneBarn")
-            .WithCultureName(UsIso, "GrandChild")
-            .Build();
-
-        contentService.Save(grandChild);
-
-        var dkLanguage = await languageService.GetAsync(DkIso);
-        var usLanguage = await languageService.GetAsync(UsIso);
-        var domainService = GetRequiredService<IDomainService>();
-
-        await domainService.UpdateDomainsAsync(
-            rootNode.Key,
-            new DomainsUpdateModel
-            {
-                Domains = new[] { new DomainModel { DomainName = "/", IsoCode = dkLanguage.IsoCode } }
-            });
-
-        await domainService.UpdateDomainsAsync(
-            childNode.Key,
-            new DomainsUpdateModel
-            {
-                Domains = new[] { new DomainModel { DomainName = "/en", IsoCode = usLanguage.IsoCode } }
-            });
-
-        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-
-        var model = new ContentItemSaveBuilder()
-            .WithContent(grandChild)
-            .WithAction(ContentSaveAction.Publish)
-            .Build();
-
-        var response =
-            await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
-
-        var body = await response.Content.ReadAsStringAsync();
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-        var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-
-        Assert.Multiple(() =>
-        {
-            Assert.NotNull(display);
-            // Assert all is good, a success notification for each culture published and no warnings.
-            Assert.AreEqual(2, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Success));
-            Assert.AreEqual(0, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-        });
-    }
-
-    // FIXME: I've commented out this tests, since it should be relevant for new backoffice
-    // This is because in new backoffice we use the temporary file service to handle drag'n'dropped images
-    // see RichTextEditorPastedImages.FindAndPersistPastedTempImagesAsync for more information.
-    // [TestCase(
-    //     @"<p><img alt src=""data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7""></p>",
-    //     false)]
-    // [TestCase(
-    //     @"<p><img src=""data:image/svg+xml;utf8,<svg viewBox=""0 0 70 74"" fill=""none"" xmlns=""http://www.w3.org/2000/svg""><rect width=""100%"" height=""100%"" fill=""black""/></svg>""></p>",
-    //     false)]
-    // [TestCase(
-    //     @"<p><img alt src=""/some/random/image.jpg""></p><p><img alt src=""data:image/jpg;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7""></p>",
-    //     false)]
-    // [TestCase(
-    //     @"<p><img alt src=""data:image/notallowedextension;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7""></p>",
-    //     true)]
-    // [LongRunning]
-    // public async Task PostSave_Simple_RichText_With_Base64(string html, bool shouldHaveDataUri)
-    // {
-    //     var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-    //
-    //     var dataTypeService = GetRequiredService<IDataTypeService>();
-    //     var contentService = GetRequiredService<IContentService>();
-    //     var contentTypeService = GetRequiredService<IContentTypeService>();
-    //
-    //     var dataType = new DataTypeBuilder()
-    //         .WithId(0)
-    //         .WithoutIdentity()
-    //         .WithDatabaseType(ValueStorageType.Ntext)
-    //         .AddEditor()
-    //         .WithAlias(Constants.PropertyEditors.Aliases.TinyMce)
-    //         .Done()
-    //         .Build();
-    //
-    //     dataTypeService.Save(dataType);
-    //
-    //     var contentType = new ContentTypeBuilder()
-    //         .WithId(0)
-    //         .AddPropertyType()
-    //         .WithDataTypeId(dataType.Id)
-    //         .WithAlias("richText")
-    //         .WithName("Rich Text")
-    //         .Done()
-    //         .WithContentVariation(ContentVariation.Nothing)
-    //         .Build();
-    //
-    //     contentTypeService.Save(contentType);
-    //
-    //     var content = new ContentBuilder()
-    //         .WithId(0)
-    //         .WithName("Invariant")
-    //         .WithContentType(contentType)
-    //         .AddPropertyData()
-    //         .WithKeyValue("richText", html)
-    //         .Done()
-    //         .Build();
-    //     contentService.SaveAndPublish(content);
-    //     var model = new ContentItemSaveBuilder()
-    //         .WithContent(content)
-    //         .Build();
-    //
-    //     // Act
-    //     var response =
-    //         await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
-    //
-    //     // Assert
-    //     var body = await response.Content.ReadAsStringAsync();
-    //
-    //     body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-    //
-    //     Assert.Multiple(() =>
-    //     {
-    //         Assert.AreEqual(HttpStatusCode.OK, response.StatusCode, body);
-    //         var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-    //         var bodyText = display.Variants.FirstOrDefault()?.Tabs.FirstOrDefault()?.Properties
-    //             ?.FirstOrDefault(x => x.Alias.Equals("richText"))?.Value?.ToString();
-    //         Assert.NotNull(bodyText);
-    //
-    //         var containsDataUri = bodyText.Contains("data:image");
-    //         if (shouldHaveDataUri)
-    //         {
-    //             Assert.True(containsDataUri, $"Data URIs were expected to be found in the body: {bodyText}");
-    //         } else {
-    //             Assert.False(containsDataUri, $"Data URIs were not expected to be found in the body: {bodyText}");
-    //         }
-    //     });
-    // }
-}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/DataTypeControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/DataTypeControllerTests.cs
deleted file mode 100644
index ed27a51aed..0000000000
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/DataTypeControllerTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System.Threading.Tasks;
-using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Attributes;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Tests.Integration.TestServerTest;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Formatters;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers;
-
-[TestFixture]
-public class DataTypeControllerTests : UmbracoTestServerTestBase
-{
-    [Test]
-    [TestCase(true)]
-    [TestCase(false)]
-    [LongRunning]
-    public async Task Has_Values_Returns_Correct_Values(bool expectHasValues)
-    {
-        var dataTypeService = GetRequiredService<IDataTypeService>();
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-        var contentService = GetRequiredService<IContentService>();
-        var serializer = GetRequiredService<IJsonSerializer>();
-
-        var dataType = new DataTypeBuilder()
-            .WithId(0)
-            .WithoutIdentity()
-            .WithDatabaseType(ValueStorageType.Ntext)
-            .Build();
-
-        dataTypeService.Save(dataType);
-
-        var contentType = new ContentTypeBuilder()
-            .WithId(0)
-            .AddPropertyType()
-            .WithDataTypeId(dataType.Id)
-            .WithName("Test")
-            .WithAlias("test")
-            .Done()
-            .WithContentVariation(ContentVariation.Nothing)
-            .Build();
-
-        contentTypeService.Save(contentType);
-
-        if (expectHasValues)
-        {
-            var content = new ContentBuilder()
-                .WithId(0)
-                .WithContentType(contentType)
-                .AddPropertyData()
-                .WithKeyValue("test", "Some Value")
-                .Done()
-                .Build();
-
-            contentService.Save(content);
-        }
-
-        var url = PrepareApiControllerUrl<DataTypeController>(x => x.HasValues(dataType.Id));
-
-        var response = await Client.GetAsync(url);
-
-        var body = await response.Content.ReadAsStringAsync();
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-
-        var result = serializer.Deserialize<DataTypeHasValuesDisplay>(body);
-
-        Assert.Multiple(() =>
-        {
-            Assert.IsNotNull(result);
-            Assert.AreEqual(dataType.Id, result.Id);
-            Assert.AreEqual(expectHasValues, result.HasValues);
-        });
-    }
-}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/EntityControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/EntityControllerTests.cs
deleted file mode 100644
index 85bdaf1159..0000000000
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/EntityControllerTests.cs
+++ /dev/null
@@ -1,412 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Net.Http.Json;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Attributes;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Tests.Integration.TestServerTest;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Formatters;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers;
-
-[TestFixture]
-public class EntityControllerTests : UmbracoTestServerTestBase
-{
-    private IScopeProvider ScopeProvider => GetRequiredService<IScopeProvider>();
-
-    [Test]
-    [LongRunning]
-    public async Task GetUrlsByIds_MediaWithIntegerIds_ReturnsValidMap()
-    {
-        var mediaTypeService = Services.GetRequiredService<IMediaTypeService>();
-        var mediaService = Services.GetRequiredService<IMediaService>();
-
-        var mediaItems = new List<Media>();
-
-        using (ScopeProvider.CreateScope(autoComplete: true))
-        {
-            var mediaType = mediaTypeService.Get("image");
-            mediaTypeService.Save(mediaType);
-
-            mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
-            mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
-
-            foreach (var media in mediaItems)
-            {
-                mediaService.Save(media);
-            }
-        }
-
-        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Media };
-
-        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-        var payload = new { ids = new[] { mediaItems[0].Id, mediaItems[1].Id } };
-
-        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-        // skip pointless un-parseable cruft.
-        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-        var results = await response.Content.ReadFromJsonAsync<IDictionary<int, string>>();
-
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            Assert.IsTrue(results![payload.ids[0]].StartsWith("/media"));
-            Assert.IsTrue(results![payload.ids[1]].StartsWith("/media"));
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task GetUrlsByIds_Media_ReturnsEmptyStringsInMapForUnknownItems()
-    {
-        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Media };
-
-        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-        var payload = new { ids = new[] { 1, 2 } };
-
-        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-        // skip pointless un-parseable cruft.
-        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-        var results = await response.Content.ReadFromJsonAsync<IDictionary<int, string>>();
-
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            Assert.That(results!.Keys.Count, Is.EqualTo(2));
-            Assert.AreEqual(results![payload.ids[0]], string.Empty);
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task GetUrlsByIds_MediaWithGuidIds_ReturnsValidMap()
-    {
-        var mediaTypeService = Services.GetRequiredService<IMediaTypeService>();
-        var mediaService = Services.GetRequiredService<IMediaService>();
-
-        var mediaItems = new List<Media>();
-
-        using (ScopeProvider.CreateScope(autoComplete: true))
-        {
-            var mediaType = mediaTypeService.Get("image");
-            mediaTypeService.Save(mediaType);
-
-            mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
-            mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
-
-            foreach (var media in mediaItems)
-            {
-                mediaService.Save(media);
-            }
-        }
-
-        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Media };
-
-        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-        var payload = new { ids = new[] { mediaItems[0].Key.ToString(), mediaItems[1].Key.ToString() } };
-
-        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-        // skip pointless un-parseable cruft.
-        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-        var results = await response.Content.ReadFromJsonAsync<IDictionary<string, string>>();
-
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            Assert.IsTrue(results![payload.ids[0]].StartsWith("/media"));
-            Assert.IsTrue(results![payload.ids[1]].StartsWith("/media"));
-        });
-    }
-
-    [Test]
-    public async Task GetUrlsByIds_MediaWithUdiIds_ReturnsValidMap()
-    {
-        var mediaTypeService = Services.GetRequiredService<IMediaTypeService>();
-        var mediaService = Services.GetRequiredService<IMediaService>();
-
-        var mediaItems = new List<Media>();
-
-        using (ScopeProvider.CreateScope(autoComplete: true))
-        {
-            var mediaType = mediaTypeService.Get("image");
-            mediaTypeService.Save(mediaType);
-
-            mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
-            mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
-
-            foreach (var media in mediaItems)
-            {
-                mediaService.Save(media);
-            }
-        }
-
-        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Media };
-
-        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-        var payload = new { ids = new[] { mediaItems[0].GetUdi().ToString(), mediaItems[1].GetUdi().ToString() } };
-
-        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-        // skip pointless un-parseable cruft.
-        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-        var results = await response.Content.ReadFromJsonAsync<IDictionary<string, string>>();
-
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            Assert.IsTrue(results![payload.ids[0]].StartsWith("/media"));
-            Assert.IsTrue(results![payload.ids[1]].StartsWith("/media"));
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task GetUrlsByIds_Documents_ReturnsHashesInMapForUnknownItems()
-    {
-        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Document };
-
-        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-        var payload = new { ids = new[] { 1, 2 } };
-
-        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-        // skip pointless un-parseable cruft.
-        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-        var results = await response.Content.ReadFromJsonAsync<IDictionary<int, string>>();
-
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            Assert.That(results!.Keys.Count, Is.EqualTo(2));
-            Assert.AreEqual(results![payload.ids[0]], "#");
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task GetUrlsByIds_DocumentWithIntIds_ReturnsValidMap()
-    {
-        var contentTypeService = Services.GetRequiredService<IContentTypeService>();
-        var contentService = Services.GetRequiredService<IContentService>();
-
-        var contentItems = new List<IContent>();
-
-        using (ScopeProvider.CreateScope(autoComplete: true))
-        {
-            IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentTypeService.Save(contentType);
-
-            var builder = new ContentBuilder()
-                .WithContentType(contentType);
-
-            var root = builder.WithName("foo").Build();
-            contentService.Save(root);
-            contentService.Publish(root, root.AvailableCultures.ToArray());
-
-            contentItems.Add(builder.WithParent(root).WithName("bar").Build());
-            contentItems.Add(builder.WithParent(root).WithName("baz").Build());
-
-            foreach (var content in contentItems)
-            {
-                contentService.Save(content);
-                contentService.Publish(content, content.AvailableCultures.ToArray());
-            }
-        }
-
-        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Document };
-
-        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-        var payload = new { ids = new[] { contentItems[0].Id, contentItems[1].Id } };
-
-        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-        // skip pointless un-parseable cruft.
-        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-        var results = await response.Content.ReadFromJsonAsync<IDictionary<int, string>>();
-
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            Assert.IsTrue(results![payload.ids[0]].StartsWith("/bar"));
-            Assert.IsTrue(results![payload.ids[1]].StartsWith("/baz"));
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task GetUrlsByIds_DocumentWithGuidIds_ReturnsValidMap()
-    {
-        var contentTypeService = Services.GetRequiredService<IContentTypeService>();
-        var contentService = Services.GetRequiredService<IContentService>();
-
-        var contentItems = new List<IContent>();
-
-        using (ScopeProvider.CreateScope(autoComplete: true))
-        {
-            IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentTypeService.Save(contentType);
-
-            var builder = new ContentBuilder()
-                .WithContentType(contentType);
-
-            var root = builder.WithName("foo").Build();
-            contentService.Save(root);
-            contentService.Publish(root, root.AvailableCultures.ToArray());
-
-            contentItems.Add(builder.WithParent(root).WithName("bar").Build());
-            contentItems.Add(builder.WithParent(root).WithName("baz").Build());
-
-            foreach (var content in contentItems)
-            {
-                contentService.Save(content);
-                contentService.Publish(content, content.AvailableCultures.ToArray());
-            }
-        }
-
-        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Document };
-
-        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-        var payload = new { ids = new[] { contentItems[0].Key.ToString(), contentItems[1].Key.ToString() } };
-
-        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-        // skip pointless un-parseable cruft.
-        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-        var results = await response.Content.ReadFromJsonAsync<IDictionary<string, string>>();
-
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            Assert.IsTrue(results![payload.ids[0]].StartsWith("/bar"));
-            Assert.IsTrue(results![payload.ids[1]].StartsWith("/baz"));
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task GetUrlsByIds_DocumentWithUdiIds_ReturnsValidMap()
-    {
-        var contentTypeService = Services.GetRequiredService<IContentTypeService>();
-        var contentService = Services.GetRequiredService<IContentService>();
-
-        var contentItems = new List<IContent>();
-
-        using (ScopeProvider.CreateScope(autoComplete: true))
-        {
-            IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentTypeService.Save(contentType);
-
-            var builder = new ContentBuilder()
-                .WithContentType(contentType);
-
-            var root = builder.WithName("foo").Build();
-            contentService.Save(root);
-            contentService.Publish(root, root.AvailableCultures.ToArray());
-
-            contentItems.Add(builder.WithParent(root).WithName("bar").Build());
-            contentItems.Add(builder.WithParent(root).WithName("baz").Build());
-
-            foreach (var content in contentItems)
-            {
-                contentService.Save(content);
-                contentService.Publish(content, content.AvailableCultures.ToArray());
-            }
-        }
-
-        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Document };
-
-        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-        var payload = new { ids = new[] { contentItems[0].GetUdi().ToString(), contentItems[1].GetUdi().ToString() } };
-
-        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-        // skip pointless un-parseable cruft.
-        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-        var results = await response.Content.ReadFromJsonAsync<IDictionary<string, string>>();
-
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            Assert.IsTrue(results![payload.ids[0]].StartsWith("/bar"));
-            Assert.IsTrue(results![payload.ids[1]].StartsWith("/baz"));
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task GetByIds_MultipleCalls_WorksAsExpected()
-    {
-        var contentTypeService = Services.GetRequiredService<IContentTypeService>();
-        var contentService = Services.GetRequiredService<IContentService>();
-
-        var contentItems = new List<IContent>();
-
-        using (ScopeProvider.CreateScope(autoComplete: true))
-        {
-            IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentTypeService.Save(contentType);
-
-            var builder = new ContentBuilder()
-                .WithContentType(contentType);
-
-            var root = builder.WithName("foo").Build();
-            contentService.Save(root);
-            contentService.Publish(root, root.AvailableCultures.ToArray());
-
-            contentItems.Add(builder.WithParent(root).WithName("bar").Build());
-            contentItems.Add(builder.WithParent(root).WithName("baz").Build());
-
-            foreach (var content in contentItems)
-            {
-                contentService.Save(content);
-                contentService.Publish(content, root.AvailableCultures.ToArray());
-            }
-        }
-
-        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Document };
-
-        var url = LinkGenerator.GetUmbracoControllerUrl("GetByIds", typeof(EntityController), queryParameters);
-
-        var udiPayload = new { ids = new[] { contentItems[0].GetUdi().ToString(), contentItems[1].GetUdi().ToString() } };
-
-        var intPayload = new { ids = new[] { contentItems[0].Id, contentItems[1].Id } };
-
-        var udiResponse = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, udiPayload);
-        var intResponse = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, intPayload);
-
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, udiResponse.StatusCode, "First request error");
-            Assert.AreEqual(HttpStatusCode.OK, intResponse.StatusCode, "Second request error");
-        });
-    }
-}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/PropertyTypeControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/PropertyTypeControllerTests.cs
deleted file mode 100644
index 2046d3934d..0000000000
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/PropertyTypeControllerTests.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System.Threading.Tasks;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Tests.Integration.TestServerTest;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Formatters;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers;
-
-[TestFixture]
-public class PropertyTypeControllerTests : UmbracoTestServerTestBase
-{
-    [Test]
-    [TestCase(true)]
-    [TestCase(false)]
-    public async Task Has_Values_Returns_Correct_Values(bool expectHasValues)
-    {
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-        var contentService = GetRequiredService<IContentService>();
-        var serializer = GetRequiredService<IJsonSerializer>();
-
-        var propertyTypeAlias = "title";
-        var contentType = new ContentTypeBuilder()
-            .WithId(0)
-            .AddPropertyType()
-            .WithAlias(propertyTypeAlias)
-            .WithValueStorageType(ValueStorageType.Integer)
-            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-            .WithName("Title")
-            .Done()
-            .WithContentVariation(ContentVariation.Nothing)
-            .Build();
-
-        contentTypeService.Save(contentType);
-
-        if (expectHasValues)
-        {
-            var content = new ContentBuilder()
-                .WithId(0)
-                .WithName("TestContent")
-                .WithContentType(contentType)
-                .AddPropertyData()
-                .WithKeyValue("title", "someValue")
-                .Done()
-                .Build();
-
-            contentService.Save(content);
-        }
-
-        var url = PrepareApiControllerUrl<PropertyTypeController>(x => x.HasValues(propertyTypeAlias));
-
-        var response = await Client.GetAsync(url);
-
-        var body = await response.Content.ReadAsStringAsync();
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-
-        var result = serializer.Deserialize<PropertyTypeHasValuesDisplay>(body);
-
-        Assert.Multiple(() =>
-        {
-            Assert.IsNotNull(result);
-            Assert.AreEqual(propertyTypeAlias, result.PropertyTypeAlias);
-            Assert.AreEqual(expectHasValues, result.HasValues);
-        });
-    }
-}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs
deleted file mode 100644
index 0b6d4dc289..0000000000
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Net;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-using Umbraco.Cms.Core.Models.TemplateQuery;
-using Umbraco.Cms.Tests.Common.Attributes;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Tests.Integration.TestServerTest;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Formatters;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers;
-
-[TestFixture]
-public class TemplateQueryControllerTests : UmbracoTestServerTestBase
-{
-    [Test]
-    [LongRunning]
-    public async Task GetContentTypes__Ensure_camel_case()
-    {
-        var url = PrepareApiControllerUrl<TemplateQueryController>(x => x.GetContentTypes());
-
-        // Act
-        var response = await Client.GetAsync(url);
-
-        var body = await response.Content.ReadAsStringAsync();
-
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-
-        // Assert
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-
-            Assert.DoesNotThrow(() => JsonConvert.DeserializeObject<ContentTypeModel[]>(body));
-
-            var jtokens = JsonConvert.DeserializeObject<JToken[]>(body);
-            foreach (var jToken in jtokens)
-            {
-                var alias = nameof(ContentTypeModel.Alias);
-                var camelCaseAlias = alias.ToCamelCase();
-                Assert.IsNotNull(jToken.Value<string>(camelCaseAlias), $"'{jToken}' do not contain the key '{camelCaseAlias}' in the expected casing");
-                Assert.IsNull(jToken.Value<string>(alias), $"'{jToken}' do contain the key '{alias}', which was not expect in that casing");
-            }
-        });
-    }
-}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs
deleted file mode 100644
index 9ebe896913..0000000000
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Net;
-using System.Net.Mime;
-using System.Text;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Attributes;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Tests.Integration.TestServerTest;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Formatters;
-using Umbraco.Cms.Web.Common.Models;
-
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers;
-
-[TestFixture]
-public class UsersControllerTests : UmbracoTestServerTestBase
-{
-    [Test]
-    [LongRunning]
-    public async Task Save_User()
-    {
-        var url = PrepareApiControllerUrl<UsersController>(x => x.PostSaveUser(null));
-
-        var userService = GetRequiredService<IUserService>();
-
-        var user = new UserBuilder()
-            .AddUserGroup()
-            .WithAlias("writer") // Needs to be an existing alias
-            .Done()
-            .Build();
-
-        userService.Save(user);
-
-        var userSave = new UserSave
-        {
-            Id = user.Id,
-            Email = user.Email,
-            Username = user.Username,
-            Culture = "en",
-            Name = user.Name,
-            UserGroups = user.Groups.Select(x => x.Alias).ToArray()
-        };
-
-        // Act
-        var response = await Client.PostAsync(
-            url,
-            new StringContent(JsonConvert.SerializeObject(userSave), Encoding.UTF8, MediaTypeNames.Application.Json));
-
-        // Assert
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            var body = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
-
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-            var actual = JsonConvert.DeserializeObject<UserDisplay>(body, new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
-            Assert.AreEqual(userSave.Name, actual.Name);
-            Assert.AreEqual(userSave.Id, actual.Id);
-            Assert.AreEqual(userSave.Email, actual.Email);
-            var userGroupAliases = actual.UserGroups.Select(x => x.Alias).ToArray();
-            CollectionAssert.AreEquivalent(userSave.UserGroups, userGroupAliases);
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task GetPagedUsers_Empty()
-    {
-        // We get page 2 to force an empty response because there always in the useradmin user
-        var url = PrepareApiControllerUrl<UsersController>(x =>
-            x.GetPagedUsers(2, 10, "username", Direction.Ascending, null, null, string.Empty));
-
-        // Act
-        var response = await Client.GetAsync(url);
-
-        var body = await response.Content.ReadAsStringAsync();
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-        var actual = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(body, new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
-        Assert.Multiple(() =>
-        {
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(1, actual.TotalItems);
-            CollectionAssert.IsEmpty(actual.Items);
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task GetPagedUsers_multiple_pages()
-    {
-        var totalNumberOfUsers = 11;
-        var pageSize = totalNumberOfUsers - 1;
-        var url = PrepareApiControllerUrl<UsersController>(x =>
-            x.GetPagedUsers(1, pageSize, "username", Direction.Ascending, null, null, string.Empty));
-
-        var userService = GetRequiredService<IUserService>();
-
-        // We already has admin user = -1, so we start from 1.
-        for (var i = 1; i < totalNumberOfUsers; i++)
-        {
-            var user = new UserBuilder()
-                .WithName($"Test user {i}")
-                .AddUserGroup()
-                .WithAlias("writer") // Needs to be an existing alias
-                .Done()
-                .Build();
-
-            userService.Save(user);
-        }
-
-        // Act
-        var response = await Client.GetAsync(url);
-
-        var body = await response.Content.ReadAsStringAsync();
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-        var actual = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(body, new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
-        Assert.Multiple(() =>
-        {
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(totalNumberOfUsers, actual.TotalItems);
-            Assert.AreEqual(pageSize, actual.Items.Count());
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task PostUnlockUsers_When_UserIds_Not_Supplied_Expect_Ok_Response()
-    {
-        var url = PrepareApiControllerUrl<UsersController>(x => x.PostUnlockUsers(Array.Empty<int>()));
-
-        // Act
-        var response = await Client.PostAsync(url, new StringContent(string.Empty));
-
-        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task PostUnlockUsers_When_User_Does_Not_Exist_Expect_Zero_Users_Message()
-    {
-        var userId = 42; // Must not exist
-        var url = PrepareApiControllerUrl<UsersController>(x => x.PostUnlockUsers(new[] { userId }));
-
-        // Act
-        var response = await Client.PostAsync(url, new StringContent(string.Empty));
-        var body = await response.Content.ReadAsStringAsync();
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-
-        var actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
-        Assert.Multiple(() => Assert.AreEqual("Unlocked 0 users", actual.Message));
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task PostUnlockUsers_When_One_UserId_Supplied_Expect_User_Locked_Out_With_Correct_Response_Message()
-    {
-        var userService = GetRequiredService<IUserService>();
-
-        var user = new UserBuilder()
-            .AddUserGroup()
-            .WithAlias("writer") // Needs to be an existing alias
-            .Done()
-            .WithIsLockedOut(true, DateTime.UtcNow)
-            .Build();
-
-        userService.Save(user);
-        var url = PrepareApiControllerUrl<UsersController>(x => x.PostUnlockUsers(new[] { user.Id }));
-
-        // Act
-        var response = await Client.PostAsync(url, new StringContent(string.Empty));
-        var body = await response.Content.ReadAsStringAsync();
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-        var actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
-
-        Assert.Multiple(() =>
-        {
-            Assert.NotNull(actual);
-            Assert.AreEqual($"{user.Name} is now unlocked", actual.Message);
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task
-        PostUnlockUsers_When_Multiple_UserIds_Supplied_Expect_User_Locked_Out_With_Correct_Response_Message()
-    {
-        var numberOfUsers = 3;
-        var userService = GetRequiredService<IUserService>();
-
-        var users = new List<IUser>();
-        for (var i = 0; i < numberOfUsers; i++)
-        {
-            users.Add(new UserBuilder()
-                .WithName($"Test User {i}")
-                .WithEmail($"TestUser{i}@umbraco.com")
-                .WithUsername($"TestUser{i}")
-                .AddUserGroup()
-                .WithAlias("writer") // Needs to be an existing alias
-                .Done()
-                .WithIsLockedOut(true, DateTime.UtcNow)
-                .Build());
-        }
-
-        foreach (var user in users)
-        {
-            userService.Save(user);
-        }
-
-        var url = PrepareApiControllerUrl<UsersController>(x => x.PostUnlockUsers(users.Select(x => x.Id).ToArray()));
-
-        // Act
-        var response = await Client.PostAsync(url, new StringContent(string.Empty));
-        var body = await response.Content.ReadAsStringAsync();
-        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-        var actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
-
-        Assert.Multiple(() =>
-        {
-            Assert.NotNull(actual);
-            Assert.AreEqual($"Unlocked {users.Count()} users", actual.Message);
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task Cannot_Disable_Invited_User()
-    {
-        var userService = GetRequiredService<IUserService>();
-
-        var user = new UserBuilder()
-            .AddUserGroup()
-            .WithAlias("writer") // Needs to be an existing alias
-            .Done()
-            .Build();
-
-        user.LastLoginDate = default;
-        user.InvitedDate = DateTime.Now;
-        userService.Save(user);
-        var createdUser = userService.GetByEmail("test@test.com");
-
-        // Act
-        var url = PrepareApiControllerUrl<UsersController>(x => x.PostDisableUsers(new []{createdUser.Id}));
-        var response = await Client.PostAsync(url, null);
-
-        // Assert
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            var body = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
-
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-        });
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task Can_Disable_Active_User()
-    {
-        var userService = GetRequiredService<IUserService>();
-
-        var user = new UserBuilder()
-            .AddUserGroup()
-            .WithAlias("writer") // Needs to be an existing alias
-            .Done()
-            .Build();
-
-        user.IsApproved = true;
-        userService.Save(user);
-
-        var createdUser = userService.GetByEmail("test@test.com");
-
-        // Act
-        var url = PrepareApiControllerUrl<UsersController>(x => x.PostDisableUsers(new[] { createdUser.Id }));
-        var response = await Client.PostAsync(url, null);
-
-        // Assert
-        Assert.Multiple(() =>
-        {
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            var body = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
-
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-            var affectedUsers = JsonConvert.DeserializeObject<DisabledUsersModel>(body, new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
-            Assert.AreEqual(affectedUsers!.DisabledUserIds.First(), createdUser!.Id);
-
-            var disabledUser = userService.GetByEmail("test@test.com");
-            Assert.AreEqual(disabledUser!.UserState, UserState.Disabled);
-        });
-    }
-}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/OutgoingEditorModelEventFilterTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/OutgoingEditorModelEventFilterTests.cs
deleted file mode 100644
index 353c95acab..0000000000
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/OutgoingEditorModelEventFilterTests.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-using System.Linq;
-using System.Net;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Notifications;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Attributes;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Tests.Integration.TestServerTest;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.Common.Formatters;
-
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Filters;
-
-[TestFixture]
-public class OutgoingEditorModelEventFilterTests : UmbracoTestServerTestBase
-{
-    private static int _messageCount;
-    private static Action<SendingContentNotification> _handler;
-
-    protected override void CustomTestSetup(IUmbracoBuilder builder)
-    {
-        builder.AddNotificationHandler<SendingContentNotification, FilterEventHandler>();
-    }
-
-    [TearDown]
-    public void Reset() => ResetNotifications();
-
-    [Test]
-    [LongRunning]
-    public async Task Content_Item_With_Schedule_Raises_SendingContentNotification()
-    {
-        IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
-        IContentService contentService = GetRequiredService<IContentService>();
-        IJsonSerializer serializer = GetRequiredService<IJsonSerializer>();
-
-        var contentType = new ContentTypeBuilder().Build();
-        contentTypeService.Save(contentType);
-
-        var contentToRequest = new ContentBuilder()
-            .WithoutIdentity()
-            .WithContentType(contentType)
-            .Build();
-
-        contentService.Save(contentToRequest);
-
-        _handler = notification => notification.Content.AllowPreview = false;
-
-        var url = PrepareApiControllerUrl<ContentController>(x => x.GetById(contentToRequest.Id));
-
-        HttpResponseMessage response = await Client.GetAsync(url);
-
-        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-
-        var text = await response.Content.ReadAsStringAsync();
-        text = text.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-        var display = serializer.Deserialize<ContentItemDisplayWithSchedule>(text);
-
-        Assert.AreEqual(1, _messageCount);
-        Assert.IsNotNull(display);
-        Assert.IsFalse(display.AllowPreview);
-    }
-
-    [Test]
-    [LongRunning]
-    public async Task Publish_Schedule_Is_Mapped_Correctly()
-    {
-        const string UsIso = "en-US";
-        const string DkIso = "da-DK";
-        const string SweIso = "sv-SE";
-        var contentTypeService = GetRequiredService<IContentTypeService>();
-        var contentService = GetRequiredService<IContentService>();
-        var languageService = GetRequiredService<ILanguageService>();
-        IJsonSerializer serializer = GetRequiredService<IJsonSerializer>();
-
-        var contentType = new ContentTypeBuilder()
-            .WithContentVariation(ContentVariation.Culture)
-            .Build();
-        contentTypeService.Save(contentType);
-
-        var dkLang = new LanguageBuilder()
-            .WithCultureInfo(DkIso)
-            .WithIsDefault(false)
-            .Build();
-
-        var sweLang = new LanguageBuilder()
-            .WithCultureInfo(SweIso)
-            .WithIsDefault(false)
-            .Build();
-
-        await languageService.CreateAsync(dkLang, Constants.Security.SuperUserKey);
-        await languageService.CreateAsync(sweLang, Constants.Security.SuperUserKey);
-
-        var content = new ContentBuilder()
-            .WithoutIdentity()
-            .WithContentType(contentType)
-            .WithCultureName(UsIso, "Same Name")
-            .WithCultureName(SweIso, "Same Name")
-            .WithCultureName(DkIso, "Same Name")
-            .Build();
-
-        contentService.Save(content);
-        var schedule = new ContentScheduleCollection();
-
-        var dkReleaseDate = new DateTime(2022, 06, 22, 21, 30, 42);
-        var dkExpireDate = new DateTime(2022, 07, 15, 18, 00, 00);
-
-        var sweReleaseDate = new DateTime(2022, 06, 23, 22, 30, 42);
-        var sweExpireDate = new DateTime(2022, 07, 10, 14, 20, 00);
-        schedule.Add(DkIso, dkReleaseDate, dkExpireDate);
-        schedule.Add(SweIso, sweReleaseDate, sweExpireDate);
-        contentService.PersistContentSchedule(content, schedule);
-
-        var url = PrepareApiControllerUrl<ContentController>(x => x.GetById(content.Id));
-
-        HttpResponseMessage response = await Client.GetAsync(url);
-
-        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-
-        var text = await response.Content.ReadAsStringAsync();
-        text = text.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-        var display = serializer.Deserialize<ContentItemDisplayWithSchedule>(text);
-
-        Assert.IsNotNull(display);
-        Assert.AreEqual(1, _messageCount);
-
-        var dkVariant = display.Variants.FirstOrDefault(x => x.Language?.IsoCode == DkIso);
-        Assert.IsNotNull(dkVariant);
-        Assert.AreEqual(dkReleaseDate, dkVariant.ReleaseDate);
-        Assert.AreEqual(dkExpireDate, dkVariant.ExpireDate);
-
-        var sweVariant = display.Variants.FirstOrDefault(x => x.Language?.IsoCode == SweIso);
-        Assert.IsNotNull(sweVariant);
-        Assert.AreEqual(sweReleaseDate, sweVariant.ReleaseDate);
-        Assert.AreEqual(sweExpireDate, sweVariant.ExpireDate);
-
-        var usVariant = display.Variants.FirstOrDefault(x => x.Language?.IsoCode == UsIso);
-        Assert.IsNotNull(usVariant);
-        Assert.IsNull(usVariant.ReleaseDate);
-        Assert.IsNull(usVariant.ExpireDate);
-    }
-
-    private void ResetNotifications()
-    {
-        _messageCount = 0;
-        _handler = null;
-    }
-
-    private class FilterEventHandler : INotificationHandler<SendingContentNotification>
-    {
-        public void Handle(SendingContentNotification notification)
-        {
-            _messageCount += 1;
-            _handler?.Invoke(notification);
-        }
-    }
-}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.Website/Security/MemberAuthorizeTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.Website/Security/MemberAuthorizeTests.cs
index c2e7389f66..b9711bc997 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.Website/Security/MemberAuthorizeTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Web.Website/Security/MemberAuthorizeTests.cs
@@ -68,36 +68,36 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.Website.Security
             Assert.AreEqual(cookieAuthenticationOptions.Value.AccessDeniedPath.ToString(), response.Headers.Location?.AbsolutePath);
         }
 
+        // FIXME: Uncomment these tests when policies are renamed back to the original names without "New"
+        // [Test]
+        // [LongRunning]
+        // public async Task Secure_ApiController_Should_Return_Unauthorized_WhenNotLoggedIn()
+        // {
+        //     _memberManagerMock.Setup(x => x.IsLoggedIn()).Returns(false);
+        //     var url = PrepareApiControllerUrl<TestApiController>(x => x.Secure());
+        //
+        //     var response = await Client.GetAsync(url);
+        //
+        //     Assert.AreEqual(HttpStatusCode.Unauthorized, response.StatusCode);
+        // }
 
-        [Test]
-        [LongRunning]
-        public async Task Secure_ApiController_Should_Return_Unauthorized_WhenNotLoggedIn()
-        {
-            _memberManagerMock.Setup(x => x.IsLoggedIn()).Returns(false);
-            var url = PrepareApiControllerUrl<TestApiController>(x => x.Secure());
-
-            var response = await Client.GetAsync(url);
-
-            Assert.AreEqual(HttpStatusCode.Unauthorized, response.StatusCode);
-        }
-
-        [Test]
-        [LongRunning]
-        public async Task Secure_ApiController_Should_Return_Forbidden_WhenNotAuthorized()
-        {
-            _memberManagerMock.Setup(x => x.IsLoggedIn()).Returns(true);
-            _memberManagerMock.Setup(x => x.IsMemberAuthorizedAsync(
-                     It.IsAny<IEnumerable<string>>(),
-                    It.IsAny<IEnumerable<string>>(),
-                     It.IsAny<IEnumerable<int>>()))
-                .ReturnsAsync(false);
-
-            var url = PrepareApiControllerUrl<TestApiController>(x => x.Secure());
-
-            var response = await Client.GetAsync(url);
-
-            Assert.AreEqual(HttpStatusCode.Forbidden, response.StatusCode);
-        }
+        // [Test]
+        // [LongRunning]
+        // public async Task Secure_ApiController_Should_Return_Forbidden_WhenNotAuthorized()
+        // {
+        //     _memberManagerMock.Setup(x => x.IsLoggedIn()).Returns(true);
+        //     _memberManagerMock.Setup(x => x.IsMemberAuthorizedAsync(
+        //              It.IsAny<IEnumerable<string>>(),
+        //             It.IsAny<IEnumerable<string>>(),
+        //              It.IsAny<IEnumerable<int>>()))
+        //         .ReturnsAsync(false);
+        //
+        //     var url = PrepareApiControllerUrl<TestApiController>(x => x.Secure());
+        //
+        //     var response = await Client.GetAsync(url);
+        //
+        //     Assert.AreEqual(HttpStatusCode.Forbidden, response.StatusCode);
+        // }
     }
 
     public class TestSurfaceController : SurfaceController
diff --git a/tests/Umbraco.Tests.UnitTests/AutoFixture/Customizations/UmbracoCustomizations.cs b/tests/Umbraco.Tests.UnitTests/AutoFixture/Customizations/UmbracoCustomizations.cs
index 855c46a796..099bbfa0eb 100644
--- a/tests/Umbraco.Tests.UnitTests/AutoFixture/Customizations/UmbracoCustomizations.cs
+++ b/tests/Umbraco.Tests.UnitTests/AutoFixture/Customizations/UmbracoCustomizations.cs
@@ -5,6 +5,8 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 using Moq;
+using Umbraco.Cms.Api.Management.Controllers.Security;
+using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Configuration.Models;
@@ -13,9 +15,6 @@ using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Install;
 using Umbraco.Cms.Infrastructure.Migrations.Install;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.BackOffice.Install;
-using Umbraco.Cms.Web.BackOffice.Routing;
 using Umbraco.Cms.Web.Common.Security;
 
 namespace Umbraco.Cms.Tests.UnitTests.AutoFixture.Customizations;
@@ -29,14 +28,10 @@ internal class UmbracoCustomizations : ICustomization
                 (a, b, c) => BackOfficeIdentityUser.CreateNew(new GlobalSettings(), a, b, c)));
 
         fixture
-            .Customize(new ConstructorCustomization(typeof(UsersController), new GreedyConstructorQuery()))
-            .Customize(new ConstructorCustomization(typeof(InstallController), new GreedyConstructorQuery()))
-            .Customize(new ConstructorCustomization(typeof(PreviewController), new GreedyConstructorQuery()))
-            .Customize(new ConstructorCustomization(typeof(BackOfficeController), new GreedyConstructorQuery()))
             .Customize(new ConstructorCustomization(typeof(BackOfficeUserManager), new GreedyConstructorQuery()))
+            .Customize(new ConstructorCustomization(typeof(BackOfficeDefaultController), new GreedyConstructorQuery()))
             .Customize(new ConstructorCustomization(typeof(MemberManager), new GreedyConstructorQuery()))
             .Customize(new ConstructorCustomization(typeof(DatabaseSchemaCreatorFactory), new GreedyConstructorQuery()))
-            .Customize(new ConstructorCustomization(typeof(BackOfficeServerVariables), new GreedyConstructorQuery()))
             .Customize(new ConstructorCustomization(typeof(InstallHelper), new GreedyConstructorQuery()))
             .Customize(new ConstructorCustomization(typeof(DatabaseBuilder), new GreedyConstructorQuery()));
 
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Cms.Api.Management/Security/BackOfficeAuthenticationBuilderTests.cs
similarity index 91%
rename from tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilderTests.cs
rename to tests/Umbraco.Tests.UnitTests/Umbraco.Cms.Api.Management/Security/BackOfficeAuthenticationBuilderTests.cs
index 9ea6bfe02d..21594280d5 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Cms.Api.Management/Security/BackOfficeAuthenticationBuilderTests.cs
@@ -3,10 +3,10 @@
 
 using Microsoft.AspNetCore.Authentication;
 using NUnit.Framework;
+using Umbraco.Cms.Api.Management.Security;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Web.BackOffice.Security;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Security;
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Cms.Api.Management.Security;
 
 [TestFixture]
 public class BackOfficeAuthenticationBuilderTests
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs
index 047e28dda5..152e5ad474 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Linq;
 using System.Reflection;
 using System.Xml;
 using Microsoft.Extensions.Logging;
@@ -9,7 +8,6 @@ using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Composing;
-using Umbraco.Cms.Web.BackOffice.Trees;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing;
@@ -45,22 +43,6 @@ public class TypeFinderTests
         Assert.AreEqual(2, typesFound.Count());
     }
 
-    [Test]
-    public void Find_Classes_With_Attribute()
-    {
-        var typeFinder = new TypeFinder(
-            Mock.Of<ILogger<TypeFinder>>(),
-            new DefaultUmbracoAssemblyProvider(GetType().Assembly, NullLoggerFactory.Instance));
-        var typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>(_assemblies);
-        Assert.AreEqual(0, typesFound.Count()); // 0 classes in _assemblies are marked with [Tree]
-
-        typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>(new[] { typeof(TreeAttribute).Assembly });
-        Assert.AreEqual(24, typesFound.Count()); // + classes in Umbraco.Web are marked with [Tree]
-
-        typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>();
-        Assert.AreEqual(24, typesFound.Count()); // + classes in Umbraco.Web are marked with [Tree]
-    }
-
     [AttributeUsage(AttributeTargets.Class)]
     public class MyTestAttribute : Attribute
     {
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
index 7ca99984f9..5d0c16dd66 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="System.Data.Odbc"  />
+    <PackageReference Include="System.Data.Odbc" />
     <PackageReference Include="System.Data.OleDb" />
   </ItemGroup>
 
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs
deleted file mode 100644
index 1a72c871e1..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using System.Globalization;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Editors;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
-
-public class AdminUsersHandlerTests
-{
-    private const string SingleUserEditQueryStringName = "id";
-    private const string MultipleUserEditQueryStringName = "ids";
-
-    private const int Admin1UserId = 0;
-    private const int Admin2UserId = 1;
-    private const int NonAdmin1UserId = 2;
-    private const int NonAdmin2UserId = 3;
-    private const int NonAdmin3UserId = 4;
-
-    [Test]
-    public async Task Missing_QueryString_Value_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler("xxx");
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Non_Integer_QueryString_Value_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(queryStringValue: "xxx");
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Editing_Single_Admin_User_By_Admin_User_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(
-            queryStringValue: Admin2UserId.ToString(CultureInfo.InvariantCulture),
-            editingWithAdmin: true);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Editing_Single_Admin_User_By_Non_Admin_User_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(queryStringValue: Admin2UserId.ToString(CultureInfo.InvariantCulture));
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Editing_Single_Non_Admin_User_By_Non_Admin_User_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(queryStringValue: NonAdmin2UserId.ToString(CultureInfo.InvariantCulture));
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Editing_Multiple_Users_Including_Admins_By_Admin_User_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(MultipleUserEditQueryStringName);
-        var sut = CreateHandler(MultipleUserEditQueryStringName, $"{Admin2UserId},{NonAdmin2UserId}", true);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Editing_Multiple_Users_Including_Admins_By_Non_Admin_User_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(MultipleUserEditQueryStringName);
-        var sut = CreateHandler(MultipleUserEditQueryStringName, $"{Admin2UserId},{NonAdmin2UserId}");
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Editing_Multiple_Users_Not_Including_Admins_By_Non_Admin_User_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(MultipleUserEditQueryStringName);
-        var sut = CreateHandler(MultipleUserEditQueryStringName, $"{NonAdmin2UserId},{NonAdmin3UserId}");
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(
-        string queryStringName = SingleUserEditQueryStringName)
-    {
-        var requirement = new AdminUsersRequirement(queryStringName);
-        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-        var resource = new object();
-        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-    }
-
-    private AdminUsersHandler CreateHandler(
-        string queryStringName = SingleUserEditQueryStringName,
-        string queryStringValue = "",
-        bool editingWithAdmin = false)
-    {
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringName, queryStringValue);
-        CreateMockUserServiceAndSecurityAccessor(editingWithAdmin, out var mockUserService, out var mockBackOfficeSecurityAccessor);
-        var userEditorAuthorizationHelper = CreateUserEditorAuthorizationHelper();
-        return new AdminUsersHandler(
-            mockHttpContextAccessor.Object,
-            mockUserService.Object,
-            mockBackOfficeSecurityAccessor.Object,
-            userEditorAuthorizationHelper);
-    }
-
-    private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(string queryStringName, string queryStringValue)
-    {
-        var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-        var mockHttpContext = new Mock<HttpContext>();
-        var mockHttpRequest = new Mock<HttpRequest>();
-        var queryParams = new Dictionary<string, StringValues> { { queryStringName, queryStringValue } };
-        mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
-        mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
-        mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
-        return mockHttpContextAccessor;
-    }
-
-    private static void CreateMockUserServiceAndSecurityAccessor(
-        bool editingWithAdmin,
-        out Mock<IUserService> mockUserService,
-        out Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor)
-    {
-        mockUserService = new Mock<IUserService>();
-        var adminUser1 = CreateUser(Admin1UserId, mockUserService, true);
-        var adminUser2 = CreateUser(Admin2UserId, mockUserService, true);
-        var nonAdminUser1 = CreateUser(NonAdmin1UserId, mockUserService);
-        var nonAdminUser2 = CreateUser(NonAdmin2UserId, mockUserService);
-        var nonAdminUser3 = CreateUser(NonAdmin3UserId, mockUserService);
-
-        // Single user requests have been setup in the create user operations, but
-        // we also need to mock the responses when multiple users are being editing.
-        mockUserService
-            .Setup(x => x.GetUsersById(It.Is<int[]>(y =>
-                y.Length == 2 && y[0] == Admin2UserId && y[1] == NonAdmin2UserId)))
-            .Returns(new List<IUser> { adminUser2, nonAdminUser2 });
-        mockUserService
-            .Setup(x => x.GetUsersById(It.Is<int[]>(y =>
-                y.Length == 2 && y[0] == NonAdmin2UserId && y[1] == NonAdmin3UserId)))
-            .Returns(new List<IUser> { nonAdminUser2, nonAdminUser3 });
-
-        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(editingWithAdmin ? adminUser1 : nonAdminUser1);
-        mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-    }
-
-    private static User CreateUser(int id, Mock<IUserService> mockUserService, bool isAdmin = false)
-    {
-        var user = new UserBuilder()
-            .WithId(id)
-            .AddUserGroup()
-            .WithAlias(isAdmin ? Constants.Security.AdminGroupAlias : Constants.Security.EditorGroupAlias)
-            .Done()
-            .Build();
-
-        mockUserService
-            .Setup(x => x.GetUsersById(It.Is<int[]>(y => y.Length == 1 && y[0] == id)))
-            .Returns(new List<IUser> { user });
-
-        return user;
-    }
-
-    private static UserEditorAuthorizationHelper CreateUserEditorAuthorizationHelper()
-    {
-        var mockContentService = new Mock<IContentService>();
-        var mockMediaService = new Mock<IMediaService>();
-        var mockEntityService = new Mock<IEntityService>();
-        return new UserEditorAuthorizationHelper(
-            mockContentService.Object,
-            mockMediaService.Object,
-            mockEntityService.Object,
-            AppCaches.Disabled);
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs
deleted file mode 100644
index 6d0fb48382..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
-
-public class BackOfficeHandlerTests
-{
-    [Test]
-    public async Task Runtime_State_Install_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(RuntimeLevel.Install);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Runtime_State_Upgrade_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(RuntimeLevel.Upgrade);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Unauthenticated_User_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler();
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Authenticated_User_Is_Not_Authorized_When_Not_Approved_And_Approval_Required()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(true);
-        var sut = CreateHandler(currentUserIsAuthenticated: true);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Authenticated_User_Is_Authorized_When_Not_Approved_And_Approval_Not_Required()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(currentUserIsAuthenticated: true);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Authenticated_User_Is_Authorized_When_Approved_And_Approval_Required()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(true);
-        var sut = CreateHandler(currentUserIsAuthenticated: true, currentUserIsApproved: true);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(bool requireApproval = false)
-    {
-        var requirement = new BackOfficeRequirement(requireApproval);
-        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-        var resource = new object();
-        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-    }
-
-    private BackOfficeHandler CreateHandler(
-        RuntimeLevel runtimeLevel = RuntimeLevel.Run,
-        bool currentUserIsAuthenticated = false,
-        bool currentUserIsApproved = false)
-    {
-        var mockBackOfficeSecurityAccessor =
-            CreateMockBackOfficeSecurityAccessor(currentUserIsAuthenticated, currentUserIsApproved);
-        var mockRuntimeState = CreateMockRuntimeState(runtimeLevel);
-        return new BackOfficeHandler(mockBackOfficeSecurityAccessor.Object, mockRuntimeState.Object);
-    }
-
-    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(
-        bool currentUserIsAuthenticated, bool currentUserIsApproved)
-    {
-        var user = new UserBuilder()
-            .WithIsApproved(currentUserIsApproved)
-            .Build();
-        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-        mockBackOfficeSecurity.Setup(x => x.IsAuthenticated()).Returns(currentUserIsAuthenticated);
-        if (currentUserIsAuthenticated)
-        {
-            mockBackOfficeSecurity.Setup(x => x.CurrentUser).Returns(user);
-        }
-
-        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-        return mockBackOfficeSecurityAccessor;
-    }
-
-    private static Mock<IRuntimeState> CreateMockRuntimeState(RuntimeLevel runtimeLevel)
-    {
-        var mockRuntimeState = new Mock<IRuntimeState>();
-        mockRuntimeState.SetupGet(x => x.Level).Returns(runtimeLevel);
-        return mockRuntimeState;
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs
deleted file mode 100644
index 148601bad9..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using System.Globalization;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Persistence.Querying;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
-
-public class ContentPermissionsPublishBranchHandlerTests
-{
-    private const int NodeId = 1000;
-    private const int DescendentNodeId1 = 1001;
-    private const int DescendentNodeId2 = 1002;
-
-    [Test]
-    public async Task User_With_Access_To_All_Descendent_Nodes_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockUserService = CreateMockUserService(
-            NodeId,
-            new Dictionary<int, string[]> { { DescendentNodeId1, new[] { "A" } }, { DescendentNodeId2, new[] { "A" } } });
-        var sut = CreateHandler(mockUserService.Object, NodeId);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-        mockUserService.Verify(x => x.GetPermissionsForPath(It.IsAny<IUser>(), It.IsAny<string>()), Times.Exactly(2));
-    }
-
-    [Test]
-    public async Task User_Without_Access_To_One_Descendent_Node_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockUserService = CreateMockUserService(
-            NodeId,
-            new Dictionary<int, string[]> { { DescendentNodeId1, new[] { "A" } }, { DescendentNodeId2, new[] { "B" } } });
-        var sut = CreateHandler(mockUserService.Object, NodeId);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-        mockUserService.Verify(x => x.GetPermissionsForPath(It.IsAny<IUser>(), It.IsAny<string>()), Times.Exactly(2));
-    }
-
-    [Test]
-    public async Task User_Without_Access_To_First_Descendent_Node_Is_Not_Authorized_And_Checks_Exit_Early()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockUserService = CreateMockUserService(
-            NodeId,
-            new Dictionary<int, string[]> { { DescendentNodeId1, new[] { "B" } }, { DescendentNodeId2, new[] { "A" } } });
-        var sut = CreateHandler(mockUserService.Object, NodeId);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-        mockUserService.Verify(x => x.GetPermissionsForPath(It.IsAny<IUser>(), It.IsAny<string>()), Times.Exactly(1));
-    }
-
-    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
-    {
-        var requirement = new ContentPermissionsPublishBranchRequirement('A');
-        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-        var resource = CreateContent(NodeId);
-        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-    }
-
-    private static Mock<IUserService> CreateMockUserService(
-        int parentNodeId,
-        Dictionary<int, string[]> descendendNodePermissionsForPath)
-    {
-        var mockUserService = new Mock<IUserService>();
-
-        mockUserService
-            .Setup(x => x.GetPermissionsForPath(
-                It.IsAny<IUser>(),
-                It.Is<string>(y =>
-                    y ==
-                    $"{Constants.System.RootString},{parentNodeId.ToString(CultureInfo.InvariantCulture)},{DescendentNodeId1}")))
-            .Returns(new EntityPermissionSet(
-                parentNodeId,
-                new EntityPermissionCollection(new List<EntityPermission>
-                {
-                    new(1, parentNodeId, descendendNodePermissionsForPath[DescendentNodeId1]),
-                })));
-        mockUserService
-            .Setup(x => x.GetPermissionsForPath(
-                It.IsAny<IUser>(),
-                It.Is<string>(y =>
-                    y ==
-                    $"{Constants.System.RootString},{parentNodeId.ToString(CultureInfo.InvariantCulture)},{DescendentNodeId1},{DescendentNodeId2}")))
-            .Returns(new EntityPermissionSet(
-                parentNodeId,
-                new EntityPermissionCollection(new List<EntityPermission>
-                {
-                    new(1, parentNodeId, descendendNodePermissionsForPath[DescendentNodeId2]),
-                })));
-
-        return mockUserService;
-    }
-
-    private ContentPermissionsPublishBranchHandler CreateHandler(IUserService userService, int nodeId)
-    {
-        var mockEntityService = CreateMockEntityService();
-        var contentPermissions = CreateContentPermissions(mockEntityService.Object, userService, nodeId);
-        var mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor();
-        return new ContentPermissionsPublishBranchHandler(mockEntityService.Object, contentPermissions, mockBackOfficeSecurityAccessor.Object);
-    }
-
-    private static Mock<IEntityService> CreateMockEntityService()
-    {
-        long totalRecords;
-        var mockEntityService = new Mock<IEntityService>();
-        mockEntityService
-            .Setup(x => x.GetPagedDescendants(
-                It.Is<int>(y => y == NodeId),
-                It.Is<UmbracoObjectTypes>(y => y == UmbracoObjectTypes.Document),
-                It.IsAny<long>(),
-                It.IsAny<int>(),
-                out totalRecords,
-                It.IsAny<IQuery<IUmbracoEntity>>(),
-                It.IsAny<Ordering>()))
-            .Returns(new List<IEntitySlim>
-            {
-                new EntitySlim { Id = DescendentNodeId1, Path = $"-1,{NodeId},{DescendentNodeId1}" },
-                new EntitySlim
-                {
-                    Id = DescendentNodeId2, Path = $"-1,{NodeId},{DescendentNodeId1},{DescendentNodeId2}",
-                },
-            });
-        return mockEntityService;
-    }
-
-    private static ContentPermissions CreateContentPermissions(IEntityService entityService, IUserService userService, int nodeId)
-    {
-        var mockContentService = new Mock<IContentService>();
-        mockContentService
-            .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
-            .Returns(CreateContent(nodeId));
-
-        return new ContentPermissions(userService, mockContentService.Object, entityService, AppCaches.Disabled);
-    }
-
-    private static IContent CreateContent(int nodeId)
-    {
-        var contentType = ContentTypeBuilder.CreateBasicContentType();
-        return ContentBuilder.CreateBasicContent(contentType, nodeId);
-    }
-
-    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor()
-    {
-        var user = CreateUser();
-        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
-        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-        return mockBackOfficeSecurityAccessor;
-    }
-
-    private static User CreateUser() =>
-        new UserBuilder()
-            .Build();
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs
deleted file mode 100644
index c562eb67ea..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs
+++ /dev/null
@@ -1,266 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
-
-public class ContentPermissionsQueryStringHandlerTests
-{
-    private const string QueryStringName = "id";
-    private const int NodeId = 1000;
-    private static readonly Guid s_nodeGuid = Guid.NewGuid();
-
-    private static readonly Udi s_nodeUdi =
-        UdiParser.Parse($"umb://document/{s_nodeGuid.ToString().ToLowerInvariant().Replace("-", string.Empty)}");
-
-    [Test]
-    public async Task Node_Id_From_Requirement_With_Permission_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor();
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "A" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Node_Id_From_Requirement_Without_Permission_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor();
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "B" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-        AssertContentCached(mockHttpContextAccessor);
-    }
-
-    [Test]
-    public async Task Node_Id_Missing_From_Requirement_And_QueryString_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor("xxx");
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "A" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Node_Integer_Id_From_QueryString_With_Permission_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: NodeId.ToString());
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "A" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-        AssertContentCached(mockHttpContextAccessor);
-    }
-
-    [Test]
-    public async Task Node_Integer_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: NodeId.ToString());
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "B" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-        AssertContentCached(mockHttpContextAccessor);
-    }
-
-    [Test]
-    public async Task Node_Udi_Id_From_QueryString_With_Permission_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeUdi.ToString());
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "A" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-        AssertContentCached(mockHttpContextAccessor);
-    }
-
-    [Test]
-    public async Task Node_Udi_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeUdi.ToString());
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "B" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-        AssertContentCached(mockHttpContextAccessor);
-    }
-
-    [Test]
-    public async Task Node_Guid_Id_From_QueryString_With_Permission_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeGuid.ToString());
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "A" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-        AssertContentCached(mockHttpContextAccessor);
-    }
-
-    [Test]
-    public async Task Node_Guid_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeGuid.ToString());
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "B" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-        AssertContentCached(mockHttpContextAccessor);
-    }
-
-    [Test]
-    public async Task Node_Invalid_Id_From_QueryString_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: "invalid");
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "A" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(int? nodeId = null)
-    {
-        const char Permission = 'A';
-        var requirement = nodeId.HasValue
-            ? new ContentPermissionsQueryStringRequirement(nodeId.Value, Permission)
-            : new ContentPermissionsQueryStringRequirement(Permission);
-        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-        var resource = new object();
-        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-    }
-
-    private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(
-        string queryStringName = QueryStringName,
-        string queryStringValue = "")
-    {
-        var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-        var mockHttpContext = new Mock<HttpContext>();
-        var mockHttpRequest = new Mock<HttpRequest>();
-        var queryParams = new Dictionary<string, StringValues> { { queryStringName, queryStringValue } };
-        mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
-        mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
-        mockHttpContext.SetupGet(x => x.Items).Returns(new Dictionary<object, object>());
-        mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
-        return mockHttpContextAccessor;
-    }
-
-    private ContentPermissionsQueryStringHandler CreateHandler(
-        IHttpContextAccessor httpContextAccessor,
-        int nodeId,
-        string[] permissionsForPath)
-    {
-        var mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor();
-        var mockEntityService = CreateMockEntityService();
-        var contentPermissions = CreateContentPermissions(mockEntityService.Object, nodeId, permissionsForPath);
-        return new ContentPermissionsQueryStringHandler(
-            mockBackOfficeSecurityAccessor.Object,
-            httpContextAccessor,
-            mockEntityService.Object,
-            contentPermissions);
-    }
-
-    private static Mock<IEntityService> CreateMockEntityService()
-    {
-        var mockEntityService = new Mock<IEntityService>();
-        mockEntityService
-            .Setup(x => x.GetId(It.Is<Udi>(y => y == s_nodeUdi)))
-            .Returns(Attempt<int>.Succeed(NodeId));
-        mockEntityService
-            .Setup(x => x.GetId(
-                It.Is<Guid>(y => y == s_nodeGuid),
-                It.Is<UmbracoObjectTypes>(y => y == UmbracoObjectTypes.Document)))
-            .Returns(Attempt<int>.Succeed(NodeId));
-        return mockEntityService;
-    }
-
-    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor()
-    {
-        var user = CreateUser();
-        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
-        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-        return mockBackOfficeSecurityAccessor;
-    }
-
-    private static User CreateUser() =>
-        new UserBuilder()
-            .Build();
-
-    private static ContentPermissions CreateContentPermissions(
-        IEntityService entityService,
-        int nodeId,
-        string[] permissionsForPath)
-    {
-        var mockUserService = new Mock<IUserService>();
-
-        mockUserService
-            .Setup(x => x.GetPermissionsForPath(
-                It.IsAny<IUser>(),
-                It.Is<string>(y => y == $"{Constants.System.RootString},{nodeId.ToInvariantString()}")))
-            .Returns(new EntityPermissionSet(
-                nodeId,
-                new EntityPermissionCollection(new List<EntityPermission> { new(1, nodeId, permissionsForPath) })));
-
-        var mockContentService = new Mock<IContentService>();
-        mockContentService
-            .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
-            .Returns(CreateContent(nodeId));
-
-        return new ContentPermissions(
-            mockUserService.Object,
-            mockContentService.Object,
-            entityService,
-            AppCaches.Disabled);
-    }
-
-    private static IContent CreateContent(int nodeId)
-    {
-        var contentType = ContentTypeBuilder.CreateBasicContentType();
-        return ContentBuilder.CreateBasicContent(contentType, nodeId);
-    }
-
-    private static void AssertContentCached(Mock<IHttpContextAccessor> mockHttpContextAccessor) =>
-        Assert.AreEqual(
-            NodeId,
-            ((IContent)mockHttpContextAccessor.Object.HttpContext.Items[typeof(IContent).ToString()]).Id);
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs
deleted file mode 100644
index 60ceb37ada..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
-
-public class ContentPermissionsResourceHandlerTests
-{
-    private const int NodeId = 1000;
-
-    [Test]
-    public async Task Resource_With_Node_Id_With_Permission_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId, true);
-        var sut = CreateHandler(NodeId, new[] { "A" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Resource_With_Content_With_Permission_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
-        var sut = CreateHandler(NodeId, new[] { "A" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Resource_With_Node_Id_Withou_Permission_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId, true);
-        var sut = CreateHandler(NodeId, new[] { "B" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Resource_With_Content_Without_Permission_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
-        var sut = CreateHandler(NodeId, new[] { "B" });
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(
-        int nodeId,
-        bool createWithNodeId = false)
-    {
-        var requirement = new ContentPermissionsResourceRequirement();
-        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-        var content = CreateContent(nodeId);
-        var permissions = new List<char> { 'A' }.AsReadOnly();
-        var resource = createWithNodeId
-            ? new ContentPermissionsResource(content, nodeId, permissions)
-            : new ContentPermissionsResource(content, permissions);
-        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-    }
-
-    private static IContent CreateContent(int nodeId)
-    {
-        var contentType = ContentTypeBuilder.CreateBasicContentType();
-        return ContentBuilder.CreateBasicContent(contentType, nodeId);
-    }
-
-    private ContentPermissionsResourceHandler CreateHandler(int nodeId, string[] permissionsForPath)
-    {
-        var mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor();
-        var contentPermissions = CreateContentPermissions(nodeId, permissionsForPath);
-        return new ContentPermissionsResourceHandler(mockBackOfficeSecurityAccessor.Object, contentPermissions);
-    }
-
-    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor()
-    {
-        var user = CreateUser();
-        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
-        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-        return mockBackOfficeSecurityAccessor;
-    }
-
-    private static User CreateUser() =>
-        new UserBuilder()
-            .Build();
-
-    private static ContentPermissions CreateContentPermissions(int nodeId, string[] permissionsForPath)
-    {
-        var mockUserService = new Mock<IUserService>();
-
-        mockUserService
-            .Setup(x => x.GetPermissionsForPath(
-                It.IsAny<IUser>(),
-                It.Is<string>(y => y == $"{Constants.System.RootString},{nodeId.ToInvariantString()}")))
-            .Returns(new EntityPermissionSet(
-                nodeId,
-                new EntityPermissionCollection(new List<EntityPermission> { new(1, nodeId, permissionsForPath) })));
-
-        var mockContentService = new Mock<IContentService>();
-        mockContentService
-            .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
-            .Returns(CreateContent(nodeId));
-
-        var mockEntityService = new Mock<IEntityService>();
-        return new ContentPermissions(
-            mockUserService.Object,
-            mockContentService.Object,
-            mockEntityService.Object,
-            AppCaches.Disabled);
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs
deleted file mode 100644
index fd664d2b5d..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-using Umbraco.Cms.Web.BackOffice.Security;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
-
-public class DenyLocalLoginHandlerTests
-{
-    [Test]
-    public async Task With_Deny_Local_Login_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(true);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Without_Deny_Local_Login_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler();
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
-    {
-        var requirement = new DenyLocalLoginRequirement();
-        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-        var resource = new object();
-        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-    }
-
-    private DenyLocalLoginHandler CreateHandler(bool denyLocalLogin = false)
-    {
-        var mockBackOfficeExternalLoginProviders = CreateMockBackOfficeExternalLoginProviders(denyLocalLogin);
-
-        return new DenyLocalLoginHandler(mockBackOfficeExternalLoginProviders.Object);
-    }
-
-    private static Mock<IBackOfficeExternalLoginProviders> CreateMockBackOfficeExternalLoginProviders(
-        bool denyLocalLogin)
-    {
-        var mockBackOfficeExternalLoginProviders = new Mock<IBackOfficeExternalLoginProviders>();
-        mockBackOfficeExternalLoginProviders.Setup(x => x.HasDenyLocalLogin()).Returns(denyLocalLogin);
-        return mockBackOfficeExternalLoginProviders;
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs
deleted file mode 100644
index 08ae10b071..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
-
-public class MediaPermissionsQueryStringHandlerTests
-{
-    private const string QueryStringName = "id";
-    private const int NodeId = 1000;
-    private static readonly Guid s_nodeGuid = Guid.NewGuid();
-
-    private static readonly Udi s_nodeUdi =
-        UdiParser.Parse($"umb://document/{s_nodeGuid.ToString().ToLowerInvariant().Replace("-", string.Empty)}");
-
-    [Test]
-    public async Task Node_Id_Missing_From_QueryString_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor("xxx");
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Node_Integer_Id_From_QueryString_With_Permission_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: NodeId.ToString());
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-        AssertMediaCached(mockHttpContextAccessor);
-    }
-
-    [Test]
-    public async Task Node_Integer_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: NodeId.ToString());
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, 1001);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-        AssertMediaCached(mockHttpContextAccessor);
-    }
-
-    [Test]
-    public async Task Node_Udi_Id_From_QueryString_With_Permission_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeUdi.ToString());
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-        AssertMediaCached(mockHttpContextAccessor);
-    }
-
-    [Test]
-    public async Task Node_Udi_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeUdi.ToString());
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, 1001);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-        AssertMediaCached(mockHttpContextAccessor);
-    }
-
-    [Test]
-    public async Task Node_Guid_Id_From_QueryString_With_Permission_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeGuid.ToString());
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-        AssertMediaCached(mockHttpContextAccessor);
-    }
-
-    [Test]
-    public async Task Node_Guid_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeGuid.ToString());
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, 1001);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-        AssertMediaCached(mockHttpContextAccessor);
-    }
-
-    [Test]
-    public async Task Node_Invalid_Id_From_QueryString_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: "invalid");
-        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
-    {
-        var requirement = new MediaPermissionsQueryStringRequirement(QueryStringName);
-        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-        var resource = new object();
-        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-    }
-
-    private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(
-        string queryStringName = QueryStringName,
-        string queryStringValue = "")
-    {
-        var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-        var mockHttpContext = new Mock<HttpContext>();
-        var mockHttpRequest = new Mock<HttpRequest>();
-        var queryParams = new Dictionary<string, StringValues> { { queryStringName, queryStringValue } };
-        mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
-        mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
-        mockHttpContext.SetupGet(x => x.Items).Returns(new Dictionary<object, object>());
-        mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
-        return mockHttpContextAccessor;
-    }
-
-    private MediaPermissionsQueryStringHandler CreateHandler(
-        IHttpContextAccessor httpContextAccessor,
-        int nodeId,
-        int startMediaId = -1)
-    {
-        var mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor(startMediaId);
-        var mockEntityService = CreateMockEntityService();
-        var mediaPermissions = CreateMediaPermissions(mockEntityService.Object, nodeId);
-        return new MediaPermissionsQueryStringHandler(
-            mockBackOfficeSecurityAccessor.Object,
-            httpContextAccessor,
-            mockEntityService.Object,
-            mediaPermissions);
-    }
-
-    private static Mock<IEntityService> CreateMockEntityService()
-    {
-        var mockEntityService = new Mock<IEntityService>();
-        mockEntityService
-            .Setup(x => x.GetId(It.Is<Udi>(y => y == s_nodeUdi)))
-            .Returns(Attempt<int>.Succeed(NodeId));
-        mockEntityService
-            .Setup(x => x.GetId(
-                It.Is<Guid>(y => y == s_nodeGuid),
-                It.Is<UmbracoObjectTypes>(y => y == UmbracoObjectTypes.Document)))
-            .Returns(Attempt<int>.Succeed(NodeId));
-        return mockEntityService;
-    }
-
-    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(int startMediaId)
-    {
-        var user = CreateUser(startMediaId);
-        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
-        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-        return mockBackOfficeSecurityAccessor;
-    }
-
-    private static User CreateUser(int startMediaId) =>
-        new UserBuilder()
-            .WithStartMediaId(startMediaId)
-            .Build();
-
-    private static MediaPermissions CreateMediaPermissions(IEntityService entityService, int nodeId)
-    {
-        var mockMediaService = new Mock<IMediaService>();
-        mockMediaService
-            .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
-            .Returns(CreateMedia(nodeId));
-
-        return new MediaPermissions(mockMediaService.Object, entityService, AppCaches.Disabled);
-    }
-
-    private static IMedia CreateMedia(int nodeId)
-    {
-        var mediaType = MediaTypeBuilder.CreateSimpleMediaType("image", "Image");
-        return MediaBuilder.CreateSimpleMedia(mediaType, "Test image", -1, nodeId);
-    }
-
-    private static void AssertMediaCached(Mock<IHttpContextAccessor> mockHttpContextAccessor) =>
-        Assert.AreEqual(
-            NodeId,
-            ((IMedia)mockHttpContextAccessor.Object.HttpContext.Items[typeof(IMedia).ToString()]).Id);
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs
deleted file mode 100644
index fb31411660..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
-
-public class MediaPermissionsResourceHandlerTests
-{
-    private const int NodeId = 1000;
-
-    [Test]
-    public async Task Resource_With_Node_Id_With_Permission_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId, true);
-        var sut = CreateHandler(NodeId);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Resource_With_Media_With_Permission_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
-        var sut = CreateHandler(NodeId);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Resource_With_Node_Id_Withou_Permission_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId, true);
-        var sut = CreateHandler(NodeId, 1001);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Resource_With_Media_Without_Permission_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
-        var sut = CreateHandler(NodeId, 1001);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(
-        int nodeId,
-        bool createWithNodeId = false)
-    {
-        var requirement = new MediaPermissionsResourceRequirement();
-        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-        var media = CreateMedia(nodeId);
-        var resource = createWithNodeId
-            ? new MediaPermissionsResource(nodeId)
-            : new MediaPermissionsResource(media);
-        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-    }
-
-    private static IMedia CreateMedia(int nodeId)
-    {
-        var mediaType = MediaTypeBuilder.CreateSimpleMediaType("image", "Image");
-        return MediaBuilder.CreateSimpleMedia(mediaType, "Test image", -1, nodeId);
-    }
-
-    private MediaPermissionsResourceHandler CreateHandler(int nodeId, int startMediaId = -1)
-    {
-        var mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor(startMediaId);
-        var contentPermissions = CreateMediaPermissions(nodeId);
-        return new MediaPermissionsResourceHandler(mockBackOfficeSecurityAccessor.Object, contentPermissions);
-    }
-
-    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(int startMediaId)
-    {
-        var user = CreateUser(startMediaId);
-        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
-        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-        return mockBackOfficeSecurityAccessor;
-    }
-
-    private static User CreateUser(int startMediaId) =>
-        new UserBuilder()
-            .WithStartMediaId(startMediaId)
-            .Build();
-
-    private static MediaPermissions CreateMediaPermissions(int nodeId)
-    {
-        var mockMediaService = new Mock<IMediaService>();
-        mockMediaService
-            .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
-            .Returns(CreateMedia(nodeId));
-
-        var mockEntityService = new Mock<IEntityService>();
-        return new MediaPermissions(mockMediaService.Object, mockEntityService.Object, AppCaches.Disabled);
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs
deleted file mode 100644
index d4b1bcf7a9..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
-
-public class SectionHandlerTests
-{
-    [Test]
-    public async Task Unauthorized_User_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler();
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task User_With_Section_Access_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(true, true);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task User_Without_Section_Access_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(true);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
-    {
-        var requirement = new SectionRequirement(Constants.Applications.Content, Constants.Applications.Media);
-        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-        var resource = new object();
-        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-    }
-
-    private SectionHandler CreateHandler(bool userIsAuthorized = false, bool userCanAccessContentSection = false)
-    {
-        var mockBackOfficeSecurityAccessor =
-            CreateMockBackOfficeSecurityAccessor(userIsAuthorized, userCanAccessContentSection);
-
-        return new SectionHandler(mockBackOfficeSecurityAccessor.Object);
-    }
-
-    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(
-        bool userIsAuthorized,
-        bool userCanAccessContentSection)
-    {
-        var user = CreateUser();
-        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(userIsAuthorized ? user : null);
-        mockBackOfficeSecurity
-            .Setup(x => x.UserHasSectionAccess(
-                Constants.Applications.Content,
-                It.Is<IUser>(y => y.Username == user.Username)))
-            .Returns(userCanAccessContentSection);
-        mockBackOfficeSecurity
-            .Setup(x => x.UserHasSectionAccess(
-                Constants.Applications.Media,
-                It.Is<IUser>(y => y.Username == user.Username)))
-            .Returns(false);
-        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-        return mockBackOfficeSecurityAccessor;
-    }
-
-    private static User CreateUser() =>
-        new UserBuilder()
-            .Build();
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs
deleted file mode 100644
index 1404df11ff..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
-
-public class TreeHandlerTests
-{
-    private const string Tree1Alias = "Tree1";
-    private const string Tree2Alias = "Tree2";
-
-    [Test]
-    public async Task Unauthorized_User_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler();
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task User_With_Access_To_Tree_Section_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(true, true);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task User_Without_Access_To_Tree_Section_Is_Not_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(true);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
-    {
-        var requirement = new TreeRequirement(Tree1Alias, Tree2Alias);
-        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-        var resource = new object();
-        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-    }
-
-    private TreeHandler CreateHandler(bool userIsAuthorized = false, bool userCanAccessContentSection = false)
-    {
-        var mockTreeService = CreateMockTreeService();
-        var mockBackOfficeSecurityAccessor =
-            CreateMockBackOfficeSecurityAccessor(userIsAuthorized, userCanAccessContentSection);
-
-        return new TreeHandler(mockTreeService.Object, mockBackOfficeSecurityAccessor.Object);
-    }
-
-    private static Mock<ITreeService> CreateMockTreeService()
-    {
-        var mockTreeService = new Mock<ITreeService>();
-        mockTreeService
-            .Setup(x => x.GetByAlias(It.Is<string>(y => y == Tree1Alias)))
-            .Returns(CreateTree(Tree1Alias, Constants.Applications.Content));
-        mockTreeService
-            .Setup(x => x.GetByAlias(It.Is<string>(y => y == Tree2Alias)))
-            .Returns(CreateTree(Tree2Alias, Constants.Applications.Media));
-        return mockTreeService;
-    }
-
-    private static Tree CreateTree(string alias, string sectionAlias) =>
-        new TreeBuilder()
-            .WithAlias(alias)
-            .WithSectionAlias(sectionAlias)
-            .Build();
-
-    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(
-        bool userIsAuthorized,
-        bool userCanAccessContentSection)
-    {
-        var user = CreateUser();
-        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(userIsAuthorized ? user : null);
-        mockBackOfficeSecurity
-            .Setup(x => x.UserHasSectionAccess(
-                Constants.Applications.Content,
-                It.Is<IUser>(y => y.Username == user.Username)))
-            .Returns(userCanAccessContentSection);
-        mockBackOfficeSecurity
-            .Setup(x => x.UserHasSectionAccess(
-                Constants.Applications.Media,
-                It.Is<IUser>(y => y.Username == user.Username)))
-            .Returns(false);
-        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-        return mockBackOfficeSecurityAccessor;
-    }
-
-    private static User CreateUser() => new UserBuilder()
-        .Build();
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs
deleted file mode 100644
index 0850075375..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Web.BackOffice.Authorization;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
-
-public class UserGroupHandlerTests
-{
-    private const string QueryStringName = "id";
-
-    private const int Group1Id = 1;
-    private const string Group1Alias = "group1";
-    private const int Group2Id = 2;
-    private const string Group2Alias = "group2";
-    private const int Group3Id = 3;
-    private const string Group3Alias = "group3";
-
-    [Test]
-    public async Task Missing_QueryString_Value_Is_Authorized()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler();
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task Admin_User_Is_Authorised()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(Group1Id.ToString(), true);
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task User_Matching_Single_Requested_Group_Id_Is_Authorised()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(Group1Id.ToString());
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task User_Matching_Only_One_Of_Requested_Group_Ids_Is_NOT_Authorised()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler($"{Group1Id},{Group2Id}");
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsTrue(authHandlerContext.HasFailed);
-    }
-
-    [Test]
-    public async Task User_Not_Matching_Single_Requested_Group_Id_Is_Not_Authorised()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler(Group2Id.ToString());
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    [Test]
-    public async Task User_Not_Matching_Any_Of_Requested_Group_Ids_Is_Not_Authorised()
-    {
-        var authHandlerContext = CreateAuthorizationHandlerContext();
-        var sut = CreateHandler($"{Group2Id},{Group3Id}");
-
-        await sut.HandleAsync(authHandlerContext);
-
-        Assert.IsFalse(authHandlerContext.HasSucceeded);
-    }
-
-    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
-    {
-        var requirement = new UserGroupRequirement();
-        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-        var resource = new object();
-        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-    }
-
-    private UserGroupHandler CreateHandler(string queryStringValue = "", bool userIsAdmin = false)
-    {
-        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue);
-
-        var mockUserService = CreateMockUserService();
-
-        var mockContentService = new Mock<IContentService>();
-        var mockMediaService = new Mock<IMediaService>();
-        var mockEntityService = new Mock<IEntityService>();
-
-        var mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor(userIsAdmin);
-
-        return new UserGroupHandler(
-            mockHttpContextAccessor.Object,
-            mockUserService.Object,
-            mockContentService.Object,
-            mockMediaService.Object,
-            mockEntityService.Object,
-            mockBackOfficeSecurityAccessor.Object,
-            AppCaches.Disabled);
-    }
-
-    private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(string queryStringValue)
-    {
-        var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-        var mockHttpContext = new Mock<HttpContext>();
-        var mockHttpRequest = new Mock<HttpRequest>();
-        var queryParams = new Dictionary<string, StringValues> { { QueryStringName, queryStringValue } };
-        mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
-        mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
-        mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
-        return mockHttpContextAccessor;
-    }
-
-    private Mock<IUserService> CreateMockUserService()
-    {
-        var mockUserService = new Mock<IUserService>();
-        mockUserService
-            .Setup(x => x.GetAllUserGroups(It.Is<int[]>(y => y.Length == 1 && y[0] == Group1Id)))
-            .Returns(new List<IUserGroup> { CreateUserGroup(Group1Id, Group1Alias) });
-        mockUserService
-            .Setup(x => x.GetAllUserGroups(It.Is<int[]>(y => y.Length == 1 && y[0] == Group2Id)))
-            .Returns(new List<IUserGroup> { CreateUserGroup(Group2Id, Group2Alias) });
-        mockUserService
-            .Setup(x => x.GetAllUserGroups(It.Is<int[]>(y => y.Length == 2 && y[0] == Group1Id && y[1] == Group2Id)))
-            .Returns(new List<IUserGroup>
-            {
-                CreateUserGroup(Group1Id, Group1Alias),
-                CreateUserGroup(Group2Id, Group2Alias),
-            });
-        mockUserService
-            .Setup(x => x.GetAllUserGroups(It.Is<int[]>(y => y.Length == 2 && y[0] == Group2Id && y[1] == Group3Id)))
-            .Returns(new List<IUserGroup>
-            {
-                CreateUserGroup(Group2Id, Group2Alias),
-                CreateUserGroup(Group3Id, Group3Alias),
-            });
-        return mockUserService;
-    }
-
-    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(bool userIsAdmin)
-    {
-        var user = CreateUser(userIsAdmin);
-        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
-        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-        return mockBackOfficeSecurityAccessor;
-    }
-
-    private static User CreateUser(bool isAdmin = false) =>
-        new UserBuilder()
-            .AddUserGroup()
-            .WithAlias(isAdmin ? Constants.Security.AdminGroupAlias : Group1Alias)
-            .Done()
-            .Build();
-
-    private IUserGroup CreateUserGroup(int id, string alias) =>
-        new UserGroupBuilder()
-            .WithId(id)
-            .WithAlias(alias)
-            .Build();
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/CollectionBuilders/TreeCollectionBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/CollectionBuilders/TreeCollectionBuilderTests.cs
deleted file mode 100644
index a3384f73f4..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/CollectionBuilders/TreeCollectionBuilderTests.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Linq;
-using NUnit.Framework;
-using Umbraco.Cms.Core.Trees;
-using Umbraco.Cms.Web.BackOffice.Trees;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.CollectionBuilders;
-
-public class TreeCollectionBuilderTests
-{
-    [Test]
-    public void Adding_Tree_To_Collection_Builder()
-    {
-        var collectionBuilder = new TreeCollectionBuilder();
-        var treeDefinition = new Tree(
-            0,
-            "test",
-            "test",
-            "test",
-            "test",
-            TreeUse.Main,
-            typeof(LanguageTreeController),
-            false);
-
-        collectionBuilder.AddTree(treeDefinition);
-        var collection = collectionBuilder.CreateCollection(null);
-
-        Assert.AreEqual(1, collection.Count);
-        Assert.AreEqual(treeDefinition, collection.FirstOrDefault());
-    }
-
-    [Test]
-    public void Remove_Tree_From_Collection_Builder()
-    {
-        var collectionBuilder = new TreeCollectionBuilder();
-        var treeDefinition = new Tree(0, "test", "test", "test", "test", TreeUse.Main, typeof(LanguageTreeController), false);
-
-        collectionBuilder.AddTree(treeDefinition);
-        collectionBuilder.RemoveTreeController<LanguageTreeController>();
-        var collection = collectionBuilder.CreateCollection(null);
-
-        Assert.AreEqual(0, collection.Count);
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
deleted file mode 100644
index fdce6f0f9b..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
+++ /dev/null
@@ -1,279 +0,0 @@
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Options;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Dictionary;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Serialization;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Infrastructure.Persistence;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers;
-
-[TestFixture]
-public class ContentControllerTests
-{
-    [Test]
-    public void Root_Node_With_Domains_Causes_No_Warning()
-    {
-        // Setup domain service
-        var domainServiceMock = new Mock<IDomainService>();
-        domainServiceMock.Setup(x => x.GetAssignedDomains(1060, It.IsAny<bool>()))
-            .Returns(new[] { new UmbracoDomain("/", "da-dk"), new UmbracoDomain("/en", "en-us") });
-
-        // Create content, we need to specify and ID in order to be able to configure domain service
-        var rootNode = new ContentBuilder()
-            .WithContentType(CreateContentType())
-            .WithId(1060)
-            .AddContentCultureInfosCollection()
-            .AddCultureInfos()
-            .WithCultureIso("da-dk")
-            .Done()
-            .AddCultureInfos()
-            .WithCultureIso("en-us")
-            .Done()
-            .Done()
-            .Build();
-
-        var culturesPublished = new[] { "en-us", "da-dk" };
-        var notifications = new SimpleNotificationModel();
-
-        var contentController = CreateContentController(domainServiceMock.Object);
-        contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
-
-        Assert.IsEmpty(notifications.Notifications);
-    }
-
-    [Test]
-    public void Node_With_Single_Published_Culture_Causes_No_Warning()
-    {
-        var domainServiceMock = new Mock<IDomainService>();
-        domainServiceMock.Setup(x => x.GetAssignedDomains(It.IsAny<int>(), It.IsAny<bool>()))
-            .Returns(Enumerable.Empty<IDomain>());
-
-        var rootNode = new ContentBuilder()
-            .WithContentType(CreateContentType())
-            .WithId(1060)
-            .AddContentCultureInfosCollection()
-            .AddCultureInfos()
-            .WithCultureIso("da-dk")
-            .Done()
-            .Done()
-            .Build();
-
-        var culturesPublished = new[] { "da-dk" };
-        var notifications = new SimpleNotificationModel();
-
-        var contentController = CreateContentController(domainServiceMock.Object);
-        contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
-
-        Assert.IsEmpty(notifications.Notifications);
-    }
-
-    [Test]
-    public void Root_Node_Without_Domains_Causes_SingleWarning()
-    {
-        var domainServiceMock = new Mock<IDomainService>();
-        domainServiceMock.Setup(x => x.GetAssignedDomains(It.IsAny<int>(), It.IsAny<bool>()))
-            .Returns(Enumerable.Empty<IDomain>());
-
-        var rootNode = new ContentBuilder()
-            .WithContentType(CreateContentType())
-            .WithId(1060)
-            .AddContentCultureInfosCollection()
-            .AddCultureInfos()
-            .WithCultureIso("da-dk")
-            .Done()
-            .AddCultureInfos()
-            .WithCultureIso("en-us")
-            .Done()
-            .Done()
-            .Build();
-
-        var culturesPublished = new[] { "en-us", "da-dk" };
-        var notifications = new SimpleNotificationModel();
-
-        var contentController = CreateContentController(domainServiceMock.Object);
-        contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
-        Assert.AreEqual(1, notifications.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-    }
-
-    [Test]
-    public void One_Warning_Per_Culture_Being_Published()
-    {
-        var domainServiceMock = new Mock<IDomainService>();
-        domainServiceMock.Setup(x => x.GetAssignedDomains(It.IsAny<int>(), It.IsAny<bool>()))
-            .Returns(new[] { new UmbracoDomain("/", "da-dk") });
-
-        var rootNode = new ContentBuilder()
-            .WithContentType(CreateContentType())
-            .WithId(1060)
-            .AddContentCultureInfosCollection()
-            .AddCultureInfos()
-            .WithCultureIso("da-dk")
-            .Done()
-            .AddCultureInfos()
-            .WithCultureIso("en-us")
-            .Done()
-            .Done()
-            .Build();
-
-        var culturesPublished = new[] { "en-us", "da-dk", "nl-bk", "se-sv" };
-        var notifications = new SimpleNotificationModel();
-
-        var contentController = CreateContentController(domainServiceMock.Object);
-        contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
-        Assert.AreEqual(3, notifications.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-    }
-
-    [Test]
-    public void Ancestor_Domains_Counts()
-    {
-        var rootId = 1060;
-        var level1Id = 1061;
-        var level2Id = 1062;
-        var level3Id = 1063;
-
-        var domainServiceMock = new Mock<IDomainService>();
-        domainServiceMock.Setup(x => x.GetAssignedDomains(rootId, It.IsAny<bool>()))
-            .Returns(new[] { new UmbracoDomain("/", "da-dk") });
-
-        domainServiceMock.Setup(x => x.GetAssignedDomains(level1Id, It.IsAny<bool>()))
-            .Returns(new[] { new UmbracoDomain("/en", "en-us") });
-
-        domainServiceMock.Setup(x => x.GetAssignedDomains(level2Id, It.IsAny<bool>()))
-            .Returns(new[] { new UmbracoDomain("/se", "se-sv"), new UmbracoDomain("/nl", "nl-bk") });
-
-        var level3Node = new ContentBuilder()
-            .WithContentType(CreateContentType())
-            .WithId(level3Id)
-            .WithPath($"-1,{rootId},{level1Id},{level2Id},{level3Id}")
-            .AddContentCultureInfosCollection()
-            .AddCultureInfos()
-            .WithCultureIso("da-dk")
-            .Done()
-            .AddCultureInfos()
-            .WithCultureIso("en-us")
-            .Done()
-            .AddCultureInfos()
-            .WithCultureIso("se-sv")
-            .Done()
-            .AddCultureInfos()
-            .WithCultureIso("nl-bk")
-            .Done()
-            .AddCultureInfos()
-            .WithCultureIso("de-de")
-            .Done()
-            .Done()
-            .Build();
-
-        var culturesPublished = new[] { "en-us", "da-dk", "nl-bk", "se-sv", "de-de" };
-
-        var contentController = CreateContentController(domainServiceMock.Object);
-        var notifications = new SimpleNotificationModel();
-
-        contentController.AddDomainWarnings(level3Node, culturesPublished, notifications);
-
-        // We expect one error because all domains except "de-de" is registered somewhere in the ancestor path
-        Assert.AreEqual(1, notifications.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-    }
-
-    [Test]
-    public void Only_Warns_About_Cultures_Being_Published()
-    {
-        var domainServiceMock = new Mock<IDomainService>();
-        domainServiceMock.Setup(x => x.GetAssignedDomains(It.IsAny<int>(), It.IsAny<bool>()))
-            .Returns(new[] { new UmbracoDomain("/", "da-dk") });
-
-        var rootNode = new ContentBuilder()
-            .WithContentType(CreateContentType())
-            .WithId(1060)
-            .AddContentCultureInfosCollection()
-            .AddCultureInfos()
-            .WithCultureIso("da-dk")
-            .Done()
-            .AddCultureInfos()
-            .WithCultureIso("en-us")
-            .Done()
-            .AddCultureInfos()
-            .WithCultureIso("se-sv")
-            .Done()
-            .AddCultureInfos()
-            .WithCultureIso("de-de")
-            .Done()
-            .Done()
-            .Build();
-
-        var culturesPublished = new[] { "en-us", "se-sv" };
-        var notifications = new SimpleNotificationModel();
-
-        var contentController = CreateContentController(domainServiceMock.Object);
-        contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
-
-        // We only get two errors, one for each culture being published, so no errors from previously published cultures.
-        Assert.AreEqual(2, notifications.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-    }
-
-    private ContentController CreateContentController(IDomainService domainService)
-    {
-        // We have to configure ILocalizedTextService to return a new string every time Localize is called
-        // Otherwise it won't add the notification because it skips dupes
-        var localizedTextServiceMock = new Mock<ILocalizedTextService>();
-        localizedTextServiceMock.Setup(x => x.Localize(
-                It.IsAny<string>(),
-                It.IsAny<string>(),
-                It.IsAny<CultureInfo>(),
-                It.IsAny<IDictionary<string, string>>()))
-            .Returns(() => Guid.NewGuid().ToString());
-
-        var controller = new ContentController(
-            Mock.Of<ICultureDictionary>(),
-            NullLoggerFactory.Instance,
-            Mock.Of<IShortStringHelper>(),
-            Mock.Of<IEventMessagesFactory>(),
-            localizedTextServiceMock.Object,
-            new PropertyEditorCollection(new DataEditorCollection(() => null)),
-            Mock.Of<IContentService>(),
-            Mock.Of<IUserService>(),
-            Mock.Of<IBackOfficeSecurityAccessor>(),
-            Mock.Of<IContentTypeService>(),
-            Mock.Of<IUmbracoMapper>(),
-            Mock.Of<IPublishedUrlProvider>(),
-            domainService,
-            Mock.Of<IDataTypeService>(),
-            Mock.Of<ILocalizationService>(),
-            Mock.Of<IFileService>(),
-            Mock.Of<INotificationService>(),
-            new ActionCollection(() => null),
-            Mock.Of<ISqlContext>(),
-            Mock.Of<IJsonSerializer>(),
-            Mock.Of<ICoreScopeProvider>(),
-            Mock.Of<IAuthorizationService>(),
-            Mock.Of<IContentVersionService>(),
-            Mock.Of<ICultureImpactFactory>(),
-            Mock.Of<IUserGroupService>(),
-            new OptionsWrapper<ContentSettings>(new ContentSettings()));
-
-        return controller;
-    }
-
-    private IContentType CreateContentType() =>
-        new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs
deleted file mode 100644
index bddc4b70d0..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using AutoFixture.NUnit3;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Tests.UnitTests.AutoFixture;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers;
-
-[TestFixture]
-public class UsersControllerTests
-{
-    [Test]
-    [AutoMoqData]
-    public void PostUnlockUsers_When_User_Lockout_Update_Fails_Expect_Failure_Response(
-        [Frozen] IBackOfficeUserManager backOfficeUserManager,
-        UsersController sut,
-        BackOfficeIdentityUser user,
-        int[] userIds,
-        string expectedMessage)
-    {
-        Mock.Get(backOfficeUserManager)
-            .Setup(x => x.FindByIdAsync(It.IsAny<string>()))
-            .ReturnsAsync(user);
-
-        var result = sut.PostUnlockUsers(userIds).Result as ObjectResult;
-        Assert.AreEqual(StatusCodes.Status400BadRequest, result.StatusCode);
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs
deleted file mode 100644
index abbd5cae2d..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Extensions;
-
-[TestFixture]
-public class ModelStateExtensionsTests
-{
-    [Test]
-    public void Get_Cultures_With_Errors()
-    {
-        var ms = new ModelStateDictionary();
-        var localizationService = new Mock<ILocalizationService>();
-        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
-
-        ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null); // invariant property
-        ms.AddPropertyError(new ValidationResult("title missing"), "title", "en-US"); // variant property
-
-        var result = ms.GetVariantsWithErrors("en-US");
-
-        // even though there are 2 errors, they are both for en-US since that is the default language and one of the errors is for an invariant property
-        Assert.AreEqual(1, result.Count);
-        Assert.AreEqual("en-US", result[0].culture);
-
-        ms = new ModelStateDictionary();
-        ms.AddVariantValidationError("en-US", null, "generic culture error");
-
-        result = ms.GetVariantsWithErrors("en-US");
-
-        Assert.AreEqual(1, result.Count);
-        Assert.AreEqual("en-US", result[0].culture);
-    }
-
-    [Test]
-    public void Get_Cultures_With_Property_Errors()
-    {
-        var ms = new ModelStateDictionary();
-        var localizationService = new Mock<ILocalizationService>();
-        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
-
-        ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null); // invariant property
-        ms.AddPropertyError(new ValidationResult("title missing"), "title", "en-US"); // variant property
-
-        var result = ms.GetVariantsWithPropertyErrors("en-US");
-
-        // even though there are 2 errors, they are both for en-US since that is the default language and one of the errors is for an invariant property
-        Assert.AreEqual(1, result.Count);
-        Assert.AreEqual("en-US", result[0].culture);
-    }
-
-    [Test]
-    public void Add_Invariant_Property_Error()
-    {
-        var ms = new ModelStateDictionary();
-        var localizationService = new Mock<ILocalizationService>();
-        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
-
-        ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null); // invariant property
-
-        Assert.AreEqual("_Properties.headerImage.invariant.null", ms.Keys.First());
-    }
-
-    [Test]
-    public void Add_Variant_Property_Error()
-    {
-        var ms = new ModelStateDictionary();
-        var localizationService = new Mock<ILocalizationService>();
-        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
-
-        ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", "en-US"); // variant property
-
-        Assert.AreEqual("_Properties.headerImage.en-US.null", ms.Keys.First());
-    }
-
-    [Test]
-    public void Add_Invariant_Segment_Property_Error()
-    {
-        var ms = new ModelStateDictionary();
-        var localizationService = new Mock<ILocalizationService>();
-        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
-
-        ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null, "mySegment"); // invariant/segment property
-
-        Assert.AreEqual("_Properties.headerImage.invariant.mySegment", ms.Keys.First());
-    }
-
-    [Test]
-    public void Add_Variant_Segment_Property_Error()
-    {
-        var ms = new ModelStateDictionary();
-        var localizationService = new Mock<ILocalizationService>();
-        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
-
-        ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", "en-US", "mySegment"); // variant/segment property
-
-        Assert.AreEqual("_Properties.headerImage.en-US.mySegment", ms.Keys.First());
-    }
-
-    [Test]
-    public void Add_Invariant_Segment_Field_Property_Error()
-    {
-        var ms = new ModelStateDictionary();
-        var localizationService = new Mock<ILocalizationService>();
-        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
-
-        ms.AddPropertyError(new ValidationResult("no header image", new[] { "myField" }), "headerImage", null, "mySegment"); // invariant/segment property
-
-        Assert.AreEqual("_Properties.headerImage.invariant.mySegment.myField", ms.Keys.First());
-    }
-
-    [Test]
-    public void Add_Variant_Segment_Field_Property_Error()
-    {
-        var ms = new ModelStateDictionary();
-        var localizationService = new Mock<ILocalizationService>();
-        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
-
-        ms.AddPropertyError(new ValidationResult("no header image", new[] { "myField" }), "headerImage", "en-US", "mySegment"); // variant/segment property
-
-        Assert.AreEqual("_Properties.headerImage.en-US.mySegment.myField", ms.Keys.First());
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs
deleted file mode 100644
index e71570e311..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Abstractions;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Routing;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Web.BackOffice.Filters;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters;
-
-[TestFixture]
-public class AppendUserModifiedHeaderAttributeTests
-{
-    [Test]
-    public void Appends_Header_When_No_User_Parameter_Provider()
-    {
-        // Arrange
-        var context = CreateContext();
-        var attribute = new AppendUserModifiedHeaderAttribute();
-
-        // Act
-        attribute.OnActionExecuting(context);
-
-        // Assert
-        context.HttpContext.Response.Headers.TryGetValue("X-Umb-User-Modified", out var headerValue);
-        Assert.AreEqual("1", headerValue[0]);
-    }
-
-    [Test]
-    public void Does_Not_Append_Header_If_Already_Exists()
-    {
-        // Arrange
-        var context = CreateContext("0");
-        var attribute = new AppendUserModifiedHeaderAttribute();
-
-        // Act
-        attribute.OnActionExecuting(context);
-
-        // Assert
-        context.HttpContext.Response.Headers.TryGetValue("X-Umb-User-Modified", out var headerValue);
-        Assert.AreEqual("0", headerValue[0]);
-    }
-
-    [Test]
-    public void Does_Not_Append_Header_When_User_Id_Parameter_Provided_And_Does_Not_Match_Current_User()
-    {
-        // Arrange
-        var context = CreateContext(actionArgument: new KeyValuePair<string, object>("UserId", 99));
-        var userIdParameter = "UserId";
-        var attribute = new AppendUserModifiedHeaderAttribute(userIdParameter);
-
-        // Act
-        attribute.OnActionExecuting(context);
-
-        // Assert
-        Assert.IsFalse(context.HttpContext.Response.Headers.ContainsKey("X-Umb-User-Modified"));
-    }
-
-    [Test]
-    public void Appends_Header_When_User_Id_Parameter_Provided_And_Does_Not_Match_Current_User()
-    {
-        // Arrange
-        var context = CreateContext(actionArgument: new KeyValuePair<string, object>("UserId", 100));
-        var userIdParameter = "UserId";
-        var attribute = new AppendUserModifiedHeaderAttribute(userIdParameter);
-
-        // Act
-        attribute.OnActionExecuting(context);
-
-        // Assert
-        context.HttpContext.Response.Headers.TryGetValue("X-Umb-User-Modified", out var headerValue);
-        Assert.AreEqual("1", headerValue[0]);
-    }
-
-    private static ActionExecutingContext CreateContext(
-        string headerValue = null,
-        KeyValuePair<string, object> actionArgument = default)
-    {
-        var httpContext = new DefaultHttpContext();
-        if (!string.IsNullOrEmpty(headerValue))
-        {
-            httpContext.Response.Headers.Add("X-Umb-User-Modified", headerValue);
-        }
-
-        var currentUserMock = new Mock<IUser>();
-        currentUserMock
-            .SetupGet(x => x.Id)
-            .Returns(100);
-
-        var backofficeSecurityMock = new Mock<IBackOfficeSecurity>();
-        backofficeSecurityMock
-            .SetupGet(x => x.CurrentUser)
-            .Returns(currentUserMock.Object);
-
-        var backofficeSecurityAccessorMock = new Mock<IBackOfficeSecurityAccessor>();
-        backofficeSecurityAccessorMock
-            .SetupGet(x => x.BackOfficeSecurity)
-            .Returns(backofficeSecurityMock.Object);
-
-        var serviceProviderMock = new Mock<IServiceProvider>();
-        serviceProviderMock
-            .Setup(x => x.GetService(typeof(IBackOfficeSecurityAccessor)))
-            .Returns(backofficeSecurityAccessorMock.Object);
-
-        httpContext.RequestServices = serviceProviderMock.Object;
-
-        var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
-
-        var context = new ActionExecutingContext(
-            actionContext,
-            new List<IFilterMetadata>(),
-            new Dictionary<string, object>(),
-            new Mock<Controller>().Object);
-
-        if (!EqualityComparer<KeyValuePair<string, object>>.Default.Equals(actionArgument, default))
-        {
-            context.ActionArguments.Add(actionArgument);
-        }
-
-        return context;
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs
deleted file mode 100644
index e1175c789b..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.ComponentModel.DataAnnotations;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-using Umbraco.Cms.Core.PropertyEditors.Validation;
-using Umbraco.Cms.Web.BackOffice.PropertyEditors.Validation;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters;
-
-[TestFixture]
-public class ContentModelValidatorTests
-{
-    [Test]
-    public void Test_Serializer()
-    {
-        var nestedLevel2 = new ComplexEditorValidationResult();
-        var id1 = Guid.NewGuid();
-        var addressInfoElementTypeResult = new ComplexEditorElementTypeValidationResult("addressInfo", id1);
-        var cityPropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("city");
-        cityPropertyTypeResult.AddValidationResult(new ValidationResult("City is invalid"));
-        cityPropertyTypeResult.AddValidationResult(new ValidationResult("City cannot be empty"));
-        cityPropertyTypeResult.AddValidationResult(new ValidationResult("City is not in Australia", new[] { "country" }));
-        cityPropertyTypeResult.AddValidationResult(new ValidationResult("Not a capital city", new[] { "capital" }));
-        addressInfoElementTypeResult.ValidationResults.Add(cityPropertyTypeResult);
-        nestedLevel2.ValidationResults.Add(addressInfoElementTypeResult);
-
-        var nestedLevel1 = new ComplexEditorValidationResult();
-        var id2 = Guid.NewGuid();
-        var addressBookElementTypeResult = new ComplexEditorElementTypeValidationResult("addressBook", id2);
-        var addressesPropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("addresses");
-        addressesPropertyTypeResult.AddValidationResult(new ValidationResult("Must have at least 3 addresses", new[] { "counter" }));
-        addressesPropertyTypeResult.AddValidationResult(nestedLevel2); // This is a nested result within the level 1
-        addressBookElementTypeResult.ValidationResults.Add(addressesPropertyTypeResult);
-        var bookNamePropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("bookName");
-        bookNamePropertyTypeResult.AddValidationResult(
-            new ValidationResult("Invalid address book name", new[] { "book" }));
-        addressBookElementTypeResult.ValidationResults.Add(bookNamePropertyTypeResult);
-        nestedLevel1.ValidationResults.Add(addressBookElementTypeResult);
-
-        var id3 = Guid.NewGuid();
-        var addressBookElementTypeResult2 = new ComplexEditorElementTypeValidationResult("addressBook", id3);
-        var addressesPropertyTypeResult2 = new ComplexEditorPropertyTypeValidationResult("addresses");
-        addressesPropertyTypeResult2.AddValidationResult(new ValidationResult("Must have at least 2 addresses", new[] { "counter" }));
-        addressBookElementTypeResult2.ValidationResults.Add(addressesPropertyTypeResult);
-        var bookNamePropertyTypeResult2 = new ComplexEditorPropertyTypeValidationResult("bookName");
-        bookNamePropertyTypeResult2.AddValidationResult(new ValidationResult("Name is too long"));
-        addressBookElementTypeResult2.ValidationResults.Add(bookNamePropertyTypeResult2);
-        nestedLevel1.ValidationResults.Add(addressBookElementTypeResult2);
-
-        // books is the outer most validation result and doesn't have it's own direct ValidationResult errors
-        var outerError = new ComplexEditorValidationResult();
-        var id4 = Guid.NewGuid();
-        var addressBookCollectionElementTypeResult =
-            new ComplexEditorElementTypeValidationResult("addressBookCollection", id4);
-        var booksPropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("books");
-        booksPropertyTypeResult.AddValidationResult(nestedLevel1); // books is the outer most validation result
-        addressBookCollectionElementTypeResult.ValidationResults.Add(booksPropertyTypeResult);
-        outerError.ValidationResults.Add(addressBookCollectionElementTypeResult);
-
-        var serialized = JsonConvert.SerializeObject(outerError, Formatting.Indented, new ValidationResultConverter());
-        Console.WriteLine(serialized);
-
-        var jsonError = JsonConvert.DeserializeObject<JArray>(serialized);
-
-        Assert.IsNotNull(jsonError.SelectToken("$[0]"));
-        Assert.AreEqual(id4.ToString(), jsonError.SelectToken("$[0].$id").Value<string>());
-        Assert.AreEqual("addressBookCollection", jsonError.SelectToken("$[0].$elementTypeAlias").Value<string>());
-        Assert.AreEqual(string.Empty, jsonError.SelectToken("$[0].ModelState['_Properties.books.invariant.null'][0]").Value<string>());
-
-        var error0 = jsonError.SelectToken("$[0].books") as JArray;
-        Assert.IsNotNull(error0);
-        Assert.AreEqual(id2.ToString(), error0.SelectToken("$[0].$id").Value<string>());
-        Assert.AreEqual("addressBook", error0.SelectToken("$[0].$elementTypeAlias").Value<string>());
-        Assert.IsNotNull(error0.SelectToken("$[0].ModelState"));
-        Assert.AreEqual(string.Empty, error0.SelectToken("$[0].ModelState['_Properties.addresses.invariant.null'][0]").Value<string>());
-        var error1 = error0.SelectToken("$[0].ModelState['_Properties.addresses.invariant.null.counter']") as JArray;
-        Assert.IsNotNull(error1);
-        Assert.AreEqual(1, error1.Count);
-        var error2 = error0.SelectToken("$[0].ModelState['_Properties.bookName.invariant.null.book']") as JArray;
-        Assert.IsNotNull(error2);
-        Assert.AreEqual(1, error2.Count);
-
-        Assert.AreEqual(id3.ToString(), error0.SelectToken("$[1].$id").Value<string>());
-        Assert.AreEqual("addressBook", error0.SelectToken("$[1].$elementTypeAlias").Value<string>());
-        Assert.IsNotNull(error0.SelectToken("$[1].ModelState"));
-        Assert.AreEqual(string.Empty, error0.SelectToken("$[1].ModelState['_Properties.addresses.invariant.null'][0]").Value<string>());
-        var error6 = error0.SelectToken("$[1].ModelState['_Properties.addresses.invariant.null.counter']") as JArray;
-        Assert.IsNotNull(error6);
-        Assert.AreEqual(1, error6.Count);
-        var error7 = error0.SelectToken("$[1].ModelState['_Properties.bookName.invariant.null']") as JArray;
-        Assert.IsNotNull(error7);
-        Assert.AreEqual(1, error7.Count);
-
-        Assert.IsNotNull(error0.SelectToken("$[0].addresses"));
-        Assert.AreEqual(id1.ToString(), error0.SelectToken("$[0].addresses[0].$id").Value<string>());
-        Assert.AreEqual("addressInfo", error0.SelectToken("$[0].addresses[0].$elementTypeAlias").Value<string>());
-        Assert.IsNotNull(error0.SelectToken("$[0].addresses[0].ModelState"));
-        var error3 =
-            error0.SelectToken("$[0].addresses[0].ModelState['_Properties.city.invariant.null.country']") as JArray;
-        Assert.IsNotNull(error3);
-        Assert.AreEqual(1, error3.Count);
-        var error4 =
-            error0.SelectToken("$[0].addresses[0].ModelState['_Properties.city.invariant.null.capital']") as JArray;
-        Assert.IsNotNull(error4);
-        Assert.AreEqual(1, error4.Count);
-        var error5 = error0.SelectToken("$[0].addresses[0].ModelState['_Properties.city.invariant.null']") as JArray;
-        Assert.IsNotNull(error5);
-        Assert.AreEqual(2, error5.Count);
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs
deleted file mode 100644
index 08e704c692..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNetCore.Mvc;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Tests.Common.Builders;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Web.BackOffice.Filters;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters;
-
-[TestFixture]
-public class FilterAllowedOutgoingContentAttributeTests
-{
-    [Test]
-    public void GetValueFromResponse_Already_EnumerableContent()
-    {
-        var expected = new List<ContentItemBasic> { new() };
-
-        var att = new FilterAllowedOutgoingContentFilter(
-            expected.GetType(),
-            null,
-            ActionBrowse.ActionLetter,
-            Mock.Of<IUserService>(),
-            Mock.Of<IEntityService>(),
-            AppCaches.Disabled,
-            Mock.Of<IBackOfficeSecurityAccessor>());
-
-        var result = att.GetValueFromResponse(new ObjectResult(expected));
-
-        Assert.AreEqual(expected, result);
-    }
-
-    [Test]
-    public void GetValueFromResponse_From_Property()
-    {
-        var expected = new List<ContentItemBasic> { new() };
-        var container = new MyTestClass { MyList = expected };
-
-        var att = new FilterAllowedOutgoingContentFilter(
-            expected.GetType(),
-            nameof(MyTestClass.MyList),
-            ActionBrowse.ActionLetter,
-            Mock.Of<IUserService>(),
-            Mock.Of<IEntityService>(),
-            AppCaches.Disabled,
-            Mock.Of<IBackOfficeSecurityAccessor>());
-
-        var result = att.GetValueFromResponse(new ObjectResult(container));
-
-        Assert.AreEqual(expected, result);
-    }
-
-    [Test]
-    public void GetValueFromResponse_Returns_Null_Not_Found_Property()
-    {
-        var expected = new List<ContentItemBasic> { new() };
-        var container = new MyTestClass { MyList = expected };
-
-        var att = new FilterAllowedOutgoingContentFilter(
-            expected.GetType(),
-            "DontFind",
-            ActionBrowse.ActionLetter,
-            Mock.Of<IUserService>(),
-            Mock.Of<IEntityService>(),
-            AppCaches.Disabled,
-            Mock.Of<IBackOfficeSecurityAccessor>());
-
-        var actual = att.GetValueFromResponse(new ObjectResult(container));
-
-        Assert.IsNull(actual);
-    }
-
-    [Test]
-    public void Filter_On_Start_Node()
-    {
-        var user = CreateUser(9, 5);
-        var userServiceMock = new Mock<IUserService>();
-        var userService = userServiceMock.Object;
-        var entityServiceMock = new Mock<IEntityService>();
-        entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-            .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 5 && entity.Path == "-1,5") });
-        var entityService = entityServiceMock.Object;
-
-        var list = new List<ContentItemBasic>();
-        var att = new FilterAllowedOutgoingContentFilter(
-            list.GetType(),
-            null,
-            ActionBrowse.ActionLetter,
-            userService,
-            entityService,
-            AppCaches.Disabled,
-            Mock.Of<IBackOfficeSecurityAccessor>());
-
-        var path = string.Empty;
-        for (var i = 0; i < 10; i++)
-        {
-            if (i > 0 && path.EndsWith(",") == false)
-            {
-                path += ",";
-            }
-
-            path += i.ToInvariantString();
-            list.Add(new ContentItemBasic { Id = i, Name = "Test" + i, ParentId = i, Path = path });
-        }
-
-        att.FilterBasedOnStartNode(list, user);
-
-        Assert.AreEqual(5, list.Count);
-    }
-
-    [Test]
-    public void Filter_On_Permissions()
-    {
-        var list = new List<ContentItemBasic>();
-        for (var i = 0; i < 10; i++)
-        {
-            list.Add(new ContentItemBasic { Id = i, Name = "Test" + i, ParentId = -1 });
-        }
-
-        var ids = list.Select(x => (int)x.Id).ToArray();
-
-        var user = CreateUser(9, 0);
-
-        var userServiceMock = new Mock<IUserService>();
-
-        // We're only assigning 3 nodes browse permissions so that is what we expect as a result
-        var permissions = new EntityPermissionCollection
-        {
-            new(9876, 1, new[] { ActionBrowse.ActionLetter.ToString() }),
-            new(9876, 2, new[] { ActionBrowse.ActionLetter.ToString() }),
-            new(9876, 3, new[] { ActionBrowse.ActionLetter.ToString() }),
-            new(9876, 4, new[] { ActionUpdate.ActionLetter.ToString() }),
-        };
-        userServiceMock.Setup(x => x.GetPermissions(user, ids)).Returns(permissions);
-        var userService = userServiceMock.Object;
-
-        var att = new FilterAllowedOutgoingContentFilter(
-            list.GetType(),
-            null,
-            ActionBrowse.ActionLetter,
-            userService,
-            Mock.Of<IEntityService>(),
-            AppCaches.Disabled,
-            Mock.Of<IBackOfficeSecurityAccessor>());
-        att.FilterBasedOnPermissions(list, user);
-
-        Assert.AreEqual(3, list.Count);
-        Assert.AreEqual(1, list.ElementAt(0).Id);
-        Assert.AreEqual(2, list.ElementAt(1).Id);
-        Assert.AreEqual(3, list.ElementAt(2).Id);
-    }
-
-    private IUser CreateUser(int id = 0, int? startContentId = null) =>
-        new UserBuilder()
-            .WithId(id)
-            .WithStartContentIds(startContentId.HasValue ? new[] { startContentId.Value } : new int[0])
-            .Build();
-
-    private class MyTestClass
-    {
-        public IEnumerable<ContentItemBasic> MyList { get; set; }
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs
deleted file mode 100644
index 0248c02216..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Abstractions;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.AspNetCore.Routing;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Web.BackOffice.Filters;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters;
-
-[TestFixture]
-public class ValidationFilterAttributeTests
-{
-    [Test]
-    public void Does_Not_Set_Result_When_No_Errors_In_Model_State()
-    {
-        // Arrange
-        var context = CreateContext();
-        var attribute = new ValidationFilterAttribute();
-
-        // Act
-        attribute.OnActionExecuting(context);
-
-        // Assert
-        Assert.IsNull(context.Result);
-    }
-
-    [Test]
-    public void Returns_Bad_Request_When_Errors_In_Model_State()
-    {
-        // Arrange
-        var context = CreateContext(true);
-        var attribute = new ValidationFilterAttribute();
-
-        // Act
-        attribute.OnActionExecuting(context);
-
-        // Assert
-        var typedResult = context.Result as BadRequestObjectResult;
-        Assert.IsNotNull(typedResult);
-    }
-
-    private static ActionExecutingContext CreateContext(bool withError = false)
-    {
-        var httpContext = new DefaultHttpContext();
-
-        var modelState = new ModelStateDictionary();
-        if (withError)
-        {
-            modelState.AddModelError(string.Empty, "Error");
-        }
-
-        var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor(), modelState);
-
-        return new ActionExecutingContext(
-            actionContext,
-            new List<IFilterMetadata>(),
-            new Dictionary<string, object>(),
-            new Mock<Controller>().Object);
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs
deleted file mode 100644
index c59f9db68f..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.Extensions.Options;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Web;
-using Umbraco.Cms.Tests.UnitTests.TestHelpers;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.BackOffice.Security;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Security;
-
-[TestFixture]
-public class BackOfficeCookieManagerTests
-{
-    [Test]
-    public void ShouldAuthenticateRequest_When_Not_Configured()
-    {
-        var globalSettings = new GlobalSettings();
-        var umbracoRequestPathsOptions = new UmbracoRequestPathsOptions();
-
-        var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Install);
-        var mgr = new BackOfficeCookieManager(
-            Mock.Of<IUmbracoContextAccessor>(),
-            runtime,
-            new UmbracoRequestPaths(Options.Create(globalSettings), TestHelper.GetHostingEnvironment(), Options.Create(umbracoRequestPathsOptions)),
-            Mock.Of<IBasicAuthService>());
-
-        var result = mgr.ShouldAuthenticateRequest("/umbraco");
-
-        Assert.IsFalse(result);
-    }
-
-    [Test]
-    public void ShouldAuthenticateRequest_When_Configured()
-    {
-        var globalSettings = new GlobalSettings();
-        var umbracoRequestPathsOptions = new UmbracoRequestPathsOptions();
-
-        var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
-        var mgr = new BackOfficeCookieManager(
-            Mock.Of<IUmbracoContextAccessor>(),
-            runtime,
-            new UmbracoRequestPaths(
-                Options.Create(globalSettings),
-                Mock.Of<IHostingEnvironment>(x =>
-                    x.ApplicationVirtualPath == "/" && x.ToAbsolute(globalSettings.UmbracoPath) == "/umbraco"),
-                Options.Create(umbracoRequestPathsOptions)),
-            Mock.Of<IBasicAuthService>());
-
-        var result = mgr.ShouldAuthenticateRequest("/umbraco");
-
-        Assert.IsTrue(result);
-    }
-
-    [Test]
-    public void ShouldAuthenticateRequest_Is_Back_Office()
-    {
-        var globalSettings = new GlobalSettings();
-        var umbracoRequestPathsOptions = new UmbracoRequestPathsOptions();
-
-        var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
-
-        GenerateAuthPaths(out var remainingTimeoutSecondsPath, out var isAuthPath);
-
-        var mgr = new BackOfficeCookieManager(
-            Mock.Of<IUmbracoContextAccessor>(),
-            runtime,
-            new UmbracoRequestPaths(
-                Options.Create(globalSettings),
-                Mock.Of<IHostingEnvironment>(x =>
-                    x.ApplicationVirtualPath == "/" && x.ToAbsolute(globalSettings.UmbracoPath) == "/umbraco" &&
-                    x.ToAbsolute(Constants.SystemDirectories.Install) == "/install"),
-                Options.Create(umbracoRequestPathsOptions)),
-            Mock.Of<IBasicAuthService>());
-
-        var result = mgr.ShouldAuthenticateRequest(remainingTimeoutSecondsPath);
-        Assert.IsTrue(result);
-
-        result = mgr.ShouldAuthenticateRequest(isAuthPath);
-        Assert.IsTrue(result);
-    }
-
-    [Test]
-    public void ShouldAuthenticateRequest_Not_Back_Office()
-    {
-        var globalSettings = new GlobalSettings();
-        var umbracoRequestPathsOptions = new UmbracoRequestPathsOptions();
-
-        var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
-
-        var mgr = new BackOfficeCookieManager(
-            Mock.Of<IUmbracoContextAccessor>(),
-            runtime,
-            new UmbracoRequestPaths(
-                Options.Create(globalSettings),
-                Mock.Of<IHostingEnvironment>(x =>
-                    x.ApplicationVirtualPath == "/" && x.ToAbsolute(globalSettings.UmbracoPath) == "/umbraco" &&
-                    x.ToAbsolute(Constants.SystemDirectories.Install) == "/install"),
-                Options.Create(umbracoRequestPathsOptions)),
-            Mock.Of<IBasicAuthService>());
-
-        var result = mgr.ShouldAuthenticateRequest("/notbackoffice");
-        Assert.IsFalse(result);
-        result = mgr.ShouldAuthenticateRequest("/umbraco/api/notbackoffice");
-        Assert.IsFalse(result);
-        result = mgr.ShouldAuthenticateRequest("/umbraco/surface/notbackoffice");
-        Assert.IsFalse(result);
-    }
-
-    private void GenerateAuthPaths(out string remainingTimeoutSecondsPath, out string isAuthPath)
-    {
-        var controllerName = ControllerExtensions.GetControllerName<AuthenticationController>();
-
-        // this path is not a back office request even though it's in the same controller - it's a 'special' endpoint
-        var rPath = remainingTimeoutSecondsPath =
-            $"/umbraco/{Constants.Web.Mvc.BackOfficePathSegment}/{Constants.Web.Mvc.BackOfficeApiArea}/{controllerName}/{nameof(AuthenticationController.GetRemainingTimeoutSeconds)}"
-                .ToLower();
-
-        // this is on the same controller but is considered a back office request
-        var aPath = isAuthPath =
-            $"/umbraco/{Constants.Web.Mvc.BackOfficePathSegment}/{Constants.Web.Mvc.BackOfficeApiArea}/{controllerName}/{nameof(AuthenticationController.IsAuthenticated)}"
-                .ToLower();
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs
deleted file mode 100644
index 04d11d6b91..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Infrastructure.WebAssets;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration;
-
-[TestFixture]
-public class ServerVariablesParserTests
-{
-    [Test]
-    public async Task Parse()
-    {
-        var parser = new ServerVariablesParser(Mock.Of<IEventAggregator>());
-
-        var d = new Dictionary<string, object>
-        {
-            { "test1", "Test 1" },
-            { "test2", "Test 2" },
-            { "test3", "Test 3" },
-            { "test4", "Test 4" },
-            { "test5", "Test 5" },
-        };
-
-        var output = (await parser.ParseAsync(d)).StripWhitespace();
-
-        Assert.IsTrue(output.Contains(@"Umbraco.Sys.ServerVariables = {
-  ""test1"": ""Test 1"",
-  ""test2"": ""Test 2"",
-  ""test3"": ""Test 3"",
-  ""test4"": ""Test 4"",
-  ""test5"": ""Test 5""
-} ;".StripWhitespace()));
-    }
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs
index 465b941f8f..bbf72aee91 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs
@@ -6,11 +6,10 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.FileProviders;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Api.Management.Controllers.Security;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Tests.UnitTests.AutoFixture;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.BackOffice.Install;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common;
 
@@ -37,45 +36,7 @@ internal class FileNameTests
 
     [Test]
     [AutoMoqData]
-    public async Task InstallViewExists(
-        [Frozen] IHostingEnvironment hostingEnvironment,
-        InstallController sut)
-    {
-        Mock.Get(hostingEnvironment).Setup(x => x.ToAbsolute(It.IsAny<string>())).Returns("http://localhost/");
-        var viewResult = await sut.Index() as ViewResult;
-        var fileName = GetViewName(viewResult, Path.DirectorySeparatorChar.ToString());
-
-        var views = GetUiFiles(new[] { "umbraco", "UmbracoInstall" });
-        Assert.True(views.Contains(fileName), $"Expected {fileName} to exist, but it didn't");
-    }
-
-    [Test]
-    [AutoMoqData]
-    public void PreviewViewExists(PreviewController sut)
-    {
-        var viewResult = sut.Index() as ViewResult;
-        var fileName = GetViewName(viewResult);
-
-        var views = GetUiFiles(new[] { "umbraco", "UmbracoBackOffice" });
-
-        Assert.True(views.Contains(fileName), $"Expected {fileName} to exist, but it didn't");
-    }
-
-    [Test]
-    [AutoMoqData]
-    public async Task LoginViewExists(BackOfficeController sut)
-    {
-        var viewResult = await sut.Login() as ViewResult;
-        var fileName = GetViewName(viewResult);
-
-        var views = GetUiFiles(new[] { "umbraco", "UmbracoLogin" });
-
-        Assert.True(views.Contains(fileName), $"Expected {fileName} to exist, but it didn't");
-    }
-
-    [Test]
-    [AutoMoqData]
-    public void BackOfficeDefaultExists(BackOfficeController sut)
+    public void BackOfficeDefaultExists(BackOfficeDefaultController sut)
     {
         var viewResult = sut.DefaultView();
         var fileName = GetViewName(viewResult);
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs
index 946b6a14d1..71735ba500 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs
@@ -7,12 +7,12 @@ using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Api.Management.Controllers.Security;
+using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.BackOffice.Routing;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Controllers;
 using Umbraco.Extensions;
@@ -47,11 +47,11 @@ public class BackOfficeAreaRoutesTests
 
         Assert.AreEqual(1, endpoints.DataSources.Count);
         var route = endpoints.DataSources.First();
-        Assert.AreEqual(4, route.Endpoints.Count);
+        Assert.AreEqual(3, route.Endpoints.Count);
 
         AssertMinimalBackOfficeRoutes(route);
 
-        var endpoint4 = (RouteEndpoint)route.Endpoints[3];
+        var endpoint4 = (RouteEndpoint)route.Endpoints[2];
         var apiControllerName = ControllerExtensions.GetControllerName<Testing1Controller>();
         Assert.AreEqual(
             $"umbraco/backoffice/api/{apiControllerName.ToLowerInvariant()}/{{action}}/{{id?}}",
@@ -65,26 +65,8 @@ public class BackOfficeAreaRoutesTests
     {
         var endpoint1 = (RouteEndpoint)route.Endpoints[0];
         Assert.AreEqual("umbraco/{action}/{id?}", endpoint1.RoutePattern.RawText);
-        Assert.AreEqual(Constants.Web.Mvc.BackOfficeArea, endpoint1.RoutePattern.Defaults[AreaToken]);
-        Assert.AreEqual("Default", endpoint1.RoutePattern.Defaults[ActionToken]);
-        Assert.AreEqual(
-            ControllerExtensions.GetControllerName<BackOfficeController>(),
-            endpoint1.RoutePattern.Defaults[ControllerToken]);
-        Assert.AreEqual(
-            endpoint1.RoutePattern.Defaults[AreaToken],
-            typeof(BackOfficeController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
-
-        var endpoint2 = (RouteEndpoint)route.Endpoints[1];
-        var controllerName = ControllerExtensions.GetControllerName<AuthenticationController>();
-        Assert.AreEqual(
-            $"umbraco/backoffice/{Constants.Web.Mvc.BackOfficeApiArea.ToLowerInvariant()}/{controllerName.ToLowerInvariant()}/{{action}}/{{id?}}",
-            endpoint2.RoutePattern.RawText);
-        Assert.AreEqual(Constants.Web.Mvc.BackOfficeApiArea, endpoint2.RoutePattern.Defaults[AreaToken]);
-        Assert.IsFalse(endpoint2.RoutePattern.Defaults.ContainsKey(ActionToken));
-        Assert.AreEqual(controllerName, endpoint2.RoutePattern.Defaults[ControllerToken]);
-        Assert.AreEqual(
-            endpoint1.RoutePattern.Defaults[AreaToken],
-            typeof(BackOfficeController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
+        Assert.AreEqual("Index", endpoint1.RoutePattern.Defaults[ActionToken]);
+        Assert.AreEqual(ControllerExtensions.GetControllerName<BackOfficeDefaultController>(), endpoint1.RoutePattern.Defaults[ControllerToken]);
     }
 
     private BackOfficeAreaRoutes GetBackOfficeAreaRoutes(RuntimeLevel level)
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs
deleted file mode 100644
index 8e8c07da8c..0000000000
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using System.Linq;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Install;
-using Umbraco.Extensions;
-using static Umbraco.Cms.Core.Constants.Web.Routing;
-
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing;
-
-[TestFixture]
-public class InstallAreaRoutesTests
-{
-    [TestCase(RuntimeLevel.BootFailed)]
-    [TestCase(RuntimeLevel.Unknown)]
-    [TestCase(RuntimeLevel.Boot)]
-    public void RuntimeState_No_Routes(RuntimeLevel level)
-    {
-        var routes = GetInstallAreaRoutes(level);
-        var endpoints = new TestRouteBuilder();
-        routes.CreateRoutes(endpoints);
-
-        Assert.AreEqual(0, endpoints.DataSources.Count);
-    }
-
-    [TestCase(RuntimeLevel.Install)]
-    [TestCase(RuntimeLevel.Upgrade)]
-    public void RuntimeState_Install(RuntimeLevel level)
-    {
-        var routes = GetInstallAreaRoutes(level);
-        var endpoints = new TestRouteBuilder();
-        routes.CreateRoutes(endpoints);
-
-        Assert.AreEqual(1, endpoints.DataSources.Count);
-        var route = endpoints.DataSources.First();
-        Assert.AreEqual(2, route.Endpoints.Count);
-
-        var endpoint1 = (RouteEndpoint)route.Endpoints[0];
-        Assert.AreEqual("install/api/{action}/{id?}", endpoint1.RoutePattern.RawText);
-        Assert.AreEqual(Constants.Web.Mvc.InstallArea, endpoint1.RoutePattern.Defaults[AreaToken]);
-        Assert.AreEqual("Index", endpoint1.RoutePattern.Defaults[ActionToken]);
-        Assert.AreEqual(
-            ControllerExtensions.GetControllerName<InstallApiController>(),
-            endpoint1.RoutePattern.Defaults[ControllerToken]);
-        Assert.AreEqual(
-            endpoint1.RoutePattern.Defaults[AreaToken],
-            typeof(InstallApiController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
-
-        var endpoint2 = (RouteEndpoint)route.Endpoints[1];
-        Assert.AreEqual("install/{action}/{id?}", endpoint2.RoutePattern.RawText);
-        Assert.AreEqual(Constants.Web.Mvc.InstallArea, endpoint2.RoutePattern.Defaults[AreaToken]);
-        Assert.AreEqual("Index", endpoint2.RoutePattern.Defaults[ActionToken]);
-        Assert.AreEqual(
-            ControllerExtensions.GetControllerName<InstallController>(),
-            endpoint2.RoutePattern.Defaults[ControllerToken]);
-        Assert.AreEqual(
-            endpoint2.RoutePattern.Defaults[AreaToken],
-            typeof(InstallController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
-
-        var dataSource = endpoints.DataSources.Last();
-        Assert.AreEqual(2, dataSource.Endpoints.Count);
-
-        Assert.AreEqual("Route: install/api/{action}/{id?}", dataSource.Endpoints[0].ToString());
-        Assert.AreEqual("Route: install/{action}/{id?}", dataSource.Endpoints[1].ToString());
-    }
-
-    [Test]
-    public void RuntimeState_Run()
-    {
-        var routes = GetInstallAreaRoutes(RuntimeLevel.Run);
-        var endpoints = new TestRouteBuilder();
-        routes.CreateRoutes(endpoints);
-
-        Assert.AreEqual(1, endpoints.DataSources.Count);
-        var route = endpoints.DataSources.First();
-        Assert.AreEqual(2, route.Endpoints.Count);
-
-        var endpoint = (RouteEndpoint)route.Endpoints[0];
-        Assert.AreEqual("install/api/{action}/{id?}", endpoint.RoutePattern.RawText);
-        
-        endpoint = (RouteEndpoint)route.Endpoints[1];
-        Assert.AreEqual("install/{action}/{id?}", endpoint.RoutePattern.RawText);
-    }
-
-    private InstallAreaRoutes GetInstallAreaRoutes(RuntimeLevel level) =>
-        new(
-            Mock.Of<IRuntimeState>(x => x.Level == level),
-            Mock.Of<IHostingEnvironment>(x =>
-                x.ToAbsolute(It.IsAny<string>()) == "/install" && x.ApplicationVirtualPath == string.Empty),
-            Mock.Of<LinkGenerator>());
-}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs
index 7fecd0605c..e3502f6ada 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs
@@ -1,18 +1,17 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Linq;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Api.Management.Controllers.Preview;
+using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Controllers;
-using Umbraco.Cms.Web.BackOffice.Routing;
 using Umbraco.Extensions;
 using static Umbraco.Cms.Core.Constants.Web.Routing;
 
@@ -42,7 +41,7 @@ public class PreviewRoutesTests
         var endpoints = new TestRouteBuilder();
         routes.CreateRoutes(endpoints);
 
-        Assert.AreEqual(2, endpoints.DataSources.Count);
+        Assert.AreEqual(1, endpoints.DataSources.Count);
         var route = endpoints.DataSources.First();
         Assert.AreEqual(2, route.Endpoints.Count);
 
@@ -50,18 +49,6 @@ public class PreviewRoutesTests
         Assert.AreEqual($"{routes.GetPreviewHubRoute()}/negotiate", endpoint0.RoutePattern.RawText);
         var endpoint1 = (RouteEndpoint)route.Endpoints[1];
         Assert.AreEqual($"{routes.GetPreviewHubRoute()}", endpoint1.RoutePattern.RawText);
-
-        var endpoint3 = (RouteEndpoint)endpoints.DataSources.Last().Endpoints[0];
-        var previewControllerName = ControllerExtensions.GetControllerName<PreviewController>();
-        Assert.AreEqual(
-            $"umbraco/{previewControllerName.ToLowerInvariant()}/{{action}}/{{id?}}",
-            endpoint3.RoutePattern.RawText);
-        Assert.AreEqual(Constants.Web.Mvc.BackOfficeArea, endpoint3.RoutePattern.Defaults["area"]);
-        Assert.AreEqual("Index", endpoint3.RoutePattern.Defaults[ActionToken]);
-        Assert.AreEqual(previewControllerName, endpoint3.RoutePattern.Defaults[ControllerToken]);
-        Assert.AreEqual(
-            endpoint3.RoutePattern.Defaults["area"],
-            typeof(PreviewController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
     }
 
     private PreviewRoutes GetRoutes(RuntimeLevel level)
diff --git a/umbraco.sln b/umbraco.sln
index 3b581e089b..d536a47c62 100644
--- a/umbraco.sln
+++ b/umbraco.sln
@@ -2,8 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32328.378
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "src\Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B5BD12C1-A454-435E-8A46-FF4A364C0382}"
 	ProjectSection(SolutionItems) = preProject
 		tests\.editorconfig = tests\.editorconfig
@@ -12,29 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B5BD12C1
 		tests\Directory.Packages.props = tests\Directory.Packages.props
 	EndProjectSection
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Web.UI.Client", "http://localhost:3961", "{3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}"
-	ProjectSection(WebsiteProperties) = preProject
-		UseIISExpress = "true"
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.8"
-		Debug.AspNetCompiler.VirtualPath = "/localhost_3961"
-		Debug.AspNetCompiler.PhysicalPath = "src\Umbraco.Web.UI.Client\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_3961\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/localhost_3961"
-		Release.AspNetCompiler.PhysicalPath = "src\Umbraco.Web.UI.Client\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_3961\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		SlnRelativePath = "src\Umbraco.Web.UI.Client\"
-		DefaultWebSiteLanguage = "Visual C#"
-		StartServerOnDebug = "false"
-	EndProjectSection
-EndProject
 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Web.UI.Login", "http://localhost:3962", "{A5A4D377-A873-4469-AB5F-24B32BC0E55A}"
 	ProjectSection(WebsiteProperties) = preProject
 		UseIISExpress = "true"
@@ -93,8 +68,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.PublishedCache.NuCa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine.Lucene", "src\Umbraco.Examine.Lucene\Umbraco.Examine.Lucene.csproj", "{0FAD7D2A-D7DD-45B1-91FD-488BB6CDACEA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.BackOffice", "src\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Website", "src\Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Integration", "tests\Umbraco.Tests.Integration\Umbraco.Tests.Integration.csproj", "{D6319409-777A-4BD0-93ED-B2DFD805B32C}"
@@ -224,15 +197,6 @@ Global
 		SkipTests|Any CPU = SkipTests|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.SkipTests|Any CPU.Build.0 = Debug|Any CPU
-		{3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU
 		{D88A926B-E8D6-495A-A2ED-8EFD0C847C62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D88A926B-E8D6-495A-A2ED-8EFD0C847C62}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D88A926B-E8D6-495A-A2ED-8EFD0C847C62}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU
@@ -276,12 +240,6 @@ Global
 		{0FAD7D2A-D7DD-45B1-91FD-488BB6CDACEA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0FAD7D2A-D7DD-45B1-91FD-488BB6CDACEA}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU
 		{0FAD7D2A-D7DD-45B1-91FD-488BB6CDACEA}.SkipTests|Any CPU.Build.0 = Debug|Any CPU
-		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.SkipTests|Any CPU.Build.0 = Debug|Any CPU
 		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Release|Any CPU.ActiveCfg = Release|Any CPU